From 0a53211389d988251ec71f3e4ad3efb1f3bb4890 Mon Sep 17 00:00:00 2001
From: aecsocket <43144841+aecsocket@users.noreply.github.com>
Date: Thu, 30 Jul 2026 05:40:52 +0100
Subject: [PATCH 01/82] fix: analytics event endpoint (#6938)

* fix: analytics event endpoint

* split admin-only routes into internal

* fix pr comment
---
 .../src/pages/admin/analytics/events.vue      |   8 +-
 .../src/routes/internal/analytics_event.rs    | 192 +++++++++++++++++
 apps/labrinth/src/routes/internal/mod.rs      |  17 +-
 .../labrinth/src/routes/v3/analytics_event.rs | 193 +-----------------
 apps/labrinth/src/routes/v3/mod.rs            |   2 +
 packages/api-client/src/modules/index.ts      |   2 +
 .../modules/labrinth/analytics/internal.ts    |  51 +++++
 .../src/modules/labrinth/analytics/v3.ts      |  43 ----
 .../api-client/src/modules/labrinth/index.ts  |   1 +
 .../api-client/src/modules/labrinth/types.ts  |  18 +-
 10 files changed, 276 insertions(+), 251 deletions(-)
 create mode 100644 apps/labrinth/src/routes/internal/analytics_event.rs
 create mode 100644 packages/api-client/src/modules/labrinth/analytics/internal.ts

diff --git a/apps/frontend/src/pages/admin/analytics/events.vue b/apps/frontend/src/pages/admin/analytics/events.vue
index bffebfaada..a471615ce9 100644
--- a/apps/frontend/src/pages/admin/analytics/events.vue
+++ b/apps/frontend/src/pages/admin/analytics/events.vue
@@ -485,9 +485,9 @@ async function saveEvent() {
 		const payload = buildEventPayload()
 
 		if (modalMode.value === 'edit' && editingEventId.value !== null) {
-			await client.labrinth.analytics_v3.editEvent(editingEventId.value, payload)
+			await client.labrinth.analytics_internal.editEvent(editingEventId.value, payload)
 		} else {
-			await client.labrinth.analytics_v3.createEvent(payload)
+			await client.labrinth.analytics_internal.createEvent(payload)
 		}
 
 		await queryClient.invalidateQueries({ queryKey: analyticsEventsQueryKey })
@@ -528,7 +528,7 @@ async function deleteEvent(eventId: Labrinth.Analytics.v3.AnalyticsEventId) {
 	setDeletingEvent(eventId, true)
 
 	try {
-		await client.labrinth.analytics_v3.deleteEvent(eventId)
+		await client.labrinth.analytics_internal.deleteEvent(eventId)
 		await queryClient.invalidateQueries({ queryKey: analyticsEventsQueryKey })
 		addNotification({
 			title: 'Analytics event deleted',
@@ -581,7 +581,7 @@ function commitAnnouncementUrl() {
 	committedAnnouncementUrl.value = form.value.announcementUrl
 }
 
-function buildEventPayload(): Labrinth.Analytics.v3.AnalyticsEventUpsert {
+function buildEventPayload(): Labrinth.Analytics.Internal.AnalyticsEventUpsert {
 	const selectedRange = getEventFormDateRange()
 	if (!selectedRange) {
 		throw new Error('Select a valid start and end date')
diff --git a/apps/labrinth/src/routes/internal/analytics_event.rs b/apps/labrinth/src/routes/internal/analytics_event.rs
new file mode 100644
index 0000000000..a743703da3
--- /dev/null
+++ b/apps/labrinth/src/routes/internal/analytics_event.rs
@@ -0,0 +1,192 @@
+use actix_web::{HttpRequest, delete, patch, post, web};
+use chrono::{DateTime, Utc};
+use eyre::eyre;
+use serde::{Deserialize, Serialize};
+use xredis::RedisPool;
+
+use crate::{
+    auth::get_user_from_headers,
+    database::{
+        PgPool,
+        models::{
+            DBAnalyticsEvent, DBAnalyticsEventId, generate_analytics_event_id,
+        },
+    },
+    models::{
+        ids::AnalyticsEventId,
+        pats::Scopes,
+        v3::analytics_event::{AnalyticsEvent, AnalyticsEventMeta},
+    },
+    queue::session::AuthQueue,
+    routes::ApiError,
+    util::error::Context,
+};
+
+pub fn config(cfg: &mut actix_web::web::ServiceConfig) {
+    cfg.service(analytics_event_create)
+        .service(analytics_event_edit)
+        .service(analytics_event_delete);
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)]
+pub struct AnalyticsEventUpsert {
+    #[serde(flatten)]
+    pub meta: AnalyticsEventMeta,
+    pub starts: DateTime<Utc>,
+    pub ends: DateTime<Utc>,
+}
+
+/// Create an analytics event.  
+#[utoipa::path(
+	context_path = "/analytics-event",
+	tag = "analytics events", responses((status = OK, body = AnalyticsEvent))
+)]
+#[post("")]
+pub async fn analytics_event_create(
+    req: HttpRequest,
+    event: web::Json<AnalyticsEventUpsert>,
+    pool: web::Data<PgPool>,
+    redis: web::Data<RedisPool>,
+    session_queue: web::Data<AuthQueue>,
+) -> Result<web::Json<AnalyticsEvent>, ApiError> {
+    let user = get_user_from_headers(
+        &req,
+        &**pool,
+        &redis,
+        &session_queue,
+        Scopes::empty(),
+    )
+    .await?
+    .1;
+
+    if !user.role.is_admin() {
+        return Err(ApiError::Auth(eyre!(
+            "you do not have permission to manage analytics events"
+        )));
+    }
+
+    let mut transaction = pool
+        .begin()
+        .await
+        .wrap_internal_err("failed to begin transaction")?;
+    let id = generate_analytics_event_id(&mut transaction)
+        .await
+        .wrap_internal_err("failed to generate analytics event ID")?;
+
+    let event = DBAnalyticsEvent {
+        id,
+        meta: event.meta.clone(),
+        starts: event.starts,
+        ends: event.ends,
+    };
+    event
+        .insert(&mut transaction)
+        .await
+        .wrap_internal_err("failed to insert analytics event")?;
+
+    transaction
+        .commit()
+        .await
+        .wrap_internal_err("failed to commit transaction")?;
+    DBAnalyticsEvent::clear_cache(&redis)
+        .await
+        .wrap_internal_err("failed to clear analytics event cache")?;
+
+    Ok(web::Json(event.into()))
+}
+
+/// Update an analytics event.  
+#[utoipa::path(
+	context_path = "/analytics-event",
+	tag = "analytics events", responses((status = OK, body = AnalyticsEvent))
+)]
+#[patch("/{id}")]
+pub async fn analytics_event_edit(
+    req: HttpRequest,
+    id: web::Path<(AnalyticsEventId,)>,
+    event: web::Json<AnalyticsEventUpsert>,
+    pool: web::Data<PgPool>,
+    redis: web::Data<RedisPool>,
+    session_queue: web::Data<AuthQueue>,
+) -> Result<web::Json<AnalyticsEvent>, ApiError> {
+    let user = get_user_from_headers(
+        &req,
+        &**pool,
+        &redis,
+        &session_queue,
+        Scopes::empty(),
+    )
+    .await?
+    .1;
+
+    if !user.role.is_admin() {
+        return Err(ApiError::Auth(eyre!(
+            "you do not have permission to manage analytics events"
+        )));
+    }
+
+    let event = DBAnalyticsEvent {
+        id: DBAnalyticsEventId::from(id.into_inner().0),
+        meta: event.meta.clone(),
+        starts: event.starts,
+        ends: event.ends,
+    };
+
+    let updated = event
+        .update(&**pool)
+        .await
+        .wrap_internal_err("failed to update analytics event")?;
+    if !updated {
+        return Err(ApiError::NotFound);
+    }
+    DBAnalyticsEvent::clear_cache(&redis)
+        .await
+        .wrap_internal_err("failed to clear analytics event cache")?;
+
+    Ok(web::Json(event.into()))
+}
+
+/// Delete an analytics event.  
+#[utoipa::path(
+	context_path = "/analytics-event",
+	tag = "analytics events", responses((status = NO_CONTENT))
+)]
+#[delete("/{id}")]
+pub async fn analytics_event_delete(
+    req: HttpRequest,
+    id: web::Path<(AnalyticsEventId,)>,
+    pool: web::Data<PgPool>,
+    redis: web::Data<RedisPool>,
+    session_queue: web::Data<AuthQueue>,
+) -> Result<(), ApiError> {
+    let user = get_user_from_headers(
+        &req,
+        &**pool,
+        &redis,
+        &session_queue,
+        Scopes::empty(),
+    )
+    .await?
+    .1;
+
+    if !user.role.is_admin() {
+        return Err(ApiError::Auth(eyre!(
+            "you do not have permission to manage analytics events"
+        )));
+    }
+
+    let deleted = DBAnalyticsEvent::remove(
+        DBAnalyticsEventId::from(id.into_inner().0),
+        &**pool,
+    )
+    .await
+    .wrap_internal_err("failed to delete analytics event")?;
+    if !deleted {
+        return Err(ApiError::NotFound);
+    }
+    DBAnalyticsEvent::clear_cache(&redis)
+        .await
+        .wrap_internal_err("failed to clear analytics event cache")?;
+
+    Ok(())
+}
diff --git a/apps/labrinth/src/routes/internal/mod.rs b/apps/labrinth/src/routes/internal/mod.rs
index 272ac2de8b..1ad10523b1 100644
--- a/apps/labrinth/src/routes/internal/mod.rs
+++ b/apps/labrinth/src/routes/internal/mod.rs
@@ -1,5 +1,6 @@
 pub mod admin;
 pub mod affiliate;
+pub mod analytics_event;
 pub mod attribution;
 pub mod billing;
 pub mod blocked_users;
@@ -35,6 +36,10 @@ pub fn config(cfg: &mut web::ServiceConfig) {
             .configure(flows::config)
             .configure(pats::config)
             .configure(oauth_clients::config)
+            .service(
+                web::scope("/analytics-event")
+                    .configure(analytics_event::config),
+            )
             .service(web::scope("/moderation").configure(moderation::config))
             .service(web::scope("/affiliate").configure(affiliate::config))
             .service(web::scope("/campaign").configure(campaign::config))
@@ -50,11 +55,6 @@ pub fn config(cfg: &mut web::ServiceConfig) {
             .configure(medal::config)
             .configure(mural::config)
             .configure(statuses::config),
-    )
-    .service(
-        web::scope("/v3/analytics-event")
-            .wrap(default_cors())
-            .configure(super::v3::analytics_event::config),
     );
 }
 
@@ -180,10 +180,9 @@ pub fn config(cfg: &mut web::ServiceConfig) {
 		medal::redeem,
 		mural::get_bank_details,
 		statuses::ws_init,
-		super::v3::analytics_event::analytics_events_get,
-		super::v3::analytics_event::analytics_event_create,
-		super::v3::analytics_event::analytics_event_edit,
-		super::v3::analytics_event::analytics_event_delete,
+		analytics_event::analytics_event_create,
+		analytics_event::analytics_event_edit,
+		analytics_event::analytics_event_delete,
 	),
 	modifiers(&InternalPathModifier, &SecurityAddon)
 )]
diff --git a/apps/labrinth/src/routes/v3/analytics_event.rs b/apps/labrinth/src/routes/v3/analytics_event.rs
index 9bbe2ef0a0..53142b411e 100644
--- a/apps/labrinth/src/routes/v3/analytics_event.rs
+++ b/apps/labrinth/src/routes/v3/analytics_event.rs
@@ -1,48 +1,22 @@
-use actix_web::{HttpRequest, delete, get, patch, post, web};
-use chrono::{DateTime, Utc};
-use eyre::eyre;
-use serde::{Deserialize, Serialize};
+use actix_web::{get, web};
 use xredis::RedisPool;
 
 use crate::{
-    auth::get_user_from_headers,
-    database::{
-        PgPool,
-        models::{
-            DBAnalyticsEvent, DBAnalyticsEventId, generate_analytics_event_id,
-        },
-    },
-    models::{
-        ids::AnalyticsEventId,
-        pats::Scopes,
-        v3::analytics_event::{AnalyticsEvent, AnalyticsEventMeta},
-    },
-    queue::session::AuthQueue,
+    database::{PgPool, models::DBAnalyticsEvent},
+    models::v3::analytics_event::AnalyticsEvent,
     routes::ApiError,
     util::error::Context,
 };
 
 pub fn config(cfg: &mut actix_web::web::ServiceConfig) {
-    cfg.service(analytics_events_get)
-        .service(analytics_event_create)
-        .service(analytics_event_edit)
-        .service(analytics_event_delete);
+    cfg.service(analytics_events_get);
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)]
-pub struct AnalyticsEventUpsert {
-    #[serde(flatten)]
-    pub meta: AnalyticsEventMeta,
-    pub starts: DateTime<Utc>,
-    pub ends: DateTime<Utc>,
-}
-
-/// List analytics events.  
+/// List analytics events.
 #[utoipa::path(
-	context_path = "/v3/analytics-event",
 	tag = "v3 analytics", responses((status = OK, body = Vec<AnalyticsEvent>))
 )]
-#[get("")]
+#[get("/analytics-event")]
 pub async fn analytics_events_get(
     pool: web::Data<PgPool>,
     redis: web::Data<RedisPool>,
@@ -56,158 +30,3 @@ pub async fn analytics_events_get(
 
     Ok(web::Json(events))
 }
-
-/// Create an analytics event.  
-#[utoipa::path(
-	context_path = "/v3/analytics-event",
-	tag = "v3 analytics", responses((status = OK, body = AnalyticsEvent))
-)]
-#[post("")]
-pub async fn analytics_event_create(
-    req: HttpRequest,
-    event: web::Json<AnalyticsEventUpsert>,
-    pool: web::Data<PgPool>,
-    redis: web::Data<RedisPool>,
-    session_queue: web::Data<AuthQueue>,
-) -> Result<web::Json<AnalyticsEvent>, ApiError> {
-    let user = get_user_from_headers(
-        &req,
-        &**pool,
-        &redis,
-        &session_queue,
-        Scopes::empty(),
-    )
-    .await?
-    .1;
-
-    if !user.role.is_admin() {
-        return Err(ApiError::Auth(eyre!(
-            "you do not have permission to manage analytics events"
-        )));
-    }
-
-    let mut transaction = pool
-        .begin()
-        .await
-        .wrap_internal_err("failed to begin transaction")?;
-    let id = generate_analytics_event_id(&mut transaction)
-        .await
-        .wrap_internal_err("failed to generate analytics event ID")?;
-
-    let event = DBAnalyticsEvent {
-        id,
-        meta: event.meta.clone(),
-        starts: event.starts,
-        ends: event.ends,
-    };
-    event
-        .insert(&mut transaction)
-        .await
-        .wrap_internal_err("failed to insert analytics event")?;
-
-    transaction
-        .commit()
-        .await
-        .wrap_internal_err("failed to commit transaction")?;
-    DBAnalyticsEvent::clear_cache(&redis)
-        .await
-        .wrap_internal_err("failed to clear analytics event cache")?;
-
-    Ok(web::Json(event.into()))
-}
-
-/// Update an analytics event.  
-#[utoipa::path(
-	context_path = "/v3/analytics-event",
-	tag = "v3 analytics", responses((status = OK, body = AnalyticsEvent))
-)]
-#[patch("/{id}")]
-pub async fn analytics_event_edit(
-    req: HttpRequest,
-    id: web::Path<(AnalyticsEventId,)>,
-    event: web::Json<AnalyticsEventUpsert>,
-    pool: web::Data<PgPool>,
-    redis: web::Data<RedisPool>,
-    session_queue: web::Data<AuthQueue>,
-) -> Result<web::Json<AnalyticsEvent>, ApiError> {
-    let user = get_user_from_headers(
-        &req,
-        &**pool,
-        &redis,
-        &session_queue,
-        Scopes::empty(),
-    )
-    .await?
-    .1;
-
-    if !user.role.is_admin() {
-        return Err(ApiError::Auth(eyre!(
-            "you do not have permission to manage analytics events"
-        )));
-    }
-
-    let event = DBAnalyticsEvent {
-        id: DBAnalyticsEventId::from(id.into_inner().0),
-        meta: event.meta.clone(),
-        starts: event.starts,
-        ends: event.ends,
-    };
-
-    let updated = event
-        .update(&**pool)
-        .await
-        .wrap_internal_err("failed to update analytics event")?;
-    if !updated {
-        return Err(ApiError::NotFound);
-    }
-    DBAnalyticsEvent::clear_cache(&redis)
-        .await
-        .wrap_internal_err("failed to clear analytics event cache")?;
-
-    Ok(web::Json(event.into()))
-}
-
-/// Delete an analytics event.  
-#[utoipa::path(
-	context_path = "/v3/analytics-event",
-	tag = "v3 analytics", responses((status = NO_CONTENT))
-)]
-#[delete("/{id}")]
-pub async fn analytics_event_delete(
-    req: HttpRequest,
-    id: web::Path<(AnalyticsEventId,)>,
-    pool: web::Data<PgPool>,
-    redis: web::Data<RedisPool>,
-    session_queue: web::Data<AuthQueue>,
-) -> Result<(), ApiError> {
-    let user = get_user_from_headers(
-        &req,
-        &**pool,
-        &redis,
-        &session_queue,
-        Scopes::empty(),
-    )
-    .await?
-    .1;
-
-    if !user.role.is_admin() {
-        return Err(ApiError::Auth(eyre!(
-            "you do not have permission to manage analytics events"
-        )));
-    }
-
-    let deleted = DBAnalyticsEvent::remove(
-        DBAnalyticsEventId::from(id.into_inner().0),
-        &**pool,
-    )
-    .await
-    .wrap_internal_err("failed to delete analytics event")?;
-    if !deleted {
-        return Err(ApiError::NotFound);
-    }
-    DBAnalyticsEvent::clear_cache(&redis)
-        .await
-        .wrap_internal_err("failed to clear analytics event cache")?;
-
-    Ok(())
-}
diff --git a/apps/labrinth/src/routes/v3/mod.rs b/apps/labrinth/src/routes/v3/mod.rs
index 919bffee4e..735daff22f 100644
--- a/apps/labrinth/src/routes/v3/mod.rs
+++ b/apps/labrinth/src/routes/v3/mod.rs
@@ -49,6 +49,7 @@ pub fn config(cfg: &mut web::ServiceConfig) {
     cfg.service(
         web::scope("/v3")
             .wrap(default_cors())
+            .configure(analytics_event::config)
             .configure(limits::config)
             .configure(collections::config)
             .configure(images::config)
@@ -80,6 +81,7 @@ pub fn config(cfg: &mut web::ServiceConfig) {
 		description = include_str!("../../api_v3_description.md"),
 	),
 	paths(
+		analytics_event::analytics_events_get,
 		analytics_get::fetch_analytics,
 		analytics_get::facets::fetch_facets,
 		analytics_get::old::playtimes_get,
diff --git a/packages/api-client/src/modules/index.ts b/packages/api-client/src/modules/index.ts
index 9f8167bbc8..28b3c77e9a 100644
--- a/packages/api-client/src/modules/index.ts
+++ b/packages/api-client/src/modules/index.ts
@@ -19,6 +19,7 @@ import { KyrosLogsV1Module } from './kyros/logs/v1'
 import { KyrosUploadSessionsV1Module } from './kyros/upload-sessions/v1'
 import { LabrinthVersionsV2Module, LabrinthVersionsV3Module } from './labrinth'
 import { LabrinthAffiliateInternalModule } from './labrinth/affiliate/internal'
+import { LabrinthAnalyticsInternalModule } from './labrinth/analytics/internal'
 import { LabrinthAnalyticsV3Module } from './labrinth/analytics/v3'
 import { LabrinthAttributionInternalModule } from './labrinth/attribution/internal'
 import { LabrinthAuthInternalModule } from './labrinth/auth/internal'
@@ -97,6 +98,7 @@ export const MODULE_REGISTRY = {
 	kyros_logs_v1: KyrosLogsV1Module,
 	kyros_upload_sessions_v1: KyrosUploadSessionsV1Module,
 	labrinth_affiliate_internal: LabrinthAffiliateInternalModule,
+	labrinth_analytics_internal: LabrinthAnalyticsInternalModule,
 	labrinth_analytics_v3: LabrinthAnalyticsV3Module,
 	labrinth_auth_internal: LabrinthAuthInternalModule,
 	labrinth_auth_v2: LabrinthAuthV2Module,
diff --git a/packages/api-client/src/modules/labrinth/analytics/internal.ts b/packages/api-client/src/modules/labrinth/analytics/internal.ts
new file mode 100644
index 0000000000..b794327ef8
--- /dev/null
+++ b/packages/api-client/src/modules/labrinth/analytics/internal.ts
@@ -0,0 +1,51 @@
+import { AbstractModule } from '../../../core/abstract-module'
+import type { Labrinth } from '../types'
+
+export class LabrinthAnalyticsInternalModule extends AbstractModule {
+	public getModuleID(): string {
+		return 'labrinth_analytics_internal'
+	}
+
+	/**
+	 * Create an analytics event.
+	 * POST /_internal/analytics-event
+	 */
+	public async createEvent(
+		data: Labrinth.Analytics.Internal.AnalyticsEventUpsert,
+	): Promise<Labrinth.Analytics.v3.AnalyticsEvent> {
+		return this.client.request<Labrinth.Analytics.v3.AnalyticsEvent>('/analytics-event', {
+			api: 'labrinth',
+			version: 'internal',
+			method: 'POST',
+			body: data,
+		})
+	}
+
+	/**
+	 * Edit an analytics event.
+	 * PATCH /_internal/analytics-event/{id}
+	 */
+	public async editEvent(
+		id: Labrinth.Analytics.v3.AnalyticsEventId,
+		data: Labrinth.Analytics.Internal.AnalyticsEventUpsert,
+	): Promise<Labrinth.Analytics.v3.AnalyticsEvent> {
+		return this.client.request<Labrinth.Analytics.v3.AnalyticsEvent>(`/analytics-event/${id}`, {
+			api: 'labrinth',
+			version: 'internal',
+			method: 'PATCH',
+			body: data,
+		})
+	}
+
+	/**
+	 * Delete an analytics event.
+	 * DELETE /_internal/analytics-event/{id}
+	 */
+	public async deleteEvent(id: Labrinth.Analytics.v3.AnalyticsEventId): Promise<void> {
+		return this.client.request<void>(`/analytics-event/${id}`, {
+			api: 'labrinth',
+			version: 'internal',
+			method: 'DELETE',
+		})
+	}
+}
diff --git a/packages/api-client/src/modules/labrinth/analytics/v3.ts b/packages/api-client/src/modules/labrinth/analytics/v3.ts
index ba93ca4ac8..6b7757e9cb 100644
--- a/packages/api-client/src/modules/labrinth/analytics/v3.ts
+++ b/packages/api-client/src/modules/labrinth/analytics/v3.ts
@@ -70,47 +70,4 @@ export class LabrinthAnalyticsV3Module extends AbstractModule {
 			method: 'GET',
 		})
 	}
-
-	/**
-	 * Create an analytics event.
-	 * POST /v3/analytics-event
-	 */
-	public async createEvent(
-		data: Labrinth.Analytics.v3.AnalyticsEventUpsert,
-	): Promise<Labrinth.Analytics.v3.AnalyticsEvent> {
-		return this.client.request<Labrinth.Analytics.v3.AnalyticsEvent>('/analytics-event', {
-			api: 'labrinth',
-			version: 3,
-			method: 'POST',
-			body: data,
-		})
-	}
-
-	/**
-	 * Edit an analytics event.
-	 * PATCH /v3/analytics-event/{id}
-	 */
-	public async editEvent(
-		id: Labrinth.Analytics.v3.AnalyticsEventId,
-		data: Labrinth.Analytics.v3.AnalyticsEventUpsert,
-	): Promise<Labrinth.Analytics.v3.AnalyticsEvent> {
-		return this.client.request<Labrinth.Analytics.v3.AnalyticsEvent>(`/analytics-event/${id}`, {
-			api: 'labrinth',
-			version: 3,
-			method: 'PATCH',
-			body: data,
-		})
-	}
-
-	/**
-	 * Delete an analytics event.
-	 * DELETE /v3/analytics-event/{id}
-	 */
-	public async deleteEvent(id: Labrinth.Analytics.v3.AnalyticsEventId): Promise<void> {
-		return this.client.request<void>(`/analytics-event/${id}`, {
-			api: 'labrinth',
-			version: 3,
-			method: 'DELETE',
-		})
-	}
 }
diff --git a/packages/api-client/src/modules/labrinth/index.ts b/packages/api-client/src/modules/labrinth/index.ts
index 38d23edd70..51cca73d32 100644
--- a/packages/api-client/src/modules/labrinth/index.ts
+++ b/packages/api-client/src/modules/labrinth/index.ts
@@ -1,3 +1,4 @@
+export * from './analytics/internal'
 export * from './analytics/v3'
 export * from './attribution/internal'
 export * from './auth/internal'
diff --git a/packages/api-client/src/modules/labrinth/types.ts b/packages/api-client/src/modules/labrinth/types.ts
index a5de5b8d8d..0e571a6291 100644
--- a/packages/api-client/src/modules/labrinth/types.ts
+++ b/packages/api-client/src/modules/labrinth/types.ts
@@ -463,6 +463,16 @@ export namespace Labrinth {
 	}
 
 	export namespace Analytics {
+		export namespace Internal {
+			export type AnalyticsEventUpsert = {
+				announcement_url: string | null
+				for_metric_kind: v3.AnalyticsEventMetricKind[] | null
+				title: string
+				ends: string
+				starts: string
+			}
+		}
+
 		export namespace v3 {
 			export type AnalyticsEventId = number
 			export type AnalyticsEventMetricKind = 'views' | 'revenue' | 'downloads' | 'playtime'
@@ -476,14 +486,6 @@ export namespace Labrinth {
 				starts: string
 			}
 
-			export type AnalyticsEventUpsert = {
-				announcement_url: string | null
-				for_metric_kind: AnalyticsEventMetricKind[] | null
-				title: string
-				ends: string
-				starts: string
-			}
-
 			export type FetchRequest = {
 				time_range: TimeRange
 				return_metrics: ReturnMetrics

From 572b8027ffc9ceceb054791e96822400b9a0b693 Mon Sep 17 00:00:00 2001
From: "Michael H." <michael@iptables.sh>
Date: Thu, 30 Jul 2026 19:23:10 +0200
Subject: [PATCH 02/82] fix: clickhouse migrations should not run normally

---
 apps/labrinth/src/background_task.rs |  3 ++
 apps/labrinth/src/clickhouse/mod.rs  | 51 ++++++++++++++++------------
 apps/labrinth/src/main.rs            |  2 +-
 apps/labrinth/src/test/mod.rs        |  1 +
 4 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/apps/labrinth/src/background_task.rs b/apps/labrinth/src/background_task.rs
index 9a5150b3c5..3936356840 100644
--- a/apps/labrinth/src/background_task.rs
+++ b/apps/labrinth/src/background_task.rs
@@ -168,6 +168,9 @@ pub async fn update_bank_balances(pool: PgPool) -> eyre::Result<()> {
 
 pub async fn run_migrations() -> eyre::Result<()> {
     database::check_for_migrations().await?;
+    crate::clickhouse::run_migrations()
+        .await
+        .wrap_err("failed to run ClickHouse migrations")?;
     Ok(())
 }
 
diff --git a/apps/labrinth/src/clickhouse/mod.rs b/apps/labrinth/src/clickhouse/mod.rs
index d20353d6ef..e511bc0481 100644
--- a/apps/labrinth/src/clickhouse/mod.rs
+++ b/apps/labrinth/src/clickhouse/mod.rs
@@ -19,29 +19,36 @@ pub async fn init_client() -> clickhouse::error::Result<clickhouse::Client> {
 pub async fn init_client_with_database(
     database: &str,
 ) -> clickhouse::error::Result<clickhouse::Client> {
+    Ok(connect()?.with_database(database))
+}
+
+fn connect() -> clickhouse::error::Result<clickhouse::Client> {
+    let https_connector = HttpsConnectorBuilder::new()
+        .with_native_roots()?
+        .https_or_http()
+        .enable_all_versions()
+        .build();
+    let hyper_client =
+        hyper_util::client::legacy::Client::builder(TokioExecutor::new())
+            .build(https_connector);
+
+    Ok(clickhouse::Client::with_http_client(hyper_client)
+        .with_url(&ENV.CLICKHOUSE_URL)
+        .with_user(&ENV.CLICKHOUSE_USER)
+        .with_password(&ENV.CLICKHOUSE_PASSWORD)
+        .with_validation(false))
+}
+
+pub async fn run_migrations() -> clickhouse::error::Result<()> {
+    run_migrations_on_database(&ENV.CLICKHOUSE_DATABASE).await
+}
+
+pub async fn run_migrations_on_database(
+    database: &str,
+) -> clickhouse::error::Result<()> {
     const MINECRAFT_JAVA_SERVER_PINGS: &str = server_ping::CLICKHOUSE_TABLE;
 
-    let client = {
-        let https_connector = HttpsConnectorBuilder::new()
-            .with_native_roots()?
-            .https_or_http()
-            .enable_all_versions()
-            .build();
-        let hyper_client =
-            hyper_util::client::legacy::Client::builder(TokioExecutor::new())
-                .build(https_connector);
-
-        clickhouse::Client::with_http_client(hyper_client)
-            .with_url(&ENV.CLICKHOUSE_URL)
-            .with_user(&ENV.CLICKHOUSE_USER)
-            .with_password(&ENV.CLICKHOUSE_PASSWORD)
-            .with_validation(false)
-    };
-
-    client
-        .query(&format!("CREATE DATABASE IF NOT EXISTS {database}"))
-        .execute()
-        .await?;
+    let client = connect()?;
 
     let clickhouse_replicated = ENV.CLICKHOUSE_REPLICATED;
     let cluster_line = if clickhouse_replicated {
@@ -270,5 +277,5 @@ pub async fn init_client_with_database(
         .execute()
         .await?;
 
-    Ok(client.with_database(database))
+    Ok(())
 }
diff --git a/apps/labrinth/src/main.rs b/apps/labrinth/src/main.rs
index d788349117..b456b77a67 100644
--- a/apps/labrinth/src/main.rs
+++ b/apps/labrinth/src/main.rs
@@ -98,7 +98,7 @@ async fn app() -> std::io::Result<()> {
         info!("Starting labrinth on {}", &ENV.BIND_ADDR);
 
         if !args.no_migrations {
-            database::check_for_migrations()
+            labrinth::background_task::run_migrations()
                 .await
                 .expect("An error occurred while running migrations.");
         }
diff --git a/apps/labrinth/src/test/mod.rs b/apps/labrinth/src/test/mod.rs
index e81289e48d..7784392012 100644
--- a/apps/labrinth/src/test/mod.rs
+++ b/apps/labrinth/src/test/mod.rs
@@ -37,6 +37,7 @@ pub async fn setup(db: &database::TemporaryDatabase) -> LabrinthConfig {
     let search_backend = db.search_backend.clone();
     let file_host: Arc<dyn FileHost> = Arc::new(file_hosting::MockHost::new());
     let file_host = web::Data::<dyn FileHost>::from(file_host);
+    clickhouse::run_migrations().await.unwrap();
     let mut clickhouse = clickhouse::init_client().await.unwrap();
 
     let stripe_client = stripe::Client::new(ENV.STRIPE_API_KEY.clone());

From c5ce5bc9b314b937d9e30ab65dba5be81ff3b4ec Mon Sep 17 00:00:00 2001
From: "Michael H." <michael@iptables.sh>
Date: Thu, 30 Jul 2026 20:08:49 +0200
Subject: [PATCH 03/82] fix: create clickhouse db in tests only

---
 apps/labrinth/src/clickhouse/mod.rs | 8 ++++++++
 apps/labrinth/src/test/mod.rs       | 3 +++
 2 files changed, 11 insertions(+)

diff --git a/apps/labrinth/src/clickhouse/mod.rs b/apps/labrinth/src/clickhouse/mod.rs
index e511bc0481..1e3f92e73b 100644
--- a/apps/labrinth/src/clickhouse/mod.rs
+++ b/apps/labrinth/src/clickhouse/mod.rs
@@ -39,6 +39,14 @@ fn connect() -> clickhouse::error::Result<clickhouse::Client> {
         .with_validation(false))
 }
 
+#[cfg(feature = "test")]
+pub async fn create_database(database: &str) -> clickhouse::error::Result<()> {
+    connect()?
+        .query(&format!("CREATE DATABASE IF NOT EXISTS {database}"))
+        .execute()
+        .await
+}
+
 pub async fn run_migrations() -> clickhouse::error::Result<()> {
     run_migrations_on_database(&ENV.CLICKHOUSE_DATABASE).await
 }
diff --git a/apps/labrinth/src/test/mod.rs b/apps/labrinth/src/test/mod.rs
index 7784392012..97fb991b87 100644
--- a/apps/labrinth/src/test/mod.rs
+++ b/apps/labrinth/src/test/mod.rs
@@ -37,6 +37,9 @@ pub async fn setup(db: &database::TemporaryDatabase) -> LabrinthConfig {
     let search_backend = db.search_backend.clone();
     let file_host: Arc<dyn FileHost> = Arc::new(file_hosting::MockHost::new());
     let file_host = web::Data::<dyn FileHost>::from(file_host);
+    clickhouse::create_database(&ENV.CLICKHOUSE_DATABASE)
+        .await
+        .unwrap();
     clickhouse::run_migrations().await.unwrap();
     let mut clickhouse = clickhouse::init_client().await.unwrap();
 

From 7abe6f8c7318a41aa859f9f8b577d5d0d4d0e492 Mon Sep 17 00:00:00 2001
From: "Michael H." <michael@iptables.sh>
Date: Thu, 30 Jul 2026 20:27:08 +0200
Subject: [PATCH 04/82] feat: sccache on windows

---
 .github/workflows/theseus-build.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/theseus-build.yml b/.github/workflows/theseus-build.yml
index abc1305f3d..6b83d5bfde 100644
--- a/.github/workflows/theseus-build.yml
+++ b/.github/workflows/theseus-build.yml
@@ -92,7 +92,6 @@ jobs:
         run: corepack enable
 
       - name: Set up caches
-        if: contains(matrix.artifact-target-name, 'linux') || contains(matrix.artifact-target-name, 'darwin')
         uses: namespacelabs/nscloud-cache-action@c5f8dab7560444c4bf8dbc64f1b203431873c547 # v1.6.1
         with:
           cache: |
@@ -100,7 +99,6 @@ jobs:
             pnpm
 
       - name: Configure sccache
-        if: contains(matrix.artifact-target-name, 'linux') || contains(matrix.artifact-target-name, 'darwin')
         run: nsc cache sccache setup --cache_name default >> "$GITHUB_ENV"
 
       - name: Generate tauri-dev.conf.json

From 295db3fb7ac113ba6b5a8622d2d325670193241e Mon Sep 17 00:00:00 2001
From: Prospector <6166773+Prospector@users.noreply.github.com>
Date: Thu, 30 Jul 2026 23:10:08 -0700
Subject: [PATCH 05/82] =?UTF-8?q?only=20refresh=20tokens=20and=20clear=20a?=
 =?UTF-8?q?uth=20cookies=20on=20auth=20fails,=20not=20any=20ran=E2=80=A6?=
 =?UTF-8?q?=20(#6947)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

only refresh tokens and clear auth cookies on auth fails, not any random error
---
 apps/frontend/src/composables/auth.ts | 64 ++++++++++++++++++++-------
 1 file changed, 48 insertions(+), 16 deletions(-)

diff --git a/apps/frontend/src/composables/auth.ts b/apps/frontend/src/composables/auth.ts
index 11f5f5c173..bffb9b72fc 100644
--- a/apps/frontend/src/composables/auth.ts
+++ b/apps/frontend/src/composables/auth.ts
@@ -30,6 +30,29 @@ const normalizeAuthToken = (value: unknown) => {
 	return ''
 }
 
+const getErrorStatus = (error: unknown): number | undefined => {
+	if (!error || typeof error !== 'object') {
+		return undefined
+	}
+
+	const typedError = error as { statusCode?: unknown; status?: unknown }
+	const status = typedError.statusCode ?? typedError.status
+
+	return typeof status === 'number' ? status : undefined
+}
+
+// only when labrinth actually gives us an auth error
+const isAuthFailure = (error: unknown): boolean => {
+	const status = getErrorStatus(error)
+	return status === 401 || status === 403
+}
+
+const clearAuthCookie = (auth: AuthState, authCookie: { value: string | null }) => {
+	authCookie.value = null
+	auth.token = ''
+	auth.user = null
+}
+
 const getQueryString = (value: QueryValue) => {
 	if (Array.isArray(value)) {
 		return value[0] ?? null
@@ -90,6 +113,7 @@ export const initAuth = async (oldToken: string | null | undefined = null) => {
 	}
 
 	const tokenStr = normalizeAuthToken(authCookie.value)
+	let shouldRefresh = false
 
 	if (authCookie.value != null && tokenStr === '') {
 		authCookie.value = null
@@ -111,12 +135,13 @@ export const initAuth = async (oldToken: string | null | undefined = null) => {
 				},
 				true,
 			)) as Labrinth.Users.v2.User
-		} catch {
-			/* empty */
+		} catch (error) {
+			// only refresh when the token was rejected. not on timeouts or other errors (think this was the cause of random logouts)
+			shouldRefresh = isAuthFailure(error)
 		}
 	}
 
-	if (!auth.user && auth.token) {
+	if (!auth.user && auth.token && shouldRefresh) {
 		try {
 			const session = (await useBaseFetch(
 				'session/refresh',
@@ -132,22 +157,29 @@ export const initAuth = async (oldToken: string | null | undefined = null) => {
 			auth.token = normalizeAuthToken(session.session)
 			if (auth.token) {
 				authCookie.value = auth.token
-				auth.user = (await useBaseFetch(
-					'user',
-					{
-						apiVersion: 3,
-						headers: {
-							Authorization: auth.token,
+				try {
+					auth.user = (await useBaseFetch(
+						'user',
+						{
+							apiVersion: 3,
+							headers: {
+								Authorization: auth.token,
+							},
 						},
-					},
-					true,
-				)) as Labrinth.Users.v2.User
+						true,
+					)) as Labrinth.Users.v2.User
+				} catch (error) {
+					if (isAuthFailure(error)) {
+						clearAuthCookie(auth, authCookie)
+					}
+				}
 			} else {
-				authCookie.value = null
-				auth.token = ''
+				clearAuthCookie(auth, authCookie)
+			}
+		} catch (error) {
+			if (isAuthFailure(error)) {
+				clearAuthCookie(auth, authCookie)
 			}
-		} catch {
-			authCookie.value = null
 		}
 	}
 

From 65a3ac4b34c14e44c9f351c40f92466714cdd1fe Mon Sep 17 00:00:00 2001
From: Prospector <6166773+Prospector@users.noreply.github.com>
Date: Thu, 30 Jul 2026 23:10:28 -0700
Subject: [PATCH 06/82] changelog

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

diff --git a/packages/blog/changelog.ts b/packages/blog/changelog.ts
index bba5af2d91..979ffff830 100644
--- a/packages/blog/changelog.ts
+++ b/packages/blog/changelog.ts
@@ -10,6 +10,12 @@ export type VersionEntry = {
 }
 
 const VERSIONS: VersionEntry[] = [
+	{
+		date: `2026-07-31T06:10:23+00:00`,
+		product: 'web',
+		body: `## Fixed
+- Fixed randomly getting signed out of Modrinth account due to random non-auth related errors.`,
+	},
 	{
 		date: `2026-07-29T21:32:06+00:00`,
 		product: 'app',

From 18b0b2848d688dfed2fee94a71ec8aabe5e4a824 Mon Sep 17 00:00:00 2001
From: "Michael H." <michael@iptables.sh>
Date: Fri, 31 Jul 2026 13:10:58 +0200
Subject: [PATCH 07/82] feat: labrinth argo

---
 .github/workflows/cmd-deploy.yml              | 19 +++++
 ...labrinth-docker.yml => labrinth-build.yml} | 69 ++++++++-----------
 .github/workflows/slash-cmds.yml              | 18 +++++
 apps/labrinth/Dockerfile                      |  2 +-
 4 files changed, 67 insertions(+), 41 deletions(-)
 create mode 100644 .github/workflows/cmd-deploy.yml
 rename .github/workflows/{labrinth-docker.yml => labrinth-build.yml} (66%)
 create mode 100644 .github/workflows/slash-cmds.yml

diff --git a/.github/workflows/cmd-deploy.yml b/.github/workflows/cmd-deploy.yml
new file mode 100644
index 0000000000..010359a2e2
--- /dev/null
+++ b/.github/workflows/cmd-deploy.yml
@@ -0,0 +1,19 @@
+name: Deploy Command
+run-name: Deploy PR #${{ github.event.client_payload.github.payload.issue.number }}
+
+on:
+  repository_dispatch:
+    types: [deploy-command]
+
+jobs:
+  deploy:
+    uses: SparkUniverse/workflows/.github/workflows/deploy-command.yaml@main
+    secrets:
+      ARGOCD_DEPLOY_KEY: ${{ secrets.ARGOCD_DEPLOY_KEY }}
+      CMD_DISPATCH_GH_TOKEN: ${{ secrets.SLASH_CMD_GH_TOKEN }}
+    with:
+      application-set: labrinth
+      build-workflow: labrinth-build.yml
+      branch: ${{ github.event.client_payload.pull_request.head.ref }}
+      issue-number: ${{ github.event.client_payload.github.payload.issue.number }}
+      head-sha: ${{ github.event.client_payload.pull_request.head.sha }}
diff --git a/.github/workflows/labrinth-docker.yml b/.github/workflows/labrinth-build.yml
similarity index 66%
rename from .github/workflows/labrinth-docker.yml
rename to .github/workflows/labrinth-build.yml
index ce8d8effae..5aba8298a3 100644
--- a/.github/workflows/labrinth-docker.yml
+++ b/.github/workflows/labrinth-build.yml
@@ -1,18 +1,18 @@
-name: docker-build
+name: Labrinth Build
 
 on:
   push:
     branches:
       - 'main'
     paths:
-      - .github/workflows/labrinth-docker.yml
+      - .github/workflows/labrinth-build.yml
       - 'apps/labrinth/**'
       - Cargo.toml
       - Cargo.lock
   pull_request:
     types: [opened, synchronize]
     paths:
-      - .github/workflows/labrinth-docker.yml
+      - .github/workflows/labrinth-build.yml
       - 'apps/labrinth/**'
       - Cargo.toml
       - Cargo.lock
@@ -69,7 +69,8 @@ jobs:
             echo "skip=false" >> $GITHUB_OUTPUT
           fi
 
-  docker:
+  build:
+    name: Build Labrinth
     runs-on: ${{ needs.skip-if-clean.outputs.internal == 'true' && 'namespace-profile-modrinth-labrinth' || 'ubuntu-latest' }}
     needs: [skip-if-clean]
     if: ${{ needs.skip-if-clean.outputs.skip != 'true' }}
@@ -120,42 +121,30 @@ jobs:
           cp -r apps/labrinth/migrations apps/labrinth/docker-stage/migrations
           cp -r apps/labrinth/assets apps/labrinth/docker-stage/assets
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0
-
-      - name: Generate Docker image metadata
-        id: docker-meta
-        uses: docker/metadata-action@dc802804100637a589fabce1cb79ff13a1411302 # v6.2.0
-        env:
-          # GitHub Packages requires annotations metadata in at least the index descriptor to show them
-          # up properly in its UI it seems, but it's not clear about it, because the docs refer to the
-          # image manifest only. See:
-          # https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-container-registry#adding-a-description-to-multi-arch-images
-          DOCKER_METADATA_ANNOTATIONS_LEVELS: manifest,index
+      - name: Upload Docker context
+        if: needs.skip-if-clean.outputs.internal == 'true'
+        uses: namespace-actions/upload-artifact@f6ccaacc655aec41b93af180d1d7eef21af862d2 # v1.0.3
         with:
-          images: ghcr.io/modrinth/labrinth
-          labels: |
-            org.opencontainers.image.title=labrinth
-            org.opencontainers.image.description=Modrinth API
-            org.opencontainers.image.licenses=AGPL-3.0-only
-          annotations: |
-            org.opencontainers.image.title=labrinth
-            org.opencontainers.image.description=Modrinth API
-            org.opencontainers.image.licenses=AGPL-3.0-only
+          name: labrinth-docker-context
+          retention-days: 1
+          path: apps/labrinth/docker-stage
 
-      - name: Login to GitHub Packages
-        uses: docker/login-action@abd2ef45e78c5afb21d64d4ca52ee8550d9572c7 # v4.5.1
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+  docker-build:
+    needs: [skip-if-clean, build]
+    if: ${{ needs.skip-if-clean.outputs.internal == 'true' }}
+    uses: SparkUniverse/workflows/.github/workflows/docker-build.yaml@main
+    with:
+      image-name: labrinth
+      dockerfile-path: apps/labrinth/Dockerfile
+      artifacts-name: labrinth-docker-context
 
-      - name: Build and push
-        uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7.3.0
-        with:
-          context: ./apps/labrinth/docker-stage
-          file: ./apps/labrinth/Dockerfile
-          push: true
-          tags: ${{ steps.docker-meta.outputs.tags }}
-          labels: ${{ steps.docker-meta.outputs.labels }}
-          annotations: ${{ steps.docker-meta.outputs.annotations }}
+  deploy:
+    needs: docker-build
+    if: ${{ github.ref == 'refs/heads/main' || github.ref == 'refs/heads/prod' }}
+    uses: SparkUniverse/workflows/.github/workflows/argo-update.yaml@main
+    secrets:
+      ARGOCD_DEPLOY_KEY: ${{ secrets.ARGOCD_DEPLOY_KEY }}
+    with:
+      application-set: labrinth
+      branch: ${{ github.ref == 'refs/heads/prod' && 'main' || 'develop' }}
+      environment-name: ${{ github.ref == 'refs/heads/prod' && 'production' || 'staging' }}
diff --git a/.github/workflows/slash-cmds.yml b/.github/workflows/slash-cmds.yml
new file mode 100644
index 0000000000..65a6d8df2e
--- /dev/null
+++ b/.github/workflows/slash-cmds.yml
@@ -0,0 +1,18 @@
+name: Slash Command Dispatch
+
+on:
+  issue_comment:
+    types: [created]
+
+jobs:
+  dispatch-command:
+    if: ${{ github.event.sender.type == 'User' && contains(fromJSON('["OWNER", "MEMBER"]'), github.event.comment.author_association) }}
+    runs-on: namespace-profile-tiny-arm64
+    steps:
+      - name: Slash Command Dispatch
+        uses: peter-evans/slash-command-dispatch@9bdcd7914ec1b75590b790b844aa3b8eee7c683a # v5.0.2
+        with:
+          token: ${{ secrets.SLASH_CMD_GH_TOKEN }}
+          issue-type: pull-request
+          commands: |
+            deploy
diff --git a/apps/labrinth/Dockerfile b/apps/labrinth/Dockerfile
index 328c4137d4..6d2923265c 100644
--- a/apps/labrinth/Dockerfile
+++ b/apps/labrinth/Dockerfile
@@ -11,7 +11,7 @@ RUN apt-get update \
 	&& apt-get install -y --no-install-recommends ca-certificates dumb-init curl \
 	&& rm -rf /var/lib/apt/lists/*
 
-COPY labrinth /labrinth/labrinth
+COPY --chmod=0755 labrinth /labrinth/labrinth
 COPY migrations /labrinth/migrations
 COPY assets /labrinth/assets
 

From 919b235621efce7278192c09f503f158ab19db43 Mon Sep 17 00:00:00 2001
From: "Michael H." <michael@iptables.sh>
Date: Fri, 31 Jul 2026 13:17:26 +0200
Subject: [PATCH 08/82] chore: address action issues

---
 .github/merge-queue-ci-skipper/action.yml | 32 +++++++++++++++--------
 .github/workflows/cmd-deploy.yml          |  4 +++
 .github/workflows/slash-cmds.yml          |  2 ++
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/.github/merge-queue-ci-skipper/action.yml b/.github/merge-queue-ci-skipper/action.yml
index 3a2474a6dd..18783bb80e 100644
--- a/.github/merge-queue-ci-skipper/action.yml
+++ b/.github/merge-queue-ci-skipper/action.yml
@@ -34,13 +34,13 @@ runs:
   using: 'composite'
   steps:
     - name: Checkout code
-      uses: actions/checkout@v4
+      uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
       with:
         fetch-depth: 0
 
     - name: Extract PR Number and Commit ID
       id: extract-pr-info
-      uses: actions/github-script@v7
+      uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7.1.0
       with:
         script: |
           const githubRef = process.env.GITHUB_REF;
@@ -90,20 +90,26 @@ runs:
     - name: Print PR Branch
       if: env.CAN_SKIP_CHECKS != 'false'
       shell: bash
+      env:
+        PR_BRANCH: ${{ steps.get-pr-branch.outputs.prBranch }}
       run: |
-        echo "PR Branch: ${{ steps.get-pr-branch.outputs.prBranch }}"
+        echo "PR Branch: $PR_BRANCH"
 
     - name: Check if PR branch contains the Merge Queue target commit ID
       if: env.CAN_SKIP_CHECKS != 'false'
       shell: bash
+      env:
+        PR_BRANCH: ${{ steps.get-pr-branch.outputs.prBranch }}
+        COMMIT_ID: ${{ steps.extract-pr-info.outputs.commitId }}
+        TARGET_BRANCH: ${{ steps.extract-pr-info.outputs.targetBranchName }}
       run: |
         # Get the branch name from previous steps
-        branch_name="origin/${{ steps.get-pr-branch.outputs.prBranch }}"
-        commit_id="${{ steps.extract-pr-info.outputs.commitId }}"
+        branch_name="origin/$PR_BRANCH"
+        commit_id="$COMMIT_ID"
 
         # Check if the branch history contains the commit
-        if git branch -r --contains "$commit_id" | grep -q "$branch_name"; then
-          echo "Branch '$branch_name' contains commit '$commit_id'. It is up to date with ${{ steps.extract-pr-info.outputs.targetBranchName }}."
+        if git branch -r --contains "$commit_id" | grep -qF "$branch_name"; then
+          echo "Branch '$branch_name' contains commit '$commit_id'. It is up to date with $TARGET_BRANCH."
         else
           echo "Branch '$branch_name' does not contain commit '$commit_id'. It is outdated. Setting CAN_SKIP_CHECKS to false."
           echo "CAN_SKIP_CHECKS=false" >> "$GITHUB_ENV"
@@ -112,8 +118,10 @@ runs:
     - name: Compare PR Branch with Current Branch
       if: env.CAN_SKIP_CHECKS != 'false'
       shell: bash
+      env:
+        PR_BRANCH: ${{ steps.get-pr-branch.outputs.prBranch }}
       run: |
-        if git diff --quiet "origin/${{ steps.get-pr-branch.outputs.prBranch }}"; then
+        if git diff --quiet "origin/$PR_BRANCH"; then
           echo "No differences found. PR branch is identical with this merge queue branch."
         else
           echo "Differences detected. PR branch has been updated after PR was added to merge queue. Setting CAN_SKIP_CHECKS to false."
@@ -122,9 +130,11 @@ runs:
 
     - name: Compute/publish skip result
       id: passed-checks
-      uses: actions/github-script@v7
+      uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7.1.0
       env:
         SECRET: ${{ inputs.secret }}
+        PR_BRANCH: ${{ steps.get-pr-branch.outputs.prBranch }}
+        TARGET_BRANCH: ${{ steps.extract-pr-info.outputs.targetBranchName }}
       with:
         github-token: ${{ inputs.secret != '' && inputs.secret || github.token }}
         script: |
@@ -144,7 +154,7 @@ runs:
           const { data: branchProtection } = await github.rest.repos.getBranchProtection({
             owner: context.repo.owner,
             repo: context.repo.repo,
-            branch: "${{ steps.extract-pr-info.outputs.targetBranchName }}",
+            branch: process.env.TARGET_BRANCH,
           });
           const requiredCheckNames = branchProtection.required_status_checks.contexts;
           console.log(`requiredCheckNames = ${requiredCheckNames}`);
@@ -152,7 +162,7 @@ runs:
           const { data: checks } = await github.rest.checks.listForRef({
             owner: context.repo.owner,
             repo: context.repo.repo,
-            ref: "refs/heads/${{ steps.get-pr-branch.outputs.prBranch }}",
+            ref: `refs/heads/${process.env.PR_BRANCH}`,
           });
 
           console.log(`checks.check_runs = ${checks.check_runs.map(check => `${check.status},${check.conclusion},${check.name};`)}`);
diff --git a/.github/workflows/cmd-deploy.yml b/.github/workflows/cmd-deploy.yml
index 010359a2e2..bde79ac0f1 100644
--- a/.github/workflows/cmd-deploy.yml
+++ b/.github/workflows/cmd-deploy.yml
@@ -5,6 +5,10 @@ on:
   repository_dispatch:
     types: [deploy-command]
 
+permissions:
+  contents: read
+  actions: read
+
 jobs:
   deploy:
     uses: SparkUniverse/workflows/.github/workflows/deploy-command.yaml@main
diff --git a/.github/workflows/slash-cmds.yml b/.github/workflows/slash-cmds.yml
index 65a6d8df2e..e35babeddf 100644
--- a/.github/workflows/slash-cmds.yml
+++ b/.github/workflows/slash-cmds.yml
@@ -4,6 +4,8 @@ on:
   issue_comment:
     types: [created]
 
+permissions: {}
+
 jobs:
   dispatch-command:
     if: ${{ github.event.sender.type == 'User' && contains(fromJSON('["OWNER", "MEMBER"]'), github.event.comment.author_association) }}

From a53c9c3771bb44ce65e24515c5df890f97ac3963 Mon Sep 17 00:00:00 2001
From: "Michael H." <michael@iptables.sh>
Date: Fri, 31 Jul 2026 13:21:35 +0200
Subject: [PATCH 09/82] fix: only deploy if internal

---
 .github/workflows/cmd-deploy.yml     | 1 +
 .github/workflows/labrinth-build.yml | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cmd-deploy.yml b/.github/workflows/cmd-deploy.yml
index bde79ac0f1..182f2bd5aa 100644
--- a/.github/workflows/cmd-deploy.yml
+++ b/.github/workflows/cmd-deploy.yml
@@ -11,6 +11,7 @@ permissions:
 
 jobs:
   deploy:
+    if: ${{ github.event.client_payload.pull_request.head.repo.full_name == github.repository }}
     uses: SparkUniverse/workflows/.github/workflows/deploy-command.yaml@main
     secrets:
       ARGOCD_DEPLOY_KEY: ${{ secrets.ARGOCD_DEPLOY_KEY }}
diff --git a/.github/workflows/labrinth-build.yml b/.github/workflows/labrinth-build.yml
index 5aba8298a3..966ec16f80 100644
--- a/.github/workflows/labrinth-build.yml
+++ b/.github/workflows/labrinth-build.yml
@@ -139,8 +139,8 @@ jobs:
       artifacts-name: labrinth-docker-context
 
   deploy:
-    needs: docker-build
-    if: ${{ github.ref == 'refs/heads/main' || github.ref == 'refs/heads/prod' }}
+    needs: [skip-if-clean, docker-build]
+    if: ${{ needs.skip-if-clean.outputs.internal == 'true' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/prod') }}
     uses: SparkUniverse/workflows/.github/workflows/argo-update.yaml@main
     secrets:
       ARGOCD_DEPLOY_KEY: ${{ secrets.ARGOCD_DEPLOY_KEY }}

From 8b753a52ad5ca2a820bc4189e207728e405d7870 Mon Sep 17 00:00:00 2001
From: "Michael H." <michael@iptables.sh>
Date: Fri, 31 Jul 2026 14:45:16 +0200
Subject: [PATCH 10/82] fix: build labrinth on prod again

---
 .github/workflows/labrinth-build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/labrinth-build.yml b/.github/workflows/labrinth-build.yml
index 966ec16f80..5fdc1ce080 100644
--- a/.github/workflows/labrinth-build.yml
+++ b/.github/workflows/labrinth-build.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - 'main'
+      - 'prod'
     paths:
       - .github/workflows/labrinth-build.yml
       - 'apps/labrinth/**'

From 1e49d7da7a141e5d9e5790e0264003824b56705c Mon Sep 17 00:00:00 2001
From: ThatGravyBoat <gravy@thatgravyboat.tech>
Date: Sun, 2 Aug 2026 19:53:03 -0230
Subject: [PATCH 11/82] fix: missing auth providers in account details (#6965)

* fix: missing auth providers in account details

This was missing due to a bad merge in #6889 not merging in #6897 correctly

* chore: run intl:extract
---
 .../layouts/shared/user-profile/layout.vue    | 112 +++++++++++++++++-
 packages/ui/src/locales/en-US/index.json      |  15 +++
 2 files changed, 125 insertions(+), 2 deletions(-)

diff --git a/packages/ui/src/layouts/shared/user-profile/layout.vue b/packages/ui/src/layouts/shared/user-profile/layout.vue
index be4f1644b9..9c3b008a6b 100644
--- a/packages/ui/src/layouts/shared/user-profile/layout.vue
+++ b/packages/ui/src/layouts/shared/user-profile/layout.vue
@@ -111,7 +111,33 @@
 					<span class="text-lg font-bold text-primary">
 						{{ formatMessage(messages.authProvidersLabel) }}
 					</span>
-					<span>{{ user.auth_providers?.join(', ') || '—' }}</span>
+					<ul class="flex flex-col gap-1 pl-4 leading-normal m-0">
+						<li v-for="provider in user.auth_providers ?? []" :key="provider">
+							<span>{{ authProviderNames[provider] ?? provider }}</span>
+							<span v-if="provider === 'discord' && user.discord_id" class="ml-1">
+								({{ user.discord_id }})
+							</span>
+							<template v-else-if="provider === 'github' && user.github_id">
+								<span class="ml-1">(</span>
+								<button
+									type="button"
+									class="m-0 appearance-none border-0 bg-transparent p-0 font-[inherit] text-link disabled:cursor-wait disabled:opacity-70"
+									:disabled="isLoadingGithubProfile"
+									@click="openGithubProfile"
+								>
+									{{
+										isLoadingGithubProfile
+											? formatMessage(messages.loadingGithubProfileLabel)
+											: formatMessage(messages.viewGithubProfileLabel)
+									}}
+								</button>
+								<span>)</span>
+							</template>
+							<span v-else-if="provider === 'steam' && user.steam_id" class="ml-1">
+								({{ user.steam_id }})
+							</span>
+						</li>
+					</ul>
 				</div>
 
 				<div v-if="isAdminViewing" class="flex flex-col gap-1">
@@ -460,7 +486,13 @@ import ProjectCardList from '#ui/components/project/ProjectCardList.vue'
 import UserBadges from '#ui/components/user/UserBadges.vue'
 import UserPageHeader from '#ui/components/user/UserPageHeader.vue'
 import { defineMessages, useVIntl } from '#ui/composables'
-import { injectAuth, injectNotificationManager, injectPageContext, injectTags } from '#ui/providers'
+import {
+	injectAuth,
+	injectModrinthClient,
+	injectNotificationManager,
+	injectPageContext,
+	injectTags,
+} from '#ui/providers'
 import { commonMessages, getProjectTypeTitleMessage } from '#ui/utils'
 
 import { blockedUsersQueryKey, injectUserProfile } from './providers'
@@ -520,6 +552,7 @@ const auth = injectAuth()
 const tags = injectTags(null)
 const pageContext = injectPageContext()
 const notificationManager = injectNotificationManager()
+const client = injectModrinthClient()
 const queryClient = useQueryClient()
 const route = useRoute()
 const router = useRouter()
@@ -567,6 +600,26 @@ const messages = defineMessages({
 		id: 'profile.details.label.auth-providers',
 		defaultMessage: 'Auth providers',
 	},
+	viewGithubProfileLabel: {
+		id: 'profile.details.label.view-github-profile',
+		defaultMessage: 'View profile',
+	},
+	loadingGithubProfileLabel: {
+		id: 'profile.details.label.loading-github-profile',
+		defaultMessage: 'Loading...',
+	},
+	githubProfileErrorTitle: {
+		id: 'profile.details.error.github-profile-title',
+		defaultMessage: 'Unable to open GitHub profile',
+	},
+	githubProfileErrorMessage: {
+		id: 'profile.details.error.github-profile-message',
+		defaultMessage: 'The GitHub profile could not be retrieved. Please try again.',
+	},
+	githubPopupBlockedMessage: {
+		id: 'profile.details.error.github-popup-blocked',
+		defaultMessage: 'Allow pop-ups for Modrinth, then try again.',
+	},
 	paymentMethodsLabel: {
 		id: 'profile.details.label.payment-methods',
 		defaultMessage: 'Payment methods',
@@ -853,6 +906,17 @@ const showCollectionsEmptyState = computed(
 const normalizedSiteUrl = computed(() => props.siteUrl.replace(/\/$/, ''))
 const editProfileLink = computed(() => props.editProfileLink ?? linkTarget('/settings/profile'))
 
+const authProviderNames = {
+	github: 'GitHub',
+	discord: 'Discord',
+	microsoft: 'Microsoft',
+	gitlab: 'GitLab',
+	google: 'Google',
+	steam: 'Steam',
+	paypal: 'PayPal',
+}
+const isLoadingGithubProfile = ref(false)
+
 function externalUrl(path: string): string {
 	return `${normalizedSiteUrl.value}${path.startsWith('/') ? path : `/${path}`}`
 }
@@ -896,6 +960,50 @@ async function copyPermalink(): Promise<void> {
 	}
 }
 
+async function openGithubProfile() {
+	const githubId = user.value?.github_id
+	if (!githubId || isLoadingGithubProfile.value) return
+
+	const profileWindow = window.open('about:blank', '_blank')
+	if (!profileWindow) {
+		notificationManager.addNotification({
+			type: 'error',
+			title: formatMessage(messages.githubProfileErrorTitle),
+			text: formatMessage(messages.githubPopupBlockedMessage),
+		})
+		return
+	}
+
+	profileWindow.opener = null
+	isLoadingGithubProfile.value = true
+
+	try {
+		const githubUser = await client.request<{ login?: string }>(`/${githubId}`, {
+			api: 'https://api.github.com',
+			version: 'user',
+			method: 'GET',
+			headers: { 'Content-Type': '' },
+			skipAuth: true,
+		})
+
+		if (!githubUser?.login) {
+			throw new Error('GitHub user response did not include a login')
+		}
+
+		profileWindow.location.replace(`https://github.com/${encodeURIComponent(githubUser.login)}`)
+	} catch (error) {
+		profileWindow.close()
+		console.error('Failed to retrieve GitHub profile:', error)
+		notificationManager.addNotification({
+			type: 'error',
+			title: formatMessage(messages.githubProfileErrorTitle),
+			text: formatMessage(messages.githubProfileErrorMessage),
+		})
+	} finally {
+		isLoadingGithubProfile.value = false
+	}
+}
+
 function reportProfile(): void {
 	if (!user.value) return
 	const reportPath = `/report?item=user&itemID=${encodeURIComponent(user.value.id)}`
diff --git a/packages/ui/src/locales/en-US/index.json b/packages/ui/src/locales/en-US/index.json
index e1c3941001..f842c47c3d 100644
--- a/packages/ui/src/locales/en-US/index.json
+++ b/packages/ui/src/locales/en-US/index.json
@@ -2921,6 +2921,15 @@
   "profile.collection.projects-count": {
     "defaultMessage": "{count, plural, one {# project} other {# projects}}"
   },
+  "profile.details.error.github-popup-blocked": {
+    "defaultMessage": "Allow pop-ups for Modrinth, then try again."
+  },
+  "profile.details.error.github-profile-message": {
+    "defaultMessage": "The GitHub profile could not be retrieved. Please try again."
+  },
+  "profile.details.error.github-profile-title": {
+    "defaultMessage": "Unable to open GitHub profile"
+  },
   "profile.details.label.auth-providers": {
     "defaultMessage": "Auth providers"
   },
@@ -2933,9 +2942,15 @@
   "profile.details.label.has-totp": {
     "defaultMessage": "Has TOTP"
   },
+  "profile.details.label.loading-github-profile": {
+    "defaultMessage": "Loading..."
+  },
   "profile.details.label.payment-methods": {
     "defaultMessage": "Payment methods"
   },
+  "profile.details.label.view-github-profile": {
+    "defaultMessage": "View profile"
+  },
   "profile.details.title": {
     "defaultMessage": "User details"
   },

From ae13d37edc2487fd0ebfd0f9c9aa096a63a99386 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?coco=20=F0=9F=90=BE?=
 <44563370+cocoelacanth@users.noreply.github.com>
Date: Sun, 2 Aug 2026 16:49:19 -0700
Subject: [PATCH 12/82] docs: corrections to GetLatestVersionFromHash and
 GetLatestVersionsFromHashes documentation (#6966)

correct version_files documentation
---
 apps/docs/public/openapi.yaml | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/apps/docs/public/openapi.yaml b/apps/docs/public/openapi.yaml
index be4c40ede2..0e098712ea 100644
--- a/apps/docs/public/openapi.yaml
+++ b/apps/docs/public/openapi.yaml
@@ -563,12 +563,18 @@ components:
           type: array
           items:
             type: string
-            example: [fabric]
+          example: [fabric]
         game_versions:
           type: array
           items:
             type: string
           example: ['1.18', 1.18.1]
+        version_types:
+          type: array
+          items:
+            type: string
+          enum: [release, alpha, beta]
+          example: [release]
       required:
         - loaders
         - game_versions
@@ -612,6 +618,12 @@ components:
               items:
                 type: string
               example: ['1.18', 1.18.1]
+            version_types:
+              type: array
+              items:
+                type: string
+              enum: [release, alpha, beta]
+              example: [release]
           required:
             - loaders
             - game_versions
@@ -2865,7 +2877,7 @@ paths:
               $ref: '#/components/schemas/HashList'
   /version_files/update:
     post:
-      summary: Latest versions of multiple project from hashes, loader(s), and game version(s)
+      summary: Latest versions of multiple projects from hashes, loader(s), and game version(s)
       description: This is the same as [`/version_file/{hash}/update`](#operation/getLatestVersionFromHash) except it accepts multiple hashes.
       operationId: getLatestVersionsFromHashes
       tags:

From 779edf03337114da11a2521776bbf364f4f51848 Mon Sep 17 00:00:00 2001
From: Prospector <6166773+Prospector@users.noreply.github.com>
Date: Mon, 3 Aug 2026 00:00:54 -0700
Subject: [PATCH 13/82] Fix server ping race condition before protocol version
 is available (#6935)

* fix race condition with server ping lookup before protocol resolved

* fix refresh button on worlds page
---
 apps/app-frontend/src/helpers/worlds.ts       | 16 ++++--
 .../app-frontend/src/locales/en-US/index.json |  3 ++
 .../src/pages/instance/Worlds.vue             | 54 ++++++++++++++++---
 3 files changed, 62 insertions(+), 11 deletions(-)

diff --git a/apps/app-frontend/src/helpers/worlds.ts b/apps/app-frontend/src/helpers/worlds.ts
index 3b5285f51b..5eb3385497 100644
--- a/apps/app-frontend/src/helpers/worlds.ts
+++ b/apps/app-frontend/src/helpers/worlds.ts
@@ -435,11 +435,12 @@ export async function refreshServerData(
 	}
 }
 
-export function refreshServers(
+export async function refreshServers(
 	worlds: World[],
 	serverData: Record<string, ServerData>,
 	protocolVersion: ProtocolVersion | null,
-) {
+	ping = true,
+): Promise<void> {
 	const servers = worlds.filter(isServerWorld)
 	servers.forEach((server) => {
 		if (!serverData[server.address]) {
@@ -451,9 +452,14 @@ export function refreshServers(
 		}
 	})
 
-	// noinspection ES6MissingAwait - handled by refreshServerData
-	Object.keys(serverData).forEach((address) =>
-		refreshServerData(serverData[address], protocolVersion, address),
+	if (!ping) {
+		return
+	}
+
+	await Promise.all(
+		Object.keys(serverData).map((address) =>
+			refreshServerData(serverData[address], protocolVersion, address),
+		),
 	)
 }
 
diff --git a/apps/app-frontend/src/locales/en-US/index.json b/apps/app-frontend/src/locales/en-US/index.json
index 91ff2a64ff..475e1027ca 100644
--- a/apps/app-frontend/src/locales/en-US/index.json
+++ b/apps/app-frontend/src/locales/en-US/index.json
@@ -590,6 +590,9 @@
   "app.instance.worlds.no-worlds-heading": {
     "message": "No servers or worlds added"
   },
+  "app.instance.worlds.refreshing": {
+    "message": "Refreshing..."
+  },
   "app.instance.worlds.remove-server-modal.remove-button": {
     "message": "Remove server"
   },
diff --git a/apps/app-frontend/src/pages/instance/Worlds.vue b/apps/app-frontend/src/pages/instance/Worlds.vue
index 1ddcb5e943..4a5bd6192d 100644
--- a/apps/app-frontend/src/pages/instance/Worlds.vue
+++ b/apps/app-frontend/src/pages/instance/Worlds.vue
@@ -75,7 +75,11 @@
 				<ButtonStyled type="transparent" hover-color-fill="none">
 					<button :disabled="refreshingAll" @click="refreshAllWorlds">
 						<RefreshCwIcon :class="refreshingAll ? 'animate-spin' : ''" />
-						{{ formatMessage(commonMessages.refreshButton) }}
+						{{
+							formatMessage(
+								refreshingAll ? messages.refreshingButton : commonMessages.refreshButton,
+							)
+						}}
 					</button>
 				</ButtonStyled>
 			</div>
@@ -242,6 +246,10 @@ const messages = defineMessages({
 		id: 'app.instance.worlds.filter-offline',
 		defaultMessage: 'Offline',
 	},
+	refreshingButton: {
+		id: 'app.instance.worlds.refreshing',
+		defaultMessage: 'Refreshing...',
+	},
 })
 
 const { formatMessage } = useVIntl()
@@ -328,7 +336,7 @@ const isLinux = platform() === 'linux'
 const linuxRefreshCount = ref(0)
 
 const protocolVersion = ref<ProtocolVersion | null>(null)
-
+const protocolVersionReady = ref(false)
 const gameVersions = ref<GameVersion[]>([])
 const supportsServerQuickPlay = computed(() =>
 	hasServerQuickPlaySupport(gameVersions.value, instance.value.game_version),
@@ -342,8 +350,16 @@ watch(
 	(data) => {
 		if (data) {
 			worlds.value = [...data]
-			refreshServers(worlds.value, serverData.value, protocolVersion.value)
 			hadNoWorlds.value = worlds.value.length === 0
+			// Manual refresh handles its own server pings to avoid double-pinging
+			if (!refreshingAll.value) {
+				void refreshServers(
+					worlds.value,
+					serverData.value,
+					protocolVersion.value,
+					protocolVersionReady.value,
+				)
+			}
 		}
 	},
 	{ immediate: true },
@@ -443,9 +459,14 @@ async function initWorldsTab() {
 	unlistenInstance = _unlistenInstance
 	protocolVersion.value = resolvedProtocolVersion
 	gameVersions.value = resolvedGameVersions
+	protocolVersionReady.value = true
+
+	if (worlds.value.length > 0) {
+		refreshServers(worlds.value, serverData.value, protocolVersion.value)
+	}
 }
 
-await initWorldsTab()
+void initWorldsTab()
 
 async function refreshServer(address: string) {
 	if (!serverData.value[address]) {
@@ -453,6 +474,7 @@ async function refreshServer(address: string) {
 			refreshing: true,
 		}
 	}
+	if (!protocolVersionReady.value) return
 	await refreshServerData(serverData.value[address], protocolVersion.value, address)
 }
 
@@ -463,8 +485,28 @@ async function refreshAllWorlds() {
 	}
 
 	refreshingAll.value = true
-	await queryClient.invalidateQueries({ queryKey: ['worlds', instance.value.id] })
-	refreshingAll.value = false
+	try {
+		// Show loading on server rows immediately while the list refreshes
+		for (const world of worlds.value) {
+			if (world.type === 'server') {
+				if (!serverData.value[world.address]) {
+					serverData.value[world.address] = { refreshing: true }
+				} else {
+					serverData.value[world.address].refreshing = true
+				}
+			}
+		}
+
+		await queryClient.invalidateQueries({ queryKey: ['worlds', instance.value.id] })
+		await refreshServers(
+			worlds.value,
+			serverData.value,
+			protocolVersion.value,
+			protocolVersionReady.value,
+		)
+	} finally {
+		refreshingAll.value = false
+	}
 }
 
 async function addServer(server: ServerWorld) {

From 2e43f6a42bd10cbc31cc3ccc704e2b11674b4ef3 Mon Sep 17 00:00:00 2001
From: Prospector <6166773+Prospector@users.noreply.github.com>
Date: Mon, 3 Aug 2026 00:03:45 -0700
Subject: [PATCH 14/82] collapse offline friends by default, save collapse
 value (#6937)

---
 .../src/components/ui/friends/FriendsList.vue | 38 +++++++++++++++++--
 .../components/ui/friends/FriendsSection.vue  |  7 ++++
 apps/app-frontend/src/store/theme.ts          |  4 ++
 packages/app-lib/src/state/settings.rs        |  4 ++
 4 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/apps/app-frontend/src/components/ui/friends/FriendsList.vue b/apps/app-frontend/src/components/ui/friends/FriendsList.vue
index 71c8c1c8fe..1b954325ac 100644
--- a/apps/app-frontend/src/components/ui/friends/FriendsList.vue
+++ b/apps/app-frontend/src/components/ui/friends/FriendsList.vue
@@ -17,17 +17,40 @@ import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
 import { useFriends } from '@/composables/use-friends'
 import type { FriendWithUserData } from '@/helpers/friends.ts'
 import type { ModrinthCredentials } from '@/helpers/mr_auth'
+import { get as getSettings, set as setSettings } from '@/helpers/settings.ts'
+import { useTheming } from '@/store/state'
 
 const { formatMessage } = useVIntl()
 
 const { handleError } = injectNotificationManager()
 const formatRelativeTime = useRelativeTime()
+const themeStore = useTheming()
 
 const props = defineProps<{
 	credentials: ModrinthCredentials | null
 	signIn: () => void
 }>()
 
+type FriendsSectionCollapsedFlag =
+	| 'friends_active_collapsed'
+	| 'friends_online_collapsed'
+	| 'friends_offline_collapsed'
+	| 'friends_pending_collapsed'
+
+function isFriendsSectionCollapsed(flag: FriendsSectionCollapsedFlag) {
+	return themeStore.getFeatureFlag(flag)
+}
+
+function setFriendsSectionCollapsed(flag: FriendsSectionCollapsedFlag, collapsed: boolean) {
+	themeStore.featureFlags[flag] = collapsed
+	getSettings()
+		.then((settings) => {
+			settings.feature_flags[flag] = collapsed
+			return setSettings(settings)
+		})
+		.catch(handleError)
+}
+
 const userCredentials = computed(() => props.credentials)
 const {
 	friends: userFriends,
@@ -331,33 +354,42 @@ const messages = defineMessages({
 			<FriendsSection
 				v-if="activeFriends.length > 0"
 				:is-searching="!!search"
-				open-by-default
+				:open-by-default="!isFriendsSectionCollapsed('friends_active_collapsed')"
 				:friends="activeFriends"
 				:heading="formatMessage(messages.active)"
 				:remove-friend="removeFriend"
+				@on-open="setFriendsSectionCollapsed('friends_active_collapsed', false)"
+				@on-close="setFriendsSectionCollapsed('friends_active_collapsed', true)"
 			/>
 			<FriendsSection
 				v-if="onlineFriends.length > 0"
 				:is-searching="!!search"
-				open-by-default
+				:open-by-default="!isFriendsSectionCollapsed('friends_online_collapsed')"
 				:friends="onlineFriends"
 				:heading="formatMessage(messages.online)"
 				:remove-friend="removeFriend"
+				@on-open="setFriendsSectionCollapsed('friends_online_collapsed', false)"
+				@on-close="setFriendsSectionCollapsed('friends_online_collapsed', true)"
 			/>
 			<FriendsSection
 				v-if="offlineFriends.length > 0"
 				:is-searching="!!search"
-				:open-by-default="activeFriends.length + onlineFriends.length < 3"
+				:open-by-default="!isFriendsSectionCollapsed('friends_offline_collapsed')"
 				:friends="offlineFriends"
 				:heading="formatMessage(messages.offline)"
 				:remove-friend="removeFriend"
+				@on-open="setFriendsSectionCollapsed('friends_offline_collapsed', false)"
+				@on-close="setFriendsSectionCollapsed('friends_offline_collapsed', true)"
 			/>
 			<FriendsSection
 				v-if="pendingFriends.length > 0"
 				:is-searching="!!search"
+				:open-by-default="!isFriendsSectionCollapsed('friends_pending_collapsed')"
 				:friends="pendingFriends"
 				:heading="formatMessage(messages.pending)"
 				:remove-friend="removeFriend"
+				@on-open="setFriendsSectionCollapsed('friends_pending_collapsed', false)"
+				@on-close="setFriendsSectionCollapsed('friends_pending_collapsed', true)"
 			/>
 			<p v-if="filteredFriends.length === 0 && search" class="text-sm text-secondary my-1 mx-4">
 				{{ formatMessage(messages.noFriendsMatch, { query: search }) }}
diff --git a/apps/app-frontend/src/components/ui/friends/FriendsSection.vue b/apps/app-frontend/src/components/ui/friends/FriendsSection.vue
index f9efeb79e6..ec453e6c38 100644
--- a/apps/app-frontend/src/components/ui/friends/FriendsSection.vue
+++ b/apps/app-frontend/src/components/ui/friends/FriendsSection.vue
@@ -31,6 +31,11 @@ const props = withDefaults(
 	},
 )
 
+const emit = defineEmits<{
+	onOpen: []
+	onClose: []
+}>()
+
 function createContextMenuOptions(friend: FriendWithUserData) {
 	if (friend.accepted) {
 		return [
@@ -112,6 +117,8 @@ const messages = defineMessages({
 				? ''
 				: ' cursor-pointer hover:brightness-[--hover-brightness] active:scale-[0.98] transition-all')
 		"
+		@on-open="emit('onOpen')"
+		@on-close="emit('onClose')"
 	>
 		<template #title>
 			<h3 class="text-base text-primary font-medium m-0">
diff --git a/apps/app-frontend/src/store/theme.ts b/apps/app-frontend/src/store/theme.ts
index 4b61ebff78..00d47dc5f3 100644
--- a/apps/app-frontend/src/store/theme.ts
+++ b/apps/app-frontend/src/store/theme.ts
@@ -18,6 +18,10 @@ export const DEFAULT_FEATURE_FLAGS = {
 	advanced_filters_collapsed: true,
 	always_show_copy_details: false,
 	hide_installed_modpacks: false,
+	friends_active_collapsed: false,
+	friends_online_collapsed: false,
+	friends_offline_collapsed: true,
+	friends_pending_collapsed: true,
 }
 
 export const THEME_OPTIONS = ['dark', 'light', 'oled', 'retro', 'system'] as const
diff --git a/packages/app-lib/src/state/settings.rs b/packages/app-lib/src/state/settings.rs
index 304cc43e4d..2e831754a5 100644
--- a/packages/app-lib/src/state/settings.rs
+++ b/packages/app-lib/src/state/settings.rs
@@ -66,6 +66,10 @@ pub enum FeatureFlag {
     AdvancedFiltersCollapsed,
     AlwaysShowCopyDetails,
     HideInstalledModpacks,
+    FriendsActiveCollapsed,
+    FriendsOnlineCollapsed,
+    FriendsOfflineCollapsed,
+    FriendsPendingCollapsed,
 }
 
 impl Settings {

From c3249ee51db9d389e30d0b25df98971a64d24b37 Mon Sep 17 00:00:00 2001
From: aecsocket <43144841+aecsocket@users.noreply.github.com>
Date: Tue, 4 Aug 2026 02:14:07 +0900
Subject: [PATCH 15/82] feat: ElasticSearch backend (#6903)

* (do not merge) search test branch

* perf

* fix up search pagination

* more parity and perf work

* expand what parity does

* fix author query

* approach parity even without explicit parity enabled

* remove old parity code

* fix shear

* fix

* fmt
---
 apps/labrinth/.env.docker-compose             |    8 +-
 apps/labrinth/.env.local                      |    4 +-
 apps/labrinth/src/env.rs                      |    5 +
 .../search/backend/elasticsearch/filter.rs    |  390 ++++++
 .../src/search/backend/elasticsearch/mod.rs   | 1202 +++++++++++++++++
 apps/labrinth/src/search/backend/mod.rs       |    2 +
 apps/labrinth/src/search/indexing.rs          |    2 +-
 apps/labrinth/src/search/mod.rs               |    6 +
 docker-compose.yml                            |  100 +-
 9 files changed, 1711 insertions(+), 8 deletions(-)
 create mode 100644 apps/labrinth/src/search/backend/elasticsearch/filter.rs
 create mode 100644 apps/labrinth/src/search/backend/elasticsearch/mod.rs

diff --git a/apps/labrinth/.env.docker-compose b/apps/labrinth/.env.docker-compose
index 81bd6934a9..bff0a03574 100644
--- a/apps/labrinth/.env.docker-compose
+++ b/apps/labrinth/.env.docker-compose
@@ -17,14 +17,14 @@ DATABASE_URL=postgresql://labrinth:labrinth@labrinth-postgres/labrinth
 DATABASE_MIN_CONNECTIONS=0
 DATABASE_MAX_CONNECTIONS=16
 
-SEARCH_BACKEND=typesense
+SEARCH_BACKEND=elasticsearch
 MEILISEARCH_READ_ADDR=http://localhost:7700
 MEILISEARCH_WRITE_ADDRS=http://localhost:7700
 MEILISEARCH_KEY=modrinth
-ELASTICSEARCH_URL=http://localhost:9200
+ELASTICSEARCH_URL=http://elasticsearch0:9200
 ELASTICSEARCH_INDEX_PREFIX=labrinth
-ELASTICSEARCH_USERNAME=elastic
-ELASTICSEARCH_PASSWORD=elastic
+ELASTICSEARCH_USERNAME=
+ELASTICSEARCH_PASSWORD=
 SEARCH_INDEX_CHUNK_SIZE=5000
 SEARCH_INCREMENTAL_INDEX_BATCH_DELAY_SECONDS=5
 SEARCH_INCREMENTAL_INDEX_BATCH_MAX_SIZE=1000
diff --git a/apps/labrinth/.env.local b/apps/labrinth/.env.local
index ddc5096de8..79220889d5 100644
--- a/apps/labrinth/.env.local
+++ b/apps/labrinth/.env.local
@@ -17,7 +17,7 @@ DATABASE_URL=postgresql://labrinth:labrinth@localhost/labrinth
 DATABASE_MIN_CONNECTIONS=0
 DATABASE_MAX_CONNECTIONS=16
 
-SEARCH_BACKEND=typesense
+SEARCH_BACKEND=elasticsearch
 
 # Meilisearch configuration
 MEILISEARCH_READ_ADDR=http://localhost:7700
@@ -32,7 +32,7 @@ ELASTICSEARCH_INDEX_PREFIX=labrinth
 # MEILISEARCH_READ_ADDR=http://localhost:7710
 # MEILISEARCH_WRITE_ADDRS=http://localhost:7700,http://localhost:7701
 
-SEARCH_BACKEND=typesense
+SEARCH_BACKEND=elasticsearch
 
 MEILISEARCH_KEY=modrinth
 MEILISEARCH_META_NAMESPACE=
diff --git a/apps/labrinth/src/env.rs b/apps/labrinth/src/env.rs
index 20ce98f546..88978d006a 100644
--- a/apps/labrinth/src/env.rs
+++ b/apps/labrinth/src/env.rs
@@ -237,6 +237,11 @@ vars! {
     SEARCH_TYPESENSE_DEFAULT_BUCKETING: Json<crate::search::backend::typesense::Bucketing> =
         Json(crate::search::backend::typesense::Bucketing::Buckets(5));
     SEARCH_TYPESENSE_DEFAULT_MAX_CANDIDATES: usize = 24usize;
+    ELASTICSEARCH_URL: String = "http://localhost:9200";
+    ELASTICSEARCH_INDEX_PREFIX: String = "labrinth";
+    ELASTICSEARCH_USERNAME: String = "";
+    ELASTICSEARCH_PASSWORD: String = "";
+    ELASTICSEARCH_BULK_BATCH_SIZE: usize = 1000usize;
 
     // storage
     STORAGE_BACKEND: crate::file_hosting::FileHostKind = crate::file_hosting::FileHostKind::Local;
diff --git a/apps/labrinth/src/search/backend/elasticsearch/filter.rs b/apps/labrinth/src/search/backend/elasticsearch/filter.rs
new file mode 100644
index 0000000000..06e0016740
--- /dev/null
+++ b/apps/labrinth/src/search/backend/elasticsearch/filter.rs
@@ -0,0 +1,390 @@
+use eyre::{Result, eyre};
+use serde_json::{Value, json};
+
+use crate::search::filter::{
+    FilterComparison, FilterCondition, FilterExpr, FilterLiteral,
+    FilterPredicate,
+};
+use crate::search::indexing::normalize_for_search;
+
+const MAX_DNF_CLAUSES: usize = 64;
+const MAX_FILTER_DEPTH: usize = 64;
+const MAX_FILTER_NODES: usize = 1024;
+
+#[derive(Clone, Copy, PartialEq, Eq)]
+enum FilterScope {
+    Project,
+    Version,
+    Mixed,
+}
+
+pub(super) struct ElasticsearchFilter {
+    pub query: Value,
+    pub has_version_filter: bool,
+}
+
+pub(super) fn serialize_filter(
+    filter: &FilterExpr,
+) -> Result<ElasticsearchFilter> {
+    let (nodes, depth) = filter_complexity(filter);
+    if nodes > MAX_FILTER_NODES {
+        return Err(eyre!("search filter has too many expressions"));
+    }
+    if depth > MAX_FILTER_DEPTH {
+        return Err(eyre!("search filter is nested too deeply"));
+    }
+
+    let mut inner_hits_index = 0;
+    let query = plan(filter, &mut inner_hits_index)?;
+    Ok(ElasticsearchFilter {
+        query,
+        has_version_filter: inner_hits_index != 0,
+    })
+}
+
+fn plan(filter: &FilterExpr, inner_hits_index: &mut usize) -> Result<Value> {
+    match filter_scope(filter) {
+        FilterScope::Project => lower(filter),
+        FilterScope::Version => version_query(lower(filter)?, inner_hits_index),
+        FilterScope::Mixed => plan_mixed(filter, inner_hits_index),
+    }
+}
+
+fn plan_mixed(
+    filter: &FilterExpr,
+    inner_hits_index: &mut usize,
+) -> Result<Value> {
+    match filter {
+        FilterExpr::Or(expressions) => expressions
+            .iter()
+            .map(|expression| plan(expression, inner_hits_index))
+            .collect::<Result<Vec<_>>>()
+            .map(or_query),
+        FilterExpr::And(expressions)
+            if expressions.iter().all(|expression| {
+                filter_scope(expression) != FilterScope::Mixed
+            }) =>
+        {
+            plan_partitioned_and(expressions, inner_hits_index)
+        }
+        _ => {
+            let clauses = to_dnf(filter)?;
+            clauses
+                .into_iter()
+                .map(|clause| plan_clause(clause, inner_hits_index))
+                .collect::<Result<Vec<_>>>()
+                .map(or_query)
+        }
+    }
+}
+
+fn plan_partitioned_and(
+    expressions: &[FilterExpr],
+    inner_hits_index: &mut usize,
+) -> Result<Value> {
+    let mut project = Vec::new();
+    let mut version = Vec::new();
+    for expression in expressions {
+        match filter_scope(expression) {
+            FilterScope::Project => project.push(lower(expression)?),
+            FilterScope::Version => version.push(lower(expression)?),
+            FilterScope::Mixed => {
+                return Err(eyre!("could not partition mixed search filter"));
+            }
+        }
+    }
+    if !version.is_empty() {
+        project.push(version_query(and_query(version), inner_hits_index)?);
+    }
+    Ok(and_query(project))
+}
+
+fn plan_clause(
+    predicates: Vec<&FilterPredicate>,
+    inner_hits_index: &mut usize,
+) -> Result<Value> {
+    let mut project = Vec::new();
+    let mut version = Vec::new();
+    for predicate in predicates {
+        let query = predicate_query(predicate)?;
+        if is_version_filter_field(predicate.field.as_str()) {
+            version.push(query);
+        } else {
+            project.push(query);
+        }
+    }
+    if !version.is_empty() {
+        project.push(version_query(and_query(version), inner_hits_index)?);
+    }
+    Ok(and_query(project))
+}
+
+fn lower(filter: &FilterExpr) -> Result<Value> {
+    match filter {
+        FilterExpr::And(expressions) => expressions
+            .iter()
+            .map(lower)
+            .collect::<Result<Vec<_>>>()
+            .map(and_query),
+        FilterExpr::Or(expressions) => expressions
+            .iter()
+            .map(lower)
+            .collect::<Result<Vec<_>>>()
+            .map(or_query),
+        FilterExpr::Predicate(predicate) => predicate_query(predicate),
+        FilterExpr::Not(_) => {
+            Err(eyre!("search filter contains an unnormalized negation"))
+        }
+    }
+}
+
+fn predicate_query(predicate: &FilterPredicate) -> Result<Value> {
+    let source_field = predicate.field.as_str();
+    let field = exact_field(source_field);
+    match &predicate.condition {
+        FilterCondition::Compare { comparison, value } => {
+            let value = literal_value(source_field, value)?;
+            Ok(match comparison {
+                FilterComparison::Equal => {
+                    json!({"term": {(field): {"value": value}}})
+                }
+                FilterComparison::NotEqual => not_query(json!({
+                    "term": {(field): {"value": value}}
+                })),
+                FilterComparison::GreaterThan => {
+                    json!({"range": {(field): {"gt": value}}})
+                }
+                FilterComparison::GreaterThanOrEqual => {
+                    json!({"range": {(field): {"gte": value}}})
+                }
+                FilterComparison::LessThan => {
+                    json!({"range": {(field): {"lt": value}}})
+                }
+                FilterComparison::LessThanOrEqual => {
+                    json!({"range": {(field): {"lte": value}}})
+                }
+            })
+        }
+        FilterCondition::In { values, negated } => {
+            let values = values
+                .iter()
+                .map(|value| literal_value(source_field, value))
+                .collect::<Result<Vec<_>>>()?;
+            let query = json!({"terms": {(field): values}});
+            Ok(if *negated { not_query(query) } else { query })
+        }
+        FilterCondition::Exists { negated } => {
+            let query = json!({"exists": {"field": field}});
+            Ok(if *negated { not_query(query) } else { query })
+        }
+    }
+}
+
+fn literal_value(field: &str, literal: &FilterLiteral) -> Result<Value> {
+    match literal {
+        FilterLiteral::String(value) if field == "author" => {
+            Ok(Value::String(normalize_for_search(value)))
+        }
+        FilterLiteral::String(value) => Ok(Value::String(value.clone())),
+        FilterLiteral::Number(value) => serde_json::from_str(value)
+            .map_err(|error| eyre!("invalid numeric filter literal: {error}")),
+        FilterLiteral::Bool(value) => Ok(Value::Bool(*value)),
+    }
+}
+
+fn exact_field(field: &str) -> &str {
+    match field {
+        "name" => "name.keyword",
+        "author" => "indexed_author.keyword",
+        "summary" => "summary.keyword",
+        "slug" => "slug.keyword",
+        _ => field,
+    }
+}
+
+fn version_query(query: Value, inner_hits_index: &mut usize) -> Result<Value> {
+    let name = format!("matching_versions_{}", *inner_hits_index);
+    *inner_hits_index += 1;
+    Ok(json!({
+        "has_child": {
+            "type": "version",
+            "score_mode": "none",
+            "query": query,
+            "inner_hits": {
+                "name": name,
+                "size": 1,
+                "_source": ["version_id", "version_published_timestamp"],
+                "sort": [
+                    {"version_published_timestamp": {"order": "desc"}},
+                    {"version_id": {"order": "desc"}}
+                ]
+            }
+        }
+    }))
+}
+
+fn and_query(queries: Vec<Value>) -> Value {
+    match queries.len() {
+        0 => json!({"match_all": {}}),
+        1 => queries.into_iter().next().unwrap_or_default(),
+        _ => json!({"bool": {"filter": queries}}),
+    }
+}
+
+fn or_query(queries: Vec<Value>) -> Value {
+    match queries.len() {
+        0 => json!({"match_none": {}}),
+        1 => queries.into_iter().next().unwrap_or_default(),
+        _ => json!({
+            "bool": {
+                "should": queries,
+                "minimum_should_match": 1
+            }
+        }),
+    }
+}
+
+fn not_query(query: Value) -> Value {
+    json!({
+        "bool": {
+            "must": [{"match_all": {}}],
+            "must_not": [query]
+        }
+    })
+}
+
+fn filter_scope(filter: &FilterExpr) -> FilterScope {
+    match filter {
+        FilterExpr::Predicate(predicate) => {
+            if is_version_filter_field(predicate.field.as_str()) {
+                FilterScope::Version
+            } else {
+                FilterScope::Project
+            }
+        }
+        FilterExpr::And(expressions) | FilterExpr::Or(expressions) => {
+            let mut scopes = expressions.iter().map(filter_scope);
+            let Some(first) = scopes.next() else {
+                return FilterScope::Project;
+            };
+            if scopes.all(|scope| scope == first) {
+                first
+            } else {
+                FilterScope::Mixed
+            }
+        }
+        FilterExpr::Not(expression) => filter_scope(expression),
+    }
+}
+
+fn is_version_filter_field(field: &str) -> bool {
+    matches!(
+        field,
+        "categories"
+            | "project_types"
+            | "environment"
+            | "game_versions"
+            | "client_side"
+            | "server_side"
+    )
+}
+
+fn to_dnf(filter: &FilterExpr) -> Result<Vec<Vec<&FilterPredicate>>> {
+    match filter {
+        FilterExpr::Predicate(predicate) => Ok(vec![vec![predicate]]),
+        FilterExpr::Or(expressions) => {
+            let mut clauses = Vec::new();
+            for expression in expressions.iter() {
+                clauses.extend(to_dnf(expression)?);
+                if clauses.len() > MAX_DNF_CLAUSES {
+                    return Err(eyre!(
+                        "search filter has too many boolean clauses"
+                    ));
+                }
+            }
+            Ok(clauses)
+        }
+        FilterExpr::And(expressions) => {
+            let mut clauses = vec![Vec::new()];
+            for expression in expressions.iter() {
+                let right = to_dnf(expression)?;
+                if clauses.len().saturating_mul(right.len()) > MAX_DNF_CLAUSES {
+                    return Err(eyre!(
+                        "search filter has too many boolean clauses"
+                    ));
+                }
+                clauses = clauses
+                    .into_iter()
+                    .flat_map(|left| {
+                        right.iter().map(move |right| {
+                            let mut clause = left.clone();
+                            clause.extend(right);
+                            clause
+                        })
+                    })
+                    .collect();
+            }
+            Ok(clauses)
+        }
+        FilterExpr::Not(_) => {
+            Err(eyre!("search filter contains an unnormalized negation"))
+        }
+    }
+}
+
+fn filter_complexity(filter: &FilterExpr) -> (usize, usize) {
+    match filter {
+        FilterExpr::Predicate(_) => (1, 1),
+        FilterExpr::And(expressions) | FilterExpr::Or(expressions) => {
+            expressions.iter().map(filter_complexity).fold(
+                (1, 1),
+                |(nodes, depth), (child_nodes, child_depth)| {
+                    (nodes + child_nodes, depth.max(child_depth + 1))
+                },
+            )
+        }
+        FilterExpr::Not(expression) => {
+            let (nodes, depth) = filter_complexity(expression);
+            (nodes + 1, depth + 1)
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::serialize_filter;
+    use crate::search::filter::{normalize, parse_expression};
+    use serde_json::Value;
+
+    fn serialize(input: &str) -> Value {
+        let filter = normalize(parse_expression(input).unwrap());
+        serialize_filter(&filter).unwrap().query
+    }
+
+    #[test]
+    fn correlated_version_filters_use_one_join() {
+        let query = serialize("categories = fabric AND game_versions = 1.21");
+        assert_eq!(query.to_string().matches("has_child").count(), 1);
+    }
+
+    #[test]
+    fn project_filters_do_not_use_a_join() {
+        let query = serialize("license = MIT");
+        assert_eq!(query.to_string().matches("has_child").count(), 0);
+        assert_eq!(query["term"]["license"]["value"], "MIT");
+    }
+
+    #[test]
+    fn author_filters_use_the_normalized_exact_field() {
+        let query = serialize("author = User");
+        assert_eq!(query["term"]["indexed_author.keyword"]["value"], "user");
+    }
+
+    #[test]
+    fn mixed_boolean_filters_preserve_version_correlation() {
+        let query = serialize(
+            "(license = MIT OR categories = fabric) AND game_versions = 1.21",
+        );
+        assert_eq!(query.to_string().matches("has_child").count(), 2);
+    }
+}
diff --git a/apps/labrinth/src/search/backend/elasticsearch/mod.rs b/apps/labrinth/src/search/backend/elasticsearch/mod.rs
new file mode 100644
index 0000000000..7e41cd93f9
--- /dev/null
+++ b/apps/labrinth/src/search/backend/elasticsearch/mod.rs
@@ -0,0 +1,1202 @@
+//! Search implementation backed by an Elasticsearch cluster.
+//!
+//! Projects and versions share an index and use an Elasticsearch join field.
+//! This keeps version filters correlated without duplicating every version
+//! into its project document.
+
+use async_trait::async_trait;
+use eyre::{Result, eyre};
+use itertools::Itertools;
+use reqwest::{Method, Response, StatusCode};
+use serde::Serialize;
+use serde_json::{Map, Value, json};
+use tracing::{debug, info, warn};
+use xredis::RedisPool;
+
+use crate::database::PgPool;
+use crate::env::ENV;
+use crate::routes::ApiError;
+use crate::search::backend::{
+    SearchIndex, combined_search_filters, parse_search_index,
+    parse_search_request,
+};
+use crate::search::filter::{
+    FilterExpr, from_legacy_v2_facets_json, normalize, parse_expression,
+};
+use crate::search::indexing::index_local;
+use crate::search::{
+    ResultSearchProject, SearchBackend, SearchIndexUpdate, SearchRequest,
+    SearchResults, TasksCancelFilter, UploadSearchProject, UploadSearchVersion,
+};
+use crate::util::error::Context;
+
+use self::filter::{ElasticsearchFilter, serialize_filter};
+
+mod filter;
+
+const DELETE_FILTER_ID_BATCH_SIZE: usize = 1024;
+const MAX_RESULT_WINDOW: usize = 10_000;
+const MAX_CACHED_HITS: usize = 250;
+
+#[derive(Debug, Clone)]
+pub struct ElasticsearchConfig {
+    pub url: String,
+    pub username: String,
+    pub password: String,
+    pub index_prefix: String,
+    pub meta_namespace: String,
+    pub index_chunk_size: i64,
+    pub bulk_batch_size: usize,
+}
+
+impl ElasticsearchConfig {
+    pub fn new(meta_namespace: Option<String>) -> Self {
+        Self {
+            url: ENV.ELASTICSEARCH_URL.clone(),
+            username: ENV.ELASTICSEARCH_USERNAME.clone(),
+            password: ENV.ELASTICSEARCH_PASSWORD.clone(),
+            index_prefix: ENV.ELASTICSEARCH_INDEX_PREFIX.clone(),
+            meta_namespace: meta_namespace.unwrap_or_default(),
+            index_chunk_size: ENV.SEARCH_INDEX_CHUNK_SIZE,
+            bulk_batch_size: ENV.ELASTICSEARCH_BULK_BATCH_SIZE,
+        }
+    }
+
+    fn alias_name(&self) -> String {
+        if self.meta_namespace.is_empty() {
+            format!("{}_projects", self.index_prefix)
+        } else {
+            format!("{}_{}_projects", self.meta_namespace, self.index_prefix)
+        }
+    }
+
+    fn next_index_name(&self, alias: &str, use_alt: bool) -> String {
+        if use_alt {
+            format!("{alias}__alt")
+        } else {
+            format!("{alias}__current")
+        }
+    }
+}
+
+struct ElasticsearchClient {
+    client: reqwest::Client,
+    base_url: String,
+    username: String,
+    password: String,
+}
+
+impl ElasticsearchClient {
+    fn new(config: &ElasticsearchConfig) -> Self {
+        Self {
+            client: reqwest::Client::new(),
+            base_url: config.url.trim_end_matches('/').to_string(),
+            username: config.username.clone(),
+            password: config.password.clone(),
+        }
+    }
+
+    fn request(&self, method: Method, path: &str) -> reqwest::RequestBuilder {
+        let request = self
+            .client
+            .request(method, format!("{}{}", self.base_url, path));
+        if self.username.is_empty() {
+            request
+        } else {
+            request.basic_auth(&self.username, Some(&self.password))
+        }
+    }
+
+    async fn get_alias_target(&self, alias: &str) -> Result<Option<String>> {
+        let response = self
+            .request(Method::GET, &format!("/_alias/{alias}"))
+            .send()
+            .await
+            .wrap_err("failed to get Elasticsearch alias")?;
+        if response.status() == StatusCode::NOT_FOUND {
+            return Ok(None);
+        }
+        let body = response_json(response, "get Elasticsearch alias").await?;
+        Ok(body
+            .as_object()
+            .and_then(|indices| indices.keys().next())
+            .cloned())
+    }
+
+    async fn index_exists(&self, index: &str) -> Result<bool> {
+        let response = self
+            .request(Method::HEAD, &format!("/{index}"))
+            .send()
+            .await
+            .wrap_err("failed to check Elasticsearch index existence")?;
+        Ok(response.status().is_success())
+    }
+
+    async fn create_index(&self, index: &str, schema: &Value) -> Result<()> {
+        let response = self
+            .request(Method::PUT, &format!("/{index}"))
+            .json(schema)
+            .send()
+            .await
+            .wrap_err("failed to create Elasticsearch index")?;
+        response_json(response, "create Elasticsearch index").await?;
+        Ok(())
+    }
+
+    async fn delete_index_if_exists(&self, index: &str) -> Result<()> {
+        let response = self
+            .request(Method::DELETE, &format!("/{index}"))
+            .send()
+            .await
+            .wrap_err("failed to delete Elasticsearch index")?;
+        if response.status() == StatusCode::NOT_FOUND {
+            return Ok(());
+        }
+        response_json(response, "delete Elasticsearch index").await?;
+        Ok(())
+    }
+
+    async fn swap_alias(
+        &self,
+        alias: &str,
+        old_index: Option<&str>,
+        new_index: &str,
+    ) -> Result<()> {
+        let mut actions = Vec::new();
+        if let Some(old_index) = old_index {
+            actions.push(json!({
+                "remove": {"index": old_index, "alias": alias}
+            }));
+        }
+        actions.push(json!({
+            "add": {
+                "index": new_index,
+                "alias": alias,
+                "is_write_index": true
+            }
+        }));
+
+        let response = self
+            .request(Method::POST, "/_aliases")
+            .json(&json!({"actions": actions}))
+            .send()
+            .await
+            .wrap_err("failed to swap Elasticsearch alias")?;
+        response_json(response, "swap Elasticsearch alias").await?;
+        Ok(())
+    }
+
+    async fn bulk(&self, index: &str, body: String) -> Result<()> {
+        let response = self
+            .request(Method::POST, &format!("/{index}/_bulk?refresh=false"))
+            .header("Content-Type", "application/x-ndjson")
+            .body(body)
+            .send()
+            .await
+            .wrap_err("failed to execute Elasticsearch bulk request")?;
+        let body =
+            response_json(response, "execute Elasticsearch bulk request")
+                .await?;
+        if body["errors"].as_bool() == Some(true) {
+            let failures = body["items"]
+                .as_array()
+                .into_iter()
+                .flatten()
+                .filter_map(|item| {
+                    item.as_object()?.values().next()?.get("error").cloned()
+                })
+                .unique()
+                .take(10)
+                .map(|error| error.to_string())
+                .join("; ");
+            return Err(eyre!(
+                "Elasticsearch bulk request contained failures: {failures}"
+            ));
+        }
+        Ok(())
+    }
+
+    async fn delete_by_query(&self, index: &str, query: &Value) -> Result<()> {
+        let response = self
+            .request(
+                Method::POST,
+                &format!(
+                    "/{index}/_delete_by_query?conflicts=proceed&refresh=false"
+                ),
+            )
+            .json(&json!({"query": query}))
+            .send()
+            .await
+            .wrap_err("failed to delete Elasticsearch documents")?;
+        let body =
+            response_json(response, "delete Elasticsearch documents").await?;
+        if body["failures"]
+            .as_array()
+            .is_some_and(|failures| !failures.is_empty())
+        {
+            return Err(eyre!(
+                "Elasticsearch delete-by-query contained failures: {}",
+                body["failures"]
+            ));
+        }
+        Ok(())
+    }
+
+    async fn refresh(&self, index: &str) -> Result<()> {
+        let response = self
+            .request(Method::POST, &format!("/{index}/_refresh"))
+            .send()
+            .await
+            .wrap_err("failed to refresh Elasticsearch index")?;
+        response_json(response, "refresh Elasticsearch index").await?;
+        Ok(())
+    }
+
+    async fn force_merge(&self, index: &str) -> Result<()> {
+        let response = self
+            .request(
+                Method::POST,
+                &format!("/{index}/_forcemerge?max_num_segments=1&flush=true"),
+            )
+            .send()
+            .await
+            .wrap_err("failed to force-merge Elasticsearch index")?;
+        response_json(response, "force-merge Elasticsearch index").await?;
+        Ok(())
+    }
+}
+
+async fn response_json(response: Response, operation: &str) -> Result<Value> {
+    let status = response.status();
+    let body = response
+        .text()
+        .await
+        .wrap_err_with(|| format!("failed to read response for {operation}"))?;
+    let json = serde_json::from_str(&body).unwrap_or_else(|_| {
+        json!({
+            "unparsed_response": body
+        })
+    });
+    if !status.is_success() {
+        return Err(eyre!("{operation} failed ({status}): {json}"));
+    }
+    Ok(json)
+}
+
+pub struct Elasticsearch {
+    pub config: ElasticsearchConfig,
+    client: ElasticsearchClient,
+}
+
+impl Elasticsearch {
+    pub fn new(config: ElasticsearchConfig) -> Self {
+        let client = ElasticsearchClient::new(&config);
+        Self { config, client }
+    }
+
+    fn sort(index: SearchIndex) -> Vec<Value> {
+        let descending = |field: &str| json!({(field): {"order": "desc", "missing": "_last"}});
+        let mut sort = match index {
+            SearchIndex::Relevance => vec![
+                json!({"_score": {"order": "desc"}}),
+                descending("log_downloads"),
+                descending("version_published_timestamp"),
+            ],
+            SearchIndex::Downloads => vec![
+                descending("log_downloads"),
+                descending("version_published_timestamp"),
+            ],
+            SearchIndex::Follows => vec![
+                descending("follows"),
+                descending("version_published_timestamp"),
+            ],
+            SearchIndex::Updated => vec![
+                descending("modified_timestamp"),
+                descending("version_published_timestamp"),
+            ],
+            SearchIndex::Newest => vec![
+                descending("created_timestamp"),
+                descending("version_published_timestamp"),
+            ],
+            SearchIndex::MinecraftJavaServerVerifiedPlays2w => vec![
+                json!({"_score": {"order": "desc"}}),
+                descending("minecraft_java_server.verified_plays_2w"),
+                descending("minecraft_java_server.is_online"),
+            ],
+            SearchIndex::MinecraftJavaServerPlayersOnline => vec![
+                json!({"_score": {"order": "desc"}}),
+                descending("minecraft_java_server.is_online"),
+                descending("minecraft_java_server.ping.data.players_online"),
+            ],
+        };
+        sort.push(json!({"project_id": {"order": "asc"}}));
+        sort
+    }
+
+    fn build_filter(
+        info: &SearchRequest,
+    ) -> Result<Option<ElasticsearchFilter>, ApiError> {
+        let facet_part = if let Some(facets_json) = info.facets.as_deref() {
+            from_legacy_v2_facets_json(facets_json)
+                .wrap_request_err("failed to parse facets")?
+        } else {
+            None
+        };
+
+        let filter_part = combined_search_filters(info)
+            .filter(|filter| !filter.trim().is_empty())
+            .map(|filter| parse_expression(&filter))
+            .transpose()
+            .wrap_request_err("failed to parse filters")?;
+
+        FilterExpr::and([facet_part, filter_part].into_iter().flatten())
+            .map(normalize)
+            .map(|filter| {
+                serialize_filter(&filter)
+                    .wrap_request_err("failed to build search filter")
+            })
+            .transpose()
+    }
+
+    async fn execute_search(
+        &self,
+        alias: &str,
+        body: &Value,
+        sort_only: bool,
+    ) -> Result<Value, ApiError> {
+        let request_cache = if body["size"]
+            .as_u64()
+            .is_some_and(|size| size <= MAX_CACHED_HITS as u64)
+        {
+            "&request_cache=true"
+        } else {
+            ""
+        };
+        let path = if sort_only {
+            format!(
+                "/{alias}/_search?filter_path=hits.total,hits.hits.sort&preference=labrinth{request_cache}"
+            )
+        } else {
+            format!("/{alias}/_search?preference=labrinth{request_cache}")
+        };
+        let response = self
+            .client
+            .request(Method::POST, &path)
+            .json(body)
+            .send()
+            .await
+            .wrap_internal_err("failed to execute Elasticsearch search")?;
+        let mut body = response_json(response, "execute Elasticsearch search")
+            .await
+            .map_err(ApiError::Internal)?;
+        if sort_only && !body["hits"]["hits"].is_array() {
+            body["hits"]["hits"] = Value::Array(Vec::new());
+        }
+        Ok(body)
+    }
+
+    async fn open_point_in_time(
+        &self,
+        alias: &str,
+    ) -> Result<String, ApiError> {
+        let response = self
+            .client
+            .request(
+                Method::POST,
+                &format!("/{alias}/_pit?keep_alive=1m&preference=labrinth"),
+            )
+            .send()
+            .await
+            .wrap_internal_err("failed to open Elasticsearch point in time")?;
+        let body = response_json(response, "open Elasticsearch point in time")
+            .await
+            .map_err(ApiError::Internal)?;
+        body["id"].as_str().map(ToOwned::to_owned).ok_or_else(|| {
+            ApiError::Internal(eyre!(
+                "Elasticsearch point in time response did not contain an ID"
+            ))
+        })
+    }
+
+    async fn close_point_in_time(&self, id: &str) -> Result<(), ApiError> {
+        let response = self
+            .client
+            .request(Method::DELETE, "/_pit")
+            .json(&json!({"id": id}))
+            .send()
+            .await
+            .wrap_internal_err("failed to close Elasticsearch point in time")?;
+        response_json(response, "close Elasticsearch point in time")
+            .await
+            .map_err(ApiError::Internal)?;
+        Ok(())
+    }
+
+    async fn execute_point_in_time_search(
+        &self,
+        body: &Value,
+        sort_only: bool,
+    ) -> Result<Value, ApiError> {
+        let path = if sort_only {
+            "/_search?filter_path=pit_id,hits.total,hits.hits.sort"
+        } else {
+            "/_search"
+        };
+        let response = self
+            .client
+            .request(Method::POST, path)
+            .json(body)
+            .send()
+            .await
+            .wrap_internal_err(
+                "failed to execute Elasticsearch point in time search",
+            )?;
+        let mut body = response_json(
+            response,
+            "execute Elasticsearch point in time search",
+        )
+        .await
+        .map_err(ApiError::Internal)?;
+        if sort_only && !body["hits"]["hits"].is_array() {
+            body["hits"]["hits"] = Value::Array(Vec::new());
+        }
+        Ok(body)
+    }
+
+    #[allow(clippy::too_many_arguments)]
+    async fn execute_deep_search(
+        &self,
+        alias: &str,
+        query: &Value,
+        sort: &[Value],
+        offset: usize,
+        size: usize,
+    ) -> Result<Value, ApiError> {
+        let mut point_in_time_id = self.open_point_in_time(alias).await?;
+        let result = self
+            .execute_deep_search_with_point_in_time(
+                query,
+                sort,
+                offset,
+                size,
+                &mut point_in_time_id,
+            )
+            .await;
+        if let Err(error) = self.close_point_in_time(&point_in_time_id).await {
+            warn!(
+                ?error,
+                "failed to close Elasticsearch deep-search point in time"
+            );
+        }
+        result
+    }
+
+    async fn execute_deep_search_with_point_in_time(
+        &self,
+        query: &Value,
+        sort: &[Value],
+        offset: usize,
+        size: usize,
+        point_in_time_id: &mut String,
+    ) -> Result<Value, ApiError> {
+        let mut remaining_offset = offset;
+        let mut search_after = None;
+        let mut total_hits = None;
+        while remaining_offset > 0 {
+            let skipped = remaining_offset.min(MAX_RESULT_WINDOW);
+            let mut body = Self::search_body(
+                query,
+                sort,
+                0,
+                skipped,
+                total_hits.is_none(),
+                search_after.as_ref(),
+                false,
+            );
+            body["pit"] = json!({
+                "id": point_in_time_id,
+                "keep_alive": "1m"
+            });
+            let body = self.execute_point_in_time_search(&body, true).await?;
+            if let Some(id) = body["pit_id"].as_str() {
+                *point_in_time_id = id.to_string();
+            }
+            if total_hits.is_none() {
+                let exact_total_hits =
+                    body["hits"]["total"]["value"].as_u64().unwrap_or_default()
+                        as usize;
+                if offset >= exact_total_hits {
+                    return Ok(json!({
+                        "hits": {
+                            "total": {
+                                "value": exact_total_hits,
+                                "relation": "eq"
+                            },
+                            "hits": []
+                        }
+                    }));
+                }
+                total_hits = Some(exact_total_hits);
+            }
+            let pagination_hits = body["hits"]["hits"].as_array();
+            let Some(anchor) = pagination_hits
+                .and_then(|hits| hits.last())
+                .and_then(|hit| hit.get("sort"))
+                .cloned()
+            else {
+                return Ok(json!({
+                    "hits": {
+                        "total": {
+                            "value": total_hits.unwrap_or_default(),
+                            "relation": "eq"
+                        },
+                        "hits": []
+                    }
+                }));
+            };
+            debug!(
+                requested_offset = offset,
+                remaining_offset,
+                skipped,
+                hit_count = pagination_hits.map_or(0, Vec::len),
+                ?anchor,
+                "advanced Elasticsearch search-after cursor"
+            );
+            search_after = Some(anchor);
+            remaining_offset -= skipped;
+        }
+
+        let mut body = Self::search_body(
+            query,
+            sort,
+            0,
+            size,
+            true,
+            search_after.as_ref(),
+            true,
+        );
+        body["pit"] = json!({
+            "id": point_in_time_id,
+            "keep_alive": "1m"
+        });
+        let body = self.execute_point_in_time_search(&body, false).await?;
+        if let Some(id) = body["pit_id"].as_str() {
+            *point_in_time_id = id.to_string();
+        }
+        Ok(body)
+    }
+
+    #[allow(clippy::too_many_arguments)]
+    fn search_body(
+        query: &Value,
+        sort: &[Value],
+        from: usize,
+        size: usize,
+        track_total_hits: bool,
+        search_after: Option<&Value>,
+        include_source: bool,
+    ) -> Value {
+        let mut body = json!({
+            "from": from,
+            "size": size,
+            "track_total_hits": track_total_hits,
+            "query": query,
+            "sort": sort
+        });
+        if let Some(search_after) = search_after {
+            body["search_after"] = search_after.clone();
+        }
+        if !include_source {
+            body["_source"] = Value::Bool(false);
+        }
+        body
+    }
+
+    async fn existing_write_indices(&self) -> Result<Vec<String>> {
+        let alias = self.config.alias_name();
+        let mut indices = self
+            .client
+            .get_alias_target(&alias)
+            .await?
+            .into_iter()
+            .collect_vec();
+
+        for index in [
+            self.config.next_index_name(&alias, false),
+            self.config.next_index_name(&alias, true),
+        ] {
+            if !indices.contains(&index)
+                && self.client.index_exists(&index).await?
+            {
+                indices.push(index);
+            }
+        }
+        Ok(indices)
+    }
+
+    fn index_schema(&self) -> Value {
+        json!({
+            "mappings": {
+                "properties": {
+                    "document_type": {
+                        "type": "join",
+                        "relations": {"project": "version"}
+                    },
+                    "version_id": {"type": "keyword"},
+                    "project_id": {"type": "keyword"},
+                    "project_types": {"type": "keyword"},
+                    "all_project_types": {"type": "keyword"},
+                    "slug": Self::text_field_schema(),
+                    "author": Self::text_field_schema(),
+                    "indexed_author": Self::text_field_schema(),
+                    "name": Self::text_field_schema(),
+                    "indexed_name": Self::text_field_schema(),
+                    "summary": Self::text_field_schema(),
+                    "downloads": {"type": "integer"},
+                    "log_downloads": {"type": "double"},
+                    "follows": {"type": "integer"},
+                    "created_timestamp": {"type": "long"},
+                    "modified_timestamp": {"type": "long"},
+                    "version_published_timestamp": {"type": "long"},
+                    "categories": {"type": "keyword"},
+                    "project_categories": {"type": "keyword"},
+                    "display_categories": {"type": "keyword"},
+                    "loaders": {"type": "keyword"},
+                    "license": {"type": "keyword"},
+                    "environment": {"type": "keyword"},
+                    "game_versions": {"type": "keyword"},
+                    "client_side": {"type": "keyword"},
+                    "server_side": {"type": "keyword"},
+                    "dependency_project_ids": {"type": "keyword"},
+                    "compatible_dependency_project_ids": {
+                        "type": "keyword"
+                    },
+                    "project_loader_fields": {
+                        "type": "object",
+                        "enabled": false
+                    },
+                    "minecraft_server": {
+                        "properties": {
+                            "region": {"type": "keyword"},
+                            "languages": {"type": "keyword"}
+                        }
+                    },
+                    "minecraft_java_server": {
+                        "properties": {
+                            "verified_plays_2w": {"type": "long"},
+                            "is_online": {"type": "boolean"},
+                            "ping": {
+                                "properties": {
+                                    "data": {
+                                        "properties": {
+                                            "players_online": {
+                                                "type": "integer"
+                                            }
+                                        }
+                                    }
+                                }
+                            },
+                            "content": {
+                                "properties": {
+                                    "kind": {"type": "keyword"},
+                                    "supported_game_versions": {
+                                        "type": "keyword"
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        })
+    }
+
+    fn text_field_schema() -> Value {
+        json!({
+            "type": "text",
+            "index_prefixes": {
+                "min_chars": 1,
+                "max_chars": 10
+            },
+            "fields": {
+                "keyword": {
+                    "type": "keyword",
+                    "ignore_above": 256
+                }
+            }
+        })
+    }
+
+    async fn import_projects(
+        &self,
+        indices: &[String],
+        documents: &[UploadSearchProject],
+    ) -> Result<()> {
+        let batch_size = self.config.bulk_batch_size.max(1);
+        for documents in documents.chunks(batch_size) {
+            let body = projects_to_bulk(documents)?;
+            for index in indices {
+                info!(
+                    index,
+                    document_count = documents.len(),
+                    content_length_bytes = body.len(),
+                    "sending Elasticsearch project bulk request"
+                );
+                self.client.bulk(index, body.clone()).await?;
+            }
+        }
+        Ok(())
+    }
+
+    async fn import_versions(
+        &self,
+        indices: &[String],
+        documents: &[UploadSearchVersion],
+    ) -> Result<()> {
+        let batch_size = self.config.bulk_batch_size.max(1);
+        for documents in documents.chunks(batch_size) {
+            let body = versions_to_bulk(documents)?;
+            for index in indices {
+                info!(
+                    index,
+                    document_count = documents.len(),
+                    content_length_bytes = body.len(),
+                    "sending Elasticsearch version bulk request"
+                );
+                self.client.bulk(index, body.clone()).await?;
+            }
+        }
+        Ok(())
+    }
+
+    async fn delete_ids(&self, field: &str, ids: &[String]) -> Result<()> {
+        let indices = self.existing_write_indices().await?;
+        for ids in ids.chunks(DELETE_FILTER_ID_BATCH_SIZE) {
+            let query = json!({"terms": {(field): ids}});
+            for index in &indices {
+                self.client.delete_by_query(index, &query).await?;
+            }
+        }
+        Ok(())
+    }
+
+    async fn refresh_write_indices(&self) -> Result<()> {
+        for index in self.existing_write_indices().await? {
+            self.client.refresh(&index).await?;
+        }
+        Ok(())
+    }
+
+    fn text_query(query: &str) -> Value {
+        if query.is_empty() || query.trim() == "*" {
+            return json!({"match_all": {}});
+        }
+
+        json!({
+            "dis_max": {
+                "queries": [
+                    Self::prefix_tier(query, &["name"], 4),
+                    Self::prefix_tier(
+                        query,
+                        &["indexed_name", "slug"],
+                        3,
+                    ),
+                    Self::prefix_tier(
+                        query,
+                        &["author", "indexed_author"],
+                        2,
+                    ),
+                    Self::prefix_tier(query, &["summary"], 1),
+                ]
+            }
+        })
+    }
+
+    fn prefix_tier(query: &str, fields: &[&str], boost: u8) -> Value {
+        json!({
+            "constant_score": {
+                "filter": {
+                    "multi_match": {
+                        "query": query,
+                        "type": "bool_prefix",
+                        "operator": "and",
+                        "fields": fields
+                    }
+                },
+                "boost": boost
+            }
+        })
+    }
+
+    async fn execute_project_search(
+        &self,
+        info: &SearchRequest,
+    ) -> Result<SearchResults, ApiError> {
+        let parsed = parse_search_request(info)?;
+        let search_sort =
+            parse_search_index(parsed.index, info.new_filters.as_deref())?;
+        let filter = Self::build_filter(info)?;
+        let mut filters = vec![json!({"term": {"document_type": "project"}})];
+        if let Some(filter) = &filter {
+            filters.push(filter.query.clone());
+        }
+        let query = json!({
+            "bool": {
+                "must": [Self::text_query(parsed.query)],
+                "filter": filters
+            }
+        });
+        let sort = Self::sort(search_sort.index);
+        let alias = self.config.alias_name();
+        let body = if parsed.offset.saturating_add(parsed.hits_per_page)
+            > MAX_RESULT_WINDOW
+        {
+            self.execute_deep_search(
+                &alias,
+                &query,
+                &sort,
+                parsed.offset,
+                parsed.hits_per_page,
+            )
+            .await?
+        } else {
+            let body = Self::search_body(
+                &query,
+                &sort,
+                parsed.offset,
+                parsed.hits_per_page,
+                true,
+                None,
+                true,
+            );
+            self.execute_search(&alias, &body, false).await?
+        };
+        let total_hits = body["hits"]["total"]["value"]
+            .as_u64()
+            .unwrap_or_default() as usize;
+        let hits = body["hits"]["hits"]
+            .as_array()
+            .into_iter()
+            .flatten()
+            .filter_map(|hit| {
+                let mut document = hit["_source"].clone();
+                let object = document.as_object_mut()?;
+                object.remove("document_type");
+                if filter
+                    .as_ref()
+                    .is_some_and(|filter| filter.has_version_filter)
+                    && let Some(version_id) = matching_version_id(hit)
+                {
+                    object.insert(
+                        "version_id".to_string(),
+                        Value::String(version_id),
+                    );
+                }
+
+                let metadata = info.show_metadata.then(|| {
+                    json!({
+                        "score": hit["_score"],
+                        "sort": hit["sort"]
+                    })
+                });
+                let mut result: ResultSearchProject =
+                    serde_json::from_value::<UploadSearchProject>(document)
+                        .ok()?
+                        .into();
+                result.search_metadata = metadata;
+                Some(result)
+            })
+            .collect();
+
+        Ok(SearchResults {
+            hits,
+            page: parsed.page,
+            hits_per_page: parsed.hits_per_page,
+            total_hits,
+        })
+    }
+}
+
+#[async_trait]
+impl SearchBackend for Elasticsearch {
+    async fn search_for_project_raw(
+        &self,
+        info: &SearchRequest,
+    ) -> Result<SearchResults, ApiError> {
+        self.execute_project_search(info).await
+    }
+
+    async fn rebuild_index(
+        &self,
+        ro_pool: PgPool,
+        redis: RedisPool,
+    ) -> Result<()> {
+        info!("starting Elasticsearch project indexing");
+        let alias = self.config.alias_name();
+        let current = self.client.get_alias_target(&alias).await?;
+        let use_alt = !current
+            .as_deref()
+            .is_some_and(|name| name.ends_with("__alt"));
+        let next = self.config.next_index_name(&alias, use_alt);
+
+        info!(index = next, "creating Elasticsearch shadow index");
+        self.client.delete_index_if_exists(&next).await?;
+        self.client
+            .create_index(&next, &self.index_schema())
+            .await?;
+
+        let mut cursor = 0_i64;
+        let mut chunk_index = 0_usize;
+        let mut total_projects = 0_usize;
+        let mut total_versions = 0_usize;
+
+        loop {
+            info!("fetching index chunk {chunk_index}");
+            chunk_index += 1;
+            let (documents, next_cursor) = index_local(
+                &ro_pool,
+                &redis,
+                cursor,
+                self.config.index_chunk_size,
+            )
+            .await
+            .wrap_err("failed to fetch projects from local DB")?;
+            if documents.projects.is_empty() {
+                info!(
+                    "no more documents; indexed {total_projects} projects and {total_versions} versions in {chunk_index} chunks"
+                );
+                break;
+            }
+
+            total_projects += documents.projects.len();
+            total_versions += documents.versions.len();
+            cursor = next_cursor;
+            self.import_projects(
+                std::slice::from_ref(&next),
+                &documents.projects,
+            )
+            .await?;
+            self.import_versions(
+                std::slice::from_ref(&next),
+                &documents.versions,
+            )
+            .await?;
+        }
+
+        self.client.refresh(&next).await?;
+        info!("force-merging Elasticsearch shadow index");
+        self.client.force_merge(&next).await?;
+        info!("swapping Elasticsearch index alias");
+        self.client
+            .swap_alias(&alias, current.as_deref(), &next)
+            .await?;
+        if let Some(old) = current {
+            self.client.delete_index_if_exists(&old).await?;
+        }
+        info!("Elasticsearch indexing complete");
+        Ok(())
+    }
+
+    async fn apply_update(&self, update: SearchIndexUpdate<'_>) -> Result<()> {
+        let removed_project_ids = update
+            .removed_projects
+            .iter()
+            .map(ToString::to_string)
+            .collect::<Vec<_>>();
+        if !removed_project_ids.is_empty() {
+            self.delete_ids("project_id", &removed_project_ids).await?;
+        }
+
+        let version_ids = update
+            .removed_versions
+            .iter()
+            .map(ToString::to_string)
+            .collect::<Vec<_>>();
+        if !version_ids.is_empty() {
+            self.delete_ids("version_id", &version_ids).await?;
+        }
+
+        let indices = self.existing_write_indices().await?;
+        if !update.projects.is_empty() {
+            debug!(
+                ?indices,
+                num_documents = update.projects.len(),
+                "replacing Elasticsearch project documents"
+            );
+            self.import_projects(&indices, update.projects).await?;
+        }
+        if !update.versions.is_empty() {
+            debug!(
+                ?indices,
+                num_documents = update.versions.len(),
+                "replacing Elasticsearch version documents"
+            );
+            self.import_versions(&indices, update.versions).await?;
+        }
+        self.refresh_write_indices().await?;
+        debug!("done applying Elasticsearch search index update");
+        Ok(())
+    }
+
+    async fn tasks(&self) -> Result<Value> {
+        let response = self
+            .client
+            .request(Method::GET, "/_tasks?detailed=true")
+            .send()
+            .await
+            .wrap_err("failed to get Elasticsearch tasks")?;
+        response_json(response, "get Elasticsearch tasks").await
+    }
+
+    async fn tasks_cancel(&self, filter: &TasksCancelFilter) -> Result<()> {
+        match filter {
+            TasksCancelFilter::All => {
+                let response = self
+                    .client
+                    .request(Method::POST, "/_tasks/_cancel")
+                    .send()
+                    .await
+                    .wrap_err("failed to cancel Elasticsearch tasks")?;
+                response_json(response, "cancel Elasticsearch tasks").await?;
+            }
+            TasksCancelFilter::AllEnqueued => {
+                // Elasticsearch executes operations immediately and does not
+                // expose an enqueued-task state.
+            }
+            TasksCancelFilter::Indexes { indexes } => {
+                let tasks = self.tasks().await?;
+                for (_node_id, node) in
+                    tasks["nodes"].as_object().into_iter().flatten()
+                {
+                    for (task_id, task) in
+                        node["tasks"].as_object().into_iter().flatten()
+                    {
+                        let description =
+                            task["description"].as_str().unwrap_or_default();
+                        if indexes
+                            .iter()
+                            .any(|index| description.contains(index))
+                        {
+                            let response = self
+                                .client
+                                .request(
+                                    Method::POST,
+                                    &format!("/_tasks/{task_id}/_cancel"),
+                                )
+                                .send()
+                                .await
+                                .wrap_err(
+                                    "failed to cancel Elasticsearch task",
+                                )?;
+                            response_json(
+                                response,
+                                "cancel Elasticsearch task",
+                            )
+                            .await?;
+                        }
+                    }
+                }
+            }
+        }
+        Ok(())
+    }
+}
+
+fn matching_version_id(hit: &Value) -> Option<String> {
+    hit["inner_hits"]
+        .as_object()?
+        .values()
+        .filter_map(|inner_hits| {
+            let source = inner_hits["hits"]["hits"]
+                .as_array()?
+                .first()?
+                .get("_source")?;
+            Some((
+                source["version_published_timestamp"].as_i64()?,
+                source["version_id"].as_str()?.to_string(),
+            ))
+        })
+        .max_by_key(|(published, _)| *published)
+        .map(|(_, version_id)| version_id)
+}
+
+fn projects_to_bulk(documents: &[UploadSearchProject]) -> Result<String> {
+    let mut output = String::new();
+    for document in documents {
+        let id = format!("project:{}", document.project_id);
+        push_json_line(
+            &mut output,
+            &json!({
+                "index": {
+                    "_id": id,
+                    "routing": document.project_id
+                }
+            }),
+        )?;
+
+        let mut source = serde_json::to_value(document)
+            .wrap_err("failed to serialize `UploadSearchProject`")?;
+        let object = source
+            .as_object_mut()
+            .ok_or_else(|| eyre!("project search document is not an object"))?;
+        object.insert(
+            "document_type".to_string(),
+            Value::String("project".to_string()),
+        );
+        add_server_online_field(object);
+        push_json_line(&mut output, &source)?;
+    }
+    Ok(output)
+}
+
+fn versions_to_bulk(documents: &[UploadSearchVersion]) -> Result<String> {
+    let mut output = String::new();
+    for document in documents {
+        let id = format!("version:{}", document.version_id);
+        push_json_line(
+            &mut output,
+            &json!({
+                "index": {
+                    "_id": id,
+                    "routing": document.project_id
+                }
+            }),
+        )?;
+
+        let mut source = serde_json::to_value(document)
+            .wrap_err("failed to serialize `UploadSearchVersion`")?;
+        source
+            .as_object_mut()
+            .ok_or_else(|| eyre!("version search document is not an object"))?
+            .insert(
+                "document_type".to_string(),
+                json!({
+                    "name": "version",
+                    "parent": format!("project:{}", document.project_id)
+                }),
+            );
+        push_json_line(&mut output, &source)?;
+    }
+    Ok(output)
+}
+
+fn add_server_online_field(object: &mut Map<String, Value>) {
+    let Some(server) = object
+        .get_mut("minecraft_java_server")
+        .and_then(Value::as_object_mut)
+    else {
+        return;
+    };
+    let is_online = server
+        .get("ping")
+        .and_then(Value::as_object)
+        .and_then(|ping| ping.get("data"))
+        .is_some_and(|data| !data.is_null());
+    server.insert("is_online".to_string(), Value::Bool(is_online));
+}
+
+fn push_json_line<T: Serialize>(output: &mut String, value: &T) -> Result<()> {
+    output.push_str(&serde_json::to_string(value)?);
+    output.push('\n');
+    Ok(())
+}
diff --git a/apps/labrinth/src/search/backend/mod.rs b/apps/labrinth/src/search/backend/mod.rs
index 544cf2a557..cb38ae6782 100644
--- a/apps/labrinth/src/search/backend/mod.rs
+++ b/apps/labrinth/src/search/backend/mod.rs
@@ -1,8 +1,10 @@
 mod common;
+pub mod elasticsearch;
 pub mod typesense;
 
 pub use common::{
     ParsedSearchRequest, SearchIndex, SearchSort, combined_search_filters,
     parse_search_index, parse_search_request,
 };
+pub use elasticsearch::{Elasticsearch, ElasticsearchConfig};
 pub use typesense::{Typesense, TypesenseConfig};
diff --git a/apps/labrinth/src/search/indexing.rs b/apps/labrinth/src/search/indexing.rs
index 5180bfea9c..03e6c34061 100644
--- a/apps/labrinth/src/search/indexing.rs
+++ b/apps/labrinth/src/search/indexing.rs
@@ -45,7 +45,7 @@ struct PartialProject {
     components: exp::ProjectSerial,
 }
 
-fn normalize_for_search(s: &str) -> String {
+pub(crate) fn normalize_for_search(s: &str) -> String {
     static SPECIAL_CHARS_RE: LazyLock<Regex> =
         LazyLock::new(|| Regex::new(r"[^a-zA-Z0-9-.\s]").expect("valid regex"));
 
diff --git a/apps/labrinth/src/search/mod.rs b/apps/labrinth/src/search/mod.rs
index f98f9f4cb1..690efe149a 100644
--- a/apps/labrinth/src/search/mod.rs
+++ b/apps/labrinth/src/search/mod.rs
@@ -189,6 +189,7 @@ pub enum TasksCancelFilter {
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub enum SearchBackendKind {
     Typesense,
+    Elasticsearch,
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, strum::EnumIter)]
@@ -224,6 +225,7 @@ impl FromStr for SearchBackendKind {
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         Ok(match s {
             "typesense" => SearchBackendKind::Typesense,
+            "elasticsearch" => SearchBackendKind::Elasticsearch,
             _ => return Err(InvalidSearchBackendKind),
         })
     }
@@ -438,5 +440,9 @@ pub fn backend(meta_namespace: Option<String>) -> Box<dyn SearchBackend> {
             let config = backend::TypesenseConfig::new(meta_namespace);
             Box::new(backend::Typesense::new(config))
         }
+        SearchBackendKind::Elasticsearch => {
+            let config = backend::ElasticsearchConfig::new(meta_namespace);
+            Box::new(backend::Elasticsearch::new(config))
+        }
     }
 }
diff --git a/docker-compose.yml b/docker-compose.yml
index def52d2862..64112bdbc0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -32,6 +32,102 @@ services:
       interval: 3s
       timeout: 5s
       retries: 3
+  elasticsearch0:
+    image: docker.elastic.co/elasticsearch/elasticsearch:9.4.4
+    container_name: labrinth-elasticsearch0
+    restart: on-failure
+    networks:
+      - elasticsearch-mesh
+    ports:
+      - '127.0.0.1:9200:9200'
+    volumes:
+      - elasticsearch0-data:/usr/share/elasticsearch/data
+    environment:
+      node.name: elasticsearch0
+      cluster.name: labrinth-elasticsearch
+      discovery.seed_hosts: elasticsearch0,elasticsearch1,elasticsearch2
+      cluster.initial_master_nodes: elasticsearch0,elasticsearch1,elasticsearch2
+      bootstrap.memory_lock: 'true'
+      xpack.security.enabled: 'false'
+      xpack.security.enrollment.enabled: 'false'
+      ES_JAVA_OPTS: -Xms512m -Xmx512m
+    ulimits:
+      memlock:
+        soft: -1
+        hard: -1
+    healthcheck:
+      test:
+        [
+          'CMD-SHELL',
+          'curl --fail http://localhost:9200/_cluster/health?wait_for_status=yellow',
+        ]
+      interval: 5s
+      timeout: 5s
+      retries: 30
+  elasticsearch1:
+    image: docker.elastic.co/elasticsearch/elasticsearch:9.4.4
+    container_name: labrinth-elasticsearch1
+    restart: on-failure
+    networks:
+      - elasticsearch-mesh
+    ports:
+      - '127.0.0.1:9201:9200'
+    volumes:
+      - elasticsearch1-data:/usr/share/elasticsearch/data
+    environment:
+      node.name: elasticsearch1
+      cluster.name: labrinth-elasticsearch
+      discovery.seed_hosts: elasticsearch0,elasticsearch1,elasticsearch2
+      cluster.initial_master_nodes: elasticsearch0,elasticsearch1,elasticsearch2
+      bootstrap.memory_lock: 'true'
+      xpack.security.enabled: 'false'
+      xpack.security.enrollment.enabled: 'false'
+      ES_JAVA_OPTS: -Xms512m -Xmx512m
+    ulimits:
+      memlock:
+        soft: -1
+        hard: -1
+    healthcheck:
+      test:
+        [
+          'CMD-SHELL',
+          'curl --fail http://localhost:9200/_cluster/health?wait_for_status=yellow',
+        ]
+      interval: 5s
+      timeout: 5s
+      retries: 30
+  elasticsearch2:
+    image: docker.elastic.co/elasticsearch/elasticsearch:9.4.4
+    container_name: labrinth-elasticsearch2
+    restart: on-failure
+    networks:
+      - elasticsearch-mesh
+    ports:
+      - '127.0.0.1:9202:9200'
+    volumes:
+      - elasticsearch2-data:/usr/share/elasticsearch/data
+    environment:
+      node.name: elasticsearch2
+      cluster.name: labrinth-elasticsearch
+      discovery.seed_hosts: elasticsearch0,elasticsearch1,elasticsearch2
+      cluster.initial_master_nodes: elasticsearch0,elasticsearch1,elasticsearch2
+      bootstrap.memory_lock: 'true'
+      xpack.security.enabled: 'false'
+      xpack.security.enrollment.enabled: 'false'
+      ES_JAVA_OPTS: -Xms512m -Xmx512m
+    ulimits:
+      memlock:
+        soft: -1
+        hard: -1
+    healthcheck:
+      test:
+        [
+          'CMD-SHELL',
+          'curl --fail http://localhost:9200/_cluster/health?wait_for_status=yellow',
+        ]
+      interval: 5s
+      timeout: 5s
+      retries: 30
   meilisearch0:
     image: getmeili/meilisearch:v1.12.0
     container_name: labrinth-meilisearch0
@@ -398,7 +494,7 @@ services:
     depends_on:
       postgres_db:
         condition: service_healthy
-      meilisearch:
+      meilisearch0:
         condition: service_healthy
       elasticsearch0:
         condition: service_healthy
@@ -481,6 +577,8 @@ services:
     volumes:
       - ./apps/labrinth/nginx/meili-lb.conf:/etc/nginx/conf.d/default.conf:ro
 networks:
+  elasticsearch-mesh:
+    driver: bridge
   meilisearch-mesh:
     driver: bridge
   redis-cluster-mesh:

From 6715a9c679086da224a4a432666db857696e3ec2 Mon Sep 17 00:00:00 2001
From: aecsocket <43144841+aecsocket@users.noreply.github.com>
Date: Tue, 4 Aug 2026 03:15:13 +0900
Subject: [PATCH 16/82] fix: global traces QA notes (#6977)

* updated at cols + search by path

* speed up scanning

* migration does not auto-set updated_at

* merge migrations
---
 ...84d26550d01a1917d1af64fe236d63dd5005.json} | 11 ++--
 ...bc49666e9fc8a400a5c41660504205e7cac5.json} |  4 +-
 ...6d08579dff663d5146c2bdfa0812fed6a4587.json | 22 +++++++
 ...a48057c24dece008dbf2c00c6ec135d8cef41.json | 60 ++++++++++++++++++
 ...7935ac84730b52a2ee090512a460cf512432.json} |  4 +-
 ...8501addc8f203a0a152346aaebd32db52be30.json | 60 ------------------
 ...01239cefbe174f4a5cc4b8eb21a10268cd73.json} |  4 +-
 ...cf7a059a49387c0c564b730733bda7358f7fe.json | 22 -------
 ...20000_delphi_detail_verdict_timestamps.sql | 11 ++++
 .../internal/delphi/tech_review_sync.rs       | 62 ++++++++++---------
 .../routes/internal/moderation/tech_review.rs | 20 ++++--
 .../internal/moderation/tech_review/global.rs | 26 ++++++++
 12 files changed, 180 insertions(+), 126 deletions(-)
 rename apps/labrinth/.sqlx/{query-87d30e8802ebe69858141d0d918cafb5286f984cfe55ad1a7ac2219ec50539a4.json => query-1551b022217df05490a01e715b3584d26550d01a1917d1af64fe236d63dd5005.json} (76%)
 rename apps/labrinth/.sqlx/{query-4680c4a59c6679f90e3b9e1a33ed1cb1fb60b93ffb79ba5b99e01ee0c14c991a.json => query-33d4e31565ece4a99832cbfd0a39bc49666e9fc8a400a5c41660504205e7cac5.json} (63%)
 create mode 100644 apps/labrinth/.sqlx/query-58a1fc9e1d76a891c961e02544b6d08579dff663d5146c2bdfa0812fed6a4587.json
 create mode 100644 apps/labrinth/.sqlx/query-6241bc72a80de01fd8e5506442da48057c24dece008dbf2c00c6ec135d8cef41.json
 rename apps/labrinth/.sqlx/{query-7ca85bcc45e7d53106ea75b606ce2219bd37be7bb33588179cca6f1a26e5bb23.json => query-7ca9b8f5699f4d60acc50647b7577935ac84730b52a2ee090512a460cf512432.json} (64%)
 delete mode 100644 apps/labrinth/.sqlx/query-bb94018c84f3809b9ad89f35ff08501addc8f203a0a152346aaebd32db52be30.json
 rename apps/labrinth/.sqlx/{query-e8b6e423aaf62046afd19fb1e177a3ef1f18f4814df8924926c47d4b0c7145c7.json => query-c40c2085202bc4486568fb24db9201239cefbe174f4a5cc4b8eb21a10268cd73.json} (72%)
 delete mode 100644 apps/labrinth/.sqlx/query-c9d5796b2c98dedd9f2f237a1a2cf7a059a49387c0c564b730733bda7358f7fe.json
 create mode 100644 apps/labrinth/migrations/20260803120000_delphi_detail_verdict_timestamps.sql

diff --git a/apps/labrinth/.sqlx/query-87d30e8802ebe69858141d0d918cafb5286f984cfe55ad1a7ac2219ec50539a4.json b/apps/labrinth/.sqlx/query-1551b022217df05490a01e715b3584d26550d01a1917d1af64fe236d63dd5005.json
similarity index 76%
rename from apps/labrinth/.sqlx/query-87d30e8802ebe69858141d0d918cafb5286f984cfe55ad1a7ac2219ec50539a4.json
rename to apps/labrinth/.sqlx/query-1551b022217df05490a01e715b3584d26550d01a1917d1af64fe236d63dd5005.json
index eabfd4299d..434d224cc7 100644
--- a/apps/labrinth/.sqlx/query-87d30e8802ebe69858141d0d918cafb5286f984cfe55ad1a7ac2219ec50539a4.json
+++ b/apps/labrinth/.sqlx/query-1551b022217df05490a01e715b3584d26550d01a1917d1af64fe236d63dd5005.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n        WITH ranked_local_traces AS (\n            SELECT\n                didws.key AS detail_key,\n                didws.id AS detail_id,\n                didws.issue_id,\n                dri.issue_type,\n                m.id AS project_id,\n                m.slug AS project_slug,\n                m.name AS project_name,\n                v.id AS version_id,\n                v.version_number,\n                f.id AS file_id,\n                f.filename AS file_name,\n                didws.jar,\n                didws.file_path,\n                didws.severity,\n                COALESCE(didv.verdict, 'pending'::delphi_report_issue_status)\n                    AS local_status,\n                didws.status AS effective_status,\n                ROW_NUMBER() OVER (\n                    PARTITION BY didws.key\n                    ORDER BY didws.id\n                ) AS row_num\n            FROM delphi_issue_details_with_statuses didws\n            INNER JOIN delphi_report_issues dri ON dri.id = didws.issue_id\n            INNER JOIN delphi_reports dr ON dr.id = dri.report_id\n            INNER JOIN files f ON f.id = dr.file_id\n            INNER JOIN versions v ON v.id = f.version_id\n            INNER JOIN mods m ON m.id = v.mod_id\n            LEFT JOIN delphi_issue_detail_verdicts didv\n                ON didv.project_id = didws.project_id\n                AND didv.detail_key = didws.key\n            WHERE\n                didws.key = ANY($1::text[])\n                AND dri.issue_type != '__dummy'\n        )\n        SELECT\n            detail_key AS \"detail_key!\",\n            detail_id AS \"detail_id!: DelphiReportIssueDetailsId\",\n            issue_id AS \"issue_id!: DelphiReportIssueId\",\n            issue_type,\n            project_id AS \"project_id!: DBProjectId\",\n            project_slug AS \"project_slug?\",\n            project_name AS \"project_name!\",\n            version_id AS \"version_id!: DBVersionId\",\n            v.version_number,\n            file_id AS \"file_id!: DBFileId\",\n            file_name AS \"file_name!\",\n            jar AS \"jar?\",\n            file_path AS \"file_path!\",\n            severity AS \"severity!: DelphiSeverity\",\n            local_status AS \"local_status!: DelphiStatus\",\n            effective_status AS \"effective_status!: DelphiStatus\"\n        FROM ranked_local_traces v\n        WHERE row_num <= $2\n        ORDER BY detail_key, detail_id\n        ",
+  "query": "\n        WITH ranked_local_traces AS (\n            SELECT\n                didws.key AS detail_key,\n                didws.id AS detail_id,\n                didws.issue_id,\n                dri.issue_type,\n                m.id AS project_id,\n                m.slug AS project_slug,\n                m.name AS project_name,\n                v.id AS version_id,\n                v.version_number,\n                f.id AS file_id,\n                f.filename AS file_name,\n                didws.jar,\n                didws.file_path,\n                didws.severity,\n                COALESCE(didv.verdict, 'pending'::delphi_report_issue_status)\n                    AS local_status,\n                didws.status AS effective_status,\n                ROW_NUMBER() OVER (\n                    PARTITION BY didws.key\n                    ORDER BY didws.id\n                ) AS row_num\n            FROM delphi_issue_details_with_statuses didws\n            INNER JOIN delphi_report_issues dri ON dri.id = didws.issue_id\n            INNER JOIN delphi_reports dr ON dr.id = dri.report_id\n            INNER JOIN files f ON f.id = dr.file_id\n            INNER JOIN versions v ON v.id = f.version_id\n            INNER JOIN mods m ON m.id = v.mod_id\n            LEFT JOIN delphi_issue_detail_verdicts didv\n                ON didv.project_id = didws.project_id\n                AND didv.detail_key = didws.key\n            WHERE\n                didws.key = ANY($1::text[])\n                AND dri.issue_type != '__dummy'\n                AND (\n                    $3::text IS NULL\n                    OR didws.key ILIKE '%' || $3 || '%'\n                    OR didws.file_path ILIKE '%' || $3 || '%'\n                )\n        )\n        SELECT\n            detail_key AS \"detail_key!\",\n            detail_id AS \"detail_id!: DelphiReportIssueDetailsId\",\n            issue_id AS \"issue_id!: DelphiReportIssueId\",\n            issue_type,\n            project_id AS \"project_id!: DBProjectId\",\n            project_slug AS \"project_slug?\",\n            project_name AS \"project_name!\",\n            version_id AS \"version_id!: DBVersionId\",\n            v.version_number,\n            file_id AS \"file_id!: DBFileId\",\n            file_name AS \"file_name!\",\n            jar AS \"jar?\",\n            file_path AS \"file_path!\",\n            severity AS \"severity!: DelphiSeverity\",\n            local_status AS \"local_status!: DelphiStatus\",\n            effective_status AS \"effective_status!: DelphiStatus\"\n        FROM ranked_local_traces v\n        WHERE row_num <= $2\n        ORDER BY detail_key, detail_id\n        ",
   "describe": {
     "columns": [
       {
@@ -76,10 +76,12 @@
             "name": "delphi_severity",
             "kind": {
               "Enum": [
+                "hidden",
                 "low",
                 "medium",
                 "high",
-                "severe"
+                "severe",
+                "malware"
               ]
             }
           }
@@ -121,7 +123,8 @@
     "parameters": {
       "Left": [
         "TextArray",
-        "Int8"
+        "Int8",
+        "Text"
       ]
     },
     "nullable": [
@@ -143,5 +146,5 @@
       true
     ]
   },
-  "hash": "87d30e8802ebe69858141d0d918cafb5286f984cfe55ad1a7ac2219ec50539a4"
+  "hash": "1551b022217df05490a01e715b3584d26550d01a1917d1af64fe236d63dd5005"
 }
diff --git a/apps/labrinth/.sqlx/query-4680c4a59c6679f90e3b9e1a33ed1cb1fb60b93ffb79ba5b99e01ee0c14c991a.json b/apps/labrinth/.sqlx/query-33d4e31565ece4a99832cbfd0a39bc49666e9fc8a400a5c41660504205e7cac5.json
similarity index 63%
rename from apps/labrinth/.sqlx/query-4680c4a59c6679f90e3b9e1a33ed1cb1fb60b93ffb79ba5b99e01ee0c14c991a.json
rename to apps/labrinth/.sqlx/query-33d4e31565ece4a99832cbfd0a39bc49666e9fc8a400a5c41660504205e7cac5.json
index 21c5f042e6..509e4cc4dd 100644
--- a/apps/labrinth/.sqlx/query-4680c4a59c6679f90e3b9e1a33ed1cb1fb60b93ffb79ba5b99e01ee0c14c991a.json
+++ b/apps/labrinth/.sqlx/query-33d4e31565ece4a99832cbfd0a39bc49666e9fc8a400a5c41660504205e7cac5.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n        SELECT\n            dgdv.detail_key,\n            dgdv.verdict AS \"verdict!: DelphiStatus\",\n            COUNT(dri.id) AS \"local_trace_count!\"\n        FROM delphi_global_detail_verdicts dgdv\n        LEFT JOIN delphi_issue_details_with_statuses didws\n            ON didws.key = dgdv.detail_key\n        LEFT JOIN delphi_report_issues dri\n            ON dri.id = didws.issue_id\n            AND dri.issue_type != '__dummy'\n        WHERE (\n            $1::text IS NULL\n            OR dgdv.detail_key ILIKE '%' || $1 || '%'\n        )\n        GROUP BY dgdv.detail_key, dgdv.verdict\n        ORDER BY dgdv.detail_key\n        LIMIT $2 OFFSET $3\n        ",
+  "query": "\n        SELECT\n            dgdv.detail_key,\n            dgdv.verdict AS \"verdict!: DelphiStatus\",\n            COUNT(dri.id) AS \"local_trace_count!\"\n        FROM delphi_global_detail_verdicts dgdv\n        LEFT JOIN delphi_issue_details_with_statuses didws\n            ON didws.key = dgdv.detail_key\n        LEFT JOIN delphi_report_issues dri\n            ON dri.id = didws.issue_id\n            AND dri.issue_type != '__dummy'\n        WHERE (\n            $1::text IS NULL\n            OR dgdv.detail_key ILIKE '%' || $1 || '%'\n            OR EXISTS (\n                SELECT 1\n                FROM delphi_issue_details_with_statuses matching_didws\n                INNER JOIN delphi_report_issues matching_dri\n                    ON matching_dri.id = matching_didws.issue_id\n                WHERE\n                    matching_didws.key = dgdv.detail_key\n                    AND matching_dri.issue_type != '__dummy'\n                    AND matching_didws.file_path ILIKE '%' || $1 || '%'\n            )\n        )\n        GROUP BY dgdv.detail_key, dgdv.verdict\n        ORDER BY dgdv.detail_key\n        LIMIT $2 OFFSET $3\n        ",
   "describe": {
     "columns": [
       {
@@ -43,5 +43,5 @@
       null
     ]
   },
-  "hash": "4680c4a59c6679f90e3b9e1a33ed1cb1fb60b93ffb79ba5b99e01ee0c14c991a"
+  "hash": "33d4e31565ece4a99832cbfd0a39bc49666e9fc8a400a5c41660504205e7cac5"
 }
diff --git a/apps/labrinth/.sqlx/query-58a1fc9e1d76a891c961e02544b6d08579dff663d5146c2bdfa0812fed6a4587.json b/apps/labrinth/.sqlx/query-58a1fc9e1d76a891c961e02544b6d08579dff663d5146c2bdfa0812fed6a4587.json
new file mode 100644
index 0000000000..772f1d9346
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-58a1fc9e1d76a891c961e02544b6d08579dff663d5146c2bdfa0812fed6a4587.json
@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        SELECT COUNT(*) AS \"total!\"\n        FROM delphi_global_detail_verdicts dgdv\n        WHERE (\n            $1::text IS NULL\n            OR dgdv.detail_key ILIKE '%' || $1 || '%'\n            OR EXISTS (\n                SELECT 1\n                FROM delphi_issue_details_with_statuses matching_didws\n                INNER JOIN delphi_report_issues matching_dri\n                    ON matching_dri.id = matching_didws.issue_id\n                WHERE\n                    matching_didws.key = dgdv.detail_key\n                    AND matching_dri.issue_type != '__dummy'\n                    AND matching_didws.file_path ILIKE '%' || $1 || '%'\n            )\n        )\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "total!",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "58a1fc9e1d76a891c961e02544b6d08579dff663d5146c2bdfa0812fed6a4587"
+}
diff --git a/apps/labrinth/.sqlx/query-6241bc72a80de01fd8e5506442da48057c24dece008dbf2c00c6ec135d8cef41.json b/apps/labrinth/.sqlx/query-6241bc72a80de01fd8e5506442da48057c24dece008dbf2c00c6ec135d8cef41.json
new file mode 100644
index 0000000000..665cd936e4
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-6241bc72a80de01fd8e5506442da48057c24dece008dbf2c00c6ec135d8cef41.json
@@ -0,0 +1,60 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        WITH project_ids AS (\n            SELECT unnest($1::bigint[]) AS project_id\n        ),\n        detail_states AS (\n            SELECT\n                p.project_id,\n                COALESCE(\n                    BOOL_OR(\n                        didws.status = 'pending'\n                        AND dri.issue_type != $3\n                    ),\n                    FALSE\n                ) AS has_pending_detail,\n                COALESCE(\n                    BOOL_OR(\n                        didws.status = 'unsafe'\n                        AND dri.issue_type != $3\n                    ),\n                    FALSE\n                ) AS has_unsafe_detail,\n                COALESCE(\n                    BOOL_OR(\n                        didws.status = 'pending'\n                        AND dri.issue_type = $3\n                    ),\n                    FALSE\n                ) AS has_dummy\n            FROM project_ids p\n            LEFT JOIN delphi_issue_details_with_statuses didws\n                ON didws.project_id = p.project_id\n            LEFT JOIN delphi_report_issues dri ON dri.id = didws.issue_id\n            GROUP BY p.project_id\n        )\n        SELECT\n            p.project_id AS \"project_id!: DBProjectId\",\n            p.has_pending_detail AS \"has_pending_detail!\",\n            p.has_unsafe_detail AS \"has_unsafe_detail!\",\n            p.has_dummy AS \"has_dummy!\",\n            (\n                SELECT t.id\n                FROM threads t\n                WHERE t.mod_id = p.project_id\n                ORDER BY t.id\n                LIMIT 1\n            ) AS \"thread_id: DBThreadId\",\n            (\n                SELECT tm.body->>'type'\n                FROM threads t\n                INNER JOIN threads_messages tm ON tm.thread_id = t.id\n                WHERE\n                    t.mod_id = p.project_id\n                    AND tm.body->>'type' = ANY($2::text[])\n                ORDER BY tm.created DESC, tm.id DESC\n                LIMIT 1\n            ) AS \"last_tech_review_message_type\",\n            (\n                SELECT dr.id\n                FROM versions v\n                INNER JOIN files f ON f.version_id = v.id\n                INNER JOIN delphi_reports dr ON dr.file_id = f.id\n                WHERE v.mod_id = p.project_id\n                ORDER BY dr.created DESC, dr.id DESC\n                LIMIT 1\n            ) AS \"report_id: DelphiReportId\"\n        FROM detail_states p\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "project_id!: DBProjectId",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 1,
+        "name": "has_pending_detail!",
+        "type_info": "Bool"
+      },
+      {
+        "ordinal": 2,
+        "name": "has_unsafe_detail!",
+        "type_info": "Bool"
+      },
+      {
+        "ordinal": 3,
+        "name": "has_dummy!",
+        "type_info": "Bool"
+      },
+      {
+        "ordinal": 4,
+        "name": "thread_id: DBThreadId",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 5,
+        "name": "last_tech_review_message_type",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 6,
+        "name": "report_id: DelphiReportId",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int8Array",
+        "TextArray",
+        "Text"
+      ]
+    },
+    "nullable": [
+      null,
+      null,
+      null,
+      null,
+      null,
+      null,
+      null
+    ]
+  },
+  "hash": "6241bc72a80de01fd8e5506442da48057c24dece008dbf2c00c6ec135d8cef41"
+}
diff --git a/apps/labrinth/.sqlx/query-7ca85bcc45e7d53106ea75b606ce2219bd37be7bb33588179cca6f1a26e5bb23.json b/apps/labrinth/.sqlx/query-7ca9b8f5699f4d60acc50647b7577935ac84730b52a2ee090512a460cf512432.json
similarity index 64%
rename from apps/labrinth/.sqlx/query-7ca85bcc45e7d53106ea75b606ce2219bd37be7bb33588179cca6f1a26e5bb23.json
rename to apps/labrinth/.sqlx/query-7ca9b8f5699f4d60acc50647b7577935ac84730b52a2ee090512a460cf512432.json
index f97540b2bc..606f1b807f 100644
--- a/apps/labrinth/.sqlx/query-7ca85bcc45e7d53106ea75b606ce2219bd37be7bb33588179cca6f1a26e5bb23.json
+++ b/apps/labrinth/.sqlx/query-7ca9b8f5699f4d60acc50647b7577935ac84730b52a2ee090512a460cf512432.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n        WITH incoming AS (\n            SELECT *\n            FROM unnest($1::text[], $2::text[]) WITH ORDINALITY\n                AS u(detail_key, verdict, ord)\n        ),\n        latest AS (\n            SELECT DISTINCT ON (detail_key)\n                detail_key,\n                verdict\n            FROM incoming\n            ORDER BY detail_key, ord DESC\n        ),\n        deleted AS (\n            DELETE FROM delphi_global_detail_verdicts dgdv\n            USING latest\n            WHERE\n                dgdv.detail_key = latest.detail_key\n                AND latest.verdict = 'pending'\n            RETURNING 1\n        )\n        INSERT INTO delphi_global_detail_verdicts (\n            detail_key,\n            verdict\n        )\n        SELECT\n            detail_key,\n            verdict::delphi_report_issue_status\n        FROM latest\n        WHERE verdict != 'pending'\n        ON CONFLICT (detail_key)\n        DO UPDATE SET verdict = EXCLUDED.verdict\n        ",
+  "query": "\n        WITH incoming AS (\n            SELECT *\n            FROM unnest($1::text[], $2::text[]) WITH ORDINALITY\n                AS u(detail_key, verdict, ord)\n        ),\n        latest AS (\n            SELECT DISTINCT ON (detail_key)\n                detail_key,\n                verdict\n            FROM incoming\n            ORDER BY detail_key, ord DESC\n        ),\n        deleted AS (\n            DELETE FROM delphi_global_detail_verdicts dgdv\n            USING latest\n            WHERE\n                dgdv.detail_key = latest.detail_key\n                AND latest.verdict = 'pending'\n            RETURNING 1\n        )\n        INSERT INTO delphi_global_detail_verdicts (\n            detail_key,\n            verdict,\n            updated_at\n        )\n        SELECT\n            detail_key,\n            verdict::delphi_report_issue_status,\n            NOW()\n        FROM latest\n        WHERE verdict != 'pending'\n        ON CONFLICT (detail_key)\n        DO UPDATE SET\n            verdict = EXCLUDED.verdict,\n            updated_at = EXCLUDED.updated_at\n        ",
   "describe": {
     "columns": [],
     "parameters": {
@@ -11,5 +11,5 @@
     },
     "nullable": []
   },
-  "hash": "7ca85bcc45e7d53106ea75b606ce2219bd37be7bb33588179cca6f1a26e5bb23"
+  "hash": "7ca9b8f5699f4d60acc50647b7577935ac84730b52a2ee090512a460cf512432"
 }
diff --git a/apps/labrinth/.sqlx/query-bb94018c84f3809b9ad89f35ff08501addc8f203a0a152346aaebd32db52be30.json b/apps/labrinth/.sqlx/query-bb94018c84f3809b9ad89f35ff08501addc8f203a0a152346aaebd32db52be30.json
deleted file mode 100644
index 247c99cd89..0000000000
--- a/apps/labrinth/.sqlx/query-bb94018c84f3809b9ad89f35ff08501addc8f203a0a152346aaebd32db52be30.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n        WITH project_ids AS (\n            SELECT unnest($1::bigint[]) AS project_id\n        )\n        SELECT\n            p.project_id AS \"project_id!: DBProjectId\",\n            EXISTS(\n                SELECT 1\n                FROM delphi_issue_details_with_statuses didws\n                INNER JOIN delphi_report_issues dri ON dri.id = didws.issue_id\n                WHERE\n                    didws.project_id = p.project_id\n                    AND didws.status = 'pending'\n                    AND dri.issue_type != $3\n            ) AS \"has_pending_detail!\",\n            EXISTS(\n                SELECT 1\n                FROM delphi_issue_details_with_statuses didws\n                INNER JOIN delphi_report_issues dri ON dri.id = didws.issue_id\n                WHERE\n                    didws.project_id = p.project_id\n                    AND didws.status = 'unsafe'\n                    AND dri.issue_type != $3\n            ) AS \"has_unsafe_detail!\",\n            EXISTS(\n                SELECT 1\n                FROM delphi_issue_details_with_statuses didws\n                INNER JOIN delphi_report_issues dri ON dri.id = didws.issue_id\n                WHERE\n                    didws.project_id = p.project_id\n                    AND didws.status = 'pending'\n                    AND dri.issue_type = $3\n            ) AS \"has_dummy!\",\n            (\n                SELECT t.id\n                FROM threads t\n                WHERE t.mod_id = p.project_id\n                ORDER BY t.id\n                LIMIT 1\n            ) AS \"thread_id: DBThreadId\",\n            (\n                SELECT tm.body->>'type'\n                FROM threads t\n                INNER JOIN threads_messages tm ON tm.thread_id = t.id\n                WHERE\n                    t.mod_id = p.project_id\n                    AND tm.body->>'type' = ANY($2::text[])\n                ORDER BY tm.created DESC, tm.id DESC\n                LIMIT 1\n            ) AS \"last_tech_review_message_type\",\n            (\n                SELECT dr.id\n                FROM versions v\n                INNER JOIN files f ON f.version_id = v.id\n                INNER JOIN delphi_reports dr ON dr.file_id = f.id\n                WHERE v.mod_id = p.project_id\n                ORDER BY dr.created DESC, dr.id DESC\n                LIMIT 1\n            ) AS \"report_id: DelphiReportId\"\n        FROM project_ids p\n        ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "project_id!: DBProjectId",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 1,
-        "name": "has_pending_detail!",
-        "type_info": "Bool"
-      },
-      {
-        "ordinal": 2,
-        "name": "has_unsafe_detail!",
-        "type_info": "Bool"
-      },
-      {
-        "ordinal": 3,
-        "name": "has_dummy!",
-        "type_info": "Bool"
-      },
-      {
-        "ordinal": 4,
-        "name": "thread_id: DBThreadId",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 5,
-        "name": "last_tech_review_message_type",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 6,
-        "name": "report_id: DelphiReportId",
-        "type_info": "Int8"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int8Array",
-        "TextArray",
-        "Text"
-      ]
-    },
-    "nullable": [
-      null,
-      null,
-      null,
-      null,
-      null,
-      null,
-      null
-    ]
-  },
-  "hash": "bb94018c84f3809b9ad89f35ff08501addc8f203a0a152346aaebd32db52be30"
-}
diff --git a/apps/labrinth/.sqlx/query-e8b6e423aaf62046afd19fb1e177a3ef1f18f4814df8924926c47d4b0c7145c7.json b/apps/labrinth/.sqlx/query-c40c2085202bc4486568fb24db9201239cefbe174f4a5cc4b8eb21a10268cd73.json
similarity index 72%
rename from apps/labrinth/.sqlx/query-e8b6e423aaf62046afd19fb1e177a3ef1f18f4814df8924926c47d4b0c7145c7.json
rename to apps/labrinth/.sqlx/query-c40c2085202bc4486568fb24db9201239cefbe174f4a5cc4b8eb21a10268cd73.json
index 1e3e8c4d7f..81c343b584 100644
--- a/apps/labrinth/.sqlx/query-e8b6e423aaf62046afd19fb1e177a3ef1f18f4814df8924926c47d4b0c7145c7.json
+++ b/apps/labrinth/.sqlx/query-c40c2085202bc4486568fb24db9201239cefbe174f4a5cc4b8eb21a10268cd73.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n        WITH incoming AS (\n            SELECT *\n            FROM unnest($1::bigint[], $2::text[]) WITH ORDINALITY\n                AS u(detail_id, verdict, ord)\n        ),\n        resolved AS (\n            SELECT\n                i.ord,\n                didws.project_id,\n                didws.key AS detail_key,\n                i.verdict\n            FROM incoming i\n            INNER JOIN delphi_issue_details_with_statuses didws ON didws.id = i.detail_id\n            INNER JOIN delphi_report_issues dri ON dri.id = didws.issue_id\n            WHERE\n                -- see delphi.rs todo comment\n                dri.issue_type != '__dummy'\n        ),\n        validated AS (\n            SELECT\n                (SELECT COUNT(*) FROM incoming) AS incoming_count,\n                (SELECT COUNT(*) FROM resolved) AS resolved_count\n        ),\n        latest AS (\n            SELECT DISTINCT ON (project_id, detail_key)\n                project_id,\n                detail_key,\n                verdict\n            FROM resolved\n            ORDER BY project_id, detail_key, ord DESC\n        ),\n        deleted AS (\n            DELETE FROM delphi_issue_detail_verdicts didv\n            USING latest\n            WHERE\n                didv.project_id = latest.project_id\n                AND didv.detail_key = latest.detail_key\n                AND latest.verdict = 'pending'\n            RETURNING 1\n        ),\n        upserted AS (\n            INSERT INTO delphi_issue_detail_verdicts (\n                project_id,\n                detail_key,\n                verdict\n            )\n            SELECT\n                project_id,\n                detail_key,\n                verdict::delphi_report_issue_status\n            FROM latest\n            WHERE verdict != 'pending'\n            ON CONFLICT (project_id, detail_key)\n            DO UPDATE SET verdict = EXCLUDED.verdict\n            RETURNING 1\n        )\n        SELECT\n            (v.incoming_count = v.resolved_count) AS \"all_found!\",\n            (SELECT COUNT(*) FROM upserted) AS \"upserted_count!\"\n        FROM validated v\n        ",
+  "query": "\n        WITH incoming AS (\n            SELECT *\n            FROM unnest($1::bigint[], $2::text[]) WITH ORDINALITY\n                AS u(detail_id, verdict, ord)\n        ),\n        resolved AS (\n            SELECT\n                i.ord,\n                didws.project_id,\n                didws.key AS detail_key,\n                i.verdict\n            FROM incoming i\n            INNER JOIN delphi_issue_details_with_statuses didws ON didws.id = i.detail_id\n            INNER JOIN delphi_report_issues dri ON dri.id = didws.issue_id\n            WHERE\n                -- see delphi.rs todo comment\n                dri.issue_type != '__dummy'\n        ),\n        validated AS (\n            SELECT\n                (SELECT COUNT(*) FROM incoming) AS incoming_count,\n                (SELECT COUNT(*) FROM resolved) AS resolved_count\n        ),\n        latest AS (\n            SELECT DISTINCT ON (project_id, detail_key)\n                project_id,\n                detail_key,\n                verdict\n            FROM resolved\n            ORDER BY project_id, detail_key, ord DESC\n        ),\n        deleted AS (\n            DELETE FROM delphi_issue_detail_verdicts didv\n            USING latest\n            WHERE\n                didv.project_id = latest.project_id\n                AND didv.detail_key = latest.detail_key\n                AND latest.verdict = 'pending'\n            RETURNING 1\n        ),\n        upserted AS (\n            INSERT INTO delphi_issue_detail_verdicts (\n                project_id,\n                detail_key,\n                verdict,\n                updated_at\n            )\n            SELECT\n                project_id,\n                detail_key,\n                verdict::delphi_report_issue_status,\n                NOW()\n            FROM latest\n            WHERE verdict != 'pending'\n            ON CONFLICT (project_id, detail_key)\n            DO UPDATE SET\n                verdict = EXCLUDED.verdict,\n                updated_at = EXCLUDED.updated_at\n            RETURNING 1\n        )\n        SELECT\n            (v.incoming_count = v.resolved_count) AS \"all_found!\",\n            (SELECT COUNT(*) FROM upserted) AS \"upserted_count!\"\n        FROM validated v\n        ",
   "describe": {
     "columns": [
       {
@@ -25,5 +25,5 @@
       null
     ]
   },
-  "hash": "e8b6e423aaf62046afd19fb1e177a3ef1f18f4814df8924926c47d4b0c7145c7"
+  "hash": "c40c2085202bc4486568fb24db9201239cefbe174f4a5cc4b8eb21a10268cd73"
 }
diff --git a/apps/labrinth/.sqlx/query-c9d5796b2c98dedd9f2f237a1a2cf7a059a49387c0c564b730733bda7358f7fe.json b/apps/labrinth/.sqlx/query-c9d5796b2c98dedd9f2f237a1a2cf7a059a49387c0c564b730733bda7358f7fe.json
deleted file mode 100644
index 3d0aa419ad..0000000000
--- a/apps/labrinth/.sqlx/query-c9d5796b2c98dedd9f2f237a1a2cf7a059a49387c0c564b730733bda7358f7fe.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n        SELECT COUNT(*) AS \"total!\"\n        FROM delphi_global_detail_verdicts dgdv\n        WHERE (\n            $1::text IS NULL\n            OR dgdv.detail_key ILIKE '%' || $1 || '%'\n        )\n        ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "total!",
-        "type_info": "Int8"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Text"
-      ]
-    },
-    "nullable": [
-      null
-    ]
-  },
-  "hash": "c9d5796b2c98dedd9f2f237a1a2cf7a059a49387c0c564b730733bda7358f7fe"
-}
diff --git a/apps/labrinth/migrations/20260803120000_delphi_detail_verdict_timestamps.sql b/apps/labrinth/migrations/20260803120000_delphi_detail_verdict_timestamps.sql
new file mode 100644
index 0000000000..8ed20055a5
--- /dev/null
+++ b/apps/labrinth/migrations/20260803120000_delphi_detail_verdict_timestamps.sql
@@ -0,0 +1,11 @@
+ALTER TABLE delphi_issue_detail_verdicts
+	ADD COLUMN updated_at TIMESTAMPTZ;
+
+ALTER TABLE delphi_global_detail_verdicts
+	ADD COLUMN updated_at TIMESTAMPTZ;
+
+CREATE INDEX delphi_report_issue_details_issue_id
+	ON delphi_report_issue_details (issue_id);
+
+CREATE INDEX threads_messages_thread_id_created_id
+	ON threads_messages (thread_id, created DESC, id DESC);
diff --git a/apps/labrinth/src/routes/internal/delphi/tech_review_sync.rs b/apps/labrinth/src/routes/internal/delphi/tech_review_sync.rs
index 23a45d218a..e67c9e517e 100644
--- a/apps/labrinth/src/routes/internal/delphi/tech_review_sync.rs
+++ b/apps/labrinth/src/routes/internal/delphi/tech_review_sync.rs
@@ -88,36 +88,42 @@ pub async fn sync_project_tech_review_state(
         r#"
         WITH project_ids AS (
             SELECT unnest($1::bigint[]) AS project_id
+        ),
+        detail_states AS (
+            SELECT
+                p.project_id,
+                COALESCE(
+                    BOOL_OR(
+                        didws.status = 'pending'
+                        AND dri.issue_type != $3
+                    ),
+                    FALSE
+                ) AS has_pending_detail,
+                COALESCE(
+                    BOOL_OR(
+                        didws.status = 'unsafe'
+                        AND dri.issue_type != $3
+                    ),
+                    FALSE
+                ) AS has_unsafe_detail,
+                COALESCE(
+                    BOOL_OR(
+                        didws.status = 'pending'
+                        AND dri.issue_type = $3
+                    ),
+                    FALSE
+                ) AS has_dummy
+            FROM project_ids p
+            LEFT JOIN delphi_issue_details_with_statuses didws
+                ON didws.project_id = p.project_id
+            LEFT JOIN delphi_report_issues dri ON dri.id = didws.issue_id
+            GROUP BY p.project_id
         )
         SELECT
             p.project_id AS "project_id!: DBProjectId",
-            EXISTS(
-                SELECT 1
-                FROM delphi_issue_details_with_statuses didws
-                INNER JOIN delphi_report_issues dri ON dri.id = didws.issue_id
-                WHERE
-                    didws.project_id = p.project_id
-                    AND didws.status = 'pending'
-                    AND dri.issue_type != $3
-            ) AS "has_pending_detail!",
-            EXISTS(
-                SELECT 1
-                FROM delphi_issue_details_with_statuses didws
-                INNER JOIN delphi_report_issues dri ON dri.id = didws.issue_id
-                WHERE
-                    didws.project_id = p.project_id
-                    AND didws.status = 'unsafe'
-                    AND dri.issue_type != $3
-            ) AS "has_unsafe_detail!",
-            EXISTS(
-                SELECT 1
-                FROM delphi_issue_details_with_statuses didws
-                INNER JOIN delphi_report_issues dri ON dri.id = didws.issue_id
-                WHERE
-                    didws.project_id = p.project_id
-                    AND didws.status = 'pending'
-                    AND dri.issue_type = $3
-            ) AS "has_dummy!",
+            p.has_pending_detail AS "has_pending_detail!",
+            p.has_unsafe_detail AS "has_unsafe_detail!",
+            p.has_dummy AS "has_dummy!",
             (
                 SELECT t.id
                 FROM threads t
@@ -144,7 +150,7 @@ pub async fn sync_project_tech_review_state(
                 ORDER BY dr.created DESC, dr.id DESC
                 LIMIT 1
             ) AS "report_id: DelphiReportId"
-        FROM project_ids p
+        FROM detail_states p
         "#,
         &project_ids_raw,
         &tech_review_message_types,
diff --git a/apps/labrinth/src/routes/internal/moderation/tech_review.rs b/apps/labrinth/src/routes/internal/moderation/tech_review.rs
index 2cb592533b..ea694627eb 100644
--- a/apps/labrinth/src/routes/internal/moderation/tech_review.rs
+++ b/apps/labrinth/src/routes/internal/moderation/tech_review.rs
@@ -1288,16 +1288,20 @@ pub async fn update_issue_details(
             INSERT INTO delphi_issue_detail_verdicts (
                 project_id,
                 detail_key,
-                verdict
+                verdict,
+                updated_at
             )
             SELECT
                 project_id,
                 detail_key,
-                verdict::delphi_report_issue_status
+                verdict::delphi_report_issue_status,
+                NOW()
             FROM latest
             WHERE verdict != 'pending'
             ON CONFLICT (project_id, detail_key)
-            DO UPDATE SET verdict = EXCLUDED.verdict
+            DO UPDATE SET
+                verdict = EXCLUDED.verdict,
+                updated_at = EXCLUDED.updated_at
             RETURNING 1
         )
         SELECT
@@ -1431,15 +1435,19 @@ pub async fn update_global_issue_details(
         )
         INSERT INTO delphi_global_detail_verdicts (
             detail_key,
-            verdict
+            verdict,
+            updated_at
         )
         SELECT
             detail_key,
-            verdict::delphi_report_issue_status
+            verdict::delphi_report_issue_status,
+            NOW()
         FROM latest
         WHERE verdict != 'pending'
         ON CONFLICT (detail_key)
-        DO UPDATE SET verdict = EXCLUDED.verdict
+        DO UPDATE SET
+            verdict = EXCLUDED.verdict,
+            updated_at = EXCLUDED.updated_at
         "#,
         &detail_keys,
         &verdicts,
diff --git a/apps/labrinth/src/routes/internal/moderation/tech_review/global.rs b/apps/labrinth/src/routes/internal/moderation/tech_review/global.rs
index 6b69125466..c152d5c2f9 100644
--- a/apps/labrinth/src/routes/internal/moderation/tech_review/global.rs
+++ b/apps/labrinth/src/routes/internal/moderation/tech_review/global.rs
@@ -170,6 +170,16 @@ pub async fn search_global_issue_details(
         WHERE (
             $1::text IS NULL
             OR dgdv.detail_key ILIKE '%' || $1 || '%'
+            OR EXISTS (
+                SELECT 1
+                FROM delphi_issue_details_with_statuses matching_didws
+                INNER JOIN delphi_report_issues matching_dri
+                    ON matching_dri.id = matching_didws.issue_id
+                WHERE
+                    matching_didws.key = dgdv.detail_key
+                    AND matching_dri.issue_type != '__dummy'
+                    AND matching_didws.file_path ILIKE '%' || $1 || '%'
+            )
         )
         "#,
         query,
@@ -194,6 +204,16 @@ pub async fn search_global_issue_details(
         WHERE (
             $1::text IS NULL
             OR dgdv.detail_key ILIKE '%' || $1 || '%'
+            OR EXISTS (
+                SELECT 1
+                FROM delphi_issue_details_with_statuses matching_didws
+                INNER JOIN delphi_report_issues matching_dri
+                    ON matching_dri.id = matching_didws.issue_id
+                WHERE
+                    matching_didws.key = dgdv.detail_key
+                    AND matching_dri.issue_type != '__dummy'
+                    AND matching_didws.file_path ILIKE '%' || $1 || '%'
+            )
         )
         GROUP BY dgdv.detail_key, dgdv.verdict
         ORDER BY dgdv.detail_key
@@ -249,6 +269,11 @@ pub async fn search_global_issue_details(
             WHERE
                 didws.key = ANY($1::text[])
                 AND dri.issue_type != '__dummy'
+                AND (
+                    $3::text IS NULL
+                    OR didws.key ILIKE '%' || $3 || '%'
+                    OR didws.file_path ILIKE '%' || $3 || '%'
+                )
         )
         SELECT
             detail_key AS "detail_key!",
@@ -273,6 +298,7 @@ pub async fn search_global_issue_details(
         "#,
         &detail_keys,
         LOCAL_TRACE_PREVIEW_LIMIT,
+        query,
     )
     .fetch_all(&**pool)
     .await

From cfea3aba34a45fa4159022e5327f514415525158 Mon Sep 17 00:00:00 2001
From: "Calum H." <calum@modrinth.com>
Date: Tue, 4 Aug 2026 15:29:03 +0100
Subject: [PATCH 17/82] fix: mc account logout on stale (#6986)

---
 apps/app-frontend/src/pages/Skins.vue        |  1 +
 packages/app-lib/src/api/minecraft_auth.rs   |  2 +-
 packages/app-lib/src/state/minecraft_auth.rs | 37 ++++++++++++++++++++
 3 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/apps/app-frontend/src/pages/Skins.vue b/apps/app-frontend/src/pages/Skins.vue
index 6c89f34712..f6a9282bf6 100644
--- a/apps/app-frontend/src/pages/Skins.vue
+++ b/apps/app-frontend/src/pages/Skins.vue
@@ -1038,6 +1038,7 @@ async function checkUserChanges() {
 	try {
 		const defaultId = await get_default_user()
 		if (defaultId !== currentUserId.value) {
+			await accountsCard.value?.refreshValues()
 			await loadCurrentUser()
 			await loadCapes()
 			await loadSkins()
diff --git a/packages/app-lib/src/api/minecraft_auth.rs b/packages/app-lib/src/api/minecraft_auth.rs
index 931b8e75bb..a347d24d68 100644
--- a/packages/app-lib/src/api/minecraft_auth.rs
+++ b/packages/app-lib/src/api/minecraft_auth.rs
@@ -39,7 +39,7 @@ pub async fn finish_login(
 #[tracing::instrument]
 pub async fn get_default_user() -> crate::Result<Option<uuid::Uuid>> {
     let state = State::get().await?;
-    let user = Credentials::get_active(&state.pool).await?;
+    let user = Credentials::get_default_credential(&state.pool).await?;
     Ok(user.map(|user| user.offline_profile.id))
 }
 
diff --git a/packages/app-lib/src/state/minecraft_auth.rs b/packages/app-lib/src/state/minecraft_auth.rs
index c021a239d2..b835ad439d 100644
--- a/packages/app-lib/src/state/minecraft_auth.rs
+++ b/packages/app-lib/src/state/minecraft_auth.rs
@@ -79,6 +79,26 @@ pub enum MinecraftAuthenticationError {
     NoUserHash,
 }
 
+#[derive(Deserialize)]
+struct OAuthErrorResponse {
+    error: String,
+}
+
+impl MinecraftAuthenticationError {
+    fn is_invalid_grant(&self) -> bool {
+        matches!(
+            self,
+            Self::DeserializeResponse {
+                step: MinecraftAuthStep::RefreshOAuthToken,
+                raw,
+                status_code: StatusCode::BAD_REQUEST,
+                ..
+            } if serde_json::from_str::<OAuthErrorResponse>(raw)
+                .is_ok_and(|response| response.error == "invalid_grant")
+        )
+    }
+}
+
 #[derive(Serialize, Deserialize, Debug)]
 pub struct MinecraftLoginFlow {
     pub verifier: String,
@@ -466,6 +486,23 @@ impl Credentials {
                         return Ok(Some(creds));
                     }
 
+                    if matches!(
+                        &*err.raw,
+                        ErrorKind::MinecraftAuthenticationError(source)
+                            if source.is_invalid_grant()
+                    ) {
+                        Self::remove(creds.offline_profile.id, exec).await?;
+
+                        if let Some((_, mut user)) =
+                            Self::get_all(exec).await?.into_iter().next()
+                        {
+                            user.active = true;
+                            user.upsert(exec).await?;
+                        }
+
+                        return Ok(None);
+                    }
+
                     Err(err)
                 }
             }

From af7336fffb19f21f46a96fca0082fc9ca3fa7d25 Mon Sep 17 00:00:00 2001
From: "Calum H." <calum@modrinth.com>
Date: Tue, 4 Aug 2026 16:21:31 +0100
Subject: [PATCH 18/82] fix: show "inspecting modpack" (#6979)

* fix: show "inspecting modpack"

Shows when determining external files for modpacks which have many overrides/over gb of content files.

* fix: better progress indicator
---
 .../src/components/ui/AppActionBar.vue        |   2 +-
 packages/app-lib/src/api/pack/install_from.rs | 102 +++++++++++++---
 .../app-lib/src/api/pack/install_mrpack.rs    |  76 +++++++++---
 packages/app-lib/src/event/emit.rs            |   2 +-
 packages/app-lib/src/event/mod.rs             |   3 +
 packages/app-lib/src/install/runner.rs        | 110 ++++++++++++++----
 packages/app-lib/src/util/fetch.rs            |  13 +++
 7 files changed, 249 insertions(+), 59 deletions(-)

diff --git a/apps/app-frontend/src/components/ui/AppActionBar.vue b/apps/app-frontend/src/components/ui/AppActionBar.vue
index 33f0a207d3..380a78a5c5 100644
--- a/apps/app-frontend/src/components/ui/AppActionBar.vue
+++ b/apps/app-frontend/src/components/ui/AppActionBar.vue
@@ -345,7 +345,7 @@ function buildDownloadItems(): PopupNotificationProgressItem[] {
 			iconUrl: currentLoadingBarIconUrls.value[getLoadingBarKey(bar)] ?? null,
 			progress: getLoadingProgress(bar),
 			waiting: !bar.total || bar.total <= 0,
-			progressType: 'percentage',
+			progressType: bar.bar_type?.type === 'pack_import' ? 'bytes' : 'percentage',
 			progressCurrent: bar.current,
 			progressTotal: bar.total,
 		})),
diff --git a/packages/app-lib/src/api/pack/install_from.rs b/packages/app-lib/src/api/pack/install_from.rs
index c894b94ad2..d2b7af8702 100644
--- a/packages/app-lib/src/api/pack/install_from.rs
+++ b/packages/app-lib/src/api/pack/install_from.rs
@@ -1,5 +1,7 @@
 use crate::State;
 use crate::data::ModLoader;
+use crate::event::LoadingBarType;
+use crate::event::emit::{emit_loading, init_loading};
 use crate::install::{
     InstallErrorContext, InstallPhaseDetails, InstallPhaseId, InstallProgress,
     InstallProgressReporter,
@@ -10,7 +12,7 @@ use crate::state::{
 };
 use crate::util::fetch::{
     DownloadMeta, DownloadReason, FetchProgressFn, fetch,
-    fetch_advanced_with_progress, sha1_file_async,
+    fetch_advanced_with_progress, sha1_file_async_with_progress,
 };
 use path_util::SafeRelativeUtf8UnixPathBuf;
 use reqwest::Method;
@@ -18,7 +20,7 @@ use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 use std::future::Future;
 
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 use std::pin::Pin;
 
 #[derive(Serialize, Deserialize, Eq, PartialEq)]
@@ -153,6 +155,17 @@ pub struct CreatePack {
 
 const MAX_LOCAL_FILE_HASH_LOOKUP_SIZE: u64 = 1024 * 1024 * 1024;
 
+pub(crate) fn get_local_pack_instance(path: &Path) -> CreatePackInstance {
+    CreatePackInstance {
+        name: path
+            .file_stem()
+            .unwrap_or_default()
+            .to_string_lossy()
+            .to_string(),
+        ..Default::default()
+    }
+}
+
 #[derive(Clone, Debug)]
 pub struct CreatePackDescription {
     pub icon: Option<PathBuf>,
@@ -182,17 +195,60 @@ pub async fn get_instance_from_pack(
             ..Default::default()
         }),
         CreatePackLocation::FromFile { path } => {
-            let file_name = path
-                .file_stem()
-                .unwrap_or_default()
-                .to_string_lossy()
-                .to_string();
+            let mut instance = get_local_pack_instance(&path);
+            let file_size = tokio::fs::metadata(&path).await?.len();
+            let hashes_archive = file_size <= MAX_LOCAL_FILE_HASH_LOOKUP_SIZE;
+            let archive_hashing_bytes =
+                if hashes_archive { file_size } else { 0 };
+            let pack_file = CreatePackFile::Path(path.clone());
+            let external_file_hashing_bytes =
+                super::install_mrpack::get_external_file_hashing_size_from_mrpack(
+                    &pack_file,
+                )
+                .await?;
+            let inspection_total_bytes = archive_hashing_bytes
+                .saturating_add(external_file_hashing_bytes)
+                .max(1);
+            let inspection = init_loading(
+                LoadingBarType::PackImport {
+                    pack_name: instance.name.clone(),
+                },
+                inspection_total_bytes as f64,
+                "Inspecting modpack",
+            )
+            .await
+            .ok();
+            let min_delta = (inspection_total_bytes / 200).max(256 * 1024);
+            let mut reported_bytes = 0_u64;
+            let mut report_progress =
+                |current: u64, offset: u64, message: &str| {
+                    let target = offset
+                        .saturating_add(current)
+                        .min(inspection_total_bytes);
+                    let increment = target.saturating_sub(reported_bytes);
+                    if target < inspection_total_bytes && increment < min_delta
+                    {
+                        return;
+                    }
 
-            let is_known_file = if tokio::fs::metadata(&path).await?.len()
-                <= MAX_LOCAL_FILE_HASH_LOOKUP_SIZE
-            {
+                    if let Some(inspection) = &inspection {
+                        let _ = emit_loading(
+                            inspection,
+                            increment as f64,
+                            Some(message),
+                        );
+                    }
+                    reported_bytes = target;
+                };
+
+            let is_known_file = if hashes_archive {
                 let state = State::get().await?;
-                let (_, hash) = sha1_file_async(&path).await?;
+                let (_, hash) =
+                    sha1_file_async_with_progress(&path, |current, _| {
+                        report_progress(current, 0, "Hashing local modpack");
+                        Ok(())
+                    })
+                    .await?;
                 match CachedEntry::get_file_many(
                     &[&hash],
                     Some(CacheBehaviour::StaleWhileRevalidateSkipOffline),
@@ -217,16 +273,26 @@ pub async fn get_instance_from_pack(
 
             let external_files_in_modpack =
                 super::install_mrpack::get_external_files_from_mrpack(
-                    &CreatePackFile::Path(path),
+                    &pack_file,
+                    |current, _| {
+                        report_progress(
+                            current,
+                            archive_hashing_bytes,
+                            "Inspecting modpack files",
+                        );
+                        Ok(())
+                    },
                 )
                 .await?;
+            report_progress(
+                inspection_total_bytes,
+                0,
+                "Finished inspecting modpack",
+            );
 
-            Ok(CreatePackInstance {
-                name: file_name,
-                unknown_file: !is_known_file,
-                external_files_in_modpack,
-                ..Default::default()
-            })
+            instance.unknown_file = !is_known_file;
+            instance.external_files_in_modpack = external_files_in_modpack;
+            Ok(instance)
         }
     }
 }
diff --git a/packages/app-lib/src/api/pack/install_mrpack.rs b/packages/app-lib/src/api/pack/install_mrpack.rs
index 52946bd120..80d8c6f64b 100644
--- a/packages/app-lib/src/api/pack/install_mrpack.rs
+++ b/packages/app-lib/src/api/pack/install_mrpack.rs
@@ -41,6 +41,7 @@ use tokio::sync::Mutex;
 type ExtractProgressFn<'a> = dyn FnMut(u64) -> Pin<Box<dyn Future<Output = crate::Result<()>> + Send + 'a>>
     + Send
     + 'a;
+type HashProgressFn<'a> = dyn FnMut(u64) -> crate::Result<()> + Send + 'a;
 const MODPACK_CONTENT_DOWNLOAD_CONCURRENCY: usize = 4;
 
 #[derive(Clone)]
@@ -166,13 +167,16 @@ impl MrpackZipReader {
     async fn hash_entry(
         &mut self,
         index: usize,
+        progress: Option<&mut HashProgressFn<'_>>,
     ) -> crate::Result<(u64, String)> {
         match self {
             Self::Memory(reader) => {
-                hash_zip_entry(reader.reader_with_entry(index).await?).await
+                hash_zip_entry(reader.reader_with_entry(index).await?, progress)
+                    .await
             }
             Self::File(reader) => {
-                hash_zip_entry(reader.reader_with_entry(index).await?).await
+                hash_zip_entry(reader.reader_with_entry(index).await?, progress)
+                    .await
             }
         }
     }
@@ -209,6 +213,7 @@ impl MrpackZipReader {
 
 async fn hash_zip_entry<R>(
     mut reader: ZipEntryReader<'_, R, WithEntry<'_>>,
+    mut progress: Option<&mut HashProgressFn<'_>>,
 ) -> crate::Result<(u64, String)>
 where
     R: futures_lite::io::AsyncBufRead + Unpin,
@@ -228,6 +233,9 @@ where
 
         hasher.update(&buffer[..bytes_read]);
         size += bytes_read as u64;
+        if let Some(progress) = progress.as_mut() {
+            progress(bytes_read as u64)?;
+        }
     }
 
     if reader.compute_hash() != expected_crc32 {
@@ -239,6 +247,7 @@ where
 
 pub(crate) async fn get_external_files_from_mrpack(
     file: &CreatePackFile,
+    mut progress: impl FnMut(u64, u64) -> crate::Result<()> + Send,
 ) -> crate::Result<Vec<String>> {
     let mut zip_reader = MrpackZipReader::new(file).await?;
     let Some(manifest_idx) =
@@ -271,21 +280,35 @@ pub(crate) async fn get_external_files_from_mrpack(
         .enumerate()
         .filter_map(|(index, entry)| {
             let path = entry.filename().as_str().ok()?;
-            let relative_path = path
-                .strip_prefix("overrides/")
-                .or_else(|| path.strip_prefix("client-overrides/"))?;
-            if path.ends_with('/')
-                || ProjectType::get_from_parent_folder(relative_path).is_none()
-            {
-                return None;
-            }
+            let relative_path = external_override_relative_path(path)?;
             let file_name = relative_path.rsplit('/').next()?.to_string();
-            Some((index, file_name))
+            Some((index, file_name, entry.uncompressed_size()))
         })
         .collect::<Vec<_>>();
 
-    for (index, file_name) in override_entries {
-        let (_, hash) = zip_reader.hash_entry(index).await?;
+    let total_bytes = override_entries
+        .iter()
+        .map(|(_, _, size)| size)
+        .sum::<u64>();
+    let min_delta = (total_bytes / 200).max(256 * 1024);
+    let mut current_bytes = 0_u64;
+    let mut last_reported_bytes = 0_u64;
+    let mut report_progress = |bytes_read: u64| {
+        current_bytes = current_bytes.saturating_add(bytes_read);
+        if current_bytes >= total_bytes
+            || current_bytes.saturating_sub(last_reported_bytes) < min_delta
+        {
+            return Ok(());
+        }
+
+        last_reported_bytes = current_bytes;
+        progress(current_bytes.min(total_bytes), total_bytes)
+    };
+
+    for (index, file_name, _) in override_entries {
+        let (_, hash) = zip_reader
+            .hash_entry(index, Some(&mut report_progress))
+            .await?;
         candidates.push((file_name, hash));
     }
 
@@ -327,6 +350,31 @@ pub(crate) async fn get_external_files_from_mrpack(
     Ok(external_files)
 }
 
+pub(crate) async fn get_external_file_hashing_size_from_mrpack(
+    file: &CreatePackFile,
+) -> crate::Result<u64> {
+    let zip_reader = MrpackZipReader::new(file).await?;
+    Ok(zip_reader
+        .file()
+        .entries()
+        .iter()
+        .filter_map(|entry| {
+            let path = entry.filename().as_str().ok()?;
+            external_override_relative_path(path)
+                .map(|_| entry.uncompressed_size())
+        })
+        .sum())
+}
+
+fn external_override_relative_path(path: &str) -> Option<&str> {
+    let relative_path = path
+        .strip_prefix("overrides/")
+        .or_else(|| path.strip_prefix("client-overrides/"))?;
+    (!path.ends_with('/')
+        && ProjectType::get_from_parent_folder(relative_path).is_some())
+    .then_some(relative_path)
+}
+
 async fn extract_zip_entry<R>(
     mut reader: ZipEntryReader<'_, R, WithEntry<'_>>,
     path: &Path,
@@ -527,7 +575,7 @@ pub(crate) async fn install_zipped_mrpack_files_with_reporter(
             .collect();
 
         for index in override_entries {
-            let (_, hash) = zip_reader.hash_entry(index).await?;
+            let (_, hash) = zip_reader.hash_entry(index, None).await?;
             file_hashes.push(hash);
         }
 
diff --git a/packages/app-lib/src/event/emit.rs b/packages/app-lib/src/event/emit.rs
index 64969cd727..bc82d9fafa 100644
--- a/packages/app-lib/src/event/emit.rs
+++ b/packages/app-lib/src/event/emit.rs
@@ -71,7 +71,7 @@ pub async fn init_loading_unsafe(
             message: title.to_string(),
             total,
             current: 0.0,
-            last_sent: 0.0,
+            last_sent: -1.0,
             bar_type,
             #[cfg(feature = "cli")]
             cli_progress_bar: {
diff --git a/packages/app-lib/src/event/mod.rs b/packages/app-lib/src/event/mod.rs
index 3a1dabb954..af1d5fe69f 100644
--- a/packages/app-lib/src/event/mod.rs
+++ b/packages/app-lib/src/event/mod.rs
@@ -157,6 +157,9 @@ pub enum LoadingBarType {
         pack_id: Option<String>,
         pack_version: Option<String>,
     },
+    PackImport {
+        pack_name: String,
+    },
     MinecraftDownload {
         instance_id: String,
         instance_name: String,
diff --git a/packages/app-lib/src/install/runner.rs b/packages/app-lib/src/install/runner.rs
index 801d957a11..1c2446aa10 100644
--- a/packages/app-lib/src/install/runner.rs
+++ b/packages/app-lib/src/install/runner.rs
@@ -16,6 +16,7 @@ use crate::ErrorKind;
 use crate::api::pack::install_from::{
     CreatePackLocation, generate_pack_from_file,
     generate_pack_from_version_id_with_reporter, get_instance_from_pack,
+    get_local_pack_instance,
 };
 use crate::api::pack::install_mrpack::install_zipped_mrpack_files_with_reporter;
 use crate::event::InstancePayloadType;
@@ -163,16 +164,6 @@ pub async fn retry_job(job_id: Uuid) -> crate::Result<InstallJobSnapshot> {
     job.state.progress.phase = InstallPhaseId::PreparingInstance;
     job.state.progress.progress = None;
     job.state.progress.details = InstallPhaseDetails::Empty;
-    if let Err(error) = prepare_initial_instance(&mut job.state, &state).await {
-        if let Err(cleanup_error) =
-            recovery::apply_cleanup(&job.state, &state).await
-        {
-            tracing::error!(
-                "Error cleaning up install job {job_id} retry preparation: {cleanup_error}"
-            );
-        }
-        return Err(error);
-    }
     job.state.record_event(InstallJobEventKind::JobQueued {
         kind: job.state.request.kind(),
     });
@@ -197,6 +188,42 @@ pub async fn retry_job(job_id: Uuid) -> crate::Result<InstallJobSnapshot> {
             return Err(error);
         }
     };
+    emit_install_job(&record.snapshot()).await?;
+
+    if let Err(error) = prepare_initial_instance(&mut job.state, &state).await {
+        let error_view = install_error_view(
+            job.state.progress.phase,
+            &error,
+            job.state.context.clone(),
+        );
+        if let Err(terminal_error) =
+            terminalize_failed_job(job_id, job.state, error_view, &state).await
+        {
+            tracing::error!(
+                "Failed to terminalize retried install job {job_id}: {terminal_error}"
+            );
+        }
+        return Err(error);
+    }
+    let record = match store::update_state(job_id, &job.state, &state).await {
+        Ok(record) => record,
+        Err(error) => {
+            let error_view = install_error_view(
+                job.state.progress.phase,
+                &error,
+                job.state.context.clone(),
+            );
+            if let Err(terminal_error) =
+                terminalize_failed_job(job_id, job.state, error_view, &state)
+                    .await
+            {
+                tracing::error!(
+                    "Failed to terminalize retried install job {job_id}: {terminal_error}"
+                );
+            }
+            return Err(error);
+        }
+    };
     if let Err(error) =
         lock_existing_instance_if_needed(&job.state, &state).await
     {
@@ -337,31 +364,39 @@ async fn start(request: InstallRequest) -> crate::Result<InstallJobSnapshot> {
     let state = State::get().await?;
     let id = Uuid::new_v4();
     let mut job_state = InstallJobState::new(request);
+    set_initial_display(&mut job_state);
+    let record =
+        store::insert(id, &job_state, InstallJobStatus::Queued, &state).await?;
+    emit_install_job(&record.snapshot()).await?;
+
     if let Err(error) = prepare_initial_instance(&mut job_state, &state).await {
-        if let Err(cleanup_error) =
-            recovery::apply_cleanup(&job_state, &state).await
+        let error_view = install_error_view(
+            job_state.progress.phase,
+            &error,
+            job_state.context.clone(),
+        );
+        if let Err(terminal_error) =
+            terminalize_failed_job(id, job_state, error_view, &state).await
         {
             tracing::error!(
-                "Error cleaning up install job preparation: {cleanup_error}"
+                "Failed to terminalize install job {id} after setup error: {terminal_error}"
             );
         }
         return Err(error);
     }
-    let record = match store::insert(
-        id,
-        &job_state,
-        InstallJobStatus::Queued,
-        &state,
-    )
-    .await
-    {
+    let record = match store::update_state(id, &job_state, &state).await {
         Ok(record) => record,
         Err(error) => {
-            if let Err(cleanup_error) =
-                recovery::apply_cleanup(&job_state, &state).await
+            let error_view = install_error_view(
+                job_state.progress.phase,
+                &error,
+                job_state.context.clone(),
+            );
+            if let Err(terminal_error) =
+                terminalize_failed_job(id, job_state, error_view, &state).await
             {
                 tracing::error!(
-                    "Error cleaning up untracked install job {id}: {cleanup_error}"
+                    "Failed to terminalize install job {id} after setup error: {terminal_error}"
                 );
             }
             return Err(error);
@@ -422,7 +457,12 @@ async fn prepare_initial_instance(
             location,
             post_install_edit,
         } => {
-            let preview = get_instance_from_pack(location).await?;
+            let preview = match location {
+                CreatePackLocation::FromFile { path } => {
+                    get_local_pack_instance(&path)
+                }
+                location => get_instance_from_pack(location).await?,
+            };
             let name = post_install_edit
                 .as_ref()
                 .and_then(|edit| edit.name.clone())
@@ -1443,6 +1483,26 @@ fn set_display(
     job_state.display = Some(InstallJobDisplay { title, icon });
 }
 
+fn set_initial_display(job_state: &mut InstallJobState) {
+    let display = match &job_state.request {
+        InstallRequest::CreateModpackInstance { location, .. } => {
+            match location {
+                CreatePackLocation::FromVersionId {
+                    title, icon_url, ..
+                } => Some((title.clone(), icon_url.clone())),
+                CreatePackLocation::FromFile { path } => {
+                    Some((get_local_pack_instance(path).name, None))
+                }
+            }
+        }
+        _ => None,
+    };
+
+    if let Some((title, icon)) = display {
+        set_display(job_state, title, icon);
+    }
+}
+
 fn install_error_view(
     phase: InstallPhaseId,
     error: &crate::Error,
diff --git a/packages/app-lib/src/util/fetch.rs b/packages/app-lib/src/util/fetch.rs
index 89a440dbf9..17c0ec002e 100644
--- a/packages/app-lib/src/util/fetch.rs
+++ b/packages/app-lib/src/util/fetch.rs
@@ -954,12 +954,24 @@ pub async fn sha1_async(bytes: Bytes) -> crate::Result<String> {
 
 pub async fn sha1_file_async(
     path: impl AsRef<Path>,
+) -> crate::Result<(u64, String)> {
+    sha1_file_async_with_progress(path, |_, _| Ok(())).await
+}
+
+pub async fn sha1_file_async_with_progress(
+    path: impl AsRef<Path>,
+    mut progress: impl FnMut(u64, u64) -> crate::Result<()>,
 ) -> crate::Result<(u64, String)> {
     let path = path.as_ref();
     // Local files can be multi-gigabyte .mrpacks, so hash them without materializing bytes.
     let mut file = File::open(path)
         .await
         .map_err(|e| IOError::with_path(e, path))?;
+    let total = file
+        .metadata()
+        .await
+        .map_err(|e| IOError::with_path(e, path))?
+        .len();
     let mut hasher = sha1_smol::Sha1::new();
     let mut size = 0;
     let mut buffer = vec![0; 262144];
@@ -975,6 +987,7 @@ pub async fn sha1_file_async(
 
         hasher.update(&buffer[..bytes_read]);
         size += bytes_read as u64;
+        progress(size, total)?;
     }
 
     Ok((size, hasher.digest().to_string()))

From 4c3abc62a8ff8bdd80a1a60a6dc3b9c27f3879bb Mon Sep 17 00:00:00 2001
From: "Calum H." <calum@modrinth.com>
Date: Tue, 4 Aug 2026 16:34:20 +0100
Subject: [PATCH 19/82] fix: export modal path handling (#6949)

* fix: export modal path handling

* fix: prepr

* fix: NEVER_EXPORTABLE_PATH_SUFFIXES list
---
 .../src/components/ui/ExportModal.vue         | 152 ++-----
 .../SharedInstancePublishModal.vue            |  34 +-
 apps/app-frontend/src/helpers/instance.ts     |  34 +-
 apps/app/src/api/instance.rs                  |  11 +-
 packages/app-lib/src/api/instance.rs          |   3 +-
 .../app-lib/src/api/instance/export_mrpack.rs | 395 ++++++++++++++----
 .../ui/src/components/base/FileTreeSelect.vue | 213 +++++++---
 .../stories/base/FileTreeSelect.stories.ts    |  46 +-
 8 files changed, 596 insertions(+), 292 deletions(-)

diff --git a/apps/app-frontend/src/components/ui/ExportModal.vue b/apps/app-frontend/src/components/ui/ExportModal.vue
index e97f833f5c..314d171c1d 100644
--- a/apps/app-frontend/src/components/ui/ExportModal.vue
+++ b/apps/app-frontend/src/components/ui/ExportModal.vue
@@ -11,15 +11,10 @@ import {
 	useVIntl,
 } from '@modrinth/ui'
 import { save } from '@tauri-apps/plugin-dialog'
-import { readDir, stat } from '@tauri-apps/plugin-fs'
-import { ref } from 'vue'
+import { ref, shallowRef } from 'vue'
 
 import { PackageIcon } from '@/assets/icons'
-import {
-	export_instance_mrpack,
-	get_full_path,
-	get_pack_export_candidates,
-} from '@/helpers/instance'
+import { export_instance_mrpack, get_pack_export_candidates } from '@/helpers/instance'
 
 const { handleError } = injectNotificationManager()
 const { formatMessage } = useVIntl()
@@ -65,30 +60,24 @@ const exportModal = ref(null)
 const nameInput = ref(props.instance.name)
 const exportDescription = ref('')
 const versionInput = ref('1.0.0')
-const files = ref([])
-const selectedFilePaths = ref([])
+const files = shallowRef([])
+const includedFilePaths = ref([])
+const excludedFilePaths = ref([])
 const fileTreeKey = ref(0)
 const filesLoadId = ref(0)
-const instanceRoot = ref('')
-const loadedDirectories = ref(new Set())
+const directoryEntries = new Map()
+const currentDirectory = ref('')
 
 async function initFiles() {
 	const loadId = ++filesLoadId.value
-	const [filePaths, root] = await Promise.all([
-		get_pack_export_candidates(props.instance.id),
-		get_full_path(props.instance.id),
-	])
-	if (loadId !== filesLoadId.value) return
-
-	instanceRoot.value = root
-	const exportCandidates = await Promise.all(
-		filePaths.map((path) => buildExportCandidateItem(root, path)),
-	)
+	const exportCandidates = await get_pack_export_candidates(props.instance.id)
 	if (loadId !== filesLoadId.value) return
 
 	files.value = exportCandidates
-	selectedFilePaths.value = files.value
-		.filter((file) => !file.disabled && isDefaultSelectedExportCandidate(file.path))
+	directoryEntries.set('', exportCandidates)
+	currentDirectory.value = ''
+	includedFilePaths.value = files.value
+		.filter((file) => !file.disabled && file.defaultSelected)
 		.map((file) => file.path)
 }
 
@@ -107,7 +96,8 @@ const exportPack = async () => {
 		export_instance_mrpack(
 			props.instance.id,
 			outputPath,
-			selectedFilePaths.value,
+			includedFilePaths.value,
+			excludedFilePaths.value,
 			versionInput.value,
 			exportDescription.value,
 			nameInput.value,
@@ -121,115 +111,45 @@ function resetExportState() {
 	exportDescription.value = ''
 	versionInput.value = '1.0.0'
 	files.value = []
-	selectedFilePaths.value = []
+	includedFilePaths.value = []
+	excludedFilePaths.value = []
 	fileTreeKey.value += 1
-	instanceRoot.value = ''
-	loadedDirectories.value = new Set()
+	directoryEntries.clear()
+	currentDirectory.value = ''
 }
 
 async function loadExportDirectory(path) {
-	if (!path || !instanceRoot.value || loadedDirectories.value.has(path)) return
+	const normalizedPath = normalizeExportPath(path)
+	currentDirectory.value = normalizedPath
+
+	const cachedEntries = directoryEntries.get(normalizedPath)
+	if (cachedEntries) {
+		files.value = cachedEntries
+		return
+	}
 
 	const loadId = filesLoadId.value
-	loadedDirectories.value.add(path)
+	files.value = []
 
 	try {
-		const entries = await readDir(`${instanceRoot.value}/${path}`)
-		const childItems = await Promise.all(
-			entries.map((entry) => buildExportDirectoryChildItem(instanceRoot.value, path, entry)),
+		const childItems = await get_pack_export_candidates(
+			props.instance.id,
+			normalizedPath || undefined,
 		)
 		if (loadId !== filesLoadId.value) return
 
-		appendExportItems(childItems)
-	} catch {
-		loadedDirectories.value.delete(path)
-	}
-}
-
-async function buildExportCandidateItem(instanceRoot, path) {
-	try {
-		const entries = await readDir(`${instanceRoot}/${path}`)
-		const metadata = await getExportCandidateMetadata(instanceRoot, path)
-		return {
-			path,
-			type: 'directory',
-			disabled: isExportCandidateDisabled(path),
-			modified: metadata.modified,
-			count: entries.length,
+		directoryEntries.set(normalizedPath, childItems)
+		if (currentDirectory.value === normalizedPath) {
+			files.value = childItems
 		}
 	} catch {
-		return buildExportFileItem(instanceRoot, path)
-	}
-}
-
-async function buildExportDirectoryChildItem(instanceRoot, parentPath, entry) {
-	const path = `${parentPath}/${entry.name}`
-	if (entry.isDirectory) {
-		const metadata = await getExportCandidateMetadata(instanceRoot, path)
-		return {
-			path,
-			type: 'directory',
-			disabled: isExportCandidateDisabled(path),
-			modified: metadata.modified,
-		}
-	}
-
-	return buildExportFileItem(instanceRoot, path)
-}
-
-async function buildExportFileItem(instanceRoot, path) {
-	const metadata = await getExportCandidateMetadata(instanceRoot, path)
-	return {
-		path,
-		type: 'file',
-		disabled: isExportCandidateDisabled(path),
-		size: metadata.size,
-		modified: metadata.modified,
-	}
-}
-
-function appendExportItems(items) {
-	const nextFiles = new Map(files.value.map((file) => [normalizeExportPath(file.path), file]))
-	for (const item of items) {
-		nextFiles.set(normalizeExportPath(item.path), item)
-	}
-	files.value = [...nextFiles.values()]
-}
-
-async function getExportCandidateMetadata(instanceRoot, path) {
-	try {
-		const metadata = await stat(`${instanceRoot}/${path}`)
-		return {
-			size: metadata.size,
-			modified: metadata.mtime ? Math.floor(metadata.mtime.getTime() / 1000) : undefined,
-		}
-	} catch {
-		return {}
+		if (currentDirectory.value === normalizedPath) files.value = []
 	}
 }
 
 function normalizeExportPath(path) {
 	return path.replaceAll('\\', '/').split('/').filter(Boolean).join('/')
 }
-
-function isDefaultSelectedExportCandidate(path) {
-	return (
-		path.startsWith('mods') ||
-		path.startsWith('datapacks') ||
-		path.startsWith('resourcepacks') ||
-		path.startsWith('shaderpacks') ||
-		path.startsWith('config')
-	)
-}
-
-function isExportCandidateDisabled(path) {
-	return (
-		path === 'profile.json' ||
-		path.startsWith('modrinth_logs') ||
-		path.startsWith('.fabric') ||
-		path.startsWith('__MACOSX')
-	)
-}
 </script>
 
 <template>
@@ -278,9 +198,11 @@ function isExportCandidateDisabled(path) {
 			</div>
 			<FileTreeSelect
 				:key="fileTreeKey"
-				v-model="selectedFilePaths"
+				v-model="includedFilePaths"
+				v-model:excluded-paths="excludedFilePaths"
 				class="min-w-0"
 				:items="files"
+				lazy
 				@navigate="loadExportDirectory"
 			/>
 		</div>
diff --git a/apps/app-frontend/src/components/ui/shared-instances/SharedInstancePublishModal.vue b/apps/app-frontend/src/components/ui/shared-instances/SharedInstancePublishModal.vue
index ca976e4d93..2ef93151c9 100644
--- a/apps/app-frontend/src/components/ui/shared-instances/SharedInstancePublishModal.vue
+++ b/apps/app-frontend/src/components/ui/shared-instances/SharedInstancePublishModal.vue
@@ -28,7 +28,8 @@
 				<div class="flex min-w-0 flex-col gap-3 pt-4">
 					<div ref="configFileTreeContainer" class="max-h-[292px] overflow-y-auto rounded-[20px]">
 						<FileTreeSelect
-							v-model="selectedConfigPaths"
+							v-model="includedConfigPaths"
+							v-model:excluded-paths="excludedConfigPaths"
 							:items="configFileItems"
 							:show-size="false"
 							:show-modified="false"
@@ -79,11 +80,20 @@ const publishReviewModal = ref<InstanceType<typeof ContentDiffModal>>()
 const configFileTreeContainer = ref<HTMLElement>()
 const publishDiffs = ref<ContentDiffItem[]>([])
 const configFilePaths = ref<string[]>([])
-const selectedConfigPaths = ref<string[]>([])
+const includedConfigPaths = ref<string[]>([])
+const excludedConfigPaths = ref<string[]>([])
 const state = ref<SharedInstancePublishState>('idle')
 const configFileItems = computed<FileTreeSelectItem[]>(() =>
 	configFilePaths.value.map((path) => ({ path, type: 'file' })),
 )
+const selectedConfigPaths = computed(() => {
+	const includedPaths = new Set(includedConfigPaths.value)
+	const excludedPaths = new Set(excludedConfigPaths.value)
+
+	return configFilePaths.value.filter((path) =>
+		isConfigPathSelected(path, includedPaths, excludedPaths),
+	)
+})
 
 async function show(e?: MouseEvent) {
 	if (state.value !== 'idle') return
@@ -108,7 +118,8 @@ async function show(e?: MouseEvent) {
 			disabled: diff.disabled,
 		}))
 		configFilePaths.value = preview.configFiles
-		selectedConfigPaths.value = []
+		includedConfigPaths.value = []
+		excludedConfigPaths.value = []
 		if (!publishReviewModal.value) return
 
 		publishReviewModal.value.show(e)
@@ -134,6 +145,23 @@ async function publishChanges() {
 	}
 }
 
+function isConfigPathSelected(
+	path: string,
+	includedPaths: Set<string>,
+	excludedPaths: Set<string>,
+) {
+	let selected = false
+	let prefix = ''
+
+	for (const segment of path.split('/').filter(Boolean)) {
+		prefix = prefix ? `${prefix}/${segment}` : segment
+		if (includedPaths.has(prefix)) selected = true
+		if (excludedPaths.has(prefix)) selected = false
+	}
+
+	return selected
+}
+
 function scrollConfigFileTreeToTop() {
 	if (configFileTreeContainer.value) {
 		configFileTreeContainer.value.scrollTop = 0
diff --git a/apps/app-frontend/src/helpers/instance.ts b/apps/app-frontend/src/helpers/instance.ts
index 512af7cf40..de112f2d27 100644
--- a/apps/app-frontend/src/helpers/instance.ts
+++ b/apps/app-frontend/src/helpers/instance.ts
@@ -282,12 +282,13 @@ export async function update_repair_modrinth(instanceId: string): Promise<Instal
 }
 
 // Export an instance to .mrpack
-// included_overrides is an array of paths to override folders to include (ie: 'mods', 'resource_packs')
+// included_overrides and excluded_overrides are inherited path rules for files in the export.
 // Version id is optional (ie: 1.1.5)
 export async function export_instance_mrpack(
 	instanceId: string,
 	exportLocation: string,
 	includedOverrides: string[],
+	excludedOverrides: string[],
 	versionId?: string,
 	description?: string,
 	name?: string,
@@ -296,22 +297,33 @@ export async function export_instance_mrpack(
 		instanceId,
 		exportLocation,
 		includedOverrides,
+		excludedOverrides,
 		versionId,
 		description,
 		name,
 	})
 }
 
-// Given a folder path, populate an array of all the subfolders
-// Intended to be used for finding potential override folders
-// profile
-// -- mods
-// -- resourcepacks
-// -- file1
-// => [mods, resourcepacks]
-// allows selection for 'included_overrides' in export_instance_mrpack
-export async function get_pack_export_candidates(instanceId: string): Promise<string[]> {
-	return await invoke('plugin:instance|instance_get_pack_export_candidates', { instanceId })
+export type PackExportCandidate = {
+	path: string
+	type: 'directory' | 'file'
+	size?: number
+	modified?: number
+	count?: number
+	disabled: boolean
+	defaultSelected: boolean
+}
+
+// Given a folder path, populate an array of exportable direct children.
+// Allows selection for 'included_overrides' in export_instance_mrpack.
+export async function get_pack_export_candidates(
+	instanceId: string,
+	parent?: string,
+): Promise<PackExportCandidate[]> {
+	return await invoke('plugin:instance|instance_get_pack_export_candidates', {
+		instanceId,
+		parent: parent ?? null,
+	})
 }
 
 // Run Minecraft using an instance
diff --git a/apps/app/src/api/instance.rs b/apps/app/src/api/instance.rs
index 570deca20b..29db061fd1 100644
--- a/apps/app/src/api/instance.rs
+++ b/apps/app/src/api/instance.rs
@@ -729,6 +729,7 @@ pub async fn instance_export_mrpack(
     instance_id: &str,
     export_location: PathBuf,
     included_overrides: Vec<String>,
+    excluded_overrides: Vec<String>,
     version_id: Option<String>,
     description: Option<String>,
     name: Option<String>,
@@ -737,6 +738,7 @@ pub async fn instance_export_mrpack(
         instance_id,
         export_location,
         included_overrides,
+        excluded_overrides,
         version_id,
         description,
         name,
@@ -748,8 +750,13 @@ pub async fn instance_export_mrpack(
 #[tauri::command]
 pub async fn instance_get_pack_export_candidates(
     instance_id: &str,
-) -> Result<Vec<SafeRelativeUtf8UnixPathBuf>> {
-    Ok(theseus::instance::get_pack_export_candidates(instance_id).await?)
+    parent: Option<SafeRelativeUtf8UnixPathBuf>,
+) -> Result<Vec<theseus::instance::PackExportCandidate>> {
+    Ok(theseus::instance::get_pack_export_candidates_for_parent(
+        instance_id,
+        parent,
+    )
+    .await?)
 }
 
 #[tauri::command]
diff --git a/packages/app-lib/src/api/instance.rs b/packages/app-lib/src/api/instance.rs
index 43f84769ba..872020863e 100644
--- a/packages/app-lib/src/api/instance.rs
+++ b/packages/app-lib/src/api/instance.rs
@@ -19,7 +19,8 @@ pub use self::content::{
     list_content_sets, sync_content_files,
 };
 pub use self::export_mrpack::{
-    create_mrpack_json, export_mrpack, get_pack_export_candidates,
+    PackExportCandidate, create_mrpack_json, export_mrpack,
+    get_pack_export_candidates, get_pack_export_candidates_for_parent,
 };
 pub use self::get::{get, get_many, list};
 pub use self::icon::edit_icon;
diff --git a/packages/app-lib/src/api/instance/export_mrpack.rs b/packages/app-lib/src/api/instance/export_mrpack.rs
index 6faada6f25..dd6605f42c 100644
--- a/packages/app-lib/src/api/instance/export_mrpack.rs
+++ b/packages/app-lib/src/api/instance/export_mrpack.rs
@@ -12,17 +12,157 @@ use crate::state::{
 use crate::util::io::{self, IOError};
 use async_zip::tokio::write::ZipFileWriter;
 use async_zip::{Compression, ZipEntryBuilder};
+use futures::{StreamExt, stream};
 use path_util::SafeRelativeUtf8UnixPathBuf;
-use std::collections::HashMap;
+use serde::Serialize;
+use std::collections::{HashMap, HashSet};
 use std::path::PathBuf;
+use std::time::UNIX_EPOCH;
 use tokio::fs::File;
-use tokio::io::AsyncReadExt;
+use tokio_util::compat::FuturesAsyncWriteCompatExt;
+
+const DEFAULT_SELECTED_EXPORT_PATH_PREFIXES: &[&str] = &[
+    "mods",
+    "datapacks",
+    "resourcepacks",
+    "shaderpacks",
+    "config",
+];
+const EXPORT_CANDIDATE_METADATA_CONCURRENCY: usize = 32;
+
+const NEVER_EXPORTABLE_PATH_PREFIXES: &[&str] = &[
+    "profile.json",
+    "modrinth_logs",
+    "mods/.connector",
+    ".sable/natives",
+    "local/crash_assistant",
+    "mods/mcef-libraries",
+    "mods/mcef-cache",
+    "config/super_resolution/libraries",
+    "config/Veinminer/update",
+    "config/epicfight/native",
+    "essential",
+    ".mixin.out",
+    ".fabric",
+    "__MACOSX",
+];
+const NEVER_EXPORTABLE_PATH_SUFFIXES: &[&str] = &[".DS_Store"];
+
+#[derive(Debug, Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct PackExportCandidate {
+    pub path: SafeRelativeUtf8UnixPathBuf,
+    #[serde(rename = "type")]
+    pub kind: PackExportCandidateType,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub size: Option<u64>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub modified: Option<u64>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub count: Option<usize>,
+    pub disabled: bool,
+    pub default_selected: bool,
+}
+
+#[derive(Debug, Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub enum PackExportCandidateType {
+    Directory,
+    File,
+}
+
+#[derive(Default)]
+struct ExportSelectionNode {
+    selected: Option<bool>,
+    has_included_rule: bool,
+    children: HashMap<String, ExportSelectionNode>,
+}
+
+#[derive(Default)]
+struct ExportSelection {
+    root: ExportSelectionNode,
+}
+
+impl ExportSelection {
+    fn new(included_paths: Vec<String>, excluded_paths: Vec<String>) -> Self {
+        let mut rules = HashMap::new();
+
+        for (paths, selected) in
+            [(included_paths, true), (excluded_paths, false)]
+        {
+            for path in paths {
+                let Ok(path) = SafeRelativeUtf8UnixPathBuf::try_from(path)
+                else {
+                    continue;
+                };
+                if path.as_str().is_empty() || !is_path_exportable(&path) {
+                    continue;
+                }
+                rules.insert(path.as_str().to_string(), selected);
+            }
+        }
+
+        let mut selection = Self::default();
+        for (path, selected) in rules {
+            selection.root.insert(&path, selected);
+        }
+        selection
+    }
+
+    fn is_included(&self, path: &SafeRelativeUtf8UnixPathBuf) -> bool {
+        self.resolve(path).0
+    }
+
+    fn should_visit_directory(
+        &self,
+        path: &SafeRelativeUtf8UnixPathBuf,
+    ) -> bool {
+        let (selected, node) = self.resolve(path);
+        selected || node.is_some_and(|node| node.has_included_rule)
+    }
+
+    fn resolve(
+        &self,
+        path: &SafeRelativeUtf8UnixPathBuf,
+    ) -> (bool, Option<&ExportSelectionNode>) {
+        let mut node = &self.root;
+        let mut selected = node.selected.unwrap_or(false);
+
+        for segment in path.as_str().split('/') {
+            let Some(child) = node.children.get(segment) else {
+                return (selected, None);
+            };
+            node = child;
+            selected = node.selected.unwrap_or(selected);
+        }
+
+        (selected, Some(node))
+    }
+}
+
+impl ExportSelectionNode {
+    fn insert(&mut self, path: &str, selected: bool) {
+        if selected {
+            self.has_included_rule = true;
+        }
+
+        let mut node = self;
+        for segment in path.split('/') {
+            node = node.children.entry(segment.to_string()).or_default();
+            if selected {
+                node.has_included_rule = true;
+            }
+        }
+        node.selected = Some(selected);
+    }
+}
 
 #[tracing::instrument(skip_all)]
 pub async fn export_mrpack(
     instance_id: &str,
     export_path: PathBuf,
     included_export_candidates: Vec<String>,
+    excluded_export_candidates: Vec<String>,
     version_id: Option<String>,
     description: Option<String>,
     _name: Option<String>,
@@ -35,17 +175,10 @@ pub async fn export_mrpack(
             "Tried to export a nonexistent instance {instance_id}!"
         ))
     })?;
-    let included_export_candidates = included_export_candidates
-        .into_iter()
-        .filter(|x| {
-            if let Some(f) = PathBuf::from(x).file_name()
-                && f.to_string_lossy().starts_with(".DS_Store")
-            {
-                return false;
-            }
-            true
-        })
-        .collect::<Vec<_>>();
+    let export_selection = ExportSelection::new(
+        included_export_candidates,
+        excluded_export_candidates,
+    );
 
     let instance_base_path = get_full_path(instance_id).await?;
     let mut file = File::create(&export_path)
@@ -56,48 +189,72 @@ pub async fn export_mrpack(
     let mut packfile =
         create_mrpack_json(&metadata, version_id, description).await?;
     packfile.files.retain(|f| {
-        is_export_candidate_included(
-            f.path.as_str(),
-            &included_export_candidates,
-        )
+        is_path_exportable(&f.path) && export_selection.is_included(&f.path)
     });
-
-    let mut path_list = Vec::new();
-    add_all_recursive_folder_paths(&instance_base_path, &mut path_list).await?;
+    let packfile_paths = packfile
+        .files
+        .iter()
+        .map(|file| file.path.as_str().to_string())
+        .collect::<HashSet<_>>();
     let loading_bar = init_loading(
         LoadingBarType::ZipExtract {
             instance_id: metadata.instance.id.clone(),
             instance_name: metadata.instance.name.clone(),
         },
-        path_list.len() as f64,
+        1.0,
         "Exporting instance to .mrpack",
     )
     .await?;
 
-    for path in path_list {
-        emit_loading(&loading_bar, 1.0, None)?;
-        let relative_path = pack_get_relative_path(&instance_base_path, &path)?;
-
-        if packfile.files.iter().any(|f| f.path == relative_path)
-            || !is_export_candidate_included(
-                relative_path.as_str(),
-                &included_export_candidates,
-            )
+    let mut directories = vec![instance_base_path.clone()];
+    while let Some(directory) = directories.pop() {
+        let mut read_dir = io::read_dir(&directory).await?;
+        while let Some(entry) = read_dir
+            .next_entry()
+            .await
+            .map_err(|e| IOError::with_path(e, &directory))?
         {
-            continue;
-        }
+            let path = entry.path();
+            let relative_path =
+                pack_get_relative_path(&instance_base_path, &path)?;
+            if !is_path_exportable(&relative_path) {
+                continue;
+            }
 
-        if path.is_file() {
-            let mut file = File::open(&path)
+            let file_type = entry
+                .file_type()
                 .await
                 .map_err(|e| IOError::with_path(e, &path))?;
-            let mut data = Vec::new();
-            file.read_to_end(&mut data).await.map_err(IOError::from)?;
-            let builder = ZipEntryBuilder::new(
-                format!("overrides/{relative_path}").into(),
-                Compression::Deflate,
-            );
-            writer.write_entry_whole(builder, &data).await?;
+            if file_type.is_dir() {
+                if export_selection.should_visit_directory(&relative_path) {
+                    directories.push(path);
+                }
+                continue;
+            }
+            if !file_type.is_file()
+                || !export_selection.is_included(&relative_path)
+                || packfile_paths.contains(relative_path.as_str())
+            {
+                continue;
+            }
+
+            let mut stream = writer
+                .write_entry_stream(
+                    ZipEntryBuilder::new(
+                        format!("overrides/{relative_path}").into(),
+                        Compression::Deflate,
+                    )
+                    .build(),
+                )
+                .await?
+                .compat_write();
+            let mut source = File::open(&path)
+                .await
+                .map_err(|e| IOError::with_path(e, &path))?;
+            tokio::io::copy(&mut source, &mut stream)
+                .await
+                .map_err(IOError::from)?;
+            stream.into_inner().close().await?;
         }
     }
 
@@ -108,54 +265,136 @@ pub async fn export_mrpack(
     );
     writer.write_entry_whole(builder, &data).await?;
     writer.close().await?;
+    emit_loading(&loading_bar, 1.0, None)?;
 
     Ok(())
 }
 
-fn is_export_candidate_included(
-    path: &str,
-    included_export_candidates: &[String],
-) -> bool {
-    included_export_candidates.iter().any(|candidate| {
-        path == candidate
+fn is_path_exportable(relative_path: &SafeRelativeUtf8UnixPathBuf) -> bool {
+    let path = relative_path.as_str();
+
+    !NEVER_EXPORTABLE_PATH_PREFIXES.iter().any(|prefix| {
+        path == *prefix
             || path
-                .strip_prefix(candidate)
+                .strip_prefix(prefix)
                 .is_some_and(|suffix| suffix.starts_with('/'))
-    })
+    }) && !NEVER_EXPORTABLE_PATH_SUFFIXES
+        .iter()
+        .any(|suffix| path.ends_with(suffix))
 }
 
 #[tracing::instrument]
 pub async fn get_pack_export_candidates(
     instance_id: &str,
-) -> crate::Result<Vec<SafeRelativeUtf8UnixPathBuf>> {
-    let mut path_list = Vec::new();
+) -> crate::Result<Vec<PackExportCandidate>> {
+    get_pack_export_candidates_for_parent(instance_id, None).await
+}
+
+#[tracing::instrument]
+pub async fn get_pack_export_candidates_for_parent(
+    instance_id: &str,
+    parent: Option<SafeRelativeUtf8UnixPathBuf>,
+) -> crate::Result<Vec<PackExportCandidate>> {
     let instance_base_dir = get_full_path(instance_id).await?;
-    let mut read_dir = io::read_dir(&instance_base_dir).await?;
+    let parent_dir = if let Some(parent) = parent {
+        if parent.as_str().is_empty() || !is_path_exportable(&parent) {
+            return Ok(Vec::new());
+        }
+
+        instance_base_dir.join(parent.as_str())
+    } else {
+        instance_base_dir.clone()
+    };
+    let parent_dir = io::canonicalize(parent_dir)?;
+    if !parent_dir.starts_with(&instance_base_dir) {
+        return Ok(Vec::new());
+    }
+
+    let mut paths = Vec::new();
+    let mut read_dir = io::read_dir(&parent_dir).await?;
     while let Some(entry) = read_dir
         .next_entry()
         .await
-        .map_err(|e| IOError::with_path(e, &instance_base_dir))?
+        .map_err(|e| IOError::with_path(e, &parent_dir))?
     {
-        let path = entry.path();
-        if path.is_dir() {
-            let mut read_dir = io::read_dir(&path).await?;
-            while let Some(entry) = read_dir
-                .next_entry()
-                .await
-                .map_err(|e| IOError::with_path(e, &instance_base_dir))?
-            {
-                path_list.push(pack_get_relative_path(
-                    &instance_base_dir,
-                    &entry.path(),
-                )?);
+        paths.push(entry.path());
+    }
+
+    let candidates = stream::iter(paths)
+        .map(|path| {
+            let instance_base_dir = &instance_base_dir;
+            async move {
+                build_pack_export_candidate(instance_base_dir, &path).await
             }
-        } else {
-            path_list.push(pack_get_relative_path(&instance_base_dir, &path)?);
+        })
+        .buffer_unordered(EXPORT_CANDIDATE_METADATA_CONCURRENCY)
+        .collect::<Vec<_>>()
+        .await;
+    let mut path_list = Vec::with_capacity(candidates.len());
+    for candidate in candidates {
+        if let Some(candidate) = candidate? {
+            path_list.push(candidate);
         }
     }
+
     Ok(path_list)
 }
 
+async fn build_pack_export_candidate(
+    instance_base_dir: &PathBuf,
+    path: &PathBuf,
+) -> crate::Result<Option<PackExportCandidate>> {
+    let relative_path = pack_get_relative_path(instance_base_dir, path)?;
+    if !is_path_exportable(&relative_path) {
+        return Ok(None);
+    }
+
+    let metadata = tokio::fs::symlink_metadata(path)
+        .await
+        .map_err(|error| IOError::with_path(error, path))?;
+    if metadata.file_type().is_symlink()
+        || (!metadata.is_dir() && !metadata.is_file())
+    {
+        return Ok(None);
+    }
+
+    let kind = if metadata.is_dir() {
+        PackExportCandidateType::Directory
+    } else {
+        PackExportCandidateType::File
+    };
+    let size = metadata.is_file().then_some(metadata.len());
+    let modified = metadata
+        .modified()
+        .ok()
+        .and_then(|modified| modified.duration_since(UNIX_EPOCH).ok())
+        .map(|duration| duration.as_secs());
+    let default_selected = is_default_selected_export_candidate(&relative_path);
+
+    Ok(Some(PackExportCandidate {
+        path: relative_path,
+        kind,
+        size,
+        modified,
+        count: None,
+        disabled: false,
+        default_selected,
+    }))
+}
+
+fn is_default_selected_export_candidate(
+    relative_path: &SafeRelativeUtf8UnixPathBuf,
+) -> bool {
+    let path = relative_path.as_str();
+
+    DEFAULT_SELECTED_EXPORT_PATH_PREFIXES.iter().any(|prefix| {
+        path == *prefix
+            || path
+                .strip_prefix(prefix)
+                .is_some_and(|suffix| suffix.starts_with('/'))
+    })
+}
+
 fn pack_get_relative_path(
     instance_path: &PathBuf,
     path: &PathBuf,
@@ -283,25 +522,3 @@ pub async fn create_mrpack_json(
         dependencies,
     })
 }
-
-#[async_recursion::async_recursion]
-async fn add_all_recursive_folder_paths(
-    folder: &PathBuf,
-    output: &mut Vec<PathBuf>,
-) -> crate::Result<()> {
-    let mut read_dir = io::read_dir(folder).await?;
-    while let Some(entry) = read_dir
-        .next_entry()
-        .await
-        .map_err(|e| IOError::with_path(e, folder))?
-    {
-        let path = entry.path();
-        if path.is_dir() {
-            add_all_recursive_folder_paths(&path, output).await?;
-        } else {
-            output.push(path);
-        }
-    }
-
-    Ok(())
-}
diff --git a/packages/ui/src/components/base/FileTreeSelect.vue b/packages/ui/src/components/base/FileTreeSelect.vue
index f64a42912d..2fe2f6ab31 100644
--- a/packages/ui/src/components/base/FileTreeSelect.vue
+++ b/packages/ui/src/components/base/FileTreeSelect.vue
@@ -258,6 +258,11 @@ type FileTreeSelectEntry = {
 	item?: NormalizedFileTreeSelectItem
 }
 
+type FileTreeSelectionRuleNode = {
+	selected?: boolean
+	children: Map<string, FileTreeSelectionRuleNode>
+}
+
 type FileTreeSelectSortField = 'name' | 'size' | 'modified'
 
 const formatBytes = useFormatBytes()
@@ -273,19 +278,22 @@ const props = withDefaults(
 	defineProps<{
 		items: FileTreeSelectItem[]
 		modelValue: string[]
+		excludedPaths: string[]
+		lazy?: boolean
 		showSize?: boolean
 		showModified?: boolean
 	}>(),
 	{
 		items: () => [],
 		modelValue: () => [],
+		lazy: false,
 		showSize: true,
 		showModified: true,
 	},
 )
 
 const emit = defineEmits<{
-	(e: 'update:modelValue', value: string[]): void
+	(e: 'update:modelValue' | 'update:excludedPaths', value: string[]): void
 	(e: 'navigate', path: string): void
 }>()
 
@@ -312,7 +320,23 @@ const normalizedItems = computed(() => {
 	return [...items.values()]
 })
 
-const selectedPaths = computed(() => new Set(props.modelValue.map((path) => normalizePath(path))))
+const includedPaths = computed(() => new Set(props.modelValue.map((path) => normalizePath(path))))
+const excludedPaths = computed(
+	() => new Set(props.excludedPaths.map((path) => normalizePath(path))),
+)
+
+const selectionRuleTree = computed(() => {
+	const root: FileTreeSelectionRuleNode = { children: new Map() }
+
+	for (const path of includedPaths.value) {
+		addSelectionRule(root, path, true)
+	}
+	for (const path of excludedPaths.value) {
+		addSelectionRule(root, path, false)
+	}
+
+	return root
+})
 
 const folderPaths = computed(() => {
 	const paths = new Set<string>()
@@ -361,24 +385,14 @@ const entries = computed<FileTreeSelectEntry[]>(() => {
 
 const visibleSelectableEntries = computed(() => entries.value.filter((entry) => !entry.disabled))
 
-const visibleSelectablePaths = computed(() => {
-	const paths = new Set<string>()
-	for (const entry of visibleSelectableEntries.value) {
-		for (const path of getEntrySelectablePaths(entry)) {
-			paths.add(path)
-		}
-	}
-	return [...paths]
-})
-
 const allVisibleSelected = computed(
 	() =>
-		visibleSelectablePaths.value.length > 0 &&
-		visibleSelectablePaths.value.every((path) => selectedPaths.value.has(path)),
+		visibleSelectableEntries.value.length > 0 &&
+		visibleSelectableEntries.value.every((entry) => entry.checked && !entry.indeterminate),
 )
 
 const someVisibleSelected = computed(() =>
-	visibleSelectablePaths.value.some((path) => selectedPaths.value.has(path)),
+	visibleSelectableEntries.value.some((entry) => entry.checked || entry.indeterminate),
 )
 
 const visibleRowCount = computed(
@@ -392,7 +406,7 @@ const fillerRowCount = computed(() =>
 watch(
 	normalizedItems,
 	() => {
-		if (currentPath.value && !folderPaths.value.has(currentPath.value)) {
+		if (!props.lazy && currentPath.value && !folderPaths.value.has(currentPath.value)) {
 			currentPath.value = ''
 		}
 	},
@@ -427,6 +441,57 @@ function getName(path: string) {
 	return path.split('/').pop() ?? path
 }
 
+function getParentPath(path: string) {
+	return path.split('/').slice(0, -1).join('/')
+}
+
+function addSelectionRule(root: FileTreeSelectionRuleNode, path: string, selected: boolean) {
+	if (!path) return
+
+	let node = root
+	for (const segment of path.split('/')) {
+		let child = node.children.get(segment)
+		if (!child) {
+			child = { children: new Map() }
+			node.children.set(segment, child)
+		}
+		node = child
+	}
+	node.selected = selected
+}
+
+function getSelectionRuleNode(path: string) {
+	let node = selectionRuleTree.value
+	if (!path) return node
+
+	for (const segment of path.split('/')) {
+		const child = node.children.get(segment)
+		if (!child) return undefined
+		node = child
+	}
+
+	return node
+}
+
+function isPathSelected(path: string) {
+	let node = selectionRuleTree.value
+	let selected = node.selected ?? false
+
+	for (const segment of path.split('/').filter(Boolean)) {
+		const child = node.children.get(segment)
+		if (!child) break
+		node = child
+		selected = node.selected ?? selected
+	}
+
+	return selected
+}
+
+function hasDescendantSelectionRule(path: string) {
+	const node = getSelectionRuleNode(path)
+	return node !== undefined && node.children.size > 0
+}
+
 function isInCurrentPath(segments: string[], currentSegments: string[]) {
 	if (segments.length <= currentSegments.length) return false
 	return currentSegments.every((segment, index) => segments[index] === segment)
@@ -505,22 +570,21 @@ function buildDirectoryEntry(
 	name: string,
 	item?: NormalizedFileTreeSelectItem,
 ): FileTreeSelectEntry {
-	const descendants = getFolderDescendants(path).filter((item) => !item.disabled)
-	const selectedCount = descendants.filter((item) =>
-		selectedPaths.value.has(item.normalizedPath),
-	).length
-	const selected = selectedPaths.value.has(path)
+	const descendants = item ? [] : getFolderDescendants(path)
+	const selectableDescendants = descendants.filter((item) => !item.disabled)
+	const selected = isPathSelected(path)
+	const indeterminate = hasDescendantSelectionRule(path)
 
 	return {
 		path,
 		name,
 		type: 'directory',
 		icon: getDirectoryIcon(name),
-		checked: selected || (descendants.length > 0 && selectedCount === descendants.length),
-		indeterminate: !selected && selectedCount > 0 && selectedCount < descendants.length,
-		disabled: item?.disabled ?? descendants.length === 0,
+		checked: selected && !indeterminate,
+		indeterminate,
+		disabled: item ? (item.disabled ?? false) : selectableDescendants.length === 0,
 		modified: item?.modified ?? getLatestModified(descendants),
-		count: item?.count ?? getFolderChildCount(path),
+		count: item?.count ?? (item ? undefined : getFolderChildCount(path)),
 		item,
 	}
 }
@@ -531,7 +595,7 @@ function buildFileEntry(item: NormalizedFileTreeSelectItem): FileTreeSelectEntry
 		name: item.name,
 		type: 'file',
 		icon: getFileIcon(item.name),
-		checked: selectedPaths.value.has(item.normalizedPath),
+		checked: isPathSelected(item.normalizedPath),
 		indeterminate: false,
 		disabled: item.disabled ?? false,
 		size: item.size,
@@ -564,48 +628,89 @@ function selectEntry(entry: FileTreeSelectEntry) {
 function toggleEntry(entry: FileTreeSelectEntry, selected: boolean) {
 	if (entry.disabled) return
 
-	const nextSelectedPaths = new Set(selectedPaths.value)
-	const paths = getEntrySelectablePaths(entry)
-
-	for (const path of paths) {
-		if (selected) {
-			nextSelectedPaths.add(path)
-		} else {
-			nextSelectedPaths.delete(path)
-		}
-	}
-
-	emit('update:modelValue', [...nextSelectedPaths])
+	updateSelection(entry.path, selected)
 }
 
-function getEntrySelectablePaths(entry: FileTreeSelectEntry) {
-	if (entry.type === 'directory') {
-		return entry.item?.type === 'directory'
-			? [entry.path]
-			: getFolderDescendants(entry.path)
-					.filter((item) => !item.disabled)
-					.map((item) => item.normalizedPath)
+function updateSelection(path: string, selected: boolean) {
+	const nextSelectedPaths = new Set(includedPaths.value)
+	const nextExcludedPaths = new Set(excludedPaths.value)
+	applySelection(nextSelectedPaths, nextExcludedPaths, path, selected)
+	emitSelection(nextSelectedPaths, nextExcludedPaths)
+}
+
+function applySelection(
+	nextSelectedPaths: Set<string>,
+	nextExcludedPaths: Set<string>,
+	path: string,
+	selected: boolean,
+) {
+	const normalizedPath = normalizePath(path)
+	if (!normalizedPath) return
+
+	removePathAndDescendants(nextSelectedPaths, normalizedPath)
+	removePathAndDescendants(nextExcludedPaths, normalizedPath)
+
+	const inheritedSelection = resolveSelectionFromSets(
+		getParentPath(normalizedPath),
+		nextSelectedPaths,
+		nextExcludedPaths,
+	)
+	if (inheritedSelection !== selected) {
+		const targetPaths = selected ? nextSelectedPaths : nextExcludedPaths
+		targetPaths.add(normalizedPath)
+	}
+}
+
+function removePathAndDescendants(paths: Set<string>, path: string) {
+	const prefix = `${path}/`
+	for (const candidate of paths) {
+		if (candidate === path || candidate.startsWith(prefix)) {
+			paths.delete(candidate)
+		}
+	}
+}
+
+function resolveSelectionFromSets(
+	path: string,
+	includedPaths: Set<string>,
+	excludedPaths: Set<string>,
+) {
+	let selected = false
+	let prefix = ''
+
+	for (const segment of path.split('/').filter(Boolean)) {
+		prefix = prefix ? `${prefix}/${segment}` : segment
+		if (includedPaths.has(prefix)) selected = true
+		if (excludedPaths.has(prefix)) selected = false
 	}
 
-	return [entry.path]
+	return selected
+}
+
+function emitSelection(includedPaths: Set<string>, excludedPaths: Set<string>) {
+	emit('update:modelValue', [...includedPaths])
+	emit('update:excludedPaths', [...excludedPaths])
 }
 
 function toggleAllVisible(selected: boolean) {
-	const nextSelectedPaths = new Set(selectedPaths.value)
-	for (const path of visibleSelectablePaths.value) {
-		if (selected) {
-			nextSelectedPaths.add(path)
-		} else {
-			nextSelectedPaths.delete(path)
+	const nextSelectedPaths = new Set(includedPaths.value)
+	const nextExcludedPaths = new Set(excludedPaths.value)
+
+	if (currentPath.value) {
+		applySelection(nextSelectedPaths, nextExcludedPaths, currentPath.value, selected)
+	} else {
+		for (const entry of visibleSelectableEntries.value) {
+			applySelection(nextSelectedPaths, nextExcludedPaths, entry.path, selected)
 		}
 	}
 
-	emit('update:modelValue', [...nextSelectedPaths])
+	emitSelection(nextSelectedPaths, nextExcludedPaths)
 }
 
 function formatSize(entry: FileTreeSelectEntry) {
 	if (entry.type === 'directory') {
-		return formatMessage(messages.itemCount, { count: entry.count ?? 0 })
+		if (entry.count === undefined) return ''
+		return formatMessage(messages.itemCount, { count: entry.count })
 	}
 
 	if (entry.size === undefined) return ''
diff --git a/packages/ui/src/stories/base/FileTreeSelect.stories.ts b/packages/ui/src/stories/base/FileTreeSelect.stories.ts
index a85d13ab5e..acaf6eb8e4 100644
--- a/packages/ui/src/stories/base/FileTreeSelect.stories.ts
+++ b/packages/ui/src/stories/base/FileTreeSelect.stories.ts
@@ -39,30 +39,37 @@ export const ModpackExport: StoryObj = {
 	render: () => ({
 		components: { FileTreeSelect },
 		setup() {
-			const selected = ref([
-				'config/fabric_loader_dependencies.json',
-				'config/crash_assistant/settings.toml',
-				'config/defaultoptions/options.txt',
-				'mods/sodium-fabric-0.6.13+mc1.21.6.jar',
-				'mods/iris-fabric-1.8.8+mc1.21.6.jar',
-				'resourcepacks/FreshAnimations_v1.9.3.zip',
-				'shaderpacks/ComplementaryUnbound_r5.5.1.zip',
-			])
-			const selectedLabel = computed(() => `${selected.value.length} selected`)
+			const included = ref(['config', 'mods'])
+			const excluded = ref(['config/defaultoptions'])
+			const selectedLabel = computed(
+				() => `${included.value.length} includes, ${excluded.value.length} exclusions`,
+			)
 
 			return {
+				excluded,
+				included,
 				items: MODPACK_FILES,
-				selected,
 				selectedLabel,
 			}
 		},
 		template: /*html*/ `
 			<div class="max-w-2xl">
-				<FileTreeSelect v-model="selected" :items="items" />
+				<FileTreeSelect
+					v-model="included"
+					v-model:excluded-paths="excluded"
+					:items="items"
+				/>
 				<div class="mt-4 rounded-[20px] bg-surface-3 p-4 text-sm text-secondary">
 					<div class="font-semibold text-contrast">{{ selectedLabel }}</div>
-					<div class="mt-2 flex flex-col gap-1">
-						<span v-for="path in selected" :key="path" class="truncate">{{ path }}</span>
+					<div class="mt-2 grid grid-cols-2 gap-4">
+						<div class="flex flex-col gap-1">
+							<span class="font-semibold text-contrast">Included</span>
+							<span v-for="path in included" :key="path" class="truncate">{{ path }}</span>
+						</div>
+						<div class="flex flex-col gap-1">
+							<span class="font-semibold text-contrast">Excluded</span>
+							<span v-for="path in excluded" :key="path" class="truncate">{{ path }}</span>
+						</div>
 					</div>
 				</div>
 			</div>
@@ -74,12 +81,17 @@ export const EmptyRoot: StoryObj = {
 	render: () => ({
 		components: { FileTreeSelect },
 		setup() {
-			const selected = ref<string[]>([])
-			return { selected }
+			const excluded = ref<string[]>([])
+			const included = ref<string[]>([])
+			return { excluded, included }
 		},
 		template: /*html*/ `
 			<div class="max-w-2xl">
-				<FileTreeSelect v-model="selected" :items="[]" />
+				<FileTreeSelect
+					v-model="included"
+					v-model:excluded-paths="excluded"
+					:items="[]"
+				/>
 			</div>
 		`,
 	}),

From 99377f843601990d2fd7d0a158dc4fd142c5734e Mon Sep 17 00:00:00 2001
From: "Michael H." <michael@iptables.sh>
Date: Tue, 4 Aug 2026 18:03:28 +0200
Subject: [PATCH 20/82] Update merge queue configuration (#6989)

Signed-off-by: Michael H. <michael@iptables.sh>
---
 .mergify.yml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 .mergify.yml

diff --git a/.mergify.yml b/.mergify.yml
new file mode 100644
index 0000000000..d8768703eb
--- /dev/null
+++ b/.mergify.yml
@@ -0,0 +1,23 @@
+merge_queue:
+  mode: parallel
+scopes:
+  source:
+    files:
+      frontend:
+        include:
+          - apps/frontend/**/*
+          - packages/ui/**/*
+          - packages/utils/**/*
+          - packages/assets/**/*
+          - "**/wrangler.jsonc"
+          - "**/pnpm-*.yaml"
+      backend:
+        include:
+          - apps/labrinth/**
+          - Cargo.toml
+      app:
+        include:
+          - apps/app/**
+          - apps/app-frontend/**
+          - packages/app-lib/**
+          - packages/app-macros/**

From fe0c97190aa937c99cca487d6594edec49079d35 Mon Sep 17 00:00:00 2001
From: "Calum H." <calum@modrinth.com>
Date: Tue, 4 Aug 2026 17:52:00 +0100
Subject: [PATCH 21/82] refactor: use DI for instance page + subpages (#6987)

* refactor: use DI for instance page + subpages

* fix: qa

* refactor: layout.vue bring up a layer

* refactor: rename folders

* import order

* refactor: move settings into instance page

* fix: lint

---------

Co-authored-by: tdgao <mr.trumgao@gmail.com>
---
 apps/app-frontend/src/App.vue                 |   3 +-
 .../components/ui/QuickInstanceSwitcher.vue   |   3 +-
 .../install_flow/AddServerToInstanceModal.vue |   3 +-
 .../browse/use-app-server-browse.ts           |   5 +-
 .../src/helpers/instance-content.ts           |   3 +-
 apps/app-frontend/src/pages/Browse.vue        | 111 +--
 .../src/pages/instance/Overview.vue           |  13 -
 .../components/admonitions}/index.vue         |  10 +-
 .../components/admonitions/messages.ts}       |   0
 .../admonitions/shared-instance-stale.vue}    |   2 +-
 .../shared-instance-unavailable.vue}          |   0
 .../shared-instance-update-available.vue}     |   2 +-
 .../shared-instance-wrong-account.vue}        |   2 +-
 .../instance/components/admonitions}/types.ts |   0
 .../components/page-header}/index.vue         |   0
 .../instance-page-header-server-metadata.vue  |   0
 ...m-revoke-shared-instance-invite-modal.vue} |   0
 .../settings-modal/general-settings.vue}      |   4 +-
 .../settings-modal/hooks-settings.vue}        |   4 +-
 .../components/settings-modal/index.vue}      |  16 +-
 .../settings-modal/installation-settings.vue} |  11 +-
 .../instance-settings-context.ts}             |   0
 .../settings-modal/java-settings.vue}         |   4 +-
 ...stance-installation-settings-controls.vue} |   0
 .../settings-modal/sharing-settings.vue}      |  10 +-
 .../settings-modal/window-settings.vue}       |   4 +-
 .../instance/{Mods.vue => content/index.vue}  | 231 +++---
 .../instance/{Files.vue => files/index.vue}   | 101 ++-
 apps/app-frontend/src/pages/instance/index.js |   9 -
 apps/app-frontend/src/pages/instance/index.ts |   8 +
 .../src/pages/instance/instance-context.ts    |  27 +
 .../pages/instance/{Index.vue => layout.vue}  | 753 +++++++-----------
 .../instance/{Logs.vue => logs/index.vue}     |  99 ++-
 .../src/pages/instance/query-options.ts       |  79 ++
 .../src/pages/instance/share/index.vue        |  89 +--
 .../shared-instance-management-context.ts     |  19 +
 .../share/shared-instance-members-table.vue   |  35 +-
 .../share/use-shared-instance-members.ts      |   5 +-
 .../pages/instance/shared-instance-context.ts | 181 +++++
 .../instance/use-shared-instance-state.ts     | 228 ------
 .../instance/{Worlds.vue => worlds/index.vue} |  64 +-
 apps/app-frontend/src/routes.js               |  13 +-
 42 files changed, 1009 insertions(+), 1142 deletions(-)
 delete mode 100644 apps/app-frontend/src/pages/instance/Overview.vue
 rename apps/app-frontend/src/{components/ui/instance/instance-admonitions => pages/instance/components/admonitions}/index.vue (91%)
 rename apps/app-frontend/src/{components/ui/instance/instance-admonitions/instance-admonitions-messages.ts => pages/instance/components/admonitions/messages.ts} (100%)
 rename apps/app-frontend/src/{components/ui/instance/instance-admonitions/instance-admonitions-shared-instance-stale.vue => pages/instance/components/admonitions/shared-instance-stale.vue} (95%)
 rename apps/app-frontend/src/{components/ui/instance/instance-admonitions/instance-admonitions-shared-instance-unavailable.vue => pages/instance/components/admonitions/shared-instance-unavailable.vue} (100%)
 rename apps/app-frontend/src/{components/ui/instance/instance-admonitions/instance-admonitions-shared-instance-update-available.vue => pages/instance/components/admonitions/shared-instance-update-available.vue} (89%)
 rename apps/app-frontend/src/{components/ui/instance/instance-admonitions/instance-admonitions-shared-instance-wrong-account.vue => pages/instance/components/admonitions/shared-instance-wrong-account.vue} (96%)
 rename apps/app-frontend/src/{components/ui/instance/instance-admonitions => pages/instance/components/admonitions}/types.ts (100%)
 rename apps/app-frontend/src/{components/ui/instance-page-header => pages/instance/components/page-header}/index.vue (100%)
 rename apps/app-frontend/src/{components/ui/instance-page-header => pages/instance/components/page-header}/instance-page-header-server-metadata.vue (100%)
 rename apps/app-frontend/src/{components/ui/shared-instances/ConfirmRevokeSharedInstanceInviteModal.vue => pages/instance/components/settings-modal/confirm-revoke-shared-instance-invite-modal.vue} (100%)
 rename apps/app-frontend/src/{components/ui/instance_settings/GeneralSettings.vue => pages/instance/components/settings-modal/general-settings.vue} (99%)
 rename apps/app-frontend/src/{components/ui/instance_settings/HooksSettings.vue => pages/instance/components/settings-modal/hooks-settings.vue} (96%)
 rename apps/app-frontend/src/{components/ui/modal/InstanceSettingsModal.vue => pages/instance/components/settings-modal/index.vue} (89%)
 rename apps/app-frontend/src/{components/ui/instance_settings/InstallationSettings.vue => pages/instance/components/settings-modal/installation-settings.vue} (97%)
 rename apps/app-frontend/src/{providers/instance-settings.ts => pages/instance/components/settings-modal/instance-settings-context.ts} (100%)
 rename apps/app-frontend/src/{components/ui/instance_settings/JavaSettings.vue => pages/instance/components/settings-modal/java-settings.vue} (98%)
 rename apps/app-frontend/src/{components/ui/shared-instances/SharedInstanceInstallationSettingsControls.vue => pages/instance/components/settings-modal/shared-instance-installation-settings-controls.vue} (100%)
 rename apps/app-frontend/src/{components/ui/instance_settings/SharingSettings.vue => pages/instance/components/settings-modal/sharing-settings.vue} (94%)
 rename apps/app-frontend/src/{components/ui/instance_settings/WindowSettings.vue => pages/instance/components/settings-modal/window-settings.vue} (97%)
 rename apps/app-frontend/src/pages/instance/{Mods.vue => content/index.vue} (89%)
 rename apps/app-frontend/src/pages/instance/{Files.vue => files/index.vue} (82%)
 delete mode 100644 apps/app-frontend/src/pages/instance/index.js
 create mode 100644 apps/app-frontend/src/pages/instance/index.ts
 create mode 100644 apps/app-frontend/src/pages/instance/instance-context.ts
 rename apps/app-frontend/src/pages/instance/{Index.vue => layout.vue} (57%)
 rename apps/app-frontend/src/pages/instance/{Logs.vue => logs/index.vue} (73%)
 create mode 100644 apps/app-frontend/src/pages/instance/query-options.ts
 create mode 100644 apps/app-frontend/src/pages/instance/share/shared-instance-management-context.ts
 create mode 100644 apps/app-frontend/src/pages/instance/shared-instance-context.ts
 delete mode 100644 apps/app-frontend/src/pages/instance/use-shared-instance-state.ts
 rename apps/app-frontend/src/pages/instance/{Worlds.vue => worlds/index.vue} (94%)

diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue
index e2f78fe965..3e766fcc8e 100644
--- a/apps/app-frontend/src/App.vue
+++ b/apps/app-frontend/src/App.vue
@@ -120,6 +120,7 @@ import {
 } from '@/helpers/utils.js'
 import { start_join_server, start_join_singleplayer_world } from '@/helpers/worlds.ts'
 import i18n from '@/i18n.config'
+import { instanceKeys } from '@/pages/instance/query-options'
 import {
 	appUpdateState,
 	downloadAvailableAppUpdate,
@@ -242,7 +243,7 @@ const { data: authenticatedModrinthUser } = useQuery({
 	retry: false,
 })
 useQuery({
-	queryKey: computed(() => ['shared-instance-eligibility', credentials.value?.user?.id]),
+	queryKey: computed(() => instanceKeys.sharedEligibility(credentials.value?.user?.id)),
 	queryFn: can_current_user_use_shared_instances,
 	enabled: () => !!credentials.value?.session && !!credentials.value?.user?.id,
 	retry: false,
diff --git a/apps/app-frontend/src/components/ui/QuickInstanceSwitcher.vue b/apps/app-frontend/src/components/ui/QuickInstanceSwitcher.vue
index c1868332eb..9a60c3d435 100644
--- a/apps/app-frontend/src/components/ui/QuickInstanceSwitcher.vue
+++ b/apps/app-frontend/src/components/ui/QuickInstanceSwitcher.vue
@@ -9,6 +9,7 @@ import { computed, onMounted, onUnmounted, ref } from 'vue'
 import NavButton from '@/components/ui/NavButton.vue'
 import { instance_listener } from '@/helpers/events.js'
 import { list } from '@/helpers/instance'
+import { instanceKeys } from '@/pages/instance/query-options'
 
 const ITEM_SIZE = 52
 const APPROX_USED_VERTICAL_SPACE = 513 // doesn't need to be exact lol just close enough so there's a little gap and no overflow
@@ -123,7 +124,7 @@ const getInstances = async () => {
 	const instances = await list().catch(handleError)
 
 	for (const instance of instances) {
-		queryClient.setQueryData(['instances', 'summary', instance.id], instance)
+		queryClient.setQueryData(instanceKeys.detail(instance.id), instance)
 	}
 
 	allInstances.value = instances.sort((a, b) => {
diff --git a/apps/app-frontend/src/components/ui/install_flow/AddServerToInstanceModal.vue b/apps/app-frontend/src/components/ui/install_flow/AddServerToInstanceModal.vue
index e3c523c8a1..17114ed83a 100644
--- a/apps/app-frontend/src/components/ui/install_flow/AddServerToInstanceModal.vue
+++ b/apps/app-frontend/src/components/ui/install_flow/AddServerToInstanceModal.vue
@@ -15,6 +15,7 @@ import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
 import { trackEvent } from '@/helpers/analytics'
 import { list } from '@/helpers/instance'
 import { add_server_to_instance, get_instance_worlds } from '@/helpers/worlds.ts'
+import { instanceKeys } from '@/pages/instance/query-options'
 
 const { handleError } = injectNotificationManager()
 const queryClient = useQueryClient()
@@ -67,7 +68,7 @@ async function addServer(instance) {
 	try {
 		await add_server_to_instance(instance.id, serverName.value, serverAddress.value, 'prompt')
 		instance.added = true
-		await queryClient.invalidateQueries({ queryKey: ['worlds', instance.id] })
+		await queryClient.invalidateQueries({ queryKey: instanceKeys.worlds(instance.id) })
 
 		trackEvent('AddServerToInstance', {
 			server_name: serverName.value,
diff --git a/apps/app-frontend/src/composables/browse/use-app-server-browse.ts b/apps/app-frontend/src/composables/browse/use-app-server-browse.ts
index addda23d9c..a789cd1033 100644
--- a/apps/app-frontend/src/composables/browse/use-app-server-browse.ts
+++ b/apps/app-frontend/src/composables/browse/use-app-server-browse.ts
@@ -17,6 +17,7 @@ import { kill, list as listInstances } from '@/helpers/instance'
 import { get_by_instance_id } from '@/helpers/process'
 import type { GameInstance } from '@/helpers/types'
 import { add_server_to_instance, getServerAddress } from '@/helpers/worlds'
+import { instanceKeys } from '@/pages/instance/query-options'
 
 interface BrowseServerInstance {
 	id: string
@@ -38,7 +39,7 @@ interface ContextMenuOptionClick {
 }
 
 export interface UseAppServerBrowseOptions {
-	instance: Ref<BrowseServerInstance | null>
+	instance: Readonly<Ref<BrowseServerInstance | null>>
 	isFromWorlds: ComputedRef<boolean>
 	allInstalledIds: ComputedRef<Set<string>>
 	newlyInstalled: Ref<string[]>
@@ -131,7 +132,7 @@ export function useAppServerBrowse(options: UseAppServerBrowseOptions) {
 					project.minecraft_java_server?.content?.kind,
 				)
 				options.newlyInstalled.value.push(project.project_id)
-				await queryClient.invalidateQueries({ queryKey: ['worlds', instanceId] })
+				await queryClient.invalidateQueries({ queryKey: instanceKeys.worlds(instanceId) })
 			} catch (error) {
 				options.handleError(error)
 			}
diff --git a/apps/app-frontend/src/helpers/instance-content.ts b/apps/app-frontend/src/helpers/instance-content.ts
index f9f386febf..b294603c34 100644
--- a/apps/app-frontend/src/helpers/instance-content.ts
+++ b/apps/app-frontend/src/helpers/instance-content.ts
@@ -51,7 +51,8 @@ export async function loadInstanceContentData(
 }
 
 function handleLoadError(error: unknown, onError?: (error: Error) => unknown) {
-	onError?.(error as Error)
+	if (!onError) throw error
+	onError(error as Error)
 	return null
 }
 
diff --git a/apps/app-frontend/src/pages/Browse.vue b/apps/app-frontend/src/pages/Browse.vue
index 8f166430fd..d35a247544 100644
--- a/apps/app-frontend/src/pages/Browse.vue
+++ b/apps/app-frontend/src/pages/Browse.vue
@@ -32,7 +32,7 @@ import {
 	useDebugLogger,
 	useVIntl,
 } from '@modrinth/ui'
-import { useQueryClient } from '@tanstack/vue-query'
+import { useQuery, useQueryClient } from '@tanstack/vue-query'
 import { convertFileSrc } from '@tauri-apps/api/core'
 import type { Ref } from 'vue'
 import { computed, onMounted, onUnmounted, ref, shallowRef, watch } from 'vue'
@@ -41,15 +41,9 @@ import { useRoute, useRouter } from 'vue-router'
 
 import ContextMenu from '@/components/ui/ContextMenu.vue'
 import { useAppServerBrowse } from '@/composables/browse/use-app-server-browse'
-import {
-	get_project,
-	get_project_v3,
-	get_search_results_v3,
-	get_version_many,
-} from '@/helpers/cache.js'
+import { get_project, get_search_results_v3, get_version_many } from '@/helpers/cache.js'
 import { instance_listener } from '@/helpers/events.js'
 import {
-	get as getInstance,
 	get_installed_project_ids as getInstalledProjectIds,
 	list as listInstances,
 } from '@/helpers/instance'
@@ -57,6 +51,11 @@ import { get_loader_versions as getLoaderManifest } from '@/helpers/metadata'
 import { get as getSettings, set as setSettings } from '@/helpers/settings.ts'
 import { get_categories, get_game_versions, get_loaders } from '@/helpers/tags'
 import { get_instance_worlds } from '@/helpers/worlds'
+import {
+	instanceDetailQueryOptions,
+	instanceKeys,
+	instanceLinkedProjectQueryOptions,
+} from '@/pages/instance/query-options'
 import {
 	type BreadcrumbDefinition,
 	useBreadcrumb,
@@ -154,30 +153,29 @@ const {
 	markServerProjectInstalled,
 } = serverInstallContent
 
-type Instance = {
-	game_version: string
-	loader: string
-	path: string
-	install_stage: string
-	icon_path?: string
-	name: string
-	link?: {
-		type: string
-		project_id: string
-		version_id: string
-	}
-}
-
-const initialInstanceId = String(route.query.i ?? '')
-const instance: Ref<Instance | null> = ref(
-	queryClient.getQueryData<Instance>(['instances', 'summary', initialInstanceId]) ?? null,
+const initialInstanceId = computed(() => String(route.query.i ?? ''))
+const instanceQuery = useQuery(
+	computed(() => ({
+		...instanceDetailQueryOptions(initialInstanceId.value),
+		enabled: !!initialInstanceId.value,
+	})),
+)
+const instance = computed(() => instanceQuery.data.value ?? null)
+const linkedInstanceProjectId = computed(() => instance.value?.link?.project_id ?? '')
+const linkedInstanceProjectQuery = useQuery(
+	computed(() => ({
+		...instanceLinkedProjectQueryOptions(linkedInstanceProjectId.value),
+		enabled: !!linkedInstanceProjectId.value,
+	})),
 )
 const installedProjectIds: Ref<string[] | null> = ref(null)
 const instanceHideInstalled = ref(route.query.ai === 'true')
 const newlyInstalled = ref<string[]>([])
 const hiddenInstanceProjectIds = ref<Set<string>>(new Set())
 const hiddenInstanceProjectIdsInitialized = ref(false)
-const isServerInstance = ref(false)
+const isServerInstance = computed(
+	() => linkedInstanceProjectQuery.data.value?.minecraft_server != null,
+)
 
 const instanceBreadcrumb = route.query.i
 	? useBreadcrumb({
@@ -291,7 +289,13 @@ await initInstanceContext()
 
 async function refreshInstalledProjectIds() {
 	if (!route.query.i) {
-		const instances = await listInstances().catch(handleError)
+		const instances = await queryClient
+			.fetchQuery({
+				queryKey: [...instanceKeys.all, 'installed-project-ids'],
+				queryFn: listInstances,
+				staleTime: 0,
+			})
+			.catch(handleError)
 		if (!instances) return
 
 		const ids = instances
@@ -303,7 +307,14 @@ async function refreshInstalledProjectIds() {
 	}
 
 	if (route.query.from === 'worlds') {
-		const worlds = await get_instance_worlds(route.query.i as string).catch(handleError)
+		const targetInstanceId = route.query.i as string
+		const worlds = await queryClient
+			.fetchQuery({
+				queryKey: instanceKeys.installedProjectIds(targetInstanceId, 'worlds'),
+				queryFn: () => get_instance_worlds(targetInstanceId),
+				staleTime: 0,
+			})
+			.catch(handleError)
 		if (!worlds) return
 
 		const serverProjectIds = worlds
@@ -314,7 +325,14 @@ async function refreshInstalledProjectIds() {
 		return
 	}
 
-	const ids = await getInstalledProjectIds(route.query.i as string).catch(handleError)
+	const targetInstanceId = route.query.i as string
+	const ids = await queryClient
+		.fetchQuery({
+			queryKey: instanceKeys.installedProjectIds(targetInstanceId, 'content'),
+			queryFn: () => getInstalledProjectIds(targetInstanceId),
+			staleTime: 0,
+		})
+		.catch(handleError)
 	if (!ids) return
 
 	debugLog('installedProjectIds loaded', { count: ids.length })
@@ -329,11 +347,13 @@ async function initInstanceContext() {
 		queryWid: route.query.wid,
 		queryFrom: route.query.from,
 	})
-	await initServerContext()
-	await refreshInstalledProjectIds()
+	await Promise.all([
+		initServerContext(),
+		refreshInstalledProjectIds(),
+		route.query.i ? instanceQuery.suspense().catch(handleError) : Promise.resolve(),
+	])
 
 	if (route.query.i) {
-		instance.value = (await getInstance(route.query.i as string).catch(handleError)) ?? null
 		debugLog('instance loaded', {
 			name: instance.value?.name,
 			loader: instance.value?.loader,
@@ -341,15 +361,7 @@ async function initInstanceContext() {
 		})
 
 		if (instance.value?.link?.project_id) {
-			debugLog('checking linked project for server status', instance.value.link.project_id)
-			const projectV3 = await get_project_v3(
-				instance.value.link.project_id,
-				'must_revalidate',
-			).catch(handleError)
-			if (projectV3?.minecraft_server != null) {
-				debugLog('instance is a server instance')
-				isServerInstance.value = true
-			}
+			await linkedInstanceProjectQuery.suspense().catch(handleError)
 		}
 	}
 }
@@ -577,16 +589,12 @@ const messages = defineMessages({
 const projectType = ref<ProjectType>(route.params.projectType as ProjectType)
 
 function resetInstanceContext() {
-	if (!instance.value) return
-
 	debugLog('instance context removed, resetting')
-	instance.value = null
 	installedProjectIds.value = null
 	instanceHideInstalled.value = false
 	newlyInstalled.value = []
 	hiddenInstanceProjectIds.value = new Set()
 	hiddenInstanceProjectIdsInitialized.value = false
-	isServerInstance.value = false
 	browseBreadcrumb.reset()
 	void refreshInstalledProjectIds()
 }
@@ -611,9 +619,18 @@ watch(
 
 watch(
 	() => route.query.i,
-	(instanceId) => {
-		if (!instanceId && route.path.startsWith('/browse')) {
+	async (nextInstanceId, previousInstanceId) => {
+		if (!route.path.startsWith('/browse') || nextInstanceId === previousInstanceId) return
+		if (!nextInstanceId) {
 			resetInstanceContext()
+			return
+		}
+
+		installedProjectIds.value = null
+		hiddenInstanceProjectIdsInitialized.value = false
+		await Promise.all([instanceQuery.suspense().catch(handleError), refreshInstalledProjectIds()])
+		if (instance.value?.link?.project_id) {
+			await linkedInstanceProjectQuery.suspense().catch(handleError)
 		}
 	},
 )
diff --git a/apps/app-frontend/src/pages/instance/Overview.vue b/apps/app-frontend/src/pages/instance/Overview.vue
deleted file mode 100644
index 1221d27175..0000000000
--- a/apps/app-frontend/src/pages/instance/Overview.vue
+++ /dev/null
@@ -1,13 +0,0 @@
-<template>{{ instance.name }} overview</template>
-<script setup lang="ts">
-import type ContextMenu from '@/components/ui/ContextMenu.vue'
-import type { GameInstance } from '@/helpers/types'
-
-defineProps<{
-	instance: GameInstance
-	options: InstanceType<typeof ContextMenu>
-	offline: boolean
-	playing: boolean
-	installed: boolean
-}>()
-</script>
diff --git a/apps/app-frontend/src/components/ui/instance/instance-admonitions/index.vue b/apps/app-frontend/src/pages/instance/components/admonitions/index.vue
similarity index 91%
rename from apps/app-frontend/src/components/ui/instance/instance-admonitions/index.vue
rename to apps/app-frontend/src/pages/instance/components/admonitions/index.vue
index e16171bc5b..5e4d996ad6 100644
--- a/apps/app-frontend/src/components/ui/instance/instance-admonitions/index.vue
+++ b/apps/app-frontend/src/pages/instance/components/admonitions/index.vue
@@ -36,11 +36,11 @@ import { computed, ref, watch } from 'vue'
 import type { SharedInstanceUnavailableReason } from '@/helpers/install'
 import type { GameInstance } from '@/helpers/types'
 
-import InstanceAdmonitionsSharedInstanceStale from './instance-admonitions-shared-instance-stale.vue'
-import InstanceAdmonitionsSharedInstanceUnavailable from './instance-admonitions-shared-instance-unavailable.vue'
-import InstanceAdmonitionsSharedInstanceUpdateAvailable from './instance-admonitions-shared-instance-update-available.vue'
-import InstanceAdmonitionsSharedInstanceWrongAccount from './instance-admonitions-shared-instance-wrong-account.vue'
-import type { InstanceAdmonitionItem, SharedInstanceRole } from './types'
+import InstanceAdmonitionsSharedInstanceStale from './shared-instance-stale.vue'
+import InstanceAdmonitionsSharedInstanceUnavailable from './shared-instance-unavailable.vue'
+import InstanceAdmonitionsSharedInstanceUpdateAvailable from './shared-instance-update-available.vue'
+import InstanceAdmonitionsSharedInstanceWrongAccount from './shared-instance-wrong-account.vue'
+import type { InstanceAdmonitionItem, SharedInstanceRole } from './types.ts'
 
 defineOptions({
 	inheritAttrs: false,
diff --git a/apps/app-frontend/src/components/ui/instance/instance-admonitions/instance-admonitions-messages.ts b/apps/app-frontend/src/pages/instance/components/admonitions/messages.ts
similarity index 100%
rename from apps/app-frontend/src/components/ui/instance/instance-admonitions/instance-admonitions-messages.ts
rename to apps/app-frontend/src/pages/instance/components/admonitions/messages.ts
diff --git a/apps/app-frontend/src/components/ui/instance/instance-admonitions/instance-admonitions-shared-instance-stale.vue b/apps/app-frontend/src/pages/instance/components/admonitions/shared-instance-stale.vue
similarity index 95%
rename from apps/app-frontend/src/components/ui/instance/instance-admonitions/instance-admonitions-shared-instance-stale.vue
rename to apps/app-frontend/src/pages/instance/components/admonitions/shared-instance-stale.vue
index e437bfe1cf..30a92c9044 100644
--- a/apps/app-frontend/src/components/ui/instance/instance-admonitions/instance-admonitions-shared-instance-stale.vue
+++ b/apps/app-frontend/src/pages/instance/components/admonitions/shared-instance-stale.vue
@@ -42,7 +42,7 @@ import { computed, ref } from 'vue'
 import SharedInstancePublishModal from '@/components/ui/shared-instances/SharedInstancePublishModal.vue'
 import type { GameInstance } from '@/helpers/types'
 
-import { instanceAdmonitionsMessages as messages } from './instance-admonitions-messages'
+import { instanceAdmonitionsMessages as messages } from './messages'
 
 defineProps<{
 	instance: GameInstance
diff --git a/apps/app-frontend/src/components/ui/instance/instance-admonitions/instance-admonitions-shared-instance-unavailable.vue b/apps/app-frontend/src/pages/instance/components/admonitions/shared-instance-unavailable.vue
similarity index 100%
rename from apps/app-frontend/src/components/ui/instance/instance-admonitions/instance-admonitions-shared-instance-unavailable.vue
rename to apps/app-frontend/src/pages/instance/components/admonitions/shared-instance-unavailable.vue
diff --git a/apps/app-frontend/src/components/ui/instance/instance-admonitions/instance-admonitions-shared-instance-update-available.vue b/apps/app-frontend/src/pages/instance/components/admonitions/shared-instance-update-available.vue
similarity index 89%
rename from apps/app-frontend/src/components/ui/instance/instance-admonitions/instance-admonitions-shared-instance-update-available.vue
rename to apps/app-frontend/src/pages/instance/components/admonitions/shared-instance-update-available.vue
index ffb96f4329..172b1227c9 100644
--- a/apps/app-frontend/src/components/ui/instance/instance-admonitions/instance-admonitions-shared-instance-update-available.vue
+++ b/apps/app-frontend/src/pages/instance/components/admonitions/shared-instance-update-available.vue
@@ -20,7 +20,7 @@
 import { DownloadIcon } from '@modrinth/assets'
 import { Admonition, ButtonStyled, useVIntl } from '@modrinth/ui'
 
-import { instanceAdmonitionsMessages as messages } from './instance-admonitions-messages'
+import { instanceAdmonitionsMessages as messages } from './messages'
 
 defineProps<{
 	instanceName: string
diff --git a/apps/app-frontend/src/components/ui/instance/instance-admonitions/instance-admonitions-shared-instance-wrong-account.vue b/apps/app-frontend/src/pages/instance/components/admonitions/shared-instance-wrong-account.vue
similarity index 96%
rename from apps/app-frontend/src/components/ui/instance/instance-admonitions/instance-admonitions-shared-instance-wrong-account.vue
rename to apps/app-frontend/src/pages/instance/components/admonitions/shared-instance-wrong-account.vue
index aab1f2fa8f..4582622772 100644
--- a/apps/app-frontend/src/components/ui/instance/instance-admonitions/instance-admonitions-shared-instance-wrong-account.vue
+++ b/apps/app-frontend/src/pages/instance/components/admonitions/shared-instance-wrong-account.vue
@@ -29,7 +29,7 @@ import { computed } from 'vue'
 
 import { get_user } from '@/helpers/cache'
 
-import { instanceAdmonitionsMessages as messages } from './instance-admonitions-messages'
+import { instanceAdmonitionsMessages as messages } from './messages'
 import type { SharedInstanceRole } from './types'
 
 const props = defineProps<{
diff --git a/apps/app-frontend/src/components/ui/instance/instance-admonitions/types.ts b/apps/app-frontend/src/pages/instance/components/admonitions/types.ts
similarity index 100%
rename from apps/app-frontend/src/components/ui/instance/instance-admonitions/types.ts
rename to apps/app-frontend/src/pages/instance/components/admonitions/types.ts
diff --git a/apps/app-frontend/src/components/ui/instance-page-header/index.vue b/apps/app-frontend/src/pages/instance/components/page-header/index.vue
similarity index 100%
rename from apps/app-frontend/src/components/ui/instance-page-header/index.vue
rename to apps/app-frontend/src/pages/instance/components/page-header/index.vue
diff --git a/apps/app-frontend/src/components/ui/instance-page-header/instance-page-header-server-metadata.vue b/apps/app-frontend/src/pages/instance/components/page-header/instance-page-header-server-metadata.vue
similarity index 100%
rename from apps/app-frontend/src/components/ui/instance-page-header/instance-page-header-server-metadata.vue
rename to apps/app-frontend/src/pages/instance/components/page-header/instance-page-header-server-metadata.vue
diff --git a/apps/app-frontend/src/components/ui/shared-instances/ConfirmRevokeSharedInstanceInviteModal.vue b/apps/app-frontend/src/pages/instance/components/settings-modal/confirm-revoke-shared-instance-invite-modal.vue
similarity index 100%
rename from apps/app-frontend/src/components/ui/shared-instances/ConfirmRevokeSharedInstanceInviteModal.vue
rename to apps/app-frontend/src/pages/instance/components/settings-modal/confirm-revoke-shared-instance-invite-modal.vue
diff --git a/apps/app-frontend/src/components/ui/instance_settings/GeneralSettings.vue b/apps/app-frontend/src/pages/instance/components/settings-modal/general-settings.vue
similarity index 99%
rename from apps/app-frontend/src/components/ui/instance_settings/GeneralSettings.vue
rename to apps/app-frontend/src/pages/instance/components/settings-modal/general-settings.vue
index 8568ebefa6..ef6bec1319 100644
--- a/apps/app-frontend/src/components/ui/instance_settings/GeneralSettings.vue
+++ b/apps/app-frontend/src/pages/instance/components/settings-modal/general-settings.vue
@@ -21,9 +21,9 @@ import ConfirmDeleteInstanceModal from '@/components/ui/modal/ConfirmDeleteInsta
 import { trackEvent } from '@/helpers/analytics'
 import { install_duplicate_instance } from '@/helpers/install'
 import { edit, edit_icon, list, remove } from '@/helpers/instance'
-import { injectInstanceSettings } from '@/providers/instance-settings'
 
-import type { GameInstance } from '../../../helpers/types'
+import type { GameInstance } from '../../../../helpers/types'
+import { injectInstanceSettings } from './instance-settings-context'
 
 const { handleError } = injectNotificationManager()
 const { formatMessage } = useVIntl()
diff --git a/apps/app-frontend/src/components/ui/instance_settings/HooksSettings.vue b/apps/app-frontend/src/pages/instance/components/settings-modal/hooks-settings.vue
similarity index 96%
rename from apps/app-frontend/src/components/ui/instance_settings/HooksSettings.vue
rename to apps/app-frontend/src/pages/instance/components/settings-modal/hooks-settings.vue
index bfd016d940..6af96227b2 100644
--- a/apps/app-frontend/src/components/ui/instance_settings/HooksSettings.vue
+++ b/apps/app-frontend/src/pages/instance/components/settings-modal/hooks-settings.vue
@@ -10,9 +10,9 @@ import { computed, ref, watch } from 'vue'
 
 import { edit } from '@/helpers/instance'
 import { get } from '@/helpers/settings.ts'
-import { injectInstanceSettings } from '@/providers/instance-settings'
 
-import type { AppSettings, Hooks } from '../../../helpers/types'
+import type { AppSettings, Hooks } from '../../../../helpers/types'
+import { injectInstanceSettings } from './instance-settings-context'
 
 const { handleError } = injectNotificationManager()
 const { formatMessage } = useVIntl()
diff --git a/apps/app-frontend/src/components/ui/modal/InstanceSettingsModal.vue b/apps/app-frontend/src/pages/instance/components/settings-modal/index.vue
similarity index 89%
rename from apps/app-frontend/src/components/ui/modal/InstanceSettingsModal.vue
rename to apps/app-frontend/src/pages/instance/components/settings-modal/index.vue
index 800cac656b..c979e793c5 100644
--- a/apps/app-frontend/src/components/ui/modal/InstanceSettingsModal.vue
+++ b/apps/app-frontend/src/pages/instance/components/settings-modal/index.vue
@@ -22,19 +22,19 @@ import { useQuery, useQueryClient } from '@tanstack/vue-query'
 import { convertFileSrc } from '@tauri-apps/api/core'
 import { computed, nextTick, ref, watch } from 'vue'
 
-import GeneralSettings from '@/components/ui/instance_settings/GeneralSettings.vue'
-import HooksSettings from '@/components/ui/instance_settings/HooksSettings.vue'
-import InstallationSettings from '@/components/ui/instance_settings/InstallationSettings.vue'
-import JavaSettings from '@/components/ui/instance_settings/JavaSettings.vue'
-import SharingSettings from '@/components/ui/instance_settings/SharingSettings.vue'
-import WindowSettings from '@/components/ui/instance_settings/WindowSettings.vue'
 import { get_project_v3 } from '@/helpers/cache'
 import { get_linked_modpack_info } from '@/helpers/instance'
 import { get_loader_versions } from '@/helpers/metadata'
 import { get_game_versions, get_loaders } from '@/helpers/tags'
-import { provideInstanceSettings } from '@/providers/instance-settings'
+import type { GameInstance } from '@/helpers/types'
 
-import type { GameInstance } from '../../../helpers/types'
+import GeneralSettings from './general-settings.vue'
+import HooksSettings from './hooks-settings.vue'
+import InstallationSettings from './installation-settings.vue'
+import { provideInstanceSettings } from './instance-settings-context.ts'
+import JavaSettings from './java-settings.vue'
+import SharingSettings from './sharing-settings.vue'
+import WindowSettings from './window-settings.vue'
 
 const { formatMessage } = useVIntl()
 const queryClient = useQueryClient()
diff --git a/apps/app-frontend/src/components/ui/instance_settings/InstallationSettings.vue b/apps/app-frontend/src/pages/instance/components/settings-modal/installation-settings.vue
similarity index 97%
rename from apps/app-frontend/src/components/ui/instance_settings/InstallationSettings.vue
rename to apps/app-frontend/src/pages/instance/components/settings-modal/installation-settings.vue
index fe210e165f..b415d92757 100644
--- a/apps/app-frontend/src/components/ui/instance_settings/InstallationSettings.vue
+++ b/apps/app-frontend/src/pages/instance/components/settings-modal/installation-settings.vue
@@ -15,7 +15,6 @@ import type { GameVersionTag, PlatformTag } from '@modrinth/utils'
 import { useQuery, useQueryClient } from '@tanstack/vue-query'
 import { computed, ref } from 'vue'
 
-import SharedInstanceInstallationSettingsControls from '@/components/ui/shared-instances/SharedInstanceInstallationSettingsControls.vue'
 import { useManagedContentPolicy } from '@/composables/instances/use-managed-content-policy'
 import { trackEvent } from '@/helpers/analytics'
 import { get_project_versions, get_version } from '@/helpers/cache'
@@ -34,10 +33,12 @@ import {
 import { get_loader_versions } from '@/helpers/metadata'
 import { get_game_versions, get_loaders } from '@/helpers/tags'
 import { provideInstanceBackup } from '@/providers/instance-backup'
-import { injectInstanceSettings } from '@/providers/instance-settings'
 import { useTheming } from '@/store/state'
 
-import type { Manifest } from '../../../helpers/types'
+import type { Manifest } from '../../../../helpers/types'
+import { instanceKeys } from '../../query-options.ts'
+import { injectInstanceSettings } from './instance-settings-context.ts'
+import SharedInstanceInstallationSettingsControls from './shared-instance-installation-settings-controls.vue'
 
 const { handleError } = injectNotificationManager()
 const filePicker = injectFilePicker()
@@ -148,7 +149,9 @@ async function unlinkSharedInstance() {
 	unlinkingSharedInstance.value = true
 	try {
 		await unlink_shared_instance(instance.value.id)
-		await queryClient.invalidateQueries({ queryKey: ['sharedInstanceUsers', instance.value.id] })
+		await queryClient.invalidateQueries({
+			queryKey: instanceKeys.sharedMembers(instance.value.id),
+		})
 		await queryClient.invalidateQueries({ queryKey: ['linkedModpackInfo', instance.value.id] })
 		onUnlinked()
 	} catch (error) {
diff --git a/apps/app-frontend/src/providers/instance-settings.ts b/apps/app-frontend/src/pages/instance/components/settings-modal/instance-settings-context.ts
similarity index 100%
rename from apps/app-frontend/src/providers/instance-settings.ts
rename to apps/app-frontend/src/pages/instance/components/settings-modal/instance-settings-context.ts
diff --git a/apps/app-frontend/src/components/ui/instance_settings/JavaSettings.vue b/apps/app-frontend/src/pages/instance/components/settings-modal/java-settings.vue
similarity index 98%
rename from apps/app-frontend/src/components/ui/instance_settings/JavaSettings.vue
rename to apps/app-frontend/src/pages/instance/components/settings-modal/java-settings.vue
index 71e4449937..b73d848c87 100644
--- a/apps/app-frontend/src/components/ui/instance_settings/JavaSettings.vue
+++ b/apps/app-frontend/src/pages/instance/components/settings-modal/java-settings.vue
@@ -25,9 +25,9 @@ import useJavaTest from '@/composables/useJavaTest'
 import useMemorySlider from '@/composables/useMemorySlider'
 import { edit, get_optimal_jre_key } from '@/helpers/instance'
 import { get } from '@/helpers/settings.ts'
-import { injectInstanceSettings } from '@/providers/instance-settings'
 
-import type { AppSettings } from '../../../helpers/types'
+import type { AppSettings } from '../../../../helpers/types'
+import { injectInstanceSettings } from './instance-settings-context'
 
 const { handleError } = injectNotificationManager()
 const { formatMessage } = useVIntl()
diff --git a/apps/app-frontend/src/components/ui/shared-instances/SharedInstanceInstallationSettingsControls.vue b/apps/app-frontend/src/pages/instance/components/settings-modal/shared-instance-installation-settings-controls.vue
similarity index 100%
rename from apps/app-frontend/src/components/ui/shared-instances/SharedInstanceInstallationSettingsControls.vue
rename to apps/app-frontend/src/pages/instance/components/settings-modal/shared-instance-installation-settings-controls.vue
diff --git a/apps/app-frontend/src/components/ui/instance_settings/SharingSettings.vue b/apps/app-frontend/src/pages/instance/components/settings-modal/sharing-settings.vue
similarity index 94%
rename from apps/app-frontend/src/components/ui/instance_settings/SharingSettings.vue
rename to apps/app-frontend/src/pages/instance/components/settings-modal/sharing-settings.vue
index c34a6e0b62..c2c481889f 100644
--- a/apps/app-frontend/src/components/ui/instance_settings/SharingSettings.vue
+++ b/apps/app-frontend/src/pages/instance/components/settings-modal/sharing-settings.vue
@@ -94,8 +94,6 @@ import {
 import { useMutation, useQuery, useQueryClient } from '@tanstack/vue-query'
 import { computed, ref } from 'vue'
 
-import ConfirmRevokeSharedInstanceInviteModal from '@/components/ui/shared-instances/ConfirmRevokeSharedInstanceInviteModal.vue'
-import SharedInstanceInstallationSettingsControls from '@/components/ui/shared-instances/SharedInstanceInstallationSettingsControls.vue'
 import { config } from '@/config'
 import {
 	get_shared_instance_invites,
@@ -104,7 +102,11 @@ import {
 	unpublish_shared_instance,
 } from '@/helpers/instance'
 import { useSharedInstanceErrors } from '@/helpers/shared-instance-errors'
-import { injectInstanceSettings } from '@/providers/instance-settings'
+
+import { instanceKeys } from '../../query-options.ts'
+import ConfirmRevokeSharedInstanceInviteModal from './confirm-revoke-shared-instance-invite-modal.vue'
+import { injectInstanceSettings } from './instance-settings-context.ts'
+import SharedInstanceInstallationSettingsControls from './shared-instance-installation-settings-controls.vue'
 
 const { instance, offline, onUnlinked } = injectInstanceSettings()
 const { notifySharedInstanceError } = useSharedInstanceErrors()
@@ -193,7 +195,7 @@ async function unpublishSharedInstance() {
 	unpublishing.value = true
 	try {
 		await unpublish_shared_instance(instance.value.id)
-		queryClient.setQueryData(['sharedInstanceUsers', instance.value.id], [])
+		queryClient.setQueryData(instanceKeys.sharedMembers(instance.value.id), [])
 		await queryClient.invalidateQueries({ queryKey: ['linkedModpackInfo', instance.value.id] })
 		onUnlinked()
 	} catch (error) {
diff --git a/apps/app-frontend/src/components/ui/instance_settings/WindowSettings.vue b/apps/app-frontend/src/pages/instance/components/settings-modal/window-settings.vue
similarity index 97%
rename from apps/app-frontend/src/components/ui/instance_settings/WindowSettings.vue
rename to apps/app-frontend/src/pages/instance/components/settings-modal/window-settings.vue
index 925a22a3de..5e6a662366 100644
--- a/apps/app-frontend/src/components/ui/instance_settings/WindowSettings.vue
+++ b/apps/app-frontend/src/pages/instance/components/settings-modal/window-settings.vue
@@ -11,9 +11,9 @@ import { computed, type Ref, ref, watch } from 'vue'
 
 import { edit } from '@/helpers/instance'
 import { get } from '@/helpers/settings.ts'
-import { injectInstanceSettings } from '@/providers/instance-settings'
 
-import type { AppSettings } from '../../../helpers/types'
+import type { AppSettings } from '../../../../helpers/types'
+import { injectInstanceSettings } from './instance-settings-context'
 
 const { handleError } = injectNotificationManager()
 const { formatMessage } = useVIntl()
diff --git a/apps/app-frontend/src/pages/instance/Mods.vue b/apps/app-frontend/src/pages/instance/content/index.vue
similarity index 89%
rename from apps/app-frontend/src/pages/instance/Mods.vue
rename to apps/app-frontend/src/pages/instance/content/index.vue
index f7314efbee..018c27b03e 100644
--- a/apps/app-frontend/src/pages/instance/Mods.vue
+++ b/apps/app-frontend/src/pages/instance/content/index.vue
@@ -19,13 +19,11 @@
 					ref="modpackContentModal"
 					:modpack-name="displayedModpackProject?.title"
 					:modpack-icon-url="displayedModpackProject?.icon_url ?? undefined"
-					:enable-toggle="!props.isServerInstance && !isSharedMember && !isQuarantined"
+					:enable-toggle="!isServerInstance && !isSharedMember && !isQuarantined"
 					:busy="isBulkOperating"
 					:get-overflow-options="getOverflowOptions"
 					:switch-version="
-						props.isServerInstance || isSharedMember || isQuarantined
-							? undefined
-							: handleSwitchVersion
+						isServerInstance || isSharedMember || isQuarantined ? undefined : handleSwitchVersion
 					"
 					@update:enabled="handleModpackContentToggle"
 					@bulk:enable="(items) => handleModpackContentBulkToggle(items, true)"
@@ -146,13 +144,15 @@ import {
 } from '@/helpers/instance'
 import { type InstanceContentData, loadInstanceContentData } from '@/helpers/instance-content'
 import { get as getSettings, set as setSettings } from '@/helpers/settings'
-import type { CacheBehaviour, GameInstance } from '@/helpers/types'
+import type { CacheBehaviour } from '@/helpers/types'
 import { highlightModInInstance } from '@/helpers/utils.js'
 import { injectContentInstall } from '@/providers/content-install'
-import { provideInstanceBackup } from '@/providers/instance-backup'
 import { useTheming } from '@/store/state'
 import type { FeatureFlag } from '@/store/theme'
 
+import { injectInstancePage } from '../instance-context'
+import { instanceContentQueryOptions, instanceKeys } from '../query-options'
+
 const messages = defineMessages({
 	shareTitle: {
 		id: 'app.instance.mods.share-title',
@@ -218,13 +218,11 @@ const skipNonEssentialWarnings = computed(() =>
 	themeStore.getFeatureFlag('skip_non_essential_warnings'),
 )
 
-const props = defineProps<{
-	instance: GameInstance
-	isServerInstance?: boolean
-	openSettings?: () => void
-	preloadedContent?: InstanceContentData | null
-}>()
-const managedContentPolicy = useManagedContentPolicy(computed(() => props.instance))
+const instancePage = injectInstancePage()
+const instance = instancePage.instance
+const isServerInstance = instancePage.isServerInstance
+const openSettings = () => instancePage.openSettings(1)
+const managedContentPolicy = useManagedContentPolicy(computed(() => instance.value))
 const {
 	isManagedModpack: isSharedMember,
 	isQuarantined,
@@ -232,18 +230,20 @@ const {
 	canUpdateContent: canUpdateProject,
 } = managedContentPolicy
 
-function hasPreloadedContent(contentData: InstanceContentData | null | undefined) {
-	return contentData?.path === props.instance.id
-}
-
-const loading = ref(!hasPreloadedContent(props.preloadedContent))
+const contentQuery = useQuery(
+	computed(() => ({
+		...instanceContentQueryOptions(instancePage.instanceId.value),
+		enabled: !!instancePage.instanceId.value,
+	})),
+)
+const loading = ref(contentQuery.data.value === undefined)
 const projects = ref<ContentItem[]>([])
 
 const installingBuffer = ref<ContentItem[]>([])
 const handledInstallRevision = ref(0)
 
 watch(
-	() => installingItems.value.get(props.instance.id),
+	() => installingItems.value.get(instance.value.id),
 	(items) => {
 		if (items && items.length > 0) {
 			installingBuffer.value = [...items]
@@ -261,7 +261,7 @@ watch(projects, (newProjects) => {
 })
 
 const mergedProjects = computed<ContentItem[]>(() => {
-	const active = installingItems.value.get(props.instance.id)
+	const active = installingItems.value.get(instance.value.id)
 	const pending = active ?? installingBuffer.value
 	if (pending.length === 0) return projects.value
 	const pendingProjectIds = new Set(pending.map((p) => p.project?.id).filter(Boolean))
@@ -276,7 +276,7 @@ const mergedProjects = computed<ContentItem[]>(() => {
 })
 
 watch(
-	() => installFailureRevisionByInstance.value.get(props.instance.id) ?? 0,
+	() => installFailureRevisionByInstance.value.get(instance.value.id) ?? 0,
 	(revision, previousRevision) => {
 		if (revision === previousRevision) return
 		installingBuffer.value = []
@@ -292,14 +292,14 @@ const linkedModpackUpdateVersionId = ref<string | null>(null)
 const localImportedModpackUnlinked = ref(false)
 
 const localImportedModpackProject = computed<ContentModpackCardProject | null>(() => {
-	const link = props.instance.link
+	const link = instance.value.link
 	if (localImportedModpackUnlinked.value || link?.type !== 'imported_modpack') return null
 
 	return {
-		id: link.filename ?? props.instance.id,
-		slug: link.filename ?? props.instance.id,
-		title: link.name ?? props.instance.name,
-		icon_url: props.instance.icon_path ? convertFileSrc(props.instance.icon_path) : undefined,
+		id: link.filename ?? instance.value.id,
+		slug: link.filename ?? instance.value.id,
+		title: link.name ?? instance.value.name,
+		icon_url: instance.value.icon_path ? convertFileSrc(instance.value.icon_path) : undefined,
 		description: '',
 		filename: link.filename ?? undefined,
 	}
@@ -310,7 +310,7 @@ const displayedModpackProject = computed(
 )
 
 watch(
-	() => props.instance.link,
+	() => instance.value.link,
 	() => {
 		localImportedModpackUnlinked.value = false
 	},
@@ -318,12 +318,12 @@ watch(
 
 const isModpackUpdating = ref(false)
 const isBulkOperating = ref(false)
-const isInstanceBusy = computed(() => props.instance?.install_stage !== 'installed')
+const isInstanceBusy = computed(() => instance.value?.install_stage !== 'installed')
 const isPackLocked = computed(
 	() =>
-		props.instance.quarantined ||
-		props.instance?.link?.type === 'modrinth_modpack' ||
-		props.instance?.link?.type === 'server_project_modpack',
+		instance.value.quarantined ||
+		instance.value?.link?.type === 'modrinth_modpack' ||
+		instance.value?.link?.type === 'server_project_modpack',
 )
 
 const shareModal = ref<InstanceType<typeof ShareModalWrapper> | null>()
@@ -337,15 +337,15 @@ const unknownFileWarningModal = ref<InstanceType<typeof UnknownFileWarningModal>
 const unknownFileName = ref('')
 let resolveUnknownFileConfirmation: ((confirmed: boolean) => void) | null = null
 
-const modpackContentQueryKey = computed(() => ['linkedModpackContent', props.instance.id])
+const modpackContentQueryKey = computed(() => instanceKeys.linkedContent(instance.value.id))
 const modpackContentQuery = useQuery({
 	queryKey: modpackContentQueryKey,
-	queryFn: () => get_linked_modpack_content(props.instance.id),
+	queryFn: () => get_linked_modpack_content(instance.value.id),
 	enabled: computed(
 		() =>
-			!!props.instance?.id &&
-			!!props.instance?.link &&
-			props.instance.install_stage === 'installed',
+			!!instance.value?.id &&
+			!!instance.value?.link &&
+			instance.value.install_stage === 'installed',
 	),
 })
 
@@ -523,15 +523,12 @@ async function getUpdaterProjectVersions(projectId: string, pinnedVersionId?: st
 }
 
 async function handleBrowseContent() {
-	if (!props.instance || props.instance.quarantined) return
-	await router.push({
-		path: `/browse/${props.instance.loader === 'vanilla' ? 'resourcepack' : 'mod'}`,
-		query: { i: props.instance.id },
-	})
+	if (!instance.value || instance.value.quarantined) return
+	await instancePage.browseContent(instance.value.loader === 'vanilla' ? 'resourcepack' : 'mod')
 }
 
 async function handleUploadFiles() {
-	if (!props.instance || props.instance.quarantined) return
+	if (!instance.value || instance.value.quarantined) return
 	const files = await open({ multiple: true })
 	if (!files) return
 	const selectedFiles: Array<{ path: string; filename: string }> = []
@@ -566,7 +563,7 @@ async function handleUploadFiles() {
 		await Promise.all(
 			confirmedFiles.map(async ({ path, filename }) => {
 				try {
-					const installedPath = await add_project_from_path(props.instance.id, path)
+					const installedPath = await add_project_from_path(instance.value.id, path)
 					return { filename, installedPath }
 				} catch (error) {
 					handleError(error as Error)
@@ -637,7 +634,7 @@ async function toggleDisableMod(mod: ContentItem, desiredEnabled?: boolean) {
 	const originalFilePath = mod.file_path
 
 	try {
-		const newPath = await toggle_disable_project(props.instance.id, mod.file_path, desiredEnabled)
+		const newPath = await toggle_disable_project(instance.value.id, mod.file_path, desiredEnabled)
 		const newFileName = fileNameFromPath(newPath)
 		const enabled = !newPath.endsWith('.disabled')
 		mod.file_path = newPath
@@ -655,8 +652,8 @@ async function toggleDisableMod(mod: ContentItem, desiredEnabled?: boolean) {
 		})
 
 		trackEvent('InstanceProjectDisable', {
-			loader: props.instance.loader,
-			game_version: props.instance.game_version,
+			loader: instance.value.loader,
+			game_version: instance.value.game_version,
 			id: mod.project?.id,
 			name: mod.project?.title ?? mod.file_name,
 			project_type: mod.project_type,
@@ -678,12 +675,12 @@ async function removeMod(mod: ContentItem) {
 
 	try {
 		const removedPath = mod.file_path
-		await remove_project(props.instance.id, removedPath)
+		await remove_project(instance.value.id, removedPath)
 		projects.value = projects.value.filter((x) => removedPath !== x.file_path)
 
 		trackEvent('InstanceProjectRemove', {
-			loader: props.instance.loader,
-			game_version: props.instance.game_version,
+			loader: instance.value.loader,
+			game_version: instance.value.game_version,
 			id: mod.project?.id,
 			name: mod.project?.title ?? mod.file_name,
 			project_type: mod.project_type,
@@ -709,7 +706,7 @@ function dependencyTargetsItem(dependency: Labrinth.Versions.v2.Dependency, item
 }
 
 async function getDeleteDependencyWarning(items: ContentItem[]) {
-	if (props.isServerInstance) return null
+	if (isServerInstance.value) return null
 
 	const deletingIds = new Set(items.map(getContentItemId))
 	const remainingItems = projects.value.filter((item) => !deletingIds.has(getContentItemId(item)))
@@ -787,12 +784,12 @@ async function bulkUpdateAllProjects(onProgress?: (status: BulkOperationStatus)
 				waiting: true,
 			})
 			unlisten = await instance_bulk_update_progress_listener((progress) => {
-				if (progress.instanceId !== props.instance.id) return
+				if (progress.instanceId !== instance.value.id) return
 				onProgress(formatBulkUpdateProgress(progress))
 			})
 		}
 
-		await update_all(props.instance.id)
+		await update_all(instance.value.id)
 		await refreshContentState('must_revalidate')
 	} catch (err) {
 		handleError(err as Error)
@@ -810,14 +807,14 @@ async function updateProject(mod: ContentItem) {
 	try {
 		const updateVersionId = mod.update_version_id!
 		await switch_project_version_with_dependencies(
-			props.instance.id,
+			instance.value.id,
 			mod.file_path,
 			updateVersionId,
 		)
 
 		trackEvent('InstanceProjectUpdate', {
-			loader: props.instance.loader,
-			game_version: props.instance.game_version,
+			loader: instance.value.loader,
+			game_version: instance.value.game_version,
 			id: mod.project?.id,
 			name: mod.project?.title ?? mod.file_name,
 			project_type: mod.project_type,
@@ -840,11 +837,11 @@ async function switchProjectVersion(mod: ContentItem, version: Labrinth.Versions
 	const oldPath = mod.file_path
 
 	try {
-		await switch_project_version_with_dependencies(props.instance.id, oldPath, version.id)
+		await switch_project_version_with_dependencies(instance.value.id, oldPath, version.id)
 
 		trackEvent('InstanceProjectUpdate', {
-			loader: props.instance.loader,
-			game_version: props.instance.game_version,
+			loader: instance.value.loader,
+			game_version: instance.value.game_version,
 			id: mod.project?.id,
 			name: mod.project?.title ?? mod.file_name,
 			project_type: mod.project_type,
@@ -872,8 +869,8 @@ async function handleUpdate(id: string) {
 		currentVersionId: item.version.id,
 		currentVersionNumber: item.version.version_number,
 		updateVersionId: item.update_version_id,
-		instanceGameVersion: props.instance.game_version,
-		instanceLoader: props.instance.loader,
+		instanceGameVersion: instance.value.game_version,
+		instanceLoader: instance.value.loader,
 	})
 
 	updatingModpack.value = false
@@ -899,11 +896,11 @@ async function handleUpdate(id: string) {
 			updateVersionId: item.update_version_id,
 		},
 		instance: {
-			path: props.instance.id,
-			name: props.instance.name,
-			gameVersion: props.instance.game_version,
-			loader: props.instance.loader,
-			link: props.instance.link,
+			path: instance.value.id,
+			name: instance.value.name,
+			gameVersion: instance.value.game_version,
+			loader: instance.value.loader,
+			link: instance.value.link,
 		},
 		modalStateBeforeFetch: {
 			updatingModpack: updatingModpack.value,
@@ -1027,7 +1024,7 @@ async function setModpackContentEnabled(items: ContentItem[], enabled: boolean)
 }
 
 async function handleModpackContent() {
-	if (!props.instance?.id) return
+	if (!instance.value?.id) return
 
 	if (modpackContentQuery.data.value?.length) {
 		modpackContentModal.value?.show(modpackContentQuery.data.value)
@@ -1047,12 +1044,12 @@ async function handleModpackContent() {
 }
 
 async function refreshModpackContentItems(cacheBehaviour?: CacheBehaviour) {
-	if (!props.instance?.id) return
+	if (!instance.value?.id) return
 
 	const contentItems = await queryClient
 		.fetchQuery({
 			queryKey: modpackContentQueryKey.value,
-			queryFn: () => get_linked_modpack_content(props.instance.id, cacheBehaviour),
+			queryFn: () => get_linked_modpack_content(instance.value.id, cacheBehaviour),
 		})
 		.catch(handleError)
 
@@ -1067,7 +1064,7 @@ async function refreshContentState(cacheBehaviour?: CacheBehaviour) {
 }
 
 watch(
-	() => installRevisionByInstance.value.get(props.instance.id) ?? 0,
+	() => installRevisionByInstance.value.get(instance.value.id) ?? 0,
 	async (revision) => {
 		if (revision <= handledInstallRevision.value) return
 		handledInstallRevision.value = revision
@@ -1076,7 +1073,7 @@ watch(
 )
 
 async function handleModpackUpdate() {
-	if (!props.instance?.link?.project_id) return
+	if (!instance.value?.link?.project_id) return
 
 	const requestId = beginUpdateRequest()
 
@@ -1089,7 +1086,7 @@ async function handleModpackUpdate() {
 	await nextTick()
 
 	const initialVersionId =
-		linkedModpackUpdateVersionId.value ?? props.instance?.link?.version_id ?? undefined
+		linkedModpackUpdateVersionId.value ?? instance.value?.link?.version_id ?? undefined
 	debug('handleModpackUpdate: opening modpack updater modal', {
 		type: 'modpack',
 		initialVersionId,
@@ -1098,11 +1095,11 @@ async function handleModpackUpdate() {
 		linkedModpackVersion: linkedModpackVersion.value,
 		linkedModpackHasUpdate: linkedModpackHasUpdate.value,
 		instance: {
-			path: props.instance.id,
-			name: props.instance.name,
-			gameVersion: props.instance.game_version,
-			loader: props.instance.loader,
-			link: props.instance.link,
+			path: instance.value.id,
+			name: instance.value.name,
+			gameVersion: instance.value.game_version,
+			loader: instance.value.loader,
+			link: instance.value.link,
 		},
 		modalStateBeforeFetch: {
 			updatingModpack: updatingModpack.value,
@@ -1118,7 +1115,7 @@ async function handleModpackUpdate() {
 	})
 	contentUpdaterModal.value?.show(initialVersionId)
 
-	const versions = await getUpdaterProjectVersions(props.instance.link.project_id, initialVersionId)
+	const versions = await getUpdaterProjectVersions(instance.value.link.project_id, initialVersionId)
 
 	if (!isActiveUpdateRequest(requestId) || !updatingModpack.value) return
 
@@ -1143,7 +1140,7 @@ async function handleModpackUpdate() {
 			: null,
 		versionCount: versions.length,
 		linkedModpackUpdateVersionId: linkedModpackUpdateVersionId.value,
-		currentLinkedVersionId: props.instance.link.version_id,
+		currentLinkedVersionId: instance.value.link.version_id,
 	})
 
 	updatingProjectVersions.value = versions
@@ -1195,14 +1192,14 @@ function resetUpdateState() {
 async function handleModpackUpdateRequest(selectedVersion: Labrinth.Versions.v2.Version) {
 	pendingModpackUpdateVersion.value = selectedVersion
 
-	const currentVersionId = props.instance?.link?.version_id
+	const currentVersionId = instance.value?.link?.version_id
 	const currentVersion = updatingProjectVersions.value.find((v) => v.id === currentVersionId)
 	isModpackUpdateDowngrade.value = currentVersion
 		? new Date(selectedVersion.date_published) < new Date(currentVersion.date_published)
 		: false
 	const shouldShowWarning =
 		isModpackUpdateDowngrade.value ||
-		versionChangesGameVersion(selectedVersion, props.instance.game_version)
+		versionChangesGameVersion(selectedVersion, instance.value.game_version)
 
 	if (skipNonEssentialWarnings.value || !shouldShowWarning) {
 		await handleModpackUpdateConfirm()
@@ -1213,7 +1210,7 @@ async function handleModpackUpdateRequest(selectedVersion: Labrinth.Versions.v2.
 }
 
 async function handleModpackUpdateConfirm() {
-	if (!pendingModpackUpdateVersion.value || !props.instance?.id) return
+	if (!pendingModpackUpdateVersion.value || !instance.value?.id) return
 
 	const version = pendingModpackUpdateVersion.value
 	pendingModpackUpdateVersion.value = null
@@ -1221,7 +1218,7 @@ async function handleModpackUpdateConfirm() {
 	contentUpdaterModal.value?.hide()
 	isModpackUpdating.value = true
 	try {
-		await update_managed_modrinth_version(props.instance.id, version.id)
+		await update_managed_modrinth_version(instance.value.id, version.id)
 		await initProjects()
 	} finally {
 		isModpackUpdating.value = false
@@ -1260,7 +1257,7 @@ async function handleModalUpdate(
 }
 
 async function unpairInstance() {
-	await edit(props.instance.id, {
+	await edit(instance.value.id, {
 		link: null as unknown as undefined,
 	})
 	linkedModpackProject.value = null
@@ -1312,7 +1309,7 @@ function getOverflowOptions(item: ContentItem): OverflowMenuOption[] {
 	options.push({
 		id: formatMessage(commonMessages.showFileButton),
 		icon: FolderOpenIcon,
-		action: () => highlightModInInstance(props.instance.id, item.file_path),
+		action: () => highlightModInInstance(instance.value.id, item.file_path),
 	})
 
 	if (item.project?.slug) {
@@ -1330,15 +1327,19 @@ function getOverflowOptions(item: ContentItem): OverflowMenuOption[] {
 	return options
 }
 
-async function initProjects(cacheBehaviour?: CacheBehaviour) {
-	if (!props.instance) return
+async function initProjects(cacheBehaviour?: CacheBehaviour, staleTime = 0) {
+	if (!instance.value) return
 
-	const contentData = await loadInstanceContentData(props.instance.id, cacheBehaviour, handleError)
+	const contentData = await queryClient.fetchQuery({
+		...instanceContentQueryOptions(instance.value.id),
+		queryFn: () => loadInstanceContentData(instance.value.id, cacheBehaviour, handleError),
+		staleTime,
+	})
 	applyContentData(contentData)
 }
 
 function applyContentData(contentData: InstanceContentData) {
-	if (contentData.path !== props.instance.id) {
+	if (contentData.path !== instance.value.id) {
 		return false
 	}
 
@@ -1372,8 +1373,6 @@ function applyContentData(contentData: InstanceContentData) {
 	return true
 }
 
-provideInstanceBackup(() => props.instance)
-
 provideContentManager({
 	items: mergedProjects,
 	loading,
@@ -1384,14 +1383,14 @@ provideContentManager({
 				project: linkedModpackProject.value,
 				projectLink: {
 					path: `/project/${linkedModpackProject.value.slug ?? linkedModpackProject.value.id}`,
-					query: { i: props.instance.id },
+					query: { i: instance.value.id },
 				},
 				version: linkedModpackVersion.value ?? undefined,
 				versionLink:
 					linkedModpackProject.value && linkedModpackVersion.value
 						? {
 								path: `/project/${linkedModpackProject.value.slug ?? linkedModpackProject.value.id}/version/${linkedModpackVersion.value.id}`,
-								query: { i: props.instance.id },
+								query: { i: instance.value.id },
 							}
 						: undefined,
 				owner: linkedModpackOwner.value
@@ -1459,12 +1458,12 @@ provideContentManager({
 	bulkUpdateAll: bulkUpdateAllProjects,
 	bulkUpdateItem: updateProject,
 	updateModpack:
-		props.isServerInstance || isSharedMember.value || isQuarantined.value
+		isServerInstance.value || isSharedMember.value || isQuarantined.value
 			? undefined
 			: handleModpackUpdate,
 	viewModpackContent: handleModpackContent,
 	unlinkModpack: unpairInstance,
-	openSettings: props.openSettings,
+	openSettings: openSettings,
 	switchVersion: handleSwitchVersion,
 	getOverflowOptions,
 	shareItems: handleShareItems,
@@ -1478,7 +1477,7 @@ provideContentManager({
 			icon_url: null,
 		},
 		projectLink: item.project?.id
-			? { path: `/project/${item.project.id}`, query: { i: props.instance.id } }
+			? { path: `/project/${item.project.id}`, query: { i: instance.value.id } }
 			: undefined,
 		version: item.version ?? {
 			id: item.file_name,
@@ -1489,7 +1488,7 @@ provideContentManager({
 			item.project?.id && item.version?.id
 				? {
 						path: `/project/${item.project.id}/version/${item.version.id}`,
-						query: { i: props.instance.id },
+						query: { i: instance.value.id },
 					}
 				: undefined,
 		owner: item.owner
@@ -1504,7 +1503,7 @@ provideContentManager({
 		hideSwitchVersion: !canMutateContent(item) || !item.project?.id || !item.version?.id,
 		hasUpdate: canUpdateProject(item),
 	}),
-	filterPersistKey: props.instance.id,
+	filterPersistKey: instance.value.id,
 })
 
 type UnlistenFn = () => void
@@ -1513,7 +1512,7 @@ const initialContentReady = loadInitialContent()
 void initialContentReady.then(restoreModpackContentModalState).catch(handleError)
 
 function getInstallRevision() {
-	return installRevisionByInstance.value.get(props.instance.id) ?? 0
+	return installRevisionByInstance.value.get(instance.value.id) ?? 0
 }
 
 function loadInitialContent() {
@@ -1523,13 +1522,23 @@ function loadInitialContent() {
 		return initProjects('must_revalidate')
 	}
 
-	if (props.preloadedContent && applyContentData(props.preloadedContent)) {
-		return Promise.resolve()
-	}
-
-	return initProjects()
+	return initProjects(undefined, 30_000)
 }
 
+watch(
+	contentQuery.data,
+	(data) => {
+		if (data) applyContentData(data)
+	},
+	{ immediate: true },
+)
+watch(contentQuery.error, (error) => {
+	if (error) {
+		loading.value = false
+		handleError(error)
+	}
+})
+
 async function restoreModpackContentModalState() {
 	if (!savedModalState) return
 
@@ -1552,11 +1561,11 @@ let unlistenInstances: UnlistenFn | null = null
 onMounted(() => {
 	void getCurrentWebview()
 		.onDragDropEvent(async (event) => {
-			if (event.payload.type !== 'drop' || !props.instance) return
+			if (event.payload.type !== 'drop' || !instance.value) return
 
 			for (const file of event.payload.paths) {
 				if (file.endsWith('.mrpack')) continue
-				await add_project_from_path(props.instance.id, file).catch(handleError)
+				await add_project_from_path(instance.value.id, file).catch(handleError)
 			}
 			await initProjects()
 		})
@@ -1572,10 +1581,10 @@ onMounted(() => {
 
 	void instance_listener(async (event: { event: string; instance_id: string }) => {
 		if (
-			props.instance &&
-			event.instance_id === props.instance.id &&
+			instance.value &&
+			event.instance_id === instance.value.id &&
 			event.event === 'synced' &&
-			props.instance.install_stage === 'installed' &&
+			instance.value.install_stage === 'installed' &&
 			!isBulkOperating.value
 		) {
 			await initProjects()
@@ -1593,7 +1602,7 @@ onMounted(() => {
 })
 
 watch(
-	() => props.instance?.install_stage,
+	() => instance.value?.install_stage,
 	async (newStage, oldStage) => {
 		if (oldStage !== 'installed' && newStage === 'installed') {
 			await refreshContentState('must_revalidate')
@@ -1604,7 +1613,7 @@ watch(
 )
 
 watch(
-	() => props.instance?.link,
+	() => instance.value?.link,
 	async (newInstanceLink, oldInstanceLink) => {
 		if (oldInstanceLink && !newInstanceLink) {
 			await initProjects('must_revalidate')
@@ -1613,7 +1622,7 @@ watch(
 )
 
 watch(
-	() => props.instance?.update_channel,
+	() => instance.value?.update_channel,
 	async (newValue, oldValue) => {
 		if (newValue !== oldValue) {
 			await initProjects('must_revalidate')
diff --git a/apps/app-frontend/src/pages/instance/Files.vue b/apps/app-frontend/src/pages/instance/files/index.vue
similarity index 82%
rename from apps/app-frontend/src/pages/instance/Files.vue
rename to apps/app-frontend/src/pages/instance/files/index.vue
index 79020b38ac..0786bb0488 100644
--- a/apps/app-frontend/src/pages/instance/Files.vue
+++ b/apps/app-frontend/src/pages/instance/files/index.vue
@@ -10,6 +10,7 @@ import {
 	useDebugLogger,
 	useVIntl,
 } from '@modrinth/ui'
+import { useQuery } from '@tanstack/vue-query'
 import { invoke } from '@tauri-apps/api/core'
 import {
 	mkdir,
@@ -22,21 +23,17 @@ import {
 	writeFile as writeFileBytes,
 	writeTextFile,
 } from '@tauri-apps/plugin-fs'
-import { onUnmounted, ref, watch } from 'vue'
+import { computed, onUnmounted, ref, watch } from 'vue'
 
 import { instance_listener } from '@/helpers/events'
 import { get_full_path } from '@/helpers/instance'
-import type { GameInstance } from '@/helpers/types'
 import { highlightInFolder } from '@/helpers/utils'
 
-const props = defineProps<{
-	instance: GameInstance
-	options: unknown
-	offline: boolean
-	playing: boolean
-	installed: boolean
-	isServerInstance: boolean
-}>()
+import { injectInstancePage } from '../instance-context'
+import { instanceKeys } from '../query-options'
+
+const instancePage = injectInstancePage()
+const instanceId = instancePage.instanceId
 
 const { formatMessage } = useVIntl()
 const { addNotification } = injectNotificationManager()
@@ -53,7 +50,15 @@ const messages = defineMessages({
 	},
 })
 
-const instanceRoot = ref('')
+const instanceRootQuery = useQuery(
+	computed(() => ({
+		queryKey: instanceKeys.rootPath(instancePage.instanceId.value),
+		queryFn: () => get_full_path(instancePage.instanceId.value),
+		enabled: !!instancePage.instanceId.value,
+		staleTime: Infinity,
+	})),
+)
+const instanceRoot = computed(() => instanceRootQuery.data.value ?? '')
 const items = ref<FileItem[]>([])
 /** True until the first directory read for the current instance path finishes (initial load only). */
 const firstPaintPending = ref(true)
@@ -62,12 +67,7 @@ const error = ref<Error | null>(null)
 const currentPath = ref('')
 const editingFile = ref<EditingFile | null>(null)
 
-debug('setup: start, instance.id =', props.instance.id)
-
-instanceRoot.value = await get_full_path(props.instance.id)
-debug('setup: instanceRoot =', instanceRoot.value)
-await refresh()
-debug('setup: refresh complete, items =', items.value.length, 'error =', error.value)
+debug('setup: start, instance.id =', instanceId.value)
 
 function resolvePath(relativePath: string): string {
 	return relativePath ? `${instanceRoot.value}/${relativePath}` : instanceRoot.value
@@ -113,21 +113,39 @@ async function listDirectory(dirPath: string): Promise<FileItem[]> {
 	return results.filter((item): item is FileItem => item !== null)
 }
 
+const directoryQuery = useQuery(
+	computed(() => ({
+		queryKey: instanceKeys.files(instancePage.instanceId.value, currentPath.value),
+		queryFn: () => listDirectory(currentPath.value),
+		enabled: !!instanceRoot.value,
+		staleTime: 30_000,
+	})),
+)
+
+watch(
+	directoryQuery.data,
+	(data) => {
+		if (!data) return
+		items.value = data
+		firstPaintPending.value = false
+	},
+	{ immediate: true },
+)
+watch(directoryQuery.isFetching, (fetching) => {
+	loading.value = fetching
+})
+watch(directoryQuery.error, (queryError) => {
+	error.value = queryError
+	if (queryError) items.value = []
+})
+
+await instanceRootQuery.suspense()
+await directoryQuery.refetch()
+firstPaintPending.value = false
+
 async function refresh() {
 	debug('refresh: called, currentPath =', currentPath.value, 'instanceRoot =', instanceRoot.value)
-	loading.value = true
-	error.value = null
-	try {
-		items.value = await listDirectory(currentPath.value)
-		debug('refresh: success, items =', items.value.length)
-	} catch (e) {
-		debug('refresh: error =', e)
-		error.value = e instanceof Error ? e : new Error(String(e))
-		items.value = []
-	} finally {
-		loading.value = false
-		firstPaintPending.value = false
-	}
+	await directoryQuery.refetch()
 }
 
 function navigateTo(path: string) {
@@ -221,7 +239,7 @@ async function handleWriteFile(path: string, content: string) {
 
 async function handleDownloadFile(path: string, _fileName: string) {
 	await invoke('plugin:files|file_save_as', {
-		instanceId: props.instance.id,
+		instanceId: instanceId.value,
 		filePath: path,
 	})
 }
@@ -275,7 +293,7 @@ async function handleUploadFiles(files: File[]) {
 async function handleExtractFile(path: string, override: boolean, dry: boolean) {
 	try {
 		return await invoke('plugin:files|file_extract_zip', {
-			instanceId: props.instance.id,
+			instanceId: instanceId.value,
 			filePath: path,
 			overrideConflicts: override,
 			dryRun: dry,
@@ -293,7 +311,7 @@ debug('setup: registering instance_listener')
 const unlistenInstances = await instance_listener(
 	async (event: { event: string; instance_id: string }) => {
 		debug('instance_listener: event =', event.event, 'path =', event.instance_id)
-		if (event.instance_id === props.instance.id && event.event === 'synced') {
+		if (event.instance_id === instanceId.value && event.event === 'synced') {
 			debug('instance_listener: synced event matched, calling refresh')
 			await refresh()
 		}
@@ -305,16 +323,13 @@ onUnmounted(() => {
 	unlistenInstances()
 })
 
-watch(
-	() => props.instance.id,
-	async () => {
-		debug('watch instance.id: changed to', props.instance.id)
-		firstPaintPending.value = true
-		instanceRoot.value = await get_full_path(props.instance.id)
-		currentPath.value = ''
-		await refresh()
-	},
-)
+watch(instanceId, async () => {
+	debug('watch instance.id: changed to', instanceId.value)
+	firstPaintPending.value = true
+	currentPath.value = ''
+	await instanceRootQuery.refetch()
+	await refresh()
+})
 
 provideFileManager({
 	items,
diff --git a/apps/app-frontend/src/pages/instance/index.js b/apps/app-frontend/src/pages/instance/index.js
deleted file mode 100644
index 0e6a0e7ec2..0000000000
--- a/apps/app-frontend/src/pages/instance/index.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import Files from './Files.vue'
-import Index from './Index.vue'
-import Logs from './Logs.vue'
-import Mods from './Mods.vue'
-import Overview from './Overview.vue'
-import Share from './share/index.vue'
-import Worlds from './Worlds.vue'
-
-export { Files, Index, Logs, Mods, Overview, Share, Worlds }
diff --git a/apps/app-frontend/src/pages/instance/index.ts b/apps/app-frontend/src/pages/instance/index.ts
new file mode 100644
index 0000000000..a4cfdec8da
--- /dev/null
+++ b/apps/app-frontend/src/pages/instance/index.ts
@@ -0,0 +1,8 @@
+import Content from './content/index.vue'
+import Files from './files/index.vue'
+import Index from './layout.vue'
+import Logs from './logs/index.vue'
+import Share from './share/index.vue'
+import Worlds from './worlds/index.vue'
+
+export { Content, Files, Index, Logs, Share, Worlds }
diff --git a/apps/app-frontend/src/pages/instance/instance-context.ts b/apps/app-frontend/src/pages/instance/instance-context.ts
new file mode 100644
index 0000000000..19223b9664
--- /dev/null
+++ b/apps/app-frontend/src/pages/instance/instance-context.ts
@@ -0,0 +1,27 @@
+import type { Labrinth } from '@modrinth/api-client'
+import { createContext } from '@modrinth/ui'
+import type { ComputedRef, Ref } from 'vue'
+
+import type { GameInstance } from '@/helpers/types'
+
+export interface InstancePageContext {
+	readonly instanceId: ComputedRef<string>
+	readonly instance: ComputedRef<GameInstance>
+	readonly linkedProject: ComputedRef<Labrinth.Projects.v3.Project | undefined>
+	readonly isServerInstance: ComputedRef<boolean>
+	readonly offline: Readonly<Ref<boolean>>
+	readonly playing: ComputedRef<boolean>
+	readonly loading: Readonly<Ref<boolean>>
+	readonly stopping: Readonly<Ref<boolean>>
+	refreshInstance: () => Promise<void>
+	refreshPlayState: () => Promise<void>
+	play: (source: string) => Promise<void>
+	stop: (source: string) => Promise<void>
+	playServer: () => Promise<void>
+	openSettings: (tab?: number) => void
+	browseContent: (projectType?: string) => Promise<void>
+	browseServers: () => Promise<void>
+}
+
+export const [injectInstancePage, provideInstancePage] =
+	createContext<InstancePageContext>('InstancePage')
diff --git a/apps/app-frontend/src/pages/instance/Index.vue b/apps/app-frontend/src/pages/instance/layout.vue
similarity index 57%
rename from apps/app-frontend/src/pages/instance/Index.vue
rename to apps/app-frontend/src/pages/instance/layout.vue
index 6cc08714f1..c2dd0ede78 100644
--- a/apps/app-frontend/src/pages/instance/Index.vue
+++ b/apps/app-frontend/src/pages/instance/layout.vue
@@ -11,7 +11,7 @@
 				ref="settingsModal"
 				:instance="instance"
 				:offline="offline"
-				@unlinked="fetchInstance"
+				@unlinked="refreshInstance"
 			/>
 			<UpdateToPlayModal ref="updateToPlayModal" :instance="instance" />
 			<SharedInstanceUpdateModal
@@ -65,32 +65,20 @@
 				:shared-instance-role="instance.shared_instance?.role"
 				:shared-instance-signed-out="sharedInstanceSignedOut"
 				:shared-instance-update-available="showSharedInstanceUpdateAdmonition"
-				@published="fetchInstance"
+				@published="refreshInstance"
 				@delete="requestInstanceDeletion"
 				@review-update="reviewSharedInstanceUpdate"
 			/>
 		</div>
 		<div :class="['p-6 pt-4', { 'min-h-0 flex-1 overflow-y-auto': isFixedRender }]">
-			<RouterView v-slot="{ Component }" :key="instance.id" :route="displayedInstanceRoute">
+			<RouterView v-slot="{ Component }">
 				<template v-if="Component">
 					<Suspense
 						:key="instance.id"
 						@pending="subpagePending = true"
 						@resolve="subpagePending = false"
 					>
-						<component
-							:is="Component"
-							:instance="instance"
-							:options="options"
-							:offline="offline"
-							:playing="playing"
-							:installed="instance.install_stage !== 'installed'"
-							:is-server-instance="isServerInstance"
-							:open-settings="() => settingsModal?.show(1)"
-							v-bind="contentSubpageProps"
-							@play="updatePlayState"
-							@stop="() => stopInstance('InstanceSubpage')"
-						></component>
+						<component :is="Component" />
 					</Suspense>
 				</template>
 			</RouterView>
@@ -102,45 +90,24 @@
 			<template #edit> <EditIcon /> Edit </template>
 			<template #copy_path> <ClipboardCopyIcon /> Copy path </template>
 			<template #open_folder> <FolderOpenIcon /> Open folder </template>
-			<template #copy_link> <ClipboardCopyIcon /> Copy link </template>
-			<template #open_link> <GlobeIcon /> Open in Modrinth <ExternalIcon /> </template>
-			<template #copy_names><EditIcon />Copy names</template>
-			<template #copy_slugs><HashIcon />Copy slugs</template>
-			<template #copy_links><GlobeIcon />Copy links</template>
-			<template #toggle><EditIcon />Toggle selected</template>
-			<template #disable><XIcon />Disable selected</template>
-			<template #enable><CheckCircleIcon />Enable selected</template>
-			<template #hide_show><EyeIcon />Show/Hide unselected</template>
-			<template #update_all
-				><UpdatedIcon />Update {{ selected.length > 0 ? 'selected' : 'all' }}</template
-			>
-			<template #filter_update><UpdatedIcon />Select Updatable</template>
 		</ContextMenu>
 	</div>
 </template>
 <script setup lang="ts">
-import type { Labrinth } from '@modrinth/api-client'
 import {
 	BoxesIcon,
-	CheckCircleIcon,
 	ClipboardCopyIcon,
 	EditIcon,
-	ExternalIcon,
-	EyeIcon,
 	FolderOpenIcon,
 	GlobeIcon,
-	HashIcon,
 	PlayIcon,
 	PlusIcon,
 	StopCircleIcon,
 	TerminalSquareIcon,
-	UpdatedIcon,
 	UserPlusIcon,
-	XIcon,
 } from '@modrinth/assets'
 import {
 	commonMessages,
-	injectAuth,
 	injectNotificationManager,
 	NavTabs,
 	useLoadingBarToken,
@@ -148,17 +115,15 @@ import {
 } from '@modrinth/ui'
 import { useQuery, useQueryClient } from '@tanstack/vue-query'
 import { convertFileSrc } from '@tauri-apps/api/core'
+import { useOnline } from '@vueuse/core'
 import dayjs from 'dayjs'
 import relativeTime from 'dayjs/plugin/relativeTime'
-import { computed, onUnmounted, ref, shallowRef, watch } from 'vue'
-import { useRoute, useRouter } from 'vue-router'
+import { computed, type ComputedRef, onMounted, onUnmounted, ref, watch } from 'vue'
+import { onBeforeRouteUpdate, useRoute, useRouter } from 'vue-router'
 
 import ContextMenu from '@/components/ui/ContextMenu.vue'
 import ExportModal from '@/components/ui/ExportModal.vue'
-import InstanceAdmonitions from '@/components/ui/instance/instance-admonitions/index.vue'
-import InstancePageHeader from '@/components/ui/instance-page-header/index.vue'
 import ConfirmDeleteInstanceModal from '@/components/ui/modal/ConfirmDeleteInstanceModal.vue'
-import InstanceSettingsModal from '@/components/ui/modal/InstanceSettingsModal.vue'
 import UpdateToPlayModal from '@/components/ui/modal/UpdateToPlayModal.vue'
 import SharedInstanceInstallModal from '@/components/ui/shared-instances/shared-instance-install-modal/index.vue'
 import SharedInstanceUpdateModal from '@/components/ui/shared-instances/SharedInstanceUpdateModal.vue'
@@ -168,7 +133,6 @@ import {
 } from '@/composables/instances/use-server-status-query'
 import { useInstanceConsole } from '@/composables/useInstanceConsole'
 import { trackEvent } from '@/helpers/analytics'
-import { get_project_v3 } from '@/helpers/cache.js'
 import { instance_listener, process_listener } from '@/helpers/events'
 import {
 	getSharedInstanceUnavailableReason,
@@ -178,69 +142,126 @@ import {
 	isSharedInstanceUnavailableError,
 	type SharedInstanceUnavailableReason,
 } from '@/helpers/install'
-import {
-	can_current_user_use_shared_instances,
-	get,
-	get_full_path,
-	kill,
-	remove,
-	run,
-} from '@/helpers/instance'
-import { type InstanceContentData, loadInstanceContentData } from '@/helpers/instance-content'
-import { get_by_instance_id } from '@/helpers/process'
+import { get_full_path, kill, remove, run } from '@/helpers/instance'
 import { useSharedInstanceErrors } from '@/helpers/shared-instance-errors'
 import type { GameInstance } from '@/helpers/types'
 import { createInstanceShortcut, showInstanceInFolder } from '@/helpers/utils.js'
-import { refreshWorlds, type ServerStatus } from '@/helpers/worlds'
+import type { ServerStatus } from '@/helpers/worlds'
 import { useRootBreadcrumb } from '@/providers/breadcrumbs'
+import { provideInstanceBackup } from '@/providers/instance-backup'
 import { injectServerInstall } from '@/providers/server-install'
 import { handleSevereError } from '@/store/error.js'
 import { useTheming } from '@/store/state'
 
-import { provideSharedInstanceState, useSharedInstanceState } from './use-shared-instance-state'
+import InstanceAdmonitions from './components/admonitions/index.vue'
+import InstancePageHeader from './components/page-header/index.vue'
+import InstanceSettingsModal from './components/settings-modal/index.vue'
+import { provideInstancePage } from './instance-context'
+import {
+	instanceContentQueryOptions,
+	instanceDetailQueryOptions,
+	instanceKeys,
+	instanceLinkedProjectQueryOptions,
+	instanceProcessesQueryOptions,
+} from './query-options'
+import { createSharedInstanceContext, provideSharedInstance } from './shared-instance-context'
 
 dayjs.extend(relativeTime)
 
 const { addNotification, handleError } = injectNotificationManager()
 const { playServerProject } = injectServerInstall()
-const auth = injectAuth()
 const queryClient = useQueryClient()
 const route = useRoute()
 const { formatMessage } = useVIntl()
 
 const router = useRouter()
-const displayedInstanceRoute = shallowRef(router.currentRoute.value)
 const themeStore = useTheming()
 const showInstancePlayTime = computed(() => themeStore.getFeatureFlag('show_instance_play_time'))
-const contentSubpageRouteNames = new Set(['Mods', 'ModsFilter'])
 
-const offline = ref(!navigator.onLine)
-window.addEventListener('offline', () => {
-	offline.value = true
-})
-window.addEventListener('online', () => {
-	offline.value = false
-})
-
-const initialInstanceId = String(displayedInstanceRoute.value.params.id ?? '')
-const instance = ref<GameInstance | undefined>(
-	queryClient.getQueryData<GameInstance>(['instances', 'summary', initialInstanceId]),
+const online = useOnline()
+const offline = computed(() => !online.value)
+const instanceId = computed(() => String(route.params.id ?? ''))
+const instanceQuery = useQuery(
+	computed(() => ({
+		...instanceDetailQueryOptions(instanceId.value),
+		enabled: !!instanceId.value,
+	})),
 )
+useQuery(
+	computed(() => ({
+		...instanceContentQueryOptions(instanceId.value, (error) => handleError(error)),
+		enabled: !!instanceId.value,
+	})),
+)
+const instance = computed(() => instanceQuery.data.value)
+const linkedProjectId = computed(() => instance.value?.link?.project_id ?? '')
+const linkedProjectQuery = useQuery(
+	computed(() => ({
+		...instanceLinkedProjectQueryOptions(linkedProjectId.value),
+		enabled: !!linkedProjectId.value && !offline.value,
+	})),
+)
+const linkedProjectV3 = computed(() => linkedProjectQuery.data.value ?? undefined)
+const isServerInstance = computed(() => linkedProjectV3.value?.minecraft_server != null)
+const processesQuery = useQuery(
+	computed(() => ({
+		...instanceProcessesQueryOptions(instanceId.value),
+		enabled: !!instanceId.value,
+	})),
+)
+const playing = computed(() => (processesQuery.data.value?.length ?? 0) > 0)
+
+async function ensureCriticalContent(targetInstanceId: string) {
+	await queryClient.ensureQueryData(
+		instanceContentQueryOptions(targetInstanceId, (error) => handleError(error)),
+	)
+}
+
+async function ensureCriticalInstanceData(targetInstanceId: string) {
+	await Promise.all([
+		queryClient.ensureQueryData(instanceDetailQueryOptions(targetInstanceId)),
+		ensureCriticalContent(targetInstanceId),
+	])
+}
+
+function isUnmanagedInstanceError(error: unknown) {
+	return error instanceof Error && error.message.includes('is not managed')
+}
+
+try {
+	await ensureCriticalInstanceData(instanceId.value)
+} catch (error) {
+	if (isUnmanagedInstanceError(error)) await router.replace('/')
+	else handleError(error)
+}
+
+onBeforeRouteUpdate(async (to, from) => {
+	const targetInstanceId = String(to.params.id ?? '')
+	const currentInstanceId = String(from.params.id ?? '')
+	if (!targetInstanceId || targetInstanceId === currentInstanceId) return
+
+	try {
+		await ensureCriticalInstanceData(targetInstanceId)
+	} catch (error) {
+		if (isUnmanagedInstanceError(error)) return { path: '/' }
+		handleError(error)
+		return false
+	}
+})
+
 useRootBreadcrumb({
 	slot: 'instance',
-	id: () => `instance:${String(displayedInstanceRoute.value.params.id ?? '')}`,
+	id: () => `instance:${instanceId.value}`,
 	label: () => instance.value?.name ?? formatMessage(commonMessages.loadingLabel),
 	visual: () => ({
 		type: 'image',
 		src: instance.value?.icon_path ? convertFileSrc(instance.value.icon_path) : undefined,
 		alt: instance.value?.name,
-		tintBy: instance.value?.id ?? String(displayedInstanceRoute.value.params.id ?? ''),
+		tintBy: instance.value?.id ?? instanceId.value,
 	}),
-	to: () => `/instance/${encodeURIComponent(String(displayedInstanceRoute.value.params.id ?? ''))}`,
+	to: () => `/instance/${encodeURIComponent(instanceId.value)}`,
 })
 
-const preloadedContent = ref<InstanceContentData | null>(null)
-const playing = ref(false)
 const loading = ref(false)
 const checkingSharedInstanceLaunch = ref(false)
 const subpagePending = ref(false)
@@ -250,16 +271,15 @@ const updateToPlayModal = ref<InstanceType<typeof UpdateToPlayModal>>()
 const sharedInstanceUpdateModal = ref<InstanceType<typeof SharedInstanceUpdateModal>>()
 const sharedInstanceReportModal = ref<InstanceType<typeof SharedInstanceInstallModal>>()
 const deleteConfirmModal = ref<InstanceType<typeof ConfirmDeleteInstanceModal>>()
+const settingsModal = ref<InstanceType<typeof InstanceSettingsModal>>()
 const selectedInstanceToDelete = ref<GameInstance | null>(null)
 const hiddenSharedInstanceUpdateKey = ref<string | null>(null)
 
 const { notifySharedInstanceError, notifySharedInstanceUnavailable } = useSharedInstanceErrors()
 
 useLoadingBarToken(subpagePending)
+useLoadingBarToken(computed(() => instanceQuery.isPending.value && !instance.value))
 
-const isServerInstance = ref(false)
-const linkedProjectV3 = ref<Labrinth.Projects.v3.Project>()
-const selected = ref<unknown[]>([])
 const minecraftServer = computed(() => linkedProjectV3.value?.minecraft_server)
 const javaServerPingData = computed(() => linkedProjectV3.value?.minecraft_java_server?.ping?.data)
 const liveServerStatusOnline = ref(false)
@@ -270,9 +290,12 @@ const recentPlays = computed(
 const playersOnline = ref<number | undefined>(undefined)
 const ping = ref<number | undefined>(undefined)
 const loadingServerPing = ref(false)
-const activeInstanceId = ref<string>()
-const sharedInstanceState = useSharedInstanceState(instance, offline, notifySharedInstanceError)
-provideSharedInstanceState(sharedInstanceState)
+const sharedInstanceState = createSharedInstanceContext(
+	instance,
+	offline,
+	notifySharedInstanceError,
+)
+provideSharedInstance(sharedInstanceState)
 const {
 	actionsLocked: sharedInstanceActionsLocked,
 	expectedUserId: sharedInstanceExpectedUserId,
@@ -296,19 +319,6 @@ const showSharedInstanceUpdateAdmonition = computed(
 		sharedInstanceUpdateKey.value !== hiddenSharedInstanceUpdateKey.value,
 )
 
-watch(
-	() => router.currentRoute.value,
-	(nextRoute) => {
-		if (
-			nextRoute.path.startsWith('/instance') &&
-			(!instance.value || nextRoute.params.id === instance.value.id)
-		) {
-			displayedInstanceRoute.value = nextRoute
-		}
-	},
-	{ immediate: true },
-)
-
 function applyServerStatus(status: ServerStatus) {
 	playersOnline.value = status.players?.online
 	ping.value = status.ping
@@ -323,124 +333,66 @@ function resetServerStatus() {
 	loadingServerPing.value = false
 }
 
-function isContentSubpageRoute(routeName = displayedInstanceRoute.value.name) {
-	return typeof routeName === 'string' && contentSubpageRouteNames.has(routeName)
-}
-
-async function fetchInstance() {
-	const requestedInstanceId = route.params.id as string
-	const requestedRouteName = route.name
-
-	const nextInstance = await get(requestedInstanceId).catch(handleError)
-	let nextLinkedProjectV3: Labrinth.Projects.v3.Project | undefined
-	let nextIsServerInstance = false
-
-	const contentPreloadPromise =
-		nextInstance && isContentSubpageRoute(requestedRouteName)
-			? loadInstanceContentData(nextInstance.id, undefined, handleError)
-			: Promise.resolve(null)
-
-	if (!offline.value && nextInstance?.link && nextInstance.link.project_id) {
-		try {
-			nextLinkedProjectV3 = await get_project_v3(nextInstance.link.project_id, 'must_revalidate')
-
-			if (nextLinkedProjectV3?.minecraft_server != null) {
-				nextIsServerInstance = true
-			}
-		} catch (error) {
-			handleError(error as Error)
-		}
-	}
-
-	let nextPreloadedContent = await contentPreloadPromise
-	let nextRoute = router.currentRoute.value
-	if (nextRoute.params.id !== requestedInstanceId) return
-
-	if (nextInstance && isContentSubpageRoute(nextRoute.name) && !nextPreloadedContent) {
-		nextPreloadedContent = await loadInstanceContentData(nextInstance.id, undefined, handleError)
-		nextRoute = router.currentRoute.value
-		if (nextRoute.params.id !== requestedInstanceId) return
-	}
-
-	instance.value = nextInstance ?? undefined
-	if (nextInstance) {
-		queryClient.setQueryData(['instances', 'summary', nextInstance.id], nextInstance)
-	}
-	displayedInstanceRoute.value = nextRoute
-	sharedInstanceState.reset()
-	sharedInstanceState.refreshAvailability()
-	linkedProjectV3.value = nextLinkedProjectV3
-	isServerInstance.value = nextIsServerInstance
-	preloadedContent.value = nextPreloadedContent
-	activeInstanceId.value = nextInstance?.id
-	resetServerStatus()
-
-	fetchDeferredData(nextInstance?.id)
-
-	if (nextInstance) {
-		queryClient.prefetchQuery({
-			queryKey: ['worlds', nextInstance.id],
-			queryFn: () => refreshWorlds(nextInstance.id),
-			staleTime: 30_000,
-		})
-	}
-}
-
-function fetchDeferredData(instanceId?: string) {
-	const serverAddress = linkedProjectV3.value?.minecraft_java_server?.address
-	if (isServerInstance.value && serverAddress) {
-		const cachedStatus = getFreshCachedServerStatus(queryClient, serverAddress)
-		if (cachedStatus) {
-			applyServerStatus(cachedStatus)
-		} else {
-			playersOnline.value = undefined
-			ping.value = undefined
-			loadingServerPing.value = false
-		}
-
-		fetchCachedServerStatus(queryClient, serverAddress)
-			.then((status) => {
-				if (
-					activeInstanceId.value !== instanceId ||
-					linkedProjectV3.value?.minecraft_java_server?.address !== serverAddress
-				)
-					return
-				applyServerStatus(status)
-			})
-			.catch((error) => {
-				console.error(`Failed to fetch server status for ${serverAddress}:`, error)
-			})
-			.finally(() => {
-				if (activeInstanceId.value !== instanceId) return
-				loadingServerPing.value = true
-			})
-	} else {
-		loadingServerPing.value = true
-	}
-
-	updatePlayState()
-}
-
-async function updatePlayState() {
-	if (!route.params.id) return
-	const runningProcesses = await get_by_instance_id(route.params.id as string).catch(handleError)
-
-	playing.value = Array.isArray(runningProcesses) && runningProcesses.length > 0
-}
-
-await fetchInstance()
+const serverAddress = computed(() => linkedProjectV3.value?.minecraft_java_server?.address)
 watch(
-	() => route.params.id,
-	async () => {
-		if (route.params.id && route.path.startsWith('/instance')) {
-			await fetchInstance()
+	[instanceId, serverAddress, isServerInstance],
+	([requestedInstanceId, address, serverInstance]) => {
+		resetServerStatus()
+		if (serverInstance && address) {
+			const cachedStatus = getFreshCachedServerStatus(queryClient, address)
+			if (cachedStatus) {
+				applyServerStatus(cachedStatus)
+			} else {
+				playersOnline.value = undefined
+				ping.value = undefined
+				loadingServerPing.value = false
+			}
+
+			fetchCachedServerStatus(queryClient, address)
+				.then((status) => {
+					if (instanceId.value !== requestedInstanceId || serverAddress.value !== address) return
+					applyServerStatus(status)
+				})
+				.catch((error) => {
+					console.error(`Failed to fetch server status for ${address}:`, error)
+				})
+				.finally(() => {
+					if (instanceId.value !== requestedInstanceId) return
+					loadingServerPing.value = true
+				})
+		} else {
+			loadingServerPing.value = true
 		}
 	},
+	{ immediate: true },
 )
 
-const basePath = computed(
-	() => `/instance/${encodeURIComponent(displayedInstanceRoute.value.params.id as string)}`,
+async function refreshInstance() {
+	await Promise.all([instanceQuery.refetch(), sharedInstanceState.refreshAvailability()])
+}
+
+async function refreshPlayState() {
+	await processesQuery.refetch()
+}
+
+watch(
+	instanceQuery.error,
+	(error) => {
+		if (!error) return
+		if (error.message.includes('is not managed')) void router.replace('/')
+		else handleError(error)
+	},
+	{ immediate: true },
 )
+watch(
+	linkedProjectQuery.error,
+	(error) => {
+		if (error) handleError(error)
+	},
+	{ immediate: true },
+)
+
+const basePath = computed(() => `/instance/${encodeURIComponent(instanceId.value)}`)
 
 /**
  * Per-route layout mode.
@@ -451,25 +403,10 @@ const basePath = computed(
  *   Used by tabs whose content (e.g. the log console) needs a bounded height to resolve `h-full`.
  */
 const renderMode = computed<'scroll' | 'fixed'>(() =>
-	displayedInstanceRoute.value.meta.renderMode === 'fixed' ? 'fixed' : 'scroll',
+	route.meta.renderMode === 'fixed' ? 'fixed' : 'scroll',
 )
 const isFixedRender = computed(() => renderMode.value === 'fixed')
-const contentSubpageProps = computed(() =>
-	isContentSubpageRoute() ? { preloadedContent: preloadedContent.value } : {},
-)
-const { data: canCurrentUserUseSharedInstances } = useQuery({
-	queryKey: computed(() => ['shared-instance-eligibility', auth.user.value?.id]),
-	queryFn: can_current_user_use_shared_instances,
-	enabled: () => !!auth.session_token.value && !!auth.user.value?.id,
-	retry: false,
-	staleTime: Infinity,
-	refetchOnMount: 'always',
-	refetchOnWindowFocus: false,
-	refetchOnReconnect: false,
-})
-const currentUserCanUseSharedInstances = computed(
-	() => !auth.session_token.value || canCurrentUserUseSharedInstances.value !== false,
-)
+const currentUserCanUseSharedInstances = sharedInstanceState.currentUserCanUseSharedInstances
 const showShareTab = computed(() => {
 	const linkType = instance.value?.link?.type
 
@@ -534,12 +471,13 @@ const options = ref<InstanceType<typeof ContextMenu> | null>(null)
 
 const launchInstance = async (context: string) => {
 	if (!instance.value || instance.value.quarantined) return
+	const currentInstance = instance.value
 	loading.value = true
 	try {
-		await run(route.params.id as string)
-		playing.value = true
+		await run(currentInstance.id)
+		queryClient.setQueryData(instanceKeys.processes(currentInstance.id), [true])
 	} catch (err) {
-		handleSevereError(err, { instanceId: route.params.id as string })
+		handleSevereError(err, { instanceId: currentInstance.id })
 	}
 	loading.value = false
 
@@ -555,7 +493,7 @@ async function handleSharedInstanceUnavailable(
 	reason: SharedInstanceUnavailableReason | null = null,
 ) {
 	notifySharedInstanceUnavailable(reason, sharedInstanceUnavailableManager.value)
-	await fetchInstance()
+	await refreshInstance()
 	setSharedInstanceUnavailable(reason)
 }
 
@@ -574,7 +512,7 @@ function reviewSharedInstanceUpdate(event: MouseEvent) {
 		currentInstance,
 		preview,
 		async () => {
-			await fetchInstance()
+			await refreshInstance()
 		},
 		event,
 	)
@@ -618,7 +556,7 @@ const startInstance = async (context: string) => {
 
 		if (preview?.updateAvailable && sharedInstanceUpdateModal.value) {
 			sharedInstanceUpdateModal.value.show(instance.value, preview, async () => {
-				await fetchInstance()
+				await refreshInstance()
 				await launchInstance(context)
 			})
 			return
@@ -628,7 +566,7 @@ const startInstance = async (context: string) => {
 	if (updateToPlayModal.value?.hasUpdate) {
 		if (isSharedInstanceMember) {
 			updateToPlayModal.value.show(instance.value, null, async () => {
-				await fetchInstance()
+				await refreshInstance()
 				await launchInstance(context)
 			})
 		} else {
@@ -641,15 +579,16 @@ const startInstance = async (context: string) => {
 }
 
 const stopInstance = async (context: string) => {
+	const currentInstance = instance.value
+	if (!currentInstance) return
 	stopping.value = true
-	await kill(route.params.id as string).catch(handleError)
+	await kill(currentInstance.id).catch(handleError)
 	stopping.value = false
-	playing.value = false
+	queryClient.setQueryData(instanceKeys.processes(currentInstance.id), [])
 
-	if (!instance.value) return
 	trackEvent('InstanceStop', {
-		loader: instance.value.loader,
-		game_version: instance.value.game_version,
+		loader: currentInstance.loader,
+		game_version: currentInstance.game_version,
 		source: context,
 	})
 }
@@ -660,26 +599,48 @@ const handlePlayServer = async () => {
 	try {
 		await playServerProject(instance.value.link.project_id)
 	} finally {
-		await updatePlayState()
+		await refreshPlayState()
 		loading.value = false
 	}
 }
 
+function openSettings(tab?: number) {
+	settingsModal.value?.show(tab)
+}
+
+async function browseContent(projectType?: string) {
+	const currentInstance = instance.value
+	if (!currentInstance || currentInstance.quarantined) return
+	await router.push({
+		path: `/browse/${projectType ?? (currentInstance.loader === 'vanilla' ? 'resourcepack' : 'mod')}`,
+		query: { i: currentInstance.id },
+	})
+}
+
+async function browseServers() {
+	if (!instance.value || instance.value.quarantined) return
+	await router.push({
+		path: '/browse/server',
+		query: { i: instance.value.id, from: 'worlds' },
+	})
+}
+
 const repairInstance = async () => {
-	if (instance.value.quarantined) return
+	const currentInstance = instance.value
+	if (!currentInstance || currentInstance.quarantined) return
 	if (
-		instance.value.install_stage !== 'pack_installed' &&
-		(instance.value.link?.type === 'modrinth_modpack' ||
-			instance.value.link?.type === 'server_project_modpack')
+		currentInstance.install_stage !== 'pack_installed' &&
+		(currentInstance.link?.type === 'modrinth_modpack' ||
+			currentInstance.link?.type === 'server_project_modpack')
 	) {
-		await install_pack_to_existing_instance(instance.value.id, {
+		await install_pack_to_existing_instance(currentInstance.id, {
 			type: 'fromVersionId',
-			project_id: instance.value.link.project_id ?? instance.value.link.server_project_id ?? '',
-			version_id: instance.value.link.version_id ?? instance.value.link.content_version_id ?? '',
-			title: instance.value.name,
+			project_id: currentInstance.link.project_id ?? currentInstance.link.server_project_id ?? '',
+			version_id: currentInstance.link.version_id ?? currentInstance.link.content_version_id ?? '',
+			title: currentInstance.name,
 		}).catch(handleError)
 	} else {
-		await install_existing_instance(instance.value.id, false).catch(handleError)
+		await install_existing_instance(currentInstance.id, false).catch(handleError)
 	}
 }
 
@@ -786,15 +747,10 @@ const handleOptionsClick = async (args: { option: string; item: unknown }) => {
 			await stopInstance('InstancePageContextMenu')
 			break
 		case 'add_content':
-			await router.push({
-				path: `/browse/${instance.value?.loader === 'vanilla' ? 'datapack' : 'mod'}`,
-				query: { i: route.params.id },
-			})
+			await browseContent(instance.value?.loader === 'vanilla' ? 'datapack' : 'mod')
 			break
 		case 'edit':
-			await router.push({
-				path: `/instance/${encodeURIComponent(route.params.id as string)}/options`,
-			})
+			openSettings()
 			break
 		case 'open_folder':
 			if (instance.value) await showInstanceInFolder(instance.value.id)
@@ -809,41 +765,79 @@ const handleOptionsClick = async (args: { option: string; item: unknown }) => {
 	}
 }
 
-const unlistenInstances = await instance_listener(
-	async (event: { instance_id: string; event: string }) => {
-		if (event.instance_id !== route.params.id) return
+let unlistenInstances: (() => void) | null = null
+let unlistenProcesses: (() => void) | null = null
+let instancePageAlive = true
+
+provideInstancePage({
+	instanceId,
+	instance: instance as ComputedRef<GameInstance>,
+	linkedProject: linkedProjectV3,
+	isServerInstance,
+	offline,
+	playing,
+	loading,
+	stopping,
+	refreshInstance,
+	refreshPlayState,
+	play: startInstance,
+	stop: stopInstance,
+	playServer: handlePlayServer,
+	openSettings,
+	browseContent,
+	browseServers,
+})
+provideInstanceBackup(() => instance.value!)
+
+function destroyInstanceConsole(targetInstanceId: string) {
+	void useInstanceConsole(targetInstanceId).destroy()
+	queryClient.removeQueries({ queryKey: instanceKeys.console(targetInstanceId), exact: true })
+}
+
+watch(instanceId, (currentInstanceId, previousInstanceId) => {
+	if (!previousInstanceId || previousInstanceId === currentInstanceId) return
+	destroyInstanceConsole(previousInstanceId)
+})
+
+onMounted(() => {
+	void instance_listener(async (event: { instance_id: string; event: string }) => {
+		if (event.instance_id !== instanceId.value) return
 		if (event.event === 'removed' || route.path === '/') {
-			if (route.path !== '/') {
-				await router.push({ path: '/' })
-			}
+			if (route.path !== '/') await router.push({ path: '/' })
 			return
 		}
-		instance.value = await get(route.params.id as string).catch((err) => {
-			if (String(err).includes('not managed')) {
-				router.push({ path: '/' })
-				return undefined
-			}
-			return handleError(err)
+		await queryClient.invalidateQueries({
+			queryKey: instanceKeys.detail(event.instance_id),
+			exact: true,
 		})
-		if (!instance.value?.link?.project_id) {
-			linkedProjectV3.value = undefined
-			isServerInstance.value = false
-		}
-	},
-)
+	})
+		.then((unlisten) => {
+			if (instancePageAlive) unlistenInstances = unlisten
+			else unlisten()
+		})
+		.catch(handleError)
 
-const unlistenProcesses = await process_listener((e: { event: string; instance_id: string }) => {
-	if (e.event === 'finished' && e.instance_id === route.params.id) {
-		playing.value = false
-	}
+	void process_listener((event: { event: string; instance_id: string }) => {
+		if (event.instance_id !== instanceId.value) return
+		if (event.event === 'finished') {
+			queryClient.setQueryData(instanceKeys.processes(event.instance_id), [])
+			useInstanceConsole(event.instance_id).invalidate()
+			void queryClient.invalidateQueries({ queryKey: instanceKeys.logs(event.instance_id) })
+		} else if (event.event === 'launched') {
+			queryClient.setQueryData(instanceKeys.processes(event.instance_id), [true])
+		}
+	})
+		.then((unlisten) => {
+			if (instancePageAlive) unlistenProcesses = unlisten
+			else unlisten()
+		})
+		.catch(handleError)
 })
 
 const icon = computed(() =>
 	instance.value?.icon_path ? convertFileSrc(instance.value.icon_path) : null,
 )
 
-const settingsModal = ref<InstanceType<typeof InstanceSettingsModal>>()
-
 const timePlayed = computed(() => {
 	return instance.value
 		? instance.value.recent_time_played + instance.value.submitted_time_played
@@ -851,210 +845,11 @@ const timePlayed = computed(() => {
 })
 
 onUnmounted(() => {
-	unlistenProcesses()
-	unlistenInstances()
-	const instanceId = displayedInstanceRoute.value.params.id
-	if (instanceId) {
-		const { destroy } = useInstanceConsole(instanceId)
-		destroy()
+	instancePageAlive = false
+	unlistenProcesses?.()
+	unlistenInstances?.()
+	if (instanceId.value) {
+		destroyInstanceConsole(instanceId.value)
 	}
 })
 </script>
-
-<style scoped lang="scss">
-.instance-card {
-	display: flex;
-	flex-direction: column;
-	gap: 1rem;
-}
-
-Button {
-	width: 100%;
-}
-
-.button-group {
-	display: flex;
-	flex-direction: row;
-	gap: 0.5rem;
-}
-
-.side-cards {
-	position: fixed;
-	width: 300px;
-	display: flex;
-	flex-direction: column;
-
-	min-height: calc(100vh - 3.25rem);
-	max-height: calc(100vh - 3.25rem);
-	overflow-y: auto;
-	-ms-overflow-style: none;
-	scrollbar-width: none;
-
-	&::-webkit-scrollbar {
-		width: 0;
-		background: transparent;
-	}
-
-	.card {
-		min-height: unset;
-		margin-bottom: 0;
-	}
-}
-
-.instance-nav {
-	display: flex;
-	flex-direction: column;
-	align-items: flex-start;
-	justify-content: center;
-	padding: 1rem;
-	gap: 0.5rem;
-	background: var(--color-raised-bg);
-	height: 100%;
-}
-
-.name {
-	font-size: 1.25rem;
-	color: var(--color-contrast);
-	overflow: hidden;
-	text-overflow: ellipsis;
-}
-
-.metadata {
-	text-transform: capitalize;
-}
-
-.instance-container {
-	display: flex;
-	flex-direction: row;
-	overflow: auto;
-	gap: 1rem;
-	min-height: 100%;
-	padding: 1rem;
-}
-
-.instance-info {
-	display: flex;
-	flex-direction: column;
-	width: 100%;
-}
-
-.badge {
-	display: flex;
-	align-items: center;
-	font-weight: bold;
-	width: fit-content;
-	color: var(--color-orange);
-}
-
-.pages-list {
-	display: flex;
-	flex-direction: column;
-	gap: var(--gap-xs);
-
-	.btn {
-		font-size: 100%;
-		font-weight: 400;
-		background: inherit;
-		transition: all ease-in-out 0.1s;
-		width: 100%;
-		color: var(--color-primary);
-		box-shadow: none;
-
-		&.router-link-exact-active {
-			box-shadow: var(--shadow-inset-lg);
-			background: var(--color-button-bg);
-			color: var(--color-contrast);
-		}
-
-		&:hover {
-			background-color: var(--color-button-bg);
-			color: var(--color-contrast);
-			box-shadow: var(--shadow-inset-lg);
-			text-decoration: none;
-		}
-
-		svg {
-			width: 1.3rem;
-			height: 1.3rem;
-		}
-	}
-}
-
-.instance-nav {
-	display: flex;
-	flex-direction: row;
-	align-items: flex-start;
-	justify-content: left;
-	padding: 1rem;
-	gap: 0.5rem;
-	height: min-content;
-	width: 100%;
-}
-
-.instance-button {
-	width: fit-content;
-}
-
-.actions {
-	display: flex;
-	flex-direction: column;
-	justify-content: flex-start;
-	gap: 0.5rem;
-}
-
-.content {
-	margin: 0 1rem 0.5rem 20rem;
-	width: calc(100% - 20rem);
-	display: flex;
-	flex-direction: column;
-	overflow: auto;
-}
-
-.stats {
-	grid-area: stats;
-	display: flex;
-	flex-direction: column;
-	flex-wrap: wrap;
-	gap: var(--gap-md);
-
-	.stat {
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		width: fit-content;
-		gap: var(--gap-xs);
-		--stat-strong-size: 1.25rem;
-
-		strong {
-			font-size: var(--stat-strong-size);
-		}
-
-		p {
-			margin: 0;
-		}
-
-		svg {
-			height: var(--stat-strong-size);
-			width: var(--stat-strong-size);
-		}
-	}
-
-	.date {
-		margin-top: auto;
-	}
-
-	@media screen and (max-width: 750px) {
-		flex-direction: row;
-		column-gap: var(--gap-md);
-		margin-top: var(--gap-xs);
-	}
-
-	@media screen and (max-width: 600px) {
-		margin-top: 0;
-
-		.stat-label {
-			display: none;
-		}
-	}
-}
-</style>
diff --git a/apps/app-frontend/src/pages/instance/Logs.vue b/apps/app-frontend/src/pages/instance/logs/index.vue
similarity index 73%
rename from apps/app-frontend/src/pages/instance/Logs.vue
rename to apps/app-frontend/src/pages/instance/logs/index.vue
index 6a08117dd7..fd8add17f7 100644
--- a/apps/app-frontend/src/pages/instance/Logs.vue
+++ b/apps/app-frontend/src/pages/instance/logs/index.vue
@@ -11,51 +11,20 @@ import {
 	injectNotificationManager,
 	provideConsoleManager,
 } from '@modrinth/ui'
+import { useQuery } from '@tanstack/vue-query'
 import { computed, onUnmounted, ref, shallowRef, triggerRef, watch, watchEffect } from 'vue'
-import { useRoute } from 'vue-router'
 
 import { useInstanceConsole } from '@/composables/useInstanceConsole'
 import { log_listener, process_listener } from '@/helpers/events.js'
 import { delete_logs_by_filename, get_output_by_filename } from '@/helpers/logs.js'
 
+import { injectInstancePage } from '../instance-context'
+import { instanceKeys } from '../query-options'
+
 const client = injectModrinthClient()
 const { handleError } = injectNotificationManager()
-const route = useRoute()
-
-const props = defineProps({
-	instance: {
-		type: Object,
-		default() {
-			return {}
-		},
-	},
-	options: {
-		type: Object,
-		default() {
-			return {}
-		},
-	},
-	offline: {
-		type: Boolean,
-		default() {
-			return false
-		},
-	},
-	playing: {
-		type: Boolean,
-		default() {
-			return false
-		},
-	},
-	installed: {
-		type: Boolean,
-		default() {
-			return false
-		},
-	},
-})
-
-const instanceId = computed(() => route.params.id)
+const instancePage = injectInstancePage()
+const instanceId = instancePage.instanceId
 const {
 	liveConsole,
 	historicalConsole,
@@ -66,7 +35,17 @@ const {
 	clearLive,
 } = useInstanceConsole(instanceId.value)
 
-await hydrate()
+const consoleHydrationQuery = useQuery({
+	queryKey: computed(() => instanceKeys.console(instanceId.value)),
+	queryFn: async () => {
+		await hydrate()
+		return true
+	},
+	staleTime: 0,
+	refetchOnMount: 'always',
+})
+
+await consoleHydrationQuery.suspense()
 
 function buildLogList(rawLogs) {
 	return [
@@ -88,18 +67,29 @@ function buildLogList(rawLogs) {
 }
 
 const logs = ref(buildLogList([]))
-
-void getHistoricalLogs()
-	.then((allLogs) => {
-		logs.value = buildLogList(allLogs)
-	})
-	.catch(handleError)
+const historicalLogsQuery = useQuery({
+	queryKey: computed(() => instanceKeys.logs(instanceId.value)),
+	queryFn: getHistoricalLogs,
+	staleTime: 0,
+})
+watch(
+	historicalLogsQuery.data,
+	(allLogs) => {
+		if (allLogs) logs.value = buildLogList(allLogs)
+	},
+	{ immediate: true },
+)
+watch(historicalLogsQuery.error, (error) => {
+	if (error) handleError(error)
+})
 
 const selectedLogIndex = ref(0)
 const isLive = computed(() => selectedLogIndex.value === 0)
 
 const filteredLogs = computed(() =>
-	props.playing ? logs.value.filter((l) => l.live || l.name !== 'latest.log') : logs.value,
+	instancePage.playing.value
+		? logs.value.filter((l) => l.live || l.name !== 'latest.log')
+		: logs.value,
 )
 
 const logSources = computed(() =>
@@ -140,16 +130,16 @@ const selectedLog = computed(() => filteredLogs.value[selectedLogIndex.value])
 const deleteDisabled = computed(() => {
 	const log = selectedLog.value
 	if (!log || log.live) return true
-	return log.filename === 'latest.log' && props.playing
+	return log.filename === 'latest.log' && instancePage.playing.value
 })
 
 async function deleteSelectedLog() {
 	const log = selectedLog.value
 	if (!log || log.live) return
-	await delete_logs_by_filename(props.instance.id, log.log_type, log.filename)
+	await delete_logs_by_filename(instanceId.value, log.log_type, log.filename)
 	invalidate()
-	const freshLogs = await getHistoricalLogs()
-	logs.value = buildLogList(freshLogs)
+	const { data } = await historicalLogsQuery.refetch()
+	if (data) logs.value = buildLogList(data)
 	selectedLogIndex.value = 0
 }
 
@@ -166,7 +156,7 @@ provideConsoleManager({
 	onDelete: deleteSelectedLog,
 	deleteDisabled,
 	deleteDisabledTooltip: 'Cannot delete latest.log while the instance is running',
-	shareDisabled: computed(() => props.offline),
+	shareDisabled: instancePage.offline,
 	emptyStateType: 'instance',
 	crashAnalysis,
 	onDismissCrash: () => {
@@ -186,7 +176,7 @@ watch(selectedLogIndex, async (newIndex) => {
 		return
 	}
 
-	const output = await get_output_by_filename(props.instance.id, log.log_type, log.filename).catch(
+	const output = await get_output_by_filename(instanceId.value, log.log_type, log.filename).catch(
 		handleError,
 	)
 	if (output) {
@@ -197,7 +187,7 @@ watch(selectedLogIndex, async (newIndex) => {
 
 selectedLogIndex.value = 0
 
-if (!props.playing) {
+if (!instancePage.playing.value) {
 	void analyseForCrash()
 }
 
@@ -216,12 +206,13 @@ const unlistenProcesses = await process_listener(async (e) => {
 	if (e.event === 'launched') {
 		liveConsole.clear()
 		invalidate()
+		void historicalLogsQuery.refetch()
 		selectedLogIndex.value = 0
 	}
 	if (e.event === 'finished') {
 		invalidate()
-		const freshLogs = await getHistoricalLogs()
-		logs.value = buildLogList(freshLogs)
+		const { data } = await historicalLogsQuery.refetch()
+		if (data) logs.value = buildLogList(data)
 		void analyseForCrash()
 	}
 })
diff --git a/apps/app-frontend/src/pages/instance/query-options.ts b/apps/app-frontend/src/pages/instance/query-options.ts
new file mode 100644
index 0000000000..93f4ee81c8
--- /dev/null
+++ b/apps/app-frontend/src/pages/instance/query-options.ts
@@ -0,0 +1,79 @@
+import { queryOptions } from '@tanstack/vue-query'
+
+import { get_project_v3 } from '@/helpers/cache.js'
+import { get as getInstance } from '@/helpers/instance'
+import { loadInstanceContentData } from '@/helpers/instance-content'
+import { get_by_instance_id } from '@/helpers/process'
+import { refreshWorlds } from '@/helpers/worlds'
+
+export const instanceKeys = {
+	all: ['instances'] as const,
+	detail: (instanceId: string) => [...instanceKeys.all, 'summary', instanceId] as const,
+	processes: (instanceId: string) => [...instanceKeys.all, 'processes', instanceId] as const,
+	content: (instanceId: string) => [...instanceKeys.all, 'content', instanceId] as const,
+	rootPath: (instanceId: string) => [...instanceKeys.detail(instanceId), 'root-path'] as const,
+	files: (instanceId: string, path: string) =>
+		[...instanceKeys.detail(instanceId), 'files', path] as const,
+	console: (instanceId: string) => [...instanceKeys.detail(instanceId), 'console'] as const,
+	logs: (instanceId: string) => [...instanceKeys.detail(instanceId), 'logs'] as const,
+	installedProjectIds: (instanceId: string, source: 'content' | 'worlds') =>
+		[...instanceKeys.detail(instanceId), 'installed-project-ids', source] as const,
+	linkedContent: (instanceId: string) => ['linkedModpackContent', instanceId] as const,
+	worlds: (instanceId: string) => ['worlds', instanceId] as const,
+	linkedProject: (projectId: string) => ['project', 'v3', projectId] as const,
+	sharedEligibility: (userId: string | null | undefined) =>
+		['shared-instance-eligibility', userId] as const,
+	sharedUpdatePreview: (instanceId: string, userId: string | null | undefined) =>
+		[...instanceKeys.detail(instanceId), 'shared-update-preview', userId] as const,
+	sharedMembers: (instanceId: string) => ['sharedInstanceUsers', instanceId] as const,
+}
+
+export function instanceDetailQueryOptions(instanceId: string) {
+	return queryOptions({
+		queryKey: instanceKeys.detail(instanceId),
+		queryFn: async () => {
+			const instance = await getInstance(instanceId)
+			if (!instance) throw new Error(`Instance ${instanceId} is not managed`)
+			return instance
+		},
+		staleTime: 30_000,
+	})
+}
+
+export function instanceProcessesQueryOptions(instanceId: string) {
+	return queryOptions({
+		queryKey: instanceKeys.processes(instanceId),
+		queryFn: async () => {
+			const processes = await get_by_instance_id(instanceId)
+			return Array.isArray(processes) ? processes : []
+		},
+		staleTime: 0,
+	})
+}
+
+export function instanceLinkedProjectQueryOptions(projectId: string) {
+	return queryOptions({
+		queryKey: instanceKeys.linkedProject(projectId),
+		queryFn: () => get_project_v3(projectId, 'must_revalidate'),
+		staleTime: 30_000,
+	})
+}
+
+export function instanceContentQueryOptions(
+	instanceId: string,
+	onError?: (error: Error) => unknown,
+) {
+	return queryOptions({
+		queryKey: instanceKeys.content(instanceId),
+		queryFn: () => loadInstanceContentData(instanceId, undefined, onError),
+		staleTime: 30_000,
+	})
+}
+
+export function instanceWorldsQueryOptions(instanceId: string) {
+	return queryOptions({
+		queryKey: instanceKeys.worlds(instanceId),
+		queryFn: () => refreshWorlds(instanceId),
+		staleTime: 0,
+	})
+}
diff --git a/apps/app-frontend/src/pages/instance/share/index.vue b/apps/app-frontend/src/pages/instance/share/index.vue
index b6addbe3bf..1c09022319 100644
--- a/apps/app-frontend/src/pages/instance/share/index.vue
+++ b/apps/app-frontend/src/pages/instance/share/index.vue
@@ -55,20 +55,7 @@
 
 		<div v-else-if="membersTableLoading" class="h-64" aria-hidden="true" />
 
-		<SharedInstanceMembersTable
-			v-else-if="showMembersTable"
-			:rows="members.rows.value"
-			:actions-locked="sharedInstanceActionsLocked"
-			:invite-disabled="!hasRemainingUserSlots"
-			:invite-pending="inviteLink.pending.value"
-			:push-update-disabled="
-				instance.install_stage !== 'installed' || publishState !== 'idle' || !!offline
-			"
-			:push-update-pending="publishState !== 'idle'"
-			@invite="showInvitePlayers"
-			@remove="showRemoveMemberModal"
-			@push-update="reviewUpdate"
-		/>
+		<SharedInstanceMembersTable v-else-if="showMembersTable" />
 
 		<SharedInstanceShareEmptyState
 			v-else-if="sharedInstanceUnavailable"
@@ -156,8 +143,8 @@ import {
 	type InvitePlayersUser,
 	useVIntl,
 } from '@modrinth/ui'
-import { useQuery, useQueryClient } from '@tanstack/vue-query'
-import { computed, ref, toRef, watch } from 'vue'
+import { useQueryClient } from '@tanstack/vue-query'
+import { computed, ref, watch } from 'vue'
 
 import ModrinthAccountRequiredModal from '@/components/ui/modal/ModrinthAccountRequiredModal.vue'
 import SharedInstancePublishModal from '@/components/ui/shared-instances/SharedInstancePublishModal.vue'
@@ -166,16 +153,16 @@ import {
 	isSharedInstancesApiError,
 	isSharedInstanceUnavailableError,
 } from '@/helpers/install'
-import { can_current_user_use_shared_instances, edit } from '@/helpers/instance'
+import { edit } from '@/helpers/instance'
 import type { ModrinthAuthFlow } from '@/helpers/mr_auth.ts'
 import {
 	sharedInstanceErrorMessages,
 	useSharedInstanceErrors,
 } from '@/helpers/shared-instance-errors'
-import type { GameInstance } from '@/helpers/types'
-import { provideInstanceBackup } from '@/providers/instance-backup'
 
-import { injectSharedInstanceState } from '../use-shared-instance-state'
+import { injectInstancePage } from '../instance-context'
+import { injectSharedInstance } from '../shared-instance-context'
+import { provideSharedInstanceManagement } from './shared-instance-management-context'
 import SharedInstanceMembersTable from './shared-instance-members-table.vue'
 import SharedInstanceRemoveMemberModal from './shared-instance-remove-member-modal.vue'
 import SharedInstanceShareEmptyState from './shared-instance-share-empty-state.vue'
@@ -184,10 +171,7 @@ import { useSharedInstanceInviteCandidates } from './use-shared-instance-invite-
 import { useSharedInstanceInviteLink } from './use-shared-instance-invite-link'
 import { useSharedInstanceMembers } from './use-shared-instance-members'
 
-const props = defineProps<{
-	instance: GameInstance
-	offline?: boolean
-}>()
+const instancePage = injectInstancePage()
 const auth = injectAuth()
 const queryClient = useQueryClient()
 const { formatMessage } = useVIntl()
@@ -196,8 +180,9 @@ const {
 	notifySharedInstanceError,
 	notifySharedInstanceUnavailable,
 } = useSharedInstanceErrors()
-const sharedInstanceState = injectSharedInstanceState()
-const instance = toRef(props, 'instance')
+const sharedInstanceState = injectSharedInstance()
+const instance = computed(() => instancePage.instance.value!)
+const offline = instancePage.offline
 const actionsLocked = sharedInstanceState.shareActionsLocked
 const sharedInstanceActionsLocked = actionsLocked
 const currentUserId = computed(() => auth.user.value?.id ?? null)
@@ -224,16 +209,7 @@ function notifyOperationError(error: unknown) {
 	}
 }
 
-const eligibilityQuery = useQuery({
-	queryKey: computed(() => ['shared-instance-eligibility', currentUserId.value]),
-	queryFn: can_current_user_use_shared_instances,
-	enabled: () => isSignedIn.value && !!currentUserId.value,
-	retry: false,
-	staleTime: Infinity,
-	refetchOnMount: 'always',
-	refetchOnWindowFocus: false,
-	refetchOnReconnect: false,
-})
+const eligibilityQuery = sharedInstanceState.eligibilityQuery
 
 const members = useSharedInstanceMembers({
 	instance,
@@ -257,7 +233,7 @@ const {
 	actionsLocked,
 })
 const inviteLink = useSharedInstanceInviteLink(
-	computed(() => props.instance.id),
+	computed(() => instance.value.id),
 	remainingUserSlots,
 	notifyOperationError,
 )
@@ -286,7 +262,7 @@ const unableToConnect = computed(
 const membersTableLoading = computed(
 	() =>
 		members.rows.value.length === 0 &&
-		!!props.instance.shared_instance &&
+		!!instance.value.shared_instance &&
 		(members.query.data.value === undefined || members.query.isFetching.value) &&
 		!sharedInstanceUnavailable.value &&
 		!sharedInstanceActionsLocked.value,
@@ -294,7 +270,7 @@ const membersTableLoading = computed(
 const showMembersTable = computed(
 	() =>
 		members.rows.value.length > 0 ||
-		(!!props.instance.shared_instance &&
+		(!!instance.value.shared_instance &&
 			members.query.data.value !== undefined &&
 			!members.query.isFetching.value &&
 			!sharedInstanceUnavailable.value &&
@@ -302,13 +278,13 @@ const showMembersTable = computed(
 )
 const requiresUnlink = computed(
 	() =>
-		props.instance.link?.type === 'imported_modpack' &&
-		!props.instance.shared_instance &&
+		instance.value.link?.type === 'imported_modpack' &&
+		!instance.value.shared_instance &&
 		!importedModpackUnlinked.value,
 )
 const importedModpackBackupTip = computed(() =>
-	props.instance.link?.type === 'imported_modpack'
-		? (props.instance.link.name ?? props.instance.link.filename ?? undefined)
+	instance.value.link?.type === 'imported_modpack'
+		? (instance.value.link.name ?? instance.value.link.filename ?? undefined)
 		: undefined,
 )
 
@@ -395,9 +371,9 @@ async function showInvitePlayers(event?: MouseEvent) {
 }
 async function unlinkImportedModpack() {
 	try {
-		await edit(props.instance.id, { link: null as unknown as undefined })
+		await edit(instance.value.id, { link: null as unknown as undefined })
 		importedModpackUnlinked.value = true
-		await queryClient.invalidateQueries({ queryKey: ['linkedModpackInfo', props.instance.id] })
+		await queryClient.invalidateQueries({ queryKey: ['linkedModpackInfo', instance.value.id] })
 		if (await inviteLink.ensure()) invitePlayersModal.value?.show()
 	} catch (error) {
 		notifyOperationError(error)
@@ -419,7 +395,7 @@ function userProfileLink(username: string) {
 	return !username || username.includes('@') ? undefined : `/user/${encodeURIComponent(username)}`
 }
 async function requestAuth(flow: ModrinthAuthFlow) {
-	await auth.requestSignIn(`/instance/${encodeURIComponent(props.instance.id)}/share`, flow, {
+	await auth.requestSignIn(`/instance/${encodeURIComponent(instance.value.id)}/share`, flow, {
 		showModal: false,
 	})
 	return !!auth.session_token.value
@@ -428,6 +404,23 @@ function signInToShare(event?: MouseEvent) {
 	void accountRequiredModal.value?.show(event)
 }
 
+provideSharedInstanceManagement({
+	rows: members.rows,
+	actionsLocked: sharedInstanceActionsLocked,
+	inviteDisabled: computed(() => !hasRemainingUserSlots.value),
+	invitePending: inviteLink.pending,
+	pushUpdateDisabled: computed(
+		() =>
+			instance.value.install_stage !== 'installed' ||
+			publishState.value !== 'idle' ||
+			offline.value,
+	),
+	pushUpdatePending: computed(() => publishState.value !== 'idle'),
+	invite: (event) => void showInvitePlayers(event),
+	remove: showRemoveMemberModal,
+	pushUpdate: reviewUpdate,
+})
+
 watch(
 	[eligibilityQuery.error, members.query.error],
 	(errors) => {
@@ -443,7 +436,7 @@ watch([eligibilityQuery.data, members.query.data], ([eligibility, memberRows]) =
 	}
 })
 watch(
-	() => props.instance.id,
+	() => instance.value.id,
 	() => {
 		importedModpackUnlinked.value = false
 	},
@@ -455,6 +448,4 @@ watch(
 	},
 	{ immediate: true, flush: 'post' },
 )
-
-provideInstanceBackup(() => props.instance)
 </script>
diff --git a/apps/app-frontend/src/pages/instance/share/shared-instance-management-context.ts b/apps/app-frontend/src/pages/instance/share/shared-instance-management-context.ts
new file mode 100644
index 0000000000..615d66e16e
--- /dev/null
+++ b/apps/app-frontend/src/pages/instance/share/shared-instance-management-context.ts
@@ -0,0 +1,19 @@
+import { createContext } from '@modrinth/ui'
+import type { ComputedRef, Ref } from 'vue'
+
+import type { ShareRow } from './shared-instance-share-types'
+
+export interface SharedInstanceManagementContext {
+	readonly rows: ComputedRef<ShareRow[]>
+	readonly actionsLocked: Ref<boolean>
+	readonly inviteDisabled: ComputedRef<boolean>
+	readonly invitePending: Ref<boolean>
+	readonly pushUpdateDisabled: ComputedRef<boolean>
+	readonly pushUpdatePending: ComputedRef<boolean>
+	invite: (event: MouseEvent) => void
+	remove: (row: ShareRow) => void
+	pushUpdate: (event: MouseEvent) => void
+}
+
+export const [injectSharedInstanceManagement, provideSharedInstanceManagement] =
+	createContext<SharedInstanceManagementContext>('InstanceSharePage')
diff --git a/apps/app-frontend/src/pages/instance/share/shared-instance-members-table.vue b/apps/app-frontend/src/pages/instance/share/shared-instance-members-table.vue
index 85cc02c8c2..b35e0f5916 100644
--- a/apps/app-frontend/src/pages/instance/share/shared-instance-members-table.vue
+++ b/apps/app-frontend/src/pages/instance/share/shared-instance-members-table.vue
@@ -15,7 +15,7 @@
 						<button
 							class="flex !h-10 shrink-0 items-center gap-2 !border"
 							:disabled="pushUpdateDisabled"
-							@click="emit('push-update', $event)"
+							@click="management.pushUpdate($event)"
 						>
 							<SpinnerIcon v-if="pushUpdatePending" class="animate-spin" aria-hidden="true" />
 							<UploadIcon v-else aria-hidden="true" />
@@ -26,7 +26,7 @@
 						<button
 							class="flex !h-10 shrink-0 items-center gap-2"
 							:disabled="invitePending || inviteDisabled"
-							@click="emit('invite', $event)"
+							@click="management.invite($event)"
 						>
 							<SpinnerIcon v-if="invitePending" class="animate-spin" aria-hidden="true" />
 							<UserPlusIcon v-else aria-hidden="true" />
@@ -125,7 +125,7 @@
 							v-tooltip="'Revoke access'"
 							:aria-label="`Revoke access for ${row.username}`"
 							class="text-secondary hover:!filter-none hover:text-red focus-visible:!filter-none"
-							@click="emit('remove', row)"
+							@click="management.remove(row)"
 						>
 							<XIcon aria-hidden="true" /></button
 					></ButtonStyled>
@@ -161,6 +161,7 @@ import {
 } from '@modrinth/ui'
 import { computed, ref, watch } from 'vue'
 
+import { injectSharedInstanceManagement } from './shared-instance-management-context'
 import {
 	type MethodFilter,
 	methodLabels,
@@ -169,19 +170,15 @@ import {
 	type ShareTableColumn,
 } from './shared-instance-share-types'
 
-const props = defineProps<{
-	rows: ShareRow[]
-	actionsLocked?: boolean
-	inviteDisabled?: boolean
-	invitePending?: boolean
-	pushUpdateDisabled?: boolean
-	pushUpdatePending?: boolean
-}>()
-const emit = defineEmits<{
-	invite: [event: MouseEvent]
-	remove: [row: ShareRow]
-	'push-update': [event: MouseEvent]
-}>()
+const management = injectSharedInstanceManagement()
+const {
+	rows,
+	actionsLocked,
+	inviteDisabled,
+	invitePending,
+	pushUpdateDisabled,
+	pushUpdatePending,
+} = management
 const search = ref('')
 const methodFilter = ref<MethodFilter>('all')
 const sortColumn = ref<string | undefined>('joined')
@@ -194,7 +191,7 @@ const methodFilterOptions: Array<{ id: ShareMethod; label: string }> = [
 	{ id: 'direct', label: methodLabels.direct },
 	{ id: 'link', label: methodLabels.link },
 ]
-const hasMultipleMethods = computed(() => new Set(props.rows.map((row) => row.method)).size > 1)
+const hasMultipleMethods = computed(() => new Set(rows.value.map((row) => row.method)).size > 1)
 const columns = computed<TableColumn<ShareTableColumn>[]>(() => {
 	const result: TableColumn<ShareTableColumn>[] = [
 		{
@@ -230,7 +227,7 @@ const columns = computed<TableColumn<ShareTableColumn>[]>(() => {
 			cellClass: 'whitespace-nowrap !px-2',
 		},
 	]
-	if (!props.actionsLocked)
+	if (!actionsLocked.value)
 		result.push({
 			key: 'actions',
 			label: 'Actions',
@@ -243,7 +240,7 @@ const columns = computed<TableColumn<ShareTableColumn>[]>(() => {
 })
 const filteredRows = computed(() => {
 	const query = search.value.trim().toLowerCase()
-	return props.rows.filter((row) => {
+	return rows.value.filter((row) => {
 		if (methodFilter.value !== 'all' && row.method !== methodFilter.value) return false
 		if (!query) return true
 		return [
diff --git a/apps/app-frontend/src/pages/instance/share/use-shared-instance-members.ts b/apps/app-frontend/src/pages/instance/share/use-shared-instance-members.ts
index 801f9a3552..cd0c43304c 100644
--- a/apps/app-frontend/src/pages/instance/share/use-shared-instance-members.ts
+++ b/apps/app-frontend/src/pages/instance/share/use-shared-instance-members.ts
@@ -12,13 +12,14 @@ import {
 } from '@/helpers/instance'
 import type { GameInstance } from '@/helpers/types'
 
+import { instanceKeys } from '../query-options'
 import {
 	normalizeInviteKey,
 	SHARED_INSTANCE_USER_LIMIT,
 	type ShareRow,
 } from './shared-instance-share-types'
 
-type MembersQueryKey = readonly ['sharedInstanceUsers', string]
+type MembersQueryKey = ReturnType<typeof instanceKeys.sharedMembers>
 
 type OptimisticChange = {
 	queryKey: MembersQueryKey
@@ -48,7 +49,7 @@ export function useSharedInstanceMembers(options: {
 	onError: (error: unknown) => void
 }) {
 	const queryClient = useQueryClient()
-	const queryKey = computed(() => ['sharedInstanceUsers', options.instance.value.id] as const)
+	const queryKey = computed(() => instanceKeys.sharedMembers(options.instance.value.id))
 	const invitingUserIds = new Set<string>()
 	const removingUserIds = new Set<string>()
 	const exclusiveMutationPending = ref(false)
diff --git a/apps/app-frontend/src/pages/instance/shared-instance-context.ts b/apps/app-frontend/src/pages/instance/shared-instance-context.ts
new file mode 100644
index 0000000000..683a7a0686
--- /dev/null
+++ b/apps/app-frontend/src/pages/instance/shared-instance-context.ts
@@ -0,0 +1,181 @@
+import { createContext, injectAuth } from '@modrinth/ui'
+import { useQuery, useQueryClient } from '@tanstack/vue-query'
+import { computed, type Ref, ref, watch } from 'vue'
+
+import { useUserQuery } from '@/composables/users/use-user-query'
+import {
+	getSharedInstanceUnavailableReason,
+	install_get_shared_instance_update_preview,
+	isSharedInstanceUnavailableError,
+	type SharedInstanceUnavailableReason,
+} from '@/helpers/install'
+import { can_current_user_use_shared_instances } from '@/helpers/instance'
+import type { GameInstance } from '@/helpers/types'
+
+import { instanceKeys } from './query-options'
+
+export type SharedInstanceManager =
+	| {
+			type: 'user'
+			name: string
+			avatarUrl?: string
+			tintBy: string
+	  }
+	| {
+			type: 'server'
+			name: string
+			avatarUrl?: string
+			tintBy: string
+	  }
+
+export function createSharedInstanceContext(
+	instance: Ref<GameInstance | undefined>,
+	offline: Ref<boolean>,
+	notifyError: (error: unknown) => void,
+) {
+	const auth = injectAuth()
+	const queryClient = useQueryClient()
+	const forcedUnavailableReason = ref<SharedInstanceUnavailableReason | null>(null)
+
+	const expectedUserId = computed(() => instance.value?.shared_instance?.linked_user_id ?? null)
+	const wrongAccount = computed(() => {
+		if (auth.isReady && !auth.isReady.value) return false
+		if (!expectedUserId.value) return false
+		return auth.user.value?.id !== expectedUserId.value
+	})
+	const actionsLocked = computed(() => wrongAccount.value)
+	const signedOut = computed(() => !auth.session_token.value)
+	const managerUserId = computed(() => {
+		const attachment = instance.value?.shared_instance
+		if (!attachment) return null
+		if (attachment.role === 'owner') {
+			return actionsLocked.value ? (attachment.linked_user_id ?? null) : null
+		}
+		return attachment.manager_id ?? null
+	})
+	const managerUserQuery = useUserQuery(managerUserId)
+	const manager = computed<SharedInstanceManager | null>(() => {
+		const attachment = instance.value?.shared_instance
+		if (!attachment) return null
+
+		if (attachment.server_manager_name) {
+			return {
+				type: 'server',
+				name: attachment.server_manager_name,
+				avatarUrl: attachment.server_manager_icon_url ?? undefined,
+				tintBy: attachment.server_manager_name,
+			}
+		}
+
+		const user = managerUserQuery.data.value
+		if (!user) return null
+		return {
+			type: 'user',
+			name: user.username,
+			avatarUrl: user.avatar_url ?? undefined,
+			tintBy: user.id,
+		}
+	})
+	const unavailableManager = computed(() => manager.value?.name ?? null)
+
+	const eligibilityQuery = useQuery({
+		queryKey: computed(() => instanceKeys.sharedEligibility(auth.user.value?.id)),
+		queryFn: can_current_user_use_shared_instances,
+		enabled: () => !!auth.session_token.value && !!auth.user.value?.id,
+		retry: false,
+		staleTime: Infinity,
+		refetchOnWindowFocus: false,
+		refetchOnReconnect: false,
+	})
+	const currentUserCanUseSharedInstances = computed(
+		() => !auth.session_token.value || eligibilityQuery.data.value !== false,
+	)
+
+	const updatePreviewQuery = useQuery({
+		queryKey: computed(() =>
+			instanceKeys.sharedUpdatePreview(instance.value?.id ?? '', auth.user.value?.id),
+		),
+		queryFn: () => install_get_shared_instance_update_preview(instance.value!.id),
+		enabled: computed(
+			() =>
+				!!instance.value?.id &&
+				!!instance.value.shared_instance &&
+				!actionsLocked.value &&
+				!offline.value &&
+				(auth.isReady?.value ?? true) &&
+				!!auth.session_token.value &&
+				!!auth.user.value?.id,
+		),
+		retry: false,
+		staleTime: 30_000,
+		refetchOnWindowFocus: false,
+	})
+
+	watch(updatePreviewQuery.data, (preview) => {
+		if (preview !== undefined) forcedUnavailableReason.value = null
+	})
+	watch(updatePreviewQuery.error, (error) => {
+		if (!error) return
+		if (isSharedInstanceUnavailableError(error)) {
+			forcedUnavailableReason.value = getSharedInstanceUnavailableReason(error)
+		} else {
+			notifyError(error)
+		}
+	})
+
+	const unavailableReason = computed(() => forcedUnavailableReason.value)
+	const shareActionsLocked = computed(() => actionsLocked.value || unavailableReason.value !== null)
+	const updatePreview = computed(() =>
+		unavailableReason.value ? null : (updatePreviewQuery.data.value ?? null),
+	)
+
+	watch(
+		() => instance.value?.id,
+		() => {
+			forcedUnavailableReason.value = null
+		},
+	)
+
+	async function refreshAvailability() {
+		forcedUnavailableReason.value = null
+		if (!instance.value?.id) return
+		await queryClient.invalidateQueries({
+			queryKey: instanceKeys.sharedUpdatePreview(instance.value.id, auth.user.value?.id),
+		})
+	}
+
+	async function refreshUpdatePreview() {
+		forcedUnavailableReason.value = null
+		if (!instance.value?.id || !auth.user.value?.id) return null
+		const result = await updatePreviewQuery.refetch({ throwOnError: true })
+		return result.data ?? null
+	}
+
+	function setUnavailable(reason: SharedInstanceUnavailableReason | null) {
+		forcedUnavailableReason.value = reason
+	}
+
+	return {
+		actionsLocked,
+		shareActionsLocked,
+		unavailableReason,
+		unavailableManager,
+		manager,
+		updatePreview,
+		expectedUserId,
+		wrongAccount,
+		signedOut,
+		eligibilityQuery,
+		currentUserCanUseSharedInstances,
+		refreshAvailability,
+		refreshUpdatePreview,
+		setUnavailable,
+	}
+}
+
+export type SharedInstanceContext = ReturnType<typeof createSharedInstanceContext>
+
+export const [injectSharedInstance, provideSharedInstance] = createContext<SharedInstanceContext>(
+	'InstancePage',
+	'sharedInstance',
+)
diff --git a/apps/app-frontend/src/pages/instance/use-shared-instance-state.ts b/apps/app-frontend/src/pages/instance/use-shared-instance-state.ts
deleted file mode 100644
index 408bd3c2cc..0000000000
--- a/apps/app-frontend/src/pages/instance/use-shared-instance-state.ts
+++ /dev/null
@@ -1,228 +0,0 @@
-import { injectAuth } from '@modrinth/ui'
-import { computed, inject, type InjectionKey, provide, type Ref, ref, watch } from 'vue'
-
-import { useUserQuery } from '@/composables/users/use-user-query'
-import {
-	getSharedInstanceUnavailableReason,
-	install_get_shared_instance_update_preview,
-	isSharedInstanceUnavailableError,
-	type SharedInstanceUnavailableReason,
-} from '@/helpers/install'
-import type { GameInstance } from '@/helpers/types'
-
-export type SharedInstanceManager =
-	| {
-			type: 'user'
-			name: string
-			avatarUrl?: string
-			tintBy: string
-	  }
-	| {
-			type: 'server'
-			name: string
-			avatarUrl?: string
-			tintBy: string
-	  }
-
-export function useSharedInstanceState(
-	instance: Ref<GameInstance | undefined>,
-	offline: Ref<boolean>,
-	notifyError: (error: unknown) => void,
-) {
-	const auth = injectAuth()
-	const updatePreview =
-		ref<Awaited<ReturnType<typeof install_get_shared_instance_update_preview>>>(null)
-	const updatePreviewLoaded = ref(false)
-	const unavailableReason = ref<SharedInstanceUnavailableReason | null>(null)
-	const availabilityCheckKey = ref<string | null>(null)
-	const availabilityRefresh = ref(0)
-	let availabilityRequestId = 0
-	let availabilityRequest: {
-		key: string
-		promise: Promise<{
-			preview: Awaited<ReturnType<typeof install_get_shared_instance_update_preview>>
-			error: unknown | null
-		}>
-	} | null = null
-
-	const expectedUserId = computed(() => instance.value?.shared_instance?.linked_user_id ?? null)
-	const wrongAccount = computed(() => {
-		if (auth.isReady && !auth.isReady.value) return false
-		if (!expectedUserId.value) return false
-		return auth.user.value?.id !== expectedUserId.value
-	})
-	const actionsLocked = computed(() => wrongAccount.value)
-	const shareActionsLocked = computed(() => actionsLocked.value || unavailableReason.value !== null)
-	const signedOut = computed(() => !auth.session_token.value)
-	const managerUserId = computed(() => {
-		const attachment = instance.value?.shared_instance
-		if (!attachment) return null
-		if (attachment.role === 'owner') {
-			return actionsLocked.value ? (attachment.linked_user_id ?? null) : null
-		}
-		return attachment.manager_id ?? null
-	})
-	const managerUserQuery = useUserQuery(managerUserId)
-	const manager = computed<SharedInstanceManager | null>(() => {
-		const attachment = instance.value?.shared_instance
-		if (!attachment) return null
-
-		if (attachment.server_manager_name) {
-			return {
-				type: 'server',
-				name: attachment.server_manager_name,
-				avatarUrl: attachment.server_manager_icon_url ?? undefined,
-				tintBy: attachment.server_manager_name,
-			}
-		}
-
-		const user = managerUserQuery.data.value
-		if (!user) return null
-		return {
-			type: 'user',
-			name: user.username,
-			avatarUrl: user.avatar_url ?? undefined,
-			tintBy: user.id,
-		}
-	})
-	const unavailableManager = computed(() => manager.value?.name ?? null)
-
-	function reset() {
-		availabilityRequestId++
-		availabilityRequest = null
-		availabilityCheckKey.value = null
-		updatePreview.value = null
-		updatePreviewLoaded.value = false
-		unavailableReason.value = null
-	}
-
-	function refreshAvailability() {
-		availabilityCheckKey.value = null
-		updatePreviewLoaded.value = false
-		availabilityRefresh.value++
-	}
-
-	function setUnavailable(reason: SharedInstanceUnavailableReason | null) {
-		availabilityRequestId++
-		availabilityRequest = null
-		availabilityCheckKey.value = null
-		updatePreview.value = null
-		updatePreviewLoaded.value = false
-		unavailableReason.value = reason
-	}
-
-	async function checkAvailability(instanceId: string, key: string, throwError = false) {
-		const requestId = ++availabilityRequestId
-		let request = availabilityRequest
-		if (!request || request.key !== key) {
-			const promise = install_get_shared_instance_update_preview(instanceId).then(
-				(preview) => ({ preview, error: null }),
-				(error: unknown) => ({ preview: null, error }),
-			)
-			request = { key, promise }
-			availabilityRequest = request
-			void promise.finally(() => {
-				if (availabilityRequest?.promise === promise) availabilityRequest = null
-			})
-		}
-
-		const result = await request.promise
-		if (!isCurrentRequest(requestId, instanceId, key)) return null
-
-		if (result.error !== null) {
-			updatePreviewLoaded.value = false
-			if (isSharedInstanceUnavailableError(result.error)) {
-				updatePreview.value = null
-				unavailableReason.value = getSharedInstanceUnavailableReason(result.error)
-			} else if (!throwError) {
-				notifyError(result.error)
-			}
-
-			if (throwError) throw result.error
-			return null
-		}
-
-		updatePreview.value = result.preview
-		updatePreviewLoaded.value = true
-		unavailableReason.value = null
-		return result.preview
-	}
-
-	async function refreshUpdatePreview() {
-		const instanceId = instance.value?.id
-		const userId = auth.user.value?.id
-		if (!instanceId || !userId) return null
-
-		const key = `${instanceId}:${userId}`
-		availabilityCheckKey.value = key
-		return await checkAvailability(instanceId, key, true)
-	}
-
-	function isCurrentRequest(requestId: number, instanceId: string, key: string) {
-		return (
-			requestId === availabilityRequestId &&
-			instance.value?.id === instanceId &&
-			availabilityCheckKey.value === key
-		)
-	}
-
-	watch(
-		() => ({
-			refresh: availabilityRefresh.value,
-			instanceId: instance.value?.id,
-			role: instance.value?.shared_instance?.role,
-			locked: actionsLocked.value,
-			offline: offline.value,
-			signedIn: !!auth.session_token.value,
-			userId: auth.user.value?.id ?? null,
-			authReady: auth.isReady?.value ?? true,
-		}),
-		async ({ instanceId, role, locked, offline, signedIn, userId, authReady }) => {
-			if (!instanceId || !role || locked || offline || !authReady || !signedIn || !userId) {
-				availabilityRequestId++
-				availabilityRequest = null
-				availabilityCheckKey.value = null
-				updatePreview.value = null
-				updatePreviewLoaded.value = false
-				if (instanceId && role) unavailableReason.value = null
-				return
-			}
-
-			const key = `${instanceId}:${userId}`
-			if (availabilityCheckKey.value === key) return
-			availabilityCheckKey.value = key
-			await checkAvailability(instanceId, key)
-		},
-		{ immediate: true },
-	)
-
-	return {
-		actionsLocked,
-		shareActionsLocked,
-		unavailableReason,
-		unavailableManager,
-		manager,
-		updatePreview,
-		expectedUserId,
-		wrongAccount,
-		signedOut,
-		reset,
-		refreshAvailability,
-		refreshUpdatePreview,
-		setUnavailable,
-	}
-}
-
-export type SharedInstanceState = ReturnType<typeof useSharedInstanceState>
-
-const sharedInstanceStateKey: InjectionKey<SharedInstanceState> = Symbol('shared-instance-state')
-
-export function provideSharedInstanceState(state: SharedInstanceState) {
-	provide(sharedInstanceStateKey, state)
-}
-
-export function injectSharedInstanceState() {
-	const state = inject(sharedInstanceStateKey)
-	if (!state) throw new Error('Shared instance state has not been provided.')
-	return state
-}
diff --git a/apps/app-frontend/src/pages/instance/Worlds.vue b/apps/app-frontend/src/pages/instance/worlds/index.vue
similarity index 94%
rename from apps/app-frontend/src/pages/instance/Worlds.vue
rename to apps/app-frontend/src/pages/instance/worlds/index.vue
index 4a5bd6192d..cc3a228df3 100644
--- a/apps/app-frontend/src/pages/instance/Worlds.vue
+++ b/apps/app-frontend/src/pages/instance/worlds/index.vue
@@ -42,12 +42,7 @@
 						</button>
 					</ButtonStyled>
 					<ButtonStyled color="brand">
-						<button
-							class="!h-10 flex items-center gap-2"
-							@click="
-								router.push({ path: '/browse/server', query: { i: instance.id, from: 'worlds' } })
-							"
-						>
+						<button class="!h-10 flex items-center gap-2" @click="instancePage.browseServers">
 							<CompassIcon class="size-5" />
 							<span>{{ formatMessage(messages.browseServers) }}</span>
 						</button>
@@ -105,7 +100,7 @@
 					:game-mode="world.type === 'singleplayer' ? GAME_MODES[world.game_mode] : undefined"
 					:shortcut-instance-id="instance.id"
 					@play="() => joinWorld(world)"
-					@stop="() => emit('stop')"
+					@stop="() => instancePage.stop('InstanceWorlds')"
 					@refresh="() => refreshServer((world as ServerWorld).address)"
 					@edit="
 						() =>
@@ -134,12 +129,7 @@
 					</button>
 				</ButtonStyled>
 				<ButtonStyled color="brand">
-					<button
-						class="!h-10 flex items-center gap-2"
-						@click="
-							router.push({ path: '/browse/server', query: { i: instance.id, from: 'worlds' } })
-						"
-					>
+					<button class="!h-10 flex items-center gap-2" @click="instancePage.browseServers">
 						<CompassIcon class="size-5" />
 						<span>{{ formatMessage(messages.browseServers) }}</span>
 					</button>
@@ -166,9 +156,8 @@ import {
 import { useQuery, useQueryClient } from '@tanstack/vue-query'
 import { platform } from '@tauri-apps/plugin-os'
 import { computed, onBeforeUnmount, ref, watch } from 'vue'
-import { useRoute, useRouter } from 'vue-router'
+import { useRoute } from 'vue-router'
 
-import type ContextMenu from '@/components/ui/ContextMenu.vue'
 import AddServerModal from '@/components/ui/world/modal/AddServerModal.vue'
 import ConfirmRemoveWorldModal from '@/components/ui/world/modal/ConfirmRemoveWorldModal.vue'
 import EditServerModal from '@/components/ui/world/modal/EditServerModal.vue'
@@ -178,7 +167,6 @@ import { trackEvent } from '@/helpers/analytics'
 import { get_project, get_project_v3 } from '@/helpers/cache.js'
 import { instance_listener } from '@/helpers/events'
 import { get_game_versions } from '@/helpers/tags'
-import type { GameInstance } from '@/helpers/types'
 import { ensureManagedServerWorldExists, getServerAddress } from '@/helpers/worlds'
 import {
 	delete_world,
@@ -194,7 +182,6 @@ import {
 	refreshServerData,
 	refreshServers,
 	refreshWorld,
-	refreshWorlds,
 	remove_server_from_instance,
 	resolveManagedServerWorld,
 	type ServerData,
@@ -209,6 +196,9 @@ import {
 import { injectServerInstall } from '@/providers/server-install'
 import { handleSevereError } from '@/store/error.js'
 
+import { injectInstancePage } from '../instance-context'
+import { instanceKeys, instanceWorldsQueryOptions } from '../query-options'
+
 const messages = defineMessages({
 	searchWorldsPlaceholder: {
 		id: 'app.instance.worlds.search-worlds-placeholder',
@@ -256,7 +246,7 @@ const { formatMessage } = useVIntl()
 const { handleError } = injectNotificationManager()
 const { playServerProject } = injectServerInstall()
 const route = useRoute()
-const router = useRouter()
+const instancePage = injectInstancePage()
 
 const addServerModal = ref<InstanceType<typeof AddServerModal>>()
 const editServerModal = ref<InstanceType<typeof EditServerModal>>()
@@ -265,25 +255,12 @@ const removeWorldModal = ref<InstanceType<typeof ConfirmRemoveWorldModal>>()
 
 const worldToRemove = ref<World | null>(null)
 
-const emit = defineEmits<{
-	(event: 'play', world: World): void
-	(event: 'stop'): void
-}>()
+const instance = computed(() => instancePage.instance.value!)
+const playing = instancePage.playing
 
-const props = defineProps<{
-	instance: GameInstance
-	options: InstanceType<typeof ContextMenu> | null
-	offline: boolean
-	playing: boolean
-	installed: boolean
-}>()
-
-const instance = computed(() => props.instance)
-const playing = computed(() => props.playing)
-
-function play(world: World) {
-	if (props.instance.quarantined) return
-	emit('play', world)
+function play() {
+	if (instance.value.quarantined) return
+	void instancePage.refreshPlayState()
 }
 
 const selectedFilters = ref<string[]>([])
@@ -319,11 +296,12 @@ const hadNoWorlds = ref(true)
 const startingInstance = ref(false)
 const worldPlaying = ref<World>()
 
-const worldsQuery = useQuery({
-	queryKey: computed(() => ['worlds', instance.value.id]),
-	queryFn: () => refreshWorlds(instance.value.id),
-	staleTime: 30_000,
-})
+const worldsQuery = useQuery(
+	computed(() => ({
+		...instanceWorldsQueryOptions(instancePage.instanceId.value),
+		enabled: !!instancePage.instanceId.value,
+	})),
+)
 
 const worldsReadyPending = useReadyState(worldsQuery)
 
@@ -497,7 +475,7 @@ async function refreshAllWorlds() {
 			}
 		}
 
-		await queryClient.invalidateQueries({ queryKey: ['worlds', instance.value.id] })
+		await queryClient.invalidateQueries({ queryKey: instanceKeys.worlds(instance.value.id) })
 		await refreshServers(
 			worlds.value,
 			serverData.value,
@@ -592,7 +570,7 @@ async function joinWorld(world: World) {
 	} else if (world.type === 'singleplayer') {
 		await start_join_singleplayer_world(instance.value.id, world.path).catch(handleJoinError)
 	}
-	play(world)
+	play()
 	startingInstance.value = false
 }
 
diff --git a/apps/app-frontend/src/routes.js b/apps/app-frontend/src/routes.js
index 70f6e5372b..62a9669b9f 100644
--- a/apps/app-frontend/src/routes.js
+++ b/apps/app-frontend/src/routes.js
@@ -141,7 +141,6 @@ export default new createRouter({
 			path: '/instance/:id',
 			name: 'Instance',
 			component: Instance.Index,
-			props: true,
 			children: [
 				{
 					path: 'worlds',
@@ -155,22 +154,22 @@ export default new createRouter({
 				},
 				{
 					path: '',
-					name: 'Mods',
-					component: Instance.Mods,
+					name: 'InstanceContent',
+					component: Instance.Content,
 				},
 				{
 					path: 'projects/:type',
-					name: 'ModsFilter',
-					component: Instance.Mods,
+					name: 'InstanceContentFilter',
+					component: Instance.Content,
 				},
 				{
 					path: 'files',
-					name: 'Files',
+					name: 'InstanceFiles',
 					component: Instance.Files,
 				},
 				{
 					path: 'logs',
-					name: 'Logs',
+					name: 'InstanceLogs',
 					component: Instance.Logs,
 					meta: {
 						renderMode: 'fixed',

From 893ab49fdf0dfcd013312020c099212d44fe0e71 Mon Sep 17 00:00:00 2001
From: Modrinth Bot <106493074+modrinth-bot@users.noreply.github.com>
Date: Tue, 4 Aug 2026 19:59:39 +0200
Subject: [PATCH 22/82] New translations from Crowdin (main) (#6972)

---
 .../app-frontend/src/locales/ar-SA/index.json |  43 +-
 .../app-frontend/src/locales/cs-CZ/index.json |  45 --
 .../app-frontend/src/locales/da-DK/index.json |  87 +-
 .../app-frontend/src/locales/de-CH/index.json | 403 +++++++++-
 .../app-frontend/src/locales/de-DE/index.json | 393 ++++++++-
 .../src/locales/es-419/index.json             | 466 ++++++++++-
 .../app-frontend/src/locales/es-ES/index.json |  68 +-
 .../app-frontend/src/locales/fi-FI/index.json |  45 --
 .../src/locales/fil-PH/index.json             |  42 -
 .../app-frontend/src/locales/fr-FR/index.json | 299 ++++++-
 .../app-frontend/src/locales/he-IL/index.json |   6 -
 .../app-frontend/src/locales/hu-HU/index.json | 757 +++++++++++++++---
 .../app-frontend/src/locales/id-ID/index.json |  42 -
 .../app-frontend/src/locales/it-IT/index.json | 406 +++++++++-
 .../app-frontend/src/locales/ja-JP/index.json | 511 +++++++++++-
 .../app-frontend/src/locales/ko-KR/index.json | 603 +++++++++++++-
 .../app-frontend/src/locales/ms-MY/index.json |  78 +-
 .../app-frontend/src/locales/nl-NL/index.json | 297 ++++++-
 .../app-frontend/src/locales/no-NO/index.json |  33 -
 .../app-frontend/src/locales/pl-PL/index.json | 335 +++++++-
 .../app-frontend/src/locales/pt-BR/index.json | 422 +++++++++-
 .../app-frontend/src/locales/pt-PT/index.json |  45 --
 .../app-frontend/src/locales/ro-RO/index.json |   3 -
 .../app-frontend/src/locales/ru-RU/index.json | 541 ++++++++++++-
 .../app-frontend/src/locales/sr-CS/index.json |  50 +-
 .../app-frontend/src/locales/sv-SE/index.json | 449 ++++++++++-
 .../app-frontend/src/locales/th-TH/index.json |  42 -
 .../app-frontend/src/locales/tr-TR/index.json | 340 ++++++--
 .../app-frontend/src/locales/uk-UA/index.json | 531 +++++++++++-
 .../app-frontend/src/locales/vi-VN/index.json |  45 --
 .../app-frontend/src/locales/zh-CN/index.json | 432 +++++++++-
 .../app-frontend/src/locales/zh-TW/index.json | 412 +++++++++-
 apps/frontend/src/locales/de-CH/index.json    |  58 +-
 apps/frontend/src/locales/de-DE/index.json    |  64 +-
 apps/frontend/src/locales/es-419/index.json   | 591 +++++++++++++-
 apps/frontend/src/locales/es-ES/index.json    | 108 +++
 apps/frontend/src/locales/fr-FR/index.json    |  76 +-
 apps/frontend/src/locales/hu-HU/index.json    | 328 +++++++-
 apps/frontend/src/locales/it-IT/index.json    |  24 +-
 apps/frontend/src/locales/ja-JP/index.json    |   5 +-
 apps/frontend/src/locales/ko-KR/index.json    | 120 +++
 apps/frontend/src/locales/ms-MY/index.json    |  33 +
 apps/frontend/src/locales/nl-NL/index.json    |  20 +-
 apps/frontend/src/locales/pl-PL/index.json    |  37 +-
 apps/frontend/src/locales/pt-BR/index.json    |  20 +-
 apps/frontend/src/locales/ru-RU/index.json    |  58 +-
 apps/frontend/src/locales/sv-SE/index.json    | 126 ++-
 apps/frontend/src/locales/tr-TR/index.json    | 129 +++
 apps/frontend/src/locales/uk-UA/index.json    | 108 +++
 apps/frontend/src/locales/zh-CN/index.json    |  38 +-
 apps/frontend/src/locales/zh-TW/index.json    |  26 +-
 .../moderation/src/locales/es-419/index.json  |   8 +-
 .../moderation/src/locales/es-ES/index.json   |   3 +
 .../moderation/src/locales/fr-FR/index.json   |   2 +-
 .../moderation/src/locales/hu-HU/index.json   |   2 +-
 .../moderation/src/locales/it-IT/index.json   |   2 +-
 .../moderation/src/locales/tr-TR/index.json   |   4 +-
 packages/ui/src/locales/cs-CZ/index.json      |   1 +
 packages/ui/src/locales/da-DK/index.json      |  16 +
 packages/ui/src/locales/de-CH/index.json      | 304 +++++++
 packages/ui/src/locales/de-DE/index.json      | 304 +++++++
 packages/ui/src/locales/es-419/index.json     | 492 +++++++++++-
 packages/ui/src/locales/fi-FI/index.json      |   1 +
 packages/ui/src/locales/fil-PH/index.json     |   1 +
 packages/ui/src/locales/fr-FR/index.json      | 310 ++++++-
 packages/ui/src/locales/fr-FR/meta.json       |   2 +-
 packages/ui/src/locales/hu-HU/index.json      | 435 +++++++++-
 packages/ui/src/locales/id-ID/index.json      |   1 +
 packages/ui/src/locales/it-IT/index.json      | 324 +++++++-
 packages/ui/src/locales/ja-JP/index.json      |  12 +-
 packages/ui/src/locales/ko-KR/index.json      | 441 ++++++++++
 packages/ui/src/locales/ms-MY/index.json      |  25 +
 packages/ui/src/locales/nl-NL/index.json      | 140 +++-
 packages/ui/src/locales/no-NO/index.json      |   1 +
 packages/ui/src/locales/pl-PL/index.json      | 271 ++++++-
 packages/ui/src/locales/pt-BR/index.json      | 324 +++++++-
 packages/ui/src/locales/pt-PT/index.json      |   1 +
 packages/ui/src/locales/ru-RU/index.json      | 328 +++++++-
 packages/ui/src/locales/sr-CS/index.json      |   1 +
 packages/ui/src/locales/sv-SE/index.json      | 520 +++++++++++-
 packages/ui/src/locales/th-TH/index.json      |   1 +
 packages/ui/src/locales/tr-TR/index.json      |  60 ++
 packages/ui/src/locales/uk-UA/index.json      | 456 ++++++++++-
 packages/ui/src/locales/vi-VN/index.json      |   1 +
 packages/ui/src/locales/zh-CN/index.json      | 337 +++++++-
 packages/ui/src/locales/zh-TW/index.json      | 337 +++++++-
 86 files changed, 14502 insertions(+), 1206 deletions(-)

diff --git a/apps/app-frontend/src/locales/ar-SA/index.json b/apps/app-frontend/src/locales/ar-SA/index.json
index 98e663c7e7..78db01f67f 100644
--- a/apps/app-frontend/src/locales/ar-SA/index.json
+++ b/apps/app-frontend/src/locales/ar-SA/index.json
@@ -134,21 +134,12 @@
   "app.ads-consent.reject": {
     "message": "رفض الكل"
   },
-  "app.appearance-settings.advanced-rendering.description": {
-    "message": "يتيح العرض المتقدم لتأثيرات مثل التشويش الذي قد تسبب مشكلات في الأداء دون استخدام العرض المسرع بالأجهزة."
-  },
   "app.appearance-settings.advanced-rendering.title": {
     "message": "العرض المتقدم"
   },
-  "app.appearance-settings.color-theme.description": {
-    "message": "اختر لون سمتك المفضل من أجل تطبيق Modrinth App."
-  },
   "app.appearance-settings.color-theme.title": {
     "message": "لون السمة"
   },
-  "app.appearance-settings.default-landing-page.description": {
-    "message": "غير الصفحة التي يفتح عليها المشغل."
-  },
   "app.appearance-settings.default-landing-page.home": {
     "message": "صفحة الرئيسية"
   },
@@ -158,50 +149,23 @@
   "app.appearance-settings.default-landing-page.title": {
     "message": "الصفحة الرئيسة الافتراضية"
   },
-  "app.appearance-settings.hide-nametag.description": {
-    "message": "ألغ تفعيل عرض الاسم فوق لاعبك في صفحة المظاهر."
-  },
   "app.appearance-settings.hide-nametag.title": {
     "message": "إخفاء عرض الاسم"
   },
-  "app.appearance-settings.jump-back-into-worlds.description": {
-    "message": "يتضمن العوالم الحديثة في قسم \"العودة إلى اللعب\" على الصفحة الرئيسية."
-  },
   "app.appearance-settings.jump-back-into-worlds.title": {
     "message": "العودة إلى العوالم"
   },
-  "app.appearance-settings.minimize-launcher.description": {
-    "message": "قم بتصغير نافذة المشغل عند بدء تشغيل عملية Minecraft."
-  },
-  "app.appearance-settings.minimize-launcher.title": {
-    "message": "تصغير نافذة المشغل"
-  },
-  "app.appearance-settings.native-decorations.description": {
-    "message": "استخدام إطار نافذة النظام (يتطلب إعادة تشغيل التطبيق)."
-  },
-  "app.appearance-settings.native-decorations.title": {
-    "message": "الزخارف التقليدية"
-  },
-  "app.appearance-settings.show-play-time.description": {
-    "message": "يعرض مقدار الوقت الذي قضيته في لعب إحدى المهام."
-  },
   "app.appearance-settings.show-play-time.title": {
     "message": "إظهار مدة التشغيل"
   },
-  "app.appearance-settings.skip-non-essential-warnings.description": {
-    "message": "يتخطى تلقائيًا عمليات التأكيد ذات المخاطر المنخفضة، مثل تثبيت حزم التعديلات المكررة، وحذف المحتوى العادي، والتحديثات الجماعية، وإلغاء ربط حزم التعديلات، ومطالبات الإصلاح. وسيستمر عرض التحذيرات الخطيرة."
-  },
   "app.appearance-settings.skip-non-essential-warnings.title": {
     "message": "تخطي التحذيرات غير الضرورية"
   },
   "app.appearance-settings.toggle-sidebar.description": {
-    "message": "يتيح إمكانية إظهار الشريط الجانبي أو إخفائه."
+    "message": "قم بإخفاء الشريط الجانبي الأيمن افتراضيًا وأضف زرًا لإظهاره أو إخفائه."
   },
   "app.appearance-settings.toggle-sidebar.title": {
-    "message": "تبديل الشريط الجانبي"
-  },
-  "app.appearance-settings.unknown-pack-warning.description": {
-    "message": "إذا حاولت تثبيت ملف Modrinth Pack (.mrpack) غير مستضاف على Modrinth، فسنتأكد من أنك على دراية بالمخاطر قبل تثبيته."
+    "message": "قم بإخفاء الشريط الجانبي الأيمن"
   },
   "app.appearance-settings.unknown-pack-warning.title": {
     "message": "أخبرني قبل تثبيت حزم التعديلات غير المعروفة"
@@ -488,9 +452,6 @@
   "app.settings.tabs.appearance": {
     "message": "المظهر"
   },
-  "app.settings.tabs.default-instance-options": {
-    "message": "خيارات النسخة الافتراضية"
-  },
   "app.settings.tabs.java-installations": {
     "message": "تثبيتات جافا"
   },
diff --git a/apps/app-frontend/src/locales/cs-CZ/index.json b/apps/app-frontend/src/locales/cs-CZ/index.json
index 16ad9f8663..499580dbf5 100644
--- a/apps/app-frontend/src/locales/cs-CZ/index.json
+++ b/apps/app-frontend/src/locales/cs-CZ/index.json
@@ -65,21 +65,12 @@
   "app.action-bar.view-logs": {
     "message": "Zobrazit logy"
   },
-  "app.appearance-settings.advanced-rendering.description": {
-    "message": "Povolí pokročilé vykreslování, například efekty rozmazání, které mohou bez hardwarového zrychlení způsobovat problémy s výkonem."
-  },
   "app.appearance-settings.advanced-rendering.title": {
     "message": "Pokročilé vykreslování"
   },
-  "app.appearance-settings.color-theme.description": {
-    "message": "Vyberte si váš preferovaný motiv pro aplikaci Modrinth."
-  },
   "app.appearance-settings.color-theme.title": {
     "message": "Barevný motiv"
   },
-  "app.appearance-settings.default-landing-page.description": {
-    "message": "Změňte stránku, která se otevře po spuštění launcheru."
-  },
   "app.appearance-settings.default-landing-page.home": {
     "message": "Domů"
   },
@@ -89,51 +80,18 @@
   "app.appearance-settings.default-landing-page.title": {
     "message": "Výchozí stránka po spuštění"
   },
-  "app.appearance-settings.hide-nametag.description": {
-    "message": "Zakáže zobrazení jmenovky nad vaší postavou na stránce skinů."
-  },
   "app.appearance-settings.hide-nametag.title": {
     "message": "Skrýt jmenovku"
   },
-  "app.appearance-settings.jump-back-into-worlds.description": {
-    "message": "Zahrne nedávné světy do sekce „Vrátit se do hry“ na domovské stránce."
-  },
   "app.appearance-settings.jump-back-into-worlds.title": {
     "message": "Rychlý návrat do světů"
   },
-  "app.appearance-settings.minimize-launcher.description": {
-    "message": "Minimalizovat launcher při spuštění Minecraftu."
-  },
-  "app.appearance-settings.minimize-launcher.title": {
-    "message": "Minimalizovat launcher"
-  },
-  "app.appearance-settings.native-decorations.description": {
-    "message": "Použít systémový rámeček okna (vyžaduje restart aplikace)."
-  },
-  "app.appearance-settings.native-decorations.title": {
-    "message": "Systémové dekorace"
-  },
-  "app.appearance-settings.show-play-time.description": {
-    "message": "Zobrazuje, kolik času jsi strávil hraním instance."
-  },
   "app.appearance-settings.show-play-time.title": {
     "message": "Zobrazit odehraný čas"
   },
-  "app.appearance-settings.skip-non-essential-warnings.description": {
-    "message": "Automaticky přeskočí nízko riziková potrvzení jako duplicitní instalace modpacků, běžné mazání obsahu, hromadné aktualizace, odpojování modpacků a výzvy k opravě. Nebezpečná upozornění se budou nadále zobrazovat."
-  },
   "app.appearance-settings.skip-non-essential-warnings.title": {
     "message": "Přeskočit nedůležitá upozornění"
   },
-  "app.appearance-settings.toggle-sidebar.description": {
-    "message": "Umožňí přepínat zobrazení postranního panelu."
-  },
-  "app.appearance-settings.toggle-sidebar.title": {
-    "message": "Přepnout postranní panel"
-  },
-  "app.appearance-settings.unknown-pack-warning.description": {
-    "message": "Pokud se pokusíte nainstalovat soubor Modrinth Pack (.mrpack), který není hostován na Modrinth, zajistíme, abyste si před instalací uvědomili související rizika."
-  },
   "app.appearance-settings.unknown-pack-warning.title": {
     "message": "Upozorni mě před instalací neznámých modpacků"
   },
@@ -401,9 +359,6 @@
   "app.settings.tabs.appearance": {
     "message": "Vzhled"
   },
-  "app.settings.tabs.default-instance-options": {
-    "message": "Výchozí možnosti instance"
-  },
   "app.settings.tabs.java-installations": {
     "message": "Instalace Javy"
   },
diff --git a/apps/app-frontend/src/locales/da-DK/index.json b/apps/app-frontend/src/locales/da-DK/index.json
index 4c423a6862..249cb7b464 100644
--- a/apps/app-frontend/src/locales/da-DK/index.json
+++ b/apps/app-frontend/src/locales/da-DK/index.json
@@ -89,6 +89,9 @@
   "app.action-bar.install.updating-shared-content": {
     "message": "Opdatere delt indhold"
   },
+  "app.action-bar.installs": {
+    "message": "Installeringer"
+  },
   "app.action-bar.make-primary-instance": {
     "message": "Gør til primære instance"
   },
@@ -131,21 +134,15 @@
   "app.ads-consent.reject": {
     "message": "Afvis alle"
   },
-  "app.appearance-settings.advanced-rendering.description": {
-    "message": "Aktiverer avanceret gengivelse som sløringseffekter, der kan forårsage ydelsesproblemer uden hardwareaccelereret gengivelse."
+  "app.ads-consent.title": {
+    "message": "Dit privatliv og hvordan reklamer hjælper Modrinth"
   },
   "app.appearance-settings.advanced-rendering.title": {
     "message": "Avanceret rendering"
   },
-  "app.appearance-settings.color-theme.description": {
-    "message": "Vælg dit foretrukne farvetema til Modrinth App."
-  },
   "app.appearance-settings.color-theme.title": {
     "message": "Farvetema"
   },
-  "app.appearance-settings.default-landing-page.description": {
-    "message": "Skift hvilken side launcheren åbner i."
-  },
   "app.appearance-settings.default-landing-page.home": {
     "message": "Hjem"
   },
@@ -155,38 +152,23 @@
   "app.appearance-settings.default-landing-page.title": {
     "message": "Standard startside"
   },
-  "app.appearance-settings.hide-nametag.description": {
-    "message": "Slår nametagget over din spiller på skins siden fra."
-  },
   "app.appearance-settings.hide-nametag.title": {
     "message": "Gem nametag"
   },
-  "app.appearance-settings.jump-back-into-worlds.description": {
-    "message": "Inkluderer de sidste verdener i afsnittet \"Hop tilbage\" på startsiden."
-  },
   "app.appearance-settings.jump-back-into-worlds.title": {
     "message": "Hop tilbage ind i verdener"
   },
-  "app.appearance-settings.minimize-launcher.description": {
-    "message": "Minimer launcheren når Minecraft starter."
-  },
   "app.appearance-settings.minimize-launcher.title": {
-    "message": "Minimer launcher"
-  },
-  "app.appearance-settings.show-play-time.description": {
-    "message": "Vis hvor meget tid du har brugt på at spille en instance."
+    "message": "Minimer app"
   },
   "app.appearance-settings.show-play-time.title": {
     "message": "Vis tid spillet"
   },
-  "app.appearance-settings.toggle-sidebar.description": {
-    "message": "Aktivere muligheden for at slå sidepanelet til og fra."
+  "app.appearance-settings.skip-non-essential-warnings.title": {
+    "message": "Spring ikke nødvendige advarseler over"
   },
   "app.appearance-settings.toggle-sidebar.title": {
-    "message": "Slå sidepanel til og fra"
-  },
-  "app.appearance-settings.unknown-pack-warning.description": {
-    "message": "Hvis du prøver at installere en Modrinth Pack fil (.mrpack) som ikke er hosted på Modrinth, så skal vi nok sikre os du forstår riskoen før du installere den."
+    "message": "Gem højre sidebar"
   },
   "app.appearance-settings.unknown-pack-warning.title": {
     "message": "Advar mig før jeg installere en ukendt modpacks"
@@ -266,9 +248,42 @@
   "app.install.phase.preparing_java.downloading": {
     "message": "Downloader Java {version}"
   },
+  "app.install.phase.preparing_java.fetching-metadata": {
+    "message": "Henter Java {version}"
+  },
+  "app.install.phase.preparing_java.resolving": {
+    "message": "Forbereder Java {version}"
+  },
   "app.instance.admonitions.shared-instance.added-label": {
     "message": "Tilføjet"
   },
+  "app.instance.admonitions.shared-instance.publish-button": {
+    "message": "Skub opdatering"
+  },
+  "app.instance.admonitions.shared-instance.publishing-button": {
+    "message": "Skubber..."
+  },
+  "app.instance.admonitions.shared-instance.removed-label": {
+    "message": "Fjernet"
+  },
+  "app.instance.admonitions.shared-instance.review-admonition-header": {
+    "message": "Skub opdatering"
+  },
+  "app.instance.admonitions.shared-instance.review-header": {
+    "message": "Gennemså ændringer"
+  },
+  "app.instance.admonitions.shared-instance.review-update-button": {
+    "message": "Gennemgå opdatering"
+  },
+  "app.instance.admonitions.shared-instance.reviewing-button": {
+    "message": "Gennemgår..."
+  },
+  "app.instance.admonitions.shared-instance.update-available-body": {
+    "message": "En opdatering er krævet for at spille {name}. Venligst opdater til den seneste version for at køre spillet."
+  },
+  "app.instance.admonitions.shared-instance.update-available-header": {
+    "message": "En opdatering er tilgængelig"
+  },
   "app.instance.confirm-delete.admonition-body": {
     "message": "Al' data for din instance vil blive permanent slettet, dette inkludere dine verdener, konfigurationer, og alt installeret indhold."
   },
@@ -299,6 +314,9 @@
   "app.instance.mods.content-type-project": {
     "message": "projekt"
   },
+  "app.instance.mods.locked-content": {
+    "message": "Indhold i låste instances kan ikke blive ændret."
+  },
   "app.instance.mods.project-was-added": {
     "message": "\"{name}\" blev tilføjet"
   },
@@ -314,6 +332,18 @@
   "app.instance.mods.successfully-uploaded": {
     "message": "Uploadet"
   },
+  "app.instance.share.empty.description": {
+    "message": "Du kan ændre denne instance med dine venner!"
+  },
+  "app.instance.share.empty.heading": {
+    "message": "Ingen venner inviteret"
+  },
+  "app.instance.share.empty.invite-friends-button": {
+    "message": "Inviter venner"
+  },
+  "app.instance.share.invite-modal.heading": {
+    "message": "Del {name}"
+  },
   "app.instance.share.locked.empty-description-suffix": {
     "message": "for at tilgå denne side."
   },
@@ -461,9 +491,6 @@
   "app.settings.tabs.appearance": {
     "message": "Udseende"
   },
-  "app.settings.tabs.default-instance-options": {
-    "message": "Standardindstillinger for instans"
-  },
   "app.settings.tabs.java-installations": {
     "message": "Javainstallationer"
   },
diff --git a/apps/app-frontend/src/locales/de-CH/index.json b/apps/app-frontend/src/locales/de-CH/index.json
index 4bed44d79a..485ddb3f38 100644
--- a/apps/app-frontend/src/locales/de-CH/index.json
+++ b/apps/app-frontend/src/locales/de-CH/index.json
@@ -15,7 +15,7 @@
     "message": "Kopiert"
   },
   "app.action-bar.install.copy-details": {
-    "message": "Kopier Details"
+    "message": "Details kopieren"
   },
   "app.action-bar.install.dismiss": {
     "message": "Ignorieren"
@@ -27,16 +27,16 @@
     "message": "Wiederholen"
   },
   "app.action-bar.install.summary.app-closing": {
-    "message": "Abbroche will app gschlosse worde isch"
+    "message": "Aufgrund von Schließung der App abgebrochen"
   },
   "app.action-bar.install.summary.bad-modpack-file": {
-    "message": "Modpack kud nöd glese werde"
+    "message": "Modpack konnte nicht gelesen werden"
   },
   "app.action-bar.install.summary.canceled": {
-    "message": "Abbroche"
+    "message": "Abgebrochen"
   },
   "app.action-bar.install.summary.cleanup-incomplete": {
-    "message": "Ufrume kunnti nöt beendet werde"
+    "message": "Bereinigung konnte nicht abgeschlossen werden"
   },
   "app.action-bar.install.summary.content-download-failed": {
     "message": "Dateien konnten nicht heruntergeladen werden"
@@ -144,19 +144,19 @@
     "message": "Deine Privatsphäre und wie Werbung Modrinth unterstützt"
   },
   "app.appearance-settings.advanced-rendering.description": {
-    "message": "Aktiviert erweiterte Rendering-Funktionen wie Unschärfeeffekte, welche ohne hardwarebeschleunigtes Rendering zu Leistungsproblemen führen können."
+    "message": "Visuelle Effekte wie Hintergrundunschärfe aktivieren. Ohne Hardwarebeschleunigung kann dies die Leistung beeinträchtigen."
   },
   "app.appearance-settings.advanced-rendering.title": {
     "message": "Erweitertes Rendering"
   },
   "app.appearance-settings.color-theme.description": {
-    "message": "Wähle dein bevorzugtes Farbschema für die Modrinth App."
+    "message": "Wähle das Farbschema der Modrinth App aus."
   },
   "app.appearance-settings.color-theme.title": {
     "message": "Farbschema"
   },
   "app.appearance-settings.default-landing-page.description": {
-    "message": "Ändere die Seite, die beim Öffnen des Launchers angezeigt wird."
+    "message": "Wähle die Seite, die beim Öffnen der Modrinth App erscheint."
   },
   "app.appearance-settings.default-landing-page.home": {
     "message": "Start"
@@ -168,49 +168,49 @@
     "message": "Standard-Startseite"
   },
   "app.appearance-settings.hide-nametag.description": {
-    "message": "Deaktiviert das Namensschild über deinem Spieler auf der Skin-Seite."
+    "message": "Verbirgt deinen Benutzernamen über der Spielervorschau auf der Skin-Auswahlseite."
   },
   "app.appearance-settings.hide-nametag.title": {
     "message": "Namensschild ausblenden"
   },
   "app.appearance-settings.jump-back-into-worlds.description": {
-    "message": "Enthält zuletzt gespielte Welten im Abschnitt „Direkt weiterspielen“ auf der Startseite."
+    "message": "Zeigt deine zuletzt gespielten Welten in der Sektion „Direkt in Welten weiterspielen“ auf der Startseite an."
   },
   "app.appearance-settings.jump-back-into-worlds.title": {
     "message": "Springe zurück in Welten"
   },
   "app.appearance-settings.minimize-launcher.description": {
-    "message": "Den Launcher minimieren, wenn ein Minecraft-Prozess gestartet wird."
+    "message": "Minimiere die Modrinth App, wenn Minecraft startet."
   },
   "app.appearance-settings.minimize-launcher.title": {
-    "message": "Launcher minimieren"
+    "message": "App minimieren"
   },
   "app.appearance-settings.native-decorations.description": {
-    "message": "Systemfensterrahmen verwenden (Neustart der App erforderlich)."
+    "message": "Nutzt die Titelleiste und Fenstersteuerung deines Betriebssystems. Erfordert einen App-Neustart."
   },
   "app.appearance-settings.native-decorations.title": {
-    "message": "Native Dekorationen"
+    "message": "System-Fensterrahmen"
   },
   "app.appearance-settings.show-play-time.description": {
-    "message": "Zeigt an, wie viel Zeit du mit dem Spielen einer Instanz verbracht hast."
+    "message": "Zeigt, wie lange du jede einzelne Instanz gespielt hast."
   },
   "app.appearance-settings.show-play-time.title": {
     "message": "Spielzeit anzeigen"
   },
   "app.appearance-settings.skip-non-essential-warnings.description": {
-    "message": "Bestätigungen mit geringem Risiko, wie z. B. die Installation doppelter Modpacks, das Löschen normaler Inhalte, Massenaktualisierungen, das Aufheben von Verknüpfungen zu Modpacks und Reparaturaufrufe, werden automatisch übersprungen. Gefährliche Warnungen werden weiterhin angezeigt."
+    "message": "Bestätigungen für risikoarme Aktionen überspringen (z. B. doppelte Installationen, normales Löschen, Massen-Updates, Entkoppeln und Reparieren). Warnungen für gefährliche Aktionen werden weiterhin angezeigt."
   },
   "app.appearance-settings.skip-non-essential-warnings.title": {
     "message": "Unwichtige Warnungen überspringen"
   },
   "app.appearance-settings.toggle-sidebar.description": {
-    "message": "Ermöglicht das Umschalten der Seitenleiste."
+    "message": "Blendet die rechte Seitenleiste standardmäßig aus und fügt einen Button zum Ein- oder Ausblenden hinzu."
   },
   "app.appearance-settings.toggle-sidebar.title": {
-    "message": "Seitenleiste umschalten"
+    "message": "Rechte Seitenleiste ausblenden"
   },
   "app.appearance-settings.unknown-pack-warning.description": {
-    "message": "Falls du versuchst, eine Modrinth-Pack-Datei (.mrpack) zu installieren, die nicht auf Modrinth gehostet wird, werden wir sicherstellen, dass du die Risiken vor der Installation verstehst."
+    "message": "Sicherheitswarnung vor der Installation eines Modrinth-Packs (.mrpack) anzeigen, das nicht auf Modrinth gehostet wird."
   },
   "app.appearance-settings.unknown-pack-warning.title": {
     "message": "Warne mich, bevor unbekannte Modpacks installiert werden"
@@ -221,6 +221,15 @@
   "app.auth-servers.unreachable.header": {
     "message": "Authentifizierungsserver sind nicht erreichbar"
   },
+  "app.behavior-settings.confirmations.title": {
+    "message": "Bestätigungen"
+  },
+  "app.behavior-settings.content.title": {
+    "message": "Startseite & Inhalte"
+  },
+  "app.behavior-settings.startup-and-navigation.title": {
+    "message": "Start & Navigation"
+  },
   "app.browse.add-servers-to-instance": {
     "message": "Server zu Instanz hinzufügen"
   },
@@ -242,12 +251,18 @@
   "app.browse.back-to-instance": {
     "message": "Zu Instanz zurückgehen"
   },
+  "app.browse.discover-project-type": {
+    "message": "{projectType} entdecken"
+  },
   "app.browse.discover-servers": {
     "message": "Server entdecken"
   },
   "app.browse.hide-added-servers": {
     "message": "Bereits hinzugefügte Server ausblenden"
   },
+  "app.browse.hide-installed-modpacks": {
+    "message": "Bereits installiert ausblenden"
+  },
   "app.browse.project-type.modpacks": {
     "message": "Modpacks"
   },
@@ -362,9 +377,18 @@
   "app.instance.admonitions.shared-instance.review-header": {
     "message": "Änderungen überprüfen"
   },
+  "app.instance.admonitions.shared-instance.review-update-button": {
+    "message": "Update überprüfen"
+  },
   "app.instance.admonitions.shared-instance.reviewing-button": {
     "message": "Wird überprüft..."
   },
+  "app.instance.admonitions.shared-instance.update-available-body": {
+    "message": "Ein Update ist erforderlich, um {name} zu spielen. Bitte aktualisiere auf die neueste Version, um das Spiel zu starten."
+  },
+  "app.instance.admonitions.shared-instance.update-available-header": {
+    "message": "Ein Update ist verfügbar"
+  },
   "app.instance.confirm-delete.admonition-body": {
     "message": "Alle Daten deiner Instanz werden permanent gelöscht, inlusive deiner Welten, Konfigurationen und allen installierten Inhalten."
   },
@@ -431,6 +455,9 @@
   "app.instance.share.invite-modal.heading": {
     "message": "{name} teilen"
   },
+  "app.instance.share.invite-modal.user-limit-reached": {
+    "message": "Diese Instanz hat das Nutzerlimit von {limit} erreicht."
+  },
   "app.instance.share.locked.empty-description-prefix": {
     "message": "Du musst dich als"
   },
@@ -449,6 +476,12 @@
   "app.instance.share.locked.wrong-account-heading": {
     "message": "Falsches Konto"
   },
+  "app.instance.share.members.empty": {
+    "message": "Es sind noch keine Benutzer beigetreten"
+  },
+  "app.instance.share.members.no-filter-results": {
+    "message": "Keine Benutzer passen zu deinen Filtern."
+  },
   "app.instance.share.remove-user-modal.effect-access": {
     "message": "Diese Person wird für diese geteilte Instanz keine Updates mehr erhalten"
   },
@@ -479,6 +512,12 @@
   "app.instance.share.sign-in.button": {
     "message": "Anmelden"
   },
+  "app.instance.share.unable-to-connect.description": {
+    "message": "Der Dienst für geteilte Instanzen ist derzeit nicht erreichbar; bitte versuche es später erneut"
+  },
+  "app.instance.share.unable-to-connect.heading": {
+    "message": "Verbindung nicht möglich"
+  },
   "app.instance.share.unlink.body": {
     "message": "Du musst die Verknüpfung zu diesem Modpack trennen, um deine Instanz zu teilen"
   },
@@ -566,12 +605,60 @@
   "app.instance.worlds.search-worlds-placeholder": {
     "message": "Durchsuche {count} Welten..."
   },
+  "app.java-detection.cancel": {
+    "message": "Abbrechen"
+  },
+  "app.java-detection.columns.actions": {
+    "message": "Aktionen"
+  },
+  "app.java-detection.columns.path": {
+    "message": "Pfad"
+  },
+  "app.java-detection.columns.version": {
+    "message": "Version"
+  },
+  "app.java-detection.no-installations-found": {
+    "message": "Keine Java Installationen gefunden."
+  },
+  "app.java-detection.select": {
+    "message": "Auswählen"
+  },
+  "app.java-detection.selected": {
+    "message": "Ausgewählt"
+  },
+  "app.java-detection.title": {
+    "message": "Java-Installation auswählen"
+  },
+  "app.java-selector.already-installed": {
+    "message": "Bereits installiert"
+  },
+  "app.java-selector.browse": {
+    "message": "Durchsuchen"
+  },
+  "app.java-selector.detect": {
+    "message": "Erkennen"
+  },
+  "app.java-selector.install-recommended": {
+    "message": "Empfohlenes installieren"
+  },
+  "app.java-selector.installing": {
+    "message": "Installiere..."
+  },
+  "app.java-selector.path.placeholder": {
+    "message": "/path/to/java"
+  },
+  "app.java-selector.test-installation": {
+    "message": "Java-Installation testen"
+  },
   "app.modal.install-to-play.additional-context": {
     "message": "Zusätzlicher Kontext"
   },
   "app.modal.install-to-play.additional-context-placeholder": {
     "message": "Füge gegebenenfalls relevante Links und Bilder hinzu"
   },
+  "app.modal.install-to-play.block-user": {
+    "message": "Benutzer blockieren"
+  },
   "app.modal.install-to-play.content-you-are-reporting": {
     "message": "Die Instanz, die du meldest"
   },
@@ -593,6 +680,9 @@
   "app.modal.install-to-play.invite-warning": {
     "message": "Diese Einladung wurde von einem anderen Modrinth-Nutzer erstellt, nicht von Modrinth. Nimm nur Einladungen von Personen an, denen du vertraust."
   },
+  "app.modal.install-to-play.invite-warning-with-creator": {
+    "message": "Diese Einladung wurde von <creator>{username}</creator> erstellt, nicht von Modrinth. Akzeptierte nur Einladungen von Leuten, denen du vertraust."
+  },
   "app.modal.install-to-play.mod-count": {
     "message": "{count, plural, one {# Mod} other {# Mods}}"
   },
@@ -650,6 +740,9 @@
   "app.modal.install-to-play.unrecognized-files": {
     "message": "Nicht erkannte Dateien"
   },
+  "app.modal.install-to-play.user-blocked": {
+    "message": "Benutzer blockiert"
+  },
   "app.modal.install-to-play.view-contents": {
     "message": "Inhalte ansehen"
   },
@@ -677,6 +770,36 @@
   "app.modal.update-to-play.update-required-description": {
     "message": "Zum Spielen von {name} ist eine Aktualisierung erforderlich. Bitte aktualisiere auf die neueste Version, um das Spiel zu starten."
   },
+  "app.nav.create-new-instance": {
+    "message": "Neue Instanz erstellen"
+  },
+  "app.nav.home": {
+    "message": "Startseite"
+  },
+  "app.nav.library": {
+    "message": "Bibliothek"
+  },
+  "app.nav.modrinth-account": {
+    "message": "Modrinth-Konto"
+  },
+  "app.nav.modrinth-hosting": {
+    "message": "Modrinth Hosting"
+  },
+  "app.nav.sign-in-to-modrinth-account": {
+    "message": "Bei einem Modrinth-Konto anmelden"
+  },
+  "app.nav.signed-in-as": {
+    "message": "Angemeldet als <user>{username}</user>"
+  },
+  "app.nav.upgrade-to-modrinth-plus": {
+    "message": "Auf Modrinth+ upgraden"
+  },
+  "app.news.title": {
+    "message": "Neuigkeiten"
+  },
+  "app.news.view-all": {
+    "message": "Alle Neuigkeiten anzeigen"
+  },
   "app.project.install-button.already-installed": {
     "message": "Dieses Projekt ist bereits installiert"
   },
@@ -686,6 +809,9 @@
   "app.project.install-context.back-to-browse": {
     "message": "Zurück zu Entdecken"
   },
+  "app.project.install-context.back-to-instance": {
+    "message": "Zurück zur Instanz"
+  },
   "app.project.version.all-versions": {
     "message": "Alle Versionen"
   },
@@ -698,20 +824,188 @@
   "app.project.versions.already-installed": {
     "message": "Bereits installiert"
   },
+  "app.quick-instance-switcher.drag-show-tooltip": {
+    "message": "Ziehen, um letzte Instanzen anzuzeigen"
+  },
+  "app.quick-instance-switcher.drag-tooltip": {
+    "message": "Ziehen zur Größenänderung"
+  },
+  "app.restarting": {
+    "message": "Wird neu gestartet..."
+  },
+  "app.settings.app-version": {
+    "message": "Modrinth App {version}"
+  },
+  "app.settings.default-instance-options.environment-variables.description": {
+    "message": "Umgebungsvariablen, die beim Starten einer Instanz gesetzt werden."
+  },
+  "app.settings.default-instance-options.environment-variables.placeholder": {
+    "message": "Umgebungsvariablen eingeben..."
+  },
+  "app.settings.default-instance-options.environment-variables.title": {
+    "message": "Umgebungsvariablen"
+  },
+  "app.settings.default-instance-options.fullscreen.description": {
+    "message": "Startet Instanzen im Vollbildmodus durch Aktualisieren ihrer options.txt-Datei."
+  },
+  "app.settings.default-instance-options.fullscreen.title": {
+    "message": "Vollbildschirm"
+  },
+  "app.settings.default-instance-options.height.description": {
+    "message": "Die Höhe des Spielfensters beim Starten"
+  },
+  "app.settings.default-instance-options.height.placeholder": {
+    "message": "Höhe eingeben..."
+  },
+  "app.settings.default-instance-options.height.title": {
+    "message": "Höhe"
+  },
+  "app.settings.default-instance-options.java-arguments.description": {
+    "message": "Argumente, die beim Starten einer Instanz an Java übergeben werden."
+  },
+  "app.settings.default-instance-options.java-arguments.placeholder": {
+    "message": "Java-Argumente eingeben..."
+  },
+  "app.settings.default-instance-options.java-arguments.title": {
+    "message": "Java-Argumente"
+  },
+  "app.settings.default-instance-options.memory-allocation.description": {
+    "message": "Maximal verfügbarer Arbeitsspeicher zu jeder Instanz."
+  },
+  "app.settings.default-instance-options.memory-allocation.title": {
+    "message": "Arbeitsspeicherzuweisung"
+  },
+  "app.settings.default-instance-options.post-exit-hook.description": {
+    "message": "Wird nach dem Beenden des Spiels ausgeführt."
+  },
+  "app.settings.default-instance-options.post-exit-hook.placeholder": {
+    "message": "Nach Spielbeendigung auszuführender Befehl eingeben..."
+  },
+  "app.settings.default-instance-options.post-exit-hook.title": {
+    "message": "Aktion nach Programmende"
+  },
+  "app.settings.default-instance-options.pre-launch-hook.description": {
+    "message": "Läuft bevor die Instanz startet."
+  },
+  "app.settings.default-instance-options.pre-launch-hook.placeholder": {
+    "message": "Vor Spielstart auszuführenden Befehl eingeben..."
+  },
+  "app.settings.default-instance-options.pre-launch-hook.title": {
+    "message": "Startaktion"
+  },
+  "app.settings.default-instance-options.width.description": {
+    "message": "Die Breite des Spielfensters beim Start."
+  },
+  "app.settings.default-instance-options.width.placeholder": {
+    "message": "Breite eingeben..."
+  },
+  "app.settings.default-instance-options.width.title": {
+    "message": "Breite"
+  },
+  "app.settings.default-instance-options.wrapper-hook.description": {
+    "message": "Wrapper-Befehl für den Minecraft-Startprozess."
+  },
+  "app.settings.default-instance-options.wrapper-hook.placeholder": {
+    "message": "Wrapperbefehl eingeben..."
+  },
+  "app.settings.default-instance-options.wrapper-hook.title": {
+    "message": "Wrapper-Hook"
+  },
+  "app.settings.developer-mode-button.label": {
+    "message": "Entwicklermodus umschalten"
+  },
   "app.settings.developer-mode-enabled": {
     "message": "Entwicklermodus aktiviert."
   },
   "app.settings.downloading": {
     "message": "Lade v{version} herunter"
   },
+  "app.settings.java-installations.location.title": {
+    "message": "Java {version, number} Installation"
+  },
+  "app.settings.operating-system.macos": {
+    "message": "macOS"
+  },
   "app.settings.privacy.ads-consent.intro": {
     "message": "Werbung ermöglicht Modrinth und finanziert die Auszahlungen an die Ersteller. Unsere Partner speichern möglicherweise Cookies in der App oder greifen auf diese zu, um Werbung zu personalisieren und die Leistung zu messen. Du kannst dies unten deaktivieren oder deine Einstellungen verwalten."
   },
+  "app.settings.privacy.discord-rich-presence.description": {
+    "message": "Zeige Modrinth App als deine aktuelle Aktivität auf Discord. Dies betrifft nicht Rich Presence die von Mods zu Instanzen hinzugefügt wird. Benötigt einen Neustart der App."
+  },
+  "app.settings.privacy.discord-rich-presence.title": {
+    "message": "Discord Rich Presence"
+  },
+  "app.settings.privacy.telemetry.description": {
+    "message": "Modrinth sammelt anonymisierte Analyse- und Nutzungsdaten, um unsere Nutzererfahrung zu verbessern und deine Erfahrung anzupassen. Wenn du diese Option deaktivierst, entscheidest du dich dagegen und deine Daten werden nicht mehr gesammelt."
+  },
+  "app.settings.privacy.telemetry.title": {
+    "message": "Telemetrie"
+  },
+  "app.settings.resource-management.always-show-copy-details.description": {
+    "message": "Zeigt die Aktion \"Details kopieren\" an, während eine Installation in der Warteschlange steht oder ausgeführt wird. Bei fehlgeschlagenen oder abgebrochenen Installationen ist sie immer verfügbar."
+  },
+  "app.settings.resource-management.always-show-copy-details.title": {
+    "message": "Immer Kopierdetails anzeigen"
+  },
+  "app.settings.resource-management.app-cache.confirm.description": {
+    "message": "Die App könnte langsamer laden, bis der Cache neu aufgebaut wurde."
+  },
+  "app.settings.resource-management.app-cache.confirm.title": {
+    "message": "App-Cache leeren?"
+  },
+  "app.settings.resource-management.app-cache.description": {
+    "message": "Gespeicherte Cache-Daten löschen und sie neu von Modrinth herunterladen. Die App könnte langsamer laden, bis der Cache neu aufgebaut wurde."
+  },
+  "app.settings.resource-management.app-cache.purge": {
+    "message": "Cache leeren"
+  },
+  "app.settings.resource-management.app-cache.title": {
+    "message": "App-Cache"
+  },
+  "app.settings.resource-management.app-database-backups.description": {
+    "message": "Backups von wichtigen App-Daten werden hier gespeichert, falls du sie später wiederherstellen musst."
+  },
+  "app.settings.resource-management.app-database-backups.open-folder": {
+    "message": "Backups Ordner öffnen"
+  },
+  "app.settings.resource-management.app-database-backups.title": {
+    "message": "App-Daten Backups"
+  },
+  "app.settings.resource-management.app-directory.browse": {
+    "message": "Nach einem App-Verzeichnis suchen"
+  },
+  "app.settings.resource-management.app-directory.description": {
+    "message": "Wo Modrinth App Instanzen und andere Dateien speichert. Änderungen werden nach dem Neustarten der App angewendet."
+  },
+  "app.settings.resource-management.app-directory.select": {
+    "message": "Neues App-Verzeichnis auswählen"
+  },
+  "app.settings.resource-management.app-directory.title": {
+    "message": "App Installation"
+  },
+  "app.settings.resource-management.maximum-concurrent-downloads.description": {
+    "message": "Anzahl der Dateien, die die App auf einmal herunterladen kann. Senke dies, wenn downloads auf deiner Verbindung unzuverlässig sind. Benötigt einen App-Neustart."
+  },
+  "app.settings.resource-management.maximum-concurrent-downloads.title": {
+    "message": "Maximale gleichzeitige Downloads"
+  },
+  "app.settings.resource-management.maximum-concurrent-writes.description": {
+    "message": "Wie viele Dateien die App auf einmal auf die Festplatte schreiben kann. Senke dies, wenn du oft I/O Fehler bekommst. Benötigt einen App-Neustart."
+  },
+  "app.settings.resource-management.maximum-concurrent-writes.title": {
+    "message": "Maximale gleichzeitige Schreibvorgänge"
+  },
+  "app.settings.sidebar.label.instances": {
+    "message": "Instanzen"
+  },
   "app.settings.tabs.appearance": {
     "message": "Erscheinungsbild"
   },
+  "app.settings.tabs.behavior": {
+    "message": "Verhalten"
+  },
   "app.settings.tabs.default-instance-options": {
-    "message": "Standard Instanz-Einstellungen"
+    "message": "Standard Spieleinstellungen"
   },
   "app.settings.tabs.java-installations": {
     "message": "Java Installationen"
@@ -725,6 +1019,9 @@
   "app.settings.tabs.resource-management": {
     "message": "Ressourcenmanagement"
   },
+  "app.sidebar.playing-as": {
+    "message": "Wird gespielt als"
+  },
   "app.skins.add-button": {
     "message": "Skin hinzufügen"
   },
@@ -884,6 +1181,21 @@
   "app.skins.toggle-ears-features-on": {
     "message": "Aktivieren"
   },
+  "app.survey.body": {
+    "message": "Könntest du ein paar Fragen über deine Erfahrung mit Modrinth App beantworten?"
+  },
+  "app.survey.footer": {
+    "message": "Das Feedback geht direkt an das Modrinth-Team und wird helfen, zukünftige Updates zu gestalten!"
+  },
+  "app.survey.no-thanks": {
+    "message": "Nein, danke"
+  },
+  "app.survey.take-survey": {
+    "message": "Beantworten"
+  },
+  "app.survey.title": {
+    "message": "Hey, Modrinth Nutzer!"
+  },
   "app.update-popup.body.download-complete": {
     "message": "Modrinth App v{version} wurde heruntergeladen. Lade die App neu um jetzt zu aktualisieren, oder automatisch nach dem schliessen der Modrinth App."
   },
@@ -1160,6 +1472,45 @@
   "instance.server-modal.resource-pack": {
     "message": "Ressourcenpaket"
   },
+  "instance.settings.sharing.active-invites.actions": {
+    "message": "Aktionen"
+  },
+  "instance.settings.sharing.active-invites.code": {
+    "message": "Einladungslink"
+  },
+  "instance.settings.sharing.active-invites.description": {
+    "message": "Jeder, der einen dieser Einladungslinks hat, kann beitreten, solange der Link aktiv ist."
+  },
+  "instance.settings.sharing.active-invites.empty": {
+    "message": "Es gibt keine aktiven Einladungen."
+  },
+  "instance.settings.sharing.active-invites.expires": {
+    "message": "Läuft ab"
+  },
+  "instance.settings.sharing.active-invites.revoke": {
+    "message": "Einladung zurückziehen"
+  },
+  "instance.settings.sharing.active-invites.revoke-with-code": {
+    "message": "Einladung {code} zurückziehen"
+  },
+  "instance.settings.sharing.active-invites.title": {
+    "message": "Aktive Einladungen"
+  },
+  "instance.settings.sharing.active-invites.uses": {
+    "message": "Nutzungen"
+  },
+  "instance.settings.sharing.revoke-invite.admonition-body": {
+    "message": "Der Einladungslink <monospace>{code}</monospace> wird sofort aufhören zu funktionieren. Nutzer, die bereits beigetreten sind, bleibt der Zugang gewährt."
+  },
+  "instance.settings.sharing.revoke-invite.admonition-header": {
+    "message": "Diese Aktion kann nicht rückgängig gemacht werden"
+  },
+  "instance.settings.sharing.revoke-invite.confirm": {
+    "message": "Einladung zurückziehen"
+  },
+  "instance.settings.sharing.revoke-invite.header": {
+    "message": "Einladung zurückziehen"
+  },
   "instance.settings.tabs.general": {
     "message": "Allgemein"
   },
@@ -1361,6 +1712,12 @@
   "instance.shared-instance.error.title": {
     "message": "Etwas ist schiefgelaufen"
   },
+  "instance.shared-instance.network-error.text": {
+    "message": "Verbindung zur Shared-Instances-API nicht möglich"
+  },
+  "instance.shared-instance.network-error.title": {
+    "message": "Netzwerkfehler"
+  },
   "instance.shared-instance.owner-tooltip": {
     "message": "Der Inhalt dieser Instanz wird mit anderen Benutzern geteilt."
   },
@@ -1552,5 +1909,11 @@
   },
   "search.filter.locked.server-loader.title": {
     "message": "Loader wird vom Server bereitgestellt"
+  },
+  "settings.sidebar.label.account": {
+    "message": "Konto"
+  },
+  "settings.sidebar.label.display": {
+    "message": "Anzeige"
   }
 }
diff --git a/apps/app-frontend/src/locales/de-DE/index.json b/apps/app-frontend/src/locales/de-DE/index.json
index 6d0c8a3172..3be909f0f0 100644
--- a/apps/app-frontend/src/locales/de-DE/index.json
+++ b/apps/app-frontend/src/locales/de-DE/index.json
@@ -144,19 +144,19 @@
     "message": "Deine Privatsphäre und wie Werbung Modrinth unterstützt"
   },
   "app.appearance-settings.advanced-rendering.description": {
-    "message": "Aktiviert erweiterte Rendering-Funktionen wie Unschärfe-Effekte, welche ohne Hardware-beschleunigtes Rendering zu Leistungsproblemen führen können."
+    "message": "Visuelle Effekte wie Hintergrundunschärfe aktivieren. Ohne Hardwarebeschleunigung kann dies die Leistung beeinträchtigen."
   },
   "app.appearance-settings.advanced-rendering.title": {
     "message": "Erweitertes Rendering"
   },
   "app.appearance-settings.color-theme.description": {
-    "message": "Wähle dein bevorzugtes Farbschema für die Modrinth App."
+    "message": "Wähle das Farbschema der Modrinth App aus."
   },
   "app.appearance-settings.color-theme.title": {
     "message": "Farbschema"
   },
   "app.appearance-settings.default-landing-page.description": {
-    "message": "Ändere die Seite, die beim Öffnen des Launchers angezeigt wird."
+    "message": "Wähle die Seite, die beim Öffnen der Modrinth App erscheint."
   },
   "app.appearance-settings.default-landing-page.home": {
     "message": "Start"
@@ -168,49 +168,49 @@
     "message": "Standard-Startseite"
   },
   "app.appearance-settings.hide-nametag.description": {
-    "message": "Deaktiviert das Namensschild über deinem Spieler auf der Skin-Seite."
+    "message": "Verbirgt deinen Benutzernamen über der Spielervorschau auf der Skin-Auswahlseite."
   },
   "app.appearance-settings.hide-nametag.title": {
     "message": "Namensschild ausblenden"
   },
   "app.appearance-settings.jump-back-into-worlds.description": {
-    "message": "Enthält zuletzt gespielte Welten im Abschnitt „Direkt weiterspielen“ auf der Startseite."
+    "message": "Zeigt deine zuletzt gespielten Welten in der Sektion „Direkt in Welten weiterspielen“ auf der Startseite an."
   },
   "app.appearance-settings.jump-back-into-worlds.title": {
     "message": "Direkt in Welten weiterspielen"
   },
   "app.appearance-settings.minimize-launcher.description": {
-    "message": "Den Launcher minimieren, wenn ein Minecraft-Prozess gestartet wird."
+    "message": "Minimiere die Modrinth App, wenn Minecraft startet."
   },
   "app.appearance-settings.minimize-launcher.title": {
-    "message": "Launcher minimieren"
+    "message": "App minimieren"
   },
   "app.appearance-settings.native-decorations.description": {
-    "message": "Fensterrahmen des Systems verwenden (Neustart der App erforderlich)."
+    "message": "Nutzt die Titelleiste und Fenstersteuerung deines Betriebssystems. Erfordert einen App-Neustart."
   },
   "app.appearance-settings.native-decorations.title": {
-    "message": "Native Dekorationen"
+    "message": "System-Fensterrahmen"
   },
   "app.appearance-settings.show-play-time.description": {
-    "message": "Zeigt an, wie viel Zeit du damit verbracht hast, eine Instanz zu spielen."
+    "message": "Zeigt, wie lange du jede einzelne Instanz gespielt hast."
   },
   "app.appearance-settings.show-play-time.title": {
     "message": "Spielzeit anzeigen"
   },
   "app.appearance-settings.skip-non-essential-warnings.description": {
-    "message": "Bestätigungen mit geringem Risiko, wie z. B. die Installation doppelter Modpacks, das Löschen normaler Inhalte, Massenaktualisierungen, das Aufheben von Verknüpfungen zu Modpacks und Reparaturaufrufe, werden automatisch übersprungen. Gefährliche Warnungen werden weiterhin angezeigt."
+    "message": "Bestätigungen für risikoarme Aktionen überspringen (z. B. doppelte Installationen, normales Löschen, Massen-Updates, Entkoppeln und Reparieren). Warnungen für gefährliche Aktionen werden weiterhin angezeigt."
   },
   "app.appearance-settings.skip-non-essential-warnings.title": {
     "message": "Unwichtige Warnungen überspringen"
   },
   "app.appearance-settings.toggle-sidebar.description": {
-    "message": "Ermöglicht das Umschalten der Seitenleiste."
+    "message": "Blendet die rechte Seitenleiste standardmäßig aus und fügt einen Button zum Ein- oder Ausblenden hinzu."
   },
   "app.appearance-settings.toggle-sidebar.title": {
-    "message": "Seitenleiste umschalten"
+    "message": "Rechte Seitenleiste ausblenden"
   },
   "app.appearance-settings.unknown-pack-warning.description": {
-    "message": "Falls du versuchst, eine Modrinth-Pack-Datei (.mrpack) zu installieren, die nicht auf Modrinth gehostet wird, werden die Risiken vor der Installation bekannt gegeben."
+    "message": "Sicherheitswarnung vor der Installation eines Modrinth-Packs (.mrpack) anzeigen, das nicht auf Modrinth gehostet wird."
   },
   "app.appearance-settings.unknown-pack-warning.title": {
     "message": "Warne mich, bevor unbekannte Modpacks installiert werden"
@@ -221,6 +221,15 @@
   "app.auth-servers.unreachable.header": {
     "message": "Authentifizierungsserver sind nicht erreichbar"
   },
+  "app.behavior-settings.confirmations.title": {
+    "message": "Bestätigungen"
+  },
+  "app.behavior-settings.content.title": {
+    "message": "Startseite & Inhalte"
+  },
+  "app.behavior-settings.startup-and-navigation.title": {
+    "message": "Start & Navigation"
+  },
   "app.browse.add-servers-to-instance": {
     "message": "Server zur Instanz hinzufügen"
   },
@@ -242,12 +251,18 @@
   "app.browse.back-to-instance": {
     "message": "Zurück zur Instanz"
   },
+  "app.browse.discover-project-type": {
+    "message": "{projectType} entdecken"
+  },
   "app.browse.discover-servers": {
     "message": "Server entdecken"
   },
   "app.browse.hide-added-servers": {
     "message": "Bereits hinzugefügte Server ausblenden"
   },
+  "app.browse.hide-installed-modpacks": {
+    "message": "Bereits installiert ausblenden"
+  },
   "app.browse.project-type.modpacks": {
     "message": "Modpacks"
   },
@@ -362,9 +377,18 @@
   "app.instance.admonitions.shared-instance.review-header": {
     "message": "Änderungen überprüfen"
   },
+  "app.instance.admonitions.shared-instance.review-update-button": {
+    "message": "Update überprüfen"
+  },
   "app.instance.admonitions.shared-instance.reviewing-button": {
     "message": "Wird überprüft..."
   },
+  "app.instance.admonitions.shared-instance.update-available-body": {
+    "message": "Ein Update ist erforderlich, um {name} zu spielen. Bitte aktualisiere auf die neueste Version, um das Spiel zu starten."
+  },
+  "app.instance.admonitions.shared-instance.update-available-header": {
+    "message": "Ein Update ist verfügbar"
+  },
   "app.instance.confirm-delete.admonition-body": {
     "message": "Alle Daten deiner Instanz werden permanent gelöscht, einschließlich deiner Welten, Konfigurationen und allen installierten Inhalten."
   },
@@ -431,6 +455,9 @@
   "app.instance.share.invite-modal.heading": {
     "message": "{name} teilen"
   },
+  "app.instance.share.invite-modal.user-limit-reached": {
+    "message": "Diese Instanz hat das Nutzerlimit von {limit} erreicht."
+  },
   "app.instance.share.locked.empty-description-prefix": {
     "message": "Du musst dich als"
   },
@@ -449,6 +476,12 @@
   "app.instance.share.locked.wrong-account-heading": {
     "message": "Falsches Konto"
   },
+  "app.instance.share.members.empty": {
+    "message": "Es sind noch keine Benutzer beigetreten"
+  },
+  "app.instance.share.members.no-filter-results": {
+    "message": "Keine Benutzer passen zu deinen Filtern."
+  },
   "app.instance.share.remove-user-modal.effect-access": {
     "message": "Diese Person wird für diese geteilte Instanz keine Updates mehr erhalten"
   },
@@ -479,6 +512,12 @@
   "app.instance.share.sign-in.button": {
     "message": "Anmelden"
   },
+  "app.instance.share.unable-to-connect.description": {
+    "message": "Der Dienst für geteilte Instanzen ist derzeit nicht erreichbar; bitte versuche es später erneut"
+  },
+  "app.instance.share.unable-to-connect.heading": {
+    "message": "Verbindung nicht möglich"
+  },
   "app.instance.share.unlink.body": {
     "message": "Du musst die Verknüpfung zu diesem Modpack trennen, um deine Instanz zu teilen"
   },
@@ -566,12 +605,60 @@
   "app.instance.worlds.search-worlds-placeholder": {
     "message": "Durchsuche {count} Welten..."
   },
+  "app.java-detection.cancel": {
+    "message": "Abbrechen"
+  },
+  "app.java-detection.columns.actions": {
+    "message": "Aktionen"
+  },
+  "app.java-detection.columns.path": {
+    "message": "Pfad"
+  },
+  "app.java-detection.columns.version": {
+    "message": "Version"
+  },
+  "app.java-detection.no-installations-found": {
+    "message": "Keine Java Installationen gefunden."
+  },
+  "app.java-detection.select": {
+    "message": "Auswählen"
+  },
+  "app.java-detection.selected": {
+    "message": "Ausgewählt"
+  },
+  "app.java-detection.title": {
+    "message": "Java-Installation auswählen"
+  },
+  "app.java-selector.already-installed": {
+    "message": "Bereits installiert"
+  },
+  "app.java-selector.browse": {
+    "message": "Durchsuchen"
+  },
+  "app.java-selector.detect": {
+    "message": "Erkennen"
+  },
+  "app.java-selector.install-recommended": {
+    "message": "Empfohlenes installieren"
+  },
+  "app.java-selector.installing": {
+    "message": "Installiere..."
+  },
+  "app.java-selector.path.placeholder": {
+    "message": "/path/to/java"
+  },
+  "app.java-selector.test-installation": {
+    "message": "Java-Installation testen"
+  },
   "app.modal.install-to-play.additional-context": {
     "message": "Zusätzlicher Kontext"
   },
   "app.modal.install-to-play.additional-context-placeholder": {
     "message": "Füge gegebenenfalls relevante Links und Bilder hinzu"
   },
+  "app.modal.install-to-play.block-user": {
+    "message": "Benutzer blockieren"
+  },
   "app.modal.install-to-play.content-you-are-reporting": {
     "message": "Die Instanz, die du meldest"
   },
@@ -593,6 +680,9 @@
   "app.modal.install-to-play.invite-warning": {
     "message": "Diese Einladung wurde von einem anderen Modrinth-Nutzer erstellt, nicht von Modrinth. Nimm nur Einladungen von Personen an, denen du vertraust."
   },
+  "app.modal.install-to-play.invite-warning-with-creator": {
+    "message": "Diese Einladung wurde von <creator>{username}</creator> erstellt, nicht von Modrinth. Akzeptierte nur Einladungen von Leuten, denen du vertraust."
+  },
   "app.modal.install-to-play.mod-count": {
     "message": "{count, plural, one {# Mod} other {# Mods}}"
   },
@@ -650,6 +740,9 @@
   "app.modal.install-to-play.unrecognized-files": {
     "message": "Nicht erkannte Dateien"
   },
+  "app.modal.install-to-play.user-blocked": {
+    "message": "Benutzer blockiert"
+  },
   "app.modal.install-to-play.view-contents": {
     "message": "Inhalte ansehen"
   },
@@ -677,6 +770,36 @@
   "app.modal.update-to-play.update-required-description": {
     "message": "Zum Spielen von {name} ist eine Aktualisierung erforderlich. Bitte aktualisiere auf die neueste Version, um das Spiel zu starten."
   },
+  "app.nav.create-new-instance": {
+    "message": "Neue Instanz erstellen"
+  },
+  "app.nav.home": {
+    "message": "Startseite"
+  },
+  "app.nav.library": {
+    "message": "Bibliothek"
+  },
+  "app.nav.modrinth-account": {
+    "message": "Modrinth-Konto"
+  },
+  "app.nav.modrinth-hosting": {
+    "message": "Modrinth Hosting"
+  },
+  "app.nav.sign-in-to-modrinth-account": {
+    "message": "Bei einem Modrinth-Konto anmelden"
+  },
+  "app.nav.signed-in-as": {
+    "message": "Angemeldet als <user>{username}</user>"
+  },
+  "app.nav.upgrade-to-modrinth-plus": {
+    "message": "Auf Modrinth+ upgraden"
+  },
+  "app.news.title": {
+    "message": "Neuigkeiten"
+  },
+  "app.news.view-all": {
+    "message": "Alle Neuigkeiten anzeigen"
+  },
   "app.project.install-button.already-installed": {
     "message": "Dieses Projekt ist bereits installiert"
   },
@@ -686,6 +809,9 @@
   "app.project.install-context.back-to-browse": {
     "message": "Zurück zum Entdecken"
   },
+  "app.project.install-context.back-to-instance": {
+    "message": "Zurück zur Instanz"
+  },
   "app.project.version.all-versions": {
     "message": "Alle Versionen"
   },
@@ -698,20 +824,188 @@
   "app.project.versions.already-installed": {
     "message": "Bereits installiert"
   },
+  "app.quick-instance-switcher.drag-show-tooltip": {
+    "message": "Ziehen, um letzte Instanzen anzuzeigen"
+  },
+  "app.quick-instance-switcher.drag-tooltip": {
+    "message": "Ziehen zur Größenänderung"
+  },
+  "app.restarting": {
+    "message": "Wird neu gestartet..."
+  },
+  "app.settings.app-version": {
+    "message": "Modrinth App {version}"
+  },
+  "app.settings.default-instance-options.environment-variables.description": {
+    "message": "Umgebungsvariablen, die beim Starten einer Instanz gesetzt werden."
+  },
+  "app.settings.default-instance-options.environment-variables.placeholder": {
+    "message": "Umgebungsvariablen eingeben..."
+  },
+  "app.settings.default-instance-options.environment-variables.title": {
+    "message": "Umgebungsvariablen"
+  },
+  "app.settings.default-instance-options.fullscreen.description": {
+    "message": "Startet Instanzen im Vollbildmodus durch Aktualisieren ihrer options.txt-Datei."
+  },
+  "app.settings.default-instance-options.fullscreen.title": {
+    "message": "Vollbildschirm"
+  },
+  "app.settings.default-instance-options.height.description": {
+    "message": "Die Höhe des Spielfensters beim Starten"
+  },
+  "app.settings.default-instance-options.height.placeholder": {
+    "message": "Höhe eingeben..."
+  },
+  "app.settings.default-instance-options.height.title": {
+    "message": "Höhe"
+  },
+  "app.settings.default-instance-options.java-arguments.description": {
+    "message": "Argumente, die beim Starten einer Instanz an Java übergeben werden."
+  },
+  "app.settings.default-instance-options.java-arguments.placeholder": {
+    "message": "Java-Argumente eingeben..."
+  },
+  "app.settings.default-instance-options.java-arguments.title": {
+    "message": "Java-Argumente"
+  },
+  "app.settings.default-instance-options.memory-allocation.description": {
+    "message": "Maximal verfügbarer Arbeitsspeicher zu jeder Instanz."
+  },
+  "app.settings.default-instance-options.memory-allocation.title": {
+    "message": "Arbeitsspeicherzuweisung"
+  },
+  "app.settings.default-instance-options.post-exit-hook.description": {
+    "message": "Wird nach dem Beenden des Spiels ausgeführt."
+  },
+  "app.settings.default-instance-options.post-exit-hook.placeholder": {
+    "message": "Nach Spielbeendigung auszuführender Befehl eingeben..."
+  },
+  "app.settings.default-instance-options.post-exit-hook.title": {
+    "message": "Aktion nach Programmende"
+  },
+  "app.settings.default-instance-options.pre-launch-hook.description": {
+    "message": "Läuft bevor die Instanz startet."
+  },
+  "app.settings.default-instance-options.pre-launch-hook.placeholder": {
+    "message": "Vor Spielstart auszuführenden Befehl eingeben..."
+  },
+  "app.settings.default-instance-options.pre-launch-hook.title": {
+    "message": "Startaktion"
+  },
+  "app.settings.default-instance-options.width.description": {
+    "message": "Die Breite des Spielfensters beim Start."
+  },
+  "app.settings.default-instance-options.width.placeholder": {
+    "message": "Breite eingeben..."
+  },
+  "app.settings.default-instance-options.width.title": {
+    "message": "Breite"
+  },
+  "app.settings.default-instance-options.wrapper-hook.description": {
+    "message": "Wrapper-Befehl für den Minecraft-Startprozess."
+  },
+  "app.settings.default-instance-options.wrapper-hook.placeholder": {
+    "message": "Wrapperbefehl eingeben..."
+  },
+  "app.settings.default-instance-options.wrapper-hook.title": {
+    "message": "Wrapper-Hook"
+  },
+  "app.settings.developer-mode-button.label": {
+    "message": "Entwicklermodus umschalten"
+  },
   "app.settings.developer-mode-enabled": {
     "message": "Entwicklermodus aktiviert."
   },
   "app.settings.downloading": {
     "message": "Lade v{version} herunter"
   },
+  "app.settings.java-installations.location.title": {
+    "message": "Java {version, number} Installation"
+  },
+  "app.settings.operating-system.macos": {
+    "message": "macOS"
+  },
   "app.settings.privacy.ads-consent.intro": {
     "message": "Werbung ermöglicht Modrinth und finanziert die Auszahlungen an die Ersteller. Unsere Partner speichern möglicherweise Cookies in der App oder greifen auf diese zu, um Werbung zu personalisieren und die Leistung zu messen. Du kannst dies unten deaktivieren oder deine Einstellungen verwalten."
   },
+  "app.settings.privacy.discord-rich-presence.description": {
+    "message": "Zeige Modrinth App als deine aktuelle Aktivität auf Discord. Dies betrifft nicht Rich Presence die von Mods zu Instanzen hinzugefügt wird. Benötigt einen Neustart der App."
+  },
+  "app.settings.privacy.discord-rich-presence.title": {
+    "message": "Discord Rich Presence"
+  },
+  "app.settings.privacy.telemetry.description": {
+    "message": "Modrinth sammelt anonymisierte Analyse- und Nutzungsdaten, um unsere Nutzererfahrung zu verbessern und deine Erfahrung anzupassen. Wenn du diese Option deaktivierst, entscheidest du dich dagegen und deine Daten werden nicht mehr gesammelt."
+  },
+  "app.settings.privacy.telemetry.title": {
+    "message": "Telemetrie"
+  },
+  "app.settings.resource-management.always-show-copy-details.description": {
+    "message": "Zeigt die Aktion \"Details kopieren\" an, während eine Installation in der Warteschlange steht oder ausgeführt wird. Bei fehlgeschlagenen oder abgebrochenen Installationen ist sie immer verfügbar."
+  },
+  "app.settings.resource-management.always-show-copy-details.title": {
+    "message": "Immer Kopierdetails anzeigen"
+  },
+  "app.settings.resource-management.app-cache.confirm.description": {
+    "message": "Die App könnte langsamer laden, bis der Cache neu aufgebaut wurde."
+  },
+  "app.settings.resource-management.app-cache.confirm.title": {
+    "message": "App-Cache leeren?"
+  },
+  "app.settings.resource-management.app-cache.description": {
+    "message": "Gespeicherte Cache-Daten löschen und sie neu von Modrinth herunterladen. Die App könnte langsamer laden, bis der Cache neu aufgebaut wurde."
+  },
+  "app.settings.resource-management.app-cache.purge": {
+    "message": "Cache leeren"
+  },
+  "app.settings.resource-management.app-cache.title": {
+    "message": "App-Cache"
+  },
+  "app.settings.resource-management.app-database-backups.description": {
+    "message": "Backups von wichtigen App-Daten werden hier gespeichert, falls du sie später wiederherstellen musst."
+  },
+  "app.settings.resource-management.app-database-backups.open-folder": {
+    "message": "Backups Ordner öffnen"
+  },
+  "app.settings.resource-management.app-database-backups.title": {
+    "message": "App-Daten Backups"
+  },
+  "app.settings.resource-management.app-directory.browse": {
+    "message": "Nach einem App-Verzeichnis suchen"
+  },
+  "app.settings.resource-management.app-directory.description": {
+    "message": "Wo Modrinth App Instanzen und andere Dateien speichert. Änderungen werden nach dem Neustarten der App angewendet."
+  },
+  "app.settings.resource-management.app-directory.select": {
+    "message": "Neues App-Verzeichnis auswählen"
+  },
+  "app.settings.resource-management.app-directory.title": {
+    "message": "App Installation"
+  },
+  "app.settings.resource-management.maximum-concurrent-downloads.description": {
+    "message": "Anzahl der Dateien, die die App auf einmal herunterladen kann. Senke dies, wenn downloads auf deiner Verbindung unzuverlässig sind. Benötigt einen App-Neustart."
+  },
+  "app.settings.resource-management.maximum-concurrent-downloads.title": {
+    "message": "Maximale gleichzeitige Downloads"
+  },
+  "app.settings.resource-management.maximum-concurrent-writes.description": {
+    "message": "Wie viele Dateien die App auf einmal auf die Festplatte schreiben kann. Senke dies, wenn du oft I/O Fehler bekommst. Benötigt einen App-Neustart."
+  },
+  "app.settings.resource-management.maximum-concurrent-writes.title": {
+    "message": "Maximale gleichzeitige Schreibvorgänge"
+  },
+  "app.settings.sidebar.label.instances": {
+    "message": "Instanzen"
+  },
   "app.settings.tabs.appearance": {
     "message": "Erscheinungsbild"
   },
+  "app.settings.tabs.behavior": {
+    "message": "Verhalten"
+  },
   "app.settings.tabs.default-instance-options": {
-    "message": "Standard Instanz-Einstellungen"
+    "message": "Standard Spieleinstellungen"
   },
   "app.settings.tabs.java-installations": {
     "message": "Java-Installationen"
@@ -725,6 +1019,9 @@
   "app.settings.tabs.resource-management": {
     "message": "Ressourcenmanagement"
   },
+  "app.sidebar.playing-as": {
+    "message": "Wird gespielt als"
+  },
   "app.skins.add-button": {
     "message": "Skin hinzufügen"
   },
@@ -884,6 +1181,21 @@
   "app.skins.toggle-ears-features-on": {
     "message": "Aktivieren"
   },
+  "app.survey.body": {
+    "message": "Könntest du ein paar Fragen über deine Erfahrung mit Modrinth App beantworten?"
+  },
+  "app.survey.footer": {
+    "message": "Das Feedback geht direkt an das Modrinth-Team und wird helfen, zukünftige Updates zu gestalten!"
+  },
+  "app.survey.no-thanks": {
+    "message": "Nein, danke"
+  },
+  "app.survey.take-survey": {
+    "message": "Beantworten"
+  },
+  "app.survey.title": {
+    "message": "Hey, Modrinth Nutzer!"
+  },
   "app.update-popup.body.download-complete": {
     "message": "Modrinth App v{version} wurde heruntergeladen. Jetzt neu laden, um sofort zu aktualisieren, oder beim Schließen der Modrinth-App automatisch aktualisieren."
   },
@@ -1160,6 +1472,45 @@
   "instance.server-modal.resource-pack": {
     "message": "Ressourcenpaket"
   },
+  "instance.settings.sharing.active-invites.actions": {
+    "message": "Aktionen"
+  },
+  "instance.settings.sharing.active-invites.code": {
+    "message": "Einladungslink"
+  },
+  "instance.settings.sharing.active-invites.description": {
+    "message": "Jeder, der einen dieser Einladungslinks hat, kann beitreten, solange der Link aktiv ist."
+  },
+  "instance.settings.sharing.active-invites.empty": {
+    "message": "Es gibt keine aktiven Einladungen."
+  },
+  "instance.settings.sharing.active-invites.expires": {
+    "message": "Läuft ab"
+  },
+  "instance.settings.sharing.active-invites.revoke": {
+    "message": "Einladung zurückziehen"
+  },
+  "instance.settings.sharing.active-invites.revoke-with-code": {
+    "message": "Einladung {code} zurückziehen"
+  },
+  "instance.settings.sharing.active-invites.title": {
+    "message": "Aktive Einladungen"
+  },
+  "instance.settings.sharing.active-invites.uses": {
+    "message": "Nutzungen"
+  },
+  "instance.settings.sharing.revoke-invite.admonition-body": {
+    "message": "Der Einladungslink <monospace>{code}</monospace> wird sofort aufhören zu funktionieren. Nutzer, die bereits beigetreten sind, bleibt der Zugang gewährt."
+  },
+  "instance.settings.sharing.revoke-invite.admonition-header": {
+    "message": "Diese Aktion kann nicht rückgängig gemacht werden"
+  },
+  "instance.settings.sharing.revoke-invite.confirm": {
+    "message": "Einladung zurückziehen"
+  },
+  "instance.settings.sharing.revoke-invite.header": {
+    "message": "Einladung zurückziehen"
+  },
   "instance.settings.tabs.general": {
     "message": "Allgemein"
   },
@@ -1361,6 +1712,12 @@
   "instance.shared-instance.error.title": {
     "message": "Etwas ist schiefgelaufen"
   },
+  "instance.shared-instance.network-error.text": {
+    "message": "Verbindung zur Shared-Instances-API nicht möglich"
+  },
+  "instance.shared-instance.network-error.title": {
+    "message": "Netzwerkfehler"
+  },
   "instance.shared-instance.owner-tooltip": {
     "message": "Der Inhalt dieser Instanz wird mit anderen Benutzern geteilt."
   },
@@ -1552,5 +1909,11 @@
   },
   "search.filter.locked.server-loader.title": {
     "message": "Loader vom Server vorgegeben"
+  },
+  "settings.sidebar.label.account": {
+    "message": "Konto"
+  },
+  "settings.sidebar.label.display": {
+    "message": "Anzeige"
   }
 }
diff --git a/apps/app-frontend/src/locales/es-419/index.json b/apps/app-frontend/src/locales/es-419/index.json
index 8b3527f336..caf734abfe 100644
--- a/apps/app-frontend/src/locales/es-419/index.json
+++ b/apps/app-frontend/src/locales/es-419/index.json
@@ -89,6 +89,9 @@
   "app.action-bar.install.unknown-instance": {
     "message": "Instancia desconocida"
   },
+  "app.action-bar.install.updating-shared-content": {
+    "message": "Actualizando el contenido compartido"
+  },
   "app.action-bar.installs": {
     "message": "Instalaciones"
   },
@@ -125,20 +128,35 @@
   "app.action-bar.view-logs": {
     "message": "Ver registros"
   },
+  "app.ads-consent.accept": {
+    "message": "Aceptar todas"
+  },
+  "app.ads-consent.body": {
+    "message": "Los anuncios hacen posible a Modrinth y financian los pagos a los creadores. Nuestros socios pueden guardar o acceder a cookies en la aplicación para personalizar anuncios y medir su rendimiento."
+  },
+  "app.ads-consent.manage": {
+    "message": "Gestionar preferencias"
+  },
+  "app.ads-consent.reject": {
+    "message": "Rechazar todas"
+  },
+  "app.ads-consent.title": {
+    "message": "Tu privacidad y como los anuncios apoyan a Modrinth"
+  },
   "app.appearance-settings.advanced-rendering.description": {
-    "message": "Activa el renderizado avanzado, como los efectos de desenfoque, que pueden afectar el rendimiento sin aceleración por hardware."
+    "message": "Activar efectos visuales como los efectos de desenfoque. Esto puede reducir el rendimiento si no tienes aceleración de hardware."
   },
   "app.appearance-settings.advanced-rendering.title": {
     "message": "Renderizado avanzado"
   },
   "app.appearance-settings.color-theme.description": {
-    "message": "Selecciona el tema de color que prefieras para la Modrinth App."
+    "message": "Escoge el esquema de colores usado por la aplicación de Modrinth."
   },
   "app.appearance-settings.color-theme.title": {
     "message": "Color de la interfaz"
   },
   "app.appearance-settings.default-landing-page.description": {
-    "message": "Cambia la página en la que se abre el launcher."
+    "message": "Escoge la página mostrada al abrir la aplicación de Modrinth."
   },
   "app.appearance-settings.default-landing-page.home": {
     "message": "Inicio"
@@ -150,49 +168,49 @@
     "message": "Página de inicio predeterminada"
   },
   "app.appearance-settings.hide-nametag.description": {
-    "message": "Desactiva la etiqueta de nombre arriba de tu personaje en la página de skins."
+    "message": "Esconde tu nombre de usuario encima de tu personaje en la página del selector de Skin."
   },
   "app.appearance-settings.hide-nametag.title": {
     "message": "Ocultar etiqueta de nombre"
   },
   "app.appearance-settings.jump-back-into-worlds.description": {
-    "message": "Incluye los mundos recientes en la sección \"Volver a jugar\" de la página de inicio."
+    "message": "Muestra los mundos recientes en la sección \"Volver a jugar\" en la página principal."
   },
   "app.appearance-settings.jump-back-into-worlds.title": {
     "message": "Volver a jugar mundos"
   },
   "app.appearance-settings.minimize-launcher.description": {
-    "message": "Minimiza el launcher al iniciar un proceso de Minecraft."
+    "message": "Minimiza la app de Modrinth al iniciar Minecraft."
   },
   "app.appearance-settings.minimize-launcher.title": {
-    "message": "Minimizar launcher"
+    "message": "Minimizar app"
   },
   "app.appearance-settings.native-decorations.description": {
-    "message": "Usar el borde de ventana del sistema (requiere reiniciar la aplicación)."
+    "message": "Usa el borde de ventana de tu sistema. Requiere reiniciar la aplicación."
   },
   "app.appearance-settings.native-decorations.title": {
     "message": "Decoraciones nativas"
   },
   "app.appearance-settings.show-play-time.description": {
-    "message": "Muestra cuánto tiempo has estado jugando en una instancia."
+    "message": "Muestra cuanto tiempo has jugado en cada instancia."
   },
   "app.appearance-settings.show-play-time.title": {
     "message": "Mostrar tiempo de juego"
   },
   "app.appearance-settings.skip-non-essential-warnings.description": {
-    "message": "Omite automáticamente las confirmaciones de bajo riesgo, como las instalaciones duplicadas de paquetes de mods, la eliminación de contenido normal, las actualizaciones masivas, la desvinculación de paquetes de mods y las solicitudes de reparación. Las advertencias peligrosas seguirán mostrándose."
+    "message": "Omite las confirmaciones para acciones de bajo riesgo como las instalaciones duplicadas de paquetes de mods, la eliminación de contenido normal, las actualizaciones masivas, la desvinculación de paquetes de mods y las solicitudes de reparación. Las advertencias de acciones peligrosas siempre se mostrarán."
   },
   "app.appearance-settings.skip-non-essential-warnings.title": {
     "message": "Omitir advertencias que no sean esenciales"
   },
   "app.appearance-settings.toggle-sidebar.description": {
-    "message": "Permite mostrar u ocultar la barra lateral."
+    "message": "Añade un botón para mostrar y esconder la barra lateral."
   },
   "app.appearance-settings.toggle-sidebar.title": {
     "message": "Mostrar u ocultar la barra lateral"
   },
   "app.appearance-settings.unknown-pack-warning.description": {
-    "message": "Si intentas instalar un paquete de Modrinth (.mrpack) que no está alojado en Modrinth, te explicaremos los riesgos antes de instalarlo."
+    "message": "Muestra una advertencia antes de instalar un Modrinth Pack (.mrpack) que no provenga de los servidores de Modrinth."
   },
   "app.appearance-settings.unknown-pack-warning.title": {
     "message": "Advertir antes de instalar modpacks desconocidos"
@@ -203,6 +221,15 @@
   "app.auth-servers.unreachable.header": {
     "message": "No se puede acceder a los servidores de autenticación"
   },
+  "app.behavior-settings.confirmations.title": {
+    "message": "Confirmaciones"
+  },
+  "app.behavior-settings.content.title": {
+    "message": "Página principal y contenido"
+  },
+  "app.behavior-settings.startup-and-navigation.title": {
+    "message": "Inicio y navegación"
+  },
   "app.browse.add-servers-to-instance": {
     "message": "Añadiendo servidor a instancia"
   },
@@ -224,12 +251,18 @@
   "app.browse.back-to-instance": {
     "message": "Volver a instancia"
   },
+  "app.browse.discover-project-type": {
+    "message": "Descubrir {projectType}"
+  },
   "app.browse.discover-servers": {
     "message": "Descubrir servidores"
   },
   "app.browse.hide-added-servers": {
     "message": "Ocultar los servidores ya agregados"
   },
+  "app.browse.hide-installed-modpacks": {
+    "message": "Esconder los ya instalados"
+  },
   "app.browse.project-type.modpacks": {
     "message": "Modpacks"
   },
@@ -317,6 +350,45 @@
   "app.install.phase.running_loader_processors": {
     "message": "Ejecutando los procesadores del cargador"
   },
+  "app.instance.admonitions.shared-instance.added-label": {
+    "message": "Añadido"
+  },
+  "app.instance.admonitions.shared-instance.changes-body": {
+    "message": "Tu instancia local tiene cambios nuevos que todavía no se han compartido."
+  },
+  "app.instance.admonitions.shared-instance.changes-header": {
+    "message": "Tus cambios todavía no se han compartido"
+  },
+  "app.instance.admonitions.shared-instance.publish-button": {
+    "message": "Enviar actualización"
+  },
+  "app.instance.admonitions.shared-instance.publishing-button": {
+    "message": "Enviando..."
+  },
+  "app.instance.admonitions.shared-instance.removed-label": {
+    "message": "Eliminado"
+  },
+  "app.instance.admonitions.shared-instance.review-admonition-header": {
+    "message": "Enviar actualización"
+  },
+  "app.instance.admonitions.shared-instance.review-description": {
+    "message": "Revisar los cambios de contenido que se compartirán con los usuarios de esta instancia."
+  },
+  "app.instance.admonitions.shared-instance.review-header": {
+    "message": "Revisar cambios"
+  },
+  "app.instance.admonitions.shared-instance.review-update-button": {
+    "message": "Actualizar"
+  },
+  "app.instance.admonitions.shared-instance.reviewing-button": {
+    "message": "Actualizando..."
+  },
+  "app.instance.admonitions.shared-instance.update-available-body": {
+    "message": "Se requiere una actualización para jugar a {name}. por favor actualiza a la versión más reciente para abrir el juego."
+  },
+  "app.instance.admonitions.shared-instance.update-available-header": {
+    "message": "Hay una actualización disponible"
+  },
   "app.instance.confirm-delete.admonition-body": {
     "message": "Todos los datos de tu instancia se eliminarán permanentemente, incluidos tus mundos, configuraciones y todo el contenido instalado."
   },
@@ -353,6 +425,9 @@
   "app.instance.mods.content-type-project": {
     "message": "proyecto"
   },
+  "app.instance.mods.locked-content": {
+    "message": "El contenido en instancias bloqueadas no se puede cambiar."
+  },
   "app.instance.mods.project-was-added": {
     "message": "Se añadió \"{name}\""
   },
@@ -368,6 +443,117 @@
   "app.instance.mods.successfully-uploaded": {
     "message": "Cargado correctamente"
   },
+  "app.instance.share.empty.description": {
+    "message": "¡Comparte esta instancia con tus amigos!"
+  },
+  "app.instance.share.empty.heading": {
+    "message": "No hay amigos invitados"
+  },
+  "app.instance.share.empty.invite-friends-button": {
+    "message": "Invitar amigos"
+  },
+  "app.instance.share.invite-modal.heading": {
+    "message": "Compartir {name}"
+  },
+  "app.instance.share.invite-modal.user-limit-reached": {
+    "message": "Esta instancia ha llegado al límite de {limit} usuarios."
+  },
+  "app.instance.share.locked.empty-description-prefix": {
+    "message": "Necesitas iniciar sesión como"
+  },
+  "app.instance.share.locked.empty-description-suffix": {
+    "message": "para acceder a esta página."
+  },
+  "app.instance.share.locked.linked-account-fallback": {
+    "message": "la cuenta vinculada"
+  },
+  "app.instance.share.locked.signed-out-heading": {
+    "message": "No estás registrado"
+  },
+  "app.instance.share.locked.switch-account-button": {
+    "message": "Cambiar de cuenta"
+  },
+  "app.instance.share.locked.wrong-account-heading": {
+    "message": "Cuenta equivocada"
+  },
+  "app.instance.share.members.empty": {
+    "message": "Nadie se ha unido todavía"
+  },
+  "app.instance.share.members.no-filter-results": {
+    "message": "Ningún usuario coincide con tus filtros."
+  },
+  "app.instance.share.remove-user-modal.effect-access": {
+    "message": "Ya no recibirán actualizaciones para esta instancia compartida"
+  },
+  "app.instance.share.remove-user-modal.effect-installed-copy": {
+    "message": "Cualquier copia que tengan instalada se quedará en su dispositivo"
+  },
+  "app.instance.share.remove-user-modal.effect-invite-again": {
+    "message": "Los puedes volver a invitar más adelante"
+  },
+  "app.instance.share.remove-user-modal.effect-last-user": {
+    "message": "Este es el último usuario, se desactivará el compartir para esta instancia"
+  },
+  "app.instance.share.remove-user-modal.effects-label": {
+    "message": "¿Qué pasará?"
+  },
+  "app.instance.share.remove-user-modal.header": {
+    "message": "Revocar acceso"
+  },
+  "app.instance.share.remove-user-modal.remove-button": {
+    "message": "Revocar acceso"
+  },
+  "app.instance.share.remove-user-modal.user-avatar-alt": {
+    "message": "Avatar de {username}"
+  },
+  "app.instance.share.remove-user-modal.warning-body": {
+    "message": "Si revocas el acceso de {username} a esta instancia, tendrás que invitarlos otra vez para que sigan recibiendo actualizaciones."
+  },
+  "app.instance.share.sign-in.button": {
+    "message": "Iniciar sesión"
+  },
+  "app.instance.share.unable-to-connect.description": {
+    "message": "El servicio de instancias compartidas no está disponible, inténtalo otra vez más tarde"
+  },
+  "app.instance.share.unable-to-connect.heading": {
+    "message": "No se puede conectar"
+  },
+  "app.instance.share.unlink.body": {
+    "message": "Debes desvincular este modpack para compartir tu instancia"
+  },
+  "app.instance.share.unlink.header": {
+    "message": "Compartir requiere desvincular"
+  },
+  "app.instance.shared-instance-already-installed.body": {
+    "message": "Esta instancia compartida ya está instalada como <bold>{instanceName}</bold>. ¿Estás seguro que quieres instalar otra copia?"
+  },
+  "app.instance.shared-instance-already-installed.header": {
+    "message": "Instancia compartida ya instalada"
+  },
+  "app.instance.shared-instance-already-installed.install-anyway": {
+    "message": "Instalar de todas formas"
+  },
+  "app.instance.shared-instance-already-installed.instance": {
+    "message": "Instancia"
+  },
+  "app.instance.shared-instance-wrong-account.fallback-username": {
+    "message": "la cuenta vinculada"
+  },
+  "app.instance.shared-instance-wrong-account.owner-admonition-body-v2": {
+    "message": "para gestionar esta instancia compartida. No podrás enviar actualizaciones a los usuarios."
+  },
+  "app.instance.shared-instance-wrong-account.sign-in-as-label": {
+    "message": "Inicia sesión con"
+  },
+  "app.instance.shared-instance-wrong-account.signed-out-header": {
+    "message": "Debes iniciar sesión en Modrinth"
+  },
+  "app.instance.shared-instance-wrong-account.user-admonition-body-v2": {
+    "message": "para recibir actualizaciones de esta instancia compartida."
+  },
+  "app.instance.shared-instance-wrong-account.warning-header": {
+    "message": "Estás usando la cuenta equivocada"
+  },
   "app.instance.worlds.add-server": {
     "message": "Añadir servidor"
   },
@@ -411,7 +597,7 @@
     "message": "Eliminar servidor"
   },
   "app.instance.worlds.remove-server-modal.warning-body": {
-    "message": "Este servidor se eliminará de tu lista de servidores y de la lista de servidores del juego. Puedes volver a agregarlo más adelante si conoces la dirección."
+    "message": "Este servidor se eliminará de tu lista de servidores y de la lista de servidores del juego. Puedes volver a añadirlo más adelante si conoces la dirección."
   },
   "app.instance.worlds.remove-server-modal.warning-header": {
     "message": "Se está eliminando {name}"
@@ -419,6 +605,69 @@
   "app.instance.worlds.search-worlds-placeholder": {
     "message": "Buscar en {count} mundos..."
   },
+  "app.java-detection.cancel": {
+    "message": "Cancelar"
+  },
+  "app.java-detection.columns.actions": {
+    "message": "Acciones"
+  },
+  "app.java-detection.columns.path": {
+    "message": "Directorio"
+  },
+  "app.java-detection.columns.version": {
+    "message": "Versión"
+  },
+  "app.java-detection.no-installations-found": {
+    "message": "No se encontraron instalaciones de Java."
+  },
+  "app.java-detection.select": {
+    "message": "Seleccionar"
+  },
+  "app.java-detection.selected": {
+    "message": "Seleccionado"
+  },
+  "app.java-detection.title": {
+    "message": "Seleccionar instalación de Java"
+  },
+  "app.java-selector.already-installed": {
+    "message": "Ya está instalado"
+  },
+  "app.java-selector.browse": {
+    "message": "Buscar"
+  },
+  "app.java-selector.detect": {
+    "message": "Detectar"
+  },
+  "app.java-selector.install-recommended": {
+    "message": "Instalar recomendado"
+  },
+  "app.java-selector.installing": {
+    "message": "Instalando..."
+  },
+  "app.java-selector.path.placeholder": {
+    "message": "/ruta/a/java"
+  },
+  "app.java-selector.test-installation": {
+    "message": "Probar instalación de Java"
+  },
+  "app.modal.install-to-play.additional-context": {
+    "message": "Contexto adicional"
+  },
+  "app.modal.install-to-play.additional-context-placeholder": {
+    "message": "En lo posible, incluye links e imágenes (si son relevantes)"
+  },
+  "app.modal.install-to-play.block-user": {
+    "message": "Bloquear usuario"
+  },
+  "app.modal.install-to-play.content-you-are-reporting": {
+    "message": "Instancia que estás reportando"
+  },
+  "app.modal.install-to-play.delete-instance": {
+    "message": "Borrar instancia"
+  },
+  "app.modal.install-to-play.external-files-dont-install": {
+    "message": "No instalar"
+  },
   "app.modal.install-to-play.header": {
     "message": "Instalar para jugar"
   },
@@ -431,15 +680,54 @@
   "app.modal.install-to-play.invite-warning": {
     "message": "Esta invitación la creó otro usuario de Modrinth, no Modrinth. Solo acepta invitaciones de personas en las que confíes."
   },
+  "app.modal.install-to-play.invite-warning-with-creator": {
+    "message": "Esta invitación fue creada por <creator>{username}</creator>, no por Modrinth. Nunca aceptes invitaciones de gente que no conozcas."
+  },
   "app.modal.install-to-play.mod-count": {
     "message": "{count, plural, one {# mod} other {# mods}}"
   },
+  "app.modal.install-to-play.report-description": {
+    "message": "Usa este formulario para reportar instancias que violen nuestras <rules-link>Reglas</rules-link> o <terms-link>Terminos de Uso</terms-link>."
+  },
+  "app.modal.install-to-play.report-image-invalid-type": {
+    "message": "El archivo no tiene una extensión de imagen aceptada"
+  },
+  "app.modal.install-to-play.report-image-too-large": {
+    "message": "El archivo excede el límite de 1 MiB"
+  },
+  "app.modal.install-to-play.report-legal-claims": {
+    "message": "Para avisos de DMCA u otros reclamos legales, consulte nuestra <copyright-link>Política de Derechos de Autor</copyright-link>."
+  },
+  "app.modal.install-to-play.report-reason": {
+    "message": "¿Qué regla rompe esta instancia?"
+  },
+  "app.modal.install-to-play.report-reason.inappropriate": {
+    "message": "Inapropiado"
+  },
+  "app.modal.install-to-play.report-reason.malicious": {
+    "message": "Malicioso"
+  },
+  "app.modal.install-to-play.report-reason.spam": {
+    "message": "Spam"
+  },
+  "app.modal.install-to-play.report-shared-instance-header": {
+    "message": "Reportar instancia compartida"
+  },
+  "app.modal.install-to-play.report-submitted": {
+    "message": "Reporte enviado"
+  },
+  "app.modal.install-to-play.report-support-and-bugs": {
+    "message": "Para solicitudes de ayuda, contacte a nuestro <support-link>equipo de soporte</support-link>. Para reportar un bug, abra una <github-link>incidencia (issue) en GitHub</github-link>."
+  },
   "app.modal.install-to-play.reviewed-files": {
     "message": "Un archivo solo se revisa si se publica en Modrinth, sin importar su formato (incluido el .mrpack)."
   },
   "app.modal.install-to-play.shared-instance": {
     "message": "Instancia compartida"
   },
+  "app.modal.install-to-play.shared-instance-content": {
+    "message": "Contenido de la instancia compartida"
+  },
   "app.modal.install-to-play.unknown-files-description": {
     "message": "Este modpack para servidor contiene archivos que no están publicados en Modrinth. Recomendamos encarecidamente instalar únicamente archivos de fuentes de confianza."
   },
@@ -458,6 +746,9 @@
   "app.modal.update-to-play.removed": {
     "message": "Eliminado"
   },
+  "app.nav.signed-in-as": {
+    "message": "Sesión iniciada como <user>{username}</user>"
+  },
   "app.project.install-button.already-installed": {
     "message": "Este proyecto ya está instalado"
   },
@@ -485,11 +776,23 @@
   "app.settings.downloading": {
     "message": "Descargando v{version}"
   },
+  "app.settings.privacy.discord-rich-presence.title": {
+    "message": "Discord Rich Presence"
+  },
+  "app.settings.privacy.telemetry.title": {
+    "message": "Telemetría"
+  },
+  "app.settings.resource-management.app-directory.title": {
+    "message": "Directorio de la aplicación"
+  },
+  "app.settings.sidebar.label.instances": {
+    "message": "Instancias"
+  },
   "app.settings.tabs.appearance": {
     "message": "Apariencia"
   },
-  "app.settings.tabs.default-instance-options": {
-    "message": "Opciones predeterminadas de la instancia"
+  "app.settings.tabs.behavior": {
+    "message": "Comportamiento"
   },
   "app.settings.tabs.java-installations": {
     "message": "Instalaciones de Java"
@@ -503,6 +806,9 @@
   "app.settings.tabs.resource-management": {
     "message": "Gestión de recursos"
   },
+  "app.sidebar.playing-as": {
+    "message": "Jugando como"
+  },
   "app.skins.add-button": {
     "message": "Añadir skin"
   },
@@ -527,6 +833,9 @@
   "app.skins.dropped-file-error.title": {
     "message": "Error al procesar el archivo"
   },
+  "app.skins.ears-feature-notice": {
+    "message": "Esta skin usa características de el mod {ears}"
+  },
   "app.skins.edit-button": {
     "message": "Editar skin"
   },
@@ -653,6 +962,21 @@
   "app.skins.title": {
     "message": "Selector de skin"
   },
+  "app.skins.toggle-ears-features-off": {
+    "message": "Desactivar"
+  },
+  "app.skins.toggle-ears-features-on": {
+    "message": "Activar"
+  },
+  "app.survey.footer": {
+    "message": "¡Tus comentarios llegarán directamente al equipo de Modrinth, y los ayudará a hacer mejores actualizaciones!"
+  },
+  "app.survey.no-thanks": {
+    "message": "No gracias"
+  },
+  "app.survey.title": {
+    "message": "¡Hola, usuario de Modrinth!"
+  },
   "app.update-popup.body.download-complete": {
     "message": "La descarga de la Modrinth App v{version} ha finalizado. Actualiza ahora o automáticamente al cerrar la Modrinth App."
   },
@@ -701,6 +1025,18 @@
   "app.world.world-item.players-online": {
     "message": "{count} en línea"
   },
+  "content.shared-instance.delete-button": {
+    "message": "Borrar de todas formas"
+  },
+  "content.shared-instance.delete-many-button": {
+    "message": "Borrar {count, number} proyectos de todas formas"
+  },
+  "content.shared-instance.disable-button": {
+    "message": "Desactivar de todas formas"
+  },
+  "content.shared-instance.disable-many-button": {
+    "message": "Desactivar {count, number} proyectos de todas formas"
+  },
   "friends.action.add-friend": {
     "message": "Añadir un amigo"
   },
@@ -764,6 +1100,15 @@
   "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.action.settings": {
+    "message": "Ajustes de la instancia"
+  },
+  "instance.action.starting": {
+    "message": "Iniciando..."
+  },
+  "instance.action.stopping": {
+    "message": "Deteniendo..."
+  },
   "instance.add-server.add-and-play": {
     "message": "Añadir y jugar"
   },
@@ -806,6 +1151,15 @@
   "instance.files.save-as": {
     "message": "Guardar como..."
   },
+  "instance.locked.delete-button": {
+    "message": "Borrar instancia"
+  },
+  "instance.locked.play-tooltip": {
+    "message": "Esta instancia ha sido bloqueada"
+  },
+  "instance.playtime.never-played": {
+    "message": "No se ha jugado"
+  },
   "instance.server-modal.address": {
     "message": "Dirección IP"
   },
@@ -818,6 +1172,36 @@
   "instance.server-modal.resource-pack": {
     "message": "Paquete de recursos"
   },
+  "instance.settings.sharing.active-invites.actions": {
+    "message": "Acciones"
+  },
+  "instance.settings.sharing.active-invites.code": {
+    "message": "Link de invitación"
+  },
+  "instance.settings.sharing.active-invites.expires": {
+    "message": "Expira"
+  },
+  "instance.settings.sharing.active-invites.revoke": {
+    "message": "Revocar invitación"
+  },
+  "instance.settings.sharing.active-invites.revoke-with-code": {
+    "message": "Revocar invitación {code}"
+  },
+  "instance.settings.sharing.active-invites.title": {
+    "message": "Invitaciones activas"
+  },
+  "instance.settings.sharing.active-invites.uses": {
+    "message": "Usos"
+  },
+  "instance.settings.sharing.revoke-invite.admonition-header": {
+    "message": "Esta acción no se puede deshacer"
+  },
+  "instance.settings.sharing.revoke-invite.confirm": {
+    "message": "Revocar invitación"
+  },
+  "instance.settings.sharing.revoke-invite.header": {
+    "message": "Revocar invitación"
+  },
   "instance.settings.tabs.general": {
     "message": "General"
   },
@@ -876,10 +1260,10 @@
     "message": "Canal de actualizaciones"
   },
   "instance.settings.tabs.general.update-channel.alpha": {
-    "message": "Alpha"
+    "message": "Alfa"
   },
   "instance.settings.tabs.general.update-channel.alpha.description": {
-    "message": "Las versiones estables, beta y alpha se mostrarán como actualizaciones disponibles. "
+    "message": "Las versiones estables, beta y alpha se mostrarán como actualizaciones disponibles."
   },
   "instance.settings.tabs.general.update-channel.beta": {
     "message": "Beta"
@@ -1010,6 +1394,15 @@
   "instance.settings.tabs.window.width.enter": {
     "message": "Ingresa el ancho..."
   },
+  "instance.shared-instance.network-error.title": {
+    "message": "Error de conexión"
+  },
+  "instance.shared-instance.publish-review.added-label": {
+    "message": "Se añadió"
+  },
+  "instance.shared-instance.publish-review.removed-label": {
+    "message": "Se removió"
+  },
   "instance.worlds.a_minecraft_server": {
     "message": "Un servidor de Minecraft"
   },
@@ -1073,6 +1466,39 @@
   "minecraft-account.sign-in": {
     "message": "Inicia sesión en Minecraft"
   },
+  "minecraft-required.dont-have-account": {
+    "message": "¿No tienes una cuenta?"
+  },
+  "minecraft-required.get-minecraft": {
+    "message": "Compra Minecraft"
+  },
+  "minecraft-required.get-support": {
+    "message": "Conseguir soporte"
+  },
+  "minecraft-required.header": {
+    "message": "Minecraft requerido"
+  },
+  "minecraft-required.sign-in": {
+    "message": "Iniciar sesión con Microsoft"
+  },
+  "modal.modrinth-account-required.cancel-button": {
+    "message": "Cancelar"
+  },
+  "modal.modrinth-account-required.header": {
+    "message": "Cuenta requerida"
+  },
+  "modal.modrinth-account-required.sign-in-button": {
+    "message": "Iniciar sesión en Modrinth"
+  },
+  "modal.modrinth-account-required.sign-in-heading": {
+    "message": "Iniciar sesión con una cuenta de Modrinth"
+  },
+  "modal.modrinth-account-required.signing-in-header": {
+    "message": "Iniciando sesión"
+  },
+  "modal.modrinth-account-required.support-prompt": {
+    "message": "¿Tienes problemas con al iniciar sesión? <support>Consigue ayuda</support>"
+  },
   "search.filter.locked.instance": {
     "message": "Proporcionado por la instancia"
   },
@@ -1096,5 +1522,11 @@
   },
   "search.filter.locked.server-loader.title": {
     "message": "El loader es proporcionado por el servidor"
+  },
+  "settings.sidebar.label.account": {
+    "message": "Cuenta"
+  },
+  "settings.sidebar.label.display": {
+    "message": "Visualización"
   }
 }
diff --git a/apps/app-frontend/src/locales/es-ES/index.json b/apps/app-frontend/src/locales/es-ES/index.json
index c548ba5d14..1c586d8109 100644
--- a/apps/app-frontend/src/locales/es-ES/index.json
+++ b/apps/app-frontend/src/locales/es-ES/index.json
@@ -11,6 +11,12 @@
   "app.action-bar.hide-more-running-instances": {
     "message": "Ocultar más instancias en ejecución"
   },
+  "app.action-bar.install.copied-details": {
+    "message": "Copiado"
+  },
+  "app.action-bar.install.copy-details": {
+    "message": "Copiar detalles"
+  },
   "app.action-bar.install.dismiss": {
     "message": "Descartar"
   },
@@ -20,6 +26,21 @@
   "app.action-bar.install.retry": {
     "message": "Reintentar"
   },
+  "app.action-bar.install.summary.app-closing": {
+    "message": "Cancelado por cierre de la aplicación"
+  },
+  "app.action-bar.install.summary.bad-modpack-file": {
+    "message": "No se pudo leer el modpack"
+  },
+  "app.action-bar.install.summary.could-not-save-files": {
+    "message": "No se pudieron guardar los archivos"
+  },
+  "app.action-bar.install.summary.download-failed": {
+    "message": "La descarga no pudo terminar"
+  },
+  "app.action-bar.install.summary.instance-not-found": {
+    "message": "La instancia no se pudo encontrar"
+  },
   "app.action-bar.install.unknown-instance": {
     "message": "Instancia desconocida"
   },
@@ -59,21 +80,12 @@
   "app.action-bar.view-logs": {
     "message": "Ver registros"
   },
-  "app.appearance-settings.advanced-rendering.description": {
-    "message": "Habilita el renderizado avanzado, como los efectos de desenfoque, que pueden causar problemas de rendimiento sin renderizado acelerado por hardware."
-  },
   "app.appearance-settings.advanced-rendering.title": {
     "message": "Renderizado avanzado"
   },
-  "app.appearance-settings.color-theme.description": {
-    "message": "Selecciona tu tema de color preferido para la Modrinth App."
-  },
   "app.appearance-settings.color-theme.title": {
     "message": "Tema de color"
   },
-  "app.appearance-settings.default-landing-page.description": {
-    "message": "Cambia la página en la que el launcher inicia."
-  },
   "app.appearance-settings.default-landing-page.home": {
     "message": "Inicio"
   },
@@ -83,51 +95,18 @@
   "app.appearance-settings.default-landing-page.title": {
     "message": "Página de inicio predeterminada"
   },
-  "app.appearance-settings.hide-nametag.description": {
-    "message": "Desactiva la etiqueta arriba de tu personaje en la página de skins."
-  },
   "app.appearance-settings.hide-nametag.title": {
     "message": "Ocultar etiqueta de nombre"
   },
-  "app.appearance-settings.jump-back-into-worlds.description": {
-    "message": "Incluye los mundos recientes en la sección \"Volver a jugar\" de la página de inicio."
-  },
   "app.appearance-settings.jump-back-into-worlds.title": {
     "message": "Volver a jugar en tus mundos"
   },
-  "app.appearance-settings.minimize-launcher.description": {
-    "message": "Minimiza el lanzador cuando se inicia un proceso de Minecraft."
-  },
-  "app.appearance-settings.minimize-launcher.title": {
-    "message": "Minimizar lanzador"
-  },
-  "app.appearance-settings.native-decorations.description": {
-    "message": "Usa el marco de ventana del sistema (requiere reiniciar la aplicación)."
-  },
-  "app.appearance-settings.native-decorations.title": {
-    "message": "Decoraciones nativas"
-  },
-  "app.appearance-settings.show-play-time.description": {
-    "message": "Muestra cuánto tiempo has estado jugando en una instancia."
-  },
   "app.appearance-settings.show-play-time.title": {
     "message": "Mostrar tiempo de juego"
   },
-  "app.appearance-settings.skip-non-essential-warnings.description": {
-    "message": "Automáticamente omite confirmaciones de bajo riesgo como modpacks duplicados, eliminación de contenido normal, actualizaciones masivas, desvinculando modpacks, y mensajes de reparación. Advertencias importantes seguirán siendo mostradas."
-  },
   "app.appearance-settings.skip-non-essential-warnings.title": {
     "message": "Omitir advertencias no esenciales"
   },
-  "app.appearance-settings.toggle-sidebar.description": {
-    "message": "Activa la posibilidad de alternar la barra lateral."
-  },
-  "app.appearance-settings.toggle-sidebar.title": {
-    "message": "Alternar barra lateral"
-  },
-  "app.appearance-settings.unknown-pack-warning.description": {
-    "message": "Si intentas instalar un archivo de paquete de Modrinth (.mrpack) que no esté alojado en Modrinth, debes comprender los riesgos que esto conlleva antes de instalarlo."
-  },
   "app.appearance-settings.unknown-pack-warning.title": {
     "message": "Adviérteme antes de instalarme modpacks desconocidos"
   },
@@ -183,7 +162,7 @@
     "message": "Exportar modpack"
   },
   "app.export-modal.modpack-name-label": {
-    "message": "Nombre del modpack"
+    "message": "Nombre del Conjunto de modificadores"
   },
   "app.export-modal.modpack-name-placeholder": {
     "message": "Nombre del modpack"
@@ -296,9 +275,6 @@
   "app.settings.tabs.appearance": {
     "message": "Apariencia"
   },
-  "app.settings.tabs.default-instance-options": {
-    "message": "Opciones predeterminadas de la instancia"
-  },
   "app.settings.tabs.java-installations": {
     "message": "Instalaciones de Java"
   },
diff --git a/apps/app-frontend/src/locales/fi-FI/index.json b/apps/app-frontend/src/locales/fi-FI/index.json
index dd8bc83469..9a6032d950 100644
--- a/apps/app-frontend/src/locales/fi-FI/index.json
+++ b/apps/app-frontend/src/locales/fi-FI/index.json
@@ -71,21 +71,12 @@
   "app.action-bar.view-logs": {
     "message": "Katso lokeja"
   },
-  "app.appearance-settings.advanced-rendering.description": {
-    "message": "Mahdollistaa edistyneen renderöinnin, kuten sumennus efektit, jotka voivat aiheuttaa suorituskykyongelmia ilman laitteistokiihdytettyä renderöintiä."
-  },
   "app.appearance-settings.advanced-rendering.title": {
     "message": "Edistynyt renderointi"
   },
-  "app.appearance-settings.color-theme.description": {
-    "message": "Valitse haluamasi väriteema Modrinth Appille."
-  },
   "app.appearance-settings.color-theme.title": {
     "message": "Väriteema"
   },
-  "app.appearance-settings.default-landing-page.description": {
-    "message": "Muuta sivua mille laukaisin avautuu."
-  },
   "app.appearance-settings.default-landing-page.home": {
     "message": "Koti"
   },
@@ -95,51 +86,18 @@
   "app.appearance-settings.default-landing-page.title": {
     "message": "Oletus laskeutumissivu"
   },
-  "app.appearance-settings.hide-nametag.description": {
-    "message": "Kytkee pois päältä nimikyltin pelaajasi päällä skinit sivulla."
-  },
   "app.appearance-settings.hide-nametag.title": {
     "message": "Piilota nimikyltti"
   },
-  "app.appearance-settings.jump-back-into-worlds.description": {
-    "message": "Sisällyttää viimeaikaiset maailmat \"Hyppää takaisin sisään\" osiossa Koti sivulla."
-  },
   "app.appearance-settings.jump-back-into-worlds.title": {
     "message": "Hyppää takaisin sisään maailmoihin"
   },
-  "app.appearance-settings.minimize-launcher.description": {
-    "message": "Pienennä laukaisin kun Minecraft prosessi käynnistyy."
-  },
-  "app.appearance-settings.minimize-launcher.title": {
-    "message": "Piilota käynnistysohjelma"
-  },
-  "app.appearance-settings.native-decorations.description": {
-    "message": "Käytä järjestelmän ikkuna kehystä (Vaatii sovelluksen uudelleen käynnistämisen)."
-  },
-  "app.appearance-settings.native-decorations.title": {
-    "message": "Natiivit koristukset"
-  },
-  "app.appearance-settings.show-play-time.description": {
-    "message": "Näyttää, kuinka paljon aikaa olet käyttänyt instanssin pelaamiseen."
-  },
   "app.appearance-settings.show-play-time.title": {
     "message": "Näyttää peliaika"
   },
-  "app.appearance-settings.skip-non-essential-warnings.description": {
-    "message": "Ohittaa automaattisesti vähäriskiset vahvistukset, kuten modpackien kaksoisasennukset, tavallisen sisällön poistamisen, massapäivitykset, modpackien linkityksen poistamisen ja korjauskehotteet. Vaaralliset varoitukset näytetään silti."
-  },
   "app.appearance-settings.skip-non-essential-warnings.title": {
     "message": "Ohita ei olennaiset varoitukset"
   },
-  "app.appearance-settings.toggle-sidebar.description": {
-    "message": "Laittaa päälle mahdollisuuden kytkeä sivupalkkia."
-  },
-  "app.appearance-settings.toggle-sidebar.title": {
-    "message": "Kytke sivupalkki"
-  },
-  "app.appearance-settings.unknown-pack-warning.description": {
-    "message": "Jos yrität asentaa Modrinth-pakettitiedoston (.mrpack), jota ei ole isännöity Modrinthissä, varmistamme, että ymmärrät riskit ennen asennusta."
-  },
   "app.appearance-settings.unknown-pack-warning.title": {
     "message": "Varoita minua ennen tuntemattomien modipakettien asentamista"
   },
@@ -401,9 +359,6 @@
   "app.settings.tabs.appearance": {
     "message": "Ulkonäkö"
   },
-  "app.settings.tabs.default-instance-options": {
-    "message": "Oletusinstanssin asetukset"
-  },
   "app.settings.tabs.java-installations": {
     "message": "Java asennukset"
   },
diff --git a/apps/app-frontend/src/locales/fil-PH/index.json b/apps/app-frontend/src/locales/fil-PH/index.json
index 9775b8db1d..76ae77ea88 100644
--- a/apps/app-frontend/src/locales/fil-PH/index.json
+++ b/apps/app-frontend/src/locales/fil-PH/index.json
@@ -47,21 +47,12 @@
   "app.action-bar.view-logs": {
     "message": "Tignan ang logs"
   },
-  "app.appearance-settings.advanced-rendering.description": {
-    "message": "Pagpapagana ng masalimuot na pagrerender katulad ng paglalabo na maaaring magdudulot ng mga isyu sa performance kapag walang hardware-acceleration."
-  },
   "app.appearance-settings.advanced-rendering.title": {
     "message": "Masalimuot na pagrerender"
   },
-  "app.appearance-settings.color-theme.description": {
-    "message": "Piliin ang iyong mas gustong kulay para sa Modrinth app."
-  },
   "app.appearance-settings.color-theme.title": {
     "message": "Tema ng kulay"
   },
-  "app.appearance-settings.default-landing-page.description": {
-    "message": "Pagpapalit ng pahina na bubuksan ng launcher."
-  },
   "app.appearance-settings.default-landing-page.home": {
     "message": "Tahanan"
   },
@@ -71,42 +62,12 @@
   "app.appearance-settings.default-landing-page.title": {
     "message": "Panimulang pahina ng paglapag"
   },
-  "app.appearance-settings.hide-nametag.description": {
-    "message": "Pagtatago ng nametag na nasa itaas ng iyong manlalaro sa loob ng pahina ng mga skin."
-  },
   "app.appearance-settings.hide-nametag.title": {
     "message": "Itago ang nametag"
   },
-  "app.appearance-settings.jump-back-into-worlds.description": {
-    "message": "Pagsasali ng mga kamakailang mundo sa seksiyong \"Jump back in\" sa pahina ng Tahanan."
-  },
   "app.appearance-settings.jump-back-into-worlds.title": {
     "message": "Bumalik sa mga mundo"
   },
-  "app.appearance-settings.minimize-launcher.description": {
-    "message": "Liitan ang launcher kung nag-start ang isang proseso ng Minecraft."
-  },
-  "app.appearance-settings.minimize-launcher.title": {
-    "message": "Liitin ang launcher"
-  },
-  "app.appearance-settings.native-decorations.description": {
-    "message": "Gamitin ang system window frame (kailangan i-restart ang app)."
-  },
-  "app.appearance-settings.native-decorations.title": {
-    "message": "Native decorations"
-  },
-  "app.appearance-settings.show-play-time.description": {
-    "message": "Magpapakita ang katagal ng iyong paglalaro sa isang instansiya."
-  },
-  "app.appearance-settings.toggle-sidebar.description": {
-    "message": "Pagpapagana na mata-toggle ang sidebar."
-  },
-  "app.appearance-settings.toggle-sidebar.title": {
-    "message": "I-toggle ang sidebar"
-  },
-  "app.appearance-settings.unknown-pack-warning.description": {
-    "message": "Kung susubukan mong mag-install ng Modrinth Pack file (.mrpack) na hindi naka-host sa Modrinth, titiyakin namin na nakaaalam ka sa mga panganib bago ito ma-install."
-  },
   "app.appearance-settings.unknown-pack-warning.title": {
     "message": "Pakipaalala bago ko ma-install ang mga di-kilalang modpack"
   },
@@ -269,9 +230,6 @@
   "app.settings.tabs.appearance": {
     "message": "Itsura"
   },
-  "app.settings.tabs.default-instance-options": {
-    "message": "Mga pagpipilian sa default na instansiya"
-  },
   "app.settings.tabs.java-installations": {
     "message": "Mga instalasyon ng Java"
   },
diff --git a/apps/app-frontend/src/locales/fr-FR/index.json b/apps/app-frontend/src/locales/fr-FR/index.json
index c8d487e5a8..246380a6b4 100644
--- a/apps/app-frontend/src/locales/fr-FR/index.json
+++ b/apps/app-frontend/src/locales/fr-FR/index.json
@@ -144,19 +144,19 @@
     "message": "Votre vie privée et comment les publicités soutiennent Modrinth"
   },
   "app.appearance-settings.advanced-rendering.description": {
-    "message": "Permet un rendu avancé tel que des effets de flou qui peuvent causer des problèmes de performance sans rendu accéléré par le matériel."
+    "message": "Activer les effets visuels tel que le flou d'arrière-plan. Ceci peut réduire les performances sans accélération matérielle."
   },
   "app.appearance-settings.advanced-rendering.title": {
     "message": "Rendu avancé"
   },
   "app.appearance-settings.color-theme.description": {
-    "message": "Sélectionnez votre couleur préférée pour le thème de Modrinth App."
+    "message": "Choisir la couleur de thème utilisée par Modrinth App."
   },
   "app.appearance-settings.color-theme.title": {
     "message": "Couleur du thème"
   },
   "app.appearance-settings.default-landing-page.description": {
-    "message": "Modifier la page sur laquelle le launcher s'ouvre."
+    "message": "Choisir la page affichée quand Modrinth App s'ouvre."
   },
   "app.appearance-settings.default-landing-page.home": {
     "message": "Accueil"
@@ -168,49 +168,49 @@
     "message": "Page d'ouverture"
   },
   "app.appearance-settings.hide-nametag.description": {
-    "message": "Désactive le nom au-dessus du joueur sur la page skins."
+    "message": "Cache votre nom d'utilisateur au-dessus de la prévisualisation du joueur sur la page de sélection de Skins."
   },
   "app.appearance-settings.hide-nametag.title": {
     "message": "Cacher le pseudo"
   },
   "app.appearance-settings.jump-back-into-worlds.description": {
-    "message": "Inclut les mondes récents dans la section « Partie rapide » sur la page d'accueil."
+    "message": "Affiche les mondes récemment joués dans la section \"Sautez à nouveau dans\" de la page principale."
   },
   "app.appearance-settings.jump-back-into-worlds.title": {
     "message": "Mondes sur partie rapide"
   },
   "app.appearance-settings.minimize-launcher.description": {
-    "message": "Minimiser le launcher quand a processus Minecraft démarre."
+    "message": "Minimiser Modrinth App quand Minecraft se lance."
   },
   "app.appearance-settings.minimize-launcher.title": {
-    "message": "Minimiser le lanceur"
+    "message": "Minimiser l'application"
   },
   "app.appearance-settings.native-decorations.description": {
-    "message": "Utiliser le cadre fenêtre du système (redémarrage de l'application requis)."
+    "message": "Utilise la barre de titre et les contrôles de fenêtre de votre système d'exploitation. Nécessite le redémarrage de l'application."
   },
   "app.appearance-settings.native-decorations.title": {
-    "message": "Décorations natives"
+    "message": "Cadre de fenêtre système"
   },
   "app.appearance-settings.show-play-time.description": {
-    "message": "Affiche combien de temps vous avez passé sur une instance."
+    "message": "Montre combien de temps vous avez joué à chaque instance."
   },
   "app.appearance-settings.show-play-time.title": {
     "message": "Afficher le temps de jeu"
   },
   "app.appearance-settings.skip-non-essential-warnings.description": {
-    "message": "Ignore automatiquement les confirmations à faible risque, comme l'installation de modpacks en double, la suppression de contenu standard, les mises à jour groupées, la dissociation des modpacks et les demandes de réparation. Les avertissements concernant les actions dangereuses continueront d'être affichés."
+    "message": "Passe les confirmations pour des actions moins risquées comme dupliquer des installations, suppression de contenu normal, grosses mises à jour, rupture de liens et réparations. Les avertissements pour les actions dangereuses seront toujours affichés."
   },
   "app.appearance-settings.skip-non-essential-warnings.title": {
     "message": "Cacher les alertes non essentielles"
   },
   "app.appearance-settings.toggle-sidebar.description": {
-    "message": "Permet d'ouvrir ou de fermer la barre latérale."
+    "message": "Cache la barre à droite par défaut et ajouter un bouton pour la montrer ou cacher."
   },
   "app.appearance-settings.toggle-sidebar.title": {
-    "message": "Tiroir latéral"
+    "message": "Cache la barre latérale droite"
   },
   "app.appearance-settings.unknown-pack-warning.description": {
-    "message": "Si vous essayez d'installer un fichier Modrinth Pack (.mrpack) qui n'est pas hébergé sur Modrinth, nous nous assurerons que vous comprenez les risques avant de l'installer."
+    "message": "Montre un avertissement de sécurité avant d'installer un Modrinth Pack (.mrpack) qui n'est pas sur Modrinth."
   },
   "app.appearance-settings.unknown-pack-warning.title": {
     "message": "M'avertir avant d'installer des modpacks inconnus"
@@ -221,6 +221,15 @@
   "app.auth-servers.unreachable.header": {
     "message": "Impossible de contacter les serveurs d'authentification"
   },
+  "app.behavior-settings.confirmations.title": {
+    "message": "Confirmations"
+  },
+  "app.behavior-settings.content.title": {
+    "message": "Accueil et contenu"
+  },
+  "app.behavior-settings.startup-and-navigation.title": {
+    "message": "Démarrage et navigation"
+  },
   "app.browse.add-servers-to-instance": {
     "message": "Ajouter le serveur à l'instance"
   },
@@ -242,12 +251,18 @@
   "app.browse.back-to-instance": {
     "message": "Retour à l'instance"
   },
+  "app.browse.discover-project-type": {
+    "message": "Découvrir des {projectType}"
+  },
   "app.browse.discover-servers": {
     "message": "Découvrir des serveurs"
   },
   "app.browse.hide-added-servers": {
     "message": "Masquer les serveurs déjà installés"
   },
+  "app.browse.hide-installed-modpacks": {
+    "message": "Cacher ce qui est déjà installé"
+  },
   "app.browse.project-type.modpacks": {
     "message": "Modpacks"
   },
@@ -362,9 +377,18 @@
   "app.instance.admonitions.shared-instance.review-header": {
     "message": "Examiner les modifications"
   },
+  "app.instance.admonitions.shared-instance.review-update-button": {
+    "message": "Télécharger la mise à jour"
+  },
   "app.instance.admonitions.shared-instance.reviewing-button": {
     "message": "Examination..."
   },
+  "app.instance.admonitions.shared-instance.update-available-body": {
+    "message": "Une mise à jour est nécessaire pour jouer à {name}. Veuillez mettre à jour vers la dernière version pour lancer le jeu."
+  },
+  "app.instance.admonitions.shared-instance.update-available-header": {
+    "message": "Une mise à jour est disponible"
+  },
   "app.instance.confirm-delete.admonition-body": {
     "message": "Toutes les données pour votre instance seront supprimées à jamais, y compris vos mondes, vos configurations, et le contenu installé."
   },
@@ -431,6 +455,9 @@
   "app.instance.share.invite-modal.heading": {
     "message": "Partager {name}"
   },
+  "app.instance.share.invite-modal.user-limit-reached": {
+    "message": "Cette instance a atteint la limite de {limit} utilisateurs."
+  },
   "app.instance.share.locked.empty-description-prefix": {
     "message": "Vous devez vous connecter en tant que"
   },
@@ -449,6 +476,12 @@
   "app.instance.share.locked.wrong-account-heading": {
     "message": "Mauvais compte"
   },
+  "app.instance.share.members.empty": {
+    "message": "Aucun utilisateur n'a encore rejoint"
+  },
+  "app.instance.share.members.no-filter-results": {
+    "message": "Aucun utilisateur ne correspond à vos filtres."
+  },
   "app.instance.share.remove-user-modal.effect-access": {
     "message": "Ils vont désormais cesser de recevoir des mises à jour pour cette instance partagée"
   },
@@ -479,6 +512,9 @@
   "app.instance.share.sign-in.button": {
     "message": "Se connecter"
   },
+  "app.instance.share.unable-to-connect.heading": {
+    "message": "Impossible de se connecter"
+  },
   "app.instance.share.unlink.body": {
     "message": "Vous devez délier ce modpack pour partager votre instance"
   },
@@ -566,12 +602,60 @@
   "app.instance.worlds.search-worlds-placeholder": {
     "message": "Rechercher {count} mondes..."
   },
+  "app.java-detection.cancel": {
+    "message": "Annuler"
+  },
+  "app.java-detection.columns.actions": {
+    "message": "Actions"
+  },
+  "app.java-detection.columns.path": {
+    "message": "Chemin"
+  },
+  "app.java-detection.columns.version": {
+    "message": "Version"
+  },
+  "app.java-detection.no-installations-found": {
+    "message": "Aucune installation Java trouvée."
+  },
+  "app.java-detection.select": {
+    "message": "Sélectionner"
+  },
+  "app.java-detection.selected": {
+    "message": "Sélectionné"
+  },
+  "app.java-detection.title": {
+    "message": "Sélectionner l'installation Java"
+  },
+  "app.java-selector.already-installed": {
+    "message": "Déjà installé"
+  },
+  "app.java-selector.browse": {
+    "message": "Naviguer"
+  },
+  "app.java-selector.detect": {
+    "message": "Détecter"
+  },
+  "app.java-selector.install-recommended": {
+    "message": "Télécharger les fichiers recommandés"
+  },
+  "app.java-selector.installing": {
+    "message": "Installation..."
+  },
+  "app.java-selector.path.placeholder": {
+    "message": "/chemin/vers/java"
+  },
+  "app.java-selector.test-installation": {
+    "message": "Tester l'installation Java"
+  },
   "app.modal.install-to-play.additional-context": {
     "message": "Contexte additionnel"
   },
   "app.modal.install-to-play.additional-context-placeholder": {
     "message": "Si possible, incluez des liens et des images pertinentes"
   },
+  "app.modal.install-to-play.block-user": {
+    "message": "Bloquer l'utilisateur"
+  },
   "app.modal.install-to-play.content-you-are-reporting": {
     "message": "L'instance que vous signalez"
   },
@@ -593,6 +677,9 @@
   "app.modal.install-to-play.invite-warning": {
     "message": "Cette invitation a été crée par un autre utilisateur Modrinth, pas par Modrinth. N'acceptez seulement les invitations de personnes en qui vous avez confiance."
   },
+  "app.modal.install-to-play.invite-warning-with-creator": {
+    "message": "Cette invitation a été crée par <creator>{username}</creator>, pas par Modrinth. N'acceptez seulement les invitations de personnes en qui vous avez confiance."
+  },
   "app.modal.install-to-play.mod-count": {
     "message": "{count, plural, one {# mod} other {# mods}}"
   },
@@ -650,6 +737,9 @@
   "app.modal.install-to-play.unrecognized-files": {
     "message": "Fichiers non reconnus"
   },
+  "app.modal.install-to-play.user-blocked": {
+    "message": "Utilisateur bloqué"
+  },
   "app.modal.install-to-play.view-contents": {
     "message": "Voir le contenu"
   },
@@ -677,6 +767,36 @@
   "app.modal.update-to-play.update-required-description": {
     "message": "Une mise à jour est requise pour jouer à {name}. Veuillez mettre à jour vers la dernière version pour lancer le jeu."
   },
+  "app.nav.create-new-instance": {
+    "message": "Créer une nouvelle instance"
+  },
+  "app.nav.home": {
+    "message": "Accueil"
+  },
+  "app.nav.library": {
+    "message": "Bibliothèque"
+  },
+  "app.nav.modrinth-account": {
+    "message": "Compte Modrinth"
+  },
+  "app.nav.modrinth-hosting": {
+    "message": "Modrinth Hosting"
+  },
+  "app.nav.sign-in-to-modrinth-account": {
+    "message": "Se connecter à un compte Modrinth"
+  },
+  "app.nav.signed-in-as": {
+    "message": "Connecté en tant que <user>{username}</user>"
+  },
+  "app.nav.upgrade-to-modrinth-plus": {
+    "message": "Passer à Modrinth+"
+  },
+  "app.news.title": {
+    "message": "Nouveautés"
+  },
+  "app.news.view-all": {
+    "message": "Voir toutes les nouveautés"
+  },
   "app.project.install-button.already-installed": {
     "message": "Ce projet a déjà été installé"
   },
@@ -686,6 +806,9 @@
   "app.project.install-context.back-to-browse": {
     "message": "Retour vers la page découvrir"
   },
+  "app.project.install-context.back-to-instance": {
+    "message": "Retour à l'instance"
+  },
   "app.project.version.all-versions": {
     "message": "Toutes les versions"
   },
@@ -698,20 +821,113 @@
   "app.project.versions.already-installed": {
     "message": "Déjà installé"
   },
+  "app.quick-instance-switcher.drag-show-tooltip": {
+    "message": "Faites glisser pour montrer les instances récentes"
+  },
+  "app.quick-instance-switcher.drag-tooltip": {
+    "message": "Faire glisser pour redimensionner"
+  },
+  "app.restarting": {
+    "message": "Redémarrage..."
+  },
+  "app.settings.app-version": {
+    "message": "Modrinth App {version}"
+  },
+  "app.settings.default-instance-options.environment-variables.placeholder": {
+    "message": "Entrer les variables d'environnement..."
+  },
+  "app.settings.default-instance-options.environment-variables.title": {
+    "message": "Variables d'environnement"
+  },
+  "app.settings.default-instance-options.fullscreen.description": {
+    "message": "Démarre les instances en plein écran en modifiant leur fichier options.txt."
+  },
+  "app.settings.default-instance-options.fullscreen.title": {
+    "message": "Plein écran"
+  },
+  "app.settings.default-instance-options.height.description": {
+    "message": "La hauteur de la fenêtre de jeu lors du lancement."
+  },
+  "app.settings.default-instance-options.height.placeholder": {
+    "message": "Entrer la hauteur"
+  },
+  "app.settings.default-instance-options.height.title": {
+    "message": "Hauteur"
+  },
+  "app.settings.default-instance-options.java-arguments.placeholder": {
+    "message": "Entrer les arguments Java..."
+  },
+  "app.settings.default-instance-options.java-arguments.title": {
+    "message": "Arguments Java"
+  },
+  "app.settings.default-instance-options.memory-allocation.description": {
+    "message": "Mémoire maximale disponible pour chaque instance."
+  },
+  "app.settings.default-instance-options.memory-allocation.title": {
+    "message": "Allocation de la mémoire"
+  },
+  "app.settings.default-instance-options.post-exit-hook.description": {
+    "message": "S'exécute après que le jeu se ferme."
+  },
+  "app.settings.default-instance-options.width.description": {
+    "message": "La largeur de la fenêtre de jeu lors du lancement."
+  },
+  "app.settings.default-instance-options.width.placeholder": {
+    "message": "Entrer la largeur..."
+  },
+  "app.settings.default-instance-options.width.title": {
+    "message": "Largeur"
+  },
+  "app.settings.developer-mode-button.label": {
+    "message": "Basculer le mode développeur"
+  },
   "app.settings.developer-mode-enabled": {
     "message": "Mode développeur activé."
   },
   "app.settings.downloading": {
     "message": "Téléchargement de la version {version}"
   },
+  "app.settings.java-installations.location.title": {
+    "message": "Emplacement de Java {version, number}"
+  },
+  "app.settings.operating-system.macos": {
+    "message": "macOS"
+  },
   "app.settings.privacy.ads-consent.intro": {
     "message": "Les publicités rendent Modrinth possible et financent les rémunérations des créateurs. Nos partenaires peuvent stocker des cookies ou y accéder au sein de l'application afin de personnaliser les publicités et de mesurer les performances. Vous pouvez refuser ou gérer vos préférences ci-dessous."
   },
+  "app.settings.privacy.telemetry.title": {
+    "message": "Télémétrie"
+  },
+  "app.settings.resource-management.always-show-copy-details.title": {
+    "message": "Toujours afficher les détails de copie"
+  },
+  "app.settings.resource-management.app-cache.purge": {
+    "message": "Purger le cache"
+  },
+  "app.settings.resource-management.app-cache.title": {
+    "message": "Cache de l'application"
+  },
+  "app.settings.resource-management.app-database-backups.open-folder": {
+    "message": "Ouvrir le dossier de sauvegardes"
+  },
+  "app.settings.resource-management.app-directory.select": {
+    "message": "Sélectionner un nouveau répertoire pour l'application"
+  },
+  "app.settings.resource-management.app-directory.title": {
+    "message": "Répertoire de l'application"
+  },
+  "app.settings.sidebar.label.instances": {
+    "message": "Instance"
+  },
   "app.settings.tabs.appearance": {
     "message": "Apparence"
   },
+  "app.settings.tabs.behavior": {
+    "message": "Comportement"
+  },
   "app.settings.tabs.default-instance-options": {
-    "message": "Options d’instance par défaut"
+    "message": "Options de jeu par défaut"
   },
   "app.settings.tabs.java-installations": {
     "message": "Installations de Java"
@@ -725,6 +941,9 @@
   "app.settings.tabs.resource-management": {
     "message": "Gestion des ressources"
   },
+  "app.sidebar.playing-as": {
+    "message": "Joue en tant que"
+  },
   "app.skins.add-button": {
     "message": "Ajouter un skin"
   },
@@ -884,6 +1103,12 @@
   "app.skins.toggle-ears-features-on": {
     "message": "Activer"
   },
+  "app.survey.no-thanks": {
+    "message": "Non merci"
+  },
+  "app.survey.take-survey": {
+    "message": "Participer au sondage"
+  },
   "app.update-popup.body.download-complete": {
     "message": "Modrinth App v{version} a finie d'être téléchargée. Rechargez pour mettre à jour maintenant, ou automatiquement quand vous fermez Modrinth App."
   },
@@ -1059,7 +1284,7 @@
     "message": "Dissocier l'instance partagée"
   },
   "installation-settings.unpublish-shared-instance.modal.admonition-body": {
-    "message": "Cela supprime l'instance partagée des serveurs de Modrinth. Les personnes l'utilisant dans l'application Modrinth vont cesser de recevoir des mises à jour, mais votre instance locale et son contenu resteront sur cet appareil."
+    "message": "Cela supprime l'instance partagée des serveurs de Modrinth. Les personnes l'utilisant dans Modrinth App vont cesser de recevoir des mises à jour, mais votre instance locale et son contenu resteront sur cet appareil."
   },
   "installation-settings.unpublish-shared-instance.modal.admonition-header": {
     "message": "Dépublication de l'instance partagée"
@@ -1157,6 +1382,39 @@
   "instance.server-modal.resource-pack": {
     "message": "Pack de ressources"
   },
+  "instance.settings.sharing.active-invites.actions": {
+    "message": "Actions"
+  },
+  "instance.settings.sharing.active-invites.code": {
+    "message": "Lien d'invitation"
+  },
+  "instance.settings.sharing.active-invites.empty": {
+    "message": "Il n'y a aucune invitation active."
+  },
+  "instance.settings.sharing.active-invites.expires": {
+    "message": "Expire"
+  },
+  "instance.settings.sharing.active-invites.revoke": {
+    "message": "Révoquer l'invitation"
+  },
+  "instance.settings.sharing.active-invites.revoke-with-code": {
+    "message": "Révoquer l'invitation {code}"
+  },
+  "instance.settings.sharing.active-invites.title": {
+    "message": "Invitations actives"
+  },
+  "instance.settings.sharing.active-invites.uses": {
+    "message": "Utilisations"
+  },
+  "instance.settings.sharing.revoke-invite.admonition-header": {
+    "message": "Cette action ne peut pas être annulée"
+  },
+  "instance.settings.sharing.revoke-invite.confirm": {
+    "message": "Révoquer l'invitation"
+  },
+  "instance.settings.sharing.revoke-invite.header": {
+    "message": "Révoquer l'invitation"
+  },
   "instance.settings.tabs.general": {
     "message": "Général"
   },
@@ -1358,6 +1616,9 @@
   "instance.shared-instance.error.title": {
     "message": "Quelque chose s'est mal passé"
   },
+  "instance.shared-instance.network-error.title": {
+    "message": "Erreur de réseau"
+  },
   "instance.shared-instance.owner-tooltip": {
     "message": "Le contenu de cette instance est partagé à d'autres utilisateurs."
   },
@@ -1549,5 +1810,11 @@
   },
   "search.filter.locked.server-loader.title": {
     "message": "Le loader est procuré par le serveur"
+  },
+  "settings.sidebar.label.account": {
+    "message": "Compte"
+  },
+  "settings.sidebar.label.display": {
+    "message": "Affichage"
   }
 }
diff --git a/apps/app-frontend/src/locales/he-IL/index.json b/apps/app-frontend/src/locales/he-IL/index.json
index 1ae32034ba..c74fc0dc83 100644
--- a/apps/app-frontend/src/locales/he-IL/index.json
+++ b/apps/app-frontend/src/locales/he-IL/index.json
@@ -20,9 +20,6 @@
   "app.action-bar.stop-instance": {
     "message": ""
   },
-  "app.appearance-settings.advanced-rendering.description": {
-    "message": "מאפשר עיבוד מתקדם כגון אפקטים טשטוש העלולים לגרום לבעיות ביצועים ללא עיבוד מואץ לחומרה."
-  },
   "app.appearance-settings.jump-back-into-worlds.title": {
     "message": "חזרה לעולמות"
   },
@@ -161,9 +158,6 @@
   "app.settings.tabs.appearance": {
     "message": "מראה"
   },
-  "app.settings.tabs.default-instance-options": {
-    "message": "אפשרויות ברירת מחדל של התקנה"
-  },
   "app.settings.tabs.java-installations": {
     "message": "התקנות ג'אווה"
   },
diff --git a/apps/app-frontend/src/locales/hu-HU/index.json b/apps/app-frontend/src/locales/hu-HU/index.json
index 755ed8ffea..04455bc7a8 100644
--- a/apps/app-frontend/src/locales/hu-HU/index.json
+++ b/apps/app-frontend/src/locales/hu-HU/index.json
@@ -9,7 +9,7 @@
     "message": "Letöltések"
   },
   "app.action-bar.hide-more-running-instances": {
-    "message": "További futó játékpéldányok elrejtése"
+    "message": "További futó játékprofilok elrejtése"
   },
   "app.action-bar.install.copied-details": {
     "message": "Másolva"
@@ -21,7 +21,7 @@
     "message": "Elutasítás"
   },
   "app.action-bar.install.open-instance": {
-    "message": "Játékpéldány megnyitása"
+    "message": "Játékprofil megnyitása"
   },
   "app.action-bar.install.retry": {
     "message": "Újra"
@@ -51,7 +51,7 @@
     "message": "A letöltés nem fejeződött be"
   },
   "app.action-bar.install.summary.instance-not-found": {
-    "message": "A játékpéldány nem található"
+    "message": "A játékprofil nem található"
   },
   "app.action-bar.install.summary.invalid-file-path": {
     "message": "A fájl elérési útja érvénytelen"
@@ -84,10 +84,10 @@
     "message": "Nem sikerült letölteni a csomagot"
   },
   "app.action-bar.install.summary.unexpected-error": {
-    "message": "Valami hiba történt"
+    "message": "Valami félrement"
   },
   "app.action-bar.install.unknown-instance": {
-    "message": "Ismeretlen játékpéldány"
+    "message": "Ismeretlen játékprofil"
   },
   "app.action-bar.install.updating-shared-content": {
     "message": "Megosztott tartalom frissítése"
@@ -96,16 +96,16 @@
     "message": "Telepítések"
   },
   "app.action-bar.make-primary-instance": {
-    "message": "Beállítás elsődleges játékpéldányként"
+    "message": "Beállítás elsődleges játékprofilként"
   },
   "app.action-bar.no-instances-running": {
-    "message": "Nincsenek futó játékpéldányok"
+    "message": "Nincsenek futó játékprofilok"
   },
   "app.action-bar.offline": {
     "message": "Offline"
   },
   "app.action-bar.primary-instance": {
-    "message": "Elsődleges játékpéldány"
+    "message": "Elsődleges játékprofil"
   },
   "app.action-bar.reload-to-update": {
     "message": "Frissítés elérhető"
@@ -114,7 +114,7 @@
     "message": "További futó pédányok megjelenítése"
   },
   "app.action-bar.stop-instance": {
-    "message": "Játékpéldány leállítása"
+    "message": "Játékprofil leállítása"
   },
   "app.action-bar.update": {
     "message": "Frissítés"
@@ -123,7 +123,7 @@
     "message": "Aktív letöltések megtekintése"
   },
   "app.action-bar.view-instance": {
-    "message": "Játékpéldány megtekintése"
+    "message": "Játékprofil megtekintése"
   },
   "app.action-bar.view-logs": {
     "message": "Naplók megtekintése"
@@ -144,19 +144,19 @@
     "message": "Adataid védelme és a hirdetések szerepe a Modrinth működésében"
   },
   "app.appearance-settings.advanced-rendering.description": {
-    "message": "Lehetővé teszi olyan speciális megjelenítési effektusok használatát, mint például az elmosódás, amelyek hardveres gyorsítás nélkül teljesítménycsökkenést okozhatnak."
+    "message": "Engedélyezi a vizuális effektusokat, például a háttér elmosását. Hardveres gyorsítás nélkül ez ronthatja a rendszer teljesítményét."
   },
   "app.appearance-settings.advanced-rendering.title": {
     "message": "Haladó megjelenítési beállítások"
   },
   "app.appearance-settings.color-theme.description": {
-    "message": "Válaszd ki a Modrinth Apphoz a kívánt színsémát."
+    "message": "Válaszd ki a Modrinth App által használt színsémát."
   },
   "app.appearance-settings.color-theme.title": {
     "message": "Téma"
   },
   "app.appearance-settings.default-landing-page.description": {
-    "message": "Állítsd be, hogy az indító melyik oldalon nyíljon meg."
+    "message": "Válaszd ki, hogy a Modrinth App megnyitásakor melyik oldal jelenjen meg."
   },
   "app.appearance-settings.default-landing-page.home": {
     "message": "Kezdőlap"
@@ -168,52 +168,52 @@
     "message": "Alapértelmezett nyitóoldal"
   },
   "app.appearance-settings.hide-nametag.description": {
-    "message": "Letiltja a játékosod felett megjelenő névcímkét a Kinézetek oldalon."
+    "message": "Elrejti a játékosod előnézete felett megjelenő névcímkét a Kinézetváltó oldalon."
   },
   "app.appearance-settings.hide-nametag.title": {
     "message": "Névcímke eltüntetése"
   },
   "app.appearance-settings.jump-back-into-worlds.description": {
-    "message": "A kezdőlap „Folytasd itt” részében a legújabb világok is megtalálhatók."
+    "message": "A legutóbb játszott világok megjelenítése a kezdőlap „Folytasd itt” részében."
   },
   "app.appearance-settings.jump-back-into-worlds.title": {
-    "message": "„Folytasd itt” a világokat is"
+    "message": "Ugorj vissza a világokba"
   },
   "app.appearance-settings.minimize-launcher.description": {
-    "message": "Minimalizáld az indítót a Minecraft indításakor."
+    "message": "A Modrinth App bezáródik a Minecraft indításakor"
   },
   "app.appearance-settings.minimize-launcher.title": {
-    "message": "Indító minimalizálása"
+    "message": "Alkalmazás bezárása"
   },
   "app.appearance-settings.native-decorations.description": {
-    "message": "A rendszer ablakkeret használata (az alkalmazás újraindítása szükséges)."
+    "message": "Az operációs rendszer címsorának és ablakvezérlőinek használata. A módosítás érvénybe lépéséhez újra kell indítani az alkalmazást."
   },
   "app.appearance-settings.native-decorations.title": {
-    "message": "Rendszer ablakkeret használata"
+    "message": "Rendszerablakkeret"
   },
   "app.appearance-settings.show-play-time.description": {
-    "message": "Megmutatja, mennyi időt töltöttél egy játékpéldányban."
+    "message": "Megjeleníti, hogy mennyi időt töltöttél egy játékprofilban."
   },
   "app.appearance-settings.show-play-time.title": {
     "message": "Játékidő megjelenítése"
   },
   "app.appearance-settings.skip-non-essential-warnings.description": {
-    "message": "Az alacsony kockázatú megerősítéseket – például a modcsomagok ismételt telepítését, a szokásos tartalomtörlést, a tömeges frissítéseket, a modcsomagok kapcsolatának megszüntetését és a javítási felhívásokat – a rendszer automatikusan kihagyja. A veszélyes figyelmeztetéseket továbbra is megjeleníti."
+    "message": "Megerősítés kihagyása az alacsony kockázatú műveletek – például az ismételt telepítések, a szokásos tartalomtörlések, a tömeges frissítések, a leválasztás és a javítások – esetében. A veszélyes műveletekre vonatkozó figyelmeztetéseket mindig megjeleníti a rendszer."
   },
   "app.appearance-settings.skip-non-essential-warnings.title": {
-    "message": "Hagyd ki a lényegtelen figyelmeztetéseket"
+    "message": "Lényegtelen figyelmeztetések kihagyása"
   },
   "app.appearance-settings.toggle-sidebar.description": {
-    "message": "Lehetővé teszi az oldalsáv be- és kikapcsolását."
+    "message": "Alapértelmezés szerint elrejti a jobb oldalsávot, és hozzáad egy gombot a megjelenítéséhez vagy elrejtéséhez."
   },
   "app.appearance-settings.toggle-sidebar.title": {
-    "message": "Oldalsáv megjelenítése/elrejtése"
+    "message": "Jobb oldalsáv elrejtése"
   },
   "app.appearance-settings.unknown-pack-warning.description": {
-    "message": "Ha olyan Modrinth Csomagfájlt (.mrpack) próbálsz telepíteni, amely nem a Modrinth szerverén található, a telepítés előtt gondoskodunk arról, hogy tisztában legyél a kockázatokkal."
+    "message": "Biztonsági figyelmeztetést jelenít meg, mielőtt olyan Modrinth Csomagfájlt (.mrpack) telepítenél, amely nem a Modrinthról származik."
   },
   "app.appearance-settings.unknown-pack-warning.title": {
-    "message": "Figyelmeztess, mielőtt ismeretlen modcsomagokat telepítenék"
+    "message": "Figyelmeztetés ismeretlen modcsomagok telepítése előtt"
   },
   "app.auth-servers.unreachable.body": {
     "message": "A Minecraft hitelesítő szerverek lehet, hogy nem üzemelnek. Bizonyosodj meg róla, hogy van internetkapcsolatod és próbáld meg újra."
@@ -221,14 +221,23 @@
   "app.auth-servers.unreachable.header": {
     "message": "Nem lehet elérni a hitelesítési kiszolgálókat"
   },
+  "app.behavior-settings.confirmations.title": {
+    "message": "Megerősítések"
+  },
+  "app.behavior-settings.content.title": {
+    "message": "Kezdőlap és tartalom"
+  },
+  "app.behavior-settings.startup-and-navigation.title": {
+    "message": "Indítás és navigáció"
+  },
   "app.browse.add-servers-to-instance": {
-    "message": "Szerver hozzáadása a játékpéldányhoz"
+    "message": "Szerver hozzáadása a játékprofilhoz"
   },
   "app.browse.add-to-an-instance": {
-    "message": "Hozzáadás egy játékpéldányhoz"
+    "message": "Hozzáadás egy játékprofilhoz"
   },
   "app.browse.add-to-instance": {
-    "message": "Hozzáadás a játékpéldányhoz"
+    "message": "Hozzáadás a játékprofilhoz"
   },
   "app.browse.add-to-instance-name": {
     "message": "Hozzáadás ehhez: {instanceName}"
@@ -240,7 +249,10 @@
     "message": "Már hozzá van adva"
   },
   "app.browse.back-to-instance": {
-    "message": "Vissza a játékpéldányhoz"
+    "message": "Vissza a játékprofilhoz"
+  },
+  "app.browse.discover-project-type": {
+    "message": "{projectType} keresése"
   },
   "app.browse.discover-servers": {
     "message": "Szerverek böngészése"
@@ -248,17 +260,20 @@
   "app.browse.hide-added-servers": {
     "message": "A már hozzáadott szerverek elrejtése"
   },
+  "app.browse.hide-installed-modpacks": {
+    "message": "A már telepítettek elrejtése"
+  },
   "app.browse.project-type.modpacks": {
     "message": "Modcsomagok"
   },
   "app.browse.server-instance-content-warning": {
-    "message": "A tartalom hozzáadása ronthatja a kompatibilitást a szerverhez való csatlakozáskor. A hozzáadott tartalom elveszik, ha frissíted a szerverpéldány tartalmát."
+    "message": "A tartalom hozzáadása ronthatja a kompatibilitást a szerverhez való csatlakozáskor. A hozzáadott tartalom elveszik, ha frissíted a szerverprofil tartalmát."
   },
   "app.browse.server.installing": {
-    "message": "Letöltés"
+    "message": "Telepítés"
   },
   "app.content-install.no-compatible-versions": {
-    "message": "Nincs a(z) {compatibilityLabel} verziónak megfelelő elérhető verzió. Válassz ki egy verziót, ha mégis telepíteni szeretnéd. A függőségek nem települnek automatikusan."
+    "message": "Nincs olyan elérhető verzió, amely kompatibilis a(z) {compatibilityLabel} értékkel. Válassz ki egy verziót a telepítés mindenképp történő folytatásához. A függőségek nem lesznek automatikusan telepítve."
   },
   "app.export-modal.description-placeholder": {
     "message": "Írd be a modcsomag leírását..."
@@ -270,7 +285,7 @@
     "message": "Modcsomag exportálása"
   },
   "app.export-modal.modpack-name-label": {
-    "message": "Modcsamag neve"
+    "message": "A modcsomag neve"
   },
   "app.export-modal.modpack-name-placeholder": {
     "message": "A modcsomag neve"
@@ -339,7 +354,7 @@
     "message": "Hozzáadva"
   },
   "app.instance.admonitions.shared-instance.changes-body": {
-    "message": "A te gépeden lévő játékpéldány újabb, mint azoké a felhasználóké, akikkel megosztottad."
+    "message": "A te gépeden lévő játékprofil újabb, mint azoké a felhasználóké, akikkel megosztottad."
   },
   "app.instance.admonitions.shared-instance.changes-header": {
     "message": "A változtatásaid még nem lettek megosztva"
@@ -357,28 +372,37 @@
     "message": "Frissítés közzététele"
   },
   "app.instance.admonitions.shared-instance.review-description": {
-    "message": "A játékpéldányt használó összes résztvevővel megosztásra kerülő tartalomváltoztatások áttekintése."
+    "message": "A játékprofilt használó összes résztvevővel megosztásra kerülő tartalomváltoztatások áttekintése."
   },
   "app.instance.admonitions.shared-instance.review-header": {
     "message": "Változtatások áttekintése"
   },
+  "app.instance.admonitions.shared-instance.review-update-button": {
+    "message": "Frissítés áttekintése"
+  },
   "app.instance.admonitions.shared-instance.reviewing-button": {
     "message": "Áttekintés..."
   },
+  "app.instance.admonitions.shared-instance.update-available-body": {
+    "message": "Egy frssítés szükséges a(z) {name} játékprofilhoz. Kérjük, frissítsd a játékot a legújabb verzióra az indításhoz."
+  },
+  "app.instance.admonitions.shared-instance.update-available-header": {
+    "message": "Frissítés érhető el"
+  },
   "app.instance.confirm-delete.admonition-body": {
-    "message": "A játékpéldányhoz tartozó összes adat véglegesen törlődik, beleértve a világokat, a beállításokat és az összes telepített tartalmat."
+    "message": "A játékprofilhoz tartozó összes adat véglegesen törlődik, beleértve a világokat, a beállításokat és az összes telepített tartalmat."
   },
   "app.instance.confirm-delete.admonition-header": {
     "message": "Ezt a műveletet nem lehet visszavonni"
   },
   "app.instance.confirm-delete.delete-button": {
-    "message": "Játékpéldány törlése"
+    "message": "Játékprofil törlése"
   },
   "app.instance.confirm-delete.header": {
-    "message": "Játékpéldány törlése"
+    "message": "Játékprofil törlése"
   },
   "app.instance.modpack-already-installed.body": {
-    "message": "Ez a modcsomag már telepítve van a(z) <bold>{instanceName}</bold> játékpéldányban. Biztosan duplikálni szeretnéd?"
+    "message": "Ez a modcsomag már telepítve van a(z) <bold>{instanceName}</bold> játékprofilban. Biztosan duplikálni szeretnéd?"
   },
   "app.instance.modpack-already-installed.create": {
     "message": "Létrehozás"
@@ -387,7 +411,7 @@
     "message": "A modcsomag már telepítve van"
   },
   "app.instance.modpack-already-installed.instance": {
-    "message": "Játékpéldány"
+    "message": "Játékprofil"
   },
   "app.instance.mods.bulk-update.downloading-projects": {
     "message": "{current, number}/{total, number} projekt letöltése..."
@@ -402,7 +426,7 @@
     "message": "projekt"
   },
   "app.instance.mods.locked-content": {
-    "message": "Zárolt játékpéldányokban a tartalom nem változtatható meg."
+    "message": "Zárolt játékprofilokban a tartalom nem változtatható meg."
   },
   "app.instance.mods.project-was-added": {
     "message": "„{name}” hozzá lett adva"
@@ -420,7 +444,7 @@
     "message": "Sikeresen feltöltve"
   },
   "app.instance.share.empty.description": {
-    "message": "Ezt a játékpéldányt megoszthatod a barátaiddal!"
+    "message": "Ezt a játékprofilt megoszthatod a barátaiddal!"
   },
   "app.instance.share.empty.heading": {
     "message": "Nincsenek barátok meghívva"
@@ -431,6 +455,9 @@
   "app.instance.share.invite-modal.heading": {
     "message": "{name} megosztása"
   },
+  "app.instance.share.invite-modal.user-limit-reached": {
+    "message": "Ez a játékprofil elérte a {limit} felhasználós korlátot."
+  },
   "app.instance.share.locked.empty-description-prefix": {
     "message": "Be kell jelentkezned mint"
   },
@@ -449,53 +476,71 @@
   "app.instance.share.locked.wrong-account-heading": {
     "message": "Helytelen fiók"
   },
+  "app.instance.share.members.empty": {
+    "message": "Még senki sem csatlakozott"
+  },
+  "app.instance.share.members.no-filter-results": {
+    "message": "Nem található a keresésnek megfelelő felhasználó"
+  },
   "app.instance.share.remove-user-modal.effect-access": {
-    "message": "Többé nem fog frissítéseket kapni ehhez a megosztott játékpéldányhoz"
+    "message": "Többé nem fog frissítéseket kapni ehhez a megosztott játékprofilhoz"
   },
   "app.instance.share.remove-user-modal.effect-installed-copy": {
-    "message": "A már telepített játékpéldányok megmaradnak az eszközén"
+    "message": "A már telepített játékprofilok megmaradnak az eszközén"
   },
   "app.instance.share.remove-user-modal.effect-invite-again": {
     "message": "Később újra meghívhatod"
   },
   "app.instance.share.remove-user-modal.effect-last-user": {
-    "message": "Ő az utolsó felhasználó, a megosztás ezen az játékpéldányon le lesz tiltva"
+    "message": "Ő az utolsó felhasználó, a megosztás ezen az játékprofilon le lesz állítva"
   },
   "app.instance.share.remove-user-modal.effects-label": {
     "message": "Mi fog történni?"
   },
   "app.instance.share.remove-user-modal.header": {
-    "message": "Hozzáférés visszavonása"
+    "message": "Hozzáférés megvonása"
   },
   "app.instance.share.remove-user-modal.remove-button": {
-    "message": "Hozzáférés visszavonása"
+    "message": "Hozzáférés megvonása"
   },
   "app.instance.share.remove-user-modal.user-avatar-alt": {
     "message": "{username} avatárja"
   },
   "app.instance.share.remove-user-modal.warning-body": {
-    "message": "Ha visszavonod {username} hozzáférését ehhez a megosztott játékpéldányhoz, újra meg kell hívnod, mielőtt frissítéseket kaphatna."
+    "message": "Ha visszavonod {username} hozzáférését ehhez a megosztott játékprofilhoz, újra meg kell hívnod, mielőtt frissítéseket kaphatna."
   },
   "app.instance.share.sign-in.button": {
     "message": "Bejelentkezés"
   },
+  "app.instance.share.unable-to-connect.description": {
+    "message": "A megosztott játékprofilok szolgáltatás pillanatnyilag nem érhető el. Kérjük, próbáld újra később"
+  },
+  "app.instance.share.unable-to-connect.heading": {
+    "message": "Nem sikerült csatlakozni"
+  },
   "app.instance.share.unlink.body": {
-    "message": "A játékpéldány megosztásához le kell választanod ezt a modcsomagot"
+    "message": "A játékprofil megosztásához le kell választanod ezt a modcsomagot"
   },
   "app.instance.share.unlink.header": {
     "message": "A megosztáshoz le kell választani"
   },
+  "app.instance.shared-instance-already-installed.body": {
+    "message": "Ez a megosztott játékprofil már telepítve van <bold>{instanceName} </bold> néven. Biztosan telepíteni szeretnél egy másik másolatot?"
+  },
+  "app.instance.shared-instance-already-installed.header": {
+    "message": "A megosztott játékprofil már telepítve van"
+  },
   "app.instance.shared-instance-already-installed.install-anyway": {
-    "message": "Telepítés mindenképpen"
+    "message": "Telepítés mindenképp"
   },
   "app.instance.shared-instance-already-installed.instance": {
-    "message": "Játékpéldány"
+    "message": "Játékprofil"
   },
   "app.instance.shared-instance-wrong-account.fallback-username": {
     "message": "az összekapcsolt fiók"
   },
   "app.instance.shared-instance-wrong-account.owner-admonition-body-v2": {
-    "message": ", hogy kezelhesd ezt a megosztott játékpéldányt. Nem fogod tudni a frissítéseket eljuttatni a felhasználókhoz."
+    "message": ", hogy kezelhesd ezt a megosztott játékprofilt. Nem fogod tudni közzétenni a frissítéseket."
   },
   "app.instance.shared-instance-wrong-account.sign-in-as-label": {
     "message": "Jelentkezz be mint"
@@ -504,7 +549,7 @@
     "message": "Be kell jelentkezned a Modrinthba"
   },
   "app.instance.shared-instance-wrong-account.user-admonition-body-v2": {
-    "message": ", hogy értesítéseket kapj erről a megosztott játékpéldányról."
+    "message": ", hogy frissítéseket kapj ehhez a megosztott játékprofilhoz."
   },
   "app.instance.shared-instance-wrong-account.warning-header": {
     "message": "Nem a megfelelő Modrinth-fiókot használod"
@@ -522,7 +567,7 @@
     "message": "Világ törlése"
   },
   "app.instance.worlds.delete-world-modal.warning-body": {
-    "message": "Ez a világ véglegesen törölve lesz ebből a játékpéldányból. Ezt NEM tudod visszavonni!"
+    "message": "Ez a világ véglegesen törölve lesz ebből a játékprofilból. Ezt NEM tudod visszavonni!"
   },
   "app.instance.worlds.delete-world-modal.warning-header": {
     "message": "{name} törlése"
@@ -545,6 +590,9 @@
   "app.instance.worlds.no-worlds-heading": {
     "message": "Nincs szerver vagy világ"
   },
+  "app.instance.worlds.refreshing": {
+    "message": "Újratöltés..."
+  },
   "app.instance.worlds.remove-server-modal.remove-button": {
     "message": "Szerver eltávolítása"
   },
@@ -560,14 +608,65 @@
   "app.instance.worlds.search-worlds-placeholder": {
     "message": "Keresés {count} világ között..."
   },
+  "app.java-detection.cancel": {
+    "message": "Mégse"
+  },
+  "app.java-detection.columns.actions": {
+    "message": "Műveletek"
+  },
+  "app.java-detection.columns.path": {
+    "message": "Elérési útvonal"
+  },
+  "app.java-detection.columns.version": {
+    "message": "Verzió"
+  },
+  "app.java-detection.no-installations-found": {
+    "message": "Nem találtunk Java-telepítést."
+  },
+  "app.java-detection.select": {
+    "message": "Kiválasztás"
+  },
+  "app.java-detection.selected": {
+    "message": "Kiválasztva"
+  },
+  "app.java-detection.title": {
+    "message": "Java-telepítés kiválasztása"
+  },
+  "app.java-selector.already-installed": {
+    "message": "Már telepítve van"
+  },
+  "app.java-selector.browse": {
+    "message": "Tallózás"
+  },
+  "app.java-selector.detect": {
+    "message": "Észlelés"
+  },
+  "app.java-selector.install-recommended": {
+    "message": "Ajánlott verzió telepítése"
+  },
+  "app.java-selector.installing": {
+    "message": "Telepítés..."
+  },
+  "app.java-selector.path.placeholder": {
+    "message": "/eleresi/ut/a/javahoz"
+  },
+  "app.java-selector.test-installation": {
+    "message": "Java-telepítés tesztelése"
+  },
   "app.modal.install-to-play.additional-context": {
     "message": "További kontextus"
   },
+  "app.modal.install-to-play.additional-context-placeholder": {
+    "message": "Ha lehetséges és hasznos, adj meg linkeket és képeket is"
+  },
+  "app.modal.install-to-play.block-user": {
+    "message": "Felhasználó letiltása"
+  },
   "app.modal.install-to-play.content-you-are-reporting": {
-    "message": "A játékpéldány, amelyet bejelenteni kívánsz"
+    "message": "A játékprofil, amelyet bejelenteni kívánsz"
   },
   "app.modal.install-to-play.delete-instance": {
-    "message": "Játékpéldány törlése"
+    "message": "Játékprofil törlése"
   },
   "app.modal.install-to-play.external-files-dont-install": {
     "message": "Ne telepítse"
@@ -576,7 +675,7 @@
     "message": "Telepítés a játékhoz"
   },
   "app.modal.install-to-play.install-anyway": {
-    "message": "Telepítés mindenképpen"
+    "message": "Telepítés mindenképp"
   },
   "app.modal.install-to-play.install-button": {
     "message": "Telepítés"
@@ -584,17 +683,56 @@
   "app.modal.install-to-play.invite-warning": {
     "message": "Ezt a meghívót nem a Modrinth, hanem egy másik Modrinth-felhasználó hozta létre. Csak olyan személyektől fogadd el a meghívásokat, akikben megbízol."
   },
+  "app.modal.install-to-play.invite-warning-with-creator": {
+    "message": "Ezt a meghívót <creator>{username}</creator> készítette, nem pedig a Modrinth. Csak olyan személyektől fogadd el a meghívásokat, akikben megbízol."
+  },
   "app.modal.install-to-play.mod-count": {
     "message": "{count} mod"
   },
+  "app.modal.install-to-play.report-description": {
+    "message": "Ezzel az űrlapmal jelentsd be azokat az eseteket, amelyek megsérthetik a <rules-link>Szabályzatunkat</rules-link> vagy a <terms-link>Felhasználási feltételeinket</terms-link>."
+  },
+  "app.modal.install-to-play.report-image-invalid-type": {
+    "message": "A fájl nem támogatott képfájlformátumot használ"
+  },
+  "app.modal.install-to-play.report-image-too-large": {
+    "message": "A fájl meghaladja az 1 MiB-os méretkorlátot"
+  },
+  "app.modal.install-to-play.report-legal-claims": {
+    "message": "A DMCA-bejelentésekkel és egyéb jogi igényekkel kapcsolatban lásd a <copyright-link>Szerzői jogi szabályzatunkat</copyright-link>."
+  },
+  "app.modal.install-to-play.report-reason": {
+    "message": "Melyik szabályt sérti meg ez az adott játékprofil?"
+  },
+  "app.modal.install-to-play.report-reason.inappropriate": {
+    "message": "Nem megfelelő"
+  },
+  "app.modal.install-to-play.report-reason.malicious": {
+    "message": "Káros"
+  },
   "app.modal.install-to-play.report-reason.spam": {
     "message": "Spam"
   },
+  "app.modal.install-to-play.report-shared-instance-header": {
+    "message": "Megosztott játékprofil jelentése"
+  },
+  "app.modal.install-to-play.report-submitted": {
+    "message": "Jelentés elküldve"
+  },
+  "app.modal.install-to-play.report-support-and-bugs": {
+    "message": "Ha segítségre van szükséged, vedd fel a kapcsolatot a <support-link>támogatási csapatunkkal</support-link>. Hibajelentésekhez nyiss egy <github-link>GitHub-issue-t</github-link>."
+  },
   "app.modal.install-to-play.reviewed-files": {
     "message": "Egy fájlt csak akkor vizsgálnak meg, ha azt a Modrinth-en közzétették, függetlenül a fájlformátumtól (beleértve a .mrpack formátumot is)."
   },
   "app.modal.install-to-play.shared-instance": {
-    "message": "Megosztott játékpéldány"
+    "message": "Megosztott játékprofil"
+  },
+  "app.modal.install-to-play.shared-instance-content": {
+    "message": "A megosztott játékprofil tartalma"
+  },
+  "app.modal.install-to-play.shared-instance-unknown-files-description": {
+    "message": "Ez a megosztott játékprofil olyan fájlokat tartalmaz, amelyek nincsenek közzétéve a Modrinthon. Határozottan javasoljuk, hogy kizárólag olyan forrásokból telepíts fájlokat, amelyekben megbízol."
   },
   "app.modal.install-to-play.unknown-files-description": {
     "message": "Ez a szerver-modpack olyan fájlokat tartalmaz, amelyek nem szerepelnek a Modrinth oldalon. Határozottan javasoljuk, hogy kizárólag olyan forrásokból telepíts fájlokat, amelyekben megbízol."
@@ -605,6 +743,9 @@
   "app.modal.install-to-play.unrecognized-files": {
     "message": "Felismerhetetlen fájlok"
   },
+  "app.modal.install-to-play.user-blocked": {
+    "message": "Felhasználó letiltva"
+  },
   "app.modal.install-to-play.view-contents": {
     "message": "Tartalom megtekintése"
   },
@@ -612,17 +753,68 @@
     "message": "Frissítsd a játékhoz"
   },
   "app.modal.update-to-play.removed": {
-    "message": "Törölve"
+    "message": "Eltávolítva"
+  },
+  "app.modal.update-to-play.server-modpack-unknown-files-description": {
+    "message": "Ez a szervermodcsomag-frissítés olyan fájlokat tartalmaz, amelyek nem találhatók meg a Modrinthen. Erősen javasoljuk, hogy csak megbízható forrásokból telepíts fájlokat."
+  },
+  "app.modal.update-to-play.shared-instance-added-label": {
+    "message": "Hozzáadva"
+  },
+  "app.modal.update-to-play.shared-instance-removed-label": {
+    "message": "Eltávolítva"
+  },
+  "app.modal.update-to-play.shared-instance-unknown-files-description": {
+    "message": "Ez a megosztott játékprofil-frissítés olyan fájlokat tartalmaz, amelyek nincsenek közzétéve a Modrinthon. Határozottan javasoljuk, hogy kizárólag olyan forrásokból telepíts fájlokat, amelyekben megbízol."
+  },
+  "app.modal.update-to-play.update-required": {
+    "message": "Frissítés szükséges"
+  },
+  "app.modal.update-to-play.update-required-description": {
+    "message": "Egy frssítés szükséges a(z) {name} játékprofilhoz. Kérjük, frissítsd a játékot a legújabb verzióra az indításhoz."
+  },
+  "app.nav.create-new-instance": {
+    "message": "Új játékprofil létrehozása"
+  },
+  "app.nav.home": {
+    "message": "Kezdőlap"
+  },
+  "app.nav.library": {
+    "message": "Könyvtár"
+  },
+  "app.nav.modrinth-account": {
+    "message": "Modrinth fiók"
+  },
+  "app.nav.modrinth-hosting": {
+    "message": "Modrinth Hosting"
+  },
+  "app.nav.sign-in-to-modrinth-account": {
+    "message": "Bejelentkezés egy Modrinth-fiókba"
+  },
+  "app.nav.signed-in-as": {
+    "message": "Bejelentkezve mint <user>{username}</user>"
+  },
+  "app.nav.upgrade-to-modrinth-plus": {
+    "message": "Frissíts a Modrinth+-ra"
+  },
+  "app.news.title": {
+    "message": "Hírek"
+  },
+  "app.news.view-all": {
+    "message": "Összes hír"
   },
   "app.project.install-button.already-installed": {
     "message": "Ez a projekt már telepítve van"
   },
   "app.project.install-button.switch-version": {
-    "message": "Verzió váltása"
+    "message": "Verzió váltás"
   },
   "app.project.install-context.back-to-browse": {
     "message": "Vissza a böngészéshez"
   },
+  "app.project.install-context.back-to-instance": {
+    "message": "Vissza a játékprofilhoz"
+  },
   "app.project.version.all-versions": {
     "message": "Összes verzió"
   },
@@ -633,7 +825,97 @@
     "message": "Telepítés..."
   },
   "app.project.versions.already-installed": {
-    "message": "Már le van töltve"
+    "message": "Már telepítve van"
+  },
+  "app.quick-instance-switcher.drag-show-tooltip": {
+    "message": "Húzd el a legutóbbi játékprofilok megjelenítéséhez"
+  },
+  "app.quick-instance-switcher.drag-tooltip": {
+    "message": "Átméretezés húzással"
+  },
+  "app.restarting": {
+    "message": "Újraindítás..."
+  },
+  "app.settings.app-version": {
+    "message": "Modrinth App {version}"
+  },
+  "app.settings.default-instance-options.environment-variables.description": {
+    "message": "A játékprofil indításakor beállított környezeti változók."
+  },
+  "app.settings.default-instance-options.environment-variables.placeholder": {
+    "message": "Adj meg környezeti változókat..."
+  },
+  "app.settings.default-instance-options.environment-variables.title": {
+    "message": "Környezeti változók"
+  },
+  "app.settings.default-instance-options.fullscreen.description": {
+    "message": "A játékprofilok elindítása teljes képernyős módban az options.txt fájl frissítésével."
+  },
+  "app.settings.default-instance-options.fullscreen.title": {
+    "message": "Teljes képernyő"
+  },
+  "app.settings.default-instance-options.height.description": {
+    "message": "A játék ablakának magassága indításkor."
+  },
+  "app.settings.default-instance-options.height.placeholder": {
+    "message": "Magasság megadása..."
+  },
+  "app.settings.default-instance-options.height.title": {
+    "message": "Magasság"
+  },
+  "app.settings.default-instance-options.java-arguments.description": {
+    "message": "A Javának a játékprofil indításakor átadott paraméterek."
+  },
+  "app.settings.default-instance-options.java-arguments.placeholder": {
+    "message": "Java-indítási paraméterek megadása..."
+  },
+  "app.settings.default-instance-options.java-arguments.title": {
+    "message": "Java-indítási paraméterek"
+  },
+  "app.settings.default-instance-options.memory-allocation.description": {
+    "message": "Az egyes játékprofilok számára rendelkezésre álló maximális memória."
+  },
+  "app.settings.default-instance-options.memory-allocation.title": {
+    "message": "Memóriakeret"
+  },
+  "app.settings.default-instance-options.post-exit-hook.description": {
+    "message": "A játék bezárása után fut le."
+  },
+  "app.settings.default-instance-options.post-exit-hook.placeholder": {
+    "message": "Adj meg egy kilépés utáni parancsot..."
+  },
+  "app.settings.default-instance-options.post-exit-hook.title": {
+    "message": "Kilépés utáni parancs"
+  },
+  "app.settings.default-instance-options.pre-launch-hook.description": {
+    "message": "A játékprofil indítása előtt fut le."
+  },
+  "app.settings.default-instance-options.pre-launch-hook.placeholder": {
+    "message": "Adj meg egy indítás előtti parancsot..."
+  },
+  "app.settings.default-instance-options.pre-launch-hook.title": {
+    "message": "Indítás előtti parancs"
+  },
+  "app.settings.default-instance-options.width.description": {
+    "message": "A játék ablakának szélessége indításkor."
+  },
+  "app.settings.default-instance-options.width.placeholder": {
+    "message": "Szélesség megadása..."
+  },
+  "app.settings.default-instance-options.width.title": {
+    "message": "Szélesség"
+  },
+  "app.settings.default-instance-options.wrapper-hook.description": {
+    "message": "A Minecraft indítási folyamatát körbefogó parancs."
+  },
+  "app.settings.default-instance-options.wrapper-hook.placeholder": {
+    "message": "Adj meg egy indítást körbefogó parancsot..."
+  },
+  "app.settings.default-instance-options.wrapper-hook.title": {
+    "message": "Indítást körbefogó parancs"
+  },
+  "app.settings.developer-mode-button.label": {
+    "message": "Fejlesztői mód bekapcsolása/kikapcsolása"
   },
   "app.settings.developer-mode-enabled": {
     "message": "Fejlesztői mód bekapcsolva."
@@ -641,14 +923,92 @@
   "app.settings.downloading": {
     "message": "v{version} letöltése"
   },
+  "app.settings.java-installations.location.title": {
+    "message": "A Java {version, number} helye"
+  },
+  "app.settings.operating-system.macos": {
+    "message": "macOS"
+  },
   "app.settings.privacy.ads-consent.intro": {
-    "message": "A hirdetések teszik lehetővé a Modrinth működését, és biztosítják a tartalomkészítők juttatásait. Partnereink sütiket tárolhatnak vagy érhetnek el az alkalmazásban a hirdetések személyre szabása és a teljesítmény mérése céljából. Az alábbiakban leiratkozhatsz erről, illetve beállíthatod a preferenciáidat."
+    "message": "A hirdetések teszik lehetővé a Modrinth működését, és biztosítják a tartalomkészítők juttatásait. Partnereink sütiket tárolhatnak vagy érhetnek el az alkalmazásban a hirdetések személyre szabása és a teljesítmény mérése céljából. Alább leiratkozhatsz erről, illetve beállíthatod a preferenciáidat."
+  },
+  "app.settings.privacy.discord-rich-presence.description": {
+    "message": "A Modrinth App megjelenítése aktuális tevékenységként a Discordon. Ez nem érinti a modok által a játékprofilokhoz hozzáadott Rich Presence-t. Az alkalmazás újraindítását igényli."
+  },
+  "app.settings.privacy.discord-rich-presence.title": {
+    "message": "Discord Rich Presence"
+  },
+  "app.settings.privacy.telemetry.description": {
+    "message": "A Modrinth névtelen használati és telemetriai adatokat gyűjt a felhasználói élmény javítása és személyre szabása érdekében. Ha kikapcsolod ezt a beállítást, leiratkozol erről, és a rendszer többé nem gyűjti az adataidat."
+  },
+  "app.settings.privacy.telemetry.title": {
+    "message": "Telemetria"
+  },
+  "app.settings.resource-management.always-show-copy-details.description": {
+    "message": "A „Részletek másolása” művelet megjelenítése, amíg a telepítés várólistán van vagy fut. A művelet mindig elérhető a sikertelen vagy megszakított telepítések esetén."
+  },
+  "app.settings.resource-management.always-show-copy-details.title": {
+    "message": "Mindig mutasd a Részletek másolását"
+  },
+  "app.settings.resource-management.app-cache.confirm.description": {
+    "message": "Az alkalmazás betöltése lassabb lehet, amíg a gyorsítótár újra nem települ."
+  },
+  "app.settings.resource-management.app-cache.confirm.title": {
+    "message": "Törlöd az alkalmazás gyorsítótárát?"
+  },
+  "app.settings.resource-management.app-cache.description": {
+    "message": "Letörli a gyorsítótárban tárolt adatokat, majd újra letölti azokat a Modrinthról. Az alkalmazás betöltése lassabb lehet, amíg a gyorsítótár újra nem települ."
+  },
+  "app.settings.resource-management.app-cache.purge": {
+    "message": "Gyorsítótár törlése"
+  },
+  "app.settings.resource-management.app-cache.title": {
+    "message": "Az alkalmazás gyorsítótára"
+  },
+  "app.settings.resource-management.app-database-backups.description": {
+    "message": "A fontos alkalmazásadatok biztonsági mentései itt kerülnek tárolásra arra az esetre, ha később vissza kellene állítanod őket."
+  },
+  "app.settings.resource-management.app-database-backups.open-folder": {
+    "message": "A biztonsági mentések mappájának megnyitása"
+  },
+  "app.settings.resource-management.app-database-backups.title": {
+    "message": "Alkalmazásadatbázis-biztonsági mentések"
+  },
+  "app.settings.resource-management.app-directory.browse": {
+    "message": "Alkalmazáskönyvtár tallózása"
+  },
+  "app.settings.resource-management.app-directory.description": {
+    "message": "A Modrinth App ebben a mappában tárolja a játékprofilokat és az egyéb fájlokat. A módosítások az alkalmazás újraindítása után lépnek érvénybe."
+  },
+  "app.settings.resource-management.app-directory.select": {
+    "message": "Új alkalmazáskönyvtár kiválasztása"
+  },
+  "app.settings.resource-management.app-directory.title": {
+    "message": "Alkalmazáskönyvtár"
+  },
+  "app.settings.resource-management.maximum-concurrent-downloads.description": {
+    "message": "Az egyszerre letölthető fájlok száma. Csökkentsd ezt az értéket, ha a letöltések gyakran sikertelenek a hálózati kapcsolatod miatt. Az alkalmazás újraindítása szükséges."
+  },
+  "app.settings.resource-management.maximum-concurrent-downloads.title": {
+    "message": "Maximális egyidejű letöltések"
+  },
+  "app.settings.resource-management.maximum-concurrent-writes.description": {
+    "message": "Az egyszerre lemezre írható fájlok száma. Csökkentsd ezt az értéket, ha gyakran tapasztalsz I/O-hibákat. Az alkalmazás újraindítása szükséges."
+  },
+  "app.settings.resource-management.maximum-concurrent-writes.title": {
+    "message": "Maximális egyidejű írási műveletek"
+  },
+  "app.settings.sidebar.label.instances": {
+    "message": "Játékprofilok"
   },
   "app.settings.tabs.appearance": {
     "message": "Megjelenés"
   },
+  "app.settings.tabs.behavior": {
+    "message": "Működés"
+  },
   "app.settings.tabs.default-instance-options": {
-    "message": "Alapértelmezett profil beállítások"
+    "message": "A játék alapbeállításai"
   },
   "app.settings.tabs.java-installations": {
     "message": "Telepített Java példányok"
@@ -662,14 +1022,17 @@
   "app.settings.tabs.resource-management": {
     "message": "Erőforráskezelés"
   },
+  "app.sidebar.playing-as": {
+    "message": "Játékfiók"
+  },
   "app.skins.add-button": {
     "message": "Kinézet hozzáadása"
   },
   "app.skins.add-button.drag-and-drop": {
-    "message": "Húzd ide a fájlt"
+    "message": "Húzd és ejtsd ide a fájlt"
   },
   "app.skins.apply-button": {
-    "message": "Alkalmazás"
+    "message": "Alkalmaz"
   },
   "app.skins.delete-button": {
     "message": "Kinézet törlése"
@@ -684,7 +1047,7 @@
     "message": "Nem sikerült beolvasni a feltöltött fájlt."
   },
   "app.skins.dropped-file-error.title": {
-    "message": "Hiba a fájl feldolgozása közben"
+    "message": "Hiba történt a fájl feldolgozása közben"
   },
   "app.skins.ears-feature-notice": {
     "message": "Ez a kinézet az {ears} mod funkcióit használja"
@@ -821,6 +1184,21 @@
   "app.skins.toggle-ears-features-on": {
     "message": "Bekapcsolás"
   },
+  "app.survey.body": {
+    "message": "Megosztanád velünk a tapasztalataidat a Modrinth App használatáról néhány kérdés megválaszolásával?"
+  },
+  "app.survey.footer": {
+    "message": "A visszajelzésed közvetlenül a Modrinth csapatához kerül, és segít a jövőbeli frissítések alakításában!"
+  },
+  "app.survey.no-thanks": {
+    "message": "Nem, köszönöm"
+  },
+  "app.survey.take-survey": {
+    "message": "Kérdőív kitöltése"
+  },
+  "app.survey.title": {
+    "message": "Hali, Modrinth-felhasználó!"
+  },
   "app.update-popup.body.download-complete": {
     "message": "A Modrinth App v{version} letöltése befejeződött. Frissítéshez válaszd ki a Frissítés opciót, vagy az alkalmazás a bezárásakor automatikusan frissül."
   },
@@ -837,7 +1215,7 @@
     "message": "Letöltés ({size})"
   },
   "app.update-popup.download-complete": {
-    "message": "Sikeres letöltés"
+    "message": "Letöltés befejezve"
   },
   "app.update-popup.reload": {
     "message": "Frissítés"
@@ -858,10 +1236,10 @@
     "message": "Válassz egy lehetőséget"
   },
   "app.world.world-item.incompatible-version": {
-    "message": "Inkompatibilis verzió: {version}"
+    "message": "Nem kompatibilis verzió: {version}"
   },
   "app.world.world-item.not-played-yet": {
-    "message": "Még nem játszottál"
+    "message": "Még nem játszott"
   },
   "app.world.world-item.offline": {
     "message": "Offline"
@@ -869,6 +1247,39 @@
   "app.world.world-item.players-online": {
     "message": "{count} online"
   },
+  "content.shared-instance.change-version-body": {
+    "message": "A verzió módosítása csak a helyi játékprofilt érinti. A megosztott játékprofil jövőbeli frissítései felülírhatják vagy ismét megváltoztathatják azt."
+  },
+  "content.shared-instance.delete-bulk-body": {
+    "message": "A kiválasztott projektek egy része a megosztott játékprofil része. Törlésük csak a helyi játékprofilt módosítja, és a megosztott játékprofil jövőbeli frissítései visszaállíthatják vagy ismét módosíthatják őket."
+  },
+  "content.shared-instance.delete-button": {
+    "message": "Törlés mindenképp"
+  },
+  "content.shared-instance.delete-many-button": {
+    "message": "{count, number} projekt törlése mindenképp"
+  },
+  "content.shared-instance.delete-single-body": {
+    "message": "A törlése csak a helyi játékprofilt módosítja. A megosztott játékprofil jövőbeli frissítései visszaállíthatják vagy ismét módosíthatják."
+  },
+  "content.shared-instance.disable-bulk-body": {
+    "message": "A kiválasztott projektek egy része a megosztott játékprofil része. Letiltásuk csak a helyi játékprofilt módosítja, és a megosztott játékprofil jövőbeli frissítései újra engedélyezhetik, visszaállíthatják vagy ismét módosíthatják őket."
+  },
+  "content.shared-instance.disable-button": {
+    "message": "Letíltás mindenképp"
+  },
+  "content.shared-instance.disable-many-button": {
+    "message": "{count, number} projekt letíltása mindenképp"
+  },
+  "content.shared-instance.disable-single-body": {
+    "message": "A letiltása csak a helyi játékprofilt módosítja. A megosztott játékprofil jövőbeli frissítései újra engedélyezhetik, visszaállíthatják vagy ismét módosíthatják."
+  },
+  "content.shared-instance.unlink-body": {
+    "message": "A leválasztás csak a helyi játékprofilt érinti. A megosztott játékprofil jövőbeli frissítései felülírhatják vagy ismét megváltoztathatják azt."
+  },
+  "content.shared-instance.warning-header": {
+    "message": "Ez egy megosztott játékprofil része"
+  },
   "friends.action.add-friend": {
     "message": "Barát hozzáadása"
   },
@@ -932,14 +1343,47 @@
   "friends.sign-in-to-add-friends": {
     "message": "<link>Lépj be Modrinth fiókodba</link>, hogy felvehess barátokat és lásd mivel játszanak!"
   },
+  "installation-settings.shared-instance.linked-title": {
+    "message": "Összekapcsolt megosztott játékprofil"
+  },
+  "installation-settings.shared-instance.title": {
+    "message": "Játékprofil megosztásának visszavonása"
+  },
+  "installation-settings.shared-instance.unlink-button": {
+    "message": "Megosztott játékprofil leválasztása"
+  },
+  "installation-settings.shared-instance.unlink-description": {
+    "message": "Leválasztja ezt a helyi játékprofilt a jövőbeli megosztott frissítésekről."
+  },
+  "installation-settings.shared-instance.unlinking-button": {
+    "message": "Leválasztás..."
+  },
+  "installation-settings.shared-instance.unpublish-button": {
+    "message": "Megosztott játékprofil megosztásának visszavonása"
+  },
+  "installation-settings.shared-instance.unpublish-description": {
+    "message": "Eltávolítja ezt a megosztott játékprofilt a Modrinthból, és nem küld többé frissítéseket azoknak, akik használják. A helyi játékprofilodat ez nem érinti."
+  },
   "installation-settings.shared-instance.unpublishing-button": {
     "message": "Közzététel visszavonása..."
   },
+  "installation-settings.unlink-shared-instance.modal.admonition-body": {
+    "message": "Ez kizárólag a helyi játékprofilodra vonatkozik. A telepített tartalmaid ezen az eszközön maradnak, és ez nem érinti a megosztott játékprofilt, illetve az azt használó többi felhasználót."
+  },
   "installation-settings.unlink-shared-instance.modal.admonition-header": {
-    "message": "Megosztott játékpéldány leválasztása"
+    "message": "Megosztott játékprofil leválasztása"
   },
   "installation-settings.unlink-shared-instance.modal.header": {
-    "message": "Megosztott játékpéldány leválasztása"
+    "message": "Megosztott játékprofil leválasztása"
+  },
+  "installation-settings.unpublish-shared-instance.modal.admonition-body": {
+    "message": "Ezzel a megosztott játékprofil törlődik a Modrinth szervereiről. A Modrinth Appban az ezt használók többé nem kapnak frissítéseket, de a helyi játékprofil és annak tartalma továbbra is ezen az eszközön marad."
+  },
+  "installation-settings.unpublish-shared-instance.modal.admonition-header": {
+    "message": "Visszavonod a megosztott játékprofil megosztását"
+  },
+  "installation-settings.unpublish-shared-instance.modal.header": {
+    "message": "Megosztott játékprofil megosztásának visszavonása"
   },
   "instance.action.create-shortcut": {
     "message": "Parancsikon létrehozása"
@@ -948,7 +1392,7 @@
     "message": "Modcsomag exportálása"
   },
   "instance.action.launch-instance": {
-    "message": "Játékpéldány elindítása"
+    "message": "Játékprofil elindítása"
   },
   "instance.action.more-actions": {
     "message": "További műveletek"
@@ -960,7 +1404,7 @@
     "message": "Javítás"
   },
   "instance.action.settings": {
-    "message": "Játékpéldány-beállítások"
+    "message": "Játékprofil beállításai"
   },
   "instance.action.starting": {
     "message": "Indítás..."
@@ -1011,7 +1455,10 @@
     "message": "Mentés másként..."
   },
   "instance.locked.delete-button": {
-    "message": "Játékpéldány törlése"
+    "message": "Játékprofil törlése"
+  },
+  "instance.locked.play-tooltip": {
+    "message": "Ez a játékprofil zárolva van"
   },
   "instance.playtime.never-played": {
     "message": "Még nem játszott"
@@ -1028,17 +1475,56 @@
   "instance.server-modal.resource-pack": {
     "message": "Forráscsomag"
   },
+  "instance.settings.sharing.active-invites.actions": {
+    "message": "Műveletek"
+  },
+  "instance.settings.sharing.active-invites.code": {
+    "message": "Meghívó link"
+  },
+  "instance.settings.sharing.active-invites.description": {
+    "message": "Bárki, akinek van ilyen meghívó linkje, csatlakozhat, amíg az aktív marad."
+  },
+  "instance.settings.sharing.active-invites.empty": {
+    "message": "Nincsenek aktív meghívások."
+  },
+  "instance.settings.sharing.active-invites.expires": {
+    "message": "Lejár"
+  },
+  "instance.settings.sharing.active-invites.revoke": {
+    "message": "Meghívó törlése"
+  },
+  "instance.settings.sharing.active-invites.revoke-with-code": {
+    "message": "A(z) {code} meghívó törlése"
+  },
+  "instance.settings.sharing.active-invites.title": {
+    "message": "Aktív meghívások"
+  },
+  "instance.settings.sharing.active-invites.uses": {
+    "message": "Használatok"
+  },
+  "instance.settings.sharing.revoke-invite.admonition-body": {
+    "message": "A(z) <monospace>{code}</monospace> meghívó link azonnal érvényét veszti. Azok, akik már csatlakoztak, továbbra is hozzáférhetnek."
+  },
+  "instance.settings.sharing.revoke-invite.admonition-header": {
+    "message": "Ezt a műveletet nem lehet visszavonni"
+  },
+  "instance.settings.sharing.revoke-invite.confirm": {
+    "message": "Meghívó törlése"
+  },
+  "instance.settings.sharing.revoke-invite.header": {
+    "message": "Meghívó törlése"
+  },
   "instance.settings.tabs.general": {
     "message": "Általános"
   },
   "instance.settings.tabs.general.delete": {
-    "message": "Játékpéldány törlése"
+    "message": "Játékprofil törlése"
   },
   "instance.settings.tabs.general.delete.button": {
-    "message": "Játékpéldány törlése"
+    "message": "Játékprofil törlése"
   },
   "instance.settings.tabs.general.delete.description": {
-    "message": "Örökké eltávolít egy játékpéldányt az eszközről, beleértve a világait, beállításait és minden telepített tartalmat. Legyél óvatos, mert ha egyszer kitörölsz egy játékpéldányt, azt többé nem lehet visszaállítani."
+    "message": "Örökké eltávolít egy játékprofilt az eszközről, beleértve a világait, beállításait és minden telepített tartalmat. Legyél óvatos, mert ha egyszer kitörölsz egy játékprofilt, azt többé nem lehet visszaállítani."
   },
   "instance.settings.tabs.general.deleting.button": {
     "message": "Törlés..."
@@ -1050,10 +1536,10 @@
     "message": "Telepítés közben nem lehet duplikálni."
   },
   "instance.settings.tabs.general.duplicate-instance": {
-    "message": "Játékpéldány duplikálása"
+    "message": "Játékprofil duplikálása"
   },
   "instance.settings.tabs.general.duplicate-instance.description": {
-    "message": "Készít egy másolatot erről a játékpéldányról, beleértve a világokat, beállításokat, modokat stb."
+    "message": "Készít egy másolatot erről a játékprofilról, beleértve a világokat, beállításokat, modokat stb."
   },
   "instance.settings.tabs.general.edit-icon": {
     "message": "Ikon szerkesztése"
@@ -1074,7 +1560,7 @@
     "message": "Új gyűjtemény létrehozása"
   },
   "instance.settings.tabs.general.library-groups.description": {
-    "message": "A könyvtárgyűjtemények segítenek külön kategóriákba rendszerezni a játékpéldányokat."
+    "message": "A könyvtárgyűjtemények segítenek külön kategóriákba rendszerezni a játékprofilokat."
   },
   "instance.settings.tabs.general.library-groups.enter-name": {
     "message": "Add meg a gyűjtemény nevét"
@@ -1128,7 +1614,7 @@
     "message": "Indítás előtt"
   },
   "instance.settings.tabs.hooks.pre-launch.description": {
-    "message": "Futtatás a játékpéldány futtatása előtt."
+    "message": "Futtatás a játékprofil futtatása előtt."
   },
   "instance.settings.tabs.hooks.pre-launch.enter": {
     "message": "Írjon be indítás előtti parancsokat..."
@@ -1151,6 +1637,9 @@
   "instance.settings.tabs.installation.loader-version": {
     "message": "{loader} verzió"
   },
+  "instance.settings.tabs.installation.locked": {
+    "message": "A telepítési beállítások nem érhetők el, amíg ez a játékprofil zárolva van."
+  },
   "instance.settings.tabs.java": {
     "message": "Java és memória"
   },
@@ -1158,7 +1647,7 @@
     "message": "Egyéni környezeti változók"
   },
   "instance.settings.tabs.java.custom-java-arguments": {
-    "message": "Egyéni Java argumentumok"
+    "message": "Egyéni Java-indítási paraméterek"
   },
   "instance.settings.tabs.java.custom-java-installation": {
     "message": "Egyedi Java telepítés"
@@ -1167,10 +1656,10 @@
     "message": "Egyéni memóriakiosztás"
   },
   "instance.settings.tabs.java.enter-environment-variables": {
-    "message": "Írja be a környezeti változókat..."
+    "message": "Környezeti változók megadása..."
   },
   "instance.settings.tabs.java.enter-java-arguments": {
-    "message": "Java argumentumok megadása..."
+    "message": "Java-indítási paraméterek megadása..."
   },
   "instance.settings.tabs.java.environment-variables": {
     "message": "Környezeti változók"
@@ -1179,7 +1668,7 @@
     "message": "Horgok"
   },
   "instance.settings.tabs.java.java-arguments": {
-    "message": "Java argumentumok"
+    "message": "Java-indítási paraméterek"
   },
   "instance.settings.tabs.java.java-installation": {
     "message": "Java telepítés"
@@ -1223,17 +1712,62 @@
   "instance.settings.tabs.window.width.enter": {
     "message": "Szélesség megadása..."
   },
+  "instance.shared-instance.error.title": {
+    "message": "Valami hiba történt"
+  },
+  "instance.shared-instance.network-error.text": {
+    "message": "Nem sikerült csatlakozni a megosztott játékprofilok API-jához"
+  },
+  "instance.shared-instance.network-error.title": {
+    "message": "Hálózati hiba"
+  },
+  "instance.shared-instance.owner-tooltip": {
+    "message": "Ennek a játékprofilnak a tartalma meg van osztva más felhasználókkal."
+  },
   "instance.shared-instance.publish-review.added-label": {
-    "message": "Hozzáadva"
+    "message": "Hozzáadva:"
+  },
+  "instance.shared-instance.publish-review.admonition-header": {
+    "message": "Frissítés közzététele a játékosoknak"
+  },
+  "instance.shared-instance.publish-review.config-title-v2": {
+    "message": "Konfigurációs fájlok kiválasztása"
+  },
+  "instance.shared-instance.publish-review.description": {
+    "message": "Ellenőrizd a tartalmi módosításokat, és válaszd ki azokat a konfigurációs fájlokat, amelyeket be szeretnél vonni ebbe a frissítésbe."
   },
   "instance.shared-instance.publish-review.header": {
     "message": "Változtatások áttekintése"
   },
+  "instance.shared-instance.publish-review.publish-button": {
+    "message": "Frissítés közzététele"
+  },
   "instance.shared-instance.publish-review.removed-label": {
-    "message": "Eltávolítva"
+    "message": "Eltávolítva:"
+  },
+  "instance.shared-instance.tooltip": {
+    "message": "Ennek a játékprofilynak a tartalmát más kezeli."
+  },
+  "instance.shared-instance.unavailable.access-revoked-text": {
+    "message": "A megosztott játékprofilhoz való hozzáférésedet visszavonták. Ez a játékprofil továbbra is elérhető, de már nincs összekapcsolva, és többé nem kap frissítéseket."
+  },
+  "instance.shared-instance.unavailable.deleted-text": {
+    "message": "Az elsődleges játékprofilt törölték. Ez a játékprofil továbbra is elérhető, de már nincs összekapcsolva, és többé nem kap frissítéseket."
+  },
+  "instance.shared-instance.unavailable.locked-text": {
+    "message": "Ezt a megosztott játékprofilt a Tartalommoderációs csapat zárolta. Többé nem kap frissítéseket az elsődleges játékprofiltól, és nem lehet játszani vele."
   },
   "instance.shared-instance.unavailable.locked-title": {
-    "message": "Pédány lezárva"
+    "message": "Játékprofil zárolva"
+  },
+  "instance.shared-instance.unavailable.manager-fallback": {
+    "message": "a játékprofil-kezelő"
+  },
+  "instance.shared-instance.unavailable.text": {
+    "message": "A te gépeden lévő játékprofil továbbra is elérhető, de már nincs összekapcsolva, és többé nem kap frissítéseket."
+  },
+  "instance.shared-instance.unavailable.title": {
+    "message": "A megosztott játékprofil már nem elérhető"
   },
   "instance.worlds.a_minecraft_server": {
     "message": "Egy Minecraft szerver"
@@ -1251,7 +1785,7 @@
     "message": "Ne mutasd a kezdőlapon"
   },
   "instance.worlds.game_already_open": {
-    "message": "A játékpéldány már el van indítva"
+    "message": "A játékprofil már el van indítva"
   },
   "instance.worlds.hardcore": {
     "message": "Hardcore mód"
@@ -1272,10 +1806,10 @@
     "message": "Csak Minecraft 1.20+-tól tudsz egyből egyjátékos világba belépni"
   },
   "instance.worlds.play_instance": {
-    "message": "Játékpéldány indítása"
+    "message": "Játékprofil indítása"
   },
   "instance.worlds.view_instance": {
-    "message": "Játékpéldány megtekintése"
+    "message": "Játékprofil megtekintése"
   },
   "instance.worlds.world_in_use": {
     "message": "A világ használatban van"
@@ -1290,7 +1824,7 @@
     "message": "Nem vagy bejelentkezve"
   },
   "minecraft-account.remove-account": {
-    "message": "Fiók törlése"
+    "message": "Fiók eltávolítása"
   },
   "minecraft-account.select-account": {
     "message": "Fiók kiválasztása"
@@ -1299,7 +1833,7 @@
     "message": "Bejelentkezés a Minecraftba"
   },
   "minecraft-required.description": {
-    "message": "A játék elindításához és játszásához szükséged van egy olyan Microsoft-fiókra, amelyhez a Minecraft tartozik."
+    "message": "A játék indítása és használata előtt rendelkezned kell egy Microsoft-fiókkal, amelyhez Minecraft tartozik."
   },
   "minecraft-required.description-header": {
     "message": "Bejelentkezés egy Microsoft-fiókba"
@@ -1311,7 +1845,7 @@
     "message": "Szerezd be a Minecraftot!"
   },
   "minecraft-required.get-support": {
-    "message": "Támogatás"
+    "message": "Segítség kérése"
   },
   "minecraft-required.header": {
     "message": "Minecraft szükséges"
@@ -1319,17 +1853,29 @@
   "minecraft-required.sign-in": {
     "message": "Bejelentkezés a Microsft-ba"
   },
+  "modal.modrinth-account-required.browser-description": {
+    "message": "Megnyílt egy új lap a bejelentkezéshez. Végezd el ott a bejelentkezést, majd térj vissza az alkalmazásba."
+  },
   "modal.modrinth-account-required.cancel-button": {
     "message": "Mégse"
   },
+  "modal.modrinth-account-required.continue-in-browser-heading": {
+    "message": "Folytatás a böngészőben"
+  },
   "modal.modrinth-account-required.create-account-button": {
     "message": "Fiók létrehozása"
   },
+  "modal.modrinth-account-required.description": {
+    "message": "Ahhoz, hogy ezt a funkciót használhas, be kell jelentkeznie a Modrinth-fiókjába."
+  },
   "modal.modrinth-account-required.header": {
     "message": "Fiók szükséges"
   },
+  "modal.modrinth-account-required.open-browser-again-button": {
+    "message": "Böngésző megnyitása újra"
+  },
   "modal.modrinth-account-required.sign-in-button": {
-    "message": "Jelentkezz be a Modrinth-be"
+    "message": "Jelentkezz be a Modrinthbe"
   },
   "modal.modrinth-account-required.sign-in-heading": {
     "message": "Jelentkezz be egy Modrinth-fiókba"
@@ -1337,17 +1883,20 @@
   "modal.modrinth-account-required.signing-in-header": {
     "message": "Bejelentkezés"
   },
+  "modal.modrinth-account-required.support-prompt": {
+    "message": "Problémád van a bejelentkezéssel? <support>Segítség</support>"
+  },
   "modal.modrinth-account-required.waiting-for-browser": {
     "message": "Várakozás a böngésző megerősítésére..."
   },
   "search.filter.locked.instance": {
-    "message": "A játékpéldány által van megadva"
+    "message": "A játékprofil által van megadva"
   },
   "search.filter.locked.instance-game-version.title": {
-    "message": "A játékverziót az adott játékpéldány biztosítja"
+    "message": "A játékverziót az adott játékprofil biztosítja"
   },
   "search.filter.locked.instance-loader.title": {
-    "message": "A betöltőt az adott játékpéldány biztosítja"
+    "message": "A betöltőt az adott játékprofil biztosítja"
   },
   "search.filter.locked.instance.sync": {
     "message": "Szinkronizálás a játékpéldánnyal"
@@ -1356,12 +1905,18 @@
     "message": "A szerver által van megadva"
   },
   "search.filter.locked.server-environment.title": {
-    "message": "Csak kliensoldali modok adhatók hozzá a szerverpéldányhoz"
+    "message": "Csak kliensoldali modok adhatók hozzá a szerverprofilhoz"
   },
   "search.filter.locked.server-game-version.title": {
     "message": "A játékverziót az adott szerver biztosítja"
   },
   "search.filter.locked.server-loader.title": {
     "message": "A betöltőt az adott szerver biztosítja"
+  },
+  "settings.sidebar.label.account": {
+    "message": "Fiók"
+  },
+  "settings.sidebar.label.display": {
+    "message": "Kijelző"
   }
 }
diff --git a/apps/app-frontend/src/locales/id-ID/index.json b/apps/app-frontend/src/locales/id-ID/index.json
index e98bfcd2b2..3e426bee82 100644
--- a/apps/app-frontend/src/locales/id-ID/index.json
+++ b/apps/app-frontend/src/locales/id-ID/index.json
@@ -44,21 +44,12 @@
   "app.action-bar.view-logs": {
     "message": "Lihat catatan"
   },
-  "app.appearance-settings.advanced-rendering.description": {
-    "message": "Menghidupkan renderasi tingkat lanjut seperti efek buram yang dapat menyebabkan masalah kinerja tanpa renderasi yang dipercepat perangkat keras."
-  },
   "app.appearance-settings.advanced-rendering.title": {
     "message": "Renderasi tingkat lanjut"
   },
-  "app.appearance-settings.color-theme.description": {
-    "message": "Pilih tema warna pilihan Anda untuk Modrinth App."
-  },
   "app.appearance-settings.color-theme.title": {
     "message": "Tema warna"
   },
-  "app.appearance-settings.default-landing-page.description": {
-    "message": "Ubah halaman utama yang dibuka oleh peluncur."
-  },
   "app.appearance-settings.default-landing-page.home": {
     "message": "Beranda"
   },
@@ -68,45 +59,15 @@
   "app.appearance-settings.default-landing-page.title": {
     "message": "Halaman arahan bawaan"
   },
-  "app.appearance-settings.hide-nametag.description": {
-    "message": "Mematikan label nama di atas wujud pemain Anda pada halaman rupa."
-  },
   "app.appearance-settings.hide-nametag.title": {
     "message": "Sembunyikan label nama"
   },
-  "app.appearance-settings.jump-back-into-worlds.description": {
-    "message": "Menyertakan dunia terkini dalam bagian \"Masuk kembali\" pada Beranda."
-  },
   "app.appearance-settings.jump-back-into-worlds.title": {
     "message": "Masuk kembali ke dunia"
   },
-  "app.appearance-settings.minimize-launcher.description": {
-    "message": "Kecilkan pluncur ketika proses Minecraft berjalan."
-  },
-  "app.appearance-settings.minimize-launcher.title": {
-    "message": "Kecilkan peluncur"
-  },
-  "app.appearance-settings.native-decorations.description": {
-    "message": "Gunakan bingkai jendela sistem (wajib menjalankan ulang aplikasi)."
-  },
-  "app.appearance-settings.native-decorations.title": {
-    "message": "Hiasan asli"
-  },
-  "app.appearance-settings.show-play-time.description": {
-    "message": "Menampilkan seberapa lama Anda memainkan sebuah instans."
-  },
   "app.appearance-settings.show-play-time.title": {
     "message": "Tampilkan waktu bermain"
   },
-  "app.appearance-settings.toggle-sidebar.description": {
-    "message": "Menghidupkan kemampuan untuk menghidupkan dan mematikan bilah sisi."
-  },
-  "app.appearance-settings.toggle-sidebar.title": {
-    "message": "Hidup/matikan bilah sisi"
-  },
-  "app.appearance-settings.unknown-pack-warning.description": {
-    "message": "Bila Anda mencoba memasangkan berkas Modrinth Pack (.mrpack) yang tidak dihoskan pada Modrinth, kami akan memastikan Anda untuk memahami risikonya sebelum memasangkannya."
-  },
   "app.appearance-settings.unknown-pack-warning.title": {
     "message": "Peringatkan saya sebelum memasang paket mod tidak dikenal"
   },
@@ -272,9 +233,6 @@
   "app.settings.tabs.appearance": {
     "message": "Tampilan"
   },
-  "app.settings.tabs.default-instance-options": {
-    "message": "Pilihan instans bawaan"
-  },
   "app.settings.tabs.java-installations": {
     "message": "Pemasangan Java"
   },
diff --git a/apps/app-frontend/src/locales/it-IT/index.json b/apps/app-frontend/src/locales/it-IT/index.json
index bd97c44f95..34de8b2a76 100644
--- a/apps/app-frontend/src/locales/it-IT/index.json
+++ b/apps/app-frontend/src/locales/it-IT/index.json
@@ -15,7 +15,7 @@
     "message": "Copiati"
   },
   "app.action-bar.install.copy-details": {
-    "message": "Copia dettagli"
+    "message": "Copia info"
   },
   "app.action-bar.install.dismiss": {
     "message": "Ignora"
@@ -144,19 +144,19 @@
     "message": "La tua privacy e come le pubblicità supportano Modrinth"
   },
   "app.appearance-settings.advanced-rendering.description": {
-    "message": "Abilita alcuni effetti come la sfocatura, ma può causare problemi di prestazioni senza accelerazione hardware."
+    "message": "Abilita effetti come lo sfondo sfocato. Questo potrebbe ridurre le prestazioni senza accelerazione hardware."
   },
   "app.appearance-settings.advanced-rendering.title": {
     "message": "Rendering avanzato"
   },
   "app.appearance-settings.color-theme.description": {
-    "message": "Scegli il tema che Modrinth App userà su questo dispositivo."
+    "message": "Scegli il tema usato da Modrinth App."
   },
   "app.appearance-settings.color-theme.title": {
     "message": "Tema"
   },
   "app.appearance-settings.default-landing-page.description": {
-    "message": "Imposta la pagina che si aprirà all'avvio del launcher."
+    "message": "Scegli la pagina che Modrinth App mostrerà all'avvio."
   },
   "app.appearance-settings.default-landing-page.home": {
     "message": "Home"
@@ -168,10 +168,10 @@
     "message": "Pagina di avvio"
   },
   "app.appearance-settings.hide-nametag.description": {
-    "message": "Rimuove il nametag sopra la testa del giocatore nella pagina delle skin."
+    "message": "Nasconde il tuo nome dalle anteprime della pagina delle Skin."
   },
   "app.appearance-settings.hide-nametag.title": {
-    "message": "Nascondi il nome"
+    "message": "Nascondi nome"
   },
   "app.appearance-settings.jump-back-into-worlds.description": {
     "message": "Elenca i mondi recenti nella sezione \"Avvio rapido\" della pagina Home."
@@ -180,37 +180,37 @@
     "message": "Avvio rapido nei mondi"
   },
   "app.appearance-settings.minimize-launcher.description": {
-    "message": "Riduci il launcher a icona quando si avvia Minecraft."
+    "message": "Minimizza l'app all'avvio di Minecraft."
   },
   "app.appearance-settings.minimize-launcher.title": {
-    "message": "Riduci a icona"
+    "message": "Minimizza app"
   },
   "app.appearance-settings.native-decorations.description": {
-    "message": "Usa la cornice di sistema (riavvio necessario)."
+    "message": "Usa la barra e i controlli delle finestre di sistema. Richiede un riavvio."
   },
   "app.appearance-settings.native-decorations.title": {
-    "message": "Decorazioni native"
+    "message": "Usa cornice di sistema"
   },
   "app.appearance-settings.show-play-time.description": {
-    "message": "Mostra quanto tempo hai speso giocando a un'istanza."
+    "message": "Mostra quanto tempo hai giocato a un'istanza."
   },
   "app.appearance-settings.show-play-time.title": {
-    "message": "Mostra le ore di gioco"
+    "message": "Mostra ore di gioco"
   },
   "app.appearance-settings.skip-non-essential-warnings.description": {
-    "message": "Salta automaticamente le conferme a basso rischio, come l'installazione di pacchetti di mod duplicati, la normale eliminazione di contenuti, gli aggiornamenti simultanei, lo scollegare i pacchetti di mod e le richieste di riparazione. Le avvertenze verranno comunque mostrate."
+    "message": "Salta le conferme a basso rischio come l'installazione duplicata, l'eliminazione di contenuti, gli aggiornamenti simultanei, lo scollegare e il riparare. Gli avvisi per operazioni pericolose verranno comunque mostrati."
   },
   "app.appearance-settings.skip-non-essential-warnings.title": {
-    "message": "Salta le conferme meno importanti"
+    "message": "Salta conferme meno importanti"
   },
   "app.appearance-settings.toggle-sidebar.description": {
-    "message": "Mostra o nascondi la barra laterale."
+    "message": "Nascondi la barra laterale destra e aggiungi un pulsante per mostrarla."
   },
   "app.appearance-settings.toggle-sidebar.title": {
-    "message": "Abilita la barra laterale"
+    "message": "Nascondi barra laterale destra"
   },
   "app.appearance-settings.unknown-pack-warning.description": {
-    "message": "Mostrerà un avviso prima di installare un file Modrinth Pack (.mrpack) non proveniente da Modrinth, a causa dei possibili rischi."
+    "message": "Mostra un avviso di sicurezza prima di installare un Modrinth Pack (.mrpack) non disponibile su Modrinth."
   },
   "app.appearance-settings.unknown-pack-warning.title": {
     "message": "Avvisami quando installo pacchetti sconosciuti"
@@ -221,6 +221,15 @@
   "app.auth-servers.unreachable.header": {
     "message": "Impossibile raggiungere i server di autenticazione"
   },
+  "app.behavior-settings.confirmations.title": {
+    "message": "Conferme"
+  },
+  "app.behavior-settings.content.title": {
+    "message": "Home e contenuti"
+  },
+  "app.behavior-settings.startup-and-navigation.title": {
+    "message": "Avvio e navigazione"
+  },
   "app.browse.add-servers-to-instance": {
     "message": "Aggiungendo il server all'istanza"
   },
@@ -242,12 +251,18 @@
   "app.browse.back-to-instance": {
     "message": "Torna all'istanza"
   },
+  "app.browse.discover-project-type": {
+    "message": "Scopri {projectType}"
+  },
   "app.browse.discover-servers": {
     "message": "Sfoglia i server"
   },
   "app.browse.hide-added-servers": {
     "message": "Nascondi server già aggiunti"
   },
+  "app.browse.hide-installed-modpacks": {
+    "message": "Nascondi già installati"
+  },
   "app.browse.project-type.modpacks": {
     "message": "Pacchetti di mod"
   },
@@ -362,9 +377,18 @@
   "app.instance.admonitions.shared-instance.review-header": {
     "message": "Revisiona modifiche"
   },
+  "app.instance.admonitions.shared-instance.review-update-button": {
+    "message": "Revisiona aggiornamento"
+  },
   "app.instance.admonitions.shared-instance.reviewing-button": {
     "message": "Revisione..."
   },
+  "app.instance.admonitions.shared-instance.update-available-body": {
+    "message": "{name} richiede degli aggiornamenti. Installa l'ultima versione per poter giocare."
+  },
+  "app.instance.admonitions.shared-instance.update-available-header": {
+    "message": "Aggiornamento disponibile"
+  },
   "app.instance.confirm-delete.admonition-body": {
     "message": "Tutti i dati della tua istanza verranno eliminati permanentemente, inclusi i tuoi mondi, configurazioni e tutti i contenuti installati."
   },
@@ -428,6 +452,9 @@
   "app.instance.share.invite-modal.heading": {
     "message": "Condividi {name}"
   },
+  "app.instance.share.invite-modal.user-limit-reached": {
+    "message": "Questa istanza ha raggiunto il limite di {limit} utenti."
+  },
   "app.instance.share.locked.empty-description-prefix": {
     "message": "Devi effettuare l'accesso come"
   },
@@ -446,6 +473,12 @@
   "app.instance.share.locked.wrong-account-heading": {
     "message": "Account sbagliato"
   },
+  "app.instance.share.members.empty": {
+    "message": "Nessun utente è entrato"
+  },
+  "app.instance.share.members.no-filter-results": {
+    "message": "Nessun utente corrisponde ai filtri."
+  },
   "app.instance.share.remove-user-modal.effect-access": {
     "message": "Non riceveranno più gli aggiornamenti di questa istanza condivisa"
   },
@@ -476,6 +509,12 @@
   "app.instance.share.sign-in.button": {
     "message": "Accedi"
   },
+  "app.instance.share.unable-to-connect.description": {
+    "message": "Il servizio delle istanze condivise non è disponibile al momento, riprova più tardi"
+  },
+  "app.instance.share.unable-to-connect.heading": {
+    "message": "Impossibile connettersi"
+  },
   "app.instance.share.unlink.body": {
     "message": "Devi scollegare questo pacchetto per condividere l'istanza"
   },
@@ -548,6 +587,9 @@
   "app.instance.worlds.no-worlds-heading": {
     "message": "Nessun server o mondo aggiunto"
   },
+  "app.instance.worlds.refreshing": {
+    "message": "Ricaricamento..."
+  },
   "app.instance.worlds.remove-server-modal.remove-button": {
     "message": "Rimuovi server"
   },
@@ -563,14 +605,62 @@
   "app.instance.worlds.search-worlds-placeholder": {
     "message": "Cerca tra {count} mondi..."
   },
+  "app.java-detection.cancel": {
+    "message": "Annulla"
+  },
+  "app.java-detection.columns.actions": {
+    "message": "Azioni"
+  },
+  "app.java-detection.columns.path": {
+    "message": "Percorso"
+  },
+  "app.java-detection.columns.version": {
+    "message": "Versione"
+  },
+  "app.java-detection.no-installations-found": {
+    "message": "Nessuna installazione di Java trovata."
+  },
+  "app.java-detection.select": {
+    "message": "Seleziona"
+  },
+  "app.java-detection.selected": {
+    "message": "Selezionata"
+  },
+  "app.java-detection.title": {
+    "message": "Seleziona l'installazione di Java"
+  },
+  "app.java-selector.already-installed": {
+    "message": "Già installata"
+  },
+  "app.java-selector.browse": {
+    "message": "Esplora"
+  },
+  "app.java-selector.detect": {
+    "message": "Rileva"
+  },
+  "app.java-selector.install-recommended": {
+    "message": "Installa consigliata"
+  },
+  "app.java-selector.installing": {
+    "message": "Installazione..."
+  },
+  "app.java-selector.path.placeholder": {
+    "message": "/percorso/di/java"
+  },
+  "app.java-selector.test-installation": {
+    "message": "Prova l'installazione di Java"
+  },
   "app.modal.install-to-play.additional-context": {
     "message": "Contesto aggiuntivo"
   },
   "app.modal.install-to-play.additional-context-placeholder": {
     "message": "Se possibile, includi link e immagini pertinenti"
   },
+  "app.modal.install-to-play.block-user": {
+    "message": "Blocca"
+  },
   "app.modal.install-to-play.content-you-are-reporting": {
-    "message": "L'istanza che stai segnalando"
+    "message": "Istanza da segnalare"
   },
   "app.modal.install-to-play.delete-instance": {
     "message": "Elimina istanza"
@@ -590,6 +680,9 @@
   "app.modal.install-to-play.invite-warning": {
     "message": "Questo invito è stato creato da un utente e non da Modrinth. Accetta solo gli inviti da persone fidate."
   },
+  "app.modal.install-to-play.invite-warning-with-creator": {
+    "message": "Questo invito è stato creato da <creator>{username}</creator>, non da Modrinth. Accetta solo gli inviti da persone fidate."
+  },
   "app.modal.install-to-play.mod-count": {
     "message": "{count} mod"
   },
@@ -647,6 +740,9 @@
   "app.modal.install-to-play.unrecognized-files": {
     "message": "File non riconosciuti"
   },
+  "app.modal.install-to-play.user-blocked": {
+    "message": "Bloccato"
+  },
   "app.modal.install-to-play.view-contents": {
     "message": "Mostra contenuti"
   },
@@ -674,6 +770,36 @@
   "app.modal.update-to-play.update-required-description": {
     "message": "{name} richiede degli aggiornamenti. Installa l'ultima versione per poter giocare."
   },
+  "app.nav.create-new-instance": {
+    "message": "Crea nuova istanza"
+  },
+  "app.nav.home": {
+    "message": "Home"
+  },
+  "app.nav.library": {
+    "message": "Libreria"
+  },
+  "app.nav.modrinth-account": {
+    "message": "Account Modrinth"
+  },
+  "app.nav.modrinth-hosting": {
+    "message": "Modrinth Hosting"
+  },
+  "app.nav.sign-in-to-modrinth-account": {
+    "message": "Accedi a un account Modrinth"
+  },
+  "app.nav.signed-in-as": {
+    "message": "Accesso effettuato come <user>{username}</user>"
+  },
+  "app.nav.upgrade-to-modrinth-plus": {
+    "message": "Abbonati a Modrinth+"
+  },
+  "app.news.title": {
+    "message": "Notizie"
+  },
+  "app.news.view-all": {
+    "message": "Leggi tutte le notizie"
+  },
   "app.project.install-button.already-installed": {
     "message": "Questo progetto è già stato installato"
   },
@@ -683,6 +809,9 @@
   "app.project.install-context.back-to-browse": {
     "message": "Torna a Esplora"
   },
+  "app.project.install-context.back-to-instance": {
+    "message": "Torna all'istanza"
+  },
   "app.project.version.all-versions": {
     "message": "Tutte le versioni"
   },
@@ -695,20 +824,188 @@
   "app.project.versions.already-installed": {
     "message": "Già installata"
   },
+  "app.quick-instance-switcher.drag-show-tooltip": {
+    "message": "Trascina per mostrare le istanze recenti"
+  },
+  "app.quick-instance-switcher.drag-tooltip": {
+    "message": "Trascina per ridimensionare"
+  },
+  "app.restarting": {
+    "message": "Riavvio..."
+  },
+  "app.settings.app-version": {
+    "message": "Modrinth App {version}"
+  },
+  "app.settings.default-instance-options.environment-variables.description": {
+    "message": "Variabili d'ambiente impostati all'avvio di un'istanza."
+  },
+  "app.settings.default-instance-options.environment-variables.placeholder": {
+    "message": "Inserisci le variabili d'ambiente..."
+  },
+  "app.settings.default-instance-options.environment-variables.title": {
+    "message": "Variabili d'ambiente"
+  },
+  "app.settings.default-instance-options.fullscreen.description": {
+    "message": "Avvia le istanze in schermo intero modificando il loro options.txt."
+  },
+  "app.settings.default-instance-options.fullscreen.title": {
+    "message": "Schermo intero"
+  },
+  "app.settings.default-instance-options.height.description": {
+    "message": "L'altezza della finestra del gioco all'avvio."
+  },
+  "app.settings.default-instance-options.height.placeholder": {
+    "message": "Inserisci l'altezza..."
+  },
+  "app.settings.default-instance-options.height.title": {
+    "message": "Altezza"
+  },
+  "app.settings.default-instance-options.java-arguments.description": {
+    "message": "Argomenti passati a Java all'avvio di un'istanza."
+  },
+  "app.settings.default-instance-options.java-arguments.placeholder": {
+    "message": "Inserisci gli argomenti Java..."
+  },
+  "app.settings.default-instance-options.java-arguments.title": {
+    "message": "Argomenti Java"
+  },
+  "app.settings.default-instance-options.memory-allocation.description": {
+    "message": "Memoria massima disponibile a ogni istanza."
+  },
+  "app.settings.default-instance-options.memory-allocation.title": {
+    "message": "Allocazione memoria"
+  },
+  "app.settings.default-instance-options.post-exit-hook.description": {
+    "message": "Si esegue dopo la chiusura del gioco."
+  },
+  "app.settings.default-instance-options.post-exit-hook.placeholder": {
+    "message": "Inserisci il comando post-uscita..."
+  },
+  "app.settings.default-instance-options.post-exit-hook.title": {
+    "message": "Hook post-uscita"
+  },
+  "app.settings.default-instance-options.pre-launch-hook.description": {
+    "message": "Si esegue prima dell'avvio dell'istanza."
+  },
+  "app.settings.default-instance-options.pre-launch-hook.placeholder": {
+    "message": "Inserisci il comando pre-avvio..."
+  },
+  "app.settings.default-instance-options.pre-launch-hook.title": {
+    "message": "Hook pre-avvio"
+  },
+  "app.settings.default-instance-options.width.description": {
+    "message": "La larghezza della finestra del gioco all'avvio."
+  },
+  "app.settings.default-instance-options.width.placeholder": {
+    "message": "Inserisci la larghezza..."
+  },
+  "app.settings.default-instance-options.width.title": {
+    "message": "Larghezza"
+  },
+  "app.settings.default-instance-options.wrapper-hook.description": {
+    "message": "Comando utilizzato per avvolgere il processo di avvio di Minecraft."
+  },
+  "app.settings.default-instance-options.wrapper-hook.placeholder": {
+    "message": "Inserisci il comando del wrapper..."
+  },
+  "app.settings.default-instance-options.wrapper-hook.title": {
+    "message": "Hook wrapper"
+  },
+  "app.settings.developer-mode-button.label": {
+    "message": "Abilita o disabilita la modalità sviluppatore"
+  },
   "app.settings.developer-mode-enabled": {
     "message": "Modalità sviluppatore attiva."
   },
   "app.settings.downloading": {
-    "message": "Scaricando v{version}"
+    "message": "Scaricando la v{version}"
+  },
+  "app.settings.java-installations.location.title": {
+    "message": "Percorso di Java {version, number}"
+  },
+  "app.settings.operating-system.macos": {
+    "message": "macOS"
   },
   "app.settings.privacy.ads-consent.intro": {
     "message": "Le pubblicità aiutano Modrinth a crescere e a finanziare i creatori. I nostri partner potrebbero memorizzare o accedere ai cookie nell'app per personalizzare e misurarne le prestazioni. Di seguito puoi scegliere di disdire o di gestire le opzioni."
   },
+  "app.settings.privacy.discord-rich-presence.description": {
+    "message": "Mostra Modrinth App come attività su Discord. Ciò non blocca le mod che mostrano la loro Rich Presence. Richiede un riavvio."
+  },
+  "app.settings.privacy.discord-rich-presence.title": {
+    "message": "Rich Presence su Discord"
+  },
+  "app.settings.privacy.telemetry.description": {
+    "message": "Modrinth raccoglie analitiche e dati anonimi per migliorare l'esperienza utente e personalizzarne la tua. Disabilitando questa opzione, i tuoi dati non verranno più raccolti."
+  },
+  "app.settings.privacy.telemetry.title": {
+    "message": "Telemetria"
+  },
+  "app.settings.resource-management.always-show-copy-details.description": {
+    "message": "Mostra il pulsante Copia info mentre un'installazione è in coda o in esecuzione. Verrà sempre mostrato dopo un errore o un'interruzione."
+  },
+  "app.settings.resource-management.always-show-copy-details.title": {
+    "message": "Mostra sempre il pulsante Copia info"
+  },
+  "app.settings.resource-management.app-cache.confirm.description": {
+    "message": "L'app potrebbe caricarsi più lentamente finché la cache non sarà ripristinata."
+  },
+  "app.settings.resource-management.app-cache.confirm.title": {
+    "message": "Eliminare la cache?"
+  },
+  "app.settings.resource-management.app-cache.description": {
+    "message": "Elimina la cache e riscarica tutto da Modrinth. L'app potrebbe caricarsi più lentamente finché la cache non sarà ripristinata."
+  },
+  "app.settings.resource-management.app-cache.purge": {
+    "message": "Elimina cache"
+  },
+  "app.settings.resource-management.app-cache.title": {
+    "message": "Cache dell'app"
+  },
+  "app.settings.resource-management.app-database-backups.description": {
+    "message": "Qui vengono salvati i backup dei dati importanti dell'app, nel caso in cui fosse necessario recuperarli."
+  },
+  "app.settings.resource-management.app-database-backups.open-folder": {
+    "message": "Apri la cartella dei backup"
+  },
+  "app.settings.resource-management.app-database-backups.title": {
+    "message": "Backup del database dell'app"
+  },
+  "app.settings.resource-management.app-directory.browse": {
+    "message": "Esplora una cartella per l'app"
+  },
+  "app.settings.resource-management.app-directory.description": {
+    "message": "Dove Modrinth App memorizza le istanze e altri file. Le modifiche avranno effetto dopo un riavvio."
+  },
+  "app.settings.resource-management.app-directory.select": {
+    "message": "Seleziona la nuova cartella dell'app"
+  },
+  "app.settings.resource-management.app-directory.title": {
+    "message": "Cartella dell'app"
+  },
+  "app.settings.resource-management.maximum-concurrent-downloads.description": {
+    "message": "Il numero di file che l'app può scaricare contemporaneamente. Decrementa se i download risultano instabili sulla tua connessione. Richiede un riavvio."
+  },
+  "app.settings.resource-management.maximum-concurrent-downloads.title": {
+    "message": "Massimo di download simultanei"
+  },
+  "app.settings.resource-management.maximum-concurrent-writes.description": {
+    "message": "Il numero di file che l'app può salvare sul disco contemporaneamente. Decrementa se riscontri problemi d'archiviazione frequenti. Richiede un riavvio."
+  },
+  "app.settings.resource-management.maximum-concurrent-writes.title": {
+    "message": "Massimo di scritture simultanee"
+  },
+  "app.settings.sidebar.label.instances": {
+    "message": "Istanze"
+  },
   "app.settings.tabs.appearance": {
     "message": "Aspetto"
   },
+  "app.settings.tabs.behavior": {
+    "message": "Comportamento"
+  },
   "app.settings.tabs.default-instance-options": {
-    "message": "Opzioni d'istanza predefinite"
+    "message": "Opzioni di gioco predefinite"
   },
   "app.settings.tabs.java-installations": {
     "message": "Installazioni Java"
@@ -722,6 +1019,9 @@
   "app.settings.tabs.resource-management": {
     "message": "Gestione delle risorse"
   },
+  "app.sidebar.playing-as": {
+    "message": "Accesso effettuato come"
+  },
   "app.skins.add-button": {
     "message": "Nuova skin"
   },
@@ -881,6 +1181,21 @@
   "app.skins.toggle-ears-features-on": {
     "message": "Attiva"
   },
+  "app.survey.body": {
+    "message": "Ti dispiacerebbe rispondere ad alcune domande sulla tua esperienza con Modrinth App?"
+  },
+  "app.survey.footer": {
+    "message": "Le tue risposte andranno direttamente al team di Modrinth e aiuteranno a guidare gli aggiornamenti futuri!"
+  },
+  "app.survey.no-thanks": {
+    "message": "No, grazie"
+  },
+  "app.survey.take-survey": {
+    "message": "Vai al sondaggio"
+  },
+  "app.survey.title": {
+    "message": "Ciao, utente di Modrinth!"
+  },
   "app.update-popup.body.download-complete": {
     "message": "Modrinth App v{version} è stata scaricata. Riavvia per aggiornare ora, o avverrà in automatico alla chiusura dell'app."
   },
@@ -1157,6 +1472,45 @@
   "instance.server-modal.resource-pack": {
     "message": "Pacchetto di risorse"
   },
+  "instance.settings.sharing.active-invites.actions": {
+    "message": "Azioni"
+  },
+  "instance.settings.sharing.active-invites.code": {
+    "message": "Link d'invito"
+  },
+  "instance.settings.sharing.active-invites.description": {
+    "message": "Chiunque abbia uno di questi inviti potrà entrare finché siano attivi."
+  },
+  "instance.settings.sharing.active-invites.empty": {
+    "message": "Non ci sono inviti attivi."
+  },
+  "instance.settings.sharing.active-invites.expires": {
+    "message": "Scadenza"
+  },
+  "instance.settings.sharing.active-invites.revoke": {
+    "message": "Revoca invito"
+  },
+  "instance.settings.sharing.active-invites.revoke-with-code": {
+    "message": "Revoca invito {code}"
+  },
+  "instance.settings.sharing.active-invites.title": {
+    "message": "Inviti attivi"
+  },
+  "instance.settings.sharing.active-invites.uses": {
+    "message": "Usi"
+  },
+  "instance.settings.sharing.revoke-invite.admonition-body": {
+    "message": "L'invito <monospace>{code}</monospace> smetterà di funzionare immediatamente. Le persone già entrate manterranno l'accesso."
+  },
+  "instance.settings.sharing.revoke-invite.admonition-header": {
+    "message": "Questa azione non può essere annullata"
+  },
+  "instance.settings.sharing.revoke-invite.confirm": {
+    "message": "Revoca invito"
+  },
+  "instance.settings.sharing.revoke-invite.header": {
+    "message": "Revoca invito"
+  },
   "instance.settings.tabs.general": {
     "message": "Generale"
   },
@@ -1358,6 +1712,12 @@
   "instance.shared-instance.error.title": {
     "message": "Qualcosa è andato storto"
   },
+  "instance.shared-instance.network-error.text": {
+    "message": "Impossibile connettersi all'API delle istanze condivise"
+  },
+  "instance.shared-instance.network-error.title": {
+    "message": "Errore di connessione"
+  },
   "instance.shared-instance.owner-tooltip": {
     "message": "I contenuti dell'istanza stanno venendo condivisi agli utenti."
   },
@@ -1549,5 +1909,11 @@
   },
   "search.filter.locked.server-loader.title": {
     "message": "Il loader è determinato dal server"
+  },
+  "settings.sidebar.label.account": {
+    "message": "Account"
+  },
+  "settings.sidebar.label.display": {
+    "message": "Visualizzazione"
   }
 }
diff --git a/apps/app-frontend/src/locales/ja-JP/index.json b/apps/app-frontend/src/locales/ja-JP/index.json
index 92ecc66882..38db7d4b16 100644
--- a/apps/app-frontend/src/locales/ja-JP/index.json
+++ b/apps/app-frontend/src/locales/ja-JP/index.json
@@ -89,6 +89,9 @@
   "app.action-bar.install.unknown-instance": {
     "message": "不明なインスタンス"
   },
+  "app.action-bar.install.updating-shared-content": {
+    "message": "シェアされたコンテンツをアップデートしました"
+  },
   "app.action-bar.installs": {
     "message": "インストール数"
   },
@@ -141,19 +144,19 @@
     "message": "プライバシーと広告がModrinthを支える仕組み"
   },
   "app.appearance-settings.advanced-rendering.description": {
-    "message": "ぼかし効果などの高度なレンダリングを有効にします。グラフィックアクセラレーションが使用できない場合は、パフォーマンスが低下する可能性があります。"
+    "message": "背景のぼかしなどの視覚効果を有効にします。ハードウェアアクセラレーションが無効の場合、パフォーマンスが低下する可能性があります。"
   },
   "app.appearance-settings.advanced-rendering.title": {
     "message": "高度なレンダリング"
   },
   "app.appearance-settings.color-theme.description": {
-    "message": "Modrinth Appでのお好みのテーマを選択してください。"
+    "message": "Modrinth Appのテーマを選びましょう。"
   },
   "app.appearance-settings.color-theme.title": {
     "message": "テーマ"
   },
   "app.appearance-settings.default-landing-page.description": {
-    "message": "ランチャー起動時に表示するページを変更します。"
+    "message": "Modrinth Appを開いたときに表示するページを選択します。"
   },
   "app.appearance-settings.default-landing-page.home": {
     "message": "ホーム"
@@ -165,49 +168,49 @@
     "message": "デフォルトの起動ページ"
   },
   "app.appearance-settings.hide-nametag.description": {
-    "message": "スキンページでプレイヤー上部のネームタグを非表示にします。"
+    "message": "スキン選択画面のプレイヤープレビュー上にあるユーザー名を非表示にします。"
   },
   "app.appearance-settings.hide-nametag.title": {
     "message": "ネームタグを非表示にする"
   },
   "app.appearance-settings.jump-back-into-worlds.description": {
-    "message": "ホームページの「ジャンプバック」セクションには、最近追加されたワールドが含まれています。"
+    "message": "ホーム画面の「Jump back in」セクションに、最近プレイしたワールドを表示します。"
   },
   "app.appearance-settings.jump-back-into-worlds.title": {
     "message": "最近のワールドを表示"
   },
   "app.appearance-settings.minimize-launcher.description": {
-    "message": "Minecraftが起動した時、ランチャーを最小化します。"
+    "message": "Minecraftを起動したときにランチャーを最小化します。"
   },
   "app.appearance-settings.minimize-launcher.title": {
     "message": "ランチャーを最小化"
   },
   "app.appearance-settings.native-decorations.description": {
-    "message": "OsのウィンドウUIを使用します（アプリの再起動が必要です）。"
+    "message": "OS標準のタイトルバーとウィンドウ操作ボタンを使用します。反映にはアプリの再起動が必要です。"
   },
   "app.appearance-settings.native-decorations.title": {
-    "message": "OSのウィンドウUIを使用"
+    "message": "システムウィンドウフレーム"
   },
   "app.appearance-settings.show-play-time.description": {
-    "message": "インスタンスのプレイ時間を表示します。"
+    "message": "各インスタンスのプレイ時間を表示します。"
   },
   "app.appearance-settings.show-play-time.title": {
     "message": "プレイ時間を表示"
   },
   "app.appearance-settings.skip-non-essential-warnings.description": {
-    "message": "Modパックの重複インストール、通常のコンテンツ削除、一括更新、Modパックのリンク解除、修復の促しなど、リスクの低い確認画面は自動的にスキップされます。危険な警告は引き続き表示されます。"
+    "message": "重複インストール、通常コンテンツの削除、一括アップデート、連携解除、修復といった低リスクな操作の確認ダイアログをスキップします。危険な操作に関する警告は常に表示されます。"
   },
   "app.appearance-settings.skip-non-essential-warnings.title": {
     "message": "重要でない警告をスキップ"
   },
   "app.appearance-settings.toggle-sidebar.description": {
-    "message": "サイドバーの表示/非表示を切り替える機能を有効にします。"
+    "message": "右サイドバーをデフォルトで非表示にし、表示／非表示を切り替えるボタンを追加します。"
   },
   "app.appearance-settings.toggle-sidebar.title": {
-    "message": "サイドバーの表示切替を有効化"
+    "message": "右のサイドバーを隠す"
   },
   "app.appearance-settings.unknown-pack-warning.description": {
-    "message": "Modrinthで配布されていないModrinth Pack（.mrpack）をインストールする場合、事前にリスクについて警告します。"
+    "message": "Modrinth以外でホストされているModrinthパック（.mrpack）をインストールする前に、安全警告を表示します。"
   },
   "app.appearance-settings.unknown-pack-warning.title": {
     "message": "不明なModパックのインストール前に警告する"
@@ -218,6 +221,15 @@
   "app.auth-servers.unreachable.header": {
     "message": "認証サーバーにアクセスできません"
   },
+  "app.behavior-settings.confirmations.title": {
+    "message": "操作の確認"
+  },
+  "app.behavior-settings.content.title": {
+    "message": "ホームとコンテンツ"
+  },
+  "app.behavior-settings.startup-and-navigation.title": {
+    "message": "起動とナビゲーション"
+  },
   "app.browse.add-servers-to-instance": {
     "message": "インスタンスにサーバーを追加中"
   },
@@ -239,12 +251,18 @@
   "app.browse.back-to-instance": {
     "message": "インスタンスに戻る"
   },
+  "app.browse.discover-project-type": {
+    "message": "{projectType}を検索"
+  },
   "app.browse.discover-servers": {
     "message": "サーバーを探す"
   },
   "app.browse.hide-added-servers": {
     "message": "既に追加済みのサーバーを非表示にする"
   },
+  "app.browse.hide-installed-modpacks": {
+    "message": "インストール済みを非表示"
+  },
   "app.browse.project-type.modpacks": {
     "message": "Modパック"
   },
@@ -335,6 +353,9 @@
   "app.instance.admonitions.shared-instance.added-label": {
     "message": "追加済"
   },
+  "app.instance.admonitions.shared-instance.changes-body": {
+    "message": "ローカルインスタンスのバージョンが、共有しているユーザー側のバージョンより進んでいます。"
+  },
   "app.instance.admonitions.shared-instance.changes-header": {
     "message": "変更はまだ共有されていません"
   },
@@ -344,12 +365,30 @@
   "app.instance.admonitions.shared-instance.publishing-button": {
     "message": "公開しています…"
   },
+  "app.instance.admonitions.shared-instance.removed-label": {
+    "message": "削除されました"
+  },
   "app.instance.admonitions.shared-instance.review-admonition-header": {
     "message": "アップデートを公開する"
   },
+  "app.instance.admonitions.shared-instance.review-description": {
+    "message": "このインスタンスを利用しているすべてのユーザーに共有されるコンテンツの変更内容を確認してください。"
+  },
+  "app.instance.admonitions.shared-instance.review-header": {
+    "message": "変更点を確認"
+  },
+  "app.instance.admonitions.shared-instance.review-update-button": {
+    "message": "アップデート内容を確認"
+  },
   "app.instance.admonitions.shared-instance.reviewing-button": {
     "message": "審査中…"
   },
+  "app.instance.admonitions.shared-instance.update-available-body": {
+    "message": "{name}をプレイするにはアップデートが必要です。ゲームを起動するには最新バージョンにアップデートしてください。"
+  },
+  "app.instance.admonitions.shared-instance.update-available-header": {
+    "message": "アップデートが利用可能です"
+  },
   "app.instance.confirm-delete.admonition-body": {
     "message": "インスタンス内のすべてのデータは、ワールド、設定、インストール済みのコンテンツを含め、完全に削除されます。"
   },
@@ -416,6 +455,9 @@
   "app.instance.share.invite-modal.heading": {
     "message": "{name} をシェアする"
   },
+  "app.instance.share.invite-modal.user-limit-reached": {
+    "message": "このインスタンスは上限の{limit}人に達しました。"
+  },
   "app.instance.share.locked.empty-description-prefix": {
     "message": "このページにアクセスするには"
   },
@@ -434,9 +476,18 @@
   "app.instance.share.locked.wrong-account-heading": {
     "message": "アカウントが違います"
   },
+  "app.instance.share.members.empty": {
+    "message": "まだ誰も参加していません"
+  },
+  "app.instance.share.members.no-filter-results": {
+    "message": "フィルターに一致するユーザーが見つかりません。"
+  },
   "app.instance.share.remove-user-modal.effect-access": {
     "message": "このインスタンスのアップデートは受信できなくなります"
   },
+  "app.instance.share.remove-user-modal.effect-installed-copy": {
+    "message": "すでにインストール済みのコピーは、そのままデバイスに残ります"
+  },
   "app.instance.share.remove-user-modal.effect-invite-again": {
     "message": "後でもう一度招待することもできます"
   },
@@ -461,6 +512,12 @@
   "app.instance.share.sign-in.button": {
     "message": "サインイン"
   },
+  "app.instance.share.unable-to-connect.description": {
+    "message": "インスタンスの共有は現在ご利用いただけません。しばらくしてからもう一度お試しください"
+  },
+  "app.instance.share.unable-to-connect.heading": {
+    "message": "接続できません"
+  },
   "app.instance.share.unlink.body": {
     "message": "この起動構成を共有するには、このmodpackのリンクを解除する必要があります"
   },
@@ -482,9 +539,18 @@
   "app.instance.shared-instance-wrong-account.fallback-username": {
     "message": "リンクされたアカウント"
   },
+  "app.instance.shared-instance-wrong-account.owner-admonition-body-v2": {
+    "message": "インスタンスを管理することができます。サインインするまでアップデートを配信することはできません。"
+  },
+  "app.instance.shared-instance-wrong-account.sign-in-as-label": {
+    "message": "このアカウントでサインインすることで"
+  },
   "app.instance.shared-instance-wrong-account.signed-out-header": {
     "message": "Modrinthへのサインインが必要です"
   },
+  "app.instance.shared-instance-wrong-account.user-admonition-body-v2": {
+    "message": "インスタンスのアップデートを受け取ることができます。"
+  },
   "app.instance.shared-instance-wrong-account.warning-header": {
     "message": "Modrinthのアカウントが間違っています"
   },
@@ -539,12 +605,60 @@
   "app.instance.worlds.search-worlds-placeholder": {
     "message": "{count} 個のワールドを検索…"
   },
+  "app.java-detection.cancel": {
+    "message": "キャンセル"
+  },
+  "app.java-detection.columns.actions": {
+    "message": "アクション"
+  },
+  "app.java-detection.columns.path": {
+    "message": "Javaの場所"
+  },
+  "app.java-detection.columns.version": {
+    "message": "バージョン"
+  },
+  "app.java-detection.no-installations-found": {
+    "message": "インストールされたJavaが見つかりません。"
+  },
+  "app.java-detection.select": {
+    "message": "選択"
+  },
+  "app.java-detection.selected": {
+    "message": "選択済み"
+  },
+  "app.java-detection.title": {
+    "message": "使用するJavaを選んでください"
+  },
+  "app.java-selector.already-installed": {
+    "message": "インストール済み"
+  },
+  "app.java-selector.browse": {
+    "message": "探す"
+  },
+  "app.java-selector.detect": {
+    "message": "検出"
+  },
+  "app.java-selector.install-recommended": {
+    "message": "推奨をインストール"
+  },
+  "app.java-selector.installing": {
+    "message": "インストール中…"
+  },
+  "app.java-selector.path.placeholder": {
+    "message": "/path/to/java"
+  },
+  "app.java-selector.test-installation": {
+    "message": "Javaのインストールをテスト"
+  },
   "app.modal.install-to-play.additional-context": {
     "message": "追加のコンテンツ"
   },
   "app.modal.install-to-play.additional-context-placeholder": {
     "message": "可能であれば、リンクや画像も含めてください"
   },
+  "app.modal.install-to-play.block-user": {
+    "message": "ユーザーをブロック"
+  },
   "app.modal.install-to-play.content-you-are-reporting": {
     "message": "起動構成を報告する"
   },
@@ -566,6 +680,9 @@
   "app.modal.install-to-play.invite-warning": {
     "message": "この招待は他のModrinthユーザーによって作成されたものであり、Modrinth公式のものではありません。信頼できる人からの招待のみ承諾してください。"
   },
+  "app.modal.install-to-play.invite-warning-with-creator": {
+    "message": "この招待はModrinthではなく<creator>{username}</creator>によって作成されました。信頼できる人物からの招待のみ受諾してください。"
+  },
   "app.modal.install-to-play.mod-count": {
     "message": "{count, plural, other {#個のMod}}"
   },
@@ -578,6 +695,9 @@
   "app.modal.install-to-play.report-image-too-large": {
     "message": "ファイルのサイズが 1 MiBの制限を超えています"
   },
+  "app.modal.install-to-play.report-legal-claims": {
+    "message": "DMCA通知やその他の法的請求については、弊社の<copyright-link>著作権ポリシー</copyright-link>をご覧ください。"
+  },
   "app.modal.install-to-play.report-reason": {
     "message": "この起動構成はどの規則に違反していますか？"
   },
@@ -620,6 +740,9 @@
   "app.modal.install-to-play.unrecognized-files": {
     "message": "認識されないファイル"
   },
+  "app.modal.install-to-play.user-blocked": {
+    "message": "ユーザーをブロックしました"
+  },
   "app.modal.install-to-play.view-contents": {
     "message": "コンテンツを見る"
   },
@@ -647,6 +770,36 @@
   "app.modal.update-to-play.update-required-description": {
     "message": "{name}をプレイするにはアップデートが必要です。ゲームを起動するには最新バージョンにアップデートしてください。"
   },
+  "app.nav.create-new-instance": {
+    "message": "新しいインスタンスを作成"
+  },
+  "app.nav.home": {
+    "message": "ホーム"
+  },
+  "app.nav.library": {
+    "message": "ライブラリ"
+  },
+  "app.nav.modrinth-account": {
+    "message": "Modrinthアカウント"
+  },
+  "app.nav.modrinth-hosting": {
+    "message": "Modrinth Hosting"
+  },
+  "app.nav.sign-in-to-modrinth-account": {
+    "message": "Modrinthアカウントにサインイン"
+  },
+  "app.nav.signed-in-as": {
+    "message": "<user>{username}</user>としてサインイン中"
+  },
+  "app.nav.upgrade-to-modrinth-plus": {
+    "message": "Modrinth+にアップグレード"
+  },
+  "app.news.title": {
+    "message": "ニュース"
+  },
+  "app.news.view-all": {
+    "message": "全てのニュースを見る"
+  },
   "app.project.install-button.already-installed": {
     "message": "このプロジェクトは既にインストールされています"
   },
@@ -656,6 +809,9 @@
   "app.project.install-context.back-to-browse": {
     "message": "ディスカバーに戻る"
   },
+  "app.project.install-context.back-to-instance": {
+    "message": "インスタンスに戻る"
+  },
   "app.project.version.all-versions": {
     "message": "すべてのバージョン"
   },
@@ -668,20 +824,188 @@
   "app.project.versions.already-installed": {
     "message": "既にインストールされています"
   },
+  "app.quick-instance-switcher.drag-show-tooltip": {
+    "message": "ドラッグして最近のインスタンスを表示"
+  },
+  "app.quick-instance-switcher.drag-tooltip": {
+    "message": "ドラッグしてサイズ変更"
+  },
+  "app.restarting": {
+    "message": "再起動中..."
+  },
+  "app.settings.app-version": {
+    "message": "Modrinth App {version}"
+  },
+  "app.settings.default-instance-options.environment-variables.description": {
+    "message": "インスタンス起動時に設定される環境変数"
+  },
+  "app.settings.default-instance-options.environment-variables.placeholder": {
+    "message": "環境変数を入力..."
+  },
+  "app.settings.default-instance-options.environment-variables.title": {
+    "message": "環境変数"
+  },
+  "app.settings.default-instance-options.fullscreen.description": {
+    "message": "options.txt ファイルを更新し、インスタンスをフルスクリーンで起動します。"
+  },
+  "app.settings.default-instance-options.fullscreen.title": {
+    "message": "全画面"
+  },
+  "app.settings.default-instance-options.height.description": {
+    "message": "起動時のゲームウィンドウの高さ"
+  },
+  "app.settings.default-instance-options.height.placeholder": {
+    "message": "高さを入力..."
+  },
+  "app.settings.default-instance-options.height.title": {
+    "message": "高さ"
+  },
+  "app.settings.default-instance-options.java-arguments.description": {
+    "message": "インスタンス起動時にJavaへ渡される引数"
+  },
+  "app.settings.default-instance-options.java-arguments.placeholder": {
+    "message": "Java引数を入力..."
+  },
+  "app.settings.default-instance-options.java-arguments.title": {
+    "message": "Java引数"
+  },
+  "app.settings.default-instance-options.memory-allocation.description": {
+    "message": "各インスタンスに割り当てる最大メモリ容量"
+  },
+  "app.settings.default-instance-options.memory-allocation.title": {
+    "message": "メモリ割り当て"
+  },
+  "app.settings.default-instance-options.post-exit-hook.description": {
+    "message": "ゲーム終了後に実行"
+  },
+  "app.settings.default-instance-options.post-exit-hook.placeholder": {
+    "message": "終了後コマンドを入力..."
+  },
+  "app.settings.default-instance-options.post-exit-hook.title": {
+    "message": "終了後フック"
+  },
+  "app.settings.default-instance-options.pre-launch-hook.description": {
+    "message": "インスタンス起動前に実行"
+  },
+  "app.settings.default-instance-options.pre-launch-hook.placeholder": {
+    "message": "起動前コマンドを入力..."
+  },
+  "app.settings.default-instance-options.pre-launch-hook.title": {
+    "message": "起動前フック"
+  },
+  "app.settings.default-instance-options.width.description": {
+    "message": "起動時のゲームウィンドウの幅"
+  },
+  "app.settings.default-instance-options.width.placeholder": {
+    "message": "幅を入力..."
+  },
+  "app.settings.default-instance-options.width.title": {
+    "message": "幅"
+  },
+  "app.settings.default-instance-options.wrapper-hook.description": {
+    "message": "Minecraftの起動プロセスをラップするためのコマンド"
+  },
+  "app.settings.default-instance-options.wrapper-hook.placeholder": {
+    "message": "ラッパーコマンドを入力..."
+  },
+  "app.settings.default-instance-options.wrapper-hook.title": {
+    "message": "ラッパーフック"
+  },
+  "app.settings.developer-mode-button.label": {
+    "message": "開発者モードの切り替え"
+  },
   "app.settings.developer-mode-enabled": {
     "message": "開発者モードがオンになっています。"
   },
   "app.settings.downloading": {
     "message": "v{version}をダウンロード中"
   },
+  "app.settings.java-installations.location.title": {
+    "message": "Java {version, number} の場所"
+  },
+  "app.settings.operating-system.macos": {
+    "message": "MacOS"
+  },
   "app.settings.privacy.ads-consent.intro": {
     "message": "Modrinthは広告収益によって運営され、クリエイターへの報酬も広告収益から支払われています。当社のパートナーは、広告のパーソナライズや効果測定のために、アプリ内でCookieを保存・利用する場合があります。この機能は下のボタンから個別に拒否や許可または変更することができます。"
   },
+  "app.settings.privacy.discord-rich-presence.description": {
+    "message": "Discordの現在のプレイ中に Modrinth App を表示します。これはModによってインスタンスに追加されるRich Presenceには影響しません。適用にはアプリの再起動が必要です。"
+  },
+  "app.settings.privacy.discord-rich-presence.title": {
+    "message": "Discord Rich Presence"
+  },
+  "app.settings.privacy.telemetry.description": {
+    "message": "Modrinthはユーザー体験の向上および最適化のために、匿名化されたアナリティクスと利用データを収集しています。このオプションをオフにすることで無効化（オプトアウト）され、以降データの収集は行われません。"
+  },
+  "app.settings.privacy.telemetry.title": {
+    "message": "テレメトリ"
+  },
+  "app.settings.resource-management.always-show-copy-details.description": {
+    "message": "インストールの保留中または実行中に「詳細をコピー」アクションを表示します。失敗または中断されたインストールでは常に利用可能です。"
+  },
+  "app.settings.resource-management.always-show-copy-details.title": {
+    "message": "「詳細をコピー」を常に表示"
+  },
+  "app.settings.resource-management.app-cache.confirm.description": {
+    "message": "キャッシュが再構築されるまで、アプリの読み込みが遅くなる場合があります。"
+  },
+  "app.settings.resource-management.app-cache.confirm.title": {
+    "message": "アプリのキャッシュを破棄しますか？"
+  },
+  "app.settings.resource-management.app-cache.description": {
+    "message": "キャッシュデータを消去し、Modrinthから再ダウンロードします。キャッシュが再構築されるまで、アプリの読み込みが遅くなる場合があります。"
+  },
+  "app.settings.resource-management.app-cache.purge": {
+    "message": "キャッシュを破棄"
+  },
+  "app.settings.resource-management.app-cache.title": {
+    "message": "アプリのキャッシュ"
+  },
+  "app.settings.resource-management.app-database-backups.description": {
+    "message": "万が一の復旧に備え、重要なアプリデータのバックアップがここに保存されます。"
+  },
+  "app.settings.resource-management.app-database-backups.open-folder": {
+    "message": "バックアップフォルダーを開く"
+  },
+  "app.settings.resource-management.app-database-backups.title": {
+    "message": "アプリデータベースのバックアップ"
+  },
+  "app.settings.resource-management.app-directory.browse": {
+    "message": "アプリのディレクトリを参照..."
+  },
+  "app.settings.resource-management.app-directory.description": {
+    "message": "Modrinth Appがインスタンスやその他のファイルを保存する場所です。変更はアプリの再起動後に反映されます。"
+  },
+  "app.settings.resource-management.app-directory.select": {
+    "message": "新しいアプリディレクトリを選択"
+  },
+  "app.settings.resource-management.app-directory.title": {
+    "message": "アプリのディレクトリ"
+  },
+  "app.settings.resource-management.maximum-concurrent-downloads.description": {
+    "message": "アプリが同時にダウンロードできるファイル数です。回線が不安定な場合は数値を下げてください。適用にはアプリの再起動が必要です。"
+  },
+  "app.settings.resource-management.maximum-concurrent-downloads.title": {
+    "message": "最大同時ダウンロード数"
+  },
+  "app.settings.resource-management.maximum-concurrent-writes.description": {
+    "message": "アプリが同時にディスクへ書き込めるファイル数です。I/Oエラーが頻発する場合は数値を下げてください。適用にはアプリの再起動が必要です。"
+  },
+  "app.settings.resource-management.maximum-concurrent-writes.title": {
+    "message": "最大同時書き込み数"
+  },
+  "app.settings.sidebar.label.instances": {
+    "message": "インスタンス"
+  },
   "app.settings.tabs.appearance": {
     "message": "表示設定"
   },
+  "app.settings.tabs.behavior": {
+    "message": "動作"
+  },
   "app.settings.tabs.default-instance-options": {
-    "message": "インスタンスの基本設定"
+    "message": "デフォルトのゲーム設定"
   },
   "app.settings.tabs.java-installations": {
     "message": "Javaのインストール設定"
@@ -695,6 +1019,9 @@
   "app.settings.tabs.resource-management": {
     "message": "リソース管理"
   },
+  "app.sidebar.playing-as": {
+    "message": "プレイ中のアカウント"
+  },
   "app.skins.add-button": {
     "message": "スキンを追加"
   },
@@ -854,6 +1181,21 @@
   "app.skins.toggle-ears-features-on": {
     "message": "オンに切り替え"
   },
+  "app.survey.body": {
+    "message": "Modrinth App の使用感についての簡単なアンケートにご協力いただけますか？"
+  },
+  "app.survey.footer": {
+    "message": "このフィードバックはModrinthチームに直接届けられ、今後のアップデートの改善に役立てられます！"
+  },
+  "app.survey.no-thanks": {
+    "message": "結構です"
+  },
+  "app.survey.take-survey": {
+    "message": "アンケートに回答"
+  },
+  "app.survey.title": {
+    "message": "Modrinthユーザーのみなさん、こんにちは！"
+  },
   "app.update-popup.body.download-complete": {
     "message": "Modrinth App v{version} のダウンロードが完了しました。今すぐ更新するには再読み込みするか、Modrinth Appを閉じる際に自動更新されます。"
   },
@@ -929,6 +1271,9 @@
   "content.shared-instance.disable-single-body": {
     "message": "無効化はローカルコピーにのみ影響します。今後共有された起動構成がアップデートされた際に、再び有効化されたり、元の状態に戻ったり、変更されたりする場合があります。"
   },
+  "content.shared-instance.unlink-body": {
+    "message": "リンク解除はローカルのコピーにのみ適用されます。将来的に共有インスタンスが更新されると、復元や変更が再度行われる可能性があります。"
+  },
   "content.shared-instance.warning-header": {
     "message": "これは共有された起動構成の一部です"
   },
@@ -1004,12 +1349,39 @@
   "installation-settings.shared-instance.unlink-button": {
     "message": "起動構成の共有を解除"
   },
+  "installation-settings.shared-instance.unlink-description": {
+    "message": "このローカルインスタンスを今後の共有アップデートから切断します。"
+  },
   "installation-settings.shared-instance.unlinking-button": {
     "message": "共有を解除中…"
   },
   "installation-settings.shared-instance.unpublish-button": {
     "message": "共有された軌道構成を非公開にする"
   },
+  "installation-settings.shared-instance.unpublish-description": {
+    "message": "この共有インスタンスをModrinthから削除し、使用者へのアップデート送信を停止します。ローカルのインスタンスには影響しません。"
+  },
+  "installation-settings.shared-instance.unpublishing-button": {
+    "message": "非公開に設定中..."
+  },
+  "installation-settings.unlink-shared-instance.modal.admonition-body": {
+    "message": "これはローカルのインスタンスにのみ影響します。インストール済みのコンテンツはこのデバイスに残り、共有インスタンスやそれを使用している他のユーザーには影響しません。"
+  },
+  "installation-settings.unlink-shared-instance.modal.admonition-header": {
+    "message": "共有インスタンスのリンク解除"
+  },
+  "installation-settings.unlink-shared-instance.modal.header": {
+    "message": "共有インスタンスのリンクを解除"
+  },
+  "installation-settings.unpublish-shared-instance.modal.admonition-body": {
+    "message": "Modrinthのサーバーからこの共有インスタンスを削除します。Modrinthアプリでこれを使用しているユーザーへのアップデート配信は停止しますが、ローカルのインスタンスとそのコンテンツはこのデバイスに残ります。"
+  },
+  "installation-settings.unpublish-shared-instance.modal.admonition-header": {
+    "message": "共有インスタンスの非公開化"
+  },
+  "installation-settings.unpublish-shared-instance.modal.header": {
+    "message": "共有インスタンスを非公開にする"
+  },
   "instance.action.create-shortcut": {
     "message": "ショートカット作成"
   },
@@ -1079,6 +1451,12 @@
   "instance.files.save-as": {
     "message": "名前をつけて保存…"
   },
+  "instance.locked.delete-button": {
+    "message": "インスタンスを削除"
+  },
+  "instance.locked.play-tooltip": {
+    "message": "このインスタンスはロックされています"
+  },
   "instance.playtime.never-played": {
     "message": "未プレイ"
   },
@@ -1094,6 +1472,45 @@
   "instance.server-modal.resource-pack": {
     "message": "リソースパック"
   },
+  "instance.settings.sharing.active-invites.actions": {
+    "message": "アクション"
+  },
+  "instance.settings.sharing.active-invites.code": {
+    "message": "招待リンク"
+  },
+  "instance.settings.sharing.active-invites.description": {
+    "message": "アクティブな招待リンクをお持ちの方なら誰でも参加できます。"
+  },
+  "instance.settings.sharing.active-invites.empty": {
+    "message": "有効な招待はありません。"
+  },
+  "instance.settings.sharing.active-invites.expires": {
+    "message": "有効期限"
+  },
+  "instance.settings.sharing.active-invites.revoke": {
+    "message": "招待を取り消す"
+  },
+  "instance.settings.sharing.active-invites.revoke-with-code": {
+    "message": "招待コード {code} を取り消す"
+  },
+  "instance.settings.sharing.active-invites.title": {
+    "message": "有効な招待"
+  },
+  "instance.settings.sharing.active-invites.uses": {
+    "message": "ユーザー"
+  },
+  "instance.settings.sharing.revoke-invite.admonition-body": {
+    "message": "招待リンク <monospace>{code}</monospace> は即座に無効化されます。すでに参加しているユーザーのアクセス権はそのまま保持されます。"
+  },
+  "instance.settings.sharing.revoke-invite.admonition-header": {
+    "message": "この操作は取り消せません"
+  },
+  "instance.settings.sharing.revoke-invite.confirm": {
+    "message": "招待を取り消す"
+  },
+  "instance.settings.sharing.revoke-invite.header": {
+    "message": "招待を取り消す"
+  },
   "instance.settings.tabs.general": {
     "message": "一般"
   },
@@ -1217,6 +1634,9 @@
   "instance.settings.tabs.installation.loader-version": {
     "message": "{loader}のバージョン"
   },
+  "instance.settings.tabs.installation.locked": {
+    "message": "このインスタンスがロックされている間は、インストール設定を利用できません。"
+  },
   "instance.settings.tabs.java": {
     "message": "Javaとメモリ"
   },
@@ -1256,6 +1676,9 @@
   "instance.settings.tabs.java.java-path-placeholder": {
     "message": "/path/to/java"
   },
+  "instance.settings.tabs.sharing": {
+    "message": "共有設定"
+  },
   "instance.settings.tabs.window": {
     "message": "ウィンドウ"
   },
@@ -1286,9 +1709,63 @@
   "instance.settings.tabs.window.width.enter": {
     "message": "幅を入力…"
   },
+  "instance.shared-instance.error.title": {
+    "message": "問題が発生しました"
+  },
+  "instance.shared-instance.network-error.text": {
+    "message": "共有インスタンス API に接続できません"
+  },
+  "instance.shared-instance.network-error.title": {
+    "message": "ネットワークエラー"
+  },
+  "instance.shared-instance.owner-tooltip": {
+    "message": "このインスタンスの内容は他のユーザーに共有されています。"
+  },
+  "instance.shared-instance.publish-review.added-label": {
+    "message": "追加しました"
+  },
   "instance.shared-instance.publish-review.admonition-header": {
     "message": "アップデートを配信する"
   },
+  "instance.shared-instance.publish-review.config-title-v2": {
+    "message": "設定ファイルを選択"
+  },
+  "instance.shared-instance.publish-review.description": {
+    "message": "変更内容を確認し、この更新に含める設定ファイルを選択してください。"
+  },
+  "instance.shared-instance.publish-review.header": {
+    "message": "変更内容を確認"
+  },
+  "instance.shared-instance.publish-review.publish-button": {
+    "message": "アップデートをプッシュ"
+  },
+  "instance.shared-instance.publish-review.removed-label": {
+    "message": "削除しました"
+  },
+  "instance.shared-instance.tooltip": {
+    "message": "このインスタンスの内容は他のユーザーによって管理されています。"
+  },
+  "instance.shared-instance.unavailable.access-revoked-text": {
+    "message": "共有インスタンスへのアクセス権が取り消されました。このインスタンスは引き続き利用可能ですが、リンクは解除され、今後のアップデートは受信されなくなります。"
+  },
+  "instance.shared-instance.unavailable.deleted-text": {
+    "message": "プライマリインスタンスが削除されました。このインスタンスは引き続き利用可能ですが、リンクは解除され、今後のアップデートは受信されなくなります。"
+  },
+  "instance.shared-instance.unavailable.locked-text": {
+    "message": "この共有インスタンスはコンテンツモデレーションチームによってロックされました。プライマリインスタンスからのアップデートの受信は停止し、プレイすることもできません。"
+  },
+  "instance.shared-instance.unavailable.locked-title": {
+    "message": "インスタンスがロックされています"
+  },
+  "instance.shared-instance.unavailable.manager-fallback": {
+    "message": "インスタンスマネージャー"
+  },
+  "instance.shared-instance.unavailable.text": {
+    "message": "ローカルインスタンスは引き続き利用可能ですが、リンクは解除されており、今後のアップデートは受信されません。"
+  },
+  "instance.shared-instance.unavailable.title": {
+    "message": "共有インスタンスは利用できなくなりました"
+  },
   "instance.worlds.a_minecraft_server": {
     "message": "Minecraftサーバー"
   },
@@ -1432,5 +1909,11 @@
   },
   "search.filter.locked.server-loader.title": {
     "message": "ローダーはサーバーによる条件です"
+  },
+  "settings.sidebar.label.account": {
+    "message": "アカウント"
+  },
+  "settings.sidebar.label.display": {
+    "message": "ディスプレイ"
   }
 }
diff --git a/apps/app-frontend/src/locales/ko-KR/index.json b/apps/app-frontend/src/locales/ko-KR/index.json
index 67a4f99baf..207a662b3c 100644
--- a/apps/app-frontend/src/locales/ko-KR/index.json
+++ b/apps/app-frontend/src/locales/ko-KR/index.json
@@ -114,7 +114,7 @@
     "message": "실행 중인 인스턴스 보이기"
   },
   "app.action-bar.stop-instance": {
-    "message": "인스턴스 멈추기"
+    "message": "인스턴스 중지"
   },
   "app.action-bar.update": {
     "message": "업데이트"
@@ -132,7 +132,7 @@
     "message": "모두 수락"
   },
   "app.ads-consent.body": {
-    "message": "광고는 Modrinth가 운영될 수 있도록 하며, 크리에이터에게 지급되는 보상을 지원합니다. 우리의 파트너는 앱에서 광고를 개인화하고 성과를 측정하기 위해 쿠키를 저장하거나 접근할 수 있습니다."
+    "message": "광고는 Modrinth가 운영될 수 있도록 하며, 크리에이터에게 지급되는 보상을 지원합니다. 우리의 파트너는 앱에서 광고를 개인 맞춤으로 제공하고 성과를 측정하기 위해 쿠키를 저장하거나 접근할 수 있습니다."
   },
   "app.ads-consent.manage": {
     "message": "환경 설정 관리"
@@ -144,19 +144,19 @@
     "message": "개인정보와 광고가 Modrinth를 지원하는 방식"
   },
   "app.appearance-settings.advanced-rendering.description": {
-    "message": "블러 효과와 같은 고급 렌더링 기능을 활성화합니다. 하드웨어 가속 없이는 성능 저하가 발생할 수 있습니다."
+    "message": "배경 흐림 효과와 같은 시각 효과를 활성화합니다. 하드웨어 가속이 지원되지 않는 경우 성능이 저하될 수 있습니다."
   },
   "app.appearance-settings.advanced-rendering.title": {
     "message": "고급 렌더링"
   },
   "app.appearance-settings.color-theme.description": {
-    "message": "Modrinth App에서 선호하는 색상 테마를 선택합니다."
+    "message": "Modrinth 앱에서 사용할 색상 테마를 선택하세요."
   },
   "app.appearance-settings.color-theme.title": {
     "message": "색상 테마"
   },
   "app.appearance-settings.default-landing-page.description": {
-    "message": "런처의 기본 시작 화면을 변경합니다."
+    "message": "Modrinth 앱이 실행될 때 표시될 페이지를 선택하세요."
   },
   "app.appearance-settings.default-landing-page.home": {
     "message": "홈"
@@ -168,49 +168,49 @@
     "message": "기본 시작 화면"
   },
   "app.appearance-settings.hide-nametag.description": {
-    "message": "스킨 화면에서 플레이어 위에 있는 이름표를 비활성화합니다."
+    "message": "스킨 페이지의 플레이어 미리보기 위에 있는 사용자 이름을 숨깁니다."
   },
   "app.appearance-settings.hide-nametag.title": {
     "message": "이름표 숨기기"
   },
   "app.appearance-settings.jump-back-into-worlds.description": {
-    "message": "홈 화면의 \"바로 입장\" 부분에 최근 플레이한 월드를 표시합니다."
+    "message": "홈페이지의 \"다시 시작하기\" 구역에 최근 플레이한 월드를 표시합니다."
   },
   "app.appearance-settings.jump-back-into-worlds.title": {
     "message": "세계로 바로 입장"
   },
   "app.appearance-settings.minimize-launcher.description": {
-    "message": "마인크래프트 실행 시 런처를 최소화합니다."
+    "message": "마인크래프트가 시작되면 Modrinth 앱을 최소화 합니다."
   },
   "app.appearance-settings.minimize-launcher.title": {
-    "message": "런처 최소화"
+    "message": "앱 최소화"
   },
   "app.appearance-settings.native-decorations.description": {
-    "message": "시스템 창 테두리 (앱 재시작 필요)."
+    "message": "운영 체제의 제목 표시줄 및 창 제어 기능을 사용합니다. 앱 재시작이 필요합니다."
   },
   "app.appearance-settings.native-decorations.title": {
-    "message": "네이티브 제목 표시줄"
+    "message": "시스템 창 프레임"
   },
   "app.appearance-settings.show-play-time.description": {
-    "message": "인스턴스의 플레이 시간을 표시합니다."
+    "message": "각 인스턴스를 얼마나 플레이했는지 표시합니다."
   },
   "app.appearance-settings.show-play-time.title": {
     "message": "플레이 시간 표시"
   },
   "app.appearance-settings.skip-non-essential-warnings.description": {
-    "message": "중복되는 모드팩 설치와 일반적인 콘텐츠 삭제, 동시 업데이트, 모드팩 링크 제거, 프롬프트 복구처럼 리스크가 적은 행위에 대한 확인 절차를 자동으로 넘깁니다. 위험한 경고는 여전히 표시됩니다."
+    "message": "중복 설치, 일반 콘텐츠 삭제, 일괄 업데이트, 연동 해제, 복구 등 위험도가 낮은 작업의 확인 절차를 건너뜁니다. 위험한 작업에 대한 경고는 항상 표시됩니다."
   },
   "app.appearance-settings.skip-non-essential-warnings.title": {
     "message": "중요하지 않은 경고 넘기기"
   },
   "app.appearance-settings.toggle-sidebar.description": {
-    "message": "사이드바를 접거나 펼칠 수 있는 기능을 활성화합니다."
+    "message": "기본 상태에서 오른쪽 사이드바를 숨기고, 이를 표시하거나 숨기는 버튼을 추가합니다."
   },
   "app.appearance-settings.toggle-sidebar.title": {
-    "message": "사이드바 토글"
+    "message": "오른쪽 사이드바 숨기기"
   },
   "app.appearance-settings.unknown-pack-warning.description": {
-    "message": "Modrinth 외부에서 가져온 모드팩 파일(.mrpack)을 설치할 때, 사용자가 위험성을 인지할 수 있도록 경고를 표시합니다."
+    "message": "Modrinth에 호스팅되지 않은 Modrinth Pack(.mrpack)을 설치하기 전에 안전 경고를 표시합니다."
   },
   "app.appearance-settings.unknown-pack-warning.title": {
     "message": "출처를 알 수 없는 모드팩 설치 전 경고"
@@ -221,6 +221,15 @@
   "app.auth-servers.unreachable.header": {
     "message": "인증 서버에 연결할 수 없습니다"
   },
+  "app.behavior-settings.confirmations.title": {
+    "message": "확인 알림"
+  },
+  "app.behavior-settings.content.title": {
+    "message": "홈 및 콘텐츠"
+  },
+  "app.behavior-settings.startup-and-navigation.title": {
+    "message": "시작 및 탐색"
+  },
   "app.browse.add-servers-to-instance": {
     "message": "인스턴스에 서버 추가"
   },
@@ -242,12 +251,18 @@
   "app.browse.back-to-instance": {
     "message": "인스턴스로 돌아가기"
   },
+  "app.browse.discover-project-type": {
+    "message": "{projectType} 둘러보기"
+  },
   "app.browse.discover-servers": {
     "message": "서버 탐색하기"
   },
   "app.browse.hide-added-servers": {
     "message": "이미 추가한 서버 숨기기"
   },
+  "app.browse.hide-installed-modpacks": {
+    "message": "이미 설치된 항목 숨기기"
+  },
   "app.browse.project-type.modpacks": {
     "message": "모드팩"
   },
@@ -362,9 +377,18 @@
   "app.instance.admonitions.shared-instance.review-header": {
     "message": "Review changes"
   },
+  "app.instance.admonitions.shared-instance.review-update-button": {
+    "message": "업데이트 검토"
+  },
   "app.instance.admonitions.shared-instance.reviewing-button": {
     "message": "검토중..."
   },
+  "app.instance.admonitions.shared-instance.update-available-body": {
+    "message": "{name} 플레이를 위해 업데이트가 필요합니다. 게임을 실행하려면 최신 버전 업데이트를 진행하세요."
+  },
+  "app.instance.admonitions.shared-instance.update-available-header": {
+    "message": "업데이트가 있습니다"
+  },
   "app.instance.confirm-delete.admonition-body": {
     "message": "인스턴스의 모든 데이터가 삭제됩니다. 세계 폴더, 설정 폴더 등 설치된 모든 컨텐츠가 포함됩니다."
   },
@@ -431,6 +455,9 @@
   "app.instance.share.invite-modal.heading": {
     "message": "{name} 공유"
   },
+  "app.instance.share.invite-modal.user-limit-reached": {
+    "message": "이 인스턴스는 {limit}명 사용자 제한에 도달했습니다."
+  },
   "app.instance.share.locked.empty-description-prefix": {
     "message": "이 페이지에 접근하려면"
   },
@@ -449,6 +476,12 @@
   "app.instance.share.locked.wrong-account-heading": {
     "message": "잘못된 계정"
   },
+  "app.instance.share.members.empty": {
+    "message": "아직 참여한 사용자가 없습니다"
+  },
+  "app.instance.share.members.no-filter-results": {
+    "message": "필터에 일치하는 사용자가 없습니다."
+  },
   "app.instance.share.remove-user-modal.effect-access": {
     "message": "이들은 더 이상 해당 공유 인스턴스의 업데이트를 받지 않습니다"
   },
@@ -479,6 +512,12 @@
   "app.instance.share.sign-in.button": {
     "message": "로그인"
   },
+  "app.instance.share.unable-to-connect.description": {
+    "message": "현재 공유 인스턴스 서비스를 이용할 수 없습니다. 잠시 후 다시 시도해 주세요"
+  },
+  "app.instance.share.unable-to-connect.heading": {
+    "message": "연결할 수 없습니다"
+  },
   "app.instance.share.unlink.body": {
     "message": "인스턴스를 공유하려면 이 모드팩 연동을 해제해야 합니다"
   },
@@ -566,12 +605,60 @@
   "app.instance.worlds.search-worlds-placeholder": {
     "message": "{count}개의 세계 검색..."
   },
+  "app.java-detection.cancel": {
+    "message": "취소"
+  },
+  "app.java-detection.columns.actions": {
+    "message": "작업"
+  },
+  "app.java-detection.columns.path": {
+    "message": "경로"
+  },
+  "app.java-detection.columns.version": {
+    "message": "버전"
+  },
+  "app.java-detection.no-installations-found": {
+    "message": "설치된 자바를 찾을수 없습니다."
+  },
+  "app.java-detection.select": {
+    "message": "선택"
+  },
+  "app.java-detection.selected": {
+    "message": "선택됨"
+  },
+  "app.java-detection.title": {
+    "message": "Java 설치 위치 선택"
+  },
+  "app.java-selector.already-installed": {
+    "message": "이미 설치됨"
+  },
+  "app.java-selector.browse": {
+    "message": "찾아보기"
+  },
+  "app.java-selector.detect": {
+    "message": "감지"
+  },
+  "app.java-selector.install-recommended": {
+    "message": "권장 버전 설치"
+  },
+  "app.java-selector.installing": {
+    "message": "설치 중..."
+  },
+  "app.java-selector.path.placeholder": {
+    "message": "/path/to/java"
+  },
+  "app.java-selector.test-installation": {
+    "message": "Java 설치 테스트"
+  },
   "app.modal.install-to-play.additional-context": {
     "message": "추가 정보"
   },
   "app.modal.install-to-play.additional-context-placeholder": {
     "message": "관련이 있는 경우 가능하면 링크 및 이미지를 포함하세요"
   },
+  "app.modal.install-to-play.block-user": {
+    "message": "사용자 차단"
+  },
   "app.modal.install-to-play.content-you-are-reporting": {
     "message": "신고 대상 인스턴스"
   },
@@ -593,18 +680,57 @@
   "app.modal.install-to-play.invite-warning": {
     "message": "이 초대장은 다른 Modrinth 사용자가 생성했으며, Modrinth에서 생성하지 않았습니다. 신뢰할 수 있는 초대장만 수락하십시오."
   },
+  "app.modal.install-to-play.invite-warning-with-creator": {
+    "message": "이 초대장은 Modrinth가 아닌 <creator>{username}</creator> 님이 생성했습니다. 신뢰할 수 있는 사람의 초대만 수락하세요."
+  },
   "app.modal.install-to-play.mod-count": {
     "message": "{count, plural, one {모드 #개} other {모드 #개}}"
   },
   "app.modal.install-to-play.report-description": {
     "message": "본 서식을 사용하여 당사의 <rules-link>규칙</rules-link> 또는 <terms-link>이용약관</terms-link> 위반 가능성이 있는 인스턴스를 신고하세요."
   },
+  "app.modal.install-to-play.report-image-invalid-type": {
+    "message": "허용되지 않는 이미지 형식의 파일입니다"
+  },
+  "app.modal.install-to-play.report-image-too-large": {
+    "message": "파일이 1 MiB 용량 제한을 초과합니다"
+  },
+  "app.modal.install-to-play.report-legal-claims": {
+    "message": "DMCA 통지 또는 기타 법적 청구 관련 내용은 <copyright-link>저작권 정책</copyright-link>을 참조하세요."
+  },
+  "app.modal.install-to-play.report-reason": {
+    "message": "이 인스턴스가 위반한 규칙은 무엇인가요?"
+  },
+  "app.modal.install-to-play.report-reason.inappropriate": {
+    "message": "부적절함"
+  },
+  "app.modal.install-to-play.report-reason.malicious": {
+    "message": "악성/유해함"
+  },
+  "app.modal.install-to-play.report-reason.spam": {
+    "message": "스팸"
+  },
+  "app.modal.install-to-play.report-shared-instance-header": {
+    "message": "공유 인스턴스 신고"
+  },
+  "app.modal.install-to-play.report-submitted": {
+    "message": "신고 제출됨"
+  },
+  "app.modal.install-to-play.report-support-and-bugs": {
+    "message": "지원 요청은 <support-link>지원 팀</support-link> 문의를 이용해 주세요. 버그 제보는 <github-link>GitHub 이슈</github-link>를 등록하세요."
+  },
   "app.modal.install-to-play.reviewed-files": {
     "message": "모든 파일은 형식(.mrpack 포함)에 무관하게 Modrinth에 게시되어야만 검수를 거칩니다."
   },
   "app.modal.install-to-play.shared-instance": {
     "message": "인스턴스 공유됨"
   },
+  "app.modal.install-to-play.shared-instance-content": {
+    "message": "공유 인스턴스 콘텐츠"
+  },
+  "app.modal.install-to-play.shared-instance-unknown-files-description": {
+    "message": "이 공유 인스턴스에는 Modrinth에 게시되지 않은 파일이 포함되어 있습니다. 신뢰할 수 있는 출처의 파일만 설치하는 것을 강력히 권장합니다."
+  },
   "app.modal.install-to-play.unknown-files-description": {
     "message": "이 서버의 모드팩은 Modrinth에 게시되지 않은 파일을 포함하고 있습니다. 신뢰할 수 있는 출처의 파일만 설치하는 것을 강력히 권장합니다."
   },
@@ -614,6 +740,9 @@
   "app.modal.install-to-play.unrecognized-files": {
     "message": "확인되지 않은 파일"
   },
+  "app.modal.install-to-play.user-blocked": {
+    "message": "사용자 차단됨"
+  },
   "app.modal.install-to-play.view-contents": {
     "message": "구성 요소 보기"
   },
@@ -623,6 +752,54 @@
   "app.modal.update-to-play.removed": {
     "message": "제거됨"
   },
+  "app.modal.update-to-play.server-modpack-unknown-files-description": {
+    "message": "이 서버 모드팩 업데이트에는 Modrinth에 게시되지 않은 파일이 포함되어 있습니다. 신뢰할 수 있는 출처의 파일만 설치하는 것을 강력히 권장합니다."
+  },
+  "app.modal.update-to-play.shared-instance-added-label": {
+    "message": "추가됨"
+  },
+  "app.modal.update-to-play.shared-instance-removed-label": {
+    "message": "제거됨"
+  },
+  "app.modal.update-to-play.shared-instance-unknown-files-description": {
+    "message": "이 공유 인스턴스 업데이트에는 Modrinth에 게시되지 않은 파일이 포함되어 있습니다. 신뢰할 수 있는 출처의 파일만 설치하는 것을 강력히 권장합니다."
+  },
+  "app.modal.update-to-play.update-required": {
+    "message": "업데이트 필요"
+  },
+  "app.modal.update-to-play.update-required-description": {
+    "message": "{name} 플레이를 진행하려면 업데이트가 필요합니다. 게임을 실행하려면 최신 버전 업데이트를 진행하세요."
+  },
+  "app.nav.create-new-instance": {
+    "message": "새 인스턴스 만들기"
+  },
+  "app.nav.home": {
+    "message": "홈"
+  },
+  "app.nav.library": {
+    "message": "라이브러리"
+  },
+  "app.nav.modrinth-account": {
+    "message": "Modrinth 계정"
+  },
+  "app.nav.modrinth-hosting": {
+    "message": "Modrinth 호스팅"
+  },
+  "app.nav.sign-in-to-modrinth-account": {
+    "message": "Modrinth 계정으로 로그인"
+  },
+  "app.nav.signed-in-as": {
+    "message": "<user>{username}</user> 으로 로그인됨"
+  },
+  "app.nav.upgrade-to-modrinth-plus": {
+    "message": "Modrinth+ 로 업그레이드"
+  },
+  "app.news.title": {
+    "message": "뉴스"
+  },
+  "app.news.view-all": {
+    "message": "모든 뉴스 보기"
+  },
   "app.project.install-button.already-installed": {
     "message": "이미 설치되어 있음"
   },
@@ -632,6 +809,9 @@
   "app.project.install-context.back-to-browse": {
     "message": "탐색으로 돌아가기"
   },
+  "app.project.install-context.back-to-instance": {
+    "message": "인스턴스 복귀"
+  },
   "app.project.version.all-versions": {
     "message": "모든 버전"
   },
@@ -644,20 +824,188 @@
   "app.project.versions.already-installed": {
     "message": "이미 설치됨"
   },
+  "app.quick-instance-switcher.drag-show-tooltip": {
+    "message": "드래그하여 최근 인스턴스 표시"
+  },
+  "app.quick-instance-switcher.drag-tooltip": {
+    "message": "드래그하여 크기 조절"
+  },
+  "app.restarting": {
+    "message": "재시작 중..."
+  },
+  "app.settings.app-version": {
+    "message": "Modrinth 앱 {version}"
+  },
+  "app.settings.default-instance-options.environment-variables.description": {
+    "message": "인스턴스를 실행할 때 설정되는 환경 변수입니다."
+  },
+  "app.settings.default-instance-options.environment-variables.placeholder": {
+    "message": "환경 변수 입력..."
+  },
+  "app.settings.default-instance-options.environment-variables.title": {
+    "message": "환경 변수"
+  },
+  "app.settings.default-instance-options.fullscreen.description": {
+    "message": "options.txt 파일을 수정하여 인스턴스 실행 시 전체 화면을 사용합니다."
+  },
+  "app.settings.default-instance-options.fullscreen.title": {
+    "message": "전체 화면"
+  },
+  "app.settings.default-instance-options.height.description": {
+    "message": "실행 시 게임 창 높이입니다."
+  },
+  "app.settings.default-instance-options.height.placeholder": {
+    "message": "높이 입력..."
+  },
+  "app.settings.default-instance-options.height.title": {
+    "message": "높이"
+  },
+  "app.settings.default-instance-options.java-arguments.description": {
+    "message": "인스턴스를 실행할 때 Java에 전달되는 인수입니다."
+  },
+  "app.settings.default-instance-options.java-arguments.placeholder": {
+    "message": "Java 인수 입력..."
+  },
+  "app.settings.default-instance-options.java-arguments.title": {
+    "message": "Java 인수"
+  },
+  "app.settings.default-instance-options.memory-allocation.description": {
+    "message": "각 인스턴스가 사용할 수 있는 최대 메모리입니다."
+  },
+  "app.settings.default-instance-options.memory-allocation.title": {
+    "message": "메모리 할당"
+  },
+  "app.settings.default-instance-options.post-exit-hook.description": {
+    "message": "게임이 종료된 후 실행됩니다."
+  },
+  "app.settings.default-instance-options.post-exit-hook.placeholder": {
+    "message": "종료 후 명령어 입력..."
+  },
+  "app.settings.default-instance-options.post-exit-hook.title": {
+    "message": "종료 후 스크립트"
+  },
+  "app.settings.default-instance-options.pre-launch-hook.description": {
+    "message": "인스턴스 시작 전 실행됩니다."
+  },
+  "app.settings.default-instance-options.pre-launch-hook.placeholder": {
+    "message": "실행 전 명령어 입력..."
+  },
+  "app.settings.default-instance-options.pre-launch-hook.title": {
+    "message": "실행 전 스크립트"
+  },
+  "app.settings.default-instance-options.width.description": {
+    "message": "실행 시 게임 창 너비입니다."
+  },
+  "app.settings.default-instance-options.width.placeholder": {
+    "message": "너비 입력..."
+  },
+  "app.settings.default-instance-options.width.title": {
+    "message": "너비"
+  },
+  "app.settings.default-instance-options.wrapper-hook.description": {
+    "message": "Minecraft 실행 프로세스를 감싸는 데 사용하는 명령어입니다."
+  },
+  "app.settings.default-instance-options.wrapper-hook.placeholder": {
+    "message": "Wrapper 명령어 입력..."
+  },
+  "app.settings.default-instance-options.wrapper-hook.title": {
+    "message": "Wrapper 스크립트"
+  },
+  "app.settings.developer-mode-button.label": {
+    "message": "개발자 모드 전환"
+  },
   "app.settings.developer-mode-enabled": {
     "message": "개발자 모드가 활성화되었습니다."
   },
   "app.settings.downloading": {
     "message": "v{version} 다운로드 중"
   },
+  "app.settings.java-installations.location.title": {
+    "message": "Java {version, number} 위치"
+  },
+  "app.settings.operating-system.macos": {
+    "message": "macOS"
+  },
   "app.settings.privacy.ads-consent.intro": {
-    "message": "광고는 Modrinth가 운영될 수 있도록 하며, 크리에이터에게 지급되는 보상을 지원합니다. 우리의 파트너는 앱에서 광고를 개인화하고 성과를 측정하기 위해 쿠키를 저장하거나 접근할 수 있습니다. 아래에서 거부하거나 환경 설정을 관리할 수 있습니다."
+    "message": "광고는 Modrinth가 운영될 수 있도록 하며, 크리에이터에게 지급되는 보상을 지원합니다. 우리의 파트너는 앱에서 광고를 개인 맞춤으로 제공하고 성과를 측정하기 위해 쿠키를 저장하거나 접근할 수 있습니다. 아래에서 거부하거나 환경 설정을 관리할 수 있습니다."
+  },
+  "app.settings.privacy.discord-rich-presence.description": {
+    "message": "Discord의 현재 활동 상태에 Modrinth App을 표시합니다. 모드가 인스턴스에 추가한 Rich Presence에는 영향을 미치지 않습니다. 앱 재시작이 필요합니다."
+  },
+  "app.settings.privacy.discord-rich-presence.title": {
+    "message": "Discord 활동 상태"
+  },
+  "app.settings.privacy.telemetry.description": {
+    "message": "Modrinth는 사용자 경험 향상 및 맞춤 설정을 위해 익명화된 분석 데이터와 사용 데이터를 수집합니다. 이 옵션을 비활성화하면 데이터 수집을 거부하게 되며, 더 이상 데이터가 수집되지 않습니다."
+  },
+  "app.settings.privacy.telemetry.title": {
+    "message": "원격 분석"
+  },
+  "app.settings.resource-management.always-show-copy-details.description": {
+    "message": "설치가 대기 중이거나 진행 중일 때 '상세 정보 복사' 버튼을 표시합니다. 실패했거나 중단된 설치 건에서는 항상 사용할 수 있습니다."
+  },
+  "app.settings.resource-management.always-show-copy-details.title": {
+    "message": "항상 상세 정보 복사 표시"
+  },
+  "app.settings.resource-management.app-cache.confirm.description": {
+    "message": "캐시가 재구축될 때까지 앱 로딩이 느려질 수 있습니다."
+  },
+  "app.settings.resource-management.app-cache.confirm.title": {
+    "message": "앱 캐시를 비우시겠습니까?"
+  },
+  "app.settings.resource-management.app-cache.description": {
+    "message": "캐시 데이터를 삭제하고 Modrinth에서 다시 다운로드합니다. 캐시가 재구축될 때까지 앱 로딩이 느려질 수 있습니다."
+  },
+  "app.settings.resource-management.app-cache.purge": {
+    "message": "캐시 비우기"
+  },
+  "app.settings.resource-management.app-cache.title": {
+    "message": "앱 캐시"
+  },
+  "app.settings.resource-management.app-database-backups.description": {
+    "message": "나중에 복구가 필요한 경우를 대비해 중요한 앱 데이터 백업을 이곳에 저장합니다."
+  },
+  "app.settings.resource-management.app-database-backups.open-folder": {
+    "message": "백업 폴더 열기"
+  },
+  "app.settings.resource-management.app-database-backups.title": {
+    "message": "앱 데이터베이스 백업"
+  },
+  "app.settings.resource-management.app-directory.browse": {
+    "message": "앱 디렉터리 찾아보기"
+  },
+  "app.settings.resource-management.app-directory.description": {
+    "message": "Modrinth App이 인스턴스 및 기타 파일을 저장하는 위치입니다. 변경 사항은 앱을 재시작한 후 적용됩니다."
+  },
+  "app.settings.resource-management.app-directory.select": {
+    "message": "새 앱 디렉터리 선택"
+  },
+  "app.settings.resource-management.app-directory.title": {
+    "message": "앱 경로"
+  },
+  "app.settings.resource-management.maximum-concurrent-downloads.description": {
+    "message": "앱이 한 번에 다운로드할 수 있는 파일 수입니다. 네트워크 연결이 불안정하면 이 수치를 낮추세요. 앱 재시작이 필요합니다."
+  },
+  "app.settings.resource-management.maximum-concurrent-downloads.title": {
+    "message": "최대 동시 다운로드 수"
+  },
+  "app.settings.resource-management.maximum-concurrent-writes.description": {
+    "message": "앱이 디스크에 한 번에 쓸 수 있는 파일 수입니다. I/O 오류가 자주 발생하면 이 수치를 낮추세요. 앱 재시작이 필요합니다."
+  },
+  "app.settings.resource-management.maximum-concurrent-writes.title": {
+    "message": "최대 동시 쓰기 수"
+  },
+  "app.settings.sidebar.label.instances": {
+    "message": "인스턴스"
   },
   "app.settings.tabs.appearance": {
     "message": "모양"
   },
+  "app.settings.tabs.behavior": {
+    "message": "동작"
+  },
   "app.settings.tabs.default-instance-options": {
-    "message": "기본 인스턴스 옵션"
+    "message": "기본 게임 옵션"
   },
   "app.settings.tabs.java-installations": {
     "message": "Java 설치"
@@ -671,6 +1019,9 @@
   "app.settings.tabs.resource-management": {
     "message": "리소스 관리"
   },
+  "app.sidebar.playing-as": {
+    "message": "플레이 중인 계정은"
+  },
   "app.skins.add-button": {
     "message": "스킨 추가"
   },
@@ -830,6 +1181,21 @@
   "app.skins.toggle-ears-features-on": {
     "message": "켜기"
   },
+  "app.survey.body": {
+    "message": "Modrinth 앱 이용 경험에 대한 몇 가지 질문에 답변해 주시겠습니까?"
+  },
+  "app.survey.footer": {
+    "message": "이 피드백은 Modrinth 팀에 직접 전달되어 향후 업데이트에 반영됩니다!"
+  },
+  "app.survey.no-thanks": {
+    "message": "괜찮습니다"
+  },
+  "app.survey.take-survey": {
+    "message": "설문 참여하기"
+  },
+  "app.survey.title": {
+    "message": "안녕하세요, Modrinth 사용자님!"
+  },
   "app.update-popup.body.download-complete": {
     "message": "Modrinth App v{version} 다운로드가 완료되었습니다. 새로고침하거나 Modrinth App을 종료하면 자동으로 업데이트됩니다."
   },
@@ -878,6 +1244,39 @@
   "app.world.world-item.players-online": {
     "message": "{count}명 온라인"
   },
+  "content.shared-instance.change-version-body": {
+    "message": "버전을 변경해도 로컬 사본만 변경됩니다. 향후 공유 인스턴스를 업데이트할 때 다시 복구되거나 변경될 수 있습니다."
+  },
+  "content.shared-instance.delete-bulk-body": {
+    "message": "선택한 프로젝트 중 일부는 공유 인스턴스의 일부입니다. 삭제해도 로컬 사본만 변경되며, 향후 공유 인스턴스를 업데이트할 때 다시 복구되거나 변경될 수 있습니다."
+  },
+  "content.shared-instance.delete-button": {
+    "message": "그래도 삭제"
+  },
+  "content.shared-instance.delete-many-button": {
+    "message": "그래도 project {count, number}개 삭제"
+  },
+  "content.shared-instance.delete-single-body": {
+    "message": "삭제해도 로컬 사본만 변경됩니다. 향후 공유 인스턴스를 업데이트할 때 다시 복구되거나 변경될 수 있습니다."
+  },
+  "content.shared-instance.disable-bulk-body": {
+    "message": "선택한 프로젝트 중 일부는 공유 인스턴스의 일부입니다. 비활성화해도 로컬 사본만 변경되며, 향후 공유 인스턴스를 업데이트할 때 다시 활성화, 복구 또는 변경될 수 있습니다."
+  },
+  "content.shared-instance.disable-button": {
+    "message": "그래도 비활성화"
+  },
+  "content.shared-instance.disable-many-button": {
+    "message": "그래도 프로젝트 {count, number}개 비활성화"
+  },
+  "content.shared-instance.disable-single-body": {
+    "message": "비활성화해도 로컬 사본만 변경됩니다. 향후 공유 인스턴스를 업데이트할 때 다시 활성화, 복구 또는 변경될 수 있습니다."
+  },
+  "content.shared-instance.unlink-body": {
+    "message": "연동 해제 시 로컬 사본만 변경됩니다. 향후 공유 인스턴스 업데이트에서 다시 복구되거나 변경될 수 있습니다."
+  },
+  "content.shared-instance.warning-header": {
+    "message": "공유 인스턴스의 일부입니다"
+  },
   "friends.action.add-friend": {
     "message": "친구 추가"
   },
@@ -941,6 +1340,48 @@
   "friends.sign-in-to-add-friends": {
     "message": "<link>Modrinth 계정으로 로그인</link>하여 친구를 추가하고 무엇을 플레이 중인지 확인하세요!"
   },
+  "installation-settings.shared-instance.linked-title": {
+    "message": "연동된 공유 인스턴스"
+  },
+  "installation-settings.shared-instance.title": {
+    "message": "인스턴스 게시 취소"
+  },
+  "installation-settings.shared-instance.unlink-button": {
+    "message": "공유 인스턴스 연동 해제"
+  },
+  "installation-settings.shared-instance.unlink-description": {
+    "message": "이 로컬 인스턴스의 향후 공유 업데이트 연동을 해제합니다."
+  },
+  "installation-settings.shared-instance.unlinking-button": {
+    "message": "연동 해제 중..."
+  },
+  "installation-settings.shared-instance.unpublish-button": {
+    "message": "공유 인스턴스 게시 취소"
+  },
+  "installation-settings.shared-instance.unpublish-description": {
+    "message": "Modrinth에서 이 공유 인스턴스를 삭제하고 이용자에게 업데이트 전송을 중단합니다. 본인의 로컬 인스턴스는 영향을 받지 않습니다."
+  },
+  "installation-settings.shared-instance.unpublishing-button": {
+    "message": "게시 취소 중..."
+  },
+  "installation-settings.unlink-shared-instance.modal.admonition-body": {
+    "message": "이 작업은 본인의 로컬 인스턴스에만 영향을 미칩니다. 설치된 콘텐츠는 이 기기에 유지되며, 공유 인스턴스 및 이를 이용하는 다른 사용자에게는 영향을 미치지 않습니다."
+  },
+  "installation-settings.unlink-shared-instance.modal.admonition-header": {
+    "message": "공유 인스턴스 연동 해제"
+  },
+  "installation-settings.unlink-shared-instance.modal.header": {
+    "message": "공유 인스턴스 연동 해제"
+  },
+  "installation-settings.unpublish-shared-instance.modal.admonition-body": {
+    "message": "이 작업은 Modrinth 서버에서 공유 인스턴스를 삭제합니다. Modrinth 앱에서 이를 이용 중인 사용자는 더 이상 업데이트를 받지 않지만, 본인의 로컬 인스턴스 및 콘텐츠는 이 기기에 유지됩니다."
+  },
+  "installation-settings.unpublish-shared-instance.modal.admonition-header": {
+    "message": "공유 인스턴스 게시 취소 중"
+  },
+  "installation-settings.unpublish-shared-instance.modal.header": {
+    "message": "공유 인스턴스 게시 취소"
+  },
   "instance.action.create-shortcut": {
     "message": "바로가기 만들기"
   },
@@ -1010,6 +1451,12 @@
   "instance.files.save-as": {
     "message": "다른 이름으로 저장..."
   },
+  "instance.locked.delete-button": {
+    "message": "인스턴스 삭제"
+  },
+  "instance.locked.play-tooltip": {
+    "message": "이 인스턴스는 잠겼습니다"
+  },
   "instance.playtime.never-played": {
     "message": "아직 플레이 하지 않음"
   },
@@ -1025,6 +1472,45 @@
   "instance.server-modal.resource-pack": {
     "message": "리소스 팩"
   },
+  "instance.settings.sharing.active-invites.actions": {
+    "message": "작업"
+  },
+  "instance.settings.sharing.active-invites.code": {
+    "message": "초대 링크"
+  },
+  "instance.settings.sharing.active-invites.description": {
+    "message": "초대 링크가 유효한 동안 링크를 보유한 사람은 누구나 참여할 수 있습니다."
+  },
+  "instance.settings.sharing.active-invites.empty": {
+    "message": "활성화된 초대가 없습니다."
+  },
+  "instance.settings.sharing.active-invites.expires": {
+    "message": "만료일"
+  },
+  "instance.settings.sharing.active-invites.revoke": {
+    "message": "초대 철회"
+  },
+  "instance.settings.sharing.active-invites.revoke-with-code": {
+    "message": "초대 {code} 철회"
+  },
+  "instance.settings.sharing.active-invites.title": {
+    "message": "활성화된 초대"
+  },
+  "instance.settings.sharing.active-invites.uses": {
+    "message": "사용 횟수"
+  },
+  "instance.settings.sharing.revoke-invite.admonition-body": {
+    "message": "초대 링크 <monospace>{code}</monospace> 사용이 즉시 중단됩니다. 이미 참여한 사용자는 계속 접근 권한을 유지합니다."
+  },
+  "instance.settings.sharing.revoke-invite.admonition-header": {
+    "message": "이 작업은 되돌릴 수 없습니다"
+  },
+  "instance.settings.sharing.revoke-invite.confirm": {
+    "message": "초대 철회"
+  },
+  "instance.settings.sharing.revoke-invite.header": {
+    "message": "초대 철회"
+  },
   "instance.settings.tabs.general": {
     "message": "일반"
   },
@@ -1148,6 +1634,9 @@
   "instance.settings.tabs.installation.loader-version": {
     "message": "{loader} 버전"
   },
+  "instance.settings.tabs.installation.locked": {
+    "message": "이 인스턴스가 잠긴 상태에서는 설치 설정을 사용할 수 없습니다."
+  },
   "instance.settings.tabs.java": {
     "message": "Java 및 메모리"
   },
@@ -1187,6 +1676,9 @@
   "instance.settings.tabs.java.java-path-placeholder": {
     "message": "/path/to/java"
   },
+  "instance.settings.tabs.sharing": {
+    "message": "공유"
+  },
   "instance.settings.tabs.window": {
     "message": "창"
   },
@@ -1217,8 +1709,23 @@
   "instance.settings.tabs.window.width.enter": {
     "message": "너비 입력..."
   },
+  "instance.shared-instance.error.title": {
+    "message": "문제가 발생했습니다"
+  },
+  "instance.shared-instance.network-error.text": {
+    "message": "공유 인스턴스 API에 연결할 수 없습니다"
+  },
+  "instance.shared-instance.network-error.title": {
+    "message": "네트워크 오류"
+  },
+  "instance.shared-instance.owner-tooltip": {
+    "message": "이 인스턴스의 콘텐츠가 다른 사용자에게 공유되는 중입니다."
+  },
+  "instance.shared-instance.publish-review.added-label": {
+    "message": "추가됨"
+  },
   "instance.shared-instance.publish-review.admonition-header": {
-    "message": "플레이어에게 업데이트 게시"
+    "message": "플레이어에게 업데이트 업로드"
   },
   "instance.shared-instance.publish-review.config-title-v2": {
     "message": "설정 파일 선택"
@@ -1230,10 +1737,10 @@
     "message": "변경 사항 검토"
   },
   "instance.shared-instance.publish-review.publish-button": {
-    "message": "업데이트 푸시"
+    "message": "업데이트 업로드"
   },
   "instance.shared-instance.publish-review.removed-label": {
-    "message": "제거됨"
+    "message": "삭제됨"
   },
   "instance.shared-instance.tooltip": {
     "message": "이 인스턴스의 콘텐츠는 다른 사용자가 관리하고 있습니다."
@@ -1247,6 +1754,18 @@
   "instance.shared-instance.unavailable.locked-text": {
     "message": "이 공유 인스턴스는 콘텐츠 조정 팀에 의해 잠겼습니다. 기본 인스턴스 업데이트를 받지 않으며 플레이할 수 없습니다."
   },
+  "instance.shared-instance.unavailable.locked-title": {
+    "message": "인스턴스 잠김"
+  },
+  "instance.shared-instance.unavailable.manager-fallback": {
+    "message": "인스턴스 관리자"
+  },
+  "instance.shared-instance.unavailable.text": {
+    "message": "로컬 인스턴스는 계속 사용할 수 있지만, 더 이상 연동되지 않으며 업데이트를 받지 않습니다."
+  },
+  "instance.shared-instance.unavailable.title": {
+    "message": "공유 인스턴스를 더 이상 사용할 수 없음"
+  },
   "instance.worlds.a_minecraft_server": {
     "message": "Minecraft 서버"
   },
@@ -1331,6 +1850,42 @@
   "minecraft-required.sign-in": {
     "message": "Microsoft 계정 로그인"
   },
+  "modal.modrinth-account-required.browser-description": {
+    "message": "로그인을 위한 새 탭이 열렸습니다. 해당 탭에서 로그인을 완료한 후 앱 돌아오세요."
+  },
+  "modal.modrinth-account-required.cancel-button": {
+    "message": "취소"
+  },
+  "modal.modrinth-account-required.continue-in-browser-heading": {
+    "message": "브라우저에서 계속 진행"
+  },
+  "modal.modrinth-account-required.create-account-button": {
+    "message": "계정 생성"
+  },
+  "modal.modrinth-account-required.description": {
+    "message": "이 기능을 사용하려면 Modrinth 계정에 로그인해야 합니다."
+  },
+  "modal.modrinth-account-required.header": {
+    "message": "계정 필요"
+  },
+  "modal.modrinth-account-required.open-browser-again-button": {
+    "message": "브라우저 다시 열기"
+  },
+  "modal.modrinth-account-required.sign-in-button": {
+    "message": "Modrinth 로그인"
+  },
+  "modal.modrinth-account-required.sign-in-heading": {
+    "message": "Modrinth 계정 로그인"
+  },
+  "modal.modrinth-account-required.signing-in-header": {
+    "message": "로그인 중"
+  },
+  "modal.modrinth-account-required.support-prompt": {
+    "message": "로그인에 문제가 있나요? <support>지원 받기</support>"
+  },
+  "modal.modrinth-account-required.waiting-for-browser": {
+    "message": "브라우저 확인 대기 중..."
+  },
   "search.filter.locked.instance": {
     "message": "인스턴스에서 관리"
   },
@@ -1354,5 +1909,11 @@
   },
   "search.filter.locked.server-loader.title": {
     "message": "로더가 서버에 의해 제공됩니다"
+  },
+  "settings.sidebar.label.account": {
+    "message": "계정"
+  },
+  "settings.sidebar.label.display": {
+    "message": "디스플레이"
   }
 }
diff --git a/apps/app-frontend/src/locales/ms-MY/index.json b/apps/app-frontend/src/locales/ms-MY/index.json
index ccf6fc1ed7..28836c710e 100644
--- a/apps/app-frontend/src/locales/ms-MY/index.json
+++ b/apps/app-frontend/src/locales/ms-MY/index.json
@@ -8,6 +8,9 @@
   "app.action-bar.hide-more-running-instances": {
     "message": "Sembunyikan lebih banyak pemasangan yang berjalan"
   },
+  "app.action-bar.install.copied-details": {
+    "message": "Disalin"
+  },
   "app.action-bar.install.dismiss": {
     "message": "Ketepikan"
   },
@@ -44,21 +47,12 @@
   "app.action-bar.view-logs": {
     "message": "Lihat log"
   },
-  "app.appearance-settings.advanced-rendering.description": {
-    "message": "Mendayakan pemaparan lanjutan seperti kesan kabur yang boleh menyebabkan masalah prestasi tanpa pemaparan dipercepatkan perkakasan."
-  },
   "app.appearance-settings.advanced-rendering.title": {
     "message": "Pemaparan lanjutan"
   },
-  "app.appearance-settings.color-theme.description": {
-    "message": "Pilih tema warna pilihan anda untuk Modrinth App."
-  },
   "app.appearance-settings.color-theme.title": {
     "message": "Tema warna"
   },
-  "app.appearance-settings.default-landing-page.description": {
-    "message": "Tukar laman utama yang dibuka oleh pelancar."
-  },
   "app.appearance-settings.default-landing-page.home": {
     "message": "Laman utama"
   },
@@ -68,42 +62,12 @@
   "app.appearance-settings.default-landing-page.title": {
     "message": "Laman pendaratan lalai"
   },
-  "app.appearance-settings.hide-nametag.description": {
-    "message": "Menyahdayakan tanda nama di atas pemain anda pada halaman kekulit."
-  },
   "app.appearance-settings.hide-nametag.title": {
     "message": "Sembunyikan tanda nama"
   },
-  "app.appearance-settings.jump-back-into-worlds.description": {
-    "message": "Sertakan dunia terkini dalam bahagian \"Lompat kembali\" pada Laman Utama."
-  },
   "app.appearance-settings.jump-back-into-worlds.title": {
     "message": "Lompat kembali ke dalam dunia"
   },
-  "app.appearance-settings.minimize-launcher.description": {
-    "message": "Meminimumkan pelancar apabila proses Minecraft bermula."
-  },
-  "app.appearance-settings.minimize-launcher.title": {
-    "message": "Minimumkan pelancar"
-  },
-  "app.appearance-settings.native-decorations.description": {
-    "message": "Gunakan bingkai tetingkap sistem (aplikasi perlu dimulakan semula)."
-  },
-  "app.appearance-settings.native-decorations.title": {
-    "message": "Hiasan asli"
-  },
-  "app.appearance-settings.skip-non-essential-warnings.description": {
-    "message": "Melangkau pengesahan berisiko rendah secara automatik seperti pemasangan pek mod pendua, pemadaman kandungan biasa, kemas kini pukal, menyahpautkan pek mod dan gesaan pembaikan. Amaran berbahaya masih akan ditunjukkan."
-  },
-  "app.appearance-settings.toggle-sidebar.description": {
-    "message": "Membolehkan keupayaan untuk menogol bar sisi."
-  },
-  "app.appearance-settings.toggle-sidebar.title": {
-    "message": "Togol bar sisi"
-  },
-  "app.appearance-settings.unknown-pack-warning.description": {
-    "message": "Jika anda cuba memasang fail Modrinth Pack (.mrpack) yang tidak dihoskan pada Modrinth, kami akan memastikan anda memahami risikonya sebelum memasangnya."
-  },
   "app.appearance-settings.unknown-pack-warning.title": {
     "message": "Beri saya amaran sebelum memasang pek mod yang tidak diketahui"
   },
@@ -185,6 +149,9 @@
   "app.install.phase.reading_pack_manifest": {
     "message": "Sedang membaca manifest pek"
   },
+  "app.instance.admonitions.shared-instance.added-label": {
+    "message": "Ditambah"
+  },
   "app.instance.confirm-delete.admonition-body": {
     "message": "Semua data untuk pemasangan anda akan dipadamkan secara kekal, termasuk dunia, konfigurasi dan semua kandungan yang dipasang."
   },
@@ -254,6 +221,15 @@
   "app.instance.worlds.search-worlds-placeholder": {
     "message": "Cari {count} dunia..."
   },
+  "app.java-detection.cancel": {
+    "message": "Batal"
+  },
+  "app.java-detection.columns.path": {
+    "message": "Laluan"
+  },
+  "app.java-detection.select": {
+    "message": "Pilih"
+  },
   "app.modal.install-to-play.header": {
     "message": "Pasang untuk mainkan"
   },
@@ -263,6 +239,9 @@
   "app.modal.install-to-play.mod-count": {
     "message": "{count, plural, other {# mod}}"
   },
+  "app.modal.install-to-play.report-reason.spam": {
+    "message": "Spam"
+  },
   "app.modal.install-to-play.shared-instance": {
     "message": "Pemasangan yang dikongsi"
   },
@@ -272,24 +251,36 @@
   "app.modal.update-to-play.header": {
     "message": "Kemas kini untuk mainkan"
   },
+  "app.modal.update-to-play.shared-instance-added-label": {
+    "message": "Ditambah"
+  },
+  "app.nav.home": {
+    "message": "Laman utama"
+  },
+  "app.news.title": {
+    "message": "Berita"
+  },
   "app.project.install-button.already-installed": {
     "message": "Projek ini sudah dipasang"
   },
   "app.project.install-context.back-to-browse": {
     "message": "Kembali menemukan"
   },
+  "app.settings.default-instance-options.width.title": {
+    "message": "Lebar"
+  },
   "app.settings.developer-mode-enabled": {
     "message": "Mod pembangun didayakan."
   },
   "app.settings.downloading": {
     "message": "Sedang memuat turun v{version}"
   },
+  "app.settings.operating-system.macos": {
+    "message": "macOS"
+  },
   "app.settings.tabs.appearance": {
     "message": "Tampilan"
   },
-  "app.settings.tabs.default-instance-options": {
-    "message": "Tetapan lalai pemasangan"
-  },
   "app.settings.tabs.java-installations": {
     "message": "Pemasangan Java"
   },
@@ -746,6 +737,9 @@
   "instance.settings.tabs.window.width.enter": {
     "message": "Masukkan lebar..."
   },
+  "instance.shared-instance.publish-review.added-label": {
+    "message": "Ditambah"
+  },
   "instance.worlds.a_minecraft_server": {
     "message": "Pelayan Minecraft"
   },
diff --git a/apps/app-frontend/src/locales/nl-NL/index.json b/apps/app-frontend/src/locales/nl-NL/index.json
index d6c2ba51f5..ea8bd2cdd3 100644
--- a/apps/app-frontend/src/locales/nl-NL/index.json
+++ b/apps/app-frontend/src/locales/nl-NL/index.json
@@ -144,19 +144,19 @@
     "message": "Je privacy en hoe advertenties Modrinth ondersteunen"
   },
   "app.appearance-settings.advanced-rendering.description": {
-    "message": "Activeert geavanceerde weergaves zoals blur effecten die mogelijke prestatieproblemen opleveren zonder hardware-versnelde weergeving."
+    "message": "Schakel visuele effecten zoals achtergrondvervaging in. Zonder hardwareversnelling kan dit ten koste gaan van de prestaties."
   },
   "app.appearance-settings.advanced-rendering.title": {
     "message": "Geavanceerde weergave"
   },
   "app.appearance-settings.color-theme.description": {
-    "message": "Selecteer je voorkeur kleurenthema voor de Modrinth App."
+    "message": "Kies het kleurenthema dat door de Modrinth-app wordt gebruikt."
   },
   "app.appearance-settings.color-theme.title": {
     "message": "Kleurenthema"
   },
   "app.appearance-settings.default-landing-page.description": {
-    "message": "Wijzig de pagina waarop de launcher opent."
+    "message": "Kies de pagina die wordt weergegeven wanneer de Modrinth-app wordt geopend."
   },
   "app.appearance-settings.default-landing-page.home": {
     "message": "Start"
@@ -168,49 +168,49 @@
     "message": "Standaard openingspagina"
   },
   "app.appearance-settings.hide-nametag.description": {
-    "message": "Schakelt het nametag boven jouw speler op de skins pagina uit."
+    "message": "Verberg je gebruikersnaam boven het voorbeeld van de speler op de Skinkiezer-pagina."
   },
   "app.appearance-settings.hide-nametag.title": {
     "message": "Verberg nametag"
   },
   "app.appearance-settings.jump-back-into-worlds.description": {
-    "message": "Inclusief recente werelden in het gedeelte \"Ga terug\" op de startpagina."
+    "message": "Toon recent gespeelde werelden in het Ga terug-gedeelte op de startpagina."
   },
   "app.appearance-settings.jump-back-into-worlds.title": {
     "message": "Ga terug in werelden"
   },
   "app.appearance-settings.minimize-launcher.description": {
-    "message": "Minimaliseer de launcher als een Minecraft proces wordt gestart."
+    "message": "Minimaliseer de Modrinth-app zodra Minecraft opstart."
   },
   "app.appearance-settings.minimize-launcher.title": {
-    "message": "Minimaliseer launcher"
+    "message": "App minimaliseren"
   },
   "app.appearance-settings.native-decorations.description": {
-    "message": "Gebruik systeem venster frame (app opnieuw starten vereist)."
+    "message": "Gebruik de titelbalk en vensterbedieningselementen van je besturingssysteem. Hiervoor moet de app opnieuw worden opgestart."
   },
   "app.appearance-settings.native-decorations.title": {
-    "message": "Oorspronkelijke versieringen"
+    "message": "Systeemvensterframe"
   },
   "app.appearance-settings.show-play-time.description": {
-    "message": "Toont hoeveel tijd je aan een instantie hebt besteed."
+    "message": "Laat zien hoe lang je elke instantie hebt gespeeld."
   },
   "app.appearance-settings.show-play-time.title": {
     "message": "Speeltijd laten zien"
   },
   "app.appearance-settings.skip-non-essential-warnings.description": {
-    "message": "Bevestigingen met een laag risico, zoals het installeren van dubbele modpacks, het verwijderen van normale inhoud, bulkupdates, het ontkoppelen van modpacks en reparatieverzoeken, worden automatisch overgeslagen. Waarschuwingen voor gevaarlijke dingen worden nog steeds weergegeven."
+    "message": "Sla bevestigingen over voor acties met een laag risico, zoals het installeren van dubbele exemplaren, het verwijderen van normale inhoud, bulkupdates, het opheffen van koppelingen en herstelbewerkingen. Waarschuwingen voor gevaarlijke handelingen worden altijd weergegeven."
   },
   "app.appearance-settings.skip-non-essential-warnings.title": {
     "message": "Niet-essentiële waarschuwingen overslaan"
   },
   "app.appearance-settings.toggle-sidebar.description": {
-    "message": "Schakelt de mogelijkheid om de zijbalk in- of uit te schakelen in."
+    "message": "Verberg de rechterzijbalk standaard en voeg een knop toe om deze weer te geven of te verbergen."
   },
   "app.appearance-settings.toggle-sidebar.title": {
-    "message": "Schakel zijbalk"
+    "message": "Rechterzijbalk verbergen"
   },
   "app.appearance-settings.unknown-pack-warning.description": {
-    "message": "Als je probeert een Modrinth Pack-bestand (.mrpack) te installeren dat niet op Modrinth zelf wordt gehost, zorgen we ervoor dat je de risico's begrijpt voordat je het installeert."
+    "message": "Geef een veiligheidswaarschuwing weer voordat een Modrinth-pakket (.mrpack) wordt geïnstalleerd dat niet op Modrinth wordt gehost."
   },
   "app.appearance-settings.unknown-pack-warning.title": {
     "message": "Waarschuw mij voordat ik onbekende modpacks installeer"
@@ -221,6 +221,15 @@
   "app.auth-servers.unreachable.header": {
     "message": "Authenticatieservers kunnen niet worden bereikt"
   },
+  "app.behavior-settings.confirmations.title": {
+    "message": "Bevestigingen"
+  },
+  "app.behavior-settings.content.title": {
+    "message": "Startpagina en inhoud"
+  },
+  "app.behavior-settings.startup-and-navigation.title": {
+    "message": "Opstarten en navigeren"
+  },
   "app.browse.add-servers-to-instance": {
     "message": "Server toevoegen aan instantie"
   },
@@ -242,12 +251,18 @@
   "app.browse.back-to-instance": {
     "message": "Terug naar instantie"
   },
+  "app.browse.discover-project-type": {
+    "message": "Ontdek {projectType}"
+  },
   "app.browse.discover-servers": {
     "message": "Ontdek servers"
   },
   "app.browse.hide-added-servers": {
     "message": "Al toegevoegde servers verbergen"
   },
+  "app.browse.hide-installed-modpacks": {
+    "message": "Verberg al geïnstalleerd"
+  },
   "app.browse.project-type.modpacks": {
     "message": "Modpacks"
   },
@@ -362,9 +377,18 @@
   "app.instance.admonitions.shared-instance.review-header": {
     "message": "Wijzigingen bekijken"
   },
+  "app.instance.admonitions.shared-instance.review-update-button": {
+    "message": "Update bekijken"
+  },
   "app.instance.admonitions.shared-instance.reviewing-button": {
     "message": "Controleren..."
   },
+  "app.instance.admonitions.shared-instance.update-available-body": {
+    "message": "Er is een update nodig om {name} te kunnen spelen. Werk het spel bij naar de nieuwste versie om het te kunnen starten."
+  },
+  "app.instance.admonitions.shared-instance.update-available-header": {
+    "message": "Update is beschikbaar"
+  },
   "app.instance.confirm-delete.admonition-body": {
     "message": "Alle gegevens van je instantie worden definitief verwijderd, inclusief je werelden, configuraties en alle geïnstalleerde inhoud."
   },
@@ -431,6 +455,9 @@
   "app.instance.share.invite-modal.heading": {
     "message": "{name} delen"
   },
+  "app.instance.share.invite-modal.user-limit-reached": {
+    "message": "Deze instantie heeft de limiet van {limit} gebruikers bereikt."
+  },
   "app.instance.share.locked.empty-description-prefix": {
     "message": "Je moet je aanmelden als"
   },
@@ -449,6 +476,12 @@
   "app.instance.share.locked.wrong-account-heading": {
     "message": "Verkeerd account"
   },
+  "app.instance.share.members.empty": {
+    "message": "Nog geen gebruikers zijn lid geworden"
+  },
+  "app.instance.share.members.no-filter-results": {
+    "message": "Geen gebruikers voldoen aan je filters."
+  },
   "app.instance.share.remove-user-modal.effect-access": {
     "message": "Ze zullen geen updates meer ontvangen voor deze gedeelde instantie"
   },
@@ -479,6 +512,12 @@
   "app.instance.share.sign-in.button": {
     "message": "Aanmelden"
   },
+  "app.instance.share.unable-to-connect.description": {
+    "message": "De dienst voor gedeelde instanties is momenteel niet beschikbaar, probeer het later nog eens"
+  },
+  "app.instance.share.unable-to-connect.heading": {
+    "message": "Kan geen verbinding maken"
+  },
   "app.instance.share.unlink.body": {
     "message": "Je moet dit modpack ontkoppelen om je instantie te kunnen delen"
   },
@@ -566,12 +605,60 @@
   "app.instance.worlds.search-worlds-placeholder": {
     "message": "Zoek werelden"
   },
+  "app.java-detection.cancel": {
+    "message": "Annuleren"
+  },
+  "app.java-detection.columns.actions": {
+    "message": "Acties"
+  },
+  "app.java-detection.columns.path": {
+    "message": "Pad"
+  },
+  "app.java-detection.columns.version": {
+    "message": "Versie"
+  },
+  "app.java-detection.no-installations-found": {
+    "message": "Geen Java-installaties gevonden."
+  },
+  "app.java-detection.select": {
+    "message": "Selecteren"
+  },
+  "app.java-detection.selected": {
+    "message": "Geselecteerd"
+  },
+  "app.java-detection.title": {
+    "message": "Selecteer Java-installatie"
+  },
+  "app.java-selector.already-installed": {
+    "message": "Al geïnstalleerd"
+  },
+  "app.java-selector.browse": {
+    "message": "Bladeren"
+  },
+  "app.java-selector.detect": {
+    "message": "Detecteren"
+  },
+  "app.java-selector.install-recommended": {
+    "message": "Aanbevolen instantie"
+  },
+  "app.java-selector.installing": {
+    "message": "Installeren..."
+  },
+  "app.java-selector.path.placeholder": {
+    "message": "/pad/naar/java"
+  },
+  "app.java-selector.test-installation": {
+    "message": "Java-installatie testen"
+  },
   "app.modal.install-to-play.additional-context": {
     "message": "Aanvullende context"
   },
   "app.modal.install-to-play.additional-context-placeholder": {
     "message": "Voeg links en afbeeldingen toe als dat mogelijk en relevant is"
   },
+  "app.modal.install-to-play.block-user": {
+    "message": "Gebruiker blokkeren"
+  },
   "app.modal.install-to-play.content-you-are-reporting": {
     "message": "Instantie die je meldt"
   },
@@ -593,6 +680,9 @@
   "app.modal.install-to-play.invite-warning": {
     "message": "Deze uitnodiging is aangemaakt door een andere Modrinth-gebruiker, niet door Modrinth zelf. Accepteer alleen uitnodigingen van mensen die je vertrouwt."
   },
+  "app.modal.install-to-play.invite-warning-with-creator": {
+    "message": "Deze uitnodiging is aangemaakt door <creator>{username}</creator>, niet door Modrinth. Accepteer alleen uitnodigingen van mensen die je vertrouwt."
+  },
   "app.modal.install-to-play.mod-count": {
     "message": "{count, plural,one {# mod}other {# mods}}"
   },
@@ -650,6 +740,9 @@
   "app.modal.install-to-play.unrecognized-files": {
     "message": "Onbekende bestanden"
   },
+  "app.modal.install-to-play.user-blocked": {
+    "message": "Gebruiker geblokkeerd"
+  },
   "app.modal.install-to-play.view-contents": {
     "message": "Inhoud bekijken"
   },
@@ -677,6 +770,36 @@
   "app.modal.update-to-play.update-required-description": {
     "message": "Er is een update nodig om {name} te spelen. Werk het spel bij naar de nieuwste versie om het te kunnen starten."
   },
+  "app.nav.create-new-instance": {
+    "message": "Nieuwe instantie aanmaken"
+  },
+  "app.nav.home": {
+    "message": "Start"
+  },
+  "app.nav.library": {
+    "message": "Bibliotheek"
+  },
+  "app.nav.modrinth-account": {
+    "message": "Modrinth-account"
+  },
+  "app.nav.modrinth-hosting": {
+    "message": "Modrinth Hosting"
+  },
+  "app.nav.sign-in-to-modrinth-account": {
+    "message": "Meld je aan bij een Modrinth-account"
+  },
+  "app.nav.signed-in-as": {
+    "message": "Aangemeld als <user>{username}</user>"
+  },
+  "app.nav.upgrade-to-modrinth-plus": {
+    "message": "Upgrade naar Modrinth+"
+  },
+  "app.news.title": {
+    "message": "Nieuws"
+  },
+  "app.news.view-all": {
+    "message": "Al het nieuws bekijken"
+  },
   "app.project.install-button.already-installed": {
     "message": "Dit project is al geïnstalleerd"
   },
@@ -686,6 +809,9 @@
   "app.project.install-context.back-to-browse": {
     "message": "Terug naar Ontdekken"
   },
+  "app.project.install-context.back-to-instance": {
+    "message": "Terug naar de instantie"
+  },
   "app.project.version.all-versions": {
     "message": "Alle versies"
   },
@@ -698,20 +824,119 @@
   "app.project.versions.already-installed": {
     "message": "Al geïnstalleerd"
   },
+  "app.quick-instance-switcher.drag-show-tooltip": {
+    "message": "Sleep om recente instanties weer te geven"
+  },
+  "app.quick-instance-switcher.drag-tooltip": {
+    "message": "Sleep om formaat aan te passen"
+  },
+  "app.restarting": {
+    "message": "Opnieuw opstarten..."
+  },
+  "app.settings.app-version": {
+    "message": "Modrinth-app {version}"
+  },
+  "app.settings.default-instance-options.environment-variables.description": {
+    "message": "Omgevingsvariabelen die bij het opstarten van een instantie worden ingesteld."
+  },
+  "app.settings.default-instance-options.environment-variables.placeholder": {
+    "message": "Omgevingsvariabelen invoeren..."
+  },
+  "app.settings.default-instance-options.environment-variables.title": {
+    "message": "Omgevingsvariabelen"
+  },
+  "app.settings.default-instance-options.fullscreen.description": {
+    "message": "Start instanties in volledig scherm door het bestand options.txt aan te passen."
+  },
+  "app.settings.default-instance-options.fullscreen.title": {
+    "message": "Volledig scherm"
+  },
+  "app.settings.default-instance-options.height.description": {
+    "message": "De hoogte van het spelvenster bij het opstarten."
+  },
+  "app.settings.default-instance-options.height.placeholder": {
+    "message": "Hoogte invoeren..."
+  },
+  "app.settings.default-instance-options.height.title": {
+    "message": "Hoogte"
+  },
+  "app.settings.default-instance-options.java-arguments.description": {
+    "message": "Argumenten die bij het starten van een instantie aan Java worden doorgegeven."
+  },
+  "app.settings.default-instance-options.java-arguments.placeholder": {
+    "message": "Voer Java-argumenten in..."
+  },
+  "app.settings.default-instance-options.java-arguments.title": {
+    "message": "Java-argumenten"
+  },
+  "app.settings.default-instance-options.memory-allocation.description": {
+    "message": "Maximaal beschikbaar geheugen voor elke instantie."
+  },
+  "app.settings.default-instance-options.memory-allocation.title": {
+    "message": "Geheugentoewijzing"
+  },
+  "app.settings.default-instance-options.post-exit-hook.description": {
+    "message": "Wordt uitgevoerd nadat het spel is afgesloten."
+  },
+  "app.settings.default-instance-options.post-exit-hook.placeholder": {
+    "message": "Voer commando voor na het afsluiten in..."
+  },
+  "app.settings.default-instance-options.post-exit-hook.title": {
+    "message": "Hook voor na het afsluiten"
+  },
+  "app.settings.default-instance-options.pre-launch-hook.description": {
+    "message": "Wordt uitgevoerd voordat de instantie wordt gestart."
+  },
+  "app.settings.default-instance-options.pre-launch-hook.placeholder": {
+    "message": "Voer commando voor het opstarten in..."
+  },
+  "app.settings.default-instance-options.pre-launch-hook.title": {
+    "message": "Hook voor het opstarten"
+  },
+  "app.settings.default-instance-options.width.description": {
+    "message": "De breedte van het spelvenster bij het opstarten."
+  },
+  "app.settings.default-instance-options.width.placeholder": {
+    "message": "Voer breedte in..."
+  },
+  "app.settings.default-instance-options.width.title": {
+    "message": "Breedte"
+  },
+  "app.settings.default-instance-options.wrapper-hook.description": {
+    "message": "Commando gebruikt om het Minecraft proces te om wikkelen."
+  },
+  "app.settings.default-instance-options.wrapper-hook.placeholder": {
+    "message": "Type een omwikkelcommando in..."
+  },
+  "app.settings.default-instance-options.wrapper-hook.title": {
+    "message": "Omwikkel haak"
+  },
+  "app.settings.developer-mode-button.label": {
+    "message": "Schakel ontwikkelaars modus"
+  },
   "app.settings.developer-mode-enabled": {
     "message": "Ontwikkelaarsmodus ingeschakeld."
   },
   "app.settings.downloading": {
     "message": "v{version} wordt gedownload"
   },
+  "app.settings.java-installations.location.title": {
+    "message": "Java {version, number} locatie"
+  },
+  "app.settings.operating-system.macos": {
+    "message": "macOS"
+  },
   "app.settings.privacy.ads-consent.intro": {
     "message": "Advertenties maken Modrinth mogelijk en financieren de uitbetalingen aan makers. Onze partners kunnen cookies in de app opslaan of gebruiken om advertenties te personaliseren en de prestaties te meten. Je kunt je hieronder afmelden of je voorkeuren beheren."
   },
+  "app.settings.privacy.discord-rich-presence.description": {
+    "message": "Laat Modrinth als jouw activiteit op Discord. Dit verandert niet activiteiten toegevoegd door mods."
+  },
   "app.settings.tabs.appearance": {
     "message": "Uiterlijk"
   },
   "app.settings.tabs.default-instance-options": {
-    "message": "Standaardopties voor instantie"
+    "message": "Standaard spelopties"
   },
   "app.settings.tabs.java-installations": {
     "message": "Java installaties"
@@ -725,6 +950,9 @@
   "app.settings.tabs.resource-management": {
     "message": "Bronnenbeheer"
   },
+  "app.sidebar.playing-as": {
+    "message": "Spelen als"
+  },
   "app.skins.add-button": {
     "message": "Skin toevoegen"
   },
@@ -884,6 +1112,21 @@
   "app.skins.toggle-ears-features-on": {
     "message": "Inschakelen"
   },
+  "app.survey.body": {
+    "message": "Zou je een paar vragen willen beantwoorden over je ervaringen met de Modrinth-app?"
+  },
+  "app.survey.footer": {
+    "message": "Deze feedback wordt rechtstreeks doorgestuurd naar het Modrinth-team en zal als leidraad dienen voor toekomstige updates!"
+  },
+  "app.survey.no-thanks": {
+    "message": "Nee, bedankt"
+  },
+  "app.survey.take-survey": {
+    "message": "Aan enquête meedoen"
+  },
+  "app.survey.title": {
+    "message": "Hoi, Modrinth-gebruiker!"
+  },
   "app.update-popup.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."
   },
@@ -1160,6 +1403,30 @@
   "instance.server-modal.resource-pack": {
     "message": "Bronpakket"
   },
+  "instance.settings.sharing.active-invites.actions": {
+    "message": "Acties"
+  },
+  "instance.settings.sharing.active-invites.code": {
+    "message": "Uitnodigingslink"
+  },
+  "instance.settings.sharing.active-invites.description": {
+    "message": "Iedereen die zo'n uitnodigingslink heeft, kan meedoen zolang deze actief is."
+  },
+  "instance.settings.sharing.active-invites.empty": {
+    "message": "Er zijn geen actieve uitnodigingen."
+  },
+  "instance.settings.sharing.active-invites.expires": {
+    "message": "Vervalt"
+  },
+  "instance.settings.sharing.active-invites.revoke": {
+    "message": "Uitnodiging intrekken"
+  },
+  "instance.settings.sharing.active-invites.revoke-with-code": {
+    "message": "Uitnodiging {code} intrekken"
+  },
+  "instance.settings.sharing.active-invites.title": {
+    "message": "Actieve uitnodigingen"
+  },
   "instance.settings.tabs.general": {
     "message": "Algemeen"
   },
diff --git a/apps/app-frontend/src/locales/no-NO/index.json b/apps/app-frontend/src/locales/no-NO/index.json
index 3aa3138482..2b35266b65 100644
--- a/apps/app-frontend/src/locales/no-NO/index.json
+++ b/apps/app-frontend/src/locales/no-NO/index.json
@@ -56,21 +56,12 @@
   "app.action-bar.view-logs": {
     "message": "Vis logger"
   },
-  "app.appearance-settings.advanced-rendering.description": {
-    "message": "Skrur på avansert rendering, som for eksempel uskarphetseffekter, som kan forårsake ytelsesproblemer om man ikke har maskinvareaksellerert rendering."
-  },
   "app.appearance-settings.advanced-rendering.title": {
     "message": "Avansert rendering"
   },
-  "app.appearance-settings.color-theme.description": {
-    "message": "Velg ditt foretrukne fargetema for Modrinth App."
-  },
   "app.appearance-settings.color-theme.title": {
     "message": "Fargetema"
   },
-  "app.appearance-settings.default-landing-page.description": {
-    "message": "Endre sida som vises når launcheren åpnes."
-  },
   "app.appearance-settings.default-landing-page.home": {
     "message": "Hjem"
   },
@@ -80,36 +71,15 @@
   "app.appearance-settings.default-landing-page.title": {
     "message": "Åpningsside"
   },
-  "app.appearance-settings.hide-nametag.description": {
-    "message": "Skjuler navnelappen over din spiller på utseende siden."
-  },
   "app.appearance-settings.hide-nametag.title": {
     "message": "Gjøm navnelapp"
   },
-  "app.appearance-settings.minimize-launcher.title": {
-    "message": "Minimer launcheren"
-  },
-  "app.appearance-settings.show-play-time.description": {
-    "message": "Viser hvor lenge du har spilt et tilfelle."
-  },
   "app.appearance-settings.show-play-time.title": {
     "message": "Vis spilletid"
   },
-  "app.appearance-settings.skip-non-essential-warnings.description": {
-    "message": "Hopper automatisk over lav-rissiko fastslåelser som modpakkeinstalasjonsduplikat, vanlig innholdsletting, bolkoppdateringer, avkoble modpakker, og reparasjonsprompter. Farlige advarsler vil fortsatt vises."
-  },
   "app.appearance-settings.skip-non-essential-warnings.title": {
     "message": "Hopp over mindre viktige advarsler"
   },
-  "app.appearance-settings.toggle-sidebar.description": {
-    "message": "Aktiverer evnen til å skru sidefeltet av/på."
-  },
-  "app.appearance-settings.toggle-sidebar.title": {
-    "message": "Sidefeltsveksling"
-  },
-  "app.appearance-settings.unknown-pack-warning.description": {
-    "message": "Hvis du prøver å laste ned en Modrinth Pakke fil (.mrpack) som er ukjent for Modrinth så kommer vi til å forsikre oss om at du forstår risikoene før du installerer den."
-  },
   "app.appearance-settings.unknown-pack-warning.title": {
     "message": "Advar meg før jeg installerer ukjente modpakker"
   },
@@ -233,9 +203,6 @@
   "app.settings.tabs.appearance": {
     "message": "Utseende"
   },
-  "app.settings.tabs.default-instance-options": {
-    "message": "Vanlige tilfelleinstillinger"
-  },
   "app.settings.tabs.java-installations": {
     "message": "Java installasjoner"
   },
diff --git a/apps/app-frontend/src/locales/pl-PL/index.json b/apps/app-frontend/src/locales/pl-PL/index.json
index 26b526e578..1fc56093d7 100644
--- a/apps/app-frontend/src/locales/pl-PL/index.json
+++ b/apps/app-frontend/src/locales/pl-PL/index.json
@@ -144,19 +144,19 @@
     "message": "Twoja prywatność i jak reklamy wspierają Modrinth"
   },
   "app.appearance-settings.advanced-rendering.description": {
-    "message": "Włącza zaawansowane renderowanie, takie jak efekty rozmycia, które może powodować problemy z wydajnością bez sprzętowej akceleracji renderowania."
+    "message": "Włącz efekty wizualne, takie jak rozmycie tła. Może to negatywnie wpłynąć na wydajność, jeżeli akceleracja sprzętowa jest wyłączona."
   },
   "app.appearance-settings.advanced-rendering.title": {
     "message": "Zaawansowane renderowanie"
   },
   "app.appearance-settings.color-theme.description": {
-    "message": "Wybierz preferowany motyw kolorystyczny dla Modrinth App."
+    "message": "Wybierz motyw użyty przez Modrinth App."
   },
   "app.appearance-settings.color-theme.title": {
     "message": "Motyw"
   },
   "app.appearance-settings.default-landing-page.description": {
-    "message": "Ustaw stronę, która pojawia się po włączeniu launchera."
+    "message": "Wybierz stronę, która pojawi się po uruchomieniu Modrinth App."
   },
   "app.appearance-settings.default-landing-page.home": {
     "message": "Strona główna"
@@ -168,49 +168,43 @@
     "message": "Domyślna strona główna"
   },
   "app.appearance-settings.hide-nametag.description": {
-    "message": "Wyłącza nazwę użytkownika nad modelem gracza na stronie skórek."
+    "message": "Ukryj nazwę użytkownika pokazaną nad podglądem wyglądu gracza na stronie wyboru skórki."
   },
   "app.appearance-settings.hide-nametag.title": {
     "message": "Ukryj nazwę"
   },
   "app.appearance-settings.jump-back-into-worlds.description": {
-    "message": "Pokazuje ostatnie światy w sekcji \"Wskocz z powrotem do światów\" na stronie głównej."
+    "message": "Pokaż ostatnie światy w sekcji \"Wskocz z powrotem do światów\" na stronie głównej."
   },
   "app.appearance-settings.jump-back-into-worlds.title": {
     "message": "Wskocz z powrotem do światów"
   },
   "app.appearance-settings.minimize-launcher.description": {
-    "message": "Minimalizuj launcher po włączeniu procesu Minecraft."
+    "message": "Minimalizuje Modrinth App po uruchomieniu Minecraft."
   },
   "app.appearance-settings.minimize-launcher.title": {
-    "message": "Minimalizuj launcher"
+    "message": "Minimalizuj aplikację"
   },
   "app.appearance-settings.native-decorations.description": {
-    "message": "Używaj systemowej ramki okna (wymaga ponownego uruchomienia)."
+    "message": "Używaj pasek tytułu i kontrolki okna systemu operacyjnego. Wymaga ponownego uruchomienia aplikacji."
   },
   "app.appearance-settings.native-decorations.title": {
-    "message": "Systemowe dekoracje"
-  },
-  "app.appearance-settings.show-play-time.description": {
-    "message": "Pokazuje czas gry spędzony w danej instancji."
+    "message": "Systemowa ramka okna"
   },
   "app.appearance-settings.show-play-time.title": {
     "message": "Pokaż czas gry"
   },
   "app.appearance-settings.skip-non-essential-warnings.description": {
-    "message": "Automatycznie pomija mało znaczące potwierdzenia takie jak duplikaty instalacji paczek modów, usuwanie zwykłej zawartości, masowe aktualizacje, odłączanie paczek modów i naprawianie. Ostrzeżenia o potencjalnie niebezpiecznych akcjach będą nadal pokazywane."
+    "message": "Pomija potwierdzenia dla akcji z niskim ryzykiem, takich jak: duplikowanie instalacji, normalne usuwanie zawartości, aktualizacje zbiorcze, odłączanie udostępnionych instancji oraz naprawy. Ostrzeżenia dla niebezpiecznych akcji wciąż będą pokazywane."
   },
   "app.appearance-settings.skip-non-essential-warnings.title": {
     "message": "Pomiń mało znaczące ostrzeżenia"
   },
   "app.appearance-settings.toggle-sidebar.description": {
-    "message": "Umożliwia przełączenie paska bocznego."
+    "message": "Domyślnie ukrywa prawy pasek boczny i dodaje guzik pozwalający go pokazywać lub ukrywać."
   },
   "app.appearance-settings.toggle-sidebar.title": {
-    "message": "Przełącz pasek boczny"
-  },
-  "app.appearance-settings.unknown-pack-warning.description": {
-    "message": "Jeżeli spróbujesz zainstalować plik Modrinth Pack (.mrpack) którego nie można znaleźć na Modrinth, poinformujemy cię o możliwym ryzyku, zanim go zainstalujesz."
+    "message": "Ukryj prawy pasek boczny"
   },
   "app.appearance-settings.unknown-pack-warning.title": {
     "message": "Ostrzegaj mnie przed instalowaniem nieznanych paczek modów"
@@ -221,6 +215,15 @@
   "app.auth-servers.unreachable.header": {
     "message": "Nie udało się połączyć się z serwerami uwierzytelniania"
   },
+  "app.behavior-settings.confirmations.title": {
+    "message": "Potwierdzenia"
+  },
+  "app.behavior-settings.content.title": {
+    "message": "Strona główna i zawartość"
+  },
+  "app.behavior-settings.startup-and-navigation.title": {
+    "message": "Uruchamianie i nawigacja"
+  },
   "app.browse.add-servers-to-instance": {
     "message": "Dodawanie serwera do instancji"
   },
@@ -242,12 +245,18 @@
   "app.browse.back-to-instance": {
     "message": "Powrót do instancji"
   },
+  "app.browse.discover-project-type": {
+    "message": "Odkrywaj {projectType}"
+  },
   "app.browse.discover-servers": {
     "message": "Odkryj serwery"
   },
   "app.browse.hide-added-servers": {
     "message": "Ukryj już dodane serwery"
   },
+  "app.browse.hide-installed-modpacks": {
+    "message": "Ukryj już zainstalowane"
+  },
   "app.browse.project-type.modpacks": {
     "message": "Paczki modów"
   },
@@ -338,6 +347,9 @@
   "app.instance.admonitions.shared-instance.added-label": {
     "message": "Dodano"
   },
+  "app.instance.admonitions.shared-instance.changes-body": {
+    "message": "Twoja lokalna przesłana instalacja wyprzedza te, które zostały przesłane użytkownikom."
+  },
   "app.instance.admonitions.shared-instance.changes-header": {
     "message": "Twoje zmiany nie zostały jeszcze udostępnione"
   },
@@ -353,12 +365,21 @@
   "app.instance.admonitions.shared-instance.review-admonition-header": {
     "message": "Opublikuj aktualizację"
   },
+  "app.instance.admonitions.shared-instance.review-description": {
+    "message": "Zobacz zmienione treści, które zostaną przesłane wszystkim użytkownikom tej instalacji."
+  },
   "app.instance.admonitions.shared-instance.review-header": {
     "message": "Sprawdź zmiany"
   },
+  "app.instance.admonitions.shared-instance.review-update-button": {
+    "message": "Sprawdź aktualizację"
+  },
   "app.instance.admonitions.shared-instance.reviewing-button": {
     "message": "Trwa przegląd..."
   },
+  "app.instance.admonitions.shared-instance.update-available-header": {
+    "message": "Dostępna aktualizacja"
+  },
   "app.instance.confirm-delete.admonition-body": {
     "message": "Wszystkie dane z Twojej instancji zostaną trwale usunięte, w tym Twoje światy, pliki konfiguracji i jakakolwiek dodana zawartość."
   },
@@ -395,6 +416,9 @@
   "app.instance.mods.content-type-project": {
     "message": "projekt"
   },
+  "app.instance.mods.locked-content": {
+    "message": "Treści w zablokowanej instalacji nie można zmienić."
+  },
   "app.instance.mods.project-was-added": {
     "message": "Dodano \"{name}\""
   },
@@ -407,6 +431,9 @@
   "app.instance.mods.successfully-uploaded": {
     "message": "Przesyłanie zakończone sukcesem"
   },
+  "app.instance.share.empty.description": {
+    "message": "Możesz udostępnić tę instalację znajomym!"
+  },
   "app.instance.share.empty.heading": {
     "message": "Nie zaproszono żadnych znajomych"
   },
@@ -452,6 +479,12 @@
   "app.instance.share.sign-in.button": {
     "message": "Zaloguj się"
   },
+  "app.instance.shared-instance-already-installed.body": {
+    "message": "Ta przesłana instalacja jest zainstalowana jako <bold>{instanceName} </bold>. Czy na pewno chcesz zainstalować jej kopię?"
+  },
+  "app.instance.shared-instance-already-installed.header": {
+    "message": "Przesłana instalacja jest już zainstalowana"
+  },
   "app.instance.shared-instance-already-installed.install-anyway": {
     "message": "Instaluj mimo to"
   },
@@ -461,6 +494,9 @@
   "app.instance.shared-instance-wrong-account.fallback-username": {
     "message": "połączone konto"
   },
+  "app.instance.shared-instance-wrong-account.owner-admonition-body-v2": {
+    "message": "aby zarządzać przesłaną instalacją, gdy to zrobisz, twoja wersja instalacji wyprzedzi instalacje zainstalowaną przez innych użytkowników."
+  },
   "app.instance.shared-instance-wrong-account.sign-in-as-label": {
     "message": "Zaloguj się jako"
   },
@@ -470,6 +506,9 @@
   "app.instance.shared-instance-wrong-account.user-admonition-body-v2": {
     "message": ", by otrzymywać aktualizacje dla tej udostępnionej instancji."
   },
+  "app.instance.shared-instance-wrong-account.warning-header": {
+    "message": "Korzystasz z niewłaściwego konta Modrith"
+  },
   "app.instance.worlds.add-server": {
     "message": "Dodaj serwer"
   },
@@ -483,7 +522,7 @@
     "message": "Usuń świat"
   },
   "app.instance.worlds.delete-world-modal.warning-body": {
-    "message": "Ten świat zostanie trwale usunięty z tej instancji. Tej akcji nie będzie można cofnąć."
+    "message": "Ten świat zostanie trwale usunięty z tej instancji. Tej akcji nie można cofnąć."
   },
   "app.instance.worlds.delete-world-modal.warning-header": {
     "message": "Usuwanie {name}"
@@ -501,7 +540,7 @@
     "message": "Vanilla"
   },
   "app.instance.worlds.no-worlds-description": {
-    "message": "Dodaj serwer lub szukaj, aby rozpocząć"
+    "message": "Dodaj serwer lub go wyszukaj, aby rozpocząć"
   },
   "app.instance.worlds.no-worlds-heading": {
     "message": "Nie dodano żadnych światów ani serwerów"
@@ -521,9 +560,57 @@
   "app.instance.worlds.search-worlds-placeholder": {
     "message": "Szukaj wśród {count} światów..."
   },
+  "app.java-detection.cancel": {
+    "message": "Anuluj"
+  },
+  "app.java-detection.columns.actions": {
+    "message": "Akcje"
+  },
+  "app.java-detection.columns.path": {
+    "message": "Ścieżka"
+  },
+  "app.java-detection.columns.version": {
+    "message": "Wersja"
+  },
+  "app.java-detection.no-installations-found": {
+    "message": "Nie znaleziono żadnych instalacji Java."
+  },
+  "app.java-detection.select": {
+    "message": "Wybierz"
+  },
+  "app.java-detection.selected": {
+    "message": "Wybrano"
+  },
+  "app.java-detection.title": {
+    "message": "Wybierz instalację Java"
+  },
+  "app.java-selector.already-installed": {
+    "message": "Już zainstalowano"
+  },
+  "app.java-selector.browse": {
+    "message": "Przeglądaj"
+  },
+  "app.java-selector.detect": {
+    "message": "Wykryj"
+  },
+  "app.java-selector.install-recommended": {
+    "message": "Zainstaluj zalecane"
+  },
+  "app.java-selector.installing": {
+    "message": "Instalowanie..."
+  },
+  "app.java-selector.path.placeholder": {
+    "message": "/path/to/java"
+  },
   "app.modal.install-to-play.additional-context": {
     "message": "Dodatkowy kontekst"
   },
+  "app.modal.install-to-play.additional-context-placeholder": {
+    "message": "Jeżeli to będzie możliwe, dodaj linki i obrazki"
+  },
+  "app.modal.install-to-play.block-user": {
+    "message": "Zablokuj użytkownika"
+  },
   "app.modal.install-to-play.content-you-are-reporting": {
     "message": "Instancja, którą zgłaszasz"
   },
@@ -548,6 +635,9 @@
   "app.modal.install-to-play.mod-count": {
     "message": "{count, plural, one {# mod} few {# mody} other {# modów}}"
   },
+  "app.modal.install-to-play.report-description": {
+    "message": "Użyj tego formularza zgłoszeniowego, aby zgłosić przypadki, które naruszają nasze <rules-link>Zasady</rules-link> albo <terms-link>Warunki Korzystania</terms-link>."
+  },
   "app.modal.install-to-play.report-image-invalid-type": {
     "message": "Plik nie jest dozwolonym formatem zdjęcia"
   },
@@ -555,28 +645,37 @@
     "message": "Plik przekracza limit rozmiaru (1MiB)"
   },
   "app.modal.install-to-play.report-legal-claims": {
-    "message": "W przypadku powiadomień DMCA lub innych roszczeń prawnych zapoznaj się z naszą <copyright-link>Polityką dotyczącą praw autorskich</copyright-link>."
+    "message": "W przypadku powiadomień DMCA lub innych roszczeń prawnych zapoznaj się z naszą <copyright-link>Polityką Praw Autorskich</copyright-link>."
   },
   "app.modal.install-to-play.report-reason": {
     "message": "Którą zasadę narusza ta instancja?"
   },
+  "app.modal.install-to-play.report-reason.inappropriate": {
+    "message": "Treści nieodpowiednie"
+  },
   "app.modal.install-to-play.report-reason.malicious": {
-    "message": "Złośliwe"
+    "message": "Zawiera Złośliwy kod"
   },
   "app.modal.install-to-play.report-reason.spam": {
     "message": "Spam"
   },
   "app.modal.install-to-play.report-shared-instance-header": {
-    "message": "Zgłoś udostępnioną instancję"
+    "message": "Zgłoś przesłaną Instalacje"
   },
   "app.modal.install-to-play.report-submitted": {
     "message": "Zgłoszenie przesłane"
   },
+  "app.modal.install-to-play.report-support-and-bugs": {
+    "message": "W przypadku pytań technicznych prosimy o kontakt z <support-link>Zespołem Obsługi Klienta</support-link>. Aby, zgłosić błąd wejdź na <github-link>GitHub issue</github-link>."
+  },
   "app.modal.install-to-play.reviewed-files": {
     "message": "Plik jest sprawdzony tylko, jeżeli został opublikowany na Modrinth, niezależnie od jego formatu (w tym pliki .mrpack)."
   },
   "app.modal.install-to-play.shared-instance": {
-    "message": "Wspólna instancja"
+    "message": "Przesłana Instalacja"
+  },
+  "app.modal.install-to-play.shared-instance-content": {
+    "message": "Treści w przesłanej ci instalacji"
   },
   "app.modal.install-to-play.unknown-files-description": {
     "message": "Ta serwerowa paczka modów zawiera pliki, które nie zostały opublikowane na Modrinth. Zalecamy instalowanie plików tylko ze źródeł, którym ufasz."
@@ -587,6 +686,9 @@
   "app.modal.install-to-play.unrecognized-files": {
     "message": "Nieznane plki"
   },
+  "app.modal.install-to-play.user-blocked": {
+    "message": "Zablokowano użytkownika"
+  },
   "app.modal.install-to-play.view-contents": {
     "message": "Pokaż zawartość"
   },
@@ -603,7 +705,7 @@
     "message": "Usunięto"
   },
   "app.modal.update-to-play.shared-instance-unknown-files-description": {
-    "message": "Ta aktualizacja udostępnionej instancji zawiera pliki, które nie zostały opublikowane na Modrinth. Zalecamy instalowanie plików tylko z źródeł, którym ufasz."
+    "message": "Ta aktualizacja przesłanej instancji zawiera pliki, które nie zostały opublikowane na Modrinth. Zalecamy instalowanie tych plików z źródła, któremu ufasz."
   },
   "app.modal.update-to-play.update-required": {
     "message": "Wymagana jest aktualizacja"
@@ -611,6 +713,36 @@
   "app.modal.update-to-play.update-required-description": {
     "message": "Aktualizacja jest wymagana, by grać w {name}. Zaktualizuj do najnowszej wersji, aby uruchomić grę."
   },
+  "app.nav.create-new-instance": {
+    "message": "Utwórz instancję"
+  },
+  "app.nav.home": {
+    "message": "Strona główna"
+  },
+  "app.nav.library": {
+    "message": "Biblioteka"
+  },
+  "app.nav.modrinth-account": {
+    "message": "Konto Modrinth"
+  },
+  "app.nav.modrinth-hosting": {
+    "message": "Modrinth Hosting"
+  },
+  "app.nav.sign-in-to-modrinth-account": {
+    "message": "Zaloguj się na konto Modrinth"
+  },
+  "app.nav.signed-in-as": {
+    "message": "Zalogowano jako <user>{username}</user>"
+  },
+  "app.nav.upgrade-to-modrinth-plus": {
+    "message": "Ulepsz do Modrinth+"
+  },
+  "app.news.title": {
+    "message": "Aktualności"
+  },
+  "app.news.view-all": {
+    "message": "Zobacz wszystkie aktualności"
+  },
   "app.project.install-button.already-installed": {
     "message": "Ten projekt jest już zainstalowany"
   },
@@ -620,6 +752,9 @@
   "app.project.install-context.back-to-browse": {
     "message": "Powróć do odkrywania"
   },
+  "app.project.install-context.back-to-instance": {
+    "message": "Powrót do instancji"
+  },
   "app.project.version.all-versions": {
     "message": "Wszystkie wersje"
   },
@@ -632,20 +767,104 @@
   "app.project.versions.already-installed": {
     "message": "Już zainstalowano"
   },
+  "app.restarting": {
+    "message": "Uruchamianie ponowne..."
+  },
+  "app.settings.app-version": {
+    "message": "Modrinth App {version}"
+  },
+  "app.settings.default-instance-options.environment-variables.title": {
+    "message": "Zmienne środowiskowe"
+  },
+  "app.settings.default-instance-options.fullscreen.title": {
+    "message": "Pełny ekran"
+  },
+  "app.settings.default-instance-options.height.description": {
+    "message": "Wysokość okna gry po uruchomieniu."
+  },
+  "app.settings.default-instance-options.height.placeholder": {
+    "message": "Wprowadź wysokość..."
+  },
+  "app.settings.default-instance-options.height.title": {
+    "message": "Wysokość"
+  },
+  "app.settings.default-instance-options.java-arguments.placeholder": {
+    "message": "Wprowadź argumenty Java..."
+  },
+  "app.settings.default-instance-options.java-arguments.title": {
+    "message": "Argumenty Java"
+  },
+  "app.settings.default-instance-options.memory-allocation.description": {
+    "message": "Maksymalna ilość pamięci dostępna dla każdej instancji."
+  },
+  "app.settings.default-instance-options.memory-allocation.title": {
+    "message": "Przypisanie pamięci"
+  },
+  "app.settings.default-instance-options.post-exit-hook.description": {
+    "message": "Aktywowane po zamknięciu gry."
+  },
+  "app.settings.default-instance-options.post-exit-hook.placeholder": {
+    "message": "Wprowadź komendę po zamknięciu..."
+  },
+  "app.settings.default-instance-options.post-exit-hook.title": {
+    "message": "Komenda po zamknięciu"
+  },
+  "app.settings.default-instance-options.pre-launch-hook.description": {
+    "message": "Aktywowane przed uruchomieniem instancji."
+  },
+  "app.settings.default-instance-options.pre-launch-hook.placeholder": {
+    "message": "Wpisz komendę przed uruchomieniem..."
+  },
+  "app.settings.default-instance-options.pre-launch-hook.title": {
+    "message": "Komenda przed uruchomieniem"
+  },
+  "app.settings.default-instance-options.width.description": {
+    "message": "Szerokość okna gry po uruchomieniu."
+  },
+  "app.settings.default-instance-options.width.placeholder": {
+    "message": "Wprowadź szerokość..."
+  },
+  "app.settings.default-instance-options.width.title": {
+    "message": "Szerokość"
+  },
   "app.settings.developer-mode-enabled": {
     "message": "Tryb dewelopera włączony."
   },
   "app.settings.downloading": {
     "message": "Pobieranie v{version}"
   },
+  "app.settings.java-installations.location.title": {
+    "message": "Ścieżka do Java {version, number}"
+  },
+  "app.settings.operating-system.macos": {
+    "message": "macOS"
+  },
   "app.settings.privacy.ads-consent.intro": {
-    "message": "Reklamy pozwalają Modrinth oraz fundują wypłaty twórców. Nasi partnerzy mogą zachować lub uzyskać dostęp ciasteczek w aplikacji, żeby spersonalizować reklamy i zmierzyć wydajność. Możesz optować lub zarządzać preferencjami poniżej."
+    "message": "Reklamy pozwalają na dalsze działanie Modrinth i finansują dochody dla twórców. Nasi partnerzy mogą gromadzić albo uzyskiwać dostęp do plików cookies w celu personalizacji reklam i mierzenia skuteczności."
+  },
+  "app.settings.privacy.discord-rich-presence.description": {
+    "message": "Pokazuj Modrinth App jako aktywność na Discord. Nie wpływa to na Rich Presence dodane do instancji przez mody. Wymaga ponownego uruchomienia aplikacji."
+  },
+  "app.settings.privacy.discord-rich-presence.title": {
+    "message": "Discord Rich Presence"
+  },
+  "app.settings.privacy.telemetry.title": {
+    "message": "Telemetria"
+  },
+  "app.settings.resource-management.maximum-concurrent-downloads.description": {
+    "message": "Ilość plików, które aplikacja może pobierać na raz. Zmniejsz tę wartość, jeśli pobieranie jest niestabilne. Wymaga ponownego uruchomienia aplikacji."
+  },
+  "app.settings.resource-management.maximum-concurrent-writes.description": {
+    "message": "Ilość plików, które aplikacja może zapisywać na dysku na raz. Zmniejsz tę wartość, jeśli często występują błędy wejścia/wyjścia. Wymaga ponownego uruchomienia aplikacji."
+  },
+  "app.settings.sidebar.label.instances": {
+    "message": "Instancje"
   },
   "app.settings.tabs.appearance": {
     "message": "Wygląd"
   },
   "app.settings.tabs.default-instance-options": {
-    "message": "Domyślne opcje instancji"
+    "message": "Domyślne opcje gry"
   },
   "app.settings.tabs.java-installations": {
     "message": "Instalacje Java"
@@ -659,6 +878,9 @@
   "app.settings.tabs.resource-management": {
     "message": "Zarządzanie zasobami"
   },
+  "app.sidebar.playing-as": {
+    "message": "Graj jako"
+  },
   "app.skins.add-button": {
     "message": "Dodaj skórkę"
   },
@@ -681,10 +903,10 @@
     "message": "Nie udało się odczytać upuszczonego pliku."
   },
   "app.skins.dropped-file-error.title": {
-    "message": "Błąd podczas przetwarzania pliku"
+    "message": "Błąd przetwarzania pliku"
   },
   "app.skins.ears-feature-notice": {
-    "message": "Ta skórka używa funkcjonalności modyfikacji {ears}"
+    "message": "Ta skórka używa modyfikacji {ears}"
   },
   "app.skins.edit-button": {
     "message": "Edytuj skórkę"
@@ -699,10 +921,10 @@
     "message": "Styl ramion"
   },
   "app.skins.modal.arm-style-slim": {
-    "message": "Smukły"
+    "message": "Smukłe"
   },
   "app.skins.modal.arm-style-wide": {
-    "message": "Szeroki"
+    "message": "Szerokie"
   },
   "app.skins.modal.cape-fallback-name": {
     "message": "Peleryna"
@@ -818,6 +1040,15 @@
   "app.skins.toggle-ears-features-on": {
     "message": "Włącz"
   },
+  "app.survey.no-thanks": {
+    "message": "Nie, dziękuję"
+  },
+  "app.survey.take-survey": {
+    "message": "Weź udział w ankiecie"
+  },
+  "app.survey.title": {
+    "message": "Cześć, użytkowniku Modrinth!"
+  },
   "app.update-popup.body.download-complete": {
     "message": "Wersja Modrinth App v{version} została pobrana. Załaduj ponownie, żeby zaktualizować teraz, albo automatycznie, gdy zamkniesz Modrinth App."
   },
@@ -947,6 +1178,18 @@
   "installation-settings.shared-instance.linked-title": {
     "message": "Powiązana udostępniona instancja"
   },
+  "installation-settings.shared-instance.unlink-button": {
+    "message": "Odłącz udostępnioną instancję"
+  },
+  "installation-settings.shared-instance.unlink-description": {
+    "message": "Odłącz lokalną instancję od aktualizacji z udostępnionej instancji."
+  },
+  "installation-settings.shared-instance.unlinking-button": {
+    "message": "Odłączanie..."
+  },
+  "installation-settings.unpublish-shared-instance.modal.admonition-body": {
+    "message": "Spowoduje to usunięcie przesyłanej instalacji z serwerów Modrith. Użytkownicy korzystający z niej na Modrinth App przestaną otrzymywać aktualizacje, ale twoja lokalna instalacja zostanie na tym urządzeniu."
+  },
   "instance.action.create-shortcut": {
     "message": "Utwórz skrót"
   },
@@ -1031,6 +1274,21 @@
   "instance.server-modal.resource-pack": {
     "message": "Paczka zasobów"
   },
+  "instance.settings.sharing.active-invites.actions": {
+    "message": "Akcje"
+  },
+  "instance.settings.sharing.active-invites.expires": {
+    "message": "Wygasa"
+  },
+  "instance.settings.sharing.active-invites.title": {
+    "message": "Aktywne zaproszenia"
+  },
+  "instance.settings.sharing.active-invites.uses": {
+    "message": "Użyć"
+  },
+  "instance.settings.sharing.revoke-invite.admonition-header": {
+    "message": "Tej akcji nie można cofnąć"
+  },
   "instance.settings.tabs.general": {
     "message": "Ogólne"
   },
@@ -1382,6 +1640,15 @@
   "modal.modrinth-account-required.sign-in-heading": {
     "message": "Zaloguj się na konto Modrinth"
   },
+  "modal.modrinth-account-required.signing-in-header": {
+    "message": "Trwa logowanie"
+  },
+  "modal.modrinth-account-required.support-prompt": {
+    "message": "Masz problem z logowaniem? Skorzystaj z <support>Obsługi klienta</support>"
+  },
+  "modal.modrinth-account-required.waiting-for-browser": {
+    "message": "Oczekiwanie na twoje potwierdzenie..."
+  },
   "search.filter.locked.instance": {
     "message": "Podane przez instancję"
   },
@@ -1405,5 +1672,11 @@
   },
   "search.filter.locked.server-loader.title": {
     "message": "Loader jest dostarczony przez serwer"
+  },
+  "settings.sidebar.label.account": {
+    "message": "Konto"
+  },
+  "settings.sidebar.label.display": {
+    "message": "Wyświetlanie"
   }
 }
diff --git a/apps/app-frontend/src/locales/pt-BR/index.json b/apps/app-frontend/src/locales/pt-BR/index.json
index 841aeca96e..06aa6d9c18 100644
--- a/apps/app-frontend/src/locales/pt-BR/index.json
+++ b/apps/app-frontend/src/locales/pt-BR/index.json
@@ -48,7 +48,7 @@
     "message": "Não foi possível salvar os arquivos"
   },
   "app.action-bar.install.summary.download-failed": {
-    "message": "A transferência não foi finalizada"
+    "message": "O download não foi concluído"
   },
   "app.action-bar.install.summary.instance-not-found": {
     "message": "Instância não encontrada"
@@ -102,7 +102,7 @@
     "message": "Nenhuma instância em execução"
   },
   "app.action-bar.offline": {
-    "message": "Inativo"
+    "message": "Offline"
   },
   "app.action-bar.primary-instance": {
     "message": "Instância principal"
@@ -144,19 +144,19 @@
     "message": "Sua privacidade e como anúncios apoiam o Modrinth"
   },
   "app.appearance-settings.advanced-rendering.description": {
-    "message": "Ativa a renderização avançada, como desfoque que talvez afete o desempenho sem renderização acelerada do hardware."
+    "message": "Ativa os efeitos visuais como o desfoque de fundo. Isso talvez reduza o desempenho sem o aceleramento de hardware."
   },
   "app.appearance-settings.advanced-rendering.title": {
     "message": "Renderização avançada"
   },
   "app.appearance-settings.color-theme.description": {
-    "message": "Escolha seu tema de cores preferido para o Modrinth App."
+    "message": "Escolha o tema usado pelo Modrinth App."
   },
   "app.appearance-settings.color-theme.title": {
-    "message": "Tema de cores"
+    "message": "Tema"
   },
   "app.appearance-settings.default-landing-page.description": {
-    "message": "Altera a página que o launcher é aberto."
+    "message": "Escolha a página exibida ao abrir o Modrinth App."
   },
   "app.appearance-settings.default-landing-page.home": {
     "message": "Início"
@@ -168,59 +168,68 @@
     "message": "Página inicial padrão"
   },
   "app.appearance-settings.hide-nametag.description": {
-    "message": "Desativa o nametag acima do seu jogador na página de Skins."
+    "message": "Oculta sua nametag acima do jogador na página de seleção de skin."
   },
   "app.appearance-settings.hide-nametag.title": {
     "message": "Ocultar nametag"
   },
   "app.appearance-settings.jump-back-into-worlds.description": {
-    "message": "Inclui mundos recentes na seção \"Retomar\" na página inicial."
+    "message": "Exibe os mundos jogados recentemente na seção \"Volte aos mundos\" na página inicial."
   },
   "app.appearance-settings.jump-back-into-worlds.title": {
-    "message": "Retomar aos mundos"
+    "message": "Volte aos mundos"
   },
   "app.appearance-settings.minimize-launcher.description": {
-    "message": "Minimize o launcher assim que algum processo do Minecraft iniciar."
+    "message": "Minimiza o Modrinth App ao iniciar o Minecraft."
   },
   "app.appearance-settings.minimize-launcher.title": {
-    "message": "Minimizar launcher"
+    "message": "Minimizar aplicativo"
   },
   "app.appearance-settings.native-decorations.description": {
-    "message": "Usar molduras de janela do sistema (exige reinicialização do aplicativo)."
+    "message": "Usa a barra de título e os controles de janela do seu sistema operacional. Exige a reinicialização do aplicativo."
   },
   "app.appearance-settings.native-decorations.title": {
-    "message": "Decorações nativas"
+    "message": "Moldura de janela do sistema"
   },
   "app.appearance-settings.show-play-time.description": {
-    "message": "Exibe a quantidade de tempo jogado de uma instância."
+    "message": "Exibe o tempo de jogo de cada instância."
   },
   "app.appearance-settings.show-play-time.title": {
-    "message": "Exibir tempo jogado"
+    "message": "Exibir tempo de jogo"
   },
   "app.appearance-settings.skip-non-essential-warnings.description": {
-    "message": "Pula automaticamente as confirmações desnecessárias como duplica de instalação de pacotes de mods, exclusão de conteúdo normal, atualizações em massa, desvinculo de pacotes de mods e diálogos de reparo. Os avisos de perigo ainda serão exibidos."
+    "message": "Ignora as confirmações para ações de baixo risco como instalações duplicadas, exclusão de conteúdo normal, atualizações em massa, desvinculação e reparos. Os avisos para ações perigosas sempre são mostrados."
   },
   "app.appearance-settings.skip-non-essential-warnings.title": {
     "message": "Ignorar avisos desnecessários"
   },
   "app.appearance-settings.toggle-sidebar.description": {
-    "message": "Permite alternar a barra lateral."
+    "message": "Oculta a barra lateral direita por padrão e adiciona um botão para mostrar ou ocultar."
   },
   "app.appearance-settings.toggle-sidebar.title": {
-    "message": "Alternar barra lateral"
+    "message": "Ocultar barra lateral direita"
   },
   "app.appearance-settings.unknown-pack-warning.description": {
-    "message": "Se você tentar instalar um arquivo Modrinth Pack (.mrpack) não hospedado no Modrinth, garantiremos que você entenda os riscos antes de instalar."
+    "message": "Exibe um aviso de segurança ao instalar um Modrinth Pack (.mrpack) que não seja hospedado no Modrinth."
   },
   "app.appearance-settings.unknown-pack-warning.title": {
     "message": "Avise-me antes de instalar pacotes de mods desconhecidos"
   },
   "app.auth-servers.unreachable.body": {
-    "message": "Os servidores de autenticação do Minecraft podem estar indisponíveis no momento. Verifique sua conexão com a rede e tente novamente mais tarde."
+    "message": "Os servidores de autenticação do Minecraft talvez estejam indisponíveis no momento. Verifique sua conexão com a internet e tente novamente mais tarde."
   },
   "app.auth-servers.unreachable.header": {
     "message": "Não foi possível acessar os servidores de autenticação"
   },
+  "app.behavior-settings.confirmations.title": {
+    "message": "Confirmações"
+  },
+  "app.behavior-settings.content.title": {
+    "message": "Início e conteúdo"
+  },
+  "app.behavior-settings.startup-and-navigation.title": {
+    "message": "Inicialização e navegação"
+  },
   "app.browse.add-servers-to-instance": {
     "message": "Adicionando servidor à instância"
   },
@@ -242,12 +251,18 @@
   "app.browse.back-to-instance": {
     "message": "Voltar à instância"
   },
+  "app.browse.discover-project-type": {
+    "message": "Descobrir {projectType}"
+  },
   "app.browse.discover-servers": {
     "message": "Descobrir servidores"
   },
   "app.browse.hide-added-servers": {
     "message": "Ocultar servidores já adicionados"
   },
+  "app.browse.hide-installed-modpacks": {
+    "message": "Ocultar já instalado"
+  },
   "app.browse.project-type.modpacks": {
     "message": "Pacotes de mods"
   },
@@ -345,7 +360,7 @@
     "message": "Suas alterações ainda não foram compartilhadas"
   },
   "app.instance.admonitions.shared-instance.publish-button": {
-    "message": "Atualização de publicação"
+    "message": "Publicar atualização"
   },
   "app.instance.admonitions.shared-instance.publishing-button": {
     "message": "Publicando..."
@@ -354,7 +369,7 @@
     "message": "Removido"
   },
   "app.instance.admonitions.shared-instance.review-admonition-header": {
-    "message": "Atualização de publicação"
+    "message": "Publicar atualização"
   },
   "app.instance.admonitions.shared-instance.review-description": {
     "message": "Revise as alterações de conteúdo que serão compartilhadas com todos os usuários desta instância."
@@ -362,9 +377,18 @@
   "app.instance.admonitions.shared-instance.review-header": {
     "message": "Revisar alterações"
   },
+  "app.instance.admonitions.shared-instance.review-update-button": {
+    "message": "Revisar atualização"
+  },
   "app.instance.admonitions.shared-instance.reviewing-button": {
     "message": "Revisando..."
   },
+  "app.instance.admonitions.shared-instance.update-available-body": {
+    "message": "Uma atualização é necessária para jogar {name}. Atualize para a versão mais recente para iniciar o jogo."
+  },
+  "app.instance.admonitions.shared-instance.update-available-header": {
+    "message": "Uma atualização está disponível"
+  },
   "app.instance.confirm-delete.admonition-body": {
     "message": "Todos os dados para sua instância serão excluídos permanentemente, incluindo seus mundos, configs e todo o conteúdo instalado."
   },
@@ -431,6 +455,9 @@
   "app.instance.share.invite-modal.heading": {
     "message": "Compartilhar {name}"
   },
+  "app.instance.share.invite-modal.user-limit-reached": {
+    "message": "Esta instância já alcançou limite de usuários de {limit}."
+  },
   "app.instance.share.locked.empty-description-prefix": {
     "message": "Você precisa iniciar sessão como"
   },
@@ -449,6 +476,12 @@
   "app.instance.share.locked.wrong-account-heading": {
     "message": "Conta errada"
   },
+  "app.instance.share.members.empty": {
+    "message": "Nenhum usuário entrou ainda"
+  },
+  "app.instance.share.members.no-filter-results": {
+    "message": "Nenhum usuário corresponde seus filtros."
+  },
   "app.instance.share.remove-user-modal.effect-access": {
     "message": "Eles não receberão mais atualizações para esta instância compartilhada"
   },
@@ -479,6 +512,12 @@
   "app.instance.share.sign-in.button": {
     "message": "Iniciar sessão"
   },
+  "app.instance.share.unable-to-connect.description": {
+    "message": "O serviço de instâncias compartilhadas não está acessível no momento, tente novamente mais tarde"
+  },
+  "app.instance.share.unable-to-connect.heading": {
+    "message": "Não foi possível conectar"
+  },
   "app.instance.share.unlink.body": {
     "message": "Você precisa desvincular este pacote de mods para compartilhar sua instância"
   },
@@ -537,7 +576,7 @@
     "message": "Modificado"
   },
   "app.instance.worlds.filter-offline": {
-    "message": "Inativo"
+    "message": "Offline"
   },
   "app.instance.worlds.filter-online": {
     "message": "Ativo"
@@ -551,6 +590,9 @@
   "app.instance.worlds.no-worlds-heading": {
     "message": "Nenhum servidor ou mundo adicionado"
   },
+  "app.instance.worlds.refreshing": {
+    "message": "Recarregando..."
+  },
   "app.instance.worlds.remove-server-modal.remove-button": {
     "message": "Remover servidor"
   },
@@ -566,12 +608,60 @@
   "app.instance.worlds.search-worlds-placeholder": {
     "message": "Buscar {count} mundos..."
   },
+  "app.java-detection.cancel": {
+    "message": "Cancelar"
+  },
+  "app.java-detection.columns.actions": {
+    "message": "Ações"
+  },
+  "app.java-detection.columns.path": {
+    "message": "Caminho"
+  },
+  "app.java-detection.columns.version": {
+    "message": "Versão"
+  },
+  "app.java-detection.no-installations-found": {
+    "message": "Nenhuma instalação Java encontrada."
+  },
+  "app.java-detection.select": {
+    "message": "Selecionar"
+  },
+  "app.java-detection.selected": {
+    "message": "Selecionado"
+  },
+  "app.java-detection.title": {
+    "message": "Selecionar instalação Java"
+  },
+  "app.java-selector.already-installed": {
+    "message": "Já instalado"
+  },
+  "app.java-selector.browse": {
+    "message": "Navegar"
+  },
+  "app.java-selector.detect": {
+    "message": "Detectar"
+  },
+  "app.java-selector.install-recommended": {
+    "message": "Instalação recomendada"
+  },
+  "app.java-selector.installing": {
+    "message": "Instalando..."
+  },
+  "app.java-selector.path.placeholder": {
+    "message": "/caminho/ao/java"
+  },
+  "app.java-selector.test-installation": {
+    "message": "Instalação de teste Java"
+  },
   "app.modal.install-to-play.additional-context": {
     "message": "Contexto adicional"
   },
   "app.modal.install-to-play.additional-context-placeholder": {
     "message": "Incluir links e imagens se possível e relevante"
   },
+  "app.modal.install-to-play.block-user": {
+    "message": "Bloquear usuário"
+  },
   "app.modal.install-to-play.content-you-are-reporting": {
     "message": "Instância que está denunciando"
   },
@@ -593,6 +683,9 @@
   "app.modal.install-to-play.invite-warning": {
     "message": "Este convite foi criado por outro usuário do Modrinth, não pelo próprio Modrinth. Só aceite convites de pessoas que você confia."
   },
+  "app.modal.install-to-play.invite-warning-with-creator": {
+    "message": "Este convite foi criado por <creator>{username}</creator>, não pelo Modrinth. Aceite apenas convites de pessoas que você confia."
+  },
   "app.modal.install-to-play.mod-count": {
     "message": "{count, plural, =0 {Nenhum mod} one {# mod} other {# mods}}"
   },
@@ -650,6 +743,9 @@
   "app.modal.install-to-play.unrecognized-files": {
     "message": "Arquivos não reconhecidos"
   },
+  "app.modal.install-to-play.user-blocked": {
+    "message": "Usuário bloqueado"
+  },
   "app.modal.install-to-play.view-contents": {
     "message": "Ver conteúdo"
   },
@@ -677,6 +773,36 @@
   "app.modal.update-to-play.update-required-description": {
     "message": "Uma atualização é necessária para jogar {name}. Atualize para a versão mais recente para iniciar o jogo."
   },
+  "app.nav.create-new-instance": {
+    "message": "Criar instância nova"
+  },
+  "app.nav.home": {
+    "message": "Início"
+  },
+  "app.nav.library": {
+    "message": "Biblioteca"
+  },
+  "app.nav.modrinth-account": {
+    "message": "Conta Modrinth"
+  },
+  "app.nav.modrinth-hosting": {
+    "message": "Modrinth Hosting"
+  },
+  "app.nav.sign-in-to-modrinth-account": {
+    "message": "Iniciar sessão em uma conta Modrinth"
+  },
+  "app.nav.signed-in-as": {
+    "message": "Conectado como <user>{username}</user>"
+  },
+  "app.nav.upgrade-to-modrinth-plus": {
+    "message": "Assinar o Modrinth+"
+  },
+  "app.news.title": {
+    "message": "Notícias"
+  },
+  "app.news.view-all": {
+    "message": "Ver todas as notícias"
+  },
   "app.project.install-button.already-installed": {
     "message": "Este projeto já foi instalado"
   },
@@ -686,6 +812,9 @@
   "app.project.install-context.back-to-browse": {
     "message": "Voltar a descobrir"
   },
+  "app.project.install-context.back-to-instance": {
+    "message": "Voltar à instância"
+  },
   "app.project.version.all-versions": {
     "message": "Todas as versões"
   },
@@ -698,23 +827,191 @@
   "app.project.versions.already-installed": {
     "message": "Já instalado"
   },
+  "app.quick-instance-switcher.drag-show-tooltip": {
+    "message": "Arraste para exibir instâncias recentes"
+  },
+  "app.quick-instance-switcher.drag-tooltip": {
+    "message": "Arraste para redimensionar"
+  },
+  "app.restarting": {
+    "message": "Reiniciando..."
+  },
+  "app.settings.app-version": {
+    "message": "Modrinth App {version}"
+  },
+  "app.settings.default-instance-options.environment-variables.description": {
+    "message": "As variáveis do ambiente definidas ao iniciar uma instância."
+  },
+  "app.settings.default-instance-options.environment-variables.placeholder": {
+    "message": "Insira as variáveis do ambiente..."
+  },
+  "app.settings.default-instance-options.environment-variables.title": {
+    "message": "Variáveis de ambiente"
+  },
+  "app.settings.default-instance-options.fullscreen.description": {
+    "message": "Inicia as instâncias em tela cheia ao atualizar o arquivo options.txt."
+  },
+  "app.settings.default-instance-options.fullscreen.title": {
+    "message": "Tela cheia"
+  },
+  "app.settings.default-instance-options.height.description": {
+    "message": "A altura da janela ao iniciar o jogo."
+  },
+  "app.settings.default-instance-options.height.placeholder": {
+    "message": "Insira a altura..."
+  },
+  "app.settings.default-instance-options.height.title": {
+    "message": "Altura"
+  },
+  "app.settings.default-instance-options.java-arguments.description": {
+    "message": "Os argumentos passados para o Java ao iniciar uma instância."
+  },
+  "app.settings.default-instance-options.java-arguments.placeholder": {
+    "message": "Insira os argumentos Java..."
+  },
+  "app.settings.default-instance-options.java-arguments.title": {
+    "message": "Argumentos Java"
+  },
+  "app.settings.default-instance-options.memory-allocation.description": {
+    "message": "O máximo de memória disponível para cada instância."
+  },
+  "app.settings.default-instance-options.memory-allocation.title": {
+    "message": "Alocação de memória"
+  },
+  "app.settings.default-instance-options.post-exit-hook.description": {
+    "message": "Executa após o jogo fechar."
+  },
+  "app.settings.default-instance-options.post-exit-hook.placeholder": {
+    "message": "Insira o comando ao sair..."
+  },
+  "app.settings.default-instance-options.post-exit-hook.title": {
+    "message": "Hook ao sair"
+  },
+  "app.settings.default-instance-options.pre-launch-hook.description": {
+    "message": "Executa antes da instância iniciar."
+  },
+  "app.settings.default-instance-options.pre-launch-hook.placeholder": {
+    "message": "Insira o comando ao iniciar..."
+  },
+  "app.settings.default-instance-options.pre-launch-hook.title": {
+    "message": "Hook ao iniciar"
+  },
+  "app.settings.default-instance-options.width.description": {
+    "message": "A largura da janela ao iniciar o jogo."
+  },
+  "app.settings.default-instance-options.width.placeholder": {
+    "message": "Insira a largura..."
+  },
+  "app.settings.default-instance-options.width.title": {
+    "message": "Largura"
+  },
+  "app.settings.default-instance-options.wrapper-hook.description": {
+    "message": "O comando usado para auxiliar o processo de inicialização do Minecraft."
+  },
+  "app.settings.default-instance-options.wrapper-hook.placeholder": {
+    "message": "Insira um comando auxiliar..."
+  },
+  "app.settings.default-instance-options.wrapper-hook.title": {
+    "message": "Hook auxiliar"
+  },
+  "app.settings.developer-mode-button.label": {
+    "message": "Alternar modo desenvolvedor"
+  },
   "app.settings.developer-mode-enabled": {
     "message": "Modo desenvolvedor ativado."
   },
   "app.settings.downloading": {
     "message": "Baixando v{version}"
   },
+  "app.settings.java-installations.location.title": {
+    "message": "Localização Java {version, number}"
+  },
+  "app.settings.operating-system.macos": {
+    "message": "macOS"
+  },
   "app.settings.privacy.ads-consent.intro": {
     "message": "Anúncios tornam o Modrinth possível e financiam os pagamentos dos criadores. Nossos parceiros talvez armazenem ou acessem os cookies no aplicativo para personalizar anúncios e medir o desempenho. Você pode recusar ou gerenciar suas preferências abaixo."
   },
+  "app.settings.privacy.discord-rich-presence.description": {
+    "message": "Exibe o Modrinth App como sua atividade atual no Discord. Isso não afeta a Presença Rica adicionada às instâncias por mods. Exige a reinicialização do aplicativo."
+  },
+  "app.settings.privacy.discord-rich-presence.title": {
+    "message": "Presença Rica do Discord"
+  },
+  "app.settings.privacy.telemetry.description": {
+    "message": "O Modrinth coleta analíticas anonimizadas e uso de dados para aprimorar nossa experiência de usuário e personalizar sua experiência. Ao desativar esta opção, você negará e seus dados não serão mais coletados."
+  },
+  "app.settings.privacy.telemetry.title": {
+    "message": "Telemetria"
+  },
+  "app.settings.resource-management.always-show-copy-details.description": {
+    "message": "Exibe a ação de copiar detalhes caso uma instalação esteja na fila ou em execução. Essa opção está sempre disponível para instalações interrompidas ou falhas."
+  },
+  "app.settings.resource-management.always-show-copy-details.title": {
+    "message": "Sempre exibir copiar detalhes"
+  },
+  "app.settings.resource-management.app-cache.confirm.description": {
+    "message": "O aplicativo talvez carregue mais lentamente até o cache ser refeito."
+  },
+  "app.settings.resource-management.app-cache.confirm.title": {
+    "message": "Purgar cache do aplicativo?"
+  },
+  "app.settings.resource-management.app-cache.description": {
+    "message": "Limpe o dado cache e baixe-o novamente do Modrinth. O aplicativo talvez carregue mais lentamente até o cache ser refeito."
+  },
+  "app.settings.resource-management.app-cache.purge": {
+    "message": "Purgar cache"
+  },
+  "app.settings.resource-management.app-cache.title": {
+    "message": "Cache do aplicativo"
+  },
+  "app.settings.resource-management.app-database-backups.description": {
+    "message": "Os backups dos dados de aplicativos importantes são armazenados aqui caso você precise recuperá-los depois."
+  },
+  "app.settings.resource-management.app-database-backups.open-folder": {
+    "message": "Abrir pasta de backups"
+  },
+  "app.settings.resource-management.app-database-backups.title": {
+    "message": "Backups do banco de dados do aplicativo"
+  },
+  "app.settings.resource-management.app-directory.browse": {
+    "message": "Buscar por um diretório de aplicativo"
+  },
+  "app.settings.resource-management.app-directory.description": {
+    "message": "Onde o Modrinth App armazena as instâncias e outros arquivos. As mudanças serão aplicadas após reiniciar o aplicativo."
+  },
+  "app.settings.resource-management.app-directory.select": {
+    "message": "Selecione um novo diretório de aplicativo"
+  },
+  "app.settings.resource-management.app-directory.title": {
+    "message": "Diretório de aplicativo"
+  },
+  "app.settings.resource-management.maximum-concurrent-downloads.description": {
+    "message": "O número de arquivos que o aplicativo pode baixar de uma só vez. Reduza se os downloads causam instabilidade em sua conexão. Exige a reinicialização do aplicativo."
+  },
+  "app.settings.resource-management.maximum-concurrent-downloads.title": {
+    "message": "Máximo de downloads simultâneos"
+  },
+  "app.settings.resource-management.maximum-concurrent-writes.description": {
+    "message": "O número de arquivos que o aplicativo pode escrever no disco de uma só vez. Reduza caso você se depara com erros I/O frequentemente. Exige a reinicialização do aplicativo."
+  },
+  "app.settings.resource-management.maximum-concurrent-writes.title": {
+    "message": "Máximo de escritas simultâneas"
+  },
+  "app.settings.sidebar.label.instances": {
+    "message": "Instâncias"
+  },
   "app.settings.tabs.appearance": {
     "message": "Aparência"
   },
+  "app.settings.tabs.behavior": {
+    "message": "Comportamento"
+  },
   "app.settings.tabs.default-instance-options": {
-    "message": "Opções da instância"
+    "message": "Configurações padrão do jogo"
   },
   "app.settings.tabs.java-installations": {
-    "message": "Instalações do Java"
+    "message": "Instalações Java"
   },
   "app.settings.tabs.language": {
     "message": "Idioma"
@@ -725,6 +1022,9 @@
   "app.settings.tabs.resource-management": {
     "message": "Gerenciamento de recursos"
   },
+  "app.sidebar.playing-as": {
+    "message": "Jogando como"
+  },
   "app.skins.add-button": {
     "message": "Adicionar skin"
   },
@@ -884,6 +1184,21 @@
   "app.skins.toggle-ears-features-on": {
     "message": "Ativar"
   },
+  "app.survey.body": {
+    "message": "Você se importaria de responder algumas perguntas sobre sua experiência com o Modrinth App?"
+  },
+  "app.survey.footer": {
+    "message": "Este comentário vai diretamente para a equipe Modrinth e ajudará a guiar futuras atualizações!"
+  },
+  "app.survey.no-thanks": {
+    "message": "Não, obrigado"
+  },
+  "app.survey.take-survey": {
+    "message": "Responder"
+  },
+  "app.survey.title": {
+    "message": "Ei, usuário do Modrinth!"
+  },
   "app.update-popup.body.download-complete": {
     "message": "O Modrinth App v{version} já foi instalado. Recarregue para atualizar agora ou ela será feita automaticamente ao fechar o Modrinth App."
   },
@@ -927,10 +1242,10 @@
     "message": "Ainda não jogado"
   },
   "app.world.world-item.offline": {
-    "message": "Inativo"
+    "message": "Offline"
   },
   "app.world.world-item.players-online": {
-    "message": "{count} ativo(s)"
+    "message": "{count} online"
   },
   "content.shared-instance.change-version-body": {
     "message": "Alterar a versão modifica apenas a sua cópia local. Atualizações futuras da instância compartilhada podem restaurá-la ou alterá-la novamente."
@@ -1160,6 +1475,45 @@
   "instance.server-modal.resource-pack": {
     "message": "Pacote de recursos"
   },
+  "instance.settings.sharing.active-invites.actions": {
+    "message": "Ações"
+  },
+  "instance.settings.sharing.active-invites.code": {
+    "message": "Link de convite"
+  },
+  "instance.settings.sharing.active-invites.description": {
+    "message": "Qualquer um com algum desses links de convite pode entrar enquanto permanecem ativos."
+  },
+  "instance.settings.sharing.active-invites.empty": {
+    "message": "Não há nenhum convite ativo."
+  },
+  "instance.settings.sharing.active-invites.expires": {
+    "message": "Expira"
+  },
+  "instance.settings.sharing.active-invites.revoke": {
+    "message": "Revogar convite"
+  },
+  "instance.settings.sharing.active-invites.revoke-with-code": {
+    "message": "Revogar convite {code}"
+  },
+  "instance.settings.sharing.active-invites.title": {
+    "message": "Convites ativos"
+  },
+  "instance.settings.sharing.active-invites.uses": {
+    "message": "Usos"
+  },
+  "instance.settings.sharing.revoke-invite.admonition-body": {
+    "message": "Este link de convite <monospace>{code}</monospace> deixará de funcionar imediatamente. As pessoas que já entraram ainda permanecerão com acesso."
+  },
+  "instance.settings.sharing.revoke-invite.admonition-header": {
+    "message": "Esta ação não pode ser desfeita"
+  },
+  "instance.settings.sharing.revoke-invite.confirm": {
+    "message": "Revogar convite"
+  },
+  "instance.settings.sharing.revoke-invite.header": {
+    "message": "Revogar convite"
+  },
   "instance.settings.tabs.general": {
     "message": "Geral"
   },
@@ -1361,6 +1715,12 @@
   "instance.shared-instance.error.title": {
     "message": "Algo deu errado"
   },
+  "instance.shared-instance.network-error.text": {
+    "message": "Não foi possível conectar a API da instância compartilhada"
+  },
+  "instance.shared-instance.network-error.title": {
+    "message": "Erro de conexão"
+  },
   "instance.shared-instance.owner-tooltip": {
     "message": "O conteúdo desta instância está sendo compartilhado com outros usuários."
   },
@@ -1428,7 +1788,7 @@
     "message": "A instância já está aberta"
   },
   "instance.worlds.hardcore": {
-    "message": "Modo Intenso"
+    "message": "Modo intenso"
   },
   "instance.worlds.incompatible_server": {
     "message": "Servidor incompatível"
@@ -1552,5 +1912,11 @@
   },
   "search.filter.locked.server-loader.title": {
     "message": "O loader é fornecido pelo servidor"
+  },
+  "settings.sidebar.label.account": {
+    "message": "Conta"
+  },
+  "settings.sidebar.label.display": {
+    "message": "Visualização"
   }
 }
diff --git a/apps/app-frontend/src/locales/pt-PT/index.json b/apps/app-frontend/src/locales/pt-PT/index.json
index 5f56e5810d..de73fdbd17 100644
--- a/apps/app-frontend/src/locales/pt-PT/index.json
+++ b/apps/app-frontend/src/locales/pt-PT/index.json
@@ -140,21 +140,12 @@
   "app.ads-consent.title": {
     "message": "A sua privacidade e como os anúncios são financiados pela Modrinth"
   },
-  "app.appearance-settings.advanced-rendering.description": {
-    "message": "Ativa a renderização avançada, como efeitos de desfoque, que podem causar problemas de desempenho sem o uso de renderização acelerada por hardware."
-  },
   "app.appearance-settings.advanced-rendering.title": {
     "message": "Renderização avançada"
   },
-  "app.appearance-settings.color-theme.description": {
-    "message": "Seleciona a tua cor preferida para a Modrinth App."
-  },
   "app.appearance-settings.color-theme.title": {
     "message": "Cor de tema"
   },
-  "app.appearance-settings.default-landing-page.description": {
-    "message": "Mudar a página em que o launcher abre."
-  },
   "app.appearance-settings.default-landing-page.home": {
     "message": "Casa"
   },
@@ -164,51 +155,18 @@
   "app.appearance-settings.default-landing-page.title": {
     "message": "Página de carregamento principal"
   },
-  "app.appearance-settings.hide-nametag.description": {
-    "message": "Desativa o nametag acima do seu player na página de skins."
-  },
   "app.appearance-settings.hide-nametag.title": {
     "message": "Ocultar nametag"
   },
-  "app.appearance-settings.jump-back-into-worlds.description": {
-    "message": "Inclui mundos recentes na secção \"Voltar à ação\" na página inicial."
-  },
   "app.appearance-settings.jump-back-into-worlds.title": {
     "message": "Volte aos mundos"
   },
-  "app.appearance-settings.minimize-launcher.description": {
-    "message": "Minimiza o inicializador quando um processo Minecraft é iniciado."
-  },
-  "app.appearance-settings.minimize-launcher.title": {
-    "message": "Minimizar launcher"
-  },
-  "app.appearance-settings.native-decorations.description": {
-    "message": "Utilizar a moldura da janela do sistema (é necessário reiniciar a aplicação)."
-  },
-  "app.appearance-settings.native-decorations.title": {
-    "message": "Decorações nativas"
-  },
-  "app.appearance-settings.show-play-time.description": {
-    "message": "Apresenta quanto tempo passou a jogar uma instância."
-  },
   "app.appearance-settings.show-play-time.title": {
     "message": "Mostrar tempo de jogo"
   },
-  "app.appearance-settings.skip-non-essential-warnings.description": {
-    "message": "Ignora automaticamente confirmações de baixo risco, como instalações duplicadas de pacotes de mods, eliminação normal de conteúdo, atualizações em massa, desvinculação de pacotes de mods e pedidos de reparação. Os avisos de perigo ainda serão exibidos."
-  },
   "app.appearance-settings.skip-non-essential-warnings.title": {
     "message": "Ignorar avisos não essenciais"
   },
-  "app.appearance-settings.toggle-sidebar.description": {
-    "message": "Permite ativar/desativar a barra lateral."
-  },
-  "app.appearance-settings.toggle-sidebar.title": {
-    "message": "Ativar/desativar Barra lateral"
-  },
-  "app.appearance-settings.unknown-pack-warning.description": {
-    "message": "Se tentar instalar um ficheiro Modrinth Pack (.mrpack) que não esteja alojado no Modrinth, iremos garantir que compreende os riscos antes de o instalar."
-  },
   "app.appearance-settings.unknown-pack-warning.title": {
     "message": "Avise-me antes de instalar pacotes de mods desconhecidos."
   },
@@ -503,9 +461,6 @@
   "app.settings.tabs.appearance": {
     "message": "Aparência"
   },
-  "app.settings.tabs.default-instance-options": {
-    "message": "Opções padrão de instância"
-  },
   "app.settings.tabs.java-installations": {
     "message": "Instalações Java"
   },
diff --git a/apps/app-frontend/src/locales/ro-RO/index.json b/apps/app-frontend/src/locales/ro-RO/index.json
index 4942efc416..a0c99fc34b 100644
--- a/apps/app-frontend/src/locales/ro-RO/index.json
+++ b/apps/app-frontend/src/locales/ro-RO/index.json
@@ -32,9 +32,6 @@
   "app.settings.tabs.appearance": {
     "message": "Aspect"
   },
-  "app.settings.tabs.default-instance-options": {
-    "message": "Opțiuni implicite instanță"
-  },
   "app.settings.tabs.java-installations": {
     "message": "Instalări Java"
   },
diff --git a/apps/app-frontend/src/locales/ru-RU/index.json b/apps/app-frontend/src/locales/ru-RU/index.json
index 88d1f8fac0..9588318155 100644
--- a/apps/app-frontend/src/locales/ru-RU/index.json
+++ b/apps/app-frontend/src/locales/ru-RU/index.json
@@ -15,7 +15,7 @@
     "message": "Скопировано"
   },
   "app.action-bar.install.copy-details": {
-    "message": "Копировать"
+    "message": "Получить отчёт"
   },
   "app.action-bar.install.dismiss": {
     "message": "Закрыть"
@@ -132,19 +132,19 @@
     "message": "Принять всё"
   },
   "app.ads-consent.body": {
-    "message": "Реклама обеспечивает работу Modrinth и финансирует выплаты авторам. Наши партнёры могут хранить или получать доступ к файлам cookie в приложении для персонализации рекламы и измерения производительности."
+    "message": "Реклама обеспечивает работу Modrinth и выплаты авторам. Для персонализации и анализа рекламы наши партнёры могут использовать куки."
   },
   "app.ads-consent.manage": {
-    "message": "Настроить предпочтения"
+    "message": "Настроить"
   },
   "app.ads-consent.reject": {
     "message": "Отклонить всё"
   },
   "app.ads-consent.title": {
-    "message": "Конфиденциальность и как реклама помогает Modrinth"
+    "message": "Конфиденциальность и реклама на Modrinth"
   },
   "app.appearance-settings.advanced-rendering.description": {
-    "message": "Включает продвинутые эффекты вроде размытия, но может снизить производительность на устройствах без аппаратного ускорения."
+    "message": "Использовать эффекты вроде размытия фона. Без аппаратного ускорения возможна потеря производительности."
   },
   "app.appearance-settings.advanced-rendering.title": {
     "message": "Расширенные эффекты"
@@ -156,7 +156,7 @@
     "message": "Тема"
   },
   "app.appearance-settings.default-landing-page.description": {
-    "message": "Страница, которая открывается при запуске лаунчера."
+    "message": "Выберите страницу для показа при запуске Modrinth App."
   },
   "app.appearance-settings.default-landing-page.home": {
     "message": "Главная"
@@ -168,49 +168,49 @@
     "message": "Стартовая страница"
   },
   "app.appearance-settings.hide-nametag.description": {
-    "message": "Скрывать имя над игроком на странице скинов."
+    "message": "Скрывать имя над игроком на странице выбора скина."
   },
   "app.appearance-settings.hide-nametag.title": {
     "message": "Без имени над скином"
   },
   "app.appearance-settings.jump-back-into-worlds.description": {
-    "message": "Показывать недавние миры в разделе «Jump back in» на главной."
+    "message": "Показывать миры в разделе «Jump back in» на главной."
   },
   "app.appearance-settings.jump-back-into-worlds.title": {
     "message": "Миры на главной"
   },
   "app.appearance-settings.minimize-launcher.description": {
-    "message": "Сворачивать окно лаунчера при запуске Minecraft."
+    "message": "Сворачивать окно Modrinth App при запуске Minecraft."
   },
   "app.appearance-settings.minimize-launcher.title": {
-    "message": "Сворачивание лаунчера"
+    "message": "Сворачивание приложения"
   },
   "app.appearance-settings.native-decorations.description": {
-    "message": "Использовать системную рамку окна (требуется перезапуск)."
+    "message": "Использовать системное оформление заголовка и кнопок окна. Требуется перезапуск."
   },
   "app.appearance-settings.native-decorations.title": {
-    "message": "Системное оформление"
+    "message": "Системная рамка окна"
   },
   "app.appearance-settings.show-play-time.description": {
-    "message": "Показывать время, проведённое в сборке."
+    "message": "Показывать проведённое время в сборке."
   },
   "app.appearance-settings.show-play-time.title": {
     "message": "Время игры"
   },
   "app.appearance-settings.skip-non-essential-warnings.description": {
-    "message": "Скрывать малозначимые подтверждения: установку копий сборок, обычное удаление контента, массовые обновления, отвязку и исправление сборок. Критические предупреждения останутся."
+    "message": "Скрывать малозначимые подтверждения: установку копий, обычное удаление контента, массовые обновления, отвязку и исправление. Критические предупреждения останутся."
   },
   "app.appearance-settings.skip-non-essential-warnings.title": {
     "message": "Только опасные предупреждения"
   },
   "app.appearance-settings.toggle-sidebar.description": {
-    "message": "Показывать кнопку скрытия боковой панели."
+    "message": "Скрывать панель справа при запуске и переключать кнопкой."
   },
   "app.appearance-settings.toggle-sidebar.title": {
-    "message": "Переключатель боковой панели"
+    "message": "Скрытие панели справа"
   },
   "app.appearance-settings.unknown-pack-warning.description": {
-    "message": "Предупреждать о рисках перед установкой файлов .mrpack, не размещённых на Modrinth."
+    "message": "Предупреждать о рисках перед установкой файлов .mrpack, не размещённых на Modrinth."
   },
   "app.appearance-settings.unknown-pack-warning.title": {
     "message": "Предупреждение о сторонних сборках"
@@ -221,6 +221,15 @@
   "app.auth-servers.unreachable.header": {
     "message": "Нет связи с серверами аутентификации"
   },
+  "app.behavior-settings.confirmations.title": {
+    "message": "Подтверждения"
+  },
+  "app.behavior-settings.content.title": {
+    "message": "Главная и контент"
+  },
+  "app.behavior-settings.startup-and-navigation.title": {
+    "message": "Запуск и навигация"
+  },
   "app.browse.add-servers-to-instance": {
     "message": "Добавление серверов в сборку"
   },
@@ -242,12 +251,18 @@
   "app.browse.back-to-instance": {
     "message": "Вернуться к сборке"
   },
+  "app.browse.discover-project-type": {
+    "message": "Поиск проектов"
+  },
   "app.browse.discover-servers": {
     "message": "Поиск серверов"
   },
   "app.browse.hide-added-servers": {
     "message": "Скрывать добавленные"
   },
+  "app.browse.hide-installed-modpacks": {
+    "message": "Скрывать установленные"
+  },
   "app.browse.project-type.modpacks": {
     "message": "Сборки"
   },
@@ -356,12 +371,24 @@
   "app.instance.admonitions.shared-instance.review-admonition-header": {
     "message": "Отправка изменений"
   },
+  "app.instance.admonitions.shared-instance.review-description": {
+    "message": "Ознакомьтесь с изменениями содержимого, которые будут доступны всем пользователям этого экземпляра."
+  },
   "app.instance.admonitions.shared-instance.review-header": {
     "message": "Проверьте изменения"
   },
+  "app.instance.admonitions.shared-instance.review-update-button": {
+    "message": "Обзор обновления"
+  },
   "app.instance.admonitions.shared-instance.reviewing-button": {
     "message": "Проверка..."
   },
+  "app.instance.admonitions.shared-instance.update-available-body": {
+    "message": "Необходимо обновление для игры в {name}. Обновитесь до последней версии и запустите игру."
+  },
+  "app.instance.admonitions.shared-instance.update-available-header": {
+    "message": "Доступно обновление"
+  },
   "app.instance.confirm-delete.admonition-body": {
     "message": "Все данные сборки будут удалены навсегда, в том числе миры, настройки и весь установленный контент."
   },
@@ -399,7 +426,7 @@
     "message": "проект"
   },
   "app.instance.mods.locked-content": {
-    "message": "Содержимое заблокированных экземпляров нельзя изменить."
+    "message": "Содержимое заблокированных сборок нельзя изменить."
   },
   "app.instance.mods.project-was-added": {
     "message": "«{name}» добавлен"
@@ -443,6 +470,24 @@
   "app.instance.share.locked.wrong-account-heading": {
     "message": "Неверный аккаунт"
   },
+  "app.instance.share.members.empty": {
+    "message": "Ни один пользователь ещё не присоединился"
+  },
+  "app.instance.share.members.no-filter-results": {
+    "message": "По заданным фильтрам пользователи не найдены."
+  },
+  "app.instance.share.remove-user-modal.effect-access": {
+    "message": "Они больше не будут получать обновления для этого общего экземпляра"
+  },
+  "app.instance.share.remove-user-modal.effect-installed-copy": {
+    "message": "Любая уже установленная копия останется на их устройстве"
+  },
+  "app.instance.share.remove-user-modal.effect-invite-again": {
+    "message": "Вы можете пригласить их снова позже"
+  },
+  "app.instance.share.remove-user-modal.effect-last-user": {
+    "message": "Это последний пользователь, в этом случае функция общего доступа будет отключена"
+  },
   "app.instance.share.remove-user-modal.effects-label": {
     "message": "Что произойдёт?"
   },
@@ -455,9 +500,27 @@
   "app.instance.share.remove-user-modal.user-avatar-alt": {
     "message": "Аватар {username}"
   },
+  "app.instance.share.remove-user-modal.warning-body": {
+    "message": "Если вы отзовете доступ пользователя {username} к этому общему экземпляру, вам потребуется снова пригласить его, прежде чем он сможет получать обновления."
+  },
   "app.instance.share.sign-in.button": {
     "message": "Войти"
   },
+  "app.instance.share.unable-to-connect.description": {
+    "message": "Сервис сборок недоступен, попробуйте позже"
+  },
+  "app.instance.share.unable-to-connect.heading": {
+    "message": "Не удалось подключиться"
+  },
+  "app.instance.share.unlink.body": {
+    "message": "Для предоставления доступа к вашему экземпляру игры необходимо отменить привязку этого модпака"
+  },
+  "app.instance.share.unlink.header": {
+    "message": "Для обмена необходимо отменить связь"
+  },
+  "app.instance.shared-instance-already-installed.body": {
+    "message": "Этот общий экземпляр уже установлен как <bold>{instanceName}</bold>. Вы уверены, что хотите установить еще одну копию?"
+  },
   "app.instance.shared-instance-already-installed.header": {
     "message": "Сборка уже установлена"
   },
@@ -467,6 +530,12 @@
   "app.instance.shared-instance-already-installed.instance": {
     "message": "Сборка"
   },
+  "app.instance.shared-instance-wrong-account.fallback-username": {
+    "message": "привязанный аккаунт"
+  },
+  "app.instance.shared-instance-wrong-account.owner-admonition-body-v2": {
+    "message": "для управления этим общим экземпляром. Вы не сможете отправлять обновления пользователям."
+  },
   "app.instance.shared-instance-wrong-account.sign-in-as-label": {
     "message": "Войти как"
   },
@@ -476,6 +545,9 @@
   "app.instance.shared-instance-wrong-account.user-admonition-body-v2": {
     "message": "для получения обновлений сборки."
   },
+  "app.instance.shared-instance-wrong-account.warning-header": {
+    "message": "Вы используете неправильную учетную запись Modrinth"
+  },
   "app.instance.worlds.add-server": {
     "message": "Добавить сервер"
   },
@@ -512,6 +584,9 @@
   "app.instance.worlds.no-worlds-heading": {
     "message": "Нет серверов и миров"
   },
+  "app.instance.worlds.refreshing": {
+    "message": "Перезагрузка..."
+  },
   "app.instance.worlds.remove-server-modal.remove-button": {
     "message": "Удалить сервер"
   },
@@ -524,12 +599,63 @@
   "app.instance.worlds.remove-server-modal.warning-header": {
     "message": "Удаление {name}"
   },
+  "app.java-detection.cancel": {
+    "message": "Отмена"
+  },
+  "app.java-detection.columns.actions": {
+    "message": "Действия"
+  },
+  "app.java-detection.columns.path": {
+    "message": "Путь"
+  },
+  "app.java-detection.columns.version": {
+    "message": "Версия"
+  },
+  "app.java-detection.no-installations-found": {
+    "message": "Установки Java не найдены."
+  },
+  "app.java-detection.select": {
+    "message": "Выбрать"
+  },
+  "app.java-detection.selected": {
+    "message": "Выбрано"
+  },
+  "app.java-detection.title": {
+    "message": "Выбор расположения Java"
+  },
+  "app.java-selector.already-installed": {
+    "message": "Уже установлена"
+  },
+  "app.java-selector.browse": {
+    "message": "Обзор"
+  },
+  "app.java-selector.detect": {
+    "message": "Обнаружить"
+  },
+  "app.java-selector.install-recommended": {
+    "message": "Установить рекомендуемую"
+  },
+  "app.java-selector.installing": {
+    "message": "Установка..."
+  },
+  "app.java-selector.path.placeholder": {
+    "message": "/путь/к/java"
+  },
+  "app.java-selector.test-installation": {
+    "message": "Проверить установку Java"
+  },
   "app.modal.install-to-play.additional-context": {
     "message": "Дополнительный контекст"
   },
   "app.modal.install-to-play.additional-context-placeholder": {
     "message": "При желании прикрепите ссылки и изображения"
   },
+  "app.modal.install-to-play.block-user": {
+    "message": "Заблокировать"
+  },
+  "app.modal.install-to-play.content-you-are-reporting": {
+    "message": "Экземпляр, о котором вы сообщаете"
+  },
   "app.modal.install-to-play.delete-instance": {
     "message": "Удалить сборку"
   },
@@ -548,15 +674,24 @@
   "app.modal.install-to-play.invite-warning": {
     "message": "Это приглашение создано другим пользователем Modrinth. Принимайте приглашения только от тех, кому доверяете."
   },
+  "app.modal.install-to-play.invite-warning-with-creator": {
+    "message": "Это приглашение создано <creator>{username}</creator>. Принимайте приглашения только от тех, кому доверяете."
+  },
   "app.modal.install-to-play.mod-count": {
     "message": "{count, plural, one {# мод} few {# мода} other {# модов}}"
   },
   "app.modal.install-to-play.report-description": {
     "message": "Используйте эту форму, чтобы отправить жалобу на сборки, которые могут нарушать наши <rules-link>Правила</rules-link> или <terms-link>Условия использования</terms-link>."
   },
+  "app.modal.install-to-play.report-image-invalid-type": {
+    "message": "Тип изображения не принимается"
+  },
   "app.modal.install-to-play.report-image-too-large": {
     "message": "Размер файла превышает лимит в 1 МиБ"
   },
+  "app.modal.install-to-play.report-legal-claims": {
+    "message": "По вопросам, касающимся уведомлений DMCA или других юридических претензий, ознакомьтесь с нашей <copyright-link>Политикой в ​​отношении авторских прав</copyright-link>."
+  },
   "app.modal.install-to-play.report-reason": {
     "message": "Какое правило нарушает данная сборка?"
   },
@@ -569,9 +704,15 @@
   "app.modal.install-to-play.report-reason.spam": {
     "message": "Спам"
   },
+  "app.modal.install-to-play.report-shared-instance-header": {
+    "message": "Сообщить об общем экземпляре"
+  },
   "app.modal.install-to-play.report-submitted": {
     "message": "Жалоба отправлена"
   },
+  "app.modal.install-to-play.report-support-and-bugs": {
+    "message": "Для запросов в поддержку обращайтесь в нашу <support-link>службу поддержки</support-link>. Для сообщений об ошибках открывайте запросы в <github-link>GitHub </github-link>."
+  },
   "app.modal.install-to-play.reviewed-files": {
     "message": "Файл проверяется только если он опубликован на Modrinth, независимо от его формата (включая .mrpack)."
   },
@@ -593,6 +734,9 @@
   "app.modal.install-to-play.unrecognized-files": {
     "message": "Нераспознанные файлы"
   },
+  "app.modal.install-to-play.user-blocked": {
+    "message": "Пользователь заблокирован"
+  },
   "app.modal.install-to-play.view-contents": {
     "message": "Посмотреть содержимое"
   },
@@ -611,12 +755,45 @@
   "app.modal.update-to-play.shared-instance-removed-label": {
     "message": "Удалён"
   },
+  "app.modal.update-to-play.shared-instance-unknown-files-description": {
+    "message": "Это обновление для общего экземпляра содержит файлы, которые не опубликованные на Modrinth. Мы настоятельно рекомендуем устанавливать файлы только из источников, которым вы доверяете."
+  },
   "app.modal.update-to-play.update-required": {
     "message": "Требуется обновление"
   },
   "app.modal.update-to-play.update-required-description": {
     "message": "Обновите {name} до последней версии, чтобы запустить игру."
   },
+  "app.nav.create-new-instance": {
+    "message": "Создать новую сборку"
+  },
+  "app.nav.home": {
+    "message": "Главная"
+  },
+  "app.nav.library": {
+    "message": "Библиотека"
+  },
+  "app.nav.modrinth-account": {
+    "message": "Аккаунт Modrinth"
+  },
+  "app.nav.modrinth-hosting": {
+    "message": "Modrinth Hosting"
+  },
+  "app.nav.sign-in-to-modrinth-account": {
+    "message": "Войти в аккаунт Modrinth"
+  },
+  "app.nav.signed-in-as": {
+    "message": "Текущий аккаунт: <user>{username}</user>"
+  },
+  "app.nav.upgrade-to-modrinth-plus": {
+    "message": "Перейти на Modrinth+"
+  },
+  "app.news.title": {
+    "message": "Новости"
+  },
+  "app.news.view-all": {
+    "message": "Посмотреть все новости"
+  },
   "app.project.install-button.already-installed": {
     "message": "Этот проект уже установлен"
   },
@@ -626,6 +803,9 @@
   "app.project.install-context.back-to-browse": {
     "message": "Вернуться к поиску"
   },
+  "app.project.install-context.back-to-instance": {
+    "message": "Вернуться к сборке"
+  },
   "app.project.version.all-versions": {
     "message": "Все версии"
   },
@@ -638,23 +818,191 @@
   "app.project.versions.already-installed": {
     "message": "Уже установлено"
   },
+  "app.quick-instance-switcher.drag-show-tooltip": {
+    "message": "Потяните для показа недавних сборок"
+  },
+  "app.quick-instance-switcher.drag-tooltip": {
+    "message": "Потяните для изменения размера"
+  },
+  "app.restarting": {
+    "message": "Перезапуск..."
+  },
+  "app.settings.app-version": {
+    "message": "Modrinth App {version}"
+  },
+  "app.settings.default-instance-options.environment-variables.description": {
+    "message": "Переменные среды при запуске игры."
+  },
+  "app.settings.default-instance-options.environment-variables.placeholder": {
+    "message": "Введите переменные среды..."
+  },
+  "app.settings.default-instance-options.environment-variables.title": {
+    "message": "Переменные среды"
+  },
+  "app.settings.default-instance-options.fullscreen.description": {
+    "message": "Запускать игру в полноэкранном режиме через options.txt."
+  },
+  "app.settings.default-instance-options.fullscreen.title": {
+    "message": "Полноэкранный режим"
+  },
+  "app.settings.default-instance-options.height.description": {
+    "message": "Высота окна игры при запуске."
+  },
+  "app.settings.default-instance-options.height.placeholder": {
+    "message": "Введите высоту..."
+  },
+  "app.settings.default-instance-options.height.title": {
+    "message": "Высота"
+  },
+  "app.settings.default-instance-options.java-arguments.description": {
+    "message": "Аргументы, передаваемые Java при запуске игры."
+  },
+  "app.settings.default-instance-options.java-arguments.placeholder": {
+    "message": "Введите аргументы Java..."
+  },
+  "app.settings.default-instance-options.java-arguments.title": {
+    "message": "Аргументы Java"
+  },
+  "app.settings.default-instance-options.memory-allocation.description": {
+    "message": "Максимальный объём памяти, выделяемый игре."
+  },
+  "app.settings.default-instance-options.memory-allocation.title": {
+    "message": "Выделенная память"
+  },
+  "app.settings.default-instance-options.post-exit-hook.description": {
+    "message": "Выполняется после выхода из игры."
+  },
+  "app.settings.default-instance-options.post-exit-hook.placeholder": {
+    "message": "Введите команду после выхода..."
+  },
+  "app.settings.default-instance-options.post-exit-hook.title": {
+    "message": "Команда после выхода"
+  },
+  "app.settings.default-instance-options.pre-launch-hook.description": {
+    "message": "Выполняется перед запуском игры."
+  },
+  "app.settings.default-instance-options.pre-launch-hook.placeholder": {
+    "message": "Введите команду перед запуском..."
+  },
+  "app.settings.default-instance-options.pre-launch-hook.title": {
+    "message": "Команда перед запуском"
+  },
+  "app.settings.default-instance-options.width.description": {
+    "message": "Ширина окна игры при запуске."
+  },
+  "app.settings.default-instance-options.width.placeholder": {
+    "message": "Введите ширину..."
+  },
+  "app.settings.default-instance-options.width.title": {
+    "message": "Ширина"
+  },
+  "app.settings.default-instance-options.wrapper-hook.description": {
+    "message": "Команда, оборачивающая процесс запуска Minecraft."
+  },
+  "app.settings.default-instance-options.wrapper-hook.placeholder": {
+    "message": "Введите команду-обёртку..."
+  },
+  "app.settings.default-instance-options.wrapper-hook.title": {
+    "message": "Команда-обёртка"
+  },
+  "app.settings.developer-mode-button.label": {
+    "message": "Переключить режим разработчика"
+  },
   "app.settings.developer-mode-enabled": {
     "message": "Режим разработчика включён."
   },
   "app.settings.downloading": {
     "message": "Скачивание версии {version}"
   },
+  "app.settings.java-installations.location.title": {
+    "message": "Расположение Java {version}"
+  },
+  "app.settings.operating-system.macos": {
+    "message": "macOS"
+  },
   "app.settings.privacy.ads-consent.intro": {
-    "message": "Реклама обеспечивает работу Modrinth и финансирует выплаты авторам. Наши партнёры могут хранить или получать доступ к файлам cookie в приложении для персонализации рекламы и измерения производительности. Вы можете отказаться или настроить предпочтения ниже."
+    "message": "Реклама обеспечивает работу Modrinth и выплаты авторам. Для персонализации и анализа рекламы наши партнёры могут использовать куки. Отказаться и настроить куки можно ниже."
+  },
+  "app.settings.privacy.discord-rich-presence.description": {
+    "message": "Показывать Modrinth App в текущей активности Discord. Не влияет на Rich Presence модов. Требуется перезапуск."
+  },
+  "app.settings.privacy.discord-rich-presence.title": {
+    "message": "Discord Rich Presence"
+  },
+  "app.settings.privacy.telemetry.description": {
+    "message": "Modrinth собирает анонимные данные об использовании для персонализации и улучшения сервиса. Отключите этот параметр, чтобы отказаться от сбора данных."
+  },
+  "app.settings.privacy.telemetry.title": {
+    "message": "Телеметрия"
+  },
+  "app.settings.resource-management.always-show-copy-details.description": {
+    "message": "Показывать кнопку «Получить отчёт» во время установки. Для прерванных установок кнопка видна всегда."
+  },
+  "app.settings.resource-management.always-show-copy-details.title": {
+    "message": "Всегда показывать «Получить отчёт»"
+  },
+  "app.settings.resource-management.app-cache.confirm.description": {
+    "message": "Приложение может замедлиться, пока кеш не восстановится."
+  },
+  "app.settings.resource-management.app-cache.confirm.title": {
+    "message": "Очистить кеш приложения?"
+  },
+  "app.settings.resource-management.app-cache.description": {
+    "message": "Удаляет кешированные данные и повторно скачивает их с Modrinth. Приложение может замедлиться, пока кеш не восстановится."
+  },
+  "app.settings.resource-management.app-cache.purge": {
+    "message": "Очистить кеш"
+  },
+  "app.settings.resource-management.app-cache.title": {
+    "message": "Кеш приложения"
+  },
+  "app.settings.resource-management.app-database-backups.description": {
+    "message": "Здесь хранятся резервные копии важных данных приложения на случай их утери."
+  },
+  "app.settings.resource-management.app-database-backups.open-folder": {
+    "message": "Открыть папку резервных копий"
+  },
+  "app.settings.resource-management.app-database-backups.title": {
+    "message": "Резервные копии базы данных"
+  },
+  "app.settings.resource-management.app-directory.browse": {
+    "message": "Выбрать каталог приложения"
+  },
+  "app.settings.resource-management.app-directory.description": {
+    "message": "Здесь Modrinth App хранит сборки и другие файлы. Изменения вступят в силу после перезапуска."
+  },
+  "app.settings.resource-management.app-directory.select": {
+    "message": "Выбор нового каталога приложения"
+  },
+  "app.settings.resource-management.app-directory.title": {
+    "message": "Каталог приложения"
+  },
+  "app.settings.resource-management.maximum-concurrent-downloads.description": {
+    "message": "Количество одновременно скачиваемых файлов. Уменьшите, если скачивание работает нестабильно. Требуется перезапуск."
+  },
+  "app.settings.resource-management.maximum-concurrent-downloads.title": {
+    "message": "Лимит одновременных скачиваний"
+  },
+  "app.settings.resource-management.maximum-concurrent-writes.description": {
+    "message": "Количество одновременно записываемых на диск файлов. Уменьшите, если возникают ошибки ввода-вывода. Требуется перезапуск."
+  },
+  "app.settings.resource-management.maximum-concurrent-writes.title": {
+    "message": "Лимит одновременных записей"
+  },
+  "app.settings.sidebar.label.instances": {
+    "message": "Сборки"
   },
   "app.settings.tabs.appearance": {
     "message": "Внешний вид"
   },
+  "app.settings.tabs.behavior": {
+    "message": "Поведение"
+  },
   "app.settings.tabs.default-instance-options": {
-    "message": "Предустановки"
+    "message": "Предустановки игры"
   },
   "app.settings.tabs.java-installations": {
-    "message": "Установки Java"
+    "message": "Расположение Java"
   },
   "app.settings.tabs.language": {
     "message": "Язык"
@@ -665,6 +1013,9 @@
   "app.settings.tabs.resource-management": {
     "message": "Управление ресурсами"
   },
+  "app.sidebar.playing-as": {
+    "message": "Текущий аккаунт"
+  },
   "app.skins.add-button": {
     "message": "Добавить скин"
   },
@@ -824,6 +1175,21 @@
   "app.skins.toggle-ears-features-on": {
     "message": "Включить"
   },
+  "app.survey.body": {
+    "message": "Не хотите ответить на несколько вопросов о вашем опыте с Modrinth App?"
+  },
+  "app.survey.footer": {
+    "message": "Этот отзыв будет доставлен напрямую команде Modrinth и поможет разрабатывать будущие обновления!"
+  },
+  "app.survey.no-thanks": {
+    "message": "Нет, спасибо"
+  },
+  "app.survey.take-survey": {
+    "message": "Пройти опрос"
+  },
+  "app.survey.title": {
+    "message": "Привет, пользователь Modrinth!"
+  },
   "app.update-popup.body.download-complete": {
     "message": "Скачивание версии Modrinth App {version} завершено. Перезапустите приложение, чтобы обновить его, или оно обновится автоматически после закрытия."
   },
@@ -872,18 +1238,36 @@
   "app.world.world-item.players-online": {
     "message": "{count} в игре"
   },
+  "content.shared-instance.change-version-body": {
+    "message": "Изменение версии затрагивает только локальную копию. В будущих обновлениях общего экземпляра она может быть восстановлена ​​или изменена снова."
+  },
+  "content.shared-instance.delete-bulk-body": {
+    "message": "Некоторые выбранные проекты являются частью общего экземпляра. Удаление этих проектов затрагивает только вашу локальную копию, и будущие обновления общего экземпляра могут восстановить или изменить их снова."
+  },
   "content.shared-instance.delete-button": {
     "message": "Всё равно удалить"
   },
   "content.shared-instance.delete-many-button": {
     "message": "Всё равно удалить {count, plural, one {# проект} few {# проекта} other {# проектов}}"
   },
+  "content.shared-instance.delete-single-body": {
+    "message": "Удаление затрагивает только локальную копию. В будущих обновлениях общего экземпляра он может быть восстановлен или изменен снова."
+  },
+  "content.shared-instance.disable-bulk-body": {
+    "message": "Некоторые выбранные проекты являются частью общего экземпляра. Отключение этих проектов затрагивает только вашу локальную копию, и будущие обновления общего экземпляра могут снова включить, восстановить или изменить их."
+  },
   "content.shared-instance.disable-button": {
     "message": "Всё равно отключить"
   },
   "content.shared-instance.disable-many-button": {
     "message": "Всё равно отключить {count, plural, one {# проект} few {# проекта} other {# проектов}}"
   },
+  "content.shared-instance.disable-single-body": {
+    "message": "Отключение этой функции затрагивает только локальную копию. В будущих обновлениях общего экземпляра она может быть повторно включена, восстановлена ​​или изменена."
+  },
+  "content.shared-instance.unlink-body": {
+    "message": "Удаление привязки затрагивает только локальную копию. В будущих обновлениях общего экземпляра она может быть восстановлена ​​или изменена снова."
+  },
   "content.shared-instance.warning-header": {
     "message": "Это часть сборки"
   },
@@ -921,7 +1305,7 @@
     "message": "Отправлен запрос дружбы"
   },
   "friends.friend.view-profile": {
-    "message": "Открыть профиль"
+    "message": "Посмотреть профиль"
   },
   "friends.heading": {
     "message": "Друзья"
@@ -953,18 +1337,45 @@
   "installation-settings.shared-instance.linked-title": {
     "message": "Связанная сборка"
   },
+  "installation-settings.shared-instance.title": {
+    "message": "Отменить публикацию экземпляра"
+  },
   "installation-settings.shared-instance.unlink-button": {
     "message": "Отвязать сборку"
   },
+  "installation-settings.shared-instance.unlink-description": {
+    "message": "Отключите этот локальный экземпляр от будущих общих обновлений."
+  },
   "installation-settings.shared-instance.unlinking-button": {
     "message": "Отвязка..."
   },
+  "installation-settings.shared-instance.unpublish-button": {
+    "message": "Отменить публикацию общего экземпляра"
+  },
+  "installation-settings.shared-instance.unpublish-description": {
+    "message": "Удалите этот общий экземпляр из Modrinth и прекратите отправлять обновления всем, кто его использует. Ваш локальный экземпляр останется без изменений."
+  },
+  "installation-settings.shared-instance.unpublishing-button": {
+    "message": "Снятие с публикации..."
+  },
+  "installation-settings.unlink-shared-instance.modal.admonition-body": {
+    "message": "Это повлияет только на ваш локальный экземпляр. Установленный контент останется на этом устройстве, и это никак не отразится на общем экземпляре и других пользователях."
+  },
   "installation-settings.unlink-shared-instance.modal.admonition-header": {
     "message": "Отвязка сборки"
   },
   "installation-settings.unlink-shared-instance.modal.header": {
     "message": "Отвязка сборки"
   },
+  "installation-settings.unpublish-shared-instance.modal.admonition-body": {
+    "message": "Это удалит общий экземпляр с серверов Modrinth. Пользователи, использующие его в приложении Modrinth, перестанут получать обновления, но ваш локальный экземпляр и его содержимое останутся на этом устройстве."
+  },
+  "installation-settings.unpublish-shared-instance.modal.admonition-header": {
+    "message": "Отмена публикации общего экземпляра"
+  },
+  "installation-settings.unpublish-shared-instance.modal.header": {
+    "message": "Отменить публикацию общего экземпляра"
+  },
   "instance.action.create-shortcut": {
     "message": "Создать ярлык"
   },
@@ -1034,6 +1445,9 @@
   "instance.locked.delete-button": {
     "message": "Удалить сборку"
   },
+  "instance.locked.play-tooltip": {
+    "message": "Сборка заблокирована"
+  },
   "instance.playtime.never-played": {
     "message": "Не запускалась"
   },
@@ -1049,6 +1463,45 @@
   "instance.server-modal.resource-pack": {
     "message": "Набор ресурсов"
   },
+  "instance.settings.sharing.active-invites.actions": {
+    "message": "Действия"
+  },
+  "instance.settings.sharing.active-invites.code": {
+    "message": "Ссылка"
+  },
+  "instance.settings.sharing.active-invites.description": {
+    "message": "Любой, у кого есть одна из этих ссылок, может присоединиться, пока она активна."
+  },
+  "instance.settings.sharing.active-invites.empty": {
+    "message": "Нет действующих приглашений."
+  },
+  "instance.settings.sharing.active-invites.expires": {
+    "message": "Истекает"
+  },
+  "instance.settings.sharing.active-invites.revoke": {
+    "message": "Отозвать приглашение"
+  },
+  "instance.settings.sharing.active-invites.revoke-with-code": {
+    "message": "Отозвать приглашение {code}"
+  },
+  "instance.settings.sharing.active-invites.title": {
+    "message": "Действующие приглашения"
+  },
+  "instance.settings.sharing.active-invites.uses": {
+    "message": "Использований"
+  },
+  "instance.settings.sharing.revoke-invite.admonition-body": {
+    "message": "Ссылка <monospace>{code}</monospace> сразу перестанет работать. Уже присоединившиеся пользователи сохранят доступ."
+  },
+  "instance.settings.sharing.revoke-invite.admonition-header": {
+    "message": "Это действие необратимо"
+  },
+  "instance.settings.sharing.revoke-invite.confirm": {
+    "message": "Отозвать приглашение"
+  },
+  "instance.settings.sharing.revoke-invite.header": {
+    "message": "Отзыв приглашения"
+  },
   "instance.settings.tabs.general": {
     "message": "Основные"
   },
@@ -1149,7 +1602,7 @@
     "message": "Перед запуском"
   },
   "instance.settings.tabs.hooks.pre-launch.description": {
-    "message": "Выполняется перед запуском сборки."
+    "message": "Выполняется перед запуском игры."
   },
   "instance.settings.tabs.hooks.pre-launch.enter": {
     "message": "Введите команду перед запуском..."
@@ -1172,6 +1625,9 @@
   "instance.settings.tabs.installation.loader-version": {
     "message": "Версия {loader}"
   },
+  "instance.settings.tabs.installation.locked": {
+    "message": "Параметры установки недоступны, пока сборка заблокирована."
+  },
   "instance.settings.tabs.java": {
     "message": "Java и память"
   },
@@ -1247,6 +1703,15 @@
   "instance.shared-instance.error.title": {
     "message": "Произошла ошибка"
   },
+  "instance.shared-instance.network-error.text": {
+    "message": "Не удалось подключиться к API сборок"
+  },
+  "instance.shared-instance.network-error.title": {
+    "message": "Ошибка сети"
+  },
+  "instance.shared-instance.owner-tooltip": {
+    "message": "Контент сборки доступен другим пользователям."
+  },
   "instance.shared-instance.publish-review.added-label": {
     "message": "Добавлен"
   },
@@ -1256,6 +1721,9 @@
   "instance.shared-instance.publish-review.config-title-v2": {
     "message": "Выберите файлы настройки"
   },
+  "instance.shared-instance.publish-review.description": {
+    "message": "Ознакомьтесь с изменениями в содержимом и выберите файлы конфигурации, которые следует включить в это обновление."
+  },
   "instance.shared-instance.publish-review.header": {
     "message": "Проверьте изменения"
   },
@@ -1265,9 +1733,30 @@
   "instance.shared-instance.publish-review.removed-label": {
     "message": "Удалён"
   },
+  "instance.shared-instance.tooltip": {
+    "message": "Содержимое данного экземпляра управляется другим пользователем."
+  },
+  "instance.shared-instance.unavailable.access-revoked-text": {
+    "message": "Доступ к сборке отозван. Сборка всё ещё доступна, но она не будет связана и не будет обновляться."
+  },
+  "instance.shared-instance.unavailable.deleted-text": {
+    "message": "Основной экземпляр был удален. Этот экземпляр по-прежнему доступен, но он больше не связан с предыдущим и не будет получать обновления."
+  },
+  "instance.shared-instance.unavailable.locked-text": {
+    "message": "Этот общий экземпляр был заблокирован командой модерации контента. Он больше не будет получать обновления от основного экземпляра и недоступен для игры."
+  },
   "instance.shared-instance.unavailable.locked-title": {
     "message": "Сборка заблокирована"
   },
+  "instance.shared-instance.unavailable.manager-fallback": {
+    "message": "менеджер сборки"
+  },
+  "instance.shared-instance.unavailable.text": {
+    "message": "Ваш локальный экземпляр по-прежнему доступен, но он больше не связан с системой и не будет получать обновления."
+  },
+  "instance.shared-instance.unavailable.title": {
+    "message": "Сборка больше недоступна"
+  },
   "instance.worlds.a_minecraft_server": {
     "message": "Сервер Minecraft"
   },
@@ -1411,5 +1900,11 @@
   },
   "search.filter.locked.server-loader.title": {
     "message": "Загрузчик управляется сервером"
+  },
+  "settings.sidebar.label.account": {
+    "message": "Аккаунт"
+  },
+  "settings.sidebar.label.display": {
+    "message": "Отображение"
   }
 }
diff --git a/apps/app-frontend/src/locales/sr-CS/index.json b/apps/app-frontend/src/locales/sr-CS/index.json
index a8f7f3343b..504cd552f8 100644
--- a/apps/app-frontend/src/locales/sr-CS/index.json
+++ b/apps/app-frontend/src/locales/sr-CS/index.json
@@ -89,6 +89,9 @@
   "app.action-bar.install.unknown-instance": {
     "message": "Nepoznata instanca"
   },
+  "app.action-bar.install.updating-shared-content": {
+    "message": "Ažuriranje deljenog sadržaja"
+  },
   "app.action-bar.installs": {
     "message": "Instalacije"
   },
@@ -125,20 +128,35 @@
   "app.action-bar.view-logs": {
     "message": "Pregledaj dnevnike"
   },
+  "app.ads-consent.accept": {
+    "message": "Prihvati sve"
+  },
+  "app.ads-consent.body": {
+    "message": "Reklame omogućavaju da Modrinth radi i finansiraju isplate kreatorima. Naši partneri mogu da čuvaju i koriste kolačiće u aplikaciji da bi personalizovali reklame i merili performanse."
+  },
+  "app.ads-consent.manage": {
+    "message": "Upravljaj podešavanjima"
+  },
+  "app.ads-consent.reject": {
+    "message": "Odbij sve"
+  },
+  "app.ads-consent.title": {
+    "message": "Tvoja bezbednost i kako reklame pomažu Modrinth-u"
+  },
   "app.appearance-settings.advanced-rendering.description": {
-    "message": "Omogućava napredno renderovanje kao što su efekti zamućenja koji mogu izazvati probleme sa performansama bez hardverski ubrzanog renderovanja."
+    "message": "Uključi vizuelne efekte kao što je blur pozadine. Ovo može da pogorša performanse bez hardverskog ubrzanja."
   },
   "app.appearance-settings.advanced-rendering.title": {
     "message": "Napredno renderovanje"
   },
   "app.appearance-settings.color-theme.description": {
-    "message": "Izaberi svoju preferiranu temu boja za Modrinth aplikaciju."
+    "message": "Izaberi boju teme koju koristi Modrinth App."
   },
   "app.appearance-settings.color-theme.title": {
     "message": "Tema boje"
   },
   "app.appearance-settings.default-landing-page.description": {
-    "message": "Promeni stranicu na kojoj se otvara pokretač."
+    "message": "Izaberi stranicu prikazanu kada se Modrinth App pokrene."
   },
   "app.appearance-settings.default-landing-page.home": {
     "message": "Početna stranica"
@@ -150,49 +168,46 @@
     "message": "Podrazumevana odredišna stranica"
   },
   "app.appearance-settings.hide-nametag.description": {
-    "message": "Onemogućava oznaku sa imenom iznad tvog igrača na stranici sa skinovima."
+    "message": "Sakrij svoje korisničko ime iznad pregleda igrača na stranici Skin birača."
   },
   "app.appearance-settings.hide-nametag.title": {
     "message": "Sakrij ime"
   },
   "app.appearance-settings.jump-back-into-worlds.description": {
-    "message": "Uključuje nedavne svetove u odeljku „Povratak“ na početnoj stranici."
+    "message": "Prikaži skorije igrane svetove na odeljku \"Vrati se u\" na početnoj stranici."
   },
   "app.appearance-settings.jump-back-into-worlds.title": {
     "message": "Vrati se u svetove"
   },
   "app.appearance-settings.minimize-launcher.description": {
-    "message": "Minimiziraj pokretač kada se pokrene Minecraft proces."
+    "message": "Smanji Modrinth App kada se Minecraft pokrene."
   },
   "app.appearance-settings.minimize-launcher.title": {
-    "message": "Minimiziraj pokretač"
+    "message": "Smanji aplikaciju"
   },
   "app.appearance-settings.native-decorations.description": {
-    "message": "Koristi okvir sistemskog prozora (potrebno je ponovno pokretanje aplikacije)."
+    "message": "Koristi naslovnu traku i kontrole prozora tvog operativnog sistema. Restart aplikacije obavezan."
   },
   "app.appearance-settings.native-decorations.title": {
-    "message": "Zavičajni ukrasi"
+    "message": "Sistemski okvir prozora"
   },
   "app.appearance-settings.show-play-time.description": {
-    "message": "Pokazuje koliko vremena si proveo igrajući instancu."
+    "message": "Prikaži koliko dugo ste igrali svaku instancu."
   },
   "app.appearance-settings.show-play-time.title": {
     "message": "Pokazivaj vreme igranja"
   },
   "app.appearance-settings.skip-non-essential-warnings.description": {
-    "message": "Automatski preskače potvrde niskog rizika kao duplirane instalacije modpakova, normalno brisanje sadržaja, grupna ažuriranja, prekidanje veze sa modpakovima i upiti za popravku. Opasna upozorenja će se i dalje prikazivati."
+    "message": "Preskoči potvrde za radnje niskog rizika kao što je dupliranje instalacije, brisanje normalnog sadržaja, grupna ažuriranja, prekid veze i popravke. Upozorenja za opasne radnje se uvek prikazuju."
   },
   "app.appearance-settings.skip-non-essential-warnings.title": {
     "message": "Preskači nebitna upozorenja"
   },
   "app.appearance-settings.toggle-sidebar.description": {
-    "message": "Omogućava mogućnost prebacivanja bočne trake."
+    "message": "Sakrij desnu bočnu traku podrazumevano i dodaj dugme da se prikaže i sakrije."
   },
   "app.appearance-settings.toggle-sidebar.title": {
-    "message": "Prebaci bočnu traku"
-  },
-  "app.appearance-settings.unknown-pack-warning.description": {
-    "message": "Ako pokušaš da instaliraš datoteku Modrinth Pack datoteke (.mrpack) koja nije hostovana na Modrinthu, uverićemo se da razumeš rizike pre nego što je instaliraš."
+    "message": "Sakrij desnu bočnu traku"
   },
   "app.appearance-settings.unknown-pack-warning.title": {
     "message": "Upozoti me prije instalacije nepoznatih modpackova"
@@ -488,9 +503,6 @@
   "app.settings.tabs.appearance": {
     "message": "Izgled"
   },
-  "app.settings.tabs.default-instance-options": {
-    "message": "Podrazumevane opcije instance"
-  },
   "app.settings.tabs.java-installations": {
     "message": "Java instalacije"
   },
diff --git a/apps/app-frontend/src/locales/sv-SE/index.json b/apps/app-frontend/src/locales/sv-SE/index.json
index 6dfb05b20c..9fafae441c 100644
--- a/apps/app-frontend/src/locales/sv-SE/index.json
+++ b/apps/app-frontend/src/locales/sv-SE/index.json
@@ -35,6 +35,9 @@
   "app.action-bar.install.summary.canceled": {
     "message": "Avbruten"
   },
+  "app.action-bar.install.summary.cleanup-incomplete": {
+    "message": "Rensningen avslutades inte"
+  },
   "app.action-bar.install.summary.content-download-failed": {
     "message": "Kunde inte ladda ner filer"
   },
@@ -53,6 +56,12 @@
   "app.action-bar.install.summary.invalid-file-path": {
     "message": "Sökväg är ogiltig"
   },
+  "app.action-bar.install.summary.invalid-modpack": {
+    "message": "Ogiltigt modpaketsdata"
+  },
+  "app.action-bar.install.summary.invalid-modpack-files": {
+    "message": "Modpaketets filer har ogiltig metadata"
+  },
   "app.action-bar.install.summary.local-data-error": {
     "message": "Kunde inte uppdatera lokal data"
   },
@@ -125,20 +134,17 @@
   "app.ads-consent.title": {
     "message": "Din integritet och hur reklam stödjer Modrinth"
   },
-  "app.appearance-settings.advanced-rendering.description": {
-    "message": "Aktiverar avancerad rendering som till exempel oskärpa vilket kan leda till prestandaproblem utan hårdvaruaccelererad rendering."
-  },
   "app.appearance-settings.advanced-rendering.title": {
     "message": "Avancerad rendering"
   },
   "app.appearance-settings.color-theme.description": {
-    "message": "Välj färgtema för Modrinth-appen."
+    "message": "Välj färgtemat som används av Modrinth App."
   },
   "app.appearance-settings.color-theme.title": {
     "message": "Färgtema"
   },
   "app.appearance-settings.default-landing-page.description": {
-    "message": "Ändrar sidan som launchern öppnas på."
+    "message": "Välj sidan som visas när Modrinth App öppnas."
   },
   "app.appearance-settings.default-landing-page.home": {
     "message": "Hem"
@@ -149,50 +155,35 @@
   "app.appearance-settings.default-landing-page.title": {
     "message": "Standardlandingssida"
   },
-  "app.appearance-settings.hide-nametag.description": {
-    "message": "Inaktiverar namnskylten ovanför din spelare på utseende-sidan."
-  },
   "app.appearance-settings.hide-nametag.title": {
     "message": "Dölj namnskylt"
   },
-  "app.appearance-settings.jump-back-into-worlds.description": {
-    "message": "Inkluderar de senaste världarna i \"Hoppa tillbaka i världar\" på hemsidan."
-  },
   "app.appearance-settings.jump-back-into-worlds.title": {
     "message": "Hoppa tillbaka i världar"
   },
   "app.appearance-settings.minimize-launcher.description": {
-    "message": "Minimerar launchern när Minecraft startas."
+    "message": "Minimera Modrinth App när Minecraft startar."
   },
   "app.appearance-settings.minimize-launcher.title": {
-    "message": "Minimera programstartare"
-  },
-  "app.appearance-settings.native-decorations.description": {
-    "message": "Använd systemets fönsterram (omstart av app krävs)."
-  },
-  "app.appearance-settings.native-decorations.title": {
-    "message": "Inbyggda fönsterdekorationer"
+    "message": "Minimera app"
   },
   "app.appearance-settings.show-play-time.description": {
-    "message": "Visar hur mycket tid du spelat på en instans."
+    "message": "Visa hur länge du spelat varje instans."
   },
   "app.appearance-settings.show-play-time.title": {
     "message": "Visa speltid"
   },
-  "app.appearance-settings.skip-non-essential-warnings.description": {
-    "message": "Hoppar över bekräftelser med låg risk, såsom installation av dubbla modpaket, radering av vanligt innehåll, massuppdateringar, avlänkning av modpaket och reparationsmeddelanden. Varningar om farliga händelser visas fortfarande."
-  },
   "app.appearance-settings.skip-non-essential-warnings.title": {
     "message": "Hoppa över icke nödvändiga varningar"
   },
   "app.appearance-settings.toggle-sidebar.description": {
-    "message": "Låter dig växla sidofältet."
+    "message": "Dölj det högra sidofältet och lägg till en knapp för att visa eller dölja det."
   },
   "app.appearance-settings.toggle-sidebar.title": {
-    "message": "Växla sidofält"
+    "message": "Dölj högra sidofält"
   },
   "app.appearance-settings.unknown-pack-warning.description": {
-    "message": "Om du försöker installera en Modrinth Pack fil (.mrpack) som inte kommer från Modrinth ser vi till att du känner till riskerna innan du installerar den."
+    "message": "Visa en säkerhetsvarning innan du installerar ett Modrinth Pack (.mrpack) som inte finns på Modrinth."
   },
   "app.appearance-settings.unknown-pack-warning.title": {
     "message": "Varna mig innan jag installerar okända modpaket"
@@ -203,6 +194,15 @@
   "app.auth-servers.unreachable.header": {
     "message": "Kan ej nå autentiseringsservrarna"
   },
+  "app.behavior-settings.confirmations.title": {
+    "message": "Bekräftningar"
+  },
+  "app.behavior-settings.content.title": {
+    "message": "Hem och innehåll"
+  },
+  "app.behavior-settings.startup-and-navigation.title": {
+    "message": "Uppstart och navigering"
+  },
   "app.browse.add-servers-to-instance": {
     "message": "Lägger till server till instans"
   },
@@ -224,12 +224,18 @@
   "app.browse.back-to-instance": {
     "message": "Tillbaka till instans"
   },
+  "app.browse.discover-project-type": {
+    "message": "Utforska {projectType}"
+  },
   "app.browse.discover-servers": {
     "message": "Upptäck servrar"
   },
   "app.browse.hide-added-servers": {
     "message": "Göm redan tillagda servrar"
   },
+  "app.browse.hide-installed-modpacks": {
+    "message": "Dölj redan installerade"
+  },
   "app.browse.project-type.modpacks": {
     "message": "Modpaket"
   },
@@ -320,9 +326,42 @@
   "app.instance.admonitions.shared-instance.added-label": {
     "message": "Tillagd"
   },
+  "app.instance.admonitions.shared-instance.changes-body": {
+    "message": "Din lokala instans ligger före de användare du har delat med."
+  },
+  "app.instance.admonitions.shared-instance.changes-header": {
+    "message": "Dina ändringar har inte delats än"
+  },
+  "app.instance.admonitions.shared-instance.publish-button": {
+    "message": "Ge ut en uppdatering"
+  },
+  "app.instance.admonitions.shared-instance.publishing-button": {
+    "message": "Ger ut..."
+  },
   "app.instance.admonitions.shared-instance.removed-label": {
     "message": "Borttagen"
   },
+  "app.instance.admonitions.shared-instance.review-admonition-header": {
+    "message": "Ge ut en uppdatering"
+  },
+  "app.instance.admonitions.shared-instance.review-description": {
+    "message": "Granska innehållsändringarna som kommer delas med alla som använder den här instansen."
+  },
+  "app.instance.admonitions.shared-instance.review-header": {
+    "message": "Granskar ändringar"
+  },
+  "app.instance.admonitions.shared-instance.review-update-button": {
+    "message": "Granska uppdatering"
+  },
+  "app.instance.admonitions.shared-instance.reviewing-button": {
+    "message": "Granskar..."
+  },
+  "app.instance.admonitions.shared-instance.update-available-body": {
+    "message": "En uppdatering krävs för att spela {name}. Vänligen uppdatera till den senaste verisoner för att köra spelet."
+  },
+  "app.instance.admonitions.shared-instance.update-available-header": {
+    "message": "En uppdatering finns tillgänglig"
+  },
   "app.instance.confirm-delete.admonition-body": {
     "message": "All data från din instans kommer permanent raderas, däribland dina världar, konfigurationer samt allt installerat innehåll."
   },
@@ -359,6 +398,9 @@
   "app.instance.mods.content-type-project": {
     "message": "projekt"
   },
+  "app.instance.mods.locked-content": {
+    "message": "Innehåll i låsta instanser kan inte ändras."
+  },
   "app.instance.mods.project-was-added": {
     "message": "\"{name}\" lades till"
   },
@@ -386,6 +428,9 @@
   "app.instance.share.invite-modal.heading": {
     "message": "Dela {name}"
   },
+  "app.instance.share.invite-modal.user-limit-reached": {
+    "message": "Instansen har nått gränsen på {limit} användare."
+  },
   "app.instance.share.locked.empty-description-prefix": {
     "message": "Du behöver logga in som"
   },
@@ -404,6 +449,12 @@
   "app.instance.share.locked.wrong-account-heading": {
     "message": "Fel konto"
   },
+  "app.instance.share.members.empty": {
+    "message": "Inga användare har gått med än"
+  },
+  "app.instance.share.members.no-filter-results": {
+    "message": "Ingen användare matchade dina filter."
+  },
   "app.instance.share.remove-user-modal.effect-access": {
     "message": "De kommer inte längre få uppdateringar för denna delade instansen"
   },
@@ -413,6 +464,9 @@
   "app.instance.share.remove-user-modal.effect-invite-again": {
     "message": "Du kan bjuda in dem igen senare"
   },
+  "app.instance.share.remove-user-modal.effect-last-user": {
+    "message": "Detta är den sista användaren, delning kommer avaktiveras för den här instansen"
+  },
   "app.instance.share.remove-user-modal.effects-label": {
     "message": "Vad händer?"
   },
@@ -431,6 +485,12 @@
   "app.instance.share.sign-in.button": {
     "message": "Logga in"
   },
+  "app.instance.share.unable-to-connect.description": {
+    "message": "Delade instanser-tjänsten är inte tillgänglig för tillfället, vänligen försök igen senare"
+  },
+  "app.instance.share.unable-to-connect.heading": {
+    "message": "Kunde inte ansluta"
+  },
   "app.instance.share.unlink.body": {
     "message": "Du måste avlänka detta modpaket för att dela din instans"
   },
@@ -452,9 +512,18 @@
   "app.instance.shared-instance-wrong-account.fallback-username": {
     "message": "det länkade kontot"
   },
+  "app.instance.shared-instance-wrong-account.owner-admonition-body-v2": {
+    "message": "för att hantera denna delade instans. Du kommer inte ge ut uppdateringar till användare."
+  },
   "app.instance.shared-instance-wrong-account.sign-in-as-label": {
     "message": "Logga in som"
   },
+  "app.instance.shared-instance-wrong-account.signed-out-header": {
+    "message": "Du behöver logga in på Modrinth"
+  },
+  "app.instance.shared-instance-wrong-account.user-admonition-body-v2": {
+    "message": "för att få uppdateringar till den här delade instansen."
+  },
   "app.instance.shared-instance-wrong-account.warning-header": {
     "message": "Du använder fel Modrinth-konto"
   },
@@ -509,12 +578,60 @@
   "app.instance.worlds.search-worlds-placeholder": {
     "message": "Sök {count} världar..."
   },
+  "app.java-detection.cancel": {
+    "message": "Avbryt"
+  },
+  "app.java-detection.columns.actions": {
+    "message": "Åtgärder"
+  },
+  "app.java-detection.columns.path": {
+    "message": "Sökväg"
+  },
+  "app.java-detection.columns.version": {
+    "message": "Version"
+  },
+  "app.java-detection.no-installations-found": {
+    "message": "Inga Java-installationer hittades."
+  },
+  "app.java-detection.select": {
+    "message": "Välj"
+  },
+  "app.java-detection.selected": {
+    "message": "Vald"
+  },
+  "app.java-detection.title": {
+    "message": "Välj java-installation"
+  },
+  "app.java-selector.already-installed": {
+    "message": "Redan installerad"
+  },
+  "app.java-selector.browse": {
+    "message": "Bläddra"
+  },
+  "app.java-selector.detect": {
+    "message": "Hitta"
+  },
+  "app.java-selector.install-recommended": {
+    "message": "Installation rekommenderas"
+  },
+  "app.java-selector.installing": {
+    "message": "Installerar..."
+  },
+  "app.java-selector.path.placeholder": {
+    "message": "/sökväg/till/java"
+  },
+  "app.java-selector.test-installation": {
+    "message": "Testa Java-installationen"
+  },
   "app.modal.install-to-play.additional-context": {
     "message": "Ytterligare sammanhang"
   },
   "app.modal.install-to-play.additional-context-placeholder": {
     "message": "Inkludera länkar och bilder om möjligt och relevant"
   },
+  "app.modal.install-to-play.block-user": {
+    "message": "Blockera användare"
+  },
   "app.modal.install-to-play.content-you-are-reporting": {
     "message": "Instans du anmäler"
   },
@@ -536,21 +653,69 @@
   "app.modal.install-to-play.invite-warning": {
     "message": "Denna inbjudan skapades av en annan Modrinth-användare, inte Modrinth. Acceptera endast inbjudningar från personer du litar på."
   },
+  "app.modal.install-to-play.invite-warning-with-creator": {
+    "message": "Denna inbjudan skapades av <creator>{username}</creator>, inte Modrinth. Acceptera endast inbjudningar från personer du litar på."
+  },
   "app.modal.install-to-play.mod-count": {
     "message": "{count, plural, one {# mod} other {# moddar}}"
   },
   "app.modal.install-to-play.report-description": {
     "message": "Använd denna formulär för att anmäla instanser som kan bryta mot våra <rules-link>Regler</rules-link> eller <terms-link>Användarvillkor</terms-link>."
   },
+  "app.modal.install-to-play.report-image-invalid-type": {
+    "message": "Filen är inte en godkänd bildtyp"
+  },
+  "app.modal.install-to-play.report-image-too-large": {
+    "message": "Fil överskrider storleksgränsen på 1 MiB"
+  },
+  "app.modal.install-to-play.report-legal-claims": {
+    "message": "För DMCA-meddelanden eller andra juridiska anspråk, se våran <copyright-link>Copyright Policy</copyright-link>."
+  },
+  "app.modal.install-to-play.report-reason": {
+    "message": "Vilken regel bryter instansen mot?"
+  },
+  "app.modal.install-to-play.report-reason.inappropriate": {
+    "message": "Olämplig"
+  },
+  "app.modal.install-to-play.report-reason.malicious": {
+    "message": "Skadlig"
+  },
+  "app.modal.install-to-play.report-reason.spam": {
+    "message": "Spam"
+  },
+  "app.modal.install-to-play.report-shared-instance-header": {
+    "message": "Rapportera delad instans"
+  },
+  "app.modal.install-to-play.report-submitted": {
+    "message": "Rapport skickad"
+  },
+  "app.modal.install-to-play.report-support-and-bugs": {
+    "message": "För supportärenden, kontakta vårt <support-link>supportteam</support-link>. För buggrapporter, öppna ett <github-link>GitHub issue</github-link>."
+  },
+  "app.modal.install-to-play.reviewed-files": {
+    "message": "En fil granskas bara om den publiceras på Modrinth, oavsett dess filformat (inklusive .mrpack)."
+  },
   "app.modal.install-to-play.shared-instance": {
     "message": "Delad instans"
   },
+  "app.modal.install-to-play.shared-instance-content": {
+    "message": "Delat instansinnehåll"
+  },
+  "app.modal.install-to-play.shared-instance-unknown-files-description": {
+    "message": "Denna delad instans innehåller filer som inte är publicerade på Modrinth. Vi rekommenderar stark att du endast installerar filer från källor du litar på."
+  },
   "app.modal.install-to-play.unknown-files-description": {
     "message": "Detta server-modpaket innehåller filer som inte är utgivna på Modrinth. Vi rekommenderar att endast installera filer från källor du litar på."
   },
   "app.modal.install-to-play.unknown-files-warning": {
     "message": "Okända filvarningar"
   },
+  "app.modal.install-to-play.unrecognized-files": {
+    "message": "Okända filer"
+  },
+  "app.modal.install-to-play.user-blocked": {
+    "message": "Användare blockerad"
+  },
   "app.modal.install-to-play.view-contents": {
     "message": "Visa innehåll"
   },
@@ -566,6 +731,39 @@
   "app.modal.update-to-play.shared-instance-removed-label": {
     "message": "Tog bort"
   },
+  "app.modal.update-to-play.update-required": {
+    "message": "Uppdatering krävs"
+  },
+  "app.modal.update-to-play.update-required-description": {
+    "message": "En uppdatering krävs för att spela {name}. Vänligen uppdatera till den senaste verisoner för att köra spelet."
+  },
+  "app.nav.create-new-instance": {
+    "message": "Skapa ny instans"
+  },
+  "app.nav.home": {
+    "message": "Hem"
+  },
+  "app.nav.library": {
+    "message": "Bibliotek"
+  },
+  "app.nav.modrinth-account": {
+    "message": "Modrinth-konto"
+  },
+  "app.nav.sign-in-to-modrinth-account": {
+    "message": "Logga in till ett Modrinth-konto"
+  },
+  "app.nav.signed-in-as": {
+    "message": "Inloggad som <user>{username}</user>"
+  },
+  "app.nav.upgrade-to-modrinth-plus": {
+    "message": "Upgradera till Modrinth+"
+  },
+  "app.news.title": {
+    "message": "Nyheter"
+  },
+  "app.news.view-all": {
+    "message": "Se alla nyheter"
+  },
   "app.project.install-button.already-installed": {
     "message": "Detta projekt är redan installerat"
   },
@@ -575,6 +773,9 @@
   "app.project.install-context.back-to-browse": {
     "message": "Tillbaka till upptäck"
   },
+  "app.project.install-context.back-to-instance": {
+    "message": "Tillbaka till instans"
+  },
   "app.project.version.all-versions": {
     "message": "Alla versioner"
   },
@@ -587,20 +788,98 @@
   "app.project.versions.already-installed": {
     "message": "Redan installerat"
   },
+  "app.restarting": {
+    "message": "Startar om..."
+  },
+  "app.settings.app-version": {
+    "message": "Modrinth App {version}"
+  },
+  "app.settings.default-instance-options.environment-variables.placeholder": {
+    "message": "Ange miljövariabler..."
+  },
+  "app.settings.default-instance-options.environment-variables.title": {
+    "message": "Miljövariabler"
+  },
+  "app.settings.default-instance-options.fullscreen.description": {
+    "message": "Starta instanser i helskärm genom att uppdatera deras option.txt-fil."
+  },
+  "app.settings.default-instance-options.fullscreen.title": {
+    "message": "Helskärm"
+  },
+  "app.settings.default-instance-options.height.description": {
+    "message": "Höjden på spelfönstret vid uppstart."
+  },
+  "app.settings.default-instance-options.height.placeholder": {
+    "message": "Ange höjd..."
+  },
+  "app.settings.default-instance-options.height.title": {
+    "message": "Höjd"
+  },
+  "app.settings.default-instance-options.java-arguments.placeholder": {
+    "message": "Ange Java-argument..."
+  },
+  "app.settings.default-instance-options.java-arguments.title": {
+    "message": "Java-argument"
+  },
+  "app.settings.default-instance-options.post-exit-hook.description": {
+    "message": "Körs efter att spelet stängs."
+  },
+  "app.settings.default-instance-options.pre-launch-hook.description": {
+    "message": "Körs innan instansen startar."
+  },
+  "app.settings.default-instance-options.pre-launch-hook.placeholder": {
+    "message": "Ange för-starts kommando..."
+  },
+  "app.settings.default-instance-options.width.placeholder": {
+    "message": "Ange bredd..."
+  },
+  "app.settings.default-instance-options.width.title": {
+    "message": "Bredd"
+  },
+  "app.settings.developer-mode-button.label": {
+    "message": "Växla utvecklarläge"
+  },
   "app.settings.developer-mode-enabled": {
     "message": "Utvecklarläge aktiverat."
   },
   "app.settings.downloading": {
     "message": "Ladda ner v{version}"
   },
+  "app.settings.operating-system.macos": {
+    "message": "macOS"
+  },
   "app.settings.privacy.ads-consent.intro": {
     "message": "Reklam gör Modrinth möjligt och finansierar utbetalningar till skapare. Våra partners kan lagra eller komma åt cookies i appen för att Personalisera reklam och mäta statistik."
   },
+  "app.settings.privacy.telemetry.description": {
+    "message": "Modrinth samlar in anonymiserad statistik och användningsdata för att förbättra vår användarupplevelse och anpassa din upplevelse. Genom att inaktivera det här alternativet avanmäler du dig och din data kommer inte längre samlas in."
+  },
+  "app.settings.privacy.telemetry.title": {
+    "message": "Telemetri"
+  },
+  "app.settings.resource-management.app-cache.confirm.description": {
+    "message": "Appen kan laddas in långsammare tills cachen är återuppbyggd."
+  },
+  "app.settings.resource-management.app-cache.confirm.title": {
+    "message": "Rensa app-cachen?"
+  },
+  "app.settings.resource-management.app-cache.description": {
+    "message": "Töm cachad data och ladda ner den igen från Modrinth. Appen kan laddas in långsammare tills cachen är återuppbyggd."
+  },
+  "app.settings.resource-management.app-cache.purge": {
+    "message": "Rensa cache"
+  },
+  "app.settings.resource-management.app-cache.title": {
+    "message": "App-cache"
+  },
+  "app.settings.sidebar.label.instances": {
+    "message": "Instanser"
+  },
   "app.settings.tabs.appearance": {
     "message": "Utseende"
   },
-  "app.settings.tabs.default-instance-options": {
-    "message": "Standardinställningar för instanser"
+  "app.settings.tabs.behavior": {
+    "message": "Beteende"
   },
   "app.settings.tabs.java-installations": {
     "message": "Java-installationer"
@@ -614,6 +893,9 @@
   "app.settings.tabs.resource-management": {
     "message": "Resurshantering"
   },
+  "app.sidebar.playing-as": {
+    "message": "Spelar som"
+  },
   "app.skins.add-button": {
     "message": "Lägg till utseende"
   },
@@ -638,6 +920,9 @@
   "app.skins.dropped-file-error.title": {
     "message": "Fel med behandlingen av filen"
   },
+  "app.skins.ears-feature-notice": {
+    "message": "Detta utseende använder funktioner från {ears}-modden"
+  },
   "app.skins.edit-button": {
     "message": "Ändra utseende"
   },
@@ -764,6 +1049,21 @@
   "app.skins.title": {
     "message": "Utseende väljare"
   },
+  "app.skins.toggle-ears-features-off": {
+    "message": "Växla av"
+  },
+  "app.skins.toggle-ears-features-on": {
+    "message": "Växla på"
+  },
+  "app.survey.footer": {
+    "message": "Den här återkopplingen kommer gå direkt till Modrinth-teamet och hjälper till att vägleda framtida uppdateringar!"
+  },
+  "app.survey.no-thanks": {
+    "message": "Nej tack"
+  },
+  "app.survey.title": {
+    "message": "Hej där Modrinth-användare!"
+  },
   "app.update-popup.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."
   },
@@ -812,6 +1112,30 @@
   "app.world.world-item.players-online": {
     "message": "{count} online"
   },
+  "content.shared-instance.change-version-body": {
+    "message": "Att ändra versionen ändrar endast din lokala kopia. Framtida uppdateringar till den delade instansen kan återställa eller ändra den igen."
+  },
+  "content.shared-instance.delete-bulk-body": {
+    "message": "Vissa valda projekt är en del av den delade instansen. Att radera dem ändrar endast din lokala kopia och framtida uppdateringar till den delade instansen kan återställa eller ändra dem igen."
+  },
+  "content.shared-instance.delete-button": {
+    "message": "Radera ändå"
+  },
+  "content.shared-instance.delete-many-button": {
+    "message": "Radera {count, number} projekt ändå"
+  },
+  "content.shared-instance.delete-single-body": {
+    "message": "Att radera den ändrar endast din lokala kopia. Framtida uppdateringar till den delade instansen kan återställa eller ändra den igen."
+  },
+  "content.shared-instance.disable-button": {
+    "message": "Inaktivera ändå"
+  },
+  "content.shared-instance.disable-many-button": {
+    "message": "Inaktivera {count, number} projekt ändå"
+  },
+  "content.shared-instance.warning-header": {
+    "message": "Det här är en del av den delade instansen"
+  },
   "friends.action.add-friend": {
     "message": "Lägg till en vän"
   },
@@ -875,12 +1199,33 @@
   "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!"
   },
+  "installation-settings.shared-instance.title": {
+    "message": "Avpublicera instans"
+  },
   "installation-settings.shared-instance.unlink-button": {
     "message": "Avlänka delad instans"
   },
   "installation-settings.shared-instance.unlinking-button": {
     "message": "Avlänkar..."
   },
+  "installation-settings.shared-instance.unpublish-button": {
+    "message": "Avpublicera delad instans"
+  },
+  "installation-settings.shared-instance.unpublish-description": {
+    "message": "Ta bort den delade instansen från Modrinth och sluta skicka uppdateringar till alla som använder den. Din lokala instans kommer inte att påverkas."
+  },
+  "installation-settings.shared-instance.unpublishing-button": {
+    "message": "Avpublicerar..."
+  },
+  "installation-settings.unpublish-shared-instance.modal.admonition-body": {
+    "message": "Detta raderar den delade instansen från Modrinths servrar. De som använder den i Modrinth App kommer sluta få uppdateringar, men din lokala instans och dess innehåll är kvar på den här enheten."
+  },
+  "installation-settings.unpublish-shared-instance.modal.admonition-header": {
+    "message": "Avpublicerar delad instans"
+  },
+  "installation-settings.unpublish-shared-instance.modal.header": {
+    "message": "Avpublicera delad instans"
+  },
   "instance.action.create-shortcut": {
     "message": "Skapa genväg"
   },
@@ -953,6 +1298,9 @@
   "instance.locked.delete-button": {
     "message": "Radera instans"
   },
+  "instance.locked.play-tooltip": {
+    "message": "Denna instans har låsts"
+  },
   "instance.playtime.never-played": {
     "message": "Aldrig spelad"
   },
@@ -968,6 +1316,30 @@
   "instance.server-modal.resource-pack": {
     "message": "Resurs pack"
   },
+  "instance.settings.sharing.active-invites.code": {
+    "message": "Inbjudningslänk"
+  },
+  "instance.settings.sharing.active-invites.expires": {
+    "message": "Går ut"
+  },
+  "instance.settings.sharing.active-invites.revoke": {
+    "message": "Återkalla inbjudan"
+  },
+  "instance.settings.sharing.active-invites.revoke-with-code": {
+    "message": "Återkalla inbjudan {code}"
+  },
+  "instance.settings.sharing.active-invites.title": {
+    "message": "Aktiva inbjudningar"
+  },
+  "instance.settings.sharing.active-invites.uses": {
+    "message": "Användningar"
+  },
+  "instance.settings.sharing.revoke-invite.confirm": {
+    "message": "Återkalla inbjudan"
+  },
+  "instance.settings.sharing.revoke-invite.header": {
+    "message": "Återkalla inbjudan"
+  },
   "instance.settings.tabs.general": {
     "message": "Allmänt"
   },
@@ -1166,6 +1538,9 @@
   "instance.shared-instance.error.title": {
     "message": "Något gick fel"
   },
+  "instance.shared-instance.network-error.title": {
+    "message": "Nätverksfel"
+  },
   "instance.shared-instance.publish-review.added-label": {
     "message": "Lade till"
   },
@@ -1178,6 +1553,9 @@
   "instance.shared-instance.publish-review.removed-label": {
     "message": "Tog bort"
   },
+  "instance.shared-instance.unavailable.locked-title": {
+    "message": "Instans låst"
+  },
   "instance.worlds.a_minecraft_server": {
     "message": "En Minecraft Server"
   },
@@ -1277,9 +1655,18 @@
   "modal.modrinth-account-required.open-browser-again-button": {
     "message": "Öppna webbläsare igen"
   },
+  "modal.modrinth-account-required.sign-in-button": {
+    "message": "Logga in på Modrinth"
+  },
+  "modal.modrinth-account-required.sign-in-heading": {
+    "message": "Logga in till ett Modrinth-konto"
+  },
   "modal.modrinth-account-required.signing-in-header": {
     "message": "Loggar in"
   },
+  "modal.modrinth-account-required.support-prompt": {
+    "message": "Har du problem med att logga in? <support>Få hjälp</support>"
+  },
   "search.filter.locked.instance": {
     "message": "Tillhandahållet av instansen"
   },
@@ -1303,5 +1690,11 @@
   },
   "search.filter.locked.server-loader.title": {
     "message": "Loader tillhandahålls av servern"
+  },
+  "settings.sidebar.label.account": {
+    "message": "Konto"
+  },
+  "settings.sidebar.label.display": {
+    "message": "Visning"
   }
 }
diff --git a/apps/app-frontend/src/locales/th-TH/index.json b/apps/app-frontend/src/locales/th-TH/index.json
index 059e5cdc4e..ddedfb4a3c 100644
--- a/apps/app-frontend/src/locales/th-TH/index.json
+++ b/apps/app-frontend/src/locales/th-TH/index.json
@@ -59,21 +59,12 @@
   "app.action-bar.view-logs": {
     "message": "ดู Log"
   },
-  "app.appearance-settings.advanced-rendering.description": {
-    "message": "เปิดการใช้งานการเรนเดอร์ขั้นสูง เช่น เอฟเฟคการเบลอ อาจทำให้เกมเกิดปัญหาด้านประสิทธิภาพได้หากไม่มีอุปกรณ์ฮาร์ดแวร์ที่สามารถรองรับการเรนเดอร์ได้"
-  },
   "app.appearance-settings.advanced-rendering.title": {
     "message": "การเรนเดอร์ขั้นสูง"
   },
-  "app.appearance-settings.color-theme.description": {
-    "message": "เลือกธีมสีที่คุณต้องการสำหรับ Modrinth App"
-  },
   "app.appearance-settings.color-theme.title": {
     "message": "ธีมสี"
   },
-  "app.appearance-settings.default-landing-page.description": {
-    "message": "เปลี่ยนหน้าไปหน้าต่างที่ลันเชอร์เปิดขึ้นมา"
-  },
   "app.appearance-settings.default-landing-page.home": {
     "message": "หน้าหลัก"
   },
@@ -83,45 +74,15 @@
   "app.appearance-settings.default-landing-page.title": {
     "message": "หน้าเริ่มต้น"
   },
-  "app.appearance-settings.hide-nametag.description": {
-    "message": "ซ่อนป้ายชื่อบนศีรษะของผู้เล่นในหน้าแสดงสกิน"
-  },
   "app.appearance-settings.hide-nametag.title": {
     "message": "ซ่อนป้ายชื่อ"
   },
-  "app.appearance-settings.jump-back-into-worlds.description": {
-    "message": "แสดงโลกที่เล่นล่าสุดในส่วน \"เล่นต่อ\" บนหน้าหลัก"
-  },
   "app.appearance-settings.jump-back-into-worlds.title": {
     "message": "เล่นต่อ"
   },
-  "app.appearance-settings.minimize-launcher.description": {
-    "message": "ย่อลันเชอร์เมื่อกระบวนการการรัน Minecraft เริ่มต้นแล้ว"
-  },
-  "app.appearance-settings.minimize-launcher.title": {
-    "message": "ย่อลันเชอร์"
-  },
-  "app.appearance-settings.native-decorations.description": {
-    "message": "ใช้กรอบหน้าต่างระบบ (ต้องรีสตาร์ทแอป)"
-  },
-  "app.appearance-settings.native-decorations.title": {
-    "message": "ของตกแต่งดั้งเดิม"
-  },
-  "app.appearance-settings.show-play-time.description": {
-    "message": "แสดงเวลาที่คุณใช้เล่นในแต่ละอินสแตนซ์"
-  },
   "app.appearance-settings.show-play-time.title": {
     "message": "แสดงระยะเวลาที่เล่น"
   },
-  "app.appearance-settings.toggle-sidebar.description": {
-    "message": "เปิดใช้งานตัวเลือกในการเลือกย่อหรือขยายแถบด้านข้าง"
-  },
-  "app.appearance-settings.toggle-sidebar.title": {
-    "message": "ย่อแถบด้านข้าง"
-  },
-  "app.appearance-settings.unknown-pack-warning.description": {
-    "message": "หากคุณกำลังติดตั้งไฟล์แพ็กของ Modrinth (.mrpack) ที่ไม่ได้โฮสต์โดยตรงบน Modrinth เราจะแจ้งให้คุณตรวจสอบให้มั่นใจก่อนที่จะติดตั้งไฟล์แพ็กดังกล่าว"
-  },
   "app.appearance-settings.unknown-pack-warning.title": {
     "message": "เตือนฉันก่อนติดตั้งแพ็กม็อดที่ไม่รู้จัก"
   },
@@ -287,9 +248,6 @@
   "app.settings.tabs.appearance": {
     "message": "หน้าตา"
   },
-  "app.settings.tabs.default-instance-options": {
-    "message": "ตั้งค่าโปรแกรมเริ่มต้น"
-  },
   "app.settings.tabs.java-installations": {
     "message": "การจัดการ Java ที่ติดตั้ง"
   },
diff --git a/apps/app-frontend/src/locales/tr-TR/index.json b/apps/app-frontend/src/locales/tr-TR/index.json
index 1886b8eed7..0df2fb9deb 100644
--- a/apps/app-frontend/src/locales/tr-TR/index.json
+++ b/apps/app-frontend/src/locales/tr-TR/index.json
@@ -144,19 +144,19 @@
     "message": "Sizin mahremiyetiniz ve reklamlar Modrinth'i nasıl destekler"
   },
   "app.appearance-settings.advanced-rendering.description": {
-    "message": "Donanım hızlandırmalı işleme kapalıyken, performans sorunlarına yol açabilecek bulanıklık efektleri gibi gelişmiş işlemeleri aktif eder."
+    "message": "Arka plan bulanıklığı gibi görsel efektleri etkinleştirin. Bu, donanım ivmelendirme yokken performansı etkileyebilir."
   },
   "app.appearance-settings.advanced-rendering.title": {
     "message": "Gelişmiş işleme"
   },
   "app.appearance-settings.color-theme.description": {
-    "message": "Modrinth App için tercih ettiğiniz temayı seçin."
+    "message": "Modrinth App tarafından kullanılacak renk şemasını seçin."
   },
   "app.appearance-settings.color-theme.title": {
-    "message": "Tema Rengi"
+    "message": "Renk teması"
   },
   "app.appearance-settings.default-landing-page.description": {
-    "message": "Launcher açıldığında varsayılan olarak açılacak sayfayı seçin."
+    "message": "Modrinth App açıldığında gözüken sayfayı seçin."
   },
   "app.appearance-settings.default-landing-page.home": {
     "message": "Ana Sayfa"
@@ -168,49 +168,40 @@
     "message": "Varsayılan karşılama sayfası"
   },
   "app.appearance-settings.hide-nametag.description": {
-    "message": "Kostümler sayfasındaki karakterinizin üzerindeki isim etiketini devre dışı bırakır."
+    "message": "Dış görünüm seçici sayfasında oyuncu önizlemesinin üzerindeki kullanıcı adınızı gizleyin."
   },
   "app.appearance-settings.hide-nametag.title": {
     "message": "İsim etiketini gizle"
   },
-  "app.appearance-settings.jump-back-into-worlds.description": {
-    "message": "Ana sayfadaki 'Hızlıca Geri Dön' bölümünde son oynanan dünyaları gösterir."
-  },
   "app.appearance-settings.jump-back-into-worlds.title": {
     "message": "Dünyalara hızlıca geri dön"
   },
   "app.appearance-settings.minimize-launcher.description": {
-    "message": "Minecraft başlatıldığında launcher'i simge durumuna at."
+    "message": "Minecraft başladığında Modrinth uygulamasını küçült."
   },
   "app.appearance-settings.minimize-launcher.title": {
-    "message": "Launcher'i simge durumuna at"
+    "message": "Uygulamayı küçült"
   },
   "app.appearance-settings.native-decorations.description": {
-    "message": "Sistem pencere kenarlıklarını kullan (Yeniden başlatma gerekli)."
+    "message": "İşletim sisteminizin başlık çubuğu ve pencere kontrollerini kullanın. Uygulamanın yeniden başlatılmasını gerektirir."
   },
   "app.appearance-settings.native-decorations.title": {
-    "message": "Yerel pencere öğeleri"
-  },
-  "app.appearance-settings.show-play-time.description": {
-    "message": "Bir oyun oturumunda ne kadar zaman geçirdiğinizi gösterir."
+    "message": "Sistem pencere çerçevesi"
   },
   "app.appearance-settings.show-play-time.title": {
-    "message": "Oynama Süresini Göster"
-  },
-  "app.appearance-settings.skip-non-essential-warnings.description": {
-    "message": "Mükerrer mod paketi kurulumları, normal içerik silme, toplu güncellemeler, mod paketi bağlantısını kesme ve onarım uyarıları gibi düşük riskli onayları otomatik olarak atlar. Tehlikeli uyarılar gösterilmeye devam edecektir."
+    "message": "Oynama süresini göster"
   },
   "app.appearance-settings.skip-non-essential-warnings.title": {
     "message": "Gerekli olmayan uyarıları atla"
   },
   "app.appearance-settings.toggle-sidebar.description": {
-    "message": "Kenar çubuğunu ayarlama özelliğini aktifleştirir."
+    "message": "Sağ kenar çubuğunu varsayılan olarak gizleyin ve onu göstermek ya da gizlemek için bir düğme ekleyin."
   },
   "app.appearance-settings.toggle-sidebar.title": {
-    "message": "Kenar çubuğunu ayarla"
+    "message": "Sağ kenar çubuğunu gizle"
   },
   "app.appearance-settings.unknown-pack-warning.description": {
-    "message": "Modrinth üzerinde barındırılmayan bir Modrinth Paket dosyasını (.mrpack) yüklemeye çalışırsanız, yükleme öncesinde riskleri anladığınızdan emin oluruz."
+    "message": "Modrinth'te yayınlanmayan bir Modrinth Pack (.mrpack) kurulmadan önce bir güvenlik uyarısı göster."
   },
   "app.appearance-settings.unknown-pack-warning.title": {
     "message": "Bilinmeyen mod paketlerini indirmeden önce beni uyar"
@@ -221,6 +212,9 @@
   "app.auth-servers.unreachable.header": {
     "message": "Doğrulama sunucularına erişilemedi"
   },
+  "app.behavior-settings.confirmations.title": {
+    "message": "Onaylamalar"
+  },
   "app.browse.add-servers-to-instance": {
     "message": "Sunucuyu kuruluma ekle"
   },
@@ -242,6 +236,9 @@
   "app.browse.back-to-instance": {
     "message": "Kuruluma dön"
   },
+  "app.browse.discover-project-type": {
+    "message": "Keşfet {projectType}"
+  },
   "app.browse.discover-servers": {
     "message": "Sunucuları keşfet"
   },
@@ -339,13 +336,13 @@
     "message": "Eklendi"
   },
   "app.instance.admonitions.shared-instance.changes-body": {
-    "message": "Yerel instance, paylaştığın kullanıcıların kurulumundan daha güncel."
+    "message": "Yerel kurulumunuz paylaştığınız kullanıcılardan daha ileride."
   },
   "app.instance.admonitions.shared-instance.changes-header": {
     "message": "Değişiklikler henüz paylaşılmadı"
   },
   "app.instance.admonitions.shared-instance.publish-button": {
-    "message": "Güncellemeyi Yayınla"
+    "message": "Güncellemeyi gönder"
   },
   "app.instance.admonitions.shared-instance.publishing-button": {
     "message": "Yayınlıyor..."
@@ -362,9 +359,18 @@
   "app.instance.admonitions.shared-instance.review-header": {
     "message": "Değişimleri inceleniyor"
   },
+  "app.instance.admonitions.shared-instance.review-update-button": {
+    "message": "Güncellemeyi gözden geçir"
+  },
   "app.instance.admonitions.shared-instance.reviewing-button": {
     "message": "İnceleniyor..."
   },
+  "app.instance.admonitions.shared-instance.update-available-body": {
+    "message": "{name}'i oynamak için bir güncelleme gerekli. Oyunu açabilmek için lütfen son sürüme güncelleyin."
+  },
+  "app.instance.admonitions.shared-instance.update-available-header": {
+    "message": "Bir güncelleme mevcut"
+  },
   "app.instance.confirm-delete.admonition-body": {
     "message": "Dünyalarınız, yapılandırmalarınız ve yüklü tüm içerikler ve tüm veriler kalıcı olarak silinecek."
   },
@@ -423,7 +429,7 @@
     "message": "Bu instance'ı arkadaşlarınla paylaşabilirsin!"
   },
   "app.instance.share.empty.heading": {
-    "message": "Hiçbir arkadaş davet edilmedi"
+    "message": "Henüz davet edilen arkadaş yok"
   },
   "app.instance.share.empty.invite-friends-button": {
     "message": "Arkadaşlarını davet et"
@@ -431,6 +437,9 @@
   "app.instance.share.invite-modal.heading": {
     "message": "Paylaş {name}"
   },
+  "app.instance.share.invite-modal.user-limit-reached": {
+    "message": "Bu örnek {limit} kullanıcı sınırına ulaştı."
+  },
   "app.instance.share.locked.empty-description-prefix": {
     "message": "Giriş yapmanız gerekiyor"
   },
@@ -449,21 +458,54 @@
   "app.instance.share.locked.wrong-account-heading": {
     "message": "Hatalı hesap"
   },
+  "app.instance.share.members.empty": {
+    "message": "Henüz katılan kullanıcı yok"
+  },
+  "app.instance.share.members.no-filter-results": {
+    "message": "Filtrelerinizle eşleşen kullanıcı yok."
+  },
   "app.instance.share.remove-user-modal.effect-access": {
     "message": "Artık bu paylaşılan kurulum için güncelleme almayacaklar"
   },
   "app.instance.share.remove-user-modal.effect-installed-copy": {
     "message": "Daha önce yükledikleri kopyalar cihazlarında kalmaya devam edecek"
   },
+  "app.instance.share.remove-user-modal.effect-invite-again": {
+    "message": "Onları sonradan tekrar davet edebilirsiniz"
+  },
   "app.instance.share.remove-user-modal.effects-label": {
     "message": "Ne olur?"
   },
+  "app.instance.share.remove-user-modal.header": {
+    "message": "Erişimi geri çek"
+  },
+  "app.instance.share.remove-user-modal.remove-button": {
+    "message": "Erişimi geri çek"
+  },
   "app.instance.share.remove-user-modal.user-avatar-alt": {
     "message": "{username} nın avatarı"
   },
   "app.instance.share.sign-in.button": {
     "message": "Giriş yap"
   },
+  "app.instance.share.unable-to-connect.heading": {
+    "message": "Bağlanılamıyor"
+  },
+  "app.instance.shared-instance-already-installed.install-anyway": {
+    "message": "Yine de kur"
+  },
+  "app.instance.shared-instance-already-installed.instance": {
+    "message": "Kurulum"
+  },
+  "app.instance.shared-instance-wrong-account.fallback-username": {
+    "message": "bağlı hesap"
+  },
+  "app.instance.shared-instance-wrong-account.signed-out-header": {
+    "message": "Modrinth'e giriş yapmanız gerek"
+  },
+  "app.instance.shared-instance-wrong-account.warning-header": {
+    "message": "Yanlış Modrinth hesabını kullanıyorsunuz"
+  },
   "app.instance.worlds.add-server": {
     "message": "Sunucu Ekle"
   },
@@ -515,6 +557,66 @@
   "app.instance.worlds.search-worlds-placeholder": {
     "message": "{count} dünya ara..."
   },
+  "app.java-detection.cancel": {
+    "message": "İptal"
+  },
+  "app.java-detection.columns.actions": {
+    "message": "Eylemler"
+  },
+  "app.java-detection.columns.path": {
+    "message": "Yol"
+  },
+  "app.java-detection.columns.version": {
+    "message": "Sürüm"
+  },
+  "app.java-detection.no-installations-found": {
+    "message": "Java kurulumu bulunamadı."
+  },
+  "app.java-detection.select": {
+    "message": "Seç"
+  },
+  "app.java-detection.selected": {
+    "message": "Seçildi"
+  },
+  "app.java-detection.title": {
+    "message": "Java kurulumunu seç"
+  },
+  "app.java-selector.already-installed": {
+    "message": "Zaten kuruldu"
+  },
+  "app.java-selector.browse": {
+    "message": "Göz at"
+  },
+  "app.java-selector.detect": {
+    "message": "Tespit et"
+  },
+  "app.java-selector.install-recommended": {
+    "message": "Önerileni kur"
+  },
+  "app.java-selector.installing": {
+    "message": "Kuruluyor..."
+  },
+  "app.java-selector.path.placeholder": {
+    "message": "/java/kurulum/yolu"
+  },
+  "app.java-selector.test-installation": {
+    "message": "Java kurulumunu dene"
+  },
+  "app.modal.install-to-play.additional-context": {
+    "message": "Ek bağlam"
+  },
+  "app.modal.install-to-play.block-user": {
+    "message": "Kullanıcıyı engelle"
+  },
+  "app.modal.install-to-play.content-you-are-reporting": {
+    "message": "Raporladığınız kurulum"
+  },
+  "app.modal.install-to-play.delete-instance": {
+    "message": "Kurulumu sil"
+  },
+  "app.modal.install-to-play.external-files-dont-install": {
+    "message": "Kurma"
+  },
   "app.modal.install-to-play.header": {
     "message": "Oynamak için yükleyin"
   },
@@ -530,12 +632,33 @@
   "app.modal.install-to-play.mod-count": {
     "message": "{count, plural, one {#mod} other {#mods}}"
   },
+  "app.modal.install-to-play.report-image-invalid-type": {
+    "message": "Dosya kabul edilen bir resim türü değil"
+  },
+  "app.modal.install-to-play.report-image-too-large": {
+    "message": "Dosya 1 MiB boyut sınırını aşıyor"
+  },
+  "app.modal.install-to-play.report-reason.inappropriate": {
+    "message": "Uygunsuz"
+  },
+  "app.modal.install-to-play.report-reason.malicious": {
+    "message": "Kötü niyetli"
+  },
+  "app.modal.install-to-play.report-reason.spam": {
+    "message": "Spam"
+  },
+  "app.modal.install-to-play.report-submitted": {
+    "message": "Rapor sunuldu"
+  },
   "app.modal.install-to-play.reviewed-files": {
     "message": "Dosya formatı ne olursa olsun (.mrpack dahil), bir dosya yalnızca Modrinth'e yüklendiğinde denetlenir."
   },
   "app.modal.install-to-play.shared-instance": {
     "message": "Paylaşılan Kurulum"
   },
+  "app.modal.install-to-play.shared-instance-content": {
+    "message": "Paylaşılan kurulum içeriği"
+  },
   "app.modal.install-to-play.unknown-files-description": {
     "message": "Bu sunucunun mod paketi Modrinth'te yayınlanmamış doysaları mevcut. Yalnızca güvendiğiniz kaynaklardan dosya indirmenizi önemle tavsiye ederiz."
   },
@@ -545,6 +668,9 @@
   "app.modal.install-to-play.unrecognized-files": {
     "message": "Tanımlanamayan dosyalar"
   },
+  "app.modal.install-to-play.user-blocked": {
+    "message": "Kullanıcı engellendi"
+  },
   "app.modal.install-to-play.view-contents": {
     "message": "İçeriği görüntüle"
   },
@@ -554,6 +680,42 @@
   "app.modal.update-to-play.removed": {
     "message": "Silindi"
   },
+  "app.modal.update-to-play.shared-instance-added-label": {
+    "message": "Eklendi"
+  },
+  "app.modal.update-to-play.shared-instance-removed-label": {
+    "message": "Kaldırıldı"
+  },
+  "app.modal.update-to-play.update-required": {
+    "message": "Güncelleme gerekiyor"
+  },
+  "app.nav.home": {
+    "message": "Ana Sayfa"
+  },
+  "app.nav.library": {
+    "message": "Kütüphane"
+  },
+  "app.nav.modrinth-account": {
+    "message": "Modrinth hesabı"
+  },
+  "app.nav.modrinth-hosting": {
+    "message": "Modrinth Hosting"
+  },
+  "app.nav.sign-in-to-modrinth-account": {
+    "message": "Bir Modrinth hesabıyla oturum açın"
+  },
+  "app.nav.signed-in-as": {
+    "message": "<user>{username}</user> olarak oturum açıldı"
+  },
+  "app.nav.upgrade-to-modrinth-plus": {
+    "message": "Modrinth+'a yükselt"
+  },
+  "app.news.title": {
+    "message": "Haberler"
+  },
+  "app.news.view-all": {
+    "message": "Tüm haberleri göster"
+  },
   "app.project.install-button.already-installed": {
     "message": "Bu proje zaten kurulu"
   },
@@ -575,20 +737,50 @@
   "app.project.versions.already-installed": {
     "message": "Zaten yüklenmiş"
   },
+  "app.quick-instance-switcher.drag-tooltip": {
+    "message": "Yeniden boyutlandırmak için kaydırın"
+  },
+  "app.restarting": {
+    "message": "Yeniden Başlatılıyor..."
+  },
+  "app.settings.app-version": {
+    "message": "Modrinth Uygulaması {version}"
+  },
+  "app.settings.default-instance-options.height.title": {
+    "message": "Yükseklik"
+  },
+  "app.settings.default-instance-options.java-arguments.placeholder": {
+    "message": "Java Argümanları girin..."
+  },
+  "app.settings.default-instance-options.java-arguments.title": {
+    "message": "Java Argümanları"
+  },
+  "app.settings.default-instance-options.width.placeholder": {
+    "message": "Genişlik gir..."
+  },
+  "app.settings.default-instance-options.width.title": {
+    "message": "Genişlik"
+  },
   "app.settings.developer-mode-enabled": {
     "message": "Geliştirici modu açıldı."
   },
   "app.settings.downloading": {
     "message": "v{version} indiriliyor"
   },
+  "app.settings.operating-system.macos": {
+    "message": "macOS"
+  },
   "app.settings.privacy.ads-consent.intro": {
     "message": "Reklamlar, Modrinth'i mümkün kılıyor ve içerik üreticilerine yapılan ödemeleri finanse ediyor. Partnerlerimiz, reklamları kişiselleştirmek ve performansı ölçmek amacıyla uygulama içinde çerez depolayabilir veya bunlara erişebilir. Aşağıdan tercihinizi yönetebilir veya vazgeçebilirsiniz."
   },
+  "app.settings.privacy.telemetry.title": {
+    "message": "Telemetri"
+  },
   "app.settings.tabs.appearance": {
     "message": "Görünüm"
   },
-  "app.settings.tabs.default-instance-options": {
-    "message": "Varsayılan profil seçenekleri"
+  "app.settings.tabs.behavior": {
+    "message": "Davranış"
   },
   "app.settings.tabs.java-installations": {
     "message": "Java kurulumları"
@@ -603,7 +795,7 @@
     "message": "Kaynak yönetimi"
   },
   "app.skins.add-button": {
-    "message": "Skin ekle"
+    "message": "Dış görünüm ekle"
   },
   "app.skins.add-button.drag-and-drop": {
     "message": "Sürükle ve bırak"
@@ -612,13 +804,13 @@
     "message": "Uygula"
   },
   "app.skins.delete-button": {
-    "message": "Skin'i sil"
+    "message": "Dış görünümü sil"
   },
   "app.skins.delete-modal.description": {
-    "message": "Bu seçilmiş skin'i kalıcı olarak silecektir. Bu işlem geri alınamaz."
+    "message": "Bu işlem seçili dış görünümü kalıcı olarak silecektir. Bu işlem geri alınamaz."
   },
   "app.skins.delete-modal.title": {
-    "message": "Bu skin'i silmek istediğinize gerçekten emin misiniz?"
+    "message": "Bu dış görünümü silmek istediğinden emin misiniz?"
   },
   "app.skins.dropped-file-error.text": {
     "message": "Bıraktığınız dosya okunamadı."
@@ -627,16 +819,16 @@
     "message": "Dosya işlenirken hata oluştu"
   },
   "app.skins.ears-feature-notice": {
-    "message": "Bu skin {ears} modundan özellikler içeriyor"
+    "message": "Bu dış görünüm {ears} modunun özelliklerini kullanıyor"
   },
   "app.skins.edit-button": {
-    "message": "Skin'i düzenle"
+    "message": "Dış görünümü düzenle"
   },
   "app.skins.modal.add-skin-button": {
-    "message": "Skin ekle"
+    "message": "Dış görünüm ekle"
   },
   "app.skins.modal.add-title": {
-    "message": "Skin ekleme"
+    "message": "Dış görünüm ekleniyor"
   },
   "app.skins.modal.arm-style-section": {
     "message": "Kol stili"
@@ -654,10 +846,10 @@
     "message": "Pelerin"
   },
   "app.skins.modal.edit-title": {
-    "message": "Skin düzenleme"
+    "message": "Dış görünüm düzenleniyor"
   },
   "app.skins.modal.make-edit-first-tooltip": {
-    "message": "Önce skin'e bir düzenleme yapın!"
+    "message": "Önce dış görünümde bir düzenleme yapın!"
   },
   "app.skins.modal.no-cape-tooltip": {
     "message": "Pelerin yok"
@@ -669,7 +861,7 @@
     "message": "Dokuyu değiştir"
   },
   "app.skins.modal.save-skin-button": {
-    "message": "Skin'i kaydet"
+    "message": "Dış görünümü kaydet"
   },
   "app.skins.modal.saving-tooltip": {
     "message": "Kaydediliyor..."
@@ -678,25 +870,25 @@
     "message": "Doku"
   },
   "app.skins.modal.upload-skin-first-tooltip": {
-    "message": "İlk başta skin yükleyin!"
+    "message": "Önce bir dış görünüm yükleyin!"
   },
   "app.skins.preview.edit-button": {
-    "message": "Skin'i düzenle"
+    "message": "Dış görünümü düzenle"
   },
   "app.skins.previewing-badge": {
     "message": "Önizleme"
   },
   "app.skins.rate-limit.text": {
-    "message": "Skin'inizi çok hızlı değiştiriyorsunuz. Mojang'ın sunucuları geçici olarak diğer istekleri engelledi. Lütfen tekrar denemeden önce biraz bekleyin."
+    "message": "Dış görünümünüzü çok sık değiştiriyorsunuz. Mojang sunucuları geçici olarak daha fazla isteği engelledi. Lütfen tekrar denemeden önce biraz bekleyin."
   },
   "app.skins.rate-limit.title": {
     "message": "Yavaşla!"
   },
   "app.skins.reorder-error.text": {
-    "message": "Skinini kaydedemedik."
+    "message": "Dış görünüm sıralamanız kaydedilemedi."
   },
   "app.skins.reorder-error.title": {
-    "message": "Skinler sıralanamadı"
+    "message": "Dış görünümler sıralanamadı"
   },
   "app.skins.section.builders-and-biomes": {
     "message": "İnşaatçılar & Biyomlar"
@@ -747,13 +939,13 @@
     "message": "Modrinth appdeki skin yönetim özelliklerini kullanmak için lütfen Minecraft hesabınıza giriş yapın."
   },
   "app.skins.sign-in.rinthbot-alt": {
-    "message": "Heyecanlı Modrinth Bot'u"
+    "message": "Heyecanlı Modrinth Botu"
   },
   "app.skins.sign-in.title": {
     "message": "Lütfen giriş yapın"
   },
   "app.skins.title": {
-    "message": "Skin seçici"
+    "message": "Dış görünüm seçici"
   },
   "app.skins.toggle-ears-features-off": {
     "message": "Kapat"
@@ -761,6 +953,9 @@
   "app.skins.toggle-ears-features-on": {
     "message": "Aç"
   },
+  "app.survey.no-thanks": {
+    "message": "Hayır teşekkürler"
+  },
   "app.update-popup.body.download-complete": {
     "message": "Modrinth App v{version} indirildi. Güncellemek için yeniden başlatın veya Modrinth App’i kapattığınızda otomatik olarak güncellenecektir."
   },
@@ -956,6 +1151,12 @@
   "instance.server-modal.resource-pack": {
     "message": "Kaynak paketi"
   },
+  "instance.settings.sharing.active-invites.actions": {
+    "message": "Eylemler"
+  },
+  "instance.settings.sharing.active-invites.code": {
+    "message": "Davet bağlantısı"
+  },
   "instance.settings.tabs.general": {
     "message": "Genel"
   },
@@ -978,7 +1179,7 @@
     "message": "Kurulurken çoğaltılamaz."
   },
   "instance.settings.tabs.general.duplicate-instance": {
-    "message": "Profili çoğalt"
+    "message": "Kurulumu çoğalt"
   },
   "instance.settings.tabs.general.duplicate-instance.description": {
     "message": "Bu profilin dünyalarını, yapılandırmalarını, modlarını vb. içeren bir kopyasını oluşturur."
@@ -1148,6 +1349,30 @@
   "instance.settings.tabs.window.width.enter": {
     "message": "Genişlik gir..."
   },
+  "instance.shared-instance.network-error.title": {
+    "message": "Bağlantı hatası"
+  },
+  "instance.shared-instance.owner-tooltip": {
+    "message": "Bu kurulumun içeriği diğer kullanıcılarla paylaşılıyor."
+  },
+  "instance.shared-instance.publish-review.added-label": {
+    "message": "Eklendi"
+  },
+  "instance.shared-instance.publish-review.admonition-header": {
+    "message": "Oyunculara güncellemeyi gönder"
+  },
+  "instance.shared-instance.publish-review.config-title-v2": {
+    "message": "Yapılandırma dosyalarını seç"
+  },
+  "instance.shared-instance.publish-review.description": {
+    "message": "İçerik değişikliklerini gözden geçirin ve bu güncellemeye dahil edilecek yapılandırma dosyalarını seçin."
+  },
+  "instance.shared-instance.publish-review.removed-label": {
+    "message": "Kaldırıldı"
+  },
+  "instance.shared-instance.tooltip": {
+    "message": "Bu kurulumun içeriği başka biri tarafından yönetiliyor."
+  },
   "instance.worlds.a_minecraft_server": {
     "message": "Minecraft Sunucusu"
   },
@@ -1232,6 +1457,21 @@
   "minecraft-required.sign-in": {
     "message": "Microsoft'a giriş yap"
   },
+  "modal.modrinth-account-required.cancel-button": {
+    "message": "İptal"
+  },
+  "modal.modrinth-account-required.continue-in-browser-heading": {
+    "message": "Tarayıcında devam et"
+  },
+  "modal.modrinth-account-required.create-account-button": {
+    "message": "Bir hesap oluştur"
+  },
+  "modal.modrinth-account-required.open-browser-again-button": {
+    "message": "Tarayıcıyı yeniden aç"
+  },
+  "modal.modrinth-account-required.signing-in-header": {
+    "message": "Giriş yapılıyor"
+  },
   "search.filter.locked.instance": {
     "message": "Kurulum tarafından sağlanan"
   },
@@ -1242,7 +1482,7 @@
     "message": "Yükleyici veren kurulumlar"
   },
   "search.filter.locked.instance.sync": {
-    "message": "Kurulumla senkronize et"
+    "message": "Kurulum ile eşitle"
   },
   "search.filter.locked.server": {
     "message": "Sunucu tarafından sağlanmıştır"
@@ -1255,5 +1495,11 @@
   },
   "search.filter.locked.server-loader.title": {
     "message": "Yükleyici sunucu tarafından sağlanıyor"
+  },
+  "settings.sidebar.label.account": {
+    "message": "Hesap"
+  },
+  "settings.sidebar.label.display": {
+    "message": "Göster"
   }
 }
diff --git a/apps/app-frontend/src/locales/uk-UA/index.json b/apps/app-frontend/src/locales/uk-UA/index.json
index 5ae8fdafb9..b3b9cd20f6 100644
--- a/apps/app-frontend/src/locales/uk-UA/index.json
+++ b/apps/app-frontend/src/locales/uk-UA/index.json
@@ -89,6 +89,9 @@
   "app.action-bar.install.unknown-instance": {
     "message": "Невідомий профіль"
   },
+  "app.action-bar.install.updating-shared-content": {
+    "message": "Оновлюємо спільний вміст"
+  },
   "app.action-bar.installs": {
     "message": "Установки"
   },
@@ -141,19 +144,19 @@
     "message": "Ваша приватність та як реклама підтримує Modrinth"
   },
   "app.appearance-settings.advanced-rendering.description": {
-    "message": "Умикає розширене промальовування, як-от ефекти розмиття. Вони можуть спричиняти проблеми з продуктивністю без апаратного прискорення."
+    "message": "Умикає візуальні ефекти, як-от розмиття фону. Це може знизити продуктивність без апаратного прискорення."
   },
   "app.appearance-settings.advanced-rendering.title": {
     "message": "Розширене промальовування"
   },
   "app.appearance-settings.color-theme.description": {
-    "message": "Оберіть бажану колірну тему для Modrinth App."
+    "message": "Оберіть тему для Modrinth App."
   },
   "app.appearance-settings.color-theme.title": {
     "message": "Колірна тема"
   },
   "app.appearance-settings.default-landing-page.description": {
-    "message": "Змініть сторінку, на якій відкривається запускач."
+    "message": "Оберіть сторінку, яка показуватиметься при відкритті Modrinth App."
   },
   "app.appearance-settings.default-landing-page.home": {
     "message": "Головна"
@@ -165,49 +168,49 @@
     "message": "Усталена цільова сторінка"
   },
   "app.appearance-settings.hide-nametag.description": {
-    "message": "Вимикає ім'я над вашим гравцем на сторінці скінів."
+    "message": "Приховати ваш нікнейм над попереднім переглядом гравця на сторінці вибору skin."
   },
   "app.appearance-settings.hide-nametag.title": {
     "message": "Приховати ім'я"
   },
   "app.appearance-settings.jump-back-into-worlds.description": {
-    "message": "Уключає нещодавні світи в розділі «Повернутися» на головній сторінці."
+    "message": "Показувати нещодавно зіграні світи в розділі «Повернутися до гри» на головній сторінці."
   },
   "app.appearance-settings.jump-back-into-worlds.title": {
     "message": "Повернутися до світів"
   },
   "app.appearance-settings.minimize-launcher.description": {
-    "message": "Згортає запускач під час запуску процесу Minecraft."
+    "message": "Згортати Modrinth App під час запуску Minecraft."
   },
   "app.appearance-settings.minimize-launcher.title": {
-    "message": "Згортати запускач"
+    "message": "Згортати застосунок"
   },
   "app.appearance-settings.native-decorations.description": {
-    "message": "Використовує рамку системного вікна (необхідно перезапустити застосунок)."
+    "message": "Використовувати заголовок вікна та елементи керування вашої операційної системи. Потребує перезапуску застосунку."
   },
   "app.appearance-settings.native-decorations.title": {
-    "message": "Системне оформлення"
+    "message": "Системна рамка вікна"
   },
   "app.appearance-settings.show-play-time.description": {
-    "message": "Показує, скільки часу ви провели в цьому профілі."
+    "message": "Показувати награний час для кожної збірки."
   },
   "app.appearance-settings.show-play-time.title": {
     "message": "Показати час гри"
   },
   "app.appearance-settings.skip-non-essential-warnings.description": {
-    "message": "Автоматично пропускає низькоризикові підтвердження: установки дубльованих збірок, звичайні видалення вмісту, масові оновлення та запити на відновлення. Попередження з вищим рівнем ризику залишаться."
+    "message": "Пропускати підтвердження для дій із низьким ризиком, як-от дублювання інсталяцій, звичайне видалення вмісту, масові оновлення, відв'язування та відновлення. Попередження про небезпечні показуються завжди."
   },
   "app.appearance-settings.skip-non-essential-warnings.title": {
     "message": "Пропустити несуттєві попередження"
   },
   "app.appearance-settings.toggle-sidebar.description": {
-    "message": "Умикає можливість перемикання бокової панелі."
+    "message": "Приховувати праву бічну панель за замовчуванням і додати кнопку для її показання або приховування."
   },
   "app.appearance-settings.toggle-sidebar.title": {
-    "message": "Перемикання бокової панелі"
+    "message": "Приховати праву бічну панель"
   },
   "app.appearance-settings.unknown-pack-warning.description": {
-    "message": "Якщо ви спробуєте встановити файл пакета Modrinth (.mrpack), який не розміщено на Modrinth, ми переконаємося, що ви розумієте ризики, перш ніж установлювати його."
+    "message": "Показувати попередження про безпеку перед встановленням Modrinth Pack (.mrpack), який не розміщено на Modrinth."
   },
   "app.appearance-settings.unknown-pack-warning.title": {
     "message": "Попереджати мене перед установленням невідомих збірок"
@@ -218,6 +221,15 @@
   "app.auth-servers.unreachable.header": {
     "message": "Не вдається зв’язатися із серверами автентифікації"
   },
+  "app.behavior-settings.confirmations.title": {
+    "message": "Підтвердження"
+  },
+  "app.behavior-settings.content.title": {
+    "message": "Головна та контент"
+  },
+  "app.behavior-settings.startup-and-navigation.title": {
+    "message": "Запуск і навігація"
+  },
   "app.browse.add-servers-to-instance": {
     "message": "Додавання сервера до профілю"
   },
@@ -239,12 +251,18 @@
   "app.browse.back-to-instance": {
     "message": "Назад до профілю"
   },
+  "app.browse.discover-project-type": {
+    "message": "Огляд {projectType}"
+  },
   "app.browse.discover-servers": {
     "message": "Дослідити сервери"
   },
   "app.browse.hide-added-servers": {
     "message": "Приховати вже додані сервери"
   },
+  "app.browse.hide-installed-modpacks": {
+    "message": "Приховати вже встановлені"
+  },
   "app.browse.project-type.modpacks": {
     "message": "Збірки"
   },
@@ -347,6 +365,30 @@
   "app.instance.admonitions.shared-instance.publishing-button": {
     "message": "Публікуємо…"
   },
+  "app.instance.admonitions.shared-instance.removed-label": {
+    "message": "Видалено"
+  },
+  "app.instance.admonitions.shared-instance.review-admonition-header": {
+    "message": "Публікація оновлення"
+  },
+  "app.instance.admonitions.shared-instance.review-description": {
+    "message": "Переглянути зміни вмісту, які застосуються для всіх, хто використовує цей профіль."
+  },
+  "app.instance.admonitions.shared-instance.review-header": {
+    "message": "Огляд змін"
+  },
+  "app.instance.admonitions.shared-instance.review-update-button": {
+    "message": "Переглянути оновлення"
+  },
+  "app.instance.admonitions.shared-instance.reviewing-button": {
+    "message": "Оглядаємо…"
+  },
+  "app.instance.admonitions.shared-instance.update-available-body": {
+    "message": "Для гри в {name} потрібне оновлення. Будь ласка, оновіть до найновішої версії, щоб запустити гру."
+  },
+  "app.instance.admonitions.shared-instance.update-available-header": {
+    "message": "Доступне оновлення"
+  },
   "app.instance.confirm-delete.admonition-body": {
     "message": "Усі дані вашого профілю будуть видалені назавжди, включно з вашими світами, налаштуваннями та всім установленим умістом."
   },
@@ -413,15 +455,33 @@
   "app.instance.share.invite-modal.heading": {
     "message": "Поділитися {name}"
   },
+  "app.instance.share.invite-modal.user-limit-reached": {
+    "message": "Ця збірка досягла ліміту в {limit} користувачів."
+  },
   "app.instance.share.locked.empty-description-prefix": {
     "message": "Ви повинні ввійти як"
   },
+  "app.instance.share.locked.empty-description-suffix": {
+    "message": "для отримання доступу до цієї сторінки."
+  },
+  "app.instance.share.locked.linked-account-fallback": {
+    "message": "прив'язаний обліковий запис"
+  },
+  "app.instance.share.locked.signed-out-heading": {
+    "message": "Вхід не виконано"
+  },
   "app.instance.share.locked.switch-account-button": {
     "message": "Змінити обліковий запис"
   },
   "app.instance.share.locked.wrong-account-heading": {
     "message": "Неправильний обліковий запис"
   },
+  "app.instance.share.members.empty": {
+    "message": "Жоден користувач ще не приєднався"
+  },
+  "app.instance.share.members.no-filter-results": {
+    "message": "Жоден користувач не відповідає вашим фільтрам."
+  },
   "app.instance.share.remove-user-modal.effect-access": {
     "message": "Він більше не зможе отримувати оновлення для цього спільного профілю"
   },
@@ -452,9 +512,18 @@
   "app.instance.share.sign-in.button": {
     "message": "Увійти"
   },
+  "app.instance.share.unable-to-connect.description": {
+    "message": "Сервіс спільних збірок наразі недоступний, будь ласка, спробуйте пізніше"
+  },
+  "app.instance.share.unable-to-connect.heading": {
+    "message": "Не вдалося під'єднатися"
+  },
   "app.instance.share.unlink.body": {
     "message": "Ви повинні від'єднати цю збірку, аби поділитися своїм профілем"
   },
+  "app.instance.share.unlink.header": {
+    "message": "Спільний доступ вимагає відв'язування"
+  },
   "app.instance.shared-instance-already-installed.body": {
     "message": "Цей спільний профіль уже встановлено як <bold>{instanceName}</bold>. Дійсно встановити ще одну копію?"
   },
@@ -464,12 +533,24 @@
   "app.instance.shared-instance-already-installed.install-anyway": {
     "message": "Усе одно встановити"
   },
+  "app.instance.shared-instance-already-installed.instance": {
+    "message": "Збірка"
+  },
+  "app.instance.shared-instance-wrong-account.fallback-username": {
+    "message": "пов'язаний обліковий запис"
+  },
+  "app.instance.shared-instance-wrong-account.owner-admonition-body-v2": {
+    "message": "для керування цією спільною збіркою. Ви не зможете надсилати оновлення користувачам."
+  },
   "app.instance.shared-instance-wrong-account.sign-in-as-label": {
     "message": "Увійти як"
   },
   "app.instance.shared-instance-wrong-account.signed-out-header": {
     "message": "Ви повинні ввійти в Modrinth"
   },
+  "app.instance.shared-instance-wrong-account.user-admonition-body-v2": {
+    "message": "щоб отримувати оновлення для цієї спільної збірки."
+  },
   "app.instance.shared-instance-wrong-account.warning-header": {
     "message": "Ви використовуєте не той обліковий запис Modrinth"
   },
@@ -524,12 +605,60 @@
   "app.instance.worlds.search-worlds-placeholder": {
     "message": "Пошук {count} світів…"
   },
+  "app.java-detection.cancel": {
+    "message": "Скасувати"
+  },
+  "app.java-detection.columns.actions": {
+    "message": "Дії"
+  },
+  "app.java-detection.columns.path": {
+    "message": "Шлях"
+  },
+  "app.java-detection.columns.version": {
+    "message": "Версія"
+  },
+  "app.java-detection.no-installations-found": {
+    "message": "Не знайдено встановленої Java."
+  },
+  "app.java-detection.select": {
+    "message": "Обрати"
+  },
+  "app.java-detection.selected": {
+    "message": "Обрано"
+  },
+  "app.java-detection.title": {
+    "message": "Виберіть версію Java"
+  },
+  "app.java-selector.already-installed": {
+    "message": "Уже встановлено"
+  },
+  "app.java-selector.browse": {
+    "message": "Огляд"
+  },
+  "app.java-selector.detect": {
+    "message": "Виявити"
+  },
+  "app.java-selector.install-recommended": {
+    "message": "Установити рекомендоване"
+  },
+  "app.java-selector.installing": {
+    "message": "Установлюємо…"
+  },
+  "app.java-selector.path.placeholder": {
+    "message": "/шлях/до/java"
+  },
+  "app.java-selector.test-installation": {
+    "message": "Протестувати інсталяцію Java"
+  },
   "app.modal.install-to-play.additional-context": {
     "message": "Додатковий контекст"
   },
   "app.modal.install-to-play.additional-context-placeholder": {
     "message": "Надайте посилання та зображення, які стосуються скарги"
   },
+  "app.modal.install-to-play.block-user": {
+    "message": "Заблокувати користувача"
+  },
   "app.modal.install-to-play.content-you-are-reporting": {
     "message": "Профіль, на який скаржитеся"
   },
@@ -551,15 +680,24 @@
   "app.modal.install-to-play.invite-warning": {
     "message": "Це запрошення створив інший користувач Modrinth, не сам Modrinth. Приймайте запрошення лише від тих людей, яким довіряєте."
   },
+  "app.modal.install-to-play.invite-warning-with-creator": {
+    "message": "Це запрошення створив користувач <creator>{username}</creator>, не Modrinth. Приймайте запрошення лише від людей, яким довіряєте."
+  },
   "app.modal.install-to-play.mod-count": {
     "message": "{count, plural, one {# мод} few {# мода} other {# модів}}"
   },
   "app.modal.install-to-play.report-description": {
     "message": "Використайте цю форму, аби поскаржитися на профілі, які можуть порушувати наші <rules-link>правила</rules-link> чи <terms-link>умови використання</terms-link>."
   },
+  "app.modal.install-to-play.report-image-invalid-type": {
+    "message": "Тип файлу зображення не підтримується"
+  },
   "app.modal.install-to-play.report-image-too-large": {
     "message": "Файл перевищує обмеження розміру в 1 МіБ"
   },
+  "app.modal.install-to-play.report-legal-claims": {
+    "message": "Для повідомлень щодо DMCA або інших юридичних претензій ознайомтеся з <copyright-link>Copyright Policy</copyright-link>."
+  },
   "app.modal.install-to-play.report-reason": {
     "message": "Яке правило порушує цей профіль?"
   },
@@ -602,6 +740,9 @@
   "app.modal.install-to-play.unrecognized-files": {
     "message": "Нерозпізнані файли"
   },
+  "app.modal.install-to-play.user-blocked": {
+    "message": "Користувача заблоковано"
+  },
   "app.modal.install-to-play.view-contents": {
     "message": "Дивитися вміст"
   },
@@ -626,6 +767,39 @@
   "app.modal.update-to-play.update-required": {
     "message": "Необхідне оновлення"
   },
+  "app.modal.update-to-play.update-required-description": {
+    "message": "Для гри в {name} потрібне оновлення. Будь ласка, оновіть до найновішої версії, щоб запустити гру."
+  },
+  "app.nav.create-new-instance": {
+    "message": "Створити новий профіль"
+  },
+  "app.nav.home": {
+    "message": "Головна"
+  },
+  "app.nav.library": {
+    "message": "Бібліотека"
+  },
+  "app.nav.modrinth-account": {
+    "message": "Обліковий запис Modrinth"
+  },
+  "app.nav.modrinth-hosting": {
+    "message": "Хостинг Modrinth"
+  },
+  "app.nav.sign-in-to-modrinth-account": {
+    "message": "Увійти в обліковий запис Modrinth"
+  },
+  "app.nav.signed-in-as": {
+    "message": "Вхід виконано як <user>{username}</user>"
+  },
+  "app.nav.upgrade-to-modrinth-plus": {
+    "message": "Оновити до Modrinth+"
+  },
+  "app.news.title": {
+    "message": "Новини"
+  },
+  "app.news.view-all": {
+    "message": "Переглянути всі новини"
+  },
   "app.project.install-button.already-installed": {
     "message": "Проєкт уже встановлено"
   },
@@ -635,6 +809,9 @@
   "app.project.install-context.back-to-browse": {
     "message": "Повернутися до дослідження"
   },
+  "app.project.install-context.back-to-instance": {
+    "message": "Повернутися до збірки"
+  },
   "app.project.version.all-versions": {
     "message": "Усі версії"
   },
@@ -647,20 +824,188 @@
   "app.project.versions.already-installed": {
     "message": "Уже встановлено"
   },
+  "app.quick-instance-switcher.drag-show-tooltip": {
+    "message": "Перетягніть, щоб показати нещодавні збірки"
+  },
+  "app.quick-instance-switcher.drag-tooltip": {
+    "message": "Перетягніть, щоб змінити розмір"
+  },
+  "app.restarting": {
+    "message": "Перезапуск..."
+  },
+  "app.settings.app-version": {
+    "message": "Modrinth App {version}"
+  },
+  "app.settings.default-instance-options.environment-variables.description": {
+    "message": "Змінні середовища встановлюються, коли профіль запускається."
+  },
+  "app.settings.default-instance-options.environment-variables.placeholder": {
+    "message": "Уведіть змінні середовища…"
+  },
+  "app.settings.default-instance-options.environment-variables.title": {
+    "message": "Змінні середовища"
+  },
+  "app.settings.default-instance-options.fullscreen.description": {
+    "message": "Запускати збірки в повноекранному режимі шляхом оновлення їхнього файлу options.txt."
+  },
+  "app.settings.default-instance-options.fullscreen.title": {
+    "message": "Повний екран"
+  },
+  "app.settings.default-instance-options.height.description": {
+    "message": "Висота ігрового вікна під час запуску."
+  },
+  "app.settings.default-instance-options.height.placeholder": {
+    "message": "Уведіть висоту…"
+  },
+  "app.settings.default-instance-options.height.title": {
+    "message": "Висота"
+  },
+  "app.settings.default-instance-options.java-arguments.description": {
+    "message": "Аргументи передаються Java, коли запускається профіль."
+  },
+  "app.settings.default-instance-options.java-arguments.placeholder": {
+    "message": "Уведіть аргументи Java…"
+  },
+  "app.settings.default-instance-options.java-arguments.title": {
+    "message": "Аргументи Java"
+  },
+  "app.settings.default-instance-options.memory-allocation.description": {
+    "message": "Максимальна кількість памʼяті для кожного профілю."
+  },
+  "app.settings.default-instance-options.memory-allocation.title": {
+    "message": "Виділення памʼяті"
+  },
+  "app.settings.default-instance-options.post-exit-hook.description": {
+    "message": "Запускається після закриття гри."
+  },
+  "app.settings.default-instance-options.post-exit-hook.placeholder": {
+    "message": "Введіть команду після виходу..."
+  },
+  "app.settings.default-instance-options.post-exit-hook.title": {
+    "message": "Команда після виходу"
+  },
+  "app.settings.default-instance-options.pre-launch-hook.description": {
+    "message": "Запускається перед відкриттям профілю."
+  },
+  "app.settings.default-instance-options.pre-launch-hook.placeholder": {
+    "message": "Введіть команду перед запуском..."
+  },
+  "app.settings.default-instance-options.pre-launch-hook.title": {
+    "message": "Команда перед запуском"
+  },
+  "app.settings.default-instance-options.width.description": {
+    "message": "Ширина ігрового вікна під час запуску."
+  },
+  "app.settings.default-instance-options.width.placeholder": {
+    "message": "Уведіть ширину…"
+  },
+  "app.settings.default-instance-options.width.title": {
+    "message": "Ширина"
+  },
+  "app.settings.default-instance-options.wrapper-hook.description": {
+    "message": "Команда, що використовується для обгортки процесу запуску Minecraft."
+  },
+  "app.settings.default-instance-options.wrapper-hook.placeholder": {
+    "message": "Введіть команду обгортки..."
+  },
+  "app.settings.default-instance-options.wrapper-hook.title": {
+    "message": "Команда обгортки"
+  },
+  "app.settings.developer-mode-button.label": {
+    "message": "Перемикнути режим розробника"
+  },
   "app.settings.developer-mode-enabled": {
     "message": "Увімкнено режим розробника."
   },
   "app.settings.downloading": {
     "message": "Завантаження v{version}"
   },
+  "app.settings.java-installations.location.title": {
+    "message": "Розташування Java {version, number}"
+  },
+  "app.settings.operating-system.macos": {
+    "message": "macOS"
+  },
   "app.settings.privacy.ads-consent.intro": {
     "message": "Реклама підтримує існування Modrinth та фінансує виплати творцям. Наші партнери можуть зберігати та отримувати доступ до cookie в застосунку, аби персоналізувати рекламу та збирати метрики. Ви можете відмовитися від них або керувати налаштуваннями нижче."
   },
+  "app.settings.privacy.discord-rich-presence.description": {
+    "message": "Показувати Modrinth App як вашу поточну активність у Discord. Це не впливає на Rich Presence, доданий до збірок модами. Потребує перезапуску застосунку."
+  },
+  "app.settings.privacy.discord-rich-presence.title": {
+    "message": "Discord Rich Presence"
+  },
+  "app.settings.privacy.telemetry.description": {
+    "message": "Modrinth збирає анонімізовану аналітику та дані про використання для покращення зручності та адаптації сервісу. Вимкнувши цю опцію, ви відмовляєтеся від збору, і ваші дані більше не збиратимуться."
+  },
+  "app.settings.privacy.telemetry.title": {
+    "message": "Телеметрія"
+  },
+  "app.settings.resource-management.always-show-copy-details.description": {
+    "message": "Показувати кнопку «Копіювати деталі», коли встановлення перебуває в черзі або виконується. Вона завжди доступна для невдалих або перерваних встановлень."
+  },
+  "app.settings.resource-management.always-show-copy-details.title": {
+    "message": "Завжди показувати деталі копіювання"
+  },
+  "app.settings.resource-management.app-cache.confirm.description": {
+    "message": "Застосунок може завантажуватися повільніше, поки кеш не відновиться."
+  },
+  "app.settings.resource-management.app-cache.confirm.title": {
+    "message": "Очистити кеш?"
+  },
+  "app.settings.resource-management.app-cache.description": {
+    "message": "Очистити кешовані дані та завантажити їх знову з Modrinth. Застосунок може завантажуватися повільніше, поки кеш відновиться."
+  },
+  "app.settings.resource-management.app-cache.purge": {
+    "message": "Очистити кеш"
+  },
+  "app.settings.resource-management.app-cache.title": {
+    "message": "Кеш застосунку"
+  },
+  "app.settings.resource-management.app-database-backups.description": {
+    "message": "Резервні копії важливих даних застосунку зберігаються тут на випадок, якщо вам знадобиться відновити їх пізніше."
+  },
+  "app.settings.resource-management.app-database-backups.open-folder": {
+    "message": "Відкрити теку резервних копій"
+  },
+  "app.settings.resource-management.app-database-backups.title": {
+    "message": "Резервні копії бази даних застосунку"
+  },
+  "app.settings.resource-management.app-directory.browse": {
+    "message": "Оглянути каталог застосунку"
+  },
+  "app.settings.resource-management.app-directory.description": {
+    "message": "Де Modrinth App зберігає збірки та інші файли. Зміни набудуть чинності після перезапуску застосунку."
+  },
+  "app.settings.resource-management.app-directory.select": {
+    "message": "Вибрати новий каталог застосунку"
+  },
+  "app.settings.resource-management.app-directory.title": {
+    "message": "Каталог застосунку"
+  },
+  "app.settings.resource-management.maximum-concurrent-downloads.description": {
+    "message": "Кількість файлів, які застосунок може завантажувати одночасно. Зменште це значення, якщо завантаження нестабільне на вашому з'єднанні. Потребує перезапуску застосунку."
+  },
+  "app.settings.resource-management.maximum-concurrent-downloads.title": {
+    "message": "Максимум одночасних завантажень"
+  },
+  "app.settings.resource-management.maximum-concurrent-writes.description": {
+    "message": "Кількість файлів, які застосунок може записувати на диск одночасно. Зменште це значення, якщо ви часто стикаєтеся з помилками вводу-виводу I/O. Потребує перезапуску застосунку."
+  },
+  "app.settings.resource-management.maximum-concurrent-writes.title": {
+    "message": "Максимум одночасних записів"
+  },
+  "app.settings.sidebar.label.instances": {
+    "message": "Збірки"
+  },
   "app.settings.tabs.appearance": {
     "message": "Вигляд"
   },
+  "app.settings.tabs.behavior": {
+    "message": "Поведінка"
+  },
   "app.settings.tabs.default-instance-options": {
-    "message": "Усталені налашт. профілю"
+    "message": "Стандартні параметри гри"
   },
   "app.settings.tabs.java-installations": {
     "message": "Інсталяції Java"
@@ -674,6 +1019,9 @@
   "app.settings.tabs.resource-management": {
     "message": "Керування ресурсами"
   },
+  "app.sidebar.playing-as": {
+    "message": "Грає як"
+  },
   "app.skins.add-button": {
     "message": "Додати скін"
   },
@@ -833,6 +1181,21 @@
   "app.skins.toggle-ears-features-on": {
     "message": "Увімкнути"
   },
+  "app.survey.body": {
+    "message": "Не бажаєте відповісти на кілька запитань про ваш досвід користування Modrinth App?"
+  },
+  "app.survey.footer": {
+    "message": "Цей відгук надійде безпосередньо команді Modrinth і допоможе у створенні майбутніх оновлень!"
+  },
+  "app.survey.no-thanks": {
+    "message": "Ні, дякую"
+  },
+  "app.survey.take-survey": {
+    "message": "Пройти опитування"
+  },
+  "app.survey.title": {
+    "message": "Привіт, користувачу Modrinth!"
+  },
   "app.update-popup.body.download-complete": {
     "message": "Modrinth App v{version} завантажено. Перезапустіть, щоб оновити зараз, або це відбудеться автоматично після закриття застосунку."
   },
@@ -881,18 +1244,39 @@
   "app.world.world-item.players-online": {
     "message": "{count} у мережі"
   },
+  "content.shared-instance.change-version-body": {
+    "message": "Зміна версії впливає лише на вашу локальну копію. Майбутні оновлення спільної збірки можуть відновити або знову змінити її."
+  },
+  "content.shared-instance.delete-bulk-body": {
+    "message": "Деякі вибрані проєкти є частиною спільної збірки. Видалення вплине лише на вашу локальну копію, а майбутні оновлення спільної збірки можуть відновити або знову змінити їх."
+  },
   "content.shared-instance.delete-button": {
     "message": "Усе одно видалити"
   },
   "content.shared-instance.delete-many-button": {
     "message": "Усе одно видалити {count, plural, one {# проєкт} few {# проєкти} many {# проєктів} other {# проєкту}}"
   },
+  "content.shared-instance.delete-single-body": {
+    "message": "Видалення вплине лише на вашу локальну копію. Майбутні оновлення спільної збірки можуть відновити або знову змінити її."
+  },
+  "content.shared-instance.disable-bulk-body": {
+    "message": "Деякі вибрані проєкти є частиною спільної збірки. Вимкнення вплине лише на вашу локальну копію, а майбутні оновлення спільної збірки можуть знову ввімкнути, відновити або змінити їх."
+  },
   "content.shared-instance.disable-button": {
     "message": "Усе одно вимкнути"
   },
   "content.shared-instance.disable-many-button": {
     "message": "Усе одно вимкнути {count, plural, one {# проєкт} few {# проєкти} many {# проєктів} other {# проєкту}}"
   },
+  "content.shared-instance.disable-single-body": {
+    "message": "Вимкнення вплине лише на вашу локальну копію. Майбутні оновлення спільної збірки можуть знову ввімкнути, відновити або змінити її."
+  },
+  "content.shared-instance.unlink-body": {
+    "message": "Відв'язування вплине лише на вашу локальну копію. Майбутні оновлення спільної збірки можуть відновити або знову змінити її."
+  },
+  "content.shared-instance.warning-header": {
+    "message": "Це частина спільної збірки"
+  },
   "friends.action.add-friend": {
     "message": "Додати друга"
   },
@@ -956,6 +1340,48 @@
   "friends.sign-in-to-add-friends": {
     "message": "<link>Увійдіть в обліковий запис Modrinth</link>, щоб додати друзів і бачити, у що вони грають!"
   },
+  "installation-settings.shared-instance.linked-title": {
+    "message": "Пов'язана спільна збірка"
+  },
+  "installation-settings.shared-instance.title": {
+    "message": "Скасувати публікацію збірки"
+  },
+  "installation-settings.shared-instance.unlink-button": {
+    "message": "Відв'язати спільну збірку"
+  },
+  "installation-settings.shared-instance.unlink-description": {
+    "message": "Від'єднати цю локальну збірку від майбутніх спільних оновлень."
+  },
+  "installation-settings.shared-instance.unlinking-button": {
+    "message": "Відв'язування..."
+  },
+  "installation-settings.shared-instance.unpublish-button": {
+    "message": "Скасувати публікацію спільної збірки"
+  },
+  "installation-settings.shared-instance.unpublish-description": {
+    "message": "Видалити цю спільну збірку з Modrinth і припинити надсилати оновлення всім, хто нею користується. Це не вплине на вашу локальну збірку."
+  },
+  "installation-settings.shared-instance.unpublishing-button": {
+    "message": "Скасування публікації..."
+  },
+  "installation-settings.unlink-shared-instance.modal.admonition-body": {
+    "message": "Це вплине лише на вашу локальну збірку. Встановлений вміст залишиться на цьому пристрої, а спільна збірка та інші користувачі не зазнають змін."
+  },
+  "installation-settings.unlink-shared-instance.modal.admonition-header": {
+    "message": "Відв'язування спільної збірки"
+  },
+  "installation-settings.unlink-shared-instance.modal.header": {
+    "message": "Відв'язати спільну збірку"
+  },
+  "installation-settings.unpublish-shared-instance.modal.admonition-body": {
+    "message": "Це видалить спільну збірку з серверів Modrinth. Користувачі Modrinth App припинять отримувати оновлення, але ваша локальна збірка та її вміст залишаться на цьому пристрої."
+  },
+  "installation-settings.unpublish-shared-instance.modal.admonition-header": {
+    "message": "Скасування публікації спільної збірки"
+  },
+  "installation-settings.unpublish-shared-instance.modal.header": {
+    "message": "Скасувати публікацію спільної збірки"
+  },
   "instance.action.create-shortcut": {
     "message": "Створити ярлик"
   },
@@ -1025,6 +1451,12 @@
   "instance.files.save-as": {
     "message": "Зберегти як..."
   },
+  "instance.locked.delete-button": {
+    "message": "Видалити збірку"
+  },
+  "instance.locked.play-tooltip": {
+    "message": "Цю збірку заблоковано"
+  },
   "instance.playtime.never-played": {
     "message": "Не запускався"
   },
@@ -1040,6 +1472,45 @@
   "instance.server-modal.resource-pack": {
     "message": "Пакет ресурсів"
   },
+  "instance.settings.sharing.active-invites.actions": {
+    "message": "Дії"
+  },
+  "instance.settings.sharing.active-invites.code": {
+    "message": "Посилання для запрошення"
+  },
+  "instance.settings.sharing.active-invites.description": {
+    "message": "Будь-хто з цим посиланням-запрошенням може приєднатися, поки воно залишається активним."
+  },
+  "instance.settings.sharing.active-invites.empty": {
+    "message": "Немає активних запрошень."
+  },
+  "instance.settings.sharing.active-invites.expires": {
+    "message": "Чинний до"
+  },
+  "instance.settings.sharing.active-invites.revoke": {
+    "message": "Відкликати запрошення"
+  },
+  "instance.settings.sharing.active-invites.revoke-with-code": {
+    "message": "Відкликати запрошення {code}"
+  },
+  "instance.settings.sharing.active-invites.title": {
+    "message": "Активні запрошення"
+  },
+  "instance.settings.sharing.active-invites.uses": {
+    "message": "Кількість використань"
+  },
+  "instance.settings.sharing.revoke-invite.admonition-body": {
+    "message": "Посилання для запрошення <monospace>{code}</monospace> негайно припинить діяти. Люди, які вже приєдналися, збережуть доступ."
+  },
+  "instance.settings.sharing.revoke-invite.admonition-header": {
+    "message": "Цю дію неможливо скасувати"
+  },
+  "instance.settings.sharing.revoke-invite.confirm": {
+    "message": "Відкликати запрошення"
+  },
+  "instance.settings.sharing.revoke-invite.header": {
+    "message": "Відкликати запрошення"
+  },
   "instance.settings.tabs.general": {
     "message": "Загальні"
   },
@@ -1163,6 +1634,9 @@
   "instance.settings.tabs.installation.loader-version": {
     "message": "Версія {loader}"
   },
+  "instance.settings.tabs.installation.locked": {
+    "message": "Налаштування інсталяції недоступні, поки ця збірка заблокована."
+  },
   "instance.settings.tabs.java": {
     "message": "Java та пам’ять"
   },
@@ -1202,6 +1676,9 @@
   "instance.settings.tabs.java.java-path-placeholder": {
     "message": "/шлях/до/java"
   },
+  "instance.settings.tabs.sharing": {
+    "message": "Спільний доступ"
+  },
   "instance.settings.tabs.window": {
     "message": "Вікно"
   },
@@ -1235,6 +1712,15 @@
   "instance.shared-instance.error.title": {
     "message": "Щось пішло не так"
   },
+  "instance.shared-instance.network-error.text": {
+    "message": "Не вдалося під'єднатися до API спільних збірок"
+  },
+  "instance.shared-instance.network-error.title": {
+    "message": "Помилка мережі"
+  },
+  "instance.shared-instance.owner-tooltip": {
+    "message": "Вміст цієї збірки надається іншим користувачам."
+  },
   "instance.shared-instance.publish-review.added-label": {
     "message": "Додано"
   },
@@ -1265,9 +1751,15 @@
   "instance.shared-instance.unavailable.deleted-text": {
     "message": "Основний профіль видалено. Цей профіль досі доступний, але вже не прив'язаний та не отримуватиме оновлення."
   },
+  "instance.shared-instance.unavailable.locked-text": {
+    "message": "Цю спільну збірку було заблоковано командою модерації контенту. Вона більше не отримуватиме оновлень від основної збірки та не може бути запущена."
+  },
   "instance.shared-instance.unavailable.locked-title": {
     "message": "Профіль заблоковано"
   },
+  "instance.shared-instance.unavailable.manager-fallback": {
+    "message": "менеджер збірки"
+  },
   "instance.shared-instance.unavailable.text": {
     "message": "Ваш локальний профіль досі доступний, але вже не прив'язаний та не отримуватиме оновлення."
   },
@@ -1364,6 +1856,9 @@
   "modal.modrinth-account-required.cancel-button": {
     "message": "Скасувати"
   },
+  "modal.modrinth-account-required.continue-in-browser-heading": {
+    "message": "Продовжити у браузері"
+  },
   "modal.modrinth-account-required.create-account-button": {
     "message": "Створити обліковий запис"
   },
@@ -1414,5 +1909,11 @@
   },
   "search.filter.locked.server-loader.title": {
     "message": "Завантажувач наданий сервером"
+  },
+  "settings.sidebar.label.account": {
+    "message": "Обліковий запис"
+  },
+  "settings.sidebar.label.display": {
+    "message": "Дисплей"
   }
 }
diff --git a/apps/app-frontend/src/locales/vi-VN/index.json b/apps/app-frontend/src/locales/vi-VN/index.json
index 7e69708076..480de3cc76 100644
--- a/apps/app-frontend/src/locales/vi-VN/index.json
+++ b/apps/app-frontend/src/locales/vi-VN/index.json
@@ -134,21 +134,12 @@
   "app.ads-consent.title": {
     "message": "Quyền riêng tư của bạn và cách quảng cáo hỗ trợ Modrinth"
   },
-  "app.appearance-settings.advanced-rendering.description": {
-    "message": "Kích hoạt các tính năng dựng hình nâng cao như hiệu ứng làm mờ, có thể gây giảm hiệu năng nếu không có chế độ tăng tốc phần cứng."
-  },
   "app.appearance-settings.advanced-rendering.title": {
     "message": "Dựng hình nâng cao"
   },
-  "app.appearance-settings.color-theme.description": {
-    "message": "Chọn màu nền ưu thích của bạn cho Modrinth App."
-  },
   "app.appearance-settings.color-theme.title": {
     "message": "Màu chủ đề"
   },
-  "app.appearance-settings.default-landing-page.description": {
-    "message": "Thay đổi trang hiển thị khi khởi chạy launcher."
-  },
   "app.appearance-settings.default-landing-page.home": {
     "message": "Trang chủ"
   },
@@ -158,51 +149,18 @@
   "app.appearance-settings.default-landing-page.title": {
     "message": "Trang mặc định"
   },
-  "app.appearance-settings.hide-nametag.description": {
-    "message": "Tắt hiển thị thẻ tên phía trên người chơi ở trang skin."
-  },
   "app.appearance-settings.hide-nametag.title": {
     "message": "Ẩn thẻ tên"
   },
-  "app.appearance-settings.jump-back-into-worlds.description": {
-    "message": "Hiển thị các thế giới gần đây trong mục \"Tiếp tục chơi\" ở Trang chủ."
-  },
   "app.appearance-settings.jump-back-into-worlds.title": {
     "message": "Tiếp tục chơi"
   },
-  "app.appearance-settings.minimize-launcher.description": {
-    "message": "Thu nhỏ launcher khi game Minecraft bắt đầu chạy."
-  },
-  "app.appearance-settings.minimize-launcher.title": {
-    "message": "Thu nhỏ launcher"
-  },
-  "app.appearance-settings.native-decorations.description": {
-    "message": "Sử dụng khung cửa sổ hệ thống (yêu cầu khởi động lại ứng dụng)."
-  },
-  "app.appearance-settings.native-decorations.title": {
-    "message": "Giao diện cửa sổ hệ thống"
-  },
-  "app.appearance-settings.show-play-time.description": {
-    "message": "Hiển thị thời gian bạn đã dành để chơi bằng một cấu hình."
-  },
   "app.appearance-settings.show-play-time.title": {
     "message": "Hiện thời gian chơi"
   },
-  "app.appearance-settings.skip-non-essential-warnings.description": {
-    "message": "Tự động bỏ qua các bước xác nhận rủi ro thấp như cài đặt gói mod trùng lặp, xóa nội dung thông thường, cập nhật hàng loạt, hủy liên kết gói mod và lời nhắc sửa chữa. Các cảnh báo nguy hiểm vẫn sẽ được hiển thị."
-  },
   "app.appearance-settings.skip-non-essential-warnings.title": {
     "message": "Bỏ qua các cảnh báo không quan trọng"
   },
-  "app.appearance-settings.toggle-sidebar.description": {
-    "message": "Bật tính năng ẩn hiển thị thanh menu bên."
-  },
-  "app.appearance-settings.toggle-sidebar.title": {
-    "message": "Ẩn/hiện thanh bên"
-  },
-  "app.appearance-settings.unknown-pack-warning.description": {
-    "message": "Nếu bạn cố gắng cài đặt tệp Modrinth Pack (.mrpack) không được lưu trữ trên máy chủ Modrinth, chúng tôi sẽ đảm bảo bạn hiểu rõ các rủi ro trước khi cài đặt."
-  },
   "app.appearance-settings.unknown-pack-warning.title": {
     "message": "Cảnh báo tôi trước khi cài đặt các modpacks không rõ nguồn gốc"
   },
@@ -446,9 +404,6 @@
   "app.settings.tabs.appearance": {
     "message": "Giao diện"
   },
-  "app.settings.tabs.default-instance-options": {
-    "message": "Tuỳ chọn hồ sơ khởi chạy mặc định"
-  },
   "app.settings.tabs.java-installations": {
     "message": "Các bản cài Java"
   },
diff --git a/apps/app-frontend/src/locales/zh-CN/index.json b/apps/app-frontend/src/locales/zh-CN/index.json
index 64cea71744..c6f14d0b9b 100644
--- a/apps/app-frontend/src/locales/zh-CN/index.json
+++ b/apps/app-frontend/src/locales/zh-CN/index.json
@@ -42,7 +42,7 @@
     "message": "无法下载文件"
   },
   "app.action-bar.install.summary.corrupt-download": {
-    "message": "下载的文件是损坏的"
+    "message": "下载的文件已损坏"
   },
   "app.action-bar.install.summary.could-not-save-files": {
     "message": "无法保存文件"
@@ -69,16 +69,16 @@
     "message": "加载器配置失败"
   },
   "app.action-bar.install.summary.local-data-error": {
-    "message": "无法更新本地的数据"
+    "message": "无法更新本地数据"
   },
   "app.action-bar.install.summary.minecraft-setup-failed": {
     "message": "Minecraft 配置失败"
   },
   "app.action-bar.install.summary.modrinth-unreachable": {
-    "message": "无法连接Modrinth"
+    "message": "无法连接 Modrinth"
   },
   "app.action-bar.install.summary.no-write-permission": {
-    "message": "没有写入的权限"
+    "message": "没有写入权限"
   },
   "app.action-bar.install.summary.pack-download-failed": {
     "message": "无法下载整合包"
@@ -108,7 +108,7 @@
     "message": "主实例"
   },
   "app.action-bar.reload-to-update": {
-    "message": "重新加载以更新"
+    "message": "重启以完成更新"
   },
   "app.action-bar.show-more-running-instances": {
     "message": "显示更多运行中的实例"
@@ -156,7 +156,7 @@
     "message": "色彩主题"
   },
   "app.appearance-settings.default-landing-page.description": {
-    "message": "更改启动器打开的页面。"
+    "message": "选择 Modrinth App 启动时显示的页面。"
   },
   "app.appearance-settings.default-landing-page.home": {
     "message": "首页"
@@ -168,7 +168,7 @@
     "message": "默认起始页"
   },
   "app.appearance-settings.hide-nametag.description": {
-    "message": "在皮肤页面中禁用你玩家头顶上的名牌。"
+    "message": "在皮肤选择器页面的玩家预览上隐藏用户名。"
   },
   "app.appearance-settings.hide-nametag.title": {
     "message": "隐藏名牌"
@@ -180,16 +180,16 @@
     "message": "快速回到世界"
   },
   "app.appearance-settings.minimize-launcher.description": {
-    "message": "当 Minecraft 进程启动时，将启动器最小化。"
+    "message": "当 Minecraft 进程启动时，将 Modrinth App 最小化。"
   },
   "app.appearance-settings.minimize-launcher.title": {
     "message": "最小化启动器"
   },
   "app.appearance-settings.native-decorations.description": {
-    "message": "使用系统窗口边框（需要重启应用）。"
+    "message": "使用操作系统的标题栏和窗口控件。需要重启应用。"
   },
   "app.appearance-settings.native-decorations.title": {
-    "message": "原生窗口"
+    "message": "系统窗口框架"
   },
   "app.appearance-settings.show-play-time.description": {
     "message": "显示你在每个实例中游玩的时间。"
@@ -204,13 +204,13 @@
     "message": "跳过非必要的警告"
   },
   "app.appearance-settings.toggle-sidebar.description": {
-    "message": "启用切换侧边栏的功能。"
+    "message": "默认隐藏右侧边栏，并添加一个按钮来显示或隐藏它。"
   },
   "app.appearance-settings.toggle-sidebar.title": {
-    "message": "切换侧边栏"
+    "message": "隐藏右侧边栏"
   },
   "app.appearance-settings.unknown-pack-warning.description": {
-    "message": "如果你尝试安装一个未托管在 Modrinth 上的 Modrinth 整合包文件（.mrpack），我们会确保你在安装之前了解相关风险。"
+    "message": "在安装非 Modrinth 托管的 Modrinth 整合包文件 (.mrpack) 前显示安全警告。"
   },
   "app.appearance-settings.unknown-pack-warning.title": {
     "message": "安装未知整合包前提醒我"
@@ -221,8 +221,17 @@
   "app.auth-servers.unreachable.header": {
     "message": "无法连接到身份验证服务器"
   },
+  "app.behavior-settings.confirmations.title": {
+    "message": "安全确认"
+  },
+  "app.behavior-settings.content.title": {
+    "message": "主页及内容"
+  },
+  "app.behavior-settings.startup-and-navigation.title": {
+    "message": "启动与导航"
+  },
   "app.browse.add-servers-to-instance": {
-    "message": "添加实例到服务器"
+    "message": "添加服务器到实例"
   },
   "app.browse.add-to-an-instance": {
     "message": "添加到实例"
@@ -242,12 +251,18 @@
   "app.browse.back-to-instance": {
     "message": "返回实例"
   },
+  "app.browse.discover-project-type": {
+    "message": "探索{projectType}"
+  },
   "app.browse.discover-servers": {
     "message": "发现服务器"
   },
   "app.browse.hide-added-servers": {
     "message": "隐藏已添加的服务器"
   },
+  "app.browse.hide-installed-modpacks": {
+    "message": "隐藏已安装内容"
+  },
   "app.browse.project-type.modpacks": {
     "message": "整合包"
   },
@@ -294,7 +309,7 @@
     "message": "正在解压覆盖项"
   },
   "app.install.phase.finalizing": {
-    "message": "完成"
+    "message": "即将完成"
   },
   "app.install.phase.preparing_instance": {
     "message": "已加入安装队列"
@@ -315,7 +330,7 @@
     "message": "正在准备 Java {version}"
   },
   "app.install.phase.preparing_java.validating": {
-    "message": "正在校验 Java {version}"
+    "message": "正在验证 Java {version}"
   },
   "app.install.phase.reading_pack_manifest": {
     "message": "正在读取整合包清单"
@@ -330,10 +345,10 @@
     "message": "正在解析内容"
   },
   "app.install.phase.rolling_back": {
-    "message": "回滚中"
+    "message": "正在回滚"
   },
   "app.install.phase.running_loader_processors": {
-    "message": "正在运行加载处理器"
+    "message": "正在运行加载器处理程序"
   },
   "app.instance.admonitions.shared-instance.added-label": {
     "message": "新增内容"
@@ -348,7 +363,7 @@
     "message": "推送更新"
   },
   "app.instance.admonitions.shared-instance.publishing-button": {
-    "message": "推送中……"
+    "message": "正在推送…"
   },
   "app.instance.admonitions.shared-instance.removed-label": {
     "message": "移除内容"
@@ -360,10 +375,19 @@
     "message": "预览即将同步给所有使用该实例用户的变更内容。"
   },
   "app.instance.admonitions.shared-instance.review-header": {
-    "message": "审核变更"
+    "message": "查看变更"
+  },
+  "app.instance.admonitions.shared-instance.review-update-button": {
+    "message": "查看更新"
   },
   "app.instance.admonitions.shared-instance.reviewing-button": {
-    "message": "正在审核……"
+    "message": "正在审查…"
+  },
+  "app.instance.admonitions.shared-instance.update-available-body": {
+    "message": "{name}需要更新。请更新到最新版本以启动游戏。"
+  },
+  "app.instance.admonitions.shared-instance.update-available-header": {
+    "message": "有更新可用"
   },
   "app.instance.confirm-delete.admonition-body": {
     "message": "你实例的所有数据将被永久删除，包括你的世界、配置和所有已安装的内容。"
@@ -384,7 +408,7 @@
     "message": "创建"
   },
   "app.instance.modpack-already-installed.header": {
-    "message": "整合包已安装"
+    "message": "该整合包已安装"
   },
   "app.instance.modpack-already-installed.instance": {
     "message": "实例"
@@ -431,6 +455,9 @@
   "app.instance.share.invite-modal.heading": {
     "message": "分享 {name}"
   },
+  "app.instance.share.invite-modal.user-limit-reached": {
+    "message": "该实例已达{limit}人数上限。"
+  },
   "app.instance.share.locked.empty-description-prefix": {
     "message": "你需要登录账号"
   },
@@ -449,6 +476,12 @@
   "app.instance.share.locked.wrong-account-heading": {
     "message": "账号错误"
   },
+  "app.instance.share.members.empty": {
+    "message": "暂无用户加入"
+  },
+  "app.instance.share.members.no-filter-results": {
+    "message": "没有符合您筛选条件的用户。"
+  },
   "app.instance.share.remove-user-modal.effect-access": {
     "message": "对方将不再收到该共享实例的后续更新"
   },
@@ -479,6 +512,12 @@
   "app.instance.share.sign-in.button": {
     "message": "登录"
   },
+  "app.instance.share.unable-to-connect.description": {
+    "message": "共享实例服务暂时无法访问，请稍后再试"
+  },
+  "app.instance.share.unable-to-connect.heading": {
+    "message": "连接失败"
+  },
   "app.instance.share.unlink.body": {
     "message": "你必须先取消关联此整合包才能分享你的实例"
   },
@@ -498,13 +537,13 @@
     "message": "实例"
   },
   "app.instance.shared-instance-wrong-account.fallback-username": {
-    "message": "已关联的账号"
+    "message": "已关联的账户"
   },
   "app.instance.shared-instance-wrong-account.owner-admonition-body-v2": {
     "message": "才能管理此共享实例。否则你将无法向其他用户推送更新。"
   },
   "app.instance.shared-instance-wrong-account.sign-in-as-label": {
-    "message": "登录账号"
+    "message": "登录账户"
   },
   "app.instance.shared-instance-wrong-account.signed-out-header": {
     "message": "你需要登录 Modrinth"
@@ -513,7 +552,7 @@
     "message": "才能接收此共享实例的更新。"
   },
   "app.instance.shared-instance-wrong-account.warning-header": {
-    "message": "你当前使用的 Modrinth 账号不正确"
+    "message": "你当前使用的 Modrinth 账户不正确"
   },
   "app.instance.worlds.add-server": {
     "message": "添加服务器"
@@ -534,7 +573,7 @@
     "message": "正在删除 {name}"
   },
   "app.instance.worlds.filter-modded": {
-    "message": "适配模组"
+    "message": "可安装 Mod"
   },
   "app.instance.worlds.filter-offline": {
     "message": "离线"
@@ -551,6 +590,9 @@
   "app.instance.worlds.no-worlds-heading": {
     "message": "未添加服务器或世界"
   },
+  "app.instance.worlds.refreshing": {
+    "message": "正在刷新……"
+  },
   "app.instance.worlds.remove-server-modal.remove-button": {
     "message": "删除服务器"
   },
@@ -564,7 +606,52 @@
     "message": "正在删除 {name}"
   },
   "app.instance.worlds.search-worlds-placeholder": {
-    "message": "搜索 {count} 个世界……"
+    "message": "搜索 {count} 个世界…"
+  },
+  "app.java-detection.cancel": {
+    "message": "取消"
+  },
+  "app.java-detection.columns.actions": {
+    "message": "操作"
+  },
+  "app.java-detection.columns.path": {
+    "message": "路径"
+  },
+  "app.java-detection.columns.version": {
+    "message": "版本"
+  },
+  "app.java-detection.no-installations-found": {
+    "message": "未找到Java配置"
+  },
+  "app.java-detection.select": {
+    "message": "选择"
+  },
+  "app.java-detection.selected": {
+    "message": "已选择"
+  },
+  "app.java-detection.title": {
+    "message": "选择Java配置"
+  },
+  "app.java-selector.already-installed": {
+    "message": "已安装"
+  },
+  "app.java-selector.browse": {
+    "message": "浏览"
+  },
+  "app.java-selector.detect": {
+    "message": "检测"
+  },
+  "app.java-selector.install-recommended": {
+    "message": "安装推荐版本"
+  },
+  "app.java-selector.installing": {
+    "message": "正在安装…"
+  },
+  "app.java-selector.path.placeholder": {
+    "message": "Java安装路径"
+  },
+  "app.java-selector.test-installation": {
+    "message": "测试"
   },
   "app.modal.install-to-play.additional-context": {
     "message": "补充说明"
@@ -572,6 +659,9 @@
   "app.modal.install-to-play.additional-context-placeholder": {
     "message": "如有必要，请尽量附上相关链接与图片"
   },
+  "app.modal.install-to-play.block-user": {
+    "message": "屏蔽该用户"
+  },
   "app.modal.install-to-play.content-you-are-reporting": {
     "message": "所举报的实例"
   },
@@ -593,6 +683,9 @@
   "app.modal.install-to-play.invite-warning": {
     "message": "这个邀请是由另一位 Modrinth 用户创建的，而不是 Modrinth 官方。只接受你信任的人的邀请。"
   },
+  "app.modal.install-to-play.invite-warning-with-creator": {
+    "message": "此邀请由 <creator>{username}</creator> 创建，而非 Modrinth。只接受您信任的人发出的邀请。"
+  },
   "app.modal.install-to-play.mod-count": {
     "message": "{count} 个模组"
   },
@@ -650,6 +743,9 @@
   "app.modal.install-to-play.unrecognized-files": {
     "message": "未识别文件"
   },
+  "app.modal.install-to-play.user-blocked": {
+    "message": "用户已屏蔽"
+  },
   "app.modal.install-to-play.view-contents": {
     "message": "查看内容"
   },
@@ -677,6 +773,36 @@
   "app.modal.update-to-play.update-required-description": {
     "message": "为了玩{name}你需要更新。"
   },
+  "app.nav.create-new-instance": {
+    "message": "创建实例"
+  },
+  "app.nav.home": {
+    "message": "首页"
+  },
+  "app.nav.library": {
+    "message": "库"
+  },
+  "app.nav.modrinth-account": {
+    "message": "Modrinth账户"
+  },
+  "app.nav.modrinth-hosting": {
+    "message": "Modrinth Hosting"
+  },
+  "app.nav.sign-in-to-modrinth-account": {
+    "message": "登录Modrinth账户"
+  },
+  "app.nav.signed-in-as": {
+    "message": "以<user>{username}</user>身份登录"
+  },
+  "app.nav.upgrade-to-modrinth-plus": {
+    "message": "升级至Modrinth+"
+  },
+  "app.news.title": {
+    "message": "新闻"
+  },
+  "app.news.view-all": {
+    "message": "查看所有新闻"
+  },
   "app.project.install-button.already-installed": {
     "message": "此项目已安装"
   },
@@ -686,6 +812,9 @@
   "app.project.install-context.back-to-browse": {
     "message": "返回发现页"
   },
+  "app.project.install-context.back-to-instance": {
+    "message": "返回实例"
+  },
   "app.project.version.all-versions": {
     "message": "所有版本"
   },
@@ -698,20 +827,188 @@
   "app.project.versions.already-installed": {
     "message": "已安装"
   },
+  "app.quick-instance-switcher.drag-show-tooltip": {
+    "message": "拖动以显示最近的实例"
+  },
+  "app.quick-instance-switcher.drag-tooltip": {
+    "message": "拖拽以调整大小"
+  },
+  "app.restarting": {
+    "message": "正在重启…"
+  },
+  "app.settings.app-version": {
+    "message": "Modrinth App {version}"
+  },
+  "app.settings.default-instance-options.environment-variables.description": {
+    "message": "启动实例时设置的环境变量。"
+  },
+  "app.settings.default-instance-options.environment-variables.placeholder": {
+    "message": "输入环境变量…"
+  },
+  "app.settings.default-instance-options.environment-variables.title": {
+    "message": "环境变量"
+  },
+  "app.settings.default-instance-options.fullscreen.description": {
+    "message": "通过更新实例的options.txt文件以全屏方式启动实例。"
+  },
+  "app.settings.default-instance-options.fullscreen.title": {
+    "message": "全屏"
+  },
+  "app.settings.default-instance-options.height.description": {
+    "message": "游戏窗口启动时的高度。"
+  },
+  "app.settings.default-instance-options.height.placeholder": {
+    "message": "输入高度…"
+  },
+  "app.settings.default-instance-options.height.title": {
+    "message": "高度"
+  },
+  "app.settings.default-instance-options.java-arguments.description": {
+    "message": "启动实例时传递给 Java 的参数。"
+  },
+  "app.settings.default-instance-options.java-arguments.placeholder": {
+    "message": "输入Java参数…"
+  },
+  "app.settings.default-instance-options.java-arguments.title": {
+    "message": "Java参数"
+  },
+  "app.settings.default-instance-options.memory-allocation.description": {
+    "message": "每个实例的最大可用内存。"
+  },
+  "app.settings.default-instance-options.memory-allocation.title": {
+    "message": "内存分配"
+  },
+  "app.settings.default-instance-options.post-exit-hook.description": {
+    "message": "在游戏关闭后运行。"
+  },
+  "app.settings.default-instance-options.post-exit-hook.placeholder": {
+    "message": "输入退出后命令..."
+  },
+  "app.settings.default-instance-options.post-exit-hook.title": {
+    "message": "退出后执行命令"
+  },
+  "app.settings.default-instance-options.pre-launch-hook.description": {
+    "message": "在实例启动前运行。"
+  },
+  "app.settings.default-instance-options.pre-launch-hook.placeholder": {
+    "message": "输入启动前命令……"
+  },
+  "app.settings.default-instance-options.pre-launch-hook.title": {
+    "message": "启动前执行命令"
+  },
+  "app.settings.default-instance-options.width.description": {
+    "message": "游戏窗口启动时的宽度。"
+  },
+  "app.settings.default-instance-options.width.placeholder": {
+    "message": "输入宽度…"
+  },
+  "app.settings.default-instance-options.width.title": {
+    "message": "宽度"
+  },
+  "app.settings.default-instance-options.wrapper-hook.description": {
+    "message": "用来包装 Minecraft 启动过程的命令。"
+  },
+  "app.settings.default-instance-options.wrapper-hook.placeholder": {
+    "message": "输入包装器命令……"
+  },
+  "app.settings.default-instance-options.wrapper-hook.title": {
+    "message": "包装器命令"
+  },
+  "app.settings.developer-mode-button.label": {
+    "message": "切换开发者模式"
+  },
   "app.settings.developer-mode-enabled": {
     "message": "开发者模式已启用。"
   },
   "app.settings.downloading": {
     "message": "正在下载 v{version}"
   },
+  "app.settings.java-installations.location.title": {
+    "message": "Java {version, number} 位置"
+  },
+  "app.settings.operating-system.macos": {
+    "message": "macOS"
+  },
   "app.settings.privacy.ads-consent.intro": {
     "message": "广告使 Modrinth 得以运营，并为创作者报酬提供资金支持。我们的合作伙伴可能会在应用中存储或访问 Cookie，以便实现广告个性化和效果衡量。您可以在下方选择退出或管理您的偏好设置。"
   },
+  "app.settings.privacy.discord-rich-presence.description": {
+    "message": "在 Discord 上将 Modrinth App 显示为您当前的活动。这不会影响模组为游戏实例添加的 Rich Presence。需要重启应用生效。"
+  },
+  "app.settings.privacy.discord-rich-presence.title": {
+    "message": "Discord Rich Presence"
+  },
+  "app.settings.privacy.telemetry.description": {
+    "message": "Modrinth 收集匿名分析和使用数据，以提升用户体验并为您提供个性化服务。若禁用此选项，即表示您选择退出，您的数据将不再被收集。"
+  },
+  "app.settings.privacy.telemetry.title": {
+    "message": "遥测"
+  },
+  "app.settings.resource-management.always-show-copy-details.description": {
+    "message": "在安装排队或运行时显示“复制详细信息”选项。对于失败或中断的安装，该选项始终可用。"
+  },
+  "app.settings.resource-management.always-show-copy-details.title": {
+    "message": "始终显示复制详情"
+  },
+  "app.settings.resource-management.app-cache.confirm.description": {
+    "message": "在缓存重建之前，应用加载可能会更慢。"
+  },
+  "app.settings.resource-management.app-cache.confirm.title": {
+    "message": "清除App缓存？"
+  },
+  "app.settings.resource-management.app-cache.description": {
+    "message": "清除缓存数据，然后从Modrinth重新下载。在缓存重建之前，应用加载可能会更慢。"
+  },
+  "app.settings.resource-management.app-cache.purge": {
+    "message": "清除缓存"
+  },
+  "app.settings.resource-management.app-cache.title": {
+    "message": "App缓存"
+  },
+  "app.settings.resource-management.app-database-backups.description": {
+    "message": "这里存储了重要的应用数据的备份，以备日后需要恢复。"
+  },
+  "app.settings.resource-management.app-database-backups.open-folder": {
+    "message": "打开备份文件夹"
+  },
+  "app.settings.resource-management.app-database-backups.title": {
+    "message": "应用数据库备份"
+  },
+  "app.settings.resource-management.app-directory.browse": {
+    "message": "浏览应用目录"
+  },
+  "app.settings.resource-management.app-directory.description": {
+    "message": "Modrinth App存储实例和其他文件的位置。更改会在重启程序后生效。"
+  },
+  "app.settings.resource-management.app-directory.select": {
+    "message": "选择新的应用目录"
+  },
+  "app.settings.resource-management.app-directory.title": {
+    "message": "应用目录"
+  },
+  "app.settings.resource-management.maximum-concurrent-downloads.description": {
+    "message": "应用可同时下载的文件数量。如果您的连接下载不稳定，请降低该值。需要重新启动应用程序。"
+  },
+  "app.settings.resource-management.maximum-concurrent-downloads.title": {
+    "message": "最大并发下载量"
+  },
+  "app.settings.resource-management.maximum-concurrent-writes.description": {
+    "message": "应用可同时写入磁盘的文件数。如果经常出现 I/O 错误，请降低该值。需要重启应用程序。"
+  },
+  "app.settings.resource-management.maximum-concurrent-writes.title": {
+    "message": "最大并发写入数"
+  },
+  "app.settings.sidebar.label.instances": {
+    "message": "实例"
+  },
   "app.settings.tabs.appearance": {
     "message": "外观"
   },
+  "app.settings.tabs.behavior": {
+    "message": "行为"
+  },
   "app.settings.tabs.default-instance-options": {
-    "message": "默认实例选项"
+    "message": "默认游戏选项"
   },
   "app.settings.tabs.java-installations": {
     "message": "Java 管理"
@@ -725,6 +1022,9 @@
   "app.settings.tabs.resource-management": {
     "message": "资源管理"
   },
+  "app.sidebar.playing-as": {
+    "message": "游玩账户"
+  },
   "app.skins.add-button": {
     "message": "添加皮肤"
   },
@@ -884,6 +1184,21 @@
   "app.skins.toggle-ears-features-on": {
     "message": "切换至开"
   },
+  "app.survey.body": {
+    "message": "您是否介意回答一些关于使用 Modrinth App 的问题？"
+  },
+  "app.survey.footer": {
+    "message": "此反馈将直接发送给Modrinth团队，为今后的更新提供指导！"
+  },
+  "app.survey.no-thanks": {
+    "message": "不，谢谢"
+  },
+  "app.survey.take-survey": {
+    "message": "参与调研"
+  },
+  "app.survey.title": {
+    "message": "嗨，Modrinth用户！"
+  },
   "app.update-popup.body.download-complete": {
     "message": "Modrinth App v{version} 更新已下载完成！立即重启更新，或退出时自动安装。"
   },
@@ -1160,6 +1475,45 @@
   "instance.server-modal.resource-pack": {
     "message": "资源包"
   },
+  "instance.settings.sharing.active-invites.actions": {
+    "message": "操作"
+  },
+  "instance.settings.sharing.active-invites.code": {
+    "message": "邀请链接"
+  },
+  "instance.settings.sharing.active-invites.description": {
+    "message": "只要邀请链接有效，任何拥有该链接的人均可加入。"
+  },
+  "instance.settings.sharing.active-invites.empty": {
+    "message": "暂无有效邀请。"
+  },
+  "instance.settings.sharing.active-invites.expires": {
+    "message": "有效期"
+  },
+  "instance.settings.sharing.active-invites.revoke": {
+    "message": "撤销邀请码"
+  },
+  "instance.settings.sharing.active-invites.revoke-with-code": {
+    "message": "撤销邀请码 {code}"
+  },
+  "instance.settings.sharing.active-invites.title": {
+    "message": "有效邀请"
+  },
+  "instance.settings.sharing.active-invites.uses": {
+    "message": "使用次数"
+  },
+  "instance.settings.sharing.revoke-invite.admonition-body": {
+    "message": "邀请链接 <monospace>{code}</monospace> 将立即失效。已加入的成员将保留访问权限。"
+  },
+  "instance.settings.sharing.revoke-invite.admonition-header": {
+    "message": "这一操作无法撤销"
+  },
+  "instance.settings.sharing.revoke-invite.confirm": {
+    "message": "撤销邀请"
+  },
+  "instance.settings.sharing.revoke-invite.header": {
+    "message": "撤销邀请"
+  },
   "instance.settings.tabs.general": {
     "message": "通用"
   },
@@ -1239,13 +1593,13 @@
     "message": "选择更新渠道"
   },
   "instance.settings.tabs.hooks": {
-    "message": "启动 Hooks"
+    "message": "启动钩子"
   },
   "instance.settings.tabs.hooks.custom-hooks": {
-    "message": "自定义启动 Hooks"
+    "message": "自定义启动钩子"
   },
   "instance.settings.tabs.hooks.description": {
-    "message": "Hooks允许高级用户在启动游戏前后运行特定的系统命令。"
+    "message": "钩子供高级用户使用，可设置游戏启动前后运行的特定系统命令。"
   },
   "instance.settings.tabs.hooks.post-exit": {
     "message": "退出后执行"
@@ -1275,7 +1629,7 @@
     "message": "用于启动 Minecraft 的包装器命令。"
   },
   "instance.settings.tabs.hooks.wrapper.enter": {
-    "message": "输入封装命令……"
+    "message": "输入包装器命令……"
   },
   "instance.settings.tabs.installation": {
     "message": "安装"
@@ -1311,7 +1665,7 @@
     "message": "环境变量"
   },
   "instance.settings.tabs.java.hooks": {
-    "message": "Hooks"
+    "message": "钩子"
   },
   "instance.settings.tabs.java.java-arguments": {
     "message": "Java 参数"
@@ -1361,6 +1715,12 @@
   "instance.shared-instance.error.title": {
     "message": "出错了"
   },
+  "instance.shared-instance.network-error.text": {
+    "message": "无法连接到共享实例API"
+  },
+  "instance.shared-instance.network-error.title": {
+    "message": "网络错误"
+  },
   "instance.shared-instance.owner-tooltip": {
     "message": "此实例的内容正在共享给其他用户。"
   },
@@ -1552,5 +1912,11 @@
   },
   "search.filter.locked.server-loader.title": {
     "message": "加载器由服务器提供"
+  },
+  "settings.sidebar.label.account": {
+    "message": "账户"
+  },
+  "settings.sidebar.label.display": {
+    "message": "显示"
   }
 }
diff --git a/apps/app-frontend/src/locales/zh-TW/index.json b/apps/app-frontend/src/locales/zh-TW/index.json
index f5d7e24953..cce0b1e88b 100644
--- a/apps/app-frontend/src/locales/zh-TW/index.json
+++ b/apps/app-frontend/src/locales/zh-TW/index.json
@@ -144,19 +144,19 @@
     "message": "關於你的隱私，以及廣告如何幫助 Modrinth"
   },
   "app.appearance-settings.advanced-rendering.description": {
-    "message": "啟用進階繪製（如模糊效果），若無硬體加速可能會導致效能問題。"
+    "message": "啟用視覺效果（如背景模糊），若無硬體加速可能會降低效能。"
   },
   "app.appearance-settings.advanced-rendering.title": {
     "message": "進階繪製"
   },
   "app.appearance-settings.color-theme.description": {
-    "message": "請選擇你偏好的 Modrinth App 色彩主題。"
+    "message": "選擇 Modrinth App 使用的色彩主題。"
   },
   "app.appearance-settings.color-theme.title": {
     "message": "色彩主題"
   },
   "app.appearance-settings.default-landing-page.description": {
-    "message": "變更啟動器開啟時的頁面。"
+    "message": "選擇 Modrinth App 開啟時顯示的頁面。"
   },
   "app.appearance-settings.default-landing-page.home": {
     "message": "首頁"
@@ -168,49 +168,49 @@
     "message": "預設起始頁面"
   },
   "app.appearance-settings.hide-nametag.description": {
-    "message": "在外觀頁面中隱藏玩家上方的名牌。"
+    "message": "在外觀選擇工具頁面中隱藏玩家預覽上方的使用者名稱。"
   },
   "app.appearance-settings.hide-nametag.title": {
     "message": "隱藏名牌"
   },
   "app.appearance-settings.jump-back-into-worlds.description": {
-    "message": "在首頁的「繼續遊玩」區塊中顯示最近進入的世界。"
+    "message": "在首頁的「繼續遊玩」區塊中顯示最近遊玩的世界。"
   },
   "app.appearance-settings.jump-back-into-worlds.title": {
     "message": "繼續遊玩世界"
   },
   "app.appearance-settings.minimize-launcher.description": {
-    "message": "當 Minecraft 處理程序啟動時最小化啟動器。"
+    "message": "當 Minecraft 啟動時將 Modrinth App 最小化。"
   },
   "app.appearance-settings.minimize-launcher.title": {
-    "message": "最小化啟動器"
+    "message": "最小化應用程式"
   },
   "app.appearance-settings.native-decorations.description": {
-    "message": "使用系統內建的視窗外框（需要重新啟動應用程式）。"
+    "message": "使用作業系統的標題列和視窗控制項。需要重新啟動應用程式。"
   },
   "app.appearance-settings.native-decorations.title": {
-    "message": "原生視窗"
+    "message": "系統視窗外框"
   },
   "app.appearance-settings.show-play-time.description": {
-    "message": "顯示你在該實例的遊玩時數。"
+    "message": "顯示你在各個實例的遊玩時數。"
   },
   "app.appearance-settings.show-play-time.title": {
     "message": "顯示遊玩時數"
   },
   "app.appearance-settings.skip-non-essential-warnings.description": {
-    "message": "自動跳過低風險操作的確認提示，例如重複安裝模組包、常規內容刪除、批次更新、取消連結模組包以及修復提示。高風險警告仍會顯示。"
+    "message": "跳過低風險動作的確認提示，例如重複安裝、常規內容刪除、批次更新、取消連結以及修復。高風險動作的警告仍會顯示。"
   },
   "app.appearance-settings.skip-non-essential-warnings.title": {
     "message": "跳過非必要的警告"
   },
   "app.appearance-settings.toggle-sidebar.description": {
-    "message": "啟用切換側邊欄的功能。"
+    "message": "預設隱藏右側邊欄，並新增顯示或隱藏按鈕。"
   },
   "app.appearance-settings.toggle-sidebar.title": {
-    "message": "切換側邊欄"
+    "message": "隱藏右側邊欄"
   },
   "app.appearance-settings.unknown-pack-warning.description": {
-    "message": "如果你嘗試安裝非 Modrinth 代管的 Modrinth 封裝檔案 (.mrpack)，我們會在安裝前確保你已了解相關風險。"
+    "message": "在安裝非託管於 Modrinth 的 Modrinth Pack（.mrpack）之前，顯示安全警告。"
   },
   "app.appearance-settings.unknown-pack-warning.title": {
     "message": "在安裝未知模組包前發出警告"
@@ -221,6 +221,15 @@
   "app.auth-servers.unreachable.header": {
     "message": "無法連線到驗證伺服器"
   },
+  "app.behavior-settings.confirmations.title": {
+    "message": "確認提示"
+  },
+  "app.behavior-settings.content.title": {
+    "message": "首頁與內容"
+  },
+  "app.behavior-settings.startup-and-navigation.title": {
+    "message": "啟動與瀏覽"
+  },
   "app.browse.add-servers-to-instance": {
     "message": "將伺服器新增至實例"
   },
@@ -242,12 +251,18 @@
   "app.browse.back-to-instance": {
     "message": "回到實例"
   },
+  "app.browse.discover-project-type": {
+    "message": "探索{projectType}"
+  },
   "app.browse.discover-servers": {
     "message": "探索伺服器"
   },
   "app.browse.hide-added-servers": {
     "message": "隱藏已新增的伺服器"
   },
+  "app.browse.hide-installed-modpacks": {
+    "message": "隱藏已安裝的內容"
+  },
   "app.browse.project-type.modpacks": {
     "message": "模組包"
   },
@@ -360,10 +375,19 @@
     "message": "審查即將與這個實例的所有使用者共用的內容變更。"
   },
   "app.instance.admonitions.shared-instance.review-header": {
-    "message": "審查變更"
+    "message": "檢視變更"
+  },
+  "app.instance.admonitions.shared-instance.review-update-button": {
+    "message": "檢視更新"
   },
   "app.instance.admonitions.shared-instance.reviewing-button": {
-    "message": "正在審查..."
+    "message": "正在檢視..."
+  },
+  "app.instance.admonitions.shared-instance.update-available-body": {
+    "message": "需要更新才能遊玩「{name}」。請更新至最新版本以啟動遊戲。"
+  },
+  "app.instance.admonitions.shared-instance.update-available-header": {
+    "message": "有可用的更新"
   },
   "app.instance.confirm-delete.admonition-body": {
     "message": "你實例中的所有資料將被永久刪除，包含你的世界、設定檔以及所有已安裝的內容。"
@@ -431,6 +455,9 @@
   "app.instance.share.invite-modal.heading": {
     "message": "共用「{name}」"
   },
+  "app.instance.share.invite-modal.user-limit-reached": {
+    "message": "這個實例已達到 {limit} 位使用者的上限。"
+  },
   "app.instance.share.locked.empty-description-prefix": {
     "message": "你需要以"
   },
@@ -449,6 +476,12 @@
   "app.instance.share.locked.wrong-account-heading": {
     "message": "帳號錯誤"
   },
+  "app.instance.share.members.empty": {
+    "message": "還沒有使用者加入"
+  },
+  "app.instance.share.members.no-filter-results": {
+    "message": "沒有找到使用者。"
+  },
   "app.instance.share.remove-user-modal.effect-access": {
     "message": "他不會再收到這個共用實例的更新"
   },
@@ -479,6 +512,12 @@
   "app.instance.share.sign-in.button": {
     "message": "登入"
   },
+  "app.instance.share.unable-to-connect.description": {
+    "message": "目前無法存取共用實例服務，請稍後再試"
+  },
+  "app.instance.share.unable-to-connect.heading": {
+    "message": "無法連線"
+  },
   "app.instance.share.unlink.body": {
     "message": "你必須先與模組包取消連結才能共用實例"
   },
@@ -486,7 +525,7 @@
     "message": "共用前需要取消連結"
   },
   "app.instance.shared-instance-already-installed.body": {
-    "message": "這個共用實例已經在本機安裝，名稱為「<bold>{instanceName}</bold>」。你確定要再安裝一個副本嗎？"
+    "message": "這個共用實例已經在本機安裝，名稱為「<bold>{instanceName}</bold>」。確定要再安裝一個副本嗎？"
   },
   "app.instance.shared-instance-already-installed.header": {
     "message": "共用實例已經安裝"
@@ -551,6 +590,9 @@
   "app.instance.worlds.no-worlds-heading": {
     "message": "未新增任何伺服器或世界"
   },
+  "app.instance.worlds.refreshing": {
+    "message": "正在重新整理..."
+  },
   "app.instance.worlds.remove-server-modal.remove-button": {
     "message": "移除伺服器"
   },
@@ -566,12 +608,60 @@
   "app.instance.worlds.search-worlds-placeholder": {
     "message": "搜尋 {count} 個世界..."
   },
+  "app.java-detection.cancel": {
+    "message": "取消"
+  },
+  "app.java-detection.columns.actions": {
+    "message": "動作"
+  },
+  "app.java-detection.columns.path": {
+    "message": "路徑"
+  },
+  "app.java-detection.columns.version": {
+    "message": "版本"
+  },
+  "app.java-detection.no-installations-found": {
+    "message": "找不到 Java 安裝。"
+  },
+  "app.java-detection.select": {
+    "message": "選擇"
+  },
+  "app.java-detection.selected": {
+    "message": "已選擇"
+  },
+  "app.java-detection.title": {
+    "message": "選擇 Java 安裝"
+  },
+  "app.java-selector.already-installed": {
+    "message": "已安裝"
+  },
+  "app.java-selector.browse": {
+    "message": "瀏覽"
+  },
+  "app.java-selector.detect": {
+    "message": "偵測"
+  },
+  "app.java-selector.install-recommended": {
+    "message": "建議安裝"
+  },
+  "app.java-selector.installing": {
+    "message": "正在安裝..."
+  },
+  "app.java-selector.path.placeholder": {
+    "message": "/path/to/java"
+  },
+  "app.java-selector.test-installation": {
+    "message": "測試 Java 安裝"
+  },
   "app.modal.install-to-play.additional-context": {
     "message": "補充說明"
   },
   "app.modal.install-to-play.additional-context-placeholder": {
     "message": "若可行且相關，請一併附上連結與圖片"
   },
+  "app.modal.install-to-play.block-user": {
+    "message": "封鎖使用者"
+  },
   "app.modal.install-to-play.content-you-are-reporting": {
     "message": "你要檢舉的實例"
   },
@@ -593,6 +683,9 @@
   "app.modal.install-to-play.invite-warning": {
     "message": "這份邀請是由另一位 Modrinth 使用者建立，並非由 Modrinth 官方建立。請僅接受來自你信任的人的邀請。"
   },
+  "app.modal.install-to-play.invite-warning-with-creator": {
+    "message": "這份邀請是由 <creator>{username}</creator> 建立，並非由 Modrinth 官方建立。請僅接受來自你信任的人的邀請。"
+  },
   "app.modal.install-to-play.mod-count": {
     "message": "{count, plural, other {# 個模組}}"
   },
@@ -650,8 +743,11 @@
   "app.modal.install-to-play.unrecognized-files": {
     "message": "無法辨識的檔案"
   },
+  "app.modal.install-to-play.user-blocked": {
+    "message": "使用者已封鎖"
+  },
   "app.modal.install-to-play.view-contents": {
-    "message": "檢視內容"
+    "message": "查看內容"
   },
   "app.modal.update-to-play.header": {
     "message": "更新以遊玩"
@@ -677,6 +773,36 @@
   "app.modal.update-to-play.update-required-description": {
     "message": "需要更新才能遊玩「{name}」。請更新至最新版本以啟動遊戲。"
   },
+  "app.nav.create-new-instance": {
+    "message": "建立新實例"
+  },
+  "app.nav.home": {
+    "message": "首頁"
+  },
+  "app.nav.library": {
+    "message": "遊戲庫"
+  },
+  "app.nav.modrinth-account": {
+    "message": "Modrinth 帳號"
+  },
+  "app.nav.modrinth-hosting": {
+    "message": "Modrinth Hosting"
+  },
+  "app.nav.sign-in-to-modrinth-account": {
+    "message": "登入 Modrinth 帳號"
+  },
+  "app.nav.signed-in-as": {
+    "message": "以 <user>{username}</user> 登入"
+  },
+  "app.nav.upgrade-to-modrinth-plus": {
+    "message": "升級至 Modrinth+"
+  },
+  "app.news.title": {
+    "message": "新聞"
+  },
+  "app.news.view-all": {
+    "message": "查看所有新聞"
+  },
   "app.project.install-button.already-installed": {
     "message": "這個專案已安裝"
   },
@@ -686,6 +812,9 @@
   "app.project.install-context.back-to-browse": {
     "message": "返回瀏覽"
   },
+  "app.project.install-context.back-to-instance": {
+    "message": "回到實例"
+  },
   "app.project.version.all-versions": {
     "message": "所有版本"
   },
@@ -698,20 +827,188 @@
   "app.project.versions.already-installed": {
     "message": "已安裝"
   },
+  "app.quick-instance-switcher.drag-show-tooltip": {
+    "message": "拖曳顯示最近遊玩的實例"
+  },
+  "app.quick-instance-switcher.drag-tooltip": {
+    "message": "拖曳調整大小"
+  },
+  "app.restarting": {
+    "message": "正在重新啟動..."
+  },
+  "app.settings.app-version": {
+    "message": "Modrinth App {version}"
+  },
+  "app.settings.default-instance-options.environment-variables.description": {
+    "message": "啟動實例時設定的環境變數。"
+  },
+  "app.settings.default-instance-options.environment-variables.placeholder": {
+    "message": "輸入環境變數..."
+  },
+  "app.settings.default-instance-options.environment-variables.title": {
+    "message": "環境變數"
+  },
+  "app.settings.default-instance-options.fullscreen.description": {
+    "message": "實例啟動時進入全螢幕模式（透過更新 options.txt 檔案）。"
+  },
+  "app.settings.default-instance-options.fullscreen.title": {
+    "message": "全螢幕"
+  },
+  "app.settings.default-instance-options.height.description": {
+    "message": "遊戲啟動時的視窗高度。"
+  },
+  "app.settings.default-instance-options.height.placeholder": {
+    "message": "輸入高度..."
+  },
+  "app.settings.default-instance-options.height.title": {
+    "message": "高度"
+  },
+  "app.settings.default-instance-options.java-arguments.description": {
+    "message": "啟動實例時傳遞給 Java 的參數。"
+  },
+  "app.settings.default-instance-options.java-arguments.placeholder": {
+    "message": "輸入 Java 參數..."
+  },
+  "app.settings.default-instance-options.java-arguments.title": {
+    "message": "Java 參數"
+  },
+  "app.settings.default-instance-options.memory-allocation.description": {
+    "message": "各個實例可使用的記憶體上限。"
+  },
+  "app.settings.default-instance-options.memory-allocation.title": {
+    "message": "記憶體配置"
+  },
+  "app.settings.default-instance-options.post-exit-hook.description": {
+    "message": "遊戲關閉後執行。"
+  },
+  "app.settings.default-instance-options.post-exit-hook.placeholder": {
+    "message": "輸入結束後指令..."
+  },
+  "app.settings.default-instance-options.post-exit-hook.title": {
+    "message": "結束後掛勾"
+  },
+  "app.settings.default-instance-options.pre-launch-hook.description": {
+    "message": "實例啟動前執行。"
+  },
+  "app.settings.default-instance-options.pre-launch-hook.placeholder": {
+    "message": "輸入啟動前指令..."
+  },
+  "app.settings.default-instance-options.pre-launch-hook.title": {
+    "message": "啟動前掛勾"
+  },
+  "app.settings.default-instance-options.width.description": {
+    "message": "遊戲啟動時的視窗寬度。"
+  },
+  "app.settings.default-instance-options.width.placeholder": {
+    "message": "輸入寬度..."
+  },
+  "app.settings.default-instance-options.width.title": {
+    "message": "寬度"
+  },
+  "app.settings.default-instance-options.wrapper-hook.description": {
+    "message": "用於包裝 Minecraft 啟動處理程序的指令。"
+  },
+  "app.settings.default-instance-options.wrapper-hook.placeholder": {
+    "message": "輸入包裝指令..."
+  },
+  "app.settings.default-instance-options.wrapper-hook.title": {
+    "message": "包裝掛勾"
+  },
+  "app.settings.developer-mode-button.label": {
+    "message": "切換開發人員模式"
+  },
   "app.settings.developer-mode-enabled": {
     "message": "開發人員模式已啟用。"
   },
   "app.settings.downloading": {
     "message": "正在下載 v{version}"
   },
+  "app.settings.java-installations.location.title": {
+    "message": "Java {version, number} 安裝位置"
+  },
+  "app.settings.operating-system.macos": {
+    "message": "macOS"
+  },
   "app.settings.privacy.ads-consent.intro": {
     "message": "廣告使 Modrinth 得以營運，並為創作者提供收益。我們的合作夥伴可能會在應用程式中儲存或存取 Cookie，以實現個人化廣告並衡量廣告成效。你可以在下方選擇退出或管理偏好設定。"
   },
+  "app.settings.privacy.discord-rich-presence.description": {
+    "message": "在 Discord 上將 Modrinth App 顯示為目前活動。這不會影響模組為實例新增的豐富狀態。需要重新啟動應用程式。"
+  },
+  "app.settings.privacy.discord-rich-presence.title": {
+    "message": "Discord 豐富狀態"
+  },
+  "app.settings.privacy.telemetry.description": {
+    "message": "Modrinth 會收集匿名化的分析與使用資料，以提升使用者體驗並提供客製化服務。若停用此選項，即表示你選擇退出，你的資料將不再被收集。"
+  },
+  "app.settings.privacy.telemetry.title": {
+    "message": "遙測"
+  },
+  "app.settings.resource-management.always-show-copy-details.description": {
+    "message": "當安裝已排入佇列或正在執行時，顯示「複製詳細資訊」按鈕。這項設定僅適用於前述安裝情形，安裝失敗或中斷時一律顯示該按鈕。"
+  },
+  "app.settings.resource-management.always-show-copy-details.title": {
+    "message": "一律顯示複製詳細資訊"
+  },
+  "app.settings.resource-management.app-cache.confirm.description": {
+    "message": "在快取完成重建前，應用程式的載入速度可能會比較慢。"
+  },
+  "app.settings.resource-management.app-cache.confirm.title": {
+    "message": "要清除應用程式快取嗎？"
+  },
+  "app.settings.resource-management.app-cache.description": {
+    "message": "清除快取資料，並從 Modrinth 重新下載。在快取完成重建前，應用程式的載入速度可能會比較慢。"
+  },
+  "app.settings.resource-management.app-cache.purge": {
+    "message": "清除快取"
+  },
+  "app.settings.resource-management.app-cache.title": {
+    "message": "應用程式快取"
+  },
+  "app.settings.resource-management.app-database-backups.description": {
+    "message": "重要應用程式資料的備份會儲存於此，以備日後需要還原時使用。"
+  },
+  "app.settings.resource-management.app-database-backups.open-folder": {
+    "message": "開啟備份資料夾"
+  },
+  "app.settings.resource-management.app-database-backups.title": {
+    "message": "應用程式資料庫備份"
+  },
+  "app.settings.resource-management.app-directory.browse": {
+    "message": "瀏覽應用程式資料夾"
+  },
+  "app.settings.resource-management.app-directory.description": {
+    "message": "Modrinth App 儲存實例及其他檔案的位置。變更將於重新啟動應用程式後生效。"
+  },
+  "app.settings.resource-management.app-directory.select": {
+    "message": "選擇新的應用程式資料夾"
+  },
+  "app.settings.resource-management.app-directory.title": {
+    "message": "應用程式資料夾"
+  },
+  "app.settings.resource-management.maximum-concurrent-downloads.description": {
+    "message": "應用程式一次可下載的檔案數量。若你的網路連線導致下載不穩定，請降低此數值。需要重新啟動應用程式。"
+  },
+  "app.settings.resource-management.maximum-concurrent-downloads.title": {
+    "message": "並行下載上限"
+  },
+  "app.settings.resource-management.maximum-concurrent-writes.description": {
+    "message": "應用程式一次可寫入硬碟的檔案數量。若你經常遇到 I/O 錯誤，請降低此數值。需要重新啟動應用程式。"
+  },
+  "app.settings.resource-management.maximum-concurrent-writes.title": {
+    "message": "並行寫入上限"
+  },
+  "app.settings.sidebar.label.instances": {
+    "message": "實例"
+  },
   "app.settings.tabs.appearance": {
     "message": "外觀"
   },
+  "app.settings.tabs.behavior": {
+    "message": "行為"
+  },
   "app.settings.tabs.default-instance-options": {
-    "message": "預設實例選項"
+    "message": "預設遊戲選項"
   },
   "app.settings.tabs.java-installations": {
     "message": "Java 安裝"
@@ -725,6 +1022,9 @@
   "app.settings.tabs.resource-management": {
     "message": "資源管理"
   },
+  "app.sidebar.playing-as": {
+    "message": "目前遊玩帳號"
+  },
   "app.skins.add-button": {
     "message": "新增外觀"
   },
@@ -738,10 +1038,10 @@
     "message": "刪除外觀"
   },
   "app.skins.delete-modal.description": {
-    "message": "這會永久刪除所選的外觀，這個動作無法復原。"
+    "message": "這會永久刪除所選的外觀，這項動作無法復原。"
   },
   "app.skins.delete-modal.title": {
-    "message": "你確定要刪除這個外觀嗎？"
+    "message": "確定要刪除這個外觀嗎？"
   },
   "app.skins.dropped-file-error.text": {
     "message": "無法讀取拖曳的檔案。"
@@ -884,6 +1184,21 @@
   "app.skins.toggle-ears-features-on": {
     "message": "開啟"
   },
+  "app.survey.body": {
+    "message": "你方便回答幾個關於 Modrinth App 使用體驗的問題嗎？"
+  },
+  "app.survey.footer": {
+    "message": "你的回覆將直接傳送給 Modrinth 團隊，作為未來更新方向的指引！"
+  },
+  "app.survey.no-thanks": {
+    "message": "不用了，謝謝"
+  },
+  "app.survey.take-survey": {
+    "message": "填寫問卷調查"
+  },
+  "app.survey.title": {
+    "message": "你好啊，Modrinth 使用者！"
+  },
   "app.update-popup.body.download-complete": {
     "message": "Modrinth App v{version} 已完成下載！立即重新載入以更新，或在關閉 Modrinth App 時自動更新。"
   },
@@ -1160,6 +1475,45 @@
   "instance.server-modal.resource-pack": {
     "message": "資源包"
   },
+  "instance.settings.sharing.active-invites.actions": {
+    "message": "動作"
+  },
+  "instance.settings.sharing.active-invites.code": {
+    "message": "邀請連結"
+  },
+  "instance.settings.sharing.active-invites.description": {
+    "message": "任何使用者都可透過下列任何一個有效邀請連結加入。"
+  },
+  "instance.settings.sharing.active-invites.empty": {
+    "message": "目前沒有有效的邀請。"
+  },
+  "instance.settings.sharing.active-invites.expires": {
+    "message": "有效期限"
+  },
+  "instance.settings.sharing.active-invites.revoke": {
+    "message": "撤銷邀請"
+  },
+  "instance.settings.sharing.active-invites.revoke-with-code": {
+    "message": "撤銷邀請 {code}"
+  },
+  "instance.settings.sharing.active-invites.title": {
+    "message": "有效邀請"
+  },
+  "instance.settings.sharing.active-invites.uses": {
+    "message": "使用次數"
+  },
+  "instance.settings.sharing.revoke-invite.admonition-body": {
+    "message": "邀請連結 <monospace>{code}</monospace> 將立即失效。已加入的使用者不受影響。"
+  },
+  "instance.settings.sharing.revoke-invite.admonition-header": {
+    "message": "這項動作無法復原"
+  },
+  "instance.settings.sharing.revoke-invite.confirm": {
+    "message": "撤銷邀請"
+  },
+  "instance.settings.sharing.revoke-invite.header": {
+    "message": "撤銷邀請"
+  },
   "instance.settings.tabs.general": {
     "message": "一般"
   },
@@ -1361,6 +1715,12 @@
   "instance.shared-instance.error.title": {
     "message": "出了點狀況"
   },
+  "instance.shared-instance.network-error.text": {
+    "message": "無法連線到共用實例 API"
+  },
+  "instance.shared-instance.network-error.title": {
+    "message": "網路錯誤"
+  },
   "instance.shared-instance.owner-tooltip": {
     "message": "這個實例的內容正在與其他使用者共用。"
   },
@@ -1377,7 +1737,7 @@
     "message": "審查內容變更，並選擇要包含在本次更新的設定檔。"
   },
   "instance.shared-instance.publish-review.header": {
-    "message": "審查變更"
+    "message": "檢視變更"
   },
   "instance.shared-instance.publish-review.publish-button": {
     "message": "推送更新"
@@ -1449,7 +1809,7 @@
     "message": "遊玩實例"
   },
   "instance.worlds.view_instance": {
-    "message": "檢視實例"
+    "message": "查看實例"
   },
   "instance.worlds.world_in_use": {
     "message": "世界正在使用中"
@@ -1552,5 +1912,11 @@
   },
   "search.filter.locked.server-loader.title": {
     "message": "載入器由伺服器提供"
+  },
+  "settings.sidebar.label.account": {
+    "message": "帳號"
+  },
+  "settings.sidebar.label.display": {
+    "message": "顯示"
   }
 }
diff --git a/apps/frontend/src/locales/de-CH/index.json b/apps/frontend/src/locales/de-CH/index.json
index 751f57167c..07f0fe0b28 100644
--- a/apps/frontend/src/locales/de-CH/index.json
+++ b/apps/frontend/src/locales/de-CH/index.json
@@ -191,6 +191,9 @@
   "analytics.chart.tooltip.hide-entry": {
     "message": "{name} im Diagramm ausblenden"
   },
+  "analytics.chart.tooltip.no-data": {
+    "message": "Keine Daten"
+  },
   "analytics.chart.tooltip.pinned": {
     "message": "Diagramm-Tooltip angeheftet"
   },
@@ -1203,7 +1206,7 @@
     "message": "Details"
   },
   "create-project-version.create-modal.stage.metadata.detected-loaders": {
-    "message": "Erkannte Loader"
+    "message": "Erkannte Plattformen"
   },
   "create-project-version.create-modal.stage.metadata.detected-versions": {
     "message": "Erkannte Versionen"
@@ -1218,7 +1221,7 @@
     "message": "Dateien"
   },
   "create-project-version.create-modal.stage.metadata.loaders": {
-    "message": "Loader"
+    "message": "Plattformen"
   },
   "create-project-version.create-modal.stage.metadata.metadata-tab": {
     "message": "Metadaten"
@@ -1230,13 +1233,13 @@
     "message": "Modpack-Versionen können nicht bearbeitet werden"
   },
   "create-project-version.create-modal.stage.metadata.no-dependencies-added": {
-    "message": "Keine Abhängigkeiten hinzugefügt."
+    "message": "Es wurden keine Abhängigkeiten hinzugefügt."
   },
   "create-project-version.create-modal.stage.metadata.no-environment-set": {
-    "message": "Keine Umgebung wurde festgelegt."
+    "message": "Es wurde keine Umgebung festgelegt."
   },
   "create-project-version.create-modal.stage.metadata.no-loaders-selected": {
-    "message": "Keine Loader ausgewählt."
+    "message": "Es wurden keine Plattformen ausgewählt."
   },
   "create-project-version.create-modal.stage.metadata.no-mod-loader": {
     "message": "Kein Modloader"
@@ -2969,6 +2972,24 @@
   "moderation.page.technicalReview": {
     "message": "Technische Überprüfung"
   },
+  "modpack-scan-modal.batch.label": {
+    "message": "{amount} pro Stapel"
+  },
+  "modpack-scan-modal.batch.placeholder": {
+    "message": "Stapelanzahl"
+  },
+  "modpack-scan-modal.delete-all-groups-confirmation.description": {
+    "message": "Hierdurch werden alle Zuordnungsgruppen für dieses Projekt und alle darin enthaltenen Dateien dauerhaft gelöscht. Diese Aktion kann nicht rückgängig gemacht werden."
+  },
+  "modpack-scan-modal.delete-all-groups.error": {
+    "message": "Fehler beim Löschen aller Gruppen: {error}"
+  },
+  "modpack-scan-modal.delete-all-groups.proceed": {
+    "message": "Löschen"
+  },
+  "modpack-scan-modal.delete-all-groups.success": {
+    "message": "Alle Gruppen wurden gelöscht."
+  },
   "modpack-scan-modal.failed": {
     "message": "Fehlgeschlagen"
   },
@@ -2999,9 +3020,15 @@
   "modpack-scan-modal.scan-all-files": {
     "message": "Alle Dateien scannen"
   },
+  "modpack-scan-modal.scan-error": {
+    "message": "Einige Dateien konnten nicht gescannt werden: \n\n{error}"
+  },
   "modpack-scan-modal.scanning": {
     "message": "Wird gescannt..."
   },
+  "modpack-scan-modal.success": {
+    "message": "Erfolg"
+  },
   "modpack-scan-modal.title": {
     "message": "Modpack-Scan ({scanned}/{total} Dateien)"
   },
@@ -3665,6 +3692,12 @@
   "project.moderation.admonition.under-review.body.3": {
     "message": "Du kannst dein Projekt weiterhin ändern, dies hat keinen Einfluss auf deine Position in der Warteschlange."
   },
+  "project.moderation.admonition.under-review.body.4": {
+    "message": "Wir bemühen uns, Einsendungen innerhalb von 24 bis 48 Stunden zu überprüfen, doch bei einigen Projekten kann es zu Verzögerungen kommen. Dies bedeutet nicht, dass mit deiner Einreichung etwas nicht in Ordnung ist."
+  },
+  "project.moderation.admonition.under-review.body.4.alt-week": {
+    "message": "Wir bemühen uns, Einsendungen innerhalb von einer Woche zu überprüfen, doch bei einigen Projekten kann es zu Verzögerungen kommen. Dies bedeutet nicht, dass mit deiner Einreichung etwas nicht in Ordnung ist."
+  },
   "project.moderation.admonition.under-review.body.5": {
     "message": "<emphasis>Wir schätzen deine Geduld, während unsere Moderatoren hart daran arbeiten, Modrinth sicher zu halten, und freuen uns darauf, dir dabei zu helfen, deine Inhalte zu teilen! 💚</emphasis>"
   },
@@ -4760,12 +4793,24 @@
   "settings.authorizations.about-this-app": {
     "message": "Über diese Anwendung"
   },
+  "settings.authorizations.created-by": {
+    "message": "Erstellt von {user}"
+  },
   "settings.authorizations.description": {
     "message": "Wenn du eine Anwendung mit deinem Modrinth-Konto autorisierst, gewährst du dieser Zugriff auf dein Konto. Du kannst den Zugriff auf dein Konto hier jederzeit verwalten und überprüfen."
   },
+  "settings.authorizations.empty-state.description": {
+    "message": "Von dir autorisierte Anwendungen werden hier angezeigt."
+  },
+  "settings.authorizations.empty-state.heading": {
+    "message": "Keine autorisierten Apps"
+  },
   "settings.authorizations.head-title": {
     "message": "Autorisierungen"
   },
+  "settings.authorizations.official-tooltip": {
+    "message": "Diese App wurde von einem offiziellen Modrinth Konto erstellt."
+  },
   "settings.authorizations.revoke.action": {
     "message": "Widerrufen"
   },
@@ -4775,6 +4820,9 @@
   "settings.authorizations.revoke.confirm.title": {
     "message": "Möchtest du diese Anwendung wirklich widerrufen?"
   },
+  "settings.authorizations.unofficial-disclosure": {
+    "message": "Diese App steht in keiner Verbindung zu Modrinth, trotz ihres Namens."
+  },
   "settings.billing.charges.description": {
     "message": "Hier werden alle bisherigen Belastungen deines Modrinth-Kontos aufgeführt:"
   },
diff --git a/apps/frontend/src/locales/de-DE/index.json b/apps/frontend/src/locales/de-DE/index.json
index 1c5a72c63b..575f938421 100644
--- a/apps/frontend/src/locales/de-DE/index.json
+++ b/apps/frontend/src/locales/de-DE/index.json
@@ -191,6 +191,9 @@
   "analytics.chart.tooltip.hide-entry": {
     "message": "{name} im Diagramm ausblenden"
   },
+  "analytics.chart.tooltip.no-data": {
+    "message": "Keine Daten"
+  },
   "analytics.chart.tooltip.pinned": {
     "message": "Infofenster des Diagramms fixiert"
   },
@@ -429,7 +432,7 @@
     "message": "Spielzeit"
   },
   "analytics.stat.playtime-hours": {
-    "message": "{hours} Std."
+    "message": "{hours} Std"
   },
   "analytics.stat.previous-period-comparison": {
     "message": "im Vergleich zum vorherigen Zeitraum"
@@ -1203,7 +1206,7 @@
     "message": "Details"
   },
   "create-project-version.create-modal.stage.metadata.detected-loaders": {
-    "message": "Erkannte Loader"
+    "message": "Erkannte Plattformen"
   },
   "create-project-version.create-modal.stage.metadata.detected-versions": {
     "message": "Erkannte Versionen"
@@ -1218,7 +1221,7 @@
     "message": "Dateien"
   },
   "create-project-version.create-modal.stage.metadata.loaders": {
-    "message": "Loader"
+    "message": "Plattformen"
   },
   "create-project-version.create-modal.stage.metadata.metadata-tab": {
     "message": "Metadaten"
@@ -1230,13 +1233,13 @@
     "message": "Modpack-Versionen können nicht bearbeitet werden"
   },
   "create-project-version.create-modal.stage.metadata.no-dependencies-added": {
-    "message": "Keine Abhängigkeiten hinzugefügt."
+    "message": "Es wurden keine Abhängigkeiten hinzugefügt."
   },
   "create-project-version.create-modal.stage.metadata.no-environment-set": {
-    "message": "Keine Umgebung wurde festgelegt."
+    "message": "Es wurde keine Umgebung festgelegt."
   },
   "create-project-version.create-modal.stage.metadata.no-loaders-selected": {
-    "message": "Keine Loader ausgewählt."
+    "message": "Es wurden keine Plattformen ausgewählt."
   },
   "create-project-version.create-modal.stage.metadata.no-mod-loader": {
     "message": "Kein Modloader"
@@ -1758,7 +1761,7 @@
     "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%)."
+    "message": "Du hast 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.tremendous-details.withdrawal-amount-min-max": {
     "message": "{min} min, {max} max Auszahlungsbetrag."
@@ -1773,7 +1776,7 @@
     "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."
+    "message": "Du hast dein Auszahlungslimit von <b>{withdrawLimit}</b> aufgebraucht. Du musst ein Steuerformular ausfüllen, um mehr abzuheben."
   },
   "dashboard.discord-roles.banner.body": {
     "message": "Du bist für {roles} qualifiziert. Verknüpfe dein Discord-Konto über Modrinth, dann synchronisieren wir diese automatisch."
@@ -2969,6 +2972,24 @@
   "moderation.page.technicalReview": {
     "message": "Technische Überprüfung"
   },
+  "modpack-scan-modal.batch.label": {
+    "message": "{amount} pro Stapel"
+  },
+  "modpack-scan-modal.batch.placeholder": {
+    "message": "Stapelanzahl"
+  },
+  "modpack-scan-modal.delete-all-groups-confirmation.description": {
+    "message": "Hierdurch werden alle Zuordnungsgruppen für dieses Projekt und alle darin enthaltenen Dateien dauerhaft gelöscht. Diese Aktion kann nicht rückgängig gemacht werden."
+  },
+  "modpack-scan-modal.delete-all-groups.error": {
+    "message": "Fehler beim Löschen aller Gruppen: {error}"
+  },
+  "modpack-scan-modal.delete-all-groups.proceed": {
+    "message": "Löschen"
+  },
+  "modpack-scan-modal.delete-all-groups.success": {
+    "message": "Alle Gruppen wurden gelöscht."
+  },
   "modpack-scan-modal.failed": {
     "message": "Fehlgeschlagen"
   },
@@ -2999,9 +3020,15 @@
   "modpack-scan-modal.scan-all-files": {
     "message": "Alle Dateien scannen"
   },
+  "modpack-scan-modal.scan-error": {
+    "message": "Einige Dateien konnten nicht gescannt werden: \n\n{error}"
+  },
   "modpack-scan-modal.scanning": {
     "message": "Wird gescannt..."
   },
+  "modpack-scan-modal.success": {
+    "message": "Erfolg"
+  },
   "modpack-scan-modal.title": {
     "message": "Modpack-Scan ({scanned}/{total} Dateien)"
   },
@@ -3665,6 +3692,12 @@
   "project.moderation.admonition.under-review.body.3": {
     "message": "Du kannst dein Projekt weiterhin bearbeiten, dies hat keinen Einfluss auf deinen Platz in der Warteschlange."
   },
+  "project.moderation.admonition.under-review.body.4": {
+    "message": "Wir bemühen uns, Einsendungen innerhalb von 24 bis 48 Stunden zu überprüfen, doch bei einigen Projekten kann es zu Verzögerungen kommen. Dies bedeutet nicht, dass mit deiner Einreichung etwas nicht in Ordnung ist."
+  },
+  "project.moderation.admonition.under-review.body.4.alt-week": {
+    "message": "Wir bemühen uns, Einsendungen innerhalb von einer Woche zu überprüfen, doch bei einigen Projekten kann es zu Verzögerungen kommen. Dies bedeutet nicht, dass mit deiner Einreichung etwas nicht in Ordnung ist."
+  },
   "project.moderation.admonition.under-review.body.5": {
     "message": "<emphasis>Wir danken dir für deine Geduld, während unsere Moderatoren daran arbeiten, Modrinth sicher zu halten, und freuen uns darauf, dir dabei zu helfen, deine Inhalte zu teilen! 💚</emphasis>"
   },
@@ -4760,12 +4793,24 @@
   "settings.authorizations.about-this-app": {
     "message": "Über diese Anwendung"
   },
+  "settings.authorizations.created-by": {
+    "message": "Erstellt von {user}"
+  },
   "settings.authorizations.description": {
     "message": "Wenn du eine Anwendung mit deinem Modrinth-Konto autorisierst, gewährst du dieser Zugriff auf dein Konto. Du kannst den Zugriff auf dein Konto hier jederzeit verwalten und überprüfen."
   },
+  "settings.authorizations.empty-state.description": {
+    "message": "Von dir autorisierte Anwendungen werden hier angezeigt."
+  },
+  "settings.authorizations.empty-state.heading": {
+    "message": "Keine autorisierten Apps"
+  },
   "settings.authorizations.head-title": {
     "message": "Autorisierungen"
   },
+  "settings.authorizations.official-tooltip": {
+    "message": "Diese App wurde von einem offiziellen Modrinth Konto erstellt."
+  },
   "settings.authorizations.revoke.action": {
     "message": "Widerrufen"
   },
@@ -4775,6 +4820,9 @@
   "settings.authorizations.revoke.confirm.title": {
     "message": "Möchtest du diese Anwendung wirklich widerrufen?"
   },
+  "settings.authorizations.unofficial-disclosure": {
+    "message": "Diese App steht in keiner Verbindung zu Modrinth, trotz ihres Namens."
+  },
   "settings.billing.charges.description": {
     "message": "Hier werden alle bisherigen Belastungen deines Modrinth-Kontos aufgeführt:"
   },
diff --git a/apps/frontend/src/locales/es-419/index.json b/apps/frontend/src/locales/es-419/index.json
index d78081990a..0a27660346 100644
--- a/apps/frontend/src/locales/es-419/index.json
+++ b/apps/frontend/src/locales/es-419/index.json
@@ -8,6 +8,21 @@
   "admin.billing.error.not-found": {
     "message": "Usuario no encontrado"
   },
+  "ads-consent.accept": {
+    "message": "Aceptar todas"
+  },
+  "ads-consent.body": {
+    "message": "Los anuncios hacen posible a Modrinth y financian los pagos a los creadores. Nuestros socios pueden guardar o acceder a cookies en la aplicación para personalizar anuncios y medir su rendimiento."
+  },
+  "ads-consent.manage": {
+    "message": "Gestionar preferencias"
+  },
+  "ads-consent.reject": {
+    "message": "Rechazar todas"
+  },
+  "ads-consent.title": {
+    "message": "Tu privacidad y como los anuncios apoyan a Modrinth"
+  },
   "analytics.action.add": {
     "message": "Añadir"
   },
@@ -176,6 +191,9 @@
   "analytics.chart.tooltip.hide-entry": {
     "message": "Ocultar {name} en la gráfica"
   },
+  "analytics.chart.tooltip.no-data": {
+    "message": "Sin datos"
+  },
   "analytics.chart.tooltip.pinned": {
     "message": "Información sobre herramientas del gráfico fijada"
   },
@@ -236,6 +254,9 @@
   "analytics.empty.select-project": {
     "message": "Selecciona al menos un proyecto para ver los datos"
   },
+  "analytics.filter.dependent-project-search-failed-title": {
+    "message": "Error al cargar los proyectos dependientes"
+  },
   "analytics.filter.game-version-type": {
     "message": "Tipo de versión de juego"
   },
@@ -932,6 +953,12 @@
   "auth.verify-email.title": {
     "message": "Verificar correo electrónico"
   },
+  "collection.aria-label.upload-icon": {
+    "message": "Ícono de subida"
+  },
+  "collection.button.discover-mods": {
+    "message": "Descubrir mods"
+  },
   "collection.button.edit-icon": {
     "message": "Editar ícono"
   },
@@ -1106,6 +1133,135 @@
   "create-project-version.create-modal.stage.add-files.admonition": {
     "message": "Los archivos complementarios sirven para recursos de apoyo, como código fuente, no para versiones o variantes alternativas."
   },
+  "create-project-version.create-modal.stage.add-files.details-tab": {
+    "message": "Detalles"
+  },
+  "create-project-version.create-modal.stage.add-files.files-tab": {
+    "message": "Archivos"
+  },
+  "create-project-version.create-modal.stage.add-files.metadata-tab": {
+    "message": "Metadatos"
+  },
+  "create-project-version.create-modal.stage.add-files.primary-file-description": {
+    "message": "El archivo principal es el archivo por defecto que descargan los usuarios al instalar el proyecto."
+  },
+  "create-project-version.create-modal.stage.add-files.primary-file-label": {
+    "message": "Archivo principal"
+  },
+  "create-project-version.create-modal.stage.add-files.supplementary-files-description": {
+    "message": "Opcionalmente puedes añadir archivos suplementarios como el código fuente, la documentación o los paquetes de recursos requeridos."
+  },
+  "create-project-version.create-modal.stage.add-files.supplementary-files-label": {
+    "message": "Archivos suplementarios"
+  },
+  "create-project-version.create-modal.stage.add-files.upload-additional-file-aria-label": {
+    "message": "Subir archivo adicional"
+  },
+  "create-project-version.create-modal.stage.add-files.upload-file-aria-label": {
+    "message": "Subir archivo"
+  },
+  "create-project-version.create-modal.stage.add-files.upload-primary-prompt": {
+    "message": "Subir archivos principales y suplementarios"
+  },
+  "create-project-version.create-modal.stage.add-files.upload-secondary-prompt": {
+    "message": "Arrastra y suelta archivos o haz clic para buscar"
+  },
+  "create-project-version.create-modal.stage.details.details-tab": {
+    "message": "Detalles"
+  },
+  "create-project-version.create-modal.stage.details.files-tab": {
+    "message": "Archivos"
+  },
+  "create-project-version.create-modal.stage.details.metadata-tab": {
+    "message": "Metadatos"
+  },
+  "create-project-version.create-modal.stage.details.version-changelog": {
+    "message": "Registro de cambios de versión"
+  },
+  "create-project-version.create-modal.stage.details.version-number": {
+    "message": "Número de versión"
+  },
+  "create-project-version.create-modal.stage.details.version-number-description": {
+    "message": "El número de versión diferencia a esta versión específica de las demás."
+  },
+  "create-project-version.create-modal.stage.details.version-number-placeholder": {
+    "message": "Introduce el número de versión, ej. 1.2.3-alfa.1"
+  },
+  "create-project-version.create-modal.stage.details.version-subtitle": {
+    "message": "Subtítulo de versión"
+  },
+  "create-project-version.create-modal.stage.details.version-subtitle-placeholder": {
+    "message": "Introduce subtítulo..."
+  },
+  "create-project-version.create-modal.stage.details.version-type": {
+    "message": "Tipo de versión"
+  },
+  "create-project-version.create-modal.stage.metadata.add-dependency": {
+    "message": "Añadir dependencia"
+  },
+  "create-project-version.create-modal.stage.metadata.dependencies": {
+    "message": "Dependencias"
+  },
+  "create-project-version.create-modal.stage.metadata.details-tab": {
+    "message": "Detalles"
+  },
+  "create-project-version.create-modal.stage.metadata.detected-loaders": {
+    "message": "Loaders detectados"
+  },
+  "create-project-version.create-modal.stage.metadata.detected-versions": {
+    "message": "Versiones detectadas"
+  },
+  "create-project-version.create-modal.stage.metadata.edit-button": {
+    "message": "Editar"
+  },
+  "create-project-version.create-modal.stage.metadata.environment": {
+    "message": "Ambiente"
+  },
+  "create-project-version.create-modal.stage.metadata.files-tab": {
+    "message": "Archivos"
+  },
+  "create-project-version.create-modal.stage.metadata.loaders": {
+    "message": "Loaders"
+  },
+  "create-project-version.create-modal.stage.metadata.metadata-tab": {
+    "message": "Metadatos"
+  },
+  "create-project-version.create-modal.stage.metadata.modpack-loaders-tooltip": {
+    "message": "No se pueden editar los loaders de un modpack"
+  },
+  "create-project-version.create-modal.stage.metadata.modpack-versions-tooltip": {
+    "message": "No se pueden editar las versiones de un modpack"
+  },
+  "create-project-version.create-modal.stage.metadata.no-dependencies-added": {
+    "message": "No se han añadido dependencias."
+  },
+  "create-project-version.create-modal.stage.metadata.no-environment-set": {
+    "message": "No se ha seleccionado ningún ambiente."
+  },
+  "create-project-version.create-modal.stage.metadata.no-loaders-selected": {
+    "message": "Ningún loader seleccionado."
+  },
+  "create-project-version.create-modal.stage.metadata.no-mod-loader": {
+    "message": "Ningún mod loader"
+  },
+  "create-project-version.create-modal.stage.metadata.no-versions-selected": {
+    "message": "No se ha seleccionado ninguna versión."
+  },
+  "create-project-version.create-modal.stage.metadata.prefilled-environment-tooltip": {
+    "message": "Pre-llenado de una versión similar previa"
+  },
+  "create-project-version.create-modal.stage.metadata.resource-pack-loaders-tooltip": {
+    "message": "No se pueden editar los loaders de un paquete de recursos"
+  },
+  "create-project-version.create-modal.stage.metadata.suggested": {
+    "message": "Sugerido"
+  },
+  "create-project-version.create-modal.stage.metadata.uploaded-files": {
+    "message": "Archivos subidos"
+  },
+  "create-project-version.create-modal.stage.metadata.versions": {
+    "message": "Versiones"
+  },
   "create.collection.collection-info": {
     "message": "Tu nueva colección se creará como una colección pública con {count, plural, =0 {ningún proyecto} one {# proyecto} other {# proyectos}}."
   },
@@ -1202,6 +1358,9 @@
   "create.project.name-placeholder": {
     "message": "Introduce el nombre del proyecto..."
   },
+  "create.project.organization-icon-alt": {
+    "message": "Ícono de {name}"
+  },
   "create.project.owner-description": {
     "message": "Establécete como propietario del proyecto a ti o a una organización de la que seas miembro."
   },
@@ -1232,9 +1391,15 @@
   "create.project.type-server": {
     "message": "Servidor"
   },
+  "create.project.unknown-user": {
+    "message": "Usuario desconocido"
+  },
   "create.project.url-label": {
     "message": "URL"
   },
+  "create.project.user-avatar-alt": {
+    "message": "Avatar del usuario"
+  },
   "create.project.visibility-description": {
     "message": "La visibilidad de tu proyecto después de que sea aprobado."
   },
@@ -1316,6 +1481,9 @@
   "dashboard.collections.sort.recently-updated": {
     "message": "Actualizado recientemente"
   },
+  "dashboard.creator-tax-form-modal.close-button": {
+    "message": "Cerrar"
+  },
   "dashboard.creator-tax-form-modal.confirmation.download-button": {
     "message": "Descargar {formType}"
   },
@@ -1343,6 +1511,12 @@
   "dashboard.creator-tax-form-modal.header": {
     "message": "Formulario fiscal"
   },
+  "dashboard.creator-tax-form-modal.incomplete.text": {
+    "message": "No has completado el formulario fiscal. Por favor inténtalo otra vez."
+  },
+  "dashboard.creator-tax-form-modal.incomplete.title": {
+    "message": "Formulario fiscal incompleto"
+  },
   "dashboard.creator-tax-form-modal.security.description": {
     "message": "Modrinth utiliza al proveedor externo Track1099 para recopilar y almacenar de forma segura tus formularios fiscales. <security-link>Más información aquí.</security-link>"
   },
@@ -1382,6 +1556,9 @@
   "dashboard.creator-withdraw-modal.kyc.business-entity": {
     "message": "Entidad comercial"
   },
+  "dashboard.creator-withdraw-modal.kyc.date-of-birth-placeholder": {
+    "message": "Seleccionar fecha de nacimiento"
+  },
   "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."
   },
@@ -1391,6 +1568,12 @@
   "dashboard.creator-withdraw-modal.kyc.private-individual": {
     "message": "Particular"
   },
+  "dashboard.creator-withdraw-modal.kyc.search-countries-placeholder": {
+    "message": "Buscar países..."
+  },
+  "dashboard.creator-withdraw-modal.kyc.search-subdivisions-placeholder": {
+    "message": "Buscar subdivisiones..."
+  },
   "dashboard.creator-withdraw-modal.method-selection.country-placeholder": {
     "message": "Selecciona tu país"
   },
@@ -1526,6 +1709,21 @@
   "dashboard.creator-withdraw-modal.tremendous-details.enter-denomination-placeholder": {
     "message": "Introduce la cantidad"
   },
+  "dashboard.creator-withdraw-modal.tremendous-details.minimum-denomination-exceeds-balance": {
+    "message": "La denominación mínima es {min}, la cual excede tu balance de {balance}."
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.need-at-least-gift-card": {
+    "message": "Necesitas al menos {min} para usar esta tarjeta de regalo."
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.no-denominations-available": {
+    "message": "No hay denominaciones disponibles para tu actual balance"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.no-suggestions-no-max": {
+    "message": "No hay denominaciones cerca de esta cantidad"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.no-suggestions-with-max": {
+    "message": "No hay denominaciones cerca de esta cantidad. La más alta disponible es {max}."
+  },
   "dashboard.creator-withdraw-modal.tremendous-details.payment-method": {
     "message": "Método de pago"
   },
@@ -1541,6 +1739,12 @@
   "dashboard.creator-withdraw-modal.tremendous-details.search-amount-label": {
     "message": "Buscar cantidad"
   },
+  "dashboard.creator-withdraw-modal.tremendous-details.search-category-placeholder": {
+    "message": "Buscar {category}..."
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.select-category-placeholder": {
+    "message": "Seleccionar {category}"
+  },
   "dashboard.creator-withdraw-modal.tremendous-details.select-denomination-hint": {
     "message": "Selecciona una denominación:"
   },
@@ -1559,6 +1763,12 @@
   "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.tremendous-details.withdrawal-amount-min-max": {
+    "message": "Puedes retirar mínimo {min}, y máximo {max}."
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.withdrawal-amount-min-only": {
+    "message": "Puedes retirar mínimo {min}."
+  },
   "dashboard.creator-withdraw-modal.withdraw-button": {
     "message": "Retirar"
   },
@@ -1925,6 +2135,12 @@
   "dashboard.withdraw.error.minimum-not-met.title": {
     "message": "Monto demasiado bajo"
   },
+  "dashboard.withdraw.error.payout-method-disabled.text": {
+    "message": "Este método de retiro ha sido desactivado por el proveedor de pagos. Por favor use un método diferente o contacte a soporte."
+  },
+  "dashboard.withdraw.error.payout-method-disabled.title": {
+    "message": "Método de retiro no disponible"
+  },
   "dashboard.withdraw.error.paypal-country-mismatch.text": {
     "message": "Por favor, usa el método de transferencia de PayPal para tu region (USA o internacional)."
   },
@@ -2222,6 +2438,24 @@
   "hosting-marketing.medal.text-secondary": {
     "message": "Oferta por tiempo limitado. No se requiere tarjeta de crédito. Disponible para servidores en EE. UU."
   },
+  "hosting-marketing.notification.error-fetching-payment-data-title": {
+    "message": "Error al conseguir datos de pago"
+  },
+  "hosting-marketing.notification.invalid-product-text": {
+    "message": "El producto seleccionado se encontró, pero le faltan datos necesarios. Por favor contacte a soporte."
+  },
+  "hosting-marketing.notification.invalid-product-title": {
+    "message": "Producto inválido"
+  },
+  "hosting-marketing.notification.server-capacity-full-text": {
+    "message": "Ahora mismo estamos en capacidad máxima. Por favor inténtalo otra vez más tarde."
+  },
+  "hosting-marketing.notification.server-capacity-full-title": {
+    "message": "Capacidad de Servidor Llena"
+  },
+  "hosting-marketing.notification.unexpected-error-text": {
+    "message": "Un error inesperado occurrió"
+  },
   "hosting-marketing.pick-customized-plan": {
     "message": "Elige un plan personalizado con solo las especificaciones que necesites."
   },
@@ -2540,6 +2774,21 @@
   "layout.footer.about.status": {
     "message": "Estado"
   },
+  "layout.footer.based-on-label": {
+    "message": "Basado en"
+  },
+  "layout.footer.developer-mode-activated.text": {
+    "message": "El modo desarrollador ha sido activado"
+  },
+  "layout.footer.developer-mode-activated.title": {
+    "message": "Modo desarrollador activado"
+  },
+  "layout.footer.developer-mode-deactivated.text": {
+    "message": "El modo desarrollador ha sido desactivado"
+  },
+  "layout.footer.developer-mode-deactivated.title": {
+    "message": "Modo desarrollador desactivado"
+  },
   "layout.footer.legal": {
     "message": "Legal"
   },
@@ -2609,6 +2858,9 @@
   "layout.footer.social.x": {
     "message": "X"
   },
+  "layout.footer.unknown-commit": {
+    "message": "desconocido"
+  },
   "layout.menu-toggle.action": {
     "message": "Alternar menú"
   },
@@ -2669,6 +2921,36 @@
   "layout.nav.upgrade-to-modrinth-plus": {
     "message": "Actualizar a Modrinth+"
   },
+  "layout.publish.email-verification-required.description": {
+    "message": "Debes verificar tu email antes de empezar a publicar en Modrinth."
+  },
+  "layout.publish.email-verification-required.title": {
+    "message": "Verificación de email requerida"
+  },
+  "modal.shared-instance.open-in-app.benefit.install": {
+    "message": "Instala automáticamente todo lo que estén jugando"
+  },
+  "modal.shared-instance.open-in-app.benefit.join": {
+    "message": "Juega el mismo contenido que tus amigos"
+  },
+  "modal.shared-instance.open-in-app.benefit.update": {
+    "message": "Mantiene el contenido compartido actualizado apenas cambia"
+  },
+  "modal.shared-instance.open-in-app.get-app": {
+    "message": "Obtener la App de Modrinth"
+  },
+  "modal.shared-instance.open-in-app.managed-by": {
+    "message": "Gestionado por"
+  },
+  "modal.shared-instance.open-in-app.opening-automatically": {
+    "message": "La App de Modrinth se abrirá automáticamente..."
+  },
+  "modal.shared-instance.open-in-app.title": {
+    "message": "Abriendo la App de Modrinth"
+  },
+  "modal.shared-instance.open-in-app.why-use": {
+    "message": "Por qué usar la App de Modrinth"
+  },
   "moderation.exclude-technical-review": {
     "message": "Excluir RT"
   },
@@ -2690,6 +2972,24 @@
   "moderation.page.technicalReview": {
     "message": "Revisión técnica"
   },
+  "modpack-scan-modal.batch.label": {
+    "message": "{amount} por página"
+  },
+  "modpack-scan-modal.batch.placeholder": {
+    "message": "Cantidad por página"
+  },
+  "modpack-scan-modal.delete-all-groups-confirmation.description": {
+    "message": "Esto borrará permanentemente todos los grupos de atribución para este proyecto y todos los archivos dentro. Esta acción no se puede deshacer."
+  },
+  "modpack-scan-modal.delete-all-groups.error": {
+    "message": "Error al borrar todos los grupos: {error}"
+  },
+  "modpack-scan-modal.delete-all-groups.proceed": {
+    "message": "Borrar"
+  },
+  "modpack-scan-modal.delete-all-groups.success": {
+    "message": "Todos los grupos fueron borrados exitosamente."
+  },
   "modpack-scan-modal.failed": {
     "message": "Error"
   },
@@ -2720,9 +3020,15 @@
   "modpack-scan-modal.scan-all-files": {
     "message": "Escanear todos los archivos"
   },
+  "modpack-scan-modal.scan-error": {
+    "message": "Algunos archivos no aparecieron en el scan:\n\n{error}"
+  },
   "modpack-scan-modal.scanning": {
     "message": "Escaneando..."
   },
+  "modpack-scan-modal.success": {
+    "message": "Éxito"
+  },
   "modpack-scan-modal.title": {
     "message": "Análisis del modpack ({scanned}/{total} archivos)"
   },
@@ -2993,6 +3299,51 @@
   "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."
   },
+  "organization.button.manage": {
+    "message": "Gestionar"
+  },
+  "organization.button.manage-projects": {
+    "message": "Gestionar proyectos"
+  },
+  "organization.label.downloads": {
+    "message": "descargas"
+  },
+  "organization.label.members": {
+    "message": "miembros"
+  },
+  "organization.label.organization": {
+    "message": "Organización"
+  },
+  "organization.label.projects": {
+    "message": "proyectos"
+  },
+  "organization.project-transfer.id-column": {
+    "message": "ID"
+  },
+  "organization.project-transfer.name-column": {
+    "message": "Nombre"
+  },
+  "organization.project-transfer.no-projects-available": {
+    "message": "No hay proyectos disponibles para transferir."
+  },
+  "organization.project-transfer.project-icon-alt": {
+    "message": "Ícono de {name}"
+  },
+  "organization.project-transfer.title": {
+    "message": "Transferir proyectos"
+  },
+  "organization.project-transfer.transfer-selected-projects": {
+    "message": "Transferir {count, plural, one {# proyecto} other {# proyectos}}"
+  },
+  "organization.project-transfer.type-column": {
+    "message": "Tipo"
+  },
+  "organization.projects.none": {
+    "message": "Esta organización aún no tiene proyectos."
+  },
+  "organization.projects.none-with-create-prompt": {
+    "message": "Esta organización aún no tiene proyectos. ¿Te gustaría <create-link>crear uno</create-link>?"
+  },
   "project-member-header.error-decline": {
     "message": "Error al rechazar la invitación del equipo"
   },
@@ -3116,6 +3467,12 @@
   "project.actions.dont-show-again": {
     "message": "No mostrar de nuevo"
   },
+  "project.actions.edit-project": {
+    "message": "Editar proyecto"
+  },
+  "project.actions.rescan-modpack": {
+    "message": "Re-escanear modpack"
+  },
   "project.actions.review-project": {
     "message": "Revisar proyecto"
   },
@@ -3258,7 +3615,7 @@
     "message": "No se pudieron descargar uno o más archivos. Inténtalo de nuevo."
   },
   "project.download.zip-failed-title": {
-    "message": "No se pudieron descargar los archivos"
+    "message": "Error al descargar los archivos"
   },
   "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 que los metadatos del entorno necesitan ser verificados."
@@ -3290,6 +3647,9 @@
   "project.gallery.title": {
     "message": "Galería"
   },
+  "project.install-context.back-to-discover": {
+    "message": "De vuelta a descubrir"
+  },
   "project.moderation.admonition.approved.body.private": {
     "message": "Tu proyecto es privado, lo que significa que solo pueden acceder tú y las personas a las que invites."
   },
@@ -3332,6 +3692,12 @@
   "project.moderation.admonition.under-review.body.3": {
     "message": "Aún puedes modificar tu proyecto, no afectará tu posición en la cola."
   },
+  "project.moderation.admonition.under-review.body.4": {
+    "message": "Esperamos revisar envíos en 24–48 horas; sin embargo, algunos proyectos pueden sufrir atrasos. Esto no refleja ningún problema con tu envío."
+  },
+  "project.moderation.admonition.under-review.body.4.alt-week": {
+    "message": "Esperamos revisar envíos en un plazo de una semana; sin embargo, algunos proyectos pueden sufrir atrasos. Esto no refleja ningún problema con tu envío."
+  },
   "project.moderation.admonition.under-review.body.5": {
     "message": "<emphasis>¡Apreciamos tu paciencia mientras nuestros moderadores trabajan duro para mantener Modrinth seguro, y estaremos encantados de poder ayudarte a compartir tu contenido! 💚</emphasis>"
   },
@@ -3449,6 +3815,21 @@
   "project.settings.permissions.completed.title": {
     "message": "¡Permisos completados!"
   },
+  "project.settings.permissions.delete-all-groups": {
+    "message": "Borrar todos los grupos"
+  },
+  "project.settings.permissions.delete-all-groups-confirmation.description": {
+    "message": "Esto borrará permanentemente {count,  plural, one {el grupo de atribución} other {los # grupos de atribución}} de este proyecto y todos los archivos dentro. Esta acción no se puede deshacer."
+  },
+  "project.settings.permissions.delete-all-groups-confirmation.title": {
+    "message": "¿Borrar todos los grupos de atribución?"
+  },
+  "project.settings.permissions.delete-all-groups-error": {
+    "message": "Error al borrar los grupos de atribución"
+  },
+  "project.settings.permissions.delete-all-groups-success": {
+    "message": "Todos los grupos de atribución fueron borrados."
+  },
   "project.settings.permissions.empty-state.description": {
     "message": "Ninguna de las versiones de tu proyecto contiene contenido externo, así que no necesitas preocuparte por obtener permisos."
   },
@@ -3465,7 +3846,7 @@
     "message": "No se puede incluir parte del contenido"
   },
   "project.settings.permissions.info-banner.description": {
-    "message": "Si incluyes contenido que no esté alojado en Modrinth, debes informarnos de dónde proviene y verificar que tienes permiso para distribuir los archivos. Consulta <link>nuestro anuncio de este nuevo sistema</link> para obtener más información."
+    "message": "Si incluyes contenido que no esté alojado en Modrinth, debes informarnos de dónde proviene y verificar que tienes permiso para distribuir los archivos. ¡Consulta <link>nuestro anuncio de este nuevo sistema</link> para obtener más información!"
   },
   "project.settings.permissions.info-banner.title": {
     "message": "Aprende sobre los permisos de distribución"
@@ -3497,6 +3878,102 @@
   "project.settings.permissions.sort.status": {
     "message": "Estado"
   },
+  "project.settings.server.bedrock-address-label": {
+    "message": "Dirección en Bedrock"
+  },
+  "project.settings.server.cannot-save-text": {
+    "message": "El servidor de Java debe ser alcanzable antes de poder guardar. Por favor asegúrate de que el ping sea exitoso."
+  },
+  "project.settings.server.cannot-save-title": {
+    "message": "No se puede guardar"
+  },
+  "project.settings.server.details-heading": {
+    "message": "Detalles del servidor"
+  },
+  "project.settings.server.enter-address-placeholder": {
+    "message": "Introducir dirección"
+  },
+  "project.settings.server.java-address-label": {
+    "message": "Dirección en Java"
+  },
+  "project.settings.server.languages-label": {
+    "message": "Idiomas"
+  },
+  "project.settings.server.latency-label": {
+    "message": "Latencia: {latency}ms"
+  },
+  "project.settings.server.optional-label": {
+    "message": "opcional"
+  },
+  "project.settings.server.ping-failed-message": {
+    "message": "No pudimos pingear a este servidor. Puede estar bloqueado por tu host, así que vuelve a reintentar unas cuantas veces. Si todavía no responde, por favor <support-link>contacte a soporte</support-link>."
+  },
+  "project.settings.server.refresh-ping-tooltip": {
+    "message": "Reintentar ping"
+  },
+  "project.settings.server.region-label": {
+    "message": "Región"
+  },
+  "project.settings.server.select-languages-placeholder": {
+    "message": "Seleccionar idiomas"
+  },
+  "project.settings.server.select-region-placeholder": {
+    "message": "Seleccionar región"
+  },
+  "project.settings.server.server-online": {
+    "message": "¡El servidor está en línea!"
+  },
+  "project.settings.server.srv-records-hint": {
+    "message": "Si tienes un <srv-tooltip>[registro SRV]</srv-tooltip> no necesitas añadir un puerto. Si no, si tienes un puerto que no sea 25565, puedes incluirlo como :12345"
+  },
+  "project.settings.server.srv-records-tooltip": {
+    "message": "La dirección que ingreses aquí puede tener registros DNS SRV _minecraft._tcp.(tu dominio) que apuntan a la dirección y el puerto de tu servidor de Minecraft."
+  },
+  "project.settings.tags.all-tags-selected-warning": {
+    "message": "Has seleccionado las {count} etiquetas disponibles. Por favor, selecciona solo las etiquetas que de verdad apliquen en tu proyecto."
+  },
+  "project.settings.tags.categories-description": {
+    "message": "Selecciona todas las categorías que reflejen los temas o la función de tu {type}."
+  },
+  "project.settings.tags.featured-tags": {
+    "message": "Etiquetas destacadas"
+  },
+  "project.settings.tags.featured-tags-description": {
+    "message": "Puedes destacar hasta 3 de tus etiquetas más relevantes. Otras etiquetas pueden ser promovidas a destacadas si no seleccionas las 3 completas."
+  },
+  "project.settings.tags.features-description": {
+    "message": "Selecciona todas las características que tu {type} usa."
+  },
+  "project.settings.tags.multiple-resolution-tags-warning": {
+    "message": "Has seleccionado {count} etiquetas de resolución ({tags}). Típicamente los paquetes de recursos solo deberían de tener una."
+  },
+  "project.settings.tags.performance-impact-description": {
+    "message": "Selecciona el impacto al rendimiento realista de tu {type}. Selecciona varias si el {type} es configurable para tener diferentes niveles de impacto al rendimiento."
+  },
+  "project.settings.tags.resolutions-description": {
+    "message": "Selecciona la(s) resolución(es) de las texturas de tu {type}."
+  },
+  "project.settings.tags.select-at-least-one-category": {
+    "message": "Selecciona al menos una categoría para destacar una categoría."
+  },
+  "project.settings.tags.tagging-importance-description": {
+    "message": "Seleccionar etiquetas relevantes es importante para ayudar a la gente a encontrar tu {type}. Asegúrate de seleccionar todas las etiquetas que apliquen."
+  },
+  "project.settings.tags.title": {
+    "message": "Etiquetas"
+  },
+  "project.settings.tags.too-many-tags-project-warning": {
+    "message": "Has seleccionado {count} etiquetas. Considera reducirlas a 8 o menos para mantener tu proyecto enfocado y que sea más fácil de descubrir."
+  },
+  "project.settings.tags.too-many-tags-server-hard-warning": {
+    "message": "Has seleccionado {count} etiquetas. Considera reducirlas a 18 o menos para mantener tu servidor enfocado y que sea más fácil de descubrir."
+  },
+  "project.settings.tags.too-many-tags-server-soft-warning": {
+    "message": "Has seleccionado {count} etiquetas. Considera reducirlas a 12 o menos para mantener tu servidor enfocado y que sea más fácil de descubrir."
+  },
+  "project.settings.tags.upload-version-first": {
+    "message": "Por favor, ¡sube una versión primero para poder seleccionar etiquetas!"
+  },
   "project.settings.title": {
     "message": "Configuración"
   },
@@ -3506,9 +3983,51 @@
   "project.status.archived.message": {
     "message": "{title} se ha archivado. {title} no recibirá más actualizaciones hasta que el autor decida desarchivar el proyecto."
   },
+  "project.versions.copy-id-option": {
+    "message": "Copiar ID"
+  },
+  "project.versions.copy-link-option": {
+    "message": "Copiar link"
+  },
+  "project.versions.copy-maven-coordinates-option": {
+    "message": "Copiar coordenadas de Maven"
+  },
+  "project.versions.delete-button": {
+    "message": "Borrar"
+  },
+  "project.versions.delete-confirm.description": {
+    "message": "Esto borrará esta versión para siempre (¡mucho tiempo!)."
+  },
+  "project.versions.delete-confirm.title": {
+    "message": "¿Estás seguro de querer borrar esta versión?"
+  },
+  "project.versions.edit-details-option": {
+    "message": "Editar detalles"
+  },
+  "project.versions.edit-files-option": {
+    "message": "Editar archivos"
+  },
+  "project.versions.edit-metadata-option": {
+    "message": "Editar metadatos"
+  },
+  "project.versions.edit-version-tooltip": {
+    "message": "Editar versión"
+  },
+  "project.versions.open-in-new-tab-option": {
+    "message": "Abrir en una pestaña nueva"
+  },
+  "project.versions.share-option": {
+    "message": "Compartir"
+  },
   "project.versions.title": {
     "message": "Versiones"
   },
+  "project.versions.version-deleted-text": {
+    "message": "La versión fue borrada exitosamente."
+  },
+  "project.versions.version-deleted-title": {
+    "message": "Versión borrada"
+  },
   "project.versions.withheld-versions-warning.description": {
     "message": "{count, plural, one {Esta versión está retenida y no listada} other {Estas versiones están retenidas y no listadas}} públicamente. Por favor, proporciona pruebas de que tienes permiso para redistribuir algunos de los archivos incluidos en {count, plural, one {la versión} other {las versiones}} del modpack."
   },
@@ -3923,6 +4442,12 @@
   "servers.plan.small.description": {
     "message": "Perfecto para 1–5 amigos con algunos mods ligeros."
   },
+  "servers.purchase.step.plan.most-popular": {
+    "message": "La más popular"
+  },
+  "servers.purchase.step.plan.per-month-billing": {
+    "message": "/ mes{interval, select, monthly {} other {, facturado {interval, select, quarterly {trimestralmente} yearly {anualmente} other {{interval}}}}}"
+  },
   "settings.account.button.complete-setup": {
     "message": "Finalizar configuración"
   },
@@ -4056,10 +4581,10 @@
     "message": "Mi clave de acceso"
   },
   "settings.account.security.passkey.add-modal.title": {
-    "message": "Agregar clave de acceso"
+    "message": "Añadir clave de acceso"
   },
   "settings.account.security.passkey.add.button": {
-    "message": "Agregar clave de acceso"
+    "message": "Añadir clave de acceso"
   },
   "settings.account.security.passkey.button": {
     "message": "Administrar claves de acceso"
@@ -4185,7 +4710,7 @@
     "message": "Añadir más"
   },
   "settings.applications.button.add-redirect-uri": {
-    "message": "Agregar un URI de redirección"
+    "message": "Añadir un URI de redirección"
   },
   "settings.applications.button.create": {
     "message": "Crear aplicación"
@@ -4268,12 +4793,24 @@
   "settings.authorizations.about-this-app": {
     "message": "Acerca de esta aplicación"
   },
+  "settings.authorizations.created-by": {
+    "message": "Creado por {user}"
+  },
   "settings.authorizations.description": {
     "message": "Cuando autorizas una aplicación con tu cuenta de Modrinth, le concedes acceso a tu cuenta. Puedes gestionar y revisar los accesos a tu cuenta aquí en cualquier momento."
   },
+  "settings.authorizations.empty-state.description": {
+    "message": "Las aplicaciones que autorices aparecerán aquí."
+  },
+  "settings.authorizations.empty-state.heading": {
+    "message": "Sin aplicaciones autorizadas"
+  },
   "settings.authorizations.head-title": {
     "message": "Autorizaciones"
   },
+  "settings.authorizations.official-tooltip": {
+    "message": "Esta app fue creada por una cuenta oficial de Modrinth."
+  },
   "settings.authorizations.revoke.action": {
     "message": "Revocar"
   },
@@ -4283,6 +4820,9 @@
   "settings.authorizations.revoke.confirm.title": {
     "message": "¿Estás seguro que quieres revocar esta aplicación?"
   },
+  "settings.authorizations.unofficial-disclosure": {
+    "message": "Esta app no está afiliada con Modrinth de ninguna forma, a pesar de su nombre."
+  },
   "settings.billing.charges.description": {
     "message": "Todos los cargos realizados a tu cuenta de Modrinth se mostrarán aquí:"
   },
@@ -4368,7 +4908,7 @@
     "message": "O {price} / año (¡ahorra {percent}%!)"
   },
   "settings.billing.payment_method.action.add": {
-    "message": "Agregar método de pago"
+    "message": "Añadir método de pago"
   },
   "settings.billing.payment_method.action.history": {
     "message": "Ver cargos anteriores"
@@ -4658,6 +5198,33 @@
   "settings.sidebar.label.display": {
     "message": "Visualización"
   },
+  "shared-instance.invite.accept": {
+    "message": "Aceptar invitación"
+  },
+  "shared-instance.invite.inviter.unknown": {
+    "message": "Un usuario de Modrinth"
+  },
+  "shared-instance.invite.joined-count": {
+    "message": "{count, plural, one {# persona se ha} other {# personas se han}} unido"
+  },
+  "shared-instance.invite.loading": {
+    "message": "Cargando invitación…"
+  },
+  "shared-instance.invite.title": {
+    "message": "{name} te ha invitado a jugar"
+  },
+  "shared-instance.invite.trust.description": {
+    "message": "Esta invitación fue creada por un usuario de Modrinth y no por Modrinth Oficial. Nunca aceptes invitaciones de gente que no conozcas."
+  },
+  "shared-instance.invite.trust.heading": {
+    "message": "¿Conoces a este usuario?"
+  },
+  "shared-instance.invite.unavailable.description": {
+    "message": "Puede haber expirado, llegado a su límite de usos o haber sido eliminado por la persona que lo compartió."
+  },
+  "shared-instance.invite.unavailable.title": {
+    "message": "Esta invitación no está disponible"
+  },
   "ui.latest-news-row.latest-news": {
     "message": "Últimas noticias de Modrinth"
   },
@@ -4730,6 +5297,18 @@
   "version.environment.unknown.title": {
     "message": "Entorno desconocido"
   },
+  "version.notification.deleted-text": {
+    "message": "La versión fue borrada existosamente."
+  },
+  "version.notification.deleted-title": {
+    "message": "Versión borrada"
+  },
+  "version.notification.packaging-success-text": {
+    "message": "¡Tu data pack se empaquetó exitosamente como mod! Asegúrate de probarlo para revisar si hay errores."
+  },
+  "version.notification.packaging-success-title": {
+    "message": "Empaquetado exitoso"
+  },
   "version.package-as-mod.button": {
     "message": "Empaquetar como mod"
   },
diff --git a/apps/frontend/src/locales/es-ES/index.json b/apps/frontend/src/locales/es-ES/index.json
index 51c1a75596..cf4cab466d 100644
--- a/apps/frontend/src/locales/es-ES/index.json
+++ b/apps/frontend/src/locales/es-ES/index.json
@@ -8,6 +8,9 @@
   "admin.billing.error.not-found": {
     "message": "Usuario no encontrado"
   },
+  "ads-consent.title": {
+    "message": "Tu privacidad y como anuncios soportan Modrinth"
+  },
   "analytics.action.add": {
     "message": "Añadir"
   },
@@ -737,6 +740,48 @@
   "auth.authorize.redirect-url": {
     "message": "Serás redirigido a <redirect-url>{url}</redirect-url>"
   },
+  "auth.create-account.date-of-birth.invalid.text": {
+    "message": "Por favor entra una fecha de nacimiento. Año no puede ser 0000."
+  },
+  "auth.create-account.date-of-birth.invalid.title": {
+    "message": "Fecha de nacimiento inválida"
+  },
+  "auth.create-account.date-of-birth.label": {
+    "message": "Fecha de nacimiento"
+  },
+  "auth.create-account.date-of-birth.placeholder": {
+    "message": "Selecciona tu fecha de nacimiento"
+  },
+  "auth.create-account.date-of-birth.required.text": {
+    "message": "Por favor pon tu fecha de nacimiento antes de continuar."
+  },
+  "auth.create-account.date-of-birth.required.title": {
+    "message": "Fecha de nacimiento requerido"
+  },
+  "auth.create-account.date-of-birth.under13-helper": {
+    "message": "No cumples con el requisito para tener una cuenta en Modrinth."
+  },
+  "auth.create-account.info-panel.source-code-link": {
+    "message": "Código Fuente relevante"
+  },
+  "auth.create-account.info-panel.text": {
+    "message": "No guardamos tu fecha de nacimiento. Lo usamos durante el registro para validar la COPPA."
+  },
+  "auth.create-account.page-title": {
+    "message": "Crear Cuenta"
+  },
+  "auth.create-account.subscribe.label": {
+    "message": "Actualízame de cosas interesantes que Modrinth hace vía correo"
+  },
+  "auth.create-account.title": {
+    "message": "Crear una cuenta"
+  },
+  "auth.create-account.username.label": {
+    "message": "Usuario"
+  },
+  "auth.create-account.username.placeholder": {
+    "message": "Su nombre de usuario"
+  },
   "auth.reset-password.method-choice.action": {
     "message": "Enviar correo de recuperación"
   },
@@ -770,24 +815,66 @@
   "auth.reset-password.title.long": {
     "message": "Restablecer tu contraseña"
   },
+  "auth.sign-in.2fa.description": {
+    "message": "Introduce el código de 6 dígitos de tu aplicación de autenticación o tus códigos de respaldo."
+  },
+  "auth.sign-in.2fa.label": {
+    "message": "Autenticación de dos factores"
+  },
   "auth.sign-in.2fa.placeholder": {
     "message": "Introducir código..."
   },
+  "auth.sign-in.continue-with-email": {
+    "message": "Continuar vía Correo"
+  },
+  "auth.sign-in.continue-with-passkey": {
+    "message": "Continuar vía clave de acceso"
+  },
+  "auth.sign-in.create-account": {
+    "message": "Registrar"
+  },
+  "auth.sign-in.forgot-password": {
+    "message": "Me olvide de la contraseña"
+  },
+  "auth.sign-in.last-sign-in": {
+    "message": "Última vez usado"
+  },
+  "auth.sign-in.no-account": {
+    "message": "¿No tienes una cuenta?"
+  },
+  "auth.sign-in.sign-in-with": {
+    "message": "Iniciar Sesión en Modrinth"
+  },
   "auth.sign-in.title": {
     "message": "Iniciar sesión"
   },
+  "auth.sign-up.continue-with-email": {
+    "message": "Continuar con Correo"
+  },
   "auth.sign-up.legal-dislaimer": {
     "message": "Al crear una cuenta, tú aceptas los <terms-link>Términos</terms-link> y <privacy-policy-link>Política de Privacidad</privacy-policy-link> de Modrinth."
   },
+  "auth.sign-up.show-fewer-options": {
+    "message": "Mostrar menos opciones"
+  },
+  "auth.sign-up.show-other-options": {
+    "message": "Mostrar otras opciones"
+  },
   "auth.sign-up.sign-in-option.title": {
     "message": "¿Ya tienes una cuenta?"
   },
   "auth.sign-up.title": {
     "message": "Registro"
   },
+  "auth.sign-up.title.sign-up-with": {
+    "message": "Crear una cuenta"
+  },
   "auth.verify-email.action.account-settings": {
     "message": "Ajustes de cuenta"
   },
+  "auth.verify-email.action.discover-mods": {
+    "message": "Descubre modificaciones"
+  },
   "auth.verify-email.already-verified.description": {
     "message": "¡Tu correo electrónico ya está verificado!"
   },
@@ -806,6 +893,15 @@
   "auth.verify-email.failed-verification.title": {
     "message": "Verificación de correo electrónico fallida"
   },
+  "auth.verify-email.notification.email-sent.description": {
+    "message": "Un correo con un enlace para verificar tu cuenta fue enviado a {email}."
+  },
+  "auth.verify-email.notification.email-sent.title": {
+    "message": "Correo enviado"
+  },
+  "auth.verify-email.notification.error-occurred.title": {
+    "message": "Un error ocurrió"
+  },
   "auth.verify-email.post-verification.description": {
     "message": "¡Tu correo electrónico ha sido verificado correctamente!"
   },
@@ -815,6 +911,12 @@
   "auth.verify-email.title": {
     "message": "Verificar correo electrónico"
   },
+  "collection.aria-label.upload-icon": {
+    "message": "Subir Icono"
+  },
+  "collection.button.discover-mods": {
+    "message": "Descubrir modificaciones"
+  },
   "collection.button.edit-icon": {
     "message": "Editar icono"
   },
@@ -989,6 +1091,12 @@
   "create-project-version.create-modal.stage.add-files.admonition": {
     "message": "Los archivos complementarios son para recursos de soporte, como el código fuente, no para versiones alternativas o variantes."
   },
+  "create-project-version.create-modal.stage.add-files.details-tab": {
+    "message": "Detalles"
+  },
+  "create-project-version.create-modal.stage.add-files.files-tab": {
+    "message": "Archivos"
+  },
   "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}}."
   },
diff --git a/apps/frontend/src/locales/fr-FR/index.json b/apps/frontend/src/locales/fr-FR/index.json
index 4b04ddb3a9..b5365bf740 100644
--- a/apps/frontend/src/locales/fr-FR/index.json
+++ b/apps/frontend/src/locales/fr-FR/index.json
@@ -102,7 +102,7 @@
     "message": "Annotations"
   },
   "analytics.chart.controls.aria": {
-    "message": "Contrôles du graphique d’analytique, {activeCount}"
+    "message": "Contrôles du graphique de statistiques, {activeCount}"
   },
   "analytics.chart.controls.button": {
     "message": "Contrôles"
@@ -191,6 +191,9 @@
   "analytics.chart.tooltip.hide-entry": {
     "message": "Masquer {name} dans le graphique"
   },
+  "analytics.chart.tooltip.no-data": {
+    "message": "Aucune donnée"
+  },
   "analytics.chart.tooltip.pinned": {
     "message": "Infobulle du graphique épinglée"
   },
@@ -417,7 +420,7 @@
     "message": "Téléchargements"
   },
   "analytics.stat.monetization-banner.body": {
-    "message": "Seuls les vues et les téléchargements effectués via Modrinth sont éligibles à la monétisation et doivent passer un filtrage de prévention de la fraude. Les téléchargements de l'application Modrinth exigent également que l'utilisateur soit connecté. Parce que tous les projets ont un ratio similaire de téléchargements monétisés, vos revenus ne changeraient pas de manière significative si tous les téléchargements étaient comptés."
+    "message": "Seuls les vues et les téléchargements effectués via Modrinth sont éligibles à la monétisation et doivent passer un filtrage de prévention de la fraude. Les téléchargements de Modrinth App exigent également que l'utilisateur soit connecté. Parce que tous les projets ont un ratio similaire de téléchargements monétisés, vos revenus ne changeraient pas de manière significative si tous les téléchargements étaient comptés."
   },
   "analytics.stat.monetization-banner.learn-more": {
     "message": "En savoir plus"
@@ -1715,6 +1718,12 @@
   "dashboard.creator-withdraw-modal.tremendous-details.no-denominations-available": {
     "message": "Aucun montant disponible pour votre solde actuel"
   },
+  "dashboard.creator-withdraw-modal.tremendous-details.no-suggestions-no-max": {
+    "message": "Aucune dénomination proche de ce montant"
+  },
+  "dashboard.creator-withdraw-modal.tremendous-details.no-suggestions-with-max": {
+    "message": "Aucune dénomination proche de ce montant. Le maximum disponible est {max}."
+  },
   "dashboard.creator-withdraw-modal.tremendous-details.payment-method": {
     "message": "Méthode de paiement"
   },
@@ -2019,7 +2028,7 @@
     "message": "Signalements actifs"
   },
   "dashboard.sidebar.label.analytics": {
-    "message": "Analytiques"
+    "message": "Statistiques"
   },
   "dashboard.sidebar.label.creators": {
     "message": "Créateurs"
@@ -2928,19 +2937,19 @@
     "message": "Gardez le contenu partagé à jour dès qu'il change"
   },
   "modal.shared-instance.open-in-app.get-app": {
-    "message": "Obtenir l'application Modrinth"
+    "message": "Obtenir Modrinth App"
   },
   "modal.shared-instance.open-in-app.managed-by": {
     "message": "Géré par"
   },
   "modal.shared-instance.open-in-app.opening-automatically": {
-    "message": "L'application Modrinth va automatiquement ouvrir..."
+    "message": "Modrinth App va automatiquement ouvrir..."
   },
   "modal.shared-instance.open-in-app.title": {
-    "message": "Ouverture de l'application Modrinth"
+    "message": "Ouverture de Modrinth App"
   },
   "modal.shared-instance.open-in-app.why-use": {
-    "message": "Pourquoi utiliser l'application Modrinth"
+    "message": "Pourquoi utiliser Modrinth App"
   },
   "moderation.exclude-technical-review": {
     "message": "Exclure la révision technique"
@@ -2963,9 +2972,24 @@
   "moderation.page.technicalReview": {
     "message": "Revue technique"
   },
+  "modpack-scan-modal.batch.label": {
+    "message": "{amount} par lot"
+  },
+  "modpack-scan-modal.batch.placeholder": {
+    "message": "Quantité de lot"
+  },
+  "modpack-scan-modal.delete-all-groups-confirmation.description": {
+    "message": "Ceci va supprimer de façon permanente tous les groupes d'attribut pour ce projet et tous les fichiers à l'intérieur. Cette action ne peut pas être défaite."
+  },
+  "modpack-scan-modal.delete-all-groups.error": {
+    "message": "Le nettoyage des groupes a échoué : {error}"
+  },
   "modpack-scan-modal.delete-all-groups.proceed": {
     "message": "Effacer"
   },
+  "modpack-scan-modal.delete-all-groups.success": {
+    "message": "Tous les groupes ont été nettoyés avec succès."
+  },
   "modpack-scan-modal.failed": {
     "message": "Échec"
   },
@@ -3668,6 +3692,12 @@
   "project.moderation.admonition.under-review.body.3": {
     "message": "Vous pouvez toujours modifier votre projet, cela n'affectera pas votre position dans la file d'attente."
   },
+  "project.moderation.admonition.under-review.body.4": {
+    "message": "Nous visons à examiner les soumissions en 24-48 heures, mais certains projets peuvent faire face à des délais. Cela ne reflète pas un problème avec votre soumission."
+  },
+  "project.moderation.admonition.under-review.body.4.alt-week": {
+    "message": "Nous visons à examiner les soumissions en une semaine, mais certains projets peuvent faire face à des délais. Cela ne reflète pas un problème avec votre soumission."
+  },
   "project.moderation.admonition.under-review.body.5": {
     "message": "<emphasis>Nous apprécions votre patience pendant que nos modérateurs travaillent dur pour garder Modrinth en sécurité, et nous sommes impatients de vous aider à partager votre contenu !</emphasis>"
   },
@@ -3794,6 +3824,12 @@
   "project.settings.permissions.delete-all-groups-confirmation.title": {
     "message": "Supprimer tous les groupes d'attribution ?"
   },
+  "project.settings.permissions.delete-all-groups-error": {
+    "message": "Impossible de supprimer tous les groupes d'attribution"
+  },
+  "project.settings.permissions.delete-all-groups-success": {
+    "message": "Tous les groupes d’attribution ont été supprimés."
+  },
   "project.settings.permissions.empty-state.description": {
     "message": "Aucune des versions de votre projet ne contient de contenu externe, vous n'avez donc pas à vous soucier d'obtenir des autorisations."
   },
@@ -3887,6 +3923,12 @@
   "project.settings.server.server-online": {
     "message": "Le serveur est en ligne !"
   },
+  "project.settings.server.srv-records-hint": {
+    "message": "Si vous avez des <srv-tooltip>[enregistrements SRV]</srv-tooltip>, vous n’avez pas besoin d’ajouter de port. Sinon, si vous avez un port qui n’est pas 25565, vous pouvez l’inclure sous la forme :12345"
+  },
+  "project.settings.server.srv-records-tooltip": {
+    "message": "L’adresse que vous saisissez ici peut avoir des enregistrements DNS SRV _minecraft._tcp.(votre domaine) qui redirigent vers l’adresse et le port de votre serveur Minecraft."
+  },
   "project.settings.tags.all-tags-selected-warning": {
     "message": "Vous avez sélectionné tous les {count} tags disponibles. Merci de seulement sélectionner les tags qui s'appliquent réellement à votre projet."
   },
@@ -4077,7 +4119,7 @@
     "message": "Lire les analyses"
   },
   "scopes.category.analytics": {
-    "message": "Analytique"
+    "message": "Statistiques"
   },
   "scopes.category.collections": {
     "message": "Collections"
@@ -4403,6 +4445,9 @@
   "servers.purchase.step.plan.most-popular": {
     "message": "Le plus populaire"
   },
+  "servers.purchase.step.plan.per-month-billing": {
+    "message": "/ mois{interval, select, monthly {} other {, facturé {interval, select, quarterly {trimestriellement} yearly {annuellement} other {{interval}}}}}"
+  },
   "settings.account.button.complete-setup": {
     "message": "Terminer la configuration"
   },
@@ -4748,12 +4793,24 @@
   "settings.authorizations.about-this-app": {
     "message": "À propos de cette application"
   },
+  "settings.authorizations.created-by": {
+    "message": "Créé par {user}"
+  },
   "settings.authorizations.description": {
     "message": "Lorsque vous autorisez une application avec votre compte Modrinth, vous lui accordez l’accès à votre compte. Vous pouvez gérer et consulter les accès à votre compte ici à tout moment."
   },
+  "settings.authorizations.empty-state.description": {
+    "message": "Les applications que vous autorisez vont apparaître ici."
+  },
+  "settings.authorizations.empty-state.heading": {
+    "message": "Aucune application autorisée"
+  },
   "settings.authorizations.head-title": {
     "message": "Autorisations"
   },
+  "settings.authorizations.official-tooltip": {
+    "message": "Cette application est créée par un compte Modrinth officiel."
+  },
   "settings.authorizations.revoke.action": {
     "message": "Révoquer"
   },
@@ -4763,6 +4820,9 @@
   "settings.authorizations.revoke.confirm.title": {
     "message": "Êtes-vous sûr·e de vouloir révoquer cette application ?"
   },
+  "settings.authorizations.unofficial-disclosure": {
+    "message": "Cette application n'est pas affiliée avec Modrinth de quelque manière que ce soit, malgré le nom."
+  },
   "settings.billing.charges.description": {
     "message": "Toutes vos transactions passées sur votre compte Modrinth seront affichées ici :"
   },
diff --git a/apps/frontend/src/locales/hu-HU/index.json b/apps/frontend/src/locales/hu-HU/index.json
index a837ca3cc2..a3c459e2b0 100644
--- a/apps/frontend/src/locales/hu-HU/index.json
+++ b/apps/frontend/src/locales/hu-HU/index.json
@@ -423,7 +423,7 @@
     "message": "{hours} óra"
   },
   "analytics.stat.previous-period-comparison": {
-    "message": "az előző időszakhoz képest"
+    "message": "az elő. idősz. kép."
   },
   "analytics.stat.previous-period-comparison-short": {
     "message": "az előzőhöz képest"
@@ -558,7 +558,7 @@
     "message": "A Modrinth App letöltésével elfogadod a <terms-link>feltételeket</terms-link> és a <privacy-link>biztonsági szabályzatot</privacy-link>."
   },
   "app-marketing.download.title": {
-    "message": "Modrinth App letöltése (béta)"
+    "message": "A Modrinth App letöltése (béta)"
   },
   "app-marketing.download.windows": {
     "message": "Windows"
@@ -699,13 +699,13 @@
     "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"
+    "message": "A Modrinth App letöltése"
   },
   "app-marketing.hero.download-modrinth-app": {
-    "message": "Modrinth App letöltése"
+    "message": "A Modrinth App letöltése"
   },
   "app-marketing.hero.download-modrinth-app-for-os": {
-    "message": "Modrinth App letöltése {os} rendszerre"
+    "message": "A Modrinth App letöltése {os} rendszerre"
   },
   "app-marketing.hero.minecraft-screenshot-alt": {
     "message": "A Cobblemon modcsomag főmenüjének képernyőképe."
@@ -846,7 +846,7 @@
     "message": "Folytatás e-maillel"
   },
   "auth.sign-in.continue-with-passkey": {
-    "message": "Továbblépés biztonsági kulccsal"
+    "message": "Továbblépés azonosítókulccsal"
   },
   "auth.sign-in.create-account": {
     "message": "Regisztráció"
@@ -1674,19 +1674,19 @@
     "message": "Elérted a(z) <b>{withdrawLimit}</b> kifizetési limitet. További kifizetésekhez ki kell töltened egy adózási űrlapot."
   },
   "dashboard.discord-roles.banner.body": {
-    "message": "Jogosult vagy a következő rangokra: {roles}. Kapcsold össze a Discord fiókodat a Modrinth-en keresztül, és automatikusan szinkronizáljuk őket."
+    "message": "Jogosult vagy a következő rangokra: {roles}. Kapcsold össze a Discord fiókodat a Modrinthon keresztül, és automatikusan szinkronizáljuk őket."
   },
   "dashboard.discord-roles.banner.cta": {
-    "message": "Discord Linkelése"
+    "message": "Link a Discordra"
   },
   "dashboard.discord-roles.banner.title": {
-    "message": "Discord Rangjaid Beváltása"
+    "message": "Vedd át a Discord-rangjaidat!"
   },
   "dashboard.discord-roles.role.big-creator": {
-    "message": "1M+ letöltést"
+    "message": "1M+ letöltés"
   },
   "dashboard.discord-roles.role.creator": {
-    "message": "Készítő"
+    "message": "Fejlesztő"
   },
   "dashboard.discord-roles.role.pride": {
     "message": "Pride 2026"
@@ -2036,6 +2036,9 @@
   "discover.install.error.no-server-world": {
     "message": "Nem található szerver világ ami letölthető."
   },
+  "discover.install.error.unsupported-content-type": {
+    "message": "Ez a tartalomtípus nem telepíthető a szerverre a Felfedezésből."
+  },
   "error.collection.404.list_item.1": {
     "message": "Elírhatad a gyűjtemémyed linkjét."
   },
@@ -2685,7 +2688,7 @@
     "message": "Tölts le Minecraft modokat, bővítményeket, adatcsomagokat, shadereket, forráscsomagokat és modcsomagokat a Modrinthról. Fedezd fel és tedd közzé projektjeidet a Modrinthon egy modern, könnyen használható felületen és API-n keresztül."
   },
   "layout.meta.og-description": {
-    "message": "Fedezd fel és tegyél közzé Minecraft tartalmakat!"
+    "message": "Fedezz fel és tegyél közzé Minecraft tartalmakat!"
   },
   "layout.mobile.close-menu": {
     "message": "Menü bezárása"
@@ -2744,6 +2747,30 @@
   "layout.publish.email-verification-required.title": {
     "message": "E-mail hitelesítés szükséges"
   },
+  "modal.shared-instance.open-in-app.benefit.install": {
+    "message": "Automatikusan letölt mindent, amivel ők játszanak"
+  },
+  "modal.shared-instance.open-in-app.benefit.join": {
+    "message": "Ugyanazzal a tartalommal játszhatsz, mint a barátaid"
+  },
+  "modal.shared-instance.open-in-app.benefit.update": {
+    "message": "A megosztott tartalmakat automatikusan naprakészen tartja"
+  },
+  "modal.shared-instance.open-in-app.get-app": {
+    "message": "Szerezd meg a Modrinth Appot"
+  },
+  "modal.shared-instance.open-in-app.managed-by": {
+    "message": "Kezelő:"
+  },
+  "modal.shared-instance.open-in-app.opening-automatically": {
+    "message": "A Modrinth App automatikusan megnyílik..."
+  },
+  "modal.shared-instance.open-in-app.title": {
+    "message": "A Modrinth App megnyitása…"
+  },
+  "modal.shared-instance.open-in-app.why-use": {
+    "message": "Miért érdemes a Modrinth Appot használni?"
+  },
   "moderation.moderate": {
     "message": "Moderálás"
   },
@@ -2759,6 +2786,9 @@
   "moderation.page.technicalReview": {
     "message": "Technikai áttekintés"
   },
+  "modpack-scan-modal.delete-all-groups-confirmation.description": {
+    "message": "Ezzel véglegesen törlődik a projekt összes hozzárendelési csoportja és a hozzá tartozó összes fájl. Ez a művelet NEM vonható vissza!"
+  },
   "modpack-scan-modal.failed": {
     "message": "Sikertelen"
   },
@@ -3296,6 +3326,9 @@
   "project.download.no-game-versions-found": {
     "message": "Játékverzió nem található"
   },
+  "project.download.no-versions-available": {
+    "message": "Nem érhető el verzió ehhez: {platform} {gameVersion}."
+  },
   "project.download.platform-unsupported-tooltip": {
     "message": "A(z) {title} nem támogatja ezt a verziót: {platform} {gameVersion}"
   },
@@ -3395,6 +3428,9 @@
   "project.moderation.admonition.under-review.header": {
     "message": "Projekt áttekintés alatt"
   },
+  "project.moderation.admonition.withheld.body": {
+    "message": "A projekted nem fog nyilvánosan megjelenni, és csak közvetlen hivatkozással lesz elérhető.{requestedStatus, select, unlisted { A kiválasztott <visibility-settings-link>láthatósági beállítások</visibility-settings-link> alapján valószínűleg nincs szükség további teendőre.} other { Kérjük, a projekt újbóli beküldése előtt oldj meg minden moderálási problémát, beleértve az alábbi üzenetekben felsoroltakat is.}}"
+  },
   "project.moderation.thread.title": {
     "message": "Moderációs üzenetek"
   },
@@ -3467,9 +3503,15 @@
   "project.settings.permissions.attention-needed.description.proj-draft": {
     "message": "Kélek mielőtt benyújtanád a projekedet felülvizsgálatra, igazold, hogy rendelkezel az alábbi fájlok mindegyikének továbbterjesztésére vonatkozó engedéllyel."
   },
+  "project.settings.permissions.attention-needed.title": {
+    "message": "Ismeretlen külső tartalom"
+  },
   "project.settings.permissions.bad-proof.description": {
     "message": "A Modrinth moderátori csapata elutasította az általad bizonyos külső tartalmakhoz megadott engedélyezési információkat. Kérlek tekintsd át az alábbi elutasított elemeket, és nyújts be elfogadható igazolást, vagy távolítsd el a tartalmat."
   },
+  "project.settings.permissions.bad-proof.title": {
+    "message": "Néhány bizonyítást elutasítottak"
+  },
   "project.settings.permissions.collapse-all": {
     "message": "Összes becsukása"
   },
@@ -3479,15 +3521,54 @@
   "project.settings.permissions.completed.title": {
     "message": "Engedélyek beállítva!"
   },
+  "project.settings.permissions.delete-all-groups": {
+    "message": "Az összes csoport törlése"
+  },
+  "project.settings.permissions.delete-all-groups-confirmation.description": {
+    "message": "Ezzel véglegesen törlődik a projekt összes hozzárendelési csoportja, valamint az azokban található összes fájl. Ez a művelet visszafordíthatatlan."
+  },
+  "project.settings.permissions.delete-all-groups-confirmation.title": {
+    "message": "Az összes hozzárendelési csoport törlése?"
+  },
+  "project.settings.permissions.delete-all-groups-error": {
+    "message": "Nem sikerült az összes hozzárendelési csoportot törölni"
+  },
+  "project.settings.permissions.delete-all-groups-success": {
+    "message": "Az összes hozzárendelési csoport törölve lett."
+  },
+  "project.settings.permissions.empty-state.description": {
+    "message": "A projekted egyetlen verziója sem tartalmaz külső tartalmat, ezért nem kell aggódnod a jogosultságok beszerzése miatt."
+  },
   "project.settings.permissions.empty-state.heading": {
     "message": "Kész is van!"
   },
   "project.settings.permissions.expand-all": {
     "message": "Összes kinyitása"
   },
+  "project.settings.permissions.fail.description": {
+    "message": "Lehet, hogy nincs engedélyed a projektedben szereplő egyes külső tartalmak továbbterjesztésére. A Modrinthon való közzétételhez kérjük, távolítsd el ezeket a tartalmakat, vagy nyújts be igazolást arról, hogy rendelkezel a felhasználásukhoz szükséges engedéllyel."
+  },
+  "project.settings.permissions.fail.title": {
+    "message": "Egyes tartalmak nem szerepelhetnek a projektben"
+  },
+  "project.settings.permissions.info-banner.description": {
+    "message": "Ha olyan tartalmat tesz közzé, amely nem a Modrinthon van tárolva, akkor jelezned kell nekünk, honnan származik, és igazolnod kell, hogy rendelkezel a fájlok terjesztéséhez szükséges engedéllyel. További információkért nézd meg <link>az új rendszerről szóló bejelentésünket</link>!"
+  },
+  "project.settings.permissions.info-banner.title": {
+    "message": "Ismerd meg a terjesztési engedélyeket"
+  },
   "project.settings.permissions.learn-more": {
     "message": "További információ"
   },
+  "project.settings.permissions.no-results": {
+    "message": "Egy külső fájl sem egyezik a kereséssel."
+  },
+  "project.settings.permissions.not-allowed.description": {
+    "message": "A felvett külső tartalmak közül néhányat nem lehet a Modrinthon terjeszteni, mivel azok megsértik a tartalmi szabályzatunkat, ezért azokat el kell távolítani."
+  },
+  "project.settings.permissions.pending-approval-count": {
+    "message": "{count, plural,\n=0 {Nincs jóváhagyásra váró hozzárendelés}\none {# hozzárendelés vár jóváhagyásra}\nother {# hozzárendelés vár jóváhagyásra}\n}"
+  },
   "project.settings.permissions.search-placeholder": {
     "message": "Keresés {count} projekt között..."
   },
@@ -3503,9 +3584,102 @@
   "project.settings.permissions.sort.status": {
     "message": "Állapot"
   },
+  "project.settings.server.bedrock-address-label": {
+    "message": "Bedrock cím"
+  },
+  "project.settings.server.cannot-save-text": {
+    "message": "A mentés előtt elérhetőnek kell lennie a Java szervernek. Kérjük, győződj meg arról, hogy a ping-parancs sikeres."
+  },
+  "project.settings.server.cannot-save-title": {
+    "message": "Nem lehet menteni"
+  },
+  "project.settings.server.details-heading": {
+    "message": "A szerver adatai"
+  },
+  "project.settings.server.enter-address-placeholder": {
+    "message": "Cím beírása"
+  },
+  "project.settings.server.java-address-label": {
+    "message": "Java cím"
+  },
+  "project.settings.server.languages-label": {
+    "message": "Nyelvek"
+  },
+  "project.settings.server.latency-label": {
+    "message": "Késleltetés: {latency} ms"
+  },
+  "project.settings.server.optional-label": {
+    "message": "opcionális"
+  },
+  "project.settings.server.ping-failed-message": {
+    "message": "Nem sikerült pingelnünk ezt a szervert. Lehet, hogy a szolgáltatód blokkolja, ezért próbáld meg néhányszor frissíteni az oldalt. Ha továbbra sem válaszol, kérjük, <support-link>fordulj az ügyfélszolgálathoz</support-link>."
+  },
+  "project.settings.server.refresh-ping-tooltip": {
+    "message": "Újrapróbálkozás"
+  },
+  "project.settings.server.region-label": {
+    "message": "Régió"
+  },
+  "project.settings.server.select-languages-placeholder": {
+    "message": "Nyelvek kiválasztása"
+  },
+  "project.settings.server.select-region-placeholder": {
+    "message": "Régió kiválasztása"
+  },
+  "project.settings.server.server-online": {
+    "message": "A szerver elérhető!"
+  },
+  "project.settings.server.srv-records-hint": {
+    "message": "Ha rendelkezel <srv-tooltip>[SRV-rekordokkal]</srv-tooltip>, akkor nem kell portot hozzáadnod. Ellenkező esetben, ha a port száma nem 25565, akkor azt a következő formában adhatod meg: :12345"
+  },
+  "project.settings.server.srv-records-tooltip": {
+    "message": "Az itt megadott címhez tartozhatnak olyan DNS SRV-bejegyzések, mint például _minecraft._tcp.(a domainod), amelyek a Minecraft-szerver címére és portjára mutatnak."
+  },
+  "project.settings.tags.all-tags-selected-warning": {
+    "message": "Mind a {count} elérhető címkét kiválasztottad. Kérjük, csak azokat a címkéket válaszd ki, amelyek valóban vonatkoznak a projektedre."
+  },
+  "project.settings.tags.categories-description": {
+    "message": "Jelöld ki az összes olyan kategóriát, amely tükrözi a {type} témáit vagy funkcióját."
+  },
+  "project.settings.tags.featured-tags": {
+    "message": "Kiemelt címkék"
+  },
+  "project.settings.tags.featured-tags-description": {
+    "message": "Legfeljebb 3 legrelevánsabb címkét jelölhetsz ki kiemeltként. Ha nem választod ki mind a 3-at, akkor a többi címke is kiemeltként jelenhet meg."
+  },
+  "project.settings.tags.features-description": {
+    "message": "Jelöld ki az összes olyan funkciót, amelyet a {type} használ."
+  },
   "project.settings.tags.multiple-resolution-tags-warning": {
     "message": "{count} felbontási címkét választottál ki ({tags}). A forráscsomagoknak általában csak egy felbontási címkéjük lehet."
   },
+  "project.settings.tags.performance-impact-description": {
+    "message": "Válaszd ki a shadered teljesítményre való hatását. Válassz ki többet, ha a shader különböző teljesítményhatás-szintekre állítható be."
+  },
+  "project.settings.tags.resolutions-description": {
+    "message": "Válaszd ki a {type} textúráinak felbontását (vagy felbontásait)."
+  },
+  "project.settings.tags.select-at-least-one-category": {
+    "message": "Válassz ki legalább egy kategóriát ahhoz, hogy kiemelj egy kategóriát."
+  },
+  "project.settings.tags.tagging-importance-description": {
+    "message": "A pontos címkézés fontos ahhoz, hogy a {type} könnyebben me. Feltétlenül válaszd ki az összes releváns címkét."
+  },
+  "project.settings.tags.title": {
+    "message": "Címkék"
+  },
+  "project.settings.tags.too-many-tags-project-warning": {
+    "message": "{count} címkét választottál ki. Fontold meg, hogy 8-ra vagy annál kevesebbre csökkentsd a számukat, hogy a projekted célzott maradjon és könnyebben megtalálható legyen."
+  },
+  "project.settings.tags.too-many-tags-server-hard-warning": {
+    "message": "{count} címkét választottál ki. Kérjük, csökkentsd a számukat 18-ra vagy annál kevesebbre, hogy a szervered célzott maradjon és könnyebben megtalálható legyen."
+  },
+  "project.settings.tags.too-many-tags-server-soft-warning": {
+    "message": "{count} címkét választottál ki. Fontold meg, hogy 12-re vagy annál kevesebbre csökkentsd a számukat, hogy a szervered célzott maradjon és könnyebben megtalálható legyen."
+  },
+  "project.settings.tags.upload-version-first": {
+    "message": "A címkék kiválasztásához előbb tölts fel egy verziót!"
+  },
   "project.settings.title": {
     "message": "Beállítások"
   },
@@ -3515,6 +3689,21 @@
   "project.status.archived.message": {
     "message": "A(z) {title} archiválásra került. A(z) {title} nem kap további frissítéseket, kivéve, ha a fejlesztő úgy dönt, hogy visszavonja a projekt archiválását."
   },
+  "project.versions.copy-id-option": {
+    "message": "Azonosító másolása"
+  },
+  "project.versions.copy-link-option": {
+    "message": "Link másolása"
+  },
+  "project.versions.delete-button": {
+    "message": "Törlés"
+  },
+  "project.versions.delete-confirm.description": {
+    "message": "Ezzel a verzió véglegesen (tényleg véglegesen) törlésre kerül."
+  },
+  "project.versions.delete-confirm.title": {
+    "message": "Biztos, hogy le akarod törölni ezt a verziót?"
+  },
   "project.versions.edit-details-option": {
     "message": "Részletek szerkesztése"
   },
@@ -3527,9 +3716,21 @@
   "project.versions.edit-version-tooltip": {
     "message": "Verzió szerkesztése"
   },
+  "project.versions.open-in-new-tab-option": {
+    "message": "Megnytás új lapon"
+  },
+  "project.versions.share-option": {
+    "message": "Megosztás"
+  },
   "project.versions.title": {
     "message": "Verziók"
   },
+  "project.versions.version-deleted-text": {
+    "message": "A verzió törlése sikeresen megtörtént."
+  },
+  "project.versions.version-deleted-title": {
+    "message": "Verzió törölve"
+  },
   "project.versions.withheld-versions-warning.description": {
     "message": "{count, plural, one {Ez a verzió} other {Ezek a verziók}} jelenleg vissza van tartva, és nem érhető{count, plural, one {} other {k}} el nyilvánosan. Kérjük, igazold, hogy engedéllyel rendelkezel a modcsomag {count, plural, one {verziójában} other {verzióiban}} található bizonyos fájlok terjesztésére."
   },
@@ -3914,6 +4115,12 @@
   "servers.plan.small.description": {
     "message": "Tökéletes 1–5 barát számára, néhány kisebb moddal."
   },
+  "servers.purchase.step.plan.most-popular": {
+    "message": "Legnépszerűbb"
+  },
+  "servers.purchase.step.plan.per-month-billing": {
+    "message": "/ month{interval, select, monthly {} other {, billed {interval, select, quarterly {quarterly} yearly {yearly} other {{interval}}}}}"
+  },
   "settings.account.button.complete-setup": {
     "message": "Beállítás befejezése"
   },
@@ -3927,7 +4134,7 @@
     "message": "Exportálás..."
   },
   "settings.account.data-export.description": {
-    "message": "Másolatot kér az összes személyes adatról, amelyet a Modrinthra feltöltött. A feldolgozás néhány percig is eltarthat."
+    "message": "Másolatot kér az összes személyes adatról, amelyet a Modrinthra feltöltöttél. A feldolgozás néhány percig is eltarthat."
   },
   "settings.account.data-export.title": {
     "message": "Adatok exportálása"
@@ -4037,8 +4244,56 @@
   "settings.account.security.email.title": {
     "message": "E-mail cím"
   },
+  "settings.account.security.passkey.add-modal.name.description": {
+    "message": "Ügyelj rá, hogy valami könnyen megjegyezhetőt válassz, hogy később is fel tudd idézni ezt az azonosítókulcsot."
+  },
+  "settings.account.security.passkey.add-modal.name.label": {
+    "message": "Név"
+  },
+  "settings.account.security.passkey.add-modal.name.placeholder": {
+    "message": "Az azonosítókulcsom"
+  },
+  "settings.account.security.passkey.add-modal.title": {
+    "message": "Azonosítókulcs hozzáadása"
+  },
+  "settings.account.security.passkey.add.button": {
+    "message": "Azonosítókulcs hozzáadása"
+  },
+  "settings.account.security.passkey.button": {
+    "message": "Azonosítókulcsok kezelése"
+  },
+  "settings.account.security.passkey.description": {
+    "message": "Kezeld a regisztrált azonosítókulcsokat, vagy adj hozzá újat."
+  },
   "settings.account.security.passkey.modal.added": {
-    "message": "Hozzá adva {ago}"
+    "message": "Hozzáadva {ago}"
+  },
+  "settings.account.security.passkey.modal.last-used": {
+    "message": "Utoljára használva {ago}"
+  },
+  "settings.account.security.passkey.modal.loading": {
+    "message": "Azonosítókulcsok betöltése..."
+  },
+  "settings.account.security.passkey.modal.never-used": {
+    "message": "Sohasem volt használva"
+  },
+  "settings.account.security.passkey.modal.no-passkeys": {
+    "message": "Nincs regisztrált azonosítókulcsod."
+  },
+  "settings.account.security.passkey.remove.button": {
+    "message": "Azonosítókulcs törlése"
+  },
+  "settings.account.security.passkey.remove.description": {
+    "message": "Ez véglegesen eltávolítja a(z) „{name}” azonosítókulcsot. Ezután már nem tudsz majd ezzel bejelentkezni."
+  },
+  "settings.account.security.passkey.remove.title": {
+    "message": "Biztosan el akarod távolítani ezt az azonosítókulcsot?"
+  },
+  "settings.account.security.passkey.rename-modal.header": {
+    "message": "Azonosítókulcs átnevezése"
+  },
+  "settings.account.security.passkey.title": {
+    "message": "Azonosítókulcsok kezelése"
   },
   "settings.account.security.password.action.add": {
     "message": "Jelszó hozzáadása"
@@ -4113,7 +4368,7 @@
     "message": "Ha a QR-kód nem olvassa be a kódot, manuálisan is megadhatja a titkos kódot:"
   },
   "settings.account.two-factor.setup.scan": {
-    "message": "Olvassa be a QR-kódot az <authy-link>Authy</authy-link>, a <microsoft-authenticator-link>Microsoft Authenticator</microsoft-authenticator-link> vagy bármely más kétlépcsős hitelesítési alkalmazás segítségével a folyamat megkezdéséhez."
+    "message": "Olvasd be a QR-kódot az <authy-link>Authy</authy-link>, a <microsoft-authenticator-link>Microsoft Authenticator</microsoft-authenticator-link> vagy bármely más kétlépcsős hitelesítési alkalmazás segítségével a folyamat megkezdéséhez."
   },
   "settings.account.two-factor.verify.description": {
     "message": "Írja be az hitelesítőalkalmazásból kapott egyszeri kódot a hozzáférés igazolásához."
@@ -4211,6 +4466,9 @@
   "settings.authorizations.about-this-app": {
     "message": "Az alkalmazásról"
   },
+  "settings.authorizations.created-by": {
+    "message": "Létrehozta: {user}"
+  },
   "settings.authorizations.description": {
     "message": "Amikor engedélyezel egy alkalmazást a Modrinth fiókoddal, hozzáférést biztosítasz számára a fiókodhoz. A fiókodhoz való hozzáférést bármikor kezelheted és ellenőrizheted itt."
   },
@@ -4332,13 +4590,13 @@
     "message": "Fizetési módok"
   },
   "settings.billing.plan.title": {
-    "message": "{size} terv"
+    "message": "{size} csomag"
   },
   "settings.billing.price.per-interval": {
     "message": "{price} / {interval}"
   },
   "settings.billing.pyro.cpu": {
-    "message": "{shared} Megosztott CPU-k (maximum {bursts} CPU-ig terjedő löketek)"
+    "message": "{shared} megosztott CPU (maximum {bursts} CPU-ig terjedő löketek)"
   },
   "settings.billing.pyro.linked-server.not-found": {
     "message": "Nem található ehhez az előfizetéshez csatolt szerver. Ennek több lehetséges magyarázata is van. Ha nemrég vásároltad meg a szervert, ez normális. A szerver kiépítése akár egy órát is igénybe vehet. Ellenkező esetben, ha egy ideje vásároltad meg ezt a szervert, valószínűleg azóta felfüggesztették. Ha nem erre számítottál, kérjük, vedd fel a kapcsolatot a Modrinth ügyfélszolgálatával a következő információkkal:"
@@ -4403,6 +4661,12 @@
   "settings.billing.subscription.title": {
     "message": "Előfizetések"
   },
+  "settings.billing.switch.switching-to-interval": {
+    "message": "Átváltás {interval, select, monthly {havontaira} yearly {éventeire} other {{interval}}}..."
+  },
+  "settings.billing.switch.to-interval": {
+    "message": "Átváltás {interval, select, monthly {havontaira} yearly {éventeire} other {{interval}}}"
+  },
   "settings.billing.switch.tooltip.monthly-additional-per-year": {
     "message": "A havi számlázás évente további {amount} költséggel jár"
   },
@@ -4592,9 +4856,33 @@
   "settings.sidebar.label.display": {
     "message": "Megjelenés"
   },
+  "shared-instance.invite.accept": {
+    "message": "Meghívó elfogadása"
+  },
+  "shared-instance.invite.inviter.unknown": {
+    "message": "Egy Modrinth felhasználó"
+  },
   "shared-instance.invite.joined-count": {
     "message": "{count} személy már csatlakozott"
   },
+  "shared-instance.invite.loading": {
+    "message": "Meghívó betöltése…"
+  },
+  "shared-instance.invite.title": {
+    "message": "{name} meghívott egy játékprofilba"
+  },
+  "shared-instance.invite.trust.description": {
+    "message": "Ezt a meghívót nem a Modrinth, hanem egy másik Modrinth-felhasználó hozta létre. Csak olyan személyektől fogadd el a meghívókat, akikben megbízol."
+  },
+  "shared-instance.invite.trust.heading": {
+    "message": "Ismered ezt a felhasználót?"
+  },
+  "shared-instance.invite.unavailable.description": {
+    "message": "Lehet, hogy lejárt, elérte a felhasználási korlátját, vagy eltávolította az, aki megosztotta."
+  },
+  "shared-instance.invite.unavailable.title": {
+    "message": "Ez a meghívó nem érhető el"
+  },
   "ui.latest-news-row.latest-news": {
     "message": "A legújabb hírek a Modrinthról"
   },
@@ -4610,9 +4898,15 @@
   "ui.newsletter-button.tooltip": {
     "message": "Feliratkozás a Modrinth hírlevelére"
   },
+  "version.confirm-delete.proceed": {
+    "message": "Verzió törlése"
+  },
   "version.confirm-delete.title": {
     "message": "Biztos, hogy le akarod törölni ezt a verziót?"
   },
+  "version.dependency.view-project": {
+    "message": "Projekt megtekintése"
+  },
   "version.download.download-dependency": {
     "message": "Válassz ki egy verziót a letöltéshez"
   },
diff --git a/apps/frontend/src/locales/it-IT/index.json b/apps/frontend/src/locales/it-IT/index.json
index 147b5344f9..1d60b77e9e 100644
--- a/apps/frontend/src/locales/it-IT/index.json
+++ b/apps/frontend/src/locales/it-IT/index.json
@@ -185,6 +185,9 @@
   "analytics.chart.tooltip.hide-entry": {
     "message": "Nascondi {name} dal grafico"
   },
+  "analytics.chart.tooltip.no-data": {
+    "message": "Nessun dato"
+  },
   "analytics.chart.tooltip.pinned": {
     "message": "Suggerimento del grafico fissato"
   },
@@ -3534,7 +3537,7 @@
     "message": "Scarica come .zip"
   },
   "project.download.download-version": {
-    "message": "Scarica {version}"
+    "message": "Scarica la {version}"
   },
   "project.download.download-with-dependencies": {
     "message": "Scarica con dipendenze"
@@ -4242,7 +4245,7 @@
     "message": "Creare segnalazioni"
   },
   "scopes.reportDelete.description": {
-    "message": "Permetti l'eliminazione di segnalazioni"
+    "message": "Permetti l'eliminazione delle segnalazioni"
   },
   "scopes.reportDelete.label": {
     "message": "Eliminare segnalazioni"
@@ -4748,12 +4751,24 @@
   "settings.authorizations.about-this-app": {
     "message": "Info sull'app"
   },
+  "settings.authorizations.created-by": {
+    "message": "Creato da {user}"
+  },
   "settings.authorizations.description": {
     "message": "Quando autorizzi un'applicazione, le concedi l'accesso al tuo account Modrinth. Qui puoi gestirne e controllarne l'accesso in qualsiasi momento."
   },
+  "settings.authorizations.empty-state.description": {
+    "message": "Le applicazioni autorizzate appariranno qui."
+  },
+  "settings.authorizations.empty-state.heading": {
+    "message": "Nessuna app autorizzata"
+  },
   "settings.authorizations.head-title": {
     "message": "Autorizzazioni"
   },
+  "settings.authorizations.official-tooltip": {
+    "message": "Questa app è stata creata da un account Modrinth ufficiale."
+  },
   "settings.authorizations.revoke.action": {
     "message": "Revoca"
   },
@@ -4763,6 +4778,9 @@
   "settings.authorizations.revoke.confirm.title": {
     "message": "Vuoi davvero revocare questa applicazione?"
   },
+  "settings.authorizations.unofficial-disclosure": {
+    "message": "Questa app non è affiliata con Modrinth, nonostante il suo nome."
+  },
   "settings.billing.charges.description": {
     "message": "Tutti gli addebiti passati del tuo account Modrinth saranno mostrati qui:"
   },
@@ -5211,7 +5229,7 @@
     "message": "Pacchetto di risorse obbligatorio"
   },
   "version.download.version": {
-    "message": "Scarica {version} ({size})"
+    "message": "Scarica la {version} ({size})"
   },
   "version.edit.button": {
     "message": "Modifica"
diff --git a/apps/frontend/src/locales/ja-JP/index.json b/apps/frontend/src/locales/ja-JP/index.json
index 7dde5c5570..07dc22bc11 100644
--- a/apps/frontend/src/locales/ja-JP/index.json
+++ b/apps/frontend/src/locales/ja-JP/index.json
@@ -137,6 +137,9 @@
   "analytics.chart.tooltip.dependent-on-project": {
     "message": "{project} に依存"
   },
+  "analytics.chart.tooltip.dependent-project-version": {
+    "message": "{dependentProject} は {dependencyProject} の {version} に依存しています"
+  },
   "analytics.chart.tooltip.total": {
     "message": "合計"
   },
@@ -198,7 +201,7 @@
     "message": "ソースを検索..."
   },
   "analytics.filter.search.members": {
-    "message": "メンバーを検索..."
+    "message": "メンバーを検索…"
   },
   "analytics.filter.search.project-versions": {
     "message": "プロジェクトバージョンを検索…"
diff --git a/apps/frontend/src/locales/ko-KR/index.json b/apps/frontend/src/locales/ko-KR/index.json
index 33619cbc35..a88933f469 100644
--- a/apps/frontend/src/locales/ko-KR/index.json
+++ b/apps/frontend/src/locales/ko-KR/index.json
@@ -191,6 +191,9 @@
   "analytics.chart.tooltip.hide-entry": {
     "message": "그래프에서 {name} 숨기기"
   },
+  "analytics.chart.tooltip.no-data": {
+    "message": "데이터 없음"
+  },
   "analytics.chart.tooltip.pinned": {
     "message": "차트 툴팁 고정됨"
   },
@@ -2132,6 +2135,12 @@
   "dashboard.withdraw.error.minimum-not-met.title": {
     "message": "금액이 너무 적습니다"
   },
+  "dashboard.withdraw.error.payout-method-disabled.text": {
+    "message": "이 정산 수단은 결제 서비스 제공업체에서 비활성화했습니다. 다른 정산 수단을 사용하거나 고객 지원팀에 문의하세요."
+  },
+  "dashboard.withdraw.error.payout-method-disabled.title": {
+    "message": "정산 수단을 사용할 수 없음"
+  },
   "dashboard.withdraw.error.paypal-country-mismatch.text": {
     "message": "귀하의 지역에 맞는 올바른 PayPal 송금 옵션을 사용해 주세요."
   },
@@ -2918,6 +2927,30 @@
   "layout.publish.email-verification-required.title": {
     "message": "이메일 승인이 필요합니다"
   },
+  "modal.shared-instance.open-in-app.benefit.install": {
+    "message": "친구들이 플레이 중인 모든 콘텐츠 자동 설치"
+  },
+  "modal.shared-instance.open-in-app.benefit.join": {
+    "message": "친구와 동일한 콘텐츠 플레이"
+  },
+  "modal.shared-instance.open-in-app.benefit.update": {
+    "message": "공유된 콘텐츠가 변경될 때마다 최신 상태 유지"
+  },
+  "modal.shared-instance.open-in-app.get-app": {
+    "message": "Modrinth App 받기"
+  },
+  "modal.shared-instance.open-in-app.managed-by": {
+    "message": "관리자:"
+  },
+  "modal.shared-instance.open-in-app.opening-automatically": {
+    "message": "Modrinth App이 자동으로 열립니다..."
+  },
+  "modal.shared-instance.open-in-app.title": {
+    "message": "Modrinth App 실행 중"
+  },
+  "modal.shared-instance.open-in-app.why-use": {
+    "message": "Modrinth App을 사용해야 하는 이유"
+  },
   "moderation.exclude-technical-review": {
     "message": "기술 검토 제외"
   },
@@ -2939,6 +2972,24 @@
   "moderation.page.technicalReview": {
     "message": "기술 리뷰"
   },
+  "modpack-scan-modal.batch.label": {
+    "message": "배치당 {amount}개"
+  },
+  "modpack-scan-modal.batch.placeholder": {
+    "message": "배치 수량"
+  },
+  "modpack-scan-modal.delete-all-groups-confirmation.description": {
+    "message": "이 프로젝트의 모든 기여 그룹 및 내부 파일이 영구 삭제됩니다. 이 작업은 되돌릴 수 없습니다."
+  },
+  "modpack-scan-modal.delete-all-groups.error": {
+    "message": "모든 그룹 삭제 실패: {error}"
+  },
+  "modpack-scan-modal.delete-all-groups.proceed": {
+    "message": "삭제"
+  },
+  "modpack-scan-modal.delete-all-groups.success": {
+    "message": "모든 그룹 삭제 완료."
+  },
   "modpack-scan-modal.failed": {
     "message": "실패"
   },
@@ -2969,9 +3020,15 @@
   "modpack-scan-modal.scan-all-files": {
     "message": "전체 파일 스캔"
   },
+  "modpack-scan-modal.scan-error": {
+    "message": "일부 파일 스캔 실패: {error}"
+  },
   "modpack-scan-modal.scanning": {
     "message": "스캔중..."
   },
+  "modpack-scan-modal.success": {
+    "message": "성공"
+  },
   "modpack-scan-modal.title": {
     "message": "모드팩 스캔 ({scanned}/{total} 파일)"
   },
@@ -3635,6 +3692,12 @@
   "project.moderation.admonition.under-review.body.3": {
     "message": "프로젝트를 수정해도 대기열 우선 순위에는 영향을 미치지 않습니다."
   },
+  "project.moderation.admonition.under-review.body.4": {
+    "message": "24~48시간 이내에 제출 항목을 검토하고자 하나, 일부 프로젝트 검토가 지연될 수 있습니다. 제출 항목의 문제를 의미하지는 않습니다."
+  },
+  "project.moderation.admonition.under-review.body.4.alt-week": {
+    "message": "1주일 이내에 제출 항목을 검토하고자 하나, 일부 프로젝트 검토가 지연될 수 있습니다. 제출 항목의 문제를 의미하지는 않습니다."
+  },
   "project.moderation.admonition.under-review.body.5": {
     "message": "<emphasis>운영진들이 Modrinth의 안전한 환경을 유지하기 위해 최선을 다하고 있는 동안 기다려 주셔서 감사합니다. 여러분의 콘텐츠를 공유하실 수 있도록 도와드릴 수 있기를 기대합니다! 💚</emphasis>"
   },
@@ -3752,6 +3815,21 @@
   "project.settings.permissions.completed.title": {
     "message": "권한 확인 완료!"
   },
+  "project.settings.permissions.delete-all-groups": {
+    "message": "모든 그룹 삭제"
+  },
+  "project.settings.permissions.delete-all-groups-confirmation.description": {
+    "message": "이 프로젝트의 모든 {count, plural, other {#개 기여 그룹}} 및 내부 파일이 영구 삭제됩니다. 이 작업은 되돌릴 수 없습니다."
+  },
+  "project.settings.permissions.delete-all-groups-confirmation.title": {
+    "message": "모든 기여 그룹을 삭제하시겠습니까?"
+  },
+  "project.settings.permissions.delete-all-groups-error": {
+    "message": "모든 기여 그룹을 삭제할 수 없습니다"
+  },
+  "project.settings.permissions.delete-all-groups-success": {
+    "message": "모든 기여 그룹이 삭제되었습니다."
+  },
   "project.settings.permissions.empty-state.description": {
     "message": "해당 프로젝트의 어떤 버전에도 외부 콘텐츠가 포함되어 있지 않으므로, 권한 증명 절차를 진행하지 않으셔도 됩니다. 또는 프로젝트의 모든 버전에 외부 콘텐츠가 포함되어 있지 않아, 별도의 권한 획득이 필요하지 않습니다."
   },
@@ -4712,12 +4790,24 @@
   "settings.authorizations.about-this-app": {
     "message": "이 앱에 대해"
   },
+  "settings.authorizations.created-by": {
+    "message": "{user}님이 작성함"
+  },
   "settings.authorizations.description": {
     "message": "Modrinth 계정으로 애플리케이션에 권한을 부여하면, 해당 앱이 귀하의 계정에 접근할 수 있게 됩니다. 여기에서 언제든지 계정 접근 권한을 관리하고 확인할 수 있습니다."
   },
+  "settings.authorizations.empty-state.description": {
+    "message": "승인한 애플리케이션이 이곳에 표시됩니다."
+  },
+  "settings.authorizations.empty-state.heading": {
+    "message": "승인된 앱이 없습니다"
+  },
   "settings.authorizations.head-title": {
     "message": "승인"
   },
+  "settings.authorizations.official-tooltip": {
+    "message": "이 앱은 공식 Modrinth 계정에서 제작했습니다."
+  },
   "settings.authorizations.revoke.action": {
     "message": "취소"
   },
@@ -4727,6 +4817,9 @@
   "settings.authorizations.revoke.confirm.title": {
     "message": "정말로 이 애플리케이션의 접근 권한을 취소하시겠습니까?"
   },
+  "settings.authorizations.unofficial-disclosure": {
+    "message": "이 앱은 이름과 달리 Modrinth와 아무런 관련이 없습니다."
+  },
   "settings.billing.charges.description": {
     "message": "Modrinth 계정의 과거 결제 내역을 여기서 확인할 수 있습니다:"
   },
@@ -5102,6 +5195,33 @@
   "settings.sidebar.label.display": {
     "message": "디스플레이"
   },
+  "shared-instance.invite.accept": {
+    "message": "초대 수락"
+  },
+  "shared-instance.invite.inviter.unknown": {
+    "message": "Modrinth 사용자"
+  },
+  "shared-instance.invite.joined-count": {
+    "message": "이미 {count, plural, other {#명}}이 참여함"
+  },
+  "shared-instance.invite.loading": {
+    "message": "초대 불러오는 중…"
+  },
+  "shared-instance.invite.title": {
+    "message": "{name}님이 플레이 초대를 보냈습니다"
+  },
+  "shared-instance.invite.trust.description": {
+    "message": "이 초대는 Modrinth가 아닌 다른 Modrinth 사용자가 생성했습니다. 신뢰할 수 있는 사람의 초대만 수락하세요."
+  },
+  "shared-instance.invite.trust.heading": {
+    "message": "이 사용자를 알고 계십니까?"
+  },
+  "shared-instance.invite.unavailable.description": {
+    "message": "만료되었거나, 사용 한도에 도달했거나, 공유한 사용자가 삭제했을 수 있습니다."
+  },
+  "shared-instance.invite.unavailable.title": {
+    "message": "이 초대는 사용할 수 없습니다"
+  },
   "ui.latest-news-row.latest-news": {
     "message": "Modrinth의 최신 뉴스"
   },
diff --git a/apps/frontend/src/locales/ms-MY/index.json b/apps/frontend/src/locales/ms-MY/index.json
index 28a2097a63..23ad7876f3 100644
--- a/apps/frontend/src/locales/ms-MY/index.json
+++ b/apps/frontend/src/locales/ms-MY/index.json
@@ -893,6 +893,18 @@
   "create-project-version.create-modal.stage.add-files.admonition": {
     "message": "Fail tambahan adalah untuk sumber sokongan seperti kod sumber, bukan untuk versi atau varian alternatif."
   },
+  "create-project-version.create-modal.stage.add-files.files-tab": {
+    "message": "Fail"
+  },
+  "create-project-version.create-modal.stage.details.files-tab": {
+    "message": "Fail"
+  },
+  "create-project-version.create-modal.stage.metadata.edit-button": {
+    "message": "Sunting"
+  },
+  "create-project-version.create-modal.stage.metadata.files-tab": {
+    "message": "Fail"
+  },
   "create.collection.collection-info": {
     "message": "Koleksi baharu anda akan dibuat sebagai koleksi awam dengan {count, plural, =0 {0 projek} other {# projek}}."
   },
@@ -1100,6 +1112,9 @@
   "dashboard.collections.sort.recently-updated": {
     "message": "Dikemas Kini Baru-baru Ini"
   },
+  "dashboard.creator-tax-form-modal.close-button": {
+    "message": "Tutup"
+  },
   "dashboard.creator-tax-form-modal.confirmation.download-button": {
     "message": "Muat turun {formType}"
   },
@@ -2408,6 +2423,9 @@
   "moderation.page.technicalReview": {
     "message": "Semakan teknikal"
   },
+  "modpack-scan-modal.delete-all-groups.proceed": {
+    "message": "Kosongkan"
+  },
   "modpack-scan-modal.failed": {
     "message": "Gagal"
   },
@@ -2681,6 +2699,15 @@
   "muralpay.warning.wallet-address": {
     "message": "Semak semula alamat dompet anda. Dana yang dihantar ke alamat yang salah tidak boleh dipulihkan."
   },
+  "organization.project-transfer.id-column": {
+    "message": "ID"
+  },
+  "organization.project-transfer.name-column": {
+    "message": "Nama"
+  },
+  "organization.project-transfer.type-column": {
+    "message": "Jenis"
+  },
   "project-member-header.error-decline": {
     "message": "Gagal menolak jemputan pasukan"
   },
@@ -3038,6 +3065,9 @@
   "project.settings.permissions.sort.status": {
     "message": "Status"
   },
+  "project.settings.tags.title": {
+    "message": "Tag"
+  },
   "project.settings.title": {
     "message": "Tetapan"
   },
@@ -3047,6 +3077,9 @@
   "project.status.archived.message": {
     "message": "{title} telah diarkibkan. {title} tidak akan menerima sebarang kemas kini lanjut melainkan pengarang memutuskan untuk menyaharkibkan projek."
   },
+  "project.versions.share-option": {
+    "message": "Kongsi"
+  },
   "project.versions.title": {
     "message": "Versi"
   },
diff --git a/apps/frontend/src/locales/nl-NL/index.json b/apps/frontend/src/locales/nl-NL/index.json
index f527efaaa5..5f8a17e677 100644
--- a/apps/frontend/src/locales/nl-NL/index.json
+++ b/apps/frontend/src/locales/nl-NL/index.json
@@ -191,6 +191,9 @@
   "analytics.chart.tooltip.hide-entry": {
     "message": "Verberg {name} in de grafiek"
   },
+  "analytics.chart.tooltip.no-data": {
+    "message": "Geen gegevens"
+  },
   "analytics.chart.tooltip.pinned": {
     "message": "Grafiek tooltip vastgepind"
   },
@@ -1599,7 +1602,7 @@
     "message": "Bankrekeninghouder"
   },
   "dashboard.creator-withdraw-modal.muralpay-details.bank-account-owner-description": {
-    "message": "Voer de naam in van de persoon die bevoegd is om dit bank account namens het bedrijf te beheren."
+    "message": "Vul de naam in van de persoon die bevoegd is om namens het bedrijf deze bankrekening te beheren."
   },
   "dashboard.creator-withdraw-modal.muralpay-details.coin": {
     "message": "Munt"
@@ -4787,12 +4790,24 @@
   "settings.authorizations.about-this-app": {
     "message": "Over deze app"
   },
+  "settings.authorizations.created-by": {
+    "message": "Gemaakt door {user}"
+  },
   "settings.authorizations.description": {
     "message": "Wanneer je een app via je Modrinth-account autoriseert, verleen je die app toegang tot je account. Je kunt de toegang tot je account hier op elk moment beheren en bekijken."
   },
+  "settings.authorizations.empty-state.description": {
+    "message": "De apps die je autoriseert, worden hier weergegeven."
+  },
+  "settings.authorizations.empty-state.heading": {
+    "message": "Geen geautoriseerde apps"
+  },
   "settings.authorizations.head-title": {
     "message": "Toestemmingen"
   },
+  "settings.authorizations.official-tooltip": {
+    "message": "Deze app is gemaakt door een officieel Modrinth-account."
+  },
   "settings.authorizations.revoke.action": {
     "message": "Intrekken"
   },
@@ -4802,6 +4817,9 @@
   "settings.authorizations.revoke.confirm.title": {
     "message": "Weet u zeker dat u deze aanvraag wilt intrekken?"
   },
+  "settings.authorizations.unofficial-disclosure": {
+    "message": "Deze app heeft, ondanks de naam, op geen enkele manier verband met Modrinth."
+  },
   "settings.billing.charges.description": {
     "message": "Al je eerdere afschrijvingen van je Modrinth-account worden hier weergegeven:"
   },
diff --git a/apps/frontend/src/locales/pl-PL/index.json b/apps/frontend/src/locales/pl-PL/index.json
index 0c99e2440f..7454c93009 100644
--- a/apps/frontend/src/locales/pl-PL/index.json
+++ b/apps/frontend/src/locales/pl-PL/index.json
@@ -188,6 +188,9 @@
   "analytics.chart.tooltip.hide-entry": {
     "message": "Ukryj {name} na wykresie"
   },
+  "analytics.chart.tooltip.no-data": {
+    "message": "Brak danych"
+  },
   "analytics.chart.tooltip.pinned": {
     "message": "Przypięto informacje"
   },
@@ -248,6 +251,9 @@
   "analytics.empty.select-project": {
     "message": "Wybierz przynajmniej jeden projekt, by przeglądać dane"
   },
+  "analytics.filter.dependent-project-search-failed-title": {
+    "message": "Nie udało się załadować zależnych projektów"
+  },
   "analytics.filter.game-version-type": {
     "message": "Rodzaj wersji gry"
   },
@@ -969,7 +975,7 @@
     "message": "Przestań obserwować projekt"
   },
   "collection.delete-modal.description": {
-    "message": "To trwale usunie tę kolekcję. Tej akcji nie można odwrócić."
+    "message": "To trwale usunie tę kolekcję. Tej akcji nie można cofnąć."
   },
   "collection.delete-modal.title": {
     "message": "Czy na pewno chcesz usunąć tę kolekcję?"
@@ -2966,6 +2972,9 @@
   "modpack-scan-modal.batch.placeholder": {
     "message": "Ilość elementów na stronę"
   },
+  "modpack-scan-modal.delete-all-groups-confirmation.description": {
+    "message": "Trwale usunie to wszystkie grupy atrybucji i wszystkie zawarte w nich pliki. Tej akcji nie można cofnąć."
+  },
   "modpack-scan-modal.delete-all-groups.proceed": {
     "message": "Wyczyść"
   },
@@ -3785,6 +3794,9 @@
   "project.settings.permissions.delete-all-groups": {
     "message": "Usuń wszystkie grupy"
   },
+  "project.settings.permissions.delete-all-groups-confirmation.description": {
+    "message": "Trwale usunie to {count, plural, one {# grupę atrybucji} few {wszystkie # grupy atrybucji} other {wszystkie # grup atrybucji}} i wszystkie zawarte w nich pliki. Tej akcji nie można cofnąć."
+  },
   "project.settings.permissions.empty-state.description": {
     "message": "Żadne z wersji Twojego projektu nie zawierają zewnętrznej zawartości, więc nie musisz martwić się o uzyskanie zezwoleń."
   },
@@ -4703,12 +4715,24 @@
   "settings.authorizations.about-this-app": {
     "message": "O aplikacji"
   },
+  "settings.authorizations.created-by": {
+    "message": "Stworzone przez {user}"
+  },
   "settings.authorizations.description": {
     "message": "Kiedy autoryzujesz aplikacje ze swoim kontem Modrinth, dajesz jej dostęp do swojego konta. Możesz tutaj zawsze zarządzać oraz przeglądać stan aplikacji z dostępem do Twojego konta."
   },
+  "settings.authorizations.empty-state.description": {
+    "message": "Aplikacje, które autoryzujesz, pojawią się tutaj."
+  },
+  "settings.authorizations.empty-state.heading": {
+    "message": "Brak autoryzowanych aplikacji"
+  },
   "settings.authorizations.head-title": {
     "message": "Autoryzacje"
   },
+  "settings.authorizations.official-tooltip": {
+    "message": "Ta aplikacja jest utworzona przez oficjalne konto Modrinth."
+  },
   "settings.authorizations.revoke.action": {
     "message": "Unieważnij"
   },
@@ -4718,6 +4742,9 @@
   "settings.authorizations.revoke.confirm.title": {
     "message": "Czy na pewno chcesz unieważnić dostęp tej aplikacji?"
   },
+  "settings.authorizations.unofficial-disclosure": {
+    "message": "Ta aplikacja nie jest powiązana w żaden sposób z Modrinth, mimo jej nazwy."
+  },
   "settings.billing.charges.description": {
     "message": "Wszystkie pobrane opłaty z twojego konta Modrinth są wyświetlane poniżej:"
   },
@@ -5139,7 +5166,7 @@
     "message": "Wszystkie wersje"
   },
   "version.confirm-delete.description": {
-    "message": "Ta wersja zostanie trwale usunięta. Tej akcji nie będzie można cofnąć."
+    "message": "Ta wersja zostanie trwale usunięta. Tej akcji nie można cofnąć."
   },
   "version.confirm-delete.proceed": {
     "message": "Usuń wersję"
@@ -5198,6 +5225,12 @@
   "version.notification.deleted-title": {
     "message": "Wersja usunięta"
   },
+  "version.notification.packaging-success-text": {
+    "message": "Twoja paczka danych została pomyślnie zapakowana jako mod! Zalecamy upewnienie się, że działa poprawnie."
+  },
+  "version.notification.packaging-success-title": {
+    "message": "Zapakowano pomyślnie"
+  },
   "version.package-as-mod.button": {
     "message": "Zapakuj jako mod"
   },
diff --git a/apps/frontend/src/locales/pt-BR/index.json b/apps/frontend/src/locales/pt-BR/index.json
index 4ded8625c6..927b8c87b9 100644
--- a/apps/frontend/src/locales/pt-BR/index.json
+++ b/apps/frontend/src/locales/pt-BR/index.json
@@ -191,6 +191,9 @@
   "analytics.chart.tooltip.hide-entry": {
     "message": "Ocultar {name} no gráfico"
   },
+  "analytics.chart.tooltip.no-data": {
+    "message": "Sem dados"
+  },
   "analytics.chart.tooltip.pinned": {
     "message": "Dica de ferramenta do gráfico fixada"
   },
@@ -3918,7 +3921,7 @@
     "message": "Selecionar região"
   },
   "project.settings.server.server-online": {
-    "message": "O servidor está ativo!"
+    "message": "O servidor está online!"
   },
   "project.settings.server.srv-records-hint": {
     "message": "Se você tiver <srv-tooltip>[registros SRV]</srv-tooltip>, não precisará adicionar uma porta. Caso contrário, se você tiver uma porta que não seja 25565, poderá incluí-la como :12345"
@@ -4790,12 +4793,24 @@
   "settings.authorizations.about-this-app": {
     "message": "Sobre este aplicativo"
   },
+  "settings.authorizations.created-by": {
+    "message": "Criado por {user}"
+  },
   "settings.authorizations.description": {
     "message": "Ao autorizar um aplicativo com sua conta do Modrinth, você concede acesso à sua conta. Você pode gerenciar e revisar o acesso à sua conta aqui a qualquer momento."
   },
+  "settings.authorizations.empty-state.description": {
+    "message": "Os aplicativos que você autorizar aparecerão aqui."
+  },
+  "settings.authorizations.empty-state.heading": {
+    "message": "Nenhum aplicativo autorizado"
+  },
   "settings.authorizations.head-title": {
     "message": "Autorizações"
   },
+  "settings.authorizations.official-tooltip": {
+    "message": "Este aplicativo foi criado por uma conta oficial do Modrinth."
+  },
   "settings.authorizations.revoke.action": {
     "message": "Revogar"
   },
@@ -4805,6 +4820,9 @@
   "settings.authorizations.revoke.confirm.title": {
     "message": "Tem certeza de que deseja revogar este aplicativo?"
   },
+  "settings.authorizations.unofficial-disclosure": {
+    "message": "Este aplicativo não é afiliado ao Modrinth em nenhum modo, apesar do nome."
+  },
   "settings.billing.charges.description": {
     "message": "Todas as suas cobranças anteriores na sua conta Modrinth serão listadas aqui:"
   },
diff --git a/apps/frontend/src/locales/ru-RU/index.json b/apps/frontend/src/locales/ru-RU/index.json
index 317e381a00..6ab49be413 100644
--- a/apps/frontend/src/locales/ru-RU/index.json
+++ b/apps/frontend/src/locales/ru-RU/index.json
@@ -9,19 +9,19 @@
     "message": "Пользователь не найден"
   },
   "ads-consent.accept": {
-    "message": "Принять все"
+    "message": "Принять всё"
   },
   "ads-consent.body": {
-    "message": "Реклама обеспечивает работу Modrinth и финансирует выплаты авторам. Наши партнёры могут хранить или получать доступ к файлам cookie на сайте для персонализации рекламы и измерения производительности."
+    "message": "Реклама обеспечивает работу Modrinth и выплаты авторам. Для персонализации и анализа рекламы наши партнёры могут использовать куки."
   },
   "ads-consent.manage": {
-    "message": "Настроить предпочтения"
+    "message": "Настроить"
   },
   "ads-consent.reject": {
     "message": "Отклонить всё"
   },
   "ads-consent.title": {
-    "message": "Конфиденциальность и как реклама помогает Modrinth"
+    "message": "Конфиденциальность и реклама на Modrinth"
   },
   "analytics.action.add": {
     "message": "Добавить"
@@ -185,6 +185,9 @@
   "analytics.chart.tooltip.hide-entry": {
     "message": "Скрыть {name} на диаграмме"
   },
+  "analytics.chart.tooltip.no-data": {
+    "message": "Нет данных"
+  },
   "analytics.chart.tooltip.pinned": {
     "message": "Подсказка графика закреплена"
   },
@@ -411,7 +414,7 @@
     "message": "Скачивания"
   },
   "analytics.stat.monetization-banner.body": {
-    "message": "К монетизации допускаются только проверенные просмотры и скачивания, выполненные через Modrinth. Для скачивания через Modrinth App пользователь также должен быть авторизован. Поскольку все проекты имеют схожее соотношение монетизируемых скачиваний, ваш доход существенно бы не изменился при учёте каждой загрузки."
+    "message": "Только просмотры и загрузки сделанные через Modrinth доступны для монетизации и должны пройти фильтры предотвращения накрутки.\nЗагрузки в приложении Modrinth еще требует аккаунт зарегистрированным. Потому что все проекты имеют похожую пропорцию монетизированных загрузок, ваш доход много бы не изменился, если все загрузки будут считаться."
   },
   "analytics.stat.monetization-banner.learn-more": {
     "message": "Подробнее"
@@ -801,7 +804,7 @@
     "message": "Проверка безопасности"
   },
   "auth.create-account.subscribe.label": {
-    "message": "Держите меня в курсе всего крутого, над чем работает Modrinth"
+    "message": "Держите меня в курсе над всеми крутыми вещами, над чем работает Modrinth через почту"
   },
   "auth.create-account.title": {
     "message": "Создание аккаунта"
@@ -810,7 +813,7 @@
     "message": "Имя пользователя"
   },
   "auth.create-account.username.placeholder": {
-    "message": "Введите имя пользователя"
+    "message": "Введите никнейм"
   },
   "auth.reset-password.method-choice.action": {
     "message": "Отправить письмо"
@@ -2166,7 +2169,7 @@
     "message": "Находите лучшие Minecraft {projectType} на Modrinth с помощью мгновенного и точного поиска. Наши фильтры помогут быстро подобрать подходящие {projectType}."
   },
   "discover.seo.title": {
-    "message": "Искать {projectType}"
+    "message": "Поиск {projectType}"
   },
   "discover.seo.title-with-query": {
     "message": "Искать {projectType} | {query}"
@@ -2910,7 +2913,7 @@
     "message": "Поиск"
   },
   "layout.nav.upgrade-to-modrinth-plus": {
-    "message": "Перейти на Modrinth+"
+    "message": "Перейти на Modrinth+"
   },
   "layout.publish.email-verification-required.description": {
     "message": "Перед публикацией на Modrinth необходимо подтвердить адрес электронной почты."
@@ -2918,6 +2921,15 @@
   "layout.publish.email-verification-required.title": {
     "message": "Необходимо подтвердить почту"
   },
+  "modal.shared-instance.open-in-app.benefit.install": {
+    "message": "Автоматически устанавливайте все, во что они играют"
+  },
+  "modal.shared-instance.open-in-app.benefit.join": {
+    "message": "Играйте в тот же контент, что и ваши друзья"
+  },
+  "modal.shared-instance.open-in-app.benefit.update": {
+    "message": "Постоянно обновляйте общий контент по мере его изменения"
+  },
   "modal.shared-instance.open-in-app.get-app": {
     "message": "Скачать лаунчер"
   },
@@ -2954,6 +2966,12 @@
   "moderation.page.technicalReview": {
     "message": "Техпроверка"
   },
+  "modpack-scan-modal.batch.label": {
+    "message": "{amount} за страницу"
+  },
+  "modpack-scan-modal.batch.placeholder": {
+    "message": "Кол-во страниц"
+  },
   "modpack-scan-modal.delete-all-groups-confirmation.description": {
     "message": "Все группы атрибуции для этого проекта и все находящиеся в них файлы будут удалены навсегда. Это действие необратимо."
   },
@@ -4389,7 +4407,7 @@
     "message": "Популярный"
   },
   "servers.purchase.step.plan.per-month-billing": {
-    "message": "в месяц{interval, select, monthly {} quarterly {, на 3 месяца} yearly {, на год} other {, billed {interval}}}"
+    "message": "в месяц{interval, select, monthly {} quarterly {, за 3 месяца} yearly {, за год} other {, billed {interval}}}"
   },
   "settings.account.button.complete-setup": {
     "message": "Завершить настройку"
@@ -4736,12 +4754,24 @@
   "settings.authorizations.about-this-app": {
     "message": "О приложении"
   },
+  "settings.authorizations.created-by": {
+    "message": "Создано {user}"
+  },
   "settings.authorizations.description": {
     "message": "Авторизованные приложения получают доступ к аккаунту Modrinth. Здесь можно просматривать и отзывать этот доступ."
   },
+  "settings.authorizations.empty-state.description": {
+    "message": "Авторизованные вами приложения появятся здесь."
+  },
+  "settings.authorizations.empty-state.heading": {
+    "message": "Нет приложений"
+  },
   "settings.authorizations.head-title": {
     "message": "Авторизации"
   },
+  "settings.authorizations.official-tooltip": {
+    "message": "Это приложение создано официальным аккаунтом Modrinth."
+  },
   "settings.authorizations.revoke.action": {
     "message": "Деавторизовать"
   },
@@ -4751,6 +4781,9 @@
   "settings.authorizations.revoke.confirm.title": {
     "message": "Вы действительно хотите деавторизовать это приложение?"
   },
+  "settings.authorizations.unofficial-disclosure": {
+    "message": "Это приложение никак не связано с Modrinth."
+  },
   "settings.billing.charges.description": {
     "message": "Здесь перечислены все списания по аккаунту Modrinth:"
   },
@@ -5100,7 +5133,7 @@
     "message": "Текущий сеанс"
   },
   "settings.sessions.description": {
-    "message": "Ниже представлены все устройства, с которых осуществлён вход в вашу учётную запись Modrinth. Вы можете управлять сеансом каждого из них по отдельности.\n\nЕсли среди них присутствует незнакомое устройство, незамедлительно завершите его сеанс и смените пароль своей учётной записи."
+    "message": "Ниже показаны устройства, использующие ваш аккаунт Modrinth. Сеансом каждого из них можно управлять по отдельности.\n\nЕсли в списке есть незнакомое устройство, немедленно завершите его сеанс и смените пароль от аккаунта."
   },
   "settings.sessions.last-accessed-ago": {
     "message": "Активность {ago}"
@@ -5141,6 +5174,9 @@
   "shared-instance.invite.trust.heading": {
     "message": "Вы знакомы с этим пользователем?"
   },
+  "shared-instance.invite.unavailable.description": {
+    "message": "Возможно, срок действия приглашения истек, исчерпан лимит использования или оно было удалено пользователем, который им поделился."
+  },
   "shared-instance.invite.unavailable.title": {
     "message": "Приглашение недоступно"
   },
diff --git a/apps/frontend/src/locales/sv-SE/index.json b/apps/frontend/src/locales/sv-SE/index.json
index 9382a0e614..baad9ce0ea 100644
--- a/apps/frontend/src/locales/sv-SE/index.json
+++ b/apps/frontend/src/locales/sv-SE/index.json
@@ -96,20 +96,29 @@
     "message": "Annoteringar"
   },
   "analytics.chart.controls.aria": {
-    "message": "Statistik diagram kontroller, {activeCount}"
+    "message": "Statistik-graf-kontroller, {activeCount}"
   },
   "analytics.chart.controls.button": {
     "message": "Kontroller"
   },
   "analytics.chart.controls.dialog-aria": {
-    "message": "Statistik diagram kontroller"
+    "message": "Statistik-graf-kontroller"
   },
   "analytics.chart.controls.display": {
-    "message": "Skärm"
+    "message": "Visa"
+  },
+  "analytics.chart.controls.no-modrinth-events": {
+    "message": "Inga Modrinth-händelser i grafen."
+  },
+  "analytics.chart.controls.no-project-events": {
+    "message": "Inga projekthändelser i grafen."
   },
   "analytics.chart.controls.previous-period": {
     "message": "Tidigare period"
   },
+  "analytics.chart.controls.project-events": {
+    "message": "Projekthändelser"
+  },
   "analytics.chart.controls.ratio": {
     "message": "Proportion"
   },
@@ -126,7 +135,7 @@
     "message": "{name} (förhandsvisa)"
   },
   "analytics.chart.render-limit.header": {
-    "message": "Visa alla {count} linjer i diagram?"
+    "message": "Visa alla {count} linjer i grafen?"
   },
   "analytics.chart.tooltip.duration.days": {
     "message": "{count, plural, one {# dag} other {# dagar}}"
@@ -138,7 +147,7 @@
     "message": "{count, plural, one {# minut} other {# minuter}}"
   },
   "analytics.chart.tooltip.hide-entry": {
-    "message": "Visa {name} i diagram"
+    "message": "Visa {name} i grafen"
   },
   "analytics.chart.tooltip.pinned-aria": {
     "message": "Fästa"
@@ -147,7 +156,7 @@
     "message": "(förhandsvisa)"
   },
   "analytics.chart.tooltip.show-entry": {
-    "message": "Visa {name} i diagram"
+    "message": "Visa {name} i grafen"
   },
   "analytics.chart.tooltip.total": {
     "message": "Totalt"
@@ -365,6 +374,12 @@
   "analytics.stat.playtime-hours": {
     "message": "{hours} h"
   },
+  "analytics.stat.previous-period-comparison": {
+    "message": "jfr tidigare period"
+  },
+  "analytics.stat.previous-period-comparison-short": {
+    "message": "jfr tidigare"
+  },
   "analytics.stat.revenue": {
     "message": "Intäkter"
   },
@@ -639,13 +654,13 @@
     "message": "Visa andra paket"
   },
   "auth.authorize.action.authorize": {
-    "message": "Auktorisera"
+    "message": "Tillåt"
   },
   "auth.authorize.action.decline": {
     "message": "Neka"
   },
   "auth.authorize.app-info": {
-    "message": "<strong>{appName}</strong> av <creator-link>{creator}</creator-link> kommer kunna:"
+    "message": "<strong>{appName}</strong> av <creator-link>{creator}</creator-link> kommer att kunna:"
   },
   "auth.authorize.authorize-app-name": {
     "message": "Auktorisera {appName}"
@@ -1058,6 +1073,12 @@
   "create-project-version.create-modal.stage.details.version-number-placeholder": {
     "message": "Ange versionsnummer, t.ex. 1.2.3-alfa.1"
   },
+  "create-project-version.create-modal.stage.metadata.details-tab": {
+    "message": "Detaljer"
+  },
+  "create-project-version.create-modal.stage.metadata.environment": {
+    "message": "Miljö"
+  },
   "create-project-version.create-modal.stage.metadata.files-tab": {
     "message": "Filer"
   },
@@ -1407,7 +1428,7 @@
     "message": "Bankkontoägare"
   },
   "dashboard.creator-withdraw-modal.muralpay-details.bank-account-owner-description": {
-    "message": "Ange namn på personen med rättigheter att hantera detta bankkonto för företaget."
+    "message": "Ange namn på personen med behörighet att hantera detta bankkonto för företaget."
   },
   "dashboard.creator-withdraw-modal.muralpay-details.coin": {
     "message": "Mynt"
@@ -1880,6 +1901,15 @@
   "discover.install.back-to-server": {
     "message": "Tillbaka till server"
   },
+  "discover.install.cancel-reset": {
+    "message": "Avbryt återställning"
+  },
+  "discover.install.error.no-server-world": {
+    "message": "Ingen servervärld är tillgänglig att installera."
+  },
+  "discover.install.heading.reset-modpack": {
+    "message": "Väljer modpaket att installera efter återställning"
+  },
   "discover.seo.description": {
     "message": "Sök och bläddra bland tusen av Minecraft {projectType} på Modrinth med snabba, träffsäkra resultat. Våra filter hjälper dig att snabbt hitta de bästa Minecraft {projectType}."
   },
@@ -2144,6 +2174,9 @@
   "hosting-marketing.medal.text-secondary": {
     "message": "Tidsbegränsat erbjudande. Inget kreditkort krävs. Tillgängligt för servrar i USA."
   },
+  "hosting-marketing.notification.invalid-product-title": {
+    "message": "Ogiltig produkt"
+  },
   "hosting-marketing.pick-customized-plan": {
     "message": "Välj en anpassad plan med just de specifikationer du behöver."
   },
@@ -2609,6 +2642,12 @@
   "moderation.page.reports": {
     "message": "Rapporter"
   },
+  "modpack-scan-modal.delete-all-groups.error": {
+    "message": "Misslyckades att tömma alla grupper: {error}"
+  },
+  "modpack-scan-modal.delete-all-groups.proceed": {
+    "message": "Töm"
+  },
   "modpack-scan-modal.failed": {
     "message": "Misslyckades"
   },
@@ -2630,6 +2669,9 @@
   "modpack-scan-modal.not-scanned": {
     "message": "Inte skannad"
   },
+  "modpack-scan-modal.pack-file-name": {
+    "message": "Paket-filnamn"
+  },
   "modpack-scan-modal.scan-all-files": {
     "message": "Skanna alla filer"
   },
@@ -2795,6 +2837,9 @@
   "muralpay.rail.fiat-zar.name": {
     "message": "Banköverföring (ZAR)"
   },
+  "organization.button.manage-projects": {
+    "message": "Hantera projekt"
+  },
   "organization.label.downloads": {
     "message": "nedladdningar"
   },
@@ -2813,9 +2858,21 @@
   "organization.project-transfer.name-column": {
     "message": "Namn"
   },
+  "organization.project-transfer.project-icon-alt": {
+    "message": "Ikon för {name}"
+  },
+  "organization.project-transfer.transfer-selected-projects": {
+    "message": "För över {count} projekt"
+  },
   "organization.project-transfer.type-column": {
     "message": "Typ"
   },
+  "organization.projects.none": {
+    "message": "Den här organisationen har inga projekt än."
+  },
+  "organization.projects.none-with-create-prompt": {
+    "message": "Den här organisationen har inga projekt än. Vill du <create-link>skapa ett</create-link>?"
+  },
   "project-member-header.error-decline": {
     "message": "Misslyckades att neka inbjudan"
   },
@@ -2981,8 +3038,11 @@
   "project.download.game-version-unsupported-tooltip": {
     "message": "{title} stöttar inte {gameVersion} för {platform}"
   },
+  "project.download.manually": {
+    "message": "Ladda ner manuellt"
+  },
   "project.download.no-app": {
-    "message": "Har du inte Modrinth appen?"
+    "message": "Har du inte Modrinth App?"
   },
   "project.download.no-game-versions-found": {
     "message": "Inga spelversioner hittades"
@@ -3050,6 +3110,12 @@
   "project.gallery.title": {
     "message": "Galleri"
   },
+  "project.moderation.admonition.approved.body.public": {
+    "message": "Ditt projekt är publicerat och upptäckbart på Modrinth."
+  },
+  "project.moderation.admonition.approved.header": {
+    "message": "Projekt godkänt"
+  },
   "project.moderation.admonition.under-review.header": {
     "message": "Projekt under granskning"
   },
@@ -3158,6 +3224,9 @@
   "project.settings.server.server-online": {
     "message": "Servern är online!"
   },
+  "project.settings.tags.resolutions-description": {
+    "message": "Välj upplösning(en/arna) på dina texturer i ditt {type}."
+  },
   "project.settings.title": {
     "message": "Inställningar"
   },
@@ -3170,9 +3239,24 @@
   "project.versions.copy-link-option": {
     "message": "Kopiera länk"
   },
+  "project.versions.delete-button": {
+    "message": "Radera"
+  },
+  "project.versions.delete-confirm.description": {
+    "message": "Det här kommer radera versioner för evigt (asså för evigt)."
+  },
+  "project.versions.delete-confirm.title": {
+    "message": "Är du säker på att du vill radera den här versionen?"
+  },
   "project.versions.edit-files-option": {
     "message": "Redigera filer"
   },
+  "project.versions.open-in-new-tab-option": {
+    "message": "Öppna i ny tabb"
+  },
+  "project.versions.share-option": {
+    "message": "Dela"
+  },
   "project.versions.title": {
     "message": "Versioner"
   },
@@ -3779,12 +3863,27 @@
   "settings.authorizations.about-this-app": {
     "message": "Om appen"
   },
+  "settings.authorizations.created-by": {
+    "message": "Skapad av {user}"
+  },
+  "settings.authorizations.description": {
+    "message": "När du tillåter en applikation med ditt Modrinth-konto, ger du den åtkomst till ditt konto. Du kan hantera och granska åtkomst till konto här när som helst."
+  },
+  "settings.authorizations.empty-state.description": {
+    "message": "Applikationer du tillåter kommer att synas här."
+  },
+  "settings.authorizations.empty-state.heading": {
+    "message": "Inga behöriga appar"
+  },
   "settings.authorizations.head-title": {
     "message": "Autentiseringar"
   },
   "settings.authorizations.revoke.action": {
     "message": "Återkalla"
   },
+  "settings.authorizations.revoke.confirm.description": {
+    "message": "Det här kommer återkalla applikationernas åtkomst till ditt konto. Du kan alltid ge tillåtelse igen senare."
+  },
   "settings.billing.charges.description": {
     "message": "Alla dina tidigare Modrinth fakturor listas här:"
   },
@@ -3813,7 +3912,7 @@
     "message": "år"
   },
   "settings.billing.midas.benefits.ad-free": {
-    "message": "Annonsfritt surfande på modrinth.com och Modrinth App"
+    "message": "Surfa annonsfritt på modrinth.com och Modrinth App"
   },
   "settings.billing.midas.benefits.badge": {
     "message": "Modrinth+ märke på din profil"
@@ -4038,7 +4137,7 @@
     "message": "Döljer \"Installera Modrinth App\" knappen från primär navigering. Modrinth App-sidan kan fortfarande hittas på landningssidan eller i sidfoten."
   },
   "settings.display.sidebar.hide-app-promos.title": {
-    "message": "Dölj \"Installera Modrinth\" knapp"
+    "message": "Dölj \"Installera Modrinth App\" knapp"
   },
   "settings.display.sidebar.left-aligned-content-sidebar.title": {
     "message": "Vänsterjusterad sidofält på innehållssidor"
@@ -4148,6 +4247,9 @@
   "shared-instance.invite.inviter.unknown": {
     "message": "En Modrinth-användare"
   },
+  "shared-instance.invite.joined-count": {
+    "message": "{count, plural, one {# person} other {# personer}} har redan gått med"
+  },
   "shared-instance.invite.loading": {
     "message": "Laddar inbjudan…"
   },
diff --git a/apps/frontend/src/locales/tr-TR/index.json b/apps/frontend/src/locales/tr-TR/index.json
index a3ca07e3ae..9e91553fd0 100644
--- a/apps/frontend/src/locales/tr-TR/index.json
+++ b/apps/frontend/src/locales/tr-TR/index.json
@@ -8,6 +8,15 @@
   "admin.billing.error.not-found": {
     "message": "Kullanıcı bulunamadı"
   },
+  "ads-consent.accept": {
+    "message": "Tümünü kabul et"
+  },
+  "ads-consent.manage": {
+    "message": "Tercihleri yönet"
+  },
+  "ads-consent.reject": {
+    "message": "Tümünü reddet"
+  },
   "analytics.action.add": {
     "message": "Ekle"
   },
@@ -932,6 +941,12 @@
   "auth.verify-email.title": {
     "message": "E-postayı Doğrula"
   },
+  "collection.aria-label.upload-icon": {
+    "message": "Simge yükle"
+  },
+  "collection.button.discover-mods": {
+    "message": "Modları keşfedin"
+  },
   "collection.button.edit-icon": {
     "message": "Simgeyi düzenle"
   },
@@ -1106,6 +1121,27 @@
   "create-project-version.create-modal.stage.add-files.admonition": {
     "message": "Ek dosyalar, alternatif sürümler veya varyantlar için değil, kaynak kodu gibi destekleyici kaynaklar içindir."
   },
+  "create-project-version.create-modal.stage.add-files.details-tab": {
+    "message": "Detaylar"
+  },
+  "create-project-version.create-modal.stage.add-files.files-tab": {
+    "message": "Dosyalar"
+  },
+  "create-project-version.create-modal.stage.add-files.upload-secondary-prompt": {
+    "message": "Dosyaları sürükleyip bırakın ya da göz atmak için tıklayın"
+  },
+  "create-project-version.create-modal.stage.details.details-tab": {
+    "message": "Detaylar"
+  },
+  "create-project-version.create-modal.stage.details.files-tab": {
+    "message": "Dosyalar"
+  },
+  "create-project-version.create-modal.stage.metadata.edit-button": {
+    "message": "Düzenle"
+  },
+  "create-project-version.create-modal.stage.metadata.suggested": {
+    "message": "Önerilen"
+  },
   "create.collection.collection-info": {
     "message": "Yeni koleksiyonunuz herkese açık olarak {count, plural, =0 {projesiz hâlde} other {# proje ile}} oluşturulacaktır."
   },
@@ -1202,6 +1238,9 @@
   "create.project.name-placeholder": {
     "message": "Projenin ismini girin..."
   },
+  "create.project.organization-icon-alt": {
+    "message": "{name} İkon"
+  },
   "create.project.owner-description": {
     "message": "Proje sahibini kendin ya da üyesi olduğun bir organizasyon olarak ayarla."
   },
@@ -1232,6 +1271,9 @@
   "create.project.type-server": {
     "message": "Sunucu"
   },
+  "create.project.unknown-user": {
+    "message": "Bilinmeyen kullanıcı"
+  },
   "create.project.url-label": {
     "message": "URL"
   },
@@ -1316,6 +1358,9 @@
   "dashboard.collections.sort.recently-updated": {
     "message": "Son Güncellenen"
   },
+  "dashboard.creator-tax-form-modal.close-button": {
+    "message": "Kapat"
+  },
   "dashboard.creator-tax-form-modal.confirmation.download-button": {
     "message": "{formType} İndirin"
   },
@@ -1541,6 +1586,9 @@
   "dashboard.creator-withdraw-modal.tremendous-details.search-amount-label": {
     "message": "Miktar arayın"
   },
+  "dashboard.creator-withdraw-modal.tremendous-details.select-category-placeholder": {
+    "message": "{category} Seç"
+  },
   "dashboard.creator-withdraw-modal.tremendous-details.select-denomination-hint": {
     "message": "Birim seçin:"
   },
@@ -2609,6 +2657,9 @@
   "layout.footer.social.x": {
     "message": "X"
   },
+  "layout.footer.unknown-commit": {
+    "message": "bilinmeyen"
+  },
   "layout.menu-toggle.action": {
     "message": "Menü aç/kapa"
   },
@@ -2723,6 +2774,9 @@
   "modpack-scan-modal.scanning": {
     "message": "Taranıyor..."
   },
+  "modpack-scan-modal.success": {
+    "message": "Başarılı"
+  },
   "modpack-scan-modal.title": {
     "message": "Mod paketi taraması ({scanned}/{total} Dosyalar)"
   },
@@ -2993,6 +3047,33 @@
   "muralpay.warning.wallet-address": {
     "message": "Cüzdan adresinizi iki kez kontrol edin. Yanlış adrese gönderilen fonlar kurtarılamaz."
   },
+  "organization.button.manage": {
+    "message": "Yönet"
+  },
+  "organization.button.manage-projects": {
+    "message": "Projeleri yönet"
+  },
+  "organization.label.downloads": {
+    "message": "indirmeler"
+  },
+  "organization.label.members": {
+    "message": "üyeler"
+  },
+  "organization.label.organization": {
+    "message": "Organizasyon"
+  },
+  "organization.label.projects": {
+    "message": "projeler"
+  },
+  "organization.project-transfer.id-column": {
+    "message": "ID"
+  },
+  "organization.project-transfer.name-column": {
+    "message": "İsim"
+  },
+  "organization.project-transfer.type-column": {
+    "message": "Tür"
+  },
   "project-member-header.error-decline": {
     "message": "Ekip daveti reddedilemedi"
   },
@@ -3443,6 +3524,21 @@
   "project.settings.permissions.sort.status": {
     "message": "Durum"
   },
+  "project.settings.server.region-label": {
+    "message": "Bölge"
+  },
+  "project.settings.server.select-languages-placeholder": {
+    "message": "Dilleri seç"
+  },
+  "project.settings.server.select-region-placeholder": {
+    "message": "Bölge seç"
+  },
+  "project.settings.server.server-online": {
+    "message": "Sunucu çevrimiçi!"
+  },
+  "project.settings.tags.title": {
+    "message": "Etiketler"
+  },
   "project.settings.title": {
     "message": "Ayarlar"
   },
@@ -3452,6 +3548,15 @@
   "project.status.archived.message": {
     "message": "{title} arşivlenmiş. {title}, yapımcı fikrini değiştirmediği sürece daha fazla güncelleme almayacak."
   },
+  "project.versions.copy-id-option": {
+    "message": "ID'yi Kopyala"
+  },
+  "project.versions.copy-link-option": {
+    "message": "Bağlantıyı kopyala"
+  },
+  "project.versions.delete-button": {
+    "message": "Sil"
+  },
   "project.versions.title": {
     "message": "Sürümler"
   },
@@ -3869,6 +3974,9 @@
   "servers.plan.small.description": {
     "message": "1–5 arkadaş ve birkaç hafif mod için mükemmel."
   },
+  "servers.purchase.step.plan.most-popular": {
+    "message": "En popüler"
+  },
   "settings.account.button.complete-setup": {
     "message": "Kurulumu tamamla"
   },
@@ -4001,6 +4109,15 @@
   "settings.account.security.passkey.add-modal.name.placeholder": {
     "message": "Giriş anahtarım"
   },
+  "settings.account.security.passkey.add-modal.title": {
+    "message": "Geçiş anahtarı ekle"
+  },
+  "settings.account.security.passkey.add.button": {
+    "message": "Geçiş anahtarı ekle"
+  },
+  "settings.account.security.passkey.button": {
+    "message": "Geçiş anahtalarını yönet"
+  },
   "settings.account.security.passkey.description": {
     "message": "Giriş anahtarlarınızı yönetin, veya yeni bir tane ekleyin."
   },
@@ -4016,6 +4133,9 @@
   "settings.account.security.passkey.modal.no-passkeys": {
     "message": "Hiçbir giriş anahtarın kayıtlı değil."
   },
+  "settings.account.security.passkey.remove.button": {
+    "message": "Geçiş anahtarını sil"
+  },
   "settings.account.security.passkey.remove.description": {
     "message": "Bu hesabınızdan \"{name}\" geçiş anahtarını silecek. Artık bu geçiş anahtarı ile giriş yapamayacaksınız."
   },
@@ -4199,6 +4319,9 @@
   "settings.authorizations.about-this-app": {
     "message": "Bu uygulama hakkında"
   },
+  "settings.authorizations.created-by": {
+    "message": "{user} tarafından oluşturuldu"
+  },
   "settings.authorizations.description": {
     "message": "Modrinth hesabınızla bir uygulamayı yetkilendirdiğinizde, ona hesabınıza erişim izni vermiş olursunuz. Hesabınıza verilen erişimi dilediğiniz zaman burada yönetebilir ve gözden geçirebilirsiniz."
   },
@@ -4589,6 +4712,12 @@
   "settings.sidebar.label.display": {
     "message": "Ekran"
   },
+  "shared-instance.invite.accept": {
+    "message": "Daveti kabul et"
+  },
+  "shared-instance.invite.inviter.unknown": {
+    "message": "Bir Modrinth kullanıcısı"
+  },
   "ui.latest-news-row.latest-news": {
     "message": "Modrinth'ten haberler"
   },
diff --git a/apps/frontend/src/locales/uk-UA/index.json b/apps/frontend/src/locales/uk-UA/index.json
index 539566c37d..5c9e76be15 100644
--- a/apps/frontend/src/locales/uk-UA/index.json
+++ b/apps/frontend/src/locales/uk-UA/index.json
@@ -188,6 +188,9 @@
   "analytics.chart.tooltip.hide-entry": {
     "message": "Приховати {name} на графіку"
   },
+  "analytics.chart.tooltip.no-data": {
+    "message": "Немає даних"
+  },
   "analytics.chart.tooltip.pinned": {
     "message": "Підказку графіка закріплено"
   },
@@ -1247,6 +1250,9 @@
   "create-project-version.create-modal.stage.metadata.resource-pack-loaders-tooltip": {
     "message": "Завантажувачі пакетів ресурсів не можна змінювати"
   },
+  "create-project-version.create-modal.stage.metadata.suggested": {
+    "message": "Рекомендоване"
+  },
   "create-project-version.create-modal.stage.metadata.uploaded-files": {
     "message": "Завантажені файли"
   },
@@ -2126,6 +2132,9 @@
   "dashboard.withdraw.error.minimum-not-met.title": {
     "message": "Замала сума"
   },
+  "dashboard.withdraw.error.payout-method-disabled.text": {
+    "message": "Цей спосіб виплат було вимкнено платіжним провайдером. Будь ласка, використайте інший спосіб виплат або зверніться до підтримки."
+  },
   "dashboard.withdraw.error.payout-method-disabled.title": {
     "message": "Метод оплати недоступний"
   },
@@ -2915,15 +2924,27 @@
   "layout.publish.email-verification-required.title": {
     "message": "Необхідно підтвердити електронну пошту"
   },
+  "modal.shared-instance.open-in-app.benefit.install": {
+    "message": "Автоматично встановлювати все, у що вони грають"
+  },
   "modal.shared-instance.open-in-app.benefit.join": {
     "message": "Можна грати в те саме, що й ваші друзі"
   },
+  "modal.shared-instance.open-in-app.benefit.update": {
+    "message": "Підтримувати спільний вміст актуальним у міру його змін"
+  },
   "modal.shared-instance.open-in-app.get-app": {
     "message": "Завантажити Modrinth App"
   },
+  "modal.shared-instance.open-in-app.managed-by": {
+    "message": "Під керуванням"
+  },
   "modal.shared-instance.open-in-app.opening-automatically": {
     "message": "Modrinth App відкриється автоматично…"
   },
+  "modal.shared-instance.open-in-app.title": {
+    "message": "Відкриття Modrinth App"
+  },
   "modal.shared-instance.open-in-app.why-use": {
     "message": "Навіщо використовувати Modrinth App"
   },
@@ -2948,6 +2969,24 @@
   "moderation.page.technicalReview": {
     "message": "Технічний огляд"
   },
+  "modpack-scan-modal.batch.label": {
+    "message": "{amount} на сторінку"
+  },
+  "modpack-scan-modal.batch.placeholder": {
+    "message": "Розмір пакета"
+  },
+  "modpack-scan-modal.delete-all-groups-confirmation.description": {
+    "message": "Це назавжди видалить усі групи атрибуції для цього проєкту та всі файли у них. Цю дію неможливо скасувати."
+  },
+  "modpack-scan-modal.delete-all-groups.error": {
+    "message": "Не вдалося очистити всі групи: {error}"
+  },
+  "modpack-scan-modal.delete-all-groups.proceed": {
+    "message": "Очистити"
+  },
+  "modpack-scan-modal.delete-all-groups.success": {
+    "message": "Усі групи успішно очищено."
+  },
   "modpack-scan-modal.failed": {
     "message": "Помилка"
   },
@@ -2978,9 +3017,15 @@
   "modpack-scan-modal.scan-all-files": {
     "message": "Сканувати всі файли"
   },
+  "modpack-scan-modal.scan-error": {
+    "message": "Не вдалося просканувати деякі файли: {error}"
+  },
   "modpack-scan-modal.scanning": {
     "message": "Скануємо…"
   },
+  "modpack-scan-modal.success": {
+    "message": "Успіх"
+  },
   "modpack-scan-modal.title": {
     "message": "Сканування збірки ({scanned}/{total} файлів)"
   },
@@ -3599,6 +3644,9 @@
   "project.gallery.title": {
     "message": "Галерея"
   },
+  "project.install-context.back-to-discover": {
+    "message": "Назад до огляду"
+  },
   "project.moderation.admonition.approved.body.private": {
     "message": "Ваш проєкт є приватним, тобто доступ до нього маєте лише ви та запрошені вами люди."
   },
@@ -3641,6 +3689,12 @@
   "project.moderation.admonition.under-review.body.3": {
     "message": "Ви все ще можете змінити свій проєкт, це не вплине на вашу позицію в черзі."
   },
+  "project.moderation.admonition.under-review.body.4": {
+    "message": "Ми намагаємося перевіряти заявки протягом 24–48 годин, але деякі проєкти можуть зазнати затримок. Це не свідчить про проблему з вашою заявкою."
+  },
+  "project.moderation.admonition.under-review.body.4.alt-week": {
+    "message": "Ми намагаємося перевіряти заявки протягом тижня, але деякі проєкти можуть зазнати затримок. Це не свідчить про проблему з вашою заявкою."
+  },
   "project.moderation.admonition.under-review.body.5": {
     "message": "<emphasis>Ми цінуємо ваше терпіння, поки наші модератори наполегливо працюють над безпекою Modrinth, і сподіваємося допомогти вам поділитися своїм умістом! 💚</emphasis>"
   },
@@ -3758,6 +3812,21 @@
   "project.settings.permissions.completed.title": {
     "message": "Дозволи отримано!"
   },
+  "project.settings.permissions.delete-all-groups": {
+    "message": "Видалити всі групи"
+  },
+  "project.settings.permissions.delete-all-groups-confirmation.description": {
+    "message": "Це назавжди видалить {count, plural, one {# групу атрибуції} few {# групи атрибуції} many {# груп атрибуції} other {# груп атрибуції}} для цього проєкту та всі файли в них. Цю дію неможливо скасувати."
+  },
+  "project.settings.permissions.delete-all-groups-confirmation.title": {
+    "message": "Видалити всі групи атрибуції?"
+  },
+  "project.settings.permissions.delete-all-groups-error": {
+    "message": "Не вдалося видалити всі групи атрибуції"
+  },
+  "project.settings.permissions.delete-all-groups-success": {
+    "message": "Усі групи атрибуцій видалено."
+  },
   "project.settings.permissions.empty-state.description": {
     "message": "Жодна з ваших версій проєкту не містить зовнішнього вмісту, тому вам не потрібно турбуватися про отримання дозволів."
   },
@@ -3881,6 +3950,9 @@
   "project.settings.tags.resolutions-description": {
     "message": "Оберіть роздільні здатності текстур у вашому {type}."
   },
+  "project.settings.tags.select-at-least-one-category": {
+    "message": "Виберіть хоча б одну категорію, щоб рекомендувати її."
+  },
   "project.settings.tags.tagging-importance-description": {
     "message": "Указання правильних теґів необхідне, щоб люди могли легше знайти ваш {type}. Переконайтеся, що ви обрали підхожі теґи."
   },
@@ -4712,12 +4784,24 @@
   "settings.authorizations.about-this-app": {
     "message": "Про застосунок"
   },
+  "settings.authorizations.created-by": {
+    "message": "Створено {user}"
+  },
   "settings.authorizations.description": {
     "message": "Коли ви авторизуєтеся у застосунку за допомогою Modrinth, ви надаєте йому доступ до вашого облікового запису. Ви завжди можете переглядати й керувати доступом до свого облікового запису тут."
   },
+  "settings.authorizations.empty-state.description": {
+    "message": "Авторизовані вами застосунки зʼявляться тут."
+  },
+  "settings.authorizations.empty-state.heading": {
+    "message": "Немає авторизованих застосунків"
+  },
   "settings.authorizations.head-title": {
     "message": "Авторизації"
   },
+  "settings.authorizations.official-tooltip": {
+    "message": "Цей застосунок створено офіційним обліковим записом Modrinth."
+  },
   "settings.authorizations.revoke.action": {
     "message": "Відкликати"
   },
@@ -4727,6 +4811,9 @@
   "settings.authorizations.revoke.confirm.title": {
     "message": "Ви впевнені, що хочете відкликати цей застосунок?"
   },
+  "settings.authorizations.unofficial-disclosure": {
+    "message": "Цей застосунок, попри свою назву, жодним чином не пов'язаний із Modrinth."
+  },
   "settings.billing.charges.description": {
     "message": "Тут буде наведено перелік усіх попередніх оплат на вашому обліковому записі Modrinth:"
   },
@@ -5102,9 +5189,30 @@
   "settings.sidebar.label.display": {
     "message": "Перегляд"
   },
+  "shared-instance.invite.accept": {
+    "message": "Прийняти запрошення"
+  },
+  "shared-instance.invite.inviter.unknown": {
+    "message": "Користувач Modrinth"
+  },
+  "shared-instance.invite.joined-count": {
+    "message": "{count, plural, one {# особа вже приєдналася} few {# особи вже приєдналися} many {# осіб вже приєдналися} other {# осіб вже приєдналися}}"
+  },
+  "shared-instance.invite.loading": {
+    "message": "Завантаження запрошення…"
+  },
+  "shared-instance.invite.title": {
+    "message": "{name} Запрошує вас зіграти"
+  },
+  "shared-instance.invite.trust.description": {
+    "message": "Це запрошення було створене іншим користувачем Modrinth, а не Modrinth. Приймайте запрошення лише від людей, яким ви довіряєте."
+  },
   "shared-instance.invite.trust.heading": {
     "message": "Ви знаєте цього користувача?"
   },
+  "shared-instance.invite.unavailable.description": {
+    "message": "Можливо, термін його дії закінчився, досягнуто ліміту використань або його видалила особа, яка ним поділилася."
+  },
   "shared-instance.invite.unavailable.title": {
     "message": "Це запрошення недоступне"
   },
diff --git a/apps/frontend/src/locales/zh-CN/index.json b/apps/frontend/src/locales/zh-CN/index.json
index 0cc7b282c8..e3ec943469 100644
--- a/apps/frontend/src/locales/zh-CN/index.json
+++ b/apps/frontend/src/locales/zh-CN/index.json
@@ -191,6 +191,9 @@
   "analytics.chart.tooltip.hide-entry": {
     "message": "在图中隐藏{name}"
   },
+  "analytics.chart.tooltip.no-data": {
+    "message": "暂无数据"
+  },
   "analytics.chart.tooltip.pinned": {
     "message": "图表已固定"
   },
@@ -1440,7 +1443,7 @@
     "message": "总下载量"
   },
   "dashboard.analytics.total-followers": {
-    "message": "总关注者"
+    "message": "总关注人数"
   },
   "dashboard.collections.button.create-new": {
     "message": "新建"
@@ -1611,10 +1614,10 @@
     "message": "确认你的钱包地址"
   },
   "dashboard.creator-withdraw-modal.muralpay-details.document-number-national-id": {
-    "message": "国民身份证号码"
+    "message": "国家身份证号码"
   },
   "dashboard.creator-withdraw-modal.muralpay-details.document-number-national-id-placeholder": {
-    "message": "输入居民身份证号码"
+    "message": "输入国家身份证号码"
   },
   "dashboard.creator-withdraw-modal.muralpay-details.document-number-passport": {
     "message": "护照号码"
@@ -1776,16 +1779,16 @@
     "message": "你已用尽<b>{withdrawLimit}</b>的提现额度。若需继续提现，请先完成税务表格填写。"
   },
   "dashboard.discord-roles.banner.body": {
-    "message": "你符合获取 {roles} 的条件。通过 Modrinth 关联你的 Discord 账户，我们将自动同步这些身份。"
+    "message": "你符合获取 {roles} 的条件。通过 Modrinth 关联你的 Discord 账户，我们将自动同步相关身份组。"
   },
   "dashboard.discord-roles.banner.cta": {
     "message": "关联 Discord 账户"
   },
   "dashboard.discord-roles.banner.title": {
-    "message": "领取你的 Discord 身分组"
+    "message": "领取你的 Discord 身份组"
   },
   "dashboard.discord-roles.role.big-creator": {
-    "message": "1OO万+ 下载"
+    "message": "破百万下载"
   },
   "dashboard.discord-roles.role.creator": {
     "message": "创作者"
@@ -3090,7 +3093,7 @@
     "message": "斯洛伐克"
   },
   "muralpay.document-type.national-id": {
-    "message": "国民身份证"
+    "message": "国家身份证"
   },
   "muralpay.document-type.passport": {
     "message": "护照"
@@ -3354,7 +3357,7 @@
     "message": "加入项目邀请"
   },
   "project-member-header.invitation-with-role": {
-    "message": "你收到了加入此项目的邀请，其中你的身份为“{role}”。"
+    "message": "你收到了加入此项目的邀请，其中你的角色为“{role}”。"
   },
   "project-member-header.success-decline": {
     "message": "你拒绝了团队邀请"
@@ -4548,7 +4551,7 @@
     "message": "添加"
   },
   "settings.account.providers.modal.header": {
-    "message": "身份验证提供程序"
+    "message": "身份验证提供器"
   },
   "settings.account.providers.table.actions": {
     "message": "行动"
@@ -4692,7 +4695,7 @@
     "message": "如果二维码无法扫描，你可以手动输入密码："
   },
   "settings.account.two-factor.setup.scan": {
-    "message": "使用 <authy-link>Authy</authy-link>、<microsoft-authenticator-link>Microsoft Authenticator</microsoft-authenticator-link> 等2次验证应用，扫描二维码即可开始。"
+    "message": "使用 <authy-link>Authy</authy-link>、<microsoft-authenticator-link>Microsoft Authenticator</microsoft-authenticator-link> 等双因素验证应用，扫描二维码即可开始。"
   },
   "settings.account.two-factor.verify.description": {
     "message": "输入验证器提供的一次性验证码以验证访问权限。"
@@ -4790,12 +4793,24 @@
   "settings.authorizations.about-this-app": {
     "message": "关于此应用"
   },
+  "settings.authorizations.created-by": {
+    "message": "由 {user}创建"
+  },
   "settings.authorizations.description": {
     "message": "当您使用 Modrinth 账户授权某个应用程序时，即表示您授予其访问您账户的权限。您可以随时在此处管理和审查对您账户的访问权限。"
   },
+  "settings.authorizations.empty-state.description": {
+    "message": "您授权的应用将显示在此。"
+  },
+  "settings.authorizations.empty-state.heading": {
+    "message": "无已授权的应用"
+  },
   "settings.authorizations.head-title": {
     "message": "授权"
   },
+  "settings.authorizations.official-tooltip": {
+    "message": "此应用由 Modrinth 官方账号创建。"
+  },
   "settings.authorizations.revoke.action": {
     "message": "撤销"
   },
@@ -4805,6 +4820,9 @@
   "settings.authorizations.revoke.confirm.title": {
     "message": "您确定要撤销此申请吗？"
   },
+  "settings.authorizations.unofficial-disclosure": {
+    "message": "尽管名字如此，这个应用与Modrinth没有任何关联。"
+  },
   "settings.billing.charges.description": {
     "message": "您过去所有支付给Modrinth账户的款项都将列在这里："
   },
diff --git a/apps/frontend/src/locales/zh-TW/index.json b/apps/frontend/src/locales/zh-TW/index.json
index b9aa299ce4..a61f5b1012 100644
--- a/apps/frontend/src/locales/zh-TW/index.json
+++ b/apps/frontend/src/locales/zh-TW/index.json
@@ -191,6 +191,9 @@
   "analytics.chart.tooltip.hide-entry": {
     "message": "在圖表中隱藏 {name}"
   },
+  "analytics.chart.tooltip.no-data": {
+    "message": "沒有數據"
+  },
   "analytics.chart.tooltip.pinned": {
     "message": "圖表工具提示已固定"
   },
@@ -975,7 +978,7 @@
     "message": "取消追蹤專案"
   },
   "collection.delete-modal.description": {
-    "message": "這將永久刪除這個收藏。此動作無法復原。"
+    "message": "這會永久刪除這個收藏，這項動作無法復原。"
   },
   "collection.delete-modal.title": {
     "message": "確定要刪除這個收藏嗎？"
@@ -996,7 +999,7 @@
     "message": "建立時間：{ago}"
   },
   "collection.label.curated-by": {
-    "message": "策劃者"
+    "message": "策展人"
   },
   "collection.label.no-projects": {
     "message": "收藏中暫無專案"
@@ -2973,7 +2976,7 @@
     "message": "每批 {amount} 個"
   },
   "modpack-scan-modal.batch.placeholder": {
-    "message": "批量數量"
+    "message": "批次數量"
   },
   "modpack-scan-modal.delete-all-groups-confirmation.description": {
     "message": "這會永久刪除這個專案的所有引用標註群組及其中的所有檔案，這項動作無法復原。"
@@ -4790,12 +4793,24 @@
   "settings.authorizations.about-this-app": {
     "message": "關於這個應用程式"
   },
+  "settings.authorizations.created-by": {
+    "message": "由 {user} 建立"
+  },
   "settings.authorizations.description": {
-    "message": "當你使用 Modrinth 帳號授權應用程式時，即代表你授予該應用程式存取你帳戶的權限。你可以隨時在這裡管理並審查帳號的存取權。"
+    "message": "當你使用 Modrinth 帳號授權應用程式時，即代表你授予該應用程式存取你帳號的權限。你可以隨時在這裡管理並審查帳號的存取權。"
+  },
+  "settings.authorizations.empty-state.description": {
+    "message": "你授權的應用程式將顯示在這裡。"
+  },
+  "settings.authorizations.empty-state.heading": {
+    "message": "沒有授權任何應用程式"
   },
   "settings.authorizations.head-title": {
     "message": "授權"
   },
+  "settings.authorizations.official-tooltip": {
+    "message": "這個應用程式由 Modrinth 官方帳號建立。"
+  },
   "settings.authorizations.revoke.action": {
     "message": "撤銷"
   },
@@ -4805,6 +4820,9 @@
   "settings.authorizations.revoke.confirm.title": {
     "message": "確定要撤銷這個應用程式的授權嗎？"
   },
+  "settings.authorizations.unofficial-disclosure": {
+    "message": "儘管名稱如此，這個應用程式與 Modrinth 沒有任何關聯。"
+  },
   "settings.billing.charges.description": {
     "message": "你對 Modrinth 帳號的所有過往支付紀錄皆會列於這裡："
   },
diff --git a/packages/moderation/src/locales/es-419/index.json b/packages/moderation/src/locales/es-419/index.json
index 065a8c26d0..31f8bb23db 100644
--- a/packages/moderation/src/locales/es-419/index.json
+++ b/packages/moderation/src/locales/es-419/index.json
@@ -6,10 +6,10 @@
     "defaultMessage": "Agrega una descripción"
   },
   "nags.add-icon.description": {
-    "defaultMessage": "Agrega un ícono único, relevante y atractivo hace que tu proyecto sea fácilmente identificable y destaque."
+    "defaultMessage": "Añade un ícono único, relevante y atractivo hace que tu proyecto sea fácilmente identificable y destaque."
   },
   "nags.add-icon.title": {
-    "defaultMessage": "Agrega un ícono"
+    "defaultMessage": "Añade un ícono"
   },
   "nags.add-java-address.description": {
     "defaultMessage": "Agrega la dirección IP y el puerto que los jugadores de Java Edition pueden usar para unirse a tu servidor."
@@ -33,7 +33,7 @@
     "defaultMessage": "Agrega cualquier enlace relevante fuera de Modrinth, como el código fuente, un rastreador de incidencias o una invitación de Discord."
   },
   "nags.add-links.title": {
-    "defaultMessage": "Agregar enlaces externos"
+    "defaultMessage": "Añadir enlaces externos"
   },
   "nags.all-languages.description": {
     "defaultMessage": "Has seleccionado todas las opciones de idioma disponibles. Por favor, indica solo los idiomas que tu servidor admite activamente."
@@ -129,7 +129,7 @@
     "defaultMessage": "Algunas de tus imágenes no tienen texto alternativo, lo cual es importante para la accesibilidad, sobre todo para usuarios con discapacidad visual."
   },
   "nags.missing-alt-text.title": {
-    "defaultMessage": "Agregar texto alternativo a la imagen"
+    "defaultMessage": "Añadir texto alternativo a la imagen"
   },
   "nags.misused-discord-link-description": {
     "defaultMessage": "Los enlaces de invitación de Discord no se pueden usar para otros tipos de enlaces. Pon tu enlace de Discord únicamente en el campo de enlace de invitación de Discord."
diff --git a/packages/moderation/src/locales/es-ES/index.json b/packages/moderation/src/locales/es-ES/index.json
index 9813868828..36dcb099b4 100644
--- a/packages/moderation/src/locales/es-ES/index.json
+++ b/packages/moderation/src/locales/es-ES/index.json
@@ -17,6 +17,9 @@
   "nags.add-java-address.title": {
     "defaultMessage": "Añade una dirección Java"
   },
+  "nags.add-license-details.title": {
+    "defaultMessage": "Agregar detalles de la licencia"
+  },
   "nags.add-links-server.description": {
     "defaultMessage": "Añade cualquier enlace relevante, como un sitio web, tienda o una invitación de Discord."
   },
diff --git a/packages/moderation/src/locales/fr-FR/index.json b/packages/moderation/src/locales/fr-FR/index.json
index b2c6875eb7..64731b4aa9 100644
--- a/packages/moderation/src/locales/fr-FR/index.json
+++ b/packages/moderation/src/locales/fr-FR/index.json
@@ -144,7 +144,7 @@
     "defaultMessage": "Examinez et traitez toutes les remarques de l’équipe de modération avant de soumettre à nouveau."
   },
   "nags.moderator-feedback.title": {
-    "defaultMessage": "Retours de revue"
+    "defaultMessage": "Voir les retours"
   },
   "nags.multiple-resolution-tags.description": {
     "defaultMessage": "Vous avez sélectionné {count, plural, one {# tag de résolution} other {# 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."
diff --git a/packages/moderation/src/locales/hu-HU/index.json b/packages/moderation/src/locales/hu-HU/index.json
index 060efff7ab..af08873992 100644
--- a/packages/moderation/src/locales/hu-HU/index.json
+++ b/packages/moderation/src/locales/hu-HU/index.json
@@ -1,6 +1,6 @@
 {
   "nags.add-description.description": {
-    "defaultMessage": "Egy leírás ami leírja a projekt célját és funkcióját szükséges."
+    "defaultMessage": "Szükséges egy leírás ami leírja a projekt célját és funkcióját."
   },
   "nags.add-description.title": {
     "defaultMessage": "Adj hozzá egy leírást"
diff --git a/packages/moderation/src/locales/it-IT/index.json b/packages/moderation/src/locales/it-IT/index.json
index 0772fbe2c1..667bc2098b 100644
--- a/packages/moderation/src/locales/it-IT/index.json
+++ b/packages/moderation/src/locales/it-IT/index.json
@@ -267,6 +267,6 @@
     "defaultMessage": "Visita pagina delle versioni"
   },
   "nags.visit-links-settings.title": {
-    "defaultMessage": "Visita impostazioni dei link"
+    "defaultMessage": "Vedi impostazioni dei link"
   }
 }
diff --git a/packages/moderation/src/locales/tr-TR/index.json b/packages/moderation/src/locales/tr-TR/index.json
index 541785be7d..4097eaf942 100644
--- a/packages/moderation/src/locales/tr-TR/index.json
+++ b/packages/moderation/src/locales/tr-TR/index.json
@@ -12,7 +12,7 @@
     "defaultMessage": "Simge ekle"
   },
   "nags.add-java-address.description": {
-    "defaultMessage": "Java Sürümü oyuncuların sunucunuza girebileceği IP adresi ve portu girin."
+    "defaultMessage": "Java Sürümü oyuncularının sunucunuza girmek için kullanabileceği IP adresi ve portu girin."
   },
   "nags.add-java-address.title": {
     "defaultMessage": "Java adresleri ekle"
@@ -51,7 +51,7 @@
     "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"
+    "defaultMessage": "Açıklamayı genişlet"
   },
   "nags.edit-description.title": {
     "defaultMessage": "Açıklamayı düzenle"
diff --git a/packages/ui/src/locales/cs-CZ/index.json b/packages/ui/src/locales/cs-CZ/index.json
index 3ca7ba4115..6552d0fc48 100644
--- a/packages/ui/src/locales/cs-CZ/index.json
+++ b/packages/ui/src/locales/cs-CZ/index.json
@@ -4557,3 +4557,4 @@
     "defaultMessage": "Typ"
   }
 }
+
diff --git a/packages/ui/src/locales/da-DK/index.json b/packages/ui/src/locales/da-DK/index.json
index 3277f89162..4e5043ceac 100644
--- a/packages/ui/src/locales/da-DK/index.json
+++ b/packages/ui/src/locales/da-DK/index.json
@@ -161,6 +161,9 @@
   "button.enable": {
     "defaultMessage": "Aktiver"
   },
+  "button.extract": {
+    "defaultMessage": "Pak ud"
+  },
   "button.follow": {
     "defaultMessage": "Følg"
   },
@@ -272,12 +275,24 @@
   "changelog.product.hosting": {
     "defaultMessage": "Hosting"
   },
+  "changelog.product.web": {
+    "defaultMessage": "Platform"
+  },
   "collection-widget.loading-projects": {
     "defaultMessage": "Indlæser projekter..."
   },
+  "collection-widget.search-placeholder": {
+    "defaultMessage": "Søg efter projekter"
+  },
   "collections.label.private": {
     "defaultMessage": "Privat"
   },
+  "content-type.content.lowercase": {
+    "defaultMessage": "indhold"
+  },
+  "content-type.item.lowercase": {
+    "defaultMessage": "{count, plural, one {genstand} other {genstande}}"
+  },
   "content.card.select-project": {
     "defaultMessage": "Vælg {project}"
   },
@@ -2238,3 +2253,4 @@
     "defaultMessage": "Vanilla Shader"
   }
 }
+
diff --git a/packages/ui/src/locales/de-CH/index.json b/packages/ui/src/locales/de-CH/index.json
index bb3ed6010b..2c28e50ba2 100644
--- a/packages/ui/src/locales/de-CH/index.json
+++ b/packages/ui/src/locales/de-CH/index.json
@@ -566,6 +566,9 @@
   "content.inline-backup.world-label": {
     "defaultMessage": "Welt"
   },
+  "content.modpack-card.installation-settings": {
+    "defaultMessage": "Installationseinstellungen"
+  },
   "content.page-layout.additional-content": {
     "defaultMessage": "Zusätzliche Inhalte"
   },
@@ -2240,6 +2243,9 @@
   "label.details": {
     "defaultMessage": "Details"
   },
+  "label.discover-content": {
+    "defaultMessage": "Inhalte erkunden"
+  },
   "label.done": {
     "defaultMessage": "Fertig"
   },
@@ -2318,6 +2324,9 @@
   "label.password": {
     "defaultMessage": "Passwort"
   },
+  "label.permissions": {
+    "defaultMessage": "Berechtigungen"
+  },
   "label.plan-custom": {
     "defaultMessage": "Benutzerdefiniert"
   },
@@ -2849,9 +2858,162 @@
   "payment-method.visa": {
     "defaultMessage": "Visa"
   },
+  "profile.bio.fallback.creator": {
+    "defaultMessage": "Ein Modrinth-Ersteller."
+  },
+  "profile.bio.fallback.user": {
+    "defaultMessage": "Ein Modrinth-Nutzer."
+  },
+  "profile.block-user.admonition-body": {
+    "defaultMessage": "{username} wird dir keine Freundschaftsanfragen mehr senden können, dich nicht zu geteilten Instanzen einladen können und dich nicht mehr zu Modrinth-Hosting Servern einladen können."
+  },
+  "profile.block-user.admonition-title": {
+    "defaultMessage": "Bist du dir sicher, dass du diesen Nutzer blockieren willst?"
+  },
+  "profile.block-user.error-description": {
+    "defaultMessage": "Beim Blockieren dieses Nutzers ist ein Fehler aufgetreten. Bitte versuche es erneut."
+  },
+  "profile.block-user.error-title": {
+    "defaultMessage": "Blockierung fehlgeschlagen"
+  },
+  "profile.block-user.success-description": {
+    "defaultMessage": "{username} wurde blockiert."
+  },
+  "profile.block-user.success-title": {
+    "defaultMessage": "Nutzer blockiert"
+  },
+  "profile.block-user.title": {
+    "defaultMessage": "Blockiere {username}"
+  },
+  "profile.button.analytics": {
+    "defaultMessage": "Benutzeranalysen anzeigen"
+  },
+  "profile.button.billing": {
+    "defaultMessage": "Benutzerabrechnung verwalten"
+  },
+  "profile.button.block": {
+    "defaultMessage": "Blockieren"
+  },
+  "profile.button.create-collection": {
+    "defaultMessage": "Sammlung erstellen"
+  },
+  "profile.button.create-project": {
+    "defaultMessage": "Projekt erstellen"
+  },
+  "profile.button.edit-role": {
+    "defaultMessage": "Rolle bearbeiten"
+  },
+  "profile.button.info": {
+    "defaultMessage": "Nutzerdetails anzeigen"
+  },
+  "profile.button.manage-projects": {
+    "defaultMessage": "Projekte verwalten"
+  },
+  "profile.button.remove-affiliate": {
+    "defaultMessage": "Als Partner entfernen"
+  },
+  "profile.button.set-affiliate": {
+    "defaultMessage": "Als Partner festlegen"
+  },
+  "profile.button.unblock": {
+    "defaultMessage": "Freigeben"
+  },
+  "profile.collection.projects-count": {
+    "defaultMessage": "{count, plural, one {# Projekt} other {# Projekte}}"
+  },
+  "profile.details.label.auth-providers": {
+    "defaultMessage": "Authentifizierungsanbieter"
+  },
+  "profile.details.label.email-verified": {
+    "defaultMessage": "E-Mail verifiziert"
+  },
+  "profile.details.label.has-password": {
+    "defaultMessage": "Hat Passwort"
+  },
+  "profile.details.label.has-totp": {
+    "defaultMessage": "Hat TOTP"
+  },
+  "profile.details.label.payment-methods": {
+    "defaultMessage": "Zahlungsmethoden"
+  },
+  "profile.details.title": {
+    "defaultMessage": "Nutzerdetails"
+  },
+  "profile.details.tooltip.email-not-verified": {
+    "defaultMessage": "E-Mail nicht verifiziert"
+  },
+  "profile.details.tooltip.email-verified": {
+    "defaultMessage": "E-Mail verifiziert"
+  },
+  "profile.error.load-description": {
+    "defaultMessage": "Das Nutzerprofil konnte nicht geladen werden."
+  },
+  "profile.error.not-found": {
+    "defaultMessage": "Nutzer nicht gefunden"
+  },
+  "profile.label.affiliate": {
+    "defaultMessage": "Partner"
+  },
   "profile.label.badges": {
     "defaultMessage": "Abzeichen"
   },
+  "profile.label.collection": {
+    "defaultMessage": "Kollektion"
+  },
+  "profile.label.download-count": {
+    "defaultMessage": "{count, plural, one {Download} other {Downloads}}"
+  },
+  "profile.label.joined": {
+    "defaultMessage": "Beigetreten"
+  },
+  "profile.label.no-collections": {
+    "defaultMessage": "Dieser Nutzer hat keine Kollektionen!"
+  },
+  "profile.label.no-collections-auth-description": {
+    "defaultMessage": "Du hast noch keine Kollektionen."
+  },
+  "profile.label.no-projects": {
+    "defaultMessage": "Dieser Nutzer hat keine Projekte!"
+  },
+  "profile.label.no-projects-auth-description": {
+    "defaultMessage": "Du hast noch keine Projekte."
+  },
+  "profile.label.organizations": {
+    "defaultMessage": "Organisationen"
+  },
+  "profile.label.project-count": {
+    "defaultMessage": "{count, plural, one {Projekt} other {Projekte}}"
+  },
+  "profile.label.saving": {
+    "defaultMessage": "Speichert..."
+  },
+  "profile.official-account": {
+    "defaultMessage": "Offizielles Modrinth-Konto"
+  },
+  "profile.official-account.bio": {
+    "defaultMessage": "Das offizielle Benutzerkonto von Modrinth. Erhalte Hilfe unter <support-link></support-link> oder per E-Mail unter <email></email>"
+  },
+  "profile.role.select-placeholder": {
+    "defaultMessage": "Eine Rolle auswählen"
+  },
+  "profile.role.update-error-description": {
+    "defaultMessage": "Beim Aktualisieren dieser Nutzerrolle ist ein Fehler aufgetreten. Bitte versuche es erneut."
+  },
+  "profile.role.update-error-title": {
+    "defaultMessage": "Rolle konnte nicht aktualisiert werden"
+  },
+  "profile.unblock-user.error-description": {
+    "defaultMessage": "Beim Freigeben dieses Nutzers ist ein Fehler aufgetreten. Bitte versuche es erneut."
+  },
+  "profile.unblock-user.error-title": {
+    "defaultMessage": "Nutzer konnte nicht freigegeben werden"
+  },
+  "profile.unblock-user.success-description": {
+    "defaultMessage": "{username} wurde freigegeben."
+  },
+  "profile.unblock-user.success-title": {
+    "defaultMessage": "Nutzer Freigegeben"
+  },
   "project-card.date.published.tooltip": {
     "defaultMessage": "Veröffentlicht {date}"
   },
@@ -2879,6 +3041,9 @@
   "project-type.all": {
     "defaultMessage": "Alle"
   },
+  "project-type.collection.plural": {
+    "defaultMessage": "Kollektionen"
+  },
   "project-type.datapack.capital": {
     "defaultMessage": "{count, plural, one {Datenpaket} other {Datenpakete}}"
   },
@@ -5105,9 +5270,120 @@
   "settings.pats.title": {
     "defaultMessage": "Persöhnlich Zugangstoken"
   },
+  "settings.profile.bio.description": {
+    "defaultMessage": "Eine kurze Beschreibung um allen ein bisschen von dir zu erzählen."
+  },
+  "settings.profile.bio.title": {
+    "defaultMessage": "Bio"
+  },
+  "settings.profile.navigation-title": {
+    "defaultMessage": "Profil"
+  },
+  "settings.profile.profile-picture.title": {
+    "defaultMessage": "Profilbild"
+  },
+  "settings.profile.public-information.description": {
+    "defaultMessage": "Deine Profilinformationen sind öffentlich auf <profile-link>Modrinth sichtbar</profile-link> und durch die <docs-link>Modrinth API</docs-link>."
+  },
+  "settings.profile.save-error": {
+    "defaultMessage": "Profil konnte nicht aktualisiert werden"
+  },
+  "settings.profile.save-error-description": {
+    "defaultMessage": "Beim Aktualisieren deines Profils ist ein Fehler aufgetreten. Bitte versuche es erneut."
+  },
+  "settings.profile.sign-in-required.description": {
+    "defaultMessage": "Melde dich mit einem Modrinth-Konto an, um dein öffentliches Profil anzupassen."
+  },
+  "settings.profile.sign-in-required.title": {
+    "defaultMessage": "Modrinth-Konto benötigt"
+  },
+  "settings.profile.username.description": {
+    "defaultMessage": "Ein eindeutiger Name für dein Profil, bei dem Groß- und Kleinschreibung nicht unterschieden wird."
+  },
   "settings.sessions.title": {
     "defaultMessage": "Sitzungen"
   },
+  "settings.social.blocked-users.column.actions": {
+    "defaultMessage": "Aktionen"
+  },
+  "settings.social.blocked-users.column.user": {
+    "defaultMessage": "Nutzer"
+  },
+  "settings.social.blocked-users.description": {
+    "defaultMessage": "Das sind die Nutzer, die du auf Modrinth blockiert hast. Sie können nicht:"
+  },
+  "settings.social.blocked-users.empty": {
+    "defaultMessage": "Du hast niemanden blockiert."
+  },
+  "settings.social.blocked-users.load-error": {
+    "defaultMessage": "Blockierte Nutzer konnten nicht geladen werden."
+  },
+  "settings.social.blocked-users.loading": {
+    "defaultMessage": "Blockierte Nutzer werden geladen…"
+  },
+  "settings.social.blocked-users.restriction.friend-requests": {
+    "defaultMessage": "Dir Freundschaftsanfragen senden"
+  },
+  "settings.social.blocked-users.restriction.hosting": {
+    "defaultMessage": "Dich zu einem Modrinth-Hosting Server einladen."
+  },
+  "settings.social.blocked-users.restriction.shared-instances": {
+    "defaultMessage": "Dich zu geteilten Instanzen einladen"
+  },
+  "settings.social.blocked-users.title": {
+    "defaultMessage": "Blockierte Nutzer"
+  },
+  "settings.social.blocked-users.unblock": {
+    "defaultMessage": "Freigeben"
+  },
+  "settings.social.blocked-users.unblock-error": {
+    "defaultMessage": "Benutzer konnte nicht freigegeben werden"
+  },
+  "settings.social.blocked-users.unblock-error-description": {
+    "defaultMessage": "Beim Freigeben dieses Nutzers ist ein Fehler aufgetreten. Bitte versuche es erneut."
+  },
+  "settings.social.blocked-users.unblock-user": {
+    "defaultMessage": "Freigeben {username}"
+  },
+  "settings.social.blocked-users.user-avatar": {
+    "defaultMessage": "{username}'s Avatar"
+  },
+  "settings.social.friend-requests.description": {
+    "defaultMessage": "Steuere wer dir auf Modrinth Freundschaftsanfragen senden kann."
+  },
+  "settings.social.friend-requests.title": {
+    "defaultMessage": "Freundschaftsanfragen"
+  },
+  "settings.social.interaction-source.coming-soon": {
+    "defaultMessage": "Bald verfügbar!"
+  },
+  "settings.social.interaction-source.everyone": {
+    "defaultMessage": "Jeder"
+  },
+  "settings.social.interaction-source.friends": {
+    "defaultMessage": "Freunde"
+  },
+  "settings.social.interaction-source.friends-of-friends": {
+    "defaultMessage": "Freunde von Freunden"
+  },
+  "settings.social.interaction-source.no-one": {
+    "defaultMessage": "Niemand"
+  },
+  "settings.social.shared-instance-invites.description": {
+    "defaultMessage": "Steuere, wer dir Einladungen zu geteilten Instanzen und Modrinth-Hosting-Panels senden kann."
+  },
+  "settings.social.shared-instance-invites.title": {
+    "defaultMessage": "Einladungen"
+  },
+  "settings.social.sign-in-required.description": {
+    "defaultMessage": "Du kannst mit einem Modrinth-Konto steuern wer mit dir interagieren kann, und geblockte Nutzer verwalten"
+  },
+  "settings.social.sign-in-required.title": {
+    "defaultMessage": "Modrinth-Konto benötigt"
+  },
+  "settings.social.title": {
+    "defaultMessage": "Sozial"
+  },
   "sharing.invite-players-modal.add": {
     "defaultMessage": "Hinzufügen"
   },
@@ -5117,6 +5393,9 @@
   "sharing.invite-players-modal.already-invited": {
     "defaultMessage": "Dieser Benutzer wurde bereits eingeladen."
   },
+  "sharing.invite-players-modal.apply-button": {
+    "defaultMessage": "Anwenden"
+  },
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "Avatar von {username}"
   },
@@ -5126,12 +5405,36 @@
   "sharing.invite-players-modal.cancel-button": {
     "defaultMessage": "Abbrechen"
   },
+  "sharing.invite-players-modal.custom-expiry": {
+    "defaultMessage": "Benutzerdefiniert..."
+  },
+  "sharing.invite-players-modal.custom-expiry-value": {
+    "defaultMessage": "Benutzerdefiniert: {date}"
+  },
   "sharing.invite-players-modal.edit-invite-link": {
     "defaultMessage": "Einladungslink bearbeiten."
   },
   "sharing.invite-players-modal.edit-invite-link-title": {
     "defaultMessage": "Einladungslink bearbeiten"
   },
+  "sharing.invite-players-modal.expiry-in-one-day": {
+    "defaultMessage": "In 1 Tag"
+  },
+  "sharing.invite-players-modal.expiry-in-one-hour": {
+    "defaultMessage": "In 1 Stunde"
+  },
+  "sharing.invite-players-modal.expiry-in-seven-days": {
+    "defaultMessage": "In 7 Tagen"
+  },
+  "sharing.invite-players-modal.expiry-in-six-hours": {
+    "defaultMessage": "In 6 Stunden"
+  },
+  "sharing.invite-players-modal.expiry-in-three-days": {
+    "defaultMessage": "In 3 Tagen"
+  },
+  "sharing.invite-players-modal.expiry-in-twelve-hours": {
+    "defaultMessage": "In 12 Stunden"
+  },
   "sharing.invite-players-modal.expiry-label": {
     "defaultMessage": "Ablaufdatum"
   },
@@ -5937,3 +6240,4 @@
     "defaultMessage": "Typ"
   }
 }
+
diff --git a/packages/ui/src/locales/de-DE/index.json b/packages/ui/src/locales/de-DE/index.json
index c6f62eb559..d77097b3eb 100644
--- a/packages/ui/src/locales/de-DE/index.json
+++ b/packages/ui/src/locales/de-DE/index.json
@@ -566,6 +566,9 @@
   "content.inline-backup.world-label": {
     "defaultMessage": "Welt"
   },
+  "content.modpack-card.installation-settings": {
+    "defaultMessage": "Installationseinstellungen"
+  },
   "content.page-layout.additional-content": {
     "defaultMessage": "Zusätzliche Inhalte"
   },
@@ -2240,6 +2243,9 @@
   "label.details": {
     "defaultMessage": "Details"
   },
+  "label.discover-content": {
+    "defaultMessage": "Inhalte erkunden"
+  },
   "label.done": {
     "defaultMessage": "Fertig"
   },
@@ -2318,6 +2324,9 @@
   "label.password": {
     "defaultMessage": "Passwort"
   },
+  "label.permissions": {
+    "defaultMessage": "Berechtigungen"
+  },
   "label.plan-custom": {
     "defaultMessage": "Benutzerdefiniert"
   },
@@ -2849,9 +2858,162 @@
   "payment-method.visa": {
     "defaultMessage": "Visa"
   },
+  "profile.bio.fallback.creator": {
+    "defaultMessage": "Ein Modrinth-Ersteller."
+  },
+  "profile.bio.fallback.user": {
+    "defaultMessage": "Ein Modrinth-Nutzer."
+  },
+  "profile.block-user.admonition-body": {
+    "defaultMessage": "{username} wird dir keine Freundschaftsanfragen mehr senden können, dich nicht zu geteilten Instanzen einladen können und dich nicht mehr zu Modrinth-Hosting Servern einladen können."
+  },
+  "profile.block-user.admonition-title": {
+    "defaultMessage": "Bist du dir sicher, dass du diesen Nutzer blockieren willst?"
+  },
+  "profile.block-user.error-description": {
+    "defaultMessage": "Beim Blockieren dieses Nutzers ist ein Fehler aufgetreten. Bitte versuche es erneut."
+  },
+  "profile.block-user.error-title": {
+    "defaultMessage": "Blockierung fehlgeschlagen"
+  },
+  "profile.block-user.success-description": {
+    "defaultMessage": "{username} wurde blockiert."
+  },
+  "profile.block-user.success-title": {
+    "defaultMessage": "Nutzer blockiert"
+  },
+  "profile.block-user.title": {
+    "defaultMessage": "Blockiere {username}"
+  },
+  "profile.button.analytics": {
+    "defaultMessage": "Benutzeranalysen anzeigen"
+  },
+  "profile.button.billing": {
+    "defaultMessage": "Benutzerabrechnung verwalten"
+  },
+  "profile.button.block": {
+    "defaultMessage": "Blockieren"
+  },
+  "profile.button.create-collection": {
+    "defaultMessage": "Sammlung erstellen"
+  },
+  "profile.button.create-project": {
+    "defaultMessage": "Projekt erstellen"
+  },
+  "profile.button.edit-role": {
+    "defaultMessage": "Rolle bearbeiten"
+  },
+  "profile.button.info": {
+    "defaultMessage": "Nutzerdetails anzeigen"
+  },
+  "profile.button.manage-projects": {
+    "defaultMessage": "Projekte verwalten"
+  },
+  "profile.button.remove-affiliate": {
+    "defaultMessage": "Als Partner entfernen"
+  },
+  "profile.button.set-affiliate": {
+    "defaultMessage": "Als Partner festlegen"
+  },
+  "profile.button.unblock": {
+    "defaultMessage": "Freigeben"
+  },
+  "profile.collection.projects-count": {
+    "defaultMessage": "{count, plural, one {# Projekt} other {# Projekte}}"
+  },
+  "profile.details.label.auth-providers": {
+    "defaultMessage": "Authentifizierungsanbieter"
+  },
+  "profile.details.label.email-verified": {
+    "defaultMessage": "E-Mail verifiziert"
+  },
+  "profile.details.label.has-password": {
+    "defaultMessage": "Hat Passwort"
+  },
+  "profile.details.label.has-totp": {
+    "defaultMessage": "Hat TOTP"
+  },
+  "profile.details.label.payment-methods": {
+    "defaultMessage": "Zahlungsmethoden"
+  },
+  "profile.details.title": {
+    "defaultMessage": "Nutzerdetails"
+  },
+  "profile.details.tooltip.email-not-verified": {
+    "defaultMessage": "E-Mail nicht verifiziert"
+  },
+  "profile.details.tooltip.email-verified": {
+    "defaultMessage": "E-Mail verifiziert"
+  },
+  "profile.error.load-description": {
+    "defaultMessage": "Das Nutzerprofil konnte nicht geladen werden."
+  },
+  "profile.error.not-found": {
+    "defaultMessage": "Nutzer nicht gefunden"
+  },
+  "profile.label.affiliate": {
+    "defaultMessage": "Partner"
+  },
   "profile.label.badges": {
     "defaultMessage": "Abzeichen"
   },
+  "profile.label.collection": {
+    "defaultMessage": "Kollektion"
+  },
+  "profile.label.download-count": {
+    "defaultMessage": "{count, plural, one {Download} other {Downloads}}"
+  },
+  "profile.label.joined": {
+    "defaultMessage": "Beigetreten"
+  },
+  "profile.label.no-collections": {
+    "defaultMessage": "Dieser Nutzer hat keine Kollektionen!"
+  },
+  "profile.label.no-collections-auth-description": {
+    "defaultMessage": "Du hast noch keine Kollektionen."
+  },
+  "profile.label.no-projects": {
+    "defaultMessage": "Dieser Nutzer hat keine Projekte!"
+  },
+  "profile.label.no-projects-auth-description": {
+    "defaultMessage": "Du hast noch keine Projekte."
+  },
+  "profile.label.organizations": {
+    "defaultMessage": "Organisationen"
+  },
+  "profile.label.project-count": {
+    "defaultMessage": "{count, plural, one {Projekt} other {Projekte}}"
+  },
+  "profile.label.saving": {
+    "defaultMessage": "Speichert..."
+  },
+  "profile.official-account": {
+    "defaultMessage": "Offizielles Modrinth-Konto"
+  },
+  "profile.official-account.bio": {
+    "defaultMessage": "Das offizielle Benutzerkonto von Modrinth. Erhalte Hilfe unter <support-link></support-link> oder per E-Mail unter <email></email>"
+  },
+  "profile.role.select-placeholder": {
+    "defaultMessage": "Eine Rolle auswählen"
+  },
+  "profile.role.update-error-description": {
+    "defaultMessage": "Beim Aktualisieren dieser Nutzerrolle ist ein Fehler aufgetreten. Bitte versuche es erneut."
+  },
+  "profile.role.update-error-title": {
+    "defaultMessage": "Rolle konnte nicht aktualisiert werden"
+  },
+  "profile.unblock-user.error-description": {
+    "defaultMessage": "Beim Freigeben dieses Nutzers ist ein Fehler aufgetreten. Bitte versuche es erneut."
+  },
+  "profile.unblock-user.error-title": {
+    "defaultMessage": "Nutzer konnte nicht freigegeben werden"
+  },
+  "profile.unblock-user.success-description": {
+    "defaultMessage": "{username} wurde freigegeben."
+  },
+  "profile.unblock-user.success-title": {
+    "defaultMessage": "Nutzer Freigegeben"
+  },
   "project-card.date.published.tooltip": {
     "defaultMessage": "Veröffentlicht am {date}"
   },
@@ -2879,6 +3041,9 @@
   "project-type.all": {
     "defaultMessage": "Alle"
   },
+  "project-type.collection.plural": {
+    "defaultMessage": "Kollektionen"
+  },
   "project-type.datapack.capital": {
     "defaultMessage": "{count, plural, one {Datenpaket} other {Datenpakete}}"
   },
@@ -5105,9 +5270,120 @@
   "settings.pats.title": {
     "defaultMessage": "Persönliche Zugangstoken"
   },
+  "settings.profile.bio.description": {
+    "defaultMessage": "Eine kurze Beschreibung um allen ein bisschen von dir zu erzählen."
+  },
+  "settings.profile.bio.title": {
+    "defaultMessage": "Bio"
+  },
+  "settings.profile.navigation-title": {
+    "defaultMessage": "Profil"
+  },
+  "settings.profile.profile-picture.title": {
+    "defaultMessage": "Profilbild"
+  },
+  "settings.profile.public-information.description": {
+    "defaultMessage": "Deine Profilinformationen sind öffentlich auf <profile-link>Modrinth sichtbar</profile-link> und durch die <docs-link>Modrinth API</docs-link>."
+  },
+  "settings.profile.save-error": {
+    "defaultMessage": "Profil konnte nicht aktualisiert werden"
+  },
+  "settings.profile.save-error-description": {
+    "defaultMessage": "Beim Aktualisieren deines Profils ist ein Fehler aufgetreten. Bitte versuche es erneut."
+  },
+  "settings.profile.sign-in-required.description": {
+    "defaultMessage": "Melde dich mit einem Modrinth-Konto an, um dein öffentliches Profil anzupassen."
+  },
+  "settings.profile.sign-in-required.title": {
+    "defaultMessage": "Modrinth-Konto benötigt"
+  },
+  "settings.profile.username.description": {
+    "defaultMessage": "Ein eindeutiger Name für dein Profil, bei dem Groß- und Kleinschreibung nicht unterschieden wird."
+  },
   "settings.sessions.title": {
     "defaultMessage": "Sitzungen"
   },
+  "settings.social.blocked-users.column.actions": {
+    "defaultMessage": "Aktionen"
+  },
+  "settings.social.blocked-users.column.user": {
+    "defaultMessage": "Nutzer"
+  },
+  "settings.social.blocked-users.description": {
+    "defaultMessage": "Das sind die Nutzer, die du auf Modrinth blockiert hast. Sie können nicht:"
+  },
+  "settings.social.blocked-users.empty": {
+    "defaultMessage": "Du hast niemanden blockiert."
+  },
+  "settings.social.blocked-users.load-error": {
+    "defaultMessage": "Blockierte Nutzer konnten nicht geladen werden."
+  },
+  "settings.social.blocked-users.loading": {
+    "defaultMessage": "Blockierte Nutzer werden geladen…"
+  },
+  "settings.social.blocked-users.restriction.friend-requests": {
+    "defaultMessage": "Dir Freundschaftsanfragen senden"
+  },
+  "settings.social.blocked-users.restriction.hosting": {
+    "defaultMessage": "Dich zu einem Modrinth-Hosting Server einladen."
+  },
+  "settings.social.blocked-users.restriction.shared-instances": {
+    "defaultMessage": "Dich zu geteilten Instanzen einladen"
+  },
+  "settings.social.blocked-users.title": {
+    "defaultMessage": "Blockierte Nutzer"
+  },
+  "settings.social.blocked-users.unblock": {
+    "defaultMessage": "Freigeben"
+  },
+  "settings.social.blocked-users.unblock-error": {
+    "defaultMessage": "Benutzer konnte nicht freigegeben werden"
+  },
+  "settings.social.blocked-users.unblock-error-description": {
+    "defaultMessage": "Beim Freigeben dieses Nutzers ist ein Fehler aufgetreten. Bitte versuche es erneut."
+  },
+  "settings.social.blocked-users.unblock-user": {
+    "defaultMessage": "Freigeben {username}"
+  },
+  "settings.social.blocked-users.user-avatar": {
+    "defaultMessage": "{username}'s Avatar"
+  },
+  "settings.social.friend-requests.description": {
+    "defaultMessage": "Steuere wer dir auf Modrinth Freundschaftsanfragen senden kann."
+  },
+  "settings.social.friend-requests.title": {
+    "defaultMessage": "Freundschaftsanfragen"
+  },
+  "settings.social.interaction-source.coming-soon": {
+    "defaultMessage": "Bald verfügbar!"
+  },
+  "settings.social.interaction-source.everyone": {
+    "defaultMessage": "Jeder"
+  },
+  "settings.social.interaction-source.friends": {
+    "defaultMessage": "Freunde"
+  },
+  "settings.social.interaction-source.friends-of-friends": {
+    "defaultMessage": "Freunde von Freunden"
+  },
+  "settings.social.interaction-source.no-one": {
+    "defaultMessage": "Niemand"
+  },
+  "settings.social.shared-instance-invites.description": {
+    "defaultMessage": "Steuere, wer dir Einladungen zu geteilten Instanzen und Modrinth-Hosting-Panels senden kann."
+  },
+  "settings.social.shared-instance-invites.title": {
+    "defaultMessage": "Einladungen"
+  },
+  "settings.social.sign-in-required.description": {
+    "defaultMessage": "Du kannst mit einem Modrinth-Konto steuern wer mit dir interagieren kann, und geblockte Nutzer verwalten"
+  },
+  "settings.social.sign-in-required.title": {
+    "defaultMessage": "Modrinth-Konto benötigt"
+  },
+  "settings.social.title": {
+    "defaultMessage": "Sozial"
+  },
   "sharing.invite-players-modal.add": {
     "defaultMessage": "Hinzufügen"
   },
@@ -5117,6 +5393,9 @@
   "sharing.invite-players-modal.already-invited": {
     "defaultMessage": "Dieser Benutzer wurde bereits eingeladen."
   },
+  "sharing.invite-players-modal.apply-button": {
+    "defaultMessage": "Anwenden"
+  },
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "Avatar von {username}"
   },
@@ -5126,12 +5405,36 @@
   "sharing.invite-players-modal.cancel-button": {
     "defaultMessage": "Abbrechen"
   },
+  "sharing.invite-players-modal.custom-expiry": {
+    "defaultMessage": "Benutzerdefiniert..."
+  },
+  "sharing.invite-players-modal.custom-expiry-value": {
+    "defaultMessage": "Benutzerdefiniert: {date}"
+  },
   "sharing.invite-players-modal.edit-invite-link": {
     "defaultMessage": "Einladungslink bearbeiten."
   },
   "sharing.invite-players-modal.edit-invite-link-title": {
     "defaultMessage": "Einladungslink bearbeiten"
   },
+  "sharing.invite-players-modal.expiry-in-one-day": {
+    "defaultMessage": "In 1 Tag"
+  },
+  "sharing.invite-players-modal.expiry-in-one-hour": {
+    "defaultMessage": "In 1 Stunde"
+  },
+  "sharing.invite-players-modal.expiry-in-seven-days": {
+    "defaultMessage": "In 7 Tagen"
+  },
+  "sharing.invite-players-modal.expiry-in-six-hours": {
+    "defaultMessage": "In 6 Stunden"
+  },
+  "sharing.invite-players-modal.expiry-in-three-days": {
+    "defaultMessage": "In 3 Tagen"
+  },
+  "sharing.invite-players-modal.expiry-in-twelve-hours": {
+    "defaultMessage": "In 12 Stunden"
+  },
   "sharing.invite-players-modal.expiry-label": {
     "defaultMessage": "Ablaufdatum"
   },
@@ -5937,3 +6240,4 @@
     "defaultMessage": "Typ"
   }
 }
+
diff --git a/packages/ui/src/locales/es-419/index.json b/packages/ui/src/locales/es-419/index.json
index 700b0fd3dd..729504e9a4 100644
--- a/packages/ui/src/locales/es-419/index.json
+++ b/packages/ui/src/locales/es-419/index.json
@@ -39,7 +39,7 @@
     "defaultMessage": "Error al cargar la configuración del servidor"
   },
   "badge.alpha": {
-    "defaultMessage": "Alpha"
+    "defaultMessage": "Alfa"
   },
   "badge.beta": {
     "defaultMessage": "Beta"
@@ -377,6 +377,9 @@
   "content.confirm-deletion.header": {
     "defaultMessage": "Eliminar {itemType}"
   },
+  "content.confirm-disable.header": {
+    "defaultMessage": "Desactivar {itemType}"
+  },
   "content.confirm-modpack-update.admonition-body": {
     "defaultMessage": "{action, select, downgrade {Bajar de versión} other {Actualizar}} puede causar problemas de compatibilidad. Los mods o contenido que agregaste sobre el modpack se mantendrán, pero podrían no ser compatibles con la nueva versión."
   },
@@ -446,12 +449,18 @@
   "content.diff-modal.added-count": {
     "defaultMessage": "{count} añadido"
   },
+  "content.diff-modal.config-files-updated": {
+    "defaultMessage": "Archivos de configuración cambiados"
+  },
   "content.diff-modal.diff-type.added": {
     "defaultMessage": "Añadido (dependencia)"
   },
   "content.diff-modal.diff-type.removed": {
     "defaultMessage": "Desactivado"
   },
+  "content.diff-modal.diff-type.removed-disabled": {
+    "defaultMessage": "Eliminado (desactivado)"
+  },
   "content.diff-modal.diff-type.updated": {
     "defaultMessage": "Actualizado"
   },
@@ -467,12 +476,36 @@
   "content.diff-modal.external-diff-type.updated": {
     "defaultMessage": "Actualizado"
   },
+  "content.diff-modal.file-count": {
+    "defaultMessage": "{count, plural, one {# archivo} other {# archivos}}"
+  },
+  "content.diff-modal.game-version-updated": {
+    "defaultMessage": "Versión del juego"
+  },
   "content.diff-modal.install-anyway": {
     "defaultMessage": "Instalar de todos modos"
   },
+  "content.diff-modal.loader-updated": {
+    "defaultMessage": "Loader"
+  },
+  "content.diff-modal.modpack-linked": {
+    "defaultMessage": "Modpack vinculado"
+  },
+  "content.diff-modal.modpack-unlinked": {
+    "defaultMessage": "Modpack desvinculado"
+  },
+  "content.diff-modal.modpack-updated": {
+    "defaultMessage": "Modpack actualizado"
+  },
+  "content.diff-modal.no-content-changes": {
+    "defaultMessage": "Sin cambios al contenido"
+  },
   "content.diff-modal.removed-count": {
     "defaultMessage": "{count} eliminados"
   },
+  "content.diff-modal.removed-disabled-count": {
+    "defaultMessage": "{count} eliminados (desactivados)"
+  },
   "content.diff-modal.reviewed-files": {
     "defaultMessage": "Un archivo solo se revisa si se publica en Modrinth, sin importar su formato (incluido el .mrpack)."
   },
@@ -533,6 +566,9 @@
   "content.inline-backup.world-label": {
     "defaultMessage": "mundo"
   },
+  "content.modpack-card.installation-settings": {
+    "defaultMessage": "Ajustes de instalación"
+  },
   "content.page-layout.additional-content": {
     "defaultMessage": "Contenido adicional"
   },
@@ -585,7 +621,7 @@
     "defaultMessage": "Nombres de los proyectos"
   },
   "content.page-layout.sort.alphabetical": {
-    "defaultMessage": "Allfabético"
+    "defaultMessage": "Alfabético"
   },
   "content.page-layout.sort.date-added-newest": {
     "defaultMessage": "Más recientes primero"
@@ -921,7 +957,7 @@
     "defaultMessage": "Configurar servidor"
   },
   "external-files.permissions-card.add-files-modal.confirm": {
-    "defaultMessage": "{count, plural, one {Agregar archivo} other {Agregar archivos}}"
+    "defaultMessage": "{count, plural, one {Añadir archivo} other {Añadir archivos}}"
   },
   "external-files.permissions-card.add-files-modal.description": {
     "defaultMessage": "Selecciona cualquier archivo que deba ser movido a este grupo."
@@ -930,7 +966,7 @@
     "defaultMessage": "No hay archivos en otros grupos que se puedan mover aquí."
   },
   "external-files.permissions-card.add-files-modal.load-error.title": {
-    "defaultMessage": "No se pudieron cargar los archivos."
+    "defaultMessage": "No se pudieron cargar los archivos"
   },
   "external-files.permissions-card.add-files-modal.no-search-results": {
     "defaultMessage": "No hay archivos que coincidan con tu búsqueda."
@@ -945,10 +981,10 @@
     "defaultMessage": "Añadir archivos a este grupo"
   },
   "external-files.permissions-card.add-files-to-group": {
-    "defaultMessage": "Agregar archivos..."
+    "defaultMessage": "Añadir archivos..."
   },
   "external-files.permissions-card.assign-files-error.title": {
-    "defaultMessage": "No se pudieron agregar los archivos"
+    "defaultMessage": "No se pudieron añadir los archivos"
   },
   "external-files.permissions-card.attribution.moderation-status.content-not-allowed": {
     "defaultMessage": "Contenido no permitido"
@@ -1077,7 +1113,7 @@
     "defaultMessage": "Grupo de atribución {id}"
   },
   "external-files.permissions-card.file-count": {
-    "defaultMessage": "{count, plural, one {Agregar archivo} other {Agregar archivos}}"
+    "defaultMessage": "{count, plural, one {Añadir archivo} other {Añadir archivos}}"
   },
   "external-files.permissions-card.included-files": {
     "defaultMessage": "Archivos incluidos:"
@@ -1101,7 +1137,7 @@
     "defaultMessage": "Motivo"
   },
   "external-files.permissions-card.moderation.error.title": {
-    "defaultMessage": "No se pudo guardar la revisión de moderación."
+    "defaultMessage": "No se pudo guardar la revisión de moderación"
   },
   "external-files.permissions-card.not-used-in-versions": {
     "defaultMessage": "Estos archivos no están siendo utilizados actualmente por ninguna versión."
@@ -1160,6 +1196,21 @@
   "external-files.permissions-card.reason.special-permission.description": {
     "defaultMessage": "Has obtenido permiso especial para redistribuir este trabajo en tu modpack."
   },
+  "external-files.permissions-card.remove-group": {
+    "defaultMessage": "Borrar grupo"
+  },
+  "external-files.permissions-card.remove-group-confirmation.description": {
+    "defaultMessage": "Esto eliminará permanentemente este grupo de atribución y todos los archivos dentro. Esta acción no se puede deshacer."
+  },
+  "external-files.permissions-card.remove-group-confirmation.title": {
+    "defaultMessage": "¿Borrar {title}?"
+  },
+  "external-files.permissions-card.remove-group-error.title": {
+    "defaultMessage": "No se pudo borrar el grupo"
+  },
+  "external-files.permissions-card.remove-group-shift-hint": {
+    "defaultMessage": "Mantén Shift al hacer clic para saltar la confirmación."
+  },
   "external-files.permissions-card.split-file": {
     "defaultMessage": "Eliminar del grupo"
   },
@@ -2039,6 +2090,12 @@
   "instances.modpack-content-modal.empty-title": {
     "defaultMessage": "No se encontró contenido"
   },
+  "instances.modpack-content-modal.external-content": {
+    "defaultMessage": "Externo"
+  },
+  "instances.modpack-content-modal.external-content-description": {
+    "defaultMessage": "Este archivo no está publicado en Modrinth."
+  },
   "instances.modpack-content-modal.header": {
     "defaultMessage": "Contenido del modpack"
   },
@@ -2048,6 +2105,9 @@
   "instances.modpack-content-modal.no-results": {
     "defaultMessage": "Ningún proyecto coincide con tu búsqueda."
   },
+  "instances.modpack-content-modal.open-in-slicer": {
+    "defaultMessage": "Abrir en Slicer"
+  },
   "instances.modpack-content-modal.search-placeholder": {
     "defaultMessage": "Buscar en {count, number} {count, plural, one {proyecto} other {proyectos}}"
   },
@@ -2183,6 +2243,9 @@
   "label.details": {
     "defaultMessage": "Detalles"
   },
+  "label.discover-content": {
+    "defaultMessage": "Descubrir contenido"
+  },
   "label.done": {
     "defaultMessage": "Listo"
   },
@@ -2261,6 +2324,9 @@
   "label.password": {
     "defaultMessage": "Contraseña"
   },
+  "label.permissions": {
+    "defaultMessage": "Permisos"
+  },
   "label.plan-custom": {
     "defaultMessage": "Personalizado"
   },
@@ -2616,7 +2682,7 @@
     "defaultMessage": "URL del video de YouTube"
   },
   "modal.add-payment-method.action": {
-    "defaultMessage": "Agregar método de pago"
+    "defaultMessage": "Añadir método de pago"
   },
   "modal.add-payment-method.title": {
     "defaultMessage": "Añadiendo método de pago"
@@ -2792,9 +2858,177 @@
   "payment-method.visa": {
     "defaultMessage": "Visa"
   },
+  "profile.bio.fallback.creator": {
+    "defaultMessage": "Un creador de Modrinth."
+  },
+  "profile.bio.fallback.user": {
+    "defaultMessage": "Un usuario de Modrinth."
+  },
+  "profile.block-user.admonition-body": {
+    "defaultMessage": "{username} no podrá enviarte solicitudes de amistad, invitarte a instancias compartidas o invitarte a servidores de Modrinth Hosting."
+  },
+  "profile.block-user.admonition-title": {
+    "defaultMessage": "¿Estás seguro de que quieres bloquear a este usuario?"
+  },
+  "profile.block-user.error-description": {
+    "defaultMessage": "Ocurrió un error al bloquear a este usuario. Por favor inténtalo otra vez."
+  },
+  "profile.block-user.error-title": {
+    "defaultMessage": "Error al bloquear usuario"
+  },
+  "profile.block-user.success-description": {
+    "defaultMessage": "Bloqueaste a {username}."
+  },
+  "profile.block-user.success-title": {
+    "defaultMessage": "Usuario bloqueado"
+  },
+  "profile.block-user.title": {
+    "defaultMessage": "Bloquear a {username}"
+  },
+  "profile.button.analytics": {
+    "defaultMessage": "Ver analíticas del usuario"
+  },
+  "profile.button.billing": {
+    "defaultMessage": "Gestionar facturación del usuario"
+  },
+  "profile.button.block": {
+    "defaultMessage": "Bloquear"
+  },
+  "profile.button.create-collection": {
+    "defaultMessage": "Crear una colección"
+  },
+  "profile.button.create-project": {
+    "defaultMessage": "Crear un proyecto"
+  },
+  "profile.button.edit-role": {
+    "defaultMessage": "Editar rol"
+  },
+  "profile.button.info": {
+    "defaultMessage": "Ver detalles del usuario"
+  },
+  "profile.button.manage-projects": {
+    "defaultMessage": "Gestionar proyectos"
+  },
+  "profile.button.remove-affiliate": {
+    "defaultMessage": "Remover como afiliado"
+  },
+  "profile.button.set-affiliate": {
+    "defaultMessage": "Configurar como afiliado"
+  },
+  "profile.button.unblock": {
+    "defaultMessage": "Desbloquear"
+  },
+  "profile.collection.projects-count": {
+    "defaultMessage": "{count, plural, one {# proyecto} other {# proyectos}}"
+  },
+  "profile.details.error.github-popup-blocked": {
+    "defaultMessage": "Permite las ventanas emergentes para Modrinth, y luego vuelve a intentarlo."
+  },
+  "profile.details.error.github-profile-message": {
+    "defaultMessage": "Este perfil de GitHub no pudo ser cargado. Por favor inténtalo otra vez."
+  },
+  "profile.details.error.github-profile-title": {
+    "defaultMessage": "Error al abrir el perfil de GitHub"
+  },
+  "profile.details.label.auth-providers": {
+    "defaultMessage": "Proveedores de autenticación"
+  },
+  "profile.details.label.email-verified": {
+    "defaultMessage": "Correo verificado"
+  },
+  "profile.details.label.has-password": {
+    "defaultMessage": "Tiene contraseña"
+  },
+  "profile.details.label.has-totp": {
+    "defaultMessage": "Tiene TOTP"
+  },
+  "profile.details.label.loading-github-profile": {
+    "defaultMessage": "Cargando..."
+  },
+  "profile.details.label.payment-methods": {
+    "defaultMessage": "Métodos de pago"
+  },
+  "profile.details.label.view-github-profile": {
+    "defaultMessage": "Ver perfil"
+  },
+  "profile.details.title": {
+    "defaultMessage": "Detalles de usuario"
+  },
+  "profile.details.tooltip.email-not-verified": {
+    "defaultMessage": "Correo sin verificar"
+  },
+  "profile.details.tooltip.email-verified": {
+    "defaultMessage": "Correo verificado"
+  },
+  "profile.error.load-description": {
+    "defaultMessage": "Este perfil de usuario no se pudo cargar."
+  },
+  "profile.error.not-found": {
+    "defaultMessage": "Usuario no encontrado"
+  },
+  "profile.label.affiliate": {
+    "defaultMessage": "Afiliado"
+  },
   "profile.label.badges": {
     "defaultMessage": "Insignias"
   },
+  "profile.label.collection": {
+    "defaultMessage": "Colección"
+  },
+  "profile.label.download-count": {
+    "defaultMessage": "{count, plural, one {descarga} other {descargas}}"
+  },
+  "profile.label.joined": {
+    "defaultMessage": "Se unió"
+  },
+  "profile.label.no-collections": {
+    "defaultMessage": "¡Este usuario no tiene colecciones!"
+  },
+  "profile.label.no-collections-auth-description": {
+    "defaultMessage": "Todavía no tienes ninguna colección."
+  },
+  "profile.label.no-projects": {
+    "defaultMessage": "¡Este usuario no tiene proyectos!"
+  },
+  "profile.label.no-projects-auth-description": {
+    "defaultMessage": "Todavía no tienes ningún proyecto."
+  },
+  "profile.label.organizations": {
+    "defaultMessage": "Organizaciones"
+  },
+  "profile.label.project-count": {
+    "defaultMessage": "{count, plural, one {proyecto} other {proyectos}}"
+  },
+  "profile.label.saving": {
+    "defaultMessage": "Guardando..."
+  },
+  "profile.official-account": {
+    "defaultMessage": "Cuenta oficial de Modrinth"
+  },
+  "profile.official-account.bio": {
+    "defaultMessage": "La cuenta oficial de Modrinth. Consigue ayuda en <support-link></support-link> o escríbenos a través de email: <email></email>"
+  },
+  "profile.role.select-placeholder": {
+    "defaultMessage": "Selecciona un rol"
+  },
+  "profile.role.update-error-description": {
+    "defaultMessage": "Ocurrió un error al actualizar el rol del usuario. Por favor inténtalo otra vez."
+  },
+  "profile.role.update-error-title": {
+    "defaultMessage": "Error al actualizar el rol"
+  },
+  "profile.unblock-user.error-description": {
+    "defaultMessage": "Ocurrió un error al desbloquear a este usuario. Por favor inténtalo otra vez."
+  },
+  "profile.unblock-user.error-title": {
+    "defaultMessage": "Error al desbloquear usuario"
+  },
+  "profile.unblock-user.success-description": {
+    "defaultMessage": "Desbloqueaste a {username}."
+  },
+  "profile.unblock-user.success-title": {
+    "defaultMessage": "Usuario desbloqueado"
+  },
   "project-card.date.published.tooltip": {
     "defaultMessage": "Publicado el {date}"
   },
@@ -2810,12 +3044,21 @@
   "project-card.environment.client-or-server": {
     "defaultMessage": "Cliente o servidor"
   },
+  "project-card.environment.dedicated-server": {
+    "defaultMessage": "Servidor dedicado"
+  },
   "project-card.environment.server": {
     "defaultMessage": "Servidor"
   },
+  "project-card.environment.singleplayer": {
+    "defaultMessage": "Un solo jugador"
+  },
   "project-type.all": {
     "defaultMessage": "Todo"
   },
+  "project-type.collection.plural": {
+    "defaultMessage": "Colecciones"
+  },
   "project-type.datapack.capital": {
     "defaultMessage": "{count, plural, one {Data Pack} other {Data Packs}}"
   },
@@ -3086,6 +3329,15 @@
   "project.follower-count-tooltip": {
     "defaultMessage": "{count, number} {count, plural, one {seguidor} other {seguidores}}"
   },
+  "project.license.error": {
+    "defaultMessage": "No se pudo conseguir el texto de la licencia."
+  },
+  "project.license.loading": {
+    "defaultMessage": "Cargando el texto de la licencia..."
+  },
+  "project.license.title": {
+    "defaultMessage": "Licencia"
+  },
   "project.online-player-count": {
     "defaultMessage": "{count, number} en línea"
   },
@@ -3491,6 +3743,12 @@
   "project.settings.view.title": {
     "defaultMessage": "Ver"
   },
+  "project.stats.downloads-label": {
+    "defaultMessage": "{count, plural, one {descarga} other {descargas}}"
+  },
+  "project.stats.followers-label": {
+    "defaultMessage": "{count, plural, one {seguidor} other {seguidores}}"
+  },
   "project.versions.channel.alpha.symbol": {
     "defaultMessage": "A"
   },
@@ -5022,14 +5280,227 @@
     "defaultMessage": "Idioma"
   },
   "settings.language.warning": {
-    "defaultMessage": "Cambiar el idioma de {platform} podría provocar que parte del contenido aparezca en inglés si no hay una traducción disponible. {platform} Aún no está completamente traducida, por lo que parte del contenido podría permanecer en inglés en ciertos idiomas."
+    "defaultMessage": "Cambiar el idioma de la {platform} podría provocar que parte del contenido aparezca en inglés si no hay una traducción disponible. La {platform} aún no está completamente traducida, por lo que parte del contenido podría permanecer en inglés en ciertos idiomas."
   },
   "settings.pats.title": {
     "defaultMessage": "Tokens de acceso personal"
   },
+  "settings.profile.bio.description": {
+    "defaultMessage": "Una descripción corta que le cuente a todos un poquito sobre tí."
+  },
+  "settings.profile.bio.title": {
+    "defaultMessage": "Biografía"
+  },
+  "settings.profile.navigation-title": {
+    "defaultMessage": "Perfil"
+  },
+  "settings.profile.profile-picture.title": {
+    "defaultMessage": "Foto de perfil"
+  },
+  "settings.profile.public-information.description": {
+    "defaultMessage": "La información de tu perfil es visible <profile-link>públicamente en Modrinth</profile-link> y también a través de la <docs-link>Modrinth API</docs-link>."
+  },
+  "settings.profile.save-error": {
+    "defaultMessage": "Error al actualizar perfil"
+  },
+  "settings.profile.save-error-description": {
+    "defaultMessage": "Ocurrió un error al actualizar tu perfil. Por favor inténtalo otra vez."
+  },
+  "settings.profile.sign-in-required.description": {
+    "defaultMessage": "Regístrate con una cuenta Modrinth para personalizar tu perfil."
+  },
+  "settings.profile.sign-in-required.title": {
+    "defaultMessage": "Cuenta Modrinth requerida"
+  },
+  "settings.profile.username.description": {
+    "defaultMessage": "Un nombre único, sin distinción de mayúsculas y minúsculas, para identificar tu perfil."
+  },
   "settings.sessions.title": {
     "defaultMessage": "Sesiones"
   },
+  "settings.social.blocked-users.column.actions": {
+    "defaultMessage": "Acciones"
+  },
+  "settings.social.blocked-users.column.user": {
+    "defaultMessage": "Usuario"
+  },
+  "settings.social.blocked-users.description": {
+    "defaultMessage": "Estos son los usuarios que has bloqueado en Modrinth. Ellos no pueden:"
+  },
+  "settings.social.blocked-users.empty": {
+    "defaultMessage": "No has bloqueado a nadie."
+  },
+  "settings.social.blocked-users.load-error": {
+    "defaultMessage": "No se pudo cargar los usuarios bloqueados."
+  },
+  "settings.social.blocked-users.loading": {
+    "defaultMessage": "Cargando usuarios bloqueados…"
+  },
+  "settings.social.blocked-users.restriction.friend-requests": {
+    "defaultMessage": "Enviarte solicitudes de amistad"
+  },
+  "settings.social.blocked-users.restriction.hosting": {
+    "defaultMessage": "Invitarte a gestionar un servidor de Modrinth Hosting."
+  },
+  "settings.social.blocked-users.restriction.shared-instances": {
+    "defaultMessage": "Invitarte a instancias compartidas"
+  },
+  "settings.social.blocked-users.title": {
+    "defaultMessage": "Usuarios bloqueados"
+  },
+  "settings.social.blocked-users.unblock": {
+    "defaultMessage": "Desbloquear"
+  },
+  "settings.social.blocked-users.unblock-error": {
+    "defaultMessage": "Error al desbloquear usuario"
+  },
+  "settings.social.blocked-users.unblock-error-description": {
+    "defaultMessage": "Ocurrió un error al desbloquear a este usuario. Por favor inténtalo otra vez."
+  },
+  "settings.social.blocked-users.unblock-user": {
+    "defaultMessage": "Desbloquear a {username}"
+  },
+  "settings.social.blocked-users.user-avatar": {
+    "defaultMessage": "Avatar de {username}"
+  },
+  "settings.social.friend-requests.description": {
+    "defaultMessage": "Controla quién puede enviarte solicitudes de amistad en Modrinth."
+  },
+  "settings.social.friend-requests.title": {
+    "defaultMessage": "Solicitudes de amistad"
+  },
+  "settings.social.interaction-source.coming-soon": {
+    "defaultMessage": "¡Próximamente!"
+  },
+  "settings.social.interaction-source.everyone": {
+    "defaultMessage": "Todos"
+  },
+  "settings.social.interaction-source.friends": {
+    "defaultMessage": "Amigos"
+  },
+  "settings.social.interaction-source.friends-of-friends": {
+    "defaultMessage": "Amigos de amigos"
+  },
+  "settings.social.interaction-source.no-one": {
+    "defaultMessage": "Nadie"
+  },
+  "settings.social.shared-instance-invites.description": {
+    "defaultMessage": "Controla quién te puede enviar invitaciones a instancias compartidas y paneles de Modrinth Hosting."
+  },
+  "settings.social.shared-instance-invites.title": {
+    "defaultMessage": "Invitaciones"
+  },
+  "settings.social.sign-in-required.description": {
+    "defaultMessage": "Puedes controlar quién puede interactuar contigo, y gestionar los usuarios bloqueados con una Cuenta Modrinth"
+  },
+  "settings.social.sign-in-required.title": {
+    "defaultMessage": "Cuenta Modrinth requerida"
+  },
+  "settings.social.title": {
+    "defaultMessage": "Social"
+  },
+  "sharing.invite-players-modal.add": {
+    "defaultMessage": "Añadir"
+  },
+  "sharing.invite-players-modal.added": {
+    "defaultMessage": "Añadido"
+  },
+  "sharing.invite-players-modal.already-invited": {
+    "defaultMessage": "Este usuario ya fue invitado."
+  },
+  "sharing.invite-players-modal.apply-button": {
+    "defaultMessage": "Aplicar"
+  },
+  "sharing.invite-players-modal.avatar-alt": {
+    "defaultMessage": "Avatar de {username}"
+  },
+  "sharing.invite-players-modal.cancel": {
+    "defaultMessage": "Cancelar"
+  },
+  "sharing.invite-players-modal.cancel-button": {
+    "defaultMessage": "Cancelar"
+  },
+  "sharing.invite-players-modal.custom-expiry": {
+    "defaultMessage": "Otro..."
+  },
+  "sharing.invite-players-modal.custom-expiry-value": {
+    "defaultMessage": "Otro: {date}"
+  },
+  "sharing.invite-players-modal.edit-invite-link": {
+    "defaultMessage": "Editar link de invitación."
+  },
+  "sharing.invite-players-modal.edit-invite-link-title": {
+    "defaultMessage": "Editar link de invitación"
+  },
+  "sharing.invite-players-modal.expiry-in-one-day": {
+    "defaultMessage": "En 1 día"
+  },
+  "sharing.invite-players-modal.expiry-in-one-hour": {
+    "defaultMessage": "En 1 hora"
+  },
+  "sharing.invite-players-modal.expiry-in-seven-days": {
+    "defaultMessage": "En 7 días"
+  },
+  "sharing.invite-players-modal.expiry-in-six-hours": {
+    "defaultMessage": "En 6 horas"
+  },
+  "sharing.invite-players-modal.expiry-in-three-days": {
+    "defaultMessage": "En 3 días"
+  },
+  "sharing.invite-players-modal.expiry-in-twelve-hours": {
+    "defaultMessage": "En 12 horas"
+  },
+  "sharing.invite-players-modal.expiry-label": {
+    "defaultMessage": "Fecha de expiración"
+  },
+  "sharing.invite-players-modal.friends-heading": {
+    "defaultMessage": "Tus amigos - {count}"
+  },
+  "sharing.invite-players-modal.invite": {
+    "defaultMessage": "Invitar"
+  },
+  "sharing.invite-players-modal.invite-expiry-description": {
+    "defaultMessage": "Tu link de invitación expira en {duration}."
+  },
+  "sharing.invite-players-modal.invite-link-heading": {
+    "defaultMessage": "O usa un link de invitación"
+  },
+  "sharing.invite-players-modal.link-copied-text": {
+    "defaultMessage": "El link de invitación fue copiado a tu portapapeles."
+  },
+  "sharing.invite-players-modal.link-copied-title": {
+    "defaultMessage": "Link copiado"
+  },
+  "sharing.invite-players-modal.link-copy-failed-title": {
+    "defaultMessage": "Error al copiar link"
+  },
+  "sharing.invite-players-modal.max-uses-label": {
+    "defaultMessage": "Usos máximos"
+  },
+  "sharing.invite-players-modal.no-friends": {
+    "defaultMessage": "No tienes amigos."
+  },
+  "sharing.invite-players-modal.no-search-results": {
+    "defaultMessage": "No se encontró ningún usuario coincidente."
+  },
+  "sharing.invite-players-modal.requested": {
+    "defaultMessage": "Solicitud enviada"
+  },
+  "sharing.invite-players-modal.requested-tooltip": {
+    "defaultMessage": "{username} debe aceptar tu solicitud de amistad primero"
+  },
+  "sharing.invite-players-modal.save-button": {
+    "defaultMessage": "Guardar"
+  },
+  "sharing.invite-players-modal.search-placeholder": {
+    "defaultMessage": "Introduce el nombre de usuario de Modrinth"
+  },
+  "sharing.invite-players-modal.searching": {
+    "defaultMessage": "Buscando..."
+  },
+  "sharing.invite-players-modal.update-invite-link-failed-title": {
+    "defaultMessage": "Error al actualizar link de invitación"
+  },
   "tag.category.128x": {
     "defaultMessage": "128x"
   },
@@ -5784,3 +6255,4 @@
     "defaultMessage": "Tipo"
   }
 }
+
diff --git a/packages/ui/src/locales/fi-FI/index.json b/packages/ui/src/locales/fi-FI/index.json
index 0f53d3fe32..f7213394cc 100644
--- a/packages/ui/src/locales/fi-FI/index.json
+++ b/packages/ui/src/locales/fi-FI/index.json
@@ -567,3 +567,4 @@
     "defaultMessage": "Sinulla on tallentamattomia muutoksia."
   }
 }
+
diff --git a/packages/ui/src/locales/fil-PH/index.json b/packages/ui/src/locales/fil-PH/index.json
index 554ae942b3..330f5de707 100644
--- a/packages/ui/src/locales/fil-PH/index.json
+++ b/packages/ui/src/locales/fil-PH/index.json
@@ -2766,3 +2766,4 @@
     "defaultMessage": "Uri"
   }
 }
+
diff --git a/packages/ui/src/locales/fr-FR/index.json b/packages/ui/src/locales/fr-FR/index.json
index 4d7ec28f42..094ee87f74 100644
--- a/packages/ui/src/locales/fr-FR/index.json
+++ b/packages/ui/src/locales/fr-FR/index.json
@@ -138,7 +138,7 @@
     "defaultMessage": "Liens affiliés"
   },
   "button.analytics": {
-    "defaultMessage": "Analyses"
+    "defaultMessage": "Statistiques"
   },
   "button.back": {
     "defaultMessage": "Retour"
@@ -566,6 +566,9 @@
   "content.inline-backup.world-label": {
     "defaultMessage": "monde"
   },
+  "content.modpack-card.installation-settings": {
+    "defaultMessage": "Paramètres d'installation"
+  },
   "content.page-layout.additional-content": {
     "defaultMessage": "Contenu supplémentaire"
   },
@@ -2234,6 +2237,9 @@
   "label.details": {
     "defaultMessage": "Détails"
   },
+  "label.discover-content": {
+    "defaultMessage": "Découvrir du contenu"
+  },
   "label.done": {
     "defaultMessage": "Terminé"
   },
@@ -2312,6 +2318,9 @@
   "label.password": {
     "defaultMessage": "Mot de passe"
   },
+  "label.permissions": {
+    "defaultMessage": "Permissions"
+  },
   "label.plan-custom": {
     "defaultMessage": "Personnalisé"
   },
@@ -2682,16 +2691,16 @@
     "defaultMessage": "Garder les fichiers à jour quand le serveur change"
   },
   "modal.open-in-app.get-app": {
-    "defaultMessage": "Obtenir l'application Modrinth"
+    "defaultMessage": "Obtenir Modrinth App"
   },
   "modal.open-in-app.opening-automatically": {
-    "defaultMessage": "L'application Modrinth s'ouvrira automatiquement..."
+    "defaultMessage": "Modrinth App s'ouvrira automatiquement..."
   },
   "modal.open-in-app.title": {
     "defaultMessage": "L'application Modrinth est en cours d'ouverture"
   },
   "modal.open-in-app.why-use": {
-    "defaultMessage": "Pourquoi utiliser l'application Modrinth"
+    "defaultMessage": "Pourquoi utiliser Modrinth App"
   },
   "notification.error.title": {
     "defaultMessage": "Une erreur est survenue"
@@ -2843,9 +2852,162 @@
   "payment-method.visa": {
     "defaultMessage": "Visa"
   },
+  "profile.bio.fallback.creator": {
+    "defaultMessage": "Un créateur Modrinth."
+  },
+  "profile.bio.fallback.user": {
+    "defaultMessage": "Un utilisateur Modrinth."
+  },
+  "profile.block-user.admonition-body": {
+    "defaultMessage": "{username} ne va pas pouvoir vous envoyer de demande d'ami, vous inviter aux instances partagées ni à des serveurs Modrinth Hosting."
+  },
+  "profile.block-user.admonition-title": {
+    "defaultMessage": "Êtes-vous sûr de vouloir bloquer cet utilisateur ?"
+  },
+  "profile.block-user.error-description": {
+    "defaultMessage": "Une erreur s'est produite pendant le blocage de cet utilisateur. Veuillez réessayer."
+  },
+  "profile.block-user.error-title": {
+    "defaultMessage": "Impossible de bloquer l'utilisateur"
+  },
+  "profile.block-user.success-description": {
+    "defaultMessage": "{username} a été bloqué."
+  },
+  "profile.block-user.success-title": {
+    "defaultMessage": "Utilisateur bloqué"
+  },
+  "profile.block-user.title": {
+    "defaultMessage": "Bloquer {username}"
+  },
+  "profile.button.analytics": {
+    "defaultMessage": "Voir les statistiques de l'utilisateur"
+  },
+  "profile.button.billing": {
+    "defaultMessage": "Gérer la facturation de l’utilisateur"
+  },
+  "profile.button.block": {
+    "defaultMessage": "Bloquer"
+  },
+  "profile.button.create-collection": {
+    "defaultMessage": "Créer une collection"
+  },
+  "profile.button.create-project": {
+    "defaultMessage": "Créer un projet"
+  },
+  "profile.button.edit-role": {
+    "defaultMessage": "Modifier le rôle"
+  },
+  "profile.button.info": {
+    "defaultMessage": "Voir les détails de l'utilisateur"
+  },
+  "profile.button.manage-projects": {
+    "defaultMessage": "Gérer les projets"
+  },
+  "profile.button.remove-affiliate": {
+    "defaultMessage": "Retirer l'affiliation"
+  },
+  "profile.button.set-affiliate": {
+    "defaultMessage": "Se mettre comme affilié"
+  },
+  "profile.button.unblock": {
+    "defaultMessage": "Débloquer"
+  },
+  "profile.collection.projects-count": {
+    "defaultMessage": "{count, plural,one {# projet} other {# projets}}"
+  },
+  "profile.details.label.auth-providers": {
+    "defaultMessage": "Fournisseurs d’authentification"
+  },
+  "profile.details.label.email-verified": {
+    "defaultMessage": "Adresse e-mail vérifiée"
+  },
+  "profile.details.label.has-password": {
+    "defaultMessage": "Dispose d'un mot de passe"
+  },
+  "profile.details.label.has-totp": {
+    "defaultMessage": "Dispose d'un TOTP"
+  },
+  "profile.details.label.payment-methods": {
+    "defaultMessage": "Moyens de paiements"
+  },
+  "profile.details.title": {
+    "defaultMessage": "Détails de l'utilisateur"
+  },
+  "profile.details.tooltip.email-not-verified": {
+    "defaultMessage": "Adresse e-mail non vérifiée"
+  },
+  "profile.details.tooltip.email-verified": {
+    "defaultMessage": "Adresse e-mail vérifiée"
+  },
+  "profile.error.load-description": {
+    "defaultMessage": "Impossible de charger le profil."
+  },
+  "profile.error.not-found": {
+    "defaultMessage": "Utilisateur introuvable"
+  },
+  "profile.label.affiliate": {
+    "defaultMessage": "Affilié"
+  },
   "profile.label.badges": {
     "defaultMessage": "Badges"
   },
+  "profile.label.collection": {
+    "defaultMessage": "Collection"
+  },
+  "profile.label.download-count": {
+    "defaultMessage": "{count, plural, one {téléchargement} other {téléchargements}}"
+  },
+  "profile.label.joined": {
+    "defaultMessage": "Rejoint"
+  },
+  "profile.label.no-collections": {
+    "defaultMessage": "Cet utilisateur n'a pas de collection !"
+  },
+  "profile.label.no-collections-auth-description": {
+    "defaultMessage": "Vous n'avez pas encore de collection."
+  },
+  "profile.label.no-projects": {
+    "defaultMessage": "Cet utilisateur n'a pas de projet !"
+  },
+  "profile.label.no-projects-auth-description": {
+    "defaultMessage": "Vous n'avez pas encore de projet."
+  },
+  "profile.label.organizations": {
+    "defaultMessage": "Organisations"
+  },
+  "profile.label.project-count": {
+    "defaultMessage": "{count, plural,one {projet}other {projets}}"
+  },
+  "profile.label.saving": {
+    "defaultMessage": "Enregistrement..."
+  },
+  "profile.official-account": {
+    "defaultMessage": "Compte Modrinth officiel"
+  },
+  "profile.official-account.bio": {
+    "defaultMessage": "Le compte utilisateur officiel de Modrinth. Obtenez de l’aide via <support-link></support-link> ou par e-mail à <email></email>"
+  },
+  "profile.role.select-placeholder": {
+    "defaultMessage": "Sélectionner un rôle"
+  },
+  "profile.role.update-error-description": {
+    "defaultMessage": "Une erreur s'est produite lors de la mise à jour du rôle utilisateur. Veuillez réessayer."
+  },
+  "profile.role.update-error-title": {
+    "defaultMessage": "Impossible de mettre à jour le rôle"
+  },
+  "profile.unblock-user.error-description": {
+    "defaultMessage": "Une erreur s'est produite pendant le déblocage de cet utilisateur. Veuillez réessayer."
+  },
+  "profile.unblock-user.error-title": {
+    "defaultMessage": "Impossible de débloquer l'utilisateur"
+  },
+  "profile.unblock-user.success-description": {
+    "defaultMessage": "{username} a été débloqué."
+  },
+  "profile.unblock-user.success-title": {
+    "defaultMessage": "Utilisateur débloqué"
+  },
   "project-card.date.published.tooltip": {
     "defaultMessage": "Publié {date}"
   },
@@ -2873,6 +3035,9 @@
   "project-type.all": {
     "defaultMessage": "Tout"
   },
+  "project-type.collection.plural": {
+    "defaultMessage": "Collections"
+  },
   "project-type.datapack.capital": {
     "defaultMessage": "{count, plural, one {Data Pack} other {Data Packs}}"
   },
@@ -4680,7 +4845,7 @@
     "defaultMessage": "Détails de l'erreur :"
   },
   "servers.manage.error.queue-notice": {
-    "defaultMessage": "Si vous avez acheté votre serveur Modrinth Hosting récemment, alors il fait actuellement la queue et apparaîtra ici dès qu'il est près. <warning>N'essayez pas d'acheter un nouveau serveur.</warning>"
+    "defaultMessage": "Si vous avez acheté votre serveur Modrinth Hosting récemment, alors il fait actuellement la queue et apparaîtra ici dès qu'il est prêt. <warning>N'essayez pas d'acheter un nouveau serveur.</warning>"
   },
   "servers.manage.error.support-notice": {
     "defaultMessage": "Si vous avez besoin de soutien personnalisé à propos du status de votre serveur, veuillez contacter Modrinth Support."
@@ -5099,9 +5264,117 @@
   "settings.pats.title": {
     "defaultMessage": "Jetons d'accès personnel"
   },
+  "settings.profile.bio.description": {
+    "defaultMessage": "Une courte description pour permettre à tout le monde d'en savoir un peu plus sur vous."
+  },
+  "settings.profile.bio.title": {
+    "defaultMessage": "Biographie"
+  },
+  "settings.profile.navigation-title": {
+    "defaultMessage": "Profil"
+  },
+  "settings.profile.profile-picture.title": {
+    "defaultMessage": "Photo de profil"
+  },
+  "settings.profile.save-error": {
+    "defaultMessage": "Impossible de mettre à jour le profil"
+  },
+  "settings.profile.save-error-description": {
+    "defaultMessage": "Une erreur s'est produite en essayant de mettre à jour votre profil. Veuillez réessayer."
+  },
+  "settings.profile.sign-in-required.description": {
+    "defaultMessage": "Connectez-vous avec votre compte Modrinth pour personnaliser votre profil public."
+  },
+  "settings.profile.sign-in-required.title": {
+    "defaultMessage": "Compte Modrinth requis"
+  },
+  "settings.profile.username.description": {
+    "defaultMessage": "Un nom unique, insensible à la casse, permettant d'identifier votre profil."
+  },
   "settings.sessions.title": {
     "defaultMessage": "Sessions"
   },
+  "settings.social.blocked-users.column.actions": {
+    "defaultMessage": "Actions"
+  },
+  "settings.social.blocked-users.column.user": {
+    "defaultMessage": "Utilisateur"
+  },
+  "settings.social.blocked-users.description": {
+    "defaultMessage": "Voici les utilisateurs que vous avez bloqués sur Modrinth. Ils ne peuvent pas :"
+  },
+  "settings.social.blocked-users.empty": {
+    "defaultMessage": "Vous n'avez bloqué personne."
+  },
+  "settings.social.blocked-users.load-error": {
+    "defaultMessage": "Impossible de charger les utilisateurs bloqués."
+  },
+  "settings.social.blocked-users.loading": {
+    "defaultMessage": "Chargement des utilisateurs bloqués…"
+  },
+  "settings.social.blocked-users.restriction.friend-requests": {
+    "defaultMessage": "Vous envoyer des demandes d'ami"
+  },
+  "settings.social.blocked-users.restriction.hosting": {
+    "defaultMessage": "Vous inviter à gérer un serveur Modrinth Hosting."
+  },
+  "settings.social.blocked-users.restriction.shared-instances": {
+    "defaultMessage": "Vous inviter à des instances partagées"
+  },
+  "settings.social.blocked-users.title": {
+    "defaultMessage": "Utilisateurs bloqués"
+  },
+  "settings.social.blocked-users.unblock": {
+    "defaultMessage": "Débloquer"
+  },
+  "settings.social.blocked-users.unblock-error": {
+    "defaultMessage": "Impossible de débloquer l'utilisateur"
+  },
+  "settings.social.blocked-users.unblock-error-description": {
+    "defaultMessage": "Une erreur s'est produite en essayant de débloquer cet utilisateur. Veuillez réessayer."
+  },
+  "settings.social.blocked-users.unblock-user": {
+    "defaultMessage": "Débloquer {username}"
+  },
+  "settings.social.blocked-users.user-avatar": {
+    "defaultMessage": "avatar de {username}"
+  },
+  "settings.social.friend-requests.description": {
+    "defaultMessage": "Contrôlez qui peut vous envoyer des demandes d'ami sur Modrinth."
+  },
+  "settings.social.friend-requests.title": {
+    "defaultMessage": "Demandes d'ami"
+  },
+  "settings.social.interaction-source.coming-soon": {
+    "defaultMessage": "À venir !"
+  },
+  "settings.social.interaction-source.everyone": {
+    "defaultMessage": "Tout le monde"
+  },
+  "settings.social.interaction-source.friends": {
+    "defaultMessage": "Amis"
+  },
+  "settings.social.interaction-source.friends-of-friends": {
+    "defaultMessage": "Amis d'amis"
+  },
+  "settings.social.interaction-source.no-one": {
+    "defaultMessage": "Personne"
+  },
+  "settings.social.shared-instance-invites.description": {
+    "defaultMessage": "Contrôlez qui peut vous inviter à des instances partagées et à des panneaux Modrinth Hosting."
+  },
+  "settings.social.shared-instance-invites.title": {
+    "defaultMessage": "Invitations"
+  },
+  "settings.social.sign-in-required.description": {
+    "defaultMessage": "Vous pouvez contrôler qui peut interagir avec vous, et gérer les utilisateurs bloqués avec un compte Modrinth"
+  },
+  "settings.social.sign-in-required.title": {
+    "defaultMessage": "Compte Modrinth requis"
+  },
+  "settings.social.title": {
+    "defaultMessage": "Social"
+  },
   "sharing.invite-players-modal.add": {
     "defaultMessage": "Ajouter"
   },
@@ -5111,6 +5384,9 @@
   "sharing.invite-players-modal.already-invited": {
     "defaultMessage": "Cet utilisateur a déjà été invité."
   },
+  "sharing.invite-players-modal.apply-button": {
+    "defaultMessage": "Appliquer"
+  },
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "Avatar de {username}"
   },
@@ -5120,12 +5396,36 @@
   "sharing.invite-players-modal.cancel-button": {
     "defaultMessage": "Annuler"
   },
+  "sharing.invite-players-modal.custom-expiry": {
+    "defaultMessage": "Personnaliser..."
+  },
+  "sharing.invite-players-modal.custom-expiry-value": {
+    "defaultMessage": "Personnalisé : {date}"
+  },
   "sharing.invite-players-modal.edit-invite-link": {
     "defaultMessage": "Modifier le lien d'invitation."
   },
   "sharing.invite-players-modal.edit-invite-link-title": {
     "defaultMessage": "Modifier le lien d'invitation"
   },
+  "sharing.invite-players-modal.expiry-in-one-day": {
+    "defaultMessage": "Dans 1 jour"
+  },
+  "sharing.invite-players-modal.expiry-in-one-hour": {
+    "defaultMessage": "Dans 1 heure"
+  },
+  "sharing.invite-players-modal.expiry-in-seven-days": {
+    "defaultMessage": "Dans 7 jours"
+  },
+  "sharing.invite-players-modal.expiry-in-six-hours": {
+    "defaultMessage": "Dans 6 heures"
+  },
+  "sharing.invite-players-modal.expiry-in-three-days": {
+    "defaultMessage": "Dans 3 jours"
+  },
+  "sharing.invite-players-modal.expiry-in-twelve-hours": {
+    "defaultMessage": "Dans 12 jours"
+  },
   "sharing.invite-players-modal.expiry-label": {
     "defaultMessage": "Date d'expiration"
   },
diff --git a/packages/ui/src/locales/fr-FR/meta.json b/packages/ui/src/locales/fr-FR/meta.json
index 0d64aef5ba..29f12c6283 100644
--- a/packages/ui/src/locales/fr-FR/meta.json
+++ b/packages/ui/src/locales/fr-FR/meta.json
@@ -1,7 +1,7 @@
 {
 	"displayName": {
 		"description": "Please enter the name of the language in its specific variant or regional form (e.g., English (US) for American English, not just English). If the language does not have any specific variant, simply enter the name of the language (e.g., Français, Deutsch).",
-		"message": "Français (France)"
+		"message": "Français"
 	},
 	"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.",
diff --git a/packages/ui/src/locales/hu-HU/index.json b/packages/ui/src/locales/hu-HU/index.json
index faa51d7f32..3779af7ee2 100644
--- a/packages/ui/src/locales/hu-HU/index.json
+++ b/packages/ui/src/locales/hu-HU/index.json
@@ -54,7 +54,7 @@
     "defaultMessage": "Mégse"
   },
   "billing.resubscribe-modal.cpus": {
-    "defaultMessage": "{sharedCpus} Megosztott CPU-k"
+    "defaultMessage": "{sharedCpus} megosztott CPU"
   },
   "billing.resubscribe-modal.description": {
     "defaultMessage": "Ön újra elő fog fizetni <server-name>{serverName}</server-name> szerverre. Az előfizetése újra fog aktiválódni és a szervere kimaradás nélkül tovább fog működni."
@@ -123,7 +123,7 @@
     "defaultMessage": "Elfogadás"
   },
   "button.add-server-to-instance": {
-    "defaultMessage": "Szerver hozzáadása a játékpéldányhoz"
+    "defaultMessage": "Szerver hozzáadása a játékprofilhoz"
   },
   "button.affiliate-links": {
     "defaultMessage": "Társulati linkek"
@@ -212,6 +212,9 @@
   "button.open-folder": {
     "defaultMessage": "Mappa megnyitása"
   },
+  "button.open-in-browser": {
+    "defaultMessage": "Megnyitás a böngészőben"
+  },
   "button.open-in-folder": {
     "defaultMessage": "Megnyitás mappában"
   },
@@ -305,6 +308,9 @@
   "changelog.product.web": {
     "defaultMessage": "Platform"
   },
+  "collection-widget.loading-projects": {
+    "defaultMessage": "Projektek betöltése..."
+  },
   "collection-widget.project-count": {
     "defaultMessage": "{count} projekt"
   },
@@ -378,7 +384,7 @@
     "defaultMessage": "Néhány kijelölt projekt függőségként van telepítve. Ha törlöd őket, a {context} hibásan működhet, vagy a tőlük függő tartalmak nem fognak megfelelően betöltődni."
   },
   "content.dependency-warning.context.instance": {
-    "defaultMessage": "játékpéldány"
+    "defaultMessage": "játékprofil"
   },
   "content.dependency-warning.context.server": {
     "defaultMessage": "szerver"
@@ -440,6 +446,9 @@
   "content.diff-modal.unknown-files-warning": {
     "defaultMessage": "Ismeretlen fájlok"
   },
+  "content.diff-modal.unknown-project": {
+    "defaultMessage": "Ismeretlen"
+  },
   "content.diff-modal.updated-count": {
     "defaultMessage": "{count} frissítve"
   },
@@ -474,7 +483,7 @@
     "defaultMessage": "Biztonsági mentés létrehozása"
   },
   "content.inline-backup.instance-label": {
-    "defaultMessage": "játékpéldány"
+    "defaultMessage": "játékprofil"
   },
   "content.inline-backup.shift-click-hint": {
     "defaultMessage": "A megerősítés kihagyásához tartsd lenyomva a Shift billentyűt a kattintás közben."
@@ -485,6 +494,9 @@
   "content.inline-backup.world-label": {
     "defaultMessage": "világ"
   },
+  "content.modpack-card.installation-settings": {
+    "defaultMessage": "Telepítési beállítások"
+  },
   "content.page-layout.additional-content": {
     "defaultMessage": "További tartalom"
   },
@@ -588,7 +600,7 @@
     "defaultMessage": "{count, number} kiválasztva"
   },
   "creation-flow.button.create-instance": {
-    "defaultMessage": "Játékpéldány létrehozása"
+    "defaultMessage": "Játékprofil létrehozása"
   },
   "creation-flow.button.create-world": {
     "defaultMessage": "Világ létrehozása"
@@ -600,7 +612,7 @@
     "defaultMessage": "Importálás"
   },
   "creation-flow.button.import-instances": {
-    "defaultMessage": "{count} játékpéldány importálása"
+    "defaultMessage": "{count} játékprofil importálása"
   },
   "creation-flow.button.setup-server": {
     "defaultMessage": "Szerver beállítása"
@@ -654,7 +666,7 @@
     "defaultMessage": "Név"
   },
   "creation-flow.modal.custom-setup.name.placeholder": {
-    "defaultMessage": "Add meg a játékpéldány nevét"
+    "defaultMessage": "Add meg a játékprofil nevét"
   },
   "creation-flow.modal.custom-setup.options.no-versions-available": {
     "defaultMessage": "Nincsenek elérhető verziók"
@@ -698,6 +710,9 @@
   "creation-flow.modal.final-config.generate-structures.label": {
     "defaultMessage": "Struktúrák generálása"
   },
+  "creation-flow.modal.final-config.generator-settings-json.placeholder": {
+    "defaultMessage": "Add meg a generátor beállításait JSON formátumban"
+  },
   "creation-flow.modal.final-config.generator-settings.custom": {
     "defaultMessage": "Egyéni"
   },
@@ -758,20 +773,26 @@
   "creation-flow.modal.import-instance.custom-launcher.name": {
     "defaultMessage": "Egyéni ({pathName})"
   },
+  "creation-flow.modal.import-instance.detecting-launcher-instances": {
+    "defaultMessage": "Indító-játékprofilok észlelése..."
+  },
   "creation-flow.modal.import-instance.launcher-instances.title": {
-    "defaultMessage": "Más indítók játékpéldányai"
+    "defaultMessage": "Más indítók játékprofiljai"
+  },
+  "creation-flow.modal.import-instance.launcher-path.add": {
+    "defaultMessage": "Add meg az elérési utat az indítóhoz"
   },
   "creation-flow.modal.import-instance.launcher-path.placeholder": {
     "defaultMessage": "Elérési útvonal az indítóhoz..."
   },
   "creation-flow.modal.import-instance.notification.no-instances-found.text": {
-    "defaultMessage": "Nem találtunk importálható játékpéldányokat a megadott útvonalon."
+    "defaultMessage": "Nem találtunk importálható játékprofilokat a megadott útvonalon."
   },
   "creation-flow.modal.import-instance.notification.no-instances-found.title": {
-    "defaultMessage": "Nem található játékpéldány"
+    "defaultMessage": "Nem található játékprofil"
   },
   "creation-flow.modal.import-instance.search.placeholder": {
-    "defaultMessage": "Játékpéldánynév keresése..."
+    "defaultMessage": "Játékprofilnév keresése..."
   },
   "creation-flow.modal.import-instance.selection.clear-all": {
     "defaultMessage": "Összes törlése"
@@ -792,7 +813,7 @@
     "defaultMessage": "Modcsomag keresése"
   },
   "creation-flow.modal.setup-type.instance.description": {
-    "defaultMessage": "A játékpéldány egy külön Minecraft-környezet egy adott modbetöltővel, verzióval és modokkal."
+    "defaultMessage": "A játékprofil egy külön Minecraft-környezet egy adott modbetöltővel, verzióval és modokkal."
   },
   "creation-flow.modal.setup-type.option.custom-setup.description": {
     "defaultMessage": "Kezdés alapoktól: válassz betöltőt és játékverziót."
@@ -801,10 +822,10 @@
     "defaultMessage": "Egyedi beállítás"
   },
   "creation-flow.modal.setup-type.option.import-instance.description": {
-    "defaultMessage": "Importálj egy játékpéldányt a Prismből, CurseForge-ból, vagy hasonló forrásból."
+    "defaultMessage": "Importálj egy játékprofilt a Prismből, CurseForge-ból, vagy hasonló forrásból."
   },
   "creation-flow.modal.setup-type.option.import-instance.title": {
-    "defaultMessage": "Játékpéldány importálása"
+    "defaultMessage": "Játékprofil importálása"
   },
   "creation-flow.modal.setup-type.option.modpack-base.description": {
     "defaultMessage": "Böngéssz modcsomagokat a Modrinthon, vagy tölts be egyet fájlból."
@@ -822,7 +843,7 @@
     "defaultMessage": "Telepítés típusa"
   },
   "creation-flow.modal.setup-type.title.instance": {
-    "defaultMessage": "Játékpéldány típusa"
+    "defaultMessage": "Játékprofil típusa"
   },
   "creation-flow.modal.setup-type.title.world": {
     "defaultMessage": "Világ típusa"
@@ -831,13 +852,13 @@
     "defaultMessage": "Modcsomag kiválasztása"
   },
   "creation-flow.title.create-instance": {
-    "defaultMessage": "Játékpéldány létrehozása"
+    "defaultMessage": "Játékprofil létrehozása"
   },
   "creation-flow.title.create-world": {
     "defaultMessage": "Világ létrehozása"
   },
   "creation-flow.title.import-instance": {
-    "defaultMessage": "Játékpéldány importálása"
+    "defaultMessage": "Játékprofil importálása"
   },
   "creation-flow.title.reset-server": {
     "defaultMessage": "Szerver visszaállítása"
@@ -875,6 +896,9 @@
   "external-files.permissions-card.custom-license-option": {
     "defaultMessage": "Egyéb"
   },
+  "external-files.permissions-card.editor.add": {
+    "defaultMessage": "Hozzárendelés hozzáadása"
+  },
   "external-files.permissions-card.editor.custom-license-label": {
     "defaultMessage": "Hivatkozás a lincenszhez"
   },
@@ -905,9 +929,15 @@
   "external-files.permissions-card.editor.notes-placeholder": {
     "defaultMessage": "Írj valamit ide..."
   },
+  "external-files.permissions-card.editor.save": {
+    "defaultMessage": "Hossárendelés mentése"
+  },
   "external-files.permissions-card.editor.select-license-label": {
     "defaultMessage": "Válassz egy licenszt..."
   },
+  "external-files.permissions-card.fallback-group-title": {
+    "defaultMessage": "A(z) {id} hozzárendelési csoport"
+  },
   "external-files.permissions-card.file-count": {
     "defaultMessage": "{count} fájl"
   },
@@ -932,6 +962,9 @@
   "external-files.permissions-card.reason.my-project": {
     "defaultMessage": "Az én projektem"
   },
+  "external-files.permissions-card.remove-group-confirmation.title": {
+    "defaultMessage": "{title} törlése?"
+  },
   "external-files.permissions-card.updated-by-moderator": {
     "defaultMessage": "Moderátor"
   },
@@ -1467,7 +1500,7 @@
     "defaultMessage": "{storage} GB Tárhely"
   },
   "hosting.specs.shared-cpus": {
-    "defaultMessage": "{cpus} Megosztott CPU-k"
+    "defaultMessage": "{cpus} megosztott CPU"
   },
   "icon-select.edit": {
     "defaultMessage": "Ikon szerkesztése"
@@ -1569,13 +1602,13 @@
     "defaultMessage": "Modcsomag újratelepítése..."
   },
   "installation-settings.removed-incompatible": {
-    "defaultMessage": "Eltávolítva (inkompatibilis)"
+    "defaultMessage": "Eltávolítva: (inkompatibilis)"
   },
   "installation-settings.repair.instance-description": {
     "defaultMessage": "Újratelepíti a Minecraft függőségeit, és ellenőrzi, hogy nincsenek-e sérült fájlok. Ez megoldhatja azokat a problémákat, ha a játék az indítóval kapcsolatos hibák miatt nem indul el."
   },
   "installation-settings.repair.instance-title": {
-    "defaultMessage": "Játékpéldány javítása"
+    "defaultMessage": "Játékprofil javítása"
   },
   "installation-settings.repair.server-description": {
     "defaultMessage": "Újratelepíti a betöltőt és a Minecraft függőségeit anélkül, hogy törölné a tartalmaidat. Ez megoldhatja a problémákat, ha a szervered nem indul el megfelelően."
@@ -1590,10 +1623,10 @@
     "defaultMessage": "Játékverzió keresése..."
   },
   "installation-settings.type.instance": {
-    "defaultMessage": "játékpéldány"
+    "defaultMessage": "játékprofil"
   },
   "installation-settings.type.instance-possessive": {
-    "defaultMessage": "játékpéldány"
+    "defaultMessage": "játékprofil"
   },
   "installation-settings.type.server": {
     "defaultMessage": "szerver"
@@ -1632,7 +1665,7 @@
     "defaultMessage": "{type} javítása"
   },
   "instance.confirm-repair.instance-label": {
-    "defaultMessage": "Játékpéldány"
+    "defaultMessage": "Játékprofil"
   },
   "instance.confirm-repair.repair-button": {
     "defaultMessage": "Javítás"
@@ -1656,10 +1689,10 @@
     "defaultMessage": "Ismeretlen játékmód"
   },
   "instances.content-install.compatible-count": {
-    "defaultMessage": "{count} kompatiblis játékpéldány"
+    "defaultMessage": "{count} kompatiblis játékprofil"
   },
   "instances.content-install.existing-tab": {
-    "defaultMessage": "Meglévő játékpéldány"
+    "defaultMessage": "Meglévő játékprofil"
   },
   "instances.content-install.game-version-placeholder": {
     "defaultMessage": "Játékverzió kiválasztása"
@@ -1668,7 +1701,7 @@
     "defaultMessage": "Projekt letöltése"
   },
   "instances.content-install.incompatible-tooltip": {
-    "defaultMessage": "Ez a játékpéldány olyan betöltőt vagy játékverziót használ, amelyet ez a projekt nem támogat."
+    "defaultMessage": "Ez a játékprofil olyan betöltőt vagy játékverziót használ, amelyet ez a projekt nem támogat."
   },
   "instances.content-install.install-button": {
     "defaultMessage": "Letöltés"
@@ -1689,7 +1722,7 @@
     "defaultMessage": "Add meg a profil nevét"
   },
   "instances.content-install.new-tab": {
-    "defaultMessage": "Új profil"
+    "defaultMessage": "Új játékprofil"
   },
   "instances.content-install.no-instances": {
     "defaultMessage": "Nem található kompatibilis profil"
@@ -1709,6 +1742,12 @@
   "instances.modpack-content-modal.empty-title": {
     "defaultMessage": "Nincsen tartalom"
   },
+  "instances.modpack-content-modal.external-content": {
+    "defaultMessage": "Külső"
+  },
+  "instances.modpack-content-modal.external-content-description": {
+    "defaultMessage": "Ez a fájl nem szerepel a Modrinthon."
+  },
   "instances.modpack-content-modal.header": {
     "defaultMessage": "Modcsomag tartalma"
   },
@@ -1718,6 +1757,9 @@
   "instances.modpack-content-modal.no-results": {
     "defaultMessage": "Nincsen olyan projekt ami keresnél."
   },
+  "instances.modpack-content-modal.open-in-slicer": {
+    "defaultMessage": "Megnyitás a Slicer-ben"
+  },
   "instances.modpack-content-modal.search-placeholder": {
     "defaultMessage": "Keresés {count, number} projekt között"
   },
@@ -1788,7 +1830,7 @@
     "defaultMessage": "Frissítés a(z) {version} verzióra"
   },
   "instances.updater-modal.warning-app": {
-    "defaultMessage": "A frissítés meghibásodást okozhat a játékpéldányban. Először nézd át a változásnaplót, és készíts biztonsági mentést."
+    "defaultMessage": "A frissítés meghibásodást okozhat a játékprofilban. Először nézd át a változásnaplót, és készíts biztonsági mentést."
   },
   "instances.updater-modal.warning-web": {
     "defaultMessage": "A frissítés meghibásodást okozhat a világban. Először nézd át a változásnaplót, és készíts biztonsági mentést."
@@ -1853,6 +1895,9 @@
   "label.details": {
     "defaultMessage": "Részletek"
   },
+  "label.discover-content": {
+    "defaultMessage": "Tartalom felfedezése"
+  },
   "label.done": {
     "defaultMessage": "Kész"
   },
@@ -2298,7 +2343,7 @@
     "defaultMessage": "Szerezd meg a Modrinth Appot"
   },
   "modal.open-in-app.opening-automatically": {
-    "defaultMessage": "A Modrinth alkalmazás automatikusan megnyílik..."
+    "defaultMessage": "A Modrinth App automatikusan megnyílik..."
   },
   "modal.open-in-app.title": {
     "defaultMessage": "A Modrinth App megnyitása"
@@ -2453,9 +2498,150 @@
   "payment-method.visa": {
     "defaultMessage": "Visa"
   },
+  "profile.bio.fallback.creator": {
+    "defaultMessage": "Egy Modrinth fejlesztő."
+  },
+  "profile.bio.fallback.user": {
+    "defaultMessage": "Egy Modrinth felhasználó."
+  },
+  "profile.block-user.admonition-body": {
+    "defaultMessage": "{username} nem fog tudni neked barátkérelmet küldeni, meghívni téged megosztott játékprofilokba, illetve meghívni téged a Modrinth Hosting szervereire."
+  },
+  "profile.block-user.admonition-title": {
+    "defaultMessage": "Biztosan le szeretnéd tiltani ezt a felhasználót?"
+  },
+  "profile.block-user.error-description": {
+    "defaultMessage": "Hiba történt a felhasználó letiltása közben. Kérlek próbáld meg újra."
+  },
+  "profile.block-user.error-title": {
+    "defaultMessage": "A felhasználó letiltása nem sikerült"
+  },
+  "profile.block-user.success-description": {
+    "defaultMessage": "{username} le lett tiltva"
+  },
+  "profile.block-user.success-title": {
+    "defaultMessage": "Felhasználó letiltva"
+  },
+  "profile.block-user.title": {
+    "defaultMessage": "{username} letiltása"
+  },
+  "profile.button.analytics": {
+    "defaultMessage": "Felhasználói statisztikák megtekintése"
+  },
+  "profile.button.block": {
+    "defaultMessage": "Letiltás"
+  },
+  "profile.button.create-collection": {
+    "defaultMessage": "Gyűjtemény létrehozása"
+  },
+  "profile.button.create-project": {
+    "defaultMessage": "Projekt létrehozása"
+  },
+  "profile.button.edit-role": {
+    "defaultMessage": "Szerep szerkesztése"
+  },
+  "profile.button.info": {
+    "defaultMessage": "Felhasználói adatok megtekintése"
+  },
+  "profile.button.manage-projects": {
+    "defaultMessage": "Projektek kezelése"
+  },
+  "profile.button.unblock": {
+    "defaultMessage": "Letiltás feloldása"
+  },
+  "profile.collection.projects-count": {
+    "defaultMessage": "{count} projekt"
+  },
+  "profile.details.label.auth-providers": {
+    "defaultMessage": "Hitelesítési szolgáltatók"
+  },
+  "profile.details.label.email-verified": {
+    "defaultMessage": "E-mail cím hitelesítve"
+  },
+  "profile.details.label.has-password": {
+    "defaultMessage": "Van jelszava"
+  },
+  "profile.details.label.has-totp": {
+    "defaultMessage": "Kétlépcsős hitelesítést használ"
+  },
+  "profile.details.label.payment-methods": {
+    "defaultMessage": "Fizetési módok"
+  },
+  "profile.details.title": {
+    "defaultMessage": "Felhasználó adatai"
+  },
+  "profile.details.tooltip.email-not-verified": {
+    "defaultMessage": "Nem hitelesített e-mail cím"
+  },
+  "profile.details.tooltip.email-verified": {
+    "defaultMessage": "Hitelesített e-mail cím"
+  },
+  "profile.error.load-description": {
+    "defaultMessage": "A felhasználói profil betöltése nem sikerült."
+  },
+  "profile.error.not-found": {
+    "defaultMessage": "Felhasználó nem található"
+  },
   "profile.label.badges": {
     "defaultMessage": "Jelvények"
   },
+  "profile.label.collection": {
+    "defaultMessage": "Gyűjtemény"
+  },
+  "profile.label.download-count": {
+    "defaultMessage": "letöltés"
+  },
+  "profile.label.joined": {
+    "defaultMessage": "Csatlakozott"
+  },
+  "profile.label.no-collections": {
+    "defaultMessage": "Ennek a felhasználónak nincsenek gyűjteményei!"
+  },
+  "profile.label.no-collections-auth-description": {
+    "defaultMessage": "Még nincs gyűjteményed."
+  },
+  "profile.label.no-projects": {
+    "defaultMessage": "Ennek a felhasználónak nincsenek projektjei!"
+  },
+  "profile.label.no-projects-auth-description": {
+    "defaultMessage": "Még nincsenek projektjeid."
+  },
+  "profile.label.organizations": {
+    "defaultMessage": "Szervezetek"
+  },
+  "profile.label.project-count": {
+    "defaultMessage": "projekt"
+  },
+  "profile.label.saving": {
+    "defaultMessage": "Mentés..."
+  },
+  "profile.official-account": {
+    "defaultMessage": "Hivatalos Modrinth-fiók"
+  },
+  "profile.official-account.bio": {
+    "defaultMessage": "A Modrinth hivatalos felhasználói fiókja. Támogatás a <support-link></support-link> oldalon kaphatsz vagy e-mailben a <email></email> címen."
+  },
+  "profile.role.select-placeholder": {
+    "defaultMessage": "Válassz egy rangot"
+  },
+  "profile.role.update-error-description": {
+    "defaultMessage": "Hiba történt a felhasználói szerepkör frissítése közben. Kérlek próbáld meg újra."
+  },
+  "profile.role.update-error-title": {
+    "defaultMessage": "A szerepkör frissítése nem sikerült"
+  },
+  "profile.unblock-user.error-description": {
+    "defaultMessage": "Hiba történt a felhasználó letiltásának feloldása közben. Kérlek próbáld meg újra."
+  },
+  "profile.unblock-user.error-title": {
+    "defaultMessage": "A felhasználó letiltásának feloldása nem sikerült"
+  },
+  "profile.unblock-user.success-description": {
+    "defaultMessage": "{username} letiltása fel lett oldva"
+  },
+  "profile.unblock-user.success-title": {
+    "defaultMessage": "Felhasználó letiltása feloldva"
+  },
   "project-card.date.published.tooltip": {
     "defaultMessage": "Közzététel: {date}"
   },
@@ -2477,8 +2663,11 @@
   "project-type.all": {
     "defaultMessage": "Összes"
   },
+  "project-type.collection.plural": {
+    "defaultMessage": "Gyűjtemények"
+  },
   "project-type.datapack.capital": {
-    "defaultMessage": "{count, plural, one {Adatcsomag} other {Adatcsomagok}}"
+    "defaultMessage": "adatcsomag"
   },
   "project-type.datapack.category": {
     "defaultMessage": "Adatcsomagok"
@@ -2487,7 +2676,7 @@
     "defaultMessage": "adatcsomag"
   },
   "project-type.mod.capital": {
-    "defaultMessage": "{count, plural,one {Mod} other {Modok}}"
+    "defaultMessage": "mod"
   },
   "project-type.mod.category": {
     "defaultMessage": "Modok"
@@ -2505,7 +2694,7 @@
     "defaultMessage": "modcsomag"
   },
   "project-type.plugin.capital": {
-    "defaultMessage": "{count, plural,one {Bővítmény} other {Bővítmények}}"
+    "defaultMessage": "bővítmény"
   },
   "project-type.plugin.category": {
     "defaultMessage": "Bővítmények"
@@ -2523,7 +2712,7 @@
     "defaultMessage": "projekt"
   },
   "project-type.resourcepack.capital": {
-    "defaultMessage": "{count, plural,one {Forráscsomag} other {Forráscsomagok}}"
+    "defaultMessage": "forráscsomag"
   },
   "project-type.resourcepack.category": {
     "defaultMessage": "Forráscsomagok"
@@ -2541,7 +2730,7 @@
     "defaultMessage": "szerver"
   },
   "project-type.shader.capital": {
-    "defaultMessage": "{count, plural,one {Shader} other {Shaderek}}"
+    "defaultMessage": "shader"
   },
   "project-type.shader.category": {
     "defaultMessage": "Shaderek"
@@ -2735,6 +2924,9 @@
   "project.follower-count-tooltip": {
     "defaultMessage": "{count, number} követő"
   },
+  "project.license.title": {
+    "defaultMessage": "Licensz"
+  },
   "project.online-player-count": {
     "defaultMessage": "{count, number} online"
   },
@@ -3053,6 +3245,9 @@
   "project.settings.environment.notice.review-options.description": {
     "defaultMessage": "Nemrégiben átalakítottuk a Modrinth környezetrendszerét, és mostantól új beállítási lehetőségek állnak rendelkezésre. Kérjük, győződj meg arról, hogy az alábbiak közül a megfelelő opciót választottad ki, majd ha kész vagy, kattints az „Ellenőrzés” gombra!"
   },
+  "project.settings.environment.notice.review-options.title": {
+    "defaultMessage": "Kérjük, tekintsd át az alábbi lehetőségeket"
+  },
   "project.settings.environment.notice.wrong-project-type.description": {
     "defaultMessage": "Csak a mod- vagy modcsomag-projektek rendelkezhetnek környezeti metaadatokkal."
   },
@@ -3132,7 +3327,7 @@
     "defaultMessage": "letöltés"
   },
   "project.stats.followers-label": {
-    "defaultMessage": "{count} követő"
+    "defaultMessage": "követő"
   },
   "project.versions.channel.alpha.symbol": {
     "defaultMessage": "A"
@@ -3143,6 +3338,9 @@
   "project.versions.channel.release.symbol": {
     "defaultMessage": "K"
   },
+  "project.versions.platform.modloader.short": {
+    "defaultMessage": "ModLoader"
+  },
   "project.visibility.archived": {
     "defaultMessage": "Archiválva"
   },
@@ -3354,7 +3552,7 @@
     "defaultMessage": "Újraindított szerver"
   },
   "servers.access-page.activity-log-filter.instances": {
-    "defaultMessage": "Játékpéldányok"
+    "defaultMessage": "Játékprofilok"
   },
   "servers.access-page.activity-log-filter.server-scoped-instance": {
     "defaultMessage": "Szerver"
@@ -3420,7 +3618,7 @@
     "defaultMessage": "Szerkesztő"
   },
   "servers.access-page.role.editor-description": {
-    "defaultMessage": "A játékpéldány tartalmának, fájljainak, biztonsági mentéseinek és egyéb beállításainak kezelése."
+    "defaultMessage": "A játékprofil tartalmának, fájljainak, biztonsági mentéseinek és egyéb beállításainak kezelése."
   },
   "servers.access-page.role.owner": {
     "defaultMessage": "Tulajdonos"
@@ -3498,7 +3696,7 @@
     "defaultMessage": "Felhasználó"
   },
   "servers.audit-log.column.world": {
-    "defaultMessage": "Játékpéldány"
+    "defaultMessage": "Játékprofil"
   },
   "servers.audit-log.column.world.tooltip-title": {
     "defaultMessage": "Hamarosan érkezik!"
@@ -3519,7 +3717,7 @@
     "defaultMessage": "Leválasztott modcsomag-verzió <version></version>"
   },
   "servers.audit-log.event.server-plan.ram-mb": {
-    "defaultMessage": "{amount, number} MB RAM"
+    "defaultMessage": "{amount, number} MB memória"
   },
   "servers.audit-log.event.server-plan.storage-gb": {
     "defaultMessage": "{amount, number} GB tárhely"
@@ -3723,7 +3921,7 @@
     "defaultMessage": "Szerkesztő"
   },
   "servers.grant-access-modal.role.editor-description": {
-    "defaultMessage": "A játékpéldány tartalmának, fájljainak, biztonsági mentéseinek és egyéb beállításainak kezelése."
+    "defaultMessage": "A játékprofil tartalmának, fájljainak, biztonsági mentéseinek és egyéb beállításainak kezelése."
   },
   "servers.grant-access-modal.role.label": {
     "defaultMessage": "Rang kiválasztása"
@@ -3806,6 +4004,9 @@
   "servers.list-empty.no-servers-title": {
     "defaultMessage": "Még nincsenek szerverek"
   },
+  "servers.list-empty.one-click-mod-installs-description": {
+    "defaultMessage": "Válaszd ki a kedvenc modjaidat, a többit bízd ránk!"
+  },
   "servers.list-empty.one-click-mod-installs-title": {
     "defaultMessage": "Modok telepítése egy kattintással"
   },
@@ -3899,6 +4100,9 @@
   "servers.manage.no-servers-found": {
     "defaultMessage": "Nem található szerver."
   },
+  "servers.manage.no-shared-servers-found": {
+    "defaultMessage": "Egy megosztott szerver sem egyezik a kereséssel."
+  },
   "servers.manage.reload-button": {
     "defaultMessage": "Újra"
   },
@@ -3920,6 +4124,9 @@
   "servers.manage.settings-hint.title": {
     "defaultMessage": "A szerver beállításait áthelyeztük"
   },
+  "servers.manage.shared-servers-title": {
+    "defaultMessage": "Megosztott szerverek"
+  },
   "servers.medal-listing.countdown.remaining": {
     "defaultMessage": "<days-count>{days}</days-count> nap <hours-count>{hours}</hours-count> óra <minutes-count>{minutes}</minutes-count> perc és <seconds-count>{seconds}</seconds-count> másodperc van hátra..."
   },
@@ -4017,7 +4224,7 @@
     "defaultMessage": "Legnépszerűbb"
   },
   "servers.purchase.step.plan.select": {
-    "defaultMessage": "Válasz előfizetést"
+    "defaultMessage": "Csomag kiválasztása"
   },
   "servers.purchase.step.plan.small": {
     "defaultMessage": "Kicsi"
@@ -4026,7 +4233,7 @@
     "defaultMessage": "Tökéletes 1–5 barát számára, néhány kisebb moddal."
   },
   "servers.purchase.step.plan.title": {
-    "defaultMessage": "Előfizetés"
+    "defaultMessage": "Csomag"
   },
   "servers.purchase.step.plan.your-current-plan": {
     "defaultMessage": "Jelenlegi csomag"
@@ -4046,6 +4253,15 @@
   "servers.region.custom.prompt-ram-only": {
     "defaultMessage": "memória"
   },
+  "servers.region.north-america-central": {
+    "defaultMessage": "Észak-Amerika középső része"
+  },
+  "servers.region.north-america-east": {
+    "defaultMessage": "Észak-Amerika keleti része"
+  },
+  "servers.region.north-america-west": {
+    "defaultMessage": "Észak-Amerika nyugati része"
+  },
   "servers.region.prompt": {
     "defaultMessage": "Hol szeretnéd elhelyezni a szerveredet?"
   },
@@ -4166,6 +4382,9 @@
   "settings.display.theme.title": {
     "defaultMessage": "Téma"
   },
+  "settings.feature-flags.title": {
+    "defaultMessage": "Funkciójelzők"
+  },
   "settings.language.categories.default": {
     "defaultMessage": "Alapértelmezett nyelvek"
   },
@@ -4199,9 +4418,120 @@
   "settings.pats.title": {
     "defaultMessage": "Személyes hozzáférési tokenek"
   },
+  "settings.profile.bio.description": {
+    "defaultMessage": "Egy rövid leírás, hogy mindenki megismerjen téged."
+  },
+  "settings.profile.bio.title": {
+    "defaultMessage": "Bemutatkozás"
+  },
+  "settings.profile.navigation-title": {
+    "defaultMessage": "Profil"
+  },
+  "settings.profile.profile-picture.title": {
+    "defaultMessage": "Profilkép"
+  },
+  "settings.profile.public-information.description": {
+    "defaultMessage": "A profiladataid nyilvánosan <profile-link>megtekinthetők a Modrinthon</profile-link> és a <docs-link>Modrinth API</docs-link>-n keresztül."
+  },
+  "settings.profile.save-error": {
+    "defaultMessage": "A profil frissítése nem sikerült"
+  },
+  "settings.profile.save-error-description": {
+    "defaultMessage": "Hiba történt a profilod frissítése közben. Kérlek, próbáld meg újra."
+  },
+  "settings.profile.sign-in-required.description": {
+    "defaultMessage": "Jelentkezz be egy Modrinth-fiókkal, hogy személyre szabhasd a nyilvános profilodat."
+  },
+  "settings.profile.sign-in-required.title": {
+    "defaultMessage": "Modrinth-fiók szükséges"
+  },
+  "settings.profile.username.description": {
+    "defaultMessage": "Egyedi, kis- és nagybetűktől független név a profilod azonosításához."
+  },
   "settings.sessions.title": {
     "defaultMessage": "Munkamenetek"
   },
+  "settings.social.blocked-users.column.actions": {
+    "defaultMessage": "Műveletek"
+  },
+  "settings.social.blocked-users.column.user": {
+    "defaultMessage": "Felhasználó"
+  },
+  "settings.social.blocked-users.description": {
+    "defaultMessage": "Ezek azok a felhasználók, akiket a Modrinthon letiltottál. Ők nem tudnak:"
+  },
+  "settings.social.blocked-users.empty": {
+    "defaultMessage": "Nem tiltottál le senkit."
+  },
+  "settings.social.blocked-users.load-error": {
+    "defaultMessage": "A letiltott felhasználók betöltése nem sikerült."
+  },
+  "settings.social.blocked-users.loading": {
+    "defaultMessage": "A letiltott felhasználók betöltése…"
+  },
+  "settings.social.blocked-users.restriction.friend-requests": {
+    "defaultMessage": "Barátkérelmeket küldeni neked"
+  },
+  "settings.social.blocked-users.restriction.hosting": {
+    "defaultMessage": "Meghívni téged, hogy kezelj egy Modrinth Hosting szervert."
+  },
+  "settings.social.blocked-users.restriction.shared-instances": {
+    "defaultMessage": "Meghívni téged megosztott játékprofilokba"
+  },
+  "settings.social.blocked-users.title": {
+    "defaultMessage": "Letiltott felhasználók"
+  },
+  "settings.social.blocked-users.unblock": {
+    "defaultMessage": "Letiltás feloldása"
+  },
+  "settings.social.blocked-users.unblock-error": {
+    "defaultMessage": "A felhasználó letiltásának feloldása nem sikerült"
+  },
+  "settings.social.blocked-users.unblock-error-description": {
+    "defaultMessage": "Hiba történt a felhasználó letiltásának feloldása közben. Kérlek próbáld meg újra."
+  },
+  "settings.social.blocked-users.unblock-user": {
+    "defaultMessage": "{username} letiltásának feloldása"
+  },
+  "settings.social.blocked-users.user-avatar": {
+    "defaultMessage": "{username} avatárja"
+  },
+  "settings.social.friend-requests.description": {
+    "defaultMessage": "Állítsd be, hogy ki küldhet neked barátkérelmeket a Modrinthon."
+  },
+  "settings.social.friend-requests.title": {
+    "defaultMessage": "Barátkérelmek"
+  },
+  "settings.social.interaction-source.coming-soon": {
+    "defaultMessage": "Hamarosan érkezik!"
+  },
+  "settings.social.interaction-source.everyone": {
+    "defaultMessage": "Bárki"
+  },
+  "settings.social.interaction-source.friends": {
+    "defaultMessage": "Barátok"
+  },
+  "settings.social.interaction-source.friends-of-friends": {
+    "defaultMessage": "A barátok barátai"
+  },
+  "settings.social.interaction-source.no-one": {
+    "defaultMessage": "Senki"
+  },
+  "settings.social.shared-instance-invites.description": {
+    "defaultMessage": "Állítsd be, hogy kik küldhetnek neked meghívókat a megosztott játékprofilokhoz és a Modrinth Hosting vezérlőpultjaihoz."
+  },
+  "settings.social.shared-instance-invites.title": {
+    "defaultMessage": "Meghívók"
+  },
+  "settings.social.sign-in-required.description": {
+    "defaultMessage": "A Modrinth-fiókod segítségével beállíthatod, hogy kik léphetnek veled kapcsolatba, és kezelheted a letiltott felhasználókat"
+  },
+  "settings.social.sign-in-required.title": {
+    "defaultMessage": "Modrinth-fiók szükséges"
+  },
+  "settings.social.title": {
+    "defaultMessage": "Közösségi"
+  },
   "sharing.invite-players-modal.add": {
     "defaultMessage": "Hozzáadás"
   },
@@ -4247,6 +4577,15 @@
   "sharing.invite-players-modal.link-copied-title": {
     "defaultMessage": "Link kimásolva"
   },
+  "sharing.invite-players-modal.link-copy-failed-title": {
+    "defaultMessage": "A link másolása nem sikerült"
+  },
+  "sharing.invite-players-modal.max-uses-label": {
+    "defaultMessage": "Maximális felhasználások száma"
+  },
+  "sharing.invite-players-modal.no-friends": {
+    "defaultMessage": "Nem találhatók barátok."
+  },
   "sharing.invite-players-modal.no-search-results": {
     "defaultMessage": "Nem található a keresésnek megfelelő felhasználó."
   },
@@ -4775,6 +5114,9 @@
   "ui.stacked-admonitions.alert-count": {
     "defaultMessage": "{count} figyelmeztetés"
   },
+  "unknown-file-warning-modal.malware-warning": {
+    "defaultMessage": "A rosszindulatú programokat gyakran modfájlokon keresztül terjesztik, például a Discordhoz hasonló platformokon történő megosztás révén."
+  },
   "unknown-file-warning-modal.modpack-warning-title": {
     "defaultMessage": "Ismeretlen fájlok"
   },
@@ -4873,5 +5215,14 @@
   },
   "user.profile.badge.staff.name": {
     "defaultMessage": "A Modrinth-csapat"
+  },
+  "version.section.content": {
+    "defaultMessage": "Tartalom"
+  },
+  "version.section.content.search-placeholder": {
+    "defaultMessage": "Tartalom keresése..."
+  },
+  "version.section.required-content": {
+    "defaultMessage": "Kötelező tartalom"
   }
 }
diff --git a/packages/ui/src/locales/id-ID/index.json b/packages/ui/src/locales/id-ID/index.json
index 8ad53fed3f..ea86cec49e 100644
--- a/packages/ui/src/locales/id-ID/index.json
+++ b/packages/ui/src/locales/id-ID/index.json
@@ -2985,3 +2985,4 @@
     "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 8ff9e91298..7e05068c8d 100644
--- a/packages/ui/src/locales/it-IT/index.json
+++ b/packages/ui/src/locales/it-IT/index.json
@@ -545,6 +545,9 @@
   "content.inline-backup.world-label": {
     "defaultMessage": "mondo"
   },
+  "content.modpack-card.installation-settings": {
+    "defaultMessage": "Impostazioni installazione"
+  },
   "content.page-layout.additional-content": {
     "defaultMessage": "Contenuto aggiuntivo"
   },
@@ -732,7 +735,7 @@
     "defaultMessage": "Nessuna versione trovata"
   },
   "creation-flow.modal.final-config.additional-settings.title": {
-    "defaultMessage": "Opzioni aggiuntive"
+    "defaultMessage": "Impostazioni aggiuntive"
   },
   "creation-flow.modal.final-config.backup.before-reset-server.name": {
     "defaultMessage": "Prima della reimpostazione"
@@ -2198,6 +2201,9 @@
   "label.details": {
     "defaultMessage": "Dettagli"
   },
+  "label.discover-content": {
+    "defaultMessage": "Sfoglia i contenuti"
+  },
   "label.done": {
     "defaultMessage": "Fatto"
   },
@@ -2276,6 +2282,9 @@
   "label.password": {
     "defaultMessage": "Password"
   },
+  "label.permissions": {
+    "defaultMessage": "Permessi"
+  },
   "label.plan-custom": {
     "defaultMessage": "Ad hoc"
   },
@@ -2807,9 +2816,177 @@
   "payment-method.visa": {
     "defaultMessage": "Visa"
   },
+  "profile.bio.fallback.creator": {
+    "defaultMessage": "Creatore su Modrinth."
+  },
+  "profile.bio.fallback.user": {
+    "defaultMessage": "Utente di Modrinth."
+  },
+  "profile.block-user.admonition-body": {
+    "defaultMessage": "{username} non potrà inviarti richieste di amicizia, invitarti alle istanze condivise o invitarti ai server Modrinth Hosting."
+  },
+  "profile.block-user.admonition-title": {
+    "defaultMessage": "Vuoi davvero bloccare quest'utente?"
+  },
+  "profile.block-user.error-description": {
+    "defaultMessage": "Sì è verificato un errore nel bloccare l'utente. Riprova più tardi."
+  },
+  "profile.block-user.error-title": {
+    "defaultMessage": "Impossibile bloccare l'utente"
+  },
+  "profile.block-user.success-description": {
+    "defaultMessage": "Utente {username} bloccato."
+  },
+  "profile.block-user.success-title": {
+    "defaultMessage": "Utente bloccato"
+  },
+  "profile.block-user.title": {
+    "defaultMessage": "Blocca {username}"
+  },
+  "profile.button.analytics": {
+    "defaultMessage": "Mostra analitiche utente"
+  },
+  "profile.button.billing": {
+    "defaultMessage": "Gestisci fatturato utente"
+  },
+  "profile.button.block": {
+    "defaultMessage": "Blocca"
+  },
+  "profile.button.create-collection": {
+    "defaultMessage": "Crea una raccolta"
+  },
+  "profile.button.create-project": {
+    "defaultMessage": "Crea un progetto"
+  },
+  "profile.button.edit-role": {
+    "defaultMessage": "Modifica ruolo"
+  },
+  "profile.button.info": {
+    "defaultMessage": "Mostra info utente"
+  },
+  "profile.button.manage-projects": {
+    "defaultMessage": "Gestisci progetti"
+  },
+  "profile.button.remove-affiliate": {
+    "defaultMessage": "Rimuovi da affiliato"
+  },
+  "profile.button.set-affiliate": {
+    "defaultMessage": "Imposta come affiliato"
+  },
+  "profile.button.unblock": {
+    "defaultMessage": "Sblocca"
+  },
+  "profile.collection.projects-count": {
+    "defaultMessage": "{count, plural, one {# progetto} other {# progetti}}"
+  },
+  "profile.details.error.github-popup-blocked": {
+    "defaultMessage": "Consentì i pop-up per Modrinth, poi riprova."
+  },
+  "profile.details.error.github-profile-message": {
+    "defaultMessage": "Impossibile recuperare il profilo GitHub. Riprova più tardi."
+  },
+  "profile.details.error.github-profile-title": {
+    "defaultMessage": "Errore nell'apertura del profilo GitHub"
+  },
+  "profile.details.label.auth-providers": {
+    "defaultMessage": "Fornitori d'autenticazione"
+  },
+  "profile.details.label.email-verified": {
+    "defaultMessage": "Email verificata"
+  },
+  "profile.details.label.has-password": {
+    "defaultMessage": "Usa una password"
+  },
+  "profile.details.label.has-totp": {
+    "defaultMessage": "Usa un TOTP"
+  },
+  "profile.details.label.loading-github-profile": {
+    "defaultMessage": "Caricamento..."
+  },
+  "profile.details.label.payment-methods": {
+    "defaultMessage": "Metodi di pagamento"
+  },
+  "profile.details.label.view-github-profile": {
+    "defaultMessage": "Visita profilo"
+  },
+  "profile.details.title": {
+    "defaultMessage": "Informazioni"
+  },
+  "profile.details.tooltip.email-not-verified": {
+    "defaultMessage": "Email non verificata"
+  },
+  "profile.details.tooltip.email-verified": {
+    "defaultMessage": "Email verificata"
+  },
+  "profile.error.load-description": {
+    "defaultMessage": "Non è stato possibile caricare il profilo."
+  },
+  "profile.error.not-found": {
+    "defaultMessage": "Utente non trovato"
+  },
+  "profile.label.affiliate": {
+    "defaultMessage": "Affiliato"
+  },
   "profile.label.badges": {
     "defaultMessage": "Distintivi"
   },
+  "profile.label.collection": {
+    "defaultMessage": "Raccolta"
+  },
+  "profile.label.download-count": {
+    "defaultMessage": "download"
+  },
+  "profile.label.joined": {
+    "defaultMessage": "Iscrizione"
+  },
+  "profile.label.no-collections": {
+    "defaultMessage": "Nessuna raccolta qui!"
+  },
+  "profile.label.no-collections-auth-description": {
+    "defaultMessage": "Ancora nessuna raccolta."
+  },
+  "profile.label.no-projects": {
+    "defaultMessage": "Nessun progetto qui!"
+  },
+  "profile.label.no-projects-auth-description": {
+    "defaultMessage": "Ancora nessun progetto."
+  },
+  "profile.label.organizations": {
+    "defaultMessage": "Organizzazioni"
+  },
+  "profile.label.project-count": {
+    "defaultMessage": "{count, plural, one {progetto} other {progetti}}"
+  },
+  "profile.label.saving": {
+    "defaultMessage": "Salvataggio..."
+  },
+  "profile.official-account": {
+    "defaultMessage": "Account Modrinth ufficiale"
+  },
+  "profile.official-account.bio": {
+    "defaultMessage": "L'account ufficiale di Modrinth. Ricevi assistenza presso <support-link></support-link> o tramite mail presso <email></email>"
+  },
+  "profile.role.select-placeholder": {
+    "defaultMessage": "Seleziona il ruolo"
+  },
+  "profile.role.update-error-description": {
+    "defaultMessage": "Sì è verificato un errore nel salvataggio del ruolo utente. Riprova più tardi."
+  },
+  "profile.role.update-error-title": {
+    "defaultMessage": "Impossibile salvare il ruolo"
+  },
+  "profile.unblock-user.error-description": {
+    "defaultMessage": "Sì è verificato un errore nello sbloccare l'utente. Riprova più tardi."
+  },
+  "profile.unblock-user.error-title": {
+    "defaultMessage": "Impossibile sbloccare l'utente"
+  },
+  "profile.unblock-user.success-description": {
+    "defaultMessage": "Utente {username} sbloccato."
+  },
+  "profile.unblock-user.success-title": {
+    "defaultMessage": "Utente sbloccato"
+  },
   "project-card.date.published.tooltip": {
     "defaultMessage": "Pubblicato {date}"
   },
@@ -2837,6 +3014,9 @@
   "project-type.all": {
     "defaultMessage": "Tutto"
   },
+  "project-type.collection.plural": {
+    "defaultMessage": "Raccolte"
+  },
   "project-type.datapack.capital": {
     "defaultMessage": "Pacchett{count, plural, one {o} other {i}} di dati"
   },
@@ -4464,7 +4644,7 @@
     "defaultMessage": "Installazione fallita"
   },
   "servers.installing-banner.error.internal-platform": {
-    "defaultMessage": "Si è verificato un errore nell'installazione della piattaforma. Riprova più tardi."
+    "defaultMessage": "Si è verificato un errore durante l'installazione della piattaforma. Riprova più tardi."
   },
   "servers.installing-banner.error.invalid-loader-version": {
     "defaultMessage": "Questa versione di Minecraft o del loader non è potuta essere installata. Potrebbe essere non valida o non supportata."
@@ -5063,9 +5243,120 @@
   "settings.pats.title": {
     "defaultMessage": "Token di accesso (PAT)"
   },
+  "settings.profile.bio.description": {
+    "defaultMessage": "Una breve descrizione per raccontare a tutti qualcosa su di te."
+  },
+  "settings.profile.bio.title": {
+    "defaultMessage": "Bio"
+  },
+  "settings.profile.navigation-title": {
+    "defaultMessage": "Profilo"
+  },
+  "settings.profile.profile-picture.title": {
+    "defaultMessage": "Foto profilo"
+  },
+  "settings.profile.public-information.description": {
+    "defaultMessage": "Le informazioni del tuo profilo sono <profile-link>visibili pubblicamente su Modrinth</profile-link> e tramite l''<docs-link>API di Modrinth</docs-link>."
+  },
+  "settings.profile.save-error": {
+    "defaultMessage": "Impossibile salvare il profilo"
+  },
+  "settings.profile.save-error-description": {
+    "defaultMessage": "Si è verificato un errore nel salvataggio del profilo. Riprova più tardi."
+  },
+  "settings.profile.sign-in-required.description": {
+    "defaultMessage": "Accedi con un account Modrinth per personalizzare il tuo profilo pubblico."
+  },
+  "settings.profile.sign-in-required.title": {
+    "defaultMessage": "Account Modrinth richiesto"
+  },
+  "settings.profile.username.description": {
+    "defaultMessage": "Un nome univoco per identificare il tuo profilo (maiuscole irrilevanti)."
+  },
   "settings.sessions.title": {
     "defaultMessage": "Sessioni"
   },
+  "settings.social.blocked-users.column.actions": {
+    "defaultMessage": "Azioni"
+  },
+  "settings.social.blocked-users.column.user": {
+    "defaultMessage": "Utente"
+  },
+  "settings.social.blocked-users.description": {
+    "defaultMessage": "Questi sono gli utenti che hai bloccato su Modrinth. Non potranno:"
+  },
+  "settings.social.blocked-users.empty": {
+    "defaultMessage": "Non hai bloccato nessuno."
+  },
+  "settings.social.blocked-users.load-error": {
+    "defaultMessage": "Impossibile caricare gli utenti bloccati."
+  },
+  "settings.social.blocked-users.loading": {
+    "defaultMessage": "Caricamento utenti bloccati…"
+  },
+  "settings.social.blocked-users.restriction.friend-requests": {
+    "defaultMessage": "Inviarti richieste di amicizia"
+  },
+  "settings.social.blocked-users.restriction.hosting": {
+    "defaultMessage": "Invitarti a gestire un server Modrinth Hosting."
+  },
+  "settings.social.blocked-users.restriction.shared-instances": {
+    "defaultMessage": "Invitarti nelle istanze condivise"
+  },
+  "settings.social.blocked-users.title": {
+    "defaultMessage": "Utenti bloccati"
+  },
+  "settings.social.blocked-users.unblock": {
+    "defaultMessage": "Sblocca"
+  },
+  "settings.social.blocked-users.unblock-error": {
+    "defaultMessage": "Impossibile sbloccare l'utente"
+  },
+  "settings.social.blocked-users.unblock-error-description": {
+    "defaultMessage": "Sì è verificato un errore nello sbloccare l'utente. Riprova più tardi."
+  },
+  "settings.social.blocked-users.unblock-user": {
+    "defaultMessage": "Sblocca {username}"
+  },
+  "settings.social.blocked-users.user-avatar": {
+    "defaultMessage": "Foto profilo di {username}"
+  },
+  "settings.social.friend-requests.description": {
+    "defaultMessage": "Controlla chi può inviarti richieste d'amicizia su Modrinth."
+  },
+  "settings.social.friend-requests.title": {
+    "defaultMessage": "Richieste di amicizia"
+  },
+  "settings.social.interaction-source.coming-soon": {
+    "defaultMessage": "In arrivo!"
+  },
+  "settings.social.interaction-source.everyone": {
+    "defaultMessage": "Tutti"
+  },
+  "settings.social.interaction-source.friends": {
+    "defaultMessage": "Amici"
+  },
+  "settings.social.interaction-source.friends-of-friends": {
+    "defaultMessage": "Amici di amici"
+  },
+  "settings.social.interaction-source.no-one": {
+    "defaultMessage": "Nessuno"
+  },
+  "settings.social.shared-instance-invites.description": {
+    "defaultMessage": "Controlla chi può invitarti alle istanze condivise e pannelli di Modrinth Hosting."
+  },
+  "settings.social.shared-instance-invites.title": {
+    "defaultMessage": "Inviti"
+  },
+  "settings.social.sign-in-required.description": {
+    "defaultMessage": "Puoi controllare chi può interagire con te e gestire gli utenti bloccati con un account Modrinth"
+  },
+  "settings.social.sign-in-required.title": {
+    "defaultMessage": "Account Modrinth richiesto"
+  },
+  "settings.social.title": {
+    "defaultMessage": "Interazioni"
+  },
   "sharing.invite-players-modal.add": {
     "defaultMessage": "Aggiungi"
   },
@@ -5075,6 +5366,9 @@
   "sharing.invite-players-modal.already-invited": {
     "defaultMessage": "Quest'utente ha già ricevuto un invito."
   },
+  "sharing.invite-players-modal.apply-button": {
+    "defaultMessage": "Applica"
+  },
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "Foto profilo di {username}"
   },
@@ -5084,12 +5378,36 @@
   "sharing.invite-players-modal.cancel-button": {
     "defaultMessage": "Annulla"
   },
+  "sharing.invite-players-modal.custom-expiry": {
+    "defaultMessage": "Personalizzata..."
+  },
+  "sharing.invite-players-modal.custom-expiry-value": {
+    "defaultMessage": "Personalizzata: {date}"
+  },
   "sharing.invite-players-modal.edit-invite-link": {
     "defaultMessage": "Modifica link d'invito."
   },
   "sharing.invite-players-modal.edit-invite-link-title": {
     "defaultMessage": "Modifica link di invito"
   },
+  "sharing.invite-players-modal.expiry-in-one-day": {
+    "defaultMessage": "In 1 giorno"
+  },
+  "sharing.invite-players-modal.expiry-in-one-hour": {
+    "defaultMessage": "In 1 ora"
+  },
+  "sharing.invite-players-modal.expiry-in-seven-days": {
+    "defaultMessage": "In 7 giorni"
+  },
+  "sharing.invite-players-modal.expiry-in-six-hours": {
+    "defaultMessage": "In 6 ore"
+  },
+  "sharing.invite-players-modal.expiry-in-three-days": {
+    "defaultMessage": "In 3 giorni"
+  },
+  "sharing.invite-players-modal.expiry-in-twelve-hours": {
+    "defaultMessage": "In 12 ore"
+  },
   "sharing.invite-players-modal.expiry-label": {
     "defaultMessage": "Scadenza"
   },
@@ -5430,7 +5748,7 @@
     "defaultMessage": "SMP"
   },
   "tag.category.social": {
-    "defaultMessage": "Società"
+    "defaultMessage": "Interazione"
   },
   "tag.category.storage": {
     "defaultMessage": "Immagazzinamento"
diff --git a/packages/ui/src/locales/ja-JP/index.json b/packages/ui/src/locales/ja-JP/index.json
index 10ed45ffbf..88b8a1f1e3 100644
--- a/packages/ui/src/locales/ja-JP/index.json
+++ b/packages/ui/src/locales/ja-JP/index.json
@@ -4998,16 +4998,16 @@
     "defaultMessage": "一般的にマルウェアは、Discord等のプラットフォーム上でModファイルを配布して拡散されます"
   },
   "user.profile.badge.alpha.about.1": {
-    "defaultMessage": "2020年11月までのModrinthがAlpha版だった頃から活動しています"
+    "defaultMessage": "2020年11月までのModrinthがAlpha版の頃から活動しています"
   },
   "user.profile.badge.alpha.name": {
     "defaultMessage": "Alpha Tester"
   },
   "user.profile.badge.beta.about.1": {
-    "defaultMessage": "2022年2月までのModrinthがBeta版だった頃から活動しています"
+    "defaultMessage": "2022年2月までのModrinthがBeta版の頃から活動しています"
   },
   "user.profile.badge.beta.link": {
-    "defaultMessage": "クリックすると、ModrinthのBeta版のリリース記事を読むことができます。"
+    "defaultMessage": "クリックするとModrinthのBeta版リリース記事を読むことができます"
   },
   "user.profile.badge.beta.name": {
     "defaultMessage": "Beta Tester"
@@ -5021,6 +5021,12 @@
   "user.profile.badge.moderator.name": {
     "defaultMessage": "コンテンツモデレーター"
   },
+  "user.profile.badge.plus.about.1": {
+    "defaultMessage": "Modrinthとクリエイターに特別なサポートを贈っています！"
+  },
+  "user.profile.badge.plus.link": {
+    "defaultMessage": "クリックしてModrinth+のメンバーになる方法を知る"
+  },
   "user.profile.badge.plus.name": {
     "defaultMessage": "Modrinth+ Member"
   },
diff --git a/packages/ui/src/locales/ko-KR/index.json b/packages/ui/src/locales/ko-KR/index.json
index 33db6fadd9..ba31764d58 100644
--- a/packages/ui/src/locales/ko-KR/index.json
+++ b/packages/ui/src/locales/ko-KR/index.json
@@ -377,6 +377,9 @@
   "content.confirm-deletion.header": {
     "defaultMessage": "{itemType} 삭제"
   },
+  "content.confirm-disable.header": {
+    "defaultMessage": "{itemType} 비활성화"
+  },
   "content.confirm-modpack-update.admonition-body": {
     "defaultMessage": "{action, select, downgrade {다운그레이드 진행 중} other {업데이트 진행 중}}에는 호환성 문제가 발생할 수 있습니다. 모드팩에 추가한 모드나 콘텐츠는 유지되지만, 새 버전과 호환되지 않을 수 있습니다."
   },
@@ -446,12 +449,18 @@
   "content.diff-modal.added-count": {
     "defaultMessage": "{count}개 추가됨"
   },
+  "content.diff-modal.config-files-updated": {
+    "defaultMessage": "변경된 설정 파일"
+  },
   "content.diff-modal.diff-type.added": {
     "defaultMessage": "추가됨 (종속성)"
   },
   "content.diff-modal.diff-type.removed": {
     "defaultMessage": "비활성화"
   },
+  "content.diff-modal.diff-type.removed-disabled": {
+    "defaultMessage": "제거됨 (비활성화됨)"
+  },
   "content.diff-modal.diff-type.updated": {
     "defaultMessage": "업데이트됨"
   },
@@ -467,12 +476,36 @@
   "content.diff-modal.external-diff-type.updated": {
     "defaultMessage": "업데이트됨"
   },
+  "content.diff-modal.file-count": {
+    "defaultMessage": "{count, plural, one {#개 파일} other {#개 파일}}"
+  },
+  "content.diff-modal.game-version-updated": {
+    "defaultMessage": "게임 버전"
+  },
   "content.diff-modal.install-anyway": {
     "defaultMessage": "무시하고 설치"
   },
+  "content.diff-modal.loader-updated": {
+    "defaultMessage": "로더"
+  },
+  "content.diff-modal.modpack-linked": {
+    "defaultMessage": "연동된 모드팩"
+  },
+  "content.diff-modal.modpack-unlinked": {
+    "defaultMessage": "연동 해제된 모드팩"
+  },
+  "content.diff-modal.modpack-updated": {
+    "defaultMessage": "업데이트된 모드팩"
+  },
+  "content.diff-modal.no-content-changes": {
+    "defaultMessage": "콘텐츠 변경 사항 없음"
+  },
   "content.diff-modal.removed-count": {
     "defaultMessage": "{count}개 제거됨"
   },
+  "content.diff-modal.removed-disabled-count": {
+    "defaultMessage": "{count} 제거됨 (비활성화됨)"
+  },
   "content.diff-modal.reviewed-files": {
     "defaultMessage": "모든 파일은 형식(.mrpack 포함)에 무관하게 Modrinth에 게시되어야만 검수를 거칩니다."
   },
@@ -533,6 +566,9 @@
   "content.inline-backup.world-label": {
     "defaultMessage": "세계"
   },
+  "content.modpack-card.installation-settings": {
+    "defaultMessage": "설치 설정"
+  },
   "content.page-layout.additional-content": {
     "defaultMessage": "추가 콘텐츠"
   },
@@ -1160,6 +1196,21 @@
   "external-files.permissions-card.reason.special-permission.description": {
     "defaultMessage": "이 작업물을 모드팩에 재배포할 수 있는 특별 허가를 받았습니다."
   },
+  "external-files.permissions-card.remove-group": {
+    "defaultMessage": "그룹 삭제"
+  },
+  "external-files.permissions-card.remove-group-confirmation.description": {
+    "defaultMessage": "이 작업은 해당 출처 표시 그룹 및 내부의 모든 파일을 영구 삭제합니다. 이 작업은 되돌릴 수 없습니다."
+  },
+  "external-files.permissions-card.remove-group-confirmation.title": {
+    "defaultMessage": "{title}를 삭제하시겠습니까?"
+  },
+  "external-files.permissions-card.remove-group-error.title": {
+    "defaultMessage": "그룹을 삭제할 수 없습니다"
+  },
+  "external-files.permissions-card.remove-group-shift-hint": {
+    "defaultMessage": "Shift 키를 누른 채 클릭하면 확인 절차를 생략합니다."
+  },
   "external-files.permissions-card.split-file": {
     "defaultMessage": "그룹에서 제거"
   },
@@ -2039,6 +2090,12 @@
   "instances.modpack-content-modal.empty-title": {
     "defaultMessage": "콘텐츠를 찾을 수 없습니다"
   },
+  "instances.modpack-content-modal.external-content": {
+    "defaultMessage": "외부"
+  },
+  "instances.modpack-content-modal.external-content-description": {
+    "defaultMessage": "이 파일은 Modrinth에 게시되지 않았습니다."
+  },
   "instances.modpack-content-modal.header": {
     "defaultMessage": "모드팩 콘텐츠"
   },
@@ -2048,6 +2105,9 @@
   "instances.modpack-content-modal.no-results": {
     "defaultMessage": "검색 결과와 일치하는 프로젝트가 없습니다."
   },
+  "instances.modpack-content-modal.open-in-slicer": {
+    "defaultMessage": "Slicer에서 열기"
+  },
   "instances.modpack-content-modal.search-placeholder": {
     "defaultMessage": "{count, number}개의 프로젝트 검색"
   },
@@ -2183,6 +2243,9 @@
   "label.details": {
     "defaultMessage": "세부 사항"
   },
+  "label.discover-content": {
+    "defaultMessage": "콘텐츠 둘러보기"
+  },
   "label.done": {
     "defaultMessage": "완료"
   },
@@ -2261,6 +2324,9 @@
   "label.password": {
     "defaultMessage": "비밀번호"
   },
+  "label.permissions": {
+    "defaultMessage": "권한"
+  },
   "label.plan-custom": {
     "defaultMessage": "사용자 지정"
   },
@@ -2792,9 +2858,162 @@
   "payment-method.visa": {
     "defaultMessage": "Visa"
   },
+  "profile.bio.fallback.creator": {
+    "defaultMessage": "Modrinth 크리에이터입니다."
+  },
+  "profile.bio.fallback.user": {
+    "defaultMessage": "Modrinth 사용자입니다."
+  },
+  "profile.block-user.admonition-body": {
+    "defaultMessage": "{username} 님은 친구 요청을 보내거나, 공유 인스턴스 초대 및 Modrinth Hosting 서버 초대를 할 수 없게 됩니다."
+  },
+  "profile.block-user.admonition-title": {
+    "defaultMessage": "이 사용자를 차단하시겠습니까?"
+  },
+  "profile.block-user.error-description": {
+    "defaultMessage": "이 사용자를 차단하는 중 오류가 발생했습니다. 다시 시도해 주세요."
+  },
+  "profile.block-user.error-title": {
+    "defaultMessage": "사용자 차단 실패"
+  },
+  "profile.block-user.success-description": {
+    "defaultMessage": "{username} 님을 차단했습니다."
+  },
+  "profile.block-user.success-title": {
+    "defaultMessage": "사용자 차단됨"
+  },
+  "profile.block-user.title": {
+    "defaultMessage": "{username} 차단"
+  },
+  "profile.button.analytics": {
+    "defaultMessage": "사용자 분석 보기"
+  },
+  "profile.button.billing": {
+    "defaultMessage": "사용자 결제 관리"
+  },
+  "profile.button.block": {
+    "defaultMessage": "차단"
+  },
+  "profile.button.create-collection": {
+    "defaultMessage": "컬렉션 만들기"
+  },
+  "profile.button.create-project": {
+    "defaultMessage": "프로젝트 만들기"
+  },
+  "profile.button.edit-role": {
+    "defaultMessage": "역할 수정"
+  },
+  "profile.button.info": {
+    "defaultMessage": "사용자 상세 정보 보기"
+  },
+  "profile.button.manage-projects": {
+    "defaultMessage": "프로젝트 관리"
+  },
+  "profile.button.remove-affiliate": {
+    "defaultMessage": "제휴 자격 해제"
+  },
+  "profile.button.set-affiliate": {
+    "defaultMessage": "제휴 자격 부여"
+  },
+  "profile.button.unblock": {
+    "defaultMessage": "차단 해제"
+  },
+  "profile.collection.projects-count": {
+    "defaultMessage": "{count, plural, one {프로젝트 #개} other {프로젝트 #개}}"
+  },
+  "profile.details.label.auth-providers": {
+    "defaultMessage": "인증 제공자"
+  },
+  "profile.details.label.email-verified": {
+    "defaultMessage": "이메일 인증됨"
+  },
+  "profile.details.label.has-password": {
+    "defaultMessage": "비밀번호 설정됨"
+  },
+  "profile.details.label.has-totp": {
+    "defaultMessage": "TOTP 설정됨"
+  },
+  "profile.details.label.payment-methods": {
+    "defaultMessage": "결제 수단"
+  },
+  "profile.details.title": {
+    "defaultMessage": "사용자 상세 정보"
+  },
+  "profile.details.tooltip.email-not-verified": {
+    "defaultMessage": "이메일 미인증"
+  },
+  "profile.details.tooltip.email-verified": {
+    "defaultMessage": "이메일 인증됨"
+  },
+  "profile.error.load-description": {
+    "defaultMessage": "사용자 프로필을 불러올 수 없습니다."
+  },
+  "profile.error.not-found": {
+    "defaultMessage": "사용자를 찾을 수 없음"
+  },
+  "profile.label.affiliate": {
+    "defaultMessage": "제휴 파트너"
+  },
   "profile.label.badges": {
     "defaultMessage": "배지"
   },
+  "profile.label.collection": {
+    "defaultMessage": "컬렉션"
+  },
+  "profile.label.download-count": {
+    "defaultMessage": "{count, plural, other {다운로드}}"
+  },
+  "profile.label.joined": {
+    "defaultMessage": "가입일"
+  },
+  "profile.label.no-collections": {
+    "defaultMessage": "이 사용자는 컬렉션이 없습니다!"
+  },
+  "profile.label.no-collections-auth-description": {
+    "defaultMessage": "아직 컬렉션이 없습니다."
+  },
+  "profile.label.no-projects": {
+    "defaultMessage": "이 사용자는 프로젝트가 없습니다!"
+  },
+  "profile.label.no-projects-auth-description": {
+    "defaultMessage": "아직 프로젝트가 없습니다."
+  },
+  "profile.label.organizations": {
+    "defaultMessage": "조직"
+  },
+  "profile.label.project-count": {
+    "defaultMessage": "{count, plural, other {프로젝트}}"
+  },
+  "profile.label.saving": {
+    "defaultMessage": "저장 중..."
+  },
+  "profile.official-account": {
+    "defaultMessage": "공식 Modrinth 계정"
+  },
+  "profile.official-account.bio": {
+    "defaultMessage": "Modrinth의 공식 사용자 계정입니다. <support-link></support-link> 또는 <email></email> 을 통해 문의해 주세요"
+  },
+  "profile.role.select-placeholder": {
+    "defaultMessage": "역할 선택"
+  },
+  "profile.role.update-error-description": {
+    "defaultMessage": "사용자 역할을 업데이트하는 동안 오류가 발생했습니다. 다시 시도해 주세요."
+  },
+  "profile.role.update-error-title": {
+    "defaultMessage": "역할 업데이트 실패"
+  },
+  "profile.unblock-user.error-description": {
+    "defaultMessage": "이 사용자의 차단을 해제하는 동안 오류가 발생했습니다. 다시 시도해 주세요."
+  },
+  "profile.unblock-user.error-title": {
+    "defaultMessage": "사용자 차단 해제 실패"
+  },
+  "profile.unblock-user.success-description": {
+    "defaultMessage": "{username}님의 차단이 해제되었습니다."
+  },
+  "profile.unblock-user.success-title": {
+    "defaultMessage": "사용자 차단 해제됨"
+  },
   "project-card.date.published.tooltip": {
     "defaultMessage": "{date}에 게시됨"
   },
@@ -2810,12 +3029,21 @@
   "project-card.environment.client-or-server": {
     "defaultMessage": "클라이언트 또는 서버"
   },
+  "project-card.environment.dedicated-server": {
+    "defaultMessage": "전용 서버"
+  },
   "project-card.environment.server": {
     "defaultMessage": "서버"
   },
+  "project-card.environment.singleplayer": {
+    "defaultMessage": "싱글플레이어"
+  },
   "project-type.all": {
     "defaultMessage": "모두"
   },
+  "project-type.collection.plural": {
+    "defaultMessage": "컬렉션"
+  },
   "project-type.datapack.capital": {
     "defaultMessage": "{count, plural, other {데이터 팩}}"
   },
@@ -5039,9 +5267,222 @@
   "settings.pats.title": {
     "defaultMessage": "개인 액세스 토큰"
   },
+  "settings.profile.bio.description": {
+    "defaultMessage": "자신을 알릴 수 있는 간단한 소개글입니다."
+  },
+  "settings.profile.bio.title": {
+    "defaultMessage": "자기소개"
+  },
+  "settings.profile.navigation-title": {
+    "defaultMessage": "프로필"
+  },
+  "settings.profile.profile-picture.title": {
+    "defaultMessage": "프로필 사진"
+  },
+  "settings.profile.public-information.description": {
+    "defaultMessage": "프로필 정보는 Modrinth에서 <profile-link>누구나 볼 수 있게 공개</profile-link>되며, <docs-link>Modrinth API</docs-link>를 통해서도 확인할 수 있습니다."
+  },
+  "settings.profile.save-error": {
+    "defaultMessage": "프로필 업데이트 실패"
+  },
+  "settings.profile.save-error-description": {
+    "defaultMessage": "프로필을 업데이트하는 동안 오류가 발생했습니다. 다시 시도해 주세요."
+  },
+  "settings.profile.sign-in-required.description": {
+    "defaultMessage": "공개 프로필을 맞춤 설정하려면 Modrinth 계정에 로그인하세요."
+  },
+  "settings.profile.sign-in-required.title": {
+    "defaultMessage": "Modrinth 계정 필요"
+  },
+  "settings.profile.username.description": {
+    "defaultMessage": "프로필을 식별하기 위한 대소문자 구분 없는 고유한 이름입니다."
+  },
   "settings.sessions.title": {
     "defaultMessage": "세션"
   },
+  "settings.social.blocked-users.column.actions": {
+    "defaultMessage": "작업"
+  },
+  "settings.social.blocked-users.column.user": {
+    "defaultMessage": "사용자"
+  },
+  "settings.social.blocked-users.description": {
+    "defaultMessage": "Modrinth에서 차단한 사용자 목록입니다. 해당 사용자는 다음 행위를 할 수 없습니다:"
+  },
+  "settings.social.blocked-users.empty": {
+    "defaultMessage": "차단한 사용자가 없습니다."
+  },
+  "settings.social.blocked-users.load-error": {
+    "defaultMessage": "차단된 사용자 목록을 불러올 수 없습니다."
+  },
+  "settings.social.blocked-users.loading": {
+    "defaultMessage": "차단된 사용자 목록 불러오는 중…"
+  },
+  "settings.social.blocked-users.restriction.friend-requests": {
+    "defaultMessage": "나에게 친구 요청 전송"
+  },
+  "settings.social.blocked-users.restriction.hosting": {
+    "defaultMessage": "Modrinth 호스팅 서버 관리 초대."
+  },
+  "settings.social.blocked-users.restriction.shared-instances": {
+    "defaultMessage": "공유 인스턴스에 초대"
+  },
+  "settings.social.blocked-users.title": {
+    "defaultMessage": "차단된 사용자"
+  },
+  "settings.social.blocked-users.unblock": {
+    "defaultMessage": "차단 해제"
+  },
+  "settings.social.blocked-users.unblock-error": {
+    "defaultMessage": "사용자 차단 해제 실패"
+  },
+  "settings.social.blocked-users.unblock-error-description": {
+    "defaultMessage": "이 사용자의 차단을 해제하는 중 오류가 발생했습니다. 다시 시도해 주세요."
+  },
+  "settings.social.blocked-users.unblock-user": {
+    "defaultMessage": "{username} 차단 해제"
+  },
+  "settings.social.blocked-users.user-avatar": {
+    "defaultMessage": "{username} 님의 아바타"
+  },
+  "settings.social.friend-requests.description": {
+    "defaultMessage": "Modrinth에서 본인에게 친구 요청을 보낼 수 있는 사람을 설정합니다."
+  },
+  "settings.social.friend-requests.title": {
+    "defaultMessage": "친구 요청"
+  },
+  "settings.social.interaction-source.coming-soon": {
+    "defaultMessage": "곧 제공할 예정입니다!"
+  },
+  "settings.social.interaction-source.everyone": {
+    "defaultMessage": "모든 사람"
+  },
+  "settings.social.interaction-source.friends": {
+    "defaultMessage": "친구"
+  },
+  "settings.social.interaction-source.friends-of-friends": {
+    "defaultMessage": "친구의 친구"
+  },
+  "settings.social.interaction-source.no-one": {
+    "defaultMessage": "아무도 없음"
+  },
+  "settings.social.shared-instance-invites.description": {
+    "defaultMessage": "공유 인스턴스 및 Modrinth Hosting 패널 초대를 보낼 수 있는 사람을 설정합니다."
+  },
+  "settings.social.shared-instance-invites.title": {
+    "defaultMessage": "초대"
+  },
+  "settings.social.sign-in-required.description": {
+    "defaultMessage": "Modrinth 계정이 있으면 본인과 소통 가능한 사람을 설정하고 차단된 사용자를 관리할 수 있습니다"
+  },
+  "settings.social.sign-in-required.title": {
+    "defaultMessage": "Modrinth 계정이 필요합니다"
+  },
+  "settings.social.title": {
+    "defaultMessage": "소셜"
+  },
+  "sharing.invite-players-modal.add": {
+    "defaultMessage": "추가"
+  },
+  "sharing.invite-players-modal.added": {
+    "defaultMessage": "추가됨"
+  },
+  "sharing.invite-players-modal.already-invited": {
+    "defaultMessage": "이 사용자는 이미 초대되었습니다."
+  },
+  "sharing.invite-players-modal.apply-button": {
+    "defaultMessage": "선택"
+  },
+  "sharing.invite-players-modal.avatar-alt": {
+    "defaultMessage": "{username} 님의 아바타"
+  },
+  "sharing.invite-players-modal.cancel": {
+    "defaultMessage": "취소"
+  },
+  "sharing.invite-players-modal.cancel-button": {
+    "defaultMessage": "취소"
+  },
+  "sharing.invite-players-modal.custom-expiry": {
+    "defaultMessage": "커스텀..."
+  },
+  "sharing.invite-players-modal.custom-expiry-value": {
+    "defaultMessage": "커스텀: {date}"
+  },
+  "sharing.invite-players-modal.edit-invite-link": {
+    "defaultMessage": "초대 링크 수정."
+  },
+  "sharing.invite-players-modal.edit-invite-link-title": {
+    "defaultMessage": "초대 링크 수정"
+  },
+  "sharing.invite-players-modal.expiry-in-one-day": {
+    "defaultMessage": "1일 후"
+  },
+  "sharing.invite-players-modal.expiry-in-one-hour": {
+    "defaultMessage": "1시간 후"
+  },
+  "sharing.invite-players-modal.expiry-in-seven-days": {
+    "defaultMessage": "7일 후"
+  },
+  "sharing.invite-players-modal.expiry-in-six-hours": {
+    "defaultMessage": "6시간 후"
+  },
+  "sharing.invite-players-modal.expiry-in-three-days": {
+    "defaultMessage": "3일 후"
+  },
+  "sharing.invite-players-modal.expiry-in-twelve-hours": {
+    "defaultMessage": "12시간 후"
+  },
+  "sharing.invite-players-modal.expiry-label": {
+    "defaultMessage": "만료일"
+  },
+  "sharing.invite-players-modal.friends-heading": {
+    "defaultMessage": "당신의 친구 - {count}"
+  },
+  "sharing.invite-players-modal.invite": {
+    "defaultMessage": "초대"
+  },
+  "sharing.invite-players-modal.invite-expiry-description": {
+    "defaultMessage": "초대 링크는 {duration} 후 만료됩니다."
+  },
+  "sharing.invite-players-modal.invite-link-heading": {
+    "defaultMessage": "또는 초대 링크 사용"
+  },
+  "sharing.invite-players-modal.link-copied-text": {
+    "defaultMessage": "초대 링크가 클립보드에 복사되었습니다."
+  },
+  "sharing.invite-players-modal.link-copied-title": {
+    "defaultMessage": "링크 복사됨"
+  },
+  "sharing.invite-players-modal.link-copy-failed-title": {
+    "defaultMessage": "링크 복사 실패"
+  },
+  "sharing.invite-players-modal.max-uses-label": {
+    "defaultMessage": "최대 사용 횟수"
+  },
+  "sharing.invite-players-modal.no-friends": {
+    "defaultMessage": "친구가 없습니다."
+  },
+  "sharing.invite-players-modal.no-search-results": {
+    "defaultMessage": "일치하는 사용자를 찾을 수 없습니다."
+  },
+  "sharing.invite-players-modal.requested": {
+    "defaultMessage": "요청 전송됨"
+  },
+  "sharing.invite-players-modal.requested-tooltip": {
+    "defaultMessage": "{username}님이 먼저 친구 요청을 수락해야 합니다"
+  },
+  "sharing.invite-players-modal.save-button": {
+    "defaultMessage": "저장"
+  },
+  "sharing.invite-players-modal.search-placeholder": {
+    "defaultMessage": "Modrinth 사용자 이름 입력"
+  },
+  "sharing.invite-players-modal.searching": {
+    "defaultMessage": "검색 중..."
+  },
+  "sharing.invite-players-modal.update-invite-link-failed-title": {
+    "defaultMessage": "초대 링크 업데이트 실패"
+  },
   "tag.category.128x": {
     "defaultMessage": "128x"
   },
diff --git a/packages/ui/src/locales/ms-MY/index.json b/packages/ui/src/locales/ms-MY/index.json
index 26c129ef81..ac9fff9c1f 100644
--- a/packages/ui/src/locales/ms-MY/index.json
+++ b/packages/ui/src/locales/ms-MY/index.json
@@ -386,6 +386,9 @@
   "content.diff-modal.diff-type.updated": {
     "defaultMessage": "Dikemas Kini"
   },
+  "content.diff-modal.external-diff-type.added": {
+    "defaultMessage": "Ditambah"
+  },
   "content.diff-modal.removed-count": {
     "defaultMessage": "{count} dialih keluar"
   },
@@ -2402,6 +2405,9 @@
   "payment-method.visa": {
     "defaultMessage": "Visa"
   },
+  "profile.button.block": {
+    "defaultMessage": "Sekat"
+  },
   "profile.label.badges": {
     "defaultMessage": "Lencana"
   },
@@ -4442,9 +4448,27 @@
   "settings.pats.title": {
     "defaultMessage": "Token akses peribadi"
   },
+  "settings.profile.bio.title": {
+    "defaultMessage": "Bio"
+  },
   "settings.sessions.title": {
     "defaultMessage": "Sesi"
   },
+  "settings.social.blocked-users.column.user": {
+    "defaultMessage": "Pengguna"
+  },
+  "sharing.invite-players-modal.add": {
+    "defaultMessage": "Tambah"
+  },
+  "sharing.invite-players-modal.added": {
+    "defaultMessage": "Ditambah"
+  },
+  "sharing.invite-players-modal.apply-button": {
+    "defaultMessage": "Terapkan"
+  },
+  "sharing.invite-players-modal.save-button": {
+    "defaultMessage": "Simpan"
+  },
   "tag.category.128x": {
     "defaultMessage": "128x"
   },
@@ -5034,3 +5058,4 @@
     "defaultMessage": "Jenis"
   }
 }
+
diff --git a/packages/ui/src/locales/nl-NL/index.json b/packages/ui/src/locales/nl-NL/index.json
index 12973c623a..f81e8595b8 100644
--- a/packages/ui/src/locales/nl-NL/index.json
+++ b/packages/ui/src/locales/nl-NL/index.json
@@ -3,22 +3,22 @@
     "defaultMessage": "Je hebt geen toestemming."
   },
   "affiliate.create.button": {
-    "defaultMessage": "Maak een affiliatelink"
+    "defaultMessage": "Partnerlink aanmaken"
   },
   "affiliate.create.header": {
-    "defaultMessage": "Nieuwe affiliate aanmaken"
+    "defaultMessage": "Nieuwe partnercode aanmaken"
   },
   "affiliate.create.title.description": {
-    "defaultMessage": "Geef je affiliate-link een naam, zodat je weet waar mensen vandaan komen!"
+    "defaultMessage": "Geef je partnerlink een naam, zodat je weet waar mensen vandaan komen!"
   },
   "affiliate.create.title.label": {
-    "defaultMessage": "Titel van affiliate-link"
+    "defaultMessage": "Titel van de partnerlink"
   },
   "affiliate.create.title.placeholder": {
-    "defaultMessage": "bijvoorbeeld YouTube"
+    "defaultMessage": "bijv. YouTube"
   },
   "affiliate.create.user.description": {
-    "defaultMessage": "De gebruikersnaam van de gebruiker voor wie de affiliatecode moet worden aangemaakt"
+    "defaultMessage": "De gebruikersnaam van de gebruiker voor wie de partnercode moet worden aangemaakt"
   },
   "affiliate.create.user.placeholder": {
     "defaultMessage": "Voer gebruikersnaam in..."
@@ -27,13 +27,13 @@
     "defaultMessage": "Gemaakt door {user}"
   },
   "affiliate.creating.button": {
-    "defaultMessage": "Affiliate-link maken..."
+    "defaultMessage": "Partnerlink maken..."
   },
   "affiliate.revoke": {
-    "defaultMessage": "Affiliatie-link intrekken"
+    "defaultMessage": "Partnerlink intrekken"
   },
   "affiliate.viewAnalytics": {
-    "defaultMessage": "Bekijk analyses"
+    "defaultMessage": "Statistieken bekijken"
   },
   "app.server-settings.failed-to-load-server": {
     "defaultMessage": "Serverinstellingen konden niet worden geladen"
@@ -135,7 +135,7 @@
     "defaultMessage": "Voeg server toevoegen aan instantie"
   },
   "button.affiliate-links": {
-    "defaultMessage": "Affiliatelinks"
+    "defaultMessage": "Partnerlinks"
   },
   "button.analytics": {
     "defaultMessage": "Analytica"
@@ -2309,6 +2309,9 @@
   "label.password": {
     "defaultMessage": "Wachtwoord"
   },
+  "label.permissions": {
+    "defaultMessage": "Machtigingen"
+  },
   "label.plan-custom": {
     "defaultMessage": "Op maat"
   },
@@ -2840,9 +2843,111 @@
   "payment-method.visa": {
     "defaultMessage": "Visa"
   },
+  "profile.bio.fallback.creator": {
+    "defaultMessage": "Een maker op Modrinth."
+  },
+  "profile.bio.fallback.user": {
+    "defaultMessage": "Een gebruiker van Modrinth."
+  },
+  "profile.button.analytics": {
+    "defaultMessage": "Gebruikersstatistieken bekijken"
+  },
+  "profile.button.billing": {
+    "defaultMessage": "Gebruikersfacturering beheren"
+  },
+  "profile.button.create-collection": {
+    "defaultMessage": "Een collectie aanmaken"
+  },
+  "profile.button.create-project": {
+    "defaultMessage": "Een project aanmaken"
+  },
+  "profile.button.edit-role": {
+    "defaultMessage": "Rol bewerken"
+  },
+  "profile.button.info": {
+    "defaultMessage": "Gebruikersgegevens bekijken"
+  },
+  "profile.button.manage-projects": {
+    "defaultMessage": "Projecten beheren"
+  },
+  "profile.button.remove-affiliate": {
+    "defaultMessage": "Als partner verwijderen"
+  },
+  "profile.button.set-affiliate": {
+    "defaultMessage": "Als partner instellen"
+  },
+  "profile.collection.projects-count": {
+    "defaultMessage": "{count, plural, one {# project} other {# projecten}}"
+  },
+  "profile.details.label.auth-providers": {
+    "defaultMessage": "Authenticatieproviders"
+  },
+  "profile.details.label.email-verified": {
+    "defaultMessage": "E-mailadres geverifieerd"
+  },
+  "profile.details.label.has-password": {
+    "defaultMessage": "Heeft wachtwoord"
+  },
+  "profile.details.label.has-totp": {
+    "defaultMessage": "Heeft TOTP"
+  },
+  "profile.details.label.payment-methods": {
+    "defaultMessage": "Betaalmethoden"
+  },
+  "profile.details.title": {
+    "defaultMessage": "Gebruikersgegevens"
+  },
+  "profile.details.tooltip.email-not-verified": {
+    "defaultMessage": "E-mailadres niet geverifieerd"
+  },
+  "profile.details.tooltip.email-verified": {
+    "defaultMessage": "E-mailadres geverifieerd"
+  },
+  "profile.error.load-description": {
+    "defaultMessage": "Het profiel kon niet worden geladen."
+  },
+  "profile.error.not-found": {
+    "defaultMessage": "Gebruiker niet gevonden"
+  },
+  "profile.label.affiliate": {
+    "defaultMessage": "Partner"
+  },
   "profile.label.badges": {
     "defaultMessage": "Badges"
   },
+  "profile.label.collection": {
+    "defaultMessage": "Collectie"
+  },
+  "profile.label.download-count": {
+    "defaultMessage": "{count, plural, one {download} other {downloads}}"
+  },
+  "profile.label.joined": {
+    "defaultMessage": "Lid sinds"
+  },
+  "profile.label.no-collections": {
+    "defaultMessage": "Deze gebruiker heeft geen collecties!"
+  },
+  "profile.label.no-collections-auth-description": {
+    "defaultMessage": "Je hebt nog geen collecties."
+  },
+  "profile.label.no-projects": {
+    "defaultMessage": "Deze gebruiker heeft geen projecten!"
+  },
+  "profile.label.no-projects-auth-description": {
+    "defaultMessage": "Je hebt nog geen projecten."
+  },
+  "profile.label.organizations": {
+    "defaultMessage": "Organisaties"
+  },
+  "profile.label.project-count": {
+    "defaultMessage": "{count, plural, one {project} other {projecten}}"
+  },
+  "profile.label.saving": {
+    "defaultMessage": "Opslaan..."
+  },
+  "profile.official-account": {
+    "defaultMessage": "Officieel Modrinth-account"
+  },
   "project-card.date.published.tooltip": {
     "defaultMessage": "Gepubliceerd op {date}"
   },
@@ -2870,6 +2975,9 @@
   "project-type.all": {
     "defaultMessage": "Alles"
   },
+  "project-type.collection.plural": {
+    "defaultMessage": "Collecties"
+  },
   "project-type.datapack.capital": {
     "defaultMessage": "{count, plural, one {Gegevenspakket} other {Gegevenspakketten}}"
   },
@@ -3546,7 +3654,7 @@
     "defaultMessage": "Upload"
   },
   "project.settings.versions.permissions": {
-    "defaultMessage": "Toestemmingen"
+    "defaultMessage": "Machtigingen"
   },
   "project.settings.versions.title": {
     "defaultMessage": "Versies"
@@ -4632,7 +4740,7 @@
     "defaultMessage": "Je abonnement wordt op <date>{formattedDate}</date> opgezegd. "
   },
   "servers.listing.notice.suspended": {
-    "defaultMessage": "Je server is opgeschort. Neem contact op met de klantenservice van Modrinth voor meer informatie."
+    "defaultMessage": "Je server is opgeschort. Neem contact op met Modrinth-ondersteuning voor meer informatie."
   },
   "servers.listing.notice.upgrading": {
     "defaultMessage": "De hardware van uw server wordt momenteel geüpgraded en zal binnenkort weer online zijn."
@@ -4665,7 +4773,7 @@
     "defaultMessage": "Bezig met uploaden"
   },
   "servers.manage.contact-support-button": {
-    "defaultMessage": "Neem contact op met de klantenservice van Modrinth"
+    "defaultMessage": "Contact opnemen met Modrinth-ondersteuning"
   },
   "servers.manage.error.alert-notice": {
     "defaultMessage": "Onze systemen waarschuwen ons team automatisch wanneer er een probleem is. We zijn al bezig om ze weer online te krijgen."
@@ -4680,7 +4788,7 @@
     "defaultMessage": "Als je kort geleden een Modrinth Hosting-server hebt gekocht, staat deze momenteel in de wachtrij en zal hij hier verschijnen zodra hij klaar is. <warning>Probeer geen nieuwe server aan te schaffen.</warning>"
   },
   "servers.manage.error.support-notice": {
-    "defaultMessage": "Als je persoonlijke ondersteuning nodig hebt met betrekking tot de status van uw server, neem dan contact op met Modrinth Support."
+    "defaultMessage": "Als je persoonlijke ondersteuning nodig hebt met de status van je server, neem dan contact op met Modrinth-ondersteuning."
   },
   "servers.manage.error.title": {
     "defaultMessage": "De servers konden niet worden geladen"
@@ -4758,10 +4866,10 @@
     "defaultMessage": "De proefperiode van je Medal-server is afgelopen en je server is opgeschort. Voer een upgrade uit om je server te kunnen blijven gebruiken."
   },
   "servers.medal-listing.notice.suspended": {
-    "defaultMessage": "Je server is opgeschort. Werk je factuurgegevens bij of neem contact op met de klantenservice van Modrinth voor meer informatie."
+    "defaultMessage": "Je server is opgeschort. Werk je factuurgegevens bij of neem contact op met Modrinth-ondersteuning voor meer informatie."
   },
   "servers.medal-listing.notice.suspended-with-reason": {
-    "defaultMessage": "Je server is opgeschort met de reden: {reason}. Werk je factuurgegevens bij of neem contact op met de klantenservice van Modrinth voor meer informatie."
+    "defaultMessage": "Je server is opgeschort met de reden: {reason}. Werk je factuurgegevens bij of neem contact op met Modrinth-ondersteuning voor meer informatie."
   },
   "servers.medal-listing.notice.upgrading": {
     "defaultMessage": "De hardware van je server wordt momenteel geüpgraded en zal binnenkort weer online zijn."
diff --git a/packages/ui/src/locales/no-NO/index.json b/packages/ui/src/locales/no-NO/index.json
index 0d28108348..5167d41191 100644
--- a/packages/ui/src/locales/no-NO/index.json
+++ b/packages/ui/src/locales/no-NO/index.json
@@ -2778,3 +2778,4 @@
     "defaultMessage": "Du har ulagrede endringer."
   }
 }
+
diff --git a/packages/ui/src/locales/pl-PL/index.json b/packages/ui/src/locales/pl-PL/index.json
index 6b58310342..e94c7806ae 100644
--- a/packages/ui/src/locales/pl-PL/index.json
+++ b/packages/ui/src/locales/pl-PL/index.json
@@ -566,6 +566,9 @@
   "content.inline-backup.world-label": {
     "defaultMessage": "Twój świat"
   },
+  "content.modpack-card.installation-settings": {
+    "defaultMessage": "Ustawienia instalacji"
+  },
   "content.page-layout.additional-content": {
     "defaultMessage": "Dodatkowa zawartość"
   },
@@ -1196,6 +1199,9 @@
   "external-files.permissions-card.remove-group": {
     "defaultMessage": "Usuń grupę"
   },
+  "external-files.permissions-card.remove-group-confirmation.description": {
+    "defaultMessage": "Trwale usunie to grupę atrybucji i wszystkie zawarte w niej pliki. Tej akcji nie można cofnąć."
+  },
   "external-files.permissions-card.remove-group-confirmation.title": {
     "defaultMessage": "Usuń {title}?"
   },
@@ -1269,10 +1275,10 @@
     "defaultMessage": "Usuń plik"
   },
   "files.delete-modal.warning.file": {
-    "defaultMessage": "Ten plik zostanie trwale usunięty. Tej akcji nie będzie można cofnąć."
+    "defaultMessage": "Ten plik zostanie trwale usunięty. Tej akcji nie można cofnąć."
   },
   "files.delete-modal.warning.folder": {
-    "defaultMessage": "Ten folder wraz z całą jego zawartością zostanie trwale usunięty. Tej akcji nie będzie można cofnąć."
+    "defaultMessage": "Ten folder wraz z całą jego zawartością zostanie trwale usunięty. Tej akcji nie można cofnąć."
   },
   "files.editor.failed-to-open-text": {
     "defaultMessage": "Nie udało się odczytać danych z pliku."
@@ -2225,6 +2231,9 @@
   "label.details": {
     "defaultMessage": "Szczegóły"
   },
+  "label.discover-content": {
+    "defaultMessage": "Odkrywaj zawartość"
+  },
   "label.done": {
     "defaultMessage": "Gotowe"
   },
@@ -2303,6 +2312,9 @@
   "label.password": {
     "defaultMessage": "Hasło"
   },
+  "label.permissions": {
+    "defaultMessage": "Uprawnienia"
+  },
   "label.plan-custom": {
     "defaultMessage": "Niestandardowy"
   },
@@ -2834,9 +2846,153 @@
   "payment-method.visa": {
     "defaultMessage": "Visa"
   },
+  "profile.bio.fallback.creator": {
+    "defaultMessage": "Twórca na Modrinth."
+  },
+  "profile.bio.fallback.user": {
+    "defaultMessage": "Użytkownik Modrinth."
+  },
+  "profile.block-user.admonition-body": {
+    "defaultMessage": "Użytkownik {username} nie będzie mógł wysyłać ci zaproszeń do znajomych, zapraszać się do udostępnionych instancji lub zapraszać się do serwerów Modrinth Hosting."
+  },
+  "profile.block-user.admonition-title": {
+    "defaultMessage": "Czy na pewno chcesz zablokować tego użytkownika?"
+  },
+  "profile.block-user.error-description": {
+    "defaultMessage": "Wystąpił błąd podczas blokowania tego użytkownika. Spróbuj ponownie później."
+  },
+  "profile.block-user.error-title": {
+    "defaultMessage": "Nie udało się zablokować użytkownika"
+  },
+  "profile.block-user.success-description": {
+    "defaultMessage": "Użytkownik {username} został zablokowany."
+  },
+  "profile.block-user.success-title": {
+    "defaultMessage": "Zablokowano użytkownika"
+  },
+  "profile.block-user.title": {
+    "defaultMessage": "Zablokuj {username}"
+  },
+  "profile.button.analytics": {
+    "defaultMessage": "Pokaż dane analityczne użytkownika"
+  },
+  "profile.button.billing": {
+    "defaultMessage": "Zarządzaj rozliczaniem użytkownika"
+  },
+  "profile.button.block": {
+    "defaultMessage": "Zablokuj"
+  },
+  "profile.button.create-collection": {
+    "defaultMessage": "Utwórz kolekcję"
+  },
+  "profile.button.create-project": {
+    "defaultMessage": "Utwórz projekt"
+  },
+  "profile.button.edit-role": {
+    "defaultMessage": "Edytuj rolę"
+  },
+  "profile.button.info": {
+    "defaultMessage": "Otwórz szczegóły użytkownika"
+  },
+  "profile.button.manage-projects": {
+    "defaultMessage": "Zarządzaj projektami"
+  },
+  "profile.button.unblock": {
+    "defaultMessage": "Odblokuj"
+  },
+  "profile.collection.projects-count": {
+    "defaultMessage": "{count, plural, one {# projekt} few {# projekty} other {# projektów}}"
+  },
+  "profile.details.label.auth-providers": {
+    "defaultMessage": "Dostawcy uwierzytelniania"
+  },
+  "profile.details.label.email-verified": {
+    "defaultMessage": "Zweryfikowano e-mail"
+  },
+  "profile.details.label.has-password": {
+    "defaultMessage": "Ma hasło"
+  },
+  "profile.details.label.has-totp": {
+    "defaultMessage": "Ma TOTP"
+  },
+  "profile.details.label.payment-methods": {
+    "defaultMessage": "Metody płatności"
+  },
+  "profile.details.title": {
+    "defaultMessage": "Szczegóły użytkownika"
+  },
+  "profile.details.tooltip.email-not-verified": {
+    "defaultMessage": "E-mail nie jest zweryfikowany"
+  },
+  "profile.details.tooltip.email-verified": {
+    "defaultMessage": "E-mail jest zweryfikowany"
+  },
+  "profile.error.load-description": {
+    "defaultMessage": "Nie udało się załadować profilu tego użytkownika."
+  },
+  "profile.error.not-found": {
+    "defaultMessage": "Nie znaleziono użytkownika"
+  },
   "profile.label.badges": {
     "defaultMessage": "Odznaki"
   },
+  "profile.label.collection": {
+    "defaultMessage": "Kolekcja"
+  },
+  "profile.label.download-count": {
+    "defaultMessage": "{count, plural, one {pobranie} few {pobrania} other {pobrań}}"
+  },
+  "profile.label.joined": {
+    "defaultMessage": "Dołączył(-a)"
+  },
+  "profile.label.no-collections": {
+    "defaultMessage": "Ten użytkownik nie ma żadnych kolekcji!"
+  },
+  "profile.label.no-collections-auth-description": {
+    "defaultMessage": "Nie masz jeszcze żadnych kolekcji."
+  },
+  "profile.label.no-projects": {
+    "defaultMessage": "Ten użytkownik nie ma żadnych projektów!"
+  },
+  "profile.label.no-projects-auth-description": {
+    "defaultMessage": "Nie masz jeszcze żadnych projektów."
+  },
+  "profile.label.organizations": {
+    "defaultMessage": "Organizacje"
+  },
+  "profile.label.project-count": {
+    "defaultMessage": "{count, plural, one {projekt} few {projekty} other {projektów}}"
+  },
+  "profile.label.saving": {
+    "defaultMessage": "Zapisywanie..."
+  },
+  "profile.official-account": {
+    "defaultMessage": "Oficjalne konto Modrinth"
+  },
+  "profile.official-account.bio": {
+    "defaultMessage": "Oficjalne konto Modrinth. Otrzymaj wsparcie na stronie <support-link></support-link> lub poprzez e-mail <email></email>"
+  },
+  "profile.role.select-placeholder": {
+    "defaultMessage": "Wybierz rolę"
+  },
+  "profile.role.update-error-description": {
+    "defaultMessage": "Wystąpił błąd podczas ustawiania roli tego użytkownika. Spróbuj ponownie później."
+  },
+  "profile.role.update-error-title": {
+    "defaultMessage": "Nie udało się zaktualizować roli"
+  },
+  "profile.unblock-user.error-description": {
+    "defaultMessage": "Wystąpił błąd podczas odblokowywania tego użytkownika. Spróbuj ponownie później."
+  },
+  "profile.unblock-user.error-title": {
+    "defaultMessage": "Nie udało się odblokować użytkownika"
+  },
+  "profile.unblock-user.success-description": {
+    "defaultMessage": "Użytkownik {username} został odblokowany."
+  },
+  "profile.unblock-user.success-title": {
+    "defaultMessage": "Użytkownik odblokowany"
+  },
   "project-card.date.published.tooltip": {
     "defaultMessage": "Opublikowany {date}"
   },
@@ -2864,6 +3020,9 @@
   "project-type.all": {
     "defaultMessage": "Wszystko"
   },
+  "project-type.collection.plural": {
+    "defaultMessage": "Kolekcje"
+  },
   "project-type.datapack.capital": {
     "defaultMessage": "{count, plural, one {Paczka danych} few {Paczki danych} other {Paczek danych}}"
   },
@@ -3134,6 +3293,9 @@
   "project.follower-count-tooltip": {
     "defaultMessage": "{count, number} {count, plural, one {obserwujący} other {obserwujących}}"
   },
+  "project.license.error": {
+    "defaultMessage": "Nie można pobrać tekstu licencji."
+  },
   "project.license.loading": {
     "defaultMessage": "Ładowanie treści licencji..."
   },
@@ -5087,9 +5249,111 @@
   "settings.pats.title": {
     "defaultMessage": "Klucze dostępu osobistego"
   },
+  "settings.profile.bio.description": {
+    "defaultMessage": "Krótki opis, aby powiedzieć wszystkim trochę o Tobie."
+  },
+  "settings.profile.bio.title": {
+    "defaultMessage": "O mnie"
+  },
+  "settings.profile.navigation-title": {
+    "defaultMessage": "Profil"
+  },
+  "settings.profile.profile-picture.title": {
+    "defaultMessage": "Zdjęcie profilowe"
+  },
+  "settings.profile.public-information.description": {
+    "defaultMessage": "Twoje informacje profilowe są publicznie <profile-link>dostępne na Modrinth</profile-link> i poprzez <docs-link>Modrinth API</docs-link>."
+  },
+  "settings.profile.save-error": {
+    "defaultMessage": "Nie udało się zaktualizować profilu"
+  },
+  "settings.profile.save-error-description": {
+    "defaultMessage": "Wystąpił błąd podczas aktualizowania profilu. Spróbuj ponownie później."
+  },
+  "settings.profile.sign-in-required.description": {
+    "defaultMessage": "Zaloguj się na konto Modrinth, by dostosować swój publiczny profil."
+  },
+  "settings.profile.sign-in-required.title": {
+    "defaultMessage": "Wymagane jest konto Modrinth"
+  },
+  "settings.profile.username.description": {
+    "defaultMessage": "Unikatowa bez uwzględniania wielkości liter nazwa identyfikująca Twój profil."
+  },
   "settings.sessions.title": {
     "defaultMessage": "Sesje"
   },
+  "settings.social.blocked-users.column.actions": {
+    "defaultMessage": "Akcje"
+  },
+  "settings.social.blocked-users.column.user": {
+    "defaultMessage": "Użytkownik"
+  },
+  "settings.social.blocked-users.description": {
+    "defaultMessage": "Lista użytkowników zablokowanych na Modrinth. Nie mogą oni:"
+  },
+  "settings.social.blocked-users.empty": {
+    "defaultMessage": "Brak zablokowanych użytkowników."
+  },
+  "settings.social.blocked-users.load-error": {
+    "defaultMessage": "Nie udała się załadować zablokowanych użytkowników."
+  },
+  "settings.social.blocked-users.loading": {
+    "defaultMessage": "Ładowanie zablokowanych użytkowników…"
+  },
+  "settings.social.blocked-users.restriction.friend-requests": {
+    "defaultMessage": "Wysyłać ci zaproszeń do znajomych"
+  },
+  "settings.social.blocked-users.restriction.hosting": {
+    "defaultMessage": "Zapraszać cię do zarządzania serwerem Modrinth Hosting."
+  },
+  "settings.social.blocked-users.restriction.shared-instances": {
+    "defaultMessage": "Zapraszać cię do udostępnionych instancji"
+  },
+  "settings.social.blocked-users.title": {
+    "defaultMessage": "Zablokowani użytkownicy"
+  },
+  "settings.social.blocked-users.unblock": {
+    "defaultMessage": "Odblokuj"
+  },
+  "settings.social.blocked-users.unblock-error": {
+    "defaultMessage": "Nie udało się odblokować użytkownika"
+  },
+  "settings.social.blocked-users.unblock-error-description": {
+    "defaultMessage": "Wystąpił błąd podczas odblokowywania tego użytkownika. Spróbuj ponownie później."
+  },
+  "settings.social.blocked-users.unblock-user": {
+    "defaultMessage": "Odblokuj {username}"
+  },
+  "settings.social.blocked-users.user-avatar": {
+    "defaultMessage": "Awatar użytkownika {username}"
+  },
+  "settings.social.friend-requests.title": {
+    "defaultMessage": "Zaproszenia do znajomych"
+  },
+  "settings.social.interaction-source.coming-soon": {
+    "defaultMessage": "Już wkrótce!"
+  },
+  "settings.social.interaction-source.everyone": {
+    "defaultMessage": "Wszyscy"
+  },
+  "settings.social.interaction-source.friends": {
+    "defaultMessage": "Znajomi"
+  },
+  "settings.social.interaction-source.friends-of-friends": {
+    "defaultMessage": "Znajomi znajomych"
+  },
+  "settings.social.interaction-source.no-one": {
+    "defaultMessage": "Nikt"
+  },
+  "settings.social.shared-instance-invites.title": {
+    "defaultMessage": "Zaproszenia"
+  },
+  "settings.social.sign-in-required.title": {
+    "defaultMessage": "Wymagane jest konto Modrinth"
+  },
+  "settings.social.title": {
+    "defaultMessage": "Społeczne"
+  },
   "sharing.invite-players-modal.add": {
     "defaultMessage": "Dodaj"
   },
@@ -5099,6 +5363,9 @@
   "sharing.invite-players-modal.already-invited": {
     "defaultMessage": "Ten użytkownik został już zaproszony."
   },
+  "sharing.invite-players-modal.apply-button": {
+    "defaultMessage": "Zastosuj"
+  },
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "Awatar użytkownika {username}"
   },
diff --git a/packages/ui/src/locales/pt-BR/index.json b/packages/ui/src/locales/pt-BR/index.json
index 27fb435faf..66ce220ef1 100644
--- a/packages/ui/src/locales/pt-BR/index.json
+++ b/packages/ui/src/locales/pt-BR/index.json
@@ -566,6 +566,9 @@
   "content.inline-backup.world-label": {
     "defaultMessage": "mundo"
   },
+  "content.modpack-card.installation-settings": {
+    "defaultMessage": "Configurações de instalação"
+  },
   "content.page-layout.additional-content": {
     "defaultMessage": "Conteúdo adicional"
   },
@@ -2240,6 +2243,9 @@
   "label.details": {
     "defaultMessage": "Detalhes"
   },
+  "label.discover-content": {
+    "defaultMessage": "Descobrir conteúdo"
+  },
   "label.done": {
     "defaultMessage": "Feito"
   },
@@ -2318,6 +2324,9 @@
   "label.password": {
     "defaultMessage": "Senha"
   },
+  "label.permissions": {
+    "defaultMessage": "Permissões"
+  },
   "label.plan-custom": {
     "defaultMessage": "Personalizado"
   },
@@ -2849,9 +2858,177 @@
   "payment-method.visa": {
     "defaultMessage": "Visa"
   },
+  "profile.bio.fallback.creator": {
+    "defaultMessage": "Um criador Modrinth."
+  },
+  "profile.bio.fallback.user": {
+    "defaultMessage": "Um usuário do Modrinth."
+  },
+  "profile.block-user.admonition-body": {
+    "defaultMessage": "{username} não poderá enviar solicitações de amizade para você, convidar você para instâncias compartilhadas ou convidar você para servidores do Modrinth Hosting."
+  },
+  "profile.block-user.admonition-title": {
+    "defaultMessage": "Deseja mesmo bloquear este usuário?"
+  },
+  "profile.block-user.error-description": {
+    "defaultMessage": "Ocorreu um erro ao bloquear este usuário. Tente novamente."
+  },
+  "profile.block-user.error-title": {
+    "defaultMessage": "Falha ao bloquear usuário"
+  },
+  "profile.block-user.success-description": {
+    "defaultMessage": "{username} bloqueado."
+  },
+  "profile.block-user.success-title": {
+    "defaultMessage": "Usuário bloqueado"
+  },
+  "profile.block-user.title": {
+    "defaultMessage": "Bloquear {username}"
+  },
+  "profile.button.analytics": {
+    "defaultMessage": "Ver estatísticas do usuário"
+  },
+  "profile.button.billing": {
+    "defaultMessage": "Gerenciar cobrança do usuário"
+  },
+  "profile.button.block": {
+    "defaultMessage": "Bloquear"
+  },
+  "profile.button.create-collection": {
+    "defaultMessage": "Criar coleção"
+  },
+  "profile.button.create-project": {
+    "defaultMessage": "Criar projeto"
+  },
+  "profile.button.edit-role": {
+    "defaultMessage": "Editar cargo"
+  },
+  "profile.button.info": {
+    "defaultMessage": "Ver detalhes do usuário"
+  },
+  "profile.button.manage-projects": {
+    "defaultMessage": "Gerenciar projetos"
+  },
+  "profile.button.remove-affiliate": {
+    "defaultMessage": "Remover como afiliado"
+  },
+  "profile.button.set-affiliate": {
+    "defaultMessage": "Definir como afiliado"
+  },
+  "profile.button.unblock": {
+    "defaultMessage": "Desbloquear"
+  },
+  "profile.collection.projects-count": {
+    "defaultMessage": "{count, plural, one {# projeto} other {# projetos}}"
+  },
+  "profile.details.error.github-popup-blocked": {
+    "defaultMessage": "Permita pop-ups para o Modrinth e tente novamente."
+  },
+  "profile.details.error.github-profile-message": {
+    "defaultMessage": "O perfil do GitHub não pode ser recuperado. Tente novamente."
+  },
+  "profile.details.error.github-profile-title": {
+    "defaultMessage": "Não foi possível abrir o perfil do GitHub"
+  },
+  "profile.details.label.auth-providers": {
+    "defaultMessage": "Provedores de autenticação"
+  },
+  "profile.details.label.email-verified": {
+    "defaultMessage": "E-mail verificado"
+  },
+  "profile.details.label.has-password": {
+    "defaultMessage": "Possui senha"
+  },
+  "profile.details.label.has-totp": {
+    "defaultMessage": "Possui TOTP"
+  },
+  "profile.details.label.loading-github-profile": {
+    "defaultMessage": "Carregando..."
+  },
+  "profile.details.label.payment-methods": {
+    "defaultMessage": "Métodos de pagamento"
+  },
+  "profile.details.label.view-github-profile": {
+    "defaultMessage": "Ver perfil"
+  },
+  "profile.details.title": {
+    "defaultMessage": "Detalhes do usuário"
+  },
+  "profile.details.tooltip.email-not-verified": {
+    "defaultMessage": "E-mail não verificado"
+  },
+  "profile.details.tooltip.email-verified": {
+    "defaultMessage": "E-mail verificado"
+  },
+  "profile.error.load-description": {
+    "defaultMessage": "O perfil do usuário não pôde ser carregado."
+  },
+  "profile.error.not-found": {
+    "defaultMessage": "Usuário não encontrado"
+  },
+  "profile.label.affiliate": {
+    "defaultMessage": "Afiliado"
+  },
   "profile.label.badges": {
     "defaultMessage": "Emblemas"
   },
+  "profile.label.collection": {
+    "defaultMessage": "Coleção"
+  },
+  "profile.label.download-count": {
+    "defaultMessage": "{count, plural, one {download} other {downloads}}"
+  },
+  "profile.label.joined": {
+    "defaultMessage": "Entrou"
+  },
+  "profile.label.no-collections": {
+    "defaultMessage": "Este usuário não tem coleções!"
+  },
+  "profile.label.no-collections-auth-description": {
+    "defaultMessage": "Você ainda não tem nenhuma coleção."
+  },
+  "profile.label.no-projects": {
+    "defaultMessage": "Este usuário não tem projetos!"
+  },
+  "profile.label.no-projects-auth-description": {
+    "defaultMessage": "Você ainda não tem projetos."
+  },
+  "profile.label.organizations": {
+    "defaultMessage": "Organizações"
+  },
+  "profile.label.project-count": {
+    "defaultMessage": "{count, plural, one {projeto} other {projetos}}"
+  },
+  "profile.label.saving": {
+    "defaultMessage": "Salvando..."
+  },
+  "profile.official-account": {
+    "defaultMessage": "Conta oficial do Modrinth"
+  },
+  "profile.official-account.bio": {
+    "defaultMessage": "Conta oficial do Modrinth. Obtenha suporte em<support-link></support-link> ou por e-mail via <email></email>"
+  },
+  "profile.role.select-placeholder": {
+    "defaultMessage": "Selecione um cargo"
+  },
+  "profile.role.update-error-description": {
+    "defaultMessage": "Ocorreu um erro ao atualizar o cargo do usuário. Tente novamente."
+  },
+  "profile.role.update-error-title": {
+    "defaultMessage": "Falha ao atualizar cargo"
+  },
+  "profile.unblock-user.error-description": {
+    "defaultMessage": "Ocorreu um erro ao desbloquear este usuário. Tente novamente."
+  },
+  "profile.unblock-user.error-title": {
+    "defaultMessage": "Falha ao desbloquear usuário"
+  },
+  "profile.unblock-user.success-description": {
+    "defaultMessage": "{username} desbloqueado."
+  },
+  "profile.unblock-user.success-title": {
+    "defaultMessage": "Usuário desbloqueado"
+  },
   "project-card.date.published.tooltip": {
     "defaultMessage": "Publicado {date}"
   },
@@ -2879,6 +3056,9 @@
   "project-type.all": {
     "defaultMessage": "Todos"
   },
+  "project-type.collection.plural": {
+    "defaultMessage": "Coleções"
+  },
   "project-type.datapack.capital": {
     "defaultMessage": "{count, plural, one {Pacote de dados} other {Pacotes de dados}}"
   },
@@ -3159,7 +3339,10 @@
     "defaultMessage": "Licença"
   },
   "project.online-player-count": {
-    "defaultMessage": "{count, plural, =0 {Ninguém online} other {{count} online}}"
+    "defaultMessage": "{count, number} online"
+  },
+  "project.online-player-count.tooltip": {
+    "defaultMessage": "{count} {countPlural, plural, one {jogador} other {jogadores}} online"
   },
   "project.recent-plays": {
     "defaultMessage": "{countPlural, plural, =0 {Nenhuma entrada recente} one {{count} entrada recente} other {{count} entradas recentes}}"
@@ -5102,9 +5285,120 @@
   "settings.pats.title": {
     "defaultMessage": "Token de acesso pessoal"
   },
+  "settings.profile.bio.description": {
+    "defaultMessage": "Uma breve descrição para falar um pouco sobre você para todos."
+  },
+  "settings.profile.bio.title": {
+    "defaultMessage": "Sobre"
+  },
+  "settings.profile.navigation-title": {
+    "defaultMessage": "Perfil"
+  },
+  "settings.profile.profile-picture.title": {
+    "defaultMessage": "Foto de perfil"
+  },
+  "settings.profile.public-information.description": {
+    "defaultMessage": "As informações do seu perfil são visíveis <profile-link>publicamente no Modrinth</profile-link> e através da <docs-link>API do Modrinth</docs-link>."
+  },
+  "settings.profile.save-error": {
+    "defaultMessage": "Falha ao atualizar o perfil"
+  },
+  "settings.profile.save-error-description": {
+    "defaultMessage": "Ocorreu um erro ao atualizar seu perfil. Tente novamente."
+  },
+  "settings.profile.sign-in-required.description": {
+    "defaultMessage": "Inicie sessão com uma conta Modrinth para personalizar seu perfil público."
+  },
+  "settings.profile.sign-in-required.title": {
+    "defaultMessage": "Conta Modrinth necessária"
+  },
+  "settings.profile.username.description": {
+    "defaultMessage": "Um nome único sem distinção de maiúsculas e minúsculas para identificar o seu perfil."
+  },
   "settings.sessions.title": {
     "defaultMessage": "Sessões"
   },
+  "settings.social.blocked-users.column.actions": {
+    "defaultMessage": "Ações"
+  },
+  "settings.social.blocked-users.column.user": {
+    "defaultMessage": "Usuário"
+  },
+  "settings.social.blocked-users.description": {
+    "defaultMessage": "Estes são os usuários que você bloqueou no Modrinth. Eles não poderão:"
+  },
+  "settings.social.blocked-users.empty": {
+    "defaultMessage": "Você não bloqueou ninguém."
+  },
+  "settings.social.blocked-users.load-error": {
+    "defaultMessage": "Os usuários bloqueados não puderam ser carregados."
+  },
+  "settings.social.blocked-users.loading": {
+    "defaultMessage": "Carregando usuários bloqueados…"
+  },
+  "settings.social.blocked-users.restriction.friend-requests": {
+    "defaultMessage": "Enviar solicitações de amizade"
+  },
+  "settings.social.blocked-users.restriction.hosting": {
+    "defaultMessage": "Convidar você para gerenciar um servidor Modrinth Hosting."
+  },
+  "settings.social.blocked-users.restriction.shared-instances": {
+    "defaultMessage": "Convidar você para instâncias compartilhadas"
+  },
+  "settings.social.blocked-users.title": {
+    "defaultMessage": "Usuários bloqueados"
+  },
+  "settings.social.blocked-users.unblock": {
+    "defaultMessage": "Desbloquear"
+  },
+  "settings.social.blocked-users.unblock-error": {
+    "defaultMessage": "Falha ao desbloquear usuário"
+  },
+  "settings.social.blocked-users.unblock-error-description": {
+    "defaultMessage": "Ocorreu um erro ao desbloquear este usuário. Tente novamente."
+  },
+  "settings.social.blocked-users.unblock-user": {
+    "defaultMessage": "Desbloquear {username}"
+  },
+  "settings.social.blocked-users.user-avatar": {
+    "defaultMessage": "Foto de perfil de {username}"
+  },
+  "settings.social.friend-requests.description": {
+    "defaultMessage": "Controle quem pode enviá-lo solicitações de amizade no Modrinth."
+  },
+  "settings.social.friend-requests.title": {
+    "defaultMessage": "Solicitações de amizade"
+  },
+  "settings.social.interaction-source.coming-soon": {
+    "defaultMessage": "Em breve!"
+  },
+  "settings.social.interaction-source.everyone": {
+    "defaultMessage": "Todos"
+  },
+  "settings.social.interaction-source.friends": {
+    "defaultMessage": "Amigos"
+  },
+  "settings.social.interaction-source.friends-of-friends": {
+    "defaultMessage": "Amigos de amigos"
+  },
+  "settings.social.interaction-source.no-one": {
+    "defaultMessage": "Ninguém"
+  },
+  "settings.social.shared-instance-invites.description": {
+    "defaultMessage": "Controle quem pode enviá-lo convites a instâncias compartilhadas e painéis do Modrinth Hosting."
+  },
+  "settings.social.shared-instance-invites.title": {
+    "defaultMessage": "Convites"
+  },
+  "settings.social.sign-in-required.description": {
+    "defaultMessage": "Você pode controlar quem interagir com você e gerenciar usuários bloqueados com uma conta Modrinth"
+  },
+  "settings.social.sign-in-required.title": {
+    "defaultMessage": "Conta Modrinth necessária"
+  },
+  "settings.social.title": {
+    "defaultMessage": "Social"
+  },
   "sharing.invite-players-modal.add": {
     "defaultMessage": "Adicionar"
   },
@@ -5114,6 +5408,9 @@
   "sharing.invite-players-modal.already-invited": {
     "defaultMessage": "Este usuário já foi convidado."
   },
+  "sharing.invite-players-modal.apply-button": {
+    "defaultMessage": "Aplicar"
+  },
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "Avatar de {username}"
   },
@@ -5123,12 +5420,36 @@
   "sharing.invite-players-modal.cancel-button": {
     "defaultMessage": "Cancelar"
   },
+  "sharing.invite-players-modal.custom-expiry": {
+    "defaultMessage": "Personalizado..."
+  },
+  "sharing.invite-players-modal.custom-expiry-value": {
+    "defaultMessage": "Personalizado: {date}"
+  },
   "sharing.invite-players-modal.edit-invite-link": {
     "defaultMessage": "Editar link de convite."
   },
   "sharing.invite-players-modal.edit-invite-link-title": {
     "defaultMessage": "Editar link de convite"
   },
+  "sharing.invite-players-modal.expiry-in-one-day": {
+    "defaultMessage": "Em 1 dia"
+  },
+  "sharing.invite-players-modal.expiry-in-one-hour": {
+    "defaultMessage": "Em 1 hora"
+  },
+  "sharing.invite-players-modal.expiry-in-seven-days": {
+    "defaultMessage": "Em 7 dias"
+  },
+  "sharing.invite-players-modal.expiry-in-six-hours": {
+    "defaultMessage": "Em 6 horas"
+  },
+  "sharing.invite-players-modal.expiry-in-three-days": {
+    "defaultMessage": "Em 3 dias"
+  },
+  "sharing.invite-players-modal.expiry-in-twelve-hours": {
+    "defaultMessage": "Em 12 horas"
+  },
   "sharing.invite-players-modal.expiry-label": {
     "defaultMessage": "Data de expiração"
   },
@@ -5934,3 +6255,4 @@
     "defaultMessage": "Tipo"
   }
 }
+
diff --git a/packages/ui/src/locales/pt-PT/index.json b/packages/ui/src/locales/pt-PT/index.json
index f27ed83e44..a0e28dd70f 100644
--- a/packages/ui/src/locales/pt-PT/index.json
+++ b/packages/ui/src/locales/pt-PT/index.json
@@ -2526,3 +2526,4 @@
     "defaultMessage": "Tens alterações por guardar."
   }
 }
+
diff --git a/packages/ui/src/locales/ru-RU/index.json b/packages/ui/src/locales/ru-RU/index.json
index 072d67b335..02cfd73fea 100644
--- a/packages/ui/src/locales/ru-RU/index.json
+++ b/packages/ui/src/locales/ru-RU/index.json
@@ -471,13 +471,13 @@
     "defaultMessage": "Загрузчик"
   },
   "content.diff-modal.modpack-linked": {
-    "defaultMessage": "Связанная сборка"
+    "defaultMessage": "Привязана сборка"
   },
   "content.diff-modal.modpack-unlinked": {
-    "defaultMessage": "Несвязанная сборка"
+    "defaultMessage": "Отвязана сборка"
   },
   "content.diff-modal.modpack-updated": {
-    "defaultMessage": "Обновлённая сборка"
+    "defaultMessage": "Обновлена сборка"
   },
   "content.diff-modal.no-content-changes": {
     "defaultMessage": "Без изменений"
@@ -536,6 +536,9 @@
   "content.inline-backup.world-label": {
     "defaultMessage": "мир"
   },
+  "content.modpack-card.installation-settings": {
+    "defaultMessage": "Настройки установки"
+  },
   "content.page-layout.additional-content": {
     "defaultMessage": "Дополнительный контент"
   },
@@ -846,7 +849,7 @@
     "defaultMessage": "Начать с нуля, выбрав загрузчик и версию игры."
   },
   "creation-flow.modal.setup-type.option.custom-setup.title": {
-    "defaultMessage": "Пользовательская настройка"
+    "defaultMessage": "Собственная настройка"
   },
   "creation-flow.modal.setup-type.option.import-instance.description": {
     "defaultMessage": "Импортировать сборку из Prism, CurseForge, или похожего лаунчера."
@@ -2156,6 +2159,9 @@
   "label.details": {
     "defaultMessage": "Сведения"
   },
+  "label.discover-content": {
+    "defaultMessage": "Найти проекты"
+  },
   "label.done": {
     "defaultMessage": "Готово"
   },
@@ -2234,6 +2240,9 @@
   "label.password": {
     "defaultMessage": "Пароль"
   },
+  "label.permissions": {
+    "defaultMessage": "Разрешения"
+  },
   "label.plan-custom": {
     "defaultMessage": "Свой"
   },
@@ -2762,9 +2771,177 @@
   "payment-method.visa": {
     "defaultMessage": "Visa"
   },
+  "profile.bio.fallback.creator": {
+    "defaultMessage": "Автор на Modrinth."
+  },
+  "profile.bio.fallback.user": {
+    "defaultMessage": "Пользователь Modrinth."
+  },
+  "profile.block-user.admonition-body": {
+    "defaultMessage": "{username} не сможет отправлять вам запросы в друзья, приглашать вас в сборки или приглашать вас управлять сервером Modrinth Hosting."
+  },
+  "profile.block-user.admonition-title": {
+    "defaultMessage": "Вы действительно хотите заблокировать этого пользователя?"
+  },
+  "profile.block-user.error-description": {
+    "defaultMessage": "Произошла ошибка при блокировке пользователя. Попробуйте снова."
+  },
+  "profile.block-user.error-title": {
+    "defaultMessage": "Не удалось заблокировать"
+  },
+  "profile.block-user.success-description": {
+    "defaultMessage": "{username} заблокирован."
+  },
+  "profile.block-user.success-title": {
+    "defaultMessage": "Пользователь заблокирован"
+  },
+  "profile.block-user.title": {
+    "defaultMessage": "Заблокировать {username}"
+  },
+  "profile.button.analytics": {
+    "defaultMessage": "Посмотреть аналитику"
+  },
+  "profile.button.billing": {
+    "defaultMessage": "Управление платежами"
+  },
+  "profile.button.block": {
+    "defaultMessage": "Заблокировать"
+  },
+  "profile.button.create-collection": {
+    "defaultMessage": "Создать коллекцию"
+  },
+  "profile.button.create-project": {
+    "defaultMessage": "Создать проект"
+  },
+  "profile.button.edit-role": {
+    "defaultMessage": "Настройка роли"
+  },
+  "profile.button.info": {
+    "defaultMessage": "Посмотреть подробности"
+  },
+  "profile.button.manage-projects": {
+    "defaultMessage": "Управление проектами"
+  },
+  "profile.button.remove-affiliate": {
+    "defaultMessage": "Убрать из партнёров"
+  },
+  "profile.button.set-affiliate": {
+    "defaultMessage": "Сделать партнёром"
+  },
+  "profile.button.unblock": {
+    "defaultMessage": "Разблокировать"
+  },
+  "profile.collection.projects-count": {
+    "defaultMessage": "{count, plural, one {# проект} few {# проекта} other {# проектов}}"
+  },
+  "profile.details.error.github-popup-blocked": {
+    "defaultMessage": "Разрешите всплывающие окна для Modrinth и повторите попытку."
+  },
+  "profile.details.error.github-profile-message": {
+    "defaultMessage": "Не удалось получить профиль GitHub. Повторите попытку."
+  },
+  "profile.details.error.github-profile-title": {
+    "defaultMessage": "Не удалось открыть профиль GitHub"
+  },
+  "profile.details.label.auth-providers": {
+    "defaultMessage": "Сервисы входа"
+  },
+  "profile.details.label.email-verified": {
+    "defaultMessage": "Почта подтверждена"
+  },
+  "profile.details.label.has-password": {
+    "defaultMessage": "Есть пароль"
+  },
+  "profile.details.label.has-totp": {
+    "defaultMessage": "Есть TOTP"
+  },
+  "profile.details.label.loading-github-profile": {
+    "defaultMessage": "Загрузка..."
+  },
+  "profile.details.label.payment-methods": {
+    "defaultMessage": "Способы оплаты"
+  },
+  "profile.details.label.view-github-profile": {
+    "defaultMessage": "Посмотреть профиль"
+  },
+  "profile.details.title": {
+    "defaultMessage": "О пользователе"
+  },
+  "profile.details.tooltip.email-not-verified": {
+    "defaultMessage": "Почта не подтверждена"
+  },
+  "profile.details.tooltip.email-verified": {
+    "defaultMessage": "Почта подтверждена"
+  },
+  "profile.error.load-description": {
+    "defaultMessage": "Не удалось загрузить профиль."
+  },
+  "profile.error.not-found": {
+    "defaultMessage": "Пользователь не найден"
+  },
+  "profile.label.affiliate": {
+    "defaultMessage": "Партнёр"
+  },
   "profile.label.badges": {
     "defaultMessage": "Значки"
   },
+  "profile.label.collection": {
+    "defaultMessage": "Коллекция"
+  },
+  "profile.label.download-count": {
+    "defaultMessage": "{count, plural, one {скачивание} few {скачивания} other {скачиваний}}"
+  },
+  "profile.label.joined": {
+    "defaultMessage": "Регистрация:"
+  },
+  "profile.label.no-collections": {
+    "defaultMessage": "У этого пользователя нет коллекций!"
+  },
+  "profile.label.no-collections-auth-description": {
+    "defaultMessage": "Коллекций пока нет."
+  },
+  "profile.label.no-projects": {
+    "defaultMessage": "У этого пользователя нет проектов!"
+  },
+  "profile.label.no-projects-auth-description": {
+    "defaultMessage": "Проектов пока нет."
+  },
+  "profile.label.organizations": {
+    "defaultMessage": "Организации"
+  },
+  "profile.label.project-count": {
+    "defaultMessage": "{count, plural, one {проект} few {проекта} other {проектов}}"
+  },
+  "profile.label.saving": {
+    "defaultMessage": "Сохранение..."
+  },
+  "profile.official-account": {
+    "defaultMessage": "Официальный аккаунт Modrinth"
+  },
+  "profile.official-account.bio": {
+    "defaultMessage": "Официальный аккаунт Modrinth. Связь с поддержкой: <support-link></support-link> или по почте <email></email>"
+  },
+  "profile.role.select-placeholder": {
+    "defaultMessage": "Выберите роль"
+  },
+  "profile.role.update-error-description": {
+    "defaultMessage": "Произошла ошибка при обновлении роли. Попробуйте снова."
+  },
+  "profile.role.update-error-title": {
+    "defaultMessage": "Не удалось обновить роль"
+  },
+  "profile.unblock-user.error-description": {
+    "defaultMessage": "Произошла ошибка при разблокировке пользователя. Попробуйте снова."
+  },
+  "profile.unblock-user.error-title": {
+    "defaultMessage": "Не удалось разблокировать"
+  },
+  "profile.unblock-user.success-description": {
+    "defaultMessage": "{username} разблокирован."
+  },
+  "profile.unblock-user.success-title": {
+    "defaultMessage": "Пользователь разблокирован"
+  },
   "project-card.date.published.tooltip": {
     "defaultMessage": "Опубликован {date}"
   },
@@ -2792,6 +2969,9 @@
   "project-type.all": {
     "defaultMessage": "Всё"
   },
+  "project-type.collection.plural": {
+    "defaultMessage": "Коллекции"
+  },
   "project-type.datapack.capital": {
     "defaultMessage": "{count, plural, one {набор данных} few {набора данных} other {наборов данных}}"
   },
@@ -4746,7 +4926,7 @@
     "defaultMessage": "Способ оплаты"
   },
   "servers.purchase.step.plan.billed": {
-    "defaultMessage": "оплата {interval, select, monthly {ежемесячно} quarterly {ежеквартально} yearly {ежегодно} other {{interval}}}"
+    "defaultMessage": "{interval, select, monthly {за месяц} quarterly {за 3 месяца} yearly {за год} other {billed {interval}}}"
   },
   "servers.purchase.step.plan.billing-subtitle": {
     "defaultMessage": "Доступно в Северной Америке, Европе и Юго‑Восточной Азии."
@@ -5018,9 +5198,120 @@
   "settings.pats.title": {
     "defaultMessage": "Личные токены доступа"
   },
+  "settings.profile.bio.description": {
+    "defaultMessage": "Возможность кратко рассказать всем о себе."
+  },
+  "settings.profile.bio.title": {
+    "defaultMessage": "О себе"
+  },
+  "settings.profile.navigation-title": {
+    "defaultMessage": "Профиль"
+  },
+  "settings.profile.profile-picture.title": {
+    "defaultMessage": "Изображение профиля"
+  },
+  "settings.profile.public-information.description": {
+    "defaultMessage": "Информация в вашем профиле <profile-link>доступна публично на Modrinth</profile-link> и через <docs-link>API Modrinth</docs-link>."
+  },
+  "settings.profile.save-error": {
+    "defaultMessage": "Не удалось обновить профиль"
+  },
+  "settings.profile.save-error-description": {
+    "defaultMessage": "Произошла ошибка при обновлении профиля. Попробуйте снова."
+  },
+  "settings.profile.sign-in-required.description": {
+    "defaultMessage": "Войдите в аккаунт Modrinth для кастомизации вашего публичного профиля."
+  },
+  "settings.profile.sign-in-required.title": {
+    "defaultMessage": "Требуется аккаунт Modrinth"
+  },
+  "settings.profile.username.description": {
+    "defaultMessage": "Уникальное имя для идентификации профиля."
+  },
   "settings.sessions.title": {
     "defaultMessage": "Сеансы"
   },
+  "settings.social.blocked-users.column.actions": {
+    "defaultMessage": "Действия"
+  },
+  "settings.social.blocked-users.column.user": {
+    "defaultMessage": "Пользователь"
+  },
+  "settings.social.blocked-users.description": {
+    "defaultMessage": "Это пользователи, которых вы заблокировали на Modrinth. Они не могут:"
+  },
+  "settings.social.blocked-users.empty": {
+    "defaultMessage": "Вы никого не заблокировали."
+  },
+  "settings.social.blocked-users.load-error": {
+    "defaultMessage": "Заблокированные пользователи не загрузились."
+  },
+  "settings.social.blocked-users.loading": {
+    "defaultMessage": "Загрузка заблокированных пользователей..."
+  },
+  "settings.social.blocked-users.restriction.friend-requests": {
+    "defaultMessage": "Отправлять вам запросы в друзья"
+  },
+  "settings.social.blocked-users.restriction.hosting": {
+    "defaultMessage": "Приглашать вас управлять сервером Modrinth Hosting."
+  },
+  "settings.social.blocked-users.restriction.shared-instances": {
+    "defaultMessage": "Приглашать вас в сборки"
+  },
+  "settings.social.blocked-users.title": {
+    "defaultMessage": "Заблокированные пользователи"
+  },
+  "settings.social.blocked-users.unblock": {
+    "defaultMessage": "Разблокировать"
+  },
+  "settings.social.blocked-users.unblock-error": {
+    "defaultMessage": "Не удалось разблокировать"
+  },
+  "settings.social.blocked-users.unblock-error-description": {
+    "defaultMessage": "Произошла ошибка при разблокировке пользователя. Попробуйте снова."
+  },
+  "settings.social.blocked-users.unblock-user": {
+    "defaultMessage": "Разблокировать {username}"
+  },
+  "settings.social.blocked-users.user-avatar": {
+    "defaultMessage": "Аватар {username}"
+  },
+  "settings.social.friend-requests.description": {
+    "defaultMessage": "Настройте, кто может отправить вам заявку в друзья на Modrinth."
+  },
+  "settings.social.friend-requests.title": {
+    "defaultMessage": "Запросы в друзья"
+  },
+  "settings.social.interaction-source.coming-soon": {
+    "defaultMessage": "Скоро будет!"
+  },
+  "settings.social.interaction-source.everyone": {
+    "defaultMessage": "Каждый"
+  },
+  "settings.social.interaction-source.friends": {
+    "defaultMessage": "Друзья"
+  },
+  "settings.social.interaction-source.friends-of-friends": {
+    "defaultMessage": "Друзья друзей"
+  },
+  "settings.social.interaction-source.no-one": {
+    "defaultMessage": "Никто"
+  },
+  "settings.social.shared-instance-invites.description": {
+    "defaultMessage": "Настройте, кто вам может отправить заявку на общие сборки и панели Modrinth Hosting."
+  },
+  "settings.social.shared-instance-invites.title": {
+    "defaultMessage": "Приглашения"
+  },
+  "settings.social.sign-in-required.description": {
+    "defaultMessage": "С помощью аккаунта Modrinth, вы можете настраивать кто может взаимодействовать с вами, а также управлять заблокированными пользователями"
+  },
+  "settings.social.sign-in-required.title": {
+    "defaultMessage": "Требуется аккаунт Modrinth"
+  },
+  "settings.social.title": {
+    "defaultMessage": "Общение"
+  },
   "sharing.invite-players-modal.add": {
     "defaultMessage": "Добавить"
   },
@@ -5030,6 +5321,9 @@
   "sharing.invite-players-modal.already-invited": {
     "defaultMessage": "Этот пользователь уже приглашён."
   },
+  "sharing.invite-players-modal.apply-button": {
+    "defaultMessage": "Применить"
+  },
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "Аватар {username}"
   },
@@ -5039,12 +5333,36 @@
   "sharing.invite-players-modal.cancel-button": {
     "defaultMessage": "Отмена"
   },
+  "sharing.invite-players-modal.custom-expiry": {
+    "defaultMessage": "Другое..."
+  },
+  "sharing.invite-players-modal.custom-expiry-value": {
+    "defaultMessage": "Другое: {date}"
+  },
   "sharing.invite-players-modal.edit-invite-link": {
     "defaultMessage": "Настроить ссылку."
   },
   "sharing.invite-players-modal.edit-invite-link-title": {
     "defaultMessage": "Настройка ссылки"
   },
+  "sharing.invite-players-modal.expiry-in-one-day": {
+    "defaultMessage": "1 день"
+  },
+  "sharing.invite-players-modal.expiry-in-one-hour": {
+    "defaultMessage": "1 час"
+  },
+  "sharing.invite-players-modal.expiry-in-seven-days": {
+    "defaultMessage": "7 дней"
+  },
+  "sharing.invite-players-modal.expiry-in-six-hours": {
+    "defaultMessage": "6 часов"
+  },
+  "sharing.invite-players-modal.expiry-in-three-days": {
+    "defaultMessage": "3 дня"
+  },
+  "sharing.invite-players-modal.expiry-in-twelve-hours": {
+    "defaultMessage": "12 часов"
+  },
   "sharing.invite-players-modal.expiry-label": {
     "defaultMessage": "Срок действия"
   },
diff --git a/packages/ui/src/locales/sr-CS/index.json b/packages/ui/src/locales/sr-CS/index.json
index 6117939c7d..ab8bd7321c 100644
--- a/packages/ui/src/locales/sr-CS/index.json
+++ b/packages/ui/src/locales/sr-CS/index.json
@@ -5784,3 +5784,4 @@
     "defaultMessage": "Tip"
   }
 }
+
diff --git a/packages/ui/src/locales/sv-SE/index.json b/packages/ui/src/locales/sv-SE/index.json
index fa83bc14dd..7bddb0ed35 100644
--- a/packages/ui/src/locales/sv-SE/index.json
+++ b/packages/ui/src/locales/sv-SE/index.json
@@ -377,6 +377,9 @@
   "content.confirm-deletion.header": {
     "defaultMessage": "Radera {itemType}"
   },
+  "content.confirm-disable.header": {
+    "defaultMessage": "Inaktivera {itemType}"
+  },
   "content.confirm-modpack-update.admonition-body": {
     "defaultMessage": "Att {action, select, downgrade {nedgradera} other {uppdatera}} kan orsaka kompatibilitetsproblem. Moddar eller innehåller du själv lagt till kommer behållas, men är kanske inte kompatibel med den nya versionen."
   },
@@ -455,6 +458,9 @@
   "content.diff-modal.diff-type.removed": {
     "defaultMessage": "Inaktiverade"
   },
+  "content.diff-modal.diff-type.removed-disabled": {
+    "defaultMessage": "Tog bort (inaktiverad)"
+  },
   "content.diff-modal.diff-type.updated": {
     "defaultMessage": "Uppdaterade"
   },
@@ -470,12 +476,24 @@
   "content.diff-modal.external-diff-type.updated": {
     "defaultMessage": "Uppdaterad"
   },
+  "content.diff-modal.file-count": {
+    "defaultMessage": "{count, plural, one {# fil} other {# filer}}"
+  },
   "content.diff-modal.game-version-updated": {
     "defaultMessage": "Spelversion"
   },
   "content.diff-modal.install-anyway": {
     "defaultMessage": "Installera ändå"
   },
+  "content.diff-modal.modpack-linked": {
+    "defaultMessage": "Länkat modpaket"
+  },
+  "content.diff-modal.modpack-unlinked": {
+    "defaultMessage": "Avlänkat modpaket"
+  },
+  "content.diff-modal.modpack-updated": {
+    "defaultMessage": "Uppdaterat modpaket"
+  },
   "content.diff-modal.no-content-changes": {
     "defaultMessage": "Inga innehållsändringar"
   },
@@ -869,9 +887,15 @@
   "creation-flow.title.reset-server": {
     "defaultMessage": "Starta om server"
   },
+  "creation-flow.title.set-up-server": {
+    "defaultMessage": "Ställ in server"
+  },
   "external-files.permissions-card.add-files-modal.confirm": {
     "defaultMessage": "Lägg till {count, plural, one {# fil} other {# filer}}"
   },
+  "external-files.permissions-card.add-files-modal.load-error.title": {
+    "defaultMessage": "Kunde inte ladda filer"
+  },
   "external-files.permissions-card.add-files-modal.no-search-results": {
     "defaultMessage": "Inga filer matchade din sökning."
   },
@@ -896,9 +920,15 @@
   "external-files.permissions-card.attribution.moderation-status.passed": {
     "defaultMessage": "Godkänd"
   },
+  "external-files.permissions-card.badge.no-permission": {
+    "defaultMessage": "Ingen tillåtelse"
+  },
   "external-files.permissions-card.badge.not-allowed": {
     "defaultMessage": "Inte tillåten"
   },
+  "external-files.permissions-card.badge.pending": {
+    "defaultMessage": "Väntar"
+  },
   "external-files.permissions-card.custom-license-option": {
     "defaultMessage": "Annan"
   },
@@ -962,6 +992,12 @@
   "external-files.permissions-card.file-count": {
     "defaultMessage": "{count, plural, one {# fil} other {# filer}}"
   },
+  "external-files.permissions-card.included-files": {
+    "defaultMessage": "Inkluderade filer:"
+  },
+  "external-files.permissions-card.included-in-versions": {
+    "defaultMessage": "Inkuderad i {count, plural, one {# verion} other {# versioner}}:"
+  },
   "external-files.permissions-card.last-updated": {
     "defaultMessage": "Senast uppdaterad den {date} av {user}"
   },
@@ -1010,6 +1046,18 @@
   "external-files.permissions-card.reason.special-permission.description": {
     "defaultMessage": "Du har erhållit speciell tillåtelse för att distribuera detta verk i ditt modpaket."
   },
+  "external-files.permissions-card.remove-group": {
+    "defaultMessage": "Radera grupp"
+  },
+  "external-files.permissions-card.remove-group-confirmation.title": {
+    "defaultMessage": "Radera {title}?"
+  },
+  "external-files.permissions-card.remove-group-error.title": {
+    "defaultMessage": "Kunde inte radera grupp"
+  },
+  "external-files.permissions-card.remove-group-shift-hint": {
+    "defaultMessage": "Håll skift medan du klickar för att hoppa över bekräftelsen."
+  },
   "external-files.permissions-card.split-file": {
     "defaultMessage": "Ta bort från grupp"
   },
@@ -1145,12 +1193,18 @@
   "files.image_viewer.image_too_large": {
     "defaultMessage": "Bilden är för stor för att se (högst {maxDimension}x{maxDimension} pixlar)"
   },
+  "files.image_viewer.invalid_image": {
+    "defaultMessage": "Ogiltig eller tom bildfil."
+  },
   "files.image_viewer.load_failed": {
     "defaultMessage": "Kunde inte ladda bilden"
   },
   "files.image_viewer.reset_zoom": {
     "defaultMessage": "Återställ zoom"
   },
+  "files.image_viewer.viewed_image_alt": {
+    "defaultMessage": "Visad bild"
+  },
   "files.image_viewer.zoom_in": {
     "defaultMessage": "Zooma in"
   },
@@ -1190,6 +1244,9 @@
   "files.move-modal.header": {
     "defaultMessage": "Flytta {type}"
   },
+  "files.navbar.back-to-home": {
+    "defaultMessage": "Tillbaka hem"
+  },
   "files.navbar.breadcrumb-navigation": {
     "defaultMessage": "Länkstigsnavigering"
   },
@@ -1220,9 +1277,24 @@
   "files.navbar.upload-from-zip": {
     "defaultMessage": "Ladda upp .zip-fil"
   },
+  "files.navbar.upload-from-zip-url": {
+    "defaultMessage": "Uppladdad från .zip-URL"
+  },
   "files.operations.current-file": {
     "defaultMessage": "Nuvarande fil: {file}"
   },
+  "files.operations.extracted": {
+    "defaultMessage": "{size} packas upp"
+  },
+  "files.operations.extracting": {
+    "defaultMessage": "Packar upp {source}"
+  },
+  "files.operations.extracting-completed": {
+    "defaultMessage": "Uppackning {source} slutförd"
+  },
+  "files.operations.extracting-failed": {
+    "defaultMessage": "Uppackning {source} misslyckad"
+  },
   "files.operations.modpack-from-url": {
     "defaultMessage": "modpaket från en webbadress"
   },
@@ -1437,7 +1509,7 @@
     "defaultMessage": "Prestandapåverkan"
   },
   "header.category.resolutions": {
-    "defaultMessage": "Kvalitet"
+    "defaultMessage": "Upplösning"
   },
   "hosting.content.failed-to-bulk-delete": {
     "defaultMessage": "Kunde inte radera innehållet"
@@ -1496,6 +1568,9 @@
   "hosting.loader.loader-version": {
     "defaultMessage": "{loader, select, null {Loader} other {{loader}}} version"
   },
+  "hosting.loader.reset-server": {
+    "defaultMessage": "Återställ server"
+  },
   "hosting.specs.burst": {
     "defaultMessage": "Ökar upp till {cpus} CPU:er"
   },
@@ -1571,9 +1646,15 @@
   "installation-settings.incompatible-content.auto-fix-button": {
     "defaultMessage": "Auto-fix"
   },
+  "installation-settings.linked-instance.title": {
+    "defaultMessage": "Länkat {projectType}"
+  },
   "installation-settings.linked.modpack": {
     "defaultMessage": "modpaket"
   },
+  "installation-settings.linked.server-project": {
+    "defaultMessage": "serverprojekt"
+  },
   "installation-settings.loader-version": {
     "defaultMessage": "{loader} version"
   },
@@ -1581,7 +1662,7 @@
     "defaultMessage": "Du kommer att behöva ställa om din server för att ändra loader."
   },
   "installation-settings.reinstall-modpack.description": {
-    "defaultMessage": "Ominstallering av modpaketet återställer {type} innehåll till dess ursprungliga skick, vilket tar bort moddar eller innehåll du lagt till."
+    "defaultMessage": "Ominstallering av modpaketet återställer {type}innehållet till dess ursprungliga skick, vilket tar bort moddar eller innehåll du lagt till."
   },
   "installation-settings.reinstall-modpack.title": {
     "defaultMessage": "Ominstallera modpaket"
@@ -1715,6 +1796,9 @@
   "instances.modpack-content-modal.empty-title": {
     "defaultMessage": "Inget innehåll hittades"
   },
+  "instances.modpack-content-modal.external-content-description": {
+    "defaultMessage": "Den här filen är inte publiserad på Modrinth."
+  },
   "instances.modpack-content-modal.header": {
     "defaultMessage": "Modpaketets innehåll"
   },
@@ -1724,6 +1808,9 @@
   "instances.modpack-content-modal.no-results": {
     "defaultMessage": "Inga projekt matchar din sökning."
   },
+  "instances.modpack-content-modal.open-in-slicer": {
+    "defaultMessage": "Öppna i Slicer"
+  },
   "instances.modpack-content-modal.search-placeholder": {
     "defaultMessage": "Sök genom {count, number} projekt"
   },
@@ -1823,6 +1910,9 @@
   "label.copied-path": {
     "defaultMessage": "Kopiera sökväg"
   },
+  "label.create-failed": {
+    "defaultMessage": "Skapning misslyckades"
+  },
   "label.created-ago": {
     "defaultMessage": "Skapad {ago}"
   },
@@ -1844,6 +1934,9 @@
   "label.details": {
     "defaultMessage": "Detaljer"
   },
+  "label.discover-content": {
+    "defaultMessage": "Upptäck innehåll"
+  },
   "label.done": {
     "defaultMessage": "Klart"
   },
@@ -1859,6 +1952,9 @@
   "label.error": {
     "defaultMessage": "Fel"
   },
+  "label.extract-failed": {
+    "defaultMessage": "Uppackning misslyckades"
+  },
   "label.filter-by": {
     "defaultMessage": "Filtrera efter"
   },
@@ -1874,6 +1970,9 @@
   "label.hide-installed-content": {
     "defaultMessage": "Göm redan installerat innehåll"
   },
+  "label.hide-selected-content": {
+    "defaultMessage": "Göm valt innehåll"
+  },
   "label.installation-info": {
     "defaultMessage": "Installationsinfo"
   },
@@ -1898,6 +1997,9 @@
   "label.modpack": {
     "defaultMessage": "Modpaket"
   },
+  "label.move-failed": {
+    "defaultMessage": "Flytt misslyckades"
+  },
   "label.no": {
     "defaultMessage": "Nej"
   },
@@ -1913,6 +2015,9 @@
   "label.password": {
     "defaultMessage": "Lösenord"
   },
+  "label.permissions": {
+    "defaultMessage": "Behörigheter"
+  },
   "label.plan-custom": {
     "defaultMessage": "Anpassad"
   },
@@ -1943,6 +2048,9 @@
   "label.rejected": {
     "defaultMessage": "Nekad"
   },
+  "label.rename-failed": {
+    "defaultMessage": "Namnbyte misslyckades"
+  },
   "label.rewards-program-terms-agreement": {
     "defaultMessage": "Jag godkänner <terms-link>Belöningsprogrammets Villkor</terms-link>"
   },
@@ -1958,12 +2066,18 @@
   "label.select-all": {
     "defaultMessage": "Välj alla"
   },
+  "label.selected": {
+    "defaultMessage": "Vald"
+  },
   "label.selection-actions": {
     "defaultMessage": "Valåtgärder"
   },
   "label.server": {
     "defaultMessage": "Server"
   },
+  "label.server-only": {
+    "defaultMessage": "Endast server"
+  },
   "label.servers": {
     "defaultMessage": "Servrar"
   },
@@ -1994,6 +2108,9 @@
   "label.updating": {
     "defaultMessage": "Uppdaterar..."
   },
+  "label.upload-failed": {
+    "defaultMessage": "Uppladdning misslyckades"
+  },
   "label.username": {
     "defaultMessage": "Användarnamn"
   },
@@ -2162,6 +2279,9 @@
   "markdown-editor.markdown-formatting-support": {
     "defaultMessage": "Denna redigerare stödjer <markdown-link>markdown formatering</markdown-link>."
   },
+  "markdown-editor.max-length.label": {
+    "defaultMessage": "Max längd:"
+  },
   "markdown-editor.max-length.unlimited": {
     "defaultMessage": "Obegränsad"
   },
@@ -2420,6 +2540,123 @@
   "payment-method.visa": {
     "defaultMessage": "Visa"
   },
+  "profile.bio.fallback.user": {
+    "defaultMessage": "En Modrinth-användare."
+  },
+  "profile.block-user.admonition-title": {
+    "defaultMessage": "Är du säker på att du vill blocka den här användaren?"
+  },
+  "profile.block-user.success-title": {
+    "defaultMessage": "Användare blockerad"
+  },
+  "profile.block-user.title": {
+    "defaultMessage": "Blocka {username}"
+  },
+  "profile.button.analytics": {
+    "defaultMessage": "Visa användarstatistik"
+  },
+  "profile.button.block": {
+    "defaultMessage": "Blockera"
+  },
+  "profile.button.create-project": {
+    "defaultMessage": "Skapa ett projekt"
+  },
+  "profile.button.edit-role": {
+    "defaultMessage": "Ändra roll"
+  },
+  "profile.button.info": {
+    "defaultMessage": "Visa användardetaljer"
+  },
+  "profile.button.manage-projects": {
+    "defaultMessage": "Hantera projekt"
+  },
+  "profile.button.unblock": {
+    "defaultMessage": "Avblockera"
+  },
+  "profile.collection.projects-count": {
+    "defaultMessage": "projekt"
+  },
+  "profile.details.label.email-verified": {
+    "defaultMessage": "E-post verifierad"
+  },
+  "profile.details.label.has-password": {
+    "defaultMessage": "Har lösenord"
+  },
+  "profile.details.label.has-totp": {
+    "defaultMessage": "Har TOTP"
+  },
+  "profile.details.label.payment-methods": {
+    "defaultMessage": "Betalningsmetoder"
+  },
+  "profile.details.title": {
+    "defaultMessage": "Användardetaljer"
+  },
+  "profile.details.tooltip.email-not-verified": {
+    "defaultMessage": "E-post ej verifierad"
+  },
+  "profile.details.tooltip.email-verified": {
+    "defaultMessage": "E-post verifierad"
+  },
+  "profile.error.load-description": {
+    "defaultMessage": "Användarprofilen kunde inte laddas in."
+  },
+  "profile.error.not-found": {
+    "defaultMessage": "Användare hittades inte"
+  },
+  "profile.label.collection": {
+    "defaultMessage": "Sammling"
+  },
+  "profile.label.download-count": {
+    "defaultMessage": "{count, plural, one {nedladdning} other {nedladdningar}}"
+  },
+  "profile.label.joined": {
+    "defaultMessage": "Gick med"
+  },
+  "profile.label.no-collections": {
+    "defaultMessage": "Den här användaren har inga samlingar!"
+  },
+  "profile.label.no-collections-auth-description": {
+    "defaultMessage": "Du har inga samlingar än."
+  },
+  "profile.label.no-projects": {
+    "defaultMessage": "Den här användaren har inga projekt!"
+  },
+  "profile.label.no-projects-auth-description": {
+    "defaultMessage": "Du har inga projekt än."
+  },
+  "profile.label.organizations": {
+    "defaultMessage": "Organisationer"
+  },
+  "profile.label.project-count": {
+    "defaultMessage": "Projekt"
+  },
+  "profile.label.saving": {
+    "defaultMessage": "Sparar..."
+  },
+  "profile.official-account": {
+    "defaultMessage": "Officiellt Modrinth-konto"
+  },
+  "profile.role.select-placeholder": {
+    "defaultMessage": "Välj en roll"
+  },
+  "profile.role.update-error-description": {
+    "defaultMessage": "Ett fel inträffade medan användarrollen uppdaterades. Vänligen försök igen."
+  },
+  "profile.role.update-error-title": {
+    "defaultMessage": "Misslyckades att uppdatera rollen"
+  },
+  "profile.unblock-user.error-description": {
+    "defaultMessage": "Ett fel inträffade under avblockeringen av den här användaren. Vänligen försök igen."
+  },
+  "profile.unblock-user.error-title": {
+    "defaultMessage": "Misslyckades att avblockera användare"
+  },
+  "profile.unblock-user.success-description": {
+    "defaultMessage": "{username} har avblockerats."
+  },
+  "profile.unblock-user.success-title": {
+    "defaultMessage": "Användare avblockerad"
+  },
   "project-card.date.published.tooltip": {
     "defaultMessage": "Skapades {date}"
   },
@@ -2438,9 +2675,15 @@
   "project-card.environment.server": {
     "defaultMessage": "Server"
   },
+  "project-card.environment.singleplayer": {
+    "defaultMessage": "Enspelarläge"
+  },
   "project-type.all": {
     "defaultMessage": "Alla"
   },
+  "project-type.collection.plural": {
+    "defaultMessage": "Samlingar"
+  },
   "project-type.datapack.capital": {
     "defaultMessage": "{count, plural, one {Datapaket} other {Datapaket}}"
   },
@@ -2540,6 +2783,9 @@
   "project.about.compatibility.platforms": {
     "defaultMessage": "Plattformar"
   },
+  "project.about.compatibility.platforms-plural": {
+    "defaultMessage": "Platform{count, plural, one {} other {ar}}"
+  },
   "project.about.compatibility.title": {
     "defaultMessage": "Kompatibilitet"
   },
@@ -2708,6 +2954,9 @@
   "project.follower-count-tooltip": {
     "defaultMessage": "{count, number} följare"
   },
+  "project.license.title": {
+    "defaultMessage": "Licens"
+  },
   "project.online-player-count": {
     "defaultMessage": "{count, number} online"
   },
@@ -3113,6 +3362,12 @@
   "project.settings.view.title": {
     "defaultMessage": "Visa"
   },
+  "project.stats.downloads-label": {
+    "defaultMessage": "nedladdning{count, plural, one {} other {ar}}"
+  },
+  "project.stats.followers-label": {
+    "defaultMessage": "följare"
+  },
   "project.versions.channel.alpha.symbol": {
     "defaultMessage": "A"
   },
@@ -3695,6 +3950,9 @@
   "servers.audit-log.event.server-properties-modified-label": {
     "defaultMessage": "Modifierade serveregenskaper"
   },
+  "servers.audit-log.event.server-reset": {
+    "defaultMessage": "Återställ server"
+  },
   "servers.audit-log.event.server-restarted": {
     "defaultMessage": "Startade om server"
   },
@@ -3767,30 +4025,75 @@
   "servers.backups.admonition.fallback-name": {
     "defaultMessage": "Din säkerhetskopia"
   },
+  "servers.backups.admonition.restore-cancelled.title": {
+    "defaultMessage": "Återställning avbröts"
+  },
   "servers.backups.admonition.restore-failed.description": {
     "defaultMessage": "Något gick fel när vi försökte återställa från säkerhetskopian {backupName}. Vänligen försök igen eller kontakta support om felet återkommer."
   },
+  "servers.backups.admonition.restore-failed.title": {
+    "defaultMessage": "Återställning misslyckades"
+  },
   "servers.backups.admonition.restore-queued.description": {
     "defaultMessage": "Återställning från {backupName} är köad och kommer att börja strax."
   },
   "servers.backups.admonition.restore-successful.description": {
     "defaultMessage": "Din server har återställts till {backupName} och är redo för att startas."
   },
+  "servers.backups.admonition.restore-successful.title": {
+    "defaultMessage": "Återställning slutförd"
+  },
   "servers.backups.admonition.restoring-backup.description": {
     "defaultMessage": "Återställer din server från {backupName}. Detta kan ta några minuter."
   },
   "servers.backups.admonition.restoring-backup.title": {
     "defaultMessage": "Återställer från säkerhetskopia"
   },
+  "servers.backups.bulk-bar.deleting": {
+    "defaultMessage": "Raderar {total, plural, one {# säkerhetskopia} other {# säkerhetskopior}}..."
+  },
+  "servers.backups.bulk-bar.selected-count": {
+    "defaultMessage": "{count, plural, one {# säkerhetskopia vald} other {# säkerhetskopior valda}}"
+  },
   "servers.backups.delete-modal.admonition-body": {
     "defaultMessage": "När {count, plural, one {denna säkerhetskopia raderas kan den} other {dessa säkerhetskopior raderas kan de}} inte återställas. Radering är permanent."
   },
+  "servers.backups.delete-modal.admonition-header": {
+    "defaultMessage": "Raderingsvarning"
+  },
+  "servers.backups.delete-modal.backups-label": {
+    "defaultMessage": "{count, plural, one {Säkerhetskopia} other {Säkerhetskopior ({count})}}"
+  },
+  "servers.backups.delete-modal.confirm": {
+    "defaultMessage": "Radera {count, plural, one {säkerhetskopia} other {# säkerhetskopior}}"
+  },
+  "servers.backups.delete-modal.header": {
+    "defaultMessage": "Radera {count, plural, one {säkerhetskopia} other {säkerhetskopior}}"
+  },
+  "servers.backups.empty.description": {
+    "defaultMessage": "Skapa din första säkerhetskopia"
+  },
+  "servers.backups.empty.heading": {
+    "defaultMessage": "Inga säkerhetskopior än"
+  },
+  "servers.backups.filtered-empty.clear-filters": {
+    "defaultMessage": "Töm filter"
+  },
+  "servers.backups.filtered-empty.description": {
+    "defaultMessage": "Prova ett annat filer eller töm filtren för att se alla säkerhetskopior."
+  },
+  "servers.backups.filtered-empty.heading": {
+    "defaultMessage": "Inga säkerhetskopior matchar"
+  },
   "servers.backups.item.auto": {
     "defaultMessage": "Auto"
   },
   "servers.backups.item.backup-schedule": {
     "defaultMessage": "Säkerhetskopieringschema"
   },
+  "servers.backups.item.creator-avatar-alt": {
+    "defaultMessage": "{username}s avatar"
+  },
   "servers.backups.item.manual-backup": {
     "defaultMessage": "Manuel säkerhetskopiering"
   },
@@ -3800,6 +4103,9 @@
   "servers.backups.item.restore": {
     "defaultMessage": "Återställ"
   },
+  "servers.backups.select-backup-aria": {
+    "defaultMessage": "Välj säkerhetskopia {name}"
+  },
   "servers.backups.toolbar.create-backup": {
     "defaultMessage": "Skapa säkerhetskopia"
   },
@@ -3906,7 +4212,7 @@
     "defaultMessage": "Ny server"
   },
   "servers.list-empty.no-servers-description": {
-    "defaultMessage": "Installera moddar, bjud in vänner och spela tillsammans, allt från Modrinth-appen."
+    "defaultMessage": "Installera moddar, bjud in vänner och spela tillsammans, allt från Modrinth App."
   },
   "servers.list-empty.no-servers-title": {
     "defaultMessage": "Inga servrar än"
@@ -3983,6 +4289,9 @@
   "servers.manage.error.details": {
     "defaultMessage": "Feldetaljer:"
   },
+  "servers.manage.error.title": {
+    "defaultMessage": "Servrar kunde inte laddas in"
+  },
   "servers.manage.handle-error.title": {
     "defaultMessage": "Ett fel inträffade"
   },
@@ -4001,6 +4310,9 @@
   "servers.manage.purchase-unavailable.text": {
     "defaultMessage": "Betalningsinformation laddar fortfarande. Öppnar kassan så snart som möjligt."
   },
+  "servers.manage.purchase-unavailable.title": {
+    "defaultMessage": "Köp otillgängligt"
+  },
   "servers.manage.reload-button": {
     "defaultMessage": "Ladda om"
   },
@@ -4034,9 +4346,15 @@
   "servers.manage.your-servers-title": {
     "defaultMessage": "Dina servrar"
   },
+  "servers.medal-listing.countdown.remaining": {
+    "defaultMessage": "<days-count>{days}</days-count> {days, plural, one {dag} other {dagar}} <hours-count>{hours}</hours-count> {hours, plural, one {timme} other {timmar}} <minutes-count>{minutes}</minutes-count> {minutes, plural, one {minut} other {minuter}} <seconds-count>{seconds}</seconds-count> {seconds, plural, one {sekund} other {sekunder}} återstår..."
+  },
   "servers.medal-listing.new-server-label": {
     "defaultMessage": "Ny server"
   },
+  "servers.medal-listing.notice.upgrading": {
+    "defaultMessage": "Din servers hårdvara uppgraderas just nu och kommer snart vara online igen."
+  },
   "servers.medal-listing.owner-avatar-alt": {
     "defaultMessage": "{username}s avatar"
   },
@@ -4232,6 +4550,9 @@
   "servers.setup.onboarding.modpack-upload-failed.title": {
     "defaultMessage": "Modpaket-uppladdning misslyckades"
   },
+  "servers.setup.onboarding.setup-server.button": {
+    "defaultMessage": "Ställ in server"
+  },
   "servers.setup.onboarding.step.choose.title": {
     "defaultMessage": "Välj vad du vill spela"
   },
@@ -4241,6 +4562,9 @@
   "servers.setup.onboarding.step.invite-friends.title": {
     "defaultMessage": "Bjud in dina vänner"
   },
+  "servers.setup.onboarding.steps.heading": {
+    "defaultMessage": "Ställ in din server (≈ 2 min)"
+  },
   "servers.setup.onboarding.uploading.progress": {
     "defaultMessage": "Laddar upp ({percent, number}%)"
   },
@@ -4275,7 +4599,7 @@
     "defaultMessage": "Dina applikationer"
   },
   "settings.authorized-apps.title": {
-    "defaultMessage": "Auktoriserade appar"
+    "defaultMessage": "Behöriga appar"
   },
   "settings.billing.title": {
     "defaultMessage": "Prenumerationer"
@@ -4293,10 +4617,10 @@
     "defaultMessage": "OLED"
   },
   "settings.display.theme.preferred-dark-theme": {
-    "defaultMessage": "Önskat mörkt tema"
+    "defaultMessage": "Föredraget mörkt tema"
   },
   "settings.display.theme.preferred-light-theme": {
-    "defaultMessage": "Önskat ljust tema"
+    "defaultMessage": "Föredraget ljust tema"
   },
   "settings.display.theme.retro": {
     "defaultMessage": "Retro"
@@ -4340,9 +4664,183 @@
   "settings.pats.title": {
     "defaultMessage": "Personliga åtkomstnycklar"
   },
+  "settings.profile.bio.title": {
+    "defaultMessage": "Biografi"
+  },
+  "settings.profile.navigation-title": {
+    "defaultMessage": "Profil"
+  },
+  "settings.profile.profile-picture.title": {
+    "defaultMessage": "Profilbild"
+  },
+  "settings.profile.save-error": {
+    "defaultMessage": "Misslyckades att uppdatera profil"
+  },
+  "settings.profile.sign-in-required.description": {
+    "defaultMessage": "Logga in på ett Modrinth-konto för att anpassa din offentliga profil."
+  },
+  "settings.profile.sign-in-required.title": {
+    "defaultMessage": "Modrinth-konto behövs"
+  },
   "settings.sessions.title": {
     "defaultMessage": "Sessioner"
   },
+  "settings.social.blocked-users.column.actions": {
+    "defaultMessage": "Åtgärder"
+  },
+  "settings.social.blocked-users.column.user": {
+    "defaultMessage": "Användare"
+  },
+  "settings.social.blocked-users.description": {
+    "defaultMessage": "Det här är användare du har blockat på Modrinth. De kan inte:"
+  },
+  "settings.social.blocked-users.empty": {
+    "defaultMessage": "Du har inte blockerat någon."
+  },
+  "settings.social.blocked-users.load-error": {
+    "defaultMessage": "Blockerade användare kunde inte laddas in."
+  },
+  "settings.social.blocked-users.loading": {
+    "defaultMessage": "Laddar in blockerade användare…"
+  },
+  "settings.social.blocked-users.restriction.friend-requests": {
+    "defaultMessage": "Skicka vänförfrågan till dig"
+  },
+  "settings.social.blocked-users.restriction.shared-instances": {
+    "defaultMessage": "Bjuda in dig till en delad instans"
+  },
+  "settings.social.blocked-users.title": {
+    "defaultMessage": "Blockerade användare"
+  },
+  "settings.social.blocked-users.unblock": {
+    "defaultMessage": "Avblockera"
+  },
+  "settings.social.blocked-users.unblock-user": {
+    "defaultMessage": "Avblockera {username}"
+  },
+  "settings.social.blocked-users.user-avatar": {
+    "defaultMessage": "{username}s avatar"
+  },
+  "settings.social.friend-requests.title": {
+    "defaultMessage": "Vänförfrågningar"
+  },
+  "settings.social.interaction-source.coming-soon": {
+    "defaultMessage": "Kommer snart!"
+  },
+  "settings.social.interaction-source.everyone": {
+    "defaultMessage": "Alla"
+  },
+  "settings.social.interaction-source.friends": {
+    "defaultMessage": "Vänner"
+  },
+  "settings.social.interaction-source.friends-of-friends": {
+    "defaultMessage": "Vänners vänner"
+  },
+  "settings.social.interaction-source.no-one": {
+    "defaultMessage": "Ingen"
+  },
+  "settings.social.shared-instance-invites.title": {
+    "defaultMessage": "Inbjudningar"
+  },
+  "settings.social.sign-in-required.title": {
+    "defaultMessage": "Modrinth-konto krävs"
+  },
+  "sharing.invite-players-modal.add": {
+    "defaultMessage": "Lägg till"
+  },
+  "sharing.invite-players-modal.added": {
+    "defaultMessage": "Tillagd"
+  },
+  "sharing.invite-players-modal.already-invited": {
+    "defaultMessage": "Den här användaren har redan bjudits in."
+  },
+  "sharing.invite-players-modal.apply-button": {
+    "defaultMessage": "Tillämpa"
+  },
+  "sharing.invite-players-modal.avatar-alt": {
+    "defaultMessage": "{username}s avatar"
+  },
+  "sharing.invite-players-modal.cancel": {
+    "defaultMessage": "Avbryt"
+  },
+  "sharing.invite-players-modal.cancel-button": {
+    "defaultMessage": "Avbryt"
+  },
+  "sharing.invite-players-modal.custom-expiry": {
+    "defaultMessage": "Anpassat..."
+  },
+  "sharing.invite-players-modal.custom-expiry-value": {
+    "defaultMessage": "Anpassat: {date}"
+  },
+  "sharing.invite-players-modal.expiry-in-one-day": {
+    "defaultMessage": "Om 1 dag"
+  },
+  "sharing.invite-players-modal.expiry-in-one-hour": {
+    "defaultMessage": "Om 1 timme"
+  },
+  "sharing.invite-players-modal.expiry-in-seven-days": {
+    "defaultMessage": "Om 7 dagar"
+  },
+  "sharing.invite-players-modal.expiry-in-six-hours": {
+    "defaultMessage": "Om 6 timmar"
+  },
+  "sharing.invite-players-modal.expiry-in-three-days": {
+    "defaultMessage": "Om 3 dagar"
+  },
+  "sharing.invite-players-modal.expiry-in-twelve-hours": {
+    "defaultMessage": "Om 12 timmar"
+  },
+  "sharing.invite-players-modal.expiry-label": {
+    "defaultMessage": "Utgångsdatum"
+  },
+  "sharing.invite-players-modal.friends-heading": {
+    "defaultMessage": "Dina vänner – {count}"
+  },
+  "sharing.invite-players-modal.invite": {
+    "defaultMessage": "Bjud in"
+  },
+  "sharing.invite-players-modal.invite-expiry-description": {
+    "defaultMessage": "Din inbjudningslänk går ut om {duration}."
+  },
+  "sharing.invite-players-modal.invite-link-heading": {
+    "defaultMessage": "Eller använd en inbjudningslänk"
+  },
+  "sharing.invite-players-modal.link-copied-text": {
+    "defaultMessage": "Inbjudningslänken har kopierats till urklippet."
+  },
+  "sharing.invite-players-modal.link-copied-title": {
+    "defaultMessage": "Länk kopierad"
+  },
+  "sharing.invite-players-modal.link-copy-failed-title": {
+    "defaultMessage": "Kunde inte kopiera länk"
+  },
+  "sharing.invite-players-modal.max-uses-label": {
+    "defaultMessage": "Högst antal användningar"
+  },
+  "sharing.invite-players-modal.no-friends": {
+    "defaultMessage": "Inga vänner hittades."
+  },
+  "sharing.invite-players-modal.no-search-results": {
+    "defaultMessage": "Inga matchande användare hittades."
+  },
+  "sharing.invite-players-modal.requested": {
+    "defaultMessage": "Förfrågan skickad"
+  },
+  "sharing.invite-players-modal.requested-tooltip": {
+    "defaultMessage": "{username} behöver acceptera din vänförfrågan först"
+  },
+  "sharing.invite-players-modal.save-button": {
+    "defaultMessage": "Spara"
+  },
+  "sharing.invite-players-modal.search-placeholder": {
+    "defaultMessage": "Ange Modrinth-användarnamn"
+  },
+  "sharing.invite-players-modal.searching": {
+    "defaultMessage": "Söker..."
+  },
+  "sharing.invite-players-modal.update-invite-link-failed-title": {
+    "defaultMessage": "Kunde inte uppdatera inbjudningslänken"
+  },
   "tag.category.128x": {
     "defaultMessage": "128x"
   },
@@ -4844,6 +5342,9 @@
   "ui.confirm-leave-modal.title": {
     "defaultMessage": "Lämna sidan?"
   },
+  "ui.stacked-admonitions.dismiss-all": {
+    "defaultMessage": "Avvisa alla"
+  },
   "unknown-file-warning-modal.dont-install": {
     "defaultMessage": "Installera inte"
   },
@@ -4889,12 +5390,18 @@
   "user.profile.badge.pride.about.1": {
     "defaultMessage": "Denna användare har deltagit i åtminstone ett av Modrinths Pride-insamlingar för LGBTQ+ gemenskapen."
   },
+  "user.profile.badge.staff.name": {
+    "defaultMessage": "Modrinth-team"
+  },
   "version.content.name": {
     "defaultMessage": "Namn"
   },
   "version.content.version": {
     "defaultMessage": "Version"
   },
+  "version.file-type.primary": {
+    "defaultMessage": "Primär"
+  },
   "version.file-type.signature": {
     "defaultMessage": "Signaturfil"
   },
@@ -4935,3 +5442,4 @@
     "defaultMessage": "Typ"
   }
 }
+
diff --git a/packages/ui/src/locales/th-TH/index.json b/packages/ui/src/locales/th-TH/index.json
index 4908b72a79..3313c10a83 100644
--- a/packages/ui/src/locales/th-TH/index.json
+++ b/packages/ui/src/locales/th-TH/index.json
@@ -663,3 +663,4 @@
     "defaultMessage": "ภาษา"
   }
 }
+
diff --git a/packages/ui/src/locales/tr-TR/index.json b/packages/ui/src/locales/tr-TR/index.json
index 5d52c8ea46..a3b32086b6 100644
--- a/packages/ui/src/locales/tr-TR/index.json
+++ b/packages/ui/src/locales/tr-TR/index.json
@@ -467,9 +467,21 @@
   "content.diff-modal.external-diff-type.updated": {
     "defaultMessage": "Güncellendi"
   },
+  "content.diff-modal.file-count": {
+    "defaultMessage": "{count, plural,one {# dosya}other {# dosya}}"
+  },
+  "content.diff-modal.game-version-updated": {
+    "defaultMessage": "Oyun sürümü"
+  },
   "content.diff-modal.install-anyway": {
     "defaultMessage": "Yine de indir"
   },
+  "content.diff-modal.loader-updated": {
+    "defaultMessage": "Yükleyici"
+  },
+  "content.diff-modal.modpack-linked": {
+    "defaultMessage": "Bağlantılı mod paketi"
+  },
   "content.diff-modal.removed-count": {
     "defaultMessage": "{count} kaldırıldı"
   },
@@ -1160,6 +1172,15 @@
   "external-files.permissions-card.reason.special-permission.description": {
     "defaultMessage": "Bu çalışmayı mod paketinizde yeniden dağıtmak için özel izin alınmıştır."
   },
+  "external-files.permissions-card.remove-group": {
+    "defaultMessage": "Grubu sil"
+  },
+  "external-files.permissions-card.remove-group-confirmation.title": {
+    "defaultMessage": "{title} silinsin mi?"
+  },
+  "external-files.permissions-card.remove-group-error.title": {
+    "defaultMessage": "Grup silinemedi"
+  },
   "external-files.permissions-card.split-file": {
     "defaultMessage": "Gruptan kaldır"
   },
@@ -2039,6 +2060,9 @@
   "instances.modpack-content-modal.empty-title": {
     "defaultMessage": "İçerik bulunamadı"
   },
+  "instances.modpack-content-modal.external-content": {
+    "defaultMessage": "Harici"
+  },
   "instances.modpack-content-modal.header": {
     "defaultMessage": "Mod paketi içeriği"
   },
@@ -2792,6 +2816,42 @@
   "payment-method.visa": {
     "defaultMessage": "Visa"
   },
+  "profile.bio.fallback.user": {
+    "defaultMessage": "Bir Modrinth kullanıcısı."
+  },
+  "profile.block-user.admonition-title": {
+    "defaultMessage": "Bu kullanıcıyı engellemek istediğinize emin misiniz?"
+  },
+  "profile.block-user.error-description": {
+    "defaultMessage": "Kullanıcıyı engellerken bir sorun oluştu. Lütfen tekrar deneyin."
+  },
+  "profile.block-user.success-description": {
+    "defaultMessage": "{username} engellendi."
+  },
+  "profile.block-user.success-title": {
+    "defaultMessage": "Kullanıcı engellendi"
+  },
+  "profile.block-user.title": {
+    "defaultMessage": "{username}'i engelle"
+  },
+  "profile.button.analytics": {
+    "defaultMessage": "Kullanıcı analizlerini göster"
+  },
+  "profile.button.block": {
+    "defaultMessage": "Engelle"
+  },
+  "profile.button.info": {
+    "defaultMessage": "Kullanıcı detaylarını göster"
+  },
+  "profile.button.unblock": {
+    "defaultMessage": "Engellemeyi kaldır"
+  },
+  "profile.collection.projects-count": {
+    "defaultMessage": "{count, plural,one{# proje} other{# proje}}"
+  },
+  "profile.error.load-description": {
+    "defaultMessage": "Kullanıcı profili yüklenemedi."
+  },
   "profile.label.badges": {
     "defaultMessage": "Rozetler"
   },
diff --git a/packages/ui/src/locales/uk-UA/index.json b/packages/ui/src/locales/uk-UA/index.json
index 67d677efb3..aec21f8bc4 100644
--- a/packages/ui/src/locales/uk-UA/index.json
+++ b/packages/ui/src/locales/uk-UA/index.json
@@ -374,6 +374,9 @@
   "content.confirm-deletion.header": {
     "defaultMessage": "Видалити {itemType}"
   },
+  "content.confirm-disable.header": {
+    "defaultMessage": "Вимкнути {itemType}"
+  },
   "content.confirm-modpack-update.admonition-body": {
     "defaultMessage": "{action, select, downgrade {Пониження} other {Підвищення}} може спричинити проблеми сумісности. Моди чи вміст, який ви додали в збірку, буде збережено, але може бути несумісним із новою версією."
   },
@@ -443,12 +446,18 @@
   "content.diff-modal.added-count": {
     "defaultMessage": "Додано {count}"
   },
+  "content.diff-modal.config-files-updated": {
+    "defaultMessage": "Змінені конфігураційні файли"
+  },
   "content.diff-modal.diff-type.added": {
     "defaultMessage": "Додано (залежності)"
   },
   "content.diff-modal.diff-type.removed": {
     "defaultMessage": "Вимкнено"
   },
+  "content.diff-modal.diff-type.removed-disabled": {
+    "defaultMessage": "Видалено (вимкнено)"
+  },
   "content.diff-modal.diff-type.updated": {
     "defaultMessage": "Оновлено"
   },
@@ -464,12 +473,36 @@
   "content.diff-modal.external-diff-type.updated": {
     "defaultMessage": "Оновлено"
   },
+  "content.diff-modal.file-count": {
+    "defaultMessage": "{count, plural, one {# файл} few {# файли} many {# файлів} other {# файлу}}"
+  },
+  "content.diff-modal.game-version-updated": {
+    "defaultMessage": "Версія гри"
+  },
   "content.diff-modal.install-anyway": {
     "defaultMessage": "Усе одно встановити"
   },
+  "content.diff-modal.loader-updated": {
+    "defaultMessage": "Завантажувач"
+  },
+  "content.diff-modal.modpack-linked": {
+    "defaultMessage": "Прив'язана збірка"
+  },
+  "content.diff-modal.modpack-unlinked": {
+    "defaultMessage": "Відв'язана збірка"
+  },
+  "content.diff-modal.modpack-updated": {
+    "defaultMessage": "Оновлена збірка"
+  },
+  "content.diff-modal.no-content-changes": {
+    "defaultMessage": "Без змін у вмісті"
+  },
   "content.diff-modal.removed-count": {
     "defaultMessage": "Видалено {count}"
   },
+  "content.diff-modal.removed-disabled-count": {
+    "defaultMessage": "Видалено (вимкнено): {count}"
+  },
   "content.diff-modal.reviewed-files": {
     "defaultMessage": "Файл перевірятиметься, лише якщо його опубліковано на Modrinth, незалежно від його формату (включно з .mrpack)."
   },
@@ -530,6 +563,9 @@
   "content.inline-backup.world-label": {
     "defaultMessage": "світ"
   },
+  "content.modpack-card.installation-settings": {
+    "defaultMessage": "Налаштування інсталяції"
+  },
   "content.page-layout.additional-content": {
     "defaultMessage": "Додатковий уміст"
   },
@@ -810,7 +846,7 @@
     "defaultMessage": "Переглянути збірки"
   },
   "creation-flow.modal.modpack.action.import": {
-    "defaultMessage": "Імпортувати збірку"
+    "defaultMessage": "Перенести збірку"
   },
   "creation-flow.modal.modpack.known-modpack.prompt": {
     "defaultMessage": "Уже знаєте яку збірку хочете встановити?"
@@ -831,13 +867,13 @@
     "defaultMessage": "Власне налаштування"
   },
   "creation-flow.modal.setup-type.option.import-instance.description": {
-    "defaultMessage": "Імпортуйте збірку з Prism, CurseForge або подібних програм."
+    "defaultMessage": "Перенесіть збірку з Prism, CurseForge абощо."
   },
   "creation-flow.modal.setup-type.option.import-instance.title": {
     "defaultMessage": "Імпорт збірки"
   },
   "creation-flow.modal.setup-type.option.modpack-base.description": {
-    "defaultMessage": "Перегляньте збірки на Modrinth або імпортуйте їх з файлу."
+    "defaultMessage": "Перегляньте збірки на Modrinth або перенесіть їх із файлу."
   },
   "creation-flow.modal.setup-type.option.modpack-base.title": {
     "defaultMessage": "Установити збірку"
@@ -1115,6 +1151,21 @@
   "external-files.permissions-card.reason.special-permission.description": {
     "defaultMessage": "Ви отримали особливі дозволи для поширення цієї роботи у вашій збірці."
   },
+  "external-files.permissions-card.remove-group": {
+    "defaultMessage": "Видалити групу"
+  },
+  "external-files.permissions-card.remove-group-confirmation.description": {
+    "defaultMessage": "Це назавжди видалить цю групу атрибуції та всі файли в ній. Цю дію неможливо скасувати."
+  },
+  "external-files.permissions-card.remove-group-confirmation.title": {
+    "defaultMessage": "Видалити {title}?"
+  },
+  "external-files.permissions-card.remove-group-error.title": {
+    "defaultMessage": "Групу не видалено"
+  },
+  "external-files.permissions-card.remove-group-shift-hint": {
+    "defaultMessage": "Утримуйте Shift під час кліку, щоб пропустити підтвердження."
+  },
   "external-files.permissions-card.split-file": {
     "defaultMessage": "Видалити з групи"
   },
@@ -1994,6 +2045,12 @@
   "instances.modpack-content-modal.empty-title": {
     "defaultMessage": "Умісту не знайдено"
   },
+  "instances.modpack-content-modal.external-content": {
+    "defaultMessage": "Зовнішні"
+  },
+  "instances.modpack-content-modal.external-content-description": {
+    "defaultMessage": "Цей файл не опубліковано на Modrinth."
+  },
   "instances.modpack-content-modal.header": {
     "defaultMessage": "Уміст збірки"
   },
@@ -2003,6 +2060,9 @@
   "instances.modpack-content-modal.no-results": {
     "defaultMessage": "За вашим запитом не знайдено жодного проєкту."
   },
+  "instances.modpack-content-modal.open-in-slicer": {
+    "defaultMessage": "Відкрити в Slicer"
+  },
   "instances.modpack-content-modal.search-placeholder": {
     "defaultMessage": "Пошук {count, number} {count, plural, one {проєкту} other {проєктів}}"
   },
@@ -2138,6 +2198,9 @@
   "label.details": {
     "defaultMessage": "Деталі"
   },
+  "label.discover-content": {
+    "defaultMessage": "Огляд вмісту"
+  },
   "label.done": {
     "defaultMessage": "Готово"
   },
@@ -2216,6 +2279,9 @@
   "label.password": {
     "defaultMessage": "Пароль"
   },
+  "label.permissions": {
+    "defaultMessage": "Дозволи"
+  },
   "label.plan-custom": {
     "defaultMessage": "Власний"
   },
@@ -2747,9 +2813,171 @@
   "payment-method.visa": {
     "defaultMessage": "Visa"
   },
+  "profile.bio.fallback.creator": {
+    "defaultMessage": "Творець Modrinth."
+  },
+  "profile.bio.fallback.user": {
+    "defaultMessage": "Користувач Modrinth."
+  },
+  "profile.block-user.admonition-body": {
+    "defaultMessage": "{username} Не зможе надсилати вам запити в друзі, запрошувати до спільних збірок або запрошувати на сервери Modrinth Hosting."
+  },
+  "profile.block-user.admonition-title": {
+    "defaultMessage": "Дійсно заблокувати цього користувача?"
+  },
+  "profile.block-user.error-description": {
+    "defaultMessage": "Виникла помилка під час блокування користувача. Спробуйте знову."
+  },
+  "profile.block-user.error-title": {
+    "defaultMessage": "Не вдалося заблокувати користувача"
+  },
+  "profile.block-user.success-description": {
+    "defaultMessage": "{username} заблоковано."
+  },
+  "profile.block-user.success-title": {
+    "defaultMessage": "Користувача заблоковано"
+  },
+  "profile.block-user.title": {
+    "defaultMessage": "Заблокувати {username}"
+  },
+  "profile.button.analytics": {
+    "defaultMessage": "Переглянути аналітику користувача"
+  },
+  "profile.button.billing": {
+    "defaultMessage": "Керувати виплатами користувача"
+  },
+  "profile.button.block": {
+    "defaultMessage": "Заблокувати"
+  },
+  "profile.button.create-collection": {
+    "defaultMessage": "Створити добірку"
+  },
+  "profile.button.create-project": {
+    "defaultMessage": "Створити проєкт"
+  },
+  "profile.button.edit-role": {
+    "defaultMessage": "Зміна ролі"
+  },
+  "profile.button.info": {
+    "defaultMessage": "Деталі про користувача"
+  },
+  "profile.button.manage-projects": {
+    "defaultMessage": "Керувати проєктами"
+  },
+  "profile.button.remove-affiliate": {
+    "defaultMessage": "Видалити як партнера"
+  },
+  "profile.button.set-affiliate": {
+    "defaultMessage": "Призначити партнером"
+  },
+  "profile.button.unblock": {
+    "defaultMessage": "Розблокувати"
+  },
+  "profile.collection.projects-count": {
+    "defaultMessage": "{count, plural, one {# проєкт} few {# проєкти} many {# проєктів} other {# проєкту}}"
+  },
+  "profile.details.error.github-popup-blocked": {
+    "defaultMessage": "Дозвольте спливні вікна для Modrinth, потім спробуйте знову."
+  },
+  "profile.details.error.github-profile-message": {
+    "defaultMessage": "Не вдалося отримати профіль GitHub. Спробуйте знову."
+  },
+  "profile.details.label.auth-providers": {
+    "defaultMessage": "Сервіси автентифікації"
+  },
+  "profile.details.label.email-verified": {
+    "defaultMessage": "Підтверджена електронна пошта"
+  },
+  "profile.details.label.has-password": {
+    "defaultMessage": "Має пароль"
+  },
+  "profile.details.label.has-totp": {
+    "defaultMessage": "Має TOTP"
+  },
+  "profile.details.label.payment-methods": {
+    "defaultMessage": "Способи оплати"
+  },
+  "profile.details.label.view-github-profile": {
+    "defaultMessage": "Переглянути профіль"
+  },
+  "profile.details.title": {
+    "defaultMessage": "Деталі користувача"
+  },
+  "profile.details.tooltip.email-not-verified": {
+    "defaultMessage": "Пошту не підтверджено"
+  },
+  "profile.details.tooltip.email-verified": {
+    "defaultMessage": "Пошту підтверджено"
+  },
+  "profile.error.load-description": {
+    "defaultMessage": "Не вдалося завантажити профіль користувача."
+  },
+  "profile.error.not-found": {
+    "defaultMessage": "Користувача не знайдено"
+  },
+  "profile.label.affiliate": {
+    "defaultMessage": "Партнер"
+  },
   "profile.label.badges": {
     "defaultMessage": "Значки"
   },
+  "profile.label.collection": {
+    "defaultMessage": "Добірка"
+  },
+  "profile.label.download-count": {
+    "defaultMessage": "{count, plural, one {завантаження} few {завантаження} many {завантажень} other {завантаження}}"
+  },
+  "profile.label.joined": {
+    "defaultMessage": "Приєднався"
+  },
+  "profile.label.no-collections": {
+    "defaultMessage": "Цей користувач не має добірок!"
+  },
+  "profile.label.no-collections-auth-description": {
+    "defaultMessage": "Ви поки не маєте добірок."
+  },
+  "profile.label.no-projects": {
+    "defaultMessage": "Цей користувач не має проєктів!"
+  },
+  "profile.label.no-projects-auth-description": {
+    "defaultMessage": "Ви поки не маєте проєктів."
+  },
+  "profile.label.organizations": {
+    "defaultMessage": "Організації"
+  },
+  "profile.label.project-count": {
+    "defaultMessage": "{count, plural, one {проєкт} few {проєкти} many {проєктів} other {проєктів}}"
+  },
+  "profile.label.saving": {
+    "defaultMessage": "Збереження..."
+  },
+  "profile.official-account": {
+    "defaultMessage": "Офіційний обліковий запис Modrinth"
+  },
+  "profile.official-account.bio": {
+    "defaultMessage": "Офіційний обліковий запис Modrinth. Зв'язатися з підтримкою можна за <support-link></support-link> або через електронну пошту за <email></email>"
+  },
+  "profile.role.select-placeholder": {
+    "defaultMessage": "Виберіть роль"
+  },
+  "profile.role.update-error-description": {
+    "defaultMessage": "Виникла помилка під час оновлення ролі користувача. Спробуйте знову."
+  },
+  "profile.role.update-error-title": {
+    "defaultMessage": "Не вдалося оновити роль"
+  },
+  "profile.unblock-user.error-description": {
+    "defaultMessage": "Виникла помилка під час розблокування користувача. Спробуйте знову."
+  },
+  "profile.unblock-user.error-title": {
+    "defaultMessage": "Не вдалося розблокувати користувача"
+  },
+  "profile.unblock-user.success-description": {
+    "defaultMessage": "{username} розблоковано."
+  },
+  "profile.unblock-user.success-title": {
+    "defaultMessage": "Користувача розблоковано"
+  },
   "project-card.date.published.tooltip": {
     "defaultMessage": "Опубліковано {date}"
   },
@@ -2765,12 +2993,21 @@
   "project-card.environment.client-or-server": {
     "defaultMessage": "Клієнт чи сервер"
   },
+  "project-card.environment.dedicated-server": {
+    "defaultMessage": "Виділений сервер"
+  },
   "project-card.environment.server": {
     "defaultMessage": "Сервер"
   },
+  "project-card.environment.singleplayer": {
+    "defaultMessage": "Одиночна гра"
+  },
   "project-type.all": {
     "defaultMessage": "Усі"
   },
+  "project-type.collection.plural": {
+    "defaultMessage": "Добірки"
+  },
   "project-type.datapack.capital": {
     "defaultMessage": "{count, plural, one {Пакет даних} few {Пакети даних} many {Пакетів даних} other {Пакетів даних}}"
   },
@@ -4997,9 +5234,222 @@
   "settings.pats.title": {
     "defaultMessage": "Особистий токен доступу"
   },
+  "settings.profile.bio.description": {
+    "defaultMessage": "Короткий опис, щоб розповісти іншим трохи про себе."
+  },
+  "settings.profile.bio.title": {
+    "defaultMessage": "Про себе"
+  },
+  "settings.profile.navigation-title": {
+    "defaultMessage": "Профіль"
+  },
+  "settings.profile.profile-picture.title": {
+    "defaultMessage": "Зображення профілю"
+  },
+  "settings.profile.public-information.description": {
+    "defaultMessage": "Інформація з вашого профілю є <profile-link>загальнодоступною на Modrinth</profile-link> та через <docs-link>Modrinth API</docs-link>."
+  },
+  "settings.profile.save-error": {
+    "defaultMessage": "Не вдалося оновити профіль"
+  },
+  "settings.profile.save-error-description": {
+    "defaultMessage": "Виникла помилка під час оновлення вашого профілю Спробуйте знову."
+  },
+  "settings.profile.sign-in-required.description": {
+    "defaultMessage": "Увійдіть за допомогою облікового запису Modrinth, щоб налаштувати свій публічний профіль."
+  },
+  "settings.profile.sign-in-required.title": {
+    "defaultMessage": "Потрібен обліковий запис Modrinth"
+  },
+  "settings.profile.username.description": {
+    "defaultMessage": "Унікальне ім'я для ідентифікації вашого профілю."
+  },
   "settings.sessions.title": {
     "defaultMessage": "Сеанси"
   },
+  "settings.social.blocked-users.column.actions": {
+    "defaultMessage": "Дії"
+  },
+  "settings.social.blocked-users.column.user": {
+    "defaultMessage": "Користувач"
+  },
+  "settings.social.blocked-users.description": {
+    "defaultMessage": "Це користувачі, яких ви заблокували на Modrinth. Вони не можуть:"
+  },
+  "settings.social.blocked-users.empty": {
+    "defaultMessage": "Ви нікого не заблокували."
+  },
+  "settings.social.blocked-users.load-error": {
+    "defaultMessage": "Не вдалося завантажити заблокованих користувачів."
+  },
+  "settings.social.blocked-users.loading": {
+    "defaultMessage": "Завантаження заблокованих користувачів…"
+  },
+  "settings.social.blocked-users.restriction.friend-requests": {
+    "defaultMessage": "Надсилати вам запити в друзі"
+  },
+  "settings.social.blocked-users.restriction.hosting": {
+    "defaultMessage": "Запрошувати вас керувати сервером Modrinth Hosting."
+  },
+  "settings.social.blocked-users.restriction.shared-instances": {
+    "defaultMessage": "Запрошувати вас до спільних збірок"
+  },
+  "settings.social.blocked-users.title": {
+    "defaultMessage": "Заблоковані користувачі"
+  },
+  "settings.social.blocked-users.unblock": {
+    "defaultMessage": "Розблокувати"
+  },
+  "settings.social.blocked-users.unblock-error": {
+    "defaultMessage": "Не вдалося розблокувати користувача"
+  },
+  "settings.social.blocked-users.unblock-error-description": {
+    "defaultMessage": "Сталася помилка під час розблокування цього користувача. Будь ласка, спробуйте ще раз."
+  },
+  "settings.social.blocked-users.unblock-user": {
+    "defaultMessage": "Розблокувати {username}"
+  },
+  "settings.social.blocked-users.user-avatar": {
+    "defaultMessage": "Аватар користувача {username}"
+  },
+  "settings.social.friend-requests.description": {
+    "defaultMessage": "Керуйте тим, хто може надсилати вам запити в друзі на Modrinth."
+  },
+  "settings.social.friend-requests.title": {
+    "defaultMessage": "Запити в друзі"
+  },
+  "settings.social.interaction-source.coming-soon": {
+    "defaultMessage": "Незабаром!"
+  },
+  "settings.social.interaction-source.everyone": {
+    "defaultMessage": "Усі"
+  },
+  "settings.social.interaction-source.friends": {
+    "defaultMessage": "Друзі"
+  },
+  "settings.social.interaction-source.friends-of-friends": {
+    "defaultMessage": "Друзі друзів"
+  },
+  "settings.social.interaction-source.no-one": {
+    "defaultMessage": "Ніхто"
+  },
+  "settings.social.shared-instance-invites.description": {
+    "defaultMessage": "Керуйте тим, хто може надсилати вам запрошення до спільних збірок та панелей Modrinth Hosting."
+  },
+  "settings.social.shared-instance-invites.title": {
+    "defaultMessage": "Запрошення"
+  },
+  "settings.social.sign-in-required.description": {
+    "defaultMessage": "З обліковим записом Modrinth ви можете налаштувати, хто може взаємодіяти з вами, або керувати заблокованими користувачами"
+  },
+  "settings.social.sign-in-required.title": {
+    "defaultMessage": "Потрібен обліковий запис Modrinth"
+  },
+  "settings.social.title": {
+    "defaultMessage": "Соціальні мережі"
+  },
+  "sharing.invite-players-modal.add": {
+    "defaultMessage": "Додати"
+  },
+  "sharing.invite-players-modal.added": {
+    "defaultMessage": "Додано"
+  },
+  "sharing.invite-players-modal.already-invited": {
+    "defaultMessage": "Цього користувача вже запрошено."
+  },
+  "sharing.invite-players-modal.apply-button": {
+    "defaultMessage": "Застосувати"
+  },
+  "sharing.invite-players-modal.avatar-alt": {
+    "defaultMessage": "Аватар користувача {username}"
+  },
+  "sharing.invite-players-modal.cancel": {
+    "defaultMessage": "Скасувати"
+  },
+  "sharing.invite-players-modal.cancel-button": {
+    "defaultMessage": "Скасувати"
+  },
+  "sharing.invite-players-modal.custom-expiry": {
+    "defaultMessage": "Власна…"
+  },
+  "sharing.invite-players-modal.custom-expiry-value": {
+    "defaultMessage": "Власна: {date}"
+  },
+  "sharing.invite-players-modal.edit-invite-link": {
+    "defaultMessage": "Редагувати посилання-запрошення."
+  },
+  "sharing.invite-players-modal.edit-invite-link-title": {
+    "defaultMessage": "Редагувати посилання-запрошення"
+  },
+  "sharing.invite-players-modal.expiry-in-one-day": {
+    "defaultMessage": "Через 1 день"
+  },
+  "sharing.invite-players-modal.expiry-in-one-hour": {
+    "defaultMessage": "Через 1 годину"
+  },
+  "sharing.invite-players-modal.expiry-in-seven-days": {
+    "defaultMessage": "Через 7 днів"
+  },
+  "sharing.invite-players-modal.expiry-in-six-hours": {
+    "defaultMessage": "Через 6 годин"
+  },
+  "sharing.invite-players-modal.expiry-in-three-days": {
+    "defaultMessage": "Через 3 дні"
+  },
+  "sharing.invite-players-modal.expiry-in-twelve-hours": {
+    "defaultMessage": "Через 12 годин"
+  },
+  "sharing.invite-players-modal.expiry-label": {
+    "defaultMessage": "Термін дії"
+  },
+  "sharing.invite-players-modal.friends-heading": {
+    "defaultMessage": "Ваші друзі — {count}"
+  },
+  "sharing.invite-players-modal.invite": {
+    "defaultMessage": "Запросити"
+  },
+  "sharing.invite-players-modal.invite-expiry-description": {
+    "defaultMessage": "Термін дії вашого посилання-запрошення закінчується через {duration}."
+  },
+  "sharing.invite-players-modal.invite-link-heading": {
+    "defaultMessage": "Або використайте посилання-запрошення"
+  },
+  "sharing.invite-players-modal.link-copied-text": {
+    "defaultMessage": "Посилання-запрошення скопійовано до буфера обміну."
+  },
+  "sharing.invite-players-modal.link-copied-title": {
+    "defaultMessage": "Посилання скопійовано"
+  },
+  "sharing.invite-players-modal.link-copy-failed-title": {
+    "defaultMessage": "Не вдалося скопіювати посилання"
+  },
+  "sharing.invite-players-modal.max-uses-label": {
+    "defaultMessage": "Максимальна кількість використань"
+  },
+  "sharing.invite-players-modal.no-friends": {
+    "defaultMessage": "Не знайдено друзів."
+  },
+  "sharing.invite-players-modal.no-search-results": {
+    "defaultMessage": "Відповідних користувачів не знайдено."
+  },
+  "sharing.invite-players-modal.requested": {
+    "defaultMessage": "Запит відправлено"
+  },
+  "sharing.invite-players-modal.requested-tooltip": {
+    "defaultMessage": "{username} спочатку має прийняти ваш запит у друзі"
+  },
+  "sharing.invite-players-modal.save-button": {
+    "defaultMessage": "Зберегти"
+  },
+  "sharing.invite-players-modal.search-placeholder": {
+    "defaultMessage": "Уведіть ім’я користувача Modrinth"
+  },
+  "sharing.invite-players-modal.searching": {
+    "defaultMessage": "Шукаємо…"
+  },
+  "sharing.invite-players-modal.update-invite-link-failed-title": {
+    "defaultMessage": "Не вдалося оновити посилання"
+  },
   "tag.category.128x": {
     "defaultMessage": "×128"
   },
diff --git a/packages/ui/src/locales/vi-VN/index.json b/packages/ui/src/locales/vi-VN/index.json
index 50d370d6d4..b356f09f22 100644
--- a/packages/ui/src/locales/vi-VN/index.json
+++ b/packages/ui/src/locales/vi-VN/index.json
@@ -5082,3 +5082,4 @@
     "defaultMessage": "Đội ngũ Modrinth"
   }
 }
+
diff --git a/packages/ui/src/locales/zh-CN/index.json b/packages/ui/src/locales/zh-CN/index.json
index e4f883d767..93120e2208 100644
--- a/packages/ui/src/locales/zh-CN/index.json
+++ b/packages/ui/src/locales/zh-CN/index.json
@@ -566,6 +566,9 @@
   "content.inline-backup.world-label": {
     "defaultMessage": "世界"
   },
+  "content.modpack-card.installation-settings": {
+    "defaultMessage": "安装设置"
+  },
   "content.page-layout.additional-content": {
     "defaultMessage": "附加内容"
   },
@@ -2240,6 +2243,9 @@
   "label.details": {
     "defaultMessage": "信息"
   },
+  "label.discover-content": {
+    "defaultMessage": "发现内容"
+  },
   "label.done": {
     "defaultMessage": "完成"
   },
@@ -2318,6 +2324,9 @@
   "label.password": {
     "defaultMessage": "密码"
   },
+  "label.permissions": {
+    "defaultMessage": "权限"
+  },
   "label.plan-custom": {
     "defaultMessage": "自定义"
   },
@@ -2849,9 +2858,177 @@
   "payment-method.visa": {
     "defaultMessage": "Visa"
   },
+  "profile.bio.fallback.creator": {
+    "defaultMessage": "一位 Modrinth 创作者。"
+  },
+  "profile.bio.fallback.user": {
+    "defaultMessage": "一位 Modrinth 用户。"
+  },
+  "profile.block-user.admonition-body": {
+    "defaultMessage": "{username} 将无法向你发送好友请求、将你邀请到共享实例或 Modrinth Hosting 服务器。"
+  },
+  "profile.block-user.admonition-title": {
+    "defaultMessage": "你确定要屏蔽该用户吗？"
+  },
+  "profile.block-user.error-description": {
+    "defaultMessage": "屏蔽该用户时发生了错误。请重试。"
+  },
+  "profile.block-user.error-title": {
+    "defaultMessage": "屏蔽用户失败"
+  },
+  "profile.block-user.success-description": {
+    "defaultMessage": "{username} 已被屏蔽。"
+  },
+  "profile.block-user.success-title": {
+    "defaultMessage": "用户已屏蔽"
+  },
+  "profile.block-user.title": {
+    "defaultMessage": "屏蔽 {username}"
+  },
+  "profile.button.analytics": {
+    "defaultMessage": "查看用户分析"
+  },
+  "profile.button.billing": {
+    "defaultMessage": "管理用户财务"
+  },
+  "profile.button.block": {
+    "defaultMessage": "屏蔽"
+  },
+  "profile.button.create-collection": {
+    "defaultMessage": "创建收藏夹"
+  },
+  "profile.button.create-project": {
+    "defaultMessage": "创建项目"
+  },
+  "profile.button.edit-role": {
+    "defaultMessage": "编辑角色"
+  },
+  "profile.button.info": {
+    "defaultMessage": "查看用户详情"
+  },
+  "profile.button.manage-projects": {
+    "defaultMessage": "管理项目"
+  },
+  "profile.button.remove-affiliate": {
+    "defaultMessage": "解除作为联盟伙伴"
+  },
+  "profile.button.set-affiliate": {
+    "defaultMessage": "设置为联盟伙伴"
+  },
+  "profile.button.unblock": {
+    "defaultMessage": "解除屏蔽"
+  },
+  "profile.collection.projects-count": {
+    "defaultMessage": "{count, plural, other {# 个项目}}"
+  },
+  "profile.details.error.github-popup-blocked": {
+    "defaultMessage": "请在来自 Modrinth 的弹出窗口中选择允许，然后重试。"
+  },
+  "profile.details.error.github-profile-message": {
+    "defaultMessage": "无法获取 GitHub 个人资料。请重试。"
+  },
+  "profile.details.error.github-profile-title": {
+    "defaultMessage": "无法打开 GitHub 个人主页"
+  },
+  "profile.details.label.auth-providers": {
+    "defaultMessage": "身份验证提供器"
+  },
+  "profile.details.label.email-verified": {
+    "defaultMessage": "电子邮箱已验证"
+  },
+  "profile.details.label.has-password": {
+    "defaultMessage": "是否有密码"
+  },
+  "profile.details.label.has-totp": {
+    "defaultMessage": "是否有 TOTP"
+  },
+  "profile.details.label.loading-github-profile": {
+    "defaultMessage": "正在加载……"
+  },
+  "profile.details.label.payment-methods": {
+    "defaultMessage": "支付方式"
+  },
+  "profile.details.label.view-github-profile": {
+    "defaultMessage": "查看个人资料"
+  },
+  "profile.details.title": {
+    "defaultMessage": "用户详情"
+  },
+  "profile.details.tooltip.email-not-verified": {
+    "defaultMessage": "电子邮箱未验证"
+  },
+  "profile.details.tooltip.email-verified": {
+    "defaultMessage": "电子邮箱已验证"
+  },
+  "profile.error.load-description": {
+    "defaultMessage": "无法加载该用户的个人资料。"
+  },
+  "profile.error.not-found": {
+    "defaultMessage": "未找到用户"
+  },
+  "profile.label.affiliate": {
+    "defaultMessage": "联盟"
+  },
   "profile.label.badges": {
     "defaultMessage": "荣誉徽章"
   },
+  "profile.label.collection": {
+    "defaultMessage": "收藏"
+  },
+  "profile.label.download-count": {
+    "defaultMessage": "{count, plural, other {次下载}}"
+  },
+  "profile.label.joined": {
+    "defaultMessage": "加入于"
+  },
+  "profile.label.no-collections": {
+    "defaultMessage": "该用户没有收藏夹！"
+  },
+  "profile.label.no-collections-auth-description": {
+    "defaultMessage": "你还没有任何收藏夹。"
+  },
+  "profile.label.no-projects": {
+    "defaultMessage": "该用户没有项目！"
+  },
+  "profile.label.no-projects-auth-description": {
+    "defaultMessage": "你还没有任何项目。"
+  },
+  "profile.label.organizations": {
+    "defaultMessage": "组织"
+  },
+  "profile.label.project-count": {
+    "defaultMessage": "{count, plural, other {项目}}"
+  },
+  "profile.label.saving": {
+    "defaultMessage": "正在保存……"
+  },
+  "profile.official-account": {
+    "defaultMessage": "官方 Modrinth 账户"
+  },
+  "profile.official-account.bio": {
+    "defaultMessage": "Modrinth 的官方用户账号。可通过 <support-link></support-link> 或电子邮件 <email></email> 获取支持"
+  },
+  "profile.role.select-placeholder": {
+    "defaultMessage": "选择角色"
+  },
+  "profile.role.update-error-description": {
+    "defaultMessage": "更新用户角色时发生了错误。请重试。"
+  },
+  "profile.role.update-error-title": {
+    "defaultMessage": "更新角色失败"
+  },
+  "profile.unblock-user.error-description": {
+    "defaultMessage": "解除屏蔽该用户时发生了错误。请重试。"
+  },
+  "profile.unblock-user.error-title": {
+    "defaultMessage": "解除屏蔽用户失败"
+  },
+  "profile.unblock-user.success-description": {
+    "defaultMessage": "{username} 已被解除屏蔽。"
+  },
+  "profile.unblock-user.success-title": {
+    "defaultMessage": "用户已解除屏蔽"
+  },
   "project-card.date.published.tooltip": {
     "defaultMessage": "发布于 {date}"
   },
@@ -2879,6 +3056,9 @@
   "project-type.all": {
     "defaultMessage": "全部"
   },
+  "project-type.collection.plural": {
+    "defaultMessage": "收藏夹"
+  },
   "project-type.datapack.capital": {
     "defaultMessage": "{count, plural, other {数据包}}"
   },
@@ -3564,10 +3744,10 @@
     "defaultMessage": "视图"
   },
   "project.stats.downloads-label": {
-    "defaultMessage": "{count, plural, other {下载量}}"
+    "defaultMessage": "{count, plural, other {次下载}}"
   },
   "project.stats.followers-label": {
-    "defaultMessage": "{count, plural, other {关注者}}"
+    "defaultMessage": "{count, plural, other {人关注}}"
   },
   "project.versions.channel.alpha.symbol": {
     "defaultMessage": "A"
@@ -3969,7 +4149,7 @@
     "defaultMessage": "角色：{role}"
   },
   "servers.access-page.role.editor": {
-    "defaultMessage": "编辑"
+    "defaultMessage": "编辑者"
   },
   "servers.access-page.role.editor-description": {
     "defaultMessage": "管理实例内容、文件、备份及其他设置。"
@@ -3984,13 +4164,13 @@
     "defaultMessage": "受限"
   },
   "servers.access-page.role.viewer-description": {
-    "defaultMessage": "可启动、停止并查看服务器状态，但无法进行更改。"
+    "defaultMessage": "可启动、停止和查看服务器，但无法进行更改。"
   },
   "servers.access-page.search-users-placeholder": {
     "defaultMessage": "搜索 {count} {count, plural, one {用户} other {用户}}………"
   },
   "servers.access-role.editor": {
-    "defaultMessage": "编辑"
+    "defaultMessage": "编辑者"
   },
   "servers.access-role.owner": {
     "defaultMessage": "所有者"
@@ -4467,7 +4647,7 @@
     "defaultMessage": "邀请"
   },
   "servers.grant-access-modal.permissions-help": {
-    "defaultMessage": "在<link>这里</link>查看各职务的完整清单。"
+    "defaultMessage": "在<link>这里</link>查看各角色权限的完整列表。"
   },
   "servers.grant-access-modal.role.editor": {
     "defaultMessage": "编辑"
@@ -4476,13 +4656,13 @@
     "defaultMessage": "管理实例内容、文件、备份及其他设置。"
   },
   "servers.grant-access-modal.role.label": {
-    "defaultMessage": "选择职能"
+    "defaultMessage": "选择角色"
   },
   "servers.grant-access-modal.role.viewer": {
-    "defaultMessage": "受制"
+    "defaultMessage": "受限"
   },
   "servers.grant-access-modal.role.viewer-description": {
-    "defaultMessage": "可以启动、停止与查看服务器，但无法进行任何更改。"
+    "defaultMessage": "可启动、停止和查看服务器，但无法进行更改。"
   },
   "servers.grant-access-modal.suggestion-avatar-alt": {
     "defaultMessage": "{username}的头像"
@@ -5105,9 +5285,120 @@
   "settings.pats.title": {
     "defaultMessage": "个人访问令牌"
   },
+  "settings.profile.bio.description": {
+    "defaultMessage": "用一段简短的描述，向大家展示你自己。"
+  },
+  "settings.profile.bio.title": {
+    "defaultMessage": "简介"
+  },
+  "settings.profile.navigation-title": {
+    "defaultMessage": "个人资料"
+  },
+  "settings.profile.profile-picture.title": {
+    "defaultMessage": "头像"
+  },
+  "settings.profile.public-information.description": {
+    "defaultMessage": "您的个人资料信息可以在 <profile-link>Modrinth 上公开查看</profile-link>，也可通过 <docs-link>Modrinth API</docs-link> 获取。"
+  },
+  "settings.profile.save-error": {
+    "defaultMessage": "更新档案失败"
+  },
+  "settings.profile.save-error-description": {
+    "defaultMessage": "更新个人资料失败，请稍后重试。"
+  },
+  "settings.profile.sign-in-required.description": {
+    "defaultMessage": "登录 Modrinth 账号以自定义您的公开资料。"
+  },
+  "settings.profile.sign-in-required.title": {
+    "defaultMessage": "需要 Modrinth 账户"
+  },
+  "settings.profile.username.description": {
+    "defaultMessage": "用于识别您个人资料的唯一名称。"
+  },
   "settings.sessions.title": {
     "defaultMessage": "会话"
   },
+  "settings.social.blocked-users.column.actions": {
+    "defaultMessage": "活动"
+  },
+  "settings.social.blocked-users.column.user": {
+    "defaultMessage": "用户"
+  },
+  "settings.social.blocked-users.description": {
+    "defaultMessage": "这些是你在 Modrinth 中屏蔽的用户。他们无法："
+  },
+  "settings.social.blocked-users.empty": {
+    "defaultMessage": "你还没有屏蔽任何人。"
+  },
+  "settings.social.blocked-users.load-error": {
+    "defaultMessage": "无法加载被屏蔽的用户。"
+  },
+  "settings.social.blocked-users.loading": {
+    "defaultMessage": "正在加载被屏蔽的用户…"
+  },
+  "settings.social.blocked-users.restriction.friend-requests": {
+    "defaultMessage": "给你发送好友邀请"
+  },
+  "settings.social.blocked-users.restriction.hosting": {
+    "defaultMessage": "邀请你管理 Modrinth 托管服务器。"
+  },
+  "settings.social.blocked-users.restriction.shared-instances": {
+    "defaultMessage": "邀请你加入共享实例"
+  },
+  "settings.social.blocked-users.title": {
+    "defaultMessage": "被屏蔽的用户"
+  },
+  "settings.social.blocked-users.unblock": {
+    "defaultMessage": "解除屏蔽"
+  },
+  "settings.social.blocked-users.unblock-error": {
+    "defaultMessage": "解除屏蔽用户失败"
+  },
+  "settings.social.blocked-users.unblock-error-description": {
+    "defaultMessage": "解除屏蔽该用户时发生了错误。请重试。"
+  },
+  "settings.social.blocked-users.unblock-user": {
+    "defaultMessage": "解除屏蔽 {username}"
+  },
+  "settings.social.blocked-users.user-avatar": {
+    "defaultMessage": "{username} 的头像"
+  },
+  "settings.social.friend-requests.description": {
+    "defaultMessage": "控制谁可以在 Modrinth 上向你发送好友申请。"
+  },
+  "settings.social.friend-requests.title": {
+    "defaultMessage": "好友邀请"
+  },
+  "settings.social.interaction-source.coming-soon": {
+    "defaultMessage": "即将到来！"
+  },
+  "settings.social.interaction-source.everyone": {
+    "defaultMessage": "所有人"
+  },
+  "settings.social.interaction-source.friends": {
+    "defaultMessage": "好友"
+  },
+  "settings.social.interaction-source.friends-of-friends": {
+    "defaultMessage": "好友的好友"
+  },
+  "settings.social.interaction-source.no-one": {
+    "defaultMessage": "无"
+  },
+  "settings.social.shared-instance-invites.description": {
+    "defaultMessage": "控制谁可以向您发送共享实例和 Modrinth 托管面板的邀请。"
+  },
+  "settings.social.shared-instance-invites.title": {
+    "defaultMessage": "邀请"
+  },
+  "settings.social.sign-in-required.description": {
+    "defaultMessage": "使用 Modrinth 账号，你可以控制谁能与你互动，并管理黑名单用户"
+  },
+  "settings.social.sign-in-required.title": {
+    "defaultMessage": "需要登录 Modrinth 账号"
+  },
+  "settings.social.title": {
+    "defaultMessage": "社交"
+  },
   "sharing.invite-players-modal.add": {
     "defaultMessage": "添加"
   },
@@ -5117,6 +5408,9 @@
   "sharing.invite-players-modal.already-invited": {
     "defaultMessage": "此用户已被邀请。"
   },
+  "sharing.invite-players-modal.apply-button": {
+    "defaultMessage": "应用"
+  },
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "{username} 的头像"
   },
@@ -5126,12 +5420,36 @@
   "sharing.invite-players-modal.cancel-button": {
     "defaultMessage": "取消"
   },
+  "sharing.invite-players-modal.custom-expiry": {
+    "defaultMessage": "自定义……"
+  },
+  "sharing.invite-players-modal.custom-expiry-value": {
+    "defaultMessage": "自定义：{date}"
+  },
   "sharing.invite-players-modal.edit-invite-link": {
     "defaultMessage": "编辑邀请链接。"
   },
   "sharing.invite-players-modal.edit-invite-link-title": {
     "defaultMessage": "编辑邀请链接"
   },
+  "sharing.invite-players-modal.expiry-in-one-day": {
+    "defaultMessage": "1 天"
+  },
+  "sharing.invite-players-modal.expiry-in-one-hour": {
+    "defaultMessage": "1 小时"
+  },
+  "sharing.invite-players-modal.expiry-in-seven-days": {
+    "defaultMessage": "7 天"
+  },
+  "sharing.invite-players-modal.expiry-in-six-hours": {
+    "defaultMessage": "6 小时"
+  },
+  "sharing.invite-players-modal.expiry-in-three-days": {
+    "defaultMessage": "3 天"
+  },
+  "sharing.invite-players-modal.expiry-in-twelve-hours": {
+    "defaultMessage": "12 小时"
+  },
   "sharing.invite-players-modal.expiry-label": {
     "defaultMessage": "过期日期"
   },
@@ -5937,3 +6255,4 @@
     "defaultMessage": "类型"
   }
 }
+
diff --git a/packages/ui/src/locales/zh-TW/index.json b/packages/ui/src/locales/zh-TW/index.json
index 191ff0108f..99b95591ea 100644
--- a/packages/ui/src/locales/zh-TW/index.json
+++ b/packages/ui/src/locales/zh-TW/index.json
@@ -561,11 +561,14 @@
     "defaultMessage": "按住 Shift 鍵並點選以跳過確認。"
   },
   "content.inline-backup.warning-body": {
-    "defaultMessage": "我們建議您在繼續操作之前建立備份，以便在出現任何問題時可以還原您的{type}。"
+    "defaultMessage": "我們建議在繼續操作前先建立備份，以便在發生問題時還原你的{type}。"
   },
   "content.inline-backup.world-label": {
     "defaultMessage": "世界"
   },
+  "content.modpack-card.installation-settings": {
+    "defaultMessage": "安裝設定"
+  },
   "content.page-layout.additional-content": {
     "defaultMessage": "額外內容"
   },
@@ -1278,10 +1281,10 @@
     "defaultMessage": "刪除檔案"
   },
   "files.delete-modal.warning.file": {
-    "defaultMessage": "此檔案將永久刪除。此操作無法撤銷。"
+    "defaultMessage": "這個檔案將永久刪除，這項動作無法復原。"
   },
   "files.delete-modal.warning.folder": {
-    "defaultMessage": "此資料夾及其所有內容將永久刪除。此操作無法撤銷。"
+    "defaultMessage": "這個資料夾及其所有內容將永久刪除，這項動作無法復原。"
   },
   "files.editor.failed-to-open-text": {
     "defaultMessage": "無法載入檔案內容。"
@@ -2240,6 +2243,9 @@
   "label.details": {
     "defaultMessage": "詳細資訊"
   },
+  "label.discover-content": {
+    "defaultMessage": "探索內容"
+  },
   "label.done": {
     "defaultMessage": "完成"
   },
@@ -2318,6 +2324,9 @@
   "label.password": {
     "defaultMessage": "密碼"
   },
+  "label.permissions": {
+    "defaultMessage": "權限"
+  },
   "label.plan-custom": {
     "defaultMessage": "自訂"
   },
@@ -2766,7 +2775,7 @@
     "defaultMessage": "由工作人員設為不公開"
   },
   "omorphia.component.copy.action.copy": {
-    "defaultMessage": "將程式碼複製到剪貼簿"
+    "defaultMessage": "將代碼複製到剪貼簿"
   },
   "omorphia.component.environment-indicator.label.client": {
     "defaultMessage": "用戶端"
@@ -2849,9 +2858,177 @@
   "payment-method.visa": {
     "defaultMessage": "Visa"
   },
+  "profile.bio.fallback.creator": {
+    "defaultMessage": "一位 Modrinth 創作者。"
+  },
+  "profile.bio.fallback.user": {
+    "defaultMessage": "一位 Modrinth 使用者。"
+  },
+  "profile.block-user.admonition-body": {
+    "defaultMessage": "{username} 將無法向你傳送好友邀請、邀請你加入共用實例，或邀請你加入 Modrinth Hosting 伺服器。"
+  },
+  "profile.block-user.admonition-title": {
+    "defaultMessage": "確定要封鎖這位使用者嗎？"
+  },
+  "profile.block-user.error-description": {
+    "defaultMessage": "封鎖使用者時發生錯誤，請再試一次。"
+  },
+  "profile.block-user.error-title": {
+    "defaultMessage": "無法封鎖使用者"
+  },
+  "profile.block-user.success-description": {
+    "defaultMessage": "{username} 已被封鎖。"
+  },
+  "profile.block-user.success-title": {
+    "defaultMessage": "使用者已封鎖"
+  },
+  "profile.block-user.title": {
+    "defaultMessage": "封鎖 {username}"
+  },
+  "profile.button.analytics": {
+    "defaultMessage": "檢視使用者數據分析"
+  },
+  "profile.button.billing": {
+    "defaultMessage": "管理使用者帳務"
+  },
+  "profile.button.block": {
+    "defaultMessage": "封鎖"
+  },
+  "profile.button.create-collection": {
+    "defaultMessage": "建立收藏"
+  },
+  "profile.button.create-project": {
+    "defaultMessage": "建立專案"
+  },
+  "profile.button.edit-role": {
+    "defaultMessage": "編輯身分"
+  },
+  "profile.button.info": {
+    "defaultMessage": "檢視使用者詳細資訊"
+  },
+  "profile.button.manage-projects": {
+    "defaultMessage": "管理專案"
+  },
+  "profile.button.remove-affiliate": {
+    "defaultMessage": "移除聯盟行銷夥伴資格"
+  },
+  "profile.button.set-affiliate": {
+    "defaultMessage": "設為聯盟行銷夥伴"
+  },
+  "profile.button.unblock": {
+    "defaultMessage": "解除封鎖"
+  },
+  "profile.collection.projects-count": {
+    "defaultMessage": "{count, plural, other {# 個專案}}"
+  },
+  "profile.details.error.github-popup-blocked": {
+    "defaultMessage": "請允許 Modrinth 的彈出式視窗，然後再試一次。"
+  },
+  "profile.details.error.github-profile-message": {
+    "defaultMessage": "無法擷取 GitHub 個人檔案，請再試一次。"
+  },
+  "profile.details.error.github-profile-title": {
+    "defaultMessage": "無法開啟 GitHub 個人檔案"
+  },
+  "profile.details.label.auth-providers": {
+    "defaultMessage": "驗證提供商"
+  },
+  "profile.details.label.email-verified": {
+    "defaultMessage": "電子郵件已驗證"
+  },
+  "profile.details.label.has-password": {
+    "defaultMessage": "是否有密碼"
+  },
+  "profile.details.label.has-totp": {
+    "defaultMessage": "是否有 TOTP"
+  },
+  "profile.details.label.loading-github-profile": {
+    "defaultMessage": "載入中..."
+  },
+  "profile.details.label.payment-methods": {
+    "defaultMessage": "付款方式"
+  },
+  "profile.details.label.view-github-profile": {
+    "defaultMessage": "查看個人檔案"
+  },
+  "profile.details.title": {
+    "defaultMessage": "使用者詳細資訊"
+  },
+  "profile.details.tooltip.email-not-verified": {
+    "defaultMessage": "電子郵件尚未驗證"
+  },
+  "profile.details.tooltip.email-verified": {
+    "defaultMessage": "電子郵件已驗證"
+  },
+  "profile.error.load-description": {
+    "defaultMessage": "無法載入使用者個人檔案。"
+  },
+  "profile.error.not-found": {
+    "defaultMessage": "找不到使用者"
+  },
+  "profile.label.affiliate": {
+    "defaultMessage": "聯盟行銷"
+  },
   "profile.label.badges": {
     "defaultMessage": "徽章"
   },
+  "profile.label.collection": {
+    "defaultMessage": "收藏"
+  },
+  "profile.label.download-count": {
+    "defaultMessage": "{count, plural, other {次下載}}"
+  },
+  "profile.label.joined": {
+    "defaultMessage": "加入時間："
+  },
+  "profile.label.no-collections": {
+    "defaultMessage": "這位使用者沒有任何收藏！"
+  },
+  "profile.label.no-collections-auth-description": {
+    "defaultMessage": "你還沒有任何收藏。"
+  },
+  "profile.label.no-projects": {
+    "defaultMessage": "這位使用者沒有任何專案！"
+  },
+  "profile.label.no-projects-auth-description": {
+    "defaultMessage": "你還沒有任何專案。"
+  },
+  "profile.label.organizations": {
+    "defaultMessage": "組織"
+  },
+  "profile.label.project-count": {
+    "defaultMessage": "{count, plural, other {個專案}}"
+  },
+  "profile.label.saving": {
+    "defaultMessage": "正在儲存..."
+  },
+  "profile.official-account": {
+    "defaultMessage": "Modrinth 官方帳號"
+  },
+  "profile.official-account.bio": {
+    "defaultMessage": "Modrinth 的官方使用者帳號。請至 <support-link></support-link> 取得支援，或透過電子郵件 <email></email> 聯絡客服團隊"
+  },
+  "profile.role.select-placeholder": {
+    "defaultMessage": "選擇身分"
+  },
+  "profile.role.update-error-description": {
+    "defaultMessage": "更新使用者身分時發生錯誤，請再試一次。"
+  },
+  "profile.role.update-error-title": {
+    "defaultMessage": "無法更新身分"
+  },
+  "profile.unblock-user.error-description": {
+    "defaultMessage": "解除封鎖使用者時發生錯誤，請再試一次。"
+  },
+  "profile.unblock-user.error-title": {
+    "defaultMessage": "無法解除封鎖使用者"
+  },
+  "profile.unblock-user.success-description": {
+    "defaultMessage": "{username} 已解除封鎖。"
+  },
+  "profile.unblock-user.success-title": {
+    "defaultMessage": "使用者已解除封鎖"
+  },
   "project-card.date.published.tooltip": {
     "defaultMessage": "發布時間：{date}"
   },
@@ -2879,6 +3056,9 @@
   "project-type.all": {
     "defaultMessage": "全部"
   },
+  "project-type.collection.plural": {
+    "defaultMessage": "收藏"
+  },
   "project-type.datapack.capital": {
     "defaultMessage": "{count, plural, other {資料包}}"
   },
@@ -3540,7 +3720,7 @@
     "defaultMessage": "成員"
   },
   "project.settings.notice.no-permission.description": {
-    "defaultMessage": "你沒有編輯這個設定的權限。"
+    "defaultMessage": "你沒有編輯這項設定的權限。"
   },
   "project.settings.notice.no-permission.title": {
     "defaultMessage": "沒有權限"
@@ -3561,7 +3741,7 @@
     "defaultMessage": "版本"
   },
   "project.settings.view.title": {
-    "defaultMessage": "檢視"
+    "defaultMessage": "檢視方式"
   },
   "project.stats.downloads-label": {
     "defaultMessage": "{count, plural, other {次下載}}"
@@ -4011,7 +4191,7 @@
     "defaultMessage": "{seconds} 秒後可重新傳送"
   },
   "servers.access-table.column.actions": {
-    "defaultMessage": "操作"
+    "defaultMessage": "動作"
   },
   "servers.access-table.column.joined": {
     "defaultMessage": "加入時間"
@@ -5105,9 +5285,120 @@
   "settings.pats.title": {
     "defaultMessage": "個人存取權杖"
   },
+  "settings.profile.bio.description": {
+    "defaultMessage": "簡單介紹一下你自己。"
+  },
+  "settings.profile.bio.title": {
+    "defaultMessage": "關於我"
+  },
+  "settings.profile.navigation-title": {
+    "defaultMessage": "個人檔案"
+  },
+  "settings.profile.profile-picture.title": {
+    "defaultMessage": "個人檔案相片"
+  },
+  "settings.profile.public-information.description": {
+    "defaultMessage": "你的個人檔案資訊會<profile-link>公開顯示在 Modrinth 上</profile-link>，並可透過 <docs-link>Modrinth API</docs-link> 查詢。"
+  },
+  "settings.profile.save-error": {
+    "defaultMessage": "無法更新個人檔案"
+  },
+  "settings.profile.save-error-description": {
+    "defaultMessage": "更新個人檔案時發生錯誤，請再試一次。"
+  },
+  "settings.profile.sign-in-required.description": {
+    "defaultMessage": "登入 Modrinth 帳號即可自訂你的公開個人檔案。"
+  },
+  "settings.profile.sign-in-required.title": {
+    "defaultMessage": "需要 Modrinth 帳號"
+  },
+  "settings.profile.username.description": {
+    "defaultMessage": "獨特且不區分大小寫的名稱，用於識別你的個人檔案。"
+  },
   "settings.sessions.title": {
     "defaultMessage": "工作階段"
   },
+  "settings.social.blocked-users.column.actions": {
+    "defaultMessage": "動作"
+  },
+  "settings.social.blocked-users.column.user": {
+    "defaultMessage": "使用者"
+  },
+  "settings.social.blocked-users.description": {
+    "defaultMessage": "以下是你在 Modrinth 上封鎖的使用者。他們無法："
+  },
+  "settings.social.blocked-users.empty": {
+    "defaultMessage": "你沒有封鎖任何使用者。"
+  },
+  "settings.social.blocked-users.load-error": {
+    "defaultMessage": "無法載入已封鎖的使用者。"
+  },
+  "settings.social.blocked-users.loading": {
+    "defaultMessage": "正在載入已封鎖的使用者..."
+  },
+  "settings.social.blocked-users.restriction.friend-requests": {
+    "defaultMessage": "傳送好友邀請給你"
+  },
+  "settings.social.blocked-users.restriction.hosting": {
+    "defaultMessage": "邀請你管理 Modrinth Hosting 伺服器。"
+  },
+  "settings.social.blocked-users.restriction.shared-instances": {
+    "defaultMessage": "邀請你加入共用實例"
+  },
+  "settings.social.blocked-users.title": {
+    "defaultMessage": "封鎖名單"
+  },
+  "settings.social.blocked-users.unblock": {
+    "defaultMessage": "解除封鎖"
+  },
+  "settings.social.blocked-users.unblock-error": {
+    "defaultMessage": "無法解除封鎖使用者"
+  },
+  "settings.social.blocked-users.unblock-error-description": {
+    "defaultMessage": "解除封鎖使用者時發生錯誤，請再試一次。"
+  },
+  "settings.social.blocked-users.unblock-user": {
+    "defaultMessage": "解除封鎖 {username}"
+  },
+  "settings.social.blocked-users.user-avatar": {
+    "defaultMessage": "{username} 的顯示圖片"
+  },
+  "settings.social.friend-requests.description": {
+    "defaultMessage": "控制誰可以在 Modrinth 向你傳送好友邀請。"
+  },
+  "settings.social.friend-requests.title": {
+    "defaultMessage": "好友邀請"
+  },
+  "settings.social.interaction-source.coming-soon": {
+    "defaultMessage": "即將推出！"
+  },
+  "settings.social.interaction-source.everyone": {
+    "defaultMessage": "所有人"
+  },
+  "settings.social.interaction-source.friends": {
+    "defaultMessage": "好友"
+  },
+  "settings.social.interaction-source.friends-of-friends": {
+    "defaultMessage": "好友的好友"
+  },
+  "settings.social.interaction-source.no-one": {
+    "defaultMessage": "沒有人"
+  },
+  "settings.social.shared-instance-invites.description": {
+    "defaultMessage": "控制誰可以向你傳送共用實例和 Modrinth Hosting 面板的邀請。"
+  },
+  "settings.social.shared-instance-invites.title": {
+    "defaultMessage": "邀請"
+  },
+  "settings.social.sign-in-required.description": {
+    "defaultMessage": "你可以透過 Modrinth 帳號控制誰可以與你互動，並管理被封鎖的使用者"
+  },
+  "settings.social.sign-in-required.title": {
+    "defaultMessage": "需要 Modrinth 帳號"
+  },
+  "settings.social.title": {
+    "defaultMessage": "社交"
+  },
   "sharing.invite-players-modal.add": {
     "defaultMessage": "新增"
   },
@@ -5115,7 +5406,10 @@
     "defaultMessage": "已加入"
   },
   "sharing.invite-players-modal.already-invited": {
-    "defaultMessage": "這個使用者已經被邀請。"
+    "defaultMessage": "這位使用者已經被邀請。"
+  },
+  "sharing.invite-players-modal.apply-button": {
+    "defaultMessage": "套用"
   },
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "{username} 的顯示圖片"
@@ -5126,14 +5420,38 @@
   "sharing.invite-players-modal.cancel-button": {
     "defaultMessage": "取消"
   },
+  "sharing.invite-players-modal.custom-expiry": {
+    "defaultMessage": "自訂..."
+  },
+  "sharing.invite-players-modal.custom-expiry-value": {
+    "defaultMessage": "自訂：{date}"
+  },
   "sharing.invite-players-modal.edit-invite-link": {
     "defaultMessage": "編輯邀請連結。"
   },
   "sharing.invite-players-modal.edit-invite-link-title": {
     "defaultMessage": "編輯邀請連結"
   },
+  "sharing.invite-players-modal.expiry-in-one-day": {
+    "defaultMessage": "1 天"
+  },
+  "sharing.invite-players-modal.expiry-in-one-hour": {
+    "defaultMessage": "1 小時"
+  },
+  "sharing.invite-players-modal.expiry-in-seven-days": {
+    "defaultMessage": "7 天"
+  },
+  "sharing.invite-players-modal.expiry-in-six-hours": {
+    "defaultMessage": "6 小時"
+  },
+  "sharing.invite-players-modal.expiry-in-three-days": {
+    "defaultMessage": "3 天"
+  },
+  "sharing.invite-players-modal.expiry-in-twelve-hours": {
+    "defaultMessage": "12 小時"
+  },
   "sharing.invite-players-modal.expiry-label": {
-    "defaultMessage": "有效期限"
+    "defaultMessage": "有效時間"
   },
   "sharing.invite-players-modal.friends-heading": {
     "defaultMessage": "你的好友 - {count}"
@@ -5937,3 +6255,4 @@
     "defaultMessage": "類型"
   }
 }
+

From 6cfe999cb3107e9742de350f07c85383964f43f8 Mon Sep 17 00:00:00 2001
From: "Calum H." <calum@modrinth.com>
Date: Tue, 4 Aug 2026 19:01:21 +0100
Subject: [PATCH 23/82] fix(shared-instances): allow nbt configs (#6993)

fix: allow nbt configs
---
 packages/app-lib/src/api/instance/shared/mod.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/app-lib/src/api/instance/shared/mod.rs b/packages/app-lib/src/api/instance/shared/mod.rs
index b0e87153da..b13cae82e8 100644
--- a/packages/app-lib/src/api/instance/shared/mod.rs
+++ b/packages/app-lib/src/api/instance/shared/mod.rs
@@ -31,7 +31,7 @@ pub(crate) const CONFIG_DIRECTORY: &str = "config";
 pub(crate) const MAX_CONFIG_BUNDLE_ENTRIES: usize = 4096;
 pub(crate) const MAX_CONFIG_BUNDLE_FILE_SIZE: u64 = 16 * 1024 * 1024;
 pub(crate) const MAX_CONFIG_BUNDLE_TOTAL_SIZE: u64 = 128 * 1024 * 1024;
-pub(crate) const CONFIG_FILE_EXTENSIONS: [&str; 13] = [
+pub(crate) const CONFIG_FILE_EXTENSIONS: [&str; 14] = [
     "json",
     "json5",
     "jsonc",
@@ -45,6 +45,7 @@ pub(crate) const CONFIG_FILE_EXTENSIONS: [&str; 13] = [
     "conf",
     "properties",
     "xml",
+    "nbt",
 ];
 
 pub(crate) fn read_bounded_config_bundle_entry(

From bb2193b6f5786d4c29bb14ee1e3d85622fa5f7f4 Mon Sep 17 00:00:00 2001
From: "Calum H." <calum@modrinth.com>
Date: Tue, 4 Aug 2026 21:54:04 +0100
Subject: [PATCH 24/82] refactor: Button components (#6929)

* feat: refactor button components

* fix: qa

* fix: storybook

* a11y: pass

* fix: build

* fix: rename default ->md

* fix: lint

* docs: buttons.md

* refactor part 1

* refactor part 2

* fix: undo refactor for fresh restart

* refactor

* Revert "refactor"

This reverts commit 96d65902d75fa766aafef3a3ef03746b9aa4ab70.

* refactor: part 1

* fix: qa

* fix: qa

* fix: qa

* fix: qa

* fix: qa

* fix: qa

* fix: qa

* fix: qa

* fix: remove text-contrast

* fix: qa

* fix: v-tooltip

* fix: lint

* fix: split broken

* fix: passkey qa

* fix: qa

* fix: qa

* fix: prepr

* fix: splitbutton

* improve button group seam

---------

Signed-off-by: Calum H. <calum@modrinth.com>
Co-authored-by: Prospector <6166773+Prospector@users.noreply.github.com>
---
 apps/app-frontend/src/App.vue                 | 106 ++-
 .../src/components/ui/AccountsCard.vue        |  49 +-
 .../src/components/ui/AddContentButton.vue    |  45 +-
 .../src/components/ui/AppActionBar.vue        |  44 +-
 .../src/components/ui/ErrorModal.vue          |  37 +-
 .../src/components/ui/ExportModal.vue         |  22 +-
 .../src/components/ui/Instance.vue            | 123 +--
 .../src/components/ui/InstanceIndicator.vue   |   6 +-
 .../src/components/ui/JavaDetectionModal.vue  |  45 +-
 .../src/components/ui/JavaSelector.vue        | 109 ++-
 .../src/components/ui/ModpackVersionModal.vue |  22 +-
 .../src/components/ui/SurveyPopup.vue         |  22 +-
 .../src/components/ui/URLConfirmModal.vue     |   6 +-
 .../src/components/ui/WindowControls.vue      |  48 +-
 .../components/ui/app-update-button/index.vue |  45 +-
 .../src/components/ui/friends/FriendsList.vue |  97 +-
 .../components/ui/friends/FriendsSection.vue  |  56 +-
 .../install_flow/AddServerToInstanceModal.vue |  24 +-
 .../MinecraftAuthErrorModal.vue               |  43 +-
 .../MinecraftRequiredModal.vue                |  61 +-
 .../ui/modal/ConfirmDeleteInstanceModal.vue   |  22 +-
 .../ui/modal/InstallToPlayModal.vue           |  60 +-
 .../ui/modal/ModpackAlreadyInstalledModal.vue |  32 +-
 .../ui/modal/ModrinthAccountRequiredModal.vue |  58 +-
 .../ui/settings/account/PrivacySettings.vue   |  12 +-
 .../settings/display/FeatureFlagSettings.vue  |  17 +-
 .../instances/ResourceManagementSettings.vue  |  29 +-
 .../SharedInstanceAlreadyInstalledModal.vue   |  32 +-
 .../shared-instance-install-modal/index.vue   |  62 +-
 .../shared-instance-install-summary.vue       |  12 +-
 .../src/components/ui/skin/EditSkinModal.vue  |  38 +-
 .../ui/skin/VirtualSkinSectionList.vue        |  99 +-
 .../src/components/ui/world/InstanceItem.vue  |  99 +-
 .../src/components/ui/world/WorldItem.vue     | 345 +++----
 .../ui/world/modal/AddServerModal.vue         |  32 +-
 .../world/modal/ConfirmRemoveWorldModal.vue   |  27 +-
 .../ui/world/modal/EditServerModal.vue        |  22 +-
 .../modal/EditSingleplayerWorldModal.vue      |  32 +-
 .../app-frontend/src/locales/en-US/index.json |   3 +
 apps/app-frontend/src/pages/Skins.vue         |  88 +-
 apps/app-frontend/src/pages/User.vue          |  86 +-
 .../admonitions/shared-instance-stale.vue     |  40 +-
 .../shared-instance-unavailable.vue           |  12 +-
 .../shared-instance-update-available.vue      |  12 +-
 .../instance/components/page-header/index.vue | 171 ++--
 ...rm-revoke-shared-instance-invite-modal.vue |  22 +-
 .../settings-modal/general-settings.vue       |  81 +-
 .../settings-modal/java-settings.vue          |  77 +-
 ...nstance-installation-settings-controls.vue |  57 +-
 .../settings-modal/sharing-settings.vue       |  45 +-
 .../src/pages/instance/content/index.vue      |   6 +-
 .../src/pages/instance/share/index.vue        |  38 +-
 .../share/shared-instance-members-table.vue   |  65 +-
 .../shared-instance-remove-member-modal.vue   |  18 +-
 .../src/pages/instance/worlds/index.vue       |  63 +-
 apps/app-frontend/src/pages/library/Index.vue |  22 +-
 .../src/pages/project/Gallery.vue             |  70 +-
 apps/app-frontend/src/pages/project/Index.vue | 186 ++--
 .../src/pages/project/Version.vue             | 111 ++-
 .../src/pages/project/Versions.vue            |  95 +-
 .../src/assets/styles/components.scss         |   2 +-
 .../AnalyticsChartRenderLimitModal.vue        |  18 +-
 .../analytics-table/index.vue                 |  42 +-
 .../components/analytics-dashboard/index.vue  |  38 +-
 .../query-builder/QueryFilter.vue             |   3 +
 .../query-builder/TimeframePicker.vue         |   9 +
 .../query-builder/index.vue                   |  37 +-
 .../stat-cards/StatCards.vue                  |  18 +-
 apps/frontend/src/components/ui/Accordion.vue |  29 +-
 .../src/components/ui/AuthorizationCard.vue   |  12 +-
 .../components/ui/ConfirmTransferOrgModal.vue |  22 +-
 .../ui/ConfirmTransferProjectModal.vue        |  22 +-
 .../src/components/ui/ModrinthFooter.vue      |  41 +-
 .../src/components/ui/NewsletterButton.vue    |  22 +-
 .../src/components/ui/NotificationItem.vue    | 183 ++--
 .../components/ui/OrganizationPageHeader.vue  |  40 +-
 .../ui/OrganizationProjectTransferModal.vue   |  45 +-
 .../ui/ProjectCollectionSaveButton.vue        | 102 +-
 .../CompatibleVersionCard.vue                 |  52 +-
 .../DownloadDependency.vue                    |  44 +-
 .../InstallWithModrinthApp.vue                |  26 +-
 .../ui/ProjectDownloadModal/index.vue         |  92 +-
 .../src/components/ui/ProjectMemberHeader.vue |  22 +-
 .../src/components/ui/ShareArticleButtons.vue | 103 +-
 .../ui/SharedInstanceInviteOpenInAppModal.vue |  34 +-
 .../ui/admin/AdminBillingChargeCard.vue       |  34 +-
 .../components/ui/admin/AssignNoticeModal.vue |  47 +-
 .../components/ui/admin/BatchCreditModal.vue  |  37 +-
 .../src/components/ui/admin/TransferModal.vue |  57 +-
 .../src/components/ui/auth/CreateAccount.vue  |  22 +-
 .../components/ui/auth/PasskeySettings.vue    | 131 ++-
 .../src/components/ui/auth/SignIn.vue         | 108 ++-
 .../src/components/ui/auth/SignUp.vue         | 123 ++-
 .../ui/banner/GeneratedStateErrorsBanner.vue  |  27 +-
 .../components/ui/banner/PreviewBanner.vue    |  14 +-
 .../src/components/ui/banner/RussiaBanner.vue |  38 +-
 .../components/ui/banner/StagingBanner.vue    |  20 +-
 .../SubscriptionPaymentFailedBanner.vue       |  12 +-
 .../ui/banner/TaxComplianceBanner.vue         |  14 +-
 .../ui/banner/TaxIdMismatchBanner.vue         |  18 +-
 .../ui/banner/VerifyEmailBanner.vue           |  19 +-
 .../components/AddedDependencyRow.vue         |  10 +-
 .../components/McVersionPicker.vue            |  68 +-
 .../SuggestedDependency.vue                   |  10 +-
 .../components/VersionFileRow.vue             |  63 +-
 .../stages/LoadersStage.vue                   |   6 +-
 .../stages/McVersionsStage.vue                |   6 +-
 .../stages/MetadataStage.vue                  |  82 +-
 .../ui/create/CollectionCreateModal.vue       |  22 +-
 .../components/ui/create/CreateLimitAlert.vue |  23 +-
 .../ui/create/OrganizationCreateModal.vue     |  22 +-
 .../ui/create/ProjectCreateModal.vue          |  28 +-
 .../ui/dashboard/CreatorTaxFormModal.vue      |  43 +-
 .../ui/dashboard/CreatorWithdrawModal.vue     |  65 +-
 .../ui/dashboard/RevenueInputField.vue        |  10 +-
 .../ui/dashboard/RevenueTransaction.vue       |  14 +-
 .../LegacyPaypalDetailsStage.vue              |  56 +-
 .../withdraw-stages/MethodSelectionStage.vue  |  39 +-
 .../withdraw-stages/TaxFormStage.vue          |  10 +-
 .../ui/moderation/BatchScanProgressAlert.vue  |  11 +-
 .../moderation/GlobalDetailLocalTraceCard.vue |  12 +-
 .../ui/moderation/GlobalDetailTracesList.vue  |  42 +-
 .../ui/moderation/MaliciousSummaryModal.vue   |  51 +-
 .../ui/moderation/ModerationProjectNags.vue   |  35 +-
 .../ui/moderation/ModerationQueueCard.vue     |  32 +-
 .../ui/moderation/ModerationReportCard.vue    |  79 +-
 .../ui/moderation/ModerationTechRevCard.vue   | 228 +++--
 .../ui/moderation/ModpackScanModal.vue        |  74 +-
 .../SharedInstanceReportContext.vue           |  49 +-
 .../checklist/ModerationChecklist.vue         | 358 +++----
 .../checklist/ModpackPermissionsFlow.vue      | 108 ++-
 .../ui/moderation/checklist/NodeRenderer.vue  | 146 ++-
 .../moderation/settings/ModerationKeybind.vue |  17 +-
 .../src/components/ui/news/LatestNewsRow.vue  |  12 +-
 .../ui/project-settings/CompatibilityCard.vue |  46 +-
 .../stages/UploadCustomModpack.vue            |  29 +-
 .../servers/marketing/MedalPlanPromotion.vue  |  18 +-
 .../servers/marketing/ServerPlanSelector.vue  |  30 +-
 .../ui/thread/ConversationThread.vue          | 583 ++++++------
 .../components/ui/thread/ThreadMessage.vue    |  36 +-
 .../src/components/ui/thread/ThreadView.vue   |  66 +-
 apps/frontend/src/error.vue                   |  21 +-
 apps/frontend/src/layouts/default.vue         | 895 ++++++++++--------
 apps/frontend/src/pages/[type]/[project].vue  | 354 +++----
 .../src/pages/[type]/[project]/changelog.vue  |  25 +-
 .../src/pages/[type]/[project]/gallery.vue    | 260 ++---
 .../[type]/[project]/settings/environment.vue |  18 +-
 .../[type]/[project]/settings/gallery.vue     | 260 ++---
 .../pages/[type]/[project]/settings/index.vue | 133 +--
 .../[type]/[project]/settings/license.vue     |  34 +-
 .../pages/[type]/[project]/settings/links.vue |  54 +-
 .../[type]/[project]/settings/members.vue     | 190 ++--
 .../[type]/[project]/settings/permissions.vue |  62 +-
 .../[type]/[project]/settings/server.vue      |  28 +-
 .../[type]/[project]/settings/versions.vue    | 388 ++++----
 .../[type]/[project]/version/[version].vue    | 502 +++++-----
 .../src/pages/[type]/[project]/versions.vue   | 384 ++++----
 apps/frontend/src/pages/admin/affiliates.vue  |  12 +-
 .../src/pages/admin/analytics/events.vue      |  90 +-
 .../src/pages/admin/billing/[user].vue        | 100 +-
 apps/frontend/src/pages/admin/docs.vue        |  35 +-
 apps/frontend/src/pages/admin/emails.vue      |  34 +-
 .../src/pages/admin/servers/notices.vue       |  62 +-
 .../src/pages/admin/servers/transfers.vue     |  28 +-
 apps/frontend/src/pages/admin/user_email.vue  |  12 +-
 apps/frontend/src/pages/app.vue               |  35 +-
 apps/frontend/src/pages/auth/authorize.vue    |  29 +-
 .../src/pages/auth/reset-password.vue         |  28 +-
 apps/frontend/src/pages/auth/verify-email.vue |  75 +-
 .../src/pages/collection/[collection].vue     | 142 +--
 apps/frontend/src/pages/dashboard.vue         |  12 +-
 .../src/pages/dashboard/affiliate-links.vue   |  12 +-
 .../src/pages/dashboard/collections.vue       |  17 +-
 apps/frontend/src/pages/dashboard/index.vue   |  12 +-
 .../src/pages/dashboard/notifications.vue     |  22 +-
 .../src/pages/dashboard/organizations.vue     |  12 +-
 .../frontend/src/pages/dashboard/projects.vue | 179 ++--
 .../src/pages/dashboard/revenue/transfers.vue |  21 +-
 apps/frontend/src/pages/hosting/index.vue     |  45 +-
 apps/frontend/src/pages/index.vue             |  36 +-
 .../pages/moderation/external-projects.vue    |  54 +-
 .../pages/moderation/global-traces/[key].vue  |  23 +-
 apps/frontend/src/pages/moderation/index.vue  |  33 +-
 .../src/pages/moderation/reports/index.vue    |  19 +-
 .../moderation/technical-review/[project].vue |  12 +-
 .../moderation/technical-review/index.vue     |  15 +-
 .../src/pages/news/article/[slug].vue         |  29 +-
 apps/frontend/src/pages/news/index.vue        |  29 +-
 .../src/pages/organization/[organization].vue |  22 +-
 .../[organization]/settings/index.vue         |  53 +-
 .../[organization]/settings/members.vue       | 151 +--
 .../[organization]/settings/projects.vue      | 181 ++--
 apps/frontend/src/pages/plus.vue              |  44 +-
 apps/frontend/src/pages/report.vue            |  61 +-
 apps/frontend/src/pages/settings/account.vue  | 306 +++---
 .../src/pages/settings/applications.vue       | 182 ++--
 .../src/pages/settings/billing/index.vue      | 329 +++----
 apps/frontend/src/pages/settings/flags.vue    |  14 +-
 apps/frontend/src/pages/settings/index.vue    |  28 +-
 apps/frontend/src/pages/settings/pats.vue     | 124 +--
 apps/frontend/src/pages/settings/sessions.vue |  10 +-
 apps/frontend/src/pages/share/[inviteId].vue  |  12 +-
 packages/assets/styles/classes.scss           |   2 +-
 packages/ui/.storybook/main.ts                |   7 +-
 packages/ui/CLAUDE.md                         |   2 +-
 .../affiliate/AffiliateLinkCard.vue           |  20 +-
 .../affiliate/AffiliateLinkCreateModal.vue    |  21 +-
 .../ui/src/components/base/Admonition.vue     |  26 +-
 .../ui/src/components/base/BaseTerminal.vue   |  10 +-
 packages/ui/src/components/base/Button.vue    | 142 ---
 .../ui/src/components/base/ButtonStyled.vue   | 397 --------
 packages/ui/src/components/base/Card.vue      |  10 +-
 packages/ui/src/components/base/Chips.vue     |   8 +-
 .../components/base/CollapsibleAdmonition.vue |  36 +-
 .../src/components/base/CollapsibleRegion.vue |  18 +-
 packages/ui/src/components/base/Combobox.vue  |  45 +-
 .../ui/src/components/base/DatePicker.vue     |  68 +-
 .../src/components/base/DropdownFilterBar.vue |  44 +-
 .../components/base/ErrorInformationCard.vue  |  40 +-
 .../ui/src/components/base/FloatingPanel.vue  |  27 +-
 .../ui/src/components/base/I18nDebugPanel.vue |  63 +-
 .../ui/src/components/base/IconSelect.vue     |  19 +-
 .../ui/src/components/base/JoinedButtons.vue  | 151 ---
 .../ui/src/components/base/ManySelect.vue     |  49 +-
 .../ui/src/components/base/MarkdownEditor.vue | 126 ++-
 .../ui/src/components/base/MultiSelect.vue    |  68 +-
 .../src/components/base/MultiStageModal.vue   |  89 +-
 .../ui/src/components/base/OverflowMenu.vue   | 149 ---
 .../ui/src/components/base/Pagination.vue     |  67 +-
 .../ui/src/components/base/ServerNotice.vue   |  20 +-
 .../components/base/StackedAdmonitions.vue    |  55 +-
 .../components/base/TeleportOverflowMenu.vue  | 522 ----------
 .../src/components/base/TimeFramePicker.vue   |  39 +-
 .../components/base/UnsavedChangesPopup.vue   |  23 +-
 .../ui/src/components/base/buttons/Button.vue |  35 +
 .../components/base/buttons/ButtonFrame.vue   | 165 ++++
 .../components/base/buttons/ButtonGroup.vue   |  85 ++
 .../components/base/buttons/ButtonLink.vue    |  67 ++
 .../components/base/buttons/FileButton.vue    |  85 ++
 .../components/base/buttons/IconButton.vue    |  58 ++
 .../components/base/buttons/SplitButton.vue   |  88 ++
 .../base/buttons/TeleportOverflowMenu.vue     | 469 +++++++++
 .../base/buttons/TeleportPopoutMenu.vue       | 149 +++
 .../ui/src/components/base/buttons/index.ts   |  23 +
 .../ui/src/components/base/buttons/types.ts   | 105 ++
 packages/ui/src/components/base/index.ts      |  32 +-
 .../billing/AddPaymentMethodModal.vue         |  24 +-
 .../billing/ModrinthServersPurchaseModal.vue  |  85 +-
 .../components/billing/ResubscribeModal.vue   |  23 +-
 .../billing/ServersGuestPlanModal.vue         |  21 +-
 .../billing/ServersPurchase0Plan.vue          |  89 +-
 .../billing/ServersPurchase3Review.vue        |  13 +-
 packages/ui/src/components/chart/Chart.vue    |  14 +-
 .../AddFilesToAttributionGroupModal.vue       |  35 +-
 .../AddToExistingExternalProjectModal.vue     |  77 +-
 .../AddToGlobalPermissionsDatabaseModal.vue   |  46 +-
 .../external_files/AttributionEditor.vue      |  66 +-
 .../ExternalProjectLookupCard.vue             |  18 +-
 .../ExternalProjectPermissionsCard.vue        | 230 ++---
 .../components/CustomSetupStage.vue           |  22 +-
 .../components/ImportInstanceStage.vue        |  38 +-
 .../components/ModpackStage.vue               |  45 +-
 .../components/modal/ConfirmLeaveModal.vue    |  22 +-
 .../ui/src/components/modal/ConfirmModal.vue  |  28 +-
 packages/ui/src/components/modal/NewModal.vue |  40 +-
 .../src/components/modal/OpenInAppModal.vue   |  36 +-
 .../ui/src/components/modal/ShareModal.vue    | 171 ++--
 .../modal/UnknownFileWarningModal.vue         |  21 +-
 .../src/components/nav/NotificationPanel.vue  |  59 +-
 .../components/nav/PopupNotificationPanel.vue |  43 +-
 .../notifications/NotificationToast.vue       | 106 ++-
 .../ui/src/components/page/NormalPage.vue     |   6 +
 .../project/ProjectPageVersions.vue           |  14 +-
 .../server/ServerModpackContentCard.vue       |  17 +-
 .../environment/ProjectEnvironmentModal.vue   |  34 +-
 .../components/search/SearchSidebarFilter.vue |  63 +-
 .../components/servers/InstallingBanner.vue   |  25 +-
 .../ui/src/components/servers/SaveBanner.vue  |  41 +-
 .../src/components/servers/ServerListing.vue  |  84 +-
 .../src/components/servers/ServersPromo.vue   |  24 +-
 .../components/servers/access/AccessTable.vue | 119 ++-
 .../servers/access/AuditLogTable.vue          |   3 +-
 .../servers/access/GrantAccessModal.vue       |  29 +-
 .../servers/access/RemoveAccessModal.vue      |  35 +-
 .../servers/admonitions/BackupAdmonition.vue  |  48 +-
 .../admonitions/FileOperationAdmonition.vue   |  24 +-
 .../servers/admonitions/UploadAdmonition.vue  |  16 +-
 .../servers/backups/BackupCreateModal.vue     |  33 +-
 .../servers/backups/BackupDeleteModal.vue     |  33 +-
 .../components/servers/backups/BackupItem.vue |  75 +-
 .../servers/backups/BackupRenameModal.vue     |  45 +-
 .../servers/backups/BackupRestoreModal.vue    |  35 +-
 .../edit-server-icon/EditServerIcon.vue       |  16 +-
 .../marketing/MedalServerCountdown.vue        |   9 +-
 .../servers/marketing/MedalServerListing.vue  |  19 +-
 .../server-header/PanelServerActionButton.vue | 110 ++-
 .../server-list-empty/ServerListEmpty.vue     |  22 +-
 .../sharing/invite-players-modal/index.vue    |  48 +-
 ...nvite-players-modal-invite-link-editor.vue |  51 +-
 .../invite-players-modal-user-row.vue         |  42 +-
 .../ui/src/components/user/UserPageHeader.vue |  58 +-
 .../version/VersionFilterControl.vue          |  12 +-
 .../src/components/version/VersionSummary.vue |  44 +-
 .../SelectedProjectsFloatingBar.vue           |  37 +-
 .../components/SelectedProjectsLeaveModal.vue |  32 +-
 .../src/layouts/shared/browse-tab/header.vue  |  21 +-
 .../src/layouts/shared/browse-tab/layout.vue  | 104 +-
 .../src/layouts/shared/browse-tab/sidebar.vue |  10 +-
 .../components/ConsoleActionButtons.vue       |  78 +-
 .../ui/src/layouts/shared/console/layout.vue  |  23 +-
 .../components/ContentCardItem.vue            | 153 +--
 .../components/ContentModpackCard.vue         | 129 +--
 .../components/ContentSelectionBar.vue        |  89 +-
 .../modals/ConfirmBulkUpdateModal.vue         |  32 +-
 .../modals/ConfirmDeletionModal.vue           |  32 +-
 .../components/modals/ConfirmDisableModal.vue |  32 +-
 .../modals/ConfirmModpackUpdateModal.vue      |  36 +-
 .../modals/ConfirmReinstallModal.vue          |  22 +-
 .../components/modals/ConfirmRepairModal.vue  |  22 +-
 .../components/modals/ConfirmUnlinkModal.vue  |  32 +-
 .../modals/ContentDependencyWarningModal.vue  |  32 +-
 .../components/modals/ContentInstallModal.vue | 118 ++-
 .../components/modals/InlineBackupCreator.vue |  40 +-
 .../components/modals/ModpackContentModal.vue |  30 +-
 .../modals/content-updater-modal/index.vue    | 111 ++-
 .../src/layouts/shared/content-tab/layout.vue | 339 ++++---
 .../content-tab/providers/content-manager.ts  |   2 +-
 .../src/layouts/shared/content-tab/types.ts   |   2 +-
 .../files-tab/components/FileContextMenu.vue  |  89 +-
 .../files-tab/components/FileManagerError.vue |  22 +-
 .../files-tab/components/FileNavbar.vue       | 239 ++---
 .../files-tab/components/FileTableRow.vue     |  98 +-
 .../components/editor/EditorFindReplace.vue   | 116 ++-
 .../components/editor/FileImageViewer.vue     |  26 +-
 .../components/modals/FileCreateItemModal.vue |  30 +-
 .../components/modals/FileDeleteItemModal.vue |  22 +-
 .../components/modals/FileMoveItemModal.vue   |  22 +-
 .../components/modals/FileRenameItemModal.vue |  22 +-
 .../modals/FileUnsavedChangesModal.vue        |  32 +-
 .../modals/FileUploadConflictModal.vue        |  22 +-
 .../modals/FileUploadZipUrlModal.vue          |  52 +-
 .../components/upload/FileUploadDropdown.vue  |   8 +-
 .../src/layouts/shared/files-tab/layout.vue   |  54 +-
 .../components/ContentDiffModal.vue           |  75 +-
 .../components/IncompatibleContentModal.vue   |  80 +-
 .../shared/installation-settings/layout.vue   | 216 ++---
 .../shared/server-settings/pages/advanced.vue | 194 ++--
 .../server-settings/pages/installation.vue    |  44 +-
 .../shared/server-settings/pages/network.vue  | 123 +--
 .../layouts/shared/user-profile/layout.vue    | 109 +--
 .../wrapped/AccountProfileSettings.vue        |  64 +-
 .../layouts/wrapped/AccountSocialSettings.vue |  57 +-
 .../hosting/manage/[id]/access/access.vue     |  28 +-
 .../hosting/manage/[id]/onboarding.vue        |  34 +-
 .../wrapped/hosting/manage/backups.vue        | 100 +-
 .../layouts/wrapped/hosting/manage/index.vue  |  32 +-
 .../layouts/wrapped/hosting/manage/root.vue   | 106 +--
 packages/ui/src/stories/add-stories.md        |  10 +-
 .../ui/src/stories/base/Admonition.stories.ts |  22 +-
 .../ui/src/stories/base/Button.stories.ts     |  83 --
 .../src/stories/base/ButtonStyled.stories.ts  | 226 -----
 .../ui/src/stories/base/EmptyState.stories.ts |   8 +-
 .../src/stories/base/JoinedButtons.stories.ts | 122 ---
 .../src/stories/base/OverflowMenu.stories.ts  |  81 --
 .../ui/src/stories/base/PageHeader.stories.ts | 154 ++-
 .../ui/src/stories/base/PopoutMenu.stories.ts |  94 --
 .../base/StackedAdmonitions.stories.ts        |  12 +-
 packages/ui/src/stories/base/Table.stories.ts | 150 ++-
 .../ui/src/stories/buttons/Button.stories.ts  | 213 +++++
 .../stories/buttons/ButtonGroup.stories.ts    |  82 ++
 .../src/stories/buttons/FileButton.stories.ts |  61 ++
 .../buttons/TeleportOverflowMenu.stories.ts   | 104 ++
 .../buttons/TeleportPopoutMenu.stories.ts     |  50 +
 .../instances/ContentCardTable.stories.ts     |  48 +-
 .../ContentDependencyWarningModal.stories.ts  |  20 +-
 .../instances/ContentUpdaterModal.stories.ts  |  26 +-
 .../instances/ModpackContentModal.stories.ts  |  50 +-
 .../modal/ConfirmLeaveModal.stories.ts        |  20 +-
 .../ui/src/stories/modal/NewModal.stories.ts  |  86 +-
 .../src/stories/modal/ShareModal.stories.ts   |  14 +-
 .../src/stories/modal/TabbedModal.stories.ts  |  50 +-
 .../modal/UnknownFileWarningModal.stories.ts  |  14 +-
 .../modal/UpdateToPlayModal.stories.ts        |   8 +-
 .../modal/UploadProgressModal.stories.ts      |  14 +-
 .../stories/nav/NotificationPanel.stories.ts  |  50 +-
 .../nav/PopupNotificationPanel.stories.ts     |  48 +-
 .../project/ProjectPageVersions.stories.ts    |  22 +-
 .../servers/CreationFlowModal.stories.ts      |  20 +-
 .../servers/GrantAccessModal.stories.ts       |  14 +-
 .../servers/RemoveAccessModal.stories.ts      |  14 +-
 .../ServerPanelAdmonitionCopyDraft.stories.ts |  34 +-
 .../sharing/InvitePlayersModal.stories.ts     |   8 +-
 .../ui/src/stories/skin/SkinButton.stories.ts |  20 +-
 packages/ui/src/utils/index.ts                |   1 +
 .../ui/src/utils/use-anchored-teleport.ts     | 162 ++++
 standards/README.md                           |   2 +-
 standards/frontend/BUTTONS.md                 | 375 ++++++++
 standards/frontend/MODALS.md                  |  10 +-
 398 files changed, 13688 insertions(+), 13133 deletions(-)
 delete mode 100644 packages/ui/src/components/base/Button.vue
 delete mode 100644 packages/ui/src/components/base/ButtonStyled.vue
 delete mode 100644 packages/ui/src/components/base/JoinedButtons.vue
 delete mode 100644 packages/ui/src/components/base/OverflowMenu.vue
 delete mode 100644 packages/ui/src/components/base/TeleportOverflowMenu.vue
 create mode 100644 packages/ui/src/components/base/buttons/Button.vue
 create mode 100644 packages/ui/src/components/base/buttons/ButtonFrame.vue
 create mode 100644 packages/ui/src/components/base/buttons/ButtonGroup.vue
 create mode 100644 packages/ui/src/components/base/buttons/ButtonLink.vue
 create mode 100644 packages/ui/src/components/base/buttons/FileButton.vue
 create mode 100644 packages/ui/src/components/base/buttons/IconButton.vue
 create mode 100644 packages/ui/src/components/base/buttons/SplitButton.vue
 create mode 100644 packages/ui/src/components/base/buttons/TeleportOverflowMenu.vue
 create mode 100644 packages/ui/src/components/base/buttons/TeleportPopoutMenu.vue
 create mode 100644 packages/ui/src/components/base/buttons/index.ts
 create mode 100644 packages/ui/src/components/base/buttons/types.ts
 delete mode 100644 packages/ui/src/stories/base/Button.stories.ts
 delete mode 100644 packages/ui/src/stories/base/ButtonStyled.stories.ts
 delete mode 100644 packages/ui/src/stories/base/JoinedButtons.stories.ts
 delete mode 100644 packages/ui/src/stories/base/OverflowMenu.stories.ts
 delete mode 100644 packages/ui/src/stories/base/PopoutMenu.stories.ts
 create mode 100644 packages/ui/src/stories/buttons/Button.stories.ts
 create mode 100644 packages/ui/src/stories/buttons/ButtonGroup.stories.ts
 create mode 100644 packages/ui/src/stories/buttons/FileButton.stories.ts
 create mode 100644 packages/ui/src/stories/buttons/TeleportOverflowMenu.stories.ts
 create mode 100644 packages/ui/src/stories/buttons/TeleportPopoutMenu.stories.ts
 create mode 100644 packages/ui/src/utils/use-anchored-teleport.ts
 create mode 100644 standards/frontend/BUTTONS.md

diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue
index 3e766fcc8e..6ef972120b 100644
--- a/apps/app-frontend/src/App.vue
+++ b/apps/app-frontend/src/App.vue
@@ -29,24 +29,25 @@ import {
 import {
 	Admonition,
 	Avatar,
-	ButtonStyled,
+	ButtonLink,
 	commonMessages,
 	ContentInstallModal,
 	ContentUpdaterModal,
 	CreationFlowModal,
 	defineMessages,
 	I18nDebugPanel,
+	IconButton,
 	IntlFormatted,
 	LoadingBar,
 	NewsArticleCard,
 	NotificationPanel,
-	OverflowMenu,
 	PopupNotificationPanel,
 	provideModalBehavior,
 	provideModrinthClient,
 	provideNotificationManager,
 	providePageContext,
 	providePopupNotificationManager,
+	TeleportOverflowMenu,
 	TextLogo,
 	useDebugLogger,
 	useFormatBytes,
@@ -1592,22 +1593,29 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
 			>
 				<SettingsIcon />
 			</NavButton>
-			<OverflowMenu
+			<TeleportOverflowMenu
 				v-if="credentials?.user"
 				v-tooltip.right="formatMessage(messages.modrinthAccount)"
-				class="w-12 h-12 text-primary rounded-full flex items-center justify-center text-2xl transition-all bg-transparent hover:bg-button-bg hover:text-contrast border-0 cursor-pointer"
+				type="quiet"
+				size="xl"
+				label="More options"
 				:options="[
 					{
 						id: 'view-profile',
+						label: formatMessage(messages.signedInAs, {
+							username: credentials.user.username,
+						}),
 						action: () => router.push(`/user/${encodeURIComponent(credentials.user.username)}`),
 					},
 					{
 						id: 'sign-out',
+						label: formatMessage(commonMessages.signOutButton),
+						tone: 'red',
 						action: () => logOut(),
-						color: 'danger',
 					},
 				]"
 				placement="right-end"
+				:distance="4"
 			>
 				<Avatar :src="credentials?.user?.avatar_url" alt="" size="32px" circle />
 				<template #view-profile>
@@ -1630,7 +1638,7 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
 					<LogOutIcon />
 					{{ formatMessage(commonMessages.signOutButton) }}
 				</template>
-			</OverflowMenu>
+			</TeleportOverflowMenu>
 			<NavButton
 				v-else
 				v-tooltip.right="formatMessage(messages.signInToModrinthAccount)"
@@ -1643,49 +1651,44 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
 			<div data-tauri-drag-region class="flex min-w-0 flex-1 items-center overflow-hidden p-2">
 				<TextLogo class="h-7 w-auto shrink-0 text-contrast pointer-events-none" />
 				<div data-tauri-drag-region class="ml-2 flex shrink-0 items-center gap-2">
-					<ButtonStyled type="outlined" circular>
-						<button
-							class="!h-7 !min-w-7 !w-7 !border !border-surface-4 !p-0 !opacity-100"
-							:disabled="!canNavigateBack"
-							aria-label="Go back"
-							@click="router.back()"
-						>
-							<ChevronLeftIcon
-								class="!size-4 !text-primary"
-								:class="{ 'opacity-20': !canNavigateBack }"
-							/>
-						</button>
-					</ButtonStyled>
-					<ButtonStyled type="outlined" circular>
-						<button
-							class="!h-7 !min-w-7 !w-7 !border !border-surface-4 !p-0 !opacity-100"
-							:disabled="!canNavigateForward"
-							aria-label="Go forward"
-							@click="router.forward()"
-						>
-							<ChevronRightIcon
-								class="!size-4 !text-primary"
-								:class="{ 'opacity-20': !canNavigateForward }"
-							/>
-						</button>
-					</ButtonStyled>
+					<IconButton
+						type="outlined"
+						label="Go back"
+						class="!h-7 !min-w-7 !w-7 !border !border-surface-4 !p-0 !opacity-100"
+						:disabled="!canNavigateBack"
+						@click="router.back()"
+					>
+						<ChevronLeftIcon
+							class="!size-4 !text-primary"
+							:class="{ 'opacity-20': !canNavigateBack }"
+						/>
+					</IconButton>
+					<IconButton
+						type="outlined"
+						label="Go forward"
+						class="!h-7 !min-w-7 !w-7 !border !border-surface-4 !p-0 !opacity-100"
+						:disabled="!canNavigateForward"
+						@click="router.forward()"
+					>
+						<ChevronRightIcon
+							class="!size-4 !text-primary"
+							:class="{ 'opacity-20': !canNavigateForward }"
+						/>
+					</IconButton>
 				</div>
 				<Breadcrumbs />
 			</div>
 			<section data-tauri-drag-region class="flex shrink-0 ml-auto items-center">
-				<ButtonStyled
+				<IconButton
 					v-if="!forceSidebar && themeStore.toggleSidebar"
-					:type="sidebarToggled ? 'standard' : 'transparent'"
-					circular
+					:type="sidebarToggled ? 'base' : 'quiet'"
+					label="Next image"
+					class="mr-3 transition-transform"
+					:class="{ 'rotate-180': !sidebarToggled }"
+					@click="sidebarToggled = !sidebarToggled"
 				>
-					<button
-						class="mr-3 transition-transform"
-						:class="{ 'rotate-180': !sidebarToggled }"
-						@click="sidebarToggled = !sidebarToggled"
-					>
-						<RightArrowIcon />
-					</button>
-				</ButtonStyled>
+					<RightArrowIcon />
+				</IconButton>
 				<div class="flex mr-3">
 					<Suspense>
 						<AppActionBar />
@@ -1794,12 +1797,17 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
 								:key="`news-${index}`"
 								:article="item"
 							/>
-							<ButtonStyled color="brand" size="large">
-								<a href="https://modrinth.com/news" target="_blank" class="my-4">
-									<NewspaperIcon />
-									{{ formatMessage(messages.viewAllNews) }}
-								</a>
-							</ButtonStyled>
+							<ButtonLink
+								type="colored"
+								color="brand"
+								size="xl"
+								href="https://modrinth.com/news"
+								target="_blank"
+								class="my-4"
+							>
+								<NewspaperIcon />
+								{{ formatMessage(messages.viewAllNews) }}
+							</ButtonLink>
 						</div>
 					</div>
 				</div>
diff --git a/apps/app-frontend/src/components/ui/AccountsCard.vue b/apps/app-frontend/src/components/ui/AccountsCard.vue
index 9c0611ef63..766f234026 100644
--- a/apps/app-frontend/src/components/ui/AccountsCard.vue
+++ b/apps/app-frontend/src/components/ui/AccountsCard.vue
@@ -4,13 +4,11 @@
 		class="flex flex-col gap-3 bg-button-bg border border-solid border-surface-5 rounded-xl p-3 mt-2"
 	>
 		<span>{{ formatMessage(messages.notSignedIn) }}</span>
-		<ButtonStyled color="brand">
-			<button color="primary" :disabled="loginDisabled" @click="login()">
-				<LogInIcon v-if="!loginDisabled" />
-				<SpinnerIcon v-else class="animate-spin" />
-				{{ formatMessage(messages.signInToMinecraft) }}
-			</button>
-		</ButtonStyled>
+		<Button type="colored" color="brand" :disabled="loginDisabled" @click="login()">
+			<LogInIcon v-if="!loginDisabled" />
+			<SpinnerIcon v-else class="animate-spin" />
+			{{ formatMessage(messages.signInToMinecraft) }}
+		</Button>
 	</div>
 	<Accordion
 		v-else
@@ -60,24 +58,28 @@
 							{{ account.profile.name }}
 						</p>
 					</button>
-					<ButtonStyled circular color="red" color-fill="none" hover-color-fill="background">
-						<button
-							v-tooltip="formatMessage(messages.removeAccount)"
-							class="mr-2"
-							@click="logout(account.profile.id)"
-						>
-							<TrashIcon />
-						</button>
-					</ButtonStyled>
+					<IconButton
+						v-tooltip="formatMessage(messages.removeAccount)"
+						type="quiet"
+						color="red"
+						:label="formatMessage(messages.removeAccount)"
+						class="mr-2 !bg-button-bg !text-primary ![box-shadow:var(--shadow-button)] hover:!bg-red focus-visible:!bg-red hover:!text-[var(--color-accent-contrast)] focus-visible:!text-[var(--color-accent-contrast)]"
+						@click="logout(account.profile.id)"
+					>
+						<TrashIcon />
+					</IconButton>
 				</div>
 			</template>
 			<div class="flex flex-col gap-2 px-2 pt-2">
-				<ButtonStyled v-if="accounts.length > 0" class="w-full">
-					<button :disabled="loginDisabled" @click="login()">
-						<PlusIcon />
-						{{ formatMessage(messages.addAccount) }}
-					</button>
-				</ButtonStyled>
+				<Button
+					v-if="accounts.length > 0"
+					class="w-full !bg-button-bg !text-primary ![box-shadow:var(--shadow-button)]"
+					:disabled="loginDisabled"
+					@click="login()"
+				>
+					<PlusIcon />
+					{{ formatMessage(messages.addAccount) }}
+				</Button>
 			</div>
 		</div>
 	</Accordion>
@@ -95,8 +97,9 @@ import {
 import {
 	Accordion,
 	Avatar,
-	ButtonStyled,
+	Button,
 	defineMessages,
+	IconButton,
 	injectNotificationManager,
 	useVIntl,
 } from '@modrinth/ui'
diff --git a/apps/app-frontend/src/components/ui/AddContentButton.vue b/apps/app-frontend/src/components/ui/AddContentButton.vue
index cdea116e87..65f6397a9e 100644
--- a/apps/app-frontend/src/components/ui/AddContentButton.vue
+++ b/apps/app-frontend/src/components/ui/AddContentButton.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { DropdownIcon, FolderOpenIcon, PlusIcon } from '@modrinth/assets'
-import { ButtonStyled, injectNotificationManager, OverflowMenu } from '@modrinth/ui'
+import { Button, injectNotificationManager, TeleportOverflowMenu } from '@modrinth/ui'
 import { open } from '@tauri-apps/plugin-dialog'
 import { useRouter } from 'vue-router'
 
@@ -36,27 +36,26 @@ const handleSearchContent = async () => {
 
 <template>
 	<div class="joined-buttons">
-		<ButtonStyled>
-			<button @click="handleSearchContent">
-				<PlusIcon />
-				Install content
-			</button>
-		</ButtonStyled>
-		<ButtonStyled>
-			<OverflowMenu
-				:options="[
-					{
-						id: 'from_file',
-						action: handleAddContentFromFile,
-					},
-				]"
-			>
-				<DropdownIcon />
-				<template #from_file>
-					<FolderOpenIcon />
-					<span class="no-wrap"> Add from file </span>
-				</template>
-			</OverflowMenu>
-		</ButtonStyled>
+		<Button @click="handleSearchContent">
+			<PlusIcon />
+			Install content
+		</Button>
+		<TeleportOverflowMenu
+			label="More options"
+			:options="[
+				{
+					id: 'from_file',
+					label: 'Add from file',
+					action: handleAddContentFromFile,
+				},
+			]"
+			class="!w-auto !px-2.5 !rounded-xl"
+		>
+			<DropdownIcon />
+			<template #from_file>
+				<FolderOpenIcon />
+				<span class="no-wrap"> Add from file </span>
+			</template>
+		</TeleportOverflowMenu>
 	</div>
 </template>
diff --git a/apps/app-frontend/src/components/ui/AppActionBar.vue b/apps/app-frontend/src/components/ui/AppActionBar.vue
index 380a78a5c5..11c172b71e 100644
--- a/apps/app-frontend/src/components/ui/AppActionBar.vue
+++ b/apps/app-frontend/src/components/ui/AppActionBar.vue
@@ -1,15 +1,15 @@
 <template>
 	<div class="flex gap-2 items-center">
-		<ButtonStyled
+		<IconButton
 			v-if="hasActiveLoadingBars && !hasVisibleActiveDownloadToasts"
+			v-tooltip="formatMessage(messages.viewActiveDownloads)"
+			type="quiet"
 			color="brand"
-			type="transparent"
-			circular
+			:label="formatMessage(messages.viewActiveDownloads)"
+			@click="openDownloadToast()"
 		>
-			<button v-tooltip="formatMessage(messages.viewActiveDownloads)" @click="openDownloadToast()">
-				<DownloadIcon />
-			</button>
-		</ButtonStyled>
+			<DownloadIcon />
+		</IconButton>
 		<div v-if="offline" class="flex items-center gap-1">
 			<UnplugIcon class="text-secondary" />
 			<span class="text-sm text-contrast"> {{ formatMessage(messages.offline) }} </span>
@@ -36,17 +36,23 @@
 						@show="showInstances = true"
 						@hide="showInstances = false"
 					>
-						<ButtonStyled type="transparent" circular size="small">
-							<button
-								v-tooltip="
-									showInstances
-										? formatMessage(messages.hideMoreRunningInstances)
-										: formatMessage(messages.showMoreRunningInstances)
-								"
-							>
-								<DropdownIcon :class="{ 'rotate-180': !!showInstances }" />
-							</button>
-						</ButtonStyled>
+						<IconButton
+							v-tooltip="
+								showInstances
+									? formatMessage(messages.hideMoreRunningInstances)
+									: formatMessage(messages.showMoreRunningInstances)
+							"
+							class="!size-6"
+							type="quiet"
+							size="xs"
+							:label="
+								showInstances
+									? formatMessage(messages.hideMoreRunningInstances)
+									: formatMessage(messages.showMoreRunningInstances)
+							"
+						>
+							<DropdownIcon :class="{ 'rotate-180': !!showInstances }" />
+						</IconButton>
 						<template #popper>
 							<div class="flex w-[20rem] max-h-[24rem] flex-col gap-2 overflow-auto">
 								<div
@@ -125,8 +131,8 @@ import {
 	TerminalSquareIcon,
 	UnplugIcon,
 } from '@modrinth/assets'
+import { IconButton } from '@modrinth/ui'
 import {
-	ButtonStyled,
 	defineMessages,
 	injectNotificationManager,
 	injectPopupNotificationManager,
diff --git a/apps/app-frontend/src/components/ui/ErrorModal.vue b/apps/app-frontend/src/components/ui/ErrorModal.vue
index 385c503f11..475c1f3f76 100644
--- a/apps/app-frontend/src/components/ui/ErrorModal.vue
+++ b/apps/app-frontend/src/components/ui/ErrorModal.vue
@@ -9,7 +9,13 @@ import {
 	WrenchIcon,
 	XIcon,
 } from '@modrinth/assets'
-import { ButtonStyled, Collapsible, injectNotificationManager } from '@modrinth/ui'
+import {
+	Button,
+	ButtonLink,
+	Collapsible,
+	IconButton,
+	injectNotificationManager,
+} from '@modrinth/ui'
 import { computed, ref } from 'vue'
 
 import { ChatIcon } from '@/assets/icons'
@@ -273,12 +279,10 @@ async function copyToClipboard(text) {
 				</template>
 			</div>
 			<div class="flex items-center gap-2">
-				<ButtonStyled>
-					<a :href="supportLink" @click="errorModal.hide()"><ChatIcon /> Get support</a>
-				</ButtonStyled>
-				<ButtonStyled v-if="closable">
-					<button @click="errorModal.hide()"><XIcon /> Close</button>
-				</ButtonStyled>
+				<ButtonLink :href="supportLink" @click="errorModal.hide()"
+					><ChatIcon /> Get support</ButtonLink
+				>
+				<Button v-if="closable" @click="errorModal.hide()"><XIcon /> Close</Button>
 			</div>
 			<template v-if="hasDebugInfo">
 				<div class="flex flex-col gap-2">
@@ -307,16 +311,15 @@ async function copyToClipboard(text) {
 								>
 									{{ debugInfo }}
 								</div>
-								<ButtonStyled circular>
-									<button
-										v-tooltip="'Copy debug info'"
-										:disabled="copied"
-										@click="copyToClipboard(debugInfo)"
-									>
-										<template v-if="copied"> <CheckIcon class="text-green" /> </template>
-										<template v-else> <CopyIcon /> </template>
-									</button>
-								</ButtonStyled>
+								<IconButton
+									v-tooltip="'Copy debug info'"
+									:label="'Copy debug info'"
+									:disabled="copied"
+									@click="copyToClipboard(debugInfo)"
+								>
+									<template v-if="copied"> <CheckIcon class="text-green" /> </template>
+									<template v-else> <CopyIcon /> </template>
+								</IconButton>
 							</div>
 						</Collapsible>
 					</div>
diff --git a/apps/app-frontend/src/components/ui/ExportModal.vue b/apps/app-frontend/src/components/ui/ExportModal.vue
index 314d171c1d..718a602acf 100644
--- a/apps/app-frontend/src/components/ui/ExportModal.vue
+++ b/apps/app-frontend/src/components/ui/ExportModal.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { XIcon } from '@modrinth/assets'
 import {
-	ButtonStyled,
+	Button,
 	commonMessages,
 	defineMessages,
 	FileTreeSelect,
@@ -208,18 +208,14 @@ function normalizeExportPath(path) {
 		</div>
 		<template #actions>
 			<div class="flex items-center justify-end gap-2">
-				<ButtonStyled type="outlined">
-					<button @click="exportModal.hide">
-						<XIcon />
-						{{ formatMessage(commonMessages.cancelButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="brand">
-					<button @click="exportPack">
-						<PackageIcon />
-						{{ formatMessage(messages.exportButton) }}
-					</button>
-				</ButtonStyled>
+				<Button type="outlined" @click="exportModal.hide">
+					<XIcon />
+					{{ formatMessage(commonMessages.cancelButton) }}
+				</Button>
+				<Button type="colored" color="brand" @click="exportPack">
+					<PackageIcon />
+					{{ formatMessage(messages.exportButton) }}
+				</Button>
 			</div>
 		</template>
 	</NewModal>
diff --git a/apps/app-frontend/src/components/ui/Instance.vue b/apps/app-frontend/src/components/ui/Instance.vue
index 6845a00f2b..7c82504eb1 100644
--- a/apps/app-frontend/src/components/ui/Instance.vue
+++ b/apps/app-frontend/src/components/ui/Instance.vue
@@ -7,7 +7,7 @@ import {
 	StopCircleIcon,
 	TimerIcon,
 } from '@modrinth/assets'
-import { Avatar, ButtonStyled, injectNotificationManager, useRelativeTime } from '@modrinth/ui'
+import { Avatar, IconButton, injectNotificationManager, useRelativeTime } from '@modrinth/ui'
 import { convertFileSrc } from '@tauri-apps/api/core'
 import dayjs from 'dayjs'
 import { computed, onMounted, onUnmounted, ref } from 'vue'
@@ -168,30 +168,37 @@ onUnmounted(() => unlisten())
 				<span class="line-clamp-2">{{ instance.name }}</span>
 			</div>
 			<div class="flex items-center">
-				<ButtonStyled v-if="playing" color="red" circular @mousehover="checkProcess">
-					<button v-tooltip="'Stop'" @click="(e) => stop(e, 'InstanceCard')">
-						<StopCircleIcon />
-					</button>
-				</ButtonStyled>
-				<ButtonStyled v-else-if="modLoading" color="standard" circular>
-					<button v-tooltip="'Instance is loading...'" disabled>
-						<SpinnerIcon class="animate-spin" />
-					</button>
-				</ButtonStyled>
-				<ButtonStyled
-					v-else-if="!instance.quarantined"
-					:color="first ? 'brand' : 'standard'"
-					circular
+				<IconButton
+					v-if="playing"
+					v-tooltip="'Stop'"
+					type="colored"
+					color="red"
+					:label="'Stop'"
+					@mouseenter="checkProcess"
+					@click="(e) => stop(e, 'InstanceCard')"
 				>
-					<button
-						v-tooltip="'Play'"
-						@click="(e) => play(e, 'InstanceCard')"
-						@mousehover="checkProcess"
-					>
-						<!-- Translate for optical centering -->
-						<PlayIcon class="translate-x-[1px]" />
-					</button>
-				</ButtonStyled>
+					<StopCircleIcon />
+				</IconButton>
+				<IconButton
+					v-else-if="modLoading"
+					v-tooltip="'Instance is loading...'"
+					:label="'Instance is loading...'"
+					disabled
+				>
+					<SpinnerIcon class="animate-spin" />
+				</IconButton>
+				<IconButton
+					v-else-if="!instance.quarantined"
+					v-tooltip="'Play'"
+					:type="first ? 'colored' : 'base'"
+					:color="first ? 'brand' : undefined"
+					label="Play"
+					@click="(e) => play(e, 'InstanceCard')"
+					@mouseenter="checkProcess"
+				>
+					<!-- Translate for optical centering -->
+					<PlayIcon class="translate-x-[1px]" />
+				</IconButton>
 			</div>
 			<div class="flex items-center col-span-3 gap-1 text-secondary font-semibold">
 				<TimerIcon />
@@ -219,47 +226,51 @@ onUnmounted(() => unlisten())
 					:class="`transition-all ${modLoading || installing ? `brightness-[0.25] scale-[0.85]` : `group-hover:brightness-75`}`"
 				/>
 				<div class="absolute inset-0 flex items-center justify-center">
-					<ButtonStyled v-if="playing" size="large" color="red" circular>
-						<button
-							v-tooltip="'Stop'"
-							:class="{ 'scale-100 opacity-100': playing }"
-							class="transition-all scale-75 origin-bottom opacity-0 card-shadow"
-							@click="(e) => stop(e, 'InstanceCard')"
-							@mousehover="checkProcess"
-						>
-							<StopCircleIcon />
-						</button>
-					</ButtonStyled>
+					<IconButton
+						v-if="playing"
+						v-tooltip="'Stop'"
+						type="colored"
+						color="red"
+						size="xl"
+						:label="'Stop'"
+						:class="{ 'scale-100 opacity-100': playing }"
+						class="transition-all scale-75 origin-bottom opacity-0 card-shadow"
+						@click="(e) => stop(e, 'InstanceCard')"
+						@mouseenter="checkProcess"
+					>
+						<StopCircleIcon />
+					</IconButton>
 					<SpinnerIcon
 						v-else-if="modLoading || installing"
 						v-tooltip="modLoading ? 'Instance is loading...' : 'Installing...'"
 						class="animate-spin w-8 h-8"
 						tabindex="-1"
 					/>
-					<ButtonStyled
+					<IconButton
 						v-else-if="!installed && !instance.quarantined"
-						size="large"
+						v-tooltip="'Repair'"
+						type="colored"
 						color="brand"
-						circular
+						size="xl"
+						:label="'Repair'"
+						class="transition-all scale-75 group-hover:scale-100 group-focus-within:scale-100 origin-bottom opacity-0 group-hover:opacity-100 group-focus-within:opacity-100 card-shadow"
+						@click="(e) => repair(e)"
 					>
-						<button
-							v-tooltip="'Repair'"
-							class="transition-all scale-75 group-hover:scale-100 group-focus-within:scale-100 origin-bottom opacity-0 group-hover:opacity-100 group-focus-within:opacity-100 card-shadow"
-							@click="(e) => repair(e)"
-						>
-							<DownloadIcon />
-						</button>
-					</ButtonStyled>
-					<ButtonStyled v-else-if="!instance.quarantined" size="large" color="brand" circular>
-						<button
-							v-tooltip="'Play'"
-							class="transition-all scale-75 group-hover:scale-100 group-focus-within:scale-100 origin-bottom opacity-0 group-hover:opacity-100 group-focus-within:opacity-100 card-shadow"
-							@click="(e) => play(e, 'InstanceCard')"
-							@mousehover="checkProcess"
-						>
-							<PlayIcon class="translate-x-[2px]" />
-						</button>
-					</ButtonStyled>
+						<DownloadIcon />
+					</IconButton>
+					<IconButton
+						v-else-if="!instance.quarantined"
+						v-tooltip="'Play'"
+						type="colored"
+						color="brand"
+						size="xl"
+						:label="'Play'"
+						class="transition-all scale-75 group-hover:scale-100 group-focus-within:scale-100 origin-bottom opacity-0 group-hover:opacity-100 group-focus-within:opacity-100 card-shadow"
+						@click="(e) => play(e, 'InstanceCard')"
+						@mouseenter="checkProcess"
+					>
+						<PlayIcon class="translate-x-[2px]" />
+					</IconButton>
 				</div>
 			</div>
 			<div class="flex flex-col gap-1">
diff --git a/apps/app-frontend/src/components/ui/InstanceIndicator.vue b/apps/app-frontend/src/components/ui/InstanceIndicator.vue
index 2787635117..cb077c4bfb 100644
--- a/apps/app-frontend/src/components/ui/InstanceIndicator.vue
+++ b/apps/app-frontend/src/components/ui/InstanceIndicator.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { GameIcon, LeftArrowIcon } from '@modrinth/assets'
-import { Avatar, ButtonStyled, FormattedTag } from '@modrinth/ui'
+import { Avatar, ButtonLink, FormattedTag } from '@modrinth/ui'
 import { convertFileSrc } from '@tauri-apps/api/core'
 import { computed } from 'vue'
 
@@ -48,9 +48,7 @@ const instanceLink = computed(() => {
 				</span>
 			</span>
 		</router-link>
-		<ButtonStyled>
-			<router-link :to="instanceLink"> <LeftArrowIcon /> Back to instance </router-link>
-		</ButtonStyled>
+		<ButtonLink :to="instanceLink"> <LeftArrowIcon /> Back to instance </ButtonLink>
 	</div>
 </template>
 
diff --git a/apps/app-frontend/src/components/ui/JavaDetectionModal.vue b/apps/app-frontend/src/components/ui/JavaDetectionModal.vue
index 31e481431f..87858c7f6e 100644
--- a/apps/app-frontend/src/components/ui/JavaDetectionModal.vue
+++ b/apps/app-frontend/src/components/ui/JavaDetectionModal.vue
@@ -14,18 +14,14 @@
 				</template>
 				<template #cell-actions="{ row }">
 					<div class="flex items-center justify-end">
-						<ButtonStyled v-if="currentSelected.path === row.path">
-							<button class="!shadow-none" disabled>
-								<CheckIcon aria-hidden="true" />
-								{{ formatMessage(messages.selected) }}
-							</button>
-						</ButtonStyled>
-						<ButtonStyled v-else>
-							<button class="!shadow-none" @click="setJavaInstall(row)">
-								<PlusIcon aria-hidden="true" />
-								{{ formatMessage(messages.select) }}
-							</button>
-						</ButtonStyled>
+						<Button v-if="currentSelected.path === row.path" disabled>
+							<CheckIcon aria-hidden="true" />
+							{{ formatMessage(messages.selected) }}
+						</Button>
+						<Button v-else @click="setJavaInstall(row)">
+							<PlusIcon aria-hidden="true" />
+							{{ formatMessage(messages.select) }}
+						</Button>
 					</div>
 				</template>
 				<template #empty-state>
@@ -35,28 +31,21 @@
 				</template>
 			</Table>
 			<div class="flex justify-end">
-				<ButtonStyled type="outlined">
-					<button
-						class="!shadow-none !border-surface-4 !border"
-						@click="$refs.detectJavaModal.hide()"
-					>
-						<XIcon aria-hidden="true" />
-						{{ formatMessage(messages.cancel) }}
-					</button>
-				</ButtonStyled>
+				<Button
+					type="outlined"
+					class="!border-surface-4 !border"
+					@click="$refs.detectJavaModal.hide()"
+				>
+					<XIcon aria-hidden="true" />
+					{{ formatMessage(messages.cancel) }}
+				</Button>
 			</div>
 		</div>
 	</ModalWrapper>
 </template>
 <script setup>
 import { CheckIcon, PlusIcon, XIcon } from '@modrinth/assets'
-import {
-	ButtonStyled,
-	defineMessages,
-	injectNotificationManager,
-	Table,
-	useVIntl,
-} from '@modrinth/ui'
+import { Button, defineMessages, injectNotificationManager, Table, useVIntl } from '@modrinth/ui'
 import { computed, ref } from 'vue'
 
 import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
diff --git a/apps/app-frontend/src/components/ui/JavaSelector.vue b/apps/app-frontend/src/components/ui/JavaSelector.vue
index e29aa2d6f0..a46f4347b1 100644
--- a/apps/app-frontend/src/components/ui/JavaSelector.vue
+++ b/apps/app-frontend/src/components/ui/JavaSelector.vue
@@ -17,64 +17,73 @@
 					}
 				"
 			/>
-			<ButtonStyled
+			<Button
+				type="quiet"
 				:color="
 					!hoveringTest && !testingJava
 						? testingJavaSuccess === true
 							? 'green'
 							: 'red'
-						: 'standard'
+						: undefined
 				"
-				color-fill="text"
+				:aria-label="formatMessage(messages.testJavaInstallation)"
+				class="!text-[var(--legacy-button-color,var(--color-base))] [&>svg]:!text-[var(--legacy-button-color,var(--color-primary))]"
+				:disabled="testingJava || props.disabled"
+				:style="{
+					'--legacy-button-color':
+						(!hoveringTest && !testingJava
+							? testingJavaSuccess === true
+								? 'green'
+								: 'red'
+							: 'standard') &&
+						(!hoveringTest && !testingJava
+							? testingJavaSuccess === true
+								? 'green'
+								: 'red'
+							: 'standard') !== 'standard'
+							? `var(--color-${
+									!hoveringTest && !testingJava
+										? testingJavaSuccess === true
+											? 'green'
+											: 'red'
+										: 'standard'
+								})`
+							: undefined,
+				}"
+				@click="runTest(props.modelValue?.path)"
+				@mouseenter="!props.disabled && (hoveringTest = true)"
+				@mouseleave="hoveringTest = false"
 			>
-				<button
-					:aria-label="formatMessage(messages.testJavaInstallation)"
-					class="!shadow-none"
-					:disabled="testingJava || props.disabled"
-					@click="runTest(props.modelValue?.path)"
-					@mouseenter="!props.disabled && (hoveringTest = true)"
-					@mouseleave="hoveringTest = false"
-				>
-					<SpinnerIcon v-if="testingJava" class="animate-spin h-4 w-4" />
-					<CheckCircleIcon
-						v-else-if="testingJavaSuccess === true && !hoveringTest"
-						class="h-4 w-4"
-					/>
-					<XCircleIcon v-else-if="testingJavaSuccess !== true && !hoveringTest" class="h-4 w-4" />
-					<RefreshCwIcon v-else-if="!props.disabled" class="h-4 w-4" />
-				</button>
-			</ButtonStyled>
+				<SpinnerIcon v-if="testingJava" class="animate-spin h-4 w-4" />
+				<CheckCircleIcon v-else-if="testingJavaSuccess === true && !hoveringTest" class="h-4 w-4" />
+				<XCircleIcon v-else-if="testingJavaSuccess !== true && !hoveringTest" class="h-4 w-4" />
+				<RefreshCwIcon v-else-if="!props.disabled" class="h-4 w-4" />
+			</Button>
 		</div>
 		<span class="installation-buttons">
-			<ButtonStyled v-if="props.version">
-				<button
-					v-tooltip="
-						testingJavaSuccess === true ? formatMessage(messages.alreadyInstalled) : undefined
-					"
-					class="!shadow-none"
-					:disabled="props.disabled || installingJava || testingJavaSuccess === true"
-					@click="reinstallJava"
-				>
-					<DownloadIcon />
-					{{
-						installingJava
-							? formatMessage(messages.installing)
-							: formatMessage(messages.installRecommended)
-					}}
-				</button>
-			</ButtonStyled>
-			<ButtonStyled>
-				<button class="!shadow-none" :disabled="props.disabled" @click="autoDetect">
-					<SearchIcon />
-					{{ formatMessage(messages.detect) }}
-				</button>
-			</ButtonStyled>
-			<ButtonStyled>
-				<button class="!shadow-none" :disabled="props.disabled" @click="handleJavaFileInput()">
-					<FolderSearchIcon />
-					{{ formatMessage(messages.browse) }}
-				</button>
-			</ButtonStyled>
+			<Button
+				v-if="props.version"
+				v-tooltip="
+					testingJavaSuccess === true ? formatMessage(messages.alreadyInstalled) : undefined
+				"
+				:disabled="props.disabled || installingJava || testingJavaSuccess === true"
+				@click="reinstallJava"
+			>
+				<DownloadIcon />
+				{{
+					installingJava
+						? formatMessage(messages.installing)
+						: formatMessage(messages.installRecommended)
+				}}
+			</Button>
+			<Button :disabled="props.disabled" @click="autoDetect">
+				<SearchIcon />
+				{{ formatMessage(messages.detect) }}
+			</Button>
+			<Button :disabled="props.disabled" @click="handleJavaFileInput()">
+				<FolderSearchIcon />
+				{{ formatMessage(messages.browse) }}
+			</Button>
 		</span>
 	</div>
 </template>
@@ -90,7 +99,7 @@ import {
 	XCircleIcon,
 } from '@modrinth/assets'
 import {
-	ButtonStyled,
+	Button,
 	defineMessages,
 	injectNotificationManager,
 	StyledInput,
diff --git a/apps/app-frontend/src/components/ui/ModpackVersionModal.vue b/apps/app-frontend/src/components/ui/ModpackVersionModal.vue
index 9e1a79a64c..20763d30f5 100644
--- a/apps/app-frontend/src/components/ui/ModpackVersionModal.vue
+++ b/apps/app-frontend/src/components/ui/ModpackVersionModal.vue
@@ -1,6 +1,6 @@
 <script setup>
 import { CheckIcon } from '@modrinth/assets'
-import { Badge, ButtonStyled } from '@modrinth/ui'
+import { Badge, IconButton } from '@modrinth/ui'
 import { computed, ref } from 'vue'
 
 import { SwapIcon } from '@/assets/icons/index.js'
@@ -74,18 +74,16 @@ const onHide = () => {
 							@click="$router.push(`/project/${version.project_id}/version/${version.id}`)"
 						>
 							<div class="table-cell table-text">
-								<ButtonStyled
-									circular
-									:color="version.id === installedVersion ? 'standard' : 'brand'"
+								<IconButton
+									:type="version.id === installedVersion ? 'base' : 'colored'"
+									:color="version.id === installedVersion ? undefined : 'brand'"
+									label="Switch version"
+									:disabled="inProgress || installing || version.id === installedVersion"
+									@click.stop="() => switchVersion(version.id)"
 								>
-									<button
-										:disabled="inProgress || installing || version.id === installedVersion"
-										@click.stop="() => switchVersion(version.id)"
-									>
-										<SwapIcon v-if="version.id !== installedVersion" />
-										<CheckIcon v-else />
-									</button>
-								</ButtonStyled>
+									<SwapIcon v-if="version.id !== installedVersion" />
+									<CheckIcon v-else />
+								</IconButton>
 							</div>
 							<div class="name-cell table-cell table-text">
 								<div class="version-link">
diff --git a/apps/app-frontend/src/components/ui/SurveyPopup.vue b/apps/app-frontend/src/components/ui/SurveyPopup.vue
index cd6fe819e4..5199c000c9 100644
--- a/apps/app-frontend/src/components/ui/SurveyPopup.vue
+++ b/apps/app-frontend/src/components/ui/SurveyPopup.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { NotepadTextIcon, XIcon } from '@modrinth/assets'
-import { ButtonStyled, defineMessages, injectNotificationManager, useVIntl } from '@modrinth/ui'
+import { Button, defineMessages, injectNotificationManager, useVIntl } from '@modrinth/ui'
 import { type } from '@tauri-apps/plugin-os'
 import { $fetch } from 'ofetch'
 import { onMounted, ref } from 'vue'
@@ -193,18 +193,14 @@ onMounted(async () => {
 				{{ formatMessage(messages.surveyFooter) }}
 			</p>
 			<div class="flex gap-2">
-				<ButtonStyled color="brand">
-					<button @click="openSurvey">
-						<NotepadTextIcon />
-						{{ formatMessage(messages.takeSurvey) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled>
-					<button @click="dismissSurvey">
-						<XIcon />
-						{{ formatMessage(messages.surveyNoThanks) }}
-					</button>
-				</ButtonStyled>
+				<Button type="colored" color="brand" @click="openSurvey">
+					<NotepadTextIcon />
+					{{ formatMessage(messages.takeSurvey) }}
+				</Button>
+				<Button @click="dismissSurvey">
+					<XIcon />
+					{{ formatMessage(messages.surveyNoThanks) }}
+				</Button>
 			</div>
 		</div>
 	</transition>
diff --git a/apps/app-frontend/src/components/ui/URLConfirmModal.vue b/apps/app-frontend/src/components/ui/URLConfirmModal.vue
index 8a48cab8cf..749bdfa1fa 100644
--- a/apps/app-frontend/src/components/ui/URLConfirmModal.vue
+++ b/apps/app-frontend/src/components/ui/URLConfirmModal.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ButtonStyled, injectNotificationManager, ProjectCard } from '@modrinth/ui'
+import { Button, injectNotificationManager, ProjectCard } from '@modrinth/ui'
 import { ref } from 'vue'
 
 import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
@@ -69,9 +69,7 @@ async function install() {
 					</p>
 				</div>
 				<div class="button-group">
-					<ButtonStyled color="brand">
-						<button @click="install">Install</button>
-					</ButtonStyled>
+					<Button type="colored" color="brand" @click="install">Install</Button>
 				</div>
 			</div>
 		</div>
diff --git a/apps/app-frontend/src/components/ui/WindowControls.vue b/apps/app-frontend/src/components/ui/WindowControls.vue
index ebed90ee51..38f00cd1fb 100644
--- a/apps/app-frontend/src/components/ui/WindowControls.vue
+++ b/apps/app-frontend/src/components/ui/WindowControls.vue
@@ -4,34 +4,38 @@
 		class="flex items-center gap-2 mr-1.5"
 		data-tauri-drag-region-exclude
 	>
-		<ButtonStyled type="transparent" circular>
-			<button class="relative expanded-button" @click="() => getCurrentWindow().minimize()">
-				<MinimizeIcon />
-			</button>
-		</ButtonStyled>
-		<ButtonStyled type="transparent" circular>
-			<button class="relative expanded-button" @click="() => getCurrentWindow().toggleMaximize()">
-				<RestoreIcon v-if="isMaximized" />
-				<MaximizeIcon v-else />
-			</button>
-		</ButtonStyled>
-		<ButtonStyled
-			type="transparent"
-			color="red"
-			color-fill="none"
-			hover-color-fill="background"
-			circular
+		<IconButton
+			type="quiet"
+			label="Minimize window"
+			class="relative expanded-button"
+			@click="() => getCurrentWindow().minimize()"
 		>
-			<button class="relative expanded-button close-button" @click="handleClose">
-				<XIcon />
-			</button>
-		</ButtonStyled>
+			<MinimizeIcon />
+		</IconButton>
+		<IconButton
+			type="quiet"
+			label="Toggle maximize window"
+			class="relative expanded-button"
+			@click="() => getCurrentWindow().toggleMaximize()"
+		>
+			<RestoreIcon v-if="isMaximized" />
+			<MaximizeIcon v-else />
+		</IconButton>
+		<IconButton
+			type="quiet"
+			color="red"
+			label="Close window"
+			class="relative expanded-button close-button hover:!bg-red focus-visible:!bg-red"
+			@click="handleClose"
+		>
+			<XIcon />
+		</IconButton>
 	</section>
 </template>
 
 <script setup>
 import { MaximizeIcon, MinimizeIcon, RestoreIcon, XIcon } from '@modrinth/assets'
-import { ButtonStyled } from '@modrinth/ui'
+import { IconButton } from '@modrinth/ui'
 import { getCurrentWindow } from '@tauri-apps/api/window'
 import { saveWindowState, StateFlags } from '@tauri-apps/plugin-window-state'
 import { computed, onMounted, onUnmounted, ref } from 'vue'
diff --git a/apps/app-frontend/src/components/ui/app-update-button/index.vue b/apps/app-frontend/src/components/ui/app-update-button/index.vue
index 6abf2532db..f5098e0187 100644
--- a/apps/app-frontend/src/components/ui/app-update-button/index.vue
+++ b/apps/app-frontend/src/components/ui/app-update-button/index.vue
@@ -1,31 +1,30 @@
 <template>
-	<ButtonStyled color="brand" type="outlined" hover-color-fill="background">
-		<button
-			v-if="showUpdatePill"
-			type="button"
-			class="!h-[34px] text-sm !transition-[opacity,transform,background-color,color,filter] !duration-200 ease-out"
-			:class="{
-				'opacity-0 scale-[0.96]': finishedDownloading && !animateReadyPill,
-				'opacity-100 scale-100': finishedDownloading && animateReadyPill,
-			}"
-			:disabled="isUpdateDownloading"
-			:aria-busy="isUpdateDownloading"
-			@click="handleUpdateClick"
-		>
-			<RefreshCwIcon v-if="finishedDownloading" :class="{ 'animate-spin': restarting }" />
-			<DownloadIcon v-else />
-			<span v-if="isUpdateDownloading">
-				{{ formatMessage(messages.downloadingUpdate) }}
-				<span class="inline-block w-[3ch] text-right tabular-nums">{{ downloadPercent }}%</span>
-			</span>
-			<span v-else>{{ updateLabel }}</span>
-		</button>
-	</ButtonStyled>
+	<Button
+		v-if="showUpdatePill"
+		type="outlined"
+		native-type="button"
+		class="!h-[34px] text-sm !transition-[opacity,transform,background-color,color,filter] !duration-200 ease-out !text-brand [&>svg]:!text-brand !shadow-[inset_0_0_0_1px_var(--color-brand)] hover:!bg-brand focus-visible:!bg-brand hover:!text-[var(--color-accent-contrast)] focus-visible:!text-[var(--color-accent-contrast)]"
+		:class="{
+			'opacity-0 scale-[0.96]': finishedDownloading && !animateReadyPill,
+			'opacity-100 scale-100': finishedDownloading && animateReadyPill,
+		}"
+		:disabled="isUpdateDownloading"
+		:aria-busy="isUpdateDownloading"
+		@click="handleUpdateClick"
+	>
+		<RefreshCwIcon v-if="finishedDownloading" :class="{ 'animate-spin': restarting }" />
+		<DownloadIcon v-else />
+		<span v-if="isUpdateDownloading">
+			{{ formatMessage(messages.downloadingUpdate) }}
+			<span class="inline-block w-[3ch] text-right tabular-nums">{{ downloadPercent }}%</span>
+		</span>
+		<span v-else>{{ updateLabel }}</span>
+	</Button>
 </template>
 
 <script setup lang="ts">
 import { DownloadIcon, RefreshCwIcon } from '@modrinth/assets'
-import { ButtonStyled, defineMessages, useVIntl } from '@modrinth/ui'
+import { Button, defineMessages, useVIntl } from '@modrinth/ui'
 import { computed, nextTick, onBeforeUnmount, ref, watch } from 'vue'
 
 import {
diff --git a/apps/app-frontend/src/components/ui/friends/FriendsList.vue b/apps/app-frontend/src/components/ui/friends/FriendsList.vue
index 1b954325ac..705b3c16a1 100644
--- a/apps/app-frontend/src/components/ui/friends/FriendsList.vue
+++ b/apps/app-frontend/src/components/ui/friends/FriendsList.vue
@@ -2,8 +2,9 @@
 import { MailIcon, SearchIcon, SendIcon, UserIcon, UserPlusIcon, XIcon } from '@modrinth/assets'
 import {
 	Avatar,
-	ButtonStyled,
+	Button,
 	defineMessages,
+	IconButton,
 	injectNotificationManager,
 	IntlFormatted,
 	StyledInput,
@@ -220,26 +221,20 @@ const messages = defineMessages({
 					</div>
 					<div class="flex gap-2">
 						<template v-if="friend.id === userCredentials?.user_id">
-							<ButtonStyled color="brand">
-								<button @click="addFriend(friend)">
-									<UserPlusIcon />
-									Accept
-								</button>
-							</ButtonStyled>
-							<ButtonStyled>
-								<button @click="removeFriend(friend)">
-									<XIcon />
-									Ignore
-								</button>
-							</ButtonStyled>
+							<Button type="colored" color="brand" @click="addFriend(friend)">
+								<UserPlusIcon />
+								Accept
+							</Button>
+							<Button @click="removeFriend(friend)">
+								<XIcon />
+								Ignore
+							</Button>
 						</template>
 						<template v-else>
-							<ButtonStyled>
-								<button @click="removeFriend(friend)">
-									<XIcon />
-									Cancel
-								</button>
-							</ButtonStyled>
+							<Button @click="removeFriend(friend)">
+								<XIcon />
+								Cancel
+							</Button>
 						</template>
 					</div>
 				</div>
@@ -263,26 +258,28 @@ const messages = defineMessages({
 					wrapper-class="flex-1"
 					@keyup.enter="addFriendFromModal"
 				/>
-				<ButtonStyled color="brand">
-					<button :disabled="username.length === 0" @click="addFriendFromModal">
-						<SendIcon />
-						{{ formatMessage(messages.sendFriendRequest) }}
-					</button>
-				</ButtonStyled>
+				<Button
+					type="colored"
+					color="brand"
+					:disabled="username.length === 0"
+					@click="addFriendFromModal"
+				>
+					<SendIcon />
+					{{ formatMessage(messages.sendFriendRequest) }}
+				</Button>
 			</div>
 		</div>
 	</ModalWrapper>
 	<div v-if="userCredentials && !loading" class="flex gap-1 items-center mb-3 -ml-1">
 		<template v-if="sortedFriends.length > 0">
-			<ButtonStyled circular type="transparent">
-				<button
-					v-tooltip="formatMessage(messages.addFriend)"
-					:aria-label="formatMessage(messages.addFriend)"
-					@click="addFriendModal.show"
-				>
-					<UserPlusIcon />
-				</button>
-			</ButtonStyled>
+			<IconButton
+				v-tooltip="formatMessage(messages.addFriend)"
+				type="quiet"
+				:label="formatMessage(messages.addFriend)"
+				@click="addFriendModal.show"
+			>
+				<UserPlusIcon />
+			</IconButton>
 			<StyledInput
 				v-model="search"
 				:icon="SearchIcon"
@@ -297,23 +294,23 @@ const messages = defineMessages({
 		<h3 v-else class="w-full text-base text-primary font-medium m-0">
 			{{ formatMessage(messages.friends) }}
 		</h3>
-		<ButtonStyled v-if="incomingRequests.length > 0" circular type="transparent">
-			<button
-				v-tooltip="formatMessage(messages.viewFriendRequests, { count: incomingRequests.length })"
-				class="relative"
-				:aria-label="formatMessage(messages.viewFriendRequests, { count: incomingRequests.length })"
-				@click="friendInvitesModal.show"
+		<IconButton
+			v-if="incomingRequests.length > 0"
+			v-tooltip="formatMessage(messages.viewFriendRequests, { count: incomingRequests.length })"
+			type="quiet"
+			:label="formatMessage(messages.viewFriendRequests, { count: incomingRequests.length })"
+			class="relative"
+			@click="friendInvitesModal.show"
+		>
+			<MailIcon />
+			<span
+				v-if="incomingRequests.length > 0"
+				aria-hidden="true"
+				class="absolute bg-brand text-brand-inverted text-[8px] top-0.5 px-1 right-0.5 min-w-3 h-3 rounded-full flex items-center justify-center font-bold"
 			>
-				<MailIcon />
-				<span
-					v-if="incomingRequests.length > 0"
-					aria-hidden="true"
-					class="absolute bg-brand text-brand-inverted text-[8px] top-0.5 px-1 right-0.5 min-w-3 h-3 rounded-full flex items-center justify-center font-bold"
-				>
-					{{ incomingRequests.length }}
-				</span>
-			</button>
-		</ButtonStyled>
+				{{ incomingRequests.length }}
+			</span>
+		</IconButton>
 	</div>
 	<div class="flex flex-col gap-3">
 		<h3 v-if="loading" class="text-base text-primary font-medium m-0">
diff --git a/apps/app-frontend/src/components/ui/friends/FriendsSection.vue b/apps/app-frontend/src/components/ui/friends/FriendsSection.vue
index ec453e6c38..e53e7cc0f6 100644
--- a/apps/app-frontend/src/components/ui/friends/FriendsSection.vue
+++ b/apps/app-frontend/src/components/ui/friends/FriendsSection.vue
@@ -3,9 +3,9 @@ import { MoreVerticalIcon, TrashIcon, UserIcon, XIcon } from '@modrinth/assets'
 import {
 	Accordion,
 	Avatar,
-	ButtonStyled,
 	defineMessages,
-	OverflowMenu,
+	IconButton,
+	TeleportOverflowMenu,
 	useVIntl,
 } from '@modrinth/ui'
 import { useTemplateRef } from 'vue'
@@ -166,29 +166,35 @@ const messages = defineMessages({
 							<span v-else-if="friend.status" class="m-0 text-xs">{{ friend.status }}</span>
 						</div>
 					</RouterLink>
-					<ButtonStyled v-if="friend.accepted" circular type="transparent">
-						<OverflowMenu
-							class="opacity-0 group-hover:opacity-100 transition-opacity"
-							:options="[
-								{
-									id: 'remove-friend',
-									action: () => removeFriend(friend),
-									color: 'red',
-								},
-							]"
-						>
-							<MoreVerticalIcon />
-							<template #remove-friend>
-								<TrashIcon />
-								{{ formatMessage(messages.removeFriend) }}
-							</template>
-						</OverflowMenu>
-					</ButtonStyled>
-					<ButtonStyled v-else type="transparent" circular>
-						<button v-tooltip="formatMessage(messages.cancelRequest)" @click="removeFriend(friend)">
-							<XIcon />
-						</button>
-					</ButtonStyled>
+					<TeleportOverflowMenu
+						v-if="friend.accepted"
+						type="quiet"
+						label="More options"
+						class="opacity-0 group-hover:opacity-100 transition-opacity"
+						:options="[
+							{
+								id: 'remove-friend',
+								label: formatMessage(messages.removeFriend),
+								action: () => removeFriend(friend),
+								tone: 'red',
+							},
+						]"
+					>
+						<MoreVerticalIcon />
+						<template #remove-friend>
+							<TrashIcon />
+							{{ formatMessage(messages.removeFriend) }}
+						</template>
+					</TeleportOverflowMenu>
+					<IconButton
+						v-else
+						v-tooltip="formatMessage(messages.cancelRequest)"
+						type="quiet"
+						:label="formatMessage(messages.cancelRequest)"
+						@click="removeFriend(friend)"
+					>
+						<XIcon />
+					</IconButton>
 				</div>
 			</div>
 		</template>
diff --git a/apps/app-frontend/src/components/ui/install_flow/AddServerToInstanceModal.vue b/apps/app-frontend/src/components/ui/install_flow/AddServerToInstanceModal.vue
index 17114ed83a..9845331baf 100644
--- a/apps/app-frontend/src/components/ui/install_flow/AddServerToInstanceModal.vue
+++ b/apps/app-frontend/src/components/ui/install_flow/AddServerToInstanceModal.vue
@@ -1,12 +1,6 @@
 <script setup>
 import { CheckIcon, PlusIcon, SearchIcon } from '@modrinth/assets'
-import {
-	Admonition,
-	Avatar,
-	ButtonStyled,
-	injectNotificationManager,
-	StyledInput,
-} from '@modrinth/ui'
+import { Admonition, Avatar, Button, injectNotificationManager, StyledInput } from '@modrinth/ui'
 import { useQueryClient } from '@tanstack/vue-query'
 import { convertFileSrc } from '@tauri-apps/api/core'
 import { computed, ref } from 'vue'
@@ -110,19 +104,15 @@ async function addServer(instance) {
 						/>
 						{{ instance.name }}
 					</router-link>
-					<ButtonStyled>
-						<button :disabled="instance.added || instance.adding" @click="addServer(instance)">
-							<PlusIcon v-if="!instance.added && !instance.adding" />
-							<CheckIcon v-else-if="instance.added" />
-							{{ instance.adding ? 'Adding...' : instance.added ? 'Added' : 'Add' }}
-						</button>
-					</ButtonStyled>
+					<Button :disabled="instance.added || instance.adding" @click="addServer(instance)">
+						<PlusIcon v-if="!instance.added && !instance.adding" />
+						<CheckIcon v-else-if="instance.added" />
+						{{ instance.adding ? 'Adding...' : instance.added ? 'Added' : 'Add' }}
+					</Button>
 				</div>
 			</div>
 			<div class="input-group push-right">
-				<ButtonStyled>
-					<button @click="modal.hide()">Cancel</button>
-				</ButtonStyled>
+				<Button @click="modal.hide()">Cancel</Button>
 			</div>
 		</div>
 	</ModalWrapper>
diff --git a/apps/app-frontend/src/components/ui/minecraft-auth-error-modal/MinecraftAuthErrorModal.vue b/apps/app-frontend/src/components/ui/minecraft-auth-error-modal/MinecraftAuthErrorModal.vue
index 40267f14f5..a08649009f 100644
--- a/apps/app-frontend/src/components/ui/minecraft-auth-error-modal/MinecraftAuthErrorModal.vue
+++ b/apps/app-frontend/src/components/ui/minecraft-auth-error-modal/MinecraftAuthErrorModal.vue
@@ -7,7 +7,7 @@ import {
 	MessagesSquareIcon,
 	WrenchIcon,
 } from '@modrinth/assets'
-import { Admonition, ButtonStyled, Collapsible, NewModal } from '@modrinth/ui'
+import { Admonition, Button, ButtonLink, Collapsible, IconButton, NewModal } from '@modrinth/ui'
 import { computed, ref } from 'vue'
 
 import { hide_ads_window, show_ads_window } from '@/helpers/ads.js'
@@ -137,16 +137,18 @@ async function copyToClipboard(text: string) {
 
 			<!-- Action buttons -->
 			<div class="flex items-center gap-2">
-				<ButtonStyled>
-					<a href="https://support.modrinth.com" class="!w-full" @click="modal?.hide()">
-						<MessagesSquareIcon /> Contact support
-					</a>
-				</ButtonStyled>
-				<ButtonStyled color="brand">
-					<button :disabled="loadingSignIn" class="!w-full" @click="signInAgain">
-						<LogInIcon /> Sign in again
-					</button>
-				</ButtonStyled>
+				<ButtonLink href="https://support.modrinth.com" class="!w-full" @click="modal?.hide()">
+					<MessagesSquareIcon /> Contact support
+				</ButtonLink>
+				<Button
+					type="colored"
+					color="brand"
+					:disabled="loadingSignIn"
+					class="!w-full"
+					@click="signInAgain"
+				>
+					<LogInIcon /> Sign in again
+				</Button>
 			</div>
 
 			<div class="flex flex-col gap-2">
@@ -176,16 +178,15 @@ async function copyToClipboard(text: string) {
 							>
 								{{ debugInfo }}
 							</div>
-							<ButtonStyled circular>
-								<button
-									v-tooltip="'Copy debug info'"
-									:disabled="copied"
-									@click="copyToClipboard(debugInfo)"
-								>
-									<template v-if="copied"> <CheckIcon class="text-green" /> </template>
-									<template v-else> <CopyIcon /> </template>
-								</button>
-							</ButtonStyled>
+							<IconButton
+								v-tooltip="'Copy debug info'"
+								:label="'Copy debug info'"
+								:disabled="copied"
+								@click="copyToClipboard(debugInfo)"
+							>
+								<template v-if="copied"> <CheckIcon class="text-green" /> </template>
+								<template v-else> <CopyIcon /> </template>
+							</IconButton>
 						</div>
 					</Collapsible>
 				</div>
diff --git a/apps/app-frontend/src/components/ui/minecraft-required-modal/MinecraftRequiredModal.vue b/apps/app-frontend/src/components/ui/minecraft-required-modal/MinecraftRequiredModal.vue
index c82c174a45..4472906316 100644
--- a/apps/app-frontend/src/components/ui/minecraft-required-modal/MinecraftRequiredModal.vue
+++ b/apps/app-frontend/src/components/ui/minecraft-required-modal/MinecraftRequiredModal.vue
@@ -21,38 +21,33 @@
 
 		<div class="flex flex-col gap-6 px-6 pb-6">
 			<div class="flex justify-end gap-2">
-				<ButtonStyled>
-					<a class="w-full !shadow-none" href="https://support.modrinth.com" @click="modal?.hide()">
-						<MessagesSquareIcon />
-						{{ formatMessage(messages.getSupport) }}
-					</a>
-				</ButtonStyled>
-				<ButtonStyled color="brand">
-					<button class="w-full !shadow-none" :disabled="loadingSignIn" @click="signIn">
-						<SpinnerIcon v-if="loadingSignIn" class="animate-spin" />
-						<svg
-							v-else
-							width="20"
-							height="20"
-							viewBox="0 0 20 20"
-							fill="none"
-							xmlns="http://www.w3.org/2000/svg"
-						>
-							<rect width="9.25" height="9.25" fill="black" fill-opacity="0.9" />
-							<rect x="10.75" width="9.25" height="9.25" fill="black" fill-opacity="0.9" />
-							<rect y="10.75" width="9.25" height="9.25" fill="black" fill-opacity="0.9" />
-							<rect
-								x="10.75"
-								y="10.75"
-								width="9.25"
-								height="9.25"
-								fill="black"
-								fill-opacity="0.9"
-							/>
-						</svg>
-						{{ formatMessage(messages.signIn) }}
-					</button>
-				</ButtonStyled>
+				<ButtonLink class="w-full" href="https://support.modrinth.com" @click="modal?.hide()">
+					<MessagesSquareIcon />
+					{{ formatMessage(messages.getSupport) }}
+				</ButtonLink>
+				<Button
+					type="colored"
+					color="brand"
+					class="w-full"
+					:disabled="loadingSignIn"
+					@click="signIn"
+				>
+					<SpinnerIcon v-if="loadingSignIn" class="animate-spin" />
+					<svg
+						v-else
+						width="20"
+						height="20"
+						viewBox="0 0 20 20"
+						fill="none"
+						xmlns="http://www.w3.org/2000/svg"
+					>
+						<rect width="9.25" height="9.25" fill="black" fill-opacity="0.9" />
+						<rect x="10.75" width="9.25" height="9.25" fill="black" fill-opacity="0.9" />
+						<rect y="10.75" width="9.25" height="9.25" fill="black" fill-opacity="0.9" />
+						<rect x="10.75" y="10.75" width="9.25" height="9.25" fill="black" fill-opacity="0.9" />
+					</svg>
+					{{ formatMessage(messages.signIn) }}
+				</Button>
 			</div>
 			<p class="m-0 text-center text-sm text-secondary">
 				{{ formatMessage(messages.dontHaveAccount) }}
@@ -69,7 +64,7 @@
 
 <script setup lang="ts">
 import { MessagesSquareIcon, SpinnerIcon } from '@modrinth/assets'
-import { ButtonStyled, defineMessages, NewModal, useVIntl } from '@modrinth/ui'
+import { Button, ButtonLink, defineMessages, NewModal, useVIntl } from '@modrinth/ui'
 import { inject, type Ref, ref } from 'vue'
 
 import steveImage from '@/assets/steve-look-up-left.webp'
diff --git a/apps/app-frontend/src/components/ui/modal/ConfirmDeleteInstanceModal.vue b/apps/app-frontend/src/components/ui/modal/ConfirmDeleteInstanceModal.vue
index d6c869ba13..4ebef1803e 100644
--- a/apps/app-frontend/src/components/ui/modal/ConfirmDeleteInstanceModal.vue
+++ b/apps/app-frontend/src/components/ui/modal/ConfirmDeleteInstanceModal.vue
@@ -6,18 +6,14 @@
 
 		<template #actions>
 			<div class="flex gap-2 justify-end">
-				<ButtonStyled type="outlined">
-					<button @click="modal?.hide()">
-						<XIcon />
-						{{ formatMessage(commonMessages.cancelButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="red">
-					<button @click="confirm">
-						<TrashIcon />
-						{{ formatMessage(messages.deleteButton) }}
-					</button>
-				</ButtonStyled>
+				<Button type="outlined" @click="modal?.hide()">
+					<XIcon />
+					{{ formatMessage(commonMessages.cancelButton) }}
+				</Button>
+				<Button type="colored" color="red" @click="confirm">
+					<TrashIcon />
+					{{ formatMessage(messages.deleteButton) }}
+				</Button>
 			</div>
 		</template>
 	</NewModal>
@@ -27,7 +23,7 @@
 import { TrashIcon, XIcon } from '@modrinth/assets'
 import {
 	Admonition,
-	ButtonStyled,
+	Button,
 	commonMessages,
 	defineMessages,
 	NewModal,
diff --git a/apps/app-frontend/src/components/ui/modal/InstallToPlayModal.vue b/apps/app-frontend/src/components/ui/modal/InstallToPlayModal.vue
index 912725f5e8..16c229706f 100644
--- a/apps/app-frontend/src/components/ui/modal/InstallToPlayModal.vue
+++ b/apps/app-frontend/src/components/ui/modal/InstallToPlayModal.vue
@@ -18,12 +18,10 @@
 						{{ formatMessage(messages.sharedInstance) }}
 					</span>
 
-					<ButtonStyled type="transparent">
-						<button @click="openViewContents">
-							<EyeIcon />
-							{{ formatMessage(messages.viewContents) }}
-						</button>
-					</ButtonStyled>
+					<Button type="quiet" @click="openViewContents">
+						<EyeIcon />
+						{{ formatMessage(messages.viewContents) }}
+					</Button>
 				</div>
 
 				<div class="flex items-center gap-3 rounded-2xl bg-surface-2 p-3">
@@ -113,40 +111,30 @@
 			</p>
 
 			<div class="flex w-full items-center justify-between gap-2">
-				<ButtonStyled type="transparent" color="red">
-					<button @click="handleReport">
-						<ReportIcon />
-						{{ formatMessage(commonMessages.reportButton) }}
-					</button>
-				</ButtonStyled>
+				<Button type="quiet" color="red" @click="handleReport">
+					<ReportIcon />
+					{{ formatMessage(commonMessages.reportButton) }}
+				</Button>
 
 				<div class="flex items-center gap-2">
 					<template v-if="hasExternalFiles">
-						<ButtonStyled type="transparent" color="orange">
-							<button @click="handleAccept">
-								{{ formatMessage(messages.installAnyway) }}
-							</button>
-						</ButtonStyled>
-						<ButtonStyled color="brand">
-							<button @click="handleDecline">
-								<BanIcon />
-								{{ formatMessage(messages.dontInstall) }}
-							</button>
-						</ButtonStyled>
+						<Button type="quiet" color="orange" @click="handleAccept">
+							{{ formatMessage(messages.installAnyway) }}
+						</Button>
+						<Button type="colored" color="brand" @click="handleDecline">
+							<BanIcon />
+							{{ formatMessage(messages.dontInstall) }}
+						</Button>
 					</template>
 					<template v-else>
-						<ButtonStyled>
-							<button @click="handleDecline">
-								<XIcon />
-								{{ formatMessage(commonMessages.cancelButton) }}
-							</button>
-						</ButtonStyled>
-						<ButtonStyled color="brand">
-							<button @click="handleAccept">
-								<DownloadIcon />
-								{{ formatMessage(messages.installButton) }}
-							</button>
-						</ButtonStyled>
+						<Button @click="handleDecline">
+							<XIcon />
+							{{ formatMessage(commonMessages.cancelButton) }}
+						</Button>
+						<Button type="colored" color="brand" @click="handleAccept">
+							<DownloadIcon />
+							{{ formatMessage(messages.installButton) }}
+						</Button>
 					</template>
 				</div>
 			</div>
@@ -163,10 +151,10 @@
 <script setup lang="ts">
 import type { Labrinth } from '@modrinth/api-client'
 import { BanIcon, DownloadIcon, EyeIcon, ReportIcon, XIcon } from '@modrinth/assets'
+import { Button } from '@modrinth/ui'
 import {
 	Admonition,
 	Avatar,
-	ButtonStyled,
 	commonMessages,
 	type ContentItem,
 	defineMessages,
diff --git a/apps/app-frontend/src/components/ui/modal/ModpackAlreadyInstalledModal.vue b/apps/app-frontend/src/components/ui/modal/ModpackAlreadyInstalledModal.vue
index 007a4a84e2..20ad5d881c 100644
--- a/apps/app-frontend/src/components/ui/modal/ModpackAlreadyInstalledModal.vue
+++ b/apps/app-frontend/src/components/ui/modal/ModpackAlreadyInstalledModal.vue
@@ -10,24 +10,18 @@
 
 		<template #actions>
 			<div class="flex gap-2 justify-end">
-				<ButtonStyled type="outlined">
-					<button @click="handleCancel">
-						<XIcon />
-						{{ formatMessage(commonMessages.cancelButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled>
-					<button @click="handleGoToInstance">
-						{{ formatMessage(messages.instance) }}
-						<RightArrowIcon />
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="orange">
-					<button @click="handleCreateAnyway">
-						<PlusIcon />
-						{{ formatMessage(messages.create) }}
-					</button>
-				</ButtonStyled>
+				<Button type="outlined" @click="handleCancel">
+					<XIcon />
+					{{ formatMessage(commonMessages.cancelButton) }}
+				</Button>
+				<Button @click="handleGoToInstance">
+					{{ formatMessage(messages.instance) }}
+					<RightArrowIcon />
+				</Button>
+				<Button type="colored" color="orange" @click="handleCreateAnyway">
+					<PlusIcon />
+					{{ formatMessage(messages.create) }}
+				</Button>
 			</div>
 		</template>
 	</NewModal>
@@ -36,7 +30,7 @@
 <script setup lang="ts">
 import { PlusIcon, RightArrowIcon, XIcon } from '@modrinth/assets'
 import {
-	ButtonStyled,
+	Button,
 	commonMessages,
 	defineMessages,
 	IntlFormatted,
diff --git a/apps/app-frontend/src/components/ui/modal/ModrinthAccountRequiredModal.vue b/apps/app-frontend/src/components/ui/modal/ModrinthAccountRequiredModal.vue
index db5dbc880c..18b832278d 100644
--- a/apps/app-frontend/src/components/ui/modal/ModrinthAccountRequiredModal.vue
+++ b/apps/app-frontend/src/components/ui/modal/ModrinthAccountRequiredModal.vue
@@ -19,18 +19,20 @@
 
 			<div class="flex flex-col gap-6">
 				<div class="grid grid-cols-1 gap-2 sm:grid-cols-2">
-					<ButtonStyled>
-						<button class="w-full !shadow-none" type="button" @click="authenticate('sign-up')">
-							<UserPlusIcon aria-hidden="true" />
-							{{ formatMessage(messages.createAccountButton) }}
-						</button>
-					</ButtonStyled>
-					<ButtonStyled color="brand">
-						<button class="w-full" type="button" @click="authenticate('sign-in')">
-							<LogInIcon aria-hidden="true" />
-							{{ formatMessage(messages.signInButton) }}
-						</button>
-					</ButtonStyled>
+					<Button class="w-full" native-type="button" @click="authenticate('sign-up')">
+						<UserPlusIcon aria-hidden="true" />
+						{{ formatMessage(messages.createAccountButton) }}
+					</Button>
+					<Button
+						type="colored"
+						color="brand"
+						class="w-full"
+						native-type="button"
+						@click="authenticate('sign-in')"
+					>
+						<LogInIcon aria-hidden="true" />
+						{{ formatMessage(messages.signInButton) }}
+					</Button>
 				</div>
 
 				<p class="m-0 text-center text-base font-medium leading-6 text-primary">
@@ -69,23 +71,19 @@
 
 			<div class="flex flex-col gap-6">
 				<div class="grid grid-cols-1 gap-2 sm:grid-cols-2">
-					<ButtonStyled type="outlined">
-						<button class="w-full" type="button" @click="modal?.hide()">
-							<XIcon aria-hidden="true" />
-							{{ formatMessage(messages.cancelButton) }}
-						</button>
-					</ButtonStyled>
-					<ButtonStyled>
-						<button
-							class="w-full !shadow-none"
-							type="button"
-							:disabled="reopeningBrowser"
-							@click="reopenBrowser"
-						>
-							<RefreshCwIcon aria-hidden="true" />
-							{{ formatMessage(messages.openBrowserAgainButton) }}
-						</button>
-					</ButtonStyled>
+					<Button type="outlined" class="w-full" native-type="button" @click="modal?.hide()">
+						<XIcon aria-hidden="true" />
+						{{ formatMessage(messages.cancelButton) }}
+					</Button>
+					<Button
+						class="w-full"
+						native-type="button"
+						:disabled="reopeningBrowser"
+						@click="reopenBrowser"
+					>
+						<RefreshCwIcon aria-hidden="true" />
+						{{ formatMessage(messages.openBrowserAgainButton) }}
+					</Button>
 				</div>
 
 				<p class="m-0 text-center text-base font-medium leading-6 text-primary">
@@ -108,7 +106,7 @@
 
 <script setup lang="ts">
 import { LogInIcon, RefreshCwIcon, SpinnerIcon, UserPlusIcon, XIcon } from '@modrinth/assets'
-import { ButtonStyled, defineMessages, IntlFormatted, NewModal, useVIntl } from '@modrinth/ui'
+import { Button, defineMessages, IntlFormatted, NewModal, useVIntl } from '@modrinth/ui'
 import { openUrl } from '@tauri-apps/plugin-opener'
 import { ref } from 'vue'
 
diff --git a/apps/app-frontend/src/components/ui/settings/account/PrivacySettings.vue b/apps/app-frontend/src/components/ui/settings/account/PrivacySettings.vue
index b945942ae6..2a309d8fa7 100644
--- a/apps/app-frontend/src/components/ui/settings/account/PrivacySettings.vue
+++ b/apps/app-frontend/src/components/ui/settings/account/PrivacySettings.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { Settings2Icon } from '@modrinth/assets'
 import {
-	ButtonStyled,
+	Button,
 	defineMessages,
 	injectNotificationManager,
 	injectPageContext,
@@ -78,12 +78,10 @@ watch(
 			{{ formatMessage(messages.adsConsentTitle) }}
 		</h2>
 		<div class="mt-2 flex flex-col gap-2.5 items-start">
-			<ButtonStyled>
-				<button class="!shadow-none" @click="manageAdsPreferences">
-					<Settings2Icon aria-hidden="true" />
-					{{ formatMessage(messages.adsConsentManage) }}
-				</button>
-			</ButtonStyled>
+			<Button @click="manageAdsPreferences">
+				<Settings2Icon aria-hidden="true" />
+				{{ formatMessage(messages.adsConsentManage) }}
+			</Button>
 			<div>
 				{{ formatMessage(messages.adsConsentIntro) }}
 			</div>
diff --git a/apps/app-frontend/src/components/ui/settings/display/FeatureFlagSettings.vue b/apps/app-frontend/src/components/ui/settings/display/FeatureFlagSettings.vue
index 65a0276b37..29f314f140 100644
--- a/apps/app-frontend/src/components/ui/settings/display/FeatureFlagSettings.vue
+++ b/apps/app-frontend/src/components/ui/settings/display/FeatureFlagSettings.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ButtonStyled, Toggle } from '@modrinth/ui'
+import { Button, Toggle } from '@modrinth/ui'
 import { ref, watch } from 'vue'
 
 import { get as getSettings, set as setSettings } from '@/helpers/settings.ts'
@@ -33,14 +33,13 @@ watch(
 				</h2>
 			</div>
 			<div class="flex items-center gap-2">
-				<ButtonStyled type="transparent">
-					<button
-						:disabled="themeStore.getFeatureFlag(option) === DEFAULT_FEATURE_FLAGS[option]"
-						@click="setFeatureFlag(option, DEFAULT_FEATURE_FLAGS[option])"
-					>
-						Reset to default
-					</button>
-				</ButtonStyled>
+				<Button
+					type="quiet"
+					:disabled="themeStore.getFeatureFlag(option) === DEFAULT_FEATURE_FLAGS[option]"
+					@click="setFeatureFlag(option, DEFAULT_FEATURE_FLAGS[option])"
+				>
+					Reset to default
+				</Button>
 				<Toggle
 					id="advanced-rendering"
 					:model-value="themeStore.getFeatureFlag(option)"
diff --git a/apps/app-frontend/src/components/ui/settings/instances/ResourceManagementSettings.vue b/apps/app-frontend/src/components/ui/settings/instances/ResourceManagementSettings.vue
index 9b6aa92062..0fc1a131f6 100644
--- a/apps/app-frontend/src/components/ui/settings/instances/ResourceManagementSettings.vue
+++ b/apps/app-frontend/src/components/ui/settings/instances/ResourceManagementSettings.vue
@@ -1,8 +1,9 @@
 <script setup>
 import { BoxIcon, FolderOpenIcon, FolderSearchIcon, TrashIcon } from '@modrinth/assets'
 import {
-	ButtonStyled,
+	Button,
 	defineMessages,
+	IconButton,
 	injectNotificationManager,
 	Slider,
 	StyledInput,
@@ -183,16 +184,14 @@ async function findLauncherDir() {
 				wrapper-class="w-full"
 			>
 				<template #right>
-					<ButtonStyled circular>
-						<button
-							v-tooltip="formatMessage(messages.browseAppDirectory)"
-							:aria-label="formatMessage(messages.browseAppDirectory)"
-							class="ml-1.5"
-							@click="findLauncherDir"
-						>
-							<FolderSearchIcon aria-hidden="true" />
-						</button>
-					</ButtonStyled>
+					<IconButton
+						v-tooltip="formatMessage(messages.browseAppDirectory)"
+						:label="formatMessage(messages.browseAppDirectory)"
+						class="ml-1.5"
+						@click="findLauncherDir"
+					>
+						<FolderSearchIcon aria-hidden="true" />
+					</IconButton>
 				</template>
 			</StyledInput>
 			<p class="m-0 leading-tight text-secondary">
@@ -235,10 +234,10 @@ async function findLauncherDir() {
 			<h2 class="m-0 text-lg font-semibold text-contrast">
 				{{ formatMessage(messages.appCacheTitle) }}
 			</h2>
-			<button id="purge-cache" class="btn min-w-max" @click="handlePurgeCacheClick">
+			<Button id="purge-cache" class="w-fit" @click="handlePurgeCacheClick">
 				<TrashIcon aria-hidden="true" />
 				{{ formatMessage(messages.purgeCache) }}
-			</button>
+			</Button>
 			<p class="m-0 leading-tight text-secondary">
 				{{ formatMessage(messages.appCacheDescription) }}
 			</p>
@@ -280,10 +279,10 @@ async function findLauncherDir() {
 			<h2 class="mt-0 m-0 text-lg font-semibold text-contrast">
 				{{ formatMessage(messages.appDatabaseBackupsTitle) }}
 			</h2>
-			<button id="open-db-backups-folder" class="btn min-w-max" @click="openDbBackupsFolder">
+			<Button id="open-db-backups-folder" class="w-fit" @click="openDbBackupsFolder">
 				<FolderOpenIcon aria-hidden="true" />
 				{{ formatMessage(messages.openBackupsFolder) }}
-			</button>
+			</Button>
 			<p class="m-0 leading-tight text-secondary">
 				{{ formatMessage(messages.appDatabaseBackupsDescription) }}
 			</p>
diff --git a/apps/app-frontend/src/components/ui/shared-instances/SharedInstanceAlreadyInstalledModal.vue b/apps/app-frontend/src/components/ui/shared-instances/SharedInstanceAlreadyInstalledModal.vue
index 3e59220273..092bf5e019 100644
--- a/apps/app-frontend/src/components/ui/shared-instances/SharedInstanceAlreadyInstalledModal.vue
+++ b/apps/app-frontend/src/components/ui/shared-instances/SharedInstanceAlreadyInstalledModal.vue
@@ -10,24 +10,18 @@
 
 		<template #actions>
 			<div class="flex justify-end gap-2">
-				<ButtonStyled type="outlined">
-					<button @click="handleCancel">
-						<XIcon />
-						{{ formatMessage(commonMessages.cancelButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled>
-					<button @click="handleGoToInstance">
-						{{ formatMessage(messages.instance) }}
-						<RightArrowIcon />
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="orange">
-					<button @click="handleInstallAnyway">
-						<DownloadIcon />
-						{{ formatMessage(messages.installAnyway) }}
-					</button>
-				</ButtonStyled>
+				<Button type="outlined" @click="handleCancel">
+					<XIcon />
+					{{ formatMessage(commonMessages.cancelButton) }}
+				</Button>
+				<Button @click="handleGoToInstance">
+					{{ formatMessage(messages.instance) }}
+					<RightArrowIcon />
+				</Button>
+				<Button type="colored" color="orange" @click="handleInstallAnyway">
+					<DownloadIcon />
+					{{ formatMessage(messages.installAnyway) }}
+				</Button>
 			</div>
 		</template>
 	</NewModal>
@@ -36,7 +30,7 @@
 <script setup lang="ts">
 import { DownloadIcon, RightArrowIcon, XIcon } from '@modrinth/assets'
 import {
-	ButtonStyled,
+	Button,
 	commonMessages,
 	defineMessages,
 	IntlFormatted,
diff --git a/apps/app-frontend/src/components/ui/shared-instances/shared-instance-install-modal/index.vue b/apps/app-frontend/src/components/ui/shared-instances/shared-instance-install-modal/index.vue
index 2c63720be5..9ffa818bcb 100644
--- a/apps/app-frontend/src/components/ui/shared-instances/shared-instance-install-modal/index.vue
+++ b/apps/app-frontend/src/components/ui/shared-instances/shared-instance-install-modal/index.vue
@@ -193,53 +193,39 @@
 				{{ formatMessage(messages.reviewedFiles) }}
 			</p>
 			<div v-if="!reportMode" class="flex w-full items-center justify-between gap-2">
-				<ButtonStyled color="red" type="transparent">
-					<button @click="reportMode = true">
-						<ReportIcon />{{ formatMessage(commonMessages.reportButton) }}
-					</button>
-				</ButtonStyled>
+				<Button type="quiet" color="red" @click="reportMode = true">
+					<ReportIcon />{{ formatMessage(commonMessages.reportButton) }}
+				</Button>
 				<div class="flex items-center gap-2">
 					<template v-if="hasExternalFiles">
-						<ButtonStyled type="transparent" color="orange">
-							<button @click="accept">
-								{{ formatMessage(messages.installAnyway) }}
-							</button>
-						</ButtonStyled>
-						<ButtonStyled color="brand">
-							<button @click="handleCancel">
-								<BanIcon />{{ formatMessage(messages.dontInstall) }}
-							</button>
-						</ButtonStyled>
+						<Button type="quiet" color="orange" @click="accept">
+							{{ formatMessage(messages.installAnyway) }}
+						</Button>
+						<Button type="colored" color="brand" @click="handleCancel">
+							<BanIcon />{{ formatMessage(messages.dontInstall) }}
+						</Button>
 					</template>
 					<template v-else>
-						<ButtonStyled type="outlined">
-							<button class="!border" @click="handleCancel">
-								<XIcon />{{ formatMessage(commonMessages.cancelButton) }}
-							</button>
-						</ButtonStyled>
-						<ButtonStyled color="brand">
-							<button @click="accept">
-								<DownloadIcon />{{ formatMessage(messages.installButton) }}
-							</button>
-						</ButtonStyled>
+						<Button type="outlined" class="!border" @click="handleCancel">
+							<XIcon />{{ formatMessage(commonMessages.cancelButton) }}
+						</Button>
+						<Button type="colored" color="brand" @click="accept">
+							<DownloadIcon />{{ formatMessage(messages.installButton) }}
+						</Button>
 					</template>
 				</div>
 			</div>
 		</div>
 		<template v-if="reportMode" #actions>
 			<div class="flex justify-end gap-2">
-				<ButtonStyled type="outlined">
-					<button class="!border" :disabled="submitLoading" @click="handleCancel">
-						<XIcon />{{ formatMessage(commonMessages.cancelButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="brand">
-					<button :disabled="!canSubmitReport" @click="submitReport">
-						<SpinnerIcon v-if="submitLoading" class="animate-spin" />
-						<SendIcon v-else />
-						{{ formatMessage(commonMessages.reportButton) }}
-					</button>
-				</ButtonStyled>
+				<Button type="outlined" class="!border" :disabled="submitLoading" @click="handleCancel">
+					<XIcon />{{ formatMessage(commonMessages.cancelButton) }}
+				</Button>
+				<Button type="colored" color="brand" :disabled="!canSubmitReport" @click="submitReport">
+					<SpinnerIcon v-if="submitLoading" class="animate-spin" />
+					<SendIcon v-else />
+					{{ formatMessage(commonMessages.reportButton) }}
+				</Button>
 			</div>
 		</template>
 	</NewModal>
@@ -254,12 +240,12 @@
 <script setup lang="ts">
 import type { Labrinth } from '@modrinth/api-client'
 import { BanIcon, DownloadIcon, ReportIcon, SendIcon, SpinnerIcon, XIcon } from '@modrinth/assets'
+import { Button } from '@modrinth/ui'
 import {
 	Admonition,
 	AutoLink,
 	Avatar,
 	blockedUsersQueryKey,
-	ButtonStyled,
 	Checkbox,
 	Combobox,
 	type ComboboxOption,
diff --git a/apps/app-frontend/src/components/ui/shared-instances/shared-instance-install-modal/shared-instance-install-summary.vue b/apps/app-frontend/src/components/ui/shared-instances/shared-instance-install-modal/shared-instance-install-summary.vue
index 8db6f7abb2..7733b6f6ce 100644
--- a/apps/app-frontend/src/components/ui/shared-instances/shared-instance-install-modal/shared-instance-install-summary.vue
+++ b/apps/app-frontend/src/components/ui/shared-instances/shared-instance-install-modal/shared-instance-install-summary.vue
@@ -4,12 +4,10 @@
 			<span class="font-semibold text-contrast">{{
 				heading ?? formatMessage(messages.sharedInstance)
 			}}</span>
-			<ButtonStyled type="transparent">
-				<button @click="emit('viewContents')">
-					<EyeIcon />
-					{{ formatMessage(messages.viewContents) }}
-				</button>
-			</ButtonStyled>
+			<Button type="quiet" @click="emit('viewContents')">
+				<EyeIcon />
+				{{ formatMessage(messages.viewContents) }}
+			</Button>
 		</div>
 		<div class="flex items-center gap-3 rounded-2xl bg-surface-2 p-3">
 			<Avatar
@@ -34,7 +32,7 @@
 
 <script setup lang="ts">
 import { EyeIcon } from '@modrinth/assets'
-import { Avatar, ButtonStyled, defineMessages, formatLoader, useVIntl } from '@modrinth/ui'
+import { Avatar, Button, defineMessages, formatLoader, useVIntl } from '@modrinth/ui'
 import { computed, toRefs } from 'vue'
 
 import type { SharedInstanceInstallPreview } from '@/helpers/install'
diff --git a/apps/app-frontend/src/components/ui/skin/EditSkinModal.vue b/apps/app-frontend/src/components/ui/skin/EditSkinModal.vue
index 7993ef2034..fe7968a3f7 100644
--- a/apps/app-frontend/src/components/ui/skin/EditSkinModal.vue
+++ b/apps/app-frontend/src/components/ui/skin/EditSkinModal.vue
@@ -22,11 +22,9 @@
 			<div class="flex flex-col gap-4 w-full min-h-[20rem]">
 				<section v-if="mode === 'edit' && canEditTextureAndModel">
 					<h2 class="text-base font-semibold mb-2">{{ formatMessage(messages.textureSection) }}</h2>
-					<ButtonStyled>
-						<button class="!shadow-none" @click="openTextureFileBrowser">
-							<UploadIcon /> {{ formatMessage(messages.replaceTextureButton) }}
-						</button>
-					</ButtonStyled>
+					<Button @click="openTextureFileBrowser">
+						<UploadIcon /> {{ formatMessage(messages.replaceTextureButton) }}
+					</Button>
 					<input
 						ref="textureFileInput"
 						type="file"
@@ -112,19 +110,21 @@
 
 		<template #actions>
 			<div class="flex gap-2 justify-end">
-				<ButtonStyled type="outlined">
-					<button :disabled="isSaving" @click="hide">
-						<XIcon />{{ formatMessage(commonMessages.cancelButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="brand">
-					<button v-tooltip="saveTooltip" :disabled="disableSave || isSaving" @click="save">
-						<SpinnerIcon v-if="isSaving" class="animate-spin" />
-						<CheckIcon v-else-if="mode === 'new'" />
-						<SaveIcon v-else />
-						{{ formatMessage(mode === 'new' ? messages.addSkinButton : messages.saveSkinButton) }}
-					</button>
-				</ButtonStyled>
+				<Button type="outlined" :disabled="isSaving" @click="hide">
+					<XIcon />{{ formatMessage(commonMessages.cancelButton) }}
+				</Button>
+				<Button
+					v-tooltip="saveTooltip"
+					type="colored"
+					color="brand"
+					:disabled="disableSave || isSaving"
+					@click="save"
+				>
+					<SpinnerIcon v-if="isSaving" class="animate-spin" />
+					<CheckIcon v-else-if="mode === 'new'" />
+					<SaveIcon v-else />
+					{{ formatMessage(mode === 'new' ? messages.addSkinButton : messages.saveSkinButton) }}
+				</Button>
 			</div>
 		</template>
 	</NewModal>
@@ -133,7 +133,7 @@
 <script setup lang="ts">
 import { CheckIcon, SaveIcon, SpinnerIcon, UploadIcon, XIcon } from '@modrinth/assets'
 import {
-	ButtonStyled,
+	Button,
 	CapeButton,
 	CapeLikeTextButton,
 	commonMessages,
diff --git a/apps/app-frontend/src/components/ui/skin/VirtualSkinSectionList.vue b/apps/app-frontend/src/components/ui/skin/VirtualSkinSectionList.vue
index 2d0eda22e0..9856d76013 100644
--- a/apps/app-frontend/src/components/ui/skin/VirtualSkinSectionList.vue
+++ b/apps/app-frontend/src/components/ui/skin/VirtualSkinSectionList.vue
@@ -2,9 +2,10 @@
 import { DropdownIcon, EditIcon, PlusIcon, TrashIcon, UnknownIcon } from '@modrinth/assets'
 import {
 	Accordion,
-	ButtonStyled,
+	Button,
 	commonMessages,
 	defineMessages,
+	IconButton,
 	SkinButton,
 	SkinLikeTextButton,
 	useScrollViewport,
@@ -463,25 +464,26 @@ defineExpose({ getAddSkinButtonElement })
 								@select="emit('select', skin)"
 							>
 								<template v-if="!readOnly" #overlay-buttons>
-									<ButtonStyled color="brand">
-										<button
-											:aria-label="formatMessage(messages.editSkinButton)"
-											class="pointer-events-auto"
-											@click.stop="(event: MouseEvent) => emit('edit', skin, event)"
-										>
-											<EditIcon /> {{ formatMessage(commonMessages.editButton) }}
-										</button>
-									</ButtonStyled>
-									<ButtonStyled v-show="!skin.is_equipped" circular color="red">
-										<button
-											v-tooltip="formatMessage(messages.deleteSkinButton)"
-											:aria-label="formatMessage(messages.deleteSkinButton)"
-											class="!rounded-[100%] pointer-events-auto"
-											@click.stop="emit('delete', skin)"
-										>
-											<TrashIcon />
-										</button>
-									</ButtonStyled>
+									<Button
+										type="colored"
+										color="brand"
+										:aria-label="formatMessage(messages.editSkinButton)"
+										class="pointer-events-auto"
+										@click.stop="(event: MouseEvent) => emit('edit', skin, event)"
+									>
+										<EditIcon /> {{ formatMessage(commonMessages.editButton) }}
+									</Button>
+									<IconButton
+										v-show="!skin.is_equipped"
+										v-tooltip="formatMessage(messages.deleteSkinButton)"
+										type="colored"
+										color="red"
+										:label="formatMessage(messages.deleteSkinButton)"
+										class="!rounded-[100%] pointer-events-auto"
+										@click.stop="emit('delete', skin)"
+									>
+										<TrashIcon />
+									</IconButton>
 								</template>
 							</SkinButton>
 						</div>
@@ -503,25 +505,26 @@ defineExpose({ getAddSkinButtonElement })
 								@select="emit('select', skin)"
 							>
 								<template v-if="!readOnly" #overlay-buttons>
-									<ButtonStyled color="brand">
-										<button
-											:aria-label="formatMessage(messages.editSkinButton)"
-											class="pointer-events-auto"
-											@click.stop="(event: MouseEvent) => emit('edit', skin, event)"
-										>
-											<EditIcon /> {{ formatMessage(commonMessages.editButton) }}
-										</button>
-									</ButtonStyled>
-									<ButtonStyled v-show="!skin.is_equipped" circular color="red">
-										<button
-											v-tooltip="formatMessage(messages.deleteSkinButton)"
-											:aria-label="formatMessage(messages.deleteSkinButton)"
-											class="!rounded-[100%] pointer-events-auto"
-											@click.stop="emit('delete', skin)"
-										>
-											<TrashIcon />
-										</button>
-									</ButtonStyled>
+									<Button
+										type="colored"
+										color="brand"
+										:aria-label="formatMessage(messages.editSkinButton)"
+										class="pointer-events-auto"
+										@click.stop="(event: MouseEvent) => emit('edit', skin, event)"
+									>
+										<EditIcon /> {{ formatMessage(commonMessages.editButton) }}
+									</Button>
+									<IconButton
+										v-show="!skin.is_equipped"
+										v-tooltip="formatMessage(messages.deleteSkinButton)"
+										type="colored"
+										color="red"
+										:label="formatMessage(messages.deleteSkinButton)"
+										class="!rounded-[100%] pointer-events-auto"
+										@click.stop="emit('delete', skin)"
+									>
+										<TrashIcon />
+									</IconButton>
 								</template>
 							</SkinButton>
 						</div>
@@ -545,15 +548,15 @@ defineExpose({ getAddSkinButtonElement })
 						@select="emit('select', skin)"
 					>
 						<template #overlay-buttons>
-							<ButtonStyled color="brand">
-								<button
-									:aria-label="formatMessage(messages.editSkinButton)"
-									class="pointer-events-auto"
-									@click.stop="(event: MouseEvent) => emit('edit', skin, event)"
-								>
-									<EditIcon /> {{ formatMessage(commonMessages.editButton) }}
-								</button>
-							</ButtonStyled>
+							<Button
+								type="colored"
+								color="brand"
+								:aria-label="formatMessage(messages.editSkinButton)"
+								class="pointer-events-auto"
+								@click.stop="(event: MouseEvent) => emit('edit', skin, event)"
+							>
+								<EditIcon /> {{ formatMessage(commonMessages.editButton) }}
+							</Button>
 						</template>
 					</SkinButton>
 				</div>
diff --git a/apps/app-frontend/src/components/ui/world/InstanceItem.vue b/apps/app-frontend/src/components/ui/world/InstanceItem.vue
index d2c2388ae3..58f6c81195 100644
--- a/apps/app-frontend/src/components/ui/world/InstanceItem.vue
+++ b/apps/app-frontend/src/components/ui/world/InstanceItem.vue
@@ -9,11 +9,11 @@ import {
 } from '@modrinth/assets'
 import {
 	Avatar,
-	ButtonStyled,
+	Button,
 	commonMessages,
 	injectNotificationManager,
-	OverflowMenu,
 	SmartClickable,
+	TeleportOverflowMenu,
 	useFormatDateTime,
 	useRelativeTime,
 	useVIntl,
@@ -185,54 +185,53 @@ onUnmounted(() => {
 				</div>
 			</div>
 			<div class="flex gap-1 justify-end smart-clickable:allow-pointer-events">
-				<ButtonStyled v-if="playing && !loading" color="red">
-					<button @click="stop">
-						<StopCircleIcon aria-hidden="true" />
-						{{ formatMessage(commonMessages.stopButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled v-else>
-					<button
-						v-tooltip="
-							instance.quarantined
-								? 'This instance has been locked'
-								: playing
-									? 'Instance is already open'
-									: null
-						"
-						:disabled="instance.quarantined || playing || loading"
-						@click="play"
-					>
-						<SpinnerIcon v-if="loading" class="animate-spin" />
-						<PlayIcon v-else aria-hidden="true" />
-						{{ formatMessage(commonMessages.playButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled circular type="transparent">
-					<OverflowMenu
-						:options="[
-							{
-								id: 'open-instance',
-								shown: !!instance.id,
-								action: () => router.push(encodeURI(`/instance/${instance.id}`)),
-							},
-							{
-								id: 'open-folder',
-								action: () => showInstanceInFolder(instance.id),
-							},
-						]"
-					>
-						<MoreVerticalIcon aria-hidden="true" />
-						<template #open-instance>
-							<EyeIcon aria-hidden="true" />
-							View instance
-						</template>
-						<template #open-folder>
-							<FolderOpenIcon aria-hidden="true" />
-							{{ formatMessage(commonMessages.openFolderButton) }}
-						</template>
-					</OverflowMenu>
-				</ButtonStyled>
+				<Button v-if="playing && !loading" type="colored" color="red" @click="stop">
+					<StopCircleIcon aria-hidden="true" />
+					{{ formatMessage(commonMessages.stopButton) }}
+				</Button>
+				<Button
+					v-else
+					v-tooltip="
+						instance.quarantined
+							? 'This instance has been locked'
+							: playing
+								? 'Instance is already open'
+								: null
+					"
+					:disabled="instance.quarantined || playing || loading"
+					@click="play"
+				>
+					<SpinnerIcon v-if="loading" class="animate-spin" />
+					<PlayIcon v-else aria-hidden="true" />
+					{{ formatMessage(commonMessages.playButton) }}
+				</Button>
+				<TeleportOverflowMenu
+					type="quiet"
+					label="More options"
+					:options="[
+						{
+							id: 'open-instance',
+							label: 'View instance',
+							shown: !!instance.id,
+							action: () => router.push(encodeURI(`/instance/${instance.id}`)),
+						},
+						{
+							id: 'open-folder',
+							label: formatMessage(commonMessages.openFolderButton),
+							action: () => showInstanceInFolder(instance.id),
+						},
+					]"
+				>
+					<MoreVerticalIcon aria-hidden="true" />
+					<template #open-instance>
+						<EyeIcon aria-hidden="true" />
+						View instance
+					</template>
+					<template #open-folder>
+						<FolderOpenIcon aria-hidden="true" />
+						{{ formatMessage(commonMessages.openFolderButton) }}
+					</template>
+				</TeleportOverflowMenu>
 			</div>
 		</div>
 	</SmartClickable>
diff --git a/apps/app-frontend/src/components/ui/world/WorldItem.vue b/apps/app-frontend/src/components/ui/world/WorldItem.vue
index 5e509c57a2..7d53d27b5d 100644
--- a/apps/app-frontend/src/components/ui/world/WorldItem.vue
+++ b/apps/app-frontend/src/components/ui/world/WorldItem.vue
@@ -21,13 +21,13 @@ import {
 import type { MessageDescriptor } from '@modrinth/ui'
 import {
 	Avatar,
-	ButtonStyled,
+	Button,
 	commonMessages,
 	defineMessages,
 	injectNotificationManager,
-	OverflowMenu,
 	SmartClickable,
 	TagItem,
+	TeleportOverflowMenu,
 	useFormatDateTime,
 	useFormatNumber,
 	useRelativeTime,
@@ -412,177 +412,184 @@ const messages = defineMessages({
 				</template>
 			</div>
 			<div class="flex gap-1 justify-end smart-clickable:allow-pointer-events">
-				<ButtonStyled
+				<Button
 					v-if="(playingWorld || (locked && playingInstance)) && !startingInstance"
+					type="colored"
 					color="red"
+					@click="emit('stop')"
 				>
-					<button @click="emit('stop')">
-						<StopCircleIcon aria-hidden="true" />
-						{{ formatMessage(commonMessages.stopButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled v-else>
-					<button
-						v-tooltip="
-							quarantined
-								? 'This instance has been locked'
-								: world.type === 'server'
-									? !supportsServerQuickPlay
-										? formatMessage(messages.noServerQuickPlay)
-										: playingOtherWorld
-											? formatMessage(messages.gameAlreadyOpen)
-											: !serverStatus
-												? formatMessage(messages.noContact)
-												: serverIncompatible
-													? formatMessage(messages.incompatibleServer)
-													: null
-									: !supportsWorldQuickPlay
-										? formatMessage(messages.noSingleplayerQuickPlay)
-										: playingOtherWorld || locked
-											? formatMessage(messages.gameAlreadyOpen)
-											: null
-						"
-						:disabled="
-							quarantined ||
-							playingOtherWorld ||
-							startingInstance ||
-							(world.type == 'server' && !supportsServerQuickPlay) ||
-							(world.type == 'singleplayer' && !supportsWorldQuickPlay)
-						"
-						@click="emit('play')"
-					>
-						<SpinnerIcon v-if="startingInstance && playingWorld" class="animate-spin" />
-						<PlayIcon v-else aria-hidden="true" />
-						{{ formatMessage(commonMessages.playButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled circular type="transparent">
-					<OverflowMenu
-						:options="[
-							{
-								id: 'play-instance',
-								shown: !!instanceId,
-								disabled: playingInstance || quarantined,
-								action: () => emit('play-instance'),
+					<StopCircleIcon aria-hidden="true" />
+					{{ formatMessage(commonMessages.stopButton) }}
+				</Button>
+				<Button
+					v-else
+					v-tooltip="
+						quarantined
+							? 'This instance has been locked'
+							: world.type === 'server'
+								? !supportsServerQuickPlay
+									? formatMessage(messages.noServerQuickPlay)
+									: playingOtherWorld
+										? formatMessage(messages.gameAlreadyOpen)
+										: !serverStatus
+											? formatMessage(messages.noContact)
+											: serverIncompatible
+												? formatMessage(messages.incompatibleServer)
+												: null
+								: !supportsWorldQuickPlay
+									? formatMessage(messages.noSingleplayerQuickPlay)
+									: playingOtherWorld || locked
+										? formatMessage(messages.gameAlreadyOpen)
+										: null
+					"
+					:disabled="
+						quarantined ||
+						playingOtherWorld ||
+						startingInstance ||
+						(world.type == 'server' && !supportsServerQuickPlay) ||
+						(world.type == 'singleplayer' && !supportsWorldQuickPlay)
+					"
+					@click="emit('play')"
+				>
+					<SpinnerIcon v-if="startingInstance && playingWorld" class="animate-spin" />
+					<PlayIcon v-else aria-hidden="true" />
+					{{ formatMessage(commonMessages.playButton) }}
+				</Button>
+				<TeleportOverflowMenu
+					type="quiet"
+					label="More options"
+					:options="[
+						{
+							id: 'play-instance',
+							label: formatMessage(messages.playInstance),
+							shown: !!instanceId,
+							disabled: playingInstance || quarantined,
+							action: () => emit('play-instance'),
+						},
+						{
+							id: 'open-instance',
+							label: formatMessage(messages.viewInstance),
+							shown: !!instanceId,
+							action: () => router.push(`/instance/${encodeURIComponent(instanceId)}`),
+						},
+						{
+							id: 'refresh',
+							label: formatMessage(commonMessages.refreshButton),
+							shown: world.type === 'server',
+							action: () => emit('refresh'),
+						},
+						{
+							id: 'copy-address',
+							label: formatMessage(messages.copyAddress),
+							shown: world.type === 'server',
+							action: () => copyToClipboard((world as ServerWorld).address),
+						},
+						{
+							id: 'edit',
+							label: formatMessage(commonMessages.editButton),
+							action: () => emit('edit'),
+							shown: !instanceId,
+							disabled: locked || managed,
+							tooltip: locked
+								? formatMessage(messages.worldInUse)
+								: managed
+									? formatMessage(messages.linkedServer)
+									: undefined,
+						},
+						{
+							id: 'open-folder',
+							label: formatMessage(commonMessages.openFolderButton),
+							shown: world.type === 'singleplayer',
+							action: () => (world.type === 'singleplayer' ? emit('open-folder', world) : {}),
+						},
+						{
+							type: 'divider',
+							shown: !!instanceId,
+						},
+						{
+							id: 'dont-show-on-home',
+							label: formatMessage(messages.dontShowOnHome),
+							shown: !!instanceId,
+							action: () => {
+								set_world_display_status(
+									instanceId,
+									world.type,
+									getWorldIdentifier(world),
+									'hidden',
+								).then(() => {
+									emit('update')
+								})
 							},
-							{
-								id: 'open-instance',
-								shown: !!instanceId,
-								action: () => router.push(`/instance/${encodeURIComponent(instanceId)}`),
-							},
-							{
-								id: 'refresh',
-								shown: world.type === 'server',
-								action: () => emit('refresh'),
-							},
-							{
-								id: 'copy-address',
-								shown: world.type === 'server',
-								action: () => copyToClipboard((world as ServerWorld).address),
-							},
-							{
-								id: 'edit',
-								action: () => emit('edit'),
-								shown: !instanceId,
-								disabled: locked || managed,
-								tooltip: locked
-									? formatMessage(messages.worldInUse)
-									: managed
-										? formatMessage(messages.linkedServer)
-										: undefined,
-							},
-							{
-								id: 'open-folder',
-								shown: world.type === 'singleplayer',
-								action: () => (world.type === 'singleplayer' ? emit('open-folder', world) : {}),
-							},
-							{
-								divider: true,
-								shown: !!instanceId,
-							},
-							{
-								id: 'dont-show-on-home',
-								shown: !!instanceId,
-								action: () => {
-									set_world_display_status(
-										instanceId,
-										world.type,
-										getWorldIdentifier(world),
-										'hidden',
-									).then(() => {
-										emit('update')
-									})
-								},
-							},
-							{
-								id: 'create-shortcut',
-								shown: !!shortcutInstanceId && !quarantined,
-								action: () => createShortcut(),
-							},
-							{
-								divider: true,
-								shown: !instanceId,
-							},
-							{
-								id: 'delete',
-								color: 'red',
-								hoverFilled: true,
-								action: () => emit('delete'),
-								shown: !instanceId,
-								disabled: locked || managed,
-								tooltip: locked
-									? formatMessage(messages.worldInUse)
-									: managed
-										? formatMessage(messages.linkedServer)
-										: undefined,
-							},
-						]"
-					>
-						<MoreVerticalIcon aria-hidden="true" />
-						<template #play-instance>
-							<PlayIcon aria-hidden="true" />
-							{{ formatMessage(messages.playInstance) }}
-						</template>
-						<template #open-instance>
-							<EyeIcon aria-hidden="true" />
-							{{ formatMessage(messages.viewInstance) }}
-						</template>
-						<template #edit>
-							<EditIcon aria-hidden="true" />
-							{{ formatMessage(commonMessages.editButton) }}
-						</template>
-						<template #open-folder>
-							<FolderOpenIcon aria-hidden="true" />
-							{{ formatMessage(commonMessages.openFolderButton) }}
-						</template>
-						<template #copy-address>
-							<ClipboardCopyIcon aria-hidden="true" />
-							{{ formatMessage(messages.copyAddress) }}
-						</template>
-						<template #refresh>
-							<UpdatedIcon aria-hidden="true" />
-							{{ formatMessage(commonMessages.refreshButton) }}
-						</template>
-						<template #create-shortcut>
-							<ExternalIcon aria-hidden="true" />
-							{{ formatMessage(messages.createShortcut) }}
-						</template>
-						<template #dont-show-on-home>
-							<XIcon aria-hidden="true" />
-							{{ formatMessage(messages.dontShowOnHome) }}
-						</template>
-						<template #delete>
-							<TrashIcon aria-hidden="true" />
-							{{
-								formatMessage(
-									world.type === 'server'
-										? commonMessages.removeButton
-										: commonMessages.deleteLabel,
-								)
-							}}
-						</template>
-					</OverflowMenu>
-				</ButtonStyled>
+						},
+						{
+							id: 'create-shortcut',
+							label: formatMessage(messages.createShortcut),
+							shown: !!shortcutInstanceId && !quarantined,
+							action: () => createShortcut(),
+						},
+						{
+							type: 'divider',
+							shown: !instanceId,
+						},
+						{
+							id: 'delete',
+							label: formatMessage(
+								world.type === 'server' ? commonMessages.removeButton : commonMessages.deleteLabel,
+							),
+							tone: 'red',
+							action: () => emit('delete'),
+							shown: !instanceId,
+							disabled: locked || managed,
+							tooltip: locked
+								? formatMessage(messages.worldInUse)
+								: managed
+									? formatMessage(messages.linkedServer)
+									: undefined,
+						},
+					]"
+				>
+					<MoreVerticalIcon aria-hidden="true" />
+					<template #play-instance>
+						<PlayIcon aria-hidden="true" />
+						{{ formatMessage(messages.playInstance) }}
+					</template>
+					<template #open-instance>
+						<EyeIcon aria-hidden="true" />
+						{{ formatMessage(messages.viewInstance) }}
+					</template>
+					<template #edit>
+						<EditIcon aria-hidden="true" />
+						{{ formatMessage(commonMessages.editButton) }}
+					</template>
+					<template #open-folder>
+						<FolderOpenIcon aria-hidden="true" />
+						{{ formatMessage(commonMessages.openFolderButton) }}
+					</template>
+					<template #copy-address>
+						<ClipboardCopyIcon aria-hidden="true" />
+						{{ formatMessage(messages.copyAddress) }}
+					</template>
+					<template #refresh>
+						<UpdatedIcon aria-hidden="true" />
+						{{ formatMessage(commonMessages.refreshButton) }}
+					</template>
+					<template #create-shortcut>
+						<ExternalIcon aria-hidden="true" />
+						{{ formatMessage(messages.createShortcut) }}
+					</template>
+					<template #dont-show-on-home>
+						<XIcon aria-hidden="true" />
+						{{ formatMessage(messages.dontShowOnHome) }}
+					</template>
+					<template #delete>
+						<TrashIcon aria-hidden="true" />
+						{{
+							formatMessage(
+								world.type === 'server' ? commonMessages.removeButton : commonMessages.deleteLabel,
+							)
+						}}
+					</template>
+				</TeleportOverflowMenu>
 			</div>
 		</div>
 	</SmartClickable>
diff --git a/apps/app-frontend/src/components/ui/world/modal/AddServerModal.vue b/apps/app-frontend/src/components/ui/world/modal/AddServerModal.vue
index c1679ae0b5..335b0b85eb 100644
--- a/apps/app-frontend/src/components/ui/world/modal/AddServerModal.vue
+++ b/apps/app-frontend/src/components/ui/world/modal/AddServerModal.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { PlayIcon, PlusIcon, XIcon } from '@modrinth/assets'
 import {
-	ButtonStyled,
+	Button,
 	commonMessages,
 	defineMessages,
 	injectNotificationManager,
@@ -96,24 +96,18 @@ defineExpose({ show, hide })
 		/>
 		<template #actions>
 			<div class="flex gap-2 justify-end">
-				<ButtonStyled type="outlined">
-					<button @click="hide()">
-						<XIcon />
-						{{ formatMessage(commonMessages.cancelButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled>
-					<button :disabled="!address" @click="addServer(false)">
-						<PlusIcon />
-						{{ formatMessage(messages.addServer) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="brand">
-					<button :disabled="!address" @click="addServer(true)">
-						<PlayIcon />
-						{{ formatMessage(messages.addAndPlay) }}
-					</button>
-				</ButtonStyled>
+				<Button type="outlined" @click="hide()">
+					<XIcon />
+					{{ formatMessage(commonMessages.cancelButton) }}
+				</Button>
+				<Button :disabled="!address" @click="addServer(false)">
+					<PlusIcon />
+					{{ formatMessage(messages.addServer) }}
+				</Button>
+				<Button type="colored" color="brand" :disabled="!address" @click="addServer(true)">
+					<PlayIcon />
+					{{ formatMessage(messages.addAndPlay) }}
+				</Button>
 			</div>
 		</template>
 	</NewModal>
diff --git a/apps/app-frontend/src/components/ui/world/modal/ConfirmRemoveWorldModal.vue b/apps/app-frontend/src/components/ui/world/modal/ConfirmRemoveWorldModal.vue
index d82bf82607..685ce81fcb 100644
--- a/apps/app-frontend/src/components/ui/world/modal/ConfirmRemoveWorldModal.vue
+++ b/apps/app-frontend/src/components/ui/world/modal/ConfirmRemoveWorldModal.vue
@@ -2,7 +2,7 @@
 import { TrashIcon, XIcon } from '@modrinth/assets'
 import {
 	Admonition,
-	ButtonStyled,
+	Button,
 	commonMessages,
 	defineMessages,
 	NewModal,
@@ -106,18 +106,19 @@ defineExpose({ show, hide })
 
 		<template #actions>
 			<div class="flex gap-2 justify-end">
-				<ButtonStyled type="outlined">
-					<button @click="hide">
-						<XIcon />
-						{{ formatMessage(commonMessages.cancelButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="red">
-					<button :disabled="!isServer && !isSingleplayer" @click="confirm">
-						<TrashIcon />
-						{{ formatMessage(actionMessage) }}
-					</button>
-				</ButtonStyled>
+				<Button type="outlined" @click="hide">
+					<XIcon />
+					{{ formatMessage(commonMessages.cancelButton) }}
+				</Button>
+				<Button
+					type="colored"
+					color="red"
+					:disabled="!isServer && !isSingleplayer"
+					@click="confirm"
+				>
+					<TrashIcon />
+					{{ formatMessage(actionMessage) }}
+				</Button>
 			</div>
 		</template>
 	</NewModal>
diff --git a/apps/app-frontend/src/components/ui/world/modal/EditServerModal.vue b/apps/app-frontend/src/components/ui/world/modal/EditServerModal.vue
index ce541cce4e..9564d12f99 100644
--- a/apps/app-frontend/src/components/ui/world/modal/EditServerModal.vue
+++ b/apps/app-frontend/src/components/ui/world/modal/EditServerModal.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { SaveIcon, XIcon } from '@modrinth/assets'
 import {
-	ButtonStyled,
+	Button,
 	commonMessages,
 	defineMessage,
 	injectNotificationManager,
@@ -105,18 +105,14 @@ const titleMessage = defineMessage({
 		<HideFromHomeOption v-model="hideFromHome" class="mt-3" />
 		<template #actions>
 			<div class="flex gap-2 justify-end">
-				<ButtonStyled type="outlined">
-					<button @click="hide()">
-						<XIcon />
-						{{ formatMessage(commonMessages.cancelButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="brand">
-					<button :disabled="!address" @click="saveServer">
-						<SaveIcon />
-						{{ formatMessage(commonMessages.saveChangesButton) }}
-					</button>
-				</ButtonStyled>
+				<Button type="outlined" @click="hide()">
+					<XIcon />
+					{{ formatMessage(commonMessages.cancelButton) }}
+				</Button>
+				<Button type="colored" color="brand" :disabled="!address" @click="saveServer">
+					<SaveIcon />
+					{{ formatMessage(commonMessages.saveChangesButton) }}
+				</Button>
 			</div>
 		</template>
 	</NewModal>
diff --git a/apps/app-frontend/src/components/ui/world/modal/EditSingleplayerWorldModal.vue b/apps/app-frontend/src/components/ui/world/modal/EditSingleplayerWorldModal.vue
index b611ce4a5f..5a518b5dbd 100644
--- a/apps/app-frontend/src/components/ui/world/modal/EditSingleplayerWorldModal.vue
+++ b/apps/app-frontend/src/components/ui/world/modal/EditSingleplayerWorldModal.vue
@@ -2,7 +2,7 @@
 import { ChevronRightIcon, SaveIcon, UndoIcon, XIcon } from '@modrinth/assets'
 import {
 	Avatar,
-	ButtonStyled,
+	Button,
 	commonMessages,
 	defineMessages,
 	injectNotificationManager,
@@ -113,24 +113,18 @@ const messages = defineMessages({
 			<HideFromHomeOption v-model="hideFromHome" class="mt-3" />
 		</div>
 		<div class="flex gap-2 mt-4">
-			<ButtonStyled color="brand">
-				<button @click="saveWorld">
-					<SaveIcon />
-					{{ formatMessage(commonMessages.saveChangesButton) }}
-				</button>
-			</ButtonStyled>
-			<ButtonStyled>
-				<button :disabled="removeIcon || !icon" @click="removeIcon = true">
-					<UndoIcon />
-					{{ formatMessage(messages.resetIcon) }}
-				</button>
-			</ButtonStyled>
-			<ButtonStyled>
-				<button @click="hide()">
-					<XIcon />
-					{{ formatMessage(commonMessages.cancelButton) }}
-				</button>
-			</ButtonStyled>
+			<Button type="colored" color="brand" @click="saveWorld">
+				<SaveIcon />
+				{{ formatMessage(commonMessages.saveChangesButton) }}
+			</Button>
+			<Button :disabled="removeIcon || !icon" @click="removeIcon = true">
+				<UndoIcon />
+				{{ formatMessage(messages.resetIcon) }}
+			</Button>
+			<Button @click="hide()">
+				<XIcon />
+				{{ formatMessage(commonMessages.cancelButton) }}
+			</Button>
 		</div>
 	</ModalWrapper>
 </template>
diff --git a/apps/app-frontend/src/locales/en-US/index.json b/apps/app-frontend/src/locales/en-US/index.json
index 475e1027ca..43b1bbefde 100644
--- a/apps/app-frontend/src/locales/en-US/index.json
+++ b/apps/app-frontend/src/locales/en-US/index.json
@@ -1229,6 +1229,9 @@
   "app.update.complete-toast.title": {
     "message": "Version {version} was successfully installed!"
   },
+  "app.user.project.install-to-instance": {
+    "message": "Install to instance"
+  },
   "app.world.server-modal.placeholder-address": {
     "message": "example.modrinth.gg"
   },
diff --git a/apps/app-frontend/src/pages/Skins.vue b/apps/app-frontend/src/pages/Skins.vue
index f6a9282bf6..14394ca444 100644
--- a/apps/app-frontend/src/pages/Skins.vue
+++ b/apps/app-frontend/src/pages/Skins.vue
@@ -10,7 +10,7 @@ import {
 	SpinnerIcon,
 } from '@modrinth/assets'
 import {
-	ButtonStyled,
+	Button,
 	commonMessages,
 	ConfirmModal,
 	defineMessages,
@@ -1112,13 +1112,15 @@ await loadSkins()
 								class="skin-preview-actions flex w-full items-center justify-center gap-1.5"
 								:class="selectedSkinHasEarsFeatures ? 'flex-nowrap' : 'flex-wrap'"
 							>
-								<button
+								<Button
 									v-tooltip="
 										selectedSkinHasEarsFeatures
 											? formatMessage(commonMessages.resetButton)
 											: undefined
 									"
-									class="skin-preview-action-button flex h-10 min-w-0 cursor-pointer items-center justify-center gap-2 rounded-[14px] border-0 bg-surface-4 px-4 py-2.5 text-base font-semibold leading-5 text-contrast shadow-md transition-[filter,transform] duration-200 enabled:hover:brightness-[--hover-brightness] enabled:focus-visible:brightness-[--hover-brightness] enabled:active:scale-95 disabled:cursor-not-allowed disabled:opacity-50 [&>svg]:size-5 [&>svg]:shrink-0"
+									type="base"
+									size="lg"
+									class="skin-preview-action-button"
 									:disabled="isApplyingSkin || isSkinManagementReadOnly"
 									:aria-label="formatMessage(commonMessages.resetButton)"
 									@click="resetSelectedSkin"
@@ -1127,12 +1129,15 @@ await loadSkins()
 									<span class="skin-preview-action-label">
 										{{ formatMessage(commonMessages.resetButton) }}
 									</span>
-								</button>
-								<button
+								</Button>
+								<Button
 									v-tooltip="
 										selectedSkinHasEarsFeatures ? formatMessage(messages.applyButton) : undefined
 									"
-									class="skin-preview-action-button flex h-10 min-w-0 cursor-pointer items-center justify-center gap-2 rounded-[14px] border-0 bg-brand px-4 py-2.5 text-base font-semibold leading-5 text-[rgba(0,0,0,0.9)] shadow-md transition-[filter,transform] duration-200 enabled:hover:brightness-[--hover-brightness] enabled:focus-visible:brightness-[--hover-brightness] enabled:active:scale-95 disabled:cursor-not-allowed disabled:opacity-50 [&>svg]:size-5 [&>svg]:shrink-0"
+									type="colored"
+									color="brand"
+									size="lg"
+									class="skin-preview-action-button"
 									:disabled="isApplyingSkin || isSkinManagementReadOnly"
 									:aria-label="formatMessage(messages.applyButton)"
 									@click="applySelectedSkin"
@@ -1142,17 +1147,18 @@ await loadSkins()
 									<span class="skin-preview-action-label">
 										{{ formatMessage(messages.applyButton) }}
 									</span>
-								</button>
+								</Button>
 							</div>
-							<button
+							<Button
 								v-else
-								class="flex h-10 min-w-0 cursor-pointer items-center justify-center gap-2 rounded-[14px] border-0 bg-surface-4 px-4 py-2.5 text-base font-semibold leading-5 shadow-md transition-[filter,transform] duration-200 enabled:hover:brightness-[--hover-brightness] enabled:focus-visible:brightness-[--hover-brightness] enabled:active:scale-95 disabled:cursor-not-allowed disabled:opacity-50 [&>svg]:size-5 [&>svg]:shrink-0"
+								type="base"
+								size="lg"
 								:disabled="!selectedSkin || isSkinManagementReadOnly"
 								@click="(e: MouseEvent) => selectedSkin && editSkinModal?.show(e, selectedSkin)"
 							>
 								<EditIcon />
 								{{ formatMessage(messages.editSkinButton) }}
-							</button>
+							</Button>
 
 							<div
 								v-if="selectedSkinHasEarsFeatures"
@@ -1181,28 +1187,28 @@ await loadSkins()
 										>Ears</router-link
 									>
 								</div>
-								<ButtonStyled type="outlined">
-									<button
-										class="ears-feature-toggle-button !h-10 !rounded-[14px] !px-4 shadow-md"
-										:aria-pressed="earsFeaturesEnabled"
-										:aria-label="
-											formatMessage(
-												earsFeaturesEnabled
-													? messages.toggleEarsFeaturesOff
-													: messages.toggleEarsFeaturesOn,
-											)
-										"
-										@click="earsFeaturesEnabled = !earsFeaturesEnabled"
-									>
-										{{
-											formatMessage(
-												earsFeaturesEnabled
-													? messages.toggleEarsFeaturesOff
-													: messages.toggleEarsFeaturesOn,
-											)
-										}}
-									</button>
-								</ButtonStyled>
+								<Button
+									type="outlined"
+									size="lg"
+									class="ears-feature-toggle-button shadow-md"
+									:aria-pressed="earsFeaturesEnabled"
+									:aria-label="
+										formatMessage(
+											earsFeaturesEnabled
+												? messages.toggleEarsFeaturesOff
+												: messages.toggleEarsFeaturesOn,
+										)
+									"
+									@click="earsFeaturesEnabled = !earsFeaturesEnabled"
+								>
+									{{
+										formatMessage(
+											earsFeaturesEnabled
+												? messages.toggleEarsFeaturesOff
+												: messages.toggleEarsFeaturesOn,
+										)
+									}}
+								</Button>
 								<Toggle
 									v-model="earsFeaturesEnabled"
 									v-tooltip="
@@ -1279,13 +1285,17 @@ await loadSkins()
 				<p class="text-lg m-0">
 					{{ formatMessage(messages.signInDescription) }}
 				</p>
-				<ButtonStyled v-show="accountsCard" color="brand" :disabled="accountsCard.loginDisabled">
-					<button :disabled="accountsCard.loginDisabled" @click="login">
-						<LogInIcon v-if="!accountsCard.loginDisabled" />
-						<SpinnerIcon v-else class="animate-spin" />
-						{{ formatMessage(messages.signInButton) }}
-					</button>
-				</ButtonStyled>
+				<Button
+					v-show="accountsCard"
+					type="colored"
+					color="brand"
+					:disabled="accountsCard.loginDisabled"
+					@click="login"
+				>
+					<LogInIcon v-if="!accountsCard.loginDisabled" />
+					<SpinnerIcon v-else class="animate-spin" />
+					{{ formatMessage(messages.signInButton) }}
+				</Button>
 			</div>
 		</div>
 	</div>
diff --git a/apps/app-frontend/src/pages/User.vue b/apps/app-frontend/src/pages/User.vue
index ea2b5cf23d..e04c0da3fa 100644
--- a/apps/app-frontend/src/pages/User.vue
+++ b/apps/app-frontend/src/pages/User.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="w-full px-2 pt-2">
+	<div class="w-full p-2">
 		<UserProfilePageLayout
 			:user-id="userId"
 			:project-type="projectType"
@@ -8,16 +8,47 @@
 			project-link-mode="app"
 			:edit-profile-link="openProfileSettings"
 			external-navigation
-		/>
+		>
+			<template #project-actions="{ project }">
+				<Button
+					type="outlined"
+					class="!text-brand [&>svg]:!text-brand !shadow-[inset_0_0_0_1px_var(--color-brand)]"
+					:disabled="isProjectInstalling(project.id)"
+					@click.stop="installProject(project)"
+				>
+					<SpinnerIcon v-if="isProjectInstalling(project.id)" class="animate-spin" />
+					<DownloadIcon v-else-if="project.project_type === 'modpack'" />
+					<PlusIcon v-else />
+					{{
+						formatMessage(
+							isProjectInstalling(project.id)
+								? commonMessages.installingLabel
+								: project.project_type === 'modpack'
+									? commonMessages.installButton
+									: messages.installToInstance,
+						)
+					}}
+				</Button>
+			</template>
+		</UserProfilePageLayout>
 	</div>
 </template>
 
 <script setup lang="ts">
 import type { Labrinth } from '@modrinth/api-client'
-import { provideUserProfile, UserProfilePageLayout } from '@modrinth/ui'
+import { DownloadIcon, PlusIcon, SpinnerIcon } from '@modrinth/assets'
+import {
+	Button,
+	commonMessages,
+	defineMessages,
+	injectNotificationManager,
+	provideUserProfile,
+	UserProfilePageLayout,
+	useVIntl,
+} from '@modrinth/ui'
 import { useQuery, useQueryClient } from '@tanstack/vue-query'
 import { computed, inject, ref, watch } from 'vue'
-import { onBeforeRouteUpdate, useRoute } from 'vue-router'
+import { onBeforeRouteUpdate, useRoute, useRouter } from 'vue-router'
 
 import {
 	block_user,
@@ -31,10 +62,57 @@ import {
 } from '@/helpers/users'
 import { appSettingsModalOpenProfileKey } from '@/providers/app-settings-modal'
 import { useBreadcrumb } from '@/providers/breadcrumbs'
+import { injectContentInstall } from '@/providers/content-install'
 
 const route = useRoute()
+const router = useRouter()
 const openProfileSettings = inject(appSettingsModalOpenProfileKey, () => {})
 const queryClient = useQueryClient()
+const { formatMessage } = useVIntl()
+const { handleError } = injectNotificationManager()
+const { install: installVersion } = injectContentInstall()
+const installingProjectIds = ref(new Set<string>())
+
+const messages = defineMessages({
+	installToInstance: {
+		id: 'app.user.project.install-to-instance',
+		defaultMessage: 'Install to instance',
+	},
+})
+
+function isProjectInstalling(projectId: string): boolean {
+	return installingProjectIds.value.has(projectId)
+}
+
+function setProjectInstalling(projectId: string, installing: boolean): void {
+	const next = new Set(installingProjectIds.value)
+	if (installing) {
+		next.add(projectId)
+	} else {
+		next.delete(projectId)
+	}
+	installingProjectIds.value = next
+}
+
+async function installProject(project: Labrinth.Projects.v2.Project): Promise<void> {
+	if (isProjectInstalling(project.id)) return
+
+	setProjectInstalling(project.id, true)
+	try {
+		await installVersion(
+			project.id,
+			null,
+			null,
+			'UserPage',
+			() => setProjectInstalling(project.id, false),
+			(instanceId) => router.push(`/instance/${encodeURIComponent(instanceId)}`),
+		)
+	} catch (error) {
+		setProjectInstalling(project.id, false)
+		handleError(error)
+	}
+}
+
 const userProfile = provideUserProfile({
 	getUser: get_user_profile,
 	getProjects: get_user_projects,
diff --git a/apps/app-frontend/src/pages/instance/components/admonitions/shared-instance-stale.vue b/apps/app-frontend/src/pages/instance/components/admonitions/shared-instance-stale.vue
index 30a92c9044..63d053a91e 100644
--- a/apps/app-frontend/src/pages/instance/components/admonitions/shared-instance-stale.vue
+++ b/apps/app-frontend/src/pages/instance/components/admonitions/shared-instance-stale.vue
@@ -6,23 +6,27 @@
 	>
 		{{ formatMessage(messages.sharedInstanceChangesBody) }}
 		<template #actions>
-			<ButtonStyled color="blue">
-				<button class="!h-10" :disabled="isPublishButtonDisabled" @click="reviewChanges">
-					<SpinnerIcon
-						v-if="isReviewingPublish || isPublishing"
-						class="animate-spin"
-						aria-hidden="true"
-					/>
-					<UploadIcon v-else aria-hidden="true" />
-					{{
-						isPublishing
-							? formatMessage(messages.sharedInstancePublishingButton)
-							: isReviewingPublish
-								? formatMessage(messages.sharedInstanceReviewingButton)
-								: formatMessage(messages.sharedInstancePublishButton)
-					}}
-				</button>
-			</ButtonStyled>
+			<Button
+				type="colored"
+				color="blue"
+				size="lg"
+				:disabled="isPublishButtonDisabled"
+				@click="reviewChanges"
+			>
+				<SpinnerIcon
+					v-if="isReviewingPublish || isPublishing"
+					class="animate-spin"
+					aria-hidden="true"
+				/>
+				<UploadIcon v-else aria-hidden="true" />
+				{{
+					isPublishing
+						? formatMessage(messages.sharedInstancePublishingButton)
+						: isReviewingPublish
+							? formatMessage(messages.sharedInstanceReviewingButton)
+							: formatMessage(messages.sharedInstancePublishButton)
+				}}
+			</Button>
 		</template>
 	</Admonition>
 
@@ -36,7 +40,7 @@
 
 <script setup lang="ts">
 import { SpinnerIcon, UploadIcon } from '@modrinth/assets'
-import { Admonition, ButtonStyled, useVIntl } from '@modrinth/ui'
+import { Admonition, Button, useVIntl } from '@modrinth/ui'
 import { computed, ref } from 'vue'
 
 import SharedInstancePublishModal from '@/components/ui/shared-instances/SharedInstancePublishModal.vue'
diff --git a/apps/app-frontend/src/pages/instance/components/admonitions/shared-instance-unavailable.vue b/apps/app-frontend/src/pages/instance/components/admonitions/shared-instance-unavailable.vue
index 88dc3b7152..319578a47e 100644
--- a/apps/app-frontend/src/pages/instance/components/admonitions/shared-instance-unavailable.vue
+++ b/apps/app-frontend/src/pages/instance/components/admonitions/shared-instance-unavailable.vue
@@ -8,19 +8,17 @@
 	>
 		{{ formatSharedInstanceUnavailable(reason ?? null, manager) }}
 		<template v-if="reason === 'quarantined'" #actions>
-			<ButtonStyled color="orange">
-				<button class="!h-10" @click="emit('delete')">
-					<TrashIcon aria-hidden="true" />
-					{{ formatMessage(messages.deleteInstance) }}
-				</button>
-			</ButtonStyled>
+			<Button type="colored" color="orange" size="lg" @click="emit('delete')">
+				<TrashIcon aria-hidden="true" />
+				{{ formatMessage(messages.deleteInstance) }}
+			</Button>
 		</template>
 	</Admonition>
 </template>
 
 <script setup lang="ts">
 import { TrashIcon } from '@modrinth/assets'
-import { Admonition, ButtonStyled, defineMessages, useVIntl } from '@modrinth/ui'
+import { Admonition, Button, defineMessages, useVIntl } from '@modrinth/ui'
 
 import type { SharedInstanceUnavailableReason } from '@/helpers/install'
 import {
diff --git a/apps/app-frontend/src/pages/instance/components/admonitions/shared-instance-update-available.vue b/apps/app-frontend/src/pages/instance/components/admonitions/shared-instance-update-available.vue
index 172b1227c9..780b51ccec 100644
--- a/apps/app-frontend/src/pages/instance/components/admonitions/shared-instance-update-available.vue
+++ b/apps/app-frontend/src/pages/instance/components/admonitions/shared-instance-update-available.vue
@@ -6,19 +6,17 @@
 	>
 		{{ formatMessage(messages.sharedInstanceUpdateAvailableBody, { name: instanceName }) }}
 		<template #actions>
-			<ButtonStyled color="blue">
-				<button class="!h-10" @click="emit('review', $event)">
-					<DownloadIcon aria-hidden="true" />
-					{{ formatMessage(messages.sharedInstanceReviewUpdateButton) }}
-				</button>
-			</ButtonStyled>
+			<Button type="colored" color="blue" size="lg" @click="emit('review', $event)">
+				<DownloadIcon aria-hidden="true" />
+				{{ formatMessage(messages.sharedInstanceReviewUpdateButton) }}
+			</Button>
 		</template>
 	</Admonition>
 </template>
 
 <script setup lang="ts">
 import { DownloadIcon } from '@modrinth/assets'
-import { Admonition, ButtonStyled, useVIntl } from '@modrinth/ui'
+import { Admonition, Button, useVIntl } from '@modrinth/ui'
 
 import { instanceAdmonitionsMessages as messages } from './messages'
 
diff --git a/apps/app-frontend/src/pages/instance/components/page-header/index.vue b/apps/app-frontend/src/pages/instance/components/page-header/index.vue
index 59eea07309..50c0f4e4fe 100644
--- a/apps/app-frontend/src/pages/instance/components/page-header/index.vue
+++ b/apps/app-frontend/src/pages/instance/components/page-header/index.vue
@@ -85,66 +85,98 @@
 
 		<template #actions>
 			<PageHeaderActions>
-				<ButtonStyled v-if="isInstalling" color="brand" size="large">
-					<button type="button" disabled>
-						{{ formatMessage(commonMessages.installingLabel) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled v-else-if="playing" color="red" size="large">
-					<button type="button" :disabled="stopping" @click="emit('stop')">
-						<StopCircleIcon />
-						{{
-							stopping ? formatMessage(messages.stopping) : formatMessage(commonMessages.stopButton)
-						}}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled v-else-if="instance.quarantined" color="brand" size="large">
-					<button v-tooltip="formatMessage(messages.lockedPlayTooltip)" type="button" disabled>
-						<PlayIcon />
-						{{ formatMessage(commonMessages.playButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled v-else-if="instance.install_stage !== 'installed'" color="brand" size="large">
-					<button type="button" @click="emit('repair')">
-						<DownloadIcon />
-						{{ formatMessage(messages.repair) }}
-					</button>
-				</ButtonStyled>
-				<JoinedButtons
-					v-else-if="!loading && isServerInstance"
-					:actions="serverPlayActions"
+				<Button
+					v-if="isInstalling"
+					type="colored"
 					color="brand"
-					size="large"
-				/>
-				<ButtonStyled v-else-if="!loading" color="brand" size="large">
-					<button type="button" @click="emit('play')">
-						<PlayIcon />
-						{{ formatMessage(commonMessages.playButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled v-else color="brand" size="large">
-					<button type="button" disabled>{{ formatMessage(messages.starting) }}</button>
-				</ButtonStyled>
+					size="xl"
+					native-type="button"
+					disabled
+				>
+					{{ formatMessage(commonMessages.installingLabel) }}
+				</Button>
+				<Button
+					v-else-if="playing"
+					type="colored"
+					color="red"
+					size="xl"
+					native-type="button"
+					:disabled="stopping"
+					@click="emit('stop')"
+				>
+					<StopCircleIcon />
+					{{
+						stopping ? formatMessage(messages.stopping) : formatMessage(commonMessages.stopButton)
+					}}
+				</Button>
+				<Button
+					v-else-if="instance.quarantined"
+					v-tooltip="formatMessage(messages.lockedPlayTooltip)"
+					type="colored"
+					color="brand"
+					size="xl"
+					native-type="button"
+					disabled
+				>
+					<PlayIcon />
+					{{ formatMessage(commonMessages.playButton) }}
+				</Button>
+				<Button
+					v-else-if="instance.install_stage !== 'installed'"
+					type="colored"
+					color="brand"
+					size="xl"
+					native-type="button"
+					@click="emit('repair')"
+				>
+					<DownloadIcon />
+					{{ formatMessage(messages.repair) }}
+				</Button>
+				<SplitButton
+					v-else-if="!loading && isServerInstance"
+					type="colored"
+					color="brand"
+					size="xl"
+					:options="serverPlayOptions"
+					:menu-label="formatMessage(messages.launchInstance)"
+					@click="emit('playServer')"
+				>
+					<PlayIcon />
+					{{ formatMessage(commonMessages.playButton) }}
+				</SplitButton>
+				<Button
+					v-else-if="!loading"
+					type="colored"
+					color="brand"
+					size="xl"
+					native-type="button"
+					@click="emit('play')"
+				>
+					<PlayIcon />
+					{{ formatMessage(commonMessages.playButton) }}
+				</Button>
+				<Button v-else type="colored" color="brand" size="xl" native-type="button" disabled>{{
+					formatMessage(messages.starting)
+				}}</Button>
 
-				<ButtonStyled circular size="large">
-					<button
-						v-tooltip="formatMessage(messages.instanceSettings)"
-						type="button"
-						:aria-label="formatMessage(messages.instanceSettings)"
-						@click="emit('settings')"
-					>
-						<SettingsIcon />
-					</button>
-				</ButtonStyled>
-				<ButtonStyled circular size="large" type="transparent">
-					<TeleportOverflowMenu
-						:options="moreActions"
-						:tooltip="formatMessage(messages.moreActions)"
-						:aria-label="formatMessage(messages.moreActions)"
-					>
-						<MoreVerticalIcon />
-					</TeleportOverflowMenu>
-				</ButtonStyled>
+				<IconButton
+					v-tooltip="formatMessage(messages.instanceSettings)"
+					size="xl"
+					:label="formatMessage(messages.instanceSettings)"
+					native-type="button"
+					@click="emit('settings')"
+				>
+					<SettingsIcon />
+				</IconButton>
+				<TeleportOverflowMenu
+					type="quiet"
+					size="xl"
+					:label="formatMessage(messages.moreActions)"
+					:tooltip="formatMessage(messages.moreActions)"
+					:options="moreActions"
+				>
+					<MoreVerticalIcon />
+				</TeleportOverflowMenu>
 			</PageHeaderActions>
 		</template>
 	</PageHeader>
@@ -167,23 +199,20 @@ import {
 	TimerIcon,
 	UnknownIcon,
 } from '@modrinth/assets'
+import { Button, IconButton, SplitButton, TeleportOverflowMenu } from '@modrinth/ui'
 import {
 	Avatar,
-	ButtonStyled,
 	commonMessages,
 	defineMessages,
 	formatLoaderLabel,
-	type JoinedButtonAction,
-	JoinedButtons,
 	LoaderIcon as ServerLoaderIcon,
+	type OverflowMenuOption,
 	PageHeader,
 	PageHeaderActions,
 	PageHeaderBadgeItem,
 	PageHeaderMetadata,
 	PageHeaderMetadataItem,
 	type ServerLoader,
-	TeleportOverflowMenu,
-	type TeleportOverflowMenuItem,
 	useVIntl,
 } from '@modrinth/ui'
 import { computed } from 'vue'
@@ -350,13 +379,7 @@ const playtimeLabel = computed(() => {
 	const seconds = Math.floor(props.timePlayed)
 	return `${seconds} second${seconds > 1 ? 's' : ''}`
 })
-const serverPlayActions = computed<JoinedButtonAction[]>(() => [
-	{
-		id: 'join_server',
-		label: formatMessage(commonMessages.playButton),
-		icon: PlayIcon,
-		action: () => emit('playServer'),
-	},
+const serverPlayOptions = computed<OverflowMenuOption[]>(() => [
 	{
 		id: 'launch_instance',
 		label: formatMessage(messages.launchInstance),
@@ -364,8 +387,8 @@ const serverPlayActions = computed<JoinedButtonAction[]>(() => [
 		action: () => emit('play'),
 	},
 ])
-const moreActions = computed<TeleportOverflowMenuItem[]>(() => {
-	const actions: TeleportOverflowMenuItem[] = [
+const moreActions = computed<OverflowMenuOption[]>(() => {
+	const actions: OverflowMenuOption[] = [
 		{
 			id: 'open-folder',
 			label: formatMessage(messages.openFolder),
@@ -393,12 +416,12 @@ const moreActions = computed<TeleportOverflowMenuItem[]>(() => {
 
 	if (props.instance.shared_instance?.role === 'member') {
 		actions.push(
-			{ divider: true },
+			{ type: 'divider' },
 			{
 				id: 'report-shared-instance',
 				label: formatMessage(commonMessages.reportButton),
 				icon: ReportIcon,
-				color: 'red',
+				tone: 'red',
 				action: (event) => emit('report', event),
 			},
 		)
diff --git a/apps/app-frontend/src/pages/instance/components/settings-modal/confirm-revoke-shared-instance-invite-modal.vue b/apps/app-frontend/src/pages/instance/components/settings-modal/confirm-revoke-shared-instance-invite-modal.vue
index e373ce7b93..89fd9f6cd8 100644
--- a/apps/app-frontend/src/pages/instance/components/settings-modal/confirm-revoke-shared-instance-invite-modal.vue
+++ b/apps/app-frontend/src/pages/instance/components/settings-modal/confirm-revoke-shared-instance-invite-modal.vue
@@ -10,18 +10,14 @@
 
 		<template #actions>
 			<div class="flex justify-end gap-2">
-				<ButtonStyled type="outlined">
-					<button @click="modal?.hide()">
-						<XIcon />
-						{{ formatMessage(commonMessages.cancelButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="red">
-					<button @click="confirm">
-						<XIcon />
-						{{ formatMessage(messages.revokeButton) }}
-					</button>
-				</ButtonStyled>
+				<Button type="outlined" @click="modal?.hide()">
+					<XIcon />
+					{{ formatMessage(commonMessages.cancelButton) }}
+				</Button>
+				<Button type="colored" color="red" @click="confirm">
+					<XIcon />
+					{{ formatMessage(messages.revokeButton) }}
+				</Button>
 			</div>
 		</template>
 	</NewModal>
@@ -31,7 +27,7 @@
 import { XIcon } from '@modrinth/assets'
 import {
 	Admonition,
-	ButtonStyled,
+	Button,
 	commonMessages,
 	defineMessages,
 	IntlFormatted,
diff --git a/apps/app-frontend/src/pages/instance/components/settings-modal/general-settings.vue b/apps/app-frontend/src/pages/instance/components/settings-modal/general-settings.vue
index ef6bec1319..e3f9d8f64b 100644
--- a/apps/app-frontend/src/pages/instance/components/settings-modal/general-settings.vue
+++ b/apps/app-frontend/src/pages/instance/components/settings-modal/general-settings.vue
@@ -2,13 +2,13 @@
 import { CopyIcon, EditIcon, PlusIcon, SpinnerIcon, TrashIcon, UploadIcon } from '@modrinth/assets'
 import {
 	Avatar,
-	ButtonStyled,
+	Button,
 	Checkbox,
 	Chips,
 	defineMessages,
 	injectNotificationManager,
-	OverflowMenu,
 	StyledInput,
+	TeleportOverflowMenu,
 	useVIntl,
 } from '@modrinth/ui'
 import { useQueryClient } from '@tanstack/vue-query'
@@ -298,17 +298,24 @@ const messages = defineMessages({
 			<div class="flex flex-col gap-1">
 				<span class="text-lg font-semibold text-contrast">Icon</span>
 				<div class="group relative w-fit">
-					<OverflowMenu
-						v-tooltip="formatMessage(messages.editIcon)"
-						class="bg-transparent border-none appearance-none p-0 m-0 cursor-pointer group-active:scale-95 transition-transform"
+					<TeleportOverflowMenu
+						:label="formatMessage(messages.editIcon)"
+						:tooltip="formatMessage(messages.editIcon)"
+						:icon-only="false"
+						type="quiet"
+						interaction="none"
+						class="m-0 !h-auto cursor-pointer appearance-none border-none bg-transparent !p-0 transition-transform group-active:scale-95"
 						:options="[
 							{
 								id: 'select',
+								label: icon
+									? formatMessage(messages.replaceIcon)
+									: formatMessage(messages.selectIcon),
 								action: () => setIcon(),
 							},
 							{
 								id: 'remove',
-								color: 'danger',
+								label: formatMessage(messages.removeIcon),
 								action: () => resetIcon(),
 								shown: !!icon,
 							},
@@ -331,7 +338,7 @@ const messages = defineMessages({
 							{{ icon ? formatMessage(messages.replaceIcon) : formatMessage(messages.selectIcon) }}
 						</template>
 						<template #remove> <TrashIcon /> {{ formatMessage(messages.removeIcon) }} </template>
-					</OverflowMenu>
+					</TeleportOverflowMenu>
 				</div>
 			</div>
 		</div>
@@ -352,17 +359,15 @@ const messages = defineMessages({
 				<h2 id="duplicate-instance-label" class="m-0 text-lg font-semibold text-contrast block">
 					{{ formatMessage(messages.duplicateInstance) }}
 				</h2>
-				<ButtonStyled>
-					<button
-						v-tooltip="installing ? formatMessage(messages.duplicateButtonTooltipInstalling) : null"
-						aria-labelledby="duplicate-instance-label"
-						:disabled="installing"
-						class="w-max !shadow-none"
-						@click="duplicateInstance"
-					>
-						<CopyIcon /> {{ formatMessage(messages.duplicateButton) }}
-					</button>
-				</ButtonStyled>
+				<Button
+					v-tooltip="installing ? formatMessage(messages.duplicateButtonTooltipInstalling) : null"
+					aria-labelledby="duplicate-instance-label"
+					:disabled="installing"
+					class="w-max"
+					@click="duplicateInstance"
+				>
+					<CopyIcon /> {{ formatMessage(messages.duplicateButton) }}
+				</Button>
 				<p class="m-0">
 					{{ formatMessage(messages.duplicateInstanceDescription) }}
 				</p>
@@ -388,11 +393,9 @@ const messages = defineMessages({
 						class="w-full max-w-[300px]"
 						@submit="() => addCategory"
 					/>
-					<ButtonStyled>
-						<button class="w-fit !shadow-none" @click="() => addCategory()">
-							<PlusIcon /> {{ formatMessage(messages.libraryGroupsCreate) }}
-						</button>
-					</ButtonStyled>
+					<Button class="w-fit" @click="() => addCategory()">
+						<PlusIcon /> {{ formatMessage(messages.libraryGroupsCreate) }}
+					</Button>
 				</div>
 			</div>
 			<p class="m-0">
@@ -421,22 +424,22 @@ const messages = defineMessages({
 			<h2 id="delete-instance-label" class="m-0 text-lg font-semibold text-contrast block">
 				{{ formatMessage(messages.deleteInstance) }}
 			</h2>
-			<ButtonStyled color="red">
-				<button
-					aria-labelledby="delete-instance-label"
-					:disabled="removing"
-					class="w-fit !shadow-none"
-					@click="deleteConfirmModal.show()"
-				>
-					<SpinnerIcon v-if="removing" class="animate-spin" />
-					<TrashIcon v-else />
-					{{
-						removing
-							? formatMessage(messages.deletingInstanceButton)
-							: formatMessage(messages.deleteInstanceButton)
-					}}
-				</button>
-			</ButtonStyled>
+			<Button
+				type="colored"
+				color="red"
+				aria-labelledby="delete-instance-label"
+				:disabled="removing"
+				class="w-fit"
+				@click="deleteConfirmModal.show()"
+			>
+				<SpinnerIcon v-if="removing" class="animate-spin" />
+				<TrashIcon v-else />
+				{{
+					removing
+						? formatMessage(messages.deletingInstanceButton)
+						: formatMessage(messages.deleteInstanceButton)
+				}}
+			</Button>
 			<p class="m-0">
 				{{ formatMessage(messages.deleteInstanceDescription) }}
 			</p>
diff --git a/apps/app-frontend/src/pages/instance/components/settings-modal/java-settings.vue b/apps/app-frontend/src/pages/instance/components/settings-modal/java-settings.vue
index b73d848c87..97a9ab101a 100644
--- a/apps/app-frontend/src/pages/instance/components/settings-modal/java-settings.vue
+++ b/apps/app-frontend/src/pages/instance/components/settings-modal/java-settings.vue
@@ -9,7 +9,7 @@ import {
 	XCircleIcon,
 } from '@modrinth/assets'
 import {
-	ButtonStyled,
+	Button,
 	Checkbox,
 	defineMessages,
 	injectNotificationManager,
@@ -224,45 +224,60 @@ const messages = defineMessages({
 							wrapper-class="flex-1 min-w-0"
 							@update:model-value="(val) => (javaPath = String(val))"
 						/>
-						<ButtonStyled
+						<Button
+							type="quiet"
 							:color="
 								!hoveringTest && !testingJava
 									? javaTestResult === true
 										? 'green'
 										: 'red'
-									: 'standard'
+									: undefined
 							"
-							color-fill="text"
+							:disabled="!overrideJavaInstall || testingJava"
+							:style="{
+								'--legacy-button-color':
+									(!hoveringTest && !testingJava
+										? javaTestResult === true
+											? 'green'
+											: 'red'
+										: 'standard') &&
+									(!hoveringTest && !testingJava
+										? javaTestResult === true
+											? 'green'
+											: 'red'
+										: 'standard') !== 'standard'
+										? `var(--color-${
+												!hoveringTest && !testingJava
+													? javaTestResult === true
+														? 'green'
+														: 'red'
+													: 'standard'
+											})`
+										: undefined,
+							}"
+							class="!text-[var(--legacy-button-color,var(--color-base))] [&>svg]:!text-[var(--legacy-button-color,var(--color-primary))]"
+							@click="testJavaInstallation(activePath, optimalJava?.parsed_version, true)"
+							@mouseenter="overrideJavaInstall && (hoveringTest = true)"
+							@mouseleave="hoveringTest = false"
 						>
-							<button
-								:disabled="!overrideJavaInstall || testingJava"
-								@click="testJavaInstallation(activePath, optimalJava?.parsed_version, true)"
-								@mouseenter="overrideJavaInstall && (hoveringTest = true)"
-								@mouseleave="hoveringTest = false"
-							>
-								<SpinnerIcon v-if="testingJava" class="animate-spin h-4 w-4" />
-								<CheckCircleIcon
-									v-else-if="javaTestResult === true && !hoveringTest"
-									class="h-4 w-4"
-								/>
-								<XCircleIcon v-else-if="javaTestResult !== true && !hoveringTest" class="h-4 w-4" />
-								<RefreshCwIcon v-else-if="overrideJavaInstall" class="h-4 w-4" />
-							</button>
-						</ButtonStyled>
+							<SpinnerIcon v-if="testingJava" class="animate-spin h-4 w-4" />
+							<CheckCircleIcon
+								v-else-if="javaTestResult === true && !hoveringTest"
+								class="h-4 w-4"
+							/>
+							<XCircleIcon v-else-if="javaTestResult !== true && !hoveringTest" class="h-4 w-4" />
+							<RefreshCwIcon v-else-if="overrideJavaInstall" class="h-4 w-4" />
+						</Button>
 					</div>
 					<div v-if="overrideJavaInstall" class="flex gap-2">
-						<ButtonStyled>
-							<button @click="handleDetectJava">
-								<SearchIcon />
-								Detect
-							</button>
-						</ButtonStyled>
-						<ButtonStyled>
-							<button @click="handleBrowseJava">
-								<FolderSearchIcon />
-								Browse
-							</button>
-						</ButtonStyled>
+						<Button @click="handleDetectJava">
+							<SearchIcon />
+							Detect
+						</Button>
+						<Button @click="handleBrowseJava">
+							<FolderSearchIcon />
+							Browse
+						</Button>
 					</div>
 				</div>
 			</div>
diff --git a/apps/app-frontend/src/pages/instance/components/settings-modal/shared-instance-installation-settings-controls.vue b/apps/app-frontend/src/pages/instance/components/settings-modal/shared-instance-installation-settings-controls.vue
index d72f17090e..62c55c1c79 100644
--- a/apps/app-frontend/src/pages/instance/components/settings-modal/shared-instance-installation-settings-controls.vue
+++ b/apps/app-frontend/src/pages/instance/components/settings-modal/shared-instance-installation-settings-controls.vue
@@ -2,13 +2,11 @@
 	<div v-if="canUnpublish" class="flex flex-col gap-2.5">
 		<span class="text-lg font-semibold text-contrast">{{ formatMessage(messages.title) }}</span>
 		<div>
-			<ButtonStyled color="orange">
-				<button :disabled="busy" @click="unpublishModal?.show()">
-					<SpinnerIcon v-if="unpublishing" class="animate-spin" />
-					<UnlinkIcon v-else class="size-5" />
-					{{ formatMessage(unpublishing ? messages.unpublishingButton : messages.unpublishButton) }}
-				</button>
-			</ButtonStyled>
+			<Button type="colored" color="orange" :disabled="busy" @click="unpublishModal?.show()">
+				<SpinnerIcon v-if="unpublishing" class="animate-spin" />
+				<UnlinkIcon v-else class="size-5" />
+				{{ formatMessage(unpublishing ? messages.unpublishingButton : messages.unpublishButton) }}
+			</Button>
 		</div>
 		<span class="text-primary">{{ formatMessage(messages.unpublishDescription) }}</span>
 	</div>
@@ -17,13 +15,11 @@
 			formatMessage(messages.linkedTitle)
 		}}</span>
 		<div>
-			<ButtonStyled color="orange">
-				<button :disabled="busy" @click="unlinkModal?.show()">
-					<SpinnerIcon v-if="unlinking" class="animate-spin" />
-					<UnlinkIcon v-else class="size-5" />
-					{{ formatMessage(unlinking ? messages.unlinkingButton : messages.unlinkButton) }}
-				</button>
-			</ButtonStyled>
+			<Button type="colored" color="orange" :disabled="busy" @click="unlinkModal?.show()">
+				<SpinnerIcon v-if="unlinking" class="animate-spin" />
+				<UnlinkIcon v-else class="size-5" />
+				{{ formatMessage(unlinking ? messages.unlinkingButton : messages.unlinkButton) }}
+			</Button>
 		</div>
 		<span class="text-primary">{{ formatMessage(messages.unlinkDescription) }}</span>
 	</div>
@@ -39,15 +35,11 @@
 		}}</Admonition>
 		<template #actions
 			><div class="flex justify-end gap-2">
-				<ButtonStyled type="outlined"
-					><button class="!border" @click="unpublishModal?.hide()">
-						<XIcon />{{ formatMessage(commonMessages.cancelButton) }}
-					</button></ButtonStyled
-				><ButtonStyled color="orange"
-					><button :disabled="busy" @click="confirmUnpublish">
-						<UnlinkIcon />{{ formatMessage(messages.unpublishButton) }}
-					</button></ButtonStyled
-				>
+				<Button type="outlined" class="!border" @click="unpublishModal?.hide()">
+					<XIcon />{{ formatMessage(commonMessages.cancelButton) }} </Button
+				><Button type="colored" color="orange" :disabled="busy" @click="confirmUnpublish">
+					<UnlinkIcon />{{ formatMessage(messages.unpublishButton) }}
+				</Button>
 			</div></template
 		>
 	</NewModal>
@@ -70,15 +62,16 @@
 		</div>
 		<template #actions
 			><div class="flex justify-end gap-2">
-				<ButtonStyled type="outlined"
-					><button class="!border" @click="unlinkModal?.hide()">
-						<XIcon />{{ formatMessage(commonMessages.cancelButton) }}
-					</button></ButtonStyled
-				><ButtonStyled color="orange"
-					><button :disabled="busy || backupBusy" @click="confirmUnlink">
-						<UnlinkIcon />{{ formatMessage(messages.unlinkButton) }}
-					</button></ButtonStyled
+				<Button type="outlined" class="!border" @click="unlinkModal?.hide()">
+					<XIcon />{{ formatMessage(commonMessages.cancelButton) }} </Button
+				><Button
+					type="colored"
+					color="orange"
+					:disabled="busy || backupBusy"
+					@click="confirmUnlink"
 				>
+					<UnlinkIcon />{{ formatMessage(messages.unlinkButton) }}
+				</Button>
 			</div></template
 		>
 	</NewModal>
@@ -88,7 +81,7 @@
 import { SpinnerIcon, UnlinkIcon, XIcon } from '@modrinth/assets'
 import {
 	Admonition,
-	ButtonStyled,
+	Button,
 	commonMessages,
 	defineMessages,
 	InlineBackupCreator,
diff --git a/apps/app-frontend/src/pages/instance/components/settings-modal/sharing-settings.vue b/apps/app-frontend/src/pages/instance/components/settings-modal/sharing-settings.vue
index c2c481889f..e4f7527170 100644
--- a/apps/app-frontend/src/pages/instance/components/settings-modal/sharing-settings.vue
+++ b/apps/app-frontend/src/pages/instance/components/settings-modal/sharing-settings.vue
@@ -40,29 +40,28 @@
 				</template>
 				<template #cell-actions="{ row }">
 					<div class="flex justify-end">
-						<ButtonStyled circular type="transparent">
-							<button
-								v-tooltip="formatMessage(messages.revokeInvite)"
-								:aria-label="
-									formatMessage(messages.revokeInviteWithCode, {
-										code: row.id,
-									})
+						<IconButton
+							v-tooltip="formatMessage(messages.revokeInvite)"
+							type="quiet"
+							:label="
+								formatMessage(messages.revokeInviteWithCode, {
+									code: row.id,
+								})
+							"
+							:disabled="revokeInviteMutation.isPending.value || isBusy"
+							class="text-secondary hover:!filter-none hover:text-red focus-visible:!filter-none"
+							@click="revokeInviteModal?.show(row.id)"
+						>
+							<SpinnerIcon
+								v-if="
+									revokeInviteMutation.isPending.value &&
+									revokeInviteMutation.variables.value?.inviteId === row.id
 								"
-								:disabled="revokeInviteMutation.isPending.value || isBusy"
-								class="text-secondary hover:!filter-none hover:text-red focus-visible:!filter-none"
-								@click="revokeInviteModal?.show(row.id)"
-							>
-								<SpinnerIcon
-									v-if="
-										revokeInviteMutation.isPending.value &&
-										revokeInviteMutation.variables.value?.inviteId === row.id
-									"
-									class="animate-spin"
-									aria-hidden="true"
-								/>
-								<XIcon v-else aria-hidden="true" />
-							</button>
-						</ButtonStyled>
+								class="animate-spin"
+								aria-hidden="true"
+							/>
+							<XIcon v-else aria-hidden="true" />
+						</IconButton>
 					</div>
 				</template>
 			</Table>
@@ -81,8 +80,8 @@
 
 <script setup lang="ts">
 import { SpinnerIcon, XIcon } from '@modrinth/assets'
+import { IconButton } from '@modrinth/ui'
 import {
-	ButtonStyled,
 	CopyCode,
 	defineMessages,
 	Table,
diff --git a/apps/app-frontend/src/pages/instance/content/index.vue b/apps/app-frontend/src/pages/instance/content/index.vue
index 018c27b03e..572bf05758 100644
--- a/apps/app-frontend/src/pages/instance/content/index.vue
+++ b/apps/app-frontend/src/pages/instance/content/index.vue
@@ -1307,14 +1307,16 @@ function getOverflowOptions(item: ContentItem): OverflowMenuOption[] {
 	const options: OverflowMenuOption[] = []
 
 	options.push({
-		id: formatMessage(commonMessages.showFileButton),
+		id: 'show-file',
+		label: formatMessage(commonMessages.showFileButton),
 		icon: FolderOpenIcon,
 		action: () => highlightModInInstance(instance.value.id, item.file_path),
 	})
 
 	if (item.project?.slug) {
 		options.push({
-			id: formatMessage(commonMessages.copyLinkButton),
+			id: 'copy-link',
+			label: formatMessage(commonMessages.copyLinkButton),
 			icon: ClipboardCopyIcon,
 			action: async () => {
 				await navigator.clipboard.writeText(
diff --git a/apps/app-frontend/src/pages/instance/share/index.vue b/apps/app-frontend/src/pages/instance/share/index.vue
index 1c09022319..d88eed0d3c 100644
--- a/apps/app-frontend/src/pages/instance/share/index.vue
+++ b/apps/app-frontend/src/pages/instance/share/index.vue
@@ -96,11 +96,9 @@
 				</span>
 			</template>
 			<template #actions>
-				<ButtonStyled color="brand"
-					><button class="!h-10" @click="signInToShare">
-						<LogInIcon aria-hidden="true" />{{ formatMessage(lockedActionButton) }}
-					</button></ButtonStyled
-				>
+				<Button type="colored" color="brand" size="lg" @click="signInToShare">
+					<LogInIcon aria-hidden="true" />{{ formatMessage(lockedActionButton) }}
+				</Button>
 			</template>
 		</SharedInstanceShareEmptyState>
 
@@ -110,21 +108,21 @@
 			:description="formatMessage(messages.noFriendsInvitedDescription)"
 		>
 			<template #actions>
-				<ButtonStyled color="brand"
-					><button
-						class="!h-10"
-						:disabled="inviteLink.pending.value || !hasRemainingUserSlots"
-						@click="showInvitePlayers($event)"
-					>
-						<SpinnerIcon
-							v-if="inviteLink.pending.value"
-							class="animate-spin"
-							aria-hidden="true"
-						/><UserPlusIcon v-else aria-hidden="true" />{{
-							formatMessage(messages.inviteFriendsButton)
-						}}
-					</button></ButtonStyled
+				<Button
+					type="colored"
+					color="brand"
+					size="lg"
+					:disabled="inviteLink.pending.value || !hasRemainingUserSlots"
+					@click="showInvitePlayers($event)"
 				>
+					<SpinnerIcon
+						v-if="inviteLink.pending.value"
+						class="animate-spin"
+						aria-hidden="true"
+					/><UserPlusIcon v-else aria-hidden="true" />{{
+						formatMessage(messages.inviteFriendsButton)
+					}}
+				</Button>
 			</template>
 		</SharedInstanceShareEmptyState>
 	</div>
@@ -134,7 +132,7 @@
 import { LogInIcon, SpinnerIcon, UserPlusIcon } from '@modrinth/assets'
 import {
 	Avatar,
-	ButtonStyled,
+	Button,
 	ConfirmUnlinkModal,
 	defineMessages,
 	injectAuth,
diff --git a/apps/app-frontend/src/pages/instance/share/shared-instance-members-table.vue b/apps/app-frontend/src/pages/instance/share/shared-instance-members-table.vue
index b35e0f5916..756f9b0430 100644
--- a/apps/app-frontend/src/pages/instance/share/shared-instance-members-table.vue
+++ b/apps/app-frontend/src/pages/instance/share/shared-instance-members-table.vue
@@ -11,28 +11,29 @@
 					clearable
 				/>
 				<template v-if="!actionsLocked">
-					<ButtonStyled type="outlined">
-						<button
-							class="flex !h-10 shrink-0 items-center gap-2 !border"
-							:disabled="pushUpdateDisabled"
-							@click="management.pushUpdate($event)"
-						>
-							<SpinnerIcon v-if="pushUpdatePending" class="animate-spin" aria-hidden="true" />
-							<UploadIcon v-else aria-hidden="true" />
-							{{ formatMessage(messages.pushUpdate) }}
-						</button>
-					</ButtonStyled>
-					<ButtonStyled color="brand">
-						<button
-							class="flex !h-10 shrink-0 items-center gap-2"
-							:disabled="invitePending || inviteDisabled"
-							@click="management.invite($event)"
-						>
-							<SpinnerIcon v-if="invitePending" class="animate-spin" aria-hidden="true" />
-							<UserPlusIcon v-else aria-hidden="true" />
-							Invite friends
-						</button>
-					</ButtonStyled>
+					<Button
+						type="outlined"
+						size="lg"
+						class="shrink-0 !border"
+						:disabled="pushUpdateDisabled"
+						@click="management.pushUpdate($event)"
+					>
+						<SpinnerIcon v-if="pushUpdatePending" class="animate-spin" aria-hidden="true" />
+						<UploadIcon v-else aria-hidden="true" />
+						{{ formatMessage(messages.pushUpdate) }}
+					</Button>
+					<Button
+						type="colored"
+						color="brand"
+						size="lg"
+						class="shrink-0"
+						:disabled="invitePending || inviteDisabled"
+						@click="management.invite($event)"
+					>
+						<SpinnerIcon v-if="invitePending" class="animate-spin" aria-hidden="true" />
+						<UserPlusIcon v-else aria-hidden="true" />
+						Invite friends
+					</Button>
 				</template>
 			</div>
 			<div v-if="hasMultipleMethods" class="flex flex-wrap items-center gap-1.5">
@@ -120,15 +121,15 @@
 			</template>
 			<template #cell-actions="{ row }">
 				<div v-if="!actionsLocked" class="flex items-center justify-end">
-					<ButtonStyled circular type="transparent"
-						><button
-							v-tooltip="'Revoke access'"
-							:aria-label="`Revoke access for ${row.username}`"
-							class="text-secondary hover:!filter-none hover:text-red focus-visible:!filter-none"
-							@click="management.remove(row)"
-						>
-							<XIcon aria-hidden="true" /></button
-					></ButtonStyled>
+					<IconButton
+						v-tooltip="'Revoke access'"
+						type="quiet"
+						:label="`Revoke access for ${row.username}`"
+						class="text-secondary hover:!filter-none hover:text-red focus-visible:!filter-none"
+						@click="management.remove(row)"
+					>
+						<XIcon aria-hidden="true"
+					/></IconButton>
 				</div>
 			</template>
 		</Table>
@@ -145,10 +146,10 @@ import {
 	UserPlusIcon,
 	XIcon,
 } from '@modrinth/assets'
+import { Button, IconButton } from '@modrinth/ui'
 import {
 	AutoLink,
 	Avatar,
-	ButtonStyled,
 	defineMessages,
 	type SortDirection,
 	StyledInput,
diff --git a/apps/app-frontend/src/pages/instance/share/shared-instance-remove-member-modal.vue b/apps/app-frontend/src/pages/instance/share/shared-instance-remove-member-modal.vue
index 1f7983dcdd..96d67be712 100644
--- a/apps/app-frontend/src/pages/instance/share/shared-instance-remove-member-modal.vue
+++ b/apps/app-frontend/src/pages/instance/share/shared-instance-remove-member-modal.vue
@@ -32,16 +32,12 @@
 				</ul>
 			</div>
 			<div class="flex justify-end gap-2 pt-1">
-				<ButtonStyled type="outlined"
-					><button class="!border !border-surface-5" @click="modal?.hide()">
-						<XIcon aria-hidden="true" />{{ formatMessage(commonMessages.cancelButton) }}
-					</button></ButtonStyled
-				>
-				<ButtonStyled color="orange"
-					><button :disabled="!row" @click="confirm">
-						<UserXIcon aria-hidden="true" />{{ formatMessage(messages.removeButton) }}
-					</button></ButtonStyled
-				>
+				<Button type="outlined" class="!border !border-surface-5" @click="modal?.hide()">
+					<XIcon aria-hidden="true" />{{ formatMessage(commonMessages.cancelButton) }}
+				</Button>
+				<Button type="colored" color="orange" :disabled="!row" @click="confirm">
+					<UserXIcon aria-hidden="true" />{{ formatMessage(messages.removeButton) }}
+				</Button>
 			</div>
 		</div>
 	</NewModal>
@@ -52,7 +48,7 @@ import { UserXIcon, XIcon } from '@modrinth/assets'
 import {
 	Admonition,
 	Avatar,
-	ButtonStyled,
+	Button,
 	commonMessages,
 	defineMessages,
 	NewModal,
diff --git a/apps/app-frontend/src/pages/instance/worlds/index.vue b/apps/app-frontend/src/pages/instance/worlds/index.vue
index cc3a228df3..1d9adca70d 100644
--- a/apps/app-frontend/src/pages/instance/worlds/index.vue
+++ b/apps/app-frontend/src/pages/instance/worlds/index.vue
@@ -35,18 +35,14 @@
 					"
 				/>
 				<div class="flex gap-2">
-					<ButtonStyled type="outlined">
-						<button class="!h-10" @click="addServerModal?.show()">
-							<PlusIcon class="size-5" />
-							{{ formatMessage(messages.addServer) }}
-						</button>
-					</ButtonStyled>
-					<ButtonStyled color="brand">
-						<button class="!h-10 flex items-center gap-2" @click="instancePage.browseServers">
-							<CompassIcon class="size-5" />
-							<span>{{ formatMessage(messages.browseServers) }}</span>
-						</button>
-					</ButtonStyled>
+					<Button type="outlined" size="lg" @click="addServerModal?.show()">
+						<PlusIcon class="size-5" />
+						{{ formatMessage(messages.addServer) }}
+					</Button>
+					<Button type="colored" color="brand" size="lg" @click="instancePage.browseServers">
+						<CompassIcon class="size-5" />
+						<span>{{ formatMessage(messages.browseServers) }}</span>
+					</Button>
 				</div>
 			</div>
 			<div class="flex flex-wrap items-center justify-between gap-2">
@@ -67,16 +63,17 @@
 						{{ option.label }}
 					</button>
 				</div>
-				<ButtonStyled type="transparent" hover-color-fill="none">
-					<button :disabled="refreshingAll" @click="refreshAllWorlds">
-						<RefreshCwIcon :class="refreshingAll ? 'animate-spin' : ''" />
-						{{
-							formatMessage(
-								refreshingAll ? messages.refreshingButton : commonMessages.refreshButton,
-							)
-						}}
-					</button>
-				</ButtonStyled>
+				<Button
+					type="quiet"
+					:disabled="refreshingAll"
+					class="hover:!bg-transparent focus-visible:!bg-transparent"
+					@click="refreshAllWorlds"
+				>
+					<RefreshCwIcon :class="refreshingAll ? 'animate-spin' : ''" />
+					{{
+						formatMessage(refreshingAll ? messages.refreshingButton : commonMessages.refreshButton)
+					}}
+				</Button>
 			</div>
 			<div class="flex flex-col w-full gap-2">
 				<WorldItem
@@ -122,26 +119,22 @@
 			:description="formatMessage(messages.noWorldsDescription)"
 		>
 			<template #actions>
-				<ButtonStyled type="outlined">
-					<button class="!h-10" @click="addServerModal?.show()">
-						<PlusIcon class="size-5" />
-						{{ formatMessage(messages.addServer) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="brand">
-					<button class="!h-10 flex items-center gap-2" @click="instancePage.browseServers">
-						<CompassIcon class="size-5" />
-						<span>{{ formatMessage(messages.browseServers) }}</span>
-					</button>
-				</ButtonStyled>
+				<Button type="outlined" size="lg" @click="addServerModal?.show()">
+					<PlusIcon class="size-5" />
+					{{ formatMessage(messages.addServer) }}
+				</Button>
+				<Button type="colored" color="brand" size="lg" @click="instancePage.browseServers">
+					<CompassIcon class="size-5" />
+					<span>{{ formatMessage(messages.browseServers) }}</span>
+				</Button>
 			</template>
 		</EmptyState>
 	</ReadyTransition>
 </template>
 <script setup lang="ts">
 import { CompassIcon, FilterIcon, PlusIcon, RefreshCwIcon, SearchIcon } from '@modrinth/assets'
+import { Button } from '@modrinth/ui'
 import {
-	ButtonStyled,
 	commonMessages,
 	defineMessages,
 	EmptyState,
diff --git a/apps/app-frontend/src/pages/library/Index.vue b/apps/app-frontend/src/pages/library/Index.vue
index a8510edcd4..9cce03ec22 100644
--- a/apps/app-frontend/src/pages/library/Index.vue
+++ b/apps/app-frontend/src/pages/library/Index.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { LibraryIcon, PlusIcon } from '@modrinth/assets'
-import { ButtonStyled, injectNotificationManager, NavTabs } from '@modrinth/ui'
+import { Button, injectNotificationManager, NavTabs } from '@modrinth/ui'
 import { inject, onUnmounted, ref, shallowRef } from 'vue'
 import { useRoute } from 'vue-router'
 
@@ -53,12 +53,10 @@ onUnmounted(() => {
 					{ label: 'Saved', href: `/library/saved`, shown: false },
 				]"
 			/>
-			<ButtonStyled color="brand">
-				<button :disabled="offline" @click="showCreationModal?.()">
-					<PlusIcon />
-					New instance
-				</button>
-			</ButtonStyled>
+			<Button type="colored" color="brand" :disabled="offline" @click="showCreationModal?.()">
+				<PlusIcon />
+				New instance
+			</Button>
 		</div>
 		<template v-if="instances && instances.length > 0">
 			<RouterView v-if="route.path.startsWith('/library')" :instances="instances" />
@@ -68,12 +66,10 @@ onUnmounted(() => {
 				<NewInstanceImage />
 			</div>
 			<h3>No instances found</h3>
-			<ButtonStyled color="brand">
-				<button :disabled="offline" @click="showCreationModal?.()">
-					<PlusIcon />
-					Create new instance
-				</button>
-			</ButtonStyled>
+			<Button type="colored" color="brand" :disabled="offline" @click="showCreationModal?.()">
+				<PlusIcon />
+				Create new instance
+			</Button>
 		</div>
 	</div>
 </template>
diff --git a/apps/app-frontend/src/pages/project/Gallery.vue b/apps/app-frontend/src/pages/project/Gallery.vue
index 05a771f927..14800122b9 100644
--- a/apps/app-frontend/src/pages/project/Gallery.vue
+++ b/apps/app-frontend/src/pages/project/Gallery.vue
@@ -39,40 +39,40 @@
 				</div>
 				<div class="controls">
 					<div class="buttons">
-						<ButtonStyled circular>
-							<button class="close" @click="hideImage">
-								<XIcon aria-hidden="true" />
-							</button>
-						</ButtonStyled>
-						<ButtonStyled circular>
-							<a
-								class="open btn icon-only"
-								target="_blank"
-								:href="
-									expandedGalleryItem.raw_url
-										? expandedGalleryItem.raw_url
-										: 'https://cdn.modrinth.com/placeholder-banner.svg'
-								"
-							>
-								<ExternalIcon aria-hidden="true" />
-							</a>
-						</ButtonStyled>
-						<ButtonStyled circular>
-							<button @click="zoomedIn = !zoomedIn">
-								<ExpandIcon v-if="!zoomedIn" aria-hidden="true" />
-								<ContractIcon v-else aria-hidden="true" />
-							</button>
-						</ButtonStyled>
-						<ButtonStyled v-if="filteredGallery.length > 1" circular>
-							<button class="previous" @click="previousImage()">
-								<LeftArrowIcon aria-hidden="true" />
-							</button>
-						</ButtonStyled>
-						<ButtonStyled v-if="filteredGallery.length > 1" circular>
-							<button class="next" @click="nextImage()">
-								<RightArrowIcon aria-hidden="true" />
-							</button>
-						</ButtonStyled>
+						<IconButton label="Close" class="close" @click="hideImage">
+							<XIcon aria-hidden="true" />
+						</IconButton>
+						<ButtonLink
+							class="open btn icon-only !w-9 !px-0 !rounded-full"
+							target="_blank"
+							:href="
+								expandedGalleryItem.raw_url
+									? expandedGalleryItem.raw_url
+									: 'https://cdn.modrinth.com/placeholder-banner.svg'
+							"
+						>
+							<ExternalIcon aria-hidden="true" />
+						</ButtonLink>
+						<IconButton label="Toggle zoom" @click="zoomedIn = !zoomedIn">
+							<ExpandIcon v-if="!zoomedIn" aria-hidden="true" />
+							<ContractIcon v-else aria-hidden="true" />
+						</IconButton>
+						<IconButton
+							v-if="filteredGallery.length > 1"
+							label="Previous image"
+							class="previous"
+							@click="previousImage()"
+						>
+							<LeftArrowIcon aria-hidden="true" />
+						</IconButton>
+						<IconButton
+							v-if="filteredGallery.length > 1"
+							label="Next image"
+							class="next"
+							@click="nextImage()"
+						>
+							<RightArrowIcon aria-hidden="true" />
+						</IconButton>
 					</div>
 				</div>
 			</div>
@@ -90,7 +90,7 @@ import {
 	RightArrowIcon,
 	XIcon,
 } from '@modrinth/assets'
-import { ButtonStyled, Card, useFormatDateTime } from '@modrinth/ui'
+import { ButtonLink, Card, IconButton, useFormatDateTime } from '@modrinth/ui'
 import { computed, onMounted, onUnmounted, ref } from 'vue'
 
 import { hide_ads_window, show_ads_window } from '@/helpers/ads.js'
diff --git a/apps/app-frontend/src/pages/project/Index.vue b/apps/app-frontend/src/pages/project/Index.vue
index 2d3ee48c3a..af7eb37055 100644
--- a/apps/app-frontend/src/pages/project/Index.vue
+++ b/apps/app-frontend/src/pages/project/Index.vue
@@ -70,87 +70,104 @@
 				>
 					<template #actions>
 						<template v-if="isServerProject">
-							<ButtonStyled v-if="serverPlaying" color="red" size="large">
-								<button type="button" @click="handleStopServer">
-									<StopCircleIcon />
-									{{ formatMessage(commonMessages.stopButton) }}
-								</button>
-							</ButtonStyled>
-							<ButtonStyled v-else color="brand" size="large">
-								<button type="button" :disabled="serverInstallLoading" @click="handleClickPlay">
-									<PlayIcon />
-									{{
-										serverInstallLoading
-											? formatMessage(commonMessages.installingLabel)
-											: formatMessage(commonMessages.playButton)
-									}}
-								</button>
-							</ButtonStyled>
-							<ButtonStyled circular size="large">
-								<button
-									v-tooltip="formatMessage(commonMessages.addServerToInstanceButton)"
-									type="button"
-									:aria-label="formatMessage(commonMessages.addServerToInstanceButton)"
-									@click="handleAddServerToInstance"
-								>
-									<PlusIcon />
-								</button>
-							</ButtonStyled>
-							<ButtonStyled circular size="large" type="transparent">
-								<TeleportOverflowMenu
-									:options="serverProjectHeaderMoreActions"
-									tooltip="More options"
-									aria-label="More options"
-								>
-									<MoreVerticalIcon />
-								</TeleportOverflowMenu>
-							</ButtonStyled>
+							<Button
+								v-if="serverPlaying"
+								type="colored"
+								color="red"
+								size="xl"
+								native-type="button"
+								@click="handleStopServer"
+							>
+								<StopCircleIcon />
+								{{ formatMessage(commonMessages.stopButton) }}
+							</Button>
+							<Button
+								v-else
+								type="colored"
+								color="brand"
+								size="xl"
+								native-type="button"
+								:disabled="serverInstallLoading"
+								@click="handleClickPlay"
+							>
+								<PlayIcon />
+								{{
+									serverInstallLoading
+										? formatMessage(commonMessages.installingLabel)
+										: formatMessage(commonMessages.playButton)
+								}}
+							</Button>
+							<IconButton
+								v-tooltip="formatMessage(commonMessages.addServerToInstanceButton)"
+								size="xl"
+								:label="formatMessage(commonMessages.addServerToInstanceButton)"
+								native-type="button"
+								@click="handleAddServerToInstance"
+							>
+								<PlusIcon />
+							</IconButton>
+							<TeleportOverflowMenu
+								type="quiet"
+								size="xl"
+								label="More options"
+								:options="serverProjectHeaderMoreActions"
+							>
+								<MoreVerticalIcon />
+							</TeleportOverflowMenu>
 						</template>
 						<template v-else>
-							<ButtonStyled v-if="showSwitchVersion && onVersionsPage" size="large">
-								<button v-tooltip="formatMessage(messages.alreadyInstalled)" type="button" disabled>
-									<CheckIcon />
-									{{ formatMessage(commonMessages.installedLabel) }}
-								</button>
-							</ButtonStyled>
-							<ButtonStyled v-else-if="showSwitchVersion" size="large">
-								<button type="button" @click="goToVersions">
-									<SwapIcon />
-									{{ formatMessage(messages.switchVersion) }}
-								</button>
-							</ButtonStyled>
-							<ButtonStyled v-else color="brand" size="large">
-								<button
-									v-tooltip="
-										installButtonInstalled ? formatMessage(messages.alreadyInstalled) : undefined
-									"
-									type="button"
-									:disabled="installButtonDisabled"
-									@click="install(null)"
-								>
-									<component :is="installButtonIcon" :class="installButtonIconClass" />
-									{{
-										installButtonInstalled
-											? formatMessage(commonMessages.installedLabel)
-											: installButtonValidating
-												? formatMessage(commonMessages.validatingLabel)
-												: installButtonLoading
-													? formatMessage(commonMessages.installingLabel)
-													: serverProjectSelected
-														? formatMessage(commonMessages.selectedLabel)
-														: formatMessage(commonMessages.installButton)
-									}}
-								</button>
-							</ButtonStyled>
-							<ButtonStyled circular size="large" type="transparent">
-								<TeleportOverflowMenu
-									:options="projectHeaderMoreActions"
-									tooltip="More options"
-									aria-label="More options"
-								>
-									<MoreVerticalIcon />
-								</TeleportOverflowMenu>
-							</ButtonStyled>
+							<Button
+								v-if="showSwitchVersion && onVersionsPage"
+								v-tooltip="formatMessage(messages.alreadyInstalled)"
+								size="xl"
+								native-type="button"
+								disabled
+							>
+								<CheckIcon />
+								{{ formatMessage(commonMessages.installedLabel) }}
+							</Button>
+							<Button
+								v-else-if="showSwitchVersion"
+								size="xl"
+								native-type="button"
+								@click="goToVersions"
+							>
+								<SwapIcon />
+								{{ formatMessage(messages.switchVersion) }}
+							</Button>
+							<Button
+								v-else
+								v-tooltip="
+									installButtonInstalled ? formatMessage(messages.alreadyInstalled) : undefined
+								"
+								type="colored"
+								color="brand"
+								size="xl"
+								native-type="button"
+								:disabled="installButtonDisabled"
+								@click="install(null)"
+							>
+								<component :is="installButtonIcon" :class="installButtonIconClass" />
+								{{
+									installButtonInstalled
+										? formatMessage(commonMessages.installedLabel)
+										: installButtonValidating
+											? formatMessage(commonMessages.validatingLabel)
+											: installButtonLoading
+												? formatMessage(commonMessages.installingLabel)
+												: serverProjectSelected
+													? formatMessage(commonMessages.selectedLabel)
+													: formatMessage(commonMessages.installButton)
+								}}
+							</Button>
+							<TeleportOverflowMenu
+								type="quiet"
+								size="xl"
+								label="More options"
+								:options="projectHeaderMoreActions"
+							>
+								<MoreVerticalIcon />
+							</TeleportOverflowMenu>
 						</template>
 					</template>
 				</ProjectPageHeader>
@@ -241,11 +258,12 @@ import {
 } from '@modrinth/assets'
 import {
 	BrowseInstallHeader,
-	ButtonStyled,
+	Button,
 	commonMessages,
 	CreationFlowModal,
 	defineMessages,
 	getTargetInstallPreferences,
+	IconButton,
 	injectNotificationManager,
 	NavTabs,
 	ProjectBackgroundGradient,
@@ -571,13 +589,13 @@ const serverProjectHeaderMoreActions = computed(() => [
 		action: openProjectInBrowser,
 	},
 	{
-		divider: true,
+		type: 'divider',
 	},
 	{
 		id: 'report',
 		label: formatMessage(commonMessages.reportButton),
 		icon: ReportIcon,
-		color: 'red',
+		tone: 'red',
 		action: reportProject,
 	},
 ])
@@ -605,13 +623,13 @@ const projectHeaderMoreActions = computed(() => [
 		action: openProjectInBrowser,
 	},
 	{
-		divider: true,
+		type: 'divider',
 	},
 	{
 		id: 'report',
 		label: formatMessage(commonMessages.reportButton),
 		icon: ReportIcon,
-		color: 'red',
+		tone: 'red',
 		action: reportProject,
 	},
 ])
diff --git a/apps/app-frontend/src/pages/project/Version.vue b/apps/app-frontend/src/pages/project/Version.vue
index 85a368440b..3d3bd2a2cd 100644
--- a/apps/app-frontend/src/pages/project/Version.vue
+++ b/apps/app-frontend/src/pages/project/Version.vue
@@ -15,62 +15,62 @@
 			:dependency-link-creator="createDependencyLink"
 		>
 			<template #headerActions>
-				<ButtonStyled color="brand">
-					<button
-						:disabled="installing || (installed && installedVersion === version.id)"
-						@click="() => version && install(version.id)"
-					>
-						<DownloadIcon v-if="!installed" />
-						<SwapIcon v-else-if="installedVersion !== version.id" />
-						<CheckIcon v-else />
-						{{
-							installing
-								? formatMessage(messages.installing)
-								: installed && installedVersion === version.id
-									? formatMessage(commonMessages.installedLabel)
-									: installed
-										? formatMessage(commonMessages.switchToVersionButton)
-										: formatMessage(commonMessages.installButton)
-						}}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled type="outlined" circular>
-					<OverflowMenu
-						v-tooltip="formatMessage(commonMessages.moreOptionsButton)"
-						:options="[
-							{
-								id: 'open-in-browser',
-								link: `https://modrinth.com/${project.project_type}/${project.slug}/version/${version.id}`,
-								external: true,
-							},
-							{
-								id: 'report',
-								color: 'red',
-								hoverFilled: true,
-								link: `https://modrinth.com/report?item=version&itemID=${version.id}`,
-								external: true,
-							},
-						]"
-						aria-label="More options"
-					>
-						<MoreVerticalIcon aria-hidden="true" />
-						<template #open-in-browser>
-							<ExternalIcon aria-hidden="true" />
-							{{ formatMessage(commonMessages.openInBrowserButton) }}
-						</template>
-						<template #report>
-							<ReportIcon aria-hidden="true" /> {{ formatMessage(commonMessages.reportButton) }}
-						</template>
-					</OverflowMenu>
-				</ButtonStyled>
+				<Button
+					type="colored"
+					color="brand"
+					:disabled="installing || (installed && installedVersion === version.id)"
+					@click="() => version && install(version.id)"
+				>
+					<DownloadIcon v-if="!installed" />
+					<SwapIcon v-else-if="installedVersion !== version.id" />
+					<CheckIcon v-else />
+					{{
+						installing
+							? formatMessage(messages.installing)
+							: installed && installedVersion === version.id
+								? formatMessage(commonMessages.installedLabel)
+								: installed
+									? formatMessage(commonMessages.switchToVersionButton)
+									: formatMessage(commonMessages.installButton)
+					}}
+				</Button>
+				<TeleportOverflowMenu
+					type="outlined"
+					label="More options"
+					:tooltip="formatMessage(commonMessages.moreOptionsButton)"
+					:options="[
+						{
+							id: 'open-in-browser',
+							label: formatMessage(commonMessages.openInBrowserButton),
+							type: 'link',
+							href: `https://modrinth.com/${project.project_type}/${project.slug}/version/${version.id}`,
+							target: '_blank',
+						},
+						{
+							id: 'report',
+							label: formatMessage(commonMessages.reportButton),
+							type: 'link',
+							tone: 'red',
+							href: `https://modrinth.com/report?item=version&itemID=${version.id}`,
+							target: '_blank',
+						},
+					]"
+				>
+					<MoreVerticalIcon aria-hidden="true" />
+					<template #open-in-browser>
+						<ExternalIcon aria-hidden="true" />
+						{{ formatMessage(commonMessages.openInBrowserButton) }}
+					</template>
+					<template #report>
+						<ReportIcon aria-hidden="true" /> {{ formatMessage(commonMessages.reportButton) }}
+					</template>
+				</TeleportOverflowMenu>
 			</template>
 			<template #supplementaryResourceActions="{ file }">
-				<ButtonStyled>
-					<a :href="file.url" :download="file.filename" target="_blank">
-						<DownloadIcon aria-hidden="true" />
-						{{ formatMessage(messages.downloadInBrowser) }}
-					</a>
-				</ButtonStyled>
+				<ButtonLink :href="file.url" :download="file.filename" target="_blank">
+					<DownloadIcon aria-hidden="true" />
+					{{ formatMessage(messages.downloadInBrowser) }}
+				</ButtonLink>
 			</template>
 		</VersionPage>
 	</div>
@@ -87,12 +87,11 @@ import {
 	ReportIcon,
 	VersionIcon,
 } from '@modrinth/assets'
+import { Button, ButtonLink, TeleportOverflowMenu } from '@modrinth/ui'
 import {
-	ButtonStyled,
 	commonMessages,
 	defineMessages,
 	type DependencyContext,
-	OverflowMenu,
 	useVIntl,
 	VersionPage,
 } from '@modrinth/ui'
diff --git a/apps/app-frontend/src/pages/project/Versions.vue b/apps/app-frontend/src/pages/project/Versions.vue
index 7d7438cf12..d723a634b8 100644
--- a/apps/app-frontend/src/pages/project/Versions.vue
+++ b/apps/app-frontend/src/pages/project/Versions.vue
@@ -9,76 +9,53 @@
 			:version-link="(version) => buildProjectHref(`/project/${project.id}/version/${version.id}`)"
 		>
 			<template #actions="{ version }">
-				<ButtonStyled
-					circular
-					type="transparent"
-					:color="installed && version.id === installedVersion ? 'standard' : 'green'"
+				<IconButton
+					v-tooltip="
+						!installed
+							? formatMessage(commonMessages.installButton)
+							: version.id !== installedVersion
+								? formatMessage(commonMessages.switchToVersionButton)
+								: formatMessage(messages.alreadyInstalled)
+					"
+					type="quiet"
+					:color="installed && version.id === installedVersion ? undefined : 'green'"
+					:label="
+						!installed
+							? formatMessage(commonMessages.installButton)
+							: version.id !== installedVersion
+								? formatMessage(commonMessages.switchToVersionButton)
+								: formatMessage(messages.alreadyInstalled)
+					"
+					:disabled="installing || (installed && version.id === installedVersion)"
+					@click.stop="() => install(version.id)"
 				>
-					<button
-						v-tooltip="
-							!installed
-								? formatMessage(commonMessages.installButton)
-								: version.id !== installedVersion
-									? formatMessage(commonMessages.switchToVersionButton)
-									: formatMessage(messages.alreadyInstalled)
-						"
-						:disabled="installing || (installed && version.id === installedVersion)"
-						@click.stop="() => install(version.id)"
-					>
-						<DownloadIcon v-if="!installed" />
-						<SwapIcon v-else-if="installed && version.id !== installedVersion" />
-						<CheckIcon v-else />
-					</button>
-				</ButtonStyled>
-				<ButtonStyled circular type="transparent">
-					<OverflowMenu
-						v-if="false"
-						:options="[
-							{
-								id: 'install-elsewhere',
-								action: () => {},
-								shown: false && !!instance,
-								color: 'primary',
-								hoverFilled: true,
-							},
-							{
-								id: 'open-in-browser',
-								link: `https://modrinth.com/${project.project_type}/${project.slug}/version/${version.id}`,
-							},
-						]"
-						aria-label="More options"
-					>
-						<MoreVerticalIcon aria-hidden="true" />
-						<template #install-elsewhere>
-							<DownloadIcon aria-hidden="true" />
-							Add to another instance
-						</template>
-						<template #open-in-browser>
-							<ExternalIcon /> {{ formatMessage(commonMessages.openInBrowserButton) }}
-						</template>
-					</OverflowMenu>
-					<a
-						v-else
-						v-tooltip="formatMessage(commonMessages.openInBrowserButton)"
-						:href="`https://modrinth.com/${project.project_type}/${project.slug}/version/${version.id}`"
-						target="_blank"
-					>
-						<ExternalIcon />
-					</a>
-				</ButtonStyled>
+					<DownloadIcon v-if="!installed" />
+					<SwapIcon v-else-if="installed && version.id !== installedVersion" />
+					<CheckIcon v-else />
+				</IconButton>
+				<ButtonLink
+					v-tooltip="formatMessage(commonMessages.openInBrowserButton)"
+					type="quiet"
+					:href="`https://modrinth.com/${project.project_type}/${project.slug}/version/${version.id}`"
+					target="_blank"
+					:aria-label="formatMessage(commonMessages.openInBrowserButton)"
+					class="!w-9 !px-0 !rounded-full"
+				>
+					<ExternalIcon />
+				</ButtonLink>
 			</template>
 		</ProjectPageVersions>
 	</div>
 </template>
 
 <script setup>
-import { CheckIcon, DownloadIcon, ExternalIcon, MoreVerticalIcon } from '@modrinth/assets'
+import { CheckIcon, DownloadIcon, ExternalIcon } from '@modrinth/assets'
 import {
-	ButtonStyled,
+	ButtonLink,
 	commonMessages,
 	defineMessages,
+	IconButton,
 	injectNotificationManager,
-	OverflowMenu,
 	ProjectPageVersions,
 	useVIntl,
 } from '@modrinth/ui'
diff --git a/apps/frontend/src/assets/styles/components.scss b/apps/frontend/src/assets/styles/components.scss
index 4458f7c307..87434d1b98 100644
--- a/apps/frontend/src/assets/styles/components.scss
+++ b/apps/frontend/src/assets/styles/components.scss
@@ -93,7 +93,7 @@
 		}
 	}
 
-	:where(button, .button, .iconified-button) {
+	:where(button:not([data-button]), .button, .iconified-button) {
 		width: fit-content;
 	}
 
diff --git a/apps/frontend/src/components/analytics-dashboard/analytics-chart/analytics-chart-header/AnalyticsChartRenderLimitModal.vue b/apps/frontend/src/components/analytics-dashboard/analytics-chart/analytics-chart-header/AnalyticsChartRenderLimitModal.vue
index 9da495ce24..06147218c1 100644
--- a/apps/frontend/src/components/analytics-dashboard/analytics-chart/analytics-chart-header/AnalyticsChartRenderLimitModal.vue
+++ b/apps/frontend/src/components/analytics-dashboard/analytics-chart/analytics-chart-header/AnalyticsChartRenderLimitModal.vue
@@ -12,23 +12,19 @@
 
 		<template #actions>
 			<div class="flex justify-end gap-2">
-				<ButtonStyled type="transparent">
-					<button @click="modal?.hide()">
-						{{ formatMessage(analyticsChartMessages.cancelButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="orange">
-					<button class="!shadow-none" @click="confirm">
-						{{ formatMessage(analyticsChartMessages.showAll) }}
-					</button>
-				</ButtonStyled>
+				<Button type="quiet" @click="modal?.hide()">
+					{{ formatMessage(analyticsChartMessages.cancelButton) }}
+				</Button>
+				<Button type="colored" color="orange" @click="confirm">
+					{{ formatMessage(analyticsChartMessages.showAll) }}
+				</Button>
 			</div>
 		</template>
 	</NewModal>
 </template>
 
 <script setup lang="ts">
-import { ButtonStyled, NewModal, useVIntl } from '@modrinth/ui'
+import { Button, NewModal, useVIntl } from '@modrinth/ui'
 
 import { analyticsChartMessages } from '../../analytics-messages'
 
diff --git a/apps/frontend/src/components/analytics-dashboard/analytics-table/index.vue b/apps/frontend/src/components/analytics-dashboard/analytics-table/index.vue
index 2b625b3a9b..fd26b3c292 100644
--- a/apps/frontend/src/components/analytics-dashboard/analytics-table/index.vue
+++ b/apps/frontend/src/components/analytics-dashboard/analytics-table/index.vue
@@ -31,23 +31,22 @@
 							wrapper-class="w-full sm:w-64"
 							@focusin="selectSearchInputText"
 						/>
-						<ButtonStyled>
-							<OverflowMenu
-								class="!shadow-none"
-								:options="csvExportOptions"
-								:disabled="isDataLoading || filteredRows.length === 0"
-							>
-								<DownloadIcon />
-								{{ formatMessage(analyticsTableMessages.exportCsvButton) }}
-								<DropdownIcon />
-								<template #cumulative-csv>
-									{{ formatMessage(analyticsTableMessages.cumulativeCsv) }}
-								</template>
-								<template #grouped-csv>
-									{{ formatMessage(analyticsTableMessages.groupedCsv, { groupBy: groupByLabel }) }}
-								</template>
-							</OverflowMenu>
-						</ButtonStyled>
+						<TeleportOverflowMenu
+							label="More options"
+							class="!w-auto !rounded-xl !px-2.5"
+							:options="csvExportOptions"
+							:disabled="isDataLoading || filteredRows.length === 0"
+						>
+							<DownloadIcon />
+							{{ formatMessage(analyticsTableMessages.exportCsvButton) }}
+							<DropdownIcon />
+							<template #cumulative-csv>
+								{{ formatMessage(analyticsTableMessages.cumulativeCsv) }}
+							</template>
+							<template #grouped-csv>
+								{{ formatMessage(analyticsTableMessages.groupedCsv, { groupBy: groupByLabel }) }}
+							</template>
+						</TeleportOverflowMenu>
 					</div>
 				</div>
 			</template>
@@ -191,9 +190,8 @@
 
 <script setup lang="ts">
 import { DownloadIcon, DropdownIcon, SearchIcon, UserIcon } from '@modrinth/assets'
+import { TeleportOverflowMenu } from '@modrinth/ui'
 import {
-	ButtonStyled,
-	OverflowMenu,
 	type OverflowMenuOption,
 	Pagination,
 	StyledInput,
@@ -370,10 +368,12 @@ const csvExportOptions = computed<OverflowMenuOption[]>(() => {
 		return [
 			{
 				id: 'cumulative-csv',
+				label: formatMessage(analyticsTableMessages.cumulativeCsv),
 				action: () => downloadCsv('breakdown_only'),
 			},
 			{
 				id: 'grouped-csv',
+				label: formatMessage(analyticsTableMessages.groupedCsv, { groupBy: groupByLabel.value }),
 				action: () => downloadCsv('date_breakdown'),
 			},
 		]
@@ -384,6 +384,10 @@ const csvExportOptions = computed<OverflowMenuOption[]>(() => {
 	return [
 		{
 			id: mode === 'date_breakdown' ? 'grouped-csv' : 'cumulative-csv',
+			label:
+				mode === 'date_breakdown'
+					? formatMessage(analyticsTableMessages.groupedCsv, { groupBy: groupByLabel.value })
+					: formatMessage(analyticsTableMessages.cumulativeCsv),
 			action: () => downloadCsv(mode),
 		},
 	]
diff --git a/apps/frontend/src/components/analytics-dashboard/index.vue b/apps/frontend/src/components/analytics-dashboard/index.vue
index 6dea6eab4a..0d00c95b35 100644
--- a/apps/frontend/src/components/analytics-dashboard/index.vue
+++ b/apps/frontend/src/components/analytics-dashboard/index.vue
@@ -6,25 +6,23 @@
 					{{ formatMessage(analyticsMessages.title) }}
 				</span>
 				<div class="flex flex-wrap items-center justify-end gap-2">
-					<ButtonStyled type="transparent">
-						<button
-							type="button"
-							:disabled="isAnalyticsQueryBuilderDefault"
-							@click="resetAnalyticsQueryBuilder"
-						>
-							{{ formatMessage(analyticsMessages.resetButton) }}
-						</button>
-					</ButtonStyled>
-					<ButtonStyled type="outlined">
-						<button
-							type="button"
-							:disabled="projects.length === 0 || !fetchRequest || isRefetching"
-							@click="refreshAnalyticsQuery"
-						>
-							<RefreshCwIcon :class="isRefetching ? 'animate-spin' : ''" />
-							{{ formatMessage(analyticsMessages.refreshButton) }}
-						</button>
-					</ButtonStyled>
+					<Button
+						type="quiet"
+						native-type="button"
+						:disabled="isAnalyticsQueryBuilderDefault"
+						@click="resetAnalyticsQueryBuilder"
+					>
+						{{ formatMessage(analyticsMessages.resetButton) }}
+					</Button>
+					<Button
+						type="outlined"
+						native-type="button"
+						:disabled="projects.length === 0 || !fetchRequest || isRefetching"
+						@click="refreshAnalyticsQuery"
+					>
+						<RefreshCwIcon :class="isRefetching ? 'animate-spin' : ''" />
+						{{ formatMessage(analyticsMessages.refreshButton) }}
+					</Button>
 				</div>
 			</div>
 			<QueryBuilder />
@@ -37,7 +35,7 @@
 
 <script setup lang="ts">
 import { RefreshCwIcon } from '@modrinth/assets'
-import { ButtonStyled, injectProjectPageContext, useVIntl } from '@modrinth/ui'
+import { Button, injectProjectPageContext, useVIntl } from '@modrinth/ui'
 
 import {
 	createAnalyticsDashboardContext,
diff --git a/apps/frontend/src/components/analytics-dashboard/query-builder/QueryFilter.vue b/apps/frontend/src/components/analytics-dashboard/query-builder/QueryFilter.vue
index 464fc9c0c0..77c48f4daa 100644
--- a/apps/frontend/src/components/analytics-dashboard/query-builder/QueryFilter.vue
+++ b/apps/frontend/src/components/analytics-dashboard/query-builder/QueryFilter.vue
@@ -7,6 +7,7 @@
 		:show-preview-filter-icon="showPreviewFilterIcon"
 		:preview-trigger-class="previewTriggerClass"
 		:add-button-class="addButtonClass"
+		:add-button-size="addButtonSize"
 		:clear-label="formatMessage(analyticsMessages.resetButton)"
 		:add-label="resolvedAddLabel"
 		checkbox-position="right"
@@ -199,6 +200,7 @@
 import { BoxIcon, UserIcon } from '@modrinth/assets'
 import {
 	buildDependentsSearchFilters,
+	type ButtonSize,
 	DropdownFilterBar,
 	type DropdownFilterBarCategory,
 	type DropdownFilterBarOption,
@@ -273,6 +275,7 @@ const props = withDefaults(
 		showPreviewFilterIcon?: boolean
 		previewTriggerClass?: string
 		addButtonClass?: string
+		addButtonSize?: ButtonSize
 		showClearAction?: boolean
 	}>(),
 	{
diff --git a/apps/frontend/src/components/analytics-dashboard/query-builder/TimeframePicker.vue b/apps/frontend/src/components/analytics-dashboard/query-builder/TimeframePicker.vue
index 11cc668208..06a0f25464 100644
--- a/apps/frontend/src/components/analytics-dashboard/query-builder/TimeframePicker.vue
+++ b/apps/frontend/src/components/analytics-dashboard/query-builder/TimeframePicker.vue
@@ -9,6 +9,9 @@
 		:min-date="ANALYTICS_START_DATE_INPUT_VALUE"
 		:now-timestamp="queryRefreshTimestamp"
 		:trigger-class="triggerClass"
+		:trigger-type="triggerType"
+		:trigger-size="triggerSize"
+		:trigger-interaction="triggerInteraction"
 		@open="handleTimeframeOpen"
 		@commit="handleTimeframeCommit"
 		@apply="handleTimeframeApply"
@@ -23,6 +26,9 @@
 
 <script setup lang="ts">
 import {
+	type ButtonInteraction,
+	type ButtonSize,
+	type ButtonType,
 	type ComboboxOption,
 	TimeFramePicker as BaseTimeFramePicker,
 	type TimeFramePickerSelection,
@@ -58,6 +64,9 @@ const {
 
 defineProps<{
 	triggerClass?: string
+	triggerType?: ButtonType
+	triggerSize?: ButtonSize
+	triggerInteraction?: ButtonInteraction
 }>()
 
 const draftSelectedGroupBy = ref(selectedGroupBy.value)
diff --git a/apps/frontend/src/components/analytics-dashboard/query-builder/index.vue b/apps/frontend/src/components/analytics-dashboard/query-builder/index.vue
index 1d43dbd9fb..d32a31d26e 100644
--- a/apps/frontend/src/components/analytics-dashboard/query-builder/index.vue
+++ b/apps/frontend/src/components/analytics-dashboard/query-builder/index.vue
@@ -16,6 +16,7 @@
 				:max-tag-rows="1"
 				:trigger-class="analyticsQueryChipTriggerClass"
 				fit-content
+				trigger-type="base"
 				checkbox-position="right"
 				show-selection-actions
 				@open="handleProjectSelectOpen"
@@ -32,7 +33,7 @@
 							decoding="async"
 						/>
 						<LayersIcon v-else class="size-5 shrink-0 text-primary" />
-						<span class="min-w-0 flex-1 truncate px-0.5 font-semibold text-primary">
+						<span class="min-w-0 flex-1 truncate px-0.5 font-semibold text-inherit">
 							{{ selectedProjectLabel }}
 						</span>
 						<ChevronLeftIcon
@@ -145,6 +146,7 @@
 				:dropdown-min-width="QUERY_BUILDER_DROPDOWN_MIN_WIDTH"
 				:display-value="selectedGroupByLabel"
 				:trigger-class="analyticsQueryChipTriggerClass"
+				trigger-type="base"
 			>
 				<template #prefix>
 					<ClockIcon class="size-5 shrink-0 text-primary" />
@@ -160,6 +162,7 @@
 				:dropdown-min-width="QUERY_BUILDER_DROPDOWN_MIN_WIDTH"
 				:trigger-class="analyticsQueryChipTriggerClass"
 				fit-content
+				trigger-type="base"
 				checkbox-position="right"
 				:placeholder="formatMessage(analyticsMessages.none)"
 				show-selection-actions
@@ -170,7 +173,7 @@
 					<div class="flex min-h-7 min-w-0 max-w-full flex-1 items-center gap-1.5 pr-1">
 						<BlocksIcon class="size-5 shrink-0 text-primary" />
 						<span
-							class="min-w-0 flex-1 truncate px-0.5 font-semibold text-primary"
+							class="min-w-0 flex-1 truncate px-0.5 font-semibold text-inherit"
 							:title="mobileSelectedBreakdownLabel"
 						>
 							{{ mobileSelectedBreakdownLabel }}
@@ -191,6 +194,7 @@
 				show-preview-filter-icon
 				:show-clear-action="false"
 				:add-button-class="analyticsQueryAddFilterButtonClass"
+				add-button-size="lg"
 			/>
 		</div>
 
@@ -214,6 +218,7 @@
 						:searchable="projectOptions.length > 6"
 						fuzzy-search
 						:max-tag-rows="1"
+						trigger-type="base"
 						checkbox-position="right"
 						show-selection-actions
 						@open="handleProjectSelectOpen"
@@ -243,7 +248,7 @@
 										class="size-5 shrink-0 text-primary"
 									/>
 									<BoxIcon v-else class="size-5 shrink-0 text-primary" />
-									<span class="min-w-0 flex-1 truncate px-1.5 font-semibold text-primary">
+									<span class="min-w-0 flex-1 truncate px-1.5 font-semibold text-inherit">
 										{{ selectedProjectLabel }}
 									</span>
 								</div>
@@ -372,18 +377,19 @@
 							:options="groupByOptions"
 							:max-height="QUERY_BUILDER_DROPDOWN_MAX_HEIGHT"
 							:dropdown-min-width="QUERY_BUILDER_DROPDOWN_MIN_WIDTH"
+							trigger-type="base"
 						/>
 					</div>
 				</div>
-				<ButtonStyled v-if="!isTimeframeAndGroupByDefault" type="transparent">
-					<button
-						type="button"
-						:disabled="isTimeframeAndGroupByDefault"
-						@click="resetTimeframeAndGroupBy"
-					>
-						{{ formatMessage(analyticsMessages.resetButton) }}
-					</button>
-				</ButtonStyled>
+				<Button
+					v-if="!isTimeframeAndGroupByDefault"
+					type="quiet"
+					native-type="button"
+					:disabled="isTimeframeAndGroupByDefault"
+					@click="resetTimeframeAndGroupBy"
+				>
+					{{ formatMessage(analyticsMessages.resetButton) }}
+				</Button>
 			</div>
 
 			<div class="flex flex-wrap items-start gap-2">
@@ -403,6 +409,7 @@
 									:max-height="QUERY_BUILDER_DROPDOWN_MAX_HEIGHT"
 									:dropdown-width="QUERY_BUILDER_DROPDOWN_MIN_WIDTH"
 									:dropdown-min-width="QUERY_BUILDER_DROPDOWN_MIN_WIDTH"
+									trigger-type="base"
 									checkbox-position="right"
 									:placeholder="formatMessage(analyticsMessages.none)"
 									show-selection-actions
@@ -412,7 +419,7 @@
 									<template #input-content="{ isOpen, openDirection }">
 										<div class="flex min-h-7 min-w-0 flex-1 items-center gap-1.5 pr-1">
 											<span
-												class="min-w-0 flex-1 truncate font-semibold text-primary"
+												class="min-w-0 flex-1 truncate font-semibold text-inherit"
 												:title="selectedBreakdownLabel"
 											>
 												{{ selectedBreakdownLabel }}
@@ -453,8 +460,8 @@ import {
 	LayersIcon,
 	UserIcon,
 } from '@modrinth/assets'
+import { Button } from '@modrinth/ui'
 import {
-	ButtonStyled,
 	Combobox,
 	type ComboboxOption,
 	MultiSelect,
@@ -504,7 +511,7 @@ import TimeFramePicker from './TimeframePicker.vue'
 const QUERY_BUILDER_DROPDOWN_MAX_HEIGHT = 500
 const QUERY_BUILDER_DROPDOWN_MIN_WIDTH = '14rem'
 const analyticsQueryChipTriggerClass = 'h-10 '
-const analyticsQueryAddFilterButtonClass = '!h-10 max-w-full !w-max !px-3.5 flex !gap-2'
+const analyticsQueryAddFilterButtonClass = 'max-w-full !w-max !px-3.5 flex !gap-2'
 const projectOptionCollator = new Intl.Collator(undefined, { numeric: true, sensitivity: 'base' })
 type ProjectSelectionPreset = 'user' | 'all'
 
diff --git a/apps/frontend/src/components/analytics-dashboard/stat-cards/StatCards.vue b/apps/frontend/src/components/analytics-dashboard/stat-cards/StatCards.vue
index 601dfaf89e..324eeaa6aa 100644
--- a/apps/frontend/src/components/analytics-dashboard/stat-cards/StatCards.vue
+++ b/apps/frontend/src/components/analytics-dashboard/stat-cards/StatCards.vue
@@ -12,12 +12,16 @@
 				{{ formatMessage(analyticsStatCardMessages.monetizationBannerBody) }}
 			</div>
 			<template #actions>
-				<ButtonStyled color="blue">
-					<a href="https://modrinth.com/legal/cmp-info" target="_blank" class="w-fit !px-4">
-						{{ formatMessage(analyticsStatCardMessages.monetizationBannerLearnMore) }}
-						<RightArrowIcon aria-hidden="true" />
-					</a>
-				</ButtonStyled>
+				<ButtonLink
+					type="colored"
+					color="blue"
+					href="https://modrinth.com/legal/cmp-info"
+					target="_blank"
+					class="w-fit !px-4"
+				>
+					{{ formatMessage(analyticsStatCardMessages.monetizationBannerLearnMore) }}
+					<RightArrowIcon aria-hidden="true" />
+				</ButtonLink>
 			</template>
 		</Admonition>
 		<div class="grid grid-cols-2 gap-3 lg:grid-cols-4">
@@ -39,7 +43,7 @@
 
 <script setup lang="ts">
 import { RightArrowIcon } from '@modrinth/assets'
-import { Admonition, ButtonStyled, useFormatNumber, useVIntl } from '@modrinth/ui'
+import { Admonition, ButtonLink, useFormatNumber, useVIntl } from '@modrinth/ui'
 import { useLocalStorage } from '@vueuse/core'
 
 import {
diff --git a/apps/frontend/src/components/ui/Accordion.vue b/apps/frontend/src/components/ui/Accordion.vue
index f255fb485a..b627e18169 100644
--- a/apps/frontend/src/components/ui/Accordion.vue
+++ b/apps/frontend/src/components/ui/Accordion.vue
@@ -1,13 +1,24 @@
 <template>
 	<div>
-		<ButtonStyled v-if="!!slots.title" :type="type">
-			<button class="!w-full" @click="() => (isOpen ? close() : open())">
-				<slot name="title" /><DropdownIcon
-					class="ml-auto size-5 text-contrast transition-transform duration-300"
-					:class="{ 'rotate-180': isOpen }"
-				/>
-			</button>
-		</ButtonStyled>
+		<Button
+			v-if="!!slots.title"
+			:type="
+				type === 'transparent'
+					? 'quiet'
+					: type === 'standard'
+						? 'base'
+						: type === 'highlight' || type === 'highlight-colored-text' || type === 'chip'
+							? 'base'
+							: type
+			"
+			class="!w-full"
+			@click="() => (isOpen ? close() : open())"
+		>
+			<slot name="title" /><DropdownIcon
+				class="ml-auto size-5 text-contrast transition-transform duration-300"
+				:class="{ 'rotate-180': isOpen }"
+			/>
+		</Button>
 		<div class="accordion-content" :class="{ open: isOpen }">
 			<div>
 				<div :class="{ 'mt-2': !!slots.title }" v-bind="$attrs" :inert="!isOpen">
@@ -20,7 +31,7 @@
 
 <script setup lang="ts">
 import { DropdownIcon } from '@modrinth/assets'
-import { ButtonStyled } from '@modrinth/ui'
+import { Button } from '@modrinth/ui'
 
 const props = withDefaults(
 	defineProps<{
diff --git a/apps/frontend/src/components/ui/AuthorizationCard.vue b/apps/frontend/src/components/ui/AuthorizationCard.vue
index 58eee3d8cb..37507e272b 100644
--- a/apps/frontend/src/components/ui/AuthorizationCard.vue
+++ b/apps/frontend/src/components/ui/AuthorizationCard.vue
@@ -40,12 +40,10 @@
 					</div>
 				</div>
 				<div>
-					<ButtonStyled color="red">
-						<button @click="emit('revoke', authorization.app_id)">
-							<XCircleIcon />
-							{{ formatMessage(messages.revokeAction) }}
-						</button>
-					</ButtonStyled>
+					<Button type="colored" color="red" @click="emit('revoke', authorization.app_id)">
+						<XCircleIcon />
+						{{ formatMessage(messages.revokeAction) }}
+					</Button>
 				</div>
 			</div>
 			<div v-if="showUnofficialDisclosure" class="flex items-center gap-1 text-orange">
@@ -82,7 +80,7 @@ import type { Labrinth } from '@modrinth/api-client'
 import { BadgeCheckIcon, CheckIcon, IssuesIcon, XCircleIcon } from '@modrinth/assets'
 import {
 	Avatar,
-	ButtonStyled,
+	Button,
 	commonMessages,
 	defineMessages,
 	IntlFormatted,
diff --git a/apps/frontend/src/components/ui/ConfirmTransferOrgModal.vue b/apps/frontend/src/components/ui/ConfirmTransferOrgModal.vue
index e4f62b43f0..606be33b05 100644
--- a/apps/frontend/src/components/ui/ConfirmTransferOrgModal.vue
+++ b/apps/frontend/src/components/ui/ConfirmTransferOrgModal.vue
@@ -57,18 +57,14 @@
 		</div>
 		<template #actions>
 			<div class="flex justify-end gap-2">
-				<ButtonStyled>
-					<button @click="hide">
-						<XIcon />
-						Cancel
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="red">
-					<button :disabled="!isConfirmEnabled" @click="onConfirmClick">
-						<TransferIcon />
-						Transfer ownership
-					</button>
-				</ButtonStyled>
+				<Button @click="hide">
+					<XIcon />
+					Cancel
+				</Button>
+				<Button type="colored" color="red" :disabled="!isConfirmEnabled" @click="onConfirmClick">
+					<TransferIcon />
+					Transfer ownership
+				</Button>
 			</div>
 		</template>
 	</NewModal>
@@ -76,7 +72,7 @@
 
 <script setup lang="ts">
 import { RightArrowIcon, TransferIcon, XIcon } from '@modrinth/assets'
-import { Admonition, Avatar, ButtonStyled, NewModal, StyledInput } from '@modrinth/ui'
+import { Admonition, Avatar, Button, NewModal, StyledInput } from '@modrinth/ui'
 import { computed, ref } from 'vue'
 
 const props = defineProps<{
diff --git a/apps/frontend/src/components/ui/ConfirmTransferProjectModal.vue b/apps/frontend/src/components/ui/ConfirmTransferProjectModal.vue
index d47a619fa0..47806997c1 100644
--- a/apps/frontend/src/components/ui/ConfirmTransferProjectModal.vue
+++ b/apps/frontend/src/components/ui/ConfirmTransferProjectModal.vue
@@ -64,18 +64,14 @@
 		</div>
 		<template #actions>
 			<div class="flex justify-end gap-2">
-				<ButtonStyled>
-					<button @click="hide">
-						<XIcon />
-						Cancel
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="red">
-					<button :disabled="!isConfirmEnabled" @click="onConfirmClick">
-						<TransferIcon />
-						Transfer ownership
-					</button>
-				</ButtonStyled>
+				<Button @click="hide">
+					<XIcon />
+					Cancel
+				</Button>
+				<Button type="colored" color="red" :disabled="!isConfirmEnabled" @click="onConfirmClick">
+					<TransferIcon />
+					Transfer ownership
+				</Button>
 			</div>
 		</template>
 	</NewModal>
@@ -83,7 +79,7 @@
 
 <script setup lang="ts">
 import { RightArrowIcon, TransferIcon, XIcon } from '@modrinth/assets'
-import { Admonition, Avatar, ButtonStyled, NewModal, StyledInput } from '@modrinth/ui'
+import { Admonition, Avatar, Button, NewModal, StyledInput } from '@modrinth/ui'
 import { computed, ref } from 'vue'
 
 const props = defineProps<{
diff --git a/apps/frontend/src/components/ui/ModrinthFooter.vue b/apps/frontend/src/components/ui/ModrinthFooter.vue
index af071d7fc7..4c47ca7742 100644
--- a/apps/frontend/src/components/ui/ModrinthFooter.vue
+++ b/apps/frontend/src/components/ui/ModrinthFooter.vue
@@ -7,9 +7,9 @@ import {
 	ToggleRightIcon,
 	TwitterIcon,
 } from '@modrinth/assets'
+import { ButtonLink } from '@modrinth/ui'
 import {
 	AutoLink,
-	ButtonStyled,
 	defineMessage,
 	defineMessages,
 	injectNotificationManager,
@@ -271,31 +271,30 @@ function developerModeIncrement() {
 							class="text-logo button-base h-6 w-auto text-contrast lg:h-8"
 							@click="developerModeIncrement()"
 						/>
-						<ButtonStyled v-if="flags.developerMode" circular type="transparent" color="brand">
-							<nuxt-link
-								v-tooltip="formatMessage(commonSettingsMessages.featureFlags)"
-								to="/settings/flags"
-							>
-								<ToggleRightIcon />
-							</nuxt-link>
-						</ButtonStyled>
+						<ButtonLink
+							v-if="flags.developerMode"
+							v-tooltip="formatMessage(commonSettingsMessages.featureFlags)"
+							type="quiet"
+							color="brand"
+							to="/settings/flags"
+							class="!w-9 !rounded-full !px-0"
+						>
+							<ToggleRightIcon />
+						</ButtonLink>
 					</div>
 					<div class="flex flex-wrap justify-center gap-px sm:-mx-2">
-						<ButtonStyled
+						<ButtonLink
 							v-for="(social, index) in socialLinks"
 							:key="`footer-social-${index}`"
-							circular
-							type="transparent"
+							v-tooltip="formatMessage(social.label)"
+							type="quiet"
+							:href="social.href"
+							target="_blank"
+							:rel="`noopener${social.rel ? ` ${social.rel}` : ''}`"
+							class="!w-9 !rounded-full !px-0"
 						>
-							<a
-								v-tooltip="formatMessage(social.label)"
-								:href="social.href"
-								target="_blank"
-								:rel="`noopener${social.rel ? ` ${social.rel}` : ''}`"
-							>
-								<component :is="social.icon" class="h-5 w-5" />
-							</a>
-						</ButtonStyled>
+							<component :is="social.icon" class="h-5 w-5" />
+						</ButtonLink>
 					</div>
 					<div class="mt-auto flex flex-wrap justify-center gap-3 md:flex-col">
 						<p class="m-0">
diff --git a/apps/frontend/src/components/ui/NewsletterButton.vue b/apps/frontend/src/components/ui/NewsletterButton.vue
index fb092bffaf..c00872c48d 100644
--- a/apps/frontend/src/components/ui/NewsletterButton.vue
+++ b/apps/frontend/src/components/ui/NewsletterButton.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { CheckIcon, MailIcon } from '@modrinth/assets'
-import { ButtonStyled, defineMessages, injectModrinthClient, useVIntl } from '@modrinth/ui'
+import { Button, defineMessages, injectModrinthClient, useVIntl } from '@modrinth/ui'
 import { useQuery, useQueryClient } from '@tanstack/vue-query'
 import { computed, ref } from 'vue'
 
@@ -61,12 +61,16 @@ async function subscribe() {
 </script>
 
 <template>
-	<ButtonStyled v-if="isSuccess && showSubscribeButton" color="brand" type="outlined">
-		<button v-tooltip="formatMessage(messages.tooltipSubscribe)" @click="subscribe">
-			<template v-if="!showSubscriptionConfirmation">
-				<MailIcon /> {{ formatMessage(messages.subscribe) }}
-			</template>
-			<template v-else> <CheckIcon /> {{ formatMessage(messages.subscribed) }} </template>
-		</button>
-	</ButtonStyled>
+	<Button
+		v-if="isSuccess && showSubscribeButton"
+		v-tooltip="formatMessage(messages.tooltipSubscribe)"
+		type="outlined"
+		class="!text-brand !shadow-[inset_0_0_0_1px_var(--color-brand)] [&>svg]:!text-brand"
+		@click="subscribe"
+	>
+		<template v-if="!showSubscriptionConfirmation">
+			<MailIcon /> {{ formatMessage(messages.subscribe) }}
+		</template>
+		<template v-else> <CheckIcon /> {{ formatMessage(messages.subscribed) }} </template>
+	</Button>
 </template>
diff --git a/apps/frontend/src/components/ui/NotificationItem.vue b/apps/frontend/src/components/ui/NotificationItem.vue
index 1bbac8bf38..4f3cfa001b 100644
--- a/apps/frontend/src/components/ui/NotificationItem.vue
+++ b/apps/frontend/src/components/ui/NotificationItem.vue
@@ -46,18 +46,18 @@
 					class="flex flex-wrap items-center gap-3"
 					:class="{ 'gap-2': compact }"
 				>
-					<ButtonStyled color="brand">
-						<button @click="performActionByTitle(notification, 'Accept')">
-							<CheckIcon />
-							Accept
-						</button>
-					</ButtonStyled>
-					<ButtonStyled color="red">
-						<button @click="performActionByTitle(notification, 'Deny')">
-							<XIcon />
-							Decline
-						</button>
-					</ButtonStyled>
+					<Button
+						type="colored"
+						color="brand"
+						@click="performActionByTitle(notification, 'Accept')"
+					>
+						<CheckIcon />
+						Accept
+					</Button>
+					<Button type="colored" color="red" @click="performActionByTitle(notification, 'Deny')">
+						<XIcon />
+						Decline
+					</Button>
 				</div>
 				<div
 					class="mt-1 flex flex-wrap items-center gap-x-3 gap-y-1 text-[var(--color-text-secondary)]"
@@ -276,9 +276,53 @@
 			</span>
 			<div v-if="compact" class="notification__actions">
 				<template v-if="type === 'team_invite' || type === 'organization_invite'">
-					<ButtonStyled circular color="brand" type="transparent">
-						<button
-							v-tooltip="`Accept`"
+					<IconButton
+						v-tooltip="`Accept`"
+						type="quiet"
+						color="brand"
+						:label="`Accept`"
+						@click="
+							() => {
+								acceptTeamInvite(notification.body.team_id)
+								read()
+							}
+						"
+					>
+						<CheckIcon />
+					</IconButton>
+					<IconButton
+						v-tooltip="`Decline`"
+						type="quiet"
+						color="red"
+						:label="`Decline`"
+						@click="
+							() => {
+								removeSelfFromTeam(notification.body.team_id)
+								read()
+							}
+						"
+					>
+						<XIcon />
+					</IconButton>
+				</template>
+				<IconButton
+					v-else-if="!notification.read"
+					v-tooltip="`Mark as read`"
+					type="quiet"
+					:label="`Mark as read`"
+					@click="read()"
+				>
+					<XIcon />
+				</IconButton>
+			</div>
+			<div v-else class="notification__actions">
+				<div v-if="type !== null" class="input-group">
+					<template
+						v-if="(type === 'team_invite' || type === 'organization_invite') && !notification.read"
+					>
+						<Button
+							type="colored"
+							color="brand"
 							@click="
 								() => {
 									acceptTeamInvite(notification.body.team_id)
@@ -287,11 +331,11 @@
 							"
 						>
 							<CheckIcon />
-						</button>
-					</ButtonStyled>
-					<ButtonStyled circular color="red" type="transparent">
-						<button
-							v-tooltip="`Decline`"
+							Accept
+						</Button>
+						<Button
+							type="colored"
+							color="red"
 							@click="
 								() => {
 									removeSelfFromTeam(notification.body.team_id)
@@ -300,75 +344,40 @@
 							"
 						>
 							<XIcon />
-						</button>
-					</ButtonStyled>
-				</template>
-				<ButtonStyled v-else-if="!notification.read" circular type="transparent">
-					<button v-tooltip="`Mark as read`" @click="read()">
-						<XIcon />
-					</button>
-				</ButtonStyled>
-			</div>
-			<div v-else class="notification__actions">
-				<div v-if="type !== null" class="input-group">
-					<template
-						v-if="(type === 'team_invite' || type === 'organization_invite') && !notification.read"
-					>
-						<ButtonStyled color="brand">
-							<button
-								@click="
-									() => {
-										acceptTeamInvite(notification.body.team_id)
-										read()
-									}
-								"
-							>
-								<CheckIcon />
-								Accept
-							</button>
-						</ButtonStyled>
-						<ButtonStyled color="red">
-							<button
-								@click="
-									() => {
-										removeSelfFromTeam(notification.body.team_id)
-										read()
-									}
-								"
-							>
-								<XIcon />
-								Decline
-							</button>
-						</ButtonStyled>
+							Decline
+						</Button>
 					</template>
-					<ButtonStyled v-else-if="!notification.read">
-						<button @click="read()">
-							<CheckIcon />
-							Mark as read
-						</button>
-					</ButtonStyled>
+					<Button v-else-if="!notification.read" @click="read()">
+						<CheckIcon />
+						Mark as read
+					</Button>
 					<CopyCode v-if="flags.developerMode" :text="notification.id" />
 				</div>
 				<div v-else class="input-group">
-					<ButtonStyled v-if="notification.link && notification.link !== '#'">
-						<nuxt-link :to="notification.link" target="_blank">
-							<ExternalIcon />
-							Open link
-						</nuxt-link>
-					</ButtonStyled>
-					<ButtonStyled v-for="(action, actionIndex) in notification.actions" :key="actionIndex">
-						<button @click="performAction(notification, actionIndex)">
-							<CheckIcon v-if="action.title === 'Accept'" />
-							<XIcon v-else-if="action.title === 'Deny'" />
-							{{ action.title }}
-						</button>
-					</ButtonStyled>
-					<ButtonStyled v-if="notification.actions.length === 0 && !notification.read">
-						<button @click="performAction(notification, null)">
-							<CheckIcon />
-							Mark as read
-						</button>
-					</ButtonStyled>
+					<ButtonLink
+						v-if="notification.link && notification.link !== '#'"
+						:to="notification.link"
+						target="_blank"
+					>
+						<ExternalIcon />
+						Open link
+					</ButtonLink>
+					<Button
+						v-for="(action, actionIndex) in notification.actions"
+						:key="actionIndex"
+						@click="performAction(notification, actionIndex)"
+					>
+						<CheckIcon v-if="action.title === 'Accept'" />
+						<XIcon v-else-if="action.title === 'Deny'" />
+						{{ action.title }}
+					</Button>
+					<Button
+						v-if="notification.actions.length === 0 && !notification.read"
+						@click="performAction(notification, null)"
+					>
+						<CheckIcon />
+						Mark as read
+					</Button>
 					<CopyCode v-if="flags.developerMode" :text="notification.id" />
 				</div>
 			</div>
@@ -390,10 +399,12 @@ import {
 } from '@modrinth/assets'
 import {
 	Avatar,
-	ButtonStyled,
+	Button,
+	ButtonLink,
 	Categories,
 	CopyCode,
 	DoubleIcon,
+	IconButton,
 	injectModrinthClient,
 	injectNotificationManager,
 	ProjectStatusBadge,
diff --git a/apps/frontend/src/components/ui/OrganizationPageHeader.vue b/apps/frontend/src/components/ui/OrganizationPageHeader.vue
index c5f74542df..6063423a50 100644
--- a/apps/frontend/src/components/ui/OrganizationPageHeader.vue
+++ b/apps/frontend/src/components/ui/OrganizationPageHeader.vue
@@ -38,21 +38,19 @@
 
 		<template #actions>
 			<PageHeaderActions>
-				<ButtonStyled v-if="canManage" size="large">
-					<nuxt-link :to="`/organization/${organization.slug}/settings`">
-						<SettingsIcon />
-						{{ formatMessage(messages.manage) }}
-					</nuxt-link>
-				</ButtonStyled>
-				<ButtonStyled circular size="large" type="transparent">
-					<TeleportOverflowMenu
-						:options="moreActions"
-						:tooltip="formatMessage(commonMessages.moreOptionsButton)"
-						:aria-label="formatMessage(commonMessages.moreOptionsButton)"
-					>
-						<MoreVerticalIcon />
-					</TeleportOverflowMenu>
-				</ButtonStyled>
+				<ButtonLink v-if="canManage" size="xl" :to="`/organization/${organization.slug}/settings`">
+					<SettingsIcon />
+					{{ formatMessage(messages.manage) }}
+				</ButtonLink>
+				<TeleportOverflowMenu
+					type="quiet"
+					size="xl"
+					:label="formatMessage(commonMessages.moreOptionsButton)"
+					:tooltip="formatMessage(commonMessages.moreOptionsButton)"
+					:options="moreActions"
+				>
+					<MoreVerticalIcon />
+				</TeleportOverflowMenu>
 			</PageHeaderActions>
 		</template>
 	</PageHeader>
@@ -68,18 +66,17 @@ import {
 	SettingsIcon,
 	UsersIcon,
 } from '@modrinth/assets'
+import { ButtonLink, TeleportOverflowMenu } from '@modrinth/ui'
 import {
 	Avatar,
-	ButtonStyled,
 	commonMessages,
 	defineMessages,
+	type OverflowMenuOption,
 	PageHeader,
 	PageHeaderActions,
 	PageHeaderBadgeItem,
 	PageHeaderMetadata,
 	PageHeaderMetadataNumberItem,
-	TeleportOverflowMenu,
-	type TeleportOverflowMenuItem,
 	useFormatNumber,
 	useVIntl,
 } from '@modrinth/ui'
@@ -135,7 +132,7 @@ const emit = defineEmits<{
 const { formatMessage } = useVIntl()
 const formatNumber = useFormatNumber()
 
-const moreActions = computed<TeleportOverflowMenuItem[]>(() => [
+const moreActions = computed<OverflowMenuOption[]>(() => [
 	{
 		id: 'manage-projects',
 		label: formatMessage(messages.manageProjects),
@@ -143,10 +140,7 @@ const moreActions = computed<TeleportOverflowMenuItem[]>(() => [
 		action: () => emit('manageProjects'),
 		shown: props.canManage,
 	},
-	{
-		divider: true,
-		shown: props.canManage,
-	},
+	{ type: 'divider', shown: props.canManage },
 	{
 		id: 'copy-id',
 		label: formatMessage(commonMessages.copyIdButton),
diff --git a/apps/frontend/src/components/ui/OrganizationProjectTransferModal.vue b/apps/frontend/src/components/ui/OrganizationProjectTransferModal.vue
index 6f66486fd0..46524dbff5 100644
--- a/apps/frontend/src/components/ui/OrganizationProjectTransferModal.vue
+++ b/apps/frontend/src/components/ui/OrganizationProjectTransferModal.vue
@@ -65,38 +65,37 @@
 			</div>
 			<template #actions>
 				<div class="flex justify-end gap-2">
-					<ButtonStyled type="outlined">
-						<button @click="hide()">
-							<XIcon />
-							{{ formatMessage(commonMessages.cancelButton) }}
-						</button>
-					</ButtonStyled>
-					<ButtonStyled color="brand">
-						<button :disabled="selectedProjects.length === 0" @click="submitTransfer()">
-							<TransferIcon />
-							{{
-								formatMessage(messages.transferSelectedProjects, {
-									count: selectedProjects.length,
-								})
-							}}
-						</button>
-					</ButtonStyled>
+					<Button type="outlined" @click="hide()">
+						<XIcon />
+						{{ formatMessage(commonMessages.cancelButton) }}
+					</Button>
+					<Button
+						type="colored"
+						color="brand"
+						:disabled="selectedProjects.length === 0"
+						@click="submitTransfer()"
+					>
+						<TransferIcon />
+						{{
+							formatMessage(messages.transferSelectedProjects, {
+								count: selectedProjects.length,
+							})
+						}}
+					</Button>
 				</div>
 			</template>
 		</NewModal>
-		<ButtonStyled>
-			<button @click="show($event)">
-				<TransferIcon />
-				<span>{{ formatMessage(messages.transferProjectsTitle) }}</span>
-			</button>
-		</ButtonStyled>
+		<Button @click="show($event)">
+			<TransferIcon />
+			<span>{{ formatMessage(messages.transferProjectsTitle) }}</span>
+		</Button>
 	</div>
 </template>
 
 <script setup>
 import { BoxIcon, TransferIcon, XIcon } from '@modrinth/assets'
 import {
-	ButtonStyled,
+	Button,
 	Checkbox,
 	commonMessages,
 	CopyCode,
diff --git a/apps/frontend/src/components/ui/ProjectCollectionSaveButton.vue b/apps/frontend/src/components/ui/ProjectCollectionSaveButton.vue
index 34752468c0..d78f38c4fd 100644
--- a/apps/frontend/src/components/ui/ProjectCollectionSaveButton.vue
+++ b/apps/frontend/src/components/ui/ProjectCollectionSaveButton.vue
@@ -1,63 +1,67 @@
 <template>
-	<ButtonStyled size="large" circular>
-		<PopoutMenu
-			v-if="authUser"
-			:tooltip="
-				saved ? formatMessage(commonMessages.savedLabel) : formatMessage(commonMessages.saveButton)
-			"
-			from="top-right"
-			:aria-label="formatMessage(commonMessages.saveButton)"
-			:dropdown-id="`${baseId}-save`"
-		>
+	<TeleportPopoutMenu
+		v-if="authUser"
+		icon-only
+		size="xl"
+		:label="
+			saved ? formatMessage(commonMessages.savedLabel) : formatMessage(commonMessages.saveButton)
+		"
+		:tooltip="
+			saved ? formatMessage(commonMessages.savedLabel) : formatMessage(commonMessages.saveButton)
+		"
+		placement="top-end"
+	>
+		<template #trigger>
 			<BookmarkIcon aria-hidden="true" :fill="saved ? 'currentColor' : 'none'" />
-			<template #menu>
-				<StyledInput
-					v-model="displayCollectionsSearch"
-					:placeholder="formatMessage(commonMessages.searchPlaceholder)"
-					wrapper-class="menu-search"
-				/>
-				<div v-if="filteredCollections.length > 0" class="collections-list text-primary">
-					<Checkbox
-						v-for="option in filteredCollections"
-						:key="option.id"
-						:model-value="option.projects.includes(projectId)"
-						class="popout-checkbox"
-						@update:model-value="() => collectProject(option, projectId)"
-					>
-						{{ option.name }}
-					</Checkbox>
-				</div>
+		</template>
+		<template #panel>
+			<StyledInput
+				v-model="displayCollectionsSearch"
+				:placeholder="formatMessage(commonMessages.searchPlaceholder)"
+				wrapper-class="menu-search"
+			/>
+			<div v-if="filteredCollections.length > 0" class="collections-list text-primary">
+				<Checkbox
+					v-for="option in filteredCollections"
+					:key="option.id"
+					:model-value="option.projects.includes(projectId)"
+					class="popout-checkbox"
+					@update:model-value="() => collectProject(option, projectId)"
+				>
+					{{ option.name }}
+				</Checkbox>
+			</div>
 
-				<div v-else class="menu-text">
-					<p class="popout-text">{{ noCollectionsLabel }}</p>
-				</div>
-				<ButtonStyled>
-					<button class="mx-3 mb-3" @click="createCollection">
-						<PlusIcon aria-hidden="true" />
-						{{ createNewCollectionLabel }}
-					</button>
-				</ButtonStyled>
-			</template>
-		</PopoutMenu>
-		<nuxt-link
-			v-else
-			v-tooltip="formatMessage(commonMessages.saveButton)"
-			:to="signInRoute"
-			:aria-label="formatMessage(commonMessages.saveButton)"
-		>
-			<BookmarkIcon aria-hidden="true" />
-		</nuxt-link>
-	</ButtonStyled>
+			<div v-else class="menu-text">
+				<p class="popout-text">{{ noCollectionsLabel }}</p>
+			</div>
+			<Button class="mx-3 mb-3" @click="createCollection">
+				<PlusIcon aria-hidden="true" />
+				{{ createNewCollectionLabel }}
+			</Button>
+		</template>
+	</TeleportPopoutMenu>
+	<ButtonLink
+		v-else
+		v-tooltip="formatMessage(commonMessages.saveButton)"
+		size="xl"
+		:to="signInRoute"
+		:aria-label="formatMessage(commonMessages.saveButton)"
+		class="!w-12 !rounded-full !px-0"
+	>
+		<BookmarkIcon aria-hidden="true" />
+	</ButtonLink>
 </template>
 
 <script setup lang="ts">
 import { BookmarkIcon, PlusIcon } from '@modrinth/assets'
 import {
-	ButtonStyled,
+	Button,
+	ButtonLink,
 	Checkbox,
 	commonMessages,
-	PopoutMenu,
 	StyledInput,
+	TeleportPopoutMenu,
 	useVIntl,
 } from '@modrinth/ui'
 import { computed, ref } from 'vue'
diff --git a/apps/frontend/src/components/ui/ProjectDownloadModal/CompatibleVersionCard.vue b/apps/frontend/src/components/ui/ProjectDownloadModal/CompatibleVersionCard.vue
index c8b5bf66c8..db6addd2de 100644
--- a/apps/frontend/src/components/ui/ProjectDownloadModal/CompatibleVersionCard.vue
+++ b/apps/frontend/src/components/ui/ProjectDownloadModal/CompatibleVersionCard.vue
@@ -48,37 +48,34 @@
 				</span>
 			</div>
 		</div>
-		<ButtonStyled
+		<ButtonLink
 			v-if="primaryFile && showDownload"
-			:color="color"
-			:type="type"
-			:circular="circular"
+			v-tooltip="circular ? formatMessage(messages.download) : null"
+			:type="downloadButtonType"
+			:color="downloadButtonColor"
+			:href="primaryFileDownloadUrl"
+			:download="primaryFile.filename"
+			:aria-label="
+				formatMessage(messages.downloadVersion, {
+					version: version.version_number,
+				})
+			"
+			:class="circular ? '!w-9 !rounded-full !px-0' : undefined"
+			@click="emit('download')"
 		>
-			<a
-				v-tooltip="circular ? formatMessage(messages.download) : null"
-				:href="primaryFileDownloadUrl"
-				:download="primaryFile.filename"
-				:aria-label="
-					formatMessage(messages.downloadVersion, {
-						version: version.version_number,
-					})
-				"
-				@click="emit('download')"
-			>
-				<DownloadIcon aria-hidden="true" />
-				<template v-if="!circular">
-					{{ formatMessage(messages.download) }}
-				</template>
-			</a>
-		</ButtonStyled>
+			<DownloadIcon aria-hidden="true" />
+			<template v-if="!circular">
+				{{ formatMessage(messages.download) }}
+			</template>
+		</ButtonLink>
 	</div>
 </template>
 
 <script setup lang="ts">
 import type { Labrinth } from '@modrinth/api-client'
 import { DownloadIcon, RadioButtonCheckedIcon, RadioButtonIcon } from '@modrinth/assets'
+import { ButtonLink } from '@modrinth/ui'
 import {
-	ButtonStyled,
 	type CdnDownloadReason,
 	defineMessages,
 	truncatedTooltip,
@@ -161,6 +158,17 @@ const publishedLabel = computed(() =>
 	capitalizeString(formatRelativeTime(props.version.date_published)),
 )
 const publishedTooltip = computed(() => formatDateTime(props.version.date_published))
+const downloadButtonType = computed(() => {
+	if (props.type === 'transparent') return 'quiet'
+	return props.color === 'brand' ? 'colored' : 'base'
+})
+const downloadButtonColor = computed(() =>
+	downloadButtonType.value === 'colored' || downloadButtonType.value === 'quiet'
+		? props.color === 'brand'
+			? 'brand'
+			: undefined
+		: undefined,
+)
 const primaryFileSizeLabel = computed(() => {
 	if (!primaryFile.value) return ''
 	return formatBytes(primaryFile.value.size)
diff --git a/apps/frontend/src/components/ui/ProjectDownloadModal/DownloadDependency.vue b/apps/frontend/src/components/ui/ProjectDownloadModal/DownloadDependency.vue
index e1959994ea..3623393d4b 100644
--- a/apps/frontend/src/components/ui/ProjectDownloadModal/DownloadDependency.vue
+++ b/apps/frontend/src/components/ui/ProjectDownloadModal/DownloadDependency.vue
@@ -56,26 +56,27 @@
 					{{ metadataLabel }}
 				</span>
 			</span>
-			<ButtonStyled v-if="dependency.downloadHref" circular type="transparent">
-				<a
-					v-tooltip="downloadTooltip"
-					:href="dependency.downloadHref"
-					:download="dependency.filename"
-					:aria-label="downloadTooltip"
-					@click="emit('download')"
-				>
-					<DownloadIcon aria-hidden="true" class="size-6 text-secondary" />
-				</a>
-			</ButtonStyled>
-			<ButtonStyled v-else circular type="transparent">
-				<button
-					v-tooltip="dependency.unavailableTooltip"
-					disabled
-					:aria-label="dependency.unavailableTooltip"
-				>
-					<DownloadIcon aria-hidden="true" class="size-6 text-secondary" />
-				</button>
-			</ButtonStyled>
+			<ButtonLink
+				v-if="dependency.downloadHref"
+				v-tooltip="downloadTooltip"
+				type="quiet"
+				:href="dependency.downloadHref"
+				:download="dependency.filename"
+				:aria-label="downloadTooltip"
+				class="!w-9 !rounded-full !px-0"
+				@click="emit('download')"
+			>
+				<DownloadIcon aria-hidden="true" class="size-6 text-secondary" />
+			</ButtonLink>
+			<IconButton
+				v-else
+				v-tooltip="dependency.unavailableTooltip"
+				type="quiet"
+				:label="dependency.unavailableTooltip"
+				disabled
+			>
+				<DownloadIcon aria-hidden="true" class="size-6 text-secondary" />
+			</IconButton>
 		</div>
 		<div
 			v-for="childDependency in dependency.dependencies"
@@ -100,8 +101,9 @@
 import { DownloadIcon, PackageIcon } from '@modrinth/assets'
 import {
 	Avatar,
-	ButtonStyled,
+	ButtonLink,
 	defineMessages,
+	IconButton,
 	TagItem,
 	truncatedTooltip,
 	useFormatBytes,
diff --git a/apps/frontend/src/components/ui/ProjectDownloadModal/InstallWithModrinthApp.vue b/apps/frontend/src/components/ui/ProjectDownloadModal/InstallWithModrinthApp.vue
index 41480b0a67..dca290994c 100644
--- a/apps/frontend/src/components/ui/ProjectDownloadModal/InstallWithModrinthApp.vue
+++ b/apps/frontend/src/components/ui/ProjectDownloadModal/InstallWithModrinthApp.vue
@@ -7,18 +7,18 @@
 		class="modrinth-app-section contents"
 	>
 		<div class="flex flex-col items-center">
-			<ButtonStyled color="brand">
-				<a
-					class="!min-h-10 w-fit no-underline"
-					:href="`modrinth://mod/${project.slug}`"
-					@click="installWithApp"
-				>
-					<ModrinthIcon aria-hidden="true" />
-					<span class="min-w-0 text-center">
-						{{ formatMessage(messages.installWithModrinthApp) }}
-					</span>
-				</a>
-			</ButtonStyled>
+			<ButtonLink
+				type="colored"
+				color="brand"
+				class="!min-h-10 w-fit no-underline"
+				:href="`modrinth://mod/${project.slug}`"
+				@click="installWithApp"
+			>
+				<ModrinthIcon aria-hidden="true" />
+				<span class="min-w-0 text-center">
+					{{ formatMessage(messages.installWithModrinthApp) }}
+				</span>
+			</ButtonLink>
 			<Accordion ref="getModrinthAppAccordion">
 				<nuxt-link class="mt-2 flex justify-center text-brand-blue hover:underline" to="/app">
 					{{ formatMessage(messages.dontHaveModrinthApp) }}
@@ -39,7 +39,7 @@
 <script setup lang="ts">
 import type { Labrinth } from '@modrinth/api-client'
 import { ModrinthIcon } from '@modrinth/assets'
-import { ButtonStyled, defineMessages, useVIntl } from '@modrinth/ui'
+import { ButtonLink, defineMessages, useVIntl } from '@modrinth/ui'
 import type { DisplayProjectType } from '@modrinth/utils'
 import { ref } from 'vue'
 
diff --git a/apps/frontend/src/components/ui/ProjectDownloadModal/index.vue b/apps/frontend/src/components/ui/ProjectDownloadModal/index.vue
index a970e6e0d9..c0c5f6d5ef 100644
--- a/apps/frontend/src/components/ui/ProjectDownloadModal/index.vue
+++ b/apps/frontend/src/components/ui/ProjectDownloadModal/index.vue
@@ -49,42 +49,50 @@
 		</template>
 		<template v-if="showDependencyDownloadActions" #actions>
 			<div class="flex flex-wrap justify-end gap-2 p-2">
-				<ButtonStyled>
-					<button
-						class="!shadow-none"
-						:disabled="!!downloadingActionType || !dependencyDownloadFilesLoaded"
-						@click="downloadSelectedVersionZip"
-					>
-						<SpinnerIcon
-							v-if="downloadingActionType === 'zip'"
-							aria-hidden="true"
-							class="animate-spin"
-						/>
-						<DownloadIcon v-else aria-hidden="true" />
-						{{ formatMessage(messages.downloadAsZip) }}
-					</button>
-				</ButtonStyled>
-				<JoinedButtons
-					v-if="hasRecommendedDownloadFiles"
-					color="brand"
-					:actions="downloadWithRecommendedActions"
+				<Button
 					:disabled="!!downloadingActionType || !dependencyDownloadFilesLoaded"
-				/>
-				<ButtonStyled v-else color="brand">
-					<button
-						class="!shadow-none"
-						:disabled="!!downloadingActionType || !dependencyDownloadFilesLoaded"
-						@click="downloadFilesWithDependencies"
-					>
-						<SpinnerIcon
-							v-if="downloadingActionType === 'dependencies'"
-							aria-hidden="true"
-							class="animate-spin"
-						/>
-						<DownloadIcon v-else aria-hidden="true" />
-						{{ formatMessage(messages.downloadWithDependencies) }}
-					</button>
-				</ButtonStyled>
+					@click="downloadSelectedVersionZip"
+				>
+					<SpinnerIcon
+						v-if="downloadingActionType === 'zip'"
+						aria-hidden="true"
+						class="animate-spin"
+					/>
+					<DownloadIcon v-else aria-hidden="true" />
+					{{ formatMessage(messages.downloadAsZip) }}
+				</Button>
+				<SplitButton
+					v-if="hasRecommendedDownloadFiles"
+					type="colored"
+					color="brand"
+					:options="downloadWithRecommendedOptions"
+					:menu-label="formatMessage(messages.downloadWithRecommended)"
+					:disabled="!!downloadingActionType || !dependencyDownloadFilesLoaded"
+					@click="downloadFilesWithDependencies"
+				>
+					<SpinnerIcon
+						v-if="downloadingActionType === 'dependencies'"
+						aria-hidden="true"
+						class="animate-spin"
+					/>
+					<DownloadIcon v-else aria-hidden="true" />
+					{{ formatMessage(messages.downloadWithDependencies) }}
+				</SplitButton>
+				<Button
+					v-else
+					type="colored"
+					color="brand"
+					:disabled="!!downloadingActionType || !dependencyDownloadFilesLoaded"
+					@click="downloadFilesWithDependencies"
+				>
+					<SpinnerIcon
+						v-if="downloadingActionType === 'dependencies'"
+						aria-hidden="true"
+						class="animate-spin"
+					/>
+					<DownloadIcon v-else aria-hidden="true" />
+					{{ formatMessage(messages.downloadWithDependencies) }}
+				</Button>
 			</div>
 		</template>
 	</NewModal>
@@ -95,15 +103,15 @@ import type { Labrinth } from '@modrinth/api-client'
 import { DownloadIcon, SpinnerIcon } from '@modrinth/assets'
 import {
 	Avatar,
-	ButtonStyled,
+	Button,
 	type CdnDownloadReason,
 	defineMessages,
 	injectModrinthClient,
 	injectNotificationManager,
-	type JoinedButtonAction,
-	JoinedButtons,
 	NewModal,
+	type OverflowMenuOption,
 	ServersPromo,
+	SplitButton,
 	truncatedTooltip,
 	useDebugLogger,
 	useVIntl,
@@ -342,13 +350,7 @@ const showDependencyDownloadActions = computed(
 			hasRecommendedDownloadFiles.value),
 )
 
-const downloadWithRecommendedActions = computed<JoinedButtonAction[]>(() => [
-	{
-		id: 'download-with-dependencies',
-		label: formatMessage(messages.downloadWithDependencies),
-		icon: downloadingActionType.value === 'dependencies' ? SpinnerIcon : DownloadIcon,
-		action: () => void downloadFilesWithDependencies(),
-	},
+const downloadWithRecommendedOptions = computed<OverflowMenuOption[]>(() => [
 	{
 		id: 'download-with-recommended',
 		label: formatMessage(messages.downloadWithRecommended),
diff --git a/apps/frontend/src/components/ui/ProjectMemberHeader.vue b/apps/frontend/src/components/ui/ProjectMemberHeader.vue
index d08f798c4a..9a4c0b2ee5 100644
--- a/apps/frontend/src/components/ui/ProjectMemberHeader.vue
+++ b/apps/frontend/src/components/ui/ProjectMemberHeader.vue
@@ -6,26 +6,22 @@
 		</p>
 		<p v-else>{{ getFormattedMessage(messages.invitationNoRole) }}</p>
 		<div class="input-group">
-			<ButtonStyled color="brand">
-				<button class="brand-button" @click="acceptInvite()">
-					<CheckIcon />
-					{{ getFormattedMessage(commonMessages.acceptButton) }}
-				</button>
-			</ButtonStyled>
-			<ButtonStyled color="red">
-				<button @click="declineInvite">
-					<XIcon />
-					{{ getFormattedMessage(commonMessages.declineButton) }}
-				</button>
-			</ButtonStyled>
+			<Button type="colored" color="brand" class="brand-button" @click="acceptInvite()">
+				<CheckIcon />
+				{{ getFormattedMessage(commonMessages.acceptButton) }}
+			</Button>
+			<Button type="colored" color="red" @click="declineInvite">
+				<XIcon />
+				{{ getFormattedMessage(commonMessages.declineButton) }}
+			</Button>
 		</div>
 	</div>
 </template>
 
 <script setup lang="ts">
 import { CheckIcon, XIcon } from '@modrinth/assets'
+import { Button } from '@modrinth/ui'
 import {
-	ButtonStyled,
 	commonMessages,
 	defineMessages,
 	injectNotificationManager,
diff --git a/apps/frontend/src/components/ui/ShareArticleButtons.vue b/apps/frontend/src/components/ui/ShareArticleButtons.vue
index 386fd27325..57b47fc331 100644
--- a/apps/frontend/src/components/ui/ShareArticleButtons.vue
+++ b/apps/frontend/src/components/ui/ShareArticleButtons.vue
@@ -1,58 +1,53 @@
 <template>
 	<div class="flex gap-2">
-		<ButtonStyled circular>
-			<a
-				v-tooltip="`Share on Bluesky`"
-				:href="`https://bsky.app/intent/compose?text=${encodedUrl}`"
-				target="_blank"
-			>
-				<BlueskyIcon />
-			</a>
-		</ButtonStyled>
-		<ButtonStyled circular>
-			<a
-				v-tooltip="`Share on Mastodon`"
-				:href="`https://tootpick.org/#text=${encodedUrl}`"
-				target="_blank"
-			>
-				<MastodonIcon />
-			</a>
-		</ButtonStyled>
-		<ButtonStyled circular>
-			<a
-				v-tooltip="`Share on X`"
-				:href="`https://www.x.com/intent/post?url=${encodedUrl}`"
-				target="_blank"
-			>
-				<TwitterIcon />
-			</a>
-		</ButtonStyled>
-		<ButtonStyled circular>
-			<a
-				v-tooltip="`Share via email`"
-				:href="`mailto:${encodedTitle ? `?subject=${encodedTitle}&` : `?`}body=${encodedUrl}`"
-				target="_blank"
-			>
-				<MailIcon />
-			</a>
-		</ButtonStyled>
-		<ButtonStyled circular>
-			<button
-				v-tooltip="copied ? `Copied to clipboard` : `Copy link`"
-				:disabled="copied"
-				class="relative grid place-items-center overflow-hidden"
-				@click="copyToClipboard(url)"
-			>
-				<CheckIcon
-					class="absolute transition-all ease-in-out"
-					:class="copied ? 'translate-y-0' : 'translate-y-7'"
-				/>
-				<LinkIcon
-					class="absolute transition-all ease-in-out"
-					:class="copied ? '-translate-y-7' : 'translate-y-0'"
-				/>
-			</button>
-		</ButtonStyled>
+		<ButtonLink
+			v-tooltip="`Share on Bluesky`"
+			:href="`https://bsky.app/intent/compose?text=${encodedUrl}`"
+			target="_blank"
+			class="!w-9 !rounded-full !px-0"
+		>
+			<BlueskyIcon />
+		</ButtonLink>
+		<ButtonLink
+			v-tooltip="`Share on Mastodon`"
+			:href="`https://tootpick.org/#text=${encodedUrl}`"
+			target="_blank"
+			class="!w-9 !rounded-full !px-0"
+		>
+			<MastodonIcon />
+		</ButtonLink>
+		<ButtonLink
+			v-tooltip="`Share on X`"
+			:href="`https://www.x.com/intent/post?url=${encodedUrl}`"
+			target="_blank"
+			class="!w-9 !rounded-full !px-0"
+		>
+			<TwitterIcon />
+		</ButtonLink>
+		<ButtonLink
+			v-tooltip="`Share via email`"
+			:href="`mailto:${encodedTitle ? `?subject=${encodedTitle}&` : `?`}body=${encodedUrl}`"
+			target="_blank"
+			class="!w-9 !rounded-full !px-0"
+		>
+			<MailIcon />
+		</ButtonLink>
+		<IconButton
+			v-tooltip="copied ? `Copied to clipboard` : `Copy link`"
+			:label="copied ? `Copied to clipboard` : `Copy link`"
+			:disabled="copied"
+			class="relative grid place-items-center overflow-hidden"
+			@click="copyToClipboard(url)"
+		>
+			<CheckIcon
+				class="absolute transition-all ease-in-out"
+				:class="copied ? 'translate-y-0' : 'translate-y-7'"
+			/>
+			<LinkIcon
+				class="absolute transition-all ease-in-out"
+				:class="copied ? '-translate-y-7' : 'translate-y-0'"
+			/>
+		</IconButton>
 	</div>
 </template>
 
@@ -65,7 +60,7 @@ import {
 	MastodonIcon,
 	TwitterIcon,
 } from '@modrinth/assets'
-import { ButtonStyled } from '@modrinth/ui'
+import { ButtonLink, IconButton } from '@modrinth/ui'
 
 const props = defineProps<{
 	title?: string
diff --git a/apps/frontend/src/components/ui/SharedInstanceInviteOpenInAppModal.vue b/apps/frontend/src/components/ui/SharedInstanceInviteOpenInAppModal.vue
index 2c6be85a6f..0a5f4b5aa6 100644
--- a/apps/frontend/src/components/ui/SharedInstanceInviteOpenInAppModal.vue
+++ b/apps/frontend/src/components/ui/SharedInstanceInviteOpenInAppModal.vue
@@ -102,23 +102,21 @@
 					formatMessage(messages.openingAutomatically)
 				}}</span>
 				<div v-else class="grid w-full grid-cols-1 gap-2 sm:grid-cols-2">
-					<ButtonStyled>
-						<button class="flex-1" type="button" @click="hide">
-							<XIcon />
-							{{ formatMessage(commonMessages.closeButton) }}
-						</button>
-					</ButtonStyled>
-					<ButtonStyled color="brand">
-						<a
-							class="flex-1"
-							href="https://modrinth.com/app"
-							target="_blank"
-							rel="noopener noreferrer"
-						>
-							<DownloadIcon />
-							{{ formatMessage(messages.getApp) }}
-						</a>
-					</ButtonStyled>
+					<Button class="flex-1" native-type="button" @click="hide">
+						<XIcon />
+						{{ formatMessage(commonMessages.closeButton) }}
+					</Button>
+					<ButtonLink
+						type="colored"
+						color="brand"
+						class="flex-1"
+						href="https://modrinth.com/app"
+						target="_blank"
+						rel="noopener noreferrer"
+					>
+						<DownloadIcon />
+						{{ formatMessage(messages.getApp) }}
+					</ButtonLink>
 				</div>
 			</div>
 		</div>
@@ -127,7 +125,7 @@
 
 <script setup lang="ts">
 import { CheckIcon, DownloadIcon, XIcon } from '@modrinth/assets'
-import { Avatar, ButtonStyled, commonMessages, defineMessages, useVIntl } from '@modrinth/ui'
+import { Avatar, Button, ButtonLink, commonMessages, defineMessages, useVIntl } from '@modrinth/ui'
 import { computed, nextTick, onUnmounted, ref } from 'vue'
 
 const { formatMessage } = useVIntl()
diff --git a/apps/frontend/src/components/ui/admin/AdminBillingChargeCard.vue b/apps/frontend/src/components/ui/admin/AdminBillingChargeCard.vue
index 46f9e79277..79a702397a 100644
--- a/apps/frontend/src/components/ui/admin/AdminBillingChargeCard.vue
+++ b/apps/frontend/src/components/ui/admin/AdminBillingChargeCard.vue
@@ -87,29 +87,23 @@
 				</div>
 			</div>
 			<div class="flex gap-2">
-				<ButtonStyled v-if="isRefunded">
-					<div class="button-like disabled"><CheckIcon /> Charge refunded</div>
-				</ButtonStyled>
-				<ButtonStyled
+				<Button v-if="isRefunded" disabled><CheckIcon /> Charge refunded</Button>
+				<Button
 					v-else-if="charge.status === 'succeeded' && charge.type !== 'refund'"
-					color="red"
-					color-fill="text"
+					class="!text-red [&>svg]:!text-red"
+					@click="emit('refund', charge)"
 				>
-					<button @click="emit('refund', charge)">
-						<CurrencyIcon />
-						Refund options
-					</button>
-				</ButtonStyled>
-				<ButtonStyled
+					<CurrencyIcon />
+					Refund options
+				</Button>
+				<Button
 					v-else-if="charge.status === 'failed' || charge.status === 'open'"
-					color="red"
-					color-fill="text"
+					class="!text-red [&>svg]:!text-red"
+					@click="emit('modify', charge, subscription)"
 				>
-					<button @click="emit('modify', charge, subscription)">
-						<CurrencyIcon />
-						Modify charge
-					</button>
-				</ButtonStyled>
+					<CurrencyIcon />
+					Modify charge
+				</Button>
 			</div>
 		</div>
 	</div>
@@ -117,7 +111,7 @@
 <script setup lang="ts">
 import type { Labrinth } from '@modrinth/api-client'
 import { CheckIcon, CurrencyIcon } from '@modrinth/assets'
-import { ButtonStyled, useFormatDateTime, useFormatPrice, useRelativeTime } from '@modrinth/ui'
+import { Button, useFormatDateTime, useFormatPrice, useRelativeTime } from '@modrinth/ui'
 import dayjs from 'dayjs'
 
 import { products } from '~/generated/state.json'
diff --git a/apps/frontend/src/components/ui/admin/AssignNoticeModal.vue b/apps/frontend/src/components/ui/admin/AssignNoticeModal.vue
index a52bb5c01e..32bbb6d6f6 100644
--- a/apps/frontend/src/components/ui/admin/AssignNoticeModal.vue
+++ b/apps/frontend/src/components/ui/admin/AssignNoticeModal.vue
@@ -3,7 +3,7 @@ import type { Archon } from '@modrinth/api-client'
 import { PlusIcon, XIcon } from '@modrinth/assets'
 import {
 	Accordion,
-	ButtonStyled,
+	Button,
 	injectModrinthClient,
 	injectNotificationManager,
 	NewModal,
@@ -181,24 +181,33 @@ defineExpose({ show, hide })
 						wrapper-class="w-full"
 						autocomplete="off"
 					/>
-					<ButtonStyled color="green" color-fill="text">
-						<button class="shrink-0" @click="() => assign(true)">
-							<PlusIcon />
-							Add server
-						</button>
-					</ButtonStyled>
-					<ButtonStyled color="blue" color-fill="text">
-						<button class="shrink-0" @click="() => assign(false)">
-							<PlusIcon />
-							Add node
-						</button>
-					</ButtonStyled>
-					<ButtonStyled color="red" color-fill="text">
-						<button class="shrink-0" @click="() => unassignDetect()">
-							<XIcon />
-							Remove
-						</button>
-					</ButtonStyled>
+					<Button
+						type="quiet"
+						color="green"
+						class="shrink-0 !text-green [&>svg]:!text-green"
+						@click="() => assign(true)"
+					>
+						<PlusIcon />
+						Add server
+					</Button>
+					<Button
+						type="quiet"
+						color="blue"
+						class="shrink-0 !text-blue [&>svg]:!text-blue"
+						@click="() => assign(false)"
+					>
+						<PlusIcon />
+						Add node
+					</Button>
+					<Button
+						type="quiet"
+						color="red"
+						class="shrink-0 !text-red [&>svg]:!text-red"
+						@click="() => unassignDetect()"
+					>
+						<XIcon />
+						Remove
+					</Button>
 				</div>
 			</div>
 		</div>
diff --git a/apps/frontend/src/components/ui/admin/BatchCreditModal.vue b/apps/frontend/src/components/ui/admin/BatchCreditModal.vue
index 587402cf1d..45f3941547 100644
--- a/apps/frontend/src/components/ui/admin/BatchCreditModal.vue
+++ b/apps/frontend/src/components/ui/admin/BatchCreditModal.vue
@@ -42,12 +42,15 @@
 							wrapper-class="w-32"
 							autocomplete="off"
 						/>
-						<ButtonStyled color="blue" color-fill="text">
-							<button class="shrink-0" @click="addNode">
-								<PlusIcon />
-								Add
-							</button>
-						</ButtonStyled>
+						<Button
+							type="quiet"
+							color="blue"
+							class="shrink-0 !text-blue [&>svg]:!text-blue"
+							@click="addNode"
+						>
+							<PlusIcon />
+							Add
+						</Button>
 					</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)">
@@ -111,18 +114,14 @@
 			</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>
+				<Button type="colored" color="brand" :disabled="applyDisabled" @click="apply">
+					<CheckIcon aria-hidden="true" />
+					Apply credits
+				</Button>
+				<Button @click="modal?.hide?.()">
+					<XIcon aria-hidden="true" />
+					Cancel
+				</Button>
 			</div>
 		</div>
 	</NewModal>
@@ -131,7 +130,7 @@
 <script setup lang="ts">
 import { CheckIcon, PlusIcon, XIcon } from '@modrinth/assets'
 import {
-	ButtonStyled,
+	Button,
 	Combobox,
 	injectModrinthClient,
 	injectNotificationManager,
diff --git a/apps/frontend/src/components/ui/admin/TransferModal.vue b/apps/frontend/src/components/ui/admin/TransferModal.vue
index bd0d5ce399..16e0df6de7 100644
--- a/apps/frontend/src/components/ui/admin/TransferModal.vue
+++ b/apps/frontend/src/components/ui/admin/TransferModal.vue
@@ -56,12 +56,15 @@
 							placeholder="us-vin200, us-vin201"
 							@keydown.enter.prevent="addNodes"
 						/>
-						<ButtonStyled color="blue" color-fill="text">
-							<button class="shrink-0" @click="addNodes">
-								<PlusIcon />
-								Add
-							</button>
-						</ButtonStyled>
+						<Button
+							type="quiet"
+							color="blue"
+							class="shrink-0 !text-blue [&>svg]:!text-blue"
+							@click="addNodes"
+						>
+							<PlusIcon />
+							Add
+						</Button>
 					</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)">
@@ -122,12 +125,15 @@
 						placeholder="ovh-gen4"
 						@keydown.enter.prevent="addTag"
 					/>
-					<ButtonStyled color="blue" color-fill="text">
-						<button class="shrink-0" @click="addTag">
-							<PlusIcon />
-							Add
-						</button>
-					</ButtonStyled>
+					<Button
+						type="quiet"
+						color="blue"
+						class="shrink-0 !text-blue [&>svg]:!text-blue"
+						@click="addTag"
+					>
+						<PlusIcon />
+						Add
+					</Button>
 				</div>
 				<div v-if="selectedTags.length" class="mt-1 flex flex-wrap gap-2">
 					<TagItem v-for="t in selectedTags" :key="`tag-${t}`" :action="() => removeTag(t)">
@@ -175,18 +181,19 @@
 			</div>
 
 			<div class="flex gap-2">
-				<ButtonStyled color="brand">
-					<button :disabled="submitDisabled || submitting" @click="submit">
-						<SendIcon aria-hidden="true" />
-						{{ submitting ? 'Scheduling...' : 'Schedule transfer' }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled>
-					<button @click="modal?.hide?.()">
-						<XIcon aria-hidden="true" />
-						Cancel
-					</button>
-				</ButtonStyled>
+				<Button
+					type="colored"
+					color="brand"
+					:disabled="submitDisabled || submitting"
+					@click="submit"
+				>
+					<SendIcon aria-hidden="true" />
+					{{ submitting ? 'Scheduling...' : 'Schedule transfer' }}
+				</Button>
+				<Button @click="modal?.hide?.()">
+					<XIcon aria-hidden="true" />
+					Cancel
+				</Button>
 			</div>
 		</div>
 	</NewModal>
@@ -195,7 +202,7 @@
 <script setup lang="ts">
 import { PlusIcon, SendIcon, XIcon } from '@modrinth/assets'
 import {
-	ButtonStyled,
+	Button,
 	Chips,
 	Combobox,
 	injectModrinthClient,
diff --git a/apps/frontend/src/components/ui/auth/CreateAccount.vue b/apps/frontend/src/components/ui/auth/CreateAccount.vue
index 412883acea..9382e20e94 100644
--- a/apps/frontend/src/components/ui/auth/CreateAccount.vue
+++ b/apps/frontend/src/components/ui/auth/CreateAccount.vue
@@ -84,16 +84,16 @@
 			<label for="create-account-consent">I agree to receive account updates by email</label>
 		</div>
 
-		<ButtonStyled color="brand">
-			<button
-				class="!w-full font-bold"
-				:disabled="globals?.captcha_enabled ? !tokenModel : false"
-				@click="onCompleteSignUpClick"
-			>
-				{{ formatMessage(messages.completeSignUpButton) }}
-				<RightArrowIcon />
-			</button>
-		</ButtonStyled>
+		<Button
+			type="colored"
+			color="brand"
+			class="!w-full font-bold"
+			:disabled="globals?.captcha_enabled ? !tokenModel : false"
+			@click="onCompleteSignUpClick"
+		>
+			{{ formatMessage(messages.completeSignUpButton) }}
+			<RightArrowIcon />
+		</Button>
 	</div>
 </template>
 
@@ -101,7 +101,7 @@
 import { RightArrowIcon } from '@modrinth/assets'
 import {
 	Admonition,
-	ButtonStyled,
+	Button,
 	Checkbox,
 	DatePicker,
 	defineMessages,
diff --git a/apps/frontend/src/components/ui/auth/PasskeySettings.vue b/apps/frontend/src/components/ui/auth/PasskeySettings.vue
index 0aeb0aef2f..7156128fad 100644
--- a/apps/frontend/src/components/ui/auth/PasskeySettings.vue
+++ b/apps/frontend/src/components/ui/auth/PasskeySettings.vue
@@ -55,48 +55,42 @@
 							</div>
 						</div>
 						<div class="flex gap-2">
-							<ButtonStyled circular>
-								<button
-									v-tooltip="formatMessage(commonMessages.renameButton)"
-									@click="
-										() => {
-											passkeyToRename = { ...passkey }
-											renamePasskeyModal?.show()
-										}
-									"
-								>
-									<EditIcon />
-								</button>
-							</ButtonStyled>
-							<ButtonStyled circular>
-								<button
-									v-tooltip="formatMessage(messages.deletePasskeyButton)"
-									@click="
-										() => {
-											passkeyToRemove = passkey
-											removePasskeyModal?.show()
-										}
-									"
-								>
-									<TrashIcon />
-								</button>
-							</ButtonStyled>
+							<IconButton
+								v-tooltip="formatMessage(commonMessages.renameButton)"
+								:label="formatMessage(commonMessages.renameButton)"
+								@click="
+									() => {
+										passkeyToRename = { ...passkey }
+										renamePasskeyModal?.show()
+									}
+								"
+							>
+								<EditIcon />
+							</IconButton>
+							<IconButton
+								v-tooltip="formatMessage(messages.deletePasskeyButton)"
+								:label="formatMessage(messages.deletePasskeyButton)"
+								@click="
+									() => {
+										passkeyToRemove = passkey
+										removePasskeyModal?.show()
+									}
+								"
+							>
+								<TrashIcon />
+							</IconButton>
 						</div>
 					</div>
 				</template>
 				<div class="input-group self-end">
-					<ButtonStyled>
-						<button @click="registerPasskey()">
-							<PlusIcon />
-							{{ formatMessage(messages.managePasskeyAddPasskeyButton) }}
-						</button>
-					</ButtonStyled>
-					<ButtonStyled>
-						<button @click="managePasskeyModal?.hide()">
-							<XIcon />
-							{{ formatMessage(commonMessages.closeButton) }}
-						</button>
-					</ButtonStyled>
+					<Button @click="registerPasskey()">
+						<PlusIcon />
+						{{ formatMessage(messages.managePasskeyAddPasskeyButton) }}
+					</Button>
+					<Button @click="managePasskeyModal?.hide()">
+						<XIcon />
+						{{ formatMessage(commonMessages.closeButton) }}
+					</Button>
 				</div>
 			</div>
 		</NewModal>
@@ -124,18 +118,19 @@
 					</div>
 				</div>
 				<div class="flex justify-end gap-2.5">
-					<ButtonStyled>
-						<button @click="addPasskeyModal?.hide()">
-							<XIcon />
-							{{ formatMessage(commonMessages.cancelButton) }}
-						</button>
-					</ButtonStyled>
-					<ButtonStyled color="brand">
-						<button :disabled="!pendingPasskeyName" @click="finishRegisterPasskey()">
-							<PlusIcon />
-							{{ formatMessage(messages.managePasskeyAddPasskeyButton) }}
-						</button>
-					</ButtonStyled>
+					<Button @click="addPasskeyModal?.hide()">
+						<XIcon />
+						{{ formatMessage(commonMessages.cancelButton) }}
+					</Button>
+					<Button
+						type="colored"
+						color="brand"
+						:disabled="!pendingPasskeyName"
+						@click="finishRegisterPasskey()"
+					>
+						<PlusIcon />
+						{{ formatMessage(messages.managePasskeyAddPasskeyButton) }}
+					</Button>
 				</div>
 			</div>
 		</NewModal>
@@ -163,18 +158,19 @@
 					</div>
 				</div>
 				<div class="flex justify-end gap-2.5">
-					<ButtonStyled>
-						<button @click="renamePasskeyModal?.hide()">
-							<XIcon />
-							{{ formatMessage(commonMessages.cancelButton) }}
-						</button>
-					</ButtonStyled>
-					<ButtonStyled color="brand">
-						<button :disabled="!passkeyToRenameName" @click="renamePasskey()">
-							<SaveIcon />
-							{{ formatMessage(commonMessages.saveButton) }}
-						</button>
-					</ButtonStyled>
+					<Button @click="renamePasskeyModal?.hide()">
+						<XIcon />
+						{{ formatMessage(commonMessages.cancelButton) }}
+					</Button>
+					<Button
+						type="colored"
+						color="brand"
+						:disabled="!passkeyToRenameName"
+						@click="renamePasskey()"
+					>
+						<SaveIcon />
+						{{ formatMessage(commonMessages.saveButton) }}
+					</Button>
 				</div>
 			</div>
 		</NewModal>
@@ -187,11 +183,9 @@
 				}}</span>
 			</label>
 			<div>
-				<ButtonStyled>
-					<button id="manage-passkeys" @click="showPasskeyModal">
-						<UserKeyIcon /> {{ formatMessage(messages.managePasskeyButton) }}
-					</button>
-				</ButtonStyled>
+				<Button id="manage-passkeys" @click="showPasskeyModal">
+					<UserKeyIcon /> {{ formatMessage(messages.managePasskeyButton) }}
+				</Button>
 			</div>
 		</div>
 	</div>
@@ -209,10 +203,11 @@ import {
 	XIcon,
 } from '@modrinth/assets'
 import {
-	ButtonStyled,
+	Button,
 	commonMessages,
 	ConfirmModal,
 	defineMessages,
+	IconButton,
 	injectModrinthClient,
 	injectNotificationManager,
 	NewModal,
diff --git a/apps/frontend/src/components/ui/auth/SignIn.vue b/apps/frontend/src/components/ui/auth/SignIn.vue
index e86d795bad..a1a033dcbb 100644
--- a/apps/frontend/src/components/ui/auth/SignIn.vue
+++ b/apps/frontend/src/components/ui/auth/SignIn.vue
@@ -28,11 +28,9 @@
 						@keyup.enter="onTwoFactorSignIn()"
 					/>
 				</div>
-				<ButtonStyled color="brand">
-					<button @click="onTwoFactorSignIn()">
-						{{ formatMessage(commonMessages.signInButton) }} <RightArrowIcon />
-					</button>
-				</ButtonStyled>
+				<Button type="colored" color="brand" @click="onTwoFactorSignIn()">
+					{{ formatMessage(commonMessages.signInButton) }} <RightArrowIcon />
+				</Button>
 			</div>
 		</template>
 		<template v-else>
@@ -42,47 +40,40 @@
 				</div>
 
 				<section class="grid grid-cols-1 gap-2.5 sm:grid-cols-2">
-					<ButtonStyled v-for="provider in oauthProviders" :key="provider.id">
-						<a
-							class="relative w-full !justify-center overflow-visible !shadow-none"
-							:class="{
-								'!border !border-[var(--color-green)]': lastSignInProvider === provider.id,
-							}"
-							:href="getAuthUrl(provider.id, redirectTarget)"
-							:aria-label="
-								formatMessage(messages.continueWithProvider, { provider: provider.name })
-							"
-							@click="onOAuthProviderClick(provider.id)"
+					<ButtonLink
+						v-for="provider in oauthProviders"
+						:key="provider.id"
+						class="relative w-full !justify-center overflow-visible"
+						:class="{
+							'!border !border-[var(--color-green)]': lastSignInProvider === provider.id,
+						}"
+						:href="getAuthUrl(provider.id, redirectTarget)"
+						:aria-label="formatMessage(messages.continueWithProvider, { provider: provider.name })"
+						@click="onOAuthProviderClick(provider.id)"
+					>
+						<component :is="provider.icon" />
+						<span>{{ provider.name }}</span>
+						<span
+							v-if="lastSignInProvider === provider.id"
+							class="oauth-provider-last-sign-in-badge"
 						>
-							<component :is="provider.icon" />
-							<span>{{ provider.name }}</span>
-							<span
-								v-if="lastSignInProvider === provider.id"
-								class="oauth-provider-last-sign-in-badge"
-							>
-								{{ formatMessage(messages.lastSignInLabel) }}
-							</span>
-						</a>
-					</ButtonStyled>
-					<ButtonStyled>
-						<a
-							class="relative w-full !justify-center overflow-visible !shadow-none sm:col-span-2"
-							:class="{ '!border !border-[var(--color-green)]': lastSignInProvider === 'passkey' }"
-							role="button"
-							tabindex="0"
-							@click="onPasskeySignIn"
-							@keydown.enter="onPasskeySignIn"
-						>
-							<UserKeyIcon />
-							<span class="ml-1">{{ formatMessage(messages.continueWithPasskey) }}</span>
-							<span
-								v-if="lastSignInProvider === 'passkey'"
-								class="oauth-provider-last-sign-in-badge"
-							>
-								{{ formatMessage(messages.lastSignInLabel) }}
-							</span>
-						</a>
-					</ButtonStyled>
+							{{ formatMessage(messages.lastSignInLabel) }}
+						</span>
+					</ButtonLink>
+					<Button
+						class="relative !w-full !justify-center overflow-visible sm:col-span-2"
+						:class="{ '!border !border-[var(--color-green)]': lastSignInProvider === 'passkey' }"
+						role="button"
+						tabindex="0"
+						@click="onPasskeySignIn"
+						@keydown.enter="onPasskeySignIn"
+					>
+						<UserKeyIcon />
+						<span class="ml-1">{{ formatMessage(messages.continueWithPasskey) }}</span>
+						<span v-if="lastSignInProvider === 'passkey'" class="oauth-provider-last-sign-in-badge">
+							{{ formatMessage(messages.lastSignInLabel) }}
+						</span>
+					</Button>
 				</section>
 
 				<div class="h-px w-full bg-surface-5"></div>
@@ -117,15 +108,15 @@
 						v-model="tokenModel"
 					/>
 
-					<ButtonStyled color="brand">
-						<button
-							class="!w-full"
-							:disabled="globals?.captcha_enabled ? !tokenModel : false"
-							@click="onPasswordSignIn()"
-						>
-							{{ formatMessage(messages.continueWithEmail) }} <RightArrowIcon />
-						</button>
-					</ButtonStyled>
+					<Button
+						type="colored"
+						color="brand"
+						class="!w-full"
+						:disabled="globals?.captcha_enabled ? !tokenModel : false"
+						@click="onPasswordSignIn()"
+					>
+						{{ formatMessage(messages.continueWithEmail) }} <RightArrowIcon />
+					</Button>
 
 					<div class="flex flex-wrap items-center justify-center gap-2.5 !text-base">
 						<NuxtLink
@@ -167,7 +158,14 @@ import {
 	SteamColorIcon,
 	UserKeyIcon,
 } from '@modrinth/assets'
-import { ButtonStyled, commonMessages, defineMessages, StyledInput, useVIntl } from '@modrinth/ui'
+import {
+	Button,
+	ButtonLink,
+	commonMessages,
+	defineMessages,
+	StyledInput,
+	useVIntl,
+} from '@modrinth/ui'
 import { useStorage } from '@vueuse/core'
 import { computed } from 'vue'
 import type { LocationQuery } from 'vue-router'
diff --git a/apps/frontend/src/components/ui/auth/SignUp.vue b/apps/frontend/src/components/ui/auth/SignUp.vue
index 9da5b7371e..4ecbf17341 100644
--- a/apps/frontend/src/components/ui/auth/SignUp.vue
+++ b/apps/frontend/src/components/ui/auth/SignUp.vue
@@ -6,67 +6,49 @@
 			{{ formatMessage(messages.signUpWithTitle) }}
 		</div>
 		<section class="flex flex-col gap-2.5">
-			<ButtonStyled>
-				<a
-					class="!shadow-none"
-					:href="getAuthUrl('google', redirectTarget)"
-					@click="onOAuthProviderClick('google')"
-				>
-					<GoogleColorIcon />
-					<span>{{ formatMessage(messages.continueWithProvider, { provider: 'Google' }) }}</span>
-				</a>
-			</ButtonStyled>
-			<ButtonStyled>
-				<a
-					class="!shadow-none"
-					:href="getAuthUrl('microsoft', redirectTarget)"
-					@click="onOAuthProviderClick('microsoft')"
-				>
-					<MicrosoftColorIcon />
-					<span>{{ formatMessage(messages.continueWithProvider, { provider: 'Microsoft' }) }}</span>
-				</a>
-			</ButtonStyled>
-			<ButtonStyled>
-				<a
-					class="!shadow-none"
-					:href="getAuthUrl('discord', redirectTarget)"
-					@click="onOAuthProviderClick('discord')"
-				>
-					<DiscordColorIcon />
-					<span>{{ formatMessage(messages.continueWithProvider, { provider: 'Discord' }) }}</span>
-				</a>
-			</ButtonStyled>
+			<ButtonLink
+				:href="getAuthUrl('google', redirectTarget)"
+				@click="onOAuthProviderClick('google')"
+			>
+				<GoogleColorIcon />
+				<span>{{ formatMessage(messages.continueWithProvider, { provider: 'Google' }) }}</span>
+			</ButtonLink>
+			<ButtonLink
+				:href="getAuthUrl('microsoft', redirectTarget)"
+				@click="onOAuthProviderClick('microsoft')"
+			>
+				<MicrosoftColorIcon />
+				<span>{{ formatMessage(messages.continueWithProvider, { provider: 'Microsoft' }) }}</span>
+			</ButtonLink>
+			<ButtonLink
+				:href="getAuthUrl('discord', redirectTarget)"
+				@click="onOAuthProviderClick('discord')"
+			>
+				<DiscordColorIcon />
+				<span>{{ formatMessage(messages.continueWithProvider, { provider: 'Discord' }) }}</span>
+			</ButtonLink>
 			<template v-if="showOtherOptions">
-				<ButtonStyled>
-					<a
-						class="!shadow-none"
-						:href="getAuthUrl('github', redirectTarget)"
-						@click="onOAuthProviderClick('github')"
-					>
-						<GitHubColorIcon />
-						<span>{{ formatMessage(messages.continueWithProvider, { provider: 'GitHub' }) }}</span>
-					</a>
-				</ButtonStyled>
-				<ButtonStyled>
-					<a
-						class="!shadow-none"
-						:href="getAuthUrl('gitlab', redirectTarget)"
-						@click="onOAuthProviderClick('gitlab')"
-					>
-						<GitLabColorIcon />
-						<span>{{ formatMessage(messages.continueWithProvider, { provider: 'GitLab' }) }}</span>
-					</a>
-				</ButtonStyled>
-				<ButtonStyled>
-					<a
-						class="!shadow-none"
-						:href="getAuthUrl('steam', redirectTarget)"
-						@click="onOAuthProviderClick('steam')"
-					>
-						<SteamColorIcon />
-						<span>{{ formatMessage(messages.continueWithProvider, { provider: 'Steam' }) }}</span>
-					</a>
-				</ButtonStyled>
+				<ButtonLink
+					:href="getAuthUrl('github', redirectTarget)"
+					@click="onOAuthProviderClick('github')"
+				>
+					<GitHubColorIcon />
+					<span>{{ formatMessage(messages.continueWithProvider, { provider: 'GitHub' }) }}</span>
+				</ButtonLink>
+				<ButtonLink
+					:href="getAuthUrl('gitlab', redirectTarget)"
+					@click="onOAuthProviderClick('gitlab')"
+				>
+					<GitLabColorIcon />
+					<span>{{ formatMessage(messages.continueWithProvider, { provider: 'GitLab' }) }}</span>
+				</ButtonLink>
+				<ButtonLink
+					:href="getAuthUrl('steam', redirectTarget)"
+					@click="onOAuthProviderClick('steam')"
+				>
+					<SteamColorIcon />
+					<span>{{ formatMessage(messages.continueWithProvider, { provider: 'Steam' }) }}</span>
+				</ButtonLink>
 			</template>
 			<button
 				class="mx-auto -mb-3 bg-transparent pt-1 text-center text-base font-semibold text-secondary transition-all hover:text-primary"
@@ -105,15 +87,15 @@
 				wrapper-class="w-full"
 			/>
 
-			<ButtonStyled color="brand">
-				<button
-					class="!w-full"
-					:disabled="!emailModel || !passwordModel"
-					@click="onContinueWithEmail()"
-				>
-					{{ formatMessage(messages.continueWithEmail) }} <RightArrowIcon />
-				</button>
-			</ButtonStyled>
+			<Button
+				type="colored"
+				color="brand"
+				class="!w-full"
+				:disabled="!emailModel || !passwordModel"
+				@click="onContinueWithEmail()"
+			>
+				{{ formatMessage(messages.continueWithEmail) }} <RightArrowIcon />
+			</Button>
 
 			<p v-if="!routeQuery.launcher" class="m-0 text-center">
 				<IntlFormatted :message-id="messages.legalDisclaimer">
@@ -159,7 +141,8 @@ import {
 	SteamColorIcon,
 } from '@modrinth/assets'
 import {
-	ButtonStyled,
+	Button,
+	ButtonLink,
 	commonMessages,
 	defineMessages,
 	IntlFormatted,
diff --git a/apps/frontend/src/components/ui/banner/GeneratedStateErrorsBanner.vue b/apps/frontend/src/components/ui/banner/GeneratedStateErrorsBanner.vue
index e03b7d370c..369c7e5471 100644
--- a/apps/frontend/src/components/ui/banner/GeneratedStateErrorsBanner.vue
+++ b/apps/frontend/src/components/ui/banner/GeneratedStateErrorsBanner.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { XCircleIcon, XIcon } from '@modrinth/assets'
-import { ButtonStyled, defineMessages, PagewideBanner, useVIntl } from '@modrinth/ui'
+import { Button, defineMessages, PagewideBanner, useVIntl } from '@modrinth/ui'
 
 const { formatMessage } = useVIntl()
 const flags = useFeatureFlags()
@@ -57,18 +57,19 @@ function alwaysIgnoreBanner() {
 			}}
 		</template>
 		<template #actions_right>
-			<ButtonStyled color="red" type="transparent" hover-color-fill="background">
-				<button @click="alwaysIgnoreBanner">
-					<XCircleIcon />
-					{{ formatMessage(messages.alwaysIgnore) }}
-				</button>
-			</ButtonStyled>
-			<ButtonStyled color="red">
-				<button @click="tempIgnored = true">
-					<XIcon />
-					{{ formatMessage(messages.ignoreErrors) }}
-				</button>
-			</ButtonStyled>
+			<Button
+				type="quiet"
+				color="red"
+				class="hover:!bg-red hover:!text-[var(--color-accent-contrast)] focus-visible:!bg-red focus-visible:!text-[var(--color-accent-contrast)]"
+				@click="alwaysIgnoreBanner"
+			>
+				<XCircleIcon />
+				{{ formatMessage(messages.alwaysIgnore) }}
+			</Button>
+			<Button type="colored" color="red" @click="tempIgnored = true">
+				<XIcon />
+				{{ formatMessage(messages.ignoreErrors) }}
+			</Button>
 		</template>
 	</PagewideBanner>
 </template>
diff --git a/apps/frontend/src/components/ui/banner/PreviewBanner.vue b/apps/frontend/src/components/ui/banner/PreviewBanner.vue
index d6d2463a9e..c8bf522d65 100644
--- a/apps/frontend/src/components/ui/banner/PreviewBanner.vue
+++ b/apps/frontend/src/components/ui/banner/PreviewBanner.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
 import { XIcon } from '@modrinth/assets'
 import {
-	ButtonStyled,
 	commonMessages,
 	defineMessages,
+	IconButton,
 	IntlFormatted,
 	PagewideBanner,
 	useVIntl,
@@ -70,11 +70,13 @@ const url = computed(() => `https://modrinth.com${route.fullPath}`)
 			</span>
 		</template>
 		<template #actions_top_right>
-			<ButtonStyled type="transparent" circular>
-				<button :aria-label="formatMessage(commonMessages.closeButton)" @click="hidePreviewBanner">
-					<XIcon aria-hidden="true" />
-				</button>
-			</ButtonStyled>
+			<IconButton
+				type="quiet"
+				:label="formatMessage(commonMessages.closeButton)"
+				@click="hidePreviewBanner"
+			>
+				<XIcon aria-hidden="true" />
+			</IconButton>
 		</template>
 	</PagewideBanner>
 </template>
diff --git a/apps/frontend/src/components/ui/banner/RussiaBanner.vue b/apps/frontend/src/components/ui/banner/RussiaBanner.vue
index 35f426f217..23478bfe6c 100644
--- a/apps/frontend/src/components/ui/banner/RussiaBanner.vue
+++ b/apps/frontend/src/components/ui/banner/RussiaBanner.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { BookTextIcon, XIcon } from '@modrinth/assets'
-import { ButtonStyled, commonMessages, PagewideBanner, useVIntl } from '@modrinth/ui'
+import { ButtonLink, commonMessages, IconButton, PagewideBanner, useVIntl } from '@modrinth/ui'
 
 const flags = useFeatureFlags()
 const { formatMessage } = useVIntl()
@@ -41,29 +41,25 @@ function hideRussiaCensorshipBanner() {
 		</template>
 		<template #actions>
 			<div class="mt-2 flex w-fit gap-2">
-				<ButtonStyled color="brand">
-					<nuxt-link to="/news/article/standing-by-our-values-russian">
-						<BookTextIcon /> Прочесть наше полное заявление
-						<span class="text-xs font-medium">(Перевод на русский)</span>
-					</nuxt-link>
-				</ButtonStyled>
-				<ButtonStyled type="transparent" hover-color-fill="background">
-					<nuxt-link to="/news/article/standing-by-our-values">
-						<BookTextIcon /> Read our full statement
-						<span class="text-xs font-medium">(English)</span>
-					</nuxt-link>
-				</ButtonStyled>
+				<ButtonLink type="colored" color="brand" to="/news/article/standing-by-our-values-russian">
+					<BookTextIcon /> Прочесть наше полное заявление
+					<span class="text-xs font-medium">(Перевод на русский)</span>
+				</ButtonLink>
+				<ButtonLink type="quiet" to="/news/article/standing-by-our-values">
+					<BookTextIcon /> Read our full statement
+					<span class="text-xs font-medium">(English)</span>
+				</ButtonLink>
 			</div>
 		</template>
 		<template #actions_top_right>
-			<ButtonStyled circular type="transparent">
-				<button
-					v-tooltip="formatMessage(commonMessages.closeButton)"
-					@click="hideRussiaCensorshipBanner"
-				>
-					<XIcon :aria-label="formatMessage(commonMessages.closeButton)" />
-				</button>
-			</ButtonStyled>
+			<IconButton
+				v-tooltip="formatMessage(commonMessages.closeButton)"
+				type="quiet"
+				:label="formatMessage(commonMessages.closeButton)"
+				@click="hideRussiaCensorshipBanner"
+			>
+				<XIcon :aria-label="formatMessage(commonMessages.closeButton)" />
+			</IconButton>
 		</template>
 	</PagewideBanner>
 </template>
diff --git a/apps/frontend/src/components/ui/banner/StagingBanner.vue b/apps/frontend/src/components/ui/banner/StagingBanner.vue
index 0f699793c9..0d33d6c8e7 100644
--- a/apps/frontend/src/components/ui/banner/StagingBanner.vue
+++ b/apps/frontend/src/components/ui/banner/StagingBanner.vue
@@ -1,12 +1,6 @@
 <script setup lang="ts">
 import { XIcon } from '@modrinth/assets'
-import {
-	ButtonStyled,
-	commonMessages,
-	defineMessages,
-	PagewideBanner,
-	useVIntl,
-} from '@modrinth/ui'
+import { commonMessages, defineMessages, IconButton, PagewideBanner, useVIntl } from '@modrinth/ui'
 
 const { formatMessage } = useVIntl()
 const cosmetics = useCosmetics()
@@ -38,11 +32,13 @@ function hideStagingBanner() {
 			{{ formatMessage(messages.description) }}
 		</template>
 		<template #actions_top_right>
-			<ButtonStyled type="transparent" circular>
-				<button :aria-label="formatMessage(commonMessages.closeButton)" @click="hideStagingBanner">
-					<XIcon aria-hidden="true" />
-				</button>
-			</ButtonStyled>
+			<IconButton
+				type="quiet"
+				:label="formatMessage(commonMessages.closeButton)"
+				@click="hideStagingBanner"
+			>
+				<XIcon aria-hidden="true" />
+			</IconButton>
 		</template>
 	</PagewideBanner>
 </template>
diff --git a/apps/frontend/src/components/ui/banner/SubscriptionPaymentFailedBanner.vue b/apps/frontend/src/components/ui/banner/SubscriptionPaymentFailedBanner.vue
index d53ba3a264..872799edb5 100644
--- a/apps/frontend/src/components/ui/banner/SubscriptionPaymentFailedBanner.vue
+++ b/apps/frontend/src/components/ui/banner/SubscriptionPaymentFailedBanner.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { SettingsIcon } from '@modrinth/assets'
-import { ButtonStyled, defineMessages, PagewideBanner, useVIntl } from '@modrinth/ui'
+import { ButtonLink, defineMessages, PagewideBanner, useVIntl } from '@modrinth/ui'
 
 const { formatMessage } = useVIntl()
 
@@ -30,12 +30,10 @@ const messages = defineMessages({
 			<span>{{ formatMessage(messages.description) }}</span>
 		</template>
 		<template #actions_right>
-			<ButtonStyled color="red">
-				<nuxt-link to="/settings/billing">
-					<SettingsIcon aria-hidden="true" />
-					{{ formatMessage(messages.action) }}
-				</nuxt-link>
-			</ButtonStyled>
+			<ButtonLink type="colored" color="red" to="/settings/billing">
+				<SettingsIcon aria-hidden="true" />
+				{{ formatMessage(messages.action) }}
+			</ButtonLink>
 		</template>
 	</PagewideBanner>
 </template>
diff --git a/apps/frontend/src/components/ui/banner/TaxComplianceBanner.vue b/apps/frontend/src/components/ui/banner/TaxComplianceBanner.vue
index b40dc5be71..fbccea2ccc 100644
--- a/apps/frontend/src/components/ui/banner/TaxComplianceBanner.vue
+++ b/apps/frontend/src/components/ui/banner/TaxComplianceBanner.vue
@@ -1,12 +1,6 @@
 <script setup lang="ts">
 import { FileTextIcon } from '@modrinth/assets'
-import {
-	ButtonStyled,
-	defineMessages,
-	PagewideBanner,
-	useFormatMoney,
-	useVIntl,
-} from '@modrinth/ui'
+import { Button, defineMessages, PagewideBanner, useFormatMoney, useVIntl } from '@modrinth/ui'
 import { computed } from 'vue'
 
 import { getTaxThreshold } from '@/providers/creator-withdraw.ts'
@@ -56,9 +50,9 @@ function openTaxForm(e: MouseEvent) {
 			}}</span>
 		</template>
 		<template #actions_right>
-			<ButtonStyled color="orange">
-				<button @click="openTaxForm"><FileTextIcon /> {{ formatMessage(messages.action) }}</button>
-			</ButtonStyled>
+			<Button type="colored" color="orange" @click="openTaxForm"
+				><FileTextIcon /> {{ formatMessage(messages.action) }}</Button
+			>
 		</template>
 	</PagewideBanner>
 </template>
diff --git a/apps/frontend/src/components/ui/banner/TaxIdMismatchBanner.vue b/apps/frontend/src/components/ui/banner/TaxIdMismatchBanner.vue
index 50b2996f2f..996696d0cb 100644
--- a/apps/frontend/src/components/ui/banner/TaxIdMismatchBanner.vue
+++ b/apps/frontend/src/components/ui/banner/TaxIdMismatchBanner.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { MessageIcon } from '@modrinth/assets'
-import { ButtonStyled, defineMessages, PagewideBanner, useVIntl } from '@modrinth/ui'
+import { ButtonLink, defineMessages, PagewideBanner, useVIntl } from '@modrinth/ui'
 
 const { formatMessage } = useVIntl()
 
@@ -31,12 +31,16 @@ const messages = defineMessages({
 		</template>
 		<template #actions_right>
 			<div class="flex w-fit flex-row">
-				<ButtonStyled color="red">
-					<nuxt-link to="https://support.modrinth.com" target="_blank" rel="noopener">
-						<MessageIcon />
-						{{ formatMessage(messages.action) }}
-					</nuxt-link>
-				</ButtonStyled>
+				<ButtonLink
+					type="colored"
+					color="red"
+					to="https://support.modrinth.com"
+					target="_blank"
+					rel="noopener"
+				>
+					<MessageIcon />
+					{{ formatMessage(messages.action) }}
+				</ButtonLink>
 			</div>
 		</template>
 	</PagewideBanner>
diff --git a/apps/frontend/src/components/ui/banner/VerifyEmailBanner.vue b/apps/frontend/src/components/ui/banner/VerifyEmailBanner.vue
index eb00ae63cd..c9f7f2b79c 100644
--- a/apps/frontend/src/components/ui/banner/VerifyEmailBanner.vue
+++ b/apps/frontend/src/components/ui/banner/VerifyEmailBanner.vue
@@ -1,7 +1,8 @@
 <script setup lang="ts">
 import { SettingsIcon } from '@modrinth/assets'
 import {
-	ButtonStyled,
+	Button,
+	ButtonLink,
 	defineMessages,
 	injectNotificationManager,
 	PagewideBanner,
@@ -97,15 +98,13 @@ async function handleResendEmailVerification() {
 			</span>
 		</template>
 		<template #actions_right>
-			<ButtonStyled color="orange">
-				<button v-if="hasEmail" @click="handleResendEmailVerification">
-					{{ formatMessage(verifyEmailBannerMessages.action) }}
-				</button>
-				<nuxt-link v-else to="/settings/account">
-					<SettingsIcon aria-hidden="true" />
-					{{ formatMessage(addEmailBannerMessages.action) }}
-				</nuxt-link>
-			</ButtonStyled>
+			<Button v-if="hasEmail" type="colored" color="orange" @click="handleResendEmailVerification">
+				{{ formatMessage(verifyEmailBannerMessages.action) }}
+			</Button>
+			<ButtonLink v-else type="colored" color="orange" to="/settings/account">
+				<SettingsIcon aria-hidden="true" />
+				{{ formatMessage(addEmailBannerMessages.action) }}
+			</ButtonLink>
 		</template>
 	</PagewideBanner>
 </template>
diff --git a/apps/frontend/src/components/ui/create-project-version/components/AddedDependencyRow.vue b/apps/frontend/src/components/ui/create-project-version/components/AddedDependencyRow.vue
index e6874350f2..e369597d61 100644
--- a/apps/frontend/src/components/ui/create-project-version/components/AddedDependencyRow.vue
+++ b/apps/frontend/src/components/ui/create-project-version/components/AddedDependencyRow.vue
@@ -25,11 +25,9 @@
 		</div>
 
 		<div v-if="!hideRemove" class="flex shrink-0 items-center justify-end gap-1">
-			<ButtonStyled size="standard" :circular="true">
-				<button aria-label="Remove file" class="-mr-2 !shadow-none" @click="emitRemove">
-					<XIcon aria-hidden="true" />
-				</button>
-			</ButtonStyled>
+			<Button aria-label="Remove file" class="-mr-2" @click="emitRemove">
+				<XIcon aria-hidden="true" />
+			</Button>
 		</div>
 	</div>
 </template>
@@ -37,7 +35,7 @@
 <script setup lang="ts">
 import type { Labrinth } from '@modrinth/api-client'
 import { XIcon } from '@modrinth/assets'
-import { Avatar, ButtonStyled, TagItem } from '@modrinth/ui'
+import { Avatar, Button, TagItem } from '@modrinth/ui'
 
 const emit = defineEmits<{
 	(e: 'fileTypeChange', type: string): void
diff --git a/apps/frontend/src/components/ui/create-project-version/components/McVersionPicker.vue b/apps/frontend/src/components/ui/create-project-version/components/McVersionPicker.vue
index c921513b43..31383eb25e 100644
--- a/apps/frontend/src/components/ui/create-project-version/components/McVersionPicker.vue
+++ b/apps/frontend/src/components/ui/create-project-version/components/McVersionPicker.vue
@@ -26,36 +26,60 @@
 			<div v-for="group in groupedGameVersions" :key="group.key" class="space-y-1.5">
 				<span class="font-semibold">{{ group.key }}</span>
 				<div class="flex flex-wrap gap-2 gap-x-1.5">
-					<ButtonStyled
+					<Button
 						v-for="version in group.versions"
 						:key="version"
+						:type="
+							modelValue.includes(version) || (holdingShift && version === anchorVersion)
+								? 'colored'
+								: 'base'
+						"
 						:color="
-							holdingShift && version === anchorVersion
+							(holdingShift && version === anchorVersion
 								? 'purple'
 								: modelValue.includes(version)
 									? 'green'
-									: 'standard'
+									: 'standard') &&
+							(holdingShift && version === anchorVersion
+								? 'purple'
+								: modelValue.includes(version)
+									? 'green'
+									: 'standard') !== 'standard'
+								? (holdingShift && version === anchorVersion
+										? 'purple'
+										: modelValue.includes(version)
+											? 'green'
+											: 'standard') === 'medal-promo'
+									? 'medal_promotion'
+									: holdingShift && version === anchorVersion
+										? 'purple'
+										: modelValue.includes(version)
+											? 'green'
+											: 'standard'
+								: undefined
 						"
-						:highlighted="modelValue.includes(version)"
-						type="chip"
-					>
-						<button
-							class="!py-1.5 focus:outline-none"
-							:class="[
+						class="!py-1.5 focus:outline-none"
+						:class="[
+							[
 								versionType === 'all' && !group.isReleaseGroup ? 'w-max' : 'w-16',
 								modelValue.includes(version) ? '!text-contrast' : '',
-							]"
-							:disabled="disabled"
-							@click="() => handleToggleVersion(version)"
-							@blur="
-								() => {
-									if (!holdingShift) anchorVersion = ''
-								}
-							"
-						>
-							{{ version }}
-						</button>
-					</ButtonStyled>
+							],
+							modelValue.includes(version)
+								? true
+									? '!bg-[var(--color-button-bg-selected)] !text-[var(--color-button-text-selected)] [&>svg]:!text-[var(--color-button-text-selected)]'
+									: '!bg-[var(--color-button-bg)] !text-contrast'
+								: '',
+						]"
+						:disabled="disabled"
+						@click="() => handleToggleVersion(version)"
+						@blur="
+							() => {
+								if (!holdingShift) anchorVersion = ''
+							}
+						"
+					>
+						{{ version }}
+					</Button>
 				</div>
 			</div>
 
@@ -68,7 +92,7 @@
 <script lang="ts" setup>
 import type { Labrinth } from '@modrinth/api-client'
 import { SearchIcon } from '@modrinth/assets'
-import { ButtonStyled, Chips, StyledInput } from '@modrinth/ui'
+import { Button, Chips, StyledInput } from '@modrinth/ui'
 import { useMagicKeys } from '@vueuse/core'
 import { computed, nextTick, onMounted, ref } from 'vue'
 
diff --git a/apps/frontend/src/components/ui/create-project-version/components/SuggestedDependencies/SuggestedDependency.vue b/apps/frontend/src/components/ui/create-project-version/components/SuggestedDependencies/SuggestedDependency.vue
index d7092beadd..719c84c3fc 100644
--- a/apps/frontend/src/components/ui/create-project-version/components/SuggestedDependencies/SuggestedDependency.vue
+++ b/apps/frontend/src/components/ui/create-project-version/components/SuggestedDependencies/SuggestedDependency.vue
@@ -26,11 +26,9 @@
 		</div>
 
 		<div class="flex shrink-0 items-center justify-end gap-1">
-			<ButtonStyled size="standard" :circular="true" type="transparent">
-				<button aria-label="Add dependency" class="!shadow-none" @click="emitAddSuggestion">
-					<PlusIcon aria-hidden="true" />
-				</button>
-			</ButtonStyled>
+			<Button type="quiet" aria-label="Add dependency" @click="emitAddSuggestion">
+				<PlusIcon aria-hidden="true" />
+			</Button>
 		</div>
 	</div>
 </template>
@@ -38,7 +36,7 @@
 <script setup lang="ts">
 import type { Labrinth } from '@modrinth/api-client'
 import { PlusIcon } from '@modrinth/assets'
-import { Avatar, ButtonStyled, TagItem } from '@modrinth/ui'
+import { Avatar, Button, TagItem } from '@modrinth/ui'
 
 const emit = defineEmits<{
 	(e: 'onAddSuggestion'): void
diff --git a/apps/frontend/src/components/ui/create-project-version/components/VersionFileRow.vue b/apps/frontend/src/components/ui/create-project-version/components/VersionFileRow.vue
index bc74a25977..486561dcb7 100644
--- a/apps/frontend/src/components/ui/create-project-version/components/VersionFileRow.vue
+++ b/apps/frontend/src/components/ui/create-project-version/components/VersionFileRow.vue
@@ -27,39 +27,36 @@
 				</div>
 			</template>
 
-			<ButtonStyled v-if="onRemove" size="standard" :circular="true">
-				<button aria-label="Remove file" class="!shadow-none" @click="onRemove">
-					<XIcon aria-hidden="true" />
-				</button>
-			</ButtonStyled>
-			<ButtonStyled v-if="isPrimary" size="standard" :circular="true">
-				<button
-					v-tooltip="
-						editingVersion
-							? 'Primary file cannot be changed after version is uploaded'
-							: 'Replace primary file'
-					"
-					aria-label="Change primary file"
-					class="!shadow-none"
+			<IconButton v-if="onRemove" label="Remove file" type="quiet" @click="onRemove">
+				<XIcon aria-hidden="true" />
+			</IconButton>
+			<IconButton
+				v-if="isPrimary"
+				v-tooltip="
+					editingVersion
+						? 'Primary file cannot be changed after version is uploaded'
+						: 'Replace primary file'
+				"
+				label="Change primary file"
+				type="quiet"
+				:disabled="editingVersion"
+				@click="primaryFileInput?.click()"
+			>
+				<ArrowLeftRightIcon aria-hidden="true" />
+				<input
+					ref="primaryFileInput"
+					class="hidden"
+					type="file"
+					:accept="acceptFileFromProjectType(projectV2.project_type)"
 					:disabled="editingVersion"
-					@click="primaryFileInput?.click()"
-				>
-					<ArrowLeftRightIcon aria-hidden="true" />
-					<input
-						ref="primaryFileInput"
-						class="hidden"
-						type="file"
-						:accept="acceptFileFromProjectType(projectV2.project_type)"
-						:disabled="editingVersion"
-						@change="
-							(e) => {
-								emit('setPrimaryFile', (e.target as HTMLInputElement)?.files?.[0])
-								;(e.target as HTMLInputElement).value = ''
-							}
-						"
-					/>
-				</button>
-			</ButtonStyled>
+					@change="
+						(e) => {
+							emit('setPrimaryFile', (e.target as HTMLInputElement)?.files?.[0])
+							;(e.target as HTMLInputElement).value = ''
+						}
+					"
+				/>
+			</IconButton>
 		</div>
 	</div>
 </template>
@@ -67,7 +64,7 @@
 <script setup lang="ts">
 import type { Labrinth } from '@modrinth/api-client'
 import { ArrowLeftRightIcon, CheckIcon, XIcon } from '@modrinth/assets'
-import { ButtonStyled, Combobox, injectProjectPageContext } from '@modrinth/ui'
+import { Combobox, IconButton, injectProjectPageContext } from '@modrinth/ui'
 import type { ComboboxOption } from '@modrinth/ui/src/components/base/Combobox.vue'
 import { acceptFileFromProjectType } from '@modrinth/utils'
 
diff --git a/apps/frontend/src/components/ui/create-project-version/stages/LoadersStage.vue b/apps/frontend/src/components/ui/create-project-version/stages/LoadersStage.vue
index a0ff8f6777..49b68dbc24 100644
--- a/apps/frontend/src/components/ui/create-project-version/stages/LoadersStage.vue
+++ b/apps/frontend/src/components/ui/create-project-version/stages/LoadersStage.vue
@@ -10,9 +10,7 @@
 		<div v-if="draftVersion.loaders.length" class="space-y-1">
 			<div class="flex items-center justify-between">
 				<span class="font-semibold text-contrast"> Added loaders </span>
-				<ButtonStyled type="transparent" size="standard">
-					<button @click="onClearAll()">Clear all</button>
-				</ButtonStyled>
+				<Button type="quiet" @click="onClearAll()">Clear all</Button>
 			</div>
 			<div
 				class="flex flex-col gap-1.5 gap-y-4 rounded-xl border border-solid border-surface-5 p-3 py-4"
@@ -43,7 +41,7 @@
 
 <script lang="ts" setup>
 import { getLoaderIcon, XIcon } from '@modrinth/assets'
-import { ButtonStyled, FormattedTag, TagItem } from '@modrinth/ui'
+import { Button, FormattedTag, TagItem } from '@modrinth/ui'
 
 import { injectManageVersionContext } from '~/providers/version/manage-version-modal'
 
diff --git a/apps/frontend/src/components/ui/create-project-version/stages/McVersionsStage.vue b/apps/frontend/src/components/ui/create-project-version/stages/McVersionsStage.vue
index d28345b782..240a7f1159 100644
--- a/apps/frontend/src/components/ui/create-project-version/stages/McVersionsStage.vue
+++ b/apps/frontend/src/components/ui/create-project-version/stages/McVersionsStage.vue
@@ -4,9 +4,7 @@
 		<div v-if="draftVersion.game_versions.length" class="space-y-1">
 			<div class="flex items-center justify-between">
 				<span class="font-semibold text-contrast"> Added versions </span>
-				<ButtonStyled type="transparent" size="standard">
-					<button @click="clearAllVersions()">Clear all</button>
-				</ButtonStyled>
+				<Button type="quiet" @click="clearAllVersions()">Clear all</Button>
 			</div>
 			<div
 				class="flex max-h-56 flex-col gap-1.5 gap-y-4 overflow-y-auto rounded-xl border border-solid border-surface-5 p-3 py-4"
@@ -34,7 +32,7 @@
 
 <script lang="ts" setup>
 import { XIcon } from '@modrinth/assets'
-import { ButtonStyled, TagItem } from '@modrinth/ui'
+import { Button, TagItem } from '@modrinth/ui'
 
 import { injectManageVersionContext } from '~/providers/version/manage-version-modal'
 
diff --git a/apps/frontend/src/components/ui/create-project-version/stages/MetadataStage.vue b/apps/frontend/src/components/ui/create-project-version/stages/MetadataStage.vue
index 2cf9d26014..d0ead22318 100644
--- a/apps/frontend/src/components/ui/create-project-version/stages/MetadataStage.vue
+++ b/apps/frontend/src/components/ui/create-project-version/stages/MetadataStage.vue
@@ -11,12 +11,10 @@
 			<div class="flex items-center justify-between">
 				<span class="font-semibold text-contrast">{{ formatMessage(messages.uploadedFiles) }}</span>
 
-				<ButtonStyled type="transparent" size="standard">
-					<button @click="editFiles">
-						<EditIcon />
-						{{ formatMessage(messages.editButton) }}
-					</button>
-				</ButtonStyled>
+				<Button type="quiet" @click="editFiles">
+					<EditIcon />
+					{{ formatMessage(messages.editButton) }}
+				</Button>
 			</div>
 			<div class="flex flex-col gap-2.5">
 				<ViewOnlyFileRow
@@ -50,22 +48,21 @@
 					}}
 				</span>
 
-				<ButtonStyled type="transparent" size="standard">
-					<button
-						v-tooltip="
-							isModpack
-								? formatMessage(messages.modpackLoadersTooltip)
-								: isResourcePack
-									? formatMessage(messages.resourcePackLoadersTooltip)
-									: undefined
-						"
-						:disabled="isModpack || isResourcePack"
-						@click="editLoaders"
-					>
-						<EditIcon />
-						{{ formatMessage(messages.editButton) }}
-					</button>
-				</ButtonStyled>
+				<Button
+					v-tooltip="
+						isModpack
+							? formatMessage(messages.modpackLoadersTooltip)
+							: isResourcePack
+								? formatMessage(messages.resourcePackLoadersTooltip)
+								: undefined
+					"
+					type="quiet"
+					:disabled="isModpack || isResourcePack"
+					@click="editLoaders"
+				>
+					<EditIcon />
+					{{ formatMessage(messages.editButton) }}
+				</Button>
 			</div>
 
 			<div
@@ -111,16 +108,15 @@
 					}}
 				</span>
 
-				<ButtonStyled type="transparent" size="standard">
-					<button
-						v-tooltip="isModpack ? formatMessage(messages.modpackVersionsTooltip) : undefined"
-						:disabled="isModpack"
-						@click="editVersions"
-					>
-						<EditIcon />
-						{{ formatMessage(messages.editButton) }}
-					</button>
-				</ButtonStyled>
+				<Button
+					v-tooltip="isModpack ? formatMessage(messages.modpackVersionsTooltip) : undefined"
+					type="quiet"
+					:disabled="isModpack"
+					@click="editVersions"
+				>
+					<EditIcon />
+					{{ formatMessage(messages.editButton) }}
+				</Button>
 			</div>
 
 			<div
@@ -152,12 +148,10 @@
 						<UnknownIcon v-tooltip="formatMessage(messages.prefilledEnvironmentTooltip)" />
 					</div>
 
-					<ButtonStyled type="transparent" size="standard">
-						<button @click="editEnvironment">
-							<EditIcon />
-							{{ formatMessage(messages.editButton) }}
-						</button>
-					</ButtonStyled>
+					<Button type="quiet" @click="editEnvironment">
+						<EditIcon />
+						{{ formatMessage(messages.editButton) }}
+					</Button>
 				</div>
 
 				<div class="flex flex-col gap-1.5 gap-y-4 rounded-xl bg-surface-2 p-3 py-4">
@@ -183,12 +177,10 @@
 							formatMessage(messages.dependencies)
 						}}</span>
 
-						<ButtonStyled type="transparent" size="standard">
-							<button @click="addDependency">
-								<PlusIcon />
-								{{ formatMessage(messages.addDependency) }}
-							</button>
-						</ButtonStyled>
+						<Button type="quiet" @click="addDependency">
+							<PlusIcon />
+							{{ formatMessage(messages.addDependency) }}
+						</Button>
 					</div>
 
 					<div v-if="draftVersion.dependencies?.length" class="flex flex-col gap-4">
@@ -215,8 +207,8 @@
 <script lang="ts" setup>
 import type { Labrinth } from '@modrinth/api-client'
 import { EditIcon, getLoaderIcon, PlusIcon, UnknownIcon } from '@modrinth/assets'
+import { Button } from '@modrinth/ui'
 import {
-	ButtonStyled,
 	defineMessages,
 	ENVIRONMENTS_COPY,
 	FormattedTag,
diff --git a/apps/frontend/src/components/ui/create/CollectionCreateModal.vue b/apps/frontend/src/components/ui/create/CollectionCreateModal.vue
index 50c4e96aae..3904ad76c2 100644
--- a/apps/frontend/src/components/ui/create/CollectionCreateModal.vue
+++ b/apps/frontend/src/components/ui/create/CollectionCreateModal.vue
@@ -38,18 +38,14 @@
 				{{ formatMessage(messages.collectionInfo, { count: projectIds.length }) }}
 			</p>
 			<div class="flex justify-end gap-2">
-				<ButtonStyled type="outlined">
-					<button @click="modal.hide()">
-						<XIcon aria-hidden="true" />
-						{{ formatMessage(commonMessages.cancelButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="brand">
-					<button :disabled="hasHitLimit" @click="create">
-						<PlusIcon aria-hidden="true" />
-						{{ formatMessage(messages.createCollection) }}
-					</button>
-				</ButtonStyled>
+				<Button type="outlined" @click="modal.hide()">
+					<XIcon aria-hidden="true" />
+					{{ formatMessage(commonMessages.cancelButton) }}
+				</Button>
+				<Button type="colored" color="brand" :disabled="hasHitLimit" @click="create">
+					<PlusIcon aria-hidden="true" />
+					{{ formatMessage(messages.createCollection) }}
+				</Button>
 			</div>
 		</div>
 	</NewModal>
@@ -57,7 +53,7 @@
 <script setup>
 import { PlusIcon, XIcon } from '@modrinth/assets'
 import {
-	ButtonStyled,
+	Button,
 	commonMessages,
 	defineMessages,
 	injectNotificationManager,
diff --git a/apps/frontend/src/components/ui/create/CreateLimitAlert.vue b/apps/frontend/src/components/ui/create/CreateLimitAlert.vue
index 1c628574fd..c4d717f4e2 100644
--- a/apps/frontend/src/components/ui/create/CreateLimitAlert.vue
+++ b/apps/frontend/src/components/ui/create/CreateLimitAlert.vue
@@ -13,11 +13,9 @@
 			<template v-if="hasHitLimit">
 				{{ formatMessage(messages.limitReachedDescription, { type: typeName.singular, max }) }}
 				<div class="w-min">
-					<ButtonStyled color="red">
-						<NuxtLink to="https://support.modrinth.com" target="_blank">
-							<MessageIcon />{{ formatMessage(messages.contactSupport) }}</NuxtLink
-						>
-					</ButtonStyled>
+					<ButtonLink type="colored" color="red" to="https://support.modrinth.com" target="_blank">
+						<MessageIcon />{{ formatMessage(messages.contactSupport) }}</ButtonLink
+					>
 				</div>
 			</template>
 			<template v-else>
@@ -29,11 +27,14 @@
 					})
 				}}
 				<div class="w-min">
-					<ButtonStyled color="orange">
-						<NuxtLink to="https://support.modrinth.com" target="_blank">
-							<MessageIcon />{{ formatMessage(messages.contactSupport) }}</NuxtLink
-						>
-					</ButtonStyled>
+					<ButtonLink
+						type="colored"
+						color="orange"
+						to="https://support.modrinth.com"
+						target="_blank"
+					>
+						<MessageIcon />{{ formatMessage(messages.contactSupport) }}</ButtonLink
+					>
 				</div>
 			</template>
 		</div>
@@ -44,7 +45,7 @@
 import { MessageIcon } from '@modrinth/assets'
 import {
 	Admonition,
-	ButtonStyled,
+	ButtonLink,
 	defineMessages,
 	injectModrinthClient,
 	useVIntl,
diff --git a/apps/frontend/src/components/ui/create/OrganizationCreateModal.vue b/apps/frontend/src/components/ui/create/OrganizationCreateModal.vue
index 687e2c2362..44009fc4d8 100644
--- a/apps/frontend/src/components/ui/create/OrganizationCreateModal.vue
+++ b/apps/frontend/src/components/ui/create/OrganizationCreateModal.vue
@@ -59,18 +59,14 @@
 				{{ formatMessage(messages.ownershipInfo) }}
 			</p>
 			<div class="flex justify-end gap-2">
-				<ButtonStyled type="outlined">
-					<button @click="hide">
-						<XIcon aria-hidden="true" />
-						{{ formatMessage(commonMessages.cancelButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="brand">
-					<button :disabled="hasHitLimit" @click="createOrganization">
-						<PlusIcon aria-hidden="true" />
-						{{ formatMessage(messages.createOrganization) }}
-					</button>
-				</ButtonStyled>
+				<Button type="outlined" @click="hide">
+					<XIcon aria-hidden="true" />
+					{{ formatMessage(commonMessages.cancelButton) }}
+				</Button>
+				<Button type="colored" color="brand" :disabled="hasHitLimit" @click="createOrganization">
+					<PlusIcon aria-hidden="true" />
+					{{ formatMessage(messages.createOrganization) }}
+				</Button>
 			</div>
 		</div>
 	</NewModal>
@@ -79,7 +75,7 @@
 <script setup lang="ts">
 import { PlusIcon, XIcon } from '@modrinth/assets'
 import {
-	ButtonStyled,
+	Button,
 	commonMessages,
 	defineMessages,
 	injectNotificationManager,
diff --git a/apps/frontend/src/components/ui/create/ProjectCreateModal.vue b/apps/frontend/src/components/ui/create/ProjectCreateModal.vue
index 0000146bb0..4bcd969178 100644
--- a/apps/frontend/src/components/ui/create/ProjectCreateModal.vue
+++ b/apps/frontend/src/components/ui/create/ProjectCreateModal.vue
@@ -111,18 +111,20 @@
 				<span>{{ formatMessage(messages.summaryDescription) }}</span>
 			</div>
 			<div class="flex justify-end gap-2.5">
-				<ButtonStyled type="outlined">
-					<button @click="cancel">
-						<XIcon aria-hidden="true" />
-						{{ formatMessage(commonMessages.cancelButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="brand">
-					<button v-tooltip="missingFieldsTooltip" :disabled="disableCreate" @click="createProject">
-						<PlusIcon aria-hidden="true" />
-						{{ formatMessage(messages.createProject) }}
-					</button>
-				</ButtonStyled>
+				<Button type="outlined" @click="cancel">
+					<XIcon aria-hidden="true" />
+					{{ formatMessage(commonMessages.cancelButton) }}
+				</Button>
+				<Button
+					v-tooltip="missingFieldsTooltip"
+					type="colored"
+					color="brand"
+					:disabled="disableCreate"
+					@click="createProject"
+				>
+					<PlusIcon aria-hidden="true" />
+					{{ formatMessage(messages.createProject) }}
+				</Button>
 			</div>
 		</div>
 	</NewModal>
@@ -131,8 +133,8 @@
 <script setup lang="ts">
 import type { Labrinth } from '@modrinth/api-client'
 import { OrganizationIcon, PlusIcon, XIcon } from '@modrinth/assets'
+import { Button } from '@modrinth/ui'
 import {
-	ButtonStyled,
 	Chips,
 	Combobox,
 	type ComboboxOption,
diff --git a/apps/frontend/src/components/ui/dashboard/CreatorTaxFormModal.vue b/apps/frontend/src/components/ui/dashboard/CreatorTaxFormModal.vue
index ef2cc08bc5..83ca57653d 100644
--- a/apps/frontend/src/components/ui/dashboard/CreatorTaxFormModal.vue
+++ b/apps/frontend/src/components/ui/dashboard/CreatorTaxFormModal.vue
@@ -81,16 +81,12 @@
 					</div>
 				</Transition>
 				<div class="mt-4 flex justify-end gap-3">
-					<ButtonStyled @click="handleCancel">
-						<button><XIcon /> {{ formatMessage(messages.cancel) }}</button>
-					</ButtonStyled>
-					<ButtonStyled>
-						<button :disabled="!canContinue || loading" @click="continueForm">
-							{{ formatMessage(messages.continue) }}
-							<RightArrowIcon v-if="!loading" />
-							<SpinnerIcon v-else class="animate-spin" />
-						</button>
-					</ButtonStyled>
+					<Button @click="handleCancel"><XIcon /> {{ formatMessage(messages.cancel) }}</Button>
+					<Button :disabled="!canContinue || loading" @click="continueForm">
+						{{ formatMessage(messages.continue) }}
+						<RightArrowIcon v-if="!loading" />
+						<SpinnerIcon v-else class="animate-spin" />
+					</Button>
 				</div>
 			</div>
 
@@ -136,18 +132,19 @@
 					</span>
 				</div>
 				<div class="flex w-full flex-row justify-stretch gap-2">
-					<ButtonStyled>
-						<button class="w-full text-contrast" @click="handleClose">
-							{{ props.closeButtonText ?? formatMessage(messages.closeButton) }}
-						</button>
-					</ButtonStyled>
-					<ButtonStyled color="green">
-						<button class="w-full text-contrast" @click="downloadTaxForm">
-							<DownloadIcon />{{
-								formatMessage(messages.downloadButton, { formType: determinedFormType })
-							}}
-						</button>
-					</ButtonStyled>
+					<Button class="w-full text-contrast" @click="handleClose">
+						{{ props.closeButtonText ?? formatMessage(messages.closeButton) }}
+					</Button>
+					<Button
+						type="colored"
+						color="green"
+						class="w-full text-contrast"
+						@click="downloadTaxForm"
+					>
+						<DownloadIcon />{{
+							formatMessage(messages.downloadButton, { formType: determinedFormType })
+						}}
+					</Button>
 				</div>
 			</div>
 		</div>
@@ -165,7 +162,7 @@ import {
 } from '@modrinth/assets'
 import {
 	Admonition,
-	ButtonStyled,
+	Button,
 	Chips,
 	commonMessages,
 	defineMessages,
diff --git a/apps/frontend/src/components/ui/dashboard/CreatorWithdrawModal.vue b/apps/frontend/src/components/ui/dashboard/CreatorWithdrawModal.vue
index a6fe5ae171..a814f0062e 100644
--- a/apps/frontend/src/components/ui/dashboard/CreatorWithdrawModal.vue
+++ b/apps/frontend/src/components/ui/dashboard/CreatorWithdrawModal.vue
@@ -58,39 +58,40 @@
 		</div>
 		<template #actions>
 			<div v-if="currentStage === 'completion'" class="mt-4 flex w-full gap-3">
-				<ButtonStyled>
-					<button class="w-full flex-1 text-contrast" @click="handleClose">
-						{{ formatMessage(commonMessages.closeButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled>
-					<button class="w-full flex-1 text-contrast" @click="handleViewTransactions">
-						{{ formatMessage(messages.transactionsButton) }}
-					</button>
-				</ButtonStyled>
+				<Button class="w-full flex-1 text-contrast" @click="handleClose">
+					{{ formatMessage(commonMessages.closeButton) }}
+				</Button>
+				<Button class="w-full flex-1 text-contrast" @click="handleViewTransactions">
+					{{ formatMessage(messages.transactionsButton) }}
+				</Button>
 			</div>
 			<div v-else class="mt-4 flex flex-col justify-end gap-2 sm:flex-row">
-				<ButtonStyled type="outlined">
-					<button :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>
+				<Button
+					type="outlined"
+					:disabled="leftButtonConfig.disabled"
+					@click="leftButtonConfig.handler"
+				>
+					<component :is="leftButtonConfig.icon" />
+					{{ leftButtonConfig.label }}
+				</Button>
+				<Button
+					:type="rightButtonConfig.color === 'standard' ? 'base' : 'colored'"
+					:color="rightButtonConfig.color === 'standard' ? undefined : rightButtonConfig.color"
+					: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>
 			</div>
 		</template>
 	</NewModal>
@@ -114,7 +115,7 @@ import {
 	XIcon,
 } from '@modrinth/assets'
 import {
-	ButtonStyled,
+	Button,
 	commonMessages,
 	defineMessages,
 	injectNotificationManager,
diff --git a/apps/frontend/src/components/ui/dashboard/RevenueInputField.vue b/apps/frontend/src/components/ui/dashboard/RevenueInputField.vue
index fb1b469d37..73fe4f82eb 100644
--- a/apps/frontend/src/components/ui/dashboard/RevenueInputField.vue
+++ b/apps/frontend/src/components/ui/dashboard/RevenueInputField.vue
@@ -26,11 +26,9 @@
 					<span class="font-semibold leading-tight">{{ item.label }}</span>
 				</template>
 			</Combobox>
-			<ButtonStyled>
-				<button class="px-4 py-2" :disabled="isDisabled" @click="setMaxAmount">
-					{{ formatMessage(commonMessages.maxButton) }}
-				</button>
-			</ButtonStyled>
+			<Button class="px-4 py-2" :disabled="isDisabled" @click="setMaxAmount">
+				{{ formatMessage(commonMessages.maxButton) }}
+			</Button>
 		</div>
 		<div>
 			<span class="my-1 mt-0 text-secondary">{{ formatMoney(safeMaxAmount) }} available.</span>
@@ -50,7 +48,7 @@
 
 <script setup lang="ts">
 import {
-	ButtonStyled,
+	Button,
 	Combobox,
 	commonMessages,
 	formFieldPlaceholders,
diff --git a/apps/frontend/src/components/ui/dashboard/RevenueTransaction.vue b/apps/frontend/src/components/ui/dashboard/RevenueTransaction.vue
index 5370e1afd4..bf38b28340 100644
--- a/apps/frontend/src/components/ui/dashboard/RevenueTransaction.vue
+++ b/apps/frontend/src/components/ui/dashboard/RevenueTransaction.vue
@@ -55,10 +55,14 @@
 						no-auto-focus
 					>
 						<span class="my-auto align-middle"
-							><ButtonStyled circular type="outlined" size="small">
-								<button class="align-middle" @click="cancelPayout">
-									<XIcon />
-								</button> </ButtonStyled
+							><IconButton
+								type="outlined"
+								size="xs"
+								label="Button"
+								class="!size-6 align-middle"
+								@click="cancelPayout"
+							>
+								<XIcon /> </IconButton
 						></span>
 						<template #popper>
 							<div class="font-semibold text-contrast">Cancel transaction</div>
@@ -82,8 +86,8 @@ import {
 } from '@modrinth/assets'
 import {
 	BulletDivider,
-	ButtonStyled,
 	getCurrencyIcon,
+	IconButton,
 	injectNotificationManager,
 	useFormatDateTime,
 	useFormatMoney,
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 24974b3bba..31d1d3b089 100644
--- a/apps/frontend/src/components/ui/dashboard/withdraw-stages/LegacyPaypalDetailsStage.vue
+++ b/apps/frontend/src/components/ui/dashboard/withdraw-stages/LegacyPaypalDetailsStage.vue
@@ -8,17 +8,18 @@
 			</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>
+				<ButtonLink
+					v-if="!isPayPalAuthenticated"
+					:href="paypalAuthUrl"
+					class="w-min"
+					@click="handlePayPalAuth"
+				>
+					<PayPalColorIcon class="size-5" />
+					{{ formatMessage(messages.signInWithPaypal) }}
+				</ButtonLink>
+				<Button v-else class="w-min" @click="handleDisconnectPaypal">
+					<XIcon /> {{ formatMessage(messages.disconnectButton) }}
+				</Button>
 			</div>
 		</div>
 
@@ -46,21 +47,21 @@
 					:placeholder="formatMessage(messages.venmoHandlePlaceholder)"
 					wrapper-class="w-full"
 				/>
-				<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(commonMessages.savedLabel)
-								: formatMessage(commonMessages.saveButton)
-						}}
-					</button>
-				</ButtonStyled>
+				<Button
+					v-tooltip="!hasVenmoChanged ? 'Change the venmo username to save.' : undefined"
+					type="colored"
+					color="brand"
+					:disabled="venmoSaving || !hasVenmoChanged"
+					@click="saveVenmoHandle"
+				>
+					<CheckIcon v-if="venmoSaveSuccess" />
+					<SaveIcon v-else />
+					{{
+						venmoSaveSuccess
+							? formatMessage(commonMessages.savedLabel)
+							: formatMessage(commonMessages.saveButton)
+					}}
+				</Button>
 			</div>
 			<span v-if="venmoSaveError" class="text-sm font-bold text-red">
 				{{ venmoSaveError }}
@@ -104,7 +105,8 @@
 <script setup lang="ts">
 import { CheckIcon, PayPalColorIcon, SaveIcon, XIcon } from '@modrinth/assets'
 import {
-	ButtonStyled,
+	Button,
+	ButtonLink,
 	Checkbox,
 	commonMessages,
 	defineMessages,
diff --git a/apps/frontend/src/components/ui/dashboard/withdraw-stages/MethodSelectionStage.vue b/apps/frontend/src/components/ui/dashboard/withdraw-stages/MethodSelectionStage.vue
index 39a84d8085..16fae7fe2c 100644
--- a/apps/frontend/src/components/ui/dashboard/withdraw-stages/MethodSelectionStage.vue
+++ b/apps/frontend/src/components/ui/dashboard/withdraw-stages/MethodSelectionStage.vue
@@ -51,26 +51,29 @@
 					<SpinnerIcon class="size-8 animate-spin text-contrast" />
 				</div>
 				<template v-else>
-					<ButtonStyled
+					<Button
 						v-for="method in paymentOptions"
 						:key="method.value"
-						:color="withdrawData.selection.method === method.value ? 'green' : 'standard'"
-						:highlighted="withdrawData.selection.method === method.value"
-						type="chip"
+						:type="withdrawData.selection.method === method.value ? 'colored' : 'base'"
+						:color="withdrawData.selection.method === method.value ? 'green' : undefined"
+						class="!justify-start !gap-2 !text-left sm:!h-10"
+						:class="
+							withdrawData.selection.method === method.value
+								? true
+									? '!bg-[var(--color-button-bg-selected)] !text-[var(--color-button-text-selected)] [&>svg]:!text-[var(--color-button-text-selected)]'
+									: '!bg-[var(--color-button-bg)] !text-contrast'
+								: ''
+						"
+						@click="handleMethodSelection(method)"
 					>
-						<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>
+						<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>
 				</template>
 			</div>
 		</div>
@@ -81,7 +84,7 @@
 import { SpinnerIcon, UnknownIcon } from '@modrinth/assets'
 import {
 	Admonition,
-	ButtonStyled,
+	Button,
 	Combobox,
 	defineMessages,
 	injectNotificationManager,
diff --git a/apps/frontend/src/components/ui/dashboard/withdraw-stages/TaxFormStage.vue b/apps/frontend/src/components/ui/dashboard/withdraw-stages/TaxFormStage.vue
index 1dfb05ad42..68fd8995bb 100644
--- a/apps/frontend/src/components/ui/dashboard/withdraw-stages/TaxFormStage.vue
+++ b/apps/frontend/src/components/ui/dashboard/withdraw-stages/TaxFormStage.vue
@@ -47,11 +47,9 @@
 					<FileTextIcon :class="iconClass" />
 				</template>
 				<template #actions>
-					<ButtonStyled color="orange">
-						<button @click="showTaxFormModal">
-							{{ formatMessage(messages.completeTaxForm) }}
-						</button>
-					</ButtonStyled>
+					<Button type="colored" color="orange" @click="showTaxFormModal">
+						{{ formatMessage(messages.completeTaxForm) }}
+					</Button>
 				</template>
 			</Admonition>
 		</template>
@@ -76,7 +74,7 @@
 import { FileTextIcon } from '@modrinth/assets'
 import {
 	Admonition,
-	ButtonStyled,
+	Button,
 	defineMessages,
 	IntlFormatted,
 	normalizeChildren,
diff --git a/apps/frontend/src/components/ui/moderation/BatchScanProgressAlert.vue b/apps/frontend/src/components/ui/moderation/BatchScanProgressAlert.vue
index a0cc693637..0ea7a3f994 100644
--- a/apps/frontend/src/components/ui/moderation/BatchScanProgressAlert.vue
+++ b/apps/frontend/src/components/ui/moderation/BatchScanProgressAlert.vue
@@ -7,9 +7,12 @@
 				<span class="text-xl font-semibold">Batch scan in progress</span>
 				<span>{{ progress?.complete }} of {{ progress?.total }} projects completed</span>
 			</div>
-			<ButtonStyled circular color="blue" type="outlined">
-				<button class="!px-4" @click="emit('cancel-scan')">Cancel scan</button>
-			</ButtonStyled>
+			<Button
+				type="outlined"
+				class="!rounded-full !px-4 !text-blue !shadow-[inset_0_0_0_1px_var(--color-blue)] [&>svg]:!text-blue"
+				@click="emit('cancel-scan')"
+				>Cancel scan</Button
+			>
 		</div>
 		<div class="w-full rounded-full bg-highlight-blue">
 			<div
@@ -21,7 +24,7 @@
 </template>
 
 <script setup lang="ts">
-import { ButtonStyled } from '@modrinth/ui'
+import { Button } from '@modrinth/ui'
 import { defineProps } from 'vue'
 
 export interface BatchScanProgress {
diff --git a/apps/frontend/src/components/ui/moderation/GlobalDetailLocalTraceCard.vue b/apps/frontend/src/components/ui/moderation/GlobalDetailLocalTraceCard.vue
index a6756ce443..4a368d2d77 100644
--- a/apps/frontend/src/components/ui/moderation/GlobalDetailLocalTraceCard.vue
+++ b/apps/frontend/src/components/ui/moderation/GlobalDetailLocalTraceCard.vue
@@ -20,12 +20,10 @@
 					<span class="text-sm text-secondary">Local</span>
 					<Badge :type="trace.local_status" />
 				</template>
-				<ButtonStyled>
-					<NuxtLink :to="localTraceLink">
-						<ExternalIcon aria-hidden="true" />
-						View
-					</NuxtLink>
-				</ButtonStyled>
+				<ButtonLink :to="localTraceLink">
+					<ExternalIcon aria-hidden="true" />
+					View
+				</ButtonLink>
 			</div>
 		</div>
 	</div>
@@ -34,7 +32,7 @@
 <script setup lang="ts">
 import type { Labrinth } from '@modrinth/api-client'
 import { ChevronRightIcon, ExternalIcon } from '@modrinth/assets'
-import { Badge, ButtonStyled } from '@modrinth/ui'
+import { Badge, ButtonLink } from '@modrinth/ui'
 
 const props = defineProps<{
 	trace: Labrinth.TechReview.Internal.GlobalIssueDetailTrace
diff --git a/apps/frontend/src/components/ui/moderation/GlobalDetailTracesList.vue b/apps/frontend/src/components/ui/moderation/GlobalDetailTracesList.vue
index 8d42abbc1e..cd38f1c50f 100644
--- a/apps/frontend/src/components/ui/moderation/GlobalDetailTracesList.vue
+++ b/apps/frontend/src/components/ui/moderation/GlobalDetailTracesList.vue
@@ -10,12 +10,10 @@
 				clearable
 				wrapper-class="flex-1 w-full"
 			/>
-			<ButtonStyled color="brand">
-				<button type="submit" :disabled="isLoading">
-					<SearchIcon aria-hidden="true" />
-					Search
-				</button>
-			</ButtonStyled>
+			<Button type="colored" color="brand" native-type="submit" :disabled="isLoading">
+				<SearchIcon aria-hidden="true" />
+				Search
+			</Button>
 		</form>
 
 		<div
@@ -71,15 +69,15 @@
 					</div>
 					<div class="flex shrink-0 flex-nowrap items-center gap-2">
 						<Badge :type="trace.verdict" />
-						<ButtonStyled color="red">
-							<button
-								:disabled="removingTraceKeys.has(trace.detail_key)"
-								@click="removeGlobalTrace(trace)"
-							>
-								<TrashIcon aria-hidden="true" />
-								Remove
-							</button>
-						</ButtonStyled>
+						<Button
+							type="colored"
+							color="red"
+							:disabled="removingTraceKeys.has(trace.detail_key)"
+							@click="removeGlobalTrace(trace)"
+						>
+							<TrashIcon aria-hidden="true" />
+							Remove
+						</Button>
 					</div>
 				</div>
 
@@ -89,14 +87,13 @@
 							Showing {{ getPreviewLocalTraces(trace).length }} of
 							{{ formatTraceCount(getVisibleLocalTraceTotal(trace)) }}
 						</p>
-						<ButtonStyled
+						<ButtonLink
 							v-if="getVisibleLocalTraceTotal(trace) > getPreviewLocalTraces(trace).length"
+							:to="getGlobalTraceLink(trace)"
 						>
-							<NuxtLink :to="getGlobalTraceLink(trace)">
-								<ListIcon aria-hidden="true" />
-								View all
-							</NuxtLink>
-						</ButtonStyled>
+							<ListIcon aria-hidden="true" />
+							View all
+						</ButtonLink>
 					</div>
 					<GlobalDetailLocalTraceCard
 						v-for="localTrace in getPreviewLocalTraces(trace)"
@@ -124,7 +121,8 @@ import type { Labrinth } from '@modrinth/api-client'
 import { HashIcon, ListIcon, SearchIcon, TrashIcon } from '@modrinth/assets'
 import {
 	Badge,
-	ButtonStyled,
+	Button,
+	ButtonLink,
 	EmptyState,
 	injectModrinthClient,
 	injectNotificationManager,
diff --git a/apps/frontend/src/components/ui/moderation/MaliciousSummaryModal.vue b/apps/frontend/src/components/ui/moderation/MaliciousSummaryModal.vue
index 6fbf188849..4d9be9942d 100644
--- a/apps/frontend/src/components/ui/moderation/MaliciousSummaryModal.vue
+++ b/apps/frontend/src/components/ui/moderation/MaliciousSummaryModal.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import type { Labrinth } from '@modrinth/api-client'
 import { ClipboardCopyIcon, DownloadIcon, LoaderCircleIcon, XIcon } from '@modrinth/assets'
-import { ButtonStyled, CopyCode, NewModal, useDebugLogger } from '@modrinth/ui'
+import { Button, ButtonLink, CopyCode, NewModal, useDebugLogger } from '@modrinth/ui'
 import { ref, useTemplateRef } from 'vue'
 
 export type UnsafeFile = {
@@ -134,16 +134,15 @@ defineExpose({ show, hide })
 								v-if="isHashLoading(item.file.version_id)"
 								class="size-4 animate-spin text-secondary"
 							/>
-							<ButtonStyled
+							<Button
 								v-else-if="getFileHash(item.file.version_id, item.file.file_id)"
-								size="small"
-								type="standard"
+								class="!h-6"
+								size="xs"
+								@click="copy(getFileHash(item.file.version_id, item.file.file_id)!)"
 							>
-								<button @click="copy(getFileHash(item.file.version_id, item.file.file_id)!)">
-									<ClipboardCopyIcon class="size-4" />
-									Copy
-								</button>
-							</ButtonStyled>
+								<ClipboardCopyIcon class="size-4" />
+								Copy
+							</Button>
 							<span v-else class="text-tertiary italic">N/A</span>
 						</td>
 						<td class="py-1 pr-2">
@@ -153,19 +152,21 @@ defineExpose({ show, hide })
 							<CopyCode :text="item.file.file_name" />
 						</td>
 						<td class="py-1 pr-2">
-							<ButtonStyled size="small" type="standard">
-								<button @click="copy(item.file.download_url)">
-									<ClipboardCopyIcon class="size-4" />
-									Copy
-								</button>
-							</ButtonStyled>
+							<Button class="!h-6" size="xs" @click="copy(item.file.download_url)">
+								<ClipboardCopyIcon class="size-4" />
+								Copy
+							</Button>
 						</td>
 						<td class="py-1">
-							<ButtonStyled circular size="small">
-								<a :href="item.file.download_url" :download="item.file.file_name" target="_blank">
-									<DownloadIcon />
-								</a>
-							</ButtonStyled>
+							<ButtonLink
+								size="xs"
+								:href="item.file.download_url"
+								:download="item.file.file_name"
+								target="_blank"
+								class="!size-6 !h-6 !rounded-full !px-0"
+							>
+								<DownloadIcon />
+							</ButtonLink>
 						</td>
 					</tr>
 				</tbody>
@@ -174,12 +175,10 @@ defineExpose({ show, hide })
 			<p v-else class="text-sm italic text-secondary">No files currently marked as malicious.</p>
 
 			<div class="flex justify-end">
-				<ButtonStyled>
-					<button @click="hide">
-						<XIcon class="size-4" />
-						Close
-					</button>
-				</ButtonStyled>
+				<Button @click="hide">
+					<XIcon class="size-4" />
+					Close
+				</Button>
 			</div>
 		</div>
 	</NewModal>
diff --git a/apps/frontend/src/components/ui/moderation/ModerationProjectNags.vue b/apps/frontend/src/components/ui/moderation/ModerationProjectNags.vue
index 33a7dbf92e..9097dbace2 100644
--- a/apps/frontend/src/components/ui/moderation/ModerationProjectNags.vue
+++ b/apps/frontend/src/components/ui/moderation/ModerationProjectNags.vue
@@ -23,11 +23,13 @@
 				</div>
 			</div>
 			<div class="input-group">
-				<ButtonStyled circular>
-					<button :class="{ '[&>svg]:rotate-180': !collapsed }" @click="$emit('toggleCollapsed')">
-						<DropdownIcon class="duration-250 transition-transform ease-in-out" />
-					</button>
-				</ButtonStyled>
+				<IconButton
+					label="Toggle details"
+					:class="{ '[&>svg]:rotate-180': !collapsed }"
+					@click="$emit('toggleCollapsed')"
+				>
+					<DropdownIcon class="duration-250 transition-transform ease-in-out" />
+				</IconButton>
 			</div>
 		</div>
 		<div v-if="!collapsed" class="mt-4 grid grid-cols-[repeat(auto-fit,minmax(15rem,1fr))] gap-2">
@@ -61,21 +63,19 @@
 					{{ getFormattedMessage(nag.link.title) }}
 					<ChevronRightIcon aria-hidden="true" class="featured-header-chevron" />
 				</NuxtLink>
-				<ButtonStyled
+				<Button
 					v-if="nag.status === 'special-submit-action' && nag.id === 'submit-for-review'"
+					v-tooltip="
+						!canSubmitForReview ? getFormattedMessage(messages.submitChecklistTooltip) : undefined
+					"
+					type="colored"
 					color="orange"
+					:disabled="!canSubmitForReview"
 					@click="submitForReview"
 				>
-					<button
-						v-tooltip="
-							!canSubmitForReview ? getFormattedMessage(messages.submitChecklistTooltip) : undefined
-						"
-						:disabled="!canSubmitForReview"
-					>
-						<SendIcon />
-						{{ getFormattedMessage(messages.submitForReviewButton) }}
-					</button>
-				</ButtonStyled>
+					<SendIcon />
+					{{ getFormattedMessage(messages.submitForReviewButton) }}
+				</Button>
 			</div>
 		</div>
 	</div>
@@ -94,7 +94,8 @@ import {
 } from '@modrinth/assets'
 import type { Nag, NagContext, NagStatus } from '@modrinth/moderation'
 import { nags } from '@modrinth/moderation'
-import { ButtonStyled, defineMessages, type MessageDescriptor, useVIntl } from '@modrinth/ui'
+import { Button, IconButton } from '@modrinth/ui'
+import { defineMessages, type MessageDescriptor, useVIntl } from '@modrinth/ui'
 import type { Component } from 'vue'
 import { computed } from 'vue'
 
diff --git a/apps/frontend/src/components/ui/moderation/ModerationQueueCard.vue b/apps/frontend/src/components/ui/moderation/ModerationQueueCard.vue
index 61e0b9bc9c..7df3d9deb1 100644
--- a/apps/frontend/src/components/ui/moderation/ModerationQueueCard.vue
+++ b/apps/frontend/src/components/ui/moderation/ModerationQueueCard.vue
@@ -102,21 +102,21 @@
 				</span>
 
 				<div class="flex items-center gap-2">
-					<ButtonStyled circular>
-						<button v-tooltip="'Copy ID'" @click="copyId">
-							<ClipboardCopyIcon />
-						</button>
-					</ButtonStyled>
-					<ButtonStyled circular>
-						<button v-tooltip="'Copy link'" @click="copyLink">
-							<LinkIcon />
-						</button>
-					</ButtonStyled>
-					<ButtonStyled circular color="orange">
-						<button v-tooltip="'Begin review'" @click="openProjectForReview">
-							<ScaleIcon />
-						</button>
-					</ButtonStyled>
+					<IconButton v-tooltip="'Copy ID'" :label="'Copy ID'" @click="copyId">
+						<ClipboardCopyIcon />
+					</IconButton>
+					<IconButton v-tooltip="'Copy link'" :label="'Copy link'" @click="copyLink">
+						<LinkIcon />
+					</IconButton>
+					<IconButton
+						v-tooltip="'Begin review'"
+						type="colored"
+						color="orange"
+						:label="'Begin review'"
+						@click="openProjectForReview"
+					>
+						<ScaleIcon />
+					</IconButton>
 				</div>
 			</div>
 		</div>
@@ -128,8 +128,8 @@ import { ClipboardCopyIcon, FileIcon, LinkIcon, ScaleIcon } from '@modrinth/asse
 import {
 	Avatar,
 	Badge,
-	ButtonStyled,
 	getProjectTypeIcon,
+	IconButton,
 	injectNotificationManager,
 	useFormatDateTime,
 	useRelativeTime,
diff --git a/apps/frontend/src/components/ui/moderation/ModerationReportCard.vue b/apps/frontend/src/components/ui/moderation/ModerationReportCard.vue
index 3566044b4b..115fa98e31 100644
--- a/apps/frontend/src/components/ui/moderation/ModerationReportCard.vue
+++ b/apps/frontend/src/components/ui/moderation/ModerationReportCard.vue
@@ -38,20 +38,17 @@
 						{{ formatRelativeTime(report.created) }}
 					</span>
 					<div class="flex items-center gap-2">
-						<ButtonStyled circular>
-							<button v-tooltip="'Copy ID'" @click="copyId">
-								<ClipboardCopyIcon />
-							</button>
-						</ButtonStyled>
-						<ButtonStyled circular>
-							<a
-								v-tooltip="'Open in new tab'"
-								:href="`/moderation/reports/${props.report.id}`"
-								target="_blank"
-							>
-								<ExternalIcon />
-							</a>
-						</ButtonStyled>
+						<IconButton v-tooltip="'Copy ID'" :label="'Copy ID'" @click="copyId">
+							<ClipboardCopyIcon />
+						</IconButton>
+						<ButtonLink
+							v-tooltip="'Open in new tab'"
+							:href="`/moderation/reports/${props.report.id}`"
+							target="_blank"
+							class="!w-9 !rounded-full !px-0"
+						>
+							<ExternalIcon />
+						</ButtonLink>
 					</div>
 				</div>
 			</div>
@@ -212,9 +209,7 @@
 									</span>
 									<span class="text-sm text-secondary">{{ sharedInstanceError }}</span>
 								</div>
-								<ButtonStyled type="outlined">
-									<button @click="loadSharedInstanceDetails">Try again</button>
-								</ButtonStyled>
+								<Button type="outlined" @click="loadSharedInstanceDetails">Try again</Button>
 							</div>
 							<SharedInstanceReportContext
 								v-else-if="sharedInstanceDetails"
@@ -227,27 +222,39 @@
 						</template>
 					</template>
 					<template #closedActions>
-						<ButtonStyled v-if="isStaff(auth.user)" color="green">
-							<button class="mt-2 w-full gap-2 sm:w-auto" @click="reopenReport()">
-								<CheckCircleIcon class="size-4" />
-								Reopen Thread
-							</button>
-						</ButtonStyled>
+						<Button
+							v-if="isStaff(auth.user)"
+							type="colored"
+							color="green"
+							class="mt-2 w-full gap-2 sm:w-auto"
+							@click="reopenReport()"
+						>
+							<CheckCircleIcon class="size-4" />
+							Reopen Thread
+						</Button>
 					</template>
 					<template #additionalActions="{ hasReply }">
 						<template v-if="isStaff(auth.user)">
-							<ButtonStyled v-if="hasReply" color="red">
-								<button class="w-full gap-2 sm:w-auto" @click="closeReport(true)">
-									<CheckCircleIcon class="size-4" />
-									Reply and close
-								</button>
-							</ButtonStyled>
-							<ButtonStyled v-else color="red">
-								<button class="w-full gap-2 sm:w-auto" @click="closeReport()">
-									<CheckCircleIcon class="size-4" />
-									Close report
-								</button>
-							</ButtonStyled>
+							<Button
+								v-if="hasReply"
+								type="colored"
+								color="red"
+								class="w-full gap-2 sm:w-auto"
+								@click="closeReport(true)"
+							>
+								<CheckCircleIcon class="size-4" />
+								Reply and close
+							</Button>
+							<Button
+								v-else
+								type="colored"
+								color="red"
+								class="w-full gap-2 sm:w-auto"
+								@click="closeReport()"
+							>
+								<CheckCircleIcon class="size-4" />
+								Close report
+							</Button>
 						</template>
 					</template>
 				</ThreadView>
@@ -265,9 +272,9 @@ import {
 	LockIcon,
 } from '@modrinth/assets'
 import { type ExtendedReport, reportQuickReplies } from '@modrinth/moderation'
+import { Button, ButtonLink, IconButton } from '@modrinth/ui'
 import {
 	Avatar,
-	ButtonStyled,
 	CollapsibleRegion,
 	type ContentItem,
 	CopyCode,
diff --git a/apps/frontend/src/components/ui/moderation/ModerationTechRevCard.vue b/apps/frontend/src/components/ui/moderation/ModerationTechRevCard.vue
index d328b054ed..0baa5864a0 100644
--- a/apps/frontend/src/components/ui/moderation/ModerationTechRevCard.vue
+++ b/apps/frontend/src/components/ui/moderation/ModerationTechRevCard.vue
@@ -22,9 +22,9 @@ import {
 	XIcon,
 } from '@modrinth/assets'
 import { type TechReviewContext, techReviewQuickReplies } from '@modrinth/moderation'
+import { Button, ButtonLink, IconButton, TeleportOverflowMenu } from '@modrinth/ui'
 import {
 	Avatar,
-	ButtonStyled,
 	Collapsible,
 	CollapsibleRegion,
 	commonMessages,
@@ -32,7 +32,6 @@ import {
 	injectModrinthClient,
 	injectNotificationManager,
 	NavTabs,
-	OverflowMenu,
 	type OverflowMenuOption,
 	Toggle,
 	useFormatBytes,
@@ -120,29 +119,32 @@ const isLoadingStatusAction = ref(false)
 const projectStatusActions = computed<OverflowMenuOption[]>(() => [
 	{
 		id: 'approve',
-		color: 'green',
-		action: () => setStatus('approved'),
+		label: 'Approve',
+		tone: 'green',
 		hoverFilled: true,
+		action: () => setStatus('approved'),
 		disabled: isStatusActionDisabled('approved'),
 	},
 	{
 		id: 'withhold',
-		color: 'orange',
-		action: () => setStatus('withheld'),
+		label: 'Withhold',
+		tone: 'orange',
 		hoverFilled: true,
+		action: () => setStatus('withheld'),
 		disabled: isStatusActionDisabled('withheld'),
 	},
 	{
 		id: 'send-to-review',
+		label: 'Send to review',
 		action: () => setStatus('processing'),
-		hoverFilled: true,
 		disabled: isStatusActionDisabled('processing'),
 	},
 	{
 		id: 'reject',
-		color: 'red',
-		action: () => setStatus('rejected'),
+		label: 'Reject',
+		tone: 'red',
 		hoverFilled: true,
+		action: () => setStatus('rejected'),
 		disabled: isStatusActionDisabled('rejected'),
 	},
 ])
@@ -1495,29 +1497,26 @@ function copyId() {
 				<div class="flex items-center gap-3">
 					<span class="text-base text-secondary">{{ formattedDate }}</span>
 					<div class="flex items-center gap-2">
-						<ButtonStyled v-if="props.item.project.link_urls?.['source']?.url" circular>
-							<a
-								v-tooltip="'Open sources in new tab'"
-								:href="props.item.project.link_urls?.['source']?.url"
-								target="_blank"
-							>
-								<CodeIcon />
-							</a>
-						</ButtonStyled>
-						<ButtonStyled circular>
-							<button v-tooltip="'Copy ID'" @click="copyId">
-								<ClipboardCopyIcon />
-							</button>
-						</ButtonStyled>
-						<ButtonStyled circular>
-							<a
-								v-tooltip="'Open in new tab'"
-								:href="`/moderation/technical-review/${props.item.project.id}`"
-								target="_blank"
-							>
-								<ExternalIcon />
-							</a>
-						</ButtonStyled>
+						<ButtonLink
+							v-if="props.item.project.link_urls?.['source']?.url"
+							v-tooltip="'Open sources in new tab'"
+							:href="props.item.project.link_urls?.['source']?.url"
+							target="_blank"
+							class="!w-9 !rounded-full !px-0"
+						>
+							<CodeIcon />
+						</ButtonLink>
+						<IconButton v-tooltip="'Copy ID'" :label="'Copy ID'" @click="copyId">
+							<ClipboardCopyIcon />
+						</IconButton>
+						<ButtonLink
+							v-tooltip="'Open in new tab'"
+							:href="`/moderation/technical-review/${props.item.project.id}`"
+							target="_blank"
+							class="!w-9 !rounded-full !px-0"
+						>
+							<ExternalIcon />
+						</ButtonLink>
 					</div>
 				</div>
 			</div>
@@ -1552,58 +1551,60 @@ function copyId() {
 							@update-thread="handleThreadUpdate"
 						>
 							<template #additionalActions>
-								<ButtonStyled color="brand">
-									<button
-										v-tooltip="!canSubmitReview ? 'There are still pending flags!' : undefined"
-										:disabled="!canSubmitReview"
-										@click="handleSubmitReview('safe')"
-									>
-										<ShieldCheckIcon /> Pass
-									</button>
-								</ButtonStyled>
-								<ButtonStyled color="red">
-									<button
-										v-tooltip="!canSubmitReview ? 'There are still pending flags!' : undefined"
-										:disabled="!canSubmitReview"
-										@click="handleSubmitReview('unsafe')"
-									>
-										<BugIcon /> Fail
-									</button>
-								</ButtonStyled>
-								<ButtonStyled color="standard">
-									<OverflowMenu
-										class="btn-dropdown-animation"
-										:disabled="isLoadingStatusAction"
-										:options="projectStatusActions"
-									>
-										<SpinnerIcon
-											v-if="isLoadingStatusAction"
-											class="animate-spin"
-											aria-hidden="true"
-										/>
-										<ScaleIcon v-else aria-hidden="true" />
-										Set Status
-										<template #approve>
-											<CheckIcon aria-hidden="true" />
-											Approve
-										</template>
-										<template #withhold>
-											<EyeOffIcon aria-hidden="true" />
-											Withhold
-										</template>
-										<template #send-to-review>
-											<ScaleIcon aria-hidden="true" />
-											Send to review
-										</template>
-										<template #reject>
-											<XIcon aria-hidden="true" />
-											Reject
-										</template>
-									</OverflowMenu>
-								</ButtonStyled>
-								<ButtonStyled v-if="featureFlags.developerMode" type="outlined">
-									<button @click="emit('showMaliciousSummary', unsafeFiles)">Debug</button>
-								</ButtonStyled>
+								<Button
+									v-tooltip="!canSubmitReview ? 'There are still pending flags!' : undefined"
+									type="colored"
+									color="brand"
+									:disabled="!canSubmitReview"
+									@click="handleSubmitReview('safe')"
+								>
+									<ShieldCheckIcon /> Pass
+								</Button>
+								<Button
+									v-tooltip="!canSubmitReview ? 'There are still pending flags!' : undefined"
+									type="colored"
+									color="red"
+									:disabled="!canSubmitReview"
+									@click="handleSubmitReview('unsafe')"
+								>
+									<BugIcon /> Fail
+								</Button>
+								<TeleportOverflowMenu
+									label="More options"
+									class="btn-dropdown-animation !w-auto !rounded-xl !px-2.5"
+									:disabled="isLoadingStatusAction"
+									:options="projectStatusActions"
+								>
+									<SpinnerIcon
+										v-if="isLoadingStatusAction"
+										class="animate-spin"
+										aria-hidden="true"
+									/>
+									<ScaleIcon v-else aria-hidden="true" />
+									Set Status
+									<template #approve>
+										<CheckIcon aria-hidden="true" />
+										Approve
+									</template>
+									<template #withhold>
+										<EyeOffIcon aria-hidden="true" />
+										Withhold
+									</template>
+									<template #send-to-review>
+										<ScaleIcon aria-hidden="true" />
+										Send to review
+									</template>
+									<template #reject>
+										<XIcon aria-hidden="true" />
+										Reject
+									</template>
+								</TeleportOverflowMenu>
+								<Button
+									v-if="featureFlags.developerMode"
+									type="outlined"
+									@click="emit('showMaliciousSummary', unsafeFiles)"
+									>Debug</Button
+								>
 							</template>
 						</ThreadView>
 					</div>
@@ -1674,19 +1675,16 @@ function copyId() {
 					</div>
 
 					<div class="flex items-center gap-2">
-						<ButtonStyled v-if="getFileDetailCount(file) > 0">
-							<button @click="viewFileFlags(file)">Flags</button>
-						</ButtonStyled>
-						<ButtonStyled type="outlined">
-							<a
-								:href="file.download_url"
-								:title="`Download ${file.file_name}`"
-								:download="file.file_name"
-								tabindex="0"
-							>
-								<DownloadIcon /> Download
-							</a>
-						</ButtonStyled>
+						<Button v-if="getFileDetailCount(file) > 0" @click="viewFileFlags(file)">Flags</Button>
+						<ButtonLink
+							type="outlined"
+							:href="file.download_url"
+							:title="`Download ${file.file_name}`"
+							:download="file.file_name"
+							tabindex="0"
+						>
+							<DownloadIcon /> Download
+						</ButtonLink>
 					</div>
 				</div>
 			</template>
@@ -1856,14 +1854,14 @@ function copyId() {
 							@click="toggleClass(classItem)"
 						>
 							<div class="my-auto flex items-center gap-2">
-								<ButtonStyled type="transparent" circular>
-									<button
-										class="transition-transform"
-										:class="{ 'rotate-180': expandedClasses.has(classItem.key) }"
-									>
-										<ChevronDownIcon class="h-5 w-5 text-contrast" />
-									</button>
-								</ButtonStyled>
+								<IconButton
+									type="quiet"
+									label="Toggle details"
+									class="transition-transform"
+									:class="{ 'rotate-180': expandedClasses.has(classItem.key) }"
+								>
+									<ChevronDownIcon class="h-5 w-5 text-contrast" />
+								</IconButton>
 
 								<span v-tooltip="classItem.filePath" class="font-mono font-semibold">{{
 									truncateMiddle(classItem.filePath)
@@ -2061,16 +2059,16 @@ function copyId() {
 									v-if="getHighlightedClassSource(classItem).length > 0"
 									class="relative inset-0 overflow-hidden rounded-lg border border-solid border-surface-5 bg-surface-4"
 								>
-									<ButtonStyled circular type="transparent">
-										<button
-											v-tooltip="`Copy code`"
-											class="absolute right-2 top-2 border-[1px]"
-											@click="copyToClipboard(getClassDecompiledSource(classItem)!, classItem.key)"
-										>
-											<CopyIcon v-if="!showCopyFeedback.get(classItem.key)" />
-											<CheckIcon v-else />
-										</button>
-									</ButtonStyled>
+									<IconButton
+										v-tooltip="`Copy code`"
+										type="quiet"
+										:label="`Copy code`"
+										class="absolute right-2 top-2 border-[1px]"
+										@click="copyToClipboard(getClassDecompiledSource(classItem)!, classItem.key)"
+									>
+										<CopyIcon v-if="!showCopyFeedback.get(classItem.key)" />
+										<CheckIcon v-else />
+									</IconButton>
 
 									<div class="overflow-x-auto bg-surface-3 py-3">
 										<div
diff --git a/apps/frontend/src/components/ui/moderation/ModpackScanModal.vue b/apps/frontend/src/components/ui/moderation/ModpackScanModal.vue
index 3d6b948120..41c0888f81 100644
--- a/apps/frontend/src/components/ui/moderation/ModpackScanModal.vue
+++ b/apps/frontend/src/components/ui/moderation/ModpackScanModal.vue
@@ -7,8 +7,8 @@ import {
 	StarIcon,
 	TrashIcon,
 } from '@modrinth/assets'
+import { Button, IconButton } from '@modrinth/ui'
 import {
-	ButtonStyled,
 	Combobox,
 	type ComboboxOption,
 	ConfirmModal,
@@ -405,26 +405,26 @@ defineExpose({ show, hide })
 							</span>
 						</template>
 					</Combobox>
-					<ButtonStyled circular color="red" color-fill="none">
-						<button
-							v-tooltip="formatMessage(messages.deleteAllGroups)"
-							:disabled="titleButtonsDisabled"
-							@click="showConfirmClearGroups"
-						>
-							<TrashIcon v-if="!isClearing" aria-hidden="true" />
-							<SpinnerIcon v-else class="animate-spin" />
-						</button>
-					</ButtonStyled>
-					<ButtonStyled circular>
-						<button
-							v-tooltip="formatMessage(messages.scanAllFiles)"
-							:disabled="titleButtonsDisabled"
-							@click="fetchAllScans"
-						>
-							<FolderSearchIcon v-if="!isScanning" aria-hidden="true" />
-							<SpinnerIcon v-else class="animate-spin" />
-						</button>
-					</ButtonStyled>
+					<IconButton
+						v-tooltip="formatMessage(messages.deleteAllGroups)"
+						type="quiet"
+						color="red"
+						:label="formatMessage(messages.deleteAllGroups)"
+						:disabled="titleButtonsDisabled"
+						@click="showConfirmClearGroups"
+					>
+						<TrashIcon v-if="!isClearing" aria-hidden="true" />
+						<SpinnerIcon v-else class="animate-spin" />
+					</IconButton>
+					<IconButton
+						v-tooltip="formatMessage(messages.scanAllFiles)"
+						:label="formatMessage(messages.scanAllFiles)"
+						:disabled="titleButtonsDisabled"
+						@click="fetchAllScans"
+					>
+						<FolderSearchIcon v-if="!isScanning" aria-hidden="true" />
+						<SpinnerIcon v-else class="animate-spin" />
+					</IconButton>
 				</div>
 			</div>
 		</template>
@@ -454,17 +454,15 @@ defineExpose({ show, hide })
 				<template #cell-newFiles="{ row }">
 					<span v-if="row.isScanning">{{ formatMessage(messages.scanning) }}</span>
 					<span v-else-if="row.error" v-tooltip="row.error" class="flex justify-center">
-						<ButtonStyled
-							class="justify-self-center"
-							color="red"
+						<Button
 							type="outlined"
-							hover-color-fill="background"
+							:disabled="rescanButtonsDisabled"
+							class="justify-self-center !text-red !shadow-[inset_0_0_0_1px_var(--color-red)] hover:!bg-red hover:!text-[var(--color-accent-contrast)] focus-visible:!bg-red focus-visible:!text-[var(--color-accent-contrast)] [&>svg]:!text-red"
+							@click="() => fetchScan(row.id)"
 						>
-							<button :disabled="rescanButtonsDisabled" @click="() => fetchScan(row.id)">
-								<RotateCounterClockwiseIcon />
-								{{ formatMessage(messages.failed) }}
-							</button>
-						</ButtonStyled>
+							<RotateCounterClockwiseIcon />
+							{{ formatMessage(messages.failed) }}
+						</Button>
 					</span>
 					<span v-else-if="row.scan">{{ row.scan.new_attribution_files }}</span>
 					<span v-else>{{ formatMessage(messages.notScanned) }}</span>
@@ -472,17 +470,15 @@ defineExpose({ show, hide })
 				<template #cell-newGroups="{ row }">
 					<span v-if="row.isScanning">{{ formatMessage(messages.scanning) }}</span>
 					<span v-else-if="row.error" v-tooltip="row.error" class="flex justify-center">
-						<ButtonStyled
-							class="justify-self-center"
-							color="red"
+						<Button
 							type="outlined"
-							hover-color-fill="background"
+							:disabled="rescanButtonsDisabled"
+							class="justify-self-center !text-red !shadow-[inset_0_0_0_1px_var(--color-red)] hover:!bg-red hover:!text-[var(--color-accent-contrast)] focus-visible:!bg-red focus-visible:!text-[var(--color-accent-contrast)] [&>svg]:!text-red"
+							@click="() => fetchScan(row.id)"
 						>
-							<button :disabled="rescanButtonsDisabled" @click="() => fetchScan(row.id)">
-								<RotateCounterClockwiseIcon />
-								{{ formatMessage(messages.failed) }}
-							</button>
-						</ButtonStyled>
+							<RotateCounterClockwiseIcon />
+							{{ formatMessage(messages.failed) }}
+						</Button>
 					</span>
 					<span v-else-if="row.scan">{{ row.scan.new_attribution_groups }}</span>
 					<span v-else>{{ formatMessage(messages.notScanned) }}</span>
diff --git a/apps/frontend/src/components/ui/moderation/SharedInstanceReportContext.vue b/apps/frontend/src/components/ui/moderation/SharedInstanceReportContext.vue
index 3f3b0d9ad5..247b350a73 100644
--- a/apps/frontend/src/components/ui/moderation/SharedInstanceReportContext.vue
+++ b/apps/frontend/src/components/ui/moderation/SharedInstanceReportContext.vue
@@ -11,9 +11,9 @@ import {
 	UsersIcon,
 	VersionIcon,
 } from '@modrinth/assets'
+import { Button, IconButton } from '@modrinth/ui'
 import {
 	Avatar,
-	ButtonStyled,
 	ConfirmLeaveModal,
 	type ContentItem,
 	injectModrinthClient,
@@ -322,12 +322,14 @@ function formattedLoader(version: SharedInstanceReportVersion) {
 								</div>
 							</div>
 
-							<ButtonStyled type="outlined">
-								<button class="w-full sm:w-auto" @click="viewReportedInstanceVersion(version)">
-									<EyeIcon class="size-4" />
-									View content
-								</button>
-							</ButtonStyled>
+							<Button
+								type="outlined"
+								class="w-full sm:w-auto"
+								@click="viewReportedInstanceVersion(version)"
+							>
+								<EyeIcon class="size-4" />
+								View content
+							</Button>
 						</div>
 					</div>
 					<span v-else class="text-sm text-secondary">
@@ -363,15 +365,14 @@ function formattedLoader(version: SharedInstanceReportVersion) {
 								{{ instance.member_count === 1 ? 'member' : 'members' }}
 							</span>
 						</div>
-						<ButtonStyled circular type="transparent">
-							<button
-								v-tooltip="`View ${instance.name} version ${instance.latest_version} content`"
-								:aria-label="`View ${instance.name} version ${instance.latest_version} content`"
-								@click="viewVersionContent(instance, instance.latest_version)"
-							>
-								<EyeIcon class="size-4" />
-							</button>
-						</ButtonStyled>
+						<IconButton
+							v-tooltip="`View ${instance.name} version ${instance.latest_version} content`"
+							type="quiet"
+							:label="`View ${instance.name} version ${instance.latest_version} content`"
+							@click="viewVersionContent(instance, instance.latest_version)"
+						>
+							<EyeIcon class="size-4" />
+						</IconButton>
 					</div>
 				</div>
 				<span v-else-if="details.other_instances_loaded" class="text-sm text-secondary">
@@ -392,12 +393,16 @@ function formattedLoader(version: SharedInstanceReportVersion) {
 						launching them.
 					</span>
 				</div>
-				<ButtonStyled color="red">
-					<button :disabled="banDisabled" class="w-full gap-2 sm:w-auto" @click="promptBanOwner">
-						<BanIcon class="size-4" />
-						{{ banButtonLabel }}
-					</button>
-				</ButtonStyled>
+				<Button
+					type="colored"
+					color="red"
+					:disabled="banDisabled"
+					class="w-full gap-2 sm:w-auto"
+					@click="promptBanOwner"
+				>
+					<BanIcon class="size-4" />
+					{{ banButtonLabel }}
+				</Button>
 			</footer>
 		</div>
 
diff --git a/apps/frontend/src/components/ui/moderation/checklist/ModerationChecklist.vue b/apps/frontend/src/components/ui/moderation/checklist/ModerationChecklist.vue
index 3727b6197c..83f45c88e6 100644
--- a/apps/frontend/src/components/ui/moderation/checklist/ModerationChecklist.vue
+++ b/apps/frontend/src/components/ui/moderation/checklist/ModerationChecklist.vue
@@ -24,9 +24,10 @@
 				<h1 class="m-0 mr-auto">
 					<TeleportOverflowMenu
 						v-if="canOpenStageSelectorFromTitle"
+						:label="checklistTitleText"
 						:options="stageOptions"
-						placement="center"
-						btn-class="inline-flex items-center gap-2 bg-transparent p-0 text-2xl font-extrabold text-contrast"
+						placement="bottom-start"
+						class="!h-auto !w-auto gap-2 !bg-transparent !p-0 text-2xl font-extrabold text-contrast"
 					>
 						<component
 							:is="isPseudoStage ? ScaleIcon : (currentStageObj._icon ?? ScaleIcon)"
@@ -56,42 +57,55 @@
 						{{ checklistTitleText }}
 					</button>
 				</h1>
-				<ButtonStyled v-if="!isPseudoStage && currentStageObj._guidanceUrl" circular>
-					<a v-tooltip="`Stage guidance`" target="_blank" :href="currentStageObj._guidanceUrl">
-						<FileTextIcon />
-					</a>
-				</ButtonStyled>
-				<ButtonStyled
-					circular
-					:color="!isPseudoStage && currentStageHasState ? 'orange' : 'red'"
-					color-fill="none"
-					hover-color-fill="background"
+				<ButtonLink
+					v-if="!isPseudoStage && currentStageObj._guidanceUrl"
+					v-tooltip="`Stage guidance`"
+					target="_blank"
+					:href="currentStageObj._guidanceUrl"
+					class="!w-9 !rounded-full !px-0"
 				>
-					<button
-						v-tooltip="
-							!isPseudoStage && currentStageHasState
-								? 'Reset Stage'
-								: !isPseudoStage && !checklistHasState
-									? 'Return to Start'
-									: 'Reset Checklist'
-						"
-						:disabled="!isPseudoStage && !checklistHasState && isOnFirstStage"
-						@click="resetProgress"
-					>
-						<UndoIcon v-if="!isPseudoStage && !checklistHasState" />
-						<BrushCleaningIcon v-else />
-					</button>
-				</ButtonStyled>
-				<ButtonStyled circular color="red" color-fill="none" hover-color-fill="background">
-					<button v-tooltip="`Exit moderation`" @click="handleExit">
-						<XIcon />
-					</button>
-				</ButtonStyled>
-				<ButtonStyled circular>
-					<button v-tooltip="collapsed ? `Expand` : `Collapse`" @click="emit('toggleCollapsed')">
-						<DropdownIcon class="transition-transform" :class="{ 'rotate-180': collapsed }" />
-					</button>
-				</ButtonStyled>
+					<FileTextIcon />
+				</ButtonLink>
+				<IconButton
+					v-tooltip="
+						!isPseudoStage && currentStageHasState
+							? 'Reset Stage'
+							: !isPseudoStage && !checklistHasState
+								? 'Return to Start'
+								: 'Reset Checklist'
+					"
+					type="quiet"
+					:color="!isPseudoStage && currentStageHasState ? 'orange' : 'red'"
+					:label="
+						!isPseudoStage && currentStageHasState
+							? 'Reset Stage'
+							: !isPseudoStage && !checklistHasState
+								? 'Return to Start'
+								: 'Reset Checklist'
+					"
+					:disabled="!isPseudoStage && !checklistHasState && isOnFirstStage"
+					@click="resetProgress"
+				>
+					<UndoIcon v-if="!isPseudoStage && !checklistHasState" />
+					<BrushCleaningIcon v-else />
+				</IconButton>
+				<IconButton
+					v-tooltip="`Exit moderation`"
+					type="quiet"
+					color="red"
+					label="Exit moderation"
+					class="hover:!bg-red hover:!text-[var(--color-accent-contrast)] focus-visible:!bg-red focus-visible:!text-[var(--color-accent-contrast)]"
+					@click="handleExit"
+				>
+					<XIcon />
+				</IconButton>
+				<IconButton
+					v-tooltip="collapsed ? `Expand` : `Collapse`"
+					:label="collapsed ? `Expand` : `Collapse`"
+					@click="emit('toggleCollapsed')"
+				>
+					<DropdownIcon class="transition-transform" :class="{ 'rotate-180': collapsed }" />
+				</IconButton>
 			</div>
 		</div>
 		<p
@@ -128,24 +142,21 @@
 						class="mt-4 flex grow justify-between gap-2 border-0 border-t-[1px] border-solid border-surface-5 pt-4"
 					>
 						<div class="flex items-center gap-2">
-							<ButtonStyled @click="openTakeOverModal">
-								<button>
-									<LockIcon aria-hidden="true" />
-									Take over
-								</button>
-							</ButtonStyled>
+							<Button @click="openTakeOverModal">
+								<LockIcon aria-hidden="true" />
+								Take over
+							</Button>
 						</div>
 						<div class="flex items-center gap-2">
-							<ButtonStyled
+							<Button
 								v-if="moderationQueue.isQueueMode && moderationQueue.queueLength > 1"
+								type="colored"
 								color="brand"
 								@click="skipToNextProject"
 							>
-								<button>
-									<RightArrowIcon aria-hidden="true" />
-									Next project ({{ moderationQueue.queueLength }} left)
-								</button>
-							</ButtonStyled>
+								<RightArrowIcon aria-hidden="true" />
+								Next project ({{ moderationQueue.queueLength }} left)
+							</Button>
 						</div>
 					</div>
 				</div>
@@ -161,24 +172,21 @@
 						class="mt-4 flex grow justify-between gap-2 border-0 border-t-[1px] border-solid border-surface-5 pt-4"
 					>
 						<div class="flex items-center gap-2">
-							<ButtonStyled @click="reviewAnyway">
-								<button>
-									<ScaleIcon aria-hidden="true" />
-									Review anyway
-								</button>
-							</ButtonStyled>
+							<Button @click="reviewAnyway">
+								<ScaleIcon aria-hidden="true" />
+								Review anyway
+							</Button>
 						</div>
 						<div class="flex items-center gap-2">
-							<ButtonStyled
+							<Button
 								v-if="moderationQueue.isQueueMode && moderationQueue.queueLength > 1"
+								type="colored"
 								color="brand"
 								@click="skipToNextProject"
 							>
-								<button>
-									<RightArrowIcon aria-hidden="true" />
-									Next project ({{ moderationQueue.queueLength }} left)
-								</button>
-							</ButtonStyled>
+								<RightArrowIcon aria-hidden="true" />
+								Next project ({{ moderationQueue.queueLength }} left)
+							</Button>
 						</div>
 					</div>
 				</div>
@@ -196,18 +204,16 @@
 						</p>
 					</div>
 					<div v-else-if="generatedMessage" class="flex min-h-0 flex-1 flex-col gap-2">
-						<ButtonStyled class="shrink-0 self-start">
-							<button @click="useSimpleEditor = !useSimpleEditor">
-								<template v-if="!useSimpleEditor">
-									<ToggleLeftIcon aria-hidden="true" />
-									Use simple mode
-								</template>
-								<template v-else>
-									<ToggleRightIcon aria-hidden="true" />
-									Use advanced mode
-								</template>
-							</button>
-						</ButtonStyled>
+						<Button class="shrink-0 self-start" @click="useSimpleEditor = !useSimpleEditor">
+							<template v-if="!useSimpleEditor">
+								<ToggleLeftIcon aria-hidden="true" />
+								Use simple mode
+							</template>
+							<template v-else>
+								<ToggleRightIcon aria-hidden="true" />
+								Use advanced mode
+							</template>
+						</Button>
 						<div class="min-h-0 flex-1 overflow-y-auto">
 							<MarkdownEditor
 								v-if="!useSimpleEditor"
@@ -250,110 +256,115 @@
 						class="mt-4 flex grow justify-between gap-2 border-0 border-t-[1px] border-solid border-surface-5 pt-4"
 					>
 						<div class="flex items-center gap-2">
-							<ButtonStyled v-if="!done && !generatedMessage && moderationQueue.hasItems">
-								<button @click="skipCurrentProject">
-									<XIcon aria-hidden="true" />
-									Skip ({{ moderationQueue.queueLength }} left)
-								</button>
-							</ButtonStyled>
+							<Button
+								v-if="!done && !generatedMessage && moderationQueue.hasItems"
+								@click="skipCurrentProject"
+							>
+								<XIcon aria-hidden="true" />
+								Skip ({{ moderationQueue.queueLength }} left)
+							</Button>
 						</div>
 
 						<div class="flex items-center gap-2">
-							<ButtonStyled v-if="!done" circular>
-								<TeleportOverflowMenu :options="stageOptions" placement="center">
-									<ListBulletedIcon />
-									<span class="sr-only">Stages</span>
-									<template v-for="opt in stageOptions" #[opt.id] :key="opt.id">
-										<component :is="opt.icon" v-if="opt.icon" class="mr-2" />
-										<span>
-											{{ opt.text
-											}}<span v-if="opt.requiredMissing" class="font-bold text-red">*</span>
-										</span>
-										<span v-if="opt.messages" class="ml-auto pl-2 font-semibold opacity-75">{{
-											opt.messages
-										}}</span>
-										<span v-if="opt.fixes" class="pl-2 font-semibold text-blue">{{
-											opt.fixes
-										}}</span>
-									</template>
-								</TeleportOverflowMenu>
-							</ButtonStyled>
+							<TeleportOverflowMenu
+								v-if="!done"
+								label="More options"
+								:options="stageOptions"
+								placement="bottom-end"
+							>
+								<ListBulletedIcon />
+								<span class="sr-only">Stages</span>
+								<template v-for="opt in stageOptions" #[opt.id] :key="opt.id">
+									<component :is="opt.icon" v-if="opt.icon" class="mr-2" />
+									<span>
+										{{ opt.text
+										}}<span v-if="opt.requiredMissing" class="font-bold text-red">*</span>
+									</span>
+									<span v-if="opt.messages" class="ml-auto pl-2 font-semibold opacity-75">{{
+										opt.messages
+									}}</span>
+									<span v-if="opt.fixes" class="pl-2 font-semibold text-blue">{{ opt.fixes }}</span>
+								</template>
+							</TeleportOverflowMenu>
 
 							<div v-if="done">
-								<ButtonStyled color="brand">
-									<button @click="endChecklist(undefined)">
-										<template v-if="hasNextProject">
-											<RightArrowIcon aria-hidden="true" />
-											Next project ({{ moderationQueue.queueLength }} left)
-										</template>
-										<template v-else>
-											<CheckIcon aria-hidden="true" />
-											All done!
-										</template>
-									</button>
-								</ButtonStyled>
+								<Button type="colored" color="brand" @click="endChecklist(undefined)">
+									<template v-if="hasNextProject">
+										<RightArrowIcon aria-hidden="true" />
+										Next project ({{ moderationQueue.queueLength }} left)
+									</template>
+									<template v-else>
+										<CheckIcon aria-hidden="true" />
+										All done!
+									</template>
+								</Button>
 							</div>
 
 							<div v-else-if="generatedMessage" class="flex items-center gap-2">
-								<ButtonStyled>
-									<button :disabled="loadingModerationDecision" @click="previousStage">
-										<LeftArrowIcon aria-hidden="true" />
-										Edit
-									</button>
-								</ButtonStyled>
-								<ButtonStyled color="red">
-									<button :disabled="loadingModerationDecision" @click="sendMessage('rejected')">
-										<SpinnerIcon
-											v-if="moderationDecision === 'rejected'"
-											class="animate-spin"
-											aria-hidden="true"
-										/>
-										<XIcon v-else aria-hidden="true" />
-										Reject
-									</button>
-								</ButtonStyled>
-								<ButtonStyled color="orange">
-									<button :disabled="loadingModerationDecision" @click="sendMessage('withheld')">
-										<SpinnerIcon
-											v-if="moderationDecision === 'withheld'"
-											class="animate-spin"
-											aria-hidden="true"
-										/>
-										<LinkIcon v-else aria-hidden="true" />
-										Withhold
-									</button>
-								</ButtonStyled>
-								<ButtonStyled color="green">
-									<button
-										:disabled="loadingModerationDecision"
-										@click="sendMessage(approveSendStatus)"
-									>
-										<SpinnerIcon
-											v-if="moderationDecision === approveSendStatus"
-											class="animate-spin"
-											aria-hidden="true"
-										/>
-										<CheckIcon v-else aria-hidden="true" />
-										Approve
-									</button>
-								</ButtonStyled>
+								<Button :disabled="loadingModerationDecision" @click="previousStage">
+									<LeftArrowIcon aria-hidden="true" />
+									Edit
+								</Button>
+								<Button
+									type="colored"
+									color="red"
+									:disabled="loadingModerationDecision"
+									@click="sendMessage('rejected')"
+								>
+									<SpinnerIcon
+										v-if="moderationDecision === 'rejected'"
+										class="animate-spin"
+										aria-hidden="true"
+									/>
+									<XIcon v-else aria-hidden="true" />
+									Reject
+								</Button>
+								<Button
+									type="colored"
+									color="orange"
+									:disabled="loadingModerationDecision"
+									@click="sendMessage('withheld')"
+								>
+									<SpinnerIcon
+										v-if="moderationDecision === 'withheld'"
+										class="animate-spin"
+										aria-hidden="true"
+									/>
+									<LinkIcon v-else aria-hidden="true" />
+									Withhold
+								</Button>
+								<Button
+									type="colored"
+									color="green"
+									:disabled="loadingModerationDecision"
+									@click="sendMessage(approveSendStatus)"
+								>
+									<SpinnerIcon
+										v-if="moderationDecision === approveSendStatus"
+										class="animate-spin"
+										aria-hidden="true"
+									/>
+									<CheckIcon v-else aria-hidden="true" />
+									Approve
+								</Button>
 							</div>
 
 							<div v-else class="flex items-center gap-2">
-								<ButtonStyled>
-									<button :disabled="!hasValidPreviousStage" @click="previousStage">
-										<LeftArrowIcon aria-hidden="true" /> Previous
-									</button>
-								</ButtonStyled>
-								<ButtonStyled color="brand" :disabled="isLastVisibleStage && loadingMessage">
-									<button @click="nextStage">
-										<template v-if="isLastVisibleStage">
-											<CheckIcon aria-hidden="true" />
-											{{ loadingMessage ? 'Generating...' : 'Generate Message' }}
-										</template>
-										<template v-else> <RightArrowIcon aria-hidden="true" /> Next </template>
-									</button>
-								</ButtonStyled>
+								<Button :disabled="!hasValidPreviousStage" @click="previousStage">
+									<LeftArrowIcon aria-hidden="true" /> Previous
+								</Button>
+								<Button
+									type="colored"
+									color="brand"
+									:disabled="isLastVisibleStage && loadingMessage"
+									@click="nextStage"
+								>
+									<template v-if="isLastVisibleStage">
+										<CheckIcon aria-hidden="true" />
+										{{ loadingMessage ? 'Generating...' : 'Generate Message' }}
+									</template>
+									<template v-else> <RightArrowIcon aria-hidden="true" /> Next </template>
+								</Button>
 							</div>
 						</div>
 					</div>
@@ -407,17 +418,19 @@ import {
 } from '@modrinth/moderation'
 import {
 	Avatar,
-	ButtonStyled,
+	Button,
+	ButtonLink,
 	Collapsible,
 	ConfirmModal,
+	IconButton,
 	injectModrinthClient,
 	injectNotificationManager,
 	injectProjectPageContext,
 	MarkdownEditor,
 	StyledInput,
+	TeleportOverflowMenu,
 	useDebugLogger,
 } from '@modrinth/ui'
-import TeleportOverflowMenu from '@modrinth/ui/src/components/base/TeleportOverflowMenu.vue'
 import type { ProjectStatus } from '@modrinth/utils'
 import { useQueryClient } from '@tanstack/vue-query'
 import { useDebounceFn } from '@vueuse/core'
@@ -1785,9 +1798,9 @@ const hasValidPreviousStage = computed(() => {
 
 interface StageOption {
 	id: string
+	label: string
 	action: () => void
 	text: string
-	color?: 'green'
 	icon?: Component
 	messages?: number
 	fixes?: number
@@ -1799,14 +1812,15 @@ const stageOptions = computed<StageOption[]>(() => {
 		.map((stage, index) => {
 			if (!shouldShowStage(stage)) return null
 
+			const label = stage.label ?? kebabToTitleCase(stage.id)
 			return {
 				id: String(index),
+				label,
 				action: () => {
 					clearGeneratedMessageState()
 					currentStage.value = index
 				},
-				text: stage.label ?? kebabToTitleCase(stage.id),
-				color: index === currentStage.value && !generatedMessage.value ? 'green' : undefined,
+				text: label,
 				icon: stage._icon ?? undefined,
 				messages: countStageActions(stage) || undefined,
 				fixes: countStageFixes(stage) || undefined,
@@ -1817,9 +1831,9 @@ const stageOptions = computed<StageOption[]>(() => {
 
 	options.push({
 		id: 'generate-message',
+		label: 'Generate Message',
 		action: () => generateMessage(),
 		text: 'Generate Message',
-		color: generatedMessage.value ? 'green' : undefined,
 		icon: CheckIcon,
 	})
 
diff --git a/apps/frontend/src/components/ui/moderation/checklist/ModpackPermissionsFlow.vue b/apps/frontend/src/components/ui/moderation/checklist/ModpackPermissionsFlow.vue
index 6aec854a41..f99e3a2b12 100644
--- a/apps/frontend/src/components/ui/moderation/checklist/ModpackPermissionsFlow.vue
+++ b/apps/frontend/src/components/ui/moderation/checklist/ModpackPermissionsFlow.vue
@@ -19,16 +19,30 @@
 			<div v-if="modPackData[currentIndex].type === 'unknown'">
 				<p>What is the approval type of {{ modPackData[currentIndex].file_name }}?</p>
 				<div class="input-group">
-					<ButtonStyled
+					<Button
 						v-for="(option, index) in fileApprovalTypes"
 						:key="index"
-						:color="modPackData[currentIndex].status === option.id ? 'brand' : 'standard'"
+						:type="
+							(modPackData[currentIndex].status === option.id ? 'brand' : 'standard') &&
+							(modPackData[currentIndex].status === option.id ? 'brand' : 'standard') !== 'standard'
+								? 'colored'
+								: 'base'
+						"
+						:color="
+							(modPackData[currentIndex].status === option.id ? 'brand' : 'standard') &&
+							(modPackData[currentIndex].status === option.id ? 'brand' : 'standard') !== 'standard'
+								? (modPackData[currentIndex].status === option.id ? 'brand' : 'standard') ===
+									'medal-promo'
+									? 'medal_promotion'
+									: modPackData[currentIndex].status === option.id
+										? 'brand'
+										: 'standard'
+								: undefined
+						"
 						@click="setStatus(currentIndex, option.id)"
 					>
-						<button>
-							{{ option.name }}
-						</button>
-					</ButtonStyled>
+						{{ option.name }}
+					</Button>
 				</div>
 				<div v-if="modPackData[currentIndex].status !== 'unidentified'" class="flex flex-col gap-1">
 					<label for="proof">
@@ -74,16 +88,30 @@
 					>)?
 				</p>
 				<div class="input-group">
-					<ButtonStyled
+					<Button
 						v-for="(option, index) in fileApprovalTypes"
 						:key="index"
-						:color="modPackData[currentIndex].status === option.id ? 'brand' : 'standard'"
+						:type="
+							(modPackData[currentIndex].status === option.id ? 'brand' : 'standard') &&
+							(modPackData[currentIndex].status === option.id ? 'brand' : 'standard') !== 'standard'
+								? 'colored'
+								: 'base'
+						"
+						:color="
+							(modPackData[currentIndex].status === option.id ? 'brand' : 'standard') &&
+							(modPackData[currentIndex].status === option.id ? 'brand' : 'standard') !== 'standard'
+								? (modPackData[currentIndex].status === option.id ? 'brand' : 'standard') ===
+									'medal-promo'
+									? 'medal_promotion'
+									: modPackData[currentIndex].status === option.id
+										? 'brand'
+										: 'standard'
+								: undefined
+						"
 						@click="setStatus(currentIndex, option.id)"
 					>
-						<button>
-							{{ option.name }}
-						</button>
-					</ButtonStyled>
+						{{ option.name }}
+					</Button>
 				</div>
 			</div>
 
@@ -110,40 +138,58 @@
 					>?
 				</p>
 				<div class="input-group">
-					<ButtonStyled
+					<Button
 						v-for="(option, index) in filePermissionTypes"
 						:key="index"
-						:color="modPackData[currentIndex].approved === option.id ? 'brand' : 'standard'"
+						:type="
+							(modPackData[currentIndex].approved === option.id ? 'brand' : 'standard') &&
+							(modPackData[currentIndex].approved === option.id ? 'brand' : 'standard') !==
+								'standard'
+								? 'colored'
+								: 'base'
+						"
+						:color="
+							(modPackData[currentIndex].approved === option.id ? 'brand' : 'standard') &&
+							(modPackData[currentIndex].approved === option.id ? 'brand' : 'standard') !==
+								'standard'
+								? (modPackData[currentIndex].approved === option.id ? 'brand' : 'standard') ===
+									'medal-promo'
+									? 'medal_promotion'
+									: modPackData[currentIndex].approved === option.id
+										? 'brand'
+										: 'standard'
+								: undefined
+						"
 						@click="setApproval(currentIndex, option.id)"
 					>
-						<button>
-							{{ option.name }}
-						</button>
-					</ButtonStyled>
+						{{ option.name }}
+					</Button>
 				</div>
 			</div>
 		</div>
 
 		<div class="mt-4 flex gap-2">
-			<ButtonStyled>
-				<button :disabled="currentIndex <= 0" @click="goToPrevious">
-					<LeftArrowIcon aria-hidden="true" />
-					Previous
-				</button>
-			</ButtonStyled>
-			<ButtonStyled v-if="modPackData && currentIndex < modPackData.length" color="blue">
-				<button :disabled="!canGoNext" @click="goToNext">
-					<RightArrowIcon aria-hidden="true" />
-					{{ currentIndex + 1 >= modPackData.length ? 'Complete' : 'Next' }}
-				</button>
-			</ButtonStyled>
+			<Button :disabled="currentIndex <= 0" @click="goToPrevious">
+				<LeftArrowIcon aria-hidden="true" />
+				Previous
+			</Button>
+			<Button
+				v-if="modPackData && currentIndex < modPackData.length"
+				type="colored"
+				color="blue"
+				:disabled="!canGoNext"
+				@click="goToNext"
+			>
+				<RightArrowIcon aria-hidden="true" />
+				{{ currentIndex + 1 >= modPackData.length ? 'Complete' : 'Next' }}
+			</Button>
 		</div>
 	</div>
 </template>
 
 <script setup lang="ts">
 import { LeftArrowIcon, RightArrowIcon } from '@modrinth/assets'
-import { ButtonStyled, StyledInput } from '@modrinth/ui'
+import { Button, StyledInput } from '@modrinth/ui'
 import type {
 	ModerationFlameModpackItem,
 	ModerationJudgements,
diff --git a/apps/frontend/src/components/ui/moderation/checklist/NodeRenderer.vue b/apps/frontend/src/components/ui/moderation/checklist/NodeRenderer.vue
index 92641ce1b1..7a320d2ff6 100644
--- a/apps/frontend/src/components/ui/moderation/checklist/NodeRenderer.vue
+++ b/apps/frontend/src/components/ui/moderation/checklist/NodeRenderer.vue
@@ -26,7 +26,7 @@ import {
 	setMessageProject,
 } from '@modrinth/moderation'
 import {
-	ButtonStyled,
+	Button,
 	Checkbox,
 	Combobox,
 	injectProjectPageContext,
@@ -251,7 +251,7 @@ function nodeHasRequiredMissing(node: IdentifiedNodeBuilder): boolean {
 	return !!nodeMetaMap?.value.get(node)?.hasRequiredMissing || hasRequiredMissingDescendants(node)
 }
 
-function getBooleanColor(node: BooleanNodeBuilder): string {
+function getBooleanColor(node: BooleanNodeBuilder): 'standard' | 'orange' | 'blue' | 'brand' {
 	if (!getBooleanState(node)) return 'standard'
 	if (hasRequiredMissingDescendants(node)) return 'orange'
 	return hasActionableFixes(node) ? 'blue' : 'brand'
@@ -555,25 +555,52 @@ watchEffect(async () => {
 									v-for="child in visibleChildren(asIdentified(item))"
 									:key="asIdentified(child).id"
 								>
-									<ButtonStyled
-										:color="
-											getMultiSelectState(asIdentified(item)).has(asIdentified(child).id!)
+									<Button
+										v-tooltip="getTooltipConfig(asIdentified(child))"
+										:type="
+											(getMultiSelectState(asIdentified(item)).has(asIdentified(child).id!)
 												? hasActionableFixes(asIdentified(child))
 													? 'blue'
 													: 'brand'
-												: 'standard'
+												: 'standard') &&
+											(getMultiSelectState(asIdentified(item)).has(asIdentified(child).id!)
+												? hasActionableFixes(asIdentified(child))
+													? 'blue'
+													: 'brand'
+												: 'standard') !== 'standard'
+												? 'colored'
+												: 'base'
 										"
-										:circular="!!asIdentified(child)._icon"
+										:color="
+											(getMultiSelectState(asIdentified(item)).has(asIdentified(child).id!)
+												? hasActionableFixes(asIdentified(child))
+													? 'blue'
+													: 'brand'
+												: 'standard') &&
+											(getMultiSelectState(asIdentified(item)).has(asIdentified(child).id!)
+												? hasActionableFixes(asIdentified(child))
+													? 'blue'
+													: 'brand'
+												: 'standard') !== 'standard'
+												? (getMultiSelectState(asIdentified(item)).has(asIdentified(child).id!)
+														? hasActionableFixes(asIdentified(child))
+															? 'blue'
+															: 'brand'
+														: 'standard') === 'medal-promo'
+													? 'medal_promotion'
+													: getMultiSelectState(asIdentified(item)).has(asIdentified(child).id!)
+														? hasActionableFixes(asIdentified(child))
+															? 'blue'
+															: 'brand'
+														: 'standard'
+												: undefined
+										"
+										:aria-label="asIdentified(child)._icon ? asLabeled(child).label : undefined"
 										@click="toggleChip(asIdentified(item), asIdentified(child))"
 									>
-										<button
-											v-tooltip="getTooltipConfig(asIdentified(child))"
-											:aria-label="asIdentified(child)._icon ? asLabeled(child).label : undefined"
-										>
-											<component :is="asIdentified(child)._icon" v-if="asIdentified(child)._icon" />
-											<template v-else>{{ asLabeled(child).label }}</template>
-										</button>
-									</ButtonStyled>
+										<component :is="asIdentified(child)._icon" v-if="asIdentified(child)._icon" />
+										<template v-else>{{ asLabeled(child).label }}</template>
+									</Button>
 								</template>
 							</div>
 							<template
@@ -601,22 +628,39 @@ watchEffect(async () => {
 									v-for="child in visibleChildren(asIdentified(item))"
 									:key="asIdentified(child).id"
 								>
-									<ButtonStyled
-										:color="
-											getSelectState(asIdentified(item)) === asIdentified(child).id
+									<Button
+										:type="
+											(getSelectState(asIdentified(item)) === asIdentified(child).id
 												? 'brand'
-												: 'standard'
+												: 'standard') &&
+											(getSelectState(asIdentified(item)) === asIdentified(child).id
+												? 'brand'
+												: 'standard') !== 'standard'
+												? 'colored'
+												: 'base'
 										"
-										:circular="!!asIdentified(child)._icon"
+										:color="
+											(getSelectState(asIdentified(item)) === asIdentified(child).id
+												? 'brand'
+												: 'standard') &&
+											(getSelectState(asIdentified(item)) === asIdentified(child).id
+												? 'brand'
+												: 'standard') !== 'standard'
+												? (getSelectState(asIdentified(item)) === asIdentified(child).id
+														? 'brand'
+														: 'standard') === 'medal-promo'
+													? 'medal_promotion'
+													: getSelectState(asIdentified(item)) === asIdentified(child).id
+														? 'brand'
+														: 'standard'
+												: undefined
+										"
+										:aria-label="asIdentified(child)._icon ? asLabeled(child).label : undefined"
+										@click="toggleSelect(asIdentified(item), asIdentified(child))"
 									>
-										<button
-											:aria-label="asIdentified(child)._icon ? asLabeled(child).label : undefined"
-											@click="toggleSelect(asIdentified(item), asIdentified(child))"
-										>
-											<component :is="asIdentified(child)._icon" v-if="asIdentified(child)._icon" />
-											<template v-else>{{ asLabeled(child).label }}</template>
-										</button>
-									</ButtonStyled>
+										<component :is="asIdentified(child)._icon" v-if="asIdentified(child)._icon" />
+										<template v-else>{{ asLabeled(child).label }}</template>
+									</Button>
 								</template>
 							</div>
 							<template
@@ -680,32 +724,34 @@ watchEffect(async () => {
 
 					<!-- button -->
 					<template v-else-if="item.type === 'button'">
-						<ButtonStyled :circular="!!item._icon && !asButton(item).label">
-							<button
-								v-tooltip="getTooltipConfig(item, showContext)"
-								:disabled="!isButtonEnabled(asButton(item))"
-								:aria-label="item._icon && !asButton(item).label ? asButton(item).label : undefined"
-								@click="handleButtonClick(asButton(item))"
-							>
-								<component :is="item._icon" v-if="item._icon" />
-								{{ asButton(item).label }}
-							</button>
-						</ButtonStyled>
+						<Button
+							v-tooltip="getTooltipConfig(item, showContext)"
+							:disabled="!isButtonEnabled(asButton(item))"
+							:aria-label="item._icon && !asButton(item).label ? asButton(item).label : undefined"
+							@click="handleButtonClick(asButton(item))"
+						>
+							<component :is="item._icon" v-if="item._icon" />
+							{{ asButton(item).label }}
+						</Button>
 					</template>
 
 					<!-- toggle -->
 					<template v-else-if="item.type === 'toggle'">
-						<ButtonStyled :color="getBooleanColor(asBool(item))" :circular="!!item._icon">
-							<button
-								v-tooltip="getTooltipConfig(asBool(item))"
-								:disabled="!isEnabled(asIdentified(item))"
-								:aria-label="item._icon ? asLabeled(item).label : undefined"
-								@click="toggleBoolean(asBool(item))"
-							>
-								<component :is="item._icon" v-if="item._icon" />
-								<template v-else>{{ asLabeled(item).label }}</template>
-							</button>
-						</ButtonStyled>
+						<Button
+							v-tooltip="getTooltipConfig(asBool(item))"
+							:type="getBooleanColor(asBool(item)) === 'standard' ? 'base' : 'colored'"
+							:color="
+								getBooleanColor(asBool(item)) === 'standard'
+									? undefined
+									: getBooleanColor(asBool(item))
+							"
+							:disabled="!isEnabled(asIdentified(item))"
+							:aria-label="item._icon ? asLabeled(item).label : undefined"
+							@click="toggleBoolean(asBool(item))"
+						>
+							<component :is="item._icon" v-if="item._icon" />
+							<template v-else>{{ asLabeled(item).label }}</template>
+						</Button>
 					</template>
 
 					<!-- check -->
diff --git a/apps/frontend/src/components/ui/moderation/settings/ModerationKeybind.vue b/apps/frontend/src/components/ui/moderation/settings/ModerationKeybind.vue
index 3f13325e88..b9dd7a5320 100644
--- a/apps/frontend/src/components/ui/moderation/settings/ModerationKeybind.vue
+++ b/apps/frontend/src/components/ui/moderation/settings/ModerationKeybind.vue
@@ -6,11 +6,16 @@
 				v-tooltip="'Can be used without the checklist open if setting enabled.'"
 			/>
 			{{ props.title }}
-			<ButtonStyled size="small" circular type="transparent">
-				<Button :disabled="!hasChanged" @click="resetToDefault">
-					<RotateCounterClockwiseIcon />
-				</Button>
-			</ButtonStyled>
+			<IconButton
+				type="quiet"
+				size="xs"
+				class="!size-6"
+				label="Reset to default"
+				:disabled="!hasChanged"
+				@click="resetToDefault"
+			>
+				<RotateCounterClockwiseIcon />
+			</IconButton>
 		</span>
 		<div class="flex flex-row items-center gap-2">
 			<kbd
@@ -42,7 +47,7 @@
 <script setup lang="ts">
 import { GlobeIcon, RotateCounterClockwiseIcon } from '@modrinth/assets'
 import { type KeybindDefinition, toKeybindDefinition } from '@modrinth/moderation'
-import { Button, ButtonStyled } from '@modrinth/ui'
+import { IconButton } from '@modrinth/ui'
 import { onUnmounted } from 'vue'
 
 const props = defineProps<{
diff --git a/apps/frontend/src/components/ui/news/LatestNewsRow.vue b/apps/frontend/src/components/ui/news/LatestNewsRow.vue
index 50bc98faf8..319ac822f2 100644
--- a/apps/frontend/src/components/ui/news/LatestNewsRow.vue
+++ b/apps/frontend/src/components/ui/news/LatestNewsRow.vue
@@ -16,12 +16,10 @@
 			</div>
 		</div>
 		<div class="mx-2 my-8 flex w-full items-center justify-center">
-			<ButtonStyled color="brand" size="large">
-				<nuxt-link to="/news">
-					<NewspaperIcon />
-					{{ formatMessage(messages.viewAll) }}
-				</nuxt-link>
-			</ButtonStyled>
+			<ButtonLink type="colored" color="brand" size="xl" to="/news">
+				<NewspaperIcon />
+				{{ formatMessage(messages.viewAll) }}
+			</ButtonLink>
 		</div>
 	</div>
 </template>
@@ -29,7 +27,7 @@
 <script setup lang="ts">
 import { NewspaperIcon } from '@modrinth/assets'
 import { articles as rawArticles } from '@modrinth/blog'
-import { ButtonStyled, defineMessages, NewsArticleCard, useVIntl } from '@modrinth/ui'
+import { ButtonLink, defineMessages, NewsArticleCard, useVIntl } from '@modrinth/ui'
 import { computed, ref } from 'vue'
 
 const { formatMessage } = useVIntl()
diff --git a/apps/frontend/src/components/ui/project-settings/CompatibilityCard.vue b/apps/frontend/src/components/ui/project-settings/CompatibilityCard.vue
index 54be708d25..75b009b0d7 100644
--- a/apps/frontend/src/components/ui/project-settings/CompatibilityCard.vue
+++ b/apps/frontend/src/components/ui/project-settings/CompatibilityCard.vue
@@ -39,18 +39,19 @@
 						</div>
 					</div>
 				</div>
-				<ButtonStyled v-if="content" type="outlined">
-					<button :disabled="!hasPermission" @click="handleSwitchCompatibility">
-						<ArrowLeftRightIcon />
-						Switch type
-					</button>
-				</ButtonStyled>
-				<ButtonStyled v-else>
-					<button :disabled="!hasPermission" @click="handleSetCompatibility">
-						<ComponentIcon />
-						Set compatibility
-					</button>
-				</ButtonStyled>
+				<Button
+					v-if="content"
+					type="outlined"
+					:disabled="!hasPermission"
+					@click="handleSwitchCompatibility"
+				>
+					<ArrowLeftRightIcon />
+					Switch type
+				</Button>
+				<Button v-else :disabled="!hasPermission" @click="handleSetCompatibility">
+					<ComponentIcon />
+					Set compatibility
+				</Button>
 			</div>
 
 			<div
@@ -182,16 +183,15 @@
 					</div>
 				</div>
 
-				<ButtonStyled v-if="content">
-					<button
-						class="!w-full !max-w-[160px]"
-						:disabled="!hasPermission"
-						@click="handleUpdateContent"
-					>
-						<RefreshCwIcon />
-						Update
-					</button>
-				</ButtonStyled>
+				<Button
+					v-if="content"
+					class="!w-full !max-w-[160px]"
+					:disabled="!hasPermission"
+					@click="handleUpdateContent"
+				>
+					<RefreshCwIcon />
+					Update
+				</Button>
 			</div>
 		</div>
 		<ServerCompatibilityModal v-if="hasPermission" ref="serverCompatibilityModal" />
@@ -211,7 +211,7 @@ import {
 } from '@modrinth/assets'
 import {
 	Avatar,
-	ButtonStyled,
+	Button,
 	FormattedTag,
 	injectModrinthClient,
 	injectProjectPageContext,
diff --git a/apps/frontend/src/components/ui/project-settings/ServerCompatibilityModal/stages/UploadCustomModpack.vue b/apps/frontend/src/components/ui/project-settings/ServerCompatibilityModal/stages/UploadCustomModpack.vue
index 1451cfb64a..61334b77c9 100644
--- a/apps/frontend/src/components/ui/project-settings/ServerCompatibilityModal/stages/UploadCustomModpack.vue
+++ b/apps/frontend/src/components/ui/project-settings/ServerCompatibilityModal/stages/UploadCustomModpack.vue
@@ -27,23 +27,16 @@
 					</span>
 				</div>
 
-				<ButtonStyled size="standard" :circular="true">
-					<button
-						v-tooltip="'Replace file'"
-						aria-label="Replace file"
-						class="!shadow-none"
-						@click="fileInput?.click()"
-					>
-						<ArrowLeftRightIcon aria-hidden="true" />
-						<input
-							ref="fileInput"
-							class="hidden"
-							type="file"
-							accept=".mrpack"
-							@change="handleFileInputChange"
-						/>
-					</button>
-				</ButtonStyled>
+				<Button v-tooltip="'Replace file'" aria-label="Replace file" @click="fileInput?.click()">
+					<ArrowLeftRightIcon aria-hidden="true" />
+					<input
+						ref="fileInput"
+						class="hidden"
+						type="file"
+						accept=".mrpack"
+						@change="handleFileInputChange"
+					/>
+				</Button>
 			</div>
 
 			<Checkbox v-model="ctx.hasLicensePermission.value">
@@ -65,7 +58,7 @@
 
 <script setup lang="ts">
 import { ArrowLeftRightIcon, FileIcon } from '@modrinth/assets'
-import { ButtonStyled, Checkbox, DropzoneFileInput } from '@modrinth/ui'
+import { Button, Checkbox, DropzoneFileInput } from '@modrinth/ui'
 
 import { injectServerCompatibilityContext } from '~/providers/manage-server-compatibility-modal'
 
diff --git a/apps/frontend/src/components/ui/servers/marketing/MedalPlanPromotion.vue b/apps/frontend/src/components/ui/servers/marketing/MedalPlanPromotion.vue
index 7e2fe3d6d1..c7d12f38e3 100644
--- a/apps/frontend/src/components/ui/servers/marketing/MedalPlanPromotion.vue
+++ b/apps/frontend/src/components/ui/servers/marketing/MedalPlanPromotion.vue
@@ -21,20 +21,22 @@
 				</span>
 			</div>
 		</div>
-		<ButtonStyled color="medal-promo" type="outlined" size="large">
-			<nuxt-link
-				to="https://medal.tv/modrinth"
-				class="z-10 my-auto mt-2 flex w-full items-center justify-center gap-1 md:mt-0 md:w-auto"
-				>{{ formatMessage(messages.learnMoreButton) }} <ExternalIcon
-			/></nuxt-link>
-		</ButtonStyled>
+		<ButtonLink
+			type="outlined"
+			size="xl"
+			href="https://medal.tv/modrinth"
+			class="z-10 my-auto mt-2 w-full md:mt-0 md:w-auto"
+		>
+			{{ formatMessage(messages.learnMoreButton) }}
+			<ExternalIcon aria-hidden="true" />
+		</ButtonLink>
 	</div>
 </template>
 
 <script lang="ts" setup>
 import { ExternalIcon } from '@modrinth/assets'
 import {
-	ButtonStyled,
+	ButtonLink,
 	defineMessages,
 	IntlFormatted,
 	MedalBackgroundImage,
diff --git a/apps/frontend/src/components/ui/servers/marketing/ServerPlanSelector.vue b/apps/frontend/src/components/ui/servers/marketing/ServerPlanSelector.vue
index 5ee3818cff..c36537d79c 100644
--- a/apps/frontend/src/components/ui/servers/marketing/ServerPlanSelector.vue
+++ b/apps/frontend/src/components/ui/servers/marketing/ServerPlanSelector.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { type MessageDescriptor, useFormatPrice } from '@modrinth/ui'
 import {
-	ButtonStyled,
+	Button,
 	commonMessages,
 	defineMessage,
 	defineMessages,
@@ -146,18 +146,24 @@ const billingMonths = computed(() => {
 				</span>
 				<p class="m-0 max-w-[18rem]">{{ formatMessage(plans[plan].description) }}</p>
 			</div>
-			<ButtonStyled
-				:color="plans[plan].buttonColor"
-				:type="plans[plan].mostPopular ? 'standard' : 'highlight-colored-text'"
-				size="large"
+			<Button
+				v-if="outOfStock"
+				disabled
+				size="xl"
+				:type="plans[plan].mostPopular ? 'colored' : 'base'"
+				:color="plans[plan].mostPopular ? plans[plan].buttonColor : undefined"
 			>
-				<span v-if="outOfStock" class="button-like disabled">{{
-					formatMessage(messages.outOfStock)
-				}}</span>
-				<button v-else @click="() => emit('select')">
-					{{ formatMessage(messages.selectPlanButton) }}
-				</button>
-			</ButtonStyled>
+				{{ formatMessage(messages.outOfStock) }}
+			</Button>
+			<Button
+				v-else
+				size="xl"
+				:type="plans[plan].mostPopular ? 'colored' : 'base'"
+				:color="plans[plan].mostPopular ? plans[plan].buttonColor : undefined"
+				@click="() => emit('select')"
+			>
+				{{ formatMessage(messages.selectPlanButton) }}
+			</Button>
 			<ServersSpecs
 				:ram="ram"
 				:storage="storage"
diff --git a/apps/frontend/src/components/ui/thread/ConversationThread.vue b/apps/frontend/src/components/ui/thread/ConversationThread.vue
index c5b6545af9..9de637941d 100644
--- a/apps/frontend/src/components/ui/thread/ConversationThread.vue
+++ b/apps/frontend/src/components/ui/thread/ConversationThread.vue
@@ -34,26 +34,24 @@
 					{{ formatMessage(messages.resubmitModalConfirmationLabel) }}
 				</Checkbox>
 				<div class="flex flex-wrap items-center justify-end gap-2">
-					<ButtonStyled type="outlined">
-						<button @click="modalSubmit.hide()">
-							<XIcon aria-hidden="true" />
-							{{ formatMessage(commonMessages.cancelButton) }}
-						</button>
-					</ButtonStyled>
-					<ButtonStyled color="orange">
-						<button
-							:disabled="!submissionConfirmation || isLoading"
-							@click="runBlockingAction('resubmit-modal', resubmit)"
-						>
-							<SpinnerIcon
-								v-if="loadingAction === 'resubmit-modal'"
-								class="animate-spin"
-								aria-hidden="true"
-							/>
-							<ScaleIcon v-else aria-hidden="true" />
-							{{ formatMessage(messages.actionResubmitForReview) }}
-						</button>
-					</ButtonStyled>
+					<Button type="outlined" @click="modalSubmit.hide()">
+						<XIcon aria-hidden="true" />
+						{{ formatMessage(commonMessages.cancelButton) }}
+					</Button>
+					<Button
+						type="colored"
+						color="orange"
+						:disabled="!submissionConfirmation || isLoading"
+						@click="runBlockingAction('resubmit-modal', resubmit)"
+					>
+						<SpinnerIcon
+							v-if="loadingAction === 'resubmit-modal'"
+							class="animate-spin"
+							aria-hidden="true"
+						/>
+						<ScaleIcon v-else aria-hidden="true" />
+						{{ formatMessage(messages.actionResubmitForReview) }}
+					</Button>
 				</div>
 			</div>
 		</NewModal>
@@ -76,26 +74,24 @@
 					{{ formatMessage(messages.replyModalConfirmationLabel) }}
 				</Checkbox>
 				<div class="flex flex-wrap items-center justify-end gap-2">
-					<ButtonStyled type="outlined">
-						<button @click="modalReply.hide()">
-							<XIcon aria-hidden="true" />
-							{{ formatMessage(commonMessages.cancelButton) }}
-						</button>
-					</ButtonStyled>
-					<ButtonStyled color="brand">
-						<button
-							:disabled="!replyConfirmation || isLoading"
-							@click="runBlockingAction('reply-modal', () => sendReplyFromModal())"
-						>
-							<SpinnerIcon
-								v-if="loadingAction === 'reply-modal'"
-								class="animate-spin"
-								aria-hidden="true"
-							/>
-							<ReplyIcon v-else aria-hidden="true" />
-							{{ formatMessage(messages.actionReplyToThread) }}
-						</button>
-					</ButtonStyled>
+					<Button type="outlined" @click="modalReply.hide()">
+						<XIcon aria-hidden="true" />
+						{{ formatMessage(commonMessages.cancelButton) }}
+					</Button>
+					<Button
+						type="colored"
+						color="brand"
+						:disabled="!replyConfirmation || isLoading"
+						@click="runBlockingAction('reply-modal', () => sendReplyFromModal())"
+					>
+						<SpinnerIcon
+							v-if="loadingAction === 'reply-modal'"
+							class="animate-spin"
+							aria-hidden="true"
+						/>
+						<ReplyIcon v-else aria-hidden="true" />
+						{{ formatMessage(messages.actionReplyToThread) }}
+					</Button>
 				</div>
 			</div>
 		</NewModal>
@@ -119,17 +115,15 @@
 			</div>
 			<template v-if="report && report.closed">
 				<p>{{ formatMessage(messages.closedThreadDescription) }}</p>
-				<ButtonStyled v-if="isStaff(auth.user)">
-					<button :disabled="isLoading" @click="runBlockingAction('reopen', () => reopenReport())">
-						<SpinnerIcon
-							v-if="loadingAction === 'reopen'"
-							class="animate-spin"
-							aria-hidden="true"
-						/>
-						<CheckCircleIcon v-else aria-hidden="true" />
-						{{ formatMessage(messages.actionReopenThread) }}
-					</button>
-				</ButtonStyled>
+				<Button
+					v-if="isStaff(auth.user)"
+					:disabled="isLoading"
+					@click="runBlockingAction('reopen', () => reopenReport())"
+				>
+					<SpinnerIcon v-if="loadingAction === 'reopen'" class="animate-spin" aria-hidden="true" />
+					<CheckCircleIcon v-else aria-hidden="true" />
+					{{ formatMessage(messages.actionReopenThread) }}
+				</Button>
 			</template>
 			<template v-else-if="!report || !report.closed">
 				<div class="mx-4 mb-2 mt-2">
@@ -147,258 +141,251 @@
 				</div>
 				<div class="m-4 mt-3 flex flex-wrap items-center justify-between gap-4">
 					<div class="flex flex-wrap items-center gap-2">
-						<ButtonStyled color="brand">
-							<button
-								v-if="sortedMessages.length > 0"
-								:disabled="!replyBody || isLoading"
-								@click="
-									isApproved(project) && !isStaff(auth.user)
-										? openReplyModal()
-										: runBlockingAction('reply', () => sendReply())
-								"
-							>
-								<SpinnerIcon
-									v-if="loadingAction === 'reply'"
-									class="animate-spin"
-									aria-hidden="true"
-								/>
-								<ReplyIcon v-else aria-hidden="true" />
-								{{ formatMessage(messages.actionReply) }}
-							</button>
-							<button
-								v-else
-								:disabled="!replyBody || isLoading"
-								@click="
-									isApproved(project) && !isStaff(auth.user)
-										? openReplyModal()
-										: runBlockingAction('send', () => sendReply())
-								"
-							>
-								<SpinnerIcon
-									v-if="loadingAction === 'send'"
-									class="animate-spin"
-									aria-hidden="true"
-								/>
-								<SendIcon v-else aria-hidden="true" />
-								{{ formatMessage(messages.actionSend) }}
-							</button>
-						</ButtonStyled>
-						<ButtonStyled v-if="isStaff(auth.user)">
-							<button
-								:disabled="!replyBody || isLoading"
-								@click="runBlockingAction('private-note', () => sendReply(null, true))"
-							>
-								<SpinnerIcon
-									v-if="loadingAction === 'private-note'"
-									class="animate-spin"
-									aria-hidden="true"
-								/>
-								<ScaleIcon v-else aria-hidden="true" />
-								{{ formatMessage(messages.actionAddPrivateNote) }}
-							</button>
-						</ButtonStyled>
+						<Button
+							v-if="sortedMessages.length > 0"
+							type="colored"
+							color="brand"
+							:disabled="!replyBody || isLoading"
+							@click="
+								isApproved(project) && !isStaff(auth.user)
+									? openReplyModal()
+									: runBlockingAction('reply', () => sendReply())
+							"
+						>
+							<SpinnerIcon
+								v-if="loadingAction === 'reply'"
+								class="animate-spin"
+								aria-hidden="true"
+							/>
+							<ReplyIcon v-else aria-hidden="true" />
+							{{ formatMessage(messages.actionReply) }}
+						</Button>
+						<Button
+							v-else
+							:disabled="!replyBody || isLoading"
+							@click="
+								isApproved(project) && !isStaff(auth.user)
+									? openReplyModal()
+									: runBlockingAction('send', () => sendReply())
+							"
+						>
+							<SpinnerIcon
+								v-if="loadingAction === 'send'"
+								class="animate-spin"
+								aria-hidden="true"
+							/>
+							<SendIcon v-else aria-hidden="true" />
+							{{ formatMessage(messages.actionSend) }}
+						</Button>
+						<Button
+							v-if="isStaff(auth.user)"
+							:disabled="!replyBody || isLoading"
+							@click="runBlockingAction('private-note', () => sendReply(null, true))"
+						>
+							<SpinnerIcon
+								v-if="loadingAction === 'private-note'"
+								class="animate-spin"
+								aria-hidden="true"
+							/>
+							<ScaleIcon v-else aria-hidden="true" />
+							{{ formatMessage(messages.actionAddPrivateNote) }}
+						</Button>
 						<template v-if="currentMember && !currentMember.staffOnly">
 							<template v-if="isRejected(project)">
-								<ButtonStyled color="orange">
-									<button v-if="replyBody" :disabled="isLoading" @click="openResubmitModal(true)">
-										<ScaleIcon aria-hidden="true" />
-										{{ formatMessage(messages.actionResubmitForReviewWithReply) }}
-									</button>
-									<button v-else :disabled="isLoading" @click="openResubmitModal(false)">
-										<ScaleIcon aria-hidden="true" />
-										{{ formatMessage(messages.actionResubmitForReview) }}
-									</button>
-								</ButtonStyled>
+								<Button
+									v-if="replyBody"
+									type="colored"
+									color="orange"
+									:disabled="isLoading"
+									@click="openResubmitModal(true)"
+								>
+									<ScaleIcon aria-hidden="true" />
+									{{ formatMessage(messages.actionResubmitForReviewWithReply) }}
+								</Button>
+								<Button v-else :disabled="isLoading" @click="openResubmitModal(false)">
+									<ScaleIcon aria-hidden="true" />
+									{{ formatMessage(messages.actionResubmitForReview) }}
+								</Button>
 							</template>
 						</template>
 					</div>
 					<div class="flex flex-wrap items-center gap-2">
 						<template v-if="report">
 							<template v-if="isStaff(auth.user)">
-								<ButtonStyled color="red">
-									<button
-										v-if="replyBody"
-										:disabled="isLoading"
-										@click="runBlockingAction('close-with-reply', () => closeReport(true))"
-									>
-										<SpinnerIcon
-											v-if="loadingAction === 'close-with-reply'"
-											class="animate-spin"
-											aria-hidden="true"
-										/>
-										<CheckCircleIcon v-else aria-hidden="true" />
-										{{ formatMessage(messages.actionCloseWithReply) }}
-									</button>
-									<button
-										v-else
-										:disabled="isLoading"
-										@click="runBlockingAction('close', () => closeReport())"
-									>
-										<SpinnerIcon
-											v-if="loadingAction === 'close'"
-											class="animate-spin"
-											aria-hidden="true"
-										/>
-										<CheckCircleIcon v-else aria-hidden="true" />
-										{{ formatMessage(messages.actionCloseThread) }}
-									</button>
-								</ButtonStyled>
+								<Button
+									v-if="replyBody"
+									type="colored"
+									color="red"
+									:disabled="isLoading"
+									@click="runBlockingAction('close-with-reply', () => closeReport(true))"
+								>
+									<SpinnerIcon
+										v-if="loadingAction === 'close-with-reply'"
+										class="animate-spin"
+										aria-hidden="true"
+									/>
+									<CheckCircleIcon v-else aria-hidden="true" />
+									{{ formatMessage(messages.actionCloseWithReply) }}
+								</Button>
+								<Button
+									v-else
+									:disabled="isLoading"
+									@click="runBlockingAction('close', () => closeReport())"
+								>
+									<SpinnerIcon
+										v-if="loadingAction === 'close'"
+										class="animate-spin"
+										aria-hidden="true"
+									/>
+									<CheckCircleIcon v-else aria-hidden="true" />
+									{{ formatMessage(messages.actionCloseThread) }}
+								</Button>
 							</template>
 						</template>
 						<template v-if="project">
 							<template v-if="isStaff(auth.user)">
-								<ButtonStyled v-if="replyBody" color="green">
-									<button
-										:disabled="isApproved(project) || isLoading"
-										@click="
-											runBlockingAction('approve-with-reply', () => sendReply(requestedStatus))
-										"
-									>
-										<SpinnerIcon
-											v-if="loadingAction === 'approve-with-reply'"
-											class="animate-spin"
-											aria-hidden="true"
-										/>
-										<CheckIcon v-else aria-hidden="true" />
-										{{ formatMessage(messages.actionApproveWithReply) }}
-									</button>
-								</ButtonStyled>
-								<ButtonStyled v-else color="green">
-									<button
-										:disabled="isApproved(project) || isLoading"
-										@click="runBlockingAction('approve', () => setStatus(requestedStatus))"
-									>
-										<SpinnerIcon
-											v-if="loadingAction === 'approve'"
-											class="animate-spin"
-											aria-hidden="true"
-										/>
-										<CheckIcon v-else aria-hidden="true" />
-										{{ formatMessage(messages.actionApprove) }}
-									</button>
-								</ButtonStyled>
-								<div class="joined-buttons">
-									<ButtonStyled v-if="replyBody" color="red">
-										<button
-											:disabled="project.status === 'rejected' || isLoading"
-											@click="runBlockingAction('reject-with-reply', () => sendReply('rejected'))"
-										>
-											<SpinnerIcon
-												v-if="loadingAction === 'reject-with-reply'"
-												class="animate-spin"
-												aria-hidden="true"
-											/>
-											<XIcon v-else aria-hidden="true" />
-											{{ formatMessage(messages.actionRejectWithReply) }}
-										</button>
-									</ButtonStyled>
-									<ButtonStyled v-else color="red">
-										<button
-											:disabled="project.status === 'rejected' || isLoading"
-											@click="runBlockingAction('reject', () => setStatus('rejected'))"
-										>
-											<SpinnerIcon
-												v-if="loadingAction === 'reject'"
-												class="animate-spin"
-												aria-hidden="true"
-											/>
-											<XIcon v-else aria-hidden="true" />
-											{{ formatMessage(messages.actionReject) }}
-										</button>
-									</ButtonStyled>
-									<ButtonStyled color="red">
-										<OverflowMenu
-											class="btn-dropdown-animation"
-											:disabled="isLoading"
-											:options="
-												replyBody
-													? [
-															{
-																id: 'withhold-reply',
-																color: 'danger',
-																action: () =>
-																	runBlockingAction('withhold-reply', () => sendReply('withheld')),
-																hoverFilled: true,
-																disabled: project.status === 'withheld' || isLoading,
-															},
-															{
-																id: 'set-to-draft-reply',
-																action: () =>
-																	runBlockingAction('set-to-draft-reply', () => sendReply('draft')),
-																hoverFilled: true,
-																disabled: project.status === 'draft' || isLoading,
-															},
-															{
-																id: 'send-to-review-reply',
-																action: () =>
-																	runBlockingAction('send-to-review-reply', () =>
-																		sendReply('processing', true),
-																	),
-																hoverFilled: true,
-																disabled: project.status === 'processing' || isLoading,
-															},
-														]
-													: [
-															{
-																id: 'withhold',
-																color: 'danger',
-																action: () =>
-																	runBlockingAction('withhold', () => setStatus('withheld')),
-																hoverFilled: true,
-																disabled: project.status === 'withheld' || isLoading,
-															},
-															{
-																id: 'set-to-draft',
-																action: () =>
-																	runBlockingAction('set-to-draft', () => setStatus('draft')),
-																hoverFilled: true,
-																disabled: project.status === 'draft' || isLoading,
-															},
-															{
-																id: 'send-to-review',
-																action: () =>
-																	runBlockingAction('send-to-review', () =>
-																		setStatus('processing'),
-																	),
-																hoverFilled: true,
-																disabled: project.status === 'processing' || isLoading,
-															},
-														]
-											"
-										>
-											<SpinnerIcon
-												v-if="isDropdownLoading"
-												class="animate-spin"
-												aria-hidden="true"
-											/>
-											<DropdownIcon v-else aria-hidden="true" />
-											<template #withhold-reply>
-												<EyeOffIcon aria-hidden="true" />
-												{{ formatMessage(messages.actionWithholdWithReply) }}
-											</template>
-											<template #withhold>
-												<EyeOffIcon aria-hidden="true" />
-												{{ formatMessage(messages.actionWithhold) }}
-											</template>
-											<template #set-to-draft-reply>
-												<FileTextIcon aria-hidden="true" />
-												{{ formatMessage(messages.actionSetToDraftWithReply) }}
-											</template>
-											<template #set-to-draft>
-												<FileTextIcon aria-hidden="true" />
-												{{ formatMessage(messages.actionSetToDraft) }}
-											</template>
-											<template #send-to-review-reply>
-												<ScaleIcon aria-hidden="true" />
-												{{ formatMessage(messages.actionSendToReviewWithReply) }}
-											</template>
-											<template #send-to-review>
-												<ScaleIcon aria-hidden="true" />
-												{{ formatMessage(messages.actionSendToReview) }}
-											</template>
-										</OverflowMenu>
-									</ButtonStyled>
-								</div>
+								<Button
+									v-if="replyBody"
+									type="colored"
+									color="green"
+									:disabled="isApproved(project) || isLoading"
+									@click="runBlockingAction('approve-with-reply', () => sendReply(requestedStatus))"
+								>
+									<SpinnerIcon
+										v-if="loadingAction === 'approve-with-reply'"
+										class="animate-spin"
+										aria-hidden="true"
+									/>
+									<CheckIcon v-else aria-hidden="true" />
+									{{ formatMessage(messages.actionApproveWithReply) }}
+								</Button>
+								<Button
+									v-else
+									type="colored"
+									color="green"
+									:disabled="isApproved(project) || isLoading"
+									@click="runBlockingAction('approve', () => setStatus(requestedStatus))"
+								>
+									<SpinnerIcon
+										v-if="loadingAction === 'approve'"
+										class="animate-spin"
+										aria-hidden="true"
+									/>
+									<CheckIcon v-else aria-hidden="true" />
+									{{ formatMessage(messages.actionApprove) }}
+								</Button>
+								<SplitButton
+									class="!m-0 !inline-flex !flex-nowrap !justify-start !gap-0"
+									type="colored"
+									color="red"
+									:menu-label="formatMessage(commonMessages.moreOptionsButton)"
+									:disabled="isLoading"
+									:primary-disabled="project.status === 'rejected'"
+									:options="
+										replyBody
+											? [
+													{
+														id: 'withhold-reply',
+														label: formatMessage(messages.actionWithholdWithReply),
+														tone: 'orange',
+														hoverFilled: true,
+														action: () =>
+															runBlockingAction('withhold-reply', () => sendReply('withheld')),
+														disabled: project.status === 'withheld' || isLoading,
+													},
+													{
+														id: 'set-to-draft-reply',
+														label: formatMessage(messages.actionSetToDraftWithReply),
+														tone: 'orange',
+														hoverFilled: true,
+														action: () =>
+															runBlockingAction('set-to-draft-reply', () => sendReply('draft')),
+														disabled: project.status === 'draft' || isLoading,
+													},
+													{
+														id: 'send-to-review-reply',
+														label: formatMessage(messages.actionSendToReviewWithReply),
+														tone: 'orange',
+														hoverFilled: true,
+														action: () =>
+															runBlockingAction('send-to-review-reply', () =>
+																sendReply('processing', true),
+															),
+														disabled: project.status === 'processing' || isLoading,
+													},
+												]
+											: [
+													{
+														id: 'withhold',
+														label: formatMessage(messages.actionWithhold),
+														tone: 'orange',
+														hoverFilled: true,
+														action: () =>
+															runBlockingAction('withhold', () => setStatus('withheld')),
+														disabled: project.status === 'withheld' || isLoading,
+													},
+													{
+														id: 'set-to-draft',
+														label: formatMessage(messages.actionSetToDraft),
+														tone: 'orange',
+														hoverFilled: true,
+														action: () =>
+															runBlockingAction('set-to-draft', () => setStatus('draft')),
+														disabled: project.status === 'draft' || isLoading,
+													},
+													{
+														id: 'send-to-review',
+														label: formatMessage(messages.actionSendToReview),
+														tone: 'orange',
+														hoverFilled: true,
+														action: () =>
+															runBlockingAction('send-to-review', () => setStatus('processing')),
+														disabled: project.status === 'processing' || isLoading,
+													},
+												]
+									"
+									@click="
+										replyBody
+											? runBlockingAction('reject-with-reply', () => sendReply('rejected'))
+											: runBlockingAction('reject', () => setStatus('rejected'))
+									"
+								>
+									<SpinnerIcon
+										v-if="loadingAction === 'reject-with-reply' || loadingAction === 'reject'"
+										class="animate-spin"
+										aria-hidden="true"
+									/>
+									<XIcon v-else aria-hidden="true" />
+									{{
+										formatMessage(
+											replyBody ? messages.actionRejectWithReply : messages.actionReject,
+										)
+									}}
+									<template #withhold-reply>
+										<EyeOffIcon aria-hidden="true" />
+										{{ formatMessage(messages.actionWithholdWithReply) }}
+									</template>
+									<template #withhold>
+										<EyeOffIcon aria-hidden="true" />
+										{{ formatMessage(messages.actionWithhold) }}
+									</template>
+									<template #set-to-draft-reply>
+										<FileTextIcon aria-hidden="true" />
+										{{ formatMessage(messages.actionSetToDraftWithReply) }}
+									</template>
+									<template #set-to-draft>
+										<FileTextIcon aria-hidden="true" />
+										{{ formatMessage(messages.actionSetToDraft) }}
+									</template>
+									<template #send-to-review-reply>
+										<ScaleIcon aria-hidden="true" />
+										{{ formatMessage(messages.actionSendToReviewWithReply) }}
+									</template>
+									<template #send-to-review>
+										<ScaleIcon aria-hidden="true" />
+										{{ formatMessage(messages.actionSendToReview) }}
+									</template>
+								</SplitButton>
 							</template>
 						</template>
 					</div>
@@ -412,7 +399,6 @@
 import {
 	CheckCircleIcon,
 	CheckIcon,
-	DropdownIcon,
 	EyeOffIcon,
 	FileTextIcon,
 	ReplyIcon,
@@ -422,7 +408,7 @@ import {
 	XIcon,
 } from '@modrinth/assets'
 import {
-	ButtonStyled,
+	Button,
 	Checkbox,
 	commonMessages,
 	CopyCode,
@@ -431,7 +417,7 @@ import {
 	IntlFormatted,
 	MarkdownEditor,
 	NewModal,
-	OverflowMenu,
+	SplitButton,
 	useVIntl,
 } from '@modrinth/ui'
 
@@ -659,15 +645,6 @@ const modalReply = ref(null)
 
 const loadingAction = ref(null)
 const isLoading = computed(() => loadingAction.value !== null)
-const dropdownActionIds = [
-	'withhold',
-	'withhold-reply',
-	'set-to-draft',
-	'set-to-draft-reply',
-	'send-to-review',
-	'send-to-review-reply',
-]
-const isDropdownLoading = computed(() => dropdownActionIds.includes(loadingAction.value))
 
 async function runBlockingAction(actionId, action) {
 	if (loadingAction.value !== null) {
diff --git a/apps/frontend/src/components/ui/thread/ThreadMessage.vue b/apps/frontend/src/components/ui/thread/ThreadMessage.vue
index ab01ec22d3..08dd9399b9 100644
--- a/apps/frontend/src/components/ui/thread/ThreadMessage.vue
+++ b/apps/frontend/src/components/ui/thread/ThreadMessage.vue
@@ -130,22 +130,23 @@
 			</span>
 		</span>
 		<div v-if="isStaff(auth.user) && message.author_id === auth.user.id" class="message__actions">
-			<ButtonStyled circular type="transparent">
-				<OverflowMenu
-					class="btn-dropdown-animation"
-					:options="[
-						{
-							id: 'delete',
-							action: () => deleteMessage(),
-							color: 'red',
-							hoverFilled: true,
-						},
-					]"
-				>
-					<MoreHorizontalIcon />
-					<template #delete> <TrashIcon /> Delete </template>
-				</OverflowMenu>
-			</ButtonStyled>
+			<TeleportOverflowMenu
+				type="quiet"
+				label="More options"
+				class="btn-dropdown-animation"
+				:options="[
+					{
+						id: 'delete',
+						label: 'Delete',
+						action: () => deleteMessage(),
+						tone: 'red',
+						hoverFilled: true,
+					},
+				]"
+			>
+				<MoreHorizontalIcon />
+				<template #delete> <TrashIcon /> Delete </template>
+			</TeleportOverflowMenu>
 		</div>
 	</div>
 </template>
@@ -165,8 +166,7 @@ import {
 	AutoLink,
 	Avatar,
 	Badge,
-	ButtonStyled,
-	OverflowMenu,
+	TeleportOverflowMenu,
 	useFormatDateTime,
 	useRelativeTime,
 } from '@modrinth/ui'
diff --git a/apps/frontend/src/components/ui/thread/ThreadView.vue b/apps/frontend/src/components/ui/thread/ThreadView.vue
index 11ee3dc6cf..857f253886 100644
--- a/apps/frontend/src/components/ui/thread/ThreadView.vue
+++ b/apps/frontend/src/components/ui/thread/ThreadView.vue
@@ -41,29 +41,45 @@
 				class="mt-4 flex flex-col items-stretch justify-between gap-3 px-4 pb-4 sm:flex-row sm:items-center sm:gap-2"
 			>
 				<div class="flex flex-col items-stretch gap-2 sm:flex-row sm:items-center">
-					<ButtonStyled v-if="sortedMessages.length > 0" color="brand">
-						<button :disabled="!replyBody" class="w-full gap-2 sm:w-auto" @click="sendReply()">
-							<ReplyIcon class="size-4" />
-							Reply
-						</button>
-					</ButtonStyled>
-					<ButtonStyled v-else color="brand">
-						<button :disabled="!replyBody" class="w-full gap-2 sm:w-auto" @click="sendReply()">
-							<SendIcon class="size-4" />
-							Send
-						</button>
-					</ButtonStyled>
-					<ButtonStyled v-if="isStaff(auth.user)">
-						<button :disabled="!replyBody" class="w-full sm:w-auto" @click="sendReply(true)">
-							Add note
-						</button>
-					</ButtonStyled>
-					<ButtonStyled v-if="visibleQuickReplies.length > 0">
-						<OverflowMenu :options="visibleQuickReplies">
-							Quick reply
-							<ChevronDownIcon />
-						</OverflowMenu>
-					</ButtonStyled>
+					<Button
+						v-if="sortedMessages.length > 0"
+						type="colored"
+						color="brand"
+						:disabled="!replyBody"
+						class="w-full gap-2 sm:w-auto"
+						@click="sendReply()"
+					>
+						<ReplyIcon class="size-4" />
+						Reply
+					</Button>
+					<Button
+						v-else
+						type="colored"
+						color="brand"
+						:disabled="!replyBody"
+						class="w-full gap-2 sm:w-auto"
+						@click="sendReply()"
+					>
+						<SendIcon class="size-4" />
+						Send
+					</Button>
+					<Button
+						v-if="isStaff(auth.user)"
+						:disabled="!replyBody"
+						class="w-full sm:w-auto"
+						@click="sendReply(true)"
+					>
+						Add note
+					</Button>
+					<TeleportOverflowMenu
+						v-if="visibleQuickReplies.length > 0"
+						label="More options"
+						:options="visibleQuickReplies"
+						class="!w-auto !rounded-xl !px-2.5"
+					>
+						Quick reply
+						<ChevronDownIcon />
+					</TeleportOverflowMenu>
 				</div>
 
 				<div class="flex flex-col items-stretch gap-2 sm:flex-row sm:items-center">
@@ -77,12 +93,11 @@
 <script setup lang="ts" generic="T">
 import { ChevronDownIcon, MessageIcon, ReplyIcon, SendIcon } from '@modrinth/assets'
 import type { QuickReply } from '@modrinth/moderation'
+import { Button, TeleportOverflowMenu } from '@modrinth/ui'
 import {
-	ButtonStyled,
 	CopyCode,
 	injectNotificationManager,
 	MarkdownEditor,
-	OverflowMenu,
 	type OverflowMenuOption,
 } from '@modrinth/ui'
 import type { Thread, User } from '@modrinth/utils'
@@ -110,6 +125,7 @@ const visibleQuickReplies = computed<OverflowMenuOption[]>(() => {
 			(reply) =>
 				({
 					id: reply.label,
+					label: reply.label,
 					action: () => handleQuickReply(reply, context),
 				}) as OverflowMenuOption,
 		)
diff --git a/apps/frontend/src/error.vue b/apps/frontend/src/error.vue
index e164cd589e..68a4699df5 100644
--- a/apps/frontend/src/error.vue
+++ b/apps/frontend/src/error.vue
@@ -37,20 +37,16 @@
 							<Avatar :src="auth.user.avatar_url" size="32px" />
 							<span class="font-medium text-contrast">{{ auth.user.username }}</span>
 
-							<ButtonStyled color="red" type="transparent">
-								<button type="button" class="ml-auto" @click="logout">
-									{{ formatMessage(commonMessages.signOutButton) }}
-								</button>
-							</ButtonStyled>
+							<Button type="quiet" color="red" native-type="button" class="ml-auto" @click="logout">
+								{{ formatMessage(commonMessages.signOutButton) }}
+							</Button>
 						</div>
 					</template>
 					<template v-else>
-						<ButtonStyled color="brand">
-							<nuxt-link class="button-like w-fit" :to="signInRoute">
-								<LogInIcon />
-								{{ formatMessage(commonMessages.signInButton) }}
-							</nuxt-link>
-						</ButtonStyled>
+						<ButtonLink type="colored" color="brand" class="button-like w-fit" :to="signInRoute">
+							<LogInIcon />
+							{{ formatMessage(commonMessages.signInButton) }}
+						</ButtonLink>
 					</template>
 				</div>
 				<div class="error-box__body">
@@ -92,7 +88,8 @@
 import { AnnoyedRinthbot, LogInIcon, SadRinthbot } from '@modrinth/assets'
 import {
 	Avatar,
-	ButtonStyled,
+	Button,
+	ButtonLink,
 	commonMessages,
 	defineMessage,
 	defineMessages,
diff --git a/apps/frontend/src/layouts/default.vue b/apps/frontend/src/layouts/default.vue
index a4eeecc6bf..4f2849bd65 100644
--- a/apps/frontend/src/layouts/default.vue
+++ b/apps/frontend/src/layouts/default.vue
@@ -91,399 +91,468 @@
 				:class="{ 'gap-4': !flags.projectTypesPrimaryNav }"
 			>
 				<template v-if="flags.projectTypesPrimaryNav">
-					<ButtonStyled
-						type="transparent"
-						:highlighted="route.name === 'discover-mods' || route.path.startsWith('/mod/')"
-						:highlighted-style="
-							route.name === 'discover-mods' ? 'main-nav-primary' : 'main-nav-secondary'
+					<ButtonLink
+						type="quiet"
+						to="/discover/mods"
+						:class="
+							route.name === 'discover-mods' || route.path.startsWith('/mod/')
+								? (route.name === 'discover-mods' ? 'main-nav-primary' : 'main-nav-secondary') ===
+									'main-nav-primary'
+									? '!bg-[var(--color-button-bg-selected)] !text-[var(--color-button-text-selected)] [&>svg]:!text-[var(--color-button-text-selected)]'
+									: '!bg-[var(--color-button-bg)] !text-contrast'
+								: ''
 						"
 					>
-						<nuxt-link to="/discover/mods">
-							<BoxIcon aria-hidden="true" />
-							{{ formatMessage(commonProjectTypeCategoryMessages.mod) }}
-						</nuxt-link>
-					</ButtonStyled>
-					<ButtonStyled
-						type="transparent"
-						:highlighted="
+						<BoxIcon aria-hidden="true" />
+						{{ formatMessage(commonProjectTypeCategoryMessages.mod) }}
+					</ButtonLink>
+					<ButtonLink
+						type="quiet"
+						to="/discover/resourcepacks"
+						:class="
 							route.name === 'discover-resourcepacks' || route.path.startsWith('/resourcepack/')
-						"
-						:highlighted-style="
-							route.name === 'discover-resourcepacks' ? 'main-nav-primary' : 'main-nav-secondary'
+								? (route.name === 'discover-resourcepacks'
+										? 'main-nav-primary'
+										: 'main-nav-secondary') === 'main-nav-primary'
+									? '!bg-[var(--color-button-bg-selected)] !text-[var(--color-button-text-selected)] [&>svg]:!text-[var(--color-button-text-selected)]'
+									: '!bg-[var(--color-button-bg)] !text-contrast'
+								: ''
 						"
 					>
-						<nuxt-link to="/discover/resourcepacks">
-							<PaintbrushIcon aria-hidden="true" />
-							{{ formatMessage(commonProjectTypeCategoryMessages.resourcepack) }}
-						</nuxt-link>
-					</ButtonStyled>
-					<ButtonStyled
-						type="transparent"
-						:highlighted="
+						<PaintbrushIcon aria-hidden="true" />
+						{{ formatMessage(commonProjectTypeCategoryMessages.resourcepack) }}
+					</ButtonLink>
+					<ButtonLink
+						type="quiet"
+						to="/discover/datapacks"
+						:class="
 							route.name === 'discover-datapacks' || route.path.startsWith('/datapack/')
-						"
-						:highlighted-style="
-							route.name === 'discover-datapacks' ? 'main-nav-primary' : 'main-nav-secondary'
+								? (route.name === 'discover-datapacks'
+										? 'main-nav-primary'
+										: 'main-nav-secondary') === 'main-nav-primary'
+									? '!bg-[var(--color-button-bg-selected)] !text-[var(--color-button-text-selected)] [&>svg]:!text-[var(--color-button-text-selected)]'
+									: '!bg-[var(--color-button-bg)] !text-contrast'
+								: ''
 						"
 					>
-						<nuxt-link to="/discover/datapacks">
-							<BracesIcon aria-hidden="true" />
-							{{ formatMessage(commonProjectTypeCategoryMessages.datapack) }}
-						</nuxt-link>
-					</ButtonStyled>
-					<ButtonStyled
-						type="transparent"
-						:highlighted="route.name === 'discover-modpacks' || route.path.startsWith('/modpack/')"
-						:highlighted-style="
-							route.name === 'discover-modpacks' ? 'main-nav-primary' : 'main-nav-secondary'
+						<BracesIcon aria-hidden="true" />
+						{{ formatMessage(commonProjectTypeCategoryMessages.datapack) }}
+					</ButtonLink>
+					<ButtonLink
+						type="quiet"
+						to="/discover/modpacks"
+						:class="
+							route.name === 'discover-modpacks' || route.path.startsWith('/modpack/')
+								? (route.name === 'discover-modpacks'
+										? 'main-nav-primary'
+										: 'main-nav-secondary') === 'main-nav-primary'
+									? '!bg-[var(--color-button-bg-selected)] !text-[var(--color-button-text-selected)] [&>svg]:!text-[var(--color-button-text-selected)]'
+									: '!bg-[var(--color-button-bg)] !text-contrast'
+								: ''
 						"
 					>
-						<nuxt-link to="/discover/modpacks">
-							<PackageOpenIcon aria-hidden="true" />
-							{{ formatMessage(commonProjectTypeCategoryMessages.modpack) }}
-						</nuxt-link>
-					</ButtonStyled>
-					<ButtonStyled
-						type="transparent"
-						:highlighted="route.name === 'discover-shaders' || route.path.startsWith('/shader/')"
-						:highlighted-style="
-							route.name === 'discover-shaders' ? 'main-nav-primary' : 'main-nav-secondary'
+						<PackageOpenIcon aria-hidden="true" />
+						{{ formatMessage(commonProjectTypeCategoryMessages.modpack) }}
+					</ButtonLink>
+					<ButtonLink
+						type="quiet"
+						to="/discover/shaders"
+						:class="
+							route.name === 'discover-shaders' || route.path.startsWith('/shader/')
+								? (route.name === 'discover-shaders'
+										? 'main-nav-primary'
+										: 'main-nav-secondary') === 'main-nav-primary'
+									? '!bg-[var(--color-button-bg-selected)] !text-[var(--color-button-text-selected)] [&>svg]:!text-[var(--color-button-text-selected)]'
+									: '!bg-[var(--color-button-bg)] !text-contrast'
+								: ''
 						"
 					>
-						<nuxt-link to="/discover/shaders">
-							<GlassesIcon aria-hidden="true" />
-							{{ formatMessage(commonProjectTypeCategoryMessages.shader) }}
-						</nuxt-link>
-					</ButtonStyled>
-					<ButtonStyled
-						type="transparent"
-						:highlighted="route.name === 'discover-plugins' || route.path.startsWith('/plugin/')"
-						:highlighted-style="
-							route.name === 'discover-plugins' ? 'main-nav-primary' : 'main-nav-secondary'
+						<GlassesIcon aria-hidden="true" />
+						{{ formatMessage(commonProjectTypeCategoryMessages.shader) }}
+					</ButtonLink>
+					<ButtonLink
+						type="quiet"
+						to="/discover/plugins"
+						:class="
+							route.name === 'discover-plugins' || route.path.startsWith('/plugin/')
+								? (route.name === 'discover-plugins'
+										? 'main-nav-primary'
+										: 'main-nav-secondary') === 'main-nav-primary'
+									? '!bg-[var(--color-button-bg-selected)] !text-[var(--color-button-text-selected)] [&>svg]:!text-[var(--color-button-text-selected)]'
+									: '!bg-[var(--color-button-bg)] !text-contrast'
+								: ''
 						"
 					>
-						<nuxt-link to="/discover/plugins">
-							<PlugIcon aria-hidden="true" />
-							{{ formatMessage(commonProjectTypeCategoryMessages.plugin) }}
-						</nuxt-link>
-					</ButtonStyled>
-					<ButtonStyled
-						type="transparent"
-						:highlighted="route.name === 'discover-servers' || route.path.startsWith('/server/')"
-						:highlighted-style="
-							route.name === 'discover-servers' ? 'main-nav-primary' : 'main-nav-secondary'
+						<PlugIcon aria-hidden="true" />
+						{{ formatMessage(commonProjectTypeCategoryMessages.plugin) }}
+					</ButtonLink>
+					<ButtonLink
+						type="quiet"
+						to="/discover/servers"
+						:class="
+							route.name === 'discover-servers' || route.path.startsWith('/server/')
+								? (route.name === 'discover-servers'
+										? 'main-nav-primary'
+										: 'main-nav-secondary') === 'main-nav-primary'
+									? '!bg-[var(--color-button-bg-selected)] !text-[var(--color-button-text-selected)] [&>svg]:!text-[var(--color-button-text-selected)]'
+									: '!bg-[var(--color-button-bg)] !text-contrast'
+								: ''
 						"
 					>
-						<nuxt-link to="/discover/servers">
-							<ServerIcon aria-hidden="true" />
-							{{ formatMessage(commonProjectTypeCategoryMessages.server) }}
-						</nuxt-link>
-					</ButtonStyled>
+						<ServerIcon aria-hidden="true" />
+						{{ formatMessage(commonProjectTypeCategoryMessages.server) }}
+					</ButtonLink>
 				</template>
 				<template v-else>
-					<ButtonStyled
-						type="transparent"
-						:highlighted="isDiscovering || isDiscoveringSubpage"
-						:highlighted-style="isDiscoveringSubpage ? 'main-nav-secondary' : 'main-nav-primary'"
+					<TeleportOverflowMenu
+						type="quiet"
+						:label="formatMessage(commonMessages.moreOptionsButton)"
+						hoverable
+						:options="[
+							{
+								id: 'mods',
+								label: formatMessage(commonProjectTypeCategoryMessages.mod),
+								type: 'link',
+								to: '/discover/mods',
+							},
+							{
+								id: 'resourcepacks',
+								label: formatMessage(commonProjectTypeCategoryMessages.resourcepack),
+								type: 'link',
+								to: '/discover/resourcepacks',
+							},
+							{
+								id: 'datapacks',
+								label: formatMessage(commonProjectTypeCategoryMessages.datapack),
+								type: 'link',
+								to: '/discover/datapacks',
+							},
+							{
+								id: 'shaders',
+								label: formatMessage(commonProjectTypeCategoryMessages.shader),
+								type: 'link',
+								to: '/discover/shaders',
+							},
+							{
+								id: 'modpacks',
+								label: formatMessage(commonProjectTypeCategoryMessages.modpack),
+								type: 'link',
+								to: '/discover/modpacks',
+							},
+							{
+								id: 'plugins',
+								label: formatMessage(commonProjectTypeCategoryMessages.plugin),
+								type: 'link',
+								to: '/discover/plugins',
+							},
+							{
+								id: 'servers',
+								label: formatMessage(commonProjectTypeCategoryMessages.server),
+								type: 'link',
+								to: '/discover/servers',
+							},
+						]"
+						:class="[
+							'!w-auto !rounded-xl !px-2.5',
+							isDiscovering
+								? '!bg-[var(--color-button-bg-selected)] !text-[var(--color-button-text-selected)] [&>svg]:!text-[var(--color-button-text-selected)]'
+								: isDiscoveringSubpage
+									? '!bg-[var(--color-button-bg)] !text-contrast'
+									: '',
+						]"
 					>
-						<TeleportOverflowMenu
-							:options="[
-								{
-									id: 'mods',
-									action: '/discover/mods',
-								},
-								{
-									id: 'resourcepacks',
-									action: '/discover/resourcepacks',
-								},
-								{
-									id: 'datapacks',
-									action: '/discover/datapacks',
-								},
-								{
-									id: 'shaders',
-									action: '/discover/shaders',
-								},
-								{
-									id: 'modpacks',
-									action: '/discover/modpacks',
-								},
-								{
-									id: 'plugins',
-									action: '/discover/plugins',
-								},
-								{
-									id: 'servers',
-									action: '/discover/servers',
-								},
-							]"
-							hoverable
-						>
-							<BoxIcon
-								v-if="route.name === 'discover-mods' || route.path.startsWith('/mod/')"
-								aria-hidden="true"
-							/>
-							<PaintbrushIcon
-								v-else-if="
-									route.name === 'discover-resourcepacks' || route.path.startsWith('/resourcepack/')
-								"
-								aria-hidden="true"
-							/>
-							<BracesIcon
-								v-else-if="
-									route.name === 'discover-datapacks' || route.path.startsWith('/datapack/')
-								"
-								aria-hidden="true"
-							/>
-							<PackageOpenIcon
-								v-else-if="route.name === 'discover-modpacks' || route.path.startsWith('/modpack/')"
-								aria-hidden="true"
-							/>
-							<GlassesIcon
-								v-else-if="route.name === 'discover-shaders' || route.path.startsWith('/shader/')"
-								aria-hidden="true"
-							/>
-							<PlugIcon
-								v-else-if="route.name === 'discover-plugins' || route.path.startsWith('/plugin/')"
-								aria-hidden="true"
-							/>
-							<ServerIcon
-								v-else-if="route.name === 'discover-servers' || route.path.startsWith('/server/')"
-								aria-hidden="true"
-							/>
-							<CompassIcon v-else aria-hidden="true" />
-							<span class="hidden md:contents">{{
-								formatMessage(commonMessages.discoverContentLabel)
-							}}</span>
-							<span class="contents md:hidden">{{ formatMessage(navMenuMessages.discover) }}</span>
-							<DropdownIcon aria-hidden="true" class="h-5 w-5" />
+						<BoxIcon
+							v-if="route.name === 'discover-mods' || route.path.startsWith('/mod/')"
+							aria-hidden="true"
+						/>
+						<PaintbrushIcon
+							v-else-if="
+								route.name === 'discover-resourcepacks' || route.path.startsWith('/resourcepack/')
+							"
+							aria-hidden="true"
+						/>
+						<BracesIcon
+							v-else-if="route.name === 'discover-datapacks' || route.path.startsWith('/datapack/')"
+							aria-hidden="true"
+						/>
+						<PackageOpenIcon
+							v-else-if="route.name === 'discover-modpacks' || route.path.startsWith('/modpack/')"
+							aria-hidden="true"
+						/>
+						<GlassesIcon
+							v-else-if="route.name === 'discover-shaders' || route.path.startsWith('/shader/')"
+							aria-hidden="true"
+						/>
+						<PlugIcon
+							v-else-if="route.name === 'discover-plugins' || route.path.startsWith('/plugin/')"
+							aria-hidden="true"
+						/>
+						<ServerIcon
+							v-else-if="route.name === 'discover-servers' || route.path.startsWith('/server/')"
+							aria-hidden="true"
+						/>
+						<CompassIcon v-else aria-hidden="true" />
+						<span class="hidden md:contents">{{
+							formatMessage(commonMessages.discoverContentLabel)
+						}}</span>
+						<span class="contents md:hidden">{{ formatMessage(navMenuMessages.discover) }}</span>
+						<DropdownIcon aria-hidden="true" class="h-5 w-5" />
 
-							<template #mods>
-								<BoxIcon aria-hidden="true" />
-								{{ formatMessage(commonProjectTypeCategoryMessages.mod) }}
-							</template>
-							<template #resourcepacks>
-								<PaintbrushIcon aria-hidden="true" />
-								{{ formatMessage(commonProjectTypeCategoryMessages.resourcepack) }}
-							</template>
-							<template #datapacks>
-								<BracesIcon aria-hidden="true" />
-								{{ formatMessage(commonProjectTypeCategoryMessages.datapack) }}
-							</template>
-							<template #plugins>
-								<PlugIcon aria-hidden="true" />
-								{{ formatMessage(commonProjectTypeCategoryMessages.plugin) }}
-							</template>
-							<template #shaders>
-								<GlassesIcon aria-hidden="true" />
-								{{ formatMessage(commonProjectTypeCategoryMessages.shader) }}
-							</template>
-							<template #modpacks>
-								<PackageOpenIcon aria-hidden="true" />
-								{{ formatMessage(commonProjectTypeCategoryMessages.modpack) }}
-							</template>
-							<template #servers>
-								<ServerIcon aria-hidden="true" />
-								{{ formatMessage(commonProjectTypeCategoryMessages.server) }}
-							</template>
-						</TeleportOverflowMenu>
-					</ButtonStyled>
-					<ButtonStyled
-						type="transparent"
-						:highlighted="
+						<template #mods>
+							<BoxIcon aria-hidden="true" />
+							{{ formatMessage(commonProjectTypeCategoryMessages.mod) }}
+						</template>
+						<template #resourcepacks>
+							<PaintbrushIcon aria-hidden="true" />
+							{{ formatMessage(commonProjectTypeCategoryMessages.resourcepack) }}
+						</template>
+						<template #datapacks>
+							<BracesIcon aria-hidden="true" />
+							{{ formatMessage(commonProjectTypeCategoryMessages.datapack) }}
+						</template>
+						<template #plugins>
+							<PlugIcon aria-hidden="true" />
+							{{ formatMessage(commonProjectTypeCategoryMessages.plugin) }}
+						</template>
+						<template #shaders>
+							<GlassesIcon aria-hidden="true" />
+							{{ formatMessage(commonProjectTypeCategoryMessages.shader) }}
+						</template>
+						<template #modpacks>
+							<PackageOpenIcon aria-hidden="true" />
+							{{ formatMessage(commonProjectTypeCategoryMessages.modpack) }}
+						</template>
+						<template #servers>
+							<ServerIcon aria-hidden="true" />
+							{{ formatMessage(commonProjectTypeCategoryMessages.server) }}
+						</template>
+					</TeleportOverflowMenu>
+					<ButtonLink
+						type="quiet"
+						to="/hosting"
+						:class="
 							route.name?.startsWith('hosting') ||
 							(route.name?.startsWith('discover-') && !!route.query.sid)
-						"
-						:highlighted-style="
-							route.name === 'hosting' ? 'main-nav-primary' : 'main-nav-secondary'
+								? (route.name === 'hosting' ? 'main-nav-primary' : 'main-nav-secondary') ===
+									'main-nav-primary'
+									? '!bg-[var(--color-button-bg-selected)] !text-[var(--color-button-text-selected)] [&>svg]:!text-[var(--color-button-text-selected)]'
+									: '!bg-[var(--color-button-bg)] !text-contrast'
+								: ''
 						"
 					>
-						<nuxt-link to="/hosting">
-							<ServerStackIcon aria-hidden="true" />
-							{{ formatMessage(navMenuMessages.hostAServer) }}
-						</nuxt-link>
-					</ButtonStyled>
-					<ButtonStyled type="transparent" :highlighted="route.name === 'app'">
-						<nuxt-link to="/app">
-							<DownloadIcon aria-hidden="true" />
-							<span class="hidden md:contents">{{
-								formatMessage(navMenuMessages.getModrinthApp)
-							}}</span>
-							<span class="contents md:hidden">{{
-								formatMessage(navMenuMessages.modrinthApp)
-							}}</span>
-						</nuxt-link>
-					</ButtonStyled>
+						<ServerStackIcon aria-hidden="true" />
+						{{ formatMessage(navMenuMessages.hostAServer) }}
+					</ButtonLink>
+					<ButtonLink
+						type="quiet"
+						to="/app"
+						:class="
+							route.name === 'app'
+								? true
+									? '!bg-[var(--color-button-bg-selected)] !text-[var(--color-button-text-selected)] [&>svg]:!text-[var(--color-button-text-selected)]'
+									: '!bg-[var(--color-button-bg)] !text-contrast'
+								: ''
+						"
+					>
+						<DownloadIcon aria-hidden="true" />
+						<span class="hidden md:contents">{{
+							formatMessage(navMenuMessages.getModrinthApp)
+						}}</span>
+						<span class="contents md:hidden">{{ formatMessage(navMenuMessages.modrinthApp) }}</span>
+					</ButtonLink>
 				</template>
 			</div>
 			<div class="flex items-center gap-1">
-				<ButtonStyled type="transparent">
-					<OverflowMenu
-						v-if="auth.user && isStaff(auth.user)"
-						class="btn-dropdown-animation flex items-center gap-1 rounded-xl bg-transparent px-2 py-1"
-						position="bottom"
-						direction="left"
-						:dropdown-id="`${basePopoutId}-staff`"
-						:aria-label="formatMessage(messages.createNew)"
-						:options="[
-							{
-								id: 'review-projects',
-								color: 'orange',
-								link: '/moderation',
-							},
-							{
-								id: 'tech-review',
-								color: 'orange',
-								link: '/moderation/technical-review',
-							},
-							{
-								id: 'review-reports',
-								color: 'orange',
-								link: '/moderation/reports',
-							},
-							{
-								id: 'external-projects',
-								color: 'orange',
-								link: '/moderation/external-projects',
-							},
-							{
-								divider: true,
-							},
-							{
-								id: 'file-lookup',
-								link: '/admin/file_lookup',
-							},
-							{
-								divider: true,
-								shown: isAdmin(auth.user),
-							},
-							{
-								id: 'user-lookup',
-								color: 'primary',
-								link: '/admin/user_email',
-								shown: isAdmin(auth.user),
-							},
-							{
-								id: 'affiliates',
-								color: 'primary',
-								link: '/admin/affiliates',
-								shown: isAdmin(auth.user),
-							},
-							{
-								id: 'servers-notices',
-								color: 'primary',
-								link: '/admin/servers/notices',
-								shown: isAdmin(auth.user),
-							},
-							{
-								id: 'servers-transfers',
-								color: 'primary',
-								link: '/admin/servers/transfers',
-								shown: isAdmin(auth.user),
-							},
-							{
-								id: 'servers-nodes',
-								color: 'primary',
-								action: (event) => $refs.modal_batch_credit.show(event),
-								shown: isAdmin(auth.user),
-							},
-							{
-								id: 'analytics-events',
-								color: 'primary',
-								link: '/admin/analytics/events',
-								shown: isAdmin(auth.user),
-							},
-						]"
-					>
-						<ModrinthIcon aria-hidden="true" />
-						<DropdownIcon aria-hidden="true" class="h-5 w-5 text-secondary" />
-						<template #review-projects>
-							<ScaleIcon aria-hidden="true" /> {{ formatMessage(messages.reviewProjects) }}
-						</template>
-						<template #tech-review>
-							<ShieldAlertIcon aria-hidden="true" /> {{ formatMessage(messages.techReview) }}
-						</template>
-						<template #review-reports>
-							<ReportIcon aria-hidden="true" /> {{ formatMessage(messages.reports) }}
-						</template>
-						<template #external-projects>
-							<GlobeIcon aria-hidden="true" /> {{ formatMessage(messages.externalProjects) }}
-						</template>
-						<template #user-lookup>
-							<UserSearchIcon aria-hidden="true" /> {{ formatMessage(messages.lookupByEmail) }}
-						</template>
-						<template #file-lookup>
-							<FileIcon aria-hidden="true" /> {{ formatMessage(messages.fileLookup) }}
-						</template>
-						<template #servers-notices>
-							<IssuesIcon aria-hidden="true" /> {{ formatMessage(messages.manageServerNotices) }}
-						</template>
-						<template #servers-transfers>
-							<TransferIcon aria-hidden="true" /> Server transfers
-						</template>
-						<template #affiliates>
-							<AffiliateIcon aria-hidden="true" /> {{ formatMessage(messages.manageAffiliates) }}
-						</template>
-						<template #servers-nodes>
-							<ServerIcon aria-hidden="true" /> Credit server nodes
-						</template>
-						<template #analytics-events>
-							<ChartIcon aria-hidden="true" /> {{ formatMessage(messages.analyticsEvents) }}
-						</template>
-					</OverflowMenu>
-				</ButtonStyled>
-				<ButtonStyled type="transparent">
-					<OverflowMenu
-						v-if="auth.user"
-						class="btn-dropdown-animation flex items-center gap-1 rounded-xl bg-transparent px-2 py-1"
-						position="bottom"
-						direction="left"
-						:dropdown-id="`${basePopoutId}-create`"
-						:aria-label="formatMessage(messages.createNew)"
-						:options="[
-							{
-								id: 'new-project',
-								action: (event) => requireVerifiedEmail(() => $refs.modal_creation.show(event)),
-							},
-							{
-								id: 'new-server-project',
-								action: (event) =>
-									requireVerifiedEmail(() => $refs.modal_creation.show(event, { type: 'server' })),
-							},
-							{
-								id: 'new-collection',
-								action: (event) =>
-									requireVerifiedEmail(() => $refs.modal_collection_creation.show(event)),
-							},
-							{ divider: true },
-							{
-								id: 'new-organization',
-								action: (event) =>
-									requireVerifiedEmail(() => $refs.modal_organization_creation.show(event)),
-							},
-						]"
-					>
-						<PlusIcon aria-hidden="true" />
-						{{ formatMessage(messages.publish) }}
-						<template #new-project>
-							<BoxIcon aria-hidden="true" /> {{ formatMessage(messages.newProject) }}
-						</template>
-						<template #new-server-project>
-							<BoxIcon aria-hidden="true" /> {{ formatMessage(messages.newServerProject) }}
-						</template>
-						<!-- <template #import-project> <BoxImportIcon /> Import project </template>-->
-						<template #new-collection>
-							<CollectionIcon aria-hidden="true" /> {{ formatMessage(messages.newCollection) }}
-						</template>
-						<template #new-organization>
-							<OrganizationIcon aria-hidden="true" /> {{ formatMessage(messages.newOrganization) }}
-						</template>
-					</OverflowMenu>
-				</ButtonStyled>
-				<OverflowMenu
+				<TeleportOverflowMenu
+					v-if="auth.user && isStaff(auth.user)"
+					type="quiet"
+					:icon-only="false"
+					:label="formatMessage(messages.createNew)"
+					class="btn-dropdown-animation !gap-1 !rounded-xl !px-2"
+					:options="[
+						{
+							id: 'review-projects',
+							label: formatMessage(messages.reviewProjects),
+							type: 'link',
+							to: '/moderation',
+							tone: 'orange',
+						},
+						{
+							id: 'tech-review',
+							label: formatMessage(messages.techReview),
+							type: 'link',
+							to: '/moderation/technical-review',
+							tone: 'orange',
+						},
+						{
+							id: 'review-reports',
+							label: formatMessage(messages.reports),
+							type: 'link',
+							to: '/moderation/reports',
+							tone: 'orange',
+						},
+						{
+							id: 'external-projects',
+							label: formatMessage(messages.externalProjects),
+							type: 'link',
+							to: '/moderation/external-projects',
+							tone: 'orange',
+						},
+						{
+							type: 'divider',
+						},
+						{
+							id: 'file-lookup',
+							label: formatMessage(messages.fileLookup),
+							type: 'link',
+							to: '/admin/file_lookup',
+						},
+						{
+							type: 'divider',
+							shown: isAdmin(auth.user),
+						},
+						{
+							id: 'user-lookup',
+							label: formatMessage(messages.lookupByEmail),
+							type: 'link',
+							to: '/admin/user_email',
+							tone: 'brand',
+							shown: isAdmin(auth.user),
+						},
+						{
+							id: 'affiliates',
+							label: formatMessage(messages.manageAffiliates),
+							type: 'link',
+							to: '/admin/affiliates',
+							tone: 'brand',
+							shown: isAdmin(auth.user),
+						},
+						{
+							id: 'servers-notices',
+							label: formatMessage(messages.manageServerNotices),
+							type: 'link',
+							to: '/admin/servers/notices',
+							tone: 'brand',
+							shown: isAdmin(auth.user),
+						},
+						{
+							id: 'servers-transfers',
+							label: 'Server transfers',
+							type: 'link',
+							to: '/admin/servers/transfers',
+							tone: 'brand',
+							shown: isAdmin(auth.user),
+						},
+						{
+							id: 'servers-nodes',
+							label: 'Credit server nodes',
+							action: (event) => $refs.modal_batch_credit.show(event),
+							tone: 'brand',
+							shown: isAdmin(auth.user),
+						},
+						{
+							id: 'analytics-events',
+							label: formatMessage(messages.analyticsEvents),
+							type: 'link',
+							to: '/admin/analytics/events',
+							tone: 'brand',
+							shown: isAdmin(auth.user),
+						},
+					]"
+				>
+					<ModrinthIcon aria-hidden="true" />
+					<DropdownIcon aria-hidden="true" class="h-5 w-5 text-secondary" />
+					<template #review-projects>
+						<ScaleIcon aria-hidden="true" /> {{ formatMessage(messages.reviewProjects) }}
+					</template>
+					<template #tech-review>
+						<ShieldAlertIcon aria-hidden="true" /> {{ formatMessage(messages.techReview) }}
+					</template>
+					<template #review-reports>
+						<ReportIcon aria-hidden="true" /> {{ formatMessage(messages.reports) }}
+					</template>
+					<template #external-projects>
+						<GlobeIcon aria-hidden="true" /> {{ formatMessage(messages.externalProjects) }}
+					</template>
+					<template #user-lookup>
+						<UserSearchIcon aria-hidden="true" /> {{ formatMessage(messages.lookupByEmail) }}
+					</template>
+					<template #file-lookup>
+						<FileIcon aria-hidden="true" /> {{ formatMessage(messages.fileLookup) }}
+					</template>
+					<template #servers-notices>
+						<IssuesIcon aria-hidden="true" /> {{ formatMessage(messages.manageServerNotices) }}
+					</template>
+					<template #servers-transfers>
+						<TransferIcon aria-hidden="true" /> Server transfers
+					</template>
+					<template #affiliates>
+						<AffiliateIcon aria-hidden="true" /> {{ formatMessage(messages.manageAffiliates) }}
+					</template>
+					<template #servers-nodes>
+						<ServerIcon aria-hidden="true" /> Credit server nodes
+					</template>
+					<template #analytics-events>
+						<ChartIcon aria-hidden="true" /> {{ formatMessage(messages.analyticsEvents) }}
+					</template>
+				</TeleportOverflowMenu>
+				<TeleportOverflowMenu
 					v-if="auth.user"
-					:dropdown-id="`${basePopoutId}-user`"
-					class="btn-dropdown-animation flex items-center gap-1 rounded-xl bg-transparent px-2 py-1 pr-1"
+					type="quiet"
+					:icon-only="false"
+					:label="formatMessage(messages.createNew)"
+					class="btn-dropdown-animation !gap-1 !rounded-xl !px-2"
+					:options="[
+						{
+							id: 'new-project',
+							label: formatMessage(messages.newProject),
+							action: (event) => requireVerifiedEmail(() => $refs.modal_creation.show(event)),
+						},
+						{
+							id: 'new-server-project',
+							label: formatMessage(messages.newServerProject),
+							action: (event) =>
+								requireVerifiedEmail(() => $refs.modal_creation.show(event, { type: 'server' })),
+						},
+						{
+							id: 'new-collection',
+							label: formatMessage(messages.newCollection),
+							action: (event) =>
+								requireVerifiedEmail(() => $refs.modal_collection_creation.show(event)),
+						},
+						{ type: 'divider' },
+						{
+							id: 'new-organization',
+							label: formatMessage(messages.newOrganization),
+							action: (event) =>
+								requireVerifiedEmail(() => $refs.modal_organization_creation.show(event)),
+						},
+					]"
+				>
+					<PlusIcon aria-hidden="true" />
+					{{ formatMessage(messages.publish) }}
+					<template #new-project>
+						<BoxIcon aria-hidden="true" /> {{ formatMessage(messages.newProject) }}
+					</template>
+					<template #new-server-project>
+						<BoxIcon aria-hidden="true" /> {{ formatMessage(messages.newServerProject) }}
+					</template>
+					<!-- <template #import-project> <BoxImportIcon /> Import project </template>-->
+					<template #new-collection>
+						<CollectionIcon aria-hidden="true" /> {{ formatMessage(messages.newCollection) }}
+					</template>
+					<template #new-organization>
+						<OrganizationIcon aria-hidden="true" /> {{ formatMessage(messages.newOrganization) }}
+					</template>
+				</TeleportOverflowMenu>
+				<TeleportOverflowMenu
+					v-if="auth.user"
+					type="quiet"
+					size="lg"
+					interaction="none"
+					:icon-only="false"
+					:label="formatMessage(commonMessages.moreOptionsButton)"
+					class="btn-dropdown-animation !gap-1 !rounded-xl !px-2 !pr-1"
 					:options="userMenuOptions"
 				>
 					<Avatar :src="auth.user.avatar_url" aria-hidden="true" circle />
@@ -536,19 +605,19 @@
 					<template #sign-out>
 						<LogOutIcon aria-hidden="true" /> {{ formatMessage(commonMessages.signOutButton) }}
 					</template>
-				</OverflowMenu>
+				</TeleportOverflowMenu>
 				<template v-else>
-					<ButtonStyled color="brand">
-						<nuxt-link :to="signInRouteObj">
-							<LogInIcon aria-hidden="true" />
-							{{ formatMessage(commonMessages.signInButton) }}
-						</nuxt-link>
-					</ButtonStyled>
-					<ButtonStyled circular>
-						<nuxt-link :v-tooltip="formatMessage(commonMessages.settingsLabel)" to="/settings">
-							<SettingsIcon :aria-label="formatMessage(commonMessages.settingsLabel)" />
-						</nuxt-link>
-					</ButtonStyled>
+					<ButtonLink type="colored" color="brand" :to="signInRouteObj">
+						<LogInIcon aria-hidden="true" />
+						{{ formatMessage(commonMessages.signInButton) }}
+					</ButtonLink>
+					<ButtonLink
+						v-tooltip="formatMessage(commonMessages.settingsLabel)"
+						to="/settings"
+						class="!w-9 !rounded-full !px-0"
+					>
+						<SettingsIcon :aria-label="formatMessage(commonMessages.settingsLabel)" />
+					</ButtonLink>
 				</template>
 			</div>
 		</header>
@@ -773,7 +842,7 @@ import {
 } from '@modrinth/assets'
 import {
 	Avatar,
-	ButtonStyled,
+	ButtonLink,
 	commonMessages,
 	commonProjectTypeCategoryMessages,
 	commonSettingsMessages,
@@ -782,12 +851,11 @@ import {
 	injectModrinthClient,
 	injectNotificationManager,
 	injectPageContext,
-	OverflowMenu,
 	providePageContext,
+	TeleportOverflowMenu,
 	useHostingIntercom,
 	useVIntl,
 } from '@modrinth/ui'
-import TeleportOverflowMenu from '@modrinth/ui/src/components/base/TeleportOverflowMenu.vue'
 import { isAdmin, isStaff, UserBadge } from '@modrinth/utils'
 import { useQuery } from '@tanstack/vue-query'
 
@@ -903,8 +971,6 @@ const showPrideBackdrop = computed(() => {
 	return !!currentProjectId.value && prideProjectIds.value.has(currentProjectId.value)
 })
 
-const basePopoutId = useId()
-
 async function fetchIntercomToken() {
 	return $fetch('/api/intercom/messenger-jwt', {
 		query: hostingIntercomServerId.value ? { server_id: hostingIntercomServerId.value } : {},
@@ -1157,26 +1223,36 @@ const userMenuOptions = computed(() => {
 	let options = [
 		{
 			id: 'profile',
-			link: `/user/${user.username}`,
+			label: formatMessage(messages.profile),
+			type: 'link',
+			to: `/user/${user.username}`,
 		},
 		{
 			id: 'plus',
-			link: '/plus',
-			color: 'purple',
+			label: formatMessage(messages.upgradeToModrinthPlus),
+			type: 'link',
+			to: '/plus',
+			tone: 'purple',
 			shown: !flags.value.hidePlusPromoInUserMenu && !hasActiveMidas(user),
 		},
 		{
 			id: 'servers',
-			link: '/hosting/manage',
+			label: formatMessage(messages.myServers),
+			type: 'link',
+			to: '/hosting/manage',
 		},
 		{
 			id: 'flags',
-			link: '/settings/flags',
+			label: formatMessage(commonSettingsMessages.featureFlags),
+			type: 'link',
+			to: '/settings/flags',
 			shown: flags.value.developerMode,
 		},
 		{
 			id: 'settings',
-			link: '/settings',
+			label: formatMessage(commonMessages.settingsLabel),
+			type: 'link',
+			to: '/settings',
 		},
 	]
 
@@ -1184,56 +1260,73 @@ const userMenuOptions = computed(() => {
 	options = [
 		...options,
 		{
-			divider: true,
+			type: 'divider',
 		},
 		{
 			id: 'notifications',
-			link: '/dashboard/notifications',
+			label: formatMessage(commonMessages.notificationsLabel),
+			type: 'link',
+			to: '/dashboard/notifications',
 		},
 		{
 			id: 'reports',
-			link: '/dashboard/reports',
+			label: formatMessage(messages.activeReports),
+			type: 'link',
+			to: '/dashboard/reports',
 		},
 		{
 			id: 'saved',
-			link: '/dashboard/collections',
+			label: formatMessage(commonMessages.collectionsLabel),
+			type: 'link',
+			to: '/dashboard/collections',
 		},
 		{
-			divider: true,
+			type: 'divider',
 		},
 		{
 			id: 'projects',
-			link: '/dashboard/projects',
+			label: formatMessage(messages.projects),
+			type: 'link',
+			to: '/dashboard/projects',
 		},
 		{
 			id: 'organizations',
-			link: '/dashboard/organizations',
+			label: formatMessage(messages.organizations),
+			type: 'link',
+			to: '/dashboard/organizations',
 		},
 		{
 			id: 'analytics',
-			link: '/dashboard/analytics',
+			label: formatMessage(commonMessages.analyticsButton),
+			type: 'link',
+			to: '/dashboard/analytics',
 		},
 		{
 			id: 'affiliate-links',
-			link: '/dashboard/affiliate-links',
+			label: formatMessage(commonMessages.affiliateLinksButton),
+			type: 'link',
+			to: '/dashboard/affiliate-links',
 			shown: user.badges & UserBadge.AFFILIATE,
 		},
 		{
 			id: 'revenue',
-			link: '/dashboard/revenue',
+			label: formatMessage(messages.revenue),
+			type: 'link',
+			to: '/dashboard/revenue',
 		},
 	]
 
 	options = [
 		...options,
 		{
-			divider: true,
+			type: 'divider',
 		},
 		{
 			id: 'sign-out',
-			color: 'danger',
-			action: () => logoutUser(),
+			label: formatMessage(commonMessages.signOutButton),
+			tone: 'red',
 			hoverFilled: true,
+			action: () => logoutUser(),
 		},
 	]
 	return options
diff --git a/apps/frontend/src/pages/[type]/[project].vue b/apps/frontend/src/pages/[type]/[project].vue
index 456d8b2a82..f0a67eec5e 100644
--- a/apps/frontend/src/pages/[type]/[project].vue
+++ b/apps/frontend/src/pages/[type]/[project].vue
@@ -21,11 +21,9 @@
 							formatMessage(messages.settingsTitle)
 						}}</span>
 						<div class="flex gap-2">
-							<ButtonStyled>
-								<nuxt-link to="/dashboard/projects"
-									><ListIcon /> {{ formatMessage(messages.visitProjectsDashboard) }}
-								</nuxt-link>
-							</ButtonStyled>
+							<ButtonLink to="/dashboard/projects"
+								><ListIcon /> {{ formatMessage(messages.visitProjectsDashboard) }}
+							</ButtonLink>
 						</div>
 					</div>
 					<ProjectMemberHeader
@@ -138,93 +136,97 @@
 						@category="(category) => router.push(`${projectSearchUrl}?f=categories:${category}`)"
 					>
 						<template #actions>
-							<ButtonStyled v-if="auth.user && currentMember" size="large" color="brand" circular>
-								<nuxt-link
-									v-tooltip="formatMessage(messages.editProject)"
-									:to="`${projectPath}/settings`"
-									class="!font-bold lg:!hidden"
-								>
-									<SettingsIcon />
-								</nuxt-link>
-							</ButtonStyled>
-							<ButtonStyled v-if="auth.user && currentMember" size="large" color="brand">
-								<nuxt-link :to="`${projectPath}/settings`" class="!font-bold max-lg:!hidden">
-									<SettingsIcon />
-									{{ formatMessage(messages.editProject) }}
-								</nuxt-link>
-							</ButtonStyled>
+							<ButtonLink
+								v-if="auth.user && currentMember"
+								v-tooltip="formatMessage(messages.editProject)"
+								type="colored"
+								color="brand"
+								size="xl"
+								:to="`${projectPath}/settings`"
+								class="!w-12 !rounded-full !px-0 !font-bold lg:!hidden"
+							>
+								<SettingsIcon />
+							</ButtonLink>
+							<ButtonLink
+								v-if="auth.user && currentMember"
+								type="colored"
+								color="brand"
+								size="xl"
+								:to="`${projectPath}/settings`"
+								class="!font-bold max-lg:!hidden"
+							>
+								<SettingsIcon />
+								{{ formatMessage(messages.editProject) }}
+							</ButtonLink>
 
 							<div class="hidden sm:contents">
-								<ButtonStyled
-									v-if="!isServerProject"
-									size="large"
-									:color="projectHeaderPrimaryColor"
-									:circular="!!auth.user && !!currentMember"
+								<IconButton
+									v-if="!isServerProject && auth.user && currentMember"
+									v-tooltip="formatMessage(commonMessages.downloadButton)"
+									:type="projectHeaderPrimaryColor === 'brand' ? 'colored' : 'base'"
+									:color="projectHeaderPrimaryColor === 'brand' ? 'brand' : undefined"
+									size="xl"
+									:label="formatMessage(commonMessages.downloadButton)"
+									@click="handleProjectHeaderPrimary"
 								>
-									<button
-										v-tooltip="
-											auth.user && currentMember
-												? formatMessage(commonMessages.downloadButton)
-												: undefined
-										"
-										type="button"
-										:aria-label="formatMessage(commonMessages.downloadButton)"
-										@click="handleProjectHeaderPrimary"
-									>
-										<DownloadIcon />
-										{{
-											auth.user && currentMember ? '' : formatMessage(commonMessages.downloadButton)
-										}}
-									</button>
-								</ButtonStyled>
-								<ButtonStyled
-									v-else
-									size="large"
-									:color="projectHeaderPrimaryColor"
-									:circular="!!auth.user && !!currentMember"
+									<DownloadIcon />
+								</IconButton>
+								<Button
+									v-else-if="!isServerProject"
+									:type="projectHeaderPrimaryColor === 'brand' ? 'colored' : 'base'"
+									:color="projectHeaderPrimaryColor === 'brand' ? 'brand' : undefined"
+									size="xl"
+									@click="handleProjectHeaderPrimary"
 								>
-									<button
-										v-tooltip="
-											auth.user && currentMember
-												? formatMessage(commonMessages.playButton)
-												: undefined
-										"
-										type="button"
-										:aria-label="formatMessage(commonMessages.playButton)"
-										@click="handleProjectHeaderPrimary"
-									>
-										<PlayIcon />
-										{{ auth.user && currentMember ? '' : formatMessage(commonMessages.playButton) }}
-									</button>
-								</ButtonStyled>
+									<DownloadIcon />
+									{{ formatMessage(commonMessages.downloadButton) }}
+								</Button>
+								<IconButton
+									v-if="isServerProject && auth.user && currentMember"
+									v-tooltip="formatMessage(commonMessages.playButton)"
+									:type="projectHeaderPrimaryColor === 'brand' ? 'colored' : 'base'"
+									:color="projectHeaderPrimaryColor === 'brand' ? 'brand' : undefined"
+									size="xl"
+									:label="formatMessage(commonMessages.playButton)"
+									@click="handleProjectHeaderPrimary"
+								>
+									<PlayIcon />
+								</IconButton>
+								<Button
+									v-else-if="isServerProject"
+									:type="projectHeaderPrimaryColor === 'brand' ? 'colored' : 'base'"
+									:color="projectHeaderPrimaryColor === 'brand' ? 'brand' : undefined"
+									size="xl"
+									@click="handleProjectHeaderPrimary"
+								>
+									<PlayIcon />
+									{{ formatMessage(commonMessages.playButton) }}
+								</Button>
 							</div>
 
 							<div class="contents sm:hidden">
-								<ButtonStyled
+								<IconButton
 									v-if="!isServerProject"
-									size="large"
-									circular
-									:color="projectHeaderPrimaryColor"
+									:type="projectHeaderPrimaryColor === 'brand' ? 'colored' : 'base'"
+									:color="projectHeaderPrimaryColor === 'brand' ? 'brand' : undefined"
+									size="xl"
+									:label="formatMessage(commonMessages.downloadButton)"
+									class="flex sm:hidden"
+									@click="handleProjectHeaderPrimary"
 								>
-									<button
-										type="button"
-										:aria-label="formatMessage(commonMessages.downloadButton)"
-										class="flex sm:hidden"
-										@click="handleProjectHeaderPrimary"
-									>
-										<DownloadIcon />
-									</button>
-								</ButtonStyled>
-								<ButtonStyled v-else size="large" circular :color="projectHeaderPrimaryColor">
-									<button
-										type="button"
-										:aria-label="formatMessage(commonMessages.playButton)"
-										class="flex sm:hidden"
-										@click="handleProjectHeaderPrimary"
-									>
-										<PlayIcon />
-									</button>
-								</ButtonStyled>
+									<DownloadIcon />
+								</IconButton>
+								<IconButton
+									v-else
+									:type="projectHeaderPrimaryColor === 'brand' ? 'colored' : 'base'"
+									:color="projectHeaderPrimaryColor === 'brand' ? 'brand' : undefined"
+									size="xl"
+									:label="formatMessage(commonMessages.playButton)"
+									class="flex sm:hidden"
+									@click="handleProjectHeaderPrimary"
+								>
+									<PlayIcon />
+								</IconButton>
 							</div>
 
 							<Tooltip
@@ -238,16 +240,16 @@
 								:auto-hide="false"
 								placement="bottom-start"
 							>
-								<ButtonStyled circular size="large">
-									<nuxt-link
-										v-tooltip="formatMessage(messages.createServerTooltip)"
-										:to="projectHeaderCreateServerTo"
-										:aria-label="formatMessage(messages.serversPromoTitle)"
-										@click="dismissProjectHeaderCreateServerPrompt"
-									>
-										<ServerPlusIcon />
-									</nuxt-link>
-								</ButtonStyled>
+								<ButtonLink
+									v-tooltip="formatMessage(messages.createServerTooltip)"
+									size="xl"
+									:to="projectHeaderCreateServerTo"
+									:aria-label="formatMessage(messages.serversPromoTitle)"
+									class="!w-12 !rounded-full !px-0"
+									@click="dismissProjectHeaderCreateServerPrompt"
+								>
+									<ServerPlusIcon />
+								</ButtonLink>
 								<template #popper>
 									<div class="grid max-w-[18rem] gap-2">
 										<div class="flex items-center justify-between gap-4">
@@ -261,14 +263,15 @@
 													{{ formatMessage(commonMessages.newBadge) }}
 												</span>
 											</div>
-											<ButtonStyled size="small" circular>
-												<button
-													v-tooltip="formatMessage(messages.dontShowAgain)"
-													@click="dismissProjectHeaderCreateServerPrompt"
-												>
-													<XIcon aria-hidden="true" />
-												</button>
-											</ButtonStyled>
+											<IconButton
+												v-tooltip="formatMessage(messages.dontShowAgain)"
+												class="!size-6"
+												size="xs"
+												:label="formatMessage(messages.dontShowAgain)"
+												@click="dismissProjectHeaderCreateServerPrompt"
+											>
+												<XIcon aria-hidden="true" />
+											</IconButton>
 										</div>
 										<p class="m-0 text-sm font-medium leading-tight text-secondary">
 											{{ formatMessage(messages.serversPromoDescription) }}
@@ -286,55 +289,58 @@
 									</div>
 								</template>
 							</Tooltip>
-							<ButtonStyled v-else-if="showProjectHeaderCreateServerAction" circular size="large">
-								<nuxt-link
-									v-tooltip="formatMessage(messages.createServerTooltip)"
-									:to="projectHeaderCreateServerTo"
-									:aria-label="formatMessage(messages.serversPromoTitle)"
-									@click="dismissProjectHeaderCreateServerPrompt"
-								>
-									<ServerPlusIcon />
-								</nuxt-link>
-							</ButtonStyled>
+							<ButtonLink
+								v-else-if="showProjectHeaderCreateServerAction"
+								v-tooltip="formatMessage(messages.createServerTooltip)"
+								size="xl"
+								:to="projectHeaderCreateServerTo"
+								:aria-label="formatMessage(messages.serversPromoTitle)"
+								class="!w-12 !rounded-full !px-0"
+								@click="dismissProjectHeaderCreateServerPrompt"
+							>
+								<ServerPlusIcon />
+							</ButtonLink>
 
-							<ButtonStyled circular size="large">
-								<ClientOnly>
-									<button
-										v-if="auth.user"
-										v-tooltip="
-											following
-												? formatMessage(commonMessages.unfollowButton)
-												: formatMessage(commonMessages.followButton)
-										"
-										type="button"
-										:aria-label="
-											following
-												? formatMessage(commonMessages.unfollowButton)
-												: formatMessage(commonMessages.followButton)
-										"
-										@click="followProjectFromHeader"
-									>
-										<HeartIcon :fill="following ? 'currentColor' : 'none'" />
-									</button>
-									<nuxt-link
-										v-else
+							<ClientOnly>
+								<IconButton
+									v-if="auth.user"
+									v-tooltip="
+										following
+											? formatMessage(commonMessages.unfollowButton)
+											: formatMessage(commonMessages.followButton)
+									"
+									size="xl"
+									:label="
+										following
+											? formatMessage(commonMessages.unfollowButton)
+											: formatMessage(commonMessages.followButton)
+									"
+									@click="followProjectFromHeader"
+								>
+									<HeartIcon :fill="following ? 'currentColor' : 'none'" />
+								</IconButton>
+								<ButtonLink
+									v-else
+									v-tooltip="formatMessage(commonMessages.followButton)"
+									size="xl"
+									:to="signInRouteObj"
+									:aria-label="formatMessage(commonMessages.followButton)"
+									class="!w-12 !rounded-full !px-0"
+								>
+									<HeartIcon aria-hidden="true" />
+								</ButtonLink>
+								<template #fallback>
+									<ButtonLink
 										v-tooltip="formatMessage(commonMessages.followButton)"
+										size="xl"
 										:to="signInRouteObj"
 										:aria-label="formatMessage(commonMessages.followButton)"
+										class="!w-12 !rounded-full !px-0"
 									>
 										<HeartIcon aria-hidden="true" />
-									</nuxt-link>
-									<template #fallback>
-										<nuxt-link
-											v-tooltip="formatMessage(commonMessages.followButton)"
-											:to="signInRouteObj"
-											:aria-label="formatMessage(commonMessages.followButton)"
-										>
-											<HeartIcon aria-hidden="true" />
-										</nuxt-link>
-									</template>
-								</ClientOnly>
-							</ButtonStyled>
+									</ButtonLink>
+								</template>
+							</ClientOnly>
 
 							<ProjectCollectionSaveButton
 								:auth-user="auth.user"
@@ -349,15 +355,15 @@
 								:create-collection="(event) => modalCollection?.show(event)"
 							/>
 
-							<ButtonStyled circular size="large" type="transparent">
-								<TeleportOverflowMenu
-									:options="projectHeaderMoreActions"
-									:tooltip="formatMessage(commonMessages.moreOptionsButton)"
-									:aria-label="formatMessage(commonMessages.moreOptionsButton)"
-								>
-									<MoreVerticalIcon />
-								</TeleportOverflowMenu>
-							</ButtonStyled>
+							<TeleportOverflowMenu
+								type="quiet"
+								size="xl"
+								:label="formatMessage(commonMessages.moreOptionsButton)"
+								:tooltip="formatMessage(commonMessages.moreOptionsButton)"
+								:options="projectHeaderMoreActions"
+							>
+								<MoreVerticalIcon />
+							</TeleportOverflowMenu>
 						</template>
 					</ProjectPageHeader>
 					<ProjectMemberHeader
@@ -406,11 +412,15 @@
 						>
 							{{ formatMessage(messages.environmentMigrationLink) }}
 						</nuxt-link>
-						<ButtonStyled v-if="hasEditDetailsPermission" color="orange">
-							<button class="mt-3 w-fit" @click="() => projectEnvironmentModal.show()">
-								<SettingsIcon /> {{ formatMessage(messages.reviewEnvironmentSettings) }}
-							</button>
-						</ButtonStyled>
+						<Button
+							v-if="hasEditDetailsPermission"
+							type="colored"
+							color="orange"
+							class="mt-3 w-fit"
+							@click="() => projectEnvironmentModal.show()"
+						>
+							<SettingsIcon /> {{ formatMessage(messages.reviewEnvironmentSettings) }}
+						</Button>
 					</Admonition>
 					<MessageBanner v-if="project.status === 'archived'" message-type="warning" class="my-4">
 						{{ formatMessage(messages.archivedMessage, { title: project.title }) }}
@@ -506,9 +516,11 @@ import {
 	Admonition,
 	Avatar,
 	BrowseInstallHeader,
-	ButtonStyled,
+	Button,
+	ButtonLink,
 	commonMessages,
 	defineMessages,
+	IconButton,
 	injectModrinthClient,
 	injectNotificationManager,
 	IntlFormatted,
@@ -1589,27 +1601,26 @@ const projectHeaderMoreActions = computed(() => {
 			id: 'analytics',
 			label: formatMessage(commonMessages.analyticsButton),
 			icon: ChartIcon,
-			link: `${projectPath.value}/settings/analytics`,
-			shown: !!auth.value.user && !!currentMember.value,
-		},
-		{
-			divider: true,
+			type: 'link',
+			to: `${projectPath.value}/settings/analytics`,
 			shown: !!auth.value.user && !!currentMember.value,
 		},
+		{ type: 'divider', shown: !!auth.value.user && !!currentMember.value },
 		{
 			id: 'moderation-checklist',
 			label: formatMessage(messages.reviewProject),
 			icon: ScaleIcon,
 			action: openModerationChecklistFromMenu,
-			color: 'orange',
+			tone: 'orange',
 			shown: !!auth.value.user && isStaff && !showModerationChecklist.value,
 		},
 		{
 			id: 'tech-review',
 			label: 'Tech review',
 			icon: ScanEyeIcon,
-			link: `/moderation/technical-review/${project.value?.id}`,
-			color: 'orange',
+			type: 'link',
+			to: `/moderation/technical-review/${project.value?.id}`,
+			tone: 'orange',
 			shown: !!auth.value.user && isStaff,
 		},
 		{
@@ -1617,19 +1628,16 @@ const projectHeaderMoreActions = computed(() => {
 			label: formatMessage(messages.rescanModpack),
 			icon: FolderSearchIcon,
 			action: () => scanModal.value?.show(),
-			color: 'orange',
+			tone: 'orange',
 			shown: !!auth.value.user && isStaff && project.value?.actualProjectType === 'modpack',
 		},
-		{
-			divider: true,
-			shown: !!auth.value.user && isStaff,
-		},
+		{ type: 'divider', shown: !!auth.value.user && isStaff },
 		{
 			id: 'report',
 			label: formatMessage(commonMessages.reportButton),
 			icon: ReportIcon,
 			action: reportProjectFromHeader,
-			color: 'red',
+			tone: 'red',
 			shown: !isMember.value,
 		},
 		{
diff --git a/apps/frontend/src/pages/[type]/[project]/changelog.vue b/apps/frontend/src/pages/[type]/[project]/changelog.vue
index f48956653a..cd220347b2 100644
--- a/apps/frontend/src/pages/[type]/[project]/changelog.vue
+++ b/apps/frontend/src/pages/[type]/[project]/changelog.vue
@@ -53,17 +53,18 @@
 										{{ formatDate(version.date_published) }}</span
 									>
 								</div>
-								<ButtonStyled v-if="getPrimaryFile(version)" color="brand" type="transparent">
-									<a
-										class="ml-auto"
-										:href="createDownloadUrl(version)"
-										:download="getPrimaryFile(version)?.filename"
-										:title="`Download ${version.name}`"
-									>
-										<DownloadIcon aria-hidden="true" />
-										Download
-									</a>
-								</ButtonStyled>
+								<ButtonLink
+									v-if="getPrimaryFile(version)"
+									type="quiet"
+									color="brand"
+									class="ml-auto"
+									:href="createDownloadUrl(version)"
+									:download="getPrimaryFile(version)?.filename"
+									:title="`Download ${version.name}`"
+								>
+									<DownloadIcon aria-hidden="true" />
+									Download
+								</ButtonLink>
 							</div>
 							<div
 								v-if="version.changelog && !version.duplicate"
@@ -90,7 +91,7 @@
 <script setup>
 import { DownloadIcon, SpinnerIcon } from '@modrinth/assets'
 import {
-	ButtonStyled,
+	ButtonLink,
 	injectModrinthClient,
 	injectProjectPageContext,
 	Pagination,
diff --git a/apps/frontend/src/pages/[type]/[project]/gallery.vue b/apps/frontend/src/pages/[type]/[project]/gallery.vue
index 801a86017d..edce759740 100644
--- a/apps/frontend/src/pages/[type]/[project]/gallery.vue
+++ b/apps/frontend/src/pages/[type]/[project]/gallery.vue
@@ -10,24 +10,23 @@
 					<div class="file-header">
 						<ImageIcon aria-hidden="true" />
 						<strong>{{ editFile ? editFile.name : 'Current image' }}</strong>
-						<ButtonStyled v-if="editIndex === -1" type="outlined">
-							<FileInput
-								class="button-like"
-								prompt="Replace"
-								:accept="acceptFileTypes"
-								:max-size="5242880"
-								should-always-reset
-								aria-label="Replace image"
-								@change="
-									(x) => {
-										editFile = x[0]
-										showPreviewImage()
-									}
-								"
-							>
-								<TransferIcon aria-hidden="true" />
-							</FileInput>
-						</ButtonStyled>
+						<FileButton
+							v-if="editIndex === -1"
+							type="outlined"
+							class="button-like"
+							prompt="Replace"
+							:accept="acceptFileTypes"
+							:max-size="5242880"
+							aria-label="Replace image"
+							@change="
+								(x) => {
+									editFile = x[0]
+									showPreviewImage()
+								}
+							"
+						>
+							<TransferIcon aria-hidden="true" />
+						</FileButton>
 					</div>
 					<img
 						:src="
@@ -74,37 +73,44 @@
 						You can feature one image on your project to be used as a banner image.
 					</span>
 				</label>
-				<ButtonStyled v-if="!editFeatured">
-					<button id="gallery-image-featured" class="w-fit" @click="editFeatured = true">
-						<StarIcon aria-hidden="true" />
-						Set as banner
-					</button>
-				</ButtonStyled>
-				<ButtonStyled v-else>
-					<button id="gallery-image-featured" class="w-fit" @click="editFeatured = false">
-						<StarIcon fill="currentColor" aria-hidden="true" />
-						Unset as banner
-					</button>
-				</ButtonStyled>
+				<Button
+					v-if="!editFeatured"
+					id="gallery-image-featured"
+					class="w-fit"
+					@click="editFeatured = true"
+				>
+					<StarIcon aria-hidden="true" />
+					Set as banner
+				</Button>
+				<Button v-else id="gallery-image-featured" class="w-fit" @click="editFeatured = false">
+					<StarIcon fill="currentColor" aria-hidden="true" />
+					Unset as banner
+				</Button>
 				<div class="button-group">
-					<ButtonStyled type="outlined">
-						<button @click="modalEditItem?.hide()">
-							<XIcon aria-hidden="true" />
-							Cancel
-						</button>
-					</ButtonStyled>
-					<ButtonStyled v-if="editIndex === -1" color="brand">
-						<button :disabled="shouldPreventActions" @click="createGalleryItem">
-							<PlusIcon aria-hidden="true" />
-							Add gallery image
-						</button>
-					</ButtonStyled>
-					<ButtonStyled v-else color="brand">
-						<button :disabled="shouldPreventActions" @click="editGalleryItem">
-							<SaveIcon aria-hidden="true" />
-							Save changes
-						</button>
-					</ButtonStyled>
+					<Button type="outlined" @click="modalEditItem?.hide()">
+						<XIcon aria-hidden="true" />
+						Cancel
+					</Button>
+					<Button
+						v-if="editIndex === -1"
+						type="colored"
+						color="brand"
+						:disabled="shouldPreventActions"
+						@click="createGalleryItem"
+					>
+						<PlusIcon aria-hidden="true" />
+						Add gallery image
+					</Button>
+					<Button
+						v-else
+						type="colored"
+						color="brand"
+						:disabled="shouldPreventActions"
+						@click="editGalleryItem"
+					>
+						<SaveIcon aria-hidden="true" />
+						Save changes
+					</Button>
 				</div>
 			</div>
 		</Modal>
@@ -146,40 +152,40 @@
 					</div>
 					<div class="controls">
 						<div class="flex gap-2">
-							<ButtonStyled circular>
-								<button class="close" @click="expandedGalleryItem = null">
-									<XIcon aria-hidden="true" />
-								</button>
-							</ButtonStyled>
-							<ButtonStyled circular>
-								<a
-									class="open"
-									target="_blank"
-									:href="
-										expandedGalleryItem?.raw_url
-											? expandedGalleryItem?.raw_url
-											: 'https://cdn.modrinth.com/placeholder-banner.svg'
-									"
-								>
-									<ExternalIcon aria-hidden="true" />
-								</a>
-							</ButtonStyled>
-							<ButtonStyled circular>
-								<button @click="zoomedIn = !zoomedIn">
-									<ExpandIcon v-if="!zoomedIn" aria-hidden="true" />
-									<ContractIcon v-else aria-hidden="true" />
-								</button>
-							</ButtonStyled>
-							<ButtonStyled v-if="filteredGallery.length > 1" circular>
-								<button class="previous" @click="previousImage()">
-									<LeftArrowIcon aria-hidden="true" />
-								</button>
-							</ButtonStyled>
-							<ButtonStyled v-if="filteredGallery.length > 1" circular>
-								<button class="next" @click="nextImage()">
-									<RightArrowIcon aria-hidden="true" />
-								</button>
-							</ButtonStyled>
+							<IconButton label="Close" class="close" @click="expandedGalleryItem = null">
+								<XIcon aria-hidden="true" />
+							</IconButton>
+							<ButtonLink
+								class="open !w-9 !rounded-full !px-0"
+								target="_blank"
+								:href="
+									expandedGalleryItem?.raw_url
+										? expandedGalleryItem?.raw_url
+										: 'https://cdn.modrinth.com/placeholder-banner.svg'
+								"
+							>
+								<ExternalIcon aria-hidden="true" />
+							</ButtonLink>
+							<IconButton label="Toggle zoom" @click="zoomedIn = !zoomedIn">
+								<ExpandIcon v-if="!zoomedIn" aria-hidden="true" />
+								<ContractIcon v-else aria-hidden="true" />
+							</IconButton>
+							<IconButton
+								v-if="filteredGallery.length > 1"
+								label="Previous image"
+								class="previous"
+								@click="previousImage()"
+							>
+								<LeftArrowIcon aria-hidden="true" />
+							</IconButton>
+							<IconButton
+								v-if="filteredGallery.length > 1"
+								label="Next image"
+								class="next"
+								@click="nextImage()"
+							>
+								<RightArrowIcon aria-hidden="true" />
+							</IconButton>
 						</div>
 					</div>
 				</div>
@@ -187,19 +193,19 @@
 		</div>
 
 		<div v-if="currentMember && filteredGallery.length" class="card header-buttons">
-			<ButtonStyled color="brand">
-				<FileInput
-					:max-size="5242880"
-					:accept="acceptFileTypes"
-					prompt="Upload an image"
-					aria-label="Upload an image"
-					class="button-like"
-					:disabled="!isPermission(currentMember?.permissions, 1 << 2)"
-					@change="handleFiles"
-				>
-					<UploadIcon aria-hidden="true" />
-				</FileInput>
-			</ButtonStyled>
+			<FileButton
+				type="colored"
+				color="brand"
+				:max-size="5242880"
+				:accept="acceptFileTypes"
+				prompt="Upload an image"
+				aria-label="Upload an image"
+				class="button-like"
+				:disabled="!isPermission(currentMember?.permissions, 1 << 2)"
+				@change="handleFiles"
+			>
+				<UploadIcon aria-hidden="true" />
+			</FileButton>
 			<span class="indicator">
 				<InfoIcon aria-hidden="true" /> Click to choose an image or drag one onto this page
 			</span>
@@ -233,37 +239,33 @@
 						{{ formatDate(item.created) }}
 					</div>
 					<div v-if="currentMember" class="gallery-buttons input-group">
-						<ButtonStyled>
-							<button
-								@click="
-									() => {
-										resetEdit()
-										editIndex = index
-										editTitle = item.title ?? ''
-										editDescription = item.description ?? ''
-										editFeatured = item.featured
-										editOrder = item.ordering
-										modalEditItem?.show()
-									}
-								"
-							>
-								<EditIcon aria-hidden="true" />
-								Edit
-							</button>
-						</ButtonStyled>
-						<ButtonStyled>
-							<button
-								@click="
-									() => {
-										deleteIndex = index
-										modalConfirm?.show()
-									}
-								"
-							>
-								<TrashIcon aria-hidden="true" />
-								Remove
-							</button>
-						</ButtonStyled>
+						<Button
+							@click="
+								() => {
+									resetEdit()
+									editIndex = index
+									editTitle = item.title ?? ''
+									editDescription = item.description ?? ''
+									editFeatured = item.featured
+									editOrder = item.ordering
+									modalEditItem?.show()
+								}
+							"
+						>
+							<EditIcon aria-hidden="true" />
+							Edit
+						</Button>
+						<Button
+							@click="
+								() => {
+									deleteIndex = index
+									modalConfirm?.show()
+								}
+							"
+						>
+							<TrashIcon aria-hidden="true" />
+							Remove
+						</Button>
 					</div>
 				</div>
 			</div>
@@ -300,10 +302,12 @@ import {
 	XIcon,
 } from '@modrinth/assets'
 import {
-	ButtonStyled,
+	Button,
+	ButtonLink,
 	ConfirmModal,
 	DropArea,
-	FileInput,
+	FileButton,
+	IconButton,
 	injectProjectPageContext,
 	NewModal as Modal,
 	StyledInput,
diff --git a/apps/frontend/src/pages/[type]/[project]/settings/environment.vue b/apps/frontend/src/pages/[type]/[project]/settings/environment.vue
index 84e4ec6cb9..f4c1affea5 100644
--- a/apps/frontend/src/pages/[type]/[project]/settings/environment.vue
+++ b/apps/frontend/src/pages/[type]/[project]/settings/environment.vue
@@ -12,14 +12,14 @@
 				</div>
 				<div>Visit Project Settings to manage environments for each version.</div>
 			</div>
-			<ButtonStyled color="green">
-				<nuxt-link
-					:to="`/${projectV2.project_type}/${projectV2.id}/settings/versions`"
-					class="items flex"
-				>
-					<SettingsIcon /> Edit versions
-				</nuxt-link>
-			</ButtonStyled>
+			<ButtonLink
+				type="colored"
+				color="green"
+				:to="`/${projectV2.project_type}/${projectV2.id}/settings/versions`"
+				class="items flex"
+			>
+				<SettingsIcon /> Edit versions
+			</ButtonLink>
 		</div>
 	</div>
 </template>
@@ -27,7 +27,7 @@
 <script setup lang="ts">
 import { SettingsIcon } from '@modrinth/assets'
 import {
-	ButtonStyled,
+	ButtonLink,
 	EnvironmentMigration,
 	injectProjectPageContext,
 	LoadingIndicator,
diff --git a/apps/frontend/src/pages/[type]/[project]/settings/gallery.vue b/apps/frontend/src/pages/[type]/[project]/settings/gallery.vue
index cf135ac425..765b6a65ef 100644
--- a/apps/frontend/src/pages/[type]/[project]/settings/gallery.vue
+++ b/apps/frontend/src/pages/[type]/[project]/settings/gallery.vue
@@ -10,24 +10,23 @@
 					<div class="file-header">
 						<ImageIcon aria-hidden="true" />
 						<strong>{{ editFile ? editFile.name : 'Current image' }}</strong>
-						<ButtonStyled v-if="editIndex === -1" type="outlined">
-							<FileInput
-								class="button-like"
-								prompt="Replace"
-								:accept="acceptFileTypes"
-								:max-size="5242880"
-								should-always-reset
-								aria-label="Replace image"
-								@change="
-									(x) => {
-										editFile = x[0]
-										showPreviewImage()
-									}
-								"
-							>
-								<TransferIcon aria-hidden="true" />
-							</FileInput>
-						</ButtonStyled>
+						<FileButton
+							v-if="editIndex === -1"
+							type="outlined"
+							class="button-like"
+							prompt="Replace"
+							:accept="acceptFileTypes"
+							:max-size="5242880"
+							aria-label="Replace image"
+							@change="
+								(x) => {
+									editFile = x[0]
+									showPreviewImage()
+								}
+							"
+						>
+							<TransferIcon aria-hidden="true" />
+						</FileButton>
 					</div>
 					<img
 						:src="
@@ -74,37 +73,44 @@
 						You can feature one image on your project to be used as a banner image.
 					</span>
 				</label>
-				<ButtonStyled v-if="!editFeatured">
-					<button id="gallery-image-featured" class="w-fit" @click="editFeatured = true">
-						<StarIcon aria-hidden="true" />
-						Set as banner
-					</button>
-				</ButtonStyled>
-				<ButtonStyled v-else>
-					<button id="gallery-image-featured" class="w-fit" @click="editFeatured = false">
-						<StarIcon fill="currentColor" aria-hidden="true" />
-						Unset as banner
-					</button>
-				</ButtonStyled>
+				<Button
+					v-if="!editFeatured"
+					id="gallery-image-featured"
+					class="w-fit"
+					@click="editFeatured = true"
+				>
+					<StarIcon aria-hidden="true" />
+					Set as banner
+				</Button>
+				<Button v-else id="gallery-image-featured" class="w-fit" @click="editFeatured = false">
+					<StarIcon fill="currentColor" aria-hidden="true" />
+					Unset as banner
+				</Button>
 				<div class="button-group">
-					<ButtonStyled type="outlined">
-						<button @click="modal_edit_item.hide()">
-							<XIcon aria-hidden="true" />
-							Cancel
-						</button>
-					</ButtonStyled>
-					<ButtonStyled v-if="editIndex === -1" color="brand">
-						<button :disabled="shouldPreventActions" @click="createGalleryItem">
-							<PlusIcon aria-hidden="true" />
-							Add gallery image
-						</button>
-					</ButtonStyled>
-					<ButtonStyled v-else color="brand">
-						<button :disabled="shouldPreventActions" @click="editGalleryItem">
-							<SaveIcon aria-hidden="true" />
-							Save changes
-						</button>
-					</ButtonStyled>
+					<Button type="outlined" @click="modal_edit_item.hide()">
+						<XIcon aria-hidden="true" />
+						Cancel
+					</Button>
+					<Button
+						v-if="editIndex === -1"
+						type="colored"
+						color="brand"
+						:disabled="shouldPreventActions"
+						@click="createGalleryItem"
+					>
+						<PlusIcon aria-hidden="true" />
+						Add gallery image
+					</Button>
+					<Button
+						v-else
+						type="colored"
+						color="brand"
+						:disabled="shouldPreventActions"
+						@click="editGalleryItem"
+					>
+						<SaveIcon aria-hidden="true" />
+						Save changes
+					</Button>
 				</div>
 			</div>
 		</Modal>
@@ -146,59 +152,59 @@
 					</div>
 					<div class="controls">
 						<div class="flex gap-2">
-							<ButtonStyled circular>
-								<button class="close" @click="expandedGalleryItem = null">
-									<XIcon aria-hidden="true" />
-								</button>
-							</ButtonStyled>
-							<ButtonStyled circular>
-								<a
-									class="open"
-									target="_blank"
-									:href="
-										expandedGalleryItem.raw_url
-											? expandedGalleryItem.raw_url
-											: 'https://cdn.modrinth.com/placeholder-banner.svg'
-									"
-								>
-									<ExternalIcon aria-hidden="true" />
-								</a>
-							</ButtonStyled>
-							<ButtonStyled circular>
-								<button @click="zoomedIn = !zoomedIn">
-									<ExpandIcon v-if="!zoomedIn" aria-hidden="true" />
-									<ContractIcon v-else aria-hidden="true" />
-								</button>
-							</ButtonStyled>
-							<ButtonStyled v-if="filteredGallery.length > 1" circular>
-								<button class="previous" @click="previousImage()">
-									<LeftArrowIcon aria-hidden="true" />
-								</button>
-							</ButtonStyled>
-							<ButtonStyled v-if="filteredGallery.length > 1" circular>
-								<button class="next" @click="nextImage()">
-									<RightArrowIcon aria-hidden="true" />
-								</button>
-							</ButtonStyled>
+							<IconButton label="Close" class="close" @click="expandedGalleryItem = null">
+								<XIcon aria-hidden="true" />
+							</IconButton>
+							<ButtonLink
+								class="open !w-9 !rounded-full !px-0"
+								target="_blank"
+								:href="
+									expandedGalleryItem.raw_url
+										? expandedGalleryItem.raw_url
+										: 'https://cdn.modrinth.com/placeholder-banner.svg'
+								"
+							>
+								<ExternalIcon aria-hidden="true" />
+							</ButtonLink>
+							<IconButton label="Toggle zoom" @click="zoomedIn = !zoomedIn">
+								<ExpandIcon v-if="!zoomedIn" aria-hidden="true" />
+								<ContractIcon v-else aria-hidden="true" />
+							</IconButton>
+							<IconButton
+								v-if="filteredGallery.length > 1"
+								label="Previous image"
+								class="previous"
+								@click="previousImage()"
+							>
+								<LeftArrowIcon aria-hidden="true" />
+							</IconButton>
+							<IconButton
+								v-if="filteredGallery.length > 1"
+								label="Next image"
+								class="next"
+								@click="nextImage()"
+							>
+								<RightArrowIcon aria-hidden="true" />
+							</IconButton>
 						</div>
 					</div>
 				</div>
 			</div>
 		</div>
 		<div v-if="currentMember" class="card header-buttons">
-			<ButtonStyled color="brand">
-				<FileInput
-					:max-size="5242880"
-					:accept="acceptFileTypes"
-					prompt="Upload an image"
-					aria-label="Upload an image"
-					class="button-like"
-					:disabled="!isPermission(currentMember?.permissions, 1 << 2)"
-					@change="handleFiles"
-				>
-					<UploadIcon aria-hidden="true" />
-				</FileInput>
-			</ButtonStyled>
+			<FileButton
+				type="colored"
+				color="brand"
+				:max-size="5242880"
+				:accept="acceptFileTypes"
+				prompt="Upload an image"
+				aria-label="Upload an image"
+				class="button-like"
+				:disabled="!isPermission(currentMember?.permissions, 1 << 2)"
+				@change="handleFiles"
+			>
+				<UploadIcon aria-hidden="true" />
+			</FileButton>
 			<span class="indicator">
 				<InfoIcon aria-hidden="true" /> Click to choose an image or drag one onto this page
 			</span>
@@ -232,37 +238,33 @@
 						{{ formatDate(item.created) }}
 					</div>
 					<div v-if="currentMember" class="gallery-buttons input-group">
-						<ButtonStyled>
-							<button
-								@click="
-									() => {
-										resetEdit()
-										editIndex = index
-										editTitle = item.title
-										editDescription = item.description
-										editFeatured = item.featured
-										editOrder = item.ordering
-										modal_edit_item.show()
-									}
-								"
-							>
-								<EditIcon aria-hidden="true" />
-								Edit
-							</button>
-						</ButtonStyled>
-						<ButtonStyled>
-							<button
-								@click="
-									() => {
-										deleteIndex = index
-										modal_confirm.show()
-									}
-								"
-							>
-								<TrashIcon aria-hidden="true" />
-								Remove
-							</button>
-						</ButtonStyled>
+						<Button
+							@click="
+								() => {
+									resetEdit()
+									editIndex = index
+									editTitle = item.title
+									editDescription = item.description
+									editFeatured = item.featured
+									editOrder = item.ordering
+									modal_edit_item.show()
+								}
+							"
+						>
+							<EditIcon aria-hidden="true" />
+							Edit
+						</Button>
+						<Button
+							@click="
+								() => {
+									deleteIndex = index
+									modal_confirm.show()
+								}
+							"
+						>
+							<TrashIcon aria-hidden="true" />
+							Remove
+						</Button>
 					</div>
 				</div>
 			</div>
@@ -290,10 +292,12 @@ import {
 	XIcon,
 } from '@modrinth/assets'
 import {
-	ButtonStyled,
+	Button,
+	ButtonLink,
 	ConfirmModal,
 	DropArea,
-	FileInput,
+	FileButton,
+	IconButton,
 	injectProjectPageContext,
 	NewModal as Modal,
 	StyledInput,
diff --git a/apps/frontend/src/pages/[type]/[project]/settings/index.vue b/apps/frontend/src/pages/[type]/[project]/settings/index.vue
index 9e755434f0..61918918f6 100644
--- a/apps/frontend/src/pages/[type]/[project]/settings/index.vue
+++ b/apps/frontend/src/pages/[type]/[project]/settings/index.vue
@@ -82,27 +82,26 @@
 							class="project__icon"
 						/>
 						<div class="flex flex-col gap-2">
-							<ButtonStyled>
-								<FileInput
-									id="project-icon"
-									:max-size="262144000"
-									:show-icon="true"
-									accept="image/png,image/jpeg,image/gif,image/webp"
-									class="button-like choose-image"
-									prompt="Upload icon"
-									aria-label="Upload icon"
-									:disabled="!hasPermission"
-									@change="showPreviewImage"
-								>
-									<UploadIcon aria-hidden="true" />
-								</FileInput>
-							</ButtonStyled>
-							<ButtonStyled v-if="!deletedIcon && (previewImage || project.icon_url)">
-								<button :disabled="!hasPermission" @click="markIconForDeletion">
-									<TrashIcon aria-hidden="true" />
-									Remove icon
-								</button>
-							</ButtonStyled>
+							<FileButton
+								id="project-icon"
+								:max-size="262144000"
+								accept="image/png,image/jpeg,image/gif,image/webp"
+								class="button-like choose-image"
+								prompt="Upload icon"
+								aria-label="Upload icon"
+								:disabled="!hasPermission"
+								@change="showPreviewImage"
+							>
+								<UploadIcon aria-hidden="true" />
+							</FileButton>
+							<Button
+								v-if="!deletedIcon && (previewImage || project.icon_url)"
+								:disabled="!hasPermission"
+								@click="markIconForDeletion"
+							>
+								<TrashIcon aria-hidden="true" />
+								Remove icon
+							</Button>
 						</div>
 					</div>
 				</div>
@@ -160,25 +159,24 @@
 							</label>
 						</div>
 						<div class="mt-2 flex items-center gap-2">
-							<ButtonStyled>
-								<FileInput
-									:max-size="524288"
-									:show-icon="true"
-									accept="image/png,image/jpeg,image/gif,image/webp"
-									class="button-like"
-									prompt="Upload banner"
-									:disabled="!hasPermission"
-									@change="showBannerPreview"
-								>
-									<UploadIcon aria-hidden="true" />
-								</FileInput>
-							</ButtonStyled>
-							<ButtonStyled v-if="!deletedBanner && (bannerPreview || bannerGalleryImage?.url)">
-								<button :disabled="!hasPermission" @click="markBannerForDeletion">
-									<TrashIcon aria-hidden="true" />
-									Remove banner
-								</button>
-							</ButtonStyled>
+							<FileButton
+								:max-size="524288"
+								accept="image/png,image/jpeg,image/gif,image/webp"
+								class="button-like"
+								prompt="Upload banner"
+								:disabled="!hasPermission"
+								@change="showBannerPreview"
+							>
+								<UploadIcon aria-hidden="true" />
+							</FileButton>
+							<Button
+								v-if="!deletedBanner && (bannerPreview || bannerGalleryImage?.url)"
+								:disabled="!hasPermission"
+								@click="markBannerForDeletion"
+							>
+								<TrashIcon aria-hidden="true" />
+								Remove banner
+							</Button>
 						</div>
 						<div class="mt-2 text-secondary">Gif, 468×60px recommended.</div>
 					</div>
@@ -279,24 +277,24 @@
 					</span>
 				</div>
 				<div v-if="isStaff" class="mt-2">
-					<ButtonStyled color="orange">
-						<button
-							v-if="!isForceDemonetized"
-							:disabled="loadingModeratorMonetization"
-							@click="updateMonetizationStatus('force-demonetized')"
-						>
-							<ScaleIcon aria-hidden="true" />
-							Disable monetization
-						</button>
-						<button
-							v-else
-							:disabled="loadingModeratorMonetization"
-							@click="updateMonetizationStatus('monetized')"
-						>
-							<ScaleIcon aria-hidden="true" />
-							Allow monetization
-						</button>
-					</ButtonStyled>
+					<Button
+						v-if="!isForceDemonetized"
+						type="colored"
+						color="orange"
+						:disabled="loadingModeratorMonetization"
+						@click="updateMonetizationStatus('force-demonetized')"
+					>
+						<ScaleIcon aria-hidden="true" />
+						Disable monetization
+					</Button>
+					<Button
+						v-else
+						:disabled="loadingModeratorMonetization"
+						@click="updateMonetizationStatus('monetized')"
+					>
+						<ScaleIcon aria-hidden="true" />
+						Allow monetization
+					</Button>
 				</div>
 			</div>
 		</section>
@@ -311,12 +309,15 @@
 				Removes your project from Modrinth's servers and search. Clicking on this will delete your
 				project, so be extra careful!
 			</p>
-			<ButtonStyled color="red">
-				<button :disabled="!hasDeletePermission" @click="$refs.modal_confirm.show()">
-					<TrashIcon aria-hidden="true" />
-					Delete project
-				</button>
-			</ButtonStyled>
+			<Button
+				type="colored"
+				color="red"
+				:disabled="!hasDeletePermission"
+				@click="$refs.modal_confirm.show()"
+			>
+				<TrashIcon aria-hidden="true" />
+				Delete project
+			</Button>
 		</section>
 		<UnsavedChangesPopup
 			:original="original"
@@ -334,10 +335,11 @@ import { ImageIcon, ScaleIcon, TrashIcon, TriangleAlertIcon, UploadIcon } from '
 import { MIN_SUMMARY_CHARS } from '@modrinth/moderation'
 import {
 	Avatar,
-	ButtonStyled,
+	Button,
 	Combobox,
 	ConfirmLeaveModal,
 	ConfirmModal,
+	FileButton,
 	injectModrinthClient,
 	injectNotificationManager,
 	injectProjectPageContext,
@@ -349,7 +351,6 @@ import {
 } from '@modrinth/ui'
 import { fileIsValid, formatProjectStatus, formatProjectType } from '@modrinth/utils'
 
-import FileInput from '~/components/ui/FileInput.vue'
 import { useAuth } from '~/composables/auth.js'
 import { useFeatureFlags } from '~/composables/featureFlags.ts'
 
diff --git a/apps/frontend/src/pages/[type]/[project]/settings/license.vue b/apps/frontend/src/pages/[type]/[project]/settings/license.vue
index 34e2f3564d..b4de71aee8 100644
--- a/apps/frontend/src/pages/[type]/[project]/settings/license.vue
+++ b/apps/frontend/src/pages/[type]/[project]/settings/license.vue
@@ -28,12 +28,13 @@
 				</label>
 
 				<div class="w-1/2">
-					<DropdownSelect
-						v-model="current.license"
-						name="License selector"
-						:options="builtinLicenses"
-						:display-name="(chosen: BuiltinLicense) => chosen.friendly"
+					<Combobox
+						v-model="selectedLicense"
+						:options="licenseOptions"
+						:display-value="current.license.friendly || undefined"
 						placeholder="Select license..."
+						:disabled="!hasPermission"
+						trigger-type="base"
 					/>
 				</div>
 			</div>
@@ -155,24 +156,25 @@
 <script setup lang="ts">
 import {
 	Checkbox,
+	Combobox,
+	type ComboboxOption,
 	ConfirmLeaveModal,
-	DropdownSelect,
 	injectProjectPageContext,
 	StyledInput,
 	UnsavedChangesPopup,
 	usePageLeaveSafety,
 	useSavable,
 } from '@modrinth/ui'
-import {
-	type BuiltinLicense,
-	builtinLicenses,
-	formatProjectType,
-	TeamMemberPermission,
-} from '@modrinth/utils'
+import { builtinLicenses, formatProjectType, TeamMemberPermission } from '@modrinth/utils'
 import { computed } from 'vue'
 
 const { projectV2: project, currentMember, patchProject } = injectProjectPageContext()
 
+const licenseOptions: ComboboxOption<string>[] = builtinLicenses.map((license) => ({
+	value: license.short,
+	label: license.friendly,
+}))
+
 function getInitialLicense() {
 	const oldLicenseId = project.value.license.id
 	const trimmedLicenseId = oldLicenseId
@@ -224,6 +226,14 @@ const { saved, current, saving, hasChanges, reset, save } = useSavable(
 
 const { confirmLeaveModal } = usePageLeaveSafety(hasChanges)
 
+const selectedLicense = computed({
+	get: () => (current.value.license.friendly === 'Custom' ? '' : current.value.license.short),
+	set: (short: string) => {
+		const license = builtinLicenses.find((option) => option.short === short)
+		if (license) current.value.license = license
+	},
+})
+
 const hasPermission = computed(() => {
 	return (currentMember.value?.permissions ?? 0) & TeamMemberPermission.EDIT_DETAILS
 })
diff --git a/apps/frontend/src/pages/[type]/[project]/settings/links.vue b/apps/frontend/src/pages/[type]/[project]/settings/links.vue
index 090260ddef..46256f3fe3 100644
--- a/apps/frontend/src/pages/[type]/[project]/settings/links.vue
+++ b/apps/frontend/src/pages/[type]/[project]/settings/links.vue
@@ -105,12 +105,15 @@
 				/>
 			</div>
 			<div class="button-group">
-				<ButtonStyled color="brand">
-					<button :disabled="!hasServerChanges" @click="saveServerChanges()">
-						<SaveIcon />
-						Save changes
-					</button>
-				</ButtonStyled>
+				<Button
+					type="colored"
+					color="brand"
+					:disabled="!hasServerChanges"
+					@click="saveServerChanges()"
+				>
+					<SaveIcon />
+					Save changes
+				</Button>
 			</div>
 		</section>
 
@@ -258,26 +261,22 @@
 					:disabled="!hasPermission"
 					@update:model-value="updateDonationLinks"
 				/>
-				<DropdownSelect
+				<Combobox
 					v-model="donationLink.id"
-					name="Donation platform selector"
-					:options="tags.donationPlatforms.map((x) => x.short)"
-					:display-name="
-						(option) => tags.donationPlatforms.find((platform) => platform.short === option)?.name
-					"
+					:options="donationPlatformOptions"
 					placeholder="Select platform"
-					render-up
-					class="platform-selector"
+					:disabled="!hasPermission"
+					force-direction="up"
+					trigger-type="base"
+					class="platform-selector !w-80"
 					@update:model-value="updateDonationLinks"
 				/>
 			</div>
 			<div class="button-group">
-				<ButtonStyled color="brand">
-					<button :disabled="!hasChanges" @click="saveChanges()">
-						<SaveIcon />
-						Save changes
-					</button>
-				</ButtonStyled>
+				<Button type="colored" color="brand" :disabled="!hasChanges" @click="saveChanges()">
+					<SaveIcon />
+					Save changes
+				</Button>
 			</div>
 		</section>
 	</div>
@@ -287,8 +286,8 @@
 import { SaveIcon, TriangleAlertIcon } from '@modrinth/assets'
 import { commonLinkDomains, isCommonUrl, isDiscordUrl, isLinkShortener } from '@modrinth/moderation'
 import {
-	ButtonStyled,
-	DropdownSelect,
+	Button,
+	Combobox,
 	injectModrinthClient,
 	injectNotificationManager,
 	injectProjectPageContext,
@@ -297,6 +296,13 @@ import {
 
 const tags = useGeneratedState()
 
+const donationPlatformOptions = computed(() =>
+	tags.value.donationPlatforms.map((platform) => ({
+		value: platform.short,
+		label: platform.name,
+	})),
+)
+
 const {
 	projectV2: project,
 	projectV3,
@@ -553,10 +559,6 @@ function checkDifference(newLink, existingLink) {
 		flex-grow: 2;
 		max-width: 26rem;
 	}
-
-	:deep(.animated-dropdown .selected) {
-		height: 40px;
-	}
 }
 
 .button-group {
diff --git a/apps/frontend/src/pages/[type]/[project]/settings/members.vue b/apps/frontend/src/pages/[type]/[project]/settings/members.vue
index e6ed7a5a59..1ba42b6c1a 100644
--- a/apps/frontend/src/pages/[type]/[project]/settings/members.vue
+++ b/apps/frontend/src/pages/[type]/[project]/settings/members.vue
@@ -41,33 +41,33 @@
 					@keypress.enter="inviteTeamMember()"
 				/>
 				<label for="username" class="hidden">Username</label>
-				<ButtonStyled color="brand">
-					<button
-						:disabled="(currentMember?.permissions & MANAGE_INVITES) !== MANAGE_INVITES"
-						@click="inviteTeamMember()"
-					>
-						<UserPlusIcon />
-						Invite
-					</button>
-				</ButtonStyled>
+				<Button
+					type="colored"
+					color="brand"
+					:disabled="(currentMember?.permissions & MANAGE_INVITES) !== MANAGE_INVITES"
+					@click="inviteTeamMember()"
+				>
+					<UserPlusIcon />
+					Invite
+				</Button>
 			</div>
 			<div class="adjacent-input">
 				<span class="label">
 					<span class="label__title">Leave project</span>
 					<span class="label__description"> Remove yourself as a member of this project. </span>
 				</span>
-				<ButtonStyled color="red">
-					<button
-						:disabled="currentMember?.is_owner"
-						:title="
-							currentMember?.is_owner ? 'You cannot leave the project if you are the owner!' : ''
-						"
-						@click="leaveProject()"
-					>
-						<UserXIcon />
-						Leave project
-					</button>
-				</ButtonStyled>
+				<Button
+					type="colored"
+					color="red"
+					:disabled="currentMember?.is_owner"
+					:title="
+						currentMember?.is_owner ? 'You cannot leave the project if you are the owner!' : ''
+					"
+					@click="leaveProject()"
+				>
+					<UserXIcon />
+					Leave project
+				</Button>
 			</div>
 		</Card>
 		<div
@@ -90,18 +90,17 @@
 				<div class="side-buttons">
 					<Badge v-if="member.accepted" type="accepted" />
 					<Badge v-else type="pending" />
-					<ButtonStyled circular>
-						<button
-							class="dropdown-icon"
-							@click="
-								openTeamMembers.indexOf(member.user.id) === -1
-									? openTeamMembers.push(member.user.id)
-									: (openTeamMembers = openTeamMembers.filter((it) => it !== member.user.id))
-							"
-						>
-							<DropdownIcon />
-						</button>
-					</ButtonStyled>
+					<IconButton
+						label="Toggle details"
+						class="dropdown-icon"
+						@click="
+							openTeamMembers.indexOf(member.user.id) === -1
+								? openTeamMembers.push(member.user.id)
+								: (openTeamMembers = openTeamMembers.filter((it) => it !== member.user.id))
+						"
+					>
+						<DropdownIcon />
+					</IconButton>
 				</div>
 			</div>
 			<div class="content">
@@ -229,30 +228,32 @@
 					</div>
 				</template>
 				<div class="input-group">
-					<ButtonStyled color="brand">
-						<button
-							:disabled="(currentMember?.permissions & EDIT_MEMBER) !== EDIT_MEMBER"
-							@click="updateTeamMember(index)"
-						>
-							<SaveIcon />
-							Save changes
-						</button>
-					</ButtonStyled>
-					<ButtonStyled v-if="!member.is_owner" color="red">
-						<button
-							:disabled="(currentMember?.permissions & EDIT_MEMBER) !== EDIT_MEMBER"
-							@click="removeTeamMember(index)"
-						>
-							<UserXIcon />
-							Remove member
-						</button>
-					</ButtonStyled>
-					<ButtonStyled v-if="!member.is_owner && currentMember?.is_owner && member.accepted">
-						<button @click="openTransferModal(index, $event)">
-							<TransferIcon />
-							Transfer ownership
-						</button>
-					</ButtonStyled>
+					<Button
+						type="colored"
+						color="brand"
+						:disabled="(currentMember?.permissions & EDIT_MEMBER) !== EDIT_MEMBER"
+						@click="updateTeamMember(index)"
+					>
+						<SaveIcon />
+						Save changes
+					</Button>
+					<Button
+						v-if="!member.is_owner"
+						type="colored"
+						color="red"
+						:disabled="(currentMember?.permissions & EDIT_MEMBER) !== EDIT_MEMBER"
+						@click="removeTeamMember(index)"
+					>
+						<UserXIcon />
+						Remove member
+					</Button>
+					<Button
+						v-if="!member.is_owner && currentMember?.is_owner && member.accepted"
+						@click="openTransferModal(index, $event)"
+					>
+						<TransferIcon />
+						Transfer ownership
+					</Button>
 				</div>
 			</div>
 		</div>
@@ -308,19 +309,20 @@
 					force-direction="up"
 					:disabled="!currentMember?.is_owner || organizationOptions.length === 0"
 				/>
-				<ButtonStyled color="brand">
-					<button :disabled="!selectedOrganization" @click="openTransferToOrgModal($event)">
-						<CheckIcon />
-						<span class="w-max"> Transfer management </span>
-					</button>
-				</ButtonStyled>
+				<Button
+					type="colored"
+					color="brand"
+					:disabled="!selectedOrganization"
+					@click="openTransferToOrgModal($event)"
+				>
+					<CheckIcon />
+					<span class="w-max"> Transfer management </span>
+				</Button>
 			</div>
-			<ButtonStyled v-if="organization">
-				<button @click="$refs.modal_remove.show()">
-					<OrganizationIcon />
-					Remove from organization
-				</button>
-			</ButtonStyled>
+			<Button v-if="organization" @click="$refs.modal_remove.show()">
+				<OrganizationIcon />
+				Remove from organization
+			</Button>
 		</section>
 		<div
 			v-for="(member, index) in allOrgMembers"
@@ -342,18 +344,17 @@
 				<div class="side-buttons">
 					<Badge v-if="member.accepted" type="accepted" />
 					<Badge v-else type="pending" />
-					<ButtonStyled circular>
-						<button
-							class="dropdown-icon"
-							@click="
-								openTeamMembers.indexOf(member.user.id) === -1
-									? openTeamMembers.push(member.user.id)
-									: (openTeamMembers = openTeamMembers.filter((it) => it !== member.user.id))
-							"
-						>
-							<DropdownIcon />
-						</button>
-					</ButtonStyled>
+					<IconButton
+						label="Toggle details"
+						class="dropdown-icon"
+						@click="
+							openTeamMembers.indexOf(member.user.id) === -1
+								? openTeamMembers.push(member.user.id)
+								: (openTeamMembers = openTeamMembers.filter((it) => it !== member.user.id))
+						"
+					>
+						<DropdownIcon />
+					</IconButton>
 				</div>
 			</div>
 			<div class="content">
@@ -527,18 +528,18 @@
 
 					we don't allow clicking the button in that last case.
 					-->
-					<ButtonStyled color="brand">
-						<button
-							:disabled="
-								(currentMember?.permissions & EDIT_MEMBER) !== EDIT_MEMBER ||
-								(!allOrgMembers[index].oldOverride && !allOrgMembers[index].override)
-							"
-							@click="updateOrgMember(index)"
-						>
-							<SaveIcon />
-							Save changes
-						</button>
-					</ButtonStyled>
+					<Button
+						type="colored"
+						color="brand"
+						:disabled="
+							(currentMember?.permissions & EDIT_MEMBER) !== EDIT_MEMBER ||
+							(!allOrgMembers[index].oldOverride && !allOrgMembers[index].override)
+						"
+						@click="updateOrgMember(index)"
+					>
+						<SaveIcon />
+						Save changes
+					</Button>
 				</div>
 			</div>
 		</div>
@@ -560,11 +561,12 @@ import {
 import {
 	Avatar,
 	Badge,
-	ButtonStyled,
+	Button,
 	Card,
 	Checkbox,
 	Combobox,
 	ConfirmModal,
+	IconButton,
 	injectModrinthClient,
 	injectNotificationManager,
 	injectProjectPageContext,
diff --git a/apps/frontend/src/pages/[type]/[project]/settings/permissions.vue b/apps/frontend/src/pages/[type]/[project]/settings/permissions.vue
index 16997ddf54..5d6314022e 100644
--- a/apps/frontend/src/pages/[type]/[project]/settings/permissions.vue
+++ b/apps/frontend/src/pages/[type]/[project]/settings/permissions.vue
@@ -6,7 +6,6 @@ import {
 	ClockArrowDownIcon,
 	FoldVerticalIcon,
 	PauseIcon,
-	RightArrowIcon,
 	ScaleIcon,
 	SearchIcon,
 	SpinnerIcon,
@@ -14,9 +13,9 @@ import {
 	UnfoldVerticalIcon,
 	XCircleIcon,
 } from '@modrinth/assets'
+import { Button } from '@modrinth/ui'
 import {
 	Admonition,
-	ButtonStyled,
 	Combobox,
 	type ComboboxOption,
 	commonMessages,
@@ -495,13 +494,6 @@ function dismissInfoBanner() {
 				</nuxt-link>
 			</template>
 		</IntlFormatted>
-		<template v-if="false" #actions>
-			<div class="flex">
-				<ButtonStyled color="blue">
-					<a> {{ formatMessage(messages.learnMore) }} <RightArrowIcon /> </a>
-				</ButtonStyled>
-			</div>
-		</template>
 	</Admonition>
 	<template v-if="pending">
 		<div class="flex flex-col gap-3">
@@ -579,9 +571,10 @@ function dismissInfoBanner() {
 				<div>
 					<Combobox
 						v-model="currentSortType"
-						class="!w-full flex-grow sm:!w-[220px] sm:flex-grow-0 [&>span]:h-[40px]"
+						class="!w-full flex-grow sm:!w-[220px] sm:flex-grow-0"
 						:options="sortTypes"
 						:placeholder="formatMessage(commonMessages.sortByLabel)"
+						trigger-size="lg"
 					>
 						<template #selected>
 							<span class="flex flex-row gap-2 align-middle font-semibold">
@@ -606,31 +599,30 @@ function dismissInfoBanner() {
 						</template>
 					</Combobox>
 				</div>
-				<ButtonStyled>
-					<button type="button" class="!h-[40px]" @click="toggleAllCardsCollapsed">
-						<UnfoldVerticalIcon
-							v-if="allCardsCollapsed"
-							class="size-5 flex-shrink-0 text-secondary"
-						/>
-						<FoldVerticalIcon v-else class="size-5 flex-shrink-0 text-secondary" />
-						{{ expandCollapseAllLabel }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled v-if="isModerator" color="red" type="outlined">
-					<button
-						type="button"
-						class="!h-[40px]"
-						:disabled="deleteAllGroupsMutation.isPending.value"
-						@click="showDeleteAllGroupsConfirmation"
-					>
-						<SpinnerIcon
-							v-if="deleteAllGroupsMutation.isPending.value"
-							class="size-5 flex-shrink-0 animate-spin"
-						/>
-						<TrashIcon v-else class="size-5 flex-shrink-0" />
-						{{ formatMessage(messages.deleteAllGroups) }}
-					</button>
-				</ButtonStyled>
+				<Button native-type="button" size="lg" @click="toggleAllCardsCollapsed">
+					<UnfoldVerticalIcon
+						v-if="allCardsCollapsed"
+						class="size-5 flex-shrink-0 text-secondary"
+					/>
+					<FoldVerticalIcon v-else class="size-5 flex-shrink-0 text-secondary" />
+					{{ expandCollapseAllLabel }}
+				</Button>
+				<Button
+					v-if="isModerator"
+					type="outlined"
+					native-type="button"
+					size="lg"
+					class="!text-red !shadow-[inset_0_0_0_1px_var(--color-red)] [&>svg]:!text-red"
+					:disabled="deleteAllGroupsMutation.isPending.value"
+					@click="showDeleteAllGroupsConfirmation"
+				>
+					<SpinnerIcon
+						v-if="deleteAllGroupsMutation.isPending.value"
+						class="size-5 flex-shrink-0 animate-spin"
+					/>
+					<TrashIcon v-else class="size-5 flex-shrink-0" />
+					{{ formatMessage(messages.deleteAllGroups) }}
+				</Button>
 			</div>
 		</div>
 		<div v-if="isModerator" class="mt-4 flex flex-wrap items-center gap-3">
diff --git a/apps/frontend/src/pages/[type]/[project]/settings/server.vue b/apps/frontend/src/pages/[type]/[project]/settings/server.vue
index 4df46c828d..1d3509b2fa 100644
--- a/apps/frontend/src/pages/[type]/[project]/settings/server.vue
+++ b/apps/frontend/src/pages/[type]/[project]/settings/server.vue
@@ -79,22 +79,20 @@
 							'items-start': javaPingResult && !javaPingResult.online,
 						}"
 					>
-						<ButtonStyled
+						<IconButton
 							v-if="(javaAddress && javaPingResult) || javaPingLoading"
-							circular
-							type="transparent"
-							size="small"
-							color="oranges"
+							v-tooltip="formatMessage(messages.refreshPingTooltip)"
+							class="!size-6"
+							type="quiet"
+							color="orange"
+							size="xs"
+							:label="formatMessage(messages.refreshPingTooltip)"
+							:disabled="javaPingLoading"
+							@click="pingJavaServer"
 						>
-							<button
-								v-tooltip="formatMessage(messages.refreshPingTooltip)"
-								:disabled="javaPingLoading"
-								@click="pingJavaServer"
-							>
-								<SpinnerIcon v-if="javaPingLoading" class="animate-spin" />
-								<RefreshCwIcon v-else />
-							</button>
-						</ButtonStyled>
+							<SpinnerIcon v-if="javaPingLoading" class="animate-spin" />
+							<RefreshCwIcon v-else />
+						</IconButton>
 						<div
 							v-if="javaPingResult !== null && !javaPingLoading && javaPingResult.online"
 							class="mt-0.5 flex items-center gap-1.5 text-green"
@@ -170,10 +168,10 @@
 <script setup>
 import { InfoIcon, RefreshCwIcon, SpinnerIcon } from '@modrinth/assets'
 import {
-	ButtonStyled,
 	Combobox,
 	ConfirmLeaveModal,
 	defineMessages,
+	IconButton,
 	injectModrinthClient,
 	injectNotificationManager,
 	injectProjectPageContext,
diff --git a/apps/frontend/src/pages/[type]/[project]/settings/versions.vue b/apps/frontend/src/pages/[type]/[project]/settings/versions.vue
index a0f385a639..1343a79171 100644
--- a/apps/frontend/src/pages/[type]/[project]/settings/versions.vue
+++ b/apps/frontend/src/pages/[type]/[project]/settings/versions.vue
@@ -35,16 +35,16 @@
 		>
 			<template #actions>
 				<div class="flex">
-					<ButtonStyled color="orange">
-						<nuxt-link
-							:to="`/${project.project_type}/${
-								project.slug ? project.slug : project.id
-							}/settings/permissions`"
-						>
-							{{ formatMessage(commonProjectSettingsMessages.withheldVersionsWarningResolve) }}
-							<RightArrowIcon />
-						</nuxt-link>
-					</ButtonStyled>
+					<ButtonLink
+						type="colored"
+						color="orange"
+						:to="`/${project.project_type}/${
+							project.slug ? project.slug : project.id
+						}/settings/permissions`"
+					>
+						{{ formatMessage(commonProjectSettingsMessages.withheldVersionsWarningResolve) }}
+						<RightArrowIcon />
+					</ButtonLink>
 				</div>
 			</template>
 		</Admonition>
@@ -67,180 +67,189 @@
 			:open-modal="currentMember ? () => handleOpenCreateVersionModal() : undefined"
 		>
 			<template #actions="{ version }">
-				<ButtonStyled circular type="transparent">
-					<OverflowMenu
-						v-tooltip="formatMessage(messages.editVersionTooltip)"
-						class="hover:!bg-button-bg [&>svg]:!text-green"
-						:dropdown-id="`${baseDropdownId}-edit-${version.id}`"
-						:options="[
-							{
-								id: 'edit-metadata',
-								action: () => handleOpenEditVersionModal(version.id, project.id, 'metadata'),
+				<TeleportOverflowMenu
+					type="quiet"
+					:label="formatMessage(messages.editVersionTooltip)"
+					:tooltip="formatMessage(messages.editVersionTooltip)"
+					class="hover:!bg-button-bg [&>svg]:!text-green"
+					:options="[
+						{
+							id: 'edit-metadata',
+							label: formatMessage(messages.editMetadataOption),
+							action: () => handleOpenEditVersionModal(version.id, project.id, 'metadata'),
+						},
+						{
+							id: 'edit-details',
+							label: formatMessage(messages.editDetailsOption),
+							action: () => handleOpenEditVersionModal(version.id, project.id, 'add-details'),
+						},
+						{
+							id: 'edit-files',
+							label: formatMessage(messages.editFilesOption),
+							action: () => handleOpenEditVersionModal(version.id, project.id, 'add-files'),
+						},
+					]"
+				>
+					<EditIcon aria-hidden="true" />
+					<template #edit-files>
+						<FileIcon aria-hidden="true" />
+						{{ formatMessage(messages.editFilesOption) }}
+					</template>
+					<template #edit-details>
+						<InfoIcon aria-hidden="true" />
+						{{ formatMessage(messages.editDetailsOption) }}
+					</template>
+					<template #edit-metadata>
+						<BoxIcon aria-hidden="true" />
+						{{ formatMessage(messages.editMetadataOption) }}
+					</template>
+				</TeleportOverflowMenu>
+				<TeleportOverflowMenu
+					type="quiet"
+					:label="formatMessage(commonMessages.moreOptionsButton)"
+					:tooltip="formatMessage(commonMessages.moreOptionsButton)"
+					class="hover:!bg-button-bg"
+					:options="[
+						{
+							id: 'download',
+							label: formatMessage(commonMessages.downloadButton),
+							type: 'link',
+							tone: 'brand',
+							hoverFilled: true,
+							href: createDownloadUrl(version),
+							download: getPrimaryFile(version)?.filename,
+							shown: !!getPrimaryFile(version),
+						},
+						{
+							id: 'new-tab',
+							label: formatMessage(messages.openInNewTabOption),
+							type: 'link',
+							href: `/${project.project_type}/${
+								project.slug ? project.slug : project.id
+							}/version/${encodeURI(version.displayUrlEnding ? version.displayUrlEnding : version.id)}`,
+							target: '_blank',
+						},
+						{
+							id: 'copy-link',
+							label: formatMessage(messages.copyLinkOption),
+							action: () =>
+								copyToClipboard(
+									`https://modrinth.com/${project.project_type}/${
+										project.slug ? project.slug : project.id
+									}/version/${encodeURI(version.displayUrlEnding ? version.displayUrlEnding : version.id)}`,
+								),
+						},
+						{
+							id: 'share',
+							label: formatMessage(messages.shareOption),
+							action: () => {},
+							shown: false,
+						},
+						{
+							id: 'report',
+							label: formatMessage(commonMessages.reportButton),
+							tone: 'red',
+							hoverFilled: true,
+							action: () =>
+								auth.user ? reportVersion(version.id) : navigateTo(getSignInRouteObj(route)),
+							shown: !currentMember,
+						},
+						{ type: 'divider', shown: !!currentMember || flags.developerMode },
+						{
+							id: 'copy-id',
+							label: formatMessage(messages.copyIdOption),
+							action: () => {
+								copyToClipboard(version.id)
 							},
-							{
-								id: 'edit-details',
-								action: () => handleOpenEditVersionModal(version.id, project.id, 'add-details'),
+							shown: !!currentMember || flags.developerMode,
+						},
+						{
+							id: 'copy-maven',
+							label: formatMessage(messages.copyMavenCoordinatesOption),
+							action: () => {
+								copyToClipboard(`maven.modrinth:${project.slug}:${version.id}`)
 							},
-							{
-								id: 'edit-files',
-								action: () => handleOpenEditVersionModal(version.id, project.id, 'add-files'),
+							shown: flags.developerMode,
+						},
+						{ type: 'divider', shown: !!currentMember },
+						{
+							id: 'edit-details',
+							label: formatMessage(messages.editDetailsOption),
+							action: () => handleOpenEditVersionModal(version.id, project.id, 'add-details'),
+							shown: !!currentMember,
+						},
+						{
+							id: 'edit-metadata',
+							label: formatMessage(messages.editMetadataOption),
+							action: () => handleOpenEditVersionModal(version.id, project.id, 'metadata'),
+							shown: !!currentMember,
+						},
+						{
+							id: 'edit-files',
+							label: formatMessage(messages.editFilesOption),
+							action: () => handleOpenEditVersionModal(version.id, project.id, 'add-files'),
+							shown: !!currentMember,
+						},
+						{
+							id: 'delete',
+							label: formatMessage(commonMessages.deleteLabel),
+							tone: 'red',
+							hoverFilled: true,
+							action: () => {
+								selectedVersion = version.id
+								deleteVersionModal?.show()
 							},
-						]"
-						:aria-label="formatMessage(messages.editVersionTooltip)"
-					>
-						<EditIcon aria-hidden="true" />
-						<template #edit-files>
-							<FileIcon aria-hidden="true" />
-							{{ formatMessage(messages.editFilesOption) }}
-						</template>
-						<template #edit-details>
-							<InfoIcon aria-hidden="true" />
-							{{ formatMessage(messages.editDetailsOption) }}
-						</template>
-						<template #edit-metadata>
-							<BoxIcon aria-hidden="true" />
-							{{ formatMessage(messages.editMetadataOption) }}
-						</template>
-					</OverflowMenu>
-				</ButtonStyled>
-				<ButtonStyled circular type="transparent">
-					<OverflowMenu
-						v-tooltip="formatMessage(commonMessages.moreOptionsButton)"
-						class="hover:!bg-button-bg"
-						:dropdown-id="`${baseDropdownId}-${version.id}`"
-						:options="[
-							{
-								id: 'download',
-								color: 'primary',
-								hoverFilled: true,
-								link: createDownloadUrl(version),
-								download: getPrimaryFile(version)?.filename,
-								action: () => {
-									emit('onDownload')
-								},
-								shown: !!getPrimaryFile(version),
-							},
-							{
-								id: 'new-tab',
-								action: () => {},
-								link: `/${project.project_type}/${
-									project.slug ? project.slug : project.id
-								}/version/${encodeURI(version.displayUrlEnding ? version.displayUrlEnding : version.id)}`,
-								external: true,
-							},
-							{
-								id: 'copy-link',
-								action: () =>
-									copyToClipboard(
-										`https://modrinth.com/${project.project_type}/${
-											project.slug ? project.slug : project.id
-										}/version/${encodeURI(version.displayUrlEnding ? version.displayUrlEnding : version.id)}`,
-									),
-							},
-							{
-								id: 'share',
-								action: () => {},
-								shown: false,
-							},
-							{
-								id: 'report',
-								color: 'red',
-								hoverFilled: true,
-								action: () =>
-									auth.user ? reportVersion(version.id) : navigateTo(getSignInRouteObj(route)),
-								shown: !currentMember,
-							},
-							{ divider: true, shown: !!currentMember || flags.developerMode },
-							{
-								id: 'copy-id',
-								action: () => {
-									copyToClipboard(version.id)
-								},
-								shown: !!currentMember || flags.developerMode,
-							},
-							{
-								id: 'copy-maven',
-								action: () => {
-									copyToClipboard(`maven.modrinth:${project.slug}:${version.id}`)
-								},
-								shown: flags.developerMode,
-							},
-							{ divider: true, shown: !!currentMember },
-							{
-								id: 'edit-details',
-								action: () => handleOpenEditVersionModal(version.id, project.id, 'add-details'),
-								shown: !!currentMember,
-							},
-							{
-								id: 'edit-metadata',
-								action: () => handleOpenEditVersionModal(version.id, project.id, 'metadata'),
-								shown: !!currentMember,
-							},
-							{
-								id: 'edit-files',
-								action: () => handleOpenEditVersionModal(version.id, project.id, 'add-files'),
-								shown: !!currentMember,
-							},
-							{
-								id: 'delete',
-								color: 'red',
-								hoverFilled: true,
-								action: () => {
-									selectedVersion = version.id
-									deleteVersionModal?.show()
-								},
-								shown: !!currentMember,
-							},
-						]"
-						:aria-label="formatMessage(commonMessages.moreOptionsButton)"
-					>
-						<MoreVerticalIcon aria-hidden="true" />
-						<template #download>
-							<DownloadIcon aria-hidden="true" />
-							{{ formatMessage(commonMessages.downloadButton) }}
-						</template>
-						<template #new-tab>
-							<ExternalIcon aria-hidden="true" />
-							{{ formatMessage(messages.openInNewTabOption) }}
-						</template>
-						<template #copy-link>
-							<LinkIcon aria-hidden="true" />
-							{{ formatMessage(messages.copyLinkOption) }}
-						</template>
-						<template #share>
-							<ShareIcon aria-hidden="true" />
-							{{ formatMessage(messages.shareOption) }}
-						</template>
-						<template #report>
-							<ReportIcon aria-hidden="true" />
-							{{ formatMessage(commonMessages.reportButton) }}
-						</template>
-						<template #edit-files>
-							<FileIcon aria-hidden="true" />
-							{{ formatMessage(messages.editFilesOption) }}
-						</template>
-						<template #edit-details>
-							<InfoIcon aria-hidden="true" />
-							{{ formatMessage(messages.editDetailsOption) }}
-						</template>
-						<template #edit-metadata>
-							<BoxIcon aria-hidden="true" />
-							{{ formatMessage(messages.editMetadataOption) }}
-						</template>
-						<template #delete>
-							<TrashIcon aria-hidden="true" />
-							{{ formatMessage(commonMessages.deleteLabel) }}
-						</template>
-						<template #copy-id>
-							<ClipboardCopyIcon aria-hidden="true" />
-							{{ formatMessage(messages.copyIdOption) }}
-						</template>
-						<template #copy-maven>
-							<ClipboardCopyIcon aria-hidden="true" />
-							{{ formatMessage(messages.copyMavenCoordinatesOption) }}
-						</template>
-					</OverflowMenu>
-				</ButtonStyled>
+							shown: !!currentMember,
+						},
+					]"
+					@select="$event.id === 'download' && emit('onDownload')"
+				>
+					<MoreVerticalIcon aria-hidden="true" />
+					<template #download>
+						<DownloadIcon aria-hidden="true" />
+						{{ formatMessage(commonMessages.downloadButton) }}
+					</template>
+					<template #new-tab>
+						<ExternalIcon aria-hidden="true" />
+						{{ formatMessage(messages.openInNewTabOption) }}
+					</template>
+					<template #copy-link>
+						<LinkIcon aria-hidden="true" />
+						{{ formatMessage(messages.copyLinkOption) }}
+					</template>
+					<template #share>
+						<ShareIcon aria-hidden="true" />
+						{{ formatMessage(messages.shareOption) }}
+					</template>
+					<template #report>
+						<ReportIcon aria-hidden="true" />
+						{{ formatMessage(commonMessages.reportButton) }}
+					</template>
+					<template #edit-files>
+						<FileIcon aria-hidden="true" />
+						{{ formatMessage(messages.editFilesOption) }}
+					</template>
+					<template #edit-details>
+						<InfoIcon aria-hidden="true" />
+						{{ formatMessage(messages.editDetailsOption) }}
+					</template>
+					<template #edit-metadata>
+						<BoxIcon aria-hidden="true" />
+						{{ formatMessage(messages.editMetadataOption) }}
+					</template>
+					<template #delete>
+						<TrashIcon aria-hidden="true" />
+						{{ formatMessage(commonMessages.deleteLabel) }}
+					</template>
+					<template #copy-id>
+						<ClipboardCopyIcon aria-hidden="true" />
+						{{ formatMessage(messages.copyIdOption) }}
+					</template>
+					<template #copy-maven>
+						<ClipboardCopyIcon aria-hidden="true" />
+						{{ formatMessage(messages.copyMavenCoordinatesOption) }}
+					</template>
+				</TeleportOverflowMenu>
 			</template>
 		</ProjectPageVersions>
 
@@ -304,11 +313,13 @@
 					<div class="text-2xl font-semibold text-contrast">No versions created</div>
 					<div>Create your first project version.</div>
 					<br />
-					<ButtonStyled color="green">
-						<button @click="() => createProjectVersionModal?.openCreateVersionModal()">
-							<PlusIcon /> Create version
-						</button>
-					</ButtonStyled>
+					<Button
+						type="colored"
+						color="green"
+						@click="() => createProjectVersionModal?.openCreateVersionModal()"
+					>
+						<PlusIcon /> Create version
+					</Button>
 				</div>
 			</div>
 		</template>
@@ -335,7 +346,8 @@ import {
 } from '@modrinth/assets'
 import {
 	Admonition,
-	ButtonStyled,
+	Button,
+	ButtonLink,
 	commonMessages,
 	commonProjectSettingsMessages,
 	ConfirmModal,
@@ -343,8 +355,8 @@ import {
 	injectModrinthClient,
 	injectNotificationManager,
 	injectProjectPageContext,
-	OverflowMenu,
 	ProjectPageVersions,
+	TeleportOverflowMenu,
 	useVIntl,
 } from '@modrinth/ui'
 import { useTemplateRef, watch } from 'vue'
diff --git a/apps/frontend/src/pages/[type]/[project]/version/[version].vue b/apps/frontend/src/pages/[type]/[project]/version/[version].vue
index 5facef220d..25fd9b2851 100644
--- a/apps/frontend/src/pages/[type]/[project]/version/[version].vue
+++ b/apps/frontend/src/pages/[type]/[project]/version/[version].vue
@@ -65,18 +65,19 @@
 				</div>
 
 				<div class="ml-auto mt-4 flex items-center gap-2">
-					<ButtonStyled type="outlined">
-						<button @click="packageModal?.hide()">
-							<XIcon aria-hidden="true" />
-							{{ formatMessage(commonMessages.cancelButton) }}
-						</button>
-					</ButtonStyled>
-					<ButtonStyled color="brand">
-						<button :disabled="packageLoaders.length === 0" @click="createDataPackVersionHandler">
-							{{ formatMessage(messages.packageDataPack) }}
-							<RightArrowIcon aria-hidden="true" />
-						</button>
-					</ButtonStyled>
+					<Button type="outlined" @click="packageModal?.hide()">
+						<XIcon aria-hidden="true" />
+						{{ formatMessage(commonMessages.cancelButton) }}
+					</Button>
+					<Button
+						type="colored"
+						color="brand"
+						:disabled="packageLoaders.length === 0"
+						@click="createDataPackVersionHandler"
+					>
+						{{ formatMessage(messages.packageDataPack) }}
+						<RightArrowIcon aria-hidden="true" />
+					</Button>
 				</div>
 			</div>
 		</NewModal>
@@ -104,16 +105,16 @@
 				>
 					<template #actions>
 						<div class="flex">
-							<ButtonStyled color="orange">
-								<nuxt-link
-									:to="`/${project.project_type}/${
-										project.slug ? project.slug : project.id
-									}/settings/permissions`"
-								>
-									{{ formatMessage(commonProjectSettingsMessages.withheldVersionsWarningResolve) }}
-									<RightArrowIcon />
-								</nuxt-link>
-							</ButtonStyled>
+							<ButtonLink
+								type="colored"
+								color="orange"
+								:to="`/${project.project_type}/${
+									project.slug ? project.slug : project.id
+								}/settings/permissions`"
+							>
+								{{ formatMessage(commonProjectSettingsMessages.withheldVersionsWarningResolve) }}
+								<RightArrowIcon />
+							</ButtonLink>
 						</div>
 					</template>
 				</Admonition>
@@ -127,23 +128,23 @@
 					class="mb-4"
 				>
 					<template #headerActions="{ primaryFile, promotedFiles }">
-						<ButtonStyled color="brand">
-							<a
-								v-tooltip="
-									primaryFile?.url
-										? primaryFile.filename + ' (' + formatBytes(primaryFile.size) + ')'
-										: formatMessage(messages.noPrimaryFile)
-								"
-								:href="decoratedPrimaryFileUrl"
-								:download="primaryFile?.filename"
-								:disabled="primaryFile?.url === undefined"
-								@click="emit('onDownload')"
-							>
-								<DownloadIcon aria-hidden="true" />
-								{{ formatMessage(commonMessages.downloadButton) }}
-							</a>
-						</ButtonStyled>
-						<ButtonStyled
+						<ButtonLink
+							v-tooltip="
+								primaryFile?.url
+									? primaryFile.filename + ' (' + formatBytes(primaryFile.size) + ')'
+									: formatMessage(messages.noPrimaryFile)
+							"
+							type="colored"
+							color="brand"
+							:href="decoratedPrimaryFileUrl"
+							:download="primaryFile?.filename"
+							:disabled="primaryFile?.url === undefined"
+							@click="emit('onDownload')"
+						>
+							<DownloadIcon aria-hidden="true" />
+							{{ formatMessage(commonMessages.downloadButton) }}
+						</ButtonLink>
+						<ButtonLink
 							v-for="file in promotedFiles.filter(
 								(x) =>
 									!!x &&
@@ -151,235 +152,237 @@
 										x.file_type === 'optional-resource-pack'),
 							)"
 							:key="`promoted-file-${file.hashes.sha1}`"
+							v-tooltip="file.filename + ' (' + formatBytes(file.size) + ')'"
+							:href="
+								createProjectDownloadUrl(file.url, {
+									reason: 'dependency',
+								})
+							"
+							:download="primaryFile?.filename"
+							:disabled="primaryFile?.url === undefined"
+							@click="emit('onDownload')"
 						>
-							<a
-								v-tooltip="file.filename + ' (' + formatBytes(file.size) + ')'"
-								:href="
-									createProjectDownloadUrl(file.url, {
-										reason: 'dependency',
-									})
-								"
-								:download="primaryFile?.filename"
-								:disabled="primaryFile?.url === undefined"
-								@click="emit('onDownload')"
-							>
-								<DownloadIcon aria-hidden="true" />
-								<template v-if="file.file_type === 'required-resource-pack'">
-									{{ formatMessage(messages.requiredResourcePack) }}
-								</template>
-								<template v-else-if="file.file_type === 'optional-resource-pack'">
-									{{ formatMessage(messages.optionalResourcePack) }}
-								</template>
-							</a>
-						</ButtonStyled>
+							<DownloadIcon aria-hidden="true" />
+							<template v-if="file.file_type === 'required-resource-pack'">
+								{{ formatMessage(messages.requiredResourcePack) }}
+							</template>
+							<template v-else-if="file.file_type === 'optional-resource-pack'">
+								{{ formatMessage(messages.optionalResourcePack) }}
+							</template>
+						</ButtonLink>
 						<template v-if="currentMember">
-							<ButtonStyled
+							<Button
 								v-if="
 									version.loaders.some((x: string) => tags.loaderData.dataPackLoaders.includes(x))
 								"
+								@click="packageModal?.show()"
 							>
-								<button @click="packageModal?.show()">
-									<PackageClosedIcon aria-hidden="true" />
-									{{ formatMessage(messages.packageAsMod) }}
-								</button>
-							</ButtonStyled>
-							<ButtonStyled>
-								<OverflowMenu
-									:dropdown-id="`${baseId}-edit-overflow`"
-									class="btn-dropdown-animation"
-									:options="[
-										{
-											id: 'edit-metadata',
-											action: () => handleOpenEditVersionModal(version!.id, project.id, 'metadata'),
-										},
-										{
-											id: 'edit-details',
-											action: () =>
-												handleOpenEditVersionModal(version!.id, project.id, 'add-details'),
-										},
-										{
-											id: 'edit-files',
-											action: () =>
-												handleOpenEditVersionModal(version!.id, project.id, 'add-files'),
-										},
-										{
-											id: 'delete',
-											color: 'red',
-											action: () => confirmModal?.show(),
-										},
-									]"
-								>
-									<SettingsIcon aria-hidden="true" /> {{ formatMessage(messages.edit) }}
-									<DropdownIcon class="h-5 w-5 text-secondary" />
-									<template #edit-metadata>
-										<BoxIcon aria-hidden="true" />
-										{{ formatMessage(messages.editMetadata) }}
-									</template>
-									<template #edit-details>
-										<InfoIcon aria-hidden="true" />
-										{{ formatMessage(messages.editDetails) }}
-									</template>
-									<template #edit-files>
-										<FileIcon aria-hidden="true" />
-										{{ formatMessage(messages.editFiles) }}
-									</template>
-									<template #delete>
-										<TrashIcon aria-hidden="true" />
-										{{ formatMessage(commonMessages.deleteLabel) }}
-									</template>
-								</OverflowMenu>
-							</ButtonStyled>
-						</template>
-						<ButtonStyled type="outlined" circular>
-							<OverflowMenu
-								v-tooltip="formatMessage(commonMessages.moreOptionsButton)"
+								<PackageClosedIcon aria-hidden="true" />
+								{{ formatMessage(messages.packageAsMod) }}
+							</Button>
+							<TeleportOverflowMenu
+								:label="formatMessage(messages.edit)"
+								:tooltip="formatMessage(messages.edit)"
 								:options="[
 									{
-										id: 'report',
-										color: 'red',
-										action: () =>
-											auth.user ? reportVersion(version!.id) : navigateTo(signInRouteObj),
-									},
-									{ divider: true, shown: flags.developerMode },
-									{
-										id: 'copy-id',
-										action: () => copyToClipboard(version!.id),
-										shown: flags.developerMode,
+										id: 'edit-metadata',
+										label: formatMessage(messages.editMetadata),
+										action: () => handleOpenEditVersionModal(version!.id, project.id, 'metadata'),
 									},
 									{
-										id: 'copy-permalink',
+										id: 'edit-details',
+										label: formatMessage(messages.editDetails),
 										action: () =>
-											copyToClipboard(
-												`https://modrinth.com/project/${project.id}/version/${version!.id}`,
-											),
-										shown: flags.developerMode,
+											handleOpenEditVersionModal(version!.id, project.id, 'add-details'),
+									},
+									{
+										id: 'edit-files',
+										label: formatMessage(messages.editFiles),
+										action: () => handleOpenEditVersionModal(version!.id, project.id, 'add-files'),
+									},
+									{
+										id: 'delete',
+										label: formatMessage(commonMessages.deleteLabel),
+										tone: 'red',
+										action: () => confirmModal?.show(),
 									},
 								]"
 							>
-								<MoreVerticalIcon />
-								<template #report>
-									<ReportIcon aria-hidden="true" />
-									{{ formatMessage(commonMessages.reportButton) }}
+								<SettingsIcon aria-hidden="true" />
+								<template #edit-metadata>
+									<BoxIcon aria-hidden="true" />
+									{{ formatMessage(messages.editMetadata) }}
 								</template>
-								<template #copy-link>
-									<ReportIcon aria-hidden="true" />
-									{{ formatMessage(commonMessages.reportButton) }}
+								<template #edit-details>
+									<InfoIcon aria-hidden="true" />
+									{{ formatMessage(messages.editDetails) }}
 								</template>
-								<template #copy-id>
-									<ClipboardCopyIcon aria-hidden="true" />
-									{{ formatMessage(commonMessages.copyIdButton) }}
+								<template #edit-files>
+									<FileIcon aria-hidden="true" />
+									{{ formatMessage(messages.editFiles) }}
 								</template>
-								<template #copy-permalink>
-									<ClipboardCopyIcon aria-hidden="true" />
-									{{ formatMessage(commonMessages.copyPermalinkButton) }}
+								<template #delete>
+									<TrashIcon aria-hidden="true" />
+									{{ formatMessage(commonMessages.deleteLabel) }}
 								</template>
-							</OverflowMenu>
-						</ButtonStyled>
+							</TeleportOverflowMenu>
+						</template>
+						<TeleportOverflowMenu
+							type="outlined"
+							:label="formatMessage(commonMessages.moreOptionsButton)"
+							:tooltip="formatMessage(commonMessages.moreOptionsButton)"
+							:options="[
+								{
+									id: 'report',
+									label: formatMessage(commonMessages.reportButton),
+									tone: 'red',
+									action: () =>
+										auth.user ? reportVersion(version!.id) : navigateTo(signInRouteObj),
+								},
+								{ type: 'divider', shown: flags.developerMode },
+								{
+									id: 'copy-id',
+									label: formatMessage(commonMessages.copyIdButton),
+									action: () => copyToClipboard(version!.id),
+									shown: flags.developerMode,
+								},
+								{
+									id: 'copy-permalink',
+									label: formatMessage(commonMessages.copyPermalinkButton),
+									action: () =>
+										copyToClipboard(
+											`https://modrinth.com/project/${project.id}/version/${version!.id}`,
+										),
+									shown: flags.developerMode,
+								},
+							]"
+						>
+							<MoreVerticalIcon />
+							<template #report>
+								<ReportIcon aria-hidden="true" />
+								{{ formatMessage(commonMessages.reportButton) }}
+							</template>
+							<template #copy-link>
+								<ReportIcon aria-hidden="true" />
+								{{ formatMessage(commonMessages.reportButton) }}
+							</template>
+							<template #copy-id>
+								<ClipboardCopyIcon aria-hidden="true" />
+								{{ formatMessage(commonMessages.copyIdButton) }}
+							</template>
+							<template #copy-permalink>
+								<ClipboardCopyIcon aria-hidden="true" />
+								{{ formatMessage(commonMessages.copyPermalinkButton) }}
+							</template>
+						</TeleportOverflowMenu>
 					</template>
 					<template #supplementaryResourceActions="{ file }">
-						<ButtonStyled>
-							<a
-								:href="decorateDownloadUrl(file.url)"
-								:title="`Download ${file.filename}`"
-								:download="file.filename"
-								tabindex="0"
-							>
-								<DownloadIcon aria-hidden="true" />
-								{{ formatMessage(commonMessages.downloadButton) }}
-							</a>
-						</ButtonStyled>
-						<ButtonStyled type="outlined" circular>
-							<OverflowMenu
-								:tooltip="formatMessage(commonMessages.moreOptionsButton)"
-								:options="[
-									{
-										id: 'copy-sha1',
-										action: () => copyFileHash(file, 'sha1'),
-									},
-									{
-										id: 'copy-sha512',
-										action: () => copyFileHash(file, 'sha512'),
-									},
-								]"
-								:dropdown-id="`${baseId}-supplementary-resource-actions`"
-							>
-								<MoreVerticalIcon aria-hidden="true" />
-								<template #copy-sha1>
-									<CopyIcon aria-hidden="true" />
-									{{ formatMessage(messages.copySha1) }}
-								</template>
-								<template #copy-sha512>
-									<CopyIcon aria-hidden="true" />
-									{{ formatMessage(messages.copySha512) }}
-								</template>
-							</OverflowMenu>
-						</ButtonStyled>
+						<ButtonLink
+							:href="decorateDownloadUrl(file.url)"
+							:title="`Download ${file.filename}`"
+							:download="file.filename"
+							tabindex="0"
+						>
+							<DownloadIcon aria-hidden="true" />
+							{{ formatMessage(commonMessages.downloadButton) }}
+						</ButtonLink>
+						<TeleportOverflowMenu
+							type="outlined"
+							:label="formatMessage(commonMessages.moreOptionsButton)"
+							:tooltip="formatMessage(commonMessages.moreOptionsButton)"
+							:options="[
+								{
+									id: 'copy-sha1',
+									label: formatMessage(messages.copySha1),
+									action: () => copyFileHash(file, 'sha1'),
+								},
+								{
+									id: 'copy-sha512',
+									label: formatMessage(messages.copySha512),
+									action: () => copyFileHash(file, 'sha512'),
+								},
+							]"
+						>
+							<MoreVerticalIcon aria-hidden="true" />
+							<template #copy-sha1>
+								<CopyIcon aria-hidden="true" />
+								{{ formatMessage(messages.copySha1) }}
+							</template>
+							<template #copy-sha512>
+								<CopyIcon aria-hidden="true" />
+								{{ formatMessage(messages.copySha512) }}
+							</template>
+						</TeleportOverflowMenu>
 					</template>
 					<template #dependencyActions="{ dependency }">
-						<ButtonStyled circular>
-							<nuxt-link
-								v-if="
-									createDependencyLink({
-										project: dependency.project,
-										version: dependency.version ?? getDependencyVersion(dependency.dependency),
-									})
-								"
-								v-tooltip="
-									formatMessage(
-										(dependency.version ?? getDependencyVersion(dependency.dependency))
-											? messages.viewVersion
-											: messages.viewProject,
-									)
-								"
-								:to="
-									createDependencyLink({
-										project: dependency.project,
-										version: dependency.version ?? getDependencyVersion(dependency.dependency),
-									})
-								"
-								target="_blank"
-							>
-								<ExternalIcon />
-							</nuxt-link>
-						</ButtonStyled>
-						<ButtonStyled circular color="brand" color-fill="text">
-							<a
-								v-if="
-									(dependency.version ?? getDependencyVersion(dependency.dependency)) &&
-									dependency.dependency.dependency_type !== 'incompatible'
-								"
-								v-tooltip="
-									getDependencyPrimaryFileTooltip(
-										dependency.version ?? getDependencyVersion(dependency.dependency),
-									)
-								"
-								:href="
-									getDependencyDownloadUrl(
-										dependency.version ?? getDependencyVersion(dependency.dependency),
-									)
-								"
-								:download="
-									getDependencyPrimaryFile(
-										dependency.version ?? getDependencyVersion(dependency.dependency),
-									)?.filename
-								"
-								:disabled="
-									!getDependencyPrimaryFile(
-										dependency.version ?? getDependencyVersion(dependency.dependency),
-									)?.url
-								"
-							>
-								<DownloadIcon />
-							</a>
-							<button
-								v-else-if="dependency.project"
-								v-tooltip="formatMessage(messages.downloadProject)"
-								:aria-label="formatMessage(messages.downloadProject)"
-								@click="openDependencyDownloadModal(dependency.project, $event)"
-							>
-								<DownloadIcon />
-							</button>
-						</ButtonStyled>
+						<ButtonLink
+							v-if="
+								createDependencyLink({
+									project: dependency.project,
+									version: dependency.version ?? getDependencyVersion(dependency.dependency),
+								})
+							"
+							v-tooltip="
+								formatMessage(
+									(dependency.version ?? getDependencyVersion(dependency.dependency))
+										? messages.viewVersion
+										: messages.viewProject,
+								)
+							"
+							:to="
+								createDependencyLink({
+									project: dependency.project,
+									version: dependency.version ?? getDependencyVersion(dependency.dependency),
+								})
+							"
+							target="_blank"
+							class="!w-9 !rounded-full !px-0"
+						>
+							<ExternalIcon />
+						</ButtonLink>
+						<ButtonLink
+							v-if="
+								(dependency.version ?? getDependencyVersion(dependency.dependency)) &&
+								dependency.dependency.dependency_type !== 'incompatible'
+							"
+							v-tooltip="
+								getDependencyPrimaryFileTooltip(
+									dependency.version ?? getDependencyVersion(dependency.dependency),
+								)
+							"
+							:href="
+								getDependencyDownloadUrl(
+									dependency.version ?? getDependencyVersion(dependency.dependency),
+								)
+							"
+							:download="
+								getDependencyPrimaryFile(
+									dependency.version ?? getDependencyVersion(dependency.dependency),
+								)?.filename
+							"
+							:disabled="
+								!getDependencyPrimaryFile(
+									dependency.version ?? getDependencyVersion(dependency.dependency),
+								)?.url
+							"
+							:aria-label="
+								getDependencyPrimaryFileTooltip(
+									dependency.version ?? getDependencyVersion(dependency.dependency),
+								)
+							"
+							class="!w-9 !rounded-full !px-0 !text-brand [&>svg]:!text-brand"
+						>
+							<DownloadIcon />
+						</ButtonLink>
+						<IconButton
+							v-else-if="dependency.project"
+							v-tooltip="formatMessage(messages.downloadProject)"
+							:label="formatMessage(messages.downloadProject)"
+							class="!text-brand [&>svg]:!text-brand"
+							@click="openDependencyDownloadModal(dependency.project, $event)"
+						>
+							<DownloadIcon />
+						</IconButton>
 					</template>
 				</VersionPage>
 				<section
@@ -501,7 +504,8 @@ import {
 } from '@modrinth/assets'
 import {
 	Admonition,
-	ButtonStyled,
+	Button,
+	ButtonLink,
 	Collapsible,
 	commonMessages,
 	commonProjectSettingsMessages,
@@ -509,13 +513,14 @@ import {
 	CopyCode,
 	defineMessages,
 	formatLoader,
+	IconButton,
 	injectModrinthClient,
 	injectNotificationManager,
 	injectProjectPageContext,
 	IntlFormatted,
 	MultiSelect,
 	NewModal,
-	OverflowMenu,
+	TeleportOverflowMenu,
 	useFormatBytes,
 	useFormatDateTime,
 	useVIntl,
@@ -577,7 +582,6 @@ const devInfoCollapsed = computed({
 	},
 })
 
-const baseId = useId()
 const signInRouteObj = computed(() => getSignInRouteObj(route))
 
 const versionRouteParam = computed(() => route.params.version as string)
diff --git a/apps/frontend/src/pages/[type]/[project]/versions.vue b/apps/frontend/src/pages/[type]/[project]/versions.vue
index 7770d541b6..48bec39fc7 100644
--- a/apps/frontend/src/pages/[type]/[project]/versions.vue
+++ b/apps/frontend/src/pages/[type]/[project]/versions.vue
@@ -41,192 +41,202 @@
 				:open-modal="currentMember ? () => handleOpenCreateVersionModal() : undefined"
 			>
 				<template #actions="{ version }">
-					<ButtonStyled v-if="getPrimaryFile(version)" circular type="transparent">
-						<a
-							v-tooltip="`Download`"
-							:href="createDownloadUrl(version)"
-							:download="getPrimaryFile(version)?.filename"
-							class="hover:!bg-button-bg [&>svg]:!text-green"
-							aria-label="Download"
-							@click="emit('onDownload')"
-						>
+					<ButtonLink
+						v-if="getPrimaryFile(version)"
+						v-tooltip="`Download`"
+						type="quiet"
+						:href="createDownloadUrl(version)"
+						:download="getPrimaryFile(version)?.filename"
+						class="!w-9 !rounded-full !px-0 hover:!bg-button-bg [&>svg]:!text-green"
+						aria-label="Download"
+						@click="emit('onDownload')"
+					>
+						<DownloadIcon aria-hidden="true" />
+					</ButtonLink>
+					<TeleportOverflowMenu
+						v-if="currentMember"
+						type="quiet"
+						label="Edit version"
+						tooltip="Edit version"
+						class="hover:!bg-button-bg"
+						:options="[
+							{
+								id: 'edit-metadata',
+								label: 'Edit metadata',
+								action: () => handleOpenEditVersionModal(version.id, project.id, 'metadata'),
+							},
+							{
+								id: 'edit-details',
+								label: 'Edit details',
+								action: () => handleOpenEditVersionModal(version.id, project.id, 'add-details'),
+							},
+							{
+								id: 'edit-files',
+								label: 'Edit files',
+								action: () => handleOpenEditVersionModal(version.id, project.id, 'add-files'),
+							},
+						]"
+					>
+						<EditIcon aria-hidden="true" />
+						<template #edit-files>
+							<FileIcon aria-hidden="true" />
+							Edit files
+						</template>
+						<template #edit-details>
+							<InfoIcon aria-hidden="true" />
+							Edit details
+						</template>
+						<template #edit-metadata>
+							<BoxIcon aria-hidden="true" />
+							Edit metadata
+						</template>
+					</TeleportOverflowMenu>
+					<TeleportOverflowMenu
+						type="quiet"
+						label="More options"
+						tooltip="More options"
+						class="hover:!bg-button-bg"
+						:options="[
+							{
+								id: 'download',
+								label: 'Download',
+								type: 'link',
+								tone: 'brand',
+								hoverFilled: true,
+								href: createDownloadUrl(version),
+								download: getPrimaryFile(version)?.filename,
+								shown: !!getPrimaryFile(version),
+							},
+							{
+								id: 'new-tab',
+								label: 'Open in new tab',
+								type: 'link',
+								href: `/${project.project_type}/${
+									project.slug ? project.slug : project.id
+								}/version/${encodeURI(version.displayUrlEnding ? version.displayUrlEnding : version.id)}`,
+								target: '_blank',
+							},
+							{
+								id: 'copy-link',
+								label: 'Copy link',
+								action: () =>
+									copyToClipboard(
+										`https://modrinth.com/${project.project_type}/${
+											project.slug ? project.slug : project.id
+										}/version/${encodeURI(version.displayUrlEnding ? version.displayUrlEnding : version.id)}`,
+									),
+							},
+							{
+								id: 'share',
+								label: 'Share',
+								action: () => {},
+								shown: false,
+							},
+							{
+								id: 'report',
+								label: 'Report',
+								tone: 'red',
+								hoverFilled: true,
+								action: () =>
+									auth.user ? reportVersion(version.id) : navigateTo(getSignInRouteObj(route)),
+								shown: !currentMember,
+							},
+							{ type: 'divider', shown: currentMember || flags.developerMode },
+							{
+								id: 'copy-id',
+								label: 'Copy ID',
+								action: () => {
+									copyToClipboard(version.id)
+								},
+								shown: currentMember || flags.developerMode,
+							},
+							{
+								id: 'copy-maven',
+								label: 'Copy Maven coordinates',
+								action: () => {
+									copyToClipboard(`maven.modrinth:${project.slug}:${version.id}`)
+								},
+								shown: flags.developerMode,
+							},
+							{ type: 'divider', shown: !!currentMember },
+							{
+								id: 'edit-metadata',
+								label: 'Edit metadata',
+								action: () => handleOpenEditVersionModal(version.id, project.id, 'metadata'),
+								shown: !!currentMember,
+							},
+							{
+								id: 'edit-details',
+								label: 'Edit details',
+								action: () => handleOpenEditVersionModal(version.id, project.id, 'add-details'),
+								shown: !!currentMember,
+							},
+							{
+								id: 'edit-files',
+								label: 'Edit files',
+								action: () => handleOpenEditVersionModal(version.id, project.id, 'add-files'),
+								shown: !!currentMember,
+							},
+							{
+								id: 'delete',
+								label: 'Delete',
+								tone: 'red',
+								hoverFilled: true,
+								action: () => {
+									selectedVersion = version.id
+									deleteVersionModal?.show()
+								},
+								shown: !!currentMember,
+							},
+						]"
+						@select="$event.id === 'download' && emit('onDownload')"
+					>
+						<MoreVerticalIcon aria-hidden="true" />
+						<template #download>
 							<DownloadIcon aria-hidden="true" />
-						</a>
-					</ButtonStyled>
-					<ButtonStyled v-if="currentMember" circular type="transparent">
-						<OverflowMenu
-							v-tooltip="'Edit version'"
-							class="hover:!bg-button-bg"
-							:dropdown-id="`${baseDropdownId}-edit-${version.id}`"
-							:options="[
-								{
-									id: 'edit-metadata',
-									action: () => handleOpenEditVersionModal(version.id, project.id, 'metadata'),
-								},
-								{
-									id: 'edit-details',
-									action: () => handleOpenEditVersionModal(version.id, project.id, 'add-details'),
-								},
-								{
-									id: 'edit-files',
-									action: () => handleOpenEditVersionModal(version.id, project.id, 'add-files'),
-								},
-							]"
-							aria-label="Edit version"
-						>
-							<EditIcon aria-hidden="true" />
-							<template #edit-files>
-								<FileIcon aria-hidden="true" />
-								Edit files
-							</template>
-							<template #edit-details>
-								<InfoIcon aria-hidden="true" />
-								Edit details
-							</template>
-							<template #edit-metadata>
-								<BoxIcon aria-hidden="true" />
-								Edit metadata
-							</template>
-						</OverflowMenu>
-					</ButtonStyled>
-					<ButtonStyled circular type="transparent">
-						<OverflowMenu
-							v-tooltip="'More options'"
-							class="hover:!bg-button-bg"
-							:dropdown-id="`${baseDropdownId}-${version.id}`"
-							:options="[
-								{
-									id: 'download',
-									color: 'primary',
-									hoverFilled: true,
-									link: createDownloadUrl(version),
-									download: getPrimaryFile(version)?.filename,
-									action: () => {
-										emit('onDownload')
-									},
-									shown: !!getPrimaryFile(version),
-								},
-								{
-									id: 'new-tab',
-									action: () => {},
-									link: `/${project.project_type}/${
-										project.slug ? project.slug : project.id
-									}/version/${encodeURI(version.displayUrlEnding ? version.displayUrlEnding : version.id)}`,
-									external: true,
-								},
-								{
-									id: 'copy-link',
-									action: () =>
-										copyToClipboard(
-											`https://modrinth.com/${project.project_type}/${
-												project.slug ? project.slug : project.id
-											}/version/${encodeURI(version.displayUrlEnding ? version.displayUrlEnding : version.id)}`,
-										),
-								},
-								{
-									id: 'share',
-									action: () => {},
-									shown: false,
-								},
-								{
-									id: 'report',
-									color: 'red',
-									hoverFilled: true,
-									action: () =>
-										auth.user ? reportVersion(version.id) : navigateTo(getSignInRouteObj(route)),
-									shown: !currentMember,
-								},
-								{ divider: true, shown: currentMember || flags.developerMode },
-								{
-									id: 'copy-id',
-									action: () => {
-										copyToClipboard(version.id)
-									},
-									shown: currentMember || flags.developerMode,
-								},
-								{
-									id: 'copy-maven',
-									action: () => {
-										copyToClipboard(`maven.modrinth:${project.slug}:${version.id}`)
-									},
-									shown: flags.developerMode,
-								},
-								{ divider: true, shown: !!currentMember },
-								{
-									id: 'edit-metadata',
-									action: () => handleOpenEditVersionModal(version.id, project.id, 'metadata'),
-									shown: !!currentMember,
-								},
-								{
-									id: 'edit-details',
-									action: () => handleOpenEditVersionModal(version.id, project.id, 'add-details'),
-									shown: !!currentMember,
-								},
-								{
-									id: 'edit-files',
-									action: () => handleOpenEditVersionModal(version.id, project.id, 'add-files'),
-									shown: !!currentMember,
-								},
-								{
-									id: 'delete',
-									color: 'red',
-									hoverFilled: true,
-									action: () => {
-										selectedVersion = version.id
-										deleteVersionModal?.show()
-									},
-									shown: !!currentMember,
-								},
-							]"
-							aria-label="More options"
-						>
-							<MoreVerticalIcon aria-hidden="true" />
-							<template #download>
-								<DownloadIcon aria-hidden="true" />
-								Download
-							</template>
-							<template #new-tab>
-								<ExternalIcon aria-hidden="true" />
-								Open in new tab
-							</template>
-							<template #copy-link>
-								<LinkIcon aria-hidden="true" />
-								Copy link
-							</template>
-							<template #share>
-								<ShareIcon aria-hidden="true" />
-								Share
-							</template>
-							<template #report>
-								<ReportIcon aria-hidden="true" />
-								Report
-							</template>
-							<template #edit-files>
-								<FileIcon aria-hidden="true" />
-								Edit files
-							</template>
-							<template #edit-details>
-								<InfoIcon aria-hidden="true" />
-								Edit details
-							</template>
-							<template #edit-metadata>
-								<BoxIcon aria-hidden="true" />
-								Edit metadata
-							</template>
-							<template #delete>
-								<TrashIcon aria-hidden="true" />
-								Delete
-							</template>
-							<template #copy-id>
-								<ClipboardCopyIcon aria-hidden="true" />
-								Copy ID
-							</template>
-							<template #copy-maven>
-								<ClipboardCopyIcon aria-hidden="true" />
-								Copy Maven coordinates
-							</template>
-						</OverflowMenu>
-					</ButtonStyled>
+							Download
+						</template>
+						<template #new-tab>
+							<ExternalIcon aria-hidden="true" />
+							Open in new tab
+						</template>
+						<template #copy-link>
+							<LinkIcon aria-hidden="true" />
+							Copy link
+						</template>
+						<template #share>
+							<ShareIcon aria-hidden="true" />
+							Share
+						</template>
+						<template #report>
+							<ReportIcon aria-hidden="true" />
+							Report
+						</template>
+						<template #edit-files>
+							<FileIcon aria-hidden="true" />
+							Edit files
+						</template>
+						<template #edit-details>
+							<InfoIcon aria-hidden="true" />
+							Edit details
+						</template>
+						<template #edit-metadata>
+							<BoxIcon aria-hidden="true" />
+							Edit metadata
+						</template>
+						<template #delete>
+							<TrashIcon aria-hidden="true" />
+							Delete
+						</template>
+						<template #copy-id>
+							<ClipboardCopyIcon aria-hidden="true" />
+							Copy ID
+						</template>
+						<template #copy-maven>
+							<ClipboardCopyIcon aria-hidden="true" />
+							Copy Maven coordinates
+						</template>
+					</TeleportOverflowMenu>
 				</template>
 			</ProjectPageVersions>
 			<template v-else>
@@ -259,13 +269,13 @@ import {
 	TrashIcon,
 } from '@modrinth/assets'
 import {
-	ButtonStyled,
+	ButtonLink,
 	ConfirmModal,
 	injectModrinthClient,
 	injectNotificationManager,
 	injectProjectPageContext,
-	OverflowMenu,
 	ProjectPageVersions,
+	TeleportOverflowMenu,
 } from '@modrinth/ui'
 import { onMounted, useTemplateRef, watch } from 'vue'
 
diff --git a/apps/frontend/src/pages/admin/affiliates.vue b/apps/frontend/src/pages/admin/affiliates.vue
index 92925757ce..c67abeb81c 100644
--- a/apps/frontend/src/pages/admin/affiliates.vue
+++ b/apps/frontend/src/pages/admin/affiliates.vue
@@ -27,12 +27,10 @@
 					placeholder="Search affiliates..."
 					clearable
 				/>
-				<ButtonStyled color="brand">
-					<button @click="createModal?.show">
-						<PlusIcon />
-						Create affiliate code
-					</button>
-				</ButtonStyled>
+				<Button type="colored" color="brand" @click="createModal?.show">
+					<PlusIcon />
+					Create affiliate code
+				</Button>
 			</div>
 		</div>
 		<Admonition v-if="error" type="critical">
@@ -90,7 +88,7 @@ import {
 	AffiliateLinkCard,
 	AffiliateLinkCreateModal,
 	Avatar,
-	ButtonStyled,
+	Button,
 	ConfirmModal,
 	injectModrinthClient,
 	injectNotificationManager,
diff --git a/apps/frontend/src/pages/admin/analytics/events.vue b/apps/frontend/src/pages/admin/analytics/events.vue
index a471615ce9..f3a9dddfb3 100644
--- a/apps/frontend/src/pages/admin/analytics/events.vue
+++ b/apps/frontend/src/pages/admin/analytics/events.vue
@@ -33,19 +33,20 @@
 				<div class="flex items-center justify-between">
 					<span class="label__title font-semibold">Announcement link (optional)</span>
 
-					<ButtonStyled v-if="committedNormalizedAnnouncementUrl" type="transparent" size="small">
-						<a
-							:href="committedNormalizedAnnouncementUrl"
-							target="_blank"
-							rel="noopener noreferrer"
-							aria-label="Check announcement link"
-							title="Check announcement link"
-							class="text-sm"
-						>
-							<ExternalIcon aria-hidden="true" />
-							Open link
-						</a>
-					</ButtonStyled>
+					<ButtonLink
+						v-if="committedNormalizedAnnouncementUrl"
+						type="quiet"
+						size="xs"
+						:href="committedNormalizedAnnouncementUrl"
+						target="_blank"
+						rel="noopener noreferrer"
+						aria-label="Check announcement link"
+						title="Check announcement link"
+						class="!h-6 text-sm"
+					>
+						<ExternalIcon aria-hidden="true" />
+						Open link
+					</ButtonLink>
 				</div>
 				<div class="flex items-center gap-2">
 					<StyledInput
@@ -110,15 +111,16 @@
 
 		<template #actions>
 			<div class="flex justify-end gap-2">
-				<ButtonStyled type="transparent">
-					<button @click="eventModal?.hide()">Cancel</button>
-				</ButtonStyled>
-				<ButtonStyled color="brand">
-					<button :disabled="!canSaveEvent || isSaving" @click="saveEvent">
-						<SaveIcon aria-hidden="true" />
-						{{ modalMode === 'create' ? 'Create event' : 'Save' }}
-					</button>
-				</ButtonStyled>
+				<Button type="quiet" @click="eventModal?.hide()">Cancel</Button>
+				<Button
+					type="colored"
+					color="brand"
+					:disabled="!canSaveEvent || isSaving"
+					@click="saveEvent"
+				>
+					<SaveIcon aria-hidden="true" />
+					{{ modalMode === 'create' ? 'Create event' : 'Save' }}
+				</Button>
 			</div>
 		</template>
 	</NewModal>
@@ -137,12 +139,10 @@
 						clearable
 						wrapper-class="w-full sm:w-72"
 					/>
-					<ButtonStyled color="brand">
-						<button :disabled="isSaving" @click="openCreateModal">
-							<PlusIcon aria-hidden="true" />
-							New event
-						</button>
-					</ButtonStyled>
+					<Button type="colored" color="brand" :disabled="isSaving" @click="openCreateModal">
+						<PlusIcon aria-hidden="true" />
+						New event
+					</Button>
 				</div>
 			</div>
 
@@ -196,21 +196,23 @@
 
 				<template #cell-actions="{ row }">
 					<div class="flex justify-end gap-2">
-						<ButtonStyled circular type="outlined" color="red">
-							<button
-								:aria-label="`Delete ${row.title}`"
-								:disabled="isDeletingEvent(row.id)"
-								@click="openDeleteEventModal(row)"
-							>
-								<TrashIcon aria-hidden="true" />
-							</button>
-						</ButtonStyled>
-						<ButtonStyled type="outlined">
-							<button :disabled="isSaving || isDeletingEvent(row.id)" @click="openEditModal(row)">
-								Edit
-								<EditIcon aria-hidden="true" />
-							</button>
-						</ButtonStyled>
+						<IconButton
+							type="outlined"
+							:label="`Delete ${row.title}`"
+							:disabled="isDeletingEvent(row.id)"
+							class="!text-red !shadow-[inset_0_0_0_1px_var(--color-red)] [&>svg]:!text-red"
+							@click="openDeleteEventModal(row)"
+						>
+							<TrashIcon aria-hidden="true" />
+						</IconButton>
+						<Button
+							type="outlined"
+							:disabled="isSaving || isDeletingEvent(row.id)"
+							@click="openEditModal(row)"
+						>
+							Edit
+							<EditIcon aria-hidden="true" />
+						</Button>
 					</div>
 				</template>
 
@@ -239,8 +241,8 @@ import {
 	SpinnerIcon,
 	TrashIcon,
 } from '@modrinth/assets'
+import { Button, ButtonLink, IconButton } from '@modrinth/ui'
 import {
-	ButtonStyled,
 	ConfirmModal,
 	DatePicker,
 	injectModrinthClient,
diff --git a/apps/frontend/src/pages/admin/billing/[user].vue b/apps/frontend/src/pages/admin/billing/[user].vue
index 936ac39ca3..72ad4e591b 100644
--- a/apps/frontend/src/pages/admin/billing/[user].vue
+++ b/apps/frontend/src/pages/admin/billing/[user].vue
@@ -43,18 +43,14 @@
 				<Toggle id="unprovision" v-model="unprovision" />
 			</div>
 			<div class="flex gap-2">
-				<ButtonStyled color="brand">
-					<button :disabled="refunding" @click="refundCharge">
-						<CheckIcon aria-hidden="true" />
-						Refund charge
-					</button>
-				</ButtonStyled>
-				<ButtonStyled>
-					<button @click="refundModal.hide()">
-						<XIcon aria-hidden="true" />
-						Cancel
-					</button>
-				</ButtonStyled>
+				<Button type="colored" color="brand" :disabled="refunding" @click="refundCharge">
+					<CheckIcon aria-hidden="true" />
+					Refund charge
+				</Button>
+				<Button @click="refundModal.hide()">
+					<XIcon aria-hidden="true" />
+					Cancel
+				</Button>
 			</div>
 		</div>
 	</NewModal>
@@ -82,18 +78,14 @@
 				<Toggle id="cancel" v-model="cancel" />
 			</div>
 			<div class="flex gap-2">
-				<ButtonStyled color="brand">
-					<button :disabled="modifying" @click="modifyCharge">
-						<CheckIcon aria-hidden="true" />
-						Modify charge
-					</button>
-				</ButtonStyled>
-				<ButtonStyled>
-					<button @click="modifyModal.hide()">
-						<XIcon aria-hidden="true" />
-						Cancel
-					</button>
-				</ButtonStyled>
+				<Button type="colored" color="brand" :disabled="modifying" @click="modifyCharge">
+					<CheckIcon aria-hidden="true" />
+					Modify charge
+				</Button>
+				<Button @click="modifyModal.hide()">
+					<XIcon aria-hidden="true" />
+					Cancel
+				</Button>
 			</div>
 		</div>
 	</NewModal>
@@ -117,18 +109,14 @@
 				<Toggle id="sendEmail" v-model="creditSendEmail" />
 			</div>
 			<div class="flex gap-2">
-				<ButtonStyled color="brand">
-					<button :disabled="crediting" @click="applyCredit">
-						<CheckIcon aria-hidden="true" />
-						Apply credit
-					</button>
-				</ButtonStyled>
-				<ButtonStyled>
-					<button @click="creditModal.hide()">
-						<XIcon aria-hidden="true" />
-						Cancel
-					</button>
-				</ButtonStyled>
+				<Button type="colored" color="brand" :disabled="crediting" @click="applyCredit">
+					<CheckIcon aria-hidden="true" />
+					Apply credit
+				</Button>
+				<Button @click="creditModal.hide()">
+					<XIcon aria-hidden="true" />
+					Cancel
+				</Button>
 			</div>
 		</div>
 	</NewModal>
@@ -141,13 +129,11 @@
 				<h1 class="m-0 text-2xl font-extrabold">{{ user?.username }}'s subscriptions</h1>
 			</div>
 			<div class="flex items-center gap-2">
-				<ButtonStyled>
-					<nuxt-link :to="`/user/${user?.id}`">
-						<UserIcon aria-hidden="true" />
-						User profile
-						<ExternalIcon class="h-4 w-4" />
-					</nuxt-link>
-				</ButtonStyled>
+				<ButtonLink :to="`/user/${user?.id}`">
+					<UserIcon aria-hidden="true" />
+					User profile
+					<ExternalIcon class="h-4 w-4" />
+				</ButtonLink>
 			</div>
 		</div>
 		<div>
@@ -176,25 +162,20 @@
 					</div>
 					<div v-if="subscription.metadata?.id" class="flex flex-col items-end gap-2">
 						<CopyCode :text="subscription.metadata.id" />
-						<ButtonStyled
+						<ButtonLink
 							v-if="
 								subscription.metadata?.type === 'pyro' || subscription.metadata?.type === 'medal'
 							"
+							:to="`/hosting/manage/${subscription.metadata.id}`"
+							target="_blank"
+							class="w-fit"
 						>
-							<nuxt-link
-								:to="`/hosting/manage/${subscription.metadata.id}`"
-								target="_blank"
-								class="w-fit"
-							>
-								<ServerIcon /> Server panel <ExternalIcon class="h-4 w-4" />
-							</nuxt-link>
-						</ButtonStyled>
-						<ButtonStyled>
-							<button @click="showCreditModal(subscription)">
-								<CurrencyIcon />
-								Credit
-							</button>
-						</ButtonStyled>
+							<ServerIcon /> Server panel <ExternalIcon class="h-4 w-4" />
+						</ButtonLink>
+						<Button @click="showCreditModal(subscription)">
+							<CurrencyIcon />
+							Credit
+						</Button>
 					</div>
 				</div>
 				<div class="flex flex-col gap-2">
@@ -226,7 +207,8 @@ import {
 } from '@modrinth/assets'
 import {
 	Avatar,
-	ButtonStyled,
+	Button,
+	ButtonLink,
 	CopyCode,
 	defineMessages,
 	DropdownSelect,
diff --git a/apps/frontend/src/pages/admin/docs.vue b/apps/frontend/src/pages/admin/docs.vue
index 557caf30fd..59847b213a 100644
--- a/apps/frontend/src/pages/admin/docs.vue
+++ b/apps/frontend/src/pages/admin/docs.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { CopyIcon, LibraryIcon, PlayIcon, SearchIcon } from '@modrinth/assets'
-import { ButtonStyled, Card, StyledInput } from '@modrinth/ui'
+import { Button, Card, StyledInput } from '@modrinth/ui'
 import { computed, onMounted, ref } from 'vue'
 
 import docs from '~/templates/docs'
@@ -60,12 +60,10 @@ onMounted(() => {
 						wrapper-class="w-72"
 					/>
 
-					<ButtonStyled color="brand">
-						<button :disabled="filtered.length === 0" @click="openAll">
-							<LibraryIcon class="h-4 w-4" aria-hidden="true" />
-							Open all ({{ counts.shown }})
-						</button>
-					</ButtonStyled>
+					<Button type="colored" color="brand" :disabled="filtered.length === 0" @click="openAll">
+						<LibraryIcon class="h-4 w-4" aria-hidden="true" />
+						Open all ({{ counts.shown }})
+					</Button>
 
 					<span class="text-sm text-secondary">
 						Showing <span class="font-medium text-contrast">{{ counts.shown }}</span> of
@@ -96,18 +94,19 @@ onMounted(() => {
 						</div>
 
 						<div class="mt-auto flex gap-2">
-							<ButtonStyled color="brand">
-								<button class="w-full flex-1 justify-center" @click="openPreview(id)">
-									<PlayIcon class="h-4 w-4" aria-hidden="true" />
-									Preview
-								</button>
-							</ButtonStyled>
+							<Button
+								type="colored"
+								color="brand"
+								class="w-full flex-1 justify-center"
+								@click="openPreview(id)"
+							>
+								<PlayIcon class="h-4 w-4" aria-hidden="true" />
+								Preview
+							</Button>
 
-							<ButtonStyled>
-								<button class="justify-center" title="Copy preview URL" @click="copy(id)">
-									<CopyIcon class="h-4 w-4" aria-hidden="true" />
-								</button>
-							</ButtonStyled>
+							<Button class="justify-center" title="Copy preview URL" @click="copy(id)">
+								<CopyIcon class="h-4 w-4" aria-hidden="true" />
+							</Button>
 						</div>
 					</li>
 				</ul>
diff --git a/apps/frontend/src/pages/admin/emails.vue b/apps/frontend/src/pages/admin/emails.vue
index 71b08af93c..9d33284e40 100644
--- a/apps/frontend/src/pages/admin/emails.vue
+++ b/apps/frontend/src/pages/admin/emails.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { CopyIcon, LibraryIcon, PlayIcon, SearchIcon } from '@modrinth/assets'
-import { ButtonStyled, NewModal, StyledInput } from '@modrinth/ui'
+import { Button, IconButton, NewModal, StyledInput } from '@modrinth/ui'
 import { computed, onMounted, ref } from 'vue'
 
 import emails from '~/templates/emails'
@@ -182,9 +182,7 @@ onMounted(() => {
 					</div>
 
 					<div class="input-group mt-4">
-						<ButtonStyled type="transparent">
-							<button @click="closePreview">Close</button>
-						</ButtonStyled>
+						<Button type="quiet" @click="closePreview">Close</Button>
 					</div>
 				</div>
 			</div>
@@ -200,12 +198,10 @@ onMounted(() => {
 					wrapper-class="w-72"
 				/>
 
-				<ButtonStyled color="brand">
-					<button :disabled="filtered.length === 0" @click="openAll">
-						<LibraryIcon class="h-4 w-4" aria-hidden="true" />
-						Open all ({{ counts.shown }})
-					</button>
-				</ButtonStyled>
+				<Button type="colored" color="brand" :disabled="filtered.length === 0" @click="openAll">
+					<LibraryIcon class="h-4 w-4" aria-hidden="true" />
+					Open all ({{ counts.shown }})
+				</Button>
 
 				<span class="text-sm text-secondary">
 					Showing <span class="font-medium text-contrast">{{ counts.shown }}</span> of
@@ -236,18 +232,14 @@ onMounted(() => {
 					</div>
 
 					<div class="mt-auto flex gap-2">
-						<ButtonStyled color="brand">
-							<button @click="openPreview(id, $event)">
-								<PlayIcon aria-hidden="true" />
-								Preview
-							</button>
-						</ButtonStyled>
+						<Button type="colored" color="brand" @click="openPreview(id, $event)">
+							<PlayIcon aria-hidden="true" />
+							Preview
+						</Button>
 
-						<ButtonStyled circular type="outlined">
-							<button title="Copy preview URL" @click="copy(id)">
-								<CopyIcon aria-hidden="true" />
-							</button>
-						</ButtonStyled>
+						<IconButton type="outlined" label="Copy" title="Copy preview URL" @click="copy(id)">
+							<CopyIcon aria-hidden="true" />
+						</IconButton>
 					</div>
 				</li>
 			</ul>
diff --git a/apps/frontend/src/pages/admin/servers/notices.vue b/apps/frontend/src/pages/admin/servers/notices.vue
index a3e8465714..3c2a8160f1 100644
--- a/apps/frontend/src/pages/admin/servers/notices.vue
+++ b/apps/frontend/src/pages/admin/servers/notices.vue
@@ -100,22 +100,24 @@
 				/>
 			</div>
 			<div class="flex gap-2">
-				<ButtonStyled color="brand">
-					<button v-if="editingNotice" :disabled="!!noticeSubmitError" @click="() => saveChanges()">
-						<SaveIcon aria-hidden="true" />
-						{{ formatMessage(commonMessages.saveChangesButton) }}
-					</button>
-					<button v-else :disabled="!!noticeSubmitError" @click="() => createNotice()">
-						<PlusIcon aria-hidden="true" />
-						{{ formatMessage(messages.createNotice) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled>
-					<button @click="createNoticeModal?.hide">
-						<XIcon aria-hidden="true" />
-						Cancel
-					</button>
-				</ButtonStyled>
+				<Button
+					v-if="editingNotice"
+					type="colored"
+					color="brand"
+					:disabled="!!noticeSubmitError"
+					@click="() => saveChanges()"
+				>
+					<SaveIcon aria-hidden="true" />
+					{{ formatMessage(commonMessages.saveChangesButton) }}
+				</Button>
+				<Button v-else :disabled="!!noticeSubmitError" @click="() => createNotice()">
+					<PlusIcon aria-hidden="true" />
+					{{ formatMessage(messages.createNotice) }}
+				</Button>
+				<Button @click="createNoticeModal?.hide">
+					<XIcon aria-hidden="true" />
+					Cancel
+				</Button>
 			</div>
 		</div>
 	</NewModal>
@@ -125,12 +127,10 @@
 			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 notices</h1>
-			<ButtonStyled color="brand">
-				<button @click="openNewNoticeModal">
-					<PlusIcon />
-					{{ formatMessage(messages.createNotice) }}
-				</button>
-			</ButtonStyled>
+			<Button type="colored" color="brand" @click="openNewNoticeModal">
+				<PlusIcon />
+				{{ formatMessage(messages.createNotice) }}
+			</Button>
 		</div>
 		<div>
 			<div v-if="!notices || notices.length === 0">
@@ -201,16 +201,12 @@
 							</TagItem>
 						</div>
 						<div class="col-span-2 flex gap-2 md:col-span-1">
-							<ButtonStyled>
-								<button @click="() => startEditing(notice)">
-									<EditIcon /> {{ formatMessage(commonMessages.editButton) }}
-								</button>
-							</ButtonStyled>
-							<ButtonStyled color="red">
-								<button @click="() => deleteNotice(notice)">
-									<TrashIcon /> {{ formatMessage(commonMessages.deleteLabel) }}
-								</button>
-							</ButtonStyled>
+							<Button @click="() => startEditing(notice)">
+								<EditIcon /> {{ formatMessage(commonMessages.editButton) }}
+							</Button>
+							<Button type="colored" color="red" @click="() => deleteNotice(notice)">
+								<TrashIcon /> {{ formatMessage(commonMessages.deleteLabel) }}
+							</Button>
 						</div>
 					</div>
 					<div class="col-span-full grid">
@@ -263,7 +259,7 @@
 import type { Archon } from '@modrinth/api-client'
 import { EditIcon, PlusIcon, SaveIcon, SettingsIcon, TrashIcon, XIcon } from '@modrinth/assets'
 import {
-	ButtonStyled,
+	Button,
 	Combobox,
 	commonMessages,
 	CopyCode,
diff --git a/apps/frontend/src/pages/admin/servers/transfers.vue b/apps/frontend/src/pages/admin/servers/transfers.vue
index ed50e5be86..7a1c2b7e85 100644
--- a/apps/frontend/src/pages/admin/servers/transfers.vue
+++ b/apps/frontend/src/pages/admin/servers/transfers.vue
@@ -13,12 +13,10 @@
 			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 transfers</h1>
-			<ButtonStyled color="brand">
-				<button @click="openTransferModal">
-					<PlusIcon />
-					New transfer
-				</button>
-			</ButtonStyled>
+			<Button type="colored" color="brand" @click="openTransferModal">
+				<PlusIcon />
+				New transfer
+			</Button>
 		</div>
 		<div>
 			<div v-if="loading" class="py-8 text-center text-secondary">Loading transfers...</div>
@@ -67,12 +65,16 @@
 								<span class="text-sm text-secondary">
 									{{ batch.log_count }} transfer{{ batch.log_count === 1 ? '' : 's' }}
 								</span>
-								<ButtonStyled v-if="canCancel(batch)" color="red" color-fill="text">
-									<button @click="showCancelModal(batch.id)">
-										<XCircleIcon />
-										Cancel
-									</button>
-								</ButtonStyled>
+								<Button
+									v-if="canCancel(batch)"
+									type="quiet"
+									color="red"
+									class="!text-red [&>svg]:!text-red"
+									@click="showCancelModal(batch.id)"
+								>
+									<XCircleIcon />
+									Cancel
+								</Button>
 							</div>
 						</div>
 						<div class="flex flex-wrap items-center gap-x-4 gap-y-1 text-sm text-secondary">
@@ -112,7 +114,7 @@ import type { Archon } from '@modrinth/api-client'
 import { PlusIcon, XCircleIcon } from '@modrinth/assets'
 import {
 	Avatar,
-	ButtonStyled,
+	Button,
 	ConfirmModal,
 	injectModrinthClient,
 	injectNotificationManager,
diff --git a/apps/frontend/src/pages/admin/user_email.vue b/apps/frontend/src/pages/admin/user_email.vue
index 30169a1470..ab52a529af 100644
--- a/apps/frontend/src/pages/admin/user_email.vue
+++ b/apps/frontend/src/pages/admin/user_email.vue
@@ -20,12 +20,10 @@
 					/>
 				</div>
 				<div class="flex gap-2">
-					<ButtonStyled color="brand">
-						<button @click="getUserFromEmail">
-							<MailIcon aria-hidden="true" />
-							Get user account
-						</button>
-					</ButtonStyled>
+					<Button type="colored" color="brand" @click="getUserFromEmail">
+						<MailIcon aria-hidden="true" />
+						Get user account
+					</Button>
 				</div>
 			</div>
 		</div>
@@ -33,7 +31,7 @@
 </template>
 <script setup lang="ts">
 import { MailIcon } from '@modrinth/assets'
-import { ButtonStyled, injectNotificationManager, StyledInput } from '@modrinth/ui'
+import { Button, injectNotificationManager, StyledInput } from '@modrinth/ui'
 
 const { addNotification } = injectNotificationManager()
 
diff --git a/apps/frontend/src/pages/app.vue b/apps/frontend/src/pages/app.vue
index 000bee5d50..284e9bd844 100644
--- a/apps/frontend/src/pages/app.vue
+++ b/apps/frontend/src/pages/app.vue
@@ -17,10 +17,11 @@ import {
 	Accordion,
 	Avatar,
 	Badge,
-	ButtonStyled,
+	Button,
 	Checkbox,
 	commonMessages,
 	defineMessages,
+	IconButton,
 	IntlFormatted,
 	useVIntl,
 } from '@modrinth/ui'
@@ -546,20 +547,16 @@ useSeoMeta({
 				{{ formatMessage(messages.description) }}
 			</h2>
 			<div class="button-group">
-				<ButtonStyled v-if="os" color="brand" size="large">
-					<button rel="noopener nofollow" @click="handleDownload">
-						<LinuxIcon v-if="os === 'Linux'" />
-						<WindowsIcon v-else-if="os === 'Windows'" />
-						<AppleIcon v-else-if="os === 'Mac'" />
-						{{ formatMessage(messages.downloadModrinthAppButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled type="outlined" size="large">
-					<button @click="scrollToSection">
-						<ArrowDownIcon />
-						{{ formatMessage(messages.moreDownloadOptions) }}
-					</button>
-				</ButtonStyled>
+				<Button v-if="os" type="colored" color="brand" size="xl" @click="handleDownload">
+					<LinuxIcon v-if="os === 'Linux'" />
+					<WindowsIcon v-else-if="os === 'Windows'" />
+					<AppleIcon v-else-if="os === 'Mac'" />
+					{{ formatMessage(messages.downloadModrinthAppButton) }}
+				</Button>
+				<Button type="outlined" size="xl" @click="scrollToSection">
+					<ArrowDownIcon />
+					{{ formatMessage(messages.moreDownloadOptions) }}
+				</Button>
 			</div>
 			<img src="https://cdn-raw.modrinth.com/app-landing/app-screenshot.webp" alt="" />
 			<div class="bottom-transition" />
@@ -602,11 +599,9 @@ useSeoMeta({
 							<div class="cell">{{ mod.version }}</div>
 							<div class="cell check">
 								<Checkbox :model-value="true" tabindex="-1" />
-								<ButtonStyled circular type="transparent">
-									<button tabindex="-1">
-										<TrashIcon />
-									</button>
-								</ButtonStyled>
+								<IconButton type="quiet" label="Delete" tabindex="-1">
+									<TrashIcon />
+								</IconButton>
 							</div>
 						</div>
 					</div>
diff --git a/apps/frontend/src/pages/auth/authorize.vue b/apps/frontend/src/pages/auth/authorize.vue
index ac04aa6edf..9a09b069ed 100644
--- a/apps/frontend/src/pages/auth/authorize.vue
+++ b/apps/frontend/src/pages/auth/authorize.vue
@@ -59,18 +59,21 @@
 				</div>
 			</div>
 			<div class="button-row">
-				<ButtonStyled size="large">
-					<button class="wide-button" :disabled="pending" @click="onReject">
-						<XIcon />
-						{{ formatMessage(messages.decline) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="brand" size="large">
-					<button class="wide-button" :disabled="pending" @click="onAuthorize">
-						<CheckIcon />
-						{{ formatMessage(messages.authorize) }}
-					</button>
-				</ButtonStyled>
+				<Button size="xl" class="wide-button" :disabled="pending" @click="onReject">
+					<XIcon />
+					{{ formatMessage(messages.decline) }}
+				</Button>
+				<Button
+					type="colored"
+					color="brand"
+					size="xl"
+					class="wide-button"
+					:disabled="pending"
+					@click="onAuthorize"
+				>
+					<CheckIcon />
+					{{ formatMessage(messages.authorize) }}
+				</Button>
 			</div>
 			<div class="flex flex-col gap-2 text-center">
 				<p class="m-0 text-sm">
@@ -91,7 +94,7 @@
 import { CheckIcon, XIcon } from '@modrinth/assets'
 import {
 	Avatar,
-	ButtonStyled,
+	Button,
 	commonMessages,
 	defineMessages,
 	injectModrinthClient,
diff --git a/apps/frontend/src/pages/auth/reset-password.vue b/apps/frontend/src/pages/auth/reset-password.vue
index 86f6bcab04..68a37a8a1a 100644
--- a/apps/frontend/src/pages/auth/reset-password.vue
+++ b/apps/frontend/src/pages/auth/reset-password.vue
@@ -38,15 +38,15 @@
 				<HCaptcha ref="captcha" v-model="token" />
 			</div>
 
-			<ButtonStyled color="brand">
-				<button
-					class="!w-full"
-					:disabled="(globals?.captcha_enabled ? !token : false) || !email"
-					@click="recovery"
-				>
-					<SendIcon /> {{ formatMessage(methodChoiceMessages.action) }}
-				</button>
-			</ButtonStyled>
+			<Button
+				type="colored"
+				color="brand"
+				class="!w-full"
+				:disabled="(globals?.captcha_enabled ? !token : false) || !email"
+				@click="recovery"
+			>
+				<SendIcon /> {{ formatMessage(methodChoiceMessages.action) }}
+			</Button>
 		</template>
 		<template v-else-if="step === 'passed_challenge'">
 			<Admonition :type="'info'">
@@ -84,11 +84,9 @@
 					wrapper-class="w-full"
 				/>
 
-				<ButtonStyled color="brand">
-					<button class="!w-full" @click="changePassword">
-						{{ formatMessage(postChallengeMessages.action) }}
-					</button>
-				</ButtonStyled>
+				<Button type="colored" color="brand" class="!w-full" @click="changePassword">
+					{{ formatMessage(postChallengeMessages.action) }}
+				</Button>
 			</div>
 		</template>
 	</div>
@@ -97,7 +95,7 @@
 import { KeyIcon, MailIcon, SendIcon } from '@modrinth/assets'
 import {
 	Admonition,
-	ButtonStyled,
+	Button,
 	commonMessages,
 	defineMessages,
 	injectModrinthClient,
diff --git a/apps/frontend/src/pages/auth/verify-email.vue b/apps/frontend/src/pages/auth/verify-email.vue
index 5118bfd8b6..6bf46eb25e 100644
--- a/apps/frontend/src/pages/auth/verify-email.vue
+++ b/apps/frontend/src/pages/auth/verify-email.vue
@@ -12,17 +12,13 @@
 			</Admonition>
 
 			<div class="grid grid-cols-2 gap-2">
-				<ButtonStyled>
-					<NuxtLink class="shadow-none" to="/settings/account">
-						<SettingsIcon /> {{ formatMessage(messages.accountSettings) }}
-					</NuxtLink>
-				</ButtonStyled>
-				<ButtonStyled color="brand">
-					<NuxtLink to="/discover/mods">
-						{{ formatMessage(messages.discoverMods) }}
-						<RightArrowIcon />
-					</NuxtLink>
-				</ButtonStyled>
+				<ButtonLink class="shadow-none" to="/settings/account">
+					<SettingsIcon /> {{ formatMessage(messages.accountSettings) }}
+				</ButtonLink>
+				<ButtonLink type="colored" color="brand" to="/discover/mods">
+					{{ formatMessage(messages.discoverMods) }}
+					<RightArrowIcon />
+				</ButtonLink>
 			</div>
 		</template>
 
@@ -37,25 +33,19 @@
 
 			<template v-if="auth.user">
 				<div class="grid grid-cols-2 gap-2">
-					<ButtonStyled>
-						<NuxtLink to="/settings/account">
-							<SettingsIcon /> {{ formatMessage(messages.accountSettings) }}
-						</NuxtLink>
-					</ButtonStyled>
-					<ButtonStyled color="brand">
-						<NuxtLink to="/discover/mods">
-							{{ formatMessage(messages.discoverMods) }}
-							<RightArrowIcon />
-						</NuxtLink>
-					</ButtonStyled>
+					<ButtonLink to="/settings/account">
+						<SettingsIcon /> {{ formatMessage(messages.accountSettings) }}
+					</ButtonLink>
+					<ButtonLink type="colored" color="brand" to="/discover/mods">
+						{{ formatMessage(messages.discoverMods) }}
+						<RightArrowIcon />
+					</ButtonLink>
 				</div>
 			</template>
-			<ButtonStyled v-else color="brand">
-				<NuxtLink to="/auth/sign-in" class="!w-full">
-					{{ formatMessage(commonMessages.signInButton) }}
-					<RightArrowIcon />
-				</NuxtLink>
-			</ButtonStyled>
+			<ButtonLink v-else type="colored" color="brand" to="/auth/sign-in" class="!w-full">
+				{{ formatMessage(commonMessages.signInButton) }}
+				<RightArrowIcon />
+			</ButtonLink>
 		</template>
 
 		<template v-else>
@@ -70,18 +60,20 @@
 				{{ formatMessage(failedVerificationMessages.description) }}
 			</Admonition>
 
-			<ButtonStyled v-if="auth.user" color="brand">
-				<button class="!w-full" @click="handleResendEmailVerification">
-					{{ formatMessage(failedVerificationMessages.action) }}
-					<RightArrowIcon />
-				</button>
-			</ButtonStyled>
-			<ButtonStyled v-else color="brand">
-				<NuxtLink to="/auth/sign-in" class="!w-full">
-					{{ formatMessage(commonMessages.signInButton) }}
-					<RightArrowIcon />
-				</NuxtLink>
-			</ButtonStyled>
+			<Button
+				v-if="auth.user"
+				type="colored"
+				color="brand"
+				class="!w-full"
+				@click="handleResendEmailVerification"
+			>
+				{{ formatMessage(failedVerificationMessages.action) }}
+				<RightArrowIcon />
+			</Button>
+			<ButtonLink v-else type="colored" color="brand" to="/auth/sign-in" class="!w-full">
+				{{ formatMessage(commonMessages.signInButton) }}
+				<RightArrowIcon />
+			</ButtonLink>
 		</template>
 	</div>
 </template>
@@ -89,7 +81,8 @@
 import { RightArrowIcon, SettingsIcon } from '@modrinth/assets'
 import {
 	Admonition,
-	ButtonStyled,
+	Button,
+	ButtonLink,
 	commonMessages,
 	defineMessages,
 	injectNotificationManager,
diff --git a/apps/frontend/src/pages/collection/[collection].vue b/apps/frontend/src/pages/collection/[collection].vue
index db4424666e..167ce44566 100644
--- a/apps/frontend/src/pages/collection/[collection].vue
+++ b/apps/frontend/src/pages/collection/[collection].vue
@@ -16,13 +16,17 @@
 			<div class="flex w-[30rem] flex-col gap-3">
 				<div class="flow-root">
 					<div class="group relative float-end ml-4">
-						<OverflowMenu
-							v-tooltip="formatMessage(messages.editIconButton)"
-							:dropdown-id="`${baseId}-edit-icon`"
+						<TeleportOverflowMenu
+							:label="formatMessage(messages.editIconButton)"
+							:tooltip="formatMessage(messages.editIconButton)"
 							class="m-0 cursor-pointer appearance-none border-none bg-transparent p-0 transition-transform group-active:scale-95"
 							:options="[
 								{
 									id: 'select',
+									label:
+										previewImage || collection.icon_url
+											? formatMessage(messages.replaceIcon)
+											: formatMessage(messages.selectIcon),
 									action: () => {
 										const input = iconInputRef?.$el?.querySelector('input')
 										input?.click()
@@ -30,7 +34,7 @@
 								},
 								{
 									id: 'remove',
-									color: 'danger',
+									label: formatMessage(messages.removeIconButton),
 									action: () => {
 										deletedIcon = true
 										previewImage = null
@@ -64,7 +68,7 @@
 								<XIcon />
 								{{ formatMessage(messages.removeIconButton) }}
 							</template>
-						</OverflowMenu>
+						</TeleportOverflowMenu>
 						<FileInput
 							id="collection-icon-input"
 							ref="iconInputRef"
@@ -117,23 +121,19 @@
 					</RadioButtons>
 				</div>
 				<div class="flex justify-end gap-2">
-					<ButtonStyled>
-						<button class="w-24" @click="() => editModal?.hide()">
-							<XIcon aria-hidden="true" />
-							{{ formatMessage(commonMessages.cancelButton) }}
-						</button>
-					</ButtonStyled>
-					<ButtonStyled color="brand">
-						<button class="w-36" :disabled="saving" @click="save()">
-							<SpinnerIcon v-if="saving" class="animate-spin" aria-hidden="true" />
-							<SaveIcon v-else aria-hidden="true" />
-							{{
-								saving
-									? formatMessage(commonMessages.savingButton)
-									: formatMessage(commonMessages.saveButton)
-							}}
-						</button>
-					</ButtonStyled>
+					<Button class="w-24" @click="() => editModal?.hide()">
+						<XIcon aria-hidden="true" />
+						{{ formatMessage(commonMessages.cancelButton) }}
+					</Button>
+					<Button type="colored" color="brand" class="w-36" :disabled="saving" @click="save()">
+						<SpinnerIcon v-if="saving" class="animate-spin" aria-hidden="true" />
+						<SaveIcon v-else aria-hidden="true" />
+						{{
+							saving
+								? formatMessage(commonMessages.savingButton)
+								: formatMessage(commonMessages.saveButton)
+						}}
+					</Button>
 				</div>
 			</div>
 		</NewModal>
@@ -204,31 +204,29 @@
 						</div>
 						<div class="col-span-2 flex items-center gap-2 sm:col-span-1">
 							<template v-if="canEdit">
-								<ButtonStyled size="large">
-									<button @click="openEditModal">
-										<EditIcon aria-hidden="true" />
-										{{ formatMessage(commonMessages.editButton) }}
-									</button>
-								</ButtonStyled>
-								<ButtonStyled size="large" circular type="transparent">
-									<OverflowMenu
-										:dropdown-id="`${baseId}-more-options`"
-										:options="[
-											{
-												id: 'delete',
-												color: 'red',
-												action: () => deleteModal?.show(),
-											},
-										]"
-										:aria-label="formatMessage(commonMessages.moreOptionsButton)"
-									>
-										<MoreVerticalIcon aria-hidden="true" />
-										<template #delete>
-											<TrashIcon aria-hidden="true" />
-											{{ formatMessage(commonMessages.deleteLabel) }}
-										</template>
-									</OverflowMenu>
-								</ButtonStyled>
+								<Button size="xl" @click="openEditModal">
+									<EditIcon aria-hidden="true" />
+									{{ formatMessage(commonMessages.editButton) }}
+								</Button>
+								<TeleportOverflowMenu
+									type="quiet"
+									size="xl"
+									:label="formatMessage(commonMessages.moreOptionsButton)"
+									:options="[
+										{
+											id: 'delete',
+											label: formatMessage(commonMessages.deleteLabel),
+											tone: 'red',
+											action: () => deleteModal?.show(),
+										},
+									]"
+								>
+									<MoreVerticalIcon aria-hidden="true" />
+									<template #delete>
+										<TrashIcon aria-hidden="true" />
+										{{ formatMessage(commonMessages.deleteLabel) }}
+									</template>
+								</TeleportOverflowMenu>
 							</template>
 						</div>
 					</div>
@@ -350,30 +348,35 @@
 					"
 				>
 					<template v-if="canEdit || collection.id === 'following'" #actions>
-						<ButtonStyled v-if="canEdit">
-							<button class="remove-btn" :disabled="removing" @click="() => removeProject(project)">
-								<SpinnerIcon v-if="removing" class="animate-spin" aria-hidden="true" />
-								<XIcon v-else aria-hidden="true" />
-								{{ formatMessage(messages.removeProjectButton) }}
-							</button>
-						</ButtonStyled>
-						<ButtonStyled v-if="collection.id === 'following'">
-							<button @click="unfollowProject(project)">
-								<HeartMinusIcon aria-hidden="true" />
-								{{ formatMessage(messages.unfollowProjectButton) }}
-							</button>
-						</ButtonStyled>
+						<Button
+							v-if="canEdit"
+							class="remove-btn"
+							:disabled="removing"
+							@click="() => removeProject(project)"
+						>
+							<SpinnerIcon v-if="removing" class="animate-spin" aria-hidden="true" />
+							<XIcon v-else aria-hidden="true" />
+							{{ formatMessage(messages.removeProjectButton) }}
+						</Button>
+						<Button v-if="collection.id === 'following'" @click="unfollowProject(project)">
+							<HeartMinusIcon aria-hidden="true" />
+							{{ formatMessage(messages.unfollowProjectButton) }}
+						</Button>
 					</template>
 				</ProjectCard>
 			</ProjectCardList>
 			<EmptyState v-else type="empty-inbox" :heading="formatMessage(messages.noProjectsLabel)">
 				<template #actions>
-					<ButtonStyled v-if="auth.user && auth.user.id === creator.id" color="brand">
-						<nuxt-link class="mx-auto w-min" to="/discover/mods">
-							<CompassIcon class="size-5" />
-							{{ formatMessage(messages.discoverModsButton) }}
-						</nuxt-link>
-					</ButtonStyled>
+					<ButtonLink
+						v-if="auth.user && auth.user.id === creator.id"
+						type="colored"
+						color="brand"
+						class="mx-auto w-min"
+						to="/discover/mods"
+					>
+						<CompassIcon class="size-5" />
+						{{ formatMessage(messages.discoverModsButton) }}
+					</ButtonLink>
 				</template>
 			</EmptyState>
 		</NormalPage>
@@ -400,7 +403,8 @@ import {
 } from '@modrinth/assets'
 import {
 	Avatar,
-	ButtonStyled,
+	Button,
+	ButtonLink,
 	commonMessages,
 	commonProjectTypeCategoryMessages,
 	commonProjectTypeSentenceMessages,
@@ -417,12 +421,12 @@ import {
 	NewModal,
 	normalizeChildren,
 	NormalPage,
-	OverflowMenu,
 	ProjectCard,
 	ProjectCardList,
 	RadioButtons,
 	SidebarCard,
 	StyledInput,
+	TeleportOverflowMenu,
 	useCompactNumber,
 	useFormatDateTime,
 	useRelativeTime,
@@ -451,8 +455,6 @@ const router = useRouter()
 const auth = await useAuth()
 const cosmetics = useCosmetics()
 const queryClient = useQueryClient()
-const baseId = useId()
-
 async function fetchProjectsByIds(projectIds) {
 	const segmentSize = 800
 	const segments = []
diff --git a/apps/frontend/src/pages/dashboard.vue b/apps/frontend/src/pages/dashboard.vue
index 2a82c1ab89..b6afc2fac3 100644
--- a/apps/frontend/src/pages/dashboard.vue
+++ b/apps/frontend/src/pages/dashboard.vue
@@ -65,12 +65,10 @@
 					}}
 				</div>
 				<template #actions>
-					<ButtonStyled color="blue">
-						<NuxtLink to="/discord/link" class="w-fit !px-4">
-							<ExternalIcon />
-							{{ formatMessage(messages.discordRoleBannerCta) }}
-						</NuxtLink>
-					</ButtonStyled>
+					<ButtonLink type="colored" color="blue" to="/discord/link" class="w-fit !px-4">
+						<ExternalIcon />
+						{{ formatMessage(messages.discordRoleBannerCta) }}
+					</ButtonLink>
 				</template>
 			</Admonition>
 			<NuxtPage :route="route" />
@@ -93,7 +91,7 @@ import {
 } from '@modrinth/assets'
 import {
 	Admonition,
-	ButtonStyled,
+	ButtonLink,
 	commonMessages,
 	defineMessages,
 	injectModrinthClient,
diff --git a/apps/frontend/src/pages/dashboard/affiliate-links.vue b/apps/frontend/src/pages/dashboard/affiliate-links.vue
index a02b7fea4d..ce10e0c94f 100644
--- a/apps/frontend/src/pages/dashboard/affiliate-links.vue
+++ b/apps/frontend/src/pages/dashboard/affiliate-links.vue
@@ -26,12 +26,10 @@
 					:placeholder="formatMessage(messages.searchAffiliateLinks)"
 					clearable
 				/>
-				<ButtonStyled color="brand">
-					<button @click="createModal?.show">
-						<PlusIcon />
-						{{ formatMessage(messages.createButton) }}
-					</button>
-				</ButtonStyled>
+				<Button type="colored" color="brand" @click="createModal?.show">
+					<PlusIcon />
+					{{ formatMessage(messages.createButton) }}
+				</Button>
 			</div>
 		</div>
 		<Admonition v-if="error" type="critical">
@@ -63,7 +61,7 @@ import {
 	Admonition,
 	AffiliateLinkCard,
 	AffiliateLinkCreateModal,
-	ButtonStyled,
+	Button,
 	ConfirmModal,
 	defineMessages,
 	injectModrinthClient,
diff --git a/apps/frontend/src/pages/dashboard/collections.vue b/apps/frontend/src/pages/dashboard/collections.vue
index a2bf61191a..abdbb631ac 100644
--- a/apps/frontend/src/pages/dashboard/collections.vue
+++ b/apps/frontend/src/pages/dashboard/collections.vue
@@ -30,12 +30,15 @@
 					<span class="font-semibold text-secondary">{{ selected }}</span>
 				</DropdownSelect>
 
-				<ButtonStyled color="brand">
-					<button class="ml-auto" @click="(event) => $refs.modal_creation.show(event)">
-						<PlusIcon aria-hidden="true" />
-						{{ formatMessage(messages.createNewButton) }}
-					</button>
-				</ButtonStyled>
+				<Button
+					type="colored"
+					color="brand"
+					class="ml-auto"
+					@click="(event) => $refs.modal_creation.show(event)"
+				>
+					<PlusIcon aria-hidden="true" />
+					{{ formatMessage(messages.createNewButton) }}
+				</Button>
 			</div>
 		</div>
 		<div class="collections-grid">
@@ -144,7 +147,7 @@ import {
 } from '@modrinth/assets'
 import {
 	Avatar,
-	ButtonStyled,
+	Button,
 	commonMessages,
 	defineMessages,
 	DropdownSelect,
diff --git a/apps/frontend/src/pages/dashboard/index.vue b/apps/frontend/src/pages/dashboard/index.vue
index c394cd4b32..aa5b86ea05 100644
--- a/apps/frontend/src/pages/dashboard/index.vue
+++ b/apps/frontend/src/pages/dashboard/index.vue
@@ -50,12 +50,10 @@
 				</template>
 				<div v-else class="universal-body">
 					<p>{{ formatMessage(messages.noUnreadNotifications) }}</p>
-					<ButtonStyled>
-						<nuxt-link to="/dashboard/notifications/history" class="!mt-4 w-fit">
-							<HistoryIcon />
-							{{ formatMessage(messages.viewNotificationHistory) }}
-						</nuxt-link>
-					</ButtonStyled>
+					<ButtonLink to="/dashboard/notifications/history" class="!mt-4 w-fit">
+						<HistoryIcon />
+						{{ formatMessage(messages.viewNotificationHistory) }}
+					</ButtonLink>
 				</div>
 			</section>
 		</div>
@@ -65,7 +63,7 @@
 import { ChevronRightIcon, HistoryIcon } from '@modrinth/assets'
 import {
 	Avatar,
-	ButtonStyled,
+	ButtonLink,
 	commonMessages,
 	defineMessages,
 	injectModrinthClient,
diff --git a/apps/frontend/src/pages/dashboard/notifications.vue b/apps/frontend/src/pages/dashboard/notifications.vue
index a53fc72c70..d910e4a28c 100644
--- a/apps/frontend/src/pages/dashboard/notifications.vue
+++ b/apps/frontend/src/pages/dashboard/notifications.vue
@@ -21,18 +21,14 @@
 					</h2>
 				</div>
 				<template v-if="!history">
-					<ButtonStyled v-if="data.hasRead">
-						<button @click="updateRoute()">
-							<HistoryIcon />
-							{{ formatMessage(messages.viewHistory) }}
-						</button>
-					</ButtonStyled>
-					<ButtonStyled v-if="notifications.length > 0" color="red">
-						<button @click="readAll()">
-							<CheckCheckIcon />
-							{{ formatMessage(messages.markAllAsRead) }}
-						</button>
-					</ButtonStyled>
+					<Button v-if="data.hasRead" @click="updateRoute()">
+						<HistoryIcon />
+						{{ formatMessage(messages.viewHistory) }}
+					</Button>
+					<Button v-if="notifications.length > 0" type="colored" color="red" @click="readAll()">
+						<CheckCheckIcon />
+						{{ formatMessage(messages.markAllAsRead) }}
+					</Button>
 				</template>
 			</div>
 			<Chips
@@ -71,7 +67,7 @@
 <script setup>
 import { CheckCheckIcon, HistoryIcon } from '@modrinth/assets'
 import {
-	ButtonStyled,
+	Button,
 	Chips,
 	commonMessages,
 	defineMessages,
diff --git a/apps/frontend/src/pages/dashboard/organizations.vue b/apps/frontend/src/pages/dashboard/organizations.vue
index d30f91d6ca..d258f0e5af 100644
--- a/apps/frontend/src/pages/dashboard/organizations.vue
+++ b/apps/frontend/src/pages/dashboard/organizations.vue
@@ -5,12 +5,10 @@
 			<div class="header__row">
 				<h2 class="header__title text-2xl">{{ formatMessage(messages.organizationsTitle) }}</h2>
 				<div class="input-group">
-					<ButtonStyled color="brand">
-						<button @click="openCreateOrgModal">
-							<PlusIcon aria-hidden="true" />
-							{{ formatMessage(messages.createOrganization) }}
-						</button>
-					</ButtonStyled>
+					<Button type="colored" color="brand" @click="openCreateOrgModal">
+						<PlusIcon aria-hidden="true" />
+						{{ formatMessage(messages.createOrganization) }}
+					</Button>
 				</div>
 			</div>
 			<template v-if="orgs?.length > 0">
@@ -53,7 +51,7 @@
 
 <script setup>
 import { PlusIcon, UsersIcon } from '@modrinth/assets'
-import { Avatar, ButtonStyled, defineMessages, injectModrinthClient, useVIntl } from '@modrinth/ui'
+import { Avatar, Button, defineMessages, injectModrinthClient, useVIntl } from '@modrinth/ui'
 import { useQuery } from '@tanstack/vue-query'
 
 import OrganizationCreateModal from '~/components/ui/create/OrganizationCreateModal.vue'
diff --git a/apps/frontend/src/pages/dashboard/projects.vue b/apps/frontend/src/pages/dashboard/projects.vue
index 3d57d8402f..ec29a4ca46 100644
--- a/apps/frontend/src/pages/dashboard/projects.vue
+++ b/apps/frontend/src/pages/dashboard/projects.vue
@@ -17,17 +17,15 @@
 							:placeholder="getLinkInputPlaceholder(editLinks.issues.clear)"
 							:maxlength="2048"
 						/>
-						<ButtonStyled circular>
-							<button
-								v-tooltip="formatMessage(messages.clearLinkLabel)"
-								class="label-button"
-								:aria-label="formatMessage(messages.clearLinkLabel)"
-								:data-active="editLinks.issues.clear"
-								@click="editLinks.issues.clear = !editLinks.issues.clear"
-							>
-								<TrashIcon />
-							</button>
-						</ButtonStyled>
+						<IconButton
+							v-tooltip="formatMessage(messages.clearLinkLabel)"
+							:label="formatMessage(messages.clearLinkLabel)"
+							class="label-button"
+							:data-active="editLinks.issues.clear"
+							@click="editLinks.issues.clear = !editLinks.issues.clear"
+						>
+							<TrashIcon />
+						</IconButton>
 					</div>
 					<label for="source-code-input" :title="formatMessage(messages.sourceCodeDescription)">
 						<span class="label__title">{{ formatMessage(messages.sourceCodeLabel) }}</span>
@@ -42,17 +40,15 @@
 							:maxlength="2048"
 							:placeholder="getLinkInputPlaceholder(editLinks.source.clear)"
 						/>
-						<ButtonStyled circular>
-							<button
-								v-tooltip="formatMessage(messages.clearLinkLabel)"
-								class="label-button"
-								:aria-label="formatMessage(messages.clearLinkLabel)"
-								:data-active="editLinks.source.clear"
-								@click="editLinks.source.clear = !editLinks.source.clear"
-							>
-								<TrashIcon />
-							</button>
-						</ButtonStyled>
+						<IconButton
+							v-tooltip="formatMessage(messages.clearLinkLabel)"
+							:label="formatMessage(messages.clearLinkLabel)"
+							class="label-button"
+							:data-active="editLinks.source.clear"
+							@click="editLinks.source.clear = !editLinks.source.clear"
+						>
+							<TrashIcon />
+						</IconButton>
 					</div>
 					<label for="wiki-page-input" :title="formatMessage(messages.wikiPageDescription)">
 						<span class="label__title">{{ formatMessage(messages.wikiPageLabel) }}</span>
@@ -67,17 +63,15 @@
 							:maxlength="2048"
 							:placeholder="getLinkInputPlaceholder(editLinks.wiki.clear)"
 						/>
-						<ButtonStyled circular>
-							<button
-								v-tooltip="formatMessage(messages.clearLinkLabel)"
-								class="label-button"
-								:aria-label="formatMessage(messages.clearLinkLabel)"
-								:data-active="editLinks.wiki.clear"
-								@click="editLinks.wiki.clear = !editLinks.wiki.clear"
-							>
-								<TrashIcon />
-							</button>
-						</ButtonStyled>
+						<IconButton
+							v-tooltip="formatMessage(messages.clearLinkLabel)"
+							:label="formatMessage(messages.clearLinkLabel)"
+							class="label-button"
+							:data-active="editLinks.wiki.clear"
+							@click="editLinks.wiki.clear = !editLinks.wiki.clear"
+						>
+							<TrashIcon />
+						</IconButton>
 					</div>
 					<label
 						for="discord-invite-input"
@@ -95,17 +89,15 @@
 							:maxlength="2048"
 							:placeholder="getLinkInputPlaceholder(editLinks.discord.clear, true)"
 						/>
-						<ButtonStyled circular>
-							<button
-								v-tooltip="formatMessage(messages.clearLinkLabel)"
-								class="label-button"
-								:aria-label="formatMessage(messages.clearLinkLabel)"
-								:data-active="editLinks.discord.clear"
-								@click="editLinks.discord.clear = !editLinks.discord.clear"
-							>
-								<TrashIcon />
-							</button>
-						</ButtonStyled>
+						<IconButton
+							v-tooltip="formatMessage(messages.clearLinkLabel)"
+							:label="formatMessage(messages.clearLinkLabel)"
+							class="label-button"
+							:data-active="editLinks.discord.clear"
+							@click="editLinks.discord.clear = !editLinks.discord.clear"
+						>
+							<TrashIcon />
+						</IconButton>
 					</div>
 				</section>
 				<p>
@@ -141,18 +133,14 @@
 					:description="formatMessage(messages.showAllProjects)"
 				/>
 				<div class="input-group ml-auto mt-4">
-					<ButtonStyled type="outlined">
-						<button @click="$refs.editLinksModal.hide()">
-							<XIcon />
-							{{ formatMessage(commonMessages.cancelButton) }}
-						</button>
-					</ButtonStyled>
-					<ButtonStyled color="brand">
-						<button @click="bulkEditLinks()">
-							<SaveIcon />
-							{{ formatMessage(commonMessages.saveChangesButton) }}
-						</button>
-					</ButtonStyled>
+					<Button type="outlined" @click="$refs.editLinksModal.hide()">
+						<XIcon />
+						{{ formatMessage(commonMessages.cancelButton) }}
+					</Button>
+					<Button type="colored" color="brand" @click="bulkEditLinks()">
+						<SaveIcon />
+						{{ formatMessage(commonMessages.saveChangesButton) }}
+					</Button>
 				</div>
 			</div>
 		</NewModal>
@@ -173,12 +161,10 @@
 							{{ formatMessage(messages.headTitle) }}
 						</h2>
 						<div class="flex w-full flex-wrap items-center gap-2 md:w-auto">
-							<ButtonStyled color="brand">
-								<button @click="$refs.modal_creation.show($event)">
-									<PlusIcon />
-									{{ formatMessage(commonMessages.createAProjectButton) }}
-								</button>
-							</ButtonStyled>
+							<Button type="colored" color="brand" @click="$refs.modal_creation.show($event)">
+								<PlusIcon />
+								{{ formatMessage(commonMessages.createAProjectButton) }}
+							</Button>
 						</div>
 					</div>
 				</template>
@@ -251,26 +237,23 @@
 				</template>
 				<template #cell-actions="{ row: project }">
 					<div class="flex !flex-row items-center !justify-end gap-2">
-						<ButtonStyled
+						<ButtonLink
 							v-if="projectsWithMigrationWarning.includes(project.id)"
-							circular
+							v-tooltip="formatMessage(messages.reviewEnvironmentMetadata)"
+							type="colored"
 							color="orange"
+							:to="`${getProjectUrl(project)}?showEnvironmentMigrationWarning=true`"
+							class="!w-9 !rounded-full !px-0"
 						>
-							<nuxt-link
-								v-tooltip="formatMessage(messages.reviewEnvironmentMetadata)"
-								:to="`${getProjectUrl(project)}?showEnvironmentMigrationWarning=true`"
-							>
-								<TriangleAlertIcon />
-							</nuxt-link>
-						</ButtonStyled>
-						<ButtonStyled circular>
-							<nuxt-link
-								v-tooltip="formatMessage(commonMessages.settingsLabel)"
-								:to="`${getProjectUrl(project)}/settings`"
-							>
-								<SettingsIcon />
-							</nuxt-link>
-						</ButtonStyled>
+							<TriangleAlertIcon />
+						</ButtonLink>
+						<ButtonLink
+							v-tooltip="formatMessage(commonMessages.settingsLabel)"
+							:to="`${getProjectUrl(project)}/settings`"
+							class="!w-9 !rounded-full !px-0"
+						>
+							<SettingsIcon />
+						</ButtonLink>
 					</div>
 				</template>
 			</Table>
@@ -320,25 +303,27 @@
 					{{ formatMessage(messages.selectedProjectsCount, { count: selectedProjects.length }) }}
 				</span>
 				<div class="mx-0.5 h-6 w-px bg-surface-5" />
-				<ButtonStyled type="transparent">
-					<button
-						v-tooltip="formatMessage(commonMessages.clearButton)"
-						class="!text-primary"
-						@click="clearProjectSelection()"
-					>
-						<XIcon class="cq-show-icon hidden" />
-						<span class="bar-label">{{ formatMessage(commonMessages.clearButton) }}</span>
-					</button>
-				</ButtonStyled>
+				<Button
+					v-tooltip="formatMessage(commonMessages.clearButton)"
+					type="quiet"
+					class="!text-primary"
+					@click="clearProjectSelection()"
+				>
+					<XIcon class="cq-show-icon hidden" />
+					<span class="bar-label">{{ formatMessage(commonMessages.clearButton) }}</span>
+				</Button>
 			</div>
 
 			<div class="ml-auto flex items-center gap-0.5">
-				<ButtonStyled color="brand">
-					<button v-tooltip="formatMessage(messages.editLinksButton)" @click="showEditLinksModal()">
-						<EditIcon />
-						<span class="bar-label">{{ formatMessage(messages.editLinksButton) }}</span>
-					</button>
-				</ButtonStyled>
+				<Button
+					v-tooltip="formatMessage(messages.editLinksButton)"
+					type="colored"
+					color="brand"
+					@click="showEditLinksModal()"
+				>
+					<EditIcon />
+					<span class="bar-label">{{ formatMessage(messages.editLinksButton) }}</span>
+				</Button>
 			</div>
 		</FloatingActionBar>
 	</div>
@@ -357,12 +342,14 @@ import {
 	XIcon,
 } from '@modrinth/assets'
 import {
-	ButtonStyled,
+	Button,
+	ButtonLink,
 	Checkbox,
 	commonMessages,
 	CopyCode,
 	defineMessages,
 	FloatingActionBar,
+	IconButton,
 	injectNotificationManager,
 	IntlFormatted,
 	NewModal,
diff --git a/apps/frontend/src/pages/dashboard/revenue/transfers.vue b/apps/frontend/src/pages/dashboard/revenue/transfers.vue
index 2dadf99100..5fb7030005 100644
--- a/apps/frontend/src/pages/dashboard/revenue/transfers.vue
+++ b/apps/frontend/src/pages/dashboard/revenue/transfers.vue
@@ -13,16 +13,15 @@
 					"
 					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>
+				<IconButton
+					v-tooltip="formatMessage(messages.downloadCsv)"
+					:label="formatMessage(messages.downloadCsv)"
+					:disabled="buildingCsv"
+					@click="onDownloadCSV"
+				>
+					<SpinnerIcon v-if="buildingCsv" class="animate-spin" />
+					<DownloadIcon v-else />
+				</IconButton>
 			</div>
 		</div>
 		<div class="grid grid-cols-1 gap-4 sm:grid-cols-3">
@@ -90,10 +89,10 @@ import {
 	SpinnerIcon,
 } from '@modrinth/assets'
 import {
-	ButtonStyled,
 	Combobox,
 	defineMessages,
 	EmptyState,
+	IconButton,
 	injectModrinthClient,
 	useFormatDateTime,
 	useFormatMoney,
diff --git a/apps/frontend/src/pages/hosting/index.vue b/apps/frontend/src/pages/hosting/index.vue
index dece65edec..3b7767f78b 100644
--- a/apps/frontend/src/pages/hosting/index.vue
+++ b/apps/frontend/src/pages/hosting/index.vue
@@ -50,21 +50,23 @@
 					<div
 						class="flex w-full flex-col items-center gap-5 text-center align-middle sm:w-fit sm:flex-row"
 					>
-						<ButtonStyled color="brand" size="large">
-							<nuxt-link class="w-fit" to="#plan">
-								<GameIcon aria-hidden="true" />
-								{{
-									hasServers
-										? formatMessage(messages.startANewServer)
-										: formatMessage(messages.startYourServer)
-								}}
-							</nuxt-link>
-						</ButtonStyled>
-						<ButtonStyled v-if="hasServers" type="outlined" size="large">
-							<nuxt-link class="w-fit" to="/hosting/manage">
-								<BoxIcon aria-hidden="true" /> {{ formatMessage(messages.manageYourServers) }}
-							</nuxt-link>
-						</ButtonStyled>
+						<ButtonLink type="colored" color="brand" size="xl" class="w-fit" to="#plan">
+							<GameIcon aria-hidden="true" />
+							{{
+								hasServers
+									? formatMessage(messages.startANewServer)
+									: formatMessage(messages.startYourServer)
+							}}
+						</ButtonLink>
+						<ButtonLink
+							v-if="hasServers"
+							type="outlined"
+							size="xl"
+							class="w-fit"
+							to="/hosting/manage"
+						>
+							<BoxIcon aria-hidden="true" /> {{ formatMessage(messages.manageYourServers) }}
+						</ButtonLink>
 					</div>
 				</div>
 			</div>
@@ -603,12 +605,10 @@
 					</div>
 
 					<div class="flex w-full flex-col-reverse gap-2 md:w-auto md:flex-col md:items-center">
-						<ButtonStyled color="standard" size="large">
-							<button class="w-full md:w-fit" @click="selectProduct('custom')">
-								{{ formatMessage(messages.getStartedButton) }}
-								<RightArrowIcon class="shrink-0" />
-							</button>
-						</ButtonStyled>
+						<Button size="xl" class="w-full md:w-fit" @click="selectProduct('custom')">
+							{{ formatMessage(messages.getStartedButton) }}
+							<RightArrowIcon class="shrink-0" />
+						</Button>
 						<p v-if="lowestPrice" class="m-0 text-sm">
 							{{
 								formatMessage(messages.startingAtPrice, {
@@ -634,7 +634,8 @@ import {
 	VersionIcon,
 } from '@modrinth/assets'
 import {
-	ButtonStyled,
+	Button,
+	ButtonLink,
 	commonMessages,
 	defineMessages,
 	injectModrinthClient,
diff --git a/apps/frontend/src/pages/index.vue b/apps/frontend/src/pages/index.vue
index 406db83516..c226a6d8c7 100644
--- a/apps/frontend/src/pages/index.vue
+++ b/apps/frontend/src/pages/index.vue
@@ -26,22 +26,24 @@
 				{{ formatMessage(messages.discoverHeading) }}
 			</h2>
 			<div class="button-group">
-				<ButtonStyled color="brand" size="large">
-					<nuxt-link to="/discover/mods">
-						<CompassIcon aria-hidden="true" />
-						{{ formatMessage(messages.discoverMods) }}
-					</nuxt-link>
-				</ButtonStyled>
-				<ButtonStyled size="large" type="outlined">
-					<nuxt-link v-if="!auth.user" to="/auth/sign-up" rel="noopener nofollow">
-						<LogInIcon aria-hidden="true" />
-						{{ formatMessage(commonMessages.signUpButton) }}
-					</nuxt-link>
-					<nuxt-link v-else to="/dashboard/projects">
-						<DashboardIcon aria-hidden="true" />
-						{{ formatMessage(messages.goToDashboard) }}
-					</nuxt-link>
-				</ButtonStyled>
+				<ButtonLink type="colored" color="brand" size="xl" to="/discover/mods">
+					<CompassIcon aria-hidden="true" />
+					{{ formatMessage(messages.discoverMods) }}
+				</ButtonLink>
+				<ButtonLink
+					v-if="!auth.user"
+					type="outlined"
+					size="xl"
+					to="/auth/sign-up"
+					rel="noopener nofollow"
+				>
+					<LogInIcon aria-hidden="true" />
+					{{ formatMessage(commonMessages.signUpButton) }}
+				</ButtonLink>
+				<ButtonLink v-else type="outlined" size="xl" to="/dashboard/projects">
+					<DashboardIcon aria-hidden="true" />
+					{{ formatMessage(messages.goToDashboard) }}
+				</ButtonLink>
 			</div>
 		</div>
 		<div class="users-section-outer">
@@ -444,7 +446,7 @@ import {
 } from '@modrinth/assets'
 import {
 	Avatar,
-	ButtonStyled,
+	ButtonLink,
 	commonMessages,
 	defineMessages,
 	DropdownSelect,
diff --git a/apps/frontend/src/pages/moderation/external-projects.vue b/apps/frontend/src/pages/moderation/external-projects.vue
index fde7ff7ef2..f77e72e99d 100644
--- a/apps/frontend/src/pages/moderation/external-projects.vue
+++ b/apps/frontend/src/pages/moderation/external-projects.vue
@@ -37,14 +37,10 @@
 				class="w-[30rem]"
 			/>
 			<div class="flex justify-end gap-2">
-				<ButtonStyled>
-					<button @click="closeEditModal">Cancel</button>
-				</ButtonStyled>
-				<ButtonStyled color="brand">
-					<button type="submit" :disabled="isSavingEdit">
-						{{ isSavingEdit ? 'Saving...' : 'Save' }}
-					</button>
-				</ButtonStyled>
+				<Button @click="closeEditModal">Cancel</Button>
+				<Button type="colored" color="brand" native-type="submit" :disabled="isSavingEdit">
+					{{ isSavingEdit ? 'Saving...' : 'Save' }}
+				</Button>
 			</div>
 		</form>
 	</NewModal>
@@ -59,24 +55,18 @@
 				clearable
 				wrapper-class="flex-1 w-full"
 			/>
-			<ButtonStyled color="brand">
-				<button type="submit">
-					<SearchIcon aria-hidden="true" />
-					Search by title
-				</button>
-			</ButtonStyled>
-			<ButtonStyled>
-				<button type="button" @click="executeFlameIdLookup">
-					<BinaryIcon aria-hidden="true" />
-					Lookup CurseForge ID
-				</button>
-			</ButtonStyled>
-			<ButtonStyled>
-				<button type="button" @click="executeSha1Lookup">
-					<HashIcon aria-hidden="true" />
-					Lookup SHA-1
-				</button>
-			</ButtonStyled>
+			<Button type="colored" color="brand" native-type="submit">
+				<SearchIcon aria-hidden="true" />
+				Search by title
+			</Button>
+			<Button native-type="button" @click="executeFlameIdLookup">
+				<BinaryIcon aria-hidden="true" />
+				Lookup CurseForge ID
+			</Button>
+			<Button native-type="button" @click="executeSha1Lookup">
+				<HashIcon aria-hidden="true" />
+				Lookup SHA-1
+			</Button>
 		</form>
 		<div>
 			<template v-if="lastSearchKind !== 'none'">
@@ -106,12 +96,10 @@
 							:cf_id="project.flame_project_id"
 						>
 							<template #actions>
-								<ButtonStyled>
-									<button @click="openEditModal(project)">
-										<EditIcon />
-										Edit
-									</button>
-								</ButtonStyled>
+								<Button @click="openEditModal(project)">
+									<EditIcon />
+									Edit
+								</Button>
 							</template>
 						</ExternalProjectLookupCard>
 					</div>
@@ -130,8 +118,8 @@
 <script setup lang="ts">
 import type { Labrinth } from '@modrinth/api-client'
 import { BinaryIcon, EditIcon, HashIcon, SearchIcon } from '@modrinth/assets'
+import { Button } from '@modrinth/ui'
 import {
-	ButtonStyled,
 	Combobox,
 	type ComboboxOption,
 	EmptyState,
diff --git a/apps/frontend/src/pages/moderation/global-traces/[key].vue b/apps/frontend/src/pages/moderation/global-traces/[key].vue
index 96121bc2c0..5adc6c9041 100644
--- a/apps/frontend/src/pages/moderation/global-traces/[key].vue
+++ b/apps/frontend/src/pages/moderation/global-traces/[key].vue
@@ -1,12 +1,10 @@
 <template>
 	<div class="flex flex-col gap-4">
 		<div>
-			<ButtonStyled>
-				<NuxtLink to="/moderation/global-traces">
-					<ArrowLeftIcon aria-hidden="true" />
-					Back to global traces
-				</NuxtLink>
-			</ButtonStyled>
+			<ButtonLink to="/moderation/global-traces">
+				<ArrowLeftIcon aria-hidden="true" />
+				Back to global traces
+			</ButtonLink>
 		</div>
 
 		<EmptyState
@@ -49,12 +47,10 @@
 				</div>
 				<div class="flex shrink-0 flex-nowrap items-center gap-2">
 					<Badge :type="trace.verdict" />
-					<ButtonStyled color="red">
-						<button :disabled="isRemoving" @click="removeGlobalTrace">
-							<TrashIcon aria-hidden="true" />
-							Remove
-						</button>
-					</ButtonStyled>
+					<Button type="colored" color="red" :disabled="isRemoving" @click="removeGlobalTrace">
+						<TrashIcon aria-hidden="true" />
+						Remove
+					</Button>
 				</div>
 			</div>
 
@@ -95,7 +91,8 @@ import type { Labrinth } from '@modrinth/api-client'
 import { ArrowLeftIcon, HashIcon, TrashIcon } from '@modrinth/assets'
 import {
 	Badge,
-	ButtonStyled,
+	Button,
+	ButtonLink,
 	EmptyState,
 	injectModrinthClient,
 	injectNotificationManager,
diff --git a/apps/frontend/src/pages/moderation/index.vue b/apps/frontend/src/pages/moderation/index.vue
index f89d6d2c8c..a0af2fbbf0 100644
--- a/apps/frontend/src/pages/moderation/index.vue
+++ b/apps/frontend/src/pages/moderation/index.vue
@@ -18,7 +18,8 @@
 					<Combobox
 						v-model="currentFilterType"
 						class="!w-full flex-grow sm:!w-[280px] sm:flex-grow-0 lg:!w-[280px]"
-						trigger-class="!h-10"
+						trigger-type="base"
+						trigger-size="lg"
 						:options="filterTypes"
 						:placeholder="formatMessage(commonMessages.filterByLabel)"
 						@select="goToPage(1)"
@@ -36,7 +37,8 @@
 					<Combobox
 						v-model="currentSortType"
 						class="!w-full flex-grow sm:!w-[240px] sm:flex-grow-0"
-						trigger-class="!h-10"
+						trigger-type="base"
+						trigger-size="lg"
 						:options="sortTypes"
 						:placeholder="formatMessage(commonMessages.sortByLabel)"
 						@select="goToPage(1)"
@@ -56,7 +58,8 @@
 					<Combobox
 						v-model="itemsPerPage"
 						class="!w-full flex-grow sm:!w-[160px] sm:flex-grow-0 lg:!w-[140px]"
-						trigger-class="!h-10"
+						trigger-type="base"
+						trigger-size="lg"
 						:options="itemsPerPageOptions"
 						placeholder="Items per page"
 						@select="goToPage(1)"
@@ -69,17 +72,17 @@
 					</Combobox>
 				</div>
 
-				<ButtonStyled color="orange">
-					<button
-						class="flex !h-[40px] w-full items-center justify-center gap-2 sm:w-auto"
-						:disabled="pending || paginatedProjects?.length === 0"
-						@click="moderateAllInFilter()"
-					>
-						<ScaleIcon class="flex-shrink-0" />
-						<span class="hidden sm:inline">{{ formatMessage(messages.moderate) }}</span>
-						<span class="sm:hidden">Moderate</span>
-					</button>
-				</ButtonStyled>
+				<Button
+					type="colored"
+					color="orange"
+					class="flex !h-[40px] w-full items-center justify-center gap-2 sm:w-auto"
+					:disabled="pending || paginatedProjects?.length === 0"
+					@click="moderateAllInFilter()"
+				>
+					<ScaleIcon class="flex-shrink-0" />
+					<span class="hidden sm:inline">{{ formatMessage(messages.moderate) }}</span>
+					<span class="sm:hidden">Moderate</span>
+				</Button>
 			</div>
 		</div>
 
@@ -139,8 +142,8 @@
 <script setup lang="ts">
 import type { Labrinth } from '@modrinth/api-client'
 import { ListFilterIcon, ScaleIcon, SearchIcon, SortAscIcon, SortDescIcon } from '@modrinth/assets'
+import { Button } from '@modrinth/ui'
 import {
-	ButtonStyled,
 	Combobox,
 	type ComboboxOption,
 	commonMessages,
diff --git a/apps/frontend/src/pages/moderation/reports/index.vue b/apps/frontend/src/pages/moderation/reports/index.vue
index 69b82307dc..67973d5e54 100644
--- a/apps/frontend/src/pages/moderation/reports/index.vue
+++ b/apps/frontend/src/pages/moderation/reports/index.vue
@@ -21,6 +21,8 @@
 					class="!w-full flex-grow sm:!w-[200px] sm:flex-grow-0"
 					:options="messageFilterTypes"
 					:placeholder="formatMessage(commonMessages.filterByLabel)"
+					trigger-type="base"
+					trigger-size="lg"
 					@select="goToPage(1)"
 				>
 					<template #selected="{ label: messageLabel }">
@@ -38,6 +40,8 @@
 					class="!w-full flex-grow sm:!w-[150px] sm:flex-grow-0 lg:!w-[150px]"
 					:options="sortTypes"
 					:placeholder="formatMessage(commonMessages.sortByLabel)"
+					trigger-type="base"
+					trigger-size="lg"
 					@select="goToPage(1)"
 				>
 					<template #selected="{ label: sortingLabel }">
@@ -61,6 +65,8 @@
 					:searchable="reporterOrProjectOptions.length > 6"
 					:max-tag-rows="1"
 					fit-content
+					trigger-type="base"
+					trigger-size="lg"
 					checkbox-position="right"
 					show-selection-actions
 					should-show-select-all
@@ -69,7 +75,7 @@
 					<template #input-content="{ isOpen, openDirection }">
 						<div class="flex min-h-7 min-w-0 max-w-full flex-1 items-center gap-1.5 pr-1">
 							<LayersIcon class="size-5 shrink-0 text-primary" />
-							<span class="min-w-0 flex-1 truncate px-0.5 font-semibold text-primary">
+							<span class="min-w-0 flex-1 truncate px-0.5 font-semibold text-inherit">
 								{{
 									currentReporterOrProject.length === 0
 										? 'All Reports'
@@ -118,8 +124,11 @@
 					</template>
 				</MultiSelect>
 
-				<FloatingPanel button-class="!h-10 !shadow-none !text-contrast" :auto-focus="false">
-					<BlendIcon class="size-5" /> Advanced filters
+				<TeleportPopoutMenu label="Advanced filters" size="lg" :auto-focus="false">
+					<template #trigger>
+						<BlendIcon aria-hidden="true" />
+						Advanced filters
+					</template>
 					<template #panel>
 						<div class="flex min-w-64 flex-col gap-3">
 							<div class="flex flex-col gap-2">
@@ -156,7 +165,7 @@
 							</div>
 						</div>
 					</template>
-				</FloatingPanel>
+				</TeleportPopoutMenu>
 			</div>
 		</div>
 
@@ -208,12 +217,12 @@ import {
 	Combobox,
 	type ComboboxOption,
 	commonMessages,
-	FloatingPanel,
 	injectModrinthClient,
 	MultiSelect,
 	type MultiSelectItem,
 	Pagination,
 	StyledInput,
+	TeleportPopoutMenu,
 	useVIntl,
 } from '@modrinth/ui'
 import Fuse from 'fuse.js'
diff --git a/apps/frontend/src/pages/moderation/technical-review/[project].vue b/apps/frontend/src/pages/moderation/technical-review/[project].vue
index af938bca01..6f04ae4823 100644
--- a/apps/frontend/src/pages/moderation/technical-review/[project].vue
+++ b/apps/frontend/src/pages/moderation/technical-review/[project].vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import type { Labrinth } from '@modrinth/api-client'
 import { ArrowLeftIcon, LoaderCircleIcon } from '@modrinth/assets'
-import { ButtonStyled, injectModrinthClient } from '@modrinth/ui'
+import { ButtonLink, injectModrinthClient } from '@modrinth/ui'
 import { useQuery, useQueryClient } from '@tanstack/vue-query'
 
 import MaliciousSummaryModal, {
@@ -274,12 +274,10 @@ function refetch() {
 <template>
 	<div class="flex flex-col gap-4">
 		<div>
-			<ButtonStyled
-				><nuxt-link :to="'/moderation/technical-review'">
-					<ArrowLeftIcon class="size-5" />
-					Back to queue
-				</nuxt-link></ButtonStyled
-			>
+			<ButtonLink :to="'/moderation/technical-review'">
+				<ArrowLeftIcon class="size-5" />
+				Back to queue
+			</ButtonLink>
 		</div>
 
 		<div v-if="isLoading" class="flex flex-col gap-4">
diff --git a/apps/frontend/src/pages/moderation/technical-review/index.vue b/apps/frontend/src/pages/moderation/technical-review/index.vue
index d66a0a4b2f..23877ace6b 100644
--- a/apps/frontend/src/pages/moderation/technical-review/index.vue
+++ b/apps/frontend/src/pages/moderation/technical-review/index.vue
@@ -12,10 +12,10 @@ import {
 	Combobox,
 	type ComboboxOption,
 	commonMessages,
-	FloatingPanel,
 	injectModrinthClient,
 	Pagination,
 	StyledInput,
+	TeleportPopoutMenu,
 	Toggle,
 	useVIntl,
 } from '@modrinth/ui'
@@ -611,6 +611,8 @@ watch(totalPages, (pages) => {
 					v-model="currentResponseFilter"
 					class="!w-full flex-grow sm:!w-[120px] sm:flex-grow-0"
 					:options="responseFilterTypes"
+					trigger-type="base"
+					trigger-size="lg"
 				>
 					<template #selected>
 						<span class="flex flex-row gap-2 align-middle font-semibold">
@@ -625,6 +627,8 @@ watch(totalPages, (pages) => {
 					class="!w-full flex-grow sm:!w-[215px] sm:flex-grow-0"
 					:options="sortTypes"
 					:placeholder="formatMessage(commonMessages.sortByLabel)"
+					trigger-type="base"
+					trigger-size="lg"
 				>
 					<template #selected>
 						<span class="flex flex-row gap-2 align-middle font-semibold">
@@ -638,8 +642,11 @@ watch(totalPages, (pages) => {
 					</template>
 				</Combobox>
 
-				<FloatingPanel button-class="!h-10 !shadow-none !text-contrast">
-					<BlendIcon class="size-5" /> Advanced filters
+				<TeleportPopoutMenu label="Advanced filters" size="lg">
+					<template #trigger>
+						<BlendIcon aria-hidden="true" />
+						Advanced filters
+					</template>
 					<template #panel>
 						<div class="flex min-w-64 flex-col gap-3">
 							<label class="flex cursor-pointer items-center justify-between gap-2 text-sm">
@@ -684,7 +691,7 @@ watch(totalPages, (pages) => {
 							</div>
 						</div>
 					</template>
-				</FloatingPanel>
+				</TeleportPopoutMenu>
 			</div>
 		</div>
 
diff --git a/apps/frontend/src/pages/news/article/[slug].vue b/apps/frontend/src/pages/news/article/[slug].vue
index e4131c8d51..e1aaafde2e 100644
--- a/apps/frontend/src/pages/news/article/[slug].vue
+++ b/apps/frontend/src/pages/news/article/[slug].vue
@@ -4,7 +4,7 @@ import { articles as rawArticles } from '@modrinth/blog'
 import {
 	ArticleBody,
 	Avatar,
-	ButtonStyled,
+	ButtonLink,
 	injectModrinthClient,
 	useFormatDateTime,
 } from '@modrinth/ui'
@@ -123,16 +123,23 @@ onMounted(() => {
 			</nuxt-link>
 			<div class="flex gap-2">
 				<NewsletterButton />
-				<ButtonStyled circular>
-					<a v-tooltip="`RSS feed`" aria-label="RSS feed" href="/news/feed/rss.xml" target="_blank">
-						<RssIcon />
-					</a>
-				</ButtonStyled>
-				<ButtonStyled circular>
-					<a v-tooltip="`Changelog`" href="/news/changelog" aria-label="Changelog">
-						<GitGraphIcon />
-					</a>
-				</ButtonStyled>
+				<ButtonLink
+					v-tooltip="`RSS feed`"
+					aria-label="RSS feed"
+					href="/news/feed/rss.xml"
+					target="_blank"
+					class="!w-9 !rounded-full !px-0"
+				>
+					<RssIcon />
+				</ButtonLink>
+				<ButtonLink
+					v-tooltip="`Changelog`"
+					href="/news/changelog"
+					aria-label="Changelog"
+					class="!w-9 !rounded-full !px-0"
+				>
+					<GitGraphIcon />
+				</ButtonLink>
 			</div>
 		</div>
 		<article class="mt-6 flex flex-col gap-4 px-6">
diff --git a/apps/frontend/src/pages/news/index.vue b/apps/frontend/src/pages/news/index.vue
index b15e1ee82c..0398072638 100644
--- a/apps/frontend/src/pages/news/index.vue
+++ b/apps/frontend/src/pages/news/index.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { ChevronRightIcon, GitGraphIcon, RssIcon } from '@modrinth/assets'
 import { articles as rawArticles } from '@modrinth/blog'
-import { ButtonStyled, NewsArticleCard, useFormatDateTime } from '@modrinth/ui'
+import { ButtonLink, NewsArticleCard, useFormatDateTime } from '@modrinth/ui'
 import { computed, ref } from 'vue'
 
 import NewsletterButton from '~/components/ui/NewsletterButton.vue'
@@ -48,16 +48,23 @@ useSeoMeta({
 			</div>
 			<div class="flex gap-2">
 				<NewsletterButton />
-				<ButtonStyled circular>
-					<a v-tooltip="`RSS feed`" aria-label="RSS feed" href="/news/feed/rss.xml" target="_blank">
-						<RssIcon />
-					</a>
-				</ButtonStyled>
-				<ButtonStyled circular>
-					<a v-tooltip="`Changelog`" href="/news/changelog" aria-label="Changelog">
-						<GitGraphIcon />
-					</a>
-				</ButtonStyled>
+				<ButtonLink
+					v-tooltip="`RSS feed`"
+					aria-label="RSS feed"
+					href="/news/feed/rss.xml"
+					target="_blank"
+					class="!w-9 !rounded-full !px-0"
+				>
+					<RssIcon />
+				</ButtonLink>
+				<ButtonLink
+					v-tooltip="`Changelog`"
+					href="/news/changelog"
+					aria-label="Changelog"
+					class="!w-9 !rounded-full !px-0"
+				>
+					<GitGraphIcon />
+				</ButtonLink>
 			</div>
 		</div>
 
diff --git a/apps/frontend/src/pages/organization/[organization].vue b/apps/frontend/src/pages/organization/[organization].vue
index 23193af2fa..740318d10a 100644
--- a/apps/frontend/src/pages/organization/[organization].vue
+++ b/apps/frontend/src/pages/organization/[organization].vue
@@ -112,18 +112,14 @@
 					<h2>Invitation to join {{ organization.name }}</h2>
 					<p>You have been invited to join {{ organization.name }}.</p>
 					<div class="input-group">
-						<ButtonStyled color="brand">
-							<button @click="onAcceptInvite">
-								<CheckIcon />
-								Accept
-							</button>
-						</ButtonStyled>
-						<ButtonStyled color="red">
-							<button @click="onDeclineInvite">
-								<XIcon />
-								Decline
-							</button>
-						</ButtonStyled>
+						<Button type="colored" color="brand" @click="onAcceptInvite">
+							<CheckIcon />
+							Accept
+						</Button>
+						<Button type="colored" color="red" @click="onDeclineInvite">
+							<XIcon />
+							Decline
+						</Button>
 					</div>
 				</div>
 				<div v-if="navLinks.length > 2" class="mb-4 max-w-full overflow-x-auto">
@@ -229,7 +225,7 @@ import {
 } from '@modrinth/assets'
 import {
 	Avatar,
-	ButtonStyled,
+	Button,
 	commonMessages,
 	defineMessages,
 	injectModrinthClient,
diff --git a/apps/frontend/src/pages/organization/[organization]/settings/index.vue b/apps/frontend/src/pages/organization/[organization]/settings/index.vue
index a4169823e6..1d56108c92 100644
--- a/apps/frontend/src/pages/organization/[organization]/settings/index.vue
+++ b/apps/frontend/src/pages/organization/[organization]/settings/index.vue
@@ -2,9 +2,9 @@
 import { TrashIcon, UploadIcon } from '@modrinth/assets'
 import {
 	Avatar,
-	ButtonStyled,
+	Button,
 	ConfirmModal,
-	FileInput,
+	FileButton,
 	injectNotificationManager,
 	StyledInput,
 	UnsavedChangesPopup,
@@ -162,26 +162,25 @@ const onDeleteOrganization = useClientTry(async () => {
 					class="project__icon"
 				/>
 				<div class="flex flex-col gap-2">
-					<ButtonStyled>
-						<FileInput
-							id="project-icon"
-							:max-size="262144"
-							:show-icon="true"
-							accept="image/png,image/jpeg,image/gif,image/webp"
-							class="button-like"
-							prompt="Upload icon"
-							:disabled="!hasPermission"
-							@change="showPreviewImage"
-						>
-							<UploadIcon />
-						</FileInput>
-					</ButtonStyled>
-					<ButtonStyled v-if="!deletedIcon && (previewImage || organization.icon_url)">
-						<button :disabled="!hasPermission" @click="markIconForDeletion">
-							<TrashIcon />
-							Remove icon
-						</button>
-					</ButtonStyled>
+					<FileButton
+						id="project-icon"
+						:max-size="262144"
+						accept="image/png,image/jpeg,image/gif,image/webp"
+						class="button-like"
+						prompt="Upload icon"
+						:disabled="!hasPermission"
+						@change="showPreviewImage"
+					>
+						<UploadIcon />
+					</FileButton>
+					<Button
+						v-if="!deletedIcon && (previewImage || organization.icon_url)"
+						:disabled="!hasPermission"
+						@click="markIconForDeletion"
+					>
+						<TrashIcon />
+						Remove icon
+					</Button>
 				</div>
 			</div>
 
@@ -231,12 +230,10 @@ const onDeleteOrganization = useClientTry(async () => {
 				Deleting your organization will transfer all of its projects to the organization owner. This
 				action cannot be undone.
 			</p>
-			<ButtonStyled color="red">
-				<button @click="() => $refs.modal_deletion.show()">
-					<TrashIcon />
-					Delete organization
-				</button>
-			</ButtonStyled>
+			<Button type="colored" color="red" @click="() => $refs.modal_deletion.show()">
+				<TrashIcon />
+				Delete organization
+			</Button>
 		</div>
 		<UnsavedChangesPopup
 			:original="originalState"
diff --git a/apps/frontend/src/pages/organization/[organization]/settings/members.vue b/apps/frontend/src/pages/organization/[organization]/settings/members.vue
index 59efe57a53..47f4b45fc8 100644
--- a/apps/frontend/src/pages/organization/[organization]/settings/members.vue
+++ b/apps/frontend/src/pages/organization/[organization]/settings/members.vue
@@ -43,20 +43,20 @@
 					@keypress.enter="() => onInviteTeamMember(organization.team, currentUsername)"
 				/>
 				<label for="username" class="hidden">Username</label>
-				<ButtonStyled color="brand">
-					<button
-						:disabled="
-							!isPermission(
-								currentMember.organization_permissions,
-								organizationPermissions.MANAGE_INVITES,
-							)
-						"
-						@click="() => onInviteTeamMember(organization.team_id, currentUsername)"
-					>
-						<UserPlusIcon />
-						Invite
-					</button>
-				</ButtonStyled>
+				<Button
+					type="colored"
+					color="brand"
+					:disabled="
+						!isPermission(
+							currentMember.organization_permissions,
+							organizationPermissions.MANAGE_INVITES,
+						)
+					"
+					@click="() => onInviteTeamMember(organization.team_id, currentUsername)"
+				>
+					<UserPlusIcon />
+					Invite
+				</Button>
 			</div>
 			<div class="adjacent-input">
 				<span class="label">
@@ -65,15 +65,15 @@
 						Remove yourself as a member of this organization.
 					</span>
 				</span>
-				<ButtonStyled color="red">
-					<button
-						:disabled="currentMember.is_owner"
-						@click="() => onLeaveProject(organization.team_id, auth.user.id)"
-					>
-						<UserRemoveIcon />
-						Leave organization
-					</button>
-				</ButtonStyled>
+				<Button
+					type="colored"
+					color="red"
+					:disabled="currentMember.is_owner"
+					@click="() => onLeaveProject(organization.team_id, auth.user.id)"
+				>
+					<UserRemoveIcon />
+					Leave organization
+				</Button>
 			</div>
 		</div>
 		<div
@@ -96,18 +96,18 @@
 				<div class="side-buttons">
 					<Badge v-if="member.accepted" type="accepted" />
 					<Badge v-else type="pending" />
-					<ButtonStyled circular type="transparent">
-						<button
-							class="dropdown-icon"
-							@click="
-								openTeamMembers.indexOf(member.user.id) === -1
-									? openTeamMembers.push(member.user.id)
-									: (openTeamMembers = openTeamMembers.filter((it) => it !== member.user.id))
-							"
-						>
-							<DropdownIcon />
-						</button>
-					</ButtonStyled>
+					<IconButton
+						type="quiet"
+						label="Toggle details"
+						class="dropdown-icon"
+						@click="
+							openTeamMembers.indexOf(member.user.id) === -1
+								? openTeamMembers.push(member.user.id)
+								: (openTeamMembers = openTeamMembers.filter((it) => it !== member.user.id))
+						"
+					>
+						<DropdownIcon />
+					</IconButton>
 				</div>
 			</div>
 			<div class="content">
@@ -190,44 +190,46 @@
 					</div>
 				</template>
 				<div class="input-group">
-					<ButtonStyled color="brand">
-						<button
-							:disabled="
-								!isPermission(
-									currentMember.organization_permissions,
-									organizationPermissions.EDIT_MEMBER,
-								)
-							"
-							@click="onUpdateTeamMember(organization.team_id, member)"
-						>
-							<SaveIcon />
-							Save changes
-						</button>
-					</ButtonStyled>
-					<ButtonStyled v-if="!member.is_owner" color="red">
-						<button
-							:disabled="
-								!isPermission(
-									currentMember.organization_permissions,
-									organizationPermissions.EDIT_MEMBER,
-								) &&
-								!isPermission(
-									currentMember.organization_permissions,
-									organizationPermissions.REMOVE_MEMBER,
-								)
-							"
-							@click="onRemoveMember(organization.team_id, member)"
-						>
-							<UserRemoveIcon />
-							Remove member
-						</button>
-					</ButtonStyled>
-					<ButtonStyled v-if="!member.is_owner && currentMember.is_owner && member.accepted">
-						<button @click="(e) => openTransferModal(member, e)">
-							<TransferIcon />
-							Transfer ownership
-						</button>
-					</ButtonStyled>
+					<Button
+						type="colored"
+						color="brand"
+						:disabled="
+							!isPermission(
+								currentMember.organization_permissions,
+								organizationPermissions.EDIT_MEMBER,
+							)
+						"
+						@click="onUpdateTeamMember(organization.team_id, member)"
+					>
+						<SaveIcon />
+						Save changes
+					</Button>
+					<Button
+						v-if="!member.is_owner"
+						type="colored"
+						color="red"
+						:disabled="
+							!isPermission(
+								currentMember.organization_permissions,
+								organizationPermissions.EDIT_MEMBER,
+							) &&
+							!isPermission(
+								currentMember.organization_permissions,
+								organizationPermissions.REMOVE_MEMBER,
+							)
+						"
+						@click="onRemoveMember(organization.team_id, member)"
+					>
+						<UserRemoveIcon />
+						Remove member
+					</Button>
+					<Button
+						v-if="!member.is_owner && currentMember.is_owner && member.accepted"
+						@click="(e) => openTransferModal(member, e)"
+					>
+						<TransferIcon />
+						Transfer ownership
+					</Button>
 				</div>
 			</div>
 		</div>
@@ -246,8 +248,9 @@ import {
 import {
 	Avatar,
 	Badge,
-	ButtonStyled,
+	Button,
 	Checkbox,
+	IconButton,
 	injectNotificationManager,
 	StyledInput,
 } from '@modrinth/ui'
diff --git a/apps/frontend/src/pages/organization/[organization]/settings/projects.vue b/apps/frontend/src/pages/organization/[organization]/settings/projects.vue
index d625181b13..58c6d58e66 100644
--- a/apps/frontend/src/pages/organization/[organization]/settings/projects.vue
+++ b/apps/frontend/src/pages/organization/[organization]/settings/projects.vue
@@ -17,17 +17,15 @@
 							:placeholder="getLinkInputPlaceholder(editLinks.issues.clear)"
 							:maxlength="2048"
 						/>
-						<ButtonStyled circular>
-							<button
-								v-tooltip="formatMessage(messages.clearLinkLabel)"
-								class="label-button"
-								:aria-label="formatMessage(messages.clearLinkLabel)"
-								:data-active="editLinks.issues.clear"
-								@click="editLinks.issues.clear = !editLinks.issues.clear"
-							>
-								<TrashIcon />
-							</button>
-						</ButtonStyled>
+						<IconButton
+							v-tooltip="formatMessage(messages.clearLinkLabel)"
+							:label="formatMessage(messages.clearLinkLabel)"
+							class="label-button"
+							:data-active="editLinks.issues.clear"
+							@click="editLinks.issues.clear = !editLinks.issues.clear"
+						>
+							<TrashIcon />
+						</IconButton>
 					</div>
 					<label for="source-code-input" :title="formatMessage(messages.sourceCodeDescription)">
 						<span class="label__title">{{ formatMessage(messages.sourceCodeLabel) }}</span>
@@ -42,17 +40,15 @@
 							:maxlength="2048"
 							:placeholder="getLinkInputPlaceholder(editLinks.source.clear)"
 						/>
-						<ButtonStyled circular>
-							<button
-								v-tooltip="formatMessage(messages.clearLinkLabel)"
-								class="label-button"
-								:aria-label="formatMessage(messages.clearLinkLabel)"
-								:data-active="editLinks.source.clear"
-								@click="editLinks.source.clear = !editLinks.source.clear"
-							>
-								<TrashIcon />
-							</button>
-						</ButtonStyled>
+						<IconButton
+							v-tooltip="formatMessage(messages.clearLinkLabel)"
+							:label="formatMessage(messages.clearLinkLabel)"
+							class="label-button"
+							:data-active="editLinks.source.clear"
+							@click="editLinks.source.clear = !editLinks.source.clear"
+						>
+							<TrashIcon />
+						</IconButton>
 					</div>
 					<label for="wiki-page-input" :title="formatMessage(messages.wikiPageDescription)">
 						<span class="label__title">{{ formatMessage(messages.wikiPageLabel) }}</span>
@@ -67,17 +63,15 @@
 							:maxlength="2048"
 							:placeholder="getLinkInputPlaceholder(editLinks.wiki.clear)"
 						/>
-						<ButtonStyled circular>
-							<button
-								v-tooltip="formatMessage(messages.clearLinkLabel)"
-								class="label-button"
-								:aria-label="formatMessage(messages.clearLinkLabel)"
-								:data-active="editLinks.wiki.clear"
-								@click="editLinks.wiki.clear = !editLinks.wiki.clear"
-							>
-								<TrashIcon />
-							</button>
-						</ButtonStyled>
+						<IconButton
+							v-tooltip="formatMessage(messages.clearLinkLabel)"
+							:label="formatMessage(messages.clearLinkLabel)"
+							class="label-button"
+							:data-active="editLinks.wiki.clear"
+							@click="editLinks.wiki.clear = !editLinks.wiki.clear"
+						>
+							<TrashIcon />
+						</IconButton>
 					</div>
 					<label
 						for="discord-invite-input"
@@ -95,17 +89,15 @@
 							:maxlength="2048"
 							:placeholder="getLinkInputPlaceholder(editLinks.discord.clear, true)"
 						/>
-						<ButtonStyled circular>
-							<button
-								v-tooltip="formatMessage(messages.clearLinkLabel)"
-								class="label-button"
-								:aria-label="formatMessage(messages.clearLinkLabel)"
-								:data-active="editLinks.discord.clear"
-								@click="editLinks.discord.clear = !editLinks.discord.clear"
-							>
-								<TrashIcon />
-							</button>
-						</ButtonStyled>
+						<IconButton
+							v-tooltip="formatMessage(messages.clearLinkLabel)"
+							:label="formatMessage(messages.clearLinkLabel)"
+							class="label-button"
+							:data-active="editLinks.discord.clear"
+							@click="editLinks.discord.clear = !editLinks.discord.clear"
+						>
+							<TrashIcon />
+						</IconButton>
 					</div>
 				</section>
 				<p>
@@ -141,18 +133,14 @@
 					:description="formatMessage(messages.showAllProjects)"
 				/>
 				<div class="input-group ml-auto mt-4">
-					<ButtonStyled type="outlined">
-						<button @click="$refs.editLinksModal.hide()">
-							<XIcon />
-							{{ formatMessage(commonMessages.cancelButton) }}
-						</button>
-					</ButtonStyled>
-					<ButtonStyled color="brand">
-						<button @click="bulkEditLinks()">
-							<SaveIcon />
-							{{ formatMessage(commonMessages.saveChangesButton) }}
-						</button>
-					</ButtonStyled>
+					<Button type="outlined" @click="$refs.editLinksModal.hide()">
+						<XIcon />
+						{{ formatMessage(commonMessages.cancelButton) }}
+					</Button>
+					<Button type="colored" color="brand" @click="bulkEditLinks()">
+						<SaveIcon />
+						{{ formatMessage(commonMessages.saveChangesButton) }}
+					</Button>
 				</div>
 			</div>
 		</NewModal>
@@ -177,12 +165,10 @@
 								:projects="usersOwnedProjects || []"
 								@submit="onProjectTransferSubmit"
 							/>
-							<ButtonStyled color="brand">
-								<button @click="$refs.modal_creation.show($event)">
-									<PlusIcon />
-									{{ formatMessage(commonMessages.createAProjectButton) }}
-								</button>
-							</ButtonStyled>
+							<Button type="colored" color="brand" @click="$refs.modal_creation.show($event)">
+								<PlusIcon />
+								{{ formatMessage(commonMessages.createAProjectButton) }}
+							</Button>
 						</div>
 					</div>
 				</template>
@@ -255,22 +241,23 @@
 				</template>
 				<template #cell-actions="{ row: project }">
 					<div class="flex !flex-row items-center !justify-end gap-2">
-						<ButtonStyled v-if="hasEnvironmentMigrationWarning(project)" circular color="orange">
-							<nuxt-link
-								v-tooltip="formatMessage(messages.reviewEnvironmentMetadata)"
-								:to="`${getProjectUrl(project)}?showEnvironmentMigrationWarning=true`"
-							>
-								<TriangleAlertIcon />
-							</nuxt-link>
-						</ButtonStyled>
-						<ButtonStyled circular>
-							<nuxt-link
-								v-tooltip="formatMessage(commonMessages.settingsLabel)"
-								:to="`${getProjectUrl(project)}/settings`"
-							>
-								<SettingsIcon />
-							</nuxt-link>
-						</ButtonStyled>
+						<ButtonLink
+							v-if="hasEnvironmentMigrationWarning(project)"
+							v-tooltip="formatMessage(messages.reviewEnvironmentMetadata)"
+							type="colored"
+							color="orange"
+							:to="`${getProjectUrl(project)}?showEnvironmentMigrationWarning=true`"
+							class="!w-9 !rounded-full !px-0"
+						>
+							<TriangleAlertIcon />
+						</ButtonLink>
+						<ButtonLink
+							v-tooltip="formatMessage(commonMessages.settingsLabel)"
+							:to="`${getProjectUrl(project)}/settings`"
+							class="!w-9 !rounded-full !px-0"
+						>
+							<SettingsIcon />
+						</ButtonLink>
 					</div>
 				</template>
 			</Table>
@@ -320,25 +307,27 @@
 					{{ formatMessage(messages.selectedProjectsCount, { count: selectedProjects.length }) }}
 				</span>
 				<div class="mx-0.5 h-6 w-px bg-surface-5" />
-				<ButtonStyled type="transparent">
-					<button
-						v-tooltip="formatMessage(commonMessages.clearButton)"
-						class="!text-primary"
-						@click="clearProjectSelection()"
-					>
-						<XIcon class="cq-show-icon hidden" />
-						<span class="bar-label">{{ formatMessage(commonMessages.clearButton) }}</span>
-					</button>
-				</ButtonStyled>
+				<Button
+					v-tooltip="formatMessage(commonMessages.clearButton)"
+					type="quiet"
+					class="!text-primary"
+					@click="clearProjectSelection()"
+				>
+					<XIcon class="cq-show-icon hidden" />
+					<span class="bar-label">{{ formatMessage(commonMessages.clearButton) }}</span>
+				</Button>
 			</div>
 
 			<div class="ml-auto flex items-center gap-0.5">
-				<ButtonStyled color="brand">
-					<button v-tooltip="formatMessage(messages.editLinksButton)" @click="showEditLinksModal()">
-						<EditIcon />
-						<span class="bar-label">{{ formatMessage(messages.editLinksButton) }}</span>
-					</button>
-				</ButtonStyled>
+				<Button
+					v-tooltip="formatMessage(messages.editLinksButton)"
+					type="colored"
+					color="brand"
+					@click="showEditLinksModal()"
+				>
+					<EditIcon />
+					<span class="bar-label">{{ formatMessage(messages.editLinksButton) }}</span>
+				</Button>
 			</div>
 		</FloatingActionBar>
 	</div>
@@ -357,12 +346,14 @@ import {
 	XIcon,
 } from '@modrinth/assets'
 import {
-	ButtonStyled,
+	Button,
+	ButtonLink,
 	Checkbox,
 	commonMessages,
 	CopyCode,
 	defineMessages,
 	FloatingActionBar,
+	IconButton,
 	injectModrinthClient,
 	injectNotificationManager,
 	IntlFormatted,
diff --git a/apps/frontend/src/pages/plus.vue b/apps/frontend/src/pages/plus.vue
index 7367b88647..8caab3edf8 100644
--- a/apps/frontend/src/pages/plus.vue
+++ b/apps/frontend/src/pages/plus.vue
@@ -38,20 +38,33 @@
 				{{ calculateSavings(price.prices.intervals.monthly, price.prices.intervals.yearly) }}% with
 				annual billing!
 			</p>
-			<ButtonStyled v-if="auth.user && hasActiveMidas(auth.user)" color="purple" size="large">
-				<nuxt-link to="/settings/billing">
-					<SettingsIcon aria-hidden="true" />
-					Manage subscription
-				</nuxt-link>
-			</ButtonStyled>
-			<ButtonStyled v-else-if="auth.user" color="purple" size="large">
-				<button @click="purchaseModal.show()">Subscribe</button>
-			</ButtonStyled>
-			<ButtonStyled v-else color="purple" size="large">
-				<nuxt-link :to="`/auth/sign-in?redirect=${encodeURIComponent('/plus?showModal=true')}`">
-					Subscribe
-				</nuxt-link>
-			</ButtonStyled>
+			<ButtonLink
+				v-if="auth.user && hasActiveMidas(auth.user)"
+				type="colored"
+				color="purple"
+				size="xl"
+				to="/settings/billing"
+			>
+				<SettingsIcon aria-hidden="true" />
+				Manage subscription
+			</ButtonLink>
+			<Button
+				v-else-if="auth.user"
+				type="colored"
+				color="purple"
+				size="xl"
+				@click="purchaseModal.show()"
+				>Subscribe</Button
+			>
+			<ButtonLink
+				v-else
+				type="colored"
+				color="purple"
+				size="xl"
+				:to="`/auth/sign-in?redirect=${encodeURIComponent('/plus?showModal=true')}`"
+			>
+				Subscribe
+			</ButtonLink>
 		</div>
 	</div>
 	<div class="perks-hero">
@@ -83,7 +96,8 @@
 <script setup>
 import { HeartIcon, ModrinthPlusIcon, SettingsIcon, SparklesIcon, StarIcon } from '@modrinth/assets'
 import {
-	ButtonStyled,
+	Button,
+	ButtonLink,
 	injectNotificationManager,
 	PurchaseModal,
 	useFormatPrice,
diff --git a/apps/frontend/src/pages/report.vue b/apps/frontend/src/pages/report.vue
index 4457940c76..d43a69ef14 100644
--- a/apps/frontend/src/pages/report.vue
+++ b/apps/frontend/src/pages/report.vue
@@ -23,21 +23,17 @@
 					})
 				}}
 				<div class="flex gap-2">
-					<ButtonStyled v-if="itemLink">
-						<nuxt-link :to="itemLink">
-							<LeftArrowIcon />
-							{{
-								formatMessage(messages.backToItem, {
-									item: formatReportItemType(formatMessage, reportItem),
-								})
-							}}
-						</nuxt-link>
-					</ButtonStyled>
-					<ButtonStyled color="brand">
-						<nuxt-link :to="`/dashboard/report/${existingReport.id}`">
-							{{ formatMessage(messages.goToReport) }} <RightArrowIcon />
-						</nuxt-link>
-					</ButtonStyled>
+					<ButtonLink v-if="itemLink" :to="itemLink">
+						<LeftArrowIcon />
+						{{
+							formatMessage(messages.backToItem, {
+								item: formatReportItemType(formatMessage, reportItem),
+							})
+						}}
+					</ButtonLink>
+					<ButtonLink type="colored" color="brand" :to="`/dashboard/report/${existingReport.id}`">
+						{{ formatMessage(messages.goToReport) }} <RightArrowIcon />
+					</ButtonLink>
 				</div>
 			</div>
 			<template v-else>
@@ -196,11 +192,14 @@
 								item: formatReportItemType(formatMessage, reportItem),
 							})
 						}}
-						<ButtonStyled color="brand">
-							<nuxt-link :to="`/dashboard/report/${existingReport.id}`" class="w-fit">
-								{{ formatMessage(messages.goToReport) }} <RightArrowIcon />
-							</nuxt-link>
-						</ButtonStyled>
+						<ButtonLink
+							type="colored"
+							color="brand"
+							:to="`/dashboard/report/${existingReport.id}`"
+							class="w-fit"
+						>
+							{{ formatMessage(messages.goToReport) }} <RightArrowIcon />
+						</ButtonLink>
 					</template>
 					<template v-else>
 						<div class="flex flex-col gap-2" :class="{ hidden: !reportItemID }">
@@ -252,16 +251,16 @@
 							/>
 						</div>
 						<div :class="{ hidden: !reportType }">
-							<ButtonStyled color="brand">
-								<button
-									id="submit-button"
-									:disabled="submitLoading || !canSubmit"
-									@click="submitReport"
-								>
-									<SendIcon aria-hidden="true" />
-									{{ formatMessage(messages.submitReport) }}
-								</button>
-							</ButtonStyled>
+							<Button
+								id="submit-button"
+								type="colored"
+								color="brand"
+								:disabled="submitLoading || !canSubmit"
+								@click="submitReport"
+							>
+								<SendIcon aria-hidden="true" />
+								{{ formatMessage(messages.submitReport) }}
+							</Button>
 						</div>
 					</template>
 				</div>
@@ -284,10 +283,10 @@ import {
 	VersionIcon,
 	XCircleIcon,
 } from '@modrinth/assets'
+import { Button, ButtonLink } from '@modrinth/ui'
 import {
 	AutoLink,
 	Avatar,
-	ButtonStyled,
 	commonMessages,
 	defineMessage,
 	defineMessages,
diff --git a/apps/frontend/src/pages/settings/account.vue b/apps/frontend/src/pages/settings/account.vue
index ce57a33618..33942d51e5 100644
--- a/apps/frontend/src/pages/settings/account.vue
+++ b/apps/frontend/src/pages/settings/account.vue
@@ -34,18 +34,14 @@
 					/>
 				</div>
 				<div class="flex justify-end gap-2.5">
-					<ButtonStyled>
-						<button @click="$refs.changeEmailModal.hide()">
-							<XIcon />
-							{{ formatMessage(commonMessages.cancelButton) }}
-						</button>
-					</ButtonStyled>
-					<ButtonStyled color="brand">
-						<button :disabled="!email" @click="saveEmail()">
-							<SaveIcon />
-							{{ formatMessage(messages.saveEmailButton) }}
-						</button>
-					</ButtonStyled>
+					<Button @click="$refs.changeEmailModal.hide()">
+						<XIcon />
+						{{ formatMessage(commonMessages.cancelButton) }}
+					</Button>
+					<Button type="colored" color="brand" :disabled="!email" @click="saveEmail()">
+						<SaveIcon />
+						{{ formatMessage(messages.saveEmailButton) }}
+					</Button>
 				</div>
 			</div>
 		</NewModal>
@@ -129,43 +125,39 @@
 					</div>
 				</template>
 				<div class="flex justify-end gap-2.5">
-					<ButtonStyled>
-						<button @click="$refs.managePasswordModal.hide()">
-							<XIcon />
-							{{ formatMessage(commonMessages.cancelButton) }}
-						</button>
-					</ButtonStyled>
+					<Button @click="$refs.managePasswordModal.hide()">
+						<XIcon />
+						{{ formatMessage(commonMessages.cancelButton) }}
+					</Button>
 					<template v-if="removePasswordMode">
-						<ButtonStyled color="red">
-							<button :disabled="!oldPassword" @click="savePassword">
-								<TrashIcon />
-								{{ formatMessage(messages.removePasswordButton) }}
-							</button>
-						</ButtonStyled>
+						<Button type="colored" color="red" :disabled="!oldPassword" @click="savePassword">
+							<TrashIcon />
+							{{ formatMessage(messages.removePasswordButton) }}
+						</Button>
 					</template>
 					<template v-else>
-						<ButtonStyled
+						<Button
 							v-if="auth.user.has_password && auth.user.auth_providers.length > 0"
+							type="colored"
 							color="red"
+							@click="removePasswordMode = true"
 						>
-							<button @click="removePasswordMode = true">
-								<TrashIcon />
-								{{ formatMessage(messages.removePasswordButton) }}
-							</button>
-						</ButtonStyled>
-						<ButtonStyled color="brand">
-							<button
-								:disabled="
-									newPassword.length == 0 ||
-									(auth.user.has_password && oldPassword.length == 0) ||
-									newPassword !== confirmNewPassword
-								"
-								@click="savePassword"
-							>
-								<SaveIcon />
-								{{ formatMessage(messages.savePasswordButton) }}
-							</button>
-						</ButtonStyled>
+							<TrashIcon />
+							{{ formatMessage(messages.removePasswordButton) }}
+						</Button>
+						<Button
+							type="colored"
+							color="brand"
+							:disabled="
+								newPassword.length == 0 ||
+								(auth.user.has_password && oldPassword.length == 0) ||
+								newPassword !== confirmNewPassword
+							"
+							@click="savePassword"
+						>
+							<SaveIcon />
+							{{ formatMessage(messages.savePasswordButton) }}
+						</Button>
 					</template>
 				</div>
 			</div>
@@ -202,18 +194,14 @@
 						{{ formatMessage(messages.twoFactorIncorrectError) }}
 					</p>
 					<div class="flex justify-end gap-2.5">
-						<ButtonStyled>
-							<button @click="$refs.manageTwoFactorModal.hide()">
-								<XIcon />
-								{{ formatMessage(commonMessages.cancelButton) }}
-							</button>
-						</ButtonStyled>
-						<ButtonStyled color="red">
-							<button @click="removeTwoFactor">
-								<TrashIcon />
-								{{ formatMessage(messages.twoFactorRemoveButton) }}
-							</button>
-						</ButtonStyled>
+						<Button @click="$refs.manageTwoFactorModal.hide()">
+							<XIcon />
+							{{ formatMessage(commonMessages.cancelButton) }}
+						</Button>
+						<Button type="colored" color="red" @click="removeTwoFactor">
+							<TrashIcon />
+							{{ formatMessage(messages.twoFactorRemoveButton) }}
+						</Button>
 					</div>
 				</template>
 				<template v-else>
@@ -280,30 +268,32 @@
 						</ul>
 					</template>
 					<div class="flex justify-end gap-2.5">
-						<ButtonStyled v-if="twoFactorStep === 1">
-							<button @click="twoFactorStep = 0">
-								<LeftArrowIcon />
-								{{ formatMessage(commonMessages.backButton) }}
-							</button>
-						</ButtonStyled>
-						<ButtonStyled v-if="twoFactorStep !== 2">
-							<button @click="$refs.manageTwoFactorModal.hide()">
-								<XIcon />
-								{{ formatMessage(commonMessages.cancelButton) }}
-							</button>
-						</ButtonStyled>
-						<ButtonStyled v-if="twoFactorStep <= 1" color="brand">
-							<button @click="twoFactorStep === 1 ? verifyTwoFactorCode() : (twoFactorStep = 1)">
-								<RightArrowIcon />
-								{{ formatMessage(commonMessages.continueButton) }}
-							</button>
-						</ButtonStyled>
-						<ButtonStyled v-if="twoFactorStep === 2" color="brand">
-							<button @click="$refs.manageTwoFactorModal.hide()">
-								<CheckIcon />
-								{{ formatMessage(messages.completeSetupButton) }}
-							</button>
-						</ButtonStyled>
+						<Button v-if="twoFactorStep === 1" @click="twoFactorStep = 0">
+							<LeftArrowIcon />
+							{{ formatMessage(commonMessages.backButton) }}
+						</Button>
+						<Button v-if="twoFactorStep !== 2" @click="$refs.manageTwoFactorModal.hide()">
+							<XIcon />
+							{{ formatMessage(commonMessages.cancelButton) }}
+						</Button>
+						<Button
+							v-if="twoFactorStep <= 1"
+							type="colored"
+							color="brand"
+							@click="twoFactorStep === 1 ? verifyTwoFactorCode() : (twoFactorStep = 1)"
+						>
+							<RightArrowIcon />
+							{{ formatMessage(commonMessages.continueButton) }}
+						</Button>
+						<Button
+							v-if="twoFactorStep === 2"
+							type="colored"
+							color="brand"
+							@click="$refs.manageTwoFactorModal.hide()"
+						>
+							<CheckIcon />
+							{{ formatMessage(messages.completeSetupButton) }}
+						</Button>
 					</div>
 				</template>
 			</div>
@@ -322,25 +312,26 @@
 						</span>
 					</template>
 					<template #cell-actions="{ row }">
-						<ButtonStyled v-if="auth.user.auth_providers.includes(row.id)">
-							<button class="!w-full" @click="handleRemoveAuthProvider(row.id)">
-								<TrashIcon /> {{ formatMessage(commonMessages.removeButton) }}
-							</button>
-						</ButtonStyled>
-						<ButtonStyled v-else>
-							<a :href="`${getAuthUrl(row.id, '/settings/account')}&token=${auth.token}`">
-								<ExternalIcon /> {{ formatMessage(messages.providerAddButton) }}
-							</a>
-						</ButtonStyled>
+						<Button
+							v-if="auth.user.auth_providers.includes(row.id)"
+							class="!w-full"
+							@click="handleRemoveAuthProvider(row.id)"
+						>
+							<TrashIcon /> {{ formatMessage(commonMessages.removeButton) }}
+						</Button>
+						<ButtonLink
+							v-else
+							:href="`${getAuthUrl(row.id, '/settings/account')}&token=${auth.token}`"
+						>
+							<ExternalIcon /> {{ formatMessage(messages.providerAddButton) }}
+						</ButtonLink>
 					</template>
 				</Table>
 				<div class="self-end">
-					<ButtonStyled>
-						<button @click="$refs.manageProvidersModal.hide()">
-							<XIcon />
-							{{ formatMessage(commonMessages.closeButton) }}
-						</button>
-					</ButtonStyled>
+					<Button @click="$refs.manageProvidersModal.hide()">
+						<XIcon />
+						{{ formatMessage(commonMessages.closeButton) }}
+					</Button>
 				</div>
 			</div>
 		</NewModal>
@@ -355,18 +346,16 @@
 					}}</span>
 				</label>
 				<div>
-					<ButtonStyled>
-						<button @click="$refs.changeEmailModal.show()">
-							<template v-if="auth.user.email">
-								<EditIcon />
-								{{ formatMessage(messages.changeEmailButton) }}
-							</template>
-							<template v-else>
-								<PlusIcon />
-								{{ formatMessage(messages.addEmailButton) }}
-							</template>
-						</button>
-					</ButtonStyled>
+					<Button @click="$refs.changeEmailModal.show()">
+						<template v-if="auth.user.email">
+							<EditIcon />
+							{{ formatMessage(messages.changeEmailButton) }}
+						</template>
+						<template v-else>
+							<PlusIcon />
+							{{ formatMessage(messages.addEmailButton) }}
+						</template>
+					</Button>
 				</div>
 			</div>
 			<div class="adjacent-input">
@@ -384,25 +373,23 @@
 					</span>
 				</label>
 				<div>
-					<ButtonStyled>
-						<button
-							@click="
-								() => {
-									oldPassword = ''
-									newPassword = ''
-									confirmNewPassword = ''
-									removePasswordMode = false
-									$refs.managePasswordModal.show()
-								}
-							"
-						>
-							<KeyIcon />
-							<template v-if="auth.user.has_password">{{
-								formatMessage(messages.changePasswordButton)
-							}}</template>
-							<template v-else> {{ formatMessage(messages.addPasswordButton) }} </template>
-						</button>
-					</ButtonStyled>
+					<Button
+						@click="
+							() => {
+								oldPassword = ''
+								newPassword = ''
+								confirmNewPassword = ''
+								removePasswordMode = false
+								$refs.managePasswordModal.show()
+							}
+						"
+					>
+						<KeyIcon />
+						<template v-if="auth.user.has_password">{{
+							formatMessage(messages.changePasswordButton)
+						}}</template>
+						<template v-else> {{ formatMessage(messages.addPasswordButton) }} </template>
+					</Button>
 				</div>
 			</div>
 			<div class="adjacent-input">
@@ -413,16 +400,14 @@
 					}}</span>
 				</label>
 				<div>
-					<ButtonStyled>
-						<button @click="showTwoFactorModal">
-							<template v-if="auth.user.has_totp">
-								<TrashIcon /> {{ formatMessage(messages.twoFactorRemoveButton) }}
-							</template>
-							<template v-else>
-								<PlusIcon /> {{ formatMessage(messages.twoFactorSetupButton) }}
-							</template>
-						</button>
-					</ButtonStyled>
+					<Button @click="showTwoFactorModal">
+						<template v-if="auth.user.has_totp">
+							<TrashIcon /> {{ formatMessage(messages.twoFactorRemoveButton) }}
+						</template>
+						<template v-else>
+							<PlusIcon /> {{ formatMessage(messages.twoFactorSetupButton) }}
+						</template>
+					</Button>
 				</div>
 			</div>
 			<div class="adjacent-input">
@@ -433,11 +418,9 @@
 					}}</span>
 				</label>
 				<div>
-					<ButtonStyled>
-						<button @click="$refs.manageProvidersModal.show()">
-							<SettingsIcon /> {{ formatMessage(messages.manageProvidersButton) }}
-						</button>
-					</ButtonStyled>
+					<Button @click="$refs.manageProvidersModal.show()">
+						<SettingsIcon /> {{ formatMessage(messages.manageProvidersButton) }}
+					</Button>
 				</div>
 			</div>
 			<PasskeySettings />
@@ -446,33 +429,27 @@
 		<section id="data-export" class="universal-card">
 			<h2>{{ formatMessage(messages.dataExportTitle) }}</h2>
 			<p>{{ formatMessage(messages.dataExportDescription) }}</p>
-			<ButtonStyled v-if="generated">
-				<a :href="generated" download="export.json">
-					<DownloadIcon />
-					{{ formatMessage(messages.downloadExportButton) }}
-				</a>
-			</ButtonStyled>
-			<ButtonStyled v-else>
-				<button :disabled="generatingExport" @click="exportData">
-					<template v-if="generatingExport">
-						<UpdatedIcon /> {{ formatMessage(messages.generatingExportButton) }}
-					</template>
-					<template v-else>
-						<UpdatedIcon /> {{ formatMessage(messages.generateExportButton) }}
-					</template>
-				</button>
-			</ButtonStyled>
+			<ButtonLink v-if="generated" :href="generated" download="export.json">
+				<DownloadIcon />
+				{{ formatMessage(messages.downloadExportButton) }}
+			</ButtonLink>
+			<Button v-else :disabled="generatingExport" @click="exportData">
+				<template v-if="generatingExport">
+					<UpdatedIcon /> {{ formatMessage(messages.generatingExportButton) }}
+				</template>
+				<template v-else>
+					<UpdatedIcon /> {{ formatMessage(messages.generateExportButton) }}
+				</template>
+			</Button>
 		</section>
 
 		<section id="delete-account" class="universal-card">
 			<h2>{{ formatMessage(messages.deleteAccountSectionTitle) }}</h2>
 			<p>{{ formatMessage(messages.deleteAccountSectionDescription) }}</p>
-			<ButtonStyled color="red">
-				<button type="button" @click="$refs.modal_confirm.show()">
-					<TrashIcon />
-					{{ formatMessage(messages.deleteAccountButton) }}
-				</button>
-			</ButtonStyled>
+			<Button type="colored" color="red" native-type="button" @click="$refs.modal_confirm.show()">
+				<TrashIcon />
+				{{ formatMessage(messages.deleteAccountButton) }}
+			</Button>
 		</section>
 	</div>
 </template>
@@ -494,7 +471,8 @@ import {
 } from '@modrinth/assets'
 import {
 	Admonition,
-	ButtonStyled,
+	Button,
+	ButtonLink,
 	commonMessages,
 	ConfirmModal,
 	defineMessages,
diff --git a/apps/frontend/src/pages/settings/applications.vue b/apps/frontend/src/pages/settings/applications.vue
index cf85773eb8..cf5e7e7fc7 100644
--- a/apps/frontend/src/pages/settings/applications.vue
+++ b/apps/frontend/src/pages/settings/applications.vue
@@ -28,17 +28,15 @@
 				</label>
 				<div v-if="editingId" class="icon-submission">
 					<Avatar size="md" :src="icon" />
-					<ButtonStyled>
-						<FileInput
-							:max-size="262144"
-							class="button-like"
-							:prompt="formatMessage(messages.uploadIcon)"
-							accept="image/png,image/jpeg,image/gif,image/webp"
-							@change="onImageSelection"
-						>
-							<UploadIcon />
-						</FileInput>
-					</ButtonStyled>
+					<FileButton
+						:max-size="262144"
+						class="button-like"
+						:prompt="formatMessage(messages.uploadIcon)"
+						accept="image/png,image/jpeg,image/gif,image/webp"
+						@change="onImageSelection"
+					>
+						<UploadIcon />
+					</FileButton>
 				</div>
 				<label v-if="editingId" for="app-url" class="mb-2 mt-4 text-lg font-semibold text-contrast">
 					{{ formatMessage(messages.urlLabel) }}
@@ -102,48 +100,51 @@
 								autocomplete="off"
 								:placeholder="formatMessage(messages.redirectUriPlaceholder)"
 							/>
-							<ButtonStyled v-if="index !== 0" circular>
-								<button @click="() => redirectUris.splice(index, 1)">
-									<TrashIcon />
-								</button>
-							</ButtonStyled>
-							<ButtonStyled v-if="index === 0" color="brand">
-								<button @click="() => redirectUris.push('')">
-									<PlusIcon /> {{ formatMessage(messages.addMore) }}
-								</button>
-							</ButtonStyled>
+							<IconButton
+								v-if="index !== 0"
+								label="Delete"
+								@click="() => redirectUris.splice(index, 1)"
+							>
+								<TrashIcon />
+							</IconButton>
+							<Button
+								v-if="index === 0"
+								type="colored"
+								color="brand"
+								@click="() => redirectUris.push('')"
+							>
+								<PlusIcon /> {{ formatMessage(messages.addMore) }}
+							</Button>
 						</div>
 					</div>
 					<div v-if="redirectUris.length <= 0">
-						<ButtonStyled color="brand">
-							<button @click="() => redirectUris.push('')">
-								<PlusIcon /> {{ formatMessage(messages.addRedirectUri) }}
-							</button>
-						</ButtonStyled>
+						<Button type="colored" color="brand" @click="() => redirectUris.push('')">
+							<PlusIcon /> {{ formatMessage(messages.addRedirectUri) }}
+						</Button>
 					</div>
 				</div>
 			</div>
 
 			<template #actions>
 				<div class="flex justify-end gap-2 p-2">
-					<ButtonStyled>
-						<button @click="$refs.appModal.hide()">
-							<XIcon />
-							{{ formatMessage(commonMessages.cancelButton) }}
-						</button>
-					</ButtonStyled>
-					<ButtonStyled v-if="editingId" color="brand">
-						<button :disabled="!canSubmit" @click="editApp">
-							<SaveIcon />
-							{{ formatMessage(commonMessages.saveChangesButton) }}
-						</button>
-					</ButtonStyled>
-					<ButtonStyled v-else color="brand">
-						<button :disabled="!canSubmit" @click="createApp">
-							<PlusIcon />
-							{{ formatMessage(messages.createApp) }}
-						</button>
-					</ButtonStyled>
+					<Button @click="$refs.appModal.hide()">
+						<XIcon />
+						{{ formatMessage(commonMessages.cancelButton) }}
+					</Button>
+					<Button
+						v-if="editingId"
+						type="colored"
+						color="brand"
+						:disabled="!canSubmit"
+						@click="editApp"
+					>
+						<SaveIcon />
+						{{ formatMessage(commonMessages.saveChangesButton) }}
+					</Button>
+					<Button v-else type="colored" color="brand" :disabled="!canSubmit" @click="createApp">
+						<PlusIcon />
+						{{ formatMessage(messages.createApp) }}
+					</Button>
 				</div>
 			</template>
 		</NewModal>
@@ -152,22 +153,22 @@
 			<div class="header__title">
 				<h2 class="text-2xl">{{ formatMessage(commonSettingsMessages.applications) }}</h2>
 			</div>
-			<ButtonStyled color="brand">
-				<button
-					@click="
-						() => {
-							name = null
-							icon = null
-							scopesVal = 0
-							redirectUris = ['']
-							editingId = null
-							$refs.appModal.show()
-						}
-					"
-				>
-					<PlusIcon /> {{ formatMessage(messages.newApplication) }}
-				</button>
-			</ButtonStyled>
+			<Button
+				type="colored"
+				color="brand"
+				@click="
+					() => {
+						name = null
+						icon = null
+						scopesVal = 0
+						redirectUris = ['']
+						editingId = null
+						$refs.appModal.show()
+					}
+				"
+			>
+				<PlusIcon /> {{ formatMessage(messages.newApplication) }}
+			</Button>
 		</div>
 		<p>
 			<IntlFormatted :message-id="messages.descriptionIntro">
@@ -215,35 +216,33 @@
 				</div>
 			</div>
 			<div class="input-group">
-				<ButtonStyled>
-					<button
-						@click="
-							() => {
-								setForm({
-									...app,
-									redirect_uris: app.redirect_uris.map((u) => u.uri) || [],
-								})
-								$refs.appModal.show()
-							}
-						"
-					>
-						<EditIcon />
-						{{ formatMessage(commonMessages.editButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="red">
-					<button
-						@click="
-							() => {
-								editingId = app.id
-								$refs.modal_confirm.show()
-							}
-						"
-					>
-						<TrashIcon />
-						{{ formatMessage(messages.delete) }}
-					</button>
-				</ButtonStyled>
+				<Button
+					@click="
+						() => {
+							setForm({
+								...app,
+								redirect_uris: app.redirect_uris.map((u) => u.uri) || [],
+							})
+							$refs.appModal.show()
+						}
+					"
+				>
+					<EditIcon />
+					{{ formatMessage(commonMessages.editButton) }}
+				</Button>
+				<Button
+					type="colored"
+					color="red"
+					@click="
+						() => {
+							editingId = app.id
+							$refs.modal_confirm.show()
+						}
+					"
+				>
+					<TrashIcon />
+					{{ formatMessage(messages.delete) }}
+				</Button>
 			</div>
 		</div>
 	</div>
@@ -252,14 +251,15 @@
 import { EditIcon, PlusIcon, SaveIcon, TrashIcon, UploadIcon, XIcon } from '@modrinth/assets'
 import {
 	Avatar,
-	ButtonStyled,
+	Button,
 	Checkbox,
 	commonMessages,
 	commonSettingsMessages,
 	ConfirmModal,
 	CopyCode,
 	defineMessages,
-	FileInput,
+	FileButton,
+	IconButton,
 	injectModrinthClient,
 	injectNotificationManager,
 	IntlFormatted,
diff --git a/apps/frontend/src/pages/settings/billing/index.vue b/apps/frontend/src/pages/settings/billing/index.vue
index e176b22d4e..f59a03f07e 100644
--- a/apps/frontend/src/pages/settings/billing/index.vue
+++ b/apps/frontend/src/pages/settings/billing/index.vue
@@ -165,107 +165,114 @@
 						v-if="midasCharge && midasCharge.status === 'failed'"
 						class="ml-auto flex flex-row-reverse items-center gap-2"
 					>
-						<ButtonStyled v-if="midasCharge && midasCharge.status === 'failed'">
-							<button
-								@click="
-									() => {
-										$refs.midasPurchaseModal.show()
-									}
-								"
-							>
-								<UpdatedIcon />
-								{{ formatMessage(messages.updateMethod) }}
-							</button>
-						</ButtonStyled>
-						<ButtonStyled type="transparent" circular>
-							<OverflowMenu
-								:dropdown-id="`${baseId}-cancel-midas`"
-								:options="[
-									{
-										id: 'cancel',
-										action: () => {
-											cancelSubscriptionId = midasSubscription.id
-											$refs.modalCancel.show()
-										},
-									},
-								]"
-							>
-								<MoreVerticalIcon />
-								<template #cancel
-									><XIcon /> {{ formatMessage(commonMessages.cancelButton) }}</template
-								>
-							</OverflowMenu>
-						</ButtonStyled>
-					</div>
-					<div
-						v-else-if="midasCharge && midasCharge.status !== 'cancelled'"
-						class="ml-auto flex gap-2"
-					>
-						<ButtonStyled>
-							<button
-								:disabled="changingInterval"
-								@click="
-									() => {
-										cancelSubscriptionId = midasSubscription.id
-										$refs.modalCancel.show()
-									}
-								"
-							>
-								<XIcon /> {{ formatMessage(commonMessages.cancelButton) }}
-							</button>
-						</ButtonStyled>
-						<ButtonStyled
-							:color="midasCharge.subscription_interval === 'yearly' ? 'standard' : 'purple'"
-							color-fill="text"
-						>
-							<button
-								v-tooltip="
-									midasCharge.subscription_interval === 'yearly'
-										? formatMessage(messages.monthlyBillingAdditionalPerYearTooltip, {
-												amount: formatPrice(
-													oppositePrice * 12 - midasCharge.amount,
-													midasCharge.currency_code,
-												),
-											})
-										: undefined
-								"
-								:disabled="changingInterval"
-								@click="switchMidasInterval(oppositeInterval)"
-							>
-								<SpinnerIcon v-if="changingInterval" class="animate-spin" />
-								<TransferIcon v-else />
-								{{
-									changingInterval
-										? formatMessage(messages.switchingToInterval, {
-												interval: oppositeInterval,
-											})
-										: formatMessage(messages.switchToInterval, {
-												interval: oppositeInterval,
-											})
-								}}
-							</button>
-						</ButtonStyled>
-					</div>
-					<ButtonStyled
-						v-else-if="midasCharge && midasCharge.status === 'cancelled'"
-						color="purple"
-					>
-						<button class="ml-auto" @click="cancelSubscription(midasSubscription.id, false)">
-							{{ formatMessage(messages.resubscribe) }} <RightArrowIcon />
-						</button>
-					</ButtonStyled>
-					<ButtonStyled v-else color="purple" size="large">
-						<button
-							class="ml-auto"
+						<Button
+							v-if="midasCharge && midasCharge.status === 'failed'"
 							@click="
 								() => {
 									$refs.midasPurchaseModal.show()
 								}
 							"
 						>
-							{{ formatMessage(messages.subscribe) }} <RightArrowIcon />
-						</button>
-					</ButtonStyled>
+							<UpdatedIcon />
+							{{ formatMessage(messages.updateMethod) }}
+						</Button>
+						<TeleportOverflowMenu
+							type="quiet"
+							:label="formatMessage(commonMessages.moreOptionsButton)"
+							:options="[
+								{
+									id: 'cancel',
+									label: formatMessage(commonMessages.cancelButton),
+									action: () => {
+										cancelSubscriptionId = midasSubscription.id
+										$refs.modalCancel.show()
+									},
+								},
+							]"
+						>
+							<MoreVerticalIcon />
+							<template #cancel
+								><XIcon /> {{ formatMessage(commonMessages.cancelButton) }}</template
+							>
+						</TeleportOverflowMenu>
+					</div>
+					<div
+						v-else-if="midasCharge && midasCharge.status !== 'cancelled'"
+						class="ml-auto flex gap-2"
+					>
+						<Button
+							:disabled="changingInterval"
+							@click="
+								() => {
+									cancelSubscriptionId = midasSubscription.id
+									$refs.modalCancel.show()
+								}
+							"
+						>
+							<XIcon /> {{ formatMessage(commonMessages.cancelButton) }}
+						</Button>
+						<Button
+							v-tooltip="
+								midasCharge.subscription_interval === 'yearly'
+									? formatMessage(messages.monthlyBillingAdditionalPerYearTooltip, {
+											amount: formatPrice(
+												oppositePrice * 12 - midasCharge.amount,
+												midasCharge.currency_code,
+											),
+										})
+									: undefined
+							"
+							type="quiet"
+							:color="midasCharge.subscription_interval === 'yearly' ? undefined : 'purple'"
+							:disabled="changingInterval"
+							:style="{
+								'--legacy-button-color':
+									(midasCharge.subscription_interval === 'yearly' ? 'standard' : 'purple') &&
+									(midasCharge.subscription_interval === 'yearly' ? 'standard' : 'purple') !==
+										'standard'
+										? `var(--color-${midasCharge.subscription_interval === 'yearly' ? 'standard' : 'purple'})`
+										: undefined,
+							}"
+							class="!text-[var(--legacy-button-color,var(--color-base))] [&>svg]:!text-[var(--legacy-button-color,var(--color-primary))]"
+							@click="switchMidasInterval(oppositeInterval)"
+						>
+							<SpinnerIcon v-if="changingInterval" class="animate-spin" />
+							<TransferIcon v-else />
+							{{
+								changingInterval
+									? formatMessage(messages.switchingToInterval, {
+											interval: oppositeInterval,
+										})
+									: formatMessage(messages.switchToInterval, {
+											interval: oppositeInterval,
+										})
+							}}
+						</Button>
+					</div>
+					<Button
+						v-else-if="midasCharge && midasCharge.status === 'cancelled'"
+						type="colored"
+						color="purple"
+						size="xl"
+						class="ml-auto"
+						@click="cancelSubscription(midasSubscription.id, false)"
+					>
+						{{ formatMessage(messages.resubscribe) }} <RightArrowIcon />
+					</Button>
+					<Button
+						v-else
+						type="colored"
+						color="purple"
+						size="xl"
+						class="ml-auto"
+						@click="
+							() => {
+								$refs.midasPurchaseModal.show()
+							}
+						"
+					>
+						{{ formatMessage(messages.subscribe) }} <RightArrowIcon />
+					</Button>
 				</div>
 			</div>
 		</div>
@@ -477,44 +484,44 @@
 										</div>
 									</div>
 									<div class="flex gap-2">
-										<ButtonStyled
+										<Button
 											v-if="
 												getPyroCharge(subscription) &&
 												getPyroCharge(subscription).status !== 'cancelled'
 											"
+											@click="showCancellationSurvey(subscription)"
 										>
-											<button @click="showCancellationSurvey(subscription)">
-												<XIcon />
-												{{ formatMessage(commonMessages.cancelButton) }}
-											</button>
-										</ButtonStyled>
-										<ButtonStyled
+											<XIcon />
+											{{ formatMessage(commonMessages.cancelButton) }}
+										</Button>
+										<Button
 											v-if="
 												getPyroCharge(subscription) &&
 												getPyroCharge(subscription).status !== 'cancelled' &&
 												getPyroCharge(subscription).status !== 'failed'
 											"
+											type="quiet"
 											color="green"
-											color-fill="text"
+											class="!text-green [&>svg]:!text-green"
+											@click="showPyroUpgradeModal(subscription)"
 										>
-											<button @click="showPyroUpgradeModal(subscription)">
-												<ArrowBigUpDashIcon />
-												{{ formatMessage(messages.upgrade) }}
-											</button>
-										</ButtonStyled>
-										<ButtonStyled
+											<ArrowBigUpDashIcon />
+											{{ formatMessage(messages.upgrade) }}
+										</Button>
+										<Button
 											v-else-if="
 												getPyroCharge(subscription) &&
 												(getPyroCharge(subscription).status === 'cancelled' ||
 													getPyroCharge(subscription).status === 'failed')
 											"
+											type="colored"
 											color="green"
+											size="xl"
+											@click="openPyroResubscribeModal(subscription)"
 										>
-											<button @click="openPyroResubscribeModal(subscription)">
-												{{ formatMessage(messages.resubscribe) }}
-												<RightArrowIcon />
-											</button>
-										</ButtonStyled>
+											{{ formatMessage(messages.resubscribe) }}
+											<RightArrowIcon />
+										</Button>
 									</div>
 								</div>
 							</div>
@@ -565,16 +572,12 @@
 			<div class="header__title">
 				<h2 class="text-2xl">{{ formatMessage(messages.paymentMethodTitle) }}</h2>
 			</div>
-			<ButtonStyled>
-				<nuxt-link to="/settings/billing/charges">
-					<HistoryIcon /> {{ formatMessage(messages.paymentMethodHistory) }}
-				</nuxt-link>
-			</ButtonStyled>
-			<ButtonStyled>
-				<button @click="addPaymentMethod">
-					<PlusIcon /> {{ formatMessage(messages.paymentMethodAdd) }}
-				</button>
-			</ButtonStyled>
+			<ButtonLink to="/settings/billing/charges">
+				<HistoryIcon /> {{ formatMessage(messages.paymentMethodHistory) }}
+			</ButtonLink>
+			<Button @click="addPaymentMethod">
+				<PlusIcon /> {{ formatMessage(messages.paymentMethodAdd) }}
+			</Button>
 		</div>
 		<div
 			v-if="!paymentMethods || paymentMethods.length === 0"
@@ -633,43 +636,43 @@
 						</div>
 					</div>
 				</div>
-				<ButtonStyled circular type="transparent">
-					<OverflowMenu
-						:dropdown-id="`${baseId}-payment-method-overflow-${index}`"
-						class="btn-dropdown-animation !w-10"
-						:options="
-							[
-								{
-									id: 'primary',
-									action: () => editPaymentMethod(index, true),
+				<TeleportOverflowMenu
+					type="quiet"
+					:label="formatMessage(commonMessages.moreOptionsButton)"
+					class="btn-dropdown-animation !w-10"
+					:options="
+						[
+							{
+								id: 'primary',
+								label: formatMessage(messages.paymentMethodMakePrimary),
+								action: () => editPaymentMethod(index, true),
+							},
+							{
+								id: 'remove',
+								label: formatMessage(commonMessages.deleteLabel),
+								action: () => {
+									removePaymentMethodIndex = index
+									$refs.modal_confirm.show()
 								},
-								{
-									id: 'remove',
-									action: () => {
-										removePaymentMethodIndex = index
-										$refs.modal_confirm.show()
-									},
-									color: 'red',
-									hoverOnly: true,
-								},
-							].slice(primaryPaymentMethodId === method.id ? 1 : 0, 2)
-						"
-					>
-						<MoreVerticalIcon />
-						<template #primary>
-							<StarIcon />
-							{{ formatMessage(messages.paymentMethodMakePrimary) }}
-						</template>
-						<template #edit>
-							<EditIcon />
-							{{ formatMessage(commonMessages.editButton) }}
-						</template>
-						<template #remove>
-							<TrashIcon />
-							{{ formatMessage(commonMessages.deleteLabel) }}
-						</template>
-					</OverflowMenu>
-				</ButtonStyled>
+								tone: 'red',
+							},
+						].slice(primaryPaymentMethodId === method.id ? 1 : 0, 2)
+					"
+				>
+					<MoreVerticalIcon />
+					<template #primary>
+						<StarIcon />
+						{{ formatMessage(messages.paymentMethodMakePrimary) }}
+					</template>
+					<template #edit>
+						<EditIcon />
+						{{ formatMessage(commonMessages.editButton) }}
+					</template>
+					<template #remove>
+						<TrashIcon />
+						{{ formatMessage(commonMessages.deleteLabel) }}
+					</template>
+				</TeleportOverflowMenu>
 			</div>
 		</div>
 	</section>
@@ -694,7 +697,8 @@ import {
 } from '@modrinth/assets'
 import {
 	AddPaymentMethodModal,
-	ButtonStyled,
+	Button,
+	ButtonLink,
 	commonMessages,
 	ConfirmModal,
 	CopyCode,
@@ -702,11 +706,11 @@ import {
 	getPaymentMethodIcon,
 	injectModrinthClient,
 	injectNotificationManager,
-	OverflowMenu,
 	paymentMethodMessages,
 	PurchaseModal,
 	ResubscribeModal,
 	ServerListing,
+	TeleportOverflowMenu,
 	useFormatDateTime,
 	useFormatPrice,
 	useServerBackupDownload,
@@ -729,7 +733,6 @@ definePageMeta({
 })
 
 const auth = await useAuth()
-const baseId = useId()
 
 useHead({
 	script: [
diff --git a/apps/frontend/src/pages/settings/flags.vue b/apps/frontend/src/pages/settings/flags.vue
index 796f6f6a69..57d0a35c71 100644
--- a/apps/frontend/src/pages/settings/flags.vue
+++ b/apps/frontend/src/pages/settings/flags.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { SearchIcon } from '@modrinth/assets'
-import { ButtonStyled, StyledInput, Toggle } from '@modrinth/ui'
+import { Button, StyledInput, Toggle } from '@modrinth/ui'
 import Fuse from 'fuse.js'
 import { computed, ref, shallowReactive } from 'vue'
 
@@ -68,11 +68,13 @@ useSeoMeta({
 				</p>
 			</label>
 			<div class="flex items-center gap-2">
-				<ButtonStyled type="transparent">
-					<button :disabled="flags[flag] === DEFAULT_FEATURE_FLAGS[flag]" @click="resetFlag(flag)">
-						Reset to default
-					</button>
-				</ButtonStyled>
+				<Button
+					type="quiet"
+					:disabled="flags[flag] === DEFAULT_FEATURE_FLAGS[flag]"
+					@click="resetFlag(flag)"
+				>
+					Reset to default
+				</Button>
 				<Toggle
 					:id="`toggle-${flag}`"
 					v-model="flags[flag]"
diff --git a/apps/frontend/src/pages/settings/index.vue b/apps/frontend/src/pages/settings/index.vue
index 9ce6e58f10..339300eded 100644
--- a/apps/frontend/src/pages/settings/index.vue
+++ b/apps/frontend/src/pages/settings/index.vue
@@ -1,7 +1,9 @@
 <template>
 	<div>
-		<MessageBanner v-if="flags.developerMode" message-type="warning" class="developer-message">
-			<CodeIcon class="inline-flex" />
+		<Admonition v-if="flags.developerMode" type="critical" class="mb-4" show-actions-underneath>
+			<template #icon="{ iconClass }">
+				<CodeIcon :class="iconClass" aria-hidden="true" />
+			</template>
 			<IntlFormatted :message-id="developerModeBanner.description">
 				<template #strong="{ children }">
 					<strong>
@@ -9,12 +11,12 @@
 					</strong>
 				</template>
 			</IntlFormatted>
-			<ButtonStyled color="red" type="highlight">
-				<button class="mt-3" @click="disableDeveloperMode()">
+			<template #actions>
+				<Button type="colored" color="red" @click="disableDeveloperMode()">
 					{{ formatMessage(developerModeBanner.deactivate) }}
-				</button>
-			</ButtonStyled>
-		</MessageBanner>
+				</Button>
+			</template>
+		</Admonition>
 		<section class="universal-card">
 			<h2 class="text-2xl">{{ formatMessage(colorTheme.title) }}</h2>
 			<p>{{ formatMessage(colorTheme.description) }}</p>
@@ -180,7 +182,8 @@
 <script setup lang="ts">
 import { CodeIcon, RadioButtonCheckedIcon, RadioButtonIcon } from '@modrinth/assets'
 import {
-	ButtonStyled,
+	Admonition,
+	Button,
 	defineMessages,
 	injectNotificationManager,
 	IntlFormatted,
@@ -191,7 +194,6 @@ import {
 } from '@modrinth/ui'
 import { formatProjectType } from '@modrinth/utils'
 
-import MessageBanner from '~/components/ui/MessageBanner.vue'
 import type { DisplayLocation } from '~/plugins/cosmetics'
 import { isDarkTheme, type Theme } from '~/plugins/theme/index.ts'
 
@@ -501,12 +503,4 @@ const listTypes = computed(() => {
 		justify-content: center;
 	}
 }
-
-.developer-message {
-	svg {
-		vertical-align: middle;
-		margin-bottom: 2px;
-		margin-right: 0.5rem;
-	}
-}
 </style>
diff --git a/apps/frontend/src/pages/settings/pats.vue b/apps/frontend/src/pages/settings/pats.vue
index 1fa0849912..ec475b4f7d 100644
--- a/apps/frontend/src/pages/settings/pats.vue
+++ b/apps/frontend/src/pages/settings/pats.vue
@@ -72,24 +72,30 @@
 				</div>
 
 				<div class="ml-auto mt-4 flex gap-2">
-					<ButtonStyled type="outlined">
-						<button @click="$refs.patModal.hide()">
-							<XIcon />
-							{{ formatMessage(commonMessages.cancelButton) }}
-						</button>
-					</ButtonStyled>
-					<ButtonStyled v-if="editPatId !== null" color="brand">
-						<button :disabled="loading || !name || !isExpiryInFuture" @click="editPat">
-							<SaveIcon />
-							{{ formatMessage(commonMessages.saveChangesButton) }}
-						</button>
-					</ButtonStyled>
-					<ButtonStyled v-else color="brand">
-						<button :disabled="loading || !name || !isExpiryInFuture" @click="createPat">
-							<PlusIcon />
-							{{ formatMessage(createModalMessages.action) }}
-						</button>
-					</ButtonStyled>
+					<Button type="outlined" @click="$refs.patModal.hide()">
+						<XIcon />
+						{{ formatMessage(commonMessages.cancelButton) }}
+					</Button>
+					<Button
+						v-if="editPatId !== null"
+						type="colored"
+						color="brand"
+						:disabled="loading || !name || !isExpiryInFuture"
+						@click="editPat"
+					>
+						<SaveIcon />
+						{{ formatMessage(commonMessages.saveChangesButton) }}
+					</Button>
+					<Button
+						v-else
+						type="colored"
+						color="brand"
+						:disabled="loading || !name || !isExpiryInFuture"
+						@click="createPat"
+					>
+						<PlusIcon />
+						{{ formatMessage(createModalMessages.action) }}
+					</Button>
 				</div>
 			</div>
 		</NewModal>
@@ -98,21 +104,21 @@
 			<div class="header__title">
 				<h2 class="text-2xl">{{ formatMessage(commonSettingsMessages.pats) }}</h2>
 			</div>
-			<ButtonStyled color="brand">
-				<button
-					@click="
-						() => {
-							name = null
-							scopesVal = 0
-							expires = null
-							editPatId = null
-							$refs.patModal.show()
-						}
-					"
-				>
-					<PlusIcon /> {{ formatMessage(messages.create) }}
-				</button>
-			</ButtonStyled>
+			<Button
+				type="colored"
+				color="brand"
+				@click="
+					() => {
+						name = null
+						scopesVal = 0
+						expires = null
+						editPatId = null
+						$refs.patModal.show()
+					}
+				"
+			>
+				<PlusIcon /> {{ formatMessage(messages.create) }}
+			</Button>
 		</div>
 		<p>
 			<IntlFormatted :message-id="messages.description">
@@ -172,33 +178,29 @@
 				</div>
 			</div>
 			<div class="token-actions ml-auto flex flex-col gap-2">
-				<ButtonStyled>
-					<button
-						@click="
-							() => {
-								editPatId = pat.id
-								name = pat.name
-								scopesVal = pat.scopes
-								expires = $dayjs(pat.expires).format('YYYY-MM-DD')
-								$refs.patModal.show()
-							}
-						"
-					>
-						<EditIcon /> {{ formatMessage(tokenMessages.edit) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled>
-					<button
-						@click="
-							() => {
-								deletePatIndex = pat.id
-								$refs.modal_confirm.show()
-							}
-						"
-					>
-						<TrashIcon /> {{ formatMessage(tokenMessages.revoke) }}
-					</button>
-				</ButtonStyled>
+				<Button
+					@click="
+						() => {
+							editPatId = pat.id
+							name = pat.name
+							scopesVal = pat.scopes
+							expires = $dayjs(pat.expires).format('YYYY-MM-DD')
+							$refs.patModal.show()
+						}
+					"
+				>
+					<EditIcon /> {{ formatMessage(tokenMessages.edit) }}
+				</Button>
+				<Button
+					@click="
+						() => {
+							deletePatIndex = pat.id
+							$refs.modal_confirm.show()
+						}
+					"
+				>
+					<TrashIcon /> {{ formatMessage(tokenMessages.revoke) }}
+				</Button>
 			</div>
 		</div>
 	</div>
@@ -206,7 +208,7 @@
 <script setup>
 import { EditIcon, PlusIcon, SaveIcon, TrashIcon, XIcon } from '@modrinth/assets'
 import {
-	ButtonStyled,
+	Button,
 	Checkbox,
 	commonMessages,
 	commonSettingsMessages,
diff --git a/apps/frontend/src/pages/settings/sessions.vue b/apps/frontend/src/pages/settings/sessions.vue
index 993844a104..7acd04d343 100644
--- a/apps/frontend/src/pages/settings/sessions.vue
+++ b/apps/frontend/src/pages/settings/sessions.vue
@@ -34,11 +34,9 @@
 			</div>
 			<div class="input-group">
 				<i v-if="session.current">{{ formatMessage(messages.currentSessionLabel) }}</i>
-				<ButtonStyled v-else>
-					<button @click="revokeSession(session.id)">
-						<XIcon /> {{ formatMessage(messages.revokeSessionButton) }}
-					</button>
-				</ButtonStyled>
+				<Button v-else @click="revokeSession(session.id)">
+					<XIcon /> {{ formatMessage(messages.revokeSessionButton) }}
+				</Button>
 			</div>
 		</div>
 	</div>
@@ -46,7 +44,7 @@
 <script setup>
 import { XIcon } from '@modrinth/assets'
 import {
-	ButtonStyled,
+	Button,
 	commonMessages,
 	commonSettingsMessages,
 	defineMessages,
diff --git a/apps/frontend/src/pages/share/[inviteId].vue b/apps/frontend/src/pages/share/[inviteId].vue
index 3e697d9676..d32602bf28 100644
--- a/apps/frontend/src/pages/share/[inviteId].vue
+++ b/apps/frontend/src/pages/share/[inviteId].vue
@@ -101,12 +101,10 @@
 				</div>
 			</div>
 
-			<ButtonStyled color="brand" size="large">
-				<button type="button" @click="acceptInvite">
-					<UserPlusIcon />
-					{{ formatMessage(messages.acceptInvite) }}
-				</button>
-			</ButtonStyled>
+			<Button type="colored" color="brand" size="xl" native-type="button" @click="acceptInvite">
+				<UserPlusIcon />
+				{{ formatMessage(messages.acceptInvite) }}
+			</Button>
 
 			<div class="flex w-full flex-col gap-2.5">
 				<span class="pl-3 font-medium text-primary">{{
@@ -133,7 +131,7 @@ import {
 import {
 	Admonition,
 	Avatar,
-	ButtonStyled,
+	Button,
 	defineMessages,
 	injectModrinthClient,
 	useVIntl,
diff --git a/packages/assets/styles/classes.scss b/packages/assets/styles/classes.scss
index f490b13777..35bb7a1a1d 100644
--- a/packages/assets/styles/classes.scss
+++ b/packages/assets/styles/classes.scss
@@ -45,7 +45,7 @@
 		margin-block-start: var(--gap-md);
 	}
 
-	:where(button, .button, .btn) {
+	:where(button:not([data-button]), .button, .btn) {
 		width: fit-content;
 	}
 
diff --git a/packages/ui/.storybook/main.ts b/packages/ui/.storybook/main.ts
index a73d03b21f..7ef55d0e69 100644
--- a/packages/ui/.storybook/main.ts
+++ b/packages/ui/.storybook/main.ts
@@ -1,11 +1,8 @@
-import path from 'node:path'
 import { fileURLToPath } from 'node:url'
 
 import type { StorybookConfig } from '@storybook/vue3-vite'
 import { mergeConfig } from 'vite'
 
-const storybookDirectory = path.dirname(fileURLToPath(import.meta.url))
-
 const config: StorybookConfig = {
 	framework: {
 		name: '@storybook/vue3-vite',
@@ -22,7 +19,9 @@ const config: StorybookConfig = {
 			},
 			resolve: {
 				alias: {
-					'@modrinth/api-client': path.resolve(storybookDirectory, '../../api-client/src/index.ts'),
+					'@modrinth/api-client': fileURLToPath(
+						new URL('../../api-client/src/index.ts', import.meta.url),
+					),
 				},
 			},
 		}),
diff --git a/packages/ui/CLAUDE.md b/packages/ui/CLAUDE.md
index 69c0ee040c..280787caf8 100644
--- a/packages/ui/CLAUDE.md
+++ b/packages/ui/CLAUDE.md
@@ -26,7 +26,7 @@ Self-contained page layouts shared across frontends. Split into two categories:
 - **`shared/`** — Reusable layout modules with their own components, composables, providers, and types. Each module is a self-contained unit (e.g. `shared/content-tab/` contains the content/mods tab layout with its own `layout.vue`, `components/`, `composables/`, `providers/`, and `types.ts`).
 - **`wrapped/`** — Page-level Vue components that mirror route structures (e.g. `wrapped/hosting/manage/`). These are full page implementations consumed by both `apps/frontend` and `apps/app-frontend`.
 
-Files inside `layouts/` use the `#ui/*` import alias (resolved via the `"imports"` field in `package.json`) to reference other `src/` modules like `#ui/components/base/ButtonStyled.vue` or `#ui/composables/i18n`.
+Files inside `layouts/` use the `#ui/*` import alias (resolved via the `"imports"` field in `package.json`) to reference other `src/` modules like `#ui/components/base/buttons` or `#ui/composables/i18n`.
 
 # Code Guidelines
 
diff --git a/packages/ui/src/components/affiliate/AffiliateLinkCard.vue b/packages/ui/src/components/affiliate/AffiliateLinkCard.vue
index 9e9a04a89b..d920b82918 100644
--- a/packages/ui/src/components/affiliate/AffiliateLinkCard.vue
+++ b/packages/ui/src/components/affiliate/AffiliateLinkCard.vue
@@ -18,12 +18,16 @@
 			</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>
+				<Button
+					v-if="showRevoke"
+					type="quiet"
+					color="red"
+					class="!text-red [&>svg]:!text-red"
+					@click="emit('revoke', affiliate)"
+				>
+					<XCircleIcon />
+					{{ formatMessage(messages.revokeAffiliateLink) }}
+				</Button>
 			</div>
 		</div>
 		<CopyCode :text="`https://modrinth.gg?afl=${affiliate.id}`" />
@@ -34,8 +38,10 @@
 import type { Labrinth } from '@modrinth/api-client'
 import { AffiliateIcon, XCircleIcon } from '@modrinth/assets'
 
+import { Button } from '#ui/components/base/buttons'
+
 import { defineMessages, useVIntl } from '../../composables/i18n'
-import { AutoBrandIcon, ButtonStyled, CopyCode } from '../index'
+import { AutoBrandIcon, CopyCode } from '../index'
 
 type AffiliateCode = Labrinth.Affiliate.Internal.AffiliateCode
 
diff --git a/packages/ui/src/components/affiliate/AffiliateLinkCreateModal.vue b/packages/ui/src/components/affiliate/AffiliateLinkCreateModal.vue
index 217102b74e..2773092034 100644
--- a/packages/ui/src/components/affiliate/AffiliateLinkCreateModal.vue
+++ b/packages/ui/src/components/affiliate/AffiliateLinkCreateModal.vue
@@ -46,13 +46,16 @@
 						input-class="pl-10"
 					/>
 				</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>
+				<Button
+					type="colored"
+					color="brand"
+					:disabled="creatingLink || !canCreate"
+					@click="createAffiliateLink"
+				>
+					<SpinnerIcon v-if="creatingLink" class="animate-spin" />
+					<PlusIcon v-else />
+					{{ formatMessage(creatingLink ? messages.creatingButton : messages.createButton) }}
+				</Button>
 			</div>
 		</div>
 	</NewModal>
@@ -62,9 +65,11 @@
 import { AffiliateIcon, PlusIcon, SpinnerIcon, UserIcon } from '@modrinth/assets'
 import { computed, ref, useTemplateRef } from 'vue'
 
+import { Button } from '#ui/components/base/buttons'
+
 import { defineMessages, useVIntl } from '../../composables/i18n'
 import { commonMessages } from '../../utils/common-messages'
-import { AutoBrandIcon, ButtonStyled, NewModal, StyledInput } from '../index'
+import { AutoBrandIcon, NewModal, StyledInput } from '../index'
 export type CreateAffiliateProps = { sourceName: string; username?: string }
 
 const props = withDefaults(
diff --git a/packages/ui/src/components/base/Admonition.vue b/packages/ui/src/components/base/Admonition.vue
index 26a3bfef62..73a6bd76a8 100644
--- a/packages/ui/src/components/base/Admonition.vue
+++ b/packages/ui/src/components/base/Admonition.vue
@@ -58,17 +58,22 @@
 			class="col-start-3 row-start-1 flex shrink-0 items-center gap-2 self-start"
 		>
 			<slot name="top-right-actions" />
-			<ButtonStyled
+			<IconButton
 				v-if="dismissible"
-				circular
-				type="transparent"
-				:color="buttonColors[type]"
-				hover-color-fill="background"
+				type="quiet"
+				:color="
+					buttonColors[type] && buttonColors[type] !== 'standard'
+						? buttonColors[type] === 'medal-promo'
+							? 'medal_promotion'
+							: buttonColors[type]
+						: undefined
+				"
+				label="Dismiss"
+				native-type="button"
+				@click="$emit('dismiss')"
 			>
-				<button type="button" aria-label="Dismiss" @click="$emit('dismiss')">
-					<XIcon />
-				</button>
-			</ButtonStyled>
+				<XIcon />
+			</IconButton>
 		</div>
 		<div
 			v-if="progress != null"
@@ -96,9 +101,10 @@ import { ClockIcon, XIcon } from '@modrinth/assets'
 import { useNow } from '@vueuse/core'
 import { computed } from 'vue'
 
+import { IconButton } from '#ui/components/base/buttons'
+
 import { useFormatDateTime, useRelativeTime } from '../../composables'
 import { getSeverityIcon } from '../../utils'
-import ButtonStyled from './ButtonStyled.vue'
 
 const props = withDefaults(
 	defineProps<{
diff --git a/packages/ui/src/components/base/BaseTerminal.vue b/packages/ui/src/components/base/BaseTerminal.vue
index ff1f37419b..cc78d727eb 100644
--- a/packages/ui/src/components/base/BaseTerminal.vue
+++ b/packages/ui/src/components/base/BaseTerminal.vue
@@ -12,11 +12,9 @@
 				/>
 			</Transition>
 			<div v-if="!isAtBottom" class="absolute bottom-4 right-4 z-10">
-				<ButtonStyled circular type="highlight" size="large">
-					<button class="!shadow-2xl" aria-label="Scroll to bottom" @click="scrollToBottom">
-						<ChevronDownIcon />
-					</button>
-				</ButtonStyled>
+				<IconButton size="xl" label="Scroll to bottom" class="!shadow-2xl" @click="scrollToBottom">
+					<ChevronDownIcon />
+				</IconButton>
 			</div>
 		</div>
 		<div
@@ -43,7 +41,7 @@ import { ChevronDownIcon, TerminalSquareIcon } from '@modrinth/assets'
 import type { Terminal } from '@xterm/xterm'
 import { nextTick, onBeforeUnmount, onMounted, ref, watch } from 'vue'
 
-import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
+import { IconButton } from '#ui/components/base/buttons'
 import StyledInput from '#ui/components/base/StyledInput.vue'
 import { useTerminal } from '#ui/composables/terminal'
 
diff --git a/packages/ui/src/components/base/Button.vue b/packages/ui/src/components/base/Button.vue
deleted file mode 100644
index 48416b4f51..0000000000
--- a/packages/ui/src/components/base/Button.vue
+++ /dev/null
@@ -1,142 +0,0 @@
-<script setup>
-import { ExternalIcon, UnknownIcon } from '@modrinth/assets'
-import { computed } from 'vue'
-
-const props = defineProps({
-	link: {
-		type: String,
-		default: null,
-	},
-	external: {
-		type: Boolean,
-		default: false,
-	},
-	download: {
-		type: String,
-		default: null,
-	},
-	action: {
-		type: Function,
-		default: null,
-	},
-	color: {
-		type: String,
-		default: 'default',
-	},
-	iconOnly: {
-		type: Boolean,
-		default: false,
-	},
-	large: {
-		type: Boolean,
-		default: false,
-	},
-	outline: {
-		type: Boolean,
-		default: false,
-	},
-	transparent: {
-		type: Boolean,
-		default: false,
-	},
-	hoverFilled: {
-		type: Boolean,
-		default: false,
-	},
-	hoverFilledOnly: {
-		type: Boolean,
-		default: false,
-	},
-	disabled: {
-		type: Boolean,
-		default: false,
-	},
-})
-
-const accentedButton = computed(() =>
-	['danger', 'primary', 'red', 'orange', 'green', 'blue', 'purple', 'gray'].includes(props.color),
-)
-
-const classes = computed(() => {
-	const color = props.color
-	return {
-		'icon-only': props.iconOnly,
-		'btn-large': props.large,
-		'btn-danger': color === 'danger',
-		'btn-primary': color === 'primary',
-		'btn-secondary': color === 'secondary',
-		'btn-highlight': color === 'highlight',
-		'btn-red': color === 'red',
-		'btn-orange': color === 'orange',
-		'btn-green': color === 'green',
-		'btn-blue': color === 'blue',
-		'btn-purple': color === 'purple',
-		'btn-gray': color === 'gray',
-		'btn-transparent': props.transparent,
-		'btn-hover-filled': props.hoverFilled,
-		'btn-hover-filled-only': props.hoverFilledOnly,
-		'btn-outline': props.outline,
-		'color-accent-contrast': accentedButton,
-		disabled: props.disabled,
-	}
-})
-</script>
-
-<template>
-	<router-link
-		v-if="link && link.startsWith('/')"
-		class="btn"
-		:class="classes"
-		:to="disabled ? '' : link"
-		:target="external ? '_blank' : '_self'"
-		@click="
-			(event) => {
-				if (disabled) {
-					event.preventDefault()
-					return
-				}
-				if (action) {
-					action(event)
-				}
-			}
-		"
-	>
-		<slot />
-		<ExternalIcon v-if="external && !iconOnly" class="external-icon" />
-		<UnknownIcon v-if="!$slots.default" />
-	</router-link>
-	<a
-		v-else-if="link"
-		class="btn"
-		:class="classes"
-		:href="disabled ? undefined : link"
-		:download="download || undefined"
-		:target="external ? '_blank' : '_self'"
-		@click="
-			(event) => {
-				if (disabled) {
-					event.preventDefault()
-					return
-				}
-				if (action) {
-					action(event)
-				}
-			}
-		"
-	>
-		<slot />
-		<ExternalIcon v-if="external && !iconOnly" class="external-icon" />
-		<UnknownIcon v-if="!$slots.default" />
-	</a>
-	<button v-else class="btn" :class="classes" :disabled="disabled" @click="action">
-		<slot />
-		<UnknownIcon v-if="!$slots.default" />
-	</button>
-</template>
-
-<style lang="scss" scoped>
-:where(button) {
-	background: none;
-	color: var(--color-base);
-}
-</style>
diff --git a/packages/ui/src/components/base/ButtonStyled.vue b/packages/ui/src/components/base/ButtonStyled.vue
deleted file mode 100644
index f546054c16..0000000000
--- a/packages/ui/src/components/base/ButtonStyled.vue
+++ /dev/null
@@ -1,397 +0,0 @@
-<script setup lang="ts">
-import { computed } from 'vue'
-
-const props = withDefaults(
-	defineProps<{
-		color?: 'standard' | 'brand' | 'red' | 'orange' | 'green' | 'blue' | 'purple' | 'medal-promo'
-		size?: 'standard' | 'large' | 'small'
-		circular?: boolean
-		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'
-		highlighted?: boolean
-	}>(),
-	{
-		color: 'standard',
-		size: 'standard',
-		circular: false,
-		type: 'standard',
-		colorFill: 'auto',
-		hoverColorFill: 'auto',
-		highlightedStyle: 'main-nav-primary',
-		highlighted: false,
-	},
-)
-
-const highlightedColorVar = computed(() => {
-	switch (props.color) {
-		case 'brand':
-			return 'var(--color-brand-highlight)'
-		case 'red':
-			return 'var(--color-red-highlight)'
-		case 'orange':
-			return 'var(--color-orange-highlight)'
-		case 'green':
-			return 'var(--color-green-highlight)'
-		case 'medal-promo':
-		case 'blue':
-			return 'var(--color-blue-highlight)'
-		case 'purple':
-			return 'var(--color-purple-highlight)'
-		case 'standard':
-		default:
-			return null
-	}
-})
-
-const colorVar = computed(() => {
-	switch (props.color) {
-		case 'brand':
-			return 'var(--color-brand)'
-		case 'red':
-			return 'var(--color-red)'
-		case 'orange':
-			return 'var(--color-orange)'
-		case 'green':
-			return 'var(--color-green)'
-		case 'blue':
-			return 'var(--color-blue)'
-		case 'purple':
-			return 'var(--color-purple)'
-		case 'medal-promo':
-			return 'var(--medal-promotion-text-orange)'
-		case 'standard':
-		default:
-			return null
-	}
-})
-
-const height = computed(() => {
-	if (props.size === 'large') {
-		return '3rem'
-	} else if (props.size === 'small') {
-		return '1.5rem'
-	}
-	return '2.25rem'
-})
-
-const width = computed(() => {
-	if (props.size === 'large') {
-		return props.circular ? '3rem' : 'auto'
-	} else if (props.size === 'small') {
-		return props.circular ? '1.5rem' : 'auto'
-	}
-	return props.circular ? '2.25rem' : 'auto'
-})
-
-const paddingX = computed(() => {
-	let padding = props.circular ? '0.5rem' : '0.75rem'
-	if (props.size === 'large') {
-		padding = props.circular ? '0.75rem' : '1rem'
-	} else if (props.size === 'small') {
-		padding = props.circular ? '0.125rem' : '0.5rem'
-	}
-	return `calc(${padding} - 0.125rem)`
-})
-
-const paddingY = computed(() => {
-	if (props.size === 'large') {
-		return '0.75rem'
-	}
-	return '0.5rem'
-})
-
-const gap = computed(() => {
-	if (props.size === 'large') {
-		return '0.5rem'
-	} else if (props.size === 'small') {
-		return '0.25rem'
-	}
-	return '0.375rem'
-})
-
-const fontWeight = computed(() => {
-	if (props.size === 'large') {
-		return '800'
-	}
-	return '600'
-})
-
-const radius = computed(() => {
-	if (props.circular) {
-		return '99999px'
-	}
-
-	if (props.size === 'large') {
-		return '1rem'
-	} else if (props.size === 'small') {
-		return '0.5rem'
-	}
-	return '0.75rem'
-})
-
-const iconSize = computed(() => {
-	if (props.size === 'large') {
-		return '1.5rem'
-	} else if (props.size === 'small') {
-		return '1rem'
-	}
-	return '1.25rem'
-})
-
-function setColorFill(
-	colors: { bg: string; text: string },
-	fill: 'background' | 'text' | 'none',
-): { bg: string; text: string } {
-	if (colorVar.value) {
-		if (fill === 'background') {
-			if (props.type === 'highlight' && highlightedColorVar.value) {
-				colors.bg = highlightedColorVar.value
-				colors.text = 'var(--color-contrast)'
-			} else if (props.type === 'highlight-colored-text' && highlightedColorVar.value) {
-				colors.bg = highlightedColorVar.value
-				colors.text = colorVar.value
-			} else {
-				colors.bg = colorVar.value
-				colors.text = 'var(--color-accent-contrast)'
-			}
-		} else if (fill === 'text') {
-			colors.text = colorVar.value
-		}
-	}
-	return colors
-}
-
-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-button-bg-selected)'
-					: 'var(--color-button-bg)',
-			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-button-text-selected)'
-						: 'var(--color-contrast)',
-		}
-		const hoverColors = JSON.parse(JSON.stringify(colors))
-		const boxShadow =
-			props.type === 'chip' && colorVar.value ? `0 0 0 1px ${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};`
-	}
-
-	let colors = {
-		bg: 'var(--color-button-bg)',
-		text: 'var(--color-base)',
-	}
-	let hoverColors = JSON.parse(JSON.stringify(colors))
-
-	if (props.type === 'outlined') {
-		hoverColors.bg = 'transparent'
-	}
-
-	if (props.type === 'outlined' || props.type === 'transparent') {
-		colors.bg = 'transparent'
-		colors = setColorFill(colors, props.colorFill === 'auto' ? 'text' : props.colorFill)
-		hoverColors = setColorFill(
-			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(
-			hoverColors,
-			props.hoverColorFill === 'auto' ? 'background' : props.hoverColorFill,
-		)
-	}
-
-	const boxShadow =
-		props.type === 'chip' && colorVar.value ? `0 0 0 1px ${colorVar.value}` : defaultShadow
-	return `--_bg: ${colors.bg}; --_text: ${colors.text}; --_hover-bg: ${hoverColors.bg}; --_hover-text: ${hoverColors.text}; --_box-shadow: ${boxShadow};`
-})
-
-const fontSize = computed(() => {
-	if (props.size === 'small') {
-		return 'text-sm'
-	}
-	return 'text-base'
-})
-</script>
-
-<template>
-	<div
-		class="btn-wrapper"
-		:class="[
-			{ outline: type === 'outlined', transparent: type === 'transparent', 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};--_outline-color:${color === 'standard' && type === 'outlined' ? 'var(--surface-5)' : 'currentColor'}`"
-	>
-		<slot />
-	</div>
-</template>
-
-<style scoped lang="scss">
-.btn-wrapper {
-	display: contents;
-}
-
-/* Searches up to 4 children deep for valid button */
-.btn-wrapper :deep(:is(button, a, .button-like):first-child),
-.btn-wrapper :slotted(:is(button, a, .button-like):first-child),
-.btn-wrapper :slotted(*) > :is(button, a, .button-like):first-child,
-.btn-wrapper :slotted(*) > *:first-child > :is(button, a, .button-like):first-child,
-.btn-wrapper
-	:slotted(*)
-	> *:first-child
-	> *:first-child
-	> :is(button, a, .button-like):first-child {
-	@apply flex touch-manipulation cursor-pointer flex-row items-center justify-center border-solid border 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,
-		filter 0.25s ease-in-out;
-
-	svg:first-child {
-		color: var(--_icon, var(--_text));
-		transition: color 0.25s ease-in-out;
-		flex-shrink: 0;
-	}
-
-	&[disabled]:not([disabled='false']),
-	&[disabled='true'],
-	&.disabled,
-	&.looks-disabled {
-		@apply opacity-50;
-	}
-
-	&[disabled]:not([disabled='false']),
-	&[disabled='true'],
-	&.disabled {
-		@apply cursor-not-allowed;
-	}
-
-	&:not([disabled]:not([disabled='false'])):not([disabled='true']):not(.disabled) {
-		@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 {
-			color: var(--_hover-icon, var(--_hover-text));
-		}
-	}
-}
-
-.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='false'])):not([disabled='true']):not(.disabled) {
-		@apply active:scale-95;
-	}
-}
-
-.disable-advanced-rendering {
-	.btn-wrapper:not(.outline):not(.transparent) :deep(:is(button, a, .button-like):first-child),
-	.btn-wrapper:not(.outline):not(.transparent) :slotted(:is(button, a, .button-like):first-child),
-	.btn-wrapper:not(.outline):not(.transparent)
-		:slotted(*)
-		> :is(button, a, .button-like):first-child,
-	.btn-wrapper:not(.outline):not(.transparent)
-		:slotted(*)
-		> *:first-child
-		> :is(button, a, .button-like):first-child,
-	.btn-wrapper
-		:slotted(*)
-		> *:first-child
-		> *:first-child
-		> :is(button, a, .button-like):first-child {
-		@apply border border-[rgba(0,0,0,0.2)];
-	}
-}
-
-.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,
-.btn-wrapper.outline :slotted(*) > *:first-child > :is(button, a, .button-like):first-child,
-.btn-wrapper.outline
-	:slotted(*)
-	> *:first-child
-	> *:first-child
-	> :is(button, a, .button-like):first-child {
-	@apply border-[--_outline-color,currentColor];
-}
-
-/*noinspection CssUnresolvedCustomProperty*/
-.btn-wrapper :deep(:is(button, a, .button-like):first-child) > svg,
-.btn-wrapper :slotted(:is(button, a, .button-like):first-child) > svg,
-.btn-wrapper :slotted(*) > :is(button, a, .button-like):first-child > svg,
-.btn-wrapper :slotted(*) > *:first-child > :is(button, a, .button-like):first-child > svg,
-.btn-wrapper
-	:slotted(*)
-	> *:first-child
-	> *:first-child
-	> :is(button, a, .button-like):first-child
-	> svg {
-	display: block;
-	width: var(--_icon-size, 1rem);
-	height: var(--_icon-size, 1rem);
-	min-width: var(--_icon-size, 1rem);
-	min-height: var(--_icon-size, 1rem);
-}
-
-.joined-buttons {
-	display: flex;
-	gap: 1px;
-
-	> .btn-wrapper:not(:first-child) {
-		:deep(:is(button, a, .button-like):first-child),
-		:slotted(:is(button, a, .button-like):first-child),
-		:slotted(*) > :is(button, a, .button-like):first-child,
-		:slotted(*) > *:first-child > :is(button, a, .button-like):first-child,
-		:slotted(*) > *:first-child > *:first-child > :is(button, a, .button-like):first-child {
-			border-top-left-radius: 0;
-			border-bottom-left-radius: 0;
-		}
-	}
-
-	> :not(:last-child) {
-		:deep(:is(button, a, .button-like):first-child),
-		:slotted(:is(button, a, .button-like):first-child),
-		:slotted(*) > :is(button, a, .button-like):first-child,
-		:slotted(*) > *:first-child > :is(button, a, .button-like):first-child,
-		:slotted(*) > *:first-child > *:first-child > :is(button, a, .button-like):first-child {
-			border-top-right-radius: 0;
-			border-bottom-right-radius: 0;
-		}
-	}
-}
-
-/* guys, I know this is nuts, I know */
-</style>
diff --git a/packages/ui/src/components/base/Card.vue b/packages/ui/src/components/base/Card.vue
index f52f4533b0..c481f17eb0 100644
--- a/packages/ui/src/components/base/Card.vue
+++ b/packages/ui/src/components/base/Card.vue
@@ -2,7 +2,7 @@
 import { DropdownIcon } from '@modrinth/assets'
 import { reactive } from 'vue'
 
-import ButtonStyled from './ButtonStyled.vue'
+import { IconButton } from '#ui/components/base/buttons'
 
 const props = defineProps({
 	collapsible: {
@@ -33,11 +33,9 @@ function toggleCollapsed() {
 		<div v-if="!!$slots.header || collapsible" class="header">
 			<slot name="header"></slot>
 			<div v-if="collapsible" class="btn-group">
-				<ButtonStyled circular>
-					<button @click="toggleCollapsed">
-						<DropdownIcon :style="{ transform: `rotate(${state.collapsed ? 0 : 180}deg)` }" />
-					</button>
-				</ButtonStyled>
+				<IconButton label="Toggle details" @click="toggleCollapsed">
+					<DropdownIcon :style="{ transform: `rotate(${state.collapsed ? 0 : 180}deg)` }" />
+				</IconButton>
 			</div>
 		</div>
 		<slot v-if="!state.collapsed" />
diff --git a/packages/ui/src/components/base/Chips.vue b/packages/ui/src/components/base/Chips.vue
index e1359c469e..e7daddc930 100644
--- a/packages/ui/src/components/base/Chips.vue
+++ b/packages/ui/src/components/base/Chips.vue
@@ -15,7 +15,11 @@
 			}"
 			@click="toggleItem(item)"
 		>
-			<CheckIcon v-if="selected === item && !hideCheckmarkIcon" />
+			<CheckIcon
+				v-if="selected === item && !hideCheckmarkIcon"
+				class="!text-brand"
+				aria-hidden="true"
+			/>
 			<span>{{ formatLabel(item) }}</span>
 		</Button>
 	</div>
@@ -24,7 +28,7 @@
 <script setup lang="ts" generic="T">
 import { CheckIcon } from '@modrinth/assets'
 
-import Button from './Button.vue'
+import Button from './buttons/Button.vue'
 
 const props = withDefaults(
 	defineProps<{
diff --git a/packages/ui/src/components/base/CollapsibleAdmonition.vue b/packages/ui/src/components/base/CollapsibleAdmonition.vue
index 273be86a81..6df8073d40 100644
--- a/packages/ui/src/components/base/CollapsibleAdmonition.vue
+++ b/packages/ui/src/components/base/CollapsibleAdmonition.vue
@@ -17,24 +17,26 @@
 					</span>
 				</div>
 				<div class="flex items-center gap-2">
-					<ButtonStyled circular type="highlight-colored-text" :color="buttonColors[type]">
-						<button aria-label="Toggle" @click.stop="expanded = !expanded">
-							<ChevronDownIcon
-								class="h-4 w-4 transition-transform duration-300"
-								:class="expanded && 'rotate-180'"
-							/>
-						</button>
-					</ButtonStyled>
-					<ButtonStyled
-						v-if="dismissible"
-						circular
-						type="highlight-colored-text"
+					<IconButton
+						type="quiet"
 						:color="buttonColors[type]"
+						label="Toggle"
+						@click.stop="expanded = !expanded"
 					>
-						<button aria-label="Dismiss" @click.stop="handleDismiss">
-							<XIcon class="h-4 w-4" />
-						</button>
-					</ButtonStyled>
+						<ChevronDownIcon
+							class="h-4 w-4 transition-transform duration-300"
+							:class="expanded && 'rotate-180'"
+						/>
+					</IconButton>
+					<IconButton
+						v-if="dismissible"
+						type="quiet"
+						:color="buttonColors[type]"
+						label="Dismiss"
+						@click.stop="handleDismiss"
+					>
+						<XIcon class="h-4 w-4" />
+					</IconButton>
 				</div>
 			</div>
 
@@ -72,7 +74,7 @@
 import { ChevronDownIcon, LightBulbIcon, TriangleAlertIcon, XIcon } from '@modrinth/assets'
 import { ref } from 'vue'
 
-import ButtonStyled from './ButtonStyled.vue'
+import { IconButton } from '#ui/components/base/buttons'
 
 export interface CollapsibleAdmonitionItem {
 	title: string
diff --git a/packages/ui/src/components/base/CollapsibleRegion.vue b/packages/ui/src/components/base/CollapsibleRegion.vue
index 04a47d13dd..a9fd3d71f7 100644
--- a/packages/ui/src/components/base/CollapsibleRegion.vue
+++ b/packages/ui/src/components/base/CollapsibleRegion.vue
@@ -17,13 +17,15 @@
 		/>
 
 		<div class="absolute bottom-4 left-1/2 z-20 -translate-x-1/2">
-			<ButtonStyled circular type="transparent">
-				<button class="flex items-center gap-1 text-xs" @click="collapsed = !collapsed">
-					<ExpandIcon v-if="collapsed" />
-					<CollapseIcon v-else />
-					{{ collapsed ? expandText : collapseText }}
-				</button>
-			</ButtonStyled>
+			<Button
+				type="quiet"
+				class="flex items-center gap-1 text-xs !rounded-full"
+				@click="collapsed = !collapsed"
+			>
+				<ExpandIcon v-if="collapsed" />
+				<CollapseIcon v-else />
+				{{ collapsed ? expandText : collapseText }}
+			</Button>
 		</div>
 	</div>
 </template>
@@ -31,7 +33,7 @@
 <script setup lang="ts">
 import { CollapseIcon, ExpandIcon } from '@modrinth/assets'
 
-import ButtonStyled from './ButtonStyled.vue'
+import { Button } from '#ui/components/base/buttons'
 
 withDefaults(
 	defineProps<{
diff --git a/packages/ui/src/components/base/Combobox.vue b/packages/ui/src/components/base/Combobox.vue
index 17821812a4..4a0c6bcd0a 100644
--- a/packages/ui/src/components/base/Combobox.vue
+++ b/packages/ui/src/components/base/Combobox.vue
@@ -49,19 +49,19 @@
 		</div>
 
 		<!-- Standard mode: button trigger -->
-		<span
+		<ButtonFrame
 			v-else
 			ref="triggerRef"
-			role="button"
-			tabindex="0"
-			class="relative flex min-h-5 w-full items-center justify-between overflow-hidden rounded-xl bg-surface-4 px-4 py-2 text-left transition-all duration-200 text-button-text gap-2.5"
+			as="button"
+			native-type="button"
+			:type="triggerType"
+			:size="triggerSize"
+			:interaction="triggerInteraction"
+			:disabled="disabled"
 			:class="[
+				'min-w-full w-full !justify-between overflow-hidden text-left',
 				props.triggerClass,
-				{
-					'z-[9999]': isOpen,
-					'cursor-not-allowed opacity-50': disabled,
-					'cursor-pointer hover:brightness-[115%] active:brightness-[115%]': !disabled,
-				},
+				{ 'z-[9999]': isOpen },
 			]"
 			:aria-expanded="isOpen"
 			:aria-haspopup="listbox ? 'listbox' : 'menu'"
@@ -78,7 +78,7 @@
 				/>
 				<span
 					v-if="selectedOption"
-					class="min-w-0 truncate text-primary font-semibold leading-tight"
+					class="min-w-0 truncate font-semibold leading-tight text-inherit"
 				>
 					<slot name="selected" :label="selectedTriggerText">{{ selectedTriggerText }}</slot>
 				</span>
@@ -94,7 +94,7 @@
 					:class="isOpen ? (openDirection === 'down' ? 'rotate-90' : '-rotate-90') : '-rotate-90'"
 				/>
 			</div>
-		</span>
+		</ButtonFrame>
 
 		<Teleport to="#teleports">
 			<Transition
@@ -217,6 +217,13 @@ import {
 	watch,
 } from 'vue'
 
+import ButtonFrame from './buttons/ButtonFrame.vue'
+import type {
+	ButtonElementHandle,
+	ButtonInteraction,
+	ButtonSize,
+	ButtonType,
+} from './buttons/types'
 import StyledInput from './StyledInput.vue'
 
 export interface ComboboxOption<T> {
@@ -281,6 +288,10 @@ const props = withDefaults(
 		displayValue?: string
 		searchValue?: string
 		triggerClass?: string
+		/** Shared button frame style for non-searchable combobox triggers. */
+		triggerType?: ButtonType
+		triggerSize?: ButtonSize
+		triggerInteraction?: ButtonInteraction
 		dropdownClass?: string
 		/** Additional selectors to ignore when detecting outside clicks */
 		outsideClickIgnore?: string[]
@@ -322,6 +333,9 @@ const props = withDefaults(
 		selectSearchTextOnFocus: false,
 		showSearchIcon: false,
 		searchType: 'text',
+		triggerType: 'base',
+		triggerSize: 'md',
+		triggerInteraction: 'surface',
 		outsideClickIgnore: () => [],
 	},
 )
@@ -343,7 +357,7 @@ const searchQuery = ref('')
 const userHasTyped = ref(false)
 const focusedIndex = ref(-1)
 const containerRef = ref<HTMLElement>()
-const triggerRef = ref<HTMLElement>()
+const triggerRef = ref<ButtonElementHandle>()
 const searchTriggerRef = ref<InstanceType<typeof StyledInput>>()
 const dropdownRef = ref<HTMLElement>()
 const optionsScrollbarRef = ref<HTMLElement>()
@@ -357,10 +371,11 @@ const effectiveTriggerEl = computed(() => {
 	if (props.searchable && searchTriggerRef.value) {
 		return (searchTriggerRef.value as unknown as { $el: HTMLElement }).$el as HTMLElement
 	}
-	return triggerRef.value
+
+	return triggerRef.value?.element ?? undefined
 })
 const outsideClickIgnoreTargets = computed(() => [
-	triggerRef,
+	effectiveTriggerEl,
 	containerRef,
 	...props.outsideClickIgnore,
 ])
@@ -642,7 +657,7 @@ function closeDropdown() {
 
 	if (!props.searchable) {
 		nextTick(() => {
-			triggerRef.value?.focus()
+			effectiveTriggerEl.value?.focus()
 		})
 	}
 }
diff --git a/packages/ui/src/components/base/DatePicker.vue b/packages/ui/src/components/base/DatePicker.vue
index 17ab811f74..7a758c26c9 100644
--- a/packages/ui/src/components/base/DatePicker.vue
+++ b/packages/ui/src/components/base/DatePicker.vue
@@ -14,33 +14,43 @@
 			rangeEndpointMoveState ? 'is-moving-range-end' : '',
 		]"
 	>
-		<CalendarIcon
-			v-if="showIcon && !calendarOnly"
-			class="pointer-events-none absolute left-3 z-[1] h-5 w-5 text-secondary opacity-60 transition-colors"
-			aria-hidden="true"
-		/>
-		<input
-			:id="id"
-			ref="inputRef"
-			:name="name"
-			:placeholder="placeholder"
-			:disabled="disabled"
-			:readonly="readonly"
-			:autocomplete="autocomplete"
-			:class="inputClasses"
-			:tabindex="calendarOnly ? -1 : undefined"
-			:aria-hidden="calendarOnly ? 'true' : undefined"
-			type="text"
-		/>
-		<button
-			v-if="hasClearButton"
-			type="button"
-			class="absolute right-0.5 top-px z-[1] touch-manipulation cursor-pointer select-none border-none bg-transparent p-2 text-secondary transition-colors hover:text-contrast"
-			aria-label="Clear date"
-			@click.stop="clearValue"
+		<ButtonFrame
+			as="span"
+			:class="[
+				calendarOnly
+					? '!block !h-auto !min-w-0 !bg-transparent !p-0 !shadow-none hover:!brightness-100'
+					: 'w-full !justify-start !p-0',
+				disabled ? '!cursor-not-allowed' : '',
+			]"
 		>
-			<XIcon class="h-5 w-5" aria-hidden="true" />
-		</button>
+			<CalendarIcon
+				v-if="showIcon && !calendarOnly"
+				class="pointer-events-none absolute left-3 z-[1] h-5 w-5 text-secondary opacity-60 transition-colors"
+				aria-hidden="true"
+			/>
+			<input
+				:id="id"
+				ref="inputRef"
+				:name="name"
+				:placeholder="placeholder"
+				:disabled="disabled"
+				:readonly="readonly"
+				:autocomplete="autocomplete"
+				:class="inputClasses"
+				:tabindex="calendarOnly ? -1 : undefined"
+				:aria-hidden="calendarOnly ? 'true' : undefined"
+				type="text"
+			/>
+			<button
+				v-if="hasClearButton"
+				type="button"
+				class="absolute right-0.5 top-px z-[1] touch-manipulation cursor-pointer select-none border-none bg-transparent p-2 text-secondary transition-colors hover:text-contrast"
+				aria-label="Clear date"
+				@click.stop="clearValue"
+			>
+				<XIcon class="h-5 w-5" aria-hidden="true" />
+			</button>
+		</ButtonFrame>
 	</div>
 </template>
 
@@ -55,6 +65,8 @@ import type { Instance } from 'flatpickr/dist/types/instance'
 import type { Options } from 'flatpickr/dist/types/options'
 import { computed, nextTick, onBeforeUnmount, onMounted, ref, watch } from 'vue'
 
+import ButtonFrame from './buttons/ButtonFrame.vue'
+
 type DatePickerValue = string | Date | null | undefined
 type RangeEdge = 'start' | 'end'
 type ViewDateAlignment = 'left' | 'right'
@@ -1188,11 +1200,11 @@ const hasClearButton = computed(
 const inputClasses = computed(() => [
 	props.calendarOnly
 		? 'sr-only pointer-events-none absolute h-0 w-0 opacity-0'
-		: 'w-full touch-manipulation text-primary placeholder:text-secondary focus:text-contrast font-medium transition-[shadow,color] appearance-none shadow-none focus:ring-4 focus:ring-brand-shadow !outline-0',
+		: 'h-full w-full touch-manipulation appearance-none bg-transparent font-semibold text-primary shadow-none transition-[shadow,color] placeholder:text-secondary focus:text-contrast focus:ring-4 focus:ring-brand-shadow !outline-0',
 	!props.calendarOnly && props.showIcon ? 'pl-10' : '',
 	!props.calendarOnly && !props.showIcon ? 'pl-3' : '',
 	!props.calendarOnly
-		? `${hasClearButton.value ? 'pr-10' : 'pr-3'} h-9 py-2 text-base outline-none bg-surface-4 border-none rounded-xl`
+		? `${hasClearButton.value ? 'pr-10' : 'pr-3'} rounded-xl border-none py-2 text-base outline-none`
 		: '',
 	props.disabled && !props.calendarOnly ? 'cursor-not-allowed' : '',
 	props.inputClass,
diff --git a/packages/ui/src/components/base/DropdownFilterBar.vue b/packages/ui/src/components/base/DropdownFilterBar.vue
index 73d61e6507..ceaea500db 100644
--- a/packages/ui/src/components/base/DropdownFilterBar.vue
+++ b/packages/ui/src/components/base/DropdownFilterBar.vue
@@ -20,6 +20,8 @@
 		:fit-content="true"
 		:searchable="preview.category.searchable"
 		:search-placeholder="preview.category.searchPlaceholder"
+		trigger-type="base"
+		trigger-size="lg"
 		:trigger-class="effectivePreviewTriggerClass"
 		:dropdown-width="getPreviewDropdownWidth(preview.category)"
 		:dropdown-min-width="getPreviewDropdownMinWidth(preview.category)"
@@ -105,24 +107,24 @@
 	</MultiSelect>
 
 	<div class="flex h-10 min-w-0 max-w-full items-center gap-2">
-		<ButtonStyled type="outlined">
-			<button
-				ref="addMenuTrigger"
-				type="button"
-				:class="addButtonClass ?? '!border'"
-				:aria-expanded="isAddMenuOpen"
-				aria-haspopup="menu"
-				@click="handleAddMenuTriggerClick"
-				@keydown="handleAddMenuTriggerKeydown"
-			>
-				<PlusIcon />
-				{{ addLabel }}
-			</button>
-		</ButtonStyled>
+		<Button
+			ref="addMenuTrigger"
+			type="outlined"
+			native-type="button"
+			:size="addButtonSize"
+			:class="addButtonClass ?? '!border'"
+			:aria-expanded="isAddMenuOpen"
+			aria-haspopup="menu"
+			@click="handleAddMenuTriggerClick"
+			@keydown="handleAddMenuTriggerKeydown"
+		>
+			<PlusIcon />
+			{{ addLabel }}
+		</Button>
 
-		<ButtonStyled v-if="shouldShowClear" type="transparent">
-			<button type="button" @click="clearAllFilters">{{ clearLabel }}</button>
-		</ButtonStyled>
+		<Button v-if="shouldShowClear" type="quiet" native-type="button" @click="clearAllFilters">{{
+			clearLabel
+		}}</Button>
 	</div>
 
 	<Teleport to="#teleports">
@@ -385,8 +387,9 @@ import { OverlayScrollbars, type PartialOptions } from 'overlayscrollbars'
 import type { Component, ComponentPublicInstance, CSSProperties } from 'vue'
 import { computed, nextTick, onBeforeUnmount, ref, watch } from 'vue'
 
+import { Button, type ButtonSize } from '#ui/components/base/buttons'
+
 import { useVirtualScroll } from '../../composables/virtual-scroll'
-import ButtonStyled from './ButtonStyled.vue'
 import MultiSelect, { type MultiSelectItem } from './MultiSelect.vue'
 import StyledInput from './StyledInput.vue'
 
@@ -514,6 +517,7 @@ const props = withDefaults(
 		showPreviewFilterIcon?: boolean
 		previewTriggerClass?: string
 		addButtonClass?: string
+		addButtonSize?: ButtonSize
 		emptyOptionsLabel?: string
 		emptySearchLabel?: string
 		checkboxPosition?: 'left' | 'right'
@@ -525,6 +529,7 @@ const props = withDefaults(
 		showClear: false,
 		showLabel: true,
 		useFilterIcon: false,
+		addButtonSize: 'md',
 		applyImmediately: false,
 		showPreviewFilterIcon: false,
 		emptyOptionsLabel: 'No options available.',
@@ -752,8 +757,7 @@ const appliedFilterPreviews = computed(() =>
 
 const hasAppliedFilters = computed(() => appliedFilterPreviews.value.length > 0)
 const shouldShowClear = computed(() => hasAppliedFilters.value || props.showClear)
-const DEFAULT_PREVIEW_TRIGGER_CLASS =
-	'h-10 max-w-[16rem] bg-surface-4 px-4 py-1.5 transition-all bg-surface-4 hover:brightness-110 active:brightness-110'
+const DEFAULT_PREVIEW_TRIGGER_CLASS = 'max-w-[16rem]'
 const effectivePreviewTriggerClass = computed(
 	() => props.previewTriggerClass ?? DEFAULT_PREVIEW_TRIGGER_CLASS,
 )
diff --git a/packages/ui/src/components/base/ErrorInformationCard.vue b/packages/ui/src/components/base/ErrorInformationCard.vue
index 7f07733174..71f010070e 100644
--- a/packages/ui/src/components/base/ErrorInformationCard.vue
+++ b/packages/ui/src/components/base/ErrorInformationCard.vue
@@ -46,31 +46,29 @@
 		</div>
 
 		<div class="mt-4 flex !w-full flex-row gap-4">
-			<ButtonStyled
+			<Button
 				v-if="action"
-				size="large"
-				:color="action.color || 'brand'"
+				:type="action.color === 'standard' ? 'base' : 'colored'"
+				:color="action.color === 'standard' ? undefined : (action.color ?? 'brand')"
+				size="xl"
 				:disabled="action.disabled"
+				class="!w-full"
 				@click="action.onClick"
 			>
-				<button class="!w-full">
-					<component :is="action.icon" v-if="action.icon && !action.showAltIcon" class="size-4" />
-					<component
-						:is="action.altIcon"
-						v-else-if="action.icon && action.showAltIcon"
-						class="size-4"
-					/>
-					{{ action.label }}
-				</button>
-			</ButtonStyled>
+				<component :is="action.icon" v-if="action.icon && !action.showAltIcon" class="size-4" />
+				<component
+					:is="action.altIcon"
+					v-else-if="action.icon && action.showAltIcon"
+					class="size-4"
+				/>
+				{{ action.label }}
+			</Button>
 
-			<ButtonStyled v-if="errorDetails" size="large" color="standard" @click="copyErrorInformation">
-				<button class="!w-full">
-					<CopyIcon v-if="!infoCopied" class="size-4" />
-					<CheckIcon v-else class="size-4" />
-					Copy Information
-				</button>
-			</ButtonStyled>
+			<Button v-if="errorDetails" size="xl" class="!w-full" @click="copyErrorInformation">
+				<CopyIcon v-if="!infoCopied" class="size-4" />
+				<CheckIcon v-else class="size-4" />
+				Copy Information
+			</Button>
 		</div>
 	</div>
 </template>
@@ -80,7 +78,7 @@ import { CheckIcon, CopyIcon } from '@modrinth/assets'
 import type { Component } from 'vue'
 import { ref } from 'vue'
 
-import ButtonStyled from './ButtonStyled.vue'
+import { Button } from '#ui/components/base/buttons'
 
 const infoCopied = ref(false)
 
diff --git a/packages/ui/src/components/base/FloatingPanel.vue b/packages/ui/src/components/base/FloatingPanel.vue
index b4d45d1267..e06aa00761 100644
--- a/packages/ui/src/components/base/FloatingPanel.vue
+++ b/packages/ui/src/components/base/FloatingPanel.vue
@@ -2,7 +2,7 @@
 import { onClickOutside } from '@vueuse/core'
 import { computed, nextTick, onMounted, onUnmounted, ref } from 'vue'
 
-import ButtonStyled from './ButtonStyled.vue'
+import { Button } from '#ui/components/base/buttons'
 
 const PANEL_VIEWPORT_MARGIN = 8
 
@@ -249,19 +249,18 @@ defineExpose({
 
 <template>
 	<div class="relative inline-block">
-		<ButtonStyled v-bind="$attrs">
-			<button
-				ref="triggerRef"
-				:class="buttonClass"
-				:disabled="disabled"
-				:aria-expanded="isOpen"
-				aria-haspopup="true"
-				@click="toggle"
-				@keydown="handleTriggerKeydown"
-			>
-				<slot></slot>
-			</button>
-		</ButtonStyled>
+		<Button
+			v-bind="$attrs"
+			ref="triggerRef"
+			:class="buttonClass"
+			:disabled="disabled"
+			:aria-expanded="isOpen"
+			aria-haspopup="true"
+			@click="toggle"
+			@keydown="handleTriggerKeydown"
+		>
+			<slot></slot>
+		</Button>
 
 		<Teleport to="body">
 			<Transition
diff --git a/packages/ui/src/components/base/I18nDebugPanel.vue b/packages/ui/src/components/base/I18nDebugPanel.vue
index 3d00bf6240..e57e1e05f0 100644
--- a/packages/ui/src/components/base/I18nDebugPanel.vue
+++ b/packages/ui/src/components/base/I18nDebugPanel.vue
@@ -10,8 +10,9 @@ import {
 } from '@modrinth/assets'
 import { computed, nextTick, onBeforeUnmount, ref, watch } from 'vue'
 
+import { IconButton } from '#ui/components/base/buttons'
+
 import { injectI18nDebug } from '../../composables/i18n-debug'
-import ButtonStyled from './ButtonStyled.vue'
 import StyledInput from './StyledInput.vue'
 
 const debugContext = injectI18nDebug()
@@ -295,37 +296,41 @@ const listMaxHeight = computed(() => `${panelHeight.value - 120}px`)
 
 					<!-- Toolbar -->
 					<div class="ml-auto flex items-center gap-0.5">
-						<ButtonStyled circular type="transparent">
-							<button
-								v-tooltip="
-									debugContext?.keyReveal.value ? 'Hide keys inline' : 'Reveal keys inline'
-								"
-								@click="toggleKeyReveal"
-							>
-								<component :is="debugContext?.keyReveal.value ? EyeOffIcon : EyeIcon" />
-							</button>
-						</ButtonStyled>
-						<ButtonStyled circular type="transparent">
-							<button v-tooltip="'Toggle CSS debug overlay'" @click="toggleOverlay">
-								<ScanEyeIcon />
-							</button>
-						</ButtonStyled>
+						<IconButton
+							v-tooltip="debugContext?.keyReveal.value ? 'Hide keys inline' : 'Reveal keys inline'"
+							type="quiet"
+							:label="debugContext?.keyReveal.value ? 'Hide keys inline' : 'Reveal keys inline'"
+							@click="toggleKeyReveal"
+						>
+							<component :is="debugContext?.keyReveal.value ? EyeOffIcon : EyeIcon" />
+						</IconButton>
+						<IconButton
+							v-tooltip="'Toggle CSS debug overlay'"
+							type="quiet"
+							:label="'Toggle CSS debug overlay'"
+							@click="toggleOverlay"
+						>
+							<ScanEyeIcon />
+						</IconButton>
 
 						<div class="mx-0.5 h-4 w-px bg-surface-5/60" />
 
-						<ButtonStyled circular type="transparent">
-							<button
-								v-tooltip="minimized ? 'Expand panel' : 'Minimize panel'"
-								@click="minimized = !minimized"
-							>
-								<component :is="minimized ? MaximizeIcon : MinusIcon" />
-							</button>
-						</ButtonStyled>
-						<ButtonStyled circular type="transparent">
-							<button v-tooltip="'Close inspector'" @click="closePanel">
-								<XIcon />
-							</button>
-						</ButtonStyled>
+						<IconButton
+							v-tooltip="minimized ? 'Expand panel' : 'Minimize panel'"
+							type="quiet"
+							:label="minimized ? 'Expand panel' : 'Minimize panel'"
+							@click="minimized = !minimized"
+						>
+							<component :is="minimized ? MaximizeIcon : MinusIcon" />
+						</IconButton>
+						<IconButton
+							v-tooltip="'Close inspector'"
+							type="quiet"
+							:label="'Close inspector'"
+							@click="closePanel"
+						>
+							<XIcon />
+						</IconButton>
 					</div>
 				</div>
 
diff --git a/packages/ui/src/components/base/IconSelect.vue b/packages/ui/src/components/base/IconSelect.vue
index 61b0231753..aec022db6d 100644
--- a/packages/ui/src/components/base/IconSelect.vue
+++ b/packages/ui/src/components/base/IconSelect.vue
@@ -1,8 +1,10 @@
 <script setup lang="ts">
 import { EditIcon, TrashIcon, UploadIcon } from '@modrinth/assets'
 
+import { TeleportOverflowMenu } from '#ui/components/base/buttons'
+
 import { defineMessages, useVIntl } from '../../composables/i18n'
-import { Avatar, OverflowMenu } from '../index'
+import { Avatar } from '../index'
 
 const { formatMessage } = useVIntl()
 
@@ -43,17 +45,22 @@ const messages = defineMessages({
 </script>
 
 <template>
-	<OverflowMenu
-		v-tooltip="formatMessage(messages.editIcon)"
-		class="m-0 cursor-pointer appearance-none border-none bg-transparent p-0 transition-transform group-active:scale-95"
+	<TeleportOverflowMenu
+		:label="formatMessage(messages.editIcon)"
+		:tooltip="formatMessage(messages.editIcon)"
+		:icon-only="false"
+		type="quiet"
+		interaction="none"
+		class="m-0 !h-auto cursor-pointer appearance-none border-none bg-transparent !p-0 transition-transform group-active:scale-95"
 		:options="[
 			{
 				id: 'select',
+				label: icon ? formatMessage(messages.replaceIcon) : formatMessage(messages.selectIcon),
 				action: () => emit('select'),
 			},
 			{
 				id: 'remove',
-				color: 'danger',
+				label: formatMessage(messages.removeIcon),
 				action: () => emit('remove'),
 				shown: !!icon,
 			},
@@ -72,5 +79,5 @@ const messages = defineMessages({
 			{{ icon ? formatMessage(messages.replaceIcon) : formatMessage(messages.selectIcon) }}
 		</template>
 		<template #remove> <TrashIcon /> {{ formatMessage(messages.removeIcon) }} </template>
-	</OverflowMenu>
+	</TeleportOverflowMenu>
 </template>
diff --git a/packages/ui/src/components/base/JoinedButtons.vue b/packages/ui/src/components/base/JoinedButtons.vue
deleted file mode 100644
index 44ffb3a424..0000000000
--- a/packages/ui/src/components/base/JoinedButtons.vue
+++ /dev/null
@@ -1,151 +0,0 @@
-<template>
-	<div class="joined-buttons">
-		<ButtonStyled :color="color" :size="size">
-			<button
-				v-tooltip="primaryTooltip"
-				:class="{ 'joined-buttons__primary--muted': primaryMuted }"
-				:disabled="primaryDisabledResolved"
-				@click="handlePrimaryAction"
-			>
-				<component :is="primaryAction.icon" v-if="primaryAction.icon" aria-hidden="true" />
-				{{ primaryAction.label }}
-			</button>
-		</ButtonStyled>
-		<ButtonStyled v-if="dropdownActions.length > 0" :color="color" :size="size">
-			<OverflowMenu
-				class="btn-dropdown-animation !w-10"
-				:options="dropdownOptions"
-				:disabled="dropdownDisabledResolved"
-				:tooltip="dropdownTooltip"
-			>
-				<DropdownIcon />
-				<template v-for="action in dropdownActions" :key="action.id" #[action.id]>
-					<component :is="action.icon" v-if="action.icon" aria-hidden="true" />
-					{{ action.label }}
-				</template>
-			</OverflowMenu>
-		</ButtonStyled>
-	</div>
-</template>
-
-<script setup lang="ts">
-import { DropdownIcon } from '@modrinth/assets'
-import type { Component } from 'vue'
-import { computed } from 'vue'
-
-import ButtonStyled from './ButtonStyled.vue'
-import OverflowMenu from './OverflowMenu.vue'
-
-// TODO: This should be moved to a shared types file.
-type Colors = 'standard' | 'brand' | 'red' | 'orange' | 'green' | 'blue' | 'purple'
-
-export interface JoinedButtonAction {
-	id: string
-	label: string
-	icon?: Component
-	action: () => void
-	color?: Colors
-	hoverFilled?: boolean
-}
-
-interface Props {
-	actions: JoinedButtonAction[]
-	color?: Colors
-	size?: 'standard' | 'large' | 'small'
-	disabled?: boolean
-	primaryDisabled?: boolean
-	dropdownDisabled?: boolean
-	primaryMuted?: boolean
-	primaryTooltip?: string
-	dropdownTooltip?: string
-}
-
-const props = withDefaults(defineProps<Props>(), {
-	color: 'standard',
-	size: 'standard',
-	disabled: false,
-	primaryDisabled: undefined,
-	dropdownDisabled: undefined,
-	primaryMuted: false,
-	primaryTooltip: undefined,
-	dropdownTooltip: undefined,
-})
-
-const primaryDisabledResolved = computed(() => props.primaryDisabled ?? props.disabled)
-const dropdownDisabledResolved = computed(() => props.dropdownDisabled ?? props.disabled)
-
-const primaryAction = computed(() => props.actions[0])
-
-const dropdownActions = computed(() => props.actions.slice(1))
-
-const colorMap: Record<
-	Colors,
-	| 'red'
-	| 'orange'
-	| 'green'
-	| 'blue'
-	| 'purple'
-	| 'highlight'
-	| 'primary'
-	| 'danger'
-	| 'secondary'
-	| undefined
-> = {
-	standard: 'secondary',
-	brand: 'primary',
-	red: 'red',
-	orange: 'orange',
-	green: 'green',
-	blue: 'blue',
-	purple: 'purple',
-}
-
-const dropdownOptions = computed(() =>
-	dropdownActions.value.map((action) => ({
-		id: action.id,
-		color: action.color ? colorMap[action.color] : undefined,
-		action: action.action,
-		hoverFilled: action.hoverFilled ?? true,
-	})),
-)
-
-function handlePrimaryAction() {
-	if (primaryAction.value && !primaryDisabledResolved.value) {
-		primaryAction.value.action()
-	}
-}
-</script>
-
-<style scoped>
-.joined-buttons {
-	display: flex;
-	align-items: center;
-}
-
-.joined-buttons > :deep(.btn) {
-	border-radius: 0;
-}
-
-.joined-buttons > :deep(.btn:first-child) {
-	border-top-left-radius: var(--radius-md);
-	border-bottom-left-radius: var(--radius-md);
-}
-
-.joined-buttons > :deep(.btn:last-child) {
-	border-top-right-radius: var(--radius-md);
-	border-bottom-right-radius: var(--radius-md);
-	margin-left: -1px;
-}
-
-.joined-buttons > :deep(.btn:not(:last-child)) {
-	border-right: none;
-}
-
-.btn-dropdown-animation {
-	padding: 0.5rem !important;
-}
-
-.joined-buttons__primary--muted {
-	opacity: 0.6;
-}
-</style>
diff --git a/packages/ui/src/components/base/ManySelect.vue b/packages/ui/src/components/base/ManySelect.vue
index ed495af309..b3c927d039 100644
--- a/packages/ui/src/components/base/ManySelect.vue
+++ b/packages/ui/src/components/base/ManySelect.vue
@@ -1,23 +1,19 @@
 <template>
-	<ButtonStyled>
-		<PopoutMenu
-			v-if="options.length > 1 || showAlways"
-			v-bind="$attrs"
-			:disabled="disabled"
-			:position="position"
-			:direction="direction"
-			:dropdown-id="dropdownId"
-			:dropdown-class="dropdownClass"
-			:tooltip="tooltip"
-			@open="
-				() => {
-					searchQuery = ''
-				}
-			"
-		>
+	<TeleportPopoutMenu
+		v-if="options.length > 1 || showAlways"
+		v-bind="$attrs"
+		:disabled="disabled"
+		:label="tooltip || 'Select options'"
+		:tooltip="tooltip"
+		placement="bottom-start"
+		@open="searchQuery = ''"
+	>
+		<template #trigger>
 			<slot />
 			<DropdownIcon class="h-5 w-5 text-secondary" />
-			<template #menu>
+		</template>
+		<template #panel>
+			<div :class="dropdownClass">
 				<StyledInput
 					v-if="search"
 					id="search-input"
@@ -37,10 +33,9 @@
 					<Button
 						v-for="(option, index) in filteredOptions"
 						:key="`option-${index}`"
-						:transparent="!manyValues.includes(option)"
-						:action="() => toggleOption(option)"
+						:type="manyValues.includes(option) ? 'base' : 'quiet'"
 						class="!w-full"
-						:color="manyValues.includes(option) ? 'secondary' : 'default'"
+						@click="toggleOption(option)"
 					>
 						<slot name="option" :option="option">{{ getOptionLabel(option) }}</slot>
 						<CheckIcon
@@ -53,10 +48,9 @@
 					<Button
 						v-for="(option, index) in filteredOptions"
 						:key="`option-${index}`"
-						:transparent="!manyValues.includes(option)"
-						:action="() => toggleOption(option)"
+						:type="manyValues.includes(option) ? 'base' : 'quiet'"
 						class="!w-full"
-						:color="manyValues.includes(option) ? 'secondary' : 'default'"
+						@click="toggleOption(option)"
 					>
 						<slot name="option" :option="option">{{ getOptionLabel(option) }}</slot>
 						<CheckIcon
@@ -66,16 +60,17 @@
 					</Button>
 				</div>
 				<slot name="footer" />
-			</template>
-		</PopoutMenu>
-	</ButtonStyled>
+			</div>
+		</template>
+	</TeleportPopoutMenu>
 </template>
 <script setup lang="ts">
 import { CheckIcon, DropdownIcon, SearchIcon } from '@modrinth/assets'
 import { computed, ref } from 'vue'
 
-import { Button, ButtonStyled, PopoutMenu, StyledInput } from '../index'
+import { Button, TeleportPopoutMenu } from './buttons'
 import ScrollablePanel from './ScrollablePanel.vue'
+import StyledInput from './StyledInput.vue'
 
 type Option = string | number | object
 
diff --git a/packages/ui/src/components/base/MarkdownEditor.vue b/packages/ui/src/components/base/MarkdownEditor.vue
index 87e932b62b..707341cbf2 100644
--- a/packages/ui/src/components/base/MarkdownEditor.vue
+++ b/packages/ui/src/components/base/MarkdownEditor.vue
@@ -46,24 +46,22 @@
 				/>
 			</div>
 			<div class="flex gap-2 justify-end mt-4">
-				<ButtonStyled type="outlined">
-					<button @click="() => linkModal?.hide()">
-						<XIcon /> {{ formatMessage(commonMessages.cancelButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="brand">
-					<button
-						:disabled="!!linkValidationErrorMessage || !linkUrl"
-						@click="
-							() => {
-								if (editor) markdownCommands.replaceSelection(editor, linkMarkdown)
-								linkModal?.hide()
-							}
-						"
-					>
-						<PlusIcon /> {{ formatMessage(messages.insertButton) }}
-					</button>
-				</ButtonStyled>
+				<Button type="outlined" @click="() => linkModal?.hide()">
+					<XIcon /> {{ formatMessage(commonMessages.cancelButton) }}
+				</Button>
+				<Button
+					type="colored"
+					color="brand"
+					:disabled="!!linkValidationErrorMessage || !linkUrl"
+					@click="
+						() => {
+							if (editor) markdownCommands.replaceSelection(editor, linkMarkdown)
+							linkModal?.hide()
+						}
+					"
+				>
+					<PlusIcon /> {{ formatMessage(messages.insertButton) }}
+				</Button>
 			</div>
 		</div>
 	</NewModal>
@@ -144,24 +142,22 @@
 				/>
 			</div>
 			<div class="flex gap-2 justify-end mt-4">
-				<ButtonStyled type="outlined">
-					<button @click="() => imageModal?.hide()">
-						<XIcon /> {{ formatMessage(commonMessages.cancelButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="brand">
-					<button
-						:disabled="!canInsertImage"
-						@click="
-							() => {
-								if (editor) markdownCommands.replaceSelection(editor, imageMarkdown)
-								imageModal?.hide()
-							}
-						"
-					>
-						<PlusIcon /> {{ formatMessage(messages.insertButton) }}
-					</button>
-				</ButtonStyled>
+				<Button type="outlined" @click="() => imageModal?.hide()">
+					<XIcon /> {{ formatMessage(commonMessages.cancelButton) }}
+				</Button>
+				<Button
+					type="colored"
+					color="brand"
+					:disabled="!canInsertImage"
+					@click="
+						() => {
+							if (editor) markdownCommands.replaceSelection(editor, imageMarkdown)
+							imageModal?.hide()
+						}
+					"
+				>
+					<PlusIcon /> {{ formatMessage(messages.insertButton) }}
+				</Button>
 			</div>
 		</div>
 	</NewModal>
@@ -204,24 +200,22 @@
 				/>
 			</div>
 			<div class="flex gap-2 justify-end mt-4">
-				<ButtonStyled type="outlined">
-					<button @click="() => videoModal?.hide()">
-						<XIcon /> {{ formatMessage(commonMessages.cancelButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="brand">
-					<button
-						:disabled="!!linkValidationErrorMessage || !linkUrl"
-						@click="
-							() => {
-								if (editor) markdownCommands.replaceSelection(editor, videoMarkdown)
-								videoModal?.hide()
-							}
-						"
-					>
-						<PlusIcon /> {{ formatMessage(messages.insertButton) }}
-					</button>
-				</ButtonStyled>
+				<Button type="outlined" @click="() => videoModal?.hide()">
+					<XIcon /> {{ formatMessage(commonMessages.cancelButton) }}
+				</Button>
+				<Button
+					type="colored"
+					color="brand"
+					:disabled="!!linkValidationErrorMessage || !linkUrl"
+					@click="
+						() => {
+							if (editor) markdownCommands.replaceSelection(editor, videoMarkdown)
+							videoModal?.hide()
+						}
+					"
+				>
+					<PlusIcon /> {{ formatMessage(messages.insertButton) }}
+				</Button>
 			</div>
 		</div>
 	</NewModal>
@@ -235,17 +229,16 @@
 					>
 						<div class="divider"></div>
 						<template v-for="button in buttonGroup.buttons" :key="button.label.id">
-							<ButtonStyled circular>
-								<button
-									v-tooltip="formatMessage(button.label)"
-									:aria-label="formatMessage(button.label)"
-									:class="{ 'mobile-hidden-group': !!buttonGroup.hideOnMobile }"
-									:disabled="previewMode || disabled"
-									@click="() => button.action(editor)"
-								>
-									<component :is="button.icon" />
-								</button>
-							</ButtonStyled>
+							<IconButton
+								v-tooltip="formatMessage(button.label)"
+								:label="formatMessage(button.label)"
+								size="sm"
+								:class="{ 'mobile-hidden-group': !!buttonGroup.hideOnMobile }"
+								:disabled="previewMode || disabled"
+								@click="() => button.action(editor)"
+							>
+								<component :is="button.icon" />
+							</IconButton>
 						</template>
 					</template>
 				</div>
@@ -333,10 +326,11 @@ import { markdownCommands, modrinthMarkdownEditorKeymap } from '@modrinth/utils/
 import { renderHighlightedString } from '@modrinth/utils/highlightjs'
 import { type Component, computed, onBeforeUnmount, onMounted, ref, toRef, watch } from 'vue'
 
+import { Button, IconButton } from '#ui/components/base/buttons'
+
 import { defineMessages, type MessageDescriptor, useVIntl } from '../../composables/i18n'
 import { commonMessages } from '../../utils/common-messages.ts'
 import NewModal from '../modal/NewModal.vue'
-import ButtonStyled from './ButtonStyled.vue'
 import Chips from './Chips.vue'
 import FileInput from './FileInput.vue'
 import IntlFormatted from './IntlFormatted.vue'
diff --git a/packages/ui/src/components/base/MultiSelect.vue b/packages/ui/src/components/base/MultiSelect.vue
index 25a19b715d..f765bd90e6 100644
--- a/packages/ui/src/components/base/MultiSelect.vue
+++ b/packages/ui/src/components/base/MultiSelect.vue
@@ -1,17 +1,21 @@
 <template>
 	<div ref="containerRef" class="relative inline-block" :class="fitContent ? 'w-auto' : 'w-full'">
-		<span
+		<component
+			:is="triggerComponent"
 			ref="triggerRef"
-			role="button"
-			tabindex="0"
-			class="relative flex items-center overflow-hidden rounded-xl bg-surface-4 px-4 py-1 text-left transition-all duration-200"
+			v-bind="triggerButtonProps"
+			:role="triggerType ? undefined : 'button'"
+			:tabindex="triggerType ? undefined : 0"
 			:class="[
+				triggerType
+					? 'overflow-hidden text-left'
+					: 'relative flex items-center overflow-hidden rounded-xl bg-surface-4 px-4 py-1 text-left transition-all duration-200',
 				fitContent ? 'w-auto max-w-full' : 'w-full',
 				triggerClass,
 				{
 					'z-[9999]': isOpen,
-					'cursor-not-allowed opacity-50': disabled,
-					'cursor-pointer hover:brightness-125 active:brightness-125': !disabled,
+					'cursor-not-allowed opacity-50': disabled && !triggerType,
+					'cursor-pointer hover:brightness-125 active:brightness-125': !disabled && !triggerType,
 				},
 			]"
 			:aria-expanded="isOpen"
@@ -39,7 +43,8 @@
 					<span
 						v-for="tag in visibleTags"
 						:key="String(tag.value)"
-						class="inline-flex items-center gap-1 rounded-full border border-solid border-surface-5 bg-surface-4 px-2 py-1 text-sm font-medium text-primary transition-all hover:brightness-[115%]"
+						class="inline-flex items-center gap-1 rounded-full border border-solid border-surface-5 bg-surface-4 px-2 py-1 text-sm font-medium transition-all hover:brightness-[115%]"
+						:class="triggerType ? 'text-inherit' : 'text-primary'"
 						@click.stop="removeTag(tag.value)"
 					>
 						{{ tag.label }}
@@ -100,7 +105,7 @@
 					/>
 				</div>
 			</template>
-		</span>
+		</component>
 
 		<Teleport to="#teleports">
 			<Transition
@@ -415,6 +420,13 @@ import {
 } from 'vue'
 
 import { useVirtualScroll } from '../../composables/virtual-scroll'
+import ButtonFrame from './buttons/ButtonFrame.vue'
+import type {
+	ButtonElementHandle,
+	ButtonInteraction,
+	ButtonSize,
+	ButtonType,
+} from './buttons/types'
 import StyledInput from './StyledInput.vue'
 
 export interface MultiSelectOption<T> {
@@ -492,6 +504,10 @@ const props = withDefaults(
 		clearable?: boolean
 		maxHeight?: number
 		triggerClass?: string
+		/** Apply the shared button frame to compact, button-owned multiselect triggers. */
+		triggerType?: ButtonType
+		triggerSize?: ButtonSize
+		triggerInteraction?: ButtonInteraction
 		fitContent?: boolean
 		/** Width for the teleported dropdown; defaults to the trigger width */
 		dropdownWidth?: string | number
@@ -517,6 +533,8 @@ const props = withDefaults(
 		showChevron: true,
 		clearable: true,
 		maxHeight: DEFAULT_MAX_HEIGHT,
+		triggerSize: 'md',
+		triggerInteraction: 'surface',
 		fitContent: false,
 		noOptionsMessage: 'No options available',
 		noResultsMessage: 'No results found',
@@ -538,11 +556,29 @@ const emit = defineEmits<{
 }>()
 
 const slots = useSlots()
+const triggerComponent = computed(() => (props.triggerType ? ButtonFrame : 'span'))
+const triggerButtonProps = computed(() =>
+	props.triggerType
+		? {
+				as: 'button' as const,
+				nativeType: 'button' as const,
+				type: props.triggerType,
+				size: props.triggerSize,
+				interaction: props.triggerInteraction,
+				disabled: props.disabled,
+			}
+		: {},
+)
 const isOpen = ref(false)
 const searchQuery = ref('')
 const focusedIndex = ref(-1)
 const containerRef = ref<HTMLElement>()
-const triggerRef = ref<HTMLElement>()
+const triggerRef = ref<HTMLElement | ButtonElementHandle>()
+const triggerElement = computed<HTMLElement | undefined>(() => {
+	const trigger = triggerRef.value
+	if (!trigger) return undefined
+	return 'element' in trigger ? (trigger.element ?? undefined) : trigger
+})
 const dropdownRef = ref<HTMLElement>()
 const optionsScrollbarRef = ref<HTMLElement>()
 const optionsContainerRef = ref<HTMLElement>()
@@ -944,11 +980,13 @@ function resolveCssSize(size: string | number | undefined): string | undefined {
 }
 
 async function updateDropdownPosition() {
-	if (!triggerRef.value || !dropdownRef.value) return
-
 	await nextTick()
 
-	const triggerRect = triggerRef.value.getBoundingClientRect()
+	const trigger = triggerElement.value
+	const dropdown = dropdownRef.value
+	if (!trigger || !dropdown) return
+
+	const triggerRect = trigger.getBoundingClientRect()
 	const width = resolveDropdownWidth(triggerRect.width)
 	const minWidth = resolveCssSize(props.dropdownMinWidth) ?? '0px'
 
@@ -960,7 +998,7 @@ async function updateDropdownPosition() {
 
 	await nextTick()
 
-	const dropdownRect = dropdownRef.value.getBoundingClientRect()
+	const dropdownRect = dropdown.getBoundingClientRect()
 	const viewport = getViewportRect()
 
 	const direction = determineOpenDirection(triggerRect, dropdownRect, viewport)
@@ -1064,7 +1102,7 @@ function closeDropdown() {
 	emit('close')
 
 	nextTick(() => {
-		triggerRef.value?.focus()
+		triggerElement.value?.focus()
 	})
 }
 
@@ -1355,7 +1393,7 @@ onClickOutside(
 	() => {
 		closeDropdown()
 	},
-	{ ignore: [triggerRef, containerRef, '.v-popper__popper'] },
+	{ ignore: [triggerElement, containerRef, '.v-popper__popper'] },
 )
 
 onMounted(() => {
diff --git a/packages/ui/src/components/base/MultiStageModal.vue b/packages/ui/src/components/base/MultiStageModal.vue
index e6c3a06718..a20a3a68c3 100644
--- a/packages/ui/src/components/base/MultiStageModal.vue
+++ b/packages/ui/src/components/base/MultiStageModal.vue
@@ -72,46 +72,48 @@
 				class="flex flex-col justify-end gap-2 sm:flex-row"
 				:class="leftButtonConfig || rightButtonConfig ? 'mt-4' : ''"
 			>
-				<ButtonStyled v-if="leftButtonConfig" type="outlined">
-					<button
-						v-tooltip="leftButtonConfig.tooltip"
-						:class="leftButtonConfig.buttonClass"
-						:disabled="leftButtonConfig.disabled"
-						@click="leftButtonConfig.onClick"
-					>
-						<component :is="leftButtonConfig.icon" />
-						{{ leftButtonConfig.label }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled v-if="rightButtonConfig" :color="rightButtonConfig.color">
-					<button
-						v-tooltip="rightButtonConfig.tooltip"
-						class="!shadow-none"
-						:class="rightButtonConfig.buttonClass"
-						:disabled="rightButtonConfig.disabled || rightButtonConfig.loading"
-						@click="rightButtonConfig.onClick"
-					>
-						<SpinnerIcon
-							v-if="rightButtonConfig.loading && rightButtonConfig.iconPosition === 'before'"
-							class="animate-spin"
-						/>
-						<component
-							:is="rightButtonConfig.icon"
-							v-else-if="rightButtonConfig.iconPosition === 'before'"
-							:class="rightButtonConfig.iconClass"
-						/>
-						{{ rightButtonConfig.label }}
-						<SpinnerIcon
-							v-if="rightButtonConfig.loading && rightButtonConfig.iconPosition === 'after'"
-							class="animate-spin"
-						/>
-						<component
-							:is="rightButtonConfig.icon"
-							v-else-if="rightButtonConfig.iconPosition === 'after'"
-							:class="rightButtonConfig.iconClass"
-						/>
-					</button>
-				</ButtonStyled>
+				<Button
+					v-if="leftButtonConfig"
+					v-tooltip="leftButtonConfig.tooltip"
+					type="outlined"
+					:class="leftButtonConfig.buttonClass"
+					:disabled="leftButtonConfig.disabled"
+					@click="leftButtonConfig.onClick"
+				>
+					<component :is="leftButtonConfig.icon" />
+					{{ leftButtonConfig.label }}
+				</Button>
+				<Button
+					v-if="rightButtonConfig"
+					v-tooltip="rightButtonConfig.tooltip"
+					:type="
+						rightButtonConfig.color && rightButtonConfig.color !== 'standard' ? 'colored' : 'base'
+					"
+					:color="rightButtonConfig.color === 'standard' ? undefined : rightButtonConfig.color"
+					:class="rightButtonConfig.buttonClass"
+					:disabled="rightButtonConfig.disabled || rightButtonConfig.loading"
+					@click="rightButtonConfig.onClick"
+				>
+					<SpinnerIcon
+						v-if="rightButtonConfig.loading && rightButtonConfig.iconPosition === 'before'"
+						class="animate-spin"
+					/>
+					<component
+						:is="rightButtonConfig.icon"
+						v-else-if="rightButtonConfig.iconPosition === 'before'"
+						:class="rightButtonConfig.iconClass"
+					/>
+					{{ rightButtonConfig.label }}
+					<SpinnerIcon
+						v-if="rightButtonConfig.loading && rightButtonConfig.iconPosition === 'after'"
+						class="animate-spin"
+					/>
+					<component
+						:is="rightButtonConfig.icon"
+						v-else-if="rightButtonConfig.iconPosition === 'after'"
+						:class="rightButtonConfig.iconClass"
+					/>
+				</Button>
 			</div>
 		</template>
 	</NewModal>
@@ -119,15 +121,18 @@
 
 <script lang="ts">
 import { ChevronRightIcon, SpinnerIcon } from '@modrinth/assets'
-import { ButtonStyled, NewModal } from '@modrinth/ui'
+import { NewModal } from '@modrinth/ui'
 import type { Component } from 'vue'
 import { computed, nextTick, ref, useTemplateRef, watch } from 'vue'
 
+import type { ButtonColor } from '#ui/components/base/buttons'
+import { Button } from '#ui/components/base/buttons'
+
 export interface StageButtonConfig {
 	label?: string
 	icon?: Component | null
 	iconPosition?: 'before' | 'after'
-	color?: InstanceType<typeof ButtonStyled>['$props']['color']
+	color?: ButtonColor | 'standard'
 	disabled?: boolean
 	loading?: boolean
 	tooltip?: string
diff --git a/packages/ui/src/components/base/OverflowMenu.vue b/packages/ui/src/components/base/OverflowMenu.vue
deleted file mode 100644
index a9e115917c..0000000000
--- a/packages/ui/src/components/base/OverflowMenu.vue
+++ /dev/null
@@ -1,149 +0,0 @@
-<template>
-	<PopoutMenu
-		ref="dropdown"
-		v-bind="$attrs"
-		:disabled="disabled"
-		:dropdown-id="dropdownId"
-		:tooltip="tooltip"
-		:placement="placement"
-	>
-		<slot></slot>
-		<template #menu>
-			<slot name="menu-header" />
-			<template v-for="(option, index) in options.filter((x) => x.shown === undefined || x.shown)">
-				<div
-					v-if="isDivider(option)"
-					:key="`divider-${index}`"
-					class="h-px mx-[0.625rem] my-2 bg-surface-5"
-				></div>
-				<Button
-					v-else
-					:key="`option-${option.id}`"
-					v-tooltip="option.tooltip"
-					:color="option.color ? option.color : 'default'"
-					:hover-filled="option.hoverFilled"
-					:hover-filled-only="option.hoverFilledOnly"
-					transparent
-					:v-close-popper="!option.remainOnClick"
-					:action="
-						option.action
-							? (event: MouseEvent) => {
-									option.action?.(event)
-									if (!option.remainOnClick) {
-										close()
-									}
-								}
-							: undefined
-					"
-					:link="option.link ? option.link : undefined"
-					:download="option.download ? option.download : undefined"
-					:external="option.external ? option.external : false"
-					:disabled="option.disabled"
-					@click="
-						() => {
-							if (option.link && !option.remainOnClick) {
-								close()
-							}
-						}
-					"
-				>
-					<template v-if="!$slots[option.id]">
-						<component :is="option.icon" v-if="option.icon" class="size-5" />
-						{{ option.id }}
-					</template>
-					<slot :name="option.id"></slot>
-				</Button>
-			</template>
-		</template>
-	</PopoutMenu>
-</template>
-
-<script setup lang="ts">
-import { type Component, type Ref, ref } from 'vue'
-
-import Button from './Button.vue'
-import PopoutMenu from './PopoutMenu.vue'
-
-interface BaseOption {
-	shown?: boolean
-}
-
-interface Divider extends BaseOption {
-	divider?: boolean
-}
-
-interface Item extends BaseOption {
-	id: string
-	icon?: Component
-	action?: (event?: MouseEvent) => void
-	link?: string
-	download?: string
-	external?: boolean
-	color?:
-		| 'primary'
-		| 'danger'
-		| 'secondary'
-		| 'highlight'
-		| 'red'
-		| 'orange'
-		| 'green'
-		| 'blue'
-		| 'purple'
-	hoverFilled?: boolean
-	hoverFilledOnly?: boolean
-	remainOnClick?: boolean
-	disabled?: boolean
-	tooltip?: string
-}
-
-export type Option = Divider | Item
-
-withDefaults(
-	defineProps<{
-		options: Option[]
-		disabled?: boolean
-		dropdownId?: string
-		tooltip?: string
-		placement?: string
-	}>(),
-	{
-		options: () => [],
-		disabled: false,
-		dropdownId: undefined,
-		tooltip: undefined,
-		placement: 'bottom-end',
-	},
-)
-
-defineOptions({
-	inheritAttrs: false,
-})
-
-const dropdown: Ref<InstanceType<typeof PopoutMenu> | null> = ref(null)
-
-const close = () => {
-	dropdown.value?.hide()
-}
-
-const open = () => {
-	dropdown.value?.show()
-}
-
-function isDivider(option: BaseOption): option is Divider {
-	return 'divider' in option
-}
-
-defineExpose({ open, close })
-</script>
-
-<style lang="scss" scoped>
-.btn {
-	white-space: nowrap;
-	width: 100%;
-	box-shadow: none;
-	--text-color: var(--color-base);
-	--background-color: transparent;
-	justify-content: flex-start;
-	padding: 0.55rem 0.625rem;
-}
-</style>
diff --git a/packages/ui/src/components/base/Pagination.vue b/packages/ui/src/components/base/Pagination.vue
index ba1eae2cda..f7a6e08cb5 100644
--- a/packages/ui/src/components/base/Pagination.vue
+++ b/packages/ui/src/components/base/Pagination.vue
@@ -1,18 +1,20 @@
 <template>
 	<div v-if="count > 1" class="flex items-center gap-1">
-		<ButtonStyled v-if="page > 1" circular type="transparent">
-			<a
+		<template v-if="page > 1">
+			<ButtonLink
 				v-if="linkFunction"
 				aria-label="Previous Page"
 				:href="linkFunction(page - 1)"
+				type="quiet"
+				class="!w-9 !px-0 !rounded-full"
 				@click.prevent="switchPage(page - 1)"
 			>
-				<ChevronLeftIcon />
-			</a>
-			<button v-else aria-label="Previous Page" @click="switchPage(page - 1)">
-				<ChevronLeftIcon />
-			</button>
-		</ButtonStyled>
+				<ChevronLeftIcon aria-hidden="true" />
+			</ButtonLink>
+			<IconButton v-else label="Previous Page" type="quiet" @click="switchPage(page - 1)">
+				<ChevronLeftIcon aria-hidden="true" />
+			</IconButton>
+		</template>
 		<div
 			v-for="(item, index) in pages"
 			:key="'page-' + item + '-' + index"
@@ -25,50 +27,55 @@
 			<div v-if="item === '-'" class="rotate-90 grid place-content-center">
 				<EllipsisVerticalIcon />
 			</div>
-			<ButtonStyled
-				v-else
-				circular
-				:color="page === item ? 'brand' : 'standard'"
-				:type="page === item ? 'highlight' : 'transparent'"
-			>
-				<a
+			<template v-else>
+				<ButtonLink
 					v-if="linkFunction"
 					:href="linkFunction(item)"
-					:class="page === item ? '!text-brand' : ''"
+					type="quiet"
+					:color="page === item ? 'brand' : undefined"
+					:interaction="page === item ? 'filled' : undefined"
+					:aria-current="page === item ? 'page' : undefined"
+					:class="['!min-w-9 !rounded-full', page === item ? '!bg-brand-highlight' : '']"
 					@click.prevent="page !== item ? switchPage(item) : null"
 				>
 					{{ item }}
-				</a>
-				<button
+				</ButtonLink>
+				<Button
 					v-else
-					:class="page === item ? '!text-brand' : ''"
+					type="quiet"
+					:color="page === item ? 'brand' : undefined"
+					:interaction="page === item ? 'filled' : undefined"
+					:aria-current="page === item ? 'page' : undefined"
+					:class="['!min-w-9 !rounded-full', page === item ? '!bg-brand-highlight' : '']"
 					@click="page !== item ? switchPage(item) : null"
 				>
 					{{ item }}
-				</button>
-			</ButtonStyled>
+				</Button>
+			</template>
 		</div>
 
-		<ButtonStyled v-if="page !== pages[pages.length - 1]" circular type="transparent">
-			<a
+		<template v-if="page !== pages[pages.length - 1]">
+			<ButtonLink
 				v-if="linkFunction"
 				aria-label="Next Page"
 				:href="linkFunction(page + 1)"
+				type="quiet"
+				class="!w-9 !px-0 !rounded-full"
 				@click.prevent="switchPage(page + 1)"
 			>
-				<ChevronRightIcon />
-			</a>
-			<button v-else aria-label="Next Page" @click="switchPage(page + 1)">
-				<ChevronRightIcon />
-			</button>
-		</ButtonStyled>
+				<ChevronRightIcon aria-hidden="true" />
+			</ButtonLink>
+			<IconButton v-else label="Next Page" type="quiet" @click="switchPage(page + 1)">
+				<ChevronRightIcon aria-hidden="true" />
+			</IconButton>
+		</template>
 	</div>
 </template>
 <script setup lang="ts">
 import { ChevronLeftIcon, ChevronRightIcon, EllipsisVerticalIcon } from '@modrinth/assets'
 import { computed } from 'vue'
 
-import ButtonStyled from './ButtonStyled.vue'
+import { Button, ButtonLink, IconButton } from './buttons'
 
 const emit = defineEmits<{
 	'switch-page': [page: number]
diff --git a/packages/ui/src/components/base/ServerNotice.vue b/packages/ui/src/components/base/ServerNotice.vue
index baac106111..d748a1d8f0 100644
--- a/packages/ui/src/components/base/ServerNotice.vue
+++ b/packages/ui/src/components/base/ServerNotice.vue
@@ -18,14 +18,15 @@
 			</template>
 		</template>
 		<template #actions>
-			<ButtonStyled v-if="dismissable" :color="NOTICE_TYPE_BTN[level]">
-				<button
-					v-tooltip="formatMessage(messages.dismiss)"
-					@click="() => (preview ? {} : emit('dismiss'))"
-				>
-					<XIcon /> Dismiss
-				</button>
-			</ButtonStyled>
+			<Button
+				v-if="dismissable"
+				v-tooltip="formatMessage(messages.dismiss)"
+				type="colored"
+				:color="NOTICE_TYPE_BTN[level]"
+				@click="() => (preview ? {} : emit('dismiss'))"
+			>
+				<XIcon /> Dismiss
+			</Button>
 		</template>
 		<div v-if="message" class="markdown-body" v-html="renderString(message)" />
 	</Admonition>
@@ -36,9 +37,10 @@ import { XIcon } from '@modrinth/assets'
 import { renderString } from '@modrinth/utils'
 import { computed } from 'vue'
 
+import { Button } from '#ui/components/base/buttons'
+
 import { defineMessages, type MessageDescriptor, useVIntl } from '../../composables/i18n'
 import Admonition from './Admonition.vue'
-import ButtonStyled from './ButtonStyled.vue'
 import CopyCode from './CopyCode.vue'
 
 const { formatMessage } = useVIntl()
diff --git a/packages/ui/src/components/base/StackedAdmonitions.vue b/packages/ui/src/components/base/StackedAdmonitions.vue
index 27b28cb1a2..85d01d3172 100644
--- a/packages/ui/src/components/base/StackedAdmonitions.vue
+++ b/packages/ui/src/components/base/StackedAdmonitions.vue
@@ -5,8 +5,9 @@ import { ChevronDownIcon, XIcon } from '@modrinth/assets'
 import { AnimatePresence, Motion } from 'motion-v'
 import { computed, onBeforeUnmount, onMounted, ref, useAttrs, useId, watch } from 'vue'
 
+import { Button } from '#ui/components/base/buttons'
+
 import { defineMessages, useVIntl } from '../../composables/i18n'
-import ButtonStyled from './ButtonStyled.vue'
 export type StackedAdmonitionType = 'info' | 'warning' | 'critical' | 'success'
 
 /** Extend this interface to attach arbitrary per-item data consumed in the #item slot. */
@@ -486,32 +487,34 @@ const messages = defineMessages({
 			>
 				<div v-if="hasActionBar" :ref="(el: unknown) => setActionBarRef(el)">
 					<div class="flex items-center justify-between pb-2">
-						<ButtonStyled type="transparent">
-							<button
-								type="button"
-								:aria-expanded="isExpanded"
-								:aria-controls="stackId"
-								@click="toggleExpanded"
+						<Button
+							type="quiet"
+							native-type="button"
+							:aria-expanded="isExpanded"
+							:aria-controls="stackId"
+							@click="toggleExpanded"
+						>
+							<Motion
+								as="span"
+								class="inline-flex"
+								:animate="{ rotate: isExpanded ? 0 : -90 }"
+								:transition="{ type: 'spring', stiffness: 350, damping: 30 }"
 							>
-								<Motion
-									as="span"
-									class="inline-flex"
-									:animate="{ rotate: isExpanded ? 0 : -90 }"
-									:transition="{ type: 'spring', stiffness: 350, damping: 30 }"
-								>
-									<ChevronDownIcon class="h-4 w-4" />
-								</Motion>
-								<slot name="header-label" :count="items.length" :expanded="isExpanded">
-									{{ formatMessage(messages.alertCount, { count: items.length }) }}
-								</slot>
-							</button>
-						</ButtonStyled>
-						<ButtonStyled v-if="dismissAllEnabled" type="transparent">
-							<button type="button" @click="$emit('dismiss-all')">
-								<XIcon class="h-4 w-4" />
-								{{ formatMessage(messages.dismissAll) }}
-							</button>
-						</ButtonStyled>
+								<ChevronDownIcon class="h-4 w-4" />
+							</Motion>
+							<slot name="header-label" :count="items.length" :expanded="isExpanded">
+								{{ formatMessage(messages.alertCount, { count: items.length }) }}
+							</slot>
+						</Button>
+						<Button
+							v-if="dismissAllEnabled"
+							type="quiet"
+							native-type="button"
+							@click="$emit('dismiss-all')"
+						>
+							<XIcon class="h-4 w-4" />
+							{{ formatMessage(messages.dismissAll) }}
+						</Button>
 					</div>
 				</div>
 			</Transition>
diff --git a/packages/ui/src/components/base/TeleportOverflowMenu.vue b/packages/ui/src/components/base/TeleportOverflowMenu.vue
deleted file mode 100644
index 7f1662ebc0..0000000000
--- a/packages/ui/src/components/base/TeleportOverflowMenu.vue
+++ /dev/null
@@ -1,522 +0,0 @@
-<template>
-	<div data-pyro-telepopover-wrapper class="relative">
-		<button
-			ref="triggerRef"
-			v-tooltip="tooltip"
-			class="teleport-overflow-menu-trigger"
-			:class="btnClass"
-			:aria-expanded="isOpen"
-			:aria-haspopup="true"
-			:aria-label="ariaLabel"
-			:disabled="disabled"
-			@mousedown="handleMouseDown"
-			@mouseenter="handleMouseEnter"
-			@mouseleave="handleMouseLeave"
-			@click="toggleMenu"
-		>
-			<slot></slot>
-		</button>
-		<Teleport to="#teleports">
-			<Transition
-				enter-active-class="transition duration-125 ease-out"
-				enter-from-class="transform scale-75 opacity-0"
-				enter-to-class="transform scale-100 opacity-100"
-				leave-active-class="transition duration-125 ease-in"
-				leave-from-class="transform scale-100 opacity-100"
-				leave-to-class="transform scale-75 opacity-0"
-			>
-				<div
-					v-if="isOpen"
-					ref="menuRef"
-					data-pyro-telepopover-root
-					class="fixed isolate z-[9999] flex w-fit flex-col gap-2 overflow-x-hidden overflow-y-auto rounded-2xl border-[1px] border-solid border-surface-5 bg-bg-raised p-2 shadow-lg"
-					:style="menuStyle"
-					role="menu"
-					tabindex="-1"
-					@mousedown.stop
-					@wheel.stop
-					@mouseleave="handleMouseLeave"
-				>
-					<template
-						v-for="(option, index) in filteredOptions"
-						:key="isDivider(option) ? `divider-${index}` : option.id"
-					>
-						<div v-if="isDivider(option)" class="h-px w-full bg-surface-5"></div>
-						<ButtonStyled
-							v-else
-							type="transparent"
-							role="menuitem"
-							:color="optionButtonColor(option)"
-						>
-							<button
-								v-if="typeof option.action === 'function' || option.disabled"
-								:ref="
-									(el) => {
-										if (el) menuItemsRef[index] = el as HTMLElement
-									}
-								"
-								v-tooltip="option.tooltip"
-								:disabled="option.disabled"
-								class="w-full !justify-start !whitespace-nowrap focus-visible:!outline-none"
-								:aria-label="option.ariaLabel ?? option.label ?? option.id"
-								:aria-selected="index === selectedIndex"
-								:style="index === selectedIndex ? { background: 'var(--color-button-bg)' } : {}"
-								@click="(event) => handleItemClick(option, index, event)"
-								@focus="selectedIndex = index"
-								@mouseover="handleMouseOver(index)"
-							>
-								<slot :name="option.id">
-									<component :is="option.icon" v-if="option.icon" class="size-5" />
-									{{ option.label ?? option.id }}
-								</slot>
-							</button>
-							<AutoLink
-								v-else-if="optionLink(option)"
-								:ref="
-									(el) => {
-										if (el) menuItemsRef[index] = el as HTMLElement
-									}
-								"
-								:to="optionLink(option)"
-								:target="option.external ? '_blank' : undefined"
-								:rel="option.external ? 'noopener noreferrer' : undefined"
-								class="w-full !justify-start !whitespace-nowrap focus-visible:!outline-none"
-								:aria-label="option.ariaLabel ?? option.label ?? option.id"
-								:aria-selected="index === selectedIndex"
-								:style="index === selectedIndex ? { background: 'var(--color-button-bg)' } : {}"
-								@click="(event) => handleItemClick(option, index, event)"
-								@focus="selectedIndex = index"
-								@mouseover="handleMouseOver(index)"
-							>
-								<slot :name="option.id">
-									<component :is="option.icon" v-if="option.icon" class="size-5" />
-									{{ option.label ?? option.id }}
-								</slot>
-							</AutoLink>
-							<span v-else>
-								<slot :name="option.id">
-									<component :is="option.icon" v-if="option.icon" class="size-5" />
-									{{ option.label ?? option.id }}
-								</slot>
-							</span>
-						</ButtonStyled>
-					</template>
-				</div>
-			</Transition>
-		</Teleport>
-	</div>
-</template>
-
-<script setup lang="ts">
-import { onClickOutside, useElementHover } from '@vueuse/core'
-import { type Component, computed, nextTick, onMounted, onUnmounted, ref, watch } from 'vue'
-
-import AutoLink from './AutoLink.vue'
-import ButtonStyled from './ButtonStyled.vue'
-
-type OptionColor =
-	| 'standard'
-	| 'brand'
-	| 'primary'
-	| 'danger'
-	| 'secondary'
-	| 'highlight'
-	| 'red'
-	| 'orange'
-	| 'green'
-	| 'blue'
-	| 'purple'
-
-export interface Option {
-	id: string
-	label?: string
-	icon?: Component
-	action?: ((event?: MouseEvent) => void) | string
-	link?: string
-	external?: boolean
-	shown?: boolean
-	color?: OptionColor
-	disabled?: boolean
-	tooltip?: string
-	ariaLabel?: string
-	remainOnClick?: boolean
-}
-
-export type Divider = {
-	divider?: boolean
-	shown?: boolean
-}
-
-export type Item = Option | Divider
-
-function isDivider(item: Item): item is Divider {
-	return !!(item as Divider).divider
-}
-
-const props = withDefaults(
-	defineProps<{
-		options: Item[]
-		hoverable?: boolean
-		btnClass?: string | string[] | Record<string, boolean>
-		disabled?: boolean
-		tooltip?: string
-		ariaLabel?: string
-		placement?: 'right' | 'center'
-	}>(),
-	{
-		hoverable: false,
-		btnClass: undefined,
-		disabled: false,
-		tooltip: undefined,
-		ariaLabel: undefined,
-		placement: 'right',
-	},
-)
-
-const emit = defineEmits<{
-	select: [option: Option]
-	open: []
-}>()
-
-const isOpen = ref(false)
-const selectedIndex = ref(-1)
-const menuRef = ref<HTMLElement | null>(null)
-const triggerRef = ref<HTMLElement | null>(null)
-const isMouseDown = ref(false)
-const typeAheadBuffer = ref('')
-const typeAheadTimeout = ref<number | null>(null)
-const menuItemsRef = ref<HTMLElement[]>([])
-
-const hoveringTrigger = useElementHover(triggerRef)
-const hoveringMenu = useElementHover(menuRef)
-
-const hovering = computed(() => hoveringTrigger.value || hoveringMenu.value)
-
-const menuStyle = ref<Record<string, string>>({
-	top: '-9999px',
-	left: '-9999px',
-})
-
-const filteredOptions = computed(() => props.options.filter((option) => option.shown !== false))
-
-const calculateMenuPosition = () => {
-	if (!triggerRef.value || !menuRef.value) return null
-
-	const triggerRect = triggerRef.value.getBoundingClientRect()
-	// offsetWidth is not affected by CSS transforms (unlike getBoundingClientRect)
-	// scrollHeight gives the full content height regardless of any maxHeight constraint,
-	// preventing a feedback loop where clamped offsetHeight makes it look like the menu fits
-	const menuWidth = menuRef.value.offsetWidth
-	const menuHeight = menuRef.value.scrollHeight
-	const margin = 8
-
-	let top: number
-	let maxHeight: number | null = null
-
-	const spaceBelow = window.innerHeight - triggerRect.bottom - margin
-	const spaceAbove = triggerRect.top - margin
-
-	if (menuHeight <= spaceBelow) {
-		top = triggerRect.bottom + margin
-	} else if (menuHeight <= spaceAbove) {
-		top = triggerRect.top - menuHeight - margin
-	} else if (spaceBelow >= spaceAbove) {
-		top = triggerRect.bottom + margin
-		maxHeight = spaceBelow
-	} else {
-		maxHeight = spaceAbove
-		top = triggerRect.top - maxHeight - margin
-	}
-
-	const preferredLeft =
-		props.placement === 'center'
-			? triggerRect.left + triggerRect.width / 2 - menuWidth / 2
-			: triggerRect.right - menuWidth
-	const left = Math.max(margin, Math.min(preferredLeft, window.innerWidth - menuWidth - margin))
-
-	return {
-		top: `${top}px`,
-		left: `${left}px`,
-		...(maxHeight !== null ? { maxHeight: `${maxHeight}px` } : {}),
-	}
-}
-
-const toggleMenu = (event: MouseEvent) => {
-	event.stopPropagation()
-	if (props.disabled) return
-	if (!props.hoverable) {
-		if (isOpen.value) {
-			closeMenu()
-		} else {
-			openMenu()
-		}
-	}
-}
-
-const openMenu = () => {
-	if (props.disabled) return
-	menuStyle.value = { top: '-9999px', left: '-9999px' }
-	isOpen.value = true
-	emit('open')
-	// nextTick lets Vue render the element, then requestAnimationFrame waits for the
-	// browser to complete layout so offsetWidth/offsetHeight are real values.
-	nextTick(() =>
-		requestAnimationFrame(() => {
-			const pos = calculateMenuPosition()
-			if (pos) menuStyle.value = pos
-			document.addEventListener('mousemove', handleMouseMove)
-			focusFirstMenuItem()
-		}),
-	)
-}
-
-const closeMenu = () => {
-	isOpen.value = false
-	selectedIndex.value = -1
-	document.removeEventListener('mousemove', handleMouseMove)
-}
-
-const selectOption = (option: Option, event?: MouseEvent) => {
-	emit('select', option)
-	if (typeof option.action === 'function') {
-		option.action(event)
-	}
-	if (!option.remainOnClick) {
-		closeMenu()
-	}
-}
-
-const handleMouseDown = (event: MouseEvent) => {
-	if (props.disabled) return
-	event.preventDefault()
-	isMouseDown.value = true
-}
-
-const handleMouseEnter = () => {
-	if (props.hoverable) {
-		openMenu()
-	}
-}
-
-const handleMouseLeave = () => {
-	if (props.hoverable) {
-		setTimeout(() => {
-			if (!hovering.value) {
-				closeMenu()
-			}
-		}, 250)
-	}
-}
-
-const handleMouseMove = (event: MouseEvent) => {
-	if (!isOpen.value || !isMouseDown.value) return
-
-	const menuRect = menuRef.value?.getBoundingClientRect()
-	if (!menuRect) return
-
-	const menuItems = menuRef.value?.querySelectorAll('[role="menuitem"]')
-	if (!menuItems) return
-
-	for (let i = 0; i < menuItems.length; i++) {
-		const itemRect = (menuItems[i] as HTMLElement).getBoundingClientRect()
-		if (
-			event.clientX >= itemRect.left &&
-			event.clientX <= itemRect.right &&
-			event.clientY >= itemRect.top &&
-			event.clientY <= itemRect.bottom
-		) {
-			selectedIndex.value = i
-			break
-		}
-	}
-}
-
-const handleItemClick = (option: Option, index: number, event?: MouseEvent) => {
-	if (option.disabled) return
-	selectedIndex.value = index
-	selectOption(option, event)
-}
-
-const handleMouseOver = (index: number) => {
-	selectedIndex.value = index
-	menuItemsRef.value[selectedIndex.value]?.focus?.()
-}
-
-const focusFirstMenuItem = () => {
-	if (menuItemsRef.value.length > 0) {
-		menuItemsRef.value[0]?.focus?.()
-	}
-}
-
-const handleKeydown = (event: KeyboardEvent) => {
-	if (!isOpen.value) {
-		if (event.key === 'Enter' || event.key === ' ') {
-			event.preventDefault()
-			openMenu()
-		}
-		return
-	}
-
-	switch (event.key) {
-		case 'ArrowDown':
-			event.preventDefault()
-			selectedIndex.value = (selectedIndex.value + 1) % filteredOptions.value.length
-			menuItemsRef.value[selectedIndex.value]?.focus?.()
-			break
-		case 'ArrowUp':
-			event.preventDefault()
-			selectedIndex.value =
-				(selectedIndex.value - 1 + filteredOptions.value.length) % filteredOptions.value.length
-			menuItemsRef.value[selectedIndex.value]?.focus?.()
-			break
-		case 'Home':
-			event.preventDefault()
-			if (menuItemsRef.value.length > 0) {
-				selectedIndex.value = 0
-				menuItemsRef.value[selectedIndex.value]?.focus?.()
-			}
-			break
-		case 'End':
-			event.preventDefault()
-			if (menuItemsRef.value.length > 0) {
-				selectedIndex.value = filteredOptions.value.length - 1
-				menuItemsRef.value[selectedIndex.value]?.focus?.()
-			}
-			break
-		case 'Enter':
-		case ' ':
-			event.preventDefault()
-			if (selectedIndex.value >= 0) {
-				const option = filteredOptions.value[selectedIndex.value]
-				if (isDivider(option)) break
-				selectOption(option)
-			}
-			break
-		case 'Escape':
-			event.preventDefault()
-			closeMenu()
-			triggerRef.value?.focus?.()
-			break
-		case 'Tab':
-			event.preventDefault()
-			if (menuItemsRef.value.length > 0) {
-				if (event.shiftKey) {
-					selectedIndex.value =
-						(selectedIndex.value - 1 + filteredOptions.value.length) % filteredOptions.value.length
-				} else {
-					selectedIndex.value = (selectedIndex.value + 1) % filteredOptions.value.length
-				}
-				menuItemsRef.value[selectedIndex.value]?.focus?.()
-			}
-			break
-		default:
-			if (event.key.length === 1) {
-				typeAheadBuffer.value += event.key.toLowerCase()
-				const matchIndex = filteredOptions.value.findIndex(
-					(option) =>
-						!isDivider(option) && option.id.toLowerCase().startsWith(typeAheadBuffer.value),
-				)
-				if (matchIndex !== -1) {
-					selectedIndex.value = matchIndex
-					menuItemsRef.value[selectedIndex.value]?.focus?.()
-				}
-				if (typeAheadTimeout.value) {
-					clearTimeout(typeAheadTimeout.value)
-				}
-				typeAheadTimeout.value = setTimeout(() => {
-					typeAheadBuffer.value = ''
-				}, 1000) as unknown as number
-			}
-			break
-	}
-}
-
-const handleResize = () => {
-	if (!isOpen.value) return
-	const pos = calculateMenuPosition()
-	if (pos) menuStyle.value = pos
-}
-
-const handleScroll = () => {
-	if (!isOpen.value) return
-	const pos = calculateMenuPosition()
-	if (!pos) return
-	// On scroll only the vertical position changes — don't update left, which would shift
-	// the menu horizontally due to scrollbar appearing/disappearing changing offsetWidth
-	const updated: Record<string, string> = { ...menuStyle.value, top: pos.top }
-	if (pos.maxHeight) {
-		updated.maxHeight = pos.maxHeight
-	} else {
-		delete updated.maxHeight
-	}
-	menuStyle.value = updated
-}
-
-const throttle = <T extends unknown[]>(
-	func: (...args: T) => void,
-	limit: number,
-): ((...args: T) => void) => {
-	let inThrottle: boolean
-	return function (...args: T) {
-		if (!inThrottle) {
-			func(...args)
-			inThrottle = true
-			setTimeout(() => (inThrottle = false), limit)
-		}
-	}
-}
-
-const throttledHandleResize = throttle(handleResize, 100)
-const throttledHandleScroll = throttle(handleScroll, 100)
-
-onMounted(() => {
-	triggerRef.value?.addEventListener('keydown', handleKeydown)
-	window.addEventListener('resize', throttledHandleResize)
-	window.addEventListener('scroll', throttledHandleScroll)
-})
-
-onUnmounted(() => {
-	triggerRef.value?.removeEventListener('keydown', handleKeydown)
-	window.removeEventListener('resize', throttledHandleResize)
-	window.removeEventListener('scroll', throttledHandleScroll)
-	document.removeEventListener('mousemove', handleMouseMove)
-	if (typeAheadTimeout.value) {
-		clearTimeout(typeAheadTimeout.value)
-	}
-})
-
-watch(isOpen, (newValue) => {
-	if (newValue) {
-		nextTick(() => {
-			menuRef.value?.addEventListener('keydown', handleKeydown)
-		})
-	} else {
-		menuRef.value?.removeEventListener('keydown', handleKeydown)
-	}
-})
-
-onClickOutside(menuRef, (event) => {
-	if (!triggerRef.value?.contains(event.target as Node)) {
-		closeMenu()
-	}
-})
-
-function optionLink(option: Option) {
-	if (typeof option.action === 'string') return option.action
-	return option.link
-}
-
-function optionButtonColor(option: Option) {
-	switch (option.color) {
-		case 'primary':
-			return 'brand'
-		case 'danger':
-			return 'red'
-		case 'secondary':
-		case 'highlight':
-			return 'standard'
-		default:
-			return option.color ?? 'standard'
-	}
-}
-</script>
diff --git a/packages/ui/src/components/base/TimeFramePicker.vue b/packages/ui/src/components/base/TimeFramePicker.vue
index 0db65f9e14..2be4e72e73 100644
--- a/packages/ui/src/components/base/TimeFramePicker.vue
+++ b/packages/ui/src/components/base/TimeFramePicker.vue
@@ -5,6 +5,9 @@
 		:display-value="selectedTimeframeLabel"
 		:max-height="maxHeight"
 		:trigger-class="triggerClass"
+		:trigger-type="triggerType"
+		:trigger-size="triggerSize"
+		:trigger-interaction="triggerInteraction"
 		:dropdown-min-width="timeframeDropdownMinWidth"
 		:outside-click-ignore="timeframeDropdownOutsideClickIgnore"
 		:dropdown-class="
@@ -103,16 +106,18 @@
 						</div>
 
 						<div class="flex items-center gap-2">
-							<ButtonStyled type="outlined">
-								<button type="button" @click="handleCustomRangeCancel">
-									{{ formatMessage(messages.cancel) }}
-								</button>
-							</ButtonStyled>
-							<ButtonStyled color="brand">
-								<button type="button" :disabled="!hasCompleteRange" @click="handleCustomRangeApply">
-									{{ formatMessage(messages.apply) }}
-								</button>
-							</ButtonStyled>
+							<Button type="outlined" native-type="button" @click="handleCustomRangeCancel">
+								{{ formatMessage(messages.cancel) }}
+							</Button>
+							<Button
+								type="colored"
+								color="brand"
+								native-type="button"
+								:disabled="!hasCompleteRange"
+								@click="handleCustomRangeApply"
+							>
+								{{ formatMessage(messages.apply) }}
+							</Button>
 						</div>
 					</div>
 				</div>
@@ -196,8 +201,14 @@
 import { MinusIcon, PlusIcon } from '@modrinth/assets'
 import { computed, nextTick, onBeforeUnmount, onMounted, ref, watch } from 'vue'
 
+import {
+	Button,
+	type ButtonInteraction,
+	type ButtonSize,
+	type ButtonType,
+} from '#ui/components/base/buttons'
+
 import { defineMessages, useVIntl } from '../../composables/i18n'
-import ButtonStyled from './ButtonStyled.vue'
 import Combobox, { type ComboboxOption } from './Combobox.vue'
 import DatePicker from './DatePicker.vue'
 
@@ -391,11 +402,17 @@ const props = withDefaults(
 		nowTimestamp?: number
 		maxHeight?: number
 		triggerClass?: string
+		triggerType?: ButtonType
+		triggerSize?: ButtonSize
+		triggerInteraction?: ButtonInteraction
 		dropdownMinWidth?: string | number
 		customRangeDropdownMinWidth?: string | number
 	}>(),
 	{
 		maxHeight: TIMEFRAME_DROPDOWN_MAX_HEIGHT,
+		triggerType: 'base',
+		triggerSize: 'md',
+		triggerInteraction: 'surface',
 		dropdownMinWidth: TIMEFRAME_DROPDOWN_MIN_WIDTH,
 		customRangeDropdownMinWidth: CUSTOM_RANGE_DROPDOWN_MIN_WIDTH,
 	},
diff --git a/packages/ui/src/components/base/UnsavedChangesPopup.vue b/packages/ui/src/components/base/UnsavedChangesPopup.vue
index 4606042c86..c997b965a5 100644
--- a/packages/ui/src/components/base/UnsavedChangesPopup.vue
+++ b/packages/ui/src/components/base/UnsavedChangesPopup.vue
@@ -3,9 +3,10 @@ import { HistoryIcon, SaveIcon, SpinnerIcon } from '@modrinth/assets'
 import { isEqual } from 'es-toolkit'
 import { type Component, computed, ref } from 'vue'
 
+import { Button } from '#ui/components/base/buttons'
+
 import { defineMessage, type MessageDescriptor, useVIntl } from '../../composables/i18n'
 import { commonMessages } from '../../utils'
-import ButtonStyled from './ButtonStyled.vue'
 import FloatingActionBar from './FloatingActionBar.vue'
 
 const { formatMessage } = useVIntl()
@@ -62,18 +63,14 @@ defineExpose({ nudge })
 	<FloatingActionBar ref="actionBar" :shown="shown" :inline="inline">
 		<p class="m-0 font-semibold text-sm md:text-base">{{ localizeIfPossible(text) }}</p>
 		<div class="ml-auto flex gap-2">
-			<ButtonStyled v-if="canReset" type="transparent">
-				<button :disabled="saving" @click="(e) => emit('reset', e)">
-					<HistoryIcon /> {{ formatMessage(commonMessages.resetButton) }}
-				</button>
-			</ButtonStyled>
-			<ButtonStyled color="brand">
-				<button :disabled="saving" @click="(e) => emit('save', e)">
-					<SpinnerIcon v-if="saving" class="animate-spin" />
-					<component :is="saveIcon" v-else />
-					{{ localizeIfPossible(saving ? savingLabel : saveLabel) }}
-				</button>
-			</ButtonStyled>
+			<Button v-if="canReset" type="quiet" :disabled="saving" @click="(e) => emit('reset', e)">
+				<HistoryIcon /> {{ formatMessage(commonMessages.resetButton) }}
+			</Button>
+			<Button type="colored" color="brand" :disabled="saving" @click="(e) => emit('save', e)">
+				<SpinnerIcon v-if="saving" class="animate-spin" />
+				<component :is="saveIcon" v-else />
+				{{ localizeIfPossible(saving ? savingLabel : saveLabel) }}
+			</Button>
 		</div>
 	</FloatingActionBar>
 </template>
diff --git a/packages/ui/src/components/base/buttons/Button.vue b/packages/ui/src/components/base/buttons/Button.vue
new file mode 100644
index 0000000000..6d9f4e2b44
--- /dev/null
+++ b/packages/ui/src/components/base/buttons/Button.vue
@@ -0,0 +1,35 @@
+<script setup lang="ts">
+import { computed, ref } from 'vue'
+
+import ButtonFrame from './ButtonFrame.vue'
+import type { ButtonProps } from './types'
+
+const props = withDefaults(defineProps<ButtonProps>(), {
+	type: 'base',
+	size: 'md',
+	nativeType: 'button',
+	disabled: false,
+	loading: false,
+})
+
+const frame = ref<InstanceType<typeof ButtonFrame> | null>(null)
+const element = computed(() => frame.value?.element ?? null)
+
+defineExpose({ element })
+</script>
+
+<template>
+	<ButtonFrame
+		ref="frame"
+		as="button"
+		:type="props.type"
+		:color="props.color"
+		:size="props.size"
+		:interaction="props.interaction"
+		:native-type="props.nativeType"
+		:disabled="props.disabled || props.loading"
+		:aria-busy="props.loading || undefined"
+	>
+		<slot />
+	</ButtonFrame>
+</template>
diff --git a/packages/ui/src/components/base/buttons/ButtonFrame.vue b/packages/ui/src/components/base/buttons/ButtonFrame.vue
new file mode 100644
index 0000000000..81d0c09f8d
--- /dev/null
+++ b/packages/ui/src/components/base/buttons/ButtonFrame.vue
@@ -0,0 +1,165 @@
+<script setup lang="ts">
+import type { Component, CSSProperties } from 'vue'
+import { computed, ref } from 'vue'
+
+import type {
+	ButtonColor,
+	ButtonInteraction,
+	ButtonNativeType,
+	ButtonSize,
+	ButtonType,
+} from './types'
+
+const baseClasses = [
+	// Base
+	'relative inline-flex min-w-0 shrink-0 items-center justify-center',
+	'whitespace-nowrap border-0 no-underline',
+	// Interactions
+	'touch-manipulation cursor-pointer select-none transition-[background-color,color,box-shadow,filter,opacity,transform] duration-150 ease-out',
+	'enabled:active:scale-[0.97]',
+	// Hovering
+	'[&:not(:disabled):not([aria-disabled=true]):hover]:brightness-[--hover-brightness]',
+	// Accessibility
+	'[&:not(:disabled):not([aria-disabled=true]):focus-visible]:brightness-[--hover-brightness] focus-visible:outline-none [&:not(:disabled):not([aria-disabled=true]):focus-visible]:ring-4 [&:not(:disabled):not([aria-disabled=true]):focus-visible]:ring-brand-shadow',
+	'disabled:cursor-not-allowed disabled:opacity-50',
+	'[&[aria-disabled=true]]:cursor-not-allowed [&[aria-disabled=true]]:opacity-50',
+].join(' ')
+
+const sizeClasses: Record<ButtonSize, string> = {
+	xs: 'h-7 gap-1 rounded-lg px-1.5 text-sm font-semibold leading-5 [&>svg]:size-4 [&>svg]:min-h-4 [&>svg]:min-w-4 [&>svg]:shrink-0',
+	sm: 'h-8 gap-1 rounded-[10px] px-1.5 text-sm font-semibold leading-5 [&>svg]:size-4 [&>svg]:min-h-4 [&>svg]:min-w-4 [&>svg]:shrink-0',
+	md: 'h-9 gap-1.5 rounded-xl px-2.5 text-base font-semibold leading-5 [&>svg]:size-5 [&>svg]:min-h-5 [&>svg]:min-w-5 [&>svg]:shrink-0',
+	lg: 'h-10 gap-2 rounded-[14px] px-4 text-base font-semibold leading-5 [&>svg]:size-5 [&>svg]:min-h-5 [&>svg]:min-w-5 [&>svg]:shrink-0',
+	xl: 'h-12 gap-2 rounded-2xl px-3.5 text-base font-extrabold leading-5 [&>svg]:size-6 [&>svg]:min-h-6 [&>svg]:min-w-6 [&>svg]:shrink-0',
+}
+
+const iconOnlySizeClasses: Record<ButtonSize, string> = {
+	xs: 'w-7 !px-0',
+	sm: 'w-8 !px-0',
+	md: 'w-9 !px-0',
+	lg: 'w-10 !px-0',
+	xl: 'w-12 !px-0',
+}
+
+const typeClasses: Record<ButtonType, string> = {
+	base: 'button-frame--base bg-surface-4 text-contrast [&>svg]:text-primary',
+	colored:
+		'button-frame--colored bg-[--button-color] text-[var(--color-accent-contrast)] [&>svg]:text-inherit',
+	outlined:
+		'button-frame--outlined bg-transparent text-[var(--button-color,var(--color-contrast))] [&>svg]:text-inherit',
+	quiet: 'button-frame--quiet bg-transparent [&>svg]:text-inherit',
+}
+
+const interactionClasses: Record<ButtonInteraction, string> = {
+	surface:
+		'[&:not(:disabled):not([aria-disabled=true]):hover]:bg-surface-4 [&:not(:disabled):not([aria-disabled=true]):focus-visible]:bg-surface-4',
+	filled:
+		'[&:not(:disabled):not([aria-disabled=true]):hover]:!bg-[--button-color] [&:not(:disabled):not([aria-disabled=true]):focus-visible]:!bg-[--button-color] [&:not(:disabled):not([aria-disabled=true]):hover]:!text-[var(--color-accent-contrast)] [&:not(:disabled):not([aria-disabled=true]):focus-visible]:!text-[var(--color-accent-contrast)]',
+	none: '[&:not(:disabled):not([aria-disabled=true]):hover]:!brightness-100 [&:not(:disabled):not([aria-disabled=true]):focus-visible]:!brightness-100',
+}
+
+const colorVariables: Record<ButtonColor, string> = {
+	brand: 'var(--color-brand)',
+	red: 'var(--color-red)',
+	orange: 'var(--color-orange)',
+	green: 'var(--color-green)',
+	blue: 'var(--color-blue)',
+	purple: 'var(--color-purple)',
+	medal_promotion: 'var(--medal-promotion-text-orange, var(--color-orange))',
+}
+
+const props = withDefaults(
+	defineProps<{
+		as: string | Component
+		type?: ButtonType
+		color?: ButtonColor
+		size?: ButtonSize
+		interaction?: ButtonInteraction
+		iconOnly?: boolean
+		circular?: boolean
+		nativeType?: ButtonNativeType
+	}>(),
+	{
+		type: 'base',
+		size: 'md',
+		interaction: 'surface',
+		iconOnly: false,
+		circular: false,
+		nativeType: undefined,
+	},
+)
+
+const element = ref<HTMLElement | null>(null)
+const classes = computed(() => [
+	baseClasses,
+	typeClasses[props.type],
+	props.type === 'quiet' ? interactionClasses[props.interaction] : '',
+	sizeClasses[props.size],
+	props.iconOnly ? iconOnlySizeClasses[props.size] : '',
+	props.circular ? '!rounded-full' : '',
+])
+const style = computed((): CSSProperties | undefined => {
+	if ((props.type === 'outlined' || props.type === 'quiet') && !props.color) return undefined
+	if (props.type !== 'colored' && props.type !== 'outlined' && props.type !== 'quiet')
+		return undefined
+
+	return {
+		'--button-color': colorVariables[props.color ?? 'brand'],
+	} as CSSProperties
+})
+
+defineExpose({ element })
+</script>
+
+<template>
+	<component
+		:is="as"
+		ref="element"
+		data-button
+		:type="props.nativeType"
+		:class="classes"
+		:style="style"
+	>
+		<slot />
+	</component>
+</template>
+
+<style scoped>
+.button-frame--base {
+	box-shadow:
+		inset 0 0 0 1px var(--surface-5),
+		0 1px 1px rgba(0, 0, 0, 0.12);
+}
+
+.button-frame--colored {
+	box-shadow:
+		0 0 0 1px color-mix(in srgb, var(--button-color) 30%, transparent),
+		0 2px 4px rgba(0, 0, 0, 0.04),
+		0 5px 8px rgba(0, 0, 0, 0.04),
+		0 10px 18px rgba(0, 0, 0, 0.03),
+		0 24px 48px rgba(0, 0, 0, 0.03);
+}
+
+.button-frame--colored::before {
+	position: absolute;
+	inset: 0;
+	padding: 1px;
+	pointer-events: none;
+	content: '';
+	border-radius: inherit;
+	background: linear-gradient(180deg, rgba(255, 255, 255, 0.3), rgba(255, 255, 255, 0));
+	-webkit-mask:
+		linear-gradient(#000 0 0) content-box,
+		linear-gradient(#000 0 0);
+	-webkit-mask-composite: xor;
+	mask-composite: exclude;
+}
+
+.button-frame--outlined {
+	box-shadow: inset 0 0 0 1px var(--button-color, var(--surface-5));
+}
+
+.button-frame--quiet {
+	color: var(--button-color, var(--color-base));
+}
+</style>
diff --git a/packages/ui/src/components/base/buttons/ButtonGroup.vue b/packages/ui/src/components/base/buttons/ButtonGroup.vue
new file mode 100644
index 0000000000..04af5b1261
--- /dev/null
+++ b/packages/ui/src/components/base/buttons/ButtonGroup.vue
@@ -0,0 +1,85 @@
+<script setup lang="ts">
+withDefaults(
+	defineProps<{
+		label?: string
+	}>(),
+	{
+		label: undefined,
+	},
+)
+</script>
+
+<template>
+	<div
+		:role="label ? 'group' : undefined"
+		:aria-label="label"
+		class="button-group inline-flex [&>[data-button]+[data-button]]:-ms-px [&>[data-button]:active]:z-10 [&>[data-button]:focus-visible]:z-10 [&>[data-button]:not(:disabled):not([aria-disabled=true]):hover]:z-10 [&>[data-button]:not(:first-child)]:rounded-l-none [&>[data-button]:not(:last-child)]:rounded-r-none"
+	>
+		<slot />
+	</div>
+</template>
+
+<style scoped>
+.button-group
+	:deep([data-button].button-frame--colored:first-child:not(:last-child):not(:focus-visible)) {
+	clip-path: inset(-4rem var(--button-group-inner-clip, 1px) -4rem -4rem);
+}
+
+.button-group
+	:deep(
+		[data-button].button-frame--colored:not(:first-child):not(:last-child):not(:focus-visible)
+	) {
+	clip-path: inset(
+		-4rem var(--button-group-inner-clip, 1px) -4rem var(--button-group-leading-clip, 0px)
+	);
+}
+
+.button-group
+	:deep([data-button].button-frame--colored:last-child:not(:first-child):not(:focus-visible)) {
+	clip-path: inset(-4rem -4rem -4rem var(--button-group-leading-clip, 0px));
+}
+
+:dir(rtl)
+	.button-group
+	:deep([data-button].button-frame--colored:first-child:not(:last-child):not(:focus-visible)) {
+	clip-path: inset(-4rem -4rem -4rem var(--button-group-inner-clip, 1px));
+}
+
+:dir(rtl)
+	.button-group
+	:deep(
+		[data-button].button-frame--colored:not(:first-child):not(:last-child):not(:focus-visible)
+	) {
+	clip-path: inset(
+		-4rem var(--button-group-leading-clip, 0px) -4rem var(--button-group-inner-clip, 1px)
+	);
+}
+
+:dir(rtl)
+	.button-group
+	:deep([data-button].button-frame--colored:last-child:not(:first-child):not(:focus-visible)) {
+	clip-path: inset(-4rem var(--button-group-leading-clip, 0px) -4rem -4rem);
+}
+
+.button-group :deep([data-button].button-frame--colored:active) {
+	--button-group-inner-clip: 0;
+}
+
+/*
+ * the seam is normally drawn by the button on the right, but hovering over the left one will make it draw the seam instead. when pressed, make the right one draw its own seam again.
+ */
+.button-group
+	:deep([data-button].button-frame--colored:not(:disabled):not([aria-disabled='true']):hover) {
+	--button-group-inner-clip: 0;
+}
+
+.button-group
+	:deep(
+		[data-button].button-frame--colored:not(:disabled):not([aria-disabled='true']):hover:not(
+				:active
+			)
+			+ [data-button]
+	) {
+	--button-group-leading-clip: 1px;
+}
+</style>
diff --git a/packages/ui/src/components/base/buttons/ButtonLink.vue b/packages/ui/src/components/base/buttons/ButtonLink.vue
new file mode 100644
index 0000000000..cb11c7c6c6
--- /dev/null
+++ b/packages/ui/src/components/base/buttons/ButtonLink.vue
@@ -0,0 +1,67 @@
+<script setup lang="ts">
+import { computed } from 'vue'
+import { RouterLink } from 'vue-router'
+
+import ButtonFrame from './ButtonFrame.vue'
+import type {
+	ButtonColor,
+	ButtonInteraction,
+	ButtonLinkDestination,
+	ButtonSize,
+	ButtonType,
+} from './types'
+
+type ButtonLinkProps = ButtonLinkDestination & {
+	type?: ButtonType
+	color?: ButtonColor
+	size?: ButtonSize
+	interaction?: ButtonInteraction
+	target?: string
+	rel?: string
+	download?: string | boolean
+	disabled?: boolean
+}
+
+const props = withDefaults(defineProps<ButtonLinkProps>(), {
+	type: 'base',
+	size: 'md',
+	target: undefined,
+	rel: undefined,
+	download: undefined,
+	disabled: false,
+})
+
+const usesRouter = computed(() => props.to !== undefined && !props.disabled)
+const component = computed(() => (usesRouter.value ? RouterLink : 'a'))
+const resolvedRel = computed(() => {
+	if (props.rel) return props.rel
+	return props.target === '_blank' ? 'noopener noreferrer' : undefined
+})
+
+function handleClick(event: MouseEvent) {
+	if (!props.disabled) return
+	event.preventDefault()
+	event.stopImmediatePropagation()
+}
+</script>
+
+<template>
+	<ButtonFrame
+		:as="component"
+		:type="props.type"
+		:color="props.color"
+		:size="props.size"
+		:interaction="props.interaction"
+		:to="usesRouter ? props.to : undefined"
+		:href="!usesRouter && !props.disabled ? props.href : undefined"
+		:target="props.target"
+		:rel="resolvedRel"
+		:download="!props.disabled ? props.download : undefined"
+		:aria-disabled="props.disabled || undefined"
+		:role="props.disabled ? 'link' : undefined"
+		:tabindex="props.disabled ? -1 : undefined"
+		@click="handleClick"
+	>
+		<slot />
+	</ButtonFrame>
+</template>
diff --git a/packages/ui/src/components/base/buttons/FileButton.vue b/packages/ui/src/components/base/buttons/FileButton.vue
new file mode 100644
index 0000000000..0c6c09b2ee
--- /dev/null
+++ b/packages/ui/src/components/base/buttons/FileButton.vue
@@ -0,0 +1,85 @@
+<script setup lang="ts">
+import { fileIsValid } from '@modrinth/utils'
+
+import { useFormatBytes } from '../../../composables'
+import ButtonFrame from './ButtonFrame.vue'
+import type { ButtonColor, ButtonInteraction, ButtonSize, ButtonType } from './types'
+
+const props = withDefaults(
+	defineProps<{
+		prompt?: string
+		multiple?: boolean
+		accept?: string
+		maxSize?: number | null
+		disabled?: boolean
+		allowDrop?: boolean
+		type?: ButtonType
+		color?: ButtonColor
+		size?: ButtonSize
+		interaction?: ButtonInteraction
+	}>(),
+	{
+		prompt: 'Select file',
+		multiple: false,
+		accept: undefined,
+		maxSize: undefined,
+		disabled: false,
+		allowDrop: true,
+		type: 'base',
+		size: 'md',
+	},
+)
+
+const emit = defineEmits<{
+	change: [files: File[]]
+}>()
+
+const formatBytes = useFormatBytes()
+
+function selectFiles(incoming: FileList) {
+	if (props.disabled) return
+
+	const validationOptions = { maxSize: props.maxSize, alertOnInvalid: true }
+	const validFiles = Array.from(incoming).filter((file) =>
+		fileIsValid(file, validationOptions, formatBytes),
+	)
+
+	if (validFiles.length > 0) emit('change', validFiles)
+}
+
+function handleChange(event: Event) {
+	const input = event.target as HTMLInputElement
+	if (input.files) selectFiles(input.files)
+	input.value = ''
+}
+
+function handleDrop(event: DragEvent) {
+	if (!props.allowDrop || !event.dataTransfer) return
+	selectFiles(event.dataTransfer.files)
+}
+</script>
+
+<template>
+	<ButtonFrame
+		as="label"
+		:type="props.type"
+		:color="props.color"
+		:size="props.size"
+		:interaction="props.interaction"
+		:aria-disabled="props.disabled || undefined"
+		class="focus-within:outline-none focus-within:ring-4 focus-within:ring-brand-shadow"
+		@drop.prevent="handleDrop"
+		@dragover.prevent
+	>
+		<slot />
+		{{ props.prompt }}
+		<input
+			type="file"
+			:multiple="props.multiple"
+			:accept="props.accept"
+			:disabled="props.disabled"
+			class="absolute size-px overflow-hidden whitespace-nowrap [clip:rect(0,0,0,0)]"
+			@change="handleChange"
+		/>
+	</ButtonFrame>
+</template>
diff --git a/packages/ui/src/components/base/buttons/IconButton.vue b/packages/ui/src/components/base/buttons/IconButton.vue
new file mode 100644
index 0000000000..6fe601fb2b
--- /dev/null
+++ b/packages/ui/src/components/base/buttons/IconButton.vue
@@ -0,0 +1,58 @@
+<script setup lang="ts">
+import { computed, ref } from 'vue'
+
+import ButtonFrame from './ButtonFrame.vue'
+import type {
+	ButtonColor,
+	ButtonInteraction,
+	ButtonNativeType,
+	ButtonSize,
+	ButtonType,
+} from './types'
+
+const props = withDefaults(
+	defineProps<{
+		label: string
+		type?: ButtonType
+		color?: ButtonColor
+		size?: ButtonSize
+		interaction?: ButtonInteraction
+		nativeType?: ButtonNativeType
+		circular?: boolean
+		disabled?: boolean
+		loading?: boolean
+	}>(),
+	{
+		type: 'base',
+		size: 'md',
+		nativeType: 'button',
+		circular: true,
+		disabled: false,
+		loading: false,
+	},
+)
+
+const frame = ref<InstanceType<typeof ButtonFrame> | null>(null)
+const element = computed(() => frame.value?.element ?? null)
+
+defineExpose({ element })
+</script>
+
+<template>
+	<ButtonFrame
+		ref="frame"
+		as="button"
+		icon-only
+		:circular="props.circular"
+		:type="props.type"
+		:color="props.color"
+		:size="props.size"
+		:interaction="props.interaction"
+		:native-type="props.nativeType"
+		:disabled="props.disabled || props.loading"
+		:aria-label="props.label"
+		:aria-busy="props.loading || undefined"
+	>
+		<slot />
+	</ButtonFrame>
+</template>
diff --git a/packages/ui/src/components/base/buttons/SplitButton.vue b/packages/ui/src/components/base/buttons/SplitButton.vue
new file mode 100644
index 0000000000..40badebad8
--- /dev/null
+++ b/packages/ui/src/components/base/buttons/SplitButton.vue
@@ -0,0 +1,88 @@
+<script setup lang="ts">
+import { DropdownIcon } from '@modrinth/assets'
+import { computed, useSlots } from 'vue'
+
+import Button from './Button.vue'
+import ButtonGroup from './ButtonGroup.vue'
+import TeleportOverflowMenu from './TeleportOverflowMenu.vue'
+import type {
+	ButtonColor,
+	ButtonInteraction,
+	ButtonNativeType,
+	ButtonSize,
+	ButtonType,
+	OverflowMenuAction,
+	OverflowMenuLink,
+	OverflowMenuOption,
+	TeleportPlacement,
+} from './types'
+
+const props = withDefaults(
+	defineProps<{
+		menuLabel: string
+		options: OverflowMenuOption[]
+		groupLabel?: string
+		type?: ButtonType
+		color?: ButtonColor
+		size?: ButtonSize
+		interaction?: ButtonInteraction
+		nativeType?: ButtonNativeType
+		disabled?: boolean
+		primaryDisabled?: boolean
+		menuDisabled?: boolean
+		placement?: TeleportPlacement
+	}>(),
+	{
+		groupLabel: undefined,
+		type: 'base',
+		size: 'md',
+		nativeType: 'button',
+		disabled: false,
+		primaryDisabled: false,
+		menuDisabled: false,
+		placement: 'bottom-end',
+	},
+)
+
+const emit = defineEmits<{
+	click: [event: MouseEvent]
+	select: [option: OverflowMenuAction | OverflowMenuLink]
+}>()
+
+const slots = useSlots()
+const forwardedSlots = computed(() => Object.keys(slots).filter((name) => name !== 'default'))
+</script>
+
+<template>
+	<ButtonGroup :label="props.groupLabel">
+		<Button
+			:type="props.type"
+			:color="props.color"
+			:size="props.size"
+			:interaction="props.interaction"
+			:native-type="props.nativeType"
+			:disabled="props.disabled || props.primaryDisabled"
+			@click="emit('click', $event)"
+		>
+			<slot />
+		</Button>
+
+		<TeleportOverflowMenu
+			:label="props.menuLabel"
+			:options="props.options"
+			:type="props.type"
+			:color="props.color"
+			:size="props.size"
+			:interaction="props.interaction"
+			:circular="false"
+			:disabled="props.disabled || props.menuDisabled"
+			:placement="props.placement"
+			@select="emit('select', $event)"
+		>
+			<DropdownIcon aria-hidden="true" />
+			<template v-for="slotName in forwardedSlots" #[slotName]="slotProps">
+				<slot :name="slotName" v-bind="slotProps" />
+			</template>
+		</TeleportOverflowMenu>
+	</ButtonGroup>
+</template>
diff --git a/packages/ui/src/components/base/buttons/TeleportOverflowMenu.vue b/packages/ui/src/components/base/buttons/TeleportOverflowMenu.vue
new file mode 100644
index 0000000000..f219a88910
--- /dev/null
+++ b/packages/ui/src/components/base/buttons/TeleportOverflowMenu.vue
@@ -0,0 +1,469 @@
+<script setup lang="ts">
+import type { CSSProperties } from 'vue'
+import { computed, nextTick, onUnmounted, ref, useId, watch } from 'vue'
+import { RouterLink } from 'vue-router'
+
+import { useAnchoredTeleport } from '../../../utils/use-anchored-teleport'
+import Button from './Button.vue'
+import IconButton from './IconButton.vue'
+import type {
+	ButtonColor,
+	ButtonElementHandle,
+	ButtonInteraction,
+	ButtonSize,
+	ButtonType,
+	OverflowMenuAction,
+	OverflowMenuLink,
+	OverflowMenuOption,
+	TeleportPlacement,
+} from './types'
+
+defineOptions({ inheritAttrs: false })
+
+const props = withDefaults(
+	defineProps<{
+		label: string
+		options: OverflowMenuOption[]
+		type?: ButtonType
+		color?: ButtonColor
+		size?: ButtonSize
+		interaction?: ButtonInteraction
+		disabled?: boolean
+		iconOnly?: boolean
+		circular?: boolean
+		tooltip?: string
+		placement?: TeleportPlacement
+		distance?: number
+		hoverable?: boolean
+	}>(),
+	{
+		type: 'base',
+		size: 'md',
+		disabled: false,
+		iconOnly: true,
+		circular: true,
+		placement: 'bottom-end',
+		distance: 8,
+		hoverable: false,
+	},
+)
+
+const emit = defineEmits<{
+	select: [option: OverflowMenuAction | OverflowMenuLink]
+	open: []
+	close: []
+}>()
+
+const triggerButton = ref<ButtonElementHandle | null>(null)
+const triggerElement = computed(() => triggerButton.value?.element ?? null)
+const panelElement = ref<HTMLElement | null>(null)
+const resolvedPlacement = computed(() => props.placement)
+const resolvedDistance = computed(() => props.distance)
+const menuId = `button-overflow-${useId()}`
+const selectedIndex = ref(-1)
+const typeahead = ref('')
+let typeaheadTimer: ReturnType<typeof setTimeout> | undefined
+let hoverCloseTimer: ReturnType<typeof setTimeout> | undefined
+const triggerComponent = computed(() => (props.iconOnly ? IconButton : Button))
+
+const visibleOptions = computed(() => props.options.filter((option) => option.shown !== false))
+const menuOptions = computed(() =>
+	visibleOptions.value.filter(
+		(option): option is OverflowMenuAction | OverflowMenuLink => option.type !== 'divider',
+	),
+)
+
+const { isOpen, panelStyle, anchorStyle, resolvedSide, open, close } = useAnchoredTeleport(
+	triggerElement,
+	panelElement,
+	resolvedPlacement,
+	resolvedDistance,
+)
+
+const menuItemClasses =
+	'overflow-menu-item flex min-h-10 w-full items-center gap-2 rounded-[10px] border-0 bg-transparent px-3 py-2 text-left text-base font-semibold leading-5 text-contrast no-underline ' +
+	'cursor-pointer whitespace-nowrap hover:bg-surface-4 focus-visible:bg-surface-4 focus-visible:outline-none ' +
+	'disabled:cursor-not-allowed disabled:opacity-50 [&[aria-disabled=true]]:cursor-not-allowed [&[aria-disabled=true]]:opacity-50 ' +
+	'[&>svg]:size-5 [&>svg]:shrink-0 [&>svg]:text-primary'
+
+const toneVariables: Record<ButtonColor, string> = {
+	brand: 'var(--color-brand)',
+	red: 'var(--color-red)',
+	orange: 'var(--color-orange)',
+	green: 'var(--color-green)',
+	blue: 'var(--color-blue)',
+	purple: 'var(--color-purple)',
+	medal_promotion: 'var(--medal-promotion-text-orange, var(--color-orange))',
+}
+
+function getMenuItemStyle(option: OverflowMenuAction | OverflowMenuLink) {
+	if (!option.tone || option.tone === 'default') return undefined
+
+	return {
+		'--overflow-menu-item-tone': toneVariables[option.tone],
+	} as CSSProperties
+}
+
+function isDivider(
+	option: OverflowMenuOption,
+): option is Extract<OverflowMenuOption, { type: 'divider' }> {
+	return option.type === 'divider'
+}
+
+function isLink(option: OverflowMenuOption): option is OverflowMenuLink {
+	return option.type === 'link'
+}
+
+function getMenuItems() {
+	if (!panelElement.value) return []
+	return Array.from(panelElement.value.querySelectorAll<HTMLElement>('[role="menuitem"]'))
+}
+
+function focusItem(index: number) {
+	const items = getMenuItems()
+	if (items.length === 0) return
+	selectedIndex.value = (index + items.length) % items.length
+	items[selectedIndex.value]?.focus()
+}
+
+async function openMenu(position: 'first' | 'last' = 'first', focus = true) {
+	if (props.disabled || isOpen.value) return
+	await open()
+	emit('open')
+	if (!focus) return
+	await nextTick()
+	focusItem(position === 'first' ? 0 : getMenuItems().length - 1)
+}
+
+function closeMenu(restoreFocus = false) {
+	if (!isOpen.value) return
+	selectedIndex.value = -1
+	close(restoreFocus)
+}
+
+async function toggleMenu(event?: MouseEvent) {
+	if (props.hoverable && window.matchMedia('(hover: hover)').matches && event?.detail) return
+	if (isOpen.value) closeMenu()
+	else await openMenu()
+}
+
+function clearHoverCloseTimer() {
+	if (!hoverCloseTimer) return
+	clearTimeout(hoverCloseTimer)
+	hoverCloseTimer = undefined
+}
+
+function handleMouseEnter() {
+	if (!props.hoverable || !window.matchMedia('(hover: hover)').matches) return
+	clearHoverCloseTimer()
+	openMenu('first', false)
+}
+
+function handleMouseLeave() {
+	if (!props.hoverable || !window.matchMedia('(hover: hover)').matches) return
+	clearHoverCloseTimer()
+	hoverCloseTimer = setTimeout(() => closeMenu(), 250)
+}
+
+function handleTriggerKeydown(event: KeyboardEvent) {
+	if (event.key !== 'ArrowDown' && event.key !== 'ArrowUp') return
+	event.preventDefault()
+	openMenu(event.key === 'ArrowDown' ? 'first' : 'last')
+}
+
+function handleAction(option: OverflowMenuAction, event: MouseEvent) {
+	if (option.disabled) return
+	option.action(event)
+	emit('select', option)
+	if (!option.remainOpen) closeMenu(true)
+}
+
+function handleLink(option: OverflowMenuLink, event: MouseEvent) {
+	if (option.disabled) {
+		event.preventDefault()
+		return
+	}
+	emit('select', option)
+	if (!option.remainOpen) closeMenu()
+}
+
+function handleLinkKeydown(option: OverflowMenuLink, event: KeyboardEvent) {
+	if (event.key !== ' ') return
+	event.preventDefault()
+	if (option.disabled) return
+	;(event.currentTarget as HTMLElement).click()
+}
+
+function handleMenuKeydown(event: KeyboardEvent) {
+	const items = getMenuItems()
+	if (items.length === 0) return
+
+	switch (event.key) {
+		case 'ArrowDown':
+			event.preventDefault()
+			focusItem(selectedIndex.value + 1)
+			break
+		case 'ArrowUp':
+			event.preventDefault()
+			focusItem(selectedIndex.value - 1)
+			break
+		case 'Home':
+			event.preventDefault()
+			focusItem(0)
+			break
+		case 'End':
+			event.preventDefault()
+			focusItem(items.length - 1)
+			break
+		case 'Escape':
+			event.preventDefault()
+			closeMenu(true)
+			break
+		case 'Tab':
+			triggerElement.value?.focus()
+			closeMenu()
+			break
+		default: {
+			if (
+				event.key === ' ' ||
+				event.key.length !== 1 ||
+				event.ctrlKey ||
+				event.metaKey ||
+				event.altKey
+			)
+				return
+
+			const character = event.key.toLocaleLowerCase()
+			const query = typeahead.value === character ? character : `${typeahead.value}${character}`
+			const startIndex = query.length === 1 ? selectedIndex.value + 1 : 0
+			typeahead.value = query
+
+			for (let offset = 0; offset < menuOptions.value.length; offset++) {
+				const index = (startIndex + offset) % menuOptions.value.length
+				if (menuOptions.value[index]?.label.toLocaleLowerCase().startsWith(query)) {
+					focusItem(index)
+					break
+				}
+			}
+
+			if (typeaheadTimer) clearTimeout(typeaheadTimer)
+			typeaheadTimer = setTimeout(() => {
+				typeahead.value = ''
+			}, 500)
+		}
+	}
+}
+
+watch(isOpen, (openState, previousOpenState) => {
+	if (!openState && previousOpenState) emit('close')
+	if (!openState && typeaheadTimer) {
+		clearTimeout(typeaheadTimer)
+		typeaheadTimer = undefined
+		typeahead.value = ''
+	}
+})
+
+onUnmounted(clearHoverCloseTimer)
+
+defineExpose({ open: openMenu, close: closeMenu })
+</script>
+
+<template>
+	<component
+		:is="triggerComponent"
+		ref="triggerButton"
+		v-bind="$attrs"
+		v-tooltip="props.tooltip"
+		:label="props.iconOnly ? props.label : undefined"
+		:aria-label="props.iconOnly ? undefined : props.label"
+		:circular="props.iconOnly ? props.circular : undefined"
+		:type="props.type"
+		:color="props.color"
+		:size="props.size"
+		:interaction="props.interaction"
+		:disabled="props.disabled"
+		:aria-expanded="isOpen"
+		:aria-controls="menuId"
+		aria-haspopup="menu"
+		@click="toggleMenu"
+		@keydown="handleTriggerKeydown"
+		@mouseenter="handleMouseEnter"
+		@mouseleave="handleMouseLeave"
+	>
+		<slot />
+	</component>
+
+	<Teleport to="body">
+		<Transition
+			enter-active-class="transition duration-125 ease-out"
+			enter-from-class="scale-95 opacity-0"
+			enter-to-class="scale-100 opacity-100"
+			leave-active-class="transition duration-100 ease-in"
+			leave-from-class="scale-100 opacity-100"
+			leave-to-class="scale-95 opacity-0"
+		>
+			<div
+				v-if="isOpen"
+				:id="menuId"
+				ref="panelElement"
+				class="fixed isolate z-[9999] flex min-w-48 flex-col gap-1 rounded-[14px] bg-surface-3 p-2 shadow-lg ring-1 ring-surface-5"
+				:style="panelStyle"
+				role="menu"
+				:aria-label="props.label"
+				@keydown="handleMenuKeydown"
+				@mouseenter="handleMouseEnter"
+				@mouseleave="handleMouseLeave"
+			>
+				<span
+					aria-hidden="true"
+					class="overflow-menu-arrow"
+					:data-side="resolvedSide"
+					:style="anchorStyle"
+				/>
+				<template v-for="(option, index) in visibleOptions" :key="option.id ?? `divider-${index}`">
+					<div v-if="isDivider(option)" role="separator" class="my-1 h-px bg-surface-5" />
+
+					<RouterLink
+						v-else-if="isLink(option) && option.to !== undefined && !option.disabled"
+						v-tooltip="option.tooltip"
+						:to="option.to"
+						:class="menuItemClasses"
+						:style="getMenuItemStyle(option)"
+						:data-tone="option.tone && option.tone !== 'default' ? option.tone : undefined"
+						:data-hover-filled="option.hoverFilled || option.hoverFilledOnly || undefined"
+						:data-hover-filled-only="option.hoverFilledOnly || undefined"
+						role="menuitem"
+						tabindex="-1"
+						@click="handleLink(option, $event)"
+						@keydown="handleLinkKeydown(option, $event)"
+						@focus="selectedIndex = getMenuItems().indexOf($event.currentTarget as HTMLElement)"
+					>
+						<slot :name="option.id" :option="option">
+							<component :is="option.icon" v-if="option.icon" aria-hidden="true" />
+							{{ option.label }}
+						</slot>
+					</RouterLink>
+
+					<a
+						v-else-if="isLink(option)"
+						v-tooltip="option.tooltip"
+						:href="option.disabled ? undefined : option.href"
+						:target="option.target"
+						:rel="option.rel ?? (option.target === '_blank' ? 'noopener noreferrer' : undefined)"
+						:download="option.download"
+						:aria-disabled="option.disabled || undefined"
+						:class="menuItemClasses"
+						:style="getMenuItemStyle(option)"
+						:data-tone="option.tone && option.tone !== 'default' ? option.tone : undefined"
+						:data-hover-filled="option.hoverFilled || option.hoverFilledOnly || undefined"
+						:data-hover-filled-only="option.hoverFilledOnly || undefined"
+						role="menuitem"
+						tabindex="-1"
+						@click="handleLink(option, $event)"
+						@keydown="handleLinkKeydown(option, $event)"
+						@focus="selectedIndex = getMenuItems().indexOf($event.currentTarget as HTMLElement)"
+					>
+						<slot :name="option.id" :option="option">
+							<component :is="option.icon" v-if="option.icon" aria-hidden="true" />
+							{{ option.label }}
+						</slot>
+					</a>
+
+					<button
+						v-else
+						v-tooltip="option.tooltip"
+						type="button"
+						:aria-disabled="option.disabled || undefined"
+						:class="menuItemClasses"
+						:style="getMenuItemStyle(option)"
+						:data-tone="option.tone && option.tone !== 'default' ? option.tone : undefined"
+						:data-hover-filled="option.hoverFilled || option.hoverFilledOnly || undefined"
+						:data-hover-filled-only="option.hoverFilledOnly || undefined"
+						role="menuitem"
+						tabindex="-1"
+						@click="handleAction(option, $event)"
+						@focus="selectedIndex = getMenuItems().indexOf($event.currentTarget as HTMLElement)"
+					>
+						<slot :name="option.id" :option="option">
+							<component :is="option.icon" v-if="option.icon" aria-hidden="true" />
+							{{ option.label }}
+						</slot>
+					</button>
+				</template>
+			</div>
+		</Transition>
+	</Teleport>
+</template>
+
+<style scoped>
+.overflow-menu-arrow {
+	position: absolute;
+	width: 0;
+	height: 0;
+	pointer-events: none;
+}
+
+.overflow-menu-arrow::before {
+	position: absolute;
+	width: 10px;
+	height: 10px;
+	content: '';
+	background-color: var(--surface-3);
+	transform: translate(-50%, -50%) rotate(45deg);
+}
+
+.overflow-menu-arrow[data-side='bottom'] {
+	top: 0;
+}
+
+.overflow-menu-arrow[data-side='bottom']::before {
+	border-top: 1px solid var(--surface-5);
+	border-left: 1px solid var(--surface-5);
+}
+
+.overflow-menu-arrow[data-side='top'] {
+	bottom: 0;
+}
+
+.overflow-menu-arrow[data-side='top']::before {
+	border-right: 1px solid var(--surface-5);
+	border-bottom: 1px solid var(--surface-5);
+}
+
+.overflow-menu-arrow[data-side='right'] {
+	left: 0;
+}
+
+.overflow-menu-arrow[data-side='right']::before {
+	border-bottom: 1px solid var(--surface-5);
+	border-left: 1px solid var(--surface-5);
+}
+
+.overflow-menu-arrow[data-side='left'] {
+	right: 0;
+}
+
+.overflow-menu-arrow[data-side='left']::before {
+	border-top: 1px solid var(--surface-5);
+	border-right: 1px solid var(--surface-5);
+}
+
+.overflow-menu-item[data-tone]:not([data-hover-filled-only]) {
+	color: var(--overflow-menu-item-tone);
+}
+
+.overflow-menu-item[data-tone]:not([data-hover-filled-only]) :deep(svg) {
+	color: var(--overflow-menu-item-tone);
+}
+
+.overflow-menu-item[data-tone][data-hover-filled]:hover,
+.overflow-menu-item[data-tone][data-hover-filled]:focus-visible {
+	color: var(--color-accent-contrast);
+	background-color: var(--overflow-menu-item-tone);
+}
+
+.overflow-menu-item[data-tone][data-hover-filled]:hover :deep(svg),
+.overflow-menu-item[data-tone][data-hover-filled]:focus-visible :deep(svg) {
+	color: inherit;
+}
+</style>
diff --git a/packages/ui/src/components/base/buttons/TeleportPopoutMenu.vue b/packages/ui/src/components/base/buttons/TeleportPopoutMenu.vue
new file mode 100644
index 0000000000..16574bfec9
--- /dev/null
+++ b/packages/ui/src/components/base/buttons/TeleportPopoutMenu.vue
@@ -0,0 +1,149 @@
+<script setup lang="ts">
+import { computed, nextTick, ref, useId, watch } from 'vue'
+
+import { useAnchoredTeleport } from '../../../utils/use-anchored-teleport'
+import Button from './Button.vue'
+import IconButton from './IconButton.vue'
+import type {
+	ButtonColor,
+	ButtonElementHandle,
+	ButtonInteraction,
+	ButtonSize,
+	ButtonType,
+	TeleportPlacement,
+} from './types'
+
+defineOptions({ inheritAttrs: false })
+
+const props = withDefaults(
+	defineProps<{
+		label: string
+		type?: ButtonType
+		color?: ButtonColor
+		size?: ButtonSize
+		interaction?: ButtonInteraction
+		disabled?: boolean
+		iconOnly?: boolean
+		tooltip?: string
+		autoFocus?: boolean
+		placement?: TeleportPlacement
+		panelRole?: 'dialog' | 'region'
+	}>(),
+	{
+		type: 'base',
+		size: 'md',
+		disabled: false,
+		iconOnly: false,
+		autoFocus: true,
+		placement: 'bottom-end',
+		panelRole: 'dialog',
+	},
+)
+
+const emit = defineEmits<{
+	open: []
+	close: []
+}>()
+
+const triggerButton = ref<ButtonElementHandle | null>(null)
+const triggerElement = computed(() => triggerButton.value?.element ?? null)
+const panelElement = ref<HTMLElement | null>(null)
+const resolvedPlacement = computed(() => props.placement)
+const panelId = `button-popout-${useId()}`
+const triggerComponent = computed(() => (props.iconOnly ? IconButton : Button))
+
+const { isOpen, panelStyle, open, close } = useAnchoredTeleport(
+	triggerElement,
+	panelElement,
+	resolvedPlacement,
+)
+
+function focusPanel() {
+	const focusable = panelElement.value?.querySelector<HTMLElement>(
+		'button:not([disabled]), a[href], input:not([disabled]), select:not([disabled]), textarea:not([disabled]), [tabindex]:not([tabindex="-1"])',
+	)
+	;(focusable ?? panelElement.value)?.focus()
+}
+
+async function openMenu() {
+	if (props.disabled || isOpen.value) return
+	await open()
+	emit('open')
+	if (props.autoFocus) await nextTick(focusPanel)
+}
+
+function closeMenu(restoreFocus = true) {
+	if (!isOpen.value) return
+	close(restoreFocus)
+}
+
+async function toggleMenu() {
+	if (isOpen.value) closeMenu()
+	else await openMenu()
+}
+
+function handleTriggerKeydown(event: KeyboardEvent) {
+	if (event.key !== 'Escape' || !isOpen.value) return
+	event.preventDefault()
+	closeMenu()
+}
+
+function handlePanelKeydown(event: KeyboardEvent) {
+	if (event.key !== 'Escape') return
+	event.preventDefault()
+	closeMenu(true)
+}
+
+watch(isOpen, (openState, previousOpenState) => {
+	if (!openState && previousOpenState) emit('close')
+})
+
+defineExpose({ open: openMenu, close: closeMenu })
+</script>
+
+<template>
+	<component
+		:is="triggerComponent"
+		ref="triggerButton"
+		v-bind="$attrs"
+		v-tooltip="props.tooltip"
+		:label="props.iconOnly ? props.label : undefined"
+		:type="props.type"
+		:color="props.color"
+		:size="props.size"
+		:interaction="props.interaction"
+		:disabled="props.disabled"
+		:aria-expanded="isOpen"
+		:aria-controls="panelId"
+		:aria-haspopup="props.panelRole === 'dialog' ? 'dialog' : undefined"
+		@click="toggleMenu"
+		@keydown="handleTriggerKeydown"
+	>
+		<slot name="trigger" />
+	</component>
+
+	<Teleport to="body">
+		<Transition
+			enter-active-class="transition duration-125 ease-out"
+			enter-from-class="scale-95 opacity-0"
+			enter-to-class="scale-100 opacity-100"
+			leave-active-class="transition duration-100 ease-in"
+			leave-from-class="scale-100 opacity-100"
+			leave-to-class="scale-95 opacity-0"
+		>
+			<div
+				v-if="isOpen"
+				:id="panelId"
+				ref="panelElement"
+				class="fixed isolate z-[9999] rounded-[14px] bg-surface-3 p-4 text-primary shadow-lg ring-1 ring-surface-5"
+				:style="panelStyle"
+				:role="props.panelRole"
+				:aria-label="props.label"
+				tabindex="-1"
+				@keydown="handlePanelKeydown"
+			>
+				<slot name="panel" :close="closeMenu" />
+			</div>
+		</Transition>
+	</Teleport>
+</template>
diff --git a/packages/ui/src/components/base/buttons/index.ts b/packages/ui/src/components/base/buttons/index.ts
new file mode 100644
index 0000000000..cbfc192984
--- /dev/null
+++ b/packages/ui/src/components/base/buttons/index.ts
@@ -0,0 +1,23 @@
+export { default as Button } from './Button.vue'
+export { default as ButtonGroup } from './ButtonGroup.vue'
+export { default as ButtonLink } from './ButtonLink.vue'
+export { default as FileButton } from './FileButton.vue'
+export { default as IconButton } from './IconButton.vue'
+export { default as SplitButton } from './SplitButton.vue'
+export { default as TeleportOverflowMenu } from './TeleportOverflowMenu.vue'
+export { default as TeleportPopoutMenu } from './TeleportPopoutMenu.vue'
+export type {
+	ButtonColor,
+	ButtonElementHandle,
+	ButtonInteraction,
+	ButtonLinkDestination,
+	ButtonNativeType,
+	ButtonSize,
+	ButtonType,
+	ButtonVisualProps,
+	OverflowMenuAction,
+	OverflowMenuDivider,
+	OverflowMenuLink,
+	OverflowMenuOption,
+	TeleportPlacement,
+} from './types'
diff --git a/packages/ui/src/components/base/buttons/types.ts b/packages/ui/src/components/base/buttons/types.ts
new file mode 100644
index 0000000000..f50eb35dcd
--- /dev/null
+++ b/packages/ui/src/components/base/buttons/types.ts
@@ -0,0 +1,105 @@
+import type { Component } from 'vue'
+import type { RouteLocationRaw } from 'vue-router'
+
+import type { AnchoredTeleportPlacement } from '../../../utils/use-anchored-teleport'
+
+export type ButtonType = 'base' | 'colored' | 'outlined' | 'quiet'
+
+export type ButtonSize = 'xs' | 'sm' | 'md' | 'lg' | 'xl'
+
+export type ButtonInteraction = 'surface' | 'filled' | 'none'
+
+// TODO: Standardized color string enum props across @modrinth/ui
+export type ButtonColor =
+	| 'brand'
+	| 'red'
+	| 'orange'
+	| 'green'
+	| 'blue'
+	| 'purple'
+	| 'medal_promotion'
+
+export type ButtonVisualProps = {
+	size?: ButtonSize
+	interaction?: ButtonInteraction
+} & (
+	| {
+			type?: 'base'
+			color?: never
+	  }
+	| {
+			type: 'outlined'
+			color?: ButtonColor
+	  }
+	| {
+			type: 'colored'
+			color?: ButtonColor
+	  }
+	| {
+			type: 'quiet'
+			color?: ButtonColor
+	  }
+)
+
+export type ButtonNativeType = 'button' | 'submit' | 'reset'
+
+export interface ButtonProps {
+	type?: ButtonType
+	color?: ButtonColor
+	size?: ButtonSize
+	interaction?: ButtonInteraction
+	nativeType?: ButtonNativeType
+	disabled?: boolean
+	loading?: boolean
+}
+
+export type ButtonLinkDestination =
+	| {
+			to: RouteLocationRaw
+			href?: never
+	  }
+	| {
+			href: string
+			to?: never
+	  }
+
+export type TeleportPlacement = AnchoredTeleportPlacement
+
+export interface OverflowMenuItemBase {
+	id: string
+	label: string
+	icon?: Component
+	shown?: boolean
+	disabled?: boolean
+	tooltip?: string
+	remainOpen?: boolean
+	tone?: 'default' | ButtonColor
+	hoverFilled?: boolean
+	hoverFilledOnly?: boolean
+}
+
+export interface OverflowMenuAction extends OverflowMenuItemBase {
+	type?: 'action'
+	action: (event: MouseEvent) => void
+}
+
+export interface OverflowMenuLink extends OverflowMenuItemBase {
+	type: 'link'
+	to?: RouteLocationRaw
+	href?: string
+	target?: string
+	rel?: string
+	download?: string | boolean
+}
+
+export interface OverflowMenuDivider {
+	type: 'divider'
+	id?: string
+	shown?: boolean
+}
+
+export type OverflowMenuOption = OverflowMenuAction | OverflowMenuLink | OverflowMenuDivider
+
+export interface ButtonElementHandle {
+	element: HTMLElement | null
+}
diff --git a/packages/ui/src/components/base/index.ts b/packages/ui/src/components/base/index.ts
index 1373522c33..08b54ef241 100644
--- a/packages/ui/src/components/base/index.ts
+++ b/packages/ui/src/components/base/index.ts
@@ -9,8 +9,27 @@ export { default as Badge } from './Badge.vue'
 export { default as BaseTerminal } from './BaseTerminal.vue'
 export { default as BigOptionButton } from './BigOptionButton.vue'
 export { default as BulletDivider } from './BulletDivider.vue'
-export { default as Button } from './Button.vue'
-export { default as ButtonStyled } from './ButtonStyled.vue'
+export { default as Button } from './buttons/Button.vue'
+export { default as ButtonGroup } from './buttons/ButtonGroup.vue'
+export { default as ButtonLink } from './buttons/ButtonLink.vue'
+export { default as FileButton } from './buttons/FileButton.vue'
+export { default as IconButton } from './buttons/IconButton.vue'
+export { default as SplitButton } from './buttons/SplitButton.vue'
+export { default as TeleportOverflowMenu } from './buttons/TeleportOverflowMenu.vue'
+export { default as TeleportPopoutMenu } from './buttons/TeleportPopoutMenu.vue'
+export type {
+	ButtonColor,
+	ButtonInteraction,
+	ButtonNativeType,
+	ButtonSize,
+	ButtonType,
+	ButtonVisualProps,
+	OverflowMenuAction,
+	OverflowMenuDivider,
+	OverflowMenuLink,
+	OverflowMenuOption,
+	TeleportPlacement,
+} from './buttons/types'
 export { default as Card } from './Card.vue'
 export { default as Checkbox } from './Checkbox.vue'
 export { default as Chips } from './Chips.vue'
@@ -46,8 +65,6 @@ export { default as HorizontalRule } from './HorizontalRule.vue'
 export { default as I18nDebugPanel } from './I18nDebugPanel.vue'
 export { default as IconSelect } from './IconSelect.vue'
 export { default as IntlFormatted } from './IntlFormatted.vue'
-export type { JoinedButtonAction } from './JoinedButtons.vue'
-export { default as JoinedButtons } from './JoinedButtons.vue'
 export { default as LoadingBar } from './LoadingBar.vue'
 export { default as LoadingIndicator } from './LoadingIndicator.vue'
 export { default as ManySelect } from './ManySelect.vue'
@@ -62,8 +79,6 @@ export type { MaybeCtxFn, StageButtonConfig, StageConfigInput } from './MultiSta
 export { default as MultiStageModal, resolveCtxFn } from './MultiStageModal.vue'
 export { default as NavTabs } from './NavTabs.vue'
 export { default as OptionGroup } from './OptionGroup.vue'
-export type { Option as OverflowMenuOption } from './OverflowMenu.vue'
-export { default as OverflowMenu } from './OverflowMenu.vue'
 export { default as Page } from './Page.vue'
 export { default as PageHeader } from './page-header/index.vue'
 export { default as PageHeaderMetadata } from './page-header/metadata/index.vue'
@@ -106,11 +121,6 @@ export type { TabsTab, TabsValue } from './Tabs.vue'
 export { default as Tabs } from './Tabs.vue'
 export { default as TagItem } from './TagItem.vue'
 export { default as TagTagItem } from './TagTagItem.vue'
-export type {
-	Item as TeleportOverflowMenuItem,
-	Option as TeleportOverflowMenuOption,
-} from './TeleportOverflowMenu.vue'
-export { default as TeleportOverflowMenu } from './TeleportOverflowMenu.vue'
 export type {
 	TimeFrameLastUnit,
 	TimeFrameLastUnitOption,
diff --git a/packages/ui/src/components/billing/AddPaymentMethodModal.vue b/packages/ui/src/components/billing/AddPaymentMethodModal.vue
index 8e1361adb6..a05eaf4f20 100644
--- a/packages/ui/src/components/billing/AddPaymentMethodModal.vue
+++ b/packages/ui/src/components/billing/AddPaymentMethodModal.vue
@@ -3,9 +3,11 @@ import { PlusIcon, XIcon } from '@modrinth/assets'
 import type Stripe from 'stripe'
 import { nextTick, ref, useTemplateRef } from 'vue'
 
+import { Button } from '#ui/components/base/buttons'
+
 import { defineMessages, useVIntl } from '../../composables/i18n'
 import { commonMessages } from '../../utils'
-import { ButtonStyled, NewModal } from '../index'
+import { NewModal } from '../index'
 import type { AddPaymentMethodProps } from './AddPaymentMethod.vue'
 import AddPaymentMethod from './AddPaymentMethod.vue'
 
@@ -57,18 +59,14 @@ defineExpose({
 				@stop-loading="loading = false"
 			/>
 			<div class="input-group mt-auto pt-4">
-				<ButtonStyled color="brand">
-					<button :disabled="loading" @click="addPaymentMethod.submit()">
-						<PlusIcon />
-						{{ formatMessage(messages.paymentMethodAdd) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled>
-					<button @click="modal.hide()">
-						<XIcon />
-						{{ formatMessage(commonMessages.cancelButton) }}
-					</button>
-				</ButtonStyled>
+				<Button type="colored" color="brand" :disabled="loading" @click="addPaymentMethod.submit()">
+					<PlusIcon />
+					{{ formatMessage(messages.paymentMethodAdd) }}
+				</Button>
+				<Button @click="modal.hide()">
+					<XIcon />
+					{{ formatMessage(commonMessages.cancelButton) }}
+				</Button>
 			</div>
 		</div>
 	</NewModal>
diff --git a/packages/ui/src/components/billing/ModrinthServersPurchaseModal.vue b/packages/ui/src/components/billing/ModrinthServersPurchaseModal.vue
index bdae9d75ed..14c1eacd8a 100644
--- a/packages/ui/src/components/billing/ModrinthServersPurchaseModal.vue
+++ b/packages/ui/src/components/billing/ModrinthServersPurchaseModal.vue
@@ -12,12 +12,12 @@ import { useQueryClient } from '@tanstack/vue-query'
 import type Stripe from 'stripe'
 import { computed, nextTick, onBeforeUnmount, ref, toRef, useTemplateRef, watch } from 'vue'
 
+import { Button } from '#ui/components/base/buttons'
 import { injectNotificationManager } from '#ui/providers/web-notifications.ts'
 
 import { defineMessage, type MessageDescriptor, useVIntl } from '../../composables/i18n'
 import { useStripe } from '../../composables/stripe'
 import { commonMessages } from '../../utils'
-import { ButtonStyled } from '../index'
 import ModalLoadingIndicator from '../modal/ModalLoadingIndicator.vue'
 import NewModal from '../modal/NewModal.vue'
 import PlanSelector from './ServersPurchase0Plan.vue'
@@ -555,51 +555,50 @@ function goToBreadcrumbStep(id: string) {
 			</div>
 		</div>
 		<div class="flex gap-2 justify-between mt-4">
-			<ButtonStyled>
-				<button v-if="previousStep" @click="previousStep && setStep(previousStep, true)">
-					<LeftArrowIcon /> {{ formatMessage(commonMessages.backButton) }}
-				</button>
-				<button v-else-if="currentStep !== 'plan'" @click="modal?.hide()">
-					<XIcon />
-					{{ formatMessage(commonMessages.cancelButton) }}
-				</button>
-			</ButtonStyled>
-			<ButtonStyled v-if="currentStep !== 'plan'" color="brand">
-				<button
-					v-tooltip="
-						currentStep === 'review' && !acceptedEula && !noPaymentRequired
-							? 'You must accept the Minecraft EULA to proceed.'
-							: undefined
-					"
-					:disabled="!canProceed"
-					@click="
-						noPaymentRequired && currentStep === 'review'
-							? (async () => {
-									if (props.onFinalizeNoPaymentChange) {
-										try {
-											await props.onFinalizeNoPaymentChange()
-										} catch (e) {
-											return
-										}
+			<Button v-if="previousStep" @click="previousStep && setStep(previousStep, true)">
+				<LeftArrowIcon /> {{ formatMessage(commonMessages.backButton) }}
+			</Button>
+			<Button v-else-if="currentStep !== 'plan'" @click="modal?.hide()">
+				<XIcon />
+				{{ formatMessage(commonMessages.cancelButton) }}
+			</Button>
+			<Button
+				v-if="currentStep !== 'plan'"
+				v-tooltip="
+					currentStep === 'review' && !acceptedEula && !noPaymentRequired
+						? 'You must accept the Minecraft EULA to proceed.'
+						: undefined
+				"
+				type="colored"
+				color="brand"
+				:disabled="!canProceed"
+				@click="
+					noPaymentRequired && currentStep === 'review'
+						? (async () => {
+								if (props.onFinalizeNoPaymentChange) {
+									try {
+										await props.onFinalizeNoPaymentChange()
+									} catch (e) {
+										return
 									}
-									modal?.hide()
-								})()
-							: setStep(nextStep)
-					"
-				>
-					<template v-if="currentStep === 'review'">
-						<template v-if="noPaymentRequired"><CheckCircleIcon /> Confirm Change</template>
-						<template v-else>
-							<SpinnerIcon v-if="completingPurchase" class="animate-spin" />
-							<CheckCircleIcon v-else />
-							Subscribe
-						</template>
-					</template>
+								}
+								modal?.hide()
+							})()
+						: setStep(nextStep)
+				"
+			>
+				<template v-if="currentStep === 'review'">
+					<template v-if="noPaymentRequired"><CheckCircleIcon /> Confirm Change</template>
 					<template v-else>
-						{{ formatMessage(commonMessages.nextButton) }} <RightArrowIcon />
+						<SpinnerIcon v-if="completingPurchase" class="animate-spin" />
+						<CheckCircleIcon v-else />
+						Subscribe
 					</template>
-				</button>
-			</ButtonStyled>
+				</template>
+				<template v-else>
+					{{ formatMessage(commonMessages.nextButton) }} <RightArrowIcon />
+				</template>
+			</Button>
 		</div>
 	</NewModal>
 </template>
diff --git a/packages/ui/src/components/billing/ResubscribeModal.vue b/packages/ui/src/components/billing/ResubscribeModal.vue
index 298416af3b..084f3a0a35 100644
--- a/packages/ui/src/components/billing/ResubscribeModal.vue
+++ b/packages/ui/src/components/billing/ResubscribeModal.vue
@@ -78,18 +78,14 @@
 
 		<template #actions>
 			<div class="flex justify-end gap-2">
-				<ButtonStyled type="outlined">
-					<button @click="handleCancel">
-						<XIcon />
-						{{ formatMessage(messages.cancelButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="brand">
-					<button :disabled="!canResubscribe" @click="handleResubscribe">
-						<RotateCounterClockwiseIcon />
-						{{ formatMessage(messages.resubscribeButton) }}
-					</button>
-				</ButtonStyled>
+				<Button type="outlined" @click="handleCancel">
+					<XIcon />
+					{{ formatMessage(messages.cancelButton) }}
+				</Button>
+				<Button type="colored" color="brand" :disabled="!canResubscribe" @click="handleResubscribe">
+					<RotateCounterClockwiseIcon />
+					{{ formatMessage(messages.resubscribeButton) }}
+				</Button>
 			</div>
 		</template>
 	</NewModal>
@@ -100,12 +96,13 @@ import type { Labrinth } from '@modrinth/api-client'
 import { RotateCounterClockwiseIcon, XIcon } from '@modrinth/assets'
 import { computed, ref, useTemplateRef } from 'vue'
 
+import { Button } from '#ui/components/base/buttons'
 import { injectNotificationManager } from '#ui/providers/web-notifications.ts'
 
 import { useFormatDateTime, useFormatPrice } from '../../composables'
 import { defineMessages, useVIntl } from '../../composables/i18n'
 import IntlFormatted from '../base/IntlFormatted.vue'
-import { ButtonStyled, NewModal } from '../index'
+import { NewModal } from '../index'
 
 const { addNotification } = injectNotificationManager()
 const { formatMessage } = useVIntl()
diff --git a/packages/ui/src/components/billing/ServersGuestPlanModal.vue b/packages/ui/src/components/billing/ServersGuestPlanModal.vue
index f99f2ecc52..f1322c88ac 100644
--- a/packages/ui/src/components/billing/ServersGuestPlanModal.vue
+++ b/packages/ui/src/components/billing/ServersGuestPlanModal.vue
@@ -3,7 +3,8 @@ import type { Labrinth } from '@modrinth/api-client'
 import { ChevronRightIcon, ExternalIcon, XIcon } from '@modrinth/assets'
 import { computed, ref, useTemplateRef } from 'vue'
 
-import ButtonStyled from '../base/ButtonStyled.vue'
+import { Button, IconButton } from '#ui/components/base/buttons'
+
 import NewModal from '../modal/NewModal.vue'
 import type { ServerBillingInterval } from './ModrinthServersPurchaseModal.vue'
 import PlanSelector from './ServersPurchase0Plan.vue'
@@ -143,11 +144,9 @@ defineExpose({
 					class="absolute inset-x-0 bottom-0 -m-px z-30 rounded-2xl border border-solid border-surface-5 bg-bg-raised p-6 shadow-2xl"
 				>
 					<div class="absolute right-4 top-4">
-						<ButtonStyled circular type="transparent">
-							<button aria-label="Close sign in prompt" @click="closeSignInPrompt">
-								<XIcon />
-							</button>
-						</ButtonStyled>
+						<IconButton type="quiet" label="Close sign in prompt" @click="closeSignInPrompt">
+							<XIcon />
+						</IconButton>
 					</div>
 
 					<div class="mx-auto flex max-w-xl flex-col items-center gap-4 text-center">
@@ -155,12 +154,10 @@ defineExpose({
 							<div class="font-semibold text-contrast">Sign in to continue your purchase</div>
 							<div class="">You need a Modrinth account to add your billing details.</div>
 						</div>
-						<ButtonStyled color="brand">
-							<button class="mt-2" @click="continueToAuth">
-								Sign in or create an account
-								<ExternalIcon class="size-4" />
-							</button>
-						</ButtonStyled>
+						<Button type="colored" color="brand" class="mt-2" @click="continueToAuth">
+							Sign in or create an account
+							<ExternalIcon class="size-4" />
+						</Button>
 					</div>
 				</div>
 			</Transition>
diff --git a/packages/ui/src/components/billing/ServersPurchase0Plan.vue b/packages/ui/src/components/billing/ServersPurchase0Plan.vue
index 456b324aea..03ae8aaf7b 100644
--- a/packages/ui/src/components/billing/ServersPurchase0Plan.vue
+++ b/packages/ui/src/components/billing/ServersPurchase0Plan.vue
@@ -3,10 +3,11 @@ import type { Labrinth } from '@modrinth/api-client'
 import { RightArrowIcon } from '@modrinth/assets'
 import { computed } from 'vue'
 
+import { Button } from '#ui/components/base/buttons'
+
 import { useFormatPrice } from '../../composables'
 import { defineMessages, useVIntl } from '../../composables/i18n'
 import { getPriceForInterval, monthsInInterval } from '../../utils/product-utils'
-import ButtonStyled from '../base/ButtonStyled.vue'
 import OptionGroup from '../base/OptionGroup.vue'
 import type { ServerBillingInterval } from './ModrinthServersPurchaseModal.vue'
 import ServersSpecs from './ServersSpecs.vue'
@@ -218,19 +219,19 @@ function selectCustom() {
 				</div>
 			</div>
 			<div class="w-full">
-				<ButtonStyled color="blue">
-					<button
-						class="w-full"
-						:disabled="existingPlan?.id === plansByRam.small.id"
-						@click="selectPlan(plansByRam.small!)"
-					>
-						{{
-							existingPlan?.id === plansByRam.small.id
-								? formatMessage(messages.yourCurrentPlan)
-								: formatMessage(messages.selectPlan)
-						}}
-					</button>
-				</ButtonStyled>
+				<Button
+					type="colored"
+					color="blue"
+					class="w-full"
+					:disabled="existingPlan?.id === plansByRam.small.id"
+					@click="selectPlan(plansByRam.small!)"
+				>
+					{{
+						existingPlan?.id === plansByRam.small.id
+							? formatMessage(messages.yourCurrentPlan)
+							: formatMessage(messages.selectPlan)
+					}}
+				</Button>
 			</div>
 			<ServersSpecs
 				v-if="smallSpecs"
@@ -281,19 +282,19 @@ function selectCustom() {
 					</div>
 				</div>
 				<div class="w-full">
-					<ButtonStyled color="brand" class="w-full">
-						<button
-							class="w-full"
-							:disabled="existingPlan?.id === plansByRam.medium.id"
-							@click="selectPlan(plansByRam.medium!)"
-						>
-							{{
-								existingPlan?.id === plansByRam.medium.id
-									? formatMessage(messages.yourCurrentPlan)
-									: formatMessage(messages.selectPlan)
-							}}
-						</button>
-					</ButtonStyled>
+					<Button
+						type="colored"
+						color="brand"
+						class="w-full"
+						:disabled="existingPlan?.id === plansByRam.medium.id"
+						@click="selectPlan(plansByRam.medium!)"
+					>
+						{{
+							existingPlan?.id === plansByRam.medium.id
+								? formatMessage(messages.yourCurrentPlan)
+								: formatMessage(messages.selectPlan)
+						}}
+					</Button>
 				</div>
 				<ServersSpecs
 					v-if="mediumSpecs"
@@ -329,19 +330,19 @@ function selectCustom() {
 				</div>
 			</div>
 			<div class="w-full">
-				<ButtonStyled color="purple" class="w-full">
-					<button
-						class="w-full"
-						:disabled="existingPlan?.id === plansByRam.large.id"
-						@click="selectPlan(plansByRam.large!)"
-					>
-						{{
-							existingPlan?.id === plansByRam.large.id
-								? formatMessage(messages.yourCurrentPlan)
-								: formatMessage(messages.selectPlan)
-						}}
-					</button>
-				</ButtonStyled>
+				<Button
+					type="colored"
+					color="purple"
+					class="w-full"
+					:disabled="existingPlan?.id === plansByRam.large.id"
+					@click="selectPlan(plansByRam.large!)"
+				>
+					{{
+						existingPlan?.id === plansByRam.large.id
+							? formatMessage(messages.yourCurrentPlan)
+							: formatMessage(messages.selectPlan)
+					}}
+				</Button>
 			</div>
 			<ServersSpecs
 				v-if="largeSpecs"
@@ -366,11 +367,9 @@ function selectCustom() {
 			</div>
 		</div>
 		<div class="flex flex-col items-end gap-2 shrink-0">
-			<ButtonStyled>
-				<button class="flex items-center gap-2" @click="selectCustom">
-					{{ formatMessage(messages.getStarted) }} <RightArrowIcon class="h-4 w-4" />
-				</button>
-			</ButtonStyled>
+			<Button class="flex items-center gap-2" @click="selectCustom">
+				{{ formatMessage(messages.getStarted) }} <RightArrowIcon class="h-4 w-4" />
+			</Button>
 			<div class="text-sm text-secondary whitespace-nowrap">
 				Starting at {{ formatPrice(customStartingPrice, currency, true) }}/mo
 			</div>
diff --git a/packages/ui/src/components/billing/ServersPurchase3Review.vue b/packages/ui/src/components/billing/ServersPurchase3Review.vue
index bfe6096c8d..ce76cbc1af 100644
--- a/packages/ui/src/components/billing/ServersPurchase3Review.vue
+++ b/packages/ui/src/components/billing/ServersPurchase3Review.vue
@@ -15,11 +15,12 @@ import dayjs from 'dayjs'
 import type Stripe from 'stripe'
 import { computed } from 'vue'
 
+import { Button } from '#ui/components/base/buttons'
+
 import { useFormatPrice } from '../../composables'
 import { useVIntl } from '../../composables/i18n'
 import { getPriceForInterval, monthsInInterval } from '../../utils/product-utils'
 import { regionOverrides } from '../../utils/regions'
-import ButtonStyled from '../base/ButtonStyled.vue'
 import Checkbox from '../base/Checkbox.vue'
 import TagItem from '../base/TagItem.vue'
 import ModrinthServersIcon from '../servers/ModrinthServersIcon.vue'
@@ -323,12 +324,10 @@ function setInterval(newInterval: ServerBillingInterval) {
 				No payment method selected
 			</div>
 		</template>
-		<ButtonStyled size="small" type="transparent">
-			<button class="ml-auto" @click="emit('changePaymentMethod')">
-				<template v-if="selectedPaymentMethod || hasPaymentMethod"> <EditIcon /> Change </template>
-				<template v-else> Select payment method <RightArrowIcon /> </template>
-			</button>
-		</ButtonStyled>
+		<Button type="quiet" size="xs" class="ml-auto !h-6" @click="emit('changePaymentMethod')">
+			<template v-if="selectedPaymentMethod || hasPaymentMethod"> <EditIcon /> Change </template>
+			<template v-else> Select payment method <RightArrowIcon /> </template>
+		</Button>
 	</div>
 	<p v-if="!noPaymentRequired" class="m-0 mt-4 text-sm text-secondary">
 		<template v-if="isUpgrade && (total ?? 0) > 0">
diff --git a/packages/ui/src/components/chart/Chart.vue b/packages/ui/src/components/chart/Chart.vue
index 43c11e1fb5..72d42bc67a 100644
--- a/packages/ui/src/components/chart/Chart.vue
+++ b/packages/ui/src/components/chart/Chart.vue
@@ -4,7 +4,7 @@ import dayjs from 'dayjs'
 import { defineAsyncComponent, onMounted, ref } from 'vue'
 
 import { useFormatNumber } from '../../composables/index.ts'
-import Button from '../base/Button.vue'
+import { IconButton } from '../base/buttons'
 import Checkbox from '../base/Checkbox.vue'
 
 const VueApexCharts = defineAsyncComponent(() => import('vue3-apexcharts'))
@@ -231,12 +231,16 @@ defineExpose({
 		<div class="title-bar">
 			<slot />
 			<div v-if="!hideToolbar" class="toolbar">
-				<Button v-tooltip="'Download data as CSV'" icon-only @click="downloadCSV">
+				<IconButton
+					v-tooltip="'Download data as CSV'"
+					label="Download data as CSV"
+					@click="downloadCSV"
+				>
 					<!-- <DownloadIcon /> -->
-				</Button>
-				<Button v-tooltip="'Reset chart'" icon-only @click="resetChart">
+				</IconButton>
+				<IconButton v-tooltip="'Reset chart'" label="Reset chart" @click="resetChart">
 					<!-- <UpdatedIcon /> -->
-				</Button>
+				</IconButton>
 				<slot name="toolbar" />
 			</div>
 		</div>
diff --git a/packages/ui/src/components/external_files/AddFilesToAttributionGroupModal.vue b/packages/ui/src/components/external_files/AddFilesToAttributionGroupModal.vue
index fc94cf5af1..effcec44fa 100644
--- a/packages/ui/src/components/external_files/AddFilesToAttributionGroupModal.vue
+++ b/packages/ui/src/components/external_files/AddFilesToAttributionGroupModal.vue
@@ -3,7 +3,8 @@ import type { Labrinth } from '@modrinth/api-client'
 import { CheckIcon, PlusIcon, SearchIcon, SpinnerIcon, XIcon } from '@modrinth/assets'
 import { computed, nextTick, ref } from 'vue'
 
-import { ButtonStyled, NewModal, StyledInput } from '#ui/components'
+import { NewModal, StyledInput } from '#ui/components'
+import { Button } from '#ui/components/base/buttons'
 import { commonMessages } from '#ui/utils'
 
 import { defineMessages, useVIntl } from '../../composables/i18n'
@@ -263,23 +264,21 @@ defineExpose({ show, hide })
 					{{ formatMessage(messages.addFilesModalSelectedCount, { count: selectedFileCount }) }}
 				</p>
 				<div class="flex gap-2 ml-auto">
-					<ButtonStyled type="outlined">
-						<button type="button" :disabled="pending" @click="hide">
-							<XIcon class="size-4 shrink-0" />
-							{{ formatMessage(commonMessages.cancelButton) }}
-						</button>
-					</ButtonStyled>
-					<ButtonStyled color="brand">
-						<button
-							type="button"
-							:disabled="selectedFileCount === 0 || pending"
-							@click="handleConfirm"
-						>
-							<SpinnerIcon v-if="pending" class="size-4 shrink-0 animate-spin" />
-							<PlusIcon v-else class="size-4 shrink-0" />
-							{{ formatMessage(messages.addFilesModalConfirm, { count: selectedFileCount }) }}
-						</button>
-					</ButtonStyled>
+					<Button type="outlined" native-type="button" :disabled="pending" @click="hide">
+						<XIcon class="size-4 shrink-0" />
+						{{ formatMessage(commonMessages.cancelButton) }}
+					</Button>
+					<Button
+						type="colored"
+						color="brand"
+						native-type="button"
+						:disabled="selectedFileCount === 0 || pending"
+						@click="handleConfirm"
+					>
+						<SpinnerIcon v-if="pending" class="size-4 shrink-0 animate-spin" />
+						<PlusIcon v-else class="size-4 shrink-0" />
+						{{ formatMessage(messages.addFilesModalConfirm, { count: selectedFileCount }) }}
+					</Button>
 				</div>
 			</div>
 		</template>
diff --git a/packages/ui/src/components/external_files/AddToExistingExternalProjectModal.vue b/packages/ui/src/components/external_files/AddToExistingExternalProjectModal.vue
index 9ad61e3b1a..85ccadcae4 100644
--- a/packages/ui/src/components/external_files/AddToExistingExternalProjectModal.vue
+++ b/packages/ui/src/components/external_files/AddToExistingExternalProjectModal.vue
@@ -4,7 +4,8 @@ import { PlusIcon, SearchIcon, SpinnerIcon, XIcon } from '@modrinth/assets'
 import { useMutation } from '@tanstack/vue-query'
 import { computed, ref, useTemplateRef } from 'vue'
 
-import { Accordion, ButtonStyled, NewModal, StyledInput } from '#ui/components'
+import { Accordion, NewModal, StyledInput } from '#ui/components'
+import { Button } from '#ui/components/base/buttons'
 
 import { injectModrinthClient, injectNotificationManager } from '../../providers'
 import AttributionGroupFilePicker from './AttributionGroupFilePicker.vue'
@@ -228,12 +229,15 @@ defineExpose({ show, hide })
 							wrapper-class="flex-1 min-w-[12rem]"
 							:disabled="addFilesMutation.isPending.value"
 						/>
-						<ButtonStyled color="brand">
-							<button type="submit" :disabled="addFilesMutation.isPending.value">
-								<SearchIcon aria-hidden="true" />
-								Search
-							</button>
-						</ButtonStyled>
+						<Button
+							type="colored"
+							color="brand"
+							native-type="submit"
+							:disabled="addFilesMutation.isPending.value"
+						>
+							<SearchIcon aria-hidden="true" />
+							Search
+						</Button>
 					</form>
 					<div
 						class="flex flex-col min-h-0 max-h-[min(50vh,24rem)] overflow-y-auto overflow-x-hidden"
@@ -269,17 +273,15 @@ defineExpose({ show, hide })
 								class="mx-4 mt-3"
 							>
 								<template #actions>
-									<ButtonStyled color="brand">
-										<button
-											type="button"
-											:disabled="
-												selectedProjectId === project.id || addFilesMutation.isPending.value
-											"
-											@click="selectProject(project.id)"
-										>
-											{{ selectedProjectId === project.id ? 'Selected' : 'Select' }}
-										</button>
-									</ButtonStyled>
+									<Button
+										type="colored"
+										color="brand"
+										native-type="button"
+										:disabled="selectedProjectId === project.id || addFilesMutation.isPending.value"
+										@click="selectProject(project.id)"
+									>
+										{{ selectedProjectId === project.id ? 'Selected' : 'Select' }}
+									</Button>
 								</template>
 							</ExternalProjectLookupCard>
 						</div>
@@ -306,22 +308,29 @@ defineExpose({ show, hide })
 				/>
 			</Accordion>
 			<div class="flex justify-end gap-2 w-full">
-				<ButtonStyled type="outlined">
-					<button type="button" :disabled="addFilesMutation.isPending.value" @click="hide">
-						<XIcon class="size-4 shrink-0" />
-						Cancel
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="brand">
-					<button type="button" :disabled="!canSubmit" @click="handleSubmit">
-						<SpinnerIcon
-							v-if="addFilesMutation.isPending.value"
-							class="size-4 shrink-0 animate-spin"
-						/>
-						<PlusIcon v-else class="size-4 shrink-0" />
-						Add files to entry
-					</button>
-				</ButtonStyled>
+				<Button
+					type="outlined"
+					native-type="button"
+					:disabled="addFilesMutation.isPending.value"
+					@click="hide"
+				>
+					<XIcon class="size-4 shrink-0" />
+					Cancel
+				</Button>
+				<Button
+					type="colored"
+					color="brand"
+					native-type="button"
+					:disabled="!canSubmit"
+					@click="handleSubmit"
+				>
+					<SpinnerIcon
+						v-if="addFilesMutation.isPending.value"
+						class="size-4 shrink-0 animate-spin"
+					/>
+					<PlusIcon v-else class="size-4 shrink-0" />
+					Add files to entry
+				</Button>
 			</div>
 		</div>
 	</NewModal>
diff --git a/packages/ui/src/components/external_files/AddToGlobalPermissionsDatabaseModal.vue b/packages/ui/src/components/external_files/AddToGlobalPermissionsDatabaseModal.vue
index c3a55d80d0..e36d1785d9 100644
--- a/packages/ui/src/components/external_files/AddToGlobalPermissionsDatabaseModal.vue
+++ b/packages/ui/src/components/external_files/AddToGlobalPermissionsDatabaseModal.vue
@@ -4,14 +4,8 @@ import { PlusIcon, SpinnerIcon, XIcon } from '@modrinth/assets'
 import { useMutation } from '@tanstack/vue-query'
 import { computed, ref, useTemplateRef } from 'vue'
 
-import {
-	Accordion,
-	ButtonStyled,
-	Combobox,
-	type ComboboxOption,
-	NewModal,
-	StyledInput,
-} from '#ui/components'
+import { Accordion, Combobox, type ComboboxOption, NewModal, StyledInput } from '#ui/components'
+import { Button } from '#ui/components/base/buttons'
 
 import { injectModrinthClient, injectNotificationManager } from '../../providers'
 import AttributionGroupFilePicker from './AttributionGroupFilePicker.vue'
@@ -223,22 +217,26 @@ defineExpose({ show, hide })
 				</div>
 			</Accordion>
 			<div class="flex justify-end gap-2 w-full">
-				<ButtonStyled type="outlined">
-					<button type="button" :disabled="createMutation.isPending.value" @click="hide">
-						<XIcon class="size-4 shrink-0" />
-						Cancel
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="brand">
-					<button type="button" :disabled="!canSubmit" @click="handleSubmit">
-						<SpinnerIcon
-							v-if="createMutation.isPending.value"
-							class="size-4 shrink-0 animate-spin"
-						/>
-						<PlusIcon v-else class="size-4 shrink-0" />
-						Add to global database
-					</button>
-				</ButtonStyled>
+				<Button
+					type="outlined"
+					native-type="button"
+					:disabled="createMutation.isPending.value"
+					@click="hide"
+				>
+					<XIcon class="size-4 shrink-0" />
+					Cancel
+				</Button>
+				<Button
+					type="colored"
+					color="brand"
+					native-type="button"
+					:disabled="!canSubmit"
+					@click="handleSubmit"
+				>
+					<SpinnerIcon v-if="createMutation.isPending.value" class="size-4 shrink-0 animate-spin" />
+					<PlusIcon v-else class="size-4 shrink-0" />
+					Add to global database
+				</Button>
 			</div>
 		</div>
 	</NewModal>
diff --git a/packages/ui/src/components/external_files/AttributionEditor.vue b/packages/ui/src/components/external_files/AttributionEditor.vue
index 3694793a02..82e99ad7cb 100644
--- a/packages/ui/src/components/external_files/AttributionEditor.vue
+++ b/packages/ui/src/components/external_files/AttributionEditor.vue
@@ -14,8 +14,9 @@ import { builtinLicenses } from '@modrinth/utils'
 import { useMutation, useQueryClient } from '@tanstack/vue-query'
 import { computed, ref, watch } from 'vue'
 
-import { ButtonStyled, Chips, Combobox, type ComboboxOption, StyledInput } from '#ui/components'
+import { Chips, Combobox, type ComboboxOption, StyledInput } from '#ui/components'
 import { FileInput } from '#ui/components/base'
+import { Button, IconButton } from '#ui/components/base/buttons'
 import { commonMessages } from '#ui/utils'
 
 import { defineMessage, defineMessages, useVIntl } from '../../composables/i18n'
@@ -577,15 +578,14 @@ function cancelEditing() {
 									class="flex w-full object-contain bg-surface-3"
 								/>
 								<div class="absolute top-2 right-2">
-									<ButtonStyled circular>
-										<button
-											v-tooltip="formatMessage(messages.proofImageRemove)"
-											type="button"
-											@click="removeProofImage(idx)"
-										>
-											<TrashIcon />
-										</button>
-									</ButtonStyled>
+									<IconButton
+										v-tooltip="formatMessage(messages.proofImageRemove)"
+										:label="formatMessage(messages.proofImageRemove)"
+										native-type="button"
+										@click="removeProofImage(idx)"
+									>
+										<TrashIcon />
+									</IconButton>
 								</div>
 							</div>
 						</div>
@@ -633,29 +633,29 @@ function cancelEditing() {
 
 		<hr class="mt-1 bg-surface-5 border-none h-[1px] w-full" />
 		<div class="flex items-center gap-2 justify-end">
-			<ButtonStyled v-if="isAttributed" type="outlined">
-				<button
-					:disabled="saveMutation.isPending.value || uploadProofImageMutation.isPending.value"
-					@click="cancelEditing"
-				>
-					<XIcon /> {{ formatMessage(commonMessages.cancelButton) }}
-				</button>
-			</ButtonStyled>
-			<ButtonStyled color="brand">
-				<button
-					:disabled="saveMutation.isPending.value || uploadProofImageMutation.isPending.value"
-					@click="handleSave"
-				>
-					<template v-if="saveMutation.isPending.value">
-						<SpinnerIcon class="animate-spin" />
-						{{ formatMessage(commonMessages.savingButton) }}
-					</template>
-					<template v-else-if="isAttributed">
-						<SaveIcon /> {{ formatMessage(messages.saveAttribution) }}
-					</template>
-					<template v-else> <CheckIcon /> {{ formatMessage(messages.addAttribution) }} </template>
-				</button>
-			</ButtonStyled>
+			<Button
+				v-if="isAttributed"
+				type="outlined"
+				:disabled="saveMutation.isPending.value || uploadProofImageMutation.isPending.value"
+				@click="cancelEditing"
+			>
+				<XIcon /> {{ formatMessage(commonMessages.cancelButton) }}
+			</Button>
+			<Button
+				type="colored"
+				color="brand"
+				:disabled="saveMutation.isPending.value || uploadProofImageMutation.isPending.value"
+				@click="handleSave"
+			>
+				<template v-if="saveMutation.isPending.value">
+					<SpinnerIcon class="animate-spin" />
+					{{ formatMessage(commonMessages.savingButton) }}
+				</template>
+				<template v-else-if="isAttributed">
+					<SaveIcon /> {{ formatMessage(messages.saveAttribution) }}
+				</template>
+				<template v-else> <CheckIcon /> {{ formatMessage(messages.addAttribution) }} </template>
+			</Button>
 		</div>
 	</div>
 </template>
diff --git a/packages/ui/src/components/external_files/ExternalProjectLookupCard.vue b/packages/ui/src/components/external_files/ExternalProjectLookupCard.vue
index 4bf6a34a92..2467b5d3cf 100644
--- a/packages/ui/src/components/external_files/ExternalProjectLookupCard.vue
+++ b/packages/ui/src/components/external_files/ExternalProjectLookupCard.vue
@@ -9,7 +9,8 @@ import {
 import { Menu } from 'floating-vue'
 import { computed } from 'vue'
 
-import { ButtonStyled, CopyCode } from '#ui/components'
+import { CopyCode } from '#ui/components'
+import { IconButton } from '#ui/components/base/buttons'
 
 import ExternalProjectLicenseStateTag from './ExternalProjectLicenseStateTag.vue'
 import type { ExternalLicenseStatus } from './types.ts'
@@ -58,11 +59,16 @@ async function copyProjectLink() {
 						</template>
 						<template v-else> <LinkIcon class="size-5 shrink-0" /> Project link </template>
 					</a>
-					<ButtonStyled circular type="transparent" size="small">
-						<button v-tooltip="'Copy link'" @click="copyProjectLink">
-							<ClipboardCopyIcon />
-						</button>
-					</ButtonStyled>
+					<IconButton
+						v-tooltip="'Copy link'"
+						class="!size-6"
+						type="quiet"
+						size="xs"
+						:label="'Copy link'"
+						@click="copyProjectLink"
+					>
+						<ClipboardCopyIcon />
+					</IconButton>
 				</div>
 			</div>
 			<slot name="actions" />
diff --git a/packages/ui/src/components/external_files/ExternalProjectPermissionsCard.vue b/packages/ui/src/components/external_files/ExternalProjectPermissionsCard.vue
index bb26531235..9dc39af921 100644
--- a/packages/ui/src/components/external_files/ExternalProjectPermissionsCard.vue
+++ b/packages/ui/src/components/external_files/ExternalProjectPermissionsCard.vue
@@ -18,8 +18,9 @@ import { renderString } from '@modrinth/utils'
 import { useMutation, useQueryClient } from '@tanstack/vue-query'
 import { computed, ref, useTemplateRef, watch } from 'vue'
 
-import { ButtonStyled, Collapsible, ConfirmModal, OverflowMenu } from '#ui/components'
+import { Collapsible, ConfirmModal } from '#ui/components'
 import type { OverflowMenuOption } from '#ui/components/base'
+import { Button, IconButton, TeleportOverflowMenu } from '#ui/components/base/buttons'
 import { commonMessages } from '#ui/utils'
 
 import { defineMessage, defineMessages, useVIntl } from '../../composables/i18n'
@@ -498,6 +499,7 @@ const visibleQuickReplies = computed<OverflowMenuOption[]>(() => {
 			(reply) =>
 				({
 					id: reply.label,
+					label: reply.label,
 					action: () => handleQuickReply(reply),
 				}) as OverflowMenuOption,
 		)
@@ -577,28 +579,27 @@ const visibleQuickReplies = computed<OverflowMenuOption[]>(() => {
 							</span>
 						</div>
 						<div class="flex items-center gap-1 my-auto">
-							<ButtonStyled v-if="group.files.length > 1" circular size="small">
-								<button
-									v-tooltip="formatMessage(messages.splitFile)"
-									class="m-1"
-									:disabled="splitFileMutation.isPending.value"
-									@click="handleSplitFile(file.sha1)"
-								>
-									<SpinnerIcon
-										v-if="splitFileMutation.isPending.value && pendingSplitSha1 === file.sha1"
-										class="size-4 shrink-0 animate-spin"
-									/>
-									<XIcon v-else class="size-4 shrink-0" />
-								</button>
-							</ButtonStyled>
+							<IconButton
+								v-if="group.files.length > 1"
+								v-tooltip="formatMessage(messages.splitFile)"
+								class="m-1 !size-6"
+								size="xs"
+								:label="formatMessage(messages.splitFile)"
+								:disabled="splitFileMutation.isPending.value"
+								@click="handleSplitFile(file.sha1)"
+							>
+								<SpinnerIcon
+									v-if="splitFileMutation.isPending.value && pendingSplitSha1 === file.sha1"
+									class="size-4 shrink-0 animate-spin"
+								/>
+								<XIcon v-else class="size-4 shrink-0" />
+							</IconButton>
 						</div>
 					</span>
 					<div>
-						<ButtonStyled>
-							<button @click="handleAddFilesToGroup($event)">
-								<PlusIcon class="size-4 shrink-0" /> {{ formatMessage(messages.addFilesToGroup) }}
-							</button>
-						</ButtonStyled>
+						<Button @click="handleAddFilesToGroup($event)">
+							<PlusIcon class="size-4 shrink-0" /> {{ formatMessage(messages.addFilesToGroup) }}
+						</Button>
 					</div>
 				</div>
 				<template v-if="(containingVersions?.length ?? 0) > 0">
@@ -644,11 +645,9 @@ const visibleQuickReplies = computed<OverflowMenuOption[]>(() => {
 						"
 						#actions
 					>
-						<ButtonStyled>
-							<button @click="startEditingAttribution">
-								<EditIcon /> {{ formatMessage(commonMessages.editButton) }}
-							</button>
-						</ButtonStyled>
+						<Button @click="startEditingAttribution">
+							<EditIcon /> {{ formatMessage(commonMessages.editButton) }}
+						</Button>
 					</template>
 					<template
 						v-if="
@@ -714,81 +713,83 @@ const visibleQuickReplies = computed<OverflowMenuOption[]>(() => {
 											class="mt-3"
 										/>
 										<div class="flex items-center gap-2 flex-wrap mt-3">
-											<ButtonStyled v-if="visibleQuickReplies.length > 0">
-												<OverflowMenu :options="visibleQuickReplies">
-													Reply presets
-													<ChevronDownIcon />
-												</OverflowMenu>
-											</ButtonStyled>
-											<ButtonStyled color="green" color-fill="text">
-												<button
-													:disabled="setModerationStatusMutation.isPending.value"
-													@click="handleSetModerationStatus('approved')"
-												>
-													<SpinnerIcon
-														v-if="
-															setModerationStatusMutation.isPending.value &&
-															pendingModerationStatusKind === 'approved'
-														"
-														class="size-4 shrink-0 animate-spin"
-													/>
-													<CheckCircleIcon v-else />
-													Approve
-												</button>
-											</ButtonStyled>
-											<ButtonStyled color="red" color-fill="text">
-												<button
-													:disabled="setModerationStatusMutation.isPending.value"
-													@click="handleSetModerationStatus('bad_proof')"
-												>
-													<SpinnerIcon
-														v-if="
-															setModerationStatusMutation.isPending.value &&
-															pendingModerationStatusKind === 'bad_proof'
-														"
-														class="size-4 shrink-0 animate-spin"
-													/>
-													<XCircleIcon v-else />
-													Reject: Insufficient proof
-												</button>
-											</ButtonStyled>
-											<ButtonStyled color="red" color-fill="text">
-												<button
-													:disabled="setModerationStatusMutation.isPending.value"
-													@click="handleSetModerationStatus('not_allowed')"
-												>
-													<SpinnerIcon
-														v-if="
-															setModerationStatusMutation.isPending.value &&
-															pendingModerationStatusKind === 'not_allowed'
-														"
-														class="size-4 shrink-0 animate-spin"
-													/>
-													<ReportIcon v-else />
-													Reject: Not allowed
-												</button>
-											</ButtonStyled>
-											<ButtonStyled v-if="isEditingModerationReview" type="outlined">
-												<button
-													:disabled="setModerationStatusMutation.isPending.value"
-													@click="cancelModerationReviewEditing"
-												>
-													<XIcon />
-													{{ formatMessage(commonMessages.cancelButton) }}
-												</button>
-											</ButtonStyled>
+											<TeleportOverflowMenu
+												v-if="visibleQuickReplies.length > 0"
+												label="More options"
+												:options="visibleQuickReplies"
+												class="!w-auto !px-2.5 !rounded-xl"
+											>
+												Reply presets
+												<ChevronDownIcon />
+											</TeleportOverflowMenu>
+											<Button
+												type="quiet"
+												color="green"
+												:disabled="setModerationStatusMutation.isPending.value"
+												class="!text-green [&>svg]:!text-green"
+												@click="handleSetModerationStatus('approved')"
+											>
+												<SpinnerIcon
+													v-if="
+														setModerationStatusMutation.isPending.value &&
+														pendingModerationStatusKind === 'approved'
+													"
+													class="size-4 shrink-0 animate-spin"
+												/>
+												<CheckCircleIcon v-else />
+												Approve
+											</Button>
+											<Button
+												type="quiet"
+												color="red"
+												:disabled="setModerationStatusMutation.isPending.value"
+												class="!text-red [&>svg]:!text-red"
+												@click="handleSetModerationStatus('bad_proof')"
+											>
+												<SpinnerIcon
+													v-if="
+														setModerationStatusMutation.isPending.value &&
+														pendingModerationStatusKind === 'bad_proof'
+													"
+													class="size-4 shrink-0 animate-spin"
+												/>
+												<XCircleIcon v-else />
+												Reject: Insufficient proof
+											</Button>
+											<Button
+												type="quiet"
+												color="red"
+												:disabled="setModerationStatusMutation.isPending.value"
+												class="!text-red [&>svg]:!text-red"
+												@click="handleSetModerationStatus('not_allowed')"
+											>
+												<SpinnerIcon
+													v-if="
+														setModerationStatusMutation.isPending.value &&
+														pendingModerationStatusKind === 'not_allowed'
+													"
+													class="size-4 shrink-0 animate-spin"
+												/>
+												<ReportIcon v-else />
+												Reject: Not allowed
+											</Button>
+											<Button
+												v-if="isEditingModerationReview"
+												type="outlined"
+												:disabled="setModerationStatusMutation.isPending.value"
+												@click="cancelModerationReviewEditing"
+											>
+												<XIcon />
+												{{ formatMessage(commonMessages.cancelButton) }}
+											</Button>
 										</div>
 										<div class="flex items-center gap-2 flex-wrap mt-3">
-											<ButtonStyled>
-												<button @click="handleAddToGlobalDatabase">
-													<ScaleIcon /> Add files to database...
-												</button>
-											</ButtonStyled>
-											<ButtonStyled>
-												<button @click="handleAddToExistingEntry">
-													<ScaleIcon /> Add to existing entry...
-												</button>
-											</ButtonStyled>
+											<Button @click="handleAddToGlobalDatabase">
+												<ScaleIcon /> Add files to database...
+											</Button>
+											<Button @click="handleAddToExistingEntry">
+												<ScaleIcon /> Add to existing entry...
+											</Button>
 										</div>
 									</template>
 								</template>
@@ -808,12 +809,10 @@ const visibleQuickReplies = computed<OverflowMenuOption[]>(() => {
 								"
 								class="ml-auto"
 							>
-								<ButtonStyled color="orange">
-									<button @click="startEditingModerationReview">
-										<ScaleIcon />
-										{{ formatMessage(commonMessages.editButton) }}
-									</button>
-								</ButtonStyled>
+								<Button type="colored" color="orange" @click="startEditingModerationReview">
+									<ScaleIcon />
+									{{ formatMessage(commonMessages.editButton) }}
+								</Button>
 							</div>
 						</div>
 					</template>
@@ -835,16 +834,19 @@ const visibleQuickReplies = computed<OverflowMenuOption[]>(() => {
 					/>
 				</div>
 				<div v-if="isModerator" class="flex justify-end pt-2">
-					<ButtonStyled color="red" type="outlined">
-						<button :disabled="deleteGroupMutation.isPending.value" @click="handleDeleteGroup">
-							<SpinnerIcon
-								v-if="deleteGroupMutation.isPending.value"
-								class="size-4 shrink-0 animate-spin"
-							/>
-							<TrashIcon v-else class="size-4 shrink-0" />
-							{{ formatMessage(messages.removeGroup) }}
-						</button>
-					</ButtonStyled>
+					<Button
+						type="outlined"
+						:disabled="deleteGroupMutation.isPending.value"
+						class="!text-red [&>svg]:!text-red !shadow-[inset_0_0_0_1px_var(--color-red)]"
+						@click="handleDeleteGroup"
+					>
+						<SpinnerIcon
+							v-if="deleteGroupMutation.isPending.value"
+							class="size-4 shrink-0 animate-spin"
+						/>
+						<TrashIcon v-else class="size-4 shrink-0" />
+						{{ formatMessage(messages.removeGroup) }}
+					</Button>
 				</div>
 			</div>
 		</Collapsible>
diff --git a/packages/ui/src/components/flows/creation-flow-modal/components/CustomSetupStage.vue b/packages/ui/src/components/flows/creation-flow-modal/components/CustomSetupStage.vue
index 2d20d1a1a0..9899a8d370 100644
--- a/packages/ui/src/components/flows/creation-flow-modal/components/CustomSetupStage.vue
+++ b/packages/ui/src/components/flows/creation-flow-modal/components/CustomSetupStage.vue
@@ -4,18 +4,14 @@
 		<div v-if="ctx.flowType === 'instance'" class="flex items-center gap-4">
 			<Avatar :src="ctx.instanceIconUrl.value ?? undefined" size="5rem" />
 			<div class="flex flex-col gap-2">
-				<ButtonStyled type="outlined">
-					<button @click="triggerIconInput">
-						<UploadIcon />
-						{{ formatMessage(messages.selectIcon) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled type="outlined">
-					<button :disabled="!ctx.instanceIcon.value" @click="removeIcon">
-						<XIcon />
-						{{ formatMessage(messages.removeIcon) }}
-					</button>
-				</ButtonStyled>
+				<Button type="outlined" @click="triggerIconInput">
+					<UploadIcon />
+					{{ formatMessage(messages.selectIcon) }}
+				</Button>
+				<Button type="outlined" :disabled="!ctx.instanceIcon.value" @click="removeIcon">
+					<XIcon />
+					{{ formatMessage(messages.removeIcon) }}
+				</Button>
 			</div>
 		</div>
 
@@ -153,11 +149,11 @@ import { EyeIcon, EyeOffIcon, UploadIcon, XIcon } from '@modrinth/assets'
 import { commonMessages, defineMessages, useVIntl } from '@modrinth/ui'
 import { computed, onMounted, ref, watch } from 'vue'
 
+import { Button } from '#ui/components/base/buttons'
 import { useDebugLogger } from '#ui/composables/debug-logger'
 
 import { injectFilePicker, injectModrinthClient, injectTags } from '../../../../providers'
 import Avatar from '../../../base/Avatar.vue'
-import ButtonStyled from '../../../base/ButtonStyled.vue'
 import Chips from '../../../base/Chips.vue'
 import Collapsible from '../../../base/Collapsible.vue'
 import Combobox, { type ComboboxOption } from '../../../base/Combobox.vue'
diff --git a/packages/ui/src/components/flows/creation-flow-modal/components/ImportInstanceStage.vue b/packages/ui/src/components/flows/creation-flow-modal/components/ImportInstanceStage.vue
index 6351399bd3..3102c9bf78 100644
--- a/packages/ui/src/components/flows/creation-flow-modal/components/ImportInstanceStage.vue
+++ b/packages/ui/src/components/flows/creation-flow-modal/components/ImportInstanceStage.vue
@@ -5,13 +5,14 @@
 			<span class="font-semibold text-contrast">{{
 				formatMessage(messages.launcherInstancesTitle)
 			}}</span>
-			<ButtonStyled
-				type="transparent"
-				size="small"
+			<Button
+				type="quiet"
+				size="xs"
+				class="!h-6"
 				:class="{ invisible: totalSelectedCount === 0 }"
+				@click="clearAll"
+				>{{ formatMessage(messages.clearAll) }}</Button
 			>
-				<button @click="clearAll">{{ formatMessage(messages.clearAll) }}</button>
-			</ButtonStyled>
 		</div>
 
 		<template v-if="loading">
@@ -76,28 +77,22 @@
 
 			<!-- Add launcher path -->
 			<div v-if="!showAddPath">
-				<ButtonStyled>
-					<button class="w-full !shadow-none" @click="showAddPath = true">
-						{{ formatMessage(messages.addLauncherPath) }}
-					</button>
-				</ButtonStyled>
+				<Button class="w-full" @click="showAddPath = true">
+					{{ formatMessage(messages.addLauncherPath) }}
+				</Button>
 			</div>
 			<div v-else class="flex items-center gap-2">
-				<ButtonStyled circular>
-					<button class="!shadow-none" @click="browseForLauncherPath">
-						<FolderSearchIcon />
-					</button>
-				</ButtonStyled>
+				<IconButton label="Browse for launcher path" @click="browseForLauncherPath">
+					<FolderSearchIcon />
+				</IconButton>
 				<StyledInput
 					v-model="newLauncherPath"
 					:placeholder="formatMessage(messages.launcherPathPlaceholder)"
 					class="flex-1"
 				/>
-				<ButtonStyled>
-					<button class="!shadow-none" :disabled="!newLauncherPath.trim()" @click="addLauncherPath">
-						{{ formatMessage(messages.add) }}
-					</button>
-				</ButtonStyled>
+				<Button :disabled="!newLauncherPath.trim()" @click="addLauncherPath">
+					{{ formatMessage(messages.add) }}
+				</Button>
 			</div>
 		</template>
 	</div>
@@ -108,9 +103,10 @@ import { ChevronRightIcon, FolderSearchIcon, SearchIcon } from '@modrinth/assets
 import { defineMessages, useVIntl } from '@modrinth/ui'
 import { computed, onMounted, ref, watch } from 'vue'
 
+import { Button, IconButton } from '#ui/components/base/buttons'
+
 import { injectInstanceImport, injectNotificationManager } from '../../../../providers'
 import type { ImportableLauncher } from '../../../../providers/instance-import'
-import ButtonStyled from '../../../base/ButtonStyled.vue'
 import Checkbox from '../../../base/Checkbox.vue'
 import Collapsible from '../../../base/Collapsible.vue'
 import StyledInput from '../../../base/StyledInput.vue'
diff --git a/packages/ui/src/components/flows/creation-flow-modal/components/ModpackStage.vue b/packages/ui/src/components/flows/creation-flow-modal/components/ModpackStage.vue
index e0860dd303..8fc5605aa3 100644
--- a/packages/ui/src/components/flows/creation-flow-modal/components/ModpackStage.vue
+++ b/packages/ui/src/components/flows/creation-flow-modal/components/ModpackStage.vue
@@ -30,28 +30,27 @@
 			<div class="h-[1px] w-full flex-1 bg-surface-5" />
 		</div>
 		<div class="flex gap-3">
-			<ButtonStyled type="outlined">
-				<button
-					v-tooltip="ctx.finishDisabled.value ? ctx.finishDisabledTooltip.value : undefined"
-					class="flex-1"
-					:disabled="ctx.finishDisabled.value"
-					@click="triggerFileInput"
-				>
-					<ImportIcon />
-					{{ formatMessage(messages.importModpack) }}
-				</button>
-			</ButtonStyled>
-			<ButtonStyled color="brand">
-				<button
-					v-tooltip="ctx.finishDisabled.value ? ctx.finishDisabledTooltip.value : undefined"
-					class="flex-1"
-					:disabled="ctx.finishDisabled.value"
-					@click="ctx.browseModpacks()"
-				>
-					<CompassIcon />
-					{{ formatMessage(messages.browseModpacks) }}
-				</button>
-			</ButtonStyled>
+			<Button
+				v-tooltip="ctx.finishDisabled.value ? ctx.finishDisabledTooltip.value : undefined"
+				type="outlined"
+				class="flex-1"
+				:disabled="ctx.finishDisabled.value"
+				@click="triggerFileInput"
+			>
+				<ImportIcon />
+				{{ formatMessage(messages.importModpack) }}
+			</Button>
+			<Button
+				v-tooltip="ctx.finishDisabled.value ? ctx.finishDisabledTooltip.value : undefined"
+				type="colored"
+				color="brand"
+				class="flex-1"
+				:disabled="ctx.finishDisabled.value"
+				@click="ctx.browseModpacks()"
+			>
+				<CompassIcon />
+				{{ formatMessage(messages.browseModpacks) }}
+			</Button>
 		</div>
 	</div>
 </template>
@@ -61,10 +60,10 @@ import { CompassIcon, ImportIcon, RightArrowIcon } from '@modrinth/assets'
 import { commonMessages, defineMessages, useVIntl } from '@modrinth/ui'
 import { defineAsyncComponent, h, onMounted, ref, watch } from 'vue'
 
+import { Button } from '#ui/components/base/buttons'
 import { useDebugLogger } from '#ui/composables/debug-logger'
 
 import { injectFilePicker } from '../../../../providers'
-import ButtonStyled from '../../../base/ButtonStyled.vue'
 import Combobox from '../../../base/Combobox.vue'
 import { injectCreationFlowContext } from '../creation-flow-context'
 
diff --git a/packages/ui/src/components/modal/ConfirmLeaveModal.vue b/packages/ui/src/components/modal/ConfirmLeaveModal.vue
index cba7b8468c..b49b7c0665 100644
--- a/packages/ui/src/components/modal/ConfirmLeaveModal.vue
+++ b/packages/ui/src/components/modal/ConfirmLeaveModal.vue
@@ -8,18 +8,14 @@
 
 		<template #actions>
 			<div class="flex justify-end gap-2">
-				<ButtonStyled type="outlined">
-					<button @click="cancel">
-						<XIcon />
-						{{ localizeIfPossible(stayLabel) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="red">
-					<button @click="leave">
-						<RightArrowIcon />
-						{{ localizeIfPossible(leaveLabel) }}
-					</button>
-				</ButtonStyled>
+				<Button type="outlined" @click="cancel">
+					<XIcon />
+					{{ localizeIfPossible(stayLabel) }}
+				</Button>
+				<Button type="colored" color="red" @click="leave">
+					<RightArrowIcon />
+					{{ localizeIfPossible(leaveLabel) }}
+				</Button>
 			</div>
 		</template>
 	</NewModal>
@@ -30,7 +26,7 @@ import { RightArrowIcon, XIcon } from '@modrinth/assets'
 import { ref } from 'vue'
 
 import Admonition from '#ui/components/base/Admonition.vue'
-import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
+import { Button } from '#ui/components/base/buttons'
 import { defineMessage, type MessageDescriptor, useVIntl } from '#ui/composables/i18n'
 
 import NewModal from './NewModal.vue'
diff --git a/packages/ui/src/components/modal/ConfirmModal.vue b/packages/ui/src/components/modal/ConfirmModal.vue
index 87a091324e..157b909d20 100644
--- a/packages/ui/src/components/modal/ConfirmModal.vue
+++ b/packages/ui/src/components/modal/ConfirmModal.vue
@@ -31,18 +31,19 @@
 				wrapper-class="max-w-[20rem]"
 			/>
 			<div class="flex gap-2 justify-end">
-				<ButtonStyled>
-					<button class="!shadow-none" @click="hide()">
-						<XIcon />
-						Cancel
-					</button>
-				</ButtonStyled>
-				<ButtonStyled :color="danger ? 'red' : 'brand'">
-					<button :disabled="action_disabled" @click="proceed">
-						<component :is="proceedIcon" />
-						{{ proceedLabel }}
-					</button>
-				</ButtonStyled>
+				<Button @click="hide()">
+					<XIcon />
+					Cancel
+				</Button>
+				<Button
+					type="colored"
+					:color="danger ? 'red' : 'brand'"
+					:disabled="action_disabled"
+					@click="proceed"
+				>
+					<component :is="proceedIcon" />
+					{{ proceedLabel }}
+				</Button>
 			</div>
 		</div>
 	</NewModal>
@@ -53,7 +54,8 @@ import { TrashIcon, XIcon } from '@modrinth/assets'
 import { renderString } from '@modrinth/utils'
 import { computed, ref } from 'vue'
 
-import ButtonStyled from '../base/ButtonStyled.vue'
+import { Button } from '#ui/components/base/buttons'
+
 import StyledInput from '../base/StyledInput.vue'
 import NewModal from './NewModal.vue'
 
diff --git a/packages/ui/src/components/modal/NewModal.vue b/packages/ui/src/components/modal/NewModal.vue
index 803b831078..c5cb846bcd 100644
--- a/packages/ui/src/components/modal/NewModal.vue
+++ b/packages/ui/src/components/modal/NewModal.vue
@@ -43,33 +43,28 @@
 						</div>
 						<div class="flex items-center gap-2">
 							<slot name="header-actions" />
-							<ButtonStyled v-if="closable" circular>
-								<button
-									v-tooltip="closeLabel"
-									:aria-label="closeLabel"
-									:disabled="disableClose"
-									@click="hide"
-								>
-									<XIcon aria-hidden="true" />
-								</button>
-							</ButtonStyled>
+							<IconButton
+								v-if="closable"
+								v-tooltip="closeLabel"
+								:label="closeLabel"
+								:disabled="disableClose"
+								@click="hide"
+							>
+								<XIcon aria-hidden="true" />
+							</IconButton>
 						</div>
 					</div>
 
-					<ButtonStyled
+					<IconButton
 						v-if="props.mergeHeader && closable"
+						v-tooltip="closeLabel"
+						:label="closeLabel"
 						class="absolute top-4 right-4 z-10"
-						circular
+						:disabled="disableClose"
+						@click="hide"
 					>
-						<button
-							v-tooltip="closeLabel"
-							:aria-label="closeLabel"
-							:disabled="disableClose"
-							@click="hide"
-						>
-							<XIcon aria-hidden="true" />
-						</button>
-					</ButtonStyled>
+						<XIcon aria-hidden="true" />
+					</IconButton>
 
 					<div v-if="scrollable" class="relative flex-1 min-h-0 flex flex-col">
 						<Transition
@@ -144,12 +139,13 @@
 import { XIcon } from '@modrinth/assets'
 import { computed, nextTick, onUnmounted, ref } from 'vue'
 
+import { IconButton } from '#ui/components/base/buttons'
+
 import { useVIntl } from '../../composables/i18n'
 import { useModalStack } from '../../composables/modal-stack'
 import { useScrollIndicator } from '../../composables/scroll-indicator'
 import { injectModalBehavior } from '../../providers'
 import { commonMessages } from '../../utils/common-messages'
-import ButtonStyled from '../base/ButtonStyled.vue'
 
 const { formatMessage } = useVIntl()
 
diff --git a/packages/ui/src/components/modal/OpenInAppModal.vue b/packages/ui/src/components/modal/OpenInAppModal.vue
index 9ca6c9d998..af02634d53 100644
--- a/packages/ui/src/components/modal/OpenInAppModal.vue
+++ b/packages/ui/src/components/modal/OpenInAppModal.vue
@@ -88,23 +88,21 @@
 					formatMessage(messages.openingAutomatically)
 				}}</span>
 				<div v-else class="grid grid-cols-2 gap-2 w-full">
-					<ButtonStyled>
-						<button class="flex-1" @click="hide">
-							<XIcon />
-							{{ formatMessage(commonMessages.closeButton) }}
-						</button>
-					</ButtonStyled>
-					<ButtonStyled color="brand">
-						<a
-							class="flex-1"
-							href="https://modrinth.com/app"
-							target="_blank"
-							rel="noopener noreferrer"
-						>
-							<DownloadIcon />
-							{{ formatMessage(messages.getApp) }}
-						</a>
-					</ButtonStyled>
+					<Button class="flex-1" @click="hide">
+						<XIcon />
+						{{ formatMessage(commonMessages.closeButton) }}
+					</Button>
+					<ButtonLink
+						type="colored"
+						color="brand"
+						class="flex-1"
+						href="https://modrinth.com/app"
+						target="_blank"
+						rel="noopener noreferrer"
+					>
+						<DownloadIcon />
+						{{ formatMessage(messages.getApp) }}
+					</ButtonLink>
 				</div>
 			</div>
 		</div>
@@ -116,8 +114,10 @@ import { CheckIcon, DownloadIcon, XIcon } from '@modrinth/assets'
 import { commonMessages } from '@modrinth/ui'
 import { computed, nextTick, onUnmounted, ref } from 'vue'
 
+import { Button, ButtonLink } from '#ui/components/base/buttons'
+
 import { defineMessages, useVIntl } from '../../composables/i18n'
-import { Avatar, ButtonStyled } from '../base'
+import { Avatar } from '../base'
 import ServerOnlinePlayers from '../project/server/ServerOnlinePlayers.vue'
 import ServerRegion from '../project/server/ServerRegion.vue'
 
diff --git a/packages/ui/src/components/modal/ShareModal.vue b/packages/ui/src/components/modal/ShareModal.vue
index db9c485c1b..70cf15203c 100644
--- a/packages/ui/src/components/modal/ShareModal.vue
+++ b/packages/ui/src/components/modal/ShareModal.vue
@@ -12,9 +12,10 @@ import {
 import QrcodeVue from 'qrcode.vue'
 import { computed, nextTick, ref } from 'vue'
 
+import { ButtonLink, IconButton } from '#ui/components/base/buttons'
 import { injectNotificationManager } from '#ui/providers'
 
-import { ButtonStyled, NewModal, StyledInput } from '../index'
+import { NewModal, StyledInput } from '../index'
 
 const props = defineProps({
 	header: {
@@ -156,16 +157,15 @@ defineExpose({
 					<div ref="qrCode">
 						<QrcodeVue :value="url" class="!bg-white rounded-[var(--radius-md)]" margin="3" />
 					</div>
-					<ButtonStyled circular type="transparent">
-						<button
-							v-tooltip="'Copy QR code'"
-							class="absolute top-0 right-0 m-2"
-							aria-label="Copy QR code"
-							@click="copyImage"
-						>
-							<ClipboardCopyIcon class="h-5 w-5" aria-hidden="true" />
-						</button>
-					</ButtonStyled>
+					<IconButton
+						v-tooltip="'Copy QR code'"
+						type="quiet"
+						label="Copy QR code"
+						class="absolute top-0 right-0 m-2"
+						@click="copyImage"
+					>
+						<ClipboardCopyIcon class="h-5 w-5" aria-hidden="true" />
+					</IconButton>
 				</div>
 				<StyledInput
 					v-else
@@ -175,17 +175,16 @@ defineExpose({
 					wrapper-class="h-full w-[30rem]"
 				>
 					<template #right>
-						<ButtonStyled circular type="transparent">
-							<button
-								v-tooltip="'Copy Text'"
-								type="button"
-								aria-label="Copy Text"
-								class="absolute top-0 right-0 m-2"
-								@click="copyText"
-							>
-								<ClipboardCopyIcon class="h-5 w-5" aria-hidden="true" />
-							</button>
-						</ButtonStyled>
+						<IconButton
+							v-tooltip="'Copy Text'"
+							type="quiet"
+							label="Copy Text"
+							native-type="button"
+							class="absolute top-0 right-0 m-2"
+							@click="copyText"
+						>
+							<ClipboardCopyIcon class="h-5 w-5" aria-hidden="true" />
+						</IconButton>
 					</template>
 				</StyledInput>
 				<div
@@ -207,75 +206,67 @@ defineExpose({
 							<ClipboardCopyIcon class="h-5 w-5" aria-hidden="true" />
 						</div>
 					</button>
-					<ButtonStyled v-if="link">
-						<a
-							:href="url"
-							target="_blank"
-							rel="noopener noreferrer"
-							aria-label="Open in new tab"
-							class="w-full"
-						>
-							Open in new tab
-							<ExternalIcon aria-hidden="true" />
-						</a>
-					</ButtonStyled>
+					<ButtonLink
+						v-if="link"
+						:href="url"
+						target="_blank"
+						rel="noopener noreferrer"
+						aria-label="Open in new tab"
+						class="w-full"
+					>
+						Open in new tab
+						<ExternalIcon aria-hidden="true" />
+					</ButtonLink>
 					<div v-if="socialButtons" class="flex flex-row gap-1">
-						<ButtonStyled v-if="canShare" circular>
-							<button v-tooltip="'Share'" aria-label="Share" @click="share">
-								<ShareIcon aria-hidden="true" />
-							</button>
-						</ButtonStyled>
-						<ButtonStyled circular>
-							<a
-								v-tooltip="'Send as an email'"
-								:href="sendEmail"
-								:target="targetParameter"
-								aria-label="Send as an email"
-							>
-								<MailIcon aria-hidden="true" />
-							</a>
-						</ButtonStyled>
-						<ButtonStyled circular>
-							<a
-								v-if="link"
-								v-tooltip="'Open link in browser'"
-								:target="targetParameter"
-								:href="url"
-								aria-label="Open link in browser"
-							>
-								<GlobeIcon aria-hidden="true" />
-							</a>
-						</ButtonStyled>
-						<ButtonStyled circular>
-							<a
-								v-tooltip="'Toot about it'"
-								:target="targetParameter"
-								:href="sendToot"
-								aria-label="Toot about it"
-							>
-								<MastodonIcon aria-hidden="true" />
-							</a>
-						</ButtonStyled>
-						<ButtonStyled circular>
-							<a
-								v-tooltip="'Tweet about it'"
-								:target="targetParameter"
-								:href="sendTweet"
-								aria-label="Tweet about it"
-							>
-								<TwitterIcon aria-hidden="true" />
-							</a>
-						</ButtonStyled>
-						<ButtonStyled circular>
-							<a
-								v-tooltip="'Share on Reddit'"
-								:target="targetParameter"
-								:href="postOnReddit"
-								aria-label="Share on Reddit"
-							>
-								<RedditIcon aria-hidden="true" />
-							</a>
-						</ButtonStyled>
+						<IconButton v-if="canShare" v-tooltip="'Share'" label="Share" @click="share">
+							<ShareIcon aria-hidden="true" />
+						</IconButton>
+						<ButtonLink
+							v-tooltip="'Send as an email'"
+							:href="sendEmail"
+							:target="targetParameter"
+							aria-label="Send as an email"
+							class="!w-9 !px-0 !rounded-full"
+						>
+							<MailIcon aria-hidden="true" />
+						</ButtonLink>
+						<ButtonLink
+							v-if="link"
+							v-tooltip="'Open link in browser'"
+							:target="targetParameter"
+							:href="url"
+							aria-label="Open link in browser"
+							class="!w-9 !px-0 !rounded-full"
+						>
+							<GlobeIcon aria-hidden="true" />
+						</ButtonLink>
+						<ButtonLink
+							v-tooltip="'Toot about it'"
+							:target="targetParameter"
+							:href="sendToot"
+							aria-label="Toot about it"
+							class="!w-9 !px-0 !rounded-full"
+						>
+							<MastodonIcon aria-hidden="true" />
+						</ButtonLink>
+						<ButtonLink
+							v-tooltip="'Tweet about it'"
+							:target="targetParameter"
+							:href="sendTweet"
+							aria-label="Tweet about it"
+							class="!w-9 !px-0 !rounded-full"
+						>
+							<TwitterIcon aria-hidden="true" />
+						</ButtonLink>
+						<ButtonLink
+							v-tooltip="'Share on Reddit'"
+							:target="targetParameter"
+							:href="postOnReddit"
+							aria-label="Share on Reddit"
+							class="!w-9 !px-0 !rounded-full"
+						>
+							<RedditIcon aria-hidden="true" />
+						</ButtonLink>
 					</div>
 				</div>
 			</div>
diff --git a/packages/ui/src/components/modal/UnknownFileWarningModal.vue b/packages/ui/src/components/modal/UnknownFileWarningModal.vue
index 247ff96c04..cd4d6055b4 100644
--- a/packages/ui/src/components/modal/UnknownFileWarningModal.vue
+++ b/packages/ui/src/components/modal/UnknownFileWarningModal.vue
@@ -86,17 +86,13 @@
 			/>
 
 			<div class="flex items-center gap-2">
-				<ButtonStyled type="transparent" color="orange">
-					<button type="button" @click="continueInstallation">
-						{{ formatMessage(messages.installAnyway) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="brand">
-					<button type="button" @click="cancelInstallation">
-						<BanIcon aria-hidden="true" />
-						{{ formatMessage(messages.dontInstall) }}
-					</button>
-				</ButtonStyled>
+				<Button type="quiet" color="orange" native-type="button" @click="continueInstallation">
+					{{ formatMessage(messages.installAnyway) }}
+				</Button>
+				<Button type="colored" color="brand" native-type="button" @click="cancelInstallation">
+					<BanIcon aria-hidden="true" />
+					{{ formatMessage(messages.dontInstall) }}
+				</Button>
 			</div>
 		</div>
 	</NewModal>
@@ -106,10 +102,11 @@
 import { BanIcon } from '@modrinth/assets'
 import { computed, nextTick, ref, useTemplateRef } from 'vue'
 
+import { Button } from '#ui/components/base/buttons'
+
 import { defineMessages, useVIntl } from '../../composables/i18n'
 import { useScrollIndicator } from '../../composables/scroll-indicator'
 import Admonition from '../base/Admonition.vue'
-import ButtonStyled from '../base/ButtonStyled.vue'
 import Checkbox from '../base/Checkbox.vue'
 import Table, { type TableColumn } from '../base/Table.vue'
 import NewModal from './NewModal.vue'
diff --git a/packages/ui/src/components/nav/NotificationPanel.vue b/packages/ui/src/components/nav/NotificationPanel.vue
index 95626d907e..0f0a592d53 100644
--- a/packages/ui/src/components/nav/NotificationPanel.vue
+++ b/packages/ui/src/components/nav/NotificationPanel.vue
@@ -59,22 +59,27 @@
 							<div v-if="item.count && item.count > 1" class="text-xs font-bold text-contrast">
 								x{{ item.count }}
 							</div>
-							<ButtonStyled v-if="item.copyable !== false" circular size="small">
-								<button
-									v-tooltip="
-										item.supportData ? 'Copy error details for support' : 'Copy to clipboard'
-									"
-									@click="copyToClipboard(item)"
-								>
-									<CheckIcon v-if="copied[getCopyKey(item)]" />
-									<CopyIcon v-else />
-								</button>
-							</ButtonStyled>
-							<ButtonStyled v-if="item.dismissible !== false" circular size="small">
-								<button v-tooltip="`Dismiss`" @click="dismissNotification(index)">
-									<XIcon />
-								</button>
-							</ButtonStyled>
+							<IconButton
+								v-if="item.copyable !== false"
+								v-tooltip="
+									item.supportData ? 'Copy error details for support' : 'Copy to clipboard'
+								"
+								size="xs"
+								:label="item.supportData ? 'Copy error details for support' : 'Copy to clipboard'"
+								@click="copyToClipboard(item)"
+							>
+								<CheckIcon v-if="copied[getCopyKey(item)]" />
+								<CopyIcon v-else />
+							</IconButton>
+							<IconButton
+								v-if="item.dismissible !== false"
+								v-tooltip="`Dismiss`"
+								size="xs"
+								:label="`Dismiss`"
+								@click="dismissNotification(index)"
+							>
+								<XIcon />
+							</IconButton>
 						</div>
 						<div v-if="item.type !== 'neutral'"></div>
 						<div
@@ -90,16 +95,22 @@
 						</template>
 						<template v-if="item.buttons?.length">
 							<div class="col-span-2 flex flex-wrap gap-1.5 pt-1">
-								<ButtonStyled
+								<Button
 									v-for="(button, buttonIndex) in item.buttons"
 									:key="buttonIndex"
-									:color="button.color"
+									:type="button.color && button.color !== 'standard' ? 'colored' : 'base'"
+									:color="
+										button.color && button.color !== 'standard'
+											? button.color === 'medal-promo'
+												? 'medal_promotion'
+												: button.color
+											: undefined
+									"
+									@click="handleButtonClick(item, button)"
 								>
-									<button class="!shadow-none" @click="handleButtonClick(item, button)">
-										<component :is="button.icon" v-if="button.icon" />
-										{{ button.label }}
-									</button>
-								</ButtonStyled>
+									<component :is="button.icon" v-if="button.icon" />
+									{{ button.label }}
+								</Button>
 							</div>
 						</template>
 					</div>
@@ -121,6 +132,7 @@ import {
 } from '@modrinth/assets'
 import { computed, onBeforeUnmount, onMounted, ref } from 'vue'
 
+import { Button, IconButton } from '#ui/components/base/buttons'
 import { useModalStack } from '#ui/composables/modal-stack.ts'
 
 import {
@@ -128,7 +140,6 @@ import {
 	type WebNotification,
 	type WebNotificationButton,
 } from '../../providers'
-import ButtonStyled from '../base/ButtonStyled.vue'
 
 const notificationManager = injectNotificationManager()
 const notifications = computed<WebNotification[]>(() => notificationManager.getNotifications())
diff --git a/packages/ui/src/components/nav/PopupNotificationPanel.vue b/packages/ui/src/components/nav/PopupNotificationPanel.vue
index 49c55ccd58..da57f93c20 100644
--- a/packages/ui/src/components/nav/PopupNotificationPanel.vue
+++ b/packages/ui/src/components/nav/PopupNotificationPanel.vue
@@ -95,11 +95,15 @@
 									</div>
 								</template>
 							</div>
-							<ButtonStyled v-if="item.dismissible !== false" type="transparent" circular>
-								<button class="-m-1.5" @click="dismiss(item.id)">
-									<XIcon />
-								</button>
-							</ButtonStyled>
+							<IconButton
+								v-if="item.dismissible !== false"
+								type="quiet"
+								label="Close"
+								class="-m-1.5"
+								@click="dismiss(item.id)"
+							>
+								<XIcon />
+							</IconButton>
 						</div>
 						<span v-if="item.text" class="text-primary">
 							{{ item.text }}
@@ -142,16 +146,28 @@
 						full-width
 					/>
 					<div v-if="item.buttons?.length" class="flex gap-1.5">
-						<ButtonStyled
+						<Button
 							v-for="(btn, idx) in item.buttons"
 							:key="idx"
-							:color="btn.color || (idx === 0 ? 'brand' : undefined)"
+							:type="
+								(btn.color || (idx === 0 ? 'brand' : undefined)) &&
+								(btn.color || (idx === 0 ? 'brand' : undefined)) !== 'standard'
+									? 'colored'
+									: 'base'
+							"
+							:color="
+								(btn.color || (idx === 0 ? 'brand' : undefined)) &&
+								(btn.color || (idx === 0 ? 'brand' : undefined)) !== 'standard'
+									? (btn.color || (idx === 0 ? 'brand' : undefined)) === 'medal-promo'
+										? 'medal_promotion'
+										: btn.color || (idx === 0 ? 'brand' : undefined)
+									: undefined
+							"
+							@click="handleButtonClick(item.id, btn)"
 						>
-							<button class="!shadow-none" @click="handleButtonClick(item.id, btn)">
-								<component :is="btn.icon" v-if="btn.icon" />
-								{{ btn.label }}
-							</button>
-						</ButtonStyled>
+							<component :is="btn.icon" v-if="btn.icon" />
+							{{ btn.label }}
+						</Button>
 					</div>
 				</div>
 			</div>
@@ -171,6 +187,8 @@ import {
 } from '@modrinth/assets'
 import { computed, ref } from 'vue'
 
+import { Button, IconButton } from '#ui/components/base/buttons'
+
 import { useModalStack } from '../../composables/modal-stack'
 import {
 	injectPopupNotificationManager,
@@ -178,7 +196,6 @@ import {
 	type PopupNotificationButton,
 	type PopupNotificationProgressItem,
 } from '../../providers'
-import ButtonStyled from '../base/ButtonStyled.vue'
 import ProgressBar from '../base/ProgressBar.vue'
 import NotificationToast from '../notifications/NotificationToast.vue'
 
diff --git a/packages/ui/src/components/notifications/NotificationToast.vue b/packages/ui/src/components/notifications/NotificationToast.vue
index 185fee06d7..82169e0044 100644
--- a/packages/ui/src/components/notifications/NotificationToast.vue
+++ b/packages/ui/src/components/notifications/NotificationToast.vue
@@ -49,31 +49,33 @@
 							</template>
 						</template>
 					</p>
-					<ButtonStyled v-if="dismissible" size="small" type="transparent" circular>
-						<button
-							type="button"
-							class="notification-toast-dismiss"
-							aria-label="Dismiss notification"
-							@click="$emit('dismiss')"
-						>
-							<XIcon />
-						</button>
-					</ButtonStyled>
+					<IconButton
+						v-if="dismissible"
+						type="quiet"
+						size="xs"
+						label="Dismiss notification"
+						native-type="button"
+						class="notification-toast-dismiss !size-6"
+						@click="$emit('dismiss')"
+					>
+						<XIcon />
+					</IconButton>
 				</div>
 				<div class="flex items-center gap-2">
-					<ButtonStyled color="brand">
-						<button :disabled="actionLoading != null" @click="$emit('accept')">
-							<SpinnerIcon v-if="actionLoading === 'accept'" class="animate-spin" />
-							<CheckIcon v-else />
-							Accept
-						</button>
-					</ButtonStyled>
-					<ButtonStyled type="outlined">
-						<button :disabled="actionLoading != null" @click="$emit('decline')">
-							<XIcon />
-							Decline
-						</button>
-					</ButtonStyled>
+					<Button
+						type="colored"
+						color="brand"
+						:disabled="actionLoading != null"
+						@click="$emit('accept')"
+					>
+						<SpinnerIcon v-if="actionLoading === 'accept'" class="animate-spin" />
+						<CheckIcon v-else />
+						Accept
+					</Button>
+					<Button type="outlined" :disabled="actionLoading != null" @click="$emit('decline')">
+						<XIcon />
+						Decline
+					</Button>
 				</div>
 			</div>
 		</div>
@@ -96,16 +98,17 @@
 					{{ entityLabel }}
 				</p>
 				<div class="col-start-2 row-start-1 justify-self-end">
-					<ButtonStyled v-if="dismissible" size="small" type="transparent" circular>
-						<button
-							type="button"
-							class="notification-toast-dismiss"
-							aria-label="Dismiss notification"
-							@click="$emit('dismiss')"
-						>
-							<XIcon />
-						</button>
-					</ButtonStyled>
+					<IconButton
+						v-if="dismissible"
+						type="quiet"
+						size="xs"
+						label="Dismiss notification"
+						native-type="button"
+						class="notification-toast-dismiss !size-6"
+						@click="$emit('dismiss')"
+					>
+						<XIcon />
+					</IconButton>
 				</div>
 				<div
 					class="col-start-1 col-end-3 row-start-2 flex min-w-0 items-center justify-between gap-0.5"
@@ -130,12 +133,8 @@
 					class="col-start-1 col-end-3 row-start-3 mt-2 flex min-w-0 items-center justify-between gap-2"
 				>
 					<div class="flex min-w-0 items-center gap-2">
-						<ButtonStyled color="brand">
-							<button @click="$emit('launch')">Launch game</button>
-						</ButtonStyled>
-						<ButtonStyled type="outlined">
-							<button @click="$emit('open-instance')">Instance</button>
-						</ButtonStyled>
+						<Button type="colored" color="brand" @click="$emit('launch')">Launch game</Button>
+						<Button type="outlined" @click="$emit('open-instance')">Instance</Button>
 					</div>
 					<div v-if="progressLabel" class="notification-inline-progress-label flex-none">
 						{{ progressLabel }}
@@ -145,16 +144,28 @@
 					v-if="type === 'instance-download' && actions?.length"
 					class="col-start-1 col-end-3 row-start-3 mt-2 flex min-w-0 flex-wrap items-center gap-2"
 				>
-					<ButtonStyled
+					<Button
 						v-for="(action, index) in actions"
 						:key="index"
-						:color="action.color || (index === 0 ? 'brand' : undefined)"
+						:type="
+							(action.color || (index === 0 ? 'brand' : undefined)) &&
+							(action.color || (index === 0 ? 'brand' : undefined)) !== 'standard'
+								? 'colored'
+								: 'base'
+						"
+						:color="
+							(action.color || (index === 0 ? 'brand' : undefined)) &&
+							(action.color || (index === 0 ? 'brand' : undefined)) !== 'standard'
+								? (action.color || (index === 0 ? 'brand' : undefined)) === 'medal-promo'
+									? 'medal_promotion'
+									: action.color || (index === 0 ? 'brand' : undefined)
+								: undefined
+						"
+						@click="$emit('action', index)"
 					>
-						<button class="!shadow-none" @click="$emit('action', index)">
-							<component :is="action.icon" v-if="action.icon" />
-							{{ action.label }}
-						</button>
-					</ButtonStyled>
+						<component :is="action.icon" v-if="action.icon" />
+						{{ action.label }}
+					</Button>
 				</div>
 			</div>
 		</div>
@@ -182,11 +193,12 @@
 import { CheckIcon, SpinnerIcon, XIcon } from '@modrinth/assets'
 import { computed, ref } from 'vue'
 
+import { Button, IconButton } from '#ui/components/base/buttons'
+
 import { useFormatBytes, useFormatNumber } from '../../composables'
 import type { PopupNotificationButton, PopupNotificationProgressType } from '../../providers'
 import { truncatedTooltip } from '../../utils/truncate'
 import Avatar from '../base/Avatar.vue'
-import ButtonStyled from '../base/ButtonStyled.vue'
 
 type NotificationToastType =
 	| 'friend-request'
diff --git a/packages/ui/src/components/page/NormalPage.vue b/packages/ui/src/components/page/NormalPage.vue
index ce3f0e1689..3acc18993e 100644
--- a/packages/ui/src/components/page/NormalPage.vue
+++ b/packages/ui/src/components/page/NormalPage.vue
@@ -3,6 +3,7 @@ import { injectPageContext } from '@modrinth/ui'
 
 defineProps<{
 	sidebar?: 'right' | 'left'
+	fullWidth?: boolean
 }>()
 const { hierarchicalSidebarAvailable } = injectPageContext()
 </script>
@@ -12,6 +13,7 @@ const { hierarchicalSidebarAvailable } = injectPageContext()
 		:class="{
 			'ui-normal-page--sidebar-left': sidebar === 'left' && !hierarchicalSidebarAvailable,
 			'ui-normal-page--sidebar-right': sidebar === 'right' && !hierarchicalSidebarAvailable,
+			'ui-normal-page--full-width': fullWidth,
 		}"
 	>
 		<div class="ui-normal-page__header">
@@ -46,6 +48,10 @@ const { hierarchicalSidebarAvailable } = injectPageContext()
 		/ 100%;
 }
 
+.ui-normal-page--full-width {
+	width: calc(100% - 2rem);
+}
+
 @media (width >= 64rem) {
 	.ui-normal-page--sidebar-left {
 		grid-template:
diff --git a/packages/ui/src/components/project/ProjectPageVersions.vue b/packages/ui/src/components/project/ProjectPageVersions.vue
index 012fea3115..0dfffebdba 100644
--- a/packages/ui/src/components/project/ProjectPageVersions.vue
+++ b/packages/ui/src/components/project/ProjectPageVersions.vue
@@ -9,9 +9,14 @@
 				@update:query="updateQuery"
 			/>
 
-			<ButtonStyled v-if="openModal" :color="createVersionButtonSecondary ? 'standard' : 'green'">
-				<button @click="openModal"><PlusIcon /> Create version</button>
-			</ButtonStyled>
+			<Button
+				v-if="openModal"
+				:type="createVersionButtonSecondary ? 'base' : 'colored'"
+				:color="createVersionButtonSecondary ? undefined : 'green'"
+				@click="openModal"
+			>
+				<PlusIcon /> Create version
+			</Button>
 
 			<Pagination
 				v-if="!openModal"
@@ -445,7 +450,6 @@ import {
 } from '@modrinth/assets'
 import {
 	AutoLink,
-	ButtonStyled,
 	Pagination,
 	SmartClickable,
 	Table,
@@ -462,6 +466,8 @@ import { Menu } from 'floating-vue'
 import { computed, type Ref, ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 
+import { Button } from '#ui/components/base/buttons'
+
 import { useRelativeTime } from '../../composables'
 import { defineMessages, useVIntl } from '../../composables/i18n'
 import { formatTag } from '../../utils/tag-messages'
diff --git a/packages/ui/src/components/project/server/ServerModpackContentCard.vue b/packages/ui/src/components/project/server/ServerModpackContentCard.vue
index bc29556cc8..1d25e4b6c0 100644
--- a/packages/ui/src/components/project/server/ServerModpackContentCard.vue
+++ b/packages/ui/src/components/project/server/ServerModpackContentCard.vue
@@ -29,20 +29,25 @@
 				</div>
 			</div>
 		</div>
-		<ButtonStyled v-if="onclickDownload" circular type="transparent">
-			<button v-tooltip="formatMessage(messages.downloadModpack)" @click="onclickDownload">
-				<DownloadIcon />
-			</button>
-		</ButtonStyled>
+		<IconButton
+			v-if="onclickDownload"
+			v-tooltip="formatMessage(messages.downloadModpack)"
+			type="quiet"
+			:label="formatMessage(messages.downloadModpack)"
+			@click="onclickDownload"
+		>
+			<DownloadIcon />
+		</IconButton>
 	</div>
 </template>
 
 <script setup lang="ts">
 import { DownloadIcon } from '@modrinth/assets/generated-icons'
 
+import { IconButton } from '#ui/components/base/buttons'
+
 import { defineMessages, useVIntl } from '../../../composables'
 import Avatar from '../../base/Avatar.vue'
-import ButtonStyled from '../../base/ButtonStyled.vue'
 
 defineProps<{
 	name: string
diff --git a/packages/ui/src/components/project/settings/environment/ProjectEnvironmentModal.vue b/packages/ui/src/components/project/settings/environment/ProjectEnvironmentModal.vue
index ece84e39da..60eefab19d 100644
--- a/packages/ui/src/components/project/settings/environment/ProjectEnvironmentModal.vue
+++ b/packages/ui/src/components/project/settings/environment/ProjectEnvironmentModal.vue
@@ -8,19 +8,25 @@
 		</div>
 		<template #actions>
 			<div v-if="canSave" class="flex justify-end gap-2 mt-2">
-				<ButtonStyled v-if="canReset" type="transparent">
-					<button :disabled="saving || !hasChanges" @click="resetEnvironment">
-						<HistoryIcon /> {{ formatMessage(commonMessages.resetButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="brand">
-					<button :disabled="saving || !hasChanges" @click="saveEnvironment">
-						<SpinnerIcon v-if="saving" class="animate-spin" />
-						<CheckIcon v-else-if="needsToVerify" />
-						<SaveIcon v-else />
-						{{ saveButtonLabel }}
-					</button>
-				</ButtonStyled>
+				<Button
+					v-if="canReset"
+					type="quiet"
+					:disabled="saving || !hasChanges"
+					@click="resetEnvironment"
+				>
+					<HistoryIcon /> {{ formatMessage(commonMessages.resetButton) }}
+				</Button>
+				<Button
+					type="colored"
+					color="brand"
+					:disabled="saving || !hasChanges"
+					@click="saveEnvironment"
+				>
+					<SpinnerIcon v-if="saving" class="animate-spin" />
+					<CheckIcon v-else-if="needsToVerify" />
+					<SaveIcon v-else />
+					{{ saveButtonLabel }}
+				</Button>
 			</div>
 		</template>
 	</NewModal>
@@ -31,10 +37,10 @@ import { CheckIcon, HistoryIcon, SaveIcon, SpinnerIcon } from '@modrinth/assets'
 import { computed, onMounted, unref, useTemplateRef } from 'vue'
 import { useRoute } from 'vue-router'
 
+import { Button } from '#ui/components/base/buttons'
 import { defineMessages, useVIntl } from '#ui/composables/i18n'
 
 import { commonMessages } from '../../../../utils/common-messages'
-import ButtonStyled from '../../../base/ButtonStyled.vue'
 import { NewModal } from '../../../modal'
 import EnvironmentMigration from './EnvironmentMigration.vue'
 
diff --git a/packages/ui/src/components/search/SearchSidebarFilter.vue b/packages/ui/src/components/search/SearchSidebarFilter.vue
index ce9b8c40ec..bdf135bdfc 100644
--- a/packages/ui/src/components/search/SearchSidebarFilter.vue
+++ b/packages/ui/src/components/search/SearchSidebarFilter.vue
@@ -54,19 +54,17 @@
 				<p class="m-0 text-secondary text-sm">
 					{{ formatMessage(messages.lockedDescription) }}
 				</p>
-				<ButtonStyled>
-					<button
-						class="w-fit"
-						@click="
-							() => {
-								overriddenProvidedFilterTypes.push(filterType.id)
-							}
-						"
-					>
-						<LockOpenIcon />
-						{{ formatMessage(messages.unlockFilterButton) }}
-					</button>
-				</ButtonStyled>
+				<Button
+					class="w-fit"
+					@click="
+						() => {
+							overriddenProvidedFilterTypes.push(filterType.id)
+						}
+					"
+				>
+					<LockOpenIcon />
+					{{ formatMessage(messages.unlockFilterButton) }}
+				</Button>
 			</div>
 		</template>
 		<template v-else #default>
@@ -157,25 +155,23 @@
 					@update:model-value="toggleGroup(group.id)"
 				/>
 				<div v-if="hasProvidedFilter" class="mt-2 mx-1">
-					<ButtonStyled>
-						<button
-							class="w-fit"
-							@click="
-								() => {
-									overriddenProvidedFilterTypes = overriddenProvidedFilterTypes.filter(
-										(id) => id !== filterType.id,
-									)
-									accordion?.close()
-									clearFilters()
-								}
-							"
-						>
-							<UpdatedIcon />
-							<slot name="sync-button">
-								{{ formatMessage(messages.syncFilterButton) }}
-							</slot>
-						</button>
-					</ButtonStyled>
+					<Button
+						class="w-fit"
+						@click="
+							() => {
+								overriddenProvidedFilterTypes = overriddenProvidedFilterTypes.filter(
+									(id) => id !== filterType.id,
+								)
+								accordion?.close()
+								clearFilters()
+							}
+						"
+					>
+						<UpdatedIcon />
+						<slot name="sync-button">
+							{{ formatMessage(messages.syncFilterButton) }}
+						</slot>
+					</Button>
 				</div>
 			</div>
 		</template>
@@ -186,10 +182,11 @@
 import { BanIcon, DropdownIcon, LockOpenIcon, SearchIcon, UpdatedIcon } from '@modrinth/assets'
 import { computed, ref } from 'vue'
 
+import { Button } from '#ui/components/base/buttons'
+
 import { defineMessages, useVIntl } from '../../composables/i18n'
 import type { FilterOption, FilterType, FilterValue } from '../../utils/search'
 import Accordion from '../base/Accordion.vue'
-import ButtonStyled from '../base/ButtonStyled.vue'
 import { Checkbox, ScrollablePanel, StyledInput } from '../index'
 import SearchFilterGroup from './SearchFilterGroup.vue'
 import SearchFilterOption from './SearchFilterOption.vue'
diff --git a/packages/ui/src/components/servers/InstallingBanner.vue b/packages/ui/src/components/servers/InstallingBanner.vue
index cf8a901019..60eb456b61 100644
--- a/packages/ui/src/components/servers/InstallingBanner.vue
+++ b/packages/ui/src/components/servers/InstallingBanner.vue
@@ -27,18 +27,17 @@
 			</div>
 		</div>
 		<template v-if="contentError" #top-right-actions>
-			<ButtonStyled color="red" type="outlined">
-				<button
-					v-tooltip="retryDisabled ? retryDisabledTooltip : undefined"
-					class="!border"
-					type="button"
-					:disabled="retryDisabled"
-					@click="emit('retry')"
-				>
-					<RotateCounterClockwiseIcon class="size-5" />
-					{{ formatMessage(commonMessages.retryButton) }}
-				</button>
-			</ButtonStyled>
+			<Button
+				v-tooltip="retryDisabled ? retryDisabledTooltip : undefined"
+				type="outlined"
+				class="!border !text-red [&>svg]:!text-red !shadow-[inset_0_0_0_1px_var(--color-red)]"
+				native-type="button"
+				:disabled="retryDisabled"
+				@click="emit('retry')"
+			>
+				<RotateCounterClockwiseIcon class="size-5" />
+				{{ formatMessage(commonMessages.retryButton) }}
+			</Button>
 		</template>
 	</Admonition>
 </template>
@@ -47,11 +46,11 @@
 import { RotateCounterClockwiseIcon } from '@modrinth/assets'
 import { computed, onMounted, onUnmounted, ref } from 'vue'
 
+import { Button } from '#ui/components/base/buttons'
 import { defineMessages, useVIntl } from '#ui/composables/i18n'
 import { commonMessages } from '#ui/utils/common-messages'
 
 import Admonition from '../base/Admonition.vue'
-import ButtonStyled from '../base/ButtonStyled.vue'
 
 export interface SyncProgress {
 	phase: 'Analyzing' | 'InstallingPack' | 'InstallingLoader' | 'Addons'
diff --git a/packages/ui/src/components/servers/SaveBanner.vue b/packages/ui/src/components/servers/SaveBanner.vue
index afc753fe51..3f4eb45b6f 100644
--- a/packages/ui/src/components/servers/SaveBanner.vue
+++ b/packages/ui/src/components/servers/SaveBanner.vue
@@ -3,22 +3,29 @@
 		<FloatingActionBar :shown="props.isVisible">
 			<p class="m-0 font-semibold text-sm md:text-base">You have unsaved changes.</p>
 			<div class="ml-auto flex gap-2">
-				<ButtonStyled type="transparent">
-					<button :disabled="props.isUpdating" @click="props.reset"><HistoryIcon /> Reset</button>
-				</ButtonStyled>
-				<ButtonStyled :color="props.restart ? 'standard' : 'brand'">
-					<button :disabled="props.isUpdating" @click="props.save">
-						<SpinnerIcon v-if="props.isUpdating" class="animate-spin" />
-						<SaveIcon v-else />
-						{{ props.isUpdating ? 'Saving...' : 'Save' }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled v-if="props.restart" color="brand">
-					<button :disabled="props.isUpdating || isTransitioning" @click="saveAndPower">
-						<SpinnerIcon v-if="props.isUpdating || isTransitioning" class="animate-spin" />
-						{{ powerButtonLabel }}
-					</button>
-				</ButtonStyled>
+				<Button type="quiet" :disabled="props.isUpdating" @click="props.reset"
+					><HistoryIcon /> Reset</Button
+				>
+				<Button
+					:type="props.restart ? 'base' : 'colored'"
+					:color="props.restart ? undefined : 'brand'"
+					:disabled="props.isUpdating"
+					@click="props.save"
+				>
+					<SpinnerIcon v-if="props.isUpdating" class="animate-spin" />
+					<SaveIcon v-else />
+					{{ props.isUpdating ? 'Saving...' : 'Save' }}
+				</Button>
+				<Button
+					v-if="props.restart"
+					type="colored"
+					color="brand"
+					:disabled="props.isUpdating || isTransitioning"
+					@click="saveAndPower"
+				>
+					<SpinnerIcon v-if="props.isUpdating || isTransitioning" class="animate-spin" />
+					{{ powerButtonLabel }}
+				</Button>
 			</div>
 		</FloatingActionBar>
 	</Teleport>
@@ -28,7 +35,7 @@
 import { HistoryIcon, SaveIcon, SpinnerIcon } from '@modrinth/assets'
 import { computed } from 'vue'
 
-import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
+import { Button } from '#ui/components/base/buttons'
 import FloatingActionBar from '#ui/components/base/FloatingActionBar.vue'
 import { injectModrinthClient, injectModrinthServerContext } from '#ui/providers'
 
diff --git a/packages/ui/src/components/servers/ServerListing.vue b/packages/ui/src/components/servers/ServerListing.vue
index fbfe10d460..f1c12c15d8 100644
--- a/packages/ui/src/components/servers/ServerListing.vue
+++ b/packages/ui/src/components/servers/ServerListing.vue
@@ -183,46 +183,53 @@
 			</div>
 
 			<div v-if="noticeButtons" class="flex gap-2">
-				<ButtonStyled
+				<IconButton
 					v-if="noticeButtons.downloadBackup && onDownloadBackup && isBackupDownloadEnabled"
+					v-tooltip="formatMessage(messages.downloadLatestBackupTooltip)"
 					type="outlined"
-					circular
+					:label="formatMessage(messages.downloadLatestBackupTooltip)"
+					data-server-listing-button
+					@click="onDownloadBackup"
 				>
-					<button
-						v-tooltip="formatMessage(messages.downloadLatestBackupTooltip)"
-						data-server-listing-button
-						@click="onDownloadBackup"
-					>
-						<DownloadIcon />
-					</button>
-				</ButtonStyled>
-				<ButtonStyled v-if="noticeButtons.copyId" type="outlined">
-					<button
-						v-tooltip="formatMessage(messages.copyCodeToClipboardTooltip)"
-						data-server-listing-button
-						@click="copyToClipboard(server_id)"
-					>
-						<template v-if="copied">
-							{{ formatMessage(messages.copiedLabel) }} <CheckIcon class="text-green" />
-						</template>
-						<template v-else> {{ formatMessage(messages.copyIdLabel) }} <CopyIcon /> </template>
-					</button>
-				</ButtonStyled>
-				<ButtonStyled v-if="noticeButtons.support">
-					<a href="https://support.modrinth.com/en/" target="_blank" data-server-listing-button
-						><MessagesSquareIcon /> {{ formatMessage(messages.supportLabel) }}
-					</a>
-				</ButtonStyled>
-				<ButtonStyled v-if="noticeButtons.manageBilling" color="brand">
-					<AutoLink :to="`/settings/billing#server-${server_id}`" data-server-listing-button>
-						<CardIcon /> {{ formatMessage(messages.manageBillingLabel) }}
-					</AutoLink>
-				</ButtonStyled>
-				<ButtonStyled v-if="noticeButtons.resubscribe && onResubscribe" color="brand">
-					<button data-server-listing-button @click="onResubscribe">
-						<RotateCounterClockwiseIcon /> {{ formatMessage(messages.resubscribeLabel) }}
-					</button>
-				</ButtonStyled>
+					<DownloadIcon />
+				</IconButton>
+				<Button
+					v-if="noticeButtons.copyId"
+					v-tooltip="formatMessage(messages.copyCodeToClipboardTooltip)"
+					type="outlined"
+					data-server-listing-button
+					@click="copyToClipboard(server_id)"
+				>
+					<template v-if="copied">
+						{{ formatMessage(messages.copiedLabel) }} <CheckIcon class="text-green" />
+					</template>
+					<template v-else> {{ formatMessage(messages.copyIdLabel) }} <CopyIcon /> </template>
+				</Button>
+				<ButtonLink
+					v-if="noticeButtons.support"
+					href="https://support.modrinth.com/en/"
+					target="_blank"
+					data-server-listing-button
+					><MessagesSquareIcon /> {{ formatMessage(messages.supportLabel) }}
+				</ButtonLink>
+				<ButtonLink
+					v-if="noticeButtons.manageBilling"
+					type="colored"
+					color="brand"
+					:to="`/settings/billing#server-${server_id}`"
+					data-server-listing-button
+				>
+					<CardIcon /> {{ formatMessage(messages.manageBillingLabel) }}
+				</ButtonLink>
+				<Button
+					v-if="noticeButtons.resubscribe && onResubscribe"
+					type="colored"
+					color="brand"
+					data-server-listing-button
+					@click="onResubscribe"
+				>
+					<RotateCounterClockwiseIcon /> {{ formatMessage(messages.resubscribeLabel) }}
+				</Button>
 			</div>
 		</div>
 
@@ -261,11 +268,12 @@ import {
 	SparklesIcon,
 	SpinnerIcon,
 } from '@modrinth/assets'
-import { AutoLink, ButtonStyled } from '@modrinth/ui'
 import { useQuery } from '@tanstack/vue-query'
 import { computed, ref } from 'vue'
 import { useRouter } from 'vue-router'
 
+import { Button, ButtonLink, IconButton } from '#ui/components/base/buttons'
+
 import {
 	CardIcon,
 	CheckIcon,
diff --git a/packages/ui/src/components/servers/ServersPromo.vue b/packages/ui/src/components/servers/ServersPromo.vue
index ef3990a3f2..0268ff48c9 100644
--- a/packages/ui/src/components/servers/ServersPromo.vue
+++ b/packages/ui/src/components/servers/ServersPromo.vue
@@ -1,8 +1,7 @@
 <script setup lang="ts">
 import { ModrinthIcon, RightArrowIcon, XIcon } from '@modrinth/assets'
 
-import AutoLink from '../base/AutoLink.vue'
-import ButtonStyled from '../base/ButtonStyled.vue'
+import { ButtonLink, IconButton } from '#ui/components/base/buttons'
 
 const emit = defineEmits<{
 	(e: 'close'): void
@@ -36,16 +35,21 @@ withDefaults(
 			<span class="text-sm font-medium">Create a server with Modrinth in just a few clicks.</span>
 		</div>
 		<div class="flex flex-col items-end justify-end z-10">
-			<ButtonStyled color="brand">
-				<AutoLink :to="link"> View plans <RightArrowIcon /> </AutoLink>
-			</ButtonStyled>
+			<ButtonLink type="colored" color="brand" :to="link">
+				View plans <RightArrowIcon />
+			</ButtonLink>
 		</div>
 		<div class="absolute top-2 right-2 z-10">
-			<ButtonStyled v-if="closable" size="small" circular>
-				<button v-tooltip="`Don't show again`" @click="emit('close')">
-					<XIcon aria-hidden="true" />
-				</button>
-			</ButtonStyled>
+			<IconButton
+				v-if="closable"
+				v-tooltip="`Don't show again`"
+				class="!size-6"
+				size="xs"
+				:label="`Don't show again`"
+				@click="emit('close')"
+			>
+				<XIcon aria-hidden="true" />
+			</IconButton>
 		</div>
 	</div>
 </template>
diff --git a/packages/ui/src/components/servers/access/AccessTable.vue b/packages/ui/src/components/servers/access/AccessTable.vue
index fad5a8fe35..2a88cd322a 100644
--- a/packages/ui/src/components/servers/access/AccessTable.vue
+++ b/packages/ui/src/components/servers/access/AccessTable.vue
@@ -74,29 +74,28 @@
 
 		<template #cell-actions="{ row: member }">
 			<div v-if="!member.isOwner" class="flex items-center justify-end gap-1">
-				<ButtonStyled v-if="member.pending" circular type="transparent">
-					<button
-						v-tooltip="resendInviteTooltip(member)"
-						:aria-label="resendInviteLabel(member)"
-						:disabled="resendInviteDisabled(member)"
-						class="text-secondary hover:!filter-none hover:text-contrast focus-visible:!filter-none active:!scale-100 active:!filter-none disabled:cursor-not-allowed disabled:opacity-50 disabled:hover:text-secondary"
-						@click="handleResendInvite(member)"
-					>
-						<SendIcon aria-hidden="true" />
-					</button>
-				</ButtonStyled>
-				<ButtonStyled circular type="transparent">
-					<button
-						v-tooltip="memberAccessActionTooltip(member)"
-						:aria-label="memberAccessActionLabel(member)"
-						:disabled="!canManageUsers"
-						class="text-secondary hover:!filter-none hover:text-red focus-visible:!filter-none active:!scale-100 active:!filter-none disabled:cursor-not-allowed disabled:opacity-50 disabled:hover:text-secondary"
-						@click="member.pending ? handleCancelInvite(member) : handleRemoveMember(member)"
-					>
-						<XIcon v-if="member.pending" aria-hidden="true" />
-						<UserXIcon v-else aria-hidden="true" />
-					</button>
-				</ButtonStyled>
+				<IconButton
+					v-if="member.pending"
+					v-tooltip="resendInviteTooltip(member)"
+					type="quiet"
+					:label="resendInviteLabel(member)"
+					:disabled="resendInviteDisabled(member)"
+					class="text-secondary hover:!filter-none hover:text-contrast focus-visible:!filter-none active:!scale-100 active:!filter-none disabled:cursor-not-allowed disabled:opacity-50 disabled:hover:text-secondary"
+					@click="handleResendInvite(member)"
+				>
+					<SendIcon aria-hidden="true" />
+				</IconButton>
+				<IconButton
+					v-tooltip="memberAccessActionTooltip(member)"
+					type="quiet"
+					:label="memberAccessActionLabel(member)"
+					:disabled="!canManageUsers"
+					class="text-secondary hover:!filter-none hover:text-red focus-visible:!filter-none active:!scale-100 active:!filter-none disabled:cursor-not-allowed disabled:opacity-50 disabled:hover:text-secondary"
+					@click="member.pending ? handleCancelInvite(member) : handleRemoveMember(member)"
+				>
+					<XIcon v-if="member.pending" aria-hidden="true" />
+					<UserXIcon v-else aria-hidden="true" />
+				</IconButton>
 			</div>
 		</template>
 	</Table>
@@ -223,29 +222,30 @@
 				<span v-else>{{ formatMessage(messages.unknownJoinedDate) }}</span>
 			</div>
 			<div class="flex min-w-0 items-center justify-end pr-4">
-				<ButtonStyled v-if="!member.isOwner" circular type="transparent">
-					<TeleportOverflowMenu
-						:options="memberActionOptions(member)"
-						btn-class="hover:!filter-none focus-visible:!filter-none active:!scale-100 active:!filter-none"
-					>
-						<MoreVerticalIcon aria-hidden="true" class="size-5" />
-						<span class="sr-only">
-							{{ formatMessage(messages.memberActionsLabel, { username: member.user.username }) }}
-						</span>
-						<template #resend-invite>
-							<SendIcon aria-hidden="true" />
-							{{ resendInviteLabel(member) }}
-						</template>
-						<template #cancel-invite>
-							<XIcon aria-hidden="true" />
-							{{ formatMessage(messages.cancelInvite) }}
-						</template>
-						<template #remove-user>
-							<UserXIcon aria-hidden="true" />
-							{{ formatMessage(messages.removeUser) }}
-						</template>
-					</TeleportOverflowMenu>
-				</ButtonStyled>
+				<TeleportOverflowMenu
+					v-if="!member.isOwner"
+					type="quiet"
+					:label="formatMessage(messages.memberActionsLabel, { username: member.user.username })"
+					:options="memberActionOptions(member)"
+					class="hover:!filter-none focus-visible:!filter-none active:!scale-100 active:!filter-none"
+				>
+					<MoreVerticalIcon aria-hidden="true" class="size-5" />
+					<span class="sr-only">
+						{{ formatMessage(messages.memberActionsLabel, { username: member.user.username }) }}
+					</span>
+					<template #resend-invite>
+						<SendIcon aria-hidden="true" />
+						{{ resendInviteLabel(member) }}
+					</template>
+					<template #cancel-invite>
+						<XIcon aria-hidden="true" />
+						{{ formatMessage(messages.cancelInvite) }}
+					</template>
+					<template #remove-user>
+						<UserXIcon aria-hidden="true" />
+						{{ formatMessage(messages.removeUser) }}
+					</template>
+				</TeleportOverflowMenu>
 			</div>
 		</div>
 	</div>
@@ -284,17 +284,21 @@ import {
 	UserXIcon,
 	XIcon,
 } from '@modrinth/assets'
-import { type Component, computed, onMounted, onUnmounted, ref } from 'vue'
+import { computed, onMounted, onUnmounted, ref } from 'vue'
+
+import {
+	IconButton,
+	type OverflowMenuOption,
+	TeleportOverflowMenu,
+} from '#ui/components/base/buttons'
 
 import { useFormatDateTime, useRelativeTime } from '../../../composables'
 import { defineMessages, useVIntl } from '../../../composables/i18n'
 import { commonMessages } from '../../../utils/common-messages'
 import AutoLink from '../../base/AutoLink.vue'
 import Avatar from '../../base/Avatar.vue'
-import ButtonStyled from '../../base/ButtonStyled.vue'
 import Combobox, { type ComboboxOption } from '../../base/Combobox.vue'
 import Table, { type SortDirection, type TableColumn } from '../../base/Table.vue'
-import TeleportOverflowMenu from '../../base/TeleportOverflowMenu.vue'
 import type {
 	ServerAccessMember,
 	ServerAccessRole,
@@ -396,16 +400,6 @@ const messages = defineMessages({
 type AccessTableColumn = 'user' | 'role' | 'joined' | 'actions'
 type AccessTableSortableColumn = Exclude<AccessTableColumn, 'actions'>
 type AccessTableRow = ServerAccessMember & Record<string, unknown>
-type OverflowMenuOption = {
-	id: string
-	icon?: Component
-	action: () => void
-	shown?: boolean
-	color?: 'standard' | 'brand' | 'red' | 'orange' | 'green' | 'blue' | 'purple'
-	disabled?: boolean
-	tooltip?: string
-}
-
 const columns = computed<TableColumn<AccessTableColumn>[]>(() => [
 	{ key: 'user', label: formatMessage(messages.userColumn), width: '32%', enableSorting: true },
 	{ key: 'role', label: formatMessage(messages.roleColumn), width: '28%', enableSorting: true },
@@ -609,6 +603,7 @@ function memberActionOptions(member: ServerAccessMember): OverflowMenuOption[] {
 	return [
 		{
 			id: 'resend-invite',
+			label: resendInviteLabel(member),
 			icon: SendIcon,
 			action: () => handleResendInvite(member),
 			shown: member.pending,
@@ -617,18 +612,20 @@ function memberActionOptions(member: ServerAccessMember): OverflowMenuOption[] {
 		},
 		{
 			id: 'cancel-invite',
+			label: formatMessage(messages.cancelInvite),
 			icon: XIcon,
 			action: () => handleCancelInvite(member),
-			color: 'red',
+			tone: 'red',
 			shown: member.pending,
 			disabled: !canManageUsers.value,
 			tooltip: memberAccessActionTooltip(member),
 		},
 		{
 			id: 'remove-user',
+			label: formatMessage(messages.removeUser),
 			icon: UserXIcon,
 			action: () => handleRemoveMember(member),
-			color: 'red',
+			tone: 'red',
 			shown: !member.pending,
 			disabled: !canManageUsers.value,
 			tooltip: memberAccessActionTooltip(member),
diff --git a/packages/ui/src/components/servers/access/AuditLogTable.vue b/packages/ui/src/components/servers/access/AuditLogTable.vue
index 0a0f3bc6a0..7208df05a1 100644
--- a/packages/ui/src/components/servers/access/AuditLogTable.vue
+++ b/packages/ui/src/components/servers/access/AuditLogTable.vue
@@ -9,6 +9,7 @@
 				v-model:custom-start-date="timeframeCustomStartDate"
 				v-model:custom-end-date="timeframeCustomEndDate"
 				:class="timeframePickerClass"
+				trigger-size="lg"
 				:trigger-class="timeframePickerTriggerClass"
 			/>
 			<template v-if="slots.filters">
@@ -363,7 +364,7 @@ const timeframePickerClass = computed(() =>
 	slots.filters ? '!w-full @[640px]:!w-[225px] shrink-0' : '!w-full @[640px]:!w-[225px]',
 )
 const timeframePickerTriggerClass =
-	'!h-10 !min-h-10 !w-full !rounded-[14px] !bg-surface-4 !py-2.5 !pl-4 !pr-3 !text-base shadow-[0px_1px_1px_rgba(0,0,0,0.3),0px_1px_1.5px_rgba(0,0,0,0.15)]'
+	'!w-full !rounded-[14px] !bg-surface-4 !py-2.5 !pl-4 !pr-3 !text-base shadow-[0px_1px_1px_rgba(0,0,0,0.3),0px_1px_1.5px_rgba(0,0,0,0.15)]'
 
 onMounted(() => {
 	updateLoadMoreObserver()
diff --git a/packages/ui/src/components/servers/access/GrantAccessModal.vue b/packages/ui/src/components/servers/access/GrantAccessModal.vue
index 80a6b19c57..315e569c24 100644
--- a/packages/ui/src/components/servers/access/GrantAccessModal.vue
+++ b/packages/ui/src/components/servers/access/GrantAccessModal.vue
@@ -126,18 +126,20 @@
 
 		<template #actions>
 			<div class="flex justify-end gap-2">
-				<ButtonStyled type="outlined">
-					<button @click="hide">
-						<XIcon aria-hidden="true" />
-						{{ formatMessage(messages.cancelButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="brand">
-					<button v-tooltip="grantPermissionTooltip" :disabled="!canSubmit" @click="submit">
-						<UserPlusIcon aria-hidden="true" />
-						{{ formatMessage(messages.inviteButton) }}
-					</button>
-				</ButtonStyled>
+				<Button type="outlined" @click="hide">
+					<XIcon aria-hidden="true" />
+					{{ formatMessage(messages.cancelButton) }}
+				</Button>
+				<Button
+					v-tooltip="grantPermissionTooltip"
+					type="colored"
+					color="brand"
+					:disabled="!canSubmit"
+					@click="submit"
+				>
+					<UserPlusIcon aria-hidden="true" />
+					{{ formatMessage(messages.inviteButton) }}
+				</Button>
 			</div>
 		</template>
 	</NewModal>
@@ -148,10 +150,11 @@ import { EyeIcon, PencilIcon, UserPlusIcon, XIcon } from '@modrinth/assets'
 import { useDebounceFn } from '@vueuse/core'
 import { computed, ref } from 'vue'
 
+import { Button } from '#ui/components/base/buttons'
+
 import { defineMessages, useVIntl } from '../../../composables/i18n'
 import { commonMessages } from '../../../utils/common-messages'
 import Avatar from '../../base/Avatar.vue'
-import ButtonStyled from '../../base/ButtonStyled.vue'
 import Checkbox from '../../base/Checkbox.vue'
 import Combobox, { type ComboboxOption } from '../../base/Combobox.vue'
 import IntlFormatted from '../../base/IntlFormatted.vue'
diff --git a/packages/ui/src/components/servers/access/RemoveAccessModal.vue b/packages/ui/src/components/servers/access/RemoveAccessModal.vue
index e58dc2d634..77e397d051 100644
--- a/packages/ui/src/components/servers/access/RemoveAccessModal.vue
+++ b/packages/ui/src/components/servers/access/RemoveAccessModal.vue
@@ -62,21 +62,23 @@
 			</div>
 
 			<div class="flex justify-end gap-2 pt-1">
-				<ButtonStyled type="outlined">
-					<button class="!border !border-surface-5" @click="hide">
-						<XIcon aria-hidden="true" />
-						{{ formatMessage(commonMessages.cancelButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="orange">
-					<button v-tooltip="removePermissionTooltip" :disabled="!canRemove" @click="confirm">
-						<TrashIcon v-if="modalState.shouldCancel" aria-hidden="true" />
-						<UserXIcon v-else aria-hidden="true" />
-						{{
-							formatMessage(modalState.shouldCancel ? messages.cancelButton : messages.removeButton)
-						}}
-					</button>
-				</ButtonStyled>
+				<Button type="outlined" class="!border !border-surface-5" @click="hide">
+					<XIcon aria-hidden="true" />
+					{{ formatMessage(commonMessages.cancelButton) }}
+				</Button>
+				<Button
+					v-tooltip="removePermissionTooltip"
+					type="colored"
+					color="orange"
+					:disabled="!canRemove"
+					@click="confirm"
+				>
+					<TrashIcon v-if="modalState.shouldCancel" aria-hidden="true" />
+					<UserXIcon v-else aria-hidden="true" />
+					{{
+						formatMessage(modalState.shouldCancel ? messages.cancelButton : messages.removeButton)
+					}}
+				</Button>
 			</div>
 		</div>
 	</NewModal>
@@ -86,12 +88,13 @@
 import { TrashIcon, UserXIcon, XIcon } from '@modrinth/assets'
 import { computed, ref, watch } from 'vue'
 
+import { Button } from '#ui/components/base/buttons'
+
 import { useRelativeTime } from '../../../composables'
 import { defineMessages, useVIntl } from '../../../composables/i18n'
 import { commonMessages } from '../../../utils/common-messages'
 import Admonition from '../../base/Admonition.vue'
 import Avatar from '../../base/Avatar.vue'
-import ButtonStyled from '../../base/ButtonStyled.vue'
 import NewModal from '../../modal/NewModal.vue'
 import type { ServerAccessRole } from './types'
 
diff --git a/packages/ui/src/components/servers/admonitions/BackupAdmonition.vue b/packages/ui/src/components/servers/admonitions/BackupAdmonition.vue
index beac824d1f..42479156eb 100644
--- a/packages/ui/src/components/servers/admonitions/BackupAdmonition.vue
+++ b/packages/ui/src/components/servers/admonitions/BackupAdmonition.vue
@@ -8,7 +8,7 @@ import {
 } from '@modrinth/assets'
 
 import Admonition from '#ui/components/base/Admonition.vue'
-import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
+import { Button } from '#ui/components/base/buttons'
 import type { MessageDescriptor } from '#ui/composables/i18n'
 import { defineMessages, useVIntl } from '#ui/composables/i18n'
 import { commonMessages } from '#ui/utils/common-messages'
@@ -279,29 +279,29 @@ function getDescription(item: BackupAdmonitionEntry): string {
 			</span>
 		</div>
 		<template #top-right-actions>
-			<ButtonStyled v-if="canCancel(item)" type="outlined" color="blue">
-				<button
-					v-tooltip="canManageBackups === false ? permissionDeniedMessage : undefined"
-					class="!border"
-					type="button"
-					:disabled="cancelling || canManageBackups === false"
-					@click="$emit('cancel')"
-				>
-					{{ formatMessage(commonMessages.cancelButton) }}
-				</button>
-			</ButtonStyled>
-			<ButtonStyled v-if="canRetry(item)" color="red" type="outlined">
-				<button
-					v-tooltip="canManageBackups === false ? permissionDeniedMessage : undefined"
-					class="!border"
-					type="button"
-					:disabled="canManageBackups === false"
-					@click="$emit('retry')"
-				>
-					<RotateCounterClockwiseIcon class="size-5" />
-					{{ formatMessage(commonMessages.retryButton) }}
-				</button>
-			</ButtonStyled>
+			<Button
+				v-if="canCancel(item)"
+				v-tooltip="canManageBackups === false ? permissionDeniedMessage : undefined"
+				type="outlined"
+				class="!border !text-blue [&>svg]:!text-blue !shadow-[inset_0_0_0_1px_var(--color-blue)]"
+				native-type="button"
+				:disabled="cancelling || canManageBackups === false"
+				@click="$emit('cancel')"
+			>
+				{{ formatMessage(commonMessages.cancelButton) }}
+			</Button>
+			<Button
+				v-if="canRetry(item)"
+				v-tooltip="canManageBackups === false ? permissionDeniedMessage : undefined"
+				type="outlined"
+				class="!border !text-red [&>svg]:!text-red !shadow-[inset_0_0_0_1px_var(--color-red)]"
+				native-type="button"
+				:disabled="canManageBackups === false"
+				@click="$emit('retry')"
+			>
+				<RotateCounterClockwiseIcon class="size-5" />
+				{{ formatMessage(commonMessages.retryButton) }}
+			</Button>
 		</template>
 	</Admonition>
 </template>
diff --git a/packages/ui/src/components/servers/admonitions/FileOperationAdmonition.vue b/packages/ui/src/components/servers/admonitions/FileOperationAdmonition.vue
index 8ce40296d5..dc96fe350a 100644
--- a/packages/ui/src/components/servers/admonitions/FileOperationAdmonition.vue
+++ b/packages/ui/src/components/servers/admonitions/FileOperationAdmonition.vue
@@ -24,17 +24,17 @@
 			</span>
 		</span>
 		<template v-if="op.id" #top-right-actions>
-			<ButtonStyled v-if="!isTerminal" type="outlined" color="blue">
-				<button
-					v-tooltip="!canWriteFiles ? permissionDeniedMessage : undefined"
-					class="!border"
-					type="button"
-					:disabled="!canWriteFiles"
-					@click="cancelOperation"
-				>
-					{{ formatMessage(commonMessages.cancelButton) }}
-				</button>
-			</ButtonStyled>
+			<Button
+				v-if="!isTerminal"
+				v-tooltip="!canWriteFiles ? permissionDeniedMessage : undefined"
+				type="outlined"
+				class="!border !text-blue [&>svg]:!text-blue !shadow-[inset_0_0_0_1px_var(--color-blue)]"
+				native-type="button"
+				:disabled="!canWriteFiles"
+				@click="cancelOperation"
+			>
+				{{ formatMessage(commonMessages.cancelButton) }}
+			</Button>
 		</template>
 	</Admonition>
 </template>
@@ -44,7 +44,7 @@ import { PackageOpenIcon } from '@modrinth/assets'
 import { computed } from 'vue'
 
 import Admonition from '#ui/components/base/Admonition.vue'
-import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
+import { Button } from '#ui/components/base/buttons'
 import { useFormatBytes } from '#ui/composables'
 import { defineMessages, useVIntl } from '#ui/composables/i18n'
 import { useServerPermissions } from '#ui/composables/server-permissions'
diff --git a/packages/ui/src/components/servers/admonitions/UploadAdmonition.vue b/packages/ui/src/components/servers/admonitions/UploadAdmonition.vue
index b5fb1ab21e..294d793976 100644
--- a/packages/ui/src/components/servers/admonitions/UploadAdmonition.vue
+++ b/packages/ui/src/components/servers/admonitions/UploadAdmonition.vue
@@ -16,11 +16,15 @@
 			}}%)
 		</span>
 		<template v-if="cancelable" #top-right-actions>
-			<ButtonStyled type="outlined" color="blue">
-				<button class="!border" type="button" :disabled="cancelling" @click="$emit('cancel')">
-					Cancel
-				</button>
-			</ButtonStyled>
+			<Button
+				type="outlined"
+				class="!border !text-blue [&>svg]:!text-blue !shadow-[inset_0_0_0_1px_var(--color-blue)]"
+				native-type="button"
+				:disabled="cancelling"
+				@click="$emit('cancel')"
+			>
+				Cancel
+			</Button>
 		</template>
 	</Admonition>
 </template>
@@ -30,7 +34,7 @@ import { UploadIcon } from '@modrinth/assets'
 import { computed } from 'vue'
 
 import Admonition from '#ui/components/base/Admonition.vue'
-import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
+import { Button } from '#ui/components/base/buttons'
 import { useFormatBytes } from '#ui/composables'
 import { injectModrinthServerContext } from '#ui/providers'
 
diff --git a/packages/ui/src/components/servers/backups/BackupCreateModal.vue b/packages/ui/src/components/servers/backups/BackupCreateModal.vue
index 363f428cc7..229f1d3d2e 100644
--- a/packages/ui/src/components/servers/backups/BackupCreateModal.vue
+++ b/packages/ui/src/components/servers/backups/BackupCreateModal.vue
@@ -46,22 +46,20 @@
 		</div>
 		<template #actions>
 			<div class="flex gap-2 justify-end">
-				<ButtonStyled type="outlined">
-					<button @click="hideModal">
-						<XIcon />
-						Cancel
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="brand">
-					<button
-						v-tooltip="createDisabledTooltip"
-						:disabled="createDisabled"
-						@click="createBackup"
-					>
-						<PlusIcon />
-						Create backup
-					</button>
-				</ButtonStyled>
+				<Button type="outlined" @click="hideModal">
+					<XIcon />
+					Cancel
+				</Button>
+				<Button
+					v-tooltip="createDisabledTooltip"
+					type="colored"
+					color="brand"
+					:disabled="createDisabled"
+					@click="createBackup"
+				>
+					<PlusIcon />
+					Create backup
+				</Button>
 			</div>
 		</template>
 	</NewModal>
@@ -73,6 +71,8 @@ import { IssuesIcon, PlusIcon, XIcon } from '@modrinth/assets'
 import { useMutation, useQueryClient } from '@tanstack/vue-query'
 import { computed, nextTick, ref } from 'vue'
 
+import { Button } from '#ui/components/base/buttons'
+
 import { useVIntl } from '../../../composables/i18n'
 import {
 	injectModrinthClient,
@@ -80,7 +80,6 @@ import {
 	injectNotificationManager,
 } from '../../../providers'
 import { commonMessages } from '../../../utils'
-import ButtonStyled from '../../base/ButtonStyled.vue'
 import StyledInput from '../../base/StyledInput.vue'
 import NewModal from '../../modal/NewModal.vue'
 
diff --git a/packages/ui/src/components/servers/backups/BackupDeleteModal.vue b/packages/ui/src/components/servers/backups/BackupDeleteModal.vue
index d00e857aad..860b81264a 100644
--- a/packages/ui/src/components/servers/backups/BackupDeleteModal.vue
+++ b/packages/ui/src/components/servers/backups/BackupDeleteModal.vue
@@ -60,22 +60,20 @@
 
 		<template #actions>
 			<div class="flex justify-end gap-2">
-				<ButtonStyled type="outlined">
-					<button @click="modal?.hide()">
-						<XIcon />
-						{{ formatMessage(commonMessages.cancelButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="red">
-					<button
-						v-tooltip="deleteDisabledTooltip"
-						:disabled="!props.canDelete"
-						@click="confirmDelete"
-					>
-						<TrashIcon />
-						{{ formatMessage(messages.confirm, { count }) }}
-					</button>
-				</ButtonStyled>
+				<Button type="outlined" @click="modal?.hide()">
+					<XIcon />
+					{{ formatMessage(commonMessages.cancelButton) }}
+				</Button>
+				<Button
+					v-tooltip="deleteDisabledTooltip"
+					type="colored"
+					color="red"
+					:disabled="!props.canDelete"
+					@click="confirmDelete"
+				>
+					<TrashIcon />
+					{{ formatMessage(messages.confirm, { count }) }}
+				</Button>
 			</div>
 		</template>
 	</NewModal>
@@ -86,11 +84,12 @@ import type { Archon } from '@modrinth/api-client'
 import { TrashIcon, XIcon } from '@modrinth/assets'
 import { computed, nextTick, ref } from 'vue'
 
+import { Button } from '#ui/components/base/buttons'
+
 import { defineMessages, useVIntl } from '../../../composables/i18n'
 import { useScrollIndicator } from '../../../composables/scroll-indicator'
 import { commonMessages } from '../../../utils'
 import Admonition from '../../base/Admonition.vue'
-import ButtonStyled from '../../base/ButtonStyled.vue'
 import NewModal from '../../modal/NewModal.vue'
 import BackupItem from './BackupItem.vue'
 
diff --git a/packages/ui/src/components/servers/backups/BackupItem.vue b/packages/ui/src/components/servers/backups/BackupItem.vue
index 4d883227c7..b64cf65c1a 100644
--- a/packages/ui/src/components/servers/backups/BackupItem.vue
+++ b/packages/ui/src/components/servers/backups/BackupItem.vue
@@ -13,13 +13,14 @@ import {
 } from '@modrinth/assets'
 import { computed, ref } from 'vue'
 
+import type { OverflowMenuOption } from '#ui/components/base/buttons'
+import { Button, TeleportOverflowMenu } from '#ui/components/base/buttons'
+
 import { useFormatDateTime } from '../../../composables'
 import { defineMessages, useVIntl } from '../../../composables/i18n'
 import { commonMessages, truncatedTooltip } from '../../../utils'
 import AutoLink from '../../base/AutoLink.vue'
 import Avatar from '../../base/Avatar.vue'
-import ButtonStyled from '../../base/ButtonStyled.vue'
-import OverflowMenu, { type Option as OverflowOption } from '../../base/OverflowMenu.vue'
 
 const { formatMessage } = useVIntl()
 const formatDateTime = useFormatDateTime({
@@ -93,38 +94,41 @@ const itemBorderClass = computed(() => {
 	return 'border-transparent'
 })
 
-const overflowMenuOptions = computed<OverflowOption[]>(() => {
-	const options: OverflowOption[] = []
+const overflowMenuOptions = computed<OverflowMenuOption[]>(() => {
+	const options: OverflowMenuOption[] = []
 
 	if (props.showCopyIdAction) {
 		options.push({
 			id: 'copy-id',
+			label: formatMessage(commonMessages.copyIdButton),
 			action: () => copyId(),
 		})
 	}
 
 	if (options.length > 0) {
-		options.push({ divider: true })
+		options.push({ type: 'divider' })
 	}
 
 	options.push({
 		id: 'download',
+		label: formatMessage(commonMessages.downloadButton),
 		action: () => emit('download'),
-		link: `https://${props.kyrosUrl}/modrinth/v0/backups/${props.backup.id}/download?auth=${props.jwt}`,
 		disabled: !props.kyrosUrl || !props.jwt,
 	})
 
 	options.push({
 		id: 'rename',
+		label: formatMessage(messages.rename),
 		action: () => emit('rename'),
 		disabled: props.writeDisabled,
 		tooltip: props.writeDisabled ? props.writeDisabledTooltip : undefined,
 	})
 
-	options.push({ divider: true })
+	options.push({ type: 'divider' })
 	options.push({
 		id: 'delete',
-		color: 'red',
+		label: formatMessage(commonMessages.deleteLabel),
+		tone: 'red',
 		action: () => emit('delete'),
 		disabled: props.writeDisabled,
 		tooltip: props.writeDisabled ? props.writeDisabledTooltip : undefined,
@@ -265,35 +269,32 @@ const creatorAvatarSrc = computed(() =>
 
 		<!-- Right side actions -->
 		<div v-if="!preview" class="flex min-w-0 flex-1 items-center justify-end gap-2">
-			<ButtonStyled color="brand" type="outlined">
-				<button
-					v-tooltip="props.restoreDisabled"
-					class="!border"
-					:disabled="!!props.restoreDisabled"
-					@click="() => emit('restore')"
-				>
-					<RotateCounterClockwiseIcon class="size-5" />
-					{{ formatMessage(messages.restore) }}
-				</button>
-			</ButtonStyled>
-			<ButtonStyled circular type="transparent">
-				<OverflowMenu :options="overflowMenuOptions">
-					<MoreVerticalIcon class="size-5" />
-					<template #copy-id>
-						<ClipboardCopyIcon class="size-5" />
-						{{ formatMessage(commonMessages.copyIdButton) }}
-					</template>
-					<template #download>
-						<DownloadIcon class="size-5" /> {{ formatMessage(commonMessages.downloadButton) }}
-					</template>
-					<template #rename>
-						<EditIcon class="size-5" /> {{ formatMessage(messages.rename) }}
-					</template>
-					<template #delete>
-						<TrashIcon class="size-5" /> {{ formatMessage(commonMessages.deleteLabel) }}
-					</template>
-				</OverflowMenu>
-			</ButtonStyled>
+			<Button
+				v-tooltip="props.restoreDisabled"
+				type="outlined"
+				class="!border !text-brand [&>svg]:!text-brand !shadow-[inset_0_0_0_1px_var(--color-brand)]"
+				:disabled="!!props.restoreDisabled"
+				@click="() => emit('restore')"
+			>
+				<RotateCounterClockwiseIcon class="size-5" />
+				{{ formatMessage(messages.restore) }}
+			</Button>
+			<TeleportOverflowMenu type="quiet" label="More options" :options="overflowMenuOptions">
+				<MoreVerticalIcon class="size-5" />
+				<template #copy-id>
+					<ClipboardCopyIcon class="size-5" />
+					{{ formatMessage(commonMessages.copyIdButton) }}
+				</template>
+				<template #download>
+					<DownloadIcon class="size-5" /> {{ formatMessage(commonMessages.downloadButton) }}
+				</template>
+				<template #rename>
+					<EditIcon class="size-5" /> {{ formatMessage(messages.rename) }}
+				</template>
+				<template #delete>
+					<TrashIcon class="size-5" /> {{ formatMessage(commonMessages.deleteLabel) }}
+				</template>
+			</TeleportOverflowMenu>
 		</div>
 
 		<pre v-if="!preview && showDebugInfo" class="w-full rounded-xl bg-surface-4 p-2 text-xs">{{
diff --git a/packages/ui/src/components/servers/backups/BackupRenameModal.vue b/packages/ui/src/components/servers/backups/BackupRenameModal.vue
index 54d090990a..97c34d2a69 100644
--- a/packages/ui/src/components/servers/backups/BackupRenameModal.vue
+++ b/packages/ui/src/components/servers/backups/BackupRenameModal.vue
@@ -22,28 +22,26 @@
 		</div>
 		<template #actions>
 			<div class="flex gap-2 justify-end">
-				<ButtonStyled type="outlined">
-					<button @click="hide">
-						<XIcon />
-						Cancel
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="brand">
-					<button
-						v-tooltip="renameDisabledTooltip"
-						:disabled="renameDisabled"
-						@click="renameBackup"
-					>
-						<template v-if="renameMutation.isPending.value">
-							<SpinnerIcon class="animate-spin" />
-							Renaming...
-						</template>
-						<template v-else>
-							<SaveIcon />
-							Save changes
-						</template>
-					</button>
-				</ButtonStyled>
+				<Button type="outlined" @click="hide">
+					<XIcon />
+					Cancel
+				</Button>
+				<Button
+					v-tooltip="renameDisabledTooltip"
+					type="colored"
+					color="brand"
+					:disabled="renameDisabled"
+					@click="renameBackup"
+				>
+					<template v-if="renameMutation.isPending.value">
+						<SpinnerIcon class="animate-spin" />
+						Renaming...
+					</template>
+					<template v-else>
+						<SaveIcon />
+						Save changes
+					</template>
+				</Button>
 			</div>
 		</template>
 	</NewModal>
@@ -55,6 +53,8 @@ import { IssuesIcon, SaveIcon, SpinnerIcon, XIcon } from '@modrinth/assets'
 import { useMutation, useQueryClient } from '@tanstack/vue-query'
 import { computed, nextTick, ref } from 'vue'
 
+import { Button } from '#ui/components/base/buttons'
+
 import { useVIntl } from '../../../composables/i18n'
 import {
 	injectModrinthClient,
@@ -62,7 +62,6 @@ import {
 	injectNotificationManager,
 } from '../../../providers'
 import { commonMessages } from '../../../utils'
-import ButtonStyled from '../../base/ButtonStyled.vue'
 import StyledInput from '../../base/StyledInput.vue'
 import NewModal from '../../modal/NewModal.vue'
 
diff --git a/packages/ui/src/components/servers/backups/BackupRestoreModal.vue b/packages/ui/src/components/servers/backups/BackupRestoreModal.vue
index 64dc1de2c6..016dccbe37 100644
--- a/packages/ui/src/components/servers/backups/BackupRestoreModal.vue
+++ b/packages/ui/src/components/servers/backups/BackupRestoreModal.vue
@@ -17,23 +17,21 @@
 
 		<template #actions>
 			<div class="flex gap-2 justify-end">
-				<ButtonStyled type="outlined">
-					<button @click="modal?.hide()">
-						<XIcon />
-						Cancel
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="red">
-					<button
-						v-tooltip="restoreDisabledTooltip"
-						:disabled="restoreDisabled"
-						@click="restoreBackup"
-					>
-						<SpinnerIcon v-if="isRestoring" class="animate-spin" />
-						<RotateCounterClockwiseIcon v-else />
-						{{ isRestoring ? 'Restoring...' : 'Restore backup' }}
-					</button>
-				</ButtonStyled>
+				<Button type="outlined" @click="modal?.hide()">
+					<XIcon />
+					Cancel
+				</Button>
+				<Button
+					v-tooltip="restoreDisabledTooltip"
+					type="colored"
+					color="red"
+					:disabled="restoreDisabled"
+					@click="restoreBackup"
+				>
+					<SpinnerIcon v-if="isRestoring" class="animate-spin" />
+					<RotateCounterClockwiseIcon v-else />
+					{{ isRestoring ? 'Restoring...' : 'Restore backup' }}
+				</Button>
 			</div>
 		</template>
 	</NewModal>
@@ -45,6 +43,8 @@ import { RotateCounterClockwiseIcon, SpinnerIcon, XIcon } from '@modrinth/assets
 import { useMutation, useQueryClient } from '@tanstack/vue-query'
 import { computed, ref } from 'vue'
 
+import { Button } from '#ui/components/base/buttons'
+
 import { useVIntl } from '../../../composables/i18n'
 import {
 	injectModrinthClient,
@@ -53,7 +53,6 @@ import {
 } from '../../../providers'
 import { commonMessages } from '../../../utils'
 import Admonition from '../../base/Admonition.vue'
-import ButtonStyled from '../../base/ButtonStyled.vue'
 import NewModal from '../../modal/NewModal.vue'
 import BackupItem from './BackupItem.vue'
 
diff --git a/packages/ui/src/components/servers/edit-server-icon/EditServerIcon.vue b/packages/ui/src/components/servers/edit-server-icon/EditServerIcon.vue
index 936e415cca..30967a7440 100644
--- a/packages/ui/src/components/servers/edit-server-icon/EditServerIcon.vue
+++ b/packages/ui/src/components/servers/edit-server-icon/EditServerIcon.vue
@@ -2,19 +2,25 @@
 	<div class="flex flex-col gap-2.5">
 		<span class="text-lg font-semibold text-contrast">Icon</span>
 		<div class="group relative w-fit">
-			<OverflowMenu
-				v-tooltip="editIconTooltip"
-				class="m-0 cursor-pointer appearance-none border-none bg-transparent p-0 transition-transform group-active:scale-95"
+			<TeleportOverflowMenu
+				:label="editIconTooltip"
+				:tooltip="editIconTooltip"
+				:icon-only="false"
+				type="quiet"
+				interaction="none"
+				class="m-0 !h-auto cursor-pointer appearance-none border-none bg-transparent !p-0 transition-transform group-active:scale-95"
 				:disabled="isIconActionDisabled"
 				:options="[
 					{
 						id: 'upload',
+						label: 'Upload icon',
 						action: () => triggerFileInput(),
 						disabled: !props.canEdit,
 						tooltip: !props.canEdit ? editIconTooltip : undefined,
 					},
 					{
 						id: 'sync',
+						label: 'Sync icon',
 						action: () => resetIcon(),
 						disabled: !props.canEdit,
 						tooltip: !props.canEdit ? editIconTooltip : undefined,
@@ -39,7 +45,7 @@
 				</div>
 				<template #upload> <UploadIcon /> Upload icon </template>
 				<template #sync> <TransferIcon /> Sync icon </template>
-			</OverflowMenu>
+			</TeleportOverflowMenu>
 		</div>
 	</div>
 </template>
@@ -49,7 +55,7 @@ import { EditIcon, SpinnerIcon, TransferIcon, UploadIcon } from '@modrinth/asset
 import { useQueryClient } from '@tanstack/vue-query'
 import { computed, ref } from 'vue'
 
-import { OverflowMenu, ServerIcon } from '#ui/components'
+import { ServerIcon, TeleportOverflowMenu } from '#ui/components'
 import { useServerImage } from '#ui/composables'
 import { useVIntl } from '#ui/composables/i18n'
 import {
diff --git a/packages/ui/src/components/servers/marketing/MedalServerCountdown.vue b/packages/ui/src/components/servers/marketing/MedalServerCountdown.vue
index e219c20ea2..fd67f30c1c 100644
--- a/packages/ui/src/components/servers/marketing/MedalServerCountdown.vue
+++ b/packages/ui/src/components/servers/marketing/MedalServerCountdown.vue
@@ -30,9 +30,10 @@
 			</Transition>
 		</div>
 
-		<ButtonStyled color="medal-promo" type="outlined" size="large">
-			<button class="z-10 my-auto" @click="openUpgradeModal"><RocketIcon /> Upgrade</button>
-		</ButtonStyled>
+		<Button type="outlined" size="xl" class="z-10 my-auto" @click="openUpgradeModal">
+			<RocketIcon aria-hidden="true" />
+			Upgrade
+		</Button>
 	</div>
 	<ServersUpgradeModalWrapper
 		ref="upgradeModal"
@@ -50,7 +51,7 @@ import dayjs from 'dayjs'
 import dayjsDuration from 'dayjs/plugin/duration'
 import { type ComponentPublicInstance, computed, onMounted, onUnmounted, ref } from 'vue'
 
-import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
+import { Button } from '#ui/components/base/buttons'
 import ServersUpgradeModalWrapper from '#ui/components/billing/ServersUpgradeModalWrapper.vue'
 import { injectModrinthClient } from '#ui/providers'
 
diff --git a/packages/ui/src/components/servers/marketing/MedalServerListing.vue b/packages/ui/src/components/servers/marketing/MedalServerListing.vue
index b357dfc933..ade503c3aa 100644
--- a/packages/ui/src/components/servers/marketing/MedalServerListing.vue
+++ b/packages/ui/src/components/servers/marketing/MedalServerListing.vue
@@ -120,11 +120,17 @@
 			</div>
 
 			<div class="z-10 ml-auto">
-				<ButtonStyled color="medal-promo" type="outlined" size="large">
-					<button class="my-auto" data-server-listing-button @click="handleUpgrade">
-						<RocketIcon /> {{ formatMessage(messages.upgradeButton) }}
-					</button>
-				</ButtonStyled>
+				<Button
+					type="outlined"
+					color="medal_promotion"
+					size="xl"
+					class="my-auto"
+					data-server-listing-button
+					@click="handleUpgrade"
+				>
+					<RocketIcon aria-hidden="true" />
+					{{ formatMessage(messages.upgradeButton) }}
+				</Button>
 			</div>
 		</div>
 
@@ -168,10 +174,11 @@ import dayjsDuration from 'dayjs/plugin/duration'
 import { computed, onMounted, onUnmounted, ref, watch } from 'vue'
 import { useRouter } from 'vue-router'
 
+import { Button } from '#ui/components/base/buttons'
+
 import { defineMessages, useVIntl } from '../../../composables/i18n'
 import { injectModrinthClient } from '../../../providers/api-client'
 import Avatar from '../../base/Avatar.vue'
-import ButtonStyled from '../../base/ButtonStyled.vue'
 import CopyCode from '../../base/CopyCode.vue'
 import IntlFormatted from '../../base/IntlFormatted.vue'
 import type { ServerListingOwner } from '../access/types'
diff --git a/packages/ui/src/components/servers/server-header/PanelServerActionButton.vue b/packages/ui/src/components/servers/server-header/PanelServerActionButton.vue
index 52d47effe2..381aed3b28 100644
--- a/packages/ui/src/components/servers/server-header/PanelServerActionButton.vue
+++ b/packages/ui/src/components/servers/server-header/PanelServerActionButton.vue
@@ -1,60 +1,75 @@
 <template>
 	<div class="contents">
 		<div class="flex flex-row items-center gap-2 rounded-lg">
-			<ButtonStyled v-if="isInstalling" type="standard" color="brand" size="large">
-				<button disabled class="flex-shrink-0">
-					<LoaderCircleIcon class="size-5 animate-spin" /> Installing...
-				</button>
-			</ButtonStyled>
+			<Button
+				v-if="isInstalling"
+				type="colored"
+				color="brand"
+				size="xl"
+				disabled
+				class="flex-shrink-0"
+			>
+				<LoaderCircleIcon class="size-5 animate-spin" /> Installing...
+			</Button>
 
 			<template v-else-if="showRestartButton">
-				<ButtonStyled type="standard" color="orange" size="large">
-					<button v-tooltip="busyTooltip" :disabled="!canTakeAction" @click="handlePrimaryAction">
-						<UpdatedIcon />
-						<span>{{ primaryActionText }}</span>
-					</button>
-				</ButtonStyled>
-
-				<JoinedButtons
-					color="red"
-					size="large"
-					:actions="stopSplitActions"
-					:primary-disabled="!canTakeAction"
-					:dropdown-disabled="!canKill"
-					:primary-tooltip="busyTooltip"
-					:dropdown-tooltip="busyTooltip"
+				<Button
+					v-tooltip="busyTooltip"
+					type="colored"
+					color="orange"
+					size="xl"
+					:disabled="!canTakeAction"
+					@click="handlePrimaryAction"
 				>
-					<template #kill_server>
-						<SlashIcon class="h-5 w-5" />
-						Kill server
-					</template>
-				</JoinedButtons>
+					<UpdatedIcon />
+					<span>{{ primaryActionText }}</span>
+				</Button>
+
+				<SplitButton
+					v-tooltip="busyTooltip"
+					type="colored"
+					color="red"
+					size="xl"
+					:options="stopMenuOptions"
+					menu-label="Force stop options"
+					:primary-disabled="!canTakeAction"
+					:menu-disabled="!canKill"
+					@click="initiateAction('Stop')"
+				>
+					<StopCircleIcon />
+					{{ isStopping ? 'Stopping' : 'Stop' }}
+				</SplitButton>
 			</template>
 
 			<template v-else-if="isStopping">
-				<JoinedButtons
+				<SplitButton
+					v-tooltip="busyTooltip"
+					type="colored"
 					color="red"
-					size="large"
-					:actions="stopSplitActions"
+					size="xl"
+					:options="stopMenuOptions"
+					menu-label="Force stop options"
 					:primary-disabled="true"
-					:dropdown-disabled="!canKill"
-					:primary-muted="true"
-					:dropdown-tooltip="busyTooltip"
+					:menu-disabled="!canKill"
+					class="opacity-60"
 				>
-					<template #kill_server>
-						<SlashIcon class="h-5 w-5" />
-						Kill server
-					</template>
-				</JoinedButtons>
+					<StopCircleIcon />
+					Stopping
+				</SplitButton>
 			</template>
 
 			<template v-else>
-				<ButtonStyled type="standard" color="brand" size="large">
-					<button v-tooltip="busyTooltip" :disabled="!canTakeAction" @click="handlePrimaryAction">
-						<PlayIcon />
-						<span>{{ primaryActionText }}</span>
-					</button>
-				</ButtonStyled>
+				<Button
+					v-tooltip="busyTooltip"
+					type="colored"
+					color="brand"
+					size="xl"
+					:disabled="!canTakeAction"
+					@click="handlePrimaryAction"
+				>
+					<PlayIcon />
+					<span>{{ primaryActionText }}</span>
+				</Button>
 			</template>
 		</div>
 	</div>
@@ -70,7 +85,8 @@ import {
 } from '@modrinth/assets'
 import { computed } from 'vue'
 
-import { ButtonStyled, type JoinedButtonAction, JoinedButtons } from '#ui/components'
+import type { OverflowMenuOption } from '#ui/components/base/buttons'
+import { Button, SplitButton } from '#ui/components/base/buttons'
 
 import { useServerPowerAction } from './use-server-power-action'
 
@@ -97,13 +113,7 @@ const {
 	disabled: computed(() => props.disabled),
 })
 
-const stopSplitActions = computed<JoinedButtonAction[]>(() => [
-	{
-		id: 'stop',
-		label: isStopping.value ? 'Stopping' : 'Stop',
-		icon: StopCircleIcon,
-		action: () => initiateAction('Stop'),
-	},
+const stopMenuOptions = computed<OverflowMenuOption[]>(() => [
 	{
 		id: 'kill_server',
 		label: 'Kill server',
diff --git a/packages/ui/src/components/servers/server-list-empty/ServerListEmpty.vue b/packages/ui/src/components/servers/server-list-empty/ServerListEmpty.vue
index 791c85410f..3e58b62071 100644
--- a/packages/ui/src/components/servers/server-list-empty/ServerListEmpty.vue
+++ b/packages/ui/src/components/servers/server-list-empty/ServerListEmpty.vue
@@ -66,12 +66,10 @@
 			<!-- CTA section -->
 			<div class="flex flex-col gap-6 items-start">
 				<div class="flex flex-col gap-3 items-start">
-					<ButtonStyled color="brand">
-						<button @click="onClickNewServer?.()">
-							<PlusIcon aria-hidden="true" />
-							{{ formatMessage(messages.newServerButton) }}
-						</button>
-					</ButtonStyled>
+					<Button type="colored" color="brand" @click="onClickNewServer?.()">
+						<PlusIcon aria-hidden="true" />
+						{{ formatMessage(messages.newServerButton) }}
+					</Button>
 
 					<AutoLink
 						to="https://modrinth.com/hosting"
@@ -90,12 +88,10 @@
 						<p class="text-base font-normal text-primary">
 							{{ formatMessage(messages.alreadyHaveServerLabel) }}
 						</p>
-						<ButtonStyled>
-							<button @click="onClickSignIn?.()">
-								<LogInIcon aria-hidden="true" />
-								{{ formatMessage(messages.signInButton) }}
-							</button>
-						</ButtonStyled>
+						<Button @click="onClickSignIn?.()">
+							<LogInIcon aria-hidden="true" />
+							{{ formatMessage(messages.signInButton) }}
+						</Button>
 					</div>
 				</template>
 			</div>
@@ -153,7 +149,7 @@ import {
 } from '@modrinth/assets'
 import { AutoLink } from '@modrinth/ui'
 
-import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
+import { Button } from '#ui/components/base/buttons'
 
 import { defineMessages, useVIntl } from '../../../composables/i18n'
 import imgAircraft from './grid-images/aircraft.png'
diff --git a/packages/ui/src/components/sharing/invite-players-modal/index.vue b/packages/ui/src/components/sharing/invite-players-modal/index.vue
index 0499ee1af7..656459e741 100644
--- a/packages/ui/src/components/sharing/invite-players-modal/index.vue
+++ b/packages/ui/src/components/sharing/invite-players-modal/index.vue
@@ -54,17 +54,17 @@
 							</div>
 						</template>
 					</Combobox>
-					<ButtonStyled color="brand">
-						<button
-							v-tooltip="searchInviteTooltip"
-							class="shrink-0"
-							:disabled="!canInviteSearchTarget"
-							@click="inviteSearchTarget"
-						>
-							<PlusIcon aria-hidden="true" />
-							{{ addButtonLabel }}
-						</button>
-					</ButtonStyled>
+					<Button
+						v-tooltip="searchInviteTooltip"
+						type="colored"
+						color="brand"
+						class="shrink-0"
+						:disabled="!canInviteSearchTarget"
+						@click="inviteSearchTarget"
+					>
+						<PlusIcon aria-hidden="true" />
+						{{ addButtonLabel }}
+					</Button>
 				</div>
 			</div>
 
@@ -102,18 +102,17 @@
 					<div class="text-base font-semibold text-contrast">
 						{{ inviteLinkHeading }}
 					</div>
-					<ButtonStyled>
-						<button
-							type="button"
-							class="!h-10 w-full !justify-between !px-4 text-left !shadow-none"
-							@click="copyInviteLink"
-						>
-							<span class="min-w-0 truncate text-base font-semibold text-primary">
-								{{ link }}
-							</span>
-							<ClipboardCopyIcon class="size-5 shrink-0 text-secondary" aria-hidden="true" />
-						</button>
-					</ButtonStyled>
+					<Button
+						native-type="button"
+						size="lg"
+						class="w-full !justify-between text-left"
+						@click="copyInviteLink"
+					>
+						<span class="min-w-0 truncate text-base font-semibold text-primary">
+							{{ link }}
+						</span>
+						<ClipboardCopyIcon class="size-5 shrink-0 text-secondary" aria-hidden="true" />
+					</Button>
 					<p v-if="link && linkExpiryDescription" class="m-0 text-base text-primary">
 						{{ linkExpiryDescription }}
 						<button
@@ -144,10 +143,11 @@
 import { ClipboardCopyIcon, PlusIcon } from '@modrinth/assets'
 import { computed, ref } from 'vue'
 
+import { Button } from '#ui/components/base/buttons'
+
 import { defineMessages, useVIntl } from '../../../composables/i18n'
 import { injectNotificationManager } from '../../../providers'
 import Avatar from '../../base/Avatar.vue'
-import ButtonStyled from '../../base/ButtonStyled.vue'
 import Combobox from '../../base/Combobox.vue'
 import NewModal from '../../modal/NewModal.vue'
 import InvitePlayersModalInviteLinkEditor from './invite-players-modal-invite-link-editor.vue'
diff --git a/packages/ui/src/components/sharing/invite-players-modal/invite-players-modal-invite-link-editor.vue b/packages/ui/src/components/sharing/invite-players-modal/invite-players-modal-invite-link-editor.vue
index 433b42085e..e1caca8cd1 100644
--- a/packages/ui/src/components/sharing/invite-players-modal/invite-players-modal-invite-link-editor.vue
+++ b/packages/ui/src/components/sharing/invite-players-modal/invite-players-modal-invite-link-editor.vue
@@ -31,20 +31,18 @@
 								calendar-class="!border-none"
 							/>
 							<div class="flex justify-end gap-2 p-3 pt-1">
-								<ButtonStyled type="outlined">
-									<button type="button" @click="cancelCustomExpiry">
-										{{ formatMessage(messages.cancel) }}
-									</button>
-								</ButtonStyled>
-								<ButtonStyled color="brand">
-									<button
-										type="button"
-										:disabled="!canApplyCustomExpiry"
-										@click="applyCustomExpiry"
-									>
-										{{ formatMessage(messages.apply) }}
-									</button>
-								</ButtonStyled>
+								<Button type="outlined" native-type="button" @click="cancelCustomExpiry">
+									{{ formatMessage(messages.cancel) }}
+								</Button>
+								<Button
+									type="colored"
+									color="brand"
+									native-type="button"
+									:disabled="!canApplyCustomExpiry"
+									@click="applyCustomExpiry"
+								>
+									{{ formatMessage(messages.apply) }}
+								</Button>
 							</div>
 						</div>
 						<button
@@ -73,19 +71,15 @@
 		</div>
 		<template #actions>
 			<div class="flex justify-end gap-2">
-				<ButtonStyled>
-					<button :disabled="saving" @click="modal?.hide()">
-						<XIcon aria-hidden="true" />
-						{{ formatMessage(messages.cancel) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="brand">
-					<button :disabled="!canSave" @click="save">
-						<SpinnerIcon v-if="saving" class="animate-spin" aria-hidden="true" />
-						<SaveIcon v-else aria-hidden="true" />
-						{{ formatMessage(messages.save) }}
-					</button>
-				</ButtonStyled>
+				<Button :disabled="saving" @click="modal?.hide()">
+					<XIcon aria-hidden="true" />
+					{{ formatMessage(messages.cancel) }}
+				</Button>
+				<Button type="colored" color="brand" :disabled="!canSave" @click="save">
+					<SpinnerIcon v-if="saving" class="animate-spin" aria-hidden="true" />
+					<SaveIcon v-else aria-hidden="true" />
+					{{ formatMessage(messages.save) }}
+				</Button>
 			</div>
 		</template>
 	</NewModal>
@@ -95,10 +89,11 @@
 import { SaveIcon, SpinnerIcon, XIcon } from '@modrinth/assets'
 import { computed, ref, watch } from 'vue'
 
+import { Button } from '#ui/components/base/buttons'
+
 import { useFormatDateTime } from '../../../composables'
 import { defineMessages, useVIntl } from '../../../composables/i18n'
 import { injectNotificationManager } from '../../../providers'
-import ButtonStyled from '../../base/ButtonStyled.vue'
 import Combobox, { type ComboboxOption } from '../../base/Combobox.vue'
 import DatePicker from '../../base/DatePicker.vue'
 import StyledInput from '../../base/StyledInput.vue'
diff --git a/packages/ui/src/components/sharing/invite-players-modal/invite-players-modal-user-row.vue b/packages/ui/src/components/sharing/invite-players-modal/invite-players-modal-user-row.vue
index d4bd297094..50d3a696ff 100644
--- a/packages/ui/src/components/sharing/invite-players-modal/invite-players-modal-user-row.vue
+++ b/packages/ui/src/components/sharing/invite-players-modal/invite-players-modal-user-row.vue
@@ -30,29 +30,26 @@
 			</AutoLink>
 		</div>
 
-		<ButtonStyled v-if="status === 'added'" type="standard" color-fill="none">
-			<button disabled>
-				<CheckIcon aria-hidden="true" />
-				{{ addedLabel }}
-			</button>
-		</ButtonStyled>
-		<ButtonStyled v-else-if="status === 'pending'" type="outlined">
-			<button :disabled="disabled" @click="$emit('cancel', user)">
-				{{ cancelLabel }}
-			</button>
-		</ButtonStyled>
+		<Button v-if="status === 'added'" type="quiet" disabled>
+			<CheckIcon aria-hidden="true" />
+			{{ addedLabel }}
+		</Button>
+		<Button
+			v-else-if="status === 'pending'"
+			type="outlined"
+			:disabled="disabled"
+			@click="$emit('cancel', user)"
+		>
+			{{ cancelLabel }}
+		</Button>
 		<span v-else-if="status === 'requested'" v-tooltip="requestedTooltip" class="inline-flex">
-			<ButtonStyled type="standard" color-fill="none">
-				<button disabled>
-					{{ requestedLabel }}
-				</button>
-			</ButtonStyled>
+			<Button type="quiet" disabled>
+				{{ requestedLabel }}
+			</Button>
 		</span>
-		<ButtonStyled v-else color-fill="none">
-			<button :disabled="disabled" @click="$emit('invite', user)">
-				{{ inviteLabel }}
-			</button>
-		</ButtonStyled>
+		<Button v-else type="quiet" :disabled="disabled" @click="$emit('invite', user)">
+			{{ inviteLabel }}
+		</Button>
 	</div>
 </template>
 
@@ -60,9 +57,10 @@
 import { CheckIcon } from '@modrinth/assets'
 import { computed } from 'vue'
 
+import { Button } from '#ui/components/base/buttons'
+
 import AutoLink from '../../base/AutoLink.vue'
 import Avatar from '../../base/Avatar.vue'
-import ButtonStyled from '../../base/ButtonStyled.vue'
 import type { InvitePlayersUser, InvitePlayersUserProfileLink } from './types'
 
 const props = withDefaults(
diff --git a/packages/ui/src/components/user/UserPageHeader.vue b/packages/ui/src/components/user/UserPageHeader.vue
index bac7c7db25..5fd30e87db 100644
--- a/packages/ui/src/components/user/UserPageHeader.vue
+++ b/packages/ui/src/components/user/UserPageHeader.vue
@@ -57,21 +57,19 @@
 
 		<template #actions>
 			<PageHeaderActions>
-				<ButtonStyled v-if="isSelf" size="large">
-					<AutoLink :to="editProfileLink">
-						<EditIcon />
-						{{ formatMessage(commonMessages.editButton) }}
-					</AutoLink>
-				</ButtonStyled>
-				<ButtonStyled circular size="large" type="transparent">
-					<TeleportOverflowMenu
-						:options="moreActions"
-						:tooltip="formatMessage(commonMessages.moreOptionsButton)"
-						:aria-label="formatMessage(commonMessages.moreOptionsButton)"
-					>
-						<MoreVerticalIcon />
-					</TeleportOverflowMenu>
-				</ButtonStyled>
+				<ButtonLink v-if="isSelf" size="xl" :to="editProfileLink">
+					<EditIcon />
+					{{ formatMessage(commonMessages.editButton) }}
+				</ButtonLink>
+				<TeleportOverflowMenu
+					type="quiet"
+					size="xl"
+					:label="formatMessage(commonMessages.moreOptionsButton)"
+					:tooltip="formatMessage(commonMessages.moreOptionsButton)"
+					:options="moreActions"
+				>
+					<MoreVerticalIcon />
+				</TeleportOverflowMenu>
 			</PageHeaderActions>
 		</template>
 	</PageHeader>
@@ -96,17 +94,15 @@ import {
 } from '@modrinth/assets'
 import { computed } from 'vue'
 
-import AutoLink from '#ui/components/base/AutoLink.vue'
 import Avatar from '#ui/components/base/Avatar.vue'
-import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
+import type { OverflowMenuOption } from '#ui/components/base/buttons'
+import { ButtonLink, TeleportOverflowMenu } from '#ui/components/base/buttons'
 import PageHeader from '#ui/components/base/page-header/index.vue'
 import PageHeaderMetadata from '#ui/components/base/page-header/metadata/index.vue'
 import PageHeaderMetadataNumberItem from '#ui/components/base/page-header/metadata/page-header-metadata-number-item.vue'
 import PageHeaderMetadataTimeItem from '#ui/components/base/page-header/metadata/page-header-metadata-time-item.vue'
 import PageHeaderActions from '#ui/components/base/page-header/page-header-actions.vue'
 import PageHeaderBadgeItem from '#ui/components/base/page-header/page-header-badge-item.vue'
-import type { Item as TeleportOverflowMenuItem } from '#ui/components/base/TeleportOverflowMenu.vue'
-import TeleportOverflowMenu from '#ui/components/base/TeleportOverflowMenu.vue'
 import { defineMessages, useFormatDateTime, useFormatNumber, useVIntl } from '#ui/composables'
 import type { AuthUser } from '#ui/providers/auth'
 import { commonMessages } from '#ui/utils'
@@ -228,7 +224,7 @@ const formatDateTime = useFormatDateTime({
 const downloadsTooltip = computed(() => formatNumber(props.downloads))
 const joinedTooltip = computed(() => formatDateTime(props.user.created))
 
-const moreActions = computed<TeleportOverflowMenuItem[]>(() => [
+const moreActions = computed<OverflowMenuOption[]>(() => [
 	{
 		id: 'manage-projects',
 		label: formatMessage(messages.profileManageProjectsButton),
@@ -236,16 +232,13 @@ const moreActions = computed<TeleportOverflowMenuItem[]>(() => [
 		action: () => emit('manageProjects'),
 		shown: props.isSelf,
 	},
-	{
-		divider: true,
-		shown: props.isSelf,
-	},
+	{ type: 'divider', shown: props.isSelf },
 	{
 		id: 'report',
 		label: formatMessage(commonMessages.reportButton),
 		icon: ReportIcon,
 		action: () => emit('report'),
-		color: 'red',
+		tone: 'red',
 		shown: props.authUser?.id !== props.user.id,
 	},
 	{
@@ -253,7 +246,7 @@ const moreActions = computed<TeleportOverflowMenuItem[]>(() => [
 		label: formatMessage(props.isBlocked ? messages.unblockButton : messages.blockButton),
 		icon: BanIcon,
 		action: () => emit('block'),
-		color: 'red',
+		tone: 'red',
 		shown: props.authUser?.id !== props.user.id,
 	},
 	{
@@ -268,15 +261,13 @@ const moreActions = computed<TeleportOverflowMenuItem[]>(() => [
 		icon: ClipboardCopyIcon,
 		action: () => emit('copyPermalink'),
 	},
-	{
-		divider: true,
-		shown: props.showStaffActions && (props.isAdmin || props.isStaff),
-	},
+	{ type: 'divider', shown: props.showStaffActions && (props.isAdmin || props.isStaff) },
 	{
 		id: 'open-billing',
 		label: formatMessage(messages.billingButton),
 		icon: CurrencyIcon,
 		action: () => emit('openBilling'),
+		tone: 'orange',
 		shown: props.showStaffActions && props.isStaff,
 	},
 	{
@@ -287,14 +278,15 @@ const moreActions = computed<TeleportOverflowMenuItem[]>(() => [
 		icon: AffiliateIcon,
 		action: () => emit('toggleAffiliate'),
 		shown: props.showStaffActions && props.isAdmin,
-		remainOnClick: true,
-		color: props.isAffiliate ? 'red' : 'orange',
+		remainOpen: true,
+		tone: props.isAffiliate ? 'red' : 'orange',
 	},
 	{
 		id: 'open-info',
 		label: formatMessage(messages.infoButton),
 		icon: InfoIcon,
 		action: () => emit('openInfo'),
+		tone: 'orange',
 		shown: props.showStaffActions && props.isStaff,
 	},
 	{
@@ -302,6 +294,7 @@ const moreActions = computed<TeleportOverflowMenuItem[]>(() => [
 		label: formatMessage(messages.analyticsButton),
 		icon: ChartIcon,
 		action: () => emit('openAnalytics'),
+		tone: 'orange',
 		shown: props.showStaffActions && props.isAdmin,
 	},
 	{
@@ -309,6 +302,7 @@ const moreActions = computed<TeleportOverflowMenuItem[]>(() => [
 		label: formatMessage(messages.editRoleButton),
 		icon: EditIcon,
 		action: () => emit('editRole'),
+		tone: 'orange',
 		shown: props.showStaffActions && props.isAdmin,
 	},
 ])
diff --git a/packages/ui/src/components/version/VersionFilterControl.vue b/packages/ui/src/components/version/VersionFilterControl.vue
index 09a77a7bdd..5c38c04da4 100644
--- a/packages/ui/src/components/version/VersionFilterControl.vue
+++ b/packages/ui/src/components/version/VersionFilterControl.vue
@@ -7,13 +7,13 @@
 				:options="platformOptions"
 				fit-content
 				:dropdown-min-width="180"
-				trigger-class="!min-h-9 !px-3 !py-0"
+				trigger-type="base"
 				@update:model-value="updateSelectedPlatforms"
 			>
 				<template #input-content="{ isOpen, openDirection }">
 					<div class="flex items-center gap-2">
 						<FilterIcon class="h-5 w-5 text-secondary" />
-						<span class="font-semibold text-primary">Platforms</span>
+						<span class="font-semibold text-inherit">Platforms</span>
 						<ChevronLeftIcon
 							class="h-5 w-5 text-secondary transition-transform duration-150"
 							:class="
@@ -31,13 +31,13 @@
 				search-placeholder="Search..."
 				fit-content
 				:dropdown-min-width="240"
-				trigger-class="!min-h-9 !px-3 !py-0"
+				trigger-type="base"
 				@update:model-value="updateSelectedGameVersions"
 			>
 				<template #input-content="{ isOpen, openDirection }">
 					<div class="flex items-center gap-2">
 						<FilterIcon class="h-5 w-5 text-secondary" />
-						<span class="font-semibold text-primary">Game versions</span>
+						<span class="font-semibold text-inherit">Game versions</span>
 						<ChevronLeftIcon
 							class="h-5 w-5 text-secondary transition-transform duration-150"
 							:class="
@@ -63,13 +63,13 @@
 				:options="channelOptions"
 				fit-content
 				:dropdown-min-width="180"
-				trigger-class="!min-h-9 !px-3 !py-0"
+				trigger-type="base"
 				@update:model-value="updateSelectedChannels"
 			>
 				<template #input-content="{ isOpen, openDirection }">
 					<div class="flex items-center gap-2">
 						<FilterIcon class="h-5 w-5 text-secondary" />
-						<span class="font-semibold text-primary">Channels</span>
+						<span class="font-semibold text-inherit">Channels</span>
 						<ChevronLeftIcon
 							class="h-5 w-5 text-secondary transition-transform duration-150"
 							:class="
diff --git a/packages/ui/src/components/version/VersionSummary.vue b/packages/ui/src/components/version/VersionSummary.vue
index 8e26a8ea1c..db345933bd 100644
--- a/packages/ui/src/components/version/VersionSummary.vue
+++ b/packages/ui/src/components/version/VersionSummary.vue
@@ -11,27 +11,25 @@
 				{{ version.name }}
 			</p>
 		</div>
-		<ButtonStyled color="brand">
-			<a
-				:href="downloadUrl"
-				:download="primaryFilename"
-				class="min-w-0"
-				@click="emit('onDownload')"
-			>
-				<DownloadIcon aria-hidden="true" /> Download
-			</a>
-		</ButtonStyled>
-		<ButtonStyled circular>
-			<button
-				class="min-w-0"
-				aria-label="View version"
-				@click="
-					emit('onNavigate', `/project/${props.version.project_id}/version/${props.version.id}`)
-				"
-			>
-				<ExternalIcon aria-hidden="true" />
-			</button>
-		</ButtonStyled>
+		<ButtonLink
+			type="colored"
+			color="brand"
+			:href="downloadUrl"
+			:download="primaryFilename"
+			class="min-w-0"
+			@click="emit('onDownload')"
+		>
+			<DownloadIcon aria-hidden="true" /> Download
+		</ButtonLink>
+		<IconButton
+			label="View version"
+			class="min-w-0"
+			@click="
+				emit('onNavigate', `/project/${props.version.project_id}/version/${props.version.id}`)
+			"
+		>
+			<ExternalIcon aria-hidden="true" />
+		</IconButton>
 	</div>
 </template>
 
@@ -40,7 +38,9 @@ import { DownloadIcon, ExternalIcon } from '@modrinth/assets'
 import type { Version, VersionFile } from '@modrinth/utils'
 import { computed } from 'vue'
 
-import { ButtonStyled, VersionChannelIndicator } from '../index'
+import { ButtonLink, IconButton } from '#ui/components/base/buttons'
+
+import { VersionChannelIndicator } from '../index'
 
 const props = defineProps<{
 	version: Version
diff --git a/packages/ui/src/layouts/shared/browse-tab/components/SelectedProjectsFloatingBar.vue b/packages/ui/src/layouts/shared/browse-tab/components/SelectedProjectsFloatingBar.vue
index a97ac6ba2a..5fc1a98cb1 100644
--- a/packages/ui/src/layouts/shared/browse-tab/components/SelectedProjectsFloatingBar.vue
+++ b/packages/ui/src/layouts/shared/browse-tab/components/SelectedProjectsFloatingBar.vue
@@ -40,25 +40,28 @@
 				{{ selectedCountText }}
 			</span>
 			<div class="mx-0.5 h-6 w-px bg-surface-5" />
-			<ButtonStyled type="transparent">
-				<button
-					type="button"
-					class="!text-primary"
-					:disabled="isInstallingSelected"
-					@click="clearSelected"
-				>
-					<span>{{ formatMessage(commonMessages.clearButton) }}</span>
-				</button>
-			</ButtonStyled>
+			<Button
+				type="quiet"
+				native-type="button"
+				class="!text-primary"
+				:disabled="isInstallingSelected"
+				@click="clearSelected"
+			>
+				<span>{{ formatMessage(commonMessages.clearButton) }}</span>
+			</Button>
 		</div>
 
 		<div class="ml-auto shrink-0">
-			<ButtonStyled color="green">
-				<button type="button" :disabled="isInstallingSelected" @click="installSelected">
-					<PlusIcon />
-					{{ installButtonText }}
-				</button>
-			</ButtonStyled>
+			<Button
+				type="colored"
+				color="green"
+				native-type="button"
+				:disabled="isInstallingSelected"
+				@click="installSelected"
+			>
+				<PlusIcon />
+				{{ installButtonText }}
+			</Button>
 		</div>
 	</FloatingActionBar>
 </template>
@@ -68,7 +71,7 @@ import { PlusIcon } from '@modrinth/assets'
 import { computed } from 'vue'
 
 import Avatar from '#ui/components/base/Avatar.vue'
-import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
+import { Button } from '#ui/components/base/buttons'
 import FloatingActionBar from '#ui/components/base/FloatingActionBar.vue'
 import { defineMessages, useVIntl } from '#ui/composables/i18n'
 import { commonMessages } from '#ui/utils/common-messages'
diff --git a/packages/ui/src/layouts/shared/browse-tab/components/SelectedProjectsLeaveModal.vue b/packages/ui/src/layouts/shared/browse-tab/components/SelectedProjectsLeaveModal.vue
index c20bae50c8..450c70665b 100644
--- a/packages/ui/src/layouts/shared/browse-tab/components/SelectedProjectsLeaveModal.vue
+++ b/packages/ui/src/layouts/shared/browse-tab/components/SelectedProjectsLeaveModal.vue
@@ -6,24 +6,18 @@
 
 		<template #actions>
 			<div class="flex flex-wrap justify-end gap-2">
-				<ButtonStyled type="outlined">
-					<button @click="resolve('cancel')">
-						<XIcon />
-						{{ formatMessage(commonMessages.cancelButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="red">
-					<button :disabled="installing" @click="resolve('discard')">
-						<TrashIcon />
-						{{ formatMessage(messages.discardButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="green">
-					<button :disabled="installing" @click="resolve('install')">
-						<PlusIcon />
-						{{ formatMessage(commonMessages.installButton) }}
-					</button>
-				</ButtonStyled>
+				<Button type="outlined" @click="resolve('cancel')">
+					<XIcon />
+					{{ formatMessage(commonMessages.cancelButton) }}
+				</Button>
+				<Button type="colored" color="red" :disabled="installing" @click="resolve('discard')">
+					<TrashIcon />
+					{{ formatMessage(messages.discardButton) }}
+				</Button>
+				<Button type="colored" color="green" :disabled="installing" @click="resolve('install')">
+					<PlusIcon />
+					{{ formatMessage(commonMessages.installButton) }}
+				</Button>
 			</div>
 		</template>
 	</NewModal>
@@ -33,7 +27,7 @@
 import { PlusIcon, TrashIcon, XIcon } from '@modrinth/assets'
 import { ref } from 'vue'
 
-import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
+import { Button } from '#ui/components/base/buttons'
 import NewModal from '#ui/components/modal/NewModal.vue'
 import { defineMessages, useVIntl } from '#ui/composables/i18n'
 import { commonMessages } from '#ui/utils/common-messages'
diff --git a/packages/ui/src/layouts/shared/browse-tab/header.vue b/packages/ui/src/layouts/shared/browse-tab/header.vue
index cda1745fb1..b2094e07fa 100644
--- a/packages/ui/src/layouts/shared/browse-tab/header.vue
+++ b/packages/ui/src/layouts/shared/browse-tab/header.vue
@@ -6,7 +6,7 @@ import { useRouter } from 'vue-router'
 
 import Admonition from '#ui/components/base/Admonition.vue'
 import Avatar from '#ui/components/base/Avatar.vue'
-import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
+import { IconButton } from '#ui/components/base/buttons'
 import PageHeader from '#ui/components/base/page-header/index.vue'
 import PageHeaderMetadata from '#ui/components/base/page-header/metadata/index.vue'
 import PageHeaderMetadataItem from '#ui/components/base/page-header/metadata/page-header-metadata-item.vue'
@@ -146,16 +146,15 @@ async function handleSelectedProjectsLeaveResult(
 			truncate-title
 		>
 			<template #leading>
-				<ButtonStyled circular size="large">
-					<button
-						v-tooltip="installContext.backLabel"
-						type="button"
-						:aria-label="installContext.backLabel"
-						@click="handleBack"
-					>
-						<LeftArrowIcon />
-					</button>
-				</ButtonStyled>
+				<IconButton
+					v-tooltip="installContext.backLabel"
+					size="xl"
+					:label="installContext.backLabel"
+					native-type="button"
+					@click="handleBack"
+				>
+					<LeftArrowIcon />
+				</IconButton>
 				<Avatar
 					v-if="iconSrc"
 					:src="iconSrc"
diff --git a/packages/ui/src/layouts/shared/browse-tab/layout.vue b/packages/ui/src/layouts/shared/browse-tab/layout.vue
index c407a9be94..371333d612 100644
--- a/packages/ui/src/layouts/shared/browse-tab/layout.vue
+++ b/packages/ui/src/layouts/shared/browse-tab/layout.vue
@@ -3,7 +3,7 @@ import type { Labrinth } from '@modrinth/api-client'
 import { SearchIcon } from '@modrinth/assets'
 import { computed, ref, toValue } from 'vue'
 
-import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
+import { Button, IconButton } from '#ui/components/base/buttons'
 import Combobox, { type ComboboxOption } from '#ui/components/base/Combobox.vue'
 import LoadingIndicator from '#ui/components/base/LoadingIndicator.vue'
 import NavTabs from '#ui/components/base/NavTabs.vue'
@@ -20,6 +20,7 @@ import type { SortType } from '#ui/utils/search'
 import SelectedProjectsFloatingBar from './components/SelectedProjectsFloatingBar.vue'
 import BrowseInstallHeader from './header.vue'
 import { injectBrowseManager } from './providers/browse-manager'
+import type { CardAction } from './types'
 
 const ctx = injectBrowseManager()
 const { formatMessage } = useVIntl()
@@ -67,6 +68,27 @@ const messages = defineMessages({
 	},
 })
 
+function cardActionType(action: CardAction) {
+	if (action.type === 'transparent') return 'quiet'
+	if (action.type === 'outlined') return 'outlined'
+	return action.color && action.color !== 'standard' ? 'colored' : 'base'
+}
+
+function cardActionColor(action: CardAction) {
+	const type = cardActionType(action)
+	return type === 'colored' || type === 'quiet' ? action.color : undefined
+}
+
+function cardActionClass(action: CardAction) {
+	if (action.type !== 'outlined' || !action.color || action.color === 'standard') return undefined
+
+	return {
+		brand: '!text-brand [&>svg]:!text-brand !shadow-[inset_0_0_0_1px_var(--color-brand)]',
+		red: '!text-red [&>svg]:!text-red !shadow-[inset_0_0_0_1px_var(--color-red)]',
+		green: '!text-green [&>svg]:!text-green !shadow-[inset_0_0_0_1px_var(--color-green)]',
+	}[action.color]
+}
+
 function getLoaderFieldValues(
 	result: Labrinth.Search.v3.ResultSearchProject,
 	field: string,
@@ -133,6 +155,7 @@ function getProjectCardTags(result: Labrinth.Search.v3.ResultSearchProject, disp
 		<Combobox
 			:model-value="ctx.effectiveCurrentSortType.value"
 			:options="sortOptions"
+			trigger-type="base"
 			:class="
 				ctx.variant === 'web'
 					? '!w-[16rem] min-w-max max-w-full flex-grow md:flex-grow-0'
@@ -150,6 +173,7 @@ function getProjectCardTags(result: Labrinth.Search.v3.ResultSearchProject, disp
 		<Combobox
 			:model-value="ctx.maxResults.value"
 			:options="maxResultsOptions"
+			trigger-type="base"
 			:class="
 				ctx.variant === 'web'
 					? '!w-[9rem] min-w-max max-w-full flex-grow md:flex-grow-0'
@@ -164,18 +188,18 @@ function getProjectCardTags(result: Labrinth.Search.v3.ResultSearchProject, disp
 		</Combobox>
 
 		<div v-if="ctx.filtersMenuOpen && !ctx.filtersMenuOpen.value" class="lg:hidden">
-			<ButtonStyled>
-				<button @click="ctx.filtersMenuOpen.value = true">
-					{{ formatMessage(messages.filterResults) }}
-				</button>
-			</ButtonStyled>
+			<Button @click="ctx.filtersMenuOpen.value = true">
+				{{ formatMessage(messages.filterResults) }}
+			</Button>
 		</div>
 
-		<ButtonStyled v-if="ctx.cycleDisplayMode" circular>
-			<button @click="ctx.cycleDisplayMode!()">
-				<slot name="display-mode-icon" />
-			</button>
-		</ButtonStyled>
+		<IconButton
+			v-if="ctx.cycleDisplayMode"
+			label="Change display mode"
+			@click="ctx.cycleDisplayMode!()"
+		>
+			<slot name="display-mode-icon" />
+		</IconButton>
 
 		<Pagination
 			:page="ctx.currentPage.value"
@@ -253,22 +277,35 @@ function getProjectCardTags(result: Labrinth.Search.v3.ResultSearchProject, disp
 				>
 					<template v-if="ctx.getCardActions?.(result, ctx.projectType.value)?.length" #actions>
 						<div class="flex gap-2">
-							<ButtonStyled
+							<template
 								v-for="action in ctx.getCardActions(result, ctx.projectType.value)"
 								:key="action.key"
-								:color="action.color"
-								:type="action.type"
-								:circular="action.circular"
 							>
-								<button
+								<IconButton
+									v-if="action.circular"
 									v-tooltip="action.tooltip"
+									:type="cardActionType(action)"
+									:color="cardActionColor(action)"
+									:class="cardActionClass(action)"
+									:label="action.label || action.tooltip || action.key"
 									:disabled="action.disabled"
 									@click.stop="action.onClick"
 								>
 									<component :is="action.icon" :class="action.iconClass" />
-									<template v-if="!action.circular">{{ action.label }}</template>
-								</button>
-							</ButtonStyled>
+								</IconButton>
+								<Button
+									v-else
+									v-tooltip="action.tooltip"
+									:type="cardActionType(action)"
+									:color="cardActionColor(action)"
+									:class="cardActionClass(action)"
+									:disabled="action.disabled"
+									@click.stop="action.onClick"
+								>
+									<component :is="action.icon" :class="action.iconClass" />
+									{{ action.label }}
+								</Button>
+							</template>
 						</div>
 					</template>
 				</ProjectCard>
@@ -315,22 +352,35 @@ function getProjectCardTags(result: Labrinth.Search.v3.ResultSearchProject, disp
 				>
 					<template v-if="ctx.getCardActions?.(result, ctx.projectType.value)?.length" #actions>
 						<div class="flex gap-2">
-							<ButtonStyled
+							<template
 								v-for="action in ctx.getCardActions(result, ctx.projectType.value)"
 								:key="action.key"
-								:color="action.color"
-								:type="action.type"
-								:circular="action.circular"
 							>
-								<button
+								<IconButton
+									v-if="action.circular"
 									v-tooltip="action.tooltip"
+									:type="cardActionType(action)"
+									:color="cardActionColor(action)"
+									:class="cardActionClass(action)"
+									:label="action.label || action.tooltip || action.key"
 									:disabled="action.disabled"
 									@click.stop="action.onClick"
 								>
 									<component :is="action.icon" :class="action.iconClass" />
-									<template v-if="!action.circular">{{ action.label }}</template>
-								</button>
-							</ButtonStyled>
+								</IconButton>
+								<Button
+									v-else
+									v-tooltip="action.tooltip"
+									:type="cardActionType(action)"
+									:color="cardActionColor(action)"
+									:class="cardActionClass(action)"
+									:disabled="action.disabled"
+									@click.stop="action.onClick"
+								>
+									<component :is="action.icon" :class="action.iconClass" />
+									{{ action.label }}
+								</Button>
+							</template>
 						</div>
 					</template>
 				</ProjectCard>
diff --git a/packages/ui/src/layouts/shared/browse-tab/sidebar.vue b/packages/ui/src/layouts/shared/browse-tab/sidebar.vue
index 29a78996ed..399d3153b2 100644
--- a/packages/ui/src/layouts/shared/browse-tab/sidebar.vue
+++ b/packages/ui/src/layouts/shared/browse-tab/sidebar.vue
@@ -2,7 +2,7 @@
 import { InfoIcon, XIcon } from '@modrinth/assets'
 import { computed, toValue } from 'vue'
 
-import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
+import { IconButton } from '#ui/components/base/buttons'
 import Toggle from '#ui/components/base/Toggle.vue'
 import SearchSidebarFilter from '#ui/components/search/SearchSidebarFilter.vue'
 import { useVIntl } from '#ui/composables/i18n'
@@ -103,11 +103,9 @@ function getFilterOpenByDefault(filterId: string): boolean {
 			class="sticky top-0 z-10 mx-1 flex items-center justify-between gap-3 border-0 border-b-[1px] border-solid border-divider bg-bg-raised px-6 py-4"
 		>
 			<h3 class="m-0 text-lg text-contrast">{{ formatMessage(commonMessages.filtersLabel) }}</h3>
-			<ButtonStyled circular>
-				<button @click="closeFiltersMenu">
-					<XIcon />
-				</button>
-			</ButtonStyled>
+			<IconButton label="Close" @click="closeFiltersMenu">
+				<XIcon />
+			</IconButton>
 		</div>
 
 		<div
diff --git a/packages/ui/src/layouts/shared/console/components/ConsoleActionButtons.vue b/packages/ui/src/layouts/shared/console/components/ConsoleActionButtons.vue
index a720d5fb54..10671ffed7 100644
--- a/packages/ui/src/layouts/shared/console/components/ConsoleActionButtons.vue
+++ b/packages/ui/src/layouts/shared/console/components/ConsoleActionButtons.vue
@@ -1,43 +1,43 @@
 <template>
 	<div class="flex items-center gap-1">
-		<ButtonStyled v-if="showClear && hasLogs" type="transparent">
-			<button
-				v-tooltip="clearDisabled ? clearDisabledTooltip : undefined"
-				:disabled="clearDisabled"
-				@click="emit('clear')"
-			>
-				<XIcon />
-				Clear
-			</button>
-		</ButtonStyled>
-		<ButtonStyled v-if="showDelete" type="transparent" hover-color-fill="background" color="red">
-			<button
-				v-tooltip="deleteDisabled ? deleteDisabledTooltip : undefined"
-				:disabled="deleteDisabled"
-				@click="emit('delete')"
-			>
-				<TrashIcon />
-				Delete
-			</button>
-		</ButtonStyled>
-		<ButtonStyled v-if="hasLogs" type="transparent">
-			<button
-				v-tooltip="shareDisabled ? shareDisabledTooltip : undefined"
-				:disabled="shareDisabled || sharing"
-				@click="emit('share')"
-			>
-				<SpinnerIcon v-if="sharing" class="animate-spin" />
-				<ShareIcon v-else />
-				Share
-			</button>
-		</ButtonStyled>
-		<ButtonStyled type="transparent">
-			<button @click="emit('toggle-fullscreen')">
-				<ContractIcon v-if="fullscreen" />
-				<ExpandIcon v-else />
-				{{ fullscreen ? 'Collapse' : 'Expand' }}
-			</button>
-		</ButtonStyled>
+		<Button
+			v-if="showClear && hasLogs"
+			v-tooltip="clearDisabled ? clearDisabledTooltip : undefined"
+			type="quiet"
+			:disabled="clearDisabled"
+			@click="emit('clear')"
+		>
+			<XIcon />
+			Clear
+		</Button>
+		<Button
+			v-if="showDelete"
+			v-tooltip="deleteDisabled ? deleteDisabledTooltip : undefined"
+			type="quiet"
+			color="red"
+			:disabled="deleteDisabled"
+			class="hover:!bg-red focus-visible:!bg-red hover:!text-[var(--color-accent-contrast)] focus-visible:!text-[var(--color-accent-contrast)]"
+			@click="emit('delete')"
+		>
+			<TrashIcon />
+			Delete
+		</Button>
+		<Button
+			v-if="hasLogs"
+			v-tooltip="shareDisabled ? shareDisabledTooltip : undefined"
+			type="quiet"
+			:disabled="shareDisabled || sharing"
+			@click="emit('share')"
+		>
+			<SpinnerIcon v-if="sharing" class="animate-spin" />
+			<ShareIcon v-else />
+			Share
+		</Button>
+		<Button type="quiet" @click="emit('toggle-fullscreen')">
+			<ContractIcon v-if="fullscreen" />
+			<ExpandIcon v-else />
+			{{ fullscreen ? 'Collapse' : 'Expand' }}
+		</Button>
 	</div>
 </template>
 
@@ -51,7 +51,7 @@ import {
 	XIcon,
 } from '@modrinth/assets'
 
-import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
+import { Button } from '#ui/components/base/buttons'
 
 defineProps<{
 	showClear?: boolean
diff --git a/packages/ui/src/layouts/shared/console/layout.vue b/packages/ui/src/layouts/shared/console/layout.vue
index 038f596fd4..a38881d351 100644
--- a/packages/ui/src/layouts/shared/console/layout.vue
+++ b/packages/ui/src/layouts/shared/console/layout.vue
@@ -27,6 +27,7 @@
 				<Combobox
 					:model-value="ctx.activeLogSourceIndex.value"
 					:options="logSourceOptions"
+					trigger-size="lg"
 					@update:model-value="(v) => (ctx.activeLogSourceIndex!.value = v)"
 				/>
 			</div>
@@ -79,18 +80,14 @@
 		</div>
 		<template #actions>
 			<div class="flex justify-end gap-2">
-				<ButtonStyled type="outlined">
-					<button @click="deleteModal?.hide()">
-						<XIcon />
-						Cancel
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="red">
-					<button :disabled="isDeleting" @click="confirmDelete">
-						<TrashIcon />
-						Delete
-					</button>
-				</ButtonStyled>
+				<Button type="outlined" @click="deleteModal?.hide()">
+					<XIcon />
+					Cancel
+				</Button>
+				<Button type="colored" color="red" :disabled="isDeleting" @click="confirmDelete">
+					<TrashIcon />
+					Delete
+				</Button>
 			</div>
 		</template>
 	</NewModal>
@@ -103,7 +100,7 @@ import { computed, isRef, nextTick, onBeforeUnmount, ref, watch } from 'vue'
 
 import Admonition from '#ui/components/base/Admonition.vue'
 import BaseTerminal from '#ui/components/base/BaseTerminal.vue'
-import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
+import { Button } from '#ui/components/base/buttons'
 import type { CollapsibleAdmonitionItem } from '#ui/components/base/CollapsibleAdmonition.vue'
 import CollapsibleAdmonition from '#ui/components/base/CollapsibleAdmonition.vue'
 import Combobox from '#ui/components/base/Combobox.vue'
diff --git a/packages/ui/src/layouts/shared/content-tab/components/ContentCardItem.vue b/packages/ui/src/layouts/shared/content-tab/components/ContentCardItem.vue
index 930615c2f5..1070c4fc84 100644
--- a/packages/ui/src/layouts/shared/content-tab/components/ContentCardItem.vue
+++ b/packages/ui/src/layouts/shared/content-tab/components/ContentCardItem.vue
@@ -15,10 +15,9 @@ import type { RouteLocationRaw } from 'vue-router'
 import AutoLink from '#ui/components/base/AutoLink.vue'
 import Avatar from '#ui/components/base/Avatar.vue'
 import BulletDivider from '#ui/components/base/BulletDivider.vue'
-import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
+import type { OverflowMenuOption } from '#ui/components/base/buttons'
+import { IconButton, TeleportOverflowMenu } from '#ui/components/base/buttons'
 import Checkbox from '#ui/components/base/Checkbox.vue'
-import type { Option as OverflowMenuOption } from '#ui/components/base/OverflowMenu.vue'
-import TeleportOverflowMenu from '#ui/components/base/TeleportOverflowMenu.vue'
 import Toggle from '#ui/components/base/Toggle.vue'
 import { defineMessages, useVIntl } from '#ui/composables/i18n'
 import { commonMessages } from '#ui/utils/common-messages'
@@ -313,43 +312,44 @@ const deleteHovered = ref(false)
 				v-if="hasUpdateListener || hasSwitchVersionListener"
 				class="flex w-8 items-center justify-center"
 			>
-				<ButtonStyled
+				<IconButton
 					v-if="hasUpdate"
-					circular
-					type="transparent"
+					v-tooltip="
+						isDisabled && disabledTooltip
+							? disabledTooltip
+							: formatMessage(commonMessages.updateAvailableLabel)
+					"
+					type="quiet"
 					color="green"
-					color-fill="text"
-					hover-color-fill="background"
+					:label="
+						isDisabled && disabledTooltip
+							? disabledTooltip
+							: formatMessage(commonMessages.updateAvailableLabel)
+					"
+					:disabled="isDisabled"
+					class="hover:!bg-green focus-visible:!bg-green hover:!text-[var(--color-accent-contrast)] focus-visible:!text-[var(--color-accent-contrast)]"
+					@click="emit('update')"
 				>
-					<button
-						v-tooltip="
-							isDisabled && disabledTooltip
-								? disabledTooltip
-								: formatMessage(commonMessages.updateAvailableLabel)
-						"
-						:disabled="isDisabled"
-						@click="emit('update')"
-					>
-						<DownloadIcon class="size-5" />
-					</button>
-				</ButtonStyled>
-				<ButtonStyled
+					<DownloadIcon class="size-5" />
+				</IconButton>
+				<IconButton
 					v-else-if="hasSwitchVersionListener && version && !hideSwitchVersion"
-					circular
-					type="transparent"
+					v-tooltip="
+						isDisabled && disabledTooltip
+							? disabledTooltip
+							: formatMessage(commonMessages.switchVersionButton)
+					"
+					type="quiet"
+					:label="
+						isDisabled && disabledTooltip
+							? disabledTooltip
+							: formatMessage(commonMessages.switchVersionButton)
+					"
+					:disabled="isDisabled"
+					@click="emit('switchVersion')"
 				>
-					<button
-						v-tooltip="
-							isDisabled && disabledTooltip
-								? disabledTooltip
-								: formatMessage(commonMessages.switchVersionButton)
-						"
-						:disabled="isDisabled"
-						@click="emit('switchVersion')"
-					>
-						<ArrowLeftRightIcon class="size-5" />
-					</button>
-				</ButtonStyled>
+					<ArrowLeftRightIcon class="size-5" />
+				</IconButton>
 			</div>
 
 			<Toggle
@@ -366,46 +366,55 @@ const deleteHovered = ref(false)
 				@update:model-value="(val) => emit('update:enabled', val as boolean)"
 			/>
 
-			<ButtonStyled v-if="hasDeleteListener && !props.hideDelete" circular type="transparent">
-				<button
-					v-tooltip="
-						isDisabled && disabledTooltip
-							? disabledTooltip
-							: formatMessage(
-									shiftHeld && deleteHovered
-										? commonMessages.deleteImmediatelyLabel
-										: commonMessages.deleteLabel,
-								)
-					"
-					:disabled="isDisabled"
-					@click="emit('delete', $event)"
-					@mouseenter="deleteHovered = true"
-					@mouseleave="deleteHovered = false"
-				>
-					<span class="relative size-5">
-						<TrashIcon
-							class="absolute inset-0 size-5 text-secondary transition-opacity duration-200"
-							:class="shiftHeld && deleteHovered ? 'opacity-0' : 'opacity-100'"
-						/>
-						<TrashExclamationIcon
-							class="absolute inset-0 size-5 text-red transition-opacity duration-200"
-							:class="shiftHeld && deleteHovered ? 'opacity-100' : 'opacity-0'"
-						/>
-					</span>
-				</button>
-			</ButtonStyled>
+			<IconButton
+				v-if="hasDeleteListener && !props.hideDelete"
+				v-tooltip="
+					isDisabled && disabledTooltip
+						? disabledTooltip
+						: formatMessage(
+								shiftHeld && deleteHovered
+									? commonMessages.deleteImmediatelyLabel
+									: commonMessages.deleteLabel,
+							)
+				"
+				type="quiet"
+				:label="
+					isDisabled && disabledTooltip
+						? disabledTooltip
+						: formatMessage(
+								shiftHeld && deleteHovered
+									? commonMessages.deleteImmediatelyLabel
+									: commonMessages.deleteLabel,
+							)
+				"
+				:disabled="isDisabled"
+				@click="emit('delete', $event)"
+				@mouseenter="deleteHovered = true"
+				@mouseleave="deleteHovered = false"
+			>
+				<span class="relative size-5">
+					<TrashIcon
+						class="absolute inset-0 size-5 text-secondary transition-opacity duration-200"
+						:class="shiftHeld && deleteHovered ? 'opacity-0' : 'opacity-100'"
+					/>
+					<TrashExclamationIcon
+						class="absolute inset-0 size-5 text-red transition-opacity duration-200"
+						:class="shiftHeld && deleteHovered ? 'opacity-100' : 'opacity-0'"
+					/>
+				</span>
+			</IconButton>
 
 			<slot name="additionalButtonsRight" />
 
-			<ButtonStyled circular type="transparent">
-				<TeleportOverflowMenu
-					v-if="overflowOptions?.length"
-					:options="overflowOptions"
-					:disabled="isDisabled"
-				>
-					<MoreVerticalIcon class="size-5" />
-				</TeleportOverflowMenu>
-			</ButtonStyled>
+			<TeleportOverflowMenu
+				v-if="overflowOptions?.length"
+				type="quiet"
+				label="More options"
+				:options="overflowOptions"
+				:disabled="isDisabled"
+			>
+				<MoreVerticalIcon class="size-5" />
+			</TeleportOverflowMenu>
 		</div>
 	</div>
 </template>
diff --git a/packages/ui/src/layouts/shared/content-tab/components/ContentModpackCard.vue b/packages/ui/src/layouts/shared/content-tab/components/ContentModpackCard.vue
index e6898f8eae..fa36c4de7f 100644
--- a/packages/ui/src/layouts/shared/content-tab/components/ContentModpackCard.vue
+++ b/packages/ui/src/layouts/shared/content-tab/components/ContentModpackCard.vue
@@ -14,12 +14,13 @@ import type { RouteLocationRaw } from 'vue-router'
 import AutoLink from '#ui/components/base/AutoLink.vue'
 import Avatar from '#ui/components/base/Avatar.vue'
 import BulletDivider from '#ui/components/base/BulletDivider.vue'
-import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
-import OverflowMenu, {
-	type Option as OverflowMenuOption,
-} from '#ui/components/base/OverflowMenu.vue'
+import {
+	Button,
+	IconButton,
+	type OverflowMenuOption,
+	TeleportOverflowMenu,
+} from '#ui/components/base/buttons'
 import TagTagItem from '#ui/components/base/TagTagItem.vue'
-import TeleportOverflowMenu from '#ui/components/base/TeleportOverflowMenu.vue'
 import { useRelativeTime } from '#ui/composables/how-ago'
 import { defineMessages, useVIntl } from '#ui/composables/i18n'
 import { commonMessages } from '#ui/utils/common-messages'
@@ -83,21 +84,19 @@ const formatCompact = (n: number | undefined) => {
 	return new Intl.NumberFormat('en', { notation: 'compact', maximumFractionDigits: 2 }).format(n)
 }
 
-const collapsedOptions = computed(() => {
-	const options: {
-		id: string
-		action: () => void
-		color?: 'standard' | 'red' | 'brand' | 'orange' | 'green' | 'blue' | 'purple'
-	}[] = []
+const collapsedOptions = computed<OverflowMenuOption[]>(() => {
+	const options: OverflowMenuOption[] = []
 	if (hasContentListener.value) {
 		options.push({
 			id: 'content',
+			label: formatMessage(commonMessages.contentLabel),
 			action: () => emit('content'),
 		})
 	}
 	if (hasSettingsListener.value) {
 		options.push({
 			id: 'settings',
+			label: formatMessage(messages.installationSettingsTooltip),
 			action: () => emit('settings'),
 		})
 	}
@@ -205,70 +204,72 @@ onUnmounted(() => {
 				<template v-else>
 					<!-- Expanded actions visible at >= 700px -->
 					<div class="hidden @[700px]:flex items-center gap-2">
-						<ButtonStyled
+						<Button
 							v-if="hasUpdateListener && hasUpdate"
-							type="transparent"
+							type="quiet"
 							color="green"
-							color-fill="text"
+							class="flex items-center gap-2"
+							@click="emit('update')"
 						>
-							<button class="flex items-center gap-2" @click="emit('update')">
-								<DownloadIcon class="!text-green" />
-								<span class="font-semibold">{{ formatMessage(commonMessages.updateButton) }}</span>
-							</button>
-						</ButtonStyled>
+							<DownloadIcon class="!text-green" />
+							<span class="font-semibold">{{ formatMessage(commonMessages.updateButton) }}</span>
+						</Button>
 
-						<ButtonStyled v-if="hasContentListener">
-							<button class="!shadow-none" @click="emit('content')">
-								<BoxesIcon />
-								{{ formatMessage(commonMessages.contentLabel) }}
-							</button>
-						</ButtonStyled>
+						<Button v-if="hasContentListener" type="base" @click="emit('content')">
+							<BoxesIcon />
+							{{ formatMessage(commonMessages.contentLabel) }}
+						</Button>
 
-						<ButtonStyled v-if="hasSettingsListener" type="outlined" circular>
-							<button
-								v-tooltip="formatMessage(messages.installationSettingsTooltip)"
-								@click="emit('settings')"
-							>
-								<Settings2Icon />
-							</button>
-						</ButtonStyled>
+						<IconButton
+							v-if="hasSettingsListener"
+							v-tooltip="formatMessage(messages.installationSettingsTooltip)"
+							type="outlined"
+							:label="formatMessage(messages.installationSettingsTooltip)"
+							@click="emit('settings')"
+						>
+							<Settings2Icon />
+						</IconButton>
 					</div>
 
 					<!-- Collapsed actions visible at < 700px -->
 					<div v-if="hasUpdate && hasUpdateListener" class="flex @[700px]:hidden">
-						<ButtonStyled circular type="transparent" color="green" color-fill="text">
-							<button
-								v-tooltip="formatMessage(commonMessages.updateButton)"
-								@click="emit('update')"
-							>
-								<DownloadIcon class="size-5" />
-							</button>
-						</ButtonStyled>
+						<IconButton
+							v-tooltip="formatMessage(commonMessages.updateButton)"
+							type="quiet"
+							color="green"
+							:label="formatMessage(commonMessages.updateButton)"
+							@click="emit('update')"
+						>
+							<DownloadIcon class="size-5" />
+						</IconButton>
 					</div>
-					<ButtonStyled v-if="collapsedOptions.length" circular type="outlined">
-						<TeleportOverflowMenu :options="collapsedOptions" class="flex @[700px]:hidden">
-							<MoreVerticalIcon class="size-5" />
-							<template #content>
-								<BoxesIcon class="size-5" />
-								{{ formatMessage(commonMessages.contentLabel) }}
-							</template>
-							<template #settings>
-								<Settings2Icon class="size-5" />
-								{{ formatMessage(messages.installationSettingsTooltip) }}
-							</template>
-						</TeleportOverflowMenu>
-					</ButtonStyled>
-
-					<ButtonStyled
-						v-if="overflowOptions?.length"
-						circular
-						type="transparent"
-						class="hidden @[700px]:flex"
+					<TeleportOverflowMenu
+						v-if="collapsedOptions.length"
+						type="outlined"
+						label="More options"
+						:options="collapsedOptions"
+						class="flex @[700px]:hidden"
 					>
-						<OverflowMenu :options="overflowOptions">
-							<MoreVerticalIcon class="size-5" />
-						</OverflowMenu>
-					</ButtonStyled>
+						<MoreVerticalIcon class="size-5" />
+						<template #content>
+							<BoxesIcon class="size-5" />
+							{{ formatMessage(commonMessages.contentLabel) }}
+						</template>
+						<template #settings>
+							<Settings2Icon class="size-5" />
+							{{ formatMessage(messages.installationSettingsTooltip) }}
+						</template>
+					</TeleportOverflowMenu>
+
+					<TeleportOverflowMenu
+						v-if="overflowOptions?.length"
+						type="quiet"
+						label="More options"
+						class="hidden @[700px]:flex"
+						:options="overflowOptions"
+					>
+						<MoreVerticalIcon class="size-5" />
+					</TeleportOverflowMenu>
 				</template>
 			</div>
 		</div>
diff --git a/packages/ui/src/layouts/shared/content-tab/components/ContentSelectionBar.vue b/packages/ui/src/layouts/shared/content-tab/components/ContentSelectionBar.vue
index d2693db24b..312ec5ec2c 100644
--- a/packages/ui/src/layouts/shared/content-tab/components/ContentSelectionBar.vue
+++ b/packages/ui/src/layouts/shared/content-tab/components/ContentSelectionBar.vue
@@ -3,7 +3,7 @@ import { PowerIcon, PowerOffIcon, XIcon } from '@modrinth/assets'
 import { computed } from 'vue'
 
 import Avatar from '#ui/components/base/Avatar.vue'
-import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
+import { Button } from '#ui/components/base/buttons'
 import FloatingActionBar from '#ui/components/base/FloatingActionBar.vue'
 import { defineMessages, useVIntl } from '#ui/composables/i18n'
 import { commonMessages, formatContentTypeSentence } from '#ui/utils/common-messages'
@@ -218,55 +218,54 @@ const bulkProgressMessage = computed(() => {
 				{{ selectedCountText }}
 			</span>
 			<div class="mx-0.5 h-6 w-px bg-surface-5" />
-			<ButtonStyled type="transparent">
-				<button
-					v-tooltip="formatMessage(commonMessages.clearButton)"
-					class="!text-primary"
-					:disabled="isBulkOperating"
-					:class="{ 'opacity-60 pointer-events-none': isBulkOperating }"
-					@click="emit('clear')"
-				>
-					<XIcon class="hidden cq-show-icon" />
-					<span class="bar-label">{{ formatMessage(commonMessages.clearButton) }}</span>
-				</button>
-			</ButtonStyled>
+			<Button
+				v-tooltip="formatMessage(commonMessages.clearButton)"
+				type="quiet"
+				class="!text-primary"
+				:disabled="isBulkOperating"
+				:class="{ 'opacity-60 pointer-events-none': isBulkOperating }"
+				@click="emit('clear')"
+			>
+				<XIcon class="hidden cq-show-icon" />
+				<span class="bar-label">{{ formatMessage(commonMessages.clearButton) }}</span>
+			</Button>
 		</div>
 
 		<div v-if="!isBulkOperating" class="ml-auto flex items-center gap-0.5">
 			<slot name="actions" />
 
-			<ButtonStyled v-if="hasToggleActions" type="transparent">
-				<button
-					v-tooltip="
-						isBusy && busyTooltip
-							? busyTooltip
-							: allEnabled
-								? formatMessage(messages.allAlreadyEnabled)
-								: formatMessage(commonMessages.enableButton)
-					"
-					:disabled="isBusy || allEnabled"
-					@click="emit('enable')"
-				>
-					<PowerIcon />
-					<span class="bar-label">{{ formatMessage(commonMessages.enableButton) }}</span>
-				</button>
-			</ButtonStyled>
-			<ButtonStyled v-if="hasToggleActions" type="transparent">
-				<button
-					v-tooltip="
-						isBusy && busyTooltip
-							? busyTooltip
-							: allDisabled
-								? formatMessage(messages.allAlreadyDisabled)
-								: formatMessage(commonMessages.disableButton)
-					"
-					:disabled="isBusy || allDisabled"
-					@click="emit('disable')"
-				>
-					<PowerOffIcon />
-					<span class="bar-label">{{ formatMessage(commonMessages.disableButton) }}</span>
-				</button>
-			</ButtonStyled>
+			<Button
+				v-if="hasToggleActions"
+				v-tooltip="
+					isBusy && busyTooltip
+						? busyTooltip
+						: allEnabled
+							? formatMessage(messages.allAlreadyEnabled)
+							: formatMessage(commonMessages.enableButton)
+				"
+				type="quiet"
+				:disabled="isBusy || allEnabled"
+				@click="emit('enable')"
+			>
+				<PowerIcon />
+				<span class="bar-label">{{ formatMessage(commonMessages.enableButton) }}</span>
+			</Button>
+			<Button
+				v-if="hasToggleActions"
+				v-tooltip="
+					isBusy && busyTooltip
+						? busyTooltip
+						: allDisabled
+							? formatMessage(messages.allAlreadyDisabled)
+							: formatMessage(commonMessages.disableButton)
+				"
+				type="quiet"
+				:disabled="isBusy || allDisabled"
+				@click="emit('disable')"
+			>
+				<PowerOffIcon />
+				<span class="bar-label">{{ formatMessage(commonMessages.disableButton) }}</span>
+			</Button>
 
 			<slot name="actions-end" />
 		</div>
diff --git a/packages/ui/src/layouts/shared/content-tab/components/modals/ConfirmBulkUpdateModal.vue b/packages/ui/src/layouts/shared/content-tab/components/modals/ConfirmBulkUpdateModal.vue
index 92c2863ff7..920d867b8f 100644
--- a/packages/ui/src/layouts/shared/content-tab/components/modals/ConfirmBulkUpdateModal.vue
+++ b/packages/ui/src/layouts/shared/content-tab/components/modals/ConfirmBulkUpdateModal.vue
@@ -22,22 +22,20 @@
 
 		<template #actions>
 			<div class="flex gap-2 justify-end">
-				<ButtonStyled type="outlined">
-					<button @click="modal?.hide()">
-						<XIcon />
-						{{ formatMessage(commonMessages.cancelButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="orange">
-					<button
-						v-tooltip="props.actionDisabled ? props.actionDisabledTooltip : undefined"
-						:disabled="buttonsDisabled || props.actionDisabled"
-						@click="confirm"
-					>
-						<DownloadIcon />
-						{{ formatMessage(messages.updateButton, { count: visibleCount }) }}
-					</button>
-				</ButtonStyled>
+				<Button type="outlined" @click="modal?.hide()">
+					<XIcon />
+					{{ formatMessage(commonMessages.cancelButton) }}
+				</Button>
+				<Button
+					v-tooltip="props.actionDisabled ? props.actionDisabledTooltip : undefined"
+					type="colored"
+					color="orange"
+					:disabled="buttonsDisabled || props.actionDisabled"
+					@click="confirm"
+				>
+					<DownloadIcon />
+					{{ formatMessage(messages.updateButton, { count: visibleCount }) }}
+				</Button>
 			</div>
 		</template>
 	</NewModal>
@@ -48,7 +46,7 @@ import { DownloadIcon, XIcon } from '@modrinth/assets'
 import { nextTick, ref } from 'vue'
 
 import Admonition from '#ui/components/base/Admonition.vue'
-import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
+import { Button } from '#ui/components/base/buttons'
 import NewModal from '#ui/components/modal/NewModal.vue'
 import { defineMessages, useVIntl } from '#ui/composables/i18n'
 import { commonMessages } from '#ui/utils/common-messages'
diff --git a/packages/ui/src/layouts/shared/content-tab/components/modals/ConfirmDeletionModal.vue b/packages/ui/src/layouts/shared/content-tab/components/modals/ConfirmDeletionModal.vue
index 77317e4c8c..042caff48c 100644
--- a/packages/ui/src/layouts/shared/content-tab/components/modals/ConfirmDeletionModal.vue
+++ b/packages/ui/src/layouts/shared/content-tab/components/modals/ConfirmDeletionModal.vue
@@ -23,22 +23,20 @@
 
 		<template #actions>
 			<div class="flex gap-2 justify-end">
-				<ButtonStyled type="outlined">
-					<button @click="modal?.hide()">
-						<XIcon />
-						{{ formatMessage(commonMessages.cancelButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="orange">
-					<button
-						v-tooltip="props.actionDisabled ? props.actionDisabledTooltip : undefined"
-						:disabled="buttonsDisabled || props.actionDisabled"
-						@click="confirm"
-					>
-						<TrashIcon />
-						{{ deleteButtonLabel }}
-					</button>
-				</ButtonStyled>
+				<Button type="outlined" @click="modal?.hide()">
+					<XIcon />
+					{{ formatMessage(commonMessages.cancelButton) }}
+				</Button>
+				<Button
+					v-tooltip="props.actionDisabled ? props.actionDisabledTooltip : undefined"
+					type="colored"
+					color="orange"
+					:disabled="buttonsDisabled || props.actionDisabled"
+					@click="confirm"
+				>
+					<TrashIcon />
+					{{ deleteButtonLabel }}
+				</Button>
 			</div>
 		</template>
 	</NewModal>
@@ -49,7 +47,7 @@ import { TrashIcon, XIcon } from '@modrinth/assets'
 import { computed, nextTick, ref } from 'vue'
 
 import Admonition from '#ui/components/base/Admonition.vue'
-import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
+import { Button } from '#ui/components/base/buttons'
 import NewModal from '#ui/components/modal/NewModal.vue'
 import { defineMessages, useVIntl } from '#ui/composables/i18n'
 import { commonMessages, formatContentTypeSentence } from '#ui/utils/common-messages'
diff --git a/packages/ui/src/layouts/shared/content-tab/components/modals/ConfirmDisableModal.vue b/packages/ui/src/layouts/shared/content-tab/components/modals/ConfirmDisableModal.vue
index dc1d76df7c..5a39f0d595 100644
--- a/packages/ui/src/layouts/shared/content-tab/components/modals/ConfirmDisableModal.vue
+++ b/packages/ui/src/layouts/shared/content-tab/components/modals/ConfirmDisableModal.vue
@@ -17,22 +17,20 @@
 
 		<template #actions>
 			<div class="flex gap-2 justify-end">
-				<ButtonStyled type="outlined">
-					<button @click="modal?.hide()">
-						<XIcon />
-						{{ formatMessage(commonMessages.cancelButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="orange">
-					<button
-						v-tooltip="props.actionDisabled ? props.actionDisabledTooltip : undefined"
-						:disabled="props.actionDisabled"
-						@click="confirm"
-					>
-						<SlashIcon />
-						{{ visibleWarning?.actionLabel }}
-					</button>
-				</ButtonStyled>
+				<Button type="outlined" @click="modal?.hide()">
+					<XIcon />
+					{{ formatMessage(commonMessages.cancelButton) }}
+				</Button>
+				<Button
+					v-tooltip="props.actionDisabled ? props.actionDisabledTooltip : undefined"
+					type="colored"
+					color="orange"
+					:disabled="props.actionDisabled"
+					@click="confirm"
+				>
+					<SlashIcon />
+					{{ visibleWarning?.actionLabel }}
+				</Button>
 			</div>
 		</template>
 	</NewModal>
@@ -43,7 +41,7 @@ import { SlashIcon, XIcon } from '@modrinth/assets'
 import { nextTick, ref } from 'vue'
 
 import Admonition from '#ui/components/base/Admonition.vue'
-import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
+import { Button } from '#ui/components/base/buttons'
 import NewModal from '#ui/components/modal/NewModal.vue'
 import { defineMessages, useVIntl } from '#ui/composables/i18n'
 import { commonMessages, formatContentTypeSentence } from '#ui/utils/common-messages'
diff --git a/packages/ui/src/layouts/shared/content-tab/components/modals/ConfirmModpackUpdateModal.vue b/packages/ui/src/layouts/shared/content-tab/components/modals/ConfirmModpackUpdateModal.vue
index a0ab73badf..889045bf0c 100644
--- a/packages/ui/src/layouts/shared/content-tab/components/modals/ConfirmModpackUpdateModal.vue
+++ b/packages/ui/src/layouts/shared/content-tab/components/modals/ConfirmModpackUpdateModal.vue
@@ -31,24 +31,22 @@
 
 		<template #actions>
 			<div class="flex gap-2 justify-end">
-				<ButtonStyled type="outlined">
-					<button @click="handleCancel">
-						<XIcon />
-						{{ formatMessage(commonMessages.cancelButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="orange">
-					<button
-						v-tooltip="props.actionDisabled ? props.actionDisabledTooltip : undefined"
-						:disabled="buttonsDisabled || props.actionDisabled"
-						@click="handleConfirm"
-					>
-						<DownloadIcon />
-						{{
-							formatMessage(messages.confirmButton, { action: downgrade ? 'downgrade' : 'update' })
-						}}
-					</button>
-				</ButtonStyled>
+				<Button type="outlined" @click="handleCancel">
+					<XIcon />
+					{{ formatMessage(commonMessages.cancelButton) }}
+				</Button>
+				<Button
+					v-tooltip="props.actionDisabled ? props.actionDisabledTooltip : undefined"
+					type="colored"
+					color="orange"
+					:disabled="buttonsDisabled || props.actionDisabled"
+					@click="handleConfirm"
+				>
+					<DownloadIcon />
+					{{
+						formatMessage(messages.confirmButton, { action: downgrade ? 'downgrade' : 'update' })
+					}}
+				</Button>
 			</div>
 		</template>
 	</NewModal>
@@ -59,7 +57,7 @@ import { DownloadIcon, XIcon } from '@modrinth/assets'
 import { computed, ref } from 'vue'
 
 import Admonition from '#ui/components/base/Admonition.vue'
-import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
+import { Button } from '#ui/components/base/buttons'
 import NewModal from '#ui/components/modal/NewModal.vue'
 import { defineMessages, useVIntl } from '#ui/composables/i18n'
 import { commonMessages } from '#ui/utils/common-messages'
diff --git a/packages/ui/src/layouts/shared/content-tab/components/modals/ConfirmReinstallModal.vue b/packages/ui/src/layouts/shared/content-tab/components/modals/ConfirmReinstallModal.vue
index d8946e3a5e..f51258d046 100644
--- a/packages/ui/src/layouts/shared/content-tab/components/modals/ConfirmReinstallModal.vue
+++ b/packages/ui/src/layouts/shared/content-tab/components/modals/ConfirmReinstallModal.vue
@@ -19,18 +19,14 @@
 
 		<template #actions>
 			<div class="flex gap-2 justify-end">
-				<ButtonStyled type="outlined">
-					<button @click="modal?.hide()">
-						<XIcon />
-						{{ formatMessage(commonMessages.cancelButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="red">
-					<button :disabled="buttonsDisabled" @click="confirm">
-						<DownloadIcon />
-						{{ formatMessage(messages.reinstallButton) }}
-					</button>
-				</ButtonStyled>
+				<Button type="outlined" @click="modal?.hide()">
+					<XIcon />
+					{{ formatMessage(commonMessages.cancelButton) }}
+				</Button>
+				<Button type="colored" color="red" :disabled="buttonsDisabled" @click="confirm">
+					<DownloadIcon />
+					{{ formatMessage(messages.reinstallButton) }}
+				</Button>
 			</div>
 		</template>
 	</NewModal>
@@ -41,7 +37,7 @@ import { DownloadIcon, XIcon } from '@modrinth/assets'
 import { ref } from 'vue'
 
 import Admonition from '#ui/components/base/Admonition.vue'
-import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
+import { Button } from '#ui/components/base/buttons'
 import NewModal from '#ui/components/modal/NewModal.vue'
 import { useDebugLogger } from '#ui/composables/debug-logger'
 import { defineMessages, useVIntl } from '#ui/composables/i18n'
diff --git a/packages/ui/src/layouts/shared/content-tab/components/modals/ConfirmRepairModal.vue b/packages/ui/src/layouts/shared/content-tab/components/modals/ConfirmRepairModal.vue
index a9dedf3c30..ed26509ec8 100644
--- a/packages/ui/src/layouts/shared/content-tab/components/modals/ConfirmRepairModal.vue
+++ b/packages/ui/src/layouts/shared/content-tab/components/modals/ConfirmRepairModal.vue
@@ -14,18 +14,14 @@
 
 		<template #actions>
 			<div class="flex gap-2 justify-end">
-				<ButtonStyled type="outlined">
-					<button @click="modal?.hide()">
-						<XIcon />
-						{{ formatMessage(commonMessages.cancelButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="green">
-					<button @click="confirm">
-						<HammerIcon />
-						{{ formatMessage(messages.repairButton) }}
-					</button>
-				</ButtonStyled>
+				<Button type="outlined" @click="modal?.hide()">
+					<XIcon />
+					{{ formatMessage(commonMessages.cancelButton) }}
+				</Button>
+				<Button type="colored" color="green" @click="confirm">
+					<HammerIcon />
+					{{ formatMessage(messages.repairButton) }}
+				</Button>
 			</div>
 		</template>
 	</NewModal>
@@ -35,7 +31,7 @@
 import { HammerIcon, XIcon } from '@modrinth/assets'
 import { ref } from 'vue'
 
-import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
+import { Button } from '#ui/components/base/buttons'
 import NewModal from '#ui/components/modal/NewModal.vue'
 import { useDebugLogger } from '#ui/composables/debug-logger'
 import { defineMessages, useVIntl } from '#ui/composables/i18n'
diff --git a/packages/ui/src/layouts/shared/content-tab/components/modals/ConfirmUnlinkModal.vue b/packages/ui/src/layouts/shared/content-tab/components/modals/ConfirmUnlinkModal.vue
index 9497d880cc..331e9d95dd 100644
--- a/packages/ui/src/layouts/shared/content-tab/components/modals/ConfirmUnlinkModal.vue
+++ b/packages/ui/src/layouts/shared/content-tab/components/modals/ConfirmUnlinkModal.vue
@@ -19,22 +19,20 @@
 
 		<template #actions>
 			<div class="flex gap-2 justify-end">
-				<ButtonStyled type="outlined">
-					<button @click="modal?.hide()">
-						<XIcon />
-						{{ formatMessage(commonMessages.cancelButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="orange">
-					<button
-						v-tooltip="props.actionDisabled ? props.actionDisabledTooltip : undefined"
-						:disabled="buttonsDisabled || props.actionDisabled"
-						@click="confirm"
-					>
-						<UnlinkIcon />
-						{{ formatMessage(actionMessage) }}
-					</button>
-				</ButtonStyled>
+				<Button type="outlined" @click="modal?.hide()">
+					<XIcon />
+					{{ formatMessage(commonMessages.cancelButton) }}
+				</Button>
+				<Button
+					v-tooltip="props.actionDisabled ? props.actionDisabledTooltip : undefined"
+					type="colored"
+					color="orange"
+					:disabled="buttonsDisabled || props.actionDisabled"
+					@click="confirm"
+				>
+					<UnlinkIcon />
+					{{ formatMessage(actionMessage) }}
+				</Button>
 			</div>
 		</template>
 	</NewModal>
@@ -45,7 +43,7 @@ import { UnlinkIcon, XIcon } from '@modrinth/assets'
 import { computed, ref } from 'vue'
 
 import Admonition from '#ui/components/base/Admonition.vue'
-import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
+import { Button } from '#ui/components/base/buttons'
 import NewModal from '#ui/components/modal/NewModal.vue'
 import { useDebugLogger } from '#ui/composables/debug-logger'
 import { defineMessages, useVIntl } from '#ui/composables/i18n'
diff --git a/packages/ui/src/layouts/shared/content-tab/components/modals/ContentDependencyWarningModal.vue b/packages/ui/src/layouts/shared/content-tab/components/modals/ContentDependencyWarningModal.vue
index eccfc87e16..9d1d50f10a 100644
--- a/packages/ui/src/layouts/shared/content-tab/components/modals/ContentDependencyWarningModal.vue
+++ b/packages/ui/src/layouts/shared/content-tab/components/modals/ContentDependencyWarningModal.vue
@@ -168,22 +168,20 @@
 
 		<template #actions>
 			<div class="flex justify-end gap-2">
-				<ButtonStyled type="outlined">
-					<button class="!border !border-surface-5" @click="hide">
-						<XIcon aria-hidden="true" />
-						{{ formatMessage(commonMessages.cancelButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="red">
-					<button
-						v-tooltip="props.actionDisabled ? props.actionDisabledTooltip : undefined"
-						:disabled="buttonsDisabled || props.actionDisabled"
-						@click="confirm"
-					>
-						<TrashIcon aria-hidden="true" />
-						{{ deleteButtonLabel }}
-					</button>
-				</ButtonStyled>
+				<Button type="outlined" class="!border !border-surface-5" @click="hide">
+					<XIcon aria-hidden="true" />
+					{{ formatMessage(commonMessages.cancelButton) }}
+				</Button>
+				<Button
+					v-tooltip="props.actionDisabled ? props.actionDisabledTooltip : undefined"
+					type="colored"
+					color="red"
+					:disabled="buttonsDisabled || props.actionDisabled"
+					@click="confirm"
+				>
+					<TrashIcon aria-hidden="true" />
+					{{ deleteButtonLabel }}
+				</Button>
 			</div>
 		</template>
 	</NewModal>
@@ -194,7 +192,7 @@ import { TrashIcon, XIcon } from '@modrinth/assets'
 import { computed, nextTick, ref } from 'vue'
 
 import Admonition from '#ui/components/base/Admonition.vue'
-import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
+import { Button } from '#ui/components/base/buttons'
 import Checkbox from '#ui/components/base/Checkbox.vue'
 import NewModal from '#ui/components/modal/NewModal.vue'
 import { defineMessages, useVIntl } from '#ui/composables/i18n'
diff --git a/packages/ui/src/layouts/shared/content-tab/components/modals/ContentInstallModal.vue b/packages/ui/src/layouts/shared/content-tab/components/modals/ContentInstallModal.vue
index b8df546ea5..96f1bb2d52 100644
--- a/packages/ui/src/layouts/shared/content-tab/components/modals/ContentInstallModal.vue
+++ b/packages/ui/src/layouts/shared/content-tab/components/modals/ContentInstallModal.vue
@@ -73,15 +73,15 @@
 					:placeholder="formatMessage(messages.searchPlaceholder)"
 					class="flex-1"
 				/>
-				<ButtonStyled type="outlined" circular>
-					<button
-						v-tooltip="`${hideUninstallable ? 'Show' : 'Hide'} unavailable`"
-						@click="hideUninstallable = !hideUninstallable"
-					>
-						<EyeOffIcon v-if="hideUninstallable" />
-						<EyeIcon v-else />
-					</button>
-				</ButtonStyled>
+				<IconButton
+					v-tooltip="`${hideUninstallable ? 'Show' : 'Hide'} unavailable`"
+					type="outlined"
+					:label="`${hideUninstallable ? 'Show' : 'Hide'} unavailable`"
+					@click="hideUninstallable = !hideUninstallable"
+				>
+					<EyeOffIcon v-if="hideUninstallable" />
+					<EyeIcon v-else />
+				</IconButton>
 			</div>
 
 			<div v-if="loading" class="flex items-center justify-center py-12">
@@ -110,30 +110,29 @@
 							inst.name
 						}}</span>
 					</button>
-					<ButtonStyled v-if="inst.installed">
-						<button disabled>
-							<CheckIcon />
-							{{ formatMessage(messages.installedBadge) }}
-						</button>
-					</ButtonStyled>
-					<ButtonStyled
+					<Button v-if="inst.installed" disabled>
+						<CheckIcon />
+						{{ formatMessage(messages.installedBadge) }}
+					</Button>
+					<Button
 						v-else
-						:type="inst.compatible ? 'standard' : 'outlined'"
-						:color="inst.compatible ? 'standard' : 'orange'"
+						v-tooltip="!inst.compatible ? formatMessage(messages.incompatibleTooltip) : undefined"
+						:type="inst.compatible ? 'base' : 'outlined'"
+						:class="
+							inst.compatible
+								? undefined
+								: '!text-orange [&>svg]:!text-orange !shadow-[inset_0_0_0_1px_var(--color-orange)]'
+						"
+						:disabled="inst.installing"
+						@click="emit('install', inst)"
 					>
-						<button
-							v-tooltip="!inst.compatible ? formatMessage(messages.incompatibleTooltip) : undefined"
-							:disabled="inst.installing"
-							@click="emit('install', inst)"
-						>
-							<TriangleAlertIcon v-if="!inst.compatible" />
-							{{
-								inst.installing
-									? formatMessage(commonMessages.installingLabel)
-									: formatMessage(messages.installButton)
-							}}
-						</button>
-					</ButtonStyled>
+						<TriangleAlertIcon v-if="!inst.compatible" />
+						{{
+							inst.installing
+								? formatMessage(commonMessages.installingLabel)
+								: formatMessage(messages.installButton)
+						}}
+					</Button>
 				</div>
 			</div>
 		</div>
@@ -143,18 +142,14 @@
 			<div class="flex items-center gap-4">
 				<Avatar :src="iconPreviewUrl ?? undefined" size="5rem" rounded="2xl" />
 				<div class="flex flex-col gap-2">
-					<ButtonStyled type="outlined">
-						<button @click="selectIcon">
-							<UploadIcon />
-							{{ formatMessage(messages.selectIcon) }}
-						</button>
-					</ButtonStyled>
-					<ButtonStyled type="outlined">
-						<button :disabled="!iconPreviewUrl" @click="removeIcon">
-							<XIcon />
-							{{ formatMessage(messages.removeIcon) }}
-						</button>
-					</ButtonStyled>
+					<Button type="outlined" @click="selectIcon">
+						<UploadIcon />
+						{{ formatMessage(messages.selectIcon) }}
+					</Button>
+					<Button type="outlined" :disabled="!iconPreviewUrl" @click="removeIcon">
+						<XIcon />
+						{{ formatMessage(messages.removeIcon) }}
+					</Button>
 				</div>
 			</div>
 
@@ -218,27 +213,26 @@
 						{{ formatMessage(messages.compatibleCount, { count: compatibleCount }) }}
 					</span>
 				</div>
-				<ButtonStyled type="outlined">
-					<button @click="modal?.hide()">
-						<XIcon />
-						{{ formatMessage(commonMessages.cancelButton) }}
-					</button>
-				</ButtonStyled>
+				<Button type="outlined" @click="modal?.hide()">
+					<XIcon />
+					{{ formatMessage(commonMessages.cancelButton) }}
+				</Button>
 			</div>
 
 			<div v-else class="flex items-center justify-end gap-2">
-				<ButtonStyled type="outlined">
-					<button @click="modal?.hide()">
-						<XIcon />
-						{{ formatMessage(commonMessages.cancelButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="brand">
-					<button :disabled="!instanceName" @click="handleCreateAndInstall">
-						<DownloadIcon />
-						{{ formatMessage(messages.installButton) }}
-					</button>
-				</ButtonStyled>
+				<Button type="outlined" @click="modal?.hide()">
+					<XIcon />
+					{{ formatMessage(commonMessages.cancelButton) }}
+				</Button>
+				<Button
+					type="colored"
+					color="brand"
+					:disabled="!instanceName"
+					@click="handleCreateAndInstall"
+				>
+					<DownloadIcon />
+					{{ formatMessage(messages.installButton) }}
+				</Button>
 			</div>
 		</template>
 	</NewModal>
@@ -260,7 +254,7 @@ import { computed, ref, watch } from 'vue'
 
 import AutoLink from '#ui/components/base/AutoLink.vue'
 import Avatar from '#ui/components/base/Avatar.vue'
-import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
+import { Button, IconButton } from '#ui/components/base/buttons'
 import Chips from '#ui/components/base/Chips.vue'
 import Combobox, { type ComboboxOption } from '#ui/components/base/Combobox.vue'
 import LoadingIndicator from '#ui/components/base/LoadingIndicator.vue'
diff --git a/packages/ui/src/layouts/shared/content-tab/components/modals/InlineBackupCreator.vue b/packages/ui/src/layouts/shared/content-tab/components/modals/InlineBackupCreator.vue
index f2cb95231f..313d8c8299 100644
--- a/packages/ui/src/layouts/shared/content-tab/components/modals/InlineBackupCreator.vue
+++ b/packages/ui/src/layouts/shared/content-tab/components/modals/InlineBackupCreator.vue
@@ -10,26 +10,24 @@
 
 		<div v-if="backup.available" class="flex items-center gap-2">
 			<!-- Button / Loading state -->
-			<ButtonStyled v-if="!backup.backupComplete.value && !backup.backupFailed.value">
-				<button
-					v-tooltip="
-						!canManageBackups
-							? permissionDeniedMessage
-							: backup.externalBackupInProgress.value
-								? formatMessage(messages.backupInProgress)
-								: undefined
-					"
-					class="!shadow-none"
-					:disabled="
-						!canManageBackups || backup.isBackingUp.value || backup.externalBackupInProgress.value
-					"
-					@click="startBackup"
-				>
-					<SpinnerIcon v-if="backup.isBackingUp.value" class="size-5 animate-spin" />
-					<PlusIcon v-else class="size-5" />
-					{{ formatMessage(backup.isBackingUp.value ? messages.backingUp : messages.createBackup) }}
-				</button>
-			</ButtonStyled>
+			<Button
+				v-if="!backup.backupComplete.value && !backup.backupFailed.value"
+				v-tooltip="
+					!canManageBackups
+						? permissionDeniedMessage
+						: backup.externalBackupInProgress.value
+							? formatMessage(messages.backupInProgress)
+							: undefined
+				"
+				:disabled="
+					!canManageBackups || backup.isBackingUp.value || backup.externalBackupInProgress.value
+				"
+				@click="startBackup"
+			>
+				<SpinnerIcon v-if="backup.isBackingUp.value" class="size-5 animate-spin" />
+				<PlusIcon v-else class="size-5" />
+				{{ formatMessage(backup.isBackingUp.value ? messages.backingUp : messages.createBackup) }}
+			</Button>
 
 			<!-- Success -->
 			<div
@@ -61,7 +59,7 @@
 import { CheckCircleIcon, PlusIcon, SpinnerIcon, TriangleAlertIcon } from '@modrinth/assets'
 import { computed, watch } from 'vue'
 
-import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
+import { Button } from '#ui/components/base/buttons'
 import { defineMessages, useVIntl } from '#ui/composables/i18n'
 import { hasServerPermission } from '#ui/composables/server-permissions'
 import { injectModrinthServerContext } from '#ui/providers'
diff --git a/packages/ui/src/layouts/shared/content-tab/components/modals/ModpackContentModal.vue b/packages/ui/src/layouts/shared/content-tab/components/modals/ModpackContentModal.vue
index f7107f9c53..cad04ab463 100644
--- a/packages/ui/src/layouts/shared/content-tab/components/modals/ModpackContentModal.vue
+++ b/packages/ui/src/layouts/shared/content-tab/components/modals/ModpackContentModal.vue
@@ -14,9 +14,9 @@ import { computed, nextTick, ref, watchSyncEffect } from 'vue'
 
 import Avatar from '#ui/components/base/Avatar.vue'
 import BulletDivider from '#ui/components/base/BulletDivider.vue'
-import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
+import type { OverflowMenuOption } from '#ui/components/base/buttons'
+import { ButtonLink } from '#ui/components/base/buttons'
 import Checkbox from '#ui/components/base/Checkbox.vue'
-import type { Option as OverflowMenuOption } from '#ui/components/base/OverflowMenu.vue'
 import StyledInput from '#ui/components/base/StyledInput.vue'
 import NewModal from '#ui/components/modal/NewModal.vue'
 import { defineMessages, useVIntl } from '#ui/composables/i18n'
@@ -290,7 +290,8 @@ const tableItems = computed<ContentCardTableItem[]>(() =>
 			...(props.switchVersion
 				? [
 						{
-							id: formatMessage(commonMessages.switchVersionButton),
+							id: 'switch-version',
+							label: formatMessage(commonMessages.switchVersionButton),
 							icon: ArrowLeftRightIcon,
 							action: () => props.switchVersion!(item),
 						},
@@ -611,17 +612,18 @@ defineExpose({ show, showLoading, hide, getState, restore, updateItem, setItems
 								</span>
 							</template>
 							<template #itemButtonsRight="{ item }">
-								<ButtonStyled v-if="externalSlicerUrls[item.id]" circular type="transparent">
-									<a
-										v-tooltip="formatMessage(messages.openInSlicer)"
-										:aria-label="formatMessage(messages.openInSlicer)"
-										:href="externalSlicerUrls[item.id]"
-										target="_blank"
-										rel="noopener noreferrer"
-									>
-										<ExternalIcon class="size-4" />
-									</a>
-								</ButtonStyled>
+								<ButtonLink
+									v-if="externalSlicerUrls[item.id]"
+									v-tooltip="formatMessage(messages.openInSlicer)"
+									type="quiet"
+									:aria-label="formatMessage(messages.openInSlicer)"
+									:href="externalSlicerUrls[item.id]"
+									target="_blank"
+									rel="noopener noreferrer"
+									class="!w-9 !px-0 !rounded-full"
+								>
+									<ExternalIcon class="size-4" />
+								</ButtonLink>
 							</template>
 						</ContentCardTable>
 					</div>
diff --git a/packages/ui/src/layouts/shared/content-tab/components/modals/content-updater-modal/index.vue b/packages/ui/src/layouts/shared/content-tab/components/modals/content-updater-modal/index.vue
index f7002f6ea4..cee3fb48a2 100644
--- a/packages/ui/src/layouts/shared/content-tab/components/modals/content-updater-modal/index.vue
+++ b/packages/ui/src/layouts/shared/content-tab/components/modals/content-updater-modal/index.vue
@@ -95,25 +95,24 @@
 					class="absolute bottom-0 left-0 right-0 pointer-events-none flex flex-col items-center justify-end bg-gradient-to-b from-transparent to-bg-raised to-70% pb-3 h-24"
 				>
 					<div class="pointer-events-auto">
-						<ButtonStyled type="transparent" :circular="true">
-							<button
-								class="flex items-center gap-1.5"
-								:aria-label="
-									hideIncompatibleState
-										? formatMessage(messages.showIncompatible)
-										: formatMessage(messages.hideIncompatible)
-								"
-								@click="hideIncompatibleState = !hideIncompatibleState"
-							>
-								<EyeIcon v-if="hideIncompatibleState" class="h-6 w-6" />
-								<EyeOffIcon v-else class="h-6 w-6" />
-								<span class="font-medium">{{
-									hideIncompatibleState
-										? formatMessage(messages.showIncompatible)
-										: formatMessage(messages.hideIncompatible)
-								}}</span>
-							</button>
-						</ButtonStyled>
+						<Button
+							type="quiet"
+							class="flex items-center gap-1.5"
+							:aria-label="
+								hideIncompatibleState
+									? formatMessage(messages.showIncompatible)
+									: formatMessage(messages.hideIncompatible)
+							"
+							@click="hideIncompatibleState = !hideIncompatibleState"
+						>
+							<EyeIcon v-if="hideIncompatibleState" class="h-6 w-6" />
+							<EyeOffIcon v-else class="h-6 w-6" />
+							<span class="font-medium">{{
+								hideIncompatibleState
+									? formatMessage(messages.showIncompatible)
+									: formatMessage(messages.hideIncompatible)
+							}}</span>
+						</Button>
 					</div>
 				</div>
 			</div>
@@ -214,43 +213,41 @@
 				}}</span>
 			</div>
 			<div class="flex flex-row gap-2 shrink-0 ml-auto">
-				<ButtonStyled type="outlined">
-					<button @click="handleCancel">
-						<XIcon />
-						{{ formatMessage(commonMessages.cancelButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled :color="incompatibilityWarningMode ? 'orange' : 'brand'">
-					<button
-						v-tooltip="props.actionDisabled ? props.actionDisabledTooltip : undefined"
-						:disabled="
-							actionLoading ||
-							props.actionDisabled ||
-							!selectedVersion ||
-							(!incompatibilityWarningMode && selectedVersion.id === currentVersionId)
-						"
-						@click="handleUpdate"
-					>
-						<SpinnerIcon v-if="actionLoading" class="size-5 animate-spin" />
-						<DownloadIcon v-else />
-						{{
-							actionLoading
-								? formatMessage(commonMessages.installingLabel)
-								: incompatibilityWarningMode
-									? formatMessage(messages.installAnywayButton)
-									: formatMessage(
-											isDowngrade
-												? messages.downgradeToVersion
-												: switchMode
-													? messages.switchToVersion
-													: messages.updateToVersion,
-											{
-												version: selectedVersion?.version_number ?? '...',
-											},
-										)
-						}}
-					</button>
-				</ButtonStyled>
+				<Button type="outlined" @click="handleCancel">
+					<XIcon />
+					{{ formatMessage(commonMessages.cancelButton) }}
+				</Button>
+				<Button
+					v-tooltip="props.actionDisabled ? props.actionDisabledTooltip : undefined"
+					type="colored"
+					:color="incompatibilityWarningMode ? 'orange' : 'brand'"
+					:disabled="
+						actionLoading ||
+						props.actionDisabled ||
+						!selectedVersion ||
+						(!incompatibilityWarningMode && selectedVersion.id === currentVersionId)
+					"
+					@click="handleUpdate"
+				>
+					<SpinnerIcon v-if="actionLoading" class="size-5 animate-spin" />
+					<DownloadIcon v-else />
+					{{
+						actionLoading
+							? formatMessage(commonMessages.installingLabel)
+							: incompatibilityWarningMode
+								? formatMessage(messages.installAnywayButton)
+								: formatMessage(
+										isDowngrade
+											? messages.downgradeToVersion
+											: switchMode
+												? messages.switchToVersion
+												: messages.updateToVersion,
+										{
+											version: selectedVersion?.version_number ?? '...',
+										},
+									)
+					}}
+				</Button>
 			</div>
 		</div>
 	</NewModal>
@@ -294,7 +291,7 @@ import { useTimeoutFn } from '@vueuse/core'
 import { computed, ref, toRef } from 'vue'
 
 import Avatar from '#ui/components/base/Avatar.vue'
-import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
+import { Button } from '#ui/components/base/buttons'
 import StyledInput from '#ui/components/base/StyledInput.vue'
 import ConfirmModal from '#ui/components/modal/ConfirmModal.vue'
 import NewModal from '#ui/components/modal/NewModal.vue'
diff --git a/packages/ui/src/layouts/shared/content-tab/layout.vue b/packages/ui/src/layouts/shared/content-tab/layout.vue
index bdee7c24a8..5e7366cd24 100644
--- a/packages/ui/src/layouts/shared/content-tab/layout.vue
+++ b/packages/ui/src/layouts/shared/content-tab/layout.vue
@@ -20,9 +20,8 @@ import {
 } from '@modrinth/assets'
 import { computed, nextTick, ref, watch } from 'vue'
 
-import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
+import { Button, TeleportOverflowMenu } from '#ui/components/base/buttons'
 import EmptyState from '#ui/components/base/EmptyState.vue'
-import OverflowMenu from '#ui/components/base/OverflowMenu.vue'
 import StyledInput from '#ui/components/base/StyledInput.vue'
 import { useDebugLogger } from '#ui/composables/debug-logger'
 import { defineMessages, useVIntl } from '#ui/composables/i18n'
@@ -763,9 +762,9 @@ const confirmUnlinkModal = ref<InstanceType<typeof ConfirmUnlinkModal>>()
 				<div class="universal-card flex flex-col items-center gap-4 p-6">
 					<h2 class="m-0 text-xl font-bold">{{ formatMessage(messages.failedToLoad) }}</h2>
 					<p class="text-secondary">{{ ctx.error.value.message }}</p>
-					<ButtonStyled color="brand">
-						<button @click="handleRefresh">{{ formatMessage(commonMessages.retryButton) }}</button>
-					</ButtonStyled>
+					<Button type="colored" color="brand" @click="handleRefresh">{{
+						formatMessage(commonMessages.retryButton)
+					}}</Button>
 				</div>
 			</div>
 
@@ -818,34 +817,33 @@ const confirmUnlinkModal = ref<InstanceType<typeof ConfirmUnlinkModal>>()
 							/>
 
 							<div class="flex gap-2">
-								<ButtonStyled type="outlined">
-									<button
-										v-tooltip="
-											ctx.busyMessage?.value ??
-											(ctx.disableAddContent?.value ? ctx.disableAddContentTooltip : undefined)
-										"
-										:disabled="ctx.isBusy.value || ctx.disableAddContent?.value"
-										class="!h-10"
-										@click="ctx.uploadFiles"
-									>
-										<FolderOpenIcon class="size-5" />
-										{{ formatMessage(messages.uploadFiles) }}
-									</button>
-								</ButtonStyled>
-								<ButtonStyled color="brand">
-									<button
-										v-tooltip="
-											ctx.busyMessage?.value ??
-											(ctx.disableAddContent?.value ? ctx.disableAddContentTooltip : undefined)
-										"
-										:disabled="ctx.isBusy.value || ctx.disableAddContent?.value"
-										class="!h-10 flex items-center gap-2"
-										@click="ctx.browse"
-									>
-										<CompassIcon class="size-5" />
-										<span>{{ formatMessage(messages.browseContent) }}</span>
-									</button>
-								</ButtonStyled>
+								<Button
+									v-tooltip="
+										ctx.busyMessage?.value ??
+										(ctx.disableAddContent?.value ? ctx.disableAddContentTooltip : undefined)
+									"
+									type="outlined"
+									size="lg"
+									:disabled="ctx.isBusy.value || ctx.disableAddContent?.value"
+									@click="ctx.uploadFiles"
+								>
+									<FolderOpenIcon class="size-5" />
+									{{ formatMessage(messages.uploadFiles) }}
+								</Button>
+								<Button
+									v-tooltip="
+										ctx.busyMessage?.value ??
+										(ctx.disableAddContent?.value ? ctx.disableAddContentTooltip : undefined)
+									"
+									type="colored"
+									color="brand"
+									size="lg"
+									:disabled="ctx.isBusy.value || ctx.disableAddContent?.value"
+									@click="ctx.browse"
+								>
+									<CompassIcon class="size-5" />
+									<span>{{ formatMessage(messages.browseContent) }}</span>
+								</Button>
 							</div>
 						</div>
 
@@ -879,66 +877,58 @@ const confirmUnlinkModal = ref<InstanceType<typeof ConfirmUnlinkModal>>()
 									{{ option.label }}
 								</button>
 								<div class="hidden @[900px]:block">
-									<ButtonStyled type="transparent">
-										<button
-											:aria-label="
-												formatMessage(messages.sortByLabel, { mode: sortLabels[sortMode]() })
-											"
-											@click="cycleSortMode"
-										>
-											<ArrowUpZAIcon v-if="sortMode === 'alphabetical-desc'" /><ClockArrowDownIcon
-												v-else-if="sortMode === 'date-added-newest'"
-											/><ClockArrowUpIcon
-												v-else-if="sortMode === 'date-added-oldest'"
-											/><ArrowDownAZIcon v-else />
-											{{ sortLabels[sortMode]() }}
-										</button>
-									</ButtonStyled>
+									<Button
+										type="quiet"
+										:aria-label="
+											formatMessage(messages.sortByLabel, { mode: sortLabels[sortMode]() })
+										"
+										@click="cycleSortMode"
+									>
+										<ArrowUpZAIcon v-if="sortMode === 'alphabetical-desc'" /><ClockArrowDownIcon
+											v-else-if="sortMode === 'date-added-newest'"
+										/><ClockArrowUpIcon
+											v-else-if="sortMode === 'date-added-oldest'"
+										/><ArrowDownAZIcon v-else />
+										{{ sortLabels[sortMode]() }}
+									</Button>
 								</div>
 							</div>
 
 							<div class="flex items-center gap-2">
 								<div class="@[900px]:hidden">
-									<ButtonStyled type="transparent">
-										<button
-											:aria-label="
-												formatMessage(messages.sortByLabel, { mode: sortLabels[sortMode]() })
-											"
-											@click="cycleSortMode"
-										>
-											<ArrowUpZAIcon v-if="sortMode === 'alphabetical-desc'" /><ClockArrowDownIcon
-												v-else-if="sortMode === 'date-added-newest'"
-											/><ClockArrowUpIcon
-												v-else-if="sortMode === 'date-added-oldest'"
-											/><ArrowDownAZIcon v-else />
-											{{ sortLabels[sortMode]() }}
-										</button>
-									</ButtonStyled>
+									<Button
+										type="quiet"
+										:aria-label="
+											formatMessage(messages.sortByLabel, { mode: sortLabels[sortMode]() })
+										"
+										@click="cycleSortMode"
+									>
+										<ArrowUpZAIcon v-if="sortMode === 'alphabetical-desc'" /><ClockArrowDownIcon
+											v-else-if="sortMode === 'date-added-newest'"
+										/><ClockArrowUpIcon
+											v-else-if="sortMode === 'date-added-oldest'"
+										/><ArrowDownAZIcon v-else />
+										{{ sortLabels[sortMode]() }}
+									</Button>
 								</div>
 
-								<ButtonStyled
+								<Button
 									v-if="hasBulkUpdateSupport && hasOutdatedProjects"
+									v-tooltip="formatMessage(messages.updateAll)"
+									type="quiet"
 									color="green"
-									type="transparent"
-									color-fill="text"
-									hover-color-fill="background"
+									:disabled="isBulkOperating"
+									class="hover:!bg-green focus-visible:!bg-green hover:!text-[var(--color-accent-contrast)] focus-visible:!text-[var(--color-accent-contrast)]"
+									@click="promptUpdateAll"
 								>
-									<button
-										v-tooltip="formatMessage(messages.updateAll)"
-										:disabled="isBulkOperating"
-										@click="promptUpdateAll"
-									>
-										<DownloadIcon />
-										{{ formatMessage(messages.updateAll) }}
-									</button>
-								</ButtonStyled>
+									<DownloadIcon />
+									{{ formatMessage(messages.updateAll) }}
+								</Button>
 
-								<ButtonStyled type="transparent">
-									<button :disabled="refreshing" @click="handleRefresh">
-										<RefreshCwIcon :class="refreshing ? 'animate-spin' : ''" />
-										{{ formatMessage(commonMessages.refreshButton) }}
-									</button>
-								</ButtonStyled>
+								<Button type="quiet" :disabled="refreshing" @click="handleRefresh">
+									<RefreshCwIcon :class="refreshing ? 'animate-spin' : ''" />
+									{{ formatMessage(commonMessages.refreshButton) }}
+								</Button>
 							</div>
 						</div>
 
@@ -981,34 +971,33 @@ const confirmUnlinkModal = ref<InstanceType<typeof ConfirmUnlinkModal>>()
 						}}
 					</template>
 					<template #actions>
-						<ButtonStyled type="outlined">
-							<button
-								v-tooltip="
-									ctx.busyMessage?.value ??
-									(ctx.disableAddContent?.value ? ctx.disableAddContentTooltip : undefined)
-								"
-								:disabled="ctx.isBusy.value || ctx.disableAddContent?.value"
-								class="!h-10"
-								@click="ctx.uploadFiles"
-							>
-								<FolderOpenIcon class="size-5" />
-								{{ formatMessage(messages.uploadFiles) }}
-							</button>
-						</ButtonStyled>
-						<ButtonStyled color="brand">
-							<button
-								v-tooltip="
-									ctx.busyMessage?.value ??
-									(ctx.disableAddContent?.value ? ctx.disableAddContentTooltip : undefined)
-								"
-								:disabled="ctx.isBusy.value || ctx.disableAddContent?.value"
-								class="!h-10 flex items-center gap-2"
-								@click="ctx.browse"
-							>
-								<CompassIcon class="size-5" />
-								<span>{{ formatMessage(messages.browseContent) }}</span>
-							</button>
-						</ButtonStyled>
+						<Button
+							v-tooltip="
+								ctx.busyMessage?.value ??
+								(ctx.disableAddContent?.value ? ctx.disableAddContentTooltip : undefined)
+							"
+							type="outlined"
+							size="lg"
+							:disabled="ctx.isBusy.value || ctx.disableAddContent?.value"
+							@click="ctx.uploadFiles"
+						>
+							<FolderOpenIcon class="size-5" />
+							{{ formatMessage(messages.uploadFiles) }}
+						</Button>
+						<Button
+							v-tooltip="
+								ctx.busyMessage?.value ??
+								(ctx.disableAddContent?.value ? ctx.disableAddContentTooltip : undefined)
+							"
+							type="colored"
+							color="brand"
+							size="lg"
+							:disabled="ctx.isBusy.value || ctx.disableAddContent?.value"
+							@click="ctx.browse"
+						>
+							<CompassIcon class="size-5" />
+							<span>{{ formatMessage(messages.browseContent) }}</span>
+						</Button>
 					</template>
 				</EmptyState>
 			</template>
@@ -1034,84 +1023,82 @@ const confirmUnlinkModal = ref<InstanceType<typeof ConfirmUnlinkModal>>()
 			@disable="bulkDisable"
 		>
 			<template #actions>
-				<ButtonStyled
+				<Button
 					v-if="hasBulkUpdateSupport && selectedItems.some((m) => m.has_update)"
-					type="transparent"
+					v-tooltip="formatMessage(commonMessages.updateButton)"
+					type="quiet"
 					color="green"
-					color-fill="text"
-					hover-color-fill="background"
+					class="hover:!bg-green focus-visible:!bg-green hover:!text-[var(--color-accent-contrast)] focus-visible:!text-[var(--color-accent-contrast)]"
+					@click="promptUpdateSelected"
 				>
-					<button
-						v-tooltip="formatMessage(commonMessages.updateButton)"
-						@click="promptUpdateSelected"
-					>
-						<DownloadIcon />
-						<span class="bar-label">{{ formatMessage(commonMessages.updateButton) }}</span>
-					</button>
-				</ButtonStyled>
+					<DownloadIcon />
+					<span class="bar-label">{{ formatMessage(commonMessages.updateButton) }}</span>
+				</Button>
 
-				<ButtonStyled v-if="ctx.shareItems" type="transparent">
-					<OverflowMenu
-						:options="[
-							{
-								id: 'share-names',
-								action: () => ctx.shareItems!(selectedItems, 'names'),
-							},
-							{
-								id: 'share-file-names',
-								action: () => ctx.shareItems!(selectedItems, 'file-names'),
-							},
-							{
-								id: 'share-urls',
-								action: () => ctx.shareItems!(selectedItems, 'urls'),
-							},
-							{
-								id: 'share-markdown',
-								action: () => ctx.shareItems!(selectedItems, 'markdown'),
-							},
-						]"
-					>
-						<ShareIcon />
-						<span class="bar-label">{{ formatMessage(messages.share) }}</span>
-						<DropdownIcon />
-						<template #share-names>
-							<TextCursorInputIcon />
-							{{ formatMessage(messages.shareProjectNames) }}
-						</template>
-						<template #share-file-names>
-							<FileIcon />
-							{{ formatMessage(messages.shareFileNames) }}
-						</template>
-						<template #share-urls>
-							<LinkIcon />
-							{{ formatMessage(messages.shareProjectLinks) }}
-						</template>
-						<template #share-markdown>
-							<CodeIcon />
-							{{ formatMessage(messages.shareMarkdownLinks) }}
-						</template>
-					</OverflowMenu>
-				</ButtonStyled>
+				<TeleportOverflowMenu
+					v-if="ctx.shareItems"
+					type="quiet"
+					:label="formatMessage(commonMessages.moreOptionsButton)"
+					:options="[
+						{
+							id: 'share-names',
+							label: formatMessage(messages.shareProjectNames),
+							action: () => ctx.shareItems!(selectedItems, 'names'),
+						},
+						{
+							id: 'share-file-names',
+							label: formatMessage(messages.shareFileNames),
+							action: () => ctx.shareItems!(selectedItems, 'file-names'),
+						},
+						{
+							id: 'share-urls',
+							label: formatMessage(messages.shareProjectLinks),
+							action: () => ctx.shareItems!(selectedItems, 'urls'),
+						},
+						{
+							id: 'share-markdown',
+							label: formatMessage(messages.shareMarkdownLinks),
+							action: () => ctx.shareItems!(selectedItems, 'markdown'),
+						},
+					]"
+					class="!w-auto !px-2.5 !rounded-xl"
+				>
+					<ShareIcon />
+					<span class="bar-label">{{ formatMessage(messages.share) }}</span>
+					<DropdownIcon />
+					<template #share-names>
+						<TextCursorInputIcon />
+						{{ formatMessage(messages.shareProjectNames) }}
+					</template>
+					<template #share-file-names>
+						<FileIcon />
+						{{ formatMessage(messages.shareFileNames) }}
+					</template>
+					<template #share-urls>
+						<LinkIcon />
+						{{ formatMessage(messages.shareProjectLinks) }}
+					</template>
+					<template #share-markdown>
+						<CodeIcon />
+						{{ formatMessage(messages.shareMarkdownLinks) }}
+					</template>
+				</TeleportOverflowMenu>
 			</template>
 
 			<template #actions-end>
 				<div v-if="deletableSelectedItems.length > 0" class="mx-1 h-6 w-px bg-surface-5" />
 
-				<ButtonStyled
+				<Button
 					v-if="deletableSelectedItems.length > 0"
-					type="transparent"
+					v-tooltip="formatMessage(commonMessages.deleteLabel)"
+					type="quiet"
 					color="red"
-					color-fill="text"
-					hover-color-fill="background"
+					class="hover:!bg-red focus-visible:!bg-red hover:!text-[var(--color-accent-contrast)] focus-visible:!text-[var(--color-accent-contrast)]"
+					@click="showBulkDeleteModal"
 				>
-					<button
-						v-tooltip="formatMessage(commonMessages.deleteLabel)"
-						@click="showBulkDeleteModal"
-					>
-						<TrashIcon />
-						<span class="bar-label">{{ formatMessage(commonMessages.deleteLabel) }}</span>
-					</button>
-				</ButtonStyled>
+					<TrashIcon />
+					<span class="bar-label">{{ formatMessage(commonMessages.deleteLabel) }}</span>
+				</Button>
 			</template>
 		</ContentSelectionBar>
 
diff --git a/packages/ui/src/layouts/shared/content-tab/providers/content-manager.ts b/packages/ui/src/layouts/shared/content-tab/providers/content-manager.ts
index 8b8a88d24e..33224d73a5 100644
--- a/packages/ui/src/layouts/shared/content-tab/providers/content-manager.ts
+++ b/packages/ui/src/layouts/shared/content-tab/providers/content-manager.ts
@@ -1,7 +1,7 @@
 import type { ComputedRef, Ref } from 'vue'
 import type { RouteLocationRaw } from 'vue-router'
 
-import type { Option as OverflowMenuOption } from '#ui/components/base/OverflowMenu.vue'
+import type { OverflowMenuOption } from '#ui/components/base/buttons'
 import { createContext } from '#ui/providers/create-context'
 
 import type {
diff --git a/packages/ui/src/layouts/shared/content-tab/types.ts b/packages/ui/src/layouts/shared/content-tab/types.ts
index b643787f58..6a208ce4a3 100644
--- a/packages/ui/src/layouts/shared/content-tab/types.ts
+++ b/packages/ui/src/layouts/shared/content-tab/types.ts
@@ -1,7 +1,7 @@
 import type { Labrinth } from '@modrinth/api-client'
 import type { RouteLocationRaw } from 'vue-router'
 
-import type { Option as OverflowMenuOption } from '#ui/components/base/OverflowMenu.vue'
+import type { OverflowMenuOption } from '#ui/components/base/buttons'
 
 export type ContentCardProject = Pick<
 	Labrinth.Projects.v2.Project,
diff --git a/packages/ui/src/layouts/shared/files-tab/components/FileContextMenu.vue b/packages/ui/src/layouts/shared/files-tab/components/FileContextMenu.vue
index cd8843d32a..6bc8da0469 100644
--- a/packages/ui/src/layouts/shared/files-tab/components/FileContextMenu.vue
+++ b/packages/ui/src/layouts/shared/files-tab/components/FileContextMenu.vue
@@ -17,57 +17,58 @@
 				tabindex="-1"
 				@mousedown.stop
 			>
-				<ButtonStyled type="transparent">
-					<button
-						class="w-full !justify-start !whitespace-nowrap"
-						role="menuitem"
-						@click="handleCopyFilename"
-					>
-						<ClipboardCopyIcon class="size-5" />
-						{{ formatMessage(commonMessages.copyFilenameButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled type="transparent">
-					<button
-						class="w-full !justify-start !whitespace-nowrap"
-						role="menuitem"
-						@click="handleCopyPath"
-					>
-						<ClipboardCopyIcon class="size-5" />
-						{{ formatMessage(commonMessages.copyFullPathButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled v-if="ctx.openInFolder" type="transparent">
-					<button
-						class="w-full !justify-start !whitespace-nowrap"
-						role="menuitem"
-						@click="handleOpenInFolder"
-					>
-						<FolderOpenIcon class="size-5" />
-						{{ formatMessage(commonMessages.openInFolderButton) }}
-					</button>
-				</ButtonStyled>
+				<Button
+					type="quiet"
+					class="w-full !justify-start !whitespace-nowrap"
+					role="menuitem"
+					@click="handleCopyFilename"
+				>
+					<ClipboardCopyIcon class="size-5" />
+					{{ formatMessage(commonMessages.copyFilenameButton) }}
+				</Button>
+				<Button
+					type="quiet"
+					class="w-full !justify-start !whitespace-nowrap"
+					role="menuitem"
+					@click="handleCopyPath"
+				>
+					<ClipboardCopyIcon class="size-5" />
+					{{ formatMessage(commonMessages.copyFullPathButton) }}
+				</Button>
+				<Button
+					v-if="ctx.openInFolder"
+					type="quiet"
+					class="w-full !justify-start !whitespace-nowrap"
+					role="menuitem"
+					@click="handleOpenInFolder"
+				>
+					<FolderOpenIcon class="size-5" />
+					{{ formatMessage(commonMessages.openInFolderButton) }}
+				</Button>
 				<div class="h-px w-full bg-surface-5" />
 				<template v-for="(option, index) in menuOptions" :key="index">
 					<div
 						v-if="'divider' in option && option.divider && option.shown !== false"
 						class="h-px w-full bg-surface-5"
 					/>
-					<ButtonStyled
+					<Button
 						v-else-if="'id' in option && option.shown !== false"
-						type="transparent"
-						:color="option.color"
+						v-tooltip="option.tooltip"
+						type="quiet"
+						:color="
+							option.color && option.color !== 'standard'
+								? option.color === 'medal-promo'
+									? 'medal_promotion'
+									: option.color
+								: undefined
+						"
+						:disabled="option.disabled"
+						class="w-full !justify-start !whitespace-nowrap"
+						role="menuitem"
+						@click="handleOptionClick(option)"
 					>
-						<button
-							v-tooltip="option.tooltip"
-							:disabled="option.disabled"
-							class="w-full !justify-start !whitespace-nowrap"
-							role="menuitem"
-							@click="handleOptionClick(option)"
-						>
-							<slot :name="option.id" />
-						</button>
-					</ButtonStyled>
+						<slot :name="option.id" />
+					</Button>
 				</template>
 			</div>
 		</Transition>
@@ -78,7 +79,7 @@
 import { ClipboardCopyIcon, FolderOpenIcon } from '@modrinth/assets'
 import { nextTick, onBeforeUnmount, onMounted, ref, watch } from 'vue'
 
-import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
+import { Button } from '#ui/components/base/buttons'
 import { useVIntl } from '#ui/composables/i18n'
 import { injectNotificationManager } from '#ui/providers/web-notifications'
 import { commonMessages } from '#ui/utils/common-messages'
diff --git a/packages/ui/src/layouts/shared/files-tab/components/FileManagerError.vue b/packages/ui/src/layouts/shared/files-tab/components/FileManagerError.vue
index 361a3b0818..56772b206a 100644
--- a/packages/ui/src/layouts/shared/files-tab/components/FileManagerError.vue
+++ b/packages/ui/src/layouts/shared/files-tab/components/FileManagerError.vue
@@ -7,18 +7,14 @@
 				{{ message }}
 			</p>
 			<div class="flex gap-2">
-				<ButtonStyled>
-					<button size="sm" @click="$emit('refetch')">
-						<RefreshCwIcon class="h-5 w-5" />
-						{{ formatMessage(messages.tryAgain) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled>
-					<button size="sm" @click="$emit('home')">
-						<HomeIcon class="h-5 w-5" />
-						{{ formatMessage(messages.goToHome) }}
-					</button>
-				</ButtonStyled>
+				<Button size="sm" @click="$emit('refetch')">
+					<RefreshCwIcon class="h-5 w-5" />
+					{{ formatMessage(messages.tryAgain) }}
+				</Button>
+				<Button size="sm" @click="$emit('home')">
+					<HomeIcon class="h-5 w-5" />
+					{{ formatMessage(messages.goToHome) }}
+				</Button>
 			</div>
 		</div>
 	</div>
@@ -27,7 +23,7 @@
 <script setup lang="ts">
 import { FileIcon, HomeIcon, RefreshCwIcon } from '@modrinth/assets'
 
-import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
+import { Button } from '#ui/components/base/buttons'
 import { defineMessages, useVIntl } from '#ui/composables/i18n'
 
 const { formatMessage } = useVIntl()
diff --git a/packages/ui/src/layouts/shared/files-tab/components/FileNavbar.vue b/packages/ui/src/layouts/shared/files-tab/components/FileNavbar.vue
index 7f245fa7e3..42dde741c8 100644
--- a/packages/ui/src/layouts/shared/files-tab/components/FileNavbar.vue
+++ b/packages/ui/src/layouts/shared/files-tab/components/FileNavbar.vue
@@ -24,18 +24,17 @@
 			>
 				<ol class="m-0 flex min-w-0 flex-shrink list-none items-center p-0">
 					<li class="mr-4 flex-shrink-0">
-						<ButtonStyled circular>
-							<button
-								v-tooltip="formatMessage(messages.backToHome)"
-								type="button"
-								class="!size-10 bg-surface-4 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-brand"
-								@click="$emit('navigateHome')"
-								@mouseenter="$emit('prefetchHome')"
-							>
-								<HomeIcon />
-								<span class="sr-only">{{ formatMessage(messages.home) }}</span>
-							</button>
-						</ButtonStyled>
+						<IconButton
+							v-tooltip="formatMessage(messages.backToHome)"
+							:label="formatMessage(messages.backToHome)"
+							native-type="button"
+							class="bg-surface-4 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-brand"
+							@click="$emit('navigateHome')"
+							@mouseenter="$emit('prefetchHome')"
+						>
+							<HomeIcon />
+							<span class="sr-only">{{ formatMessage(messages.home) }}</span>
+						</IconButton>
 					</li>
 					<li class="m-0 -ml-2 min-w-0 flex-shrink p-0">
 						<ol
@@ -64,20 +63,19 @@
 									class="relative flex shrink-0 items-center text-sm"
 								>
 									<div class="flex shrink-0 items-center">
-										<ButtonStyled type="transparent">
-											<button
-												class="cursor-pointer whitespace-nowrap focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-brand"
-												:aria-current="
-													!isEditing && index === breadcrumbs.length - 1 ? 'location' : undefined
-												"
-												:class="{
-													'!text-contrast': !isEditing && index === breadcrumbs.length - 1,
-												}"
-												@click="$emit('navigate', index)"
-											>
-												{{ segment || '' }}
-											</button>
-										</ButtonStyled>
+										<Button
+											type="quiet"
+											class="cursor-pointer whitespace-nowrap focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-brand"
+											:aria-current="
+												!isEditing && index === breadcrumbs.length - 1 ? 'location' : undefined
+											"
+											:class="{
+												'!text-contrast': !isEditing && index === breadcrumbs.length - 1,
+											}"
+											@click="$emit('navigate', index)"
+										>
+											{{ segment || '' }}
+										</Button>
 										<ChevronRightIcon
 											v-if="index < breadcrumbs.length - 1 || isEditing"
 											class="size-4 flex-shrink-0 text-secondary"
@@ -111,98 +109,110 @@
 					@update:model-value="$emit('update:searchQuery', $event)"
 				/>
 
-				<ButtonStyled v-if="showRefreshButton" type="outlined">
-					<button
-						type="button"
-						class="flex !h-10 items-center gap-2"
-						:disabled="refreshing"
-						@click="handleRefresh"
-					>
-						<RefreshCwIcon
-							aria-hidden="true"
-							class="h-5 w-5 transition-transform"
-							:class="refreshing ? 'animate-spin' : ''"
-						/>
-						{{ formatMessage(commonMessages.refreshButton) }}
-					</button>
-				</ButtonStyled>
+				<Button
+					v-if="showRefreshButton"
+					type="outlined"
+					native-type="button"
+					size="lg"
+					:disabled="refreshing"
+					@click="handleRefresh"
+				>
+					<RefreshCwIcon
+						aria-hidden="true"
+						class="h-5 w-5 transition-transform"
+						:class="refreshing ? 'animate-spin' : ''"
+					/>
+					{{ formatMessage(commonMessages.refreshButton) }}
+				</Button>
 
-				<ButtonStyled type="outlined">
-					<OverflowMenu
-						:dropdown-id="`create-new-${baseId}`"
-						position="bottom"
-						direction="left"
-						:aria-label="formatMessage(messages.createNew)"
-						:disabled="disabled"
-						:tooltip="disabled ? disabledTooltip : undefined"
-						class="!h-10 justify-center gap-2"
-						:options="[
-							{ id: 'file', action: () => $emit('create', 'file') },
-							{ id: 'directory', action: () => $emit('create', 'directory') },
-							{ id: 'upload', action: () => $emit('upload') },
-							{ divider: true, shown: showInstallFromUrl ?? false },
-							{ id: 'upload-zip', shown: false, action: () => $emit('uploadZip') },
-							{
-								id: 'install-from-url',
-								shown: showInstallFromUrl ?? false,
-								action: () => $emit('unzipFromUrl', false),
-							},
-							{
-								id: 'install-cf-pack',
-								shown: showInstallFromUrl ?? false,
-								action: () => $emit('unzipFromUrl', true),
-							},
-						]"
-					>
-						<PlusIcon aria-hidden="true" class="h-5 w-5" />
-						<DropdownIcon aria-hidden="true" class="h-5 w-5" />
-						<template #file>
-							<BoxIcon aria-hidden="true" /> {{ formatMessage(messages.newFile) }}
-						</template>
-						<template #directory>
-							<FolderOpenIcon aria-hidden="true" /> {{ formatMessage(messages.newFolder) }}
-						</template>
-						<template #upload>
-							<UploadIcon aria-hidden="true" /> {{ formatMessage(messages.uploadFile) }}
-						</template>
-						<template #upload-zip>
-							<FileArchiveIcon aria-hidden="true" /> {{ formatMessage(messages.uploadFromZip) }}
-						</template>
-						<template #install-from-url>
-							<LinkIcon aria-hidden="true" /> {{ formatMessage(messages.uploadFromZipUrl) }}
-						</template>
-						<template #install-cf-pack>
-							<CurseForgeIcon aria-hidden="true" />
-							{{ formatMessage(messages.installCurseForgePack) }}
-						</template>
-					</OverflowMenu>
-				</ButtonStyled>
+				<TeleportOverflowMenu
+					type="outlined"
+					:label="formatMessage(messages.createNew)"
+					:disabled="disabled"
+					:tooltip="disabled ? disabledTooltip : undefined"
+					size="lg"
+					class="justify-center gap-2 !w-auto !px-2.5 !rounded-xl"
+					:options="[
+						{
+							id: 'file',
+							label: formatMessage(messages.newFile),
+							action: () => $emit('create', 'file'),
+						},
+						{
+							id: 'directory',
+							label: formatMessage(messages.newFolder),
+							action: () => $emit('create', 'directory'),
+						},
+						{
+							id: 'upload',
+							label: formatMessage(messages.uploadFile),
+							action: () => $emit('upload'),
+						},
+						{ type: 'divider', shown: showInstallFromUrl ?? false },
+						{
+							id: 'upload-zip',
+							label: formatMessage(messages.uploadFromZip),
+							shown: false,
+							action: () => $emit('uploadZip'),
+						},
+						{
+							id: 'install-from-url',
+							label: formatMessage(messages.uploadFromZipUrl),
+							shown: showInstallFromUrl ?? false,
+							action: () => $emit('unzipFromUrl', false),
+						},
+						{
+							id: 'install-cf-pack',
+							label: formatMessage(messages.installCurseForgePack),
+							shown: showInstallFromUrl ?? false,
+							action: () => $emit('unzipFromUrl', true),
+						},
+					]"
+				>
+					<PlusIcon aria-hidden="true" class="h-5 w-5" />
+					<DropdownIcon aria-hidden="true" class="h-5 w-5" />
+					<template #file>
+						<BoxIcon aria-hidden="true" /> {{ formatMessage(messages.newFile) }}
+					</template>
+					<template #directory>
+						<FolderOpenIcon aria-hidden="true" /> {{ formatMessage(messages.newFolder) }}
+					</template>
+					<template #upload>
+						<UploadIcon aria-hidden="true" /> {{ formatMessage(messages.uploadFile) }}
+					</template>
+					<template #upload-zip>
+						<FileArchiveIcon aria-hidden="true" /> {{ formatMessage(messages.uploadFromZip) }}
+					</template>
+					<template #install-from-url>
+						<LinkIcon aria-hidden="true" /> {{ formatMessage(messages.uploadFromZipUrl) }}
+					</template>
+					<template #install-cf-pack>
+						<CurseForgeIcon aria-hidden="true" />
+						{{ formatMessage(messages.installCurseForgePack) }}
+					</template>
+				</TeleportOverflowMenu>
 			</div>
 
 			<div v-else-if="!isEditingImage" class="flex gap-2">
-				<ButtonStyled v-if="isLogFile" type="transparent" circular>
-					<button
-						v-tooltip="formatMessage(messages.shareToMclogs)"
-						:aria-label="formatMessage(messages.shareToMclogs)"
-						@click="$emit('share')"
-					>
-						<ShareIcon />
-					</button>
-				</ButtonStyled>
-				<ButtonStyled
-					circular
-					:type="isEditorFindOpen ? 'standard' : 'transparent'"
-					:color="isEditorFindOpen ? 'brand' : 'standard'"
+				<IconButton
+					v-if="isLogFile"
+					v-tooltip="formatMessage(messages.shareToMclogs)"
+					type="quiet"
+					:label="formatMessage(messages.shareToMclogs)"
+					@click="$emit('share')"
 				>
-					<button
-						v-tooltip="formatMessage(messages.findInFile)"
-						:aria-label="formatMessage(messages.findInFile)"
-						:aria-pressed="isEditorFindOpen"
-						@click="$emit('find')"
-					>
-						<SearchIcon />
-					</button>
-				</ButtonStyled>
+					<ShareIcon />
+				</IconButton>
+				<IconButton
+					v-tooltip="formatMessage(messages.findInFile)"
+					:type="isEditorFindOpen ? 'colored' : 'quiet'"
+					:color="isEditorFindOpen ? 'brand' : undefined"
+					:label="formatMessage(messages.findInFile)"
+					:aria-pressed="isEditorFindOpen"
+					@click="$emit('find')"
+				>
+					<SearchIcon />
+				</IconButton>
 			</div>
 		</div>
 	</header>
@@ -226,8 +236,7 @@ import {
 } from '@modrinth/assets'
 import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'
 
-import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
-import OverflowMenu from '#ui/components/base/OverflowMenu.vue'
+import { Button, IconButton, TeleportOverflowMenu } from '#ui/components/base/buttons'
 import StyledInput from '#ui/components/base/StyledInput.vue'
 import { defineMessages, useVIntl } from '#ui/composables/i18n'
 import { commonMessages } from '#ui/utils/common-messages'
diff --git a/packages/ui/src/layouts/shared/files-tab/components/FileTableRow.vue b/packages/ui/src/layouts/shared/files-tab/components/FileTableRow.vue
index 05816710aa..983af761ad 100644
--- a/packages/ui/src/layouts/shared/files-tab/components/FileTableRow.vue
+++ b/packages/ui/src/layouts/shared/files-tab/components/FileTableRow.vue
@@ -49,41 +49,49 @@
 				>
 					{{ formatMessage(commonMessages.actionsLabel) }}
 				</span>
-				<div class="col-start-1 row-start-1 flex justify-end">
-					<ButtonStyled circular type="transparent">
-						<TeleportOverflowMenu :options="menuOptions">
-							<MoreHorizontalIcon class="h-5 w-5 bg-transparent" />
-							<template #copy-filename
-								><ClipboardCopyIcon />
-								{{ formatMessage(commonMessages.copyFilenameButton) }}</template
-							>
-							<template #copy-full-path
-								><ClipboardCopyIcon />
-								{{ formatMessage(commonMessages.copyFullPathButton) }}</template
-							>
-							<template #open-in-folder
-								><FolderOpenIcon /> {{ formatMessage(commonMessages.openInFolderButton) }}</template
-							>
-							<template #extract
-								><PackageOpenIcon /> {{ formatMessage(commonMessages.extractButton) }}</template
-							>
-							<template #rename
-								><EditIcon /> {{ formatMessage(commonMessages.renameButton) }}</template
-							>
-							<template #move
-								><RightArrowIcon /> {{ formatMessage(commonMessages.moveButton) }}</template
-							>
-							<template #download
-								><DownloadIcon />
-								{{
-									ctx.downloadButtonLabel ?? formatMessage(commonMessages.downloadButton)
-								}}</template
-							>
-							<template #delete
-								><TrashIcon /> {{ formatMessage(commonMessages.deleteLabel) }}</template
-							>
-						</TeleportOverflowMenu>
-					</ButtonStyled>
+				<div
+					class="col-start-1 row-start-1 flex justify-end"
+					@click.stop
+					@contextmenu.stop
+					@keydown.stop
+					@pointerdown.stop
+				>
+					<TeleportOverflowMenu
+						type="quiet"
+						:label="formatMessage(commonMessages.actionsLabel)"
+						:options="menuOptions"
+					>
+						<MoreHorizontalIcon class="h-5 w-5 bg-transparent" />
+						<template #copy-filename
+							><ClipboardCopyIcon />
+							{{ formatMessage(commonMessages.copyFilenameButton) }}</template
+						>
+						<template #copy-full-path
+							><ClipboardCopyIcon />
+							{{ formatMessage(commonMessages.copyFullPathButton) }}</template
+						>
+						<template #open-in-folder
+							><FolderOpenIcon /> {{ formatMessage(commonMessages.openInFolderButton) }}</template
+						>
+						<template #extract
+							><PackageOpenIcon /> {{ formatMessage(commonMessages.extractButton) }}</template
+						>
+						<template #rename
+							><EditIcon /> {{ formatMessage(commonMessages.renameButton) }}</template
+						>
+						<template #move
+							><RightArrowIcon /> {{ formatMessage(commonMessages.moveButton) }}</template
+						>
+						<template #download
+							><DownloadIcon />
+							{{
+								ctx.downloadButtonLabel ?? formatMessage(commonMessages.downloadButton)
+							}}</template
+						>
+						<template #delete
+							><TrashIcon /> {{ formatMessage(commonMessages.deleteLabel) }}</template
+						>
+					</TeleportOverflowMenu>
 				</div>
 			</div>
 		</div>
@@ -109,9 +117,8 @@ import {
 } from '@modrinth/assets'
 import { computed, ref } from 'vue'
 
-import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
+import { TeleportOverflowMenu } from '#ui/components/base/buttons'
 import Checkbox from '#ui/components/base/Checkbox.vue'
-import TeleportOverflowMenu from '#ui/components/base/TeleportOverflowMenu.vue'
 import { useFormatBytes } from '#ui/composables'
 import { useFormatDateTime } from '#ui/composables/format-date-time'
 import { defineMessages, useVIntl } from '#ui/composables/i18n'
@@ -211,6 +218,7 @@ const menuOptions = computed(() => {
 	return [
 		{
 			id: 'copy-filename',
+			label: formatMessage(commonMessages.copyFilenameButton),
 			icon: ClipboardCopyIcon,
 			action: () => {
 				navigator.clipboard.writeText(props.name)
@@ -222,6 +230,7 @@ const menuOptions = computed(() => {
 		},
 		{
 			id: 'copy-full-path',
+			label: formatMessage(commonMessages.copyFullPathButton),
 			icon: ClipboardCopyIcon,
 			action: () => {
 				navigator.clipboard.writeText(getFullPath())
@@ -230,45 +239,48 @@ const menuOptions = computed(() => {
 		},
 		{
 			id: 'open-in-folder',
+			label: formatMessage(commonMessages.openInFolderButton),
 			icon: FolderOpenIcon,
 			shown: !!ctx.openInFolder,
 			action: () => ctx.openInFolder?.(getFullPath()),
 		},
-		{ divider: true },
+		{ type: 'divider' },
 		{
 			id: 'extract',
+			label: formatMessage(commonMessages.extractButton),
 			shown: isZip.value,
 			disabled: wd,
 			tooltip: wd ? wdTooltip : undefined,
 			action: () => emit('extract', item),
 		},
-		{
-			divider: true,
-			shown: isZip.value,
-		},
+		{ type: 'divider', shown: isZip.value },
 		{
 			id: 'rename',
+			label: formatMessage(commonMessages.renameButton),
 			disabled: wd,
 			tooltip: wd ? wdTooltip : undefined,
 			action: () => emit('rename', item),
 		},
 		{
 			id: 'move',
+			label: formatMessage(commonMessages.moveButton),
 			disabled: wd,
 			tooltip: wd ? wdTooltip : undefined,
 			action: () => emit('move', item),
 		},
 		{
 			id: 'download',
+			label: ctx.downloadButtonLabel ?? formatMessage(commonMessages.downloadButton),
 			action: () => emit('download', item),
 			shown: props.type !== 'directory',
 		},
 		{
 			id: 'delete',
+			label: formatMessage(commonMessages.deleteLabel),
 			disabled: wd,
 			tooltip: wd ? wdTooltip : undefined,
 			action: () => emit('delete', item),
-			color: 'red' as const,
+			tone: 'red',
 		},
 	]
 })
diff --git a/packages/ui/src/layouts/shared/files-tab/components/editor/EditorFindReplace.vue b/packages/ui/src/layouts/shared/files-tab/components/editor/EditorFindReplace.vue
index 1e28ffbbb7..47a19ca752 100644
--- a/packages/ui/src/layouts/shared/files-tab/components/editor/EditorFindReplace.vue
+++ b/packages/ui/src/layouts/shared/files-tab/components/editor/EditorFindReplace.vue
@@ -7,19 +7,18 @@
 		>
 			<!-- Find row -->
 			<div class="flex items-center gap-1">
-				<ButtonStyled type="transparent" circular>
-					<button
-						v-tooltip="formatMessage(messages.toggleReplace)"
-						:disabled="props.readonly"
-						:aria-label="formatMessage(messages.toggleReplace)"
-						@click="toggleReplace"
-					>
-						<ChevronRightIcon
-							class="transition-transform duration-150"
-							:class="{ 'rotate-90': isReplaceOpen }"
-						/>
-					</button>
-				</ButtonStyled>
+				<IconButton
+					v-tooltip="formatMessage(messages.toggleReplace)"
+					type="quiet"
+					:label="formatMessage(messages.toggleReplace)"
+					:disabled="props.readonly"
+					@click="toggleReplace"
+				>
+					<ChevronRightIcon
+						class="transition-transform duration-150"
+						:class="{ 'rotate-90': isReplaceOpen }"
+					/>
+				</IconButton>
 				<div
 					@keydown.enter.exact.prevent.stop="emit('findNext')"
 					@keydown.shift.enter.prevent.stop="emit('findPrevious')"
@@ -47,36 +46,33 @@
 								: ''
 					}}
 				</span>
-				<ButtonStyled type="transparent" circular>
-					<button
-						v-tooltip="formatMessage(messages.previousMatch)"
-						:disabled="findMatchCount === 0"
-						:aria-label="formatMessage(messages.previousMatch)"
-						@click="emit('findPrevious')"
-					>
-						<ChevronUpIcon />
-					</button>
-				</ButtonStyled>
-				<ButtonStyled type="transparent" circular>
-					<button
-						v-tooltip="formatMessage(messages.nextMatch)"
-						:disabled="findMatchCount === 0"
-						:aria-label="formatMessage(messages.nextMatch)"
-						@click="emit('findNext')"
-					>
-						<ChevronDownIcon />
-					</button>
-				</ButtonStyled>
+				<IconButton
+					v-tooltip="formatMessage(messages.previousMatch)"
+					type="quiet"
+					:label="formatMessage(messages.previousMatch)"
+					:disabled="findMatchCount === 0"
+					@click="emit('findPrevious')"
+				>
+					<ChevronUpIcon />
+				</IconButton>
+				<IconButton
+					v-tooltip="formatMessage(messages.nextMatch)"
+					type="quiet"
+					:label="formatMessage(messages.nextMatch)"
+					:disabled="findMatchCount === 0"
+					@click="emit('findNext')"
+				>
+					<ChevronDownIcon />
+				</IconButton>
 				<div class="mx-0.5 h-4 w-px bg-surface-5" />
-				<ButtonStyled type="transparent" circular>
-					<button
-						v-tooltip="formatMessage(messages.closeFind)"
-						:aria-label="formatMessage(messages.closeFind)"
-						@click="close"
-					>
-						<XIcon />
-					</button>
-				</ButtonStyled>
+				<IconButton
+					v-tooltip="formatMessage(messages.closeFind)"
+					type="quiet"
+					:label="formatMessage(messages.closeFind)"
+					@click="close"
+				>
+					<XIcon />
+				</IconButton>
 			</div>
 
 			<!-- Replace row -->
@@ -94,24 +90,22 @@
 						wrapper-class="w-44"
 					/>
 				</div>
-				<ButtonStyled type="outlined">
-					<button
-						class="!h-8 whitespace-nowrap px-2 text-sm disabled:opacity-50"
-						:disabled="props.readonly || findMatchCount === 0"
-						@click="emit('replace', replaceQuery)"
-					>
-						{{ formatMessage(messages.replace) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled type="outlined">
-					<button
-						class="!h-8 whitespace-nowrap px-2 text-sm disabled:opacity-50"
-						:disabled="props.readonly || findMatchCount === 0"
-						@click="emit('replaceAll', replaceQuery)"
-					>
-						{{ formatMessage(messages.replaceAll) }}
-					</button>
-				</ButtonStyled>
+				<Button
+					type="outlined"
+					class="!h-8 whitespace-nowrap px-2 text-sm disabled:opacity-50"
+					:disabled="props.readonly || findMatchCount === 0"
+					@click="emit('replace', replaceQuery)"
+				>
+					{{ formatMessage(messages.replace) }}
+				</Button>
+				<Button
+					type="outlined"
+					class="!h-8 whitespace-nowrap px-2 text-sm disabled:opacity-50"
+					:disabled="props.readonly || findMatchCount === 0"
+					@click="emit('replaceAll', replaceQuery)"
+				>
+					{{ formatMessage(messages.replaceAll) }}
+				</Button>
 			</div>
 		</div>
 	</Transition>
@@ -121,7 +115,7 @@
 import { ChevronDownIcon, ChevronRightIcon, ChevronUpIcon, XIcon } from '@modrinth/assets'
 import { nextTick, ref, watch } from 'vue'
 
-import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
+import { Button, IconButton } from '#ui/components/base/buttons'
 import StyledInput from '#ui/components/base/StyledInput.vue'
 import { defineMessages, useVIntl } from '#ui/composables/i18n'
 
diff --git a/packages/ui/src/layouts/shared/files-tab/components/editor/FileImageViewer.vue b/packages/ui/src/layouts/shared/files-tab/components/editor/FileImageViewer.vue
index 6bd8bfec48..9b58de141d 100644
--- a/packages/ui/src/layouts/shared/files-tab/components/editor/FileImageViewer.vue
+++ b/packages/ui/src/layouts/shared/files-tab/components/editor/FileImageViewer.vue
@@ -24,22 +24,16 @@
 			v-if="isReady"
 			class="absolute bottom-4 left-1/2 flex -translate-x-1/2 items-center gap-1 rounded-2xl bg-surface-3/80 p-1.5 backdrop-blur-sm"
 		>
-			<ButtonStyled type="transparent">
-				<button v-tooltip="formatMessage(messages.zoomIn)" @click="zoomIn">
-					<ZoomInIcon />
-				</button>
-			</ButtonStyled>
-			<ButtonStyled type="transparent">
-				<button v-tooltip="formatMessage(messages.zoomOut)" @click="zoomOut">
-					<ZoomOutIcon />
-				</button>
-			</ButtonStyled>
+			<Button v-tooltip="formatMessage(messages.zoomIn)" type="quiet" @click="zoomIn">
+				<ZoomInIcon />
+			</Button>
+			<Button v-tooltip="formatMessage(messages.zoomOut)" type="quiet" @click="zoomOut">
+				<ZoomOutIcon />
+			</Button>
 			<div class="mx-1 h-6 w-px bg-surface-5" />
-			<ButtonStyled type="transparent">
-				<button v-tooltip="formatMessage(messages.resetZoom)" @click="resetZoom">
-					<span class="px-1 text-sm tabular-nums">{{ Math.round(scale * 100) }}%</span>
-				</button>
-			</ButtonStyled>
+			<Button v-tooltip="formatMessage(messages.resetZoom)" type="quiet" @click="resetZoom">
+				<span class="px-1 text-sm tabular-nums">{{ Math.round(scale * 100) }}%</span>
+			</Button>
 		</div>
 	</div>
 </template>
@@ -48,7 +42,7 @@
 import { TriangleAlertIcon, ZoomInIcon, ZoomOutIcon } from '@modrinth/assets'
 import { computed, onMounted, onUnmounted, ref, watch } from 'vue'
 
-import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
+import { Button } from '#ui/components/base/buttons'
 import { defineMessages, useVIntl } from '#ui/composables/i18n'
 
 const { formatMessage } = useVIntl()
diff --git a/packages/ui/src/layouts/shared/files-tab/components/modals/FileCreateItemModal.vue b/packages/ui/src/layouts/shared/files-tab/components/modals/FileCreateItemModal.vue
index deaf3828b0..584f74f64a 100644
--- a/packages/ui/src/layouts/shared/files-tab/components/modals/FileCreateItemModal.vue
+++ b/packages/ui/src/layouts/shared/files-tab/components/modals/FileCreateItemModal.vue
@@ -28,22 +28,18 @@
 		</form>
 		<template #actions>
 			<div class="flex gap-2 justify-end">
-				<ButtonStyled type="outlined">
-					<button @click="hide">
-						<XIcon class="h-5 w-5" />
-						{{ formatMessage(commonMessages.cancelButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="brand">
-					<button :disabled="!!error && submitted" @click="handleSubmit">
-						<PlusIcon class="h-5 w-5" />
-						{{
-							formatMessage(messages.createButton, {
-								type: formatFileItemType(formatMessage, type),
-							})
-						}}
-					</button>
-				</ButtonStyled>
+				<Button type="outlined" @click="hide">
+					<XIcon class="h-5 w-5" />
+					{{ formatMessage(commonMessages.cancelButton) }}
+				</Button>
+				<Button type="colored" color="brand" :disabled="!!error && submitted" @click="handleSubmit">
+					<PlusIcon class="h-5 w-5" />
+					{{
+						formatMessage(messages.createButton, {
+							type: formatFileItemType(formatMessage, type),
+						})
+					}}
+				</Button>
 			</div>
 		</template>
 	</NewModal>
@@ -53,7 +49,7 @@
 import { PlusIcon, XIcon } from '@modrinth/assets'
 import { computed, nextTick, ref } from 'vue'
 
-import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
+import { Button } from '#ui/components/base/buttons'
 import StyledInput from '#ui/components/base/StyledInput.vue'
 import NewModal from '#ui/components/modal/NewModal.vue'
 import { defineMessages, useVIntl } from '#ui/composables/i18n'
diff --git a/packages/ui/src/layouts/shared/files-tab/components/modals/FileDeleteItemModal.vue b/packages/ui/src/layouts/shared/files-tab/components/modals/FileDeleteItemModal.vue
index d66e0445b3..e39871c240 100644
--- a/packages/ui/src/layouts/shared/files-tab/components/modals/FileDeleteItemModal.vue
+++ b/packages/ui/src/layouts/shared/files-tab/components/modals/FileDeleteItemModal.vue
@@ -10,18 +10,14 @@
 		</Admonition>
 		<template #actions>
 			<div class="flex gap-2 justify-end">
-				<ButtonStyled type="outlined">
-					<button @click="hide">
-						<XIcon class="h-5 w-5" />
-						{{ formatMessage(commonMessages.cancelButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="red">
-					<button @click="handleSubmit">
-						<TrashIcon class="h-5 w-5" />
-						{{ formatMessage(commonMessages.deleteLabel) }}
-					</button>
-				</ButtonStyled>
+				<Button type="outlined" @click="hide">
+					<XIcon class="h-5 w-5" />
+					{{ formatMessage(commonMessages.cancelButton) }}
+				</Button>
+				<Button type="colored" color="red" @click="handleSubmit">
+					<TrashIcon class="h-5 w-5" />
+					{{ formatMessage(commonMessages.deleteLabel) }}
+				</Button>
 			</div>
 		</template>
 	</NewModal>
@@ -32,7 +28,7 @@ import { TrashIcon, XIcon } from '@modrinth/assets'
 import { ref } from 'vue'
 
 import Admonition from '#ui/components/base/Admonition.vue'
-import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
+import { Button } from '#ui/components/base/buttons'
 import NewModal from '#ui/components/modal/NewModal.vue'
 import { defineMessages, useVIntl } from '#ui/composables/i18n'
 import { commonMessages } from '#ui/utils/common-messages'
diff --git a/packages/ui/src/layouts/shared/files-tab/components/modals/FileMoveItemModal.vue b/packages/ui/src/layouts/shared/files-tab/components/modals/FileMoveItemModal.vue
index 37a36e298c..805c200d31 100644
--- a/packages/ui/src/layouts/shared/files-tab/components/modals/FileMoveItemModal.vue
+++ b/packages/ui/src/layouts/shared/files-tab/components/modals/FileMoveItemModal.vue
@@ -29,18 +29,14 @@
 		</form>
 		<template #actions>
 			<div class="flex gap-2 justify-end">
-				<ButtonStyled type="outlined">
-					<button @click="hide">
-						<XIcon class="h-5 w-5" />
-						{{ formatMessage(commonMessages.cancelButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="brand">
-					<button @click="handleSubmit">
-						<RightArrowIcon class="h-5 w-5" />
-						{{ formatMessage(commonMessages.moveButton) }}
-					</button>
-				</ButtonStyled>
+				<Button type="outlined" @click="hide">
+					<XIcon class="h-5 w-5" />
+					{{ formatMessage(commonMessages.cancelButton) }}
+				</Button>
+				<Button type="colored" color="brand" @click="handleSubmit">
+					<RightArrowIcon class="h-5 w-5" />
+					{{ formatMessage(commonMessages.moveButton) }}
+				</Button>
 			</div>
 		</template>
 	</NewModal>
@@ -50,7 +46,7 @@
 import { RightArrowIcon, XIcon } from '@modrinth/assets'
 import { nextTick, ref } from 'vue'
 
-import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
+import { Button } from '#ui/components/base/buttons'
 import StyledInput from '#ui/components/base/StyledInput.vue'
 import NewModal from '#ui/components/modal/NewModal.vue'
 import { defineMessages, useVIntl } from '#ui/composables/i18n'
diff --git a/packages/ui/src/layouts/shared/files-tab/components/modals/FileRenameItemModal.vue b/packages/ui/src/layouts/shared/files-tab/components/modals/FileRenameItemModal.vue
index 44cbdbe545..7609b1a733 100644
--- a/packages/ui/src/layouts/shared/files-tab/components/modals/FileRenameItemModal.vue
+++ b/packages/ui/src/layouts/shared/files-tab/components/modals/FileRenameItemModal.vue
@@ -13,18 +13,14 @@
 		</form>
 		<template #actions>
 			<div class="flex gap-2 justify-end">
-				<ButtonStyled type="outlined">
-					<button @click="hide">
-						<XIcon class="h-5 w-5" />
-						{{ formatMessage(commonMessages.cancelButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="brand">
-					<button :disabled="!!error && submitted" @click="handleSubmit">
-						<EditIcon class="h-5 w-5" />
-						{{ formatMessage(commonMessages.renameButton) }}
-					</button>
-				</ButtonStyled>
+				<Button type="outlined" @click="hide">
+					<XIcon class="h-5 w-5" />
+					{{ formatMessage(commonMessages.cancelButton) }}
+				</Button>
+				<Button type="colored" color="brand" :disabled="!!error && submitted" @click="handleSubmit">
+					<EditIcon class="h-5 w-5" />
+					{{ formatMessage(commonMessages.renameButton) }}
+				</Button>
 			</div>
 		</template>
 	</NewModal>
@@ -34,7 +30,7 @@
 import { EditIcon, XIcon } from '@modrinth/assets'
 import { computed, nextTick, ref } from 'vue'
 
-import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
+import { Button } from '#ui/components/base/buttons'
 import StyledInput from '#ui/components/base/StyledInput.vue'
 import NewModal from '#ui/components/modal/NewModal.vue'
 import { defineMessages, useVIntl } from '#ui/composables/i18n'
diff --git a/packages/ui/src/layouts/shared/files-tab/components/modals/FileUnsavedChangesModal.vue b/packages/ui/src/layouts/shared/files-tab/components/modals/FileUnsavedChangesModal.vue
index 9a1bb53dcc..718a3f0d76 100644
--- a/packages/ui/src/layouts/shared/files-tab/components/modals/FileUnsavedChangesModal.vue
+++ b/packages/ui/src/layouts/shared/files-tab/components/modals/FileUnsavedChangesModal.vue
@@ -5,24 +5,18 @@
 		</p>
 		<template #actions>
 			<div class="flex justify-end gap-2">
-				<ButtonStyled type="outlined">
-					<button @click="handleCancel">
-						<XIcon />
-						{{ formatMessage(commonMessages.cancelButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="red">
-					<button @click="handleDiscard">
-						<TrashIcon />
-						{{ formatMessage(messages.discard) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="green">
-					<button @click="handleSave">
-						<SaveIcon />
-						{{ formatMessage(commonMessages.saveButton) }}
-					</button>
-				</ButtonStyled>
+				<Button type="outlined" @click="handleCancel">
+					<XIcon />
+					{{ formatMessage(commonMessages.cancelButton) }}
+				</Button>
+				<Button type="colored" color="red" @click="handleDiscard">
+					<TrashIcon />
+					{{ formatMessage(messages.discard) }}
+				</Button>
+				<Button type="colored" color="green" @click="handleSave">
+					<SaveIcon />
+					{{ formatMessage(commonMessages.saveButton) }}
+				</Button>
 			</div>
 		</template>
 	</NewModal>
@@ -32,7 +26,7 @@
 import { SaveIcon, TrashIcon, XIcon } from '@modrinth/assets'
 import { ref } from 'vue'
 
-import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
+import { Button } from '#ui/components/base/buttons'
 import NewModal from '#ui/components/modal/NewModal.vue'
 import { defineMessages, useVIntl } from '#ui/composables/i18n'
 import { commonMessages } from '#ui/utils/common-messages'
diff --git a/packages/ui/src/layouts/shared/files-tab/components/modals/FileUploadConflictModal.vue b/packages/ui/src/layouts/shared/files-tab/components/modals/FileUploadConflictModal.vue
index 61e7f43c94..07e3413efd 100644
--- a/packages/ui/src/layouts/shared/files-tab/components/modals/FileUploadConflictModal.vue
+++ b/packages/ui/src/layouts/shared/files-tab/components/modals/FileUploadConflictModal.vue
@@ -56,18 +56,14 @@
 
 		<template #actions>
 			<div class="flex justify-end gap-2 pt-4">
-				<ButtonStyled type="outlined">
-					<button @click="hide">
-						<XIcon />
-						{{ formatMessage(commonMessages.cancelButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="brand">
-					<button @click="handleProceed">
-						<CheckIcon />
-						{{ formatMessage(messages.overwriteButton) }}
-					</button>
-				</ButtonStyled>
+				<Button type="outlined" @click="hide">
+					<XIcon />
+					{{ formatMessage(commonMessages.cancelButton) }}
+				</Button>
+				<Button type="colored" color="brand" @click="handleProceed">
+					<CheckIcon />
+					{{ formatMessage(messages.overwriteButton) }}
+				</Button>
 			</div>
 		</template>
 	</NewModal>
@@ -78,7 +74,7 @@ import { CheckIcon, MinusIcon, XIcon } from '@modrinth/assets'
 import { computed, ref } from 'vue'
 
 import Admonition from '#ui/components/base/Admonition.vue'
-import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
+import { Button } from '#ui/components/base/buttons'
 import IntlFormatted from '#ui/components/base/IntlFormatted.vue'
 import NewModal from '#ui/components/modal/NewModal.vue'
 import { defineMessages, useVIntl } from '#ui/composables/i18n'
diff --git a/packages/ui/src/layouts/shared/files-tab/components/modals/FileUploadZipUrlModal.vue b/packages/ui/src/layouts/shared/files-tab/components/modals/FileUploadZipUrlModal.vue
index 423635d6e8..d63cc95c8e 100644
--- a/packages/ui/src/layouts/shared/files-tab/components/modals/FileUploadZipUrlModal.vue
+++ b/packages/ui/src/layouts/shared/files-tab/components/modals/FileUploadZipUrlModal.vue
@@ -63,32 +63,30 @@
 
 		<template #actions>
 			<div class="flex w-full items-center justify-end gap-2">
-				<ButtonStyled type="outlined">
-					<button type="button" @click="hide">
-						<XIcon />
-						{{
-							submitted
-								? formatMessage(commonMessages.closeButton)
-								: formatMessage(commonMessages.cancelButton)
-						}}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="brand">
-					<button
-						v-tooltip="submitTooltip"
-						:disabled="submitDisabled"
-						type="submit"
-						@click="handleSubmit"
-					>
-						<SpinnerIcon v-if="submitted" class="animate-spin" />
-						<DownloadIcon v-else />
-						{{
-							submitted
-								? formatMessage(commonMessages.installingLabel)
-								: formatMessage(messages.installButton)
-						}}
-					</button>
-				</ButtonStyled>
+				<Button type="outlined" native-type="button" @click="hide">
+					<XIcon />
+					{{
+						submitted
+							? formatMessage(commonMessages.closeButton)
+							: formatMessage(commonMessages.cancelButton)
+					}}
+				</Button>
+				<Button
+					v-tooltip="submitTooltip"
+					type="colored"
+					color="brand"
+					:disabled="submitDisabled"
+					native-type="submit"
+					@click="handleSubmit"
+				>
+					<SpinnerIcon v-if="submitted" class="animate-spin" />
+					<DownloadIcon v-else />
+					{{
+						submitted
+							? formatMessage(commonMessages.installingLabel)
+							: formatMessage(messages.installButton)
+					}}
+				</Button>
 			</div>
 		</template>
 	</NewModal>
@@ -105,7 +103,7 @@ import {
 } from '@modrinth/assets'
 import { computed, nextTick, ref } from 'vue'
 
-import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
+import { Button } from '#ui/components/base/buttons'
 import StyledInput from '#ui/components/base/StyledInput.vue'
 import NewModal from '#ui/components/modal/NewModal.vue'
 import { defineMessages, useVIntl } from '#ui/composables/i18n'
diff --git a/packages/ui/src/layouts/shared/files-tab/components/upload/FileUploadDropdown.vue b/packages/ui/src/layouts/shared/files-tab/components/upload/FileUploadDropdown.vue
index a25cc3ebe1..315f9788a8 100644
--- a/packages/ui/src/layouts/shared/files-tab/components/upload/FileUploadDropdown.vue
+++ b/packages/ui/src/layouts/shared/files-tab/components/upload/FileUploadDropdown.vue
@@ -84,9 +84,9 @@
 												:style="{ width: item.progress + '%' }"
 											/>
 										</div>
-										<ButtonStyled color="red" type="transparent" @click="cancelUpload(item)">
-											<button>{{ formatMessage(commonMessages.cancelButton) }}</button>
-										</ButtonStyled>
+										<Button type="quiet" color="red" @click="cancelUpload(item)">{{
+											formatMessage(commonMessages.cancelButton)
+										}}</Button>
 									</template>
 									<template v-else-if="item.status === 'cancelled'">
 										<span class="text-red">{{ formatMessage(messages.cancelled) }}</span>
@@ -114,7 +114,7 @@
 import { CheckCircleIcon, FolderOpenIcon, SpinnerIcon, XCircleIcon } from '@modrinth/assets'
 import { computed, nextTick, ref, watch } from 'vue'
 
-import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
+import { Button } from '#ui/components/base/buttons'
 import { useFormatBytes } from '#ui/composables'
 import { defineMessages, useVIntl } from '#ui/composables/i18n'
 import { injectModrinthClient } from '#ui/providers/api-client'
diff --git a/packages/ui/src/layouts/shared/files-tab/layout.vue b/packages/ui/src/layouts/shared/files-tab/layout.vue
index 75847b76eb..a8744b0888 100644
--- a/packages/ui/src/layouts/shared/files-tab/layout.vue
+++ b/packages/ui/src/layouts/shared/files-tab/layout.vue
@@ -157,20 +157,18 @@
 				{{ formatMessage(messages.unsavedChanges) }}
 			</p>
 			<div class="ml-auto flex gap-2">
-				<ButtonStyled type="transparent">
-					<button @click="fileEditorRef?.revertChanges()">
-						<HistoryIcon /> {{ formatMessage(commonMessages.resetButton) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="brand">
-					<button
-						v-tooltip="isBusy ? busyTooltip : undefined"
-						:disabled="isBusy"
-						@click="fileEditorRef?.saveFileContent(false)"
-					>
-						<SaveIcon /> {{ formatMessage(commonMessages.saveButton) }}
-					</button>
-				</ButtonStyled>
+				<Button type="quiet" @click="fileEditorRef?.revertChanges()">
+					<HistoryIcon /> {{ formatMessage(commonMessages.resetButton) }}
+				</Button>
+				<Button
+					v-tooltip="isBusy ? busyTooltip : undefined"
+					type="colored"
+					color="brand"
+					:disabled="isBusy"
+					@click="fileEditorRef?.saveFileContent(false)"
+				>
+					<SaveIcon /> {{ formatMessage(commonMessages.saveButton) }}
+				</Button>
 			</div>
 		</FloatingActionBar>
 		<FloatingActionBar :shown="selectedItems.size > 0">
@@ -179,25 +177,23 @@
 					{{ formatMessage(messages.selectedCount, { count: selectedItems.size }) }}
 				</span>
 				<div class="mx-1 h-6 w-px bg-surface-5" />
-				<ButtonStyled type="transparent">
-					<button class="!text-primary" @click="deselectAll">
-						<span class="bar-label">{{ formatMessage(commonMessages.clearButton) }}</span>
-					</button>
-				</ButtonStyled>
+				<Button type="quiet" class="!text-primary" @click="deselectAll">
+					<span class="bar-label">{{ formatMessage(commonMessages.clearButton) }}</span>
+				</Button>
 			</div>
 			<div class="ml-auto flex items-center gap-0.5">
 				<div class="mx-1 h-6 w-px bg-surface-5" />
-				<ButtonStyled
-					type="transparent"
+				<Button
+					v-tooltip="busyTooltip"
+					type="quiet"
 					color="red"
-					color-fill="text"
-					hover-color-fill="background"
+					:disabled="isBusy"
+					class="hover:!bg-red focus-visible:!bg-red hover:!text-[var(--color-accent-contrast)] focus-visible:!text-[var(--color-accent-contrast)]"
+					@click="showBulkDeleteModal"
 				>
-					<button v-tooltip="busyTooltip" :disabled="isBusy" @click="showBulkDeleteModal">
-						<TrashIcon />
-						<span class="bar-label">{{ formatMessage(commonMessages.deleteLabel) }}</span>
-					</button>
-				</ButtonStyled>
+					<TrashIcon />
+					<span class="bar-label">{{ formatMessage(commonMessages.deleteLabel) }}</span>
+				</Button>
 			</div>
 		</FloatingActionBar>
 	</div>
@@ -217,7 +213,7 @@ import {
 import type { Component } from 'vue'
 import { computed, onMounted, onUnmounted, ref, shallowRef, watch } from 'vue'
 
-import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
+import { Button } from '#ui/components/base/buttons'
 import FloatingActionBar from '#ui/components/base/FloatingActionBar.vue'
 import { defineMessages, useVIntl } from '#ui/composables/i18n'
 import { useStickyObserver } from '#ui/composables/sticky-observer'
diff --git a/packages/ui/src/layouts/shared/installation-settings/components/ContentDiffModal.vue b/packages/ui/src/layouts/shared/installation-settings/components/ContentDiffModal.vue
index e13df17036..78e4e6b5b3 100644
--- a/packages/ui/src/layouts/shared/installation-settings/components/ContentDiffModal.vue
+++ b/packages/ui/src/layouts/shared/installation-settings/components/ContentDiffModal.vue
@@ -138,25 +138,29 @@
 				<p class="m-0 text-primary">{{ formatMessage(messages.reviewedFiles) }}</p>
 				<div class="flex justify-between gap-2">
 					<div>
-						<ButtonStyled v-if="showReportButton" color="red" type="transparent">
-							<button @click="emit('report', $event)">
-								<ReportIcon />
-								{{ formatMessage(commonMessages.reportButton) }}
-							</button>
-						</ButtonStyled>
+						<Button
+							v-if="showReportButton"
+							type="quiet"
+							color="red"
+							@click="emit('report', $event)"
+						>
+							<ReportIcon />
+							{{ formatMessage(commonMessages.reportButton) }}
+						</Button>
 					</div>
 					<div class="flex gap-2">
-						<ButtonStyled type="transparent" color="orange">
-							<button :disabled="buttonsDisabled || confirmDisabled" @click="handleConfirm">
-								{{ formatMessage(messages.installAnyway) }}
-							</button>
-						</ButtonStyled>
-						<ButtonStyled color="brand">
-							<button @click="handleCancel">
-								<BanIcon />
-								{{ formatMessage(messages.dontInstall) }}
-							</button>
-						</ButtonStyled>
+						<Button
+							type="quiet"
+							color="orange"
+							:disabled="buttonsDisabled || confirmDisabled"
+							@click="handleConfirm"
+						>
+							{{ formatMessage(messages.installAnyway) }}
+						</Button>
+						<Button type="colored" color="brand" @click="handleCancel">
+							<BanIcon />
+							{{ formatMessage(messages.dontInstall) }}
+						</Button>
 					</div>
 				</div>
 			</div>
@@ -166,26 +170,25 @@
 				:class="{ 'pt-4': !$slots['additional-content'] }"
 			>
 				<div>
-					<ButtonStyled v-if="showReportButton" color="red" type="transparent">
-						<button @click="emit('report', $event)">
-							<ReportIcon />
-							{{ formatMessage(commonMessages.reportButton) }}
-						</button>
-					</ButtonStyled>
+					<Button v-if="showReportButton" type="quiet" color="red" @click="emit('report', $event)">
+						<ReportIcon />
+						{{ formatMessage(commonMessages.reportButton) }}
+					</Button>
 				</div>
 				<div class="flex gap-2">
-					<ButtonStyled type="outlined">
-						<button class="!border" @click="handleCancel">
-							<XIcon />
-							{{ formatMessage(commonMessages.cancelButton) }}
-						</button>
-					</ButtonStyled>
-					<ButtonStyled color="brand">
-						<button :disabled="buttonsDisabled || confirmDisabled" @click="handleConfirm">
-							<component :is="confirmIcon" v-if="confirmIcon" />
-							{{ confirmLabel || formatMessage(commonMessages.confirmButton) }}
-						</button>
-					</ButtonStyled>
+					<Button type="outlined" class="!border" @click="handleCancel">
+						<XIcon />
+						{{ formatMessage(commonMessages.cancelButton) }}
+					</Button>
+					<Button
+						type="colored"
+						color="brand"
+						:disabled="buttonsDisabled || confirmDisabled"
+						@click="handleConfirm"
+					>
+						<component :is="confirmIcon" v-if="confirmIcon" />
+						{{ confirmLabel || formatMessage(commonMessages.confirmButton) }}
+					</Button>
 				</div>
 			</div>
 		</template>
@@ -205,7 +208,7 @@ import {
 import { type Component, computed, ref } from 'vue'
 
 import Admonition from '#ui/components/base/Admonition.vue'
-import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
+import { Button } from '#ui/components/base/buttons'
 import NewModal from '#ui/components/modal/NewModal.vue'
 import { defineMessages, useVIntl } from '#ui/composables/i18n'
 import { commonMessages } from '#ui/utils/common-messages'
diff --git a/packages/ui/src/layouts/shared/installation-settings/components/IncompatibleContentModal.vue b/packages/ui/src/layouts/shared/installation-settings/components/IncompatibleContentModal.vue
index ea9e03e114..36f09a0195 100644
--- a/packages/ui/src/layouts/shared/installation-settings/components/IncompatibleContentModal.vue
+++ b/packages/ui/src/layouts/shared/installation-settings/components/IncompatibleContentModal.vue
@@ -18,12 +18,10 @@
 						}}
 					</span>
 					<div v-if="variant === 'loader-change'">
-						<ButtonStyled color="red">
-							<button :disabled="loading" @click="handleResetServer">
-								<TrashIcon class="size-5" />
-								{{ formatMessage(commonMessages.resetServerButton) }}
-							</button>
-						</ButtonStyled>
+						<Button type="colored" color="red" :disabled="loading" @click="handleResetServer">
+							<TrashIcon class="size-5" />
+							{{ formatMessage(commonMessages.resetServerButton) }}
+						</Button>
 					</div>
 				</div>
 			</Admonition>
@@ -40,42 +38,44 @@
 
 		<template #actions>
 			<div class="flex justify-end gap-2">
-				<ButtonStyled>
-					<button :disabled="loading" @click="handleCancel">
-						<XIcon />
-						{{ formatMessage(commonMessages.cancelButton) }}
-					</button>
-				</ButtonStyled>
+				<Button :disabled="loading" @click="handleCancel">
+					<XIcon />
+					{{ formatMessage(commonMessages.cancelButton) }}
+				</Button>
 				<template v-if="variant === 'game-version-change'">
-					<ButtonStyled>
-						<button :disabled="buttonsDisabled || loading" @click="handleDisableConflicts">
-							<SpinnerIcon
-								v-if="loading && loadingAction === 'disable-conflicts'"
-								class="size-5 animate-spin"
-							/>
-							<PowerOffIcon v-else class="size-5" />
-							{{ formatMessage(messages.disableConflictsButton) }}
-						</button>
-					</ButtonStyled>
-					<ButtonStyled color="orange">
-						<button :disabled="buttonsDisabled || loading" @click="handleAutoFix">
-							<SpinnerIcon
-								v-if="loading && loadingAction === 'auto-fix'"
-								class="size-5 animate-spin"
-							/>
-							<HammerIcon v-else class="size-5" />
-							{{ formatMessage(messages.autoFixButton) }}
-						</button>
-					</ButtonStyled>
+					<Button :disabled="buttonsDisabled || loading" @click="handleDisableConflicts">
+						<SpinnerIcon
+							v-if="loading && loadingAction === 'disable-conflicts'"
+							class="size-5 animate-spin"
+						/>
+						<PowerOffIcon v-else class="size-5" />
+						{{ formatMessage(messages.disableConflictsButton) }}
+					</Button>
+					<Button
+						type="colored"
+						color="orange"
+						:disabled="buttonsDisabled || loading"
+						@click="handleAutoFix"
+					>
+						<SpinnerIcon
+							v-if="loading && loadingAction === 'auto-fix'"
+							class="size-5 animate-spin"
+						/>
+						<HammerIcon v-else class="size-5" />
+						{{ formatMessage(messages.autoFixButton) }}
+					</Button>
 				</template>
 				<template v-else>
-					<ButtonStyled color="red">
-						<button :disabled="buttonsDisabled || loading" @click="handleConfirmLoaderChange">
-							<SpinnerIcon v-if="loading" class="size-5 animate-spin" />
-							<CircleAlertIcon v-else class="size-5" />
-							{{ formatMessage(messages.changeLoaderButton) }}
-						</button>
-					</ButtonStyled>
+					<Button
+						type="colored"
+						color="red"
+						:disabled="buttonsDisabled || loading"
+						@click="handleConfirmLoaderChange"
+					>
+						<SpinnerIcon v-if="loading" class="size-5 animate-spin" />
+						<CircleAlertIcon v-else class="size-5" />
+						{{ formatMessage(messages.changeLoaderButton) }}
+					</Button>
 				</template>
 			</div>
 		</template>
@@ -94,7 +94,7 @@ import {
 import { ref } from 'vue'
 
 import Admonition from '#ui/components/base/Admonition.vue'
-import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
+import { Button } from '#ui/components/base/buttons'
 import NewModal from '#ui/components/modal/NewModal.vue'
 import { defineMessages, useVIntl } from '#ui/composables/i18n'
 import { commonMessages } from '#ui/utils/common-messages'
diff --git a/packages/ui/src/layouts/shared/installation-settings/layout.vue b/packages/ui/src/layouts/shared/installation-settings/layout.vue
index 9d0f404150..5bf5ad7bf8 100644
--- a/packages/ui/src/layouts/shared/installation-settings/layout.vue
+++ b/packages/ui/src/layouts/shared/installation-settings/layout.vue
@@ -19,7 +19,7 @@ import { onBeforeRouteLeave } from 'vue-router'
 import Admonition from '#ui/components/base/Admonition.vue'
 import AutoLink from '#ui/components/base/AutoLink.vue'
 import Avatar from '#ui/components/base/Avatar.vue'
-import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
+import { Button } from '#ui/components/base/buttons'
 import Chips from '#ui/components/base/Chips.vue'
 import Combobox from '#ui/components/base/Combobox.vue'
 import PaperChannelBadge from '#ui/components/base/PaperChannelBadge.vue'
@@ -667,17 +667,15 @@ const messages = defineMessages({
 						</div>
 					</div>
 					<div class="flex flex-wrap gap-2">
-						<ButtonStyled v-if="showModpackVersionActions || isLocalFile">
-							<button
-								v-tooltip="ctx.isBusy.value ? ctx.busyMessage?.value : undefined"
-								class="!shadow-none"
-								:disabled="ctx.isBusy.value"
-								@click="handleModpackPrimaryAction"
-							>
-								<ArrowLeftRightIcon class="size-5" />
-								{{ formatMessage(commonMessages.changeVersionButton) }}
-							</button>
-						</ButtonStyled>
+						<Button
+							v-if="showModpackVersionActions || isLocalFile"
+							v-tooltip="ctx.isBusy.value ? ctx.busyMessage?.value : undefined"
+							:disabled="ctx.isBusy.value"
+							@click="handleModpackPrimaryAction"
+						>
+							<ArrowLeftRightIcon class="size-5" />
+							{{ formatMessage(commonMessages.changeVersionButton) }}
+						</Button>
 					</div>
 					<Admonition
 						v-if="isManagedModpack && (showModpackVersionActions || isLocalFile)"
@@ -700,21 +698,20 @@ const messages = defineMessages({
 						}}
 					</span>
 					<div>
-						<ButtonStyled color="orange">
-							<button
-								v-tooltip="ctx.isBusy.value ? ctx.busyMessage?.value : undefined"
-								class="!shadow-none"
-								:disabled="ctx.isBusy.value"
-								@click="handleShowUnlinkModal"
-							>
-								<UnlinkIcon class="size-5" />
-								{{
-									formatMessage(
-										isLinkedModpack ? commonMessages.unlinkModpackButton : messages.unlinkButton,
-									)
-								}}
-							</button>
-						</ButtonStyled>
+						<Button
+							v-tooltip="ctx.isBusy.value ? ctx.busyMessage?.value : undefined"
+							type="colored"
+							color="orange"
+							:disabled="ctx.isBusy.value"
+							@click="handleShowUnlinkModal"
+						>
+							<UnlinkIcon class="size-5" />
+							{{
+								formatMessage(
+									isLinkedModpack ? commonMessages.unlinkModpackButton : messages.unlinkButton,
+								)
+							}}
+						</Button>
 					</div>
 					<span class="text-primary">
 						{{
@@ -734,22 +731,21 @@ const messages = defineMessages({
 						{{ formatMessage(messages.reinstallModpackTitle) }}
 					</span>
 					<div>
-						<ButtonStyled color="red">
-							<button
-								v-tooltip="ctx.isBusy.value ? ctx.busyMessage?.value : undefined"
-								class="!shadow-none"
-								:disabled="ctx.isBusy.value"
-								@click="handleShowReinstallModal"
-							>
-								<SpinnerIcon v-if="ctx.reinstalling?.value" class="animate-spin" />
-								<DownloadIcon v-else class="size-5" />
-								{{
-									ctx.reinstalling?.value
-										? formatMessage(messages.reinstallingModpackButton)
-										: formatMessage(commonMessages.reinstallModpackButton)
-								}}
-							</button>
-						</ButtonStyled>
+						<Button
+							v-tooltip="ctx.isBusy.value ? ctx.busyMessage?.value : undefined"
+							type="colored"
+							color="red"
+							:disabled="ctx.isBusy.value"
+							@click="handleShowReinstallModal"
+						>
+							<SpinnerIcon v-if="ctx.reinstalling?.value" class="animate-spin" />
+							<DownloadIcon v-else class="size-5" />
+							{{
+								ctx.reinstalling?.value
+									? formatMessage(messages.reinstallingModpackButton)
+									: formatMessage(commonMessages.reinstallModpackButton)
+							}}
+						</Button>
 					</div>
 					<span class="text-primary">
 						{{
@@ -772,22 +768,19 @@ const messages = defineMessages({
 						}}
 					</span>
 					<div>
-						<ButtonStyled>
-							<button
-								v-tooltip="ctx.isBusy.value ? ctx.busyMessage?.value : undefined"
-								class="!shadow-none"
-								:disabled="ctx.isBusy.value"
-								@click="handleShowRepairModal"
-							>
-								<SpinnerIcon v-if="ctx.repairing?.value" class="animate-spin" />
-								<HammerIcon v-else class="size-5" />
-								{{
-									ctx.repairing?.value
-										? formatMessage(commonMessages.repairingButton)
-										: formatMessage(commonMessages.repairButton)
-								}}
-							</button>
-						</ButtonStyled>
+						<Button
+							v-tooltip="ctx.isBusy.value ? ctx.busyMessage?.value : undefined"
+							:disabled="ctx.isBusy.value"
+							@click="handleShowRepairModal"
+						>
+							<SpinnerIcon v-if="ctx.repairing?.value" class="animate-spin" />
+							<HammerIcon v-else class="size-5" />
+							{{
+								ctx.repairing?.value
+									? formatMessage(commonMessages.repairingButton)
+									: formatMessage(commonMessages.repairButton)
+							}}
+						</Button>
 					</div>
 					<span class="text-primary">
 						{{
@@ -926,35 +919,32 @@ const messages = defineMessages({
 						</div>
 
 						<div class="flex flex-wrap gap-2">
-							<ButtonStyled color="brand">
-								<button
-									v-tooltip="ctx.isBusy.value ? ctx.busyMessage?.value : undefined"
-									class="!shadow-none"
-									:disabled="
-										!form.isValid.value ||
-										!form.hasChanges.value ||
-										form.isSaving.value ||
-										ctx.isBusy.value
-									"
-									@click="handleSave"
-								>
-									<SpinnerIcon v-if="form.isSaving.value" class="animate-spin" />
-									<SaveIcon v-else />
-									{{
-										form.isVerifying.value
-											? formatMessage(messages.verifyingLabel)
-											: form.isSaving.value
-												? formatMessage(messages.savingLabel)
-												: formatMessage(commonMessages.saveButton)
-									}}
-								</button>
-							</ButtonStyled>
-							<ButtonStyled type="outlined">
-								<button @click="handleCancelEditing">
-									<XIcon />
-									{{ formatMessage(commonMessages.cancelButton) }}
-								</button>
-							</ButtonStyled>
+							<Button
+								v-tooltip="ctx.isBusy.value ? ctx.busyMessage?.value : undefined"
+								type="colored"
+								color="brand"
+								:disabled="
+									!form.isValid.value ||
+									!form.hasChanges.value ||
+									form.isSaving.value ||
+									ctx.isBusy.value
+								"
+								@click="handleSave"
+							>
+								<SpinnerIcon v-if="form.isSaving.value" class="animate-spin" />
+								<SaveIcon v-else />
+								{{
+									form.isVerifying.value
+										? formatMessage(messages.verifyingLabel)
+										: form.isSaving.value
+											? formatMessage(messages.savingLabel)
+											: formatMessage(commonMessages.saveButton)
+								}}
+							</Button>
+							<Button type="outlined" @click="handleCancelEditing">
+								<XIcon />
+								{{ formatMessage(commonMessages.cancelButton) }}
+							</Button>
 						</div>
 					</div>
 				</div>
@@ -975,17 +965,16 @@ const messages = defineMessages({
 						</div>
 					</div>
 					<div class="flex flex-wrap gap-2">
-						<ButtonStyled color="orange">
-							<button
-								v-tooltip="ctx.isBusy.value ? ctx.busyMessage?.value : undefined"
-								class="!shadow-none"
-								:disabled="ctx.isBusy.value"
-								@click="handleStartEditing"
-							>
-								<PencilIcon class="size-5" />
-								{{ formatMessage(commonMessages.editButton) }}
-							</button>
-						</ButtonStyled>
+						<Button
+							v-tooltip="ctx.isBusy.value ? ctx.busyMessage?.value : undefined"
+							type="colored"
+							color="orange"
+							:disabled="ctx.isBusy.value"
+							@click="handleStartEditing"
+						>
+							<PencilIcon class="size-5" />
+							{{ formatMessage(commonMessages.editButton) }}
+						</Button>
 						<slot name="unlinked-extra-buttons" />
 					</div>
 					<div class="flex items-start gap-2">
@@ -1010,22 +999,19 @@ const messages = defineMessages({
 						}}
 					</span>
 					<div>
-						<ButtonStyled>
-							<button
-								v-tooltip="ctx.isBusy.value ? ctx.busyMessage?.value : undefined"
-								class="!shadow-none"
-								:disabled="ctx.isBusy.value"
-								@click="handleShowRepairModal"
-							>
-								<SpinnerIcon v-if="ctx.repairing?.value" class="animate-spin" />
-								<HammerIcon v-else class="size-5" />
-								{{
-									ctx.repairing?.value
-										? formatMessage(commonMessages.repairingButton)
-										: formatMessage(commonMessages.repairButton)
-								}}
-							</button>
-						</ButtonStyled>
+						<Button
+							v-tooltip="ctx.isBusy.value ? ctx.busyMessage?.value : undefined"
+							:disabled="ctx.isBusy.value"
+							@click="handleShowRepairModal"
+						>
+							<SpinnerIcon v-if="ctx.repairing?.value" class="animate-spin" />
+							<HammerIcon v-else class="size-5" />
+							{{
+								ctx.repairing?.value
+									? formatMessage(commonMessages.repairingButton)
+									: formatMessage(commonMessages.repairButton)
+							}}
+						</Button>
 					</div>
 					<span class="text-primary">
 						{{
diff --git a/packages/ui/src/layouts/shared/server-settings/pages/advanced.vue b/packages/ui/src/layouts/shared/server-settings/pages/advanced.vue
index 133342ce11..c56d47c942 100644
--- a/packages/ui/src/layouts/shared/server-settings/pages/advanced.vue
+++ b/packages/ui/src/layouts/shared/server-settings/pages/advanced.vue
@@ -6,95 +6,82 @@
 				<div class="flex flex-col gap-2">
 					<div class="flex flex-col items-center justify-between gap-0.5 sm:flex-row">
 						<span class="text-lg font-semibold text-contrast">SFTP</span>
-						<ButtonStyled>
-							<a
-								v-tooltip="sftpActionTooltip"
-								class="!w-full sm:!w-auto"
-								:class="{ 'opacity-60': !canWriteFiles }"
-								:href="canWriteFiles ? sftpUrl : undefined"
-								:aria-disabled="!canWriteFiles"
-								target="_blank"
-								@click="handleSftpLaunchClick"
-							>
-								<ExternalIcon class="h-5 w-5" />
-								Launch SFTP
-							</a>
-						</ButtonStyled>
+						<ButtonLink
+							v-tooltip="sftpActionTooltip"
+							class="!w-full sm:!w-auto"
+							:class="{ 'opacity-60': !canWriteFiles }"
+							:href="canWriteFiles ? sftpUrl : undefined"
+							:aria-disabled="!canWriteFiles"
+							target="_blank"
+							@click="handleSftpLaunchClick"
+						>
+							<ExternalIcon class="h-5 w-5" />
+							Launch SFTP
+						</ButtonLink>
 					</div>
 
 					<div class="flex flex-col gap-2.5 rounded-2xl bg-surface-2 p-4">
 						<span class="text-lg font-semibold text-contrast">Server Address</span>
-						<div
+						<Button
 							v-tooltip="sftpCopyTooltip('Copy SFTP server address')"
-							class="copy-field hover:bg-button-bg-hover"
-							:class="{ 'opacity-60': !canWriteFiles }"
+							native-type="button"
+							size="lg"
+							class="w-full !justify-between text-left"
+							:disabled="!canWriteFiles"
 							@click="copyToClipboard('Server address', server?.sftp_host)"
 						>
-							<span class="cursor-pointer font-semibold text-primary">
+							<span class="min-w-0 truncate text-base font-semibold text-primary">
 								{{ server?.sftp_host }}
 							</span>
-							<div class="grid h-10 w-10 place-content-center">
-								<CopyIcon class="h-5 w-5" />
-							</div>
-						</div>
+							<ClipboardCopyIcon class="size-5 shrink-0 text-secondary" aria-hidden="true" />
+						</Button>
 						<div class="flex flex-col gap-2 sm:mt-0 sm:flex-row">
 							<div class="flex w-full flex-col justify-center gap-2">
 								<span class="text-lg font-semibold text-contrast">Username</span>
-								<div
+								<Button
 									v-tooltip="sftpCopyTooltip('Copy SFTP username')"
-									class="copy-field hover:bg-button-bg-hover"
-									:class="{ 'opacity-60': !canWriteFiles }"
+									native-type="button"
+									size="lg"
+									class="w-full !justify-between text-left"
+									:disabled="!canWriteFiles"
 									@click="copyToClipboard('Username', server?.sftp_username)"
 								>
-									<div class="truncate font-semibold">
+									<span class="min-w-0 truncate text-base font-semibold text-primary">
 										{{ server?.sftp_username }}
-									</div>
-									<div class="grid h-10 w-9 place-content-center">
-										<CopyIcon class="h-5 w-5" />
-									</div>
-								</div>
+									</span>
+									<ClipboardCopyIcon class="size-5 shrink-0 text-secondary" aria-hidden="true" />
+								</Button>
 							</div>
 							<div class="flex w-full flex-col justify-center gap-2">
 								<span class="text-lg font-semibold text-contrast">Password</span>
-								<div
-									class="copy-field-has-button [&:hover:not(:has(button:hover))]:bg-button-bg-hover"
-									:class="{ 'opacity-60': !canWriteFiles }"
-									@click="copyToClipboard('Password', server?.sftp_password)"
-								>
-									<div class="flex items-center gap-1.5 h-full w-full">
-										<div
-											v-tooltip="sftpCopyTooltip('Copy SFTP Password')"
-											class="h-full flex justify-between grow items-center"
-										>
-											<div class="truncate font-semibold">
-												{{
-													showPassword
-														? server?.sftp_password
-														: '*'.repeat(server?.sftp_password?.length ?? 0)
-												}}
-											</div>
-											<CopyIcon class="h-5 w-5" />
-										</div>
-
-										<ButtonStyled type="transparent" circular>
-											<button
-												v-tooltip="
-													canWriteFiles
-														? showPassword
-															? 'Hide password'
-															: 'Show password'
-														: permissionDeniedMessage
-												"
-												class="hover:bg-button-bg-hover grid h-10 w-10 place-content-center rounded-lg"
-												:disabled="!canWriteFiles"
-												@click.stop="togglePasswordVisibility"
-											>
-												<!-- look into doing stop propagation here -->
-												<EyeIcon v-if="showPassword" class="h-5 w-5" />
-												<EyeOffIcon v-else class="h-5 w-5" />
-											</button>
-										</ButtonStyled>
-									</div>
+								<div class="flex items-center gap-1.5">
+									<Button
+										v-tooltip="sftpCopyTooltip('Copy SFTP password')"
+										native-type="button"
+										size="lg"
+										class="min-w-0 grow !justify-between text-left"
+										:disabled="!canWriteFiles"
+										@click="copyToClipboard('Password', server?.sftp_password)"
+									>
+										<span class="min-w-0 truncate text-base font-semibold text-primary">
+											{{
+												showPassword
+													? server?.sftp_password
+													: '*'.repeat(server?.sftp_password?.length ?? 0)
+											}}
+										</span>
+										<ClipboardCopyIcon class="size-5 shrink-0 text-secondary" aria-hidden="true" />
+									</Button>
+									<IconButton
+										v-tooltip="passwordVisibilityTooltip"
+										:label="passwordVisibilityTooltip"
+										size="lg"
+										:disabled="!canWriteFiles"
+										@click="togglePasswordVisibility"
+									>
+										<EyeIcon v-if="showPassword" />
+										<EyeOffIcon v-else />
+									</IconButton>
 								</div>
 							</div>
 						</div>
@@ -107,21 +94,21 @@
 						<label for="startup-command-field" class="mb-0.5 flex flex-col gap-2">
 							<span class="text-lg font-semibold text-contrast">Startup command</span>
 						</label>
-						<ButtonStyled v-if="startupCommand !== defaultStartupCommand" type="transparent">
-							<button
-								v-tooltip="advancedActionTooltip"
-								:disabled="
-									isStartupLoading ||
-									startupCommand === defaultStartupCommand ||
-									!canUseAdvancedSettings
-								"
-								class="relative !w-full sm:!w-auto"
-								@click="resetToDefault"
-							>
-								<UpdatedIcon class="h-5 w-5" />
-								Default
-							</button>
-						</ButtonStyled>
+						<Button
+							v-if="startupCommand !== defaultStartupCommand"
+							v-tooltip="advancedActionTooltip"
+							type="quiet"
+							:disabled="
+								isStartupLoading ||
+								startupCommand === defaultStartupCommand ||
+								!canUseAdvancedSettings
+							"
+							class="relative !w-full sm:!w-auto"
+							@click="resetToDefault"
+						>
+							<UpdatedIcon class="h-5 w-5" />
+							Default
+						</Button>
 					</div>
 					<div class="relative">
 						<StyledInput
@@ -157,6 +144,7 @@
 							:options="displayedJavaVersions"
 							:display-value="javaVersionLabel ?? 'Java Version'"
 							:disabled="isStartupLoading || !canUseAdvancedSettings"
+							trigger-type="base"
 						>
 							<template #dropdown-footer>
 								<button
@@ -194,6 +182,7 @@
 							:options="JRE_VENDORS"
 							:display-value="jreVendorLabel ?? 'Runtime'"
 							:disabled="isStartupLoading || !canUseAdvancedSettings"
+							trigger-type="base"
 						/>
 						<div
 							v-if="isStartupLoading"
@@ -219,7 +208,7 @@
 <script setup lang="ts">
 import type { Archon } from '@modrinth/api-client'
 import {
-	CopyIcon,
+	ClipboardCopyIcon,
 	ExternalIcon,
 	EyeIcon,
 	EyeOffIcon,
@@ -229,7 +218,8 @@ import {
 import { useMutation, useQuery, useQueryClient } from '@tanstack/vue-query'
 import { computed, ref, watch } from 'vue'
 
-import { ButtonStyled, Combobox, StyledInput } from '#ui/components'
+import { Combobox, StyledInput } from '#ui/components'
+import { Button, ButtonLink, IconButton } from '#ui/components/base/buttons'
 import SaveBanner from '#ui/components/servers/SaveBanner.vue'
 import { useServerPermissions } from '#ui/composables/server-permissions'
 import {
@@ -244,7 +234,6 @@ const client = injectModrinthClient()
 const queryClient = useQueryClient()
 const { canUseAdvancedSettings, canWriteFiles, permissionDeniedMessage } = useServerPermissions()
 
-// SFTP state
 const showPassword = ref(false)
 const sftpUrl = computed(() => `sftp://${server.value?.sftp_username}@${server.value?.sftp_host}`)
 const advancedActionTooltip = computed(() =>
@@ -257,6 +246,13 @@ const sftpActionTooltip = computed(() =>
 )
 const sftpCopyTooltip = (label: string) =>
 	canWriteFiles.value ? label : permissionDeniedMessage.value
+const passwordVisibilityTooltip = computed(() =>
+	canWriteFiles.value
+		? showPassword.value
+			? 'Hide password'
+			: 'Show password'
+		: permissionDeniedMessage.value,
+)
 
 function handleSftpLaunchClick(event: MouseEvent) {
 	if (canWriteFiles.value) return
@@ -272,6 +268,11 @@ const copyToClipboard = (name: string, textToCopy?: string) => {
 	})
 }
 
+function togglePasswordVisibility() {
+	if (!canWriteFiles.value) return
+	showPassword.value = !showPassword.value
+}
+
 // Startup state
 const startupQueryKey = computed(() => ['servers', 'startup', 'v1', serverId, worldId.value])
 
@@ -281,11 +282,6 @@ const { data: startupData, isLoading: isStartupLoading } = useQuery({
 	enabled: computed(() => worldId.value !== null),
 })
 
-function togglePasswordVisibility() {
-	if (!canWriteFiles.value) return
-	showPassword.value = !showPassword.value
-}
-
 const JAVA_VERSIONS = [
 	{ value: 8, label: 'Java 8' },
 	{ value: 11, label: 'Java 11' },
@@ -427,15 +423,3 @@ function resetToDefault() {
 	startupCommand.value = defaultStartupCommand.value
 }
 </script>
-
-<style scoped>
-.copy-field {
-	@apply flex h-10 cursor-pointer items-center justify-between gap-2 rounded-lg bg-button-bg px-3 pr-1.5 transition-all;
-	@apply hover:brightness-125 active:scale-95;
-}
-
-.copy-field-has-button {
-	@apply flex h-10 cursor-pointer items-center justify-between gap-2 rounded-lg bg-button-bg px-3 pr-1.5 transition-all;
-	@apply [&:hover:not(:has(button:hover))]:brightness-125 [&:active:not(:has(button:active))]:scale-95;
-}
-</style>
diff --git a/packages/ui/src/layouts/shared/server-settings/pages/installation.vue b/packages/ui/src/layouts/shared/server-settings/pages/installation.vue
index 3d943bd823..21275870a7 100644
--- a/packages/ui/src/layouts/shared/server-settings/pages/installation.vue
+++ b/packages/ui/src/layouts/shared/server-settings/pages/installation.vue
@@ -22,17 +22,16 @@
 						formatMessage(messages.resetServerTitle)
 					}}</span>
 					<div>
-						<ButtonStyled color="red">
-							<button
-								v-tooltip="resetServerDisabledTooltip"
-								class="!shadow-none"
-								:disabled="resetServerDisabled"
-								@click="showResetServerModal"
-							>
-								<RotateCounterClockwiseIcon class="size-5" />
-								{{ formatMessage(commonMessages.resetServerButton) }}
-							</button>
-						</ButtonStyled>
+						<Button
+							v-tooltip="resetServerDisabledTooltip"
+							type="colored"
+							color="red"
+							:disabled="resetServerDisabled"
+							@click="showResetServerModal"
+						>
+							<RotateCounterClockwiseIcon class="size-5" />
+							{{ formatMessage(commonMessages.resetServerButton) }}
+						</Button>
 					</div>
 					<span class="text-primary">
 						{{ formatMessage(messages.resetServerDescription) }}
@@ -59,17 +58,16 @@
 				{{ formatMessage(messages.supportOptionsTitle) }}
 			</span>
 			<div>
-				<ButtonStyled color="red">
-					<button
-						v-tooltip="supportResetToOnboardingTooltip"
-						class="!shadow-none"
-						:disabled="supportResetToOnboardingDisabled"
-						@click="showResetToOnboardingModal"
-					>
-						<RotateCounterClockwiseIcon class="size-5" />
-						{{ formatMessage(messages.resetToOnboardingButton) }}
-					</button>
-				</ButtonStyled>
+				<Button
+					v-tooltip="supportResetToOnboardingTooltip"
+					type="colored"
+					color="red"
+					:disabled="supportResetToOnboardingDisabled"
+					@click="showResetToOnboardingModal"
+				>
+					<RotateCounterClockwiseIcon class="size-5" />
+					{{ formatMessage(messages.resetToOnboardingButton) }}
+				</Button>
 			</div>
 		</div>
 	</div>
@@ -79,7 +77,6 @@
 import type { Archon } from '@modrinth/api-client'
 import { RotateCounterClockwiseIcon } from '@modrinth/assets'
 import {
-	ButtonStyled,
 	commonMessages,
 	ConfirmModal,
 	defineMessages,
@@ -103,6 +100,7 @@ import {
 import { useQuery, useQueryClient } from '@tanstack/vue-query'
 import { computed, ref, useTemplateRef, watch } from 'vue'
 
+import { Button } from '#ui/components/base/buttons'
 import { injectFilePicker } from '#ui/providers/file-picker'
 
 const debug = useDebugLogger('LoaderPage')
diff --git a/packages/ui/src/layouts/shared/server-settings/pages/network.vue b/packages/ui/src/layouts/shared/server-settings/pages/network.vue
index dd8091b289..9a91d08000 100644
--- a/packages/ui/src/layouts/shared/server-settings/pages/network.vue
+++ b/packages/ui/src/layouts/shared/server-settings/pages/network.vue
@@ -16,18 +16,16 @@
 							placeholder="e.g. Secondary allocation"
 						/>
 						<div class="mb-1 mt-4 flex justify-end gap-2.5">
-							<ButtonStyled>
-								<button @click="editAllocationModal?.hide()">Cancel</button>
-							</ButtonStyled>
-							<ButtonStyled color="brand">
-								<button
-									v-tooltip="advancedActionTooltip"
-									:disabled="!editAllocationName || creatingAllocation || !canUseAdvancedSettings"
-									type="submit"
-								>
-									<SaveIcon /> Update allocation
-								</button>
-							</ButtonStyled>
+							<Button @click="editAllocationModal?.hide()">Cancel</Button>
+							<Button
+								v-tooltip="advancedActionTooltip"
+								type="colored"
+								color="brand"
+								:disabled="!editAllocationName || creatingAllocation || !canUseAdvancedSettings"
+								native-type="submit"
+							>
+								<SaveIcon /> Update allocation
+							</Button>
 						</div>
 					</form>
 				</NewModal>
@@ -61,9 +59,14 @@
 								allocationsError?.message ?? 'Unknown error'
 							}}</span>
 						</p>
-						<ButtonStyled size="large" color="brand" @click="() => refetchAllocations()">
-							<button class="mt-6 !w-full">Retry</button>
-						</ButtonStyled>
+						<Button
+							type="colored"
+							color="brand"
+							size="xl"
+							class="mt-6 !w-full"
+							@click="() => refetchAllocations()"
+							>Retry</Button
+						>
 					</div>
 				</div>
 			</div>
@@ -83,16 +86,16 @@
 								placeholder="e.g. Secondary allocation"
 							/>
 
-							<ButtonStyled color="brand">
-								<button
-									v-tooltip="createAllocationTooltip"
-									:disabled="!createAllocationName || creatingAllocation || !canUseAdvancedSettings"
-									@click="addNewAllocation"
-								>
-									<PlusIcon />
-									<span>Create allocation</span>
-								</button>
-							</ButtonStyled>
+							<Button
+								v-tooltip="createAllocationTooltip"
+								type="colored"
+								color="brand"
+								:disabled="!createAllocationName || creatingAllocation || !canUseAdvancedSettings"
+								@click="addNewAllocation"
+							>
+								<PlusIcon />
+								<span>Create allocation</span>
+							</Button>
 						</div>
 
 						<Table :columns="allocationColumns" :data="allocationRows" row-key="port">
@@ -105,30 +108,33 @@
 							</template>
 							<template #cell-actions="{ row }">
 								<div class="flex items-center justify-end gap-2">
-									<ButtonStyled type="transparent" circular>
-										<button @click="copyText(`${serverIP}:${row.port}`)">
-											<CopyIcon />
-										</button>
-									</ButtonStyled>
+									<IconButton
+										type="quiet"
+										label="Copy"
+										@click="copyText(`${serverIP}:${row.port}`)"
+									>
+										<CopyIcon />
+									</IconButton>
 									<template v-if="!row.primary">
-										<ButtonStyled type="transparent" circular>
-											<button
-												v-tooltip="advancedActionTooltip"
-												:disabled="!canUseAdvancedSettings"
-												@click="showEditAllocationModal(row.port)"
-											>
-												<PencilIcon />
-											</button>
-										</ButtonStyled>
-										<ButtonStyled type="outlined" circular color="red">
-											<button
-												v-tooltip="advancedActionTooltip"
-												:disabled="!canUseAdvancedSettings"
-												@click="showConfirmDeleteModal(row.port)"
-											>
-												<TrashIcon />
-											</button>
-										</ButtonStyled>
+										<IconButton
+											v-tooltip="advancedActionTooltip"
+											type="quiet"
+											:label="advancedActionTooltip"
+											:disabled="!canUseAdvancedSettings"
+											@click="showEditAllocationModal(row.port)"
+										>
+											<PencilIcon />
+										</IconButton>
+										<IconButton
+											v-tooltip="advancedActionTooltip"
+											type="outlined"
+											:label="advancedActionTooltip"
+											:disabled="!canUseAdvancedSettings"
+											class="!text-red [&>svg]:!text-red !shadow-[inset_0_0_0_1px_var(--color-red)]"
+											@click="showConfirmDeleteModal(row.port)"
+										>
+											<TrashIcon />
+										</IconButton>
 									</template>
 								</div>
 							</template>
@@ -153,16 +159,14 @@
 								:placeholder="exampleDomain"
 							/>
 
-							<ButtonStyled>
-								<button
-									class="!w-full sm:!w-auto"
-									:disabled="userDomain == ''"
-									@click="exportDnsRecords"
-								>
-									<UploadIcon />
-									<span>Export</span>
-								</button>
-							</ButtonStyled>
+							<Button
+								class="!w-full sm:!w-auto"
+								:disabled="userDomain == ''"
+								@click="exportDnsRecords"
+							>
+								<UploadIcon />
+								<span>Export</span>
+							</Button>
 						</div>
 
 						<Table :columns="dnsColumns" :data="dnsRecords">
@@ -223,8 +227,9 @@ import {
 import { useQuery, useQueryClient } from '@tanstack/vue-query'
 import { computed, nextTick, ref } from 'vue'
 
-import { ButtonStyled, ConfirmModal, NewModal, StyledInput, Table, TagItem } from '#ui/components'
+import { ConfirmModal, NewModal, StyledInput, Table, TagItem } from '#ui/components'
 import type { TableColumn } from '#ui/components/base'
+import { Button, IconButton } from '#ui/components/base/buttons'
 import { useServerPermissions } from '#ui/composables/server-permissions'
 import {
 	injectModrinthClient,
diff --git a/packages/ui/src/layouts/shared/user-profile/layout.vue b/packages/ui/src/layouts/shared/user-profile/layout.vue
index 9c3b008a6b..608994520e 100644
--- a/packages/ui/src/layouts/shared/user-profile/layout.vue
+++ b/packages/ui/src/layouts/shared/user-profile/layout.vue
@@ -13,19 +13,26 @@
 
 			<template #actions>
 				<div class="flex justify-end gap-2">
-					<ButtonStyled type="outlined">
-						<button type="button" :disabled="isBlockingUser" @click="blockUserModal?.hide()">
-							<XIcon />
-							{{ formatMessage(commonMessages.cancelButton) }}
-						</button>
-					</ButtonStyled>
-					<ButtonStyled color="red">
-						<button type="button" :disabled="isBlockingUser" @click="confirmBlockUser">
-							<SpinnerIcon v-if="isBlockingUser" class="animate-spin" />
-							<BanIcon v-else />
-							{{ formatMessage(messages.blockButton) }}
-						</button>
-					</ButtonStyled>
+					<Button
+						type="outlined"
+						native-type="button"
+						:disabled="isBlockingUser"
+						@click="blockUserModal?.hide()"
+					>
+						<XIcon />
+						{{ formatMessage(commonMessages.cancelButton) }}
+					</Button>
+					<Button
+						type="colored"
+						color="red"
+						native-type="button"
+						:disabled="isBlockingUser"
+						@click="confirmBlockUser"
+					>
+						<SpinnerIcon v-if="isBlockingUser" class="animate-spin" />
+						<BanIcon v-else />
+						{{ formatMessage(messages.blockButton) }}
+					</Button>
 				</div>
 			</template>
 		</NewModal>
@@ -42,28 +49,26 @@
 					:placeholder="formatMessage(messages.selectRolePlaceholder)"
 				/>
 				<div class="flex justify-end gap-2">
-					<ButtonStyled>
-						<button type="button" @click="cancelRoleEdit">
-							<XIcon />
-							{{ formatMessage(commonMessages.cancelButton) }}
-						</button>
-					</ButtonStyled>
-					<ButtonStyled color="brand">
-						<button
-							type="button"
-							:disabled="!selectedRole || selectedRole === user.role || isSavingRole"
-							@click="saveRoleEdit"
-						>
-							<template v-if="isSavingRole">
-								<SpinnerIcon class="animate-spin" />
-								{{ formatMessage(messages.savingLabel) }}
-							</template>
-							<template v-else>
-								<SaveIcon />
-								{{ formatMessage(commonMessages.saveChangesButton) }}
-							</template>
-						</button>
-					</ButtonStyled>
+					<Button native-type="button" @click="cancelRoleEdit">
+						<XIcon />
+						{{ formatMessage(commonMessages.cancelButton) }}
+					</Button>
+					<Button
+						type="colored"
+						color="brand"
+						native-type="button"
+						:disabled="!selectedRole || selectedRole === user.role || isSavingRole"
+						@click="saveRoleEdit"
+					>
+						<template v-if="isSavingRole">
+							<SpinnerIcon class="animate-spin" />
+							{{ formatMessage(messages.savingLabel) }}
+						</template>
+						<template v-else>
+							<SaveIcon />
+							{{ formatMessage(commonMessages.saveChangesButton) }}
+						</template>
+					</Button>
 				</div>
 			</div>
 		</NewModal>
@@ -192,7 +197,7 @@
 			</div>
 		</NewModal>
 
-		<NormalPage :sidebar="sidebarPosition">
+		<NormalPage :sidebar="sidebarPosition" :full-width="variant === 'app'">
 			<template #header>
 				<UserPageHeader
 					:user="user"
@@ -284,7 +289,11 @@
 							}"
 							:layout="displayMode === 'list' ? 'list' : 'grid'"
 							:status="project.status"
-						/>
+						>
+							<template v-if="$slots['project-actions']" #actions>
+								<slot name="project-actions" :project="project" />
+							</template>
+						</ProjectCard>
 					</ProjectCardList>
 
 					<EmptyState
@@ -296,11 +305,9 @@
 						"
 					>
 						<template v-if="isSelf" #actions>
-							<ButtonStyled color="brand">
-								<button type="button" @click="createProject">
-									{{ formatMessage(messages.createProjectButton) }}
-								</button>
-							</ButtonStyled>
+							<Button type="colored" color="brand" native-type="button" @click="createProject">
+								{{ formatMessage(messages.createProjectButton) }}
+							</Button>
 						</template>
 					</EmptyState>
 
@@ -380,11 +387,9 @@
 						"
 					>
 						<template v-if="isSelf" #actions>
-							<ButtonStyled color="brand">
-								<button type="button" @click="createCollection">
-									{{ formatMessage(messages.createCollectionButton) }}
-								</button>
-							</ButtonStyled>
+							<Button type="colored" color="brand" native-type="button" @click="createCollection">
+								{{ formatMessage(messages.createCollectionButton) }}
+							</Button>
 						</template>
 					</EmptyState>
 				</div>
@@ -437,11 +442,9 @@
 			:description="formatMessage(messages.userLoadErrorDescription)"
 		>
 			<template #actions>
-				<ButtonStyled color="brand">
-					<button type="button" @click="retryQueries">
-						{{ formatMessage(commonMessages.retryButton) }}
-					</button>
-				</ButtonStyled>
+				<Button type="colored" color="brand" native-type="button" @click="retryQueries">
+					{{ formatMessage(commonMessages.retryButton) }}
+				</Button>
 			</template>
 		</EmptyState>
 	</div>
@@ -473,7 +476,7 @@ import { useRoute, useRouter } from 'vue-router'
 import Admonition from '#ui/components/base/Admonition.vue'
 import AutoLink from '#ui/components/base/AutoLink.vue'
 import Avatar from '#ui/components/base/Avatar.vue'
-import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
+import { Button } from '#ui/components/base/buttons'
 import Combobox from '#ui/components/base/Combobox.vue'
 import EmptyState from '#ui/components/base/EmptyState.vue'
 import IntlFormatted from '#ui/components/base/IntlFormatted.vue'
diff --git a/packages/ui/src/layouts/wrapped/AccountProfileSettings.vue b/packages/ui/src/layouts/wrapped/AccountProfileSettings.vue
index 1cd295cdcc..f38537a444 100644
--- a/packages/ui/src/layouts/wrapped/AccountProfileSettings.vue
+++ b/packages/ui/src/layouts/wrapped/AccountProfileSettings.vue
@@ -15,12 +15,10 @@
 			</div>
 		</template>
 		<template #actions>
-			<ButtonStyled color="brand" size="large">
-				<button type="button" @click="requestSignIn">
-					<LogInIcon aria-hidden="true" />
-					{{ formatMessage(commonMessages.signInButton) }}
-				</button>
-			</ButtonStyled>
+			<Button type="colored" color="brand" size="xl" native-type="button" @click="requestSignIn">
+				<LogInIcon aria-hidden="true" />
+				{{ formatMessage(commonMessages.signInButton) }}
+			</Button>
 		</template>
 	</EmptyState>
 
@@ -56,30 +54,33 @@
 				<div class="flex items-center gap-4">
 					<Avatar :src="displayedAvatarUrl" size="md" circle :alt="auth.user.value.username" />
 					<div class="flex flex-col gap-2">
-						<ButtonStyled>
-							<FileInput
-								:max-size="262144"
-								:show-icon="true"
-								class="button-like !shadow-none"
-								:prompt="formatMessage(commonMessages.uploadImageButton)"
-								accept="image/png,image/jpeg,image/gif,image/webp"
-								@change="showPreviewImage"
-							>
-								<UploadIcon aria-hidden="true" />
-							</FileInput>
-						</ButtonStyled>
-						<ButtonStyled v-if="avatarUrl && !pendingAvatarDeletion">
-							<button type="button" class="!shadow-none" @click="removePreviewImage">
-								<TrashIcon aria-hidden="true" />
-								{{ formatMessage(commonMessages.removeImageButton) }}
-							</button>
-						</ButtonStyled>
-						<ButtonStyled v-if="avatarFile || pendingAvatarDeletion">
-							<button type="button" class="!shadow-none" @click="resetAvatar">
-								<UndoIcon aria-hidden="true" />
-								{{ formatMessage(commonMessages.resetButton) }}
-							</button>
-						</ButtonStyled>
+						<FileButton
+							:max-size="262144"
+							:prompt="formatMessage(commonMessages.uploadImageButton)"
+							accept="image/png,image/jpeg,image/gif,image/webp"
+							size="md"
+							@change="showPreviewImage"
+						>
+							<UploadIcon aria-hidden="true" />
+						</FileButton>
+						<Button
+							v-if="avatarUrl && !pendingAvatarDeletion"
+							native-type="button"
+							size="md"
+							@click="removePreviewImage"
+						>
+							<TrashIcon aria-hidden="true" />
+							{{ formatMessage(commonMessages.removeImageButton) }}
+						</Button>
+						<Button
+							v-if="avatarFile || pendingAvatarDeletion"
+							native-type="button"
+							size="md"
+							@click="resetAvatar"
+						>
+							<UndoIcon aria-hidden="true" />
+							{{ formatMessage(commonMessages.resetButton) }}
+						</Button>
 					</div>
 				</div>
 			</div>
@@ -135,9 +136,8 @@ import { computed, onBeforeUnmount, ref, shallowRef, watch } from 'vue'
 import { RouterLink } from 'vue-router'
 
 import Avatar from '#ui/components/base/Avatar.vue'
-import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
+import { Button, FileButton } from '#ui/components/base/buttons'
 import EmptyState from '#ui/components/base/EmptyState.vue'
-import FileInput from '#ui/components/base/FileInput.vue'
 import IntlFormatted from '#ui/components/base/IntlFormatted.vue'
 import StyledInput from '#ui/components/base/StyledInput.vue'
 import { defineMessages, useVIntl } from '#ui/composables'
diff --git a/packages/ui/src/layouts/wrapped/AccountSocialSettings.vue b/packages/ui/src/layouts/wrapped/AccountSocialSettings.vue
index 6d2f4f5d8c..240744fa31 100644
--- a/packages/ui/src/layouts/wrapped/AccountSocialSettings.vue
+++ b/packages/ui/src/layouts/wrapped/AccountSocialSettings.vue
@@ -15,12 +15,10 @@
 			</div>
 		</template>
 		<template #actions>
-			<ButtonStyled color="brand" size="large">
-				<button type="button" @click="requestSignIn">
-					<LogInIcon aria-hidden="true" />
-					{{ formatMessage(commonMessages.signInButton) }}
-				</button>
-			</ButtonStyled>
+			<Button type="colored" color="brand" size="xl" native-type="button" @click="requestSignIn">
+				<LogInIcon aria-hidden="true" />
+				{{ formatMessage(commonMessages.signInButton) }}
+			</Button>
 		</template>
 	</EmptyState>
 
@@ -112,11 +110,9 @@
 								</div>
 								<div v-else-if="loadError" class="flex flex-col items-center gap-3">
 									<span>{{ formatMessage(messages.loadError) }}</span>
-									<ButtonStyled type="outlined">
-										<button type="button" @click="retry">
-											{{ formatMessage(commonMessages.retryButton) }}
-										</button>
-									</ButtonStyled>
+									<Button type="outlined" native-type="button" @click="retry">
+										{{ formatMessage(commonMessages.retryButton) }}
+									</Button>
 								</div>
 								<span v-else>{{ formatMessage(messages.noBlockedUsers) }}</span>
 							</div>
@@ -145,25 +141,24 @@
 
 						<template #cell-actions="{ row }">
 							<div class="flex justify-end">
-								<ButtonStyled type="outlined">
-									<button
-										type="button"
-										:disabled="unblockingUserId !== null"
-										:aria-label="
-											formatMessage(messages.unblockUserAriaLabel, {
-												username: row.username,
-											})
-										"
-										@click="unblock(row)"
-									>
-										<SpinnerIcon
-											v-if="unblockingUserId === row.id"
-											class="animate-spin"
-											aria-hidden="true"
-										/>
-										{{ formatMessage(messages.unblockButton) }}
-									</button>
-								</ButtonStyled>
+								<Button
+									type="outlined"
+									native-type="button"
+									:disabled="unblockingUserId !== null"
+									:aria-label="
+										formatMessage(messages.unblockUserAriaLabel, {
+											username: row.username,
+										})
+									"
+									@click="unblock(row)"
+								>
+									<SpinnerIcon
+										v-if="unblockingUserId === row.id"
+										class="animate-spin"
+										aria-hidden="true"
+									/>
+									{{ formatMessage(messages.unblockButton) }}
+								</Button>
 							</div>
 						</template>
 					</Table>
@@ -195,7 +190,7 @@ import { useQuery, useQueryClient } from '@tanstack/vue-query'
 import { computed, ref } from 'vue'
 
 import Avatar from '#ui/components/base/Avatar.vue'
-import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
+import { Button } from '#ui/components/base/buttons'
 import Chips from '#ui/components/base/Chips.vue'
 import EmptyState from '#ui/components/base/EmptyState.vue'
 import Table, { type TableColumn } from '#ui/components/base/Table.vue'
diff --git a/packages/ui/src/layouts/wrapped/hosting/manage/[id]/access/access.vue b/packages/ui/src/layouts/wrapped/hosting/manage/[id]/access/access.vue
index 96cc63944a..b85f8d8fe3 100644
--- a/packages/ui/src/layouts/wrapped/hosting/manage/[id]/access/access.vue
+++ b/packages/ui/src/layouts/wrapped/hosting/manage/[id]/access/access.vue
@@ -14,23 +14,25 @@
 					v-model="roleFilter"
 					:options="roleFilterOptions"
 					:display-value="selectedRoleFilterLabel"
-					trigger-class="min-w-[225px] !h-10 !min-h-10 !py-0"
+					trigger-size="lg"
+					trigger-class="min-w-[225px]"
 				>
 					<template #prefix>
 						<FilterIcon class="size-5 text-secondary" aria-hidden="true" />
 					</template>
 				</Combobox>
-				<ButtonStyled color="brand">
-					<button
-						v-tooltip="manageUsersActionTooltip"
-						class="!h-10 w-full md:w-fit"
-						:disabled="!canManageUsers"
-						@click="grantAccessModal?.show($event)"
-					>
-						<UserPlusIcon aria-hidden="true" />
-						{{ formatMessage(messages.inviteFriends) }}
-					</button>
-				</ButtonStyled>
+				<Button
+					v-tooltip="manageUsersActionTooltip"
+					type="colored"
+					color="brand"
+					size="lg"
+					class="w-full md:w-fit"
+					:disabled="!canManageUsers"
+					@click="grantAccessModal?.show($event)"
+				>
+					<UserPlusIcon aria-hidden="true" />
+					{{ formatMessage(messages.inviteFriends) }}
+				</Button>
 			</div>
 		</div>
 
@@ -113,7 +115,7 @@ import { FilterIcon, SearchIcon, UserPlusIcon } from '@modrinth/assets'
 import { useQuery, useQueryClient } from '@tanstack/vue-query'
 import { computed, ref, watch } from 'vue'
 
-import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
+import { Button } from '#ui/components/base/buttons'
 import Combobox, { type ComboboxOption } from '#ui/components/base/Combobox.vue'
 import DropdownFilterBar from '#ui/components/base/DropdownFilterBar.vue'
 import StyledInput from '#ui/components/base/StyledInput.vue'
diff --git a/packages/ui/src/layouts/wrapped/hosting/manage/[id]/onboarding.vue b/packages/ui/src/layouts/wrapped/hosting/manage/[id]/onboarding.vue
index bcdebf6392..f231ba7956 100644
--- a/packages/ui/src/layouts/wrapped/hosting/manage/[id]/onboarding.vue
+++ b/packages/ui/src/layouts/wrapped/hosting/manage/[id]/onboarding.vue
@@ -42,22 +42,22 @@
 		</div>
 
 		<div class="w-full">
-			<ButtonStyled v-if="uploading" size="large">
-				<button class="ml-auto" disabled>
-					<SpinnerIcon class="animate-spin" />
-					{{ formatMessage(messages.uploadingProgress, { percent: uploadPercent }) }}
-				</button>
-			</ButtonStyled>
-			<ButtonStyled v-else color="brand" size="large">
-				<button
-					v-tooltip="!canSetup ? permissionDeniedMessage : undefined"
-					class="ml-auto"
-					:disabled="!canSetup"
-					@click="openModal"
-				>
-					{{ formatMessage(messages.setupServerButton) }} <RightArrowIcon />
-				</button>
-			</ButtonStyled>
+			<Button v-if="uploading" size="xl" class="ml-auto" disabled>
+				<SpinnerIcon class="animate-spin" />
+				{{ formatMessage(messages.uploadingProgress, { percent: uploadPercent }) }}
+			</Button>
+			<Button
+				v-else
+				v-tooltip="!canSetup ? permissionDeniedMessage : undefined"
+				type="colored"
+				color="brand"
+				size="xl"
+				class="ml-auto"
+				:disabled="!canSetup"
+				@click="openModal"
+			>
+				{{ formatMessage(messages.setupServerButton) }} <RightArrowIcon />
+			</Button>
 		</div>
 
 		<CreationFlowModal
@@ -80,7 +80,6 @@
 import type { Archon } from '@modrinth/api-client'
 import { GlobeIcon, PackageIcon, RightArrowIcon, SpinnerIcon, UsersIcon } from '@modrinth/assets'
 import {
-	ButtonStyled,
 	defineMessages,
 	injectModrinthClient,
 	injectNotificationManager,
@@ -93,6 +92,7 @@ import { useRoute, useRouter } from 'vue-router'
 
 import type { CreationFlowContextValue } from '#ui/components'
 import { CreationFlowModal } from '#ui/components'
+import { Button } from '#ui/components/base/buttons'
 import { injectModrinthServerContext } from '#ui/providers'
 
 const client = injectModrinthClient()
diff --git a/packages/ui/src/layouts/wrapped/hosting/manage/backups.vue b/packages/ui/src/layouts/wrapped/hosting/manage/backups.vue
index b6e8da3f92..2e313a3877 100644
--- a/packages/ui/src/layouts/wrapped/hosting/manage/backups.vue
+++ b/packages/ui/src/layouts/wrapped/hosting/manage/backups.vue
@@ -19,9 +19,9 @@
 					<p>
 						<span class="break-all font-mono">{{ error.message }}</span>
 					</p>
-					<ButtonStyled size="large" color="brand" @click="refetch">
-						<button class="mt-6 !w-full">Retry</button>
-					</ButtonStyled>
+					<Button type="colored" color="brand" size="xl" class="mt-6 !w-full" @click="refetch"
+						>Retry</Button
+					>
 				</div>
 			</div>
 		</div>
@@ -71,16 +71,16 @@
 							<template #all>{{ formatMessage(commonMessages.allProjectType) }}</template>
 						</FilterPills>
 					</div>
-					<ButtonStyled color="brand">
-						<button
-							v-tooltip="backupCreationDisabled"
-							:disabled="!!backupCreationDisabled"
-							@click="showCreateModel"
-						>
-							<PlusIcon class="size-5" />
-							{{ formatMessage(messages.createBackup) }}
-						</button>
-					</ButtonStyled>
+					<Button
+						v-tooltip="backupCreationDisabled"
+						type="colored"
+						color="brand"
+						:disabled="!!backupCreationDisabled"
+						@click="showCreateModel"
+					>
+						<PlusIcon class="size-5" />
+						{{ formatMessage(messages.createBackup) }}
+					</Button>
 				</div>
 
 				<div class="flex w-full flex-col gap-1.5">
@@ -95,17 +95,17 @@
 							:description="formatMessage(messages.emptyDescription)"
 						>
 							<template #actions>
-								<ButtonStyled color="brand">
-									<button
-										v-tooltip="backupCreationDisabled"
-										:disabled="!!backupCreationDisabled"
-										class="mx-auto w-min"
-										@click="showCreateModel"
-									>
-										<PlusIcon class="size-5" />
-										{{ formatMessage(messages.createBackup) }}
-									</button>
-								</ButtonStyled>
+								<Button
+									v-tooltip="backupCreationDisabled"
+									type="colored"
+									color="brand"
+									:disabled="!!backupCreationDisabled"
+									class="mx-auto w-min"
+									@click="showCreateModel"
+								>
+									<PlusIcon class="size-5" />
+									{{ formatMessage(messages.createBackup) }}
+								</Button>
 							</template>
 						</EmptyState>
 						<EmptyState
@@ -115,11 +115,9 @@
 							:description="formatMessage(messages.filteredEmptyDescription)"
 						>
 							<template #actions>
-								<ButtonStyled type="outlined">
-									<button @click="clearBackupFilters">
-										{{ formatMessage(messages.clearFilters) }}
-									</button>
-								</ButtonStyled>
+								<Button type="outlined" @click="clearBackupFilters">
+									{{ formatMessage(messages.clearFilters) }}
+								</Button>
 							</template>
 						</EmptyState>
 					</div>
@@ -198,30 +196,30 @@
 							}}
 						</span>
 						<div class="mx-1 h-6 w-px bg-surface-5" />
-						<ButtonStyled type="transparent">
-							<button
-								type="button"
-								:disabled="isBulkOperating"
-								:class="{ 'pointer-events-none opacity-60': isBulkOperating }"
-								@click="deselectAll"
-							>
-								{{ formatMessage(commonMessages.clearButton) }}
-							</button>
-						</ButtonStyled>
+						<Button
+							type="quiet"
+							native-type="button"
+							:disabled="isBulkOperating"
+							:class="{ 'pointer-events-none opacity-60': isBulkOperating }"
+							@click="deselectAll"
+						>
+							{{ formatMessage(commonMessages.clearButton) }}
+						</Button>
 					</div>
 
 					<div v-if="!isBulkOperating" class="ml-auto flex items-center gap-0.5">
-						<ButtonStyled type="transparent" color="red" hover-color-fill="background">
-							<button
-								v-tooltip="!canManageBackups ? permissionDeniedMessage : undefined"
-								type="button"
-								:disabled="!canManageBackups"
-								@click="confirmBulkDelete"
-							>
-								<TrashIcon />
-								<span class="bar-label">{{ formatMessage(commonMessages.deleteLabel) }}</span>
-							</button>
-						</ButtonStyled>
+						<Button
+							v-tooltip="!canManageBackups ? permissionDeniedMessage : undefined"
+							type="quiet"
+							color="red"
+							native-type="button"
+							:disabled="!canManageBackups"
+							class="hover:!bg-red focus-visible:!bg-red hover:!text-[var(--color-accent-contrast)] focus-visible:!text-[var(--color-accent-contrast)]"
+							@click="confirmBulkDelete"
+						>
+							<TrashIcon />
+							<span class="bar-label">{{ formatMessage(commonMessages.deleteLabel) }}</span>
+						</Button>
 					</div>
 
 					<div v-else class="ml-auto flex items-center" aria-live="polite">
@@ -273,7 +271,7 @@ import type { Component } from 'vue'
 import { computed, nextTick, onBeforeUnmount, ref, watch } from 'vue'
 import { useRoute } from 'vue-router'
 
-import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
+import { Button } from '#ui/components/base/buttons'
 import Checkbox from '#ui/components/base/Checkbox.vue'
 import EmptyState from '#ui/components/base/EmptyState.vue'
 import FilterPills, { type FilterPillOption } from '#ui/components/base/FilterPills.vue'
diff --git a/packages/ui/src/layouts/wrapped/hosting/manage/index.vue b/packages/ui/src/layouts/wrapped/hosting/manage/index.vue
index d22ac2dac4..f85d23337c 100644
--- a/packages/ui/src/layouts/wrapped/hosting/manage/index.vue
+++ b/packages/ui/src/layouts/wrapped/hosting/manage/index.vue
@@ -75,14 +75,17 @@
 						</li>
 					</ul>
 				</div>
-				<ButtonStyled size="large" type="standard" color="brand">
-					<AutoLink class="mt-6 !w-full" to="https://support.modrinth.com">{{
-						formatMessage(messages.contactSupportButton)
-					}}</AutoLink>
-				</ButtonStyled>
-				<ButtonStyled size="large" @click="() => router.go(0)">
-					<button class="mt-3 !w-full">{{ formatMessage(messages.reloadButton) }}</button>
-				</ButtonStyled>
+				<ButtonLink
+					type="colored"
+					color="brand"
+					size="xl"
+					class="mt-6 !w-full"
+					to="https://support.modrinth.com"
+					>{{ formatMessage(messages.contactSupportButton) }}</ButtonLink
+				>
+				<Button size="xl" class="mt-3 !w-full" @click="() => router.go(0)">{{
+					formatMessage(messages.reloadButton)
+				}}</Button>
 			</div>
 		</div>
 
@@ -106,12 +109,10 @@
 						:placeholder="formatMessage(messages.searchPlaceholder, { count: filteredData.length })"
 						wrapper-class="w-full md:w-72"
 					/>
-					<ButtonStyled type="standard" color="brand">
-						<button @click="openPurchaseModal">
-							<PlusIcon />
-							{{ formatMessage(messages.newServerButton) }}
-						</button>
-					</ButtonStyled>
+					<Button type="colored" color="brand" @click="openPurchaseModal">
+						<PlusIcon />
+						{{ formatMessage(messages.newServerButton) }}
+					</Button>
 				</div>
 			</div>
 
@@ -231,8 +232,6 @@
 import type { Archon, Labrinth } from '@modrinth/api-client'
 import { HammerIcon, LoaderCircleIcon, PlusIcon, SearchIcon } from '@modrinth/assets'
 import {
-	AutoLink,
-	ButtonStyled,
 	CopyCode,
 	defineMessages,
 	injectAuth,
@@ -255,6 +254,7 @@ import type Stripe from 'stripe'
 import { type ComponentPublicInstance, computed, ref, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 
+import { Button, ButtonLink } from '#ui/components/base/buttons'
 import ServersUpgradeModalWrapper from '#ui/components/billing/ServersUpgradeModalWrapper.vue'
 import type { ServerListingOwner } from '#ui/components/servers/access'
 import MedalServerListing from '#ui/components/servers/marketing/MedalServerListing.vue'
diff --git a/packages/ui/src/layouts/wrapped/hosting/manage/root.vue b/packages/ui/src/layouts/wrapped/hosting/manage/root.vue
index c781570242..dbf56d1b69 100644
--- a/packages/ui/src/layouts/wrapped/hosting/manage/root.vue
+++ b/packages/ui/src/layouts/wrapped/hosting/manage/root.vue
@@ -181,31 +181,30 @@
 								:auto-hide="false"
 								placement="bottom-end"
 							>
-								<ButtonStyled circular size="large">
-									<button
-										v-tooltip="showSettingsHint ? undefined : 'Server settings'"
-										type="button"
-										aria-label="Server settings"
-										@click="handleOpenServerSettings"
-									>
-										<SettingsIcon />
-									</button>
-								</ButtonStyled>
+								<IconButton
+									v-tooltip="showSettingsHint ? undefined : 'Server settings'"
+									size="xl"
+									label="Server settings"
+									native-type="button"
+									@click="handleOpenServerSettings"
+								>
+									<SettingsIcon />
+								</IconButton>
 								<template #popper>
 									<div class="grid grid-cols-[min-content] gap-1">
 										<div class="flex min-w-48 items-center justify-between gap-8">
 											<h3 class="m-0 whitespace-nowrap text-base font-bold text-contrast">
 												{{ formatMessage(settingsHintMessages.title) }}
 											</h3>
-											<ButtonStyled size="small" circular>
-												<button
-													type="button"
-													:aria-label="formatMessage(settingsHintMessages.dismiss)"
-													@click="dismissSettingsHint"
-												>
-													<XIcon aria-hidden="true" />
-												</button>
-											</ButtonStyled>
+											<IconButton
+												class="!size-6"
+												size="xs"
+												:label="formatMessage(settingsHintMessages.dismiss)"
+												native-type="button"
+												@click="dismissSettingsHint"
+											>
+												<XIcon aria-hidden="true" />
+											</IconButton>
 										</div>
 										<p class="m-0 text-wrap text-sm font-medium leading-tight text-secondary">
 											{{ formatMessage(settingsHintMessages.description) }}
@@ -213,15 +212,15 @@
 									</div>
 								</template>
 							</Tooltip>
-							<ButtonStyled circular type="transparent" size="large">
-								<TeleportOverflowMenu
-									:options="serverMenuOptions"
-									:disabled="!!installError"
-									aria-label="More server options"
-								>
-									<MoreVerticalIcon aria-hidden="true" />
-								</TeleportOverflowMenu>
-							</ButtonStyled>
+							<TeleportOverflowMenu
+								type="quiet"
+								size="xl"
+								label="More server options"
+								:options="serverMenuOptions"
+								:disabled="!!installError"
+							>
+								<MoreVerticalIcon aria-hidden="true" />
+							</TeleportOverflowMenu>
 						</PageHeaderActions>
 					</template>
 				</PageHeader>
@@ -284,13 +283,11 @@
 												If you're stuck, please contact Modrinth Support with the information below:
 											</li>
 										</ul>
-										<ButtonStyled>
-											<button class="mt-2" @click="copyServerDebugInfo">
-												<CopyIcon v-if="!copied" />
-												<CheckIcon v-else />
-												Copy Debug Info
-											</button>
-										</ButtonStyled>
+										<Button class="mt-2" @click="copyServerDebugInfo">
+											<CopyIcon v-if="!copied" />
+											<CheckIcon v-else />
+											Copy Debug Info
+										</Button>
 									</div>
 									<div v-if="errorMessage.toLocaleLowerCase() === 'internal error'">
 										An internal error occurred while installing your server. Don't fret — try
@@ -310,25 +307,23 @@
 										v-if="errorTitle === 'Installation error'"
 										class="mt-2 flex flex-col gap-4 sm:flex-row"
 									>
-										<ButtonStyled v-if="errorLog">
-											<button @click="openInstallLog"><FileIcon />Open Installation Log</button>
-										</ButtonStyled>
-										<ButtonStyled>
-											<button @click="copyServerDebugInfo">
-												<CopyIcon v-if="!copied" />
-												<CheckIcon v-else />
-												Copy Debug Info
-											</button>
-										</ButtonStyled>
-										<ButtonStyled color="red" type="standard">
-											<button
-												class="whitespace-pre"
-												@click="openServerSettingsModal('installation')"
-											>
-												<RightArrowIcon />
-												Change Loader
-											</button>
-										</ButtonStyled>
+										<Button v-if="errorLog" @click="openInstallLog"
+											><FileIcon />Open Installation Log</Button
+										>
+										<Button @click="copyServerDebugInfo">
+											<CopyIcon v-if="!copied" />
+											<CheckIcon v-else />
+											Copy Debug Info
+										</Button>
+										<Button
+											type="colored"
+											color="red"
+											class="whitespace-pre"
+											@click="openServerSettingsModal('installation')"
+										>
+											<RightArrowIcon />
+											Change Loader
+										</Button>
 									</div>
 								</div>
 							</div>
@@ -430,7 +425,7 @@ import { computed, nextTick, onBeforeUnmount, onMounted, onUnmounted, ref, watch
 import { onBeforeRouteLeave, useRoute, useRouter } from 'vue-router'
 
 import Avatar from '#ui/components/base/Avatar.vue'
-import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
+import { Button, IconButton, TeleportOverflowMenu } from '#ui/components/base/buttons'
 import ErrorInformationCard from '#ui/components/base/ErrorInformationCard.vue'
 import NavTabs from '#ui/components/base/NavTabs.vue'
 import PageHeader from '#ui/components/base/page-header/index.vue'
@@ -438,7 +433,6 @@ import PageHeaderMetadata from '#ui/components/base/page-header/metadata/index.v
 import PageHeaderMetadataItem from '#ui/components/base/page-header/metadata/page-header-metadata-item.vue'
 import PageHeaderActions from '#ui/components/base/page-header/page-header-actions.vue'
 import ServerNotice from '#ui/components/base/ServerNotice.vue'
-import TeleportOverflowMenu from '#ui/components/base/TeleportOverflowMenu.vue'
 import ConfirmLeaveModal from '#ui/components/modal/ConfirmLeaveModal.vue'
 import ServerPanelAdmonitions from '#ui/components/servers/admonitions/ServerPanelAdmonitions.vue'
 import LoaderIcon from '#ui/components/servers/icons/LoaderIcon.vue'
diff --git a/packages/ui/src/stories/add-stories.md b/packages/ui/src/stories/add-stories.md
index 19f83c3ba9..2132d4f14c 100644
--- a/packages/ui/src/stories/add-stories.md
+++ b/packages/ui/src/stories/add-stories.md
@@ -153,16 +153,14 @@ For components that need user interaction to show:
 ```typescript
 export const Default: Story = {
 	render: () => ({
-		components: { NewModal, ButtonStyled },
+		components: { Button, NewModal },
 		setup() {
 			const modalRef = ref<InstanceType<typeof NewModal> | null>(null)
 			return { modalRef }
 		},
 		template: /* html */ `
             <div>
-                <ButtonStyled @click="modalRef?.show()">
-                    <button>Open Modal</button>
-                </ButtonStyled>
+				<Button @click="modalRef?.show()">Open Modal</Button>
                 <NewModal ref="modalRef" header="Example Modal">
                     <p>Modal content</p>
                 </NewModal>
@@ -199,10 +197,10 @@ Components should use relative imports, not the package alias:
 
 ```typescript
 // ❌ BAD - Causes circular dependency in Storybook
-import { ButtonStyled } from '@modrinth/ui'
+import { Button } from '@modrinth/ui'
 
 // ✅ GOOD - Use relative imports
-import ButtonStyled from '../base/ButtonStyled.vue'
+import Button from '../components/base/buttons/Button.vue'
 ```
 
 ### 2. Object/Array Prop Defaults Must Be Factory Functions
diff --git a/packages/ui/src/stories/base/Admonition.stories.ts b/packages/ui/src/stories/base/Admonition.stories.ts
index 413e2a1b6d..bcd6894084 100644
--- a/packages/ui/src/stories/base/Admonition.stories.ts
+++ b/packages/ui/src/stories/base/Admonition.stories.ts
@@ -2,7 +2,7 @@ import type { Meta, StoryObj } from '@storybook/vue3-vite'
 import { ref } from 'vue'
 
 import Admonition from '../../components/base/Admonition.vue'
-import ButtonStyled from '../../components/base/ButtonStyled.vue'
+import { Button } from '../../components/base/buttons'
 
 const meta = {
 	title: 'Base/Admonition',
@@ -78,7 +78,7 @@ export const HeaderWithTimestamp: Story = {
 
 export const WithTopRightActions: Story = {
 	render: () => ({
-		components: { Admonition, ButtonStyled },
+		components: { Admonition, Button },
 		template: /*html*/ `
 			<div style="display: flex; flex-direction: column; gap: 1rem;">
 				<Admonition
@@ -88,9 +88,7 @@ export const WithTopRightActions: Story = {
 				>
 					Uploading server files...
 					<template #top-right-actions>
-						<ButtonStyled type="outlined" color="blue">
-							<button class="!border" type="button">Cancel</button>
-						</ButtonStyled>
+						<Button type="outlined" class="!border !text-blue [&>svg]:!text-blue !shadow-[inset_0_0_0_1px_var(--color-blue)]" native-type="button">Cancel</Button>
 					</template>
 				</Admonition>
 				<Admonition
@@ -100,9 +98,7 @@ export const WithTopRightActions: Story = {
 				>
 					Something went wrong while extracting the archive.
 					<template #top-right-actions>
-						<ButtonStyled color="red">
-							<button type="button">Retry</button>
-						</ButtonStyled>
+						<Button type="colored" color="red" native-type="button">Retry</Button>
 					</template>
 				</Admonition>
 				<Admonition type="success" header="Extraction complete" :dismissible="true">
@@ -115,7 +111,7 @@ export const WithTopRightActions: Story = {
 
 export const WithProgressBar: Story = {
 	render: () => ({
-		components: { Admonition, ButtonStyled },
+		components: { Admonition, Button },
 		template: /*html*/ `
 			<div style="display: flex; flex-direction: column; gap: 1rem;">
 				<Admonition
@@ -127,9 +123,7 @@ export const WithProgressBar: Story = {
 				>
 					128 KB / 1.2 MB (45%)
 					<template #top-right-actions>
-						<ButtonStyled type="outlined" color="blue">
-							<button class="!border" type="button">Cancel</button>
-						</ButtonStyled>
+						<Button type="outlined" class="!border !text-blue [&>svg]:!text-blue !shadow-[inset_0_0_0_1px_var(--color-blue)]" native-type="button">Cancel</Button>
 					</template>
 				</Admonition>
 				<Admonition
@@ -141,9 +135,7 @@ export const WithProgressBar: Story = {
 				>
 					24 MB extracted — config/settings.yml
 					<template #top-right-actions>
-						<ButtonStyled type="outlined" color="blue">
-							<button class="!border" type="button">Cancel</button>
-						</ButtonStyled>
+						<Button type="outlined" class="!border !text-blue [&>svg]:!text-blue !shadow-[inset_0_0_0_1px_var(--color-blue)]" native-type="button">Cancel</Button>
 					</template>
 				</Admonition>
 				<Admonition
diff --git a/packages/ui/src/stories/base/Button.stories.ts b/packages/ui/src/stories/base/Button.stories.ts
deleted file mode 100644
index 8c58271e03..0000000000
--- a/packages/ui/src/stories/base/Button.stories.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/vue3-vite'
-
-import Button from '../../components/base/Button.vue'
-
-const meta = {
-	title: 'Base/Button',
-	component: Button,
-	render: (args) => ({
-		components: { Button },
-		setup() {
-			return { args }
-		},
-		template: /*html*/ `
-			<Button v-bind="args">Click me</Button>
-		`,
-	}),
-} satisfies Meta<typeof Button>
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-export const Default: Story = {}
-
-export const Primary: Story = {
-	args: {
-		color: 'primary',
-	},
-}
-
-export const Danger: Story = {
-	args: {
-		color: 'danger',
-	},
-}
-
-export const AllColors: Story = {
-	render: () => ({
-		components: { Button },
-		template: /*html*/ `
-			<div style="display: flex; flex-wrap: wrap; gap: 1rem;">
-				<Button color="default">Default</Button>
-				<Button color="primary">Primary</Button>
-				<Button color="danger">Danger</Button>
-				<Button color="red">Red</Button>
-				<Button color="orange">Orange</Button>
-				<Button color="green">Green</Button>
-				<Button color="blue">Blue</Button>
-				<Button color="purple">Purple</Button>
-			</div>
-		`,
-	}),
-}
-
-export const Large: Story = {
-	args: {
-		large: true,
-	},
-}
-
-export const Outline: Story = {
-	args: {
-		outline: true,
-	},
-}
-
-export const Transparent: Story = {
-	args: {
-		transparent: true,
-	},
-}
-
-export const Disabled: Story = {
-	args: {
-		disabled: true,
-	},
-}
-
-export const AsLink: Story = {
-	args: {
-		link: 'https://modrinth.com',
-		external: true,
-	},
-}
diff --git a/packages/ui/src/stories/base/ButtonStyled.stories.ts b/packages/ui/src/stories/base/ButtonStyled.stories.ts
deleted file mode 100644
index 852ceab118..0000000000
--- a/packages/ui/src/stories/base/ButtonStyled.stories.ts
+++ /dev/null
@@ -1,226 +0,0 @@
-import { DownloadIcon, HeartIcon, SettingsIcon } from '@modrinth/assets'
-import type { Meta, StoryObj } from '@storybook/vue3-vite'
-
-import ButtonStyled from '../../components/base/ButtonStyled.vue'
-
-const colors = ['standard', 'brand', 'red', 'orange', 'green', 'blue', 'purple'] as const
-const types = [
-	'standard',
-	'outlined',
-	'transparent',
-	'highlight',
-	'highlight-colored-text',
-	'chip',
-] as const
-const sizes = ['small', 'standard', 'large'] as const
-
-const meta = {
-	title: 'Base/ButtonStyled',
-	component: ButtonStyled,
-	argTypes: {
-		color: {
-			control: 'select',
-			options: [...colors, 'medal-promo'],
-		},
-		size: {
-			control: 'select',
-			options: [...sizes],
-		},
-		type: {
-			control: 'select',
-			options: [...types],
-		},
-		circular: { control: 'boolean' },
-		colorFill: {
-			control: 'select',
-			options: ['auto', 'background', 'text', 'none'],
-		},
-		hoverColorFill: {
-			control: 'select',
-			options: ['auto', 'background', 'text', 'none'],
-		},
-		highlighted: { control: 'boolean' },
-		highlightedStyle: {
-			control: 'select',
-			options: ['main-nav-primary', 'main-nav-secondary'],
-		},
-	},
-	args: {
-		color: 'standard',
-		size: 'standard',
-		type: 'standard',
-		circular: false,
-		colorFill: 'auto',
-		hoverColorFill: 'auto',
-		highlighted: false,
-		highlightedStyle: 'main-nav-primary',
-	},
-	render: (args) => ({
-		components: { ButtonStyled, DownloadIcon },
-		setup() {
-			return { args }
-		},
-		template: /*html*/ `
-			<ButtonStyled v-bind="args">
-				<button><DownloadIcon /> Button</button>
-			</ButtonStyled>
-		`,
-	}),
-} satisfies Meta<typeof ButtonStyled>
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-export const Default: Story = {
-	args: {
-		type: 'standard',
-	},
-}
-
-export const AllVariants: Story = {
-	render: () => ({
-		components: { ButtonStyled },
-		setup() {
-			return { colors, types }
-		},
-		template: /*html*/ `
-			<div style="overflow-x: auto;">
-				<table style="border-collapse: collapse; width: 100%;">
-					<thead>
-						<tr>
-							<th style="padding: 0.5rem 1rem; text-align: left; font-size: 0.75rem; text-transform: uppercase; color: var(--color-secondary);">Color / Type</th>
-							<th v-for="type in types" :key="type" style="padding: 0.5rem 1rem; text-align: center; font-size: 0.75rem; text-transform: uppercase; color: var(--color-secondary);">{{ type }}</th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr v-for="color in colors" :key="color" style="border-top: 1px solid var(--color-surface-5);">
-							<td style="padding: 0.5rem 1rem; font-weight: 600; font-size: 0.875rem;">{{ color }}</td>
-							<td v-for="type in types" :key="type" style="padding: 0.5rem 1rem; text-align: center;">
-								<ButtonStyled :color="color" :type="type">
-									<button>Button</button>
-								</ButtonStyled>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-		`,
-	}),
-}
-
-export const AllVariantsHighlighted: Story = {
-	render: () => ({
-		components: { ButtonStyled },
-		setup() {
-			return { colors, types }
-		},
-		template: /*html*/ `
-			<div style="overflow-x: auto;">
-				<table style="border-collapse: collapse; width: 100%;">
-					<thead>
-						<tr>
-							<th style="padding: 0.5rem 1rem; text-align: left; font-size: 0.75rem; text-transform: uppercase; color: var(--color-secondary);">Color / Type</th>
-							<th v-for="type in types" :key="type" style="padding: 0.5rem 1rem; text-align: center; font-size: 0.75rem; text-transform: uppercase; color: var(--color-secondary);">{{ type }}</th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr v-for="color in colors" :key="color" style="border-top: 1px solid var(--color-surface-5);">
-							<td style="padding: 0.5rem 1rem; font-weight: 600; font-size: 0.875rem;">{{ color }}</td>
-							<td v-for="type in types" :key="type" style="padding: 0.5rem 1rem; text-align: center;">
-								<ButtonStyled :color="color" :type="type" highlighted>
-									<button>Button</button>
-								</ButtonStyled>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-		`,
-	}),
-}
-
-export const Sizes: Story = {
-	render: () => ({
-		components: { ButtonStyled },
-		setup() {
-			return { sizes, types }
-		},
-		template: /*html*/ `
-			<div style="overflow-x: auto;">
-				<table style="border-collapse: collapse; width: 100%;">
-					<thead>
-						<tr>
-							<th style="padding: 0.5rem 1rem; text-align: left; font-size: 0.75rem; text-transform: uppercase; color: var(--color-secondary);">Size / Type</th>
-							<th v-for="type in types" :key="type" style="padding: 0.5rem 1rem; text-align: center; font-size: 0.75rem; text-transform: uppercase; color: var(--color-secondary);">{{ type }}</th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr v-for="size in sizes" :key="size" style="border-top: 1px solid var(--color-surface-5);">
-							<td style="padding: 0.5rem 1rem; font-weight: 600; font-size: 0.875rem;">{{ size }}</td>
-							<td v-for="type in types" :key="type" style="padding: 0.5rem 1rem; text-align: center;">
-								<ButtonStyled :size="size" :type="type" color="brand">
-									<button>Button</button>
-								</ButtonStyled>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-		`,
-	}),
-}
-
-export const WithIcons: Story = {
-	render: () => ({
-		components: { ButtonStyled, DownloadIcon, HeartIcon, SettingsIcon },
-		setup() {
-			return { types }
-		},
-		template: /*html*/ `
-			<div style="overflow-x: auto;">
-				<table style="border-collapse: collapse; width: 100%;">
-					<thead>
-						<tr>
-							<th style="padding: 0.5rem 1rem; text-align: left; font-size: 0.75rem; text-transform: uppercase; color: var(--color-secondary);">Variant</th>
-							<th v-for="type in types" :key="type" style="padding: 0.5rem 1rem; text-align: center; font-size: 0.75rem; text-transform: uppercase; color: var(--color-secondary);">{{ type }}</th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr style="border-top: 1px solid var(--color-surface-5);">
-							<td style="padding: 0.5rem 1rem; font-weight: 600; font-size: 0.875rem;">Icon + text</td>
-							<td v-for="type in types" :key="type" style="padding: 0.5rem 1rem; text-align: center;">
-								<ButtonStyled :type="type" color="brand">
-									<button><DownloadIcon /> Download</button>
-								</ButtonStyled>
-							</td>
-						</tr>
-						<tr style="border-top: 1px solid var(--color-surface-5);">
-							<td style="padding: 0.5rem 1rem; font-weight: 600; font-size: 0.875rem;">Icon only</td>
-							<td v-for="type in types" :key="type" style="padding: 0.5rem 1rem; text-align: center;">
-								<ButtonStyled :type="type" color="brand" circular>
-									<button><HeartIcon /></button>
-								</ButtonStyled>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-		`,
-	}),
-}
-
-export const Disabled: Story = {
-	render: () => ({
-		components: { ButtonStyled },
-		setup() {
-			return { types }
-		},
-		template: /*html*/ `
-			<div style="display: flex; flex-wrap: wrap; gap: 1rem; align-items: center;">
-				<ButtonStyled v-for="type in types" :key="type" :type="type" color="brand">
-					<button disabled>{{ type }}</button>
-				</ButtonStyled>
-			</div>
-		`,
-	}),
-}
diff --git a/packages/ui/src/stories/base/EmptyState.stories.ts b/packages/ui/src/stories/base/EmptyState.stories.ts
index f698148b9b..8fa5be7f23 100644
--- a/packages/ui/src/stories/base/EmptyState.stories.ts
+++ b/packages/ui/src/stories/base/EmptyState.stories.ts
@@ -1,6 +1,6 @@
 import type { Meta, StoryObj } from '@storybook/vue3-vite'
 
-import ButtonStyled from '../../components/base/ButtonStyled.vue'
+import { Button } from '../../components/base/buttons'
 import EmptyState from '../../components/base/EmptyState.vue'
 
 const meta = {
@@ -42,7 +42,7 @@ export const Default: Story = {
 
 export const WithActions: StoryObj = {
 	render: () => ({
-		components: { EmptyState, ButtonStyled },
+		components: { EmptyState, Button },
 		template: /*html*/ `
 			<EmptyState
 				type="empty-inbox"
@@ -50,9 +50,7 @@ export const WithActions: StoryObj = {
 				description="Create your first backup"
 			>
 				<template #actions>
-					<ButtonStyled color="brand">
-						<button>Create backup</button>
-					</ButtonStyled>
+					<Button type="colored" color="brand">Create backup</Button>
 				</template>
 			</EmptyState>
 		`,
diff --git a/packages/ui/src/stories/base/JoinedButtons.stories.ts b/packages/ui/src/stories/base/JoinedButtons.stories.ts
deleted file mode 100644
index c007e3631d..0000000000
--- a/packages/ui/src/stories/base/JoinedButtons.stories.ts
+++ /dev/null
@@ -1,122 +0,0 @@
-import { PlayIcon, SlashIcon, StopCircleIcon, UpdatedIcon } from '@modrinth/assets'
-import type { Meta, StoryObj } from '@storybook/vue3-vite'
-
-import JoinedButtons from '../../components/base/JoinedButtons.vue'
-
-const meta = {
-	title: 'Base/JoinedButtons',
-	component: JoinedButtons,
-	argTypes: {
-		color: {
-			control: 'select',
-			options: ['standard', 'brand', 'red', 'orange', 'green', 'blue', 'purple'],
-		},
-		size: {
-			control: 'select',
-			options: ['small', 'standard', 'large'],
-		},
-		disabled: { control: 'boolean' },
-		primaryDisabled: { control: 'boolean' },
-		dropdownDisabled: { control: 'boolean' },
-		primaryMuted: { control: 'boolean' },
-	},
-} satisfies Meta<typeof JoinedButtons>
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-export const Start: Story = {
-	args: {
-		color: 'brand',
-		size: 'large',
-		actions: [
-			{
-				id: 'start',
-				label: 'Start',
-				icon: PlayIcon,
-				action: () => console.log('Start'),
-			},
-		],
-	},
-}
-
-export const StopWithKill: Story = {
-	args: {
-		color: 'red',
-		size: 'large',
-		actions: [
-			{
-				id: 'stop',
-				label: 'Stop',
-				icon: StopCircleIcon,
-				action: () => console.log('Stop'),
-			},
-			{
-				id: 'kill_server',
-				label: 'Kill server',
-				icon: SlashIcon,
-				action: () => console.log('Kill'),
-			},
-		],
-	},
-}
-
-export const Stopping: Story = {
-	args: {
-		color: 'red',
-		size: 'large',
-		primaryDisabled: true,
-		primaryMuted: true,
-		actions: [
-			{
-				id: 'stop',
-				label: 'Stopping',
-				icon: StopCircleIcon,
-				action: () => console.log('Stop'),
-			},
-			{
-				id: 'kill_server',
-				label: 'Kill server',
-				icon: SlashIcon,
-				action: () => console.log('Kill'),
-			},
-		],
-	},
-}
-
-export const Restart: Story = {
-	args: {
-		color: 'orange',
-		size: 'large',
-		actions: [
-			{
-				id: 'restart',
-				label: 'Restart',
-				icon: UpdatedIcon,
-				action: () => console.log('Restart'),
-			},
-		],
-	},
-}
-
-export const Disabled: Story = {
-	args: {
-		color: 'red',
-		size: 'large',
-		disabled: true,
-		actions: [
-			{
-				id: 'stop',
-				label: 'Stop',
-				icon: StopCircleIcon,
-				action: () => console.log('Stop'),
-			},
-			{
-				id: 'kill_server',
-				label: 'Kill server',
-				icon: SlashIcon,
-				action: () => console.log('Kill'),
-			},
-		],
-	},
-}
diff --git a/packages/ui/src/stories/base/OverflowMenu.stories.ts b/packages/ui/src/stories/base/OverflowMenu.stories.ts
deleted file mode 100644
index 0adec75cf2..0000000000
--- a/packages/ui/src/stories/base/OverflowMenu.stories.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-import { MoreHorizontalIcon } from '@modrinth/assets'
-import type { Meta, StoryObj } from '@storybook/vue3-vite'
-
-import ButtonStyled from '../../components/base/ButtonStyled.vue'
-import OverflowMenu from '../../components/base/OverflowMenu.vue'
-
-const meta = {
-	title: 'Base/OverflowMenu',
-	component: OverflowMenu,
-	render: (args) => ({
-		components: { OverflowMenu, MoreHorizontalIcon, ButtonStyled },
-		setup() {
-			return { args }
-		},
-		template: /*html*/ `
-			<ButtonStyled circular type="transparent">
-				<OverflowMenu v-bind="args">
-					<MoreHorizontalIcon class="h-5 w-5" />
-					<template #edit>Edit</template>
-					<template #delete>Delete</template>
-					<template #share>Share</template>
-				</OverflowMenu>
-			</ButtonStyled>
-		`,
-	}),
-} satisfies Meta<typeof OverflowMenu>
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-export const Default: Story = {
-	args: {
-		options: [
-			{ id: 'edit', action: () => console.log('Edit clicked') },
-			{ id: 'share', action: () => console.log('Share clicked') },
-			{ divider: true },
-			{ id: 'delete', action: () => console.log('Delete clicked'), color: 'danger' },
-		],
-	},
-}
-
-export const WithDifferentPlacements: StoryObj = {
-	render: () => ({
-		components: { OverflowMenu, MoreHorizontalIcon, ButtonStyled },
-		template: /*html*/ `
-			<div class="flex gap-8 items-start">
-				<div class="flex flex-col items-center gap-2">
-					<span class="text-sm text-secondary">bottom-end (default)</span>
-					<ButtonStyled circular type="transparent">
-						<OverflowMenu
-							:options="[
-								{ id: 'edit', action: () => {} },
-								{ id: 'delete', action: () => {}, color: 'danger' },
-							]"
-						>
-							<MoreHorizontalIcon class="h-5 w-5" />
-							<template #edit>Edit</template>
-							<template #delete>Delete</template>
-						</OverflowMenu>
-					</ButtonStyled>
-				</div>
-				<div class="flex flex-col items-center gap-2">
-					<span class="text-sm text-secondary">bottom-start</span>
-					<ButtonStyled circular type="transparent">
-						<OverflowMenu
-							direction="left"
-							:options="[
-								{ id: 'edit', action: () => {} },
-								{ id: 'delete', action: () => {}, color: 'danger' },
-							]"
-						>
-							<MoreHorizontalIcon class="h-5 w-5" />
-							<template #edit>Edit</template>
-							<template #delete>Delete</template>
-						</OverflowMenu>
-					</ButtonStyled>
-				</div>
-			</div>
-		`,
-	}),
-}
diff --git a/packages/ui/src/stories/base/PageHeader.stories.ts b/packages/ui/src/stories/base/PageHeader.stories.ts
index 73ad628820..d2e569ae6b 100644
--- a/packages/ui/src/stories/base/PageHeader.stories.ts
+++ b/packages/ui/src/stories/base/PageHeader.stories.ts
@@ -20,9 +20,13 @@ import type { Meta, StoryObj } from '@storybook/vue3-vite'
 
 import AutoLink from '../../components/base/AutoLink.vue'
 import Avatar from '../../components/base/Avatar.vue'
-import ButtonStyled from '../../components/base/ButtonStyled.vue'
+import {
+	Button,
+	IconButton,
+	SplitButton,
+	TeleportOverflowMenu,
+} from '../../components/base/buttons'
 import FormattedTag from '../../components/base/FormattedTag.vue'
-import JoinedButtons from '../../components/base/JoinedButtons.vue'
 import PageHeader from '../../components/base/page-header/index.vue'
 import PageHeaderMetadata from '../../components/base/page-header/metadata/index.vue'
 import PageHeaderMetadataItem from '../../components/base/page-header/metadata/page-header-metadata-item.vue'
@@ -32,7 +36,6 @@ import PageHeaderMetadataTimeItem from '../../components/base/page-header/metada
 import PageHeaderActions from '../../components/base/page-header/page-header-actions.vue'
 import PageHeaderBadgeItem from '../../components/base/page-header/page-header-badge-item.vue'
 import TagItem from '../../components/base/TagItem.vue'
-import TeleportOverflowMenu from '../../components/base/TeleportOverflowMenu.vue'
 import LoaderIcon from '../../components/servers/icons/LoaderIcon.vue'
 import ServerIcon from '../../components/servers/icons/ServerIcon.vue'
 
@@ -87,9 +90,10 @@ const pageHeaderIcons = {
 const pageHeaderComponents = {
 	AutoLink,
 	Avatar,
-	ButtonStyled,
+	Button,
 	FormattedTag,
-	JoinedButtons,
+	IconButton,
+	SplitButton,
 	PageHeader,
 	PageHeaderActions,
 	PageHeaderBadgeItem,
@@ -111,7 +115,7 @@ const meta = {
 	},
 	decorators: [
 		(story) => ({
-			components: { story },
+			components: { story, TeleportOverflowMenu },
 			template: '<div class="w-full"><story /></div>',
 		}),
 	],
@@ -157,17 +161,13 @@ export const ProjectHeader: Story = {
 
 				<template #actions>
 					<PageHeaderActions>
-						<ButtonStyled color="brand" size="large">
-							<button type="button" @click="noop">
-								<DownloadIcon />
-								Download
-							</button>
-						</ButtonStyled>
-						<ButtonStyled circular size="large" type="transparent">
-							<TeleportOverflowMenu :options="menuActions" aria-label="More actions">
-								<MoreVerticalIcon />
-							</TeleportOverflowMenu>
-						</ButtonStyled>
+						<Button type="colored" color="brand" size="xl" native-type="button" @click="noop">
+							<DownloadIcon />
+							Download
+						</Button>
+						<TeleportOverflowMenu type="quiet" size="xl" label="More actions" :options="menuActions">
+							<MoreVerticalIcon />
+						</TeleportOverflowMenu>
 					</PageHeaderActions>
 				</template>
 			</PageHeader>
@@ -207,12 +207,10 @@ export const CreatorHeader: Story = {
 
 				<template #actions>
 					<PageHeaderActions>
-						<ButtonStyled color="brand" size="large">
-							<button type="button" @click="noop">
-								<HeartIcon />
-								Follow
-							</button>
-						</ButtonStyled>
+						<Button type="colored" color="brand" size="xl" native-type="button" @click="noop">
+							<HeartIcon />
+							Follow
+						</Button>
 					</PageHeaderActions>
 				</template>
 			</PageHeader>
@@ -222,10 +220,7 @@ export const CreatorHeader: Story = {
 
 export const AppInstanceHeader: Story = {
 	render: () => ({
-		components: {
-			...pageHeaderComponents,
-			LoaderIcon,
-		},
+		components: { ...pageHeaderComponents, LoaderIcon, TeleportOverflowMenu },
 		setup() {
 			return {
 				...pageHeaderIcons,
@@ -252,22 +247,16 @@ export const AppInstanceHeader: Story = {
 
 				<template #actions>
 					<PageHeaderActions>
-						<ButtonStyled color="brand" size="large">
-							<button type="button" @click="noop">
-								<PlayIcon />
-								Play
-							</button>
-						</ButtonStyled>
-						<ButtonStyled circular size="large">
-							<button type="button" aria-label="Instance settings" @click="noop">
-								<SettingsIcon />
-							</button>
-						</ButtonStyled>
-						<ButtonStyled circular size="large" type="transparent">
-							<TeleportOverflowMenu :options="menuActions" aria-label="More actions">
-								<MoreVerticalIcon />
-							</TeleportOverflowMenu>
-						</ButtonStyled>
+						<Button type="colored" color="brand" size="xl" native-type="button" @click="noop">
+							<PlayIcon />
+							Play
+						</Button>
+						<IconButton size="xl" label="Instance settings" native-type="button" @click="noop">
+							<SettingsIcon />
+						</IconButton>
+						<TeleportOverflowMenu type="quiet" size="xl" label="More actions" :options="menuActions">
+							<MoreVerticalIcon />
+						</TeleportOverflowMenu>
 					</PageHeaderActions>
 				</template>
 			</PageHeader>
@@ -277,10 +266,7 @@ export const AppInstanceHeader: Story = {
 
 export const BrowseHeader: Story = {
 	render: () => ({
-		components: {
-			...pageHeaderComponents,
-			LoaderIcon,
-		},
+		components: { ...pageHeaderComponents, LoaderIcon, TeleportOverflowMenu },
 		setup() {
 			return {
 				...pageHeaderIcons,
@@ -291,11 +277,9 @@ export const BrowseHeader: Story = {
 		template: `
 			<PageHeader title="Survival SMP" :divider="false" :bottom-padding="false" main-class="items-center" title-class="leading-8" truncate-title>
 				<template #leading>
-					<ButtonStyled circular size="large">
-						<button type="button" aria-label="Back to instance" @click="noop">
-							<LeftArrowIcon />
-						</button>
-					</ButtonStyled>
+					<IconButton size="xl" label="Back to instance" native-type="button" @click="noop">
+						<LeftArrowIcon />
+					</IconButton>
 					<Avatar src="" alt="Survival SMP" size="48px" tint-by="survival-smp" />
 				</template>
 
@@ -317,10 +301,7 @@ export const BrowseHeader: Story = {
 
 export const ServerPanelRootHeader: Story = {
 	render: () => ({
-		components: {
-			...pageHeaderComponents,
-			ServerIcon,
-		},
+		components: { ...pageHeaderComponents, ServerIcon, TeleportOverflowMenu },
 		setup() {
 			return {
 				...pageHeaderIcons,
@@ -346,17 +327,13 @@ export const ServerPanelRootHeader: Story = {
 
 				<template #actions>
 					<PageHeaderActions>
-						<ButtonStyled color="brand" size="large">
-							<button type="button" @click="noop">
-								<PlayIcon />
-								Start server
-							</button>
-						</ButtonStyled>
-						<ButtonStyled circular size="large">
-							<button type="button" aria-label="Server settings" @click="noop">
-								<SettingsIcon />
-							</button>
-						</ButtonStyled>
+						<Button type="colored" color="brand" size="xl" native-type="button" @click="noop">
+							<PlayIcon />
+							Start server
+						</Button>
+						<IconButton size="xl" label="Server settings" native-type="button" @click="noop">
+							<SettingsIcon />
+						</IconButton>
 					</PageHeaderActions>
 				</template>
 			</PageHeader>
@@ -366,10 +343,7 @@ export const ServerPanelRootHeader: Story = {
 
 export const ServerPanelInstanceHeader: Story = {
 	render: () => ({
-		components: {
-			...pageHeaderComponents,
-			LoaderIcon,
-		},
+		components: { ...pageHeaderComponents, LoaderIcon, TeleportOverflowMenu },
 		setup() {
 			return {
 				...pageHeaderIcons,
@@ -381,11 +355,9 @@ export const ServerPanelInstanceHeader: Story = {
 		template: `
 			<PageHeader title="My World">
 				<template #leading>
-					<ButtonStyled circular size="large">
-						<button type="button" aria-label="All instances" @click="noop">
-							<LeftArrowIcon />
-						</button>
-					</ButtonStyled>
+					<IconButton size="xl" label="All instances" native-type="button" @click="noop">
+						<LeftArrowIcon />
+					</IconButton>
 				</template>
 
 				<template #metadata>
@@ -400,18 +372,24 @@ export const ServerPanelInstanceHeader: Story = {
 
 				<template #actions>
 					<PageHeaderActions>
-						<ButtonStyled color="brand" size="large">
-							<button type="button" @click="noop">
-								<PlayIcon />
-								Start instance
-							</button>
-						</ButtonStyled>
-						<JoinedButtons :actions="joinedActions" color="red" size="large" />
-						<ButtonStyled circular size="large">
-							<button type="button" aria-label="Instance settings" @click="noop">
-								<SettingsIcon />
-							</button>
-						</ButtonStyled>
+						<Button type="colored" color="brand" size="xl" native-type="button" @click="noop">
+							<PlayIcon />
+							Start instance
+						</Button>
+						<SplitButton
+							type="colored"
+							color="red"
+							size="xl"
+							:options="joinedActions.slice(1)"
+							menu-label="Force stop options"
+							@click="noop"
+						>
+							<StopCircleIcon />
+							Stop
+						</SplitButton>
+						<IconButton size="xl" label="Instance settings" native-type="button" @click="noop">
+							<SettingsIcon />
+						</IconButton>
 					</PageHeaderActions>
 				</template>
 			</PageHeader>
diff --git a/packages/ui/src/stories/base/PopoutMenu.stories.ts b/packages/ui/src/stories/base/PopoutMenu.stories.ts
deleted file mode 100644
index 7e3d02a512..0000000000
--- a/packages/ui/src/stories/base/PopoutMenu.stories.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-import { SettingsIcon } from '@modrinth/assets'
-import type { Meta, StoryObj } from '@storybook/vue3-vite'
-
-import Button from '../../components/base/Button.vue'
-import ButtonStyled from '../../components/base/ButtonStyled.vue'
-import PopoutMenu from '../../components/base/PopoutMenu.vue'
-
-const meta = {
-	title: 'Base/PopoutMenu',
-	component: PopoutMenu,
-	render: (args) => ({
-		components: { PopoutMenu, Button, ButtonStyled, SettingsIcon },
-		setup() {
-			return { args }
-		},
-		template: /*html*/ `
-			<ButtonStyled circular type="transparent">
-				<PopoutMenu v-bind="args">
-					<SettingsIcon class="h-5 w-5" />
-					<template #menu>
-						<div class="flex flex-col gap-1 p-1">
-							<Button transparent>Option 1</Button>
-							<Button transparent>Option 2</Button>
-							<Button transparent>Option 3</Button>
-						</div>
-					</template>
-				</PopoutMenu>
-			</ButtonStyled>
-		`,
-	}),
-} satisfies Meta<typeof PopoutMenu>
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-export const Default: Story = {}
-
-export const WithTooltip: Story = {
-	args: {
-		tooltip: 'Click for more options',
-	},
-}
-
-export const DifferentPlacements: StoryObj = {
-	render: () => ({
-		components: { PopoutMenu, Button, ButtonStyled, SettingsIcon },
-		template: /*html*/ `
-			<div class="flex gap-8 items-start p-8">
-				<div class="flex flex-col items-center gap-2">
-					<span class="text-sm text-secondary">bottom-end (default)</span>
-					<ButtonStyled circular type="transparent">
-						<PopoutMenu placement="bottom-end">
-							<SettingsIcon class="h-5 w-5" />
-							<template #menu>
-								<div class="flex flex-col gap-1 p-1">
-									<Button transparent>Option 1</Button>
-									<Button transparent>Option 2</Button>
-								</div>
-							</template>
-						</PopoutMenu>
-					</ButtonStyled>
-				</div>
-				<div class="flex flex-col items-center gap-2">
-					<span class="text-sm text-secondary">bottom-start</span>
-					<ButtonStyled circular type="transparent">
-						<PopoutMenu placement="bottom-start">
-							<SettingsIcon class="h-5 w-5" />
-							<template #menu>
-								<div class="flex flex-col gap-1 p-1">
-									<Button transparent>Option 1</Button>
-									<Button transparent>Option 2</Button>
-								</div>
-							</template>
-						</PopoutMenu>
-					</ButtonStyled>
-				</div>
-				<div class="flex flex-col items-center gap-2">
-					<span class="text-sm text-secondary">top-end</span>
-					<ButtonStyled circular type="transparent">
-						<PopoutMenu placement="top-end">
-							<SettingsIcon class="h-5 w-5" />
-							<template #menu>
-								<div class="flex flex-col gap-1 p-1">
-									<Button transparent>Option 1</Button>
-									<Button transparent>Option 2</Button>
-								</div>
-							</template>
-						</PopoutMenu>
-					</ButtonStyled>
-				</div>
-			</div>
-		`,
-	}),
-}
diff --git a/packages/ui/src/stories/base/StackedAdmonitions.stories.ts b/packages/ui/src/stories/base/StackedAdmonitions.stories.ts
index c0683ad7df..fbef68fb42 100644
--- a/packages/ui/src/stories/base/StackedAdmonitions.stories.ts
+++ b/packages/ui/src/stories/base/StackedAdmonitions.stories.ts
@@ -2,7 +2,7 @@ import type { Meta, StoryObj } from '@storybook/vue3-vite'
 import { ref } from 'vue'
 
 import Admonition from '../../components/base/Admonition.vue'
-import ButtonStyled from '../../components/base/ButtonStyled.vue'
+import { Button } from '../../components/base/buttons'
 import StackedAdmonitionsRaw, {
 	type StackedAdmonitionItem,
 } from '../../components/base/StackedAdmonitions.vue'
@@ -383,7 +383,7 @@ interface RichItem extends StackedAdmonitionItem {
 
 export const RichContent: Story = {
 	render: () => ({
-		components: { StackedAdmonitions, Admonition, ButtonStyled },
+		components: { StackedAdmonitions, Admonition, Button },
 		setup() {
 			const items = ref<RichItem[]>([
 				{
@@ -429,12 +429,8 @@ export const RichContent: Story = {
 					>
 						{{ item.body }}
 						<template #top-right-actions>
-							<ButtonStyled v-if="item.canCancel" type="outlined" color="blue">
-								<button class="!border" type="button" @click="dismiss(item.id)">Cancel</button>
-							</ButtonStyled>
-							<ButtonStyled v-if="item.canRetry" color="red">
-								<button type="button" @click="dismiss(item.id)">Retry</button>
-							</ButtonStyled>
+							<Button type="outlined" v-if="item.canCancel" class="!border !text-blue [&>svg]:!text-blue !shadow-[inset_0_0_0_1px_var(--color-blue)]" native-type="button" @click="dismiss(item.id)">Cancel</Button>
+							<Button type="colored" color="red" v-if="item.canRetry" native-type="button" @click="dismiss(item.id)">Retry</Button>
 						</template>
 					</Admonition>
 				</template>
diff --git a/packages/ui/src/stories/base/Table.stories.ts b/packages/ui/src/stories/base/Table.stories.ts
index 157c1ffbcb..6448cbe7bd 100644
--- a/packages/ui/src/stories/base/Table.stories.ts
+++ b/packages/ui/src/stories/base/Table.stories.ts
@@ -3,8 +3,7 @@ import type { Meta, StoryObj } from '@storybook/vue3-vite'
 import { computed, ref } from 'vue'
 
 import Badge from '../../components/base/Badge.vue'
-import ButtonStyled from '../../components/base/ButtonStyled.vue'
-import OverflowMenu from '../../components/base/OverflowMenu.vue'
+import { Button, TeleportOverflowMenu } from '../../components/base/buttons'
 import Table from '../../components/base/Table.vue'
 
 interface User {
@@ -54,7 +53,7 @@ export default meta
 export const Default: StoryObj = {
 	args: {},
 	render: () => ({
-		components: { Table },
+		components: { Table, TeleportOverflowMenu },
 		setup() {
 			const columns = [
 				{ key: 'name', label: 'Name' },
@@ -74,7 +73,7 @@ export const Default: StoryObj = {
 export const HorizontalOverflow: StoryObj = {
 	args: {},
 	render: () => ({
-		components: { Table },
+		components: { Table, TeleportOverflowMenu },
 		setup() {
 			const columns = [
 				{ key: 'name', label: 'Name' },
@@ -103,7 +102,7 @@ export const HorizontalOverflow: StoryObj = {
 export const CustomClasses: StoryObj = {
 	args: {},
 	render: () => ({
-		components: { Table },
+		components: { Table, TeleportOverflowMenu },
 		setup() {
 			const columns = [
 				{ key: 'name', label: 'Name', cellClass: '!overflow-visible py-3' },
@@ -129,7 +128,7 @@ export const CustomClasses: StoryObj = {
 export const WithSelection: StoryObj = {
 	args: {},
 	render: () => ({
-		components: { Table },
+		components: { Table, TeleportOverflowMenu },
 		setup() {
 			const columns = [
 				{ key: 'name', label: 'Name' },
@@ -160,7 +159,7 @@ export const WithSelection: StoryObj = {
 export const WithSelectionData: StoryObj = {
 	args: {},
 	render: () => ({
-		components: { Table },
+		components: { Table, TeleportOverflowMenu },
 		setup() {
 			const columns = [
 				{ key: 'name', label: 'Name' },
@@ -193,7 +192,7 @@ export const WithSelectionData: StoryObj = {
 export const WithSelectionIds: StoryObj = {
 	args: {},
 	render: () => ({
-		components: { Table },
+		components: { Table, TeleportOverflowMenu },
 		setup() {
 			const columns = [
 				{ key: 'name', label: 'Name' },
@@ -233,7 +232,7 @@ export const WithSorting: StoryObj = {
 		},
 	},
 	render: () => ({
-		components: { Table },
+		components: { Table, TeleportOverflowMenu },
 		setup() {
 			const columns = [
 				{ key: 'name', label: 'Name', enableSorting: true },
@@ -269,7 +268,7 @@ export const WithSorting: StoryObj = {
 export const WithColumnAlignment: StoryObj = {
 	args: {},
 	render: () => ({
-		components: { Table },
+		components: { Table, TeleportOverflowMenu },
 		setup() {
 			const columns = [
 				{ key: 'name', label: 'Name', align: 'left' as const },
@@ -289,7 +288,7 @@ export const WithColumnAlignment: StoryObj = {
 export const WithCustomCellSlots: StoryObj = {
 	args: {},
 	render: () => ({
-		components: { Table, Badge },
+		components: { Table, Badge, TeleportOverflowMenu },
 		setup() {
 			const columns = [
 				{ key: 'name', label: 'Name' },
@@ -335,7 +334,7 @@ export const WithCustomCellSlots: StoryObj = {
 export const WithCustomHeaderSlots: StoryObj = {
 	args: {},
 	render: () => ({
-		components: { Table },
+		components: { Table, TeleportOverflowMenu },
 		setup() {
 			const columns = [
 				{ key: 'name', label: 'Name' },
@@ -365,7 +364,7 @@ export const WithCustomHeaderSlots: StoryObj = {
 export const WithHeaderSlot: StoryObj = {
 	args: {},
 	render: () => ({
-		components: { Table, ButtonStyled },
+		components: { Table, Button, TeleportOverflowMenu },
 		setup() {
 			const columns = [
 				{ key: 'name', label: 'Name' },
@@ -383,9 +382,7 @@ export const WithHeaderSlot: StoryObj = {
 					<div class="flex flex-col gap-3 xl:flex-row xl:items-center xl:justify-between">
 						<div class="text-lg font-semibold text-contrast">Team Members</div>
 						<div class="flex items-center gap-2">
-							<ButtonStyled color="brand">
-								<button type="button">Invite member</button>
-							</ButtonStyled>
+							<Button type="colored" color="brand" native-type="button">Invite member</Button>
 						</div>
 					</div>
 				</template>
@@ -397,7 +394,7 @@ export const WithHeaderSlot: StoryObj = {
 export const WithActionsColumn: StoryObj = {
 	args: {},
 	render: () => ({
-		components: { Table, ButtonStyled, EditIcon, TrashIcon },
+		components: { Table, EditIcon, TrashIcon, Button, TeleportOverflowMenu },
 		setup() {
 			const columns = [
 				{ key: 'name', label: 'Name' },
@@ -421,18 +418,14 @@ export const WithActionsColumn: StoryObj = {
 			<Table :columns="columns" :data="data">
 				<template #cell-actions="{ row }">
 					<div class="flex items-center justify-end gap-2">
-						<ButtonStyled color="brand" type="transparent" @click="handleEdit(row)">
-							<button class="flex items-center gap-1">
-								<EditIcon class="size-4" />
-								Edit
-							</button>
-						</ButtonStyled>
-						<ButtonStyled color="red" type="transparent" @click="handleDelete(row)">
-							<button class="flex items-center gap-1">
-								<TrashIcon class="size-4" />
-								Delete
-							</button>
-						</ButtonStyled>
+						<Button type="quiet" color="brand" @click="handleEdit(row)" class="flex items-center gap-1">
+							<EditIcon class="size-4" />
+							Edit
+						</Button>
+						<Button type="quiet" color="red" @click="handleDelete(row)" class="flex items-center gap-1">
+							<TrashIcon class="size-4" />
+							Delete
+						</Button>
 					</div>
 				</template>
 			</Table>
@@ -443,7 +436,7 @@ export const WithActionsColumn: StoryObj = {
 export const WithLocalizedActionsColumn: StoryObj = {
 	args: {},
 	render: () => ({
-		components: { Table, ButtonStyled, EditIcon, TrashIcon },
+		components: { Table, EditIcon, TrashIcon, Button, TeleportOverflowMenu },
 		setup() {
 			const columns = [
 				{ key: 'name', label: 'Nombre' },
@@ -467,18 +460,14 @@ export const WithLocalizedActionsColumn: StoryObj = {
 			<Table :columns="columns" :data="data">
 				<template #cell-actions="{ row }">
 					<div class="flex items-center justify-end gap-2">
-						<ButtonStyled color="brand" type="transparent" @click="handleEdit(row)">
-							<button class="flex items-center gap-1">
-								<EditIcon class="size-4" />
-								Editar
-							</button>
-						</ButtonStyled>
-						<ButtonStyled color="red" type="transparent" @click="handleDelete(row)">
-							<button class="flex items-center gap-1">
-								<TrashIcon class="size-4" />
-								Eliminar
-							</button>
-						</ButtonStyled>
+						<Button type="quiet" color="brand" @click="handleEdit(row)" class="flex items-center gap-1">
+							<EditIcon class="size-4" />
+							Editar
+						</Button>
+						<Button type="quiet" color="red" @click="handleDelete(row)" class="flex items-center gap-1">
+							<TrashIcon class="size-4" />
+							Eliminar
+						</Button>
 					</div>
 				</template>
 			</Table>
@@ -489,7 +478,7 @@ export const WithLocalizedActionsColumn: StoryObj = {
 export const FullFeatured: StoryObj = {
 	args: {},
 	render: () => ({
-		components: { Table, Badge, ButtonStyled, EditIcon, TrashIcon },
+		components: { Table, Badge, EditIcon, TrashIcon, Button, TeleportOverflowMenu },
 		setup() {
 			const columns = [
 				{ key: 'name', label: 'Name', enableSorting: true },
@@ -565,18 +554,14 @@ export const FullFeatured: StoryObj = {
 					</template>
 					<template #cell-actions="{ row }">
 						<div class="flex items-center justify-end gap-2">
-							<ButtonStyled color="brand" type="transparent" @click="handleEdit(row)">
-								<button class="flex items-center gap-1">
-									<EditIcon class="size-4" />
-									Edit
-								</button>
-							</ButtonStyled>
-							<ButtonStyled color="red" type="transparent" @click="handleDelete(row)">
-								<button class="flex items-center gap-1">
-									<TrashIcon class="size-4" />
-									Delete
-								</button>
-							</ButtonStyled>
+							<Button type="quiet" color="brand" @click="handleEdit(row)" class="flex items-center gap-1">
+								<EditIcon class="size-4" />
+								Edit
+							</Button>
+							<Button type="quiet" color="red" @click="handleDelete(row)" class="flex items-center gap-1">
+								<TrashIcon class="size-4" />
+								Delete
+							</Button>
 						</div>
 					</template>
 				</Table>
@@ -592,7 +577,7 @@ export const FullFeatured: StoryObj = {
 export const VirtualizedLargeData: StoryObj = {
 	args: {},
 	render: () => ({
-		components: { Table, Badge },
+		components: { Table, Badge, TeleportOverflowMenu },
 		setup() {
 			const columns = [
 				{ key: 'name', label: 'Name', enableSorting: true },
@@ -710,7 +695,15 @@ export const VirtualizedLargeData: StoryObj = {
 export const WithOverflowMenu: StoryObj = {
 	args: {},
 	render: () => ({
-		components: { Table, Badge, ButtonStyled, OverflowMenu, MoreVerticalIcon, EditIcon, TrashIcon },
+		components: {
+			Table,
+			Badge,
+			MoreVerticalIcon,
+			EditIcon,
+			TrashIcon,
+			Button,
+			TeleportOverflowMenu,
+		},
 		setup() {
 			const columns = [
 				{ key: 'name', label: 'Name' },
@@ -737,17 +730,19 @@ export const WithOverflowMenu: StoryObj = {
 			const getMenuOptions = (row: User) => [
 				{
 					id: 'edit',
+					label: 'Edit',
 					action: () => alert(`Edit user: ${row.name}`),
 				},
 				{
 					id: 'duplicate',
+					label: 'Duplicate',
 					action: () => alert(`Duplicate user: ${row.name}`),
 				},
-				{ divider: true },
+				{ type: 'divider' },
 				{
 					id: 'delete',
-					color: 'red' as const,
-					hoverFilled: true,
+					label: 'Delete',
+					tone: 'red',
 					action: () => alert(`Delete user: ${row.name}`),
 				},
 			]
@@ -766,26 +761,23 @@ export const WithOverflowMenu: StoryObj = {
 				</template>
 				<template #cell-actions="{ row }">
 					<div class="flex justify-end">
-						<ButtonStyled circular type="transparent">
-							<OverflowMenu
+						<TeleportOverflowMenu type="quiet" label="More options"
 								:options="getMenuOptions(row)"
-								aria-label="More options"
 							>
-								<MoreVerticalIcon aria-hidden="true" />
-								<template #edit>
-									<EditIcon class="size-4" aria-hidden="true" />
-									Edit
-								</template>
-								<template #duplicate>
-									<EditIcon class="size-4" aria-hidden="true" />
-									Duplicate
-								</template>
-								<template #delete>
-									<TrashIcon class="size-4" aria-hidden="true" />
-									Delete
-								</template>
-							</OverflowMenu>
-						</ButtonStyled>
+							<MoreVerticalIcon aria-hidden="true" />
+							<template #edit>
+								<EditIcon class="size-4" aria-hidden="true" />
+								Edit
+							</template>
+							<template #duplicate>
+								<EditIcon class="size-4" aria-hidden="true" />
+								Duplicate
+							</template>
+							<template #delete>
+								<TrashIcon class="size-4" aria-hidden="true" />
+								Delete
+							</template>
+						</TeleportOverflowMenu>
 					</div>
 				</template>
 			</Table>
@@ -796,7 +788,7 @@ export const WithOverflowMenu: StoryObj = {
 export const EmptyState: StoryObj = {
 	args: {},
 	render: () => ({
-		components: { Table },
+		components: { Table, TeleportOverflowMenu },
 		setup() {
 			const columns = [
 				{ key: 'name', label: 'Name' },
diff --git a/packages/ui/src/stories/buttons/Button.stories.ts b/packages/ui/src/stories/buttons/Button.stories.ts
new file mode 100644
index 0000000000..85bfe95332
--- /dev/null
+++ b/packages/ui/src/stories/buttons/Button.stories.ts
@@ -0,0 +1,213 @@
+import { DownloadIcon, ExternalIcon, HeartIcon, SettingsIcon } from '@modrinth/assets'
+import type { Meta, StoryObj } from '@storybook/vue3-vite'
+
+import Button from '../../components/base/buttons/Button.vue'
+import ButtonLink from '../../components/base/buttons/ButtonLink.vue'
+import IconButton from '../../components/base/buttons/IconButton.vue'
+
+const types = ['base', 'colored', 'outlined', 'quiet'] as const
+const sizes = ['sm', 'md', 'lg', 'xl'] as const
+const colors = ['brand', 'red', 'orange', 'green', 'blue', 'purple', 'medal_promotion'] as const
+const sizeColumns = [
+	{ value: 'sm', label: 'Small' },
+	{ value: 'md', label: 'Medium' },
+	{ value: 'lg', label: 'Large' },
+	{ value: 'xl', label: 'Extra large' },
+] as const
+const typeRows = [
+	{ label: 'Base', type: 'base' },
+	{ label: 'Outlined', type: 'outlined' },
+	{ label: 'Quiet', type: 'quiet' },
+	...colors.map((color) => ({
+		label: `Colored / ${color.charAt(0).toUpperCase()}${color.slice(1)}`,
+		type: 'colored' as const,
+		color,
+	})),
+	...colors.map((color) => ({
+		label: `Outlined / ${color.charAt(0).toUpperCase()}${color.slice(1)}`,
+		type: 'outlined' as const,
+		color,
+	})),
+	...colors.map((color) => ({
+		label: `Quiet / ${color.charAt(0).toUpperCase()}${color.slice(1)}`,
+		type: 'quiet' as const,
+		color,
+	})),
+]
+
+const meta = {
+	title: 'Buttons/Button',
+	component: Button,
+	argTypes: {
+		type: {
+			control: 'select',
+			options: types,
+		},
+		size: {
+			control: 'select',
+			options: sizes,
+		},
+		color: {
+			control: 'select',
+			options: colors,
+		},
+		nativeType: {
+			control: 'select',
+			options: ['button', 'submit', 'reset'],
+		},
+		disabled: { control: 'boolean' },
+		loading: { control: 'boolean' },
+	},
+	args: {
+		type: 'base',
+		size: 'md',
+		color: 'brand',
+		nativeType: 'button',
+		disabled: false,
+		loading: false,
+	},
+	render: (args) => ({
+		components: { Button, DownloadIcon },
+		setup() {
+			return { args }
+		},
+		template: /*html*/ `
+			<Button v-bind="args">
+				<DownloadIcon />
+				Download
+			</Button>
+		`,
+	}),
+} satisfies Meta<typeof Button>
+
+export default meta
+type Story = StoryObj<typeof meta>
+
+export const Playground: Story = {}
+
+export const AllTypes: Story = {
+	render: () => ({
+		components: { Button, DownloadIcon },
+		setup() {
+			return { sizeColumns, typeRows }
+		},
+		template: /*html*/ `
+			<div class="grid grid-cols-[max-content_repeat(4,max-content)] items-center gap-4 overflow-x-auto p-1">
+				<div />
+				<div v-for="size in sizeColumns" :key="size.value" class="font-semibold text-contrast">
+					{{ size.label }}
+				</div>
+
+				<template v-for="row in typeRows" :key="row.label">
+					<div class="whitespace-nowrap font-semibold text-secondary">{{ row.label }}</div>
+					<Button
+						v-for="size in sizeColumns"
+						:key="size.value"
+						:type="row.type"
+						:color="row.color"
+						:size="size.value"
+					>
+						<DownloadIcon />Button
+					</Button>
+				</template>
+			</div>
+		`,
+	}),
+}
+
+export const Quiet: Story = {
+	render: () => ({
+		components: { Button, DownloadIcon, IconButton, SettingsIcon },
+		template: /*html*/ `
+			<div class="flex flex-wrap items-center gap-4">
+				<Button type="quiet"><DownloadIcon />Quiet</Button>
+				<Button type="quiet" color="red"><DownloadIcon />Quiet destructive</Button>
+				<IconButton label="Settings" type="quiet"><SettingsIcon /></IconButton>
+			</div>
+		`,
+	}),
+}
+
+export const Sizes: Story = {
+	render: () => ({
+		components: { Button, DownloadIcon, IconButton },
+		setup() {
+			return { sizes }
+		},
+		template: /*html*/ `
+			<div class="flex flex-wrap items-center gap-4">
+				<template v-for="size in sizes" :key="size">
+					<Button :size="size"><DownloadIcon />{{ size }}</Button>
+					<IconButton :label="size" :size="size"><DownloadIcon /></IconButton>
+				</template>
+			</div>
+		`,
+	}),
+}
+
+export const Colors: Story = {
+	render: () => ({
+		components: { Button },
+		setup() {
+			return { colors }
+		},
+		template: /*html*/ `
+			<div class="flex flex-wrap items-center gap-4">
+				<Button v-for="color in colors" :key="color" type="colored" :color="color">
+					{{ color }}
+				</Button>
+			</div>
+		`,
+	}),
+}
+
+export const Content: Story = {
+	render: () => ({
+		components: { Button, DownloadIcon, SettingsIcon },
+		template: /*html*/ `
+			<div class="flex max-w-2xl flex-col items-start gap-4">
+				<Button>Text only</Button>
+				<Button><DownloadIcon />Leading icon</Button>
+				<Button>Trailing icon<SettingsIcon /></Button>
+				<Button class="w-full">Full width</Button>
+				<Button>Continue with a deliberately long translated action label</Button>
+			</div>
+		`,
+	}),
+}
+
+export const InteractionStates: Story = {
+	render: () => ({
+		components: { Button },
+		template: /*html*/ `
+			<div class="flex flex-wrap items-center gap-4">
+				<Button>Enabled</Button>
+				<Button disabled>Disabled</Button>
+				<Button loading>Loading</Button>
+				<Button type="colored">Colored</Button>
+				<Button type="colored" disabled>Colored disabled</Button>
+				<Button type="outlined">Outlined</Button>
+				<Button type="quiet">Quiet</Button>
+			</div>
+		`,
+	}),
+}
+
+export const LinksAndIconButton: Story = {
+	render: () => ({
+		components: { ButtonLink, ExternalIcon, HeartIcon, IconButton },
+		template: /*html*/ `
+			<div class="flex flex-wrap items-center gap-4">
+				<ButtonLink to="/library">Internal link</ButtonLink>
+				<ButtonLink href="https://modrinth.com" target="_blank" type="outlined">
+					Modrinth<ExternalIcon />
+				</ButtonLink>
+				<ButtonLink href="https://modrinth.com" disabled>Disabled link</ButtonLink>
+				<IconButton label="Favorite"><HeartIcon /></IconButton>
+				<IconButton label="Favorite" type="colored"><HeartIcon /></IconButton>
+				<IconButton label="Favorite" type="outlined"><HeartIcon /></IconButton>
+				<IconButton label="Favorite" type="quiet"><HeartIcon /></IconButton>
+			</div>
+		`,
+	}),
+}
diff --git a/packages/ui/src/stories/buttons/ButtonGroup.stories.ts b/packages/ui/src/stories/buttons/ButtonGroup.stories.ts
new file mode 100644
index 0000000000..3f234148c4
--- /dev/null
+++ b/packages/ui/src/stories/buttons/ButtonGroup.stories.ts
@@ -0,0 +1,82 @@
+import { PlayIcon, SettingsIcon, StopCircleIcon, TrashIcon } from '@modrinth/assets'
+import type { Meta, StoryObj } from '@storybook/vue3-vite'
+
+import Button from '../../components/base/buttons/Button.vue'
+import ButtonGroup from '../../components/base/buttons/ButtonGroup.vue'
+import SplitButton from '../../components/base/buttons/SplitButton.vue'
+import type { OverflowMenuOption } from '../../components/base/buttons/types'
+
+const splitOptions: OverflowMenuOption[] = [
+	{
+		id: 'settings',
+		label: 'Server settings',
+		icon: SettingsIcon,
+		action: () => undefined,
+	},
+	{ type: 'divider' },
+	{
+		id: 'delete',
+		label: 'Delete server',
+		icon: TrashIcon,
+		tone: 'red',
+		action: () => undefined,
+	},
+]
+
+const meta = {
+	title: 'Buttons/Button Group',
+	component: ButtonGroup,
+} satisfies Meta<typeof ButtonGroup>
+
+export default meta
+type Story = StoryObj<typeof meta>
+
+export const Joined: Story = {
+	render: () => ({
+		components: { Button, ButtonGroup },
+		template: /*html*/ `
+			<ButtonGroup label="Pagination">
+				<Button type="outlined">Previous</Button>
+				<Button type="outlined">Next</Button>
+			</ButtonGroup>
+		`,
+	}),
+}
+
+export const Split: Story = {
+	render: () => ({
+		components: { PlayIcon, SplitButton },
+		setup() {
+			return { splitOptions }
+		},
+		template: /*html*/ `
+			<SplitButton
+				menu-label="More server actions"
+				group-label="Server actions"
+				type="colored"
+				:options="splitOptions"
+			>
+				<PlayIcon />Start server
+			</SplitButton>
+		`,
+	}),
+}
+
+export const IndependentDisabledStates: Story = {
+	render: () => ({
+		components: { SplitButton, StopCircleIcon },
+		setup() {
+			return { splitOptions }
+		},
+		template: /*html*/ `
+			<div class="flex flex-wrap gap-4">
+				<SplitButton menu-label="More actions" :options="splitOptions" primary-disabled>
+					<StopCircleIcon />Primary disabled
+				</SplitButton>
+				<SplitButton menu-label="More actions" :options="splitOptions" menu-disabled>
+					<StopCircleIcon />Menu disabled
+				</SplitButton>
+			</div>
+		`,
+	}),
+}
diff --git a/packages/ui/src/stories/buttons/FileButton.stories.ts b/packages/ui/src/stories/buttons/FileButton.stories.ts
new file mode 100644
index 0000000000..2f07b27acc
--- /dev/null
+++ b/packages/ui/src/stories/buttons/FileButton.stories.ts
@@ -0,0 +1,61 @@
+import { UploadIcon } from '@modrinth/assets'
+import type { Meta, StoryObj } from '@storybook/vue3-vite'
+
+import FileButton from '../../components/base/buttons/FileButton.vue'
+
+const meta = {
+	title: 'Buttons/File Button',
+	component: FileButton,
+	argTypes: {
+		type: {
+			control: 'select',
+			options: ['base', 'colored', 'outlined', 'quiet'],
+		},
+		size: {
+			control: 'select',
+			options: ['sm', 'md', 'lg', 'xl'],
+		},
+		color: {
+			control: 'select',
+			options: ['brand', 'red', 'orange', 'green', 'blue', 'purple', 'medal_promotion'],
+		},
+	},
+	args: {
+		prompt: 'Select file',
+		type: 'base',
+		size: 'md',
+		multiple: false,
+		disabled: false,
+	},
+	render: (args) => ({
+		components: { FileButton, UploadIcon },
+		setup() {
+			return { args }
+		},
+		template: /*html*/ `
+			<FileButton v-bind="args">
+				<UploadIcon />
+			</FileButton>
+		`,
+	}),
+} satisfies Meta<typeof FileButton>
+
+export default meta
+type Story = StoryObj<typeof meta>
+
+export const Default: Story = {}
+
+export const MultipleImages: Story = {
+	args: {
+		prompt: 'Select images',
+		accept: 'image/*',
+		multiple: true,
+		type: 'colored',
+	},
+}
+
+export const Disabled: Story = {
+	args: {
+		disabled: true,
+	},
+}
diff --git a/packages/ui/src/stories/buttons/TeleportOverflowMenu.stories.ts b/packages/ui/src/stories/buttons/TeleportOverflowMenu.stories.ts
new file mode 100644
index 0000000000..5ed21392f1
--- /dev/null
+++ b/packages/ui/src/stories/buttons/TeleportOverflowMenu.stories.ts
@@ -0,0 +1,104 @@
+import {
+	DownloadIcon,
+	ExternalIcon,
+	MoreVerticalIcon,
+	SettingsIcon,
+	TrashIcon,
+} from '@modrinth/assets'
+import type { Meta, StoryObj } from '@storybook/vue3-vite'
+
+import TeleportOverflowMenu from '../../components/base/buttons/TeleportOverflowMenu.vue'
+import type { OverflowMenuOption } from '../../components/base/buttons/types'
+
+const options: OverflowMenuOption[] = [
+	{
+		id: 'download',
+		label: 'Download',
+		icon: DownloadIcon,
+		action: () => undefined,
+	},
+	{
+		id: 'settings',
+		label: 'Project settings',
+		icon: SettingsIcon,
+		type: 'link',
+		to: '/settings',
+	},
+	{
+		id: 'website',
+		label: 'Open website',
+		icon: ExternalIcon,
+		type: 'link',
+		href: 'https://modrinth.com',
+		target: '_blank',
+	},
+	{
+		id: 'unavailable',
+		label: 'Unavailable action',
+		disabled: true,
+		tooltip: 'This action is currently unavailable',
+		action: () => undefined,
+	},
+	{ type: 'divider' },
+	{
+		id: 'delete',
+		label: 'Delete project',
+		icon: TrashIcon,
+		tone: 'red',
+		action: () => undefined,
+	},
+]
+
+const meta = {
+	title: 'Buttons/Teleport Overflow Menu',
+	component: TeleportOverflowMenu,
+	args: {
+		label: 'More actions',
+		options,
+		type: 'base',
+		size: 'md',
+		placement: 'bottom-end',
+		disabled: false,
+		hoverable: false,
+	},
+	render: (args) => ({
+		components: { MoreVerticalIcon, TeleportOverflowMenu },
+		setup() {
+			return { args }
+		},
+		template: /*html*/ `
+			<TeleportOverflowMenu v-bind="args">
+				<MoreVerticalIcon />
+			</TeleportOverflowMenu>
+		`,
+	}),
+} satisfies Meta<typeof TeleportOverflowMenu>
+
+export default meta
+type Story = StoryObj<typeof meta>
+
+export const Default: Story = {}
+
+export const ColoredTrigger: Story = {
+	args: {
+		type: 'colored',
+	},
+}
+
+export const OutlinedTrigger: Story = {
+	args: {
+		type: 'outlined',
+	},
+}
+
+export const QuietTrigger: Story = {
+	args: {
+		type: 'quiet',
+	},
+}
+
+export const Hoverable: Story = {
+	args: {
+		hoverable: true,
+	},
+}
diff --git a/packages/ui/src/stories/buttons/TeleportPopoutMenu.stories.ts b/packages/ui/src/stories/buttons/TeleportPopoutMenu.stories.ts
new file mode 100644
index 0000000000..d6b183197c
--- /dev/null
+++ b/packages/ui/src/stories/buttons/TeleportPopoutMenu.stories.ts
@@ -0,0 +1,50 @@
+import { SettingsIcon } from '@modrinth/assets'
+import type { Meta, StoryObj } from '@storybook/vue3-vite'
+
+import Button from '../../components/base/buttons/Button.vue'
+import TeleportPopoutMenu from '../../components/base/buttons/TeleportPopoutMenu.vue'
+
+const meta = {
+	title: 'Buttons/Teleport Popout Menu',
+	component: TeleportPopoutMenu,
+} satisfies Meta<typeof TeleportPopoutMenu>
+
+export default meta
+type Story = StoryObj<typeof meta>
+
+export const ArbitraryContent: Story = {
+	render: () => ({
+		components: { Button, SettingsIcon, TeleportPopoutMenu },
+		template: /*html*/ `
+			<TeleportPopoutMenu label="Configure versions" placement="bottom-start">
+				<template #trigger>
+					<SettingsIcon />Configure
+				</template>
+
+				<template #panel="{ close }">
+					<div class="flex w-72 flex-col gap-4">
+						<label class="flex flex-col gap-2 font-semibold text-contrast">
+							Version name
+							<input class="rounded-lg bg-surface-4 px-3 py-2 text-primary ring-1 ring-surface-5" value="1.21.8" />
+						</label>
+						<Button type="colored" @click="close()">Apply</Button>
+					</div>
+				</template>
+			</TeleportPopoutMenu>
+		`,
+	}),
+}
+
+export const IconTrigger: Story = {
+	render: () => ({
+		components: { SettingsIcon, TeleportPopoutMenu },
+		template: /*html*/ `
+			<TeleportPopoutMenu label="Open settings" type="quiet" icon-only>
+				<template #trigger><SettingsIcon /></template>
+				<template #panel>
+					<p class="m-0 w-64">Arbitrary teleported content can live here.</p>
+				</template>
+			</TeleportPopoutMenu>
+		`,
+	}),
+}
diff --git a/packages/ui/src/stories/instances/ContentCardTable.stories.ts b/packages/ui/src/stories/instances/ContentCardTable.stories.ts
index 486a4c909e..e7a90ebbea 100644
--- a/packages/ui/src/stories/instances/ContentCardTable.stories.ts
+++ b/packages/ui/src/stories/instances/ContentCardTable.stories.ts
@@ -3,7 +3,7 @@ import type { Meta, StoryObj } from '@storybook/vue3-vite'
 import { fn } from 'storybook/test'
 import { onMounted, onUnmounted, ref } from 'vue'
 
-import ButtonStyled from '../../components/base/ButtonStyled.vue'
+import { Button, IconButton } from '../../components/base/buttons'
 import ContentCardTable from '../../layouts/shared/content-tab/components/ContentCardTable.vue'
 import type { ContentCardTableItem } from '../../layouts/shared/content-tab/types'
 
@@ -539,7 +539,7 @@ export const InteractiveActions: Story = {
 
 export const WithCustomItemButtons: Story = {
 	render: () => ({
-		components: { ContentCardTable, ButtonStyled, EyeIcon, FolderOpenIcon, DownloadIcon },
+		components: { ContentCardTable, EyeIcon, FolderOpenIcon, DownloadIcon, Button, IconButton },
 		setup() {
 			return { items: sampleItems }
 		},
@@ -551,23 +551,17 @@ export const WithCustomItemButtons: Story = {
 				@delete="(id) => console.log('Delete', id)"
 			>
 				<template #itemButtonsLeft="{ item }">
-					<ButtonStyled v-tooltip="'Download'" circular type="transparent" color="green" color-fill="text">
-						<button @click="console.log('Download', item.id)">
-							<DownloadIcon class="size-5" />
-						</button>
-					</ButtonStyled>
+					<IconButton type="quiet" color="green" label="Download" v-tooltip="'Download'" @click="console.log('Download', item.id)" class="!text-green [&>svg]:!text-green">
+						<DownloadIcon class="size-5" />
+					</IconButton>
 				</template>
 				<template #itemButtonsRight="{ item }">
-					<ButtonStyled v-tooltip="'View on Modrinth'" circular type="transparent">
-						<button @click="console.log('View', item.id)">
-							<EyeIcon class="size-5 text-secondary" />
-						</button>
-					</ButtonStyled>
-					<ButtonStyled v-tooltip="'Open folder'" circular type="transparent">
-						<button @click="console.log('Open folder', item.id)">
-							<FolderOpenIcon class="size-5 text-secondary" />
-						</button>
-					</ButtonStyled>
+					<IconButton type="quiet" label="View on Modrinth" v-tooltip="'View on Modrinth'" @click="console.log('View', item.id)">
+						<EyeIcon class="size-5 text-secondary" />
+					</IconButton>
+					<IconButton type="quiet" label="Open folder" v-tooltip="'Open folder'" @click="console.log('Open folder', item.id)">
+						<FolderOpenIcon class="size-5 text-secondary" />
+					</IconButton>
 				</template>
 			</ContentCardTable>
 		`,
@@ -582,15 +576,13 @@ export const WithEmptyState: Story = {
 
 export const WithCustomEmptyState: Story = {
 	render: () => ({
-		components: { ContentCardTable, ButtonStyled },
+		components: { ContentCardTable, Button, IconButton },
 		template: /*html*/ `
 			<ContentCardTable :items="[]">
 				<template #empty>
 					<div class="flex flex-col items-center gap-4 py-8">
 						<span class="text-lg text-secondary">No mods installed</span>
-						<ButtonStyled color="green">
-							<button>Browse mods</button>
-						</ButtonStyled>
+						<Button type="colored" color="green">Browse mods</Button>
 					</div>
 				</template>
 			</ContentCardTable>
@@ -781,7 +773,7 @@ export const WithOverflowMenu: Story = {
 
 export const BulkActionsDemo: Story = {
 	render: () => ({
-		components: { ContentCardTable, ButtonStyled },
+		components: { ContentCardTable, Button, IconButton },
 		setup() {
 			const items = ref<ContentCardTableItem[]>([
 				{ ...sodiumItem, enabled: true },
@@ -825,15 +817,9 @@ export const BulkActionsDemo: Story = {
 				<div class="flex items-center gap-2">
 					<span class="text-sm text-secondary">{{ selectedIds.length }} selected</span>
 					<template v-if="selectedIds.length > 0">
-						<ButtonStyled size="small" color="green">
-							<button @click="enableSelected">Enable</button>
-						</ButtonStyled>
-						<ButtonStyled size="small" type="transparent">
-							<button @click="disableSelected">Disable</button>
-						</ButtonStyled>
-						<ButtonStyled size="small" color="red">
-							<button @click="deleteSelected">Delete</button>
-						</ButtonStyled>
+						<Button type="colored" color="green" size="xs" @click="enableSelected" class="!h-6">Enable</Button>
+						<Button type="quiet" size="xs" @click="disableSelected" class="!h-6">Disable</Button>
+						<Button type="colored" color="red" size="xs" @click="deleteSelected" class="!h-6">Delete</Button>
 					</template>
 				</div>
 				<ContentCardTable
diff --git a/packages/ui/src/stories/instances/ContentDependencyWarningModal.stories.ts b/packages/ui/src/stories/instances/ContentDependencyWarningModal.stories.ts
index fcb644d625..fbc0b35350 100644
--- a/packages/ui/src/stories/instances/ContentDependencyWarningModal.stories.ts
+++ b/packages/ui/src/stories/instances/ContentDependencyWarningModal.stories.ts
@@ -1,7 +1,7 @@
 import type { Meta, StoryObj } from '@storybook/vue3-vite'
 import { ref } from 'vue'
 
-import ButtonStyled from '../../components/base/ButtonStyled.vue'
+import { Button } from '../../components/base/buttons'
 import ContentDependencyWarningModal from '../../layouts/shared/content-tab/components/modals/ContentDependencyWarningModal.vue'
 import type { ContentCardTableItem } from '../../layouts/shared/content-tab/types'
 
@@ -165,7 +165,7 @@ type Story = StoryObj<typeof meta>
 
 export const InstanceDependency: Story = {
 	render: () => ({
-		components: { ButtonStyled, ContentDependencyWarningModal },
+		components: { ContentDependencyWarningModal, Button },
 		setup() {
 			const modalRef = ref<InstanceType<typeof ContentDependencyWarningModal> | null>(null)
 			const deleted = ref(false)
@@ -186,9 +186,7 @@ export const InstanceDependency: Story = {
 		},
 		template: /* html */ `
 			<div class="flex flex-col items-center gap-4">
-				<ButtonStyled color="orange">
-					<button @click="modalRef?.show()">Delete dependency</button>
-				</ButtonStyled>
+				<Button type="colored" color="orange" @click="modalRef?.show()">Delete dependency</Button>
 				<p v-if="deleted" class="m-0 text-sm text-secondary">Dependency deletion confirmed</p>
 				<ContentDependencyWarningModal
 					ref="modalRef"
@@ -210,7 +208,7 @@ export const InstanceDependency: Story = {
 
 export const ServerDependency: Story = {
 	render: () => ({
-		components: { ButtonStyled, ContentDependencyWarningModal },
+		components: { ContentDependencyWarningModal, Button },
 		setup() {
 			const modalRef = ref<InstanceType<typeof ContentDependencyWarningModal> | null>(null)
 			const deleted = ref(false)
@@ -227,9 +225,7 @@ export const ServerDependency: Story = {
 		},
 		template: /* html */ `
 			<div class="flex flex-col items-center gap-4">
-				<ButtonStyled color="orange">
-					<button @click="modalRef?.show()">Delete server dependency</button>
-				</ButtonStyled>
+				<Button type="colored" color="orange" @click="modalRef?.show()">Delete server dependency</Button>
 				<p v-if="deleted" class="m-0 text-sm text-secondary">Server dependency deletion confirmed</p>
 				<ContentDependencyWarningModal
 					ref="modalRef"
@@ -246,7 +242,7 @@ export const ServerDependency: Story = {
 
 export const BulkDependencies: Story = {
 	render: () => ({
-		components: { ButtonStyled, ContentDependencyWarningModal },
+		components: { ContentDependencyWarningModal, Button },
 		setup() {
 			const modalRef = ref<InstanceType<typeof ContentDependencyWarningModal> | null>(null)
 			const deleted = ref(false)
@@ -267,9 +263,7 @@ export const BulkDependencies: Story = {
 		},
 		template: /* html */ `
 			<div class="flex flex-col items-center gap-4">
-				<ButtonStyled color="orange">
-					<button @click="modalRef?.show()">Delete selected dependencies</button>
-				</ButtonStyled>
+				<Button type="colored" color="orange" @click="modalRef?.show()">Delete selected dependencies</Button>
 				<p v-if="deleted" class="m-0 text-sm text-secondary">Bulk dependency deletion confirmed</p>
 				<ContentDependencyWarningModal
 					ref="modalRef"
diff --git a/packages/ui/src/stories/instances/ContentUpdaterModal.stories.ts b/packages/ui/src/stories/instances/ContentUpdaterModal.stories.ts
index 909463c837..129f602d60 100644
--- a/packages/ui/src/stories/instances/ContentUpdaterModal.stories.ts
+++ b/packages/ui/src/stories/instances/ContentUpdaterModal.stories.ts
@@ -3,7 +3,7 @@ import type { Meta, StoryObj } from '@storybook/vue3-vite'
 import { fn } from 'storybook/test'
 import { ref } from 'vue'
 
-import ButtonStyled from '../../components/base/ButtonStyled.vue'
+import { Button } from '../../components/base/buttons'
 import ContentUpdaterModal from '../../layouts/shared/content-tab/components/modals/content-updater-modal/index.vue'
 
 // Real version data from Modrinth API - Sodium (mod)
@@ -265,7 +265,7 @@ type Story = StoryObj<typeof meta>
 
 export const ModExample: Story = {
 	render: (args) => ({
-		components: { ContentUpdaterModal, ButtonStyled },
+		components: { ContentUpdaterModal, Button },
 		setup() {
 			const modalRef = ref<InstanceType<typeof ContentUpdaterModal> | null>(null)
 			const openModal = () => modalRef.value?.show()
@@ -277,9 +277,7 @@ export const ModExample: Story = {
 		},
 		template: /*html*/ `
 			<div>
-				<ButtonStyled color="brand">
-					<button @click="openModal">Update Sodium</button>
-				</ButtonStyled>
+				<Button type="colored" color="brand" @click="openModal">Update Sodium</Button>
 				<ContentUpdaterModal
 					ref="modalRef"
 					v-bind="args"
@@ -306,7 +304,7 @@ export const ModExample: Story = {
 
 export const ModpackExample: Story = {
 	render: (args) => ({
-		components: { ContentUpdaterModal, ButtonStyled },
+		components: { ContentUpdaterModal, Button },
 		setup() {
 			const modalRef = ref<InstanceType<typeof ContentUpdaterModal> | null>(null)
 			const openModal = () => modalRef.value?.show()
@@ -318,9 +316,7 @@ export const ModpackExample: Story = {
 		},
 		template: /*html*/ `
 			<div>
-				<ButtonStyled color="brand">
-					<button @click="openModal">Update Cobblemon Modpack</button>
-				</ButtonStyled>
+				<Button type="colored" color="brand" @click="openModal">Update Cobblemon Modpack</Button>
 				<ContentUpdaterModal
 					ref="modalRef"
 					v-bind="args"
@@ -347,7 +343,7 @@ export const ModpackExample: Story = {
 
 export const WithIncompatibleVersions: Story = {
 	render: (args) => ({
-		components: { ContentUpdaterModal, ButtonStyled },
+		components: { ContentUpdaterModal, Button },
 		setup() {
 			const modalRef = ref<InstanceType<typeof ContentUpdaterModal> | null>(null)
 			const openModal = () => modalRef.value?.show()
@@ -355,9 +351,7 @@ export const WithIncompatibleVersions: Story = {
 		},
 		template: /*html*/ `
 			<div>
-				<ButtonStyled color="brand">
-					<button @click="openModal">Update (Shows Incompatible)</button>
-				</ButtonStyled>
+				<Button type="colored" color="brand" @click="openModal">Update (Shows Incompatible)</Button>
 				<ContentUpdaterModal
 					ref="modalRef"
 					v-bind="args"
@@ -381,7 +375,7 @@ export const WithIncompatibleVersions: Story = {
 
 export const AllVersionTypes: Story = {
 	render: (args) => ({
-		components: { ContentUpdaterModal, ButtonStyled },
+		components: { ContentUpdaterModal, Button },
 		setup() {
 			const modalRef = ref<InstanceType<typeof ContentUpdaterModal> | null>(null)
 			const openModal = () => modalRef.value?.show()
@@ -389,9 +383,7 @@ export const AllVersionTypes: Story = {
 		},
 		template: /*html*/ `
 			<div>
-				<ButtonStyled color="brand">
-					<button @click="openModal">View All Version Types</button>
-				</ButtonStyled>
+				<Button type="colored" color="brand" @click="openModal">View All Version Types</Button>
 				<ContentUpdaterModal
 					ref="modalRef"
 					v-bind="args"
diff --git a/packages/ui/src/stories/instances/ModpackContentModal.stories.ts b/packages/ui/src/stories/instances/ModpackContentModal.stories.ts
index d86dafbe05..fdccdaba75 100644
--- a/packages/ui/src/stories/instances/ModpackContentModal.stories.ts
+++ b/packages/ui/src/stories/instances/ModpackContentModal.stories.ts
@@ -1,7 +1,7 @@
 import type { Meta, StoryObj } from '@storybook/vue3-vite'
 import { ref } from 'vue'
 
-import ButtonStyled from '../../components/base/ButtonStyled.vue'
+import { Button } from '../../components/base/buttons'
 import ModpackContentModal from '../../layouts/shared/content-tab/components/modals/ModpackContentModal.vue'
 import type { ContentItem } from '../../layouts/shared/content-tab/types'
 
@@ -409,7 +409,7 @@ type Story = StoryObj<typeof meta>
 
 export const Default: Story = {
 	render: () => ({
-		components: { ModpackContentModal, ButtonStyled },
+		components: { ModpackContentModal, Button },
 		setup() {
 			const modalRef = ref<InstanceType<typeof ModpackContentModal> | null>(null)
 			const openModal = () => modalRef.value?.show(mixedModpackContent)
@@ -417,9 +417,7 @@ export const Default: Story = {
 		},
 		template: /*html*/ `
 			<div>
-				<ButtonStyled color="brand">
-					<button @click="openModal">View Modpack Content (Mixed)</button>
-				</ButtonStyled>
+				<Button type="colored" color="brand" @click="openModal">View Modpack Content (Mixed)</Button>
 				<ModpackContentModal
 					ref="modalRef"
 					modpack-name="Cobblemon Official Modpack"
@@ -432,7 +430,7 @@ export const Default: Story = {
 
 export const ModsOnly: Story = {
 	render: () => ({
-		components: { ModpackContentModal, ButtonStyled },
+		components: { ModpackContentModal, Button },
 		setup() {
 			const modalRef = ref<InstanceType<typeof ModpackContentModal> | null>(null)
 			const openModal = () => modalRef.value?.show(modsOnlyContent)
@@ -440,9 +438,7 @@ export const ModsOnly: Story = {
 		},
 		template: /*html*/ `
 			<div>
-				<ButtonStyled color="brand">
-					<button @click="openModal">View Modpack Content (Mods Only)</button>
-				</ButtonStyled>
+				<Button type="colored" color="brand" @click="openModal">View Modpack Content (Mods Only)</Button>
 				<ModpackContentModal ref="modalRef" />
 			</div>
 		`,
@@ -455,7 +451,7 @@ export const ModsOnly: Story = {
 
 export const LoadingState: Story = {
 	render: () => ({
-		components: { ModpackContentModal, ButtonStyled },
+		components: { ModpackContentModal, Button },
 		setup() {
 			const modalRef = ref<InstanceType<typeof ModpackContentModal> | null>(null)
 			const openModal = () => {
@@ -469,9 +465,7 @@ export const LoadingState: Story = {
 		},
 		template: /*html*/ `
 			<div>
-				<ButtonStyled color="brand">
-					<button @click="openModal">View Content (With Loading)</button>
-				</ButtonStyled>
+				<Button type="colored" color="brand" @click="openModal">View Content (With Loading)</Button>
 				<ModpackContentModal
 					ref="modalRef"
 					modpack-name="Fabulously Optimized"
@@ -488,7 +482,7 @@ export const LoadingState: Story = {
 
 export const EmptyContent: Story = {
 	render: () => ({
-		components: { ModpackContentModal, ButtonStyled },
+		components: { ModpackContentModal, Button },
 		setup() {
 			const modalRef = ref<InstanceType<typeof ModpackContentModal> | null>(null)
 			const openModal = () => modalRef.value?.show([])
@@ -496,9 +490,7 @@ export const EmptyContent: Story = {
 		},
 		template: /*html*/ `
 			<div>
-				<ButtonStyled color="brand">
-					<button @click="openModal">View Empty Modpack</button>
-				</ButtonStyled>
+				<Button type="colored" color="brand" @click="openModal">View Empty Modpack</Button>
 				<ModpackContentModal ref="modalRef" />
 			</div>
 		`,
@@ -511,7 +503,7 @@ export const EmptyContent: Story = {
 
 export const LargeModpack: Story = {
 	render: () => ({
-		components: { ModpackContentModal, ButtonStyled },
+		components: { ModpackContentModal, Button },
 		setup() {
 			const modalRef = ref<InstanceType<typeof ModpackContentModal> | null>(null)
 			const openModal = () => modalRef.value?.show(largeModpackContent)
@@ -519,9 +511,7 @@ export const LargeModpack: Story = {
 		},
 		template: /*html*/ `
 			<div>
-				<ButtonStyled color="brand">
-					<button @click="openModal">View Large Modpack (47 items)</button>
-				</ButtonStyled>
+				<Button type="colored" color="brand" @click="openModal">View Large Modpack (47 items)</Button>
 				<ModpackContentModal
 					ref="modalRef"
 					modpack-name="All the Mods 10"
@@ -538,7 +528,7 @@ export const LargeModpack: Story = {
 
 export const SearchDemo: Story = {
 	render: () => ({
-		components: { ModpackContentModal, ButtonStyled },
+		components: { ModpackContentModal, Button },
 		setup() {
 			const modalRef = ref<InstanceType<typeof ModpackContentModal> | null>(null)
 			const openModal = () => modalRef.value?.show(mixedModpackContent)
@@ -549,9 +539,7 @@ export const SearchDemo: Story = {
 				<p class="text-sm text-secondary max-w-md text-center">
 					Click the button and try searching for "sodium", "shader", or "faithful" to test the search functionality.
 				</p>
-				<ButtonStyled color="brand">
-					<button @click="openModal">Test Search</button>
-				</ButtonStyled>
+				<Button type="colored" color="brand" @click="openModal">Test Search</Button>
 				<ModpackContentModal ref="modalRef" />
 			</div>
 		`,
@@ -564,7 +552,7 @@ export const SearchDemo: Story = {
 
 export const FilterDemo: Story = {
 	render: () => ({
-		components: { ModpackContentModal, ButtonStyled },
+		components: { ModpackContentModal, Button },
 		setup() {
 			const modalRef = ref<InstanceType<typeof ModpackContentModal> | null>(null)
 			const openModal = () => modalRef.value?.show(mixedModpackContent)
@@ -575,9 +563,7 @@ export const FilterDemo: Story = {
 				<p class="text-sm text-secondary max-w-md text-center">
 					Click the button and try the filter chips (Mods, Shaders, Resource Packs) to filter content by type.
 				</p>
-				<ButtonStyled color="brand">
-					<button @click="openModal">Test Filters</button>
-				</ButtonStyled>
+				<Button type="colored" color="brand" @click="openModal">Test Filters</Button>
 				<ModpackContentModal ref="modalRef" />
 			</div>
 		`,
@@ -590,7 +576,7 @@ export const FilterDemo: Story = {
 
 export const MixedOwnerTypes: Story = {
 	render: () => ({
-		components: { ModpackContentModal, ButtonStyled },
+		components: { ModpackContentModal, Button },
 		setup() {
 			const modalRef = ref<InstanceType<typeof ModpackContentModal> | null>(null)
 			// Mix of user and organization owners
@@ -608,9 +594,7 @@ export const MixedOwnerTypes: Story = {
 				<p class="text-sm text-secondary max-w-md text-center">
 					Shows content with different owner types: users (circular avatar) and organizations (rounded + icon).
 				</p>
-				<ButtonStyled color="brand">
-					<button @click="openModal">View Mixed Owners</button>
-				</ButtonStyled>
+				<Button type="colored" color="brand" @click="openModal">View Mixed Owners</Button>
 				<ModpackContentModal ref="modalRef" />
 			</div>
 		`,
diff --git a/packages/ui/src/stories/modal/ConfirmLeaveModal.stories.ts b/packages/ui/src/stories/modal/ConfirmLeaveModal.stories.ts
index 9509d27ac1..ac33eb8886 100644
--- a/packages/ui/src/stories/modal/ConfirmLeaveModal.stories.ts
+++ b/packages/ui/src/stories/modal/ConfirmLeaveModal.stories.ts
@@ -1,7 +1,7 @@
 import type { StoryObj } from '@storybook/vue3-vite'
 import { ref } from 'vue'
 
-import ButtonStyled from '../../components/base/ButtonStyled.vue'
+import { Button } from '../../components/base/buttons'
 import ConfirmLeaveModal from '../../components/modal/ConfirmLeaveModal.vue'
 
 const meta = {
@@ -14,7 +14,7 @@ type Story = StoryObj<typeof ConfirmLeaveModal>
 
 export const Default: Story = {
 	render: () => ({
-		components: { ConfirmLeaveModal, ButtonStyled },
+		components: { ConfirmLeaveModal, Button },
 		setup() {
 			const modalRef = ref<InstanceType<typeof ConfirmLeaveModal> | null>(null)
 			const result = ref<string>('')
@@ -27,9 +27,7 @@ export const Default: Story = {
 		},
 		template: /* html */ `
 			<div>
-				<ButtonStyled color="red">
-					<button @click="openModal">Trigger Leave Confirmation</button>
-				</ButtonStyled>
+				<Button type="colored" color="red" @click="openModal">Trigger Leave Confirmation</Button>
 				<p v-if="result" class="mt-4 text-secondary">{{ result }}</p>
 				<ConfirmLeaveModal ref="modalRef" />
 			</div>
@@ -39,7 +37,7 @@ export const Default: Story = {
 
 export const CustomMessages: Story = {
 	render: () => ({
-		components: { ConfirmLeaveModal, ButtonStyled },
+		components: { ConfirmLeaveModal, Button },
 		setup() {
 			const modalRef = ref<InstanceType<typeof ConfirmLeaveModal> | null>(null)
 			const openModal = () => modalRef.value?.prompt()
@@ -47,9 +45,7 @@ export const CustomMessages: Story = {
 		},
 		template: /* html */ `
 			<div>
-				<ButtonStyled color="red">
-					<button @click="openModal">Discard Draft?</button>
-				</ButtonStyled>
+				<Button type="colored" color="red" @click="openModal">Discard Draft?</Button>
 				<ConfirmLeaveModal
 					ref="modalRef"
 					title="Discard draft?"
@@ -65,7 +61,7 @@ export const CustomMessages: Story = {
 
 export const WarningAdmonition: Story = {
 	render: () => ({
-		components: { ConfirmLeaveModal, ButtonStyled },
+		components: { ConfirmLeaveModal, Button },
 		setup() {
 			const modalRef = ref<InstanceType<typeof ConfirmLeaveModal> | null>(null)
 			const openModal = () => modalRef.value?.prompt()
@@ -73,9 +69,7 @@ export const WarningAdmonition: Story = {
 		},
 		template: /* html */ `
 			<div>
-				<ButtonStyled color="orange">
-					<button @click="openModal">Open Warning Variant</button>
-				</ButtonStyled>
+				<Button type="colored" color="orange" @click="openModal">Open Warning Variant</Button>
 				<ConfirmLeaveModal
 					ref="modalRef"
 					admonition-type="warning"
diff --git a/packages/ui/src/stories/modal/NewModal.stories.ts b/packages/ui/src/stories/modal/NewModal.stories.ts
index b044f7289f..4eb09d7491 100644
--- a/packages/ui/src/stories/modal/NewModal.stories.ts
+++ b/packages/ui/src/stories/modal/NewModal.stories.ts
@@ -1,7 +1,7 @@
 import type { StoryObj } from '@storybook/vue3-vite'
 import { ref } from 'vue'
 
-import ButtonStyled from '../../components/base/ButtonStyled.vue'
+import { Button } from '../../components/base/buttons'
 import NewModal from '../../components/modal/NewModal.vue'
 
 const meta = {
@@ -14,7 +14,7 @@ type Story = StoryObj<typeof NewModal>
 
 export const Default: Story = {
 	render: () => ({
-		components: { NewModal, ButtonStyled },
+		components: { NewModal, Button },
 		setup() {
 			const modalRef = ref<InstanceType<typeof NewModal> | null>(null)
 			const openModal = () => modalRef.value?.show()
@@ -22,9 +22,7 @@ export const Default: Story = {
 		},
 		template: `
 			<div>
-				<ButtonStyled color="brand">
-					<button @click="openModal">Open Modal</button>
-				</ButtonStyled>
+				<Button type="colored" color="brand" @click="openModal">Open Modal</Button>
 				<NewModal ref="modalRef" header="Example Modal">
 					<p>This is the modal content.</p>
 					<p class="text-secondary mt-2">You can put any content here.</p>
@@ -36,7 +34,7 @@ export const Default: Story = {
 
 export const WithActions: Story = {
 	render: () => ({
-		components: { NewModal, ButtonStyled },
+		components: { NewModal, Button },
 		setup() {
 			const modalRef = ref<InstanceType<typeof NewModal> | null>(null)
 			const openModal = () => modalRef.value?.show()
@@ -44,19 +42,13 @@ export const WithActions: Story = {
 		},
 		template: `
 			<div>
-				<ButtonStyled color="brand">
-					<button @click="openModal">Open Modal with Actions</button>
-				</ButtonStyled>
+				<Button type="colored" color="brand" @click="openModal">Open Modal with Actions</Button>
 				<NewModal ref="modalRef" header="Confirm Action">
 					<p>Are you sure you want to proceed with this action?</p>
 					<template #actions>
 						<div class="flex gap-2 justify-end">
-							<ButtonStyled>
-								<button @click="modalRef?.hide()">Cancel</button>
-							</ButtonStyled>
-							<ButtonStyled color="brand">
-								<button @click="modalRef?.hide()">Confirm</button>
-							</ButtonStyled>
+							<Button @click="modalRef?.hide()">Cancel</Button>
+							<Button type="colored" color="brand" @click="modalRef?.hide()">Confirm</Button>
 						</div>
 					</template>
 				</NewModal>
@@ -67,7 +59,7 @@ export const WithActions: Story = {
 
 export const DangerFade: Story = {
 	render: () => ({
-		components: { NewModal, ButtonStyled },
+		components: { NewModal, Button },
 		setup() {
 			const modalRef = ref<InstanceType<typeof NewModal> | null>(null)
 			const openModal = () => modalRef.value?.show()
@@ -75,19 +67,13 @@ export const DangerFade: Story = {
 		},
 		template: `
 			<div>
-				<ButtonStyled color="red">
-					<button @click="openModal">Open Danger Modal</button>
-				</ButtonStyled>
+				<Button type="colored" color="red" @click="openModal">Open Danger Modal</Button>
 				<NewModal ref="modalRef" header="Delete Item" fade="danger">
 					<p>Are you sure you want to delete this item? This action cannot be undone.</p>
 					<template #actions>
 						<div class="flex gap-2 justify-end">
-							<ButtonStyled>
-								<button @click="modalRef?.hide()">Cancel</button>
-							</ButtonStyled>
-							<ButtonStyled color="red">
-								<button @click="modalRef?.hide()">Delete</button>
-							</ButtonStyled>
+							<Button @click="modalRef?.hide()">Cancel</Button>
+							<Button type="colored" color="red" @click="modalRef?.hide()">Delete</Button>
 						</div>
 					</template>
 				</NewModal>
@@ -98,7 +84,7 @@ export const DangerFade: Story = {
 
 export const WarningFade: Story = {
 	render: () => ({
-		components: { NewModal, ButtonStyled },
+		components: { NewModal, Button },
 		setup() {
 			const modalRef = ref<InstanceType<typeof NewModal> | null>(null)
 			const openModal = () => modalRef.value?.show()
@@ -106,19 +92,13 @@ export const WarningFade: Story = {
 		},
 		template: `
 			<div>
-				<ButtonStyled color="orange">
-					<button @click="openModal">Open Warning Modal</button>
-				</ButtonStyled>
+				<Button type="colored" color="orange" @click="openModal">Open Warning Modal</Button>
 				<NewModal ref="modalRef" header="Warning" fade="warning">
 					<p>This action may have unintended consequences. Please review before proceeding.</p>
 					<template #actions>
 						<div class="flex gap-2 justify-end">
-							<ButtonStyled>
-								<button @click="modalRef?.hide()">Cancel</button>
-							</ButtonStyled>
-							<ButtonStyled color="orange">
-								<button @click="modalRef?.hide()">Proceed</button>
-							</ButtonStyled>
+							<Button @click="modalRef?.hide()">Cancel</Button>
+							<Button type="colored" color="orange" @click="modalRef?.hide()">Proceed</Button>
 						</div>
 					</template>
 				</NewModal>
@@ -129,7 +109,7 @@ export const WarningFade: Story = {
 
 export const Scrollable: Story = {
 	render: () => ({
-		components: { NewModal, ButtonStyled },
+		components: { NewModal, Button },
 		setup() {
 			const modalRef = ref<InstanceType<typeof NewModal> | null>(null)
 			const openModal = () => modalRef.value?.show()
@@ -137,9 +117,7 @@ export const Scrollable: Story = {
 		},
 		template: `
 			<div>
-				<ButtonStyled color="brand">
-					<button @click="openModal">Open Scrollable Modal</button>
-				</ButtonStyled>
+				<Button type="colored" color="brand" @click="openModal">Open Scrollable Modal</Button>
 				<NewModal ref="modalRef" header="Scrollable Content" scrollable max-content-height="300px">
 					<div class="space-y-4">
 						<p v-for="i in 20" :key="i">
@@ -148,9 +126,7 @@ export const Scrollable: Story = {
 					</div>
 					<template #actions>
 						<div class="flex gap-2 justify-end">
-							<ButtonStyled color="brand">
-								<button @click="modalRef?.hide()">Close</button>
-							</ButtonStyled>
+							<Button type="colored" color="brand" @click="modalRef?.hide()">Close</Button>
 						</div>
 					</template>
 				</NewModal>
@@ -161,7 +137,7 @@ export const Scrollable: Story = {
 
 export const MergedHeader: Story = {
 	render: () => ({
-		components: { NewModal, ButtonStyled },
+		components: { NewModal, Button },
 		setup() {
 			const modalRef = ref<InstanceType<typeof NewModal> | null>(null)
 			const openModal = () => modalRef.value?.show()
@@ -169,9 +145,7 @@ export const MergedHeader: Story = {
 		},
 		template: `
 			<div>
-				<ButtonStyled color="brand">
-					<button @click="openModal">Open Modal (Merged Header)</button>
-				</ButtonStyled>
+				<Button type="colored" color="brand" @click="openModal">Open Modal (Merged Header)</Button>
 				<NewModal ref="modalRef" hide-header merge-header>
 					<div class="text-center py-8">
 						<h2 class="text-xl font-bold mb-4">Custom Header Area</h2>
@@ -185,7 +159,7 @@ export const MergedHeader: Story = {
 
 export const NotClosable: Story = {
 	render: () => ({
-		components: { NewModal, ButtonStyled },
+		components: { NewModal, Button },
 		setup() {
 			const modalRef = ref<InstanceType<typeof NewModal> | null>(null)
 			const openModal = () => modalRef.value?.show()
@@ -193,17 +167,13 @@ export const NotClosable: Story = {
 		},
 		template: `
 			<div>
-				<ButtonStyled color="brand">
-					<button @click="openModal">Open Non-Closable Modal</button>
-				</ButtonStyled>
+				<Button type="colored" color="brand" @click="openModal">Open Non-Closable Modal</Button>
 				<NewModal ref="modalRef" header="Processing..." :closable="false" :close-on-esc="false" :close-on-click-outside="false">
 					<p>This modal cannot be closed by clicking outside or pressing escape.</p>
 					<p class="text-secondary mt-2">Only the action button can close it.</p>
 					<template #actions>
 						<div class="flex justify-end">
-							<ButtonStyled color="brand">
-								<button @click="modalRef?.hide()">I understand, close</button>
-							</ButtonStyled>
+							<Button type="colored" color="brand" @click="modalRef?.hide()">I understand, close</Button>
 						</div>
 					</template>
 				</NewModal>
@@ -214,7 +184,7 @@ export const NotClosable: Story = {
 
 export const NoPadding: Story = {
 	render: () => ({
-		components: { NewModal, ButtonStyled },
+		components: { NewModal, Button },
 		setup() {
 			const modalRef = ref<InstanceType<typeof NewModal> | null>(null)
 			const openModal = () => modalRef.value?.show()
@@ -222,16 +192,12 @@ export const NoPadding: Story = {
 		},
 		template: `
 			<div>
-				<ButtonStyled color="brand">
-					<button @click="openModal">Open Modal (No Padding)</button>
-				</ButtonStyled>
+				<Button type="colored" color="brand" @click="openModal">Open Modal (No Padding)</Button>
 				<NewModal ref="modalRef" header="No Padding Modal" no-padding>
 					<p>This modal has no default padding on the content area.</p>
 					<template #actions>
 						<div class="flex gap-2 justify-end p-6 pt-0">
-							<ButtonStyled color="brand">
-								<button @click="modalRef?.hide()">Close</button>
-							</ButtonStyled>
+							<Button type="colored" color="brand" @click="modalRef?.hide()">Close</Button>
 						</div>
 					</template>
 				</NewModal>
diff --git a/packages/ui/src/stories/modal/ShareModal.stories.ts b/packages/ui/src/stories/modal/ShareModal.stories.ts
index 10b07701f4..28c81af2ae 100644
--- a/packages/ui/src/stories/modal/ShareModal.stories.ts
+++ b/packages/ui/src/stories/modal/ShareModal.stories.ts
@@ -1,7 +1,7 @@
 import type { StoryObj } from '@storybook/vue3-vite'
 import { ref } from 'vue'
 
-import ButtonStyled from '../../components/base/ButtonStyled.vue'
+import { Button } from '../../components/base/buttons'
 import ShareModal from '../../components/modal/ShareModal.vue'
 
 const meta = {
@@ -20,7 +20,7 @@ export const LinkShare: Story = {
 		link: true,
 	},
 	render: (args) => ({
-		components: { ShareModal, ButtonStyled },
+		components: { ShareModal, Button },
 		setup() {
 			const modalRef = ref<InstanceType<typeof ShareModal> | null>(null)
 			const openModal = () => {
@@ -30,9 +30,7 @@ export const LinkShare: Story = {
 		},
 		template: `
 			<div>
-				<ButtonStyled color="brand">
-					<button @click="openModal">Open Link Share Modal</button>
-				</ButtonStyled>
+				<Button type="colored" color="brand" @click="openModal">Open Link Share Modal</Button>
 				<ShareModal ref="modalRef" v-bind="args" />
 			</div>
 		`,
@@ -47,7 +45,7 @@ export const TextShare: Story = {
 		link: false,
 	},
 	render: (args) => ({
-		components: { ShareModal, ButtonStyled },
+		components: { ShareModal, Button },
 		setup() {
 			const modalRef = ref<InstanceType<typeof ShareModal> | null>(null)
 			const openModal = () => {
@@ -57,9 +55,7 @@ export const TextShare: Story = {
 		},
 		template: `
 			<div>
-				<ButtonStyled color="brand">
-					<button @click="openModal">Open Text Share Modal</button>
-				</ButtonStyled>
+				<Button type="colored" color="brand" @click="openModal">Open Text Share Modal</Button>
 				<ShareModal ref="modalRef" v-bind="args" />
 			</div>
 		`,
diff --git a/packages/ui/src/stories/modal/TabbedModal.stories.ts b/packages/ui/src/stories/modal/TabbedModal.stories.ts
index aee894f212..5d85e192ef 100644
--- a/packages/ui/src/stories/modal/TabbedModal.stories.ts
+++ b/packages/ui/src/stories/modal/TabbedModal.stories.ts
@@ -14,7 +14,7 @@ import {
 import type { StoryObj } from '@storybook/vue3-vite'
 import { defineComponent, h, ref } from 'vue'
 
-import ButtonStyled from '../../components/base/ButtonStyled.vue'
+import { Button } from '../../components/base/buttons'
 import UnsavedChangesPopup from '../../components/base/UnsavedChangesPopup.vue'
 import TabbedModal from '../../components/modal/TabbedModal.vue'
 
@@ -42,7 +42,7 @@ export default meta
 
 export const Default: StoryObj = {
 	render: () => ({
-		components: { TabbedModal, ButtonStyled },
+		components: { TabbedModal, Button },
 		setup() {
 			const modalRef = ref<InstanceType<typeof TabbedModal> | null>(null)
 			const tabs = [
@@ -66,9 +66,7 @@ export const Default: StoryObj = {
 		},
 		template: /* html */ `
 			<div>
-				<ButtonStyled color="brand">
-					<button @click="modalRef?.show()">Open Tabbed Modal</button>
-				</ButtonStyled>
+				<Button type="colored" color="brand" @click="modalRef?.show()">Open Tabbed Modal</Button>
 				<TabbedModal ref="modalRef" header="Settings" :tabs="tabs" />
 			</div>
 		`,
@@ -77,7 +75,7 @@ export const Default: StoryObj = {
 
 export const WithTitleSlot: StoryObj = {
 	render: () => ({
-		components: { TabbedModal, ButtonStyled, SettingsIcon },
+		components: { TabbedModal, SettingsIcon, Button },
 		setup() {
 			const modalRef = ref<InstanceType<typeof TabbedModal> | null>(null)
 			const tabs = [
@@ -96,9 +94,7 @@ export const WithTitleSlot: StoryObj = {
 		},
 		template: /* html */ `
 			<div>
-				<ButtonStyled color="brand">
-					<button @click="modalRef?.show()">Open with Title Slot</button>
-				</ButtonStyled>
+				<Button type="colored" color="brand" @click="modalRef?.show()">Open with Title Slot</Button>
 				<TabbedModal ref="modalRef" :tabs="tabs">
 					<template #title>
 						<span class="flex items-center gap-2 text-lg font-extrabold text-contrast">
@@ -113,7 +109,7 @@ export const WithTitleSlot: StoryObj = {
 
 export const WithFooter: StoryObj = {
 	render: () => ({
-		components: { TabbedModal, ButtonStyled },
+		components: { TabbedModal, Button },
 		setup() {
 			const modalRef = ref<InstanceType<typeof TabbedModal> | null>(null)
 			const tabs = [
@@ -137,9 +133,7 @@ export const WithFooter: StoryObj = {
 		},
 		template: /* html */ `
 			<div>
-				<ButtonStyled color="brand">
-					<button @click="modalRef?.show()">Open with Footer</button>
-				</ButtonStyled>
+				<Button type="colored" color="brand" @click="modalRef?.show()">Open with Footer</Button>
 				<TabbedModal ref="modalRef" header="Settings" :tabs="tabs">
 					<template #footer>
 						<div class="mt-auto text-secondary text-sm">
@@ -155,7 +149,7 @@ export const WithFooter: StoryObj = {
 
 export const WithFloatingActionBar: StoryObj = {
 	render: () => ({
-		components: { TabbedModal, ButtonStyled, UnsavedChangesPopup },
+		components: { TabbedModal, UnsavedChangesPopup, Button },
 		setup() {
 			const modalRef = ref<InstanceType<typeof TabbedModal> | null>(null)
 			const dirty = ref(true)
@@ -170,9 +164,7 @@ export const WithFloatingActionBar: StoryObj = {
 		},
 		template: /* html */ `
 			<div>
-				<ButtonStyled color="brand">
-					<button @click="dirty = true; modalRef?.show()">Open with Floating Action Bar</button>
-				</ButtonStyled>
+				<Button type="colored" color="brand" @click="dirty = true; modalRef?.show()">Open with Floating Action Bar</Button>
 				<TabbedModal
 					ref="modalRef"
 					header="Settings"
@@ -196,7 +188,7 @@ export const WithFloatingActionBar: StoryObj = {
 
 export const WithBadge: StoryObj = {
 	render: () => ({
-		components: { TabbedModal, ButtonStyled },
+		components: { TabbedModal, Button },
 		setup() {
 			const modalRef = ref<InstanceType<typeof TabbedModal> | null>(null)
 			const tabs = [
@@ -221,9 +213,7 @@ export const WithBadge: StoryObj = {
 		},
 		template: /* html */ `
 			<div>
-				<ButtonStyled color="brand">
-					<button @click="modalRef?.show()">Open with Badge</button>
-				</ButtonStyled>
+				<Button type="colored" color="brand" @click="modalRef?.show()">Open with Badge</Button>
 				<TabbedModal ref="modalRef" header="Settings" :tabs="tabs" />
 			</div>
 		`,
@@ -232,7 +222,7 @@ export const WithBadge: StoryObj = {
 
 export const HiddenTabs: StoryObj = {
 	render: () => ({
-		components: { TabbedModal, ButtonStyled },
+		components: { TabbedModal, Button },
 		setup() {
 			const modalRef = ref<InstanceType<typeof TabbedModal> | null>(null)
 			const tabs = [
@@ -257,9 +247,7 @@ export const HiddenTabs: StoryObj = {
 		},
 		template: /* html */ `
 			<div>
-				<ButtonStyled color="brand">
-					<button @click="modalRef?.show()">Open with Hidden Tab</button>
-				</ButtonStyled>
+				<Button type="colored" color="brand" @click="modalRef?.show()">Open with Hidden Tab</Button>
 				<TabbedModal ref="modalRef" header="Settings" :tabs="tabs" />
 			</div>
 		`,
@@ -268,7 +256,7 @@ export const HiddenTabs: StoryObj = {
 
 export const ManyTabs: StoryObj = {
 	render: () => ({
-		components: { TabbedModal, ButtonStyled },
+		components: { TabbedModal, Button },
 		setup() {
 			const modalRef = ref<InstanceType<typeof TabbedModal> | null>(null)
 			const tabs = [
@@ -331,9 +319,7 @@ export const ManyTabs: StoryObj = {
 		},
 		template: /* html */ `
 			<div>
-				<ButtonStyled color="brand">
-					<button @click="modalRef?.show()">Open with Many Tabs</button>
-				</ButtonStyled>
+				<Button type="colored" color="brand" @click="modalRef?.show()">Open with Many Tabs</Button>
 				<TabbedModal ref="modalRef" header="Settings" :tabs="tabs" />
 			</div>
 		`,
@@ -342,7 +328,7 @@ export const ManyTabs: StoryObj = {
 
 export const ScrollableContent: StoryObj = {
 	render: () => ({
-		components: { TabbedModal, ButtonStyled },
+		components: { TabbedModal, Button },
 		setup() {
 			const modalRef = ref<InstanceType<typeof TabbedModal> | null>(null)
 			const tabs = [
@@ -361,9 +347,7 @@ export const ScrollableContent: StoryObj = {
 		},
 		template: /* html */ `
 			<div>
-				<ButtonStyled color="brand">
-					<button @click="modalRef?.show()">Open with Scrollable Content</button>
-				</ButtonStyled>
+				<Button type="colored" color="brand" @click="modalRef?.show()">Open with Scrollable Content</Button>
 				<TabbedModal ref="modalRef" header="Scrollable Demo" :tabs="tabs" />
 			</div>
 		`,
diff --git a/packages/ui/src/stories/modal/UnknownFileWarningModal.stories.ts b/packages/ui/src/stories/modal/UnknownFileWarningModal.stories.ts
index 902de288bc..8ec6c6085a 100644
--- a/packages/ui/src/stories/modal/UnknownFileWarningModal.stories.ts
+++ b/packages/ui/src/stories/modal/UnknownFileWarningModal.stories.ts
@@ -1,7 +1,7 @@
 import type { Meta, StoryObj } from '@storybook/vue3-vite'
 import { ref } from 'vue'
 
-import ButtonStyled from '../../components/base/ButtonStyled.vue'
+import { Button } from '../../components/base/buttons'
 import UnknownFileWarningModal from '../../components/modal/UnknownFileWarningModal.vue'
 
 const meta = {
@@ -17,15 +17,13 @@ type Story = StoryObj<typeof meta>
 
 export const Modpack: Story = {
 	render: () => ({
-		components: { ButtonStyled, UnknownFileWarningModal },
+		components: { UnknownFileWarningModal, Button },
 		setup() {
 			const modalRef = ref<InstanceType<typeof UnknownFileWarningModal> | null>(null)
 			return { modalRef }
 		},
 		template: /* html */ `
-			<ButtonStyled color="brand">
-				<button @click="modalRef?.show()">Open modpack warning</button>
-			</ButtonStyled>
+			<Button type="colored" color="brand" @click="modalRef?.show()">Open modpack warning</Button>
 			<UnknownFileWarningModal
 				ref="modalRef"
 				mode="modpack"
@@ -45,15 +43,13 @@ export const Modpack: Story = {
 
 export const Mod: Story = {
 	render: () => ({
-		components: { ButtonStyled, UnknownFileWarningModal },
+		components: { UnknownFileWarningModal, Button },
 		setup() {
 			const modalRef = ref<InstanceType<typeof UnknownFileWarningModal> | null>(null)
 			return { modalRef }
 		},
 		template: /* html */ `
-			<ButtonStyled color="brand">
-				<button @click="modalRef?.show()">Open file warning</button>
-			</ButtonStyled>
+			<Button type="colored" color="brand" @click="modalRef?.show()">Open file warning</Button>
 			<UnknownFileWarningModal
 				ref="modalRef"
 				mode="mod"
diff --git a/packages/ui/src/stories/modal/UpdateToPlayModal.stories.ts b/packages/ui/src/stories/modal/UpdateToPlayModal.stories.ts
index adb4af7c4b..46c81ab712 100644
--- a/packages/ui/src/stories/modal/UpdateToPlayModal.stories.ts
+++ b/packages/ui/src/stories/modal/UpdateToPlayModal.stories.ts
@@ -2,7 +2,7 @@ import { DownloadIcon } from '@modrinth/assets'
 import type { Meta, StoryObj } from '@storybook/vue3-vite'
 import { ref } from 'vue'
 
-import ButtonStyled from '../../components/base/ButtonStyled.vue'
+import { Button } from '../../components/base/buttons'
 import ContentDiffModal from '../../layouts/shared/installation-settings/components/ContentDiffModal.vue'
 import type { ContentDiffItem } from '../../layouts/shared/installation-settings/types'
 
@@ -66,15 +66,13 @@ const diffs: ContentDiffItem[] = [
 
 export const ExternalFiles: Story = {
 	render: () => ({
-		components: { ButtonStyled, ContentDiffModal },
+		components: { ContentDiffModal, Button },
 		setup() {
 			const modalRef = ref<InstanceType<typeof ContentDiffModal> | null>(null)
 			return { diffs, DownloadIcon, modalRef }
 		},
 		template: /* html */ `
-			<ButtonStyled color="brand">
-				<button @click="modalRef?.show()">Open update warning</button>
-			</ButtonStyled>
+			<Button type="colored" color="brand" @click="modalRef?.show()">Open update warning</Button>
 			<ContentDiffModal
 				ref="modalRef"
 				header="Update to play"
diff --git a/packages/ui/src/stories/modal/UploadProgressModal.stories.ts b/packages/ui/src/stories/modal/UploadProgressModal.stories.ts
index 5f82830156..5f59705576 100644
--- a/packages/ui/src/stories/modal/UploadProgressModal.stories.ts
+++ b/packages/ui/src/stories/modal/UploadProgressModal.stories.ts
@@ -2,7 +2,7 @@ import type { UploadHandle, UploadProgress } from '@modrinth/api-client'
 import type { StoryObj } from '@storybook/vue3-vite'
 import { ref } from 'vue'
 
-import ButtonStyled from '../../components/base/ButtonStyled.vue'
+import { Button } from '../../components/base/buttons'
 import UploadProgressModal from '../../components/modal/UploadProgressModal.vue'
 
 const meta = {
@@ -52,7 +52,7 @@ function createMockUploadHandle(totalBytes: number, durationMs: number): UploadH
 
 export const Default: Story = {
 	render: () => ({
-		components: { UploadProgressModal, ButtonStyled },
+		components: { UploadProgressModal, Button },
 		setup() {
 			const modalRef = ref<InstanceType<typeof UploadProgressModal> | null>(null)
 			const startUpload = () => {
@@ -63,9 +63,7 @@ export const Default: Story = {
 		},
 		template: `
 			<div>
-				<ButtonStyled color="brand">
-					<button @click="startUpload">Upload 50MB file (3s)</button>
-				</ButtonStyled>
+				<Button type="colored" color="brand" @click="startUpload">Upload 50MB file (3s)</Button>
 				<UploadProgressModal ref="modalRef" />
 			</div>
 		`,
@@ -74,7 +72,7 @@ export const Default: Story = {
 
 export const LargeFile: Story = {
 	render: () => ({
-		components: { UploadProgressModal, ButtonStyled },
+		components: { UploadProgressModal, Button },
 		setup() {
 			const modalRef = ref<InstanceType<typeof UploadProgressModal> | null>(null)
 			const startUpload = () => {
@@ -85,9 +83,7 @@ export const LargeFile: Story = {
 		},
 		template: `
 			<div>
-				<ButtonStyled color="brand">
-					<button @click="startUpload">Upload 500MB file (8s)</button>
-				</ButtonStyled>
+				<Button type="colored" color="brand" @click="startUpload">Upload 500MB file (8s)</Button>
 				<UploadProgressModal ref="modalRef" />
 			</div>
 		`,
diff --git a/packages/ui/src/stories/nav/NotificationPanel.stories.ts b/packages/ui/src/stories/nav/NotificationPanel.stories.ts
index 0f0f865d8c..e4a29fda5f 100644
--- a/packages/ui/src/stories/nav/NotificationPanel.stories.ts
+++ b/packages/ui/src/stories/nav/NotificationPanel.stories.ts
@@ -1,6 +1,6 @@
 import type { Meta, StoryObj } from '@storybook/vue3-vite'
 
-import ButtonStyled from '../../components/base/ButtonStyled.vue'
+import { Button } from '../../components/base/buttons'
 import NotificationPanel from '../../components/nav/NotificationPanel.vue'
 import { injectNotificationManager } from '../../providers'
 
@@ -13,7 +13,7 @@ export default meta
 
 export const Default: StoryObj = {
 	render: () => ({
-		components: { NotificationPanel, ButtonStyled },
+		components: { NotificationPanel, Button },
 		setup() {
 			const notificationManager = injectNotificationManager()
 
@@ -87,24 +87,12 @@ export const Default: StoryObj = {
 		template: /* html */ `
 			<div>
 				<div class="flex flex-wrap gap-2">
-					<ButtonStyled color="green">
-						<button @click="showSuccess">Success</button>
-					</ButtonStyled>
-					<ButtonStyled color="red">
-						<button @click="showError">Error</button>
-					</ButtonStyled>
-					<ButtonStyled color="orange">
-						<button @click="showWarning">Warning</button>
-					</ButtonStyled>
-					<ButtonStyled color="blue">
-						<button @click="showInfo">Info</button>
-					</ButtonStyled>
-					<ButtonStyled>
-						<button @click="showActions">Actions</button>
-					</ButtonStyled>
-					<ButtonStyled>
-						<button @click="clearAll">Clear All</button>
-					</ButtonStyled>
+					<Button type="colored" color="green" @click="showSuccess">Success</Button>
+					<Button type="colored" color="red" @click="showError">Error</Button>
+					<Button type="colored" color="orange" @click="showWarning">Warning</Button>
+					<Button type="colored" color="blue" @click="showInfo">Info</Button>
+					<Button @click="showActions">Actions</Button>
+					<Button @click="clearAll">Clear All</Button>
 				</div>
 				<NotificationPanel />
 			</div>
@@ -114,7 +102,7 @@ export const Default: StoryObj = {
 
 export const LeftSide: StoryObj = {
 	render: () => ({
-		components: { NotificationPanel, ButtonStyled },
+		components: { NotificationPanel, Button },
 		setup() {
 			const notificationManager = injectNotificationManager()
 			notificationManager.setNotificationLocation('left')
@@ -161,21 +149,11 @@ export const LeftSide: StoryObj = {
 		template: /* html */ `
 			<div>
 				<div class="flex flex-wrap gap-2">
-					<ButtonStyled color="green">
-						<button @click="showSuccess">Success</button>
-					</ButtonStyled>
-					<ButtonStyled color="red">
-						<button @click="showError">Error</button>
-					</ButtonStyled>
-					<ButtonStyled color="orange">
-						<button @click="showWarning">Warning</button>
-					</ButtonStyled>
-					<ButtonStyled color="blue">
-						<button @click="showInfo">Info</button>
-					</ButtonStyled>
-					<ButtonStyled>
-						<button @click="clearAll">Clear All</button>
-					</ButtonStyled>
+					<Button type="colored" color="green" @click="showSuccess">Success</Button>
+					<Button type="colored" color="red" @click="showError">Error</Button>
+					<Button type="colored" color="orange" @click="showWarning">Warning</Button>
+					<Button type="colored" color="blue" @click="showInfo">Info</Button>
+					<Button @click="clearAll">Clear All</Button>
 				</div>
 				<NotificationPanel />
 			</div>
diff --git a/packages/ui/src/stories/nav/PopupNotificationPanel.stories.ts b/packages/ui/src/stories/nav/PopupNotificationPanel.stories.ts
index b75607a006..ee0ecf4db3 100644
--- a/packages/ui/src/stories/nav/PopupNotificationPanel.stories.ts
+++ b/packages/ui/src/stories/nav/PopupNotificationPanel.stories.ts
@@ -1,6 +1,6 @@
 import type { Meta, StoryObj } from '@storybook/vue3-vite'
 
-import ButtonStyled from '../../components/base/ButtonStyled.vue'
+import { Button } from '../../components/base/buttons'
 import PopupNotificationPanel from '../../components/nav/PopupNotificationPanel.vue'
 import { injectPopupNotificationManager } from '../../providers'
 
@@ -13,7 +13,7 @@ export default meta
 
 export const Default: StoryObj = {
 	render: () => ({
-		components: { PopupNotificationPanel, ButtonStyled },
+		components: { PopupNotificationPanel, Button },
 		setup() {
 			const popupManager = injectPopupNotificationManager()
 
@@ -209,39 +209,17 @@ export const Default: StoryObj = {
 		template: /* html */ `
 			<div>
 				<div class="flex flex-wrap gap-2">
-					<ButtonStyled color="green">
-						<button @click="showSuccess">Install Complete</button>
-					</ButtonStyled>
-					<ButtonStyled color="red">
-						<button @click="showError">Download Failed</button>
-					</ButtonStyled>
-					<ButtonStyled color="orange">
-						<button @click="showWarning">Update Available (Permanent)</button>
-					</ButtonStyled>
-					<ButtonStyled color="blue">
-						<button @click="showInfo">Download Complete</button>
-					</ButtonStyled>
-					<ButtonStyled>
-						<button @click="showNoButtons">No Buttons</button>
-					</ButtonStyled>
-					<ButtonStyled>
-						<button @click="showPermanent">Permanent</button>
-					</ButtonStyled>
-					<ButtonStyled>
-						<button @click="showBlocking">Blocking</button>
-					</ButtonStyled>
-					<ButtonStyled>
-						<button @click="showWaitingProgress">Waiting Progress</button>
-					</ButtonStyled>
-					<ButtonStyled>
-						<button @click="showDeterminateProgress">Determinate Progress</button>
-					</ButtonStyled>
-					<ButtonStyled>
-						<button @click="showGroupedDownloads">Grouped Downloads</button>
-					</ButtonStyled>
-					<ButtonStyled>
-						<button @click="clearAll">Clear All</button>
-					</ButtonStyled>
+					<Button type="colored" color="green" @click="showSuccess">Install Complete</Button>
+					<Button type="colored" color="red" @click="showError">Download Failed</Button>
+					<Button type="colored" color="orange" @click="showWarning">Update Available (Permanent)</Button>
+					<Button type="colored" color="blue" @click="showInfo">Download Complete</Button>
+					<Button @click="showNoButtons">No Buttons</Button>
+					<Button @click="showPermanent">Permanent</Button>
+					<Button @click="showBlocking">Blocking</Button>
+					<Button @click="showWaitingProgress">Waiting Progress</Button>
+					<Button @click="showDeterminateProgress">Determinate Progress</Button>
+					<Button @click="showGroupedDownloads">Grouped Downloads</Button>
+					<Button @click="clearAll">Clear All</Button>
 				</div>
 				<PopupNotificationPanel />
 			</div>
diff --git a/packages/ui/src/stories/project/ProjectPageVersions.stories.ts b/packages/ui/src/stories/project/ProjectPageVersions.stories.ts
index ec35f531fb..2acf5ab2bc 100644
--- a/packages/ui/src/stories/project/ProjectPageVersions.stories.ts
+++ b/packages/ui/src/stories/project/ProjectPageVersions.stories.ts
@@ -3,7 +3,7 @@ import { DownloadIcon, MoreVerticalIcon } from '@modrinth/assets'
 import type { GameVersionTag, Version } from '@modrinth/utils'
 import type { Meta, StoryObj } from '@storybook/vue3-vite'
 
-import ButtonStyled from '../../components/base/ButtonStyled.vue'
+import { ButtonLink, IconButton } from '../../components/base/buttons'
 import ProjectPageVersions from '../../components/project/ProjectPageVersions.vue'
 
 type StoryVersion = Version & {
@@ -148,28 +148,24 @@ const meta = {
 		versionLink: (version: Version) => `https://modrinth.com/mod/sodium/version/${version.id}`,
 	},
 	render: (args) => ({
-		components: { ButtonStyled, DownloadIcon, MoreVerticalIcon, ProjectPageVersions },
+		components: { DownloadIcon, MoreVerticalIcon, ProjectPageVersions, ButtonLink, IconButton },
 		setup() {
 			return { args }
 		},
 		template: /* html */ `
 			<ProjectPageVersions v-bind="args">
 				<template #actions="{ version }">
-					<ButtonStyled circular type="transparent">
-						<a
+					<ButtonLink type="quiet"
 							v-tooltip="'Download'"
 							:href="version.files[0]?.url"
 							:download="version.files[0]?.filename"
 							aria-label="Download"
-						>
-							<DownloadIcon aria-hidden="true" />
-						</a>
-					</ButtonStyled>
-					<ButtonStyled circular type="transparent">
-						<button v-tooltip="'More options'" aria-label="More options">
-							<MoreVerticalIcon aria-hidden="true" />
-						</button>
-					</ButtonStyled>
+						 class="!w-9 !px-0 !rounded-full">
+						<DownloadIcon aria-hidden="true" />
+					</ButtonLink>
+					<IconButton type="quiet" label="More options" v-tooltip="'More options'" aria-label="More options">
+						<MoreVerticalIcon aria-hidden="true" />
+					</IconButton>
 				</template>
 			</ProjectPageVersions>
 		`,
diff --git a/packages/ui/src/stories/servers/CreationFlowModal.stories.ts b/packages/ui/src/stories/servers/CreationFlowModal.stories.ts
index a3007db595..4082fc134a 100644
--- a/packages/ui/src/stories/servers/CreationFlowModal.stories.ts
+++ b/packages/ui/src/stories/servers/CreationFlowModal.stories.ts
@@ -1,7 +1,7 @@
 import type { Meta, StoryObj } from '@storybook/vue3-vite'
 import { ref } from 'vue'
 
-import ButtonStyled from '../../components/base/ButtonStyled.vue'
+import { Button } from '../../components/base/buttons'
 import type { CreationFlowContextValue } from '../../components/flows/creation-flow-modal/creation-flow-context'
 import CreationFlowModal from '../../components/flows/creation-flow-modal/index.vue'
 
@@ -23,7 +23,7 @@ type Story = StoryObj<typeof meta>
 export const CreateWorld: Story = {
 	name: 'Create World (Hosting)',
 	render: () => ({
-		components: { CreationFlowModal, ButtonStyled },
+		components: { CreationFlowModal, Button },
 		setup() {
 			const modalRef = ref<InstanceType<typeof CreationFlowModal> | null>(null)
 			const lastEvent = ref('')
@@ -36,9 +36,7 @@ export const CreateWorld: Story = {
 		},
 		template: /*html*/ `
 			<div class="flex flex-col gap-4 items-center">
-				<ButtonStyled color="brand">
-					<button @click="openModal">Create World</button>
-				</ButtonStyled>
+				<Button type="colored" color="brand" @click="openModal">Create World</Button>
 				<p v-if="lastEvent" class="text-sm text-secondary mt-2">Last event: {{ lastEvent }}</p>
 				<CreationFlowModal
 					ref="modalRef"
@@ -60,7 +58,7 @@ export const CreateWorld: Story = {
 export const ServerOnboarding: Story = {
 	name: 'Server Setup (Legacy) (Hosting)',
 	render: () => ({
-		components: { CreationFlowModal, ButtonStyled },
+		components: { CreationFlowModal, Button },
 		setup() {
 			const modalRef = ref<InstanceType<typeof CreationFlowModal> | null>(null)
 			const lastEvent = ref('')
@@ -73,9 +71,7 @@ export const ServerOnboarding: Story = {
 		},
 		template: /*html*/ `
 			<div class="flex flex-col gap-4 items-center">
-				<ButtonStyled color="brand">
-					<button @click="openModal">Set Up Server</button>
-				</ButtonStyled>
+				<Button type="colored" color="brand" @click="openModal">Set Up Server</Button>
 				<p v-if="lastEvent" class="text-sm text-secondary mt-2">Last event: {{ lastEvent }}</p>
 				<CreationFlowModal
 					ref="modalRef"
@@ -97,7 +93,7 @@ export const ServerOnboarding: Story = {
 export const Instance: Story = {
 	name: 'Create Instance (App)',
 	render: () => ({
-		components: { CreationFlowModal, ButtonStyled },
+		components: { CreationFlowModal, Button },
 		setup() {
 			const modalRef = ref<InstanceType<typeof CreationFlowModal> | null>(null)
 			const lastEvent = ref('')
@@ -110,9 +106,7 @@ export const Instance: Story = {
 		},
 		template: /*html*/ `
 			<div class="flex flex-col gap-4 items-center">
-				<ButtonStyled color="brand">
-					<button @click="openModal">Create Instance</button>
-				</ButtonStyled>
+				<Button type="colored" color="brand" @click="openModal">Create Instance</Button>
 				<p v-if="lastEvent" class="text-sm text-secondary mt-2">Last event: {{ lastEvent }}</p>
 				<CreationFlowModal
 					ref="modalRef"
diff --git a/packages/ui/src/stories/servers/GrantAccessModal.stories.ts b/packages/ui/src/stories/servers/GrantAccessModal.stories.ts
index af99dfc773..997f10f8be 100644
--- a/packages/ui/src/stories/servers/GrantAccessModal.stories.ts
+++ b/packages/ui/src/stories/servers/GrantAccessModal.stories.ts
@@ -1,7 +1,7 @@
 import type { Meta, StoryObj } from '@storybook/vue3-vite'
 import { ref } from 'vue'
 
-import ButtonStyled from '../../components/base/ButtonStyled.vue'
+import { Button } from '../../components/base/buttons'
 import GrantAccessModal from '../../components/servers/access/GrantAccessModal.vue'
 import type {
 	GrantServerAccessPayload,
@@ -27,7 +27,7 @@ type Story = StoryObj<typeof meta>
 
 export const Default: Story = {
 	render: () => ({
-		components: { ButtonStyled, GrantAccessModal },
+		components: { GrantAccessModal, Button },
 		setup() {
 			const modalRef = ref<InstanceType<typeof GrantAccessModal> | null>(null)
 			const lastAddedUser = ref('')
@@ -49,9 +49,7 @@ export const Default: Story = {
 		},
 		template: /* html */ `
 			<div class="flex flex-col items-center gap-4">
-				<ButtonStyled color="brand">
-					<button @click="modalRef?.show($event)">Add user</button>
-				</ButtonStyled>
+				<Button type="colored" color="brand" @click="modalRef?.show($event)">Add user</Button>
 				<p v-if="lastAddedUser" class="m-0 text-sm text-secondary">Last added: {{ lastAddedUser }}</p>
 				<GrantAccessModal ref="modalRef" :search-users="searchUsers" @grant="handleGrant" />
 			</div>
@@ -61,7 +59,7 @@ export const Default: Story = {
 
 export const ExistingMember: Story = {
 	render: () => ({
-		components: { ButtonStyled, GrantAccessModal },
+		components: { GrantAccessModal, Button },
 		setup() {
 			const modalRef = ref<InstanceType<typeof GrantAccessModal> | null>(null)
 			const users = [
@@ -88,9 +86,7 @@ export const ExistingMember: Story = {
 		},
 		template: /* html */ `
 			<div class="flex flex-col items-center gap-4">
-				<ButtonStyled color="brand">
-					<button @click="modalRef?.show($event)">Add existing user</button>
-				</ButtonStyled>
+				<Button type="colored" color="brand" @click="modalRef?.show($event)">Add existing user</Button>
 				<GrantAccessModal ref="modalRef" :members="members" :search-users="searchUsers" />
 			</div>
 		`,
diff --git a/packages/ui/src/stories/servers/RemoveAccessModal.stories.ts b/packages/ui/src/stories/servers/RemoveAccessModal.stories.ts
index 6b81a8495d..ee0834ac09 100644
--- a/packages/ui/src/stories/servers/RemoveAccessModal.stories.ts
+++ b/packages/ui/src/stories/servers/RemoveAccessModal.stories.ts
@@ -1,7 +1,7 @@
 import type { Meta, StoryObj } from '@storybook/vue3-vite'
 import { ref } from 'vue'
 
-import ButtonStyled from '../../components/base/ButtonStyled.vue'
+import { Button } from '../../components/base/buttons'
 import RemoveAccessModal from '../../components/servers/access/RemoveAccessModal.vue'
 
 const meta = {
@@ -17,7 +17,7 @@ type Story = StoryObj<typeof meta>
 
 export const Default: Story = {
 	render: () => ({
-		components: { ButtonStyled, RemoveAccessModal },
+		components: { RemoveAccessModal, Button },
 		setup() {
 			const modalRef = ref<InstanceType<typeof RemoveAccessModal> | null>(null)
 			const removed = ref(false)
@@ -28,9 +28,7 @@ export const Default: Story = {
 		},
 		template: /* html */ `
 			<div class="flex flex-col items-center gap-4">
-				<ButtonStyled color="red">
-					<button @click="modalRef?.show()">Remove user</button>
-				</ButtonStyled>
+				<Button type="colored" color="red" @click="modalRef?.show()">Remove user</Button>
 				<p v-if="removed" class="m-0 text-sm text-secondary">User removed</p>
 				<RemoveAccessModal
 					ref="modalRef"
@@ -46,7 +44,7 @@ export const Default: Story = {
 
 export const CancelInvite: Story = {
 	render: () => ({
-		components: { ButtonStyled, RemoveAccessModal },
+		components: { RemoveAccessModal, Button },
 		setup() {
 			const modalRef = ref<InstanceType<typeof RemoveAccessModal> | null>(null)
 			const cancelled = ref(false)
@@ -57,9 +55,7 @@ export const CancelInvite: Story = {
 		},
 		template: /* html */ `
 			<div class="flex flex-col items-center gap-4">
-				<ButtonStyled color="red">
-					<button @click="modalRef?.show()">Cancel invite</button>
-				</ButtonStyled>
+				<Button type="colored" color="red" @click="modalRef?.show()">Cancel invite</Button>
 				<p v-if="cancelled" class="m-0 text-sm text-secondary">Invite cancelled</p>
 				<RemoveAccessModal
 					ref="modalRef"
diff --git a/packages/ui/src/stories/servers/ServerPanelAdmonitionCopyDraft.stories.ts b/packages/ui/src/stories/servers/ServerPanelAdmonitionCopyDraft.stories.ts
index 6ec76ee2c2..af8f324669 100644
--- a/packages/ui/src/stories/servers/ServerPanelAdmonitionCopyDraft.stories.ts
+++ b/packages/ui/src/stories/servers/ServerPanelAdmonitionCopyDraft.stories.ts
@@ -2,7 +2,7 @@ import { RotateCounterClockwiseIcon } from '@modrinth/assets'
 import type { Meta, StoryObj } from '@storybook/vue3-vite'
 
 import Admonition from '../../components/base/Admonition.vue'
-import ButtonStyled from '../../components/base/ButtonStyled.vue'
+import { Button } from '../../components/base/buttons'
 
 type AdmonitionType = 'info' | 'warning' | 'critical' | 'success'
 type ActionType = 'Cancel' | 'Retry' | 'Dismiss'
@@ -191,7 +191,7 @@ const sections: CopySection[] = [
 
 export const AllCopy: Story = {
 	render: () => ({
-		components: { Admonition, ButtonStyled, RotateCounterClockwiseIcon },
+		components: { Admonition, RotateCounterClockwiseIcon, Button },
 		setup() {
 			return { sections }
 		},
@@ -221,19 +221,11 @@ export const AllCopy: Story = {
 									"
 									#top-right-actions
 								>
-									<ButtonStyled v-if="item.action === 'Cancel'" type="outlined" color="blue">
-										<button class="!border" type="button">Cancel</button>
-									</ButtonStyled>
-									<ButtonStyled
-										v-else
-										type="outlined"
-										color="red"
-									>
-										<button class="!border" type="button">
-											<RotateCounterClockwiseIcon class="size-5" />
-											Retry
-										</button>
-									</ButtonStyled>
+									<Button type="outlined" v-if="item.action === 'Cancel'" class="!border !text-blue [&>svg]:!text-blue !shadow-[inset_0_0_0_1px_var(--color-blue)]" native-type="button">Cancel</Button>
+									<Button type="outlined" v-else class="!border !text-red [&>svg]:!text-red !shadow-[inset_0_0_0_1px_var(--color-red)]" native-type="button">
+										<RotateCounterClockwiseIcon class="size-5" />
+										Retry
+									</Button>
 								</template>
 							</Admonition>
 						</div>
@@ -246,7 +238,7 @@ export const AllCopy: Story = {
 
 export const TitleTreatmentExperiment: Story = {
 	render: () => ({
-		components: { Admonition, ButtonStyled, RotateCounterClockwiseIcon },
+		components: { Admonition, RotateCounterClockwiseIcon, Button },
 		template: /* html */ `
 			<div style="max-width: 840px;">
 				<Admonition
@@ -256,12 +248,10 @@ export const TitleTreatmentExperiment: Story = {
 				>
 					Something went wrong while creating World backup. Please try again or contact support if the issue continues.
 					<template #top-right-actions>
-						<ButtonStyled type="outlined" color="red">
-							<button class="!border" type="button">
-								<RotateCounterClockwiseIcon class="size-5" />
-								Retry
-							</button>
-						</ButtonStyled>
+						<Button type="outlined" class="!border !text-red [&>svg]:!text-red !shadow-[inset_0_0_0_1px_var(--color-red)]" native-type="button">
+							<RotateCounterClockwiseIcon class="size-5" />
+							Retry
+						</Button>
 					</template>
 				</Admonition>
 			</div>
diff --git a/packages/ui/src/stories/sharing/InvitePlayersModal.stories.ts b/packages/ui/src/stories/sharing/InvitePlayersModal.stories.ts
index ec69a691fa..f454d75cf9 100644
--- a/packages/ui/src/stories/sharing/InvitePlayersModal.stories.ts
+++ b/packages/ui/src/stories/sharing/InvitePlayersModal.stories.ts
@@ -2,7 +2,7 @@ import type { Labrinth } from '@modrinth/api-client'
 import type { Meta, StoryObj } from '@storybook/vue3-vite'
 import { ref } from 'vue'
 
-import ButtonStyled from '../../components/base/ButtonStyled.vue'
+import { Button } from '../../components/base/buttons'
 import InvitePlayersModal from '../../components/sharing/invite-players-modal/index.vue'
 import type {
 	InviteLinkSettings,
@@ -98,7 +98,7 @@ function createSearchUsers() {
 
 function createRender(args: Record<string, unknown>) {
 	return {
-		components: { ButtonStyled, InvitePlayersModal },
+		components: { InvitePlayersModal, Button },
 		setup() {
 			const modalRef = ref<InstanceType<typeof InvitePlayersModal> | null>(null)
 			const friends = ref<InvitePlayersUser[]>(createFriends())
@@ -166,9 +166,7 @@ function createRender(args: Record<string, unknown>) {
 		},
 		template: /* html */ `
 			<div class="flex flex-col items-center gap-4">
-				<ButtonStyled color="brand">
-					<button @click="modalRef?.show($event)">Open modal</button>
-				</ButtonStyled>
+				<Button type="colored" color="brand" @click="modalRef?.show($event)">Open modal</Button>
 				<p v-if="lastAction" class="m-0 text-sm text-secondary">{{ lastAction }}</p>
 				<InvitePlayersModal
 					ref="modalRef"
diff --git a/packages/ui/src/stories/skin/SkinButton.stories.ts b/packages/ui/src/stories/skin/SkinButton.stories.ts
index 53b71b6204..1a7dfe817a 100644
--- a/packages/ui/src/stories/skin/SkinButton.stories.ts
+++ b/packages/ui/src/stories/skin/SkinButton.stories.ts
@@ -1,7 +1,7 @@
 import { EditIcon, TrashIcon } from '@modrinth/assets'
 import type { Meta, StoryObj } from '@storybook/vue3-vite'
 
-import ButtonStyled from '../../components/base/ButtonStyled.vue'
+import { Button, IconButton } from '../../components/base/buttons'
 import SkinButton from '../../components/skin/SkinButton.vue'
 
 const frontImage = `data:image/svg+xml,${encodeURIComponent(`
@@ -62,7 +62,7 @@ export const ActiveUnselected: Story = {
 
 export const WithActions: Story = {
 	render: (args) => ({
-		components: { ButtonStyled, EditIcon, SkinButton, TrashIcon },
+		components: { EditIcon, SkinButton, TrashIcon, Button, IconButton },
 		setup() {
 			return { args }
 		},
@@ -70,16 +70,12 @@ export const WithActions: Story = {
 			<div class="w-[156px]">
 				<SkinButton v-bind="args">
 					<template #overlay-buttons>
-						<ButtonStyled color="brand">
-							<button class="pointer-events-auto">
-								<EditIcon /> Edit
-							</button>
-						</ButtonStyled>
-						<ButtonStyled circular color="red">
-							<button class="pointer-events-auto" aria-label="Delete skin">
-								<TrashIcon />
-							</button>
-						</ButtonStyled>
+						<Button type="colored" color="brand" class="pointer-events-auto">
+							<EditIcon /> Edit
+						</Button>
+						<IconButton type="colored" color="red" label="Delete skin" class="pointer-events-auto">
+							<TrashIcon />
+						</IconButton>
 					</template>
 				</SkinButton>
 			</div>
diff --git a/packages/ui/src/utils/index.ts b/packages/ui/src/utils/index.ts
index 541b999cf9..6aeb20c1a9 100644
--- a/packages/ui/src/utils/index.ts
+++ b/packages/ui/src/utils/index.ts
@@ -12,6 +12,7 @@ export * from './server-content-installing'
 export * from './server-search'
 export * from './tag-messages'
 export * from './truncate'
+export * from './use-anchored-teleport'
 export * from './version-compatibility'
 export * from './vue-children'
 export * from './webgl/skin-rendering'
diff --git a/packages/ui/src/utils/use-anchored-teleport.ts b/packages/ui/src/utils/use-anchored-teleport.ts
new file mode 100644
index 0000000000..453de58fb6
--- /dev/null
+++ b/packages/ui/src/utils/use-anchored-teleport.ts
@@ -0,0 +1,162 @@
+import type { CSSProperties, Ref } from 'vue'
+import { nextTick, onUnmounted, ref, watch } from 'vue'
+
+export type AnchoredTeleportPlacement =
+	| 'bottom-start'
+	| 'bottom-end'
+	| 'top-start'
+	| 'top-end'
+	| 'right-start'
+	| 'right-end'
+	| 'left-start'
+	| 'left-end'
+export type AnchoredTeleportSide = 'top' | 'right' | 'bottom' | 'left'
+
+const viewportPadding = 8
+const anchorPadding = 18
+const defaultDistance = ref(8)
+
+export function useAnchoredTeleport(
+	trigger: Readonly<Ref<HTMLElement | null>>,
+	panel: Readonly<Ref<HTMLElement | null>>,
+	placement: Readonly<Ref<AnchoredTeleportPlacement>>,
+	distance: Readonly<Ref<number>> = defaultDistance,
+) {
+	const isOpen = ref(false)
+	const panelStyle = ref<CSSProperties>({
+		top: '0px',
+		left: '0px',
+		visibility: 'hidden',
+	})
+	const anchorStyle = ref<CSSProperties>({})
+	const resolvedSide = ref<AnchoredTeleportSide>('bottom')
+
+	let resizeObserver: ResizeObserver | undefined
+
+	function updatePosition() {
+		if (!isOpen.value || !trigger.value || !panel.value) return
+
+		const triggerRect = trigger.value.getBoundingClientRect()
+		const panelRect = panel.value.getBoundingClientRect()
+		const offset = distance.value
+		const alignsEnd = placement.value.endsWith('end')
+		const isHorizontal = placement.value.startsWith('right') || placement.value.startsWith('left')
+		let idealTop: number
+		let idealLeft: number
+
+		if (isHorizontal) {
+			const prefersRight = placement.value.startsWith('right')
+			const spaceRight = window.innerWidth - triggerRect.right - viewportPadding
+			const spaceLeft = triggerRect.left - viewportPadding
+			const opensRight = prefersRight
+				? panelRect.width + offset <= spaceRight || spaceRight > spaceLeft
+				: panelRect.width + offset > spaceLeft && spaceRight > spaceLeft
+
+			resolvedSide.value = opensRight ? 'right' : 'left'
+			idealTop = alignsEnd ? triggerRect.bottom - panelRect.height : triggerRect.top
+			idealLeft = opensRight
+				? triggerRect.right + offset
+				: triggerRect.left - panelRect.width - offset
+		} else {
+			const prefersTop = placement.value.startsWith('top')
+			const spaceBelow = window.innerHeight - triggerRect.bottom - viewportPadding
+			const spaceAbove = triggerRect.top - viewportPadding
+			const opensAbove = prefersTop
+				? panelRect.height + offset <= spaceAbove || spaceAbove > spaceBelow
+				: panelRect.height + offset > spaceBelow && spaceAbove > spaceBelow
+
+			resolvedSide.value = opensAbove ? 'top' : 'bottom'
+			idealTop = opensAbove
+				? triggerRect.top - panelRect.height - offset
+				: triggerRect.bottom + offset
+			idealLeft = alignsEnd ? triggerRect.right - panelRect.width : triggerRect.left
+		}
+
+		const maxTop = Math.max(
+			viewportPadding,
+			window.innerHeight - panelRect.height - viewportPadding,
+		)
+		const maxLeft = Math.max(viewportPadding, window.innerWidth - panelRect.width - viewportPadding)
+		const panelTop = Math.min(Math.max(idealTop, viewportPadding), maxTop)
+		const panelLeft = Math.min(Math.max(idealLeft, viewportPadding), maxLeft)
+
+		panelStyle.value = {
+			top: `${panelTop}px`,
+			left: `${panelLeft}px`,
+			visibility: 'visible',
+		}
+		anchorStyle.value = isHorizontal
+			? {
+					top: `${Math.min(
+						Math.max(triggerRect.top + triggerRect.height / 2 - panelTop, anchorPadding),
+						Math.max(anchorPadding, panelRect.height - anchorPadding),
+					)}px`,
+				}
+			: {
+					left: `${Math.min(
+						Math.max(triggerRect.left + triggerRect.width / 2 - panelLeft, anchorPadding),
+						Math.max(anchorPadding, panelRect.width - anchorPadding),
+					)}px`,
+				}
+	}
+
+	function handlePointerDown(event: PointerEvent) {
+		const target = event.target as Node | null
+		if (!target || trigger.value?.contains(target) || panel.value?.contains(target)) return
+		close()
+	}
+
+	function addListeners() {
+		document.addEventListener('pointerdown', handlePointerDown)
+		window.addEventListener('resize', updatePosition)
+		window.addEventListener('scroll', updatePosition, true)
+
+		resizeObserver = new ResizeObserver(updatePosition)
+		if (trigger.value) resizeObserver.observe(trigger.value)
+		if (panel.value) resizeObserver.observe(panel.value)
+	}
+
+	function removeListeners() {
+		document.removeEventListener('pointerdown', handlePointerDown)
+		window.removeEventListener('resize', updatePosition)
+		window.removeEventListener('scroll', updatePosition, true)
+		resizeObserver?.disconnect()
+		resizeObserver = undefined
+	}
+
+	async function open() {
+		if (isOpen.value) return
+		panelStyle.value = { top: '0px', left: '0px', visibility: 'hidden' }
+		isOpen.value = true
+		await nextTick()
+		updatePosition()
+		addListeners()
+	}
+
+	function close(restoreFocus = false) {
+		if (!isOpen.value) return
+		isOpen.value = false
+		removeListeners()
+		if (restoreFocus) nextTick(() => trigger.value?.focus())
+	}
+
+	watch([placement, distance], updatePosition)
+	watch(panel, () => {
+		if (!isOpen.value) return
+		resizeObserver?.disconnect()
+		if (trigger.value) resizeObserver?.observe(trigger.value)
+		if (panel.value) resizeObserver?.observe(panel.value)
+		updatePosition()
+	})
+
+	onUnmounted(removeListeners)
+
+	return {
+		isOpen,
+		panelStyle,
+		anchorStyle,
+		resolvedSide,
+		open,
+		close,
+	}
+}
diff --git a/standards/README.md b/standards/README.md
index aee6553cc1..080ed1953c 100644
--- a/standards/README.md
+++ b/standards/README.md
@@ -2,4 +2,4 @@
 
 This folder contains technical standards and documentation we use to develop Modrinth. The majority of this has been migrated from our internal documentation.
 
-For contributing guidelines, please refer to [docs.modrinth.com](https://docs.modrinth.com/contributing/getting-started/) — these documents are more for technical reference, not a guide on making pull requests, features, etc.
+For contributing guidelines, please refer to [docs.modrinth.com](https://docs.modrinth.com/contributing/getting-started/) - these documents are more for technical reference, not a guide on making pull requests, features, etc.
diff --git a/standards/frontend/BUTTONS.md b/standards/frontend/BUTTONS.md
new file mode 100644
index 0000000000..b1f71db07c
--- /dev/null
+++ b/standards/frontend/BUTTONS.md
@@ -0,0 +1,375 @@
+# Buttons
+
+Use the button components in `packages/ui/src/components/base/buttons/` for actions,
+navigation, file selection, and button-owned menus. They share the same sizing,
+interaction states, focus treatment, and visual variants.
+
+Do not recreate button styling with raw `<button>` or `<a>` elements. A raw element is
+appropriate only when an interaction has semantics or behaviour that the shared
+components cannot represent.
+
+`ButtonFrame` is an internal styling primitive. Use one of the public components instead
+of importing it directly.
+
+## Choosing a component
+
+| Component                  | Use                                                                                 |
+| -------------------------- | ----------------------------------------------------------------------------------- |
+| `Button`                   | An action, including form submission                                                 |
+| `ButtonLink`               | Navigation to an internal route or external URL                                      |
+| `IconButton`               | An icon-only action                                                                  |
+| `FileButton`               | Opening a file picker, with optional drag-and-drop support                           |
+| `ButtonGroup`              | Visually joining related buttons                                                     |
+| `SplitButton`              | A primary action with an attached overflow menu                                      |
+| `TeleportOverflowMenu`     | An icon button that opens a menu of actions and links                                |
+| `TeleportPopoutMenu`       | A button or icon button that opens an arbitrary panel                                |
+
+Use the component that matches the interaction's semantics. Do not use a click handler
+on `ButtonLink` for an action, and do not perform navigation from a `Button`.
+
+Import public button components from `@modrinth/ui`. Inside `packages/ui`, use the
+corresponding `#ui/components/base/buttons/*` path:
+
+```ts
+import { Button, ButtonLink, IconButton } from '@modrinth/ui'
+```
+
+## Basic usage
+
+Use `Button` for actions. Its native type defaults to `button`, so set
+`native-type="submit"` explicitly when it submits a form.
+
+```vue
+<Button type="colored" @click="save">
+	<SaveIcon aria-hidden="true" />
+	Save changes
+</Button>
+
+<Button native-type="submit" :loading="saveMutation.isPending.value">
+	Save
+</Button>
+```
+
+Use `ButtonLink` for navigation. Pass exactly one of `to` or `href`:
+
+```vue
+<ButtonLink to="/settings">Settings</ButtonLink>
+
+<ButtonLink href="https://example.com" target="_blank" type="outlined">
+	Documentation
+	<ExternalIcon aria-hidden="true" />
+</ButtonLink>
+```
+
+`to` creates a Vue Router link. `href` creates a standard anchor. External links opened
+in a new tab receive `rel="noopener noreferrer"` unless a different `rel` is provided.
+
+Use `IconButton` when the visible icon is the entire button content. The `label` prop is
+required and supplies the button's accessible name:
+
+```vue
+<IconButton label="Open settings" type="quiet" @click="openSettings">
+	<SettingsIcon aria-hidden="true" />
+</IconButton>
+```
+
+Do not replace `label` with a tooltip or rely on the icon to communicate the action.
+User-visible labels, including `IconButton` labels and menu option labels, must use the
+localization system.
+
+## Visual types
+
+All button components use the same four visual types:
+
+| Type       | Use                                                                 |
+| ---------- | ------------------------------------------------------------------- |
+| `base`     | Default neutral actions                                             |
+| `colored`  | The highest-emphasis action in a section                            |
+| `outlined` | Secondary actions that need a visible boundary                      |
+| `quiet`    | Low-emphasis actions in toolbars, cards, and other compact contexts |
+
+`base` is the default. Use `colored` deliberately: a group should normally have only one
+highest-emphasis action.
+
+The available colors are `brand`, `red`, `orange`, `green`, `blue`, `purple`, and
+`medal_promotion`. Color is supported by `colored`, `outlined`, and `quiet`; `base` uses
+its standard neutral treatment. An outlined button without a color uses the standard
+neutral treatment.
+
+```vue
+<Button type="colored" color="brand">Create project</Button>
+<Button type="colored" color="red">Delete project</Button>
+<Button type="outlined">Cancel</Button>
+<Button type="outlined" color="blue">View analytics</Button>
+<Button type="quiet" color="red">Remove</Button>
+```
+
+Quiet buttons support an `interaction` prop when their hover and keyboard-focus
+treatment needs to differ from the default surface fill:
+
+| Interaction | Treatment |
+| ----------- | --------- |
+| `surface` | Uses the standard neutral hover/focus surface. This is the default. |
+| `filled` | Fills with the button's `color` and uses contrast text. |
+| `none` | Keeps the background transparent while retaining the focus ring. |
+
+```vue
+<Button type="quiet" color="brand" interaction="filled">Current page</Button>
+<IconButton type="quiet" interaction="none" label="Open account menu">
+	<AvatarIcon aria-hidden="true" />
+</IconButton>
+```
+
+Use `interaction` to describe behavior rather than passing arbitrary hover colors.
+Resting selected-state backgrounds, such as a current pagination page, remain the
+responsibility of the owning component.
+
+Use red only for destructive or dangerous actions. Do not use color as the only way to
+communicate an action's meaning.
+
+## Sizes
+
+- `sm`: Notifications and popups, usually for icon-only actions.
+- `md`: Modal and card actions that do not appear at the top of a page.
+- `lg`: Actions at the top of a page or subpage, such as beside inputs or filters.
+- `xl`: Header actions.
+
+`md` is the default. Buttons that appear together must use the same size.
+
+Prefer the size prop over overriding height, padding, border radius, font weight, gap, or
+icon dimensions with utility classes. Width and layout utilities such as `w-full` are
+fine when required by the surrounding layout.
+
+```vue
+<Button size="sm">Compact action</Button>
+<Button>Default action</Button>
+<Button size="lg">Prominent action</Button>
+<Button size="xl">Large action</Button>
+```
+
+## States
+
+Use `disabled` when an action is unavailable. Use `loading` while a `Button` or
+`IconButton` action is in progress:
+
+```vue
+<Button
+	type="colored"
+	:loading="createMutation.isPending.value"
+	@click="createMutation.mutate()"
+>
+	Create
+</Button>
+```
+
+`loading` disables the underlying button and sets `aria-busy`. Keep the label stable so
+the action remains understandable while it is running.
+
+Disabled links are made non-navigable and removed from the tab order by `ButtonLink`.
+Do not reimplement disabled-link click handling in consumers.
+
+## Icons and content
+
+Place icons directly inside the component so the shared styles can size and space them:
+
+```vue
+<Button>
+	<DownloadIcon aria-hidden="true" />
+	Download
+</Button>
+
+<Button>
+	Continue
+	<RightArrowIcon aria-hidden="true" />
+</Button>
+```
+
+Icons next to a visible label are decorative and should use `aria-hidden="true"`. Use
+`IconButton` instead of an empty text button for icon-only actions.
+
+Button labels should describe the action directly. Avoid vague labels such as "Yes",
+"OK", or "Submit" when a specific label such as "Delete version" or "Save settings"
+would be clearer.
+
+## File buttons
+
+`FileButton` owns the file input and emits validated files:
+
+```vue
+<FileButton
+	prompt="Select images"
+	accept="image/*"
+	:max-size="MAX_IMAGE_SIZE"
+	multiple
+	@change="handleFiles"
+>
+	<UploadIcon aria-hidden="true" />
+</FileButton>
+```
+
+The `change` event receives a `File[]`. `allow-drop` defaults to `true`; set it to
+`false` when the surrounding interface should not accept dropped files.
+
+Use `FileButton` for a compact file-selection action. Use a dedicated drop area when
+drag-and-drop is the primary interaction or the interface needs previews, progress, or
+more detailed instructions.
+
+## Button groups and split buttons
+
+Use `ButtonGroup` only for closely related controls. Pass a localized `label` when the
+relationship is not already clear from surrounding accessible content:
+
+```vue
+<ButtonGroup label="Pagination">
+	<Button type="outlined">Previous</Button>
+	<Button type="outlined">Next</Button>
+</ButtonGroup>
+```
+
+`ButtonGroup` joins the buttons visually, so its direct children must be components from
+this button system.
+
+Use `SplitButton` when one action is primary and closely related alternatives belong in
+an attached menu:
+
+```vue
+<script setup lang="ts">
+import { PlayIcon, SettingsIcon, TrashIcon } from '@modrinth/assets'
+import type { OverflowMenuOption } from '@modrinth/ui/src/components/base/buttons/types'
+
+const options: OverflowMenuOption[] = [
+	{
+		id: 'settings',
+		label: 'Server settings',
+		icon: SettingsIcon,
+		action: openSettings,
+	},
+	{ type: 'divider' },
+	{
+		id: 'delete',
+		label: 'Delete server',
+		icon: TrashIcon,
+		tone: 'red',
+		action: deleteServer,
+	},
+]
+</script>
+
+<template>
+	<SplitButton
+		menu-label="More server actions"
+		group-label="Server actions"
+		type="colored"
+		:options="options"
+		@click="startServer"
+	>
+		<PlayIcon aria-hidden="true" />
+		Start server
+	</SplitButton>
+</template>
+```
+
+Use `primary-disabled` and `menu-disabled` when only one side is unavailable. Use
+`disabled` when the entire split button is unavailable.
+
+## Overflow menus
+
+`TeleportOverflowMenu` is for a menu of discrete actions and navigation targets. Define
+its options as `OverflowMenuOption[]`:
+
+```ts
+const options: OverflowMenuOption[] = [
+	{
+		id: 'download',
+		label: 'Download',
+		icon: DownloadIcon,
+		action: download,
+	},
+	{
+		id: 'project-page',
+		label: 'Open project page',
+		icon: ExternalIcon,
+		type: 'link',
+		to: projectRoute,
+	},
+	{ type: 'divider' },
+	{
+		id: 'delete',
+		label: 'Delete',
+		icon: TrashIcon,
+		tone: 'red',
+		action: remove,
+	},
+]
+```
+
+Each non-divider option needs a stable, unique `id` and a localized `label`.
+
+The trigger is an `IconButton` by default. Set `icon-only="false"` when the trigger has
+visible text or composite content, such as an avatar and chevron; it will use a normal
+`Button` so intrinsic width, padding, and gaps are preserved.
+
+- Use an action option for behaviour and a link option for navigation.
+- Use `shown: false` to remove an option conditionally.
+- Use `disabled` with a `tooltip` when the user needs to understand why an option is
+  unavailable.
+- Use `remainOpen` only when selecting the option should not dismiss the menu.
+- Use `tone` for semantically colored options. The available tones are `brand`, `red`,
+  `orange`, `green`, `blue`, `purple`, and `medal_promotion`.
+- Use `hoverFilled: true` when a toned option should fill with its tone on hover and
+  focus. Use `hoverFilledOnly: true` to keep the default text color until that state.
+- Use `tone: 'red'` for destructive options.
+- Use dividers sparingly to separate meaningful groups.
+
+The component implements menu keyboard navigation, focus management, typeahead, and
+Escape handling. Consumers should not add competing keyboard or focus behaviour.
+
+Set `hoverable` when a navigation menu should also open on pointer hover. Click, touch,
+and keyboard activation remain available.
+
+## Popout menus
+
+Use `TeleportPopoutMenu` for arbitrary interactive content that belongs to a button,
+such as a compact settings panel. Use `TeleportOverflowMenu` instead when the content is
+only a list of actions or links.
+
+```vue
+<TeleportPopoutMenu label="Configure versions" placement="bottom-start">
+	<template #trigger>
+		<SettingsIcon aria-hidden="true" />
+		Configure
+	</template>
+
+	<template #panel="{ close }">
+		<div class="flex w-72 flex-col gap-4">
+			<StyledInput v-model="versionName" label="Version name" />
+			<Button type="colored" @click="close()">Apply</Button>
+		</div>
+	</template>
+</TeleportPopoutMenu>
+```
+
+Set `icon-only` when the trigger has no visible text; `label` then becomes the trigger's
+accessible name. The panel role defaults to `dialog`; use `panel-role="region"` only
+when the content is non-modal supplementary content.
+
+The panel slot receives `close`, and the component manages initial focus, Escape, and
+focus restoration.
+
+## Legacy components
+
+Do not introduce new uses of the legacy `packages/ui/src/components/base/Button.vue` or
+`ButtonStyled.vue` APIs. When migrating:
+
+| Legacy pattern                  | Replacement                                  |
+| ------------------------------- | -------------------------------------------- |
+| `link` / `external`             | `ButtonLink` with `to`, `href`, and `target` |
+| `action`                        | `@click` on `Button`                         |
+| `icon-only`                     | `IconButton` with `label`                    |
+| `large`                         | `size="lg"` or `size="xl"`                   |
+| `outline`                       | `type="outlined"`                            |
+| `transparent`                   | `type="quiet"`                               |
+| `ButtonStyled` wrapping an element | The matching direct button component      |
+
+Preserve the original element's semantics while migrating. A visual match is not enough
+if a link becomes a button or an icon-only action loses its accessible name.
diff --git a/standards/frontend/MODALS.md b/standards/frontend/MODALS.md
index bfedfc0141..7e5ec2bd4b 100644
--- a/standards/frontend/MODALS.md
+++ b/standards/frontend/MODALS.md
@@ -104,12 +104,8 @@ Renders a bottom action bar below the content area (with `p-4 pt-0` padding). Us
 <NewModal ref="modal" header="Delete Item" fade="danger">
 	<p>This action cannot be undone.</p>
 	<template #actions>
-		<ButtonStyled color="danger">
-			<button @click="handleDelete">Delete</button>
-		</ButtonStyled>
-		<ButtonStyled>
-			<button @click="modal?.hide()">Cancel</button>
-		</ButtonStyled>
+		<Button type="colored" color="red" @click="handleDelete">Delete</Button>
+		<Button @click="modal?.hide()">Cancel</Button>
 	</template>
 </NewModal>
 ```
@@ -274,7 +270,7 @@ export const detailsStageConfig: StageConfigInput<MyModalContext> = {
 | `label`        | Button text             |
 | `icon`         | Icon component          |
 | `iconPosition` | `'before'` or `'after'` |
-| `color`        | ButtonStyled color prop |
+| `color`        | Button color prop       |
 | `disabled`     | Disable the button      |
 | `onClick`      | Click handler           |
 

From 3487523f74f70e70c9430f107bd48d515f785324 Mon Sep 17 00:00:00 2001
From: LarpinWBD <invest_trade_crypto@protonmail.com>
Date: Tue, 4 Aug 2026 17:12:57 -0400
Subject: [PATCH 25/82] fix: version tags toggling every supported version and
 freezing the page (#6967)

Fixes #6601.

Clicking any game version tag on the versions tab passed the release's
entire game_versions array to toggleFilters, so clicking 26.x (or even a
single version tag) selected every version the release supports. On
projects supporting many versions this also froze the page for seconds:
toggleFilters awaited a needlessly-async toggleFilter per version, which
let Vue flush a full re-render between every iteration (~90 flushes on
the reported project).

- formatVersionsForDisplay's grouping now also returns the member
  versions per displayed range (getVersionGroupsForDisplay), so version
  tags toggle exactly the versions they represent
- toggleFilters applies the whole batch synchronously in one update, and
  selects the missing versions unless all are already selected (instead
  of blindly inverting each one)

Co-authored-by: Claude <noreply@anthropic.com>
---
 .../project/ProjectPageVersions.vue           | 57 ++++++++------
 .../version/VersionFilterControl.vue          | 46 ++++++------
 packages/utils/projects.ts                    | 74 ++++++++++++-------
 3 files changed, 110 insertions(+), 67 deletions(-)

diff --git a/packages/ui/src/components/project/ProjectPageVersions.vue b/packages/ui/src/components/project/ProjectPageVersions.vue
index 0dfffebdba..82674f07d0 100644
--- a/packages/ui/src/components/project/ProjectPageVersions.vue
+++ b/packages/ui/src/components/project/ProjectPageVersions.vue
@@ -120,14 +120,17 @@
 		<template #cell-gameVersions="{ row: version }">
 			<div class="flex min-w-0 w-full max-w-[12rem] flex-wrap gap-1">
 				<TagItem
-					v-for="gameVersion in getDisplayGameVersions(version).slice(0, MAX_GAME_VERSION_TAGS)"
-					:key="`version-tag-${gameVersion}`"
-					v-tooltip="getFilterTooltip(gameVersion)"
+					v-for="gameVersionGroup in getDisplayGameVersions(version).slice(
+						0,
+						MAX_GAME_VERSION_TAGS,
+					)"
+					:key="`version-tag-${gameVersionGroup.label}`"
+					v-tooltip="getFilterTooltip(gameVersionGroup.label)"
 					data-no-row-click
 					class="w-fit max-w-full truncate"
-					:action="() => versionFilters?.toggleFilters('gameVersion', version.game_versions)"
+					:action="() => versionFilters?.toggleFilters('gameVersion', gameVersionGroup.versions)"
 				>
-					<span class="min-w-0 truncate">{{ gameVersion }}</span>
+					<span class="min-w-0 truncate">{{ gameVersionGroup.label }}</span>
 				</TagItem>
 				<Menu
 					v-if="getDisplayGameVersions(version).length > MAX_GAME_VERSION_TAGS"
@@ -144,12 +147,16 @@
 					<template #popper>
 						<div class="flex max-w-[20rem] flex-wrap gap-1">
 							<TagItem
-								v-for="gameVersion in getDisplayGameVersions(version).slice(MAX_GAME_VERSION_TAGS)"
-								:key="`overflow-version-tag-${gameVersion}`"
+								v-for="gameVersionGroup in getDisplayGameVersions(version).slice(
+									MAX_GAME_VERSION_TAGS,
+								)"
+								:key="`overflow-version-tag-${gameVersionGroup.label}`"
 								class="w-fit max-w-full truncate"
-								:action="() => versionFilters?.toggleFilters('gameVersion', version.game_versions)"
+								:action="
+									() => versionFilters?.toggleFilters('gameVersion', gameVersionGroup.versions)
+								"
 							>
-								<span class="min-w-0 truncate">{{ gameVersion }}</span>
+								<span class="min-w-0 truncate">{{ gameVersionGroup.label }}</span>
 							</TagItem>
 						</div>
 					</template>
@@ -316,16 +323,18 @@
 					<div class="flex flex-col justify-center gap-3">
 						<div class="flex flex-row flex-wrap items-center gap-1.5">
 							<TagItem
-								v-for="gameVersion in getDisplayGameVersions(version).slice(
+								v-for="gameVersionGroup in getDisplayGameVersions(version).slice(
 									0,
 									MAX_GAME_VERSION_TAGS,
 								)"
-								:key="`version-tag-${gameVersion}`"
-								v-tooltip="getFilterTooltip(gameVersion)"
+								:key="`version-tag-${gameVersionGroup.label}`"
+								v-tooltip="getFilterTooltip(gameVersionGroup.label)"
 								class="smart-clickable:allow-pointer-events"
-								:action="() => versionFilters?.toggleFilters('gameVersion', version.game_versions)"
+								:action="
+									() => versionFilters?.toggleFilters('gameVersion', gameVersionGroup.versions)
+								"
 							>
-								{{ gameVersion }}
+								{{ gameVersionGroup.label }}
 							</TagItem>
 							<Menu
 								v-if="getDisplayGameVersions(version).length > MAX_GAME_VERSION_TAGS"
@@ -339,15 +348,16 @@
 								<template #popper>
 									<div class="flex max-w-[20rem] flex-wrap gap-1">
 										<TagItem
-											v-for="gameVersion in getDisplayGameVersions(version).slice(
+											v-for="gameVersionGroup in getDisplayGameVersions(version).slice(
 												MAX_GAME_VERSION_TAGS,
 											)"
-											:key="`overflow-version-tag-${gameVersion}`"
+											:key="`overflow-version-tag-${gameVersionGroup.label}`"
 											:action="
-												() => versionFilters?.toggleFilters('gameVersion', version.game_versions)
+												() =>
+													versionFilters?.toggleFilters('gameVersion', gameVersionGroup.versions)
 											"
 										>
-											{{ gameVersion }}
+											{{ gameVersionGroup.label }}
 										</TagItem>
 									</div>
 								</template>
@@ -461,7 +471,12 @@ import {
 	VersionChannelIndicator,
 	VersionFilterControl,
 } from '@modrinth/ui'
-import { formatVersionsForDisplay, type GameVersionTag, type Version } from '@modrinth/utils'
+import {
+	type GameVersionTag,
+	getVersionGroupsForDisplay,
+	type Version,
+	type VersionDisplayGroup,
+} from '@modrinth/utils'
 import { Menu } from 'floating-vue'
 import { computed, type Ref, ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
@@ -622,8 +637,8 @@ function hasNoModLoader(loaders: string[]): boolean {
 	)
 }
 
-function getDisplayGameVersions(version: DisplayVersion): string[] {
-	return formatVersionsForDisplay(version.game_versions, props.gameVersions)
+function getDisplayGameVersions(version: DisplayVersion): VersionDisplayGroup[] {
+	return getVersionGroupsForDisplay(version.game_versions, props.gameVersions)
 }
 
 function getFilterTooltip(filter: string): string {
diff --git a/packages/ui/src/components/version/VersionFilterControl.vue b/packages/ui/src/components/version/VersionFilterControl.vue
index 5c38c04da4..3554b18795 100644
--- a/packages/ui/src/components/version/VersionFilterControl.vue
+++ b/packages/ui/src/components/version/VersionFilterControl.vue
@@ -243,31 +243,35 @@ if (selectedGameVersions.value.some((version) => !isReleaseGameVersion(version))
 	showSnapshots.value = true
 }
 
-async function toggleFilters(type: FilterType, filters: Filter[]) {
-	for (const filter of filters) {
-		await toggleFilter(type, filter, true)
+function selectedFiltersOfType(type: FilterType) {
+	if (type === 'channel') {
+		return selectedChannels
+	} else if (type === 'gameVersion') {
+		return selectedGameVersions
+	} else {
+		return selectedPlatforms
 	}
+}
+
+function toggleFilters(type: FilterType, filters: Filter[]) {
+	const selected = selectedFiltersOfType(type)
+	const allSelected = filters.every((filter) => selected.value.includes(filter))
+
+	selected.value = allSelected
+		? selected.value.filter((x) => !filters.includes(x))
+		: [...selected.value, ...filters.filter((filter) => !selected.value.includes(filter))]
 
 	updateFilters()
 }
 
-async function toggleFilter(type: FilterType, filter: Filter, bulk = false) {
-	if (type === 'channel') {
-		selectedChannels.value = selectedChannels.value.includes(filter)
-			? selectedChannels.value.filter((x) => x !== filter)
-			: [...selectedChannels.value, filter]
-	} else if (type === 'gameVersion') {
-		selectedGameVersions.value = selectedGameVersions.value.includes(filter)
-			? selectedGameVersions.value.filter((x) => x !== filter)
-			: [...selectedGameVersions.value, filter]
-	} else if (type === 'platform') {
-		selectedPlatforms.value = selectedPlatforms.value.includes(filter)
-			? selectedPlatforms.value.filter((x) => x !== filter)
-			: [...selectedPlatforms.value, filter]
-	}
-	if (!bulk) {
-		updateFilters()
-	}
+function toggleFilter(type: FilterType, filter: Filter) {
+	const selected = selectedFiltersOfType(type)
+
+	selected.value = selected.value.includes(filter)
+		? selected.value.filter((x) => x !== filter)
+		: [...selected.value, filter]
+
+	updateFilters()
 }
 
 function updateSelectedGameVersions(versions: string[]) {
@@ -302,7 +306,7 @@ function updateShowSnapshots(value: boolean, _event?: MouseEvent) {
 	}
 }
 
-async function clearFilters() {
+function clearFilters() {
 	selectedChannels.value = []
 	selectedGameVersions.value = []
 	selectedPlatforms.value = []
diff --git a/packages/utils/projects.ts b/packages/utils/projects.ts
index 3176c940a4..36bb49e299 100644
--- a/packages/utils/projects.ts
+++ b/packages/utils/projects.ts
@@ -66,6 +66,11 @@ export type PlatformTag = {
 	supported_project_types: DisplayProjectType[]
 }
 
+export type VersionDisplayGroup = {
+	label: string
+	versions: string[]
+}
+
 export function getVersionsToDisplay(project, allGameVersions: GameVersionTag[]) {
 	return formatVersionsForDisplay(project.game_versions.slice(), allGameVersions)
 }
@@ -74,6 +79,13 @@ export function formatVersionsForDisplay(
 	gameVersions: string[],
 	allGameVersions: GameVersionTag[],
 ) {
+	return getVersionGroupsForDisplay(gameVersions, allGameVersions).map((group) => group.label)
+}
+
+export function getVersionGroupsForDisplay(
+	gameVersions: string[],
+	allGameVersions: GameVersionTag[],
+): VersionDisplayGroup[] {
 	const inputVersions = gameVersions.slice()
 	const allVersions = allGameVersions.slice()
 
@@ -112,26 +124,33 @@ export function formatVersionsForDisplay(
 	)
 	const projectVersionsGrouped = groupVersions(releaseVersions, true)
 
-	const releaseVersionsAsRanges = projectVersionsGrouped.map(({ major, minor }) => {
-		if (minor.length === 1) {
-			return formatMinecraftMinorVersion(major, minor[0])
-		}
+	const releaseVersionsAsRanges: VersionDisplayGroup[] = projectVersionsGrouped.map(
+		({ major, minor }) => {
+			const versions = minor.map((minorVersion) => formatMinecraftMinorVersion(major, minorVersion))
 
-		const range = allReleasesGrouped.find((x) => x.major === major)
+			if (minor.length === 1) {
+				return { label: versions[0], versions }
+			}
 
-		if (range?.minor.every((value, index) => value === minor[index])) {
-			return `${major}.x`
-		}
+			const range = allReleasesGrouped.find((x) => x.major === major)
 
-		return `${formatMinecraftMinorVersion(major, minor[0])}–${formatMinecraftMinorVersion(major, minor[minor.length - 1])}`
-	})
+			if (range?.minor.every((value, index) => value === minor[index])) {
+				return { label: `${major}.x`, versions }
+			}
+
+			return {
+				label: `${formatMinecraftMinorVersion(major, minor[0])}–${formatMinecraftMinorVersion(major, minor[minor.length - 1])}`,
+				versions,
+			}
+		},
+	)
 
 	const legacyVersionsAsRanges = groupConsecutiveIndices(
 		inputVersions.filter((projVer) => allLegacy.some((gameVer) => gameVer.version === projVer)),
 		allLegacy,
 	)
 
-	let output = [...legacyVersionsAsRanges]
+	let output: VersionDisplayGroup[] = [...legacyVersionsAsRanges]
 
 	// show all snapshots if there's no release versions
 	if (releaseVersionsAsRanges.length === 0) {
@@ -141,14 +160,14 @@ export function formatVersionsForDisplay(
 		const snapshotVersionsAsRanges =
 			snapshotVersions.length > 3
 				? groupConsecutiveIndices(snapshotVersions, allSnapshots)
-				: snapshotVersions
+				: snapshotVersions.map((version) => ({ label: version, versions: [version] }))
 		output = [...snapshotVersionsAsRanges, ...output]
 	} else {
 		output = [...releaseVersionsAsRanges, ...output]
 	}
 
 	if (releaseVersionsAsRanges.length > 0 && latestSnapshot) {
-		output = [latestSnapshot, ...output]
+		output = [{ label: latestSnapshot, versions: [latestSnapshot] }, ...output]
 	}
 	return output
 }
@@ -188,7 +207,10 @@ function groupVersions(versions: string[], consecutive = false) {
 		.reverse()
 }
 
-function groupConsecutiveIndices(versions: string[], referenceList: GameVersionTag[]) {
+function groupConsecutiveIndices(
+	versions: string[],
+	referenceList: GameVersionTag[],
+): VersionDisplayGroup[] {
 	if (!versions || versions.length === 0) {
 		return []
 	}
@@ -202,21 +224,23 @@ function groupConsecutiveIndices(versions: string[], referenceList: GameVersionT
 		.slice()
 		.sort((a, b) => referenceMap.get(a) - referenceMap.get(b))
 
-	const ranges: string[] = []
-	let start = sortedList[0]
-	let previous = sortedList[0]
+	const ranges: VersionDisplayGroup[] = []
+	let rangeStartIndex = 0
 
-	for (let i = 1; i < sortedList.length; i++) {
-		const current = sortedList[i]
-		if (referenceMap.get(current) !== referenceMap.get(previous) + 1) {
-			ranges.push(validateRange(`${previous}–${start}`))
-			start = current
+	for (let i = 1; i <= sortedList.length; i++) {
+		if (
+			i === sortedList.length ||
+			referenceMap.get(sortedList[i]) !== referenceMap.get(sortedList[i - 1]) + 1
+		) {
+			const members = sortedList.slice(rangeStartIndex, i)
+			ranges.push({
+				label: validateRange(`${members[members.length - 1]}–${members[0]}`),
+				versions: members,
+			})
+			rangeStartIndex = i
 		}
-		previous = current
 	}
 
-	ranges.push(validateRange(`${previous}–${start}`))
-
 	return ranges
 }
 

From 36857a167b6ff73a4f84fe08fc9ebf5e369b1a3e Mon Sep 17 00:00:00 2001
From: "Calum H." <calum@modrinth.com>
Date: Tue, 4 Aug 2026 22:24:43 +0100
Subject: [PATCH 26/82] fix: content selection bar not showing in
 ModpackContentModal (#6950)

---
 .../shared/content-tab/components/ContentSelectionBar.vue | 8 +++++++-
 .../content-tab/components/modals/ModpackContentModal.vue | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/ui/src/layouts/shared/content-tab/components/ContentSelectionBar.vue b/packages/ui/src/layouts/shared/content-tab/components/ContentSelectionBar.vue
index 312ec5ec2c..bf2ec3f9c8 100644
--- a/packages/ui/src/layouts/shared/content-tab/components/ContentSelectionBar.vue
+++ b/packages/ui/src/layouts/shared/content-tab/components/ContentSelectionBar.vue
@@ -95,6 +95,7 @@ interface Props {
 	ariaLabel?: string
 	getItemId?: (item: ContentItem) => string
 	toggleItems?: ContentItem[]
+	hideWhenModalOpen?: boolean
 }
 
 const props = withDefaults(defineProps<Props>(), {
@@ -111,6 +112,7 @@ const props = withDefaults(defineProps<Props>(), {
 	ariaLabel: undefined,
 	getItemId: undefined,
 	toggleItems: undefined,
+	hideWhenModalOpen: true,
 })
 
 const emit = defineEmits<{
@@ -181,7 +183,11 @@ const bulkProgressMessage = computed(() => {
 </script>
 
 <template>
-	<FloatingActionBar :shown="shown" :aria-label="ariaLabel" hide-when-modal-open>
+	<FloatingActionBar
+		:shown="shown"
+		:aria-label="ariaLabel"
+		:hide-when-modal-open="hideWhenModalOpen"
+	>
 		<div class="flex items-center gap-0.5">
 			<div
 				v-if="selectedItems.length > 0"
diff --git a/packages/ui/src/layouts/shared/content-tab/components/modals/ModpackContentModal.vue b/packages/ui/src/layouts/shared/content-tab/components/modals/ModpackContentModal.vue
index cad04ab463..1dc3f4933a 100644
--- a/packages/ui/src/layouts/shared/content-tab/components/modals/ModpackContentModal.vue
+++ b/packages/ui/src/layouts/shared/content-tab/components/modals/ModpackContentModal.vue
@@ -664,6 +664,7 @@ defineExpose({ show, showLoading, hide, getState, restore, updateItem, setItems
 			:selected-items="selectedItems"
 			:is-busy="props.actionDisabled"
 			:busy-tooltip="props.actionDisabledTooltip"
+			:hide-when-modal-open="false"
 			style="--left-bar-width: 0px; --right-bar-width: 0px"
 			@clear="selectedIds = []"
 			@enable="bulkEnable"

From 540b3269dfe0ad8a5fcb534cd3612cf7e918295c Mon Sep 17 00:00:00 2001
From: "Calum H." <calum@modrinth.com>
Date: Tue, 4 Aug 2026 22:32:52 +0100
Subject: [PATCH 27/82] fix: breadcrumb issue on browse content via server
 panel (#6971)

fix: breadcrumb issue on browse/navigation bar

Co-authored-by: Prospector <6166773+Prospector@users.noreply.github.com>
---
 apps/app-frontend/src/App.vue                 | 12 ++-
 apps/app-frontend/src/pages/Browse.vue        | 98 +++++++++++--------
 .../providers/setup/server-install-content.ts | 42 +++++++-
 3 files changed, 105 insertions(+), 47 deletions(-)

diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue
index 6ef972120b..35e6692fbb 100644
--- a/apps/app-frontend/src/App.vue
+++ b/apps/app-frontend/src/App.vue
@@ -1547,8 +1547,10 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
 			<NavButton
 				v-tooltip.right="formatMessage(commonMessages.discoverContentLabel)"
 				to="/browse/modpack"
-				:is-primary="() => route.path.startsWith('/browse') && !route.query.i"
-				:is-subpage="(route) => route.path.startsWith('/project') && !route.query.i"
+				:is-primary="() => route.path.startsWith('/browse') && !route.query.i && !route.query.sid"
+				:is-subpage="
+					(route) => route.path.startsWith('/project') && !route.query.i && !route.query.sid
+				"
 			>
 				<CompassIcon />
 			</NavButton>
@@ -1572,7 +1574,11 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
 				v-tooltip.right="formatMessage(messages.modrinthHosting)"
 				to="/hosting/manage"
 				:is-primary="(r) => r.path === '/hosting/manage' || r.path === '/hosting/manage/'"
-				:is-subpage="(r) => r.path.startsWith('/hosting/manage/') && r.path !== '/hosting/manage/'"
+				:is-subpage="
+					(r) =>
+						(r.path.startsWith('/hosting/manage/') && r.path !== '/hosting/manage/') ||
+						((r.path.startsWith('/browse') || r.path.startsWith('/project')) && r.query.sid)
+				"
 			>
 				<ServerStackIcon />
 			</NavButton>
diff --git a/apps/app-frontend/src/pages/Browse.vue b/apps/app-frontend/src/pages/Browse.vue
index d35a247544..f2a4eb084e 100644
--- a/apps/app-frontend/src/pages/Browse.vue
+++ b/apps/app-frontend/src/pages/Browse.vue
@@ -56,11 +56,7 @@ import {
 	instanceKeys,
 	instanceLinkedProjectQueryOptions,
 } from '@/pages/instance/query-options'
-import {
-	type BreadcrumbDefinition,
-	useBreadcrumb,
-	useRootBreadcrumb,
-} from '@/providers/breadcrumbs'
+import { type BreadcrumbDefinition, injectBreadcrumbManager } from '@/providers/breadcrumbs'
 import { injectContentInstall } from '@/providers/content-install'
 import { injectServerInstall } from '@/providers/server-install'
 import {
@@ -177,45 +173,46 @@ const isServerInstance = computed(
 	() => linkedInstanceProjectQuery.data.value?.minecraft_server != null,
 )
 
-const instanceBreadcrumb = route.query.i
-	? useBreadcrumb({
-			slot: 'instance',
-			id: () => `instance:${String(displayedBrowseRoute.value.query.i ?? '')}`,
-			label: () => instance.value?.name ?? formatMessage(commonMessages.loadingLabel),
-			visual: () => ({
-				type: 'image',
-				src: instance.value?.icon_path ? convertFileSrc(instance.value.icon_path) : undefined,
-				alt: instance.value?.name,
-				tintBy: String(displayedBrowseRoute.value.query.i ?? ''),
-			}),
-			to: () => {
-				const instancePath = `/instance/${encodeURIComponent(
-					String(displayedBrowseRoute.value.query.i ?? ''),
-				)}`
-				return displayedBrowseRoute.value.query.from === 'worlds'
-					? `${instancePath}/worlds`
-					: instancePath
-			},
-		})
-	: undefined
+const breadcrumbManager = injectBreadcrumbManager()
+const instanceBreadcrumbDefinition = {
+	slot: 'instance',
+	id: () => `instance:${String(displayedBrowseRoute.value.query.i ?? '')}`,
+	label: () => instance.value?.name ?? formatMessage(commonMessages.loadingLabel),
+	visual: () => ({
+		type: 'image' as const,
+		src: instance.value?.icon_path ? convertFileSrc(instance.value.icon_path) : undefined,
+		alt: instance.value?.name,
+		tintBy: String(displayedBrowseRoute.value.query.i ?? ''),
+	}),
+	to: () => {
+		const instancePath = `/instance/${encodeURIComponent(
+			String(displayedBrowseRoute.value.query.i ?? ''),
+		)}`
+		return displayedBrowseRoute.value.query.from === 'worlds'
+			? `${instancePath}/worlds`
+			: instancePath
+	},
+} satisfies BreadcrumbDefinition
+const serversBreadcrumbDefinition = {
+	slot: 'root',
+	id: 'servers',
+	label: () => formatMessage(commonMessages.serversLabel),
+	to: '/hosting/manage/',
+	visual: { type: 'icon', component: ServerStackIcon },
+} satisfies BreadcrumbDefinition
 const serverBreadcrumbTo = ref(serverBackUrl.value)
 watch(serverBackUrl, (value) => {
 	if (route.path.startsWith('/browse/')) {
 		serverBreadcrumbTo.value = value
 	}
 })
-const serverBreadcrumb =
-	!instanceBreadcrumb && serverIdQuery.value
-		? useBreadcrumb({
-				slot: 'server',
-				id: () => `server:${String(displayedBrowseRoute.value.query.sid ?? '')}`,
-				label: () =>
-					serverContextServerData.value?.name ?? formatMessage(commonMessages.loadingLabel),
-				visual: { type: 'icon', component: ServerStackIcon },
-				to: serverBreadcrumbTo,
-			})
-		: undefined
-const breadcrumbParent = instanceBreadcrumb ?? serverBreadcrumb
+const serverBreadcrumbDefinition = {
+	slot: 'server',
+	id: () => `server:${String(displayedBrowseRoute.value.query.sid ?? '')}`,
+	label: () => serverContextServerData.value?.name ?? formatMessage(commonMessages.loadingLabel),
+	visual: { type: 'icon', component: ServerStackIcon },
+	to: serverBreadcrumbTo,
+} satisfies BreadcrumbDefinition
 const breadcrumbDefinition = {
 	slot: 'browse',
 	id: () =>
@@ -228,9 +225,27 @@ const breadcrumbDefinition = {
 	to: () => displayedBrowseRoute.value.fullPath,
 	visual: { type: 'icon', component: CompassIcon },
 } satisfies BreadcrumbDefinition
-const browseBreadcrumb = breadcrumbParent
-	? useBreadcrumb(breadcrumbDefinition, { parent: breadcrumbParent })
-	: useRootBreadcrumb(breadcrumbDefinition)
+
+function syncBreadcrumbs() {
+	if (displayedBrowseRoute.value.query.i) {
+		const instanceBreadcrumb = breadcrumbManager.reset(instanceBreadcrumbDefinition)
+		breadcrumbManager.push(breadcrumbDefinition, { parent: instanceBreadcrumb })
+		return
+	}
+
+	if (displayedBrowseRoute.value.query.sid) {
+		const serversBreadcrumb = breadcrumbManager.reset(serversBreadcrumbDefinition)
+		const serverBreadcrumb = breadcrumbManager.push(serverBreadcrumbDefinition, {
+			parent: serversBreadcrumb,
+		})
+		breadcrumbManager.push(breadcrumbDefinition, { parent: serverBreadcrumb })
+		return
+	}
+
+	breadcrumbManager.reset(breadcrumbDefinition)
+}
+
+watch(displayedBrowseRoute, syncBreadcrumbs, { immediate: true, flush: 'sync' })
 
 debugLog('fetching tags (categories, loaders, gameVersions)')
 const [categories, loaders, availableGameVersions] = await Promise.all([
@@ -595,6 +610,7 @@ function resetInstanceContext() {
 	newlyInstalled.value = []
 	hiddenInstanceProjectIds.value = new Set()
 	hiddenInstanceProjectIdsInitialized.value = false
+	isServerInstance.value = false
 	browseBreadcrumb.reset()
 	void refreshInstalledProjectIds()
 }
diff --git a/apps/app-frontend/src/providers/setup/server-install-content.ts b/apps/app-frontend/src/providers/setup/server-install-content.ts
index c48b90f2c1..c2556c8937 100644
--- a/apps/app-frontend/src/providers/setup/server-install-content.ts
+++ b/apps/app-frontend/src/providers/setup/server-install-content.ts
@@ -222,7 +222,29 @@ export function createServerInstallContent(opts: {
 	const isSetupServerContext = computed(() => !!serverIdQuery.value && !!serverFlowFrom.value)
 
 	const serverContextWorldId = ref<string | null>(worldIdQuery.value)
-	const serverContextServerData = ref<Archon.Servers.v0.Server | null>(null)
+
+	function getCachedServer(serverId: string): Archon.Servers.v0.Server | null {
+		return (
+			queryClient.getQueryData<Archon.Servers.v0.Server>(['servers', 'detail', serverId]) ??
+			queryClient
+				.getQueryData<Archon.Servers.v0.ServerGetResponse>(['servers'])
+				?.servers.find((server) => server.server_id === serverId) ??
+			null
+		)
+	}
+
+	async function ensureServer(serverId: string): Promise<Archon.Servers.v0.Server> {
+		return queryClient.ensureQueryData({
+			queryKey: ['servers', 'detail', serverId],
+			queryFn: () => client.archon.servers_v0.get(serverId),
+			staleTime: 30_000,
+		})
+	}
+
+	const initialServerId = serverIdQuery.value
+	const serverContextServerData = ref<Archon.Servers.v0.Server | null>(
+		initialServerId ? getCachedServer(initialServerId) : null,
+	)
 	const serverContentProjectIds = ref<Set<string>>(new Set())
 	const serverContentInstallKeys = ref<Set<string>>(new Set())
 	const queuedServerInstalls = ref<Map<string, BrowseInstallPlan<InstallableSearchResult>>>(
@@ -277,6 +299,9 @@ export function createServerInstallContent(opts: {
 	async function refreshServerInstalledContent(serverId: string, worldId: string) {
 		try {
 			const content = await client.archon.content_v1.getAddons(serverId, worldId)
+			if (serverIdQuery.value !== serverId || effectiveServerWorldId.value !== worldId) {
+				return
+			}
 			const ids = new Set(
 				(content.addons ?? [])
 					.map((addon) => addon.project_id)
@@ -297,14 +322,20 @@ export function createServerInstallContent(opts: {
 		if (!sid) return
 
 		try {
-			serverContextServerData.value = await client.archon.servers_v0.get(sid)
+			const server = await ensureServer(sid)
+			if (serverIdQuery.value === sid) {
+				serverContextServerData.value = server
+			}
 		} catch (err) {
 			handleError(err as Error)
 		}
 
+		if (serverIdQuery.value !== sid) return
+
 		let resolvedWorldId = effectiveServerWorldId.value
 		if (!resolvedWorldId) {
 			resolvedWorldId = await resolveServerContextWorldId(sid)
+			if (serverIdQuery.value !== sid) return
 			if (resolvedWorldId) {
 				serverContextWorldId.value = resolvedWorldId
 			}
@@ -319,6 +350,7 @@ export function createServerInstallContent(opts: {
 	function watchServerContextChanges() {
 		watch([serverIdQuery, effectiveServerWorldId], async ([sid, wid], [prevSid, prevWid]) => {
 			if (!sid) {
+				serverContextWorldId.value = null
 				serverContextServerData.value = null
 				serverContentProjectIds.value = new Set()
 				serverContentInstallKeys.value = new Set()
@@ -330,8 +362,12 @@ export function createServerInstallContent(opts: {
 				serverContentProjectIds.value = new Set()
 				serverContentInstallKeys.value = new Set()
 				queuedServerInstalls.value = readStoredServerInstallQueue(sid, wid)
+				serverContextServerData.value = getCachedServer(sid)
 				try {
-					serverContextServerData.value = await client.archon.servers_v0.get(sid)
+					const server = await ensureServer(sid)
+					if (serverIdQuery.value === sid) {
+						serverContextServerData.value = server
+					}
 				} catch (err) {
 					handleError(err as Error)
 				}

From f42a3bfde38cafd659ed85ed2e4027ca7f58e96f Mon Sep 17 00:00:00 2001
From: "Calum H." <calum@modrinth.com>
Date: Tue, 4 Aug 2026 22:33:17 +0100
Subject: [PATCH 28/82] fix: moderation fixes (#6952)

* fix: skip deleted projects

* fix: remove unnesecary blocker
---
 .../checklist/ModerationChecklist.vue         | 37 +++++++++++--------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/apps/frontend/src/components/ui/moderation/checklist/ModerationChecklist.vue b/apps/frontend/src/components/ui/moderation/checklist/ModerationChecklist.vue
index 83f45c88e6..25d7a4d8be 100644
--- a/apps/frontend/src/components/ui/moderation/checklist/ModerationChecklist.vue
+++ b/apps/frontend/src/components/ui/moderation/checklist/ModerationChecklist.vue
@@ -777,11 +777,17 @@ function isEligibleQueueCandidate(result: QueueCandidateCheck | undefined): bool
 	return !result.locked || !!result.expired || !!result.isOwnLock
 }
 
+function isNotFoundError(error: unknown): boolean {
+	if (!error || typeof error !== 'object') return false
+	const fetchError = error as { statusCode?: number; response?: { status?: number } }
+	return fetchError.statusCode === 404 || fetchError.response?.status === 404
+}
+
 function notifySkippedQueueProjects(count: number) {
 	if (count <= 0) return
 	addNotification({
 		title: 'Skipped projects',
-		text: `Skipped ${count} project(s) already moderated or locked by others.`,
+		text: `Skipped ${count} project(s) already moderated, deleted, or locked by others.`,
 		type: 'info',
 		autoCloseMs: 2000,
 	})
@@ -812,10 +818,10 @@ async function batchCheckQueueCandidates(
 		projectIds.map(async (id) => {
 			const [lockResponse, projectData] = await Promise.all([
 				moderationQueue.checkLock(id),
-				useBaseFetch(`project/${id}`, { method: 'GET' }).catch(() => null),
+				useBaseFetch(`project/${id}`, { method: 'GET' }),
 			])
 
-			const status = (projectData as { status?: string } | null)?.status
+			const status = (projectData as { status?: string }).status
 
 			return {
 				id,
@@ -825,7 +831,7 @@ async function batchCheckQueueCandidates(
 				slug: (projectData as { slug?: string } | null)?.slug,
 				projectType: (projectData as { project_type?: string } | null)?.project_type,
 				status,
-				isProcessing: projectData === null ? true : status === 'processing',
+				isProcessing: status === 'processing',
 			}
 		}),
 	)
@@ -833,6 +839,8 @@ async function batchCheckQueueCandidates(
 	checks.forEach((result, index) => {
 		if (result.status === 'fulfilled') {
 			results.set(result.value.id, result.value)
+		} else if (isNotFoundError(result.reason)) {
+			results.set(projectIds[index], { locked: false, isProcessing: false })
 		} else {
 			results.set(projectIds[index], { locked: false, isProcessing: true })
 		}
@@ -979,7 +987,7 @@ async function skipToNextProject() {
 		debug('[skipToNextProject] No eligible projects in queue')
 		addNotification({
 			title: 'No projects available',
-			text: 'All remaining projects are already moderated or locked by others.',
+			text: 'All remaining projects are already moderated, deleted, or locked by others.',
 			type: 'warning',
 		})
 	}
@@ -1649,9 +1657,15 @@ async function sendMessage(status: ProjectStatus) {
 			}
 		}
 
-		await refreshModerationCaches(threadId)
-
 		const willHaveNext = await moderationQueue.completeCurrentProject(projectId, 'completed')
+		// Set both states together - hasNextProject MUST be set before done
+		// to avoid the race condition where done=true renders with hasNextProject=false
+		hasNextProject.value = willHaveNext
+		done.value = true
+		clearGeneratedMessageState()
+		await nextTick()
+
+		await refreshModerationCaches(threadId)
 
 		await Promise.race([
 			moderationQueue.releaseLock(projectId),
@@ -1661,16 +1675,9 @@ async function sendMessage(status: ProjectStatus) {
 		if (projectFixChanges?.slug) {
 			const urlType = getProjectTypeForUrlShorthand(projectV2.value.project_type, [], tags.value)
 			localStorage.setItem('moderation-checklist-finished', projectId)
-			clearGeneratedMessageState()
 			await navigateTo(`/${urlType}/${projectFixChanges.slug}/moderation`, { replace: true })
 			return
 		}
-
-		// Set both states together - hasNextProject MUST be set before done
-		// to avoid the race condition where done=true renders with hasNextProject=false
-		hasNextProject.value = willHaveNext
-		done.value = true
-		clearGeneratedMessageState()
 	} catch (error) {
 		console.error('Error submitting moderation:', error)
 		addNotification({
@@ -1733,7 +1740,7 @@ async function endChecklist(status?: string) {
 					)
 					addNotification({
 						title: 'No projects available',
-						text: 'All remaining projects are already moderated or locked by others.',
+						text: 'All remaining projects are already moderated, deleted, or locked by others.',
 						type: 'warning',
 					})
 				}

From 474c6560fc39da7531c33d8a9a30d456015dce3b Mon Sep 17 00:00:00 2001
From: coolbot <76798835+coolbot100s@users.noreply.github.com>
Date: Tue, 4 Aug 2026 14:33:26 -0700
Subject: [PATCH 29/82] feat: update gallery nags (#6999)

* update nag to require 3 images from shader projects.

* locales
---
 packages/moderation/src/data/nags/core.ts     | 50 ++++++++++++-------
 .../moderation/src/locales/ar-SA/index.json   |  4 --
 .../moderation/src/locales/cs-CZ/index.json   |  4 --
 .../moderation/src/locales/de-CH/index.json   |  4 --
 .../moderation/src/locales/de-DE/index.json   |  4 --
 .../moderation/src/locales/en-US/index.json   |  7 ++-
 .../moderation/src/locales/es-419/index.json  |  4 --
 .../moderation/src/locales/es-ES/index.json   |  4 --
 .../moderation/src/locales/fil-PH/index.json  |  4 --
 .../moderation/src/locales/fr-FR/index.json   |  4 --
 .../moderation/src/locales/hu-HU/index.json   |  4 --
 .../moderation/src/locales/id-ID/index.json   |  4 --
 .../moderation/src/locales/it-IT/index.json   |  3 --
 .../moderation/src/locales/ja-JP/index.json   |  4 --
 .../moderation/src/locales/ko-KR/index.json   |  4 --
 .../moderation/src/locales/ms-MY/index.json   |  4 --
 .../moderation/src/locales/nl-NL/index.json   |  4 --
 .../moderation/src/locales/pl-PL/index.json   |  4 --
 .../moderation/src/locales/pt-BR/index.json   |  4 --
 .../moderation/src/locales/ru-RU/index.json   |  4 --
 .../moderation/src/locales/sr-CS/index.json   |  4 --
 .../moderation/src/locales/sv-SE/index.json   |  4 --
 .../moderation/src/locales/tr-TR/index.json   |  4 --
 .../moderation/src/locales/uk-UA/index.json   |  4 --
 .../moderation/src/locales/vi-VN/index.json   |  4 --
 .../moderation/src/locales/zh-CN/index.json   |  4 --
 .../moderation/src/locales/zh-TW/index.json   |  4 --
 27 files changed, 36 insertions(+), 120 deletions(-)

diff --git a/packages/moderation/src/data/nags/core.ts b/packages/moderation/src/data/nags/core.ts
index faae1fce36..2695aeda99 100644
--- a/packages/moderation/src/data/nags/core.ts
+++ b/packages/moderation/src/data/nags/core.ts
@@ -102,6 +102,23 @@ export const coreNags: Nag[] = [
 		description: (context: NagContext) => {
 			const { formatMessage } = useVIntl()
 
+			if (context.projectV3?.project_types.includes('resourcepack')) {
+				return formatMessage(
+					defineMessage({
+						id: 'nags.upload-gallery-image.description-resourcepack',
+						defaultMessage:
+							'At least one gallery image is required to showcase the content of your resource pack, except for audio or localization packs. If this describes your pack, please select the appropriate tag.',
+					}),
+				)
+			} else if (context.projectV3?.project_types.includes('shader')) {
+				return formatMessage(
+					defineMessage({
+						id: 'nags.upload-gallery-image.description-shader',
+						defaultMessage:
+							'At least three gallery images are required to showcase the content of your shader in a variety of situations and conditions.',
+					}),
+				)
+			}
 			return formatMessage(
 				defineMessage({
 					id: 'nags.upload-gallery-image.description',
@@ -109,31 +126,26 @@ export const coreNags: Nag[] = [
 						'At least one gallery image is required to showcase the content of your {type}.',
 				}),
 				{
-					type:
-						context.project.project_type === 'resourcepack'
-							? formatMessage(
-									defineMessage({
-										id: 'nags.upload-gallery-image.resourcepack-type',
-										defaultMessage:
-											'resource pack, except for audio or localization packs. If this describes your pack, please select the appropriate tag',
-									}),
-								)
-							: formatProjectTypeSentence(formatMessage, context.project.project_type),
+					type: formatProjectTypeSentence(formatMessage, context.project.project_type),
 				},
 			)
 		},
 		status: 'required',
 		shouldShow: (context: NagContext) => {
 			return (
-				(context.project.project_type === 'resourcepack' ||
-					context.project.project_type === 'shader') &&
-				(!context.project.gallery || context.project.gallery?.length === 0) &&
-				!(
-					context.project.categories.includes('audio') ||
-					context.project.additional_categories.includes('audio') ||
-					context.project.categories.includes('locale') ||
-					context.project.additional_categories.includes('locale')
-				)
+				(context.projectV3?.project_types.includes('shader') &&
+					context.project.gallery &&
+					context.project.gallery?.length < 3) ||
+				(context.projectV3?.project_types.includes('resourcepack') &&
+					context.project.gallery &&
+					context.project.gallery?.length === 0 &&
+					!(
+						context.project.categories.includes('audio') ||
+						context.project.additional_categories.includes('audio') ||
+						context.project.categories.includes('locale') ||
+						context.project.additional_categories.includes('locale')
+					)) ||
+				false
 			)
 		},
 		link: {
diff --git a/packages/moderation/src/locales/ar-SA/index.json b/packages/moderation/src/locales/ar-SA/index.json
index 3c74e2d8fd..8a0510236a 100644
--- a/packages/moderation/src/locales/ar-SA/index.json
+++ b/packages/moderation/src/locales/ar-SA/index.json
@@ -254,9 +254,6 @@
   "nags.upload-gallery-image.description": {
     "defaultMessage": "يُطلب صورة واحدة على الأقل في المَعْرِض لعرض محتوى {type} الخاص بك."
   },
-  "nags.upload-gallery-image.resourcepack-type": {
-    "defaultMessage": "حُزْمَة موارد، باستثناء حزم الصوت أو التعريب. إذا كان هذا يصف حزمتك، يرجى اختيار الوسم المناسب"
-  },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "رفع صورة من المَعْرِض"
   },
@@ -279,4 +276,3 @@
     "defaultMessage": "زيارة إعدادات الروابط"
   }
 }
-
diff --git a/packages/moderation/src/locales/cs-CZ/index.json b/packages/moderation/src/locales/cs-CZ/index.json
index eb28e1b21d..ac693424c3 100644
--- a/packages/moderation/src/locales/cs-CZ/index.json
+++ b/packages/moderation/src/locales/cs-CZ/index.json
@@ -251,9 +251,6 @@
   "nags.upload-gallery-image.description": {
     "defaultMessage": "Je vyžadován alespoň jeden obrázek v galerii pro zobrazení obsahu vašeho {type}."
   },
-  "nags.upload-gallery-image.resourcepack-type": {
-    "defaultMessage": "resource packu, s výjimkou audia nebo lokalizačních balíčků. Pokud popis odpovídá vašemu balíčku, vyberte prosím příslušný štítek"
-  },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "Nahrajte obrázek do galerie"
   },
@@ -276,4 +273,3 @@
     "defaultMessage": "Přejděte do nastavení odkazů"
   }
 }
-
diff --git a/packages/moderation/src/locales/de-CH/index.json b/packages/moderation/src/locales/de-CH/index.json
index 75c59e8b80..87c6dcf80a 100644
--- a/packages/moderation/src/locales/de-CH/index.json
+++ b/packages/moderation/src/locales/de-CH/index.json
@@ -254,9 +254,6 @@
   "nags.upload-gallery-image.description": {
     "defaultMessage": "Es wird mindestens ein Galeriebild benötigt, um den Inhalt deines/deiner {type} zu präsentieren."
   },
-  "nags.upload-gallery-image.resourcepack-type": {
-    "defaultMessage": "Resource Pack, ausgenommen Audio- oder Lokalisierungs-Packs. Wenn dies auf dein Pack zutrifft, wähle bitte das entsprechende Tag aus"
-  },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "Lade ein Galeriebild hoch"
   },
@@ -279,4 +276,3 @@
     "defaultMessage": "Link-Einstellungen ansehen"
   }
 }
-
diff --git a/packages/moderation/src/locales/de-DE/index.json b/packages/moderation/src/locales/de-DE/index.json
index b2f3e88c7c..40d6b556e7 100644
--- a/packages/moderation/src/locales/de-DE/index.json
+++ b/packages/moderation/src/locales/de-DE/index.json
@@ -254,9 +254,6 @@
   "nags.upload-gallery-image.description": {
     "defaultMessage": "Es ist mindestens ein Galeriebild erforderlich, um den Inhalt deines {type} zu präsentieren."
   },
-  "nags.upload-gallery-image.resourcepack-type": {
-    "defaultMessage": "Ressourcenpaket, mit Ausnahme von Audio- oder Lokalisierungspaketen. Wenn dies auf dein Paket zutrifft, wähle bitte den entsprechenden Tag aus"
-  },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "Galeriebild hochladen"
   },
@@ -279,4 +276,3 @@
     "defaultMessage": "Linkeinstellungen ansehen"
   }
 }
-
diff --git a/packages/moderation/src/locales/en-US/index.json b/packages/moderation/src/locales/en-US/index.json
index e66ce1ed21..442d363b87 100644
--- a/packages/moderation/src/locales/en-US/index.json
+++ b/packages/moderation/src/locales/en-US/index.json
@@ -254,8 +254,11 @@
   "nags.upload-gallery-image.description": {
     "defaultMessage": "At least one gallery image is required to showcase the content of your {type}."
   },
-  "nags.upload-gallery-image.resourcepack-type": {
-    "defaultMessage": "resource pack, except for audio or localization packs. If this describes your pack, please select the appropriate tag"
+  "nags.upload-gallery-image.description-resourcepack": {
+    "defaultMessage": "At least one gallery image is required to showcase the content of your resource pack, except for audio or localization packs. If this describes your pack, please select the appropriate tag."
+  },
+  "nags.upload-gallery-image.description-shader": {
+    "defaultMessage": "At least three gallery images are required to showcase the content of your shader in a variety of situations and conditions."
   },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "Upload a gallery image"
diff --git a/packages/moderation/src/locales/es-419/index.json b/packages/moderation/src/locales/es-419/index.json
index 31f8bb23db..40b3102f42 100644
--- a/packages/moderation/src/locales/es-419/index.json
+++ b/packages/moderation/src/locales/es-419/index.json
@@ -254,9 +254,6 @@
   "nags.upload-gallery-image.description": {
     "defaultMessage": "Se requiere al menos una imagen en la galería para mostrar el contenido de tu {type}."
   },
-  "nags.upload-gallery-image.resourcepack-type": {
-    "defaultMessage": "pack de recursos, excepto para audio o packs de localización. Si esto describe tu pack, por favor, seleccionar la etiqueta apropiada"
-  },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "Subir una imagen a la galería"
   },
@@ -279,4 +276,3 @@
     "defaultMessage": "Ver configuración de enlaces"
   }
 }
-
diff --git a/packages/moderation/src/locales/es-ES/index.json b/packages/moderation/src/locales/es-ES/index.json
index 36dcb099b4..9d5ba51c18 100644
--- a/packages/moderation/src/locales/es-ES/index.json
+++ b/packages/moderation/src/locales/es-ES/index.json
@@ -251,9 +251,6 @@
   "nags.upload-gallery-image.description": {
     "defaultMessage": "Se requiere al menos una imagen en la galería para mostrar el contenido de tu {type}."
   },
-  "nags.upload-gallery-image.resourcepack-type": {
-    "defaultMessage": "pack de recursos, excepto para audio o packs de localización. Si esto describe tu pack, por favor, seleccionar la etiqueta apropiada"
-  },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "Subir una imagen a la galería"
   },
@@ -276,4 +273,3 @@
     "defaultMessage": "Visitar la configuración de enlaces"
   }
 }
-
diff --git a/packages/moderation/src/locales/fil-PH/index.json b/packages/moderation/src/locales/fil-PH/index.json
index c999145a17..538a16cf38 100644
--- a/packages/moderation/src/locales/fil-PH/index.json
+++ b/packages/moderation/src/locales/fil-PH/index.json
@@ -227,9 +227,6 @@
   "nags.upload-gallery-image.description": {
     "defaultMessage": "Mangangailangan ng hindi kukulang sa isang imaheng panggaleriya na pang-showcase ng kontento ng iyong {type}."
   },
-  "nags.upload-gallery-image.resourcepack-type": {
-    "defaultMessage": "resource pack, maliban sa audio o mga pack ng pagsasalon. Kung napaglarawan nito ang iyong pack, mangyaring piliin ang nakawawastong tag"
-  },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "Mag-upload ng imaheng panggaleriya"
   },
@@ -252,4 +249,3 @@
     "defaultMessage": "Bisitahin ang mga setting sa mga link"
   }
 }
-
diff --git a/packages/moderation/src/locales/fr-FR/index.json b/packages/moderation/src/locales/fr-FR/index.json
index 64731b4aa9..41e4a2e0d9 100644
--- a/packages/moderation/src/locales/fr-FR/index.json
+++ b/packages/moderation/src/locales/fr-FR/index.json
@@ -254,9 +254,6 @@
   "nags.upload-gallery-image.description": {
     "defaultMessage": "Au moins une image dans la galerie est nécessaire pour montrer le contenu de votre {type}."
   },
-  "nags.upload-gallery-image.resourcepack-type": {
-    "defaultMessage": "pack de ressource, sauf pour les packs d'audio ou de localisation. Si cela décrit votre pack, veuillez sélectionner les étiquettes appropriées"
-  },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "Ajouter une image à la galerie"
   },
@@ -279,4 +276,3 @@
     "defaultMessage": "Accéder aux paramètres des liens"
   }
 }
-
diff --git a/packages/moderation/src/locales/hu-HU/index.json b/packages/moderation/src/locales/hu-HU/index.json
index af08873992..9bd7b6f18d 100644
--- a/packages/moderation/src/locales/hu-HU/index.json
+++ b/packages/moderation/src/locales/hu-HU/index.json
@@ -254,9 +254,6 @@
   "nags.upload-gallery-image.description": {
     "defaultMessage": "Legalább egy kép megadása szükséged a te {type}-od alapján."
   },
-  "nags.upload-gallery-image.resourcepack-type": {
-    "defaultMessage": "forráscsomag, kivéve a hang illetve a fordításos csomagok. Ha ez leírja a csomagod akkor válaszd ki a megfelelő címkét"
-  },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "Tölts fel egy képet"
   },
@@ -279,4 +276,3 @@
     "defaultMessage": "Látogasd meg a linkbeállításokat"
   }
 }
-
diff --git a/packages/moderation/src/locales/id-ID/index.json b/packages/moderation/src/locales/id-ID/index.json
index 5a17ff7d56..b43f5bf93a 100644
--- a/packages/moderation/src/locales/id-ID/index.json
+++ b/packages/moderation/src/locales/id-ID/index.json
@@ -254,9 +254,6 @@
   "nags.upload-gallery-image.description": {
     "defaultMessage": "Setidaknya satu gambar galeri diperlukan untuk memamerkan konten dari {type} Anda."
   },
-  "nags.upload-gallery-image.resourcepack-type": {
-    "defaultMessage": "paket sumber, kecuali untuk paket suara atau penerjemahan. Bila keterangan ini sesuai dengan paket Anda, mohon pilih tag yang sesuai"
-  },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "Unggah gambar galeri"
   },
@@ -279,4 +276,3 @@
     "defaultMessage": "Kunjungi pengaturan tautan"
   }
 }
-
diff --git a/packages/moderation/src/locales/it-IT/index.json b/packages/moderation/src/locales/it-IT/index.json
index 667bc2098b..0ce9d4b100 100644
--- a/packages/moderation/src/locales/it-IT/index.json
+++ b/packages/moderation/src/locales/it-IT/index.json
@@ -245,9 +245,6 @@
   "nags.too-many-tags.title": {
     "defaultMessage": "Seleziona i tag pertinenti"
   },
-  "nags.upload-gallery-image.resourcepack-type": {
-    "defaultMessage": "pacchetto di risorse, eccetto per audio e localizzazioni. Se ciò descrive il pacchetto, seleziona il tag appropriato"
-  },
   "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 7f96364ef0..84725ee57d 100644
--- a/packages/moderation/src/locales/ja-JP/index.json
+++ b/packages/moderation/src/locales/ja-JP/index.json
@@ -254,9 +254,6 @@
   "nags.upload-gallery-image.description": {
     "defaultMessage": "{type}の内容を展示するには、少なくとも１枚の画像が必要です。"
   },
-  "nags.upload-gallery-image.resourcepack-type": {
-    "defaultMessage": "音声パックや翻訳パックを除くリソースパックに該当する場合は、適切なタグを選択してください"
-  },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "ギャラリー画像をアップロード"
   },
@@ -279,4 +276,3 @@
     "defaultMessage": "リンク設定を表示"
   }
 }
-
diff --git a/packages/moderation/src/locales/ko-KR/index.json b/packages/moderation/src/locales/ko-KR/index.json
index 87e6b0b768..75ee8e2f5f 100644
--- a/packages/moderation/src/locales/ko-KR/index.json
+++ b/packages/moderation/src/locales/ko-KR/index.json
@@ -254,9 +254,6 @@
   "nags.upload-gallery-image.description": {
     "defaultMessage": "{type}의 내용을 보여주기 위해서는 갤러리 이미지가 최소 한 장 이상 필요합니다."
   },
-  "nags.upload-gallery-image.resourcepack-type": {
-    "defaultMessage": "오디오나 현지화 팩을 제외한 리소스 팩입니다. 팩이 이에 해당한다면, 적절한 태그를 선택해 주세요"
-  },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "갤러리 이미지 업로드"
   },
@@ -279,4 +276,3 @@
     "defaultMessage": "링크 설정 방문"
   }
 }
-
diff --git a/packages/moderation/src/locales/ms-MY/index.json b/packages/moderation/src/locales/ms-MY/index.json
index 8b145e8cf8..a8bf81c6a3 100644
--- a/packages/moderation/src/locales/ms-MY/index.json
+++ b/packages/moderation/src/locales/ms-MY/index.json
@@ -227,9 +227,6 @@
   "nags.upload-gallery-image.description": {
     "defaultMessage": "Sekurang-kurangnya satu gambar galeri diperlukan untuk mempamerkan kandungan {type} anda."
   },
-  "nags.upload-gallery-image.resourcepack-type": {
-    "defaultMessage": "pek sumber anda, melainkan ianya pek audio atau terjemahan. Jika pek ini adalah pek audio atau terjemahan, sila pilih tag yang sesuai"
-  },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "Muat naik gambar galeri"
   },
@@ -252,4 +249,3 @@
     "defaultMessage": "Kunjungi tetapan pautan"
   }
 }
-
diff --git a/packages/moderation/src/locales/nl-NL/index.json b/packages/moderation/src/locales/nl-NL/index.json
index 056db50986..5abda570ae 100644
--- a/packages/moderation/src/locales/nl-NL/index.json
+++ b/packages/moderation/src/locales/nl-NL/index.json
@@ -254,9 +254,6 @@
   "nags.upload-gallery-image.description": {
     "defaultMessage": "Er is minstens één afbeelding in de galerij vereist om de inhoud van je {type} te tonen."
   },
-  "nags.upload-gallery-image.resourcepack-type": {
-    "defaultMessage": "bronpakket, met uitzondering van audio- of lokalisatiepakketten. Als dit op jouw pakket van toepassing is, selecteer dan de juiste tag"
-  },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "Upload een galerijafbeelding"
   },
@@ -279,4 +276,3 @@
     "defaultMessage": "Bezoek linkjes instellingen"
   }
 }
-
diff --git a/packages/moderation/src/locales/pl-PL/index.json b/packages/moderation/src/locales/pl-PL/index.json
index 62366fc681..9853913326 100644
--- a/packages/moderation/src/locales/pl-PL/index.json
+++ b/packages/moderation/src/locales/pl-PL/index.json
@@ -254,9 +254,6 @@
   "nags.upload-gallery-image.description": {
     "defaultMessage": "Przynajmniej jeden z obrazów w galerii musi pokazywać zawartość {type}."
   },
-  "nags.upload-gallery-image.resourcepack-type": {
-    "defaultMessage": "paczki zasobów, z wyjątkiem paczek zasobów z dźwiękami bądź tłumaczeniami. Jeżeli opisuje to Twoją paczkę zasobów, wybierz odpowiedni tag"
-  },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "Prześlij obraz do galerii"
   },
@@ -279,4 +276,3 @@
     "defaultMessage": "Odwiedź ustawienia linków"
   }
 }
-
diff --git a/packages/moderation/src/locales/pt-BR/index.json b/packages/moderation/src/locales/pt-BR/index.json
index b2842318fb..275d3197ca 100644
--- a/packages/moderation/src/locales/pt-BR/index.json
+++ b/packages/moderation/src/locales/pt-BR/index.json
@@ -254,9 +254,6 @@
   "nags.upload-gallery-image.description": {
     "defaultMessage": "Pelo menos uma imagem de galeria é necessária para mostrar o conteúdo do seu {type}."
   },
-  "nags.upload-gallery-image.resourcepack-type": {
-    "defaultMessage": "pacote de recursos, exceto pacotes de áudio ou localização. Se esta descrição se aplica ao seu pacote, selecione a etiqueta apropriada"
-  },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "Envie uma imagem para a galeria"
   },
@@ -279,4 +276,3 @@
     "defaultMessage": "Visitar página de links"
   }
 }
-
diff --git a/packages/moderation/src/locales/ru-RU/index.json b/packages/moderation/src/locales/ru-RU/index.json
index 79d9a125ad..60234043fe 100644
--- a/packages/moderation/src/locales/ru-RU/index.json
+++ b/packages/moderation/src/locales/ru-RU/index.json
@@ -254,9 +254,6 @@
   "nags.upload-gallery-image.description": {
     "defaultMessage": "Нужно минимум одно изображение, чтобы показать контент, входящий в {type}."
   },
-  "nags.upload-gallery-image.resourcepack-type": {
-    "defaultMessage": "набор ресурсов, кроме наборов аудио и локализации. Если это описывает ваш набор, выберите подходящий тег"
-  },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "Добавьте изображения"
   },
@@ -279,4 +276,3 @@
     "defaultMessage": "Настроить ссылки"
   }
 }
-
diff --git a/packages/moderation/src/locales/sr-CS/index.json b/packages/moderation/src/locales/sr-CS/index.json
index aa62f23f33..c4870fbc39 100644
--- a/packages/moderation/src/locales/sr-CS/index.json
+++ b/packages/moderation/src/locales/sr-CS/index.json
@@ -254,9 +254,6 @@
   "nags.upload-gallery-image.description": {
     "defaultMessage": "Barem jedna slika u geliriji je potrebna da bi se predstavio sadržaj tvog {type}."
   },
-  "nags.upload-gallery-image.resourcepack-type": {
-    "defaultMessage": "resurs paket, osim za audio ili paket za lokalizacije. Ako to opisuje tvoj paket, molimo izaberi tačnu oznaku"
-  },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "Postavi sliku za geleriju"
   },
@@ -279,4 +276,3 @@
     "defaultMessage": "Posjeti podešavanja linkova"
   }
 }
-
diff --git a/packages/moderation/src/locales/sv-SE/index.json b/packages/moderation/src/locales/sv-SE/index.json
index 31baf4f519..9f3ea9d520 100644
--- a/packages/moderation/src/locales/sv-SE/index.json
+++ b/packages/moderation/src/locales/sv-SE/index.json
@@ -254,9 +254,6 @@
   "nags.upload-gallery-image.description": {
     "defaultMessage": "Åtminstone en galleribild måste visa innehållet av din {type}."
   },
-  "nags.upload-gallery-image.resourcepack-type": {
-    "defaultMessage": "resurspaket, förutom ljud eller lokaliseringspaket. Om detta beskriver ditt paket, vänligen välj den passande taggen"
-  },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "Ladda upp en galleribild"
   },
@@ -279,4 +276,3 @@
     "defaultMessage": "Besök länkinställningar"
   }
 }
-
diff --git a/packages/moderation/src/locales/tr-TR/index.json b/packages/moderation/src/locales/tr-TR/index.json
index 4097eaf942..d3c8623792 100644
--- a/packages/moderation/src/locales/tr-TR/index.json
+++ b/packages/moderation/src/locales/tr-TR/index.json
@@ -254,9 +254,6 @@
   "nags.upload-gallery-image.description": {
     "defaultMessage": "{type} içeriğinizi sergilemek için en az bir galeri görseli gereklidir."
   },
-  "nags.upload-gallery-image.resourcepack-type": {
-    "defaultMessage": "ses veya yerelleştirme paketleri hariç kaynak paketi. Eğer paketiniz bu tanıma uyuyorsa, lütfen uygun etiketi seçin"
-  },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "Galeriye resim yükle"
   },
@@ -279,4 +276,3 @@
     "defaultMessage": "Bağlantı ayarlarına göz at"
   }
 }
-
diff --git a/packages/moderation/src/locales/uk-UA/index.json b/packages/moderation/src/locales/uk-UA/index.json
index 7c92a6ef2a..46391f770c 100644
--- a/packages/moderation/src/locales/uk-UA/index.json
+++ b/packages/moderation/src/locales/uk-UA/index.json
@@ -254,9 +254,6 @@
   "nags.upload-gallery-image.description": {
     "defaultMessage": "Потрібно щонайменше одне зображення з галереї, щоб показати вміст вашого {type}."
   },
-  "nags.upload-gallery-image.resourcepack-type": {
-    "defaultMessage": "пакет ресурсів, окрім аудіопакетів або пакетів локалізації. Якщо це відповідає вашому пакету, будь ласка, оберіть відповідний теґ"
-  },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "Завантажте зображення до галереї"
   },
@@ -279,4 +276,3 @@
     "defaultMessage": "Відвідайте налаштування посилань"
   }
 }
-
diff --git a/packages/moderation/src/locales/vi-VN/index.json b/packages/moderation/src/locales/vi-VN/index.json
index b19b3bda81..cb2ddcda50 100644
--- a/packages/moderation/src/locales/vi-VN/index.json
+++ b/packages/moderation/src/locales/vi-VN/index.json
@@ -254,9 +254,6 @@
   "nags.upload-gallery-image.description": {
     "defaultMessage": "Cần ít nhất một hình ảnh minh họa cho {type}."
   },
-  "nags.upload-gallery-image.resourcepack-type": {
-    "defaultMessage": "gói tài nguyên, trừ gói tài nguyên nhạc hoặc phiên dịch. Nếu các trường hợp trên bao gồm gói tài nguyên của bạn, hãy lựa chọn một nhãn thích hợp"
-  },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "Tải lên hình ảnh thư viện"
   },
@@ -279,4 +276,3 @@
     "defaultMessage": "Truy cập cài đặt liên kết"
   }
 }
-
diff --git a/packages/moderation/src/locales/zh-CN/index.json b/packages/moderation/src/locales/zh-CN/index.json
index 4620918e6f..25e96372bd 100644
--- a/packages/moderation/src/locales/zh-CN/index.json
+++ b/packages/moderation/src/locales/zh-CN/index.json
@@ -254,9 +254,6 @@
   "nags.upload-gallery-image.description": {
     "defaultMessage": "至少需要一个图像来展示你的 {type}的内容。"
   },
-  "nags.upload-gallery-image.resourcepack-type": {
-    "defaultMessage": "资源包，但不包括音频包或本地化包。如果你的内容符合这一描述，请选择相应的标签"
-  },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "上传图片至项目图库"
   },
@@ -279,4 +276,3 @@
     "defaultMessage": "访问链接设置"
   }
 }
-
diff --git a/packages/moderation/src/locales/zh-TW/index.json b/packages/moderation/src/locales/zh-TW/index.json
index 0234e73ab5..7d7ad267e5 100644
--- a/packages/moderation/src/locales/zh-TW/index.json
+++ b/packages/moderation/src/locales/zh-TW/index.json
@@ -254,9 +254,6 @@
   "nags.upload-gallery-image.description": {
     "defaultMessage": "需要至少一張圖庫圖片來展示你的{type}。"
   },
-  "nags.upload-gallery-image.resourcepack-type": {
-    "defaultMessage": "資源包（音效包或在地化語言包除外）。如果你的資源包屬於上述類型，請選擇對應的標籤"
-  },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "上傳圖庫圖片"
   },
@@ -279,4 +276,3 @@
     "defaultMessage": "前往連結設定"
   }
 }
-

From cc53d9a6f843a6e03526cfdd815c2c5d0dc76be3 Mon Sep 17 00:00:00 2001
From: Slackow <32826498+Slackow@users.noreply.github.com>
Date: Tue, 4 Aug 2026 15:23:07 -0700
Subject: [PATCH 30/82] feat: support supplementary environment variables for
 hooks in App (#5916)

* feat: Implement launcher supplementary environmental variables, and env var substitution in hooks

* lint fix, prettier reformat

* descriptions added for each environment variable for hook settings

* alphabetize language keys

---------

Co-authored-by: Prospector <6166773+Prospector@users.noreply.github.com>
---
 .../instances/DefaultInstanceSettings.vue     |  41 +++++
 .../app-frontend/src/locales/en-US/index.json |  21 +++
 .../settings-modal/hooks-settings.vue         |  41 +++++
 packages/app-lib/src/api/instance/run.rs      | 138 ++++++++++-----
 packages/app-lib/src/launcher/hooks.rs        | 165 ++++++++++++++++++
 packages/app-lib/src/launcher/mod.rs          |  60 ++++++-
 packages/app-lib/src/state/process.rs         |   5 +-
 7 files changed, 430 insertions(+), 41 deletions(-)
 create mode 100644 packages/app-lib/src/launcher/hooks.rs

diff --git a/apps/app-frontend/src/components/ui/settings/instances/DefaultInstanceSettings.vue b/apps/app-frontend/src/components/ui/settings/instances/DefaultInstanceSettings.vue
index 02183800b6..fcfa509e8b 100644
--- a/apps/app-frontend/src/components/ui/settings/instances/DefaultInstanceSettings.vue
+++ b/apps/app-frontend/src/components/ui/settings/instances/DefaultInstanceSettings.vue
@@ -116,6 +116,35 @@ const messages = defineMessages({
 		id: 'app.settings.default-instance-options.post-exit-hook.description',
 		defaultMessage: 'Runs after the game closes.',
 	},
+	hookVariablesDescription: {
+		id: 'instance.settings.tabs.hooks.variables.description',
+		defaultMessage:
+			'Hooks run in the working directory of the instance, with the following variables:',
+	},
+	instanceNameDescription: {
+		id: 'instance.settings.tabs.hooks.variables.inst-name.description',
+		defaultMessage: '$INST_NAME: The name of the instance',
+	},
+	instanceIdDescription: {
+		id: 'instance.settings.tabs.hooks.variables.inst-id.description',
+		defaultMessage: "$INST_ID: The name of the instance's folder",
+	},
+	instanceDirDescription: {
+		id: 'instance.settings.tabs.hooks.variables.inst-dir.description',
+		defaultMessage: "$INST_DIR: The absolute path to the instance's folder",
+	},
+	instanceMcDirDescription: {
+		id: 'instance.settings.tabs.hooks.variables.inst-mc-dir.description',
+		defaultMessage: '$INST_MC_DIR: An alias for $INST_DIR',
+	},
+	instanceJavaDescription: {
+		id: 'instance.settings.tabs.hooks.variables.inst-java.description',
+		defaultMessage: '$INST_JAVA: The absolute path to the java binary',
+	},
+	instanceJavaArgsDescription: {
+		id: 'instance.settings.tabs.hooks.variables.inst-java-args.description',
+		defaultMessage: '$INST_JAVA_ARGS: The JVM Arguments provided to the game',
+	},
 })
 
 const fetchSettings = await get()
@@ -328,6 +357,18 @@ watch(
 					{{ formatMessage(messages.postExitHookDescription) }}
 				</p>
 			</div>
+
+			<div class="m-0 leading-tight">
+				{{ formatMessage(messages.hookVariablesDescription) }}
+				<ul>
+					<li>{{ formatMessage(messages.instanceNameDescription) }}</li>
+					<li>{{ formatMessage(messages.instanceIdDescription) }}</li>
+					<li>{{ formatMessage(messages.instanceDirDescription) }}</li>
+					<li>{{ formatMessage(messages.instanceMcDirDescription) }}</li>
+					<li>{{ formatMessage(messages.instanceJavaDescription) }}</li>
+					<li>{{ formatMessage(messages.instanceJavaArgsDescription) }}</li>
+				</ul>
+			</div>
 		</div>
 	</div>
 </template>
diff --git a/apps/app-frontend/src/locales/en-US/index.json b/apps/app-frontend/src/locales/en-US/index.json
index 43b1bbefde..884e06f247 100644
--- a/apps/app-frontend/src/locales/en-US/index.json
+++ b/apps/app-frontend/src/locales/en-US/index.json
@@ -1625,6 +1625,27 @@
   "instance.settings.tabs.hooks.title": {
     "message": "Game launch hooks"
   },
+  "instance.settings.tabs.hooks.variables.description": {
+    "message": "Hooks run in the working directory of the instance, with the following variables:"
+  },
+  "instance.settings.tabs.hooks.variables.inst-dir.description": {
+    "message": "$INST_DIR: The absolute path to the instance's folder"
+  },
+  "instance.settings.tabs.hooks.variables.inst-id.description": {
+    "message": "$INST_ID: The name of the instance's folder"
+  },
+  "instance.settings.tabs.hooks.variables.inst-java-args.description": {
+    "message": "$INST_JAVA_ARGS: The JVM Arguments provided to the game"
+  },
+  "instance.settings.tabs.hooks.variables.inst-java.description": {
+    "message": "$INST_JAVA: The absolute path to the java binary"
+  },
+  "instance.settings.tabs.hooks.variables.inst-mc-dir.description": {
+    "message": "$INST_MC_DIR: An alias for $INST_DIR"
+  },
+  "instance.settings.tabs.hooks.variables.inst-name.description": {
+    "message": "$INST_NAME: The name of the instance"
+  },
   "instance.settings.tabs.hooks.wrapper": {
     "message": "Wrapper"
   },
diff --git a/apps/app-frontend/src/pages/instance/components/settings-modal/hooks-settings.vue b/apps/app-frontend/src/pages/instance/components/settings-modal/hooks-settings.vue
index 6af96227b2..a40a173b8e 100644
--- a/apps/app-frontend/src/pages/instance/components/settings-modal/hooks-settings.vue
+++ b/apps/app-frontend/src/pages/instance/components/settings-modal/hooks-settings.vue
@@ -56,6 +56,35 @@ const messages = defineMessages({
 		defaultMessage:
 			'Hooks allow advanced users to run certain system commands before and after launching the game.',
 	},
+	hookVariablesDescription: {
+		id: 'instance.settings.tabs.hooks.variables.description',
+		defaultMessage:
+			'Hooks run in the working directory of the instance, with the following variables:',
+	},
+	instanceNameDescription: {
+		id: 'instance.settings.tabs.hooks.variables.inst-name.description',
+		defaultMessage: '$INST_NAME: The name of the instance',
+	},
+	instanceIdDescription: {
+		id: 'instance.settings.tabs.hooks.variables.inst-id.description',
+		defaultMessage: "$INST_ID: The name of the instance's folder",
+	},
+	instanceDirDescription: {
+		id: 'instance.settings.tabs.hooks.variables.inst-dir.description',
+		defaultMessage: "$INST_DIR: The absolute path to the instance's folder",
+	},
+	instanceMcDirDescription: {
+		id: 'instance.settings.tabs.hooks.variables.inst-mc-dir.description',
+		defaultMessage: '$INST_MC_DIR: An alias for $INST_DIR',
+	},
+	instanceJavaDescription: {
+		id: 'instance.settings.tabs.hooks.variables.inst-java.description',
+		defaultMessage: '$INST_JAVA: The absolute path to the java binary',
+	},
+	instanceJavaArgsDescription: {
+		id: 'instance.settings.tabs.hooks.variables.inst-java-args.description',
+		defaultMessage: '$INST_JAVA_ARGS: The JVM Arguments provided to the game',
+	},
 	customHooks: {
 		id: 'instance.settings.tabs.hooks.custom-hooks',
 		defaultMessage: 'Custom launch hooks',
@@ -153,5 +182,17 @@ const messages = defineMessages({
 		<p class="m-0">
 			{{ formatMessage(messages.postExitDescription) }}
 		</p>
+
+		<div class="m-0 mt-6">
+			{{ formatMessage(messages.hookVariablesDescription) }}
+		</div>
+		<ul class="m-0 mt-2">
+			<li>{{ formatMessage(messages.instanceNameDescription) }}</li>
+			<li>{{ formatMessage(messages.instanceIdDescription) }}</li>
+			<li>{{ formatMessage(messages.instanceDirDescription) }}</li>
+			<li>{{ formatMessage(messages.instanceMcDirDescription) }}</li>
+			<li>{{ formatMessage(messages.instanceJavaDescription) }}</li>
+			<li>{{ formatMessage(messages.instanceJavaArgsDescription) }}</li>
+		</ul>
 	</div>
 </template>
diff --git a/packages/app-lib/src/api/instance/run.rs b/packages/app-lib/src/api/instance/run.rs
index e5615ddedc..17de3a88f3 100644
--- a/packages/app-lib/src/api/instance/run.rs
+++ b/packages/app-lib/src/api/instance/run.rs
@@ -79,15 +79,95 @@ async fn run_credentials(
         .into());
     }
 
-    let pre_launch_hooks = context
+    let pre_launch_hook = context
         .launch_overrides
         .hooks
         .pre_launch
         .as_ref()
         .or(settings.hooks.pre_launch.as_ref())
         .filter(|hook_command| !hook_command.is_empty());
-    if let Some(hook) = pre_launch_hooks {
-        let mut cmd = shlex::split(hook)
+
+    let java_args = context
+        .launch_overrides
+        .extra_launch_args
+        .clone()
+        .unwrap_or(settings.extra_launch_args);
+
+    let wrapper = context
+        .launch_overrides
+        .hooks
+        .wrapper
+        .clone()
+        .or(settings.hooks.wrapper)
+        .filter(|hook_command| !hook_command.is_empty());
+
+    let env_args = context
+        .launch_overrides
+        .custom_env_vars
+        .clone()
+        .unwrap_or(settings.custom_env_vars);
+
+    let post_exit_hook = context
+        .launch_overrides
+        .hooks
+        .post_exit
+        .clone()
+        .or(settings.hooks.post_exit)
+        .filter(|hook_command| !hook_command.is_empty());
+
+    let memory = context.launch_overrides.memory.unwrap_or(settings.memory);
+    let resolution = context
+        .launch_overrides
+        .game_resolution
+        .unwrap_or(settings.game_resolution);
+    let has_hook_commands = pre_launch_hook.is_some()
+        || wrapper.is_some()
+        || post_exit_hook.is_some();
+    let full_path = if has_hook_commands {
+        Some(crate::util::io::canonicalize(
+            state
+                .directories
+                .instances_dir()
+                .join(&context.instance.path),
+        )?)
+    } else {
+        None
+    };
+    let hook_environment = if has_hook_commands {
+        let full_path = full_path
+            .as_ref()
+            .expect("hooked launches always resolve their instance path");
+        let java_version =
+            crate::launcher::resolve_java_for_launch(&context).await?;
+
+        Some(crate::launcher::hooks::HookEnvironment::from_current_env(
+            &env_args,
+            crate::launcher::hooks::HookVariables {
+                instance_name: context.instance.name.clone(),
+                instance_id: context.instance.path.clone(),
+                instance_dir: full_path.to_string_lossy().to_string(),
+                java_path: java_version.path.clone(),
+                java_args: crate::launcher::hooks::build_hook_java_args(
+                    &java_args,
+                    memory,
+                    &java_version,
+                ),
+            },
+        ))
+    } else {
+        None
+    };
+    let launch_env_args = hook_environment
+        .as_ref()
+        .map_or_else(|| env_args.clone(), |env| env.injected_envs());
+
+    if let (Some(hook), Some(hook_environment), Some(full_path)) = (
+        pre_launch_hook,
+        hook_environment.as_ref(),
+        full_path.as_ref(),
+    ) {
+        let expanded_hook = hook_environment.expand(hook);
+        let mut cmd = shlex::split(&expanded_hook)
             .ok_or_else(|| {
                 crate::ErrorKind::LauncherError(format!(
                     "Invalid pre-launch command: {hook}",
@@ -96,17 +176,12 @@ async fn run_credentials(
             .into_iter();
 
         if let Some(command) = cmd.next() {
-            let full_path = crate::util::io::canonicalize(
-                state
-                    .directories
-                    .instances_dir()
-                    .join(&context.instance.path),
-            )?;
             let result = Command::new(command)
                 .args(cmd)
-                .current_dir(&full_path)
+                .envs(launch_env_args.iter().cloned())
+                .current_dir(full_path)
                 .spawn()
-                .map_err(|e| IOError::with_path(e, &full_path))?
+                .map_err(|e| IOError::with_path(e, full_path))?
                 .wait()
                 .await
                 .map_err(IOError::from)?;
@@ -121,34 +196,19 @@ async fn run_credentials(
         }
     }
 
-    let java_args = context
-        .launch_overrides
-        .extra_launch_args
-        .clone()
-        .unwrap_or(settings.extra_launch_args);
-    let wrapper = context
-        .launch_overrides
-        .hooks
-        .wrapper
-        .clone()
-        .or(settings.hooks.wrapper)
+    let wrapper = wrapper
+        .map(|hook| {
+            hook_environment
+                .as_ref()
+                .map_or(hook.clone(), |env| env.expand(&hook))
+        })
         .filter(|hook_command| !hook_command.is_empty());
-    let memory = context.launch_overrides.memory.unwrap_or(settings.memory);
-    let resolution = context
-        .launch_overrides
-        .game_resolution
-        .unwrap_or(settings.game_resolution);
-    let env_args = context
-        .launch_overrides
-        .custom_env_vars
-        .clone()
-        .unwrap_or(settings.custom_env_vars);
-    let post_exit_hook = context
-        .launch_overrides
-        .hooks
-        .post_exit
-        .clone()
-        .or(settings.hooks.post_exit)
+    let post_exit_hook = post_exit_hook
+        .map(|hook| {
+            hook_environment
+                .as_ref()
+                .map_or(hook.clone(), |env| env.expand(&hook))
+        })
         .filter(|hook_command| !hook_command.is_empty());
 
     let mut mc_set_options: Vec<(String, String)> = vec![];
@@ -210,7 +270,7 @@ async fn run_credentials(
     crate::minecraft_skins::flush_pending_skin_change().await?;
     crate::launcher::launch_minecraft(
         &java_args,
-        &env_args,
+        &launch_env_args,
         &mc_set_options,
         &wrapper,
         &memory,
diff --git a/packages/app-lib/src/launcher/hooks.rs b/packages/app-lib/src/launcher/hooks.rs
new file mode 100644
index 0000000000..942e2d0420
--- /dev/null
+++ b/packages/app-lib/src/launcher/hooks.rs
@@ -0,0 +1,165 @@
+use crate::state::{JavaVersion, MemorySettings};
+use regex::{Captures, Regex};
+use std::collections::BTreeMap;
+use std::sync::LazyLock;
+
+static ENV_VAR_PATTERN: LazyLock<Regex> =
+    LazyLock::new(|| Regex::new(r"\$(\w+)").expect("valid env var regex"));
+
+#[derive(Debug, Clone)]
+pub(crate) struct HookVariables {
+    pub instance_name: String,
+    pub instance_id: String,
+    pub instance_dir: String,
+    pub java_path: String,
+    pub java_args: String,
+}
+
+#[derive(Debug, Clone)]
+pub(crate) struct HookEnvironment {
+    lookup_env: BTreeMap<String, String>,
+    injected_env: BTreeMap<String, String>,
+}
+
+impl HookEnvironment {
+    pub(crate) fn from_current_env(
+        custom_env_vars: &[(String, String)],
+        variables: HookVariables,
+    ) -> Self {
+        Self::new(
+            std::env::vars_os().map(|(key, value)| {
+                (
+                    key.to_string_lossy().into_owned(),
+                    value.to_string_lossy().into_owned(),
+                )
+            }),
+            custom_env_vars,
+            variables,
+        )
+    }
+
+    fn new(
+        process_env: impl IntoIterator<Item = (String, String)>,
+        custom_env_vars: &[(String, String)],
+        variables: HookVariables,
+    ) -> Self {
+        let mut lookup_env =
+            process_env.into_iter().collect::<BTreeMap<_, _>>();
+        let mut injected_env = BTreeMap::new();
+
+        for (key, value) in custom_env_vars {
+            lookup_env.insert(key.clone(), value.clone());
+            injected_env.insert(key.clone(), value.clone());
+        }
+
+        let hook_vars = [
+            ("INST_NAME", variables.instance_name),
+            ("INST_ID", variables.instance_id),
+            ("INST_DIR", variables.instance_dir.clone()),
+            ("INST_MC_DIR", variables.instance_dir),
+            ("INST_JAVA", variables.java_path),
+            ("INST_JAVA_ARGS", variables.java_args),
+        ];
+
+        for (key, value) in hook_vars {
+            let key = key.to_string();
+            lookup_env.insert(key.clone(), value.clone());
+            injected_env.insert(key, value);
+        }
+
+        Self {
+            lookup_env,
+            injected_env,
+        }
+    }
+
+    pub(crate) fn expand(&self, input: &str) -> String {
+        ENV_VAR_PATTERN
+            .replace_all(input, |captures: &Captures| {
+                self.lookup_env
+                    .get(&captures[1])
+                    .cloned()
+                    .unwrap_or_else(|| captures[0].to_string())
+            })
+            .into_owned()
+    }
+
+    pub(crate) fn injected_envs(&self) -> Vec<(String, String)> {
+        self.injected_env
+            .iter()
+            .map(|(key, value)| (key.clone(), value.clone()))
+            .collect()
+    }
+}
+
+pub(crate) fn build_hook_java_args(
+    java_args: &[String],
+    memory: MemorySettings,
+    java_version: &JavaVersion,
+) -> String {
+    let mut args = vec![format!("-Xmx{}M", memory.maximum)];
+
+    args.extend(java_args.iter().filter(|arg| !arg.is_empty()).cloned());
+
+    if java_version.parsed_version >= 9 {
+        args.push(
+            "--add-opens=java.base/java.lang.reflect=ALL-UNNAMED".to_string(),
+        );
+    }
+
+    if java_version.parsed_version >= 25 {
+        args.push(
+            "--add-opens=jdk.internal/jdk.internal.misc=ALL-UNNAMED"
+                .to_string(),
+        );
+    }
+
+    args.join(" ")
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn sample_variables() -> HookVariables {
+        HookVariables {
+            instance_name: "Test Instance".to_string(),
+            instance_id: "test-instance".to_string(),
+            instance_dir: "/profiles/test-instance".to_string(),
+            java_path: "/java/bin/java".to_string(),
+            java_args: "-Xmx4096M".to_string(),
+        }
+    }
+
+    #[test]
+    fn expands_builtin_and_custom_variables() {
+        let env = HookEnvironment::new(
+            [("HOME".to_string(), "/home/alex".to_string())],
+            &[("CUSTOM_VAR".to_string(), "custom".to_string())],
+            sample_variables(),
+        );
+
+        assert_eq!(
+            env.expand("$HOME/$INST_ID/$CUSTOM_VAR"),
+            "/home/alex/test-instance/custom"
+        );
+    }
+
+    #[test]
+    fn leaves_unknown_variables_untouched() {
+        let env = HookEnvironment::new([], &[], sample_variables());
+
+        assert_eq!(env.expand("$UNKNOWN/$INST_NAME"), "$UNKNOWN/Test Instance");
+    }
+
+    #[test]
+    fn expands_empty_variables_to_empty_strings() {
+        let env = HookEnvironment::new(
+            [("EMPTY_VAR".to_string(), String::new())],
+            &[],
+            sample_variables(),
+        );
+
+        assert_eq!(env.expand("prefix$EMPTY_VAR-suffix"), "prefix-suffix");
+    }
+}
diff --git a/packages/app-lib/src/launcher/mod.rs b/packages/app-lib/src/launcher/mod.rs
index 1b24a9693f..6575e8fe5f 100644
--- a/packages/app-lib/src/launcher/mod.rs
+++ b/packages/app-lib/src/launcher/mod.rs
@@ -32,6 +32,7 @@ use std::path::PathBuf;
 use tokio::process::Command;
 
 mod args;
+pub(crate) mod hooks;
 
 pub mod download;
 pub mod quick_play_version;
@@ -214,6 +215,62 @@ fn loader_versions_for_game_version<'a>(
     }
 }
 
+pub(crate) async fn resolve_java_for_launch(
+    context: &InstanceLaunchContext,
+) -> crate::Result<JavaVersion> {
+    let state = State::get().await?;
+    let content_set = &context.applied_content_set;
+    let (minecraft, version_index) =
+        resolve_minecraft_manifest(&content_set.game_version, &state).await?;
+    let version = &minecraft.versions[version_index];
+
+    let mut loader_version = get_loader_version_from_profile(
+        &content_set.game_version,
+        content_set.loader,
+        content_set.loader_version.as_deref(),
+    )
+    .await?;
+
+    if content_set.loader != ModLoader::Vanilla && loader_version.is_none() {
+        loader_version = get_loader_version_from_profile(
+            &content_set.game_version,
+            content_set.loader,
+            Some("stable"),
+        )
+        .await?;
+    }
+
+    let version_info = download::download_version_info(
+        &state,
+        version,
+        loader_version.as_ref(),
+        None,
+        None,
+        None,
+    )
+    .await?;
+
+    let key = version_info
+        .java_version
+        .as_ref()
+        .map_or(8, |it| it.major_version);
+    let (java_path, set_java) = if let Some(java_version) =
+        get_java_version_from_launch_context(context, &version_info).await?
+    {
+        (PathBuf::from(java_version.path), false)
+    } else {
+        (crate::api::jre::auto_install_java(key).await?, true)
+    };
+
+    let java_version = crate::api::jre::check_jre(java_path).await?;
+
+    if set_java {
+        java_version.upsert(&state.pool).await?;
+    }
+
+    Ok(java_version)
+}
+
 /// Resolves the Minecraft version manifest and finds the index for the given
 /// game version. If the version isn't found in the cache, forces a manifest
 /// refresh to pick up newly-released versions.
@@ -998,7 +1055,7 @@ pub async fn launch_minecraft(
     // Java options should be set in instance options (the existence of _JAVA_OPTIONS overwrites them)
     command.env_remove("_JAVA_OPTIONS");
 
-    command.envs(env_args);
+    command.envs(env_args.iter().cloned());
 
     // Overwrites the minecraft options.txt file with the settings from the profile
     // Uses 'a:b' syntax which is not quite yaml
@@ -1084,6 +1141,7 @@ pub async fn launch_minecraft(
             &instance.name,
             command,
             post_exit_hook,
+            env_args,
             state.directories.instance_logs_dir(&instance.path),
             version_info.logging.is_some(),
             main_class_keep_alive,
diff --git a/packages/app-lib/src/state/process.rs b/packages/app-lib/src/state/process.rs
index 669dac581f..d8ed86e636 100644
--- a/packages/app-lib/src/state/process.rs
+++ b/packages/app-lib/src/state/process.rs
@@ -107,6 +107,7 @@ impl ProcessManager {
         instance_name: &str,
         mut mc_command: Command,
         post_exit_command: Option<String>,
+        post_exit_env_vars: Vec<(String, String)>,
         logs_folder: PathBuf,
         xml_logging: bool,
         main_class_keep_alive: TempDir,
@@ -217,6 +218,7 @@ impl ProcessManager {
             instance_id.to_string(),
             instance_path.to_string(),
             post_exit_command,
+            post_exit_env_vars,
             metadata.uuid,
         ));
 
@@ -750,6 +752,7 @@ impl Process {
         instance_id: String,
         instance_path: String,
         post_exit_command: Option<String>,
+        post_exit_env_vars: Vec<(String, String)>,
         uuid: Uuid,
     ) -> crate::Result<()> {
         async fn update_playtime(
@@ -885,7 +888,7 @@ impl Process {
 
                 if let Some(command) = cmd.next() {
                     let mut command = Command::new(command);
-                    command.args(cmd).current_dir(
+                    command.args(cmd).envs(post_exit_env_vars).current_dir(
                         state.directories.instances_dir().join(&instance_path),
                     );
                     command.spawn().map_err(IOError::from)?;

From 5148e8ec3585ea68c7abe5cdea05744566fc2ddb Mon Sep 17 00:00:00 2001
From: aecsocket <43144841+aecsocket@users.noreply.github.com>
Date: Wed, 5 Aug 2026 19:36:05 +0900
Subject: [PATCH 31/82] feat: use postcard for redis serde (#6956)

* redo error handling in xredis

* give proper types to metadata fields

* add round-trip tests

* inline loader enum metadata fields

* postcard roundtrips

* prepare

* bump redis key version

* serde-binhum

* clippy

* fix

* fix frontend checking existence of component fields rather than non-null-ness

* prepare
---
 Cargo.lock                                    |  14 +-
 Cargo.toml                                    |   2 +
 apps/frontend/src/pages/[type]/[project].vue  |   6 +-
 ...1d32cab210cfaea2205c95d9ca3bbd0ec1cd.json} |  16 +-
 ...358c2b9eac5323ae0795581358ed29e5ba65.json} |  16 +-
 ...19f81d17197673d831d210e351c149e41fc8.json} |  16 +-
 ...34d36eff6902ae55b7ed4d89a10c4d69506a9.json |  50 ---
 ...01ba8dca63912e9d7054115052ad89ab4718.json} |  16 +-
 ...654bd8650dcdd16cb9f74148bef6e932e2837.json |  50 +++
 apps/labrinth/AGENTS.md                       |   4 +-
 apps/labrinth/Cargo.toml                      |   1 +
 apps/labrinth/src/auth/mod.rs                 |   6 -
 .../database/models/analytics_event_item.rs   |   2 +-
 .../src/database/models/categories.rs         |   2 +-
 .../src/database/models/collection_item.rs    |   2 +-
 .../labrinth/src/database/models/flow_item.rs |  32 +-
 .../src/database/models/image_item.rs         |   2 +-
 .../database/models/legacy_loader_fields.rs   |  13 +-
 .../src/database/models/loader_fields.rs      | 131 +++---
 apps/labrinth/src/database/models/mod.rs      |   2 -
 .../database/models/moderation_note_item.rs   |   4 +-
 .../src/database/models/notification_item.rs  |   2 +-
 .../models/notifications_template_item.rs     |  24 +-
 .../models/notifications_type_item.rs         |   2 +-
 .../src/database/models/organization_item.rs  |   4 +-
 apps/labrinth/src/database/models/pat_item.rs |   6 +-
 .../src/database/models/product_item.rs       |   4 +-
 .../src/database/models/project_item.rs       |  25 +-
 .../src/database/models/session_item.rs       |   6 +-
 .../labrinth/src/database/models/team_item.rs |   2 +-
 .../labrinth/src/database/models/user_item.rs |   6 +-
 .../src/database/models/version_item.rs       |  21 +-
 apps/labrinth/src/database/redis.rs           |  56 ---
 apps/labrinth/src/database/redis/mod.rs       | 411 ++++++++++++++++++
 apps/labrinth/src/env.rs                      |   2 +-
 apps/labrinth/src/models/exp/minecraft.rs     |   7 +-
 apps/labrinth/src/models/exp/project.rs       |   3 +-
 apps/labrinth/src/models/v3/billing.rs        |   5 +-
 apps/labrinth/src/models/v3/notifications.rs  |   4 +-
 apps/labrinth/src/queue/analytics/cache.rs    |   2 +-
 apps/labrinth/src/queue/analytics/mod.rs      |  49 ++-
 apps/labrinth/src/queue/server_ping.rs        |   4 +-
 apps/labrinth/src/routes/internal/campaign.rs |   2 +-
 apps/labrinth/src/routes/internal/flows.rs    |   2 +-
 apps/labrinth/src/routes/mod.rs               |   6 -
 apps/labrinth/src/routes/v2/tags.rs           |  13 +-
 apps/labrinth/src/routes/v3/content/mod.rs    |   4 +-
 apps/labrinth/src/routes/v3/tags.rs           |   3 +-
 apps/labrinth/src/search/indexing.rs          |  11 +-
 apps/labrinth/src/sync/friends.rs             |   2 +-
 apps/labrinth/src/sync/status.rs              |   2 +-
 apps/labrinth/src/util/gotenberg.rs           |   2 +-
 apps/labrinth/src/util/ratelimit.rs           |   2 +-
 apps/labrinth/tests/loader_fields.rs          |  14 +-
 apps/labrinth/tests/redis.rs                  |  40 +-
 apps/labrinth/tests/tags.rs                   |   7 +-
 .../api-client/src/modules/labrinth/types.ts  |   7 +-
 packages/serde-binhum/Cargo.toml              |  18 +
 packages/serde-binhum/README.md               | 154 +++++++
 packages/serde-binhum/src/lib.rs              | 390 +++++++++++++++++
 packages/xredis/Cargo.toml                    |   3 +-
 packages/xredis/src/blocking.rs               |  58 ++-
 packages/xredis/src/cache.rs                  | 162 ++++---
 packages/xredis/src/cache/locking/local.rs    |  17 +-
 packages/xredis/src/commands.rs               | 105 +++--
 packages/xredis/src/config.rs                 |  52 ++-
 packages/xredis/src/connection.rs             |  88 ++--
 packages/xredis/src/lib.rs                    |  92 ++--
 packages/xredis/src/metrics.rs                |  40 +-
 packages/xredis/src/pubsub.rs                 |  31 +-
 70 files changed, 1713 insertions(+), 646 deletions(-)
 rename apps/labrinth/.sqlx/{query-04c04958c71c4fab903c46c9185286e7460a6ff7b03cbc90939ac6c7cb526433.json => query-214cc9257db904fd2cc68b8aa8d61d32cab210cfaea2205c95d9ca3bbd0ec1cd.json} (68%)
 rename apps/labrinth/.sqlx/{query-d9c4d536ce0bea290f445c3bccb56b4743f2f3a9ce4b170fb439e0e135ca9d51.json => query-83b7543e426ae348e589b591f249358c2b9eac5323ae0795581358ed29e5ba65.json} (58%)
 rename apps/labrinth/.sqlx/{query-fe34673ce6d7bcb616a5ab2e8900d7dfb4e0fa2ee640128d29d6e4beafe60f4c.json => query-a8569122a309057326be0d49630119f81d17197673d831d210e351c149e41fc8.json} (63%)
 delete mode 100644 apps/labrinth/.sqlx/query-ab9b4b383ce8431214eb26abde734d36eff6902ae55b7ed4d89a10c4d69506a9.json
 rename apps/labrinth/.sqlx/{query-43d4eafdbcb449a56551d3d6edeba0d6e196fa6539e3f9df107c23a74ba962af.json => query-ec9abad348739217eb887e2ac84901ba8dca63912e9d7054115052ad89ab4718.json} (58%)
 create mode 100644 apps/labrinth/.sqlx/query-f21bfe5bcc157d442180bf49c97654bd8650dcdd16cb9f74148bef6e932e2837.json
 delete mode 100644 apps/labrinth/src/database/redis.rs
 create mode 100644 apps/labrinth/src/database/redis/mod.rs
 create mode 100644 packages/serde-binhum/Cargo.toml
 create mode 100644 packages/serde-binhum/README.md
 create mode 100644 packages/serde-binhum/src/lib.rs

diff --git a/Cargo.lock b/Cargo.lock
index b3eefef689..db6f7b0ae2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5515,6 +5515,7 @@ dependencies = [
  "scalar_api_reference",
  "sentry",
  "serde",
+ "serde-binhum",
  "serde_json",
  "serde_with",
  "sha1 0.10.6",
@@ -9379,6 +9380,16 @@ dependencies = [
  "serde_derive",
 ]
 
+[[package]]
+name = "serde-binhum"
+version = "0.1.0"
+dependencies = [
+ "darling 0.23.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+]
+
 [[package]]
 name = "serde-untagged"
 version = "0.1.9"
@@ -13443,12 +13454,13 @@ dependencies = [
  "chrono",
  "dashmap",
  "deadpool-redis",
+ "eyre",
  "futures",
  "lz4_flex",
+ "postcard",
  "prometheus",
  "redis",
  "serde",
- "serde_json",
  "thiserror 2.0.17",
  "tokio",
  "tracing",
diff --git a/Cargo.toml b/Cargo.toml
index 1529ce8910..01c9a1af38 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,6 +15,7 @@ members = [
   "packages/modrinth-util",
   "packages/neverbounce",
   "packages/path-util",
+  "packages/serde-binhum",
   "packages/xredis",
 ]
 
@@ -183,6 +184,7 @@ sentry = { version = "0.45.0", default-features = false, features = [
   "rustls",
 ] }
 serde = "1.0.228"
+serde-binhum = { path = "packages/serde-binhum" }
 serde_bytes = "0.11.19"
 serde_cbor = "0.11.2"
 serde_ini = "0.2.0"
diff --git a/apps/frontend/src/pages/[type]/[project].vue b/apps/frontend/src/pages/[type]/[project].vue
index f0a67eec5e..b60e21f004 100644
--- a/apps/frontend/src/pages/[type]/[project].vue
+++ b/apps/frontend/src/pages/[type]/[project].vue
@@ -2014,9 +2014,7 @@ const navLinks = computed(() => {
 			label: formatMessage(messages.changelogTab),
 			href: withInstallContextQuery(`${projectUrl}/changelog`),
 			shown:
-				hasVersions.value &&
-				projectV3Loaded.value &&
-				projectV3.value?.minecraft_server === undefined,
+				hasVersions.value && projectV3Loaded.value && projectV3.value?.minecraft_server == null,
 			onHover: loadVersions,
 		},
 		{
@@ -2025,7 +2023,7 @@ const navLinks = computed(() => {
 			shown:
 				(hasVersions.value || !!currentMember.value) &&
 				projectV3Loaded.value &&
-				projectV3.value?.minecraft_server === undefined,
+				projectV3.value?.minecraft_server == null,
 			subpages: [`${projectUrl}/version/`],
 			onHover: loadVersions,
 		},
diff --git a/apps/labrinth/.sqlx/query-04c04958c71c4fab903c46c9185286e7460a6ff7b03cbc90939ac6c7cb526433.json b/apps/labrinth/.sqlx/query-214cc9257db904fd2cc68b8aa8d61d32cab210cfaea2205c95d9ca3bbd0ec1cd.json
similarity index 68%
rename from apps/labrinth/.sqlx/query-04c04958c71c4fab903c46c9185286e7460a6ff7b03cbc90939ac6c7cb526433.json
rename to apps/labrinth/.sqlx/query-214cc9257db904fd2cc68b8aa8d61d32cab210cfaea2205c95d9ca3bbd0ec1cd.json
index 6c62c2b6b6..f7c409af75 100644
--- a/apps/labrinth/.sqlx/query-04c04958c71c4fab903c46c9185286e7460a6ff7b03cbc90939ac6c7cb526433.json
+++ b/apps/labrinth/.sqlx/query-214cc9257db904fd2cc68b8aa8d61d32cab210cfaea2205c95d9ca3bbd0ec1cd.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n                    SELECT id, enum_id, value, ordering, metadata, created FROM loader_field_enum_values\n                    WHERE enum_id = ANY($1)\n                    ORDER BY enum_id, ordering, created DESC\n                    ",
+  "query": "\n                    SELECT id, enum_id, value, ordering,\n                    metadata->>'type' AS \"ty?\",\n                    (metadata->>'major')::boolean AS \"major?\",\n                    created FROM loader_field_enum_values\n                    WHERE enum_id = ANY($1)\n                    ORDER BY enum_id, ordering, created DESC\n                    ",
   "describe": {
     "columns": [
       {
@@ -25,11 +25,16 @@
       },
       {
         "ordinal": 4,
-        "name": "metadata",
-        "type_info": "Jsonb"
+        "name": "ty?",
+        "type_info": "Text"
       },
       {
         "ordinal": 5,
+        "name": "major?",
+        "type_info": "Bool"
+      },
+      {
+        "ordinal": 6,
         "name": "created",
         "type_info": "Timestamptz"
       }
@@ -44,9 +49,10 @@
       false,
       false,
       true,
-      true,
+      null,
+      null,
       false
     ]
   },
-  "hash": "04c04958c71c4fab903c46c9185286e7460a6ff7b03cbc90939ac6c7cb526433"
+  "hash": "214cc9257db904fd2cc68b8aa8d61d32cab210cfaea2205c95d9ca3bbd0ec1cd"
 }
diff --git a/apps/labrinth/.sqlx/query-d9c4d536ce0bea290f445c3bccb56b4743f2f3a9ce4b170fb439e0e135ca9d51.json b/apps/labrinth/.sqlx/query-83b7543e426ae348e589b591f249358c2b9eac5323ae0795581358ed29e5ba65.json
similarity index 58%
rename from apps/labrinth/.sqlx/query-d9c4d536ce0bea290f445c3bccb56b4743f2f3a9ce4b170fb439e0e135ca9d51.json
rename to apps/labrinth/.sqlx/query-83b7543e426ae348e589b591f249358c2b9eac5323ae0795581358ed29e5ba65.json
index 7141f46a13..d0bc6abfc1 100644
--- a/apps/labrinth/.sqlx/query-d9c4d536ce0bea290f445c3bccb56b4743f2f3a9ce4b170fb439e0e135ca9d51.json
+++ b/apps/labrinth/.sqlx/query-83b7543e426ae348e589b591f249358c2b9eac5323ae0795581358ed29e5ba65.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n                    SELECT DISTINCT id, enum_id, value, ordering, created, metadata\n                    FROM loader_field_enum_values lfev\n                    WHERE id = ANY($1)\n                    ORDER BY enum_id, ordering, created ASC\n                    ",
+  "query": "\n                    SELECT DISTINCT id, enum_id, value, ordering, created,\n                    metadata->>'type' AS \"ty?\",\n                    (metadata->>'major')::boolean AS \"major?\"\n                    FROM loader_field_enum_values lfev\n                    WHERE id = ANY($1)\n                    ORDER BY enum_id, ordering, created DESC\n                    ",
   "describe": {
     "columns": [
       {
@@ -30,8 +30,13 @@
       },
       {
         "ordinal": 5,
-        "name": "metadata",
-        "type_info": "Jsonb"
+        "name": "ty?",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 6,
+        "name": "major?",
+        "type_info": "Bool"
       }
     ],
     "parameters": {
@@ -45,8 +50,9 @@
       false,
       true,
       false,
-      true
+      null,
+      null
     ]
   },
-  "hash": "d9c4d536ce0bea290f445c3bccb56b4743f2f3a9ce4b170fb439e0e135ca9d51"
+  "hash": "83b7543e426ae348e589b591f249358c2b9eac5323ae0795581358ed29e5ba65"
 }
diff --git a/apps/labrinth/.sqlx/query-fe34673ce6d7bcb616a5ab2e8900d7dfb4e0fa2ee640128d29d6e4beafe60f4c.json b/apps/labrinth/.sqlx/query-a8569122a309057326be0d49630119f81d17197673d831d210e351c149e41fc8.json
similarity index 63%
rename from apps/labrinth/.sqlx/query-fe34673ce6d7bcb616a5ab2e8900d7dfb4e0fa2ee640128d29d6e4beafe60f4c.json
rename to apps/labrinth/.sqlx/query-a8569122a309057326be0d49630119f81d17197673d831d210e351c149e41fc8.json
index 0af23b8554..2f1c614db8 100644
--- a/apps/labrinth/.sqlx/query-fe34673ce6d7bcb616a5ab2e8900d7dfb4e0fa2ee640128d29d6e4beafe60f4c.json
+++ b/apps/labrinth/.sqlx/query-a8569122a309057326be0d49630119f81d17197673d831d210e351c149e41fc8.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n        SELECT DISTINCT id, enum_id, value, ordering, created, metadata\n        FROM loader_field_enum_values lfev\n        ORDER BY enum_id, ordering, created DESC\n        ",
+  "query": "\n        SELECT DISTINCT id, enum_id, value, ordering, created,\n        metadata->>'type' AS \"ty?\",\n        (metadata->>'major')::boolean AS \"major?\"\n        FROM loader_field_enum_values lfev\n        ORDER BY enum_id, ordering, created DESC\n        ",
   "describe": {
     "columns": [
       {
@@ -30,8 +30,13 @@
       },
       {
         "ordinal": 5,
-        "name": "metadata",
-        "type_info": "Jsonb"
+        "name": "ty?",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 6,
+        "name": "major?",
+        "type_info": "Bool"
       }
     ],
     "parameters": {
@@ -43,8 +48,9 @@
       false,
       true,
       false,
-      true
+      null,
+      null
     ]
   },
-  "hash": "fe34673ce6d7bcb616a5ab2e8900d7dfb4e0fa2ee640128d29d6e4beafe60f4c"
+  "hash": "a8569122a309057326be0d49630119f81d17197673d831d210e351c149e41fc8"
 }
diff --git a/apps/labrinth/.sqlx/query-ab9b4b383ce8431214eb26abde734d36eff6902ae55b7ed4d89a10c4d69506a9.json b/apps/labrinth/.sqlx/query-ab9b4b383ce8431214eb26abde734d36eff6902ae55b7ed4d89a10c4d69506a9.json
deleted file mode 100644
index 340549e517..0000000000
--- a/apps/labrinth/.sqlx/query-ab9b4b383ce8431214eb26abde734d36eff6902ae55b7ed4d89a10c4d69506a9.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            SELECT l.id id, l.loader loader, l.icon icon, l.metadata metadata,\n            ARRAY_AGG(DISTINCT pt.name) filter (where pt.name is not null) project_types,\n            ARRAY_AGG(DISTINCT g.slug) filter (where g.slug is not null) games\n            FROM loaders l\n            LEFT OUTER JOIN loaders_project_types lpt ON joining_loader_id = l.id\n            LEFT OUTER JOIN project_types pt ON lpt.joining_project_type_id = pt.id\n            LEFT OUTER JOIN loaders_project_types_games lptg ON lptg.loader_id = lpt.joining_loader_id AND lptg.project_type_id = lpt.joining_project_type_id\n            LEFT OUTER JOIN games g ON lptg.game_id = g.id\n            GROUP BY l.id;\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "id",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 1,
-        "name": "loader",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 2,
-        "name": "icon",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 3,
-        "name": "metadata",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 4,
-        "name": "project_types",
-        "type_info": "VarcharArray"
-      },
-      {
-        "ordinal": 5,
-        "name": "games",
-        "type_info": "VarcharArray"
-      }
-    ],
-    "parameters": {
-      "Left": []
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      false,
-      null,
-      null
-    ]
-  },
-  "hash": "ab9b4b383ce8431214eb26abde734d36eff6902ae55b7ed4d89a10c4d69506a9"
-}
diff --git a/apps/labrinth/.sqlx/query-43d4eafdbcb449a56551d3d6edeba0d6e196fa6539e3f9df107c23a74ba962af.json b/apps/labrinth/.sqlx/query-ec9abad348739217eb887e2ac84901ba8dca63912e9d7054115052ad89ab4718.json
similarity index 58%
rename from apps/labrinth/.sqlx/query-43d4eafdbcb449a56551d3d6edeba0d6e196fa6539e3f9df107c23a74ba962af.json
rename to apps/labrinth/.sqlx/query-ec9abad348739217eb887e2ac84901ba8dca63912e9d7054115052ad89ab4718.json
index c66e860181..478c4dcd62 100644
--- a/apps/labrinth/.sqlx/query-43d4eafdbcb449a56551d3d6edeba0d6e196fa6539e3f9df107c23a74ba962af.json
+++ b/apps/labrinth/.sqlx/query-ec9abad348739217eb887e2ac84901ba8dca63912e9d7054115052ad89ab4718.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n                    SELECT DISTINCT id, enum_id, value, ordering, created, metadata\n                    FROM loader_field_enum_values lfev\n                    WHERE id = ANY($1)\n                    ORDER BY enum_id, ordering, created DESC\n                    ",
+  "query": "\n                    SELECT DISTINCT id, enum_id, value, ordering, created,\n                    metadata->>'type' AS \"ty?\",\n                    (metadata->>'major')::boolean AS \"major?\"\n                    FROM loader_field_enum_values lfev\n                    WHERE id = ANY($1)\n                    ORDER BY enum_id, ordering, created ASC\n                    ",
   "describe": {
     "columns": [
       {
@@ -30,8 +30,13 @@
       },
       {
         "ordinal": 5,
-        "name": "metadata",
-        "type_info": "Jsonb"
+        "name": "ty?",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 6,
+        "name": "major?",
+        "type_info": "Bool"
       }
     ],
     "parameters": {
@@ -45,8 +50,9 @@
       false,
       true,
       false,
-      true
+      null,
+      null
     ]
   },
-  "hash": "43d4eafdbcb449a56551d3d6edeba0d6e196fa6539e3f9df107c23a74ba962af"
+  "hash": "ec9abad348739217eb887e2ac84901ba8dca63912e9d7054115052ad89ab4718"
 }
diff --git a/apps/labrinth/.sqlx/query-f21bfe5bcc157d442180bf49c97654bd8650dcdd16cb9f74148bef6e932e2837.json b/apps/labrinth/.sqlx/query-f21bfe5bcc157d442180bf49c97654bd8650dcdd16cb9f74148bef6e932e2837.json
new file mode 100644
index 0000000000..9fda28ebba
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-f21bfe5bcc157d442180bf49c97654bd8650dcdd16cb9f74148bef6e932e2837.json
@@ -0,0 +1,50 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            SELECT l.id id, l.loader loader, l.icon icon,\n            (l.metadata->>'platform')::boolean AS platform,\n            ARRAY_AGG(DISTINCT pt.name) filter (where pt.name is not null) project_types,\n            ARRAY_AGG(DISTINCT g.slug) filter (where g.slug is not null) games\n            FROM loaders l\n            LEFT OUTER JOIN loaders_project_types lpt ON joining_loader_id = l.id\n            LEFT OUTER JOIN project_types pt ON lpt.joining_project_type_id = pt.id\n            LEFT OUTER JOIN loaders_project_types_games lptg ON lptg.loader_id = lpt.joining_loader_id AND lptg.project_type_id = lpt.joining_project_type_id\n            LEFT OUTER JOIN games g ON lptg.game_id = g.id\n            GROUP BY l.id;\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 1,
+        "name": "loader",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 2,
+        "name": "icon",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 3,
+        "name": "platform",
+        "type_info": "Bool"
+      },
+      {
+        "ordinal": 4,
+        "name": "project_types",
+        "type_info": "VarcharArray"
+      },
+      {
+        "ordinal": 5,
+        "name": "games",
+        "type_info": "VarcharArray"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      null,
+      null,
+      null
+    ]
+  },
+  "hash": "f21bfe5bcc157d442180bf49c97654bd8650dcdd16cb9f74148bef6e932e2837"
+}
diff --git a/apps/labrinth/AGENTS.md b/apps/labrinth/AGENTS.md
index 0c1e193f6f..3c11a2248b 100644
--- a/apps/labrinth/AGENTS.md
+++ b/apps/labrinth/AGENTS.md
@@ -12,8 +12,10 @@
   - no trailing punctuation
   - wrap code items e.g. type names in backticks
 - Prefer `wrap_internal_err`, `wrap_request_err` when attaching context to an existing error (like Anyhow `context` or Eyre `wrap_err`)
+- Prefer importing `eyre::Result` and using `Result<T>` instead of `eyre::Result<T>`
+- Prefer `eyre::Ok(value)` instead of `Ok::<_, eyre::Report>(value)` when an explicit Eyre result type is needed
 - All operations should ideally have some context attached
-  - Database operations can have a message like `.wrap_internal_err("failed to fetch XYZ")`
+  - Database operations can have a message like `.wrap_internal_err("fetching XYZ")`
 - You can perform real-time queries against the databases in the Docker Compose
   - `docker exec labrinth-postgres psql -c "select 1"`
   - `docker exec labrinth-redis redis-cli flushall`
diff --git a/apps/labrinth/Cargo.toml b/apps/labrinth/Cargo.toml
index 1081074d9a..fccb039a12 100644
--- a/apps/labrinth/Cargo.toml
+++ b/apps/labrinth/Cargo.toml
@@ -111,6 +111,7 @@ rusty-money = { workspace = true }
 scalar_api_reference = { workspace = true, features = ["actix-web"] }
 sentry = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
+serde-binhum = { workspace = true }
 serde_json = { workspace = true }
 serde_with = { workspace = true }
 sha1 = { workspace = true }
diff --git a/apps/labrinth/src/auth/mod.rs b/apps/labrinth/src/auth/mod.rs
index bf0a963f81..c58a032f13 100644
--- a/apps/labrinth/src/auth/mod.rs
+++ b/apps/labrinth/src/auth/mod.rs
@@ -59,12 +59,6 @@ pub enum AuthenticationError {
     Url,
 }
 
-impl From<xredis::Error> for AuthenticationError {
-    fn from(error: xredis::Error) -> Self {
-        Self::Database(error.into())
-    }
-}
-
 impl actix_web::ResponseError for AuthenticationError {
     fn status_code(&self) -> StatusCode {
         match self {
diff --git a/apps/labrinth/src/database/models/analytics_event_item.rs b/apps/labrinth/src/database/models/analytics_event_item.rs
index 268c0fc538..47493582aa 100644
--- a/apps/labrinth/src/database/models/analytics_event_item.rs
+++ b/apps/labrinth/src/database/models/analytics_event_item.rs
@@ -9,7 +9,7 @@ use crate::{
 };
 use serde::{Deserialize, Serialize};
 
-const ANALYTICS_EVENTS_NAMESPACE: &str = "analytics_events:v3";
+const ANALYTICS_EVENTS_NAMESPACE: &str = "analytics_events:v4";
 const ANALYTICS_EVENTS_ALL_KEY: &str = "all";
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
diff --git a/apps/labrinth/src/database/models/categories.rs b/apps/labrinth/src/database/models/categories.rs
index edddeb7d21..c2b60ebeb8 100644
--- a/apps/labrinth/src/database/models/categories.rs
+++ b/apps/labrinth/src/database/models/categories.rs
@@ -7,7 +7,7 @@ use super::ids::*;
 use futures::TryStreamExt;
 use serde::{Deserialize, Serialize};
 
-const TAGS_NAMESPACE: &str = "tags:v3";
+const TAGS_NAMESPACE: &str = "tags:v4";
 
 pub struct ProjectType {
     pub id: ProjectTypeId,
diff --git a/apps/labrinth/src/database/models/collection_item.rs b/apps/labrinth/src/database/models/collection_item.rs
index b2c53e1f21..6f89b75e71 100644
--- a/apps/labrinth/src/database/models/collection_item.rs
+++ b/apps/labrinth/src/database/models/collection_item.rs
@@ -8,7 +8,7 @@ use futures::TryStreamExt;
 use serde::{Deserialize, Serialize};
 use xredis::RedisPool;
 
-const COLLECTIONS_NAMESPACE: &str = "collections:v3";
+const COLLECTIONS_NAMESPACE: &str = "collections:v4";
 
 #[derive(Clone)]
 pub struct CollectionBuilder {
diff --git a/apps/labrinth/src/database/models/flow_item.rs b/apps/labrinth/src/database/models/flow_item.rs
index 649da111be..dd675941ae 100644
--- a/apps/labrinth/src/database/models/flow_item.rs
+++ b/apps/labrinth/src/database/models/flow_item.rs
@@ -8,14 +8,14 @@ use rand::Rng;
 use rand::distributions::Alphanumeric;
 use rand_chacha::ChaCha20Rng;
 use rand_chacha::rand_core::SeedableRng;
-use serde::{Deserialize, Serialize};
+use serde_binhum::serde_binhum;
 use url::Url;
 use webauthn_rs::prelude::{DiscoverableAuthentication, PasskeyRegistration};
 use xredis::RedisPool;
 
-const FLOWS_NAMESPACE: &str = "flows:v3";
+const FLOWS_NAMESPACE: &str = "flows:v4";
 
-#[derive(Deserialize, Serialize)]
+#[serde_binhum]
 pub enum DBFlow {
     OAuth {
         user_id: Option<DBUserId>,
@@ -60,13 +60,39 @@ pub enum DBFlow {
     },
     RegisterPasskey {
         user_id: DBUserId,
+        #[serde_binhum(binary(with = "json_string"))]
         state: PasskeyRegistration,
     },
     AuthenticatePasskey {
+        #[serde_binhum(binary(with = "json_string"))]
         state: DiscoverableAuthentication,
     },
 }
 
+mod json_string {
+    use serde::de::DeserializeOwned;
+    use serde::{Deserialize, Deserializer, Serialize, Serializer};
+
+    pub fn serialize<T, S>(value: &T, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        T: Serialize,
+        S: Serializer,
+    {
+        let value =
+            serde_json::to_string(value).map_err(serde::ser::Error::custom)?;
+        value.serialize(serializer)
+    }
+
+    pub fn deserialize<'de, T, D>(deserializer: D) -> Result<T, D::Error>
+    where
+        T: DeserializeOwned,
+        D: Deserializer<'de>,
+    {
+        let value = String::deserialize(deserializer)?;
+        serde_json::from_str(&value).map_err(serde::de::Error::custom)
+    }
+}
+
 impl DBFlow {
     pub async fn insert_with_state(
         &self,
diff --git a/apps/labrinth/src/database/models/image_item.rs b/apps/labrinth/src/database/models/image_item.rs
index edb3d5add9..f3403ed7fc 100644
--- a/apps/labrinth/src/database/models/image_item.rs
+++ b/apps/labrinth/src/database/models/image_item.rs
@@ -6,7 +6,7 @@ use dashmap::DashMap;
 use serde::{Deserialize, Serialize};
 use xredis::RedisPool;
 
-const IMAGES_NAMESPACE: &str = "images:v3";
+const IMAGES_NAMESPACE: &str = "images:v4";
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct DBImage {
diff --git a/apps/labrinth/src/database/models/legacy_loader_fields.rs b/apps/labrinth/src/database/models/legacy_loader_fields.rs
index a11a8a504f..f24291c25e 100644
--- a/apps/labrinth/src/database/models/legacy_loader_fields.rs
+++ b/apps/labrinth/src/database/models/legacy_loader_fields.rs
@@ -117,17 +117,8 @@ impl MinecraftGameVersion {
             id: loader_field_enum_value.id,
             version: loader_field_enum_value.value,
             created: loader_field_enum_value.created,
-            type_: loader_field_enum_value
-                .metadata
-                .get("type")
-                .and_then(|x| x.as_str())
-                .map(|x| x.to_string())
-                .unwrap_or_default(),
-            major: loader_field_enum_value
-                .metadata
-                .get("major")
-                .and_then(|x| x.as_bool())
-                .unwrap_or_default(),
+            type_: loader_field_enum_value.ty.unwrap_or_default(),
+            major: loader_field_enum_value.major.unwrap_or_default(),
         }
     }
 }
diff --git a/apps/labrinth/src/database/models/loader_fields.rs b/apps/labrinth/src/database/models/loader_fields.rs
index a794812b25..bb599a1764 100644
--- a/apps/labrinth/src/database/models/loader_fields.rs
+++ b/apps/labrinth/src/database/models/loader_fields.rs
@@ -12,14 +12,14 @@ use itertools::Itertools;
 use serde::{Deserialize, Serialize};
 use xredis::RedisPool;
 
-const GAMES_LIST_NAMESPACE: &str = "games:v3";
-const LOADER_ID: &str = "loader_id:v3";
-const LOADERS_LIST_NAMESPACE: &str = "loaders:v3";
-const LOADER_FIELDS_NAMESPACE: &str = "loader_fields:v3";
-const LOADER_FIELDS_NAMESPACE_ALL: &str = "loader_fields_all:v3";
-const LOADER_FIELD_ENUMS_ID_NAMESPACE: &str = "loader_field_enums:v3";
+const GAMES_LIST_NAMESPACE: &str = "games:v4";
+const LOADER_ID: &str = "loader_id:v4";
+const LOADERS_LIST_NAMESPACE: &str = "loaders:v4";
+const LOADER_FIELDS_NAMESPACE: &str = "loader_fields:v4";
+const LOADER_FIELDS_NAMESPACE_ALL: &str = "loader_fields_all:v4";
+const LOADER_FIELD_ENUMS_ID_NAMESPACE: &str = "loader_field_enums:v4";
 pub const LOADER_FIELD_ENUM_VALUES_NAMESPACE: &str =
-    "loader_field_enum_values:v3";
+    "loader_field_enum_values:v4";
 
 #[derive(Clone, Serialize, Deserialize, Debug)]
 pub struct Game {
@@ -87,6 +87,11 @@ impl Game {
     }
 }
 
+#[derive(Clone, Serialize, Deserialize)]
+pub struct LoaderMetadata {
+    pub platform: Option<bool>,
+}
+
 #[derive(Serialize, Deserialize, Clone)]
 pub struct Loader {
     pub id: LoaderId,
@@ -94,7 +99,7 @@ pub struct Loader {
     pub icon: String,
     pub supported_project_types: Vec<String>,
     pub supported_games: Vec<String>, // slugs
-    pub metadata: serde_json::Value,
+    pub metadata: LoaderMetadata,
 }
 
 impl Loader {
@@ -154,7 +159,8 @@ impl Loader {
 
         let result = sqlx::query!(
             "
-            SELECT l.id id, l.loader loader, l.icon icon, l.metadata metadata,
+            SELECT l.id id, l.loader loader, l.icon icon,
+            (l.metadata->>'platform')::boolean AS platform,
             ARRAY_AGG(DISTINCT pt.name) filter (where pt.name is not null) project_types,
             ARRAY_AGG(DISTINCT g.slug) filter (where g.slug is not null) games
             FROM loaders l
@@ -179,7 +185,9 @@ impl Loader {
             supported_games: x
                 .games
                 .unwrap_or_default(),
-            metadata: x.metadata
+            metadata: LoaderMetadata {
+                platform: x.platform,
+            },
         })
         .try_collect::<Vec<_>>()
         .await?;
@@ -277,8 +285,9 @@ pub struct LoaderFieldEnumValue {
     pub value: String,
     pub ordering: Option<i32>,
     pub created: DateTime<Utc>,
-    #[serde(flatten)]
-    pub metadata: serde_json::Value,
+    #[serde(rename = "type")]
+    pub ty: Option<String>,
+    pub major: Option<bool>,
 }
 
 impl std::hash::Hash for LoaderFieldEnumValue {
@@ -357,7 +366,8 @@ pub struct QueryLoaderFieldEnumValue {
     pub value: String,
     pub ordering: Option<i32>,
     pub created: DateTime<Utc>,
-    pub metadata: Option<serde_json::Value>,
+    pub ty: Option<String>,
+    pub major: Option<bool>,
 }
 
 impl LoaderField {
@@ -612,42 +622,50 @@ impl LoaderFieldEnumValue {
     where
         E: crate::database::Executor<'a, Database = sqlx::Postgres>,
     {
-        let val = redis.get_cached_keys_raw(
-            LOADER_FIELD_ENUM_VALUES_NAMESPACE,
-            &loader_field_enum_ids.iter().map(|x| x.0).collect::<Vec<_>>(),
-            |loader_field_enum_ids| async move {
-                let values = sqlx::query!(
-                    "
-                    SELECT id, enum_id, value, ordering, metadata, created FROM loader_field_enum_values
+        let val = redis
+            .get_cached_keys_raw(
+                LOADER_FIELD_ENUM_VALUES_NAMESPACE,
+                &loader_field_enum_ids
+                    .iter()
+                    .map(|x| x.0)
+                    .collect::<Vec<_>>(),
+                |loader_field_enum_ids| async move {
+                    let values = sqlx::query!(
+                        r#"
+                    SELECT id, enum_id, value, ordering,
+                    metadata->>'type' AS "ty?",
+                    (metadata->>'major')::boolean AS "major?",
+                    created FROM loader_field_enum_values
                     WHERE enum_id = ANY($1)
                     ORDER BY enum_id, ordering, created DESC
-                    ",
-                    &loader_field_enum_ids
-                )
+                    "#,
+                        &loader_field_enum_ids
+                    )
                     .fetch(exec)
-                    .try_fold(DashMap::new(), |acc: DashMap<i32, Vec<LoaderFieldEnumValue>>, c| {
-                        let value = LoaderFieldEnumValue {
-                            id: LoaderFieldEnumValueId(c.id),
-                            enum_id: LoaderFieldEnumId(c.enum_id),
-                            value: c.value,
-                            ordering: c.ordering,
-                            created: c.created,
-                            metadata: c.metadata.unwrap_or_default(),
-                        };
+                    .try_fold(
+                        DashMap::new(),
+                        |acc: DashMap<i32, Vec<LoaderFieldEnumValue>>, c| {
+                            let value = LoaderFieldEnumValue {
+                                id: LoaderFieldEnumValueId(c.id),
+                                enum_id: LoaderFieldEnumId(c.enum_id),
+                                value: c.value,
+                                ordering: c.ordering,
+                                created: c.created,
+                                ty: c.ty,
+                                major: c.major,
+                            };
 
-                        acc.entry(c.enum_id)
-                            .or_default()
-                            .push(value);
+                            acc.entry(c.enum_id).or_default().push(value);
 
-                        async move {
-                            Ok(acc)
-                        }
-                    })
+                            async move { Ok(acc) }
+                        },
+                    )
                     .await?;
 
-                Ok::<_, DatabaseError>(values)
-            },
-        ).await?;
+                    Ok::<_, DatabaseError>(values)
+                },
+            )
+            .await?;
 
         Ok(val
             .into_iter()
@@ -669,15 +687,16 @@ impl LoaderFieldEnumValue {
             .await?
             .into_iter()
             .filter(|x| {
-                let mut bool = true;
-                for (key, value) in &filter {
-                    if let Some(metadata_value) = x.metadata.get(key) {
-                        bool &= metadata_value == value;
-                    } else {
-                        bool = false;
+                filter.iter().all(|(key, value)| match key.as_str() {
+                    "type" => {
+                        x.ty.as_deref()
+                            .is_some_and(|type_| value.as_str() == Some(type_))
                     }
-                }
-                bool
+                    "major" => x
+                        .major
+                        .is_some_and(|major| value.as_bool() == Some(major)),
+                    _ => false,
+                })
             })
             .collect();
 
@@ -1170,10 +1189,8 @@ impl VersionFieldValue {
                                     value: lfev.value.clone(),
                                     ordering: lfev.ordering,
                                     created: lfev.created,
-                                    metadata: lfev
-                                        .metadata
-                                        .clone()
-                                        .unwrap_or_default(),
+                                    ty: lfev.ty.clone(),
+                                    major: lfev.major,
                                 }
                             }),
                         ))
@@ -1249,10 +1266,8 @@ impl VersionFieldValue {
                                 value: lfev.value.clone(),
                                 ordering: lfev.ordering,
                                 created: lfev.created,
-                                metadata: lfev
-                                    .metadata
-                                    .clone()
-                                    .unwrap_or_default(),
+                                ty: lfev.ty.clone(),
+                                major: lfev.major,
                             })
                         })
                         .collect::<Result<_, _>>()?,
diff --git a/apps/labrinth/src/database/models/mod.rs b/apps/labrinth/src/database/models/mod.rs
index 09eddcaed7..badfad0bdb 100644
--- a/apps/labrinth/src/database/models/mod.rs
+++ b/apps/labrinth/src/database/models/mod.rs
@@ -77,8 +77,6 @@ pub enum DatabaseError {
     SerdeCacheError(#[from] serde_json::Error),
     #[error("error while encoding or decoding the cache: {0}")]
     PostcardCacheError(#[from] postcard::Error),
-    #[error(transparent)]
-    Redis(#[from] xredis::Error),
     #[error("Schema error: {0}")]
     SchemaError(String),
 }
diff --git a/apps/labrinth/src/database/models/moderation_note_item.rs b/apps/labrinth/src/database/models/moderation_note_item.rs
index 5f837b5da1..b0f14d175e 100644
--- a/apps/labrinth/src/database/models/moderation_note_item.rs
+++ b/apps/labrinth/src/database/models/moderation_note_item.rs
@@ -7,9 +7,9 @@ use xredis::RedisPool;
 
 use super::{DBOrganizationId, DBUserId, DatabaseError};
 
-const MODERATION_NOTES_USERS_NAMESPACE: &str = "moderation_notes_users:v3";
+const MODERATION_NOTES_USERS_NAMESPACE: &str = "moderation_notes_users:v4";
 const MODERATION_NOTES_ORGANIZATIONS_NAMESPACE: &str =
-    "moderation_notes_organizations:v3";
+    "moderation_notes_organizations:v4";
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct DBModerationNote {
diff --git a/apps/labrinth/src/database/models/notification_item.rs b/apps/labrinth/src/database/models/notification_item.rs
index b97972c647..6421a6d0bf 100644
--- a/apps/labrinth/src/database/models/notification_item.rs
+++ b/apps/labrinth/src/database/models/notification_item.rs
@@ -10,7 +10,7 @@ use futures::TryStreamExt;
 use serde::{Deserialize, Serialize};
 use xredis::RedisPool;
 
-const USER_NOTIFICATIONS_NAMESPACE: &str = "user_notifications:v3";
+const USER_NOTIFICATIONS_NAMESPACE: &str = "user_notifications:v4";
 
 pub struct NotificationBuilder {
     pub body: NotificationBody,
diff --git a/apps/labrinth/src/database/models/notifications_template_item.rs b/apps/labrinth/src/database/models/notifications_template_item.rs
index e5b7911561..dbe908e39e 100644
--- a/apps/labrinth/src/database/models/notifications_template_item.rs
+++ b/apps/labrinth/src/database/models/notifications_template_item.rs
@@ -1,14 +1,15 @@
 use crate::database::models::DatabaseError;
 use crate::models::v3::notifications::{NotificationChannel, NotificationType};
 use crate::routes::ApiError;
+use crate::util::error::Context;
 use serde::{Deserialize, Serialize};
 use xredis::RedisPool;
 
-const TEMPLATES_NAMESPACE: &str = "notifications_templates:v3";
+const TEMPLATES_NAMESPACE: &str = "notifications_templates:v4";
 const TEMPLATES_HTML_DATA_NAMESPACE: &str =
-    "notifications_templates_html_data:v3";
+    "notifications_templates_html_data:v4";
 const TEMPLATES_DYNAMIC_HTML_NAMESPACE: &str =
-    "notifications_templates_dynamic_html:v3";
+    "notifications_templates_dynamic_html:v4";
 
 const HTML_DATA_CACHE_EXPIRY: i64 = 60 * 15; // 15 minutes
 const TEMPLATES_CACHE_EXPIRY: i64 = 60 * 30; // 30 minutes
@@ -123,12 +124,16 @@ where
         html: String,
     }
 
-    let mut redis_conn = redis.connect().await?;
+    let mut redis_conn = redis.connect().await.wrap_internal_err(
+        "connecting to redis for dynamic notification html",
+    )?;
     let redis_key = redis_conn
         .key()
         .metadata(TEMPLATES_DYNAMIC_HTML_NAMESPACE, key);
-    if let Some(body) =
-        redis_conn.get_deserialized::<HtmlBody>(&redis_key).await?
+    if let Some(body) = redis_conn
+        .get_deserialized::<HtmlBody>(&redis_key)
+        .await
+        .wrap_internal_err("fetching dynamic notification html from redis")?
     {
         return Ok(body.html);
     }
@@ -136,14 +141,17 @@ where
     drop(redis_conn);
 
     let cached = HtmlBody { html: get().await? };
-    let mut redis_conn = redis.connect().await?;
+    let mut redis_conn = redis.connect().await.wrap_internal_err(
+        "connecting to redis for dynamic notification html",
+    )?;
     let redis_key = redis_conn
         .key()
         .metadata(TEMPLATES_DYNAMIC_HTML_NAMESPACE, key);
 
     redis_conn
         .set_serialized(&redis_key, &cached, Some(HTML_DATA_CACHE_EXPIRY))
-        .await?;
+        .await
+        .wrap_internal_err("writing dynamic notification html to redis")?;
 
     Ok(cached.html)
 }
diff --git a/apps/labrinth/src/database/models/notifications_type_item.rs b/apps/labrinth/src/database/models/notifications_type_item.rs
index 4663d90920..c2d036a3f7 100644
--- a/apps/labrinth/src/database/models/notifications_type_item.rs
+++ b/apps/labrinth/src/database/models/notifications_type_item.rs
@@ -3,7 +3,7 @@ use crate::models::v3::notifications::NotificationType;
 use serde::{Deserialize, Serialize};
 use xredis::RedisPool;
 
-const NOTIFICATION_TYPES_NAMESPACE: &str = "notification_types:v3";
+const NOTIFICATION_TYPES_NAMESPACE: &str = "notification_types:v4";
 
 #[derive(Serialize, Deserialize)]
 pub struct NotificationTypeItem {
diff --git a/apps/labrinth/src/database/models/organization_item.rs b/apps/labrinth/src/database/models/organization_item.rs
index 2cb83b6fc3..845ff1235d 100644
--- a/apps/labrinth/src/database/models/organization_item.rs
+++ b/apps/labrinth/src/database/models/organization_item.rs
@@ -9,8 +9,8 @@ use xredis::RedisPool;
 use super::{DBTeamMember, ids::*};
 use serde::{Deserialize, Serialize};
 
-const ORGANIZATIONS_NAMESPACE: &str = "organizations:v3";
-const ORGANIZATIONS_TITLES_NAMESPACE: &str = "organizations_titles:v3";
+const ORGANIZATIONS_NAMESPACE: &str = "organizations:v4";
+const ORGANIZATIONS_TITLES_NAMESPACE: &str = "organizations_titles:v4";
 
 #[derive(Deserialize, Serialize, Clone, Debug)]
 /// An organization of users who together control one or more projects and organizations.
diff --git a/apps/labrinth/src/database/models/pat_item.rs b/apps/labrinth/src/database/models/pat_item.rs
index 50a05c84c7..deb6f4a0b2 100644
--- a/apps/labrinth/src/database/models/pat_item.rs
+++ b/apps/labrinth/src/database/models/pat_item.rs
@@ -11,9 +11,9 @@ use std::fmt::{Debug, Display};
 use std::hash::Hash;
 use xredis::RedisPool;
 
-const PATS_NAMESPACE: &str = "pats:v3";
-const PATS_TOKENS_NAMESPACE: &str = "pats_tokens:v3";
-const PATS_USERS_NAMESPACE: &str = "pats_users:v3";
+const PATS_NAMESPACE: &str = "pats:v4";
+const PATS_TOKENS_NAMESPACE: &str = "pats_tokens:v4";
+const PATS_USERS_NAMESPACE: &str = "pats_users:v4";
 
 #[derive(Deserialize, Serialize, Clone, Debug)]
 pub struct DBPersonalAccessToken {
diff --git a/apps/labrinth/src/database/models/product_item.rs b/apps/labrinth/src/database/models/product_item.rs
index 266eafa773..a1f4cc291e 100644
--- a/apps/labrinth/src/database/models/product_item.rs
+++ b/apps/labrinth/src/database/models/product_item.rs
@@ -9,7 +9,7 @@ use std::convert::TryFrom;
 use std::convert::TryInto;
 use xredis::RedisPool;
 
-const PRODUCTS_NAMESPACE: &str = "products:v3";
+const PRODUCTS_NAMESPACE: &str = "products:v4";
 
 pub struct DBProduct {
     pub id: DBProductId,
@@ -136,7 +136,7 @@ pub struct QueryProductWithPrices {
     pub id: DBProductId,
     pub metadata: ProductMetadata,
     pub unitary: bool,
-    #[serde(skip_serializing_if = "Option::is_none", default)]
+    #[serde(default)]
     pub name: Option<String>,
     pub prices: Vec<DBProductPrice>,
 }
diff --git a/apps/labrinth/src/database/models/project_item.rs b/apps/labrinth/src/database/models/project_item.rs
index e862cf76f3..f4d0d3118a 100644
--- a/apps/labrinth/src/database/models/project_item.rs
+++ b/apps/labrinth/src/database/models/project_item.rs
@@ -19,13 +19,14 @@ use dashmap::{DashMap, DashSet};
 use futures::TryStreamExt;
 use itertools::Itertools;
 use serde::{Deserialize, Serialize};
+use serde_binhum::serde_binhum;
 use std::fmt::{Debug, Display};
 use std::hash::Hash;
 use xredis::RedisPool;
 
-pub const PROJECTS_NAMESPACE: &str = "projects:v3";
-pub const PROJECTS_SLUGS_NAMESPACE: &str = "projects_slugs:v3";
-const PROJECTS_DEPENDENCIES_NAMESPACE: &str = "projects_dependencies:v3";
+pub const PROJECTS_NAMESPACE: &str = "projects:v4";
+pub const PROJECTS_SLUGS_NAMESPACE: &str = "projects_slugs:v4";
+const PROJECTS_DEPENDENCIES_NAMESPACE: &str = "projects_dependencies:v4";
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct LinkUrl {
@@ -657,12 +658,14 @@ impl DBProject {
                     .await?;
 
                 let loader_field_enum_values: Vec<QueryLoaderFieldEnumValue> = sqlx::query!(
-                    "
-                    SELECT DISTINCT id, enum_id, value, ordering, created, metadata
+                    r#"
+                    SELECT DISTINCT id, enum_id, value, ordering, created,
+                    metadata->>'type' AS "ty?",
+                    (metadata->>'major')::boolean AS "major?"
                     FROM loader_field_enum_values lfev
                     WHERE id = ANY($1)
                     ORDER BY enum_id, ordering, created DESC
-                    ",
+                    "#,
                     &loader_field_enum_value_ids
                         .iter()
                         .map(|x| x.0)
@@ -675,7 +678,8 @@ impl DBProject {
                         value: m.value,
                         ordering: m.ordering,
                         created: m.created,
-                        metadata: m.metadata,
+                        ty: m.ty,
+                        major: m.major,
                     })
                     .try_collect()
                     .await?;
@@ -946,7 +950,7 @@ impl DBProject {
             },
         )
         .await
-        .wrap_internal_err("failed to fetch cached projects")?;
+        .wrap_internal_err("fetching cached projects")?;
 
         Ok(val)
     }
@@ -1041,8 +1045,10 @@ impl DBProject {
     }
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize)]
+#[serde_binhum]
+#[derive(Clone, Debug)]
 pub struct ProjectQueryResult {
+    #[serde(flatten)]
     pub inner: DBProject,
     pub categories: Vec<String>,
     pub additional_categories: Vec<String>,
@@ -1053,6 +1059,5 @@ pub struct ProjectQueryResult {
     pub gallery_items: Vec<DBGalleryItem>,
     pub thread_id: DBThreadId,
     pub aggregate_version_fields: Vec<VersionField>,
-    #[serde(flatten)]
     pub components: exp::ProjectQuery,
 }
diff --git a/apps/labrinth/src/database/models/session_item.rs b/apps/labrinth/src/database/models/session_item.rs
index 9d58dd4f12..9ca8ae560d 100644
--- a/apps/labrinth/src/database/models/session_item.rs
+++ b/apps/labrinth/src/database/models/session_item.rs
@@ -10,9 +10,9 @@ use std::fmt::{Debug, Display};
 use std::hash::Hash;
 use xredis::RedisPool;
 
-const SESSIONS_NAMESPACE: &str = "sessions:v3";
-const SESSIONS_IDS_NAMESPACE: &str = "sessions_ids:v3";
-const SESSIONS_USERS_NAMESPACE: &str = "sessions_users:v3";
+const SESSIONS_NAMESPACE: &str = "sessions:v4";
+const SESSIONS_IDS_NAMESPACE: &str = "sessions_ids:v4";
+const SESSIONS_USERS_NAMESPACE: &str = "sessions_users:v4";
 
 pub struct SessionBuilder {
     pub session: String,
diff --git a/apps/labrinth/src/database/models/team_item.rs b/apps/labrinth/src/database/models/team_item.rs
index 698c9d08a5..4246e60d7d 100644
--- a/apps/labrinth/src/database/models/team_item.rs
+++ b/apps/labrinth/src/database/models/team_item.rs
@@ -10,7 +10,7 @@ use rust_decimal::Decimal;
 use serde::{Deserialize, Serialize};
 use xredis::RedisPool;
 
-const TEAMS_NAMESPACE: &str = "teams:v3";
+const TEAMS_NAMESPACE: &str = "teams:v4";
 
 pub struct TeamBuilder {
     pub members: Vec<TeamMemberBuilder>,
diff --git a/apps/labrinth/src/database/models/user_item.rs b/apps/labrinth/src/database/models/user_item.rs
index 416d1bad18..a5efc5e701 100644
--- a/apps/labrinth/src/database/models/user_item.rs
+++ b/apps/labrinth/src/database/models/user_item.rs
@@ -16,9 +16,9 @@ use std::fmt::{Debug, Display};
 use std::hash::Hash;
 use xredis::RedisPool;
 
-const USERS_NAMESPACE: &str = "users:v3";
-const USER_USERNAMES_NAMESPACE: &str = "users_usernames:v3";
-const USERS_PROJECTS_NAMESPACE: &str = "users_projects:v3";
+const USERS_NAMESPACE: &str = "users:v4";
+const USER_USERNAMES_NAMESPACE: &str = "users_usernames:v4";
+const USERS_PROJECTS_NAMESPACE: &str = "users_projects:v4";
 
 #[derive(Deserialize, Serialize, Clone, Debug)]
 pub struct DBUser {
diff --git a/apps/labrinth/src/database/models/version_item.rs b/apps/labrinth/src/database/models/version_item.rs
index 096bed6614..aff56773e5 100644
--- a/apps/labrinth/src/database/models/version_item.rs
+++ b/apps/labrinth/src/database/models/version_item.rs
@@ -17,12 +17,13 @@ use dashmap::{DashMap, DashSet};
 use futures::TryStreamExt;
 use itertools::Itertools;
 use serde::{Deserialize, Serialize};
+use serde_binhum::serde_binhum;
 use std::cmp::Ordering;
 use std::collections::HashMap;
 use tracing::error;
 
-pub const VERSIONS_NAMESPACE: &str = "versions:v3";
-const VERSION_FILES_NAMESPACE: &str = "versions_files:v3";
+pub const VERSIONS_NAMESPACE: &str = "versions:v4";
+const VERSION_FILES_NAMESPACE: &str = "versions_files:v4";
 
 pub async fn cleanup_unused_attribution_files_and_groups(
     transaction: &mut PgTransaction<'_>,
@@ -704,12 +705,14 @@ impl DBVersion {
                     .await?;
 
                 let loader_field_enum_values: Vec<QueryLoaderFieldEnumValue> = sqlx::query!(
-                    "
-                    SELECT DISTINCT id, enum_id, value, ordering, created, metadata
+                    r#"
+                    SELECT DISTINCT id, enum_id, value, ordering, created,
+                    metadata->>'type' AS "ty?",
+                    (metadata->>'major')::boolean AS "major?"
                     FROM loader_field_enum_values lfev
                     WHERE id = ANY($1)
                     ORDER BY enum_id, ordering, created ASC
-                    ",
+                    "#,
                     &loader_field_enum_value_ids
                         .iter()
                         .map(|x| x.0)
@@ -722,7 +725,8 @@ impl DBVersion {
                         value: m.value,
                         ordering: m.ordering,
                         created: m.created,
-                        metadata: m.metadata,
+                        ty: m.ty,
+                        major: m.major,
                     })
                     .try_collect()
                     .await?;
@@ -1080,8 +1084,10 @@ impl DBVersion {
     }
 }
 
-#[derive(Clone, Deserialize, Serialize)]
+#[serde_binhum]
+#[derive(Clone)]
 pub struct VersionQueryResult {
+    #[serde(flatten)]
     pub inner: DBVersion,
 
     pub files: Vec<FileQueryResult>,
@@ -1090,7 +1096,6 @@ pub struct VersionQueryResult {
     pub project_types: Vec<String>,
     pub games: Vec<String>,
     pub dependencies: Vec<DependencyQueryResult>,
-    #[serde(flatten)]
     pub components: exp::VersionQuery,
 }
 
diff --git a/apps/labrinth/src/database/redis.rs b/apps/labrinth/src/database/redis.rs
deleted file mode 100644
index 0bc5f37231..0000000000
--- a/apps/labrinth/src/database/redis.rs
+++ /dev/null
@@ -1,56 +0,0 @@
-use std::sync::Arc;
-
-use crate::env::ENV;
-
-struct RedisConfig {
-    inner: xredis::RedisConfig,
-    cache_settings: xredis::CacheSettings,
-}
-
-impl RedisConfig {
-    fn from_env() -> Result<Self, xredis::RedisConfigError> {
-        let inner = xredis::RedisConfig::new(
-            ENV.REDIS_TOPOLOGY,
-            ENV.REDIS_CONNECTION_TYPE,
-            &ENV.REDIS_URL,
-            ENV.REDIS_WAIT_TIMEOUT_MS,
-            (
-                ENV.REDIS_MAX_CONNECTIONS as usize,
-                ENV.REDIS_MIN_CONNECTIONS,
-            ),
-            (
-                ENV.REDIS_CLUSTER_MAX_CONNECTIONS as usize,
-                ENV.REDIS_CLUSTER_MIN_CONNECTIONS,
-            ),
-            (ENV.REDIS_BLOCKING_MAX_CONNECTIONS as usize, 0),
-            ENV.REDIS_CACHE_LOCKING_STRATEGY,
-            ENV.REDIS_READ_REPLICA_STRATEGY,
-        )?;
-        let cache_settings = xredis::CacheSettings {
-            default_expiry: ENV.REDIS_DEFAULT_EXPIRY,
-            actual_expiry: ENV.REDIS_ACTUAL_EXPIRY,
-            version_default_expiry: ENV.REDIS_VERSION_DEFAULT_EXPIRY,
-            version_actual_expiry: ENV.REDIS_VERSION_ACTUAL_EXPIRY,
-            encoding_format: ENV.REDIS_ENCODING_FORMAT,
-            compression_algorithm: ENV.REDIS_COMPRESSION_ALGORITHM,
-            compression_level: ENV.REDIS_COMPRESSION_LEVEL,
-            compression_threshold_bytes: ENV.REDIS_COMPRESSION_THRESHOLD_BYTES,
-            compression_min_savings_ratio: ENV
-                .REDIS_COMPRESSION_MIN_SAVINGS_RATIO,
-        };
-
-        Ok(Self {
-            inner,
-            cache_settings,
-        })
-    }
-}
-
-pub async fn from_env(
-    meta_namespace: impl Into<Arc<str>>,
-) -> xredis::RedisPool {
-    let config = RedisConfig::from_env().expect("invalid Redis configuration");
-    xredis::RedisPool::new(meta_namespace, config.inner, config.cache_settings)
-        .await
-        .expect("failed to initialize Redis connections")
-}
diff --git a/apps/labrinth/src/database/redis/mod.rs b/apps/labrinth/src/database/redis/mod.rs
new file mode 100644
index 0000000000..b2d4d4724f
--- /dev/null
+++ b/apps/labrinth/src/database/redis/mod.rs
@@ -0,0 +1,411 @@
+use std::sync::Arc;
+
+use crate::env::ENV;
+use eyre::{Result, WrapErr};
+
+struct RedisConfig {
+    inner: xredis::RedisConfig,
+    cache_settings: xredis::CacheSettings,
+}
+
+impl RedisConfig {
+    fn from_env() -> Result<Self> {
+        let inner = xredis::RedisConfig::new(
+            ENV.REDIS_TOPOLOGY,
+            ENV.REDIS_CONNECTION_TYPE,
+            &ENV.REDIS_URL,
+            ENV.REDIS_WAIT_TIMEOUT_MS,
+            (
+                ENV.REDIS_MAX_CONNECTIONS as usize,
+                ENV.REDIS_MIN_CONNECTIONS,
+            ),
+            (
+                ENV.REDIS_CLUSTER_MAX_CONNECTIONS as usize,
+                ENV.REDIS_CLUSTER_MIN_CONNECTIONS,
+            ),
+            (ENV.REDIS_BLOCKING_MAX_CONNECTIONS as usize, 0),
+            ENV.REDIS_CACHE_LOCKING_STRATEGY,
+            ENV.REDIS_READ_REPLICA_STRATEGY,
+        )
+        .wrap_err("loading Redis configuration from environment")?;
+        let cache_settings = xredis::CacheSettings {
+            default_expiry: ENV.REDIS_DEFAULT_EXPIRY,
+            actual_expiry: ENV.REDIS_ACTUAL_EXPIRY,
+            version_default_expiry: ENV.REDIS_VERSION_DEFAULT_EXPIRY,
+            version_actual_expiry: ENV.REDIS_VERSION_ACTUAL_EXPIRY,
+            encoding_format: ENV.REDIS_ENCODING_FORMAT,
+            compression_algorithm: ENV.REDIS_COMPRESSION_ALGORITHM,
+            compression_level: ENV.REDIS_COMPRESSION_LEVEL,
+            compression_threshold_bytes: ENV.REDIS_COMPRESSION_THRESHOLD_BYTES,
+            compression_min_savings_ratio: ENV
+                .REDIS_COMPRESSION_MIN_SAVINGS_RATIO,
+        };
+
+        Ok(Self {
+            inner,
+            cache_settings,
+        })
+    }
+}
+
+pub async fn from_env(
+    meta_namespace: impl Into<Arc<str>>,
+) -> xredis::RedisPool {
+    let config = RedisConfig::from_env().expect("invalid Redis configuration");
+    xredis::RedisPool::new(meta_namespace, config.inner, config.cache_settings)
+        .await
+        .expect("failed to initialize Redis connections")
+}
+
+#[cfg(test)]
+mod tests {
+    use std::collections::HashMap;
+
+    use ::serde::{Serialize, de::DeserializeOwned};
+    use chrono::Utc;
+    use url::Url;
+    use uuid::Uuid;
+    use webauthn_rs::WebauthnBuilder;
+
+    use crate::database::models::flow_item::DBFlow;
+    use crate::database::models::ids::{
+        DBNotificationId, DBProjectId, DBTeamId, DBThreadId, DBUserId,
+        DBVersionId, LoaderFieldEnumId, LoaderFieldEnumValueId, LoaderFieldId,
+        LoaderId,
+    };
+    use crate::database::models::loader_fields::{
+        Loader, LoaderFieldEnumValue, LoaderMetadata, VersionField,
+        VersionFieldValue,
+    };
+    use crate::database::models::notification_item::DBNotification;
+    use crate::database::models::project_item::{
+        DBProject, ProjectQueryResult,
+    };
+    use crate::database::models::version_item::{
+        DBVersion, VersionQueryResult,
+    };
+    use crate::models::billing::{Price, ProductMetadata};
+    use crate::models::exp::{self, minecraft};
+    use crate::models::notifications::NotificationBody;
+    use crate::models::projects::{
+        MonetizationStatus, ProjectStatus, SideTypesMigrationReviewStatus,
+        VersionStatus,
+    };
+
+    fn postcard_round_trip<T>(value: &T) -> T
+    where
+        T: Serialize + DeserializeOwned,
+    {
+        let serialized =
+            postcard::to_allocvec(value).expect("serializing with postcard");
+        postcard::from_bytes(&serialized).expect("deserializing with postcard")
+    }
+
+    fn loader_field_enum_value(ty: &str, major: bool) -> LoaderFieldEnumValue {
+        LoaderFieldEnumValue {
+            id: LoaderFieldEnumValueId(1),
+            enum_id: LoaderFieldEnumId(2),
+            value: "1.21.8".to_string(),
+            ordering: None,
+            created: Utc::now(),
+            ty: Some(ty.to_string()),
+            major: Some(major),
+        }
+    }
+
+    fn db_project() -> DBProject {
+        let now = Utc::now();
+
+        DBProject {
+            id: DBProjectId(1),
+            team_id: DBTeamId(2),
+            organization_id: None,
+            name: "project".to_string(),
+            summary: "summary".to_string(),
+            description: "description".to_string(),
+            published: now,
+            updated: now,
+            approved: Some(now),
+            queued: None,
+            status: ProjectStatus::Approved,
+            requested_status: None,
+            downloads: 3,
+            follows: 4,
+            icon_url: None,
+            raw_icon_url: None,
+            license_url: None,
+            license: "MIT".to_string(),
+            slug: Some("project".to_string()),
+            moderation_message: None,
+            moderation_message_body: None,
+            webhook_sent: false,
+            color: None,
+            monetization_status: MonetizationStatus::Monetized,
+            side_types_migration_review_status:
+                SideTypesMigrationReviewStatus::Reviewed,
+            loaders: vec!["fabric".to_string()],
+            components: exp::ProjectSerial::default(),
+        }
+    }
+
+    fn db_version() -> DBVersion {
+        DBVersion {
+            id: DBVersionId(1),
+            project_id: DBProjectId(2),
+            author_id: DBUserId(3),
+            name: "version".to_string(),
+            version_number: "1.0.0".to_string(),
+            changelog: "changelog".to_string(),
+            date_published: Utc::now(),
+            downloads: 4,
+            version_type: "release".to_string(),
+            featured: true,
+            status: VersionStatus::Listed,
+            requested_status: None,
+            ordering: None,
+            components: exp::VersionSerial::default(),
+        }
+    }
+
+    #[test]
+    fn loader_metadata_round_trips_with_postcard() {
+        for platform in [None, Some(false), Some(true)] {
+            let metadata = LoaderMetadata { platform };
+            let round_tripped = postcard_round_trip(&metadata);
+
+            assert_eq!(round_tripped.platform, platform);
+        }
+    }
+
+    #[test]
+    fn loader_round_trips_with_postcard() {
+        for platform in [None, Some(false), Some(true)] {
+            let loader = Loader {
+                id: LoaderId(1),
+                loader: "paper".to_string(),
+                icon: "icon".to_string(),
+                supported_project_types: vec!["plugin".to_string()],
+                supported_games: vec!["minecraft-java".to_string()],
+                metadata: LoaderMetadata { platform },
+            };
+            let round_tripped = postcard_round_trip(&loader);
+
+            assert_eq!(round_tripped.id, loader.id);
+            assert_eq!(round_tripped.loader, loader.loader);
+            assert_eq!(round_tripped.icon, loader.icon);
+            assert_eq!(
+                round_tripped.supported_project_types,
+                loader.supported_project_types
+            );
+            assert_eq!(round_tripped.supported_games, loader.supported_games);
+            assert_eq!(round_tripped.metadata.platform, platform);
+        }
+    }
+
+    #[test]
+    fn loader_field_enum_values_round_trip_with_postcard() {
+        let metadata_values = [
+            (None, None),
+            (Some("snapshot"), Some(false)),
+            (Some("alpha"), Some(false)),
+            (Some("beta"), Some(true)),
+            (Some("release"), Some(true)),
+            (Some("beta"), Some(false)),
+            (Some("release"), Some(false)),
+        ];
+
+        for (ty, major) in metadata_values {
+            let enum_value = LoaderFieldEnumValue {
+                id: LoaderFieldEnumValueId(1),
+                enum_id: LoaderFieldEnumId(2),
+                value: "1.21.8".to_string(),
+                ordering: None,
+                created: Utc::now(),
+                ty: ty.map(str::to_string),
+                major,
+            };
+
+            assert_eq!(postcard_round_trip(&enum_value), enum_value);
+        }
+    }
+
+    #[test]
+    fn loader_field_enum_value_keeps_flattened_json_layout() {
+        let enum_value = loader_field_enum_value("release", true);
+        let json = serde_json::to_value(&enum_value)
+            .expect("serializing loader field enum value as JSON");
+
+        assert_eq!(json.get("type"), Some(&serde_json::json!("release")));
+        assert_eq!(json.get("major"), Some(&serde_json::json!(true)));
+        assert!(json.get("metadata").is_none());
+        assert_eq!(
+            serde_json::from_value::<LoaderFieldEnumValue>(json)
+                .expect("deserializing loader field enum value from JSON"),
+            enum_value
+        );
+    }
+
+    #[test]
+    fn non_enum_version_fields_round_trip_with_postcard() {
+        let values = [
+            VersionFieldValue::Integer(5),
+            VersionFieldValue::Text("value".to_string()),
+            VersionFieldValue::Boolean(true),
+            VersionFieldValue::ArrayInteger(vec![1, 2]),
+            VersionFieldValue::ArrayText(vec!["one".to_string()]),
+            VersionFieldValue::ArrayBoolean(vec![true, false]),
+        ];
+
+        for value in values {
+            let field = VersionField {
+                version_id: DBVersionId(1),
+                field_id: LoaderFieldId(2),
+                field_name: "field".to_string(),
+                value,
+            };
+
+            assert_eq!(postcard_round_trip(&field), field);
+        }
+    }
+
+    #[test]
+    fn flattened_cache_values_round_trip_with_postcard() {
+        let enum_value = loader_field_enum_value("release", true);
+        postcard_round_trip(&enum_value);
+
+        let version = VersionQueryResult {
+            inner: db_version(),
+            files: Vec::new(),
+            version_fields: vec![VersionField {
+                version_id: DBVersionId(1),
+                field_id: LoaderFieldId(2),
+                field_name: "game_versions".to_string(),
+                value: VersionFieldValue::Enum(
+                    LoaderFieldEnumId(2),
+                    enum_value,
+                ),
+            }],
+            loaders: vec!["fabric".to_string()],
+            project_types: vec!["mod".to_string()],
+            games: vec!["minecraft-java".to_string()],
+            dependencies: Vec::new(),
+            components: exp::VersionQuery::default(),
+        };
+        postcard_round_trip(&version);
+
+        let project = ProjectQueryResult {
+            inner: db_project(),
+            categories: Vec::new(),
+            additional_categories: Vec::new(),
+            versions: vec![DBVersionId(1)],
+            project_types: vec!["mod".to_string()],
+            games: vec!["minecraft-java".to_string()],
+            urls: Vec::new(),
+            gallery_items: Vec::new(),
+            thread_id: DBThreadId(1),
+            aggregate_version_fields: Vec::new(),
+            components: exp::ProjectQuery::default(),
+        };
+        postcard_round_trip(&project);
+    }
+
+    #[test]
+    fn skipped_cache_fields_round_trip_with_postcard() {
+        postcard_round_trip(&exp::ProjectSerial::default());
+        postcard_round_trip(&exp::ProjectQuery::default());
+        postcard_round_trip(&db_project());
+    }
+
+    #[test]
+    fn internally_tagged_cache_values_round_trip_with_postcard() {
+        for metadata in [
+            ProductMetadata::Midas,
+            ProductMetadata::Pyro {
+                cpu: 1,
+                ram: 2,
+                swap: 3,
+                storage: 4,
+            },
+            ProductMetadata::Medal {
+                cpu: 1,
+                ram: 2,
+                swap: 3,
+                storage: 4,
+                region: "us-east".to_string(),
+            },
+        ] {
+            postcard_round_trip(&metadata);
+        }
+
+        for price in [
+            Price::OneTime { price: 500 },
+            Price::Recurring {
+                intervals: HashMap::new(),
+            },
+        ] {
+            postcard_round_trip(&price);
+        }
+
+        postcard_round_trip(&NotificationBody::TwoFactorEnabled);
+        postcard_round_trip(&DBNotification {
+            id: DBNotificationId(1),
+            user_id: DBUserId(2),
+            body: NotificationBody::TwoFactorEnabled,
+            read: false,
+            created: Utc::now(),
+        });
+        postcard_round_trip(&minecraft::ServerContent::Vanilla {
+            supported_game_versions: vec!["1.21.8".to_string()],
+            recommended_game_version: Some("1.21.8".to_string()),
+        });
+        postcard_round_trip(&minecraft::ServerContentQuery::Vanilla {
+            supported_game_versions: vec!["1.21.8".to_string()],
+            recommended_game_version: Some("1.21.8".to_string()),
+        });
+    }
+
+    #[test]
+    fn simple_flow_variants_round_trip_with_postcard() {
+        assert!(matches!(
+            postcard_round_trip(&DBFlow::MinecraftAuth),
+            DBFlow::MinecraftAuth
+        ));
+
+        let flow = postcard_round_trip(&DBFlow::Login2FA {
+            user_id: DBUserId(1),
+        });
+        assert!(matches!(
+            flow,
+            DBFlow::Login2FA {
+                user_id: DBUserId(1)
+            }
+        ));
+    }
+
+    #[test]
+    fn passkey_flow_variants_round_trip_with_postcard() {
+        let origin = Url::parse("https://example.com").unwrap();
+        let webauthn = WebauthnBuilder::new("example.com", &origin)
+            .unwrap()
+            .build()
+            .unwrap();
+        let (_, registration) = webauthn
+            .start_passkey_registration(
+                Uuid::from_u128(1),
+                "user@example.com",
+                "user",
+                None,
+            )
+            .unwrap();
+        postcard_round_trip(&DBFlow::RegisterPasskey {
+            user_id: DBUserId(1),
+            state: registration,
+        });
+
+        let (_, authentication) =
+            webauthn.start_discoverable_authentication().unwrap();
+        postcard_round_trip(&DBFlow::AuthenticatePasskey {
+            state: authentication,
+        });
+    }
+}
diff --git a/apps/labrinth/src/env.rs b/apps/labrinth/src/env.rs
index 88978d006a..9ddbdb9c24 100644
--- a/apps/labrinth/src/env.rs
+++ b/apps/labrinth/src/env.rs
@@ -165,7 +165,7 @@ vars! {
     REDIS_BLOCKING_MAX_CONNECTIONS: u32 = 256u32;
 
     // The encoding format used for Redis cache values.
-    REDIS_ENCODING_FORMAT: xredis::EncodingFormat = xredis::EncodingFormat::Json;
+    REDIS_ENCODING_FORMAT: xredis::EncodingFormat = xredis::EncodingFormat::Postcard;
     // The level of LZ4 compression used for Redis cache values. A value of 0 disables compression (supports 1-12)
     REDIS_COMPRESSION_LEVEL: i32 = 0i32;
     // The compression algorithm used for Redis cache values. Currently only LZ4 is supported.
diff --git a/apps/labrinth/src/models/exp/minecraft.rs b/apps/labrinth/src/models/exp/minecraft.rs
index 3b8fb5508c..54f7e037c5 100644
--- a/apps/labrinth/src/models/exp/minecraft.rs
+++ b/apps/labrinth/src/models/exp/minecraft.rs
@@ -3,6 +3,7 @@ use std::time::Duration;
 use chrono::{DateTime, Utc};
 use eyre::Result;
 use serde::{Deserialize, Serialize};
+use serde_binhum::serde_binhum;
 use tracing::warn;
 use validator::Validate;
 
@@ -324,7 +325,8 @@ impl ComponentEdit for JavaServerProjectEdit {
 }
 
 /// What game content a [`JavaServerProject`] is using.
-#[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)]
+#[derive(Debug, Clone)]
+#[serde_binhum(schema)]
 #[serde(tag = "kind", rename_all = "snake_case")]
 pub enum ServerContent {
     /// Server runs modded content with a modpack found on the Modrinth platform.
@@ -346,7 +348,8 @@ pub enum ServerContent {
 }
 
 /// What game content a [`JavaServerProject`] is using.
-#[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)]
+#[derive(Debug, Clone)]
+#[serde_binhum(schema)]
 #[serde(tag = "kind", rename_all = "snake_case")]
 pub enum ServerContentQuery {
     /// Server runs modded content with a modpack found on the Modrinth platform.
diff --git a/apps/labrinth/src/models/exp/project.rs b/apps/labrinth/src/models/exp/project.rs
index 46694b2ec8..4dcc06fcab 100644
--- a/apps/labrinth/src/models/exp/project.rs
+++ b/apps/labrinth/src/models/exp/project.rs
@@ -54,7 +54,7 @@ macro_rules! define_project_components {
         pub struct ProjectSerial {
             $(
                 #[validate(nested)]
-                #[serde(default, skip_serializing_if = "Option::is_none")]
+                #[serde(default)]
                 pub $field_name: Option<$ty>,
             )*
         }
@@ -114,7 +114,6 @@ macro_rules! define_project_components {
         #[derive(Debug, Clone, Default, Serialize, Deserialize, utoipa::ToSchema)]
         pub struct ProjectQuery {
             $(
-                #[serde(skip_serializing_if = "Option::is_none")]
                 pub $field_name: Option<Query<$ty>>,
             )*
         }
diff --git a/apps/labrinth/src/models/v3/billing.rs b/apps/labrinth/src/models/v3/billing.rs
index c3ef13facb..2557184e6b 100644
--- a/apps/labrinth/src/models/v3/billing.rs
+++ b/apps/labrinth/src/models/v3/billing.rs
@@ -4,6 +4,7 @@ use crate::models::ids::{
 use ariadne::ids::UserId;
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
+use serde_binhum::serde_binhum;
 use std::collections::HashMap;
 
 #[derive(Serialize, Deserialize)]
@@ -14,7 +15,7 @@ pub struct Product {
     pub unitary: bool,
 }
 
-#[derive(Serialize, Deserialize)]
+#[serde_binhum]
 #[serde(tag = "type", rename_all = "kebab-case")]
 pub enum ProductMetadata {
     Midas,
@@ -55,7 +56,7 @@ pub struct ProductPrice {
     pub currency_code: String,
 }
 
-#[derive(Serialize, Deserialize)]
+#[serde_binhum]
 #[serde(tag = "type", rename_all = "kebab-case")]
 pub enum Price {
     OneTime {
diff --git a/apps/labrinth/src/models/v3/notifications.rs b/apps/labrinth/src/models/v3/notifications.rs
index 6a655958f9..12598e7fed 100644
--- a/apps/labrinth/src/models/v3/notifications.rs
+++ b/apps/labrinth/src/models/v3/notifications.rs
@@ -12,6 +12,7 @@ use crate::routes::ApiError;
 use ariadne::ids::UserId;
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
+use serde_binhum::serde_binhum;
 use uuid::Uuid;
 
 #[derive(Serialize, Deserialize)]
@@ -151,7 +152,8 @@ impl NotificationType {
     }
 }
 
-#[derive(Serialize, Deserialize, Clone)]
+#[derive(Clone)]
+#[serde_binhum]
 #[serde(tag = "type", rename_all = "snake_case")]
 pub enum NotificationBody {
     ProjectUpdate {
diff --git a/apps/labrinth/src/queue/analytics/cache.rs b/apps/labrinth/src/queue/analytics/cache.rs
index 386cbdaad5..a82c69be29 100644
--- a/apps/labrinth/src/queue/analytics/cache.rs
+++ b/apps/labrinth/src/queue/analytics/cache.rs
@@ -12,7 +12,7 @@ use crate::{
     routes::analytics::MINECRAFT_SERVER_PLAYS, util::error::Context,
 };
 
-pub const MINECRAFT_SERVER_ANALYTICS: &str = "minecraft_server_analytics:v3";
+pub const MINECRAFT_SERVER_ANALYTICS: &str = "minecraft_server_analytics:v4";
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct MinecraftServerAnalytics {
diff --git a/apps/labrinth/src/queue/analytics/mod.rs b/apps/labrinth/src/queue/analytics/mod.rs
index 18766e48da..91c3f553d2 100644
--- a/apps/labrinth/src/queue/analytics/mod.rs
+++ b/apps/labrinth/src/queue/analytics/mod.rs
@@ -4,6 +4,7 @@ use crate::models::analytics::{
 };
 use crate::routes::ApiError;
 use crate::routes::analytics::MINECRAFT_SERVER_PLAYS;
+use crate::util::error::Context;
 use dashmap::{DashMap, DashSet};
 use std::collections::HashMap;
 use tracing::trace;
@@ -11,9 +12,9 @@ use xredis::RedisPool;
 
 pub mod cache;
 
-const DOWNLOADS_NAMESPACE: &str = "downloads:v3";
-const VIEWS_NAMESPACE: &str = "views:v3";
-const MINECRAFT_SERVER_PLAYS_NAMESPACE: &str = "minecraft_server_plays:v3";
+const DOWNLOADS_NAMESPACE: &str = "downloads:v4";
+const VIEWS_NAMESPACE: &str = "views:v4";
+const MINECRAFT_SERVER_PLAYS_NAMESPACE: &str = "minecraft_server_plays:v4";
 const MINECRAFT_SERVER_PLAYS_EXPIRY: u64 = 86_400; // 24 hours
 const MINECRAFT_SERVER_PLAYS_LIMIT: u32 = 5;
 
@@ -142,10 +143,15 @@ impl AnalyticsQueue {
                     )
                 })
                 .collect::<Vec<_>>();
-            let mut redis_connection = redis.connect().await?;
+            let mut redis_connection =
+                redis.connect().await.wrap_internal_err(
+                    "connecting to redis for server play counts",
+                )?;
 
-            let results =
-                redis_connection.get_many_typed::<u32>(&redis_keys).await?;
+            let results = redis_connection
+                .get_many_typed::<u32>(&redis_keys)
+                .await
+                .wrap_internal_err("fetching server play counts from redis")?;
             for (idx, count) in results.into_iter().enumerate() {
                 let new_count = if let Some(count) = count {
                     if count >= MINECRAFT_SERVER_PLAYS_LIMIT {
@@ -164,7 +170,8 @@ impl AnalyticsQueue {
                         new_count,
                         Some(MINECRAFT_SERVER_PLAYS_EXPIRY as i64),
                     )
-                    .await?;
+                    .await
+                    .wrap_internal_err("writing server play count to redis")?;
             }
 
             let mut plays = client
@@ -198,10 +205,15 @@ impl AnalyticsQueue {
                     )
                 })
                 .collect::<Vec<_>>();
-            let mut redis_connection = redis.connect().await?;
+            let mut redis_connection = redis
+                .connect()
+                .await
+                .wrap_internal_err("connecting to redis for view counts")?;
 
-            let results =
-                redis_connection.get_many_typed::<u32>(&redis_keys).await?;
+            let results = redis_connection
+                .get_many_typed::<u32>(&redis_keys)
+                .await
+                .wrap_internal_err("fetching view counts from redis")?;
             for (idx, count) in results.into_iter().enumerate() {
                 let new_count =
                     if let Some((views, monetized)) = raw_views.get_mut(idx) {
@@ -226,7 +238,8 @@ impl AnalyticsQueue {
                 let key = &redis_keys[idx];
                 redis_connection
                     .set(key, new_count, Some(6 * 60 * 60))
-                    .await?;
+                    .await
+                    .wrap_internal_err("writing view count to redis")?;
             }
 
             let mut views = client.insert::<PageView>("views").await?;
@@ -267,10 +280,15 @@ impl AnalyticsQueue {
                     )
                 })
                 .collect::<Vec<_>>();
-            let mut redis_connection = redis.connect().await?;
+            let mut redis_connection = redis
+                .connect()
+                .await
+                .wrap_internal_err("connecting to redis for download counts")?;
 
-            let results =
-                redis_connection.get_many_typed::<u32>(&redis_keys).await?;
+            let results = redis_connection
+                .get_many_typed::<u32>(&redis_keys)
+                .await
+                .wrap_internal_err("fetching download counts from redis")?;
             for (idx, count) in results.into_iter().enumerate() {
                 let new_count = if let Some(count) = count {
                     if count > 5 {
@@ -286,7 +304,8 @@ impl AnalyticsQueue {
                 let key = &redis_keys[idx];
                 redis_connection
                     .set(key, new_count, Some(6 * 60 * 60))
-                    .await?;
+                    .await
+                    .wrap_internal_err("writing download count to redis")?;
             }
 
             let mut transaction = pool.begin().await?;
diff --git a/apps/labrinth/src/queue/server_ping.rs b/apps/labrinth/src/queue/server_ping.rs
index 75e8728260..070095c0b7 100644
--- a/apps/labrinth/src/queue/server_ping.rs
+++ b/apps/labrinth/src/queue/server_ping.rs
@@ -26,9 +26,9 @@ pub struct ServerPingQueue {
     pub incremental_search_queue: IncrementalSearchQueue,
 }
 
-pub const REDIS_NAMESPACE: &str = "minecraft_java_server_ping:v3";
+pub const REDIS_NAMESPACE: &str = "minecraft_java_server_ping:v4";
 pub const REDIS_FAILURE_NAMESPACE: &str =
-    "minecraft_java_server_ping_failures:v3";
+    "minecraft_java_server_ping_failures:v4";
 pub const CLICKHOUSE_TABLE: &str = "minecraft_java_server_pings";
 
 impl ServerPingQueue {
diff --git a/apps/labrinth/src/routes/internal/campaign.rs b/apps/labrinth/src/routes/internal/campaign.rs
index b440558cc5..5da7ebc414 100644
--- a/apps/labrinth/src/routes/internal/campaign.rs
+++ b/apps/labrinth/src/routes/internal/campaign.rs
@@ -68,7 +68,7 @@ pub struct CampaignInfo {
     cached_at: DateTime<Utc>,
 }
 
-const CAMPAIGN_INFO_CACHE_NAMESPACE: &str = "campaign_info:v3";
+const CAMPAIGN_INFO_CACHE_NAMESPACE: &str = "campaign_info:v4";
 const CAMPAIGN_INFO_CACHE_STALE_SECONDS: i64 = 15 * 60;
 const CAMPAIGN_INFO_CACHE_TTL_SECONDS: i64 = 24 * 60 * 60;
 
diff --git a/apps/labrinth/src/routes/internal/flows.rs b/apps/labrinth/src/routes/internal/flows.rs
index e9effeb083..fd70c60c55 100644
--- a/apps/labrinth/src/routes/internal/flows.rs
+++ b/apps/labrinth/src/routes/internal/flows.rs
@@ -2213,7 +2213,7 @@ async fn validate_2fa_code(
     )
     .map_err(|_| AuthenticationError::InvalidCredentials)?;
 
-    const TOTP_NAMESPACE: &str = "used_totp:v3";
+    const TOTP_NAMESPACE: &str = "used_totp:v4";
     let mut conn = redis.connect().await?;
     let logical_key = format!("{}-{}", input, user_id.0);
     let key = redis
diff --git a/apps/labrinth/src/routes/mod.rs b/apps/labrinth/src/routes/mod.rs
index fc75849d22..e9e606deba 100644
--- a/apps/labrinth/src/routes/mod.rs
+++ b/apps/labrinth/src/routes/mod.rs
@@ -267,12 +267,6 @@ pub enum ApiError {
     },
 }
 
-impl From<xredis::Error> for ApiError {
-    fn from(error: xredis::Error) -> Self {
-        Self::Database(error.into())
-    }
-}
-
 impl ApiError {
     pub fn delphi(err: impl Into<eyre::Error>) -> Self {
         Self::Delphi(err.into())
diff --git a/apps/labrinth/src/routes/v2/tags.rs b/apps/labrinth/src/routes/v2/tags.rs
index 6f3ef45283..56a86ca46d 100644
--- a/apps/labrinth/src/routes/v2/tags.rs
+++ b/apps/labrinth/src/routes/v2/tags.rs
@@ -210,18 +210,9 @@ pub async fn game_version_list(
                     .into_iter()
                     .map(|f| GameVersionQueryData {
                         version: f.value,
-                        version_type: f
-                            .metadata
-                            .get("type")
-                            .and_then(|m| m.as_str())
-                            .unwrap_or_default()
-                            .to_string(),
+                        version_type: f.ty.unwrap_or_default(),
                         date: f.created,
-                        major: f
-                            .metadata
-                            .get("major")
-                            .and_then(|m| m.as_bool())
-                            .unwrap_or_default(),
+                        major: f.major.unwrap_or_default(),
                     })
                     .collect::<Vec<_>>();
                 HttpResponse::Ok().json(fields)
diff --git a/apps/labrinth/src/routes/v3/content/mod.rs b/apps/labrinth/src/routes/v3/content/mod.rs
index 41807babd7..4d8cda3b91 100644
--- a/apps/labrinth/src/routes/v3/content/mod.rs
+++ b/apps/labrinth/src/routes/v3/content/mod.rs
@@ -23,8 +23,8 @@ use sha2::{Digest, Sha256};
 use std::collections::BTreeMap;
 use xredis::RedisPool;
 
-const CONTENT_RESOLVE_CACHE_NAMESPACE: &str = "content_resolve:v3";
-const CONTENT_RESOLVE_CACHE_HEAT_NAMESPACE: &str = "content_resolve_heat:v3";
+const CONTENT_RESOLVE_CACHE_NAMESPACE: &str = "content_resolve:v4";
+const CONTENT_RESOLVE_CACHE_HEAT_NAMESPACE: &str = "content_resolve_heat:v4";
 const CONTENT_RESOLVE_CACHE_SCHEMA_VERSION: &str = "v3";
 const CONTENT_RESOLVE_CACHE_HEAT_WINDOW_SECONDS: i64 = 60 * 60 * 24;
 
diff --git a/apps/labrinth/src/routes/v3/tags.rs b/apps/labrinth/src/routes/v3/tags.rs
index 6a499df5df..4c1589cbbc 100644
--- a/apps/labrinth/src/routes/v3/tags.rs
+++ b/apps/labrinth/src/routes/v3/tags.rs
@@ -6,6 +6,7 @@ use crate::database::models::categories::{
 };
 use crate::database::models::loader_fields::{
     Game, Loader, LoaderField, LoaderFieldEnumValue, LoaderFieldType,
+    LoaderMetadata,
 };
 use actix_web::{HttpResponse, get, web};
 use xredis::RedisPool;
@@ -103,7 +104,7 @@ pub struct LoaderData {
     pub supported_project_types: Vec<String>,
     pub supported_games: Vec<String>,
     pub supported_fields: Vec<String>, // Available loader fields for this loader
-    pub metadata: Value,
+    pub metadata: LoaderMetadata,
 }
 
 #[utoipa::path(tag = "tags", responses((status = OK)))]
diff --git a/apps/labrinth/src/search/indexing.rs b/apps/labrinth/src/search/indexing.rs
index 03e6c34061..26ca2ba53b 100644
--- a/apps/labrinth/src/search/indexing.rs
+++ b/apps/labrinth/src/search/indexing.rs
@@ -394,11 +394,13 @@ async fn build_search_documents(
 
     let loader_field_enum_values: Vec<QueryLoaderFieldEnumValue> =
         sqlx::query!(
-            "
-        SELECT DISTINCT id, enum_id, value, ordering, created, metadata
+            r#"
+        SELECT DISTINCT id, enum_id, value, ordering, created,
+        metadata->>'type' AS "ty?",
+        (metadata->>'major')::boolean AS "major?"
         FROM loader_field_enum_values lfev
         ORDER BY enum_id, ordering, created DESC
-        "
+        "#
         )
         .fetch(pool)
         .map_ok(|m| QueryLoaderFieldEnumValue {
@@ -407,7 +409,8 @@ async fn build_search_documents(
             value: m.value,
             ordering: m.ordering,
             created: m.created,
-            metadata: m.metadata,
+            ty: m.ty,
+            major: m.major,
         })
         .try_collect()
         .await?;
diff --git a/apps/labrinth/src/sync/friends.rs b/apps/labrinth/src/sync/friends.rs
index a7327f38eb..32169677e8 100644
--- a/apps/labrinth/src/sync/friends.rs
+++ b/apps/labrinth/src/sync/friends.rs
@@ -14,7 +14,7 @@ use redis::{RedisWrite, ToRedisArgs, ToSingleRedisArg};
 use serde::{Deserialize, Serialize};
 use tokio::sync::mpsc;
 
-pub const FRIENDS_CHANNEL_NAME: &str = "friends:v3";
+pub const FRIENDS_CHANNEL_NAME: &str = "friends:v4";
 
 #[derive(Serialize, Deserialize)]
 pub enum RedisFriendsMessage {
diff --git a/apps/labrinth/src/sync/status.rs b/apps/labrinth/src/sync/status.rs
index 33f6bc3881..98375dccb7 100644
--- a/apps/labrinth/src/sync/status.rs
+++ b/apps/labrinth/src/sync/status.rs
@@ -5,7 +5,7 @@ use redis::AsyncCommands;
 use xredis::RedisPool;
 
 const EXPIRY_TIME_SECONDS: i64 = 60;
-const USER_STATUS_NAMESPACE: &str = "user_status:v3";
+const USER_STATUS_NAMESPACE: &str = "user_status:v4";
 
 pub async fn get_user_status(
     user: UserId,
diff --git a/apps/labrinth/src/util/gotenberg.rs b/apps/labrinth/src/util/gotenberg.rs
index 64d971b801..0c1a3248b0 100644
--- a/apps/labrinth/src/util/gotenberg.rs
+++ b/apps/labrinth/src/util/gotenberg.rs
@@ -14,7 +14,7 @@ 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:v3";
+pub const PAYMENT_STATEMENTS_NAMESPACE: &str = "payment_statements:v4";
 const REDIS_TIMEOUT_MARGIN_MS: u64 = 250;
 
 pub(crate) fn payment_statement_key(
diff --git a/apps/labrinth/src/util/ratelimit.rs b/apps/labrinth/src/util/ratelimit.rs
index 9088b6ad50..3bac6cabe8 100644
--- a/apps/labrinth/src/util/ratelimit.rs
+++ b/apps/labrinth/src/util/ratelimit.rs
@@ -12,7 +12,7 @@ use std::str::FromStr;
 use std::sync::Arc;
 use xredis::RedisPool;
 
-const RATE_LIMIT_NAMESPACE: &str = "rate_limit:v3";
+const RATE_LIMIT_NAMESPACE: &str = "rate_limit:v4";
 const RATE_LIMIT_EXPIRY: i64 = 300; // 5 minutes
 const MINUTE_IN_NANOS: i64 = 60_000_000_000;
 
diff --git a/apps/labrinth/tests/loader_fields.rs b/apps/labrinth/tests/loader_fields.rs
index 53a86bfac5..750fd18e91 100644
--- a/apps/labrinth/tests/loader_fields.rs
+++ b/apps/labrinth/tests/loader_fields.rs
@@ -574,12 +574,7 @@ async fn minecraft_game_version_update() {
         // A couple specific checks- in the dummy data, all game versions are marked as major=false except 1.20.5
         let name_to_major = game_versions
             .iter()
-            .map(|x| {
-                (
-                    x.value.clone(),
-                    x.metadata.get("major").unwrap().as_bool().unwrap(),
-                )
-            })
+            .map(|x| (x.value.clone(), x.major.unwrap()))
             .collect::<std::collections::HashMap<_, _>>();
         for (name, major) in name_to_major {
             if name == "1.20.5" {
@@ -612,12 +607,7 @@ async fn minecraft_game_version_update() {
 
         let name_to_major = game_versions
             .iter()
-            .map(|x| {
-                (
-                    x.value.clone(),
-                    x.metadata.get("major").unwrap().as_bool().unwrap(),
-                )
-            })
+            .map(|x| (x.value.clone(), x.major.unwrap()))
             .collect::<std::collections::HashMap<_, _>>();
         // Confirm that the new version is there
         assert!(name_to_major.contains_key("1.20.6"));
diff --git a/apps/labrinth/tests/redis.rs b/apps/labrinth/tests/redis.rs
index c812868fcf..bbd38fea94 100644
--- a/apps/labrinth/tests/redis.rs
+++ b/apps/labrinth/tests/redis.rs
@@ -22,7 +22,7 @@ use serde_json::json;
 use tokio::sync::{Barrier, Notify};
 use tokio::time::timeout;
 use uuid::Uuid;
-use xredis::{KeyBuilder, RedisPool, RedisTopology};
+use xredis::{KeyBuilder, RedisPool, RedisTopology, RedisValue};
 
 pub mod common;
 
@@ -250,7 +250,7 @@ async fn cache_lock_coalesces_concurrent_misses_for_one_key() {
         tasks.push(tokio::spawn(async move {
             barrier.wait().await;
             pool.get_cached_keys_raw(
-                "single_flight:v3",
+                "single_flight:v4",
                 &["shared".to_string()],
                 move |keys| async move {
                     fetch_count.fetch_add(1, Ordering::SeqCst);
@@ -292,7 +292,7 @@ async fn cache_lock_coalesces_only_overlapping_keys() {
         tasks.push(tokio::spawn(async move {
             barrier.wait().await;
             pool.get_cached_keys_raw(
-                "overlapping_locks:v3",
+                "overlapping_locks:v4",
                 &requested,
                 move |keys| async move {
                     tokio::time::sleep(Duration::from_millis(75)).await;
@@ -333,7 +333,7 @@ async fn cache_lock_does_not_block_independent_keys() {
     let slow = tokio::spawn(async move {
         slow_pool
             .get_cached_keys_raw(
-                "independent_locks:v3",
+                "independent_locks:v4",
                 &["slow".to_string()],
                 move |keys| async move {
                     slow_started.notify_one();
@@ -350,7 +350,7 @@ async fn cache_lock_does_not_block_independent_keys() {
     let fast = timeout(
         Duration::from_secs(1),
         pool.get_cached_keys_raw(
-            "independent_locks:v3",
+            "independent_locks:v4",
             &["fast".to_string()],
             |keys| async move {
                 let values = DashMap::new();
@@ -379,7 +379,7 @@ async fn cache_lock_is_released_after_error_and_cancellation() {
 
     let failed = pool
         .get_cached_keys_raw(
-            "error_recovery:v3",
+            "error_recovery:v4",
             &["key".to_string()],
             |_| async {
                 Err::<DashMap<String, String>, _>(DatabaseError::Internal(
@@ -393,7 +393,7 @@ async fn cache_lock_is_released_after_error_and_cancellation() {
     let recovered = timeout(
         Duration::from_secs(1),
         pool.get_cached_keys_raw(
-            "error_recovery:v3",
+            "error_recovery:v4",
             &["key".to_string()],
             |keys| async move {
                 let values = DashMap::new();
@@ -413,7 +413,7 @@ async fn cache_lock_is_released_after_error_and_cancellation() {
     let cancelled = tokio::spawn(async move {
         cancelled_pool
             .get_cached_keys_raw(
-                "cancellation_recovery:v3",
+                "cancellation_recovery:v4",
                 &["key".to_string()],
                 move |_| async move {
                     cancelled_started.notify_one();
@@ -432,7 +432,7 @@ async fn cache_lock_is_released_after_error_and_cancellation() {
     let recovered = timeout(
         Duration::from_secs(1),
         pool.get_cached_keys_raw(
-            "cancellation_recovery:v3",
+            "cancellation_recovery:v4",
             &["key".to_string()],
             |keys| async move {
                 let values = DashMap::new();
@@ -452,19 +452,19 @@ async fn cache_lock_is_released_after_error_and_cancellation() {
 #[actix_rt::test]
 async fn expired_cache_value_serves_waiter_while_writer_refreshes() {
     let pool = isolated_redis_pool("stale_while_revalidate").await;
-    let namespace = "stale_while_revalidate:v3";
+    let namespace = "stale_while_revalidate:v4";
     let logical_key = "key".to_string();
     let mut connection = pool.connect().await.unwrap();
     let redis_key = connection.key().entity(namespace, &logical_key);
     connection
         .set_serialized(
             &redis_key,
-            json!({
-                "key": logical_key,
-                "alias": null,
-                "iat": 0,
-                "val": "stale",
-            }),
+            RedisValue::<String, String, String>::new(
+                logical_key.clone(),
+                None,
+                0,
+                "stale".to_string(),
+            ),
             None,
         )
         .await
@@ -539,8 +539,8 @@ async fn case_insensitive_slug_requests_share_one_cache_lock() {
             let requested = vec![requested];
             barrier.wait().await;
             pool.get_cached_keys_raw_with_slug(
-                "slug_values:v3",
-                Some("slug_aliases:v3"),
+                "slug_values:v4",
+                Some("slug_aliases:v4"),
                 false,
                 &requested,
                 move |_| async move {
@@ -651,11 +651,11 @@ async fn many_get_routes_handle_cross_slot_cache_lifecycle() {
                 redis.key().entity(VERSIONS_NAMESPACE, alpha_version_id),
                 redis.key().entity(VERSIONS_NAMESPACE, beta_version_id),
                 redis.key().entity(
-                    "versions_files:v3",
+                    "versions_files:v4",
                     format!("sha1_{}", alpha.file_hash),
                 ),
                 redis.key().entity(
-                    "versions_files:v3",
+                    "versions_files:v4",
                     format!("sha1_{}", beta.file_hash),
                 ),
             ];
diff --git a/apps/labrinth/tests/tags.rs b/apps/labrinth/tests/tags.rs
index 5ca1bb49ad..e2852d461a 100644
--- a/apps/labrinth/tests/tags.rs
+++ b/apps/labrinth/tests/tags.rs
@@ -47,12 +47,7 @@ async fn get_tags_v3() {
 
             let loader_metadata = loaders
                 .into_iter()
-                .map(|x| {
-                    (
-                        x.name,
-                        x.metadata.get("platform").and_then(|x| x.as_bool()),
-                    )
-                })
+                .map(|x| (x.name, x.metadata.platform))
                 .collect::<HashMap<_, _>>();
             let loader_names =
                 loader_metadata.keys().cloned().collect::<HashSet<String>>();
diff --git a/packages/api-client/src/modules/labrinth/types.ts b/packages/api-client/src/modules/labrinth/types.ts
index 0e571a6291..7d9980a041 100644
--- a/packages/api-client/src/modules/labrinth/types.ts
+++ b/packages/api-client/src/modules/labrinth/types.ts
@@ -1153,9 +1153,10 @@ export namespace Labrinth {
 				side_types_migration_review_status: 'reviewed' | 'pending'
 				environment?: Environment[]
 
-				minecraft_server?: MinecraftServer
-				minecraft_java_server?: MinecraftJavaServer
-				minecraft_bedrock_server?: MinecraftBedrockServer
+				minecraft_server?: MinecraftServer | null
+				minecraft_java_server?: MinecraftJavaServer | null
+				minecraft_bedrock_server?: MinecraftBedrockServer | null
+				minecraft_mod?: unknown | null
 
 				/**
 				 * @deprecated Not recommended to use.
diff --git a/packages/serde-binhum/Cargo.toml b/packages/serde-binhum/Cargo.toml
new file mode 100644
index 0000000000..d4d438f1b9
--- /dev/null
+++ b/packages/serde-binhum/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+name = "serde-binhum"
+version = "0.1.0"
+edition.workspace = true
+rust-version.workspace = true
+repository.workspace = true
+
+[lib]
+proc-macro = true
+
+[dependencies]
+darling = { workspace = true }
+proc-macro2 = { workspace = true }
+quote = { workspace = true }
+syn = { workspace = true, features = ["full"] }
+
+[lints]
+workspace = true
diff --git a/packages/serde-binhum/README.md b/packages/serde-binhum/README.md
new file mode 100644
index 0000000000..c30ddd502c
--- /dev/null
+++ b/packages/serde-binhum/README.md
@@ -0,0 +1,154 @@
+Implement `serde::{Serialize, Deserialize}` on a type with different behavior for human-readable and non-human-readable (binary) formats.
+
+# Motivation
+
+Serde has the concept of human-readable and non-human-readable de/serializers. Human-readable ones, like JSON, are - well - readable by humans, and are usually verbose and self-describing. Human-readable format deserializers implement `deserialize_any`, which lets Serde do more complicated things like internally tagged enums and `serde(flatten)`. However, binary formats, like Postcard, cannot implement `deserialize_any`, and attempting to deserialize a value using `serde(flatten)` using one of these will fail.
+
+```rust
+#[derive(serde::Serialize, serde::Deserialize)]
+#[serde(tag = "kind")]
+enum MyEnum {
+    Foo,
+    Bar {
+        x: i32,
+        #[serde(flatten)]
+        data: BarData,
+    },
+}
+
+#[derive(serde::Serialize, serde::Deserialize)]
+struct BarData {
+    y: i32,
+}
+
+let error = postcard::to_allocvec(&MyEnum::Bar {
+    x: 1,
+    data: BarData { y: 2 },
+})
+.unwrap_err();
+```
+
+To fix this, we can generate two `De/Serialize` implementations: one for human-readable, and another for binary formats. Then, the `De/Serialize` impl on the actual type will delegate to one of those two:
+
+```rust
+enum MyEnum {
+    Foo,
+    Bar {
+        x: i32,
+        data: BarData,
+    },
+}
+
+// note: this type doesn't use any features which require `deserialize_any`,
+// so it can safely derive `De/Serialize` as normal
+#[derive(serde::Serialize, serde::Deserialize)]
+struct BarData {
+    y: i32,
+}
+
+const _: () = {
+    #[derive(serde::Serialize, serde::Deserialize)]
+    #[serde(remote = "MyEnum", tag = "kind")]
+    enum MyEnumHumanProxy {
+        Foo,
+        Bar {
+            x: i32,
+            #[serde(flatten)]
+            data: BarData,
+        },
+    }
+
+    #[derive(serde::Serialize, serde::Deserialize)]
+    #[serde(remote = "MyEnum")]
+    enum MyEnumBinaryProxy {
+        Foo,
+        Bar {
+            x: i32,
+            data: BarData,
+        },
+    }
+
+    impl serde::Serialize for MyEnum {
+        fn serialize<S: serde::Serializer>(
+            &self,
+            serializer: S,
+        ) -> Result<S::Ok, S::Error>
+        {
+            if serializer.is_human_readable() {
+                MyEnumHumanProxy::serialize(self, serializer)
+            } else {
+                MyEnumBinaryProxy::serialize(self, serializer)
+            }
+        }
+    }
+
+    impl<'de> serde::Deserialize<'de> for MyEnum {
+        fn deserialize<D: serde::Deserializer<'de>>(
+            deserializer: D,
+        ) -> Result<Self, D::Error>
+        {
+            if deserializer.is_human_readable() {
+                MyEnumHumanProxy::deserialize(deserializer)
+            } else {
+                MyEnumBinaryProxy::deserialize(deserializer)
+            }
+        }
+    }
+};
+```
+
+# Usage
+
+Add `#[serde_binhum::serde_binhum]` on a type, and remove `#[derive(serde::Serialize, serde::Deserialize)]`.
+
+Ordinary `#[serde(...)]` attributes describe the human-readable representation. `serde-binhum` removes attributes such as `tag` and `flatten` from the generated binary proxy:
+
+```rust
+#[serde_binhum::serde_binhum]
+#[derive(Debug, PartialEq)]
+#[serde(tag = "kind")]
+enum MyEnum {
+    Foo,
+    Bar {
+        x: i32,
+        #[serde(flatten)]
+        data: BarData,
+    },
+}
+
+#[derive(Debug, PartialEq, serde::Serialize, serde::Deserialize)]
+struct BarData {
+    y: i32,
+}
+
+let value = MyEnum::Bar {
+    x: 1,
+    data: BarData { y: 2 },
+};
+
+let json = serde_json::to_value(&value).unwrap();
+assert_eq!(
+    json,
+    serde_json::json!({
+        "kind": "Bar",
+        "x": 1,
+        "y": 2,
+    }),
+);
+
+let bytes = postcard::to_allocvec(&value).unwrap();
+let decoded = postcard::from_bytes::<MyEnum>(&bytes).unwrap();
+assert_eq!(decoded, value);
+```
+
+Representation-specific Serde options can be added with `human(...)` and `binary(...)`:
+
+```rust
+#[serde_binhum::serde_binhum]
+struct Value {
+    #[serde_binhum(human(flatten), binary(with = "binary_data"))]
+    data: Data,
+}
+```
+
+Use `#[serde_binhum::serde_binhum(schema)]` to forward `utoipa::PartialSchema` and `utoipa::ToSchema` to the human-readable proxy.
diff --git a/packages/serde-binhum/src/lib.rs b/packages/serde-binhum/src/lib.rs
new file mode 100644
index 0000000000..6fa3db8389
--- /dev/null
+++ b/packages/serde-binhum/src/lib.rs
@@ -0,0 +1,390 @@
+#![doc = include_str!("../README.md")]
+
+use darling::{FromMeta, ast::NestedMeta};
+use proc_macro::TokenStream;
+use quote::{format_ident, quote};
+use syn::punctuated::Punctuated;
+use syn::{
+    Attribute, Error, Fields, Ident, Item, ItemEnum, ItemStruct, Meta, Path,
+    Result, Token, parse_macro_input, parse_quote,
+};
+
+#[derive(Default, FromMeta)]
+struct Args {
+    #[darling(default)]
+    schema: bool,
+}
+
+#[derive(Default, FromMeta)]
+struct AttributeArgs {
+    #[darling(default)]
+    human: Option<SerdeOptions>,
+    #[darling(default)]
+    binary: Option<SerdeOptions>,
+}
+
+struct SerdeOptions(Vec<Meta>);
+
+impl FromMeta for SerdeOptions {
+    fn from_list(items: &[NestedMeta]) -> darling::Result<Self> {
+        let options = items
+            .iter()
+            .map(|item| match item {
+                NestedMeta::Meta(option) => Ok(option.clone()),
+                NestedMeta::Lit(literal) => {
+                    Err(darling::Error::custom("expected a Serde option")
+                        .with_span(literal))
+                }
+            })
+            .collect::<darling::Result<Vec<_>>>()?;
+        Ok(Self(options))
+    }
+}
+
+#[derive(Clone, Copy)]
+enum Representation {
+    Human,
+    Binary,
+}
+
+#[proc_macro_attribute]
+/// Implements `Serialize` and `Deserialize` through generated human and binary
+/// remote proxies.
+///
+/// The annotated type must not derive either trait itself. Ordinary
+/// `#[serde(...)]` attributes define the human-readable representation.
+///
+/// # Attributes
+///
+/// - **`#[serde_binhum]`**: Generates human-readable and binary Serde proxies
+///   and delegates `Serialize` and `Deserialize` to the appropriate proxy.
+/// - **`#[serde_binhum(schema)]`**: Also forwards `utoipa::PartialSchema` and
+///   `utoipa::ToSchema` to the human-readable proxy.
+/// - **`#[serde_binhum(human(...))]`**: Adds the enclosed Serde options only
+///   to the human-readable proxy. This can be placed on the type, a variant, or
+///   a field.
+/// - **`#[serde_binhum(binary(...))]`**: Adds the enclosed Serde options only
+///   to the binary proxy. This can be placed on the type, a variant, or a field.
+pub fn serde_binhum(args: TokenStream, input: TokenStream) -> TokenStream {
+    let args = match NestedMeta::parse_meta_list(args.into())
+        .map_err(darling::Error::from)
+        .and_then(|args| Args::from_list(&args))
+    {
+        Ok(args) => args,
+        Err(error) => return error.write_errors().into(),
+    };
+    let item = parse_macro_input!(input as Item);
+
+    expand(args, item)
+        .unwrap_or_else(|error| error.to_compile_error())
+        .into()
+}
+
+fn expand(args: Args, item: Item) -> Result<proc_macro2::TokenStream> {
+    match item {
+        Item::Enum(item) => expand_enum(args, item),
+        Item::Struct(item) => expand_struct(args, item),
+        item => Err(Error::new_spanned(
+            item,
+            "`serde_binhum` only supports structs and enums",
+        )),
+    }
+}
+
+fn expand_enum(
+    args: Args,
+    mut item: ItemEnum,
+) -> Result<proc_macro2::TokenStream> {
+    validate_item(&item.ident, &item.generics.params, &item.attrs)?;
+
+    let ident = item.ident.clone();
+    let human = enum_proxy(&item, Representation::Human, args.schema)?;
+    let binary = enum_proxy(&item, Representation::Binary, false)?;
+    clean_attributes(&mut item.attrs);
+    for variant in &mut item.variants {
+        clean_attributes(&mut variant.attrs);
+        clean_fields(&mut variant.fields);
+    }
+    let implementations = implementations(&ident, args.schema);
+
+    Ok(quote! {
+        #item
+
+        const _: () = {
+            #human
+            #binary
+            #implementations
+        };
+    })
+}
+
+fn expand_struct(
+    args: Args,
+    mut item: ItemStruct,
+) -> Result<proc_macro2::TokenStream> {
+    validate_item(&item.ident, &item.generics.params, &item.attrs)?;
+
+    let ident = item.ident.clone();
+    let human = struct_proxy(&item, Representation::Human, args.schema)?;
+    let binary = struct_proxy(&item, Representation::Binary, false)?;
+    clean_attributes(&mut item.attrs);
+    clean_fields(&mut item.fields);
+    let implementations = implementations(&ident, args.schema);
+
+    Ok(quote! {
+        #item
+
+        const _: () = {
+            #human
+            #binary
+            #implementations
+        };
+    })
+}
+
+fn validate_item(
+    ident: &Ident,
+    generics: &Punctuated<syn::GenericParam, Token![,]>,
+    attrs: &[Attribute],
+) -> Result<()> {
+    if !generics.is_empty() {
+        return Err(Error::new_spanned(
+            generics,
+            "`serde_binhum` does not yet support generic types",
+        ));
+    }
+
+    for attr in attrs.iter().filter(|attr| attr.path().is_ident("derive")) {
+        let derives = attr
+            .parse_args_with(Punctuated::<Path, Token![,]>::parse_terminated)?;
+        for derive in derives {
+            let Some(name) = derive.segments.last() else {
+                continue;
+            };
+            if name.ident == "Serialize" || name.ident == "Deserialize" {
+                return Err(Error::new_spanned(
+                    derive,
+                    format!(
+                        "`{ident}` must not derive `Serialize` or `Deserialize`; `#[serde_binhum]` implements both"
+                    ),
+                ));
+            }
+        }
+    }
+
+    Ok(())
+}
+
+fn enum_proxy(
+    item: &ItemEnum,
+    representation: Representation,
+    schema: bool,
+) -> Result<ItemEnum> {
+    let mut proxy = item.clone();
+    proxy.ident = match representation {
+        Representation::Human => format_ident!("HumanProxy"),
+        Representation::Binary => format_ident!("BinaryProxy"),
+    };
+    proxy.vis = syn::Visibility::Inherited;
+    proxy.attrs = proxy_item_attributes(
+        &item.attrs,
+        &item.ident,
+        representation,
+        schema,
+    )?;
+
+    for variant in &mut proxy.variants {
+        variant.attrs = proxy_attributes(&variant.attrs, representation)?;
+        proxy_fields(&mut variant.fields, representation)?;
+    }
+
+    Ok(proxy)
+}
+
+fn struct_proxy(
+    item: &ItemStruct,
+    representation: Representation,
+    schema: bool,
+) -> Result<ItemStruct> {
+    let mut proxy = item.clone();
+    proxy.ident = match representation {
+        Representation::Human => format_ident!("HumanProxy"),
+        Representation::Binary => format_ident!("BinaryProxy"),
+    };
+    proxy.vis = syn::Visibility::Inherited;
+    proxy.attrs = proxy_item_attributes(
+        &item.attrs,
+        &item.ident,
+        representation,
+        schema,
+    )?;
+    proxy_fields(&mut proxy.fields, representation)?;
+
+    Ok(proxy)
+}
+
+fn proxy_item_attributes(
+    attrs: &[Attribute],
+    remote: &Ident,
+    representation: Representation,
+    schema: bool,
+) -> Result<Vec<Attribute>> {
+    let mut attrs = proxy_attributes(attrs, representation)?;
+    let derive = if schema {
+        parse_quote!(#[derive(serde::Deserialize, serde::Serialize, utoipa::ToSchema)])
+    } else {
+        parse_quote!(#[derive(serde::Deserialize, serde::Serialize)])
+    };
+    let remote = remote.to_string();
+    let remote: Attribute = parse_quote!(#[serde(remote = #remote)]);
+    attrs.insert(0, remote);
+    attrs.insert(0, derive);
+    Ok(attrs)
+}
+
+fn proxy_fields(
+    fields: &mut Fields,
+    representation: Representation,
+) -> Result<()> {
+    for field in fields {
+        field.attrs = proxy_attributes(&field.attrs, representation)?;
+    }
+    Ok(())
+}
+
+fn proxy_attributes(
+    attrs: &[Attribute],
+    representation: Representation,
+) -> Result<Vec<Attribute>> {
+    let mut output = Vec::new();
+    let mut representation_options = Vec::new();
+
+    for attr in attrs {
+        if attr.path().is_ident("serde") {
+            let mut options = attr
+                .parse_args_with(
+                    Punctuated::<Meta, Token![,]>::parse_terminated,
+                )?
+                .into_iter()
+                .collect::<Vec<_>>();
+            if matches!(representation, Representation::Binary) {
+                options.retain(|option| !binary_incompatible(option));
+            }
+            if !options.is_empty() {
+                output.push(parse_quote!(#[serde(#(#options),*)]));
+            }
+        } else if attr.path().is_ident("serde_binhum") {
+            representation_options
+                .extend(parse_representation_options(attr, representation)?);
+        } else if attr.path().is_ident("doc") || attr.path().is_ident("schema")
+        {
+            output.push(attr.clone());
+        }
+    }
+
+    if !representation_options.is_empty() {
+        output.push(parse_quote!(#[serde(#(#representation_options),*)]));
+    }
+
+    Ok(output)
+}
+
+fn parse_representation_options(
+    attr: &Attribute,
+    representation: Representation,
+) -> Result<Vec<Meta>> {
+    let args = AttributeArgs::from_meta(&attr.meta)
+        .map_err(|error| Error::new(error.span(), error.to_string()))?;
+    if args.human.is_none() && args.binary.is_none() {
+        return Err(Error::new_spanned(
+            attr,
+            "expected `human(...)` or `binary(...)`",
+        ));
+    }
+
+    Ok(match representation {
+        Representation::Human => args.human,
+        Representation::Binary => args.binary,
+    }
+    .map_or_else(Vec::new, |options| options.0))
+}
+
+fn binary_incompatible(option: &Meta) -> bool {
+    let path = option.path();
+    path.is_ident("flatten")
+        || path.is_ident("tag")
+        || path.is_ident("content")
+        || path.is_ident("untagged")
+        || path.is_ident("skip_serializing_if")
+}
+
+fn clean_fields(fields: &mut Fields) {
+    for field in fields {
+        clean_attributes(&mut field.attrs);
+    }
+}
+
+fn clean_attributes(attrs: &mut Vec<Attribute>) {
+    attrs.retain(|attr| {
+        !attr.path().is_ident("serde") && !attr.path().is_ident("serde_binhum")
+    });
+}
+
+fn implementations(ident: &Ident, schema: bool) -> proc_macro2::TokenStream {
+    let schema = schema.then(|| {
+        quote! {
+            impl ::utoipa::PartialSchema for #ident {
+                fn schema()
+                -> ::utoipa::openapi::RefOr<::utoipa::openapi::schema::Schema> {
+                    <HumanProxy as ::utoipa::PartialSchema>::schema()
+                }
+            }
+
+            impl ::utoipa::ToSchema for #ident {
+                fn schemas(
+                    schemas: &mut ::std::vec::Vec<(
+                        ::std::string::String,
+                        ::utoipa::openapi::RefOr<::utoipa::openapi::schema::Schema>,
+                    )>,
+                ) {
+                    <HumanProxy as ::utoipa::ToSchema>::schemas(schemas);
+                }
+            }
+        }
+    });
+
+    quote! {
+        impl ::serde::Serialize for #ident {
+            fn serialize<S>(
+                &self,
+                serializer: S,
+            ) -> ::std::result::Result<S::Ok, S::Error>
+            where
+                S: ::serde::Serializer,
+            {
+                if serializer.is_human_readable() {
+                    HumanProxy::serialize(self, serializer)
+                } else {
+                    BinaryProxy::serialize(self, serializer)
+                }
+            }
+        }
+
+        impl<'de> ::serde::Deserialize<'de> for #ident {
+            fn deserialize<D>(
+                deserializer: D,
+            ) -> ::std::result::Result<Self, D::Error>
+            where
+                D: ::serde::Deserializer<'de>,
+            {
+                if deserializer.is_human_readable() {
+                    HumanProxy::deserialize(deserializer)
+                } else {
+                    BinaryProxy::deserialize(deserializer)
+                }
+            }
+        }
+
+        #schema
+    }
+}
diff --git a/packages/xredis/Cargo.toml b/packages/xredis/Cargo.toml
index 7f9fd2035a..cc87779098 100644
--- a/packages/xredis/Cargo.toml
+++ b/packages/xredis/Cargo.toml
@@ -10,8 +10,10 @@ ariadne = { workspace = true }
 chrono = { workspace = true }
 dashmap = { workspace = true }
 deadpool-redis = { workspace = true, features = ["cluster-async"] }
+eyre = { workspace = true }
 futures = { workspace = true }
 lz4_flex = { workspace = true }
+postcard = { workspace = true }
 prometheus = { workspace = true }
 redis = { workspace = true, features = [
   "ahash",
@@ -20,7 +22,6 @@ redis = { workspace = true, features = [
   "tokio-comp"
 ] }
 serde = { workspace = true, features = ["derive"] }
-serde_json = { workspace = true }
 thiserror = { workspace = true }
 tokio = { workspace = true, features = ["rt", "sync", "time"] }
 tracing = { workspace = true }
diff --git a/packages/xredis/src/blocking.rs b/packages/xredis/src/blocking.rs
index 7a7b7f4e0f..5aaf62d772 100644
--- a/packages/xredis/src/blocking.rs
+++ b/packages/xredis/src/blocking.rs
@@ -1,14 +1,14 @@
 use std::time::Duration;
 
+use eyre::{Result, WrapErr, bail};
 use prometheus::Registry;
 
+use super::RedisPool;
 use super::config::{RedisConfig, RedisTopology};
-use super::connection::RedisBackendBuildError;
 use super::metrics::{
     LogicalPoolStatus, LogicalPoolStatusProvider,
     register_blocking_pool_metrics,
 };
-use super::{Error, RedisPool};
 
 const POOL_RETAIN_INTERVAL: Duration = Duration::from_secs(30);
 const MAX_IDLE_CONNECTION_AGE: Duration = Duration::from_secs(5 * 60);
@@ -27,9 +27,7 @@ enum RedisBlockingPoolInner {
 }
 
 impl RedisBlockingPool {
-    pub(super) async fn new(
-        config: &RedisConfig,
-    ) -> Result<Self, RedisBackendBuildError> {
+    pub(super) async fn new(config: &RedisConfig) -> Result<Self> {
         let pool_size = config.blocking_pool_size();
         let inner = match config.topology() {
             RedisTopology::Standalone => {
@@ -39,14 +37,16 @@ impl RedisBlockingPool {
                 let manager = deadpool_redis::Manager::new_with_config(
                     config.seed_urls()[0].clone(),
                     connection_config,
-                )?;
+                )
+                .wrap_err("configuring standalone blocking Redis client")?;
                 let pool = deadpool_redis::Pool::builder(manager)
                     .max_size(pool_size.max())
                     .wait_timeout(Some(Duration::from_millis(
                         config.wait_timeout_ms(),
                     )))
                     .runtime(deadpool_redis::Runtime::Tokio1)
-                    .build()?;
+                    .build()
+                    .wrap_err("building standalone blocking Redis pool")?;
                 retain_standalone_pool(pool.clone());
                 RedisBlockingPoolInner::Standalone(pool)
             }
@@ -54,14 +54,16 @@ impl RedisBlockingPool {
                 let manager = deadpool_redis::cluster::Manager::new(
                     config.seed_urls().to_vec(),
                     false,
-                )?;
+                )
+                .wrap_err("configuring clustered blocking Redis client")?;
                 let pool = deadpool_redis::cluster::Pool::builder(manager)
                     .max_size(pool_size.max())
                     .wait_timeout(Some(Duration::from_millis(
                         config.wait_timeout_ms(),
                     )))
                     .runtime(deadpool_redis::Runtime::Tokio1)
-                    .build()?;
+                    .build()
+                    .wrap_err("building clustered blocking Redis pool")?;
                 retain_cluster_pool(pool.clone());
                 RedisBlockingPoolInner::Cluster(pool)
             }
@@ -70,10 +72,7 @@ impl RedisBlockingPool {
         Ok(Self { inner })
     }
 
-    pub(super) fn register_metrics(
-        &self,
-        registry: &Registry,
-    ) -> Result<(), prometheus::Error> {
+    pub(super) fn register_metrics(&self, registry: &Registry) -> Result<()> {
         register_blocking_pool_metrics(registry, self.clone())
     }
 
@@ -81,22 +80,33 @@ impl RedisBlockingPool {
         &self,
         key: &str,
         timeout: Duration,
-    ) -> Result<Option<[Vec<u8>; 2]>, Error> {
+    ) -> Result<Option<[Vec<u8>; 2]>> {
         if timeout.is_zero() {
-            return Err(Error::InvalidBlockingTimeout);
+            bail!("redis blocking timeout must be greater than zero");
         }
 
         let mut command = redis::cmd("BRPOP");
         command.arg(key).arg(timeout.as_secs_f64());
 
-        let response: Option<(Vec<u8>, Vec<u8>)> = match &self.inner {
-            RedisBlockingPoolInner::Standalone(pool) => {
-                command.query_async(&mut pool.get().await?).await?
-            }
-            RedisBlockingPoolInner::Cluster(pool) => {
-                command.query_async(&mut pool.get().await?).await?
-            }
-        };
+        let response: Option<(Vec<u8>, Vec<u8>)> =
+            match &self.inner {
+                RedisBlockingPoolInner::Standalone(pool) => {
+                    let mut connection = pool.get().await.wrap_err(
+                        "fetching standalone blocking Redis connection",
+                    )?;
+                    command.query_async(&mut connection).await.wrap_err(
+                        "reading from standalone Redis blocking queue",
+                    )?
+                }
+                RedisBlockingPoolInner::Cluster(pool) => {
+                    let mut connection = pool.get().await.wrap_err(
+                        "fetching clustered blocking Redis connection",
+                    )?;
+                    command.query_async(&mut connection).await.wrap_err(
+                        "reading from clustered Redis blocking queue",
+                    )?
+                }
+            };
 
         Ok(response.map(|(key, value)| [key, value]))
     }
@@ -120,7 +130,7 @@ impl RedisPool {
         &self,
         key: &str,
         timeout: Duration,
-    ) -> Result<Option<[Vec<u8>; 2]>, Error> {
+    ) -> Result<Option<[Vec<u8>; 2]>> {
         self.blocking.brpop(key, timeout).await
     }
 }
diff --git a/packages/xredis/src/cache.rs b/packages/xredis/src/cache.rs
index 5e2aba678b..99e085e873 100644
--- a/packages/xredis/src/cache.rs
+++ b/packages/xredis/src/cache.rs
@@ -8,6 +8,7 @@ use std::str::FromStr;
 use ariadne::ids::base62_impl::{parse_base62, to_base62};
 use chrono::{TimeZone, Utc};
 use dashmap::DashMap;
+use eyre::{Result, WrapErr, eyre};
 use futures::stream::{FuturesUnordered, StreamExt};
 use redis::aio::ConnectionLike;
 use serde::de::DeserializeOwned;
@@ -16,8 +17,6 @@ use thiserror::Error;
 use tokio::time::{Instant, timeout_at};
 use tracing::{Instrument, info_span};
 
-use crate::Error;
-
 use super::commands;
 use super::connection::RoutableConnection;
 use super::key::KeyBuilder;
@@ -33,9 +32,7 @@ const FILL_TIMEOUT: std::time::Duration = std::time::Duration::from_secs(60);
 pub(super) trait ConnectionProvider {
     type Connection: ConnectionLike + RoutableConnection;
 
-    fn connect(
-        &self,
-    ) -> impl Future<Output = Result<Self::Connection, Error>> + Send;
+    fn connect(&self) -> impl Future<Output = Result<Self::Connection>> + Send;
 }
 
 #[derive(Clone, Copy)]
@@ -53,7 +50,7 @@ pub enum Codec {
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum EncodingFormat {
-    Json,
+    Postcard,
 }
 
 #[derive(Debug, Error)]
@@ -92,7 +89,7 @@ impl FromStr for EncodingFormat {
 
     fn from_str(value: &str) -> Result<Self, Self::Err> {
         match value {
-            "json" => Ok(Self::Json),
+            "postcard" => Ok(Self::Postcard),
             _ => Err(InvalidEncodingFormat),
         }
     }
@@ -112,12 +109,10 @@ pub struct CacheSettings {
 }
 
 impl CacheSettings {
-    pub fn encode_value<T: Serialize>(
-        &self,
-        value: &T,
-    ) -> Result<Vec<u8>, Error> {
+    pub fn encode_value<T: Serialize>(&self, value: &T) -> Result<Vec<u8>> {
         let mut value = match self.encoding_format {
-            EncodingFormat::Json => serde_json::to_vec(value)?,
+            EncodingFormat::Postcard => postcard::to_allocvec(value)
+                .wrap_err("serializing Redis cache value with postcard")?,
         };
 
         if self.compression_level > 0
@@ -149,15 +144,23 @@ impl CacheSettings {
         T: for<'a> Deserialize<'a>,
     {
         let (codec, value) = value.split_first()?;
-        let value = match Codec::try_from(*codec).ok()? {
+        let Ok(codec) = Codec::try_from(*codec) else {
+            return None;
+        };
+        let value = match codec {
             Codec::Raw => Cow::Borrowed(value),
-            Codec::Lz4 => Cow::Owned(
-                lz4_flex::block::decompress_size_prepended(value).ok()?,
-            ),
+            Codec::Lz4 => {
+                let Ok(value) =
+                    lz4_flex::block::decompress_size_prepended(value)
+                else {
+                    return None;
+                };
+                Cow::Owned(value)
+            }
         };
 
         match self.encoding_format {
-            EncodingFormat::Json => serde_json::from_slice(&value).ok(),
+            EncodingFormat::Postcard => postcard::from_bytes(&value).ok(),
         }
     }
 
@@ -202,12 +205,12 @@ impl CacheManager {
         namespace: &str,
         keys: &[K],
         closure: F,
-    ) -> Result<Vec<T>, E>
+    ) -> Result<Vec<T>>
     where
         P: ConnectionProvider,
         F: FnOnce(Vec<K>) -> Fut,
         Fut: Future<Output = Result<DashMap<K, T>, E>>,
-        E: From<Error>,
+        E: std::error::Error + Send + Sync + 'static,
         T: Serialize + DeserializeOwned,
         K: Display
             + Hash
@@ -220,7 +223,8 @@ impl CacheManager {
     {
         Ok(self
             .get_cached_keys_raw(provider, namespace, keys, closure)
-            .await?
+            .await
+            .wrap_err("fetching Redis cache values")?
             .into_values()
             .collect())
     }
@@ -232,12 +236,12 @@ impl CacheManager {
         namespace: &str,
         keys: &[K],
         closure: F,
-    ) -> Result<HashMap<K, T>, E>
+    ) -> Result<HashMap<K, T>>
     where
         P: ConnectionProvider,
         F: FnOnce(Vec<K>) -> Fut,
         Fut: Future<Output = Result<DashMap<K, T>, E>>,
-        E: From<Error>,
+        E: std::error::Error + Send + Sync + 'static,
         T: Serialize + DeserializeOwned,
         K: Display
             + Hash
@@ -255,11 +259,16 @@ impl CacheManager {
             false,
             keys,
             |ids| async move {
-                Ok(closure(ids)
-                    .await?
-                    .into_iter()
-                    .map(|(key, value)| (key, (None::<String>, value)))
-                    .collect())
+                let values = match closure(ids).await {
+                    Ok(values) => values,
+                    Err(error) => return Err(error),
+                };
+                Ok::<_, E>(
+                    values
+                        .into_iter()
+                        .map(|(key, value)| (key, (None::<String>, value)))
+                        .collect(),
+                )
             },
         )
         .await
@@ -274,12 +283,12 @@ impl CacheManager {
         case_sensitive: bool,
         keys: &[I],
         closure: F,
-    ) -> Result<Vec<T>, E>
+    ) -> Result<Vec<T>>
     where
         P: ConnectionProvider,
         F: FnOnce(Vec<I>) -> Fut,
         Fut: Future<Output = Result<DashMap<K, (Option<S>, T)>, E>>,
-        E: From<Error>,
+        E: std::error::Error + Send + Sync + 'static,
         T: Serialize + DeserializeOwned,
         I: Display + Hash + Eq + PartialEq + Clone + Debug,
         K: Display
@@ -300,7 +309,8 @@ impl CacheManager {
                 keys,
                 closure,
             )
-            .await?
+            .await
+            .wrap_err("fetching Redis cache values by slug")?
             .into_values()
             .collect())
     }
@@ -314,12 +324,12 @@ impl CacheManager {
         case_sensitive: bool,
         keys: &[I],
         closure: F,
-    ) -> Result<HashMap<K, T>, E>
+    ) -> Result<HashMap<K, T>>
     where
         P: ConnectionProvider,
         F: FnOnce(Vec<I>) -> Fut,
         Fut: Future<Output = Result<DashMap<K, (Option<S>, T)>, E>>,
-        E: From<Error>,
+        E: std::error::Error + Send + Sync + 'static,
         T: Serialize + DeserializeOwned,
         I: Display + Hash + Eq + PartialEq + Clone + Debug,
         K: Display
@@ -360,7 +370,9 @@ impl CacheManager {
                                 })
                                 .collect::<Vec<_>>();
                             let mut connection =
-                                provider.connect().await.map_err(E::from)?;
+                                provider.connect().await.wrap_err(
+                                    "connecting to Redis for slug lookup",
+                                )?;
                             let values = match routing {
                                 CacheReadRouting::ReplicaOptional => {
                                     commands::get_many_strings(
@@ -377,8 +389,8 @@ impl CacheManager {
                                     .await
                                 }
                             }
-                            .map_err(E::from)?;
-                            Ok::<_, E>(
+                            .wrap_err("fetching Redis cache slug values")?;
+                            eyre::Ok(
                                 values
                                     .into_iter()
                                     .flatten()
@@ -386,7 +398,8 @@ impl CacheManager {
                             )
                         }
                         .instrument(info_span!("get slug ids"))
-                        .await?
+                        .await
+                        .wrap_err("resolving Redis cache slugs")?
                     } else {
                         Vec::new()
                     };
@@ -403,8 +416,10 @@ impl CacheManager {
                         .map(|key| self.key_builder.entity(namespace, key))
                         .collect::<Vec<_>>();
 
-                    let mut connection =
-                        provider.connect().await.map_err(E::from)?;
+                    let mut connection = provider
+                        .connect()
+                        .await
+                        .wrap_err("connecting to Redis for cache lookup")?;
                     let mut cached_values = HashMap::new();
                     let values = match routing {
                         CacheReadRouting::ReplicaOptional => {
@@ -415,7 +430,7 @@ impl CacheManager {
                                 .await
                         }
                     }
-                    .map_err(E::from)?;
+                    .wrap_err("fetching Redis cache values")?;
                     for value in values {
                         if let Some(value) = value.and_then(|value| {
                             self.settings
@@ -425,7 +440,7 @@ impl CacheManager {
                         }
                     }
 
-                    Ok::<_, E>((cached_values, ids))
+                    eyre::Ok((cached_values, ids))
                 }
                 .instrument(info_span!("get_cached_values_closure"))
             };
@@ -437,7 +452,9 @@ impl CacheManager {
         let deadline = Instant::now() + WAIT_TIMEOUT;
 
         let (cached_values_raw, ids) =
-            get_cached_values(ids, CacheReadRouting::ReplicaOptional).await?;
+            get_cached_values(ids, CacheReadRouting::ReplicaOptional)
+                .await
+                .wrap_err("reading Redis cache")?;
         let mut cached_values = cached_values_raw
             .into_iter()
             .filter_map(|(key, value)| {
@@ -508,7 +525,10 @@ impl CacheManager {
 
                 let values = timeout_at(fill_deadline, closure(fetch_ids))
                     .await
-                    .map_err(|_| lock_timeout_error(0, waiters.len()))??;
+                    .map_err(|_| lock_timeout_error(0, waiters.len()))
+                    .wrap_err("waiting to fill Redis cache")?;
+                let values =
+                    values.wrap_err("fetching values to fill Redis cache")?;
 
                 let mut return_values = HashMap::new();
                 let mut encoded_values = Vec::with_capacity(values.len());
@@ -520,13 +540,17 @@ impl CacheManager {
                         val: value,
                         alias: slug.clone(),
                     };
-                    let encoded =
-                        self.settings.encode_value(&value).map_err(E::from)?;
+                    let encoded = self
+                        .settings
+                        .encode_value(&value)
+                        .wrap_err("encoding Redis cache value")?;
                     encoded_values.push((key, slug, value, encoded));
                 }
 
-                let mut connection =
-                    provider.connect().await.map_err(E::from)?;
+                let mut connection = provider
+                    .connect()
+                    .await
+                    .wrap_err("connecting to Redis to fill cache")?;
                 for (key, slug, _, encoded) in &encoded_values {
                     let redis_key =
                         self.key_builder.entity(namespace, key.to_string());
@@ -537,7 +561,7 @@ impl CacheManager {
                         default_expiry,
                     )
                     .await
-                    .map_err(E::from)?;
+                    .wrap_err("writing Redis cache value")?;
                     if let Some(slug) = slug
                         && let Some(slug_namespace) = slug_namespace
                     {
@@ -554,7 +578,7 @@ impl CacheManager {
                             default_expiry,
                         )
                         .await
-                        .map_err(E::from)?;
+                        .wrap_err("writing Redis cache slug")?;
                     }
                 }
 
@@ -563,7 +587,7 @@ impl CacheManager {
                     return_values.insert(key, value);
                 }
 
-                Result::<_, E>::Ok(return_values)
+                Result::<_>::Ok(return_values)
             }
             .await
         } else {
@@ -604,13 +628,14 @@ impl CacheManager {
                                 Err(error) => Err(error),
                             }
                         }
-                        Err(error) => Err(E::from(error)),
+                        Err(error) => Err(error),
                     }
                 }
             }
             Err(error) => Err(error),
         };
-        cached_values.extend(operation_result?);
+        cached_values
+            .extend(operation_result.wrap_err("populating Redis cache")?);
 
         Ok(cached_values
             .into_iter()
@@ -679,7 +704,7 @@ fn push_identity(identities: &mut Vec<String>, identity: String) {
 async fn wait_for_locks<I>(
     waiters: Vec<(I, LockWaiter)>,
     deadline: Instant,
-) -> Result<Vec<I>, Error> {
+) -> Result<Vec<I>> {
     let total = waiters.len();
     let mut released = Vec::with_capacity(total);
     let mut futures = FuturesUnordered::new();
@@ -695,26 +720,24 @@ async fn wait_for_locks<I>(
             Ok(()) => {
                 released.push(key);
             }
-            Err(error)
-                if is_lock_timeout(&error) || Instant::now() >= deadline =>
-            {
+            Err(_) if Instant::now() >= deadline => {
                 return Err(lock_timeout_error(released.len(), total));
             }
-            Err(error) => return Err(error),
+            Err(error) => {
+                return Err(error).wrap_err("waiting for Redis cache lock");
+            }
         }
     }
     Ok(released)
 }
 
-fn is_lock_timeout(error: &Error) -> bool {
-    matches!(error, Error::LocalCacheTimeout { .. })
-}
-
-fn lock_timeout_error(locks_released: usize, locks_waiting: usize) -> Error {
-    Error::LocalCacheTimeout {
-        released: locks_released,
-        total: locks_waiting,
-    }
+fn lock_timeout_error(
+    locks_released: usize,
+    locks_waiting: usize,
+) -> eyre::Report {
+    eyre!(
+        "timeout waiting on local Redis cache lock ({locks_released}/{locks_waiting} released)"
+    )
 }
 
 #[derive(Serialize, Deserialize)]
@@ -726,6 +749,15 @@ pub struct RedisValue<T, K, S> {
 }
 
 impl<T, K, S> RedisValue<T, K, S> {
+    pub fn new(key: K, alias: Option<S>, iat: i64, val: T) -> Self {
+        Self {
+            key,
+            alias,
+            iat,
+            val,
+        }
+    }
+
     pub fn value(&self) -> &T {
         &self.val
     }
diff --git a/packages/xredis/src/cache/locking/local.rs b/packages/xredis/src/cache/locking/local.rs
index fab5f6f822..001a64f72b 100644
--- a/packages/xredis/src/cache/locking/local.rs
+++ b/packages/xredis/src/cache/locking/local.rs
@@ -3,11 +3,10 @@ use std::sync::atomic::{AtomicBool, Ordering};
 
 use dashmap::DashMap;
 use dashmap::mapref::entry::Entry;
+use eyre::{Result, WrapErr};
 use tokio::sync::Notify;
 use tokio::time::{Instant, timeout_at};
 
-use crate::Error;
-
 #[derive(Clone)]
 pub(in crate::cache) struct LockCoordinator {
     locks: Arc<DashMap<String, Arc<LockState>>>,
@@ -76,10 +75,7 @@ pub(in crate::cache) struct LockWaiter {
 }
 
 impl LockWaiter {
-    pub(in crate::cache) async fn wait(
-        self,
-        deadline: Instant,
-    ) -> Result<(), Error> {
+    pub(in crate::cache) async fn wait(self, deadline: Instant) -> Result<()> {
         loop {
             if self.state.released.load(Ordering::Acquire) {
                 return Ok(());
@@ -94,7 +90,7 @@ impl LockWaiter {
 
             timeout_at(deadline, notified)
                 .await
-                .map_err(|_| lock_timeout())?;
+                .wrap_err("waiting for local Redis cache lock")?;
         }
     }
 }
@@ -112,10 +108,3 @@ impl LockState {
         }
     }
 }
-
-fn lock_timeout() -> Error {
-    Error::LocalCacheTimeout {
-        released: 0,
-        total: 1,
-    }
-}
diff --git a/packages/xredis/src/commands.rs b/packages/xredis/src/commands.rs
index fdf0b058c7..744e158a89 100644
--- a/packages/xredis/src/commands.rs
+++ b/packages/xredis/src/commands.rs
@@ -1,10 +1,9 @@
 use std::fmt::Debug;
 
+use eyre::{Result, WrapErr};
 use redis::aio::ConnectionLike;
 use redis::{FromRedisValue, ToRedisArgs};
 
-use crate::Error;
-
 use super::cache::CacheSettings;
 use super::connection::RoutableConnection;
 use super::routing::primary_mget_routing;
@@ -18,7 +17,7 @@ pub async fn set<C, D>(
     key: &str,
     data: D,
     expiry: i64,
-) -> Result<(), Error>
+) -> Result<()>
 where
     C: ConnectionLike,
     D: ToRedisArgs + Send + Sync + Debug,
@@ -29,7 +28,8 @@ where
         .arg("EX")
         .arg(expiry)
         .query_async::<()>(connection)
-        .await?;
+        .await
+        .wrap_err("writing to Redis")?;
     Ok(())
 }
 
@@ -40,7 +40,7 @@ pub async fn set_serialized<C, D>(
     data: D,
     expiry: Option<i64>,
     settings: &CacheSettings,
-) -> Result<(), Error>
+) -> Result<()>
 where
     C: ConnectionLike,
     D: serde::Serialize,
@@ -48,21 +48,24 @@ where
     set(
         connection,
         key,
-        settings.encode_value(&data)?,
+        settings
+            .encode_value(&data)
+            .wrap_err("serializing Redis value")?,
         expiry.unwrap_or(settings.default_expiry),
     )
     .await
 }
 
 #[tracing::instrument(skip_all)]
-pub async fn get<C>(
-    connection: &mut C,
-    key: &str,
-) -> Result<Option<String>, Error>
+pub async fn get<C>(connection: &mut C, key: &str) -> Result<Option<String>>
 where
     C: ConnectionLike,
 {
-    Ok(cmd("GET").arg(key).query_async(connection).await?)
+    cmd("GET")
+        .arg(key)
+        .query_async(connection)
+        .await
+        .wrap_err("fetching from Redis")
 }
 
 /// Issues ordinary `MGET` commands in bounded chunks. Cluster routing and
@@ -72,7 +75,7 @@ where
 pub async fn get_many<C>(
     connection: &mut C,
     keys: &[String],
-) -> Result<Vec<Option<Vec<u8>>>, Error>
+) -> Result<Vec<Option<Vec<u8>>>>
 where
     C: ConnectionLike,
 {
@@ -83,7 +86,7 @@ where
 pub async fn get_many_strings<C>(
     connection: &mut C,
     keys: &[String],
-) -> Result<Vec<Option<String>>, Error>
+) -> Result<Vec<Option<String>>>
 where
     C: ConnectionLike,
 {
@@ -93,7 +96,7 @@ where
 pub(super) async fn get_many_primary<C>(
     connection: &mut C,
     keys: &[String],
-) -> Result<Vec<Option<Vec<u8>>>, Error>
+) -> Result<Vec<Option<Vec<u8>>>>
 where
     C: RoutableConnection,
 {
@@ -103,7 +106,7 @@ where
 pub(super) async fn get_many_strings_primary<C>(
     connection: &mut C,
     keys: &[String],
-) -> Result<Vec<Option<String>>, Error>
+) -> Result<Vec<Option<String>>>
 where
     C: RoutableConnection,
 {
@@ -113,7 +116,7 @@ where
 pub(super) async fn get_many_as<C, T>(
     connection: &mut C,
     keys: &[String],
-) -> Result<Vec<Option<T>>, Error>
+) -> Result<Vec<Option<T>>>
 where
     C: ConnectionLike,
     T: FromRedisValue,
@@ -123,7 +126,8 @@ where
         let part = cmd("MGET")
             .arg(chunk)
             .query_async::<Vec<Option<T>>>(connection)
-            .await?;
+            .await
+            .wrap_err("fetching multiple values from Redis")?;
         values.extend(part);
     }
     Ok(values)
@@ -132,7 +136,7 @@ where
 async fn get_many_primary_as<C, T>(
     connection: &mut C,
     keys: &[String],
-) -> Result<Vec<Option<T>>, Error>
+) -> Result<Vec<Option<T>>>
 where
     C: RoutableConnection,
     T: FromRedisValue,
@@ -143,10 +147,14 @@ where
         command.arg(chunk);
         let value = connection
             .route_command(command, primary_mget_routing(chunk))
-            .await?;
-        let part =
-            redis::from_redis_value::<Vec<Option<T>>>(value.extract_error()?)
-                .map_err(redis::RedisError::from)?;
+            .await
+            .wrap_err("fetching multiple values from primary Redis nodes")?;
+        let value = value
+            .extract_error()
+            .wrap_err("extracting Redis response")?;
+        let part = redis::from_redis_value::<Vec<Option<T>>>(value)
+            .map_err(redis::RedisError::from)
+            .wrap_err("decoding Redis response")?;
         values.extend(part);
     }
     Ok(values)
@@ -157,13 +165,16 @@ pub async fn get_deserialized<C, R>(
     connection: &mut C,
     key: &str,
     settings: &CacheSettings,
-) -> Result<Option<R>, Error>
+) -> Result<Option<R>>
 where
     C: ConnectionLike,
     R: for<'a> serde::Deserialize<'a>,
 {
-    let value: Option<Vec<u8>> =
-        cmd("GET").arg(key).query_async(connection).await?;
+    let value: Option<Vec<u8>> = cmd("GET")
+        .arg(key)
+        .query_async(connection)
+        .await
+        .wrap_err("fetching serialized value from Redis")?;
     Ok(value.and_then(|value| settings.decode_value(&value)))
 }
 
@@ -172,47 +183,49 @@ pub async fn get_many_deserialized<C, R>(
     connection: &mut C,
     keys: &[String],
     settings: &CacheSettings,
-) -> Result<Vec<Option<R>>, Error>
+) -> Result<Vec<Option<R>>>
 where
     C: ConnectionLike,
     R: for<'a> serde::Deserialize<'a>,
 {
     Ok(get_many(connection, keys)
-        .await?
+        .await
+        .wrap_err("fetching serialized values from Redis")?
         .into_iter()
         .map(|value| value.and_then(|value| settings.decode_value(&value)))
         .collect())
 }
 
 #[tracing::instrument(skip_all)]
-pub async fn delete<C>(connection: &mut C, key: &str) -> Result<(), Error>
+pub async fn delete<C>(connection: &mut C, key: &str) -> Result<()>
 where
     C: ConnectionLike,
 {
-    cmd("DEL").arg(key).query_async::<()>(connection).await?;
+    cmd("DEL")
+        .arg(key)
+        .query_async::<()>(connection)
+        .await
+        .wrap_err("deleting from Redis")?;
     Ok(())
 }
 
 #[tracing::instrument(skip_all)]
-pub async fn delete_many<C>(
-    connection: &mut C,
-    keys: &[String],
-) -> Result<(), Error>
+pub async fn delete_many<C>(connection: &mut C, keys: &[String]) -> Result<()>
 where
     C: ConnectionLike,
 {
     if !keys.is_empty() {
-        cmd("DEL").arg(keys).query_async::<()>(connection).await?;
+        cmd("DEL")
+            .arg(keys)
+            .query_async::<()>(connection)
+            .await
+            .wrap_err("deleting multiple values from Redis")?;
     }
     Ok(())
 }
 
 #[tracing::instrument(skip_all)]
-pub async fn lpush<C, D>(
-    connection: &mut C,
-    key: &str,
-    value: D,
-) -> Result<(), Error>
+pub async fn lpush<C, D>(connection: &mut C, key: &str, value: D) -> Result<()>
 where
     C: ConnectionLike,
     D: ToRedisArgs + Send + Sync + Debug,
@@ -221,17 +234,19 @@ where
         .arg(key)
         .arg(value)
         .query_async::<()>(connection)
-        .await?;
+        .await
+        .wrap_err("pushing to Redis list")?;
     Ok(())
 }
 
 #[tracing::instrument(skip_all)]
-pub async fn incr<C>(
-    connection: &mut C,
-    key: &str,
-) -> Result<Option<u64>, Error>
+pub async fn incr<C>(connection: &mut C, key: &str) -> Result<Option<u64>>
 where
     C: ConnectionLike,
 {
-    Ok(cmd("INCR").arg(key).query_async(connection).await?)
+    cmd("INCR")
+        .arg(key)
+        .query_async(connection)
+        .await
+        .wrap_err("incrementing Redis value")
 }
diff --git a/packages/xredis/src/config.rs b/packages/xredis/src/config.rs
index 6e466b107d..d63b3b7f89 100644
--- a/packages/xredis/src/config.rs
+++ b/packages/xredis/src/config.rs
@@ -1,5 +1,6 @@
 use std::{fmt, str::FromStr};
 
+use eyre::{Result, WrapErr};
 use thiserror::Error;
 
 #[derive(Debug, Default, Clone, Copy, PartialEq, Eq)]
@@ -91,13 +92,11 @@ pub(crate) struct RedisPoolSize {
 }
 
 impl RedisPoolSize {
-    fn new(
-        name: &'static str,
-        max: usize,
-        min: usize,
-    ) -> Result<Self, RedisConfigError> {
+    fn new(name: &'static str, max: usize, min: usize) -> Result<Self> {
         if max == 0 || min > max {
-            return Err(RedisConfigError::InvalidPoolSize { name, max, min });
+            return Err(
+                RedisConfigError::InvalidPoolSize { name, max, min }.into()
+            );
         }
 
         Ok(Self { max, min })
@@ -193,11 +192,12 @@ impl RedisConfig {
         blocking_pool_size: (usize, usize),
         cache_locking_strategy: CacheLockingStrategy,
         read_replica_strategy: ReadReplicaStrategy,
-    ) -> Result<Self, RedisConfigError> {
+    ) -> Result<Self> {
         if cache_locking_strategy == CacheLockingStrategy::Distributed {
             return Err(RedisConfigError::UnsupportedCacheLockingStrategy {
                 strategy: cache_locking_strategy,
-            });
+            }
+            .into());
         }
 
         let seed_urls = raw_urls
@@ -208,26 +208,32 @@ impl RedisConfig {
             .collect::<Vec<_>>();
 
         if seed_urls.is_empty() {
-            return Err(RedisConfigError::MissingUrl);
+            return Err(RedisConfigError::MissingUrl.into());
         }
 
         let backend = match (mode, connection_type) {
             (RedisTopology::Standalone, RedisConnectionType::Pooled) => {
                 if seed_urls.len() != 1 {
-                    return Err(RedisConfigError::MultipleStandaloneUrls);
+                    return Err(RedisConfigError::MultipleStandaloneUrls.into());
                 }
-                RedisBackendConfig::StandalonePooled(RedisPoolSize::new(
-                    "standalone",
-                    standalone_pool_size.0,
-                    standalone_pool_size.1,
-                )?)
+                RedisBackendConfig::StandalonePooled(
+                    RedisPoolSize::new(
+                        "standalone",
+                        standalone_pool_size.0,
+                        standalone_pool_size.1,
+                    )
+                    .wrap_err("validating standalone Redis pool size")?,
+                )
             }
             (RedisTopology::Cluster, RedisConnectionType::Pooled) => {
-                RedisBackendConfig::ClusterPooled(RedisPoolSize::new(
-                    "cluster",
-                    cluster_pool_size.0,
-                    cluster_pool_size.1,
-                )?)
+                RedisBackendConfig::ClusterPooled(
+                    RedisPoolSize::new(
+                        "cluster",
+                        cluster_pool_size.0,
+                        cluster_pool_size.1,
+                    )
+                    .wrap_err("validating clustered Redis pool size")?,
+                )
             }
             (RedisTopology::Cluster, RedisConnectionType::Multiplexed) => {
                 RedisBackendConfig::ClusterMultiplexed
@@ -236,7 +242,8 @@ impl RedisConfig {
                 return Err(RedisConfigError::UnsupportedConnectionType {
                     mode,
                     connection_type,
-                });
+                }
+                .into());
             }
         };
 
@@ -249,7 +256,8 @@ impl RedisConfig {
                 "blocking",
                 blocking_pool_size.0,
                 blocking_pool_size.1,
-            )?,
+            )
+            .wrap_err("validating blocking Redis pool size")?,
             cache_locking_strategy,
             read_replica_strategy,
         })
diff --git a/packages/xredis/src/connection.rs b/packages/xredis/src/connection.rs
index 0d66fc818d..3632290d19 100644
--- a/packages/xredis/src/connection.rs
+++ b/packages/xredis/src/connection.rs
@@ -1,5 +1,6 @@
 use std::time::Duration;
 
+use eyre::{Result, WrapErr};
 use futures::future::try_join_all;
 use prometheus::Registry;
 use redis::aio::ConnectionLike;
@@ -7,7 +8,6 @@ use redis::cluster_read_routing::{
     RandomReplicaStrategy, RoundRobinReplicaStrategy,
 };
 use redis::cluster_routing::RoutingInfo;
-use thiserror::Error;
 use tracing::warn;
 
 use crate::ReadReplicaStrategy;
@@ -29,16 +29,6 @@ pub(crate) enum RedisBackend {
     ClusterMultiplexed(redis::cluster_async::ClusterConnection),
 }
 
-#[derive(Debug, Error)]
-pub enum RedisBackendBuildError {
-    #[error("failed to configure Redis client: {0}")]
-    Redis(#[from] redis::RedisError),
-    #[error("failed to build Redis pool: {0}")]
-    PoolBuild(#[from] deadpool_redis::BuildError),
-    #[error("failed to establish initial Redis pool connections: {0}")]
-    Pool(#[from] deadpool_redis::PoolError),
-}
-
 pub(crate) struct RedisConnection {
     inner: RedisConnectionInner,
 }
@@ -58,9 +48,7 @@ pub(crate) trait RoutableConnection: ConnectionLike {
 }
 
 impl RedisBackend {
-    pub(crate) async fn new(
-        config: &RedisConfig,
-    ) -> Result<Self, RedisBackendBuildError> {
+    pub(crate) async fn new(config: &RedisConfig) -> Result<Self> {
         match config.backend() {
             RedisBackendConfig::StandalonePooled(pool_size) => {
                 Self::standalone_pooled(config, pool_size).await
@@ -77,21 +65,25 @@ impl RedisBackend {
     async fn standalone_pooled(
         config: &RedisConfig,
         pool_size: RedisPoolSize,
-    ) -> Result<Self, RedisBackendBuildError> {
+    ) -> Result<Self> {
         let connection_config = redis::AsyncConnectionConfig::new()
             .set_connection_timeout(None)
             .set_response_timeout(None);
         let manager = deadpool_redis::Manager::new_with_config(
             config.seed_urls()[0].clone(),
             connection_config,
-        )?;
+        )
+        .wrap_err("configuring standalone Redis client")?;
         let pool = deadpool_redis::Pool::builder(manager)
             .max_size(pool_size.max())
             .wait_timeout(Some(Duration::from_millis(config.wait_timeout_ms())))
             .runtime(deadpool_redis::Runtime::Tokio1)
-            .build()?;
+            .build()
+            .wrap_err("building standalone Redis pool")?;
 
-        warm_standalone_pool(&pool, pool_size.min()).await?;
+        warm_standalone_pool(&pool, pool_size.min())
+            .await
+            .wrap_err("warming standalone Redis pool")?;
         retain_standalone_pool(pool.clone());
 
         Ok(Self::StandalonePooled(pool))
@@ -100,16 +92,18 @@ impl RedisBackend {
     async fn cluster_pooled(
         config: &RedisConfig,
         pool_size: RedisPoolSize,
-    ) -> Result<Self, RedisBackendBuildError> {
+    ) -> Result<Self> {
         let manager = deadpool_redis::cluster::Manager::new(
             config.seed_urls().to_vec(),
             false,
-        )?;
+        )
+        .wrap_err("configuring clustered Redis client")?;
         let pool = deadpool_redis::cluster::Pool::builder(manager)
             .max_size(pool_size.max())
             .wait_timeout(Some(Duration::from_millis(config.wait_timeout_ms())))
             .runtime(deadpool_redis::Runtime::Tokio1)
-            .build()?;
+            .build()
+            .wrap_err("building clustered Redis pool")?;
 
         if config.read_replica_strategy() != ReadReplicaStrategy::Primary {
             warn!(
@@ -117,15 +111,15 @@ impl RedisBackend {
             );
         }
 
-        warm_cluster_pool(&pool, pool_size.min()).await?;
+        warm_cluster_pool(&pool, pool_size.min())
+            .await
+            .wrap_err("warming clustered Redis pool")?;
         retain_cluster_pool(pool.clone());
 
         Ok(Self::ClusterPooled(pool))
     }
 
-    async fn cluster_multiplexed(
-        config: &RedisConfig,
-    ) -> Result<Self, RedisBackendBuildError> {
+    async fn cluster_multiplexed(config: &RedisConfig) -> Result<Self> {
         let mut builder = redis::cluster::ClusterClientBuilder::new(
             config.seed_urls().iter().map(String::as_str),
         );
@@ -141,22 +135,31 @@ impl RedisBackend {
             }
         }
 
-        let client = builder.build()?;
-        let connection = client.get_async_connection().await?;
+        let client = builder
+            .build()
+            .wrap_err("building multiplexed Redis client")?;
+        let connection = client
+            .get_async_connection()
+            .await
+            .wrap_err("connecting multiplexed Redis client")?;
 
         Ok(Self::ClusterMultiplexed(connection))
     }
 
-    pub(crate) async fn connect(
-        &self,
-    ) -> Result<RedisConnection, deadpool_redis::PoolError> {
+    pub(crate) async fn connect(&self) -> Result<RedisConnection> {
         let inner = match self {
             Self::StandalonePooled(pool) => {
-                RedisConnectionInner::StandalonePooled(pool.get().await?)
-            }
-            Self::ClusterPooled(pool) => {
-                RedisConnectionInner::ClusterPooled(pool.get().await?)
+                RedisConnectionInner::StandalonePooled(
+                    pool.get()
+                        .await
+                        .wrap_err("fetching standalone Redis connection")?,
+                )
             }
+            Self::ClusterPooled(pool) => RedisConnectionInner::ClusterPooled(
+                pool.get()
+                    .await
+                    .wrap_err("fetching clustered Redis connection")?,
+            ),
             Self::ClusterMultiplexed(connection) => {
                 RedisConnectionInner::ClusterMultiplexed(connection.clone())
             }
@@ -165,10 +168,7 @@ impl RedisBackend {
         Ok(RedisConnection { inner })
     }
 
-    pub(crate) fn register_metrics(
-        &self,
-        registry: &Registry,
-    ) -> Result<(), prometheus::Error> {
+    pub(crate) fn register_metrics(&self, registry: &Registry) -> Result<()> {
         register_command_pool_metrics(registry, self.clone())
     }
 }
@@ -282,8 +282,10 @@ impl RoutableConnection for RedisConnection {
 async fn warm_standalone_pool(
     pool: &deadpool_redis::Pool,
     min: usize,
-) -> Result<(), deadpool_redis::PoolError> {
-    let connections = try_join_all((0..min).map(|_| pool.get())).await?;
+) -> Result<()> {
+    let connections = try_join_all((0..min).map(|_| pool.get()))
+        .await
+        .wrap_err("fetching initial standalone Redis connections")?;
     drop(connections);
     Ok(())
 }
@@ -291,8 +293,10 @@ async fn warm_standalone_pool(
 async fn warm_cluster_pool(
     pool: &deadpool_redis::cluster::Pool,
     min: usize,
-) -> Result<(), deadpool_redis::PoolError> {
-    let connections = try_join_all((0..min).map(|_| pool.get())).await?;
+) -> Result<()> {
+    let connections = try_join_all((0..min).map(|_| pool.get()))
+        .await
+        .wrap_err("fetching initial clustered Redis connections")?;
     drop(connections);
     Ok(())
 }
diff --git a/packages/xredis/src/lib.rs b/packages/xredis/src/lib.rs
index e84fce15eb..19d4afce1e 100644
--- a/packages/xredis/src/lib.rs
+++ b/packages/xredis/src/lib.rs
@@ -6,6 +6,7 @@ use std::hash::Hash;
 use std::sync::Arc;
 
 use dashmap::DashMap;
+use eyre::{Result, WrapErr};
 use prometheus::Registry;
 use redis::aio::ConnectionLike;
 use redis::{FromRedisValue, ToRedisArgs};
@@ -35,25 +36,7 @@ pub use config::{
     RedisConfigError, RedisConnectionType, RedisTopology,
 };
 use connection::RedisBackend;
-pub use connection::RedisBackendBuildError;
 pub use key::KeyBuilder;
-use thiserror::Error as ThisError;
-
-#[derive(Debug, ThisError)]
-pub enum Error {
-    #[error("error while interacting with Redis: {0}")]
-    Redis(#[from] redis::RedisError),
-    #[error("Redis pool error: {0}")]
-    Pool(#[from] deadpool_redis::PoolError),
-    #[error("error while serializing a Redis cache value: {0}")]
-    Serialization(#[from] serde_json::Error),
-    #[error("Redis blocking timeout must be greater than zero")]
-    InvalidBlockingTimeout,
-    #[error(
-        "timeout waiting on local cache lock ({released}/{total} released)"
-    )]
-    LocalCacheTimeout { released: usize, total: usize },
-}
 
 #[derive(Clone)]
 pub struct RedisPool {
@@ -75,15 +58,19 @@ impl RedisPool {
         meta_namespace: impl Into<Arc<str>>,
         config: RedisConfig,
         cache_settings: CacheSettings,
-    ) -> Result<Self, RedisBackendBuildError> {
+    ) -> Result<Self> {
         tracing::info!(
             strategy = %config.cache_locking_strategy(),
             "configured Redis cache locking"
         );
 
-        let backend = RedisBackend::new(&config).await?;
+        let backend = RedisBackend::new(&config)
+            .await
+            .wrap_err("creating Redis command backend")?;
 
-        let blocking = blocking::RedisBlockingPool::new(&config).await?;
+        let blocking = blocking::RedisBlockingPool::new(&config)
+            .await
+            .wrap_err("creating Redis blocking pool")?;
         let key_builder = KeyBuilder::new(meta_namespace, config.topology());
         let cache = CacheManager::new(key_builder.clone(), cache_settings);
 
@@ -102,9 +89,13 @@ impl RedisPool {
 }
 
 impl RedisPool {
-    pub async fn connect(&self) -> Result<RedisConnection, Error> {
+    pub async fn connect(&self) -> Result<RedisConnection> {
         Ok(RedisConnection {
-            inner: self.backend.connect().await?,
+            inner: self
+                .backend
+                .connect()
+                .await
+                .wrap_err("connecting to Redis")?,
             key_builder: self.key_builder.clone(),
             settings: self.cache.settings().clone(),
         })
@@ -113,9 +104,13 @@ impl RedisPool {
     pub async fn register_and_set_metrics(
         &self,
         registry: &Registry,
-    ) -> Result<(), prometheus::Error> {
-        self.backend.register_metrics(registry)?;
-        self.blocking.register_metrics(registry)
+    ) -> Result<()> {
+        self.backend
+            .register_metrics(registry)
+            .wrap_err("registering Redis command pool metrics")?;
+        self.blocking
+            .register_metrics(registry)
+            .wrap_err("registering Redis blocking pool metrics")
     }
 
     pub async fn get_cached_keys<F, Fut, T, K, E>(
@@ -123,11 +118,11 @@ impl RedisPool {
         namespace: &str,
         keys: &[K],
         closure: F,
-    ) -> Result<Vec<T>, E>
+    ) -> Result<Vec<T>>
     where
         F: FnOnce(Vec<K>) -> Fut,
         Fut: Future<Output = Result<DashMap<K, T>, E>>,
-        E: From<Error>,
+        E: std::error::Error + Send + Sync + 'static,
         T: Serialize + DeserializeOwned,
         K: Display
             + Hash
@@ -148,11 +143,11 @@ impl RedisPool {
         namespace: &str,
         keys: &[K],
         closure: F,
-    ) -> Result<std::collections::HashMap<K, T>, E>
+    ) -> Result<std::collections::HashMap<K, T>>
     where
         F: FnOnce(Vec<K>) -> Fut,
         Fut: Future<Output = Result<DashMap<K, T>, E>>,
-        E: From<Error>,
+        E: std::error::Error + Send + Sync + 'static,
         T: Serialize + DeserializeOwned,
         K: Display
             + Hash
@@ -175,11 +170,11 @@ impl RedisPool {
         case_sensitive: bool,
         keys: &[I],
         closure: F,
-    ) -> Result<Vec<T>, E>
+    ) -> Result<Vec<T>>
     where
         F: FnOnce(Vec<I>) -> Fut,
         Fut: Future<Output = Result<DashMap<K, (Option<S>, T)>, E>>,
-        E: From<Error>,
+        E: std::error::Error + Send + Sync + 'static,
         T: Serialize + DeserializeOwned,
         I: Display + Hash + Eq + PartialEq + Clone + Debug,
         K: Display
@@ -210,11 +205,11 @@ impl RedisPool {
         case_sensitive: bool,
         keys: &[I],
         closure: F,
-    ) -> Result<std::collections::HashMap<K, T>, E>
+    ) -> Result<std::collections::HashMap<K, T>>
     where
         F: FnOnce(Vec<I>) -> Fut,
         Fut: Future<Output = Result<DashMap<K, (Option<S>, T)>, E>>,
-        E: From<Error>,
+        E: std::error::Error + Send + Sync + 'static,
         T: Serialize + DeserializeOwned,
         I: Display + Hash + Eq + PartialEq + Clone + Debug,
         K: Display
@@ -242,9 +237,7 @@ impl RedisPool {
 impl ConnectionProvider for RedisPool {
     type Connection = RedisConnection;
 
-    fn connect(
-        &self,
-    ) -> impl Future<Output = Result<Self::Connection, Error>> + Send {
+    fn connect(&self) -> impl Future<Output = Result<Self::Connection>> + Send {
         RedisPool::connect(self)
     }
 }
@@ -259,7 +252,7 @@ impl RedisConnection {
         key: &str,
         data: D,
         expiry: Option<i64>,
-    ) -> Result<(), Error>
+    ) -> Result<()>
     where
         D: ToRedisArgs + Send + Sync + Debug,
     {
@@ -277,7 +270,7 @@ impl RedisConnection {
         key: &str,
         data: D,
         expiry: Option<i64>,
-    ) -> Result<(), Error>
+    ) -> Result<()>
     where
         D: Serialize,
     {
@@ -291,31 +284,28 @@ impl RedisConnection {
         .await
     }
 
-    pub async fn get(&mut self, key: &str) -> Result<Option<String>, Error> {
+    pub async fn get(&mut self, key: &str) -> Result<Option<String>> {
         commands::get(&mut self.inner, key).await
     }
 
     pub async fn get_many(
         &mut self,
         keys: &[String],
-    ) -> Result<Vec<Option<Vec<u8>>>, Error> {
+    ) -> Result<Vec<Option<Vec<u8>>>> {
         commands::get_many(&mut self.inner, keys).await
     }
 
     pub async fn get_many_typed<R>(
         &mut self,
         keys: &[String],
-    ) -> Result<Vec<Option<R>>, Error>
+    ) -> Result<Vec<Option<R>>>
     where
         R: FromRedisValue,
     {
         commands::get_many_as(&mut self.inner, keys).await
     }
 
-    pub async fn get_deserialized<R>(
-        &mut self,
-        key: &str,
-    ) -> Result<Option<R>, Error>
+    pub async fn get_deserialized<R>(&mut self, key: &str) -> Result<Option<R>>
     where
         R: for<'a> serde::Deserialize<'a>,
     {
@@ -325,7 +315,7 @@ impl RedisConnection {
     pub async fn get_many_deserialized<R>(
         &mut self,
         keys: &[String],
-    ) -> Result<Vec<Option<R>>, Error>
+    ) -> Result<Vec<Option<R>>>
     where
         R: for<'a> serde::Deserialize<'a>,
     {
@@ -333,22 +323,22 @@ impl RedisConnection {
             .await
     }
 
-    pub async fn delete(&mut self, key: &str) -> Result<(), Error> {
+    pub async fn delete(&mut self, key: &str) -> Result<()> {
         commands::delete(&mut self.inner, key).await
     }
 
-    pub async fn delete_many(&mut self, keys: &[String]) -> Result<(), Error> {
+    pub async fn delete_many(&mut self, keys: &[String]) -> Result<()> {
         commands::delete_many(&mut self.inner, keys).await
     }
 
-    pub async fn lpush<D>(&mut self, key: &str, value: D) -> Result<(), Error>
+    pub async fn lpush<D>(&mut self, key: &str, value: D) -> Result<()>
     where
         D: ToRedisArgs + Send + Sync + Debug,
     {
         commands::lpush(&mut self.inner, key, value).await
     }
 
-    pub async fn incr(&mut self, key: &str) -> Result<Option<u64>, Error> {
+    pub async fn incr(&mut self, key: &str) -> Result<Option<u64>> {
         commands::incr(&mut self.inner, key).await
     }
 }
diff --git a/packages/xredis/src/metrics.rs b/packages/xredis/src/metrics.rs
index d50e4cce47..fafd5dccbe 100644
--- a/packages/xredis/src/metrics.rs
+++ b/packages/xredis/src/metrics.rs
@@ -1,5 +1,6 @@
 use std::time::Duration;
 
+use eyre::{Result, WrapErr};
 use prometheus::{IntGauge, Registry};
 
 const METRICS_UPDATE_INTERVAL: Duration = Duration::from_secs(5);
@@ -72,7 +73,7 @@ impl RedisPoolMetrics {
     fn register(
         registry: &Registry,
         kind: RedisPoolMetricsKind,
-    ) -> Result<Self, prometheus::Error> {
+    ) -> Result<Self> {
         let prefix = kind.metric_prefix();
         let description = kind.description();
         let max_size = IntGauge::new(
@@ -80,28 +81,40 @@ impl RedisPoolMetrics {
             format!(
                 "Maximum logical connection count for the {description}; clustered logical connections may own multiple physical sockets"
             ),
-        )?;
+        )
+        .wrap_err("creating Redis pool maximum size metric")?;
         let size = IntGauge::new(
             format!("{prefix}_size"),
             format!(
                 "Current logical connection count for the {description}; clustered logical connections may own multiple physical sockets"
             ),
-        )?;
+        )
+        .wrap_err("creating Redis pool size metric")?;
         let available = IntGauge::new(
             format!("{prefix}_available"),
             format!("Available logical connections in the {description}"),
-        )?;
+        )
+        .wrap_err("creating Redis pool availability metric")?;
         let waiting = IntGauge::new(
             format!("{prefix}_waiting"),
             format!(
                 "Number of futures waiting for a logical connection from the {description}"
             ),
-        )?;
+        )
+        .wrap_err("creating Redis pool waiters metric")?;
 
-        registry.register(Box::new(max_size.clone()))?;
-        registry.register(Box::new(size.clone()))?;
-        registry.register(Box::new(available.clone()))?;
-        registry.register(Box::new(waiting.clone()))?;
+        registry
+            .register(Box::new(max_size.clone()))
+            .wrap_err("registering Redis pool maximum size metric")?;
+        registry
+            .register(Box::new(size.clone()))
+            .wrap_err("registering Redis pool size metric")?;
+        registry
+            .register(Box::new(available.clone()))
+            .wrap_err("registering Redis pool availability metric")?;
+        registry
+            .register(Box::new(waiting.clone()))
+            .wrap_err("registering Redis pool waiters metric")?;
 
         Ok(Self {
             max_size,
@@ -122,7 +135,7 @@ impl RedisPoolMetrics {
 pub(super) fn register_command_pool_metrics<P>(
     registry: &Registry,
     provider: P,
-) -> Result<(), prometheus::Error>
+) -> Result<()>
 where
     P: LogicalPoolStatusProvider,
 {
@@ -132,7 +145,7 @@ where
 pub(super) fn register_blocking_pool_metrics<P>(
     registry: &Registry,
     provider: P,
-) -> Result<(), prometheus::Error>
+) -> Result<()>
 where
     P: LogicalPoolStatusProvider,
 {
@@ -143,11 +156,12 @@ fn register_pool_metrics<P>(
     registry: &Registry,
     kind: RedisPoolMetricsKind,
     provider: P,
-) -> Result<(), prometheus::Error>
+) -> Result<()>
 where
     P: LogicalPoolStatusProvider,
 {
-    let metrics = RedisPoolMetrics::register(registry, kind)?;
+    let metrics = RedisPoolMetrics::register(registry, kind)
+        .wrap_err("registering Redis pool metrics")?;
     metrics.set(provider.logical_pool_status());
 
     tokio::spawn(async move {
diff --git a/packages/xredis/src/pubsub.rs b/packages/xredis/src/pubsub.rs
index b6080a0f32..c4986ce043 100644
--- a/packages/xredis/src/pubsub.rs
+++ b/packages/xredis/src/pubsub.rs
@@ -1,11 +1,12 @@
 use std::time::Duration;
 
+use eyre::{Result, WrapErr};
 use futures::StreamExt;
 use redis::ToRedisArgs;
 use tokio::sync::mpsc;
 use tracing::{info, warn};
 
-use super::{Error, RedisPool};
+use super::RedisPool;
 
 const PUBSUB_BUFFER_SIZE: usize = 1024;
 const INITIAL_RECONNECT_BACKOFF: Duration = Duration::from_millis(250);
@@ -35,21 +36,20 @@ impl RedisPool {
         receiver
     }
 
-    pub async fn publish<M>(
-        &self,
-        channel: &str,
-        message: M,
-    ) -> Result<(), Error>
+    pub async fn publish<M>(&self, channel: &str, message: M) -> Result<()>
     where
         M: ToRedisArgs + Send + Sync,
     {
-        let mut connection = self.connect().await?;
+        let mut connection = self
+            .connect()
+            .await
+            .wrap_err("connecting to Redis for publishing")?;
         let _: usize = redis::cmd("PUBLISH")
             .arg(channel)
             .arg(message)
             .query_async(&mut connection)
             .await
-            .map_err(Error::from)?;
+            .wrap_err("publishing to Redis channel")?;
         Ok(())
     }
 }
@@ -111,10 +111,17 @@ async fn forward_from_seed(
     seed_url: &str,
     channel: &'static str,
     sender: &mpsc::Sender<Vec<u8>>,
-) -> redis::RedisResult<SubscriptionOutcome> {
-    let client = redis::Client::open(seed_url)?;
-    let mut pubsub = client.get_async_pubsub().await?;
-    pubsub.subscribe(channel).await?;
+) -> Result<SubscriptionOutcome> {
+    let client = redis::Client::open(seed_url)
+        .wrap_err("configuring Redis Pub/Sub client")?;
+    let mut pubsub = client
+        .get_async_pubsub()
+        .await
+        .wrap_err("connecting to Redis Pub/Sub")?;
+    pubsub
+        .subscribe(channel)
+        .await
+        .wrap_err("subscribing to Redis channel")?;
     info!(channel, "Established Redis Pub/Sub subscription");
 
     let mut stream = pubsub.into_on_message();

From bca8b1a02b18b977e8c36b6e7e45196a71f6e88e Mon Sep 17 00:00:00 2001
From: "Calum H." <calum@modrinth.com>
Date: Wed, 5 Aug 2026 11:47:06 +0100
Subject: [PATCH 32/82] fix: moderation queue endpoint regression (#7003)

fix: regression caused by 2308ac1 changes
---
 ...584d26550d01a1917d1af64fe236d63dd5005.json |   4 +-
 ...b206d70238d0132dad1f8974ae1ac346d2bd8.json |  28 ++++
 ...fd08431fc3f984263faed7aaeb311fa6ac2a9.json |  28 ----
 ...8103c009077768b33c17e22dcef4774ae5814.json | 138 ++++++++++++++++++
 ...931c2e9776ffed87f4406bb5c2bc30087f5b.json} |   4 +-
 ...51d55a61c2b6466db69a81be975e150b3ef41.json | 138 ------------------
 .../src/routes/internal/moderation/mod.rs     |   6 +-
 7 files changed, 172 insertions(+), 174 deletions(-)
 create mode 100644 apps/labrinth/.sqlx/query-17dc154d8cf4d857d2611c21352b206d70238d0132dad1f8974ae1ac346d2bd8.json
 delete mode 100644 apps/labrinth/.sqlx/query-22fbd4bf1c2088903842b2c0070fd08431fc3f984263faed7aaeb311fa6ac2a9.json
 create mode 100644 apps/labrinth/.sqlx/query-b3aaa0b2f38950057d845b3d4dc8103c009077768b33c17e22dcef4774ae5814.json
 rename apps/labrinth/.sqlx/{query-5a68c53bd00c08edf9dfb9ffdabc28f86cdd77cd06bbb10c9a8e5199509f9c4b.json => query-c268a2a256f11a65449bd132a14f931c2e9776ffed87f4406bb5c2bc30087f5b.json} (63%)
 delete mode 100644 apps/labrinth/.sqlx/query-ca8493b59004511e8d26200638951d55a61c2b6466db69a81be975e150b3ef41.json

diff --git a/apps/labrinth/.sqlx/query-1551b022217df05490a01e715b3584d26550d01a1917d1af64fe236d63dd5005.json b/apps/labrinth/.sqlx/query-1551b022217df05490a01e715b3584d26550d01a1917d1af64fe236d63dd5005.json
index 434d224cc7..db45e607d0 100644
--- a/apps/labrinth/.sqlx/query-1551b022217df05490a01e715b3584d26550d01a1917d1af64fe236d63dd5005.json
+++ b/apps/labrinth/.sqlx/query-1551b022217df05490a01e715b3584d26550d01a1917d1af64fe236d63dd5005.json
@@ -76,12 +76,10 @@
             "name": "delphi_severity",
             "kind": {
               "Enum": [
-                "hidden",
                 "low",
                 "medium",
                 "high",
-                "severe",
-                "malware"
+                "severe"
               ]
             }
           }
diff --git a/apps/labrinth/.sqlx/query-17dc154d8cf4d857d2611c21352b206d70238d0132dad1f8974ae1ac346d2bd8.json b/apps/labrinth/.sqlx/query-17dc154d8cf4d857d2611c21352b206d70238d0132dad1f8974ae1ac346d2bd8.json
new file mode 100644
index 0000000000..b3a813243e
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-17dc154d8cf4d857d2611c21352b206d70238d0132dad1f8974ae1ac346d2bd8.json
@@ -0,0 +1,28 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            WITH moderation_projects AS (\n                SELECT\n                    m.id,\n                    m.slug,\n                    m.name,\n                    m.summary,\n                    m.description,\n                    m.queued,\n                    m.published,\n                    m.organization_id,\n                    m.team_id,\n                    m.components\n                FROM mods m\n                WHERE\n                    m.status = $1\n                    AND (\n                        $7::boolean = false\n                        OR NOT EXISTS (\n                            SELECT 1\n                            FROM delphi_issue_details_with_statuses didws\n                            WHERE didws.project_id = m.id\n                                AND didws.status = 'pending'\n                        )\n                    )\n            ),\n            external_dependencies AS (\n                SELECT\n                    v.mod_id,\n                    COUNT(*) AS external_dependencies_count\n                FROM versions v\n                INNER JOIN moderation_projects mp ON mp.id = v.mod_id\n                INNER JOIN dependencies d ON d.dependent_id = v.id\n                WHERE d.dependency_file_name IS NOT NULL\n                GROUP BY v.mod_id\n            ),\n            version_project_types AS (\n                SELECT\n                    v.mod_id,\n                    ARRAY_AGG(DISTINCT pt.name::text) FILTER (WHERE pt.name IS NOT NULL) AS project_types\n                FROM versions v\n                INNER JOIN moderation_projects mp ON mp.id = v.mod_id\n                INNER JOIN loaders_versions lv ON v.id = lv.version_id\n                INNER JOIN loaders l ON lv.loader_id = l.id\n                INNER JOIN loaders_project_types lpt ON lpt.joining_loader_id = l.id\n                INNER JOIN project_types pt ON pt.id = lpt.joining_project_type_id\n                WHERE v.status = ANY($2)\n                GROUP BY v.mod_id\n            ),\n            queue_projects AS (\n                SELECT\n                    mp.id,\n                    mp.slug,\n                    mp.name,\n                    mp.summary,\n                    mp.description,\n                    mp.queued,\n                    mp.published,\n                    search_organization.name AS organization_name,\n                    search_owner.username AS owner_name,\n                    CASE\n                        WHEN jsonb_typeof(mp.components -> 'minecraft_server') = 'object'\n                            THEN ARRAY_APPEND(\n                                ARRAY_REMOVE(\n                                    COALESCE(vpt.project_types::text[], ARRAY[]::text[]),\n                                    'modpack'\n                                ),\n                                'minecraft_java_server'\n                            )\n                        ELSE COALESCE(vpt.project_types::text[], ARRAY[]::text[])\n                    END AS project_types,\n                    COALESCE(ed.external_dependencies_count, 0) AS external_dependencies_count\n                FROM moderation_projects mp\n                LEFT JOIN organizations search_organization\n                    ON search_organization.id = mp.organization_id\n                    AND $3::text IS NOT NULL\n                LEFT JOIN LATERAL (\n                    SELECT\n                        u.username\n                    FROM team_members tm\n                    INNER JOIN users u ON u.id = tm.user_id\n                    WHERE tm.team_id = mp.team_id\n                        AND tm.is_owner\n                    ORDER BY tm.ordering ASC\n                    LIMIT 1\n                ) search_owner ON $3::text IS NOT NULL\n                    AND mp.organization_id IS NULL\n                LEFT JOIN external_dependencies ed ON ed.mod_id = mp.id\n                LEFT JOIN version_project_types vpt ON vpt.mod_id = mp.id\n            )\n            SELECT id\n            FROM queue_projects\n            WHERE\n                (\n                    $3::text IS NULL\n                    OR name ILIKE '%' || $3 || '%'\n                    OR slug ILIKE '%' || $3 || '%'\n                    OR summary ILIKE '%' || $3 || '%'\n                    OR description ILIKE '%' || $3 || '%'\n                    OR owner_name ILIKE '%' || $3 || '%'\n                    OR organization_name ILIKE '%' || $3 || '%'\n                    OR EXISTS (\n                        SELECT 1\n                        FROM UNNEST(project_types) AS searched_project_type(project_type)\n                        WHERE searched_project_type.project_type ILIKE '%' || $3 || '%'\n                    )\n                )\n                AND (\n                    $4::text IS NULL\n                    OR ($4 = 'none' AND CARDINALITY(project_types) = 0)\n                    OR ($4 = 'minecraft_java_server' AND project_types @> ARRAY['minecraft_java_server']::text[])\n                    OR ($4 <> 'none' AND $4 <> 'minecraft_java_server' AND project_types[1] = $4)\n                )\n                AND ($5::boolean IS NULL OR (external_dependencies_count > 0) = $5)\n            ORDER BY\n                CASE WHEN $6 = 'most_external_deps' THEN external_dependencies_count END DESC,\n                CASE WHEN $6 = 'least_external_deps' THEN external_dependencies_count END ASC,\n                CASE WHEN $6 = 'newest' THEN COALESCE(queued, published) END DESC NULLS LAST,\n                CASE WHEN $6 IN ('oldest', 'most_external_deps', 'least_external_deps') THEN COALESCE(queued, published) END ASC NULLS LAST,\n                id ASC\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "TextArray",
+        "Text",
+        "Text",
+        "Bool",
+        "Text",
+        "Bool"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "17dc154d8cf4d857d2611c21352b206d70238d0132dad1f8974ae1ac346d2bd8"
+}
diff --git a/apps/labrinth/.sqlx/query-22fbd4bf1c2088903842b2c0070fd08431fc3f984263faed7aaeb311fa6ac2a9.json b/apps/labrinth/.sqlx/query-22fbd4bf1c2088903842b2c0070fd08431fc3f984263faed7aaeb311fa6ac2a9.json
deleted file mode 100644
index 38d43c6043..0000000000
--- a/apps/labrinth/.sqlx/query-22fbd4bf1c2088903842b2c0070fd08431fc3f984263faed7aaeb311fa6ac2a9.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            WITH moderation_projects AS (\n                SELECT\n                    m.id,\n                    m.slug,\n                    m.name,\n                    m.summary,\n                    m.description,\n                    m.queued,\n                    m.published,\n                    m.organization_id,\n                    m.team_id,\n                    m.components\n                FROM mods m\n                WHERE\n                    m.status = $1\n                    AND (\n                        $7::boolean = false\n                        OR NOT EXISTS (\n                            SELECT 1\n                            FROM delphi_issue_details_with_statuses didws\n                            WHERE didws.project_id = m.id\n                                AND didws.status = 'pending'\n                        )\n                    )\n            ),\n            external_dependencies AS (\n                SELECT\n                    v.mod_id,\n                    COUNT(*) AS external_dependencies_count\n                FROM versions v\n                INNER JOIN moderation_projects mp ON mp.id = v.mod_id\n                INNER JOIN dependencies d ON d.dependent_id = v.id\n                WHERE d.dependency_file_name IS NOT NULL\n                GROUP BY v.mod_id\n            ),\n            version_project_types AS (\n                SELECT\n                    v.mod_id,\n                    ARRAY_AGG(DISTINCT pt.name::text) FILTER (WHERE pt.name IS NOT NULL) AS project_types\n                FROM versions v\n                INNER JOIN moderation_projects mp ON mp.id = v.mod_id\n                INNER JOIN loaders_versions lv ON v.id = lv.version_id\n                INNER JOIN loaders l ON lv.loader_id = l.id\n                INNER JOIN loaders_project_types lpt ON lpt.joining_loader_id = l.id\n                INNER JOIN project_types pt ON pt.id = lpt.joining_project_type_id\n                WHERE v.status = ANY($2)\n                GROUP BY v.mod_id\n            ),\n            queue_projects AS (\n                SELECT\n                    mp.id,\n                    mp.slug,\n                    mp.name,\n                    mp.summary,\n                    mp.description,\n                    mp.queued,\n                    mp.published,\n                    search_organization.name AS organization_name,\n                    search_owner.username AS owner_name,\n                    CASE\n                        WHEN mp.components ? 'minecraft_server'\n                            THEN ARRAY_APPEND(\n                                ARRAY_REMOVE(\n                                    COALESCE(vpt.project_types::text[], ARRAY[]::text[]),\n                                    'modpack'\n                                ),\n                                'minecraft_java_server'\n                            )\n                        ELSE COALESCE(vpt.project_types::text[], ARRAY[]::text[])\n                    END AS project_types,\n                    COALESCE(ed.external_dependencies_count, 0) AS external_dependencies_count\n                FROM moderation_projects mp\n                LEFT JOIN organizations search_organization\n                    ON search_organization.id = mp.organization_id\n                    AND $3::text IS NOT NULL\n                LEFT JOIN LATERAL (\n                    SELECT\n                        u.username\n                    FROM team_members tm\n                    INNER JOIN users u ON u.id = tm.user_id\n                    WHERE tm.team_id = mp.team_id\n                        AND tm.is_owner\n                    ORDER BY tm.ordering ASC\n                    LIMIT 1\n                ) search_owner ON $3::text IS NOT NULL\n                    AND mp.organization_id IS NULL\n                LEFT JOIN external_dependencies ed ON ed.mod_id = mp.id\n                LEFT JOIN version_project_types vpt ON vpt.mod_id = mp.id\n            )\n            SELECT id\n            FROM queue_projects\n            WHERE\n                (\n                    $3::text IS NULL\n                    OR name ILIKE '%' || $3 || '%'\n                    OR slug ILIKE '%' || $3 || '%'\n                    OR summary ILIKE '%' || $3 || '%'\n                    OR description ILIKE '%' || $3 || '%'\n                    OR owner_name ILIKE '%' || $3 || '%'\n                    OR organization_name ILIKE '%' || $3 || '%'\n                    OR EXISTS (\n                        SELECT 1\n                        FROM UNNEST(project_types) AS searched_project_type(project_type)\n                        WHERE searched_project_type.project_type ILIKE '%' || $3 || '%'\n                    )\n                )\n                AND (\n                    $4::text IS NULL\n                    OR ($4 = 'none' AND CARDINALITY(project_types) = 0)\n                    OR ($4 = 'minecraft_java_server' AND project_types @> ARRAY['minecraft_java_server']::text[])\n                    OR ($4 <> 'none' AND $4 <> 'minecraft_java_server' AND project_types[1] = $4)\n                )\n                AND ($5::boolean IS NULL OR (external_dependencies_count > 0) = $5)\n            ORDER BY\n                CASE WHEN $6 = 'most_external_deps' THEN external_dependencies_count END DESC,\n                CASE WHEN $6 = 'least_external_deps' THEN external_dependencies_count END ASC,\n                CASE WHEN $6 = 'newest' THEN COALESCE(queued, published) END DESC NULLS LAST,\n                CASE WHEN $6 IN ('oldest', 'most_external_deps', 'least_external_deps') THEN COALESCE(queued, published) END ASC NULLS LAST,\n                id ASC\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "id",
-        "type_info": "Int8"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Text",
-        "TextArray",
-        "Text",
-        "Text",
-        "Bool",
-        "Text",
-        "Bool"
-      ]
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "22fbd4bf1c2088903842b2c0070fd08431fc3f984263faed7aaeb311fa6ac2a9"
-}
diff --git a/apps/labrinth/.sqlx/query-b3aaa0b2f38950057d845b3d4dc8103c009077768b33c17e22dcef4774ae5814.json b/apps/labrinth/.sqlx/query-b3aaa0b2f38950057d845b3d4dc8103c009077768b33c17e22dcef4774ae5814.json
new file mode 100644
index 0000000000..e54ff20ebf
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-b3aaa0b2f38950057d845b3d4dc8103c009077768b33c17e22dcef4774ae5814.json
@@ -0,0 +1,138 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            WITH moderation_projects AS (\n                SELECT\n                    m.id,\n                    m.slug,\n                    m.name,\n                    m.summary,\n                    m.description,\n                    m.queued,\n                    m.published,\n                    m.organization_id,\n                    m.team_id,\n                    m.components\n                FROM mods m\n                WHERE\n                    m.status = $1\n                    AND (\n                        $9::boolean = false\n                        OR NOT EXISTS (\n                            SELECT 1\n                            FROM delphi_issue_details_with_statuses didws\n                            WHERE didws.project_id = m.id\n                                AND didws.status = 'pending'\n                        )\n                    )\n            ),\n            external_dependencies AS (\n                SELECT\n                    v.mod_id,\n                    COUNT(*) AS external_dependencies_count\n                FROM versions v\n                INNER JOIN moderation_projects mp ON mp.id = v.mod_id\n                INNER JOIN dependencies d ON d.dependent_id = v.id\n                WHERE d.dependency_file_name IS NOT NULL\n                GROUP BY v.mod_id\n            ),\n            version_project_types AS (\n                SELECT\n                    v.mod_id,\n                    ARRAY_AGG(DISTINCT pt.name::text) FILTER (WHERE pt.name IS NOT NULL) AS project_types\n                FROM versions v\n                INNER JOIN moderation_projects mp ON mp.id = v.mod_id\n                INNER JOIN loaders_versions lv ON v.id = lv.version_id\n                INNER JOIN loaders l ON lv.loader_id = l.id\n                INNER JOIN loaders_project_types lpt ON lpt.joining_loader_id = l.id\n                INNER JOIN project_types pt ON pt.id = lpt.joining_project_type_id\n                WHERE v.status = ANY($2)\n                GROUP BY v.mod_id\n            ),\n            queue_projects AS (\n                SELECT\n                    mp.id,\n                    mp.slug,\n                    mp.name,\n                    mp.summary,\n                    mp.description,\n                    mp.queued,\n                    mp.published,\n                    search_organization.name AS organization_name,\n                    search_owner.username AS owner_name,\n                    CASE\n                        WHEN jsonb_typeof(mp.components -> 'minecraft_server') = 'object'\n                            THEN ARRAY_APPEND(\n                                ARRAY_REMOVE(\n                                    COALESCE(vpt.project_types::text[], ARRAY[]::text[]),\n                                    'modpack'\n                                ),\n                                'minecraft_java_server'\n                            )\n                        ELSE COALESCE(vpt.project_types::text[], ARRAY[]::text[])\n                    END AS project_types,\n                    COALESCE(ed.external_dependencies_count, 0) AS external_dependencies_count\n                FROM moderation_projects mp\n                LEFT JOIN organizations search_organization\n                    ON search_organization.id = mp.organization_id\n                    AND $3::text IS NOT NULL\n                LEFT JOIN LATERAL (\n                    SELECT\n                        u.username\n                    FROM team_members tm\n                    INNER JOIN users u ON u.id = tm.user_id\n                    WHERE tm.team_id = mp.team_id\n                        AND tm.is_owner\n                    ORDER BY tm.ordering ASC\n                    LIMIT 1\n                ) search_owner ON $3::text IS NOT NULL\n                    AND mp.organization_id IS NULL\n                LEFT JOIN external_dependencies ed ON ed.mod_id = mp.id\n                LEFT JOIN version_project_types vpt ON vpt.mod_id = mp.id\n            ),\n            filtered_projects AS (\n                SELECT\n                    id,\n                    queued,\n                    published,\n                    project_types,\n                    external_dependencies_count\n                FROM queue_projects\n                WHERE\n                    (\n                        $3::text IS NULL\n                        OR name ILIKE '%' || $3 || '%'\n                        OR slug ILIKE '%' || $3 || '%'\n                        OR summary ILIKE '%' || $3 || '%'\n                        OR description ILIKE '%' || $3 || '%'\n                        OR owner_name ILIKE '%' || $3 || '%'\n                        OR organization_name ILIKE '%' || $3 || '%'\n                        OR EXISTS (\n                            SELECT 1\n                            FROM UNNEST(project_types) AS searched_project_type(project_type)\n                            WHERE searched_project_type.project_type ILIKE '%' || $3 || '%'\n                        )\n                    )\n                    AND (\n                        $4::text IS NULL\n                        OR ($4 = 'none' AND CARDINALITY(project_types) = 0)\n                        OR ($4 = 'minecraft_java_server' AND project_types @> ARRAY['minecraft_java_server']::text[])\n                        OR ($4 <> 'none' AND $4 <> 'minecraft_java_server' AND\n                            project_types[1] = $4\n                        )\n                    )\n                    AND ($5::boolean IS NULL OR (external_dependencies_count > 0) = $5)\n            ),\n            total AS (\n                SELECT COUNT(*) AS total_count FROM filtered_projects\n            ),\n            page_ids AS (\n                SELECT\n                    id,\n                    queued,\n                    published,\n                    project_types,\n                    external_dependencies_count\n                FROM filtered_projects\n                ORDER BY\n                    CASE WHEN $8 = 'most_external_deps' THEN external_dependencies_count END DESC,\n                    CASE WHEN $8 = 'least_external_deps' THEN external_dependencies_count END ASC,\n                    CASE WHEN $8 = 'newest' THEN COALESCE(queued, published) END DESC NULLS LAST,\n                    CASE WHEN $8 IN ('oldest', 'most_external_deps', 'least_external_deps') THEN COALESCE(queued, published) END ASC NULLS LAST,\n                    id ASC\n                OFFSET $7\n                LIMIT $6\n            ),\n            page_projects AS (\n                SELECT\n                    m.id,\n                    m.slug,\n                    m.name,\n                    m.summary,\n                    m.icon_url,\n                    m.status,\n                    m.requested_status,\n                    m.queued,\n                    m.published,\n                    m.updated,\n                    m.organization_id,\n                    m.team_id,\n                    o.name AS organization_name,\n                    o.icon_url AS organization_icon_url,\n                    owner.user_id AS owner_id,\n                    owner.username AS owner_name,\n                    owner.avatar_url AS owner_icon_url,\n                    page_ids.project_types,\n                    page_ids.external_dependencies_count\n                FROM page_ids\n                INNER JOIN mods m ON m.id = page_ids.id\n                LEFT JOIN organizations o ON o.id = m.organization_id\n                LEFT JOIN LATERAL (\n                    SELECT\n                        tm.user_id,\n                        u.username,\n                        u.avatar_url\n                    FROM team_members tm\n                    INNER JOIN users u ON u.id = tm.user_id\n                    WHERE tm.team_id = m.team_id\n                        AND tm.is_owner\n                    ORDER BY tm.ordering ASC\n                    LIMIT 1\n                ) owner ON m.organization_id IS NULL\n            )\n            SELECT\n                total.total_count AS \"total_count!\",\n                page_projects.id AS \"id?\",\n                page_projects.slug AS \"slug?\",\n                page_projects.name AS \"name?\",\n                page_projects.summary AS \"summary?\",\n                page_projects.icon_url AS \"icon_url?\",\n                page_projects.status AS \"status?\",\n                page_projects.requested_status AS \"requested_status?\",\n                page_projects.queued AS \"queued?\",\n                page_projects.published AS \"published?\",\n                page_projects.updated AS \"updated?\",\n                page_projects.organization_id AS \"organization_id?\",\n                page_projects.organization_name AS \"organization_name?\",\n                page_projects.organization_icon_url AS \"organization_icon_url?\",\n                page_projects.owner_id AS \"owner_id?\",\n                page_projects.owner_name AS \"owner_name?\",\n                page_projects.owner_icon_url AS \"owner_icon_url?\",\n                page_projects.project_types AS \"project_types?: Vec<String>\",\n                page_projects.external_dependencies_count AS \"external_dependencies_count?\"\n            FROM total\n            LEFT JOIN page_projects ON true\n            ORDER BY\n                CASE WHEN $8 = 'most_external_deps' THEN page_projects.external_dependencies_count END DESC,\n                CASE WHEN $8 = 'least_external_deps' THEN page_projects.external_dependencies_count END ASC,\n                CASE WHEN $8 = 'newest' THEN COALESCE(page_projects.queued, page_projects.published) END DESC NULLS LAST,\n                CASE WHEN $8 IN ('oldest', 'most_external_deps', 'least_external_deps') THEN COALESCE(page_projects.queued, page_projects.published) END ASC NULLS LAST,\n                page_projects.id ASC\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "total_count!",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 1,
+        "name": "id?",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 2,
+        "name": "slug?",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 3,
+        "name": "name?",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 4,
+        "name": "summary?",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 5,
+        "name": "icon_url?",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 6,
+        "name": "status?",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 7,
+        "name": "requested_status?",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 8,
+        "name": "queued?",
+        "type_info": "Timestamptz"
+      },
+      {
+        "ordinal": 9,
+        "name": "published?",
+        "type_info": "Timestamptz"
+      },
+      {
+        "ordinal": 10,
+        "name": "updated?",
+        "type_info": "Timestamptz"
+      },
+      {
+        "ordinal": 11,
+        "name": "organization_id?",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 12,
+        "name": "organization_name?",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 13,
+        "name": "organization_icon_url?",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 14,
+        "name": "owner_id?",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 15,
+        "name": "owner_name?",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 16,
+        "name": "owner_icon_url?",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 17,
+        "name": "project_types?: Vec<String>",
+        "type_info": "TextArray"
+      },
+      {
+        "ordinal": 18,
+        "name": "external_dependencies_count?",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "TextArray",
+        "Text",
+        "Text",
+        "Bool",
+        "Int8",
+        "Int8",
+        "Text",
+        "Bool"
+      ]
+    },
+    "nullable": [
+      null,
+      false,
+      true,
+      false,
+      false,
+      true,
+      false,
+      true,
+      true,
+      false,
+      false,
+      true,
+      false,
+      true,
+      false,
+      false,
+      true,
+      null,
+      null
+    ]
+  },
+  "hash": "b3aaa0b2f38950057d845b3d4dc8103c009077768b33c17e22dcef4774ae5814"
+}
diff --git a/apps/labrinth/.sqlx/query-5a68c53bd00c08edf9dfb9ffdabc28f86cdd77cd06bbb10c9a8e5199509f9c4b.json b/apps/labrinth/.sqlx/query-c268a2a256f11a65449bd132a14f931c2e9776ffed87f4406bb5c2bc30087f5b.json
similarity index 63%
rename from apps/labrinth/.sqlx/query-5a68c53bd00c08edf9dfb9ffdabc28f86cdd77cd06bbb10c9a8e5199509f9c4b.json
rename to apps/labrinth/.sqlx/query-c268a2a256f11a65449bd132a14f931c2e9776ffed87f4406bb5c2bc30087f5b.json
index 450ec6ad79..bf61274204 100644
--- a/apps/labrinth/.sqlx/query-5a68c53bd00c08edf9dfb9ffdabc28f86cdd77cd06bbb10c9a8e5199509f9c4b.json
+++ b/apps/labrinth/.sqlx/query-c268a2a256f11a65449bd132a14f931c2e9776ffed87f4406bb5c2bc30087f5b.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            WITH filtered_projects AS (\n                SELECT\n                    m.id,\n                    m.queued,\n                    m.published\n                FROM mods m\n                WHERE\n                    m.status = $1\n                    AND (\n                        $6::boolean = false\n                        OR NOT EXISTS (\n                            SELECT 1\n                            FROM delphi_issue_details_with_statuses didws\n                            WHERE didws.project_id = m.id\n                                AND didws.status = 'pending'\n                        )\n                    )\n            ),\n            total AS (\n                SELECT COUNT(*) AS total_count FROM filtered_projects\n            ),\n            page_ids AS (\n                SELECT\n                    id,\n                    queued,\n                    published\n                FROM filtered_projects\n                ORDER BY\n                    CASE WHEN $5 = 'newest' THEN COALESCE(queued, published) END DESC NULLS LAST,\n                    CASE WHEN $5 = 'oldest' THEN COALESCE(queued, published) END ASC NULLS LAST,\n                    id ASC\n                OFFSET $4\n                LIMIT $3\n            ),\n            page_project_types AS (\n                SELECT\n                    v.mod_id,\n                    ARRAY_AGG(DISTINCT pt.name::text) FILTER (WHERE pt.name IS NOT NULL) AS project_types\n                FROM versions v\n                INNER JOIN page_ids page ON page.id = v.mod_id\n                INNER JOIN loaders_versions lv ON v.id = lv.version_id\n                INNER JOIN loaders l ON lv.loader_id = l.id\n                INNER JOIN loaders_project_types lpt ON lpt.joining_loader_id = l.id\n                INNER JOIN project_types pt ON pt.id = lpt.joining_project_type_id\n                WHERE v.status = ANY($2)\n                GROUP BY v.mod_id\n            ),\n            page_external_dependencies AS (\n                SELECT\n                    v.mod_id,\n                    COUNT(*) AS external_dependencies_count\n                FROM versions v\n                INNER JOIN page_ids page ON page.id = v.mod_id\n                INNER JOIN dependencies d ON d.dependent_id = v.id\n                WHERE d.dependency_file_name IS NOT NULL\n                GROUP BY v.mod_id\n            ),\n            page_projects AS (\n                SELECT\n                    m.id,\n                    m.slug,\n                    m.name,\n                    m.summary,\n                    m.icon_url,\n                    m.status,\n                    m.requested_status,\n                    m.queued,\n                    m.published,\n                    m.updated,\n                    m.organization_id,\n                    o.name AS organization_name,\n                    o.icon_url AS organization_icon_url,\n                    owner.user_id AS owner_id,\n                    owner.username AS owner_name,\n                    owner.avatar_url AS owner_icon_url,\n                    CASE\n                        WHEN m.components ? 'minecraft_server'\n                            THEN ARRAY_APPEND(\n                                ARRAY_REMOVE(\n                                    COALESCE(ppt.project_types::text[], ARRAY[]::text[]),\n                                    'modpack'\n                                ),\n                                'minecraft_java_server'\n                            )\n                        ELSE COALESCE(ppt.project_types::text[], ARRAY[]::text[])\n                    END AS project_types,\n                    COALESCE(ped.external_dependencies_count, 0) AS external_dependencies_count\n                FROM page_ids page\n                INNER JOIN mods m ON m.id = page.id\n                LEFT JOIN organizations o ON o.id = m.organization_id\n                LEFT JOIN LATERAL (\n                    SELECT\n                        tm.user_id,\n                        u.username,\n                        u.avatar_url\n                    FROM team_members tm\n                    INNER JOIN users u ON u.id = tm.user_id\n                    WHERE tm.team_id = m.team_id\n                        AND tm.is_owner\n                    ORDER BY tm.ordering ASC\n                    LIMIT 1\n                ) owner ON m.organization_id IS NULL\n                LEFT JOIN page_project_types ppt ON ppt.mod_id = m.id\n                LEFT JOIN page_external_dependencies ped ON ped.mod_id = m.id\n            )\n            SELECT\n                total.total_count AS \"total_count!\",\n                page_projects.id AS \"id?\",\n                page_projects.slug AS \"slug?\",\n                page_projects.name AS \"name?\",\n                page_projects.summary AS \"summary?\",\n                page_projects.icon_url AS \"icon_url?\",\n                page_projects.status AS \"status?\",\n                page_projects.requested_status AS \"requested_status?\",\n                page_projects.queued AS \"queued?\",\n                page_projects.published AS \"published?\",\n                page_projects.updated AS \"updated?\",\n                page_projects.organization_id AS \"organization_id?\",\n                page_projects.organization_name AS \"organization_name?\",\n                page_projects.organization_icon_url AS \"organization_icon_url?\",\n                page_projects.owner_id AS \"owner_id?\",\n                page_projects.owner_name AS \"owner_name?\",\n                page_projects.owner_icon_url AS \"owner_icon_url?\",\n                page_projects.project_types AS \"project_types?: Vec<String>\",\n                page_projects.external_dependencies_count AS \"external_dependencies_count?\"\n            FROM total\n            LEFT JOIN page_projects ON true\n            ORDER BY\n                CASE WHEN $5 = 'newest' THEN COALESCE(page_projects.queued, page_projects.published) END DESC NULLS LAST,\n                CASE WHEN $5 = 'oldest' THEN COALESCE(page_projects.queued, page_projects.published) END ASC NULLS LAST,\n                page_projects.id ASC\n            ",
+  "query": "\n            WITH filtered_projects AS (\n                SELECT\n                    m.id,\n                    m.queued,\n                    m.published\n                FROM mods m\n                WHERE\n                    m.status = $1\n                    AND (\n                        $6::boolean = false\n                        OR NOT EXISTS (\n                            SELECT 1\n                            FROM delphi_issue_details_with_statuses didws\n                            WHERE didws.project_id = m.id\n                                AND didws.status = 'pending'\n                        )\n                    )\n            ),\n            total AS (\n                SELECT COUNT(*) AS total_count FROM filtered_projects\n            ),\n            page_ids AS (\n                SELECT\n                    id,\n                    queued,\n                    published\n                FROM filtered_projects\n                ORDER BY\n                    CASE WHEN $5 = 'newest' THEN COALESCE(queued, published) END DESC NULLS LAST,\n                    CASE WHEN $5 = 'oldest' THEN COALESCE(queued, published) END ASC NULLS LAST,\n                    id ASC\n                OFFSET $4\n                LIMIT $3\n            ),\n            page_project_types AS (\n                SELECT\n                    v.mod_id,\n                    ARRAY_AGG(DISTINCT pt.name::text) FILTER (WHERE pt.name IS NOT NULL) AS project_types\n                FROM versions v\n                INNER JOIN page_ids page ON page.id = v.mod_id\n                INNER JOIN loaders_versions lv ON v.id = lv.version_id\n                INNER JOIN loaders l ON lv.loader_id = l.id\n                INNER JOIN loaders_project_types lpt ON lpt.joining_loader_id = l.id\n                INNER JOIN project_types pt ON pt.id = lpt.joining_project_type_id\n                WHERE v.status = ANY($2)\n                GROUP BY v.mod_id\n            ),\n            page_external_dependencies AS (\n                SELECT\n                    v.mod_id,\n                    COUNT(*) AS external_dependencies_count\n                FROM versions v\n                INNER JOIN page_ids page ON page.id = v.mod_id\n                INNER JOIN dependencies d ON d.dependent_id = v.id\n                WHERE d.dependency_file_name IS NOT NULL\n                GROUP BY v.mod_id\n            ),\n            page_projects AS (\n                SELECT\n                    m.id,\n                    m.slug,\n                    m.name,\n                    m.summary,\n                    m.icon_url,\n                    m.status,\n                    m.requested_status,\n                    m.queued,\n                    m.published,\n                    m.updated,\n                    m.organization_id,\n                    o.name AS organization_name,\n                    o.icon_url AS organization_icon_url,\n                    owner.user_id AS owner_id,\n                    owner.username AS owner_name,\n                    owner.avatar_url AS owner_icon_url,\n                    CASE\n                        WHEN jsonb_typeof(m.components -> 'minecraft_server') = 'object'\n                            THEN ARRAY_APPEND(\n                                ARRAY_REMOVE(\n                                    COALESCE(ppt.project_types::text[], ARRAY[]::text[]),\n                                    'modpack'\n                                ),\n                                'minecraft_java_server'\n                            )\n                        ELSE COALESCE(ppt.project_types::text[], ARRAY[]::text[])\n                    END AS project_types,\n                    COALESCE(ped.external_dependencies_count, 0) AS external_dependencies_count\n                FROM page_ids page\n                INNER JOIN mods m ON m.id = page.id\n                LEFT JOIN organizations o ON o.id = m.organization_id\n                LEFT JOIN LATERAL (\n                    SELECT\n                        tm.user_id,\n                        u.username,\n                        u.avatar_url\n                    FROM team_members tm\n                    INNER JOIN users u ON u.id = tm.user_id\n                    WHERE tm.team_id = m.team_id\n                        AND tm.is_owner\n                    ORDER BY tm.ordering ASC\n                    LIMIT 1\n                ) owner ON m.organization_id IS NULL\n                LEFT JOIN page_project_types ppt ON ppt.mod_id = m.id\n                LEFT JOIN page_external_dependencies ped ON ped.mod_id = m.id\n            )\n            SELECT\n                total.total_count AS \"total_count!\",\n                page_projects.id AS \"id?\",\n                page_projects.slug AS \"slug?\",\n                page_projects.name AS \"name?\",\n                page_projects.summary AS \"summary?\",\n                page_projects.icon_url AS \"icon_url?\",\n                page_projects.status AS \"status?\",\n                page_projects.requested_status AS \"requested_status?\",\n                page_projects.queued AS \"queued?\",\n                page_projects.published AS \"published?\",\n                page_projects.updated AS \"updated?\",\n                page_projects.organization_id AS \"organization_id?\",\n                page_projects.organization_name AS \"organization_name?\",\n                page_projects.organization_icon_url AS \"organization_icon_url?\",\n                page_projects.owner_id AS \"owner_id?\",\n                page_projects.owner_name AS \"owner_name?\",\n                page_projects.owner_icon_url AS \"owner_icon_url?\",\n                page_projects.project_types AS \"project_types?: Vec<String>\",\n                page_projects.external_dependencies_count AS \"external_dependencies_count?\"\n            FROM total\n            LEFT JOIN page_projects ON true\n            ORDER BY\n                CASE WHEN $5 = 'newest' THEN COALESCE(page_projects.queued, page_projects.published) END DESC NULLS LAST,\n                CASE WHEN $5 = 'oldest' THEN COALESCE(page_projects.queued, page_projects.published) END ASC NULLS LAST,\n                page_projects.id ASC\n            ",
   "describe": {
     "columns": [
       {
@@ -131,5 +131,5 @@
       null
     ]
   },
-  "hash": "5a68c53bd00c08edf9dfb9ffdabc28f86cdd77cd06bbb10c9a8e5199509f9c4b"
+  "hash": "c268a2a256f11a65449bd132a14f931c2e9776ffed87f4406bb5c2bc30087f5b"
 }
diff --git a/apps/labrinth/.sqlx/query-ca8493b59004511e8d26200638951d55a61c2b6466db69a81be975e150b3ef41.json b/apps/labrinth/.sqlx/query-ca8493b59004511e8d26200638951d55a61c2b6466db69a81be975e150b3ef41.json
deleted file mode 100644
index 91c2728ad9..0000000000
--- a/apps/labrinth/.sqlx/query-ca8493b59004511e8d26200638951d55a61c2b6466db69a81be975e150b3ef41.json
+++ /dev/null
@@ -1,138 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            WITH moderation_projects AS (\n                SELECT\n                    m.id,\n                    m.slug,\n                    m.name,\n                    m.summary,\n                    m.description,\n                    m.queued,\n                    m.published,\n                    m.organization_id,\n                    m.team_id,\n                    m.components\n                FROM mods m\n                WHERE\n                    m.status = $1\n                    AND (\n                        $9::boolean = false\n                        OR NOT EXISTS (\n                            SELECT 1\n                            FROM delphi_issue_details_with_statuses didws\n                            WHERE didws.project_id = m.id\n                                AND didws.status = 'pending'\n                        )\n                    )\n            ),\n            external_dependencies AS (\n                SELECT\n                    v.mod_id,\n                    COUNT(*) AS external_dependencies_count\n                FROM versions v\n                INNER JOIN moderation_projects mp ON mp.id = v.mod_id\n                INNER JOIN dependencies d ON d.dependent_id = v.id\n                WHERE d.dependency_file_name IS NOT NULL\n                GROUP BY v.mod_id\n            ),\n            version_project_types AS (\n                SELECT\n                    v.mod_id,\n                    ARRAY_AGG(DISTINCT pt.name::text) FILTER (WHERE pt.name IS NOT NULL) AS project_types\n                FROM versions v\n                INNER JOIN moderation_projects mp ON mp.id = v.mod_id\n                INNER JOIN loaders_versions lv ON v.id = lv.version_id\n                INNER JOIN loaders l ON lv.loader_id = l.id\n                INNER JOIN loaders_project_types lpt ON lpt.joining_loader_id = l.id\n                INNER JOIN project_types pt ON pt.id = lpt.joining_project_type_id\n                WHERE v.status = ANY($2)\n                GROUP BY v.mod_id\n            ),\n            queue_projects AS (\n                SELECT\n                    mp.id,\n                    mp.slug,\n                    mp.name,\n                    mp.summary,\n                    mp.description,\n                    mp.queued,\n                    mp.published,\n                    search_organization.name AS organization_name,\n                    search_owner.username AS owner_name,\n                    CASE\n                        WHEN mp.components ? 'minecraft_server'\n                            THEN ARRAY_APPEND(\n                                ARRAY_REMOVE(\n                                    COALESCE(vpt.project_types::text[], ARRAY[]::text[]),\n                                    'modpack'\n                                ),\n                                'minecraft_java_server'\n                            )\n                        ELSE COALESCE(vpt.project_types::text[], ARRAY[]::text[])\n                    END AS project_types,\n                    COALESCE(ed.external_dependencies_count, 0) AS external_dependencies_count\n                FROM moderation_projects mp\n                LEFT JOIN organizations search_organization\n                    ON search_organization.id = mp.organization_id\n                    AND $3::text IS NOT NULL\n                LEFT JOIN LATERAL (\n                    SELECT\n                        u.username\n                    FROM team_members tm\n                    INNER JOIN users u ON u.id = tm.user_id\n                    WHERE tm.team_id = mp.team_id\n                        AND tm.is_owner\n                    ORDER BY tm.ordering ASC\n                    LIMIT 1\n                ) search_owner ON $3::text IS NOT NULL\n                    AND mp.organization_id IS NULL\n                LEFT JOIN external_dependencies ed ON ed.mod_id = mp.id\n                LEFT JOIN version_project_types vpt ON vpt.mod_id = mp.id\n            ),\n            filtered_projects AS (\n                SELECT\n                    id,\n                    queued,\n                    published,\n                    project_types,\n                    external_dependencies_count\n                FROM queue_projects\n                WHERE\n                    (\n                        $3::text IS NULL\n                        OR name ILIKE '%' || $3 || '%'\n                        OR slug ILIKE '%' || $3 || '%'\n                        OR summary ILIKE '%' || $3 || '%'\n                        OR description ILIKE '%' || $3 || '%'\n                        OR owner_name ILIKE '%' || $3 || '%'\n                        OR organization_name ILIKE '%' || $3 || '%'\n                        OR EXISTS (\n                            SELECT 1\n                            FROM UNNEST(project_types) AS searched_project_type(project_type)\n                            WHERE searched_project_type.project_type ILIKE '%' || $3 || '%'\n                        )\n                    )\n                    AND (\n                        $4::text IS NULL\n                        OR ($4 = 'none' AND CARDINALITY(project_types) = 0)\n                        OR ($4 = 'minecraft_java_server' AND project_types @> ARRAY['minecraft_java_server']::text[])\n                        OR ($4 <> 'none' AND $4 <> 'minecraft_java_server' AND\n                            project_types[1] = $4\n                        )\n                    )\n                    AND ($5::boolean IS NULL OR (external_dependencies_count > 0) = $5)\n            ),\n            total AS (\n                SELECT COUNT(*) AS total_count FROM filtered_projects\n            ),\n            page_ids AS (\n                SELECT\n                    id,\n                    queued,\n                    published,\n                    project_types,\n                    external_dependencies_count\n                FROM filtered_projects\n                ORDER BY\n                    CASE WHEN $8 = 'most_external_deps' THEN external_dependencies_count END DESC,\n                    CASE WHEN $8 = 'least_external_deps' THEN external_dependencies_count END ASC,\n                    CASE WHEN $8 = 'newest' THEN COALESCE(queued, published) END DESC NULLS LAST,\n                    CASE WHEN $8 IN ('oldest', 'most_external_deps', 'least_external_deps') THEN COALESCE(queued, published) END ASC NULLS LAST,\n                    id ASC\n                OFFSET $7\n                LIMIT $6\n            ),\n            page_projects AS (\n                SELECT\n                    m.id,\n                    m.slug,\n                    m.name,\n                    m.summary,\n                    m.icon_url,\n                    m.status,\n                    m.requested_status,\n                    m.queued,\n                    m.published,\n                    m.updated,\n                    m.organization_id,\n                    m.team_id,\n                    o.name AS organization_name,\n                    o.icon_url AS organization_icon_url,\n                    owner.user_id AS owner_id,\n                    owner.username AS owner_name,\n                    owner.avatar_url AS owner_icon_url,\n                    page_ids.project_types,\n                    page_ids.external_dependencies_count\n                FROM page_ids\n                INNER JOIN mods m ON m.id = page_ids.id\n                LEFT JOIN organizations o ON o.id = m.organization_id\n                LEFT JOIN LATERAL (\n                    SELECT\n                        tm.user_id,\n                        u.username,\n                        u.avatar_url\n                    FROM team_members tm\n                    INNER JOIN users u ON u.id = tm.user_id\n                    WHERE tm.team_id = m.team_id\n                        AND tm.is_owner\n                    ORDER BY tm.ordering ASC\n                    LIMIT 1\n                ) owner ON m.organization_id IS NULL\n            )\n            SELECT\n                total.total_count AS \"total_count!\",\n                page_projects.id AS \"id?\",\n                page_projects.slug AS \"slug?\",\n                page_projects.name AS \"name?\",\n                page_projects.summary AS \"summary?\",\n                page_projects.icon_url AS \"icon_url?\",\n                page_projects.status AS \"status?\",\n                page_projects.requested_status AS \"requested_status?\",\n                page_projects.queued AS \"queued?\",\n                page_projects.published AS \"published?\",\n                page_projects.updated AS \"updated?\",\n                page_projects.organization_id AS \"organization_id?\",\n                page_projects.organization_name AS \"organization_name?\",\n                page_projects.organization_icon_url AS \"organization_icon_url?\",\n                page_projects.owner_id AS \"owner_id?\",\n                page_projects.owner_name AS \"owner_name?\",\n                page_projects.owner_icon_url AS \"owner_icon_url?\",\n                page_projects.project_types AS \"project_types?: Vec<String>\",\n                page_projects.external_dependencies_count AS \"external_dependencies_count?\"\n            FROM total\n            LEFT JOIN page_projects ON true\n            ORDER BY\n                CASE WHEN $8 = 'most_external_deps' THEN page_projects.external_dependencies_count END DESC,\n                CASE WHEN $8 = 'least_external_deps' THEN page_projects.external_dependencies_count END ASC,\n                CASE WHEN $8 = 'newest' THEN COALESCE(page_projects.queued, page_projects.published) END DESC NULLS LAST,\n                CASE WHEN $8 IN ('oldest', 'most_external_deps', 'least_external_deps') THEN COALESCE(page_projects.queued, page_projects.published) END ASC NULLS LAST,\n                page_projects.id ASC\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "total_count!",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 1,
-        "name": "id?",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 2,
-        "name": "slug?",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 3,
-        "name": "name?",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 4,
-        "name": "summary?",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 5,
-        "name": "icon_url?",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 6,
-        "name": "status?",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 7,
-        "name": "requested_status?",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 8,
-        "name": "queued?",
-        "type_info": "Timestamptz"
-      },
-      {
-        "ordinal": 9,
-        "name": "published?",
-        "type_info": "Timestamptz"
-      },
-      {
-        "ordinal": 10,
-        "name": "updated?",
-        "type_info": "Timestamptz"
-      },
-      {
-        "ordinal": 11,
-        "name": "organization_id?",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 12,
-        "name": "organization_name?",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 13,
-        "name": "organization_icon_url?",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 14,
-        "name": "owner_id?",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 15,
-        "name": "owner_name?",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 16,
-        "name": "owner_icon_url?",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 17,
-        "name": "project_types?: Vec<String>",
-        "type_info": "TextArray"
-      },
-      {
-        "ordinal": 18,
-        "name": "external_dependencies_count?",
-        "type_info": "Int8"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Text",
-        "TextArray",
-        "Text",
-        "Text",
-        "Bool",
-        "Int8",
-        "Int8",
-        "Text",
-        "Bool"
-      ]
-    },
-    "nullable": [
-      null,
-      false,
-      true,
-      false,
-      false,
-      true,
-      false,
-      true,
-      true,
-      false,
-      false,
-      true,
-      false,
-      true,
-      false,
-      false,
-      true,
-      null,
-      null
-    ]
-  },
-  "hash": "ca8493b59004511e8d26200638951d55a61c2b6466db69a81be975e150b3ef41"
-}
diff --git a/apps/labrinth/src/routes/internal/moderation/mod.rs b/apps/labrinth/src/routes/internal/moderation/mod.rs
index e66f0e0f84..aecce43cbb 100644
--- a/apps/labrinth/src/routes/internal/moderation/mod.rs
+++ b/apps/labrinth/src/routes/internal/moderation/mod.rs
@@ -333,7 +333,7 @@ pub async fn get_projects_internal(
                     search_organization.name AS organization_name,
                     search_owner.username AS owner_name,
                     CASE
-                        WHEN mp.components ? 'minecraft_server'
+                        WHEN jsonb_typeof(mp.components -> 'minecraft_server') = 'object'
                             THEN ARRAY_APPEND(
                                 ARRAY_REMOVE(
                                     COALESCE(vpt.project_types::text[], ARRAY[]::text[]),
@@ -603,7 +603,7 @@ pub async fn get_projects_internal(
                     owner.username AS owner_name,
                     owner.avatar_url AS owner_icon_url,
                     CASE
-                        WHEN m.components ? 'minecraft_server'
+                        WHEN jsonb_typeof(m.components -> 'minecraft_server') = 'object'
                             THEN ARRAY_APPEND(
                                 ARRAY_REMOVE(
                                     COALESCE(ppt.project_types::text[], ARRAY[]::text[]),
@@ -808,7 +808,7 @@ pub async fn get_project_ids(
                     search_organization.name AS organization_name,
                     search_owner.username AS owner_name,
                     CASE
-                        WHEN mp.components ? 'minecraft_server'
+                        WHEN jsonb_typeof(mp.components -> 'minecraft_server') = 'object'
                             THEN ARRAY_APPEND(
                                 ARRAY_REMOVE(
                                     COALESCE(vpt.project_types::text[], ARRAY[]::text[]),

From 1c574a1f2d4af85bad5bebb1783082392f580c21 Mon Sep 17 00:00:00 2001
From: "Calum H." <calum@modrinth.com>
Date: Wed, 5 Aug 2026 13:22:05 +0100
Subject: [PATCH 33/82] fix: affiliates showing when not meant to (#7008)

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

diff --git a/apps/frontend/src/layouts/default.vue b/apps/frontend/src/layouts/default.vue
index 4f2849bd65..6085cc5cfa 100644
--- a/apps/frontend/src/layouts/default.vue
+++ b/apps/frontend/src/layouts/default.vue
@@ -1306,7 +1306,7 @@ const userMenuOptions = computed(() => {
 			label: formatMessage(commonMessages.affiliateLinksButton),
 			type: 'link',
 			to: '/dashboard/affiliate-links',
-			shown: user.badges & UserBadge.AFFILIATE,
+			shown: Boolean(user.badges & UserBadge.AFFILIATE),
 		},
 		{
 			id: 'revenue',

From c0e6f094d993738c43342015ffa3b83e846b56c1 Mon Sep 17 00:00:00 2001
From: "Calum H." <calum@modrinth.com>
Date: Wed, 5 Aug 2026 14:17:29 +0100
Subject: [PATCH 34/82] fix: panel issues w/ backups (#7009)

---
 .../ui/src/components/base/ErrorInformationCard.vue    |  4 ++--
 .../ui/src/components/servers/backups/BackupItem.vue   | 10 ++++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/ui/src/components/base/ErrorInformationCard.vue b/packages/ui/src/components/base/ErrorInformationCard.vue
index 71f010070e..f183cca2fe 100644
--- a/packages/ui/src/components/base/ErrorInformationCard.vue
+++ b/packages/ui/src/components/base/ErrorInformationCard.vue
@@ -52,7 +52,7 @@
 				:color="action.color === 'standard' ? undefined : (action.color ?? 'brand')"
 				size="xl"
 				:disabled="action.disabled"
-				class="!w-full"
+				class="flex-1"
 				@click="action.onClick"
 			>
 				<component :is="action.icon" v-if="action.icon && !action.showAltIcon" class="size-4" />
@@ -64,7 +64,7 @@
 				{{ action.label }}
 			</Button>
 
-			<Button v-if="errorDetails" size="xl" class="!w-full" @click="copyErrorInformation">
+			<Button v-if="errorDetails" size="xl" class="flex-1" @click="copyErrorInformation">
 				<CopyIcon v-if="!infoCopied" class="size-4" />
 				<CheckIcon v-else class="size-4" />
 				Copy Information
diff --git a/packages/ui/src/components/servers/backups/BackupItem.vue b/packages/ui/src/components/servers/backups/BackupItem.vue
index b64cf65c1a..dc5b4f7c01 100644
--- a/packages/ui/src/components/servers/backups/BackupItem.vue
+++ b/packages/ui/src/components/servers/backups/BackupItem.vue
@@ -112,7 +112,8 @@ const overflowMenuOptions = computed<OverflowMenuOption[]>(() => {
 	options.push({
 		id: 'download',
 		label: formatMessage(commonMessages.downloadButton),
-		action: () => emit('download'),
+		type: 'link',
+		href: `https://${props.kyrosUrl}/modrinth/v0/backups/${props.backup.id}/download?auth=${props.jwt}`,
 		disabled: !props.kyrosUrl || !props.jwt,
 	})
 
@@ -279,7 +280,12 @@ const creatorAvatarSrc = computed(() =>
 				<RotateCounterClockwiseIcon class="size-5" />
 				{{ formatMessage(messages.restore) }}
 			</Button>
-			<TeleportOverflowMenu type="quiet" label="More options" :options="overflowMenuOptions">
+			<TeleportOverflowMenu
+				type="quiet"
+				label="More options"
+				:options="overflowMenuOptions"
+				@select="(option) => option.id === 'download' && emit('download')"
+			>
 				<MoreVerticalIcon class="size-5" />
 				<template #copy-id>
 					<ClipboardCopyIcon class="size-5" />

From 0038ea8b1593c2d8742b4a6cbfc559e1bd6ce8d3 Mon Sep 17 00:00:00 2001
From: "Calum H." <calum@modrinth.com>
Date: Wed, 5 Aug 2026 15:34:00 +0100
Subject: [PATCH 35/82] fix: remove legacy button classes (#7011)

* fix: remove legacy button-group class for tailwind (conflicts)

* fix: delete legacy button classes from scss

* fix: fmt
---
 .../src/assets/styles/components.scss         | 183 +-----------------
 apps/frontend/src/assets/styles/global.scss   |  12 --
 apps/frontend/src/components/ui/Chips.vue     | 103 ----------
 .../src/components/ui/ModrinthFooter.vue      |  16 +-
 apps/frontend/src/components/ui/NavStack.vue  |  19 +-
 .../src/components/ui/OptionGroup.vue         | 128 ------------
 .../src/components/ui/ProjectMemberHeader.vue |   2 +-
 .../ui/thread/ConversationThread.vue          |   1 -
 apps/frontend/src/layouts/default.vue         | 106 ++++++----
 .../src/pages/[type]/[project]/changelog.vue  |   4 -
 .../src/pages/[type]/[project]/gallery.vue    |   2 +-
 .../[type]/[project]/settings/gallery.vue     |   2 +-
 .../pages/[type]/[project]/settings/index.vue |   4 -
 .../pages/[type]/[project]/settings/links.vue |   8 +-
 .../[type]/[project]/settings/members.vue     |   9 +-
 .../pages/[type]/[project]/settings/tags.vue  |   5 -
 .../src/pages/admin/billing/[user].vue        |   2 +-
 apps/frontend/src/pages/app.vue               |  18 +-
 .../src/pages/dashboard/organizations.vue     |  17 +-
 apps/frontend/src/pages/hosting/index.vue     |   2 +-
 apps/frontend/src/pages/index.vue             |  17 +-
 apps/frontend/src/pages/settings/index.vue    |  50 +++--
 .../ui/src/components/base/OptionGroup.vue    |  16 +-
 23 files changed, 162 insertions(+), 564 deletions(-)
 delete mode 100644 apps/frontend/src/components/ui/Chips.vue
 delete mode 100644 apps/frontend/src/components/ui/OptionGroup.vue

diff --git a/apps/frontend/src/assets/styles/components.scss b/apps/frontend/src/assets/styles/components.scss
index 87434d1b98..ad5da17d1e 100644
--- a/apps/frontend/src/assets/styles/components.scss
+++ b/apps/frontend/src/assets/styles/components.scss
@@ -93,7 +93,7 @@
 		}
 	}
 
-	:where(button:not([data-button]), .button, .iconified-button) {
+	:where(button:not([data-button])) {
 		width: fit-content;
 	}
 
@@ -118,7 +118,6 @@
 		gap: var(--spacing-card-sm);
 		margin-bottom: calc(var(--spacing-card-sm) + var(--spacing-card-md));
 
-		.iconified-button,
 		.input-group {
 			flex-shrink: 0;
 		}
@@ -250,185 +249,6 @@
 	}
 }
 
-.button-base {
-	@extend .button-animation;
-	font-weight: 500;
-	outline: 2px solid transparent;
-
-	&:focus-visible:not(&:disabled),
-	&:hover:not(&:disabled) {
-		cursor: pointer;
-		filter: brightness(0.85);
-	}
-
-	&:active:not(&:disabled) {
-		filter: brightness(0.8);
-	}
-
-	&:disabled,
-	&[disabled='true'] {
-		cursor: not-allowed;
-		filter: grayscale(50%);
-		opacity: 0.5;
-		box-shadow: none;
-	}
-}
-
-:not(tr).button-transparent {
-	@extend .button-base;
-	background-color: transparent;
-	border-radius: var(--size-rounded-sm);
-
-	&:focus-visible:not(&:disabled),
-	&:hover:not(&:disabled),
-	&:active:not(&:disabled) {
-		background-color: var(--color-raised-bg);
-	}
-
-	&.brand-button {
-		color: var(--color-brand);
-	}
-
-	&.danger-button {
-		color: var(--color-red);
-	}
-}
-
-tr.button-transparent {
-	@extend .button-animation;
-	background-color: transparent;
-	border-radius: var(--size-rounded-sm);
-
-	&:focus-visible:not(&:disabled) > *,
-	&:hover:not(&:disabled) > * {
-		cursor: pointer;
-		filter: brightness(0.85);
-		background-color: var(--color-raised-bg);
-	}
-
-	&:active:not(&:disabled) > * {
-		filter: brightness(0.8);
-		background-color: var(--color-raised-bg);
-	}
-
-	&:disabled > *,
-	&[disabled='true'] > * {
-		cursor: not-allowed;
-		filter: grayscale(50%);
-		opacity: 0.5;
-		box-shadow: none;
-	}
-}
-
-.button-color-base {
-	box-sizing: border-box;
-	--text-color: var(--color-button-text);
-	--background-color: var(--color-button-bg);
-
-	color: var(--text-color);
-	background-color: var(--background-color);
-	box-shadow:
-		var(--shadow-inset-sm),
-		0 0 0 0 transparent;
-	border-radius: var(--size-rounded-sm);
-}
-
-.iconified-button {
-	@extend .button-base;
-	@extend .button-color-base;
-
-	display: flex;
-	padding: var(--spacing-card-sm) var(--spacing-card-bg);
-	margin: 0;
-	font-size: var(--font-size-nm);
-	align-items: center;
-	cursor: pointer;
-	width: fit-content;
-	height: fit-content;
-	transition:
-		opacity 0.5s ease-in-out,
-		filter 0.2s ease-in-out,
-		scale 0.05s ease-in-out,
-		outline 0.2s ease-in-out;
-
-	text-decoration: none;
-
-	svg {
-		width: 1.1rem;
-		height: 1.1rem;
-		margin-right: 0.5rem;
-	}
-
-	&.icon-only {
-		padding: 0 0.5rem;
-
-		svg {
-			margin-right: 0;
-		}
-	}
-
-	&.transparent {
-		background: none;
-		box-shadow: none;
-	}
-}
-
-.square-button {
-	@extend .button-base;
-
-	--text-color: var(--color-button-text);
-	--background-color: var(--color-button-bg);
-
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	height: 2.25rem;
-	width: 2.25rem;
-	border-radius: var(--size-rounded-sm);
-	color: var(--text-color);
-	background-color: var(--background-color);
-	box-shadow:
-		var(--shadow-inset-sm),
-		0 0 0 0 transparent;
-
-	svg {
-		min-width: 1.25rem;
-		max-width: 1.25rem;
-		min-height: 1.25rem;
-		max-height: 1.25rem;
-	}
-
-	flex-shrink: 0;
-}
-
-.raised-button {
-	--background-color: var(--color-raised-bg);
-	box-shadow: var(--shadow-inset-sm), var(--shadow-raised);
-}
-
-.danger-button {
-	--background-color: var(--color-red);
-	--text-color: var(--color-brand-inverted);
-}
-
-.moderation-button {
-	--background-color: var(--color-orange);
-	--text-color: var(--color-brand-inverted);
-}
-
-.brand-button {
-	--background-color: var(--color-brand);
-	--text-color: var(--color-brand-inverted);
-}
-
-.button-group {
-	display: flex;
-	grid-gap: var(--spacing-card-sm);
-	flex-wrap: wrap;
-	margin-top: var(--spacing-card-md);
-	justify-content: right;
-}
-
 .error {
 	display: flex;
 	flex-direction: column;
@@ -501,7 +321,6 @@ textarea.known-error {
 }
 
 @media (prefers-reduced-motion) {
-	.button-animation,
 	button {
 		transform: none !important;
 	}
diff --git a/apps/frontend/src/assets/styles/global.scss b/apps/frontend/src/assets/styles/global.scss
index 8ad63c2da1..edc80e96d8 100644
--- a/apps/frontend/src/assets/styles/global.scss
+++ b/apps/frontend/src/assets/styles/global.scss
@@ -475,18 +475,6 @@ input {
 	outline: 2px solid transparent !important;
 }
 
-.button-animation {
-	transition:
-		opacity 0.5s ease-in-out,
-		filter 0.2s ease-in-out,
-		transform 0.05s ease-in-out,
-		outline-width 0.2s ease-in-out;
-}
-
-.button-transparent {
-	box-shadow: none;
-}
-
 .qc-cmp2-close-tooltip {
 	background-color: transparent;
 	color: hsl(145, 78%, 28%);
diff --git a/apps/frontend/src/components/ui/Chips.vue b/apps/frontend/src/components/ui/Chips.vue
deleted file mode 100644
index 17905aa13c..0000000000
--- a/apps/frontend/src/components/ui/Chips.vue
+++ /dev/null
@@ -1,103 +0,0 @@
-<template>
-	<div class="chips">
-		<button
-			v-for="item in items"
-			:key="item"
-			class="iconified-button"
-			:class="{ selected: selected === item, capitalize: capitalize }"
-			@click="toggleItem(item)"
-		>
-			<CheckIcon v-if="selected === item" />
-			<span>{{ formatLabel(item) }}</span>
-		</button>
-	</div>
-</template>
-
-<script>
-import { CheckIcon } from '@modrinth/assets'
-
-export default {
-	components: {
-		CheckIcon,
-	},
-	props: {
-		modelValue: {
-			required: true,
-			type: String,
-		},
-		items: {
-			required: true,
-			type: Array,
-		},
-		neverEmpty: {
-			default: true,
-			type: Boolean,
-		},
-		formatLabel: {
-			default: (x) => x,
-			type: Function,
-		},
-		capitalize: {
-			type: Boolean,
-			default: true,
-		},
-	},
-	emits: ['update:modelValue'],
-	computed: {
-		selected: {
-			get() {
-				return this.modelValue
-			},
-			set(value) {
-				this.$emit('update:modelValue', value)
-			},
-		},
-	},
-	created() {
-		if (this.items.length > 0 && this.neverEmpty) {
-			this.selected = this.items[0]
-		}
-	},
-	methods: {
-		toggleItem(item) {
-			if (this.selected === item && !this.neverEmpty) {
-				this.selected = null
-			} else {
-				this.selected = item
-			}
-		},
-	},
-}
-</script>
-
-<style lang="scss" scoped>
-.chips {
-	display: flex;
-	grid-gap: 0.5rem;
-	flex-wrap: wrap;
-
-	.iconified-button {
-		&.capitalize {
-			text-transform: capitalize;
-		}
-
-		svg {
-			width: 1em;
-			height: 1em;
-		}
-
-		&:focus-visible {
-			outline: 0.25rem solid var(--color-focus-ring);
-			border-radius: 0.25rem;
-		}
-	}
-
-	.selected {
-		color: var(--color-button-text-active);
-		background-color: var(--color-brand-highlight);
-		box-shadow:
-			inset 0 0 0 transparent,
-			0 0 0 2px var(--color-brand);
-	}
-}
-</style>
diff --git a/apps/frontend/src/components/ui/ModrinthFooter.vue b/apps/frontend/src/components/ui/ModrinthFooter.vue
index 4c47ca7742..84da60b415 100644
--- a/apps/frontend/src/components/ui/ModrinthFooter.vue
+++ b/apps/frontend/src/components/ui/ModrinthFooter.vue
@@ -7,7 +7,7 @@ import {
 	ToggleRightIcon,
 	TwitterIcon,
 } from '@modrinth/assets'
-import { ButtonLink } from '@modrinth/ui'
+import { Button, ButtonLink } from '@modrinth/ui'
 import {
 	AutoLink,
 	defineMessage,
@@ -266,11 +266,17 @@ function developerModeIncrement() {
 					:aria-label="formatMessage(messages.modrinthInformation)"
 				>
 					<div class="flex items-center gap-2">
-						<TextLogo
-							aria-hidden="true"
-							class="text-logo button-base h-6 w-auto text-contrast lg:h-8"
+						<Button
+							type="quiet"
+							interaction="none"
+							aria-label="Modrinth"
+							class="!h-auto !p-0"
 							@click="developerModeIncrement()"
-						/>
+						>
+							<span class="inline-flex">
+								<TextLogo aria-hidden="true" class="text-logo h-6 w-auto text-contrast lg:h-8" />
+							</span>
+						</Button>
 						<ButtonLink
 							v-if="flags.developerMode"
 							v-tooltip="formatMessage(commonSettingsMessages.featureFlags)"
diff --git a/apps/frontend/src/components/ui/NavStack.vue b/apps/frontend/src/components/ui/NavStack.vue
index 23d0acbb76..e71314a55a 100644
--- a/apps/frontend/src/components/ui/NavStack.vue
+++ b/apps/frontend/src/components/ui/NavStack.vue
@@ -17,10 +17,12 @@
 						{{ item.label }}
 					</div>
 
-					<NuxtLink
+					<ButtonLink
 						v-else-if="item.link ?? item.to"
+						type="quiet"
+						interaction="surface"
 						:to="(item.link ?? item.to) as string"
-						class="nav-item inline-flex w-full cursor-pointer items-center gap-2 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="nav-item !h-auto !w-full !justify-start !rounded-xl !px-4 !py-2.5 text-left leading-tight"
 						:class="{ 'is-active': isActive(item as NavStackLinkItem) }"
 					>
 						<component
@@ -37,12 +39,14 @@
 							{{ String(item.badge) }}
 						</span>
 						<span v-if="item.chevron" class="ml-auto"><ChevronRightIcon /></span>
-					</NuxtLink>
+					</ButtonLink>
 
-					<button
+					<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 }"
+						type="quiet"
+						interaction="surface"
+						:color="item.danger ? 'red' : undefined"
+						class="nav-item !h-auto !w-full !justify-start !rounded-xl !px-4 !py-2.5 text-left leading-tight"
 						@click="item.action"
 					>
 						<component
@@ -58,7 +62,7 @@
 						>
 							{{ String(item.badge) }}
 						</span>
-					</button>
+					</Button>
 
 					<span v-else>You frog. 🐸</span>
 				</li>
@@ -69,6 +73,7 @@
 
 <script setup lang="ts">
 import { ChevronRightIcon } from '@modrinth/assets'
+import { Button, ButtonLink } from '@modrinth/ui'
 import { type Component, computed, useSlots } from 'vue'
 
 type NavStackBaseItem = {
diff --git a/apps/frontend/src/components/ui/OptionGroup.vue b/apps/frontend/src/components/ui/OptionGroup.vue
deleted file mode 100644
index 36313921ef..0000000000
--- a/apps/frontend/src/components/ui/OptionGroup.vue
+++ /dev/null
@@ -1,128 +0,0 @@
-<template>
-	<nav
-		ref="scrollContainer"
-		class="card-shadow relative flex w-fit overflow-x-auto rounded-full bg-bg-raised p-1 text-sm font-bold"
-	>
-		<button
-			v-for="(option, index) in options"
-			:key="`option-group-${index}`"
-			ref="optionButtons"
-			class="button-animation z-[1] flex flex-row items-center gap-2 rounded-full bg-transparent px-4 py-2 font-semibold"
-			:class="{
-				'text-button-textSelected': modelValue === option,
-				'text-primary': modelValue !== option,
-			}"
-			@click="setOption(option)"
-		>
-			<slot :option="option" :selected="modelValue === option" />
-		</button>
-		<div
-			class="navtabs-transition pointer-events-none absolute h-[calc(100%-0.5rem)] overflow-hidden rounded-full bg-button-bgSelected p-1"
-			:style="{
-				left: sliderLeftPx,
-				top: sliderTopPx,
-				right: sliderRightPx,
-				bottom: sliderBottomPx,
-				opacity: initialized ? 1 : 0,
-			}"
-			aria-hidden="true"
-		></div>
-	</nav>
-</template>
-
-<script setup lang="ts" generic="T">
-import { computed, onMounted, ref } from 'vue'
-
-const modelValue = defineModel<T>({ required: true })
-
-const props = defineProps<{
-	options: T[]
-}>()
-
-const scrollContainer = ref<HTMLElement | null>(null)
-
-const sliderLeft = ref(4)
-const sliderTop = ref(4)
-const sliderRight = ref(4)
-const sliderBottom = ref(4)
-
-const sliderLeftPx = computed(() => `${sliderLeft.value}px`)
-const sliderTopPx = computed(() => `${sliderTop.value}px`)
-const sliderRightPx = computed(() => `${sliderRight.value}px`)
-const sliderBottomPx = computed(() => `${sliderBottom.value}px`)
-
-const optionButtons = ref()
-
-const initialized = ref(false)
-
-function setOption(option: T) {
-	modelValue.value = option
-}
-
-watch(modelValue, () => {
-	startAnimation(props.options.indexOf(modelValue.value))
-})
-
-function startAnimation(index: number) {
-	const el = optionButtons.value[index]
-
-	if (!el || !el.offsetParent) return
-
-	const newValues = {
-		left: el.offsetLeft,
-		top: el.offsetTop,
-		right: el.offsetParent.offsetWidth - el.offsetLeft - el.offsetWidth,
-		bottom: el.offsetParent.offsetHeight - el.offsetTop - el.offsetHeight,
-	}
-
-	if (sliderLeft.value === 4 && sliderRight.value === 4) {
-		sliderLeft.value = newValues.left
-		sliderRight.value = newValues.right
-		sliderTop.value = newValues.top
-		sliderBottom.value = newValues.bottom
-	} else {
-		const delay = 200
-
-		if (newValues.left < sliderLeft.value) {
-			sliderLeft.value = newValues.left
-			setTimeout(() => {
-				sliderRight.value = newValues.right
-			}, delay)
-		} else {
-			sliderRight.value = newValues.right
-			setTimeout(() => {
-				sliderLeft.value = newValues.left
-			}, delay)
-		}
-
-		if (newValues.top < sliderTop.value) {
-			sliderTop.value = newValues.top
-			setTimeout(() => {
-				sliderBottom.value = newValues.bottom
-			}, delay)
-		} else {
-			sliderBottom.value = newValues.bottom
-			setTimeout(() => {
-				sliderTop.value = newValues.top
-			}, delay)
-		}
-	}
-	initialized.value = true
-}
-
-onMounted(() => {
-	startAnimation(props.options.indexOf(modelValue.value))
-})
-</script>
-
-<style scoped>
-.navtabs-transition {
-	transition:
-		all 150ms cubic-bezier(0.4, 0, 0.2, 1),
-		opacity 250ms cubic-bezier(0.5, 0, 0.2, 1) 50ms;
-}
-
-.card-shadow {
-	box-shadow: var(--shadow-card);
-}
-</style>
diff --git a/apps/frontend/src/components/ui/ProjectMemberHeader.vue b/apps/frontend/src/components/ui/ProjectMemberHeader.vue
index 9a4c0b2ee5..76c0a87056 100644
--- a/apps/frontend/src/components/ui/ProjectMemberHeader.vue
+++ b/apps/frontend/src/components/ui/ProjectMemberHeader.vue
@@ -6,7 +6,7 @@
 		</p>
 		<p v-else>{{ getFormattedMessage(messages.invitationNoRole) }}</p>
 		<div class="input-group">
-			<Button type="colored" color="brand" class="brand-button" @click="acceptInvite()">
+			<Button type="colored" color="brand" @click="acceptInvite()">
 				<CheckIcon />
 				{{ getFormattedMessage(commonMessages.acceptButton) }}
 			</Button>
diff --git a/apps/frontend/src/components/ui/thread/ConversationThread.vue b/apps/frontend/src/components/ui/thread/ConversationThread.vue
index 9de637941d..d3e4df0c2f 100644
--- a/apps/frontend/src/components/ui/thread/ConversationThread.vue
+++ b/apps/frontend/src/components/ui/thread/ConversationThread.vue
@@ -275,7 +275,6 @@
 									{{ formatMessage(messages.actionApprove) }}
 								</Button>
 								<SplitButton
-									class="!m-0 !inline-flex !flex-nowrap !justify-start !gap-0"
 									type="colored"
 									color="red"
 									:menu-label="formatMessage(commonMessages.moreOptionsButton)"
diff --git a/apps/frontend/src/layouts/default.vue b/apps/frontend/src/layouts/default.vue
index 6085cc5cfa..13a58bf002 100644
--- a/apps/frontend/src/layouts/default.vue
+++ b/apps/frontend/src/layouts/default.vue
@@ -629,14 +629,14 @@
 				@focusout="isBrowseMenuOpen = false"
 			>
 				<div class="links cascade-links">
-					<NuxtLink
+					<ButtonLink
 						v-for="navRoute in navRoutes"
 						:key="navRoute.href"
 						:to="navRoute.href"
-						class="iconified-button"
+						class="!h-auto !whitespace-normal"
 					>
 						{{ navRoute.label }}
-					</NuxtLink>
+					</ButtonLink>
 				</div>
 			</div>
 			<div
@@ -646,10 +646,10 @@
 				@focusout="isMobileMenuOpen = false"
 			>
 				<div class="account-container">
-					<NuxtLink
+					<ButtonLink
 						v-if="auth.user"
 						:to="`/user/${auth.user.username}`"
-						class="iconified-button account-button"
+						class="account-button !h-auto !whitespace-normal"
 					>
 						<Avatar
 							:src="auth.user.avatar_url"
@@ -662,66 +662,85 @@
 							<div>@{{ auth.user.username }}</div>
 							<div>{{ formatMessage(commonMessages.visitYourProfile) }}</div>
 						</div>
-					</NuxtLink>
-					<nuxt-link v-else class="iconified-button brand-button" :to="signInRouteObj">
+					</ButtonLink>
+					<ButtonLink
+						v-else
+						type="colored"
+						color="brand"
+						:to="signInRouteObj"
+						class="!h-auto !whitespace-normal"
+					>
 						<LogInIcon aria-hidden="true" /> {{ formatMessage(commonMessages.signInButton) }}
-					</nuxt-link>
+					</ButtonLink>
 				</div>
 				<div class="links">
 					<template v-if="auth.user">
-						<button class="iconified-button danger-button" @click="logoutUser()">
+						<Button
+							type="colored"
+							color="red"
+							class="!h-auto !whitespace-normal"
+							@click="logoutUser()"
+						>
 							<LogOutIcon aria-hidden="true" />
 							{{ formatMessage(commonMessages.signOutButton) }}
-						</button>
-						<button class="iconified-button" @click="$refs.modal_creation.show()">
+						</Button>
+						<Button class="!h-auto !whitespace-normal" @click="$refs.modal_creation.show()">
 							<PlusIcon aria-hidden="true" />
 							{{ formatMessage(commonMessages.createAProjectButton) }}
-						</button>
-						<NuxtLink class="iconified-button" to="/dashboard/collections">
+						</Button>
+						<ButtonLink class="!h-auto !whitespace-normal" to="/dashboard/collections">
 							<LibraryIcon class="icon" />
 							{{ formatMessage(commonMessages.collectionsLabel) }}
-						</NuxtLink>
-						<NuxtLink class="iconified-button" to="/hosting/manage">
+						</ButtonLink>
+						<ButtonLink class="!h-auto !whitespace-normal" to="/hosting/manage">
 							<ServerIcon class="icon" />
 							{{ formatMessage(commonMessages.serversLabel) }}
-						</NuxtLink>
-						<NuxtLink
+						</ButtonLink>
+						<ButtonLink
 							v-if="auth.user.role === 'moderator' || auth.user.role === 'admin'"
-							class="iconified-button"
+							class="!h-auto !whitespace-normal"
 							to="/moderation"
 						>
 							<ScaleIcon aria-hidden="true" />
 							{{ formatMessage(commonMessages.moderationLabel) }}
-						</NuxtLink>
-						<NuxtLink v-if="flags.developerMode" class="iconified-button" to="/settings/flags">
+						</ButtonLink>
+						<ButtonLink
+							v-if="flags.developerMode"
+							class="!h-auto !whitespace-normal"
+							to="/settings/flags"
+						>
 							<ToggleRightIcon aria-hidden="true" />
 							{{ formatMessage(commonSettingsMessages.featureFlags) }}
-						</NuxtLink>
+						</ButtonLink>
 					</template>
-					<NuxtLink class="iconified-button" to="/settings">
+					<ButtonLink class="!h-auto !whitespace-normal" to="/settings">
 						<SettingsIcon aria-hidden="true" />
 						{{ formatMessage(commonMessages.settingsLabel) }}
-					</NuxtLink>
-					<button class="iconified-button" @click="changeTheme">
+					</ButtonLink>
+					<Button class="!h-auto !whitespace-normal" @click="changeTheme">
 						<MoonIcon v-if="$theme.active === 'light'" class="icon" />
 						<SunIcon v-else class="icon" />
 						<span class="dropdown-item__text">
 							{{ formatMessage(messages.changeTheme) }}
 						</span>
-					</button>
+					</Button>
 				</div>
 			</div>
 			<div class="mobile-navbar" :class="{ expanded: isBrowseMenuOpen || isMobileMenuOpen }">
-				<NuxtLink
+				<ButtonLink
 					to="/"
-					class="tab button-animation"
+					type="quiet"
+					interaction="none"
+					class="tab !h-auto !rounded-none !px-0"
 					:title="formatMessage(navMenuMessages.home)"
 					:aria-label="formatMessage(navMenuMessages.home)"
 				>
 					<HomeIcon aria-hidden="true" />
-				</NuxtLink>
-				<button
-					class="tab button-animation"
+				</ButtonLink>
+				<Button
+					type="quiet"
+					interaction="none"
+					class="tab !h-auto !rounded-none !px-0"
 					:class="{ 'router-link-exact-active': isBrowseMenuOpen }"
 					:title="formatMessage(navMenuMessages.search)"
 					:aria-label="formatMessage(navMenuMessages.search)"
@@ -734,11 +753,13 @@
 						<SearchIcon aria-hidden="true" class="smaller" />
 						{{ formatMessage(navMenuMessages.search) }}
 					</template>
-				</button>
+				</Button>
 				<template v-if="auth.user">
-					<NuxtLink
+					<ButtonLink
 						to="/dashboard/notifications"
-						class="tab button-animation"
+						type="quiet"
+						interaction="none"
+						class="tab !h-auto !rounded-none !px-0"
 						:aria-label="formatMessage(commonMessages.notificationsLabel)"
 						:class="{
 							'no-active': isMobileMenuOpen || isBrowseMenuOpen,
@@ -752,18 +773,22 @@
 						"
 					>
 						<BellIcon aria-hidden="true" />
-					</NuxtLink>
-					<NuxtLink
+					</ButtonLink>
+					<ButtonLink
 						to="/dashboard"
-						class="tab button-animation"
+						type="quiet"
+						interaction="none"
+						class="tab !h-auto !rounded-none !px-0"
 						:aria-label="formatMessage(commonMessages.dashboardLabel)"
 						:title="formatMessage(commonMessages.dashboardLabel)"
 					>
 						<ChartIcon aria-hidden="true" />
-					</NuxtLink>
+					</ButtonLink>
 				</template>
-				<button
-					class="tab button-animation"
+				<Button
+					type="quiet"
+					interaction="none"
+					class="tab !h-auto !rounded-none !px-0"
 					:title="formatMessage(messages.toggleMenu)"
 					:aria-label="
 						isMobileMenuOpen ? formatMessage(messages.closeMenu) : formatMessage(messages.openMenu)
@@ -784,7 +809,7 @@
 							circle
 						/>
 					</template>
-				</button>
+				</Button>
 			</div>
 		</header>
 		<main class="min-h-[calc(100vh-4.5rem-310.59px)]">
@@ -842,6 +867,7 @@ import {
 } from '@modrinth/assets'
 import {
 	Avatar,
+	Button,
 	ButtonLink,
 	commonMessages,
 	commonProjectTypeCategoryMessages,
diff --git a/apps/frontend/src/pages/[type]/[project]/changelog.vue b/apps/frontend/src/pages/[type]/[project]/changelog.vue
index cd220347b2..376964b839 100644
--- a/apps/frontend/src/pages/[type]/[project]/changelog.vue
+++ b/apps/frontend/src/pages/[type]/[project]/changelog.vue
@@ -368,8 +368,4 @@ function getVersionLoaders(version) {
 		}
 	}
 }
-
-.brand-button {
-	color: var(--color-accent-contrast);
-}
 </style>
diff --git a/apps/frontend/src/pages/[type]/[project]/gallery.vue b/apps/frontend/src/pages/[type]/[project]/gallery.vue
index edce759740..d6b539e2da 100644
--- a/apps/frontend/src/pages/[type]/[project]/gallery.vue
+++ b/apps/frontend/src/pages/[type]/[project]/gallery.vue
@@ -86,7 +86,7 @@
 					<StarIcon fill="currentColor" aria-hidden="true" />
 					Unset as banner
 				</Button>
-				<div class="button-group">
+				<div class="mt-3 flex flex-wrap justify-end gap-2">
 					<Button type="outlined" @click="modalEditItem?.hide()">
 						<XIcon aria-hidden="true" />
 						Cancel
diff --git a/apps/frontend/src/pages/[type]/[project]/settings/gallery.vue b/apps/frontend/src/pages/[type]/[project]/settings/gallery.vue
index 765b6a65ef..452e7d0b73 100644
--- a/apps/frontend/src/pages/[type]/[project]/settings/gallery.vue
+++ b/apps/frontend/src/pages/[type]/[project]/settings/gallery.vue
@@ -86,7 +86,7 @@
 					<StarIcon fill="currentColor" aria-hidden="true" />
 					Unset as banner
 				</Button>
-				<div class="button-group">
+				<div class="mt-3 flex flex-wrap justify-end gap-2">
 					<Button type="outlined" @click="modal_edit_item.hide()">
 						<XIcon aria-hidden="true" />
 						Cancel
diff --git a/apps/frontend/src/pages/[type]/[project]/settings/index.vue b/apps/frontend/src/pages/[type]/[project]/settings/index.vue
index 61918918f6..b1caf99c3f 100644
--- a/apps/frontend/src/pages/[type]/[project]/settings/index.vue
+++ b/apps/frontend/src/pages/[type]/[project]/settings/index.vue
@@ -740,8 +740,4 @@ svg {
 		color: var(--color-orange);
 	}
 }
-
-.button-group {
-	justify-content: flex-start;
-}
 </style>
diff --git a/apps/frontend/src/pages/[type]/[project]/settings/links.vue b/apps/frontend/src/pages/[type]/[project]/settings/links.vue
index 46256f3fe3..854e9a0f72 100644
--- a/apps/frontend/src/pages/[type]/[project]/settings/links.vue
+++ b/apps/frontend/src/pages/[type]/[project]/settings/links.vue
@@ -104,7 +104,7 @@
 					:disabled="!hasPermission"
 				/>
 			</div>
-			<div class="button-group">
+			<div class="mt-3 flex flex-wrap justify-start gap-2">
 				<Button
 					type="colored"
 					color="brand"
@@ -272,7 +272,7 @@
 					@update:model-value="updateDonationLinks"
 				/>
 			</div>
-			<div class="button-group">
+			<div class="mt-3 flex flex-wrap justify-start gap-2">
 				<Button type="colored" color="brand" :disabled="!hasChanges" @click="saveChanges()">
 					<SaveIcon />
 					Save changes
@@ -560,8 +560,4 @@ function checkDifference(newLink, existingLink) {
 		max-width: 26rem;
 	}
 }
-
-.button-group {
-	justify-content: flex-start;
-}
 </style>
diff --git a/apps/frontend/src/pages/[type]/[project]/settings/members.vue b/apps/frontend/src/pages/[type]/[project]/settings/members.vue
index 1ba42b6c1a..e028930579 100644
--- a/apps/frontend/src/pages/[type]/[project]/settings/members.vue
+++ b/apps/frontend/src/pages/[type]/[project]/settings/members.vue
@@ -270,9 +270,11 @@
 					</nuxt-link>
 					. You may override them below.
 				</p>
-				<nuxt-link
+				<ButtonLink
+					type="quiet"
+					interaction="none"
 					:to="`/organization/${organization.slug}`"
-					class="universal-card button-base recessed org"
+					class="universal-card recessed org !h-auto !w-full !shrink !items-stretch !justify-start !whitespace-normal !p-[var(--spacing-card-bg)]"
 				>
 					<Avatar :src="organization.icon_url" :alt="organization.name" size="md" />
 					<div class="details">
@@ -294,7 +296,7 @@
 							</div>
 						</span>
 					</div>
-				</nuxt-link>
+				</ButtonLink>
 			</div>
 			<p v-else>
 				This project is not managed by an organization. If you are the member of any organizations,
@@ -562,6 +564,7 @@ import {
 	Avatar,
 	Badge,
 	Button,
+	ButtonLink,
 	Card,
 	Checkbox,
 	Combobox,
diff --git a/apps/frontend/src/pages/[type]/[project]/settings/tags.vue b/apps/frontend/src/pages/[type]/[project]/settings/tags.vue
index 77acc7d932..cbfc414335 100644
--- a/apps/frontend/src/pages/[type]/[project]/settings/tags.vue
+++ b/apps/frontend/src/pages/[type]/[project]/settings/tags.vue
@@ -434,11 +434,6 @@ const toggleFeaturedCategory = (category: Category) => {
 		vertical-align: top;
 	}
 }
-
-.button-group {
-	justify-content: flex-start;
-}
-
 .category-list {
 	column-count: 4;
 	column-gap: var(--spacing-card-lg);
diff --git a/apps/frontend/src/pages/admin/billing/[user].vue b/apps/frontend/src/pages/admin/billing/[user].vue
index 72ad4e591b..e8e9d75300 100644
--- a/apps/frontend/src/pages/admin/billing/[user].vue
+++ b/apps/frontend/src/pages/admin/billing/[user].vue
@@ -166,7 +166,7 @@
 							v-if="
 								subscription.metadata?.type === 'pyro' || subscription.metadata?.type === 'medal'
 							"
-							:to="`/hosting/manage/${subscription.metadata.id}`"
+							:href="`/hosting/manage/${subscription.metadata.id}`"
 							target="_blank"
 							class="w-fit"
 						>
diff --git a/apps/frontend/src/pages/app.vue b/apps/frontend/src/pages/app.vue
index 284e9bd844..4f94a7ac1a 100644
--- a/apps/frontend/src/pages/app.vue
+++ b/apps/frontend/src/pages/app.vue
@@ -18,6 +18,7 @@ import {
 	Avatar,
 	Badge,
 	Button,
+	ButtonLink,
 	Checkbox,
 	commonMessages,
 	defineMessages,
@@ -546,7 +547,7 @@ useSeoMeta({
 			<h2 class="main-subheader">
 				{{ formatMessage(messages.description) }}
 			</h2>
-			<div class="button-group">
+			<div class="mx-auto flex w-fit flex-wrap justify-center gap-2 [mask-image:none]">
 				<Button v-if="os" type="colored" color="brand" size="xl" @click="handleDownload">
 					<LinuxIcon v-if="os === 'Linux'" />
 					<WindowsIcon v-else-if="os === 'Windows'" />
@@ -745,10 +746,12 @@ useSeoMeta({
 					<div class="projects-showcase">
 						<div v-for="(row, index) in rows" :key="index" class="row">
 							<div v-for="n in 2" :key="n" class="row__content" :class="{ offset: index % 2 }">
-								<nuxt-link
+								<ButtonLink
 									v-for="project in row"
 									:key="project.id"
-									class="project button-animation gradient-border"
+									type="quiet"
+									interaction="none"
+									class="project gradient-border !h-auto !shrink !items-stretch !justify-start !whitespace-normal !p-4 !font-normal !leading-normal"
 									:to="`/${project.project_type}/${project.slug ? project.slug : project.id}`"
 								>
 									<Avatar :src="project.icon_url!" alt="" size="sm" />
@@ -760,7 +763,7 @@ useSeoMeta({
 											{{ project.description }}
 										</span>
 									</div>
-								</nuxt-link>
+								</ButtonLink>
 							</div>
 						</div>
 					</div>
@@ -1228,13 +1231,6 @@ useSeoMeta({
 		mask-image: none;
 	}
 
-	.button-group {
-		width: fit-content;
-		margin: 0 auto;
-		justify-content: center;
-		mask-image: none;
-	}
-
 	img {
 		width: 100%;
 		max-width: 65rem;
diff --git a/apps/frontend/src/pages/dashboard/organizations.vue b/apps/frontend/src/pages/dashboard/organizations.vue
index d258f0e5af..fddcf8b664 100644
--- a/apps/frontend/src/pages/dashboard/organizations.vue
+++ b/apps/frontend/src/pages/dashboard/organizations.vue
@@ -13,11 +13,13 @@
 			</div>
 			<template v-if="orgs?.length > 0">
 				<div class="orgs-grid">
-					<nuxt-link
+					<ButtonLink
 						v-for="org in sortedOrgs"
 						:key="org.id"
+						type="quiet"
+						interaction="none"
 						:to="`/organization/${org.slug}`"
-						class="universal-card button-base recessed org"
+						class="universal-card recessed org !h-auto !w-full !shrink !items-stretch !justify-start !whitespace-normal !p-[var(--spacing-card-bg)]"
 						:class="{ 'is-disabled': onlyAcceptedMembers(org.members).length === 0 }"
 					>
 						<Avatar :src="org.icon_url" :alt="org.name" class="icon" />
@@ -41,7 +43,7 @@
 								</div>
 							</span>
 						</div>
-					</nuxt-link>
+					</ButtonLink>
 				</div>
 			</template>
 			<template v-else> {{ formatMessage(messages.makeOrganization) }} </template>
@@ -51,7 +53,14 @@
 
 <script setup>
 import { PlusIcon, UsersIcon } from '@modrinth/assets'
-import { Avatar, Button, defineMessages, injectModrinthClient, useVIntl } from '@modrinth/ui'
+import {
+	Avatar,
+	Button,
+	ButtonLink,
+	defineMessages,
+	injectModrinthClient,
+	useVIntl,
+} from '@modrinth/ui'
 import { useQuery } from '@tanstack/vue-query'
 
 import OrganizationCreateModal from '~/components/ui/create/OrganizationCreateModal.vue'
diff --git a/apps/frontend/src/pages/hosting/index.vue b/apps/frontend/src/pages/hosting/index.vue
index 3b7767f78b..5ea21cbd6d 100644
--- a/apps/frontend/src/pages/hosting/index.vue
+++ b/apps/frontend/src/pages/hosting/index.vue
@@ -643,6 +643,7 @@ import {
 	IntlFormatted,
 	LoaderIcon,
 	ModrinthServersPurchaseModal,
+	OptionGroup,
 	useFormatPrice,
 	useVIntl,
 } from '@modrinth/ui'
@@ -650,7 +651,6 @@ import { monthsInInterval } from '@modrinth/ui/src/utils/billing.ts'
 import { useQuery } from '@tanstack/vue-query'
 import { computed } from 'vue'
 
-import OptionGroup from '~/components/ui/OptionGroup.vue'
 import MedalPlanPromotion from '~/components/ui/servers/marketing/MedalPlanPromotion.vue'
 import ServerPlanSelector from '~/components/ui/servers/marketing/ServerPlanSelector.vue'
 import { products } from '~/generated/state.json'
diff --git a/apps/frontend/src/pages/index.vue b/apps/frontend/src/pages/index.vue
index c226a6d8c7..b74b666b6b 100644
--- a/apps/frontend/src/pages/index.vue
+++ b/apps/frontend/src/pages/index.vue
@@ -25,7 +25,7 @@
 			<h2>
 				{{ formatMessage(messages.discoverHeading) }}
 			</h2>
-			<div class="button-group">
+			<div class="mx-auto mb-20 flex w-fit flex-wrap justify-center gap-5">
 				<ButtonLink type="colored" color="brand" size="xl" to="/discover/mods">
 					<CompassIcon aria-hidden="true" />
 					{{ formatMessage(messages.discoverMods) }}
@@ -50,10 +50,12 @@
 			<div v-if="rows" class="projects-showcase">
 				<div v-for="(row, index) in rows" :key="index" class="row">
 					<div v-for="n in 2" :key="n" class="row__content" :class="{ offset: index % 2 }">
-						<nuxt-link
+						<ButtonLink
 							v-for="project in row"
 							:key="project.id"
-							class="project button-animation"
+							type="quiet"
+							interaction="none"
+							class="project !h-auto !shrink !items-stretch !justify-start !whitespace-normal !p-4 !font-normal !leading-normal"
 							:to="`/${project.project_type}/${project.slug ? project.slug : project.id}`"
 						>
 							<Avatar :src="project.icon_url" :alt="project.title" size="sm" loading="lazy" />
@@ -65,7 +67,7 @@
 									{{ project.description }}
 								</span>
 							</div>
-						</nuxt-link>
+						</ButtonLink>
 					</div>
 				</div>
 			</div>
@@ -738,13 +740,6 @@ const creatorFeatureMessages = defineMessages({
 		color: var(--landing-color-subheading);
 		max-width: 50rem;
 	}
-
-	.button-group {
-		width: fit-content;
-		gap: 1.25rem;
-		margin: 0 auto 5rem;
-		justify-content: center;
-	}
 }
 
 .users-section-outer {
diff --git a/apps/frontend/src/pages/settings/index.vue b/apps/frontend/src/pages/settings/index.vue
index 339300eded..b11e4edb96 100644
--- a/apps/frontend/src/pages/settings/index.vue
+++ b/apps/frontend/src/pages/settings/index.vue
@@ -43,13 +43,17 @@
 					</div>
 					<div class="project-list-layouts">
 						<button
-							class="preview-radio button-base"
+							type="button"
+							class="flex !w-full cursor-pointer flex-col overflow-hidden rounded-[var(--radius-md)] border border-solid border-divider bg-button-bg p-0 text-left text-primary outline-2 outline-transparent transition-[filter,transform] hover:brightness-[0.85] focus-visible:ring-4 focus-visible:ring-brand-shadow active:scale-[0.97] active:brightness-[0.8] [&_.example-card]:m-0 [&_.example-card]:min-h-0 [&_.example-card]:border-2 [&_.example-card]:border-solid [&_.example-card]:border-transparent [&_.example-card]:p-4 [&_.example-card]:outline-2 [&_.example-card]:outline-transparent"
 							:class="{
-								selected: cosmetics.searchDisplayMode[projectType.id] === 'list',
+								'!text-contrast [&_.example-card]:!border-brand [&_.example-card]:!bg-brand-highlight [&_.radio]:text-brand':
+									cosmetics.searchDisplayMode[projectType.id] === 'list',
 							}"
 							@click="() => (cosmetics.searchDisplayMode[projectType.id] = 'list')"
 						>
-							<div class="preview">
+							<div
+								class="preview flex w-full items-center justify-center bg-bg p-6 outline-2 outline-transparent"
+							>
 								<div class="layout-list-mode">
 									<div class="example-card card"></div>
 									<div class="example-card card"></div>
@@ -57,25 +61,30 @@
 									<div class="example-card card"></div>
 								</div>
 							</div>
-							<div class="label">
+							<div
+								class="label flex grow items-center px-[var(--gap-lg)] py-[var(--gap-md)] text-left"
+							>
 								<RadioButtonCheckedIcon
 									v-if="cosmetics.searchDisplayMode[projectType.id] === 'list'"
-									class="radio shrink-0"
+									class="radio mr-2 shrink-0"
 								/>
-								<RadioButtonIcon v-else class="radio shrink-0" />
+								<RadioButtonIcon v-else class="radio mr-2 shrink-0" />
 								{{ formatMessage(layoutMode.rows) }}
 							</div>
 						</button>
 						<button
-							class="preview-radio button-base"
+							type="button"
+							class="flex !w-full cursor-pointer flex-col overflow-hidden rounded-[var(--radius-md)] border border-solid border-divider bg-button-bg p-0 text-left text-primary outline-2 outline-transparent transition-[filter,transform] hover:brightness-[0.85] focus-visible:ring-4 focus-visible:ring-brand-shadow active:scale-[0.97] active:brightness-[0.8] [&_.example-card]:m-0 [&_.example-card]:min-h-0 [&_.example-card]:border-2 [&_.example-card]:border-solid [&_.example-card]:border-transparent [&_.example-card]:p-4 [&_.example-card]:outline-2 [&_.example-card]:outline-transparent"
 							:class="{
-								selected:
+								'!text-contrast [&_.example-card]:!border-brand [&_.example-card]:!bg-brand-highlight [&_.radio]:text-brand':
 									cosmetics.searchDisplayMode[projectType.id] === 'gallery' ||
 									cosmetics.searchDisplayMode[projectType.id] === 'grid',
 							}"
 							@click="() => (cosmetics.searchDisplayMode[projectType.id] = 'grid')"
 						>
-							<div class="preview">
+							<div
+								class="preview flex w-full items-center justify-center bg-bg p-6 outline-2 outline-transparent"
+							>
 								<div class="layout-gallery-mode">
 									<div class="example-card card"></div>
 									<div class="example-card card"></div>
@@ -83,15 +92,17 @@
 									<div class="example-card card"></div>
 								</div>
 							</div>
-							<div class="label">
+							<div
+								class="label flex grow items-center px-[var(--gap-lg)] py-[var(--gap-md)] text-left"
+							>
 								<RadioButtonCheckedIcon
 									v-if="
 										cosmetics.searchDisplayMode[projectType.id] === 'gallery' ||
 										cosmetics.searchDisplayMode[projectType.id] === 'grid'
 									"
-									class="radio shrink-0"
+									class="radio mr-2 shrink-0"
 								/>
-								<RadioButtonIcon v-else class="radio shrink-0" />
+								<RadioButtonIcon v-else class="radio mr-2 shrink-0" />
 								{{ formatMessage(layoutMode.grid) }}
 							</div>
 						</button>
@@ -487,20 +498,5 @@ const listTypes = computed(() => {
 	display: grid;
 	grid-template-columns: repeat(auto-fit, minmax(9.5rem, 1fr));
 	gap: var(--gap-lg);
-
-	.preview-radio .example-card {
-		border: 2px solid transparent;
-	}
-
-	.preview-radio.selected .example-card {
-		border-color: var(--color-brand);
-		background-color: var(--color-brand-highlight);
-	}
-
-	.preview {
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
 }
 </style>
diff --git a/packages/ui/src/components/base/OptionGroup.vue b/packages/ui/src/components/base/OptionGroup.vue
index bdb70a5c4a..9000fdcb65 100644
--- a/packages/ui/src/components/base/OptionGroup.vue
+++ b/packages/ui/src/components/base/OptionGroup.vue
@@ -3,19 +3,21 @@
 		ref="scrollContainer"
 		class="card-shadow relative flex w-fit overflow-x-auto rounded-full bg-bg-raised p-1 text-sm font-bold"
 	>
-		<button
+		<Button
 			v-for="(option, index) in options"
 			:key="`option-group-${index}`"
 			ref="optionButtons"
-			class="button-animation z-[1] flex flex-row items-center gap-2 rounded-full bg-transparent px-4 py-2 font-semibold"
+			type="quiet"
+			interaction="none"
+			class="z-[1] !h-auto !gap-2 !rounded-full !px-4 !py-2"
 			:class="{
-				'text-button-textSelected': modelValue === option,
-				'text-primary': modelValue !== option,
+				'!text-brand': modelValue === option,
+				'!text-primary': modelValue !== option,
 			}"
 			@click="setOption(option)"
 		>
 			<slot :option="option" :selected="modelValue === option" />
-		</button>
+		</Button>
 		<div
 			class="navtabs-transition pointer-events-none absolute h-[calc(100%-0.5rem)] overflow-hidden rounded-full bg-button-bgSelected p-1"
 			:style="{
@@ -33,6 +35,8 @@
 <script setup lang="ts" generic="T">
 import { computed, onMounted, ref, watch } from 'vue'
 
+import Button from './buttons/Button.vue'
+
 const modelValue = defineModel<T>({ required: true })
 
 const props = defineProps<{
@@ -64,7 +68,7 @@ watch(modelValue, () => {
 })
 
 function startAnimation(index: number) {
-	const el = optionButtons.value[index]
+	const el = optionButtons.value[index]?.element
 
 	if (!el || !el.offsetParent) return
 

From a89711841d340e9a9ae4c8140f12c6c0d15a3194 Mon Sep 17 00:00:00 2001
From: "Michael H." <michael@iptables.sh>
Date: Wed, 5 Aug 2026 19:59:15 +0200
Subject: [PATCH 36/82] chore: reduce frontend server memory & tracing (#7014)

* chore: reduce memory usage

* feat: worker tracing

* fix: eslint

* fix: remove compat flag

* fix: prettier
---
 apps/frontend/package.json                    |    2 +-
 .../ui/dashboard/RevenueTransaction.vue       |    9 +-
 .../withdraw-stages/MuralpayDetailsStage.vue  |    5 +-
 .../ui/servers/ServersUpgradeModalWrapper.vue |    6 +-
 apps/frontend/src/composables/country.ts      |   11 +-
 apps/frontend/src/composables/generated.ts    |   70 +-
 apps/frontend/src/layouts/default.vue         |    6 +-
 .../src/pages/dashboard/revenue/transfers.vue |    5 +-
 .../src/pages/hosting/manage/index.vue        |    6 +-
 apps/frontend/wrangler.jsonc                  |   23 +-
 .../src/modules/labrinth/state/index.ts       |    6 +-
 packages/ui/wrangler.jsonc                    |    2 +-
 pnpm-lock.yaml                                | 1296 ++++++++++++-----
 13 files changed, 1014 insertions(+), 433 deletions(-)

diff --git a/apps/frontend/package.json b/apps/frontend/package.json
index fa2e751f4c..8852cd5123 100644
--- a/apps/frontend/package.json
+++ b/apps/frontend/package.json
@@ -35,7 +35,7 @@
 		"vite-svg-loader": "^5.1.0",
 		"vue-component-type-helpers": "^3.1.8",
 		"vue-tsc": "^2.0.24",
-		"wrangler": "^4.54.0"
+		"wrangler": "^4.115.0"
 	},
 	"dependencies": {
 		"@formatjs/intl-localematcher": "^0.5.4",
diff --git a/apps/frontend/src/components/ui/dashboard/RevenueTransaction.vue b/apps/frontend/src/components/ui/dashboard/RevenueTransaction.vue
index bf38b28340..840548b412 100644
--- a/apps/frontend/src/components/ui/dashboard/RevenueTransaction.vue
+++ b/apps/frontend/src/components/ui/dashboard/RevenueTransaction.vue
@@ -96,7 +96,7 @@ import {
 import { capitalizeString } from '@modrinth/utils'
 import { Tooltip } from 'floating-vue'
 
-import { useGeneratedState } from '~/composables/generated'
+import { tremendousIdMap } from '~/generated/state.json'
 import { findRail } from '~/utils/muralpay-rails'
 
 type Transaction = Labrinth.Payout.v3.TransactionItem
@@ -110,7 +110,6 @@ const emit = defineEmits<{
 }>()
 
 const { addNotification } = injectNotificationManager()
-const generatedState = useGeneratedState()
 
 const isIncome = computed(() => props.transaction.type === 'payout_available')
 
@@ -120,7 +119,7 @@ const methodIconUrl = computed(() => {
 	const methodId = props.transaction.method_id
 
 	if (method === 'tremendous' && methodId) {
-		const methodInfo = generatedState.value.tremendousIdMap?.[methodId]
+		const methodInfo = tremendousIdMap?.[methodId]
 		if (methodInfo?.name?.toLowerCase()?.includes('paypal')) return null
 		return methodInfo?.image_url ?? null
 	}
@@ -137,7 +136,7 @@ const methodIconComponent = computed(() => {
 		case 'tremendous': {
 			const methodId = props.transaction.method_id
 			if (methodId) {
-				const info = generatedState.value.tremendousIdMap?.[methodId]
+				const info = tremendousIdMap?.[methodId]
 				if (info?.name?.toLowerCase()?.includes('paypal')) {
 					return PayPalColorIcon
 				}
@@ -187,7 +186,7 @@ function formatMethodName(method: string | undefined, method_id: string | undefi
 			return 'Venmo'
 		case 'tremendous':
 			if (method_id) {
-				const info = generatedState.value.tremendousIdMap?.[method_id]
+				const info = tremendousIdMap?.[method_id]
 				if (info) return `${info.name}`
 			}
 			return 'Tremendous'
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 f0e4b6311c..e30bc9dc87 100644
--- a/apps/frontend/src/components/ui/dashboard/withdraw-stages/MuralpayDetailsStage.vue
+++ b/apps/frontend/src/components/ui/dashboard/withdraw-stages/MuralpayDetailsStage.vue
@@ -248,13 +248,12 @@ 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 { getRailConfig } from '@/utils/muralpay-rails'
+import { muralBankDetails } from '~/generated/state.json'
 
 const { withdrawData, maxWithdrawAmount, availableMethods, calculateFees } = useWithdrawContext()
 const { formatMessage } = useVIntl()
-const generatedState = useGeneratedState()
 
 const selectedRail = computed(() => {
 	const railId = withdrawData.value.selection.method
@@ -285,7 +284,7 @@ const availableBankNames = computed(() => {
 	const rail = selectedRail.value
 	if (!rail || !rail.railCode) return []
 
-	const bankDetails = generatedState.value.muralBankDetails?.[rail.railCode]
+	const bankDetails = muralBankDetails?.[rail.railCode as keyof typeof muralBankDetails]
 	return bankDetails?.bankNames || []
 })
 
diff --git a/apps/frontend/src/components/ui/servers/ServersUpgradeModalWrapper.vue b/apps/frontend/src/components/ui/servers/ServersUpgradeModalWrapper.vue
index b33544199b..7737ce1b2e 100644
--- a/apps/frontend/src/components/ui/servers/ServersUpgradeModalWrapper.vue
+++ b/apps/frontend/src/components/ui/servers/ServersUpgradeModalWrapper.vue
@@ -3,18 +3,18 @@
 		ref="wrapperRef"
 		:stripe-publishable-key="config.public.stripePublishableKey"
 		:site-url="config.public.siteUrl"
-		:products="generatedState.products || []"
+		:products="(products ?? []) as Labrinth.Billing.Internal.Product[]"
 	/>
 </template>
 
 <script setup lang="ts">
+import type { Labrinth } from '@modrinth/api-client'
 // TODO: Remove this wrapper when we figure out how to do cross platform state + stripe
 import { ServersUpgradeModalWrapper as ServersUpgradeModalWrapperBase } from '@modrinth/ui'
 
-import { useGeneratedState } from '~/composables/generated'
+import { products } from '~/generated/state.json'
 
 const config = useRuntimeConfig()
-const generatedState = useGeneratedState()
 
 const wrapperRef = ref<InstanceType<typeof ServersUpgradeModalWrapperBase> | null>(null)
 
diff --git a/apps/frontend/src/composables/country.ts b/apps/frontend/src/composables/country.ts
index 06e55dbe29..8daaea9ccd 100644
--- a/apps/frontend/src/composables/country.ts
+++ b/apps/frontend/src/composables/country.ts
@@ -1,9 +1,10 @@
-import { useGeneratedState } from '@/composables/generated.ts'
+import type { ISO3166 } from '@modrinth/api-client'
+
 import { useRequestHeaders, useState } from '#imports'
+import { countries, subdivisions } from '~/generated/state.json'
 
 export const useCountries = () => {
-	const generated = useGeneratedState()
-	return computed(() => generated.value.countries ?? [])
+	return computed(() => (countries ?? []) as ISO3166.Country[])
 }
 
 export const useFormattedCountries = () => {
@@ -28,10 +29,10 @@ export const useFormattedCountries = () => {
 }
 
 export const useSubdivisions = (countryCode: ComputedRef<string> | Ref<string> | string) => {
-	const generated = useGeneratedState()
 	const code = isRef(countryCode) ? countryCode : ref(countryCode)
+	const byCountry = (subdivisions ?? {}) as Record<string, ISO3166.Subdivision[]>
 
-	return computed(() => generated.value.subdivisions?.[unref(code)] ?? [])
+	return computed(() => byCountry[unref(code)] ?? [])
 }
 
 export const useUserCountry = () => {
diff --git a/apps/frontend/src/composables/generated.ts b/apps/frontend/src/composables/generated.ts
index b47e9fec13..e178ab048a 100644
--- a/apps/frontend/src/composables/generated.ts
+++ b/apps/frontend/src/composables/generated.ts
@@ -1,7 +1,17 @@
 import type { ISO3166, Labrinth } from '@modrinth/api-client'
 import type { DisplayProjectType } from '@modrinth/utils'
 
-import generatedState from '~/generated/state.json'
+import {
+	apiUrl,
+	categories,
+	donationPlatforms,
+	errors,
+	gameVersions,
+	lastGenerated,
+	loaders,
+	reportTypes,
+	taxComplianceThresholds,
+} from '~/generated/state.json'
 import type { DisplayMode } from '~/plugins/cosmetics'
 
 export interface ProjectType {
@@ -23,7 +33,25 @@ export interface LoaderData {
 export type Country = ISO3166.Country
 export type Subdivision = ISO3166.Subdivision
 
-export interface GeneratedState extends Labrinth.State.GeneratedState {
+/**
+ * Route-specific slices of the generated state are deliberately excluded here.
+ * Anything placed on `useGeneratedState` is serialized into the SSR payload of
+ * every page, so large fields must be imported directly by the pages that need
+ * them instead (see `useCountries`, `useSubdivisions`, `~/generated/state.json`).
+ */
+type GloballyUsedState = Omit<
+	Labrinth.State.GeneratedState,
+	| 'countries'
+	| 'subdivisions'
+	| 'muralBankDetails'
+	| 'tremendousIdMap'
+	| 'homePageProjects'
+	| 'homePageSearch'
+	| 'homePageNotifs'
+	| 'products'
+>
+
+export interface GeneratedState extends GloballyUsedState {
 	// Additional runtime-defined fields not from the API
 	projectTypes: ProjectType[]
 	loaderData: LoaderData
@@ -40,26 +68,17 @@ export interface GeneratedState extends Labrinth.State.GeneratedState {
 }
 
 /**
- * Composable for accessing the complete generated state.
+ * Composable for accessing the globally used generated state.
  * This includes both fetched data and runtime-defined constants.
  */
 export const useGeneratedState = () =>
 	useState<GeneratedState>('generatedState', () => ({
 		// 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,
-		tremendousIdMap: generatedState.tremendousIdMap as
-			| Record<string, { name: string; image_url: string | null }>
-			| undefined,
-		countries: (generatedState.countries ?? []) as ISO3166.Country[],
-		subdivisions: (generatedState.subdivisions ?? {}) as Record<string, ISO3166.Subdivision[]>,
+		categories: (categories ?? []) as Labrinth.Tags.v2.Category[],
+		loaders: (loaders ?? []) as Labrinth.Tags.v2.Loader[],
+		gameVersions: (gameVersions ?? []) as Labrinth.Tags.v2.GameVersion[],
+		donationPlatforms: (donationPlatforms ?? []) as Labrinth.Tags.v2.DonationPlatform[],
+		reportTypes: (reportTypes ?? []) as string[],
 
 		projectTypes: [
 			{
@@ -121,20 +140,11 @@ export const useGeneratedState = () =>
 		rejectedStatuses: ['rejected', 'withheld'],
 		staffRoles: ['moderator', 'admin'],
 
-		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,
-		taxComplianceThresholds: (generatedState.taxComplianceThresholds ?? {}) as Record<
-			string,
-			number
-		>,
+		taxComplianceThresholds: (taxComplianceThresholds ?? {}) as Record<string, number>,
 
-		lastGenerated: generatedState.lastGenerated,
-		apiUrl: generatedState.apiUrl,
-		errors: generatedState.errors,
+		lastGenerated,
+		apiUrl,
+		errors,
 
 		buildYear: new Date().getFullYear(),
 	}))
diff --git a/apps/frontend/src/layouts/default.vue b/apps/frontend/src/layouts/default.vue
index 13a58bf002..bf09d69e04 100644
--- a/apps/frontend/src/layouts/default.vue
+++ b/apps/frontend/src/layouts/default.vue
@@ -902,13 +902,11 @@ import OrganizationCreateModal from '~/components/ui/create/OrganizationCreateMo
 import ProjectCreateModal from '~/components/ui/create/ProjectCreateModal.vue'
 import ModrinthFooter from '~/components/ui/ModrinthFooter.vue'
 import { getSignInRouteObj } from '~/composables/auth.ts'
-import { errors as generatedStateErrors } from '~/generated/state.json'
+import { errors as generatedStateErrors, taxComplianceThresholds } from '~/generated/state.json'
 import { provideCurrentProjectId } from '~/providers/current-project.ts'
 import { getProjectTypeMessage } from '~/utils/i18n-project-type.ts'
 import { hasActiveMidas } from '~/utils/user-membership.ts'
 
-const generatedState = useGeneratedState()
-
 const country = useUserCountry()
 
 const { formatMessage } = useVIntl()
@@ -956,7 +954,7 @@ const showTaxComplianceBanner = computed(() => {
 	if (flags.value.testTaxForm && auth.value.user) return true
 	const bal = payoutBalance.value
 	if (!bal) return false
-	const threshold = getTaxThreshold(generatedState.value?.taxComplianceThresholds)
+	const threshold = getTaxThreshold(taxComplianceThresholds)
 	const thresholdMet = (bal.withdrawn_ytd ?? 0) >= threshold
 	const status = bal.form_completion_status ?? 'unknown'
 	const isComplete = status === 'complete'
diff --git a/apps/frontend/src/pages/dashboard/revenue/transfers.vue b/apps/frontend/src/pages/dashboard/revenue/transfers.vue
index 5fb7030005..a513df4510 100644
--- a/apps/frontend/src/pages/dashboard/revenue/transfers.vue
+++ b/apps/frontend/src/pages/dashboard/revenue/transfers.vue
@@ -103,7 +103,7 @@ import { useQuery } from '@tanstack/vue-query'
 import dayjs from 'dayjs'
 
 import RevenueTransaction from '~/components/ui/dashboard/RevenueTransaction.vue'
-import { useGeneratedState } from '~/composables/generated'
+import { tremendousIdMap } from '~/generated/state.json'
 import { findRail } from '~/utils/muralpay-rails'
 
 const { formatMessage } = useVIntl()
@@ -114,7 +114,6 @@ const formatMonth = useFormatDateTime({
 })
 
 const client = injectModrinthClient()
-const generatedState = useGeneratedState()
 
 const messages = defineMessages({
 	transactionsHeader: {
@@ -281,7 +280,7 @@ function transactionsToCSV() {
 					break
 				case 'tremendous':
 					if (txn.method_id) {
-						const info = generatedState.value.tremendousIdMap?.[txn.method_id]
+						const info = tremendousIdMap?.[txn.method_id]
 						if (info) {
 							methodOrSource = `Tremendous (${info.name})`
 							break
diff --git a/apps/frontend/src/pages/hosting/manage/index.vue b/apps/frontend/src/pages/hosting/manage/index.vue
index 3ea3fb216b..0fb27696f6 100644
--- a/apps/frontend/src/pages/hosting/manage/index.vue
+++ b/apps/frontend/src/pages/hosting/manage/index.vue
@@ -1,7 +1,8 @@
 <script setup lang="ts">
+import type { Labrinth } from '@modrinth/api-client'
 import { ServersManagePageIndex } from '@modrinth/ui'
 
-import { useGeneratedState } from '~/composables/generated'
+import { products } from '~/generated/state.json'
 
 definePageMeta({
 	middleware: 'auth',
@@ -12,14 +13,13 @@ useHead({
 })
 
 const config = useRuntimeConfig()
-const generatedState = useGeneratedState()
 </script>
 
 <template>
 	<ServersManagePageIndex
 		:stripe-publishable-key="config.public.stripePublishableKey"
 		:site-url="config.public.siteUrl"
-		:products="generatedState.products || []"
+		:products="(products ?? []) as Labrinth.Billing.Internal.Product[]"
 		class="max-w-[1280px] py-0"
 	/>
 </template>
diff --git a/apps/frontend/wrangler.jsonc b/apps/frontend/wrangler.jsonc
index 17d5bb1360..821c5c3e9a 100644
--- a/apps/frontend/wrangler.jsonc
+++ b/apps/frontend/wrangler.jsonc
@@ -1,13 +1,12 @@
 {
 	"$schema": "node_modules/wrangler/config-schema.json",
 	"name": "frontend",
-	"compatibility_date": "2025-12-10",
+	"compatibility_date": "2026-08-05",
 	"main": "./.output/server/index.mjs",
 	"assets": {
 		"binding": "ASSETS",
 		"directory": "./.output/public/"
 	},
-	"compatibility_flags": ["nodejs_compat_v2"],
 	"routes": ["modrinth.com/*"],
 	"preview_urls": true,
 	"workers_dev": true,
@@ -15,8 +14,14 @@
 		"cpu_ms": 5000
 	},
 	"observability": {
-		"enabled": true,
-		"head_sampling_rate": 0.0001
+		"traces": {
+			"enabled": true,
+			"head_sampling_rate": 0.0001
+		},
+		"logs": {
+			"enabled": true,
+			"head_sampling_rate": 0.0001
+		}
 	},
 	"keep_vars": false,
 	"secrets_store_secrets": [
@@ -49,8 +54,14 @@
 	"env": {
 		"staging": {
 			"observability": {
-				"enabled": true,
-				"head_sampling_rate": 0.1
+				"traces": {
+					"enabled": true,
+					"head_sampling_rate": 0.1
+				},
+				"logs": {
+					"enabled": true,
+					"head_sampling_rate": 0.1
+				}
 			},
 			"routes": ["staging.modrinth.com/*"],
 			"vars": {
diff --git a/packages/api-client/src/modules/labrinth/state/index.ts b/packages/api-client/src/modules/labrinth/state/index.ts
index f82f36c737..ab15c13b5a 100644
--- a/packages/api-client/src/modules/labrinth/state/index.ts
+++ b/packages/api-client/src/modules/labrinth/state/index.ts
@@ -154,11 +154,13 @@ export class LabrinthStateModule extends AbstractModule {
 			homePageSearch,
 			homePageNotifs,
 			products,
-			muralBankDetails: muralBankDetails?.bankDetails,
+			// Always emit a value: `undefined` is dropped by JSON.stringify, and consumers
+			// import these keys by name from the generated state.
+			muralBankDetails: muralBankDetails?.bankDetails ?? {},
 			tremendousIdMap,
 			countries: iso3166Data.countries,
 			subdivisions: iso3166Data.subdivisions,
-			taxComplianceThresholds: globals?.tax_compliance_thresholds,
+			taxComplianceThresholds: globals?.tax_compliance_thresholds ?? {},
 			errors,
 		}
 	}
diff --git a/packages/ui/wrangler.jsonc b/packages/ui/wrangler.jsonc
index bdd4196e11..02c1a9e64a 100644
--- a/packages/ui/wrangler.jsonc
+++ b/packages/ui/wrangler.jsonc
@@ -1,6 +1,6 @@
 {
 	"name": "storybook",
-	"compatibility_date": "2026-02-12",
+	"compatibility_date": "2026-08-05",
 	"workers_dev": true,
 	"assets": {
 		"directory": "./storybook-static"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 72a32c7ed6..f3f5accd91 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -179,7 +179,7 @@ importers:
     devDependencies:
       '@eslint/compat':
         specifier: ^1.1.1
-        version: 1.4.1(eslint@9.39.2(jiti@2.6.1))
+        version: 1.4.1(eslint@9.39.2(jiti@1.21.7))
       '@formatjs/cli':
         specifier: ^6.2.12
         version: 6.12.2(@vue/compiler-core@3.5.27)(vue@3.5.27(typescript@5.9.3))
@@ -188,22 +188,22 @@ importers:
         version: link:../../packages/tooling-config
       '@nuxt/eslint-config':
         specifier: ^0.5.6
-        version: 0.5.7(@typescript-eslint/utils@8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
+        version: 0.5.7(@typescript-eslint/utils@8.54.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
       '@taijased/vue-render-tracker':
         specifier: ^1.0.7
         version: 1.0.7(vue@3.5.27(typescript@5.9.3))
       '@vitejs/plugin-vue':
         specifier: ^6.0.3
-        version: 6.0.4(vite@8.0.3(@types/node@24.12.2)(esbuild@0.27.3)(jiti@2.6.1)(sass@1.97.3)(terser@5.46.0)(yaml@2.8.2))(vue@3.5.27(typescript@5.9.3))
+        version: 6.0.4(vite@8.0.3(@types/node@24.12.2)(esbuild@0.27.3)(jiti@1.21.7)(sass@1.97.3)(terser@5.46.0)(yaml@2.8.2))(vue@3.5.27(typescript@5.9.3))
       autoprefixer:
         specifier: ^10.4.19
         version: 10.4.24(postcss@8.5.6)
       eslint:
         specifier: ^9.9.1
-        version: 9.39.2(jiti@2.6.1)
+        version: 9.39.2(jiti@1.21.7)
       eslint-plugin-turbo:
         specifier: ^2.5.4
-        version: 2.8.2(eslint@9.39.2(jiti@2.6.1))(turbo@2.8.2)
+        version: 2.8.2(eslint@9.39.2(jiti@1.21.7))(turbo@2.8.2)
       postcss:
         specifier: ^8.4.39
         version: 8.5.6
@@ -221,7 +221,7 @@ importers:
         version: 5.9.3
       vite:
         specifier: ^8.0.0
-        version: 8.0.3(@types/node@24.12.2)(esbuild@0.27.3)(jiti@2.6.1)(sass@1.97.3)(terser@5.46.0)(yaml@2.8.2)
+        version: 8.0.3(@types/node@24.12.2)(esbuild@0.27.3)(jiti@1.21.7)(sass@1.97.3)(terser@5.46.0)(yaml@2.8.2)
       vue-component-type-helpers:
         specifier: ^3.1.8
         version: 3.2.4
@@ -442,8 +442,8 @@ importers:
         specifier: ^2.0.24
         version: 2.2.12(typescript@5.9.3)
       wrangler:
-        specifier: ^4.54.0
-        version: 4.62.0
+        specifier: ^4.115.0
+        version: 4.115.0
 
   apps/labrinth: {}
 
@@ -778,10 +778,10 @@ importers:
         version: 10.2.4(storybook@10.2.4(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))
       '@storybook/builder-vite':
         specifier: ^10.1.10
-        version: 10.2.4(esbuild@0.27.3)(rollup@4.57.1)(storybook@10.2.4(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(vite@5.4.21(@types/node@24.12.2)(lightningcss@1.32.0)(sass@1.97.3)(terser@5.46.0))
+        version: 10.2.4(esbuild@0.28.1)(rollup@4.57.1)(storybook@10.2.4(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(vite@5.4.21(@types/node@24.12.2)(lightningcss@1.32.0)(sass@1.97.3)(terser@5.46.0))
       '@storybook/vue3-vite':
         specifier: ^10.1.10
-        version: 10.2.4(esbuild@0.27.3)(rollup@4.57.1)(storybook@10.2.4(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(vite@5.4.21(@types/node@24.12.2)(lightningcss@1.32.0)(sass@1.97.3)(terser@5.46.0))(vue@3.5.27(typescript@5.9.3))
+        version: 10.2.4(esbuild@0.28.1)(rollup@4.57.1)(storybook@10.2.4(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(vite@5.4.21(@types/node@24.12.2)(lightningcss@1.32.0)(sass@1.97.3)(terser@5.46.0))(vue@3.5.27(typescript@5.9.3))
       '@stripe/stripe-js':
         specifier: ^7.3.1
         version: 7.9.0
@@ -793,7 +793,7 @@ importers:
         version: 5.2.4(vite@5.4.21(@types/node@24.12.2)(lightningcss@1.32.0)(sass@1.97.3)(terser@5.46.0))(vue@3.5.27(typescript@5.9.3))
       eslint-plugin-storybook:
         specifier: ^10.1.10
-        version: 10.2.4(eslint@9.39.2(jiti@1.21.7))(storybook@10.2.4(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(typescript@5.9.3)
+        version: 10.2.4(eslint@9.39.2(jiti@2.6.1))(storybook@10.2.4(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(typescript@5.9.3)
       storybook:
         specifier: ^10.1.10
         version: 10.2.4(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
@@ -1118,14 +1118,9 @@ packages:
     resolution: {integrity: sha512-SIOD2DxrRRwQ+jgzlXCqoEFiKOFqaPjhnNTGKXSRLvp1HiOvapLaFG2kEr9dYQTYe8rKrd9uvDUzmAITeNyaHQ==}
     engines: {node: '>=18.0.0'}
 
-  '@cloudflare/unenv-preset@2.12.0':
-    resolution: {integrity: sha512-NK4vN+2Z/GbfGS4BamtbbVk1rcu5RmqaYGiyHJQrA09AoxdZPHDF3W/EhgI0YSK8p3vRo/VNCtbSJFPON7FWMQ==}
-    peerDependencies:
-      unenv: 2.0.0-rc.24
-      workerd: ^1.20260115.0
-    peerDependenciesMeta:
-      workerd:
-        optional: true
+  '@cloudflare/kv-asset-handler@0.5.0':
+    resolution: {integrity: sha512-jxQYkj8dSIzc0cD6cMMNdOc1UVjqSqu8BZdor5s8cGjW2I8BjODt/kWPVdY+u9zj3ms75Q5qaZgnxUad83+eAg==}
+    engines: {node: '>=22.0.0'}
 
   '@cloudflare/unenv-preset@2.12.1':
     resolution: {integrity: sha512-tP/Wi+40aBJovonSNJSsS7aFJY0xjuckKplmzDs2Xat06BJ68B6iG7YDUWXJL8gNn0gqW7YC5WhlYhO3QbugQA==}
@@ -1136,11 +1131,14 @@ packages:
       workerd:
         optional: true
 
-  '@cloudflare/workerd-darwin-64@1.20260131.0':
-    resolution: {integrity: sha512-+1X4qErc715NUhJZNhtlpuCxajhD5YNre7Cz50WPMmj+BMUrh9h7fntKEadtrUo5SM2YONY7CDzK7wdWbJJBVA==}
-    engines: {node: '>=16'}
-    cpu: [x64]
-    os: [darwin]
+  '@cloudflare/unenv-preset@2.16.1':
+    resolution: {integrity: sha512-ECxObrMfyTl5bhQf/lZCXwo5G6xX9IAUo+nDMKK4SZ8m4Jvvxp52vilxyySSWh2YTZz8+HQ07qGH/2rEom1vDw==}
+    peerDependencies:
+      unenv: 2.0.0-rc.24
+      workerd: '>1.20260305.0 <2.0.0-0'
+    peerDependenciesMeta:
+      workerd:
+        optional: true
 
   '@cloudflare/workerd-darwin-64@1.20260212.0':
     resolution: {integrity: sha512-kLxuYutk88Wlo7edp8mlkN68TgZZ9237SUnuX9kNaD5jcOdblUqiBctMRZeRcPsuoX/3g2t0vS4ga02NBEVRNg==}
@@ -1148,10 +1146,10 @@ packages:
     cpu: [x64]
     os: [darwin]
 
-  '@cloudflare/workerd-darwin-arm64@1.20260131.0':
-    resolution: {integrity: sha512-M84mXR8WEMEBuX4/dL2IQ4wHV/ALwYjx9if5ePZR8rdbD7if/fkEEoMBq0bGS/1gMLRqqCZLstabxHV+g92NNg==}
+  '@cloudflare/workerd-darwin-64@1.20260722.1':
+    resolution: {integrity: sha512-vZOP8vIS3NwnuaO+gz0FZ7kIGeiO3bZmxV35Ph9zOXKSREhDFlH7wQ7mkCdhW3O4jnXsew+XT7b+DNEI2CcJGQ==}
     engines: {node: '>=16'}
-    cpu: [arm64]
+    cpu: [x64]
     os: [darwin]
 
   '@cloudflare/workerd-darwin-arm64@1.20260212.0':
@@ -1160,11 +1158,11 @@ packages:
     cpu: [arm64]
     os: [darwin]
 
-  '@cloudflare/workerd-linux-64@1.20260131.0':
-    resolution: {integrity: sha512-SWzr48bCL9y5wjkj23tXS6t/6us99EAH9T5TAscMV0hfJFZQt97RY/gaHKyRRjFv6jfJZvk7d4g+OmGeYBnwcg==}
+  '@cloudflare/workerd-darwin-arm64@1.20260722.1':
+    resolution: {integrity: sha512-EmIQymihDq6WNdER4+LF8Qn80yqayBUpJ+tkOO7wmY8pmgfyXjIUFNXotl21AHovTeu2seR7HdVUgeN/BilCWw==}
     engines: {node: '>=16'}
-    cpu: [x64]
-    os: [linux]
+    cpu: [arm64]
+    os: [darwin]
 
   '@cloudflare/workerd-linux-64@1.20260212.0':
     resolution: {integrity: sha512-bCSQoZzDzV5MSh4ueWo1DgmOn4Hf3QBu4Yo3eQFXA2llYFIu/sZgRtkEehw1X2/SY5Sn6O0EMCqxJYRf82Wdeg==}
@@ -1172,10 +1170,10 @@ packages:
     cpu: [x64]
     os: [linux]
 
-  '@cloudflare/workerd-linux-arm64@1.20260131.0':
-    resolution: {integrity: sha512-mL0kLPGIBJRPeHS3+erJ2t5dJT3ODhsKvR9aA4BcsY7M30/QhlgJIF6wsgwNisTJ23q8PbobZNHBUKIe8l/E9A==}
+  '@cloudflare/workerd-linux-64@1.20260722.1':
+    resolution: {integrity: sha512-jvZ3k9fxcnEn04s80CgIYxQfpOyAiz/8qC42DP8EBa9tR27qWyg9wmm31zIobVlrgBZn/+8NfdP73avRGcQOjQ==}
     engines: {node: '>=16'}
-    cpu: [arm64]
+    cpu: [x64]
     os: [linux]
 
   '@cloudflare/workerd-linux-arm64@1.20260212.0':
@@ -1184,14 +1182,20 @@ packages:
     cpu: [arm64]
     os: [linux]
 
-  '@cloudflare/workerd-windows-64@1.20260131.0':
-    resolution: {integrity: sha512-hoQqTFBpP1zntP2OQSpt5dEWbd9vSBliK+G7LmDXjKitPkmkRFo2PB4P9aBRE1edPAIO/fpdoJv928k2HaAn4A==}
+  '@cloudflare/workerd-linux-arm64@1.20260722.1':
+    resolution: {integrity: sha512-BOSB55SMNdy+DA5uj2WirgiNanpHGis5PVvXH1wSfvjRKr4JGgWK+EZzxz0RFUo6QjjQQC/NimEzNZ7va7jmKg==}
+    engines: {node: '>=16'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@cloudflare/workerd-windows-64@1.20260212.0':
+    resolution: {integrity: sha512-wHRI218Xn4ndgWJCUHH4Zx0YlU5q/o6OmcxXkcw95tJOsQn4lDrhppioPh4eScxJZALf2X+ODeZcyQTCq5exGw==}
     engines: {node: '>=16'}
     cpu: [x64]
     os: [win32]
 
-  '@cloudflare/workerd-windows-64@1.20260212.0':
-    resolution: {integrity: sha512-wHRI218Xn4ndgWJCUHH4Zx0YlU5q/o6OmcxXkcw95tJOsQn4lDrhppioPh4eScxJZALf2X+ODeZcyQTCq5exGw==}
+  '@cloudflare/workerd-windows-64@1.20260722.1':
+    resolution: {integrity: sha512-sYM8YgUpKnRz2xjvdJLX1Ojzoi4MlA4gk8WTTExhGydjYB2UTs5NIbv0ZmpKgMoK9io3ixgmiW56ZnTbcWOdiA==}
     engines: {node: '>=16'}
     cpu: [x64]
     os: [win32]
@@ -1268,6 +1272,9 @@ packages:
   '@emnapi/core@1.8.1':
     resolution: {integrity: sha512-AvT9QFpxK0Zd8J0jopedNm+w/2fIzvtPKPjqyw9jwvBaReTTqPBk9Hixaz7KbjimP+QNz605/XnjFcDAL2pqBg==}
 
+  '@emnapi/runtime@1.11.3':
+    resolution: {integrity: sha512-Xz4Tpyki7XyrpbUK1jR1AhdAdaXyhhY4lZ3neLodmhpuWfy2PAQN5B46sAiU4liOXGLkHypn/qU+jvfWSCYYLA==}
+
   '@emnapi/runtime@1.8.1':
     resolution: {integrity: sha512-mehfKSMWjjNol8659Z8KxEMrdSJDDot5SXMq00dM8BN4o+CLNXQ0xH2V7EchNHV4RmbZLmmPdEaXZc5H2FXmDg==}
 
@@ -1290,12 +1297,6 @@ packages:
     cpu: [ppc64]
     os: [aix]
 
-  '@esbuild/aix-ppc64@0.27.0':
-    resolution: {integrity: sha512-KuZrd2hRjz01y5JK9mEBSD3Vj3mbCvemhT466rSuJYeE/hjuBrHfjjcjMdTm/sz7au+++sdbJZJmuBwQLuw68A==}
-    engines: {node: '>=18'}
-    cpu: [ppc64]
-    os: [aix]
-
   '@esbuild/aix-ppc64@0.27.2':
     resolution: {integrity: sha512-GZMB+a0mOMZs4MpDbj8RJp4cw+w1WV5NYD6xzgvzUJ5Ek2jerwfO2eADyI6ExDSUED+1X8aMbegahsJi+8mgpw==}
     engines: {node: '>=18'}
@@ -1308,6 +1309,12 @@ packages:
     cpu: [ppc64]
     os: [aix]
 
+  '@esbuild/aix-ppc64@0.28.1':
+    resolution: {integrity: sha512-Svl7tq8k/08+p6CXPpRjQ1fKX+1odH/BQbb48fV6fj3CWHhsoIOoY87w1oHXm0qEpkIK3ZfVgp0hed3XBXzXMQ==}
+    engines: {node: '>=18'}
+    cpu: [ppc64]
+    os: [aix]
+
   '@esbuild/android-arm64@0.21.5':
     resolution: {integrity: sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==}
     engines: {node: '>=12'}
@@ -1320,12 +1327,6 @@ packages:
     cpu: [arm64]
     os: [android]
 
-  '@esbuild/android-arm64@0.27.0':
-    resolution: {integrity: sha512-CC3vt4+1xZrs97/PKDkl0yN7w8edvU2vZvAFGD16n9F0Cvniy5qvzRXjfO1l94efczkkQE6g1x0i73Qf5uthOQ==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [android]
-
   '@esbuild/android-arm64@0.27.2':
     resolution: {integrity: sha512-pvz8ZZ7ot/RBphf8fv60ljmaoydPU12VuXHImtAs0XhLLw+EXBi2BLe3OYSBslR4rryHvweW5gmkKFwTiFy6KA==}
     engines: {node: '>=18'}
@@ -1338,6 +1339,12 @@ packages:
     cpu: [arm64]
     os: [android]
 
+  '@esbuild/android-arm64@0.28.1':
+    resolution: {integrity: sha512-34EGEbCIAgosYz6goLcopX6Mo7NyGv9tfwEM2/7Ce2VcVRk568iSvniGWcUXIy7wEDR1wzolcxcriFVrWYcwBg==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [android]
+
   '@esbuild/android-arm@0.21.5':
     resolution: {integrity: sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==}
     engines: {node: '>=12'}
@@ -1350,12 +1357,6 @@ packages:
     cpu: [arm]
     os: [android]
 
-  '@esbuild/android-arm@0.27.0':
-    resolution: {integrity: sha512-j67aezrPNYWJEOHUNLPj9maeJte7uSMM6gMoxfPC9hOg8N02JuQi/T7ewumf4tNvJadFkvLZMlAq73b9uwdMyQ==}
-    engines: {node: '>=18'}
-    cpu: [arm]
-    os: [android]
-
   '@esbuild/android-arm@0.27.2':
     resolution: {integrity: sha512-DVNI8jlPa7Ujbr1yjU2PfUSRtAUZPG9I1RwW4F4xFB1Imiu2on0ADiI/c3td+KmDtVKNbi+nffGDQMfcIMkwIA==}
     engines: {node: '>=18'}
@@ -1368,6 +1369,12 @@ packages:
     cpu: [arm]
     os: [android]
 
+  '@esbuild/android-arm@0.28.1':
+    resolution: {integrity: sha512-0k2F129Xdio1TdJfzJ8sy1Q47vUD2NnwdhiAf7drUN1EBTfPf4hsFCtmMgu/6m8JSzsBrlmVjudMBQqOfG8usQ==}
+    engines: {node: '>=18'}
+    cpu: [arm]
+    os: [android]
+
   '@esbuild/android-x64@0.21.5':
     resolution: {integrity: sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==}
     engines: {node: '>=12'}
@@ -1380,12 +1387,6 @@ packages:
     cpu: [x64]
     os: [android]
 
-  '@esbuild/android-x64@0.27.0':
-    resolution: {integrity: sha512-wurMkF1nmQajBO1+0CJmcN17U4BP6GqNSROP8t0X/Jiw2ltYGLHpEksp9MpoBqkrFR3kv2/te6Sha26k3+yZ9Q==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [android]
-
   '@esbuild/android-x64@0.27.2':
     resolution: {integrity: sha512-z8Ank4Byh4TJJOh4wpz8g2vDy75zFL0TlZlkUkEwYXuPSgX8yzep596n6mT7905kA9uHZsf/o2OJZubl2l3M7A==}
     engines: {node: '>=18'}
@@ -1398,6 +1399,12 @@ packages:
     cpu: [x64]
     os: [android]
 
+  '@esbuild/android-x64@0.28.1':
+    resolution: {integrity: sha512-dbwY7ltSMDWsRatcRpCnES4F+im88OCUgGZjy52shC7GqHRE/cYlxNbB4Z4UpJswpcc4Qxd2oE/ufM0p61IKng==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [android]
+
   '@esbuild/darwin-arm64@0.21.5':
     resolution: {integrity: sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==}
     engines: {node: '>=12'}
@@ -1410,12 +1417,6 @@ packages:
     cpu: [arm64]
     os: [darwin]
 
-  '@esbuild/darwin-arm64@0.27.0':
-    resolution: {integrity: sha512-uJOQKYCcHhg07DL7i8MzjvS2LaP7W7Pn/7uA0B5S1EnqAirJtbyw4yC5jQ5qcFjHK9l6o/MX9QisBg12kNkdHg==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [darwin]
-
   '@esbuild/darwin-arm64@0.27.2':
     resolution: {integrity: sha512-davCD2Zc80nzDVRwXTcQP/28fiJbcOwvdolL0sOiOsbwBa72kegmVU0Wrh1MYrbuCL98Omp5dVhQFWRKR2ZAlg==}
     engines: {node: '>=18'}
@@ -1428,6 +1429,12 @@ packages:
     cpu: [arm64]
     os: [darwin]
 
+  '@esbuild/darwin-arm64@0.28.1':
+    resolution: {integrity: sha512-TZbWkQY7kvTAXbXUT7uVACR5cMHsDiSz9z7ZKAX/RTq/WJEk3QyRr0wZpNhBDX+/0CtdqUIJlOiodQcta6tY3Q==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [darwin]
+
   '@esbuild/darwin-x64@0.21.5':
     resolution: {integrity: sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==}
     engines: {node: '>=12'}
@@ -1440,12 +1447,6 @@ packages:
     cpu: [x64]
     os: [darwin]
 
-  '@esbuild/darwin-x64@0.27.0':
-    resolution: {integrity: sha512-8mG6arH3yB/4ZXiEnXof5MK72dE6zM9cDvUcPtxhUZsDjESl9JipZYW60C3JGreKCEP+p8P/72r69m4AZGJd5g==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [darwin]
-
   '@esbuild/darwin-x64@0.27.2':
     resolution: {integrity: sha512-ZxtijOmlQCBWGwbVmwOF/UCzuGIbUkqB1faQRf5akQmxRJ1ujusWsb3CVfk/9iZKr2L5SMU5wPBi1UWbvL+VQA==}
     engines: {node: '>=18'}
@@ -1458,6 +1459,12 @@ packages:
     cpu: [x64]
     os: [darwin]
 
+  '@esbuild/darwin-x64@0.28.1':
+    resolution: {integrity: sha512-zfdzgK9ACBNZLI/CyHTOx81SyNbM6YXn7rxSgX97VjyiPl9W1i4Ka4fgKECEoFCKGpvBj5qArWIGgQjOwkgskQ==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [darwin]
+
   '@esbuild/freebsd-arm64@0.21.5':
     resolution: {integrity: sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==}
     engines: {node: '>=12'}
@@ -1470,12 +1477,6 @@ packages:
     cpu: [arm64]
     os: [freebsd]
 
-  '@esbuild/freebsd-arm64@0.27.0':
-    resolution: {integrity: sha512-9FHtyO988CwNMMOE3YIeci+UV+x5Zy8fI2qHNpsEtSF83YPBmE8UWmfYAQg6Ux7Gsmd4FejZqnEUZCMGaNQHQw==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [freebsd]
-
   '@esbuild/freebsd-arm64@0.27.2':
     resolution: {integrity: sha512-lS/9CN+rgqQ9czogxlMcBMGd+l8Q3Nj1MFQwBZJyoEKI50XGxwuzznYdwcav6lpOGv5BqaZXqvBSiB/kJ5op+g==}
     engines: {node: '>=18'}
@@ -1488,6 +1489,12 @@ packages:
     cpu: [arm64]
     os: [freebsd]
 
+  '@esbuild/freebsd-arm64@0.28.1':
+    resolution: {integrity: sha512-wG2EA8ENdEI0qhkSZMjfqrdY+ziCYCPMmtZjjIwOmXFjmyzEHn+UUxk5of+SYsjtfs3VpnlC7QLzSI5hY/rOAw==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [freebsd]
+
   '@esbuild/freebsd-x64@0.21.5':
     resolution: {integrity: sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==}
     engines: {node: '>=12'}
@@ -1500,12 +1507,6 @@ packages:
     cpu: [x64]
     os: [freebsd]
 
-  '@esbuild/freebsd-x64@0.27.0':
-    resolution: {integrity: sha512-zCMeMXI4HS/tXvJz8vWGexpZj2YVtRAihHLk1imZj4efx1BQzN76YFeKqlDr3bUWI26wHwLWPd3rwh6pe4EV7g==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [freebsd]
-
   '@esbuild/freebsd-x64@0.27.2':
     resolution: {integrity: sha512-tAfqtNYb4YgPnJlEFu4c212HYjQWSO/w/h/lQaBK7RbwGIkBOuNKQI9tqWzx7Wtp7bTPaGC6MJvWI608P3wXYA==}
     engines: {node: '>=18'}
@@ -1518,6 +1519,12 @@ packages:
     cpu: [x64]
     os: [freebsd]
 
+  '@esbuild/freebsd-x64@0.28.1':
+    resolution: {integrity: sha512-i7dZ9vQgnvSCzi/rYCXNgtF/U+eKZNJBzu3eTQbRgHnM7tNSizLOkRFAl3qzVc/Op/u5YkHHa4pf/3DOYHthLQ==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [freebsd]
+
   '@esbuild/linux-arm64@0.21.5':
     resolution: {integrity: sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==}
     engines: {node: '>=12'}
@@ -1530,12 +1537,6 @@ packages:
     cpu: [arm64]
     os: [linux]
 
-  '@esbuild/linux-arm64@0.27.0':
-    resolution: {integrity: sha512-AS18v0V+vZiLJyi/4LphvBE+OIX682Pu7ZYNsdUHyUKSoRwdnOsMf6FDekwoAFKej14WAkOef3zAORJgAtXnlQ==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [linux]
-
   '@esbuild/linux-arm64@0.27.2':
     resolution: {integrity: sha512-hYxN8pr66NsCCiRFkHUAsxylNOcAQaxSSkHMMjcpx0si13t1LHFphxJZUiGwojB1a/Hd5OiPIqDdXONia6bhTw==}
     engines: {node: '>=18'}
@@ -1548,6 +1549,12 @@ packages:
     cpu: [arm64]
     os: [linux]
 
+  '@esbuild/linux-arm64@0.28.1':
+    resolution: {integrity: sha512-yHs+0uc8+nvEAfAfxrWQKK5peSNzBc4PegcMO0EJ2hT71uA7vB8Ihg2e77R2P7SG5uYjPbHlLLmve4LLLRCf0g==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [linux]
+
   '@esbuild/linux-arm@0.21.5':
     resolution: {integrity: sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==}
     engines: {node: '>=12'}
@@ -1560,12 +1567,6 @@ packages:
     cpu: [arm]
     os: [linux]
 
-  '@esbuild/linux-arm@0.27.0':
-    resolution: {integrity: sha512-t76XLQDpxgmq2cNXKTVEB7O7YMb42atj2Re2Haf45HkaUpjM2J0UuJZDuaGbPbamzZ7bawyGFUkodL+zcE+jvQ==}
-    engines: {node: '>=18'}
-    cpu: [arm]
-    os: [linux]
-
   '@esbuild/linux-arm@0.27.2':
     resolution: {integrity: sha512-vWfq4GaIMP9AIe4yj1ZUW18RDhx6EPQKjwe7n8BbIecFtCQG4CfHGaHuh7fdfq+y3LIA2vGS/o9ZBGVxIDi9hw==}
     engines: {node: '>=18'}
@@ -1578,6 +1579,12 @@ packages:
     cpu: [arm]
     os: [linux]
 
+  '@esbuild/linux-arm@0.28.1':
+    resolution: {integrity: sha512-qVXBOHQS+d5Y722GwJzJUtOLlX7km3CraOaGormF1pDtPd2C/l1SHRPgjLunLGe51Sh5YYWKMFDyV4SxgMQYTQ==}
+    engines: {node: '>=18'}
+    cpu: [arm]
+    os: [linux]
+
   '@esbuild/linux-ia32@0.21.5':
     resolution: {integrity: sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==}
     engines: {node: '>=12'}
@@ -1590,12 +1597,6 @@ packages:
     cpu: [ia32]
     os: [linux]
 
-  '@esbuild/linux-ia32@0.27.0':
-    resolution: {integrity: sha512-Mz1jxqm/kfgKkc/KLHC5qIujMvnnarD9ra1cEcrs7qshTUSksPihGrWHVG5+osAIQ68577Zpww7SGapmzSt4Nw==}
-    engines: {node: '>=18'}
-    cpu: [ia32]
-    os: [linux]
-
   '@esbuild/linux-ia32@0.27.2':
     resolution: {integrity: sha512-MJt5BRRSScPDwG2hLelYhAAKh9imjHK5+NE/tvnRLbIqUWa+0E9N4WNMjmp/kXXPHZGqPLxggwVhz7QP8CTR8w==}
     engines: {node: '>=18'}
@@ -1608,6 +1609,12 @@ packages:
     cpu: [ia32]
     os: [linux]
 
+  '@esbuild/linux-ia32@0.28.1':
+    resolution: {integrity: sha512-d1z4ZuP0ajrfz/FhGT4vv278rX8KnPPJx8i5+AtK7TYbx9Le9F1hyzurZpkEyjkGa9dUGhQow4C1NmeGvqxN2w==}
+    engines: {node: '>=18'}
+    cpu: [ia32]
+    os: [linux]
+
   '@esbuild/linux-loong64@0.21.5':
     resolution: {integrity: sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==}
     engines: {node: '>=12'}
@@ -1620,12 +1627,6 @@ packages:
     cpu: [loong64]
     os: [linux]
 
-  '@esbuild/linux-loong64@0.27.0':
-    resolution: {integrity: sha512-QbEREjdJeIreIAbdG2hLU1yXm1uu+LTdzoq1KCo4G4pFOLlvIspBm36QrQOar9LFduavoWX2msNFAAAY9j4BDg==}
-    engines: {node: '>=18'}
-    cpu: [loong64]
-    os: [linux]
-
   '@esbuild/linux-loong64@0.27.2':
     resolution: {integrity: sha512-lugyF1atnAT463aO6KPshVCJK5NgRnU4yb3FUumyVz+cGvZbontBgzeGFO1nF+dPueHD367a2ZXe1NtUkAjOtg==}
     engines: {node: '>=18'}
@@ -1638,6 +1639,12 @@ packages:
     cpu: [loong64]
     os: [linux]
 
+  '@esbuild/linux-loong64@0.28.1':
+    resolution: {integrity: sha512-M5sRjUVZrkm1OAPR3dlOYzNmN+loZKGVi1VUQGrwuqLcbR6qeAz+famMhjASeH3YVKvZz+zT1jlh/keC3Rj/lg==}
+    engines: {node: '>=18'}
+    cpu: [loong64]
+    os: [linux]
+
   '@esbuild/linux-mips64el@0.21.5':
     resolution: {integrity: sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==}
     engines: {node: '>=12'}
@@ -1650,12 +1657,6 @@ packages:
     cpu: [mips64el]
     os: [linux]
 
-  '@esbuild/linux-mips64el@0.27.0':
-    resolution: {integrity: sha512-sJz3zRNe4tO2wxvDpH/HYJilb6+2YJxo/ZNbVdtFiKDufzWq4JmKAiHy9iGoLjAV7r/W32VgaHGkk35cUXlNOg==}
-    engines: {node: '>=18'}
-    cpu: [mips64el]
-    os: [linux]
-
   '@esbuild/linux-mips64el@0.27.2':
     resolution: {integrity: sha512-nlP2I6ArEBewvJ2gjrrkESEZkB5mIoaTswuqNFRv/WYd+ATtUpe9Y09RnJvgvdag7he0OWgEZWhviS1OTOKixw==}
     engines: {node: '>=18'}
@@ -1668,6 +1669,12 @@ packages:
     cpu: [mips64el]
     os: [linux]
 
+  '@esbuild/linux-mips64el@0.28.1':
+    resolution: {integrity: sha512-mRObBZeHh2OxcBFPWE/FjylkRgZdYuiTR3vaTozquCGOH14iP9oN4x4Ge81CoIDYQrXmIxpFumJBu5MtZpnQJQ==}
+    engines: {node: '>=18'}
+    cpu: [mips64el]
+    os: [linux]
+
   '@esbuild/linux-ppc64@0.21.5':
     resolution: {integrity: sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==}
     engines: {node: '>=12'}
@@ -1680,12 +1687,6 @@ packages:
     cpu: [ppc64]
     os: [linux]
 
-  '@esbuild/linux-ppc64@0.27.0':
-    resolution: {integrity: sha512-z9N10FBD0DCS2dmSABDBb5TLAyF1/ydVb+N4pi88T45efQ/w4ohr/F/QYCkxDPnkhkp6AIpIcQKQ8F0ANoA2JA==}
-    engines: {node: '>=18'}
-    cpu: [ppc64]
-    os: [linux]
-
   '@esbuild/linux-ppc64@0.27.2':
     resolution: {integrity: sha512-C92gnpey7tUQONqg1n6dKVbx3vphKtTHJaNG2Ok9lGwbZil6DrfyecMsp9CrmXGQJmZ7iiVXvvZH6Ml5hL6XdQ==}
     engines: {node: '>=18'}
@@ -1698,6 +1699,12 @@ packages:
     cpu: [ppc64]
     os: [linux]
 
+  '@esbuild/linux-ppc64@0.28.1':
+    resolution: {integrity: sha512-slScBsMAb3GFDcdrCgLwZtPYRoH2H/youv10QiZyRjmsP48fznoveWytSgCI/R0ZcUgpc0ZhIUEx6LHts8yrfQ==}
+    engines: {node: '>=18'}
+    cpu: [ppc64]
+    os: [linux]
+
   '@esbuild/linux-riscv64@0.21.5':
     resolution: {integrity: sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==}
     engines: {node: '>=12'}
@@ -1710,12 +1717,6 @@ packages:
     cpu: [riscv64]
     os: [linux]
 
-  '@esbuild/linux-riscv64@0.27.0':
-    resolution: {integrity: sha512-pQdyAIZ0BWIC5GyvVFn5awDiO14TkT/19FTmFcPdDec94KJ1uZcmFs21Fo8auMXzD4Tt+diXu1LW1gHus9fhFQ==}
-    engines: {node: '>=18'}
-    cpu: [riscv64]
-    os: [linux]
-
   '@esbuild/linux-riscv64@0.27.2':
     resolution: {integrity: sha512-B5BOmojNtUyN8AXlK0QJyvjEZkWwy/FKvakkTDCziX95AowLZKR6aCDhG7LeF7uMCXEJqwa8Bejz5LTPYm8AvA==}
     engines: {node: '>=18'}
@@ -1728,6 +1729,12 @@ packages:
     cpu: [riscv64]
     os: [linux]
 
+  '@esbuild/linux-riscv64@0.28.1':
+    resolution: {integrity: sha512-kw0owk1o0GFETUJyW0jc0G4Yzs0BHZn0JDZ8JRT088vjJYX777BAs1fDGxAC+q831qOs2DTC96mNsG2opdfyyQ==}
+    engines: {node: '>=18'}
+    cpu: [riscv64]
+    os: [linux]
+
   '@esbuild/linux-s390x@0.21.5':
     resolution: {integrity: sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==}
     engines: {node: '>=12'}
@@ -1740,12 +1747,6 @@ packages:
     cpu: [s390x]
     os: [linux]
 
-  '@esbuild/linux-s390x@0.27.0':
-    resolution: {integrity: sha512-hPlRWR4eIDDEci953RI1BLZitgi5uqcsjKMxwYfmi4LcwyWo2IcRP+lThVnKjNtk90pLS8nKdroXYOqW+QQH+w==}
-    engines: {node: '>=18'}
-    cpu: [s390x]
-    os: [linux]
-
   '@esbuild/linux-s390x@0.27.2':
     resolution: {integrity: sha512-p4bm9+wsPwup5Z8f4EpfN63qNagQ47Ua2znaqGH6bqLlmJ4bx97Y9JdqxgGZ6Y8xVTixUnEkoKSHcpRlDnNr5w==}
     engines: {node: '>=18'}
@@ -1758,6 +1759,12 @@ packages:
     cpu: [s390x]
     os: [linux]
 
+  '@esbuild/linux-s390x@0.28.1':
+    resolution: {integrity: sha512-/lAIjX8aYFRByhh6L5rYtPEDRqa9de/4V/juOXcta5frjvzXO4/sqEtyytse0g3zZFuWu5cDN0MkLz2qRDD2Ag==}
+    engines: {node: '>=18'}
+    cpu: [s390x]
+    os: [linux]
+
   '@esbuild/linux-x64@0.21.5':
     resolution: {integrity: sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==}
     engines: {node: '>=12'}
@@ -1770,12 +1777,6 @@ packages:
     cpu: [x64]
     os: [linux]
 
-  '@esbuild/linux-x64@0.27.0':
-    resolution: {integrity: sha512-1hBWx4OUJE2cab++aVZ7pObD6s+DK4mPGpemtnAORBvb5l/g5xFGk0vc0PjSkrDs0XaXj9yyob3d14XqvnQ4gw==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [linux]
-
   '@esbuild/linux-x64@0.27.2':
     resolution: {integrity: sha512-uwp2Tip5aPmH+NRUwTcfLb+W32WXjpFejTIOWZFw/v7/KnpCDKG66u4DLcurQpiYTiYwQ9B7KOeMJvLCu/OvbA==}
     engines: {node: '>=18'}
@@ -1788,18 +1789,18 @@ packages:
     cpu: [x64]
     os: [linux]
 
+  '@esbuild/linux-x64@0.28.1':
+    resolution: {integrity: sha512-u/anNYF2mmVOEDwLtnQ1wOr3EZ9sTNGLWrsYGYwHWzGA3Si84IOkHXlbWTD1NB+9/1lcnweYKO54uhxZydNzfA==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [linux]
+
   '@esbuild/netbsd-arm64@0.25.12':
     resolution: {integrity: sha512-xXwcTq4GhRM7J9A8Gv5boanHhRa/Q9KLVmcyXHCTaM4wKfIpWkdXiMog/KsnxzJ0A1+nD+zoecuzqPmCRyBGjg==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [netbsd]
 
-  '@esbuild/netbsd-arm64@0.27.0':
-    resolution: {integrity: sha512-6m0sfQfxfQfy1qRuecMkJlf1cIzTOgyaeXaiVaaki8/v+WB+U4hc6ik15ZW6TAllRlg/WuQXxWj1jx6C+dfy3w==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [netbsd]
-
   '@esbuild/netbsd-arm64@0.27.2':
     resolution: {integrity: sha512-Kj6DiBlwXrPsCRDeRvGAUb/LNrBASrfqAIok+xB0LxK8CHqxZ037viF13ugfsIpePH93mX7xfJp97cyDuTZ3cw==}
     engines: {node: '>=18'}
@@ -1812,6 +1813,12 @@ packages:
     cpu: [arm64]
     os: [netbsd]
 
+  '@esbuild/netbsd-arm64@0.28.1':
+    resolution: {integrity: sha512-oks0DYbLwWMmaakTsCb+zL4E+aHRVLom9IJZOAthMQEPiQmydXHkziYEsGYRx0uNV/IjEKGAV941JzH02pflqw==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [netbsd]
+
   '@esbuild/netbsd-x64@0.21.5':
     resolution: {integrity: sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==}
     engines: {node: '>=12'}
@@ -1824,12 +1831,6 @@ packages:
     cpu: [x64]
     os: [netbsd]
 
-  '@esbuild/netbsd-x64@0.27.0':
-    resolution: {integrity: sha512-xbbOdfn06FtcJ9d0ShxxvSn2iUsGd/lgPIO2V3VZIPDbEaIj1/3nBBe1AwuEZKXVXkMmpr6LUAgMkLD/4D2PPA==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [netbsd]
-
   '@esbuild/netbsd-x64@0.27.2':
     resolution: {integrity: sha512-HwGDZ0VLVBY3Y+Nw0JexZy9o/nUAWq9MlV7cahpaXKW6TOzfVno3y3/M8Ga8u8Yr7GldLOov27xiCnqRZf0tCA==}
     engines: {node: '>=18'}
@@ -1842,18 +1843,18 @@ packages:
     cpu: [x64]
     os: [netbsd]
 
+  '@esbuild/netbsd-x64@0.28.1':
+    resolution: {integrity: sha512-aeL6lAnN89Hz43Mlh1G8ARasbuoYvSITDEx0tHh5b7jJnHcssqgjy9Yx430GDpmCa6OyrKoS0aNRjKundRizGg==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [netbsd]
+
   '@esbuild/openbsd-arm64@0.25.12':
     resolution: {integrity: sha512-fF96T6KsBo/pkQI950FARU9apGNTSlZGsv1jZBAlcLL1MLjLNIWPBkj5NlSz8aAzYKg+eNqknrUJ24QBybeR5A==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [openbsd]
 
-  '@esbuild/openbsd-arm64@0.27.0':
-    resolution: {integrity: sha512-fWgqR8uNbCQ/GGv0yhzttj6sU/9Z5/Sv/VGU3F5OuXK6J6SlriONKrQ7tNlwBrJZXRYk5jUhuWvF7GYzGguBZQ==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [openbsd]
-
   '@esbuild/openbsd-arm64@0.27.2':
     resolution: {integrity: sha512-DNIHH2BPQ5551A7oSHD0CKbwIA/Ox7+78/AWkbS5QoRzaqlev2uFayfSxq68EkonB+IKjiuxBFoV8ESJy8bOHA==}
     engines: {node: '>=18'}
@@ -1866,6 +1867,12 @@ packages:
     cpu: [arm64]
     os: [openbsd]
 
+  '@esbuild/openbsd-arm64@0.28.1':
+    resolution: {integrity: sha512-MEFJe5C3R8pwXdZ5Y21oo6m7ePiS0d9pWucn99O/wvyJZChoIQKrQDxKrGeW8F5+T0okTHesAmDeiHDTIq0V/Q==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [openbsd]
+
   '@esbuild/openbsd-x64@0.21.5':
     resolution: {integrity: sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==}
     engines: {node: '>=12'}
@@ -1878,12 +1885,6 @@ packages:
     cpu: [x64]
     os: [openbsd]
 
-  '@esbuild/openbsd-x64@0.27.0':
-    resolution: {integrity: sha512-aCwlRdSNMNxkGGqQajMUza6uXzR/U0dIl1QmLjPtRbLOx3Gy3otfFu/VjATy4yQzo9yFDGTxYDo1FfAD9oRD2A==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [openbsd]
-
   '@esbuild/openbsd-x64@0.27.2':
     resolution: {integrity: sha512-/it7w9Nb7+0KFIzjalNJVR5bOzA9Vay+yIPLVHfIQYG/j+j9VTH84aNB8ExGKPU4AzfaEvN9/V4HV+F+vo8OEg==}
     engines: {node: '>=18'}
@@ -1896,18 +1897,18 @@ packages:
     cpu: [x64]
     os: [openbsd]
 
+  '@esbuild/openbsd-x64@0.28.1':
+    resolution: {integrity: sha512-i/ZLIOafE0Z8cI/XANJAixoJL/uRAoS2xOA3rb0xN+KK0K177cMAsQYkzHtBrtMXAKuAc7HGgcWiZ/sRC1Nxgw==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [openbsd]
+
   '@esbuild/openharmony-arm64@0.25.12':
     resolution: {integrity: sha512-rm0YWsqUSRrjncSXGA7Zv78Nbnw4XL6/dzr20cyrQf7ZmRcsovpcRBdhD43Nuk3y7XIoW2OxMVvwuRvk9XdASg==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [openharmony]
 
-  '@esbuild/openharmony-arm64@0.27.0':
-    resolution: {integrity: sha512-nyvsBccxNAsNYz2jVFYwEGuRRomqZ149A39SHWk4hV0jWxKM0hjBPm3AmdxcbHiFLbBSwG6SbpIcUbXjgyECfA==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [openharmony]
-
   '@esbuild/openharmony-arm64@0.27.2':
     resolution: {integrity: sha512-LRBbCmiU51IXfeXk59csuX/aSaToeG7w48nMwA6049Y4J4+VbWALAuXcs+qcD04rHDuSCSRKdmY63sruDS5qag==}
     engines: {node: '>=18'}
@@ -1920,6 +1921,12 @@ packages:
     cpu: [arm64]
     os: [openharmony]
 
+  '@esbuild/openharmony-arm64@0.28.1':
+    resolution: {integrity: sha512-ge+Z7EXFNt2BO1oAMsVpiQ8EwndV9i1xXerAeTIK7AtPs3bKFXQM7nlRxDSIUIMeueR1CNXxqztLzdNeReKBJg==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [openharmony]
+
   '@esbuild/sunos-x64@0.21.5':
     resolution: {integrity: sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==}
     engines: {node: '>=12'}
@@ -1932,12 +1939,6 @@ packages:
     cpu: [x64]
     os: [sunos]
 
-  '@esbuild/sunos-x64@0.27.0':
-    resolution: {integrity: sha512-Q1KY1iJafM+UX6CFEL+F4HRTgygmEW568YMqDA5UV97AuZSm21b7SXIrRJDwXWPzr8MGr75fUZPV67FdtMHlHA==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [sunos]
-
   '@esbuild/sunos-x64@0.27.2':
     resolution: {integrity: sha512-kMtx1yqJHTmqaqHPAzKCAkDaKsffmXkPHThSfRwZGyuqyIeBvf08KSsYXl+abf5HDAPMJIPnbBfXvP2ZC2TfHg==}
     engines: {node: '>=18'}
@@ -1950,6 +1951,12 @@ packages:
     cpu: [x64]
     os: [sunos]
 
+  '@esbuild/sunos-x64@0.28.1':
+    resolution: {integrity: sha512-BEjgtECkL3vY+SaSQ6nzVfiALUeFxpawyp8Jmf5PtYhf1Ug40N1h/hxlhts+f1FvSvarEigdxS3BlSMI2PJLcQ==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [sunos]
+
   '@esbuild/win32-arm64@0.21.5':
     resolution: {integrity: sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==}
     engines: {node: '>=12'}
@@ -1962,12 +1969,6 @@ packages:
     cpu: [arm64]
     os: [win32]
 
-  '@esbuild/win32-arm64@0.27.0':
-    resolution: {integrity: sha512-W1eyGNi6d+8kOmZIwi/EDjrL9nxQIQ0MiGqe/AWc6+IaHloxHSGoeRgDRKHFISThLmsewZ5nHFvGFWdBYlgKPg==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [win32]
-
   '@esbuild/win32-arm64@0.27.2':
     resolution: {integrity: sha512-Yaf78O/B3Kkh+nKABUF++bvJv5Ijoy9AN1ww904rOXZFLWVc5OLOfL56W+C8F9xn5JQZa3UX6m+IktJnIb1Jjg==}
     engines: {node: '>=18'}
@@ -1980,6 +1981,12 @@ packages:
     cpu: [arm64]
     os: [win32]
 
+  '@esbuild/win32-arm64@0.28.1':
+    resolution: {integrity: sha512-lCv9eK/H6ZJWbE7bh2nw54CZ9M2nupBxJcTsdk/QQnWkdSjKGuxmmH8/GWrlT1eMmZfn4dGcCjRte397WqfQXA==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [win32]
+
   '@esbuild/win32-ia32@0.21.5':
     resolution: {integrity: sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==}
     engines: {node: '>=12'}
@@ -1992,12 +1999,6 @@ packages:
     cpu: [ia32]
     os: [win32]
 
-  '@esbuild/win32-ia32@0.27.0':
-    resolution: {integrity: sha512-30z1aKL9h22kQhilnYkORFYt+3wp7yZsHWus+wSKAJR8JtdfI76LJ4SBdMsCopTR3z/ORqVu5L1vtnHZWVj4cQ==}
-    engines: {node: '>=18'}
-    cpu: [ia32]
-    os: [win32]
-
   '@esbuild/win32-ia32@0.27.2':
     resolution: {integrity: sha512-Iuws0kxo4yusk7sw70Xa2E2imZU5HoixzxfGCdxwBdhiDgt9vX9VUCBhqcwY7/uh//78A1hMkkROMJq9l27oLQ==}
     engines: {node: '>=18'}
@@ -2010,6 +2011,12 @@ packages:
     cpu: [ia32]
     os: [win32]
 
+  '@esbuild/win32-ia32@0.28.1':
+    resolution: {integrity: sha512-zvb/mB2bSCoJOpoCBgYKKpX6YM6mJBlBUVUtVj41DlZJVEB6/0CKlRYxP5wWl1C1ILiCoAU5wZZ4q1P3qeS6Eg==}
+    engines: {node: '>=18'}
+    cpu: [ia32]
+    os: [win32]
+
   '@esbuild/win32-x64@0.21.5':
     resolution: {integrity: sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==}
     engines: {node: '>=12'}
@@ -2022,12 +2029,6 @@ packages:
     cpu: [x64]
     os: [win32]
 
-  '@esbuild/win32-x64@0.27.0':
-    resolution: {integrity: sha512-aIitBcjQeyOhMTImhLZmtxfdOcuNRpwlPNmlFKPcHQYPhEssw75Cl1TSXJXpMkzaua9FUetx/4OQKq7eJul5Cg==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [win32]
-
   '@esbuild/win32-x64@0.27.2':
     resolution: {integrity: sha512-sRdU18mcKf7F+YgheI/zGf5alZatMUTKj/jNS6l744f9u3WFu4v7twcUI9vu4mknF4Y9aDlblIie0IM+5xxaqQ==}
     engines: {node: '>=18'}
@@ -2040,6 +2041,12 @@ packages:
     cpu: [x64]
     os: [win32]
 
+  '@esbuild/win32-x64@0.28.1':
+    resolution: {integrity: sha512-bm4Mowrv+GXMlpWX++EcXw/iLyd1o3+bJkC2DkWXYVvgZCqD/bSj9ctZeAMC3cIxgjRVR2Dufaiu4YPxr5gW1A==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [win32]
+
   '@eslint-community/eslint-utils@4.9.1':
     resolution: {integrity: sha512-phrYmNiYppR7znFEdqgfWHXR6NCkZEK7hwWDHZUjit/2/U0r6XvkDl0SYnoM51Hq7FhCGdLDT6zxCCOY1hexsQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -2207,6 +2214,10 @@ packages:
     resolution: {integrity: sha512-A5P/LfWGFSl6nsckYtjw9da+19jB8hkJ6ACTGcDfEJ0aE+l2n2El7dsVM7UVHZQ9s2lmYMWlrS21YLy2IR1LUw==}
     engines: {node: '>=18'}
 
+  '@img/colour@1.1.0':
+    resolution: {integrity: sha512-Td76q7j57o/tLVdgS746cYARfSyxk8iEfRxewL9h4OMzYhbW4TAcppl0mT4eyqXddh6L/jwoM75mo7ixa/pCeQ==}
+    engines: {node: '>=18'}
+
   '@img/sharp-darwin-arm64@0.33.5':
     resolution: {integrity: sha512-UT4p+iz/2H4twwAoLCqfA9UH5pI6DggwKEGuaPy7nCVQ8ZsiY5PIcrRvD1DzuY3qYL07NtIQcWnBSY/heikIFQ==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
@@ -2219,6 +2230,12 @@ packages:
     cpu: [arm64]
     os: [darwin]
 
+  '@img/sharp-darwin-arm64@0.35.2':
+    resolution: {integrity: sha512-eEieHsMksAW4IiO5NzauESRl2D2qz3J/kwUxUrSfV06A93eEaRfMpHXyUb1mAqrR7i8U9A0GRqE9pjn6u1Jjpg==}
+    engines: {node: '>=20.9.0'}
+    cpu: [arm64]
+    os: [darwin]
+
   '@img/sharp-darwin-x64@0.33.5':
     resolution: {integrity: sha512-fyHac4jIc1ANYGRDxtiqelIbdWkIuQaI84Mv45KvGRRxSAa7o7d1ZKAOBaYbnepLC1WqxfpimdeWfvqqSGwR2Q==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
@@ -2231,6 +2248,17 @@ packages:
     cpu: [x64]
     os: [darwin]
 
+  '@img/sharp-darwin-x64@0.35.2':
+    resolution: {integrity: sha512-BaktuGPCeHJMARpodR8jK4uKiZrPAy9WrfQW0sdI37clracq8Bp01AYS3SZgi5FS/y5twa9t4+LIuuxQjqRrWw==}
+    engines: {node: '>=20.9.0'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@img/sharp-freebsd-wasm32@0.35.2':
+    resolution: {integrity: sha512-YoAxdnd8hPUkvLHd3bWY+YA8nw3xM/RyRopYucNsWHVSan8NLVM3X2volsfoRDcXdUJPg6tXahSd7HXPK7lRnw==}
+    engines: {node: '>=20.9.0'}
+    os: [freebsd]
+
   '@img/sharp-libvips-darwin-arm64@1.0.4':
     resolution: {integrity: sha512-XblONe153h0O2zuFfTAbQYAX2JhYmDHeWikp1LM9Hul9gVPjFY427k6dFEcOL72O01QxQsWi761svJ/ev9xEDg==}
     cpu: [arm64]
@@ -2241,6 +2269,11 @@ packages:
     cpu: [arm64]
     os: [darwin]
 
+  '@img/sharp-libvips-darwin-arm64@1.3.1':
+    resolution: {integrity: sha512-4V/M3roRMTYjiwZY9IOVQOE8OyeCxFAkYmyZDrZl51uOKjibm3oeEJ4WAmLxutAfzFbC9jqUiPs2gbnGflH+7g==}
+    cpu: [arm64]
+    os: [darwin]
+
   '@img/sharp-libvips-darwin-x64@1.0.4':
     resolution: {integrity: sha512-xnGR8YuZYfJGmWPvmlunFaWJsb9T/AO2ykoP3Fz/0X5XV2aoYBPkX6xqCQvUTKKiLddarLaxpzNe+b1hjeWHAQ==}
     cpu: [x64]
@@ -2251,6 +2284,11 @@ packages:
     cpu: [x64]
     os: [darwin]
 
+  '@img/sharp-libvips-darwin-x64@1.3.1':
+    resolution: {integrity: sha512-c0/DxItpJv2+dGhgycJBBgotdqruGYDvA79drdh0MD1dFpy7JzJ/PlXwi1H4rFf0eTy8tgbI91aHDnZIceY3jQ==}
+    cpu: [x64]
+    os: [darwin]
+
   '@img/sharp-libvips-linux-arm64@1.0.4':
     resolution: {integrity: sha512-9B+taZ8DlyyqzZQnoeIvDVR/2F4EbMepXMc/NdVbkzsJbzkUjhXv/70GQJ7tdLA4YJgNP25zukcxpX2/SueNrA==}
     cpu: [arm64]
@@ -2263,6 +2301,12 @@ packages:
     os: [linux]
     libc: [glibc]
 
+  '@img/sharp-libvips-linux-arm64@1.3.1':
+    resolution: {integrity: sha512-JznefmcK9j1JKPz8AkQDh89kjojubyfOasWBPKfzMIhPwsgDy9evpE/naJTXXXmghS1iFwR8u/kTwh/I2/+GCw==}
+    cpu: [arm64]
+    os: [linux]
+    libc: [glibc]
+
   '@img/sharp-libvips-linux-arm@1.0.5':
     resolution: {integrity: sha512-gvcC4ACAOPRNATg/ov8/MnbxFDJqf/pDePbBnuBDcjsI8PssmjoKMAz4LtLaVi+OnSb5FK/yIOamqDwGmXW32g==}
     cpu: [arm]
@@ -2275,18 +2319,36 @@ packages:
     os: [linux]
     libc: [glibc]
 
+  '@img/sharp-libvips-linux-arm@1.3.1':
+    resolution: {integrity: sha512-aGGy9aWzXgHBG7HNyQPWorZthlp7+x6fDRoPAQbGO3ThcttuTyKIx3NuSHb6zb4gBNq6/yNn9f1cy9nFKS/Vmg==}
+    cpu: [arm]
+    os: [linux]
+    libc: [glibc]
+
   '@img/sharp-libvips-linux-ppc64@1.2.4':
     resolution: {integrity: sha512-FMuvGijLDYG6lW+b/UvyilUWu5Ayu+3r2d1S8notiGCIyYU/76eig1UfMmkZ7vwgOrzKzlQbFSuQfgm7GYUPpA==}
     cpu: [ppc64]
     os: [linux]
     libc: [glibc]
 
+  '@img/sharp-libvips-linux-ppc64@1.3.1':
+    resolution: {integrity: sha512-1EkwGNCZk6iWNCMWqrvdJ+r1j0PT1zIz60CNPhYnJlK/zyeWqlsPZIe+ocBVqPF8k/Ssee/NCk+tE9Ryrko6ng==}
+    cpu: [ppc64]
+    os: [linux]
+    libc: [glibc]
+
   '@img/sharp-libvips-linux-riscv64@1.2.4':
     resolution: {integrity: sha512-oVDbcR4zUC0ce82teubSm+x6ETixtKZBh/qbREIOcI3cULzDyb18Sr/Wcyx7NRQeQzOiHTNbZFF1UwPS2scyGA==}
     cpu: [riscv64]
     os: [linux]
     libc: [glibc]
 
+  '@img/sharp-libvips-linux-riscv64@1.3.1':
+    resolution: {integrity: sha512-Ilays+w2bXdnxzxtQdmXR62u8o8GYa3eL4+Gr+1KiE4xperMZUslRaVPJwwPkzlHEjGfXAfRVAa/7CYCtSqsBw==}
+    cpu: [riscv64]
+    os: [linux]
+    libc: [glibc]
+
   '@img/sharp-libvips-linux-s390x@1.0.4':
     resolution: {integrity: sha512-u7Wz6ntiSSgGSGcjZ55im6uvTrOxSIS8/dgoVMoiGE9I6JAfU50yH5BoDlYA1tcuGS7g/QNtetJnxA6QEsCVTA==}
     cpu: [s390x]
@@ -2299,6 +2361,12 @@ packages:
     os: [linux]
     libc: [glibc]
 
+  '@img/sharp-libvips-linux-s390x@1.3.1':
+    resolution: {integrity: sha512-VfBwVHQTbRoj4XlpA/KLZ7ltgMpz+4WSejFzQ+GnoImjo1PtEJ59QB2qR1xQEeRPYIkNrPIm2L4cICMvz4C2ew==}
+    cpu: [s390x]
+    os: [linux]
+    libc: [glibc]
+
   '@img/sharp-libvips-linux-x64@1.0.4':
     resolution: {integrity: sha512-MmWmQ3iPFZr0Iev+BAgVMb3ZyC4KeFc3jFxnNbEPas60e1cIfevbtuyf9nDGIzOaW9PdnDciJm+wFFaTlj5xYw==}
     cpu: [x64]
@@ -2311,6 +2379,12 @@ packages:
     os: [linux]
     libc: [glibc]
 
+  '@img/sharp-libvips-linux-x64@1.3.1':
+    resolution: {integrity: sha512-+c8ukgwU62DS54nCAjw7keOfHUkmr0B5QHEdcOqRnodF/MNXJbVI8Eopoj4B/0H8Asr65I+A4Amrn7a85/md6A==}
+    cpu: [x64]
+    os: [linux]
+    libc: [glibc]
+
   '@img/sharp-libvips-linuxmusl-arm64@1.0.4':
     resolution: {integrity: sha512-9Ti+BbTYDcsbp4wfYib8Ctm1ilkugkA/uscUn6UXK1ldpC1JjiXbLfFZtRlBhjPZ5o1NCLiDbg8fhUPKStHoTA==}
     cpu: [arm64]
@@ -2323,6 +2397,12 @@ packages:
     os: [linux]
     libc: [musl]
 
+  '@img/sharp-libvips-linuxmusl-arm64@1.3.1':
+    resolution: {integrity: sha512-qlKb/pwbkAi1WMsJrYHk7CuDrd12s27U2QnRhFYUoJNrRCmkosMTttuRFat/DDB3IlDm5qE1TJgZ4JDnHX8Ldw==}
+    cpu: [arm64]
+    os: [linux]
+    libc: [musl]
+
   '@img/sharp-libvips-linuxmusl-x64@1.0.4':
     resolution: {integrity: sha512-viYN1KX9m+/hGkJtvYYp+CCLgnJXwiQB39damAO7WMdKWlIhmYTfHjwSbQeUK/20vY154mwezd9HflVFM1wVSw==}
     cpu: [x64]
@@ -2335,6 +2415,12 @@ packages:
     os: [linux]
     libc: [musl]
 
+  '@img/sharp-libvips-linuxmusl-x64@1.3.1':
+    resolution: {integrity: sha512-yO21HwoUVLN8Qa+/SBjQLMYwBWAVJjeGPNe+hc0OUeMeifEtJqu5a1c4HayE1nNpDih9y3/KkoltfkDodmKAlg==}
+    cpu: [x64]
+    os: [linux]
+    libc: [musl]
+
   '@img/sharp-linux-arm64@0.33.5':
     resolution: {integrity: sha512-JMVv+AMRyGOHtO1RFBiJy/MBsgz0x4AWrT6QoEVVTyh1E39TrCUpTRI7mx9VksGX4awWASxqCYLCV4wBZHAYxA==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
@@ -2349,6 +2435,13 @@ packages:
     os: [linux]
     libc: [glibc]
 
+  '@img/sharp-linux-arm64@0.35.2':
+    resolution: {integrity: sha512-af12Pnd0ZGu2HfP8NayB0kk6eC/lrfbQE6HlR4jD+34wdJ1Vw9TF6TMn6ZvffT+WgqVsl0hRbmNvz2u/23VmwA==}
+    engines: {node: '>=20.9.0'}
+    cpu: [arm64]
+    os: [linux]
+    libc: [glibc]
+
   '@img/sharp-linux-arm@0.33.5':
     resolution: {integrity: sha512-JTS1eldqZbJxjvKaAkxhZmBqPRGmxgu+qFKSInv8moZ2AmT5Yib3EQ1c6gp493HvrvV8QgdOXdyaIBrhvFhBMQ==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
@@ -2363,6 +2456,13 @@ packages:
     os: [linux]
     libc: [glibc]
 
+  '@img/sharp-linux-arm@0.35.2':
+    resolution: {integrity: sha512-SE4kzF2mepn6z+6E7L6lsV8FzuLL6IPQdyX8ZiwROAG/G8td+hP/m7FsFPwidtrF19gvajuC9l6TxAVcsA4S7A==}
+    engines: {node: '>=20.9.0'}
+    cpu: [arm]
+    os: [linux]
+    libc: [glibc]
+
   '@img/sharp-linux-ppc64@0.34.5':
     resolution: {integrity: sha512-7zznwNaqW6YtsfrGGDA6BRkISKAAE1Jo0QdpNYXNMHu2+0dTrPflTLNkpc8l7MUP5M16ZJcUvysVWWrMefZquA==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
@@ -2370,6 +2470,13 @@ packages:
     os: [linux]
     libc: [glibc]
 
+  '@img/sharp-linux-ppc64@0.35.2':
+    resolution: {integrity: sha512-hYSBm7zcNtDCozCxQHYZJiu63b/bXsgRZuOxCIBZsStMM9Vap47iFHdbX4kCvQsblPB/k+clhELpdQJHQLSHvg==}
+    engines: {node: '>=20.9.0'}
+    cpu: [ppc64]
+    os: [linux]
+    libc: [glibc]
+
   '@img/sharp-linux-riscv64@0.34.5':
     resolution: {integrity: sha512-51gJuLPTKa7piYPaVs8GmByo7/U7/7TZOq+cnXJIHZKavIRHAP77e3N2HEl3dgiqdD/w0yUfiJnII77PuDDFdw==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
@@ -2377,6 +2484,13 @@ packages:
     os: [linux]
     libc: [glibc]
 
+  '@img/sharp-linux-riscv64@0.35.2':
+    resolution: {integrity: sha512-qQt0Kc13+Hoan/Awq/qMSQw3L+RI1NCRPgD5cUJ/1WSSmIoysLOc72jlRM3E0OHN9Yr313jgeQ2T+zW+F03QFA==}
+    engines: {node: '>=20.9.0'}
+    cpu: [riscv64]
+    os: [linux]
+    libc: [glibc]
+
   '@img/sharp-linux-s390x@0.33.5':
     resolution: {integrity: sha512-y/5PCd+mP4CA/sPDKl2961b+C9d+vPAveS33s6Z3zfASk2j5upL6fXVPZi7ztePZ5CuH+1kW8JtvxgbuXHRa4Q==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
@@ -2391,6 +2505,13 @@ packages:
     os: [linux]
     libc: [glibc]
 
+  '@img/sharp-linux-s390x@0.35.2':
+    resolution: {integrity: sha512-E4fLLfRPzDLlEeDaTzI98OFLcv++WL5ChLLMwPoVd0CIoZQqupBSNbOisPL5am9XsbQ9T84+iiMpUvbFtkunbA==}
+    engines: {node: '>=20.9.0'}
+    cpu: [s390x]
+    os: [linux]
+    libc: [glibc]
+
   '@img/sharp-linux-x64@0.33.5':
     resolution: {integrity: sha512-opC+Ok5pRNAzuvq1AG0ar+1owsu842/Ab+4qvU879ippJBHvyY5n2mxF1izXqkPYlGuP/M556uh53jRLJmzTWA==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
@@ -2405,6 +2526,13 @@ packages:
     os: [linux]
     libc: [glibc]
 
+  '@img/sharp-linux-x64@0.35.2':
+    resolution: {integrity: sha512-gi0zFJJRLswfCZmHtJdikXPOc5u7qamSOS3NHedLqLd4W8Q0NqjdBr6TTRIgsfFjqfTsHFgdfvJ9LwqSgcHiAA==}
+    engines: {node: '>=20.9.0'}
+    cpu: [x64]
+    os: [linux]
+    libc: [glibc]
+
   '@img/sharp-linuxmusl-arm64@0.33.5':
     resolution: {integrity: sha512-XrHMZwGQGvJg2V/oRSUfSAfjfPxO+4DkiRh6p2AFjLQztWUuY/o8Mq0eMQVIY7HJ1CDQUJlxGGZRw1a5bqmd1g==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
@@ -2419,6 +2547,13 @@ packages:
     os: [linux]
     libc: [musl]
 
+  '@img/sharp-linuxmusl-arm64@0.35.2':
+    resolution: {integrity: sha512-siWbOW1u6HFnFLrp0waKyW7VEf7jYvcDWdrXEFa8AkdAQgEvuu5Fz8/Y70w9EeqAdwDtfU012BhEHHaDqvQNzg==}
+    engines: {node: '>=20.9.0'}
+    cpu: [arm64]
+    os: [linux]
+    libc: [musl]
+
   '@img/sharp-linuxmusl-x64@0.33.5':
     resolution: {integrity: sha512-WT+d/cgqKkkKySYmqoZ8y3pxx7lx9vVejxW/W4DOFMYVSkErR+w7mf2u8m/y4+xHe7yY9DAXQMWQhpnMuFfScw==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
@@ -2433,6 +2568,13 @@ packages:
     os: [linux]
     libc: [musl]
 
+  '@img/sharp-linuxmusl-x64@0.35.2':
+    resolution: {integrity: sha512-YBqMMcjDi4QGYiSn4vNOYBhmlC4z5AXqkOUUqI2e0AFA4urNv4ESgOgwNl3K+4etQhha0twXlzeF20bbULm9Yg==}
+    engines: {node: '>=20.9.0'}
+    cpu: [x64]
+    os: [linux]
+    libc: [musl]
+
   '@img/sharp-wasm32@0.33.5':
     resolution: {integrity: sha512-ykUW4LVGaMcU9lu9thv85CbRMAwfeadCJHRsg2GmeRa/cJxsVY9Rbd57JcMxBkKHag5U/x7TSBpScF4U8ElVzg==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
@@ -2443,12 +2585,27 @@ packages:
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [wasm32]
 
+  '@img/sharp-wasm32@0.35.2':
+    resolution: {integrity: sha512-Mrv4JQNYVQ94xH+jzZ9r+gowleN8mv2FTgKT+PI6bx5C0G8TdNYndu161pg2i7uoBwxy2ImPMHrJOM2LZef7Bw==}
+    engines: {node: '>=20.9.0'}
+
+  '@img/sharp-webcontainers-wasm32@0.35.2':
+    resolution: {integrity: sha512-QNV27pxs9wpApEiCfvHM1RDoP1w1+2KrUWWDPEhEwg+latvOrfuhWrHWZKwdSFwU6jh3myjw/yOCRsUIuOft3g==}
+    engines: {node: '>=20.9.0'}
+    cpu: [wasm32]
+
   '@img/sharp-win32-arm64@0.34.5':
     resolution: {integrity: sha512-WQ3AgWCWYSb2yt+IG8mnC6Jdk9Whs7O0gxphblsLvdhSpSTtmu69ZG1Gkb6NuvxsNACwiPV6cNSZNzt0KPsw7g==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [arm64]
     os: [win32]
 
+  '@img/sharp-win32-arm64@0.35.2':
+    resolution: {integrity: sha512-BiVRYc/t6/Vl3e1hBx0hugG4oN9Pydf4fgMSpxTQJmwGUg/YoXTWHiFeRymHfCZzifxu4F4rpk/I67D0LQ20wQ==}
+    engines: {node: '>=20.9.0'}
+    cpu: [arm64]
+    os: [win32]
+
   '@img/sharp-win32-ia32@0.33.5':
     resolution: {integrity: sha512-T36PblLaTwuVJ/zw/LaH0PdZkRz5rd3SmMHX8GSmR7vtNSP5Z6bQkExdSK7xGWyxLw4sUknBuugTelgw2faBbQ==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
@@ -2461,6 +2618,12 @@ packages:
     cpu: [ia32]
     os: [win32]
 
+  '@img/sharp-win32-ia32@0.35.2':
+    resolution: {integrity: sha512-YYEhx9PImCC7T0tI8JDMi4DB9LwLCXCU5OWNYEXAxh5Q1ShKkyC6byxzoBJ3gEFDnH2lQckWuDe70G7mB2XJog==}
+    engines: {node: ^20.9.0}
+    cpu: [ia32]
+    os: [win32]
+
   '@img/sharp-win32-x64@0.33.5':
     resolution: {integrity: sha512-MpY/o8/8kj+EcnxwvrP4aTJSWw/aZ7JIGR4aBeZkZw5B7/Jn+tY9/VNwtcoGmdT7GfggGIU4kygOMSbYnOrAbg==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
@@ -2473,6 +2636,12 @@ packages:
     cpu: [x64]
     os: [win32]
 
+  '@img/sharp-win32-x64@0.35.2':
+    resolution: {integrity: sha512-imoOyBcoM/iiUr4J6VPpCNjPnjvP/Gks95898yB8YqoGGYmHYbOyCuNv9FMhFgtaiHFGbHW8bxKqRV6VjtXThQ==}
+    engines: {node: '>=20.9.0'}
+    cpu: [x64]
+    os: [win32]
+
   '@intercom/messenger-js-sdk@0.0.14':
     resolution: {integrity: sha512-2dH4BDAh9EI90K7hUkAdZ76W79LM45Sd1OBX7t6Vzy8twpNiQ5X+7sH9G5hlJlkSGnf+vFWlFcy9TOYAyEs1hA==}
 
@@ -6018,11 +6187,6 @@ packages:
     engines: {node: '>=18'}
     hasBin: true
 
-  esbuild@0.27.0:
-    resolution: {integrity: sha512-jd0f4NHbD6cALCyGElNpGAOtWxSq46l9X/sWB0Nzd5er4Kz2YTm+Vl0qKFT9KUJvD8+fiO8AvoHhFvEatfVixA==}
-    engines: {node: '>=18'}
-    hasBin: true
-
   esbuild@0.27.2:
     resolution: {integrity: sha512-HyNQImnsOC7X9PMNaCIeAm4ISCQXs5a5YasTXVliKv4uuBo1dKrG0A+uQS8M5eXjVMnLg3WgXaKvprHlFJQffw==}
     engines: {node: '>=18'}
@@ -6033,6 +6197,11 @@ packages:
     engines: {node: '>=18'}
     hasBin: true
 
+  esbuild@0.28.1:
+    resolution: {integrity: sha512-HrJrvZv5ayxBzPfwphOoNzkzOIIlifzk0KJrGK2c8R4+LKpMtpYLQeUdjnwjWv/LZlkH2laZk+4w78pi99D4Vw==}
+    engines: {node: '>=18'}
+    hasBin: true
+
   escalade@3.2.0:
     resolution: {integrity: sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==}
     engines: {node: '>=6'}
@@ -7586,16 +7755,16 @@ packages:
     resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==}
     engines: {node: '>=4'}
 
-  miniflare@4.20260131.0:
-    resolution: {integrity: sha512-CtObRzlAzOUpCFH+MgImykxmDNKthrgIYtC+oLC3UGpve6bGLomKUW4u4EorTvzlQFHe66/9m/+AYbBbpzG0mQ==}
-    engines: {node: '>=18.0.0'}
-    hasBin: true
-
   miniflare@4.20260212.0:
     resolution: {integrity: sha512-Lgxq83EuR2q/0/DAVOSGXhXS1V7GDB04HVggoPsenQng8sqEDR3hO4FigIw5ZI2Sv2X7kIc30NCzGHJlCFIYWg==}
     engines: {node: '>=18.0.0'}
     hasBin: true
 
+  miniflare@4.20260722.1:
+    resolution: {integrity: sha512-FJIg4omaCb2wwSyOeRosEdmVRi3JzGAOOH3pa3twmmtvWECl6BVZMIDwJbjByLKRyU+mrfk0M/n3oSiojFZvSA==}
+    engines: {node: '>=22.0.0'}
+    hasBin: true
+
   minimatch@10.1.2:
     resolution: {integrity: sha512-fu656aJ0n2kcXwsnwnv9g24tkU5uSmOlTjd6WyyaKm2Z+h1qmY6bAjrcaIxF/BslFqbZ8UBtbJi7KgQOZD2PTw==}
     engines: {node: 20 || >=22}
@@ -8832,6 +9001,11 @@ packages:
     engines: {node: '>=10'}
     hasBin: true
 
+  semver@7.8.5:
+    resolution: {integrity: sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==}
+    engines: {node: '>=10'}
+    hasBin: true
+
   send@1.2.1:
     resolution: {integrity: sha512-1gnZf7DFcoIcajTjTwjwuDjzuz4PPcY2StKPlsGAQ1+YH20IRVrBaXSWmdjowTJ6u8Rc01PoYOGHXfP1mYcZNQ==}
     engines: {node: '>= 18'}
@@ -8864,6 +9038,10 @@ packages:
     resolution: {integrity: sha512-Ou9I5Ft9WNcCbXrU9cMgPBcCK8LiwLqcbywW3t4oDV37n1pzpuNLsYiAV8eODnjbtQlSDwZ2cUEeQz4E54Hltg==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
 
+  sharp@0.35.2:
+    resolution: {integrity: sha512-FVtFjtBCMiJS6yb5CX7Sop45WFMpeGw6oRKuJnXYgf/f1ms/D7LE/ZUSNxnW7rZ/dbslQWYkoqFHGPaDBtaK4w==}
+    engines: {node: '>=20.9.0'}
+
   shebang-command@1.2.0:
     resolution: {integrity: sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==}
     engines: {node: '>=0.10.0'}
@@ -9419,6 +9597,10 @@ packages:
     resolution: {integrity: sha512-y+8YjDFzWdQlSE9N5nzKMT3g4a5UBX1HKowfdXh0uvAnTaqqwqB92Jt4UXBAeKekDs5IaDKyJFR4X1gYVCgXcw==}
     engines: {node: '>=20.18.1'}
 
+  undici@7.28.0:
+    resolution: {integrity: sha512-cRZYrTDwWznlnRiPjggAGxZXanty6M8RV1ff8Wm4LWXBp7/IG8v5DnOm74DtUBp9OONpK75YlPnIjQqX0dBDtA==}
+    engines: {node: '>=20.18.1'}
+
   unenv@2.0.0-rc.24:
     resolution: {integrity: sha512-i7qRCmY42zmCwnYlh9H2SvLEypEFGye5iRmEMKjcGi7zk9UquigRjFtTLz0TYqr0ZGLZhaMHl/foy1bZR+Cwlw==}
 
@@ -9992,8 +10174,8 @@ packages:
   vue-component-type-helpers@3.2.4:
     resolution: {integrity: sha512-05lR16HeZDcDpB23ku5b5f1fBOoHqFnMiKRr2CiEvbG5Ux4Yi0McmQBOET0dR0nxDXosxyVqv67q6CzS3AK8rw==}
 
-  vue-component-type-helpers@3.3.7:
-    resolution: {integrity: sha512-Skkhw9agYSgsWqv7bxSOGJZa9SaiJbZVGdXuFWnrzKaQYHnw9qbjD630rw6RyMqDbp54nfLCLw5SZA55if7JLg==}
+  vue-component-type-helpers@3.3.8:
+    resolution: {integrity: sha512-troqCMmQodQDqUqn63NQaFi+CDSclSe7sc8VEBFqf5GFLqmGR2Ph3P2WEC7qwpRVyEWsTi/aAr4vyOe/B1hU3g==}
 
   vue-confetti-explosion@1.0.2:
     resolution: {integrity: sha512-80OboM3/6BItIoZ6DpNcZFqGpF607kjIVc5af56oKgtFmt5yWehvJeoYhkzYlqxrqdBe0Ko4Ie3bWrmLau+dJw==}
@@ -10160,22 +10342,22 @@ packages:
     resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==}
     engines: {node: '>=0.10.0'}
 
-  workerd@1.20260131.0:
-    resolution: {integrity: sha512-4zZxOdWeActbRfydQQlj7vZ2ay01AjjNC4K3stjmWC3xZHeXeN3EAROwsWE83SZHhtw4rn18srrhtXoQvQMw3Q==}
-    engines: {node: '>=16'}
-    hasBin: true
-
   workerd@1.20260212.0:
     resolution: {integrity: sha512-4B9BoZUzKSRv3pVZGEPh7OX+Q817hpUqAUtz5O0TxJVqo4OsYJAUA/sY177Q5ha/twjT9KaJt2DtQzE+oyCOzw==}
     engines: {node: '>=16'}
     hasBin: true
 
-  wrangler@4.62.0:
-    resolution: {integrity: sha512-DogP9jifqw85g33BqwF6m21YBW5J7+Ep9IJLgr6oqHU0RkA79JMN5baeWXdmnIWZl+VZh6bmtNtR+5/Djd32tg==}
-    engines: {node: '>=20.0.0'}
+  workerd@1.20260722.1:
+    resolution: {integrity: sha512-NycKuc1x2onvsRfGGpM093vRlLFU2zHDAM0+APpccfg4+gZxDGCH27RmdDvkeBuoZyYqgLo3oAfF6re4mvC3vQ==}
+    engines: {node: '>=16'}
+    hasBin: true
+
+  wrangler@4.115.0:
+    resolution: {integrity: sha512-+upG2VW66M1sjb43yzgUZ6Ss8iYpJ6+7F3U4GF8TY5EYd+08sYdS54d24AEwCnhuef3J9KlSPusqiqR9WYy1UA==}
+    engines: {node: '>=22.0.0'}
     hasBin: true
     peerDependencies:
-      '@cloudflare/workers-types': ^4.20260131.0
+      '@cloudflare/workers-types': ^5.20260722.1
     peerDependenciesMeta:
       '@cloudflare/workers-types':
         optional: true
@@ -10229,6 +10411,18 @@ packages:
       utf-8-validate:
         optional: true
 
+  ws@8.21.0:
+    resolution: {integrity: sha512-Vsp28b7DRcimFQvrqu2Wek3z1iYxDCWqHYB8Qsnk/S4RfaCQzPGPyBNuVjJV3cd6UiKtUtp6sNM77gWvzcCH+g==}
+    engines: {node: '>=10.0.0'}
+    peerDependencies:
+      bufferutil: ^4.0.1
+      utf-8-validate: '>=5.0.2'
+    peerDependenciesMeta:
+      bufferutil:
+        optional: true
+      utf-8-validate:
+        optional: true
+
   wsl-utils@0.1.0:
     resolution: {integrity: sha512-h3Fbisa2nKGPxCpm89Hk33lBLsnaGBvctQopaBSOW/uIs6FTe1ATyAnKFJrzVs9vpGdsTe73WF3V4lIsk4Gacw==}
     engines: {node: '>=18'}
@@ -10711,11 +10905,7 @@ snapshots:
 
   '@cloudflare/kv-asset-handler@0.4.2': {}
 
-  '@cloudflare/unenv-preset@2.12.0(unenv@2.0.0-rc.24)(workerd@1.20260131.0)':
-    dependencies:
-      unenv: 2.0.0-rc.24
-    optionalDependencies:
-      workerd: 1.20260131.0
+  '@cloudflare/kv-asset-handler@0.5.0': {}
 
   '@cloudflare/unenv-preset@2.12.1(unenv@2.0.0-rc.24)(workerd@1.20260212.0)':
     dependencies:
@@ -10723,36 +10913,42 @@ snapshots:
     optionalDependencies:
       workerd: 1.20260212.0
 
-  '@cloudflare/workerd-darwin-64@1.20260131.0':
-    optional: true
+  '@cloudflare/unenv-preset@2.16.1(unenv@2.0.0-rc.24)(workerd@1.20260722.1)':
+    dependencies:
+      unenv: 2.0.0-rc.24
+    optionalDependencies:
+      workerd: 1.20260722.1
 
   '@cloudflare/workerd-darwin-64@1.20260212.0':
     optional: true
 
-  '@cloudflare/workerd-darwin-arm64@1.20260131.0':
+  '@cloudflare/workerd-darwin-64@1.20260722.1':
     optional: true
 
   '@cloudflare/workerd-darwin-arm64@1.20260212.0':
     optional: true
 
-  '@cloudflare/workerd-linux-64@1.20260131.0':
+  '@cloudflare/workerd-darwin-arm64@1.20260722.1':
     optional: true
 
   '@cloudflare/workerd-linux-64@1.20260212.0':
     optional: true
 
-  '@cloudflare/workerd-linux-arm64@1.20260131.0':
+  '@cloudflare/workerd-linux-64@1.20260722.1':
     optional: true
 
   '@cloudflare/workerd-linux-arm64@1.20260212.0':
     optional: true
 
-  '@cloudflare/workerd-windows-64@1.20260131.0':
+  '@cloudflare/workerd-linux-arm64@1.20260722.1':
     optional: true
 
   '@cloudflare/workerd-windows-64@1.20260212.0':
     optional: true
 
+  '@cloudflare/workerd-windows-64@1.20260722.1':
+    optional: true
+
   '@codemirror/autocomplete@6.20.0':
     dependencies:
       '@codemirror/language': 6.12.1
@@ -10887,6 +11083,11 @@ snapshots:
       tslib: 2.8.1
     optional: true
 
+  '@emnapi/runtime@1.11.3':
+    dependencies:
+      tslib: 2.8.1
+    optional: true
+
   '@emnapi/runtime@1.8.1':
     dependencies:
       tslib: 2.8.1
@@ -10911,259 +11112,256 @@ snapshots:
   '@esbuild/aix-ppc64@0.25.12':
     optional: true
 
-  '@esbuild/aix-ppc64@0.27.0':
-    optional: true
-
   '@esbuild/aix-ppc64@0.27.2':
     optional: true
 
   '@esbuild/aix-ppc64@0.27.3':
     optional: true
 
+  '@esbuild/aix-ppc64@0.28.1':
+    optional: true
+
   '@esbuild/android-arm64@0.21.5':
     optional: true
 
   '@esbuild/android-arm64@0.25.12':
     optional: true
 
-  '@esbuild/android-arm64@0.27.0':
-    optional: true
-
   '@esbuild/android-arm64@0.27.2':
     optional: true
 
   '@esbuild/android-arm64@0.27.3':
     optional: true
 
+  '@esbuild/android-arm64@0.28.1':
+    optional: true
+
   '@esbuild/android-arm@0.21.5':
     optional: true
 
   '@esbuild/android-arm@0.25.12':
     optional: true
 
-  '@esbuild/android-arm@0.27.0':
-    optional: true
-
   '@esbuild/android-arm@0.27.2':
     optional: true
 
   '@esbuild/android-arm@0.27.3':
     optional: true
 
+  '@esbuild/android-arm@0.28.1':
+    optional: true
+
   '@esbuild/android-x64@0.21.5':
     optional: true
 
   '@esbuild/android-x64@0.25.12':
     optional: true
 
-  '@esbuild/android-x64@0.27.0':
-    optional: true
-
   '@esbuild/android-x64@0.27.2':
     optional: true
 
   '@esbuild/android-x64@0.27.3':
     optional: true
 
+  '@esbuild/android-x64@0.28.1':
+    optional: true
+
   '@esbuild/darwin-arm64@0.21.5':
     optional: true
 
   '@esbuild/darwin-arm64@0.25.12':
     optional: true
 
-  '@esbuild/darwin-arm64@0.27.0':
-    optional: true
-
   '@esbuild/darwin-arm64@0.27.2':
     optional: true
 
   '@esbuild/darwin-arm64@0.27.3':
     optional: true
 
+  '@esbuild/darwin-arm64@0.28.1':
+    optional: true
+
   '@esbuild/darwin-x64@0.21.5':
     optional: true
 
   '@esbuild/darwin-x64@0.25.12':
     optional: true
 
-  '@esbuild/darwin-x64@0.27.0':
-    optional: true
-
   '@esbuild/darwin-x64@0.27.2':
     optional: true
 
   '@esbuild/darwin-x64@0.27.3':
     optional: true
 
+  '@esbuild/darwin-x64@0.28.1':
+    optional: true
+
   '@esbuild/freebsd-arm64@0.21.5':
     optional: true
 
   '@esbuild/freebsd-arm64@0.25.12':
     optional: true
 
-  '@esbuild/freebsd-arm64@0.27.0':
-    optional: true
-
   '@esbuild/freebsd-arm64@0.27.2':
     optional: true
 
   '@esbuild/freebsd-arm64@0.27.3':
     optional: true
 
+  '@esbuild/freebsd-arm64@0.28.1':
+    optional: true
+
   '@esbuild/freebsd-x64@0.21.5':
     optional: true
 
   '@esbuild/freebsd-x64@0.25.12':
     optional: true
 
-  '@esbuild/freebsd-x64@0.27.0':
-    optional: true
-
   '@esbuild/freebsd-x64@0.27.2':
     optional: true
 
   '@esbuild/freebsd-x64@0.27.3':
     optional: true
 
+  '@esbuild/freebsd-x64@0.28.1':
+    optional: true
+
   '@esbuild/linux-arm64@0.21.5':
     optional: true
 
   '@esbuild/linux-arm64@0.25.12':
     optional: true
 
-  '@esbuild/linux-arm64@0.27.0':
-    optional: true
-
   '@esbuild/linux-arm64@0.27.2':
     optional: true
 
   '@esbuild/linux-arm64@0.27.3':
     optional: true
 
+  '@esbuild/linux-arm64@0.28.1':
+    optional: true
+
   '@esbuild/linux-arm@0.21.5':
     optional: true
 
   '@esbuild/linux-arm@0.25.12':
     optional: true
 
-  '@esbuild/linux-arm@0.27.0':
-    optional: true
-
   '@esbuild/linux-arm@0.27.2':
     optional: true
 
   '@esbuild/linux-arm@0.27.3':
     optional: true
 
+  '@esbuild/linux-arm@0.28.1':
+    optional: true
+
   '@esbuild/linux-ia32@0.21.5':
     optional: true
 
   '@esbuild/linux-ia32@0.25.12':
     optional: true
 
-  '@esbuild/linux-ia32@0.27.0':
-    optional: true
-
   '@esbuild/linux-ia32@0.27.2':
     optional: true
 
   '@esbuild/linux-ia32@0.27.3':
     optional: true
 
+  '@esbuild/linux-ia32@0.28.1':
+    optional: true
+
   '@esbuild/linux-loong64@0.21.5':
     optional: true
 
   '@esbuild/linux-loong64@0.25.12':
     optional: true
 
-  '@esbuild/linux-loong64@0.27.0':
-    optional: true
-
   '@esbuild/linux-loong64@0.27.2':
     optional: true
 
   '@esbuild/linux-loong64@0.27.3':
     optional: true
 
+  '@esbuild/linux-loong64@0.28.1':
+    optional: true
+
   '@esbuild/linux-mips64el@0.21.5':
     optional: true
 
   '@esbuild/linux-mips64el@0.25.12':
     optional: true
 
-  '@esbuild/linux-mips64el@0.27.0':
-    optional: true
-
   '@esbuild/linux-mips64el@0.27.2':
     optional: true
 
   '@esbuild/linux-mips64el@0.27.3':
     optional: true
 
+  '@esbuild/linux-mips64el@0.28.1':
+    optional: true
+
   '@esbuild/linux-ppc64@0.21.5':
     optional: true
 
   '@esbuild/linux-ppc64@0.25.12':
     optional: true
 
-  '@esbuild/linux-ppc64@0.27.0':
-    optional: true
-
   '@esbuild/linux-ppc64@0.27.2':
     optional: true
 
   '@esbuild/linux-ppc64@0.27.3':
     optional: true
 
+  '@esbuild/linux-ppc64@0.28.1':
+    optional: true
+
   '@esbuild/linux-riscv64@0.21.5':
     optional: true
 
   '@esbuild/linux-riscv64@0.25.12':
     optional: true
 
-  '@esbuild/linux-riscv64@0.27.0':
-    optional: true
-
   '@esbuild/linux-riscv64@0.27.2':
     optional: true
 
   '@esbuild/linux-riscv64@0.27.3':
     optional: true
 
+  '@esbuild/linux-riscv64@0.28.1':
+    optional: true
+
   '@esbuild/linux-s390x@0.21.5':
     optional: true
 
   '@esbuild/linux-s390x@0.25.12':
     optional: true
 
-  '@esbuild/linux-s390x@0.27.0':
-    optional: true
-
   '@esbuild/linux-s390x@0.27.2':
     optional: true
 
   '@esbuild/linux-s390x@0.27.3':
     optional: true
 
+  '@esbuild/linux-s390x@0.28.1':
+    optional: true
+
   '@esbuild/linux-x64@0.21.5':
     optional: true
 
   '@esbuild/linux-x64@0.25.12':
     optional: true
 
-  '@esbuild/linux-x64@0.27.0':
-    optional: true
-
   '@esbuild/linux-x64@0.27.2':
     optional: true
 
   '@esbuild/linux-x64@0.27.3':
     optional: true
 
-  '@esbuild/netbsd-arm64@0.25.12':
+  '@esbuild/linux-x64@0.28.1':
     optional: true
 
-  '@esbuild/netbsd-arm64@0.27.0':
+  '@esbuild/netbsd-arm64@0.25.12':
     optional: true
 
   '@esbuild/netbsd-arm64@0.27.2':
@@ -11172,25 +11370,25 @@ snapshots:
   '@esbuild/netbsd-arm64@0.27.3':
     optional: true
 
+  '@esbuild/netbsd-arm64@0.28.1':
+    optional: true
+
   '@esbuild/netbsd-x64@0.21.5':
     optional: true
 
   '@esbuild/netbsd-x64@0.25.12':
     optional: true
 
-  '@esbuild/netbsd-x64@0.27.0':
-    optional: true
-
   '@esbuild/netbsd-x64@0.27.2':
     optional: true
 
   '@esbuild/netbsd-x64@0.27.3':
     optional: true
 
-  '@esbuild/openbsd-arm64@0.25.12':
+  '@esbuild/netbsd-x64@0.28.1':
     optional: true
 
-  '@esbuild/openbsd-arm64@0.27.0':
+  '@esbuild/openbsd-arm64@0.25.12':
     optional: true
 
   '@esbuild/openbsd-arm64@0.27.2':
@@ -11199,25 +11397,25 @@ snapshots:
   '@esbuild/openbsd-arm64@0.27.3':
     optional: true
 
+  '@esbuild/openbsd-arm64@0.28.1':
+    optional: true
+
   '@esbuild/openbsd-x64@0.21.5':
     optional: true
 
   '@esbuild/openbsd-x64@0.25.12':
     optional: true
 
-  '@esbuild/openbsd-x64@0.27.0':
-    optional: true
-
   '@esbuild/openbsd-x64@0.27.2':
     optional: true
 
   '@esbuild/openbsd-x64@0.27.3':
     optional: true
 
-  '@esbuild/openharmony-arm64@0.25.12':
+  '@esbuild/openbsd-x64@0.28.1':
     optional: true
 
-  '@esbuild/openharmony-arm64@0.27.0':
+  '@esbuild/openharmony-arm64@0.25.12':
     optional: true
 
   '@esbuild/openharmony-arm64@0.27.2':
@@ -11226,66 +11424,69 @@ snapshots:
   '@esbuild/openharmony-arm64@0.27.3':
     optional: true
 
+  '@esbuild/openharmony-arm64@0.28.1':
+    optional: true
+
   '@esbuild/sunos-x64@0.21.5':
     optional: true
 
   '@esbuild/sunos-x64@0.25.12':
     optional: true
 
-  '@esbuild/sunos-x64@0.27.0':
-    optional: true
-
   '@esbuild/sunos-x64@0.27.2':
     optional: true
 
   '@esbuild/sunos-x64@0.27.3':
     optional: true
 
+  '@esbuild/sunos-x64@0.28.1':
+    optional: true
+
   '@esbuild/win32-arm64@0.21.5':
     optional: true
 
   '@esbuild/win32-arm64@0.25.12':
     optional: true
 
-  '@esbuild/win32-arm64@0.27.0':
-    optional: true
-
   '@esbuild/win32-arm64@0.27.2':
     optional: true
 
   '@esbuild/win32-arm64@0.27.3':
     optional: true
 
+  '@esbuild/win32-arm64@0.28.1':
+    optional: true
+
   '@esbuild/win32-ia32@0.21.5':
     optional: true
 
   '@esbuild/win32-ia32@0.25.12':
     optional: true
 
-  '@esbuild/win32-ia32@0.27.0':
-    optional: true
-
   '@esbuild/win32-ia32@0.27.2':
     optional: true
 
   '@esbuild/win32-ia32@0.27.3':
     optional: true
 
+  '@esbuild/win32-ia32@0.28.1':
+    optional: true
+
   '@esbuild/win32-x64@0.21.5':
     optional: true
 
   '@esbuild/win32-x64@0.25.12':
     optional: true
 
-  '@esbuild/win32-x64@0.27.0':
-    optional: true
-
   '@esbuild/win32-x64@0.27.2':
     optional: true
 
   '@esbuild/win32-x64@0.27.3':
     optional: true
 
+  '@esbuild/win32-x64@0.28.1':
+    optional: true
+
   '@eslint-community/eslint-utils@4.9.1(eslint@9.39.2(jiti@1.21.7))':
     dependencies:
       eslint: 9.39.2(jiti@1.21.7)
@@ -11298,6 +11499,12 @@ snapshots:
 
   '@eslint-community/regexpp@4.12.2': {}
 
+  '@eslint/compat@1.4.1(eslint@9.39.2(jiti@1.21.7))':
+    dependencies:
+      '@eslint/core': 0.17.0
+    optionalDependencies:
+      eslint: 9.39.2(jiti@1.21.7)
+
   '@eslint/compat@1.4.1(eslint@9.39.2(jiti@2.6.1))':
     dependencies:
       '@eslint/core': 0.17.0
@@ -11477,6 +11684,8 @@ snapshots:
 
   '@img/colour@1.0.0': {}
 
+  '@img/colour@1.1.0': {}
+
   '@img/sharp-darwin-arm64@0.33.5':
     optionalDependencies:
       '@img/sharp-libvips-darwin-arm64': 1.0.4
@@ -11487,6 +11696,11 @@ snapshots:
       '@img/sharp-libvips-darwin-arm64': 1.2.4
     optional: true
 
+  '@img/sharp-darwin-arm64@0.35.2':
+    optionalDependencies:
+      '@img/sharp-libvips-darwin-arm64': 1.3.1
+    optional: true
+
   '@img/sharp-darwin-x64@0.33.5':
     optionalDependencies:
       '@img/sharp-libvips-darwin-x64': 1.0.4
@@ -11497,60 +11711,100 @@ snapshots:
       '@img/sharp-libvips-darwin-x64': 1.2.4
     optional: true
 
+  '@img/sharp-darwin-x64@0.35.2':
+    optionalDependencies:
+      '@img/sharp-libvips-darwin-x64': 1.3.1
+    optional: true
+
+  '@img/sharp-freebsd-wasm32@0.35.2':
+    dependencies:
+      '@img/sharp-wasm32': 0.35.2
+    optional: true
+
   '@img/sharp-libvips-darwin-arm64@1.0.4':
     optional: true
 
   '@img/sharp-libvips-darwin-arm64@1.2.4':
     optional: true
 
+  '@img/sharp-libvips-darwin-arm64@1.3.1':
+    optional: true
+
   '@img/sharp-libvips-darwin-x64@1.0.4':
     optional: true
 
   '@img/sharp-libvips-darwin-x64@1.2.4':
     optional: true
 
+  '@img/sharp-libvips-darwin-x64@1.3.1':
+    optional: true
+
   '@img/sharp-libvips-linux-arm64@1.0.4':
     optional: true
 
   '@img/sharp-libvips-linux-arm64@1.2.4':
     optional: true
 
+  '@img/sharp-libvips-linux-arm64@1.3.1':
+    optional: true
+
   '@img/sharp-libvips-linux-arm@1.0.5':
     optional: true
 
   '@img/sharp-libvips-linux-arm@1.2.4':
     optional: true
 
+  '@img/sharp-libvips-linux-arm@1.3.1':
+    optional: true
+
   '@img/sharp-libvips-linux-ppc64@1.2.4':
     optional: true
 
+  '@img/sharp-libvips-linux-ppc64@1.3.1':
+    optional: true
+
   '@img/sharp-libvips-linux-riscv64@1.2.4':
     optional: true
 
+  '@img/sharp-libvips-linux-riscv64@1.3.1':
+    optional: true
+
   '@img/sharp-libvips-linux-s390x@1.0.4':
     optional: true
 
   '@img/sharp-libvips-linux-s390x@1.2.4':
     optional: true
 
+  '@img/sharp-libvips-linux-s390x@1.3.1':
+    optional: true
+
   '@img/sharp-libvips-linux-x64@1.0.4':
     optional: true
 
   '@img/sharp-libvips-linux-x64@1.2.4':
     optional: true
 
+  '@img/sharp-libvips-linux-x64@1.3.1':
+    optional: true
+
   '@img/sharp-libvips-linuxmusl-arm64@1.0.4':
     optional: true
 
   '@img/sharp-libvips-linuxmusl-arm64@1.2.4':
     optional: true
 
+  '@img/sharp-libvips-linuxmusl-arm64@1.3.1':
+    optional: true
+
   '@img/sharp-libvips-linuxmusl-x64@1.0.4':
     optional: true
 
   '@img/sharp-libvips-linuxmusl-x64@1.2.4':
     optional: true
 
+  '@img/sharp-libvips-linuxmusl-x64@1.3.1':
+    optional: true
+
   '@img/sharp-linux-arm64@0.33.5':
     optionalDependencies:
       '@img/sharp-libvips-linux-arm64': 1.0.4
@@ -11561,6 +11815,11 @@ snapshots:
       '@img/sharp-libvips-linux-arm64': 1.2.4
     optional: true
 
+  '@img/sharp-linux-arm64@0.35.2':
+    optionalDependencies:
+      '@img/sharp-libvips-linux-arm64': 1.3.1
+    optional: true
+
   '@img/sharp-linux-arm@0.33.5':
     optionalDependencies:
       '@img/sharp-libvips-linux-arm': 1.0.5
@@ -11571,16 +11830,31 @@ snapshots:
       '@img/sharp-libvips-linux-arm': 1.2.4
     optional: true
 
+  '@img/sharp-linux-arm@0.35.2':
+    optionalDependencies:
+      '@img/sharp-libvips-linux-arm': 1.3.1
+    optional: true
+
   '@img/sharp-linux-ppc64@0.34.5':
     optionalDependencies:
       '@img/sharp-libvips-linux-ppc64': 1.2.4
     optional: true
 
+  '@img/sharp-linux-ppc64@0.35.2':
+    optionalDependencies:
+      '@img/sharp-libvips-linux-ppc64': 1.3.1
+    optional: true
+
   '@img/sharp-linux-riscv64@0.34.5':
     optionalDependencies:
       '@img/sharp-libvips-linux-riscv64': 1.2.4
     optional: true
 
+  '@img/sharp-linux-riscv64@0.35.2':
+    optionalDependencies:
+      '@img/sharp-libvips-linux-riscv64': 1.3.1
+    optional: true
+
   '@img/sharp-linux-s390x@0.33.5':
     optionalDependencies:
       '@img/sharp-libvips-linux-s390x': 1.0.4
@@ -11591,6 +11865,11 @@ snapshots:
       '@img/sharp-libvips-linux-s390x': 1.2.4
     optional: true
 
+  '@img/sharp-linux-s390x@0.35.2':
+    optionalDependencies:
+      '@img/sharp-libvips-linux-s390x': 1.3.1
+    optional: true
+
   '@img/sharp-linux-x64@0.33.5':
     optionalDependencies:
       '@img/sharp-libvips-linux-x64': 1.0.4
@@ -11601,6 +11880,11 @@ snapshots:
       '@img/sharp-libvips-linux-x64': 1.2.4
     optional: true
 
+  '@img/sharp-linux-x64@0.35.2':
+    optionalDependencies:
+      '@img/sharp-libvips-linux-x64': 1.3.1
+    optional: true
+
   '@img/sharp-linuxmusl-arm64@0.33.5':
     optionalDependencies:
       '@img/sharp-libvips-linuxmusl-arm64': 1.0.4
@@ -11611,6 +11895,11 @@ snapshots:
       '@img/sharp-libvips-linuxmusl-arm64': 1.2.4
     optional: true
 
+  '@img/sharp-linuxmusl-arm64@0.35.2':
+    optionalDependencies:
+      '@img/sharp-libvips-linuxmusl-arm64': 1.3.1
+    optional: true
+
   '@img/sharp-linuxmusl-x64@0.33.5':
     optionalDependencies:
       '@img/sharp-libvips-linuxmusl-x64': 1.0.4
@@ -11621,6 +11910,11 @@ snapshots:
       '@img/sharp-libvips-linuxmusl-x64': 1.2.4
     optional: true
 
+  '@img/sharp-linuxmusl-x64@0.35.2':
+    optionalDependencies:
+      '@img/sharp-libvips-linuxmusl-x64': 1.3.1
+    optional: true
+
   '@img/sharp-wasm32@0.33.5':
     dependencies:
       '@emnapi/runtime': 1.8.1
@@ -11631,21 +11925,40 @@ snapshots:
       '@emnapi/runtime': 1.8.1
     optional: true
 
+  '@img/sharp-wasm32@0.35.2':
+    dependencies:
+      '@emnapi/runtime': 1.11.3
+    optional: true
+
+  '@img/sharp-webcontainers-wasm32@0.35.2':
+    dependencies:
+      '@img/sharp-wasm32': 0.35.2
+    optional: true
+
   '@img/sharp-win32-arm64@0.34.5':
     optional: true
 
+  '@img/sharp-win32-arm64@0.35.2':
+    optional: true
+
   '@img/sharp-win32-ia32@0.33.5':
     optional: true
 
   '@img/sharp-win32-ia32@0.34.5':
     optional: true
 
+  '@img/sharp-win32-ia32@0.35.2':
+    optional: true
+
   '@img/sharp-win32-x64@0.33.5':
     optional: true
 
   '@img/sharp-win32-x64@0.34.5':
     optional: true
 
+  '@img/sharp-win32-x64@0.35.2':
+    optional: true
+
   '@intercom/messenger-js-sdk@0.0.14': {}
 
   '@intlify/core-base@10.0.8':
@@ -11960,6 +12273,31 @@ snapshots:
       - utf-8-validate
       - vue
 
+  '@nuxt/eslint-config@0.5.7(@typescript-eslint/utils@8.54.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)':
+    dependencies:
+      '@eslint/js': 9.39.2
+      '@nuxt/eslint-plugin': 0.5.7(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+      '@stylistic/eslint-plugin': 2.13.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+      '@typescript-eslint/eslint-plugin': 8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+      '@typescript-eslint/parser': 8.54.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+      eslint: 9.39.2(jiti@1.21.7)
+      eslint-config-flat-gitignore: 0.3.0(eslint@9.39.2(jiti@1.21.7))
+      eslint-flat-config-utils: 0.4.0
+      eslint-plugin-import-x: 4.16.1(@typescript-eslint/utils@8.54.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))
+      eslint-plugin-jsdoc: 50.8.0(eslint@9.39.2(jiti@1.21.7))
+      eslint-plugin-regexp: 2.10.0(eslint@9.39.2(jiti@1.21.7))
+      eslint-plugin-unicorn: 55.0.0(eslint@9.39.2(jiti@1.21.7))
+      eslint-plugin-vue: 9.33.0(eslint@9.39.2(jiti@1.21.7))
+      globals: 15.15.0
+      local-pkg: 0.5.1
+      pathe: 1.1.2
+      vue-eslint-parser: 9.4.3(eslint@9.39.2(jiti@1.21.7))
+    transitivePeerDependencies:
+      - '@typescript-eslint/utils'
+      - eslint-import-resolver-node
+      - supports-color
+      - typescript
+
   '@nuxt/eslint-config@0.5.7(@typescript-eslint/utils@8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)':
     dependencies:
       '@eslint/js': 9.39.2
@@ -11985,6 +12323,15 @@ snapshots:
       - supports-color
       - typescript
 
+  '@nuxt/eslint-plugin@0.5.7(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)':
+    dependencies:
+      '@typescript-eslint/types': 8.54.0
+      '@typescript-eslint/utils': 8.54.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+      eslint: 9.39.2(jiti@1.21.7)
+    transitivePeerDependencies:
+      - supports-color
+      - typescript
+
   '@nuxt/eslint-plugin@0.5.7(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)':
     dependencies:
       '@typescript-eslint/types': 8.54.0
@@ -13426,9 +13773,9 @@ snapshots:
       storybook: 10.2.4(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
       ts-dedent: 2.2.0
 
-  '@storybook/builder-vite@10.2.4(esbuild@0.27.3)(rollup@4.57.1)(storybook@10.2.4(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(vite@5.4.21(@types/node@24.12.2)(lightningcss@1.32.0)(sass@1.97.3)(terser@5.46.0))':
+  '@storybook/builder-vite@10.2.4(esbuild@0.28.1)(rollup@4.57.1)(storybook@10.2.4(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(vite@5.4.21(@types/node@24.12.2)(lightningcss@1.32.0)(sass@1.97.3)(terser@5.46.0))':
     dependencies:
-      '@storybook/csf-plugin': 10.2.4(esbuild@0.27.3)(rollup@4.57.1)(storybook@10.2.4(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(vite@5.4.21(@types/node@24.12.2)(lightningcss@1.32.0)(sass@1.97.3)(terser@5.46.0))
+      '@storybook/csf-plugin': 10.2.4(esbuild@0.28.1)(rollup@4.57.1)(storybook@10.2.4(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(vite@5.4.21(@types/node@24.12.2)(lightningcss@1.32.0)(sass@1.97.3)(terser@5.46.0))
       storybook: 10.2.4(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
       ts-dedent: 2.2.0
       vite: 5.4.21(@types/node@24.12.2)(lightningcss@1.32.0)(sass@1.97.3)(terser@5.46.0)
@@ -13437,12 +13784,12 @@ snapshots:
       - rollup
       - webpack
 
-  '@storybook/csf-plugin@10.2.4(esbuild@0.27.3)(rollup@4.57.1)(storybook@10.2.4(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(vite@5.4.21(@types/node@24.12.2)(lightningcss@1.32.0)(sass@1.97.3)(terser@5.46.0))':
+  '@storybook/csf-plugin@10.2.4(esbuild@0.28.1)(rollup@4.57.1)(storybook@10.2.4(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(vite@5.4.21(@types/node@24.12.2)(lightningcss@1.32.0)(sass@1.97.3)(terser@5.46.0))':
     dependencies:
       storybook: 10.2.4(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
       unplugin: 2.3.11
     optionalDependencies:
-      esbuild: 0.27.3
+      esbuild: 0.28.1
       rollup: 4.57.1
       vite: 5.4.21(@types/node@24.12.2)(lightningcss@1.32.0)(sass@1.97.3)(terser@5.46.0)
 
@@ -13453,9 +13800,9 @@ snapshots:
       react: 19.2.4
       react-dom: 19.2.4(react@19.2.4)
 
-  '@storybook/vue3-vite@10.2.4(esbuild@0.27.3)(rollup@4.57.1)(storybook@10.2.4(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(vite@5.4.21(@types/node@24.12.2)(lightningcss@1.32.0)(sass@1.97.3)(terser@5.46.0))(vue@3.5.27(typescript@5.9.3))':
+  '@storybook/vue3-vite@10.2.4(esbuild@0.28.1)(rollup@4.57.1)(storybook@10.2.4(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(vite@5.4.21(@types/node@24.12.2)(lightningcss@1.32.0)(sass@1.97.3)(terser@5.46.0))(vue@3.5.27(typescript@5.9.3))':
     dependencies:
-      '@storybook/builder-vite': 10.2.4(esbuild@0.27.3)(rollup@4.57.1)(storybook@10.2.4(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(vite@5.4.21(@types/node@24.12.2)(lightningcss@1.32.0)(sass@1.97.3)(terser@5.46.0))
+      '@storybook/builder-vite': 10.2.4(esbuild@0.28.1)(rollup@4.57.1)(storybook@10.2.4(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(vite@5.4.21(@types/node@24.12.2)(lightningcss@1.32.0)(sass@1.97.3)(terser@5.46.0))
       '@storybook/vue3': 10.2.4(storybook@10.2.4(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(vue@3.5.27(typescript@5.9.3))
       magic-string: 0.30.21
       storybook: 10.2.4(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
@@ -13475,10 +13822,22 @@ snapshots:
       storybook: 10.2.4(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
       type-fest: 2.19.0
       vue: 3.5.27(typescript@5.9.3)
-      vue-component-type-helpers: 3.3.7
+      vue-component-type-helpers: 3.3.8
 
   '@stripe/stripe-js@7.9.0': {}
 
+  '@stylistic/eslint-plugin@2.13.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)':
+    dependencies:
+      '@typescript-eslint/utils': 8.54.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+      eslint: 9.39.2(jiti@1.21.7)
+      eslint-visitor-keys: 4.2.1
+      espree: 10.4.0
+      estraverse: 5.3.0
+      picomatch: 4.0.4
+    transitivePeerDependencies:
+      - supports-color
+      - typescript
+
   '@stylistic/eslint-plugin@2.13.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)':
     dependencies:
       '@typescript-eslint/utils': 8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
@@ -13893,6 +14252,22 @@ snapshots:
     dependencies:
       '@types/node': 24.12.2
 
+  '@typescript-eslint/eslint-plugin@8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)':
+    dependencies:
+      '@eslint-community/regexpp': 4.12.2
+      '@typescript-eslint/parser': 8.54.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+      '@typescript-eslint/scope-manager': 8.54.0
+      '@typescript-eslint/type-utils': 8.54.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+      '@typescript-eslint/utils': 8.54.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+      '@typescript-eslint/visitor-keys': 8.54.0
+      eslint: 9.39.2(jiti@1.21.7)
+      ignore: 7.0.5
+      natural-compare: 1.4.0
+      ts-api-utils: 2.4.0(typescript@5.9.3)
+      typescript: 5.9.3
+    transitivePeerDependencies:
+      - supports-color
+
   '@typescript-eslint/eslint-plugin@8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)':
     dependencies:
       '@eslint-community/regexpp': 4.12.2
@@ -13909,6 +14284,18 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@typescript-eslint/parser@8.54.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)':
+    dependencies:
+      '@typescript-eslint/scope-manager': 8.54.0
+      '@typescript-eslint/types': 8.54.0
+      '@typescript-eslint/typescript-estree': 8.54.0(typescript@5.9.3)
+      '@typescript-eslint/visitor-keys': 8.54.0
+      debug: 4.4.3
+      eslint: 9.39.2(jiti@1.21.7)
+      typescript: 5.9.3
+    transitivePeerDependencies:
+      - supports-color
+
   '@typescript-eslint/parser@8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)':
     dependencies:
       '@typescript-eslint/scope-manager': 8.54.0
@@ -13952,6 +14339,18 @@ snapshots:
     dependencies:
       typescript: 5.9.3
 
+  '@typescript-eslint/type-utils@8.54.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)':
+    dependencies:
+      '@typescript-eslint/types': 8.54.0
+      '@typescript-eslint/typescript-estree': 8.54.0(typescript@5.9.3)
+      '@typescript-eslint/utils': 8.54.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+      debug: 4.4.3
+      eslint: 9.39.2(jiti@1.21.7)
+      ts-api-utils: 2.4.0(typescript@5.9.3)
+      typescript: 5.9.3
+    transitivePeerDependencies:
+      - supports-color
+
   '@typescript-eslint/type-utils@8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)':
     dependencies:
       '@typescript-eslint/types': 8.54.0
@@ -14144,6 +14543,12 @@ snapshots:
       vite: 7.3.1(@types/node@24.12.2)(jiti@2.6.1)(lightningcss@1.32.0)(sass@1.97.3)(terser@5.46.0)(yaml@2.8.2)
       vue: 3.5.27(typescript@5.9.3)
 
+  '@vitejs/plugin-vue@6.0.4(vite@8.0.3(@types/node@24.12.2)(esbuild@0.27.3)(jiti@1.21.7)(sass@1.97.3)(terser@5.46.0)(yaml@2.8.2))(vue@3.5.27(typescript@5.9.3))':
+    dependencies:
+      '@rolldown/pluginutils': 1.0.0-rc.2
+      vite: 8.0.3(@types/node@24.12.2)(esbuild@0.27.3)(jiti@1.21.7)(sass@1.97.3)(terser@5.46.0)(yaml@2.8.2)
+      vue: 3.5.27(typescript@5.9.3)
+
   '@vitejs/plugin-vue@6.0.4(vite@8.0.3(@types/node@24.12.2)(esbuild@0.27.3)(jiti@2.6.1)(sass@1.97.3)(terser@5.46.0)(yaml@2.8.2))(vue@3.5.27(typescript@5.9.3))':
     dependencies:
       '@rolldown/pluginutils': 1.0.0-rc.2
@@ -15637,35 +16042,6 @@ snapshots:
       '@esbuild/win32-ia32': 0.25.12
       '@esbuild/win32-x64': 0.25.12
 
-  esbuild@0.27.0:
-    optionalDependencies:
-      '@esbuild/aix-ppc64': 0.27.0
-      '@esbuild/android-arm': 0.27.0
-      '@esbuild/android-arm64': 0.27.0
-      '@esbuild/android-x64': 0.27.0
-      '@esbuild/darwin-arm64': 0.27.0
-      '@esbuild/darwin-x64': 0.27.0
-      '@esbuild/freebsd-arm64': 0.27.0
-      '@esbuild/freebsd-x64': 0.27.0
-      '@esbuild/linux-arm': 0.27.0
-      '@esbuild/linux-arm64': 0.27.0
-      '@esbuild/linux-ia32': 0.27.0
-      '@esbuild/linux-loong64': 0.27.0
-      '@esbuild/linux-mips64el': 0.27.0
-      '@esbuild/linux-ppc64': 0.27.0
-      '@esbuild/linux-riscv64': 0.27.0
-      '@esbuild/linux-s390x': 0.27.0
-      '@esbuild/linux-x64': 0.27.0
-      '@esbuild/netbsd-arm64': 0.27.0
-      '@esbuild/netbsd-x64': 0.27.0
-      '@esbuild/openbsd-arm64': 0.27.0
-      '@esbuild/openbsd-x64': 0.27.0
-      '@esbuild/openharmony-arm64': 0.27.0
-      '@esbuild/sunos-x64': 0.27.0
-      '@esbuild/win32-arm64': 0.27.0
-      '@esbuild/win32-ia32': 0.27.0
-      '@esbuild/win32-x64': 0.27.0
-
   esbuild@0.27.2:
     optionalDependencies:
       '@esbuild/aix-ppc64': 0.27.2
@@ -15724,6 +16100,35 @@ snapshots:
       '@esbuild/win32-ia32': 0.27.3
       '@esbuild/win32-x64': 0.27.3
 
+  esbuild@0.28.1:
+    optionalDependencies:
+      '@esbuild/aix-ppc64': 0.28.1
+      '@esbuild/android-arm': 0.28.1
+      '@esbuild/android-arm64': 0.28.1
+      '@esbuild/android-x64': 0.28.1
+      '@esbuild/darwin-arm64': 0.28.1
+      '@esbuild/darwin-x64': 0.28.1
+      '@esbuild/freebsd-arm64': 0.28.1
+      '@esbuild/freebsd-x64': 0.28.1
+      '@esbuild/linux-arm': 0.28.1
+      '@esbuild/linux-arm64': 0.28.1
+      '@esbuild/linux-ia32': 0.28.1
+      '@esbuild/linux-loong64': 0.28.1
+      '@esbuild/linux-mips64el': 0.28.1
+      '@esbuild/linux-ppc64': 0.28.1
+      '@esbuild/linux-riscv64': 0.28.1
+      '@esbuild/linux-s390x': 0.28.1
+      '@esbuild/linux-x64': 0.28.1
+      '@esbuild/netbsd-arm64': 0.28.1
+      '@esbuild/netbsd-x64': 0.28.1
+      '@esbuild/openbsd-arm64': 0.28.1
+      '@esbuild/openbsd-x64': 0.28.1
+      '@esbuild/openharmony-arm64': 0.28.1
+      '@esbuild/sunos-x64': 0.28.1
+      '@esbuild/win32-arm64': 0.28.1
+      '@esbuild/win32-ia32': 0.28.1
+      '@esbuild/win32-x64': 0.28.1
+
   escalade@3.2.0: {}
 
   escape-html@1.0.3: {}
@@ -15734,6 +16139,12 @@ snapshots:
 
   escape-string-regexp@5.0.0: {}
 
+  eslint-config-flat-gitignore@0.3.0(eslint@9.39.2(jiti@1.21.7)):
+    dependencies:
+      '@eslint/compat': 1.4.1(eslint@9.39.2(jiti@1.21.7))
+      eslint: 9.39.2(jiti@1.21.7)
+      find-up-simple: 1.0.1
+
   eslint-config-flat-gitignore@0.3.0(eslint@9.39.2(jiti@2.6.1)):
     dependencies:
       '@eslint/compat': 1.4.1(eslint@9.39.2(jiti@2.6.1))
@@ -15755,6 +16166,23 @@ snapshots:
     optionalDependencies:
       unrs-resolver: 1.11.1
 
+  eslint-plugin-import-x@4.16.1(@typescript-eslint/utils@8.54.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7)):
+    dependencies:
+      '@typescript-eslint/types': 8.54.0
+      comment-parser: 1.4.5
+      debug: 4.4.3
+      eslint: 9.39.2(jiti@1.21.7)
+      eslint-import-context: 0.1.9(unrs-resolver@1.11.1)
+      is-glob: 4.0.3
+      minimatch: 10.1.2
+      semver: 7.7.4
+      stable-hash-x: 0.2.0
+      unrs-resolver: 1.11.1
+    optionalDependencies:
+      '@typescript-eslint/utils': 8.54.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+    transitivePeerDependencies:
+      - supports-color
+
   eslint-plugin-import-x@4.16.1(@typescript-eslint/utils@8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.2(jiti@2.6.1)):
     dependencies:
       '@typescript-eslint/types': 8.54.0
@@ -15772,6 +16200,22 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  eslint-plugin-jsdoc@50.8.0(eslint@9.39.2(jiti@1.21.7)):
+    dependencies:
+      '@es-joy/jsdoccomment': 0.50.2
+      are-docs-informative: 0.0.2
+      comment-parser: 1.4.1
+      debug: 4.4.3
+      escape-string-regexp: 4.0.0
+      eslint: 9.39.2(jiti@1.21.7)
+      espree: 10.4.0
+      esquery: 1.7.0
+      parse-imports-exports: 0.2.4
+      semver: 7.7.4
+      spdx-expression-parse: 4.0.0
+    transitivePeerDependencies:
+      - supports-color
+
   eslint-plugin-jsdoc@50.8.0(eslint@9.39.2(jiti@2.6.1)):
     dependencies:
       '@es-joy/jsdoccomment': 0.50.2
@@ -15797,6 +16241,17 @@ snapshots:
     optionalDependencies:
       eslint-config-prettier: 10.1.8(eslint@9.39.2(jiti@2.6.1))
 
+  eslint-plugin-regexp@2.10.0(eslint@9.39.2(jiti@1.21.7)):
+    dependencies:
+      '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.2(jiti@1.21.7))
+      '@eslint-community/regexpp': 4.12.2
+      comment-parser: 1.4.5
+      eslint: 9.39.2(jiti@1.21.7)
+      jsdoc-type-pratt-parser: 4.8.0
+      refa: 0.12.1
+      regexp-ast-analysis: 0.7.1
+      scslre: 0.3.0
+
   eslint-plugin-regexp@2.10.0(eslint@9.39.2(jiti@2.6.1)):
     dependencies:
       '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.2(jiti@2.6.1))
@@ -15812,21 +16267,47 @@ snapshots:
     dependencies:
       eslint: 9.39.2(jiti@2.6.1)
 
-  eslint-plugin-storybook@10.2.4(eslint@9.39.2(jiti@1.21.7))(storybook@10.2.4(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(typescript@5.9.3):
+  eslint-plugin-storybook@10.2.4(eslint@9.39.2(jiti@2.6.1))(storybook@10.2.4(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(typescript@5.9.3):
     dependencies:
-      '@typescript-eslint/utils': 8.54.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
-      eslint: 9.39.2(jiti@1.21.7)
+      '@typescript-eslint/utils': 8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
+      eslint: 9.39.2(jiti@2.6.1)
       storybook: 10.2.4(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
     transitivePeerDependencies:
       - supports-color
       - typescript
 
+  eslint-plugin-turbo@2.8.2(eslint@9.39.2(jiti@1.21.7))(turbo@2.8.2):
+    dependencies:
+      dotenv: 16.0.3
+      eslint: 9.39.2(jiti@1.21.7)
+      turbo: 2.8.2
+
   eslint-plugin-turbo@2.8.2(eslint@9.39.2(jiti@2.6.1))(turbo@2.8.2):
     dependencies:
       dotenv: 16.0.3
       eslint: 9.39.2(jiti@2.6.1)
       turbo: 2.8.2
 
+  eslint-plugin-unicorn@55.0.0(eslint@9.39.2(jiti@1.21.7)):
+    dependencies:
+      '@babel/helper-validator-identifier': 7.28.5
+      '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.2(jiti@1.21.7))
+      ci-info: 4.4.0
+      clean-regexp: 1.0.0
+      core-js-compat: 3.48.0
+      eslint: 9.39.2(jiti@1.21.7)
+      esquery: 1.7.0
+      globals: 15.15.0
+      indent-string: 4.0.0
+      is-builtin-module: 3.2.1
+      jsesc: 3.1.0
+      pluralize: 8.0.0
+      read-pkg-up: 7.0.1
+      regexp-tree: 0.1.27
+      regjsparser: 0.10.0
+      semver: 7.7.4
+      strip-indent: 3.0.0
+
   eslint-plugin-unicorn@55.0.0(eslint@9.39.2(jiti@2.6.1)):
     dependencies:
       '@babel/helper-validator-identifier': 7.28.5
@@ -15861,6 +16342,20 @@ snapshots:
       '@stylistic/eslint-plugin': 2.13.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
       '@typescript-eslint/parser': 8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
 
+  eslint-plugin-vue@9.33.0(eslint@9.39.2(jiti@1.21.7)):
+    dependencies:
+      '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.2(jiti@1.21.7))
+      eslint: 9.39.2(jiti@1.21.7)
+      globals: 13.24.0
+      natural-compare: 1.4.0
+      nth-check: 2.1.1
+      postcss-selector-parser: 6.1.2
+      semver: 7.7.4
+      vue-eslint-parser: 9.4.3(eslint@9.39.2(jiti@1.21.7))
+      xml-name-validator: 4.0.0
+    transitivePeerDependencies:
+      - supports-color
+
   eslint-plugin-vue@9.33.0(eslint@9.39.2(jiti@2.6.1)):
     dependencies:
       '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.2(jiti@2.6.1))
@@ -17713,18 +18208,6 @@ snapshots:
 
   min-indent@1.0.1: {}
 
-  miniflare@4.20260131.0:
-    dependencies:
-      '@cspotcode/source-map-support': 0.8.1
-      sharp: 0.34.5
-      undici: 7.18.2
-      workerd: 1.20260131.0
-      ws: 8.18.0
-      youch: 4.1.0-beta.10
-    transitivePeerDependencies:
-      - bufferutil
-      - utf-8-validate
-
   miniflare@4.20260212.0:
     dependencies:
       '@cspotcode/source-map-support': 0.8.1
@@ -17737,6 +18220,18 @@ snapshots:
       - bufferutil
       - utf-8-validate
 
+  miniflare@4.20260722.1:
+    dependencies:
+      '@cspotcode/source-map-support': 0.8.1
+      sharp: 0.35.2
+      undici: 7.28.0
+      workerd: 1.20260722.1
+      ws: 8.21.0
+      youch: 4.1.0-beta.10
+    transitivePeerDependencies:
+      - bufferutil
+      - utf-8-validate
+
   minimatch@10.1.2:
     dependencies:
       '@isaacs/brace-expansion': 5.0.1
@@ -19281,6 +19776,8 @@ snapshots:
 
   semver@7.7.4: {}
 
+  semver@7.8.5: {}
+
   send@1.2.1:
     dependencies:
       debug: 4.4.3
@@ -19377,6 +19874,38 @@ snapshots:
       '@img/sharp-win32-ia32': 0.34.5
       '@img/sharp-win32-x64': 0.34.5
 
+  sharp@0.35.2:
+    dependencies:
+      '@img/colour': 1.1.0
+      detect-libc: 2.1.2
+      semver: 7.8.5
+    optionalDependencies:
+      '@img/sharp-darwin-arm64': 0.35.2
+      '@img/sharp-darwin-x64': 0.35.2
+      '@img/sharp-freebsd-wasm32': 0.35.2
+      '@img/sharp-libvips-darwin-arm64': 1.3.1
+      '@img/sharp-libvips-darwin-x64': 1.3.1
+      '@img/sharp-libvips-linux-arm': 1.3.1
+      '@img/sharp-libvips-linux-arm64': 1.3.1
+      '@img/sharp-libvips-linux-ppc64': 1.3.1
+      '@img/sharp-libvips-linux-riscv64': 1.3.1
+      '@img/sharp-libvips-linux-s390x': 1.3.1
+      '@img/sharp-libvips-linux-x64': 1.3.1
+      '@img/sharp-libvips-linuxmusl-arm64': 1.3.1
+      '@img/sharp-libvips-linuxmusl-x64': 1.3.1
+      '@img/sharp-linux-arm': 0.35.2
+      '@img/sharp-linux-arm64': 0.35.2
+      '@img/sharp-linux-ppc64': 0.35.2
+      '@img/sharp-linux-riscv64': 0.35.2
+      '@img/sharp-linux-s390x': 0.35.2
+      '@img/sharp-linux-x64': 0.35.2
+      '@img/sharp-linuxmusl-arm64': 0.35.2
+      '@img/sharp-linuxmusl-x64': 0.35.2
+      '@img/sharp-webcontainers-wasm32': 0.35.2
+      '@img/sharp-win32-arm64': 0.35.2
+      '@img/sharp-win32-ia32': 0.35.2
+      '@img/sharp-win32-x64': 0.35.2
+
   shebang-command@1.2.0:
     dependencies:
       shebang-regex: 1.0.0
@@ -19952,6 +20481,8 @@ snapshots:
 
   undici@7.18.2: {}
 
+  undici@7.28.0: {}
+
   unenv@2.0.0-rc.24:
     dependencies:
       pathe: 2.0.3
@@ -20357,6 +20888,22 @@ snapshots:
       yaml: 2.8.2
     optional: true
 
+  vite@8.0.3(@types/node@24.12.2)(esbuild@0.27.3)(jiti@1.21.7)(sass@1.97.3)(terser@5.46.0)(yaml@2.8.2):
+    dependencies:
+      lightningcss: 1.32.0
+      picomatch: 4.0.4
+      postcss: 8.5.8
+      rolldown: 1.0.0-rc.12
+      tinyglobby: 0.2.15
+    optionalDependencies:
+      '@types/node': 24.12.2
+      esbuild: 0.27.3
+      fsevents: 2.3.3
+      jiti: 1.21.7
+      sass: 1.97.3
+      terser: 5.46.0
+      yaml: 2.8.2
+
   vite@8.0.3(@types/node@24.12.2)(esbuild@0.27.3)(jiti@2.6.1)(sass@1.97.3)(terser@5.46.0)(yaml@2.8.2):
     dependencies:
       lightningcss: 1.32.0
@@ -20493,7 +21040,7 @@ snapshots:
 
   vue-component-type-helpers@3.2.4: {}
 
-  vue-component-type-helpers@3.3.7: {}
+  vue-component-type-helpers@3.3.8: {}
 
   vue-confetti-explosion@1.0.2(vue@3.5.27(typescript@5.9.3)):
     dependencies:
@@ -20533,6 +21080,19 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  vue-eslint-parser@9.4.3(eslint@9.39.2(jiti@1.21.7)):
+    dependencies:
+      debug: 4.4.3
+      eslint: 9.39.2(jiti@1.21.7)
+      eslint-scope: 7.2.2
+      eslint-visitor-keys: 3.4.3
+      espree: 9.6.1
+      esquery: 1.7.0
+      lodash: 4.17.23
+      semver: 7.7.4
+    transitivePeerDependencies:
+      - supports-color
+
   vue-eslint-parser@9.4.3(eslint@9.39.2(jiti@2.6.1)):
     dependencies:
       debug: 4.4.3
@@ -20667,14 +21227,6 @@ snapshots:
 
   word-wrap@1.2.5: {}
 
-  workerd@1.20260131.0:
-    optionalDependencies:
-      '@cloudflare/workerd-darwin-64': 1.20260131.0
-      '@cloudflare/workerd-darwin-arm64': 1.20260131.0
-      '@cloudflare/workerd-linux-64': 1.20260131.0
-      '@cloudflare/workerd-linux-arm64': 1.20260131.0
-      '@cloudflare/workerd-windows-64': 1.20260131.0
-
   workerd@1.20260212.0:
     optionalDependencies:
       '@cloudflare/workerd-darwin-64': 1.20260212.0
@@ -20683,16 +21235,24 @@ snapshots:
       '@cloudflare/workerd-linux-arm64': 1.20260212.0
       '@cloudflare/workerd-windows-64': 1.20260212.0
 
-  wrangler@4.62.0:
+  workerd@1.20260722.1:
+    optionalDependencies:
+      '@cloudflare/workerd-darwin-64': 1.20260722.1
+      '@cloudflare/workerd-darwin-arm64': 1.20260722.1
+      '@cloudflare/workerd-linux-64': 1.20260722.1
+      '@cloudflare/workerd-linux-arm64': 1.20260722.1
+      '@cloudflare/workerd-windows-64': 1.20260722.1
+
+  wrangler@4.115.0:
     dependencies:
-      '@cloudflare/kv-asset-handler': 0.4.2
-      '@cloudflare/unenv-preset': 2.12.0(unenv@2.0.0-rc.24)(workerd@1.20260131.0)
+      '@cloudflare/kv-asset-handler': 0.5.0
+      '@cloudflare/unenv-preset': 2.16.1(unenv@2.0.0-rc.24)(workerd@1.20260722.1)
       blake3-wasm: 2.1.5
-      esbuild: 0.27.0
-      miniflare: 4.20260131.0
+      esbuild: 0.28.1
+      miniflare: 4.20260722.1
       path-to-regexp: 6.3.0
       unenv: 2.0.0-rc.24
-      workerd: 1.20260131.0
+      workerd: 1.20260722.1
     optionalDependencies:
       fsevents: 2.3.3
     transitivePeerDependencies:
@@ -20739,6 +21299,8 @@ snapshots:
 
   ws@8.19.0: {}
 
+  ws@8.21.0: {}
+
   wsl-utils@0.1.0:
     dependencies:
       is-wsl: 3.1.0

From c671ca52f63a02856b6f3d3d89ed143f38c5f350 Mon Sep 17 00:00:00 2001
From: "Calum H." <calum@modrinth.com>
Date: Thu, 6 Aug 2026 16:10:46 +0100
Subject: [PATCH 37/82] fix: dropdown panel at 0,0 (#7024)

---
 .../ui/src/components/base/DropdownFilterBar.vue   | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/ui/src/components/base/DropdownFilterBar.vue b/packages/ui/src/components/base/DropdownFilterBar.vue
index ceaea500db..90163795c1 100644
--- a/packages/ui/src/components/base/DropdownFilterBar.vue
+++ b/packages/ui/src/components/base/DropdownFilterBar.vue
@@ -387,7 +387,7 @@ import { OverlayScrollbars, type PartialOptions } from 'overlayscrollbars'
 import type { Component, ComponentPublicInstance, CSSProperties } from 'vue'
 import { computed, nextTick, onBeforeUnmount, ref, watch } from 'vue'
 
-import { Button, type ButtonSize } from '#ui/components/base/buttons'
+import { Button, type ButtonElementHandle, type ButtonSize } from '#ui/components/base/buttons'
 
 import { useVirtualScroll } from '../../composables/virtual-scroll'
 import MultiSelect, { type MultiSelectItem } from './MultiSelect.vue'
@@ -554,7 +554,7 @@ const isCursorInsideSubmenu = ref(false)
 const hasSubmenuPosition = ref(false)
 const isMobileAddMenuLayout = ref(false)
 const submenuOpenDirection = ref<SubmenuOpenDirection>('right')
-const addMenuTrigger = ref<HTMLElement | null>(null)
+const addMenuTrigger = ref<ButtonElementHandle | null>(null)
 const menuContainer = ref<HTMLElement | null>(null)
 const submenu = ref<HTMLElement | null>(null)
 const activeCategoryOptionsScrollbar = ref<HTMLElement | null>(null)
@@ -732,8 +732,9 @@ const addMenuTransitionEnterActiveClass = computed(() =>
 const addMenuTransitionEnterFromClass = computed(() =>
 	isMobileAddMenuLayout.value ? 'opacity-100' : 'opacity-0',
 )
+const addMenuTriggerElement = computed(() => addMenuTrigger.value?.element ?? null)
 const addMenuOutsideClickTarget = computed(() => menuContainer.value ?? submenu.value)
-const addMenuOutsideClickIgnore = computed(() => [addMenuTrigger, menuContainer, submenu])
+const addMenuOutsideClickIgnore = computed(() => [addMenuTriggerElement, menuContainer, submenu])
 
 const appliedFilterPreviews = computed(() =>
 	Object.entries(props.modelValue)
@@ -984,7 +985,7 @@ function handleAddMenuKeydown(event: KeyboardEvent) {
 
 	event.preventDefault()
 	closeAddMenu()
-	nextTick(() => addMenuTrigger.value?.focus())
+	nextTick(() => addMenuTriggerElement.value?.focus())
 }
 
 function setCategoryButtonRef(
@@ -1585,11 +1586,12 @@ function triangleArea(a: Point, b: Point, c: Point): number {
 function updateAddMenuPosition(): boolean {
 	const positioningElement =
 		menuContainer.value ?? (isMobileActiveSubmenu.value ? submenu.value : null)
-	if (typeof window === 'undefined' || !addMenuTrigger.value || !positioningElement) {
+	const triggerElement = addMenuTriggerElement.value
+	if (typeof window === 'undefined' || !triggerElement || !positioningElement) {
 		return false
 	}
 
-	const triggerRect = addMenuTrigger.value.getBoundingClientRect()
+	const triggerRect = triggerElement.getBoundingClientRect()
 	const dropdownWidth = Math.max(ADD_MENU_WIDTH, triggerRect.width)
 
 	addMenuStyle.value = {

From b8d97268cb5041c0ed021654a1d5a1b1960a1a14 Mon Sep 17 00:00:00 2001
From: "Michael H." <michael@iptables.sh>
Date: Thu, 6 Aug 2026 17:39:06 +0200
Subject: [PATCH 38/82] perf: further reduce memory (#7015)

* feat: server source maps

* perf: strip unused fields from search results

* perf: reduce game version memory usage
---
 apps/frontend/src/composables/generated.ts    | 35 ++++++++++++++++---
 .../src/pages/discover/[type]/index.vue       | 19 ++++++++--
 .../plugins/update-game-versions.client.ts    | 19 ++++++++++
 .../src/plugins/update-game-versions.ts       | 17 ---------
 apps/frontend/wrangler.jsonc                  |  1 +
 5 files changed, 67 insertions(+), 24 deletions(-)
 create mode 100644 apps/frontend/src/plugins/update-game-versions.client.ts
 delete mode 100644 apps/frontend/src/plugins/update-game-versions.ts

diff --git a/apps/frontend/src/composables/generated.ts b/apps/frontend/src/composables/generated.ts
index e178ab048a..8a7b895e0f 100644
--- a/apps/frontend/src/composables/generated.ts
+++ b/apps/frontend/src/composables/generated.ts
@@ -68,11 +68,16 @@ export interface GeneratedState extends GloballyUsedState {
 }
 
 /**
- * Composable for accessing the globally used generated state.
- * This includes both fetched data and runtime-defined constants.
+ * Built once per module load rather than via `useState`, because every `useState` value is
+ * serialized into the SSR payload of every page. This is build-time constant data that the
+ * client already has via the static import above, so putting it in the payload would ship a
+ * second copy for no benefit.
+ *
+ * Consequence: on the server this object is shared by every request in the isolate, so it must
+ * stay immutable there. Runtime refreshes are client-only and go through `setGameVersions`.
  */
-export const useGeneratedState = () =>
-	useState<GeneratedState>('generatedState', () => ({
+const generatedState = shallowRef<GeneratedState>(
+	Object.freeze({
 		// Cast JSON data to typed API responses
 		categories: (categories ?? []) as Labrinth.Tags.v2.Category[],
 		loaders: (loaders ?? []) as Labrinth.Tags.v2.Loader[],
@@ -147,4 +152,24 @@ export const useGeneratedState = () =>
 		errors,
 
 		buildYear: new Date().getFullYear(),
-	}))
+	}) as GeneratedState,
+)
+
+/**
+ * Composable for accessing the globally used generated state.
+ * This includes both fetched data and runtime-defined constants.
+ */
+export const useGeneratedState = () => generatedState
+
+/**
+ * Replaces the build-time game versions with a freshly fetched list. Client-only: mutating this
+ * on the server would leak across every request sharing the isolate.
+ */
+export function setGameVersions(versions: Labrinth.Tags.v2.GameVersion[]) {
+	if (import.meta.server) return
+
+	generatedState.value = Object.freeze({
+		...generatedState.value,
+		gameVersions: versions,
+	}) as GeneratedState
+}
diff --git a/apps/frontend/src/pages/discover/[type]/index.vue b/apps/frontend/src/pages/discover/[type]/index.vue
index 8b24b6f5f2..993c13eabe 100644
--- a/apps/frontend/src/pages/discover/[type]/index.vue
+++ b/apps/frontend/src/pages/discover/[type]/index.vue
@@ -228,6 +228,19 @@ function parseSearchParams(requestParams: string): Labrinth.Search.SearchParams
 	}
 }
 
+// Search returns expanded dependency data that no card renders and that isn't part of
+// ResultSearchProject. On modpacks it is ~90% of the response, and everything cached here
+// is serialized into the SSR payload, so drop it before it reaches the query cache.
+function stripUnrenderedFields(
+	hits: Labrinth.Search.v3.ResultSearchProject[],
+): Labrinth.Search.v3.ResultSearchProject[] {
+	return hits.map((hit) => {
+		const { dependencies, dependency_project_ids, compatible_dependency_project_ids, ...rendered } =
+			hit as Labrinth.Search.v3.ResultSearchProject & Record<string, unknown>
+		return rendered as Labrinth.Search.v3.ResultSearchProject
+	})
+}
+
 async function fetchSearch(requestParams: string) {
 	debug('search() called', {
 		requestParams: requestParams.substring(0, 100),
@@ -241,17 +254,19 @@ async function fetchSearch(requestParams: string) {
 
 	debug('search() response', { total_hits: raw.total_hits, hitCount: raw.hits?.length })
 
+	const hits = stripUnrenderedFields(raw.hits ?? [])
+
 	if (isServerType.value) {
 		return {
 			projectHits: [],
-			serverHits: raw.hits,
+			serverHits: hits,
 			total_hits: raw.total_hits,
 			per_page: raw.hits_per_page,
 		}
 	}
 
 	return {
-		projectHits: raw.hits,
+		projectHits: hits,
 		serverHits: [],
 		total_hits: raw.total_hits,
 		per_page: raw.hits_per_page,
diff --git a/apps/frontend/src/plugins/update-game-versions.client.ts b/apps/frontend/src/plugins/update-game-versions.client.ts
new file mode 100644
index 0000000000..b73976b254
--- /dev/null
+++ b/apps/frontend/src/plugins/update-game-versions.client.ts
@@ -0,0 +1,19 @@
+import type { Labrinth } from '@modrinth/api-client'
+
+import { setGameVersions } from '~/composables/generated'
+
+export default defineNuxtPlugin((nuxtApp) => {
+	// Deferred until after hydration: the server renders with the build-time game versions, so
+	// swapping them in during setup would make the first client render disagree with the markup.
+	nuxtApp.hook('app:suspense:resolve', async () => {
+		try {
+			const gameVersions = await $fetch<Labrinth.Tags.v2.GameVersion[]>('/api/tags/game-versions')
+
+			if (gameVersions && gameVersions.length > 0) {
+				setGameVersions(gameVersions)
+			}
+		} catch (error) {
+			console.error('[Game Version Updater] Failed to fetch:', error)
+		}
+	})
+})
diff --git a/apps/frontend/src/plugins/update-game-versions.ts b/apps/frontend/src/plugins/update-game-versions.ts
deleted file mode 100644
index 5ded43620b..0000000000
--- a/apps/frontend/src/plugins/update-game-versions.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import type { Labrinth } from '@modrinth/api-client'
-
-export default defineNuxtPlugin(async () => {
-	try {
-		const gameVersions = await $fetch<Labrinth.Tags.v2.GameVersion[]>('/api/tags/game-versions')
-
-		if (gameVersions && gameVersions.length > 0) {
-			const state = useState<{ gameVersions: Labrinth.Tags.v2.GameVersion[] }>('generatedState')
-
-			if (state.value) {
-				state.value.gameVersions = gameVersions
-			}
-		}
-	} catch (error) {
-		console.error('[Game Version Updater] Failed to fetch:', error)
-	}
-})
diff --git a/apps/frontend/wrangler.jsonc b/apps/frontend/wrangler.jsonc
index 821c5c3e9a..22da20148b 100644
--- a/apps/frontend/wrangler.jsonc
+++ b/apps/frontend/wrangler.jsonc
@@ -10,6 +10,7 @@
 	"routes": ["modrinth.com/*"],
 	"preview_urls": true,
 	"workers_dev": true,
+	"upload_source_maps": true,
 	"limits": {
 		"cpu_ms": 5000
 	},

From 8aa22b9bed38151e7eda1c5b66fade475b236ed5 Mon Sep 17 00:00:00 2001
From: Mr_chank <180248271+chank-op@users.noreply.github.com>
Date: Fri, 7 Aug 2026 14:39:05 +1000
Subject: [PATCH 39/82] refactor(i18n): use common messages for generic button
 labels (#7020)

A few components defined their own "Cancel", "Close", "Clear" and
"Success" descriptors when commonMessages already has them. Swapped
them over and removed the old ones.

Locale files come from intl:prune-local dropping the now-orphaned
strings across every language.
---
 .../ui/modal/ModrinthAccountRequiredModal.vue     | 15 +++++++++------
 apps/app-frontend/src/locales/da-DK/index.json    |  3 ---
 apps/app-frontend/src/locales/de-CH/index.json    |  3 ---
 apps/app-frontend/src/locales/de-DE/index.json    |  3 ---
 apps/app-frontend/src/locales/en-US/index.json    |  3 ---
 apps/app-frontend/src/locales/es-419/index.json   |  3 ---
 apps/app-frontend/src/locales/fr-FR/index.json    |  3 ---
 apps/app-frontend/src/locales/hu-HU/index.json    |  3 ---
 apps/app-frontend/src/locales/it-IT/index.json    |  3 ---
 apps/app-frontend/src/locales/ja-JP/index.json    |  3 ---
 apps/app-frontend/src/locales/ko-KR/index.json    |  3 ---
 apps/app-frontend/src/locales/nl-NL/index.json    |  3 ---
 apps/app-frontend/src/locales/pl-PL/index.json    |  3 ---
 apps/app-frontend/src/locales/pt-BR/index.json    |  3 ---
 apps/app-frontend/src/locales/ru-RU/index.json    |  3 ---
 apps/app-frontend/src/locales/sv-SE/index.json    |  3 ---
 apps/app-frontend/src/locales/tr-TR/index.json    |  3 ---
 apps/app-frontend/src/locales/uk-UA/index.json    |  3 ---
 apps/app-frontend/src/locales/zh-CN/index.json    |  3 ---
 apps/app-frontend/src/locales/zh-TW/index.json    |  3 ---
 .../ui/dashboard/CreatorTaxFormModal.vue          |  6 +-----
 .../components/ui/moderation/ModpackScanModal.vue | 13 +++----------
 apps/frontend/src/locales/de-CH/index.json        |  9 ---------
 apps/frontend/src/locales/de-DE/index.json        |  9 ---------
 apps/frontend/src/locales/en-US/index.json        |  9 ---------
 apps/frontend/src/locales/es-419/index.json       |  9 ---------
 apps/frontend/src/locales/fr-FR/index.json        |  9 ---------
 apps/frontend/src/locales/hu-HU/index.json        |  3 ---
 apps/frontend/src/locales/it-IT/index.json        |  9 ---------
 apps/frontend/src/locales/ja-JP/index.json        |  3 ---
 apps/frontend/src/locales/ko-KR/index.json        |  9 ---------
 apps/frontend/src/locales/ms-MY/index.json        |  6 ------
 apps/frontend/src/locales/nl-NL/index.json        |  9 ---------
 apps/frontend/src/locales/pl-PL/index.json        |  9 ---------
 apps/frontend/src/locales/pt-BR/index.json        |  9 ---------
 apps/frontend/src/locales/ru-RU/index.json        |  9 ---------
 apps/frontend/src/locales/sv-SE/index.json        |  6 ------
 apps/frontend/src/locales/tr-TR/index.json        |  6 ------
 apps/frontend/src/locales/uk-UA/index.json        |  9 ---------
 apps/frontend/src/locales/zh-CN/index.json        |  9 ---------
 apps/frontend/src/locales/zh-TW/index.json        |  9 ---------
 .../sharing/invite-players-modal/index.vue        |  9 ++++-----
 .../invite-players-modal-invite-link-editor.vue   |  9 +++------
 .../components/editor/EditorFindReplace.vue       |  9 +++------
 packages/ui/src/locales/cs-CZ/index.json          |  4 ----
 packages/ui/src/locales/da-DK/index.json          |  4 ----
 packages/ui/src/locales/de-CH/index.json          | 10 ----------
 packages/ui/src/locales/de-DE/index.json          | 10 ----------
 packages/ui/src/locales/en-US/index.json          |  9 ---------
 packages/ui/src/locales/es-419/index.json         | 10 ----------
 packages/ui/src/locales/es-ES/index.json          |  3 ---
 packages/ui/src/locales/fil-PH/index.json         |  4 ----
 packages/ui/src/locales/fr-FR/index.json          |  9 ---------
 packages/ui/src/locales/hu-HU/index.json          |  9 ---------
 packages/ui/src/locales/id-ID/index.json          |  4 ----
 packages/ui/src/locales/it-IT/index.json          |  9 ---------
 packages/ui/src/locales/ja-JP/index.json          |  3 ---
 packages/ui/src/locales/ko-KR/index.json          |  9 ---------
 packages/ui/src/locales/ms-MY/index.json          |  4 ----
 packages/ui/src/locales/nl-NL/index.json          |  9 ---------
 packages/ui/src/locales/pl-PL/index.json          |  9 ---------
 packages/ui/src/locales/pt-BR/index.json          | 10 ----------
 packages/ui/src/locales/pt-PT/index.json          |  4 ----
 packages/ui/src/locales/ro-RO/index.json          |  3 ---
 packages/ui/src/locales/ru-RU/index.json          |  9 ---------
 packages/ui/src/locales/sr-CS/index.json          |  4 ----
 packages/ui/src/locales/sv-SE/index.json          | 10 ----------
 packages/ui/src/locales/tr-TR/index.json          |  3 ---
 packages/ui/src/locales/uk-UA/index.json          |  9 ---------
 packages/ui/src/locales/vi-VN/index.json          |  4 ----
 packages/ui/src/locales/zh-CN/index.json          | 10 ----------
 packages/ui/src/locales/zh-TW/index.json          | 10 ----------
 72 files changed, 23 insertions(+), 440 deletions(-)

diff --git a/apps/app-frontend/src/components/ui/modal/ModrinthAccountRequiredModal.vue b/apps/app-frontend/src/components/ui/modal/ModrinthAccountRequiredModal.vue
index 18b832278d..ad413f1ab8 100644
--- a/apps/app-frontend/src/components/ui/modal/ModrinthAccountRequiredModal.vue
+++ b/apps/app-frontend/src/components/ui/modal/ModrinthAccountRequiredModal.vue
@@ -73,7 +73,7 @@
 				<div class="grid grid-cols-1 gap-2 sm:grid-cols-2">
 					<Button type="outlined" class="w-full" native-type="button" @click="modal?.hide()">
 						<XIcon aria-hidden="true" />
-						{{ formatMessage(messages.cancelButton) }}
+						{{ formatMessage(commonMessages.cancelButton) }}
 					</Button>
 					<Button
 						class="w-full"
@@ -106,7 +106,14 @@
 
 <script setup lang="ts">
 import { LogInIcon, RefreshCwIcon, SpinnerIcon, UserPlusIcon, XIcon } from '@modrinth/assets'
-import { Button, defineMessages, IntlFormatted, NewModal, useVIntl } from '@modrinth/ui'
+import {
+	Button,
+	commonMessages,
+	defineMessages,
+	IntlFormatted,
+	NewModal,
+	useVIntl,
+} from '@modrinth/ui'
 import { openUrl } from '@tauri-apps/plugin-opener'
 import { ref } from 'vue'
 
@@ -245,10 +252,6 @@ const messages = defineMessages({
 		id: 'modal.modrinth-account-required.waiting-for-browser',
 		defaultMessage: 'Waiting for browser confirmation...',
 	},
-	cancelButton: {
-		id: 'modal.modrinth-account-required.cancel-button',
-		defaultMessage: 'Cancel',
-	},
 	openBrowserAgainButton: {
 		id: 'modal.modrinth-account-required.open-browser-again-button',
 		defaultMessage: 'Open browser again',
diff --git a/apps/app-frontend/src/locales/da-DK/index.json b/apps/app-frontend/src/locales/da-DK/index.json
index 249cb7b464..c0aa6b0e50 100644
--- a/apps/app-frontend/src/locales/da-DK/index.json
+++ b/apps/app-frontend/src/locales/da-DK/index.json
@@ -1112,9 +1112,6 @@
   "minecraft-required.sign-in": {
     "message": "Log ind på Microsoft"
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "Annuller"
-  },
   "modal.modrinth-account-required.continue-in-browser-heading": {
     "message": "Fortsæt i din browser"
   },
diff --git a/apps/app-frontend/src/locales/de-CH/index.json b/apps/app-frontend/src/locales/de-CH/index.json
index 485ddb3f38..c74ea4c9f9 100644
--- a/apps/app-frontend/src/locales/de-CH/index.json
+++ b/apps/app-frontend/src/locales/de-CH/index.json
@@ -1853,9 +1853,6 @@
   "modal.modrinth-account-required.browser-description": {
     "message": "Ein neuer Tab zum Anmelden wurde geöffnet. Schließe die Anmeldung dort ab und kehren anschließend zur App zurück."
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "Abbrechen"
-  },
   "modal.modrinth-account-required.continue-in-browser-heading": {
     "message": "Im Browser fortfahren"
   },
diff --git a/apps/app-frontend/src/locales/de-DE/index.json b/apps/app-frontend/src/locales/de-DE/index.json
index 3be909f0f0..aec68c7665 100644
--- a/apps/app-frontend/src/locales/de-DE/index.json
+++ b/apps/app-frontend/src/locales/de-DE/index.json
@@ -1853,9 +1853,6 @@
   "modal.modrinth-account-required.browser-description": {
     "message": "Ein neuer Tab zum Anmelden wurde geöffnet. Schließe die Anmeldung dort ab und kehren anschließend zur App zurück."
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "Abbrechen"
-  },
   "modal.modrinth-account-required.continue-in-browser-heading": {
     "message": "Im Browser fortfahren"
   },
diff --git a/apps/app-frontend/src/locales/en-US/index.json b/apps/app-frontend/src/locales/en-US/index.json
index 884e06f247..9b5a674d18 100644
--- a/apps/app-frontend/src/locales/en-US/index.json
+++ b/apps/app-frontend/src/locales/en-US/index.json
@@ -1880,9 +1880,6 @@
   "modal.modrinth-account-required.browser-description": {
     "message": "A new tab opened to sign in. Complete the sign in there, then return to the app."
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "Cancel"
-  },
   "modal.modrinth-account-required.continue-in-browser-heading": {
     "message": "Continue in your browser"
   },
diff --git a/apps/app-frontend/src/locales/es-419/index.json b/apps/app-frontend/src/locales/es-419/index.json
index caf734abfe..967688bdfb 100644
--- a/apps/app-frontend/src/locales/es-419/index.json
+++ b/apps/app-frontend/src/locales/es-419/index.json
@@ -1481,9 +1481,6 @@
   "minecraft-required.sign-in": {
     "message": "Iniciar sesión con Microsoft"
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "Cancelar"
-  },
   "modal.modrinth-account-required.header": {
     "message": "Cuenta requerida"
   },
diff --git a/apps/app-frontend/src/locales/fr-FR/index.json b/apps/app-frontend/src/locales/fr-FR/index.json
index 246380a6b4..3fdb65f6f0 100644
--- a/apps/app-frontend/src/locales/fr-FR/index.json
+++ b/apps/app-frontend/src/locales/fr-FR/index.json
@@ -1754,9 +1754,6 @@
   "modal.modrinth-account-required.browser-description": {
     "message": "A nouvel onglet a été ouvert pour vous connecter. Finissez la connexion, puis retournez dans l'application."
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "Annuler"
-  },
   "modal.modrinth-account-required.continue-in-browser-heading": {
     "message": "Continuer dans votre navigateur"
   },
diff --git a/apps/app-frontend/src/locales/hu-HU/index.json b/apps/app-frontend/src/locales/hu-HU/index.json
index 04455bc7a8..77f9bffdb4 100644
--- a/apps/app-frontend/src/locales/hu-HU/index.json
+++ b/apps/app-frontend/src/locales/hu-HU/index.json
@@ -1856,9 +1856,6 @@
   "modal.modrinth-account-required.browser-description": {
     "message": "Megnyílt egy új lap a bejelentkezéshez. Végezd el ott a bejelentkezést, majd térj vissza az alkalmazásba."
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "Mégse"
-  },
   "modal.modrinth-account-required.continue-in-browser-heading": {
     "message": "Folytatás a böngészőben"
   },
diff --git a/apps/app-frontend/src/locales/it-IT/index.json b/apps/app-frontend/src/locales/it-IT/index.json
index 34de8b2a76..16587ed018 100644
--- a/apps/app-frontend/src/locales/it-IT/index.json
+++ b/apps/app-frontend/src/locales/it-IT/index.json
@@ -1853,9 +1853,6 @@
   "modal.modrinth-account-required.browser-description": {
     "message": "Si è aperta una nuova scheda per effettuare l'accesso. Poi torna all'app."
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "Annulla"
-  },
   "modal.modrinth-account-required.continue-in-browser-heading": {
     "message": "Continua nel browser"
   },
diff --git a/apps/app-frontend/src/locales/ja-JP/index.json b/apps/app-frontend/src/locales/ja-JP/index.json
index 38db7d4b16..6bd7ff8194 100644
--- a/apps/app-frontend/src/locales/ja-JP/index.json
+++ b/apps/app-frontend/src/locales/ja-JP/index.json
@@ -1853,9 +1853,6 @@
   "modal.modrinth-account-required.browser-description": {
     "message": "サインイン用のタブが開きました。そちらでサインインを完了してから、アプリに戻ってください。"
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "キャンセル"
-  },
   "modal.modrinth-account-required.continue-in-browser-heading": {
     "message": "ブラウザで続行"
   },
diff --git a/apps/app-frontend/src/locales/ko-KR/index.json b/apps/app-frontend/src/locales/ko-KR/index.json
index 207a662b3c..1be3efe362 100644
--- a/apps/app-frontend/src/locales/ko-KR/index.json
+++ b/apps/app-frontend/src/locales/ko-KR/index.json
@@ -1853,9 +1853,6 @@
   "modal.modrinth-account-required.browser-description": {
     "message": "로그인을 위한 새 탭이 열렸습니다. 해당 탭에서 로그인을 완료한 후 앱 돌아오세요."
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "취소"
-  },
   "modal.modrinth-account-required.continue-in-browser-heading": {
     "message": "브라우저에서 계속 진행"
   },
diff --git a/apps/app-frontend/src/locales/nl-NL/index.json b/apps/app-frontend/src/locales/nl-NL/index.json
index ea8bd2cdd3..10af52cfdb 100644
--- a/apps/app-frontend/src/locales/nl-NL/index.json
+++ b/apps/app-frontend/src/locales/nl-NL/index.json
@@ -1763,9 +1763,6 @@
   "modal.modrinth-account-required.browser-description": {
     "message": "Er is een nieuw tabblad geopend om je aan te melden. Log daar in en ga vervolgens terug naar de app."
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "Annuleren"
-  },
   "modal.modrinth-account-required.continue-in-browser-heading": {
     "message": "Doorgaan in je browser"
   },
diff --git a/apps/app-frontend/src/locales/pl-PL/index.json b/apps/app-frontend/src/locales/pl-PL/index.json
index 1fc56093d7..5fb45c66c8 100644
--- a/apps/app-frontend/src/locales/pl-PL/index.json
+++ b/apps/app-frontend/src/locales/pl-PL/index.json
@@ -1619,9 +1619,6 @@
   "minecraft-required.sign-in": {
     "message": "Zaloguj się do Microsoft"
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "Anuluj"
-  },
   "modal.modrinth-account-required.continue-in-browser-heading": {
     "message": "Kontynuuj w przeglądarce"
   },
diff --git a/apps/app-frontend/src/locales/pt-BR/index.json b/apps/app-frontend/src/locales/pt-BR/index.json
index 06aa6d9c18..f46b9bbab6 100644
--- a/apps/app-frontend/src/locales/pt-BR/index.json
+++ b/apps/app-frontend/src/locales/pt-BR/index.json
@@ -1856,9 +1856,6 @@
   "modal.modrinth-account-required.browser-description": {
     "message": "Uma nova aba foi aberta para iniciar sessão. Conclua lá, então volte ao aplicativo."
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "Cancelar"
-  },
   "modal.modrinth-account-required.continue-in-browser-heading": {
     "message": "Continuar em seu navegador"
   },
diff --git a/apps/app-frontend/src/locales/ru-RU/index.json b/apps/app-frontend/src/locales/ru-RU/index.json
index 9588318155..76ad5b2c8e 100644
--- a/apps/app-frontend/src/locales/ru-RU/index.json
+++ b/apps/app-frontend/src/locales/ru-RU/index.json
@@ -1844,9 +1844,6 @@
   "modal.modrinth-account-required.browser-description": {
     "message": "Открылась вкладка для входа. Завершение вход и вернитесь в приложение."
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "Отмена"
-  },
   "modal.modrinth-account-required.continue-in-browser-heading": {
     "message": "Продолжите в браузере"
   },
diff --git a/apps/app-frontend/src/locales/sv-SE/index.json b/apps/app-frontend/src/locales/sv-SE/index.json
index 9fafae441c..a6eb17552c 100644
--- a/apps/app-frontend/src/locales/sv-SE/index.json
+++ b/apps/app-frontend/src/locales/sv-SE/index.json
@@ -1640,9 +1640,6 @@
   "minecraft-required.sign-in": {
     "message": "Logga in på Microsoft"
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "Avbryt"
-  },
   "modal.modrinth-account-required.continue-in-browser-heading": {
     "message": "Fortsätt i din webbläsare"
   },
diff --git a/apps/app-frontend/src/locales/tr-TR/index.json b/apps/app-frontend/src/locales/tr-TR/index.json
index 0df2fb9deb..9fe9fd9359 100644
--- a/apps/app-frontend/src/locales/tr-TR/index.json
+++ b/apps/app-frontend/src/locales/tr-TR/index.json
@@ -1457,9 +1457,6 @@
   "minecraft-required.sign-in": {
     "message": "Microsoft'a giriş yap"
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "İptal"
-  },
   "modal.modrinth-account-required.continue-in-browser-heading": {
     "message": "Tarayıcında devam et"
   },
diff --git a/apps/app-frontend/src/locales/uk-UA/index.json b/apps/app-frontend/src/locales/uk-UA/index.json
index b3b9cd20f6..1666af7c26 100644
--- a/apps/app-frontend/src/locales/uk-UA/index.json
+++ b/apps/app-frontend/src/locales/uk-UA/index.json
@@ -1853,9 +1853,6 @@
   "modal.modrinth-account-required.browser-description": {
     "message": "Відкрилася нова вкладка, де ви зможете ввійти. Увійдіть, тоді поверніться до застосунку."
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "Скасувати"
-  },
   "modal.modrinth-account-required.continue-in-browser-heading": {
     "message": "Продовжити у браузері"
   },
diff --git a/apps/app-frontend/src/locales/zh-CN/index.json b/apps/app-frontend/src/locales/zh-CN/index.json
index c6f14d0b9b..0d6ebfc67c 100644
--- a/apps/app-frontend/src/locales/zh-CN/index.json
+++ b/apps/app-frontend/src/locales/zh-CN/index.json
@@ -1856,9 +1856,6 @@
   "modal.modrinth-account-required.browser-description": {
     "message": "一个新的标签页已打开，你需要在那里完成登录，然后回到Modrinth app。"
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "取消"
-  },
   "modal.modrinth-account-required.continue-in-browser-heading": {
     "message": "请在你的浏览器中继续"
   },
diff --git a/apps/app-frontend/src/locales/zh-TW/index.json b/apps/app-frontend/src/locales/zh-TW/index.json
index cce0b1e88b..c87fdb7f28 100644
--- a/apps/app-frontend/src/locales/zh-TW/index.json
+++ b/apps/app-frontend/src/locales/zh-TW/index.json
@@ -1856,9 +1856,6 @@
   "modal.modrinth-account-required.browser-description": {
     "message": "一個新分頁已開啟供你登入。請在該分頁完成登入，然後返回應用程式。"
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "取消"
-  },
   "modal.modrinth-account-required.continue-in-browser-heading": {
     "message": "在瀏覽器中繼續"
   },
diff --git a/apps/frontend/src/components/ui/dashboard/CreatorTaxFormModal.vue b/apps/frontend/src/components/ui/dashboard/CreatorTaxFormModal.vue
index 83ca57653d..3999e22cb1 100644
--- a/apps/frontend/src/components/ui/dashboard/CreatorTaxFormModal.vue
+++ b/apps/frontend/src/components/ui/dashboard/CreatorTaxFormModal.vue
@@ -133,7 +133,7 @@
 				</div>
 				<div class="flex w-full flex-row justify-stretch gap-2">
 					<Button class="w-full text-contrast" @click="handleClose">
-						{{ props.closeButtonText ?? formatMessage(messages.closeButton) }}
+						{{ props.closeButtonText ?? formatMessage(commonMessages.closeButton) }}
 					</Button>
 					<Button
 						type="colored"
@@ -267,10 +267,6 @@ const messages = defineMessages({
 		id: 'dashboard.creator-tax-form-modal.confirmation.download-button',
 		defaultMessage: 'Download {formType}',
 	},
-	closeButton: {
-		id: 'dashboard.creator-tax-form-modal.close-button',
-		defaultMessage: 'Close',
-	},
 	incompleteTitle: {
 		id: 'dashboard.creator-tax-form-modal.incomplete.title',
 		defaultMessage: 'Tax form incomplete',
diff --git a/apps/frontend/src/components/ui/moderation/ModpackScanModal.vue b/apps/frontend/src/components/ui/moderation/ModpackScanModal.vue
index 41c0888f81..c3057c955c 100644
--- a/apps/frontend/src/components/ui/moderation/ModpackScanModal.vue
+++ b/apps/frontend/src/components/ui/moderation/ModpackScanModal.vue
@@ -11,6 +11,7 @@ import { Button, IconButton } from '@modrinth/ui'
 import {
 	Combobox,
 	type ComboboxOption,
+	commonMessages,
 	ConfirmModal,
 	defineMessages,
 	injectModrinthClient,
@@ -61,10 +62,6 @@ const messages = defineMessages({
 		id: 'modpack-scan-modal.scanning',
 		defaultMessage: 'Scanning...',
 	},
-	success: {
-		id: 'modpack-scan-modal.success',
-		defaultMessage: 'Success',
-	},
 	failed: {
 		id: 'modpack-scan-modal.failed',
 		defaultMessage: 'Failed',
@@ -102,10 +99,6 @@ const messages = defineMessages({
 		defaultMessage:
 			'This will permanently delete all attribution groups for this project and all files inside them. This action cannot be undone.',
 	},
-	deleteAllGroupsConfirmationProceed: {
-		id: 'modpack-scan-modal.delete-all-groups.proceed',
-		defaultMessage: 'Clear',
-	},
 	deleteAllGroupsSuccess: {
 		id: 'modpack-scan-modal.delete-all-groups.success',
 		defaultMessage: 'All groups cleared successfully.',
@@ -344,7 +337,7 @@ async function clearAllGroups() {
 	if (!failed) {
 		addNotification({
 			type: 'success',
-			title: formatMessage(messages.success),
+			title: formatMessage(commonMessages.successLabel),
 			text: formatMessage(messages.deleteAllGroupsSuccess),
 		})
 	}
@@ -369,7 +362,7 @@ defineExpose({ show, hide })
 		ref="clearModalRef"
 		:title="formatMessage(messages.deleteAllGroupsConfirmationTitle)"
 		:description="formatMessage(messages.deleteAllGroupsConfirmationDescription)"
-		:proceed-label="formatMessage(messages.deleteAllGroupsConfirmationProceed)"
+		:proceed-label="formatMessage(commonMessages.clearButton)"
 		@proceed="clearAllGroups"
 	/>
 
diff --git a/apps/frontend/src/locales/de-CH/index.json b/apps/frontend/src/locales/de-CH/index.json
index 07f0fe0b28..f8f3215659 100644
--- a/apps/frontend/src/locales/de-CH/index.json
+++ b/apps/frontend/src/locales/de-CH/index.json
@@ -1481,9 +1481,6 @@
   "dashboard.collections.sort.recently-updated": {
     "message": "Kürzlich aktualisiert"
   },
-  "dashboard.creator-tax-form-modal.close-button": {
-    "message": "Schließen"
-  },
   "dashboard.creator-tax-form-modal.confirmation.download-button": {
     "message": "{formType} herunterladen"
   },
@@ -2984,9 +2981,6 @@
   "modpack-scan-modal.delete-all-groups.error": {
     "message": "Fehler beim Löschen aller Gruppen: {error}"
   },
-  "modpack-scan-modal.delete-all-groups.proceed": {
-    "message": "Löschen"
-  },
   "modpack-scan-modal.delete-all-groups.success": {
     "message": "Alle Gruppen wurden gelöscht."
   },
@@ -3026,9 +3020,6 @@
   "modpack-scan-modal.scanning": {
     "message": "Wird gescannt..."
   },
-  "modpack-scan-modal.success": {
-    "message": "Erfolg"
-  },
   "modpack-scan-modal.title": {
     "message": "Modpack-Scan ({scanned}/{total} Dateien)"
   },
diff --git a/apps/frontend/src/locales/de-DE/index.json b/apps/frontend/src/locales/de-DE/index.json
index 575f938421..f78ec91224 100644
--- a/apps/frontend/src/locales/de-DE/index.json
+++ b/apps/frontend/src/locales/de-DE/index.json
@@ -1481,9 +1481,6 @@
   "dashboard.collections.sort.recently-updated": {
     "message": "Kürzlich aktualisiert"
   },
-  "dashboard.creator-tax-form-modal.close-button": {
-    "message": "Schließen"
-  },
   "dashboard.creator-tax-form-modal.confirmation.download-button": {
     "message": "Lade {formType} herunter"
   },
@@ -2984,9 +2981,6 @@
   "modpack-scan-modal.delete-all-groups.error": {
     "message": "Fehler beim Löschen aller Gruppen: {error}"
   },
-  "modpack-scan-modal.delete-all-groups.proceed": {
-    "message": "Löschen"
-  },
   "modpack-scan-modal.delete-all-groups.success": {
     "message": "Alle Gruppen wurden gelöscht."
   },
@@ -3026,9 +3020,6 @@
   "modpack-scan-modal.scanning": {
     "message": "Wird gescannt..."
   },
-  "modpack-scan-modal.success": {
-    "message": "Erfolg"
-  },
   "modpack-scan-modal.title": {
     "message": "Modpack-Scan ({scanned}/{total} Dateien)"
   },
diff --git a/apps/frontend/src/locales/en-US/index.json b/apps/frontend/src/locales/en-US/index.json
index aac072810e..da8e2ed9ef 100644
--- a/apps/frontend/src/locales/en-US/index.json
+++ b/apps/frontend/src/locales/en-US/index.json
@@ -1481,9 +1481,6 @@
   "dashboard.collections.sort.recently-updated": {
     "message": "Recently Updated"
   },
-  "dashboard.creator-tax-form-modal.close-button": {
-    "message": "Close"
-  },
   "dashboard.creator-tax-form-modal.confirmation.download-button": {
     "message": "Download {formType}"
   },
@@ -2984,9 +2981,6 @@
   "modpack-scan-modal.delete-all-groups.error": {
     "message": "Failed to clear all groups: {error}"
   },
-  "modpack-scan-modal.delete-all-groups.proceed": {
-    "message": "Clear"
-  },
   "modpack-scan-modal.delete-all-groups.success": {
     "message": "All groups cleared successfully."
   },
@@ -3026,9 +3020,6 @@
   "modpack-scan-modal.scanning": {
     "message": "Scanning..."
   },
-  "modpack-scan-modal.success": {
-    "message": "Success"
-  },
   "modpack-scan-modal.title": {
     "message": "Modpack Scan ({scanned}/{total} Files)"
   },
diff --git a/apps/frontend/src/locales/es-419/index.json b/apps/frontend/src/locales/es-419/index.json
index 0a27660346..2aa8d978e3 100644
--- a/apps/frontend/src/locales/es-419/index.json
+++ b/apps/frontend/src/locales/es-419/index.json
@@ -1481,9 +1481,6 @@
   "dashboard.collections.sort.recently-updated": {
     "message": "Actualizado recientemente"
   },
-  "dashboard.creator-tax-form-modal.close-button": {
-    "message": "Cerrar"
-  },
   "dashboard.creator-tax-form-modal.confirmation.download-button": {
     "message": "Descargar {formType}"
   },
@@ -2984,9 +2981,6 @@
   "modpack-scan-modal.delete-all-groups.error": {
     "message": "Error al borrar todos los grupos: {error}"
   },
-  "modpack-scan-modal.delete-all-groups.proceed": {
-    "message": "Borrar"
-  },
   "modpack-scan-modal.delete-all-groups.success": {
     "message": "Todos los grupos fueron borrados exitosamente."
   },
@@ -3026,9 +3020,6 @@
   "modpack-scan-modal.scanning": {
     "message": "Escaneando..."
   },
-  "modpack-scan-modal.success": {
-    "message": "Éxito"
-  },
   "modpack-scan-modal.title": {
     "message": "Análisis del modpack ({scanned}/{total} archivos)"
   },
diff --git a/apps/frontend/src/locales/fr-FR/index.json b/apps/frontend/src/locales/fr-FR/index.json
index b5365bf740..a7729d4f72 100644
--- a/apps/frontend/src/locales/fr-FR/index.json
+++ b/apps/frontend/src/locales/fr-FR/index.json
@@ -1481,9 +1481,6 @@
   "dashboard.collections.sort.recently-updated": {
     "message": "Mis à jour récemment"
   },
-  "dashboard.creator-tax-form-modal.close-button": {
-    "message": "Fermer"
-  },
   "dashboard.creator-tax-form-modal.confirmation.download-button": {
     "message": "Télécharger {formType}"
   },
@@ -2984,9 +2981,6 @@
   "modpack-scan-modal.delete-all-groups.error": {
     "message": "Le nettoyage des groupes a échoué : {error}"
   },
-  "modpack-scan-modal.delete-all-groups.proceed": {
-    "message": "Effacer"
-  },
   "modpack-scan-modal.delete-all-groups.success": {
     "message": "Tous les groupes ont été nettoyés avec succès."
   },
@@ -3026,9 +3020,6 @@
   "modpack-scan-modal.scanning": {
     "message": "Scan en cours..."
   },
-  "modpack-scan-modal.success": {
-    "message": "Succès"
-  },
   "modpack-scan-modal.title": {
     "message": "Scan du modpack ({scanned}/{total} fichiers)"
   },
diff --git a/apps/frontend/src/locales/hu-HU/index.json b/apps/frontend/src/locales/hu-HU/index.json
index a3c459e2b0..f95488ce5e 100644
--- a/apps/frontend/src/locales/hu-HU/index.json
+++ b/apps/frontend/src/locales/hu-HU/index.json
@@ -1415,9 +1415,6 @@
   "dashboard.collections.sort.recently-updated": {
     "message": "Nemrég frissített"
   },
-  "dashboard.creator-tax-form-modal.close-button": {
-    "message": "Bezárás"
-  },
   "dashboard.creator-tax-form-modal.confirmation.download-button": {
     "message": "Letöltés {formType}"
   },
diff --git a/apps/frontend/src/locales/it-IT/index.json b/apps/frontend/src/locales/it-IT/index.json
index 1d60b77e9e..b94fefd5b4 100644
--- a/apps/frontend/src/locales/it-IT/index.json
+++ b/apps/frontend/src/locales/it-IT/index.json
@@ -1475,9 +1475,6 @@
   "dashboard.collections.sort.recently-updated": {
     "message": "Ultima modifica"
   },
-  "dashboard.creator-tax-form-modal.close-button": {
-    "message": "Chiudi"
-  },
   "dashboard.creator-tax-form-modal.confirmation.download-button": {
     "message": "Scarica {formType}"
   },
@@ -2975,9 +2972,6 @@
   "modpack-scan-modal.delete-all-groups.error": {
     "message": "Errore nell'eliminazione dei gruppi: {error}"
   },
-  "modpack-scan-modal.delete-all-groups.proceed": {
-    "message": "Procedi"
-  },
   "modpack-scan-modal.delete-all-groups.success": {
     "message": "Tutti i gruppi eliminati con successo."
   },
@@ -3017,9 +3011,6 @@
   "modpack-scan-modal.scanning": {
     "message": "Scansione..."
   },
-  "modpack-scan-modal.success": {
-    "message": "Successo"
-  },
   "modpack-scan-modal.title": {
     "message": "Scansione del pacchetto ({scanned}/{total} file)"
   },
diff --git a/apps/frontend/src/locales/ja-JP/index.json b/apps/frontend/src/locales/ja-JP/index.json
index 07dc22bc11..12b20205b3 100644
--- a/apps/frontend/src/locales/ja-JP/index.json
+++ b/apps/frontend/src/locales/ja-JP/index.json
@@ -1109,9 +1109,6 @@
   "dashboard.collections.sort.recently-updated": {
     "message": "更新順(新しい順)"
   },
-  "dashboard.creator-tax-form-modal.close-button": {
-    "message": "閉じる"
-  },
   "dashboard.creator-tax-form-modal.confirmation.download-button": {
     "message": "{formType} をダウンロード"
   },
diff --git a/apps/frontend/src/locales/ko-KR/index.json b/apps/frontend/src/locales/ko-KR/index.json
index a88933f469..4b43d5eb08 100644
--- a/apps/frontend/src/locales/ko-KR/index.json
+++ b/apps/frontend/src/locales/ko-KR/index.json
@@ -1481,9 +1481,6 @@
   "dashboard.collections.sort.recently-updated": {
     "message": "최근 업데이트"
   },
-  "dashboard.creator-tax-form-modal.close-button": {
-    "message": "닫기"
-  },
   "dashboard.creator-tax-form-modal.confirmation.download-button": {
     "message": "{formType} 다운로드"
   },
@@ -2984,9 +2981,6 @@
   "modpack-scan-modal.delete-all-groups.error": {
     "message": "모든 그룹 삭제 실패: {error}"
   },
-  "modpack-scan-modal.delete-all-groups.proceed": {
-    "message": "삭제"
-  },
   "modpack-scan-modal.delete-all-groups.success": {
     "message": "모든 그룹 삭제 완료."
   },
@@ -3026,9 +3020,6 @@
   "modpack-scan-modal.scanning": {
     "message": "스캔중..."
   },
-  "modpack-scan-modal.success": {
-    "message": "성공"
-  },
   "modpack-scan-modal.title": {
     "message": "모드팩 스캔 ({scanned}/{total} 파일)"
   },
diff --git a/apps/frontend/src/locales/ms-MY/index.json b/apps/frontend/src/locales/ms-MY/index.json
index 23ad7876f3..c12e695005 100644
--- a/apps/frontend/src/locales/ms-MY/index.json
+++ b/apps/frontend/src/locales/ms-MY/index.json
@@ -1112,9 +1112,6 @@
   "dashboard.collections.sort.recently-updated": {
     "message": "Dikemas Kini Baru-baru Ini"
   },
-  "dashboard.creator-tax-form-modal.close-button": {
-    "message": "Tutup"
-  },
   "dashboard.creator-tax-form-modal.confirmation.download-button": {
     "message": "Muat turun {formType}"
   },
@@ -2423,9 +2420,6 @@
   "moderation.page.technicalReview": {
     "message": "Semakan teknikal"
   },
-  "modpack-scan-modal.delete-all-groups.proceed": {
-    "message": "Kosongkan"
-  },
   "modpack-scan-modal.failed": {
     "message": "Gagal"
   },
diff --git a/apps/frontend/src/locales/nl-NL/index.json b/apps/frontend/src/locales/nl-NL/index.json
index 5f8a17e677..6c64df1f48 100644
--- a/apps/frontend/src/locales/nl-NL/index.json
+++ b/apps/frontend/src/locales/nl-NL/index.json
@@ -1478,9 +1478,6 @@
   "dashboard.collections.sort.recently-updated": {
     "message": "Recentelijk geüpdate"
   },
-  "dashboard.creator-tax-form-modal.close-button": {
-    "message": "Sluiten"
-  },
   "dashboard.creator-tax-form-modal.confirmation.download-button": {
     "message": "Download {formType}"
   },
@@ -2981,9 +2978,6 @@
   "modpack-scan-modal.delete-all-groups.error": {
     "message": "Niet gelukt om alle groepen te wissen: {error}"
   },
-  "modpack-scan-modal.delete-all-groups.proceed": {
-    "message": "Wissen"
-  },
   "modpack-scan-modal.delete-all-groups.success": {
     "message": "Alle groepen zijn succesvol gewist."
   },
@@ -3023,9 +3017,6 @@
   "modpack-scan-modal.scanning": {
     "message": "Scannen..."
   },
-  "modpack-scan-modal.success": {
-    "message": "Gelukt"
-  },
   "modpack-scan-modal.title": {
     "message": "Modpack-scan ({scanned}/{total} bestanden)"
   },
diff --git a/apps/frontend/src/locales/pl-PL/index.json b/apps/frontend/src/locales/pl-PL/index.json
index 7454c93009..85f58da7e8 100644
--- a/apps/frontend/src/locales/pl-PL/index.json
+++ b/apps/frontend/src/locales/pl-PL/index.json
@@ -1478,9 +1478,6 @@
   "dashboard.collections.sort.recently-updated": {
     "message": "Ostatnio zaktualizowane"
   },
-  "dashboard.creator-tax-form-modal.close-button": {
-    "message": "Zamknij"
-  },
   "dashboard.creator-tax-form-modal.confirmation.download-button": {
     "message": "Pobierz {formType}"
   },
@@ -2975,9 +2972,6 @@
   "modpack-scan-modal.delete-all-groups-confirmation.description": {
     "message": "Trwale usunie to wszystkie grupy atrybucji i wszystkie zawarte w nich pliki. Tej akcji nie można cofnąć."
   },
-  "modpack-scan-modal.delete-all-groups.proceed": {
-    "message": "Wyczyść"
-  },
   "modpack-scan-modal.failed": {
     "message": "Błąd"
   },
@@ -3014,9 +3008,6 @@
   "modpack-scan-modal.scanning": {
     "message": "Skanowanie..."
   },
-  "modpack-scan-modal.success": {
-    "message": "Sukces"
-  },
   "modpack-scan-modal.title": {
     "message": "Skanowanie paczki modów ({scanned}/{total} plików)"
   },
diff --git a/apps/frontend/src/locales/pt-BR/index.json b/apps/frontend/src/locales/pt-BR/index.json
index 927b8c87b9..20925759f1 100644
--- a/apps/frontend/src/locales/pt-BR/index.json
+++ b/apps/frontend/src/locales/pt-BR/index.json
@@ -1481,9 +1481,6 @@
   "dashboard.collections.sort.recently-updated": {
     "message": "Atualizado recentemente"
   },
-  "dashboard.creator-tax-form-modal.close-button": {
-    "message": "Fechar"
-  },
   "dashboard.creator-tax-form-modal.confirmation.download-button": {
     "message": "Baixar {formType}"
   },
@@ -2984,9 +2981,6 @@
   "modpack-scan-modal.delete-all-groups.error": {
     "message": "Falhou ao excluir todos os grupos: {error}"
   },
-  "modpack-scan-modal.delete-all-groups.proceed": {
-    "message": "Excluir"
-  },
   "modpack-scan-modal.delete-all-groups.success": {
     "message": "Todos os grupos excluídos com sucesso."
   },
@@ -3026,9 +3020,6 @@
   "modpack-scan-modal.scanning": {
     "message": "Verificando..."
   },
-  "modpack-scan-modal.success": {
-    "message": "Sucesso"
-  },
   "modpack-scan-modal.title": {
     "message": "Verificação do pacote de mods ({scanned}/{total} Arquivos)"
   },
diff --git a/apps/frontend/src/locales/ru-RU/index.json b/apps/frontend/src/locales/ru-RU/index.json
index 6ab49be413..51a767ad5b 100644
--- a/apps/frontend/src/locales/ru-RU/index.json
+++ b/apps/frontend/src/locales/ru-RU/index.json
@@ -1475,9 +1475,6 @@
   "dashboard.collections.sort.recently-updated": {
     "message": "Дата обновления"
   },
-  "dashboard.creator-tax-form-modal.close-button": {
-    "message": "Закрыть"
-  },
   "dashboard.creator-tax-form-modal.confirmation.download-button": {
     "message": "Скачать {formType}"
   },
@@ -2978,9 +2975,6 @@
   "modpack-scan-modal.delete-all-groups.error": {
     "message": "Не удалось удалить все группы: {error}"
   },
-  "modpack-scan-modal.delete-all-groups.proceed": {
-    "message": "Удалить"
-  },
   "modpack-scan-modal.delete-all-groups.success": {
     "message": "Все группы успешно удалены."
   },
@@ -3020,9 +3014,6 @@
   "modpack-scan-modal.scanning": {
     "message": "Сканирование..."
   },
-  "modpack-scan-modal.success": {
-    "message": "Готово"
-  },
   "muralpay.account-type.checking": {
     "message": "Расчётный"
   },
diff --git a/apps/frontend/src/locales/sv-SE/index.json b/apps/frontend/src/locales/sv-SE/index.json
index baad9ce0ea..180fefda8c 100644
--- a/apps/frontend/src/locales/sv-SE/index.json
+++ b/apps/frontend/src/locales/sv-SE/index.json
@@ -1313,9 +1313,6 @@
   "dashboard.collections.sort.recently-updated": {
     "message": "Nyligen uppdaterade"
   },
-  "dashboard.creator-tax-form-modal.close-button": {
-    "message": "Stäng"
-  },
   "dashboard.creator-tax-form-modal.confirmation.download-button": {
     "message": "Ladda ner {formType}"
   },
@@ -2645,9 +2642,6 @@
   "modpack-scan-modal.delete-all-groups.error": {
     "message": "Misslyckades att tömma alla grupper: {error}"
   },
-  "modpack-scan-modal.delete-all-groups.proceed": {
-    "message": "Töm"
-  },
   "modpack-scan-modal.failed": {
     "message": "Misslyckades"
   },
diff --git a/apps/frontend/src/locales/tr-TR/index.json b/apps/frontend/src/locales/tr-TR/index.json
index 9e91553fd0..d8c8d5df7d 100644
--- a/apps/frontend/src/locales/tr-TR/index.json
+++ b/apps/frontend/src/locales/tr-TR/index.json
@@ -1358,9 +1358,6 @@
   "dashboard.collections.sort.recently-updated": {
     "message": "Son Güncellenen"
   },
-  "dashboard.creator-tax-form-modal.close-button": {
-    "message": "Kapat"
-  },
   "dashboard.creator-tax-form-modal.confirmation.download-button": {
     "message": "{formType} İndirin"
   },
@@ -2774,9 +2771,6 @@
   "modpack-scan-modal.scanning": {
     "message": "Taranıyor..."
   },
-  "modpack-scan-modal.success": {
-    "message": "Başarılı"
-  },
   "modpack-scan-modal.title": {
     "message": "Mod paketi taraması ({scanned}/{total} Dosyalar)"
   },
diff --git a/apps/frontend/src/locales/uk-UA/index.json b/apps/frontend/src/locales/uk-UA/index.json
index 5c9e76be15..0bd18c26c5 100644
--- a/apps/frontend/src/locales/uk-UA/index.json
+++ b/apps/frontend/src/locales/uk-UA/index.json
@@ -1478,9 +1478,6 @@
   "dashboard.collections.sort.recently-updated": {
     "message": "Нещодавно оновлені"
   },
-  "dashboard.creator-tax-form-modal.close-button": {
-    "message": "Закрити"
-  },
   "dashboard.creator-tax-form-modal.confirmation.download-button": {
     "message": "Завантажити {formType}"
   },
@@ -2981,9 +2978,6 @@
   "modpack-scan-modal.delete-all-groups.error": {
     "message": "Не вдалося очистити всі групи: {error}"
   },
-  "modpack-scan-modal.delete-all-groups.proceed": {
-    "message": "Очистити"
-  },
   "modpack-scan-modal.delete-all-groups.success": {
     "message": "Усі групи успішно очищено."
   },
@@ -3023,9 +3017,6 @@
   "modpack-scan-modal.scanning": {
     "message": "Скануємо…"
   },
-  "modpack-scan-modal.success": {
-    "message": "Успіх"
-  },
   "modpack-scan-modal.title": {
     "message": "Сканування збірки ({scanned}/{total} файлів)"
   },
diff --git a/apps/frontend/src/locales/zh-CN/index.json b/apps/frontend/src/locales/zh-CN/index.json
index e3ec943469..1cbf4f42c0 100644
--- a/apps/frontend/src/locales/zh-CN/index.json
+++ b/apps/frontend/src/locales/zh-CN/index.json
@@ -1481,9 +1481,6 @@
   "dashboard.collections.sort.recently-updated": {
     "message": "最近更新"
   },
-  "dashboard.creator-tax-form-modal.close-button": {
-    "message": "关闭"
-  },
   "dashboard.creator-tax-form-modal.confirmation.download-button": {
     "message": "下载{formType}"
   },
@@ -2984,9 +2981,6 @@
   "modpack-scan-modal.delete-all-groups.error": {
     "message": "未能清除所有组:{error}"
   },
-  "modpack-scan-modal.delete-all-groups.proceed": {
-    "message": "清除"
-  },
   "modpack-scan-modal.delete-all-groups.success": {
     "message": "所有组均已成功清除。"
   },
@@ -3026,9 +3020,6 @@
   "modpack-scan-modal.scanning": {
     "message": "扫描中……"
   },
-  "modpack-scan-modal.success": {
-    "message": "成功"
-  },
   "modpack-scan-modal.title": {
     "message": "模组包扫描 ({scanned}/{total} 个文件)"
   },
diff --git a/apps/frontend/src/locales/zh-TW/index.json b/apps/frontend/src/locales/zh-TW/index.json
index a61f5b1012..6b70244445 100644
--- a/apps/frontend/src/locales/zh-TW/index.json
+++ b/apps/frontend/src/locales/zh-TW/index.json
@@ -1481,9 +1481,6 @@
   "dashboard.collections.sort.recently-updated": {
     "message": "最近更新"
   },
-  "dashboard.creator-tax-form-modal.close-button": {
-    "message": "關閉"
-  },
   "dashboard.creator-tax-form-modal.confirmation.download-button": {
     "message": "下載 {formType}"
   },
@@ -2984,9 +2981,6 @@
   "modpack-scan-modal.delete-all-groups.error": {
     "message": "無法清除所有群組：{error}"
   },
-  "modpack-scan-modal.delete-all-groups.proceed": {
-    "message": "清除"
-  },
   "modpack-scan-modal.delete-all-groups.success": {
     "message": "已成功清除所有群組。"
   },
@@ -3026,9 +3020,6 @@
   "modpack-scan-modal.scanning": {
     "message": "正在掃描..."
   },
-  "modpack-scan-modal.success": {
-    "message": "成功"
-  },
   "modpack-scan-modal.title": {
     "message": "模組包掃描（{scanned}/{total} 個檔案）"
   },
diff --git a/packages/ui/src/components/sharing/invite-players-modal/index.vue b/packages/ui/src/components/sharing/invite-players-modal/index.vue
index 656459e741..1188a1fcd9 100644
--- a/packages/ui/src/components/sharing/invite-players-modal/index.vue
+++ b/packages/ui/src/components/sharing/invite-players-modal/index.vue
@@ -147,6 +147,7 @@ import { Button } from '#ui/components/base/buttons'
 
 import { defineMessages, useVIntl } from '../../../composables/i18n'
 import { injectNotificationManager } from '../../../providers'
+import { commonMessages } from '../../../utils/common-messages'
 import Avatar from '../../base/Avatar.vue'
 import Combobox from '../../base/Combobox.vue'
 import NewModal from '../../modal/NewModal.vue'
@@ -226,10 +227,6 @@ const messages = defineMessages({
 		id: 'sharing.invite-players-modal.added',
 		defaultMessage: 'Added',
 	},
-	cancelButton: {
-		id: 'sharing.invite-players-modal.cancel',
-		defaultMessage: 'Cancel',
-	},
 	requestedButton: {
 		id: 'sharing.invite-players-modal.requested',
 		defaultMessage: 'Request sent',
@@ -297,7 +294,9 @@ const searchPlaceholderLabel = computed(
 const addButtonLabel = computed(() => props.addLabel ?? formatMessage(messages.addButton))
 const inviteButtonLabel = computed(() => props.inviteLabel ?? formatMessage(messages.inviteButton))
 const addedButtonLabel = computed(() => props.addedLabel ?? formatMessage(messages.addedButton))
-const cancelButtonLabel = computed(() => props.cancelLabel ?? formatMessage(messages.cancelButton))
+const cancelButtonLabel = computed(
+	() => props.cancelLabel ?? formatMessage(commonMessages.cancelButton),
+)
 const requestedButtonLabel = computed(
 	() => props.requestedLabel ?? formatMessage(messages.requestedButton),
 )
diff --git a/packages/ui/src/components/sharing/invite-players-modal/invite-players-modal-invite-link-editor.vue b/packages/ui/src/components/sharing/invite-players-modal/invite-players-modal-invite-link-editor.vue
index e1caca8cd1..c59177c2fd 100644
--- a/packages/ui/src/components/sharing/invite-players-modal/invite-players-modal-invite-link-editor.vue
+++ b/packages/ui/src/components/sharing/invite-players-modal/invite-players-modal-invite-link-editor.vue
@@ -32,7 +32,7 @@
 							/>
 							<div class="flex justify-end gap-2 p-3 pt-1">
 								<Button type="outlined" native-type="button" @click="cancelCustomExpiry">
-									{{ formatMessage(messages.cancel) }}
+									{{ formatMessage(commonMessages.cancelButton) }}
 								</Button>
 								<Button
 									type="colored"
@@ -73,7 +73,7 @@
 			<div class="flex justify-end gap-2">
 				<Button :disabled="saving" @click="modal?.hide()">
 					<XIcon aria-hidden="true" />
-					{{ formatMessage(messages.cancel) }}
+					{{ formatMessage(commonMessages.cancelButton) }}
 				</Button>
 				<Button type="colored" color="brand" :disabled="!canSave" @click="save">
 					<SpinnerIcon v-if="saving" class="animate-spin" aria-hidden="true" />
@@ -94,6 +94,7 @@ import { Button } from '#ui/components/base/buttons'
 import { useFormatDateTime } from '../../../composables'
 import { defineMessages, useVIntl } from '../../../composables/i18n'
 import { injectNotificationManager } from '../../../providers'
+import { commonMessages } from '../../../utils/common-messages'
 import Combobox, { type ComboboxOption } from '../../base/Combobox.vue'
 import DatePicker from '../../base/DatePicker.vue'
 import StyledInput from '../../base/StyledInput.vue'
@@ -186,10 +187,6 @@ const messages = defineMessages({
 		id: 'sharing.invite-players-modal.custom-expiry-value',
 		defaultMessage: 'Custom: {date}',
 	},
-	cancel: {
-		id: 'sharing.invite-players-modal.cancel-button',
-		defaultMessage: 'Cancel',
-	},
 	apply: {
 		id: 'sharing.invite-players-modal.apply-button',
 		defaultMessage: 'Apply',
diff --git a/packages/ui/src/layouts/shared/files-tab/components/editor/EditorFindReplace.vue b/packages/ui/src/layouts/shared/files-tab/components/editor/EditorFindReplace.vue
index 47a19ca752..4248691886 100644
--- a/packages/ui/src/layouts/shared/files-tab/components/editor/EditorFindReplace.vue
+++ b/packages/ui/src/layouts/shared/files-tab/components/editor/EditorFindReplace.vue
@@ -66,9 +66,9 @@
 				</IconButton>
 				<div class="mx-0.5 h-4 w-px bg-surface-5" />
 				<IconButton
-					v-tooltip="formatMessage(messages.closeFind)"
+					v-tooltip="formatMessage(commonMessages.closeButton)"
 					type="quiet"
-					:label="formatMessage(messages.closeFind)"
+					:label="formatMessage(commonMessages.closeButton)"
 					@click="close"
 				>
 					<XIcon />
@@ -118,6 +118,7 @@ import { nextTick, ref, watch } from 'vue'
 import { Button, IconButton } from '#ui/components/base/buttons'
 import StyledInput from '#ui/components/base/StyledInput.vue'
 import { defineMessages, useVIntl } from '#ui/composables/i18n'
+import { commonMessages } from '#ui/utils/common-messages'
 
 const props = defineProps<{
 	isFindOpen: boolean
@@ -161,10 +162,6 @@ const messages = defineMessages({
 		id: 'files.editor.find-next-match',
 		defaultMessage: 'Next match',
 	},
-	closeFind: {
-		id: 'files.editor.find-close',
-		defaultMessage: 'Close',
-	},
 	toggleReplace: {
 		id: 'files.editor.find-toggle-replace',
 		defaultMessage: 'Toggle replace',
diff --git a/packages/ui/src/locales/cs-CZ/index.json b/packages/ui/src/locales/cs-CZ/index.json
index 6552d0fc48..56154cebc0 100644
--- a/packages/ui/src/locales/cs-CZ/index.json
+++ b/packages/ui/src/locales/cs-CZ/index.json
@@ -1130,9 +1130,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Soubor uložen"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Zavřít"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Najít"
   },
@@ -4557,4 +4554,3 @@
     "defaultMessage": "Typ"
   }
 }
-
diff --git a/packages/ui/src/locales/da-DK/index.json b/packages/ui/src/locales/da-DK/index.json
index 4e5043ceac..71381b8a42 100644
--- a/packages/ui/src/locales/da-DK/index.json
+++ b/packages/ui/src/locales/da-DK/index.json
@@ -557,9 +557,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Fil gemt"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Luk"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Find"
   },
@@ -2253,4 +2250,3 @@
     "defaultMessage": "Vanilla Shader"
   }
 }
-
diff --git a/packages/ui/src/locales/de-CH/index.json b/packages/ui/src/locales/de-CH/index.json
index 2c28e50ba2..4620db4fa0 100644
--- a/packages/ui/src/locales/de-CH/index.json
+++ b/packages/ui/src/locales/de-CH/index.json
@@ -1304,9 +1304,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Datei gespeichert"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Schliessen"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Finden"
   },
@@ -5399,12 +5396,6 @@
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "Avatar von {username}"
   },
-  "sharing.invite-players-modal.cancel": {
-    "defaultMessage": "Abbrechen"
-  },
-  "sharing.invite-players-modal.cancel-button": {
-    "defaultMessage": "Abbrechen"
-  },
   "sharing.invite-players-modal.custom-expiry": {
     "defaultMessage": "Benutzerdefiniert..."
   },
@@ -6240,4 +6231,3 @@
     "defaultMessage": "Typ"
   }
 }
-
diff --git a/packages/ui/src/locales/de-DE/index.json b/packages/ui/src/locales/de-DE/index.json
index d77097b3eb..e49817eab2 100644
--- a/packages/ui/src/locales/de-DE/index.json
+++ b/packages/ui/src/locales/de-DE/index.json
@@ -1304,9 +1304,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Datei gespeichert"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Schließen"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Finden"
   },
@@ -5399,12 +5396,6 @@
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "Avatar von {username}"
   },
-  "sharing.invite-players-modal.cancel": {
-    "defaultMessage": "Abbrechen"
-  },
-  "sharing.invite-players-modal.cancel-button": {
-    "defaultMessage": "Abbrechen"
-  },
   "sharing.invite-players-modal.custom-expiry": {
     "defaultMessage": "Benutzerdefiniert..."
   },
@@ -6240,4 +6231,3 @@
     "defaultMessage": "Typ"
   }
 }
-
diff --git a/packages/ui/src/locales/en-US/index.json b/packages/ui/src/locales/en-US/index.json
index f842c47c3d..b1704ca9cc 100644
--- a/packages/ui/src/locales/en-US/index.json
+++ b/packages/ui/src/locales/en-US/index.json
@@ -1304,9 +1304,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "File saved"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Close"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Find"
   },
@@ -5414,12 +5411,6 @@
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "{username}'s avatar"
   },
-  "sharing.invite-players-modal.cancel": {
-    "defaultMessage": "Cancel"
-  },
-  "sharing.invite-players-modal.cancel-button": {
-    "defaultMessage": "Cancel"
-  },
   "sharing.invite-players-modal.custom-expiry": {
     "defaultMessage": "Custom..."
   },
diff --git a/packages/ui/src/locales/es-419/index.json b/packages/ui/src/locales/es-419/index.json
index 729504e9a4..d72d86a709 100644
--- a/packages/ui/src/locales/es-419/index.json
+++ b/packages/ui/src/locales/es-419/index.json
@@ -1304,9 +1304,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Archivo guardado"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Cerrar"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Buscar"
   },
@@ -5414,12 +5411,6 @@
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "Avatar de {username}"
   },
-  "sharing.invite-players-modal.cancel": {
-    "defaultMessage": "Cancelar"
-  },
-  "sharing.invite-players-modal.cancel-button": {
-    "defaultMessage": "Cancelar"
-  },
   "sharing.invite-players-modal.custom-expiry": {
     "defaultMessage": "Otro..."
   },
@@ -6255,4 +6246,3 @@
     "defaultMessage": "Tipo"
   }
 }
-
diff --git a/packages/ui/src/locales/es-ES/index.json b/packages/ui/src/locales/es-ES/index.json
index bfeabbbb50..d198fae97f 100644
--- a/packages/ui/src/locales/es-ES/index.json
+++ b/packages/ui/src/locales/es-ES/index.json
@@ -1187,9 +1187,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Archivo guardado"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Cerrar"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Encontrar"
   },
diff --git a/packages/ui/src/locales/fil-PH/index.json b/packages/ui/src/locales/fil-PH/index.json
index 330f5de707..643493b467 100644
--- a/packages/ui/src/locales/fil-PH/index.json
+++ b/packages/ui/src/locales/fil-PH/index.json
@@ -341,9 +341,6 @@
   "external-project-license-status.yes": {
     "defaultMessage": "Oo"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Isara"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Hahanapin"
   },
@@ -2766,4 +2763,3 @@
     "defaultMessage": "Uri"
   }
 }
-
diff --git a/packages/ui/src/locales/fr-FR/index.json b/packages/ui/src/locales/fr-FR/index.json
index 094ee87f74..3a73d5ac67 100644
--- a/packages/ui/src/locales/fr-FR/index.json
+++ b/packages/ui/src/locales/fr-FR/index.json
@@ -1301,9 +1301,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Fichier sauvegardé"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Fermer"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Trouver"
   },
@@ -5390,12 +5387,6 @@
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "Avatar de {username}"
   },
-  "sharing.invite-players-modal.cancel": {
-    "defaultMessage": "Annuler"
-  },
-  "sharing.invite-players-modal.cancel-button": {
-    "defaultMessage": "Annuler"
-  },
   "sharing.invite-players-modal.custom-expiry": {
     "defaultMessage": "Personnaliser..."
   },
diff --git a/packages/ui/src/locales/hu-HU/index.json b/packages/ui/src/locales/hu-HU/index.json
index 3779af7ee2..56b16f5eb5 100644
--- a/packages/ui/src/locales/hu-HU/index.json
+++ b/packages/ui/src/locales/hu-HU/index.json
@@ -1028,9 +1028,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "A fájl mentve"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Bezárás"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Keresés"
   },
@@ -4544,12 +4541,6 @@
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "{username} avatárja"
   },
-  "sharing.invite-players-modal.cancel": {
-    "defaultMessage": "Mégse"
-  },
-  "sharing.invite-players-modal.cancel-button": {
-    "defaultMessage": "Mégse"
-  },
   "sharing.invite-players-modal.edit-invite-link": {
     "defaultMessage": "Meghívólink szerkesztése."
   },
diff --git a/packages/ui/src/locales/id-ID/index.json b/packages/ui/src/locales/id-ID/index.json
index ea86cec49e..f813993ef3 100644
--- a/packages/ui/src/locales/id-ID/index.json
+++ b/packages/ui/src/locales/id-ID/index.json
@@ -824,9 +824,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Berkas disimpan"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Tutup"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Cari"
   },
@@ -2985,4 +2982,3 @@
     "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 7e05068c8d..8c99b7d979 100644
--- a/packages/ui/src/locales/it-IT/index.json
+++ b/packages/ui/src/locales/it-IT/index.json
@@ -1274,9 +1274,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "File salvato"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Chiudi"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Trova"
   },
@@ -5372,12 +5369,6 @@
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "Foto profilo di {username}"
   },
-  "sharing.invite-players-modal.cancel": {
-    "defaultMessage": "Annulla"
-  },
-  "sharing.invite-players-modal.cancel-button": {
-    "defaultMessage": "Annulla"
-  },
   "sharing.invite-players-modal.custom-expiry": {
     "defaultMessage": "Personalizzata..."
   },
diff --git a/packages/ui/src/locales/ja-JP/index.json b/packages/ui/src/locales/ja-JP/index.json
index 88b8a1f1e3..8ade34a533 100644
--- a/packages/ui/src/locales/ja-JP/index.json
+++ b/packages/ui/src/locales/ja-JP/index.json
@@ -1220,9 +1220,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "保存済み"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "閉じる"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "検索"
   },
diff --git a/packages/ui/src/locales/ko-KR/index.json b/packages/ui/src/locales/ko-KR/index.json
index ba31764d58..cb845c6eef 100644
--- a/packages/ui/src/locales/ko-KR/index.json
+++ b/packages/ui/src/locales/ko-KR/index.json
@@ -1304,9 +1304,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "파일 저장됨"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "닫다"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "찾다"
   },
@@ -5396,12 +5393,6 @@
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "{username} 님의 아바타"
   },
-  "sharing.invite-players-modal.cancel": {
-    "defaultMessage": "취소"
-  },
-  "sharing.invite-players-modal.cancel-button": {
-    "defaultMessage": "취소"
-  },
   "sharing.invite-players-modal.custom-expiry": {
     "defaultMessage": "커스텀..."
   },
diff --git a/packages/ui/src/locales/ms-MY/index.json b/packages/ui/src/locales/ms-MY/index.json
index ac9fff9c1f..07a9a3002a 100644
--- a/packages/ui/src/locales/ms-MY/index.json
+++ b/packages/ui/src/locales/ms-MY/index.json
@@ -914,9 +914,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Fail disimpan"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Tutup"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Cari"
   },
@@ -5058,4 +5055,3 @@
     "defaultMessage": "Jenis"
   }
 }
-
diff --git a/packages/ui/src/locales/nl-NL/index.json b/packages/ui/src/locales/nl-NL/index.json
index f81e8595b8..456e7988e7 100644
--- a/packages/ui/src/locales/nl-NL/index.json
+++ b/packages/ui/src/locales/nl-NL/index.json
@@ -1301,9 +1301,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Bestand opgeslagen"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Sluiten"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Vind"
   },
@@ -5219,12 +5216,6 @@
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "Avatar van {username}"
   },
-  "sharing.invite-players-modal.cancel": {
-    "defaultMessage": "Annuleren"
-  },
-  "sharing.invite-players-modal.cancel-button": {
-    "defaultMessage": "Annuleren"
-  },
   "sharing.invite-players-modal.edit-invite-link": {
     "defaultMessage": "Uitnodigingslink bewerken."
   },
diff --git a/packages/ui/src/locales/pl-PL/index.json b/packages/ui/src/locales/pl-PL/index.json
index e94c7806ae..a602e1f73c 100644
--- a/packages/ui/src/locales/pl-PL/index.json
+++ b/packages/ui/src/locales/pl-PL/index.json
@@ -1298,9 +1298,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Plik zapisany"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Zamknij"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Znajdź"
   },
@@ -5369,12 +5366,6 @@
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "Awatar użytkownika {username}"
   },
-  "sharing.invite-players-modal.cancel": {
-    "defaultMessage": "Anuluj"
-  },
-  "sharing.invite-players-modal.cancel-button": {
-    "defaultMessage": "Anuluj"
-  },
   "sharing.invite-players-modal.expiry-label": {
     "defaultMessage": "Data wygaśnięcia"
   },
diff --git a/packages/ui/src/locales/pt-BR/index.json b/packages/ui/src/locales/pt-BR/index.json
index 66ce220ef1..454a67c26c 100644
--- a/packages/ui/src/locales/pt-BR/index.json
+++ b/packages/ui/src/locales/pt-BR/index.json
@@ -1304,9 +1304,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Arquivo salvo"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Fechar"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Localizar"
   },
@@ -5414,12 +5411,6 @@
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "Avatar de {username}"
   },
-  "sharing.invite-players-modal.cancel": {
-    "defaultMessage": "Cancelar"
-  },
-  "sharing.invite-players-modal.cancel-button": {
-    "defaultMessage": "Cancelar"
-  },
   "sharing.invite-players-modal.custom-expiry": {
     "defaultMessage": "Personalizado..."
   },
@@ -6255,4 +6246,3 @@
     "defaultMessage": "Tipo"
   }
 }
-
diff --git a/packages/ui/src/locales/pt-PT/index.json b/packages/ui/src/locales/pt-PT/index.json
index a0e28dd70f..3fae453a27 100644
--- a/packages/ui/src/locales/pt-PT/index.json
+++ b/packages/ui/src/locales/pt-PT/index.json
@@ -497,9 +497,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Ficheiro salvo"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Fechar"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Encontrar"
   },
@@ -2526,4 +2523,3 @@
     "defaultMessage": "Tens alterações por guardar."
   }
 }
-
diff --git a/packages/ui/src/locales/ro-RO/index.json b/packages/ui/src/locales/ro-RO/index.json
index 689a414b43..3fe8371574 100644
--- a/packages/ui/src/locales/ro-RO/index.json
+++ b/packages/ui/src/locales/ro-RO/index.json
@@ -551,9 +551,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Fișier salvat"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Închide"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Caută"
   },
diff --git a/packages/ui/src/locales/ru-RU/index.json b/packages/ui/src/locales/ru-RU/index.json
index 02cfd73fea..24430a0f10 100644
--- a/packages/ui/src/locales/ru-RU/index.json
+++ b/packages/ui/src/locales/ru-RU/index.json
@@ -1232,9 +1232,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Файл сохранён"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Закрыть"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Найти"
   },
@@ -5327,12 +5324,6 @@
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "Аватар {username}"
   },
-  "sharing.invite-players-modal.cancel": {
-    "defaultMessage": "Отозвать"
-  },
-  "sharing.invite-players-modal.cancel-button": {
-    "defaultMessage": "Отмена"
-  },
   "sharing.invite-players-modal.custom-expiry": {
     "defaultMessage": "Другое..."
   },
diff --git a/packages/ui/src/locales/sr-CS/index.json b/packages/ui/src/locales/sr-CS/index.json
index ab8bd7321c..a7d528128b 100644
--- a/packages/ui/src/locales/sr-CS/index.json
+++ b/packages/ui/src/locales/sr-CS/index.json
@@ -1253,9 +1253,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Datoteka sačuvana"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Zatvori"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Pronađi"
   },
@@ -5784,4 +5781,3 @@
     "defaultMessage": "Tip"
   }
 }
-
diff --git a/packages/ui/src/locales/sv-SE/index.json b/packages/ui/src/locales/sv-SE/index.json
index 7bddb0ed35..93cd6523dc 100644
--- a/packages/ui/src/locales/sv-SE/index.json
+++ b/packages/ui/src/locales/sv-SE/index.json
@@ -1142,9 +1142,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Filen sparades"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Stäng"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Hitta"
   },
@@ -4760,12 +4757,6 @@
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "{username}s avatar"
   },
-  "sharing.invite-players-modal.cancel": {
-    "defaultMessage": "Avbryt"
-  },
-  "sharing.invite-players-modal.cancel-button": {
-    "defaultMessage": "Avbryt"
-  },
   "sharing.invite-players-modal.custom-expiry": {
     "defaultMessage": "Anpassat..."
   },
@@ -5442,4 +5433,3 @@
     "defaultMessage": "Typ"
   }
 }
-
diff --git a/packages/ui/src/locales/tr-TR/index.json b/packages/ui/src/locales/tr-TR/index.json
index a3b32086b6..8fa466b737 100644
--- a/packages/ui/src/locales/tr-TR/index.json
+++ b/packages/ui/src/locales/tr-TR/index.json
@@ -1274,9 +1274,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Dosya kaydedildi"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Kapat"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Bul"
   },
diff --git a/packages/ui/src/locales/uk-UA/index.json b/packages/ui/src/locales/uk-UA/index.json
index aec21f8bc4..a4850a6d7d 100644
--- a/packages/ui/src/locales/uk-UA/index.json
+++ b/packages/ui/src/locales/uk-UA/index.json
@@ -1259,9 +1259,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Файл збережено"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Закрити"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Знайти"
   },
@@ -5363,12 +5360,6 @@
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "Аватар користувача {username}"
   },
-  "sharing.invite-players-modal.cancel": {
-    "defaultMessage": "Скасувати"
-  },
-  "sharing.invite-players-modal.cancel-button": {
-    "defaultMessage": "Скасувати"
-  },
   "sharing.invite-players-modal.custom-expiry": {
     "defaultMessage": "Власна…"
   },
diff --git a/packages/ui/src/locales/vi-VN/index.json b/packages/ui/src/locales/vi-VN/index.json
index b356f09f22..96044097c8 100644
--- a/packages/ui/src/locales/vi-VN/index.json
+++ b/packages/ui/src/locales/vi-VN/index.json
@@ -935,9 +935,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Tệp đã được lưu"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Đóng"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Tìm"
   },
@@ -5082,4 +5079,3 @@
     "defaultMessage": "Đội ngũ Modrinth"
   }
 }
-
diff --git a/packages/ui/src/locales/zh-CN/index.json b/packages/ui/src/locales/zh-CN/index.json
index 93120e2208..229117c170 100644
--- a/packages/ui/src/locales/zh-CN/index.json
+++ b/packages/ui/src/locales/zh-CN/index.json
@@ -1304,9 +1304,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "文件已保存"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "关闭"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "查找"
   },
@@ -5414,12 +5411,6 @@
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "{username} 的头像"
   },
-  "sharing.invite-players-modal.cancel": {
-    "defaultMessage": "取消"
-  },
-  "sharing.invite-players-modal.cancel-button": {
-    "defaultMessage": "取消"
-  },
   "sharing.invite-players-modal.custom-expiry": {
     "defaultMessage": "自定义……"
   },
@@ -6255,4 +6246,3 @@
     "defaultMessage": "类型"
   }
 }
-
diff --git a/packages/ui/src/locales/zh-TW/index.json b/packages/ui/src/locales/zh-TW/index.json
index 99b95591ea..c42ded253b 100644
--- a/packages/ui/src/locales/zh-TW/index.json
+++ b/packages/ui/src/locales/zh-TW/index.json
@@ -1304,9 +1304,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "已儲存檔案"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "關閉"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "尋找"
   },
@@ -5414,12 +5411,6 @@
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "{username} 的顯示圖片"
   },
-  "sharing.invite-players-modal.cancel": {
-    "defaultMessage": "取消"
-  },
-  "sharing.invite-players-modal.cancel-button": {
-    "defaultMessage": "取消"
-  },
   "sharing.invite-players-modal.custom-expiry": {
     "defaultMessage": "自訂..."
   },
@@ -6255,4 +6246,3 @@
     "defaultMessage": "類型"
   }
 }
-

From f234b7a0ac5c3a0b21ed33a5a3841a8050fe6385 Mon Sep 17 00:00:00 2001
From: "Calum H." <calum@modrinth.com>
Date: Fri, 7 Aug 2026 05:43:17 +0100
Subject: [PATCH 40/82] fix: broken plan selector colors (#7013)

---
 .../servers/marketing/ServerPlanSelector.vue  | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/apps/frontend/src/components/ui/servers/marketing/ServerPlanSelector.vue b/apps/frontend/src/components/ui/servers/marketing/ServerPlanSelector.vue
index c36537d79c..9e0bffc6e7 100644
--- a/apps/frontend/src/components/ui/servers/marketing/ServerPlanSelector.vue
+++ b/apps/frontend/src/components/ui/servers/marketing/ServerPlanSelector.vue
@@ -42,8 +42,7 @@ const plans: Record<
 	Plan,
 	{
 		buttonColor: 'blue' | 'green' | 'purple'
-		accentText: string
-		accentBg: string
+		buttonClasses: string
 		name: MessageDescriptor
 		description: MessageDescriptor
 		mostPopular: boolean
@@ -51,8 +50,7 @@ const plans: Record<
 > = {
 	small: {
 		buttonColor: 'blue',
-		accentText: 'text-blue',
-		accentBg: 'bg-bg-blue',
+		buttonClasses: '!bg-highlight-blue !text-blue',
 		name: commonMessages.planSmallLabel,
 		description: defineMessage({
 			id: 'servers.plan.small.description',
@@ -62,8 +60,7 @@ const plans: Record<
 	},
 	medium: {
 		buttonColor: 'green',
-		accentText: 'text-green',
-		accentBg: 'bg-bg-green',
+		buttonClasses: '',
 		name: commonMessages.planMediumLabel,
 		description: defineMessage({
 			id: 'servers.plan.medium.description',
@@ -73,8 +70,7 @@ const plans: Record<
 	},
 	large: {
 		buttonColor: 'purple',
-		accentText: 'text-purple',
-		accentBg: 'bg-bg-purple',
+		buttonClasses: '!bg-highlight-purple !text-purple',
 		name: commonMessages.planLargeLabel,
 		description: defineMessage({
 			id: 'servers.plan.large.description',
@@ -150,16 +146,20 @@ const billingMonths = computed(() => {
 				v-if="outOfStock"
 				disabled
 				size="xl"
-				:type="plans[plan].mostPopular ? 'colored' : 'base'"
-				:color="plans[plan].mostPopular ? plans[plan].buttonColor : undefined"
+				:type="plans[plan].mostPopular ? 'colored' : 'quiet'"
+				:color="plans[plan].buttonColor"
+				:interaction="plans[plan].mostPopular ? undefined : 'none'"
+				:class="plans[plan].buttonClasses"
 			>
 				{{ formatMessage(messages.outOfStock) }}
 			</Button>
 			<Button
 				v-else
 				size="xl"
-				:type="plans[plan].mostPopular ? 'colored' : 'base'"
-				:color="plans[plan].mostPopular ? plans[plan].buttonColor : undefined"
+				:type="plans[plan].mostPopular ? 'colored' : 'quiet'"
+				:color="plans[plan].buttonColor"
+				:interaction="plans[plan].mostPopular ? undefined : 'none'"
+				:class="plans[plan].buttonClasses"
 				@click="() => emit('select')"
 			>
 				{{ formatMessage(messages.selectPlanButton) }}

From 9625740906dbfeaba37b05090f58357b8aad7bfd Mon Sep 17 00:00:00 2001
From: Arthur <contact@creeperkatze.dev>
Date: Fri, 7 Aug 2026 08:29:06 +0200
Subject: [PATCH 41/82] fix: anchored teleport (#7027)

* Fix anchored teleport

* pointless commit

Signed-off-by: Prospector <6166773+Prospector@users.noreply.github.com>

* undo

Signed-off-by: Prospector <6166773+Prospector@users.noreply.github.com>

* prepr

---------

Signed-off-by: Prospector <6166773+Prospector@users.noreply.github.com>
Co-authored-by: Prospector <6166773+Prospector@users.noreply.github.com>
---
 .../ui/src/utils/use-anchored-teleport.ts     | 34 ++++++++-----------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/packages/ui/src/utils/use-anchored-teleport.ts b/packages/ui/src/utils/use-anchored-teleport.ts
index 453de58fb6..304fc4601e 100644
--- a/packages/ui/src/utils/use-anchored-teleport.ts
+++ b/packages/ui/src/utils/use-anchored-teleport.ts
@@ -37,7 +37,8 @@ export function useAnchoredTeleport(
 		if (!isOpen.value || !trigger.value || !panel.value) return
 
 		const triggerRect = trigger.value.getBoundingClientRect()
-		const panelRect = panel.value.getBoundingClientRect()
+		const panelWidth = panel.value.offsetWidth
+		const panelHeight = panel.value.offsetHeight
 		const offset = distance.value
 		const alignsEnd = placement.value.endsWith('end')
 		const isHorizontal = placement.value.startsWith('right') || placement.value.startsWith('left')
@@ -49,34 +50,27 @@ export function useAnchoredTeleport(
 			const spaceRight = window.innerWidth - triggerRect.right - viewportPadding
 			const spaceLeft = triggerRect.left - viewportPadding
 			const opensRight = prefersRight
-				? panelRect.width + offset <= spaceRight || spaceRight > spaceLeft
-				: panelRect.width + offset > spaceLeft && spaceRight > spaceLeft
+				? panelWidth + offset <= spaceRight || spaceRight > spaceLeft
+				: panelWidth + offset > spaceLeft && spaceRight > spaceLeft
 
 			resolvedSide.value = opensRight ? 'right' : 'left'
-			idealTop = alignsEnd ? triggerRect.bottom - panelRect.height : triggerRect.top
-			idealLeft = opensRight
-				? triggerRect.right + offset
-				: triggerRect.left - panelRect.width - offset
+			idealTop = alignsEnd ? triggerRect.bottom - panelHeight : triggerRect.top
+			idealLeft = opensRight ? triggerRect.right + offset : triggerRect.left - panelWidth - offset
 		} else {
 			const prefersTop = placement.value.startsWith('top')
 			const spaceBelow = window.innerHeight - triggerRect.bottom - viewportPadding
 			const spaceAbove = triggerRect.top - viewportPadding
 			const opensAbove = prefersTop
-				? panelRect.height + offset <= spaceAbove || spaceAbove > spaceBelow
-				: panelRect.height + offset > spaceBelow && spaceAbove > spaceBelow
+				? panelHeight + offset <= spaceAbove || spaceAbove > spaceBelow
+				: panelHeight + offset > spaceBelow && spaceAbove > spaceBelow
 
 			resolvedSide.value = opensAbove ? 'top' : 'bottom'
-			idealTop = opensAbove
-				? triggerRect.top - panelRect.height - offset
-				: triggerRect.bottom + offset
-			idealLeft = alignsEnd ? triggerRect.right - panelRect.width : triggerRect.left
+			idealTop = opensAbove ? triggerRect.top - panelHeight - offset : triggerRect.bottom + offset
+			idealLeft = alignsEnd ? triggerRect.right - panelWidth : triggerRect.left
 		}
 
-		const maxTop = Math.max(
-			viewportPadding,
-			window.innerHeight - panelRect.height - viewportPadding,
-		)
-		const maxLeft = Math.max(viewportPadding, window.innerWidth - panelRect.width - viewportPadding)
+		const maxTop = Math.max(viewportPadding, window.innerHeight - panelHeight - viewportPadding)
+		const maxLeft = Math.max(viewportPadding, window.innerWidth - panelWidth - viewportPadding)
 		const panelTop = Math.min(Math.max(idealTop, viewportPadding), maxTop)
 		const panelLeft = Math.min(Math.max(idealLeft, viewportPadding), maxLeft)
 
@@ -89,13 +83,13 @@ export function useAnchoredTeleport(
 			? {
 					top: `${Math.min(
 						Math.max(triggerRect.top + triggerRect.height / 2 - panelTop, anchorPadding),
-						Math.max(anchorPadding, panelRect.height - anchorPadding),
+						Math.max(anchorPadding, panelHeight - anchorPadding),
 					)}px`,
 				}
 			: {
 					left: `${Math.min(
 						Math.max(triggerRect.left + triggerRect.width / 2 - panelLeft, anchorPadding),
-						Math.max(anchorPadding, panelRect.width - anchorPadding),
+						Math.max(anchorPadding, panelWidth - anchorPadding),
 					)}px`,
 				}
 	}

From 61b52ecd2cb747a722a0b15e1db13e1b0cd513bb Mon Sep 17 00:00:00 2001
From: Arthur <contact@creeperkatze.dev>
Date: Fri, 7 Aug 2026 08:30:42 +0200
Subject: [PATCH 42/82] fix: inconsistent color vars (#7028)

* Fix inconsistent color vars

* pointless commit

Signed-off-by: Prospector <6166773+Prospector@users.noreply.github.com>

* undo

Signed-off-by: Prospector <6166773+Prospector@users.noreply.github.com>

* prepr

---------

Signed-off-by: Prospector <6166773+Prospector@users.noreply.github.com>
Co-authored-by: Prospector <6166773+Prospector@users.noreply.github.com>
---
 .../share/shared-instance-members-table.vue   |  2 +-
 .../src/pages/instance/worlds/index.vue       |  2 +-
 .../stat-cards/StatCard.vue                   |  2 +-
 .../components/LoaderPicker.vue               |  2 +-
 apps/frontend/src/pages/[type]/[project].vue  |  2 +-
 apps/frontend/src/pages/app.vue               |  2 +-
 .../src/pages/dashboard/revenue/index.vue     |  8 +++----
 apps/frontend/src/pages/hosting/index.vue     |  6 ++---
 .../components/base/CollapsibleAdmonition.vue | 24 +++++++++----------
 .../src/components/base/DropzoneFileInput.vue |  2 +-
 .../ui/src/components/base/FilterPills.vue    |  2 +-
 .../billing/ServersPurchase0Plan.vue          |  4 +---
 .../components/project/server/ServerPing.vue  |  4 ++--
 .../components/servers/access/AccessTable.vue |  2 +-
 .../servers/access/RemoveAccessModal.vue      |  2 +-
 .../servers/access/events/UserAccessEvent.vue |  2 +-
 .../components/ContentSelectionBar.vue        |  2 +-
 .../components/modals/ModpackContentModal.vue |  4 ++--
 .../modals/content-updater-modal/index.vue    |  4 ++--
 .../src/layouts/shared/content-tab/layout.vue |  4 ++--
 .../wrapped/hosting/manage/backups.vue        |  4 +++-
 21 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/apps/app-frontend/src/pages/instance/share/shared-instance-members-table.vue b/apps/app-frontend/src/pages/instance/share/shared-instance-members-table.vue
index 756f9b0430..fb35a9457a 100644
--- a/apps/app-frontend/src/pages/instance/share/shared-instance-members-table.vue
+++ b/apps/app-frontend/src/pages/instance/share/shared-instance-members-table.vue
@@ -283,7 +283,7 @@ function filterClass(active: boolean) {
 	return [
 		'cursor-pointer rounded-full border border-solid px-3 py-1.5 text-base font-semibold leading-5 transition-all duration-100 active:scale-[0.97]',
 		active
-			? 'border-green bg-brand-highlight text-brand'
+			? 'border-brand bg-brand-highlight text-brand'
 			: 'border-surface-5 bg-surface-4 text-primary hover:bg-surface-5',
 	]
 }
diff --git a/apps/app-frontend/src/pages/instance/worlds/index.vue b/apps/app-frontend/src/pages/instance/worlds/index.vue
index 1d9adca70d..10f9118401 100644
--- a/apps/app-frontend/src/pages/instance/worlds/index.vue
+++ b/apps/app-frontend/src/pages/instance/worlds/index.vue
@@ -263,7 +263,7 @@ function filterPillClass(isActive: boolean) {
 	return [
 		'cursor-pointer rounded-full border border-solid px-3 py-1.5 text-base font-semibold leading-5 transition-all duration-100 active:scale-[0.97]',
 		isActive
-			? 'border-green bg-brand-highlight text-brand'
+			? 'border-brand bg-brand-highlight text-brand'
 			: 'border-surface-5 bg-surface-4 text-primary hover:bg-surface-5',
 	]
 }
diff --git a/apps/frontend/src/components/analytics-dashboard/stat-cards/StatCard.vue b/apps/frontend/src/components/analytics-dashboard/stat-cards/StatCard.vue
index 071e2eb584..9585972b1f 100644
--- a/apps/frontend/src/components/analytics-dashboard/stat-cards/StatCard.vue
+++ b/apps/frontend/src/components/analytics-dashboard/stat-cards/StatCard.vue
@@ -5,7 +5,7 @@
 		class="flex h-full appearance-none flex-col gap-2.5 rounded-2xl border border-solid p-5 px-4 text-left transition-colors sm:gap-4"
 		:class="{
 			'cursor-not-allowed border-surface-5 bg-surface-2 opacity-60': disabled,
-			'cursor-default border-brand bg-highlight-green': !disabled && active,
+			'cursor-default border-brand bg-brand-highlight': !disabled && active,
 			'border-surface-5 bg-surface-3 hover:bg-surface-4 active:scale-95': !disabled && !active,
 		}"
 		:disabled="disabled"
diff --git a/apps/frontend/src/components/ui/create-project-version/components/LoaderPicker.vue b/apps/frontend/src/components/ui/create-project-version/components/LoaderPicker.vue
index 4c0ed3356f..1496ee3c4d 100644
--- a/apps/frontend/src/components/ui/create-project-version/components/LoaderPicker.vue
+++ b/apps/frontend/src/components/ui/create-project-version/components/LoaderPicker.vue
@@ -22,7 +22,7 @@
 						class="border !border-solid !transition-all hover:bg-button-bgHover hover:no-underline"
 						:class="
 							selectedLoaders.includes(loader.name)
-								? 'border-brand bg-highlight-green text-brand'
+								? 'border-brand bg-brand-highlight text-brand'
 								: 'border-surface-5'
 						"
 						:style="`--_color: var(--color-platform-${loader.name})`"
diff --git a/apps/frontend/src/pages/[type]/[project].vue b/apps/frontend/src/pages/[type]/[project].vue
index b60e21f004..d3a89b1d27 100644
--- a/apps/frontend/src/pages/[type]/[project].vue
+++ b/apps/frontend/src/pages/[type]/[project].vue
@@ -2186,7 +2186,7 @@ provideProjectPageContext({
 
 .servers-popup {
 	box-shadow:
-		0 0 12px 1px rgba(0, 175, 92, 0.6),
+		0 0 12px 1px color-mix(in srgb, var(--color-brand) 60%, transparent),
 		var(--shadow-floating);
 
 	&::before {
diff --git a/apps/frontend/src/pages/app.vue b/apps/frontend/src/pages/app.vue
index 4f94a7ac1a..e7fd582636 100644
--- a/apps/frontend/src/pages/app.vue
+++ b/apps/frontend/src/pages/app.vue
@@ -533,7 +533,7 @@ useSeoMeta({
 	<div>
 		<div class="landing-hero">
 			<div
-				class="relative mt-4 h-fit w-fit rounded-full bg-highlight-green px-3 py-1 text-sm font-bold text-brand backdrop-blur-lg"
+				class="relative mt-4 h-fit w-fit rounded-full bg-brand-highlight px-3 py-1 text-sm font-bold text-brand backdrop-blur-lg"
 			>
 				{{ formatMessage(commonMessages.betaRelease) }}
 			</div>
diff --git a/apps/frontend/src/pages/dashboard/revenue/index.vue b/apps/frontend/src/pages/dashboard/revenue/index.vue
index 60b503a931..82f4c48756 100644
--- a/apps/frontend/src/pages/dashboard/revenue/index.vue
+++ b/apps/frontend/src/pages/dashboard/revenue/index.vue
@@ -159,22 +159,22 @@
 							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="var(--color-brand)"
 							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="var(--color-brand)"
 							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="var(--color-brand)"
 							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="var(--color-brand)"
 							stroke-opacity="0.12"
 						/>
 					</svg>
diff --git a/apps/frontend/src/pages/hosting/index.vue b/apps/frontend/src/pages/hosting/index.vue
index 5ea21cbd6d..2b99fd96f0 100644
--- a/apps/frontend/src/pages/hosting/index.vue
+++ b/apps/frontend/src/pages/hosting/index.vue
@@ -33,7 +33,7 @@
 			<div class="z-[5] flex w-full flex-col gap-8">
 				<div class="flex flex-col gap-4">
 					<div
-						class="relative h-fit w-fit rounded-full bg-highlight-green px-3 py-1 text-sm font-bold text-brand backdrop-blur-lg"
+						class="relative h-fit w-fit rounded-full bg-brand-highlight px-3 py-1 text-sm font-bold text-brand backdrop-blur-lg"
 					>
 						{{ formatMessage(commonMessages.betaRelease) }}
 					</div>
@@ -110,7 +110,7 @@
 			<div class="faded-brand-line absolute left-0 top-0 h-[1px] w-full"></div>
 			<div class="relative mx-auto flex w-full max-w-7xl flex-col gap-8">
 				<div
-					class="relative w-fit rounded-full bg-highlight-green px-3 py-1 text-sm font-bold text-brand backdrop-blur-lg"
+					class="relative w-fit rounded-full bg-brand-highlight px-3 py-1 text-sm font-bold text-brand backdrop-blur-lg"
 				>
 					{{ formatMessage(messages.whyModrinthHosting) }}
 				</div>
@@ -238,7 +238,7 @@
 			<div class="faded-brand-line absolute left-0 top-0 h-[1px] w-full"></div>
 			<div class="relative mx-auto flex w-full max-w-7xl flex-col gap-8">
 				<div
-					class="relative w-fit rounded-full bg-highlight-green px-3 py-1 text-sm font-bold text-brand backdrop-blur-lg"
+					class="relative w-fit rounded-full bg-brand-highlight px-3 py-1 text-sm font-bold text-brand backdrop-blur-lg"
 				>
 					{{ formatMessage(messages.includedWithYourServer) }}
 				</div>
diff --git a/packages/ui/src/components/base/CollapsibleAdmonition.vue b/packages/ui/src/components/base/CollapsibleAdmonition.vue
index 6df8073d40..30acebedee 100644
--- a/packages/ui/src/components/base/CollapsibleAdmonition.vue
+++ b/packages/ui/src/components/base/CollapsibleAdmonition.vue
@@ -132,51 +132,51 @@ const buttonColors: Record<string, 'blue' | 'orange' | 'red' | 'green'> = {
 
 <style scoped>
 .collapsible-admonition[data-type='critical'] {
-	border-color: rgba(255, 73, 110, 0.6);
+	border-color: color-mix(in srgb, var(--color-red) 60%, transparent);
 }
 
 .collapsible-admonition[data-type='critical'] .collapsible-admonition__item {
-	background: rgba(255, 73, 110, 0.1);
+	background: var(--color-red-bg);
 }
 
 .collapsible-admonition[data-type='critical'] .collapsible-admonition__item--bordered {
-	border-top: 1px solid rgba(255, 73, 110, 0.6);
+	border-top: 1px solid color-mix(in srgb, var(--color-red) 60%, transparent);
 }
 
 .collapsible-admonition[data-type='info'] {
-	border-color: rgba(47, 158, 255, 0.6);
+	border-color: color-mix(in srgb, var(--color-blue) 60%, transparent);
 }
 
 .collapsible-admonition[data-type='info'] .collapsible-admonition__item {
-	background: rgba(47, 158, 255, 0.1);
+	background: var(--color-blue-bg);
 }
 
 .collapsible-admonition[data-type='info'] .collapsible-admonition__item--bordered {
-	border-top: 1px solid rgba(47, 158, 255, 0.6);
+	border-top: 1px solid color-mix(in srgb, var(--color-blue) 60%, transparent);
 }
 
 .collapsible-admonition[data-type='warning'] {
-	border-color: rgba(255, 163, 71, 0.6);
+	border-color: color-mix(in srgb, var(--color-orange) 60%, transparent);
 }
 
 .collapsible-admonition[data-type='warning'] .collapsible-admonition__item {
-	background: rgba(255, 163, 71, 0.1);
+	background: var(--color-orange-bg);
 }
 
 .collapsible-admonition[data-type='warning'] .collapsible-admonition__item--bordered {
-	border-top: 1px solid rgba(255, 163, 71, 0.6);
+	border-top: 1px solid color-mix(in srgb, var(--color-orange) 60%, transparent);
 }
 
 .collapsible-admonition[data-type='success'] {
-	border-color: rgba(27, 217, 106, 0.6);
+	border-color: color-mix(in srgb, var(--color-green) 60%, transparent);
 }
 
 .collapsible-admonition[data-type='success'] .collapsible-admonition__item {
-	background: rgba(27, 217, 106, 0.1);
+	background: var(--color-green-bg);
 }
 
 .collapsible-admonition[data-type='success'] .collapsible-admonition__item--bordered {
-	border-top: 1px solid rgba(27, 217, 106, 0.6);
+	border-top: 1px solid color-mix(in srgb, var(--color-green) 60%, transparent);
 }
 
 .collapsible-admonition-enter-active,
diff --git a/packages/ui/src/components/base/DropzoneFileInput.vue b/packages/ui/src/components/base/DropzoneFileInput.vue
index a2023ef0cc..cac41e5e63 100644
--- a/packages/ui/src/components/base/DropzoneFileInput.vue
+++ b/packages/ui/src/components/base/DropzoneFileInput.vue
@@ -13,7 +13,7 @@
 	>
 		<div
 			:class="[
-				'grid place-content-center  text-brand border-brand border-solid border bg-highlight-green',
+				'grid place-content-center  text-brand border-brand border-solid border bg-brand-highlight',
 				size === 'small' ? 'w-10 h-10' : 'h-14 w-14',
 				size === 'small' ? 'rounded-xl' : 'rounded-2xl',
 			]"
diff --git a/packages/ui/src/components/base/FilterPills.vue b/packages/ui/src/components/base/FilterPills.vue
index fc0b0da539..4a5d052d98 100644
--- a/packages/ui/src/components/base/FilterPills.vue
+++ b/packages/ui/src/components/base/FilterPills.vue
@@ -38,7 +38,7 @@ function pillClass(active: boolean) {
 	return [
 		'cursor-pointer rounded-full border border-solid px-3 py-1.5 text-base font-semibold leading-5 transition-all duration-100 active:scale-[0.97]',
 		active
-			? 'border-green bg-brand-highlight text-brand'
+			? 'border-brand bg-brand-highlight text-brand'
 			: 'border-surface-5 bg-surface-4 text-primary hover:bg-surface-5',
 	]
 }
diff --git a/packages/ui/src/components/billing/ServersPurchase0Plan.vue b/packages/ui/src/components/billing/ServersPurchase0Plan.vue
index 03ae8aaf7b..16d85c9fbb 100644
--- a/packages/ui/src/components/billing/ServersPurchase0Plan.vue
+++ b/packages/ui/src/components/billing/ServersPurchase0Plan.vue
@@ -246,9 +246,7 @@ function selectCustom() {
 			<div
 				class="z-10 -mb-3.5 rounded-full text-sm font-medium text-brand whitespace-nowrap absolute -top-3 right-4 bg-surface-3"
 			>
-				<div
-					class="bg-brand-highlight border border-solid border-highlight-green px-2.5 py-0.5 rounded-full"
-				>
+				<div class="bg-brand-highlight border border-solid border-brand px-2.5 py-0.5 rounded-full">
 					{{ formatMessage(messages.mostPopular) }}
 				</div>
 			</div>
diff --git a/packages/ui/src/components/project/server/ServerPing.vue b/packages/ui/src/components/project/server/ServerPing.vue
index 43185cea63..1d2198b3aa 100644
--- a/packages/ui/src/components/project/server/ServerPing.vue
+++ b/packages/ui/src/components/project/server/ServerPing.vue
@@ -33,10 +33,10 @@ const { formatMessage } = useVIntl()
 
 const pingClass = computed(() => {
 	if (props.ping === undefined) {
-		return 'border-brand bg-highlight-green text-brand'
+		return 'border-green bg-highlight-green text-green'
 	}
 	if (props.ping < 150) {
-		return 'border-brand bg-highlight-green text-brand'
+		return 'border-green bg-highlight-green text-green'
 	}
 	if (props.ping < 250) {
 		return 'border-brand-orange bg-highlight-orange text-orange'
diff --git a/packages/ui/src/components/servers/access/AccessTable.vue b/packages/ui/src/components/servers/access/AccessTable.vue
index 2a88cd322a..6babe5b7ac 100644
--- a/packages/ui/src/components/servers/access/AccessTable.vue
+++ b/packages/ui/src/components/servers/access/AccessTable.vue
@@ -514,7 +514,7 @@ function roleClasses(role: ServerAccessRole): string {
 		case 'owner':
 			return 'border-orange !bg-highlight-orange !text-orange'
 		case 'editor':
-			return 'border-green !bg-highlight-green !text-brand'
+			return 'border-green !bg-highlight-green !text-green'
 		case 'viewer':
 			return 'border-blue !bg-highlight-blue !text-blue'
 	}
diff --git a/packages/ui/src/components/servers/access/RemoveAccessModal.vue b/packages/ui/src/components/servers/access/RemoveAccessModal.vue
index 77e397d051..6543740e00 100644
--- a/packages/ui/src/components/servers/access/RemoveAccessModal.vue
+++ b/packages/ui/src/components/servers/access/RemoveAccessModal.vue
@@ -300,7 +300,7 @@ function roleClasses(role: ServerAccessRole): string {
 		case 'owner':
 			return 'border-orange bg-highlight-orange text-orange'
 		case 'editor':
-			return 'border-green bg-highlight-green text-brand'
+			return 'border-green bg-highlight-green text-green'
 		case 'viewer':
 			return 'border-blue bg-highlight-blue text-blue'
 	}
diff --git a/packages/ui/src/components/servers/access/events/UserAccessEvent.vue b/packages/ui/src/components/servers/access/events/UserAccessEvent.vue
index 37ebd5b805..71a6a06ca5 100644
--- a/packages/ui/src/components/servers/access/events/UserAccessEvent.vue
+++ b/packages/ui/src/components/servers/access/events/UserAccessEvent.vue
@@ -115,7 +115,7 @@ function roleClasses(role: ServerAccessRole): string {
 		case 'owner':
 			return 'border-orange bg-highlight-orange text-orange'
 		case 'editor':
-			return 'border-green bg-highlight-green text-brand'
+			return 'border-green bg-highlight-green text-green'
 		case 'viewer':
 			return 'border-blue bg-highlight-blue text-blue'
 	}
diff --git a/packages/ui/src/layouts/shared/content-tab/components/ContentSelectionBar.vue b/packages/ui/src/layouts/shared/content-tab/components/ContentSelectionBar.vue
index bf2ec3f9c8..949f0c3e6b 100644
--- a/packages/ui/src/layouts/shared/content-tab/components/ContentSelectionBar.vue
+++ b/packages/ui/src/layouts/shared/content-tab/components/ContentSelectionBar.vue
@@ -295,7 +295,7 @@ const bulkProgressMessage = computed(() => {
 				:aria-valuenow="bulkWaiting ? undefined : bulkProgress"
 				:aria-valuemin="0"
 				:aria-valuemax="bulkTotal"
-				style="box-shadow: 0px -2px 4px 0px rgba(27, 217, 106, 0.1)"
+				style="box-shadow: 0px -2px 4px 0px color-mix(in srgb, var(--color-brand) 10%, transparent)"
 			/>
 		</div>
 	</FloatingActionBar>
diff --git a/packages/ui/src/layouts/shared/content-tab/components/modals/ModpackContentModal.vue b/packages/ui/src/layouts/shared/content-tab/components/modals/ModpackContentModal.vue
index 1dc3f4933a..2cdf830569 100644
--- a/packages/ui/src/layouts/shared/content-tab/components/modals/ModpackContentModal.vue
+++ b/packages/ui/src/layouts/shared/content-tab/components/modals/ModpackContentModal.vue
@@ -493,7 +493,7 @@ defineExpose({ show, showLoading, hide, getState, restore, updateItem, setItems
 							class="rounded-full border border-solid px-3 py-1.5 text-base font-semibold leading-5 transition-colors"
 							:class="
 								selectedFilters.length === 0
-									? 'border-green bg-brand-highlight text-brand'
+									? 'border-brand bg-brand-highlight text-brand'
 									: 'border-surface-5 bg-surface-4 text-primary hover:bg-surface-5'
 							"
 							@click="selectedFilters = []"
@@ -507,7 +507,7 @@ defineExpose({ show, showLoading, hide, getState, restore, updateItem, setItems
 							class="rounded-full border border-solid px-3 py-1.5 text-base font-semibold leading-5 transition-colors"
 							:class="
 								selectedFilters.includes(option.id)
-									? 'border-green bg-brand-highlight text-brand'
+									? 'border-brand bg-brand-highlight text-brand'
 									: 'border-surface-5 bg-surface-4 text-primary hover:bg-surface-5'
 							"
 							@click="toggleFilter(option.id)"
diff --git a/packages/ui/src/layouts/shared/content-tab/components/modals/content-updater-modal/index.vue b/packages/ui/src/layouts/shared/content-tab/components/modals/content-updater-modal/index.vue
index cee3fb48a2..a6d3c66943 100644
--- a/packages/ui/src/layouts/shared/content-tab/components/modals/content-updater-modal/index.vue
+++ b/packages/ui/src/layouts/shared/content-tab/components/modals/content-updater-modal/index.vue
@@ -566,7 +566,7 @@ function getBadgeClasses(version: Labrinth.Versions.v2.Version): string {
 	// Version type badges
 	switch (version.version_type) {
 		case 'release':
-			return 'bg-highlight-green border-brand text-brand'
+			return 'bg-highlight-green border-green text-green'
 		case 'beta':
 			return 'bg-highlight-blue border-brand-blue text-brand-blue'
 		case 'alpha':
@@ -579,7 +579,7 @@ function getBadgeClasses(version: Labrinth.Versions.v2.Version): string {
 function getVersionTypeBadgeClasses(version: Labrinth.Versions.v2.Version): string {
 	switch (version.version_type) {
 		case 'release':
-			return 'bg-highlight-green border-brand text-brand'
+			return 'bg-highlight-green border-green text-green'
 		case 'beta':
 			return 'bg-highlight-blue border-brand-blue text-brand-blue'
 		case 'alpha':
diff --git a/packages/ui/src/layouts/shared/content-tab/layout.vue b/packages/ui/src/layouts/shared/content-tab/layout.vue
index 5e7366cd24..2ec27bb643 100644
--- a/packages/ui/src/layouts/shared/content-tab/layout.vue
+++ b/packages/ui/src/layouts/shared/content-tab/layout.vue
@@ -854,7 +854,7 @@ const confirmUnlinkModal = ref<InstanceType<typeof ConfirmUnlinkModal>>()
 									class="cursor-pointer rounded-full border border-solid px-3 py-1.5 text-base font-semibold leading-5 transition-all duration-100 active:scale-[0.97]"
 									:class="
 										selectedFilters.length === 0
-											? 'border-green bg-brand-highlight text-brand'
+											? 'border-brand bg-brand-highlight text-brand'
 											: 'border-surface-5 bg-surface-4 text-primary hover:bg-surface-5'
 									"
 									:aria-pressed="selectedFilters.length === 0"
@@ -868,7 +868,7 @@ const confirmUnlinkModal = ref<InstanceType<typeof ConfirmUnlinkModal>>()
 									class="cursor-pointer rounded-full border border-solid px-3 py-1.5 text-base font-semibold leading-5 transition-all duration-100 active:scale-[0.97]"
 									:class="
 										selectedFilters.includes(option.id)
-											? 'border-green bg-brand-highlight text-brand'
+											? 'border-brand bg-brand-highlight text-brand'
 											: 'border-surface-5 bg-surface-4 text-primary hover:bg-surface-5'
 									"
 									:aria-pressed="selectedFilters.includes(option.id)"
diff --git a/packages/ui/src/layouts/wrapped/hosting/manage/backups.vue b/packages/ui/src/layouts/wrapped/hosting/manage/backups.vue
index 2e313a3877..8733d59559 100644
--- a/packages/ui/src/layouts/wrapped/hosting/manage/backups.vue
+++ b/packages/ui/src/layouts/wrapped/hosting/manage/backups.vue
@@ -234,7 +234,9 @@
 							role="progressbar"
 							:aria-valuemin="0"
 							:aria-valuemax="bulkTotal"
-							style="box-shadow: 0px -2px 4px 0px rgba(27, 217, 106, 0.1)"
+							style="
+								box-shadow: 0px -2px 4px 0px color-mix(in srgb, var(--color-brand) 10%, transparent);
+							"
 						/>
 					</div>
 				</FloatingActionBar>

From 09f2af61dc2312538ebb426ca9be7eebad958492 Mon Sep 17 00:00:00 2001
From: aecsocket <43144841+aecsocket@users.noreply.github.com>
Date: Fri, 7 Aug 2026 18:05:13 +0900
Subject: [PATCH 43/82] fix: Mural payout status schema (#7038)

---
 packages/muralpay/src/payout.rs | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/packages/muralpay/src/payout.rs b/packages/muralpay/src/payout.rs
index 7fb215aaf1..5b3cdc0957 100644
--- a/packages/muralpay/src/payout.rs
+++ b/packages/muralpay/src/payout.rs
@@ -319,7 +319,7 @@ pub struct FiatPayoutDetails {
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 #[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
-#[serde(tag = "type", rename_all = "kebab-case")]
+#[serde(tag = "type", rename_all = "camelCase")]
 pub enum FiatPayoutStatus {
     Created,
     #[serde(rename_all = "camelCase")]
@@ -999,3 +999,22 @@ pub struct CurrenciesBankDetails {
 pub struct CurrencyBankDetails {
     pub bank_names: Vec<String>,
 }
+
+#[cfg(test)]
+mod tests {
+    use super::FiatPayoutStatus;
+
+    #[test]
+    fn deserializes_refund_in_progress_status() -> Result<(), serde_json::Error>
+    {
+        let status = serde_json::from_value(serde_json::json!({
+            "type": "refundInProgress",
+            "errorCode": "UNKNOWN",
+            "failureReason": "The receiving bank rejected the payout",
+            "refundInitiatedAt": "2026-08-07T00:00:00Z"
+        }))?;
+
+        assert!(matches!(status, FiatPayoutStatus::RefundInProgress { .. }));
+        Ok(())
+    }
+}

From feb3c3ee31ed5b7107987066afebe971b6c89677 Mon Sep 17 00:00:00 2001
From: "Michael H." <michael@iptables.sh>
Date: Fri, 7 Aug 2026 11:47:47 +0200
Subject: [PATCH 44/82] build: trigger labrinth ci on packagess

---
 .github/workflows/labrinth-build.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/labrinth-build.yml b/.github/workflows/labrinth-build.yml
index 5fdc1ce080..7dfcffce83 100644
--- a/.github/workflows/labrinth-build.yml
+++ b/.github/workflows/labrinth-build.yml
@@ -8,6 +8,9 @@ on:
     paths:
       - .github/workflows/labrinth-build.yml
       - 'apps/labrinth/**'
+      - 'packages/**'
+      - '!packages/api-client/**'
+      - '!packages/app-lib/**'
       - Cargo.toml
       - Cargo.lock
   pull_request:
@@ -15,6 +18,9 @@ on:
     paths:
       - .github/workflows/labrinth-build.yml
       - 'apps/labrinth/**'
+      - 'packages/**'
+      - '!packages/api-client/**'
+      - '!packages/app-lib/**'
       - Cargo.toml
       - Cargo.lock
   merge_group:

From c57e88ecd43b689a6eaeb449181cfdb54bc911da Mon Sep 17 00:00:00 2001
From: aecsocket <43144841+aecsocket@users.noreply.github.com>
Date: Fri, 7 Aug 2026 23:33:15 +0900
Subject: [PATCH 45/82] fix: improve analytics dependents query (#7025)

* fix: improve analytics dependents query

* fix up compose
---
 ...5f1c520155d65a5c51021224ab4461c688db8.json | 22 -----------
 ...955a75323663880b47aa9ed42c9f33cd65f16.json | 28 ++++++++++++++
 .../metrics/project_downloads.rs              | 37 +++++++------------
 .../src/routes/v3/analytics_get/mod.rs        |  2 -
 docker-compose.yml                            |  1 +
 5 files changed, 43 insertions(+), 47 deletions(-)
 delete mode 100644 apps/labrinth/.sqlx/query-6ebb0cffc875f50ebe95b91e4735f1c520155d65a5c51021224ab4461c688db8.json
 create mode 100644 apps/labrinth/.sqlx/query-93b19a49ae305ab760792d22c5b955a75323663880b47aa9ed42c9f33cd65f16.json

diff --git a/apps/labrinth/.sqlx/query-6ebb0cffc875f50ebe95b91e4735f1c520155d65a5c51021224ab4461c688db8.json b/apps/labrinth/.sqlx/query-6ebb0cffc875f50ebe95b91e4735f1c520155d65a5c51021224ab4461c688db8.json
deleted file mode 100644
index 6d00c56a9f..0000000000
--- a/apps/labrinth/.sqlx/query-6ebb0cffc875f50ebe95b91e4735f1c520155d65a5c51021224ab4461c688db8.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n        SELECT id FROM mods\n        WHERE id = ANY($1)\n            AND components ? 'minecraft_server'\n        ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "id",
-        "type_info": "Int8"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int8Array"
-      ]
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "6ebb0cffc875f50ebe95b91e4735f1c520155d65a5c51021224ab4461c688db8"
-}
diff --git a/apps/labrinth/.sqlx/query-93b19a49ae305ab760792d22c5b955a75323663880b47aa9ed42c9f33cd65f16.json b/apps/labrinth/.sqlx/query-93b19a49ae305ab760792d22c5b955a75323663880b47aa9ed42c9f33cd65f16.json
new file mode 100644
index 0000000000..3e0b89ec2e
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-93b19a49ae305ab760792d22c5b955a75323663880b47aa9ed42c9f33cd65f16.json
@@ -0,0 +1,28 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        SELECT v.id, v.mod_id\n        FROM versions v\n        INNER JOIN mods m ON m.id = v.mod_id\n        WHERE\n            v.id = ANY($1)\n            AND jsonb_typeof(m.components -> 'minecraft_server') IS DISTINCT FROM 'object'\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 1,
+        "name": "mod_id",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int8Array"
+      ]
+    },
+    "nullable": [
+      false,
+      false
+    ]
+  },
+  "hash": "93b19a49ae305ab760792d22c5b955a75323663880b47aa9ed42c9f33cd65f16"
+}
diff --git a/apps/labrinth/src/routes/v3/analytics_get/metrics/project_downloads.rs b/apps/labrinth/src/routes/v3/analytics_get/metrics/project_downloads.rs
index 36e8aabe16..bfae56126b 100644
--- a/apps/labrinth/src/routes/v3/analytics_get/metrics/project_downloads.rs
+++ b/apps/labrinth/src/routes/v3/analytics_get/metrics/project_downloads.rs
@@ -14,7 +14,7 @@ use serde::{Deserialize, Deserializer, Serialize, Serializer, de::Error as _};
 use crate::{
     database::{
         PgPool,
-        models::{DBProjectId, DBVersion, DBVersionId},
+        models::{DBProjectId, DBVersionId},
     },
     models::{
         ids::{ProjectId, VersionId},
@@ -326,37 +326,28 @@ async fn fetch_dependent_version_projects(
         return Ok(HashMap::new());
     }
 
-    let dependent_on_version_ids =
-        dependent_on_version_ids.into_iter().collect::<Vec<_>>();
-    let versions =
-        DBVersion::get_many(&dependent_on_version_ids, cx.pool, cx.redis)
-            .await?;
-
-    let dependent_project_ids = versions
-        .iter()
-        .map(|version| version.inner.project_id.0)
+    let dependent_on_version_ids = dependent_on_version_ids
+        .into_iter()
+        .map(|version_id| version_id.0)
         .collect::<Vec<_>>();
-    let server_projects = sqlx::query!(
+    let versions = sqlx::query!(
         "
-        SELECT id FROM mods
-        WHERE id = ANY($1)
-            AND components ? 'minecraft_server'
+        SELECT v.id, v.mod_id
+        FROM versions v
+        INNER JOIN mods m ON m.id = v.mod_id
+        WHERE
+            v.id = ANY($1)
+            AND jsonb_typeof(m.components -> 'minecraft_server') IS DISTINCT FROM 'object'
         ",
-        &dependent_project_ids,
+        &dependent_on_version_ids,
     )
     .fetch_all(cx.pool)
     .await
-    .wrap_internal_err("failed to fetch server dependent projects")?
-    .into_iter()
-    .map(|project| DBProjectId(project.id))
-    .collect::<HashSet<_>>();
+    .wrap_internal_err("failed to fetch dependent version projects")?;
 
     Ok(versions
         .into_iter()
-        .filter_map(|version| {
-            (!server_projects.contains(&version.inner.project_id))
-                .then_some((version.inner.id, version.inner.project_id))
-        })
+        .map(|version| (DBVersionId(version.id), DBProjectId(version.mod_id)))
         .collect())
 }
 
diff --git a/apps/labrinth/src/routes/v3/analytics_get/mod.rs b/apps/labrinth/src/routes/v3/analytics_get/mod.rs
index 72d1831dbc..3a23adc780 100644
--- a/apps/labrinth/src/routes/v3/analytics_get/mod.rs
+++ b/apps/labrinth/src/routes/v3/analytics_get/mod.rs
@@ -330,7 +330,6 @@ pub async fn fetch_analytics(
     let mut query_clickhouse_cx = QueryClickhouseContext {
         clickhouse: &clickhouse,
         pool: &pool,
-        redis: &redis,
         req: &req,
         time_slices: &mut time_slices,
         project_ids: &project_ids,
@@ -677,7 +676,6 @@ async fn fetch_project_status_change_events(
 pub(crate) struct QueryClickhouseContext<'a> {
     pub(crate) clickhouse: &'a clickhouse::Client,
     pub(crate) pool: &'a PgPool,
-    pub(crate) redis: &'a RedisPool,
     pub(crate) req: &'a GetRequest,
     pub(crate) time_slices: &'a mut [TimeSlice],
     pub(crate) project_ids: &'a [DBProjectId],
diff --git a/docker-compose.yml b/docker-compose.yml
index 64112bdbc0..a488c7fee0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -415,6 +415,7 @@ services:
     ports:
       - '127.0.0.1:8123:8123'
     environment:
+      CLICKHOUSE_DB: staging_ariadne
       CLICKHOUSE_USER: default
       CLICKHOUSE_PASSWORD: default
     healthcheck:

From 204f4da33f3c08bdb555f6321236b4af811b75b1 Mon Sep 17 00:00:00 2001
From: Prospector <6166773+Prospector@users.noreply.github.com>
Date: Fri, 7 Aug 2026 08:16:09 -0700
Subject: [PATCH 46/82] fix edit profile in app not working (#7046)

---
 packages/ui/src/components/user/UserPageHeader.vue | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/ui/src/components/user/UserPageHeader.vue b/packages/ui/src/components/user/UserPageHeader.vue
index 5fd30e87db..84a552cd00 100644
--- a/packages/ui/src/components/user/UserPageHeader.vue
+++ b/packages/ui/src/components/user/UserPageHeader.vue
@@ -57,7 +57,15 @@
 
 		<template #actions>
 			<PageHeaderActions>
-				<ButtonLink v-if="isSelf" size="xl" :to="editProfileLink">
+				<Button
+					v-if="isSelf && typeof editProfileLink === 'function'"
+					size="xl"
+					@click="editProfileLink"
+				>
+					<EditIcon />
+					{{ formatMessage(commonMessages.editButton) }}
+				</Button>
+				<ButtonLink v-else-if="isSelf" size="xl" :to="editProfileLink">
 					<EditIcon />
 					{{ formatMessage(commonMessages.editButton) }}
 				</ButtonLink>
@@ -96,7 +104,7 @@ import { computed } from 'vue'
 
 import Avatar from '#ui/components/base/Avatar.vue'
 import type { OverflowMenuOption } from '#ui/components/base/buttons'
-import { ButtonLink, TeleportOverflowMenu } from '#ui/components/base/buttons'
+import { Button, ButtonLink, TeleportOverflowMenu } from '#ui/components/base/buttons'
 import PageHeader from '#ui/components/base/page-header/index.vue'
 import PageHeaderMetadata from '#ui/components/base/page-header/metadata/index.vue'
 import PageHeaderMetadataNumberItem from '#ui/components/base/page-header/metadata/page-header-metadata-number-item.vue'

From d344cbcb7a7851355459ae990f2ff513c9ad4519 Mon Sep 17 00:00:00 2001
From: Prospector <6166773+Prospector@users.noreply.github.com>
Date: Fri, 7 Aug 2026 08:29:25 -0700
Subject: [PATCH 47/82] make neoforge icon look more fox-like, replace hosting
 LoaderIcon with TagIcon (#7045)

make neoforge icon look more fox-like, replace hosting LoaderIcon with ui lib TagIcon
---
 .../instance/components/page-header/index.vue |   6 +-
 apps/frontend/src/pages/hosting/index.vue     |   4 +-
 .../assets/icons/tags/loaders/neoforge.svg    |   2 +-
 packages/ui/src/components/base/index.ts      |   1 +
 .../src/components/billing/PurchaseModal.vue  |   4 +-
 .../components/servers/icons/LoaderIcon.vue   | 236 ------------------
 .../ui/src/components/servers/icons/index.ts  |   1 -
 .../servers/labels/ServerLoaderLabel.vue      |   4 +-
 .../src/layouts/shared/browse-tab/header.vue  |   6 +-
 .../layouts/wrapped/hosting/manage/root.vue   |   6 +-
 .../ui/src/stories/base/PageHeader.stories.ts |  20 +-
 11 files changed, 27 insertions(+), 263 deletions(-)
 delete mode 100644 packages/ui/src/components/servers/icons/LoaderIcon.vue

diff --git a/apps/app-frontend/src/pages/instance/components/page-header/index.vue b/apps/app-frontend/src/pages/instance/components/page-header/index.vue
index 50c0f4e4fe..507b03bd63 100644
--- a/apps/app-frontend/src/pages/instance/components/page-header/index.vue
+++ b/apps/app-frontend/src/pages/instance/components/page-header/index.vue
@@ -55,8 +55,8 @@
 				</PageHeaderMetadataItem>
 				<PageHeaderMetadataItem
 					v-if="sharedInstanceManager?.type !== 'user'"
-					:icon="ServerLoaderIcon"
-					:icon-props="{ loader: loaderDisplayName }"
+					:icon="TagIcon"
+					:icon-props="{ tag: loaderDisplayName, enforceType: 'loader' }"
 					tooltip="Mod loader"
 				>
 					{{ loaderLabel }}
@@ -205,7 +205,6 @@ import {
 	commonMessages,
 	defineMessages,
 	formatLoaderLabel,
-	LoaderIcon as ServerLoaderIcon,
 	type OverflowMenuOption,
 	PageHeader,
 	PageHeaderActions,
@@ -213,6 +212,7 @@ import {
 	PageHeaderMetadata,
 	PageHeaderMetadataItem,
 	type ServerLoader,
+	TagIcon,
 	useVIntl,
 } from '@modrinth/ui'
 import { computed } from 'vue'
diff --git a/apps/frontend/src/pages/hosting/index.vue b/apps/frontend/src/pages/hosting/index.vue
index 2b99fd96f0..827298042b 100644
--- a/apps/frontend/src/pages/hosting/index.vue
+++ b/apps/frontend/src/pages/hosting/index.vue
@@ -154,7 +154,7 @@
 					</div>
 
 					<div class="relative flex flex-col gap-4 rounded-2xl bg-bg p-6 text-left md:p-12">
-						<LoaderIcon loader="fabric" class="size-8 text-brand" />
+						<TagIcon tag="fabric" enforce-type="loader" class="size-8 text-brand" />
 						<h2 class="m-0 text-lg font-bold">{{ formatMessage(messages.yourFavoriteMods) }}</h2>
 						<h3 class="m-0 text-base font-normal text-secondary">
 							{{ formatMessage(messages.yourFavoriteModsDescription) }}
@@ -641,9 +641,9 @@ import {
 	injectModrinthClient,
 	injectNotificationManager,
 	IntlFormatted,
-	LoaderIcon,
 	ModrinthServersPurchaseModal,
 	OptionGroup,
+	TagIcon,
 	useFormatPrice,
 	useVIntl,
 } from '@modrinth/ui'
diff --git a/packages/assets/icons/tags/loaders/neoforge.svg b/packages/assets/icons/tags/loaders/neoforge.svg
index afd5420fb5..ca55ea9203 100644
--- a/packages/assets/icons/tags/loaders/neoforge.svg
+++ b/packages/assets/icons/tags/loaders/neoforge.svg
@@ -1 +1 @@
-<svg enable-background="new 0 0 24 24" version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"><path d="m12 19.2v2m0-2v2"/><path d="m8.4 1.3c0.5 1.5 0.7 3 0.1 4.6-0.2 0.5-0.9 1.5-1.6 1.5m8.7-6.1c-0.5 1.5-0.7 3-0.1 4.6 0.2 0.6 0.9 1.5 1.6 1.5"/><path d="m3.6 15.8h-1.7m18.5 0h1.7"/><path d="m3.2 12.1h-1.7m19.3 0h1.8"/><path d="m8.1 12.7v1.6m7.8-1.6v1.6"/><path d="m10.8 18h1.2m0 1.2-1.2-1.2m2.4 0h-1.2m0 1.2 1.2-1.2"/><path d="m4 9.7c-0.5 1.2-0.8 2.4-0.8 3.7 0 3.1 2.9 6.3 5.3 8.2 0.9 0.7 2.2 1.1 3.4 1.1m0.1-17.8c-1.1 0-2.1 0.2-3.2 0.7m11.2 4.1c0.5 1.2 0.8 2.4 0.8 3.7 0 3.1-2.9 6.3-5.3 8.2-0.9 0.7-2.2 1.1-3.4 1.1m-0.1-17.8c1.1 0 2.1 0.2 3.2 0.7"/><path d="m4 9.7c-0.2-1.8-0.3-3.7 0.5-5.5s2.2-2.6 3.9-3m11.6 8.5c0.2-1.9 0.3-3.7-0.5-5.5s-2.2-2.6-3.9-3"/><path d="m12 21.2-2.4 0.4m2.4-0.4 2.4 0.4"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="1.5" clip-rule="evenodd" viewBox="0 0 100 100"><g fill="none" stroke="currentColor" stroke-width="8.33"><path d="M61.098 32.028V6.529L84.001 26.74v52.944L50.38 93.608 16.759 79.684V26.74L39.662 6.529v25.499M39.805 25.427h21.15M34.23 54.498v7.815M65.77 54.498v7.815M47.035 77.633h6.692M21.719 51.608 6.492 44.885M21.719 63.582 6.492 70.305M79.043 51.608l15.227-6.723M79.043 63.582l15.227 6.723"/></g></svg>
\ No newline at end of file
diff --git a/packages/ui/src/components/base/index.ts b/packages/ui/src/components/base/index.ts
index 08b54ef241..1f9405d81d 100644
--- a/packages/ui/src/components/base/index.ts
+++ b/packages/ui/src/components/base/index.ts
@@ -119,6 +119,7 @@ export type { SortDirection, TableColumn } from './Table.vue'
 export { default as Table } from './Table.vue'
 export type { TabsTab, TabsValue } from './Tabs.vue'
 export { default as Tabs } from './Tabs.vue'
+export { default as TagIcon } from './TagIcon.vue'
 export { default as TagItem } from './TagItem.vue'
 export { default as TagTagItem } from './TagTagItem.vue'
 export type {
diff --git a/packages/ui/src/components/billing/PurchaseModal.vue b/packages/ui/src/components/billing/PurchaseModal.vue
index d1753d10a0..5c291fb92a 100644
--- a/packages/ui/src/components/billing/PurchaseModal.vue
+++ b/packages/ui/src/components/billing/PurchaseModal.vue
@@ -86,7 +86,7 @@
 							}"
 							@click="serverLoader = loader"
 						>
-							<LoaderIcon :loader="loader" class="!h-12 !w-12" />
+							<TagIcon :tag="loader" enforce-type="loader" class="!h-12 !w-12" />
 							<p class="text-lg font-bold m-0">{{ loader }}</p>
 						</button>
 					</div>
@@ -478,9 +478,9 @@ import Checkbox from '../base/Checkbox.vue'
 import Combobox from '../base/Combobox.vue'
 import Slider from '../base/Slider.vue'
 import StyledInput from '../base/StyledInput.vue'
+import TagIcon from '../base/TagIcon.vue'
 import AnimatedLogo from '../brand/AnimatedLogo.vue'
 import NewModal from '../modal/NewModal.vue'
-import LoaderIcon from '../servers/icons/LoaderIcon.vue'
 
 const { formatMessage } = useVIntl()
 const formatPrice = useFormatPrice()
diff --git a/packages/ui/src/components/servers/icons/LoaderIcon.vue b/packages/ui/src/components/servers/icons/LoaderIcon.vue
deleted file mode 100644
index b2e3e35f0f..0000000000
--- a/packages/ui/src/components/servers/icons/LoaderIcon.vue
+++ /dev/null
@@ -1,236 +0,0 @@
-<template>
-	<svg
-		v-if="normalizedLoader === 'Fabric'"
-		xmlns="http://www.w3.org/2000/svg"
-		xml:space="preserve"
-		fill-rule="evenodd"
-		stroke-linecap="round"
-		stroke-linejoin="round"
-		clip-rule="evenodd"
-		viewBox="0 0 24 24"
-	>
-		<path fill="none" d="M0 0h24v24H0z" />
-		<path
-			fill="none"
-			stroke="currentColor"
-			stroke-width="23"
-			d="m820 761-85.6-87.6c-4.6-4.7-10.4-9.6-25.9 1-19.9 13.6-8.4 21.9-5.2 25.4 8.2 9 84.1 89 97.2 104 2.5 2.8-20.3-22.5-6.5-39.7 5.4-7 18-12 26-3 6.5 7.3 10.7 18-3.4 29.7-24.7 20.4-102 82.4-127 103-12.5 10.3-28.5 2.3-35.8-6-7.5-8.9-30.6-34.6-51.3-58.2-5.5-6.3-4.1-19.6 2.3-25 35-30.3 91.9-73.8 111.9-90.8"
-			transform="matrix(.08671 0 0 .0867 -49.8 -56)"
-		/>
-	</svg>
-	<svg
-		v-else-if="normalizedLoader === 'Quilt'"
-		xmlns:xlink="http://www.w3.org/1999/xlink"
-		xml:space="preserve"
-		fill-rule="evenodd"
-		stroke-linecap="round"
-		stroke-linejoin="round"
-		stroke-miterlimit="2"
-		clip-rule="evenodd"
-		viewBox="0 0 24 24"
-	>
-		<defs>
-			<path
-				id="quilt"
-				fill="none"
-				stroke="currentColor"
-				stroke-width="65.6"
-				d="M442.5 233.9c0-6.4-5.2-11.6-11.6-11.6h-197c-6.4 0-11.6 5.2-11.6 11.6v197c0 6.4 5.2 11.6 11.6 11.6h197c6.4 0 11.6-5.2 11.6-11.7v-197Z"
-			></path>
-		</defs>
-		<path fill="none" d="M0 0h24v24H0z"></path>
-		<use
-			xlink:href="#quilt"
-			stroke-width="65.6"
-			transform="matrix(.03053 0 0 .03046 -3.2 -3.2)"
-		></use>
-		<use xlink:href="#quilt" stroke-width="65.6" transform="matrix(.03053 0 0 .03046 -3.2 7)"></use>
-		<use
-			xlink:href="#quilt"
-			stroke-width="65.6"
-			transform="matrix(.03053 0 0 .03046 6.9 -3.2)"
-		></use>
-		<path
-			fill="none"
-			stroke="currentColor"
-			stroke-width="70.4"
-			d="M442.5 234.8c0-7-5.6-12.5-12.5-12.5H234.7c-6.8 0-12.4 5.6-12.4 12.5V430c0 6.9 5.6 12.5 12.4 12.5H430c6.9 0 12.5-5.6 12.5-12.5V234.8Z"
-			transform="rotate(45 3.5 24) scale(.02843 .02835)"
-		></path>
-	</svg>
-	<svg
-		v-else-if="normalizedLoader === 'Forge'"
-		ml:space="preserve"
-		fill-rule="evenodd"
-		stroke-linecap="round"
-		stroke-linejoin="round"
-		stroke-miterlimit="1.5"
-		clip-rule="evenodd"
-		viewBox="0 0 24 24"
-	>
-		<path fill="none" d="M0 0h24v24H0z"></path>
-		<path
-			fill="none"
-			stroke="currentColor"
-			stroke-width="2"
-			d="M2 7.5h8v-2h12v2s-7 3.4-7 6 3.1 3.1 3.1 3.1l.9 3.9H5l1-4.1s3.8.1 4-2.9c.2-2.7-6.5-.7-8-6Z"
-		></path>
-	</svg>
-	<svg
-		v-else-if="normalizedLoader === 'NeoForge'"
-		enable-background="new 0 0 24 24"
-		version="1.1"
-		viewBox="0 0 24 24"
-		xml:space="preserve"
-		xmlns="http://www.w3.org/2000/svg"
-	>
-		<g
-			fill="none"
-			stroke="currentColor"
-			stroke-linecap="round"
-			stroke-linejoin="round"
-			stroke-width="2"
-		>
-			<path d="m12 19.2v2m0-2v2" />
-			<path
-				d="m8.4 1.3c0.5 1.5 0.7 3 0.1 4.6-0.2 0.5-0.9 1.5-1.6 1.5m8.7-6.1c-0.5 1.5-0.7 3-0.1 4.6 0.2 0.6 0.9 1.5 1.6 1.5"
-			/>
-			<path d="m3.6 15.8h-1.7m18.5 0h1.7" />
-			<path d="m3.2 12.1h-1.7m19.3 0h1.8" />
-			<path d="m8.1 12.7v1.6m7.8-1.6v1.6" />
-			<path d="m10.8 18h1.2m0 1.2-1.2-1.2m2.4 0h-1.2m0 1.2 1.2-1.2" />
-			<path
-				d="m4 9.7c-0.5 1.2-0.8 2.4-0.8 3.7 0 3.1 2.9 6.3 5.3 8.2 0.9 0.7 2.2 1.1 3.4 1.1m0.1-17.8c-1.1 0-2.1 0.2-3.2 0.7m11.2 4.1c0.5 1.2 0.8 2.4 0.8 3.7 0 3.1-2.9 6.3-5.3 8.2-0.9 0.7-2.2 1.1-3.4 1.1m-0.1-17.8c1.1 0 2.1 0.2 3.2 0.7"
-			/>
-			<path
-				d="m4 9.7c-0.2-1.8-0.3-3.7 0.5-5.5s2.2-2.6 3.9-3m11.6 8.5c0.2-1.9 0.3-3.7-0.5-5.5s-2.2-2.6-3.9-3"
-			/>
-			<path d="m12 21.2-2.4 0.4m2.4-0.4 2.4 0.4" />
-		</g>
-	</svg>
-	<svg
-		v-else-if="normalizedLoader === 'Paper'"
-		xml:space="preserve"
-		fill-rule="evenodd"
-		stroke-linecap="round"
-		stroke-linejoin="round"
-		stroke-miterlimit="1.5"
-		clip-rule="evenodd"
-		viewBox="0 0 24 24"
-	>
-		<path fill="none" d="M0 0h24v24H0z" />
-		<path fill="none" stroke="currentColor" stroke-width="2" d="m12 18 6 2 3-17L2 14l6 2" />
-		<path stroke="currentColor" stroke-width="2" d="m9 21-1-5 4 2-3 3Z" />
-		<path fill="currentColor" d="m12 18-4-2 10-9-6 11Z" />
-	</svg>
-	<svg
-		v-else-if="normalizedLoader === 'Spigot'"
-		viewBox="0 0 332 284"
-		style="
-			fill-rule: evenodd;
-			clip-rule: evenodd;
-			stroke-linejoin: round;
-			fill: none;
-			fill-rule: nonzero;
-			stroke-width: 24px;
-		"
-		stroke="currentColor"
-	>
-		<path
-			d="M147.5,27l27,-15l27.5,15l66.5,0l0,33.5l-73,-0.912l0,45.5l26,-0.088l0,31.5l-12.5,0l0,15.5l16,21.5l35,0l0,-21.5l35.5,0l0,21.5l24.5,0l0,55.5l-24.5,0l0,17l-35.5,0l0,-27l-35,0l-55.5,14.5l-67.5,-14.5l-15,14.5l18,12.5l-3,24.5l-41.5,1.5l-48.5,-19.5l6,-19l24.5,-4.5l16,-41l79,-36l-7,-15.5l0,-31.5l23.5,0l0,-45.5l-73.5,0l0,-32.5l67,0Z"
-		/>
-	</svg>
-	<svg
-		v-else-if="normalizedLoader === 'Bukkit'"
-		viewBox="0 0 292 319"
-		style="fill-rule: evenodd; clip-rule: evenodd; stroke-linecap: round; stroke-linejoin: round"
-		stroke="currentColor"
-	>
-		<g transform="matrix(1,0,0,1,0,-5)">
-			<path
-				d="M12,109.5L12,155L34.5,224L57.5,224L57.5,271L81,294L160,294L160,172L259.087,172L265,155L265,109.5M12,109.5L12,64L34.5,64L34.5,41L81,17L195.5,17L241,41L241,64L265,64L265,109.5M12,109.5L81,109.5L81,132L195.5,132L195.5,109.5L265,109.5M264.087,204L264.087,244M207.5,272L207.5,312M250,272L250,312L280,312L280,272L250,272ZM192.5,204L192.5,244L222.5,244L222.5,204L192.5,204Z"
-				style="fill: none; fill-rule: nonzero; stroke-width: 24px"
-			/>
-		</g>
-	</svg>
-	<svg
-		v-else-if="normalizedLoader === 'Purpur'"
-		xml:space="preserve"
-		fill-rule="evenodd"
-		stroke-linecap="round"
-		stroke-linejoin="round"
-		stroke-miterlimit="1.5"
-		clip-rule="evenodd"
-		viewBox="0 0 24 24"
-	>
-		<defs>
-			<path
-				id="purpur"
-				fill="none"
-				stroke="currentColor"
-				stroke-width="1.68"
-				d="m264 41.95 8-4v8l-8 4v-8Z"
-			></path>
-		</defs>
-		<path fill="none" d="M0 0h24v24H0z"></path>
-		<path
-			fill="none"
-			stroke="currentColor"
-			stroke-width="1.77"
-			d="m264 29.95-8 4 8 4.42 8-4.42-8-4Z"
-			transform="matrix(1.125 0 0 1.1372 -285 -31.69)"
-		></path>
-		<path
-			fill="none"
-			stroke="currentColor"
-			stroke-width="1.77"
-			d="m272 38.37-8 4.42-8-4.42"
-			transform="matrix(1.125 0 0 1.1372 -285 -31.69)"
-		></path>
-		<path
-			fill="none"
-			stroke="currentColor"
-			stroke-width="1.77"
-			d="m260 31.95 8 4.21V45"
-			transform="matrix(1.125 0 0 1.1372 -285 -31.69)"
-		></path>
-		<path
-			fill="none"
-			stroke="currentColor"
-			stroke-width="1.77"
-			d="M260 45v-8.84l8-4.21"
-			transform="matrix(1.125 0 0 1.1372 -285 -31.69)"
-		></path>
-		<use
-			xlink:href="#purpur"
-			stroke-width="1.68"
-			transform="matrix(1.125 0 0 1.2569 -285 -40.78)"
-		></use>
-		<use
-			xlink:href="#purpur"
-			stroke-width="1.68"
-			transform="matrix(-1.125 0 0 1.2569 309 -40.78)"
-		></use>
-	</svg>
-	<svg v-else-if="normalizedLoader === 'Vanilla'" viewBox="0 0 20 20" fill="currentColor">
-		<path
-			fill-rule="evenodd"
-			d="M9.504 1.132a1 1 0 01.992 0l1.75 1a1 1 0 11-.992 1.736L10 3.152l-1.254.716a1 1 0 11-.992-1.736l1.75-1zM5.618 4.504a1 1 0 01-.372 1.364L5.016 6l.23.132a1 1 0 11-.992 1.736L4 7.723V8a1 1 0 01-2 0V6a.996.996 0 01.52-.878l1.734-.99a1 1 0 011.364.372zm8.764 0a1 1 0 011.364-.372l1.733.99A1.002 1.002 0 0118 6v2a1 1 0 11-2 0v-.277l-.254.145a1 1 0 11-.992-1.736l.23-.132-.23-.132a1 1 0 01-.372-1.364zm-7 4a1 1 0 011.364-.372L10 8.848l1.254-.716a1 1 0 11.992 1.736L11 10.58V12a1 1 0 11-2 0v-1.42l-1.246-.712a1 1 0 01-.372-1.364zM3 11a1 1 0 011 1v1.42l1.246.712a1 1 0 11-.992 1.736l-1.75-1A1 1 0 012 14v-2a1 1 0 011-1zm14 0a1 1 0 011 1v2a1 1 0 01-.504.868l-1.75 1a1 1 0 11-.992-1.736L16 13.42V12a1 1 0 011-1zm-9.618 5.504a1 1 0 011.364-.372l.254.145V16a1 1 0 112 0v.277l.254-.145a1 1 0 11.992 1.736l-1.735.992a.995.995 0 01-1.022 0l-1.735-.992a1 1 0 01-.372-1.364z"
-			clip-rule="evenodd"
-		></path>
-	</svg>
-	<LoaderIcon v-else />
-</template>
-
-<script setup lang="ts">
-import { LoaderIcon } from '@modrinth/assets'
-import { computed } from 'vue'
-
-import { formatLoaderLabel, type ServerLoader } from '#ui/utils/loaders'
-
-const props = defineProps<{
-	loader: ServerLoader
-}>()
-
-const normalizedLoader = computed(() => formatLoaderLabel(props.loader))
-</script>
diff --git a/packages/ui/src/components/servers/icons/index.ts b/packages/ui/src/components/servers/icons/index.ts
index 71498d858d..4e635fb3f2 100644
--- a/packages/ui/src/components/servers/icons/index.ts
+++ b/packages/ui/src/components/servers/icons/index.ts
@@ -1,2 +1 @@
-export { default as LoaderIcon } from './LoaderIcon.vue'
 export { default as ServerIcon } from './ServerIcon.vue'
diff --git a/packages/ui/src/components/servers/labels/ServerLoaderLabel.vue b/packages/ui/src/components/servers/labels/ServerLoaderLabel.vue
index 9478a89a9e..8ad5a4e626 100644
--- a/packages/ui/src/components/servers/labels/ServerLoaderLabel.vue
+++ b/packages/ui/src/components/servers/labels/ServerLoaderLabel.vue
@@ -2,7 +2,7 @@
 	<div class="flex min-w-0 flex-row items-center gap-2 truncate">
 		<Separator v-if="!noSeparator" />
 		<div class="flex flex-row items-center gap-1.5">
-			<LoaderIcon v-if="loader" :loader="loader" />
+			<TagIcon v-if="loader" :tag="loader" enforce-type="loader" />
 			<div v-else class="size-5 shrink-0 animate-pulse rounded-full bg-button-border"></div>
 			<AutoLink
 				v-if="isLink"
@@ -41,7 +41,7 @@ import { injectServerSettingsModal } from '#ui/providers/server-settings-modal'
 import type { ServerLoader } from '#ui/utils/loaders'
 
 import AutoLink from '../../base/AutoLink.vue'
-import LoaderIcon from '../icons/LoaderIcon.vue'
+import TagIcon from '../../base/TagIcon.vue'
 import Separator from './Separator.vue'
 
 defineProps<{
diff --git a/packages/ui/src/layouts/shared/browse-tab/header.vue b/packages/ui/src/layouts/shared/browse-tab/header.vue
index b2094e07fa..34ee71ef27 100644
--- a/packages/ui/src/layouts/shared/browse-tab/header.vue
+++ b/packages/ui/src/layouts/shared/browse-tab/header.vue
@@ -10,7 +10,7 @@ import { IconButton } from '#ui/components/base/buttons'
 import PageHeader from '#ui/components/base/page-header/index.vue'
 import PageHeaderMetadata from '#ui/components/base/page-header/metadata/index.vue'
 import PageHeaderMetadataItem from '#ui/components/base/page-header/metadata/page-header-metadata-item.vue'
-import LoaderIcon from '#ui/components/servers/icons/LoaderIcon.vue'
+import TagIcon from '#ui/components/base/TagIcon.vue'
 import { useServerImage } from '#ui/composables/use-server-image'
 import { formatLoaderLabel } from '#ui/utils/loaders'
 
@@ -77,8 +77,8 @@ const metadataItems = computed(() => {
 		items.push({
 			id: 'loader',
 			label: loaderLabel,
-			icon: LoaderIcon,
-			iconProps: { loader: loaderName },
+			icon: TagIcon,
+			iconProps: { tag: loaderName, enforceType: 'loader' },
 			class: '!text-primary',
 		})
 	}
diff --git a/packages/ui/src/layouts/wrapped/hosting/manage/root.vue b/packages/ui/src/layouts/wrapped/hosting/manage/root.vue
index dbf56d1b69..978b6b6c49 100644
--- a/packages/ui/src/layouts/wrapped/hosting/manage/root.vue
+++ b/packages/ui/src/layouts/wrapped/hosting/manage/root.vue
@@ -142,8 +142,8 @@
 							<template v-else>
 								<PageHeaderMetadataItem
 									v-if="serverData.loader"
-									:icon="LoaderIcon"
-									:icon-props="{ loader: serverData.loader }"
+									:icon="TagIcon"
+									:icon-props="{ tag: serverData.loader, enforceType: 'loader' }"
 								>
 									{{ formatLoaderLabel(serverData.loader) }} {{ serverData.mc_version }}
 								</PageHeaderMetadataItem>
@@ -433,9 +433,9 @@ import PageHeaderMetadata from '#ui/components/base/page-header/metadata/index.v
 import PageHeaderMetadataItem from '#ui/components/base/page-header/metadata/page-header-metadata-item.vue'
 import PageHeaderActions from '#ui/components/base/page-header/page-header-actions.vue'
 import ServerNotice from '#ui/components/base/ServerNotice.vue'
+import TagIcon from '#ui/components/base/TagIcon.vue'
 import ConfirmLeaveModal from '#ui/components/modal/ConfirmLeaveModal.vue'
 import ServerPanelAdmonitions from '#ui/components/servers/admonitions/ServerPanelAdmonitions.vue'
-import LoaderIcon from '#ui/components/servers/icons/LoaderIcon.vue'
 import ServerIcon from '#ui/components/servers/icons/ServerIcon.vue'
 import MedalServerCountdown from '#ui/components/servers/marketing/MedalServerCountdown.vue'
 import { PanelServerActionButton } from '#ui/components/servers/server-header'
diff --git a/packages/ui/src/stories/base/PageHeader.stories.ts b/packages/ui/src/stories/base/PageHeader.stories.ts
index d2e569ae6b..a8344567da 100644
--- a/packages/ui/src/stories/base/PageHeader.stories.ts
+++ b/packages/ui/src/stories/base/PageHeader.stories.ts
@@ -35,8 +35,8 @@ import PageHeaderMetadataTagsItem from '../../components/base/page-header/metada
 import PageHeaderMetadataTimeItem from '../../components/base/page-header/metadata/page-header-metadata-time-item.vue'
 import PageHeaderActions from '../../components/base/page-header/page-header-actions.vue'
 import PageHeaderBadgeItem from '../../components/base/page-header/page-header-badge-item.vue'
+import TagIcon from '../../components/base/TagIcon.vue'
 import TagItem from '../../components/base/TagItem.vue'
-import LoaderIcon from '../../components/servers/icons/LoaderIcon.vue'
 import ServerIcon from '../../components/servers/icons/ServerIcon.vue'
 
 const noop = () => undefined
@@ -220,11 +220,11 @@ export const CreatorHeader: Story = {
 
 export const AppInstanceHeader: Story = {
 	render: () => ({
-		components: { ...pageHeaderComponents, LoaderIcon, TeleportOverflowMenu },
+		components: { ...pageHeaderComponents, TagIcon, TeleportOverflowMenu },
 		setup() {
 			return {
 				...pageHeaderIcons,
-				LoaderIcon,
+				TagIcon,
 				menuActions,
 				noop,
 			}
@@ -238,7 +238,7 @@ export const AppInstanceHeader: Story = {
 				<template #metadata>
 					<PageHeaderMetadata>
 						<PageHeaderMetadataItem :icon="Gamepad2Icon" tooltip="Minecraft version">Minecraft 1.20.1</PageHeaderMetadataItem>
-						<PageHeaderMetadataItem :icon="LoaderIcon" :icon-props="{ loader: 'Fabric' }" tooltip="Mod loader">
+						<PageHeaderMetadataItem :icon="TagIcon" :icon-props="{ tag: 'Fabric', enforceType: 'loader' }" tooltip="Mod loader">
 							Fabric 0.16.14
 						</PageHeaderMetadataItem>
 						<PageHeaderMetadataItem :icon="TimerIcon" tooltip="Total playtime">12 hours</PageHeaderMetadataItem>
@@ -266,11 +266,11 @@ export const AppInstanceHeader: Story = {
 
 export const BrowseHeader: Story = {
 	render: () => ({
-		components: { ...pageHeaderComponents, LoaderIcon, TeleportOverflowMenu },
+		components: { ...pageHeaderComponents, TagIcon, TeleportOverflowMenu },
 		setup() {
 			return {
 				...pageHeaderIcons,
-				LoaderIcon,
+				TagIcon,
 				noop,
 			}
 		},
@@ -289,7 +289,7 @@ export const BrowseHeader: Story = {
 						<PageHeaderMetadataItem class="!text-primary" :icon="Gamepad2Icon" tooltip="Minecraft version">
 							Minecraft 1.20.1
 						</PageHeaderMetadataItem>
-						<PageHeaderMetadataItem class="!text-primary" :icon="LoaderIcon" :icon-props="{ loader: 'Fabric' }" tooltip="Mod loader">
+						<PageHeaderMetadataItem class="!text-primary" :icon="TagIcon" :icon-props="{ tag: 'Fabric', enforceType: 'loader' }" tooltip="Mod loader">
 							Fabric
 						</PageHeaderMetadataItem>
 					</PageHeaderMetadata>
@@ -343,12 +343,12 @@ export const ServerPanelRootHeader: Story = {
 
 export const ServerPanelInstanceHeader: Story = {
 	render: () => ({
-		components: { ...pageHeaderComponents, LoaderIcon, TeleportOverflowMenu },
+		components: { ...pageHeaderComponents, TagIcon, TeleportOverflowMenu },
 		setup() {
 			return {
 				...pageHeaderIcons,
 				joinedActions,
-				LoaderIcon,
+				TagIcon,
 				noop,
 			}
 		},
@@ -363,7 +363,7 @@ export const ServerPanelInstanceHeader: Story = {
 				<template #metadata>
 					<PageHeaderMetadata>
 						<PageHeaderMetadataItem :icon="Gamepad2Icon" tooltip="Minecraft version">Minecraft 1.20.1</PageHeaderMetadataItem>
-						<PageHeaderMetadataItem :icon="LoaderIcon" :icon-props="{ loader: 'Fabric' }" tooltip="Mod loader">
+						<PageHeaderMetadataItem :icon="TagIcon" :icon-props="{ tag: 'Fabric', enforceType: 'loader' }" tooltip="Mod loader">
 							Fabric 0.19.2
 						</PageHeaderMetadataItem>
 						<PageHeaderMetadataItem :icon="TimerIcon" tooltip="Last activity">Last active 2 weeks ago</PageHeaderMetadataItem>

From 3fa6905006bd7bb6d60e678c289429f357f5e992 Mon Sep 17 00:00:00 2001
From: aecsocket <43144841+aecsocket@users.noreply.github.com>
Date: Sat, 8 Aug 2026 00:47:54 +0900
Subject: [PATCH 48/82] refactor: labrinth `ApiError` and error reporting
 (#6981)

* refactor: labrinth `ApiError` and error reporting

* fix clippy

* fix ci
---
 Cargo.lock                                    |  86 --
 Cargo.toml                                    |   1 -
 apps/labrinth/Cargo.toml                      |   1 -
 apps/labrinth/src/auth/checks.rs              |  41 +-
 apps/labrinth/src/clickhouse/fetch.rs         |  26 +-
 .../models/notifications_template_item.rs     |   9 +-
 .../models/products_tax_identifier_item.rs    |  12 +-
 apps/labrinth/src/lib.rs                      |   8 +-
 .../src/models/v3/moderation_notes.rs         |  21 +-
 apps/labrinth/src/models/v3/notifications.rs  |   4 +-
 apps/labrinth/src/queue/analytics/mod.rs      |  84 +-
 apps/labrinth/src/queue/billing.rs            | 414 +++++---
 apps/labrinth/src/queue/email.rs              |  53 +-
 apps/labrinth/src/queue/email/templates.rs    | 127 ++-
 apps/labrinth/src/queue/payouts/flow/mod.rs   |   5 +-
 apps/labrinth/src/queue/payouts/flow/mural.rs |  29 +-
 .../labrinth/src/queue/payouts/flow/paypal.rs |  31 +-
 .../src/queue/payouts/flow/tremendous.rs      |  10 +-
 apps/labrinth/src/queue/payouts/mod.rs        | 198 ++--
 apps/labrinth/src/routes/analytics.rs         |  37 +-
 apps/labrinth/src/routes/debug/pprof.rs       |  20 +-
 apps/labrinth/src/routes/internal/admin.rs    |  48 +-
 .../labrinth/src/routes/internal/affiliate.rs |  94 +-
 .../src/routes/internal/analytics_event.rs    |  13 +-
 .../src/routes/internal/attribution.rs        | 115 ++-
 apps/labrinth/src/routes/internal/billing.rs  | 780 ++++++++------
 .../src/routes/internal/billing/payments.rs   | 255 ++---
 .../internal/billing/update_subscriptions.rs  |   5 +-
 .../src/routes/internal/blocked_users.rs      |  24 +-
 apps/labrinth/src/routes/internal/campaign.rs |  11 +-
 .../src/routes/internal/delphi/mod.rs         |  26 +-
 .../internal/delphi/tech_review_sync.rs       |  20 +-
 .../routes/internal/external_notifications.rs |  93 +-
 apps/labrinth/src/routes/internal/flows.rs    | 814 ++++++++++-----
 apps/labrinth/src/routes/internal/gdpr.rs     |  59 +-
 apps/labrinth/src/routes/internal/medal.rs    |  33 +-
 .../internal/moderation/external_license.rs   | 133 ++-
 .../src/routes/internal/moderation/mod.rs     | 149 ++-
 .../routes/internal/moderation/tech_review.rs |  78 +-
 .../internal/moderation/tech_review/global.rs |   8 +-
 apps/labrinth/src/routes/internal/mural.rs    |   2 +-
 apps/labrinth/src/routes/internal/pats.rs     | 125 ++-
 apps/labrinth/src/routes/internal/search.rs   |  10 +-
 .../src/routes/internal/server_ping.rs        |   3 +-
 apps/labrinth/src/routes/internal/session.rs  |  80 +-
 apps/labrinth/src/routes/internal/statuses.rs |  42 +-
 apps/labrinth/src/routes/maven.rs             | 120 ++-
 apps/labrinth/src/routes/mod.rs               | 205 +---
 apps/labrinth/src/routes/updates.rs           |  20 +-
 apps/labrinth/src/routes/v2/notifications.rs  |  10 +-
 apps/labrinth/src/routes/v2/projects.rs       |  64 +-
 apps/labrinth/src/routes/v2/reports.rs        |  13 +-
 apps/labrinth/src/routes/v2/statistics.rs     |   4 +-
 apps/labrinth/src/routes/v2/tags.rs           |  19 +-
 apps/labrinth/src/routes/v2/teams.rs          |  13 +-
 apps/labrinth/src/routes/v2/threads.rs        |   4 +-
 apps/labrinth/src/routes/v2/users.rs          |  32 +-
 apps/labrinth/src/routes/v2/version_file.rs   |  28 +-
 apps/labrinth/src/routes/v2/versions.rs       |  26 +-
 apps/labrinth/src/routes/v2_reroute.rs        |   2 +-
 .../routes/v3/analytics_get/facets/fixed.rs   |   5 +-
 .../src/routes/v3/analytics_get/facets/mod.rs |   9 +-
 .../metrics/affiliate_code_conversions.rs     |  11 +-
 .../metrics/affiliate_code_revenue.rs         |  11 +-
 .../metrics/project_downloads.rs              |  22 +-
 .../analytics_get/metrics/project_playtime.rs |  15 +-
 .../analytics_get/metrics/project_revenue.rs  |  11 +-
 .../v3/analytics_get/metrics/project_views.rs |  15 +-
 .../src/routes/v3/analytics_get/mod.rs        | 144 ++-
 .../src/routes/v3/analytics_get/old.rs        | 105 +-
 apps/labrinth/src/routes/v3/blocked_users.rs  |  48 +-
 apps/labrinth/src/routes/v3/collections.rs    | 202 ++--
 apps/labrinth/src/routes/v3/content/mod.rs    |   4 +-
 apps/labrinth/src/routes/v3/friends.rs        | 126 ++-
 apps/labrinth/src/routes/v3/images.rs         | 144 +--
 apps/labrinth/src/routes/v3/limits.rs         |  22 +-
 apps/labrinth/src/routes/v3/notifications.rs  | 119 ++-
 apps/labrinth/src/routes/v3/oauth_clients.rs  | 179 ++--
 apps/labrinth/src/routes/v3/organizations.rs  | 560 +++++++----
 apps/labrinth/src/routes/v3/payouts.rs        | 300 ++++--
 .../src/routes/v3/project_creation.rs         |  17 +-
 .../src/routes/v3/project_creation/new.rs     |   4 +-
 apps/labrinth/src/routes/v3/projects.rs       | 949 +++++++++++-------
 apps/labrinth/src/routes/v3/reports.rs        | 236 +++--
 apps/labrinth/src/routes/v3/statistics.rs     |  13 +-
 apps/labrinth/src/routes/v3/tags.rs           |  51 +-
 apps/labrinth/src/routes/v3/teams.rs          | 526 ++++++----
 apps/labrinth/src/routes/v3/threads.rs        | 196 ++--
 apps/labrinth/src/routes/v3/users.rs          | 402 +++++---
 apps/labrinth/src/routes/v3/version_file.rs   | 155 ++-
 apps/labrinth/src/routes/v3/versions.rs       | 311 ++++--
 .../src/search/backend/elasticsearch/mod.rs   |  57 +-
 .../src/search/backend/typesense/mod.rs       |  22 +-
 apps/labrinth/src/search/mod.rs               |   9 +-
 apps/labrinth/src/util/avalara1099.rs         |  39 +-
 apps/labrinth/src/util/captcha.rs             |   8 +-
 apps/labrinth/src/util/error.rs               | 248 +++++
 apps/labrinth/src/util/gotenberg.rs           |  11 +-
 apps/labrinth/src/util/img.rs                 |  40 +-
 apps/labrinth/src/util/ratelimit.rs           |  15 +-
 apps/labrinth/src/util/routes.rs              |  34 +-
 apps/labrinth/src/util/webhook.rs             |  48 +-
 102 files changed, 6449 insertions(+), 3791 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index db6f7b0ae2..6a53ac4b9b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2331,15 +2331,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
 
-[[package]]
-name = "convert_case"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baaaa0ecca5b51987b9423ccdc971514dd8b0bb7b4060b983d3664dad3f1f89f"
-dependencies = [
- "unicode-segmentation",
-]
-
 [[package]]
 name = "convert_case"
 version = "0.10.0"
@@ -5217,15 +5208,6 @@ version = "1.70.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
 
-[[package]]
-name = "iso8601"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1082f0c48f143442a1ac6122f67e360ceee130b967af4d50996e5154a45df46"
-dependencies = [
- "nom 8.0.0",
-]
-
 [[package]]
 name = "itertools"
 version = "0.12.1"
@@ -5385,19 +5367,6 @@ dependencies = [
  "serde_json",
 ]
 
-[[package]]
-name = "jsonwebtoken"
-version = "9.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a87cc7a48537badeae96744432de36f4be2b4a34a05a5ef32e9dd8a1c169dde"
-dependencies = [
- "base64 0.22.1",
- "js-sys",
- "ring",
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "keyboard-types"
 version = "0.7.0"
@@ -5491,7 +5460,6 @@ dependencies = [
  "json-patch 4.1.0",
  "labrinth",
  "lettre",
- "meilisearch-sdk",
  "modrinth-content-management",
  "modrinth-util",
  "muralpay",
@@ -5955,49 +5923,6 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ae960838283323069879657ca3de837e9f7bbb4c7bf6ea7f1b290d5e9476d2e0"
 
-[[package]]
-name = "meilisearch-index-setting-macro"
-version = "0.30.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e36e5cad3754ed329feb201c24f26c0694442bef50a90dbcff0ba6d12b5ca133"
-dependencies = [
- "convert_case 0.8.0",
- "proc-macro2",
- "quote",
- "structmeta",
- "syn 2.0.106",
-]
-
-[[package]]
-name = "meilisearch-sdk"
-version = "0.30.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f620c9ed9b790cf292b66c8dab16f0e4aafb377583ec0e589da7c3ee81ff2038"
-dependencies = [
- "async-trait",
- "bytes",
- "either",
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-util",
- "iso8601",
- "jsonwebtoken",
- "log",
- "meilisearch-index-setting-macro",
- "pin-project-lite",
- "reqwest 0.12.24",
- "serde",
- "serde_json",
- "thiserror 2.0.17",
- "time",
- "tokio",
- "uuid 1.23.3",
- "wasm-bindgen-futures",
- "web-sys",
- "yaup",
-]
-
 [[package]]
 name = "memchr"
 version = "2.7.6"
@@ -13499,17 +13424,6 @@ dependencies = [
  "xml-rs",
 ]
 
-[[package]]
-name = "yaup"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0144f1a16a199846cb21024da74edd930b43443463292f536b7110b4855b5c6"
-dependencies = [
- "form_urlencoded",
- "serde",
- "thiserror 1.0.69",
-]
-
 [[package]]
 name = "yoke"
 version = "0.8.0"
diff --git a/Cargo.toml b/Cargo.toml
index 01c9a1af38..6670a240af 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -131,7 +131,6 @@ lz4_flex = { version = "0.11.5", default-features = false, features = [
   "std",
 ] }
 maxminddb = "0.26.0"
-meilisearch-sdk = { version = "0.30.0", default-features = false }
 modrinth-content-management = { path = "packages/modrinth-content-management" }
 modrinth-log = { path = "packages/modrinth-log" }
 modrinth-util = { path = "packages/modrinth-util" }
diff --git a/apps/labrinth/Cargo.toml b/apps/labrinth/Cargo.toml
index fccb039a12..fbfe31b0bf 100644
--- a/apps/labrinth/Cargo.toml
+++ b/apps/labrinth/Cargo.toml
@@ -73,7 +73,6 @@ image = { workspace = true, features = [
 itertools = { workspace = true }
 json-patch = { workspace = true }
 lettre = { workspace = true }
-meilisearch-sdk = { workspace = true, features = ["reqwest"] }
 modrinth-content-management = { workspace = true }
 modrinth-util = { workspace = true, features = ["decimal", "sentry", "utoipa"] }
 muralpay = { workspace = true, features = ["client", "mock", "utoipa"] }
diff --git a/apps/labrinth/src/auth/checks.rs b/apps/labrinth/src/auth/checks.rs
index ea3d1e259b..daf9d35d00 100644
--- a/apps/labrinth/src/auth/checks.rs
+++ b/apps/labrinth/src/auth/checks.rs
@@ -11,6 +11,8 @@ use crate::models::projects::{
 use crate::models::users::User;
 use crate::queue::file_scan::get_files_missing_attribution;
 use crate::routes::ApiError;
+use crate::util::error::ApiContext as _;
+use crate::util::error::Context as _;
 use futures::TryStreamExt;
 use itertools::Itertools;
 use xredis::RedisPool;
@@ -91,7 +93,8 @@ pub async fn filter_visible_projects(
         pool,
         hide_unlisted,
     )
-    .await?;
+    .await
+    .wrap_api_err("filtering visible project ids")?;
     projects.retain(|x| filtered_project_ids.contains(&x.inner.id));
     Ok(projects.into_iter().map(|x| x.into()).collect())
 }
@@ -128,7 +131,8 @@ pub async fn filter_visible_project_ids(
     if !check_projects.is_empty() {
         return_projects.extend(
             filter_enlisted_projects_ids(check_projects, user_option, pool)
-                .await?,
+                .await
+                .wrap_api_err("filtering enlisted projects ids")?,
         );
     }
 
@@ -178,7 +182,8 @@ pub async fn filter_enlisted_projects_ids(
             }
         })
         .try_collect::<Vec<()>>()
-        .await?;
+        .await
+        .wrap_internal_err("fetching query results from database")?;
     }
     Ok(return_projects)
 }
@@ -218,7 +223,8 @@ pub async fn filter_visible_versions(
         pool,
         redis,
     )
-    .await?;
+    .await
+    .wrap_api_err("filtering visible version ids")?;
     versions.retain(|x| filtered_version_ids.contains(&x.inner.id));
 
     let version_ids: Vec<_> = versions.iter().map(|v| v.inner.id).collect();
@@ -265,10 +271,9 @@ impl ValidateAuthorized for models::DBOAuthClient {
             return if user.role.is_mod() || user.id == self.created_by.into() {
                 Ok(())
             } else {
-                Err(ApiError::CustomAuthentication(
-                    "You don't have sufficient permissions to interact with this OAuth application"
-                        .to_string(),
-                ))
+                Err(ApiError::Auth(eyre::eyre!(
+                    "You don't have sufficient permissions to interact with this OAuth application",
+                )))
             };
         }
 
@@ -292,7 +297,8 @@ pub async fn filter_visible_version_ids(
     // Get visible projects- ones we are allowed to see public versions for.
     let visible_project_ids = filter_visible_project_ids(
         DBProject::get_many_ids(&project_ids, pool, redis)
-            .await?
+            .await
+            .wrap_api_err("fetching projects for visibility filtering")?
             .iter()
             .map(|x| &x.inner)
             .collect(),
@@ -300,12 +306,14 @@ pub async fn filter_visible_version_ids(
         pool,
         false,
     )
-    .await?;
+    .await
+    .wrap_api_err("filtering visible project IDs")?;
 
     // Then, get enlisted versions (Versions that are a part of a project we are a member of)
     let enlisted_version_ids =
         filter_enlisted_version_ids(versions.clone(), user_option, pool, redis)
-            .await?;
+            .await
+            .wrap_api_err("filtering enlisted version ids")?;
 
     let version_ids: Vec<_> = versions.iter().map(|v| v.id).collect();
     let withheld_versions = get_files_missing_attribution(pool, &version_ids)
@@ -346,14 +354,16 @@ pub async fn filter_enlisted_version_ids(
     // Get enlisted projects- ones we are allowed to see hidden versions for.
     let authorized_project_ids = filter_enlisted_projects_ids(
         DBProject::get_many_ids(&project_ids, pool, redis)
-            .await?
+            .await
+            .wrap_api_err("fetching projects for membership filtering")?
             .iter()
             .map(|x| &x.inner)
             .collect(),
         user_option,
         pool,
     )
-    .await?;
+    .await
+    .wrap_api_err("filtering projects by membership")?;
 
     for version in versions {
         if user_option.as_ref().is_some_and(|x| x.role.is_mod())
@@ -428,7 +438,8 @@ pub async fn is_visible_organization(
 ) -> Result<bool, ApiError> {
     let members =
         DBTeamMember::get_from_team_full(organization.team_id, pool, redis)
-            .await?;
+            .await
+            .wrap_internal_err("fetching team members from database")?;
 
     // This is meant to match the same projects as the `Project::is_searchable` method, but we're not using
     // it here because that'd entail pulling in all projects for the organization
@@ -437,7 +448,7 @@ pub async fn is_visible_organization(
         organization.id as database::models::ids::DBOrganizationId
     )
     .fetch_optional(pool)
-    .await?
+    .await.wrap_internal_err("checking organization for searchable projects")?
     .flatten()
     .unwrap_or(false);
 
diff --git a/apps/labrinth/src/clickhouse/fetch.rs b/apps/labrinth/src/clickhouse/fetch.rs
index b0245075b8..73d9be0e52 100644
--- a/apps/labrinth/src/clickhouse/fetch.rs
+++ b/apps/labrinth/src/clickhouse/fetch.rs
@@ -1,3 +1,4 @@
+use crate::util::error::Context as _;
 use std::sync::Arc;
 
 use crate::{models::ids::ProjectId, routes::ApiError};
@@ -47,7 +48,10 @@ pub async fn fetch_playtimes(
         .bind(end_date.timestamp())
         .bind(projects.iter().map(|x| x.0).collect::<Vec<_>>());
 
-    Ok(query.fetch_all().await?)
+    query
+        .fetch_all()
+        .await
+        .wrap_internal_err("querying database for `fetch_playtimes`")
 }
 
 // Fetches views as a Vec of ReturnViews
@@ -77,7 +81,10 @@ pub async fn fetch_views(
         .bind(end_date.timestamp())
         .bind(projects.iter().map(|x| x.0).collect::<Vec<_>>());
 
-    Ok(query.fetch_all().await?)
+    query
+        .fetch_all()
+        .await
+        .wrap_internal_err("querying database for `fetch_views`")
 }
 
 // Fetches downloads as a Vec of ReturnDownloads
@@ -106,7 +113,10 @@ pub async fn fetch_downloads(
         .bind(end_date.timestamp())
         .bind(projects.iter().map(|x| x.0).collect::<Vec<_>>());
 
-    Ok(query.fetch_all().await?)
+    query
+        .fetch_all()
+        .await
+        .wrap_internal_err("querying database for `fetch_downloads`")
 }
 
 pub async fn fetch_countries_downloads(
@@ -133,7 +143,10 @@ pub async fn fetch_countries_downloads(
         .bind(end_date.timestamp())
         .bind(projects.iter().map(|x| x.0).collect::<Vec<_>>());
 
-    Ok(query.fetch_all().await?)
+    query
+        .fetch_all()
+        .await
+        .wrap_internal_err("querying database for `fetch_countries_downloads`")
 }
 
 pub async fn fetch_countries_views(
@@ -160,5 +173,8 @@ pub async fn fetch_countries_views(
         .bind(end_date.timestamp())
         .bind(projects.iter().map(|x| x.0).collect::<Vec<_>>());
 
-    Ok(query.fetch_all().await?)
+    query
+        .fetch_all()
+        .await
+        .wrap_internal_err("querying database for `fetch_countries_views`")
 }
diff --git a/apps/labrinth/src/database/models/notifications_template_item.rs b/apps/labrinth/src/database/models/notifications_template_item.rs
index dbe908e39e..3c9ef97f70 100644
--- a/apps/labrinth/src/database/models/notifications_template_item.rs
+++ b/apps/labrinth/src/database/models/notifications_template_item.rs
@@ -1,7 +1,8 @@
 use crate::database::models::DatabaseError;
 use crate::models::v3::notifications::{NotificationChannel, NotificationType};
 use crate::routes::ApiError;
-use crate::util::error::Context;
+use crate::util::error::ApiContext as _;
+use crate::util::error::Context as _;
 use serde::{Deserialize, Serialize};
 use xredis::RedisPool;
 
@@ -140,7 +141,11 @@ where
 
     drop(redis_conn);
 
-    let cached = HtmlBody { html: get().await? };
+    let cached = HtmlBody {
+        html: get()
+            .await
+            .wrap_api_err("generating notification template HTML")?,
+    };
     let mut redis_conn = redis.connect().await.wrap_internal_err(
         "connecting to redis for dynamic notification html",
     )?;
diff --git a/apps/labrinth/src/database/models/products_tax_identifier_item.rs b/apps/labrinth/src/database/models/products_tax_identifier_item.rs
index 506a82ce2e..0a8a5a85e5 100644
--- a/apps/labrinth/src/database/models/products_tax_identifier_item.rs
+++ b/apps/labrinth/src/database/models/products_tax_identifier_item.rs
@@ -1,6 +1,7 @@
 use crate::database::models::ids::{DBProductId, DBProductPriceId};
 use crate::models::billing::ProductMetadata;
 use crate::routes::ApiError;
+use crate::util::error::Context as _;
 
 pub struct DBProductsTaxIdentifier {
     pub id: i32,
@@ -18,7 +19,8 @@ impl DBProductsTaxIdentifier {
             product_id.0,
         )
         .fetch_optional(exec)
-        .await?;
+        .await
+        .wrap_internal_err("querying database for `get_product`")?;
 
         Ok(maybe_row.map(|row| DBProductsTaxIdentifier {
             id: row.id,
@@ -41,7 +43,8 @@ impl DBProductsTaxIdentifier {
             price_id.0,
         )
         .fetch_optional(exec)
-        .await?;
+        .await
+        .wrap_internal_err("querying database for `get_price`")?;
 
         Ok(maybe_row.map(|row| DBProductsTaxIdentifier {
             id: row.id,
@@ -73,7 +76,7 @@ pub async fn product_info_by_product_price_id(
         product_price_id.0 as i64,
     )
     .fetch_optional(exec)
-    .await?;
+    .await.wrap_internal_err("querying database for `product_info_by_product_price_id`")?;
 
     match maybe_row {
         None => Ok(None),
@@ -83,7 +86,8 @@ pub async fn product_info_by_product_price_id(
                 tax_processor_id: row.tax_processor_id,
                 product_id: DBProductId(row.product_id),
             },
-            product_metadata: serde_json::from_value(row.product_metadata)?,
+            product_metadata: serde_json::from_value(row.product_metadata)
+                .wrap_request_err("deserializing JSON data")?,
         })),
     }
 }
diff --git a/apps/labrinth/src/lib.rs b/apps/labrinth/src/lib.rs
index e3ffe16b75..382dd9fc66 100644
--- a/apps/labrinth/src/lib.rs
+++ b/apps/labrinth/src/lib.rs
@@ -328,16 +328,16 @@ pub fn app_data_config(
     labrinth_config: LabrinthConfig,
 ) {
     cfg.app_data(web::FormConfig::default().error_handler(|err, _req| {
-        routes::ApiError::Validation(err.to_string()).into()
+        routes::ApiError::Request(eyre::eyre!("{err}")).into()
     }))
     .app_data(web::PathConfig::default().error_handler(|err, _req| {
-        routes::ApiError::Validation(err.to_string()).into()
+        routes::ApiError::Request(eyre::eyre!("{err}")).into()
     }))
     .app_data(web::QueryConfig::default().error_handler(|err, _req| {
-        routes::ApiError::Validation(err.to_string()).into()
+        routes::ApiError::Request(eyre::eyre!("{err}")).into()
     }))
     .app_data(web::JsonConfig::default().error_handler(|err, _req| {
-        routes::ApiError::Validation(err.to_string()).into()
+        routes::ApiError::Request(eyre::eyre!("{err}")).into()
     }))
     .app_data(web::Data::new(labrinth_config.redis_pool.clone()))
     .app_data(web::Data::new(labrinth_config.pool.clone()))
diff --git a/apps/labrinth/src/models/v3/moderation_notes.rs b/apps/labrinth/src/models/v3/moderation_notes.rs
index b6621dc8ea..5488ec0ddf 100644
--- a/apps/labrinth/src/models/v3/moderation_notes.rs
+++ b/apps/labrinth/src/models/v3/moderation_notes.rs
@@ -4,6 +4,7 @@ use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 
 use crate::routes::ApiError;
+use crate::util::error::Context as _;
 
 #[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)]
 pub struct ModerationNote {
@@ -37,9 +38,9 @@ pub struct PatchModerationNote {
 impl PatchModerationNote {
     pub fn validate_not_empty(&self) -> Result<(), ApiError> {
         if self.notes.is_none() && self.user_rating.is_none() {
-            return Err(ApiError::InvalidInput(
-                "must specify `notes` or `user_rating`".to_string(),
-            ));
+            return Err(ApiError::Request(eyre::eyre!(
+                "must specify `notes` or `user_rating`",
+            )));
         }
 
         Ok(())
@@ -53,16 +54,14 @@ pub fn parse_if_match_header(
         return Ok(None);
     };
 
-    let value = value.to_str().map_err(|_| {
-        ApiError::InvalidInput(
-            "`if-match` header must be a valid integer".to_string(),
-        )
-    })?;
+    let value = value.to_str().wrap_request_err(
+        "`if-match` header must be a valid integer".to_string(),
+    )?;
 
     Some(value.parse::<i32>().map_err(|_| {
-        ApiError::InvalidInput(
-            "`if-match` header must be a valid integer".to_string(),
-        )
+        ApiError::Request(eyre::eyre!(
+            "`if-match` header must be a valid integer",
+        ))
     }))
     .transpose()
 }
diff --git a/apps/labrinth/src/models/v3/notifications.rs b/apps/labrinth/src/models/v3/notifications.rs
index 12598e7fed..2b9cb26dee 100644
--- a/apps/labrinth/src/models/v3/notifications.rs
+++ b/apps/labrinth/src/models/v3/notifications.rs
@@ -767,8 +767,8 @@ impl NotificationDeliveryStatus {
             NotificationDeliveryStatus::Delivered => Ok(()),
             NotificationDeliveryStatus::SkippedPreferences |
             NotificationDeliveryStatus::SkippedDefault |
-            NotificationDeliveryStatus::Pending => Err(ApiError::InvalidInput("An error occurred while sending an email to your email address. Please try again later.".to_owned())),
-            NotificationDeliveryStatus::PermanentlyFailed => Err(ApiError::InvalidInput("This email address doesn't exist! Please try another one.".to_owned())),
+            NotificationDeliveryStatus::Pending => Err(ApiError::Request(eyre::eyre!("An error occurred while sending an email to your email address. Please try again later.".to_owned()))),
+            NotificationDeliveryStatus::PermanentlyFailed => Err(ApiError::Request(eyre::eyre!("This email address doesn't exist! Please try another one.".to_owned()))),
         }
     }
 
diff --git a/apps/labrinth/src/queue/analytics/mod.rs b/apps/labrinth/src/queue/analytics/mod.rs
index 91c3f553d2..f1be710b4b 100644
--- a/apps/labrinth/src/queue/analytics/mod.rs
+++ b/apps/labrinth/src/queue/analytics/mod.rs
@@ -4,7 +4,7 @@ use crate::models::analytics::{
 };
 use crate::routes::ApiError;
 use crate::routes::analytics::MINECRAFT_SERVER_PLAYS;
-use crate::util::error::Context;
+use crate::util::error::Context as _;
 use dashmap::{DashMap, DashSet};
 use std::collections::HashMap;
 use tracing::trace;
@@ -100,25 +100,39 @@ impl AnalyticsQueue {
         if !affiliate_code_clicks_queue.is_empty() {
             let mut insert_clicks = client
                 .insert::<AffiliateCodeClick>("affiliate_code_clicks")
-                .await?;
+                .await
+                .wrap_internal_err("writing analytics data to ClickHouse")?;
 
             for (_, click_vec) in affiliate_code_clicks_queue {
                 for click in click_vec {
-                    insert_clicks.write(&click).await?;
+                    insert_clicks.write(&click).await.wrap_internal_err(
+                        "writing analytics data to ClickHouse",
+                    )?;
                 }
             }
 
-            insert_clicks.end().await?;
+            insert_clicks
+                .end()
+                .await
+                .wrap_internal_err("writing analytics data to ClickHouse")?;
         }
 
         if !playtime_queue.is_empty() {
-            let mut playtimes = client.insert::<Playtime>("playtime").await?;
+            let mut playtimes = client
+                .insert::<Playtime>("playtime")
+                .await
+                .wrap_internal_err("writing analytics data to ClickHouse")?;
 
             for playtime in playtime_queue {
-                playtimes.write(&playtime).await?;
+                playtimes.write(&playtime).await.wrap_internal_err(
+                    "writing analytics data to ClickHouse",
+                )?;
             }
 
-            playtimes.end().await?;
+            playtimes
+                .end()
+                .await
+                .wrap_internal_err("writing analytics data to ClickHouse")?;
         }
 
         if !minecraft_server_plays_queue.is_empty() {
@@ -176,13 +190,19 @@ impl AnalyticsQueue {
 
             let mut plays = client
                 .insert::<MinecraftServerPlay>(MINECRAFT_SERVER_PLAYS)
-                .await?;
+                .await
+                .wrap_internal_err("writing analytics data to ClickHouse")?;
 
             for (_, play) in raw_plays {
-                plays.write(&play).await?;
+                plays.write(&play).await.wrap_internal_err(
+                    "writing analytics data to ClickHouse",
+                )?;
             }
 
-            plays.end().await?;
+            plays
+                .end()
+                .await
+                .wrap_internal_err("writing analytics data to ClickHouse")?;
         }
 
         if !views_queue.is_empty() {
@@ -242,7 +262,10 @@ impl AnalyticsQueue {
                     .wrap_internal_err("writing view count to redis")?;
             }
 
-            let mut views = client.insert::<PageView>("views").await?;
+            let mut views = client
+                .insert::<PageView>("views")
+                .await
+                .wrap_internal_err("writing analytics data to ClickHouse")?;
 
             for (all_views, monetized) in raw_views {
                 for (idx, mut view) in all_views.into_iter().enumerate() {
@@ -250,11 +273,16 @@ impl AnalyticsQueue {
                         view.monetized = false;
                     }
 
-                    views.write(&view).await?;
+                    views.write(&view).await.wrap_internal_err(
+                        "writing analytics data to ClickHouse",
+                    )?;
                 }
             }
 
-            views.end().await?;
+            views
+                .end()
+                .await
+                .wrap_internal_err("writing analytics data to ClickHouse")?;
         }
 
         if !downloads_queue.is_empty() {
@@ -308,8 +336,14 @@ impl AnalyticsQueue {
                     .wrap_internal_err("writing download count to redis")?;
             }
 
-            let mut transaction = pool.begin().await?;
-            let mut downloads = client.insert::<Download>("downloads").await?;
+            let mut transaction = pool
+                .begin()
+                .await
+                .wrap_internal_err("starting database transaction")?;
+            let mut downloads = client
+                .insert::<Download>("downloads")
+                .await
+                .wrap_internal_err("writing analytics data to ClickHouse")?;
 
             let mut version_downloads: HashMap<i64, i32> = HashMap::new();
             let mut project_downloads: HashMap<i64, i32> = HashMap::new();
@@ -329,7 +363,9 @@ impl AnalyticsQueue {
 
                 trace!("writing download {download:?}");
 
-                downloads.write(&download).await?;
+                downloads.write(&download).await.wrap_internal_err(
+                    "writing analytics data to ClickHouse",
+                )?;
             }
 
             sqlx::query!(
@@ -343,7 +379,8 @@ impl AnalyticsQueue {
                 &version_downloads.values().copied().collect::<Vec<_>>(),
             )
             .execute(&mut transaction)
-            .await?;
+            .await
+            .wrap_internal_err("incrementing version download counts")?;
 
             sqlx::query!(
                 "
@@ -356,10 +393,17 @@ impl AnalyticsQueue {
                 &project_downloads.values().copied().collect::<Vec<_>>(),
             )
             .execute(&mut transaction)
-            .await?;
+            .await
+            .wrap_internal_err("incrementing project download counts")?;
 
-            transaction.commit().await?;
-            downloads.end().await?;
+            transaction
+                .commit()
+                .await
+                .wrap_internal_err("committing database transaction")?;
+            downloads
+                .end()
+                .await
+                .wrap_internal_err("writing analytics data to ClickHouse")?;
         }
 
         Ok(())
diff --git a/apps/labrinth/src/queue/billing.rs b/apps/labrinth/src/queue/billing.rs
index f982ce48f8..504720adb4 100644
--- a/apps/labrinth/src/queue/billing.rs
+++ b/apps/labrinth/src/queue/billing.rs
@@ -24,6 +24,7 @@ use crate::routes::internal::billing::payments::*;
 use crate::util::anrok;
 use crate::util::archon::ArchonClient;
 use crate::util::archon::{CreateServerRequest, Specs};
+use crate::util::error::ApiContext as _;
 use crate::util::error::Context;
 use ariadne::ids::base62_impl::to_base62;
 use chrono::Utc;
@@ -48,9 +49,14 @@ async fn update_tax_amounts(
     let mut processed_charges = 0;
 
     loop {
-        let mut txn = pg.begin().await?;
+        let mut txn = pg
+            .begin()
+            .await
+            .wrap_internal_err("starting database transaction")?;
 
-        let charges = DBCharge::get_updateable_lock(&mut txn, 5).await?;
+        let charges = DBCharge::get_updateable_lock(&mut txn, 5)
+            .await
+            .wrap_internal_err("fetching charges from database")?;
 
         if charges.is_empty() {
             info!("No more charges to process");
@@ -82,67 +88,70 @@ async fn update_tax_amounts(
                         charge.price_id,
                         &pg,
                     )
-                    .await?
+                    .await
+                    .wrap_api_err("fetching price")?
                     .ok_or_else(|| {
                         DatabaseError::Database(sqlx::Error::RowNotFound)
-                    })?;
+                    })
+                    .wrap_internal_err("querying database for `update_tax_amounts`")?;
 
-                    let product =
-                        DBProduct::get_price(charge.price_id, &pg)
-                            .await?
-                            .ok_or_else(|| {
-                            DatabaseError::Database(
-                                sqlx::Error::RowNotFound,
-                            )
-                        })?;
+                    let product = DBProduct::get_price(charge.price_id, &pg)
+                        .await
+                        .wrap_internal_err(
+                            "fetching product price from database",
+                        )?
+                        .ok_or_else(|| {
+                            DatabaseError::Database(sqlx::Error::RowNotFound)
+                        })
+                        .wrap_internal_err(
+                            "finding product price in database",
+                        )?;
 
                     let stripe_address = 'a: {
-                        let stripe_customer_id =
+                        let stripe_customer =
                             DBUser::get_id(charge.user_id, &pg, &redis)
-                                .await?
-                                .ok_or_else(|| {
-                                    ApiError::from(DatabaseError::Database(
-                                        sqlx::Error::RowNotFound,
-                                    ))
-                                })
-                                .and_then(|user| {
-                                    user.stripe_customer_id.ok_or_else(
-                                        || {
-                                            ApiError::InvalidInput(
-                                            "User has no Stripe customer ID"
-                                                .to_owned(),
-                                        )
-                                        },
-                                    )
-                                })?
-                                .parse()
-                                .map_err(|_| {
-                                    ApiError::InvalidInput(
-                                        "User Stripe customer ID was invalid".to_owned(),
-                                    )
-                                })?;
+                                .await
+                                .wrap_internal_err(
+                                    "fetching Stripe customer from database",
+                                )?
+                                .wrap_internal_err(
+                                    "finding Stripe customer in database",
+                                )?;
+                        let stripe_customer_id = stripe_customer
+                            .stripe_customer_id
+                            .wrap_request_err(
+                                "finding Stripe customer ID on user",
+                            )?
+                            .parse()
+                            .wrap_request_err(
+                                "parsing user Stripe customer ID",
+                            )?;
 
                         let customer = stripe::Customer::retrieve(
                             &stripe_client,
                             &stripe_customer_id,
                             &["invoice_settings.default_payment_method"],
                         )
-                        .await?;
+                        .await
+                        .wrap_failed_dependency_err(
+                            "communicating with payment provider",
+                        )?;
 
                         // A customer should have a default payment method if they have an active subscription.
 
                         let payment_method = customer
                             .invoice_settings
                             .and_then(|x| {
-                                x.default_payment_method.and_then(|x| x.into_object())
+                                x.default_payment_method
+                                    .and_then(|x| x.into_object())
                             })
-                            .ok_or_else(|| {
-                                ApiError::InvalidInput(
-                                    "Customer has no default payment method!".to_string(),
-                                )
+                            .wrap_request_err_with(|| {
+                                "customer has no default payment method!"
+                                    .to_string()
                             })?;
 
-                        let stripe_address = payment_method.billing_details.address;
+                        let stripe_address =
+                            payment_method.billing_details.address;
 
                         // Attempt the default payment method's address first, then the customer's address.
                         match stripe_address {
@@ -152,18 +161,14 @@ async fn update_tax_amounts(
                             }
                         };
 
-                        customer.address.ok_or_else(|| {
-                            ApiError::InvalidInput(
-                                "Couldn't get an address for the Stripe customer"
-                                    .to_owned(),
-                            )
+                        customer.address.wrap_request_err_with(|| {
+                            "couldn't get an address for the Stripe customer"
+                                .to_owned()
                         })?
                     };
 
                     let customer_address =
-                        anrok::Address::from_stripe_address(
-                            &stripe_address,
-                        );
+                        anrok::Address::from_stripe_address(&stripe_address);
 
                     let tax_amount = anrok_client
                         .create_ephemeral_txn(&anrok::TransactionFields {
@@ -179,17 +184,16 @@ async fn update_tax_amounts(
                             customer_id: None,
                             customer_name: None,
                         })
-                        .await?
+                        .await
+                        .wrap_internal_err("inserting database records for `update_tax_amounts`")?
                         .tax_amount_to_collect;
 
-                    Result::<ProcessedCharge, ApiError>::Ok(
-                        ProcessedCharge {
-                            new_tax_amount: tax_amount,
-                            product_name: product
-                                .name
-                                .unwrap_or_else(|| "Modrinth".to_owned()),
-                        },
-                    )
+                    Result::<ProcessedCharge, ApiError>::Ok(ProcessedCharge {
+                        new_tax_amount: tax_amount,
+                        product_name: product
+                            .name
+                            .unwrap_or_else(|| "Modrinth".to_owned()),
+                    })
                 };
 
                 op_fut.then(move |res| async move { (charge_clone, res) })
@@ -212,11 +216,9 @@ async fn update_tax_amounts(
                         // for this.
 
                         let subscription_id =
-                            charge.subscription_id.ok_or_else(|| {
-                                ApiError::InvalidInput(
-                                    "Charge has no subscription ID".to_owned(),
-                                )
-                            })?;
+                            charge.subscription_id.wrap_request_err_with(
+                                || "charge has no subscription ID".to_owned(),
+                            )?;
 
                         NotificationBuilder {
                             body: NotificationBody::TaxNotification {
@@ -234,7 +236,8 @@ async fn update_tax_amounts(
                             },
                         }
                         .insert(charge.user_id, &mut txn, redis)
-                        .await?;
+                        .await
+                        .wrap_internal_err("inserting database records for `update_tax_amounts`")?;
 
                         charge.tax_amount = new_tax_amount;
                     }
@@ -248,10 +251,15 @@ async fn update_tax_amounts(
             };
 
             charge.tax_last_updated = Some(Utc::now());
-            charge.upsert(&mut txn).await?;
+            charge
+                .upsert(&mut txn)
+                .await
+                .wrap_internal_err("updating subscription id in database")?;
         }
 
-        txn.commit().await?;
+        txn.commit()
+            .await
+            .wrap_internal_err("committing database transaction")?;
 
         if processed_charges >= limit {
             break Ok(());
@@ -287,11 +295,9 @@ async fn update_anrok_transactions(
                     .payment_platform_id
                     .as_ref()
                     .and_then(|x| x.parse().ok())
-                    .ok_or_else(|| {
-                        ApiError::InvalidInput(
-                            "Refund charge has no or an invalid refund ID"
-                                .to_owned(),
-                        )
+                    .wrap_request_err_with(|| {
+                        "refund charge has no or an invalid refund ID"
+                            .to_owned()
                     })?;
 
                 let refund = stripe::Refund::retrieve(
@@ -299,15 +305,16 @@ async fn update_anrok_transactions(
                     &refund_id,
                     &["payment_intent.payment_method"],
                 )
-                .await?;
+                .await
+                .wrap_failed_dependency_err(
+                    "communicating with payment provider",
+                )?;
 
                 let pi = refund
                     .payment_intent
                     .and_then(|x| x.into_object())
-                    .ok_or_else(|| {
-                        ApiError::InvalidInput(
-                            "Refund charge has no payment intent".to_owned(),
-                        )
+                    .wrap_request_err_with(|| {
+                        "refund charge has no payment intent".to_owned()
                     })?;
 
                 (pi, anrok::transaction_id_stripe_pyr(&refund_id))
@@ -316,10 +323,8 @@ async fn update_anrok_transactions(
                     .payment_platform_id
                     .as_ref()
                     .and_then(|x| x.parse().ok())
-                    .ok_or_else(|| {
-                        ApiError::InvalidInput(
-                            "Charge has no payment platform ID".to_owned(),
-                        )
+                    .wrap_request_err_with(|| {
+                        "charge has no payment platform ID".to_owned()
                     })?;
 
                 // Attempt retrieving the address via the payment intent's payment method
@@ -329,7 +334,10 @@ async fn update_anrok_transactions(
                     &stripe_id,
                     &["payment_method"],
                 )
-                .await?;
+                .await
+                .wrap_failed_dependency_err(
+                    "communicating with payment provider",
+                )?;
 
                 let anrok_id = anrok::transaction_id_stripe_pi(&stripe_id);
 
@@ -341,27 +349,17 @@ async fn update_anrok_transactions(
                 .and_then(|x| x.into_object())
                 .and_then(|x| x.billing_details.address);
 
-            let stripe_customer_id =
-                DBUser::get_id(c.user_id, &mut *txn, redis)
-                    .await?
-                    .ok_or_else(|| {
-                        ApiError::from(DatabaseError::Database(
-                            sqlx::Error::RowNotFound,
-                        ))
-                    })
-                    .and_then(|user| {
-                        user.stripe_customer_id.ok_or_else(|| {
-                            ApiError::InvalidInput(
-                                "User has no Stripe customer ID".to_owned(),
-                            )
-                        })
-                    })?;
+            let stripe_customer = DBUser::get_id(c.user_id, &mut *txn, redis)
+                .await
+                .wrap_internal_err("fetching Stripe customer from database")?
+                .wrap_internal_err("finding Stripe customer in database")?;
+            let stripe_customer_id = stripe_customer
+                .stripe_customer_id
+                .wrap_request_err("finding Stripe customer ID on user")?;
 
-            let customer_id = stripe_customer_id.parse().map_err(|e| {
-                ApiError::InvalidInput(format!(
-                    "Charge's Stripe customer ID was invalid ({e})"
-                ))
-            })?;
+            let customer_id = stripe_customer_id
+                .parse()
+                .wrap_request_err("parsing request value")?;
 
             match pi_stripe_address {
                 Some(address) => {
@@ -377,7 +375,10 @@ async fn update_anrok_transactions(
 
             let customer =
                 stripe::Customer::retrieve(stripe_client, &customer_id, &[])
-                    .await?;
+                    .await
+                    .wrap_failed_dependency_err(
+                        "communicating with payment provider",
+                    )?;
 
             let Some(address) = customer.address else {
                 // We won't really be able to do anything about this.
@@ -388,7 +389,9 @@ async fn update_anrok_transactions(
                 );
 
                 c.tax_platform_id = Some("unresolved".to_owned());
-                c.upsert(txn).await?;
+                c.upsert(txn)
+                    .await
+                    .wrap_internal_err("updating customer in database")?;
 
                 return Ok(());
             };
@@ -397,8 +400,12 @@ async fn update_anrok_transactions(
         };
 
         let tax_id = DBProductsTaxIdentifier::get_price(c.price_id, &mut *txn)
-            .await?
-            .ok_or_else(|| DatabaseError::Database(sqlx::Error::RowNotFound))?;
+            .await
+            .wrap_api_err("fetching price")?
+            .ok_or_else(|| DatabaseError::Database(sqlx::Error::RowNotFound))
+            .wrap_internal_err(
+                "fetching products tax identifier from database",
+            )?;
 
         // Note: if the tax amount that was charged to the customer is *different* than
         // what it *should* be NOW, we will take on a loss here.
@@ -427,18 +434,18 @@ async fn update_anrok_transactions(
 
         match result {
             Ok(response) => {
-                let version = response.version.ok_or_else(|| {
-                    ApiError::InvalidInput(
-                        "Anrok response is missing tax transaction version"
-                            .to_owned(),
-                    )
+                let version = response.version.wrap_request_err_with(|| {
+                    "anrok response is missing tax transaction version"
+                        .to_owned()
                 })?;
 
                 c.tax_drift_loss = Some(response.tax_amount_to_collect);
                 c.tax_platform_id = Some(tax_platform_id);
                 c.tax_transaction_version = Some(version);
                 c.tax_platform_accounting_time = Some(c.due);
-                c.upsert(txn).await?;
+                c.upsert(txn)
+                    .await
+                    .wrap_internal_err("updating version in database")?;
 
                 Ok(())
             }
@@ -449,11 +456,15 @@ async fn update_anrok_transactions(
                     .is_conflict_and(|x| x == "customerAddressCouldNotResolve")
                 {
                     c.tax_platform_id = Some("unresolved".to_owned());
-                    c.upsert(txn).await?;
+                    c.upsert(txn)
+                        .await
+                        .wrap_internal_err("updating version in database")?;
 
                     Ok(())
                 } else {
-                    Err(error.into())
+                    Err(ApiError::Internal(eyre::eyre!(
+                        "calculating tax with Anrok: {error}"
+                    )))
                 }
             }
         }
@@ -464,11 +475,15 @@ async fn update_anrok_transactions(
     let mut offset = 0;
 
     loop {
-        let mut txn = pg.begin().await?;
+        let mut txn = pg
+            .begin()
+            .await
+            .wrap_internal_err("starting database transaction")?;
 
         let mut charges =
             DBCharge::get_missing_tax_identifier_lock(&mut txn, offset, 1)
-                .await?;
+                .await
+                .wrap_internal_err("fetching charges from database")?;
 
         let Some(c) = charges.pop() else {
             info!("No more charges to process");
@@ -492,7 +507,9 @@ async fn update_anrok_transactions(
             offset += 1;
         }
 
-        txn.commit().await?;
+        txn.commit()
+            .await
+            .wrap_internal_err("committing database transaction")?;
 
         if processed_charges >= limit {
             break Ok(());
@@ -512,7 +529,10 @@ pub async fn try_process_user_redeemal(
     user_redeemal.last_attempt = Some(Utc::now());
     user_redeemal.n_attempts += 1;
     user_redeemal.status = users_redeemals::Status::Processing;
-    let updated = user_redeemal.update_status_if_pending(pool).await?;
+    let updated = user_redeemal
+        .update_status_if_pending(pool)
+        .await
+        .wrap_internal_err("updating updated in database")?;
 
     if !updated {
         return Ok(());
@@ -526,7 +546,8 @@ pub async fn try_process_user_redeemal(
         product_item::QueryProductWithPrices::list_by_product_type(
             pool, "medal",
         )
-        .await?;
+        .await
+        .wrap_internal_err("fetching query product with prices from Redis")?;
 
     let Some(product_item::QueryProductWithPrices {
         id: _product_id,
@@ -536,9 +557,9 @@ pub async fn try_process_user_redeemal(
         name: _,
     }) = medal_products.pop()
     else {
-        return Err(ApiError::Conflict(
+        return Err(ApiError::Conflict(eyre::eyre!(
             "Missing Medal subscription product".to_owned(),
-        ));
+        )));
     };
 
     let ProductMetadata::Medal {
@@ -549,31 +570,31 @@ pub async fn try_process_user_redeemal(
         region,
     } = metadata
     else {
-        return Err(ApiError::Conflict(
+        return Err(ApiError::Conflict(eyre::eyre!(
             "Missing or incorrect metadata for Medal subscription".to_owned(),
-        ));
+        )));
     };
 
     let Some(medal_price) = prices.pop() else {
-        return Err(ApiError::Conflict(
+        return Err(ApiError::Conflict(eyre::eyre!(
             "Missing price for Medal subscription".to_owned(),
-        ));
+        )));
     };
 
     let (price_duration, price_amount) = match medal_price.prices {
         Price::OneTime { price: _ } => {
-            return Err(ApiError::Conflict(
+            return Err(ApiError::Conflict(eyre::eyre!(
                 "Unexpected metadata for Medal subscription price".to_owned(),
-            ));
+            )));
         }
 
         Price::Recurring { intervals } => {
             let Some((price_duration, price_amount)) =
                 intervals.into_iter().next()
             else {
-                return Err(ApiError::Conflict(
+                return Err(ApiError::Conflict(eyre::eyre!(
                     "Missing price interval for Medal subscription".to_owned(),
-                ));
+                )));
             };
 
             (price_duration, price_amount)
@@ -585,13 +606,15 @@ pub async fn try_process_user_redeemal(
     // Get the user's username
 
     let user = DBUser::get_id(user_id, pool, redis)
-        .await?
-        .ok_or(ApiError::NotFound)?;
+        .await
+        .wrap_internal_err("fetching user from database")?
+        .wrap_not_found_err("resource not found")?;
 
     // Send the provision request to Archon. On failure, the redeemal will be "stuck" processing,
     // and moved back to pending by `index_subscriptions`.
 
-    let archon_client = ArchonClient::from_env()?;
+    let archon_client = ArchonClient::from_env()
+        .wrap_api_err("executing `ArchonClient::from_env`")?;
     let server_id = archon_client
         .create_server(&CreateServerRequest {
             user_id: to_base62(user_id.0 as u64),
@@ -606,13 +629,21 @@ pub async fn try_process_user_redeemal(
             region,
             tags: vec!["medal".to_owned()],
         })
-        .await?;
+        .await
+        .wrap_internal_err(
+            "inserting database records for `try_process_user_redeemal`",
+        )?;
 
-    let mut txn = pool.begin().await?;
+    let mut txn = pool
+        .begin()
+        .await
+        .wrap_internal_err("starting database transaction")?;
 
     // Build a subscription using this price ID.
     let subscription = DBUserSubscription {
-        id: generate_user_subscription_id(&mut txn).await?,
+        id: generate_user_subscription_id(&mut txn)
+            .await
+            .wrap_internal_err("generating user subscription ID")?,
         user_id,
         price_id,
         interval: PriceDuration::FiveDays,
@@ -623,12 +654,17 @@ pub async fn try_process_user_redeemal(
         }),
     };
 
-    subscription.upsert(&mut txn).await?;
+    subscription
+        .upsert(&mut txn)
+        .await
+        .wrap_internal_err("generating user subscription ID")?;
 
     // Insert an expiring charge, `index_subscriptions` will unprovision the
     // subscription when expired.
     DBCharge {
-        id: generate_charge_id(&mut txn).await?,
+        id: generate_charge_id(&mut txn)
+            .await
+            .wrap_internal_err("generating redeemal charge ID")?,
         user_id,
         price_id,
         amount: price_amount.into(),
@@ -651,26 +687,42 @@ pub async fn try_process_user_redeemal(
         tax_platform_accounting_time: None,
     }
     .upsert(&mut txn)
-    .await?;
+    .await
+    .wrap_internal_err("upserting redeemal charge")?;
 
     // Update `users_redeemal`, mark subscription as redeemed.
     user_redeemal.status = users_redeemals::Status::Processed;
-    user_redeemal.update(&mut txn).await?;
+    user_redeemal.update(&mut txn).await.wrap_internal_err(
+        "updating database records for `try_process_user_redeemal`",
+    )?;
 
-    txn.commit().await?;
+    txn.commit()
+        .await
+        .wrap_internal_err("committing database transaction")?;
 
     Ok(())
 }
 
 pub async fn cancel_failing_charges(pool: &PgPool) -> Result<(), ApiError> {
-    let charges_to_cancel = DBCharge::get_cancellable(pool).await?;
+    let charges_to_cancel = DBCharge::get_cancellable(pool)
+        .await
+        .wrap_internal_err("fetching charge from database")?;
 
     for mut charge in charges_to_cancel {
         charge.status = ChargeStatus::Cancelled;
 
-        let mut transaction = pool.begin().await?;
-        charge.upsert(&mut transaction).await?;
-        transaction.commit().await?;
+        let mut transaction = pool
+            .begin()
+            .await
+            .wrap_internal_err("starting database transaction")?;
+        charge
+            .upsert(&mut transaction)
+            .await
+            .wrap_internal_err("updating transaction in database")?;
+        transaction
+            .commit()
+            .await
+            .wrap_internal_err("committing database transaction")?;
     }
 
     Ok(())
@@ -682,7 +734,9 @@ pub async fn process_chargeable_charges(
     stripe_client: &stripe::Client,
     anrok_client: &anrok::Client,
 ) -> Result<(), ApiError> {
-    let charges_to_do = DBCharge::get_chargeable(pool).await?;
+    let charges_to_do = DBCharge::get_chargeable(pool)
+        .await
+        .wrap_internal_err("fetching charge from database")?;
 
     let prices = product_item::DBProductPrice::get_many(
         &charges_to_do
@@ -693,7 +747,8 @@ pub async fn process_chargeable_charges(
             .collect::<Vec<_>>(),
         pool,
     )
-    .await?;
+    .await
+    .wrap_internal_err("fetching product prices from database")?;
 
     let users = crate::database::models::DBUser::get_many_ids(
         &charges_to_do
@@ -705,7 +760,8 @@ pub async fn process_chargeable_charges(
         pool,
         redis,
     )
-    .await?;
+    .await
+    .wrap_internal_err("fetching users from database")?;
 
     for mut charge in charges_to_do {
         let Some(product_price) =
@@ -784,9 +840,18 @@ pub async fn process_chargeable_charges(
             charge.status = ChargeStatus::Failed;
         }
 
-        let mut transaction = pool.begin().await?;
-        charge.upsert(&mut transaction).await?;
-        transaction.commit().await?;
+        let mut transaction = pool
+            .begin()
+            .await
+            .wrap_internal_err("starting database transaction")?;
+        charge
+            .upsert(&mut transaction)
+            .await
+            .wrap_internal_err("updating transaction in database")?;
+        transaction
+            .commit()
+            .await
+            .wrap_internal_err("committing database transaction")?;
     }
 
     Ok(())
@@ -798,7 +863,10 @@ async fn unprovision_subscriptions(
 ) -> Result<(), ApiError> {
     info!("Gathering charges to unprovision");
 
-    let mut transaction = pool.begin().await?;
+    let mut transaction = pool
+        .begin()
+        .await
+        .wrap_internal_err("starting database transaction")?;
     let mut clear_cache_users = Vec::new();
 
     // If an active subscription has:
@@ -806,7 +874,9 @@ async fn unprovision_subscriptions(
     // - An expiring charge due now
     // - A failed charge more than two days ago
     // It should be unprovisioned
-    let all_charges = DBCharge::get_unprovision(pool).await?;
+    let all_charges = DBCharge::get_unprovision(pool)
+        .await
+        .wrap_internal_err("fetching charges from database")?;
 
     let mut all_subscriptions =
         user_subscription_item::DBUserSubscription::get_many(
@@ -818,7 +888,8 @@ async fn unprovision_subscriptions(
                 .collect::<Vec<_>>(),
             pool,
         )
-        .await?;
+        .await
+        .wrap_internal_err("fetching user subscriptions from database")?;
     let subscription_prices = product_item::DBProductPrice::get_many(
         &all_subscriptions
             .iter()
@@ -828,7 +899,8 @@ async fn unprovision_subscriptions(
             .collect::<Vec<_>>(),
         pool,
     )
-    .await?;
+    .await
+    .wrap_internal_err("fetching product prices from database")?;
     let subscription_products = product_item::DBProduct::get_many(
         &subscription_prices
             .iter()
@@ -838,7 +910,8 @@ async fn unprovision_subscriptions(
             .collect::<Vec<_>>(),
         pool,
     )
-    .await?;
+    .await
+    .wrap_internal_err("fetching products from database")?;
     let users = DBUser::get_many_ids(
         &all_subscriptions
             .iter()
@@ -849,7 +922,8 @@ async fn unprovision_subscriptions(
         pool,
         redis,
     )
-    .await?;
+    .await
+    .wrap_internal_err("fetching users from database")?;
 
     for charge in all_charges {
         debug!("Unprovisioning charge '{}'", to_base62(charge.id.0 as u64));
@@ -898,7 +972,10 @@ async fn unprovision_subscriptions(
                     user.id as DBUserId,
                 )
                 .execute(&mut transaction)
-                .await?;
+                .await
+                .wrap_internal_err(
+                    "querying database for `unprovision_subscriptions`",
+                )?;
 
                 true
             }
@@ -939,7 +1016,10 @@ async fn unprovision_subscriptions(
 
         if unprovisioned {
             subscription.status = SubscriptionStatus::Unprovisioned;
-            subscription.upsert(&mut transaction).await?;
+            subscription
+                .upsert(&mut transaction)
+                .await
+                .wrap_internal_err("updating err in database")?;
 
             DBUsersSubscriptionsAffiliations::deactivate(
                 subscription.id,
@@ -961,8 +1041,12 @@ async fn unprovision_subscriptions(
             .collect::<Vec<_>>(),
         redis,
     )
-    .await?;
-    transaction.commit().await?;
+    .await
+    .wrap_internal_err("clearing cached data from Redis")?;
+    transaction
+        .commit()
+        .await
+        .wrap_internal_err("committing database transaction")?;
 
     Ok(())
 }
@@ -972,11 +1056,17 @@ async fn process_redeemals(
     redis: &RedisPool,
 ) -> Result<(), ApiError> {
     // If an offer redeemal has been processing for over 5 minutes, it should be set pending.
-    UserRedeemal::update_stuck_5_minutes(pool).await?;
+    UserRedeemal::update_stuck_5_minutes(pool)
+        .await
+        .wrap_internal_err(
+            "updating database records for `process_redeemals`",
+        )?;
 
     // If an offer redeemal is pending, try processing it.
     // Try processing it.
-    let pending_redeemals = UserRedeemal::get_pending(pool, 100).await?;
+    let pending_redeemals = UserRedeemal::get_pending(pool, 100)
+        .await
+        .wrap_internal_err("fetching user redeemal from Redis")?;
     for redeemal in pending_redeemals {
         if let Err(error) =
             try_process_user_redeemal(pool, redis, redeemal).await
diff --git a/apps/labrinth/src/queue/email.rs b/apps/labrinth/src/queue/email.rs
index ff1b9cfb7b..5ee5374b17 100644
--- a/apps/labrinth/src/queue/email.rs
+++ b/apps/labrinth/src/queue/email.rs
@@ -10,6 +10,8 @@ use crate::models::v3::notifications::{
     NotificationChannel, NotificationDeliveryStatus,
 };
 use crate::routes::ApiError;
+use crate::util::error::ApiContext as _;
+use crate::util::error::Context as _;
 use chrono::Utc;
 use futures::stream::{FuturesUnordered, StreamExt};
 use lettre::message::Mailbox;
@@ -150,7 +152,13 @@ impl EmailQueue {
     /// Returns `Ok(false)` if no emails were processed, `Ok(true)` if some were processed.
     #[instrument(name = "EmailQueue::index", skip_all)]
     pub async fn index(&self, limit: i64) -> Result<bool, ApiError> {
-        let transport = self.mailer.lock().await.to_transport().await?;
+        let transport = self
+            .mailer
+            .lock()
+            .await
+            .to_transport()
+            .await
+            .wrap_internal_err("creating email transport")?;
 
         let begin = std::time::Instant::now();
 
@@ -159,7 +167,8 @@ impl EmailQueue {
             limit,
             &self.pg,
         )
-        .await?;
+        .await
+        .wrap_internal_err("creating email transport")?;
 
         if deliveries.is_empty() {
             return Ok(false);
@@ -171,7 +180,9 @@ impl EmailQueue {
         // ballooning the error rate.
         for d in deliveries.iter_mut().filter(|d| d.attempt_count >= 3) {
             d.status = NotificationDeliveryStatus::PermanentlyFailed;
-            d.update(&self.pg).await?;
+            d.update(&self.pg).await.wrap_internal_err(
+                "marking exhausted email delivery as failed",
+            )?;
         }
 
         // We hold a FOR UPDATE lock on the rows here, so no other workers are accessing them
@@ -183,7 +194,9 @@ impl EmailQueue {
             .map(|d| d.notification_id)
             .collect::<Vec<_>>();
         let notifications =
-            DBNotification::get_many(&notification_ids, &self.pg).await?;
+            DBNotification::get_many(&notification_ids, &self.pg)
+                .await
+                .wrap_internal_err("fetching notifications from database")?;
 
         // For all notifications we collected, fill out the template
         // and send it via SMTP in parallel.
@@ -201,11 +214,16 @@ impl EmailQueue {
             let seq = Arc::clone(&sequential_processing);
 
             futures.push(async move {
-                let mut txn = this.pg.begin().await?;
+                let mut txn = this
+                    .pg
+                    .begin()
+                    .await
+                    .wrap_internal_err("starting database transaction")?;
 
                 let maybe_user =
                     DBUser::get_id(notification.user_id, &mut txn, &this.redis)
-                        .await?;
+                        .await
+                        .wrap_internal_err("fetching user from database")?;
 
                 let Some(mailbox) = maybe_user
                     .and_then(|user| user.email)
@@ -268,7 +286,9 @@ impl EmailQueue {
                         };
 
                         delivery.attempt_count += 1;
-                        delivery.update(&self.pg).await?;
+                        delivery.update(&self.pg).await.wrap_internal_err(
+                            "updating processed email delivery",
+                        )?;
                     }
                 }
 
@@ -283,7 +303,10 @@ impl EmailQueue {
             delivery.next_attempt = Utc::now()
                 + chrono::Duration::seconds(EMAIL_RETRY_DELAY_SECONDS);
 
-            delivery.update(&self.pg).await?;
+            delivery
+                .update(&self.pg)
+                .await
+                .wrap_internal_err("scheduling email delivery retry")?;
         }
 
         info!(
@@ -302,7 +325,13 @@ impl EmailQueue {
         user_id: DBUserId,
         address: Mailbox,
     ) -> Result<NotificationDeliveryStatus, ApiError> {
-        let transport = self.mailer.lock().await.to_transport().await?;
+        let transport = self
+            .mailer
+            .lock()
+            .await
+            .to_transport()
+            .await
+            .wrap_internal_err("creating email transport")?;
         self.send_one_with_transport(
             txn,
             transport,
@@ -329,7 +358,8 @@ impl EmailQueue {
             &mut *txn,
             &self.redis,
         )
-        .await?
+        .await
+        .wrap_internal_err("creating email transport")?
         .into_iter()
         .find(|t| t.notification_type == notification.notification_type()) else {
             return Ok(NotificationDeliveryStatus::SkippedDefault);
@@ -345,7 +375,8 @@ impl EmailQueue {
             self.identity.clone(),
             address,
         )
-        .await?;
+        .await
+        .wrap_api_err("executing `templates::build_email`")?;
 
         let send_result = transport.send(message).await;
 
diff --git a/apps/labrinth/src/queue/email/templates.rs b/apps/labrinth/src/queue/email/templates.rs
index 1ef37e77fe..1ba595cdae 100644
--- a/apps/labrinth/src/queue/email/templates.rs
+++ b/apps/labrinth/src/queue/email/templates.rs
@@ -11,6 +11,7 @@ use crate::database::models::{
 use crate::env::ENV;
 use crate::models::v3::notifications::NotificationBody;
 use crate::routes::ApiError;
+use crate::util::error::ApiContext as _;
 use crate::util::error::Context;
 use crate::util::http::HTTP_CLIENT;
 use ariadne::ids::base62_impl::to_base62;
@@ -135,7 +136,11 @@ pub async fn build_email(
 ) -> Result<Message, ApiError> {
     let get_html_body = async {
         let result: Result<Result<String, reqwest::Error>, ApiError> =
-            match template.get_cached_html_data(redis).await? {
+            match template
+                .get_cached_html_data(redis)
+                .await
+                .wrap_internal_err("fetching email template HTML from Redis")?
+            {
                 Some(html_body) => Ok(Ok(html_body)),
                 None => {
                     let result = client
@@ -149,7 +154,10 @@ pub async fn build_email(
                     if let Ok(ref body) = result {
                         template
                             .set_cached_html_data(body.clone(), redis)
-                            .await?;
+                            .await
+                            .wrap_internal_err(
+                                "updating database records for `build_email`",
+                            )?;
                     }
 
                     Ok(result)
@@ -167,8 +175,10 @@ pub async fn build_email(
     } = from;
 
     let db_user = DBUser::get_id(user_id, &mut *exec, redis)
-        .await?
-        .ok_or(DatabaseError::Database(sqlx::Error::RowNotFound))?;
+        .await
+        .wrap_internal_err("fetching user from database")?
+        .ok_or(DatabaseError::Database(sqlx::Error::RowNotFound))
+        .wrap_internal_err("fetching user from database")?;
 
     let map = [
         (USER_NAME, db_user.username),
@@ -180,17 +190,24 @@ pub async fn build_email(
     let (html_body_result, either) = futures::try_join!(
         get_html_body,
         collect_template_variables(exec, redis, user_id, body, map)
-    )?;
+    )
+    .wrap_api_err("executing `collect_template_variables`")?;
 
     let mut message_builder = Message::builder().from(Mailbox::new(
         Some(from_name),
-        from_address.parse().map_err(MailError::from)?,
+        from_address
+            .parse()
+            .map_err(MailError::from)
+            .wrap_internal_err("reading HTTP response body")?,
     ));
 
     if let Some((name, address)) = reply_name.zip(reply_address) {
         message_builder = message_builder.reply_to(Mailbox::new(
             Some(name),
-            address.parse().map_err(MailError::from)?,
+            address
+                .parse()
+                .map_err(MailError::from)
+                .wrap_internal_err("reading HTTP response body")?,
         ));
     }
 
@@ -244,21 +261,26 @@ pub async fn build_email(
             html: Some(html),
         } => message_builder
             .multipart(MultiPart::alternative_plain_html(plaintext, html))
-            .map_err(MailError::from)?,
+            .map_err(MailError::from)
+            .wrap_internal_err(
+                "executing `MultiPart::alternative_plain_html`",
+            )?,
 
         Body {
             plaintext: Some(plaintext),
             html: None,
         } => message_builder
             .singlepart(SinglePart::plain(plaintext))
-            .map_err(MailError::from)?,
+            .map_err(MailError::from)
+            .wrap_internal_err("executing `SinglePart::plain`")?,
 
         Body {
             plaintext: None,
             html: Some(html),
         } => message_builder
             .singlepart(SinglePart::html(html))
-            .map_err(MailError::from)?,
+            .map_err(MailError::from)
+            .wrap_internal_err("executing `SinglePart::html`")?,
 
         Body {
             plaintext: None,
@@ -329,7 +351,10 @@ async fn resolve_report_title(
         return Ok(title);
     }
 
-    let Some(report) = DBReport::get(report_id, &mut *exec).await? else {
+    let Some(report) = DBReport::get(report_id, &mut *exec)
+        .await
+        .wrap_internal_err("fetching report from database")?
+    else {
         return Ok(title);
     };
     let Some(shared_instance_id) = report.shared_instance_id else {
@@ -398,8 +423,10 @@ async fn collect_template_variables(
                 exec,
                 redis,
             )
-            .await?
-            .ok_or_else(|| DatabaseError::Database(sqlx::Error::RowNotFound))?
+            .await
+            .wrap_api_err("fetching email project")?
+            .ok_or_else(|| DatabaseError::Database(sqlx::Error::RowNotFound))
+            .wrap_internal_err("fetching project from database")?
             .inner;
 
             map.insert(PROJECT_ID, to_base62(project_id.0));
@@ -423,7 +450,7 @@ async fn collect_template_variables(
                 report_id.0 as i64
             )
             .fetch_one(&mut *exec)
-            .await?;
+            .await.wrap_internal_err("querying database for `collect_template_variables`")?;
 
             map.insert(REPORT_ID, to_base62(report_id.0));
             map.insert(
@@ -433,7 +460,8 @@ async fn collect_template_variables(
                     DBReportId(report_id.0 as i64),
                     result.title,
                 )
-                .await?,
+                .await
+                .wrap_api_err("executing `resolve_report_title`")?,
             );
             map.insert(REPORT_DATE, date_human_readable(result.created));
             Ok(EmailTemplate::Static(map))
@@ -453,7 +481,7 @@ async fn collect_template_variables(
                 report_id.0 as i64
             )
             .fetch_one(&mut *exec)
-            .await?;
+            .await.wrap_internal_err("querying database for `collect_template_variables`")?;
 
             map.insert(
                 REPORT_TITLE,
@@ -462,7 +490,8 @@ async fn collect_template_variables(
                     DBReportId(report_id.0 as i64),
                     result.title,
                 )
-                .await?,
+                .await
+                .wrap_api_err("executing `resolve_report_title`")?,
             );
             map.insert(NEWREPORT_ID, to_base62(report_id.0));
             Ok(EmailTemplate::Static(map))
@@ -476,7 +505,10 @@ async fn collect_template_variables(
                 project_id.0 as i64
             )
             .fetch_one(&mut *exec)
-            .await?;
+            .await
+            .wrap_internal_err(
+                "querying database for `collect_template_variables`",
+            )?;
 
             map.insert(PROJECT_ID, to_base62(project_id.0));
             map.insert(PROJECT_NAME, result.name);
@@ -494,8 +526,10 @@ async fn collect_template_variables(
                 exec,
                 redis,
             )
-            .await?
-            .ok_or_else(|| DatabaseError::Database(sqlx::Error::RowNotFound))?
+            .await
+            .wrap_api_err("fetching email project")?
+            .ok_or_else(|| DatabaseError::Database(sqlx::Error::RowNotFound))
+            .wrap_internal_err("fetching project from database")?
             .inner;
 
             map.insert(PROJECT_ID, to_base62(project_id.0));
@@ -516,8 +550,10 @@ async fn collect_template_variables(
                 &mut *exec,
                 redis,
             )
-            .await?
-            .ok_or_else(|| DatabaseError::Database(sqlx::Error::RowNotFound))?
+            .await
+            .wrap_api_err("fetching email project")?
+            .ok_or_else(|| DatabaseError::Database(sqlx::Error::RowNotFound))
+            .wrap_internal_err("fetching project from database")?
             .inner;
 
             map.insert(PROJECT_ID, to_base62(project_id.0));
@@ -530,10 +566,14 @@ async fn collect_template_variables(
                     &mut *exec,
                     redis,
                 )
-                .await?
+                .await
+                .wrap_internal_err("fetching user from database")?
                 .ok_or_else(|| {
                     DatabaseError::Database(sqlx::Error::RowNotFound)
-                })?;
+                })
+                .wrap_internal_err(
+                    "querying database for `collect_template_variables`",
+                )?;
 
                 map.insert(NEWOWNER_TYPE, "user".to_string());
                 map.insert(NEWOWNER_TYPE_CAPITALIZED, "User".to_string());
@@ -546,10 +586,14 @@ async fn collect_template_variables(
                     &mut *exec,
                     redis,
                 )
-                .await?
+                .await
+                .wrap_internal_err("fetching organization from database")?
                 .ok_or_else(|| {
                     DatabaseError::Database(sqlx::Error::RowNotFound)
-                })?;
+                })
+                .wrap_internal_err(
+                    "querying database for `collect_template_variables`",
+                )?;
 
                 map.insert(NEWOWNER_TYPE, "organization".to_string());
                 map.insert(
@@ -584,7 +628,10 @@ async fn collect_template_variables(
                 user_id.0 as i64
             )
             .fetch_one(&mut *exec)
-            .await?;
+            .await
+            .wrap_internal_err(
+                "querying database for `collect_template_variables`",
+            )?;
 
             map.insert(TEAMINVITE_INVITER_NAME, result.inviter_name);
             map.insert(TEAMINVITE_PROJECT_NAME, result.project_name);
@@ -616,7 +663,10 @@ async fn collect_template_variables(
                 user_id.0 as i64
             )
             .fetch_one(&mut *exec)
-            .await?;
+            .await
+            .wrap_internal_err(
+                "querying database for `collect_template_variables`",
+            )?;
 
             map.insert(ORGINVITE_INVITER_NAME, result.inviter_name);
             map.insert(ORGINVITE_ORG_NAME, result.organization_name);
@@ -644,7 +694,10 @@ async fn collect_template_variables(
                 user_id.0 as i64,
             )
             .fetch_one(&mut *exec)
-            .await?;
+            .await
+            .wrap_internal_err(
+                "querying database for `collect_template_variables`",
+            )?;
 
             map.insert(STATUSCHANGE_PROJECT_NAME, result.project_name);
             map.insert(STATUSCHANGE_OLD_STATUS, old_status.as_str().to_owned());
@@ -829,7 +882,9 @@ async fn collect_template_variables(
             key,
         } => Ok(EmailTemplate::Dynamic {
             variables: map,
-            body: dynamic_email_body(redis, title, body_md, key).await?,
+            body: dynamic_email_body(redis, title, body_md, key)
+                .await
+                .wrap_api_err("executing `dynamic_email_body`")?,
             title: title.to_string(),
         }),
 
@@ -844,8 +899,10 @@ async fn collect_template_variables(
                 &mut *exec,
                 redis,
             )
-            .await?
-            .ok_or_else(|| DatabaseError::Database(sqlx::Error::RowNotFound))?;
+            .await
+            .wrap_internal_err("fetching user from database")?
+            .ok_or_else(|| DatabaseError::Database(sqlx::Error::RowNotFound))
+            .wrap_internal_err("fetching user from database")?;
 
             map.insert(SERVERINVITE_INVITER_NAME, inviter.username);
             map.insert(SERVERINVITE_SERVER_NAME, server_name.clone());
@@ -883,9 +940,11 @@ async fn dynamic_email_body(
                 }))
                 .send()
                 .await
-                .and_then(|res| res.error_for_status())?
+                .and_then(|res| res.error_for_status())
+                .wrap_internal_err("deserializing HTTP response")?
                 .bytes()
-                .await?
+                .await
+                .wrap_internal_err("deserializing HTTP response")?
                 .as_ref(),
         )
         .wrap_internal_err("email body is not valid UTF-8")
diff --git a/apps/labrinth/src/queue/payouts/flow/mod.rs b/apps/labrinth/src/queue/payouts/flow/mod.rs
index 08c8d7776a..240b525acf 100644
--- a/apps/labrinth/src/queue/payouts/flow/mod.rs
+++ b/apps/labrinth/src/queue/payouts/flow/mod.rs
@@ -1,6 +1,7 @@
 //! Centralized place where payout rails are defined - their fees, minimum and
 //! maximum withdraw amounts, and execution logic.
 
+use crate::util::error::ApiContext as _;
 use eyre::eyre;
 use modrinth_util::decimal::Decimal2dp;
 use rust_decimal::Decimal;
@@ -59,7 +60,9 @@ impl PayoutsQueue {
                     self,
                     withdrawal.amount,
                     method_details,
-                    &get_method.await?,
+                    &get_method
+                        .await
+                        .wrap_api_err("executing `tremendous::create`")?,
                 )
                 .await
             }
diff --git a/apps/labrinth/src/queue/payouts/flow/mural.rs b/apps/labrinth/src/queue/payouts/flow/mural.rs
index 15ff290e80..6cf2dad6f3 100644
--- a/apps/labrinth/src/queue/payouts/flow/mural.rs
+++ b/apps/labrinth/src/queue/payouts/flow/mural.rs
@@ -19,7 +19,7 @@ use crate::{
         mural::MuralPayoutRequest,
     },
     routes::ApiError,
-    util::error::Context,
+    util::error::{ApiContext as _, Context},
 };
 
 pub const PLATFORM_FEE: PayoutMethodFee = PayoutMethodFee {
@@ -67,7 +67,7 @@ pub(super) async fn create(
     let mural = queue.muralpay.load();
     let mural = mural
         .as_ref()
-        .wrap_internal_err("Mural client not available")?;
+        .wrap_internal_err("required Mural client is not available")?;
 
     let method_fee_usd;
     let forex_usd_to_currency;
@@ -158,14 +158,15 @@ pub(super) async fn execute(
         recipient_info,
     }: MuralFlow,
 ) -> Result<(), ApiError> {
-    let user_email = get_verified_email(user)?;
+    let user_email = get_verified_email(user)
+        .wrap_api_err("fetching verified user email")?;
     let sent_to_method_usd = net_usd + method_fee_usd;
     let total_fee_usd = method_fee_usd + platform_fee_usd;
 
     let mural = queue.muralpay.load();
     let mural = mural
         .as_ref()
-        .wrap_internal_err("Mural client not available")?;
+        .wrap_internal_err("required Mural client is not available")?;
 
     let payment_statement_doc = queue
         .create_mural_payment_statement_doc(
@@ -175,7 +176,8 @@ pub(super) async fn execute(
             &recipient_info,
             gotenberg,
         )
-        .await?;
+        .await
+        .wrap_api_err("creating Mural payment statement document")?;
 
     let user_id = UserId::from(user.id);
     let method_id = match &payout_details {
@@ -235,13 +237,18 @@ pub(super) async fn execute(
             Some(format!("User {user_id}")),
             &[payout],
         )
-        .await
-        .map_err(|err| match err {
-            muralpay::MuralError::Api(err) => ApiError::Mural(Box::new(err)),
-            err => ApiError::Internal(
+        .await;
+    let payout_request = match payout_request {
+        Ok(payout_request) => payout_request,
+        Err(muralpay::MuralError::Api(err)) => {
+            return Err(ApiError::Request(eyre::eyre!(Box::new(err))));
+        }
+        Err(err) => {
+            return Err(ApiError::Internal(
                 eyre!(err).wrap_err("failed to create payout request"),
-            ),
-        })?;
+            ));
+        }
+    };
 
     // Once the Mural payout request has been created successfully,
     // then we *must* commit *a* payout row into the DB, to link the Mural
diff --git a/apps/labrinth/src/queue/payouts/flow/paypal.rs b/apps/labrinth/src/queue/payouts/flow/paypal.rs
index c8e20e279a..de4b158f34 100644
--- a/apps/labrinth/src/queue/payouts/flow/paypal.rs
+++ b/apps/labrinth/src/queue/payouts/flow/paypal.rs
@@ -102,21 +102,20 @@ pub(super) async fn execute(
         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(),
-            ));
+            return Err(ApiError::Request(eyre::eyre!(
+                "Venmo address has not been set for account!",
+            )));
         }
     } else if let Some(paypal_id) = &user.paypal_id {
         if let Some(paypal_country) = &user.paypal_country {
             if paypal_country == "US" && method_id != "paypal_us" {
-                return Err(ApiError::InvalidInput(
-                    "Please use the US PayPal transfer option!".to_string(),
-                ));
+                return Err(ApiError::Request(eyre::eyre!(
+                    "Please use the US PayPal transfer option!",
+                )));
             } else if paypal_country != "US" && method_id == "paypal_us" {
-                return Err(ApiError::InvalidInput(
-                    "Please use the International PayPal transfer option!"
-                        .to_string(),
-                ));
+                return Err(ApiError::Request(eyre::eyre!(
+                    "Please use the International PayPal transfer option!",
+                )));
             }
 
             (
@@ -126,14 +125,14 @@ pub(super) async fn execute(
                 user.paypal_email.as_ref().unwrap_or(paypal_id),
             )
         } else {
-            return Err(ApiError::InvalidInput(
-                "Please re-link your PayPal account!".to_string(),
-            ));
+            return Err(ApiError::Request(eyre::eyre!(
+                "Please re-link your PayPal account!",
+            )));
         }
     } else {
-        return Err(ApiError::InvalidInput(
-            "You have not linked a PayPal account!".to_string(),
-        ));
+        return Err(ApiError::Request(eyre::eyre!(
+            "You have not linked a PayPal account!",
+        )));
     };
 
     let payout_req = json!({
diff --git a/apps/labrinth/src/queue/payouts/flow/tremendous.rs b/apps/labrinth/src/queue/payouts/flow/tremendous.rs
index 21f6b7100e..19b00bba95 100644
--- a/apps/labrinth/src/queue/payouts/flow/tremendous.rs
+++ b/apps/labrinth/src/queue/payouts/flow/tremendous.rs
@@ -1,3 +1,4 @@
+use crate::util::error::ApiContext as _;
 use chrono::Utc;
 use eyre::eyre;
 use modrinth_util::decimal::Decimal2dp;
@@ -64,7 +65,8 @@ pub(super) async fn create(
         "paypal" | "venmo" => {
             let currency = details.currency.unwrap_or(TremendousCurrency::Usd);
             let currency_code = currency.to_string();
-            let usd_to_currency = usd_to_currency_for(&currency_code)?;
+            let usd_to_currency = usd_to_currency_for(&currency_code)
+                .wrap_api_err("executing `usd_to_currency_for`")?;
 
             let fee = PayoutMethodFee {
                 // If a user withdraws $10:
@@ -127,7 +129,8 @@ pub(super) async fn create(
                 } else {
                     TremendousCurrency::Usd.to_string()
                 };
-            let usd_to_currency = usd_to_currency_for(&currency_code)?;
+            let usd_to_currency = usd_to_currency_for(&currency_code)
+                .wrap_api_err("executing `usd_to_currency_for`")?;
             let currency_to_usd = dec!(1) / usd_to_currency;
 
             // no fees
@@ -190,7 +193,8 @@ pub(super) async fn execute(
         pub order: Order,
     }
 
-    let user_email = get_verified_email(user)?;
+    let user_email = get_verified_email(user)
+        .wrap_api_err("fetching verified user email")?;
 
     let order_req = json!({
         "payment": {
diff --git a/apps/labrinth/src/queue/payouts/mod.rs b/apps/labrinth/src/queue/payouts/mod.rs
index c237f6d624..cdc5b34cdd 100644
--- a/apps/labrinth/src/queue/payouts/mod.rs
+++ b/apps/labrinth/src/queue/payouts/mod.rs
@@ -8,6 +8,7 @@ use crate::models::payouts::{
 };
 use crate::models::projects::MonetizationStatus;
 use crate::routes::ApiError;
+use crate::util::error::ApiContext as _;
 use crate::util::error::Context;
 use crate::util::webhook::{
     PayoutSourceAlertType, send_slack_payout_source_alert_webhook,
@@ -207,19 +208,17 @@ impl PayoutsQueue {
             .form(&form)
             .send()
             .await
-            .map_err(|_| {
-                ApiError::Payments(
-                    "Error while authenticating with PayPal".to_string(),
-                )
-            })?
+            .map_err(|err| eyre::eyre!(err))
+            .wrap_failed_dependency_err(
+                "error while authenticating with PayPal".to_string(),
+            )?
             .json()
             .await
-            .map_err(|_| {
-                ApiError::Payments(
-                    "Error while authenticating with PayPal (deser error)"
-                        .to_string(),
-                )
-            })?;
+            .map_err(|err| eyre::eyre!(err))
+            .wrap_failed_dependency_err(
+                "error while authenticating with PayPal (deser error)"
+                    .to_string(),
+            )?;
 
         let new_creds = PayPalCredentials {
             access_token: credential.access_token,
@@ -244,21 +243,23 @@ impl PayoutsQueue {
         let credentials = if let Some(credentials) = read.as_ref() {
             if credentials.expires < Utc::now() {
                 drop(read);
-                self.refresh_token().await.map_err(|_| {
-                    ApiError::Payments(
-                        "Error while authenticating with PayPal".to_string(),
-                    )
-                })?
+                self.refresh_token()
+                    .await
+                    .map_err(|err| eyre::eyre!(err))
+                    .wrap_failed_dependency_err(
+                        "error while authenticating with PayPal".to_string(),
+                    )?
             } else {
                 credentials.clone()
             }
         } else {
             drop(read);
-            self.refresh_token().await.map_err(|_| {
-                ApiError::Payments(
-                    "Error while authenticating with PayPal".to_string(),
-                )
-            })?
+            self.refresh_token()
+                .await
+                .map_err(|err| eyre::eyre!(err))
+                .wrap_failed_dependency_err(
+                    "error while authenticating with PayPal".to_string(),
+                )?
         };
 
         let client = reqwest::Client::new();
@@ -287,17 +288,23 @@ impl PayoutsQueue {
                 .body(body);
         }
 
-        let resp = request.send().await.map_err(|_| {
-            ApiError::Payments("could not communicate with PayPal".to_string())
-        })?;
+        let resp = request
+            .send()
+            .await
+            .map_err(|err| eyre::eyre!(err))
+            .wrap_failed_dependency_err(
+                "could not communicate with PayPal".to_string(),
+            )?;
 
         let status = resp.status();
 
-        let value = resp.json::<Value>().await.map_err(|_| {
-            ApiError::Payments(
+        let value = resp
+            .json::<Value>()
+            .await
+            .map_err(|err| eyre::eyre!(err))
+            .wrap_failed_dependency_err(
                 "could not retrieve PayPal response body".to_string(),
-            )
-        })?;
+            )?;
 
         if !status.is_success() {
             #[derive(Deserialize)]
@@ -318,27 +325,28 @@ impl PayoutsQueue {
                 if error.name == "INSUFFICIENT_FUNDS" {
                     error.message = "We're currently transferring funds to our PayPal account. Please try again in a couple days.".to_string();
                 }
-                return Err(ApiError::Payments(format!(
+                return Err(ApiError::FailedDependency(eyre::eyre!(format!(
                     "error name: {}, message: {}",
                     error.name, error.message
-                )));
+                ))));
             }
 
             if let Ok(error) =
                 serde_json::from_value::<PayPalIdentityError>(value)
             {
-                return Err(ApiError::Payments(format!(
+                return Err(ApiError::FailedDependency(eyre::eyre!(format!(
                     "error name: {}, message: {}",
                     error.error, error.error_description
-                )));
+                ))));
             }
 
-            return Err(ApiError::Payments(
-                "could not retrieve PayPal error body".to_string(),
-            ));
+            return Err(ApiError::FailedDependency(eyre::eyre!(
+                "could not retrieve PayPal error body",
+            )));
         }
 
-        Ok(serde_json::from_value(value)?)
+        serde_json::from_value(value)
+            .wrap_request_err("deserializing JSON data")
     }
 
     pub async fn make_tremendous_request<T: Serialize, X: DeserializeOwned>(
@@ -359,19 +367,23 @@ impl PayoutsQueue {
             request = request.json(&body);
         }
 
-        let resp = request.send().await.map_err(|_| {
-            ApiError::Payments(
+        let resp = request
+            .send()
+            .await
+            .map_err(|err| eyre::eyre!(err))
+            .wrap_failed_dependency_err(
                 "could not communicate with Tremendous".to_string(),
-            )
-        })?;
+            )?;
 
         let status = resp.status();
 
-        let value = resp.json::<Value>().await.map_err(|_| {
-            ApiError::Payments(
+        let value = resp
+            .json::<Value>()
+            .await
+            .map_err(|err| eyre::eyre!(err))
+            .wrap_failed_dependency_err(
                 "could not retrieve Tremendous response body".to_string(),
-            )
-        })?;
+            )?;
 
         if !status.is_success()
             && let Some(obj) = value.as_object()
@@ -385,25 +397,25 @@ impl PayoutsQueue {
 
                 let err =
                     serde_json::from_value::<TremendousError>(array.clone())
-                        .map_err(|_| {
-                            ApiError::Payments(
-                                "could not retrieve Tremendous error json body"
-                                    .to_string(),
-                            )
-                        })?;
+                        .map_err(|err| eyre::eyre!(err))
+                        .wrap_failed_dependency_err(
+                            "could not retrieve Tremendous error json body"
+                                .to_string(),
+                        )?;
 
-                return Err(ApiError::Payments(format!(
+                return Err(ApiError::FailedDependency(eyre::eyre!(format!(
                     "Tremendous error: {} ({:?})",
                     err.message, err.payload
-                )));
+                ))));
             }
 
-            return Err(ApiError::Payments(
-                "could not retrieve Tremendous error body".to_string(),
-            ));
+            return Err(ApiError::FailedDependency(eyre::eyre!(
+                "could not retrieve Tremendous error body",
+            )));
         }
 
-        Ok(serde_json::from_value(value)?)
+        serde_json::from_value(value)
+            .wrap_request_err("deserializing JSON data")
     }
 
     pub async fn get_payout_methods(
@@ -469,13 +481,17 @@ impl PayoutsQueue {
         let options = if let Some(options) = read.as_ref() {
             if options.expires < Utc::now() {
                 drop(read);
-                refresh_payout_methods(self).await?
+                refresh_payout_methods(self)
+                    .await
+                    .wrap_api_err("executing `refresh_payout_methods`")?
             } else {
                 options.clone()
             }
         } else {
             drop(read);
-            refresh_payout_methods(self).await?
+            refresh_payout_methods(self)
+                .await
+                .wrap_api_err("executing `refresh_payout_methods`")?
         };
 
         Ok(options.options)
@@ -876,12 +892,18 @@ pub async fn make_aditude_request(
             "interval": interval
         }))
         .send()
-        .await?
-        .error_for_status()?;
+        .await
+        .wrap_internal_err("deserializing HTTP response")?
+        .error_for_status()
+        .wrap_internal_err("deserializing HTTP response")?;
 
-    let text = request.text().await?;
+    let text = request
+        .text()
+        .await
+        .wrap_internal_err("reading HTTP response body")?;
 
-    let json: Vec<AditudePoints> = serde_json::from_str(&text)?;
+    let json: Vec<AditudePoints> = serde_json::from_str(&text)
+        .wrap_request_err("deserializing JSON data")?;
 
     Ok(json)
 }
@@ -900,7 +922,8 @@ pub async fn process_payout(
         crate::models::payouts::PayoutStatus::InTransit.as_str(),
     )
     .execute(pool)
-    .await?;
+    .await
+    .wrap_internal_err("writing analytics data to ClickHouse")?;
 
     let start: DateTime<Utc> = DateTime::from_naive_utc_and_offset(
         (Utc::now() - Duration::days(1))
@@ -915,7 +938,8 @@ pub async fn process_payout(
         start,
     )
     .fetch_one(pool)
-    .await?;
+    .await
+    .wrap_internal_err("querying database for `process_payout`")?;
 
     if results.exists.unwrap_or(false) {
         return Ok(());
@@ -966,9 +990,12 @@ pub async fn process_payout(
             .bind(end.timestamp())
             .fetch_one::<u64>(),
     )
-        .await?;
+        .await.wrap_internal_err("querying database for `process_payout`")?;
 
-    let mut transaction = pool.begin().await?;
+    let mut transaction = pool
+        .begin()
+        .await
+        .wrap_internal_err("starting database transaction")?;
 
     struct PayoutMultipliers {
         sum: u64,
@@ -1029,7 +1056,7 @@ pub async fn process_payout(
             .insert(r.user_id, r.payouts_split);
         async move { Ok(acc) }
     })
-    .await?;
+    .await.wrap_internal_err("inserting project org members into database")?;
 
     let project_team_members = sqlx::query!(
         "
@@ -1055,7 +1082,7 @@ pub async fn process_payout(
             async move { Ok(acc) }
         },
     )
-    .await?;
+    .await.wrap_internal_err("inserting project team members into database")?;
 
     for project_id in project_ids {
         let team_members: HashMap<i64, Decimal> = project_team_members
@@ -1098,7 +1125,8 @@ pub async fn process_payout(
         "Yesterday",
         "1d",
     )
-    .await?;
+    .await
+    .wrap_api_err("executing `make_aditude_request`")?;
 
     let aditude_amount: Decimal = aditude_res
         .iter()
@@ -1193,9 +1221,12 @@ pub async fn process_payout(
         &insert_availables[..]
     )
     .execute(&mut transaction)
-    .await?;
+    .await.wrap_internal_err("inserting database records for `process_payout`")?;
 
-    transaction.commit().await?;
+    transaction
+        .commit()
+        .await
+        .wrap_internal_err("committing database transaction")?;
 
     Ok(())
 }
@@ -1230,14 +1261,18 @@ pub async fn index_payouts_notifications(
 ) -> Result<(), ApiError> {
     info!("Updating payout notifications");
 
-    let mut transaction = pool.begin().await?;
+    let mut transaction = pool
+        .begin()
+        .await
+        .wrap_internal_err("starting database transaction")?;
 
     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?;
+    .await
+    .wrap_internal_err("executing `payouts_values_notifications::synchronize_future_payout_values`")?;
+    let items = payouts_values_notifications::PayoutsValuesNotification::unnotified_users_with_available_payouts_with_limit(&mut transaction, 200).await.wrap_internal_err("executing `PayoutsValuesNotification::unnotified_users_with_available_payouts_with_limit`")?;
 
     let payout_ref_ids = items.iter().map(|x| x.id).collect::<Vec<_>>();
     let dates_available =
@@ -1250,14 +1285,23 @@ pub async fn index_payouts_notifications(
         &mut transaction,
         redis,
     )
-    .await?;
+    .await
+    .wrap_internal_err(
+        "inserting database records for `index_payouts_notifications`",
+    )?;
     payouts_values_notifications::PayoutsValuesNotification::set_notified_many(
         &payout_ref_ids,
         &mut transaction,
     )
-    .await?;
+    .await
+    .wrap_internal_err(
+        "updating database records for `index_payouts_notifications`",
+    )?;
 
-    transaction.commit().await?;
+    transaction
+        .commit()
+        .await
+        .wrap_internal_err("committing database transaction")?;
 
     Ok(())
 }
diff --git a/apps/labrinth/src/routes/analytics.rs b/apps/labrinth/src/routes/analytics.rs
index 5319350e7b..7330f80d59 100644
--- a/apps/labrinth/src/routes/analytics.rs
+++ b/apps/labrinth/src/routes/analytics.rs
@@ -9,6 +9,7 @@ use crate::queue::analytics::AnalyticsQueue;
 use crate::queue::session::AuthQueue;
 use crate::routes::ApiError;
 use crate::util::date::get_current_tenths_of_ms;
+use crate::util::error::ApiContext as _;
 use crate::util::error::Context;
 use crate::util::http::HttpClient;
 use actix_web::{HttpRequest, HttpResponse};
@@ -84,11 +85,11 @@ pub async fn page_view_ingest(
     .ok();
     let conn_info = req.connection_info().peer_addr().map(|x| x.to_string());
 
-    let url = Url::parse(&url_input.url).map_err(|_| {
-        ApiError::InvalidInput("invalid page view URL specified!".to_string())
-    })?;
-    let domain = url.host_str().ok_or_else(|| {
-        ApiError::InvalidInput("invalid page view URL specified!".to_string())
+    let url = Url::parse(&url_input.url)
+        .map_err(|err| eyre::eyre!(err))
+        .wrap_request_err("invalid page view URL specified!".to_string())?;
+    let domain = url.host_str().wrap_request_err_with(|| {
+        "invalid page view URL specified!".to_string()
     })?;
     let url_origin = url.origin().ascii_serialization();
 
@@ -98,9 +99,9 @@ pub async fn page_view_ingest(
         .any(|origin| origin == "*" || url_origin == *origin);
 
     if !is_valid_url_origin {
-        return Err(ApiError::InvalidInput(
-            "invalid page view URL specified!".to_string(),
-        ));
+        return Err(ApiError::Request(eyre::eyre!(
+            "invalid page view URL specified!",
+        )));
     }
 
     let headers = req
@@ -158,7 +159,8 @@ pub async fn page_view_ingest(
                     &**pool,
                     &redis,
                 )
-                .await?;
+                .await
+                .wrap_api_err("fetching project from database")?;
 
                 if let Some(project) = project {
                     view.project_id = project.inner.id.0 as u64;
@@ -209,14 +211,15 @@ pub async fn playtime_ingest(
         &session_queue,
         Scopes::PERFORM_ANALYTICS,
     )
-    .await?;
+    .await
+    .wrap_auth_err("authenticating API request")?;
 
     let playtimes = playtime_input.0;
 
     if playtimes.len() > 2000 {
-        return Err(ApiError::InvalidInput(
-            "Too much playtime entered for version!".to_string(),
-        ));
+        return Err(ApiError::Request(eyre::eyre!(
+            "Too much playtime entered for version!",
+        )));
     }
 
     let versions = crate::database::models::DBVersion::get_many(
@@ -224,7 +227,8 @@ pub async fn playtime_ingest(
         &**pool,
         &redis,
     )
-    .await?;
+    .await
+    .wrap_internal_err("fetching versions from database")?;
 
     let headers = req.headers();
 
@@ -300,8 +304,9 @@ pub async fn minecraft_server_play_ingest(
     let project_id = play_input.project_id;
 
     let project = DBProject::get(&project_id.to_string(), &**pool, &redis)
-        .await?
-        .ok_or(ApiError::NotFound)?;
+        .await
+        .wrap_api_err("fetching project from database")?
+        .wrap_not_found_err("resource not found")?;
 
     if project.components.minecraft_server.is_none() {
         return Err(ApiError::Request(eyre!(
diff --git a/apps/labrinth/src/routes/debug/pprof.rs b/apps/labrinth/src/routes/debug/pprof.rs
index cf338ee386..89845bb77c 100644
--- a/apps/labrinth/src/routes/debug/pprof.rs
+++ b/apps/labrinth/src/routes/debug/pprof.rs
@@ -1,7 +1,9 @@
 use crate::routes::ApiError;
+use crate::util::error::ApiContext as _;
+use crate::util::error::Context as _;
 use crate::util::guards::admin_key_guard;
 use actix_web::{HttpResponse, get};
-use eyre::{Context, eyre};
+use eyre::eyre;
 use prometheus::{IntGauge, Registry};
 use std::time::Duration;
 
@@ -21,10 +23,12 @@ pub fn config(cfg: &mut actix_web::web::ServiceConfig) {
 #[get("/pprof/heap", guard = "admin_key_guard")]
 pub async fn heap() -> Result<HttpResponse, ApiError> {
     let mut prof_ctl = jemalloc_pprof::PROF_CTL.as_ref().unwrap().lock().await;
-    require_profiling_activated(&prof_ctl)?;
+    require_profiling_activated(&prof_ctl)
+        .wrap_api_err("executing `require_profiling_activated`")?;
     let pprof = prof_ctl
         .dump_pprof()
-        .map_err(|err| ApiError::InvalidInput(err.to_string()))?;
+        .map_err(|err| eyre::Report::msg(err.to_string()))
+        .wrap_request_err("processing request")?;
 
     Ok(HttpResponse::Ok()
         .content_type("application/octet-stream")
@@ -39,10 +43,12 @@ pub async fn heap() -> Result<HttpResponse, ApiError> {
 #[get("/pprof/heap/flamegraph", guard = "admin_key_guard")]
 pub async fn flame_graph() -> Result<HttpResponse, ApiError> {
     let mut prof_ctl = jemalloc_pprof::PROF_CTL.as_ref().unwrap().lock().await;
-    require_profiling_activated(&prof_ctl)?;
+    require_profiling_activated(&prof_ctl)
+        .wrap_api_err("executing `require_profiling_activated`")?;
     let svg = prof_ctl
         .dump_flamegraph()
-        .map_err(|err| ApiError::InvalidInput(err.to_string()))?;
+        .map_err(|err| eyre::Report::msg(err.to_string()))
+        .wrap_request_err("processing request")?;
 
     Ok(HttpResponse::Ok().content_type("image/svg+xml").body(svg))
 }
@@ -53,8 +59,8 @@ fn require_profiling_activated(
     if prof_ctl.activated() {
         Ok(())
     } else {
-        Err(ApiError::InvalidInput(
-            "Profiling is not activated".to_string(),
+        Err(ApiError::Request(
+            eyre::eyre!("Profiling is not activated",),
         ))
     }
 }
diff --git a/apps/labrinth/src/routes/internal/admin.rs b/apps/labrinth/src/routes/internal/admin.rs
index dcce8286c5..0fa0196156 100644
--- a/apps/labrinth/src/routes/internal/admin.rs
+++ b/apps/labrinth/src/routes/internal/admin.rs
@@ -9,6 +9,7 @@ use crate::routes::ApiError;
 use crate::search::SearchBackend;
 use crate::search::incremental::consume::reindex_project_document;
 use crate::util::date::get_current_tenths_of_ms;
+use crate::util::error::ApiContext as _;
 use crate::util::error::Context;
 use crate::util::guards::admin_key_guard;
 use crate::util::tags::valid_download_tags;
@@ -78,12 +79,11 @@ fn parse_download_meta_from_query(
     for (key, value) in url.query_pairs() {
         match key.as_ref() {
             "mr_download_reason" => {
-                meta.reason =
-                    Some(DownloadReason::from_str(&value).map_err(|_| {
-                        ApiError::Request(eyre!(
-                            "invalid download reason specified"
-                        ))
-                    })?);
+                meta.reason = Some(
+                    DownloadReason::from_str(&value)
+                        .map_err(|()| eyre::eyre!("invalid download reason"))
+                        .wrap_request_err("parsing download reason")?,
+                );
             }
             "mr_game_version" => {
                 meta.game_version = Some(value.into_owned());
@@ -92,8 +92,12 @@ fn parse_download_meta_from_query(
                 meta.loader = Some(value.into_owned());
             }
             "mr_dependent_on" => {
-                meta.dependent_on =
-                    Some(parse_download_meta_version(&value, "dependent_on")?);
+                meta.dependent_on = Some(
+                    parse_download_meta_version(&value, "dependent_on")
+                        .wrap_api_err(
+                            "executing `parse_download_meta_version`",
+                        )?,
+                );
             }
             _ => {}
         }
@@ -122,8 +126,8 @@ async fn resolve_download_attribution_version(
     crate::database::models::DBVersion::get(version_id, pool, redis)
         .await
         .wrap_internal_err("failed to fetch download attribution version")?
-        .ok_or_else(|| {
-            ApiError::Request(eyre!("invalid `{field}` version specified"))
+        .wrap_request_err_with(|| {
+            format!("invalid `{field}` version specified")
         })?;
 
     Ok(version_id.0 as u64)
@@ -185,7 +189,8 @@ pub async fn count_download(
         download_body.url,
     )
     .fetch_optional(pool.as_ref())
-    .await?
+    .await
+    .wrap_internal_err("fetching version from database")?
     {
         (version.id, version.mod_id)
     } else if let Some(version) = sqlx::query!(
@@ -198,18 +203,19 @@ pub async fn count_download(
         id_option
     )
     .fetch_optional(pool.as_ref())
-    .await?
+    .await
+    .wrap_internal_err("fetching version from database")?
     {
         (version.id, version.mod_id)
     } else {
-        return Err(ApiError::InvalidInput(
-            "Specified version does not exist!".to_string(),
-        ));
+        return Err(ApiError::Request(eyre::eyre!(
+            "Specified version does not exist!",
+        )));
     };
 
-    let url = url::Url::parse(&download_body.url).map_err(|_| {
-        ApiError::InvalidInput("invalid download URL specified!".to_string())
-    })?;
+    let url = url::Url::parse(&download_body.url)
+        .map_err(|err| eyre::eyre!(err))
+        .wrap_request_err("invalid download URL specified!".to_string())?;
 
     let ip = crate::util::ip::convert_to_ip_v6(&download_body.ip)
         .unwrap_or_else(|_| Ipv4Addr::new(127, 0, 0, 1).to_ipv6_mapped());
@@ -220,7 +226,8 @@ pub async fn count_download(
                 .map(Some)
                 .wrap_request_err("invalid download meta")?
         } else {
-            parse_download_meta_from_query(&url)?
+            parse_download_meta_from_query(&url)
+                .wrap_api_err("parsing download metadata from URL")?
         };
 
     if let Some(meta) = &meta {
@@ -250,7 +257,8 @@ pub async fn count_download(
         meta.as_ref().and_then(|m| m.dependent_on),
         "dependent_on",
     )
-    .await?;
+    .await
+    .wrap_api_err("executing `resolve_download_attribution_version`")?;
 
     let download = Download {
         recorded: get_current_tenths_of_ms(),
diff --git a/apps/labrinth/src/routes/internal/affiliate.rs b/apps/labrinth/src/routes/internal/affiliate.rs
index 85f6e9ae69..8716dffba1 100644
--- a/apps/labrinth/src/routes/internal/affiliate.rs
+++ b/apps/labrinth/src/routes/internal/affiliate.rs
@@ -66,8 +66,8 @@ pub async fn ingest_click(
     let conn_info = req.connection_info().peer_addr().map(|x| x.to_string());
 
     let url = ingest_click.url;
-    let domain = url.host_str().ok_or_else(|| {
-        ApiError::InvalidInput("invalid page view URL specified!".to_string())
+    let domain = url.host_str().wrap_request_err_with(|| {
+        "invalid page view URL specified!".to_string()
     })?;
     let url_origin = url.origin().ascii_serialization();
 
@@ -77,9 +77,9 @@ pub async fn ingest_click(
         .any(|origin| origin == "*" || url_origin == *origin);
 
     if !is_valid_url_origin {
-        return Err(ApiError::InvalidInput(
-            "invalid page view URL specified!".to_string(),
-        ));
+        return Err(ApiError::Request(eyre::eyre!(
+            "invalid page view URL specified!",
+        )));
     }
 
     let exists = sqlx::query!(
@@ -159,7 +159,8 @@ pub async fn get_all(
         &session_queue,
         Scopes::SESSION_ACCESS,
     )
-    .await?;
+    .await
+    .wrap_auth_err("authenticating API request")?;
 
     if user.role.is_admin() {
         let codes = DBAffiliateCode::get_all(&**pool)
@@ -181,9 +182,9 @@ pub async fn get_all(
             .collect::<Vec<_>>();
         Ok(web::Json(codes))
     } else {
-        Err(ApiError::CustomAuthentication(
-            "You do not have permission to view affiliate codes!".to_string(),
-        ))
+        Err(ApiError::Auth(eyre::eyre!(
+            "You do not have permission to view affiliate codes!",
+        )))
     }
 }
 
@@ -214,16 +215,16 @@ pub async fn create(
         &session_queue,
         Scopes::SESSION_ACCESS,
     )
-    .await?;
+    .await
+    .wrap_auth_err("authenticating API request")?;
 
     let is_admin = creator.role.is_admin();
     let is_affiliate = creator.badges.contains(Badges::AFFILIATE);
 
     if !is_admin && !is_affiliate {
-        return Err(ApiError::CustomAuthentication(
-            "You do not have permission to create an affiliate code!"
-                .to_string(),
-        ));
+        return Err(ApiError::Auth(eyre::eyre!(
+            "You do not have permission to create an affiliate code!",
+        )));
     }
 
     let creator_id = DBUserId::from(creator.id);
@@ -239,19 +240,25 @@ pub async fn create(
 
     if affiliate_id != creator_id {
         let Some(_affiliate_user) =
-            DBUser::get_id(affiliate_id, &**pool, &redis).await?
+            DBUser::get_id(affiliate_id, &**pool, &redis)
+                .await
+                .wrap_internal_err("fetching user from database")?
         else {
-            return Err(ApiError::CustomAuthentication(
-                "Affiliate user not found!".to_string(),
-            ));
+            return Err(ApiError::Auth(eyre::eyre!(
+                "Affiliate user not found!",
+            )));
         };
     }
 
-    let mut transaction = pool.begin().await?;
+    let mut transaction = pool
+        .begin()
+        .await
+        .wrap_internal_err("starting database transaction")?;
 
     let affiliate_code_id =
         crate::database::models::generate_affiliate_code_id(&mut transaction)
-            .await?;
+            .await
+            .wrap_internal_err("generating affiliate code ID")?;
 
     let code = DBAffiliateCode {
         id: affiliate_code_id,
@@ -293,13 +300,15 @@ pub async fn get(
         &session_queue,
         Scopes::SESSION_ACCESS,
     )
-    .await?;
+    .await
+    .wrap_auth_err("authenticating API request")?;
 
     let (affiliate_code_id,) = path.into_inner();
     let affiliate_code_id = DBAffiliateCodeId::from(affiliate_code_id);
 
-    if let Some(model) =
-        DBAffiliateCode::get_by_id(affiliate_code_id, &**pool).await?
+    if let Some(model) = DBAffiliateCode::get_by_id(affiliate_code_id, &**pool)
+        .await
+        .wrap_internal_err("fetching affiliate code from database")?
     {
         let is_admin = user.role.is_admin();
         let is_owner = model.affiliate == DBUserId::from(user.id);
@@ -307,10 +316,10 @@ pub async fn get(
         if is_admin || is_owner {
             Ok(web::Json(AffiliateCode::from(model, is_admin)))
         } else {
-            Err(ApiError::NotFound)
+            Err(ApiError::NotFound(eyre::eyre!("resource not found")))
         }
     } else {
-        Err(ApiError::NotFound)
+        Err(ApiError::NotFound(eyre::eyre!("resource not found")))
     }
 }
 
@@ -335,30 +344,33 @@ pub async fn delete(
         &session_queue,
         Scopes::SESSION_ACCESS,
     )
-    .await?;
+    .await
+    .wrap_auth_err("authenticating API request")?;
 
     let (affiliate_code_id,) = path.into_inner();
     let affiliate_code_id = DBAffiliateCodeId::from(affiliate_code_id);
 
-    if let Some(model) =
-        DBAffiliateCode::get_by_id(affiliate_code_id, &**pool).await?
+    if let Some(model) = DBAffiliateCode::get_by_id(affiliate_code_id, &**pool)
+        .await
+        .wrap_internal_err("fetching affiliate code from database")?
     {
         let is_admin = user.role.is_admin();
         let is_owner = model.affiliate == DBUserId::from(user.id);
 
         if is_admin || is_owner {
-            let result =
-                DBAffiliateCode::remove(affiliate_code_id, &**pool).await?;
+            let result = DBAffiliateCode::remove(affiliate_code_id, &**pool)
+                .await
+                .wrap_internal_err("deleting affiliate code from database")?;
             if result.is_some() {
                 Ok(())
             } else {
-                Err(ApiError::NotFound)
+                Err(ApiError::NotFound(eyre::eyre!("resource not found")))
             }
         } else {
-            Err(ApiError::NotFound)
+            Err(ApiError::NotFound(eyre::eyre!("resource not found")))
         }
     } else {
-        Err(ApiError::NotFound)
+        Err(ApiError::NotFound(eyre::eyre!("resource not found")))
     }
 }
 
@@ -389,26 +401,28 @@ pub async fn patch(
         &session_queue,
         Scopes::SESSION_ACCESS,
     )
-    .await?;
+    .await
+    .wrap_auth_err("authenticating API request")?;
 
     let (affiliate_code_id,) = path.into_inner();
     let affiliate_code_id = DBAffiliateCodeId::from(affiliate_code_id);
 
     let existing_code = DBAffiliateCode::get_by_id(affiliate_code_id, &**pool)
-        .await?
-        .ok_or(ApiError::NotFound)?;
+        .await
+        .wrap_internal_err("fetching affiliate code from database")?
+        .wrap_not_found_err("resource not found")?;
 
     let is_admin = user.role.is_admin();
     let is_owner = existing_code.affiliate == DBUserId::from(user.id);
 
     if !is_admin && !is_owner {
-        return Err(ApiError::NotFound);
+        return Err(ApiError::NotFound(eyre::eyre!("resource not found")));
     }
 
     if !is_admin && !user.badges.contains(Badges::AFFILIATE) {
-        return Err(ApiError::CustomAuthentication(
-            "You do not have permission to update affiliate codes!".to_string(),
-        ));
+        return Err(ApiError::Auth(eyre::eyre!(
+            "You do not have permission to update affiliate codes!",
+        )));
     }
 
     DBAffiliateCode::update_source_name(
diff --git a/apps/labrinth/src/routes/internal/analytics_event.rs b/apps/labrinth/src/routes/internal/analytics_event.rs
index a743703da3..5a6bec2b7e 100644
--- a/apps/labrinth/src/routes/internal/analytics_event.rs
+++ b/apps/labrinth/src/routes/internal/analytics_event.rs
@@ -56,7 +56,8 @@ pub async fn analytics_event_create(
         &session_queue,
         Scopes::empty(),
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     if !user.role.is_admin() {
@@ -116,7 +117,8 @@ pub async fn analytics_event_edit(
         &session_queue,
         Scopes::empty(),
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     if !user.role.is_admin() {
@@ -137,7 +139,7 @@ pub async fn analytics_event_edit(
         .await
         .wrap_internal_err("failed to update analytics event")?;
     if !updated {
-        return Err(ApiError::NotFound);
+        return Err(ApiError::NotFound(eyre::eyre!("resource not found")));
     }
     DBAnalyticsEvent::clear_cache(&redis)
         .await
@@ -166,7 +168,8 @@ pub async fn analytics_event_delete(
         &session_queue,
         Scopes::empty(),
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     if !user.role.is_admin() {
@@ -182,7 +185,7 @@ pub async fn analytics_event_delete(
     .await
     .wrap_internal_err("failed to delete analytics event")?;
     if !deleted {
-        return Err(ApiError::NotFound);
+        return Err(ApiError::NotFound(eyre::eyre!("resource not found")));
     }
     DBAnalyticsEvent::clear_cache(&redis)
         .await
diff --git a/apps/labrinth/src/routes/internal/attribution.rs b/apps/labrinth/src/routes/internal/attribution.rs
index b12e7e931d..444065345c 100644
--- a/apps/labrinth/src/routes/internal/attribution.rs
+++ b/apps/labrinth/src/routes/internal/attribution.rs
@@ -1,3 +1,4 @@
+use crate::util::error::ApiContext as _;
 use actix_web::{HttpRequest, delete, get, patch, post, web};
 use chrono::{DateTime, Utc};
 use eyre::eyre;
@@ -125,7 +126,8 @@ pub async fn scan(
         &session_queue,
         Scopes::VERSION_WRITE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     let mut version_ids: Vec<i64> = body
@@ -155,7 +157,7 @@ pub async fn scan(
     .wrap_internal_err("failed to fetch versions for attribution scan")?;
 
     if versions.len() != version_ids.len() {
-        return Err(ApiError::NotFound);
+        return Err(ApiError::NotFound(eyre::eyre!("resource not found")));
     }
 
     let mut project_ids: Vec<DBProjectId> =
@@ -170,7 +172,8 @@ pub async fn scan(
             &user,
             "you do not have permission to upload versions to this project",
         )
-        .await?;
+        .await
+        .wrap_api_err("validating can upload versions to project")?;
     }
 
     let project_ids = project_ids.iter().map(|id| id.0).collect::<Vec<_>>();
@@ -238,7 +241,8 @@ async fn force_scan_file(
         &session_queue,
         Scopes::PROJECT_READ,
     )
-    .await?;
+    .await
+    .wrap_auth_err("authenticating API request")?;
 
     let file_id: DBFileId = path.into_inner().into();
     let file = sqlx::query!(
@@ -256,7 +260,7 @@ async fn force_scan_file(
     .fetch_optional(pool.as_ref())
     .await
     .wrap_internal_err("failed to fetch attribution scan file")?
-    .ok_or(ApiError::NotFound)?;
+    .wrap_not_found_err("resource not found")?;
 
     let mut transaction = pool.begin().await.wrap_internal_err(
         "failed to begin attribution file scan transaction",
@@ -320,13 +324,15 @@ pub async fn list(
         &session_queue,
         Scopes::VERSION_READ,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
     let requester_is_mod = user.role.is_mod();
 
     let project = DBProject::get_id(project_id, pool.as_ref(), redis.as_ref())
-        .await?
-        .ok_or(ApiError::NotFound)?;
+        .await
+        .wrap_api_err("fetching attribution project")?
+        .wrap_not_found_err("resource not found")?;
     let (team_member, organization_team_member) =
         DBTeamMember::get_for_project_permissions(
             &project.inner,
@@ -651,13 +657,17 @@ pub async fn update_group(
         &session_queue,
         Scopes::VERSION_WRITE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
-    if !can_edit_attribution_group(pool.as_ref(), group_id, &user).await? {
-        return Err(ApiError::CustomAuthentication(
-            "This attribution group cannot be edited".to_string(),
-        ));
+    if !can_edit_attribution_group(pool.as_ref(), group_id, &user)
+        .await
+        .wrap_api_err("checking edit attribution group")?
+    {
+        return Err(ApiError::Auth(eyre::eyre!(
+            "This attribution group cannot be edited",
+        )));
     }
 
     if matches!(
@@ -665,15 +675,15 @@ pub async fn update_group(
         AttributionResolutionKind::GloballyAllowed { .. }
     ) && !user.role.is_mod()
     {
-        return Err(ApiError::CustomAuthentication(
-            "Only moderators can set globally allowed attributions".to_string(),
-        ));
+        return Err(ApiError::Auth(eyre::eyre!(
+            "Only moderators can set globally allowed attributions",
+        )));
     }
 
     if body.attribution.moderation_status.is_some() && !user.role.is_mod() {
-        return Err(ApiError::CustomAuthentication(
-            "Only moderators can set attribution moderation status".to_string(),
-        ));
+        return Err(ApiError::Auth(eyre::eyre!(
+            "Only moderators can set attribution moderation status",
+        )));
     }
 
     let mut attribution = body.attribution;
@@ -698,11 +708,12 @@ pub async fn update_group(
     .wrap_internal_err("failed to update attribution group")?;
 
     if result.rows_affected() == 0 {
-        return Err(ApiError::NotFound);
+        return Err(ApiError::NotFound(eyre::eyre!("resource not found")));
     }
 
     clear_group_version_cache(pool.as_ref(), redis.as_ref(), &[group_id])
-        .await?;
+        .await
+        .wrap_api_err("executing `clear_group_version_cache`")?;
 
     Ok(())
 }
@@ -734,7 +745,8 @@ pub async fn delete_groups(
         &session_queue,
         Scopes::PROJECT_READ,
     )
-    .await?;
+    .await
+    .wrap_auth_err("deleting database records for `delete_groups`")?;
 
     let group_ids = body
         .groups
@@ -772,7 +784,8 @@ pub async fn delete_all_groups(
         &session_queue,
         Scopes::PROJECT_READ,
     )
-    .await?;
+    .await
+    .wrap_auth_err("deleting database records for `delete_all_groups`")?;
 
     let project_id = DBProjectId::from(body.project_id).0;
     let group_ids = sqlx::query_scalar!(
@@ -849,7 +862,7 @@ async fn delete_attribution_groups(
     .wrap_internal_err("failed to delete attribution groups")?;
 
     if result.rows_affected() != group_ids.len() as u64 {
-        return Err(ApiError::NotFound);
+        return Err(ApiError::NotFound(eyre::eyre!("resource not found")));
     }
 
     txn.commit().await.wrap_internal_err(
@@ -891,14 +904,13 @@ pub async fn assign(
         &session_queue,
         Scopes::VERSION_WRITE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     let sha1 = body.sha1.trim().to_lowercase();
     if hex_to_bytes(&sha1).is_none() {
-        return Err(ApiError::InvalidInput(
-            "invalid sha1 hex string".to_string(),
-        ));
+        return Err(ApiError::Request(eyre::eyre!("invalid sha1 hex string",)));
     }
     let sha1_bytes = sha1.as_bytes().to_vec();
     let project_id: DBProjectId = body.project_id.into();
@@ -916,7 +928,7 @@ pub async fn assign(
     .fetch_optional(pool.as_ref())
     .await
     .wrap_internal_err("failed to fetch source attribution group")?
-    .ok_or(ApiError::NotFound)?;
+    .wrap_not_found_err("resource not found")?;
 
     let target_group_exists = sqlx::query_scalar!(
         "
@@ -932,21 +944,23 @@ pub async fn assign(
     .wrap_internal_err("failed to check target attribution group")?;
 
     if !target_group_exists {
-        return Err(ApiError::NotFound);
+        return Err(ApiError::NotFound(eyre::eyre!("resource not found")));
     }
 
     if !can_edit_attribution_group(pool.as_ref(), source_group_id, &user)
-        .await?
+        .await
+        .wrap_api_err("checking edit attribution group")?
         || !can_edit_attribution_group(
             pool.as_ref(),
             body.target_group_id,
             &user,
         )
-        .await?
+        .await
+        .wrap_api_err("checking edit attribution group")?
     {
-        return Err(ApiError::CustomAuthentication(
-            "This attribution group cannot be edited".to_string(),
-        ));
+        return Err(ApiError::Auth(eyre::eyre!(
+            "This attribution group cannot be edited",
+        )));
     }
 
     let mut txn = pool.begin().await.wrap_internal_err(
@@ -986,7 +1000,7 @@ pub async fn assign(
     .wrap_internal_err("failed to insert assigned attribution file")?;
 
     if result.rows_affected() == 0 {
-        return Err(ApiError::NotFound);
+        return Err(ApiError::NotFound(eyre::eyre!("resource not found")));
     }
 
     sqlx::query!(
@@ -1020,7 +1034,8 @@ pub async fn assign(
         project_id,
         &sha1_bytes,
     )
-    .await?;
+    .await
+    .wrap_api_err("executing `clear_project_sha1_version_cache`")?;
 
     Ok(())
 }
@@ -1052,14 +1067,13 @@ pub async fn split(
         &session_queue,
         Scopes::VERSION_WRITE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     let sha1 = body.sha1.trim().to_lowercase();
     if hex_to_bytes(&sha1).is_none() {
-        return Err(ApiError::InvalidInput(
-            "invalid sha1 hex string".to_string(),
-        ));
+        return Err(ApiError::Request(eyre::eyre!("invalid sha1 hex string",)));
     }
     let sha1_bytes = sha1.as_bytes().to_vec();
     let project_id: DBProjectId = body.project_id.into();
@@ -1078,15 +1092,16 @@ pub async fn split(
     .wrap_internal_err("failed to fetch attribution file to split")?;
 
     let Some(existing) = existing else {
-        return Err(ApiError::NotFound);
+        return Err(ApiError::NotFound(eyre::eyre!("resource not found")));
     };
 
     if !can_edit_attribution_group(pool.as_ref(), existing.group_id, &user)
-        .await?
+        .await
+        .wrap_api_err("checking edit attribution group")?
     {
-        return Err(ApiError::CustomAuthentication(
-            "This attribution group cannot be edited".to_string(),
-        ));
+        return Err(ApiError::Auth(eyre::eyre!(
+            "This attribution group cannot be edited",
+        )));
     }
 
     let mut txn = pool
@@ -1138,7 +1153,8 @@ pub async fn split(
         project_id,
         &sha1_bytes,
     )
-    .await?;
+    .await
+    .wrap_api_err("executing `clear_project_sha1_version_cache`")?;
 
     Ok(())
 }
@@ -1217,7 +1233,7 @@ async fn can_edit_attribution_group(
     .fetch_optional(pool)
     .await
     .wrap_internal_err("failed to fetch attribution group")?
-    .ok_or(ApiError::NotFound)?;
+    .wrap_not_found_err("resource not found")?;
 
     ensure_can_upload_versions_to_project(
         pool,
@@ -1225,7 +1241,8 @@ async fn can_edit_attribution_group(
         user,
         "you do not have permission to edit this attribution group",
     )
-    .await?;
+    .await
+    .wrap_api_err("validating can upload versions to project")?;
 
     let attribution: Option<AttributionResolution> = group
         .attribution
diff --git a/apps/labrinth/src/routes/internal/billing.rs b/apps/labrinth/src/routes/internal/billing.rs
index 82242dd145..5b4f971c96 100644
--- a/apps/labrinth/src/routes/internal/billing.rs
+++ b/apps/labrinth/src/routes/internal/billing.rs
@@ -25,6 +25,8 @@ use crate::models::users::Badges;
 use crate::queue::session::AuthQueue;
 use crate::routes::ApiError;
 use crate::util::anrok;
+use crate::util::error::ApiContext as _;
+use crate::util::error::Context as _;
 use actix_web::{HttpRequest, HttpResponse, delete, get, patch, post, web};
 use ariadne::ids::base62_impl::{parse_base62, to_base62};
 use chrono::{Duration, Utc};
@@ -79,7 +81,8 @@ pub async fn products(
     let products = product_item::QueryProductWithPrices::list_purchaseable(
         &**pool, &redis,
     )
-    .await?;
+    .await
+    .wrap_internal_err("fetching query product with prices from Redis")?;
 
     let products = products
         .into_iter()
@@ -137,7 +140,8 @@ pub async fn subscriptions(
         &session_queue,
         Scopes::SESSION_ACCESS,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     let db_subscriptions =
@@ -146,23 +150,24 @@ pub async fn subscriptions(
                 if user.role.is_admin() {
                     user_id.into()
                 } else {
-                    return Err(ApiError::InvalidInput(
-                        "You cannot see the subscriptions of other users!"
-                            .to_string(),
-                    ));
+                    return Err(ApiError::Request(eyre::eyre!(
+                        "You cannot see the subscriptions of other users!",
+                    )));
                 }
             } else {
                 user.id.into()
             },
             &**pool,
         )
-        .await?;
+        .await
+        .wrap_internal_err("fetching user subscriptions from database")?;
 
     let mut subscriptions = Vec::with_capacity(db_subscriptions.len());
     for subscription in db_subscriptions {
         let next_charge_tax_amount =
             DBCharge::get_open_subscription(subscription.id, &**pool)
-                .await?
+                .await
+                .wrap_internal_err("fetching charge from database")?
                 .map(|charge| charge.tax_amount);
 
         subscriptions.push(UserSubscriptionWithNextChargeTaxAmount {
@@ -215,19 +220,25 @@ pub async fn refund_charge(
         &session_queue,
         Scopes::SESSION_ACCESS,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     let (id,) = info.into_inner();
 
     if !user.role.is_admin() {
-        return Err(ApiError::CustomAuthentication(
-            "You do not have permission to refund a subscription!".to_string(),
-        ));
+        return Err(ApiError::Auth(eyre::eyre!(
+            "You do not have permission to refund a subscription!",
+        )));
     }
 
-    if let Some(charge) = DBCharge::get(id.into(), &**pool).await? {
-        let refunds = DBCharge::get_children(id.into(), &**pool).await?;
+    if let Some(charge) = DBCharge::get(id.into(), &**pool)
+        .await
+        .wrap_internal_err("fetching charge from database")?
+    {
+        let refunds = DBCharge::get_children(id.into(), &**pool)
+            .await
+            .wrap_internal_err("fetching charges from database")?;
         let refunds = -refunds
             .into_iter()
             .filter_map(|x| match x.status {
@@ -249,16 +260,15 @@ pub async fn refund_charge(
         };
 
         if charge.status != ChargeStatus::Succeeded {
-            return Err(ApiError::InvalidInput(
-                "This charge cannot be refunded!".to_string(),
-            ));
+            return Err(ApiError::Request(eyre::eyre!(
+                "This charge cannot be refunded!",
+            )));
         }
 
         if (refundable - refund_amount) < 0 {
-            return Err(ApiError::InvalidInput(
-                "You cannot refund more than the amount of the charge!"
-                    .to_string(),
-            ));
+            return Err(ApiError::Request(eyre::eyre!(
+                "You cannot refund more than the amount of the charge!",
+            )));
         }
 
         let (id, net, anrok_result) = if refund_amount == 0 {
@@ -287,29 +297,33 @@ pub async fn refund_charge(
                             &payment_platform_id,
                             &["payment_method"],
                         )
-                        .await?;
+                        .await
+                        .wrap_failed_dependency_err(
+                            "communicating with payment provider",
+                        )?;
 
                         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(
+                            return Err(ApiError::Request(eyre::eyre!(
                                 "Couldn't retrieve billing address for payment method!"
                                     .to_owned(),
-                            ));
+                            )));
                         };
 
                         let tax_id = product_info_by_product_price_id(
                             charge.price_id,
                             &**pool,
                         )
-                        .await?
-                        .ok_or_else(|| {
-                            ApiError::InvalidInput(
-                                "Could not find product tax info for price ID!"
-                                    .to_owned(),
-                            )
+                        .await
+                        .wrap_api_err(
+                            "executing `product_info_by_product_price_id`",
+                        )?
+                        .wrap_request_err_with(|| {
+                            "could not find product tax info for price ID!"
+                                .to_owned()
                         })?
                         .tax_identifier
                         .tax_processor_id;
@@ -326,10 +340,10 @@ pub async fn refund_charge(
                             .zip(charge.tax_transaction_version)
                             .zip(charge.tax_platform_accounting_time)
                         else {
-                            return Err(ApiError::InvalidInput(
+                            return Err(ApiError::Request(eyre::eyre!(
                                 "Charge is missing full tax information. Please wait for the original charge to be synchronized with the tax processor."
                                     .to_owned(),
-                            ));
+                            )));
                         };
 
                         let refund = stripe::Refund::create(
@@ -344,7 +358,10 @@ pub async fn refund_charge(
                                 ..Default::default()
                             },
                         )
-                        .await?;
+                        .await
+                        .wrap_failed_dependency_err(
+                            "communicating with payment provider",
+                        )?;
 
                         let anrok_txn_result = anrok_client.negate_or_create_partial_negation(
                             original_tax_platform_id,
@@ -373,24 +390,28 @@ pub async fn refund_charge(
                             Some(anrok_txn_result),
                         )
                     } else {
-                        return Err(ApiError::InvalidInput(
-                            "Charge does not have attached payment id!"
-                                .to_string(),
-                        ));
+                        return Err(ApiError::Request(eyre::eyre!(
+                            "Charge does not have attached payment id!",
+                        )));
                     }
                 }
                 PaymentPlatform::None => {
-                    return Err(ApiError::InvalidInput(
+                    return Err(ApiError::Request(eyre::eyre!(
                         "This charge was not processed via a payment platform."
                             .to_owned(),
-                    ));
+                    )));
                 }
             }
         };
 
-        let mut transaction = pool.begin().await?;
+        let mut transaction = pool
+            .begin()
+            .await
+            .wrap_internal_err("starting database transaction")?;
 
-        let charge_id = generate_charge_id(&mut transaction).await?;
+        let charge_id = generate_charge_id(&mut transaction)
+            .await
+            .wrap_internal_err("generating charge ID")?;
         DBCharge {
             id: charge_id,
             user_id: charge.user_id,
@@ -419,39 +440,47 @@ pub async fn refund_charge(
             tax_platform_accounting_time: None,
         }
         .upsert(&mut transaction)
-        .await?;
+        .await
+        .wrap_internal_err("generating charge ID")?;
 
         if body.0.unprovision.unwrap_or(false)
             && let Some(subscription_id) = charge.subscription_id
         {
             let open_charge =
                 DBCharge::get_open_subscription(subscription_id, &**pool)
-                    .await?;
+                    .await
+                    .wrap_internal_err("fetching charge from database")?;
             if let Some(mut open_charge) = open_charge {
                 open_charge.status = ChargeStatus::Cancelled;
                 open_charge.due = Utc::now();
 
-                open_charge.upsert(&mut transaction).await?;
+                open_charge
+                    .upsert(&mut transaction)
+                    .await
+                    .wrap_internal_err("cancelling subscription charge")?;
             }
         }
 
-        transaction.commit().await?;
+        transaction
+            .commit()
+            .await
+            .wrap_internal_err("committing database transaction")?;
 
         if let Some(Err(error)) = anrok_result {
             if let anrok::AnrokError::Conflict(m) = &error
                 && m.contains("transactionExpectedVersionMismatch")
             {
-                return Err(ApiError::InvalidInput(
+                return Err(ApiError::Request(eyre::eyre!(
                     "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!(
+                return Err(ApiError::Request(eyre::eyre!(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}"
-                )));
+                ))));
             }
         }
     }
@@ -482,80 +511,86 @@ pub async fn reprocess_charge_tax(
         &session_queue,
         Scopes::SESSION_ACCESS,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .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(),
-        ));
+        return Err(ApiError::Auth(eyre::eyre!(
+            "You do not have permission to reprocess a tax transaction!",
+        )));
     }
 
-    let mut txn = pool.begin().await?;
+    let mut txn = pool
+        .begin()
+        .await
+        .wrap_internal_err("starting database transaction")?;
 
     let charge_refund = charge_item::DBCharge::get(id.into(), &mut txn)
-        .await?
-        .ok_or_else(|| ApiError::NotFound)?;
+        .await
+        .wrap_internal_err("fetching charge from database")?
+        .wrap_not_found_err_with(|| "resource not found")?;
 
     let Some(parent_charge_id) = charge_refund.parent_charge_id else {
-        return Err(ApiError::InvalidInput(
-            "This charge does not have a parent!".to_string(),
-        ));
+        return Err(ApiError::Request(eyre::eyre!(
+            "This charge does not have a parent!",
+        )));
     };
 
     match charge_refund.tax_platform_id {
         Some(_) => {
-            return Err(ApiError::InvalidInput(
-                "Refund charge already has a tax transaction ID!".to_string(),
-            ));
+            return Err(ApiError::Request(eyre::eyre!(
+                "Refund charge already has a tax transaction ID!",
+            )));
         }
         None => {
             let charge = charge_item::DBCharge::get(parent_charge_id, &mut txn)
-                .await?
-                .ok_or_else(|| ApiError::NotFound)?;
+                .await
+                .wrap_internal_err("fetching charge from database")?
+                .wrap_not_found_err_with(|| "resource not found")?;
 
             let payment_platform_id = charge
                 .payment_platform_id
-                .ok_or_else(|| {
-                    ApiError::Internal(eyre::eyre!(
-                        "parent charge is missing a payment platform ID"
-                    ))
-                })?
+                .wrap_internal_err_with(
+                    || "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."
-                    ))
-                })?;
+                .map_err(|err| eyre::eyre!(err))
+                .wrap_internal_err(
+                    "parent charge has an invalid payment platform ID.",
+                )?;
 
             let pi = stripe::PaymentIntent::retrieve(
                 &stripe_client,
                 &payment_platform_id,
                 &["payment_method"],
             )
-            .await?;
+            .await
+            .wrap_failed_dependency_err(
+                "communicating with payment provider",
+            )?;
 
             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(
+                return Err(ApiError::Request(eyre::eyre!(
                     "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(),
-                        )
+                    .await
+                    .wrap_api_err(
+                        "executing `product_info_by_product_price_id`",
+                    )?
+                    .wrap_request_err_with(|| {
+                        "could not find product tax info for price ID!"
+                            .to_owned()
                     })?
                     .tax_identifier
                     .tax_processor_id;
@@ -569,22 +604,19 @@ pub async fn reprocess_charge_tax(
                 .zip(charge.tax_transaction_version)
                 .zip(charge.tax_platform_accounting_time)
             else {
-                return Err(ApiError::InvalidInput(
+                return Err(ApiError::Request(eyre::eyre!(
                     "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!"
-                    ))
-                })?;
+                charge_refund.payment_platform_id.wrap_internal_err_with(
+                    || "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 refund_id = stripe::RefundId::from_str(&refund_id)
+                .map_err(|err| eyre::eyre!(err))
+                .wrap_internal_err("invalid refund ID!")?;
 
             let anrok_txn_result = anrok_client
                 .negate_or_create_partial_negation(
@@ -621,14 +653,16 @@ pub async fn reprocess_charge_tax(
                 .await;
 
             if let Err(error) = anrok_txn_result {
-                return Err(ApiError::InvalidInput(format!(
+                return Err(ApiError::Request(eyre::eyre!(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?;
+    txn.commit()
+        .await
+        .wrap_internal_err("committing database transaction")?;
 
     Ok(HttpResponse::NoContent().finish())
 }
@@ -678,7 +712,8 @@ pub async fn edit_subscription(
         &session_queue,
         Scopes::SESSION_ACCESS,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     #[derive(Clone, Copy, PartialEq, Eq)]
@@ -699,21 +734,19 @@ pub async fn edit_subscription(
             new_product_price.product_id,
             &mut *txn,
         )
-        .await?
-        .ok_or_else(|| {
-            ApiError::InvalidInput(
-                "Could not link new product price to product.".to_owned(),
-            )
+        .await
+        .wrap_internal_err("fetching product from database")?
+        .wrap_request_err_with(|| {
+            "could not link new product price to product.".to_owned()
         })?;
         let current_product = product_item::DBProduct::get(
             current_product_price.product_id,
             &mut *txn,
         )
-        .await?
-        .ok_or_else(|| {
-            ApiError::InvalidInput(
-                "Could not link current product price to product.".to_owned(),
-            )
+        .await
+        .wrap_internal_err("fetching product from database")?
+        .wrap_request_err_with(|| {
+            "could not link current product price to product.".to_owned()
         })?;
 
         // Special case: for promoting a 'medal' subscription to 'pyro', compare the RAM. If pyro plan has:
@@ -765,11 +798,9 @@ pub async fn edit_subscription(
         let current_amount = match &current_price.prices {
             Price::OneTime { price } => *price,
             Price::Recurring { intervals } => {
-                *intervals.get(&duration).ok_or_else(|| {
-                    ApiError::InvalidInput(
-                        "Could not find a valid price for the user's duration"
-                            .to_owned(),
-                    )
+                *intervals.get(&duration).wrap_request_err_with(|| {
+                    "could not find a valid price for the user's duration"
+                        .to_owned()
                 })?
             }
         };
@@ -777,11 +808,9 @@ pub async fn edit_subscription(
         let amount = match &new_product_price.prices {
             Price::OneTime { price } => *price,
             Price::Recurring { intervals } => {
-                *intervals.get(&duration).ok_or_else(|| {
-                    ApiError::InvalidInput(
-                        "Could not find a valid price for the user's duration"
-                            .to_owned(),
-                    )
+                *intervals.get(&duration).wrap_request_err_with(|| {
+                    "could not find a valid price for the user's duration"
+                        .to_owned()
                 })?
             }
         };
@@ -791,10 +820,8 @@ pub async fn edit_subscription(
         let proration = (Decimal::from(amount - current_amount) * complete)
             .floor()
             .to_i32()
-            .ok_or_else(|| {
-                ApiError::InvalidInput(
-                    "Could not convert proration to i32".to_owned(),
-                )
+            .wrap_request_err_with(|| {
+                "could not convert proration to i32".to_owned()
             })?;
 
         Ok((
@@ -815,35 +842,37 @@ pub async fn edit_subscription(
 
     let subscription =
         user_subscription_item::DBUserSubscription::get(id.into(), &**pool)
-            .await?
-            .ok_or_else(|| ApiError::NotFound)?;
+            .await
+            .wrap_internal_err("fetching user subscription from database")?
+            .wrap_not_found_err_with(|| "resource not found")?;
 
     if subscription.user_id != user.id.into() && !user.role.is_admin() {
-        return Err(ApiError::NotFound);
+        return Err(ApiError::NotFound(eyre::eyre!("resource not found")));
     }
 
-    let mut transaction = pool.begin().await?;
+    let mut transaction = pool
+        .begin()
+        .await
+        .wrap_internal_err("starting database transaction")?;
 
     let mut open_charge = charge_item::DBCharge::get_open_subscription(
         subscription.id,
         &mut transaction,
     )
-    .await?
-    .ok_or_else(|| {
-        ApiError::InvalidInput(
-            "Could not find open charge for this subscription".to_string(),
-        )
+    .await
+    .wrap_internal_err("fetching charge from database")?
+    .wrap_request_err_with(|| {
+        "could not find open charge for this subscription".to_string()
     })?;
 
     let current_price = product_item::DBProductPrice::get(
         subscription.price_id,
         &mut transaction,
     )
-    .await?
-    .ok_or_else(|| {
-        ApiError::InvalidInput(
-            "Could not find current product price".to_string(),
-        )
+    .await
+    .wrap_internal_err("fetching product price from database")?
+    .wrap_request_err_with(|| {
+        "could not find current product price".to_string()
     })?;
 
     let maybe_intent_metadata = match edit_subscription.into_inner() {
@@ -857,7 +886,10 @@ pub async fn edit_subscription(
                     subscription.id,
                     &mut transaction,
                 )
-                .await?;
+                .await
+                .wrap_internal_err(
+                    "updating users subscriptions affiliations in database",
+                )?;
                 open_charge.status = ChargeStatus::Cancelled;
             } else {
                 // Forces another resubscription attempt
@@ -881,7 +913,10 @@ pub async fn edit_subscription(
                     subscription.id,
                     &mut transaction,
                 )
-                .await?;
+                .await
+                .wrap_internal_err(
+                    "executing `DBUsersSubscriptionsAffiliations::deactivate`",
+                )?;
                 ChargeStatus::Cancelled
             } else {
                 ChargeStatus::Open
@@ -904,22 +939,21 @@ pub async fn edit_subscription(
                     product_id.into(),
                     &mut transaction,
                 )
-                .await?
+                .await
+                .wrap_internal_err("fetching product prices from database")?
                 .into_iter()
                 .find(|x| x.currency_code == current_price.currency_code)
-                .ok_or_else(|| {
-                    ApiError::InvalidInput(
-                        "Could not find a valid price for your currency code!"
-                            .to_owned(),
-                    )
+                .wrap_request_err_with(|| {
+                    "could not find a valid price for your currency code!"
+                        .to_owned()
                 })?;
 
             // The price is the same! The request likely asked to edit the product to what it already is.
             if new_product_price.id == current_price.id {
-                return Err(ApiError::InvalidInput(
+                return Err(ApiError::Request(eyre::eyre!(
                     "You cannot use the existing product when modifying a subscription! Modifications to only the billing interval aren't yet supported."
                         .to_owned(),
-                ));
+                )));
             }
 
             #[derive(Serialize)]
@@ -931,9 +965,8 @@ pub async fn edit_subscription(
             let currency = stripe::Currency::from_str(
                 &current_price.currency_code.to_lowercase(),
             )
-            .map_err(|_| {
-                ApiError::InvalidInput("Invalid currency code".to_string())
-            })?;
+            .map_err(|err| eyre::eyre!(err))
+            .wrap_request_err("invalid currency code".to_string())?;
 
             // The next charge is an expiring charge, so we are promoting the subscription to a paid product.
             // Instead of doing a proration (since the product is likely free) we either:
@@ -944,15 +977,16 @@ pub async fn edit_subscription(
             //
             // ..depending on the special cases defined in `promotion_payment_requirement`.
             if open_charge.status == ChargeStatus::Expiring {
-                let new_region = region.ok_or_else(|| ApiError::InvalidInput("You need to specify a region when promoting an expiring charge.".to_owned()))?;
-                let new_interval = interval.ok_or_else(|| ApiError::InvalidInput("You need to specify an interval when promoting an expiring charge.".to_owned()))?;
+                let new_region = region.wrap_request_err_with(|| "you need to specify a region when promoting an expiring charge.".to_owned())?;
+                let new_interval = interval.wrap_request_err_with(|| "you need to specify an interval when promoting an expiring charge.".to_owned())?;
 
                 let req = promotion_payment_requirement(
                     &mut transaction,
                     &current_price,
                     &new_product_price,
                 )
-                .await?;
+                .await
+                .wrap_api_err("executing `promotion_payment_requirement`")?;
 
                 if dry {
                     // Note: we aren't committing the transaction here and it will be aborted.
@@ -966,10 +1000,8 @@ pub async fn edit_subscription(
 
                 let payment_request_type =
                     PaymentRequestType::from_stripe_id(payment_method)
-                        .ok_or_else(|| {
-                            ApiError::InvalidInput(
-                                "Invalid payment method ID".to_owned(),
-                            )
+                        .wrap_request_err_with(|| {
+                            "invalid payment method ID".to_owned()
                         })?;
 
                 if req == PaymentRequirement::RequiresPayment {
@@ -994,14 +1026,15 @@ pub async fn edit_subscription(
                             attach_payment_metadata: None,
                         },
                     )
-                    .await?;
+                    .await
+                    .wrap_api_err("creating subscription charge")?;
 
                     Some(results)
                 } else {
                     /*
                     open_charge.status = ChargeStatus::Open;
                     open_charge.payment_platform = PaymentPlatform::Stripe;
-                    open_charge.amount = new_product_price.prices.get_interval(new_interval).ok_or_else(|| ApiError::InvalidInput("Could not find a valid price for the user's duration".to_owned()))?;
+                    open_charge.amount = new_product_price.prices.get_interval(new_interval).wrap_request_err_with(|| "could not find a valid price for the user's duration".to_owned())?;
                     open_charge.currency_code = new_product_price.currency_code;
                     open_charge.subscription_interval = Some(new_interval);
                     open_charge.price_id = new_product_price.id;
@@ -1019,7 +1052,8 @@ pub async fn edit_subscription(
                     &subscription,
                     &current_price,
                     &new_product_price,
-                )?;
+                )
+                .wrap_api_err("executing `proration_amount`")?;
 
                 if dry {
                     // Note: we aren't committing the transaction here and it will be aborted.
@@ -1083,7 +1117,8 @@ pub async fn edit_subscription(
                                 attach_payment_metadata: None,
                             },
                         )
-                        .await?;
+                        .await
+                        .wrap_api_err("creating subscription charge")?;
 
                         Some(results)
                     }
@@ -1097,25 +1132,25 @@ pub async fn edit_subscription(
             interval,
             ..
         } if region.is_some() || interval.is_some() => {
-            return Err(ApiError::InvalidInput(
+            return Err(ApiError::Request(eyre::eyre!(
                 "It is not currently possible to only modify the region or interval of a subscription".to_owned(),
-            ));
+            )));
         }
 
         SubscriptionEdit {
             payment_method: None,
             ..
         } => {
-            return Err(ApiError::InvalidInput(
+            return Err(ApiError::Request(eyre::eyre!(
                 "A known payment method is required at this point to calculate tax information".to_owned(),
-            ));
+            )));
         }
 
         _ => {
-            return Err(ApiError::InvalidInput(
+            return Err(ApiError::Request(eyre::eyre!(
                 "Unexpected combination of fields in subscription PATCH request. Please either only specify `cancelled`, or specify `product` \
                 alongside optionally specifying a `region` and `interval`. In some cases, you may be required to provide `region` and `interval`.".to_owned(),
-            ));
+            )));
         }
     };
 
@@ -1125,8 +1160,14 @@ pub async fn edit_subscription(
         // At this point, if dry is true, we've already early-returned, except in
         // the `cancelled` branches.
 
-        open_charge.upsert(&mut transaction).await?;
-        transaction.commit().await?;
+        open_charge
+            .upsert(&mut transaction)
+            .await
+            .wrap_internal_err("committing database transaction")?;
+        transaction
+            .commit()
+            .await
+            .wrap_internal_err("committing database transaction")?;
     }
 
     if let Some(PaymentBootstrapResults {
@@ -1169,7 +1210,8 @@ pub async fn user_customer(
         &session_queue,
         Scopes::SESSION_ACCESS,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     let customer_id = get_or_create_customer(
@@ -1180,9 +1222,14 @@ pub async fn user_customer(
         &pool,
         &redis,
     )
-    .await?;
+    .await
+    .wrap_api_err("fetching or creating Stripe customer")?;
     let customer =
-        stripe::Customer::retrieve(&stripe_client, &customer_id, &[]).await?;
+        stripe::Customer::retrieve(&stripe_client, &customer_id, &[])
+            .await
+            .wrap_failed_dependency_err(
+                "communicating with payment provider",
+            )?;
 
     Ok(HttpResponse::Ok().json(customer))
 }
@@ -1214,7 +1261,8 @@ pub async fn charges(
         &session_queue,
         Scopes::SESSION_ACCESS,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     let charges =
@@ -1223,17 +1271,17 @@ pub async fn charges(
                 if user.role.is_admin() {
                     user_id.into()
                 } else {
-                    return Err(ApiError::InvalidInput(
-                        "You cannot see the subscriptions of other users!"
-                            .to_string(),
-                    ));
+                    return Err(ApiError::Request(eyre::eyre!(
+                        "You cannot see the subscriptions of other users!",
+                    )));
                 }
             } else {
                 user.id.into()
             },
             &**pool,
         )
-        .await?;
+        .await
+        .wrap_internal_err("fetching user charges from database")?;
 
     Ok(HttpResponse::Ok().json(
         charges
@@ -1279,7 +1327,8 @@ pub async fn add_payment_method_flow(
         &session_queue,
         Scopes::SESSION_ACCESS,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     let customer = get_or_create_customer(
@@ -1290,7 +1339,8 @@ pub async fn add_payment_method_flow(
         &pool,
         &redis,
     )
-    .await?;
+    .await
+    .wrap_api_err("fetching or creating Stripe customer")?;
 
     let intent = SetupIntent::create(
         &stripe_client,
@@ -1305,7 +1355,7 @@ pub async fn add_payment_method_flow(
             ..Default::default()
         },
     )
-    .await?;
+    .await.wrap_failed_dependency_err("communicating with payment provider")?;
 
     Ok(HttpResponse::Ok().json(serde_json::json!({
         "client_secret": intent.client_secret
@@ -1339,13 +1389,14 @@ pub async fn edit_payment_method(
         &session_queue,
         Scopes::SESSION_ACCESS,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     let (id,) = info.into_inner();
 
     let Ok(payment_method_id) = PaymentMethodId::from_str(&id) else {
-        return Err(ApiError::NotFound);
+        return Err(ApiError::NotFound(eyre::eyre!("resource not found")));
     };
 
     let customer = get_or_create_customer(
@@ -1356,14 +1407,16 @@ pub async fn edit_payment_method(
         &pool,
         &redis,
     )
-    .await?;
+    .await
+    .wrap_api_err("fetching or creating Stripe customer")?;
 
     let payment_method = stripe::PaymentMethod::retrieve(
         &stripe_client,
         &payment_method_id,
         &[],
     )
-    .await?;
+    .await
+    .wrap_failed_dependency_err("communicating with payment provider")?;
 
     if payment_method.customer.is_some_and(|x| x.id() == customer)
         || user.role.is_admin()
@@ -1379,11 +1432,12 @@ pub async fn edit_payment_method(
                 ..Default::default()
             },
         )
-        .await?;
+        .await
+        .wrap_failed_dependency_err("communicating with payment provider")?;
 
         Ok(HttpResponse::NoContent().finish())
     } else {
-        Err(ApiError::NotFound)
+        Err(ApiError::NotFound(eyre::eyre!("resource not found")))
     }
 }
 
@@ -1409,13 +1463,14 @@ pub async fn remove_payment_method(
         &session_queue,
         Scopes::SESSION_ACCESS,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     let (id,) = info.into_inner();
 
     let Ok(payment_method_id) = PaymentMethodId::from_str(&id) else {
-        return Err(ApiError::NotFound);
+        return Err(ApiError::NotFound(eyre::eyre!("resource not found")));
     };
 
     let customer = get_or_create_customer(
@@ -1426,28 +1481,35 @@ pub async fn remove_payment_method(
         &pool,
         &redis,
     )
-    .await?;
+    .await
+    .wrap_api_err("fetching or creating Stripe customer")?;
 
     let payment_method = stripe::PaymentMethod::retrieve(
         &stripe_client,
         &payment_method_id,
         &[],
     )
-    .await?;
+    .await
+    .wrap_failed_dependency_err("communicating with payment provider")?;
 
     let user_subscriptions =
         user_subscription_item::DBUserSubscription::get_all_user(
             user.id.into(),
             &**pool,
         )
-        .await?;
+        .await
+        .wrap_internal_err("fetching user subscriptions from database")?;
 
     if user_subscriptions
         .iter()
         .any(|x| x.status != SubscriptionStatus::Unprovisioned)
     {
         let customer =
-            stripe::Customer::retrieve(&stripe_client, &customer, &[]).await?;
+            stripe::Customer::retrieve(&stripe_client, &customer, &[])
+                .await
+                .wrap_failed_dependency_err(
+                    "communicating with payment provider",
+                )?;
 
         if customer
             .invoice_settings
@@ -1457,10 +1519,9 @@ pub async fn remove_payment_method(
             })
             .unwrap_or(false)
         {
-            return Err(ApiError::InvalidInput(
-                "You may not remove the default payment method if you have active subscriptions!"
-                    .to_string(),
-            ));
+            return Err(ApiError::Request(eyre::eyre!(
+                "You may not remove the default payment method if you have active subscriptions!",
+            )));
         }
     }
 
@@ -1468,11 +1529,14 @@ pub async fn remove_payment_method(
         || user.role.is_admin()
     {
         stripe::PaymentMethod::detach(&stripe_client, &payment_method_id)
-            .await?;
+            .await
+            .wrap_failed_dependency_err(
+                "communicating with payment provider",
+            )?;
 
         Ok(HttpResponse::NoContent().finish())
     } else {
-        Err(ApiError::NotFound)
+        Err(ApiError::NotFound(eyre::eyre!("resource not found")))
     }
 }
 
@@ -1500,7 +1564,8 @@ pub async fn payment_methods(
         &session_queue,
         Scopes::SESSION_ACCESS,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     if let Some(customer_id) = user
@@ -1516,7 +1581,8 @@ pub async fn payment_methods(
                 ..Default::default()
             },
         )
-        .await?;
+        .await
+        .wrap_failed_dependency_err("communicating with payment provider")?;
 
         Ok(HttpResponse::Ok().json(methods.data))
     } else {
@@ -1560,16 +1626,15 @@ pub async fn active_servers(
         .get("X-Master-Key")
         .is_none_or(|it| it.as_bytes() != master_key.as_bytes())
     {
-        return Err(ApiError::CustomAuthentication(
-            "Invalid master key".to_string(),
-        ));
+        return Err(ApiError::Auth(eyre::eyre!("Invalid master key",)));
     }
 
     let servers = user_subscription_item::DBUserSubscription::get_all_servers(
         query.subscription_status,
         &**pool,
     )
-    .await?;
+    .await
+    .wrap_internal_err("fetching user subscriptions from database")?;
 
     let server_ids = servers
         .into_iter()
@@ -1676,7 +1741,8 @@ pub async fn initiate_payment(
         &session_queue,
         Scopes::SESSION_ACCESS,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     let payment_request = payment_request.into_inner();
@@ -1696,12 +1762,16 @@ pub async fn initiate_payment(
                 &**pool,
                 payment_request.charge,
             )
-            .await?,
+            .await
+            .wrap_api_err(
+                "executing `AttachedCharge::from_charge_request_type`",
+            )?,
             currency: CurrencyMode::Infer,
             attach_payment_metadata: payment_request.metadata,
         },
     )
-    .await?;
+    .await
+    .wrap_api_err("executing `AttachedCharge::from_charge_request_type`")?;
 
     match results.new_payment_intent {
         Some(payment_intent) => {
@@ -1785,7 +1855,8 @@ pub async fn stripe_webhook(
                     crate::database::models::user_item::DBUser::get_id(
                         user_id, pool, redis,
                     )
-                    .await?
+                    .await
+                    .wrap_internal_err("fetching user from database")?
                 else {
                     break 'metadata;
                 };
@@ -1826,13 +1897,17 @@ pub async fn stripe_webhook(
                         crate::database::models::charge_item::DBCharge::get(
                             charge_id, pool,
                         )
-                        .await?
+                        .await
+                        .wrap_internal_err("fetching charge from database")?
                     {
                         let Some(price) = product_item::DBProductPrice::get(
                             charge.price_id,
                             pool,
                         )
-                        .await?
+                        .await
+                        .wrap_internal_err(
+                            "fetching product price from database",
+                        )?
                         else {
                             break 'metadata;
                         };
@@ -1841,7 +1916,8 @@ pub async fn stripe_webhook(
                             price.product_id,
                             pool,
                         )
-                        .await?
+                        .await
+                        .wrap_internal_err("fetching product from database")?
                         else {
                             break 'metadata;
                         };
@@ -1852,7 +1928,9 @@ pub async fn stripe_webhook(
                             Some(payment_intent_id.to_string());
                         charge.tax_amount = tax_amount;
                         charge.tax_platform_id = None;
-                        charge.upsert(transaction).await?;
+                        charge.upsert(transaction).await.wrap_internal_err(
+                            "updating payment intent charge",
+                        )?;
 
                         if let Some(subscription_id) = charge.subscription_id {
                             let maybe_subscription =
@@ -1860,7 +1938,7 @@ pub async fn stripe_webhook(
                                 subscription_id,
                                 pool,
                             )
-                            .await?;
+                            .await.wrap_internal_err("fetching user subscription from database")?;
 
                             let Some(mut subscription) = maybe_subscription
                             else {
@@ -1880,14 +1958,18 @@ pub async fn stripe_webhook(
                                     subscription.price_id = charge.price_id;
                                 }
                                 ChargeType::Refund => {
-                                    return Err(ApiError::InvalidInput(
-                                        "Invalid charge type: Refund"
-                                            .to_string(),
+                                    return Err(ApiError::Request(
+                                        eyre::eyre!(
+                                            "Invalid charge type: Refund",
+                                        ),
                                     ));
                                 }
                             }
 
-                            subscription.upsert(transaction).await?;
+                            subscription
+                                .upsert(transaction)
+                                .await
+                                .wrap_internal_err("upserting subscription")?;
 
                             (
                                 charge,
@@ -1914,7 +1996,10 @@ pub async fn stripe_webhook(
 
                         let Some(price) =
                             product_item::DBProductPrice::get(price_id, pool)
-                                .await?
+                                .await
+                                .wrap_internal_err(
+                                    "fetching product price from database",
+                                )?
                         else {
                             break 'metadata;
                         };
@@ -1923,7 +2008,8 @@ pub async fn stripe_webhook(
                             price.product_id,
                             pool,
                         )
-                        .await?;
+                        .await
+                        .wrap_internal_err("fetching product from database")?;
 
                         let Some(product) = maybe_product else {
                             break 'metadata;
@@ -1949,7 +2035,7 @@ pub async fn stripe_webhook(
                                     break 'metadata;
                                 };
 
-                                    let subscription = if let Some(mut subscription) = user_subscription_item::DBUserSubscription::get(subscription_id, pool).await? {
+                                    let subscription = if let Some(mut subscription) = user_subscription_item::DBUserSubscription::get(subscription_id, pool).await.wrap_internal_err("fetching user subscription from database")? {
                                     subscription.status = SubscriptionStatus::Unprovisioned;
                                     subscription.price_id = price_id;
                                     subscription.interval = interval;
@@ -1970,7 +2056,10 @@ pub async fn stripe_webhook(
                                     if charge_status != ChargeStatus::Failed {
                                         subscription
                                             .upsert(&mut *transaction)
-                                            .await?;
+                                            .await
+                                            .wrap_internal_err(
+                                                "upserting subscription",
+                                            )?;
                                     }
 
                                     Some(subscription)
@@ -2011,7 +2100,10 @@ pub async fn stripe_webhook(
                         };
 
                         if charge_status != ChargeStatus::Failed {
-                            charge.upsert(&mut *transaction).await?;
+                            charge
+                                .upsert(&mut *transaction)
+                                .await
+                                .wrap_internal_err("upserting charge")?;
                         }
 
                         (charge, price, product, subscription, new_region)
@@ -2029,9 +2121,9 @@ pub async fn stripe_webhook(
                 });
             }
 
-            Err(ApiError::InvalidInput(
-                "Webhook missing required webhook metadata!".to_string(),
-            ))
+            Err(ApiError::Request(eyre::eyre!(
+                "Webhook missing required webhook metadata!",
+            )))
         }
 
         match event.type_ {
@@ -2039,7 +2131,10 @@ pub async fn stripe_webhook(
                 if let EventObject::PaymentIntent(payment_intent) =
                     event.data.object
                 {
-                    let mut transaction = pool.begin().await?;
+                    let mut transaction = pool
+                        .begin()
+                        .await
+                        .wrap_internal_err("starting database transaction")?;
 
                     let mut metadata = get_payment_intent_metadata(
                         payment_intent.id,
@@ -2051,7 +2146,8 @@ pub async fn stripe_webhook(
                         ChargeStatus::Succeeded,
                         &mut transaction,
                     )
-                    .await?;
+                    .await
+                    .wrap_api_err("fetching payment intent metadata")?;
 
                     if let Some(latest_charge) = payment_intent.latest_charge {
                         let charge = stripe::Charge::retrieve(
@@ -2059,7 +2155,10 @@ pub async fn stripe_webhook(
                             &latest_charge.id(),
                             &["balance_transaction"],
                         )
-                        .await?;
+                        .await
+                        .wrap_failed_dependency_err(
+                            "communicating with payment provider",
+                        )?;
 
                         if let Some(balance_transaction) = charge
                             .balance_transaction
@@ -2070,7 +2169,8 @@ pub async fn stripe_webhook(
                             metadata
                                 .charge_item
                                 .upsert(&mut transaction)
-                                .await?;
+                                .await
+                                .wrap_internal_err("upserting charge")?;
                         }
                     }
 
@@ -2098,7 +2198,8 @@ pub async fn stripe_webhook(
                                     as crate::database::models::ids::DBUserId,
                             )
                             .execute(&mut transaction)
-                            .await?;
+                            .await
+                            .wrap_internal_err("querying database for `get_payment_intent_metadata`")?;
                         }
                         ProductMetadata::Pyro {
                             ram,
@@ -2124,11 +2225,11 @@ pub async fn stripe_webhook(
                                             let region = metadata.new_region.clone();
 
                                             if region.is_none() {
-                                                return Err(ApiError::InvalidInput(
+                                                return Err(ApiError::Request(eyre::eyre!(
                                                     "We attempted to promote a subscription with type=medal, which requires specifying \
                                                     a new region to move the server to. However, no new region was present in the payment \
                                                     intent metadata.".to_owned()
-                                                ));
+                                                )));
                                             }
 
                                             region
@@ -2162,8 +2263,8 @@ pub async fn stripe_webhook(
                                         ))
                                         .header("X-Master-Key", &ENV.PYRO_API_KEY)
                                         .send()
-                                        .await?
-                                        .error_for_status()?;
+                                        .await.wrap_internal_err("sending HTTP request")?
+                                        .error_for_status().wrap_internal_err("sending HTTP request")?;
 
                                     client
                                         .post(format!(
@@ -2177,8 +2278,8 @@ pub async fn stripe_webhook(
                                         )
                                         .json(&body)
                                         .send()
-                                        .await?
-                                        .error_for_status()?;
+                                        .await.wrap_internal_err("deserializing HTTP response")?
+                                        .error_for_status().wrap_internal_err("deserializing HTTP response")?;
 
                                     // As the subscription has been promoted, this is now a Pyro subscription.
                                     // Ensure the metadata is properly updated.
@@ -2206,7 +2307,7 @@ pub async fn stripe_webhook(
                                                 None,
                                                 &**pool,
                                                 &redis,
-                                            ).await?;
+                                            ).await.wrap_internal_err("fetching minecraft versions from database")?;
 
                                             (
                                                 None,
@@ -2257,10 +2358,10 @@ pub async fn stripe_webhook(
                                             })
                                         }))
                                         .send()
-                                        .await?
-                                        .error_for_status()?
+                                        .await.wrap_internal_err("sending HTTP request")?
+                                        .error_for_status().wrap_internal_err("sending HTTP request")?
                                         .json::<PyroServerResponse>()
-                                        .await?;
+                                        .await.wrap_internal_err("deserializing HTTP response")?;
 
                                     if let Some(ref mut subscription) =
                                         metadata.user_subscription_item
@@ -2283,17 +2384,14 @@ pub async fn stripe_webhook(
                             subscription.id,
                             &mut transaction,
                         )
-                        .await?;
+                        .await
+                        .wrap_internal_err("fetching charge from database")?;
 
                         let new_price = match metadata.product_price_item.prices {
                             Price::OneTime { price } => price,
                             Price::Recurring { intervals } => {
-                                *intervals.get(&subscription.interval).ok_or_else(|| {
-                                    ApiError::InvalidInput(
-                                        "Could not find a valid price for the user's country"
-                                            .to_string(),
-                                    )
-                                })?
+                                *intervals.get(&subscription.interval).wrap_request_err_with(|| "could not find a valid price for the user's country"
+                                            .to_string())?
                             }
                         };
 
@@ -2333,12 +2431,19 @@ pub async fn stripe_webhook(
                                     metadata.product_price_item.id;
                                 charge.amount = new_price as i64;
                             }
-                            charge.upsert(&mut transaction).await?;
+                            charge
+                                .upsert(&mut transaction)
+                                .await
+                                .wrap_internal_err("upserting charge")?;
                         } else if metadata.charge_item.status
                             != ChargeStatus::Cancelled
                         {
                             let charge_id =
-                                generate_charge_id(&mut transaction).await?;
+                                generate_charge_id(&mut transaction)
+                                    .await
+                                    .wrap_internal_err(
+                                        "generating charge ID",
+                                    )?;
                             DBCharge {
                                 id: charge_id,
                                 user_id: metadata.user_item.id,
@@ -2375,7 +2480,10 @@ pub async fn stripe_webhook(
                                 tax_platform_accounting_time: None,
                             }
                             .upsert(&mut transaction)
-                            .await?;
+                            .await
+                            .wrap_internal_err(
+                                "upserting subscription charge",
+                            )?;
 
                             if let Some(affiliate_code) = metadata
                                 .payment_metadata
@@ -2390,27 +2498,42 @@ pub async fn stripe_webhook(
                                     deactivated_at: None,
                                 }
                                 .insert(&mut transaction)
-                                .await?;
+                                .await
+                                .wrap_internal_err(
+                                    "inserting subscription affiliation into database",
+                                )?;
                             }
                         };
 
                         subscription.status = SubscriptionStatus::Provisioned;
-                        subscription.upsert(&mut transaction).await?;
+                        subscription
+                            .upsert(&mut transaction)
+                            .await
+                            .wrap_internal_err(
+                                "updating affiliate code id in database",
+                            )?;
                     }
 
-                    transaction.commit().await?;
+                    transaction
+                        .commit()
+                        .await
+                        .wrap_internal_err("committing database transaction")?;
                     crate::database::models::user_item::DBUser::clear_caches(
                         &[(metadata.user_item.id, None)],
                         &redis,
                     )
-                    .await?;
+                    .await
+                    .wrap_internal_err("clearing cached data from Redis")?;
                 }
             }
             EventType::PaymentIntentProcessing => {
                 if let EventObject::PaymentIntent(payment_intent) =
                     event.data.object
                 {
-                    let mut transaction = pool.begin().await?;
+                    let mut transaction = pool
+                        .begin()
+                        .await
+                        .wrap_internal_err("starting database transaction")?;
                     get_payment_intent_metadata(
                         payment_intent.id,
                         payment_intent.amount,
@@ -2421,15 +2544,22 @@ pub async fn stripe_webhook(
                         ChargeStatus::Processing,
                         &mut transaction,
                     )
-                    .await?;
-                    transaction.commit().await?;
+                    .await
+                    .wrap_api_err("fetching payment intent metadata")?;
+                    transaction
+                        .commit()
+                        .await
+                        .wrap_internal_err("committing database transaction")?;
                 }
             }
             EventType::PaymentIntentPaymentFailed => {
                 if let EventObject::PaymentIntent(payment_intent) =
                     event.data.object
                 {
-                    let mut transaction = pool.begin().await?;
+                    let mut transaction = pool
+                        .begin()
+                        .await
+                        .wrap_internal_err("starting database transaction")?;
 
                     let metadata = get_payment_intent_metadata(
                         payment_intent.id,
@@ -2441,7 +2571,8 @@ pub async fn stripe_webhook(
                         ChargeStatus::Failed,
                         &mut transaction,
                     )
-                    .await?;
+                    .await
+                    .wrap_api_err("fetching payment intent metadata")?;
 
                     if metadata.user_item.email.is_some() {
                         let money = rusty_money::Money::from_minor(
@@ -2474,10 +2605,16 @@ pub async fn stripe_webhook(
                             },
                         }
                         .insert(metadata.user_item.id, &mut transaction, &redis)
-                        .await?;
+                        .await
+                        .wrap_internal_err(
+                            "inserting payment failure notification",
+                        )?;
                     }
 
-                    transaction.commit().await?;
+                    transaction
+                        .commit()
+                        .await
+                        .wrap_internal_err("committing database transaction")?;
                 }
             }
             EventType::PaymentMethodAttached => {
@@ -2491,7 +2628,10 @@ pub async fn stripe_webhook(
                         &customer_id,
                         &[],
                     )
-                    .await?;
+                    .await
+                    .wrap_failed_dependency_err(
+                        "communicating with payment provider",
+                    )?;
 
                     if customer
                         .invoice_settings
@@ -2512,16 +2652,19 @@ pub async fn stripe_webhook(
                                 ..Default::default()
                             },
                         )
-                        .await?;
+                        .await
+                        .wrap_failed_dependency_err(
+                            "communicating with payment provider",
+                        )?;
                     }
                 }
             }
             _ => {}
         }
     } else {
-        return Err(ApiError::InvalidInput(
-            "Webhook signature validation failed!".to_string(),
-        ));
+        return Err(ApiError::Request(eyre::eyre!(
+            "Webhook signature validation failed!",
+        )));
     }
 
     Ok(HttpResponse::Ok().finish())
@@ -2545,7 +2688,8 @@ async fn apply_credit_many(
         &subs_ids,
         &mut *transaction,
     )
-    .await?;
+    .await
+    .wrap_internal_err("fetching user subscriptions from database")?;
 
     let provisioned_count = subs
         .iter()
@@ -2573,18 +2717,22 @@ async fn apply_credit_many(
             subscription.id,
             &mut *transaction,
         )
-        .await?
-        .ok_or_else(|| {
-            ApiError::InvalidInput(format!(
-                "Could not find open charge for subscription {}",
+        .await
+        .wrap_internal_err("fetching charge from database")?
+        .wrap_request_err_with(|| {
+            format!(
+                "could not find open charge for subscription `{}`",
                 to_base62(subscription.id.0 as u64)
-            ))
+            )
         })?;
 
         let previous_due = open_charge.due;
         open_charge.due = previous_due + Duration::days(days as i64);
         let next_due = open_charge.due;
-        open_charge.upsert(&mut *transaction).await?;
+        open_charge
+            .upsert(&mut *transaction)
+            .await
+            .wrap_internal_err("updating next due in database")?;
 
         credit_sub_ids.push(subscription.id);
         credit_user_ids.push(subscription.user_id);
@@ -2604,7 +2752,10 @@ async fn apply_credit_many(
                 },
             }
             .insert(subscription.user_id, &mut *transaction, redis)
-            .await?;
+            .await
+            .wrap_internal_err(
+                "inserting database records for `apply_credit_many`",
+            )?;
         }
     }
 
@@ -2618,7 +2769,8 @@ async fn apply_credit_many(
         &credit_next_dues,
     )
     .await
-    .map_err(|e| ApiError::Internal(eyre::eyre!(e)))?;
+    .map_err(|err| eyre::eyre!(err))
+    .wrap_internal_err("inserting subscription credits into database")?;
 
     Ok(())
 }
@@ -2668,13 +2820,14 @@ pub async fn credit(
         &session_queue,
         Scopes::SESSION_ACCESS,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     if !user.role.is_admin() {
-        return Err(ApiError::CustomAuthentication(
-            "You do not have permission to credit subscriptions!".to_string(),
-        ));
+        return Err(ApiError::Auth(eyre::eyre!(
+            "You do not have permission to credit subscriptions!",
+        )));
     }
 
     let CreditRequest {
@@ -2685,18 +2838,21 @@ pub async fn credit(
     } = body.into_inner();
 
     if days <= 0 {
-        return Err(ApiError::InvalidInput(
-            "Days must be greater than zero".to_string(),
-        ));
+        return Err(ApiError::Request(eyre::eyre!(
+            "Days must be greater than zero",
+        )));
     }
-    let mut transaction = pool.begin().await?;
+    let mut transaction = pool
+        .begin()
+        .await
+        .wrap_internal_err("starting database transaction")?;
 
     match target {
         CreditTarget::Subscriptions { subscription_ids } => {
             if subscription_ids.is_empty() {
-                return Err(ApiError::InvalidInput(
-                    "You must specify at least one subscription id".to_string(),
-                ));
+                return Err(ApiError::Request(eyre::eyre!(
+                    "You must specify at least one subscription id",
+                )));
             }
             apply_credit_many(
                 &mut transaction,
@@ -2707,18 +2863,23 @@ pub async fn credit(
                 send_email,
                 message,
             )
-            .await?;
+            .await
+            .wrap_api_err("crediting user subscriptions")?;
         }
         CreditTarget::Nodes { nodes } => {
             if nodes.is_empty() {
-                return Err(ApiError::InvalidInput(
-                    "You must specify at least one node hostname".to_string(),
-                ));
+                return Err(ApiError::Request(eyre::eyre!(
+                    "You must specify at least one node hostname",
+                )));
             }
             let mut server_ids: Vec<String> = Vec::new();
             for hostname in nodes {
-                let ids =
-                    archon_client.get_servers_by_hostname(&hostname).await?;
+                let ids = archon_client
+                    .get_servers_by_hostname(&hostname)
+                    .await
+                    .wrap_internal_err(
+                        "fetching servers by hostname from Archon",
+                    )?;
                 server_ids.extend(ids.into_iter().map(|id| id.to_string()));
             }
             server_ids.dedup();
@@ -2726,11 +2887,11 @@ pub async fn credit(
                 &server_ids,
                 &mut transaction,
             )
-            .await?;
+            .await.wrap_internal_err("fetching user subscriptions from database")?;
             if subs.is_empty() {
-                return Err(ApiError::InvalidInput(
-                    "No subscriptions found for provided nodes".to_string(),
-                ));
+                return Err(ApiError::Request(eyre::eyre!(
+                    "No subscriptions found for provided nodes",
+                )));
             }
             apply_credit_many(
                 &mut transaction,
@@ -2741,20 +2902,23 @@ pub async fn credit(
                 send_email,
                 message,
             )
-            .await?;
+            .await
+            .wrap_api_err("crediting server subscriptions")?;
         }
         CreditTarget::Region { region } => {
-            let servers =
-                archon_client.get_active_servers_by_region(&region).await?;
+            let servers = archon_client
+                .get_active_servers_by_region(&region)
+                .await
+                .wrap_internal_err("fetching servers from database")?;
             let subs = user_subscription_item::DBUserSubscription::get_many_by_server_ids(
                 &servers.into_iter().map(|id| id.to_string()).collect::<Vec<String>>(),
                 &mut transaction,
             )
-            .await?;
+            .await.wrap_internal_err("fetching user subscriptions from database")?;
             if subs.is_empty() {
-                return Err(ApiError::InvalidInput(
-                    "No subscriptions found for provided region".to_string(),
-                ));
+                return Err(ApiError::Request(eyre::eyre!(
+                    "No subscriptions found for provided region",
+                )));
             }
             apply_credit_many(
                 &mut transaction,
@@ -2765,11 +2929,15 @@ pub async fn credit(
                 send_email,
                 message,
             )
-            .await?;
+            .await
+            .wrap_api_err("crediting region subscriptions")?;
         }
     }
 
-    transaction.commit().await?;
+    transaction
+        .commit()
+        .await
+        .wrap_internal_err("committing database transaction")?;
 
     Ok(HttpResponse::NoContent().finish())
 }
diff --git a/apps/labrinth/src/routes/internal/billing/payments.rs b/apps/labrinth/src/routes/internal/billing/payments.rs
index 2e0f445243..e73bd778b5 100644
--- a/apps/labrinth/src/routes/internal/billing/payments.rs
+++ b/apps/labrinth/src/routes/internal/billing/payments.rs
@@ -8,6 +8,7 @@ use crate::models::v3::billing::SubscriptionStatus;
 use crate::models::v3::users::User;
 use crate::routes::ApiError;
 use crate::util::anrok;
+use crate::util::error::{ApiContext as _, Context as _};
 use xredis::RedisPool;
 
 use crate::database::PgPool;
@@ -97,13 +98,12 @@ impl AttachedCharge {
     ) -> Result<Self, ApiError> {
         Ok(match charge_request_type {
             ChargeRequestType::Existing { id } => AttachedCharge::UseExisting {
-                charge: DBCharge::get(id.into(), exec).await?.ok_or_else(
-                    || {
-                        ApiError::InvalidInput(
-                            "Could not find charge".to_string(),
-                        )
-                    },
-                )?,
+                charge: DBCharge::get(id.into(), exec)
+                    .await
+                    .wrap_internal_err("fetching charge from database")?
+                    .wrap_request_err_with(|| {
+                        "could not find charge".to_string()
+                    })?,
             },
             ChargeRequestType::New {
                 product_id,
@@ -212,7 +212,8 @@ pub async fn create_or_update_payment_intent(
         pg,
         redis,
     )
-    .await?;
+    .await
+    .wrap_api_err("fetching or creating Stripe customer")?;
 
     let mut intent_uses_confirmation_token = false;
 
@@ -220,15 +221,15 @@ pub async fn create_or_update_payment_intent(
         PaymentSession::Interactive {
             payment_request_type: PaymentRequestType::PaymentMethod { id },
         } => {
-            let payment_method_id =
-                PaymentMethodId::from_str(id).map_err(|_| {
-                    ApiError::InvalidInput(
-                        "Invalid payment method id".to_string(),
-                    )
-                })?;
+            let payment_method_id = PaymentMethodId::from_str(id)
+                .map_err(|err| eyre::eyre!(err))
+                .wrap_request_err("invalid payment method id".to_string())?;
 
             PaymentMethod::retrieve(stripe_client, &payment_method_id, &[])
-                .await?
+                .await
+                .wrap_failed_dependency_err(
+                    "communicating with payment provider",
+                )?
         }
         PaymentSession::Interactive {
             payment_request_type:
@@ -243,7 +244,10 @@ pub async fn create_or_update_payment_intent(
 
             let mut confirmation: serde_json::Value = stripe_client
                 .get(&format!("confirmation_tokens/{token}"))
-                .await?;
+                .await
+                .wrap_failed_dependency_err(
+                    "communicating with payment provider",
+                )?;
 
             // We patch the JSONs to support the PaymentMethod struct
             let p: json_patch::Patch = serde_json::from_value(serde_json::json!([
@@ -254,19 +258,20 @@ pub async fn create_or_update_payment_intent(
             json_patch::patch(&mut confirmation, &p).unwrap();
 
             let confirmation: ConfirmationToken =
-                serde_json::from_value(confirmation)?;
+                serde_json::from_value(confirmation)
+                    .wrap_request_err("deserializing JSON data")?;
 
-            confirmation.payment_method_preview.ok_or_else(|| {
-                ApiError::InvalidInput(
-                    "Confirmation token is missing payment method!".to_string(),
-                )
-            })?
+            confirmation
+                .payment_method_preview
+                .wrap_request_err_with(|| {
+                    "confirmation token is missing payment method!".to_string()
+                })?
         }
         PaymentSession::AutomatedRenewal => {
             if attached_charge.as_charge().is_none() {
-                return Err(ApiError::InvalidInput(
-                    "Missing attached charge for automated renewal".to_string(),
-                ));
+                return Err(ApiError::Request(eyre::eyre!(
+                    "Missing attached charge for automated renewal",
+                )));
             }
 
             let customer = stripe::Customer::retrieve(
@@ -274,17 +279,18 @@ pub async fn create_or_update_payment_intent(
                 &customer_id,
                 &["invoice_settings.default_payment_method"],
             )
-            .await?;
+            .await
+            .wrap_failed_dependency_err(
+                "communicating with payment provider",
+            )?;
 
             customer
                 .invoice_settings
                 .and_then(|x| {
                     x.default_payment_method.and_then(|x| x.into_object())
                 })
-                .ok_or_else(|| {
-                    ApiError::InvalidInput(
-                        "Customer has no default payment method!".to_string(),
-                    )
+                .wrap_request_err_with(|| {
+                    "customer has no default payment method!".to_string()
                 })?
         }
     };
@@ -301,9 +307,8 @@ pub async fn create_or_update_payment_intent(
         CurrencyMode::Infer => infer_currency_code(user_country)
             .to_lowercase()
             .parse::<Currency>()
-            .map_err(|_| {
-                ApiError::InvalidInput("Invalid currency code".to_string())
-            })?,
+            .map_err(|err| eyre::eyre!(err))
+            .wrap_request_err("invalid currency code".to_string())?,
     };
 
     let charge_data = match attached_charge {
@@ -335,7 +340,8 @@ pub async fn create_or_update_payment_intent(
                 Some(next_interval),
                 inferred_stripe_currency,
             )
-            .await?;
+            .await
+            .wrap_api_err("deriving proration charge data")?;
 
             charge_data.amount = amount;
             charge_data.charge_type = ChargeType::Proration;
@@ -346,29 +352,27 @@ pub async fn create_or_update_payment_intent(
             interval,
             current_subscription: _,
             new_region: _,
-        } => {
-            derive_charge_data_from_product_selector(
-                pg,
-                user.id,
-                product_id,
-                Some(interval),
-                inferred_stripe_currency,
-            )
-            .await?
-        }
+        } => derive_charge_data_from_product_selector(
+            pg,
+            user.id,
+            product_id,
+            Some(interval),
+            inferred_stripe_currency,
+        )
+        .await
+        .wrap_api_err("deriving promotion charge data")?,
         AttachedCharge::BaseUpon {
             product_id,
             interval,
-        } => {
-            derive_charge_data_from_product_selector(
-                pg,
-                user.id,
-                product_id,
-                interval,
-                inferred_stripe_currency,
-            )
-            .await?
-        }
+        } => derive_charge_data_from_product_selector(
+            pg,
+            user.id,
+            product_id,
+            interval,
+            inferred_stripe_currency,
+        )
+        .await
+        .wrap_api_err("deriving base charge data")?,
     };
 
     // Create an ephemeral transaction to calculate the tax amount if needed
@@ -388,23 +392,18 @@ pub async fn create_or_update_payment_intent(
                 charge_data.price_id.into(),
                 pg,
             )
-            .await?
-            .ok_or_else(|| {
-                ApiError::InvalidInput(
-                    "Missing product tax identifier for charge to continue"
-                        .to_owned(),
-                )
+            .await
+            .wrap_internal_err("fetching product tax identifier")?
+            .wrap_request_err_with(|| {
+                "missing product tax identifier for charge to continue"
+                    .to_owned()
             })?;
 
-        let address =
-            payment_method.billing_details.address.clone().ok_or_else(
-                || {
-                    ApiError::InvalidInput(
-						"Missing billing details from payment method to continue"
-							.to_owned(),
-					)
-                },
-            )?;
+        let address = payment_method
+            .billing_details
+            .address
+            .clone()
+            .wrap_request_err("finding billing details on payment method")?;
 
         let ephemeral_invoice = anrok_client
             .create_ephemeral_txn(&anrok::TransactionFields {
@@ -419,7 +418,8 @@ pub async fn create_or_update_payment_intent(
                 customer_id: None,
                 customer_name: None,
             })
-            .await?;
+            .await
+            .wrap_internal_err("inserting database records for `create_or_update_payment_intent`")?;
 
         ephemeral_invoice.tax_amount_to_collect
     };
@@ -436,7 +436,8 @@ pub async fn create_or_update_payment_intent(
     if let Some(payment_metadata) = attach_payment_metadata {
         metadata.insert(
             MODRINTH_PAYMENT_METADATA.to_owned(),
-            serde_json::to_string(&payment_metadata)?,
+            serde_json::to_string(&payment_metadata)
+                .wrap_request_err("inserting payment metadata into database")?,
         );
     }
 
@@ -459,8 +460,13 @@ pub async fn create_or_update_payment_intent(
         current_subscription,
     } = attached_charge
     {
-        let mut transaction = pg.begin().await?;
-        let charge_id = generate_charge_id(&mut transaction).await?;
+        let mut transaction = pg
+            .begin()
+            .await
+            .wrap_internal_err("starting database transaction")?;
+        let charge_id = generate_charge_id(&mut transaction)
+            .await
+            .wrap_internal_err("generating charge ID")?;
 
         metadata.insert(
             MODRINTH_CHARGE_ID.to_owned(),
@@ -486,8 +492,13 @@ pub async fn create_or_update_payment_intent(
         new_region,
     } = attached_charge
     {
-        let mut transaction = pg.begin().await?;
-        let charge_id = generate_charge_id(&mut transaction).await?;
+        let mut transaction = pg
+            .begin()
+            .await
+            .wrap_internal_err("starting database transaction")?;
+        let charge_id = generate_charge_id(&mut transaction)
+            .await
+            .wrap_internal_err("generating charge ID")?;
 
         metadata.insert(
             MODRINTH_CHARGE_ID.to_owned(),
@@ -508,10 +519,16 @@ pub async fn create_or_update_payment_intent(
         );
         metadata.insert(MODRINTH_NEW_REGION.to_owned(), new_region);
     } else {
-        let mut transaction = pg.begin().await?;
-        let charge_id = generate_charge_id(&mut transaction).await?;
-        let subscription_id =
-            generate_user_subscription_id(&mut transaction).await?;
+        let mut transaction = pg
+            .begin()
+            .await
+            .wrap_internal_err("starting database transaction")?;
+        let charge_id = generate_charge_id(&mut transaction)
+            .await
+            .wrap_internal_err("generating charge ID")?;
+        let subscription_id = generate_user_subscription_id(&mut transaction)
+            .await
+            .wrap_internal_err("generating charge ID")?;
 
         metadata.insert(
             MODRINTH_CHARGE_ID.to_owned(),
@@ -538,7 +555,11 @@ pub async fn create_or_update_payment_intent(
     if let Some(payment_intent_id) = existing_payment_intent {
         let mut update_payment_intent = stripe::UpdatePaymentIntent {
             amount: Some(charge_data.amount + tax_amount),
-            currency: Some(charge_data.stripe_currency_code()?),
+            currency: Some(
+                charge_data
+                    .stripe_currency_code()
+                    .wrap_api_err("converting charge currency for Stripe")?,
+            ),
             customer: Some(customer_id),
             metadata: Some(metadata),
             ..Default::default()
@@ -560,7 +581,10 @@ pub async fn create_or_update_payment_intent(
             &payment_intent_id,
             update_payment_intent,
         )
-        .await?;
+        .await
+        .wrap_failed_dependency_err(
+            "updating database records for `create_or_update_payment_intent`",
+        )?;
 
         Ok(PaymentBootstrapResults {
             new_payment_intent: None,
@@ -572,7 +596,9 @@ pub async fn create_or_update_payment_intent(
     } else {
         let mut intent = CreatePaymentIntent::new(
             charge_data.amount + tax_amount,
-            charge_data.stripe_currency_code()?,
+            charge_data
+                .stripe_currency_code()
+                .wrap_api_err("converting charge currency for Stripe")?,
         );
 
         intent.customer = Some(customer_id);
@@ -585,7 +611,11 @@ pub async fn create_or_update_payment_intent(
         payment_session.set_payment_intent_session_options(&mut intent);
 
         let payment_intent =
-            stripe::PaymentIntent::create(stripe_client, intent).await?;
+            stripe::PaymentIntent::create(stripe_client, intent)
+                .await
+                .wrap_failed_dependency_err(
+                    "communicating with payment provider",
+                )?;
 
         Ok(PaymentBootstrapResults {
             new_payment_intent: Some(payment_intent),
@@ -621,7 +651,8 @@ pub async fn get_or_create_customer(
                 ..Default::default()
             },
         )
-        .await?;
+        .await
+        .wrap_failed_dependency_err("communicating with payment provider")?;
 
         sqlx::query!(
             "
@@ -633,13 +664,15 @@ pub async fn get_or_create_customer(
             user_id.0 as i64
         )
         .execute(pool)
-        .await?;
+        .await
+        .wrap_internal_err("querying database for `get_or_create_customer`")?;
 
         crate::database::models::user_item::DBUser::clear_caches(
             &[(user_id.into(), None)],
             redis,
         )
-        .await?;
+        .await
+        .wrap_internal_err("clearing cached data from Redis")?;
 
         Ok(customer.id)
     }
@@ -720,9 +753,9 @@ impl ChargeData {
         self.currency_code
             .to_lowercase()
             .parse::<stripe::Currency>()
-            .map_err(|_| ApiError::InvalidInput(
+            .map_err(|_| ApiError::Request(eyre::eyre!(
                 format!("Invalid currency code '{}': could not convert to Stripe currency", &self.currency_code)
-            ))
+            )))
     }
 }
 
@@ -736,18 +769,18 @@ async fn derive_charge_data_from_product_selector(
     let recommended_currency_code = stripe_currency.to_string().to_uppercase();
 
     let product = product_item::DBProduct::get(product_id.into(), pool)
-        .await?
-        .ok_or_else(|| {
-            ApiError::InvalidInput(
-                "Specified product could not be found!".to_string(),
-            )
+        .await
+        .wrap_internal_err("fetching product from database")?
+        .wrap_request_err_with(|| {
+            "specified product could not be found!".to_string()
         })?;
 
     let mut product_prices =
         product_item::DBProductPrice::get_all_public_product_prices(
             product.id, pool,
         )
-        .await?;
+        .await
+        .wrap_internal_err("fetching product prices from database")?;
 
     let price_item = if let Some(pos) = product_prices
         .iter()
@@ -759,26 +792,22 @@ async fn derive_charge_data_from_product_selector(
     {
         product_prices.remove(pos)
     } else {
-        return Err(ApiError::InvalidInput(
-            "Could not find a valid price for the user's country".to_string(),
-        ));
+        return Err(ApiError::Request(eyre::eyre!(
+            "Could not find a valid price for the user's country",
+        )));
     };
 
     let price = match price_item.prices {
         Price::OneTime { price } => price,
         Price::Recurring { ref intervals } => {
-            let interval = interval.ok_or_else(|| {
-                ApiError::InvalidInput(
-                    "Could not find a valid price for the user's country"
-                        .to_string(),
-                )
+            let interval = interval.wrap_request_err_with(|| {
+                "could not find a valid price for the user's country"
+                    .to_string()
             })?;
 
-            *intervals.get(&interval).ok_or_else(|| {
-                ApiError::InvalidInput(
-                    "Could not find a valid price for the user's country"
-                        .to_string(),
-                )
+            *intervals.get(&interval).wrap_request_err_with(|| {
+                "could not find a valid price for the user's country"
+                    .to_string()
             })?
         }
     };
@@ -791,7 +820,8 @@ async fn derive_charge_data_from_product_selector(
                 user_id.into(),
                 pool,
             )
-            .await?;
+            .await
+            .wrap_internal_err("fetching user subscriptions from database")?;
 
         let user_products = product_item::DBProductPrice::get_many(
             &user_subscriptions
@@ -801,15 +831,16 @@ async fn derive_charge_data_from_product_selector(
                 .collect::<Vec<_>>(),
             pool,
         )
-        .await?;
+        .await
+        .wrap_internal_err("fetching product prices from database")?;
 
         if user_products
             .into_iter()
             .any(|x| x.product_id == product.id)
         {
-            return Err(ApiError::InvalidInput(
-                "You are already subscribed to this product!".to_string(),
-            ));
+            return Err(ApiError::Request(eyre::eyre!(
+                "You are already subscribed to this product!",
+            )));
         }
     }
 
diff --git a/apps/labrinth/src/routes/internal/billing/update_subscriptions.rs b/apps/labrinth/src/routes/internal/billing/update_subscriptions.rs
index cc003d4d22..592d11a00a 100644
--- a/apps/labrinth/src/routes/internal/billing/update_subscriptions.rs
+++ b/apps/labrinth/src/routes/internal/billing/update_subscriptions.rs
@@ -104,7 +104,10 @@ pub async fn update_many(
             *region = Some(new_region);
         }
 
-        subscription.upsert(&mut txn).await?;
+        subscription
+            .upsert(&mut txn)
+            .await
+            .wrap_internal_err("updating uuid in database")?;
     }
 
     txn.commit()
diff --git a/apps/labrinth/src/routes/internal/blocked_users.rs b/apps/labrinth/src/routes/internal/blocked_users.rs
index 67b305970d..acffff0475 100644
--- a/apps/labrinth/src/routes/internal/blocked_users.rs
+++ b/apps/labrinth/src/routes/internal/blocked_users.rs
@@ -2,6 +2,7 @@ use crate::database::PgPool;
 use crate::database::models::DBUserId;
 use crate::database::models::blocked_user_item::DBBlockedUser;
 use crate::routes::ApiError;
+use crate::util::error::Context as _;
 use crate::util::guards::admin_key_guard;
 use actix_web::{get, web};
 use ariadne::ids::base62_impl::parse_base62;
@@ -25,17 +26,20 @@ pub async fn block_status(
 ) -> Result<web::Json<BlockStatus>, ApiError> {
     let (user_id, target_id) = info.into_inner();
 
-    let user_id =
-        DBUserId(parse_base62(&user_id).map_err(|_| {
-            ApiError::InvalidInput("invalid user_id".to_string())
-        })? as i64);
-    let target_id =
-        DBUserId(parse_base62(&target_id).map_err(|_| {
-            ApiError::InvalidInput("invalid target_id".to_string())
-        })? as i64);
+    let user_id = DBUserId(
+        parse_base62(&user_id)
+            .map_err(|err| eyre::eyre!(err))
+            .wrap_request_err("invalid user_id".to_string())? as i64,
+    );
+    let target_id = DBUserId(
+        parse_base62(&target_id)
+            .map_err(|err| eyre::eyre!(err))
+            .wrap_request_err("invalid target_id".to_string())? as i64,
+    );
 
-    let blocked =
-        DBBlockedUser::is_blocked(user_id, target_id, &**pool).await?;
+    let blocked = DBBlockedUser::is_blocked(user_id, target_id, &**pool)
+        .await
+        .wrap_internal_err("checking whether user is blocked")?;
 
     Ok(web::Json(BlockStatus { blocked }))
 }
diff --git a/apps/labrinth/src/routes/internal/campaign.rs b/apps/labrinth/src/routes/internal/campaign.rs
index 5da7ebc414..4e317bfdbd 100644
--- a/apps/labrinth/src/routes/internal/campaign.rs
+++ b/apps/labrinth/src/routes/internal/campaign.rs
@@ -1,3 +1,4 @@
+use crate::util::error::ApiContext as _;
 use actix_web::{HttpRequest, get, post, web};
 use base64::Engine;
 use chrono::{DateTime, Duration, Utc};
@@ -158,7 +159,8 @@ pub async fn tiltify_webhook(
     payouts_queue: web::Data<PayoutsQueue>,
     body: String,
 ) -> Result<(), ApiError> {
-    verify_tiltify_webhook_signature(&req, &body)?;
+    verify_tiltify_webhook_signature(&req, &body)
+        .wrap_api_err("executing `verify_tiltify_webhook_signature`")?;
 
     let raw_payload = serde_json::from_str::<serde_json::Value>(&body)
         .wrap_internal_err_with(|| eyre!("invalid Tiltify webhook JSON"))?;
@@ -181,7 +183,9 @@ pub async fn tiltify_webhook(
         .begin()
         .await
         .wrap_internal_err("beginning transaction")?;
-    let id = generate_campaign_donation_id(&mut transaction).await?;
+    let id = generate_campaign_donation_id(&mut transaction)
+        .await
+        .wrap_internal_err("generating campaign donation ID")?;
 
     let mut donation = CampaignDonation {
         id,
@@ -377,7 +381,8 @@ pub async fn pride_26(
             total_donations_usd: response.data.total_amount_raised.value,
             target_usd: response.data.goal.value,
             num_donators: num_donators(&http, &access_token, campaign_id)
-                .await?,
+                .await
+                .wrap_api_err("executing `num_donators`")?,
             cached_at: Utc::now(),
         };
 
diff --git a/apps/labrinth/src/routes/internal/delphi/mod.rs b/apps/labrinth/src/routes/internal/delphi/mod.rs
index 1a5d9e55fb..ef265171d2 100644
--- a/apps/labrinth/src/routes/internal/delphi/mod.rs
+++ b/apps/labrinth/src/routes/internal/delphi/mod.rs
@@ -1,3 +1,4 @@
+use crate::util::error::ApiContext as _;
 use std::{collections::HashMap, fmt::Write, time::Instant};
 use xredis::RedisPool;
 
@@ -156,7 +157,7 @@ pub async fn ingest_report(
     let report = serde_json::from_value::<DelphiReport>(report.clone())
         .wrap_internal_err_with(|| {
             eyre!(
-                "Delphi sent a response which does not match our schema\n\n{}",
+                "received a Delphi response which does not match our schema\n\n{}",
                 serde_json::to_string_pretty(&report).unwrap()
             )
         })?;
@@ -251,7 +252,8 @@ async fn ingest_report_deserialized(
         tech_review_sync::TechReviewExitReason::Resolved,
         &mut transaction,
     )
-    .await?;
+    .await
+    .wrap_api_err("synchronizing project technical-review state")?;
 
     transaction
         .commit()
@@ -278,7 +280,7 @@ pub async fn run(
         run_parameters.file_id.0 as i64
     )
     .fetch_one(exec)
-    .await?;
+    .await.wrap_internal_err("fetching file from database")?;
 
     tracing::debug!(
         "Running Delphi for project {}, version {}, file {}",
@@ -297,7 +299,7 @@ pub async fn run(
         .send()
         .await
         .and_then(|res| res.error_for_status())
-        .map_err(ApiError::delphi)?;
+        .wrap_internal_err("requesting a Delphi scan")?;
 
     Ok(HttpResponse::NoContent().finish())
 }
@@ -325,7 +327,8 @@ pub async fn _run(
         &session_queue,
         Scopes::PROJECT_READ,
     )
-    .await?;
+    .await
+    .wrap_auth_err("authenticating API request")?;
 
     run(&**pool, run_parameters.into_inner(), &http).await
 }
@@ -350,12 +353,14 @@ pub async fn version(
         &session_queue,
         Scopes::PROJECT_READ,
     )
-    .await?;
+    .await
+    .wrap_auth_err("authenticating API request")?;
 
     Ok(HttpResponse::Ok().json(
         sqlx::query_scalar!("SELECT MAX(delphi_version) FROM delphi_reports")
             .fetch_one(&**pool)
-            .await?,
+            .await
+            .wrap_internal_err("deserializing HTTP response")?,
     ))
 }
 
@@ -380,7 +385,8 @@ pub async fn issue_type_schema(
         &session_queue,
         Scopes::PROJECT_READ,
     )
-    .await?;
+    .await
+    .wrap_auth_err("deserializing HTTP response")?;
 
     // This route is expected to be called often by the frontend, and Delphi is not necessarily
     // built to scale beyond malware analysis, so cache the result of its quasi-constant-valued
@@ -401,10 +407,10 @@ pub async fn issue_type_schema(
                         .send()
                         .await
                         .and_then(|res| res.error_for_status())
-                        .map_err(ApiError::delphi)?
+                        .wrap_internal_err("fetching the Delphi schema")?
                         .json::<serde_json::Map<String, serde_json::Value>>()
                         .await
-                        .map_err(ApiError::delphi)?,
+                        .wrap_internal_err("deserializing the Delphi schema")?,
                     Instant::now(),
                 ))
                 .0,
diff --git a/apps/labrinth/src/routes/internal/delphi/tech_review_sync.rs b/apps/labrinth/src/routes/internal/delphi/tech_review_sync.rs
index e67c9e517e..ca80c6e9e9 100644
--- a/apps/labrinth/src/routes/internal/delphi/tech_review_sync.rs
+++ b/apps/labrinth/src/routes/internal/delphi/tech_review_sync.rs
@@ -38,6 +38,7 @@
 //! to act as a single chokepoint which (correctly) syncs all the state, instead
 //! of having each mutation run its own ad-hoc update logic.
 
+use crate::util::error::ApiContext as _;
 use itertools::Itertools;
 
 use crate::{
@@ -170,7 +171,9 @@ pub async fn sync_project_tech_review_state(
             last_tech_review_message_type: row.last_tech_review_message_type,
         };
 
-        sync_one_project_tech_review_state(state, exit_reason, txn).await?;
+        sync_one_project_tech_review_state(state, exit_reason, txn)
+            .await
+            .wrap_api_err("executing `sync_one_project_tech_review_state`")?;
     }
 
     Ok(())
@@ -245,7 +248,8 @@ pub async fn sync_deleted_project_tech_review_exit(
         && should_send_exit(row.last_tech_review_message_type.as_deref())
     {
         insert_exit_message(thread_id, TechReviewExitReason::FileDeleted, txn)
-            .await?;
+            .await
+            .wrap_api_err("executing `insert_exit_message`")?;
     }
 
     Ok(())
@@ -275,7 +279,9 @@ async fn sync_one_project_tech_review_state(
             // an append-only project tech review event table where the latest
             // enter/exit event is the current state. Until then, this dummy
             // issue detail acts as the pending queue blocker.
-            ensure_dummy_issue_detail(report_id, txn).await?;
+            ensure_dummy_issue_detail(report_id, txn)
+                .await
+                .wrap_api_err("validating dummy issue detail")?;
         }
 
         if let Some(thread_id) = state.thread_id
@@ -301,7 +307,9 @@ async fn sync_one_project_tech_review_state(
             == Some(MessageBody::TechReviewEntered.as_ref())
     {
         if let Some(report_id) = state.report_id {
-            ensure_dummy_issue_detail(report_id, txn).await?;
+            ensure_dummy_issue_detail(report_id, txn)
+                .await
+                .wrap_api_err("validating dummy issue detail")?;
         }
 
         return Ok(());
@@ -310,7 +318,9 @@ async fn sync_one_project_tech_review_state(
     if let Some(thread_id) = state.thread_id
         && should_send_exit(state.last_tech_review_message_type.as_deref())
     {
-        insert_exit_message(thread_id, exit_reason, txn).await?;
+        insert_exit_message(thread_id, exit_reason, txn)
+            .await
+            .wrap_api_err("executing `insert_exit_message`")?;
     }
 
     Ok(())
diff --git a/apps/labrinth/src/routes/internal/external_notifications.rs b/apps/labrinth/src/routes/internal/external_notifications.rs
index 122edfbf79..e43eae6c54 100644
--- a/apps/labrinth/src/routes/internal/external_notifications.rs
+++ b/apps/labrinth/src/routes/internal/external_notifications.rs
@@ -1,3 +1,5 @@
+use crate::util::error::ApiContext as _;
+use crate::util::error::Context as _;
 use std::collections::HashMap;
 
 use crate::auth::get_user_from_headers;
@@ -152,16 +154,23 @@ async fn create_impl(
         .map(|x| DBUserId(*x))
         .collect::<Vec<_>>();
 
-    let mut txn = pool.begin().await?;
+    let mut txn = pool
+        .begin()
+        .await
+        .wrap_internal_err("starting database transaction")?;
 
-    if !DBUser::exists_many(&user_ids, &mut txn).await? {
-        return Err(ApiError::InvalidInput(
+    if !DBUser::exists_many(&user_ids, &mut txn)
+        .await
+        .wrap_internal_err("fetching users from database")?
+    {
+        return Err(ApiError::Request(eyre::eyre!(
             "One of the specified users do not exist.".to_owned(),
-        ));
+        )));
     }
 
     // Skip users who already have an identical notification
-    let body_value = serde_json::value::to_value(&body)?;
+    let body_value = serde_json::value::to_value(&body)
+        .wrap_request_err("serializing external notification body")?;
     let already_notified = sqlx::query!(
         "
         SELECT DISTINCT user_id
@@ -172,7 +181,8 @@ async fn create_impl(
         body_value,
     )
     .fetch_all(&mut txn)
-    .await?
+    .await
+    .wrap_internal_err("fetching already notified from database")?
     .into_iter()
     .map(|row| DBUserId(row.user_id))
     .collect::<std::collections::HashSet<_>>();
@@ -188,7 +198,8 @@ async fn create_impl(
     let notification_ids = if email_strategy == EmailStrategy::Async {
         notification_builder
             .insert_many(notification_user_ids, &mut txn, &redis)
-            .await?
+            .await
+            .wrap_internal_err("inserting notification IDs into database")?
     } else {
         notification_builder
             .insert_many_without_delivery(
@@ -196,22 +207,31 @@ async fn create_impl(
                 &mut txn,
                 &redis,
             )
-            .await?
+            .await
+            .wrap_internal_err("inserting database records for `create_impl`")?
     };
 
     let notifications =
-        get_site_exposed_notifications(&notification_ids, &mut txn).await?;
+        get_site_exposed_notifications(&notification_ids, &mut txn)
+            .await
+            .wrap_api_err("fetching site exposed notifications")?;
 
-    txn.commit().await?;
+    txn.commit()
+        .await
+        .wrap_internal_err("committing database transaction")?;
 
     broadcast_notifications(&redis, notifications).await;
 
     if email_strategy == EmailStrategy::Sync {
-        let mut email_txn = pool.begin().await?;
+        let mut email_txn = pool
+            .begin()
+            .await
+            .wrap_internal_err("starting database transaction")?;
 
         let mut failed = HashMap::new();
         let users = DBUser::get_many_ids(&user_ids, &mut email_txn, &redis)
-            .await?
+            .await
+            .wrap_internal_err("fetching users from database")?
             .into_iter()
             .map(|user| (user.id, user))
             .collect::<HashMap<_, _>>();
@@ -242,10 +262,7 @@ async fn create_impl(
                     }
                 }
                 Err(error) => {
-                    if matches!(
-                        error,
-                        ApiError::SqlxDatabase(_) | ApiError::Database(_)
-                    ) {
+                    if matches!(error, ApiError::Internal(_)) {
                         return Err(error);
                     };
                     failed.insert(user_id, error.into());
@@ -253,7 +270,10 @@ async fn create_impl(
             };
         }
 
-        email_txn.commit().await?;
+        email_txn
+            .commit()
+            .await
+            .wrap_internal_err("committing database transaction")?;
 
         let status = if failed
             .values()
@@ -310,14 +330,20 @@ pub async fn remove(
         .map(|x| DBUserId(x.0 as i64))
         .collect::<Vec<_>>();
 
-    let mut txn = pool.begin().await?;
+    let mut txn = pool
+        .begin()
+        .await
+        .wrap_internal_err("starting database transaction")?;
 
     DBNotification::remove_many_matching_body(
         &filters, &user_ids, &mut txn, &redis,
     )
-    .await?;
+    .await
+    .wrap_internal_err("deleting notifications from database")?;
 
-    txn.commit().await?;
+    txn.commit()
+        .await
+        .wrap_internal_err("committing database transaction")?;
 
     Ok(HttpResponse::NoContent().finish())
 }
@@ -350,13 +376,14 @@ pub async fn send_custom_email(
         &session_queue,
         Scopes::SESSION_ACCESS,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     if user.role != Role::Admin {
-        return Err(ApiError::CustomAuthentication(
-            "You do not have permission to send custom emails!".to_string(),
-        ));
+        return Err(ApiError::Auth(eyre::eyre!(
+            "You do not have permission to send custom emails!",
+        )));
     }
 
     let SendEmail {
@@ -371,7 +398,10 @@ pub async fn send_custom_email(
         .map(|x| DBUserId(x.0 as i64))
         .collect::<Vec<_>>();
 
-    let mut txn = pool.begin().await?;
+    let mut txn = pool
+        .begin()
+        .await
+        .wrap_internal_err("starting database transaction")?;
 
     NotificationBuilder {
         body: NotificationBody::Custom {
@@ -381,9 +411,12 @@ pub async fn send_custom_email(
         },
     }
     .insert_many(users, &mut txn, &redis)
-    .await?;
+    .await
+    .wrap_internal_err("inserting database records for `send_custom_email`")?;
 
-    txn.commit().await?;
+    txn.commit()
+        .await
+        .wrap_internal_err("committing database transaction")?;
 
     Ok(HttpResponse::Accepted().finish())
 }
@@ -404,13 +437,15 @@ async fn get_site_exposed_notifications(
         &raw_ids[..],
     )
     .fetch_all(&mut *txn)
-    .await?
+    .await
+    .wrap_internal_err("fetching exposed IDs from database")?
     .into_iter()
     .map(DBNotificationId)
     .collect::<Vec<_>>();
 
     Ok(DBNotification::get_many(&exposed_ids, txn)
-        .await?
+        .await
+        .wrap_internal_err("fetching notifications from database")?
         .into_iter()
         .map(Notification::from)
         .collect())
diff --git a/apps/labrinth/src/routes/internal/flows.rs b/apps/labrinth/src/routes/internal/flows.rs
index fd70c60c55..4bf40c8d20 100644
--- a/apps/labrinth/src/routes/internal/flows.rs
+++ b/apps/labrinth/src/routes/internal/flows.rs
@@ -20,6 +20,7 @@ use crate::queue::session::AuthQueue;
 use crate::routes::ApiError;
 use crate::routes::internal::session::issue_session;
 use crate::util::captcha::check_hcaptcha;
+use crate::util::error::ApiContext as _;
 use crate::util::error::Context;
 use crate::util::ext::get_image_ext;
 use crate::util::img::upload_image_optimized;
@@ -1477,14 +1478,21 @@ pub async fn create_oauth_account(
     redis: Data<RedisPool>,
     web::Json(new_account): web::Json<NewOAuthAccount>,
 ) -> Result<HttpResponse, ApiError> {
-    new_account.validate().map_err(|err| {
-        ApiError::InvalidInput(validation_errors_to_string(err, None))
-    })?;
+    new_account
+        .validate()
+        .map_err(|err| eyre::eyre!(err))
+        .wrap_request_err("validating request")?;
 
-    validate_account_consent(new_account.account_consent)?;
+    validate_account_consent(new_account.account_consent)
+        .wrap_api_err("validating account consent")?;
 
-    if !check_hcaptcha(&req, &new_account.challenge).await? {
-        return Err(ApiError::Turnstile);
+    if !check_hcaptcha(&req, &new_account.challenge)
+        .await
+        .wrap_api_err("checking captcha response")?
+    {
+        return Err(ApiError::Request(eyre::eyre!(
+            "captcha validation failed"
+        )));
     }
 
     let flow = DBFlow::get(&new_account.state, &redis)
@@ -1502,7 +1510,8 @@ pub async fn create_oauth_account(
     };
 
     if let Some(email) = &user.email {
-        ensure_email_domain_is_allowed(email)?;
+        ensure_email_domain_is_allowed(email)
+            .wrap_api_err("validating email domain is allowed")?;
     }
 
     let mut txn = db
@@ -1520,11 +1529,16 @@ pub async fn create_oauth_account(
             new_account.username,
             new_account.sign_up_newsletter,
         )
-        .await?;
+        .await
+        .wrap_auth_err("inserting user ID into database")?;
 
-    let session = issue_session(req, user_id, &mut txn, &redis, None).await?;
+    let session = issue_session(req, user_id, &mut txn, &redis, None)
+        .await
+        .wrap_auth_err("authenticating API request")?;
     let res = crate::models::sessions::Session::from(session, true, None);
-    txn.commit().await?;
+    txn.commit()
+        .await
+        .wrap_internal_err("committing database transaction")?;
 
     Ok(HttpResponse::Ok().json(res))
 }
@@ -1585,7 +1599,8 @@ pub async fn discord_community_link(
         &session_queue,
         Scopes::SESSION_ACCESS,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     let Some(discord_id) = db_user.discord_id else {
@@ -1656,23 +1671,30 @@ pub async fn delete_auth_provider(
         &session_queue,
         Scopes::USER_AUTH_WRITE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     if user.auth_providers.is_none_or(|x| x.len() <= 1)
         && !user.has_password.unwrap_or(false)
     {
-        return Err(ApiError::InvalidInput(
-            "You must have another authentication method added to this account!".to_string(),
-        ));
+        return Err(ApiError::Request(eyre::eyre!(
+            "You must have another authentication method added to this account!",
+        )));
     }
 
-    let mut transaction = pool.begin().await?;
+    let mut transaction = pool
+        .begin()
+        .await
+        .wrap_internal_err("starting database transaction")?;
 
     delete_provider
         .provider
         .update_user_id(user.id.into(), None, &mut transaction)
-        .await?;
+        .await
+        .wrap_auth_err(
+            "updating database records for `delete_auth_provider`",
+        )?;
 
     if delete_provider.provider != AuthProvider::PayPal {
         NotificationBuilder {
@@ -1681,15 +1703,22 @@ pub async fn delete_auth_provider(
             },
         }
         .insert(user.id.into(), &mut transaction, &redis)
-        .await?;
+        .await
+        .wrap_internal_err(
+            "inserting database records for `delete_auth_provider`",
+        )?;
     }
 
-    transaction.commit().await?;
+    transaction
+        .commit()
+        .await
+        .wrap_internal_err("committing database transaction")?;
     crate::database::models::DBUser::clear_caches(
         &[(user.id.into(), None)],
         &redis,
     )
-    .await?;
+    .await
+    .wrap_internal_err("clearing cached data from Redis")?;
 
     Ok(HttpResponse::NoContent().finish())
 }
@@ -1779,6 +1808,18 @@ impl AccountRegisterValidateError {
             AccountRegisterValidateError::InvalidInput(_) => "invalid_input",
         }
     }
+
+    fn into_api_error(self) -> ApiError {
+        match &self {
+            Self::UsernameTaken => {
+                ApiError::Auth(eyre::eyre!(AuthenticationError::UsernameTaken))
+            }
+            Self::DuplicateEmail => {
+                ApiError::Auth(eyre::eyre!(AuthenticationError::DuplicateEmail))
+            }
+            _ => ApiError::Request(eyre::eyre!("{self}")),
+        }
+    }
 }
 
 impl actix_web::ResponseError for AccountRegisterValidateError {
@@ -1795,20 +1836,6 @@ impl actix_web::ResponseError for AccountRegisterValidateError {
     }
 }
 
-impl From<AccountRegisterValidateError> for ApiError {
-    fn from(value: AccountRegisterValidateError) -> Self {
-        match &value {
-            AccountRegisterValidateError::UsernameTaken => {
-                ApiError::Authentication(AuthenticationError::UsernameTaken)
-            }
-            AccountRegisterValidateError::DuplicateEmail => {
-                ApiError::Authentication(AuthenticationError::DuplicateEmail)
-            }
-            _ => ApiError::InvalidInput(value.to_string()),
-        }
-    }
-}
-
 impl From<NewAccount> for AccountRegisterFlow {
     fn from(account: NewAccount) -> Self {
         Self {
@@ -1862,9 +1889,12 @@ fn ensure_email_domain_is_allowed(email: &str) -> Result<(), ApiError> {
 }
 
 async fn ensure_email_is_usable(email: &str) -> Result<(), ApiError> {
-    ensure_email_domain_is_allowed(email)?;
+    ensure_email_domain_is_allowed(email)
+        .wrap_api_err("validating email domain is allowed")?;
 
-    let result = check_email(email).await.map_err(ApiError::Request)?;
+    let result = check_email(email)
+        .await
+        .wrap_request_err("checking email address")?;
 
     if matches!(
         result,
@@ -1941,16 +1971,18 @@ impl ReadyAccountRegisterFlow {
     ) -> Result<crate::models::sessions::Session, ApiError> {
         let register_flow = self.inner;
 
-        let user_id =
-            crate::database::models::generate_user_id(transaction).await?;
+        let user_id = crate::database::models::generate_user_id(transaction)
+            .await
+            .wrap_internal_err("generating user ID")?;
 
         let hasher = Argon2::default();
         let salt = SaltString::generate(&mut ChaCha20Rng::from_entropy());
         let password_hash = hasher
-            .hash_password(register_flow.password.as_bytes(), &salt)?
+            .hash_password(register_flow.password.as_bytes(), &salt)
+            .wrap_internal_err("hashing password")?
             .to_string();
 
-        crate::database::models::DBUser {
+        let insert_result = crate::database::models::DBUser {
             id: user_id,
             github_id: None,
             discord_id: None,
@@ -1980,41 +2012,51 @@ impl ReadyAccountRegisterFlow {
             eligibility_verified_at: Some(Utc::now()),
         }
         .insert(transaction)
-        .await
-        .map_err(|err| {
-            if let sqlx::Error::Database(database_error) = &err {
-                match database_error.constraint() {
-                    Some("username_unique" | "users_username_key") => {
-                        return ApiError::from(
-                            AccountRegisterValidateError::UsernameTaken,
-                        );
+        .await;
+        match insert_result {
+            Ok(()) => {}
+            Err(err) => {
+                if let sqlx::Error::Database(database_error) = &err {
+                    match database_error.constraint() {
+                        Some("username_unique" | "users_username_key") => {
+                            return Err(
+                                AccountRegisterValidateError::UsernameTaken
+                                    .into_api_error(),
+                            );
+                        }
+                        Some("email_unique" | "users_email_key") => {
+                            return Err(
+                                AccountRegisterValidateError::DuplicateEmail
+                                    .into_api_error(),
+                            );
+                        }
+                        _ => {}
                     }
-                    Some("email_unique" | "users_email_key") => {
-                        return ApiError::from(
-                            AccountRegisterValidateError::DuplicateEmail,
-                        );
-                    }
-                    _ => {}
                 }
+
+                return Err(ApiError::Internal(eyre::eyre!(
+                    "inserting registered user: {err}"
+                )));
             }
+        }
 
-            ApiError::from(err)
-        })?;
-
-        let session =
-            issue_session(req, user_id, transaction, redis, None).await?;
+        let session = issue_session(req, user_id, transaction, redis, None)
+            .await
+            .wrap_auth_err("authenticating API request")?;
         let res = crate::models::sessions::Session::from(session, true, None);
 
-        let mailbox: Mailbox = register_flow.email.parse().map_err(|_| {
-            ApiError::InvalidInput("Invalid email address!".to_string())
-        })?;
+        let mailbox: Mailbox = register_flow
+            .email
+            .parse()
+            .wrap_request_err("invalid email address!".to_string())?;
 
         let flow = DBFlow::ConfirmEmail {
             user_id,
             confirm_email: register_flow.email.clone(),
         }
         .insert(Duration::hours(24), redis)
-        .await?;
+        .await
+        .wrap_internal_err("storing email-verification flow in Redis")?;
 
         email_queue
             .send_one(
@@ -2023,8 +2065,10 @@ impl ReadyAccountRegisterFlow {
                 user_id,
                 mailbox,
             )
-            .await?
-            .as_user_error()?;
+            .await
+            .wrap_api_err("sending account email")?
+            .as_user_error()
+            .wrap_api_err("validating email delivery status")?;
 
         Ok(res)
     }
@@ -2079,26 +2123,40 @@ pub async fn create_account_with_password(
 ) -> Result<HttpResponse, ApiError> {
     let new_account = new_account.into_inner();
 
-    validate_account_consent(new_account.account_consent)?;
+    validate_account_consent(new_account.account_consent)
+        .wrap_api_err("validating account consent")?;
 
     if !check_hcaptcha(&req, new_account.challenge.as_deref().unwrap_or(""))
-        .await?
+        .await
+        .wrap_api_err("checking captcha response")?
     {
-        return Err(ApiError::Turnstile);
+        return Err(ApiError::Request(eyre::eyre!(
+            "captcha validation failed"
+        )));
     }
 
-    ensure_email_is_usable(&new_account.email).await?;
+    ensure_email_is_usable(&new_account.email)
+        .await
+        .wrap_api_err("validating email is usable")?;
 
-    let mut transaction = pool.begin().await?;
+    let mut transaction = pool
+        .begin()
+        .await
+        .wrap_internal_err("starting database transaction")?;
 
     let ready_flow = AccountRegisterFlow::from(new_account)
         .validate(&mut transaction, &redis)
-        .await?;
+        .await
+        .wrap_internal_err("validating ready flow")?;
 
     let res = ready_flow
         .execute(req, &mut transaction, &redis, &email)
-        .await?;
-    transaction.commit().await?;
+        .await
+        .wrap_api_err("executing `execute`")?;
+    transaction
+        .commit()
+        .await
+        .wrap_internal_err("committing database transaction")?;
 
     Ok(HttpResponse::Ok().json(res))
 }
@@ -2129,8 +2187,13 @@ pub async fn login_password(
     redis: Data<RedisPool>,
     login: web::Json<Login>,
 ) -> Result<HttpResponse, ApiError> {
-    if !check_hcaptcha(&req, &login.challenge).await? {
-        return Err(ApiError::Turnstile);
+    if !check_hcaptcha(&req, &login.challenge)
+        .await
+        .wrap_api_err("checking captcha response")?
+    {
+        return Err(ApiError::Request(eyre::eyre!(
+            "captcha validation failed"
+        )));
     }
 
     let user = if let Some(user) = crate::database::models::DBUser::get(
@@ -2138,7 +2201,8 @@ pub async fn login_password(
         &**pool,
         &redis,
     )
-    .await?
+    .await
+    .wrap_internal_err("fetching user from database")?
     {
         user
     } else {
@@ -2146,12 +2210,16 @@ pub async fn login_password(
             &login.username_or_email,
             &**pool,
         )
-        .await?
-        .ok_or_else(|| AuthenticationError::InvalidCredentials)?;
+        .await
+        .wrap_internal_err("fetching user from database")?
+        .ok_or_else(|| AuthenticationError::InvalidCredentials)
+        .wrap_auth_err("fetching user from database")?;
 
         crate::database::models::DBUser::get_id(user, &**pool, &redis)
-            .await?
-            .ok_or_else(|| AuthenticationError::InvalidCredentials)?
+            .await
+            .wrap_internal_err("fetching user from database")?
+            .ok_or_else(|| AuthenticationError::InvalidCredentials)
+            .wrap_auth_err("fetching user from database")?
     };
 
     let hasher = Argon2::default();
@@ -2161,15 +2229,19 @@ pub async fn login_password(
             &PasswordHash::new(
                 &user
                     .password
-                    .ok_or_else(|| AuthenticationError::InvalidCredentials)?,
-            )?,
+                    .ok_or_else(|| AuthenticationError::InvalidCredentials)
+                    .wrap_auth_err("authenticating API request")?,
+            )
+            .wrap_internal_err("validating data")?,
         )
-        .map_err(|_| AuthenticationError::InvalidCredentials)?;
+        .map_err(|_| AuthenticationError::InvalidCredentials)
+        .wrap_auth_err("authenticating API request")?;
 
     if user.totp_secret.is_some() {
         let flow = DBFlow::Login2FA { user_id: user.id }
             .insert(Duration::minutes(30), &redis)
-            .await?;
+            .await
+            .wrap_internal_err("inserting authentication flow into database")?;
 
         Ok(HttpResponse::Ok().json(serde_json::json!({
             "error": "2fa_required",
@@ -2177,11 +2249,19 @@ pub async fn login_password(
             "flow": flow,
         })))
     } else {
-        let mut transaction = pool.begin().await?;
+        let mut transaction = pool
+            .begin()
+            .await
+            .wrap_internal_err("starting database transaction")?;
         let session =
-            issue_session(req, user.id, &mut transaction, &redis, None).await?;
+            issue_session(req, user.id, &mut transaction, &redis, None)
+                .await
+                .wrap_auth_err("authenticating API request")?;
         let res = crate::models::sessions::Session::from(session, true, None);
-        transaction.commit().await?;
+        transaction
+            .commit()
+            .await
+            .wrap_internal_err("committing database transaction")?;
 
         Ok(HttpResponse::Ok().json(res))
     }
@@ -2285,44 +2365,60 @@ pub async fn login_2fa(
     login: web::Json<Login2FA>,
 ) -> Result<HttpResponse, ApiError> {
     let flow = DBFlow::get(&login.flow, &redis)
-        .await?
-        .ok_or_else(|| AuthenticationError::InvalidCredentials)?;
+        .await
+        .wrap_internal_err("fetching login flow from Redis")?
+        .ok_or_else(|| AuthenticationError::InvalidCredentials)
+        .wrap_auth_err("finding login flow")?;
 
     if let DBFlow::Login2FA { user_id } = flow {
         let user =
             crate::database::models::DBUser::get_id(user_id, &**pool, &redis)
-                .await?
-                .ok_or_else(|| AuthenticationError::InvalidCredentials)?;
+                .await
+                .wrap_internal_err("fetching user from database")?
+                .ok_or_else(|| AuthenticationError::InvalidCredentials)
+                .wrap_auth_err("fetching user from database")?;
 
-        let mut transaction = pool.begin().await?;
+        let mut transaction = pool
+            .begin()
+            .await
+            .wrap_internal_err("starting database transaction")?;
         if !validate_2fa_code(
             login.code.clone(),
             user.totp_secret
-                .ok_or_else(|| AuthenticationError::InvalidCredentials)?,
+                .ok_or_else(|| AuthenticationError::InvalidCredentials)
+                .wrap_auth_err("authenticating API request")?,
             true,
             user.id,
             &redis,
             &pool,
             &mut transaction,
         )
-        .await?
+        .await
+        .wrap_auth_err("authenticating API request")?
         {
-            return Err(ApiError::Authentication(
+            return Err(ApiError::Auth(eyre::eyre!(
                 AuthenticationError::InvalidCredentials,
-            ));
+            )));
         }
-        DBFlow::remove(&login.flow, &redis).await?;
+        DBFlow::remove(&login.flow, &redis)
+            .await
+            .wrap_internal_err("removing authentication flow from Redis")?;
 
         let session =
-            issue_session(req, user_id, &mut transaction, &redis, None).await?;
+            issue_session(req, user_id, &mut transaction, &redis, None)
+                .await
+                .wrap_auth_err("authenticating API request")?;
         let res = crate::models::sessions::Session::from(session, true, None);
-        transaction.commit().await?;
+        transaction
+            .commit()
+            .await
+            .wrap_internal_err("committing database transaction")?;
 
         Ok(HttpResponse::Ok().json(res))
     } else {
-        Err(ApiError::Authentication(
+        Err(ApiError::Auth(eyre::eyre!(
             AuthenticationError::InvalidCredentials,
-        ))
+        )))
     }
 }
 
@@ -2352,7 +2448,8 @@ pub async fn begin_2fa_flow(
         &session_queue,
         Scopes::USER_AUTH_WRITE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     if !user.has_totp.unwrap_or(false) {
@@ -2364,16 +2461,17 @@ pub async fn begin_2fa_flow(
             secret: encoded.to_string(),
         }
         .insert(Duration::minutes(30), &redis)
-        .await?;
+        .await
+        .wrap_internal_err("inserting database records for `begin_2fa_flow`")?;
 
         Ok(HttpResponse::Ok().json(serde_json::json!({
             "secret": encoded.to_string(),
             "flow": flow,
         })))
     } else {
-        Err(ApiError::InvalidInput(
-            "User already has 2FA enabled on their account!".to_string(),
-        ))
+        Err(ApiError::Request(eyre::eyre!(
+            "User already has 2FA enabled on their account!",
+        )))
     }
 }
 
@@ -2398,8 +2496,10 @@ pub async fn finish_2fa_flow(
     session_queue: Data<AuthQueue>,
 ) -> Result<HttpResponse, ApiError> {
     let flow = DBFlow::get(&login.flow, &redis)
-        .await?
-        .ok_or_else(|| AuthenticationError::InvalidCredentials)?;
+        .await
+        .wrap_internal_err("fetching 2FA initialization flow from Redis")?
+        .ok_or_else(|| AuthenticationError::InvalidCredentials)
+        .wrap_auth_err("finding 2FA initialization flow")?;
 
     if let DBFlow::Initialize2FA { user_id, secret } = flow {
         let user = get_user_from_headers(
@@ -2409,16 +2509,20 @@ pub async fn finish_2fa_flow(
             &session_queue,
             Scopes::USER_AUTH_WRITE,
         )
-        .await?
+        .await
+        .wrap_auth_err("authenticating API request")?
         .1;
 
         if user.id != user_id.into() {
-            return Err(ApiError::Authentication(
+            return Err(ApiError::Auth(eyre::eyre!(
                 AuthenticationError::InvalidCredentials,
-            ));
+            )));
         }
 
-        let mut transaction = pool.begin().await?;
+        let mut transaction = pool
+            .begin()
+            .await
+            .wrap_internal_err("starting database transaction")?;
 
         if !validate_2fa_code(
             login.code.clone(),
@@ -2429,14 +2533,17 @@ pub async fn finish_2fa_flow(
             &pool,
             &mut transaction,
         )
-        .await?
+        .await
+        .wrap_auth_err("authenticating API request")?
         {
-            return Err(ApiError::Authentication(
+            return Err(ApiError::Auth(eyre::eyre!(
                 AuthenticationError::InvalidCredentials,
-            ));
+            )));
         }
 
-        DBFlow::remove(&login.flow, &redis).await?;
+        DBFlow::remove(&login.flow, &redis)
+            .await
+            .wrap_internal_err("removing authentication flow from Redis")?;
 
         sqlx::query!(
             "
@@ -2448,7 +2555,8 @@ pub async fn finish_2fa_flow(
             user_id as crate::database::models::ids::DBUserId,
         )
         .execute(&mut transaction)
-        .await?;
+        .await
+        .wrap_internal_err("querying database for `finish_2fa_flow`")?;
 
         sqlx::query!(
             "
@@ -2458,7 +2566,8 @@ pub async fn finish_2fa_flow(
             user_id as crate::database::models::ids::DBUserId,
         )
         .execute(&mut transaction)
-        .await?;
+        .await
+        .wrap_internal_err("querying database for `finish_2fa_flow`")?;
 
         let mut codes = Vec::new();
 
@@ -2479,7 +2588,8 @@ pub async fn finish_2fa_flow(
                 val as i64,
             )
             .execute(&mut transaction)
-            .await?;
+            .await
+            .wrap_internal_err("querying database for `finish_2fa_flow`")?;
 
             codes.push(to_base62(val));
         }
@@ -2488,22 +2598,29 @@ pub async fn finish_2fa_flow(
             body: NotificationBody::TwoFactorEnabled,
         }
         .insert(user.id.into(), &mut transaction, &redis)
-        .await?;
+        .await
+        .wrap_internal_err(
+            "inserting database records for `finish_2fa_flow`",
+        )?;
 
-        transaction.commit().await?;
+        transaction
+            .commit()
+            .await
+            .wrap_internal_err("committing database transaction")?;
         crate::database::models::DBUser::clear_caches(
             &[(user.id.into(), None)],
             &redis,
         )
-        .await?;
+        .await
+        .wrap_internal_err("clearing cached data from Redis")?;
 
         Ok(HttpResponse::Ok().json(serde_json::json!({
             "backup_codes": codes,
         })))
     } else {
-        Err(ApiError::Authentication(
+        Err(ApiError::Auth(eyre::eyre!(
             AuthenticationError::InvalidCredentials,
-        ))
+        )))
     }
 }
 
@@ -2540,23 +2657,26 @@ pub async fn remove_2fa(
         &session_queue,
         false,
     )
-    .await?
-    .ok_or_else(|| AuthenticationError::InvalidCredentials)?;
+    .await
+    .wrap_auth_err("authenticating API request")?
+    .ok_or_else(|| AuthenticationError::InvalidCredentials)
+    .wrap_auth_err("authenticating API request")?;
 
     if !scopes.contains(Scopes::USER_AUTH_WRITE) {
-        return Err(ApiError::Authentication(
+        return Err(ApiError::Auth(eyre::eyre!(
             AuthenticationError::InvalidCredentials,
-        ));
+        )));
     }
 
-    let mut transaction = pool.begin().await?;
+    let mut transaction = pool
+        .begin()
+        .await
+        .wrap_internal_err("starting database transaction")?;
 
     if !validate_2fa_code(
         login.code.clone(),
-        user.totp_secret.ok_or_else(|| {
-            ApiError::InvalidInput(
-                "User does not have 2FA enabled on the account!".to_string(),
-            )
+        user.totp_secret.wrap_request_err_with(|| {
+            "user does not have 2FA enabled on the account!".to_string()
         })?,
         true,
         user.id,
@@ -2564,11 +2684,12 @@ pub async fn remove_2fa(
         &pool,
         &mut transaction,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     {
-        return Err(ApiError::Authentication(
+        return Err(ApiError::Auth(eyre::eyre!(
             AuthenticationError::InvalidCredentials,
-        ));
+        )));
     }
 
     sqlx::query!(
@@ -2580,7 +2701,8 @@ pub async fn remove_2fa(
         user.id as crate::database::models::ids::DBUserId,
     )
     .execute(&mut transaction)
-    .await?;
+    .await
+    .wrap_internal_err("querying database for `remove_2fa`")?;
 
     sqlx::query!(
         "
@@ -2590,17 +2712,23 @@ pub async fn remove_2fa(
         user.id as crate::database::models::ids::DBUserId,
     )
     .execute(&mut transaction)
-    .await?;
+    .await
+    .wrap_internal_err("querying database for `remove_2fa`")?;
 
     NotificationBuilder {
         body: NotificationBody::TwoFactorRemoved,
     }
     .insert(user.id, &mut transaction, &redis)
-    .await?;
+    .await
+    .wrap_internal_err("inserting database records for `remove_2fa`")?;
 
-    transaction.commit().await?;
+    transaction
+        .commit()
+        .await
+        .wrap_internal_err("committing database transaction")?;
     crate::database::models::DBUser::clear_caches(&[(user.id, None)], &redis)
-        .await?;
+        .await
+        .wrap_internal_err("clearing cached data from Redis")?;
 
     Ok(HttpResponse::NoContent().finish())
 }
@@ -2631,18 +2759,27 @@ pub async fn reset_password_begin(
     reset_password: web::Json<ResetPassword>,
     email: web::Data<EmailQueue>,
 ) -> Result<HttpResponse, ApiError> {
-    if !check_hcaptcha(&req, &reset_password.challenge).await? {
-        return Err(ApiError::Turnstile);
+    if !check_hcaptcha(&req, &reset_password.challenge)
+        .await
+        .wrap_api_err("checking captcha response")?
+    {
+        return Err(ApiError::Request(eyre::eyre!(
+            "captcha validation failed"
+        )));
     }
 
-    let mut txn = pool.begin().await?;
+    let mut txn = pool
+        .begin()
+        .await
+        .wrap_internal_err("starting database transaction")?;
 
     let user =
         match crate::database::models::DBUser::get_by_case_insensitive_email(
             &reset_password.username_or_email,
             &mut txn,
         )
-        .await?[..]
+        .await
+        .wrap_internal_err("fetching user from database")?[..]
         {
             [] => {
                 // Try finding by username or ID
@@ -2651,7 +2788,8 @@ pub async fn reset_password_begin(
                     &mut txn,
                     &redis,
                 )
-                .await?
+                .await
+                .wrap_internal_err("fetching user from database")?
             }
             [user_id] => {
                 // If there is only one user with the given email, ignoring case,
@@ -2659,7 +2797,8 @@ pub async fn reset_password_begin(
                 crate::database::models::DBUser::get_id(
                     user_id, &mut txn, &redis,
                 )
-                .await?
+                .await
+                .wrap_internal_err("fetching user from database")?
             }
             _ => {
                 // When several users use variations of the same email with
@@ -2671,12 +2810,16 @@ pub async fn reset_password_begin(
                         &reset_password.username_or_email,
                         &mut txn,
                     )
-                    .await?
+                    .await
+                    .wrap_internal_err(
+                        "fetching password-reset user by email",
+                    )?
                 {
                     crate::database::models::DBUser::get_id(
                         user_id, &mut txn, &redis,
                     )
-                    .await?
+                    .await
+                    .wrap_internal_err("fetching password-reset user by ID")?
                 } else {
                     None
                 }
@@ -2691,7 +2834,8 @@ pub async fn reset_password_begin(
     {
         let flow = DBFlow::ForgotPassword { user_id }
             .insert(Duration::hours(24), &redis)
-            .await?;
+            .await
+            .wrap_internal_err("inserting authentication flow into database")?;
 
         if let Ok(mailbox) = user_email.unwrap_or_default().parse() {
             email
@@ -2701,12 +2845,16 @@ pub async fn reset_password_begin(
                     user_id,
                     mailbox,
                 )
-                .await?
-                .as_user_error()?;
+                .await
+                .wrap_api_err("sending account email")?
+                .as_user_error()
+                .wrap_api_err("validating email delivery status")?;
         }
     }
 
-    txn.commit().await?;
+    txn.commit()
+        .await
+        .wrap_internal_err("committing database transaction")?;
 
     Ok(HttpResponse::Ok().finish())
 }
@@ -2740,20 +2888,24 @@ pub async fn change_password(
     session_queue: Data<AuthQueue>,
 ) -> Result<HttpResponse, ApiError> {
     let user = if let Some(flow) = &change_password.flow {
-        let flow = DBFlow::get(flow, &redis).await?;
+        let flow = DBFlow::get(flow, &redis)
+            .await
+            .wrap_internal_err("fetching password-reset flow from Redis")?;
 
         if let Some(DBFlow::ForgotPassword { user_id }) = flow {
             let user = crate::database::models::DBUser::get_id(
                 user_id, &**pool, &redis,
             )
-            .await?
-            .ok_or_else(|| AuthenticationError::InvalidCredentials)?;
+            .await
+            .wrap_internal_err("fetching user from database")?
+            .ok_or_else(|| AuthenticationError::InvalidCredentials)
+            .wrap_auth_err("fetching user from database")?;
 
             Some(user)
         } else {
-            return Err(ApiError::CustomAuthentication(
-                "The password change flow code is invalid or has expired. Did you copy it promptly and correctly?".to_string(),
-            ));
+            return Err(ApiError::Auth(eyre::eyre!(
+                "The password change flow code is invalid or has expired. Did you copy it promptly and correctly?",
+            )));
         }
     } else {
         None
@@ -2770,33 +2922,43 @@ pub async fn change_password(
             &session_queue,
             false,
         )
-        .await?
-        .ok_or_else(|| AuthenticationError::InvalidCredentials)?;
+        .await
+        .wrap_auth_err("authenticating API request")?
+        .ok_or_else(|| AuthenticationError::InvalidCredentials)
+        .wrap_auth_err("authenticating API request")?;
 
         if !scopes.contains(Scopes::USER_AUTH_WRITE) {
-            return Err(ApiError::Authentication(
+            return Err(ApiError::Auth(eyre::eyre!(
                 AuthenticationError::InvalidCredentials,
-            ));
+            )));
         }
 
         if let Some(pass) = user.password.as_ref() {
-            let old_password = change_password.old_password.as_ref().ok_or_else(|| {
-                ApiError::CustomAuthentication(
-                    "You must specify the old password to change your password!".to_string(),
-                )
-            })?;
+            let old_password = change_password
+                .old_password
+                .as_ref()
+                .wrap_auth_err_with(|| {
+                    "you must specify the old password to change your password!"
+                        .to_string()
+                })?;
 
             let hasher = Argon2::default();
-            hasher.verify_password(
-                old_password.as_bytes(),
-                &PasswordHash::new(pass)?,
-            )?;
+            hasher
+                .verify_password(
+                    old_password.as_bytes(),
+                    &PasswordHash::new(pass)
+                        .wrap_internal_err("validating data")?,
+                )
+                .wrap_internal_err("validating data")?;
         }
 
         user
     };
 
-    let mut transaction = pool.begin().await?;
+    let mut transaction = pool
+        .begin()
+        .await
+        .wrap_internal_err("starting database transaction")?;
 
     let update_password = if let Some(new_password) =
         &change_password.new_password
@@ -2807,21 +2969,25 @@ pub async fn change_password(
         );
 
         if score.score() < Score::Three {
-            return Err(ApiError::InvalidInput(
-                if let Some(feedback) =
-                    score.feedback().and_then(|x| x.warning())
-                {
-                    format!("Password too weak: {feedback}")
-                } else {
-                    "Specified password is too weak! Please improve its strength.".to_string()
-                },
-            ));
+            let report = score
+                .feedback()
+                .and_then(|feedback| feedback.warning())
+                .map_or_else(
+                    || {
+                        eyre::eyre!(
+                            "Specified password is too weak! Please improve its strength."
+                        )
+                    },
+                    |feedback| eyre::eyre!("Password too weak: {feedback}"),
+                );
+            return Err(ApiError::Request(report));
         }
 
         let hasher = Argon2::default();
         let salt = SaltString::generate(&mut ChaCha20Rng::from_entropy());
         let password_hash = hasher
-            .hash_password(new_password.as_bytes(), &salt)?
+            .hash_password(new_password.as_bytes(), &salt)
+            .wrap_internal_err("hashing password")?
             .to_string();
 
         Some(password_hash)
@@ -2833,9 +2999,9 @@ pub async fn change_password(
             || user.steam_id.is_some()
             || user.discord_id.is_some())
         {
-            return Err(ApiError::InvalidInput(
-                "You must have another authentication method added to remove password authentication!".to_string(),
-            ));
+            return Err(ApiError::Request(eyre::eyre!(
+                "You must have another authentication method added to remove password authentication!",
+            )));
         }
 
         None
@@ -2851,10 +3017,13 @@ pub async fn change_password(
         user.id as crate::database::models::ids::DBUserId,
     )
     .execute(&mut transaction)
-    .await?;
+    .await
+    .wrap_internal_err("updating database records for `change_password`")?;
 
     if let Some(flow) = &change_password.flow {
-        DBFlow::remove(flow, &redis).await?;
+        DBFlow::remove(flow, &redis)
+            .await
+            .wrap_internal_err("removing authentication flow from Redis")?;
     }
 
     if update_password.is_some() {
@@ -2862,18 +3031,28 @@ pub async fn change_password(
             body: NotificationBody::PasswordChanged,
         }
         .insert(user.id, &mut transaction, &redis)
-        .await?;
+        .await
+        .wrap_internal_err(
+            "inserting database records for `change_password`",
+        )?;
     } else {
         NotificationBuilder {
             body: NotificationBody::PasswordRemoved,
         }
         .insert(user.id, &mut transaction, &redis)
-        .await?;
+        .await
+        .wrap_internal_err(
+            "inserting database records for `change_password`",
+        )?;
     }
 
-    transaction.commit().await?;
+    transaction
+        .commit()
+        .await
+        .wrap_internal_err("committing database transaction")?;
     crate::database::models::DBUser::clear_caches(&[(user.id, None)], &redis)
-        .await?;
+        .await
+        .wrap_internal_err("clearing cached data from Redis")?;
 
     Ok(HttpResponse::Ok().finish())
 }
@@ -2907,13 +3086,15 @@ pub async fn set_email(
     session_queue: Data<AuthQueue>,
     stripe_client: Data<stripe::Client>,
 ) -> Result<HttpResponse, ApiError> {
-    email_address.0.validate().map_err(|err| {
-        ApiError::InvalidInput(validation_errors_to_string(err, None))
-    })?;
+    email_address
+        .0
+        .validate()
+        .wrap_request_err("validating request")?;
 
-    let mailbox: Mailbox = email_address.email.parse().map_err(|_| {
-        ApiError::InvalidInput("Invalid email address!".to_string())
-    })?;
+    let mailbox: Mailbox = email_address
+        .email
+        .parse()
+        .wrap_request_err("invalid email address!".to_string())?;
 
     let user = get_user_from_headers(
         &req,
@@ -2922,24 +3103,31 @@ pub async fn set_email(
         &session_queue,
         Scopes::USER_AUTH_WRITE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     if !crate::database::models::DBUser::get_by_case_insensitive_email(
         &email_address.email,
         &**pool,
     )
-    .await?
+    .await
+    .wrap_internal_err("fetching user from database")?
     .is_empty()
     {
-        return Err(ApiError::InvalidInput(
-            "Email is already registered on Modrinth! Try 'Forgot password' in incognito to access and delete your other account.".to_string(),
-        ));
+        return Err(ApiError::Request(eyre::eyre!(
+            "Email is already registered on Modrinth! Try 'Forgot password' in incognito to access and delete your other account.",
+        )));
     }
 
-    ensure_email_is_usable(&email_address.email).await?;
+    ensure_email_is_usable(&email_address.email)
+        .await
+        .wrap_api_err("validating email is usable")?;
 
-    let mut transaction = pool.begin().await?;
+    let mut transaction = pool
+        .begin()
+        .await
+        .wrap_internal_err("starting database transaction")?;
 
     sqlx::query!(
         "
@@ -2951,7 +3139,8 @@ pub async fn set_email(
         user.id.0 as i64,
     )
     .execute(&mut transaction)
-    .await?;
+    .await
+    .wrap_internal_err("querying database for `set_email`")?;
 
     if let Some(user_email) = user.email.clone() {
         NotificationBuilder {
@@ -2961,7 +3150,8 @@ pub async fn set_email(
             },
         }
         .insert(user.id.into(), &mut transaction, &redis)
-        .await?;
+        .await
+        .wrap_internal_err("inserting database records for `set_email`")?;
     }
 
     if let Some(customer_id) = user
@@ -2977,7 +3167,8 @@ pub async fn set_email(
                 ..Default::default()
             },
         )
-        .await?;
+        .await
+        .wrap_failed_dependency_err("communicating with payment provider")?;
     }
 
     let flow = DBFlow::ConfirmEmail {
@@ -2985,7 +3176,8 @@ pub async fn set_email(
         confirm_email: email_address.email.clone(),
     }
     .insert(Duration::hours(24), &redis)
-    .await?;
+    .await
+    .wrap_internal_err("inserting database records for `set_email`")?;
 
     email
         .send_one(
@@ -2994,16 +3186,22 @@ pub async fn set_email(
             user.id.into(),
             mailbox,
         )
-        .await?
-        .as_user_error()?;
+        .await
+        .wrap_api_err("sending account email")?
+        .as_user_error()
+        .wrap_api_err("validating email delivery status")?;
 
-    transaction.commit().await?;
+    transaction
+        .commit()
+        .await
+        .wrap_internal_err("committing database transaction")?;
 
     crate::database::models::DBUser::clear_caches(
         &[(user.id.into(), None)],
         &redis,
     )
-    .await?;
+    .await
+    .wrap_internal_err("clearing cached data from Redis")?;
 
     Ok(HttpResponse::Ok().finish())
 }
@@ -3035,14 +3233,15 @@ pub async fn resend_verify_email(
         &session_queue,
         Scopes::USER_AUTH_WRITE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     if let Some(email_address) = user.email {
         if user.email_verified.unwrap_or(false) {
-            return Err(ApiError::InvalidInput(
-                "User email is already verified!".to_string(),
-            ));
+            return Err(ApiError::Request(eyre::eyre!(
+                "User email is already verified!",
+            )));
         }
 
         let flow = DBFlow::ConfirmEmail {
@@ -3050,13 +3249,19 @@ pub async fn resend_verify_email(
             confirm_email: email_address.clone(),
         }
         .insert(Duration::hours(24), &redis)
-        .await?;
+        .await
+        .wrap_internal_err(
+            "inserting database records for `resend_verify_email`",
+        )?;
 
-        let mailbox: Mailbox = email_address.parse().map_err(|_| {
-            ApiError::InvalidInput("Invalid email address!".to_string())
-        })?;
+        let mailbox: Mailbox = email_address
+            .parse()
+            .wrap_request_err("invalid email address!".to_string())?;
 
-        let mut transaction = pool.begin().await?;
+        let mut transaction = pool
+            .begin()
+            .await
+            .wrap_internal_err("starting database transaction")?;
 
         email
             .send_one(
@@ -3065,16 +3270,21 @@ pub async fn resend_verify_email(
                 user.id.into(),
                 mailbox,
             )
-            .await?
-            .as_user_error()?;
+            .await
+            .wrap_api_err("sending account email")?
+            .as_user_error()
+            .wrap_api_err("validating email delivery status")?;
 
-        transaction.commit().await?;
+        transaction
+            .commit()
+            .await
+            .wrap_internal_err("committing database transaction")?;
 
         Ok(HttpResponse::NoContent().finish())
     } else {
-        Err(ApiError::InvalidInput(
-            "User does not have an email.".to_string(),
-        ))
+        Err(ApiError::Request(eyre::eyre!(
+            "User does not have an email.",
+        )))
     }
 }
 
@@ -3100,7 +3310,9 @@ pub async fn verify_email(
     redis: Data<RedisPool>,
     email: web::Json<VerifyEmail>,
 ) -> Result<HttpResponse, ApiError> {
-    let flow = DBFlow::get(&email.flow, &redis).await?;
+    let flow = DBFlow::get(&email.flow, &redis)
+        .await
+        .wrap_internal_err("fetching email-verification flow from Redis")?;
 
     if let Some(DBFlow::ConfirmEmail {
         user_id,
@@ -3109,17 +3321,21 @@ pub async fn verify_email(
     {
         let user =
             crate::database::models::DBUser::get_id(user_id, &**pool, &redis)
-                .await?
-                .ok_or_else(|| AuthenticationError::InvalidCredentials)?;
+                .await
+                .wrap_internal_err("fetching user from database")?
+                .ok_or_else(|| AuthenticationError::InvalidCredentials)
+                .wrap_auth_err("fetching user from database")?;
 
         if user.email != Some(confirm_email) {
-            return Err(ApiError::InvalidInput(
-                "E-mail does not match verify email. Try re-requesting the verification link."
-                    .to_string(),
-            ));
+            return Err(ApiError::Request(eyre::eyre!(
+                "E-mail does not match verify email. Try re-requesting the verification link.",
+            )));
         }
 
-        let mut transaction = pool.begin().await?;
+        let mut transaction = pool
+            .begin()
+            .await
+            .wrap_internal_err("starting database transaction")?;
 
         sqlx::query!(
             "
@@ -3130,22 +3346,28 @@ pub async fn verify_email(
             user.id as crate::database::models::ids::DBUserId,
         )
         .execute(&mut transaction)
-        .await?;
+        .await
+        .wrap_internal_err("querying database for `verify_email`")?;
 
-        DBFlow::remove(&email.flow, &redis).await?;
-        transaction.commit().await?;
+        DBFlow::remove(&email.flow, &redis)
+            .await
+            .wrap_internal_err("removing authentication flow from Redis")?;
+        transaction
+            .commit()
+            .await
+            .wrap_internal_err("committing database transaction")?;
         crate::database::models::DBUser::clear_caches(
             &[(user.id, None)],
             &redis,
         )
-        .await?;
+        .await
+        .wrap_internal_err("clearing cached data from Redis")?;
 
         Ok(HttpResponse::NoContent().finish())
     } else {
-        Err(ApiError::InvalidInput(
-            "Flow does not exist. Try re-requesting the verification link."
-                .to_string(),
-        ))
+        Err(ApiError::Request(eyre::eyre!(
+            "Flow does not exist. Try re-requesting the verification link.",
+        )))
     }
 }
 
@@ -3175,7 +3397,8 @@ pub async fn subscribe_newsletter(
         &session_queue,
         Scopes::USER_AUTH_WRITE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     sqlx::query!(
@@ -3187,13 +3410,15 @@ pub async fn subscribe_newsletter(
         user.id.0 as i64,
     )
     .execute(&**pool)
-    .await?;
+    .await
+    .wrap_internal_err("querying database for `subscribe_newsletter`")?;
 
     crate::database::models::DBUser::clear_caches(
         &[(user.id.into(), None)],
         &redis,
     )
-    .await?;
+    .await
+    .wrap_internal_err("clearing cached data from Redis")?;
 
     Ok(HttpResponse::NoContent().finish())
 }
@@ -3224,12 +3449,15 @@ pub async fn get_newsletter_subscription_status(
         &session_queue,
         Scopes::USER_READ,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     let is_subscribed = user.is_subscribed_to_newsletter
         || if let Some(email) = user.email {
-            check_sendy_subscription(&email).await?
+            check_sendy_subscription(&email)
+                .await
+                .wrap_auth_err("authenticating API request")?
         } else {
             false
         };
@@ -3275,7 +3503,8 @@ pub async fn register_passkey_start(
         &session_queue,
         Scopes::USER_AUTH_WRITE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     // Get currently registered credentials, so an authenticator knows not to register
@@ -3377,12 +3606,14 @@ pub async fn register_passkey_finish(
         &session_queue,
         Scopes::USER_AUTH_WRITE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
-    response.validate().map_err(|err| {
-        ApiError::InvalidInput(validation_errors_to_string(err, None))
-    })?;
+    response
+        .validate()
+        .map_err(|err| eyre::eyre!(err))
+        .wrap_request_err("validating request")?;
 
     let db_user_id: DBUserId = user.id.into();
     let flow = DBFlow::take_if(
@@ -3390,19 +3621,22 @@ pub async fn register_passkey_finish(
         |f| matches!(f, DBFlow::RegisterPasskey { user_id, .. } if *user_id == db_user_id),
         &redis,
     )
-    .await?;
+    .await.wrap_internal_err("executing `DBFlow::take_if`")?;
     if let Some(DBFlow::RegisterPasskey { user_id, state }) = flow {
         if user_id != db_user_id {
-            return Err(ApiError::Authentication(
+            return Err(ApiError::Auth(eyre::eyre!(
                 AuthenticationError::InvalidCredentials,
-            ));
+            )));
         }
 
         let result = webauthn
             .finish_passkey_registration(&response.credential, &state)
             .wrap_request_err("failed to finish passkey registration")?;
 
-        let mut transaction = pool.begin().await?;
+        let mut transaction = pool
+            .begin()
+            .await
+            .wrap_internal_err("starting database transaction")?;
 
         let existing_passkeys =
             DBPasskey::get_for_user(db_user_id, &mut transaction)
@@ -3431,9 +3665,12 @@ pub async fn register_passkey_finish(
         passkey
             .insert(&mut transaction)
             .await
-            .wrap_internal_err("Failed to create passkey object")?;
+            .wrap_internal_err("failed to create passkey object")?;
 
-        transaction.commit().await?;
+        transaction
+            .commit()
+            .await
+            .wrap_internal_err("committing database transaction")?;
         Ok((
             web::Json(PasskeyResponse {
                 id: passkey.id.into(),
@@ -3524,7 +3761,8 @@ pub async fn authenticate_passkey_finish(
         |f| matches!(f, DBFlow::AuthenticatePasskey { .. }),
         &redis,
     )
-    .await?;
+    .await
+    .wrap_internal_err("executing `DBFlow::take_if`")?;
 
     if let Some(DBFlow::AuthenticatePasskey { state }) = flow {
         let credential_id = response.credential.get_credential_id();
@@ -3532,7 +3770,7 @@ pub async fn authenticate_passkey_finish(
             DBPasskey::get_by_credential_id(credential_id, &**pool)
                 .await
                 .wrap_internal_err("failed to fetch passkey")?
-                .ok_or_else(|| ApiError::Request(eyre!("passkey not found")))?;
+                .wrap_request_err_with(|| "passkey not found")?;
 
         let mut transaction = pool
             .begin()
@@ -3559,7 +3797,10 @@ pub async fn authenticate_passkey_finish(
                 )
                 .await
                 .wrap_internal_err("failed to invalidate user sessions")?;
-                transaction.commit().await?;
+                transaction
+                    .commit()
+                    .await
+                    .wrap_internal_err("committing database transaction")?;
                 DBSession::clear_cache(
                     sessions
                         .into_iter()
@@ -3605,10 +3846,14 @@ pub async fn authenticate_passkey_finish(
             &redis,
             None,
         )
-        .await?;
+        .await
+        .wrap_auth_err("authenticating API request")?;
         let res = crate::models::sessions::Session::from(session, true, None);
 
-        transaction.commit().await?;
+        transaction
+            .commit()
+            .await
+            .wrap_internal_err("committing database transaction")?;
         Ok(web::Json(res))
     } else {
         Err(ApiError::Request(eyre!(
@@ -3643,7 +3888,8 @@ pub async fn list_passkeys(
         &session_queue,
         Scopes::USER_AUTH_WRITE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     let passkeys = DBPasskey::get_for_user(user.id.into(), &**pool)
@@ -3696,29 +3942,36 @@ pub async fn rename_passkey(
         &session_queue,
         Scopes::USER_AUTH_WRITE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
-    body.validate().map_err(|err| {
-        ApiError::InvalidInput(validation_errors_to_string(err, None))
-    })?;
+    body.validate()
+        .map_err(|err| eyre::eyre!(err))
+        .wrap_request_err("validating request")?;
 
     let id = DBPasskeyId(
         parse_base62(&info.into_inner().0)
             .wrap_request_err("invalid passkey id")? as i64,
     );
 
-    let mut transaction = pool.begin().await?;
+    let mut transaction = pool
+        .begin()
+        .await
+        .wrap_internal_err("starting database transaction")?;
 
     let found =
         DBPasskey::rename(id, user.id.into(), &body.name, &mut transaction)
             .await
             .wrap_internal_err("failed to rename passkey")?;
     if !found {
-        return Err(ApiError::NotFound);
+        return Err(ApiError::NotFound(eyre::eyre!("resource not found")));
     }
 
-    transaction.commit().await?;
+    transaction
+        .commit()
+        .await
+        .wrap_internal_err("committing database transaction")?;
     Ok(HttpResponse::NoContent().finish())
 }
 
@@ -3749,7 +4002,8 @@ pub async fn delete_passkey(
         &session_queue,
         Scopes::USER_AUTH_WRITE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     let id = DBPasskeyId(
@@ -3757,16 +4011,22 @@ pub async fn delete_passkey(
             .wrap_request_err("invalid passkey id")? as i64,
     );
 
-    let mut transaction = pool.begin().await?;
+    let mut transaction = pool
+        .begin()
+        .await
+        .wrap_internal_err("starting database transaction")?;
 
     let found =
         DBPasskey::remove_for_user(id, user.id.into(), &mut transaction)
             .await
             .wrap_internal_err("failed to delete passkey")?;
     if !found {
-        return Err(ApiError::NotFound);
+        return Err(ApiError::NotFound(eyre::eyre!("resource not found")));
     }
 
-    transaction.commit().await?;
+    transaction
+        .commit()
+        .await
+        .wrap_internal_err("committing database transaction")?;
     Ok(HttpResponse::NoContent().finish())
 }
diff --git a/apps/labrinth/src/routes/internal/gdpr.rs b/apps/labrinth/src/routes/internal/gdpr.rs
index de25c7746d..479209bd17 100644
--- a/apps/labrinth/src/routes/internal/gdpr.rs
+++ b/apps/labrinth/src/routes/internal/gdpr.rs
@@ -3,6 +3,7 @@ use crate::database::PgPool;
 use crate::models::pats::Scopes;
 use crate::queue::session::AuthQueue;
 use crate::routes::ApiError;
+use crate::util::error::Context as _;
 use actix_web::{HttpRequest, HttpResponse, post, web};
 use xredis::RedisPool;
 
@@ -30,46 +31,52 @@ pub async fn export(
         &session_queue,
         Scopes::SESSION_ACCESS,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     let user_id = user.id.into();
 
     let collection_ids =
         crate::database::models::DBUser::get_collections(user_id, &**pool)
-            .await?;
+            .await
+            .wrap_internal_err("fetching users from database")?;
     let collections = crate::database::models::DBCollection::get_many(
         &collection_ids,
         &**pool,
         &redis,
     )
-    .await?
+    .await
+    .wrap_internal_err("fetching collections from database")?
     .into_iter()
     .map(crate::models::collections::Collection::from)
     .collect::<Vec<_>>();
 
     let follows =
         crate::database::models::DBUser::get_follows(user_id, &**pool)
-            .await?
+            .await
+            .wrap_internal_err("fetching users from database")?
             .into_iter()
             .map(crate::models::ids::ProjectId::from)
             .collect::<Vec<_>>();
 
     let projects =
         crate::database::models::DBUser::get_projects(user_id, &**pool, &redis)
-            .await?
+            .await
+            .wrap_internal_err("fetching users from database")?
             .into_iter()
             .map(crate::models::ids::ProjectId::from)
             .collect::<Vec<_>>();
 
     let org_ids =
         crate::database::models::DBUser::get_organizations(user_id, &**pool)
-            .await?;
+            .await
+            .wrap_internal_err("fetching users from database")?;
     let orgs =
         crate::database::models::organization_item::DBOrganization::get_many_ids(
             &org_ids, &**pool, &redis,
         )
-        .await?
+        .await.wrap_internal_err("fetching organizations from database")?
         .into_iter()
         // TODO: add team members
         .map(|x| crate::models::organizations::Organization::from(x, vec![]))
@@ -78,7 +85,7 @@ pub async fn export(
     let notifs = crate::database::models::notification_item::DBNotification::get_all_user(
         user_id, &**pool,
     )
-    .await?
+    .await.wrap_internal_err("fetching notifications from database")?
     .into_iter()
     .map(crate::models::notifications::Notification::from)
     .collect::<Vec<_>>();
@@ -86,7 +93,7 @@ pub async fn export(
     let notifs_deliveries = crate::database::models::notifications_deliveries_item::DBNotificationDelivery::get_all_user(
         user_id, &**pool,
     )
-    .await?
+    .await.wrap_internal_err("fetching notification deliveries from database")?
     .into_iter()
     .map(crate::models::notifications::NotificationDelivery::from)
     .collect::<Vec<_>>();
@@ -95,7 +102,7 @@ pub async fn export(
         crate::database::models::oauth_client_item::DBOAuthClient::get_all_user_clients(
             user_id, &**pool,
         )
-        .await?
+        .await.wrap_internal_err("fetching OAuth clients from database")?
         .into_iter()
         .map(crate::models::oauth_clients::OAuthClient::from)
         .collect::<Vec<_>>();
@@ -103,7 +110,7 @@ pub async fn export(
     let oauth_authorizations = crate::database::models::oauth_client_authorization_item::DBOAuthClientAuthorization::get_all_for_user(
         user_id, &**pool,
     )
-        .await?
+        .await.wrap_internal_err("fetching OAuth client authorizations from database")?
         .into_iter()
         .map(crate::models::oauth_clients::OAuthClientAuthorization::from)
         .collect::<Vec<_>>();
@@ -112,12 +119,13 @@ pub async fn export(
         crate::database::models::pat_item::DBPersonalAccessToken::get_user_pats(
             user_id, &**pool, &redis,
         )
-        .await?;
+        .await.wrap_internal_err("fetching personal access tokens from database")?;
     let pats =
         crate::database::models::pat_item::DBPersonalAccessToken::get_many_ids(
             &pat_ids, &**pool, &redis,
         )
-        .await?
+        .await
+        .wrap_internal_err("fetching personal access tokens from database")?
         .into_iter()
         .map(|x| crate::models::pats::PersonalAccessToken::from(x, false))
         .collect::<Vec<_>>();
@@ -126,13 +134,15 @@ pub async fn export(
         crate::database::models::payout_item::DBPayout::get_all_for_user(
             user_id, &**pool,
         )
-        .await?;
+        .await
+        .wrap_internal_err("fetching payouts from database")?;
 
     let payouts = crate::database::models::payout_item::DBPayout::get_many(
         &payout_ids,
         &**pool,
     )
-    .await?
+    .await
+    .wrap_internal_err("fetching payouts from database")?
     .into_iter()
     .map(crate::models::payouts::Payout::from)
     .collect::<Vec<_>>();
@@ -140,12 +150,14 @@ pub async fn export(
     let report_ids = crate::database::models::user_item::DBUser::get_reports(
         user_id, &**pool,
     )
-    .await?;
+    .await
+    .wrap_internal_err("fetching users from database")?;
     let reports = crate::database::models::report_item::DBReport::get_many(
         &report_ids,
         &**pool,
     )
-    .await?
+    .await
+    .wrap_internal_err("fetching reports from database")?
     .into_iter()
     .map(crate::models::reports::Report::from)
     .collect::<Vec<_>>();
@@ -157,7 +169,7 @@ pub async fn export(
         user_id.0
     )
     .fetch_all(pool.as_ref())
-    .await?
+    .await.wrap_internal_err("fetching message IDs from database")?
     .into_iter()
     .map(|x| crate::database::models::ids::DBThreadMessageId(x.id))
     .collect::<Vec<_>>();
@@ -167,7 +179,8 @@ pub async fn export(
             &message_ids,
             &**pool,
         )
-        .await?
+        .await
+        .wrap_internal_err("fetching thread messages from database")?
         .into_iter()
         .map(|x| crate::models::threads::ThreadMessage::from(x, &user))
         .collect::<Vec<_>>();
@@ -177,7 +190,8 @@ pub async fn export(
         user_id.0
     )
     .fetch_all(pool.as_ref())
-    .await?
+    .await
+    .wrap_internal_err("fetching uploaded images IDs from database")?
     .into_iter()
     .map(|x| crate::database::models::ids::DBImageId(x.id))
     .collect::<Vec<_>>();
@@ -188,7 +202,8 @@ pub async fn export(
             &**pool,
             &redis,
         )
-        .await?
+        .await
+        .wrap_internal_err("fetching images from database")?
         .into_iter()
         .map(crate::models::images::Image::from)
         .collect::<Vec<_>>();
@@ -197,7 +212,7 @@ pub async fn export(
         crate::database::models::user_subscription_item::DBUserSubscription::get_all_user(
             user_id, &**pool,
         )
-        .await?
+        .await.wrap_internal_err("fetching user subscriptions from database")?
         .into_iter()
         .map(crate::models::billing::UserSubscription::from)
         .collect::<Vec<_>>();
diff --git a/apps/labrinth/src/routes/internal/medal.rs b/apps/labrinth/src/routes/internal/medal.rs
index 67c8f637dc..c443e19e75 100644
--- a/apps/labrinth/src/routes/internal/medal.rs
+++ b/apps/labrinth/src/routes/internal/medal.rs
@@ -1,4 +1,5 @@
 use crate::database::PgPool;
+use crate::util::error::Context as _;
 use actix_web::{HttpResponse, post, web};
 use ariadne::ids::UserId;
 use chrono::Utc;
@@ -45,10 +46,11 @@ pub async fn verify(
             &username,
             Offer::Medal,
         )
-        .await?;
+        .await
+        .wrap_internal_err("executing `RedeemalLookupFields::redeemal_status_by_username_and_offer`")?;
 
     match maybe_fields {
-        None => Err(ApiError::NotFound),
+        None => Err(ApiError::NotFound(eyre::eyre!("resource not found"))),
         Some(fields) => Ok(HttpResponse::Ok().json(VerifyResponse {
             user_id: fields.user_id.into(),
             redeemed: fields.redeemal_status.is_some(),
@@ -71,7 +73,10 @@ pub async fn redeem(
     // Check the offer hasn't been redeemed yet, then insert into the table.
     // In a transaction to avoid double inserts.
 
-    let mut txn = pool.begin().await?;
+    let mut txn = pool
+        .begin()
+        .await
+        .wrap_internal_err("starting database transaction")?;
 
     let maybe_fields =
         RedeemalLookupFields::redeemal_status_by_username_and_offer(
@@ -79,15 +84,18 @@ pub async fn redeem(
             &username,
             Offer::Medal,
         )
-        .await?;
+        .await
+        .wrap_internal_err("executing `RedeemalLookupFields::redeemal_status_by_username_and_offer`")?;
 
     let user_id = match maybe_fields {
-        None => return Err(ApiError::NotFound),
+        None => {
+            return Err(ApiError::NotFound(eyre::eyre!("resource not found")));
+        }
         Some(fields) => {
             if fields.redeemal_status.is_some() {
-                return Err(ApiError::Conflict(
-                    "User already redeemed this offer".to_string(),
-                ));
+                return Err(ApiError::Conflict(eyre::eyre!(
+                    "User already redeemed this offer",
+                )));
             }
 
             fields.user_id
@@ -105,9 +113,14 @@ pub async fn redeem(
         n_attempts: 0,
     };
 
-    redeemal.insert(&mut txn).await?;
+    redeemal
+        .insert(&mut txn)
+        .await
+        .wrap_internal_err("inserting database records for `redeem`")?;
 
-    txn.commit().await?;
+    txn.commit()
+        .await
+        .wrap_internal_err("committing database transaction")?;
 
     // Immediately try to process the redeemal
     if let Err(error) = try_process_user_redeemal(&pool, &redis, redeemal).await
diff --git a/apps/labrinth/src/routes/internal/moderation/external_license.rs b/apps/labrinth/src/routes/internal/moderation/external_license.rs
index 493a866b59..84ae825b04 100644
--- a/apps/labrinth/src/routes/internal/moderation/external_license.rs
+++ b/apps/labrinth/src/routes/internal/moderation/external_license.rs
@@ -1,3 +1,5 @@
+use crate::util::error::ApiContext as _;
+use crate::util::error::Context as _;
 use std::collections::HashMap;
 
 use actix_web::{HttpRequest, get, patch, post, web};
@@ -99,9 +101,9 @@ impl LicenseId {
         match self {
             LicenseId::Number(id) => Ok(id),
             LicenseId::String(id) => id.parse().map_err(|_| {
-                ApiError::InvalidInput(
-                    "license_id must be a valid integer".to_string(),
-                )
+                ApiError::Request(eyre::eyre!(
+                    "license_id must be a valid integer",
+                ))
             }),
         }
     }
@@ -143,9 +145,9 @@ fn normalize_sha1_hashes(hashes: &[String]) -> Result<Vec<String>, ApiError> {
             let hash = hash.trim().to_lowercase();
             if hash.len() != 40 || !hash.chars().all(|c| c.is_ascii_hexdigit())
             {
-                return Err(ApiError::InvalidInput(
-                    "hash must be a valid SHA1 hex string".to_string(),
-                ));
+                return Err(ApiError::Request(eyre::eyre!(
+                    "hash must be a valid SHA1 hex string",
+                )));
             }
 
             Ok(hash)
@@ -196,7 +198,8 @@ async fn fetch_linked_files(
         license_ids,
     )
     .fetch_all(pool)
-    .await?;
+    .await
+    .wrap_internal_err("fetching file rows from database")?;
 
     let mut map: HashMap<i64, Vec<LinkedFile>> = HashMap::new();
     for row in file_rows {
@@ -247,10 +250,12 @@ async fn fetch_by_hashes(
         &hash_bytes,
     )
     .fetch_all(pool)
-    .await?;
+    .await.wrap_internal_err("querying database for `fetch_by_hashes`")?;
 
     let license_ids = rows.iter().map(|row| row.id).collect::<Vec<_>>();
-    let files_map = fetch_linked_files(pool, &license_ids).await?;
+    let files_map = fetch_linked_files(pool, &license_ids)
+        .await
+        .wrap_api_err("fetching linked files")?;
 
     let mut results = HashMap::new();
     for row in rows {
@@ -309,10 +314,13 @@ async fn fetch_by_flame_ids(
         flame_ids,
     )
     .fetch_all(pool)
-    .await?;
+    .await
+    .wrap_internal_err("querying database for `fetch_by_flame_ids`")?;
 
     let license_ids = rows.iter().map(|row| row.id).collect::<Vec<_>>();
-    let files_map = fetch_linked_files(pool, &license_ids).await?;
+    let files_map = fetch_linked_files(pool, &license_ids)
+        .await
+        .wrap_api_err("fetching linked files")?;
 
     let mut results: HashMap<i32, Vec<ExternalProject>> = HashMap::new();
     for row in rows {
@@ -350,7 +358,8 @@ pub async fn search(
         &session_queue,
         Scopes::PROJECT_READ,
     )
-    .await?;
+    .await
+    .wrap_auth_err("authenticating external license search")?;
 
     let rows = sqlx::query_as!(
         LicenseRow,
@@ -381,10 +390,13 @@ pub async fn search(
         body.flame_ids.as_deref(),
     )
     .fetch_all(&**pool)
-    .await?;
+    .await
+    .wrap_internal_err("querying database for `search`")?;
 
     let license_ids: Vec<i64> = rows.iter().map(|r| r.id).collect();
-    let files_map = fetch_linked_files(&pool, &license_ids).await?;
+    let files_map = fetch_linked_files(&pool, &license_ids)
+        .await
+        .wrap_api_err("fetching linked files")?;
 
     let results = rows
         .into_iter()
@@ -419,12 +431,18 @@ pub async fn lookup(
         &session_queue,
         Scopes::PROJECT_READ,
     )
-    .await?;
+    .await
+    .wrap_auth_err("authenticating API request")?;
 
     let body = body.into_inner();
-    let hashes = normalize_sha1_hashes(&body.hashes)?;
-    let flame_ids = fetch_by_flame_ids(&pool, &body.flame_ids).await?;
-    let hashes = fetch_by_hashes(&pool, &hashes).await?;
+    let hashes = normalize_sha1_hashes(&body.hashes)
+        .wrap_api_err("executing `normalize_sha1_hashes`")?;
+    let flame_ids = fetch_by_flame_ids(&pool, &body.flame_ids)
+        .await
+        .wrap_api_err("fetching by flame ids")?;
+    let hashes = fetch_by_hashes(&pool, &hashes)
+        .await
+        .wrap_api_err("fetching by hashes")?;
 
     Ok(web::Json(ExternalLicenseLookupResponse {
         flame_ids,
@@ -453,12 +471,18 @@ pub async fn get_by_sha1(
         &session_queue,
         Scopes::PROJECT_READ,
     )
-    .await?;
+    .await
+    .wrap_auth_err("authenticating API request")?;
 
-    let hashes = normalize_sha1_hashes(&[path.into_inner().0])?;
-    let hash = hashes.first().ok_or(ApiError::NotFound)?;
-    let mut results = fetch_by_hashes(&pool, &hashes).await?;
-    let result = results.remove(hash).ok_or(ApiError::NotFound)?;
+    let hashes = normalize_sha1_hashes(&[path.into_inner().0])
+        .wrap_api_err("normalizing SHA-1 hash")?;
+    let hash = hashes.first().wrap_not_found_err("resource not found")?;
+    let mut results = fetch_by_hashes(&pool, &hashes)
+        .await
+        .wrap_api_err("fetching by hashes")?;
+    let result = results
+        .remove(hash)
+        .wrap_not_found_err("resource not found")?;
 
     Ok(web::Json(result))
 }
@@ -484,10 +508,14 @@ pub async fn get_by_sha1_bulk(
         &session_queue,
         Scopes::PROJECT_READ,
     )
-    .await?;
+    .await
+    .wrap_auth_err("authenticating API request")?;
 
-    let hashes = normalize_sha1_hashes(&body.hashes)?;
-    let results = fetch_by_hashes(&pool, &hashes).await?;
+    let hashes = normalize_sha1_hashes(&body.hashes)
+        .wrap_api_err("executing `normalize_sha1_hashes`")?;
+    let results = fetch_by_hashes(&pool, &hashes)
+        .await
+        .wrap_api_err("fetching by hashes")?;
 
     Ok(web::Json(results))
 }
@@ -540,16 +568,21 @@ async fn upsert_file_license(
         &session_queue,
         Scopes::PROJECT_READ,
     )
-    .await?;
+    .await
+    .wrap_auth_err("authenticating API request")?;
 
     let body = body.into_inner();
-    let license_id = body.license_id.parse()?;
+    let license_id = body
+        .license_id
+        .parse()
+        .wrap_api_err("parsing external license ID")?;
     if body.hashes.is_empty() {
-        return Err(ApiError::InvalidInput(
-            "hashes must contain at least one SHA1 hex string".to_string(),
-        ));
+        return Err(ApiError::Request(eyre::eyre!(
+            "hashes must contain at least one SHA1 hex string",
+        )));
     }
-    let hashes = normalize_sha1_hashes(&body.hashes)?;
+    let hashes = normalize_sha1_hashes(&body.hashes)
+        .wrap_api_err("executing `normalize_sha1_hashes`")?;
     let hash_bytes = hashes
         .iter()
         .map(|hash| hash.as_bytes().to_vec())
@@ -557,7 +590,10 @@ async fn upsert_file_license(
     let filenames = vec![None; hashes.len()];
     let license_ids = vec![license_id; hashes.len()];
 
-    let mut transaction = pool.begin().await?;
+    let mut transaction = pool
+        .begin()
+        .await
+        .wrap_internal_err("starting database transaction")?;
 
     let license = sqlx::query!(
         r#"
@@ -579,8 +615,9 @@ async fn upsert_file_license(
         license_id,
     )
     .fetch_optional(&mut transaction)
-    .await?
-    .ok_or(ApiError::NotFound)?;
+    .await
+    .wrap_internal_err("fetching license from database")?
+    .wrap_not_found_err("resource not found")?;
 
     ExternalLicense::insert_files(
         &mut transaction,
@@ -589,11 +626,19 @@ async fn upsert_file_license(
         &license_ids,
         DBUserId(user.id.0 as i64),
     )
-    .await?;
+    .await
+    .wrap_internal_err(
+        "inserting database records for `upsert_file_license`",
+    )?;
 
-    transaction.commit().await?;
+    transaction
+        .commit()
+        .await
+        .wrap_internal_err("committing database transaction")?;
 
-    let files_map = fetch_linked_files(&pool, &[license_id]).await?;
+    let files_map = fetch_linked_files(&pool, &[license_id])
+        .await
+        .wrap_api_err("fetching linked files")?;
     let linked_files = files_map.get(&license_id).cloned().unwrap_or_default();
 
     Ok(web::Json(
@@ -636,7 +681,8 @@ pub async fn update_license(
         &session_queue,
         Scopes::PROJECT_READ,
     )
-    .await?;
+    .await
+    .wrap_auth_err("authenticating API request")?;
 
     let id = path.into_inner().0;
 
@@ -666,10 +712,13 @@ pub async fn update_license(
         user.id.0 as i64,
     )
     .fetch_optional(&**pool)
-    .await?
-    .ok_or(ApiError::NotFound)?;
+    .await
+    .wrap_internal_err("querying database for `update_license`")?
+    .wrap_not_found_err("resource not found")?;
 
-    let files_map = fetch_linked_files(&pool, &[id]).await?;
+    let files_map = fetch_linked_files(&pool, &[id])
+        .await
+        .wrap_api_err("fetching linked files")?;
     let linked_files = files_map.get(&id).cloned().unwrap_or_default();
 
     Ok(web::Json(
diff --git a/apps/labrinth/src/routes/internal/moderation/mod.rs b/apps/labrinth/src/routes/internal/moderation/mod.rs
index aecce43cbb..b6d28c760a 100644
--- a/apps/labrinth/src/routes/internal/moderation/mod.rs
+++ b/apps/labrinth/src/routes/internal/moderation/mod.rs
@@ -8,6 +8,7 @@ use crate::models::ids::{OrganizationId, ProjectId};
 use crate::models::projects::{ProjectStatus, VersionStatus};
 use crate::queue::moderation::{ApprovalType, IdentifiedFile, MissingMetadata};
 use crate::queue::session::AuthQueue;
+use crate::util::error::ApiContext as _;
 use crate::util::error::Context;
 use crate::{
     auth::{check_is_moderator_from_headers, get_user_from_bearer_token},
@@ -254,7 +255,8 @@ pub async fn get_projects_internal(
         &session_queue,
         Scopes::PROJECT_READ,
     )
-    .await?;
+    .await
+    .wrap_auth_err("authenticating API request")?;
 
     let request_opts = request_opts.into_inner();
     let query = normalize_optional_string(request_opts.query.as_deref());
@@ -518,7 +520,9 @@ pub async fn get_projects_internal(
                 row.owner_icon_url,
                 row.project_types,
                 row.external_dependencies_count,
-            )? {
+            )
+            .wrap_api_err("executing `row_to_queue_project`")?
+            {
                 projects.push(project);
             }
         }
@@ -693,7 +697,9 @@ pub async fn get_projects_internal(
                 row.owner_icon_url,
                 row.project_types,
                 row.external_dependencies_count,
-            )? {
+            )
+            .wrap_api_err("executing `row_to_queue_project`")?
+            {
                 projects.push(project);
             }
         }
@@ -731,7 +737,8 @@ pub async fn get_project_ids(
         &session_queue,
         Scopes::PROJECT_READ,
     )
-    .await?;
+    .await
+    .wrap_auth_err("authenticating API request")?;
 
     let request_opts = request_opts.into_inner();
     let query = normalize_optional_string(request_opts.query.as_deref());
@@ -978,7 +985,8 @@ fn row_to_queue_project(
         owner_id,
         owner_name,
         owner_icon_url,
-    )?;
+    )
+    .wrap_api_err("executing `row_to_ownership`")?;
 
     Ok(Some(ModerationQueueProject {
         id: project_id,
@@ -1076,11 +1084,14 @@ pub async fn get_project_meta(
         &session_queue,
         Scopes::PROJECT_READ,
     )
-    .await?;
+    .await
+    .wrap_auth_err("authenticating API request")?;
 
     let project_id = info.into_inner().0;
     let project =
-        database::models::DBProject::get(&project_id, &**pool, &redis).await?;
+        database::models::DBProject::get(&project_id, &**pool, &redis)
+            .await
+            .wrap_api_err("fetching project from database")?;
 
     if let Some(project) = project {
         let rows = sqlx::query!(
@@ -1094,7 +1105,8 @@ pub async fn get_project_meta(
             project.inner.id.0
         )
         .fetch_all(&**pool)
-        .await?;
+        .await
+        .wrap_internal_err("querying database for `get_project_meta`")?;
 
         let mut merged = MissingMetadata {
             identified: HashMap::new(),
@@ -1134,7 +1146,7 @@ pub async fn get_project_meta(
                 .collect::<Vec<_>>()
         )
         .fetch_all(&**pool)
-        .await?;
+        .await.wrap_internal_err("querying database for `get_project_meta`")?;
 
         for row in rows {
             if let Some(sha1) = row.sha1 {
@@ -1169,7 +1181,8 @@ pub async fn get_project_meta(
             &check_flames,
         )
         .fetch_all(&**pool)
-        .await?;
+        .await
+        .wrap_internal_err("querying database for `get_project_meta`")?;
 
         for row in rows {
             if let Some(sha1) = merged
@@ -1192,7 +1205,7 @@ pub async fn get_project_meta(
 
         Ok(web::Json(merged))
     } else {
-        Err(ApiError::NotFound)
+        Err(ApiError::NotFound(eyre::eyre!("resource not found")))
     }
 }
 
@@ -1234,9 +1247,13 @@ pub async fn set_project_meta(
         &session_queue,
         Scopes::PROJECT_READ,
     )
-    .await?;
+    .await
+    .wrap_auth_err("authenticating API request")?;
 
-    let mut transaction = pool.begin().await?;
+    let mut transaction = pool
+        .begin()
+        .await
+        .wrap_internal_err("starting database transaction")?;
 
     let mut licenses = Vec::new();
     let mut file_hashes = Vec::new();
@@ -1287,7 +1304,8 @@ pub async fn set_project_meta(
         &licenses,
         user_id,
     )
-    .await?;
+    .await
+    .wrap_internal_err("inserting database records for `set_project_meta`")?;
 
     moderation_external_item::ExternalLicense::insert_files(
         &mut transaction,
@@ -1299,9 +1317,13 @@ pub async fn set_project_meta(
         &file_license_ids,
         user_id,
     )
-    .await?;
+    .await
+    .wrap_internal_err("inserting database records for `set_project_meta`")?;
 
-    transaction.commit().await?;
+    transaction
+        .commit()
+        .await
+        .wrap_internal_err("committing database transaction")?;
 
     Ok(())
 }
@@ -1331,18 +1353,23 @@ pub async fn acquire_lock(
         &session_queue,
         Scopes::PROJECT_WRITE,
     )
-    .await?;
+    .await
+    .wrap_auth_err("authenticating API request")?;
 
     let project_id_str = path.into_inner().0;
     let project =
         database::models::DBProject::get(&project_id_str, &**pool, &redis)
-            .await?
-            .ok_or(ApiError::NotFound)?;
+            .await
+            .wrap_api_err("fetching project from database")?
+            .wrap_not_found_err("resource not found")?;
 
     let db_project_id = project.inner.id;
     let db_user_id = database::models::DBUserId::from(user.id);
 
-    match DBModerationLock::acquire(db_project_id, db_user_id, &pool).await? {
+    match DBModerationLock::acquire(db_project_id, db_user_id, &pool)
+        .await
+        .wrap_internal_err("executing `DBModerationLock::acquire`")?
+    {
         Ok(()) => Ok(web::Json(LockAcquireResponse {
             success: true,
             is_own_lock: true,
@@ -1390,18 +1417,22 @@ pub async fn override_lock(
         &session_queue,
         Scopes::PROJECT_WRITE,
     )
-    .await?;
+    .await
+    .wrap_auth_err("authenticating API request")?;
 
     let project_id_str = path.into_inner().0;
     let project =
         database::models::DBProject::get(&project_id_str, &**pool, &redis)
-            .await?
-            .ok_or(ApiError::NotFound)?;
+            .await
+            .wrap_api_err("fetching project from database")?
+            .wrap_not_found_err("resource not found")?;
 
     let db_project_id = project.inner.id;
     let db_user_id = database::models::DBUserId::from(user.id);
 
-    DBModerationLock::force_acquire(db_project_id, db_user_id, &pool).await?;
+    DBModerationLock::force_acquire(db_project_id, db_user_id, &pool)
+        .await
+        .wrap_internal_err("executing `DBModerationLock::force_acquire`")?;
 
     Ok(web::Json(LockAcquireResponse {
         success: true,
@@ -1437,18 +1468,23 @@ pub async fn get_lock_status(
         &session_queue,
         Scopes::PROJECT_READ,
     )
-    .await?;
+    .await
+    .wrap_auth_err("authenticating API request")?;
 
     let project_id_str = path.into_inner().0;
     let project =
         database::models::DBProject::get(&project_id_str, &**pool, &redis)
-            .await?
-            .ok_or(ApiError::NotFound)?;
+            .await
+            .wrap_api_err("fetching project from database")?
+            .wrap_not_found_err("resource not found")?;
 
     let db_project_id = project.inner.id;
     let db_user_id = database::models::DBUserId::from(user.id);
 
-    match DBModerationLock::get_with_user(db_project_id, &pool).await? {
+    match DBModerationLock::get_with_user(db_project_id, &pool)
+        .await
+        .wrap_internal_err("fetching moderation lock from database")?
+    {
         Some(lock) => {
             let is_own_lock = lock.moderator_id == db_user_id;
             Ok(web::Json(LockStatusResponse {
@@ -1499,19 +1535,22 @@ pub async fn release_lock(
         &session_queue,
         Scopes::PROJECT_WRITE,
     )
-    .await?;
+    .await
+    .wrap_auth_err("authenticating API request")?;
 
     let project_id_str = path.into_inner().0;
     let project =
         database::models::DBProject::get(&project_id_str, &**pool, &redis)
-            .await?
-            .ok_or(ApiError::NotFound)?;
+            .await
+            .wrap_api_err("fetching project from database")?
+            .wrap_not_found_err("resource not found")?;
 
     let db_project_id = project.inner.id;
     let db_user_id = database::models::DBUserId::from(user.id);
 
-    let released =
-        DBModerationLock::release(db_project_id, db_user_id, &pool).await?;
+    let released = DBModerationLock::release(db_project_id, db_user_id, &pool)
+        .await
+        .wrap_internal_err("executing `DBModerationLock::release`")?;
 
     let _ = DBModerationLock::cleanup_expired(&pool).await;
 
@@ -1547,9 +1586,9 @@ pub async fn release_lock_beacon(
 ) -> Result<web::Json<LockReleaseResponse>, ApiError> {
     let token = body.trim();
     if token.is_empty() {
-        return Err(ApiError::InvalidInput(
-            "missing token in request body".to_string(),
-        ));
+        return Err(ApiError::Request(eyre::eyre!(
+            "missing token in request body",
+        )));
     }
     let token = token.strip_prefix("Bearer ").unwrap_or(token).trim();
 
@@ -1561,30 +1600,33 @@ pub async fn release_lock_beacon(
         &session_queue,
         false,
     )
-    .await?;
+    .await
+    .wrap_auth_err("authenticating API request")?;
 
     if !scopes.contains(Scopes::PROJECT_WRITE) {
-        return Err(ApiError::CustomAuthentication(
-            "token is missing required scopes".to_string(),
-        ));
+        return Err(ApiError::Auth(eyre::eyre!(
+            "token is missing required scopes",
+        )));
     }
     if !user.role.is_mod() {
-        return Err(ApiError::CustomAuthentication(
-            "only moderators may release moderation locks".to_string(),
-        ));
+        return Err(ApiError::Auth(eyre::eyre!(
+            "only moderators may release moderation locks",
+        )));
     }
 
     let project_id_str = path.into_inner().0;
     let project =
         database::models::DBProject::get(&project_id_str, &**pool, &redis)
-            .await?
-            .ok_or(ApiError::NotFound)?;
+            .await
+            .wrap_api_err("fetching project from database")?
+            .wrap_not_found_err("resource not found")?;
 
     let db_project_id = project.inner.id;
     let db_user_id = database::models::DBUserId::from(user.id);
 
-    let released =
-        DBModerationLock::release(db_project_id, db_user_id, &pool).await?;
+    let released = DBModerationLock::release(db_project_id, db_user_id, &pool)
+        .await
+        .wrap_internal_err("executing `DBModerationLock::release`")?;
 
     let _ = DBModerationLock::cleanup_expired(&pool).await;
 
@@ -1614,16 +1656,19 @@ pub async fn delete_all_locks(
         &session_queue,
         Scopes::PROJECT_WRITE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     if !user.role.is_admin() {
-        return Err(ApiError::CustomAuthentication(
-            "You must be an admin to delete all locks".to_string(),
-        ));
+        return Err(ApiError::Auth(eyre::eyre!(
+            "You must be an admin to delete all locks",
+        )));
     }
 
-    let deleted_count = DBModerationLock::delete_all(&pool).await?;
+    let deleted_count = DBModerationLock::delete_all(&pool)
+        .await
+        .wrap_internal_err("deleting moderation locks from database")?;
 
     Ok(web::Json(DeleteAllLocksResponse { deleted_count }))
 }
diff --git a/apps/labrinth/src/routes/internal/moderation/tech_review.rs b/apps/labrinth/src/routes/internal/moderation/tech_review.rs
index ea694627eb..c55d8fdbc7 100644
--- a/apps/labrinth/src/routes/internal/moderation/tech_review.rs
+++ b/apps/labrinth/src/routes/internal/moderation/tech_review.rs
@@ -1,3 +1,4 @@
+use crate::util::error::ApiContext as _;
 use std::{collections::HashMap, fmt};
 use xredis::RedisPool;
 
@@ -225,7 +226,8 @@ pub async fn get_issue(
         &session_queue,
         Scopes::PROJECT_READ,
     )
-    .await?;
+    .await
+    .wrap_auth_err("authenticating API request")?;
 
     let (issue_id,) = path.into_inner();
     let row = sqlx::query!(
@@ -261,7 +263,7 @@ pub async fn get_issue(
     .fetch_optional(&**pool)
     .await
     .wrap_internal_err("failed to fetch issue from database")?
-    .ok_or(ApiError::NotFound)?;
+    .wrap_not_found_err("resource not found")?;
 
     Ok(web::Json(row.data.0))
 }
@@ -288,7 +290,8 @@ pub async fn get_report(
         &session_queue,
         Scopes::PROJECT_READ,
     )
-    .await?;
+    .await
+    .wrap_auth_err("authenticating API request")?;
 
     let (report_id,) = path.into_inner();
 
@@ -348,7 +351,7 @@ pub async fn get_report(
     .fetch_optional(&**pool)
     .await
     .wrap_internal_err("failed to fetch report from database")?
-    .ok_or(ApiError::NotFound)?;
+    .wrap_not_found_err("resource not found")?;
 
     Ok(web::Json(row.data.0))
 }
@@ -703,7 +706,8 @@ pub async fn search_projects(
         &session_queue,
         Scopes::PROJECT_READ,
     )
-    .await?;
+    .await
+    .wrap_auth_err("authenticating API request")?;
 
     let sort_by = search_req.sort_by.to_string();
     let limit = search_req.limit.max(50);
@@ -819,8 +823,9 @@ pub async fn search_projects(
         thread_ids.push(row.thread_id);
     }
 
-    let project_reports =
-        fetch_project_reports(&project_ids, &pool, &redis).await?;
+    let project_reports = fetch_project_reports(&project_ids, &pool, &redis)
+        .await
+        .wrap_api_err("fetching project reports")?;
 
     let projects = DBProject::get_many_ids(&project_ids, &**pool, &redis)
         .await
@@ -913,7 +918,8 @@ pub async fn get_project_report(
         &session_queue,
         Scopes::PROJECT_READ,
     )
-    .await?;
+    .await
+    .wrap_auth_err("authenticating API request")?;
 
     let (project_id,) = path.into_inner();
     let db_project_id = DBProjectId::from(project_id);
@@ -929,10 +935,12 @@ pub async fn get_project_report(
     .fetch_optional(&**pool)
     .await
     .wrap_internal_err("failed to fetch thread")?
-    .ok_or(ApiError::NotFound)?;
+    .wrap_not_found_err("resource not found")?;
 
     let project_reports =
-        fetch_project_reports(&[db_project_id], &pool, &redis).await?;
+        fetch_project_reports(&[db_project_id], &pool, &redis)
+            .await
+            .wrap_api_err("fetching project reports")?;
 
     let project_report = project_reports.into_iter().next();
 
@@ -966,7 +974,7 @@ pub async fn get_project_report(
     let thread = threads
         .get(&row.thread_id.into())
         .cloned()
-        .ok_or(ApiError::NotFound)?;
+        .wrap_not_found_err("resource not found")?;
 
     Ok(web::Json(ProjectReportResponse {
         project_report,
@@ -988,8 +996,8 @@ pub struct SubmitReport {
 ///
 /// Before this is called, all issues for this project's reports must have been
 /// marked as either safe or unsafe. Otherwise, this will error with
-/// [`ApiError::TechReviewIssuesWithNoVerdict`], providing the issue IDs which
-/// are still unmarked.
+/// A request error is returned with the issue detail IDs which are still
+/// unmarked.
 #[utoipa::path(
 	context_path = "/moderation/tech-review",
 	tag = "moderation",
@@ -1013,7 +1021,8 @@ pub async fn submit_report(
         &session_queue,
         Scopes::PROJECT_WRITE,
     )
-    .await?;
+    .await
+    .wrap_auth_err("authenticating API request")?;
     let (project_id,) = path.into_inner();
     let project_id = DBProjectId::from(project_id);
 
@@ -1045,14 +1054,13 @@ pub async fn submit_report(
     .wrap_internal_err("failed to fetch pending issues")?;
 
     if !pending_issue_details.is_empty() {
-        return Err(ApiError::TechReviewDetailsWithNoVerdict {
-            details: pending_issue_details
-                .into_iter()
-                .map(|record| {
-                    DelphiReportIssueDetailsId(record.issue_detail_id)
-                })
-                .collect(),
-        });
+        let details = pending_issue_details
+            .into_iter()
+            .map(|record| DelphiReportIssueDetailsId(record.issue_detail_id))
+            .collect_vec();
+        return Err(ApiError::Request(eyre::eyre!(
+            "report still has issue details with no verdict: {details:?}"
+        )));
     }
 
     sqlx::query!(
@@ -1171,7 +1179,10 @@ pub async fn submit_report(
             None,
             None,
         )
-        .await?;
+        .await
+        .wrap_api_err(
+            "executing `projects::clear_project_cache_and_queue_search`",
+        )?;
     }
 
     Ok(())
@@ -1224,7 +1235,8 @@ pub async fn update_issue_details(
         &session_queue,
         Scopes::PROJECT_WRITE,
     )
-    .await?;
+    .await
+    .wrap_auth_err("updating database records for `update_issue_details`")?;
 
     let mut txn = pool
         .begin()
@@ -1347,7 +1359,10 @@ pub async fn update_issue_details(
         TechReviewExitReason::Resolved,
         &mut txn,
     )
-    .await?;
+    .await
+    .wrap_api_err(
+        "executing `tech_review_sync::sync_project_tech_review_state`",
+    )?;
 
     txn.commit()
         .await
@@ -1381,7 +1396,10 @@ pub async fn update_global_issue_details(
         &session_queue,
         Scopes::PROJECT_WRITE,
     )
-    .await?;
+    .await
+    .wrap_auth_err(
+        "updating database records for `update_global_issue_details`",
+    )?;
 
     let updates = update_reqs.into_inner();
 
@@ -1461,7 +1479,10 @@ pub async fn update_global_issue_details(
         TechReviewExitReason::Resolved,
         &mut txn,
     )
-    .await?;
+    .await
+    .wrap_api_err(
+        "executing `tech_review_sync::sync_detail_key_tech_review_state`",
+    )?;
 
     txn.commit()
         .await
@@ -1498,7 +1519,8 @@ pub async fn add_report(
         &session_queue,
         Scopes::PROJECT_WRITE,
     )
-    .await?;
+    .await
+    .wrap_auth_err("inserting database records for `add_report`")?;
     let file_id = add_report.file_id;
 
     let mut txn = pool
diff --git a/apps/labrinth/src/routes/internal/moderation/tech_review/global.rs b/apps/labrinth/src/routes/internal/moderation/tech_review/global.rs
index c152d5c2f9..84fbe00fe3 100644
--- a/apps/labrinth/src/routes/internal/moderation/tech_review/global.rs
+++ b/apps/labrinth/src/routes/internal/moderation/tech_review/global.rs
@@ -148,7 +148,8 @@ pub async fn search_global_issue_details(
         &session_queue,
         Scopes::PROJECT_READ,
     )
-    .await?;
+    .await
+    .wrap_auth_err("authenticating global issue search")?;
 
     let query = search_req
         .query
@@ -370,7 +371,8 @@ pub async fn get_global_issue_detail(
         &session_queue,
         Scopes::PROJECT_READ,
     )
-    .await?;
+    .await
+    .wrap_auth_err("authenticating global issue detail request")?;
 
     let detail_key = get_req.detail_key.trim();
     if detail_key.is_empty() {
@@ -404,7 +406,7 @@ pub async fn get_global_issue_detail(
     .fetch_optional(&**pool)
     .await
     .wrap_internal_err("failed to fetch global issue detail")?
-    .ok_or(ApiError::NotFound)?;
+    .wrap_not_found_err("resource not found")?;
 
     let local_rows = sqlx::query!(
         r#"
diff --git a/apps/labrinth/src/routes/internal/mural.rs b/apps/labrinth/src/routes/internal/mural.rs
index b78069de5c..ea29c29e38 100644
--- a/apps/labrinth/src/routes/internal/mural.rs
+++ b/apps/labrinth/src/routes/internal/mural.rs
@@ -22,7 +22,7 @@ pub async fn get_bank_details(
     let mural = payouts_queue.muralpay.load();
     let mural = mural
         .as_ref()
-        .wrap_internal_err("Mural API not available")?;
+        .wrap_internal_err("required Mural API is not available")?;
     let fiat_and_rail_codes = FiatAndRailCode::iter().collect::<Vec<_>>();
     let details = mural
         .client
diff --git a/apps/labrinth/src/routes/internal/pats.rs b/apps/labrinth/src/routes/internal/pats.rs
index 5c0d41b783..63e4f10eba 100644
--- a/apps/labrinth/src/routes/internal/pats.rs
+++ b/apps/labrinth/src/routes/internal/pats.rs
@@ -1,5 +1,6 @@
 use crate::database;
 use crate::database::models::generate_pat_id;
+use crate::util::error::Context as _;
 
 use crate::auth::get_user_from_headers;
 use crate::routes::ApiError;
@@ -18,7 +19,6 @@ use crate::database::models::notification_item::NotificationBuilder;
 use crate::models::notifications::NotificationBody;
 use crate::models::pats::{PersonalAccessToken, Scopes};
 use crate::queue::session::AuthQueue;
-use crate::util::validate::validation_errors_to_string;
 use serde::Deserialize;
 use validator::Validate;
 
@@ -54,7 +54,8 @@ pub async fn get_pats(
         &session_queue,
         Scopes::PAT_READ,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     let pat_ids =
@@ -63,11 +64,13 @@ pub async fn get_pats(
             &**pool,
             &redis,
         )
-        .await?;
+        .await
+        .wrap_internal_err("fetching personal access tokens from database")?;
     let pats = database::models::pat_item::DBPersonalAccessToken::get_many_ids(
         &pat_ids, &**pool, &redis,
     )
-    .await?;
+    .await
+    .wrap_internal_err("fetching personal access tokens from database")?;
 
     Ok(HttpResponse::Ok().json(
         pats.into_iter()
@@ -104,19 +107,20 @@ pub async fn create_pat(
     redis: Data<RedisPool>,
     session_queue: Data<AuthQueue>,
 ) -> Result<HttpResponse, ApiError> {
-    info.0.validate().map_err(|err| {
-        ApiError::InvalidInput(validation_errors_to_string(err, None))
-    })?;
+    info.0
+        .validate()
+        .map_err(|err| eyre::eyre!(err))
+        .wrap_request_err("validating request")?;
 
     if info.scopes.is_restricted() {
-        return Err(ApiError::InvalidInput(
-            "Invalid scopes requested!".to_string(),
-        ));
+        return Err(ApiError::Request(eyre::eyre!(
+            "Invalid scopes requested!",
+        )));
     }
     if info.expires < Utc::now() {
-        return Err(ApiError::InvalidInput(
-            "Expire date must be in the future!".to_string(),
-        ));
+        return Err(ApiError::Request(eyre::eyre!(
+            "Expire date must be in the future!",
+        )));
     }
 
     let user = get_user_from_headers(
@@ -126,12 +130,18 @@ pub async fn create_pat(
         &session_queue,
         Scopes::PAT_CREATE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
-    let mut transaction = pool.begin().await?;
+    let mut transaction = pool
+        .begin()
+        .await
+        .wrap_internal_err("starting database transaction")?;
 
-    let id = generate_pat_id(&mut transaction).await?;
+    let id = generate_pat_id(&mut transaction)
+        .await
+        .wrap_internal_err("generating pat ID")?;
 
     let token = ChaCha20Rng::from_entropy()
         .sample_iter(&Alphanumeric)
@@ -152,7 +162,8 @@ pub async fn create_pat(
         last_used: None,
     }
     .insert(&mut transaction)
-    .await?;
+    .await
+    .wrap_internal_err("inserting database records for `create_pat`")?;
 
     NotificationBuilder {
         body: NotificationBody::PatCreated {
@@ -160,14 +171,19 @@ pub async fn create_pat(
         },
     }
     .insert(user.id.into(), &mut transaction, &redis)
-    .await?;
-    transaction.commit().await?;
+    .await
+    .wrap_internal_err("inserting database records for `create_pat`")?;
+    transaction
+        .commit()
+        .await
+        .wrap_internal_err("committing database transaction")?;
 
     database::models::pat_item::DBPersonalAccessToken::clear_cache(
         vec![(None, None, Some(user.id.into()))],
         &redis,
     )
-    .await?;
+    .await
+    .wrap_internal_err("clearing cached data from Redis")?;
 
     Ok(HttpResponse::Ok().json(PersonalAccessToken {
         id: id.into(),
@@ -213,9 +229,10 @@ pub async fn edit_pat(
     redis: Data<RedisPool>,
     session_queue: Data<AuthQueue>,
 ) -> Result<HttpResponse, ApiError> {
-    info.0.validate().map_err(|err| {
-        ApiError::InvalidInput(validation_errors_to_string(err, None))
-    })?;
+    info.0
+        .validate()
+        .map_err(|err| eyre::eyre!(err))
+        .wrap_request_err("validating request")?;
 
     let user = get_user_from_headers(
         &req,
@@ -224,25 +241,30 @@ pub async fn edit_pat(
         &session_queue,
         Scopes::PAT_WRITE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     let id = id.into_inner().0;
     let pat = database::models::pat_item::DBPersonalAccessToken::get(
         &id, &**pool, &redis,
     )
-    .await?;
+    .await
+    .wrap_internal_err("fetching personal access token from database")?;
 
     if let Some(pat) = pat
         && pat.user_id == user.id.into()
     {
-        let mut transaction = pool.begin().await?;
+        let mut transaction = pool
+            .begin()
+            .await
+            .wrap_internal_err("starting database transaction")?;
 
         if let Some(scopes) = &info.scopes {
             if scopes.is_restricted() {
-                return Err(ApiError::InvalidInput(
-                    "Invalid scopes requested!".to_string(),
-                ));
+                return Err(ApiError::Request(eyre::eyre!(
+                    "Invalid scopes requested!",
+                )));
             }
 
             sqlx::query!(
@@ -255,7 +277,8 @@ pub async fn edit_pat(
                 pat.id.0
             )
             .execute(&mut transaction)
-            .await?;
+            .await
+            .wrap_internal_err("querying database for `edit_pat`")?;
         }
         if let Some(name) = &info.name {
             sqlx::query!(
@@ -268,13 +291,14 @@ pub async fn edit_pat(
                 pat.id.0
             )
             .execute(&mut transaction)
-            .await?;
+            .await
+            .wrap_internal_err("querying database for `edit_pat`")?;
         }
         if let Some(expires) = &info.expires {
             if expires < &Utc::now() {
-                return Err(ApiError::InvalidInput(
-                    "Expire date must be in the future!".to_string(),
-                ));
+                return Err(ApiError::Request(eyre::eyre!(
+                    "Expire date must be in the future!",
+                )));
             }
 
             sqlx::query!(
@@ -287,15 +311,20 @@ pub async fn edit_pat(
                 pat.id.0
             )
             .execute(&mut transaction)
-            .await?;
+            .await
+            .wrap_internal_err("querying database for `edit_pat`")?;
         }
 
-        transaction.commit().await?;
+        transaction
+            .commit()
+            .await
+            .wrap_internal_err("committing database transaction")?;
         database::models::pat_item::DBPersonalAccessToken::clear_cache(
             vec![(Some(pat.id), Some(pat.access_token), Some(pat.user_id))],
             &redis,
         )
-        .await?;
+        .await
+        .wrap_internal_err("clearing cached data from Redis")?;
     }
 
     Ok(HttpResponse::NoContent().finish())
@@ -330,29 +359,39 @@ pub async fn delete_pat(
         &session_queue,
         Scopes::PAT_DELETE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
     let id = id.into_inner().0;
     let pat = database::models::pat_item::DBPersonalAccessToken::get(
         &id, &**pool, &redis,
     )
-    .await?;
+    .await
+    .wrap_internal_err("fetching personal access token from database")?;
 
     if let Some(pat) = pat
         && pat.user_id == user.id.into()
     {
-        let mut transaction = pool.begin().await?;
+        let mut transaction = pool
+            .begin()
+            .await
+            .wrap_internal_err("starting database transaction")?;
         database::models::pat_item::DBPersonalAccessToken::remove(
             pat.id,
             &mut transaction,
         )
-        .await?;
-        transaction.commit().await?;
+        .await
+        .wrap_internal_err("deleting personal access token from database")?;
+        transaction
+            .commit()
+            .await
+            .wrap_internal_err("committing database transaction")?;
         database::models::pat_item::DBPersonalAccessToken::clear_cache(
             vec![(Some(pat.id), Some(pat.access_token), Some(pat.user_id))],
             &redis,
         )
-        .await?;
+        .await
+        .wrap_internal_err("clearing cached data from Redis")?;
     }
 
     Ok(HttpResponse::NoContent().finish())
diff --git a/apps/labrinth/src/routes/internal/search.rs b/apps/labrinth/src/routes/internal/search.rs
index 6521a21800..04063ebfcc 100644
--- a/apps/labrinth/src/routes/internal/search.rs
+++ b/apps/labrinth/src/routes/internal/search.rs
@@ -1,3 +1,4 @@
+use crate::util::error::Context as _;
 use crate::util::guards::admin_key_guard;
 use crate::{
     routes::ApiError,
@@ -19,7 +20,12 @@ pub fn config(cfg: &mut actix_web::web::ServiceConfig) {
 pub async fn tasks(
     search: web::Data<dyn SearchBackend>,
 ) -> Result<web::Json<serde_json::Value>, ApiError> {
-    Ok(web::Json(search.tasks().await.map_err(ApiError::Internal)?))
+    Ok(web::Json(
+        search
+            .tasks()
+            .await
+            .wrap_internal_err("fetching search tasks")?,
+    ))
 }
 
 /// Cancel search tasks.  
@@ -36,6 +42,6 @@ pub async fn tasks_cancel(
     search
         .tasks_cancel(&body)
         .await
-        .map_err(ApiError::Internal)?;
+        .wrap_internal_err("cancelling search tasks")?;
     Ok(())
 }
diff --git a/apps/labrinth/src/routes/internal/server_ping.rs b/apps/labrinth/src/routes/internal/server_ping.rs
index f80961bc88..5847572ea5 100644
--- a/apps/labrinth/src/routes/internal/server_ping.rs
+++ b/apps/labrinth/src/routes/internal/server_ping.rs
@@ -44,7 +44,8 @@ pub async fn ping_minecraft_java(
         &session_queue,
         Scopes::SESSION_ACCESS,
     )
-    .await?;
+    .await
+    .wrap_auth_err("authenticating API request")?;
 
     let timeout = request.timeout_ms.map(Duration::from_millis);
     server_ping::ping_server(&request.address, timeout)
diff --git a/apps/labrinth/src/routes/internal/session.rs b/apps/labrinth/src/routes/internal/session.rs
index c6316a3bad..f7bd6f685c 100644
--- a/apps/labrinth/src/routes/internal/session.rs
+++ b/apps/labrinth/src/routes/internal/session.rs
@@ -9,6 +9,7 @@ use crate::models::pats::Scopes;
 use crate::models::sessions::Session;
 use crate::queue::session::AuthQueue;
 use crate::routes::ApiError;
+use crate::util::error::Context as _;
 use actix_web::http::header::AUTHORIZATION;
 use actix_web::web::Data;
 use actix_web::{HttpRequest, HttpResponse, delete, get, post, web};
@@ -159,20 +160,24 @@ pub async fn list(
         &session_queue,
         Scopes::SESSION_READ,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     let session = req
         .headers()
         .get(AUTHORIZATION)
         .and_then(|x| x.to_str().ok())
-        .ok_or_else(|| AuthenticationError::InvalidCredentials)?;
+        .ok_or_else(|| AuthenticationError::InvalidCredentials)
+        .wrap_auth_err("authenticating API request")?;
 
     let session_ids =
         DBSession::get_user_sessions(current_user.id.into(), &**pool, &redis)
-            .await?;
+            .await
+            .wrap_internal_err("fetching sessions from database")?;
     let sessions = DBSession::get_many_ids(&session_ids, &**pool, &redis)
-        .await?
+        .await
+        .wrap_internal_err("fetching sessions from database")?
         .into_iter()
         .filter(|x| x.expires > Utc::now())
         .map(|x| Session::from(x, false, Some(session)))
@@ -211,17 +216,28 @@ pub async fn delete(
         &session_queue,
         Scopes::SESSION_DELETE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
-    let session = DBSession::get(info.into_inner().0, &**pool, &redis).await?;
+    let session = DBSession::get(info.into_inner().0, &**pool, &redis)
+        .await
+        .wrap_internal_err("fetching session from database")?;
 
     if let Some(session) = session
         && session.user_id == current_user.id.into()
     {
-        let mut transaction = pool.begin().await?;
-        DBSession::remove(session.id, &mut transaction).await?;
-        transaction.commit().await?;
+        let mut transaction = pool
+            .begin()
+            .await
+            .wrap_internal_err("starting database transaction")?;
+        DBSession::remove(session.id, &mut transaction)
+            .await
+            .wrap_internal_err("deleting session from database")?;
+        transaction
+            .commit()
+            .await
+            .wrap_internal_err("committing database transaction")?;
         DBSession::clear_cache(
             vec![(
                 Some(session.id),
@@ -230,7 +246,8 @@ pub async fn delete(
             )],
             &redis,
         )
-        .await?;
+        .await
+        .wrap_internal_err("clearing cached data from Redis")?;
     }
 
     Ok(HttpResponse::NoContent().body(""))
@@ -258,16 +275,14 @@ pub async fn refresh(
         .headers()
         .get(AUTHORIZATION)
         .and_then(|x| x.to_str().ok())
-        .ok_or_else(|| {
-            ApiError::Authentication(AuthenticationError::InvalidCredentials)
-        })?;
+        .wrap_auth_err_with(|| AuthenticationError::InvalidCredentials)?;
 
     // We should ensure that the authorization given is a session token, and not some other type of token (like a PAT), since this endpoint is only for refreshing sessions.
     // This is done by checking the prefix of the token, which should be "mra_" for session tokens.
     if !session.starts_with("mra_") {
-        return Err(ApiError::Authentication(
+        return Err(ApiError::Auth(eyre::eyre!(
             AuthenticationError::InvalidCredentials,
-        ));
+        )));
     }
 
     let current_user = get_user_from_bearer_token(
@@ -278,23 +293,31 @@ pub async fn refresh(
         &session_queue,
         true, // Allow expired sessions, since we want to allow refreshing expired sessions
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
-    let session = DBSession::get(session, &**pool, &redis).await?;
+    let session = DBSession::get(session, &**pool, &redis)
+        .await
+        .wrap_internal_err("fetching session from database")?;
 
     if let Some(session) = session {
         if current_user.id != session.user_id.into()
             || session.refresh_expires < Utc::now()
         {
-            return Err(ApiError::Authentication(
+            return Err(ApiError::Auth(eyre::eyre!(
                 AuthenticationError::InvalidCredentials,
-            ));
+            )));
         }
 
-        let mut transaction = pool.begin().await?;
+        let mut transaction = pool
+            .begin()
+            .await
+            .wrap_internal_err("starting database transaction")?;
 
-        DBSession::remove(session.id, &mut transaction).await?;
+        DBSession::remove(session.id, &mut transaction)
+            .await
+            .wrap_internal_err("deleting session from database")?;
         let new_session = issue_session(
             req,
             session.user_id,
@@ -302,8 +325,12 @@ pub async fn refresh(
             &redis,
             Some(session.refresh_expires),
         )
-        .await?;
-        transaction.commit().await?;
+        .await
+        .wrap_auth_err("authenticating API request")?;
+        transaction
+            .commit()
+            .await
+            .wrap_internal_err("committing database transaction")?;
         DBSession::clear_cache(
             vec![(
                 Some(session.id),
@@ -312,12 +339,13 @@ pub async fn refresh(
             )],
             &redis,
         )
-        .await?;
+        .await
+        .wrap_internal_err("clearing cached data from Redis")?;
 
         Ok(HttpResponse::Ok().json(Session::from(new_session, true, None)))
     } else {
-        Err(ApiError::Authentication(
+        Err(ApiError::Auth(eyre::eyre!(
             AuthenticationError::InvalidCredentials,
-        ))
+        )))
     }
 }
diff --git a/apps/labrinth/src/routes/internal/statuses.rs b/apps/labrinth/src/routes/internal/statuses.rs
index 160cdba9ba..62e4fde4d9 100644
--- a/apps/labrinth/src/routes/internal/statuses.rs
+++ b/apps/labrinth/src/routes/internal/statuses.rs
@@ -15,6 +15,7 @@ use crate::sync::friends::{FRIENDS_CHANNEL_NAME, RedisFriendsMessage};
 use crate::sync::status::{
     get_user_status, push_back_user_expiry, replace_user_status,
 };
+use crate::util::error::Context as _;
 use actix_web::web::{Data, Payload};
 use actix_web::{HttpRequest, HttpResponse, get, web};
 use actix_ws::Message;
@@ -67,15 +68,14 @@ pub async fn ws_init(
         &session_queue,
         false,
     )
-    .await?
-    .ok_or_else(|| {
-        ApiError::Authentication(AuthenticationError::InvalidCredentials)
-    })?;
+    .await
+    .wrap_auth_err("authenticating API request")?
+    .wrap_auth_err_with(|| AuthenticationError::InvalidCredentials)?;
 
     if !scopes.contains(Scopes::SESSION_ACCESS) {
-        return Err(ApiError::Authentication(
+        return Err(ApiError::Auth(eyre::eyre!(
             AuthenticationError::InvalidCredentials,
-        ));
+        )));
     }
 
     let user = User::from_full(db_user);
@@ -93,7 +93,9 @@ pub async fn ws_init(
     };
 
     let friends =
-        DBFriend::get_user_friends(user.id.into(), Some(true), &**pool).await?;
+        DBFriend::get_user_friends(user.id.into(), Some(true), &**pool)
+            .await
+            .wrap_internal_err("fetching friends from database")?;
 
     let friend_statuses = if !friends.is_empty() {
         let db = db.clone();
@@ -127,11 +129,12 @@ pub async fn ws_init(
     };
 
     let _ = session
-        .text(serde_json::to_string(
-            &ServerToClientMessage::FriendStatuses {
+        .text(
+            serde_json::to_string(&ServerToClientMessage::FriendStatuses {
                 statuses: friend_statuses,
-            },
-        )?)
+            })
+            .wrap_request_err("serializing friend statuses")?,
+        )
         .await;
 
     let unread_launcher_invites =
@@ -140,7 +143,8 @@ pub async fn ws_init(
             &**pool,
             &redis,
         )
-        .await?
+        .await
+        .wrap_internal_err("fetching notifications from database")?
         .into_iter()
         .filter(|notification| {
             !notification.read
@@ -153,7 +157,12 @@ pub async fn ws_init(
         .map(Notification::from);
 
     for notification in unread_launcher_invites {
-        let _ = session.text(serde_json::to_string(&notification)?).await;
+        let _ = session
+            .text(
+                serde_json::to_string(&notification)
+                    .wrap_request_err("serializing launcher notification")?,
+            )
+            .await;
     }
 
     let db = db.clone();
@@ -168,12 +177,15 @@ pub async fn ws_init(
     #[cfg(debug_assertions)]
     tracing::info!("Connection {socket_id} opened by {}", user.id);
 
-    replace_user_status(None, Some(&status), &redis).await?;
+    replace_user_status(None, Some(&status), &redis)
+        .await
+        .wrap_internal_err("reading HTTP response body")?;
     broadcast_friends_message(
         &redis,
         RedisFriendsMessage::StatusUpdate { status },
     )
-    .await?;
+    .await
+    .wrap_internal_err("reading HTTP response body")?;
 
     let (shutdown_sender, mut shutdown_receiver) =
         tokio::sync::oneshot::channel::<()>();
diff --git a/apps/labrinth/src/routes/maven.rs b/apps/labrinth/src/routes/maven.rs
index bc351ccb03..a10e7d724c 100644
--- a/apps/labrinth/src/routes/maven.rs
+++ b/apps/labrinth/src/routes/maven.rs
@@ -11,6 +11,8 @@ use crate::models::pats::Scopes;
 use crate::models::projects::FileType;
 use crate::queue::session::AuthQueue;
 use crate::routes::ApiError;
+use crate::util::error::ApiContext as _;
+use crate::util::error::Context;
 use crate::{auth::get_user_from_headers, database};
 use actix_web::{HttpRequest, HttpResponse, get, route, web};
 use quick_xml::escape::escape;
@@ -85,9 +87,11 @@ pub async fn maven_metadata(
 ) -> Result<HttpResponse, ApiError> {
     let project_id = params.into_inner().0;
     let Some(project) =
-        database::models::DBProject::get(&project_id, &**pool, &redis).await?
+        database::models::DBProject::get(&project_id, &**pool, &redis)
+            .await
+            .wrap_api_err("fetching Maven project")?
     else {
-        return Err(ApiError::NotFound);
+        return Err(ApiError::NotFound(eyre::eyre!("resource not found")));
     };
 
     let user_option = get_user_from_headers(
@@ -101,8 +105,11 @@ pub async fn maven_metadata(
     .map(|x| x.1)
     .ok();
 
-    if !is_visible_project(&project.inner, &user_option, &pool, false).await? {
-        return Err(ApiError::NotFound);
+    if !is_visible_project(&project.inner, &user_option, &pool, false)
+        .await
+        .wrap_api_err("checking project visibility")?
+    {
+        return Err(ApiError::NotFound(eyre::eyre!("resource not found")));
     }
 
     let version_names = sqlx::query!(
@@ -119,7 +126,8 @@ pub async fn maven_metadata(
             .collect::<Vec<String>>(),
     )
     .fetch_all(&**pool)
-    .await?;
+    .await
+    .wrap_internal_err("fetching version names from database")?;
 
     let mut new_versions = Vec::new();
     let mut vals = HashSet::new();
@@ -162,9 +170,11 @@ pub async fn maven_metadata(
         },
     };
 
-    Ok(HttpResponse::Ok()
-        .content_type("text/xml")
-        .body(yaserde::ser::to_string(&respdata).map_err(ApiError::Xml)?))
+    Ok(HttpResponse::Ok().content_type("text/xml").body(
+        yaserde::ser::to_string(&respdata)
+            .map_err(eyre::Report::msg)
+            .wrap_internal_err("serializing Maven metadata as XML")?,
+    ))
 }
 
 async fn find_version(
@@ -179,7 +189,8 @@ async fn find_version(
 
     let all_versions =
         database::models::DBVersion::get_many(&project.versions, pool, redis)
-            .await?;
+            .await
+            .wrap_internal_err("fetching versions from database")?;
 
     let exact_matches = all_versions
         .iter()
@@ -199,7 +210,8 @@ async fn find_version(
     };
 
     let db_loaders: HashSet<String> = Loader::list(pool, redis)
-        .await?
+        .await
+        .wrap_internal_err("fetching loader from Redis")?
         .into_iter()
         .map(|x| x.loader)
         .collect();
@@ -310,9 +322,11 @@ pub async fn version_file(
 ) -> Result<HttpResponse, ApiError> {
     let (project_id, vnum, file) = params.into_inner();
     let Some(project) =
-        database::models::DBProject::get(&project_id, &**pool, &redis).await?
+        database::models::DBProject::get(&project_id, &**pool, &redis)
+            .await
+            .wrap_api_err("fetching Maven project")?
     else {
-        return Err(ApiError::NotFound);
+        return Err(ApiError::NotFound(eyre::eyre!("resource not found")));
     };
 
     let user_option = get_user_from_headers(
@@ -326,17 +340,25 @@ pub async fn version_file(
     .map(|x| x.1)
     .ok();
 
-    if !is_visible_project(&project.inner, &user_option, &pool, false).await? {
-        return Err(ApiError::NotFound);
+    if !is_visible_project(&project.inner, &user_option, &pool, false)
+        .await
+        .wrap_api_err("checking project visibility")?
+    {
+        return Err(ApiError::NotFound(eyre::eyre!("resource not found")));
     }
 
-    let Some(version) = find_version(&project, &vnum, &pool, &redis).await?
+    let Some(version) = find_version(&project, &vnum, &pool, &redis)
+        .await
+        .wrap_api_err("fetching Maven version")?
     else {
-        return Err(ApiError::NotFound);
+        return Err(ApiError::NotFound(eyre::eyre!("resource not found")));
     };
 
-    if !is_visible_version(&version.inner, &user_option, &pool, &redis).await? {
-        return Err(ApiError::NotFound);
+    if !is_visible_version(&version.inner, &user_option, &pool, &redis)
+        .await
+        .wrap_api_err("checking version visibility")?
+    {
+        return Err(ApiError::NotFound(eyre::eyre!("resource not found")));
     }
 
     if file.eq_ignore_ascii_case(&format!("{}-{}.pom", &project_id, &vnum)) {
@@ -352,9 +374,11 @@ pub async fn version_file(
             name: project.inner.name,
             description: escape(project.inner.summary).into_owned(),
         };
-        return Ok(HttpResponse::Ok()
-            .content_type("text/xml")
-            .body(yaserde::ser::to_string(&respdata).map_err(ApiError::Xml)?));
+        return Ok(HttpResponse::Ok().content_type("text/xml").body(
+            yaserde::ser::to_string(&respdata)
+                .map_err(eyre::Report::msg)
+                .wrap_internal_err("serializing Maven project as XML")?,
+        ));
     } else if let Some(selected_file) =
         find_file(&project_id, &vnum, &version, &file)
     {
@@ -363,7 +387,7 @@ pub async fn version_file(
             .body(""));
     }
 
-    Err(ApiError::NotFound)
+    Err(ApiError::NotFound(eyre::eyre!("resource not found")))
 }
 
 #[utoipa::path(
@@ -385,9 +409,11 @@ pub async fn version_file_sha1(
 ) -> Result<HttpResponse, ApiError> {
     let (project_id, vnum, file) = params.into_inner();
     let Some(project) =
-        database::models::DBProject::get(&project_id, &**pool, &redis).await?
+        database::models::DBProject::get(&project_id, &**pool, &redis)
+            .await
+            .wrap_api_err("fetching Maven project")?
     else {
-        return Err(ApiError::NotFound);
+        return Err(ApiError::NotFound(eyre::eyre!("resource not found")));
     };
 
     let user_option = get_user_from_headers(
@@ -401,17 +427,25 @@ pub async fn version_file_sha1(
     .map(|x| x.1)
     .ok();
 
-    if !is_visible_project(&project.inner, &user_option, &pool, false).await? {
-        return Err(ApiError::NotFound);
+    if !is_visible_project(&project.inner, &user_option, &pool, false)
+        .await
+        .wrap_api_err("checking project visibility")?
+    {
+        return Err(ApiError::NotFound(eyre::eyre!("resource not found")));
     }
 
-    let Some(version) = find_version(&project, &vnum, &pool, &redis).await?
+    let Some(version) = find_version(&project, &vnum, &pool, &redis)
+        .await
+        .wrap_api_err("fetching Maven version")?
     else {
-        return Err(ApiError::NotFound);
+        return Err(ApiError::NotFound(eyre::eyre!("resource not found")));
     };
 
-    if !is_visible_version(&version.inner, &user_option, &pool, &redis).await? {
-        return Err(ApiError::NotFound);
+    if !is_visible_version(&version.inner, &user_option, &pool, &redis)
+        .await
+        .wrap_api_err("checking version visibility")?
+    {
+        return Err(ApiError::NotFound(eyre::eyre!("resource not found")));
     }
 
     Ok(find_file(&project_id, &vnum, &version, &file)
@@ -441,9 +475,11 @@ pub async fn version_file_sha512(
 ) -> Result<HttpResponse, ApiError> {
     let (project_id, vnum, file) = params.into_inner();
     let Some(project) =
-        database::models::DBProject::get(&project_id, &**pool, &redis).await?
+        database::models::DBProject::get(&project_id, &**pool, &redis)
+            .await
+            .wrap_api_err("fetching Maven project")?
     else {
-        return Err(ApiError::NotFound);
+        return Err(ApiError::NotFound(eyre::eyre!("resource not found")));
     };
 
     let user_option = get_user_from_headers(
@@ -457,17 +493,25 @@ pub async fn version_file_sha512(
     .map(|x| x.1)
     .ok();
 
-    if !is_visible_project(&project.inner, &user_option, &pool, false).await? {
-        return Err(ApiError::NotFound);
+    if !is_visible_project(&project.inner, &user_option, &pool, false)
+        .await
+        .wrap_api_err("checking project visibility")?
+    {
+        return Err(ApiError::NotFound(eyre::eyre!("resource not found")));
     }
 
-    let Some(version) = find_version(&project, &vnum, &pool, &redis).await?
+    let Some(version) = find_version(&project, &vnum, &pool, &redis)
+        .await
+        .wrap_api_err("fetching Maven version")?
     else {
-        return Err(ApiError::NotFound);
+        return Err(ApiError::NotFound(eyre::eyre!("resource not found")));
     };
 
-    if !is_visible_version(&version.inner, &user_option, &pool, &redis).await? {
-        return Err(ApiError::NotFound);
+    if !is_visible_version(&version.inner, &user_option, &pool, &redis)
+        .await
+        .wrap_api_err("checking version visibility")?
+    {
+        return Err(ApiError::NotFound(eyre::eyre!("resource not found")));
     }
 
     Ok(find_file(&project_id, &vnum, &version, &file)
diff --git a/apps/labrinth/src/routes/mod.rs b/apps/labrinth/src/routes/mod.rs
index e9e606deba..fc5f72e75c 100644
--- a/apps/labrinth/src/routes/mod.rs
+++ b/apps/labrinth/src/routes/mod.rs
@@ -1,13 +1,10 @@
-use crate::database::models::DelphiReportIssueDetailsId;
 use crate::env::ENV;
-use crate::file_hosting::FileHostingError;
 use crate::util::cors::default_cors;
 use actix_cors::Cors;
 use actix_files::Files;
 use actix_web::http::StatusCode;
 use actix_web::{HttpResponse, web};
 use futures::FutureExt;
-use serde_json::json;
 use utoipa::openapi::extensions::ExtensionsBuilder;
 use utoipa::openapi::security::{HttpAuthScheme, HttpBuilder, SecurityScheme};
 
@@ -192,84 +189,49 @@ pub enum ApiError {
     /// Caller attempted a request which they are not allowed to make.
     #[error(transparent)]
     Auth(eyre::Report),
-    #[error("Invalid input: {0}")]
-    InvalidInput(String),
-    #[error("Error while uploading file: {0}")]
-    FileHosting(#[from] FileHostingError),
-    #[error("database error")]
-    Database(#[from] crate::database::models::DatabaseError),
-    // todo: remove this variant
-    #[error("Postgres database error: {0}")]
-    SqlxDatabase(#[from] sqlx::Error),
-    #[error("redis database error")]
-    RedisDatabase(#[from] redis::RedisError),
-    #[error("Clickhouse error: {0}")]
-    Clickhouse(#[from] clickhouse::error::Error),
-    #[error("XML error: {0}")]
-    Xml(String),
-    #[error("Deserialization error: {0}")]
-    Json(#[from] serde_json::Error),
-    #[error("Authentication error: {0}")]
-    Authentication(#[from] crate::auth::AuthenticationError),
-    #[error("Authentication error: {0}")]
-    CustomAuthentication(String),
-    #[error("Error while validating input: {0}")]
-    Validation(String),
-    #[error("Search error: {0}")]
-    Search(#[from] meilisearch_sdk::errors::Error),
-    #[error("Payments error: {0}")]
-    Payments(String),
-    #[error("Discord error: {0}")]
-    Discord(String),
-    #[error("Slack webhook error: {0}")]
-    Slack(String),
-    #[error("Captcha error. Try resubmitting the form.")]
-    Turnstile,
-    #[error("Error while decoding Base62: {0}")]
-    Decoding(#[from] ariadne::ids::DecodingError),
-    #[error("Image parsing error: {0}")]
-    ImageParse(#[from] image::ImageError),
-    #[error("Password hashing error: {0}")]
-    PasswordHashing(#[from] argon2::password_hash::Error),
-    #[error("{0}")]
-    Mail(#[from] crate::queue::email::MailError),
-    #[error("Error while rerouting request: {0:?}")]
-    Reroute(#[from] reqwest::Error),
-    #[error("Unable to read zip archive: {0}")]
-    Zip(#[from] zip::result::ZipError),
-    #[error("IO Error: {0}")]
-    Io(#[from] std::io::Error),
-    #[error("Resource not found")]
-    NotFound,
-    #[error("Conflict: {0}")]
-    Conflict(String),
-    #[error("precondition required: {0}")]
-    PreconditionRequired(String),
-    #[error("precondition failed: {0}")]
-    PreconditionFailed(String),
-    #[error("External tax compliance API error")]
-    TaxComplianceApi,
+    /// The requested resource does not exist.
     #[error(transparent)]
-    TaxProcessor(#[from] crate::util::anrok::AnrokError),
-    #[error(
-        "You are being rate-limited. Please wait {0} milliseconds. 0/{1} remaining."
-    )]
-    RateLimitError(u128, u32),
-    #[error("Error while interacting with payment processor: {0}")]
-    Stripe(#[from] stripe::StripeError),
-    #[error("Error while interacting with Delphi: {0:?}")]
-    Delphi(eyre::Error),
+    NotFound(eyre::Report),
+    /// The request conflicts with the current state of the resource.
     #[error(transparent)]
-    Mural(#[from] Box<muralpay::ApiError>),
-    #[error("report still has {} issue details with no verdict", details.len())]
-    TechReviewDetailsWithNoVerdict {
-        details: Vec<DelphiReportIssueDetailsId>,
-    },
+    Conflict(eyre::Report),
+    /// A service dependency failed to complete the request.
+    #[error(transparent)]
+    FailedDependency(eyre::Report),
+    /// The request requires a precondition.
+    #[error(transparent)]
+    PreconditionRequired(eyre::Report),
+    /// A request precondition was not met.
+    #[error(transparent)]
+    PreconditionFailed(eyre::Report),
+    /// The caller exceeded a request rate limit.
+    #[error(transparent)]
+    RateLimit(eyre::Report),
 }
 
 impl ApiError {
-    pub fn delphi(err: impl Into<eyre::Error>) -> Self {
-        Self::Delphi(err.into())
+    /// Adds context to the contained report while preserving the HTTP status.
+    pub(crate) fn wrap_err<D>(self, msg: D) -> Self
+    where
+        D: Send + Sync + std::fmt::Debug + std::fmt::Display + 'static,
+    {
+        match self {
+            Self::Internal(report) => Self::Internal(report.wrap_err(msg)),
+            Self::Request(report) => Self::Request(report.wrap_err(msg)),
+            Self::Auth(report) => Self::Auth(report.wrap_err(msg)),
+            Self::NotFound(report) => Self::NotFound(report.wrap_err(msg)),
+            Self::Conflict(report) => Self::Conflict(report.wrap_err(msg)),
+            Self::FailedDependency(report) => {
+                Self::FailedDependency(report.wrap_err(msg))
+            }
+            Self::PreconditionRequired(report) => {
+                Self::PreconditionRequired(report.wrap_err(msg))
+            }
+            Self::PreconditionFailed(report) => {
+                Self::PreconditionFailed(report.wrap_err(msg))
+            }
+            Self::RateLimit(report) => Self::RateLimit(report.wrap_err(msg)),
+        }
     }
 
     pub fn as_api_error<'a>(&self) -> crate::models::error::ApiError<'a> {
@@ -278,60 +240,15 @@ impl ApiError {
                 Self::Internal(..) => "internal_error",
                 Self::Request(..) => "request_error",
                 Self::Auth(..) => "auth_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::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::NotFound(..) => "not_found",
                 Self::Conflict(..) => "conflict",
+                Self::FailedDependency(..) => "failed_dependency",
                 Self::PreconditionRequired(..) => "precondition_required",
                 Self::PreconditionFailed(..) => "precondition_failed",
-                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",
-                Self::Delphi(..) => "delphi_error",
-                Self::Mural(..) => "mural_error",
-                Self::TechReviewDetailsWithNoVerdict { .. } => {
-                    "tech_review_issues_with_no_verdict"
-                }
-            },
-            description: match self {
-                Self::Internal(e) => format!("{e:#}"),
-                Self::Request(e) => format!("{e:#}"),
-                Self::Auth(e) => format!("{e:#}"),
-                _ => self.to_string(),
-            },
-            details: match self {
-                Self::Mural(err) => serde_json::to_value(err.clone()).ok(),
-                Self::TechReviewDetailsWithNoVerdict { details } => {
-                    let details = serde_json::to_value(details)
-                        .expect("details should never fail to serialize");
-                    Some(json!({
-                        "issue_details": details
-                    }))
-                }
-                _ => None,
+                Self::RateLimit(..) => "ratelimit_error",
             },
+            description: format!("{self:#}"),
+            details: None,
         }
     }
 }
@@ -342,42 +259,12 @@ impl actix_web::ResponseError for ApiError {
             Self::Internal(..) => StatusCode::INTERNAL_SERVER_ERROR,
             Self::Request(..) => StatusCode::BAD_REQUEST,
             Self::Auth(..) => StatusCode::UNAUTHORIZED,
-            Self::InvalidInput(..) => StatusCode::BAD_REQUEST,
-            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::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::NotFound(..) => StatusCode::NOT_FOUND,
             Self::Conflict(..) => StatusCode::CONFLICT,
+            Self::FailedDependency(..) => StatusCode::FAILED_DEPENDENCY,
             Self::PreconditionRequired(..) => StatusCode::PRECONDITION_REQUIRED,
             Self::PreconditionFailed(..) => StatusCode::PRECONDITION_FAILED,
-            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,
-            Self::Delphi(..) => StatusCode::INTERNAL_SERVER_ERROR,
-            Self::Mural(..) => StatusCode::BAD_REQUEST,
-            Self::TechReviewDetailsWithNoVerdict { .. } => {
-                StatusCode::BAD_REQUEST
-            }
+            Self::RateLimit(..) => StatusCode::TOO_MANY_REQUESTS,
         }
     }
 
diff --git a/apps/labrinth/src/routes/updates.rs b/apps/labrinth/src/routes/updates.rs
index 7b287c6cf9..95db80199d 100644
--- a/apps/labrinth/src/routes/updates.rs
+++ b/apps/labrinth/src/routes/updates.rs
@@ -1,3 +1,5 @@
+use crate::util::error::ApiContext as _;
+use crate::util::error::Context as _;
 use std::cmp::Reverse;
 use std::collections::HashMap;
 
@@ -55,8 +57,9 @@ pub async fn forge_updates(
     let (id,) = info.into_inner();
 
     let project = database::models::DBProject::get(&id, &**pool, &redis)
-        .await?
-        .ok_or_else(|| ApiError::InvalidInput(ERROR.to_string()))?;
+        .await
+        .wrap_api_err("fetching project from database")?
+        .wrap_request_err_with(|| ERROR.to_string())?;
 
     let user_option = get_user_from_headers(
         &req,
@@ -69,8 +72,11 @@ pub async fn forge_updates(
     .map(|x| x.1)
     .ok();
 
-    if !is_visible_project(&project.inner, &user_option, &pool, false).await? {
-        return Err(ApiError::InvalidInput(ERROR.to_string()));
+    if !is_visible_project(&project.inner, &user_option, &pool, false)
+        .await
+        .wrap_api_err("checking project visibility")?
+    {
+        return Err(ApiError::Request(eyre::eyre!("{ERROR}")));
     }
 
     let versions = database::models::DBVersion::get_many(
@@ -78,7 +84,8 @@ pub async fn forge_updates(
         &***ro_pool,
         &redis,
     )
-    .await?;
+    .await
+    .wrap_internal_err("fetching versions from database")?;
 
     let loaders = match &*neo.neoforge {
         "only" => |x: &String| *x == "neoforge",
@@ -96,7 +103,8 @@ pub async fn forge_updates(
         &ro_pool,
         &redis,
     )
-    .await?;
+    .await
+    .wrap_api_err("fetching compatible update versions")?;
 
     versions.sort_by_key(|b| Reverse(b.date_published));
 
diff --git a/apps/labrinth/src/routes/v2/notifications.rs b/apps/labrinth/src/routes/v2/notifications.rs
index f84f58ab5d..52f279fa6c 100644
--- a/apps/labrinth/src/routes/v2/notifications.rs
+++ b/apps/labrinth/src/routes/v2/notifications.rs
@@ -6,6 +6,7 @@ use crate::queue::session::AuthQueue;
 use crate::routes::ApiError;
 use crate::routes::v2_reroute;
 use crate::routes::v3;
+use crate::util::error::ApiContext as _;
 use actix_web::{HttpRequest, HttpResponse, delete, get, patch, web};
 use serde::{Deserialize, Serialize};
 use xredis::RedisPool;
@@ -65,7 +66,11 @@ pub async fn notifications_get(
     )
     .await
     .or_else(v2_reroute::flatten_404_error);
-    match v2_reroute::extract_ok_json::<Vec<Notification>>(resp?).await {
+    match v2_reroute::extract_ok_json::<Vec<Notification>>(
+        resp.wrap_api_err("extracting v2 response body")?,
+    )
+    .await
+    {
         Ok(notifications) => {
             let notifications: Vec<LegacyNotification> = notifications
                 .into_iter()
@@ -115,7 +120,8 @@ pub async fn notification_get(
         session_queue,
     )
     .await
-    .or_else(v2_reroute::flatten_404_error)?;
+    .or_else(v2_reroute::flatten_404_error)
+    .wrap_api_err("flattening v2 not-found response")?;
     match v2_reroute::extract_ok_json::<Notification>(response).await {
         Ok(notification) => {
             let notification = LegacyNotification::from(notification);
diff --git a/apps/labrinth/src/routes/v2/projects.rs b/apps/labrinth/src/routes/v2/projects.rs
index d36bae318f..407d6359b2 100644
--- a/apps/labrinth/src/routes/v2/projects.rs
+++ b/apps/labrinth/src/routes/v2/projects.rs
@@ -13,6 +13,8 @@ use crate::queue::session::AuthQueue;
 use crate::routes::v3::projects::ProjectIds;
 use crate::routes::{ApiError, v2_reroute, v3};
 use crate::search::{SearchBackend, SearchRequest, SearchState};
+use crate::util::error::ApiContext as _;
+use crate::util::error::Context as _;
 use actix_web::{HttpRequest, HttpResponse, delete, get, patch, post, web};
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
@@ -79,7 +81,8 @@ pub async fn project_search(
     // While the backend for this has changed, it doesnt affect much
     // in the API calls except that 'versions:x' is now 'game_versions:x'
     let facets: Option<Vec<Vec<String>>> = if let Some(facets) = info.facets {
-        let facets = serde_json::from_str::<Vec<Vec<String>>>(&facets)?;
+        let facets = serde_json::from_str::<Vec<Vec<String>>>(&facets)
+            .wrap_request_err("deserializing JSON data")?;
 
         Some(
             facets
@@ -119,7 +122,10 @@ pub async fn project_search(
         ..info
     };
 
-    let results = search_backend.search_for_project(&info, &redis).await?;
+    let results = search_backend
+        .search_for_project(&info, &redis)
+        .await
+        .wrap_api_err("searching projects")?;
 
     let results = LegacySearchResults::from(results);
 
@@ -194,12 +200,17 @@ pub async fn random_projects_get(
     )
     .await
     .or_else(v2_reroute::flatten_404_error)
-    .or_else(v2_reroute::flatten_404_error)?;
+    .or_else(v2_reroute::flatten_404_error)
+    .wrap_api_err("flattening v2 not-found response")?;
     // Convert response to V2 format
     match v2_reroute::extract_ok_json::<Vec<Project>>(response).await {
         Ok(project) => {
             let legacy_projects =
-                LegacyProject::from_many(project, &**pool, &redis).await?;
+                LegacyProject::from_many(project, &**pool, &redis)
+                    .await
+                    .wrap_internal_err(
+                        "executing `LegacyProject::from_many`",
+                    )?;
             Ok(HttpResponse::Ok().json(legacy_projects))
         }
         Err(response) => Ok(response),
@@ -234,13 +245,18 @@ pub async fn projects_get(
     )
     .await
     .or_else(v2_reroute::flatten_404_error)
-    .or_else(v2_reroute::flatten_404_error)?;
+    .or_else(v2_reroute::flatten_404_error)
+    .wrap_api_err("flattening v2 not-found response")?;
 
     // Convert response to V2 format
     match v2_reroute::extract_ok_json::<Vec<Project>>(response).await {
         Ok(project) => {
             let legacy_projects =
-                LegacyProject::from_many(project, &**pool, &redis).await?;
+                LegacyProject::from_many(project, &**pool, &redis)
+                    .await
+                    .wrap_internal_err(
+                        "executing `LegacyProject::from_many`",
+                    )?;
             Ok(HttpResponse::Ok().json(legacy_projects))
         }
         Err(response) => Ok(response),
@@ -284,14 +300,18 @@ pub async fn project_get(
     .await
     {
         Ok(resp) => resp.0,
-        Err(ApiError::NotFound) => return Ok(HttpResponse::NotFound().body("")),
+        Err(ApiError::NotFound(_)) => {
+            return Ok(HttpResponse::NotFound().body(""));
+        }
         Err(err) => return Err(err),
     };
 
     // Convert response to V2 format
     let version_item = match project.versions.first() {
         Some(vid) => {
-            version_item::DBVersion::get((*vid).into(), &**pool, &redis).await?
+            version_item::DBVersion::get((*vid).into(), &**pool, &redis)
+                .await
+                .wrap_internal_err("fetching version from database")?
         }
         None => None,
     };
@@ -371,7 +391,8 @@ pub async fn dependency_list(
         session_queue,
     )
     .await
-    .or_else(v2_reroute::flatten_404_error)?;
+    .or_else(v2_reroute::flatten_404_error)
+    .wrap_api_err("flattening v2 not-found response")?;
 
     match v2_reroute::extract_ok_json::<
         crate::routes::v3::projects::DependencyInfo,
@@ -384,7 +405,10 @@ pub async fn dependency_list(
                 &**pool,
                 &redis,
             )
-            .await?;
+            .await
+            .wrap_internal_err(
+                "converting dependency projects to legacy responses",
+            )?;
             let converted_versions = dependency_info
                 .versions
                 .into_iter()
@@ -585,7 +609,9 @@ pub async fn project_edit(
     if let Some(donation_urls) = v2_new_project.donation_urls {
         // Fetch current donation links from project so we know what to delete
         let fetched_example_project =
-            project_item::DBProject::get(&info.0, &**pool, &redis).await?;
+            project_item::DBProject::get(&info.0, &**pool, &redis)
+                .await
+                .wrap_api_err("fetching project from database")?;
         let donation_links = fetched_example_project
             .map(|x| {
                 x.urls
@@ -647,7 +673,8 @@ pub async fn project_edit(
         search_state.clone(),
     )
     .await
-    .or_else(v2_reroute::flatten_404_error)?;
+    .or_else(v2_reroute::flatten_404_error)
+    .wrap_api_err("flattening v2 not-found response")?;
 
     // If client and server side were set, we will call
     // the version setting route for each version to set the side types for each of them.
@@ -659,11 +686,13 @@ pub async fn project_edit(
             &**pool,
             &redis,
         )
-        .await?;
+        .await
+        .wrap_api_err("fetching project from database")?;
         let version_ids = project_item.map(|x| x.versions).unwrap_or_default();
         let versions =
             version_item::DBVersion::get_many(&version_ids, &**pool, &redis)
-                .await?;
+                .await
+                .wrap_internal_err("fetching versions from database")?;
         for version in versions {
             let version = Version::from(version);
             let mut fields = version.fields;
@@ -690,7 +719,8 @@ pub async fn project_edit(
                 session_queue.clone(),
                 search_state.clone(),
             )
-            .await?;
+            .await
+            .wrap_api_err("editing project")?;
         }
     }
     Ok(response)
@@ -795,7 +825,9 @@ pub async fn projects_edit(
     // If we are *setting* donation links, we will set every possible donation link to None, as
     // setting will delete all of them then 're-add' the ones we want to keep
     if let Some(donation_url) = bulk_edit_project.donation_urls {
-        let link_platforms = LinkPlatform::list(&**pool, &redis).await?;
+        let link_platforms = LinkPlatform::list(&**pool, &redis)
+            .await
+            .wrap_internal_err("fetching link platform from Redis")?;
         for link in link_platforms {
             if link.donation {
                 link_urls.insert(link.name, None);
diff --git a/apps/labrinth/src/routes/v2/reports.rs b/apps/labrinth/src/routes/v2/reports.rs
index c50950e544..041900e5f7 100644
--- a/apps/labrinth/src/routes/v2/reports.rs
+++ b/apps/labrinth/src/routes/v2/reports.rs
@@ -3,6 +3,7 @@ use crate::models::reports::Report;
 use crate::models::v2::reports::LegacyReport;
 use crate::queue::session::AuthQueue;
 use crate::routes::{ApiError, v2_reroute, v3};
+use crate::util::error::ApiContext as _;
 use actix_web::{HttpRequest, HttpResponse, delete, get, patch, post, web};
 use serde::Deserialize;
 use validator::Validate;
@@ -44,7 +45,8 @@ pub async fn report_create(
     let response =
         v3::reports::report_create(req, pool, body, redis, session_queue)
             .await
-            .or_else(v2_reroute::flatten_404_error)?;
+            .or_else(v2_reroute::flatten_404_error)
+            .wrap_api_err("flattening v2 not-found response")?;
 
     // Convert response to V2 format
     match v2_reroute::extract_ok_json::<Report>(response).await {
@@ -109,7 +111,8 @@ pub async fn reports(
         session_queue,
     )
     .await
-    .or_else(v2_reroute::flatten_404_error)?;
+    .or_else(v2_reroute::flatten_404_error)
+    .wrap_api_err("flattening v2 not-found response")?;
 
     // Convert response to V2 format
     match v2_reroute::extract_ok_json::<Vec<Report>>(response).await {
@@ -164,7 +167,8 @@ pub async fn reports_get(
         session_queue,
     )
     .await
-    .or_else(v2_reroute::flatten_404_error)?;
+    .or_else(v2_reroute::flatten_404_error)
+    .wrap_api_err("flattening v2 not-found response")?;
 
     // Convert response to V2 format
     match v2_reroute::extract_ok_json::<Vec<Report>>(response).await {
@@ -209,7 +213,8 @@ pub async fn report_get(
     let response =
         v3::reports::report_get(req, pool, redis, info, session_queue)
             .await
-            .or_else(v2_reroute::flatten_404_error)?;
+            .or_else(v2_reroute::flatten_404_error)
+            .wrap_api_err("flattening v2 not-found response")?;
 
     // Convert response to V2 format
     match v2_reroute::extract_ok_json::<Report>(response).await {
diff --git a/apps/labrinth/src/routes/v2/statistics.rs b/apps/labrinth/src/routes/v2/statistics.rs
index 94ac6f66e9..fed3166c32 100644
--- a/apps/labrinth/src/routes/v2/statistics.rs
+++ b/apps/labrinth/src/routes/v2/statistics.rs
@@ -3,6 +3,7 @@ use crate::routes::{
     ApiError, v2_reroute,
     v3::{self, statistics::V3Stats},
 };
+use crate::util::error::ApiContext as _;
 use actix_web::{HttpResponse, get, web};
 
 pub fn config(cfg: &mut actix_web::web::ServiceConfig) {
@@ -36,7 +37,8 @@ pub async fn get_stats(
 ) -> Result<HttpResponse, ApiError> {
     let response = v3::statistics::get_stats(pool)
         .await
-        .or_else(v2_reroute::flatten_404_error)?;
+        .or_else(v2_reroute::flatten_404_error)
+        .wrap_api_err("flattening v2 not-found response")?;
 
     match v2_reroute::extract_ok_json::<V3Stats>(response).await {
         Ok(stats) => {
diff --git a/apps/labrinth/src/routes/v2/tags.rs b/apps/labrinth/src/routes/v2/tags.rs
index 56a86ca46d..ac14c0b412 100644
--- a/apps/labrinth/src/routes/v2/tags.rs
+++ b/apps/labrinth/src/routes/v2/tags.rs
@@ -1,3 +1,4 @@
+use crate::util::error::ApiContext as _;
 use std::collections::HashMap;
 
 use super::ApiError;
@@ -54,7 +55,9 @@ pub async fn category_list(
     pool: web::Data<PgPool>,
     redis: web::Data<RedisPool>,
 ) -> Result<HttpResponse, ApiError> {
-    let response = v3::tags::category_list(pool, redis).await?;
+    let response = v3::tags::category_list(pool, redis)
+        .await
+        .wrap_api_err("executing `tags::category_list`")?;
 
     // Convert to V2 format
     match v2_reroute::extract_ok_json::<Vec<v3::tags::CategoryData>>(response)
@@ -102,7 +105,9 @@ pub async fn loader_list(
     pool: web::Data<PgPool>,
     redis: web::Data<RedisPool>,
 ) -> Result<HttpResponse, ApiError> {
-    let response = v3::tags::loader_list(pool, redis).await?;
+    let response = v3::tags::loader_list(pool, redis)
+        .await
+        .wrap_api_err("executing `tags::loader_list`")?;
 
     // Convert to V2 format
     match v2_reroute::extract_ok_json::<Vec<v3::tags::LoaderData>>(response)
@@ -198,7 +203,8 @@ pub async fn game_version_list(
         }),
         redis,
     )
-    .await?;
+    .await
+    .wrap_api_err("fetching game versions")?;
 
     // Convert to V2 format
     Ok(
@@ -293,7 +299,8 @@ pub async fn license_text(
 ) -> Result<HttpResponse, ApiError> {
     let license = v3::tags::license_text(params)
         .await
-        .or_else(v2_reroute::flatten_404_error)?;
+        .or_else(v2_reroute::flatten_404_error)
+        .wrap_api_err("flattening v2 not-found response")?;
 
     // Convert to V2 format
     Ok(
@@ -339,7 +346,9 @@ pub async fn donation_platform_list(
     pool: web::Data<PgPool>,
     redis: web::Data<RedisPool>,
 ) -> Result<HttpResponse, ApiError> {
-    let response = v3::tags::link_platform_list(pool, redis).await?;
+    let response = v3::tags::link_platform_list(pool, redis)
+        .await
+        .wrap_api_err("executing `tags::link_platform_list`")?;
 
     // Convert to V2 format
     Ok(
diff --git a/apps/labrinth/src/routes/v2/teams.rs b/apps/labrinth/src/routes/v2/teams.rs
index 36c373094e..cdd4e30665 100644
--- a/apps/labrinth/src/routes/v2/teams.rs
+++ b/apps/labrinth/src/routes/v2/teams.rs
@@ -6,6 +6,7 @@ use crate::models::teams::{
 use crate::models::v2::teams::LegacyTeamMember;
 use crate::queue::session::AuthQueue;
 use crate::routes::{ApiError, v2_reroute, v3};
+use crate::util::error::ApiContext as _;
 use actix_web::{HttpRequest, HttpResponse, delete, get, patch, post, web};
 use ariadne::ids::UserId;
 use rust_decimal::Decimal;
@@ -63,7 +64,8 @@ pub async fn team_members_get_project(
         session_queue,
     )
     .await
-    .or_else(v2_reroute::flatten_404_error)?;
+    .or_else(v2_reroute::flatten_404_error)
+    .wrap_api_err("flattening v2 not-found response")?;
     // Convert response to V2 format
     match v2_reroute::extract_ok_json::<Vec<TeamMember>>(response).await {
         Ok(members) => {
@@ -101,7 +103,8 @@ pub async fn team_members_get(
     let response =
         v3::teams::team_members_get(req, info, pool, redis, session_queue)
             .await
-            .or_else(v2_reroute::flatten_404_error)?;
+            .or_else(v2_reroute::flatten_404_error)
+            .wrap_api_err("flattening v2 not-found response")?;
     // Convert response to V2 format
     match v2_reroute::extract_ok_json::<Vec<TeamMember>>(response).await {
         Ok(members) => {
@@ -148,7 +151,11 @@ pub async fn teams_get(
     .await
     .or_else(v2_reroute::flatten_404_error);
     // Convert response to V2 format
-    match v2_reroute::extract_ok_json::<Vec<Vec<TeamMember>>>(response?).await {
+    match v2_reroute::extract_ok_json::<Vec<Vec<TeamMember>>>(
+        response.wrap_api_err("extracting v2 response body")?,
+    )
+    .await
+    {
         Ok(members) => {
             let members = members
                 .into_iter()
diff --git a/apps/labrinth/src/routes/v2/threads.rs b/apps/labrinth/src/routes/v2/threads.rs
index 3854d4977a..e110ef5b98 100644
--- a/apps/labrinth/src/routes/v2/threads.rs
+++ b/apps/labrinth/src/routes/v2/threads.rs
@@ -5,6 +5,7 @@ use crate::models::threads::{MessageBody, Thread};
 use crate::models::v2::threads::LegacyThread;
 use crate::queue::session::AuthQueue;
 use crate::routes::{ApiError, v2_reroute, v3};
+use crate::util::error::ApiContext as _;
 use actix_web::{HttpRequest, HttpResponse, delete, get, post, web};
 use serde::Deserialize;
 use xredis::RedisPool;
@@ -88,7 +89,8 @@ pub async fn threads_get(
         session_queue,
     )
     .await
-    .or_else(v2_reroute::flatten_404_error)?;
+    .or_else(v2_reroute::flatten_404_error)
+    .wrap_api_err("flattening v2 not-found response")?;
 
     // Convert response to V2 format
     match v2_reroute::extract_ok_json::<Vec<Thread>>(response).await {
diff --git a/apps/labrinth/src/routes/v2/users.rs b/apps/labrinth/src/routes/v2/users.rs
index 5879315336..3c5dae8e8e 100644
--- a/apps/labrinth/src/routes/v2/users.rs
+++ b/apps/labrinth/src/routes/v2/users.rs
@@ -8,6 +8,8 @@ use crate::models::v2::projects::LegacyProject;
 use crate::models::v2::user::LegacyUser;
 use crate::queue::session::AuthQueue;
 use crate::routes::{ApiError, v2_reroute, v3};
+use crate::util::error::ApiContext as _;
+use crate::util::error::Context as _;
 use actix_web::{HttpRequest, HttpResponse, delete, get, patch, web};
 use serde::{Deserialize, Serialize};
 use validator::Validate;
@@ -53,7 +55,8 @@ pub async fn user_auth_get(
 ) -> Result<HttpResponse, ApiError> {
     let response = v3::users::user_auth_get(req, pool, redis, session_queue)
         .await
-        .or_else(v2_reroute::flatten_404_error)?;
+        .or_else(v2_reroute::flatten_404_error)
+        .wrap_api_err("flattening v2 not-found response")?;
 
     // Convert response to V2 format
     match v2_reroute::extract_ok_json::<User>(response).await {
@@ -96,7 +99,8 @@ pub async fn users_get(
         session_queue,
     )
     .await
-    .or_else(v2_reroute::flatten_404_error)?;
+    .or_else(v2_reroute::flatten_404_error)
+    .wrap_api_err("flattening v2 not-found response")?;
 
     // Convert response to V2 format
     match v2_reroute::extract_ok_json::<Vec<User>>(response).await {
@@ -136,7 +140,8 @@ pub async fn user_get(
 ) -> Result<HttpResponse, ApiError> {
     let response = v3::users::user_get(req, info, pool, redis, session_queue)
         .await
-        .or_else(v2_reroute::flatten_404_error)?;
+        .or_else(v2_reroute::flatten_404_error)
+        .wrap_api_err("flattening v2 not-found response")?;
 
     // Convert response to V2 format
     match v2_reroute::extract_ok_json::<User>(response).await {
@@ -181,13 +186,18 @@ pub async fn projects_list(
         session_queue,
     )
     .await
-    .or_else(v2_reroute::flatten_404_error)?;
+    .or_else(v2_reroute::flatten_404_error)
+    .wrap_api_err("flattening v2 not-found response")?;
 
     // Convert to V2 projects
     match v2_reroute::extract_ok_json::<Vec<Project>>(response).await {
         Ok(project) => {
             let legacy_projects =
-                LegacyProject::from_many(project, &**pool, &redis).await?;
+                LegacyProject::from_many(project, &**pool, &redis)
+                    .await
+                    .wrap_internal_err(
+                        "executing `LegacyProject::from_many`",
+                    )?;
             Ok(HttpResponse::Ok().json(legacy_projects))
         }
         Err(response) => Ok(response),
@@ -448,13 +458,18 @@ pub async fn user_follows(
         session_queue,
     )
     .await
-    .or_else(v2_reroute::flatten_404_error)?;
+    .or_else(v2_reroute::flatten_404_error)
+    .wrap_api_err("flattening v2 not-found response")?;
 
     // Convert to V2 projects
     match v2_reroute::extract_ok_json::<Vec<Project>>(response).await {
         Ok(project) => {
             let legacy_projects =
-                LegacyProject::from_many(project, &**pool, &redis).await?;
+                LegacyProject::from_many(project, &**pool, &redis)
+                    .await
+                    .wrap_internal_err(
+                        "executing `LegacyProject::from_many`",
+                    )?;
             Ok(HttpResponse::Ok().json(legacy_projects))
         }
         Err(response) => Ok(response),
@@ -494,7 +509,8 @@ pub async fn user_notifications(
     let response =
         v3::users::user_notifications(req, info, pool, redis, session_queue)
             .await
-            .or_else(v2_reroute::flatten_404_error)?;
+            .or_else(v2_reroute::flatten_404_error)
+            .wrap_api_err("flattening v2 not-found response")?;
     // Convert response to V2 format
     match v2_reroute::extract_ok_json::<Vec<Notification>>(response).await {
         Ok(notifications) => {
diff --git a/apps/labrinth/src/routes/v2/version_file.rs b/apps/labrinth/src/routes/v2/version_file.rs
index a4c529b8c1..f1db94c0bf 100644
--- a/apps/labrinth/src/routes/v2/version_file.rs
+++ b/apps/labrinth/src/routes/v2/version_file.rs
@@ -7,6 +7,8 @@ use crate::queue::session::AuthQueue;
 use crate::routes::HashAlgorithm;
 use crate::routes::v3::version_file::{DownloadRedirect, HashQuery};
 use crate::routes::{FileHash, v2_reroute, v3};
+use crate::util::error::ApiContext as _;
+use crate::util::error::Context as _;
 use actix_web::{HttpRequest, HttpResponse, delete, get, post, web};
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
@@ -69,7 +71,8 @@ pub async fn get_version_from_hash(
         session_queue,
     )
     .await
-    .or_else(v2_reroute::flatten_404_error)?;
+    .or_else(v2_reroute::flatten_404_error)
+    .wrap_api_err("flattening v2 not-found response")?;
 
     // Convert response to V2 format
     match v2_reroute::extract_ok_json::<Version>(response).await {
@@ -233,7 +236,8 @@ pub async fn get_update_from_hash(
         session_queue,
     )
     .await
-    .or_else(v2_reroute::flatten_404_error)?;
+    .or_else(v2_reroute::flatten_404_error)
+    .wrap_api_err("flattening v2 not-found response")?;
 
     // Convert response to V2 format
     match v2_reroute::extract_ok_json::<Version>(response).await {
@@ -289,7 +293,8 @@ pub async fn get_versions_from_hashes(
         session_queue,
     )
     .await
-    .or_else(v2_reroute::flatten_404_error)?;
+    .or_else(v2_reroute::flatten_404_error)
+    .wrap_api_err("flattening v2 not-found response")?;
 
     // Convert to V2
     match v2_reroute::extract_ok_json::<HashMap<String, Version>>(response)
@@ -342,7 +347,8 @@ pub async fn get_projects_from_hashes(
         session_queue,
     )
     .await
-    .or_else(v2_reroute::flatten_404_error)?;
+    .or_else(v2_reroute::flatten_404_error)
+    .wrap_api_err("flattening v2 not-found response")?;
 
     // Convert to V2
     match v2_reroute::extract_ok_json::<HashMap<String, Project>>(response)
@@ -361,7 +367,8 @@ pub async fn get_projects_from_hashes(
                 &**pool,
                 &redis,
             )
-            .await?;
+            .await
+            .wrap_internal_err("converting projects to legacy responses")?;
             let legacy_projects_hashes = hash_to_project_id
                 .into_iter()
                 .filter_map(|(hash, project_id)| {
@@ -426,7 +433,9 @@ pub async fn update_files(
     .await
     {
         Ok(resp) => resp,
-        Err(ApiError::NotFound) => return Ok(HttpResponse::NotFound().body("")),
+        Err(ApiError::NotFound(_)) => {
+            return Ok(HttpResponse::NotFound().body(""));
+        }
         Err(err) => return Err(err),
     };
 
@@ -477,7 +486,9 @@ pub async fn update_files_many(
     .await
     {
         Ok(resp) => resp,
-        Err(ApiError::NotFound) => return Ok(HttpResponse::NotFound().body("")),
+        Err(ApiError::NotFound(_)) => {
+            return Ok(HttpResponse::NotFound().body(""));
+        }
         Err(err) => return Err(err),
     };
 
@@ -565,7 +576,8 @@ pub async fn update_individual_files(
         session_queue,
     )
     .await
-    .or_else(v2_reroute::flatten_404_error)?;
+    .or_else(v2_reroute::flatten_404_error)
+    .wrap_api_err("flattening v2 not-found response")?;
 
     // Convert response to V2 format
     match v2_reroute::extract_ok_json::<HashMap<String, Version>>(response)
diff --git a/apps/labrinth/src/routes/v2/versions.rs b/apps/labrinth/src/routes/v2/versions.rs
index 2ffb4abd93..ec94f169ba 100644
--- a/apps/labrinth/src/routes/v2/versions.rs
+++ b/apps/labrinth/src/routes/v2/versions.rs
@@ -1,3 +1,5 @@
+use crate::util::error::ApiContext as _;
+use crate::util::error::Context as _;
 use std::collections::HashMap;
 
 use super::ApiError;
@@ -138,7 +140,8 @@ pub async fn version_list(
         session_queue,
     )
     .await
-    .or_else(v2_reroute::flatten_404_error)?;
+    .or_else(v2_reroute::flatten_404_error)
+    .wrap_api_err("flattening v2 not-found response")?;
 
     // Convert response to V2 format
     match v2_reroute::extract_ok_json::<Vec<Version>>(response).await {
@@ -191,7 +194,8 @@ pub async fn version_project_get(
         session_queue,
     )
     .await
-    .or_else(v2_reroute::flatten_404_error)?;
+    .or_else(v2_reroute::flatten_404_error)
+    .wrap_api_err("flattening v2 not-found response")?;
     // Convert response to V2 format
     match v2_reroute::extract_ok_json::<Version>(response).await {
         Ok(version) => {
@@ -242,7 +246,8 @@ pub async fn versions_get(
         session_queue,
     )
     .await
-    .or_else(v2_reroute::flatten_404_error)?;
+    .or_else(v2_reroute::flatten_404_error)
+    .wrap_api_err("flattening v2 not-found response")?;
 
     // Convert response to V2 format
     match v2_reroute::extract_ok_json::<Vec<Version>>(response).await {
@@ -294,7 +299,8 @@ pub async fn version_get(
     )
     .await
     .map(|b| HttpResponse::Ok().json(b))
-    .or_else(v2_reroute::flatten_404_error)?;
+    .or_else(v2_reroute::flatten_404_error)
+    .wrap_api_err("flattening v2 not-found response")?;
     // Convert response to V2 format
     match v2_reroute::extract_ok_json::<Version>(response).await {
         Ok(version) => {
@@ -396,7 +402,9 @@ pub async fn version_edit(
     .await
     {
         Ok(resp) => resp,
-        Err(ApiError::NotFound) => return Ok(HttpResponse::NotFound().body("")),
+        Err(ApiError::NotFound(_)) => {
+            return Ok(HttpResponse::NotFound().body(""));
+        }
         Err(err) => return Err(err),
     };
     let old_version = match v2_reroute::extract_ok_json::<Version>(
@@ -450,12 +458,16 @@ pub async fn version_edit(
         info,
         pool,
         redis,
-        web::Json(serde_json::to_value(new_version)?),
+        web::Json(
+            serde_json::to_value(new_version)
+                .wrap_request_err("serializing version edit")?,
+        ),
         session_queue,
         search_state,
     )
     .await
-    .or_else(v2_reroute::flatten_404_error)?;
+    .or_else(v2_reroute::flatten_404_error)
+    .wrap_api_err("editing version through v3 route")?;
     Ok(response)
 }
 
diff --git a/apps/labrinth/src/routes/v2_reroute.rs b/apps/labrinth/src/routes/v2_reroute.rs
index 0a99b0796c..5576c0f2fa 100644
--- a/apps/labrinth/src/routes/v2_reroute.rs
+++ b/apps/labrinth/src/routes/v2_reroute.rs
@@ -45,7 +45,7 @@ where
 // This should not be used on the fallback no-route-found handler
 pub fn flatten_404_error(res: ApiError) -> Result<HttpResponse, ApiError> {
     match res {
-        ApiError::NotFound => Ok(HttpResponse::NotFound().body("")),
+        ApiError::NotFound(_) => Ok(HttpResponse::NotFound().body("")),
         _ => Err(res),
     }
 }
diff --git a/apps/labrinth/src/routes/v3/analytics_get/facets/fixed.rs b/apps/labrinth/src/routes/v3/analytics_get/facets/fixed.rs
index 14b1f68911..02a37254bb 100644
--- a/apps/labrinth/src/routes/v3/analytics_get/facets/fixed.rs
+++ b/apps/labrinth/src/routes/v3/analytics_get/facets/fixed.rs
@@ -3,6 +3,7 @@ use super::{
     AnalyticsFacets, ProjectDownloadsFacets, ProjectPlaytimeFacets,
     ProjectViewsFacets,
 };
+use crate::util::error::ApiContext as _;
 use crate::{
     database::PgPool, models::v3::analytics::DownloadReason, routes::ApiError,
     util::tags::valid_download_tags,
@@ -13,7 +14,9 @@ pub async fn fetch(
     pool: &PgPool,
     redis: &RedisPool,
 ) -> Result<AnalyticsFacets, ApiError> {
-    let tags = valid_download_tags(pool, redis).await?;
+    let tags = valid_download_tags(pool, redis)
+        .await
+        .wrap_api_err("executing `valid_download_tags`")?;
     let mut loaders = tags.loaders.iter().cloned().collect::<Vec<_>>();
     loaders.sort();
     let mut game_versions =
diff --git a/apps/labrinth/src/routes/v3/analytics_get/facets/mod.rs b/apps/labrinth/src/routes/v3/analytics_get/facets/mod.rs
index 02218bcec9..c61ea4f565 100644
--- a/apps/labrinth/src/routes/v3/analytics_get/facets/mod.rs
+++ b/apps/labrinth/src/routes/v3/analytics_get/facets/mod.rs
@@ -1,3 +1,5 @@
+use crate::util::error::ApiContext as _;
+use crate::util::error::Context as _;
 use xredis::RedisPool;
 mod fixed;
 
@@ -78,9 +80,12 @@ pub async fn fetch_facets(
         &session_queue,
         Scopes::ANALYTICS,
     )
-    .await?;
+    .await
+    .wrap_auth_err("authenticating API request")?;
 
-    let facets = fixed::fetch(&pool, &redis).await?;
+    let facets = fixed::fetch(&pool, &redis)
+        .await
+        .wrap_api_err("executing `fixed::fetch`")?;
 
     Ok(web::Json(FacetsResponse { facets }))
 }
diff --git a/apps/labrinth/src/routes/v3/analytics_get/metrics/affiliate_code_conversions.rs b/apps/labrinth/src/routes/v3/analytics_get/metrics/affiliate_code_conversions.rs
index c62f1e0e0b..29e611ccab 100644
--- a/apps/labrinth/src/routes/v3/analytics_get/metrics/affiliate_code_conversions.rs
+++ b/apps/labrinth/src/routes/v3/analytics_get/metrics/affiliate_code_conversions.rs
@@ -1,3 +1,4 @@
+use crate::util::error::ApiContext as _;
 use futures::StreamExt;
 use serde::{Deserialize, Serialize};
 
@@ -91,7 +92,12 @@ pub(crate) async fn fetch(
         &filter_affiliate_code_ids,
     )
     .fetch(pool);
-    while let Some(row) = rows.next().await.transpose()? {
+    while let Some(row) = rows
+        .next()
+        .await
+        .transpose()
+        .wrap_internal_err("fetching affiliate code conversions")?
+    {
         let bucket = row
             .bucket
             .wrap_internal_err("bucket should be non-null - query bug!")?;
@@ -116,7 +122,8 @@ pub(crate) async fn fetch(
                     AffiliateCodeConversions { conversions },
                 ),
             }),
-        )?;
+        )
+        .wrap_api_err("executing `AffiliateCodeMetrics::Conversions`")?;
     }
 
     Ok(())
diff --git a/apps/labrinth/src/routes/v3/analytics_get/metrics/affiliate_code_revenue.rs b/apps/labrinth/src/routes/v3/analytics_get/metrics/affiliate_code_revenue.rs
index 9873bc15cd..791dd8a3dd 100644
--- a/apps/labrinth/src/routes/v3/analytics_get/metrics/affiliate_code_revenue.rs
+++ b/apps/labrinth/src/routes/v3/analytics_get/metrics/affiliate_code_revenue.rs
@@ -1,3 +1,4 @@
+use crate::util::error::ApiContext as _;
 use futures::StreamExt;
 use rust_decimal::Decimal;
 use serde::{Deserialize, Serialize};
@@ -86,7 +87,12 @@ pub(crate) async fn fetch(
         &filter_affiliate_code_ids,
     )
     .fetch(pool);
-    while let Some(row) = rows.next().await.transpose()? {
+    while let Some(row) = rows
+        .next()
+        .await
+        .transpose()
+        .wrap_internal_err("fetching affiliate code revenue")?
+    {
         let bucket = row
             .bucket
             .wrap_internal_err("bucket should be non-null - query bug!")?;
@@ -110,7 +116,8 @@ pub(crate) async fn fetch(
                     revenue,
                 }),
             }),
-        )?;
+        )
+        .wrap_api_err("executing `AffiliateCodeMetrics::Revenue`")?;
     }
 
     Ok(())
diff --git a/apps/labrinth/src/routes/v3/analytics_get/metrics/project_downloads.rs b/apps/labrinth/src/routes/v3/analytics_get/metrics/project_downloads.rs
index bfae56126b..2439d9cb5c 100644
--- a/apps/labrinth/src/routes/v3/analytics_get/metrics/project_downloads.rs
+++ b/apps/labrinth/src/routes/v3/analytics_get/metrics/project_downloads.rs
@@ -1,3 +1,4 @@
+use crate::util::error::ApiContext as _;
 use std::{
     collections::{HashMap, HashSet},
     sync::{
@@ -358,7 +359,9 @@ pub(crate) async fn fetch(
     use ProjectDownloadsField as F;
     let uses = |field| metrics.bucket_by.contains(&field);
     let dependent_on_version_filter =
-        fetch_dependent_on_version_filter(metrics, cx.pool).await?;
+        fetch_dependent_on_version_filter(metrics, cx.pool)
+            .await
+            .wrap_api_err("fetching dependent on version filter")?;
     if !metrics.filter_by.dependent_project_id.is_empty()
         && dependent_on_version_filter.is_empty()
     {
@@ -433,15 +436,23 @@ pub(crate) async fn fetch(
             .iter()
             .any(|(column_name, used)| *column_name == name && *used)
     };
-    let mut cursor = query.fetch::<DownloadRow>()?;
+    let mut cursor = query
+        .fetch::<DownloadRow>()
+        .wrap_internal_err("fetching project-download pagination cursor")?;
     let mut rows = Vec::new();
 
-    while let Some(row) = cursor.next().await? {
+    while let Some(row) = cursor
+        .next()
+        .await
+        .wrap_internal_err("fetching project downloads")?
+    {
         rows.push(row);
     }
 
     let dependent_version_projects =
-        fetch_dependent_version_projects(&rows, cx).await?;
+        fetch_dependent_version_projects(&rows, cx)
+            .await
+            .wrap_api_err("fetching dependent version projects")?;
     let mut buckets = HashMap::<DownloadBucket, u64>::new();
 
     for row in rows {
@@ -567,7 +578,8 @@ pub(crate) async fn fetch(
                     downloads,
                 }),
             }),
-        )?;
+        )
+        .wrap_api_err("executing `ProjectMetrics::Downloads`")?;
     }
 
     Ok(())
diff --git a/apps/labrinth/src/routes/v3/analytics_get/metrics/project_playtime.rs b/apps/labrinth/src/routes/v3/analytics_get/metrics/project_playtime.rs
index 91ce1cfc10..f5ce8767b0 100644
--- a/apps/labrinth/src/routes/v3/analytics_get/metrics/project_playtime.rs
+++ b/apps/labrinth/src/routes/v3/analytics_get/metrics/project_playtime.rs
@@ -1,3 +1,5 @@
+use crate::util::error::ApiContext as _;
+use crate::util::error::Context as _;
 use std::collections::HashMap;
 
 use const_format::formatcp;
@@ -227,10 +229,16 @@ pub(crate) async fn fetch(
         query = filter_param.bind(query);
     }
 
-    let mut cursor = query.fetch::<PlaytimeRow>()?;
+    let mut cursor = query
+        .fetch::<PlaytimeRow>()
+        .wrap_internal_err("fetching project-playtime pagination cursor")?;
     let mut buckets = HashMap::<PlaytimeBucket, u64>::new();
 
-    while let Some(row) = cursor.next().await? {
+    while let Some(row) = cursor
+        .next()
+        .await
+        .wrap_internal_err("fetching project playtime")?
+    {
         let project_id =
             if uses_column("use_project_id") && row.project_id.0 == 0 {
                 parent_version_projects
@@ -308,7 +316,8 @@ pub(crate) async fn fetch(
                     seconds,
                 }),
             }),
-        )?;
+        )
+        .wrap_api_err("executing `ProjectMetrics::Playtime`")?;
     }
 
     Ok(())
diff --git a/apps/labrinth/src/routes/v3/analytics_get/metrics/project_revenue.rs b/apps/labrinth/src/routes/v3/analytics_get/metrics/project_revenue.rs
index 0b292ae0f3..c03de3cf8c 100644
--- a/apps/labrinth/src/routes/v3/analytics_get/metrics/project_revenue.rs
+++ b/apps/labrinth/src/routes/v3/analytics_get/metrics/project_revenue.rs
@@ -1,3 +1,4 @@
+use crate::util::error::ApiContext as _;
 use futures::StreamExt;
 use rust_decimal::Decimal;
 use serde::{Deserialize, Serialize};
@@ -95,7 +96,12 @@ pub(crate) async fn fetch(
         user_id_bucket_project_ids,
     )
     .fetch(pool);
-    while let Some(row) = rows.next().await.transpose()? {
+    while let Some(row) = rows
+        .next()
+        .await
+        .transpose()
+        .wrap_internal_err("fetching project revenue")?
+    {
         let bucket = row
             .bucket
             .wrap_internal_err("bucket should be non-null - query bug!")?;
@@ -123,7 +129,8 @@ pub(crate) async fn fetch(
                         revenue,
                     }),
                 }),
-            )?;
+            )
+            .wrap_api_err("adding project revenue to time slice")?;
         }
     }
 
diff --git a/apps/labrinth/src/routes/v3/analytics_get/metrics/project_views.rs b/apps/labrinth/src/routes/v3/analytics_get/metrics/project_views.rs
index cd612c3c38..a1b276e99c 100644
--- a/apps/labrinth/src/routes/v3/analytics_get/metrics/project_views.rs
+++ b/apps/labrinth/src/routes/v3/analytics_get/metrics/project_views.rs
@@ -1,3 +1,5 @@
+use crate::util::error::ApiContext as _;
+use crate::util::error::Context as _;
 use std::collections::HashMap;
 
 use const_format::formatcp;
@@ -188,10 +190,16 @@ pub(crate) async fn fetch(
         query = filter_param.bind(query);
     }
 
-    let mut cursor = query.fetch::<ViewRow>()?;
+    let mut cursor = query
+        .fetch::<ViewRow>()
+        .wrap_internal_err("fetching project-view pagination cursor")?;
     let mut buckets = HashMap::<ViewBucket, u64>::new();
 
-    while let Some(row) = cursor.next().await? {
+    while let Some(row) = cursor
+        .next()
+        .await
+        .wrap_internal_err("fetching project views")?
+    {
         let key = ViewBucket {
             bucket: row.bucket,
             project_id: row.project_id,
@@ -252,7 +260,8 @@ pub(crate) async fn fetch(
                     views,
                 }),
             }),
-        )?;
+        )
+        .wrap_api_err("executing `ProjectMetrics::Views`")?;
     }
 
     Ok(())
diff --git a/apps/labrinth/src/routes/v3/analytics_get/mod.rs b/apps/labrinth/src/routes/v3/analytics_get/mod.rs
index 3a23adc780..6dc980a1c7 100644
--- a/apps/labrinth/src/routes/v3/analytics_get/mod.rs
+++ b/apps/labrinth/src/routes/v3/analytics_get/mod.rs
@@ -7,6 +7,9 @@
 //!   requests, you have to zip together M arrays of N elements
 //!   - this makes it inconvenient to have separate endpoints
 
+use crate::util::error::ApiContext as _;
+use crate::util::error::Context as _;
+
 use xredis::RedisPool;
 
 pub mod facets;
@@ -195,36 +198,30 @@ pub async fn fetch_analytics(
         &session_queue,
         Scopes::ANALYTICS,
     )
-    .await?;
+    .await
+    .wrap_auth_err("authenticating API request")?;
 
     let full_time_range = req.time_range.end - req.time_range.start;
     if full_time_range < TimeDelta::zero() {
-        return Err(ApiError::InvalidInput(
-            "End date must be after start date".into(),
-        ));
+        return Err(ApiError::Request(eyre::eyre!(
+            "End date must be after start date",
+        )));
     }
 
     let (num_time_slices, resolution) = match req.time_range.resolution {
         TimeRangeResolution::Slices(slices) => {
-            let slices = i32::try_from(slices.get()).map_err(|_| {
-                ApiError::InvalidInput(
-                    "Number of slices must fit into an `i32`".into(),
-                )
-            })?;
+            let slices = i32::try_from(slices.get())
+                .map_err(|err| eyre::eyre!(err))
+                .wrap_request_err("number of slices must fit into an `i32`")?;
             let resolution = full_time_range / slices;
             (slices as usize, resolution)
         }
         TimeRangeResolution::Minutes(resolution_minutes) => {
             let resolution_minutes = i64::try_from(resolution_minutes.get())
-                .map_err(|_| {
-                    ApiError::InvalidInput(
-                        "Resolution must fit into a `i64`".into(),
-                    )
-                })?;
+                .map_err(|err| eyre::eyre!(err))
+                .wrap_request_err("resolution must fit into a `i64`")?;
             let resolution = TimeDelta::try_minutes(resolution_minutes)
-                .ok_or_else(|| {
-                    ApiError::InvalidInput("Resolution overflow".into())
-                })?;
+                .wrap_request_err_with(|| "resolution overflow")?;
 
             let num_slices =
                 full_time_range.as_seconds_f64() / resolution.as_seconds_f64();
@@ -248,7 +245,9 @@ pub async fn fetch_analytics(
 
     let project_ids = {
         if req.project_ids.is_empty() {
-            DBUser::get_projects(user.id.into(), &**pool, &redis).await?
+            DBUser::get_projects(user.id.into(), &**pool, &redis)
+                .await
+                .wrap_internal_err("fetching users from database")?
         } else {
             req.project_ids
                 .iter()
@@ -258,7 +257,9 @@ pub async fn fetch_analytics(
     };
 
     let project_ids =
-        filter_allowed_project_ids(&project_ids, &user, &pool, &redis).await?;
+        filter_allowed_project_ids(&project_ids, &user, &pool, &redis)
+            .await
+            .wrap_api_err("filtering allowed project ids")?;
 
     let project_id_values =
         project_ids.iter().map(|id| id.0).collect::<Vec<_>>();
@@ -271,7 +272,8 @@ pub async fn fetch_analytics(
         &project_id_values,
     )
     .fetch_all(&**pool)
-    .await?;
+    .await
+    .wrap_internal_err("fetching parent versions from database")?;
     let parent_version_ids = parent_versions
         .iter()
         .map(|version| DBVersionId(version.id))
@@ -281,7 +283,9 @@ pub async fn fetch_analytics(
         .map(|version| (DBVersionId(version.id), DBProjectId(version.mod_id)))
         .collect::<HashMap<_, _>>();
     let parent_version_data =
-        DBVersion::get_many(&parent_version_ids, &**pool, &redis).await?;
+        DBVersion::get_many(&parent_version_ids, &**pool, &redis)
+            .await
+            .wrap_internal_err("fetching versions from database")?;
     let visible_version_ids = filter_visible_version_ids(
         parent_version_data
             .iter()
@@ -291,7 +295,8 @@ pub async fn fetch_analytics(
         &pool,
         &redis,
     )
-    .await?;
+    .await
+    .wrap_api_err("filtering visible version ids")?;
     let mut project_events = parent_version_data
         .iter()
         .filter(|version| {
@@ -315,13 +320,15 @@ pub async fn fetch_analytics(
             &req.time_range,
             &pool,
         )
-        .await?,
+        .await
+        .wrap_api_err("fetching project status change events")?,
     );
     project_events.sort_by_key(|event| event.timestamp);
 
     let affiliate_code_ids =
         DBAffiliateCode::get_by_affiliate(user.id.into(), &**pool)
-            .await?
+            .await
+            .wrap_internal_err("fetching affiliate codes from database")?
             .into_iter()
             .map(|code| code.id)
             .collect::<Vec<_>>();
@@ -339,12 +346,15 @@ pub async fn fetch_analytics(
     };
 
     if let Some(metrics) = &req.return_metrics.project_views {
-        metrics::fetch_project_views(&mut query_clickhouse_cx, metrics).await?;
+        metrics::fetch_project_views(&mut query_clickhouse_cx, metrics)
+            .await
+            .wrap_api_err("fetching project views")?;
     }
 
     if let Some(metrics) = &req.return_metrics.project_downloads {
         metrics::fetch_project_downloads(&mut query_clickhouse_cx, metrics)
-            .await?;
+            .await
+            .wrap_api_err("fetching project downloads")?;
     }
 
     if let Some(metrics) = &req.return_metrics.project_playtime {
@@ -353,17 +363,21 @@ pub async fn fetch_analytics(
             &parent_version_projects,
             metrics,
         )
-        .await?;
+        .await
+        .wrap_api_err("fetching project playtime")?;
     }
 
     if let Some(metrics) = &req.return_metrics.affiliate_code_clicks {
         metrics::fetch_affiliate_code_clicks(&mut query_clickhouse_cx, metrics)
-            .await?;
+            .await
+            .wrap_api_err("fetching affiliate code clicks")?;
     }
 
     if let Some(metrics) = &req.return_metrics.project_revenue {
         if !scopes.contains(Scopes::PAYOUTS_READ) {
-            return Err(AuthenticationError::InvalidCredentials.into());
+            return Err(ApiError::Auth(eyre::eyre!(
+                AuthenticationError::InvalidCredentials
+            )));
         }
 
         let user_id_bucket_project_ids = sqlx::query!(
@@ -380,7 +394,8 @@ pub async fn fetch_analytics(
             DBUserId::from(user.id).0,
         )
         .fetch_all(&**pool)
-        .await?
+        .await
+        .wrap_internal_err("fetching user IDs from database")?
         .into_iter()
         .map(|row| row.id)
         .collect::<Vec<_>>();
@@ -395,7 +410,8 @@ pub async fn fetch_analytics(
             user.role.is_mod(),
             metrics,
         )
-        .await?;
+        .await
+        .wrap_api_err("checking mod")?;
     }
 
     if let Some(metrics) = &req.return_metrics.affiliate_code_conversions {
@@ -407,12 +423,15 @@ pub async fn fetch_analytics(
             num_time_slices,
             metrics,
         )
-        .await?;
+        .await
+        .wrap_api_err("fetching affiliate code conversions")?;
     }
 
     if let Some(metrics) = &req.return_metrics.affiliate_code_revenue {
         if !scopes.contains(Scopes::PAYOUTS_READ) {
-            return Err(AuthenticationError::InvalidCredentials.into());
+            return Err(ApiError::Auth(eyre::eyre!(
+                AuthenticationError::InvalidCredentials
+            )));
         }
 
         metrics::fetch_affiliate_code_revenue(
@@ -423,12 +442,17 @@ pub async fn fetch_analytics(
             num_time_slices,
             metrics,
         )
-        .await?;
+        .await
+        .wrap_api_err("fetching affiliate code revenue")?;
     }
 
     let projects =
-        fetch_response_projects(&mut time_slices, &user, &pool, &redis).await?;
-    let users = fetch_response_users(&time_slices, &pool, &redis).await?;
+        fetch_response_projects(&mut time_slices, &user, &pool, &redis)
+            .await
+            .wrap_api_err("fetching response projects")?;
+    let users = fetch_response_users(&time_slices, &pool, &redis)
+        .await
+        .wrap_api_err("fetching response users")?;
 
     Ok(web::Json(GetResponse {
         metrics: time_slices,
@@ -530,14 +554,17 @@ async fn fetch_response_projects(
     }
 
     let project_ids = project_ids.into_iter().collect::<Vec<_>>();
-    let projects = DBProject::get_many_ids(&project_ids, pool, redis).await?;
+    let projects = DBProject::get_many_ids(&project_ids, pool, redis)
+        .await
+        .wrap_api_err("fetching analytics projects")?;
     let visible_project_ids = filter_visible_project_ids(
         projects.iter().map(|project| &project.inner).collect(),
         &Some(user.clone()),
         pool,
         false,
     )
-    .await?
+    .await
+    .wrap_api_err("filtering visible project ids")?
     .into_iter()
     .collect::<HashSet<_>>();
 
@@ -579,7 +606,9 @@ async fn fetch_response_users(
         return Ok(HashMap::new());
     }
 
-    let users = DBUser::get_many_ids(&user_ids, pool, redis).await?;
+    let users = DBUser::get_many_ids(&user_ids, pool, redis)
+        .await
+        .wrap_internal_err("fetching users from database")?;
 
     Ok(users
         .into_iter()
@@ -648,7 +677,10 @@ async fn fetch_project_status_change_events(
         time_range.end,
     )
     .fetch_all(&**pool)
-    .await?;
+    .await
+    .wrap_internal_err(
+        "querying database for `fetch_project_status_change_events`",
+    )?;
 
     Ok(rows
         .into_iter()
@@ -796,14 +828,21 @@ where
     for filter_param in filter_params {
         query = filter_param.bind(query);
     }
-    let mut cursor = query.fetch::<Row>()?;
+    let mut cursor = query
+        .fetch::<Row>()
+        .wrap_internal_err("fetching analytics pagination cursor")?;
 
-    while let Some(row) = cursor.next().await? {
+    while let Some(row) = cursor
+        .next()
+        .await
+        .wrap_internal_err("querying database for `query_clickhouse`")?
+    {
         if !row_filter(&row) {
             continue;
         }
         let bucket = row_get_bucket(&row) as usize;
-        add_to_time_slice(cx.time_slices, bucket, row_to_analytics(row))?;
+        add_to_time_slice(cx.time_slices, bucket, row_to_analytics(row))
+            .wrap_api_err("executing `row_to_analytics`")?;
     }
 
     Ok(())
@@ -825,11 +864,7 @@ pub(crate) fn add_to_time_slice(
     };
 
     let num_time_slices = time_slices.len();
-    let slice = time_slices.get_mut(bucket).ok_or_else(|| {
-        ApiError::InvalidInput(
-            format!("bucket {bucket} returned by query out of range for {num_time_slices} - query bug!")
-        )
-    })?;
+    let slice = time_slices.get_mut(bucket).wrap_request_err_with(|| format!("bucket {bucket} returned by query out of range for {num_time_slices} - query bug!"))?;
 
     slice.0.push(data);
     Ok(())
@@ -841,7 +876,9 @@ async fn filter_allowed_project_ids(
     pool: &PgPool,
     redis: &RedisPool,
 ) -> Result<Vec<DBProjectId>, ApiError> {
-    let projects = DBProject::get_many_ids(project_ids, pool, redis).await?;
+    let projects = DBProject::get_many_ids(project_ids, pool, redis)
+        .await
+        .wrap_api_err("fetching projects for analytics authorization")?;
 
     let team_ids = projects
         .iter()
@@ -850,7 +887,8 @@ async fn filter_allowed_project_ids(
     let team_members = database::models::DBTeamMember::get_from_team_full_many(
         &team_ids, pool, redis,
     )
-    .await?;
+    .await
+    .wrap_internal_err("fetching team members from database")?;
 
     let organization_ids = projects
         .iter()
@@ -861,7 +899,8 @@ async fn filter_allowed_project_ids(
         pool,
         redis,
     )
-    .await?;
+    .await
+    .wrap_internal_err("fetching organizations from database")?;
 
     let organization_team_ids = organizations
         .iter()
@@ -873,7 +912,8 @@ async fn filter_allowed_project_ids(
             pool,
             redis,
         )
-        .await?;
+        .await
+        .wrap_internal_err("fetching team members from database")?;
 
     Ok(projects
         .into_iter()
diff --git a/apps/labrinth/src/routes/v3/analytics_get/old.rs b/apps/labrinth/src/routes/v3/analytics_get/old.rs
index 060a0299d7..a164921783 100644
--- a/apps/labrinth/src/routes/v3/analytics_get/old.rs
+++ b/apps/labrinth/src/routes/v3/analytics_get/old.rs
@@ -1,5 +1,8 @@
 //! TODO: this module should be removed; it is superseded by `analytics_get`
 
+use crate::util::error::ApiContext as _;
+use crate::util::error::Context as _;
+
 use super::ApiError;
 use crate::database;
 use crate::database::PgPool;
@@ -13,7 +16,6 @@ use crate::{
 use actix_web::{HttpRequest, HttpResponse, get, web};
 use ariadne::ids::base62_impl::to_base62;
 use chrono::{DateTime, Duration, Utc};
-use eyre::eyre;
 use serde::{Deserialize, Serialize};
 use sqlx::postgres::types::PgInterval;
 use std::collections::HashMap;
@@ -77,13 +79,15 @@ pub async fn playtimes_get(
         Scopes::ANALYTICS,
     )
     .await
-    .map(|x| x.1)?;
+    .map(|x| x.1)
+    .wrap_auth_err("authenticating API request")?;
 
     let project_ids = data
         .project_ids
         .as_ref()
         .map(|ids| serde_json::from_str::<Vec<String>>(ids))
-        .transpose()?;
+        .transpose()
+        .wrap_request_err("deserializing JSON data")?;
 
     let start_date = data.start_date.unwrap_or(Utc::now() - Duration::weeks(2));
     let end_date = data.end_date.unwrap_or(Utc::now());
@@ -95,7 +99,9 @@ pub async fn playtimes_get(
     // - Filter out unauthorized projects/versions
     // - If no project_ids or version_ids are provided, we default to all projects the user has access to
     let project_ids =
-        filter_allowed_ids(project_ids, user, &pool, &redis, None).await?;
+        filter_allowed_ids(project_ids, user, &pool, &redis, None)
+            .await
+            .wrap_api_err("filtering authorized playtime project IDs")?;
 
     // Get the views
     let playtimes = crate::clickhouse::fetch_playtimes(
@@ -105,7 +111,8 @@ pub async fn playtimes_get(
         resolution_minutes,
         clickhouse.into_inner(),
     )
-    .await?;
+    .await
+    .wrap_api_err("fetching project playtime from ClickHouse")?;
 
     let mut hm = HashMap::new();
     for playtime in playtimes {
@@ -159,13 +166,15 @@ pub async fn views_get(
         Scopes::ANALYTICS,
     )
     .await
-    .map(|x| x.1)?;
+    .map(|x| x.1)
+    .wrap_auth_err("authenticating API request")?;
 
     let project_ids = data
         .project_ids
         .as_ref()
         .map(|ids| serde_json::from_str::<Vec<String>>(ids))
-        .transpose()?;
+        .transpose()
+        .wrap_request_err("deserializing JSON data")?;
 
     let start_date = data.start_date.unwrap_or(Utc::now() - Duration::weeks(2));
     let end_date = data.end_date.unwrap_or(Utc::now());
@@ -177,7 +186,9 @@ pub async fn views_get(
     // - Filter out unauthorized projects/versions
     // - If no project_ids or version_ids are provided, we default to all projects the user has access to
     let project_ids =
-        filter_allowed_ids(project_ids, user, &pool, &redis, None).await?;
+        filter_allowed_ids(project_ids, user, &pool, &redis, None)
+            .await
+            .wrap_api_err("filtering authorized view project IDs")?;
 
     // Get the views
     let views = crate::clickhouse::fetch_views(
@@ -187,7 +198,8 @@ pub async fn views_get(
         resolution_minutes,
         clickhouse.into_inner(),
     )
-    .await?;
+    .await
+    .wrap_api_err("fetching project views from ClickHouse")?;
 
     let mut hm = HashMap::new();
     for views in views {
@@ -241,13 +253,15 @@ pub async fn downloads_get(
         Scopes::ANALYTICS,
     )
     .await
-    .map(|x| x.1)?;
+    .map(|x| x.1)
+    .wrap_auth_err("authenticating API request")?;
 
     let project_ids = data
         .project_ids
         .as_ref()
         .map(|ids| serde_json::from_str::<Vec<String>>(ids))
-        .transpose()?;
+        .transpose()
+        .wrap_request_err("deserializing JSON data")?;
 
     let start_date = data.start_date.unwrap_or(Utc::now() - Duration::weeks(2));
     let end_date = data.end_date.unwrap_or(Utc::now());
@@ -260,7 +274,8 @@ pub async fn downloads_get(
     // - If no project_ids or version_ids are provided, we default to all projects the user has access to
     let project_ids =
         filter_allowed_ids(project_ids, user_option, &pool, &redis, None)
-            .await?;
+            .await
+            .wrap_api_err("filtering authorized download project IDs")?;
 
     // Get the downloads
     let downloads = crate::clickhouse::fetch_downloads(
@@ -270,7 +285,8 @@ pub async fn downloads_get(
         resolution_minutes,
         clickhouse.into_inner(),
     )
-    .await?;
+    .await
+    .wrap_api_err("fetching project downloads from ClickHouse")?;
 
     let mut hm = HashMap::new();
     for downloads in downloads {
@@ -323,13 +339,15 @@ pub async fn revenue_get(
         Scopes::PAYOUTS_READ,
     )
     .await
-    .map(|x| x.1)?;
+    .map(|x| x.1)
+    .wrap_auth_err("authenticating API request")?;
 
     let project_ids = data
         .project_ids
         .as_ref()
         .map(|ids| serde_json::from_str::<Vec<String>>(ids))
-        .transpose()?;
+        .transpose()
+        .wrap_request_err("deserializing JSON data")?;
 
     let start_date = data.start_date.unwrap_or(Utc::now() - Duration::weeks(2));
     let end_date = data.end_date.unwrap_or(Utc::now());
@@ -357,13 +375,15 @@ pub async fn revenue_get(
         &redis,
         Some(true),
     )
-    .await?;
+    .await
+    .wrap_api_err("filtering authorized revenue project IDs")?;
 
     let duration: PgInterval = Duration::minutes(resolution_minutes as i64)
         .try_into()
-        .map_err(|_| {
-            ApiError::Request(eyre!("Invalid `resolution_minutes`"))
-        })?;
+        .map_err(|err: Box<dyn std::error::Error + Send + Sync>| {
+            eyre::eyre!("{err}")
+        })
+        .wrap_request_err("invalid `resolution_minutes`")?;
     // Get the revenue data
     let project_ids = project_ids.unwrap_or_default();
 
@@ -387,7 +407,7 @@ pub async fn revenue_get(
             duration,
         )
             .fetch_all(&**pool)
-            .await?.into_iter().map(|x| PayoutValue {
+            .await.wrap_internal_err("fetching payouts values from database")?.into_iter().map(|x| PayoutValue {
             mod_id: x.mod_id,
             amount_sum: x.amount_sum,
             interval_start: x.interval_start,
@@ -406,7 +426,7 @@ pub async fn revenue_get(
             duration,
         )
             .fetch_all(&**pool)
-            .await?.into_iter().map(|x| PayoutValue {
+            .await.wrap_internal_err("querying database for `revenue_get`")?.into_iter().map(|x| PayoutValue {
             mod_id: x.mod_id,
             amount_sum: x.amount_sum,
             interval_start: x.interval_start,
@@ -476,13 +496,15 @@ pub async fn countries_downloads_get(
         Scopes::ANALYTICS,
     )
     .await
-    .map(|x| x.1)?;
+    .map(|x| x.1)
+    .wrap_auth_err("authenticating API request")?;
 
     let project_ids = data
         .project_ids
         .as_ref()
         .map(|ids| serde_json::from_str::<Vec<String>>(ids))
-        .transpose()?;
+        .transpose()
+        .wrap_request_err("deserializing JSON data")?;
 
     let start_date = data.start_date.unwrap_or(Utc::now() - Duration::weeks(2));
     let end_date = data.end_date.unwrap_or(Utc::now());
@@ -491,7 +513,11 @@ pub async fn countries_downloads_get(
     // - Filter out unauthorized projects/versions
     // - If no project_ids or version_ids are provided, we default to all projects the user has access to
     let project_ids =
-        filter_allowed_ids(project_ids, user, &pool, &redis, None).await?;
+        filter_allowed_ids(project_ids, user, &pool, &redis, None)
+            .await
+            .wrap_api_err(
+                "filtering authorized download-country project IDs",
+            )?;
 
     // Get the countries
     let countries = crate::clickhouse::fetch_countries_downloads(
@@ -500,7 +526,8 @@ pub async fn countries_downloads_get(
         end_date,
         clickhouse.into_inner(),
     )
-    .await?;
+    .await
+    .wrap_api_err("fetching download countries from ClickHouse")?;
 
     let mut hm = HashMap::new();
     for views in countries {
@@ -562,13 +589,15 @@ pub async fn countries_views_get(
         Scopes::ANALYTICS,
     )
     .await
-    .map(|x| x.1)?;
+    .map(|x| x.1)
+    .wrap_auth_err("authenticating API request")?;
 
     let project_ids = data
         .project_ids
         .as_ref()
         .map(|ids| serde_json::from_str::<Vec<String>>(ids))
-        .transpose()?;
+        .transpose()
+        .wrap_request_err("deserializing JSON data")?;
 
     let start_date = data.start_date.unwrap_or(Utc::now() - Duration::weeks(2));
     let end_date = data.end_date.unwrap_or(Utc::now());
@@ -577,7 +606,9 @@ pub async fn countries_views_get(
     // - Filter out unauthorized projects/versions
     // - If no project_ids or version_ids are provided, we default to all projects the user has access to
     let project_ids =
-        filter_allowed_ids(project_ids, user, &pool, &redis, None).await?;
+        filter_allowed_ids(project_ids, user, &pool, &redis, None)
+            .await
+            .wrap_api_err("filtering authorized view-country project IDs")?;
 
     // Get the countries
     let countries = crate::clickhouse::fetch_countries_views(
@@ -586,7 +617,8 @@ pub async fn countries_views_get(
         end_date,
         clickhouse.into_inner(),
     )
-    .await?;
+    .await
+    .wrap_api_err("fetching view countries from ClickHouse")?;
 
     let mut hm = HashMap::new();
     for views in countries {
@@ -635,7 +667,8 @@ async fn filter_allowed_ids(
     if project_ids.is_none() && !remove_defaults.unwrap_or(false) {
         project_ids = Some(
             user_item::DBUser::get_projects(user.id.into(), &***pool, redis)
-                .await?
+                .await
+                .wrap_internal_err("deleting user from database")?
                 .into_iter()
                 .map(|x| ProjectId::from(x).to_string())
                 .collect(),
@@ -650,7 +683,8 @@ async fn filter_allowed_ids(
             &***pool,
             redis,
         )
-        .await?;
+        .await
+        .wrap_api_err("fetching analytics projects")?;
 
         let team_ids = projects_data
             .iter()
@@ -660,7 +694,8 @@ async fn filter_allowed_ids(
             database::models::DBTeamMember::get_from_team_full_many(
                 &team_ids, &***pool, redis,
             )
-            .await?;
+            .await
+            .wrap_internal_err("fetching team members from database")?;
 
         let organization_ids = projects_data
             .iter()
@@ -671,7 +706,8 @@ async fn filter_allowed_ids(
             &***pool,
             redis,
         )
-        .await?;
+        .await
+        .wrap_internal_err("fetching organizations from database")?;
 
         let organization_team_ids = organizations
             .iter()
@@ -683,7 +719,8 @@ async fn filter_allowed_ids(
                 &***pool,
                 redis,
             )
-            .await?;
+            .await
+            .wrap_internal_err("fetching team members from database")?;
 
         let ids = projects_data
             .into_iter()
diff --git a/apps/labrinth/src/routes/v3/blocked_users.rs b/apps/labrinth/src/routes/v3/blocked_users.rs
index 4090e3ac1c..2cdd00bbc9 100644
--- a/apps/labrinth/src/routes/v3/blocked_users.rs
+++ b/apps/labrinth/src/routes/v3/blocked_users.rs
@@ -6,6 +6,7 @@ use crate::database::models::friend_item::DBFriend;
 use crate::models::pats::Scopes;
 use crate::queue::session::AuthQueue;
 use crate::routes::ApiError;
+use crate::util::error::Context as _;
 use actix_web::{HttpRequest, delete, get, post, web};
 use ariadne::ids::UserId;
 use eyre::eyre;
@@ -34,30 +35,43 @@ pub async fn block_user(
         &session_queue,
         Scopes::USER_WRITE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     let user_id = info.into_inner().0;
-    let Some(blocked) = DBUser::get(&user_id, &**pool, &redis).await? else {
-        return Err(ApiError::NotFound);
+    let Some(blocked) = DBUser::get(&user_id, &**pool, &redis)
+        .await
+        .wrap_internal_err("fetching user from database")?
+    else {
+        return Err(ApiError::NotFound(eyre::eyre!("resource not found")));
     };
 
     if blocked.id == user.id.into() {
         return Err(ApiError::Request(eyre!("you cannot block yourself")));
     }
 
-    let mut transaction = pool.begin().await?;
+    let mut transaction = pool
+        .begin()
+        .await
+        .wrap_internal_err("starting database transaction")?;
 
-    DBFriend::remove(user.id.into(), blocked.id, &mut transaction).await?;
+    DBFriend::remove(user.id.into(), blocked.id, &mut transaction)
+        .await
+        .wrap_internal_err("deleting friend from database")?;
 
     DBBlockedUser {
         user_id: user.id.into(),
         blocked_id: blocked.id,
     }
     .insert(&mut transaction)
-    .await?;
+    .await
+    .wrap_internal_err("inserting database records for `block_user`")?;
 
-    transaction.commit().await?;
+    transaction
+        .commit()
+        .await
+        .wrap_internal_err("committing database transaction")?;
 
     Ok(())
 }
@@ -79,15 +93,21 @@ pub async fn unblock_user(
         &session_queue,
         Scopes::USER_WRITE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     let user_id = info.into_inner().0;
-    let Some(blocked) = DBUser::get(&user_id, &**pool, &redis).await? else {
-        return Err(ApiError::NotFound);
+    let Some(blocked) = DBUser::get(&user_id, &**pool, &redis)
+        .await
+        .wrap_internal_err("fetching user from database")?
+    else {
+        return Err(ApiError::NotFound(eyre::eyre!("resource not found")));
     };
 
-    DBBlockedUser::remove(user.id.into(), blocked.id, &**pool).await?;
+    DBBlockedUser::remove(user.id.into(), blocked.id, &**pool)
+        .await
+        .wrap_internal_err("deleting blocked user from database")?;
 
     Ok(())
 }
@@ -108,11 +128,13 @@ pub async fn get_blocked_users(
         &session_queue,
         Scopes::USER_READ,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     let blocked = DBBlockedUser::get_blocked_for_user(user.id.into(), &**pool)
-        .await?
+        .await
+        .wrap_internal_err("fetching blocked user from database")?
         .into_iter()
         .map(UserId::from)
         .collect();
diff --git a/apps/labrinth/src/routes/v3/collections.rs b/apps/labrinth/src/routes/v3/collections.rs
index fe549298cf..b5e5d266a8 100644
--- a/apps/labrinth/src/routes/v3/collections.rs
+++ b/apps/labrinth/src/routes/v3/collections.rs
@@ -14,6 +14,7 @@ use crate::models::v3::user_limits::UserLimits;
 use crate::queue::session::AuthQueue;
 use crate::routes::ApiError;
 use crate::routes::v3::project_creation::CreateError;
+use crate::util::error::ApiContext as _;
 use crate::util::error::Context;
 use crate::util::img::delete_old_images;
 use crate::util::routes::read_limited_from_payload;
@@ -157,16 +158,20 @@ pub async fn collections_get(
     redis: web::Data<RedisPool>,
     session_queue: web::Data<AuthQueue>,
 ) -> Result<HttpResponse, ApiError> {
-    let ids = serde_json::from_str::<Vec<&str>>(&ids.ids)?;
+    let ids = serde_json::from_str::<Vec<&str>>(&ids.ids)
+        .wrap_request_err("deserializing JSON data")?;
     let ids = ids
         .into_iter()
         .map(|x| {
             parse_base62(x).map(|x| database::models::DBCollectionId(x as i64))
         })
-        .collect::<Result<Vec<_>, _>>()?;
+        .collect::<Result<Vec<_>, _>>()
+        .wrap_request_err("parsing collection IDs")?;
 
     let collections_data =
-        database::models::DBCollection::get_many(&ids, &**pool, &redis).await?;
+        database::models::DBCollection::get_many(&ids, &**pool, &redis)
+            .await
+            .wrap_internal_err("fetching collections from database")?;
 
     let user_option = get_user_from_headers(
         &req,
@@ -181,7 +186,8 @@ pub async fn collections_get(
 
     let collections =
         filter_visible_collections(collections_data, &user_option, false)
-            .await?;
+            .await
+            .wrap_api_err("filtering visible collections")?;
 
     Ok(HttpResponse::Ok().json(collections))
 }
@@ -197,9 +203,13 @@ pub async fn collection_get(
 ) -> Result<HttpResponse, ApiError> {
     let string = info.into_inner().0;
 
-    let id = database::models::DBCollectionId(parse_base62(&string)? as i64);
+    let id = database::models::DBCollectionId(
+        parse_base62(&string).wrap_request_err("parsing collection ID")? as i64,
+    );
     let collection_data =
-        database::models::DBCollection::get(id, &**pool, &redis).await?;
+        database::models::DBCollection::get(id, &**pool, &redis)
+            .await
+            .wrap_internal_err("fetching collection from database")?;
     let user_option = get_user_from_headers(
         &req,
         &**pool,
@@ -212,11 +222,13 @@ pub async fn collection_get(
     .ok();
 
     if let Some(data) = collection_data
-        && is_visible_collection(&data, &user_option, false).await?
+        && is_visible_collection(&data, &user_option, false)
+            .await
+            .wrap_api_err("checking collection visibility")?
     {
         return Ok(HttpResponse::Ok().json(Collection::from(data)));
     }
-    Err(ApiError::NotFound)
+    Err(ApiError::NotFound(eyre::eyre!("resource not found")))
 }
 
 #[derive(Deserialize, Validate, utoipa::ToSchema)]
@@ -256,17 +268,22 @@ pub async fn collection_edit(
         &session_queue,
         Scopes::COLLECTION_WRITE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
-    new_collection.validate().map_err(|err| {
-        ApiError::Validation(validation_errors_to_string(err, None))
-    })?;
+    new_collection
+        .validate()
+        .map_err(|err| eyre::eyre!(err))
+        .wrap_request_err("validating request")?;
 
     let string = info.into_inner().0;
-    let id = database::models::DBCollectionId(parse_base62(&string)? as i64);
-    let result =
-        database::models::DBCollection::get(id, &**pool, &redis).await?;
+    let id = database::models::DBCollectionId(
+        parse_base62(&string).wrap_request_err("parsing collection ID")? as i64,
+    );
+    let result = database::models::DBCollection::get(id, &**pool, &redis)
+        .await
+        .wrap_internal_err("fetching collection from database")?;
 
     if let Some(collection_item) = result {
         if !can_modify_collection(&collection_item, &user) {
@@ -275,7 +292,10 @@ pub async fn collection_edit(
 
         let id = collection_item.id;
 
-        let mut transaction = pool.begin().await?;
+        let mut transaction = pool
+            .begin()
+            .await
+            .wrap_internal_err("starting database transaction")?;
 
         if let Some(name) = &new_collection.name {
             sqlx::query!(
@@ -288,7 +308,8 @@ pub async fn collection_edit(
                 id as database::models::ids::DBCollectionId,
             )
             .execute(&mut transaction)
-            .await?;
+            .await
+            .wrap_internal_err("querying database for `collection_edit`")?;
         }
 
         if let Some(description) = &new_collection.description {
@@ -302,7 +323,8 @@ pub async fn collection_edit(
                 id as database::models::ids::DBCollectionId,
             )
             .execute(&mut transaction)
-            .await?;
+            .await
+            .wrap_internal_err("querying database for `collection_edit`")?;
         }
 
         if let Some(status) = &new_collection.status {
@@ -310,9 +332,9 @@ pub async fn collection_edit(
                 || collection_item.status.is_approved()
                     && status.can_be_requested())
             {
-                return Err(ApiError::CustomAuthentication(
-                    "You don't have permission to set this status!".to_string(),
-                ));
+                return Err(ApiError::Auth(eyre::eyre!(
+                    "You don't have permission to set this status!",
+                )));
             }
 
             sqlx::query!(
@@ -325,7 +347,8 @@ pub async fn collection_edit(
                 id as database::models::ids::DBCollectionId,
             )
             .execute(&mut transaction)
-            .await?;
+            .await
+            .wrap_internal_err("querying database for `collection_edit`")?;
         }
 
         if let Some(new_project_ids) = &new_collection.new_projects {
@@ -338,7 +361,8 @@ pub async fn collection_edit(
                 collection_item.id as database::models::ids::DBCollectionId,
             )
             .execute(&mut transaction)
-            .await?;
+            .await
+            .wrap_internal_err("fetching new project IDs from database")?;
 
             let collection_item_ids = new_project_ids
                 .iter()
@@ -349,9 +373,10 @@ pub async fn collection_edit(
                 let project = database::models::DBProject::get(
                     project_id, &**pool, &redis,
                 )
-                .await?
+                .await
+                .wrap_api_err("fetching project from database")?
                 .wrap_request_err_with(|| {
-                    eyre!("The specified project {project_id} does not exist!")
+                    eyre!("the specified project `{project_id}` does not exist")
                 })?;
                 validated_project_ids.push(project.inner.id.0);
             }
@@ -366,7 +391,8 @@ pub async fn collection_edit(
                 &validated_project_ids[..],
             )
             .execute(&mut transaction)
-            .await?;
+            .await
+            .wrap_internal_err("querying database for `collection_edit`")?;
 
             sqlx::query!(
                 "
@@ -377,16 +403,21 @@ pub async fn collection_edit(
                 collection_item.id as database::models::ids::DBCollectionId,
             )
             .execute(&mut transaction)
-            .await?;
+            .await
+            .wrap_internal_err("querying database for `collection_edit`")?;
         }
 
-        transaction.commit().await?;
+        transaction
+            .commit()
+            .await
+            .wrap_internal_err("committing database transaction")?;
         database::models::DBCollection::clear_cache(collection_item.id, &redis)
-            .await?;
+            .await
+            .wrap_internal_err("clearing cached data from Redis")?;
 
         Ok(HttpResponse::NoContent().body(""))
     } else {
-        Err(ApiError::NotFound)
+        Err(ApiError::NotFound(eyre::eyre!("resource not found")))
     }
 }
 
@@ -420,18 +451,20 @@ pub async fn collection_icon_edit(
         &session_queue,
         Scopes::COLLECTION_WRITE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     let string = info.into_inner().0;
-    let id = database::models::DBCollectionId(parse_base62(&string)? as i64);
+    let id = database::models::DBCollectionId(
+        parse_base62(&string).wrap_request_err("parsing collection ID")? as i64,
+    );
     let collection_item =
         database::models::DBCollection::get(id, &**pool, &redis)
-            .await?
-            .ok_or_else(|| {
-                ApiError::InvalidInput(
-                    "The specified collection does not exist!".to_string(),
-                )
+            .await
+            .wrap_internal_err("fetching collection from database")?
+            .wrap_request_err_with(|| {
+                "the specified collection does not exist!".to_string()
             })?;
 
     if !can_modify_collection(&collection_item, &user) {
@@ -444,14 +477,16 @@ pub async fn collection_icon_edit(
         FileHostPublicity::Public,
         &**file_host,
     )
-    .await?;
+    .await
+    .wrap_api_err("deleting old images")?;
 
     let bytes = read_limited_from_payload(
         &mut payload,
         262144,
         "Icons must be smaller than 256KiB",
     )
-    .await?;
+    .await
+    .wrap_api_err("executing `read_limited_from_payload`")?;
 
     let collection_id: CollectionId = collection_item.id.into();
     let upload_result = crate::util::img::upload_image_optimized(
@@ -463,9 +498,13 @@ pub async fn collection_icon_edit(
         Some(1.0),
         &**file_host,
     )
-    .await?;
+    .await
+    .wrap_api_err("uploading image")?;
 
-    let mut transaction = pool.begin().await?;
+    let mut transaction = pool
+        .begin()
+        .await
+        .wrap_internal_err("starting database transaction")?;
 
     sqlx::query!(
         "
@@ -479,11 +518,16 @@ pub async fn collection_icon_edit(
         collection_item.id as database::models::ids::DBCollectionId,
     )
     .execute(&mut transaction)
-    .await?;
+    .await
+    .wrap_internal_err("querying database for `collection_icon_edit`")?;
 
-    transaction.commit().await?;
+    transaction
+        .commit()
+        .await
+        .wrap_internal_err("committing database transaction")?;
     database::models::DBCollection::clear_cache(collection_item.id, &redis)
-        .await?;
+        .await
+        .wrap_internal_err("clearing cached data from Redis")?;
 
     Ok(HttpResponse::NoContent().body(""))
 }
@@ -505,18 +549,20 @@ pub async fn delete_collection_icon(
         &session_queue,
         Scopes::COLLECTION_WRITE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     let string = info.into_inner().0;
-    let id = database::models::DBCollectionId(parse_base62(&string)? as i64);
+    let id = database::models::DBCollectionId(
+        parse_base62(&string).wrap_request_err("parsing collection ID")? as i64,
+    );
     let collection_item =
         database::models::DBCollection::get(id, &**pool, &redis)
-            .await?
-            .ok_or_else(|| {
-                ApiError::InvalidInput(
-                    "The specified collection does not exist!".to_string(),
-                )
+            .await
+            .wrap_internal_err("fetching collection from database")?
+            .wrap_request_err_with(|| {
+                "the specified collection does not exist!".to_string()
             })?;
     if !can_modify_collection(&collection_item, &user) {
         return Ok(HttpResponse::Unauthorized().body(""));
@@ -528,8 +574,12 @@ pub async fn delete_collection_icon(
         FileHostPublicity::Public,
         &**file_host,
     )
-    .await?;
-    let mut transaction = pool.begin().await?;
+    .await
+    .wrap_api_err("deleting old images")?;
+    let mut transaction = pool
+        .begin()
+        .await
+        .wrap_internal_err("starting database transaction")?;
 
     sqlx::query!(
         "
@@ -540,11 +590,16 @@ pub async fn delete_collection_icon(
         collection_item.id as database::models::ids::DBCollectionId,
     )
     .execute(&mut transaction)
-    .await?;
+    .await
+    .wrap_internal_err("querying database for `delete_collection_icon`")?;
 
-    transaction.commit().await?;
+    transaction
+        .commit()
+        .await
+        .wrap_internal_err("committing database transaction")?;
     database::models::DBCollection::clear_cache(collection_item.id, &redis)
-        .await?;
+        .await
+        .wrap_internal_err("clearing cached data from Redis")?;
 
     Ok(HttpResponse::NoContent().body(""))
 }
@@ -565,37 +620,48 @@ pub async fn collection_delete(
         &session_queue,
         Scopes::COLLECTION_DELETE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     let string = info.into_inner().0;
-    let id = database::models::DBCollectionId(parse_base62(&string)? as i64);
+    let id = database::models::DBCollectionId(
+        parse_base62(&string).wrap_request_err("parsing collection ID")? as i64,
+    );
     let collection = database::models::DBCollection::get(id, &**pool, &redis)
-        .await?
-        .ok_or_else(|| {
-            ApiError::InvalidInput(
-                "The specified collection does not exist!".to_string(),
-            )
+        .await
+        .wrap_internal_err("fetching collection from database")?
+        .wrap_request_err_with(|| {
+            "the specified collection does not exist!".to_string()
         })?;
     if !can_modify_collection(&collection, &user) {
         return Ok(HttpResponse::Unauthorized().body(""));
     }
-    let mut transaction = pool.begin().await?;
+    let mut transaction = pool
+        .begin()
+        .await
+        .wrap_internal_err("starting database transaction")?;
 
     let result = database::models::DBCollection::remove(
         collection.id,
         &mut transaction,
         &redis,
     )
-    .await?;
+    .await
+    .wrap_internal_err("deleting collection from database")?;
 
-    transaction.commit().await?;
-    database::models::DBCollection::clear_cache(collection.id, &redis).await?;
+    transaction
+        .commit()
+        .await
+        .wrap_internal_err("committing database transaction")?;
+    database::models::DBCollection::clear_cache(collection.id, &redis)
+        .await
+        .wrap_internal_err("clearing cached data from Redis")?;
 
     if result.is_some() {
         Ok(HttpResponse::NoContent().body(""))
     } else {
-        Err(ApiError::NotFound)
+        Err(ApiError::NotFound(eyre::eyre!("resource not found")))
     }
 }
 
diff --git a/apps/labrinth/src/routes/v3/content/mod.rs b/apps/labrinth/src/routes/v3/content/mod.rs
index 4d8cda3b91..51379b7f1b 100644
--- a/apps/labrinth/src/routes/v3/content/mod.rs
+++ b/apps/labrinth/src/routes/v3/content/mod.rs
@@ -11,6 +11,7 @@ use crate::models::pats::Scopes;
 use crate::models::projects::{DependencyType, Version};
 use crate::models::users::User;
 use crate::queue::session::AuthQueue;
+use crate::util::error::ApiContext as _;
 use actix_web::{HttpRequest, post, web};
 use ariadne::ids::base62_impl::parse_base62;
 use async_trait::async_trait;
@@ -72,7 +73,8 @@ pub async fn resolve_content(
         modrinth_content_management::resolve_content(&mut provider, request)
             .await
     }
-    .map_err(resolve_error_to_api)?;
+    .map_err(resolve_error_to_api)
+    .wrap_api_err("executing `modrinth_content_management::resolve_content`")?;
 
     Ok(web::Json(plan))
 }
diff --git a/apps/labrinth/src/routes/v3/friends.rs b/apps/labrinth/src/routes/v3/friends.rs
index 0f02c081da..5be589a6ac 100644
--- a/apps/labrinth/src/routes/v3/friends.rs
+++ b/apps/labrinth/src/routes/v3/friends.rs
@@ -13,6 +13,8 @@ use crate::routes::internal::statuses::{
 };
 use crate::sync::friends::RedisFriendsMessage;
 use crate::sync::status::get_user_status;
+use crate::util::error::ApiContext as _;
+use crate::util::error::Context as _;
 use actix_web::{HttpRequest, HttpResponse, delete, get, post, web};
 use ariadne::networking::message::ServerToClientMessage;
 use chrono::Utc;
@@ -42,41 +44,54 @@ pub async fn add_friend(
         &session_queue,
         Scopes::USER_WRITE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     let string = info.into_inner().0;
-    let Some(friend) = DBUser::get(&string, &**pool, &redis).await? else {
-        return Err(ApiError::NotFound);
+    let Some(friend) = DBUser::get(&string, &**pool, &redis)
+        .await
+        .wrap_internal_err("fetching user from database")?
+    else {
+        return Err(ApiError::NotFound(eyre::eyre!("resource not found")));
     };
 
-    if DBBlockedUser::is_blocked(friend.id, user.id.into(), &**pool).await? {
-        return Err(ApiError::InvalidInput(
-            "You've been blocked the other user!".to_string(),
-        ));
-    } else if DBBlockedUser::is_blocked(user.id.into(), friend.id, &**pool)
-        .await?
+    if DBBlockedUser::is_blocked(friend.id, user.id.into(), &**pool)
+        .await
+        .wrap_internal_err("checking whether target user blocked requester")?
     {
-        return Err(ApiError::InvalidInput(
-            "You've blocked the other user!".to_string(),
-        ));
+        return Err(ApiError::Request(eyre::eyre!(
+            "You've been blocked the other user!",
+        )));
+    } else if DBBlockedUser::is_blocked(user.id.into(), friend.id, &**pool)
+        .await
+        .wrap_internal_err("checking whether requester blocked target user")?
+    {
+        return Err(ApiError::Request(eyre::eyre!(
+            "You've blocked the other user!",
+        )));
     }
 
-    let mut transaction = pool.begin().await?;
+    let mut transaction = pool
+        .begin()
+        .await
+        .wrap_internal_err("starting database transaction")?;
 
     if let Some(friend) =
-        DBFriend::get_friend(user.id.into(), friend.id, &**pool).await?
+        DBFriend::get_friend(user.id.into(), friend.id, &**pool)
+            .await
+            .wrap_internal_err("fetching friend from database")?
     {
         if friend.accepted {
-            return Err(ApiError::InvalidInput(
-                "You are already friends with this user!".to_string(),
-            ));
+            return Err(ApiError::Request(eyre::eyre!(
+                "You are already friends with this user!",
+            )));
         }
 
         if !friend.accepted && user.id != friend.friend_id.into() {
-            return Err(ApiError::InvalidInput(
-                "You cannot accept your own friend request!".to_string(),
-            ));
+            return Err(ApiError::Request(eyre::eyre!(
+                "You cannot accept your own friend request!",
+            )));
         }
 
         DBFriend::update_friend(
@@ -85,7 +100,8 @@ pub async fn add_friend(
             true,
             &mut transaction,
         )
-        .await?;
+        .await
+        .wrap_internal_err("updating friend in database")?;
 
         async fn send_friend_status(
             user_id: DBUserId,
@@ -103,27 +119,30 @@ pub async fn add_friend(
                         status: friend_status,
                     },
                 )
-                .await?;
+                .await
+                .wrap_internal_err("updating friend in database")?;
             }
 
             Ok(())
         }
 
         send_friend_status(friend.user_id, friend.friend_id, &db, &redis)
-            .await?;
+            .await
+            .wrap_api_err("executing `send_friend_status`")?;
         send_friend_status(friend.friend_id, friend.user_id, &db, &redis)
-            .await?;
+            .await
+            .wrap_api_err("executing `send_friend_status`")?;
     } else {
         if friend.id == user.id.into() {
-            return Err(ApiError::InvalidInput(
-                "You cannot add yourself as a friend!".to_string(),
-            ));
+            return Err(ApiError::Request(eyre::eyre!(
+                "You cannot add yourself as a friend!",
+            )));
         }
 
         if !friend.allow_friend_requests {
-            return Err(ApiError::InvalidInput(
-                "Friend requests are disabled for this user!".to_string(),
-            ));
+            return Err(ApiError::Request(eyre::eyre!(
+                "Friend requests are disabled for this user!",
+            )));
         }
 
         DBFriend {
@@ -133,17 +152,26 @@ pub async fn add_friend(
             accepted: false,
         }
         .insert(&mut transaction)
-        .await?;
+        .await
+        .wrap_internal_err(
+            "inserting database records for `send_friend_status`",
+        )?;
 
         send_message_to_user(
             &db,
             friend.id.into(),
             &ServerToClientMessage::FriendRequest { from: user.id },
         )
-        .await?;
+        .await
+        .wrap_internal_err(
+            "inserting database records for `send_friend_status`",
+        )?;
     }
 
-    transaction.commit().await?;
+    transaction
+        .commit()
+        .await
+        .wrap_internal_err("committing database transaction")?;
 
     Ok(HttpResponse::NoContent().body(""))
 }
@@ -166,29 +194,41 @@ pub async fn remove_friend(
         &session_queue,
         Scopes::USER_WRITE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     let string = info.into_inner().0;
-    let friend = DBUser::get(&string, &**pool, &redis).await?;
+    let friend = DBUser::get(&string, &**pool, &redis)
+        .await
+        .wrap_internal_err("fetching user from database")?;
 
     if let Some(friend) = friend {
-        let mut transaction = pool.begin().await?;
+        let mut transaction = pool
+            .begin()
+            .await
+            .wrap_internal_err("starting database transaction")?;
 
-        DBFriend::remove(user.id.into(), friend.id, &mut transaction).await?;
+        DBFriend::remove(user.id.into(), friend.id, &mut transaction)
+            .await
+            .wrap_internal_err("deleting friend from database")?;
 
         send_message_to_user(
             &db,
             friend.id.into(),
             &ServerToClientMessage::FriendRequestRejected { from: user.id },
         )
-        .await?;
+        .await
+        .wrap_internal_err("deleting friend from database")?;
 
-        transaction.commit().await?;
+        transaction
+            .commit()
+            .await
+            .wrap_internal_err("committing database transaction")?;
 
         Ok(HttpResponse::NoContent().body(""))
     } else {
-        Err(ApiError::NotFound)
+        Err(ApiError::NotFound(eyre::eyre!("resource not found")))
     }
 }
 
@@ -208,11 +248,13 @@ pub async fn friends(
         &session_queue,
         Scopes::USER_READ,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     let friends = DBFriend::get_user_friends(user.id.into(), None, &**pool)
-        .await?
+        .await
+        .wrap_internal_err("fetching friends from database")?
         .into_iter()
         .map(UserFriend::from)
         .collect::<Vec<_>>();
diff --git a/apps/labrinth/src/routes/v3/images.rs b/apps/labrinth/src/routes/v3/images.rs
index 6b53cf0fab..7e45da50c1 100644
--- a/apps/labrinth/src/routes/v3/images.rs
+++ b/apps/labrinth/src/routes/v3/images.rs
@@ -11,6 +11,8 @@ use crate::models::ids::{ReportId, ThreadMessageId, VersionId};
 use crate::models::images::{Image, ImageContext};
 use crate::queue::session::AuthQueue;
 use crate::routes::ApiError;
+use crate::util::error::ApiContext as _;
+use crate::util::error::Context as _;
 use crate::util::img::upload_image_optimized;
 use crate::util::routes::read_limited_from_payload;
 use actix_web::{HttpRequest, HttpResponse, post, web};
@@ -68,7 +70,8 @@ pub async fn images_add(
         &session_queue,
         context.relevant_scope(),
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     // Attempt to associated a supplied id with the context
@@ -77,25 +80,28 @@ pub async fn images_add(
         ImageContext::Project { project_id } => {
             if let Some(id) = data.project_id {
                 let project =
-                    project_item::DBProject::get(&id, &**pool, &redis).await?;
+                    project_item::DBProject::get(&id, &**pool, &redis)
+                        .await
+                        .wrap_api_err("fetching project from database")?;
                 if let Some(project) = project {
                     if is_team_member_project(
                         &project.inner,
                         &Some(user.clone()),
                         &pool,
                     )
-                    .await?
+                    .await
+                    .wrap_api_err("checking team member project")?
                     {
                         *project_id = Some(project.inner.id.into());
                     } else {
-                        return Err(ApiError::CustomAuthentication(
-                            "You are not authorized to upload images for this project".to_string(),
-                        ));
+                        return Err(ApiError::Auth(eyre::eyre!(
+                            "You are not authorized to upload images for this project",
+                        )));
                     }
                 } else {
-                    return Err(ApiError::InvalidInput(
-                        "The project could not be found.".to_string(),
-                    ));
+                    return Err(ApiError::Request(eyre::eyre!(
+                        "The project could not be found.",
+                    )));
                 }
             }
         }
@@ -103,7 +109,8 @@ pub async fn images_add(
             if let Some(id) = data.version_id {
                 let version =
                     version_item::DBVersion::get(id.into(), &**pool, &redis)
-                        .await?;
+                        .await
+                        .wrap_internal_err("fetching version from database")?;
                 if let Some(version) = version {
                     if is_team_member_version(
                         &version.inner,
@@ -111,18 +118,19 @@ pub async fn images_add(
                         &pool,
                         &redis,
                     )
-                    .await?
+                    .await
+                    .wrap_api_err("checking team member version")?
                     {
                         *version_id = Some(version.inner.id.into());
                     } else {
-                        return Err(ApiError::CustomAuthentication(
-                            "You are not authorized to upload images for this version".to_string(),
-                        ));
+                        return Err(ApiError::Auth(eyre::eyre!(
+                            "You are not authorized to upload images for this version",
+                        )));
                     }
                 } else {
-                    return Err(ApiError::InvalidInput(
-                        "The version could not be found.".to_string(),
-                    ));
+                    return Err(ApiError::Request(eyre::eyre!(
+                        "The version could not be found.",
+                    )));
                 }
             }
         }
@@ -130,60 +138,63 @@ pub async fn images_add(
             if let Some(id) = data.thread_message_id {
                 let thread_message =
                     thread_item::DBThreadMessage::get(id.into(), &**pool)
-                        .await?
-                        .ok_or_else(|| {
-                            ApiError::InvalidInput(
-                                "The thread message could not found."
-                                    .to_string(),
-                            )
+                        .await
+                        .wrap_internal_err(
+                            "fetching thread message from database",
+                        )?
+                        .wrap_request_err_with(|| {
+                            "the thread message could not found.".to_string()
                         })?;
                 let thread = thread_item::DBThread::get(thread_message.thread_id, &**pool)
-                    .await?
-                    .ok_or_else(|| {
-                        ApiError::InvalidInput(
-                            "The thread associated with the thread message could not be found"
-                                .to_string(),
-                        )
-                    })?;
-                if is_authorized_thread(&thread, &user, &pool).await? {
+                    .await.wrap_internal_err("fetching thread from database")?
+                    .wrap_request_err_with(|| "the thread associated with the thread message could not be found"
+                                .to_string())?;
+                if is_authorized_thread(&thread, &user, &pool)
+                    .await
+                    .wrap_api_err("checking thread authorization")?
+                {
                     *thread_message_id = Some(thread_message.id.into());
                 } else {
-                    return Err(ApiError::CustomAuthentication(
-                        "You are not authorized to upload images for this thread message"
-                            .to_string(),
-                    ));
+                    return Err(ApiError::Auth(eyre::eyre!(
+                        "You are not authorized to upload images for this thread message",
+                    )));
                 }
             }
         }
         ImageContext::Report { report_id } => {
             if let Some(id) = data.report_id {
                 let report = report_item::DBReport::get(id.into(), &**pool)
-                    .await?
-                    .ok_or_else(|| {
-                        ApiError::InvalidInput(
-                            "The report could not be found.".to_string(),
-                        )
+                    .await
+                    .wrap_internal_err("fetching report from database")?
+                    .wrap_request_err_with(|| {
+                        "the report could not be found.".to_string()
                     })?;
-                let thread = thread_item::DBThread::get(report.thread_id, &**pool)
-                    .await?
-                    .ok_or_else(|| {
-                        ApiError::InvalidInput(
-                            "The thread associated with the report could not be found.".to_string(),
-                        )
-                    })?;
-                if is_authorized_thread(&thread, &user, &pool).await? {
+                let thread = thread_item::DBThread::get(
+                    report.thread_id,
+                    &**pool,
+                )
+                .await
+                .wrap_internal_err("fetching thread from database")?
+                .wrap_request_err_with(|| {
+                    "the thread associated with the report could not be found."
+                        .to_string()
+                })?;
+                if is_authorized_thread(&thread, &user, &pool)
+                    .await
+                    .wrap_api_err("checking thread authorization")?
+                {
                     *report_id = Some(report.id.into());
                 } else {
-                    return Err(ApiError::CustomAuthentication(
-                        "You are not authorized to upload images for this report".to_string(),
-                    ));
+                    return Err(ApiError::Auth(eyre::eyre!(
+                        "You are not authorized to upload images for this report",
+                    )));
                 }
             }
         }
         ImageContext::Unknown => {
-            return Err(ApiError::InvalidInput(
-                "Context must be one of: project, version, thread_message, report".to_string(),
-            ));
+            return Err(ApiError::Request(eyre::eyre!(
+                "Context must be one of: project, version, thread_message, report",
+            )));
         }
     }
 
@@ -193,7 +204,8 @@ pub async fn images_add(
         1_048_576,
         "Icons must be smaller than 1MiB",
     )
-    .await?;
+    .await
+    .wrap_api_err("executing `read_limited_from_payload`")?;
 
     let content_length = bytes.len();
     let upload_result = upload_image_optimized(
@@ -205,12 +217,18 @@ pub async fn images_add(
         None,
         &**file_host,
     )
-    .await?;
+    .await
+    .wrap_api_err("uploading image")?;
 
-    let mut transaction = pool.begin().await?;
+    let mut transaction = pool
+        .begin()
+        .await
+        .wrap_internal_err("starting database transaction")?;
 
     let db_image: database::models::DBImage = database::models::DBImage {
-        id: database::models::generate_image_id(&mut transaction).await?,
+        id: database::models::generate_image_id(&mut transaction)
+            .await
+            .wrap_internal_err("generating image ID")?,
         url: upload_result.url,
         raw_url: upload_result.raw_url,
         size: content_length as u64,
@@ -252,7 +270,10 @@ pub async fn images_add(
     };
 
     // Insert
-    db_image.insert(&mut transaction).await?;
+    db_image
+        .insert(&mut transaction)
+        .await
+        .wrap_internal_err("inserting database records for `images_add`")?;
 
     let image = Image {
         id: db_image.id.into(),
@@ -263,7 +284,10 @@ pub async fn images_add(
         context,
     };
 
-    transaction.commit().await?;
+    transaction
+        .commit()
+        .await
+        .wrap_internal_err("committing database transaction")?;
 
     Ok(HttpResponse::Ok().json(image))
 }
diff --git a/apps/labrinth/src/routes/v3/limits.rs b/apps/labrinth/src/routes/v3/limits.rs
index f7ef89a48f..ab11d37a8e 100644
--- a/apps/labrinth/src/routes/v3/limits.rs
+++ b/apps/labrinth/src/routes/v3/limits.rs
@@ -1,4 +1,5 @@
 use crate::database::PgPool;
+use crate::util::error::Context as _;
 use crate::{
     auth::get_user_from_headers,
     models::{pats::Scopes, v3::user_limits::UserLimits},
@@ -29,9 +30,12 @@ pub async fn get_project_limits(
         &session_queue,
         Scopes::empty(),
     )
-    .await?;
+    .await
+    .wrap_auth_err("authenticating API request")?;
 
-    let limits = UserLimits::get_for_projects(&user, &pool).await?;
+    let limits = UserLimits::get_for_projects(&user, &pool)
+        .await
+        .wrap_internal_err("fetching user limits from Redis")?;
     Ok(web::Json(limits))
 }
 
@@ -50,9 +54,12 @@ pub async fn get_organization_limits(
         &session_queue,
         Scopes::empty(),
     )
-    .await?;
+    .await
+    .wrap_auth_err("authenticating API request")?;
 
-    let limits = UserLimits::get_for_organizations(&user, &pool).await?;
+    let limits = UserLimits::get_for_organizations(&user, &pool)
+        .await
+        .wrap_internal_err("fetching user limits from Redis")?;
     Ok(web::Json(limits))
 }
 
@@ -71,8 +78,11 @@ pub async fn get_collection_limits(
         &session_queue,
         Scopes::empty(),
     )
-    .await?;
+    .await
+    .wrap_auth_err("authenticating API request")?;
 
-    let limits = UserLimits::get_for_collections(&user, &pool).await?;
+    let limits = UserLimits::get_for_collections(&user, &pool)
+        .await
+        .wrap_internal_err("fetching user limits from Redis")?;
     Ok(web::Json(limits))
 }
diff --git a/apps/labrinth/src/routes/v3/notifications.rs b/apps/labrinth/src/routes/v3/notifications.rs
index bab2519802..1daa7acf3e 100644
--- a/apps/labrinth/src/routes/v3/notifications.rs
+++ b/apps/labrinth/src/routes/v3/notifications.rs
@@ -6,6 +6,7 @@ use crate::models::notifications::Notification;
 use crate::models::pats::Scopes;
 use crate::queue::session::AuthQueue;
 use crate::routes::ApiError;
+use crate::util::error::Context as _;
 use actix_web::{HttpRequest, HttpResponse, delete, get, patch, web};
 use serde::{Deserialize, Serialize};
 use xredis::RedisPool;
@@ -54,14 +55,16 @@ pub async fn notifications_get(
         &session_queue,
         Scopes::NOTIFICATION_READ,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     use database::models::DBNotificationId;
     use database::models::notification_item::DBNotification;
 
     let notification_ids: Vec<DBNotificationId> =
-        serde_json::from_str::<Vec<NotificationId>>(ids.ids.as_str())?
+        serde_json::from_str::<Vec<NotificationId>>(ids.ids.as_str())
+            .wrap_request_err("deserializing JSON data")?
             .into_iter()
             .map(DBNotificationId::from)
             .collect();
@@ -71,7 +74,8 @@ pub async fn notifications_get(
             &notification_ids,
             &**pool,
         )
-        .await?;
+        .await
+        .wrap_internal_err("fetching notifications from database")?;
 
     let notifications: Vec<Notification> = notifications_data
         .into_iter()
@@ -108,7 +112,8 @@ pub async fn notification_get(
         &session_queue,
         Scopes::NOTIFICATION_READ,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     let id = info.into_inner().0;
@@ -118,16 +123,17 @@ pub async fn notification_get(
             id.into(),
             &**pool,
         )
-        .await?;
+        .await
+        .wrap_internal_err("fetching notification from database")?;
 
     if let Some(data) = notification_data {
         if user.id == data.user_id.into() || user.role.is_admin() {
             Ok(HttpResponse::Ok().json(Notification::from(data)))
         } else {
-            Err(ApiError::NotFound)
+            Err(ApiError::NotFound(eyre::eyre!("resource not found")))
         }
     } else {
-        Err(ApiError::NotFound)
+        Err(ApiError::NotFound(eyre::eyre!("resource not found")))
     }
 }
 
@@ -157,7 +163,8 @@ pub async fn notification_read(
         &session_queue,
         Scopes::NOTIFICATION_WRITE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     let id = info.into_inner().0;
@@ -167,29 +174,37 @@ pub async fn notification_read(
             id.into(),
             &**pool,
         )
-        .await?;
+        .await
+        .wrap_internal_err("fetching notification from database")?;
 
     if let Some(data) = notification_data {
         if data.user_id == user.id.into() || user.role.is_admin() {
-            let mut transaction = pool.begin().await?;
+            let mut transaction = pool
+                .begin()
+                .await
+                .wrap_internal_err("starting database transaction")?;
 
             database::models::notification_item::DBNotification::read(
                 id.into(),
                 &mut transaction,
                 &redis,
             )
-            .await?;
+            .await
+            .wrap_internal_err("executing `DBNotification::read`")?;
 
-            transaction.commit().await?;
+            transaction
+                .commit()
+                .await
+                .wrap_internal_err("committing database transaction")?;
 
             Ok(HttpResponse::NoContent().body(""))
         } else {
-            Err(ApiError::CustomAuthentication(
-                "You are not authorized to read this notification!".to_string(),
-            ))
+            Err(ApiError::Auth(eyre::eyre!(
+                "You are not authorized to read this notification!",
+            )))
         }
     } else {
-        Err(ApiError::NotFound)
+        Err(ApiError::NotFound(eyre::eyre!("resource not found")))
     }
 }
 
@@ -219,7 +234,8 @@ pub async fn notification_delete(
         &session_queue,
         Scopes::NOTIFICATION_WRITE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     let id = info.into_inner().0;
@@ -229,30 +245,37 @@ pub async fn notification_delete(
             id.into(),
             &**pool,
         )
-        .await?;
+        .await
+        .wrap_internal_err("fetching notification from database")?;
 
     if let Some(data) = notification_data {
         if data.user_id == user.id.into() || user.role.is_admin() {
-            let mut transaction = pool.begin().await?;
+            let mut transaction = pool
+                .begin()
+                .await
+                .wrap_internal_err("starting database transaction")?;
 
             database::models::notification_item::DBNotification::remove(
                 id.into(),
                 &mut transaction,
                 &redis,
             )
-            .await?;
+            .await
+            .wrap_internal_err("deleting notification from database")?;
 
-            transaction.commit().await?;
+            transaction
+                .commit()
+                .await
+                .wrap_internal_err("committing database transaction")?;
 
             Ok(HttpResponse::NoContent().body(""))
         } else {
-            Err(ApiError::CustomAuthentication(
-                "You are not authorized to delete this notification!"
-                    .to_string(),
-            ))
+            Err(ApiError::Auth(eyre::eyre!(
+                "You are not authorized to delete this notification!",
+            )))
         }
     } else {
-        Err(ApiError::NotFound)
+        Err(ApiError::NotFound(eyre::eyre!("resource not found")))
     }
 }
 
@@ -286,23 +309,29 @@ pub async fn notifications_read(
         &session_queue,
         Scopes::NOTIFICATION_WRITE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     let notification_ids =
-        serde_json::from_str::<Vec<NotificationId>>(&ids.ids)?
+        serde_json::from_str::<Vec<NotificationId>>(&ids.ids)
+            .wrap_request_err("deserializing JSON data")?
             .into_iter()
             .map(|x| x.into())
             .collect::<Vec<_>>();
 
-    let mut transaction = pool.begin().await?;
+    let mut transaction = pool
+        .begin()
+        .await
+        .wrap_internal_err("starting database transaction")?;
 
     let notifications_data =
         database::models::notification_item::DBNotification::get_many(
             &notification_ids,
             &**pool,
         )
-        .await?;
+        .await
+        .wrap_internal_err("fetching notifications from database")?;
 
     let mut notifications: Vec<database::models::ids::DBNotificationId> =
         Vec::new();
@@ -318,9 +347,13 @@ pub async fn notifications_read(
         &mut transaction,
         &redis,
     )
-    .await?;
+    .await
+    .wrap_internal_err("marking notifications as read")?;
 
-    transaction.commit().await?;
+    transaction
+        .commit()
+        .await
+        .wrap_internal_err("committing database transaction")?;
 
     Ok(HttpResponse::NoContent().body(""))
 }
@@ -355,23 +388,29 @@ pub async fn notifications_delete(
         &session_queue,
         Scopes::NOTIFICATION_WRITE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     let notification_ids =
-        serde_json::from_str::<Vec<NotificationId>>(&ids.ids)?
+        serde_json::from_str::<Vec<NotificationId>>(&ids.ids)
+            .wrap_request_err("deserializing JSON data")?
             .into_iter()
             .map(|x| x.into())
             .collect::<Vec<_>>();
 
-    let mut transaction = pool.begin().await?;
+    let mut transaction = pool
+        .begin()
+        .await
+        .wrap_internal_err("starting database transaction")?;
 
     let notifications_data =
         database::models::notification_item::DBNotification::get_many(
             &notification_ids,
             &**pool,
         )
-        .await?;
+        .await
+        .wrap_internal_err("fetching notifications from database")?;
 
     let mut notifications: Vec<database::models::ids::DBNotificationId> =
         Vec::new();
@@ -387,9 +426,13 @@ pub async fn notifications_delete(
         &mut transaction,
         &redis,
     )
-    .await?;
+    .await
+    .wrap_internal_err("deleting notifications from database")?;
 
-    transaction.commit().await?;
+    transaction
+        .commit()
+        .await
+        .wrap_internal_err("committing database transaction")?;
 
     Ok(HttpResponse::NoContent().body(""))
 }
diff --git a/apps/labrinth/src/routes/v3/oauth_clients.rs b/apps/labrinth/src/routes/v3/oauth_clients.rs
index a2b3a5c52b..039045f28d 100644
--- a/apps/labrinth/src/routes/v3/oauth_clients.rs
+++ b/apps/labrinth/src/routes/v3/oauth_clients.rs
@@ -1,3 +1,5 @@
+use crate::util::error::ApiContext as _;
+use crate::util::error::Context as _;
 use std::{collections::HashSet, fmt::Display};
 use xredis::RedisPool;
 
@@ -71,23 +73,27 @@ pub async fn get_user_clients(
         &session_queue,
         Scopes::SESSION_ACCESS,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
-    let target_user = DBUser::get(&info.into_inner(), &**pool, &redis).await?;
+    let target_user = DBUser::get(&info.into_inner(), &**pool, &redis)
+        .await
+        .wrap_internal_err("fetching user from database")?;
 
     if let Some(target_user) = target_user {
         if target_user.id != current_user.id.into()
             && !current_user.role.is_admin()
         {
-            return Err(ApiError::CustomAuthentication(
-                "You do not have permission to see the OAuth clients of this user!".to_string(),
-            ));
+            return Err(ApiError::Auth(eyre::eyre!(
+                "You do not have permission to see the OAuth clients of this user!",
+            )));
         }
 
         let clients =
             DBOAuthClient::get_all_user_clients(target_user.id, &**pool)
-                .await?;
+                .await
+                .wrap_internal_err("fetching OAuth clients from database")?;
 
         let response = clients
             .into_iter()
@@ -96,7 +102,7 @@ pub async fn get_user_clients(
 
         Ok(HttpResponse::Ok().json(response))
     } else {
-        Err(ApiError::NotFound)
+        Err(ApiError::NotFound(eyre::eyre!("resource not found")))
     }
 }
 
@@ -112,11 +118,13 @@ pub async fn get_client(
     id: web::Path<OAuthClientId>,
     pool: web::Data<PgPool>,
 ) -> Result<HttpResponse, ApiError> {
-    let clients = get_clients_inner(&[id.into_inner()], pool).await?;
+    let clients = get_clients_inner(&[id.into_inner()], pool)
+        .await
+        .wrap_api_err("fetching OAuth client")?;
     if let Some(client) = clients.into_iter().next() {
         Ok(HttpResponse::Ok().json(client))
     } else {
-        Err(ApiError::NotFound)
+        Err(ApiError::NotFound(eyre::eyre!("resource not found")))
     }
 }
 
@@ -136,9 +144,12 @@ pub async fn get_clients(
         .ids
         .iter()
         .map(|id| parse_base62(id).map(OAuthClientId))
-        .collect::<Result<_, _>>()?;
+        .collect::<Result<_, _>>()
+        .wrap_request_err("parsing OAuth client IDs")?;
 
-    let clients = get_clients_inner(&ids, pool).await?;
+    let clients = get_clients_inner(&ids, pool)
+        .await
+        .wrap_api_err("fetching clients inner")?;
 
     Ok(HttpResponse::Ok().json(clients))
 }
@@ -257,18 +268,24 @@ pub async fn oauth_client_delete(
         &session_queue,
         Scopes::SESSION_ACCESS,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
-    let client =
-        DBOAuthClient::get(client_id.into_inner().into(), &**pool).await?;
+    let client = DBOAuthClient::get(client_id.into_inner().into(), &**pool)
+        .await
+        .wrap_internal_err("fetching OAuth client from database")?;
     if let Some(client) = client {
-        client.validate_authorized(Some(&current_user))?;
-        DBOAuthClient::remove(client.id, &**pool).await?;
+        client
+            .validate_authorized(Some(&current_user))
+            .wrap_api_err("validating authorized")?;
+        DBOAuthClient::remove(client.id, &**pool)
+            .await
+            .wrap_internal_err("validating oauth client")?;
 
         Ok(HttpResponse::NoContent().body(""))
     } else {
-        Err(ApiError::NotFound)
+        Err(ApiError::NotFound(eyre::eyre!("resource not found")))
     }
 }
 
@@ -321,17 +338,23 @@ pub async fn oauth_client_edit(
         &session_queue,
         Scopes::SESSION_ACCESS,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
-    client_updates.validate().map_err(|e| {
-        ApiError::Validation(validation_errors_to_string(e, None))
-    })?;
+    client_updates
+        .validate()
+        .map_err(|err| eyre::eyre!(err))
+        .wrap_request_err("validating request")?;
 
     if let Some(existing_client) =
-        DBOAuthClient::get(client_id.into_inner().into(), &**pool).await?
+        DBOAuthClient::get(client_id.into_inner().into(), &**pool)
+            .await
+            .wrap_internal_err("fetching OAuth client from database")?
     {
-        existing_client.validate_authorized(Some(&current_user))?;
+        existing_client
+            .validate_authorized(Some(&current_user))
+            .wrap_api_err("authorizing OAuth client update")?;
 
         let mut updated_client = existing_client.clone();
         let OAuthClientEdit {
@@ -357,21 +380,31 @@ pub async fn oauth_client_edit(
             updated_client.description = description;
         }
 
-        let mut transaction = pool.begin().await?;
+        let mut transaction = pool
+            .begin()
+            .await
+            .wrap_internal_err("starting database transaction")?;
         updated_client
             .update_editable_fields(&mut transaction)
-            .await?;
+            .await
+            .wrap_internal_err(
+                "updating database records for `oauth_client_edit`",
+            )?;
 
         if let Some(redirects) = redirect_uris {
             edit_redirects(redirects, &existing_client, &mut transaction)
-                .await?;
+                .await
+                .wrap_internal_err("updating redirects in database")?;
         }
 
-        transaction.commit().await?;
+        transaction
+            .commit()
+            .await
+            .wrap_internal_err("committing database transaction")?;
 
         Ok(HttpResponse::Ok().body(""))
     } else {
-        Err(ApiError::NotFound)
+        Err(ApiError::NotFound(eyre::eyre!("resource not found")))
     }
 }
 
@@ -410,18 +443,20 @@ pub async fn oauth_client_icon_edit(
         &session_queue,
         Scopes::SESSION_ACCESS,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     let client = DBOAuthClient::get((*client_id).into(), &**pool)
-        .await?
-        .ok_or_else(|| {
-            ApiError::InvalidInput(
-                "The specified client does not exist!".to_string(),
-            )
+        .await
+        .wrap_internal_err("fetching OAuth client from database")?
+        .wrap_request_err_with(|| {
+            "the specified client does not exist!".to_string()
         })?;
 
-    client.validate_authorized(Some(&user))?;
+    client
+        .validate_authorized(Some(&user))
+        .wrap_api_err("validating authorized")?;
 
     delete_old_images(
         client.icon_url.clone(),
@@ -429,14 +464,16 @@ pub async fn oauth_client_icon_edit(
         FileHostPublicity::Public,
         &**file_host,
     )
-    .await?;
+    .await
+    .wrap_api_err("deleting old images")?;
 
     let bytes = read_limited_from_payload(
         &mut payload,
         262144,
         "Icons must be smaller than 256KiB",
     )
-    .await?;
+    .await
+    .wrap_api_err("executing `read_limited_from_payload`")?;
     let upload_result = upload_image_optimized(
         &format!("data/{client_id}"),
         FileHostPublicity::Public,
@@ -446,9 +483,13 @@ pub async fn oauth_client_icon_edit(
         Some(1.0),
         &**file_host,
     )
-    .await?;
+    .await
+    .wrap_api_err("uploading image")?;
 
-    let mut transaction = pool.begin().await?;
+    let mut transaction = pool
+        .begin()
+        .await
+        .wrap_internal_err("starting database transaction")?;
 
     let mut editable_client = client.clone();
     editable_client.icon_url = Some(upload_result.url);
@@ -456,9 +497,15 @@ pub async fn oauth_client_icon_edit(
 
     editable_client
         .update_editable_fields(&mut transaction)
-        .await?;
+        .await
+        .wrap_internal_err(
+            "updating database records for `oauth_client_icon_edit`",
+        )?;
 
-    transaction.commit().await?;
+    transaction
+        .commit()
+        .await
+        .wrap_internal_err("committing database transaction")?;
 
     Ok(HttpResponse::NoContent().body(""))
 }
@@ -486,17 +533,19 @@ pub async fn oauth_client_icon_delete(
         &session_queue,
         Scopes::SESSION_ACCESS,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     let client = DBOAuthClient::get((*client_id).into(), &**pool)
-        .await?
-        .ok_or_else(|| {
-            ApiError::InvalidInput(
-                "The specified client does not exist!".to_string(),
-            )
+        .await
+        .wrap_internal_err("fetching OAuth client from database")?
+        .wrap_request_err_with(|| {
+            "the specified client does not exist!".to_string()
         })?;
-    client.validate_authorized(Some(&user))?;
+    client
+        .validate_authorized(Some(&user))
+        .wrap_api_err("validating authorized")?;
 
     delete_old_images(
         client.icon_url.clone(),
@@ -504,9 +553,13 @@ pub async fn oauth_client_icon_delete(
         FileHostPublicity::Public,
         &**file_host,
     )
-    .await?;
+    .await
+    .wrap_api_err("deleting old images")?;
 
-    let mut transaction = pool.begin().await?;
+    let mut transaction = pool
+        .begin()
+        .await
+        .wrap_internal_err("starting database transaction")?;
 
     let mut editable_client = client.clone();
     editable_client.icon_url = None;
@@ -514,8 +567,14 @@ pub async fn oauth_client_icon_delete(
 
     editable_client
         .update_editable_fields(&mut transaction)
-        .await?;
-    transaction.commit().await?;
+        .await
+        .wrap_internal_err(
+            "updating database records for `oauth_client_icon_delete`",
+        )?;
+    transaction
+        .commit()
+        .await
+        .wrap_internal_err("committing database transaction")?;
 
     Ok(HttpResponse::NoContent().body(""))
 }
@@ -540,14 +599,16 @@ pub async fn get_user_oauth_authorizations(
         &session_queue,
         Scopes::SESSION_ACCESS,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     let authorizations = DBOAuthClientAuthorization::get_all_for_user(
         current_user.id.into(),
         &**pool,
     )
-    .await?;
+    .await
+    .wrap_internal_err("fetching OAuth client authorizations from database")?;
 
     let mapped: Vec<models::oauth_clients::OAuthClientAuthorization> =
         authorizations.into_iter().map(|a| a.into()).collect_vec();
@@ -577,7 +638,8 @@ pub async fn revoke_oauth_authorization(
         &session_queue,
         Scopes::SESSION_ACCESS,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     DBOAuthClientAuthorization::remove(
@@ -585,7 +647,8 @@ pub async fn revoke_oauth_authorization(
         current_user.id.into(),
         &**pool,
     )
-    .await?;
+    .await
+    .wrap_internal_err("deleting oauth client authorization from database")?;
 
     Ok(HttpResponse::Ok().body(""))
 }
@@ -653,7 +716,9 @@ pub async fn get_clients_inner(
     pool: web::Data<PgPool>,
 ) -> Result<Vec<models::oauth_clients::OAuthClient>, ApiError> {
     let ids: Vec<DBOAuthClientId> = ids.iter().map(|i| (*i).into()).collect();
-    let clients = DBOAuthClient::get_many(&ids, &**pool).await?;
+    let clients = DBOAuthClient::get_many(&ids, &**pool)
+        .await
+        .wrap_internal_err("fetching OAuth clients from database")?;
 
     Ok(clients.into_iter().map(|c| c.into()).collect_vec())
 }
diff --git a/apps/labrinth/src/routes/v3/organizations.rs b/apps/labrinth/src/routes/v3/organizations.rs
index 91f9e04b43..3ff46b06e3 100644
--- a/apps/labrinth/src/routes/v3/organizations.rs
+++ b/apps/labrinth/src/routes/v3/organizations.rs
@@ -1,3 +1,4 @@
+use crate::util::error::ApiContext as _;
 use std::collections::HashMap;
 
 use super::ApiError;
@@ -18,6 +19,7 @@ use crate::models::v3::user_limits::UserLimits;
 use crate::queue::session::AuthQueue;
 use crate::routes::v3::project_creation::CreateError;
 use crate::search::SearchState;
+use crate::util::error::Context;
 use crate::util::img::delete_old_images;
 use crate::util::routes::read_limited_from_payload;
 use crate::util::validate::validation_errors_to_string;
@@ -65,10 +67,13 @@ pub async fn organization_projects_get(
     .map(|x| x.1)
     .ok();
 
-    let organization_data = DBOrganization::get(&id, &**pool, &redis).await?;
+    let organization_data = DBOrganization::get(&id, &**pool, &redis)
+        .await
+        .wrap_internal_err("fetching organization from database")?;
     if let Some(organization) = organization_data
         && is_visible_organization(&organization, &current_user, &pool, &redis)
-            .await?
+            .await
+            .wrap_api_err("checking organization visibility")?
     {
         let project_ids = sqlx::query!(
             "
@@ -81,22 +86,25 @@ pub async fn organization_projects_get(
         .fetch(&**pool)
         .map_ok(|m| database::models::DBProjectId(m.id))
         .try_collect::<Vec<_>>()
-        .await?;
+        .await
+        .wrap_internal_err("fetching project IDs from database")?;
 
         let projects_data = crate::database::models::DBProject::get_many_ids(
             &project_ids,
             &**pool,
             &redis,
         )
-        .await?;
+        .await
+        .wrap_api_err("fetching organization projects")?;
 
         let projects =
             filter_visible_projects(projects_data, &current_user, &pool, true)
-                .await?;
+                .await
+                .wrap_api_err("filtering visible projects")?;
 
         Ok(HttpResponse::Ok().json(projects))
     } else {
-        Err(ApiError::NotFound)
+        Err(ApiError::NotFound(eyre::eyre!("resource not found")))
     }
 }
 
@@ -242,20 +250,26 @@ pub async fn organization_get(
     .ok();
     let user_id = current_user.as_ref().map(|x| x.id.into());
 
-    let organization_data = DBOrganization::get(&id, &**pool, &redis).await?;
+    let organization_data = DBOrganization::get(&id, &**pool, &redis)
+        .await
+        .wrap_internal_err("fetching organization from database")?;
     if let Some(data) = organization_data
-        && is_visible_organization(&data, &current_user, &pool, &redis).await?
+        && is_visible_organization(&data, &current_user, &pool, &redis)
+            .await
+            .wrap_api_err("checking organization visibility")?
     {
         let members_data =
             DBTeamMember::get_from_team_full(data.team_id, &**pool, &redis)
-                .await?;
+                .await
+                .wrap_internal_err("fetching team members from database")?;
 
         let users = crate::database::models::DBUser::get_many_ids(
             &members_data.iter().map(|x| x.user_id).collect::<Vec<_>>(),
             &**pool,
             &redis,
         )
-        .await?;
+        .await
+        .wrap_internal_err("fetching users from database")?;
         let logged_in = current_user
             .as_ref()
             .and_then(|user| {
@@ -292,12 +306,13 @@ pub async fn organization_get(
                 &**pool,
                 &redis,
             )
-            .await?;
+            .await
+            .wrap_internal_err("fetching moderation note from database")?;
             organization.moderation_notes = Some(note.map(Into::into));
         }
         return Ok(HttpResponse::Ok().json(organization));
     }
-    Err(ApiError::NotFound)
+    Err(ApiError::NotFound(eyre::eyre!("resource not found")))
 }
 
 #[utoipa::path(tag = "organizations", responses((status = NO_CONTENT)))]
@@ -317,25 +332,35 @@ pub async fn organization_notes_edit(
         &session_queue,
         Scopes::SESSION_ACCESS,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     if !user.role.is_mod() {
-        return Err(ApiError::CustomAuthentication(
-            "you do not have permission to edit moderation notes".to_string(),
-        ));
+        return Err(ApiError::Auth(eyre::eyre!(
+            "you do not have permission to edit moderation notes",
+        )));
     }
 
-    new_note.validate_not_empty()?;
+    new_note
+        .validate_not_empty()
+        .wrap_api_err("validating not empty")?;
     let expected_version =
-        crate::models::moderation_notes::parse_if_match_header(&req)?;
+        crate::models::moderation_notes::parse_if_match_header(&req)
+            .wrap_api_err(
+                "executing `moderation_notes::parse_if_match_header`",
+            )?;
 
     let organization =
         DBOrganization::get(&info.into_inner().0, &**pool, &redis)
-            .await?
-            .ok_or(ApiError::NotFound)?;
+            .await
+            .wrap_internal_err("fetching organization from database")?
+            .wrap_not_found_err("resource not found")?;
 
-    let mut transaction = pool.begin().await?;
+    let mut transaction = pool
+        .begin()
+        .await
+        .wrap_internal_err("starting database transaction")?;
     if let Some(expected) = expected_version {
         let updated = DBModerationNote::update(
             None,
@@ -346,12 +371,13 @@ pub async fn organization_notes_edit(
             new_note.user_rating,
             &mut transaction,
         )
-        .await?;
+        .await
+        .wrap_internal_err("updating moderation note in database")?;
 
         if updated.is_none() {
-            return Err(ApiError::PreconditionFailed(
-                "moderation note version does not match".to_string(),
-            ));
+            return Err(ApiError::PreconditionFailed(eyre::eyre!(
+                "moderation note version does not match",
+            )));
         }
     } else {
         let updated = DBModerationNote::insert(
@@ -362,17 +388,23 @@ pub async fn organization_notes_edit(
             new_note.user_rating,
             &mut transaction,
         )
-        .await?;
+        .await
+        .wrap_internal_err("inserting moderation note into database")?;
 
         if updated.is_none() {
-            return Err(ApiError::PreconditionRequired(
-                "moderation note version does not match".to_string(),
-            ));
+            return Err(ApiError::PreconditionRequired(eyre::eyre!(
+                "moderation note version does not match",
+            )));
         }
     };
 
-    transaction.commit().await?;
-    DBModerationNote::clear_organization_cache(organization.id, &redis).await?;
+    transaction
+        .commit()
+        .await
+        .wrap_internal_err("committing database transaction")?;
+    DBModerationNote::clear_organization_cache(organization.id, &redis)
+        .await
+        .wrap_internal_err("clearing cached moderation note in Redis")?;
 
     Ok(HttpResponse::NoContent().finish())
 }
@@ -395,9 +427,11 @@ pub async fn organizations_get(
     redis: web::Data<RedisPool>,
     session_queue: web::Data<AuthQueue>,
 ) -> Result<HttpResponse, ApiError> {
-    let ids = serde_json::from_str::<Vec<&str>>(&ids.ids)?;
-    let organizations_data =
-        DBOrganization::get_many(&ids, &**pool, &redis).await?;
+    let ids = serde_json::from_str::<Vec<&str>>(&ids.ids)
+        .wrap_request_err("deserializing JSON data")?;
+    let organizations_data = DBOrganization::get_many(&ids, &**pool, &redis)
+        .await
+        .wrap_internal_err("fetching organizations from database")?;
     let team_ids = organizations_data
         .iter()
         .map(|x| x.team_id)
@@ -405,13 +439,15 @@ pub async fn organizations_get(
 
     let teams_data =
         DBTeamMember::get_from_team_full_many(&team_ids, &**pool, &redis)
-            .await?;
+            .await
+            .wrap_internal_err("fetching team members from database")?;
     let users = crate::database::models::DBUser::get_many_ids(
         &teams_data.iter().map(|x| x.user_id).collect::<Vec<_>>(),
         &**pool,
         &redis,
     )
-    .await?;
+    .await
+    .wrap_internal_err("fetching users from database")?;
 
     let current_user = get_user_from_headers(
         &req,
@@ -431,7 +467,8 @@ pub async fn organizations_get(
             &**pool,
             &redis,
         )
-        .await?
+        .await
+        .wrap_internal_err("fetching moderation notes from database")?
     } else {
         HashMap::new()
     };
@@ -444,7 +481,9 @@ pub async fn organizations_get(
     }
 
     for data in organizations_data {
-        if !is_visible_organization(&data, &current_user, &pool, &redis).await?
+        if !is_visible_organization(&data, &current_user, &pool, &redis)
+            .await
+            .wrap_api_err("checking organization visibility")?
         {
             continue;
         }
@@ -522,16 +561,20 @@ pub async fn organizations_edit(
         &session_queue,
         Scopes::ORGANIZATION_WRITE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
-    new_organization.validate().map_err(|err| {
-        ApiError::Validation(validation_errors_to_string(err, None))
-    })?;
+    new_organization
+        .validate()
+        .map_err(|err| eyre::eyre!(err))
+        .wrap_request_err("validating request")?;
 
     let string = info.into_inner().0;
     let result =
-        database::models::DBOrganization::get(&string, &**pool, &redis).await?;
+        database::models::DBOrganization::get(&string, &**pool, &redis)
+            .await
+            .wrap_internal_err("fetching organization from database")?;
     if let Some(organization_item) = result {
         let id = organization_item.id;
 
@@ -540,7 +583,8 @@ pub async fn organizations_edit(
             user.id.into(),
             &**pool,
         )
-        .await?;
+        .await
+        .wrap_internal_err("fetching team member from database")?;
 
         let permissions = OrganizationPermissions::get_permissions_by_role(
             &user.role,
@@ -548,13 +592,15 @@ pub async fn organizations_edit(
         );
 
         if let Some(perms) = permissions {
-            let mut transaction = pool.begin().await?;
+            let mut transaction = pool
+                .begin()
+                .await
+                .wrap_internal_err("starting database transaction")?;
             if let Some(description) = &new_organization.description {
                 if !perms.contains(OrganizationPermissions::EDIT_DETAILS) {
-                    return Err(ApiError::CustomAuthentication(
-                        "You do not have the permissions to edit the description of this organization!"
-                            .to_string(),
-                    ));
+                    return Err(ApiError::Auth(eyre::eyre!(
+                        "You do not have the permissions to edit the description of this organization!",
+                    )));
                 }
                 sqlx::query!(
                     "
@@ -566,15 +612,17 @@ pub async fn organizations_edit(
                     id as database::models::ids::DBOrganizationId,
                 )
                 .execute(&mut transaction)
-                .await?;
+                .await
+                .wrap_internal_err(
+                    "querying database for `organizations_edit`",
+                )?;
             }
 
             if let Some(name) = &new_organization.name {
                 if !perms.contains(OrganizationPermissions::EDIT_DETAILS) {
-                    return Err(ApiError::CustomAuthentication(
-                        "You do not have the permissions to edit the name of this organization!"
-                            .to_string(),
-                    ));
+                    return Err(ApiError::Auth(eyre::eyre!(
+                        "You do not have the permissions to edit the name of this organization!",
+                    )));
                 }
                 sqlx::query!(
                     "
@@ -586,15 +634,17 @@ pub async fn organizations_edit(
                     id as database::models::ids::DBOrganizationId,
                 )
                 .execute(&mut transaction)
-                .await?;
+                .await
+                .wrap_internal_err(
+                    "querying database for `organizations_edit`",
+                )?;
             }
 
             if let Some(slug) = &new_organization.slug {
                 if !perms.contains(OrganizationPermissions::EDIT_DETAILS) {
-                    return Err(ApiError::CustomAuthentication(
-                        "You do not have the permissions to edit the slug of this organization!"
-                            .to_string(),
-                    ));
+                    return Err(ApiError::Auth(eyre::eyre!(
+                        "You do not have the permissions to edit the slug of this organization!",
+                    )));
                 }
 
                 let existing = DBOrganization::get(
@@ -602,12 +652,12 @@ pub async fn organizations_edit(
                     &mut transaction,
                     &redis,
                 )
-                .await?;
+                .await
+                .wrap_internal_err("fetching organization from database")?;
                 if existing.is_some() {
-                    return Err(ApiError::InvalidInput(
-                        "Slug collides with other organization's id!"
-                            .to_string(),
-                    ));
+                    return Err(ApiError::Request(eyre::eyre!(
+                        "Slug collides with other organization's id!",
+                    )));
                 }
 
                 // Make sure the new name is different from the old one
@@ -625,13 +675,15 @@ pub async fn organizations_edit(
                         slug
                     )
                     .fetch_one(&mut transaction)
-                    .await?;
+                    .await
+                    .wrap_internal_err(
+                        "querying database for `organizations_edit`",
+                    )?;
 
                     if results.exists.unwrap_or(true) {
-                        return Err(ApiError::InvalidInput(
-                            "Slug collides with other organization's id!"
-                                .to_string(),
-                        ));
+                        return Err(ApiError::Request(eyre::eyre!(
+                            "Slug collides with other organization's id!",
+                        )));
                     }
                 }
 
@@ -645,26 +697,32 @@ pub async fn organizations_edit(
                     id as database::models::ids::DBOrganizationId,
                 )
                 .execute(&mut transaction)
-                .await?;
+                .await
+                .wrap_internal_err(
+                    "querying database for `organizations_edit`",
+                )?;
             }
 
-            transaction.commit().await?;
+            transaction
+                .commit()
+                .await
+                .wrap_internal_err("committing database transaction")?;
             database::models::DBOrganization::clear_cache(
                 organization_item.id,
                 Some(organization_item.slug),
                 &redis,
             )
-            .await?;
+            .await
+            .wrap_internal_err("clearing cached data from Redis")?;
 
             Ok(HttpResponse::NoContent().body(""))
         } else {
-            Err(ApiError::CustomAuthentication(
-                "You do not have permission to edit this organization!"
-                    .to_string(),
-            ))
+            Err(ApiError::Auth(eyre::eyre!(
+                "You do not have permission to edit this organization!",
+            )))
         }
     } else {
-        Err(ApiError::NotFound)
+        Err(ApiError::NotFound(eyre::eyre!("resource not found")))
     }
 }
 
@@ -685,17 +743,17 @@ pub async fn organization_delete(
         &session_queue,
         Scopes::ORGANIZATION_DELETE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
     let string = info.into_inner().0;
 
     let organization =
         database::models::DBOrganization::get(&string, &**pool, &redis)
-            .await?
-            .ok_or_else(|| {
-                ApiError::InvalidInput(
-                    "The specified organization does not exist!".to_string(),
-                )
+            .await
+            .wrap_internal_err("fetching organization from database")?
+            .wrap_request_err_with(|| {
+                "the specified organization does not exist!".to_string()
             })?;
 
     if !user.role.is_admin() {
@@ -707,11 +765,9 @@ pub async fn organization_delete(
                 &**pool,
             )
             .await
-            .map_err(ApiError::Database)?
-            .ok_or_else(|| {
-                ApiError::InvalidInput(
-                    "The specified organization does not exist!".to_string(),
-                )
+            .wrap_internal_err("fetching organization team member")?
+            .wrap_request_err_with(|| {
+                "the specified organization does not exist!".to_string()
             })?;
 
         let permissions = OrganizationPermissions::get_permissions_by_role(
@@ -721,10 +777,9 @@ pub async fn organization_delete(
         .unwrap_or_default();
 
         if !permissions.contains(OrganizationPermissions::DELETE_ORGANIZATION) {
-            return Err(ApiError::CustomAuthentication(
-                "You don't have permission to delete this organization!"
-                    .to_string(),
-            ));
+            return Err(ApiError::Auth(eyre::eyre!(
+                "You don't have permission to delete this organization!",
+            )));
         }
     }
 
@@ -736,11 +791,15 @@ pub async fn organization_delete(
         organization.team_id as database::models::ids::DBTeamId
     )
     .fetch_one(&**pool)
-    .await?
+    .await
+    .wrap_internal_err("fetching owner ID from database")?
     .user_id;
     let owner_id = database::models::ids::DBUserId(owner_id);
 
-    let mut transaction = pool.begin().await?;
+    let mut transaction = pool
+        .begin()
+        .await
+        .wrap_internal_err("starting database transaction")?;
 
     // Handle projects- every project that is in this organization needs to have its owner changed the organization owner
     // Now, no project should have an owner if it is in an organization, and also
@@ -762,7 +821,8 @@ pub async fn organization_delete(
         )
     })
     .try_collect::<Vec<_>>()
-    .await?;
+    .await
+    .wrap_internal_err("querying database for `organization_delete`")?;
     let organization_project_teams = organization_projects
         .iter()
         .map(|(team_id, _)| *team_id)
@@ -776,7 +836,8 @@ pub async fn organization_delete(
         let new_id = crate::database::models::ids::generate_team_member_id(
             &mut transaction,
         )
-        .await?;
+        .await
+        .wrap_internal_err("fetching query results from database")?;
         let member = DBTeamMember {
             id: new_id,
             team_id: *organization_project_team,
@@ -789,7 +850,9 @@ pub async fn organization_delete(
             payouts_split: Decimal::ZERO,
             ordering: 0,
         };
-        member.insert(&mut transaction).await?;
+        member.insert(&mut transaction).await.wrap_internal_err(
+            "inserting database records for `organization_delete`",
+        )?;
     }
     // Safely remove the organization
     let result = database::models::DBOrganization::remove(
@@ -797,19 +860,26 @@ pub async fn organization_delete(
         &mut transaction,
         &redis,
     )
-    .await?;
+    .await
+    .wrap_internal_err("fetching query results from database")?;
 
-    transaction.commit().await?;
+    transaction
+        .commit()
+        .await
+        .wrap_internal_err("committing database transaction")?;
 
     database::models::DBOrganization::clear_cache(
         organization.id,
         Some(organization.slug),
         &redis,
     )
-    .await?;
+    .await
+    .wrap_internal_err("clearing cached data from Redis")?;
 
     for team_id in &organization_project_teams {
-        database::models::DBTeamMember::clear_cache(*team_id, &redis).await?;
+        database::models::DBTeamMember::clear_cache(*team_id, &redis)
+            .await
+            .wrap_internal_err("clearing cached data from Redis")?;
     }
 
     for project_id in organization_project_ids {
@@ -820,18 +890,22 @@ pub async fn organization_delete(
             None,
             None,
         )
-        .await?;
+        .await
+        .wrap_api_err(
+            "executing `projects::clear_project_cache_and_queue_search`",
+        )?;
     }
 
     if !organization_project_teams.is_empty() {
         database::models::DBUser::clear_project_cache(&[owner_id], &redis)
-            .await?;
+            .await
+            .wrap_internal_err("clearing cached user in Redis")?;
     }
 
     if result.is_some() {
         Ok(HttpResponse::NoContent().body(""))
     } else {
-        Err(ApiError::NotFound)
+        Err(ApiError::NotFound(eyre::eyre!("resource not found")))
     }
 }
 
@@ -858,16 +932,16 @@ pub async fn organization_projects_add(
         &session_queue,
         Scopes::PROJECT_WRITE | Scopes::ORGANIZATION_WRITE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     let organization =
         database::models::DBOrganization::get(&info, &**pool, &redis)
-            .await?
-            .ok_or_else(|| {
-                ApiError::InvalidInput(
-                    "The specified organization does not exist!".to_string(),
-                )
+            .await
+            .wrap_internal_err("fetching organization from database")?
+            .wrap_request_err_with(|| {
+                "the specified organization does not exist!".to_string()
             })?;
 
     let project_item = database::models::DBProject::get(
@@ -875,17 +949,15 @@ pub async fn organization_projects_add(
         &**pool,
         &redis,
     )
-    .await?
-    .ok_or_else(|| {
-        ApiError::InvalidInput(
-            "The specified project does not exist!".to_string(),
-        )
+    .await
+    .wrap_api_err("fetching project from database")?
+    .wrap_request_err_with(|| {
+        "the specified project does not exist!".to_string()
     })?;
     if project_item.inner.organization_id.is_some() {
-        return Err(ApiError::InvalidInput(
-            "The specified project is already owned by an organization!"
-                .to_string(),
-        ));
+        return Err(ApiError::Request(eyre::eyre!(
+            "The specified project is already owned by an organization!",
+        )));
     }
 
     let project_team_member =
@@ -895,11 +967,10 @@ pub async fn organization_projects_add(
             false,
             &**pool,
         )
-        .await?
-        .ok_or_else(|| {
-            ApiError::InvalidInput(
-                "You are not a member of this project!".to_string(),
-            )
+        .await
+        .wrap_internal_err("fetching team member from database")?
+        .wrap_request_err_with(|| {
+            "you are not a member of this project!".to_string()
         })?;
     let organization_team_member =
         database::models::DBTeamMember::get_from_user_id_organization(
@@ -908,18 +979,17 @@ pub async fn organization_projects_add(
             false,
             &**pool,
         )
-        .await?
-        .ok_or_else(|| {
-            ApiError::InvalidInput(
-                "You are not a member of this organization!".to_string(),
-            )
+        .await
+        .wrap_internal_err("fetching team member from database")?
+        .wrap_request_err_with(|| {
+            "you are not a member of this organization!".to_string()
         })?;
 
     // Require ownership of a project to add it to an organization
     if !current_user.role.is_admin() && !project_team_member.is_owner {
-        return Err(ApiError::CustomAuthentication(
-            "You need to be an owner of a project to add it to an organization!".to_string(),
-        ));
+        return Err(ApiError::Auth(eyre::eyre!(
+            "You need to be an owner of a project to add it to an organization!",
+        )));
     }
 
     let permissions = OrganizationPermissions::get_permissions_by_role(
@@ -928,7 +998,10 @@ pub async fn organization_projects_add(
     )
     .unwrap_or_default();
     if permissions.contains(OrganizationPermissions::ADD_PROJECT) {
-        let mut transaction = pool.begin().await?;
+        let mut transaction = pool
+            .begin()
+            .await
+            .wrap_internal_err("starting database transaction")?;
         sqlx::query!(
             "
             UPDATE mods
@@ -939,7 +1012,10 @@ pub async fn organization_projects_add(
             project_item.inner.id as database::models::ids::DBProjectId
         )
         .execute(&mut transaction)
-        .await?;
+        .await
+        .wrap_internal_err(
+            "querying database for `organization_projects_add`",
+        )?;
 
         // The former owner is no longer an owner (as it is now 'owned' by the organization, 'given' to them)
         // The former owner is still a member of the project, but not an owner
@@ -955,7 +1031,10 @@ pub async fn organization_projects_add(
             organization.team_id as database::models::ids::DBTeamId
         )
         .fetch_one(&mut transaction)
-        .await?;
+        .await
+        .wrap_internal_err(
+            "fetching organization owner user ID from database",
+        )?;
         let organization_owner_user_id =
             database::models::ids::DBUserId(organization_owner_user_id.id);
 
@@ -968,20 +1047,28 @@ pub async fn organization_projects_add(
             organization_owner_user_id as database::models::ids::DBUserId,
         )
         .execute(&mut transaction)
-        .await?;
+        .await
+        .wrap_internal_err(
+            "querying database for `organization_projects_add`",
+        )?;
 
-        transaction.commit().await?;
+        transaction
+            .commit()
+            .await
+            .wrap_internal_err("committing database transaction")?;
 
         database::models::DBUser::clear_project_cache(
             &[current_user.id.into()],
             &redis,
         )
-        .await?;
+        .await
+        .wrap_internal_err("clearing cached user in Redis")?;
         database::models::DBTeamMember::clear_cache(
             project_item.inner.team_id,
             &redis,
         )
-        .await?;
+        .await
+        .wrap_internal_err("clearing cached data from Redis")?;
         super::projects::clear_project_cache_and_queue_search(
             &redis,
             &search_state,
@@ -989,12 +1076,14 @@ pub async fn organization_projects_add(
             project_item.inner.slug,
             None,
         )
-        .await?;
+        .await
+        .wrap_api_err(
+            "executing `projects::clear_project_cache_and_queue_search`",
+        )?;
     } else {
-        return Err(ApiError::CustomAuthentication(
-            "You do not have permission to add projects to this organization!"
-                .to_string(),
-        ));
+        return Err(ApiError::Auth(eyre::eyre!(
+            "You do not have permission to add projects to this organization!",
+        )));
     }
     Ok(HttpResponse::Ok().finish())
 }
@@ -1025,7 +1114,8 @@ pub async fn organization_projects_remove(
         &session_queue,
         Scopes::PROJECT_WRITE | Scopes::ORGANIZATION_WRITE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     let organization = database::models::DBOrganization::get(
@@ -1033,20 +1123,18 @@ pub async fn organization_projects_remove(
         &**pool,
         &redis,
     )
-    .await?
-    .ok_or_else(|| {
-        ApiError::InvalidInput(
-            "The specified organization does not exist!".to_string(),
-        )
+    .await
+    .wrap_internal_err("fetching organization from database")?
+    .wrap_request_err_with(|| {
+        "the specified organization does not exist!".to_string()
     })?;
 
     let project_item =
         database::models::DBProject::get(&project_id, &**pool, &redis)
-            .await?
-            .ok_or_else(|| {
-                ApiError::InvalidInput(
-                    "The specified project does not exist!".to_string(),
-                )
+            .await
+            .wrap_api_err("fetching project from database")?
+            .wrap_request_err_with(|| {
+                "the specified project does not exist!".to_string()
             })?;
 
     if !project_item
@@ -1054,10 +1142,9 @@ pub async fn organization_projects_remove(
         .organization_id
         .eq(&Some(organization.id))
     {
-        return Err(ApiError::InvalidInput(
-            "The specified project is not owned by this organization!"
-                .to_string(),
-        ));
+        return Err(ApiError::Request(eyre::eyre!(
+            "The specified project is not owned by this organization!",
+        )));
     }
 
     let organization_team_member =
@@ -1067,11 +1154,10 @@ pub async fn organization_projects_remove(
             false,
             &**pool,
         )
-        .await?
-        .ok_or_else(|| {
-            ApiError::InvalidInput(
-                "You are not a member of this organization!".to_string(),
-            )
+        .await
+        .wrap_internal_err("fetching team member from database")?
+        .wrap_request_err_with(|| {
+            "you are not a member of this organization!".to_string()
         })?;
 
     let permissions = OrganizationPermissions::get_permissions_by_role(
@@ -1087,12 +1173,11 @@ pub async fn organization_projects_remove(
             false,
             &**pool,
         )
-        .await?
-        .ok_or_else(|| {
-            ApiError::InvalidInput(
-                "The specified user is not a member of this organization!"
-                    .to_string(),
-            )
+        .await
+        .wrap_internal_err("deleting team member from database")?
+        .wrap_request_err_with(|| {
+            "the specified user is not a member of this organization!"
+                .to_string()
         })?;
 
         // Then, we get the team member of the project and that user (if it exists)
@@ -1104,9 +1189,13 @@ pub async fn organization_projects_remove(
                 true,
                 &**pool,
             )
-            .await?;
+            .await
+            .wrap_internal_err("fetching team member from database")?;
 
-        let mut transaction = pool.begin().await?;
+        let mut transaction = pool
+            .begin()
+            .await
+            .wrap_internal_err("starting database transaction")?;
 
         // If the user is not a member of the project, we add them
         let new_owner = match new_owner {
@@ -1116,7 +1205,8 @@ pub async fn organization_projects_remove(
                     crate::database::models::ids::generate_team_member_id(
                         &mut transaction,
                     )
-                    .await?;
+                    .await
+                    .wrap_internal_err("generating team member ID")?;
                 let member = DBTeamMember {
                     id: new_id,
                     team_id: project_item.inner.team_id,
@@ -1129,7 +1219,10 @@ pub async fn organization_projects_remove(
                     payouts_split: Decimal::ZERO,
                     ordering: 0,
                 };
-                member.insert(&mut transaction).await?;
+                member
+                    .insert(&mut transaction)
+                    .await
+                    .wrap_internal_err("inserting database records for `organization_projects_remove`")?;
                 member
             }
         };
@@ -1150,7 +1243,10 @@ pub async fn organization_projects_remove(
             ProjectPermissions::all().bits() as i64
         )
         .execute(&mut transaction)
-        .await?;
+        .await
+        .wrap_internal_err(
+            "querying database for `organization_projects_remove`",
+        )?;
 
         sqlx::query!(
             "
@@ -1161,19 +1257,27 @@ pub async fn organization_projects_remove(
             project_item.inner.id as database::models::ids::DBProjectId
         )
         .execute(&mut transaction)
-        .await?;
+        .await
+        .wrap_internal_err(
+            "querying database for `organization_projects_remove`",
+        )?;
 
-        transaction.commit().await?;
+        transaction
+            .commit()
+            .await
+            .wrap_internal_err("committing database transaction")?;
         database::models::DBUser::clear_project_cache(
             &[current_user.id.into()],
             &redis,
         )
-        .await?;
+        .await
+        .wrap_internal_err("clearing cached user in Redis")?;
         database::models::DBTeamMember::clear_cache(
             project_item.inner.team_id,
             &redis,
         )
-        .await?;
+        .await
+        .wrap_internal_err("clearing cached data from Redis")?;
         super::projects::clear_project_cache_and_queue_search(
             &redis,
             &search_state,
@@ -1181,12 +1285,14 @@ pub async fn organization_projects_remove(
             project_item.inner.slug,
             None,
         )
-        .await?;
+        .await
+        .wrap_api_err(
+            "executing `projects::clear_project_cache_and_queue_search`",
+        )?;
     } else {
-        return Err(ApiError::CustomAuthentication(
-            "You do not have permission to add projects to this organization!"
-                .to_string(),
-        ));
+        return Err(ApiError::Auth(eyre::eyre!(
+            "You do not have permission to add projects to this organization!",
+        )));
     }
     Ok(HttpResponse::Ok().finish())
 }
@@ -1221,17 +1327,17 @@ pub async fn organization_icon_edit(
         &session_queue,
         Scopes::ORGANIZATION_WRITE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
     let string = info.into_inner().0;
 
     let organization_item =
         database::models::DBOrganization::get(&string, &**pool, &redis)
-            .await?
-            .ok_or_else(|| {
-                ApiError::InvalidInput(
-                    "The specified organization does not exist!".to_string(),
-                )
+            .await
+            .wrap_internal_err("fetching organization from database")?
+            .wrap_request_err_with(|| {
+                "the specified organization does not exist!".to_string()
             })?;
 
     if !user.role.is_mod() {
@@ -1241,7 +1347,7 @@ pub async fn organization_icon_edit(
             &**pool,
         )
         .await
-        .map_err(ApiError::Database)?;
+        .wrap_internal_err("fetching organization team member")?;
 
         let permissions = OrganizationPermissions::get_permissions_by_role(
             &user.role,
@@ -1250,10 +1356,9 @@ pub async fn organization_icon_edit(
         .unwrap_or_default();
 
         if !permissions.contains(OrganizationPermissions::EDIT_DETAILS) {
-            return Err(ApiError::CustomAuthentication(
-                "You don't have permission to edit this organization's icon."
-                    .to_string(),
-            ));
+            return Err(ApiError::Auth(eyre::eyre!(
+                "You don't have permission to edit this organization's icon.",
+            )));
         }
     }
 
@@ -1263,14 +1368,16 @@ pub async fn organization_icon_edit(
         FileHostPublicity::Public,
         &**file_host,
     )
-    .await?;
+    .await
+    .wrap_api_err("deleting old images")?;
 
     let bytes = read_limited_from_payload(
         &mut payload,
         262144,
         "Icons must be smaller than 256KiB",
     )
-    .await?;
+    .await
+    .wrap_api_err("executing `read_limited_from_payload`")?;
 
     let organization_id: OrganizationId = organization_item.id.into();
     let upload_result = crate::util::img::upload_image_optimized(
@@ -1282,9 +1389,13 @@ pub async fn organization_icon_edit(
         Some(1.0),
         &**file_host,
     )
-    .await?;
+    .await
+    .wrap_api_err("uploading image")?;
 
-    let mut transaction = pool.begin().await?;
+    let mut transaction = pool
+        .begin()
+        .await
+        .wrap_internal_err("starting database transaction")?;
 
     sqlx::query!(
         "
@@ -1298,15 +1409,20 @@ pub async fn organization_icon_edit(
         organization_item.id as database::models::ids::DBOrganizationId,
     )
     .execute(&mut transaction)
-    .await?;
+    .await
+    .wrap_internal_err("querying database for `organization_icon_edit`")?;
 
-    transaction.commit().await?;
+    transaction
+        .commit()
+        .await
+        .wrap_internal_err("committing database transaction")?;
     database::models::DBOrganization::clear_cache(
         organization_item.id,
         Some(organization_item.slug),
         &redis,
     )
-    .await?;
+    .await
+    .wrap_internal_err("clearing cached data from Redis")?;
 
     Ok(HttpResponse::NoContent().body(""))
 }
@@ -1328,17 +1444,17 @@ pub async fn delete_organization_icon(
         &session_queue,
         Scopes::ORGANIZATION_WRITE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
     let string = info.into_inner().0;
 
     let organization_item =
         database::models::DBOrganization::get(&string, &**pool, &redis)
-            .await?
-            .ok_or_else(|| {
-                ApiError::InvalidInput(
-                    "The specified organization does not exist!".to_string(),
-                )
+            .await
+            .wrap_internal_err("fetching organization from database")?
+            .wrap_request_err_with(|| {
+                "the specified organization does not exist!".to_string()
             })?;
 
     if !user.role.is_mod() {
@@ -1348,7 +1464,7 @@ pub async fn delete_organization_icon(
             &**pool,
         )
         .await
-        .map_err(ApiError::Database)?;
+        .wrap_internal_err("fetching organization team member")?;
 
         let permissions = OrganizationPermissions::get_permissions_by_role(
             &user.role,
@@ -1357,10 +1473,9 @@ pub async fn delete_organization_icon(
         .unwrap_or_default();
 
         if !permissions.contains(OrganizationPermissions::EDIT_DETAILS) {
-            return Err(ApiError::CustomAuthentication(
-                "You don't have permission to edit this organization's icon."
-                    .to_string(),
-            ));
+            return Err(ApiError::Auth(eyre::eyre!(
+                "You don't have permission to edit this organization's icon.",
+            )));
         }
     }
 
@@ -1370,9 +1485,13 @@ pub async fn delete_organization_icon(
         FileHostPublicity::Public,
         &**file_host,
     )
-    .await?;
+    .await
+    .wrap_api_err("deleting old images")?;
 
-    let mut transaction = pool.begin().await?;
+    let mut transaction = pool
+        .begin()
+        .await
+        .wrap_internal_err("starting database transaction")?;
 
     sqlx::query!(
         "
@@ -1383,16 +1502,21 @@ pub async fn delete_organization_icon(
         organization_item.id as database::models::ids::DBOrganizationId,
     )
     .execute(&mut transaction)
-    .await?;
+    .await
+    .wrap_internal_err("querying database for `delete_organization_icon`")?;
 
-    transaction.commit().await?;
+    transaction
+        .commit()
+        .await
+        .wrap_internal_err("committing database transaction")?;
 
     database::models::DBOrganization::clear_cache(
         organization_item.id,
         Some(organization_item.slug),
         &redis,
     )
-    .await?;
+    .await
+    .wrap_internal_err("clearing cached data from Redis")?;
 
     Ok(HttpResponse::NoContent().body(""))
 }
diff --git a/apps/labrinth/src/routes/v3/payouts.rs b/apps/labrinth/src/routes/v3/payouts.rs
index 8f9cb8a447..b0deabbb83 100644
--- a/apps/labrinth/src/routes/v3/payouts.rs
+++ b/apps/labrinth/src/routes/v3/payouts.rs
@@ -14,6 +14,7 @@ use crate::queue::session::AuthQueue;
 use crate::routes::ApiError;
 use crate::routes::internal::globals::tax_compliance_payout_threshold;
 use crate::util::avalara1099;
+use crate::util::error::ApiContext as _;
 use crate::util::error::Context;
 use crate::util::gotenberg::GotenbergClient;
 use actix_web::{HttpRequest, HttpResponse, delete, get, post, web};
@@ -70,16 +71,21 @@ pub async fn post_compliance_form(
         &session_queue,
         Scopes::PAYOUTS_WRITE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     let user_id = DBUserId(user.id.0 as i64);
 
-    let mut txn = pool.begin().await?;
+    let mut txn = pool
+        .begin()
+        .await
+        .wrap_internal_err("starting database transaction")?;
 
     let maybe_compliance =
         users_compliance::UserCompliance::get_by_user_id(&mut txn, user_id)
-            .await?;
+            .await
+            .wrap_internal_err("fetching user compliance from Redis")?;
 
     let mut compliance = match maybe_compliance {
         Some(c) => {
@@ -87,9 +93,9 @@ pub async fn post_compliance_form(
                 && c.form_type.is_some_and(|f| f.requires_domestic_tin_match())
                 && !c.tin_matched
             {
-                return Err(ApiError::InvalidInput(
+                return Err(ApiError::Request(eyre::eyre!(
                     "Your TIN/SSN did not match the IRS records. Please contact support https://support.modrinth.com".to_owned(),
-                ));
+                )));
             }
 
             c
@@ -109,7 +115,9 @@ pub async fn post_compliance_form(
         },
     };
 
-    let result = avalara1099::request_form(user_id, body.0.form_type).await?;
+    let result = avalara1099::request_form(user_id, body.0.form_type)
+        .await
+        .wrap_api_err("executing `avalara1099::request_form`")?;
 
     match result {
         Ok(
@@ -132,15 +140,20 @@ pub async fn post_compliance_form(
             compliance.form_type = Some(body.0.form_type);
             compliance.last_checked = Utc::now() - COMPLIANCE_CHECK_DEBOUNCE;
 
-            compliance.upsert_partial(&mut txn).await?;
-            txn.commit().await?;
+            compliance
+                .upsert_partial(&mut txn)
+                .await
+                .wrap_internal_err("updating user compliance request")?;
+            txn.commit()
+                .await
+                .wrap_internal_err("committing database transaction")?;
 
             Ok(HttpResponse::Ok().json(toplevel))
         }
 
         Ok(_) => {
             error!("Missing form request ID in Avalara response");
-            Err(ApiError::TaxComplianceApi)
+            Err(ApiError::Internal(eyre::eyre!("tax compliance API failed")))
         }
 
         Err(json_error) => {
@@ -148,7 +161,7 @@ pub async fn post_compliance_form(
                 "Error sending request to Avalara: {}",
                 serde_json::to_string_pretty(&json_error).unwrap()
             );
-            Err(ApiError::TaxComplianceApi)
+            Err(ApiError::Internal(eyre::eyre!("tax compliance API failed")))
         }
     }
 }
@@ -171,37 +184,27 @@ pub async fn paypal_webhook(
         .headers()
         .get("PAYPAL-AUTH-ALGO")
         .and_then(|x| x.to_str().ok())
-        .ok_or_else(|| {
-            ApiError::InvalidInput("missing auth algo".to_string())
-        })?;
+        .wrap_request_err_with(|| "missing auth algo".to_string())?;
     let cert_url = req
         .headers()
         .get("PAYPAL-CERT-URL")
         .and_then(|x| x.to_str().ok())
-        .ok_or_else(|| {
-            ApiError::InvalidInput("missing cert url".to_string())
-        })?;
+        .wrap_request_err_with(|| "missing cert url".to_string())?;
     let transmission_id = req
         .headers()
         .get("PAYPAL-TRANSMISSION-ID")
         .and_then(|x| x.to_str().ok())
-        .ok_or_else(|| {
-            ApiError::InvalidInput("missing transmission ID".to_string())
-        })?;
+        .wrap_request_err_with(|| "missing transmission ID".to_string())?;
     let transmission_sig = req
         .headers()
         .get("PAYPAL-TRANSMISSION-SIG")
         .and_then(|x| x.to_str().ok())
-        .ok_or_else(|| {
-            ApiError::InvalidInput("missing transmission sig".to_string())
-        })?;
+        .wrap_request_err_with(|| "missing transmission sig".to_string())?;
     let transmission_time = req
         .headers()
         .get("PAYPAL-TRANSMISSION-TIME")
         .and_then(|x| x.to_str().ok())
-        .ok_or_else(|| {
-            ApiError::InvalidInput("missing transmission time".to_string())
-        })?;
+        .wrap_request_err_with(|| "missing transmission time".to_string())?;
 
     #[derive(Deserialize)]
     struct WebHookResponse {
@@ -228,12 +231,13 @@ pub async fn paypal_webhook(
             )),
             None,
         )
-        .await?;
+        .await
+        .wrap_api_err("verifying PayPal webhook signature")?;
 
     if &webhook_res.verification_status != "SUCCESS" {
-        return Err(ApiError::InvalidInput(
-            "Invalid webhook signature".to_string(),
-        ));
+        return Err(ApiError::Request(eyre::eyre!(
+            "Invalid webhook signature",
+        )));
     }
 
     #[derive(Deserialize)]
@@ -247,7 +251,8 @@ pub async fn paypal_webhook(
         pub resource: PayPalResource,
     }
 
-    let webhook = serde_json::from_str::<PayPalWebhook>(&body)?;
+    let webhook = serde_json::from_str::<PayPalWebhook>(&body)
+        .wrap_request_err("deserializing JSON data")?;
 
     match &*webhook.event_type {
         "PAYMENT.PAYOUTS-ITEM.BLOCKED"
@@ -255,7 +260,10 @@ pub async fn paypal_webhook(
         | "PAYMENT.PAYOUTS-ITEM.REFUNDED"
         | "PAYMENT.PAYOUTS-ITEM.RETURNED"
         | "PAYMENT.PAYOUTS-ITEM.CANCELED" => {
-            let mut transaction = pool.begin().await?;
+            let mut transaction = pool
+                .begin()
+                .await
+                .wrap_internal_err("starting database transaction")?;
 
             let result = sqlx::query!(
                 "SELECT user_id, amount, fee FROM payouts WHERE platform_id = $1 AND status = $2",
@@ -263,7 +271,7 @@ pub async fn paypal_webhook(
                 PayoutStatus::InTransit.as_str()
             )
             .fetch_optional(&mut transaction)
-            .await?;
+            .await.wrap_internal_err("querying database for `paypal_webhook`")?;
 
             if let Some(result) = result {
                 sqlx::query!(
@@ -281,9 +289,13 @@ pub async fn paypal_webhook(
                     webhook.resource.payout_item_id
                 )
                 .execute(&mut transaction)
-                .await?;
+                .await
+                .wrap_internal_err("querying database for `paypal_webhook`")?;
 
-                transaction.commit().await?;
+                transaction
+                    .commit()
+                    .await
+                    .wrap_internal_err("committing database transaction")?;
 
                 crate::database::models::user_item::DBUser::clear_caches(
                     &[(
@@ -292,11 +304,15 @@ pub async fn paypal_webhook(
                     )],
                     &redis,
                 )
-                .await?;
+                .await
+                .wrap_internal_err("clearing cached data from Redis")?;
             }
         }
         "PAYMENT.PAYOUTS-ITEM.SUCCEEDED" => {
-            let mut transaction = pool.begin().await?;
+            let mut transaction = pool
+                .begin()
+                .await
+                .wrap_internal_err("starting database transaction")?;
             sqlx::query!(
                 "
                 UPDATE payouts
@@ -307,8 +323,12 @@ pub async fn paypal_webhook(
                 webhook.resource.payout_item_id
             )
             .execute(&mut transaction)
-            .await?;
-            transaction.commit().await?;
+            .await
+            .wrap_internal_err("querying database for `paypal_webhook`")?;
+            transaction
+                .commit()
+                .await
+                .wrap_internal_err("committing database transaction")?;
         }
         _ => {}
     }
@@ -334,21 +354,21 @@ pub async fn tremendous_webhook(
         .get("Tremendous-Webhook-Signature")
         .and_then(|x| x.to_str().ok())
         .and_then(|x| x.split('=').next_back())
-        .ok_or_else(|| {
-            ApiError::InvalidInput("missing webhook signature".to_string())
-        })?;
+        .wrap_request_err_with(|| "missing webhook signature".to_string())?;
 
-    let mut mac: Hmac<Sha256> = Hmac::new_from_slice(
-        ENV.TREMENDOUS_PRIVATE_KEY.as_bytes(),
-    )
-    .map_err(|_| ApiError::Payments("error initializing HMAC".to_string()))?;
+    let mut mac: Hmac<Sha256> =
+        Hmac::new_from_slice(ENV.TREMENDOUS_PRIVATE_KEY.as_bytes())
+            .map_err(|err| eyre::eyre!(err))
+            .wrap_failed_dependency_err(
+                "error initializing HMAC".to_string(),
+            )?;
     mac.update(body.as_bytes());
     let request_signature = mac.finalize().into_bytes().encode_hex::<String>();
 
     if &*request_signature != signature {
-        return Err(ApiError::InvalidInput(
-            "Invalid webhook signature".to_string(),
-        ));
+        return Err(ApiError::Request(eyre::eyre!(
+            "Invalid webhook signature",
+        )));
     }
 
     #[derive(Deserialize)]
@@ -367,11 +387,15 @@ pub async fn tremendous_webhook(
         pub payload: TremendousPayload,
     }
 
-    let webhook = serde_json::from_str::<TremendousWebhook>(&body)?;
+    let webhook = serde_json::from_str::<TremendousWebhook>(&body)
+        .wrap_request_err("deserializing JSON data")?;
 
     match &*webhook.event {
         "REWARDS.CANCELED" | "REWARDS.DELIVERY.FAILED" => {
-            let mut transaction = pool.begin().await?;
+            let mut transaction = pool
+                .begin()
+                .await
+                .wrap_internal_err("starting database transaction")?;
 
             let result = sqlx::query!(
                 "SELECT user_id, amount, fee FROM payouts WHERE platform_id = $1 AND status = $2",
@@ -379,7 +403,7 @@ pub async fn tremendous_webhook(
                 PayoutStatus::InTransit.as_str()
             )
             .fetch_optional(&mut transaction)
-            .await?;
+            .await.wrap_internal_err("querying database for `tremendous_webhook`")?;
 
             if let Some(result) = result {
                 sqlx::query!(
@@ -397,9 +421,15 @@ pub async fn tremendous_webhook(
                     webhook.payload.resource.id
                 )
                 .execute(&mut transaction)
-                .await?;
+                .await
+                .wrap_internal_err(
+                    "querying database for `tremendous_webhook`",
+                )?;
 
-                transaction.commit().await?;
+                transaction
+                    .commit()
+                    .await
+                    .wrap_internal_err("committing database transaction")?;
 
                 crate::database::models::user_item::DBUser::clear_caches(
                     &[(
@@ -408,11 +438,15 @@ pub async fn tremendous_webhook(
                     )],
                     &redis,
                 )
-                .await?;
+                .await
+                .wrap_internal_err("clearing cached data from Redis")?;
             }
         }
         "REWARDS.DELIVERY.SUCCEEDED" => {
-            let mut transaction = pool.begin().await?;
+            let mut transaction = pool
+                .begin()
+                .await
+                .wrap_internal_err("starting database transaction")?;
             sqlx::query!(
                 "
                 UPDATE payouts
@@ -423,8 +457,12 @@ pub async fn tremendous_webhook(
                 webhook.payload.resource.id
             )
             .execute(&mut transaction)
-            .await?;
-            transaction.commit().await?;
+            .await
+            .wrap_internal_err("querying database for `tremendous_webhook`")?;
+            transaction
+                .commit()
+                .await
+                .wrap_internal_err("committing database transaction")?;
         }
         _ => {}
     }
@@ -463,12 +501,14 @@ pub async fn calculate_fees(
         &session_queue,
         false,
     )
-    .await?
-    .ok_or_else(|| {
-        ApiError::Authentication(AuthenticationError::InvalidCredentials)
-    })?;
+    .await
+    .wrap_auth_err("authenticating API request")?
+    .wrap_auth_err_with(|| AuthenticationError::InvalidCredentials)?;
 
-    let payout_flow = payouts_queue.create_payout_flow(body.0).await?;
+    let payout_flow = payouts_queue
+        .create_payout_flow(body.0)
+        .await
+        .wrap_api_err("creating payout flow")?;
 
     Ok(web::Json(WithdrawalFees {
         net_usd: payout_flow.net_usd,
@@ -500,18 +540,20 @@ pub async fn create_payout(
         &session_queue,
         false,
     )
-    .await?
-    .ok_or_else(|| {
-        ApiError::Authentication(AuthenticationError::InvalidCredentials)
-    })?;
+    .await
+    .wrap_auth_err("authenticating API request")?
+    .wrap_auth_err_with(|| AuthenticationError::InvalidCredentials)?;
 
     if !scopes.contains(Scopes::PAYOUTS_WRITE) {
-        return Err(ApiError::Authentication(
+        return Err(ApiError::Auth(eyre::eyre!(
             AuthenticationError::InvalidCredentials,
-        ));
+        )));
     }
 
-    let mut transaction = pool.begin().await?;
+    let mut transaction = pool
+        .begin()
+        .await
+        .wrap_internal_err("starting database transaction")?;
 
     sqlx::query!(
         "
@@ -528,8 +570,8 @@ pub async fn create_payout(
         .wrap_internal_err("failed to calculate user balance")?;
 
     if body.amount < Decimal::ZERO {
-        return Err(ApiError::InvalidInput(
-            "Amount must be positive!".to_string(),
+        return Err(ApiError::Request(
+            eyre::eyre!("Amount must be positive!",),
         ));
     }
 
@@ -537,13 +579,18 @@ pub async fn create_payout(
     // for tax threshold checks. body.amount may be in local currency for
     // gift cards (e.g. INR), so we must not compare it directly against
     // USD thresholds.
-    let payout_flow = payouts_queue.create_payout_flow(body.0).await?;
+    let payout_flow = payouts_queue
+        .create_payout_flow(body.0)
+        .await
+        .wrap_api_err("creating payout flow")?;
     let amount_usd = payout_flow.net_usd.get();
 
     let requires_manual_review;
 
     if let Some(threshold) = tax_compliance_payout_threshold() {
-        let maybe_compliance = update_compliance_status(&pool, user.id).await?;
+        let maybe_compliance = update_compliance_status(&pool, user.id)
+            .await
+            .wrap_api_err("updating compliance status")?;
 
         let (tin_matched, signed, requested, api_check_failed) =
             match maybe_compliance {
@@ -575,14 +622,16 @@ pub async fn create_payout(
             // error with the API, as this is more accurate than saying the form wasn't completed
             // properly as this might be wrong!
             if api_check_failed {
-                return Err(ApiError::TaxComplianceApi);
+                return Err(ApiError::Internal(eyre::eyre!(
+                    "tax compliance API failed"
+                )));
             }
 
-            return Err(ApiError::InvalidInput(match (tin_matched, signed, requested) {
+            return Err(ApiError::Request(eyre::eyre!(match (tin_matched, signed, requested) {
                 (_, false, true) => "Tax form isn't signed yet!",
                 (false, true, true) => "Tax form is signed, but the Tax Identification Number/SSN didn't match the IRS records. Withdrawals are blocked until the TIN/SSN matches.",
                 _ => "Tax compliance form is required to withdraw more!",
-            }.to_owned()));
+            }.to_owned())));
         }
     } else {
         requires_manual_review = None;
@@ -592,19 +641,22 @@ pub async fn create_payout(
         r
     } else {
         users_compliance::UserCompliance::get_by_user_id(&**pool, user.id)
-            .await?
+            .await
+            .wrap_internal_err("fetching user compliance from database")?
             .is_some_and(|x| x.requires_manual_review)
     };
 
     if requires_manual_review {
-        return Err(ApiError::InvalidInput(
-            "More information is required to proceed. Please contact support (https://support.modrinth.com, support@modrinth.com)".to_string(),
-        ));
+        return Err(ApiError::Request(eyre::eyre!(
+            "More information is required to proceed. Please contact support (https://support.modrinth.com, support@modrinth.com)",
+        )));
     }
 
     let payout_flow = match payout_flow.validate(balance.available) {
         Ok(flow) => flow,
-        Err(err) => return Err(ApiError::InvalidInput(err.to_string())),
+        Err(err) => {
+            return Err(ApiError::Request(eyre::eyre!("{err}")));
+        }
     };
 
     let payout_id = generate_payout_id(&mut transaction)
@@ -613,7 +665,8 @@ pub async fn create_payout(
 
     payout_flow
         .execute(&payouts_queue, &user, payout_id, transaction, &gotenberg)
-        .await?;
+        .await
+        .wrap_api_err("executing `execute`")?;
 
     crate::database::models::DBUser::clear_caches(&[(user.id, None)], &redis)
         .await
@@ -714,19 +767,22 @@ pub async fn transaction_history(
         &session_queue,
         Scopes::PAYOUTS_READ,
     )
-    .await?;
+    .await
+    .wrap_auth_err("authenticating API request")?;
 
     let payout_ids =
         crate::database::models::payout_item::DBPayout::get_all_for_user(
             user.id.into(),
             &**pool,
         )
-        .await?;
+        .await
+        .wrap_internal_err("fetching payouts from database")?;
     let payouts = crate::database::models::payout_item::DBPayout::get_many(
         &payout_ids,
         &**pool,
     )
-    .await?;
+    .await
+    .wrap_internal_err("fetching payouts from database")?;
     let withdrawals =
         payouts
             .into_iter()
@@ -802,13 +858,15 @@ pub async fn cancel_payout(
         &session_queue,
         Scopes::PAYOUTS_WRITE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     let id = info.into_inner().0;
     let payout =
         crate::database::models::payout_item::DBPayout::get(id.into(), &**pool)
-            .await?;
+            .await
+            .wrap_internal_err("fetching payout from database")?;
 
     if let Some(payout) = payout {
         if payout.user_id != user.id.into() && !user.role.is_admin() {
@@ -818,9 +876,9 @@ pub async fn cancel_payout(
         if let Some(platform_id) = payout.platform_id {
             if let Some(method) = payout.method {
                 if payout.status != PayoutStatus::InTransit {
-                    return Err(ApiError::InvalidInput(
-                        "Payout cannot be cancelled!".to_string(),
-                    ));
+                    return Err(ApiError::Request(eyre::eyre!(
+                        "Payout cannot be cancelled!",
+                    )));
                 }
 
                 match method {
@@ -835,7 +893,8 @@ pub async fn cancel_payout(
                                 None,
                                 None,
                             )
-                            .await?;
+                            .await
+                            .wrap_api_err("cancelling PayPal payout")?;
                     }
                     PayoutMethodType::Tremendous => {
                         payouts
@@ -844,7 +903,8 @@ pub async fn cancel_payout(
                                 &format!("rewards/{platform_id}/cancel"),
                                 None,
                             )
-                            .await?;
+                            .await
+                            .wrap_api_err("cancelling Tremendous payout")?;
                     }
                     PayoutMethodType::MuralPay => {
                         let payout_request_id = platform_id
@@ -859,7 +919,10 @@ pub async fn cancel_payout(
                     }
                 }
 
-                let mut transaction = pool.begin().await?;
+                let mut transaction = pool
+                    .begin()
+                    .await
+                    .wrap_internal_err("starting database transaction")?;
                 sqlx::query!(
                     "
                     UPDATE payouts
@@ -870,19 +933,23 @@ pub async fn cancel_payout(
                     platform_id
                 )
                 .execute(&mut transaction)
-                .await?;
-                transaction.commit().await?;
+                .await
+                .wrap_internal_err("querying database for `cancel_payout`")?;
+                transaction
+                    .commit()
+                    .await
+                    .wrap_internal_err("committing database transaction")?;
 
                 Ok(HttpResponse::NoContent().finish())
             } else {
-                Err(ApiError::InvalidInput(
-                    "Payout cannot be cancelled!".to_string(),
-                ))
+                Err(ApiError::Request(eyre::eyre!(
+                    "Payout cannot be cancelled!",
+                )))
             }
         } else {
-            Err(ApiError::InvalidInput(
-                "Payout cannot be cancelled!".to_string(),
-            ))
+            Err(ApiError::Request(eyre::eyre!(
+                "Payout cannot be cancelled!",
+            )))
         }
     } else {
         Ok(HttpResponse::NotFound().finish())
@@ -920,7 +987,8 @@ pub async fn payment_methods(
 ) -> Result<HttpResponse, ApiError> {
     let methods = payouts_queue
         .get_payout_methods()
-        .await?
+        .await
+        .wrap_api_err("fetching payout methods")?
         .into_iter()
         .filter(|x| {
             let mut val = true;
@@ -973,10 +1041,13 @@ pub async fn get_balance(
         &session_queue,
         Scopes::PAYOUTS_READ,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
-    let balance = get_user_balance(user.id.into(), &pool).await?;
+    let balance = get_user_balance(user.id.into(), &pool)
+        .await
+        .wrap_api_err("fetching user balance")?;
 
     let mut requested_form_type = None;
     let mut form_completion_status = None;
@@ -985,7 +1056,8 @@ pub async fn get_balance(
     if tax_compliance_payout_threshold().is_some() {
         form_completion_status = Some(
             update_compliance_status(&pool, user.id.into())
-                .await?
+                .await
+                .wrap_api_err("updating compliance status")?
                 .filter(|x| x.model.form_type.is_some())
                 .map_or(FormCompletionStatus::Unrequested, |compliance| {
                     requested_form_type = compliance.model.form_type;
@@ -1031,7 +1103,8 @@ async fn get_user_balance(
         user_id.0
     )
     .fetch_all(pool)
-    .await?;
+    .await
+    .wrap_internal_err("fetching payouts from database")?;
 
     let available = payouts
         .iter()
@@ -1054,7 +1127,7 @@ async fn get_user_balance(
         user_id.0
     )
     .fetch_optional(pool)
-    .await?;
+    .await.wrap_internal_err("fetching withdrawn from database")?;
 
     let (withdrawn, fees, withdrawn_this_year) =
         withdrawn.map_or((Decimal::ZERO, Decimal::ZERO, Decimal::ZERO), |x| {
@@ -1152,7 +1225,9 @@ async fn update_compliance_status(
             }
         }
 
-        compliance.update(pg).await?;
+        compliance.update(pg).await.wrap_internal_err(
+            "updating database records for `update_compliance_status`",
+        )?;
 
         Ok(Some(ComplianceCheck {
             model: compliance,
@@ -1202,7 +1277,8 @@ pub async fn platform_revenue(
         ",
     )
     .fetch_optional(&**pool)
-    .await?
+    .await
+    .wrap_internal_err("fetching all time payouts from database")?
     .and_then(|x| x.sum)
     .unwrap_or(Decimal::ZERO);
 
@@ -1212,7 +1288,8 @@ pub async fn platform_revenue(
         ",
     )
     .fetch_optional(&**pool)
-    .await?
+    .await
+    .wrap_internal_err("fetching all available from database")?
     .and_then(|x| x.sum)
     .unwrap_or(Decimal::ZERO);
 
@@ -1232,7 +1309,8 @@ pub async fn platform_revenue(
         end
     )
     .fetch_all(&**pool)
-    .await?
+    .await
+    .wrap_internal_err("fetching revenue from database")?
     .into_iter()
     .map(|x| RevenueData {
         time: x.created.timestamp() as u64,
diff --git a/apps/labrinth/src/routes/v3/project_creation.rs b/apps/labrinth/src/routes/v3/project_creation.rs
index f7c383a8ca..e8f5adc972 100644
--- a/apps/labrinth/src/routes/v3/project_creation.rs
+++ b/apps/labrinth/src/routes/v3/project_creation.rs
@@ -99,25 +99,14 @@ pub enum CreateError {
 impl From<crate::routes::ApiError> for CreateError {
     fn from(value: crate::routes::ApiError) -> Self {
         match value {
-            crate::routes::ApiError::Database(err) => Self::DatabaseError(err),
-            crate::routes::ApiError::SqlxDatabase(err) => {
-                Self::SqlxDatabaseError(err)
-            }
-            crate::routes::ApiError::Authentication(err) => {
-                Self::Unauthorized(err)
-            }
-            crate::routes::ApiError::CustomAuthentication(err) => {
-                Self::CustomAuthenticationError(err)
-            }
             crate::routes::ApiError::Auth(err) => {
                 Self::CustomAuthenticationError(format!("{err:#}"))
             }
-            crate::routes::ApiError::InvalidInput(err)
-            | crate::routes::ApiError::Validation(err) => {
-                Self::InvalidInput(err)
+            crate::routes::ApiError::Request(err) => {
+                Self::InvalidInput(format!("{err:#}"))
             }
             err => Self::DatabaseError(models::DatabaseError::SchemaError(
-                err.to_string(),
+                format!("{err:#}"),
             )),
         }
     }
diff --git a/apps/labrinth/src/routes/v3/project_creation/new.rs b/apps/labrinth/src/routes/v3/project_creation/new.rs
index 5112807803..2922375796 100644
--- a/apps/labrinth/src/routes/v3/project_creation/new.rs
+++ b/apps/labrinth/src/routes/v3/project_creation/new.rs
@@ -138,13 +138,13 @@ pub async fn create(
         Scopes::PROJECT_CREATE,
     )
     .await
-    .map_err(ApiError::from)?;
+    .wrap_auth_err("authenticating project creator")?;
 
     require_verified_email(&user)?;
 
     let limits = UserLimits::get_for_projects(&user, &db)
         .await
-        .map_err(ApiError::from)?;
+        .wrap_internal_err("fetching project limits")?;
     if limits.current >= limits.max {
         return Err(CreateError::LimitReached);
     }
diff --git a/apps/labrinth/src/routes/v3/projects.rs b/apps/labrinth/src/routes/v3/projects.rs
index 8c7074a4ba..4af79d0635 100644
--- a/apps/labrinth/src/routes/v3/projects.rs
+++ b/apps/labrinth/src/routes/v3/projects.rs
@@ -1,3 +1,4 @@
+use crate::util::error::ApiContext as _;
 use std::any::type_name;
 use std::cmp::Reverse;
 use std::collections::HashMap;
@@ -34,7 +35,6 @@ use crate::util::error::Context;
 use crate::util::img;
 use crate::util::img::{delete_old_images, upload_image_optimized};
 use crate::util::routes::read_limited_from_payload;
-use crate::util::validate::validation_errors_to_string;
 use actix_web::{HttpRequest, HttpResponse, delete, get, patch, post, web};
 use chrono::Utc;
 use eyre::eyre;
@@ -84,7 +84,8 @@ pub async fn clear_project_cache_and_queue_search(
         clear_dependencies,
         redis,
     )
-    .await?;
+    .await
+    .wrap_internal_err("clearing cached data from Redis")?;
 
     search_state
         .queue
@@ -119,9 +120,10 @@ pub async fn random_projects_get(
     pool: web::Data<PgPool>,
     redis: web::Data<RedisPool>,
 ) -> Result<HttpResponse, ApiError> {
-    count.validate().map_err(|err| {
-        ApiError::Validation(validation_errors_to_string(err, None))
-    })?;
+    count
+        .validate()
+        .map_err(|err| eyre::eyre!(err))
+        .wrap_request_err("validating request")?;
 
     let project_ids = sqlx::query!(
         // IDs are randomly generated (see the `generate_ids` macro), so fetching a
@@ -143,11 +145,12 @@ pub async fn random_projects_get(
     .fetch(&**pool)
     .map_ok(|m| db_ids::DBProjectId(m.id))
     .try_collect::<Vec<_>>()
-    .await?;
+    .await.wrap_internal_err("querying random project IDs")?;
 
     let projects_data =
         db_models::DBProject::get_many_ids(&project_ids, &**pool, &redis)
-            .await?
+            .await
+            .wrap_api_err("fetching projects by ID")?
             .into_iter()
             .map(Project::from)
             .collect::<Vec<_>>();
@@ -188,9 +191,11 @@ pub async fn projects_get(
     redis: web::Data<RedisPool>,
     session_queue: web::Data<AuthQueue>,
 ) -> Result<HttpResponse, ApiError> {
-    let ids = serde_json::from_str::<Vec<&str>>(&ids.ids)?;
-    let projects_data =
-        db_models::DBProject::get_many(&ids, &**pool, &redis).await?;
+    let ids = serde_json::from_str::<Vec<&str>>(&ids.ids)
+        .wrap_request_err("deserializing JSON data")?;
+    let projects_data = db_models::DBProject::get_many(&ids, &**pool, &redis)
+        .await
+        .wrap_api_err("fetching requested projects")?;
 
     let user_option = get_user_from_headers(
         &req,
@@ -205,7 +210,8 @@ pub async fn projects_get(
 
     let projects =
         filter_visible_projects(projects_data, &user_option, &pool, false)
-            .await?;
+            .await
+            .wrap_api_err("filtering visible projects")?;
 
     Ok(HttpResponse::Ok().json(projects))
 }
@@ -256,7 +262,7 @@ pub async fn project_get_internal(
     {
         return Ok(web::Json(Project::from(data)));
     }
-    Err(ApiError::NotFound)
+    Err(ApiError::NotFound(eyre::eyre!("resource not found")))
 }
 
 #[derive(Debug, Serialize, Deserialize, Validate, utoipa::ToSchema)]
@@ -388,18 +394,21 @@ pub async fn project_edit_internal(
         &session_queue,
         Scopes::PROJECT_WRITE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
-    new_project.validate().map_err(|err| {
-        ApiError::Validation(validation_errors_to_string(err, None))
-    })?;
+    new_project
+        .validate()
+        .map_err(|err| eyre::eyre!(err))
+        .wrap_request_err("validating request")?;
 
     let Some(mut project_item) =
         db_models::DBProject::get(&info.into_inner().0, &**pool, &redis)
-            .await?
+            .await
+            .wrap_api_err("fetching project")?
     else {
-        return Err(ApiError::NotFound);
+        return Err(ApiError::NotFound(eyre::eyre!("resource not found")));
     };
 
     let id = project_item.inner.id;
@@ -410,26 +419,29 @@ pub async fn project_edit_internal(
             user.id.into(),
             &**pool,
         )
-        .await?;
+        .await
+        .wrap_internal_err("fetching team member from database")?;
 
     let Some(perms) = ProjectPermissions::get_permissions_by_role(
         &user.role,
         &team_member,
         &organization_team_member,
     ) else {
-        return Err(ApiError::CustomAuthentication(
-            "You do not have permission to edit this project!".to_string(),
-        ));
+        return Err(ApiError::Auth(eyre::eyre!(
+            "You do not have permission to edit this project!",
+        )));
     };
 
-    let mut transaction = pool.begin().await?;
+    let mut transaction = pool
+        .begin()
+        .await
+        .wrap_internal_err("starting database transaction")?;
 
     if let Some(name) = &new_project.name {
         if !perms.contains(ProjectPermissions::EDIT_DETAILS) {
-            return Err(ApiError::CustomAuthentication(
-                "You do not have the permissions to edit the name of this project!"
-                    .to_string(),
-            ));
+            return Err(ApiError::Auth(eyre::eyre!(
+                "You do not have the permissions to edit the name of this project!",
+            )));
         }
 
         sqlx::query!(
@@ -442,15 +454,15 @@ pub async fn project_edit_internal(
             id as db_ids::DBProjectId,
         )
         .execute(&mut transaction)
-        .await?;
+        .await
+        .wrap_internal_err("querying database for `project_edit_internal`")?;
     }
 
     if let Some(summary) = &new_project.summary {
         if !perms.contains(ProjectPermissions::EDIT_DETAILS) {
-            return Err(ApiError::CustomAuthentication(
-                "You do not have the permissions to edit the summary of this project!"
-                    .to_string(),
-            ));
+            return Err(ApiError::Auth(eyre::eyre!(
+                "You do not have the permissions to edit the summary of this project!",
+            )));
         }
 
         sqlx::query!(
@@ -463,15 +475,15 @@ pub async fn project_edit_internal(
             id as db_ids::DBProjectId,
         )
         .execute(&mut transaction)
-        .await?;
+        .await
+        .wrap_internal_err("querying database for `project_edit_internal`")?;
     }
 
     if let Some(status) = &new_project.status {
         if !perms.contains(ProjectPermissions::EDIT_DETAILS) {
-            return Err(ApiError::CustomAuthentication(
-                "You do not have the permissions to edit the status of this project!"
-                    .to_string(),
-            ));
+            return Err(ApiError::Auth(eyre::eyre!(
+                "You do not have the permissions to edit the status of this project!",
+            )));
         }
 
         if !(user.role.is_mod()
@@ -480,9 +492,9 @@ pub async fn project_edit_internal(
             || project_item.inner.status.is_approved()
                 && status.can_be_requested())
         {
-            return Err(ApiError::CustomAuthentication(
-                "You don't have permission to set this status!".to_string(),
-            ));
+            return Err(ApiError::Auth(eyre::eyre!(
+                "You don't have permission to set this status!",
+            )));
         }
 
         // If a moderator (non-admin) is completing a review while another moderator holds an
@@ -493,21 +505,24 @@ pub async fn project_edit_internal(
             && status != &ProjectStatus::Processing
             && let Some(lock) =
                 DBModerationLock::get_with_user(project_item.inner.id, &pool)
-                    .await?
+                    .await
+                    .wrap_internal_err(
+                        "fetching moderation lock from database",
+                    )?
             && lock.moderator_id != db_ids::DBUserId::from(user.id)
             && !lock.expired
         {
-            return Err(ApiError::CustomAuthentication(format!(
+            return Err(ApiError::Auth(eyre::eyre!(format!(
                 "This project is currently being moderated by @{}. Please wait for them to finish or for the lock to expire.",
                 lock.moderator_username
-            )));
+            ))));
         }
 
         if status == &ProjectStatus::Processing {
             if project_item.versions.is_empty() {
-                return Err(ApiError::InvalidInput(String::from(
+                return Err(ApiError::Request(eyre::eyre!(String::from(
                     "Project submitted for review with no initial versions",
-                )));
+                ))));
             }
 
             sqlx::query!(
@@ -519,7 +534,7 @@ pub async fn project_edit_internal(
                 id as db_ids::DBProjectId,
             )
             .execute(&mut transaction)
-            .await?;
+            .await.wrap_internal_err("querying database for `project_edit_internal`")?;
         }
 
         if status.is_approved() && !project_item.inner.status.is_approved() {
@@ -532,7 +547,10 @@ pub async fn project_edit_internal(
                 id as db_ids::DBProjectId,
             )
             .execute(&mut transaction)
-            .await?;
+            .await
+            .wrap_internal_err(
+                "querying database for `project_edit_internal`",
+            )?;
         }
 
         if status.is_searchable()
@@ -559,7 +577,10 @@ pub async fn project_edit_internal(
                 id as db_ids::DBProjectId,
             )
             .execute(&mut transaction)
-            .await?;
+            .await
+            .wrap_internal_err(
+                "querying database for `project_edit_internal`",
+            )?;
         }
 
         if user.role.is_mod() && !ENV.MODERATION_SLACK_WEBHOOK.is_empty() {
@@ -596,7 +617,8 @@ pub async fn project_edit_internal(
             .fetch(&mut transaction)
             .map_ok(|c| db_models::DBUserId(c.id))
             .try_collect::<Vec<_>>()
-            .await?;
+            .await
+            .wrap_internal_err("fetching notified members from database")?;
 
             NotificationBuilder {
                 body: NotificationBody::StatusChange {
@@ -606,7 +628,10 @@ pub async fn project_edit_internal(
                 },
             }
             .insert_many(notified_members.clone(), &mut transaction, &redis)
-            .await?;
+            .await
+            .wrap_internal_err(
+                "inserting database records for `project_edit_internal`",
+            )?;
 
             NotificationBuilder {
                 body: if status.is_approved() {
@@ -622,7 +647,10 @@ pub async fn project_edit_internal(
                 },
             }
             .insert_many(notified_members, &mut transaction, &redis)
-            .await?;
+            .await
+            .wrap_internal_err(
+                "inserting database records for `project_edit_internal`",
+            )?;
         }
 
         ThreadMessageBuilder {
@@ -635,7 +663,10 @@ pub async fn project_edit_internal(
             hide_identity: user.role.is_mod(),
         }
         .insert(&mut transaction)
-        .await?;
+        .await
+        .wrap_internal_err(
+            "inserting database records for `project_edit_internal`",
+        )?;
 
         sqlx::query!(
             "
@@ -647,24 +678,24 @@ pub async fn project_edit_internal(
             id as db_ids::DBProjectId,
         )
         .execute(&mut transaction)
-        .await?;
+        .await
+        .wrap_internal_err("querying database for `project_edit_internal`")?;
     }
 
     if let Some(requested_status) = &new_project.requested_status {
         if !perms.contains(ProjectPermissions::EDIT_DETAILS) {
-            return Err(ApiError::CustomAuthentication(
-                "You do not have the permissions to edit the requested status of this project!"
-                    .to_string(),
-            ));
+            return Err(ApiError::Auth(eyre::eyre!(
+                "You do not have the permissions to edit the requested status of this project!",
+            )));
         }
 
         if !requested_status
             .map(|x| x.can_be_requested())
             .unwrap_or(true)
         {
-            return Err(ApiError::InvalidInput(String::from(
+            return Err(ApiError::Request(eyre::eyre!(String::from(
                 "Specified status cannot be requested!",
-            )));
+            ))));
         }
 
         sqlx::query!(
@@ -677,7 +708,8 @@ pub async fn project_edit_internal(
             id as db_ids::DBProjectId,
         )
         .execute(&mut transaction)
-        .await?;
+        .await
+        .wrap_internal_err("querying database for `project_edit_internal`")?;
     }
 
     if perms.contains(ProjectPermissions::EDIT_DETAILS) {
@@ -690,7 +722,10 @@ pub async fn project_edit_internal(
                 id as db_ids::DBProjectId,
             )
             .execute(&mut transaction)
-            .await?;
+            .await
+            .wrap_internal_err(
+                "updating database records for `project_edit_internal`",
+            )?;
         }
 
         if new_project.additional_categories.is_some() {
@@ -702,7 +737,10 @@ pub async fn project_edit_internal(
                 id as db_ids::DBProjectId,
             )
             .execute(&mut transaction)
-            .await?;
+            .await
+            .wrap_internal_err(
+                "querying database for `project_edit_internal`",
+            )?;
         }
     }
 
@@ -714,7 +752,8 @@ pub async fn project_edit_internal(
             false,
             &mut transaction,
         )
-        .await?;
+        .await
+        .wrap_api_err("executing `edit_project_categories`")?;
     }
 
     if let Some(categories) = &new_project.additional_categories {
@@ -725,15 +764,15 @@ pub async fn project_edit_internal(
             true,
             &mut transaction,
         )
-        .await?;
+        .await
+        .wrap_api_err("executing `edit_project_categories`")?;
     }
 
     if let Some(license_url) = &new_project.license_url {
         if !perms.contains(ProjectPermissions::EDIT_DETAILS) {
-            return Err(ApiError::CustomAuthentication(
-                "You do not have the permissions to edit the license URL of this project!"
-                    .to_string(),
-            ));
+            return Err(ApiError::Auth(eyre::eyre!(
+                "You do not have the permissions to edit the license URL of this project!",
+            )));
         }
 
         sqlx::query!(
@@ -746,15 +785,15 @@ pub async fn project_edit_internal(
             id as db_ids::DBProjectId,
         )
         .execute(&mut transaction)
-        .await?;
+        .await
+        .wrap_internal_err("querying database for `project_edit_internal`")?;
     }
 
     if let Some(slug) = &new_project.slug {
         if !perms.contains(ProjectPermissions::EDIT_DETAILS) {
-            return Err(ApiError::CustomAuthentication(
-                "You do not have the permissions to edit the slug of this project!"
-                    .to_string(),
-            ));
+            return Err(ApiError::Auth(eyre::eyre!(
+                "You do not have the permissions to edit the slug of this project!",
+            )));
         }
 
         let existing = db_models::DBProject::get(
@@ -762,11 +801,12 @@ pub async fn project_edit_internal(
             &mut transaction,
             &redis,
         )
-        .await?;
+        .await
+        .wrap_api_err("checking project slug availability")?;
         if existing.is_some() {
-            return Err(ApiError::InvalidInput(
-                "Slug collides with other project's id!".to_string(),
-            ));
+            return Err(ApiError::Request(eyre::eyre!(
+                "Slug collides with other project's id!",
+            )));
         }
 
         // Make sure the new slug is different from the old one
@@ -784,12 +824,15 @@ pub async fn project_edit_internal(
                 slug
             )
             .fetch_one(&mut transaction)
-            .await?;
+            .await
+            .wrap_internal_err(
+                "querying database for `project_edit_internal`",
+            )?;
 
             if results.exists.unwrap_or(true) {
-                return Err(ApiError::InvalidInput(
-                    "Slug collides with other project's id!".to_string(),
-                ));
+                return Err(ApiError::Request(eyre::eyre!(
+                    "Slug collides with other project's id!",
+                )));
             }
         }
 
@@ -803,15 +846,15 @@ pub async fn project_edit_internal(
             id as db_ids::DBProjectId,
         )
         .execute(&mut transaction)
-        .await?;
+        .await
+        .wrap_internal_err("querying database for `project_edit_internal`")?;
     }
 
     if let Some(license) = &new_project.license_id {
         if !perms.contains(ProjectPermissions::EDIT_DETAILS) {
-            return Err(ApiError::CustomAuthentication(
-                "You do not have the permissions to edit the license of this project!"
-                    .to_string(),
-            ));
+            return Err(ApiError::Auth(eyre::eyre!(
+                "You do not have the permissions to edit the license of this project!",
+            )));
         }
 
         let mut license = license.clone();
@@ -820,11 +863,9 @@ pub async fn project_edit_internal(
             license = models::projects::DEFAULT_LICENSE_ID.to_string();
         }
 
-        spdx::Expression::parse(&license).map_err(|err| {
-            ApiError::InvalidInput(format!(
-                "Invalid SPDX license identifier: {err}"
-            ))
-        })?;
+        spdx::Expression::parse(&license)
+            .map_err(|err| eyre::eyre!(err))
+            .wrap_request_err("parsing request value")?;
 
         sqlx::query!(
             "
@@ -836,17 +877,17 @@ pub async fn project_edit_internal(
             id as db_ids::DBProjectId,
         )
         .execute(&mut transaction)
-        .await?;
+        .await
+        .wrap_internal_err("querying database for `project_edit_internal`")?;
     }
 
     if let Some(links) = &new_project.link_urls
         && !links.is_empty()
     {
         if !perms.contains(ProjectPermissions::EDIT_DETAILS) {
-            return Err(ApiError::CustomAuthentication(
-                    "You do not have the permissions to edit the links of this project!"
-                        .to_string(),
-                ));
+            return Err(ApiError::Auth(eyre::eyre!(
+                "You do not have the permissions to edit the links of this project!",
+            )));
         }
 
         let ids_to_delete = links.keys().cloned().collect::<Vec<String>>();
@@ -862,7 +903,8 @@ pub async fn project_edit_internal(
             &ids_to_delete
         )
         .execute(&mut transaction)
-        .await?;
+        .await
+        .wrap_internal_err("querying database for `project_edit_internal`")?;
 
         for (platform, url) in links {
             if let Some(url) = url {
@@ -870,12 +912,10 @@ pub async fn project_edit_internal(
                     platform,
                     &mut transaction,
                 )
-                .await?
-                .ok_or_else(|| {
-                    ApiError::InvalidInput(format!(
-                        "Platform {} does not exist.",
-                        platform.clone()
-                    ))
+                .await
+                .wrap_internal_err("fetching link platform from database")?
+                .wrap_request_err_with(|| {
+                    format!("platform `{}` does not exist", platform.clone())
                 })?;
                 sqlx::query!(
                         "
@@ -887,7 +927,7 @@ pub async fn project_edit_internal(
                         url
                     )
                     .execute(&mut transaction)
-                    .await?;
+                    .await.wrap_internal_err("querying database for `project_edit_internal`")?;
             }
         }
     }
@@ -896,10 +936,9 @@ pub async fn project_edit_internal(
             && (!project_item.inner.status.is_approved()
                 || moderation_message.is_some())
         {
-            return Err(ApiError::CustomAuthentication(
-                "You do not have the permissions to edit the moderation message of this project!"
-                    .to_string(),
-            ));
+            return Err(ApiError::Auth(eyre::eyre!(
+                "You do not have the permissions to edit the moderation message of this project!",
+            )));
         }
 
         sqlx::query!(
@@ -912,7 +951,8 @@ pub async fn project_edit_internal(
             id as db_ids::DBProjectId,
         )
         .execute(&mut transaction)
-        .await?;
+        .await
+        .wrap_internal_err("querying database for `project_edit_internal`")?;
     }
 
     if let Some(moderation_message_body) = &new_project.moderation_message_body
@@ -921,10 +961,9 @@ pub async fn project_edit_internal(
             && (!project_item.inner.status.is_approved()
                 || moderation_message_body.is_some())
         {
-            return Err(ApiError::CustomAuthentication(
-                "You do not have the permissions to edit the moderation message body of this project!"
-                    .to_string(),
-            ));
+            return Err(ApiError::Auth(eyre::eyre!(
+                "You do not have the permissions to edit the moderation message body of this project!",
+            )));
         }
 
         sqlx::query!(
@@ -937,15 +976,15 @@ pub async fn project_edit_internal(
             id as db_ids::DBProjectId,
         )
         .execute(&mut transaction)
-        .await?;
+        .await
+        .wrap_internal_err("querying database for `project_edit_internal`")?;
     }
 
     if let Some(description) = &new_project.description {
         if !perms.contains(ProjectPermissions::EDIT_BODY) {
-            return Err(ApiError::CustomAuthentication(
-                "You do not have the permissions to edit the description (body) of this project!"
-                    .to_string(),
-            ));
+            return Err(ApiError::Auth(eyre::eyre!(
+                "You do not have the permissions to edit the description (body) of this project!",
+            )));
         }
 
         sqlx::query!(
@@ -958,15 +997,15 @@ pub async fn project_edit_internal(
             id as db_ids::DBProjectId,
         )
         .execute(&mut transaction)
-        .await?;
+        .await
+        .wrap_internal_err("querying database for `project_edit_internal`")?;
     }
 
     if let Some(monetization_status) = &new_project.monetization_status {
         if !perms.contains(ProjectPermissions::EDIT_DETAILS) {
-            return Err(ApiError::CustomAuthentication(
-                "You do not have the permissions to edit the monetization status of this project!"
-                    .to_string(),
-            ));
+            return Err(ApiError::Auth(eyre::eyre!(
+                "You do not have the permissions to edit the monetization status of this project!",
+            )));
         }
 
         if (*monetization_status == MonetizationStatus::ForceDemonetized
@@ -974,10 +1013,9 @@ pub async fn project_edit_internal(
                 == MonetizationStatus::ForceDemonetized)
             && !user.role.is_mod()
         {
-            return Err(ApiError::CustomAuthentication(
-                "You do not have the permissions to edit the monetization status of this project!"
-                    .to_string(),
-            ));
+            return Err(ApiError::Auth(eyre::eyre!(
+                "You do not have the permissions to edit the monetization status of this project!",
+            )));
         }
 
         sqlx::query!(
@@ -990,17 +1028,17 @@ pub async fn project_edit_internal(
             id as db_ids::DBProjectId,
         )
         .execute(&mut transaction)
-        .await?;
+        .await
+        .wrap_internal_err("querying database for `project_edit_internal`")?;
     }
 
     if let Some(side_types_migration_review_status) =
         &new_project.side_types_migration_review_status
     {
         if !perms.contains(ProjectPermissions::EDIT_DETAILS) {
-            return Err(ApiError::CustomAuthentication(
-                "You do not have the permissions to edit the side types migration review status of this project!"
-                    .to_string(),
-            ));
+            return Err(ApiError::Auth(eyre::eyre!(
+                "You do not have the permissions to edit the side types migration review status of this project!",
+            )));
         }
 
         sqlx::query!(
@@ -1013,7 +1051,8 @@ pub async fn project_edit_internal(
             id as db_ids::DBProjectId,
         )
         .execute(&mut transaction)
-        .await?;
+        .await
+        .wrap_internal_err("querying database for `project_edit_internal`")?;
     }
 
     if !new_project.loader_fields.is_empty() {
@@ -1022,7 +1061,8 @@ pub async fn project_edit_internal(
             &**pool,
             &redis,
         )
-        .await?
+        .await
+        .wrap_internal_err("fetching versions from database")?
         {
             match super::versions::version_edit_helper(
                 req.clone(),
@@ -1043,7 +1083,7 @@ pub async fn project_edit_internal(
                 // the loaders defined for this version, which is a common case for
                 // projects with heterogeneous loaders across versions and is best
                 // handled with opportunistic update semantics
-                Ok(_) | Err(ApiError::InvalidInput(_)) => continue,
+                Ok(_) | Err(ApiError::Request(_)) => continue,
                 err => return err,
             }
         }
@@ -1064,10 +1104,9 @@ pub async fn project_edit_internal(
         };
 
         if !perms.contains(ProjectPermissions::EDIT_DETAILS) {
-            return Err(ApiError::CustomAuthentication(
-                "You do not have the permissions to edit the components of this project!"
-                    .to_string(),
-            ));
+            return Err(ApiError::Auth(eyre::eyre!(
+                "You do not have the permissions to edit the components of this project!",
+            )));
         }
 
         match (&mut component, edit) {
@@ -1112,7 +1151,8 @@ pub async fn project_edit_internal(
         &mut project_item.inner.components.minecraft_server,
         perms,
     )
-    .await?;
+    .await
+    .wrap_api_err("updating Minecraft server component")?;
     reindex_versions |= update(
         &mut transaction,
         id,
@@ -1120,7 +1160,8 @@ pub async fn project_edit_internal(
         &mut project_item.inner.components.minecraft_java_server,
         perms,
     )
-    .await?;
+    .await
+    .wrap_api_err("updating Minecraft Java server component")?;
     reindex_versions |= update(
         &mut transaction,
         id,
@@ -1128,7 +1169,8 @@ pub async fn project_edit_internal(
         &mut project_item.inner.components.minecraft_bedrock_server,
         perms,
     )
-    .await?;
+    .await
+    .wrap_api_err("updating Minecraft Bedrock server component")?;
 
     let components_serial = project_item.inner.components.clone();
 
@@ -1170,9 +1212,13 @@ pub async fn project_edit_internal(
         &mut transaction,
         &redis,
     )
-    .await?;
+    .await
+    .wrap_api_err("deleting unused images")?;
 
-    transaction.commit().await?;
+    transaction
+        .commit()
+        .await
+        .wrap_internal_err("committing database transaction")?;
 
     if reindex_versions {
         db_models::DBProject::clear_cache(
@@ -1181,7 +1227,8 @@ pub async fn project_edit_internal(
             None,
             &redis,
         )
-        .await?;
+        .await
+        .wrap_internal_err("clearing cached data from Redis")?;
         search_state
             .queue
             .push_version_changes(
@@ -1197,7 +1244,8 @@ pub async fn project_edit_internal(
             project_item.inner.slug,
             None,
         )
-        .await?;
+        .await
+        .wrap_api_err("executing `clear_project_cache_and_queue_search`")?;
     }
 
     // Remove no longer searchable projects from search index
@@ -1223,9 +1271,9 @@ pub async fn edit_project_categories(
 ) -> Result<(), ApiError> {
     if !perms.contains(ProjectPermissions::EDIT_DETAILS) {
         let additional_str = if is_additional { "additional " } else { "" };
-        return Err(ApiError::CustomAuthentication(format!(
+        return Err(ApiError::Auth(eyre::eyre!(format!(
             "You do not have the permissions to edit the {additional_str}categories of this project!"
-        )));
+        ))));
     }
 
     let mut mod_categories = Vec::new();
@@ -1234,7 +1282,8 @@ pub async fn edit_project_categories(
             category,
             &mut *transaction,
         )
-        .await?;
+        .await
+        .wrap_internal_err("fetching category from Redis")?;
         // TODO: We should filter out categories that don't match the project type of any of the versions
         // ie: if mod and modpack both share a name this should only have modpack if it only has a modpack as a version
 
@@ -1248,7 +1297,9 @@ pub async fn edit_project_categories(
             .collect::<Vec<_>>();
         mod_categories.extend(mcategories);
     }
-    DBModCategory::insert_many(mod_categories, &mut *transaction).await?;
+    DBModCategory::insert_many(mod_categories, &mut *transaction)
+        .await
+        .wrap_internal_err("inserting mod categories into database")?;
 
     Ok(())
 }
@@ -1290,7 +1341,8 @@ pub async fn project_search(
 ) -> Result<web::Json<SearchResults>, ApiError> {
     let results = search_backend
         .search_for_project(&SearchRequest::from(info), &redis)
-        .await?;
+        .await
+        .wrap_api_err("searching projects")?;
 
     // TODO: add this back
     // let results = ReturnSearchResults {
@@ -1320,7 +1372,10 @@ pub async fn project_search_post(
     search_backend: web::Data<dyn SearchBackend>,
     redis: web::Data<RedisPool>,
 ) -> Result<web::Json<SearchResults>, ApiError> {
-    let results = search_backend.search_for_project(&info, &redis).await?;
+    let results = search_backend
+        .search_for_project(&info, &redis)
+        .await
+        .wrap_api_err("searching projects")?;
     Ok(web::Json(results))
 }
 
@@ -1346,15 +1401,16 @@ pub async fn project_get_check_internal(
 ) -> Result<HttpResponse, ApiError> {
     let slug = info.into_inner().0;
 
-    let project_data =
-        db_models::DBProject::get(&slug, &**pool, &redis).await?;
+    let project_data = db_models::DBProject::get(&slug, &**pool, &redis)
+        .await
+        .wrap_api_err("fetching project from database")?;
 
     if let Some(project) = project_data {
         Ok(HttpResponse::Ok().json(ProjectCheckResponse {
             id: models::ids::ProjectId::from(project.inner.id),
         }))
     } else {
-        Err(ApiError::NotFound)
+        Err(ApiError::NotFound(eyre::eyre!("resource not found")))
     }
 }
 
@@ -1392,8 +1448,9 @@ pub async fn dependency_list_internal(
 ) -> Result<HttpResponse, ApiError> {
     let string = info.into_inner().0;
 
-    let result =
-        db_models::DBProject::get(&string, &***ro_pool, &redis).await?;
+    let result = db_models::DBProject::get(&string, &***ro_pool, &redis)
+        .await
+        .wrap_api_err("fetching project from database")?;
 
     let user_option = get_user_from_headers(
         &req,
@@ -1408,9 +1465,10 @@ pub async fn dependency_list_internal(
 
     if let Some(project) = result {
         if !is_visible_project(&project.inner, &user_option, &pool, false)
-            .await?
+            .await
+            .wrap_api_err("checking project visibility")?
         {
-            return Err(ApiError::NotFound);
+            return Err(ApiError::NotFound(eyre::eyre!("resource not found")));
         }
 
         let dependencies = database::DBProject::get_dependencies(
@@ -1418,7 +1476,8 @@ pub async fn dependency_list_internal(
             &***ro_pool,
             &redis,
         )
-        .await?;
+        .await
+        .wrap_internal_err("fetching projects from database")?;
         let project_ids = dependencies
             .iter()
             .filter_map(|x| {
@@ -1456,7 +1515,8 @@ pub async fn dependency_list_internal(
                 .wrap_internal_err("failed to fetch dependency versions")
             },
         )
-        .await?;
+        .await
+        .wrap_api_err("fetching project dependencies")?;
 
         let mut projects = filter_visible_projects(
             projects_result,
@@ -1464,7 +1524,8 @@ pub async fn dependency_list_internal(
             &pool,
             false,
         )
-        .await?;
+        .await
+        .wrap_api_err("filtering visible projects")?;
         let mut versions = filter_visible_versions(
             versions_result,
             &user_option,
@@ -1472,7 +1533,8 @@ pub async fn dependency_list_internal(
             &ro_pool,
             &redis,
         )
-        .await?;
+        .await
+        .wrap_api_err("filtering visible versions")?;
 
         projects.sort_by_key(|b| Reverse(b.published));
         projects.dedup_by(|a, b| a.id == b.id);
@@ -1482,7 +1544,7 @@ pub async fn dependency_list_internal(
 
         Ok(HttpResponse::Ok().json(DependencyInfo { projects, versions }))
     } else {
-        Err(ApiError::NotFound)
+        Err(ApiError::NotFound(eyre::eyre!("resource not found")))
     }
 }
 
@@ -1555,31 +1617,35 @@ pub async fn projects_edit(
         &session_queue,
         Scopes::PROJECT_WRITE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
-    bulk_edit_project.validate().map_err(|err| {
-        ApiError::Validation(validation_errors_to_string(err, None))
-    })?;
+    bulk_edit_project
+        .validate()
+        .map_err(|err| eyre::eyre!(err))
+        .wrap_request_err("validating request")?;
 
     let project_ids: Vec<db_ids::DBProjectId> =
-        serde_json::from_str::<Vec<ProjectId>>(&ids.ids)?
+        serde_json::from_str::<Vec<ProjectId>>(&ids.ids)
+            .wrap_request_err("deserializing JSON data")?
             .into_iter()
             .map(|x| x.into())
             .collect();
 
     let projects_data =
         db_models::DBProject::get_many_ids(&project_ids, &**pool, &redis)
-            .await?;
+            .await
+            .wrap_api_err("fetching projects to edit")?;
 
     if let Some(id) = project_ids
         .iter()
         .find(|x| !projects_data.iter().any(|y| x == &&y.inner.id))
     {
-        return Err(ApiError::InvalidInput(format!(
+        return Err(ApiError::Request(eyre::eyre!(format!(
             "Project {} not found",
             ProjectId(id.0 as u64)
-        )));
+        ))));
     }
 
     let team_ids = projects_data
@@ -1589,7 +1655,8 @@ pub async fn projects_edit(
     let team_members = db_models::DBTeamMember::get_from_team_full_many(
         &team_ids, &**pool, &redis,
     )
-    .await?;
+    .await
+    .wrap_internal_err("fetching team members from database")?;
 
     let organization_ids = projects_data
         .iter()
@@ -1600,7 +1667,8 @@ pub async fn projects_edit(
         &**pool,
         &redis,
     )
-    .await?;
+    .await
+    .wrap_internal_err("fetching organizations from database")?;
 
     let organization_team_ids = organizations
         .iter()
@@ -1612,14 +1680,21 @@ pub async fn projects_edit(
             &**pool,
             &redis,
         )
-        .await?;
+        .await
+        .wrap_internal_err("fetching team members from database")?;
 
-    let categories =
-        db_models::categories::Category::list(&**pool, &redis).await?;
+    let categories = db_models::categories::Category::list(&**pool, &redis)
+        .await
+        .wrap_internal_err("fetching category from Redis")?;
     let link_platforms =
-        db_models::categories::LinkPlatform::list(&**pool, &redis).await?;
+        db_models::categories::LinkPlatform::list(&**pool, &redis)
+            .await
+            .wrap_internal_err("fetching link platform from Redis")?;
 
-    let mut transaction = pool.begin().await?;
+    let mut transaction = pool
+        .begin()
+        .await
+        .wrap_internal_err("starting database transaction")?;
     let mut changed_projects = Vec::new();
 
     for project in projects_data {
@@ -1653,21 +1728,21 @@ pub async fn projects_edit(
 
             if team_member.is_some() {
                 if !permissions.contains(ProjectPermissions::EDIT_DETAILS) {
-                    return Err(ApiError::CustomAuthentication(format!(
+                    return Err(ApiError::Auth(eyre::eyre!(format!(
                         "You do not have the permissions to bulk edit project {}!",
                         project.inner.name
-                    )));
+                    ))));
                 }
             } else if project.inner.status.is_hidden() {
-                return Err(ApiError::InvalidInput(format!(
+                return Err(ApiError::Request(eyre::eyre!(format!(
                     "Project {} not found",
                     ProjectId(project.inner.id.0 as u64)
-                )));
+                ))));
             } else {
-                return Err(ApiError::CustomAuthentication(format!(
+                return Err(ApiError::Auth(eyre::eyre!(format!(
                     "You are not a member of project {}!",
                     project.inner.name
-                )));
+                ))));
             };
         }
 
@@ -1684,7 +1759,8 @@ pub async fn projects_edit(
             false,
             &mut transaction,
         )
-        .await?;
+        .await
+        .wrap_api_err("executing `bulk_edit_project_categories`")?;
 
         reindex_versions |= bulk_edit_project_categories(
             &categories,
@@ -1700,7 +1776,8 @@ pub async fn projects_edit(
             true,
             &mut transaction,
         )
-        .await?;
+        .await
+        .wrap_api_err("executing `bulk_edit_project_categories`")?;
 
         if let Some(links) = &bulk_edit_project.link_urls {
             let ids_to_delete = links.keys().cloned().collect::<Vec<String>>();
@@ -1716,18 +1793,19 @@ pub async fn projects_edit(
                 &ids_to_delete
             )
             .execute(&mut transaction)
-            .await?;
+            .await
+            .wrap_internal_err("querying database for `projects_edit`")?;
 
             for (platform, url) in links {
                 if let Some(url) = url {
                     let platform_id = link_platforms
                         .iter()
                         .find(|x| &x.name == platform)
-                        .ok_or_else(|| {
-                            ApiError::InvalidInput(format!(
-                                "Platform {} does not exist.",
+                        .wrap_request_err_with(|| {
+                            format!(
+                                "platform `{}` does not exist",
                                 platform.clone()
-                            ))
+                            )
                         })?
                         .id;
                     sqlx::query!(
@@ -1740,7 +1818,7 @@ pub async fn projects_edit(
                         url
                     )
                     .execute(&mut transaction)
-                    .await?;
+                    .await.wrap_internal_err("querying database for `projects_edit`")?;
                 }
             }
         }
@@ -1753,12 +1831,16 @@ pub async fn projects_edit(
         ));
     }
 
-    transaction.commit().await?;
+    transaction
+        .commit()
+        .await
+        .wrap_internal_err("committing database transaction")?;
 
     for (project_id, slug, versions, reindex_versions) in changed_projects {
         if reindex_versions {
             db_models::DBProject::clear_cache(project_id, slug, None, &redis)
-                .await?;
+                .await
+                .wrap_internal_err("clearing cached data from Redis")?;
             search_state
                 .queue
                 .push_version_changes(
@@ -1774,7 +1856,8 @@ pub async fn projects_edit(
                 slug,
                 None,
             )
-            .await?;
+            .await
+            .wrap_api_err("executing `clear_project_cache_and_queue_search`")?;
         }
     }
 
@@ -1827,18 +1910,18 @@ pub async fn bulk_edit_project_categories(
             is_additional
         )
         .execute(&mut *transaction)
-        .await?;
+        .await
+        .wrap_internal_err(
+            "querying database for `bulk_edit_project_categories`",
+        )?;
 
         let mut mod_categories = Vec::new();
         for category in set_categories {
             let category_id = all_db_categories
                 .iter()
                 .find(|x| x.category == category)
-                .ok_or_else(|| {
-                    ApiError::InvalidInput(format!(
-                        "Category {} does not exist.",
-                        category.clone()
-                    ))
+                .wrap_request_err_with(|| {
+                    format!("category `{}` does not exist", category.clone())
                 })?
                 .id;
             mod_categories.push(DBModCategory {
@@ -1847,7 +1930,9 @@ pub async fn bulk_edit_project_categories(
                 is_additional,
             });
         }
-        DBModCategory::insert_many(mod_categories, &mut *transaction).await?;
+        DBModCategory::insert_many(mod_categories, &mut *transaction)
+            .await
+            .wrap_internal_err("inserting mod categories into database")?;
     }
 
     Ok(changed)
@@ -1913,16 +1998,16 @@ pub async fn project_icon_edit_internal(
         &session_queue,
         Scopes::PROJECT_WRITE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
     let string = info.into_inner().0;
 
     let project_item = db_models::DBProject::get(&string, &**pool, &redis)
-        .await?
-        .ok_or_else(|| {
-            ApiError::InvalidInput(
-                "The specified project does not exist!".to_string(),
-            )
+        .await
+        .wrap_api_err("fetching project from database")?
+        .wrap_request_err_with(|| {
+            "the specified project does not exist!".to_string()
         })?;
 
     if !user.role.is_mod() {
@@ -1932,13 +2017,14 @@ pub async fn project_icon_edit_internal(
                 user.id.into(),
                 &**pool,
             )
-            .await?;
+            .await
+            .wrap_internal_err("fetching team member from database")?;
 
         // Hide the project
         if team_member.is_none() && organization_team_member.is_none() {
-            return Err(ApiError::CustomAuthentication(
-                "The specified project does not exist!".to_string(),
-            ));
+            return Err(ApiError::Auth(eyre::eyre!(
+                "The specified project does not exist!",
+            )));
         }
 
         let permissions = ProjectPermissions::get_permissions_by_role(
@@ -1949,10 +2035,9 @@ pub async fn project_icon_edit_internal(
         .unwrap_or_default();
 
         if !permissions.contains(ProjectPermissions::EDIT_DETAILS) {
-            return Err(ApiError::CustomAuthentication(
-                "You don't have permission to edit this project's icon."
-                    .to_string(),
-            ));
+            return Err(ApiError::Auth(eyre::eyre!(
+                "You don't have permission to edit this project's icon.",
+            )));
         }
     }
 
@@ -1962,14 +2047,16 @@ pub async fn project_icon_edit_internal(
         FileHostPublicity::Public,
         &**file_host,
     )
-    .await?;
+    .await
+    .wrap_api_err("deleting old images")?;
 
     let bytes = read_limited_from_payload(
         &mut payload,
         262144,
         "Icons must be smaller than 256KiB",
     )
-    .await?;
+    .await
+    .wrap_api_err("executing `read_limited_from_payload`")?;
 
     let project_id: ProjectId = project_item.inner.id.into();
     let upload_result = upload_image_optimized(
@@ -1981,9 +2068,13 @@ pub async fn project_icon_edit_internal(
         Some(1.0),
         &**file_host,
     )
-    .await?;
+    .await
+    .wrap_api_err("uploading image")?;
 
-    let mut transaction = pool.begin().await?;
+    let mut transaction = pool
+        .begin()
+        .await
+        .wrap_internal_err("starting database transaction")?;
 
     sqlx::query!(
         "
@@ -1997,9 +2088,13 @@ pub async fn project_icon_edit_internal(
         project_item.inner.id as db_ids::DBProjectId,
     )
     .execute(&mut transaction)
-    .await?;
+    .await
+    .wrap_internal_err("querying database for `project_icon_edit_internal`")?;
 
-    transaction.commit().await?;
+    transaction
+        .commit()
+        .await
+        .wrap_internal_err("committing database transaction")?;
     clear_project_cache_and_queue_search(
         &redis,
         &search_state,
@@ -2007,7 +2102,8 @@ pub async fn project_icon_edit_internal(
         project_item.inner.slug,
         None,
     )
-    .await?;
+    .await
+    .wrap_api_err("executing `clear_project_cache_and_queue_search`")?;
 
     Ok(HttpResponse::NoContent().body(""))
 }
@@ -2055,16 +2151,16 @@ pub async fn delete_project_icon_internal(
         &session_queue,
         Scopes::PROJECT_WRITE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
     let string = info.into_inner().0;
 
     let project_item = db_models::DBProject::get(&string, &**pool, &redis)
-        .await?
-        .ok_or_else(|| {
-            ApiError::InvalidInput(
-                "The specified project does not exist!".to_string(),
-            )
+        .await
+        .wrap_api_err("fetching project from database")?
+        .wrap_request_err_with(|| {
+            "the specified project does not exist!".to_string()
         })?;
 
     if !user.role.is_mod() {
@@ -2074,13 +2170,14 @@ pub async fn delete_project_icon_internal(
                 user.id.into(),
                 &**pool,
             )
-            .await?;
+            .await
+            .wrap_internal_err("fetching team member from database")?;
 
         // Hide the project
         if team_member.is_none() && organization_team_member.is_none() {
-            return Err(ApiError::CustomAuthentication(
-                "The specified project does not exist!".to_string(),
-            ));
+            return Err(ApiError::Auth(eyre::eyre!(
+                "The specified project does not exist!",
+            )));
         }
         let permissions = ProjectPermissions::get_permissions_by_role(
             &user.role,
@@ -2090,10 +2187,9 @@ pub async fn delete_project_icon_internal(
         .unwrap_or_default();
 
         if !permissions.contains(ProjectPermissions::EDIT_DETAILS) {
-            return Err(ApiError::CustomAuthentication(
-                "You don't have permission to edit this project's icon."
-                    .to_string(),
-            ));
+            return Err(ApiError::Auth(eyre::eyre!(
+                "You don't have permission to edit this project's icon.",
+            )));
         }
     }
 
@@ -2103,9 +2199,13 @@ pub async fn delete_project_icon_internal(
         FileHostPublicity::Public,
         &**file_host,
     )
-    .await?;
+    .await
+    .wrap_api_err("deleting old images")?;
 
-    let mut transaction = pool.begin().await?;
+    let mut transaction = pool
+        .begin()
+        .await
+        .wrap_internal_err("starting database transaction")?;
 
     sqlx::query!(
         "
@@ -2116,9 +2216,15 @@ pub async fn delete_project_icon_internal(
         project_item.inner.id as db_ids::DBProjectId,
     )
     .execute(&mut transaction)
-    .await?;
+    .await
+    .wrap_internal_err(
+        "querying database for `delete_project_icon_internal`",
+    )?;
 
-    transaction.commit().await?;
+    transaction
+        .commit()
+        .await
+        .wrap_internal_err("committing database transaction")?;
     clear_project_cache_and_queue_search(
         &redis,
         &search_state,
@@ -2126,7 +2232,8 @@ pub async fn delete_project_icon_internal(
         project_item.inner.slug,
         None,
     )
-    .await?;
+    .await
+    .wrap_api_err("executing `clear_project_cache_and_queue_search`")?;
 
     Ok(HttpResponse::NoContent().body(""))
 }
@@ -2196,9 +2303,9 @@ pub async fn add_gallery_item_internal(
     session_queue: web::Data<AuthQueue>,
     search_state: web::Data<SearchState>,
 ) -> Result<HttpResponse, ApiError> {
-    item.validate().map_err(|err| {
-        ApiError::Validation(validation_errors_to_string(err, None))
-    })?;
+    item.validate()
+        .map_err(|err| eyre::eyre!(err))
+        .wrap_request_err("validating request")?;
 
     let user = get_user_from_headers(
         &req,
@@ -2207,23 +2314,22 @@ pub async fn add_gallery_item_internal(
         &session_queue,
         Scopes::PROJECT_WRITE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
     let string = info.into_inner().0;
 
     let project_item = db_models::DBProject::get(&string, &**pool, &redis)
-        .await?
-        .ok_or_else(|| {
-            ApiError::InvalidInput(
-                "The specified project does not exist!".to_string(),
-            )
+        .await
+        .wrap_api_err("fetching project from database")?
+        .wrap_request_err_with(|| {
+            "the specified project does not exist!".to_string()
         })?;
 
     if project_item.gallery_items.len() > 64 {
-        return Err(ApiError::CustomAuthentication(
-            "You have reached the maximum of gallery images to upload."
-                .to_string(),
-        ));
+        return Err(ApiError::Auth(eyre::eyre!(
+            "You have reached the maximum of gallery images to upload.",
+        )));
     }
 
     if !user.role.is_admin() {
@@ -2233,13 +2339,14 @@ pub async fn add_gallery_item_internal(
                 user.id.into(),
                 &**pool,
             )
-            .await?;
+            .await
+            .wrap_internal_err("fetching team member from database")?;
 
         // Hide the project
         if team_member.is_none() && organization_team_member.is_none() {
-            return Err(ApiError::CustomAuthentication(
-                "The specified project does not exist!".to_string(),
-            ));
+            return Err(ApiError::Auth(eyre::eyre!(
+                "The specified project does not exist!",
+            )));
         }
 
         let permissions = ProjectPermissions::get_permissions_by_role(
@@ -2250,10 +2357,9 @@ pub async fn add_gallery_item_internal(
         .unwrap_or_default();
 
         if !permissions.contains(ProjectPermissions::EDIT_DETAILS) {
-            return Err(ApiError::CustomAuthentication(
-                "You don't have permission to edit this project's gallery."
-                    .to_string(),
-            ));
+            return Err(ApiError::Auth(eyre::eyre!(
+                "You don't have permission to edit this project's gallery.",
+            )));
         }
     }
 
@@ -2262,7 +2368,8 @@ pub async fn add_gallery_item_internal(
         5 * (1 << 20),
         "Gallery image exceeds the maximum of 5MiB.",
     )
-    .await?;
+    .await
+    .wrap_api_err("executing `read_limited_from_payload`")?;
 
     let id: ProjectId = project_item.inner.id.into();
     let upload_result = upload_image_optimized(
@@ -2274,19 +2381,23 @@ pub async fn add_gallery_item_internal(
         Some(1.0),
         &**file_host,
     )
-    .await?;
+    .await
+    .wrap_api_err("uploading image")?;
 
     if project_item
         .gallery_items
         .iter()
         .any(|x| x.image_url == upload_result.url)
     {
-        return Err(ApiError::InvalidInput(
-            "You may not upload duplicate gallery images!".to_string(),
-        ));
+        return Err(ApiError::Request(eyre::eyre!(
+            "You may not upload duplicate gallery images!",
+        )));
     }
 
-    let mut transaction = pool.begin().await?;
+    let mut transaction = pool
+        .begin()
+        .await
+        .wrap_internal_err("starting database transaction")?;
 
     if item.featured {
         sqlx::query!(
@@ -2299,7 +2410,10 @@ pub async fn add_gallery_item_internal(
             false,
         )
         .execute(&mut transaction)
-        .await?;
+        .await
+        .wrap_internal_err(
+            "querying database for `add_gallery_item_internal`",
+        )?;
     }
 
     let gallery_item = vec![db_models::project_item::DBGalleryItem {
@@ -2316,9 +2430,13 @@ pub async fn add_gallery_item_internal(
         project_item.inner.id,
         &mut transaction,
     )
-    .await?;
+    .await
+    .wrap_internal_err("inserting galleries into database")?;
 
-    transaction.commit().await?;
+    transaction
+        .commit()
+        .await
+        .wrap_internal_err("committing database transaction")?;
     clear_project_cache_and_queue_search(
         &redis,
         &search_state,
@@ -2326,7 +2444,8 @@ pub async fn add_gallery_item_internal(
         project_item.inner.slug,
         None,
     )
-    .await?;
+    .await
+    .wrap_api_err("executing `clear_project_cache_and_queue_search`")?;
 
     Ok(HttpResponse::NoContent().body(""))
 }
@@ -2401,12 +2520,13 @@ pub async fn edit_gallery_item_internal(
         &session_queue,
         Scopes::PROJECT_WRITE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
-    item.validate().map_err(|err| {
-        ApiError::Validation(validation_errors_to_string(err, None))
-    })?;
+    item.validate()
+        .map_err(|err| eyre::eyre!(err))
+        .wrap_request_err("validating request")?;
 
     let result = sqlx::query!(
         "
@@ -2416,12 +2536,13 @@ pub async fn edit_gallery_item_internal(
         item.url
     )
     .fetch_optional(&**pool)
-    .await?
-    .ok_or_else(|| {
-        ApiError::InvalidInput(format!(
-            "Gallery item at URL {} is not part of the project's gallery.",
+    .await
+    .wrap_internal_err("querying database for `edit_gallery_item_internal`")?
+    .wrap_request_err_with(|| {
+        format!(
+            "gallery item at URL `{}` is not part of the project's gallery",
             item.url
-        ))
+        )
     })?;
 
     let project_item = db_models::DBProject::get_id(
@@ -2429,11 +2550,10 @@ pub async fn edit_gallery_item_internal(
         &**pool,
         &redis,
     )
-    .await?
-    .ok_or_else(|| {
-        ApiError::InvalidInput(
-            "The specified project does not exist!".to_string(),
-        )
+    .await
+    .wrap_api_err("fetching project from database")?
+    .wrap_request_err_with(|| {
+        "the specified project does not exist!".to_string()
     })?;
 
     if !user.role.is_mod() {
@@ -2443,13 +2563,14 @@ pub async fn edit_gallery_item_internal(
                 user.id.into(),
                 &**pool,
             )
-            .await?;
+            .await
+            .wrap_internal_err("fetching team member from database")?;
 
         // Hide the project
         if team_member.is_none() && organization_team_member.is_none() {
-            return Err(ApiError::CustomAuthentication(
-                "The specified project does not exist!".to_string(),
-            ));
+            return Err(ApiError::Auth(eyre::eyre!(
+                "The specified project does not exist!",
+            )));
         }
         let permissions = ProjectPermissions::get_permissions_by_role(
             &user.role,
@@ -2459,14 +2580,16 @@ pub async fn edit_gallery_item_internal(
         .unwrap_or_default();
 
         if !permissions.contains(ProjectPermissions::EDIT_DETAILS) {
-            return Err(ApiError::CustomAuthentication(
-                "You don't have permission to edit this project's gallery."
-                    .to_string(),
-            ));
+            return Err(ApiError::Auth(eyre::eyre!(
+                "You don't have permission to edit this project's gallery.",
+            )));
         }
     }
 
-    let mut transaction = pool.begin().await?;
+    let mut transaction = pool
+        .begin()
+        .await
+        .wrap_internal_err("starting database transaction")?;
 
     if let Some(featured) = item.featured {
         if featured {
@@ -2480,7 +2603,8 @@ pub async fn edit_gallery_item_internal(
                 false,
             )
             .execute(&mut transaction)
-            .await?;
+            .await
+            .wrap_internal_err("fetching featured status from database")?;
         }
 
         sqlx::query!(
@@ -2493,7 +2617,10 @@ pub async fn edit_gallery_item_internal(
             featured
         )
         .execute(&mut transaction)
-        .await?;
+        .await
+        .wrap_internal_err(
+            "querying database for `edit_gallery_item_internal`",
+        )?;
     }
     if let Some(name) = item.name {
         sqlx::query!(
@@ -2506,7 +2633,10 @@ pub async fn edit_gallery_item_internal(
             name
         )
         .execute(&mut transaction)
-        .await?;
+        .await
+        .wrap_internal_err(
+            "querying database for `edit_gallery_item_internal`",
+        )?;
     }
     if let Some(description) = item.description {
         sqlx::query!(
@@ -2519,7 +2649,10 @@ pub async fn edit_gallery_item_internal(
             description
         )
         .execute(&mut transaction)
-        .await?;
+        .await
+        .wrap_internal_err(
+            "querying database for `edit_gallery_item_internal`",
+        )?;
     }
     if let Some(ordering) = item.ordering {
         sqlx::query!(
@@ -2532,10 +2665,16 @@ pub async fn edit_gallery_item_internal(
             ordering
         )
         .execute(&mut transaction)
-        .await?;
+        .await
+        .wrap_internal_err(
+            "querying database for `edit_gallery_item_internal`",
+        )?;
     }
 
-    transaction.commit().await?;
+    transaction
+        .commit()
+        .await
+        .wrap_internal_err("committing database transaction")?;
 
     clear_project_cache_and_queue_search(
         &redis,
@@ -2544,7 +2683,8 @@ pub async fn edit_gallery_item_internal(
         project_item.inner.slug,
         None,
     )
-    .await?;
+    .await
+    .wrap_api_err("executing `clear_project_cache_and_queue_search`")?;
 
     Ok(HttpResponse::NoContent().body(""))
 }
@@ -2601,7 +2741,8 @@ pub async fn delete_gallery_item_internal(
         &session_queue,
         Scopes::PROJECT_WRITE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     let item = sqlx::query!(
@@ -2612,12 +2753,13 @@ pub async fn delete_gallery_item_internal(
         item.url
     )
     .fetch_optional(&**pool)
-    .await?
-    .ok_or_else(|| {
-        ApiError::InvalidInput(format!(
-            "Gallery item at URL {} is not part of the project's gallery.",
+    .await
+    .wrap_internal_err("querying database for `delete_gallery_item_internal`")?
+    .wrap_request_err_with(|| {
+        format!(
+            "gallery item at URL `{}` is not part of the project's gallery",
             item.url
-        ))
+        )
     })?;
 
     let project_item = db_models::DBProject::get_id(
@@ -2625,11 +2767,10 @@ pub async fn delete_gallery_item_internal(
         &**pool,
         &redis,
     )
-    .await?
-    .ok_or_else(|| {
-        ApiError::InvalidInput(
-            "The specified project does not exist!".to_string(),
-        )
+    .await
+    .wrap_api_err("fetching project from database")?
+    .wrap_request_err_with(|| {
+        "the specified project does not exist!".to_string()
     })?;
 
     if !user.role.is_mod() {
@@ -2639,13 +2780,14 @@ pub async fn delete_gallery_item_internal(
                 user.id.into(),
                 &**pool,
             )
-            .await?;
+            .await
+            .wrap_internal_err("fetching team member from database")?;
 
         // Hide the project
         if team_member.is_none() && organization_team_member.is_none() {
-            return Err(ApiError::CustomAuthentication(
-                "The specified project does not exist!".to_string(),
-            ));
+            return Err(ApiError::Auth(eyre::eyre!(
+                "The specified project does not exist!",
+            )));
         }
 
         let permissions = ProjectPermissions::get_permissions_by_role(
@@ -2656,10 +2798,9 @@ pub async fn delete_gallery_item_internal(
         .unwrap_or_default();
 
         if !permissions.contains(ProjectPermissions::EDIT_DETAILS) {
-            return Err(ApiError::CustomAuthentication(
-                "You don't have permission to edit this project's gallery."
-                    .to_string(),
-            ));
+            return Err(ApiError::Auth(eyre::eyre!(
+                "You don't have permission to edit this project's gallery.",
+            )));
         }
     }
 
@@ -2669,9 +2810,13 @@ pub async fn delete_gallery_item_internal(
         FileHostPublicity::Public,
         &**file_host,
     )
-    .await?;
+    .await
+    .wrap_api_err("deleting old images")?;
 
-    let mut transaction = pool.begin().await?;
+    let mut transaction = pool
+        .begin()
+        .await
+        .wrap_internal_err("starting database transaction")?;
 
     sqlx::query!(
         "
@@ -2681,9 +2826,15 @@ pub async fn delete_gallery_item_internal(
         item.id
     )
     .execute(&mut transaction)
-    .await?;
+    .await
+    .wrap_internal_err(
+        "querying database for `delete_gallery_item_internal`",
+    )?;
 
-    transaction.commit().await?;
+    transaction
+        .commit()
+        .await
+        .wrap_internal_err("committing database transaction")?;
 
     clear_project_cache_and_queue_search(
         &redis,
@@ -2692,7 +2843,8 @@ pub async fn delete_gallery_item_internal(
         project_item.inner.slug,
         None,
     )
-    .await?;
+    .await
+    .wrap_api_err("executing `clear_project_cache_and_queue_search`")?;
 
     Ok(HttpResponse::NoContent().body(""))
 }
@@ -2730,7 +2882,8 @@ pub async fn project_delete_internal(
         &session_queue,
         Scopes::PROJECT_DELETE,
     )
-    .await?;
+    .await
+    .wrap_auth_err("authenticating API request")?;
     let string = info.into_inner().0;
 
     // In two cases, we return `The specified project does not exist!`:
@@ -2744,7 +2897,7 @@ pub async fn project_delete_internal(
     let project = db_models::DBProject::get(&string, &**pool, &redis)
         .await
         .wrap_internal_err("failed to get project")?
-        .wrap_auth_err("The specified project does not exist!")?;
+        .wrap_auth_err("the specified project does not exist")?;
 
     if !user.role.is_admin() {
         let (team_member, organization_team_member) =
@@ -2771,9 +2924,9 @@ pub async fn project_delete_internal(
         .unwrap_or_default();
 
         if !permissions.contains(ProjectPermissions::DELETE_PROJECT) {
-            return Err(ApiError::CustomAuthentication(
-                "You don't have permission to delete this project!".to_string(),
-            ));
+            return Err(ApiError::Auth(eyre::eyre!(
+                "You don't have permission to delete this project!",
+            )));
         }
     }
 
@@ -2785,7 +2938,10 @@ pub async fn project_delete_internal(
         project.inner.id,
         &mut transaction,
     )
-    .await?;
+    .await
+    .wrap_api_err(
+        "executing `tech_review_sync::sync_deleted_project_tech_review_exit`",
+    )?;
 
     let context = ImageContext::Project {
         project_id: Some(project.inner.id.into()),
@@ -2833,14 +2989,15 @@ pub async fn project_delete_internal(
             None,
             &redis,
         )
-        .await?;
+        .await
+        .wrap_internal_err("clearing cached data from Redis")?;
         search_state
             .queue
             .push_project_removal(project.inner.id.into())
             .await;
         Ok(())
     } else {
-        Err(ApiError::NotFound)
+        Err(ApiError::NotFound(eyre::eyre!("resource not found")))
     }
 }
 
@@ -2874,23 +3031,26 @@ pub async fn project_follow_internal(
         &session_queue,
         Scopes::USER_WRITE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
     let string = info.into_inner().0;
 
     let result = db_models::DBProject::get(&string, &**pool, &redis)
-        .await?
-        .ok_or_else(|| {
-            ApiError::InvalidInput(
-                "The specified project does not exist!".to_string(),
-            )
+        .await
+        .wrap_api_err("fetching project from database")?
+        .wrap_request_err_with(|| {
+            "the specified project does not exist!".to_string()
         })?;
 
     let user_id: db_ids::DBUserId = user.id.into();
     let project_id: db_ids::DBProjectId = result.inner.id;
 
-    if !is_visible_project(&result.inner, &Some(user), &pool, false).await? {
-        return Err(ApiError::NotFound);
+    if !is_visible_project(&result.inner, &Some(user), &pool, false)
+        .await
+        .wrap_api_err("checking project visibility")?
+    {
+        return Err(ApiError::NotFound(eyre::eyre!("resource not found")));
     }
 
     let following = sqlx::query!(
@@ -2901,12 +3061,15 @@ pub async fn project_follow_internal(
         project_id as db_ids::DBProjectId
     )
     .fetch_one(&**pool)
-    .await?
+    .await.wrap_internal_err("fetching project follow status from database")?
     .exists
     .unwrap_or(false);
 
     if !following {
-        let mut transaction = pool.begin().await?;
+        let mut transaction = pool
+            .begin()
+            .await
+            .wrap_internal_err("starting database transaction")?;
 
         sqlx::query!(
             "
@@ -2917,7 +3080,8 @@ pub async fn project_follow_internal(
             project_id as db_ids::DBProjectId,
         )
         .execute(&mut transaction)
-        .await?;
+        .await
+        .wrap_internal_err("querying database for `project_follow_internal`")?;
 
         sqlx::query!(
             "
@@ -2928,15 +3092,19 @@ pub async fn project_follow_internal(
             project_id as db_ids::DBProjectId
         )
         .execute(&mut transaction)
-        .await?;
+        .await
+        .wrap_internal_err("querying database for `project_follow_internal`")?;
 
-        transaction.commit().await?;
+        transaction
+            .commit()
+            .await
+            .wrap_internal_err("committing database transaction")?;
 
         Ok(HttpResponse::NoContent().body(""))
     } else {
-        Err(ApiError::InvalidInput(
-            "You are already following this project!".to_string(),
-        ))
+        Err(ApiError::Request(eyre::eyre!(
+            "You are already following this project!",
+        )))
     }
 }
 
@@ -2970,16 +3138,16 @@ pub async fn project_unfollow_internal(
         &session_queue,
         Scopes::USER_WRITE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
     let string = info.into_inner().0;
 
     let result = db_models::DBProject::get(&string, &**pool, &redis)
-        .await?
-        .ok_or_else(|| {
-            ApiError::InvalidInput(
-                "The specified project does not exist!".to_string(),
-            )
+        .await
+        .wrap_api_err("fetching project from database")?
+        .wrap_request_err_with(|| {
+            "the specified project does not exist!".to_string()
         })?;
 
     let user_id: db_ids::DBUserId = user.id.into();
@@ -2993,12 +3161,15 @@ pub async fn project_unfollow_internal(
         project_id as db_ids::DBProjectId
     )
     .fetch_one(&**pool)
-    .await?
+    .await.wrap_internal_err("fetching project follow status from database")?
     .exists
     .unwrap_or(false);
 
     if following {
-        let mut transaction = pool.begin().await?;
+        let mut transaction = pool
+            .begin()
+            .await
+            .wrap_internal_err("starting database transaction")?;
 
         sqlx::query!(
             "
@@ -3009,7 +3180,10 @@ pub async fn project_unfollow_internal(
             project_id as db_ids::DBProjectId,
         )
         .execute(&mut transaction)
-        .await?;
+        .await
+        .wrap_internal_err(
+            "querying database for `project_unfollow_internal`",
+        )?;
 
         sqlx::query!(
             "
@@ -3020,15 +3194,21 @@ pub async fn project_unfollow_internal(
             project_id as db_ids::DBProjectId
         )
         .execute(&mut transaction)
-        .await?;
+        .await
+        .wrap_internal_err(
+            "querying database for `project_unfollow_internal`",
+        )?;
 
-        transaction.commit().await?;
+        transaction
+            .commit()
+            .await
+            .wrap_internal_err("committing database transaction")?;
 
         Ok(HttpResponse::NoContent().body(""))
     } else {
-        Err(ApiError::InvalidInput(
-            "You are not following this project!".to_string(),
-        ))
+        Err(ApiError::Request(eyre::eyre!(
+            "You are not following this project!",
+        )))
     }
 }
 
@@ -3059,25 +3239,26 @@ pub async fn project_get_organization(
 
     let string = info.into_inner().0;
     let result = db_models::DBProject::get(&string, &**pool, &redis)
-        .await?
-        .ok_or_else(|| {
-            ApiError::InvalidInput(
-                "The specified project does not exist!".to_string(),
-            )
+        .await
+        .wrap_api_err("fetching project from database")?
+        .wrap_request_err_with(|| {
+            "the specified project does not exist!".to_string()
         })?;
 
-    if !is_visible_project(&result.inner, &current_user, &pool, false).await? {
-        Err(ApiError::InvalidInput(
-            "The specified project does not exist!".to_string(),
-        ))
+    if !is_visible_project(&result.inner, &current_user, &pool, false)
+        .await
+        .wrap_api_err("checking project visibility")?
+    {
+        Err(ApiError::Request(eyre::eyre!(
+            "The specified project does not exist!",
+        )))
     } else if let Some(organization_id) = result.inner.organization_id {
         let organization =
             db_models::DBOrganization::get_id(organization_id, &**pool, &redis)
-                .await?
-                .ok_or_else(|| {
-                    ApiError::InvalidInput(
-                        "The attached organization does not exist!".to_string(),
-                    )
+                .await
+                .wrap_internal_err("fetching organization from database")?
+                .wrap_request_err_with(|| {
+                    "the attached organization does not exist!".to_string()
                 })?;
 
         let members_data = DBTeamMember::get_from_team_full(
@@ -3085,14 +3266,16 @@ pub async fn project_get_organization(
             &**pool,
             &redis,
         )
-        .await?;
+        .await
+        .wrap_internal_err("fetching team members from database")?;
 
         let users = crate::database::models::DBUser::get_many_ids(
             &members_data.iter().map(|x| x.user_id).collect::<Vec<_>>(),
             &**pool,
             &redis,
         )
-        .await?;
+        .await
+        .wrap_internal_err("fetching users from database")?;
         let logged_in = current_user
             .as_ref()
             .and_then(|user| {
@@ -3127,6 +3310,6 @@ pub async fn project_get_organization(
         );
         Ok(HttpResponse::Ok().json(organization))
     } else {
-        Err(ApiError::NotFound)
+        Err(ApiError::NotFound(eyre::eyre!("resource not found")))
     }
 }
diff --git a/apps/labrinth/src/routes/v3/reports.rs b/apps/labrinth/src/routes/v3/reports.rs
index 04dc2b3028..a3bba51279 100644
--- a/apps/labrinth/src/routes/v3/reports.rs
+++ b/apps/labrinth/src/routes/v3/reports.rs
@@ -17,6 +17,7 @@ use crate::models::reports::{ItemType, Report};
 use crate::models::threads::{MessageBody, ThreadType};
 use crate::queue::session::AuthQueue;
 use crate::routes::ApiError;
+use crate::util::error::ApiContext as _;
 use crate::util::error::Context;
 use crate::util::http::HTTP_CLIENT;
 use crate::util::img;
@@ -73,7 +74,10 @@ pub async fn report_create(
     redis: web::Data<RedisPool>,
     session_queue: web::Data<AuthQueue>,
 ) -> Result<HttpResponse, ApiError> {
-    let mut transaction = pool.begin().await?;
+    let mut transaction = pool
+        .begin()
+        .await
+        .wrap_internal_err("starting database transaction")?;
 
     let current_user = get_user_from_headers(
         &req,
@@ -82,23 +86,25 @@ pub async fn report_create(
         &session_queue,
         Scopes::REPORT_CREATE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
-    let new_report: CreateReport = read_typed_from_payload(&mut body).await?;
+    let new_report: CreateReport = read_typed_from_payload(&mut body)
+        .await
+        .wrap_api_err("reading request payload")?;
 
-    let id =
-        crate::database::models::generate_report_id(&mut transaction).await?;
+    let id = crate::database::models::generate_report_id(&mut transaction)
+        .await
+        .wrap_internal_err("generating report ID")?;
     let report_type = crate::database::models::categories::ReportType::get_id(
         &new_report.report_type,
         &mut transaction,
     )
-    .await?
-    .ok_or_else(|| {
-        ApiError::InvalidInput(format!(
-            "Invalid report type: {}",
-            new_report.report_type
-        ))
+    .await
+    .wrap_internal_err("generating report ID")?
+    .wrap_request_err_with(|| {
+        format!("invalid report type: `{}`", new_report.report_type)
     })?;
 
     let mut report = crate::database::models::report_item::DBReport {
@@ -117,60 +123,70 @@ pub async fn report_create(
 
     match new_report.item_type {
         ItemType::Project => {
-            let project_id =
-                ProjectId(parse_base62(new_report.item_id.as_str())?);
+            let project_id = ProjectId(
+                parse_base62(new_report.item_id.as_str())
+                    .wrap_request_err("parsing reported project ID")?,
+            );
 
             let result = sqlx::query!(
                 "SELECT EXISTS(SELECT 1 FROM mods WHERE id = $1)",
                 project_id.0 as i64
             )
             .fetch_one(&mut transaction)
-            .await?;
+            .await
+            .wrap_internal_err("querying database for `report_create`")?;
 
             if !result.exists.unwrap_or(false) {
-                return Err(ApiError::InvalidInput(format!(
+                return Err(ApiError::Request(eyre::eyre!(format!(
                     "Project could not be found: {}",
                     new_report.item_id
-                )));
+                ))));
             }
 
             report.project_id = Some(project_id.into())
         }
         ItemType::Version => {
-            let version_id =
-                VersionId(parse_base62(new_report.item_id.as_str())?);
+            let version_id = VersionId(
+                parse_base62(new_report.item_id.as_str())
+                    .wrap_request_err("parsing reported version ID")?,
+            );
 
             let result = sqlx::query!(
                 "SELECT EXISTS(SELECT 1 FROM versions WHERE id = $1)",
                 version_id.0 as i64
             )
             .fetch_one(&mut transaction)
-            .await?;
+            .await
+            .wrap_internal_err("querying database for `report_create`")?;
 
             if !result.exists.unwrap_or(false) {
-                return Err(ApiError::InvalidInput(format!(
+                return Err(ApiError::Request(eyre::eyre!(format!(
                     "Version could not be found: {}",
                     new_report.item_id
-                )));
+                ))));
             }
 
             report.version_id = Some(version_id.into())
         }
         ItemType::User => {
-            let user_id = UserId(parse_base62(new_report.item_id.as_str())?);
+            let user_id = UserId(
+                parse_base62(new_report.item_id.as_str())
+                    .wrap_request_err("parsing reported user ID")?,
+            );
 
             let result = sqlx::query!(
                 "SELECT EXISTS(SELECT 1 FROM users WHERE id = $1)",
                 user_id.0 as i64
             )
             .fetch_one(&mut transaction)
-            .await?;
+            .await
+            .wrap_internal_err("querying database for `report_create`")?;
 
             if !result.exists.unwrap_or(false) {
-                return Err(ApiError::InvalidInput(format!(
+                return Err(ApiError::Request(eyre::eyre!(format!(
                     "User could not be found: {}",
                     new_report.item_id
-                )));
+                ))));
             }
 
             report.user_id = Some(user_id.into())
@@ -180,21 +196,18 @@ pub async fn report_create(
             let (instance_part, version_part) = new_report
                 .item_id
                 .split_once('/')
-                .ok_or_else(|| {
-                    ApiError::InvalidInput(
-                        "Shared instance reports must format the item ID as `instance_id/version_id`"
-                            .to_string(),
-                    )
-                })?;
+                .wrap_request_err_with(|| "shared instance reports must format the item ID as `instance_id/version_id`"
+                            .to_string())?;
 
-            let shared_instance_id =
-                SharedInstanceId(parse_base62(instance_part)? as i64);
+            let shared_instance_id = SharedInstanceId(
+                parse_base62(instance_part)
+                    .wrap_request_err("parsing reported shared instance ID")?
+                    as i64,
+            );
             let shared_instance_version_id: i32 =
-                version_part.parse().map_err(|_| {
-                    ApiError::InvalidInput(format!(
-                        "Shared instance version is not a number: {version_part}"
-                    ))
-                })?;
+                version_part.parse().wrap_request_err(format!(
+                    "shared instance version is not a number: `{version_part}`"
+                ))?;
 
             // validation
             let url = format!(
@@ -212,9 +225,9 @@ pub async fn report_create(
                 )?;
 
             if !instance_response.status().is_success() {
-                return Err(ApiError::InvalidInput(format!(
+                return Err(ApiError::Request(eyre::eyre!(format!(
                     "Shared instance could not be found: {instance_part}"
-                )));
+                ))));
             }
 
             let version_response = HTTP_CLIENT
@@ -225,36 +238,40 @@ pub async fn report_create(
                 .wrap_internal_err("failed to reach the shared instance service (version lookup)")?;
 
             if !version_response.status().is_success() {
-                return Err(ApiError::InvalidInput(format!(
+                return Err(ApiError::Request(eyre::eyre!(format!(
                     "Shared instance version could not be found: {instance_part}/{version_part}"
-                )));
+                ))));
             }
 
             report.shared_instance_id = Some(shared_instance_id);
             report.shared_instance_version_id = Some(shared_instance_version_id)
         }
         ItemType::Unknown => {
-            return Err(ApiError::InvalidInput(format!(
+            return Err(ApiError::Request(eyre::eyre!(format!(
                 "Invalid report item type: {}",
                 new_report.item_type.as_str()
-            )));
+            ))));
         }
     }
 
-    report.insert(&mut transaction).await?;
+    report
+        .insert(&mut transaction)
+        .await
+        .wrap_internal_err("inserting database records for `report_create`")?;
 
     for image_id in new_report.uploaded_images {
         if let Some(db_image) =
             image_item::DBImage::get(image_id.into(), &mut transaction, &redis)
-                .await?
+                .await
+                .wrap_internal_err("fetching image from database")?
         {
             let image: Image = db_image.into();
             if !matches!(image.context, ImageContext::Report { .. })
                 || image.context.inner_id().is_some()
             {
-                return Err(ApiError::InvalidInput(format!(
+                return Err(ApiError::Request(eyre::eyre!(format!(
                     "Image {image_id} is not unused and in the 'report' context"
-                )));
+                ))));
             }
 
             sqlx::query!(
@@ -267,13 +284,16 @@ pub async fn report_create(
                 image_id.0 as i64
             )
             .execute(&mut transaction)
-            .await?;
+            .await
+            .wrap_internal_err("querying database for `report_create`")?;
 
-            image_item::DBImage::clear_cache(image.id.into(), &redis).await?;
+            image_item::DBImage::clear_cache(image.id.into(), &redis)
+                .await
+                .wrap_internal_err("clearing cached data from Redis")?;
         } else {
-            return Err(ApiError::InvalidInput(format!(
+            return Err(ApiError::Request(eyre::eyre!(format!(
                 "Image {image_id} could not be found"
-            )));
+            ))));
         }
     }
 
@@ -284,7 +304,8 @@ pub async fn report_create(
         report_id: Some(report.id),
     }
     .insert(&mut transaction)
-    .await?;
+    .await
+    .wrap_internal_err("inserting database records for `report_create`")?;
 
     // Notify the reporter that the report has been submitted
     NotificationBuilder {
@@ -293,9 +314,13 @@ pub async fn report_create(
         },
     }
     .insert(current_user.id.into(), &mut transaction, &redis)
-    .await?;
+    .await
+    .wrap_internal_err("inserting database records for `report_create`")?;
 
-    transaction.commit().await?;
+    transaction
+        .commit()
+        .await
+        .wrap_internal_err("committing database transaction")?;
 
     Ok(HttpResponse::Ok().json(Report {
         id: id.into(),
@@ -362,7 +387,8 @@ pub async fn reports(
         &session_queue,
         Scopes::REPORT_READ,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     use futures::stream::TryStreamExt;
@@ -382,7 +408,8 @@ pub async fn reports(
         .fetch(&**pool)
         .map_ok(|m| crate::database::models::ids::DBReportId(m.id))
         .try_collect::<Vec<crate::database::models::ids::DBReportId>>()
-        .await?
+        .await
+        .wrap_internal_err("fetching report IDs from database")?
     } else {
         sqlx::query!(
             "
@@ -399,7 +426,8 @@ pub async fn reports(
         .fetch(&**pool)
         .map_ok(|m| crate::database::models::ids::DBReportId(m.id))
         .try_collect::<Vec<crate::database::models::ids::DBReportId>>()
-        .await?
+        .await
+        .wrap_internal_err("querying database for `reports`")?
     };
 
     let query_reports =
@@ -407,7 +435,8 @@ pub async fn reports(
             &report_ids,
             &**pool,
         )
-        .await?;
+        .await
+        .wrap_internal_err("fetching reports from database")?;
 
     let mut reports: Vec<Report> = Vec::new();
 
@@ -447,7 +476,8 @@ pub async fn reports_get(
     session_queue: web::Data<AuthQueue>,
 ) -> Result<HttpResponse, ApiError> {
     let report_ids: Vec<crate::database::models::ids::DBReportId> =
-        serde_json::from_str::<Vec<crate::models::ids::ReportId>>(&ids.ids)?
+        serde_json::from_str::<Vec<crate::models::ids::ReportId>>(&ids.ids)
+            .wrap_request_err("deserializing JSON data")?
             .into_iter()
             .map(|x| x.into())
             .collect();
@@ -457,7 +487,8 @@ pub async fn reports_get(
             &report_ids,
             &**pool,
         )
-        .await?;
+        .await
+        .wrap_internal_err("fetching reports from database")?;
 
     let user = get_user_from_headers(
         &req,
@@ -466,7 +497,8 @@ pub async fn reports_get(
         &session_queue,
         Scopes::REPORT_READ,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     let all_reports = reports_data
@@ -504,23 +536,25 @@ pub async fn report_get(
         &session_queue,
         Scopes::REPORT_READ,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
     let id = info.into_inner().0.into();
 
     let report =
         crate::database::models::report_item::DBReport::get(id, &**pool)
-            .await?;
+            .await
+            .wrap_internal_err("fetching report from database")?;
 
     if let Some(report) = report {
         if !user.role.is_mod() && report.reporter != user.id.into() {
-            return Err(ApiError::NotFound);
+            return Err(ApiError::NotFound(eyre::eyre!("resource not found")));
         }
 
         let report: Report = report.into();
         Ok(HttpResponse::Ok().json(report))
     } else {
-        Err(ApiError::NotFound)
+        Err(ApiError::NotFound(eyre::eyre!("resource not found")))
     }
 }
 
@@ -559,20 +593,25 @@ pub async fn report_edit(
         &session_queue,
         Scopes::REPORT_WRITE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
     let id = info.into_inner().0.into();
 
     let report =
         crate::database::models::report_item::DBReport::get(id, &**pool)
-            .await?;
+            .await
+            .wrap_internal_err("fetching report from database")?;
 
     if let Some(report) = report {
         if !user.role.is_mod() && report.reporter != user.id.into() {
-            return Err(ApiError::NotFound);
+            return Err(ApiError::NotFound(eyre::eyre!("resource not found")));
         }
 
-        let mut transaction = pool.begin().await?;
+        let mut transaction = pool
+            .begin()
+            .await
+            .wrap_internal_err("starting database transaction")?;
 
         if let Some(edit_body) = &edit_report.body {
             sqlx::query!(
@@ -585,14 +624,15 @@ pub async fn report_edit(
                 id as crate::database::models::ids::DBReportId,
             )
             .execute(&mut transaction)
-            .await?;
+            .await
+            .wrap_internal_err("updating edit body in database")?;
         }
 
         if let Some(edit_closed) = edit_report.closed {
             if !user.role.is_mod() {
-                return Err(ApiError::InvalidInput(
-                    "You cannot reopen a report!".to_string(),
-                ));
+                return Err(ApiError::Request(eyre::eyre!(
+                    "You cannot reopen a report!",
+                )));
             }
 
             ThreadMessageBuilder {
@@ -606,7 +646,10 @@ pub async fn report_edit(
                 hide_identity: user.role.is_mod(),
             }
             .insert(&mut transaction)
-            .await?;
+            .await
+            .wrap_internal_err(
+                "inserting database records for `report_edit`",
+            )?;
 
             NotificationBuilder {
                 body: NotificationBody::ReportStatusUpdated {
@@ -614,7 +657,10 @@ pub async fn report_edit(
                 },
             }
             .insert(report.reporter, &mut transaction, &redis)
-            .await?;
+            .await
+            .wrap_internal_err(
+                "inserting database records for `report_edit`",
+            )?;
 
             sqlx::query!(
                 "
@@ -626,7 +672,8 @@ pub async fn report_edit(
                 id as crate::database::models::ids::DBReportId,
             )
             .execute(&mut transaction)
-            .await?;
+            .await
+            .wrap_internal_err("updating database records for `report_edit`")?;
         }
 
         // delete any images no longer in the body
@@ -643,13 +690,17 @@ pub async fn report_edit(
             &mut transaction,
             &redis,
         )
-        .await?;
+        .await
+        .wrap_api_err("deleting unused images")?;
 
-        transaction.commit().await?;
+        transaction
+            .commit()
+            .await
+            .wrap_internal_err("committing database transaction")?;
 
         Ok(HttpResponse::NoContent().body(""))
     } else {
-        Err(ApiError::NotFound)
+        Err(ApiError::NotFound(eyre::eyre!("resource not found")))
     }
 }
 
@@ -679,9 +730,13 @@ pub async fn report_delete(
         &session_queue,
         Scopes::REPORT_DELETE,
     )
-    .await?;
+    .await
+    .wrap_auth_err("authenticating API request")?;
 
-    let mut transaction = pool.begin().await?;
+    let mut transaction = pool
+        .begin()
+        .await
+        .wrap_internal_err("starting database transaction")?;
 
     let id = info.into_inner().0;
     let context = ImageContext::Report {
@@ -691,21 +746,28 @@ pub async fn report_delete(
         context,
         &mut transaction,
     )
-    .await?;
+    .await
+    .wrap_internal_err("fetching images from database")?;
     for image in uploaded_images {
-        image_item::DBImage::remove(image.id, &mut transaction, &redis).await?;
+        image_item::DBImage::remove(image.id, &mut transaction, &redis)
+            .await
+            .wrap_internal_err("deleting image from database")?;
     }
 
     let result = crate::database::models::report_item::DBReport::remove_full(
         id.into(),
         &mut transaction,
     )
-    .await?;
-    transaction.commit().await?;
+    .await
+    .wrap_internal_err("deleting report from database")?;
+    transaction
+        .commit()
+        .await
+        .wrap_internal_err("committing database transaction")?;
 
     if result.is_some() {
         Ok(HttpResponse::NoContent().body(""))
     } else {
-        Err(ApiError::NotFound)
+        Err(ApiError::NotFound(eyre::eyre!("resource not found")))
     }
 }
diff --git a/apps/labrinth/src/routes/v3/statistics.rs b/apps/labrinth/src/routes/v3/statistics.rs
index c09797e5de..b607eac5ab 100644
--- a/apps/labrinth/src/routes/v3/statistics.rs
+++ b/apps/labrinth/src/routes/v3/statistics.rs
@@ -1,5 +1,6 @@
 use crate::database::PgPool;
 use crate::routes::ApiError;
+use crate::util::error::Context as _;
 use actix_web::{HttpResponse, get, web};
 
 pub fn config(cfg: &mut actix_web::web::ServiceConfig) {
@@ -37,7 +38,8 @@ pub async fn get_stats(
             .collect::<Vec<String>>(),
     )
     .fetch_one(&**pool)
-    .await?;
+    .await
+    .wrap_internal_err("counting projects")?;
 
     let versions = sqlx::query!(
         "
@@ -56,7 +58,8 @@ pub async fn get_stats(
             .collect::<Vec<String>>(),
     )
     .fetch_one(&**pool)
-    .await?;
+    .await
+    .wrap_internal_err("counting versions")?;
 
     let authors = sqlx::query!(
         "
@@ -71,7 +74,8 @@ pub async fn get_stats(
             .collect::<Vec<String>>(),
     )
     .fetch_one(&**pool)
-    .await?;
+    .await
+    .wrap_internal_err("counting project authors")?;
 
     let files = sqlx::query!(
         "
@@ -89,7 +93,8 @@ pub async fn get_stats(
             .collect::<Vec<String>>(),
     )
     .fetch_one(&**pool)
-    .await?;
+    .await
+    .wrap_internal_err("counting version files")?;
 
     let v3_stats = V3Stats {
         projects: projects.count,
diff --git a/apps/labrinth/src/routes/v3/tags.rs b/apps/labrinth/src/routes/v3/tags.rs
index 4c1589cbbc..2a2b638fb9 100644
--- a/apps/labrinth/src/routes/v3/tags.rs
+++ b/apps/labrinth/src/routes/v3/tags.rs
@@ -1,3 +1,4 @@
+use crate::util::error::Context as _;
 use std::collections::HashMap;
 
 use super::ApiError;
@@ -49,7 +50,8 @@ pub async fn games_list(
     redis: web::Data<RedisPool>,
 ) -> Result<HttpResponse, ApiError> {
     let results = Game::list(&**pool, &redis)
-        .await?
+        .await
+        .wrap_internal_err("fetching game from Redis")?
         .into_iter()
         .map(|x| GameData {
             slug: x.slug,
@@ -84,7 +86,8 @@ pub async fn category_list(
     redis: web::Data<RedisPool>,
 ) -> Result<HttpResponse, ApiError> {
     let results = Category::list(&**pool, &redis)
-        .await?
+        .await
+        .wrap_internal_err("fetching category from Redis")?
         .into_iter()
         .map(|x| CategoryData {
             icon: x.icon,
@@ -120,14 +123,17 @@ pub async fn loader_list(
     pool: web::Data<PgPool>,
     redis: web::Data<RedisPool>,
 ) -> Result<HttpResponse, ApiError> {
-    let loaders = Loader::list(&**pool, &redis).await?;
+    let loaders = Loader::list(&**pool, &redis)
+        .await
+        .wrap_internal_err("fetching loader from Redis")?;
 
     let loader_fields = LoaderField::get_fields_per_loader(
         &loaders.iter().map(|x| x.id).collect_vec(),
         &**pool,
         &redis,
     )
-    .await?;
+    .await
+    .wrap_internal_err("fetching loader field from Redis")?;
 
     let mut results = loaders
         .into_iter()
@@ -180,25 +186,23 @@ pub async fn loader_fields_list(
 ) -> Result<HttpResponse, ApiError> {
     let query = query.into_inner();
     let loader_field = LoaderField::get_fields_all(&**pool, &redis)
-        .await?
+        .await
+        .wrap_internal_err("fetching loader field from Redis")?
         .into_iter()
         .find(|x| x.field == query.loader_field)
-        .ok_or_else(|| {
-            ApiError::InvalidInput(format!(
-                "'{}' was not a valid loader field.",
-                query.loader_field
-            ))
+        .wrap_request_err_with(|| {
+            format!("'{}' was not a valid loader field.", query.loader_field)
         })?;
 
     let (LoaderFieldType::Enum(loader_field_enum_id)
     | LoaderFieldType::ArrayEnum(loader_field_enum_id)) =
         loader_field.field_type
     else {
-        return Err(ApiError::InvalidInput(format!(
+        return Err(ApiError::Request(eyre::eyre!(format!(
             "'{}' is not an enumerable field, but an '{}' field.",
             query.loader_field,
             loader_field.field_type.to_str()
-        )));
+        ))));
     };
 
     let results: Vec<_> = if let Some(filters) = query.filters {
@@ -208,10 +212,12 @@ pub async fn loader_fields_list(
             &**pool,
             &redis,
         )
-        .await?
+        .await
+        .wrap_internal_err("fetching loader field enum value from Redis")?
     } else {
         LoaderFieldEnumValue::list(loader_field_enum_id, &**pool, &redis)
-            .await?
+            .await
+            .wrap_internal_err("fetching loader field enum value from Redis")?
     };
 
     Ok(HttpResponse::Ok().json(results))
@@ -276,9 +282,9 @@ pub async fn license_text(
         }));
     }
 
-    Err(ApiError::InvalidInput(
-        "Invalid SPDX identifier specified".to_string(),
-    ))
+    Err(ApiError::Request(eyre::eyre!(
+        "Invalid SPDX identifier specified",
+    )))
 }
 
 #[derive(serde::Serialize, serde::Deserialize)]
@@ -302,7 +308,8 @@ pub async fn link_platform_list(
 ) -> Result<HttpResponse, ApiError> {
     let results: Vec<LinkPlatformQueryData> =
         LinkPlatform::list(&**pool, &redis)
-            .await?
+            .await
+            .wrap_internal_err("reading HTTP response body")?
             .into_iter()
             .map(|x| LinkPlatformQueryData {
                 name: x.name,
@@ -325,7 +332,9 @@ pub async fn report_type_list(
     pool: web::Data<PgPool>,
     redis: web::Data<RedisPool>,
 ) -> Result<HttpResponse, ApiError> {
-    let results = ReportType::list(&**pool, &redis).await?;
+    let results = ReportType::list(&**pool, &redis)
+        .await
+        .wrap_internal_err("reading HTTP response body")?;
     Ok(HttpResponse::Ok().json(results))
 }
 
@@ -342,6 +351,8 @@ pub async fn project_type_list(
     pool: web::Data<PgPool>,
     redis: web::Data<RedisPool>,
 ) -> Result<HttpResponse, ApiError> {
-    let results = ProjectType::list(&**pool, &redis).await?;
+    let results = ProjectType::list(&**pool, &redis)
+        .await
+        .wrap_internal_err("fetching project type from Redis")?;
     Ok(HttpResponse::Ok().json(results))
 }
diff --git a/apps/labrinth/src/routes/v3/teams.rs b/apps/labrinth/src/routes/v3/teams.rs
index 3cc0b127e8..5cb8e173bb 100644
--- a/apps/labrinth/src/routes/v3/teams.rs
+++ b/apps/labrinth/src/routes/v3/teams.rs
@@ -11,6 +11,7 @@ use crate::models::pats::Scopes;
 use crate::models::teams::{OrganizationPermissions, ProjectPermissions};
 use crate::queue::session::AuthQueue;
 use crate::routes::ApiError;
+use crate::util::error::ApiContext as _;
 use crate::util::error::Context;
 use actix_web::{HttpRequest, HttpResponse, delete, get, patch, post, web};
 use ariadne::ids::UserId;
@@ -61,7 +62,8 @@ pub async fn team_members_get_project_internal(
     let string = info.into_inner().0;
     let project_data =
         crate::database::models::DBProject::get(&string, &**pool, &redis)
-            .await?;
+            .await
+            .wrap_api_err("fetching project from database")?;
 
     if let Some(project) = project_data {
         let current_user = get_user_from_headers(
@@ -76,22 +78,25 @@ pub async fn team_members_get_project_internal(
         .ok();
 
         if !is_visible_project(&project.inner, &current_user, &pool, false)
-            .await?
+            .await
+            .wrap_api_err("checking project visibility")?
         {
-            return Err(ApiError::NotFound);
+            return Err(ApiError::NotFound(eyre::eyre!("resource not found")));
         }
         let members_data = DBTeamMember::get_from_team_full(
             project.inner.team_id,
             &**pool,
             &redis,
         )
-        .await?;
+        .await
+        .wrap_internal_err("fetching team members from database")?;
         let users = DBUser::get_many_ids(
             &members_data.iter().map(|x| x.user_id).collect::<Vec<_>>(),
             &**pool,
             &redis,
         )
-        .await?;
+        .await
+        .wrap_internal_err("fetching users from database")?;
 
         let user_id = current_user.as_ref().map(|x| x.id.into());
         let logged_in = if let Some(user_id) = user_id {
@@ -101,7 +106,8 @@ pub async fn team_members_get_project_internal(
                     user_id,
                     &**pool,
                 )
-                .await?;
+                .await
+                .wrap_internal_err("fetching team member from database")?;
 
             team_member.is_some() || organization_team_member.is_some()
         } else {
@@ -130,7 +136,7 @@ pub async fn team_members_get_project_internal(
 
         Ok(HttpResponse::Ok().json(team_members))
     } else {
-        Err(ApiError::NotFound)
+        Err(ApiError::NotFound(eyre::eyre!("resource not found")))
     }
 }
 
@@ -146,7 +152,8 @@ pub async fn team_members_get_organization(
     let string = info.into_inner().0;
     let organization_data =
         crate::database::models::DBOrganization::get(&string, &**pool, &redis)
-            .await?;
+            .await
+            .wrap_internal_err("fetching organization from database")?;
 
     let current_user = get_user_from_headers(
         &req,
@@ -161,20 +168,23 @@ pub async fn team_members_get_organization(
 
     if let Some(organization) = organization_data
         && is_visible_organization(&organization, &current_user, &pool, &redis)
-            .await?
+            .await
+            .wrap_api_err("checking organization visibility")?
     {
         let members_data = DBTeamMember::get_from_team_full(
             organization.team_id,
             &**pool,
             &redis,
         )
-        .await?;
+        .await
+        .wrap_internal_err("fetching team members from database")?;
         let users = crate::database::models::DBUser::get_many_ids(
             &members_data.iter().map(|x| x.user_id).collect::<Vec<_>>(),
             &**pool,
             &redis,
         )
-        .await?;
+        .await
+        .wrap_internal_err("fetching users from database")?;
 
         let user_id = current_user.as_ref().map(|x| x.id.into());
 
@@ -208,7 +218,7 @@ pub async fn team_members_get_organization(
 
         Ok(HttpResponse::Ok().json(team_members))
     } else {
-        Err(ApiError::NotFound)
+        Err(ApiError::NotFound(eyre::eyre!("resource not found")))
     }
 }
 
@@ -234,13 +244,16 @@ pub async fn team_members_get(
 ) -> Result<HttpResponse, ApiError> {
     let id = info.into_inner().0;
     let members_data =
-        DBTeamMember::get_from_team_full(id.into(), &**pool, &redis).await?;
+        DBTeamMember::get_from_team_full(id.into(), &**pool, &redis)
+            .await
+            .wrap_internal_err("fetching team members from database")?;
     let users = crate::database::models::DBUser::get_many_ids(
         &members_data.iter().map(|x| x.user_id).collect::<Vec<_>>(),
         &**pool,
         &redis,
     )
-    .await?;
+    .await
+    .wrap_internal_err("fetching users from database")?;
 
     let current_user = get_user_from_headers(
         &req,
@@ -315,20 +328,23 @@ pub async fn teams_get(
 ) -> Result<HttpResponse, ApiError> {
     use itertools::Itertools;
 
-    let team_ids = serde_json::from_str::<Vec<TeamId>>(&ids.ids)?
+    let team_ids = serde_json::from_str::<Vec<TeamId>>(&ids.ids)
+        .wrap_request_err("deserializing JSON data")?
         .into_iter()
         .map(|x| x.into())
         .collect::<Vec<crate::database::models::ids::DBTeamId>>();
 
     let teams_data =
         DBTeamMember::get_from_team_full_many(&team_ids, &**pool, &redis)
-            .await?;
+            .await
+            .wrap_internal_err("fetching team members from database")?;
     let users = crate::database::models::DBUser::get_many_ids(
         &teams_data.iter().map(|x| x.user_id).collect::<Vec<_>>(),
         &**pool,
         &redis,
     )
-    .await?;
+    .await
+    .wrap_internal_err("fetching users from database")?;
 
     let current_user = get_user_from_headers(
         &req,
@@ -403,7 +419,8 @@ pub async fn join_team(
         &session_queue,
         Scopes::PROJECT_WRITE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     let member = DBTeamMember::get_from_user_id_pending(
@@ -411,15 +428,19 @@ pub async fn join_team(
         current_user.id.into(),
         &**pool,
     )
-    .await?;
+    .await
+    .wrap_internal_err("fetching team member from database")?;
 
     if let Some(member) = member {
         if member.accepted {
-            return Err(ApiError::InvalidInput(
-                "You are already a member of this team".to_string(),
-            ));
+            return Err(ApiError::Request(eyre::eyre!(
+                "You are already a member of this team",
+            )));
         }
-        let mut transaction = pool.begin().await?;
+        let mut transaction = pool
+            .begin()
+            .await
+            .wrap_internal_err("starting database transaction")?;
 
         // Edit Team Member to set Accepted to True
         DBTeamMember::edit_team_member(
@@ -434,16 +455,24 @@ pub async fn join_team(
             None,
             &mut transaction,
         )
-        .await?;
+        .await
+        .wrap_internal_err("updating team member in database")?;
 
-        transaction.commit().await?;
+        transaction
+            .commit()
+            .await
+            .wrap_internal_err("committing database transaction")?;
 
-        DBUser::clear_project_cache(&[current_user.id.into()], &redis).await?;
-        DBTeamMember::clear_cache(team_id, &redis).await?;
+        DBUser::clear_project_cache(&[current_user.id.into()], &redis)
+            .await
+            .wrap_internal_err("clearing cached user in Redis")?;
+        DBTeamMember::clear_cache(team_id, &redis)
+            .await
+            .wrap_internal_err("clearing cached data from Redis")?;
     } else {
-        return Err(ApiError::InvalidInput(
-            "There is no pending request from this team".to_string(),
-        ));
+        return Err(ApiError::Request(eyre::eyre!(
+            "There is no pending request from this team",
+        )));
     }
 
     Ok(HttpResponse::NoContent().body(""))
@@ -496,7 +525,10 @@ pub async fn add_team_member(
 ) -> Result<HttpResponse, ApiError> {
     let team_id = info.into_inner().0.into();
 
-    let mut transaction = pool.begin().await?;
+    let mut transaction = pool
+        .begin()
+        .await
+        .wrap_internal_err("starting database transaction")?;
 
     let current_user = get_user_from_headers(
         &req,
@@ -505,21 +537,22 @@ pub async fn add_team_member(
         &session_queue,
         Scopes::PROJECT_WRITE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
     let team_association = DBTeam::get_association(team_id, &**pool)
-        .await?
-        .ok_or_else(|| {
-            ApiError::InvalidInput(
-                "The team specified does not exist".to_string(),
-            )
+        .await
+        .wrap_internal_err("fetching team from database")?
+        .wrap_request_err_with(|| {
+            "the team specified does not exist".to_string()
         })?;
     let member = DBTeamMember::get_from_user_id(
         team_id,
         current_user.id.into(),
         &**pool,
     )
-    .await?;
+    .await
+    .wrap_internal_err("fetching team member from database")?;
     match team_association {
         // If team is associated with a project, check if they have permissions to invite users to that project
         TeamAssociationId::Project(pid) => {
@@ -527,7 +560,8 @@ pub async fn add_team_member(
                 DBOrganization::get_associated_organization_project_id(
                     pid, &**pool,
                 )
-                .await?;
+                .await
+                .wrap_internal_err("fetching organization from database")?;
             let organization_team_member =
                 if let Some(organization) = &organization {
                     DBTeamMember::get_from_user_id(
@@ -535,7 +569,8 @@ pub async fn add_team_member(
                         current_user.id.into(),
                         &**pool,
                     )
-                    .await?
+                    .await
+                    .wrap_internal_err("fetching team member from database")?
                 } else {
                     None
                 };
@@ -547,23 +582,20 @@ pub async fn add_team_member(
             .unwrap_or_default();
 
             if !permissions.contains(ProjectPermissions::MANAGE_INVITES) {
-                return Err(ApiError::CustomAuthentication(
-                    "You don't have permission to invite users to this team"
-                        .to_string(),
-                ));
+                return Err(ApiError::Auth(eyre::eyre!(
+                    "You don't have permission to invite users to this team",
+                )));
             }
             if !permissions.contains(new_member.permissions) {
-                return Err(ApiError::InvalidInput(
-                    "The new member has permissions that you don't have"
-                        .to_string(),
-                ));
+                return Err(ApiError::Request(eyre::eyre!(
+                    "The new member has permissions that you don't have",
+                )));
             }
 
             if new_member.organization_permissions.is_some() {
-                return Err(ApiError::InvalidInput(
-                    "The organization permissions of a project team member cannot be set"
-                        .to_string(),
-                ));
+                return Err(ApiError::Request(eyre::eyre!(
+                    "The organization permissions of a project team member cannot be set",
+                )));
             }
         }
         // If team is associated with an organization, check if they have permissions to invite users to that organization
@@ -577,25 +609,24 @@ pub async fn add_team_member(
             if !organization_permissions
                 .contains(OrganizationPermissions::MANAGE_INVITES)
             {
-                return Err(ApiError::CustomAuthentication(
-                    "You don't have permission to invite users to this organization".to_string(),
-                ));
+                return Err(ApiError::Auth(eyre::eyre!(
+                    "You don't have permission to invite users to this organization",
+                )));
             }
             if !organization_permissions.contains(
                 new_member.organization_permissions.unwrap_or_default(),
             ) {
-                return Err(ApiError::InvalidInput(
-                    "The new member has organization permissions that you don't have".to_string(),
-                ));
+                return Err(ApiError::Request(eyre::eyre!(
+                    "The new member has organization permissions that you don't have",
+                )));
             }
             if !organization_permissions.contains(
                 OrganizationPermissions::EDIT_MEMBER_DEFAULT_PERMISSIONS,
             ) && !new_member.permissions.is_empty()
             {
-                return Err(ApiError::CustomAuthentication(
-                    "You do not have permission to give this user default project permissions. Ensure 'permissions' is set if it is not, and empty (0)."
-                        .to_string(),
-                ));
+                return Err(ApiError::Auth(eyre::eyre!(
+                    "You do not have permission to give this user default project permissions. Ensure 'permissions' is set if it is not, and empty (0).",
+                )));
             }
         }
     }
@@ -603,9 +634,9 @@ pub async fn add_team_member(
     if new_member.payouts_split < Decimal::ZERO
         || new_member.payouts_split > Decimal::from(5000)
     {
-        return Err(ApiError::InvalidInput(
-            "Payouts split must be between 0 and 5000!".to_string(),
-        ));
+        return Err(ApiError::Request(eyre::eyre!(
+            "Payouts split must be between 0 and 5000!",
+        )));
     }
 
     let request = DBTeamMember::get_from_user_id_pending(
@@ -613,18 +644,18 @@ pub async fn add_team_member(
         new_member.user_id.into(),
         &**pool,
     )
-    .await?;
+    .await
+    .wrap_internal_err("fetching team member from database")?;
 
     if let Some(req) = request {
         if req.accepted {
-            return Err(ApiError::InvalidInput(
-                "The user is already a member of that team".to_string(),
-            ));
+            return Err(ApiError::Request(eyre::eyre!(
+                "The user is already a member of that team",
+            )));
         } else {
-            return Err(ApiError::InvalidInput(
-                "There is already a pending member request for this user"
-                    .to_string(),
-            ));
+            return Err(ApiError::Request(eyre::eyre!(
+                "There is already a pending member request for this user",
+            )));
         }
     }
     let new_user = crate::database::models::DBUser::get_id(
@@ -632,10 +663,9 @@ pub async fn add_team_member(
         &**pool,
         &redis,
     )
-    .await?
-    .ok_or_else(|| {
-        ApiError::InvalidInput("An invalid User ID specified".to_string())
-    })?;
+    .await
+    .wrap_internal_err("fetching user from database")?
+    .wrap_request_err_with(|| "an invalid User ID specified".to_string())?;
 
     let mut force_accepted = false;
     if let TeamAssociationId::Project(pid) = team_association {
@@ -644,7 +674,8 @@ pub async fn add_team_member(
             DBOrganization::get_associated_organization_project_id(
                 pid, &**pool,
             )
-            .await?;
+            .await
+            .wrap_internal_err("fetching organization from database")?;
         let new_user_organization_team_member =
             if let Some(organization) = &organization {
                 DBTeamMember::get_from_user_id(
@@ -652,7 +683,8 @@ pub async fn add_team_member(
                     new_user.id,
                     &**pool,
                 )
-                .await?
+                .await
+                .wrap_internal_err("fetching team member from database")?
             } else {
                 None
             };
@@ -661,10 +693,9 @@ pub async fn add_team_member(
             .is_some_and(|tm| tm.is_owner)
             && new_member.permissions != ProjectPermissions::all()
         {
-            return Err(ApiError::InvalidInput(
-                "You cannot override the owner of an organization's permissions in a project team"
-                    .to_string(),
-            ));
+            return Err(ApiError::Request(eyre::eyre!(
+                "You cannot override the owner of an organization's permissions in a project team",
+            )));
         }
 
         // In the case of adding a user that is in an org, to a project that is owned by that same org,
@@ -678,7 +709,8 @@ pub async fn add_team_member(
 
     let new_id =
         crate::database::models::ids::generate_team_member_id(&mut transaction)
-            .await?;
+            .await
+            .wrap_internal_err("generating team member ID")?;
     DBTeamMember {
         id: new_id,
         team_id,
@@ -692,7 +724,8 @@ pub async fn add_team_member(
         ordering: new_member.ordering,
     }
     .insert(&mut transaction)
-    .await?;
+    .await
+    .wrap_internal_err("inserting database records for `add_team_member`")?;
 
     // If the user has an opportunity to accept the invite, send a notification
     if !force_accepted {
@@ -707,7 +740,10 @@ pub async fn add_team_member(
                     },
                 }
                 .insert(new_member.user_id.into(), &mut transaction, &redis)
-                .await?;
+                .await
+                .wrap_internal_err(
+                    "inserting database records for `add_team_member`",
+                )?;
             }
             TeamAssociationId::Organization(oid) => {
                 NotificationBuilder {
@@ -719,14 +755,24 @@ pub async fn add_team_member(
                     },
                 }
                 .insert(new_member.user_id.into(), &mut transaction, &redis)
-                .await?;
+                .await
+                .wrap_internal_err(
+                    "inserting database records for `add_team_member`",
+                )?;
             }
         }
     }
 
-    transaction.commit().await?;
-    DBTeamMember::clear_cache(team_id, &redis).await?;
-    DBUser::clear_project_cache(&[new_member.user_id.into()], &redis).await?;
+    transaction
+        .commit()
+        .await
+        .wrap_internal_err("committing database transaction")?;
+    DBTeamMember::clear_cache(team_id, &redis)
+        .await
+        .wrap_internal_err("clearing cached data from Redis")?;
+    DBUser::clear_project_cache(&[new_member.user_id.into()], &redis)
+        .await
+        .wrap_internal_err("clearing cached user in Redis")?;
 
     Ok(HttpResponse::NoContent().body(""))
 }
@@ -777,7 +823,8 @@ pub async fn edit_team_member(
         &session_queue,
         Scopes::PROJECT_WRITE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     let team_association = DBTeam::get_association(id, &**pool)
@@ -786,7 +833,8 @@ pub async fn edit_team_member(
         .wrap_request_err("the specified team does not exist")?;
     let member =
         DBTeamMember::get_from_user_id(id, current_user.id.into(), &**pool)
-            .await?;
+            .await
+            .wrap_internal_err("fetching team member from database")?;
     let edit_member_db =
         DBTeamMember::get_from_user_id_pending(id, user_id, &**pool)
             .await
@@ -796,15 +844,18 @@ pub async fn edit_team_member(
 				the member must first be created via `POST`",
             )?;
 
-    let mut transaction = pool.begin().await?;
+    let mut transaction = pool
+        .begin()
+        .await
+        .wrap_internal_err("starting database transaction")?;
 
     if edit_member_db.is_owner
         && (edit_member.permissions.is_some()
             || edit_member.organization_permissions.is_some())
     {
-        return Err(ApiError::InvalidInput(
-            "The owner's permission's in a team cannot be edited".to_string(),
-        ));
+        return Err(ApiError::Request(eyre::eyre!(
+            "The owner's permission's in a team cannot be edited",
+        )));
     }
 
     match team_association {
@@ -813,7 +864,8 @@ pub async fn edit_team_member(
                 DBOrganization::get_associated_organization_project_id(
                     project_id, &**pool,
                 )
-                .await?;
+                .await
+                .wrap_internal_err("fetching organization from database")?;
             let organization_team_member =
                 if let Some(organization) = &organization {
                     DBTeamMember::get_from_user_id(
@@ -821,7 +873,8 @@ pub async fn edit_team_member(
                         current_user.id.into(),
                         &**pool,
                     )
-                    .await?
+                    .await
+                    .wrap_internal_err("fetching team member from database")?
                 } else {
                     None
                 };
@@ -833,7 +886,8 @@ pub async fn edit_team_member(
                         user_id,
                         &**pool,
                     )
-                    .await?
+                    .await
+                    .wrap_internal_err("fetching team member from database")?
                 } else {
                     None
                 };
@@ -845,10 +899,9 @@ pub async fn edit_team_member(
                     .permissions
                     .is_some_and(|x| x != ProjectPermissions::all())
             {
-                return Err(ApiError::CustomAuthentication(
-                    "You cannot override the project permissions of the organization owner!"
-                        .to_string(),
-                ));
+                return Err(ApiError::Auth(eyre::eyre!(
+                    "You cannot override the project permissions of the organization owner!",
+                )));
             }
 
             let permissions = ProjectPermissions::get_permissions_by_role(
@@ -858,26 +911,23 @@ pub async fn edit_team_member(
             )
             .unwrap_or_default();
             if !permissions.contains(ProjectPermissions::EDIT_MEMBER) {
-                return Err(ApiError::CustomAuthentication(
-                    "You don't have permission to edit members of this team"
-                        .to_string(),
-                ));
+                return Err(ApiError::Auth(eyre::eyre!(
+                    "You don't have permission to edit members of this team",
+                )));
             }
 
             if let Some(new_permissions) = edit_member.permissions
                 && !permissions.contains(new_permissions)
             {
-                return Err(ApiError::InvalidInput(
-                    "The new permissions have permissions that you don't have"
-                        .to_string(),
-                ));
+                return Err(ApiError::Request(eyre::eyre!(
+                    "The new permissions have permissions that you don't have",
+                )));
             }
 
             if edit_member.organization_permissions.is_some() {
-                return Err(ApiError::InvalidInput(
-                    "The organization permissions of a project team member cannot be edited"
-                        .to_string(),
-                ));
+                return Err(ApiError::Request(eyre::eyre!(
+                    "The organization permissions of a project team member cannot be edited",
+                )));
             }
         }
         TeamAssociationId::Organization(_) => {
@@ -891,19 +941,17 @@ pub async fn edit_team_member(
             if !organization_permissions
                 .contains(OrganizationPermissions::EDIT_MEMBER)
             {
-                return Err(ApiError::CustomAuthentication(
-                    "You don't have permission to edit members of this team"
-                        .to_string(),
-                ));
+                return Err(ApiError::Auth(eyre::eyre!(
+                    "You don't have permission to edit members of this team",
+                )));
             }
 
             if let Some(new_permissions) = edit_member.organization_permissions
                 && !organization_permissions.contains(new_permissions)
             {
-                return Err(ApiError::InvalidInput(
-                        "The new organization permissions have permissions that you don't have"
-                            .to_string(),
-                    ));
+                return Err(ApiError::Request(eyre::eyre!(
+                    "The new organization permissions have permissions that you don't have",
+                )));
             }
 
             if edit_member.permissions.is_some()
@@ -911,10 +959,9 @@ pub async fn edit_team_member(
                     OrganizationPermissions::EDIT_MEMBER_DEFAULT_PERMISSIONS,
                 )
             {
-                return Err(ApiError::CustomAuthentication(
-                    "You do not have permission to give this user default project permissions."
-                        .to_string(),
-                ));
+                return Err(ApiError::Auth(eyre::eyre!(
+                    "You do not have permission to give this user default project permissions.",
+                )));
             }
         }
     }
@@ -923,9 +970,9 @@ pub async fn edit_team_member(
         && (payouts_split < Decimal::ZERO
             || payouts_split > Decimal::from(5000))
     {
-        return Err(ApiError::InvalidInput(
-            "Payouts split must be between 0 and 5000!".to_string(),
-        ));
+        return Err(ApiError::Request(eyre::eyre!(
+            "Payouts split must be between 0 and 5000!",
+        )));
     }
 
     DBTeamMember::edit_team_member(
@@ -940,10 +987,16 @@ pub async fn edit_team_member(
         None,
         &mut transaction,
     )
-    .await?;
+    .await
+    .wrap_internal_err("updating team member in database")?;
 
-    transaction.commit().await?;
-    DBTeamMember::clear_cache(id, &redis).await?;
+    transaction
+        .commit()
+        .await
+        .wrap_internal_err("committing database transaction")?;
+    DBTeamMember::clear_cache(id, &redis)
+        .await
+        .wrap_internal_err("clearing cached data from Redis")?;
 
     Ok(HttpResponse::NoContent().body(""))
 }
@@ -983,23 +1036,26 @@ pub async fn transfer_ownership(
         &session_queue,
         Scopes::PROJECT_WRITE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     // Forbid transferring ownership of a project team that is owned by an organization
     // These are owned by the organization owner, and must be removed from the organization first
     // There shouldnt be an owner on these projects in these cases, but just in case.
-    let team_association_id =
-        DBTeam::get_association(id.into(), &**pool).await?;
+    let team_association_id = DBTeam::get_association(id.into(), &**pool)
+        .await
+        .wrap_internal_err("fetching team from database")?;
     if let Some(TeamAssociationId::Project(pid)) = team_association_id {
-        let result = DBProject::get_id(pid, &**pool, &redis).await?;
+        let result = DBProject::get_id(pid, &**pool, &redis)
+            .await
+            .wrap_api_err("fetching project for ownership transfer")?;
         if let Some(project_item) = result
             && project_item.inner.organization_id.is_some()
         {
-            return Err(ApiError::InvalidInput(
-                    "You cannot transfer ownership of a project team that is owned by an organization"
-                        .to_string(),
-                ));
+            return Err(ApiError::Request(eyre::eyre!(
+                "You cannot transfer ownership of a project team that is owned by an organization",
+            )));
         }
     }
 
@@ -1009,19 +1065,16 @@ pub async fn transfer_ownership(
             current_user.id.into(),
             &**pool,
         )
-        .await?
-        .ok_or_else(|| {
-            ApiError::CustomAuthentication(
-                "You don't have permission to edit members of this team"
-                    .to_string(),
-            )
+        .await
+        .wrap_internal_err("fetching team member from database")?
+        .wrap_auth_err_with(|| {
+            "you don't have permission to edit members of this team".to_string()
         })?;
 
         if !member.is_owner {
-            return Err(ApiError::CustomAuthentication(
-                "You don't have permission to edit the ownership of this team"
-                    .to_string(),
-            ));
+            return Err(ApiError::Auth(eyre::eyre!(
+                "You don't have permission to edit the ownership of this team",
+            )));
         }
     }
 
@@ -1030,25 +1083,28 @@ pub async fn transfer_ownership(
         new_owner.user_id.into(),
         &**pool,
     )
-    .await?
-    .ok_or_else(|| {
-        ApiError::InvalidInput(
-            "The new owner specified does not exist".to_string(),
-        )
+    .await
+    .wrap_internal_err("fetching team member from database")?
+    .wrap_request_err_with(|| {
+        "the new owner specified does not exist".to_string()
     })?;
 
     if !new_member.accepted {
-        return Err(ApiError::InvalidInput(
-            "You can only transfer ownership to members who are currently in your team".to_string(),
-        ));
+        return Err(ApiError::Request(eyre::eyre!(
+            "You can only transfer ownership to members who are currently in your team",
+        )));
     }
 
-    let mut transaction = pool.begin().await?;
+    let mut transaction = pool
+        .begin()
+        .await
+        .wrap_internal_err("starting database transaction")?;
 
     // The following are the only places new_is_owner is modified.
     if let Some(former_owner) =
         DBTeamMember::get_from_team_full(id.into(), &**pool, &redis)
-            .await?
+            .await
+            .wrap_internal_err("fetching team member from database")?
             .into_iter()
             .find(|x| x.is_owner)
     {
@@ -1064,7 +1120,8 @@ pub async fn transfer_ownership(
             Some(false),
             &mut transaction,
         )
-        .await?;
+        .await
+        .wrap_internal_err("updating team member in database")?;
     }
 
     DBTeamMember::edit_team_member(
@@ -1086,7 +1143,8 @@ pub async fn transfer_ownership(
         Some(true),
         &mut transaction,
     )
-    .await?;
+    .await
+    .wrap_internal_err("updating database records for `transfer_ownership`")?;
 
     let project_teams_edited =
         if let Some(TeamAssociationId::Organization(oid)) = team_association_id
@@ -1105,7 +1163,8 @@ pub async fn transfer_ownership(
                 oid.0 as i64
             )
             .fetch_all(&mut transaction)
-            .await?;
+            .await
+            .wrap_internal_err("fetching team IDs from database")?;
 
             let team_ids: Vec<crate::database::models::ids::DBTeamId> =
                 team_ids
@@ -1120,7 +1179,8 @@ pub async fn transfer_ownership(
                     new_owner.user_id.into(),
                     &mut transaction,
                 )
-                .await?;
+                .await
+                .wrap_internal_err("deleting team member from database")?;
             }
 
             team_ids
@@ -1138,14 +1198,24 @@ pub async fn transfer_ownership(
             },
         }
         .insert(new_owner.user_id.into(), &mut transaction, &redis)
-        .await?;
+        .await
+        .wrap_internal_err(
+            "inserting database records for `transfer_ownership`",
+        )?;
     }
 
-    transaction.commit().await?;
+    transaction
+        .commit()
+        .await
+        .wrap_internal_err("committing database transaction")?;
 
-    DBTeamMember::clear_cache(id.into(), &redis).await?;
+    DBTeamMember::clear_cache(id.into(), &redis)
+        .await
+        .wrap_internal_err("clearing cached data from Redis")?;
     for team_id in project_teams_edited {
-        DBTeamMember::clear_cache(team_id, &redis).await?;
+        DBTeamMember::clear_cache(team_id, &redis)
+            .await
+            .wrap_internal_err("clearing cached data from Redis")?;
     }
 
     Ok(HttpResponse::NoContent().body(""))
@@ -1181,31 +1251,38 @@ pub async fn remove_team_member(
         &session_queue,
         Scopes::PROJECT_WRITE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
-    let team_association =
-        DBTeam::get_association(id, &**pool).await?.ok_or_else(|| {
-            ApiError::InvalidInput(
-                "The team specified does not exist".to_string(),
-            )
+    let team_association = DBTeam::get_association(id, &**pool)
+        .await
+        .wrap_internal_err("fetching team from database")?
+        .wrap_request_err_with(|| {
+            "the team specified does not exist".to_string()
         })?;
     let member =
         DBTeamMember::get_from_user_id(id, current_user.id.into(), &**pool)
-            .await?;
+            .await
+            .wrap_internal_err("fetching team member from database")?;
 
     let delete_member =
-        DBTeamMember::get_from_user_id_pending(id, user_id, &**pool).await?;
+        DBTeamMember::get_from_user_id_pending(id, user_id, &**pool)
+            .await
+            .wrap_internal_err("deleting team member from database")?;
 
     if let Some(delete_member) = delete_member {
         if delete_member.is_owner {
             // The owner cannot be removed from a team
-            return Err(ApiError::CustomAuthentication(
-                "The owner can't be removed from a team".to_string(),
-            ));
+            return Err(ApiError::Auth(eyre::eyre!(
+                "The owner can't be removed from a team",
+            )));
         }
 
-        let mut transaction = pool.begin().await?;
+        let mut transaction = pool
+            .begin()
+            .await
+            .wrap_internal_err("starting database transaction")?;
 
         // Organization attached to a project this team is attached to
         match team_association {
@@ -1214,18 +1291,21 @@ pub async fn remove_team_member(
                     DBOrganization::get_associated_organization_project_id(
                         pid, &**pool,
                     )
-                    .await?;
-                let organization_team_member =
-                    if let Some(organization) = &organization {
-                        DBTeamMember::get_from_user_id(
-                            organization.team_id,
-                            current_user.id.into(),
-                            &**pool,
-                        )
-                        .await?
-                    } else {
-                        None
-                    };
+                    .await
+                    .wrap_internal_err("fetching organization from database")?;
+                let organization_team_member = if let Some(organization) =
+                    &organization
+                {
+                    DBTeamMember::get_from_user_id(
+                        organization.team_id,
+                        current_user.id.into(),
+                        &**pool,
+                    )
+                    .await
+                    .wrap_internal_err("fetching team member from database")?
+                } else {
+                    None
+                };
                 let permissions = ProjectPermissions::get_permissions_by_role(
                     &current_user.role,
                     &member,
@@ -1243,12 +1323,14 @@ pub async fn remove_team_member(
                     // true as if the permission exists, but the member does not, they are part of an org
                     {
                         DBTeamMember::delete(id, user_id, &mut transaction)
-                            .await?;
+                            .await
+                            .wrap_internal_err(
+                                "deleting team member from database",
+                            )?;
                     } else {
-                        return Err(ApiError::CustomAuthentication(
-                            "You do not have permission to remove a member from this team"
-                                .to_string(),
-                        ));
+                        return Err(ApiError::Auth(eyre::eyre!(
+                            "You do not have permission to remove a member from this team",
+                        )));
                     }
                 } else if Some(delete_member.user_id)
                     == member.as_ref().map(|m| m.user_id)
@@ -1258,12 +1340,13 @@ pub async fn remove_team_member(
                     // This is a pending invite rather than a member, so the
                     // user being invited or team members with the MANAGE_INVITES
                     // permission can remove it.
-                    DBTeamMember::delete(id, user_id, &mut transaction).await?;
+                    DBTeamMember::delete(id, user_id, &mut transaction)
+                        .await
+                        .wrap_internal_err("deleting team member from database")?;
                 } else {
-                    return Err(ApiError::CustomAuthentication(
-                        "You do not have permission to cancel a team invite"
-                            .to_string(),
-                    ));
+                    return Err(ApiError::Auth(eyre::eyre!(
+                        "You do not have permission to cancel a team invite",
+                    )));
                 }
             }
             TeamAssociationId::Organization(_) => {
@@ -1282,12 +1365,14 @@ pub async fn remove_team_member(
                             .contains(OrganizationPermissions::REMOVE_MEMBER)
                     {
                         DBTeamMember::delete(id, user_id, &mut transaction)
-                            .await?;
+                            .await
+                            .wrap_internal_err(
+                                "deleting team member from database",
+                            )?;
                     } else {
-                        return Err(ApiError::CustomAuthentication(
-                            "You do not have permission to remove a member from this organization"
-                                .to_string(),
-                        ));
+                        return Err(ApiError::Auth(eyre::eyre!(
+                            "You do not have permission to remove a member from this organization",
+                        )));
                     }
                 } else if Some(delete_member.user_id)
                     == member.map(|m| m.user_id)
@@ -1297,22 +1382,31 @@ pub async fn remove_team_member(
                     // This is a pending invite rather than a member, so the
                     // user being invited or team members with the MANAGE_INVITES
                     // permission can remove it.
-                    DBTeamMember::delete(id, user_id, &mut transaction).await?;
+                    DBTeamMember::delete(id, user_id, &mut transaction)
+                        .await
+                        .wrap_internal_err("deleting team member from database")?;
                 } else {
-                    return Err(ApiError::CustomAuthentication(
-                        "You do not have permission to cancel an organization invite".to_string(),
-                    ));
+                    return Err(ApiError::Auth(eyre::eyre!(
+                        "You do not have permission to cancel an organization invite",
+                    )));
                 }
             }
         }
 
-        transaction.commit().await?;
+        transaction
+            .commit()
+            .await
+            .wrap_internal_err("committing database transaction")?;
 
-        DBTeamMember::clear_cache(id, &redis).await?;
-        DBUser::clear_project_cache(&[delete_member.user_id], &redis).await?;
+        DBTeamMember::clear_cache(id, &redis)
+            .await
+            .wrap_internal_err("clearing cached data from Redis")?;
+        DBUser::clear_project_cache(&[delete_member.user_id], &redis)
+            .await
+            .wrap_internal_err("deleting user from database")?;
 
         Ok(HttpResponse::NoContent().body(""))
     } else {
-        Err(ApiError::NotFound)
+        Err(ApiError::NotFound(eyre::eyre!("resource not found")))
     }
 }
diff --git a/apps/labrinth/src/routes/v3/threads.rs b/apps/labrinth/src/routes/v3/threads.rs
index cfca3fdb67..4d7d82167d 100644
--- a/apps/labrinth/src/routes/v3/threads.rs
+++ b/apps/labrinth/src/routes/v3/threads.rs
@@ -15,6 +15,8 @@ use crate::models::threads::{MessageBody, Thread, ThreadType};
 use crate::models::users::User;
 use crate::queue::session::AuthQueue;
 use crate::routes::ApiError;
+use crate::util::error::ApiContext as _;
+use crate::util::error::Context as _;
 use actix_web::{HttpRequest, HttpResponse, delete, get, post, web};
 use futures::TryStreamExt;
 use serde::Deserialize;
@@ -46,7 +48,7 @@ pub async fn is_authorized_thread(
                     user_id as database::models::ids::DBUserId,
                 )
                 .fetch_one(pool)
-                .await?
+                .await.wrap_internal_err("fetching report exists from database")?
                 .exists;
 
                 report_exists.unwrap_or(false)
@@ -62,7 +64,7 @@ pub async fn is_authorized_thread(
                     user_id as database::models::ids::DBUserId,
                 )
                     .fetch_one(pool)
-                    .await?
+                    .await.wrap_internal_err("fetching project exists from database")?
                     .exists;
 
                 if !project_exists.unwrap_or(false) {
@@ -72,7 +74,7 @@ pub async fn is_authorized_thread(
                         user_id as database::models::ids::DBUserId,
                     )
                         .fetch_one(pool)
-                        .await?
+                        .await.wrap_internal_err("fetching organization exists from database")?
                         .exists;
 
                     org_exists.unwrap_or(false)
@@ -139,7 +141,7 @@ pub async fn filter_authorized_threads(
                 });
             })
             .try_collect::<Vec<()>>()
-            .await?;
+            .await.wrap_internal_err("fetching query results from database")?;
         }
 
         let mut org_project_thread_ids = check_threads
@@ -171,7 +173,7 @@ pub async fn filter_authorized_threads(
                 });
             })
             .try_collect::<Vec<()>>()
-            .await?;
+            .await.wrap_internal_err("fetching query results from database")?;
         }
 
         let report_thread_ids = check_threads
@@ -202,7 +204,8 @@ pub async fn filter_authorized_threads(
                 });
             })
             .try_collect::<Vec<()>>()
-            .await?;
+            .await
+            .wrap_internal_err("fetching query results from database")?;
         }
     }
 
@@ -224,7 +227,8 @@ pub async fn filter_authorized_threads(
 
     let users: Vec<User> =
         database::models::DBUser::get_many_ids(&user_ids, &***pool, redis)
-            .await?
+            .await
+            .wrap_internal_err("fetching users from database")?
             .into_iter()
             .map(From::from)
             .collect();
@@ -283,7 +287,9 @@ pub async fn thread_get(
 ) -> Result<HttpResponse, ApiError> {
     let string = info.into_inner().0.into();
 
-    let thread_data = database::models::DBThread::get(string, &**pool).await?;
+    let thread_data = database::models::DBThread::get(string, &**pool)
+        .await
+        .wrap_internal_err("fetching thread from database")?;
 
     let user = get_user_from_headers(
         &req,
@@ -292,11 +298,14 @@ pub async fn thread_get(
         &session_queue,
         Scopes::THREAD_READ,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     if let Some(mut data) = thread_data
-        && is_authorized_thread(&data, &user, &pool).await?
+        && is_authorized_thread(&data, &user, &pool)
+            .await
+            .wrap_api_err("checking thread authorization")?
     {
         let authors = &mut data.members;
 
@@ -316,14 +325,15 @@ pub async fn thread_get(
 
         let users: Vec<User> =
             database::models::DBUser::get_many_ids(authors, &**pool, &redis)
-                .await?
+                .await
+                .wrap_internal_err("fetching users from database")?
                 .into_iter()
                 .map(From::from)
                 .collect();
 
         return Ok(HttpResponse::Ok().json(Thread::from(data, users, &user)));
     }
-    Err(ApiError::NotFound)
+    Err(ApiError::NotFound(eyre::eyre!("resource not found")))
 }
 
 #[derive(Deserialize)]
@@ -361,20 +371,25 @@ pub async fn threads_get(
         &session_queue,
         Scopes::THREAD_READ,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     let thread_ids: Vec<database::models::ids::DBThreadId> =
-        serde_json::from_str::<Vec<ThreadId>>(&ids.ids)?
+        serde_json::from_str::<Vec<ThreadId>>(&ids.ids)
+            .wrap_request_err("deserializing JSON data")?
             .into_iter()
             .map(|x| x.into())
             .collect();
 
     let threads_data =
-        database::models::DBThread::get_many(&thread_ids, &**pool).await?;
+        database::models::DBThread::get_many(&thread_ids, &**pool)
+            .await
+            .wrap_internal_err("fetching threads from database")?;
 
-    let threads =
-        filter_authorized_threads(threads_data, &user, &pool, &redis).await?;
+    let threads = filter_authorized_threads(threads_data, &user, &pool, &redis)
+        .await
+        .wrap_api_err("filtering authorized threads")?;
 
     Ok(HttpResponse::Ok().json(threads))
 }
@@ -413,7 +428,8 @@ pub async fn thread_send_message(
         &session_queue,
         Scopes::THREAD_WRITE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     thread_send_message_internal(
@@ -423,7 +439,8 @@ pub async fn thread_send_message(
         new_message.into_inner(),
         &redis,
     )
-    .await?;
+    .await
+    .wrap_api_err("sending thread message")?;
     Ok(HttpResponse::NoContent().finish())
 }
 
@@ -446,15 +463,15 @@ pub async fn thread_send_message_internal(
     } = &new_message.body
     {
         if body.len() > 65536 {
-            return Err(ApiError::InvalidInput(
-                "Input body is too long!".to_string(),
-            ));
+            return Err(ApiError::Request(eyre::eyre!(
+                "Input body is too long!",
+            )));
         }
 
         if *private && !user.role.is_mod() {
-            return Err(ApiError::InvalidInput(
-                "You are not allowed to send private messages!".to_string(),
-            ));
+            return Err(ApiError::Request(eyre::eyre!(
+                "You are not allowed to send private messages!",
+            )));
         }
 
         if let Some(replying_to) = replying_to {
@@ -462,37 +479,45 @@ pub async fn thread_send_message_internal(
                 (*replying_to).into(),
                 pool,
             )
-            .await?;
+            .await
+            .wrap_internal_err("fetching thread message from database")?;
 
             if let Some(thread_message) = thread_message {
                 if thread_message.thread_id != string {
-                    return Err(ApiError::InvalidInput(
-                        "Message replied to is from another thread!"
-                            .to_string(),
-                    ));
+                    return Err(ApiError::Request(eyre::eyre!(
+                        "Message replied to is from another thread!",
+                    )));
                 }
             } else {
-                return Err(ApiError::InvalidInput(
-                    "Message replied to does not exist!".to_string(),
-                ));
+                return Err(ApiError::Request(eyre::eyre!(
+                    "Message replied to does not exist!",
+                )));
             }
         }
 
         is_private = *private;
     } else {
-        return Err(ApiError::InvalidInput(
-            "You may only send text messages through this route!".to_string(),
-        ));
+        return Err(ApiError::Request(eyre::eyre!(
+            "You may only send text messages through this route!",
+        )));
     }
 
-    let result = database::models::DBThread::get(string, pool).await?;
+    let result = database::models::DBThread::get(string, pool)
+        .await
+        .wrap_internal_err("fetching thread from database")?;
 
     if let Some(thread) = result {
-        if !is_authorized_thread(&thread, user, pool).await? {
-            return Err(ApiError::NotFound);
+        if !is_authorized_thread(&thread, user, pool)
+            .await
+            .wrap_api_err("checking thread authorization")?
+        {
+            return Err(ApiError::NotFound(eyre::eyre!("resource not found")));
         }
 
-        let mut transaction = pool.begin().await?;
+        let mut transaction = pool
+            .begin()
+            .await
+            .wrap_internal_err("starting database transaction")?;
 
         let id = ThreadMessageBuilder {
             author_id: Some(user.id.into()),
@@ -501,12 +526,16 @@ pub async fn thread_send_message_internal(
             hide_identity: user.role.is_mod(),
         }
         .insert(&mut transaction)
-        .await?;
+        .await
+        .wrap_internal_err(
+            "inserting database records for `thread_send_message_internal`",
+        )?;
 
         if let Some(project_id) = thread.project_id {
             let project =
                 database::models::DBProject::get_id(project_id, pool, redis)
-                    .await?;
+                    .await
+                    .wrap_api_err("fetching thread project")?;
 
             if let Some(project) = project
                 && project.inner.status != ProjectStatus::Processing
@@ -519,7 +548,8 @@ pub async fn thread_send_message_internal(
                         pool,
                         redis,
                     )
-                    .await?;
+                    .await
+                    .wrap_internal_err("fetching team members from database")?;
 
                 NotificationBuilder {
                     body: NotificationBody::ModeratorMessage {
@@ -534,7 +564,8 @@ pub async fn thread_send_message_internal(
                     &mut transaction,
                     redis,
                 )
-                .await?;
+                .await
+                .wrap_internal_err("inserting database records for `thread_send_message_internal`")?;
 
                 NotificationBuilder {
                     body: NotificationBody::ModerationMessageReceived {
@@ -546,18 +577,20 @@ pub async fn thread_send_message_internal(
                     &mut transaction,
                     redis,
                 )
-                .await?;
+                .await
+                .wrap_internal_err("inserting database records for `thread_send_message_internal`")?;
             }
         } else if let Some(report_id) = thread.report_id {
             let report =
                 database::models::report_item::DBReport::get(report_id, pool)
-                    .await?;
+                    .await
+                    .wrap_internal_err("fetching report from database")?;
 
             if let Some(report) = report {
                 if report.closed && !user.role.is_mod() {
-                    return Err(ApiError::InvalidInput(
-                        "You may not reply to a closed report".to_string(),
-                    ));
+                    return Err(ApiError::Request(eyre::eyre!(
+                        "You may not reply to a closed report",
+                    )));
                 }
 
                 if user.id != report.reporter.into() && !is_private {
@@ -570,7 +603,8 @@ pub async fn thread_send_message_internal(
                         },
                     }
                     .insert(report.reporter, &mut transaction, redis)
-                    .await?;
+                    .await
+                    .wrap_internal_err("inserting database records for `thread_send_message_internal`")?;
                 }
             }
         }
@@ -585,7 +619,8 @@ pub async fn thread_send_message_internal(
                     &mut transaction,
                     redis,
                 )
-                .await?
+                .await
+                .wrap_internal_err("fetching image from database")?
                 {
                     let image: Image = db_image.into();
                     if !matches!(
@@ -593,9 +628,9 @@ pub async fn thread_send_message_internal(
                         ImageContext::ThreadMessage { .. }
                     ) || image.context.inner_id().is_some()
                     {
-                        return Err(ApiError::InvalidInput(format!(
+                        return Err(ApiError::Request(eyre::eyre!(format!(
                             "Image {image_id} is not unused and in the 'thread_message' context"
-                        )));
+                        ))));
                     }
 
                     sqlx::query!(
@@ -608,23 +643,30 @@ pub async fn thread_send_message_internal(
                         image_id.0 as i64
                     )
                     .execute(&mut transaction)
-                    .await?;
+                    .await
+                    .wrap_internal_err(
+                        "querying database for `thread_send_message_internal`",
+                    )?;
 
                     image_item::DBImage::clear_cache(image.id.into(), redis)
-                        .await?;
+                        .await
+                        .wrap_internal_err("clearing cached data from Redis")?;
                 } else {
-                    return Err(ApiError::InvalidInput(format!(
+                    return Err(ApiError::Request(eyre::eyre!(format!(
                         "Image {image_id} does not exist"
-                    )));
+                    ))));
                 }
             }
         }
 
-        transaction.commit().await?;
+        transaction
+            .commit()
+            .await
+            .wrap_internal_err("committing database transaction")?;
 
         Ok(())
     } else {
-        Err(ApiError::NotFound)
+        Err(ApiError::NotFound(eyre::eyre!("resource not found")))
     }
 }
 
@@ -656,30 +698,36 @@ pub async fn message_delete(
         &session_queue,
         Scopes::THREAD_WRITE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     let result = database::models::DBThreadMessage::get(
         info.into_inner().0.into(),
         &**pool,
     )
-    .await?;
+    .await
+    .wrap_internal_err("fetching thread message from database")?;
 
     if let Some(thread) = result {
         if !user.role.is_mod() && thread.author_id != Some(user.id.into()) {
-            return Err(ApiError::CustomAuthentication(
-                "You cannot delete this message!".to_string(),
-            ));
+            return Err(ApiError::Auth(eyre::eyre!(
+                "You cannot delete this message!",
+            )));
         }
 
-        let mut transaction = pool.begin().await?;
+        let mut transaction = pool
+            .begin()
+            .await
+            .wrap_internal_err("starting database transaction")?;
 
         let context = ImageContext::ThreadMessage {
             thread_message_id: Some(thread.id.into()),
         };
         let images =
             database::DBImage::get_many_contexted(context, &mut transaction)
-                .await?;
+                .await
+                .wrap_internal_err("fetching images from database")?;
         for image in images {
             let name = image.url.split(&format!("{}/", ENV.CDN_URL)).nth(1);
             if let Some(icon_path) = name {
@@ -688,10 +736,12 @@ pub async fn message_delete(
                         icon_path,
                         FileHostPublicity::Public, // FIXME: Consider using private file storage?
                     )
-                    .await?;
+                    .await
+                    .wrap_internal_err("deleting file from file host")?;
             }
             database::DBImage::remove(image.id, &mut transaction, &redis)
-                .await?;
+                .await
+                .wrap_internal_err("deleting image from database")?;
         }
 
         let private = thread.body.is_private();
@@ -700,11 +750,15 @@ pub async fn message_delete(
             private,
             &mut transaction,
         )
-        .await?;
-        transaction.commit().await?;
+        .await
+        .wrap_internal_err("deleting thread message from database")?;
+        transaction
+            .commit()
+            .await
+            .wrap_internal_err("committing database transaction")?;
 
         Ok(HttpResponse::NoContent().body(""))
     } else {
-        Err(ApiError::NotFound)
+        Err(ApiError::NotFound(eyre::eyre!("resource not found")))
     }
 }
diff --git a/apps/labrinth/src/routes/v3/users.rs b/apps/labrinth/src/routes/v3/users.rs
index 59a452c4de..ce5215d4ce 100644
--- a/apps/labrinth/src/routes/v3/users.rs
+++ b/apps/labrinth/src/routes/v3/users.rs
@@ -1,3 +1,4 @@
+use crate::util::error::ApiContext as _;
 use std::{
     cmp::Reverse,
     collections::{HashMap, HashSet},
@@ -24,10 +25,7 @@ use crate::{
         users::{Badges, Role},
     },
     queue::session::AuthQueue,
-    util::{
-        img::delete_old_images, routes::read_limited_from_payload,
-        validate::validation_errors_to_string,
-    },
+    util::{img::delete_old_images, routes::read_limited_from_payload},
 };
 use actix_web::{HttpRequest, HttpResponse, delete, get, patch, web};
 use ariadne::ids::UserId;
@@ -85,16 +83,21 @@ pub async fn all_projects(
     .map(|x| x.1)
     .ok();
     let target_user = DBUser::get(&info.into_inner().0, &**pool, &redis)
-        .await?
-        .ok_or(ApiError::NotFound)?;
+        .await
+        .wrap_internal_err("fetching user from database")?
+        .wrap_not_found_err("resource not found")?;
 
     let user_project_ids =
-        DBUser::get_projects(target_user.id, &**pool, &redis).await?;
-    let organization_ids =
-        DBUser::get_organizations(target_user.id, &**pool).await?;
+        DBUser::get_projects(target_user.id, &**pool, &redis)
+            .await
+            .wrap_internal_err("fetching users from database")?;
+    let organization_ids = DBUser::get_organizations(target_user.id, &**pool)
+        .await
+        .wrap_internal_err("fetching users from database")?;
     let organizations_data =
         DBOrganization::get_many_ids(&organization_ids, &**pool, &redis)
-            .await?;
+            .await
+            .wrap_internal_err("fetching organizations from database")?;
 
     let team_ids = organizations_data
         .iter()
@@ -104,7 +107,8 @@ pub async fn all_projects(
         crate::database::models::DBTeamMember::get_from_team_full_many(
             &team_ids, &**pool, &redis,
         )
-        .await?;
+        .await
+        .wrap_internal_err("fetching team members from database")?;
     let users = DBUser::get_many_ids(
         &teams_data
             .iter()
@@ -113,7 +117,8 @@ pub async fn all_projects(
         &**pool,
         &redis,
     )
-    .await?;
+    .await
+    .wrap_internal_err("fetching users from database")?;
 
     let mut team_groups = HashMap::new();
     for member in teams_data {
@@ -126,7 +131,10 @@ pub async fn all_projects(
     let mut organizations = HashMap::new();
     let mut visible_organization_ids = Vec::new();
     for data in organizations_data {
-        if !is_visible_organization(&data, &user, &pool, &redis).await? {
+        if !is_visible_organization(&data, &user, &pool, &redis)
+            .await
+            .wrap_api_err("checking organization visibility")?
+        {
             continue;
         }
 
@@ -173,7 +181,8 @@ pub async fn all_projects(
         &organization_id_values,
     )
     .fetch_all(&**pool)
-    .await?
+    .await
+    .wrap_internal_err("fetching organization project IDs from database")?
     .into_iter()
     .map(|row| DBProjectId(row.id))
     .collect::<Vec<_>>();
@@ -186,9 +195,11 @@ pub async fn all_projects(
         .collect::<Vec<_>>();
     let projects_data =
         crate::database::DBProject::get_many_ids(&project_ids, &**pool, &redis)
-            .await?;
-    let projects =
-        filter_visible_projects(projects_data, &user, &pool, true).await?;
+            .await
+            .wrap_api_err("fetching user and organization projects")?;
+    let projects = filter_visible_projects(projects_data, &user, &pool, true)
+        .await
+        .wrap_api_err("filtering visible projects")?;
 
     Ok(web::Json(AllProjectsResponse {
         projects,
@@ -217,13 +228,13 @@ pub async fn admin_user_email(
         Scopes::SESSION_ACCESS,
     )
     .await
-    .map(|x| x.1)?;
+    .map(|x| x.1)
+    .wrap_auth_err("authenticating API request")?;
 
     if !user.role.is_admin() {
-        return Err(ApiError::CustomAuthentication(
-            "You do not have permission to get a user from their email!"
-                .to_string(),
-        ));
+        return Err(ApiError::Auth(eyre::eyre!(
+            "You do not have permission to get a user from their email!",
+        )));
     }
 
     let user_id = sqlx::query!(
@@ -234,12 +245,11 @@ pub async fn admin_user_email(
         email.email
     )
     .fetch_optional(&**pool)
-    .await?
+    .await
+    .wrap_internal_err("fetching user ID from database")?
     .map(|x| x.id)
-    .ok_or_else(|| {
-        ApiError::InvalidInput(
-            "The email provided is not associated with a user!".to_string(),
-        )
+    .wrap_request_err_with(|| {
+        "the email provided is not associated with a user!".to_string()
     })?;
 
     let user = DBUser::get_id(
@@ -247,12 +257,13 @@ pub async fn admin_user_email(
         &**pool,
         &redis,
     )
-    .await?;
+    .await
+    .wrap_internal_err("fetching user from database")?;
 
     if let Some(user) = user {
         Ok(HttpResponse::Ok().json(user))
     } else {
-        Err(ApiError::NotFound)
+        Err(ApiError::NotFound(eyre::eyre!("resource not found")))
     }
 }
 
@@ -286,22 +297,28 @@ pub async fn projects_list(
     .map(|x| x.1)
     .ok();
 
-    let id_option = DBUser::get(&info.into_inner().0, &**pool, &redis).await?;
+    let id_option = DBUser::get(&info.into_inner().0, &**pool, &redis)
+        .await
+        .wrap_internal_err("fetching user from database")?;
 
     if let Some(id) = id_option.map(|x| x.id) {
-        let project_data = DBUser::get_projects(id, &**pool, &redis).await?;
+        let project_data = DBUser::get_projects(id, &**pool, &redis)
+            .await
+            .wrap_internal_err("fetching user from database")?;
 
         let projects: Vec<_> = crate::database::DBProject::get_many_ids(
             &project_data,
             &**pool,
             &redis,
         )
-        .await?;
-        let projects =
-            filter_visible_projects(projects, &user, &pool, true).await?;
+        .await
+        .wrap_api_err("fetching organization projects")?;
+        let projects = filter_visible_projects(projects, &user, &pool, true)
+            .await
+            .wrap_api_err("filtering visible projects")?;
         Ok(HttpResponse::Ok().json(projects))
     } else {
-        Err(ApiError::NotFound)
+        Err(ApiError::NotFound(eyre::eyre!("resource not found")))
     }
 }
 
@@ -329,7 +346,8 @@ pub async fn user_auth_get(
         &session_queue,
         Scopes::USER_READ,
     )
-    .await?;
+    .await
+    .wrap_auth_err("authenticating API request")?;
 
     if !scopes.contains(Scopes::USER_READ_EMAIL) {
         user.email = None;
@@ -340,8 +358,9 @@ pub async fn user_auth_get(
     }
 
     if user.role.is_mod() {
-        let note =
-            DBModerationNote::get_user(user.id.into(), &**pool, &redis).await?;
+        let note = DBModerationNote::get_user(user.id.into(), &**pool, &redis)
+            .await
+            .wrap_internal_err("fetching moderation note from database")?;
         user.moderation_notes = Some(note.map(Into::into));
     }
 
@@ -402,9 +421,12 @@ pub async fn users_get(
     redis: web::Data<RedisPool>,
     session_queue: web::Data<AuthQueue>,
 ) -> Result<HttpResponse, ApiError> {
-    let user_ids = serde_json::from_str::<Vec<String>>(&ids.ids)?;
+    let user_ids = serde_json::from_str::<Vec<String>>(&ids.ids)
+        .wrap_request_err("deserializing JSON data")?;
 
-    let users_data = DBUser::get_many(&user_ids, &**pool, &redis).await?;
+    let users_data = DBUser::get_many(&user_ids, &**pool, &redis)
+        .await
+        .wrap_internal_err("fetching users from database")?;
 
     let auth_user = get_user_from_headers(
         &req,
@@ -423,7 +445,8 @@ pub async fn users_get(
             &**pool,
             &redis,
         )
-        .await?
+        .await
+        .wrap_internal_err("fetching moderation notes from database")?
     } else {
         HashMap::new()
     };
@@ -462,7 +485,9 @@ pub async fn user_get(
     redis: web::Data<RedisPool>,
     session_queue: web::Data<AuthQueue>,
 ) -> Result<HttpResponse, ApiError> {
-    let user_data = DBUser::get(&info.into_inner().0, &**pool, &redis).await?;
+    let user_data = DBUser::get(&info.into_inner().0, &**pool, &redis)
+        .await
+        .wrap_internal_err("fetching user from database")?;
 
     if let Some(data) = user_data {
         let auth_user = get_user_from_headers(
@@ -495,14 +520,15 @@ pub async fn user_get(
         };
 
         if is_mod {
-            let note =
-                DBModerationNote::get_user(user_id, &**pool, &redis).await?;
+            let note = DBModerationNote::get_user(user_id, &**pool, &redis)
+                .await
+                .wrap_internal_err("fetching moderation note from database")?;
             response.moderation_notes = Some(note.map(Into::into));
         }
 
         Ok(HttpResponse::Ok().json(response))
     } else {
-        Err(ApiError::NotFound)
+        Err(ApiError::NotFound(eyre::eyre!("resource not found")))
     }
 }
 
@@ -523,17 +549,27 @@ pub async fn user_notes_edit(
         &session_queue,
         Scopes::SESSION_ACCESS,
     )
-    .await?;
+    .await
+    .wrap_auth_err("authenticating API request")?;
 
-    new_note.validate_not_empty()?;
+    new_note
+        .validate_not_empty()
+        .wrap_api_err("validating not empty")?;
     let expected_version =
-        crate::models::moderation_notes::parse_if_match_header(&req)?;
+        crate::models::moderation_notes::parse_if_match_header(&req)
+            .wrap_api_err(
+                "executing `moderation_notes::parse_if_match_header`",
+            )?;
 
     let user_data = DBUser::get(&info.into_inner().0, &**pool, &redis)
-        .await?
-        .ok_or(ApiError::NotFound)?;
+        .await
+        .wrap_internal_err("fetching user from database")?
+        .wrap_not_found_err("resource not found")?;
 
-    let mut transaction = pool.begin().await?;
+    let mut transaction = pool
+        .begin()
+        .await
+        .wrap_internal_err("starting database transaction")?;
     if let Some(expected) = expected_version {
         let updated = DBModerationNote::update(
             Some(user_data.id),
@@ -544,12 +580,13 @@ pub async fn user_notes_edit(
             new_note.user_rating,
             &mut transaction,
         )
-        .await?;
+        .await
+        .wrap_internal_err("updating moderation note in database")?;
 
         if updated.is_none() {
-            return Err(ApiError::PreconditionFailed(
-                "moderation note version does not match".to_string(),
-            ));
+            return Err(ApiError::PreconditionFailed(eyre::eyre!(
+                "moderation note version does not match",
+            )));
         }
     } else {
         let updated = DBModerationNote::insert(
@@ -560,17 +597,23 @@ pub async fn user_notes_edit(
             new_note.user_rating,
             &mut transaction,
         )
-        .await?;
+        .await
+        .wrap_internal_err("inserting moderation note into database")?;
 
         if updated.is_none() {
-            return Err(ApiError::PreconditionRequired(
-                "moderation note version does not match".to_string(),
-            ));
+            return Err(ApiError::PreconditionRequired(eyre::eyre!(
+                "moderation note version does not match",
+            )));
         }
     };
 
-    transaction.commit().await?;
-    DBModerationNote::clear_user_cache(user_data.id, &redis).await?;
+    transaction
+        .commit()
+        .await
+        .wrap_internal_err("committing database transaction")?;
+    DBModerationNote::clear_user_cache(user_data.id, &redis)
+        .await
+        .wrap_internal_err("clearing cached moderation note in Redis")?;
 
     Ok(HttpResponse::NoContent().finish())
 }
@@ -595,24 +638,30 @@ pub async fn collections_list(
     .map(|x| x.1)
     .ok();
 
-    let id_option = DBUser::get(&info.into_inner().0, &**pool, &redis).await?;
+    let id_option = DBUser::get(&info.into_inner().0, &**pool, &redis)
+        .await
+        .wrap_internal_err("fetching user from database")?;
 
     if let Some(id) = id_option.map(|x| x.id) {
-        let collection_data = DBUser::get_collections(id, &**pool).await?;
+        let collection_data = DBUser::get_collections(id, &**pool)
+            .await
+            .wrap_internal_err("fetching user from database")?;
 
         let response: Vec<_> = crate::database::models::DBCollection::get_many(
             &collection_data,
             &**pool,
             &redis,
         )
-        .await?;
+        .await
+        .wrap_internal_err("fetching collections from database")?;
 
-        let collections =
-            filter_visible_collections(response, &user, true).await?;
+        let collections = filter_visible_collections(response, &user, true)
+            .await
+            .wrap_api_err("filtering visible collections")?;
 
         Ok(HttpResponse::Ok().json(collections))
     } else {
-        Err(ApiError::NotFound)
+        Err(ApiError::NotFound(eyre::eyre!("resource not found")))
     }
 }
 
@@ -636,16 +685,20 @@ pub async fn orgs_list(
     .map(|x| x.1)
     .ok();
 
-    let id_option = DBUser::get(&info.into_inner().0, &**pool, &redis).await?;
+    let id_option = DBUser::get(&info.into_inner().0, &**pool, &redis)
+        .await
+        .wrap_internal_err("fetching user from database")?;
 
     if let Some(id) = id_option.map(|x| x.id) {
-        let org_data = DBUser::get_organizations(id, &**pool).await?;
+        let org_data = DBUser::get_organizations(id, &**pool)
+            .await
+            .wrap_internal_err("fetching user from database")?;
 
         let organizations_data =
             crate::database::models::organization_item::DBOrganization::get_many_ids(
                 &org_data, &**pool, &redis,
             )
-            .await?;
+            .await.wrap_internal_err("fetching organizations from database")?;
 
         let team_ids = organizations_data
             .iter()
@@ -656,13 +709,15 @@ pub async fn orgs_list(
             crate::database::models::DBTeamMember::get_from_team_full_many(
                 &team_ids, &**pool, &redis,
             )
-            .await?;
+            .await
+            .wrap_internal_err("fetching team members from database")?;
         let users = DBUser::get_many_ids(
             &teams_data.iter().map(|x| x.user_id).collect::<Vec<_>>(),
             &**pool,
             &redis,
         )
-        .await?;
+        .await
+        .wrap_internal_err("fetching users from database")?;
 
         let mut organizations = vec![];
         let mut team_groups = HashMap::new();
@@ -671,7 +726,10 @@ pub async fn orgs_list(
         }
 
         for data in organizations_data {
-            if !is_visible_organization(&data, &user, &pool, &redis).await? {
+            if !is_visible_organization(&data, &user, &pool, &redis)
+                .await
+                .wrap_api_err("checking organization visibility")?
+            {
                 continue;
             }
 
@@ -709,7 +767,7 @@ pub async fn orgs_list(
 
         Ok(HttpResponse::Ok().json(organizations))
     } else {
-        Err(ApiError::NotFound)
+        Err(ApiError::NotFound(eyre::eyre!("resource not found")))
     }
 }
 
@@ -759,24 +817,33 @@ pub async fn user_edit(
         &session_queue,
         Scopes::USER_WRITE,
     )
-    .await?;
+    .await
+    .wrap_auth_err("authenticating API request")?;
 
-    new_user.validate().map_err(|err| {
-        ApiError::Validation(validation_errors_to_string(err, None))
-    })?;
+    new_user
+        .validate()
+        .map_err(|err| eyre::eyre!(err))
+        .wrap_request_err("validating request")?;
 
-    let id_option = DBUser::get(&info.into_inner().0, &**pool, &redis).await?;
+    let id_option = DBUser::get(&info.into_inner().0, &**pool, &redis)
+        .await
+        .wrap_internal_err("fetching user from database")?;
 
     if let Some(actual_user) = id_option {
         let id = actual_user.id;
         let user_id: UserId = id.into();
 
         if user.id == user_id || user.role.is_mod() {
-            let mut transaction = pool.begin().await?;
+            let mut transaction = pool
+                .begin()
+                .await
+                .wrap_internal_err("starting database transaction")?;
 
             if let Some(username) = &new_user.username {
                 let existing_user_id_option =
-                    DBUser::get(username, &**pool, &redis).await?;
+                    DBUser::get(username, &**pool, &redis)
+                        .await
+                        .wrap_internal_err("fetching user from database")?;
 
                 if existing_user_id_option
                     .map(|x| UserId::from(x.id))
@@ -792,11 +859,12 @@ pub async fn user_edit(
                         id as crate::database::models::ids::DBUserId,
                     )
                     .execute(&mut transaction)
-                    .await?;
+                    .await
+                    .wrap_internal_err("querying database for `user_edit`")?;
                 } else {
-                    return Err(ApiError::InvalidInput(format!(
+                    return Err(ApiError::Request(eyre::eyre!(format!(
                         "Username {username} is taken!"
-                    )));
+                    ))));
                 }
             }
 
@@ -811,15 +879,15 @@ pub async fn user_edit(
                     id as crate::database::models::ids::DBUserId,
                 )
                 .execute(&mut transaction)
-                .await?;
+                .await
+                .wrap_internal_err("fetching bio from database")?;
             }
 
             if let Some(role) = &new_user.role {
                 if !user.role.is_admin() {
-                    return Err(ApiError::CustomAuthentication(
-                        "You do not have the permissions to edit the role of this user!"
-                            .to_string(),
-                    ));
+                    return Err(ApiError::Auth(eyre::eyre!(
+                        "You do not have the permissions to edit the role of this user!",
+                    )));
                 }
 
                 let role = role.to_string();
@@ -834,15 +902,15 @@ pub async fn user_edit(
                     id as crate::database::models::ids::DBUserId,
                 )
                 .execute(&mut transaction)
-                .await?;
+                .await
+                .wrap_internal_err("querying database for `user_edit`")?;
             }
 
             if let Some(badges) = &new_user.badges {
                 if !user.role.is_admin() {
-                    return Err(ApiError::CustomAuthentication(
-                        "You do not have the permissions to edit the badges of this user!"
-                            .to_string(),
-                    ));
+                    return Err(ApiError::Auth(eyre::eyre!(
+                        "You do not have the permissions to edit the badges of this user!",
+                    )));
                 }
 
                 sqlx::query!(
@@ -855,15 +923,15 @@ pub async fn user_edit(
                     id as crate::database::models::ids::DBUserId,
                 )
                 .execute(&mut transaction)
-                .await?;
+                .await
+                .wrap_internal_err("querying database for `user_edit`")?;
             }
 
             if let Some(venmo_handle) = &new_user.venmo_handle {
                 if !scopes.contains(Scopes::PAYOUTS_WRITE) {
-                    return Err(ApiError::CustomAuthentication(
-                        "You do not have the permissions to edit the venmo handle of this user!"
-                            .to_string(),
-                    ));
+                    return Err(ApiError::Auth(eyre::eyre!(
+                        "You do not have the permissions to edit the venmo handle of this user!",
+                    )));
                 }
 
                 sqlx::query!(
@@ -876,7 +944,8 @@ pub async fn user_edit(
                     id as crate::database::models::ids::DBUserId,
                 )
                 .execute(&mut transaction)
-                .await?;
+                .await
+                .wrap_internal_err("querying database for `user_edit`")?;
             }
 
             if let Some(allow_friend_requests) = &user.allow_friend_requests {
@@ -890,20 +959,27 @@ pub async fn user_edit(
                     id as crate::database::models::ids::DBUserId,
                 )
                 .execute(&mut transaction)
-                .await?;
+                .await
+                .wrap_internal_err(
+                    "fetching allow friend requests from database",
+                )?;
             }
 
-            transaction.commit().await?;
+            transaction
+                .commit()
+                .await
+                .wrap_internal_err("committing database transaction")?;
             DBUser::clear_caches(&[(id, Some(actual_user.username))], &redis)
-                .await?;
+                .await
+                .wrap_internal_err("clearing cached data from Redis")?;
             Ok(HttpResponse::NoContent().body(""))
         } else {
-            Err(ApiError::CustomAuthentication(
-                "You do not have permission to edit this user!".to_string(),
-            ))
+            Err(ApiError::Auth(eyre::eyre!(
+                "You do not have permission to edit this user!",
+            )))
         }
     } else {
-        Err(ApiError::NotFound)
+        Err(ApiError::NotFound(eyre::eyre!("resource not found")))
     }
 }
 
@@ -960,16 +1036,18 @@ pub async fn user_icon_edit(
         &session_queue,
         Scopes::USER_WRITE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
-    let id_option = DBUser::get(&info.into_inner().0, &**pool, &redis).await?;
+    let id_option = DBUser::get(&info.into_inner().0, &**pool, &redis)
+        .await
+        .wrap_internal_err("fetching user from database")?;
 
     if let Some(actual_user) = id_option {
         if user.id != actual_user.id.into() && !user.role.is_mod() {
-            return Err(ApiError::CustomAuthentication(
-                "You don't have permission to edit this user's icon."
-                    .to_string(),
-            ));
+            return Err(ApiError::Auth(eyre::eyre!(
+                "You don't have permission to edit this user's icon.",
+            )));
         }
 
         delete_old_images(
@@ -978,14 +1056,16 @@ pub async fn user_icon_edit(
             FileHostPublicity::Public,
             &**file_host,
         )
-        .await?;
+        .await
+        .wrap_api_err("deleting old images")?;
 
         let bytes = read_limited_from_payload(
             &mut payload,
             262144,
             "Icons must be smaller than 256KiB",
         )
-        .await?;
+        .await
+        .wrap_api_err("executing `read_limited_from_payload`")?;
 
         let user_id: UserId = actual_user.id.into();
         let upload_result = crate::util::img::upload_image_optimized(
@@ -997,7 +1077,8 @@ pub async fn user_icon_edit(
             Some(1.0),
             &**file_host,
         )
-        .await?;
+        .await
+        .wrap_api_err("uploading image")?;
 
         sqlx::query!(
             "
@@ -1010,12 +1091,15 @@ pub async fn user_icon_edit(
             actual_user.id as crate::database::models::ids::DBUserId,
         )
         .execute(&**pool)
-        .await?;
-        DBUser::clear_caches(&[(actual_user.id, None)], &redis).await?;
+        .await
+        .wrap_internal_err("querying database for `user_icon_edit`")?;
+        DBUser::clear_caches(&[(actual_user.id, None)], &redis)
+            .await
+            .wrap_internal_err("clearing cached data from Redis")?;
 
         Ok(HttpResponse::NoContent().body(""))
     } else {
-        Err(ApiError::NotFound)
+        Err(ApiError::NotFound(eyre::eyre!("resource not found")))
     }
 }
 
@@ -1047,16 +1131,18 @@ pub async fn user_icon_delete(
         &session_queue,
         Scopes::USER_WRITE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
-    let id_option = DBUser::get(&info.into_inner().0, &**pool, &redis).await?;
+    let id_option = DBUser::get(&info.into_inner().0, &**pool, &redis)
+        .await
+        .wrap_internal_err("fetching user from database")?;
 
     if let Some(actual_user) = id_option {
         if user.id != actual_user.id.into() && !user.role.is_mod() {
-            return Err(ApiError::CustomAuthentication(
-                "You don't have permission to edit this user's icon."
-                    .to_string(),
-            ));
+            return Err(ApiError::Auth(eyre::eyre!(
+                "You don't have permission to edit this user's icon.",
+            )));
         }
 
         delete_old_images(
@@ -1065,7 +1151,8 @@ pub async fn user_icon_delete(
             FileHostPublicity::Public,
             &**file_host,
         )
-        .await?;
+        .await
+        .wrap_api_err("deleting old images")?;
 
         sqlx::query!(
             "
@@ -1076,13 +1163,16 @@ pub async fn user_icon_delete(
             actual_user.id as crate::database::models::ids::DBUserId,
         )
         .execute(&**pool)
-        .await?;
+        .await
+        .wrap_internal_err("querying database for `user_icon_delete`")?;
 
-        DBUser::clear_caches(&[(actual_user.id, None)], &redis).await?;
+        DBUser::clear_caches(&[(actual_user.id, None)], &redis)
+            .await
+            .wrap_internal_err("clearing cached data from Redis")?;
 
         Ok(HttpResponse::NoContent().body(""))
     } else {
-        Err(ApiError::NotFound)
+        Err(ApiError::NotFound(eyre::eyre!("resource not found")))
     }
 }
 
@@ -1112,17 +1202,20 @@ pub async fn user_delete(
         &session_queue,
         Scopes::USER_DELETE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
     let id_option = DBUser::get(&info.into_inner().0, &**pool, &redis)
         .await
         .wrap_internal_err("failed to get user")?;
 
-    let id = id_option.map(|x| x.id).ok_or(ApiError::NotFound)?;
+    let id = id_option
+        .map(|x| x.id)
+        .wrap_not_found_err("resource not found")?;
     if !user.role.is_admin() && user.id != id.into() {
-        return Err(ApiError::CustomAuthentication(
-            "You do not have permission to delete this user!".to_string(),
-        ));
+        return Err(ApiError::Auth(eyre::eyre!(
+            "You do not have permission to delete this user!",
+        )));
     }
 
     let mut transaction = pool
@@ -1142,7 +1235,7 @@ pub async fn user_delete(
     if result.is_some() {
         Ok(())
     } else {
-        Err(ApiError::NotFound)
+        Err(ApiError::NotFound(eyre::eyre!("resource not found")))
     }
 }
 
@@ -1172,31 +1265,37 @@ pub async fn user_follows(
         &session_queue,
         Scopes::USER_READ,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
-    let id_option = DBUser::get(&info.into_inner().0, &**pool, &redis).await?;
+    let id_option = DBUser::get(&info.into_inner().0, &**pool, &redis)
+        .await
+        .wrap_internal_err("fetching user from database")?;
 
     if let Some(id) = id_option.map(|x| x.id) {
         if !user.role.is_admin() && user.id != id.into() {
-            return Err(ApiError::CustomAuthentication(
-                "You do not have permission to see the projects this user follows!".to_string(),
-            ));
+            return Err(ApiError::Auth(eyre::eyre!(
+                "You do not have permission to see the projects this user follows!",
+            )));
         }
 
-        let project_ids = DBUser::get_follows(id, &**pool).await?;
+        let project_ids = DBUser::get_follows(id, &**pool)
+            .await
+            .wrap_internal_err("fetching users from database")?;
         let projects: Vec<_> = crate::database::DBProject::get_many_ids(
             &project_ids,
             &**pool,
             &redis,
         )
-        .await?
+        .await
+        .wrap_api_err("fetching followed projects")?
         .into_iter()
         .map(Project::from)
         .collect();
 
         Ok(HttpResponse::Ok().json(projects))
     } else {
-        Err(ApiError::NotFound)
+        Err(ApiError::NotFound(eyre::eyre!("resource not found")))
     }
 }
 
@@ -1226,22 +1325,25 @@ pub async fn user_notifications(
         &session_queue,
         Scopes::NOTIFICATION_READ,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
-    let id_option = DBUser::get(&info.into_inner().0, &**pool, &redis).await?;
+    let id_option = DBUser::get(&info.into_inner().0, &**pool, &redis)
+        .await
+        .wrap_internal_err("fetching user from database")?;
 
     if let Some(id) = id_option.map(|x| x.id) {
         if !user.role.is_admin() && user.id != id.into() {
-            return Err(ApiError::CustomAuthentication(
-                "You do not have permission to see the notifications of this user!".to_string(),
-            ));
+            return Err(ApiError::Auth(eyre::eyre!(
+                "You do not have permission to see the notifications of this user!",
+            )));
         }
 
         let mut notifications: Vec<Notification> =
             crate::database::models::notification_item::DBNotification::get_many_user_exposed_on_site(
                 id, &**pool, &redis,
             )
-            .await?
+            .await.wrap_internal_err("fetching notifications from database")?
             .into_iter()
             .map(Into::into)
             .collect();
@@ -1249,6 +1351,6 @@ pub async fn user_notifications(
         notifications.sort_by_key(|b| Reverse(b.created));
         Ok(HttpResponse::Ok().json(notifications))
     } else {
-        Err(ApiError::NotFound)
+        Err(ApiError::NotFound(eyre::eyre!("resource not found")))
     }
 }
diff --git a/apps/labrinth/src/routes/v3/version_file.rs b/apps/labrinth/src/routes/v3/version_file.rs
index efda1648ad..929416b0c5 100644
--- a/apps/labrinth/src/routes/v3/version_file.rs
+++ b/apps/labrinth/src/routes/v3/version_file.rs
@@ -10,6 +10,8 @@ use crate::models::teams::ProjectPermissions;
 use crate::queue::session::AuthQueue;
 use crate::routes::internal::delphi;
 use crate::routes::{FileHash, HashAlgorithm};
+use crate::util::error::ApiContext as _;
+use crate::util::error::Context;
 use crate::{database, models};
 use actix_web::{HttpRequest, HttpResponse, delete, get, post, web};
 use dashmap::DashMap;
@@ -91,25 +93,30 @@ pub async fn get_version_from_hash(
         &**pool,
         &redis,
     )
-    .await?;
+    .await
+    .wrap_internal_err("fetching version from database")?;
     if let Some(file) = file {
         let version =
             database::models::DBVersion::get(file.version_id, &**pool, &redis)
-                .await?;
+                .await
+                .wrap_internal_err("fetching version from database")?;
         if let Some(version) = version {
             if !is_visible_version(&version.inner, &user_option, &pool, &redis)
-                .await?
+                .await
+                .wrap_api_err("checking version visibility")?
             {
-                return Err(ApiError::NotFound);
+                return Err(ApiError::NotFound(eyre::eyre!(
+                    "resource not found"
+                )));
             }
 
             Ok(HttpResponse::Ok()
                 .json(models::projects::Version::from(version)))
         } else {
-            Err(ApiError::NotFound)
+            Err(ApiError::NotFound(eyre::eyre!("resource not found")))
         }
     } else {
-        Err(ApiError::NotFound)
+        Err(ApiError::NotFound(eyre::eyre!("resource not found")))
     }
 }
 
@@ -217,20 +224,23 @@ pub async fn get_update_from_hash(
         &***pool,
         &redis,
     )
-    .await?
+    .await
+    .wrap_internal_err("querying database for `get_update_from_hash`")?
         && let Some(project) = database::models::DBProject::get_id(
             file.project_id,
             &***pool,
             &redis,
         )
-        .await?
+        .await
+        .wrap_api_err("fetching project for version file")?
     {
         let mut versions = database::models::DBVersion::get_many(
             &project.versions,
             &***pool,
             &redis,
         )
-        .await?
+        .await
+        .wrap_internal_err("fetching versions from database")?
         .into_iter()
         .filter(|x| {
             let mut bool = true;
@@ -259,9 +269,12 @@ pub async fn get_update_from_hash(
 
         if let Some(first) = versions.next_back() {
             if !is_visible_version(&first.inner, &user_option, &pool, &redis)
-                .await?
+                .await
+                .wrap_api_err("checking version visibility")?
             {
-                return Err(ApiError::NotFound);
+                return Err(ApiError::NotFound(eyre::eyre!(
+                    "resource not found"
+                )));
             }
 
             return Ok(
@@ -269,7 +282,7 @@ pub async fn get_update_from_hash(
             );
         }
     }
-    Err(ApiError::NotFound)
+    Err(ApiError::NotFound(eyre::eyre!("resource not found")))
 }
 
 // Requests above with multiple versions below
@@ -336,18 +349,21 @@ pub async fn get_versions_from_hashes(
         &***pool,
         &redis,
     )
-    .await?;
+    .await
+    .wrap_internal_err("fetching versions from database")?;
 
     let version_ids = files.iter().map(|x| x.version_id).collect::<Vec<_>>();
     let versions_data = filter_visible_versions(
         database::models::DBVersion::get_many(&version_ids, &***pool, &redis)
-            .await?,
+            .await
+            .wrap_internal_err("fetching versions from database")?,
         &user_option,
         &pool,
         pool.as_ref(),
         &redis,
     )
-    .await?;
+    .await
+    .wrap_api_err("filtering visible versions")?;
 
     let mut response = HashMap::new();
 
@@ -415,7 +431,8 @@ pub async fn get_projects_from_hashes(
         &**pool,
         &redis,
     )
-    .await?;
+    .await
+    .wrap_internal_err("fetching versions from database")?;
 
     let project_ids = files.iter().map(|x| x.project_id).collect::<Vec<_>>();
 
@@ -425,12 +442,14 @@ pub async fn get_projects_from_hashes(
             &**pool,
             &redis,
         )
-        .await?,
+        .await
+        .wrap_api_err("fetching projects for visibility filtering")?,
         &user_option,
         &pool,
         false,
     )
-    .await?;
+    .await
+    .wrap_api_err("filtering visible projects")?;
 
     let mut response = HashMap::new();
 
@@ -531,7 +550,9 @@ pub async fn update_files(
     update_data: web::Json<ManyUpdateData>,
 ) -> Result<web::Json<HashMap<String, models::projects::Version>>, ApiError> {
     let file_hashes_to_versions =
-        update_files_internal(pool, redis, update_data).await?;
+        update_files_internal(pool, redis, update_data)
+            .await
+            .wrap_api_err("updating files internal")?;
     let resp = file_hashes_to_versions
         .into_iter()
         .filter_map(|(hash, versions)| {
@@ -557,7 +578,8 @@ async fn update_files_internal(
         &***pool,
         &redis,
     )
-    .await?;
+    .await
+    .wrap_internal_err("updating versions in database")?;
 
     // TODO: de-hardcode this and actually use version fields system
     let update_version_ids = sqlx::query!(
@@ -592,7 +614,8 @@ async fn update_files_internal(
                 .push(database::models::DBVersionId(m.version_id));
             async move { Ok(acc) }
         })
-        .await?;
+        .await
+        .wrap_internal_err("fetching project version IDs from database")?;
 
     let versions = database::models::DBVersion::get_many(
         &update_version_ids
@@ -602,7 +625,8 @@ async fn update_files_internal(
         &***pool,
         &redis,
     )
-    .await?;
+    .await
+    .wrap_internal_err("updating versions in database")?;
 
     let mut response = HashMap::<String, Vec<models::projects::Version>>::new();
     for file in files {
@@ -697,14 +721,16 @@ pub async fn update_individual_files(
         &**pool,
         &redis,
     )
-    .await?;
+    .await
+    .wrap_internal_err("updating versions in database")?;
 
     let projects = database::models::DBProject::get_many_ids(
         &files.iter().map(|x| x.project_id).collect::<Vec<_>>(),
         &**pool,
         &redis,
     )
-    .await?;
+    .await
+    .wrap_api_err("fetching projects for version files")?;
     let all_versions = database::models::DBVersion::get_many(
         &projects
             .iter()
@@ -713,7 +739,8 @@ pub async fn update_individual_files(
         &**pool,
         &redis,
     )
-    .await?;
+    .await
+    .wrap_internal_err("fetching versions from database")?;
 
     let mut response = HashMap::new();
 
@@ -766,7 +793,8 @@ pub async fn update_individual_files(
                         &pool,
                         &redis,
                     )
-                    .await?
+                    .await
+                    .wrap_api_err("checking version visibility")?
                 {
                     response.insert(
                         hash.clone(),
@@ -830,7 +858,8 @@ pub async fn delete_file(
         &session_queue,
         Scopes::VERSION_WRITE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
     let hash = info.into_inner().0.to_lowercase();
@@ -844,7 +873,8 @@ pub async fn delete_file(
         &**pool,
         &redis,
     )
-    .await?;
+    .await
+    .wrap_internal_err("fetching version from database")?;
 
     if let Some(row) = file {
         if !user.role.is_admin() {
@@ -855,7 +885,7 @@ pub async fn delete_file(
                     &**pool,
                 )
                 .await
-                .map_err(ApiError::Database)?;
+                .wrap_internal_err("fetching version team member")?;
 
             let organization =
                 database::models::DBOrganization::get_associated_organization_project_id(
@@ -863,7 +893,7 @@ pub async fn delete_file(
                     &**pool,
                 )
                 .await
-                .map_err(ApiError::Database)?;
+                .wrap_internal_err("fetching project organization")?;
 
             let organization_team_member = if let Some(organization) =
                 &organization
@@ -875,7 +905,7 @@ pub async fn delete_file(
                     &**pool,
                 )
                 .await
-                .map_err(ApiError::Database)?
+                .wrap_internal_err("fetching organization team member")?
             } else {
                 None
             };
@@ -888,28 +918,32 @@ pub async fn delete_file(
             .unwrap_or_default();
 
             if !permissions.contains(ProjectPermissions::DELETE_VERSION) {
-                return Err(ApiError::CustomAuthentication(
-                    "You don't have permission to delete this file!"
-                        .to_string(),
-                ));
+                return Err(ApiError::Auth(eyre::eyre!(
+                    "You don't have permission to delete this file!",
+                )));
             }
         }
 
         let version =
             database::models::DBVersion::get(row.version_id, &**pool, &redis)
-                .await?;
+                .await
+                .wrap_internal_err("fetching version from database")?;
         if let Some(version) = version {
             if version.files.len() < 2 {
-                return Err(ApiError::InvalidInput(
-                    "Versions must have at least one file uploaded to them"
-                        .to_string(),
-                ));
+                return Err(ApiError::Request(eyre::eyre!(
+                    "Versions must have at least one file uploaded to them",
+                )));
             }
 
-            database::models::DBVersion::clear_cache(&version, &redis).await?;
+            database::models::DBVersion::clear_cache(&version, &redis)
+                .await
+                .wrap_internal_err("clearing cached data from Redis")?;
         }
 
-        let mut transaction = pool.begin().await?;
+        let mut transaction = pool
+            .begin()
+            .await
+            .wrap_internal_err("starting database transaction")?;
 
         sqlx::query!(
             "
@@ -919,7 +953,8 @@ pub async fn delete_file(
             row.id.0
         )
         .execute(&mut transaction)
-        .await?;
+        .await
+        .wrap_internal_err("querying database for `delete_file`")?;
 
         sqlx::query!(
             "
@@ -929,23 +964,30 @@ pub async fn delete_file(
             row.id.0,
         )
         .execute(&mut transaction)
-        .await?;
+        .await
+        .wrap_internal_err("querying database for `delete_file`")?;
 
         database::models::version_item::cleanup_unused_attribution_files_and_groups(&mut transaction)
-            .await?;
+            .await.wrap_internal_err("deleting version item from database")?;
 
         delphi::tech_review_sync::sync_project_tech_review_state(
             &[row.project_id],
             delphi::tech_review_sync::TechReviewExitReason::FileDeleted,
             &mut transaction,
         )
-        .await?;
+        .await
+        .wrap_api_err(
+            "executing `tech_review_sync::sync_project_tech_review_state`",
+        )?;
 
-        transaction.commit().await?;
+        transaction
+            .commit()
+            .await
+            .wrap_internal_err("committing database transaction")?;
 
         Ok(HttpResponse::NoContent().body(""))
     } else {
-        Err(ApiError::NotFound)
+        Err(ApiError::NotFound(eyre::eyre!("resource not found")))
     }
 }
 
@@ -1015,27 +1057,32 @@ pub async fn download_version(
         &**pool,
         &redis,
     )
-    .await?;
+    .await
+    .wrap_internal_err("fetching version from database")?;
 
     if let Some(file) = file {
         let version =
             database::models::DBVersion::get(file.version_id, &**pool, &redis)
-                .await?;
+                .await
+                .wrap_internal_err("fetching version from database")?;
 
         if let Some(version) = version {
             if !is_visible_version(&version.inner, &user_option, &pool, &redis)
-                .await?
+                .await
+                .wrap_api_err("checking version visibility")?
             {
-                return Err(ApiError::NotFound);
+                return Err(ApiError::NotFound(eyre::eyre!(
+                    "resource not found"
+                )));
             }
 
             Ok(HttpResponse::TemporaryRedirect()
                 .append_header(("Location", &*file.url))
                 .json(DownloadRedirect { url: file.url }))
         } else {
-            Err(ApiError::NotFound)
+            Err(ApiError::NotFound(eyre::eyre!("resource not found")))
         }
     } else {
-        Err(ApiError::NotFound)
+        Err(ApiError::NotFound(eyre::eyre!("resource not found")))
     }
 }
diff --git a/apps/labrinth/src/routes/v3/versions.rs b/apps/labrinth/src/routes/v3/versions.rs
index c09489bec3..377071142c 100644
--- a/apps/labrinth/src/routes/v3/versions.rs
+++ b/apps/labrinth/src/routes/v3/versions.rs
@@ -1,3 +1,4 @@
+use crate::util::error::ApiContext as _;
 use std::collections::HashMap;
 
 use super::ApiError;
@@ -27,8 +28,8 @@ use crate::queue::file_scan::get_files_missing_attribution;
 use crate::queue::session::AuthQueue;
 use crate::routes::internal::delphi;
 use crate::search::SearchState;
+use crate::util::error::Context;
 use crate::util::img;
-use crate::util::validate::validation_errors_to_string;
 use actix_web::{HttpRequest, HttpResponse, delete, get, patch, web};
 use ariadne::ids::base62_impl::parse_base62;
 use itertools::Itertools;
@@ -79,8 +80,9 @@ pub async fn version_project_get_helper(
     redis: web::Data<RedisPool>,
     session_queue: web::Data<AuthQueue>,
 ) -> Result<HttpResponse, ApiError> {
-    let result =
-        database::models::DBProject::get(&id.0, &***ro_pool, &redis).await?;
+    let result = database::models::DBProject::get(&id.0, &***ro_pool, &redis)
+        .await
+        .wrap_api_err("fetching project from database")?;
 
     let user_option = get_user_from_headers(
         &req,
@@ -95,9 +97,10 @@ pub async fn version_project_get_helper(
 
     if let Some(project) = result {
         if !is_visible_project(&project.inner, &user_option, &pool, false)
-            .await?
+            .await
+            .wrap_api_err("checking project visibility")?
         {
-            return Err(ApiError::NotFound);
+            return Err(ApiError::NotFound(eyre::eyre!("resource not found")));
         }
 
         let versions = database::models::DBVersion::get_many(
@@ -105,7 +108,8 @@ pub async fn version_project_get_helper(
             &***ro_pool,
             &redis,
         )
-        .await?;
+        .await
+        .wrap_internal_err("fetching versions from database")?;
 
         let id_opt = parse_base62(&id.1).ok();
         let version = versions.into_iter().find(|x| {
@@ -115,7 +119,8 @@ pub async fn version_project_get_helper(
 
         if let Some(version) = version
             && is_visible_version(&version.inner, &user_option, &pool, &redis)
-                .await?
+                .await
+                .wrap_api_err("checking version visibility")?
         {
             let version_id = version.inner.id;
             let mut v = models::projects::Version::from(version);
@@ -148,7 +153,7 @@ pub async fn version_project_get_helper(
         }
     }
 
-    Err(ApiError::NotFound)
+    Err(ApiError::NotFound(eyre::eyre!("resource not found")))
 }
 
 #[derive(Serialize, Deserialize)]
@@ -193,7 +198,8 @@ pub async fn versions_get(
     session_queue: web::Data<AuthQueue>,
 ) -> Result<HttpResponse, ApiError> {
     let version_ids =
-        serde_json::from_str::<Vec<models::ids::VersionId>>(&ids.ids)?
+        serde_json::from_str::<Vec<models::ids::VersionId>>(&ids.ids)
+            .wrap_request_err("deserializing JSON data")?
             .into_iter()
             .map(|x| x.into())
             .collect::<Vec<database::models::DBVersionId>>();
@@ -202,7 +208,8 @@ pub async fn versions_get(
         &***ro_pool,
         &redis,
     )
-    .await?;
+    .await
+    .wrap_internal_err("fetching versions from database")?;
 
     let user_option = get_user_from_headers(
         &req,
@@ -222,7 +229,8 @@ pub async fn versions_get(
         &ro_pool,
         &redis,
     )
-    .await?;
+    .await
+    .wrap_api_err("filtering visible versions")?;
 
     if !ids.include_changelog {
         for version in &mut versions {
@@ -282,7 +290,8 @@ pub async fn version_get_helper(
 ) -> Result<web::Json<models::projects::Version>, ApiError> {
     let version_data =
         database::models::DBVersion::get(id.into(), &***ro_pool, &redis)
-            .await?;
+            .await
+            .wrap_internal_err("fetching version from database")?;
 
     let user_option = get_user_from_headers(
         &req,
@@ -296,7 +305,9 @@ pub async fn version_get_helper(
     .ok();
 
     if let Some(data) = version_data
-        && is_visible_version(&data.inner, &user_option, &pool, &redis).await?
+        && is_visible_version(&data.inner, &user_option, &pool, &redis)
+            .await
+            .wrap_api_err("checking version visibility")?
     {
         let version_id = data.inner.id;
         let mut version = models::projects::Version::from(data);
@@ -329,7 +340,7 @@ pub async fn version_get_helper(
         return Ok(web::Json(version));
     }
 
-    Err(ApiError::NotFound)
+    Err(ApiError::NotFound(eyre::eyre!("resource not found")))
 }
 
 #[derive(Serialize, Deserialize, Validate, Default, Debug)]
@@ -431,7 +442,8 @@ pub async fn version_edit(
     search_state: web::Data<SearchState>,
 ) -> Result<HttpResponse, ApiError> {
     let new_version: EditVersion =
-        serde_json::from_value(new_version.into_inner())?;
+        serde_json::from_value(new_version.into_inner())
+            .wrap_request_err("deserializing JSON data")?;
     version_edit_helper(
         req,
         info.into_inner(),
@@ -459,17 +471,20 @@ pub async fn version_edit_helper(
         &session_queue,
         Scopes::VERSION_WRITE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
 
-    new_version.validate().map_err(|err| {
-        ApiError::Validation(validation_errors_to_string(err, None))
-    })?;
+    new_version
+        .validate()
+        .map_err(|err| eyre::eyre!(err))
+        .wrap_request_err("validating request")?;
 
     let version_id = info.0.into();
 
-    let result =
-        database::models::DBVersion::get(version_id, &**pool, &redis).await?;
+    let result = database::models::DBVersion::get(version_id, &**pool, &redis)
+        .await
+        .wrap_internal_err("fetching version from database")?;
 
     if let Some(version_item) = result {
         let team_member =
@@ -479,14 +494,16 @@ pub async fn version_edit_helper(
                 false,
                 &**pool,
             )
-            .await?;
+            .await
+            .wrap_internal_err("fetching team member from database")?;
 
         let organization =
             DBOrganization::get_associated_organization_project_id(
                 version_item.inner.project_id,
                 &**pool,
             )
-            .await?;
+            .await
+            .wrap_internal_err("fetching organization from database")?;
 
         let organization_team_member = if let Some(organization) = &organization
         {
@@ -495,7 +512,8 @@ pub async fn version_edit_helper(
                 user.id.into(),
                 &**pool,
             )
-            .await?
+            .await
+            .wrap_internal_err("fetching team member from database")?
         } else {
             None
         };
@@ -508,13 +526,15 @@ pub async fn version_edit_helper(
 
         if let Some(perms) = permissions {
             if !perms.contains(ProjectPermissions::UPLOAD_VERSION) {
-                return Err(ApiError::CustomAuthentication(
-                    "You do not have the permissions to edit this version!"
-                        .to_string(),
-                ));
+                return Err(ApiError::Auth(eyre::eyre!(
+                    "You do not have the permissions to edit this version!",
+                )));
             }
 
-            let mut transaction = pool.begin().await?;
+            let mut transaction = pool
+                .begin()
+                .await
+                .wrap_internal_err("starting database transaction")?;
 
             if let Some(name) = &new_version.name {
                 sqlx::query!(
@@ -527,7 +547,10 @@ pub async fn version_edit_helper(
                     version_id as database::models::ids::DBVersionId,
                 )
                 .execute(&mut transaction)
-                .await?;
+                .await
+                .wrap_internal_err(
+                    "querying database for `version_edit_helper`",
+                )?;
             }
 
             if let Some(number) = &new_version.version_number {
@@ -541,7 +564,10 @@ pub async fn version_edit_helper(
                     version_id as database::models::ids::DBVersionId,
                 )
                 .execute(&mut transaction)
-                .await?;
+                .await
+                .wrap_internal_err(
+                    "querying database for `version_edit_helper`",
+                )?;
             }
 
             if let Some(version_type) = &new_version.version_type {
@@ -555,7 +581,8 @@ pub async fn version_edit_helper(
                     version_id as database::models::ids::DBVersionId,
                 )
                 .execute(&mut transaction)
-                .await?;
+                .await
+                .wrap_internal_err("fetching version type from database")?;
             }
 
             if let Some(dependencies) = &new_version.dependencies {
@@ -566,7 +593,8 @@ pub async fn version_edit_helper(
                     version_id as database::models::ids::DBVersionId,
                 )
                 .execute(&mut transaction)
-                .await?;
+                .await
+                .wrap_internal_err("fetching dependencies from database")?;
 
                 let builders = dependencies
                     .iter()
@@ -583,7 +611,10 @@ pub async fn version_edit_helper(
                     version_item.inner.id,
                     &mut transaction,
                 )
-                .await?;
+                .await
+                .wrap_internal_err(
+                    "inserting database records for `version_edit_helper`",
+                )?;
             }
 
             if !new_version.fields.is_empty() {
@@ -595,7 +626,8 @@ pub async fn version_edit_helper(
 
                 let all_loaders =
                     loader_fields::Loader::list(&mut transaction, &redis)
-                        .await?;
+                        .await
+                        .wrap_internal_err("fetching loader from Redis")?;
                 let loader_ids = version_item
                     .loaders
                     .iter()
@@ -612,7 +644,8 @@ pub async fn version_edit_helper(
                     &mut transaction,
                     &redis,
                 )
-                .await?
+                .await
+                .wrap_internal_err("fetching loader field from Redis")?
                 .into_iter()
                 .filter(|lf| version_fields_names.contains(&lf.field))
                 .collect::<Vec<LoaderField>>();
@@ -631,7 +664,10 @@ pub async fn version_edit_helper(
                     &loader_field_ids
                 )
                 .execute(&mut transaction)
-                .await?;
+                .await
+                .wrap_internal_err(
+                    "querying database for `version_edit_helper`",
+                )?;
 
                 let mut loader_field_enum_values =
                     LoaderFieldEnumValue::list_many_loader_fields(
@@ -639,18 +675,19 @@ pub async fn version_edit_helper(
                         &mut transaction,
                         &redis,
                     )
-                    .await?;
+                    .await
+                    .wrap_internal_err(
+                        "fetching loader field enum value from Redis",
+                    )?;
 
                 let mut version_fields = Vec::new();
                 for (vf_name, vf_value) in new_version.fields {
                     let loader_field = loader_fields
                         .iter()
                         .find(|lf| lf.field == vf_name)
-                        .ok_or_else(|| {
-                            ApiError::InvalidInput(format!(
-                                "Loader field '{vf_name}' does not exist for any loaders supplied."
-                            ))
-                        })?;
+                        .wrap_request_err_with(|| format!(
+                                "loader field `{vf_name}` does not exist for any loaders supplied"
+                            ))?;
                     let enum_variants = loader_field_enum_values
                         .remove(&loader_field.id)
                         .unwrap_or_default();
@@ -660,11 +697,15 @@ pub async fn version_edit_helper(
                         vf_value.clone(),
                         enum_variants,
                     )
-                    .map_err(ApiError::InvalidInput)?;
+                    .map_err(eyre::Report::msg)
+                    .wrap_request_err("parsing version field")?;
                     version_fields.push(vf);
                 }
                 VersionField::insert_many(version_fields, &mut transaction)
-                    .await?;
+                    .await
+                    .wrap_internal_err(
+                        "inserting database records for `version_edit_helper`",
+                    )?;
             }
 
             if let Some(loaders) = &new_version.loaders {
@@ -675,7 +716,8 @@ pub async fn version_edit_helper(
                     version_id as database::models::ids::DBVersionId,
                 )
                 .execute(&mut transaction)
-                .await?;
+                .await
+                .wrap_internal_err("fetching loaders from database")?;
 
                 let mut loader_versions = Vec::new();
                 for loader in loaders {
@@ -685,20 +727,24 @@ pub async fn version_edit_helper(
                             &mut transaction,
                             &redis,
                         )
-                        .await?
-                        .ok_or_else(|| {
-                            ApiError::InvalidInput(
-                                "No database entry for loader provided."
-                                    .to_string(),
-                            )
-                        })?;
+                        .await
+                        .wrap_internal_err("fetching loader from Redis")?
+                        .wrap_request_err_with(
+                            || {
+                                "no database entry for loader provided."
+                                    .to_string()
+                            },
+                        )?;
                     loader_versions.push(DBLoaderVersion {
                         loader_id,
                         version_id,
                     });
                 }
                 DBLoaderVersion::insert_many(loader_versions, &mut transaction)
-                    .await?;
+                    .await
+                    .wrap_internal_err(
+                        "inserting loader versions into database",
+                    )?;
             }
 
             if let Some(featured) = &new_version.featured {
@@ -712,7 +758,8 @@ pub async fn version_edit_helper(
                     version_id as database::models::ids::DBVersionId,
                 )
                 .execute(&mut transaction)
-                .await?;
+                .await
+                .wrap_internal_err("fetching featured status from database")?;
             }
 
             if let Some(body) = &new_version.changelog {
@@ -726,14 +773,17 @@ pub async fn version_edit_helper(
                     version_id as database::models::ids::DBVersionId,
                 )
                 .execute(&mut transaction)
-                .await?;
+                .await
+                .wrap_internal_err(
+                    "querying database for `version_edit_helper`",
+                )?;
             }
 
             if let Some(downloads) = &new_version.downloads {
                 if !user.role.is_mod() {
-                    return Err(ApiError::CustomAuthentication(
-                        "You don't have permission to set the downloads of this mod".to_string(),
-                    ));
+                    return Err(ApiError::Auth(eyre::eyre!(
+                        "You don't have permission to set the downloads of this mod",
+                    )));
                 }
 
                 sqlx::query!(
@@ -746,7 +796,10 @@ pub async fn version_edit_helper(
                     version_id as database::models::ids::DBVersionId,
                 )
                 .execute(&mut transaction)
-                .await?;
+                .await
+                .wrap_internal_err(
+                    "querying database for `version_edit_helper`",
+                )?;
 
                 let diff = *downloads - (version_item.inner.downloads as u32);
 
@@ -761,14 +814,17 @@ pub async fn version_edit_helper(
                         as database::models::ids::DBProjectId,
                 )
                 .execute(&mut transaction)
-                .await?;
+                .await
+                .wrap_internal_err(
+                    "querying database for `version_edit_helper`",
+                )?;
             }
 
             if let Some(status) = &new_version.status {
                 if !status.can_be_requested() {
-                    return Err(ApiError::InvalidInput(
-                        "The requested status cannot be set!".to_string(),
-                    ));
+                    return Err(ApiError::Request(eyre::eyre!(
+                        "The requested status cannot be set!",
+                    )));
                 }
 
                 sqlx::query!(
@@ -781,7 +837,10 @@ pub async fn version_edit_helper(
                     version_id as database::models::ids::DBVersionId,
                 )
                 .execute(&mut transaction)
-                .await?;
+                .await
+                .wrap_internal_err(
+                    "querying database for `version_edit_helper`",
+                )?;
             }
 
             if let Some(file_types) = &new_version.file_types {
@@ -796,12 +855,15 @@ pub async fn version_edit_helper(
                         file_type.algorithm
                     )
                     .fetch_optional(&**pool)
-                    .await?
-                    .ok_or_else(|| {
-                        ApiError::InvalidInput(format!(
-                            "Specified file with hash {} does not exist.",
+                    .await
+                    .wrap_internal_err(
+                        "querying database for `version_edit_helper`",
+                    )?
+                    .wrap_request_err_with(|| {
+                        format!(
+                            "specified file with hash `{}` does not exist",
                             file_type.algorithm.clone()
-                        ))
+                        )
                     })?;
 
                     sqlx::query!(
@@ -814,7 +876,10 @@ pub async fn version_edit_helper(
                         file_type.file_type.as_ref().map(|x| x.as_str()),
                     )
                     .execute(&mut transaction)
-                    .await?;
+                    .await
+                    .wrap_internal_err(
+                        "querying database for `version_edit_helper`",
+                    )?;
                 }
             }
 
@@ -829,7 +894,10 @@ pub async fn version_edit_helper(
                     version_id as database::models::ids::DBVersionId,
                 )
                 .execute(&mut transaction)
-                .await?;
+                .await
+                .wrap_internal_err(
+                    "querying database for `version_edit_helper`",
+                )?;
             }
 
             // delete any images no longer in the changelog
@@ -847,18 +915,24 @@ pub async fn version_edit_helper(
                 &mut transaction,
                 &redis,
             )
-            .await?;
+            .await
+            .wrap_api_err("deleting unused images")?;
 
-            transaction.commit().await?;
+            transaction
+                .commit()
+                .await
+                .wrap_internal_err("committing database transaction")?;
             database::models::DBVersion::clear_cache(&version_item, &redis)
-                .await?;
+                .await
+                .wrap_internal_err("clearing cached data from Redis")?;
             database::models::DBProject::clear_cache(
                 version_item.inner.project_id,
                 None,
                 Some(true),
                 &redis,
             )
-            .await?;
+            .await
+            .wrap_internal_err("clearing cached data from Redis")?;
             search_state
                 .queue
                 .push_version_changes(
@@ -868,12 +942,12 @@ pub async fn version_edit_helper(
                 .await;
             Ok(HttpResponse::NoContent().body(""))
         } else {
-            Err(ApiError::CustomAuthentication(
-                "You do not have permission to edit this version!".to_string(),
-            ))
+            Err(ApiError::Auth(eyre::eyre!(
+                "You do not have permission to edit this version!",
+            )))
         }
     } else {
-        Err(ApiError::NotFound)
+        Err(ApiError::NotFound(eyre::eyre!("resource not found")))
     }
 }
 
@@ -949,8 +1023,9 @@ pub async fn version_list_internal(
 ) -> Result<HttpResponse, ApiError> {
     let string = info.into_inner().0;
 
-    let result =
-        database::models::DBProject::get(&string, &***ro_pool, &redis).await?;
+    let result = database::models::DBProject::get(&string, &***ro_pool, &redis)
+        .await
+        .wrap_api_err("fetching project from database")?;
 
     let user_option = get_user_from_headers(
         &req,
@@ -965,9 +1040,10 @@ pub async fn version_list_internal(
 
     if let Some(project) = result {
         if !is_visible_project(&project.inner, &user_option, &pool, false)
-            .await?
+            .await
+            .wrap_api_err("checking project visibility")?
         {
-            return Err(ApiError::NotFound);
+            return Err(ApiError::NotFound(eyre::eyre!("resource not found")));
         }
 
         let loader_field_filters = filters.loader_fields.as_ref().map(|x| {
@@ -982,7 +1058,8 @@ pub async fn version_list_internal(
             &***ro_pool,
             &redis,
         )
-        .await?
+        .await
+        .wrap_internal_err("fetching versions from database")?
         .into_iter()
         .filter(|x| {
             let mut bool = true;
@@ -1048,7 +1125,7 @@ pub async fn version_list_internal(
                     &redis,
                 ),
             )
-            .await?;
+            .await.wrap_internal_err("fetching minecraft game version from Redis")?;
 
             let mut joined_filters = Vec::new();
             for game_version in &game_versions {
@@ -1093,7 +1170,8 @@ pub async fn version_list_internal(
             &ro_pool,
             &redis,
         )
-        .await?;
+        .await
+        .wrap_api_err("filtering visible versions")?;
 
         if !filters.include_changelog {
             for version in &mut response {
@@ -1103,7 +1181,7 @@ pub async fn version_list_internal(
 
         Ok(HttpResponse::Ok().json(response))
     } else {
-        Err(ApiError::NotFound)
+        Err(ApiError::NotFound(eyre::eyre!("resource not found")))
     }
 }
 
@@ -1154,16 +1232,16 @@ pub async fn version_delete(
         &session_queue,
         Scopes::VERSION_DELETE,
     )
-    .await?
+    .await
+    .wrap_auth_err("authenticating API request")?
     .1;
     let id = info.into_inner().0;
 
     let version = database::models::DBVersion::get(id.into(), &**pool, &redis)
-        .await?
-        .ok_or_else(|| {
-            ApiError::InvalidInput(
-                "The specified version does not exist!".to_string(),
-            )
+        .await
+        .wrap_internal_err("fetching version from database")?
+        .wrap_request_err_with(|| {
+            "the specified version does not exist!".to_string()
         })?;
 
     if !user.role.is_admin() {
@@ -1175,14 +1253,15 @@ pub async fn version_delete(
                 &**pool,
             )
             .await
-            .map_err(ApiError::Database)?;
+            .wrap_internal_err("fetching project team member")?;
 
         let organization =
             DBOrganization::get_associated_organization_project_id(
                 version.inner.project_id,
                 &**pool,
             )
-            .await?;
+            .await
+            .wrap_internal_err("fetching organization from database")?;
 
         let organization_team_member = if let Some(organization) = &organization
         {
@@ -1191,7 +1270,8 @@ pub async fn version_delete(
                 user.id.into(),
                 &**pool,
             )
-            .await?
+            .await
+            .wrap_internal_err("fetching team member from database")?
         } else {
             None
         };
@@ -1203,14 +1283,16 @@ pub async fn version_delete(
         .unwrap_or_default();
 
         if !permissions.contains(ProjectPermissions::DELETE_VERSION) {
-            return Err(ApiError::CustomAuthentication(
-                "You do not have permission to delete versions in this team"
-                    .to_string(),
-            ));
+            return Err(ApiError::Auth(eyre::eyre!(
+                "You do not have permission to delete versions in this team",
+            )));
         }
     }
 
-    let mut transaction = pool.begin().await?;
+    let mut transaction = pool
+        .begin()
+        .await
+        .wrap_internal_err("starting database transaction")?;
 
     let context = ImageContext::Version {
         version_id: Some(version.inner.id.into()),
@@ -1219,9 +1301,12 @@ pub async fn version_delete(
         context,
         &mut transaction,
     )
-    .await?;
+    .await
+    .wrap_internal_err("fetching images from database")?;
     for image in uploaded_images {
-        image_item::DBImage::remove(image.id, &mut transaction, &redis).await?;
+        image_item::DBImage::remove(image.id, &mut transaction, &redis)
+            .await
+            .wrap_internal_err("deleting image from database")?;
     }
 
     let result = database::models::DBVersion::remove_full(
@@ -1229,16 +1314,23 @@ pub async fn version_delete(
         &redis,
         &mut transaction,
     )
-    .await?;
+    .await
+    .wrap_internal_err("deleting version from database")?;
 
     delphi::tech_review_sync::sync_project_tech_review_state(
         &[version.inner.project_id],
         delphi::tech_review_sync::TechReviewExitReason::FileDeleted,
         &mut transaction,
     )
-    .await?;
+    .await
+    .wrap_api_err(
+        "executing `tech_review_sync::sync_project_tech_review_state`",
+    )?;
 
-    transaction.commit().await?;
+    transaction
+        .commit()
+        .await
+        .wrap_internal_err("committing database transaction")?;
 
     database::models::DBProject::clear_cache(
         version.inner.project_id,
@@ -1246,7 +1338,8 @@ pub async fn version_delete(
         Some(true),
         &redis,
     )
-    .await?;
+    .await
+    .wrap_internal_err("clearing cached data from Redis")?;
     search_state
         .queue
         .push_version_changes(
@@ -1257,6 +1350,6 @@ pub async fn version_delete(
     if result.is_some() {
         Ok(HttpResponse::NoContent().body(""))
     } else {
-        Err(ApiError::NotFound)
+        Err(ApiError::NotFound(eyre::eyre!("resource not found")))
     }
 }
diff --git a/apps/labrinth/src/search/backend/elasticsearch/mod.rs b/apps/labrinth/src/search/backend/elasticsearch/mod.rs
index 7e41cd93f9..b6474bd61d 100644
--- a/apps/labrinth/src/search/backend/elasticsearch/mod.rs
+++ b/apps/labrinth/src/search/backend/elasticsearch/mod.rs
@@ -4,6 +4,7 @@
 //! This keeps version filters correlated without duplicating every version
 //! into its project document.
 
+use crate::util::error::ApiContext as _;
 use async_trait::async_trait;
 use eyre::{Result, eyre};
 use itertools::Itertools;
@@ -388,7 +389,7 @@ impl Elasticsearch {
             .wrap_internal_err("failed to execute Elasticsearch search")?;
         let mut body = response_json(response, "execute Elasticsearch search")
             .await
-            .map_err(ApiError::Internal)?;
+            .wrap_internal_err("parsing Elasticsearch search response")?;
         if sort_only && !body["hits"]["hits"].is_array() {
             body["hits"]["hits"] = Value::Array(Vec::new());
         }
@@ -410,12 +411,15 @@ impl Elasticsearch {
             .wrap_internal_err("failed to open Elasticsearch point in time")?;
         let body = response_json(response, "open Elasticsearch point in time")
             .await
-            .map_err(ApiError::Internal)?;
-        body["id"].as_str().map(ToOwned::to_owned).ok_or_else(|| {
-            ApiError::Internal(eyre!(
-                "Elasticsearch point in time response did not contain an ID"
-            ))
-        })
+            .wrap_internal_err(
+                "parsing Elasticsearch point-in-time response",
+            )?;
+        body["id"]
+            .as_str()
+            .map(ToOwned::to_owned)
+            .wrap_internal_err(
+                "finding ID in Elasticsearch point-in-time response",
+            )
     }
 
     async fn close_point_in_time(&self, id: &str) -> Result<(), ApiError> {
@@ -428,7 +432,9 @@ impl Elasticsearch {
             .wrap_internal_err("failed to close Elasticsearch point in time")?;
         response_json(response, "close Elasticsearch point in time")
             .await
-            .map_err(ApiError::Internal)?;
+            .wrap_internal_err(
+                "parsing Elasticsearch point-in-time response",
+            )?;
         Ok(())
     }
 
@@ -456,7 +462,9 @@ impl Elasticsearch {
             "execute Elasticsearch point in time search",
         )
         .await
-        .map_err(ApiError::Internal)?;
+        .wrap_internal_err(
+            "parsing Elasticsearch point-in-time search response",
+        )?;
         if sort_only && !body["hits"]["hits"].is_array() {
             body["hits"]["hits"] = Value::Array(Vec::new());
         }
@@ -472,7 +480,10 @@ impl Elasticsearch {
         offset: usize,
         size: usize,
     ) -> Result<Value, ApiError> {
-        let mut point_in_time_id = self.open_point_in_time(alias).await?;
+        let mut point_in_time_id = self
+            .open_point_in_time(alias)
+            .await
+            .wrap_api_err("executing `open_point_in_time`")?;
         let result = self
             .execute_deep_search_with_point_in_time(
                 query,
@@ -517,7 +528,10 @@ impl Elasticsearch {
                 "id": point_in_time_id,
                 "keep_alive": "1m"
             });
-            let body = self.execute_point_in_time_search(&body, true).await?;
+            let body = self
+                .execute_point_in_time_search(&body, true)
+                .await
+                .wrap_api_err("executing `execute_point_in_time_search`")?;
             if let Some(id) = body["pit_id"].as_str() {
                 *point_in_time_id = id.to_string();
             }
@@ -579,7 +593,10 @@ impl Elasticsearch {
             "id": point_in_time_id,
             "keep_alive": "1m"
         });
-        let body = self.execute_point_in_time_search(&body, false).await?;
+        let body = self
+            .execute_point_in_time_search(&body, false)
+            .await
+            .wrap_api_err("executing `execute_point_in_time_search`")?;
         if let Some(id) = body["pit_id"].as_str() {
             *point_in_time_id = id.to_string();
         }
@@ -832,10 +849,13 @@ impl Elasticsearch {
         &self,
         info: &SearchRequest,
     ) -> Result<SearchResults, ApiError> {
-        let parsed = parse_search_request(info)?;
+        let parsed = parse_search_request(info)
+            .wrap_api_err("executing `parse_search_request`")?;
         let search_sort =
-            parse_search_index(parsed.index, info.new_filters.as_deref())?;
-        let filter = Self::build_filter(info)?;
+            parse_search_index(parsed.index, info.new_filters.as_deref())
+                .wrap_api_err("executing `parse_search_index`")?;
+        let filter = Self::build_filter(info)
+            .wrap_api_err("executing `Self::build_filter`")?;
         let mut filters = vec![json!({"term": {"document_type": "project"}})];
         if let Some(filter) = &filter {
             filters.push(filter.query.clone());
@@ -858,7 +878,8 @@ impl Elasticsearch {
                 parsed.offset,
                 parsed.hits_per_page,
             )
-            .await?
+            .await
+            .wrap_api_err("executing `execute_deep_search`")?
         } else {
             let body = Self::search_body(
                 &query,
@@ -869,7 +890,9 @@ impl Elasticsearch {
                 None,
                 true,
             );
-            self.execute_search(&alias, &body, false).await?
+            self.execute_search(&alias, &body, false)
+                .await
+                .wrap_api_err("executing `execute_search`")?
         };
         let total_hits = body["hits"]["total"]["value"]
             .as_u64()
diff --git a/apps/labrinth/src/search/backend/typesense/mod.rs b/apps/labrinth/src/search/backend/typesense/mod.rs
index e65232106c..6c7e407730 100644
--- a/apps/labrinth/src/search/backend/typesense/mod.rs
+++ b/apps/labrinth/src/search/backend/typesense/mod.rs
@@ -137,6 +137,7 @@
 //! enabled. This avoids repeating joins for popular queries at the cost of
 //! results remaining stale for Typesense's default 60-second cache lifetime.
 
+use crate::util::error::ApiContext as _;
 use std::sync::LazyLock;
 
 use async_trait::async_trait;
@@ -911,7 +912,8 @@ impl Typesense {
         new_filters: Option<&str>,
         request_config: &RequestConfig,
     ) -> Result<(String, String), ApiError> {
-        let sort = parse_search_index(index, new_filters)?;
+        let sort = parse_search_index(index, new_filters)
+            .wrap_api_err("executing `parse_search_index`")?;
         let alias = self.config.get_alias_name("projects");
         Ok((alias, self.get_sort_fields(sort.index, request_config)))
     }
@@ -1047,14 +1049,18 @@ impl SearchBackend for Typesense {
         &self,
         info: &SearchRequest,
     ) -> Result<SearchResults, ApiError> {
-        let parsed = parse_search_request(info)?;
-        let (collection_alias, sort_by) = self.get_sort_index(
-            parsed.index,
-            info.new_filters.as_deref(),
-            &info.typesense_config,
-        )?;
+        let parsed = parse_search_request(info)
+            .wrap_api_err("executing `parse_search_request`")?;
+        let (collection_alias, sort_by) = self
+            .get_sort_index(
+                parsed.index,
+                info.new_filters.as_deref(),
+                &info.typesense_config,
+            )
+            .wrap_api_err("fetching sort index")?;
         let versions_alias = self.config.get_alias_name("versions");
-        let filter_by = Self::build_filter(info, &versions_alias)?;
+        let filter_by = Self::build_filter(info, &versions_alias)
+            .wrap_api_err("executing `Self::build_filter`")?;
 
         let q = if parsed.query.is_empty() {
             "*"
diff --git a/apps/labrinth/src/search/mod.rs b/apps/labrinth/src/search/mod.rs
index 690efe149a..9df4220e71 100644
--- a/apps/labrinth/src/search/mod.rs
+++ b/apps/labrinth/src/search/mod.rs
@@ -4,6 +4,8 @@ use crate::models::ids::{ProjectId, VersionId};
 use crate::models::projects::DependencyType;
 use crate::queue::server_ping;
 use crate::routes::ApiError;
+use crate::util::error::ApiContext as _;
+use crate::util::error::Context as _;
 use crate::{database::PgPool, env::ENV};
 use ariadne::ids::base62_impl::parse_base62;
 use async_trait::async_trait;
@@ -94,10 +96,13 @@ pub trait SearchBackend: Send + Sync {
         info: &SearchRequest,
         redis: &RedisPool,
     ) -> Result<SearchResults, ApiError> {
-        let mut results = self.search_for_project_raw(info).await?;
+        let mut results = self
+            .search_for_project_raw(info)
+            .await
+            .wrap_api_err("searching projects")?;
         hydrate_search_results(&mut results.hits, redis)
             .await
-            .map_err(ApiError::Internal)?;
+            .wrap_internal_err("hydrating search results from database")?;
         Ok(results)
     }
 
diff --git a/apps/labrinth/src/util/avalara1099.rs b/apps/labrinth/src/util/avalara1099.rs
index d36e5edf62..8b9ebfb329 100644
--- a/apps/labrinth/src/util/avalara1099.rs
+++ b/apps/labrinth/src/util/avalara1099.rs
@@ -1,6 +1,8 @@
 use crate::database::models::{DBUserId, users_compliance::FormType};
 use crate::env::ENV;
 use crate::routes::ApiError;
+use crate::util::error::ApiContext as _;
+use crate::util::error::Context as _;
 use ariadne::ids::base62_impl::to_base62;
 use chrono::Datelike;
 use serde::{Deserialize, Serialize};
@@ -62,7 +64,8 @@ pub async fn request_form(
     }
 
     let (request_builder, company_id) =
-        team_request(reqwest::Method::POST, "/form_requests")?;
+        team_request(reqwest::Method::POST, "/form_requests")
+            .wrap_api_err("executing `team_request`")?;
 
     let response = request_builder
         .json(&DataWrapper {
@@ -84,12 +87,19 @@ pub async fn request_form(
             },
         })
         .send()
-        .await?;
+        .await
+        .wrap_internal_err("deserializing HTTP response")?;
 
     Ok(if response.status().is_success() {
-        Ok(response.json::<DataWrapper<FormResponse>>().await?)
+        Ok(response
+            .json::<DataWrapper<FormResponse>>()
+            .await
+            .wrap_internal_err("deserializing HTTP response")?)
     } else {
-        Err(response.json().await?)
+        Err(response
+            .json()
+            .await
+            .wrap_internal_err("deserializing HTTP response")?)
     })
 }
 
@@ -104,12 +114,18 @@ pub async fn check_form(
         &format!(
             "/w9forms?filter[reference_id_eq]={reference_id}&page[number]=1&page[size]=1"
         ),
-    )?;
+    ).wrap_api_err("executing `team_request`")?;
 
-    let response = request_builder.send().await?;
+    let response = request_builder
+        .send()
+        .await
+        .wrap_internal_err("sending HTTP request")?;
 
     Ok(if response.status().is_success() {
-        let body = response.text().await?;
+        let body = response
+            .text()
+            .await
+            .wrap_internal_err("reading HTTP response body")?;
         let serde_result =
             serde_json::from_str::<ListWrapper<W9FormsResponse>>(&body);
 
@@ -118,13 +134,16 @@ pub async fn check_form(
                 Ok(list_wrapper.data.pop().map(|data| DataWrapper { data }))
             }
             Err(e) => {
-                return Err(ApiError::InvalidInput(format!(
+                return Err(ApiError::Request(eyre::eyre!(format!(
                     "Error parsing avalara1099 response: {e}. Actual response body: {body}"
-                )));
+                ))));
             }
         }
     } else {
-        Err(response.json().await?)
+        Err(response
+            .json()
+            .await
+            .wrap_internal_err("deserializing HTTP response")?)
     })
 }
 
diff --git a/apps/labrinth/src/util/captcha.rs b/apps/labrinth/src/util/captcha.rs
index af32e51927..b2cabe52c0 100644
--- a/apps/labrinth/src/util/captcha.rs
+++ b/apps/labrinth/src/util/captcha.rs
@@ -1,5 +1,6 @@
 use crate::env::ENV;
 use crate::routes::ApiError;
+use crate::util::error::Context as _;
 use actix_web::HttpRequest;
 use serde::Deserialize;
 use std::collections::HashMap;
@@ -26,7 +27,7 @@ pub async fn check_hcaptcha(
         conn_info.peer_addr()
     };
 
-    let ip_addr = ip_addr.ok_or(ApiError::Turnstile)?;
+    let ip_addr = ip_addr.wrap_request_err("captcha validation failed")?;
 
     let client = reqwest::Client::new();
 
@@ -46,10 +47,11 @@ pub async fn check_hcaptcha(
         .form(&form)
         .send()
         .await
-        .map_err(|_| ApiError::Turnstile)?
+        .wrap_request_err("captcha validation failed")?
         .json()
         .await
-        .map_err(|_| ApiError::Turnstile)?;
+        .map_err(|err| eyre::eyre!(err))
+        .wrap_request_err("captcha validation failed")?;
 
     Ok(val.success)
 }
diff --git a/apps/labrinth/src/util/error.rs b/apps/labrinth/src/util/error.rs
index 5f9ff343c2..8b52a20c7b 100644
--- a/apps/labrinth/src/util/error.rs
+++ b/apps/labrinth/src/util/error.rs
@@ -5,6 +5,31 @@ use std::{
 
 use crate::routes::ApiError;
 
+/// Adds context to an [`ApiError`] while preserving its HTTP status variant.
+pub trait ApiContext<T>: Sized {
+    /// Wraps the report held by the error variant with a lazily-created message.
+    fn wrap_api_err_with<D>(self, f: impl FnOnce() -> D) -> Result<T, ApiError>
+    where
+        D: Send + Sync + Debug + Display + 'static;
+
+    /// Wraps the report held by the error variant with the given message.
+    fn wrap_api_err<D>(self, msg: D) -> Result<T, ApiError>
+    where
+        D: Send + Sync + Debug + Display + 'static,
+    {
+        self.wrap_api_err_with(|| msg)
+    }
+}
+
+impl<T> ApiContext<T> for Result<T, ApiError> {
+    fn wrap_api_err_with<D>(self, f: impl FnOnce() -> D) -> Result<T, ApiError>
+    where
+        D: Send + Sync + Debug + Display + 'static,
+    {
+        self.map_err(|error| error.wrap_err(f()))
+    }
+}
+
 /// Allows wrapping [`Result`]s and [`Option`]s into [`Result<T, ApiError>`]s.
 #[allow(
     clippy::missing_errors_doc,
@@ -85,6 +110,133 @@ pub trait Context<T, E>: Sized {
     {
         self.wrap_auth_err_with(|| msg)
     }
+
+    /// Maps the error variant into an [`ApiError::NotFound`] using the closure to create the message.
+    #[inline]
+    fn wrap_not_found_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::NotFound)
+    }
+
+    /// Maps the error variant into an [`ApiError::NotFound`] with the given message.
+    #[inline]
+    fn wrap_not_found_err<D>(self, msg: D) -> Result<T, ApiError>
+    where
+        D: Send + Sync + Debug + Display + 'static,
+    {
+        self.wrap_not_found_err_with(|| msg)
+    }
+
+    /// Maps the error variant into an [`ApiError::Conflict`] using the closure to create the message.
+    #[inline]
+    fn wrap_conflict_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::Conflict)
+    }
+
+    /// Maps the error variant into an [`ApiError::Conflict`] with the given message.
+    #[inline]
+    fn wrap_conflict_err<D>(self, msg: D) -> Result<T, ApiError>
+    where
+        D: Send + Sync + Debug + Display + 'static,
+    {
+        self.wrap_conflict_err_with(|| msg)
+    }
+
+    /// Maps the error variant into an [`ApiError::FailedDependency`] using the closure to create the message.
+    #[inline]
+    fn wrap_failed_dependency_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::FailedDependency)
+    }
+
+    /// Maps the error variant into an [`ApiError::FailedDependency`] with the given message.
+    #[inline]
+    fn wrap_failed_dependency_err<D>(self, msg: D) -> Result<T, ApiError>
+    where
+        D: Send + Sync + Debug + Display + 'static,
+    {
+        self.wrap_failed_dependency_err_with(|| msg)
+    }
+
+    /// Maps the error variant into an [`ApiError::PreconditionRequired`] using the closure to create the message.
+    #[inline]
+    fn wrap_precondition_required_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::PreconditionRequired)
+    }
+
+    /// Maps the error variant into an [`ApiError::PreconditionRequired`] with the given message.
+    #[inline]
+    fn wrap_precondition_required_err<D>(self, msg: D) -> Result<T, ApiError>
+    where
+        D: Send + Sync + Debug + Display + 'static,
+    {
+        self.wrap_precondition_required_err_with(|| msg)
+    }
+
+    /// Maps the error variant into an [`ApiError::PreconditionFailed`] using the closure to create the message.
+    #[inline]
+    fn wrap_precondition_failed_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::PreconditionFailed)
+    }
+
+    /// Maps the error variant into an [`ApiError::PreconditionFailed`] with the given message.
+    #[inline]
+    fn wrap_precondition_failed_err<D>(self, msg: D) -> Result<T, ApiError>
+    where
+        D: Send + Sync + Debug + Display + 'static,
+    {
+        self.wrap_precondition_failed_err_with(|| msg)
+    }
+
+    /// Maps the error variant into an [`ApiError::RateLimit`] using the closure to create the message.
+    #[inline]
+    fn wrap_rate_limit_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::RateLimit)
+    }
+
+    /// Maps the error variant into an [`ApiError::RateLimit`] with the given message.
+    #[inline]
+    fn wrap_rate_limit_err<D>(self, msg: D) -> Result<T, ApiError>
+    where
+        D: Send + Sync + Debug + Display + 'static,
+    {
+        self.wrap_rate_limit_err_with(|| msg)
+    }
 }
 
 impl<T, E> Context<T, E> for Result<T, E>
@@ -146,6 +298,40 @@ mod tests {
 
         let auth_error = ApiError::Auth(eyre::eyre!("auth error"));
         assert_eq!(auth_error.status_code(), StatusCode::UNAUTHORIZED);
+
+        let not_found_error =
+            ApiError::NotFound(eyre::eyre!("not found error"));
+        assert_eq!(not_found_error.status_code(), StatusCode::NOT_FOUND);
+
+        let conflict_error = ApiError::Conflict(eyre::eyre!("conflict error"));
+        assert_eq!(conflict_error.status_code(), StatusCode::CONFLICT);
+
+        let dependency_error =
+            ApiError::FailedDependency(eyre::eyre!("dependency error"));
+        assert_eq!(
+            dependency_error.status_code(),
+            StatusCode::FAILED_DEPENDENCY
+        );
+
+        let required_error = ApiError::PreconditionRequired(eyre::eyre!(
+            "precondition required error"
+        ));
+        assert_eq!(
+            required_error.status_code(),
+            StatusCode::PRECONDITION_REQUIRED
+        );
+
+        let failed_error = ApiError::PreconditionFailed(eyre::eyre!(
+            "precondition failed error"
+        ));
+        assert_eq!(failed_error.status_code(), StatusCode::PRECONDITION_FAILED);
+
+        let rate_limit_error =
+            ApiError::RateLimit(eyre::eyre!("rate limit error"));
+        assert_eq!(
+            rate_limit_error.status_code(),
+            StatusCode::TOO_MANY_REQUESTS
+        );
     }
 
     #[test]
@@ -237,6 +423,68 @@ mod tests {
         }
     }
 
+    #[test]
+    fn test_context_trait_status_errors() {
+        let not_found: Option<i32> = None;
+        assert!(matches!(
+            not_found.wrap_not_found_err("missing value").unwrap_err(),
+            ApiError::NotFound(_)
+        ));
+
+        let conflict: Option<i32> = None;
+        assert!(matches!(
+            conflict.wrap_conflict_err("conflicting value").unwrap_err(),
+            ApiError::Conflict(_)
+        ));
+
+        let dependency: Option<i32> = None;
+        assert!(matches!(
+            dependency
+                .wrap_failed_dependency_err("dependency failed")
+                .unwrap_err(),
+            ApiError::FailedDependency(_)
+        ));
+
+        let required: Option<i32> = None;
+        assert!(matches!(
+            required
+                .wrap_precondition_required_err("precondition required")
+                .unwrap_err(),
+            ApiError::PreconditionRequired(_)
+        ));
+
+        let failed: Option<i32> = None;
+        assert!(matches!(
+            failed
+                .wrap_precondition_failed_err("precondition failed")
+                .unwrap_err(),
+            ApiError::PreconditionFailed(_)
+        ));
+
+        let rate_limit: Option<i32> = None;
+        assert!(matches!(
+            rate_limit
+                .wrap_rate_limit_err("rate limit exceeded")
+                .unwrap_err(),
+            ApiError::RateLimit(_)
+        ));
+    }
+
+    #[test]
+    fn test_api_context_preserves_status_variant() {
+        let result: Result<(), ApiError> =
+            Err(ApiError::NotFound(eyre::eyre!("missing value")));
+        let error = result.wrap_api_err("fetching test value").unwrap_err();
+
+        match error {
+            ApiError::NotFound(report) => {
+                assert_eq!(report.to_string(), "fetching test value");
+                assert!(format!("{report:#}").contains("missing value"));
+            }
+            _ => panic!("expected NotFound error"),
+        }
+    }
+
     #[test]
     fn test_context_trait_with_closure() {
         let result: Result<i32, std::io::Error> = Err(std::io::Error::new(
diff --git a/apps/labrinth/src/util/gotenberg.rs b/apps/labrinth/src/util/gotenberg.rs
index 0c1a3248b0..6fd4f3661b 100644
--- a/apps/labrinth/src/util/gotenberg.rs
+++ b/apps/labrinth/src/util/gotenberg.rs
@@ -2,6 +2,7 @@ use crate::env::ENV;
 use crate::models::ids::PayoutId;
 use crate::routes::ApiError;
 use crate::routes::internal::gotenberg::{GotenbergDocument, GotenbergError};
+use crate::util::error::ApiContext as _;
 use crate::util::error::Context;
 use actix_web::http::header::HeaderName;
 use chrono::{DateTime, Datelike, Utc};
@@ -166,7 +167,7 @@ impl GotenbergClient {
             .await
             .wrap_internal_err("failed to submit HTML to Gotenberg")?
             .error_for_status()
-            .wrap_internal_err("Gotenberg returned an error status")?;
+            .wrap_internal_err("received an error status from Gotenberg")?;
 
         Ok(())
     }
@@ -190,7 +191,9 @@ impl GotenbergClient {
         &self,
         statement: &PaymentStatement,
     ) -> Result<GotenbergDocument, ApiError> {
-        self.generate_payment_statement(statement).await?;
+        self.generate_payment_statement(statement)
+            .await
+            .wrap_api_err("executing `generate_payment_statement`")?;
 
         let timeout_ms = ENV.GOTENBERG_TIMEOUT;
         let redis_timeout_ms =
@@ -205,7 +208,7 @@ impl GotenbergClient {
                 .brpop(&response_key, Duration::from_millis(redis_timeout_ms)),
         )
         .await
-        .wrap_internal_err("Gotenberg document generation timed out")?
+        .wrap_internal_err("timed out generating Gotenberg document")?
         .wrap_internal_err("failed to get document over Redis")?
         .wrap_internal_err("no document was returned from Redis")?;
 
@@ -213,7 +216,7 @@ impl GotenbergClient {
             Result<GotenbergDocument, GotenbergError>,
         >(&document)
         .wrap_internal_err("failed to deserialize Redis document response")?
-        .wrap_internal_err("Gotenberg document generation failed")?;
+        .wrap_internal_err("failed to generate Gotenberg document")?;
 
         Ok(document)
     }
diff --git a/apps/labrinth/src/util/img.rs b/apps/labrinth/src/util/img.rs
index ecbecb3470..613d86666e 100644
--- a/apps/labrinth/src/util/img.rs
+++ b/apps/labrinth/src/util/img.rs
@@ -4,6 +4,7 @@ use crate::env::ENV;
 use crate::file_hosting::{FileHost, FileHostPublicity};
 use crate::models::images::ImageContext;
 use crate::routes::ApiError;
+use crate::util::error::Context as _;
 use color_thief::ColorFormat;
 use hex::ToHex;
 use image::imageops::FilterType;
@@ -54,10 +55,8 @@ pub async fn upload_image_optimized(
     file_host: &dyn FileHost,
 ) -> Result<UploadImageResult, ApiError> {
     let content_type = crate::util::ext::get_image_content_type(file_extension)
-        .ok_or_else(|| {
-            ApiError::InvalidInput(format!(
-                "Invalid format for image: {file_extension}"
-            ))
+        .wrap_request_err_with(|| {
+            format!("invalid format for image: {file_extension}")
         })?;
 
     let cdn_url = &ENV.CDN_URL;
@@ -68,8 +67,10 @@ pub async fn upload_image_optimized(
         content_type,
         target_width,
         min_aspect_ratio,
-    )?;
-    let color = get_color_from_img(&bytes)?;
+    )
+    .wrap_request_err("processing uploaded image")?;
+    let color = get_color_from_img(&bytes)
+        .wrap_request_err("extracting color from uploaded image")?;
 
     // Only upload the processed image if it's smaller than the original
     let processed_upload_data = if processed_image.len() < bytes.len() {
@@ -87,7 +88,8 @@ pub async fn upload_image_optimized(
                     publicity,
                     processed_image,
                 )
-                .await?,
+                .await
+                .wrap_internal_err("uploading file to file host")?,
         )
     } else {
         None
@@ -100,7 +102,8 @@ pub async fn upload_image_optimized(
             publicity,
             bytes,
         )
-        .await?;
+        .await
+        .wrap_internal_err("uploading file to file host")?;
 
     let url = format!("{}/{}", cdn_url, upload_data.file_name);
     Ok(UploadImageResult {
@@ -182,7 +185,10 @@ pub async fn delete_old_images(
         let name = image_url.split(&cdn_url_start).nth(1);
 
         if let Some(icon_path) = name {
-            file_host.delete_file(icon_path, publicity).await?;
+            file_host
+                .delete_file(icon_path, publicity)
+                .await
+                .wrap_internal_err("deleting file from file host")?;
         }
     }
 
@@ -190,7 +196,10 @@ pub async fn delete_old_images(
         let name = raw_image_url.split(&cdn_url_start).nth(1);
 
         if let Some(icon_path) = name {
-            file_host.delete_file(icon_path, publicity).await?;
+            file_host
+                .delete_file(icon_path, publicity)
+                .await
+                .wrap_internal_err("deleting file from file host")?;
         }
     }
 
@@ -208,7 +217,8 @@ pub async fn delete_unused_images(
 ) -> Result<(), ApiError> {
     let uploaded_images =
         database::models::DBImage::get_many_contexted(context, transaction)
-            .await?;
+            .await
+            .wrap_internal_err("fetching images from database")?;
 
     for image in uploaded_images {
         let mut should_delete = true;
@@ -220,8 +230,12 @@ pub async fn delete_unused_images(
         }
 
         if should_delete {
-            image_item::DBImage::remove(image.id, transaction, redis).await?;
-            image_item::DBImage::clear_cache(image.id, redis).await?;
+            image_item::DBImage::remove(image.id, transaction, redis)
+                .await
+                .wrap_internal_err("deleting image from database")?;
+            image_item::DBImage::clear_cache(image.id, redis)
+                .await
+                .wrap_internal_err("clearing cached data from Redis")?;
         }
     }
 
diff --git a/apps/labrinth/src/util/ratelimit.rs b/apps/labrinth/src/util/ratelimit.rs
index 3bac6cabe8..8bb340080f 100644
--- a/apps/labrinth/src/util/ratelimit.rs
+++ b/apps/labrinth/src/util/ratelimit.rs
@@ -178,10 +178,10 @@ pub async fn rate_limit_middleware(
 
             Ok(service_response.map_into_left_body())
         } else {
-            let mut response = ApiError::RateLimitError(
-                decision.retry_after_ms.unwrap_or(0) as u128,
-                decision.limit,
-            )
+            let retry_after_ms = decision.retry_after_ms.unwrap_or(0);
+            let mut response = ApiError::RateLimit(eyre::eyre!(
+                "rate limit exceeded; retry after {retry_after_ms} milliseconds"
+            ))
             .error_response();
 
             // Add rate limit headers
@@ -220,10 +220,9 @@ pub async fn rate_limit_middleware(
             Ok(req.into_response(response.map_into_right_body()))
         }
     } else {
-        let response = ApiError::CustomAuthentication(
-            "Unable to obtain user IP address!".to_string(),
-        )
-        .error_response();
+        let response =
+            ApiError::Auth(eyre::eyre!("Unable to obtain user IP address!",))
+                .error_response();
 
         Ok(req.into_response(response.map_into_right_body()))
     }
diff --git a/apps/labrinth/src/util/routes.rs b/apps/labrinth/src/util/routes.rs
index c963937213..c753988375 100644
--- a/apps/labrinth/src/util/routes.rs
+++ b/apps/labrinth/src/util/routes.rs
@@ -1,6 +1,6 @@
 use crate::routes::ApiError;
 use crate::routes::v3::project_creation::CreateError;
-use crate::util::validate::validation_errors_to_string;
+use crate::util::error::Context as _;
 use actix_multipart::Field;
 use actix_web::web::Payload;
 use bytes::BytesMut;
@@ -16,13 +16,13 @@ pub async fn read_limited_from_payload(
     let mut bytes = BytesMut::new();
     while let Some(item) = payload.next().await {
         if bytes.len() >= cap {
-            return Err(ApiError::InvalidInput(String::from(err_msg)));
+            return Err(ApiError::Request(eyre::eyre!(String::from(err_msg))));
         } else {
-            bytes.extend_from_slice(&item.map_err(|_| {
-                ApiError::InvalidInput(
-                    "Unable to parse bytes in payload sent!".to_string(),
-                )
-            })?);
+            bytes.extend_from_slice(
+                &item.map_err(|err| eyre::eyre!(err)).wrap_request_err(
+                    "unable to parse bytes in payload sent!".to_string(),
+                )?,
+            );
         }
     }
     Ok(bytes)
@@ -36,17 +36,19 @@ where
 {
     let mut bytes = BytesMut::new();
     while let Some(item) = payload.next().await {
-        bytes.extend_from_slice(&item.map_err(|_| {
-            ApiError::InvalidInput(
-                "Unable to parse bytes in payload sent!".to_string(),
-            )
-        })?);
+        bytes.extend_from_slice(
+            &item.map_err(|err| eyre::eyre!(err)).wrap_request_err(
+                "unable to parse bytes in payload sent!".to_string(),
+            )?,
+        );
     }
 
-    let parsed: T = serde_json::from_slice(&bytes)?;
-    parsed.validate().map_err(|err| {
-        ApiError::InvalidInput(validation_errors_to_string(err, None))
-    })?;
+    let parsed: T = serde_json::from_slice(&bytes)
+        .wrap_request_err("deserializing JSON data")?;
+    parsed
+        .validate()
+        .map_err(|err| eyre::eyre!(err))
+        .wrap_request_err("validating request")?;
     Ok(parsed)
 }
 
diff --git a/apps/labrinth/src/util/webhook.rs b/apps/labrinth/src/util/webhook.rs
index aa0978ee5a..8ce75b6afe 100644
--- a/apps/labrinth/src/util/webhook.rs
+++ b/apps/labrinth/src/util/webhook.rs
@@ -1,6 +1,8 @@
 use crate::database::models::legacy_loader_fields::MinecraftGameVersion;
 use crate::models::ids::ProjectId;
 use crate::routes::ApiError;
+use crate::util::error::ApiContext as _;
+use crate::util::error::Context as _;
 use crate::{database::PgPool, env::ENV};
 use ariadne::ids::base62_impl::to_base62;
 use chrono::{DateTime, Utc};
@@ -51,7 +53,8 @@ async fn get_webhook_metadata(
         pool,
         redis,
     )
-    .await?;
+    .await
+    .wrap_api_err("fetching webhook project")?;
 
     if let Some(mut project) = project {
         let mut owner = None;
@@ -62,7 +65,7 @@ async fn get_webhook_metadata(
                 pool,
                 redis,
             )
-            .await?;
+            .await.wrap_internal_err("fetching organization from database")?;
 
             if let Some(organization) = organization {
                 owner = Some(WebhookAuthor {
@@ -81,7 +84,7 @@ async fn get_webhook_metadata(
                 pool,
                 redis,
             )
-            .await?;
+            .await.wrap_internal_err("fetching team member from database")?;
 
             if let Some(member) = team.into_iter().find(|x| x.is_owner) {
                 let user = crate::database::models::user_item::DBUser::get_id(
@@ -89,7 +92,8 @@ async fn get_webhook_metadata(
                     pool,
                     redis,
                 )
-                .await?;
+                .await
+                .wrap_internal_err("fetching user from database")?;
 
                 if let Some(user) = user {
                     owner = Some(WebhookAuthor {
@@ -106,7 +110,11 @@ async fn get_webhook_metadata(
         };
 
         let all_game_versions =
-            MinecraftGameVersion::list(None, None, pool, redis).await?;
+            MinecraftGameVersion::list(None, None, pool, redis)
+                .await
+                .wrap_internal_err(
+                    "fetching minecraft game version from Redis",
+                )?;
 
         let versions = project
             .aggregate_version_fields
@@ -249,9 +257,7 @@ pub async fn send_slack_payout_source_alert_webhook(
         }))
         .send()
         .await
-        .map_err(|_| {
-            ApiError::Slack("Error while sending projects webhook".to_string())
-        })?;
+        .map_err(|err| eyre::eyre!(err)).wrap_internal_err("error while sending projects webhook".to_string())?;
 
     Ok(())
 }
@@ -263,7 +269,9 @@ pub async fn send_slack_project_webhook(
     webhook_url: &str,
     message: Option<String>,
 ) -> Result<(), ApiError> {
-    let metadata = get_webhook_metadata(project_id, pool, redis).await?;
+    let metadata = get_webhook_metadata(project_id, pool, redis)
+        .await
+        .wrap_api_err("fetching webhook metadata")?;
 
     if let Some(metadata) = metadata {
         let mut blocks = vec![];
@@ -365,11 +373,10 @@ pub async fn send_slack_project_webhook(
             }))
             .send()
             .await
-            .map_err(|_| {
-                ApiError::Slack(
-                    "Error while sending projects webhook".to_string(),
-                )
-            })?;
+            .map_err(|err| eyre::eyre!(err))
+            .wrap_internal_err(
+                "error while sending projects webhook".to_string(),
+            )?;
     }
 
     Ok(())
@@ -434,7 +441,9 @@ pub async fn send_discord_webhook(
     webhook_url: &str,
     message: Option<String>,
 ) -> Result<(), ApiError> {
-    let metadata = get_webhook_metadata(project_id, pool, redis).await?;
+    let metadata = get_webhook_metadata(project_id, pool, redis)
+        .await
+        .wrap_api_err("fetching webhook metadata")?;
 
     if let Some(project) = metadata {
         let mut fields = vec![];
@@ -503,11 +512,10 @@ pub async fn send_discord_webhook(
             })
             .send()
             .await
-            .map_err(|_| {
-                ApiError::Discord(
-                    "Error while sending projects webhook".to_string(),
-                )
-            })?;
+            .map_err(|err| eyre::eyre!(err))
+            .wrap_failed_dependency_err(
+                "error while sending projects webhook".to_string(),
+            )?;
     }
 
     Ok(())

From 6ed044a54b9c6d138a487035ab523e244ccc04f2 Mon Sep 17 00:00:00 2001
From: Truman Gao <106889354+tdgao@users.noreply.github.com>
Date: Fri, 7 Aug 2026 10:04:04 -0600
Subject: [PATCH 49/82] fix: multiple compatible downloads showing as radio
 button (#7050)

---
 .../ProjectDownloadModal/DownloadProject.vue  | 38 ++++++++-----------
 1 file changed, 15 insertions(+), 23 deletions(-)

diff --git a/apps/frontend/src/components/ui/ProjectDownloadModal/DownloadProject.vue b/apps/frontend/src/components/ui/ProjectDownloadModal/DownloadProject.vue
index 976b2a681f..e267253398 100644
--- a/apps/frontend/src/components/ui/ProjectDownloadModal/DownloadProject.vue
+++ b/apps/frontend/src/components/ui/ProjectDownloadModal/DownloadProject.vue
@@ -82,10 +82,8 @@
 
 	<div
 		v-if="selectedVersion && downloadDataLoaded"
-		:role="compatibleVersions.length > 1 ? 'radiogroup' : undefined"
-		:aria-label="
-			compatibleVersions.length > 1 ? formatMessage(messages.compatibleVersionTitle) : undefined
-		"
+		:role="showVersionSelector ? 'radiogroup' : undefined"
+		:aria-label="showVersionSelector ? formatMessage(messages.compatibleVersionTitle) : undefined"
 		class="flex flex-col gap-2.5"
 	>
 		<h3
@@ -102,26 +100,12 @@
 			:download-reason="downloadReason"
 			:current-game-version="currentGameVersion"
 			:current-platform="currentPlatform"
-			:selectable="compatibleVersions.length > 1"
+			:selectable="showVersionSelector"
 			:selected="compatibleVersion.id === selectedVersion.id"
-			:show-download="
-				compatibleVersions.length === 1 || compatibleVersion.id === selectedVersion.id
-			"
-			:color="
-				compatibleVersion.id === selectedVersion.id &&
-				compatibleVersions.length === 1 &&
-				!hasAdditionalDownloads
-					? 'brand'
-					: 'standard'
-			"
-			:type="
-				compatibleVersion.id === selectedVersion.id &&
-				compatibleVersions.length === 1 &&
-				!hasAdditionalDownloads
-					? 'standard'
-					: 'transparent'
-			"
-			:circular="hasAdditionalDownloads || compatibleVersions.length > 1"
+			:show-download="!showVersionSelector || compatibleVersion.id === selectedVersion.id"
+			:color="isPrimaryDownloadVersion(compatibleVersion) ? 'brand' : 'standard'"
+			:type="isPrimaryDownloadVersion(compatibleVersion) ? 'standard' : 'transparent'"
+			:circular="!isPrimaryDownloadVersion(compatibleVersion)"
 			@select="selectCompatibleVersion(compatibleVersion)"
 			@download="emit('download')"
 		/>
@@ -494,6 +478,10 @@ const hasAdditionalDownloads = computed(() => {
 	return hrefs.size > 1
 })
 
+const showVersionSelector = computed(
+	() => hasAdditionalDownloads.value && compatibleVersions.value.length > 1,
+)
+
 watch(
 	[currentGameVersion, currentPlatform, selectedVersion, selectedPrimaryFile],
 	() => {
@@ -539,6 +527,10 @@ function selectCompatibleVersion(version: Labrinth.Versions.v3.Version) {
 	userSelectedCompatibleVersionId.value = version.id
 }
 
+function isPrimaryDownloadVersion(version: Labrinth.Versions.v3.Version) {
+	return !hasAdditionalDownloads.value && version.id === defaultSelectedVersion.value?.id
+}
+
 function latestVersionByType(type: Labrinth.Versions.v3.VersionChannel) {
 	return filteredVersions.value
 		.filter((version) => version.version_type === type)

From a71a361e0f044d628bcb5129cea8be61cdebb565 Mon Sep 17 00:00:00 2001
From: Blodhgarm <blodhgrm@gmail.com>
Date: Fri, 7 Aug 2026 11:45:37 -0500
Subject: [PATCH 50/82] feat: Allow for adjustable alignment of main content on
 certain pages for content moderators (#7034)

* Add type safety and validation for moderation settings

* Add ability for moderators to adjust page layout for discover, project, moderation pages

Primarily for changes to have more tooling present without overlapping important info
---
 apps/frontend/src/assets/styles/layout.scss  | 24 +++++++++++
 apps/frontend/src/pages/[type]/[project].vue | 30 ++++++++------
 apps/frontend/src/pages/discover.vue         |  8 +++-
 apps/frontend/src/pages/moderation.vue       |  9 +++-
 packages/moderation/src/data/settings.ts     | 27 ++++++++----
 packages/moderation/src/handles/settings.ts  | 15 ++++++-
 packages/moderation/src/types/settings.ts    | 43 ++++++++++++++++++--
 7 files changed, 129 insertions(+), 27 deletions(-)

diff --git a/apps/frontend/src/assets/styles/layout.scss b/apps/frontend/src/assets/styles/layout.scss
index 83debb8ff8..d633ed8df9 100644
--- a/apps/frontend/src/assets/styles/layout.scss
+++ b/apps/frontend/src/assets/styles/layout.scss
@@ -111,6 +111,18 @@
 				max-width: 100%;
 			}
 		}
+
+		&.align-x {
+			margin: 0 auto;
+		}
+
+		&.align-l {
+			margin: 0 0 0 auto;
+		}
+
+		&.align-r {
+			margin: 0 auto 0 0;
+		}
 	}
 
 	.normal-page__sidebar {
@@ -140,6 +152,18 @@
 		'sidebar'
 		/ 100%;
 
+	&.align-x {
+		margin: 0 auto;
+	}
+
+	&.align-l {
+		margin: 0 0 0 auto;
+	}
+
+	&.align-r {
+		margin: 0 auto 0 0;
+	}
+
 	@media screen and (min-width: 1024px) {
 		&.sidebar {
 			grid-template:
diff --git a/apps/frontend/src/pages/[type]/[project].vue b/apps/frontend/src/pages/[type]/[project].vue
index d3a89b1d27..6b2b092f30 100644
--- a/apps/frontend/src/pages/[type]/[project].vue
+++ b/apps/frontend/src/pages/[type]/[project].vue
@@ -4,7 +4,7 @@
 			<ProjectBackgroundGradient :project="project" />
 		</Teleport>
 		<template v-if="isSettings">
-			<div v-if="canAccessSettings" class="normal-page no-sidebar">
+			<div v-if="canAccessSettings" class="normal-page no-sidebar" :class="`align-${marginTarget}`">
 				<div class="normal-page__header">
 					<div
 						class="mb-4 flex flex-wrap items-center gap-x-2 gap-y-3 border-0 border-b-[1px] border-solid border-divider pb-4 text-lg font-semibold"
@@ -94,17 +94,20 @@
 			/>
 			<div
 				class="new-page sidebar"
-				:class="{
-					'alt-layout': cosmetics.leftContentLayout,
-					'checklist-open':
-						showModerationChecklist &&
-						!collapsedModerationChecklist &&
-						!flags.alwaysShowChecklistAsPopup,
-					'checklist-collapsed':
-						showModerationChecklist &&
-						collapsedModerationChecklist &&
-						!flags.alwaysShowChecklistAsPopup,
-				}"
+				:class="[
+					{
+						'alt-layout': cosmetics.leftContentLayout,
+						'checklist-open':
+							showModerationChecklist &&
+							!collapsedModerationChecklist &&
+							!flags.alwaysShowChecklistAsPopup,
+						'checklist-collapsed':
+							showModerationChecklist &&
+							collapsedModerationChecklist &&
+							!flags.alwaysShowChecklistAsPopup,
+					},
+					`align-${marginTarget}`,
+				]"
 			>
 				<div
 					class="normal-page__header relative mb-4"
@@ -511,7 +514,7 @@ import {
 	SettingsIcon,
 	XIcon,
 } from '@modrinth/assets'
-import { moderationSettings } from '@modrinth/moderation'
+import { getMarginTarget, moderationSettings } from '@modrinth/moderation'
 import {
 	Admonition,
 	Avatar,
@@ -583,6 +586,7 @@ const config = useRuntimeConfig()
 const moderationQueue = useModerationQueue()
 const keybinds = useModerationKeybinds()
 const modSettings = useModerationSettings()
+const marginTarget = computed(() => getMarginTarget(modSettings.value))
 const notifications = injectNotificationManager()
 const { addNotification } = notifications
 
diff --git a/apps/frontend/src/pages/discover.vue b/apps/frontend/src/pages/discover.vue
index 7b0f537acb..74f3699db8 100644
--- a/apps/frontend/src/pages/discover.vue
+++ b/apps/frontend/src/pages/discover.vue
@@ -1,12 +1,15 @@
 <script setup lang="ts">
+import { getMarginTarget } from '@modrinth/moderation'
 import { commonProjectTypeCategoryMessages, NavTabs, useVIntl } from '@modrinth/ui'
 
 const { formatMessage } = useVIntl()
 
 const flags = useFeatureFlags()
 const route = useRoute()
+const modSettings = useModerationSettings()
 
 const allowTabChanging = computed(() => !route.query.sid)
+const marginTarget = computed(() => getMarginTarget(modSettings.value))
 
 const selectableProjectTypes = [
 	{
@@ -47,7 +50,10 @@ const selectableProjectTypes = [
 ]
 </script>
 <template>
-	<div class="mx-auto box-border flex w-full max-w-[1280px] flex-col gap-4 px-6 pb-6">
+	<div
+		class="box-border flex w-full max-w-[1280px] flex-col gap-4 px-6 pb-6"
+		:class="`m${marginTarget}-auto`"
+	>
 		<NavTabs
 			v-if="!flags.projectTypesPrimaryNav && allowTabChanging"
 			:links="selectableProjectTypes"
diff --git a/apps/frontend/src/pages/moderation.vue b/apps/frontend/src/pages/moderation.vue
index 9352acabba..4334b52079 100644
--- a/apps/frontend/src/pages/moderation.vue
+++ b/apps/frontend/src/pages/moderation.vue
@@ -1,5 +1,8 @@
 <template>
-	<div class="relative mx-auto mb-6 flex min-h-screen w-full max-w-[1280px] flex-col px-6">
+	<div
+		class="relativemb-6 flex min-h-screen w-full max-w-[1280px] flex-col px-6"
+		:class="`m${marginTarget}-auto`"
+	>
 		<h1>Moderation</h1>
 		<NavTabs :links="moderationLinks" class="mb-4 hidden sm:flex" />
 		<div class="mb-4 sm:hidden">
@@ -16,6 +19,7 @@
 
 <script setup lang="ts">
 import { FolderIcon, GlobeIcon, HashIcon, ReportIcon, ShieldCheckIcon } from '@modrinth/assets'
+import { getMarginTarget } from '@modrinth/moderation'
 import { Chips, defineMessages, NavTabs, useVIntl } from '@modrinth/ui'
 
 definePageMeta({
@@ -30,6 +34,9 @@ const { formatMessage } = useVIntl()
 const route = useRoute()
 const router = useRouter()
 
+const modSettings = useModerationSettings()
+const marginTarget = computed(() => getMarginTarget(modSettings.value))
+
 const messages = defineMessages({
 	projectsTitle: {
 		id: 'moderation.page.projects',
diff --git a/packages/moderation/src/data/settings.ts b/packages/moderation/src/data/settings.ts
index 25c8ccff4a..432aa09d2b 100644
--- a/packages/moderation/src/data/settings.ts
+++ b/packages/moderation/src/data/settings.ts
@@ -1,8 +1,8 @@
-import type { EnumSettingDefinition, ToggleSettingDefinition } from '../types/settings.ts'
+import { setting } from '../types/settings.ts'
 
 const settings = {
 	General: {
-		ChecklistPosition: {
+		ChecklistPosition: setting.asEnum({
 			type: 'enum',
 			id: 'checklist-position',
 			title: 'Checklist Position',
@@ -12,21 +12,34 @@ const settings = {
 				{ value: 'right', label: 'Right' },
 			],
 			default: 'right',
-		} as EnumSettingDefinition,
-		ProjectKeybinds: {
+		}),
+		ProjectKeybinds: setting.asToggle({
 			type: 'toggle',
 			id: 'project-keybinds',
 			title: 'Enable Project Keybinds',
 			description: 'Weather certain keybinds should work without the checklist visible.',
 			default: false,
-		} as ToggleSettingDefinition,
-		PrivateMessageHighlight: {
+		}),
+		PrivateMessageHighlight: setting.asToggle({
 			type: 'toggle',
 			id: 'private-message-highlight',
 			title: 'Highlight Private Messages',
 			description: 'Whether private messages should be highlighted in the chat.',
 			default: true,
-		} as ToggleSettingDefinition,
+		}),
+		AdjustPageAlignment: setting.asEnum({
+			type: 'enum',
+			id: 'adjust-page-alignment',
+			title: 'Adjust Page Alignment',
+			description:
+				'Whether the main page elements should be centered or offset opposite to the Checklist Position.',
+			entries: [
+				{ value: 'never', label: 'Never' },
+				{ value: 'checklist-present', label: 'Checklist Needed' },
+				{ value: 'always', label: 'Always' },
+			],
+			default: 'never',
+		}),
 	},
 } as const
 
diff --git a/packages/moderation/src/handles/settings.ts b/packages/moderation/src/handles/settings.ts
index 6109596d8b..8b48c79ddb 100644
--- a/packages/moderation/src/handles/settings.ts
+++ b/packages/moderation/src/handles/settings.ts
@@ -1,4 +1,5 @@
-import type { SettingDefinitionBase } from '../types/settings.ts'
+import { isValidFor, type SettingDefinitionBase } from '../types/settings.ts'
+import { moderationSettings } from '../index.ts'
 
 export class Settings {
 	private readonly settings: { [id: string]: any }
@@ -13,7 +14,9 @@ export class Settings {
 	}
 
 	get<T>(definition: SettingDefinitionBase<T>): T {
-		return this.settings[definition.id] ?? definition.default
+		const value = this.settings[definition.id]
+
+		return (isValidFor(definition, value) ? value : undefined) ?? definition.default
 	}
 
 	set<T>(definition: SettingDefinitionBase<T>, value?: T): void {
@@ -23,3 +26,11 @@ export class Settings {
 		this.onChange()
 	}
 }
+
+export function getMarginTarget(settings: Settings): string {
+	return settings.get(moderationSettings.General.AdjustPageAlignment) == 'always'
+		? settings.get(moderationSettings.General.ChecklistPosition) == 'right'
+			? 'r'
+			: 'l'
+		: 'x'
+}
diff --git a/packages/moderation/src/types/settings.ts b/packages/moderation/src/types/settings.ts
index 7cf1f91ee7..1bdbb64d6a 100644
--- a/packages/moderation/src/types/settings.ts
+++ b/packages/moderation/src/types/settings.ts
@@ -1,5 +1,5 @@
 export interface SettingDefinitionBase<T> {
-	type: string
+	type: SettingDefinitionTypes
 	id: string
 	title: string
 	description: string
@@ -11,16 +11,53 @@ export interface ToggleSettingDefinition extends SettingDefinitionBase<boolean>
 	type: 'toggle'
 }
 
-export interface EnumSettingDefinition extends SettingDefinitionBase<string> {
+export interface EnumSettingDefinition<T extends string = string> extends SettingDefinitionBase<T> {
 	type: 'enum'
 	entries: {
 		label: string
-		value: string
+		value: T
 	}[]
 }
 
 export interface StringSettingDefinition extends SettingDefinitionBase<string> {
 	type: 'string'
+	regex?: RegExp
+}
+
+export type SettingDefinitions = ReturnType<(typeof setting)[keyof typeof setting]>
+export type SettingDefinitionTypes = SettingDefinitions['type']
+
+export const setting = {
+	asEnum: <const E extends ReadonlyArray<{ label: string; value: string }>>(
+		data: EnumSettingDefinition<E[number]['value']> & { entries: E },
+	): EnumSettingDefinition<E[number]['value']> => {
+		return data as EnumSettingDefinition<E[number]['value']>
+	},
+	asToggle: (data: ToggleSettingDefinition) => data,
+	asString: (data: StringSettingDefinition) => data,
+}
+
+export function isValidFor(definitionBase: SettingDefinitionBase<any>, value: any): boolean {
+	if (value != null) {
+		// Tried my best with type safety but sadly having the `SettingDefinitions` as the type leads to issues handling types else where...
+		const definition = definitionBase as SettingDefinitions
+		if (
+			definition.type == 'enum' &&
+			definition.entries.map((entry) => entry.value).includes(value)
+		) {
+			return true
+		} else if (definition.type == 'toggle' && typeof value === 'boolean') {
+			return true
+		} else if (
+			definition.type == 'string' &&
+			typeof value === 'string' &&
+			(!definition.regex || value.match(definition.regex))
+		) {
+			return true
+		}
+	}
+
+	return false
 }
 
 export type SettingDefinition =

From 75335647ee6c448a6be4c6fc094a8b29154784ba Mon Sep 17 00:00:00 2001
From: Prospector <6166773+Prospector@users.noreply.github.com>
Date: Fri, 7 Aug 2026 13:19:36 -0700
Subject: [PATCH 51/82] update tags page + sort project types consistently
 (#7044)

---
 apps/frontend/src/layouts/default.vue         |  44 +-
 apps/frontend/src/locales/de-CH/index.json    |   6 -
 apps/frontend/src/locales/de-DE/index.json    |   6 -
 apps/frontend/src/locales/en-US/index.json    |  22 +-
 apps/frontend/src/locales/es-419/index.json   |   6 -
 apps/frontend/src/locales/fr-FR/index.json    |   6 -
 apps/frontend/src/locales/hu-HU/index.json    |   6 -
 apps/frontend/src/locales/it-IT/index.json    |   3 -
 apps/frontend/src/locales/ko-KR/index.json    |   6 -
 apps/frontend/src/locales/nl-NL/index.json    |   6 -
 apps/frontend/src/locales/pl-PL/index.json    |   3 -
 apps/frontend/src/locales/pt-BR/index.json    |   6 -
 apps/frontend/src/locales/ru-RU/index.json    |   6 -
 apps/frontend/src/locales/uk-UA/index.json    |   6 -
 apps/frontend/src/locales/zh-CN/index.json    |   6 -
 apps/frontend/src/locales/zh-TW/index.json    |   6 -
 .../pages/[type]/[project]/settings/tags.vue  | 641 +++++++++---------
 .../src/pages/collection/[collection].vue     |   3 +-
 .../src/pages/organization/[organization].vue |  25 +-
 .../components/base/UnsavedChangesPopup.vue   |  53 +-
 .../layouts/shared/user-profile/layout.vue    |  20 +-
 packages/ui/src/utils/index.ts                |   1 +
 packages/ui/src/utils/project-types.ts        |  31 +
 packages/ui/src/utils/search.ts               |   4 +-
 24 files changed, 452 insertions(+), 470 deletions(-)
 create mode 100644 packages/ui/src/utils/project-types.ts

diff --git a/apps/frontend/src/layouts/default.vue b/apps/frontend/src/layouts/default.vue
index bf09d69e04..6ebd410f11 100644
--- a/apps/frontend/src/layouts/default.vue
+++ b/apps/frontend/src/layouts/default.vue
@@ -138,22 +138,6 @@
 						<BracesIcon aria-hidden="true" />
 						{{ formatMessage(commonProjectTypeCategoryMessages.datapack) }}
 					</ButtonLink>
-					<ButtonLink
-						type="quiet"
-						to="/discover/modpacks"
-						:class="
-							route.name === 'discover-modpacks' || route.path.startsWith('/modpack/')
-								? (route.name === 'discover-modpacks'
-										? 'main-nav-primary'
-										: 'main-nav-secondary') === 'main-nav-primary'
-									? '!bg-[var(--color-button-bg-selected)] !text-[var(--color-button-text-selected)] [&>svg]:!text-[var(--color-button-text-selected)]'
-									: '!bg-[var(--color-button-bg)] !text-contrast'
-								: ''
-						"
-					>
-						<PackageOpenIcon aria-hidden="true" />
-						{{ formatMessage(commonProjectTypeCategoryMessages.modpack) }}
-					</ButtonLink>
 					<ButtonLink
 						type="quiet"
 						to="/discover/shaders"
@@ -170,6 +154,22 @@
 						<GlassesIcon aria-hidden="true" />
 						{{ formatMessage(commonProjectTypeCategoryMessages.shader) }}
 					</ButtonLink>
+					<ButtonLink
+						type="quiet"
+						to="/discover/modpacks"
+						:class="
+							route.name === 'discover-modpacks' || route.path.startsWith('/modpack/')
+								? (route.name === 'discover-modpacks'
+										? 'main-nav-primary'
+										: 'main-nav-secondary') === 'main-nav-primary'
+									? '!bg-[var(--color-button-bg-selected)] !text-[var(--color-button-text-selected)] [&>svg]:!text-[var(--color-button-text-selected)]'
+									: '!bg-[var(--color-button-bg)] !text-contrast'
+								: ''
+						"
+					>
+						<PackageOpenIcon aria-hidden="true" />
+						{{ formatMessage(commonProjectTypeCategoryMessages.modpack) }}
+					</ButtonLink>
 					<ButtonLink
 						type="quiet"
 						to="/discover/plugins"
@@ -1215,8 +1215,8 @@ const navRoutes = computed(() => [
 		href: '/discover/mods',
 	},
 	{
-		label: formatMessage(getProjectTypeMessage('plugin', true)),
-		href: '/discover/plugins',
+		label: formatMessage(getProjectTypeMessage('resourcepack', true)),
+		href: '/discover/resourcepacks',
 	},
 	{
 		label: formatMessage(getProjectTypeMessage('datapack', true)),
@@ -1226,14 +1226,14 @@ const navRoutes = computed(() => [
 		label: formatMessage(getProjectTypeMessage('shader', true)),
 		href: '/discover/shaders',
 	},
-	{
-		label: formatMessage(getProjectTypeMessage('resourcepack', true)),
-		href: '/discover/resourcepacks',
-	},
 	{
 		label: formatMessage(getProjectTypeMessage('modpack', true)),
 		href: '/discover/modpacks',
 	},
+	{
+		label: formatMessage(getProjectTypeMessage('plugin', true)),
+		href: '/discover/plugins',
+	},
 	{
 		label: formatMessage(getProjectTypeMessage('server', true)),
 		href: '/discover/servers',
diff --git a/apps/frontend/src/locales/de-CH/index.json b/apps/frontend/src/locales/de-CH/index.json
index f8f3215659..8701689713 100644
--- a/apps/frontend/src/locales/de-CH/index.json
+++ b/apps/frontend/src/locales/de-CH/index.json
@@ -3929,9 +3929,6 @@
   "project.settings.tags.featured-tags": {
     "message": "Hervorgehobene Tags"
   },
-  "project.settings.tags.featured-tags-description": {
-    "message": "Du kannst bis zu 3 deiner relevantesten Tags als hervorheben. Andere Tags werden möglicherweise hervorgehoben, falls du nicht alle 3 auswählst."
-  },
   "project.settings.tags.features-description": {
     "message": "Wähle alle Funktionen aus, die dein {type} nutzt."
   },
@@ -3947,9 +3944,6 @@
   "project.settings.tags.select-at-least-one-category": {
     "message": "Wähle mindestens eine Kategorie aus, um eine Kategorie hervorzuheben."
   },
-  "project.settings.tags.tagging-importance-description": {
-    "message": "Genaue Tags sind wichtig, damit Nutzer dein {type} leichter finden können. Achte darauf, alle zutreffenden Tags auszuwählen."
-  },
   "project.settings.tags.title": {
     "message": "Tags"
   },
diff --git a/apps/frontend/src/locales/de-DE/index.json b/apps/frontend/src/locales/de-DE/index.json
index f78ec91224..e414759eb7 100644
--- a/apps/frontend/src/locales/de-DE/index.json
+++ b/apps/frontend/src/locales/de-DE/index.json
@@ -3929,9 +3929,6 @@
   "project.settings.tags.featured-tags": {
     "message": "Hervorgehobene Tags"
   },
-  "project.settings.tags.featured-tags-description": {
-    "message": "Du kannst bis zu 3 deiner relevantesten Tags als hervorheben. Andere Tags werden möglicherweise hervorgehoben, falls du nicht alle 3 auswählst."
-  },
   "project.settings.tags.features-description": {
     "message": "Wähle alle Funktionen aus, die dein {type} nutzt."
   },
@@ -3947,9 +3944,6 @@
   "project.settings.tags.select-at-least-one-category": {
     "message": "Wähle mindestens eine Kategorie aus, um eine Kategorie hervorzuheben."
   },
-  "project.settings.tags.tagging-importance-description": {
-    "message": "Genaue Tags sind wichtig, damit Nutzer dein {type} leichter finden können. Achte darauf, alle zutreffenden Tags auszuwählen."
-  },
   "project.settings.tags.title": {
     "message": "Tags"
   },
diff --git a/apps/frontend/src/locales/en-US/index.json b/apps/frontend/src/locales/en-US/index.json
index da8e2ed9ef..812e796be1 100644
--- a/apps/frontend/src/locales/en-US/index.json
+++ b/apps/frontend/src/locales/en-US/index.json
@@ -3929,12 +3929,27 @@
   "project.settings.tags.featured-tags": {
     "message": "Featured tags"
   },
-  "project.settings.tags.featured-tags-description": {
-    "message": "You can feature up to 3 of your most relevant tags. Other tags may be promoted to featured if you do not select all 3."
+  "project.settings.tags.featured-tags-required": {
+    "message": "You must have at least one featured tag."
+  },
+  "project.settings.tags.featured-tags-select-description": {
+    "message": "Select your most relevant tags. These are displayed before the rest of your tags."
   },
   "project.settings.tags.features-description": {
     "message": "Select all of the features that your {type} makes use of."
   },
+  "project.settings.tags.group-title.categories": {
+    "message": "{showType, select, yes {{types} categories} other {Categories}}"
+  },
+  "project.settings.tags.group-title.features": {
+    "message": "{showType, select, yes {{types} features} other {Features}}"
+  },
+  "project.settings.tags.group-title.performance-impact": {
+    "message": "{showType, select, yes {{types} performance impact} other {Performance impact}}"
+  },
+  "project.settings.tags.group-title.resolutions": {
+    "message": "{showType, select, yes {{types} resolutions} other {Resolutions}}"
+  },
   "project.settings.tags.multiple-resolution-tags-warning": {
     "message": "You've selected {count} resolution tags ({tags}). Resource packs should typically only have one resolution tag."
   },
@@ -3947,9 +3962,6 @@
   "project.settings.tags.select-at-least-one-category": {
     "message": "Select at least one category in order to feature a category."
   },
-  "project.settings.tags.tagging-importance-description": {
-    "message": "Accurate tagging is important to help people find your {type}. Make sure to select all tags that apply."
-  },
   "project.settings.tags.title": {
     "message": "Tags"
   },
diff --git a/apps/frontend/src/locales/es-419/index.json b/apps/frontend/src/locales/es-419/index.json
index 2aa8d978e3..038094172a 100644
--- a/apps/frontend/src/locales/es-419/index.json
+++ b/apps/frontend/src/locales/es-419/index.json
@@ -3929,9 +3929,6 @@
   "project.settings.tags.featured-tags": {
     "message": "Etiquetas destacadas"
   },
-  "project.settings.tags.featured-tags-description": {
-    "message": "Puedes destacar hasta 3 de tus etiquetas más relevantes. Otras etiquetas pueden ser promovidas a destacadas si no seleccionas las 3 completas."
-  },
   "project.settings.tags.features-description": {
     "message": "Selecciona todas las características que tu {type} usa."
   },
@@ -3947,9 +3944,6 @@
   "project.settings.tags.select-at-least-one-category": {
     "message": "Selecciona al menos una categoría para destacar una categoría."
   },
-  "project.settings.tags.tagging-importance-description": {
-    "message": "Seleccionar etiquetas relevantes es importante para ayudar a la gente a encontrar tu {type}. Asegúrate de seleccionar todas las etiquetas que apliquen."
-  },
   "project.settings.tags.title": {
     "message": "Etiquetas"
   },
diff --git a/apps/frontend/src/locales/fr-FR/index.json b/apps/frontend/src/locales/fr-FR/index.json
index a7729d4f72..d78cf40a5e 100644
--- a/apps/frontend/src/locales/fr-FR/index.json
+++ b/apps/frontend/src/locales/fr-FR/index.json
@@ -3929,9 +3929,6 @@
   "project.settings.tags.featured-tags": {
     "message": "Tags mis en avant"
   },
-  "project.settings.tags.featured-tags-description": {
-    "message": "Vous pouvez mettre en avant jusqu'à 3 de vos tags les plus pertinents. D'autres tags peuvent être mis en avant si vous ne sélectionnez pas les 3."
-  },
   "project.settings.tags.features-description": {
     "message": "Sélectionnez toutes les fonctionnalités que votre {type} utilise."
   },
@@ -3947,9 +3944,6 @@
   "project.settings.tags.select-at-least-one-category": {
     "message": "Sélectionnez au moins une catégorie afin de pouvoir mettre en avant une catégorie."
   },
-  "project.settings.tags.tagging-importance-description": {
-    "message": "Un étiquetage correct est important pour aider les gens à trouver votre {type}. Faites en sorte de sélectionner tous les tags qui s'appliquent."
-  },
   "project.settings.tags.title": {
     "message": "Tags"
   },
diff --git a/apps/frontend/src/locales/hu-HU/index.json b/apps/frontend/src/locales/hu-HU/index.json
index f95488ce5e..7313d7b514 100644
--- a/apps/frontend/src/locales/hu-HU/index.json
+++ b/apps/frontend/src/locales/hu-HU/index.json
@@ -3641,9 +3641,6 @@
   "project.settings.tags.featured-tags": {
     "message": "Kiemelt címkék"
   },
-  "project.settings.tags.featured-tags-description": {
-    "message": "Legfeljebb 3 legrelevánsabb címkét jelölhetsz ki kiemeltként. Ha nem választod ki mind a 3-at, akkor a többi címke is kiemeltként jelenhet meg."
-  },
   "project.settings.tags.features-description": {
     "message": "Jelöld ki az összes olyan funkciót, amelyet a {type} használ."
   },
@@ -3659,9 +3656,6 @@
   "project.settings.tags.select-at-least-one-category": {
     "message": "Válassz ki legalább egy kategóriát ahhoz, hogy kiemelj egy kategóriát."
   },
-  "project.settings.tags.tagging-importance-description": {
-    "message": "A pontos címkézés fontos ahhoz, hogy a {type} könnyebben me. Feltétlenül válaszd ki az összes releváns címkét."
-  },
   "project.settings.tags.title": {
     "message": "Címkék"
   },
diff --git a/apps/frontend/src/locales/it-IT/index.json b/apps/frontend/src/locales/it-IT/index.json
index b94fefd5b4..1d09448f32 100644
--- a/apps/frontend/src/locales/it-IT/index.json
+++ b/apps/frontend/src/locales/it-IT/index.json
@@ -3917,9 +3917,6 @@
   "project.settings.tags.featured-tags": {
     "message": "Tag in evidenza"
   },
-  "project.settings.tags.featured-tags-description": {
-    "message": "Puoi mettere in evidenza fino a 3 tag. Altri tag potrebbero aggiungersi se non bastassero."
-  },
   "project.settings.tags.multiple-resolution-tags-warning": {
     "message": "Hai selezionato {count} tag di risoluzione ({tags}). I pacchetti di risorse dovrebbero averne solo uno."
   },
diff --git a/apps/frontend/src/locales/ko-KR/index.json b/apps/frontend/src/locales/ko-KR/index.json
index 4b43d5eb08..280d47f8af 100644
--- a/apps/frontend/src/locales/ko-KR/index.json
+++ b/apps/frontend/src/locales/ko-KR/index.json
@@ -3929,9 +3929,6 @@
   "project.settings.tags.featured-tags": {
     "message": "추천 태그"
   },
-  "project.settings.tags.featured-tags-description": {
-    "message": "가장 적합한 태그를 최대 3개까지 지정할 수 있습니다. 3개를 모두 선택하지 않으면 다른 태그가 추천 태그로 표시될 수 있습니다."
-  },
   "project.settings.tags.features-description": {
     "message": " {type}에서 사용하는 모든 기능을 선택하세요."
   },
@@ -3947,9 +3944,6 @@
   "project.settings.tags.select-at-least-one-category": {
     "message": "추천 카테고리를 지정하려면 적어도 하나의 카테고리를 선택해야 합니다."
   },
-  "project.settings.tags.tagging-importance-description": {
-    "message": "정확한 태그 선택은 {type}을 쉽게 찾을 수 있도록 돕습니다. 관련된 모든 태그를 선택해 주세요."
-  },
   "project.settings.tags.title": {
     "message": "태그"
   },
diff --git a/apps/frontend/src/locales/nl-NL/index.json b/apps/frontend/src/locales/nl-NL/index.json
index 6c64df1f48..6e52d55ba4 100644
--- a/apps/frontend/src/locales/nl-NL/index.json
+++ b/apps/frontend/src/locales/nl-NL/index.json
@@ -3926,9 +3926,6 @@
   "project.settings.tags.featured-tags": {
     "message": "Uitgelichte tags"
   },
-  "project.settings.tags.featured-tags-description": {
-    "message": "Je kunt maximaal 3 van je meest relevante tags als uitgelichte tags selecteren. Als je niet alle 3 selecteert, kunnen andere tags als uitgelichte tags worden weergegeven."
-  },
   "project.settings.tags.features-description": {
     "message": "Selecteer alle functies waarvan je {type} gebruikmaakt."
   },
@@ -3944,9 +3941,6 @@
   "project.settings.tags.select-at-least-one-category": {
     "message": "Selecteer minstens één categorie om een categorie uit te lichten."
   },
-  "project.settings.tags.tagging-importance-description": {
-    "message": "Nauwkeurige tags zijn belangrijk om mensen te helpen je {type} te vinden. Zorg ervoor dat je alle relevante tags selecteert."
-  },
   "project.settings.tags.title": {
     "message": "Tags"
   },
diff --git a/apps/frontend/src/locales/pl-PL/index.json b/apps/frontend/src/locales/pl-PL/index.json
index 85f58da7e8..28d9253571 100644
--- a/apps/frontend/src/locales/pl-PL/index.json
+++ b/apps/frontend/src/locales/pl-PL/index.json
@@ -3875,9 +3875,6 @@
   "project.settings.tags.featured-tags": {
     "message": "Wyróżnione tagi"
   },
-  "project.settings.tags.featured-tags-description": {
-    "message": "Możesz wyróżnić 3 z najlepiej pasujących do Twojego projektu tagów. Inne tagi mogą zostać pokazane jako wyróżnione, jeżeli nie wybierzesz wszystkich trzech."
-  },
   "project.settings.tags.features-description": {
     "message": "Wszystkie funkcjonalności, których używa {type}"
   },
diff --git a/apps/frontend/src/locales/pt-BR/index.json b/apps/frontend/src/locales/pt-BR/index.json
index 20925759f1..c43bc191b6 100644
--- a/apps/frontend/src/locales/pt-BR/index.json
+++ b/apps/frontend/src/locales/pt-BR/index.json
@@ -3929,9 +3929,6 @@
   "project.settings.tags.featured-tags": {
     "message": "Etiquetas em destaque"
   },
-  "project.settings.tags.featured-tags-description": {
-    "message": "Você pode destacar até 3 das suas etiquetas mais relevantes. Outras etiquetas poderão ser promovidas a destaque caso você não selecione todas as 3."
-  },
   "project.settings.tags.features-description": {
     "message": "Selecione todas as funcionalidades que o seu {type} utiliza."
   },
@@ -3947,9 +3944,6 @@
   "project.settings.tags.select-at-least-one-category": {
     "message": "Selecione pelo menos uma categoria para ela ser destacada."
   },
-  "project.settings.tags.tagging-importance-description": {
-    "message": "Etiquetar corretamente é importante para ajudar as pessoas a encontrarem seu {type}. Certifique-se de selecionar todas as etiquetas aplicáveis."
-  },
   "project.settings.tags.title": {
     "message": "Etiquetas"
   },
diff --git a/apps/frontend/src/locales/ru-RU/index.json b/apps/frontend/src/locales/ru-RU/index.json
index 51a767ad5b..dc0d3de738 100644
--- a/apps/frontend/src/locales/ru-RU/index.json
+++ b/apps/frontend/src/locales/ru-RU/index.json
@@ -3920,9 +3920,6 @@
   "project.settings.tags.featured-tags": {
     "message": "Ключевые теги"
   },
-  "project.settings.tags.featured-tags-description": {
-    "message": "Можно выбрать до 3 ключевых тегов. Если не выбрать все 3, то другие теги могут стать ключевыми."
-  },
   "project.settings.tags.features-description": {
     "message": "Выберите все особенности, которые использует ваш {type}"
   },
@@ -3935,9 +3932,6 @@
   "project.settings.tags.select-at-least-one-category": {
     "message": "Выберите хотя бы одну категорию, чтобы отобразить ее."
   },
-  "project.settings.tags.tagging-importance-description": {
-    "message": "Аккуратная маркировка важна, чтобы помочь людям найти ваш {type}"
-  },
   "project.settings.tags.title": {
     "message": "Теги"
   },
diff --git a/apps/frontend/src/locales/uk-UA/index.json b/apps/frontend/src/locales/uk-UA/index.json
index 0bd18c26c5..f85db2798d 100644
--- a/apps/frontend/src/locales/uk-UA/index.json
+++ b/apps/frontend/src/locales/uk-UA/index.json
@@ -3926,9 +3926,6 @@
   "project.settings.tags.featured-tags": {
     "message": "Основні теґи"
   },
-  "project.settings.tags.featured-tags-description": {
-    "message": "Ви можете обрати основними до 3 найбільш описових теґів. Інші теґи можуть стати основними, якщо не оберете всі 3."
-  },
   "project.settings.tags.features-description": {
     "message": "Оберіть увесь функціонал, який присутній у {type}."
   },
@@ -3944,9 +3941,6 @@
   "project.settings.tags.select-at-least-one-category": {
     "message": "Виберіть хоча б одну категорію, щоб рекомендувати її."
   },
-  "project.settings.tags.tagging-importance-description": {
-    "message": "Указання правильних теґів необхідне, щоб люди могли легше знайти ваш {type}. Переконайтеся, що ви обрали підхожі теґи."
-  },
   "project.settings.tags.title": {
     "message": "Теґи"
   },
diff --git a/apps/frontend/src/locales/zh-CN/index.json b/apps/frontend/src/locales/zh-CN/index.json
index 1cbf4f42c0..f556e930cc 100644
--- a/apps/frontend/src/locales/zh-CN/index.json
+++ b/apps/frontend/src/locales/zh-CN/index.json
@@ -3929,9 +3929,6 @@
   "project.settings.tags.featured-tags": {
     "message": "精选标签"
   },
-  "project.settings.tags.featured-tags-description": {
-    "message": "你可以设置最多 3 个精选标签，标示出最相关的特点。如果没有选完 3 个标签，其他标签也可能提升为精选标签。"
-  },
   "project.settings.tags.features-description": {
     "message": "选择你的{type}作用于哪类特性。"
   },
@@ -3947,9 +3944,6 @@
   "project.settings.tags.select-at-least-one-category": {
     "message": "请先至少选择一个分类，再设置精选分类。"
   },
-  "project.settings.tags.tagging-importance-description": {
-    "message": "准确选好标签，能极大帮助别人找到你的{type}。请确保选择所有合适的标签。"
-  },
   "project.settings.tags.title": {
     "message": "标签"
   },
diff --git a/apps/frontend/src/locales/zh-TW/index.json b/apps/frontend/src/locales/zh-TW/index.json
index 6b70244445..acc1d22e3a 100644
--- a/apps/frontend/src/locales/zh-TW/index.json
+++ b/apps/frontend/src/locales/zh-TW/index.json
@@ -3929,9 +3929,6 @@
   "project.settings.tags.featured-tags": {
     "message": "精選標籤"
   },
-  "project.settings.tags.featured-tags-description": {
-    "message": "你可以選擇最多 3 個最相關的標籤作為精選標籤。如果沒有選完 3 個標籤，系統可能會自動將其他標籤選為精選標籤。"
-  },
   "project.settings.tags.features-description": {
     "message": "請選擇你的{type}包含的功能。"
   },
@@ -3947,9 +3944,6 @@
   "project.settings.tags.select-at-least-one-category": {
     "message": "請選擇至少一個類別再選擇精選標籤。"
   },
-  "project.settings.tags.tagging-importance-description": {
-    "message": "精確的標籤對於協助使用者找到你的{type}非常重要。請務必選擇所有合適的標籤。"
-  },
   "project.settings.tags.title": {
     "message": "標籤"
   },
diff --git a/apps/frontend/src/pages/[type]/[project]/settings/tags.vue b/apps/frontend/src/pages/[type]/[project]/settings/tags.vue
index cbfc414335..5a2645962f 100644
--- a/apps/frontend/src/pages/[type]/[project]/settings/tags.vue
+++ b/apps/frontend/src/pages/[type]/[project]/settings/tags.vue
@@ -1,174 +1,23 @@
-<template>
-	<div>
-		<ConfirmLeaveModal ref="confirmLeaveModal" />
-		<section class="universal-card">
-			<div class="label">
-				<h3>
-					<span class="label__title size-card-header">{{ formatMessage(messages.tagsTitle) }}</span>
-				</h3>
-			</div>
-
-			<div
-				v-if="tooManyTagsWarning && !allTagsSelectedWarning"
-				class="my-2 flex items-center gap-1.5 text-orange"
-			>
-				<TriangleAlertIcon class="my-auto" />
-				{{ tooManyTagsWarning }}
-			</div>
-
-			<div v-if="multipleResolutionTagsWarning" class="my-2 flex items-center gap-1.5 text-orange">
-				<TriangleAlertIcon class="my-auto" />
-				{{ multipleResolutionTagsWarning }}
-			</div>
-
-			<div v-if="allTagsSelectedWarning" class="my-2 flex items-center gap-1.5 text-red">
-				<TriangleAlertIcon class="my-auto" />
-				<span>{{ allTagsSelectedWarning }}</span>
-			</div>
-
-			<p>
-				{{
-					formatMessage(messages.taggingImportanceDescription, {
-						type: formatProjectType(project.project_type).toLowerCase(),
-					})
-				}}
-			</p>
-
-			<p
-				v-if="project.versions.length === 0 && projectV3?.minecraft_server == null"
-				class="known-errors"
-			>
-				{{ formatMessage(messages.uploadVersionFirst) }}
-			</p>
-			<template v-else>
-				<template v-for="header in Object.keys(categoryLists)" :key="`categories-${header}`">
-					<div class="label mb-3">
-						<h4>
-							<span class="label__title">{{ formatCategoryHeader(formatMessage, header) }}</span>
-						</h4>
-						<span class="label__description">
-							<template v-if="header === 'categories'">
-								{{
-									formatMessage(messages.categoriesDescription, {
-										type: formatProjectType(project.project_type).toLowerCase(),
-									})
-								}}
-							</template>
-							<template v-else-if="header === 'features'">
-								{{
-									formatMessage(messages.featuresDescription, {
-										type: formatProjectType(project.project_type).toLowerCase(),
-									})
-								}}
-							</template>
-							<template v-else-if="header === 'resolutions'">
-								{{
-									formatMessage(messages.resolutionsDescription, {
-										type: formatProjectType(project.project_type).toLowerCase(),
-									})
-								}}
-							</template>
-							<template v-else-if="header === 'performance impact'">
-								{{
-									formatMessage(messages.performanceImpactDescription, {
-										type: formatProjectType(project.project_type).toLowerCase(),
-									})
-								}}
-							</template>
-						</span>
-					</div>
-					<div class="category-list input-div">
-						<Checkbox
-							v-for="category in categoryLists[header]"
-							:key="`category-${header}-${category.name}`"
-							:model-value="current.selectedTags.includes(category)"
-							:description="formatCategory(formatMessage, category.name)"
-							class="category-selector"
-							@update:model-value="toggleCategory(category)"
-						>
-							<div class="category-selector__label">
-								<component
-									:is="getTagIcon(category.name)"
-									v-if="header !== 'resolutions' && getTagIcon(category.name)"
-									aria-hidden="true"
-									class="icon"
-								/>
-								<span aria-hidden="true">
-									<FormattedTag :tag="category.name" enforce-type="category" />
-								</span>
-							</div>
-						</Checkbox>
-					</div>
-				</template>
-				<div class="label">
-					<h4>
-						<span class="label__title"
-							><StarIcon /> {{ formatMessage(messages.featuredTags) }}</span
-						>
-					</h4>
-					<span class="label__description">{{
-						formatMessage(messages.featuredTagsDescription)
-					}}</span>
-				</div>
-				<p v-if="current.selectedTags.length < 1">
-					{{ formatMessage(messages.selectAtLeastOneCategory) }}
-				</p>
-				<div class="category-list input-div">
-					<Checkbox
-						v-for="category in current.selectedTags"
-						:key="`featured-category-${category.name}`"
-						class="category-selector"
-						:model-value="current.featuredTags.includes(category)"
-						:description="formatCategory(formatMessage, category.name)"
-						:disabled="current.featuredTags.length >= 3 && !current.featuredTags.includes(category)"
-						@update:model-value="toggleFeaturedCategory(category)"
-					>
-						<div class="category-selector__label">
-							<component
-								:is="getTagIcon(category.name)"
-								v-if="category.header !== 'resolutions' && getTagIcon(category.name)"
-								aria-hidden="true"
-								class="icon"
-							/>
-							<span aria-hidden="true">
-								<FormattedTag :tag="category.name" enforce-type="category" />
-							</span>
-						</div>
-					</Checkbox>
-				</div>
-			</template>
-		</section>
-		<UnsavedChangesPopup
-			:original="saved"
-			:modified="current"
-			:saving="saving"
-			@reset="reset"
-			@save="save"
-		/>
-	</div>
-</template>
-
 <script setup lang="ts">
 import {
-	getCategoryIcon,
-	SERVER_CATEGORY_ICON_MAP,
-	StarIcon,
-	TriangleAlertIcon,
-} from '@modrinth/assets'
-import {
+	Admonition,
 	Checkbox,
 	ConfirmLeaveModal,
 	defineMessages,
 	formatCategory,
 	formatCategoryHeader,
+	formatProjectTypeSentence,
 	FormattedTag,
 	injectProjectPageContext,
+	type MessageDescriptor,
+	sortProjectTypes,
+	TagItem,
 	UnsavedChangesPopup,
 	usePageLeaveSafety,
 	useSavable,
 	useVIntl,
 } from '@modrinth/ui'
-import { formatProjectType, sortedCategories } from '@modrinth/utils'
+import { capitalizeString, sortedCategories } from '@modrinth/utils'
 import { computed } from 'vue'
 
 interface Category {
@@ -178,19 +27,30 @@ interface Category {
 	project_type: string
 }
 
+interface CategoryGroup {
+	id: string
+	title: string
+	description?: string
+	categories: Category[]
+}
+
+const MAX_FEATURED_TAGS = 3
+
+const RESOLUTION_TAGS = ['8x-', '16x', '32x', '48x', '64x', '128x', '256x', '512x+']
+
+const SHARED_CATEGORY_PROJECT_TYPES: Record<string, string> = {
+	plugin: 'mod',
+	datapack: 'mod',
+}
+
 const tags = useGeneratedState()
 const { formatMessage, locale } = useVIntl()
 
 const messages = defineMessages({
-	tagsTitle: {
+	title: {
 		id: 'project.settings.tags.title',
 		defaultMessage: 'Tags',
 	},
-	taggingImportanceDescription: {
-		id: 'project.settings.tags.tagging-importance-description',
-		defaultMessage:
-			'Accurate tagging is important to help people find your {type}. Make sure to select all tags that apply.',
-	},
 	uploadVersionFirst: {
 		id: 'project.settings.tags.upload-version-first',
 		defaultMessage: 'Please upload a version first in order to select tags!',
@@ -217,14 +77,18 @@ const messages = defineMessages({
 		defaultMessage: 'Featured tags',
 	},
 	featuredTagsDescription: {
-		id: 'project.settings.tags.featured-tags-description',
+		id: 'project.settings.tags.featured-tags-select-description',
 		defaultMessage:
-			'You can feature up to 3 of your most relevant tags. Other tags may be promoted to featured if you do not select all 3.',
+			'Select your most relevant tags. These are displayed before the rest of your tags.',
 	},
 	selectAtLeastOneCategory: {
 		id: 'project.settings.tags.select-at-least-one-category',
 		defaultMessage: 'Select at least one category in order to feature a category.',
 	},
+	featuredTagsRequired: {
+		id: 'project.settings.tags.featured-tags-required',
+		defaultMessage: 'You must have at least one featured tag.',
+	},
 	tooManyTagsServerHardWarning: {
 		id: 'project.settings.tags.too-many-tags-server-hard-warning',
 		defaultMessage:
@@ -252,72 +116,183 @@ const messages = defineMessages({
 	},
 })
 
+const groupTitleMessages: Record<string, MessageDescriptor> = defineMessages({
+	categories: {
+		id: 'project.settings.tags.group-title.categories',
+		defaultMessage: '{showType, select, yes {{types} categories} other {Categories}}',
+	},
+	features: {
+		id: 'project.settings.tags.group-title.features',
+		defaultMessage: '{showType, select, yes {{types} features} other {Features}}',
+	},
+	resolutions: {
+		id: 'project.settings.tags.group-title.resolutions',
+		defaultMessage: '{showType, select, yes {{types} resolutions} other {Resolutions}}',
+	},
+	'performance impact': {
+		id: 'project.settings.tags.group-title.performance-impact',
+		defaultMessage:
+			'{showType, select, yes {{types} performance impact} other {Performance impact}}',
+	},
+})
+
+const groupDescriptionMessages: Record<string, MessageDescriptor> = {
+	categories: messages.categoriesDescription,
+	features: messages.featuresDescription,
+	resolutions: messages.resolutionsDescription,
+	'performance impact': messages.performanceImpactDescription,
+}
+
 const { projectV2: project, projectV3, patchProject } = injectProjectPageContext()
 
-const formatCategoryName = (categoryName: string) => {
-	return formatCategory(formatMessage, categoryName)
-}
+const formatCategoryName = (categoryName: string) => formatCategory(formatMessage, categoryName)
 
 const isServerProject = computed(() => projectV3.value?.minecraft_server != null)
 
-const getTagIcon = (categoryName: string) => {
-	const iconName = isServerProject.value
-		? (SERVER_CATEGORY_ICON_MAP[categoryName] ?? categoryName)
-		: categoryName
-	return getCategoryIcon(iconName)
+const canSelectTags = computed(() => project.value.versions.length > 0 || isServerProject.value)
+
+const projectTypes = computed(() => {
+	if (isServerProject.value) {
+		return ['minecraft_java_server']
+	}
+
+	const types = projectV3.value?.project_types?.length
+		? projectV3.value.project_types
+		: [project.value.actualProjectType]
+
+	return sortProjectTypes(new Set(types))
+})
+
+const allCategories = computed(
+	() => sortedCategories(tags.value, formatCategoryName, locale.value) as Category[],
+)
+
+const projectTypesByCategoryList = computed(() => {
+	const lists = new Map<string, string[]>()
+	for (const projectType of projectTypes.value) {
+		const source = SHARED_CATEGORY_PROJECT_TYPES[projectType] ?? projectType
+		lists.set(source, [...(lists.get(source) ?? []), projectType])
+	}
+	return lists
+})
+
+const projectTypeListFormatter = computed(
+	() => new Intl.ListFormat(locale.value, { style: 'long', type: 'conjunction' }),
+)
+
+function formatProjectTypeName(type: string) {
+	return formatProjectTypeSentence(
+		formatMessage,
+		type === 'minecraft_java_server' ? 'server' : type,
+	)
 }
 
-const matchesProjectType = (x: Category) => {
-	if (isServerProject.value) {
-		return x.project_type === 'minecraft_java_server'
-	} else {
-		return x.project_type === project.value.actualProjectType
+function formatGroupTitle(header: string, types: string[]) {
+	const message = groupTitleMessages[header]
+	if (!message) {
+		return formatCategoryHeader(formatMessage, header)
 	}
+
+	const showType = projectTypes.value.length > 1
+	return formatMessage(message, {
+		showType: showType ? 'yes' : 'other',
+		types: showType
+			? capitalizeString(projectTypeListFormatter.value.format(types.map(formatProjectTypeName)))
+			: '',
+	})
+}
+
+function formatGroupDescription(header: string, types: string[]) {
+	const message = groupDescriptionMessages[header]
+	if (!message) {
+		return undefined
+	}
+
+	// listing out every type gets unwieldy, fallback to the generic term when there's more than one
+	return formatMessage(message, {
+		type: formatProjectTypeName(types.length > 1 ? 'project' : types[0]),
+	})
+}
+
+const categorySections = computed(() => {
+	const sections: {
+		categoryList: string
+		header: string
+		types: string[]
+		categories: Category[]
+	}[] = []
+
+	for (const [categoryList, types] of projectTypesByCategoryList.value) {
+		const byHeader = new Map<string, Category[]>()
+		for (const category of allCategories.value) {
+			if (category.project_type !== categoryList) continue
+			byHeader.set(category.header, [...(byHeader.get(category.header) ?? []), category])
+		}
+
+		for (const [header, categories] of byHeader) {
+			sections.push({
+				categoryList,
+				header,
+				types,
+				categories:
+					header === 'minecraft_server_features' ? withPokemonFirst(categories) : categories,
+			})
+		}
+	}
+
+	return sections
+})
+
+const categoryGroups = computed<CategoryGroup[]>(() =>
+	categorySections.value.map((section) => ({
+		id: `${section.categoryList}-${section.header}`,
+		title: formatGroupTitle(section.header, section.types),
+		description: formatGroupDescription(section.header, section.types),
+		categories: section.categories,
+	})),
+)
+
+function withPokemonFirst(categories: Category[]) {
+	return categories.slice().sort((a, b) => {
+		if (a.name === 'pokemon') return -1
+		if (b.name === 'pokemon') return 1
+		return 0
+	})
+}
+
+const availableTags = computed(() => [
+	...new Set(categorySections.value.flatMap((section) => section.categories.map((x) => x.name))),
+])
+
+function hasSameTags(a: string[], b: string[]) {
+	return a.length === b.length && a.every((tag) => b.includes(tag))
 }
 
 const { saved, current, saving, hasChanges, reset, save } = useSavable(
 	() => ({
-		selectedTags: sortedCategories(tags.value, formatCategoryName, locale.value).filter(
-			(x: Category) =>
-				matchesProjectType(x) &&
-				(project.value.categories.includes(x.name) ||
-					project.value.additional_categories.includes(x.name)),
-		) as Category[],
-		featuredTags: sortedCategories(tags.value, formatCategoryName, locale.value).filter(
-			(x: Category) => matchesProjectType(x) && project.value.categories.includes(x.name),
-		) as Category[],
+		selectedTags: availableTags.value.filter(
+			(tag) =>
+				project.value.categories.includes(tag) || project.value.additional_categories.includes(tag),
+		),
+		featuredTags: availableTags.value.filter((tag) => project.value.categories.includes(tag)),
 	}),
 	async () => {
-		// Promote selected categories to featured if there are less than 3 featured
-		const newFeaturedTags = current.value.featuredTags.slice()
-		if (newFeaturedTags.length < 1 && current.value.selectedTags.length > newFeaturedTags.length) {
-			const nonFeaturedCategories = current.value.selectedTags.filter(
-				(x) => !newFeaturedTags.includes(x),
-			)
-			nonFeaturedCategories
-				.slice(0, Math.min(nonFeaturedCategories.length, 3 - newFeaturedTags.length))
-				.forEach((x) => newFeaturedTags.push(x))
+		if (!canSave.value) {
+			throw new Error('At least one tag must be featured')
 		}
 
-		// Convert selected and featured categories to backend-usable arrays
-		const categories = newFeaturedTags.map((x) => x.name)
-		const additionalCategories = current.value.selectedTags
-			.filter((x) => !newFeaturedTags.includes(x))
-			.map((x) => x.name)
+		const featuredTags = current.value.featuredTags
+		const additionalCategories = current.value.selectedTags.filter(
+			(tag) => !featuredTags.includes(tag),
+		)
 
 		const data: Record<string, string[]> = {}
 
-		if (
-			categories.length !== project.value.categories.length ||
-			categories.some((value) => !project.value.categories.includes(value))
-		) {
-			data.categories = categories
+		if (!hasSameTags(featuredTags, project.value.categories)) {
+			data.categories = featuredTags
 		}
 
-		if (
-			additionalCategories.length !== project.value.additional_categories.length ||
-			additionalCategories.some((value) => !project.value.additional_categories.includes(value))
-		) {
+		if (!hasSameTags(additionalCategories, project.value.additional_categories)) {
 			data.additional_categories = additionalCategories
 		}
 
@@ -327,31 +302,15 @@ const { saved, current, saving, hasChanges, reset, save } = useSavable(
 
 const { confirmLeaveModal } = usePageLeaveSafety(hasChanges)
 
-const categoryLists = computed(() => {
-	const lists: Record<string, Category[]> = {}
-	sortedCategories(tags.value, formatCategoryName, locale.value).forEach((x: Category) => {
-		if (matchesProjectType(x)) {
-			const header = x.header
-			if (!lists[header]) {
-				lists[header] = []
-			}
-			lists[header].push(x)
-		}
-	})
-	const featuresKey = 'minecraft_server_features'
-	if (lists[featuresKey]) {
-		lists[featuresKey].sort((a, b) => {
-			if (a.name === 'pokemon') return -1
-			if (b.name === 'pokemon') return 1
-			return 0
-		})
-	}
-	return lists
-})
+const isFeaturedLimitReached = computed(
+	() => current.value.featuredTags.length >= MAX_FEATURED_TAGS,
+)
+
+const canSave = computed(() => current.value.featuredTags.length > 0)
 
 const tooManyTagsWarning = computed(() => {
 	const tagCount = current.value.selectedTags.length
-	if (projectV3?.value?.minecraft_server != null) {
+	if (isServerProject.value) {
 		if (tagCount > 18) {
 			return formatMessage(messages.tooManyTagsServerHardWarning, { count: tagCount })
 		} else if (tagCount > 12) {
@@ -364,122 +323,140 @@ const tooManyTagsWarning = computed(() => {
 })
 
 const multipleResolutionTagsWarning = computed(() => {
-	if (project.value.actualProjectType !== 'resourcepack') return null
+	if (!projectTypes.value.includes('resourcepack')) return null
 
-	const resolutionTags = current.value.selectedTags.filter((tag) =>
-		['8x-', '16x', '32x', '48x', '64x', '128x', '256x', '512x+'].includes(tag.name),
-	)
+	const resolutionTags = current.value.selectedTags.filter((tag) => RESOLUTION_TAGS.includes(tag))
+	if (resolutionTags.length < 2) return null
 
-	if (resolutionTags.length > 1) {
-		const tagsList = resolutionTags
-			.map((t) => t.name)
+	return formatMessage(messages.multipleResolutionTagsWarning, {
+		count: resolutionTags.length,
+		tags: resolutionTags
 			.join(', ')
 			.replace('8x-', '8x or lower')
-			.replace('512x+', '512x or higher')
-		return formatMessage(messages.multipleResolutionTagsWarning, {
-			count: resolutionTags.length,
-			tags: tagsList,
-		})
-	}
-	return null
+			.replace('512x+', '512x or higher'),
+	})
 })
 
 const allTagsSelectedWarning = computed(() => {
-	const categoriesForProjectType = sortedCategories(
-		tags.value,
-		formatCategoryName,
-		locale.value,
-	).filter((x: Category) => x.project_type === project.value.actualProjectType)
-	const totalSelectedTags = current.value.selectedTags.length
-
 	if (
-		totalSelectedTags === categoriesForProjectType.length &&
-		categoriesForProjectType.length > 0
+		availableTags.value.length < 1 ||
+		availableTags.value.length < 1 ||
+		current.value.selectedTags.length !== availableTags.value.length
 	) {
-		return formatMessage(messages.allTagsSelectedWarning, {
-			count: categoriesForProjectType.length,
-		})
+		return null
 	}
-	return null
+
+	return formatMessage(messages.allTagsSelectedWarning, { count: availableTags.value.length })
 })
 
-const toggleCategory = (category: Category) => {
-	if (current.value.selectedTags.includes(category)) {
-		current.value.selectedTags = current.value.selectedTags.filter((x) => x !== category)
-		if (current.value.featuredTags.includes(category)) {
-			current.value.featuredTags = current.value.featuredTags.filter((x) => x !== category)
-		}
-	} else {
-		current.value.selectedTags = [...current.value.selectedTags, category]
+function toggleTagRaw(selection: string[], tag: string) {
+	if (selection.includes(tag)) {
+		return selection.filter((x) => x !== tag)
+	}
+	return availableTags.value.filter((x) => x === tag || selection.includes(x))
+}
+
+const toggleTag = (tag: string) => {
+	current.value.selectedTags = toggleTagRaw(current.value.selectedTags, tag)
+	if (!current.value.selectedTags.includes(tag)) {
+		current.value.featuredTags = current.value.featuredTags.filter((x) => x !== tag)
 	}
 }
 
-const toggleFeaturedCategory = (category: Category) => {
-	if (current.value.featuredTags.includes(category)) {
-		current.value.featuredTags = current.value.featuredTags.filter((x) => x !== category)
-	} else {
-		current.value.featuredTags = [...current.value.featuredTags, category]
-	}
+const toggleFeatured = (tag: string) => {
+	current.value.featuredTags = toggleTagRaw(current.value.featuredTags, tag)
 }
 </script>
+<template>
+	<div>
+		<ConfirmLeaveModal ref="confirmLeaveModal" />
+		<h2 class="mb-4 mt-0 text-2xl font-semibold">
+			{{ formatMessage(messages.title) }}
+		</h2>
+		<p v-if="!canSelectTags" class="known-errors">
+			{{ formatMessage(messages.uploadVersionFirst) }}
+		</p>
+		<div v-else class="flex flex-col gap-4">
+			<Admonition v-if="allTagsSelectedWarning" type="critical" :body="allTagsSelectedWarning" />
+			<Admonition v-else-if="tooManyTagsWarning" type="warning" :body="tooManyTagsWarning" />
+			<Admonition
+				v-if="multipleResolutionTagsWarning"
+				type="warning"
+				:body="multipleResolutionTagsWarning"
+			/>
 
-<style lang="scss" scoped>
-.label__title {
-	display: flex;
-	align-items: center;
-	gap: var(--spacing-card-xs);
-	margin-top: var(--spacing-card-bg);
+			<div
+				v-for="group in categoryGroups"
+				:key="group.id"
+				class="rounded-2xl border border-solid border-surface-4 bg-surface-3 p-4"
+			>
+				<h3 class="mb-1 mt-0 text-base font-semibold text-contrast">
+					{{ group.title }}
+				</h3>
+				<p v-if="group.description" class="mb-3 mt-0 text-sm">
+					{{ group.description }}
+				</p>
+				<div class="grid grid-cols-2 gap-x-4 gap-y-2 sm:grid-cols-4">
+					<Checkbox
+						v-for="category in group.categories"
+						:key="`${group.id}-${category.name}`"
+						:model-value="current.selectedTags.includes(category.name)"
+						:description="formatCategoryName(category.name)"
+						@update:model-value="toggleTag(category.name)"
+					>
+						<span aria-hidden="true">
+							<FormattedTag :tag="category.name" enforce-type="category" />
+						</span>
+					</Checkbox>
+				</div>
+			</div>
 
-	svg {
-		vertical-align: top;
-	}
-}
-.category-list {
-	column-count: 4;
-	column-gap: var(--spacing-card-lg);
-	margin-bottom: var(--spacing-card-md);
-
-	:deep(.category-selector) {
-		margin-bottom: 0.75rem;
-
-		.category-selector__label {
-			display: flex;
-			align-items: center;
-			text-align: left;
-
-			.icon {
-				height: 1rem;
-				width: 1rem;
-				margin-right: 0.25rem;
-				display: flex;
-				align-items: center;
-
-				svg {
-					width: 1rem;
-					height: 1rem;
-				}
-			}
-		}
-
-		span {
-			user-select: none;
-		}
-	}
-
-	@media only screen and (max-width: 1250px) {
-		column-count: 3;
-	}
-	@media only screen and (max-width: 1024px) {
-		column-count: 4;
-	}
-	@media only screen and (max-width: 960px) {
-		column-count: 3;
-	}
-	@media only screen and (max-width: 750px) {
-		column-count: 2;
-	}
-	@media only screen and (max-width: 530px) {
-		column-count: 1;
-	}
-}
-</style>
+			<div class="rounded-2xl border border-solid border-surface-4 bg-surface-3 p-4">
+				<div class="mb-1 flex items-center gap-2">
+					<h3 class="m-0 text-base font-semibold text-contrast">
+						{{ formatMessage(messages.featuredTags) }}
+					</h3>
+					<TagItem
+						v-tooltip="
+							current.featuredTags.length === 0
+								? formatMessage(messages.featuredTagsRequired)
+								: undefined
+						"
+						:style="canSave ? undefined : { '--_color': 'var(--color-red)' }"
+					>
+						{{ current.featuredTags.length }}/{{ MAX_FEATURED_TAGS }}
+					</TagItem>
+				</div>
+				<p class="mb-3 mt-0 text-sm">
+					{{ formatMessage(messages.featuredTagsDescription) }}
+				</p>
+				<p v-if="current.selectedTags.length < 1" class="m-0 text-sm text-secondary">
+					{{ formatMessage(messages.selectAtLeastOneCategory) }}
+				</p>
+				<div v-else class="grid grid-cols-2 gap-x-4 gap-y-2 sm:grid-cols-4">
+					<Checkbox
+						v-for="name in current.selectedTags"
+						:key="`featured-${name}`"
+						:model-value="current.featuredTags.includes(name)"
+						:description="formatCategoryName(name)"
+						:disabled="isFeaturedLimitReached && !current.featuredTags.includes(name)"
+						@update:model-value="toggleFeatured(name)"
+					>
+						<span aria-hidden="true">
+							<FormattedTag :tag="name" enforce-type="category" />
+						</span>
+					</Checkbox>
+				</div>
+			</div>
+		</div>
+		<UnsavedChangesPopup
+			:original="saved"
+			:modified="current"
+			:saving="saving"
+			:can-save="canSave"
+			:save-disabled-reason="messages.featuredTagsRequired"
+			@reset="reset"
+			@save="save"
+		/>
+	</div>
+</template>
diff --git a/apps/frontend/src/pages/collection/[collection].vue b/apps/frontend/src/pages/collection/[collection].vue
index 167ce44566..355c6abc24 100644
--- a/apps/frontend/src/pages/collection/[collection].vue
+++ b/apps/frontend/src/pages/collection/[collection].vue
@@ -425,6 +425,7 @@ import {
 	ProjectCardList,
 	RadioButtons,
 	SidebarCard,
+	sortProjectTypes,
 	StyledInput,
 	TeleportOverflowMenu,
 	useCompactNumber,
@@ -769,7 +770,7 @@ const projectTypes = computed(() => {
 		projects.value?.map((project) => project?.project_type).filter((x) => x !== undefined) || [],
 	)
 	projectSet.delete('project')
-	return Array.from(projectSet)
+	return sortProjectTypes(projectSet)
 })
 
 function getProjectTypeSentenceMessage(type) {
diff --git a/apps/frontend/src/pages/organization/[organization].vue b/apps/frontend/src/pages/organization/[organization].vue
index 740318d10a..88368fc6e0 100644
--- a/apps/frontend/src/pages/organization/[organization].vue
+++ b/apps/frontend/src/pages/organization/[organization].vue
@@ -236,6 +236,7 @@ import {
 	ProjectCard,
 	ProjectCardList,
 	SidebarCard,
+	sortProjectTypes,
 	useCompactNumber,
 	useVIntl,
 } from '@modrinth/ui'
@@ -376,15 +377,14 @@ const isInvited = computed(() => {
 })
 
 const projectTypes = computed(() => {
-	const obj: Record<string, boolean> = {}
+	const types = new Set<string>()
 
 	for (const project of projects.value ?? []) {
-		obj[project.project_types[0] ?? 'project'] = true
+		const type = project.project_types[0] ?? 'project'
+		if (type !== 'project') types.add(type)
 	}
 
-	delete obj.project
-
-	return Object.keys(obj)
+	return sortProjectTypes(types)
 })
 function isProjectServer(project: ProjectV3): boolean {
 	return project.minecraft_server != null
@@ -494,15 +494,12 @@ const navLinks = computed(() => [
 		label: formatMessage(commonMessages.allProjectType),
 		href: `/organization/${organization.value?.slug}`,
 	},
-	...projectTypes.value
-		.map((x) => {
-			return {
-				label: formatMessage(getProjectTypeMessage(x as ProjectType, true)),
-				href: `/organization/${organization.value?.slug}/${x}s`,
-			}
-		})
-		.slice()
-		.sort((a, b) => a.label.localeCompare(b.label)),
+	...projectTypes.value.map((x) => {
+		return {
+			label: formatMessage(getProjectTypeMessage(x as ProjectType, true)),
+			href: `/organization/${organization.value?.slug}/${x}s`,
+		}
+	}),
 ])
 
 async function copyId() {
diff --git a/packages/ui/src/components/base/UnsavedChangesPopup.vue b/packages/ui/src/components/base/UnsavedChangesPopup.vue
index c997b965a5..5c3bab9260 100644
--- a/packages/ui/src/components/base/UnsavedChangesPopup.vue
+++ b/packages/ui/src/components/base/UnsavedChangesPopup.vue
@@ -15,20 +15,25 @@ const emit = defineEmits<{
 	(e: 'reset' | 'save', event: MouseEvent): void
 }>()
 
+type SaveDisabledReason = MessageDescriptor | string
+
 const props = withDefaults(
 	defineProps<{
 		canReset?: boolean
+		canSave?: boolean
 		original: T
 		modified: Partial<T>
 		saving?: boolean
 		text?: MessageDescriptor | string
 		saveLabel?: MessageDescriptor | string
 		savingLabel?: MessageDescriptor | string
+		saveDisabledReason?: SaveDisabledReason | SaveDisabledReason[]
 		saveIcon?: Component
 		inline?: boolean
 	}>(),
 	{
 		canReset: true,
+		canSave: true,
 		saving: false,
 		text: () =>
 			defineMessage({
@@ -37,6 +42,7 @@ const props = withDefaults(
 			}),
 		saveLabel: () => commonMessages.saveButton,
 		savingLabel: () => commonMessages.savingButton,
+		saveDisabledReason: undefined,
 		saveIcon: SaveIcon,
 		inline: false,
 	},
@@ -50,6 +56,22 @@ function localizeIfPossible(message: MessageDescriptor | string) {
 	return typeof message === 'string' ? message : formatMessage(message)
 }
 
+const saveDisabled = computed(() => props.saving || !props.canSave)
+
+const saveDisabledTooltip = computed(() => {
+	if (!saveDisabled.value || props.saving || !props.saveDisabledReason) {
+		return undefined
+	}
+
+	const reasons = (
+		Array.isArray(props.saveDisabledReason) ? props.saveDisabledReason : [props.saveDisabledReason]
+	).map(localizeIfPossible)
+
+	return reasons.length > 0
+		? { content: reasons.join('\n'), popperClass: 'unsaved-changes-save-tooltip' }
+		: undefined
+})
+
 const actionBar = ref<InstanceType<typeof FloatingActionBar> | null>(null)
 
 function nudge(): void {
@@ -66,11 +88,32 @@ defineExpose({ nudge })
 			<Button v-if="canReset" type="quiet" :disabled="saving" @click="(e) => emit('reset', e)">
 				<HistoryIcon /> {{ formatMessage(commonMessages.resetButton) }}
 			</Button>
-			<Button type="colored" color="brand" :disabled="saving" @click="(e) => emit('save', e)">
-				<SpinnerIcon v-if="saving" class="animate-spin" />
-				<component :is="saveIcon" v-else />
-				{{ localizeIfPossible(saving ? savingLabel : saveLabel) }}
-			</Button>
+			<span
+				v-tooltip="saveDisabledTooltip"
+				class="flex"
+				:class="{ 'cursor-not-allowed': saveDisabled }"
+			>
+				<Button
+					type="colored"
+					color="brand"
+					:disabled="saveDisabled"
+					:class="{ 'pointer-events-none': saveDisabled }"
+					@click="(e) => emit('save', e)"
+				>
+					<SpinnerIcon v-if="saving" class="animate-spin" />
+					<component :is="saveIcon" v-else />
+					{{ localizeIfPossible(saving ? savingLabel : saveLabel) }}
+				</Button>
+			</span>
 		</div>
 	</FloatingActionBar>
 </template>
+
+<style lang="scss">
+/* unscoped because floating-vue teleports the tooltip outside of scope */
+.v-popper__popper.v-popper--theme-tooltip.unsaved-changes-save-tooltip .v-popper__inner {
+	max-width: 22rem;
+	white-space: pre-line;
+	line-height: 1.4;
+}
+</style>
diff --git a/packages/ui/src/layouts/shared/user-profile/layout.vue b/packages/ui/src/layouts/shared/user-profile/layout.vue
index 608994520e..bd16975459 100644
--- a/packages/ui/src/layouts/shared/user-profile/layout.vue
+++ b/packages/ui/src/layouts/shared/user-profile/layout.vue
@@ -496,7 +496,7 @@ import {
 	injectPageContext,
 	injectTags,
 } from '#ui/providers'
-import { commonMessages, getProjectTypeTitleMessage } from '#ui/utils'
+import { commonMessages, getProjectTypeTitleMessage, sortProjectTypes } from '#ui/utils'
 
 import { blockedUsersQueryKey, injectUserProfile } from './providers'
 import {
@@ -840,7 +840,7 @@ const projectTypes = computed(() => {
 	const types = new Set(projects.value.map((project) => project.resolvedProjectType))
 	if (collections.value.length > 0) types.add('collection')
 	types.delete('project')
-	return [...types]
+	return sortProjectTypes(types)
 })
 
 const navLinks = computed(() => {
@@ -851,15 +851,13 @@ const navLinks = computed(() => {
 			label: formatMessage(commonMessages.allProjectType),
 			href: profilePath,
 		},
-		...projectTypes.value
-			.map((projectType) => ({
-				label:
-					projectType === 'collection'
-						? formatMessage(messages.collectionsLabel)
-						: formatMessage(getProjectTypeTitleMessage(projectType), { count: 2 }),
-				href: `${profilePath}/${projectType}s`,
-			}))
-			.sort((first, second) => first.label.localeCompare(second.label)),
+		...projectTypes.value.map((projectType) => ({
+			label:
+				projectType === 'collection'
+					? formatMessage(messages.collectionsLabel)
+					: formatMessage(getProjectTypeTitleMessage(projectType), { count: 2 }),
+			href: `${profilePath}/${projectType}s`,
+		})),
 	]
 })
 
diff --git a/packages/ui/src/utils/index.ts b/packages/ui/src/utils/index.ts
index 6aeb20c1a9..217dd867e4 100644
--- a/packages/ui/src/utils/index.ts
+++ b/packages/ui/src/utils/index.ts
@@ -6,6 +6,7 @@ export * from './file-extensions'
 export * from './game-modes'
 export * from './loaders'
 export * from './notices'
+export * from './project-types'
 export * from './savable'
 export * from './search'
 export * from './server-content-installing'
diff --git a/packages/ui/src/utils/project-types.ts b/packages/ui/src/utils/project-types.ts
new file mode 100644
index 0000000000..447532156a
--- /dev/null
+++ b/packages/ui/src/utils/project-types.ts
@@ -0,0 +1,31 @@
+export const PROJECT_TYPE_ORDER = [
+	'mod',
+	'resourcepack',
+	'datapack',
+	'shader',
+	'modpack',
+	'plugin',
+	'server',
+	'collection',
+] as const
+
+export type OrderedProjectType = (typeof PROJECT_TYPE_ORDER)[number]
+
+const PROJECT_TYPE_SORT_ALIASES: Record<string, string> = {
+	minecraft_java_server: 'server',
+	shaderpack: 'shader',
+}
+
+export function getProjectTypeSortIndex(type: string): number {
+	const normalized = PROJECT_TYPE_SORT_ALIASES[type] ?? type
+	const index = (PROJECT_TYPE_ORDER as readonly string[]).indexOf(normalized)
+	return index === -1 ? PROJECT_TYPE_ORDER.length : index
+}
+
+export function compareProjectTypes(a: string, b: string): number {
+	return getProjectTypeSortIndex(a) - getProjectTypeSortIndex(b)
+}
+
+export function sortProjectTypes<T extends string>(types: Iterable<T>): T[] {
+	return [...types].sort(compareProjectTypes)
+}
diff --git a/packages/ui/src/utils/search.ts b/packages/ui/src/utils/search.ts
index 5a189fa92e..8e06f062ce 100644
--- a/packages/ui/src/utils/search.ts
+++ b/packages/ui/src/utils/search.ts
@@ -93,10 +93,10 @@ export type ProjectType =
 
 const ALL_PROJECT_TYPES: ProjectType[] = [
 	'mod',
-	'modpack',
 	'resourcepack',
-	'shader',
 	'datapack',
+	'shader',
+	'modpack',
 	'plugin',
 	'server',
 ]

From bca5303ae34eef7080aa2bd55481fe000172aaa4 Mon Sep 17 00:00:00 2001
From: Prospector <6166773+Prospector@users.noreply.github.com>
Date: Fri, 7 Aug 2026 13:19:56 -0700
Subject: [PATCH 52/82] improve popout animations (#7040)

---
 packages/ui/src/components/base/Combobox.vue  |   8 +-
 .../src/components/base/DropdownFilterBar.vue | 378 +++++++++---------
 .../ui/src/components/base/MultiSelect.vue    |   7 +-
 .../base/buttons/TeleportOverflowMenu.vue     |  24 +-
 .../base/buttons/TeleportPopoutMenu.vue       |   9 +-
 .../files-tab/components/FileContextMenu.vue  |  11 +-
 packages/ui/src/styles/tailwind-utilities.css |  23 ++
 7 files changed, 230 insertions(+), 230 deletions(-)

diff --git a/packages/ui/src/components/base/Combobox.vue b/packages/ui/src/components/base/Combobox.vue
index 4a0c6bcd0a..750238a9e1 100644
--- a/packages/ui/src/components/base/Combobox.vue
+++ b/packages/ui/src/components/base/Combobox.vue
@@ -97,12 +97,7 @@
 		</ButtonFrame>
 
 		<Teleport to="#teleports">
-			<Transition
-				enter-active-class="transition-opacity duration-150"
-				leave-active-class="transition-opacity duration-150"
-				enter-from-class="opacity-0"
-				leave-to-class="opacity-0"
-			>
+			<Transition name="floating-expand">
 				<div
 					v-if="shouldRenderDropdown"
 					ref="dropdownRef"
@@ -110,7 +105,6 @@
 					:class="[
 						props.dropdownClass,
 						openDirection === 'up' ? 'shadow-[0_-25px_50px_-12px_rgb(0,0,0,0.25)]' : 'shadow-2xl',
-						props.dropdownClass,
 					]"
 					:style="dropdownStyle"
 					:role="listbox ? 'listbox' : 'menu'"
diff --git a/packages/ui/src/components/base/DropdownFilterBar.vue b/packages/ui/src/components/base/DropdownFilterBar.vue
index 90163795c1..796b8907f7 100644
--- a/packages/ui/src/components/base/DropdownFilterBar.vue
+++ b/packages/ui/src/components/base/DropdownFilterBar.vue
@@ -128,12 +128,7 @@
 	</div>
 
 	<Teleport to="#teleports">
-		<Transition
-			:enter-active-class="addMenuTransitionEnterActiveClass"
-			leave-active-class="transition-none duration-0"
-			:enter-from-class="addMenuTransitionEnterFromClass"
-			leave-to-class="opacity-0"
-		>
+		<Transition name="floating-expand" :css="!isMobileAddMenuLayout">
 			<div
 				v-if="isAddMenuOpen && !isMobileActiveSubmenu"
 				ref="menuContainer"
@@ -166,207 +161,214 @@
 	</Teleport>
 
 	<Teleport to="#teleports">
-		<div
-			v-if="isAddMenuOpen && activeCategory && (isMobileAddMenuLayout || hasSubmenuPosition)"
-			ref="submenu"
-			class="fixed z-[10000] flex max-h-[min(70vh,32rem)] max-w-[calc(100vw-1rem)] flex-col overflow-hidden rounded-[14px] border border-solid border-surface-5 bg-surface-4 shadow-2xl"
-			:class="activeCategory.submenuClass ?? DEFAULT_SUBMENU_CLASS"
-			:style="submenuStyle"
-			@mouseenter="handleSubmenuMouseEnter"
-			@mouseleave="handleSubmenuMouseLeave"
-			@keydown="handleAddMenuKeydown"
-			@mousemove="(event) => handleMenuMouseMove(event, 'submenu')"
-		>
+		<Transition name="floating-expand" :css="!isMobileAddMenuLayout">
 			<div
-				v-if="isMobileAddMenuLayout"
-				class="flex items-center border-0 border-b border-solid border-b-surface-5 bg-surface-4"
-			>
-				<button
-					type="button"
-					class="flex h-12 w-full items-center gap-2 border-0 bg-transparent px-4 text-left text-base font-semibold text-primary shadow-none transition-all hover:brightness-110 focus-visible:brightness-110"
-					@click="returnToCategoryMenu"
-				>
-					<ChevronLeftIcon class="size-5 shrink-0 text-secondary" />
-					<span class="min-w-0 truncate">{{ activeCategory.label }}</span>
-				</button>
-			</div>
-			<div
-				v-if="activeCategory.searchable"
-				class="flex justify-between border-0 border-b border-solid border-b-surface-5 py-1.5 w-full"
-			>
-				<StyledInput
-					v-model="categorySearchQuery"
-					:icon="SearchIcon"
-					type="text"
-					:placeholder="activeCategory.searchPlaceholder ?? 'Search...'"
-					wrapper-class="grow bg-surface-4 mx-1"
-					input-class="ps-9 mx-1.5"
-				/>
-				<slot
-					name="search-actions"
-					:category="activeCategory"
-					:selected-values="activeCategorySelectedValues"
-					:set-selected-values="setActiveCategorySelectedValues"
-					:close-menu="closeAddMenu"
-				></slot>
-			</div>
-
-			<div v-if="$slots['category-top']" class="border-0 border-b border-solid border-b-surface-5">
-				<slot
-					name="category-top"
-					:category="activeCategory"
-					:selected-values="activeCategorySelectedValues"
-					:set-selected-values="setActiveCategorySelectedValues"
-					:close-menu="closeAddMenu"
-				></slot>
-			</div>
-
-			<div
-				class="flex items-center justify-between gap-3 border-0 border-b border-solid border-b-surface-5 px-4 py-2.5 text-sm"
-			>
-				<span class="font-semibold text-secondary">{{ activeCategorySelectionLabel }}</span>
-				<button
-					type="button"
-					class="border-0 bg-transparent p-0 text-sm font-semibold text-secondary shadow-none transition-colors"
-					:class="
-						hasActiveCategorySelection
-							? 'hover:bg-transparent hover:text-contrast'
-							: 'cursor-not-allowed opacity-50'
-					"
-					:disabled="!hasActiveCategorySelection"
-					@click="clearActiveCategorySelection"
-					@keydown.enter.stop
-					@keydown.space.stop
-				>
-					Clear
-				</button>
-			</div>
-			<div
-				ref="activeCategoryOptionsScrollbar"
-				class="dropdown-filter-bar-options-scrollbar min-h-0 flex-1 bg-surface-4"
-				data-overlayscrollbars-initialize
+				v-if="isAddMenuOpen && activeCategory && (isMobileAddMenuLayout || hasSubmenuPosition)"
+				ref="submenu"
+				class="fixed z-[10000] flex max-h-[min(70vh,32rem)] max-w-[calc(100vw-1rem)] flex-col overflow-hidden rounded-[14px] border border-solid border-surface-5 bg-surface-4 shadow-2xl"
+				:class="activeCategory.submenuClass ?? DEFAULT_SUBMENU_CLASS"
+				:style="submenuStyle"
+				@mouseenter="handleSubmenuMouseEnter"
+				@mouseleave="handleSubmenuMouseLeave"
+				@keydown="handleAddMenuKeydown"
+				@mousemove="(event) => handleMenuMouseMove(event, 'submenu')"
 			>
 				<div
-					ref="activeCategoryOptionsContainer"
-					class="h-full min-h-0 overflow-y-auto"
-					data-overlayscrollbars-viewport
+					v-if="isMobileAddMenuLayout"
+					class="flex items-center border-0 border-b border-solid border-b-surface-5 bg-surface-4"
+				>
+					<button
+						type="button"
+						class="flex h-12 w-full items-center gap-2 border-0 bg-transparent px-4 text-left text-base font-semibold text-primary shadow-none transition-all hover:brightness-110 focus-visible:brightness-110"
+						@click="returnToCategoryMenu"
+					>
+						<ChevronLeftIcon class="size-5 shrink-0 text-secondary" />
+						<span class="min-w-0 truncate">{{ activeCategory.label }}</span>
+					</button>
+				</div>
+				<div
+					v-if="activeCategory.searchable"
+					class="flex justify-between border-0 border-b border-solid border-b-surface-5 py-1.5 w-full"
+				>
+					<StyledInput
+						v-model="categorySearchQuery"
+						:icon="SearchIcon"
+						type="text"
+						:placeholder="activeCategory.searchPlaceholder ?? 'Search...'"
+						wrapper-class="grow bg-surface-4 mx-1"
+						input-class="ps-9 mx-1.5"
+					/>
+					<slot
+						name="search-actions"
+						:category="activeCategory"
+						:selected-values="activeCategorySelectedValues"
+						:set-selected-values="setActiveCategorySelectedValues"
+						:close-menu="closeAddMenu"
+					></slot>
+				</div>
+
+				<div
+					v-if="$slots['category-top']"
+					class="border-0 border-b border-solid border-b-surface-5"
+				>
+					<slot
+						name="category-top"
+						:category="activeCategory"
+						:selected-values="activeCategorySelectedValues"
+						:set-selected-values="setActiveCategorySelectedValues"
+						:close-menu="closeAddMenu"
+					></slot>
+				</div>
+
+				<div
+					class="flex items-center justify-between gap-3 border-0 border-b border-solid border-b-surface-5 px-4 py-2.5 text-sm"
+				>
+					<span class="font-semibold text-secondary">{{ activeCategorySelectionLabel }}</span>
+					<button
+						type="button"
+						class="border-0 bg-transparent p-0 text-sm font-semibold text-secondary shadow-none transition-colors"
+						:class="
+							hasActiveCategorySelection
+								? 'hover:bg-transparent hover:text-contrast'
+								: 'cursor-not-allowed opacity-50'
+						"
+						:disabled="!hasActiveCategorySelection"
+						@click="clearActiveCategorySelection"
+						@keydown.enter.stop
+						@keydown.space.stop
+					>
+						Clear
+					</button>
+				</div>
+				<div
+					ref="activeCategoryOptionsScrollbar"
+					class="dropdown-filter-bar-options-scrollbar min-h-0 flex-1 bg-surface-4"
+					data-overlayscrollbars-initialize
 				>
 					<div
-						v-if="filteredActiveCategoryOptions.length === 0"
-						class="px-4 py-3.5 text-base font-medium text-secondary"
-					>
-						{{ activeCategoryEmptyStateLabel }}
-					</div>
-					<div
-						v-else
-						ref="activeCategoryOptionsListContainer"
-						:class="shouldVirtualizeActiveCategoryOptions ? 'relative' : 'flex flex-col'"
-						:style="activeCategoryOptionsListStyle"
+						ref="activeCategoryOptionsContainer"
+						class="h-full min-h-0 overflow-y-auto"
+						data-overlayscrollbars-viewport
 					>
 						<div
-							v-for="{ item, index } in renderedVisibleActiveCategoryOptions"
-							:key="getActiveCategoryItemKey(item, index)"
-							:class="shouldVirtualizeActiveCategoryOptions ? 'absolute left-0 right-0' : undefined"
-							:style="getActiveCategoryOptionWrapperStyle(index)"
+							v-if="filteredActiveCategoryOptions.length === 0"
+							class="px-4 py-3.5 text-base font-medium text-secondary"
+						>
+							{{ activeCategoryEmptyStateLabel }}
+						</div>
+						<div
+							v-else
+							ref="activeCategoryOptionsListContainer"
+							:class="shouldVirtualizeActiveCategoryOptions ? 'relative' : 'flex flex-col'"
+							:style="activeCategoryOptionsListStyle"
 						>
 							<div
-								v-if="isDropdownFilterSectionHeader(item)"
-								class="flex items-center justify-between gap-3 border-0 px-4 py-2.5 text-sm font-semibold text-secondary"
-								:class="[
-									item.class,
-									item.dividerBefore && index > 0
-										? 'border-t border-solid border-surface-5'
-										: undefined,
-								]"
+								v-for="{ item, index } in renderedVisibleActiveCategoryOptions"
+								:key="getActiveCategoryItemKey(item, index)"
+								:class="
+									shouldVirtualizeActiveCategoryOptions ? 'absolute left-0 right-0' : undefined
+								"
+								:style="getActiveCategoryOptionWrapperStyle(index)"
 							>
-								<span class="flex min-w-0 items-center gap-2">
-									<component
-										:is="item.icon"
-										v-if="item.icon"
-										class="size-4 shrink-0"
-										aria-hidden="true"
-									/>
-									<span class="min-w-0 truncate">{{ item.label }}</span>
-								</span>
+								<div
+									v-if="isDropdownFilterSectionHeader(item)"
+									class="flex items-center justify-between gap-3 border-0 px-4 py-2.5 text-sm font-semibold text-secondary"
+									:class="[
+										item.class,
+										item.dividerBefore && index > 0
+											? 'border-t border-solid border-surface-5'
+											: undefined,
+									]"
+								>
+									<span class="flex min-w-0 items-center gap-2">
+										<component
+											:is="item.icon"
+											v-if="item.icon"
+											class="size-4 shrink-0"
+											aria-hidden="true"
+										/>
+										<span class="min-w-0 truncate">{{ item.label }}</span>
+									</span>
+									<button
+										v-if="hasSelectableSectionHeaderOptions(item)"
+										type="button"
+										class="border-0 bg-transparent p-0 text-sm font-semibold text-secondary shadow-none transition-colors hover:text-contrast"
+										@click="toggleSectionHeaderOptions(item)"
+									>
+										{{ areSectionHeaderOptionsSelected(item) ? 'Clear' : 'Select all' }}
+									</button>
+								</div>
 								<button
-									v-if="hasSelectableSectionHeaderOptions(item)"
+									v-else
 									type="button"
-									class="border-0 bg-transparent p-0 text-sm font-semibold text-secondary shadow-none transition-colors hover:text-contrast"
-									@click="toggleSectionHeaderOptions(item)"
+									class="flex w-full cursor-pointer items-center gap-2.5 border-0 px-4 py-3.5 text-left text-contrast shadow-none transition-all duration-150 bg-surface-4 hover:brightness-[115%] focus-visible:brightness-[115%] focus-visible:outline-none"
+									:class="[
+										shouldVirtualizeActiveCategoryOptions ? 'h-12' : undefined,
+										{
+											'brightness-[115%]': item.selected,
+											'pointer-events-none cursor-not-allowed opacity-50': item.disabled,
+										},
+									]"
+									:aria-disabled="item.disabled || undefined"
+									:aria-checked="item.selected"
+									role="checkbox"
+									@click="toggleFilterOption(activeCategory.key, item)"
 								>
-									{{ areSectionHeaderOptionsSelected(item) ? 'Clear' : 'Select all' }}
-								</button>
-							</div>
-							<button
-								v-else
-								type="button"
-								class="flex w-full cursor-pointer items-center gap-2.5 border-0 px-4 py-3.5 text-left text-contrast shadow-none transition-all duration-150 bg-surface-4 hover:brightness-[115%] focus-visible:brightness-[115%] focus-visible:outline-none"
-								:class="[
-									shouldVirtualizeActiveCategoryOptions ? 'h-12' : undefined,
-									{
-										'brightness-[115%]': item.selected,
-										'pointer-events-none cursor-not-allowed opacity-50': item.disabled,
-									},
-								]"
-								:aria-disabled="item.disabled || undefined"
-								:aria-checked="item.selected"
-								role="checkbox"
-								@click="toggleFilterOption(activeCategory.key, item)"
-							>
-								<span
-									v-if="checkboxPosition === 'left'"
-									class="checkbox-shadow flex h-5 w-5 shrink-0 items-center justify-center rounded-md border-[1px] border-solid"
-									:class="
-										item.selected
-											? 'border-button-border bg-brand text-brand-inverted'
-											: 'border-surface-5 bg-surface-2'
-									"
-								>
-									<CheckIcon v-if="item.selected" aria-hidden="true" stroke-width="3" />
-								</span>
-								<div class="flex min-w-0 flex-1 items-center justify-between gap-3">
-									<slot
-										v-if="$slots.option"
-										name="option"
-										:category="activeCategory"
-										:option="item"
-										:selected="item.selected"
-										:index="index"
-									></slot>
-									<template v-else>
-										<span
-											class="min-w-0 truncate font-semibold leading-tight"
-											:class="item.selected ? 'text-contrast' : 'text-primary'"
-										>
-											{{ item.label }}
-										</span>
+									<span
+										v-if="checkboxPosition === 'left'"
+										class="checkbox-shadow flex h-5 w-5 shrink-0 items-center justify-center rounded-md border-[1px] border-solid"
+										:class="
+											item.selected
+												? 'border-button-border bg-brand text-brand-inverted'
+												: 'border-surface-5 bg-surface-2'
+										"
+									>
+										<CheckIcon v-if="item.selected" aria-hidden="true" stroke-width="3" />
+									</span>
+									<div class="flex min-w-0 flex-1 items-center justify-between gap-3">
 										<slot
-											name="option-right"
+											v-if="$slots.option"
+											name="option"
 											:category="activeCategory"
 											:option="item"
 											:selected="item.selected"
+											:index="index"
 										></slot>
-									</template>
-								</div>
-								<span
-									v-if="checkboxPosition === 'right'"
-									class="flex shrink-0 items-center justify-center text-brand"
-								>
-									<CheckIcon v-if="item.selected" aria-hidden="true" class="size-5" />
-								</span>
-							</button>
+										<template v-else>
+											<span
+												class="min-w-0 truncate font-semibold leading-tight"
+												:class="item.selected ? 'text-contrast' : 'text-primary'"
+											>
+												{{ item.label }}
+											</span>
+											<slot
+												name="option-right"
+												:category="activeCategory"
+												:option="item"
+												:selected="item.selected"
+											></slot>
+										</template>
+									</div>
+									<span
+										v-if="checkboxPosition === 'right'"
+										class="flex shrink-0 items-center justify-center text-brand"
+									>
+										<CheckIcon v-if="item.selected" aria-hidden="true" class="size-5" />
+									</span>
+								</button>
+							</div>
 						</div>
 					</div>
 				</div>
+				<slot
+					name="category-footer"
+					:category="activeCategory"
+					:selected-values="activeCategorySelectedValues"
+					:set-selected-values="setActiveCategorySelectedValues"
+					:close-menu="closeAddMenu"
+				></slot>
 			</div>
-			<slot
-				name="category-footer"
-				:category="activeCategory"
-				:selected-values="activeCategorySelectedValues"
-				:set-selected-values="setActiveCategorySelectedValues"
-				:close-menu="closeAddMenu"
-			></slot>
-		</div>
+		</Transition>
 	</Teleport>
 </template>
 
@@ -726,12 +728,6 @@ const isMobileActiveSubmenu = computed(
 	() =>
 		isMobileAddMenuLayout.value && activeCategory.value !== undefined && hasSubmenuPosition.value,
 )
-const addMenuTransitionEnterActiveClass = computed(() =>
-	isMobileAddMenuLayout.value ? 'transition-none duration-0' : 'transition-opacity duration-150',
-)
-const addMenuTransitionEnterFromClass = computed(() =>
-	isMobileAddMenuLayout.value ? 'opacity-100' : 'opacity-0',
-)
 const addMenuTriggerElement = computed(() => addMenuTrigger.value?.element ?? null)
 const addMenuOutsideClickTarget = computed(() => menuContainer.value ?? submenu.value)
 const addMenuOutsideClickIgnore = computed(() => [addMenuTriggerElement, menuContainer, submenu])
diff --git a/packages/ui/src/components/base/MultiSelect.vue b/packages/ui/src/components/base/MultiSelect.vue
index f765bd90e6..7d17408333 100644
--- a/packages/ui/src/components/base/MultiSelect.vue
+++ b/packages/ui/src/components/base/MultiSelect.vue
@@ -108,12 +108,7 @@
 		</component>
 
 		<Teleport to="#teleports">
-			<Transition
-				enter-active-class="transition-opacity duration-150"
-				leave-active-class="transition-opacity duration-150"
-				enter-from-class="opacity-0"
-				leave-to-class="opacity-0"
-			>
+			<Transition name="floating-expand">
 				<div
 					v-if="isOpen"
 					ref="dropdownRef"
diff --git a/packages/ui/src/components/base/buttons/TeleportOverflowMenu.vue b/packages/ui/src/components/base/buttons/TeleportOverflowMenu.vue
index f219a88910..8f0aec56f2 100644
--- a/packages/ui/src/components/base/buttons/TeleportOverflowMenu.vue
+++ b/packages/ui/src/components/base/buttons/TeleportOverflowMenu.vue
@@ -80,6 +80,19 @@ const { isOpen, panelStyle, anchorStyle, resolvedSide, open, close } = useAnchor
 	resolvedDistance,
 )
 
+const menuTransformOrigin = computed(() => {
+	switch (resolvedSide.value) {
+		case 'top':
+			return 'bottom center'
+		case 'left':
+			return 'right center'
+		case 'right':
+			return 'left center'
+		default:
+			return 'top center'
+	}
+})
+
 const menuItemClasses =
 	'overflow-menu-item flex min-h-10 w-full items-center gap-2 rounded-[10px] border-0 bg-transparent px-3 py-2 text-left text-base font-semibold leading-5 text-contrast no-underline ' +
 	'cursor-pointer whitespace-nowrap hover:bg-surface-4 focus-visible:bg-surface-4 focus-visible:outline-none ' +
@@ -294,20 +307,13 @@ defineExpose({ open: openMenu, close: closeMenu })
 	</component>
 
 	<Teleport to="body">
-		<Transition
-			enter-active-class="transition duration-125 ease-out"
-			enter-from-class="scale-95 opacity-0"
-			enter-to-class="scale-100 opacity-100"
-			leave-active-class="transition duration-100 ease-in"
-			leave-from-class="scale-100 opacity-100"
-			leave-to-class="scale-95 opacity-0"
-		>
+		<Transition name="floating-expand">
 			<div
 				v-if="isOpen"
 				:id="menuId"
 				ref="panelElement"
 				class="fixed isolate z-[9999] flex min-w-48 flex-col gap-1 rounded-[14px] bg-surface-3 p-2 shadow-lg ring-1 ring-surface-5"
-				:style="panelStyle"
+				:style="[panelStyle, { transformOrigin: menuTransformOrigin }]"
 				role="menu"
 				:aria-label="props.label"
 				@keydown="handleMenuKeydown"
diff --git a/packages/ui/src/components/base/buttons/TeleportPopoutMenu.vue b/packages/ui/src/components/base/buttons/TeleportPopoutMenu.vue
index 16574bfec9..8fc2ff4abb 100644
--- a/packages/ui/src/components/base/buttons/TeleportPopoutMenu.vue
+++ b/packages/ui/src/components/base/buttons/TeleportPopoutMenu.vue
@@ -123,14 +123,7 @@ defineExpose({ open: openMenu, close: closeMenu })
 	</component>
 
 	<Teleport to="body">
-		<Transition
-			enter-active-class="transition duration-125 ease-out"
-			enter-from-class="scale-95 opacity-0"
-			enter-to-class="scale-100 opacity-100"
-			leave-active-class="transition duration-100 ease-in"
-			leave-from-class="scale-100 opacity-100"
-			leave-to-class="scale-95 opacity-0"
-		>
+		<Transition name="floating-expand">
 			<div
 				v-if="isOpen"
 				:id="panelId"
diff --git a/packages/ui/src/layouts/shared/files-tab/components/FileContextMenu.vue b/packages/ui/src/layouts/shared/files-tab/components/FileContextMenu.vue
index 6bc8da0469..340c136540 100644
--- a/packages/ui/src/layouts/shared/files-tab/components/FileContextMenu.vue
+++ b/packages/ui/src/layouts/shared/files-tab/components/FileContextMenu.vue
@@ -1,18 +1,11 @@
 <template>
 	<Teleport to="#teleports">
-		<Transition
-			enter-active-class="transition duration-125 ease-out"
-			enter-from-class="transform scale-75 opacity-0"
-			enter-to-class="transform scale-100 opacity-100"
-			leave-active-class="transition duration-125 ease-in"
-			leave-from-class="transform scale-100 opacity-100"
-			leave-to-class="transform scale-75 opacity-0"
-		>
+		<Transition name="floating-expand">
 			<div
 				v-if="visible"
 				ref="menuRef"
 				class="fixed isolate z-[9999] flex w-fit min-w-[180px] flex-col gap-2 overflow-hidden rounded-2xl border border-solid border-surface-5 bg-bg-raised p-2 shadow-lg"
-				:style="{ left: `${position.x}px`, top: `${position.y}px` }"
+				:style="{ left: `${position.x}px`, top: `${position.y}px`, transformOrigin: 'top left' }"
 				role="menu"
 				tabindex="-1"
 				@mousedown.stop
diff --git a/packages/ui/src/styles/tailwind-utilities.css b/packages/ui/src/styles/tailwind-utilities.css
index adc17e4fd2..c32ef00996 100644
--- a/packages/ui/src/styles/tailwind-utilities.css
+++ b/packages/ui/src/styles/tailwind-utilities.css
@@ -1,3 +1,26 @@
+:root {
+	--ease-out-expo: cubic-bezier(0.16, 1, 0.3, 1);
+}
+
+.floating-expand-enter-from,
+.floating-expand-leave-to {
+	opacity: 0;
+	scale: 0.9 0.3;
+}
+
+.floating-expand-enter-to,
+.floating-expand-leave-from {
+	opacity: 1;
+}
+
+.floating-expand-enter-active,
+.floating-expand-leave-active {
+	transition:
+		opacity 0.125s var(--ease-out-expo),
+		scale 0.125s var(--ease-out-expo);
+	transform-origin: top;
+}
+
 @layer utilities {
 	.heading-xl {
 		@apply m-0 text-xl font-semibold leading-none text-contrast;

From 2e8aaa31beb84ea1d5069011198f6a488e44014d Mon Sep 17 00:00:00 2001
From: Prospector <6166773+Prospector@users.noreply.github.com>
Date: Fri, 7 Aug 2026 13:20:05 -0700
Subject: [PATCH 53/82] change admin edit role modal to edit user (#7035)

change edit role modal to edit user
---
 apps/app-frontend/src/pages/User.vue          |   6 +
 apps/frontend/src/pages/user/[user].vue       |   3 +
 .../ui/src/components/user/UserPageHeader.vue |  12 +-
 .../components/edit-user-modal.vue            | 310 ++++++++++++++++++
 .../layouts/shared/user-profile/layout.vue    | 107 +-----
 .../user-profile/providers/user-profile.ts    |   4 +-
 packages/ui/src/locales/de-CH/index.json      |  15 -
 packages/ui/src/locales/de-DE/index.json      |  15 -
 packages/ui/src/locales/en-US/index.json      |  15 -
 packages/ui/src/locales/es-419/index.json     |  15 -
 packages/ui/src/locales/fr-FR/index.json      |  15 -
 packages/ui/src/locales/hu-HU/index.json      |  15 -
 packages/ui/src/locales/it-IT/index.json      |  15 -
 packages/ui/src/locales/ko-KR/index.json      |  15 -
 packages/ui/src/locales/nl-NL/index.json      |   6 -
 packages/ui/src/locales/pl-PL/index.json      |  15 -
 packages/ui/src/locales/pt-BR/index.json      |  15 -
 packages/ui/src/locales/ru-RU/index.json      |  15 -
 packages/ui/src/locales/sv-SE/index.json      |  15 -
 packages/ui/src/locales/uk-UA/index.json      |  15 -
 packages/ui/src/locales/zh-CN/index.json      |  15 -
 packages/ui/src/locales/zh-TW/index.json      |  15 -
 22 files changed, 330 insertions(+), 343 deletions(-)
 create mode 100644 packages/ui/src/layouts/shared/user-profile/components/edit-user-modal.vue

diff --git a/apps/app-frontend/src/pages/User.vue b/apps/app-frontend/src/pages/User.vue
index e04c0da3fa..daf79890c2 100644
--- a/apps/app-frontend/src/pages/User.vue
+++ b/apps/app-frontend/src/pages/User.vue
@@ -52,6 +52,8 @@ import { onBeforeRouteUpdate, useRoute, useRouter } from 'vue-router'
 
 import {
 	block_user,
+	change_user_avatar,
+	delete_user_avatar,
 	get_blocked_users,
 	get_user_collections,
 	get_user_organizations,
@@ -119,6 +121,10 @@ const userProfile = provideUserProfile({
 	getOrganizations: get_user_organizations,
 	getCollections: get_user_collections,
 	patchUser: patch_user,
+	changeAvatar: async (userId, file, extension) => {
+		await change_user_avatar(userId, new Uint8Array(await file.arrayBuffer()), extension)
+	},
+	deleteAvatar: delete_user_avatar,
 	getBlockedUsers: get_blocked_users,
 	blockUser: block_user,
 	unblockUser: unblock_user,
diff --git a/apps/frontend/src/pages/user/[user].vue b/apps/frontend/src/pages/user/[user].vue
index 3962e8ebcd..a4e01bc453 100644
--- a/apps/frontend/src/pages/user/[user].vue
+++ b/apps/frontend/src/pages/user/[user].vue
@@ -34,6 +34,9 @@ const userProfile = provideUserProfile({
 	getOrganizations: (userId) => client.labrinth.users_v2.getOrganizations(userId),
 	getCollections: (userId) => client.labrinth.users_v2.getCollections(userId),
 	patchUser: (userId, patch) => client.labrinth.users_v2.patch(userId, patch),
+	changeAvatar: (userId, file, extension) =>
+		client.labrinth.users_v2.changeIcon(userId, file, extension),
+	deleteAvatar: (userId) => client.labrinth.users_v2.deleteIcon(userId),
 	getBlockedUsers: () => client.labrinth.blocked_users_v3.list(),
 	blockUser: (userId) => client.labrinth.blocked_users_v3.block(userId),
 	unblockUser: (userId) => client.labrinth.blocked_users_v3.unblock(userId),
diff --git a/packages/ui/src/components/user/UserPageHeader.vue b/packages/ui/src/components/user/UserPageHeader.vue
index 84a552cd00..a99f3eadaf 100644
--- a/packages/ui/src/components/user/UserPageHeader.vue
+++ b/packages/ui/src/components/user/UserPageHeader.vue
@@ -136,10 +136,6 @@ const messages = defineMessages({
 		id: 'profile.button.unblock',
 		defaultMessage: 'Unblock',
 	},
-	editRoleButton: {
-		id: 'profile.button.edit-role',
-		defaultMessage: 'Edit role',
-	},
 	infoButton: {
 		id: 'profile.button.info',
 		defaultMessage: 'View user details',
@@ -220,7 +216,7 @@ const emit = defineEmits<{
 	toggleAffiliate: []
 	openInfo: []
 	openAnalytics: []
-	editRole: []
+	editUser: []
 }>()
 
 const { formatMessage } = useVIntl()
@@ -306,10 +302,10 @@ const moreActions = computed<OverflowMenuOption[]>(() => [
 		shown: props.showStaffActions && props.isAdmin,
 	},
 	{
-		id: 'edit-role',
-		label: formatMessage(messages.editRoleButton),
+		id: 'edit-user',
+		label: 'Edit user',
 		icon: EditIcon,
-		action: () => emit('editRole'),
+		action: () => emit('editUser'),
 		tone: 'orange',
 		shown: props.showStaffActions && props.isAdmin,
 	},
diff --git a/packages/ui/src/layouts/shared/user-profile/components/edit-user-modal.vue b/packages/ui/src/layouts/shared/user-profile/components/edit-user-modal.vue
new file mode 100644
index 0000000000..64e3e27043
--- /dev/null
+++ b/packages/ui/src/layouts/shared/user-profile/components/edit-user-modal.vue
@@ -0,0 +1,310 @@
+<template>
+	<NewModal ref="modal" header="Edit user" :closable="!isSaving">
+		<div class="flex w-[28rem] flex-col gap-4">
+			<div class="flex flex-col gap-2.5">
+				<span class="text-lg font-semibold text-contrast">Profile picture</span>
+				<div class="flex items-center gap-4">
+					<Avatar
+						:src="displayedAvatarUrl"
+						size="md"
+						circle
+						:alt="form.username || user.username"
+					/>
+					<div class="flex flex-col gap-2">
+						<FileButton
+							:max-size="262144"
+							:prompt="formatMessage(commonMessages.uploadImageButton)"
+							accept="image/png,image/jpeg,image/gif,image/webp"
+							size="md"
+							:disabled="isSaving"
+							@change="showAvatarPreview"
+						>
+							<UploadIcon aria-hidden="true" />
+						</FileButton>
+						<Button
+							v-if="avatarUrl && !pendingAvatarDeletion"
+							native-type="button"
+							size="md"
+							:disabled="isSaving"
+							@click="removeAvatar"
+						>
+							<TrashIcon aria-hidden="true" />
+							{{ formatMessage(commonMessages.removeImageButton) }}
+						</Button>
+						<Button
+							v-if="avatarFile || pendingAvatarDeletion"
+							native-type="button"
+							size="md"
+							:disabled="isSaving"
+							@click="resetAvatar"
+						>
+							<UndoIcon aria-hidden="true" />
+							{{ formatMessage(commonMessages.resetButton) }}
+						</Button>
+					</div>
+				</div>
+			</div>
+
+			<div class="flex flex-col gap-2.5">
+				<label class="text-lg font-semibold text-contrast" for="admin-edit-username">
+					{{ formatMessage(commonMessages.usernameLabel) }}
+				</label>
+				<div class="flex items-center gap-2">
+					<StyledInput
+						id="admin-edit-username"
+						v-model="form.username"
+						class="w-full"
+						:error="form.username.length > 39"
+						:disabled="isSaving"
+					/>
+					<span
+						v-if="form.username.length >= 30"
+						class="shrink-0 text-secondary"
+						:class="{ 'text-red': form.username.length > 39 }"
+					>
+						{{ form.username.length }}/39
+					</span>
+				</div>
+			</div>
+
+			<div class="flex flex-col gap-2.5">
+				<label class="text-lg font-semibold text-contrast" for="admin-edit-bio">Bio</label>
+				<StyledInput
+					id="admin-edit-bio"
+					v-model="form.bio"
+					multiline
+					:error="form.bio.length > 160"
+					:disabled="isSaving"
+				/>
+				<div class="text-secondary" :class="{ 'text-red': form.bio.length > 160 }">
+					{{ form.bio.length }}/160
+				</div>
+			</div>
+
+			<div class="flex flex-col gap-2.5">
+				<span class="text-lg font-semibold text-contrast">Role</span>
+				<Combobox
+					v-model="form.role"
+					:options="roleOptions"
+					placeholder="Select a role"
+					:disabled="isSaving"
+				/>
+			</div>
+
+			<div class="flex justify-end gap-2">
+				<Button native-type="button" :disabled="isSaving" @click="cancel">
+					<XIcon />
+					{{ formatMessage(commonMessages.cancelButton) }}
+				</Button>
+				<Button
+					type="colored"
+					color="brand"
+					native-type="button"
+					:disabled="!canSave || isSaving"
+					@click="save"
+				>
+					<template v-if="isSaving">
+						<SpinnerIcon class="animate-spin" />
+						{{ formatMessage(commonMessages.savingButton) }}
+					</template>
+					<template v-else>
+						<SaveIcon />
+						{{ formatMessage(commonMessages.saveChangesButton) }}
+					</template>
+				</Button>
+			</div>
+		</div>
+	</NewModal>
+</template>
+
+<script setup lang="ts">
+import type { Labrinth } from '@modrinth/api-client'
+import { SaveIcon, SpinnerIcon, TrashIcon, UndoIcon, UploadIcon, XIcon } from '@modrinth/assets'
+import { useQueryClient } from '@tanstack/vue-query'
+import { computed, onBeforeUnmount, ref, shallowRef } from 'vue'
+import { useRouter } from 'vue-router'
+
+import Avatar from '#ui/components/base/Avatar.vue'
+import { Button, FileButton } from '#ui/components/base/buttons'
+import Combobox from '#ui/components/base/Combobox.vue'
+import StyledInput from '#ui/components/base/StyledInput.vue'
+import NewModal from '#ui/components/modal/NewModal.vue'
+import { useVIntl } from '#ui/composables'
+import { injectNotificationManager } from '#ui/providers'
+import { commonMessages } from '#ui/utils'
+
+import { injectUserProfile } from '../providers'
+
+const props = defineProps<{
+	user: Labrinth.Users.v3.User
+	userId: string
+}>()
+
+const userProfile = injectUserProfile()
+const notificationManager = injectNotificationManager()
+const queryClient = useQueryClient()
+const router = useRouter()
+const { formatMessage } = useVIntl()
+
+const modal = ref<InstanceType<typeof NewModal> | null>(null)
+const isSaving = ref(false)
+const form = ref<{
+	username: string
+	bio: string
+	role: Labrinth.Users.v3.Role | null
+}>({
+	username: '',
+	bio: '',
+	role: null,
+})
+const avatarUrl = ref<string | null>(null)
+const avatarFile = shallowRef<File | null>(null)
+const avatarPreviewUrl = ref<string | null>(null)
+const pendingAvatarDeletion = ref(false)
+
+const roleOptions = [
+	{ value: 'developer', label: 'None' },
+	{ value: 'moderator', label: 'Content Moderator' },
+	{ value: 'admin', label: 'Admin' },
+] satisfies { value: Labrinth.Users.v3.Role; label: string }[]
+
+const displayedAvatarUrl = computed(() => {
+	if (avatarPreviewUrl.value) {
+		return avatarPreviewUrl.value
+	}
+	if (pendingAvatarDeletion.value) {
+		return null
+	}
+	return avatarUrl.value
+})
+
+const hasChanges = computed(() => {
+	return (
+		form.value.username !== props.user.username ||
+		form.value.bio !== (props.user.bio ?? '') ||
+		form.value.role !== props.user.role ||
+		Boolean(avatarFile.value || pendingAvatarDeletion.value)
+	)
+})
+
+const canSave = computed(() => {
+	return (
+		hasChanges.value &&
+		form.value.username.length > 0 &&
+		form.value.username.length <= 39 &&
+		form.value.bio.length <= 160 &&
+		form.value.role !== null
+	)
+})
+
+function revokeAvatarPreview(): void {
+	if (avatarPreviewUrl.value) {
+		URL.revokeObjectURL(avatarPreviewUrl.value)
+		avatarPreviewUrl.value = null
+	}
+}
+
+function syncFromUser(): void {
+	revokeAvatarPreview()
+	form.value = {
+		username: props.user.username,
+		bio: props.user.bio ?? '',
+		role: props.user.role,
+	}
+	avatarUrl.value = props.user.avatar_url ?? null
+	avatarFile.value = null
+	pendingAvatarDeletion.value = false
+}
+
+function showAvatarPreview(files: File[]): void {
+	const file = files[0]
+	if (!file) {
+		return
+	}
+
+	revokeAvatarPreview()
+	avatarFile.value = file
+	avatarPreviewUrl.value = URL.createObjectURL(file)
+	pendingAvatarDeletion.value = false
+}
+
+function removeAvatar(): void {
+	revokeAvatarPreview()
+	avatarFile.value = null
+	pendingAvatarDeletion.value = true
+}
+
+function resetAvatar(): void {
+	revokeAvatarPreview()
+	avatarFile.value = null
+	pendingAvatarDeletion.value = false
+}
+
+function show(): void {
+	syncFromUser()
+	modal.value?.show()
+}
+
+function hide(): void {
+	modal.value?.hide()
+}
+
+function cancel(): void {
+	syncFromUser()
+	hide()
+}
+
+async function save(): Promise<void> {
+	if (!form.value.role || !canSave.value || isSaving.value) {
+		return
+	}
+	const nextUsername = form.value.username
+	const usernameChanged = nextUsername !== props.user.username
+	isSaving.value = true
+	try {
+		const patch: Partial<Pick<Labrinth.Users.v3.User, 'bio' | 'role' | 'username'>> = {}
+		if (usernameChanged) {
+			patch.username = nextUsername
+		}
+		if (form.value.bio !== (props.user.bio ?? '')) {
+			patch.bio = form.value.bio
+		}
+		if (form.value.role !== props.user.role) {
+			patch.role = form.value.role
+		}
+		if (Object.keys(patch).length > 0) {
+			await userProfile.patchUser(props.user.id, patch)
+		}
+
+		if (pendingAvatarDeletion.value) {
+			await userProfile.deleteAvatar(props.user.id)
+		} else if (avatarFile.value) {
+			const extension = avatarFile.value.type.split('/').at(-1)
+			if (!extension) throw new Error('The selected image does not have a valid file type.')
+			await userProfile.changeAvatar(props.user.id, avatarFile.value, extension)
+		}
+
+		await queryClient.invalidateQueries({ queryKey: ['user', props.userId] })
+		hide()
+
+		if (usernameChanged) {
+			await router.replace(`/user/${encodeURIComponent(nextUsername)}`)
+		}
+	} catch {
+		notificationManager.addNotification({
+			type: 'error',
+			title: 'Failed to update user',
+			text: 'An error occurred while updating this user. Please try again.',
+		})
+	} finally {
+		isSaving.value = false
+	}
+}
+
+onBeforeUnmount(revokeAvatarPreview)
+
+defineExpose({
+	show,
+	hide,
+})
+</script>
diff --git a/packages/ui/src/layouts/shared/user-profile/layout.vue b/packages/ui/src/layouts/shared/user-profile/layout.vue
index bd16975459..8ffe648c35 100644
--- a/packages/ui/src/layouts/shared/user-profile/layout.vue
+++ b/packages/ui/src/layouts/shared/user-profile/layout.vue
@@ -37,41 +37,7 @@
 			</template>
 		</NewModal>
 
-		<NewModal
-			v-if="variant === 'web'"
-			ref="editRoleModal"
-			:header="formatMessage(messages.editRoleButton)"
-		>
-			<div class="flex w-80 flex-col gap-4">
-				<Combobox
-					v-model="selectedRole"
-					:options="roleOptions"
-					:placeholder="formatMessage(messages.selectRolePlaceholder)"
-				/>
-				<div class="flex justify-end gap-2">
-					<Button native-type="button" @click="cancelRoleEdit">
-						<XIcon />
-						{{ formatMessage(commonMessages.cancelButton) }}
-					</Button>
-					<Button
-						type="colored"
-						color="brand"
-						native-type="button"
-						:disabled="!selectedRole || selectedRole === user.role || isSavingRole"
-						@click="saveRoleEdit"
-					>
-						<template v-if="isSavingRole">
-							<SpinnerIcon class="animate-spin" />
-							{{ formatMessage(messages.savingLabel) }}
-						</template>
-						<template v-else>
-							<SaveIcon />
-							{{ formatMessage(commonMessages.saveChangesButton) }}
-						</template>
-					</Button>
-				</div>
-			</div>
-		</NewModal>
+		<EditUserModal v-if="variant === 'web'" ref="editUserModal" :user="user" :user-id="userId" />
 
 		<NewModal
 			v-if="variant === 'web' && isStaffViewing"
@@ -226,7 +192,7 @@
 					@open-analytics="
 						openPath(`/dashboard/analytics?user=${encodeURIComponent(user.username)}`)
 					"
-					@edit-role="openRoleEditModal"
+					@edit-user="editUserModal?.show()"
 				>
 					<template v-if="isModrinthUser" #summary>
 						<IntlFormatted :message-id="messages.officialAccountBio">
@@ -460,7 +426,6 @@ import {
 	LibraryIcon,
 	LinkIcon,
 	LockIcon,
-	SaveIcon,
 	SpinnerIcon,
 	XIcon,
 } from '@modrinth/assets'
@@ -477,7 +442,6 @@ import Admonition from '#ui/components/base/Admonition.vue'
 import AutoLink from '#ui/components/base/AutoLink.vue'
 import Avatar from '#ui/components/base/Avatar.vue'
 import { Button } from '#ui/components/base/buttons'
-import Combobox from '#ui/components/base/Combobox.vue'
 import EmptyState from '#ui/components/base/EmptyState.vue'
 import IntlFormatted from '#ui/components/base/IntlFormatted.vue'
 import NavTabs from '#ui/components/base/NavTabs.vue'
@@ -498,6 +462,7 @@ import {
 } from '#ui/providers'
 import { commonMessages, getProjectTypeTitleMessage, sortProjectTypes } from '#ui/utils'
 
+import EditUserModal from './components/edit-user-modal.vue'
 import { blockedUsersQueryKey, injectUserProfile } from './providers'
 import {
 	hasActivePride26Midas,
@@ -571,18 +536,6 @@ const messages = defineMessages({
 		id: 'profile.collection.projects-count',
 		defaultMessage: '{count, plural, one {# project} other {# projects}}',
 	},
-	savingLabel: {
-		id: 'profile.label.saving',
-		defaultMessage: 'Saving...',
-	},
-	editRoleButton: {
-		id: 'profile.button.edit-role',
-		defaultMessage: 'Edit role',
-	},
-	selectRolePlaceholder: {
-		id: 'profile.role.select-placeholder',
-		defaultMessage: 'Select a role',
-	},
 	userDetailsTitle: {
 		id: 'profile.details.title',
 		defaultMessage: 'User details',
@@ -692,14 +645,6 @@ const messages = defineMessages({
 		defaultMessage:
 			'The official user account of Modrinth. Get support at <support-link></support-link> or via email at <email></email>',
 	},
-	roleUpdateErrorTitle: {
-		id: 'profile.role.update-error-title',
-		defaultMessage: 'Failed to update role',
-	},
-	roleUpdateErrorDescription: {
-		id: 'profile.role.update-error-description',
-		defaultMessage: 'An error occurred while updating the user role. Please try again.',
-	},
 	blockButton: {
 		id: 'profile.button.block',
 		defaultMessage: 'Block',
@@ -1043,35 +988,15 @@ async function retryQueries(): Promise<void> {
 }
 
 const userDetailsModal = ref<ModalRef | null>(null)
-const editRoleModal = ref<ModalRef | null>(null)
+const editUserModal = ref<InstanceType<typeof EditUserModal> | null>(null)
 const blockUserModal = ref<ModalRef | null>(null)
-const selectedRole = ref<Labrinth.Users.v3.Role | null>(null)
-const isSavingRole = ref(false)
 const isBlockingUser = ref(false)
 const isUnblockingUser = ref(false)
-const roleOptions = [
-	{ value: 'developer', label: 'Developer' },
-	{ value: 'moderator', label: 'Moderator' },
-	{ value: 'admin', label: 'Admin' },
-] satisfies { value: Labrinth.Users.v3.Role; label: string }[]
-
-watch(
-	user,
-	(currentUser) => {
-		selectedRole.value = currentUser?.role ?? null
-	},
-	{ immediate: true },
-)
 
 function openUserDetails(): void {
 	userDetailsModal.value?.show()
 }
 
-function openRoleEditModal(): void {
-	selectedRole.value = user.value?.role ?? null
-	editRoleModal.value?.show()
-}
-
 async function handleBlockAction(): Promise<void> {
 	if (!auth.user.value) {
 		await auth.requestSignIn(route.fullPath)
@@ -1148,11 +1073,6 @@ async function unblockCurrentUser(): Promise<void> {
 	}
 }
 
-function cancelRoleEdit(): void {
-	selectedRole.value = user.value?.role ?? null
-	editRoleModal.value?.hide()
-}
-
 async function toggleAffiliate(): Promise<void> {
 	if (!user.value) return
 	await userProfile.patchUser(user.value.id, {
@@ -1160,23 +1080,4 @@ async function toggleAffiliate(): Promise<void> {
 	})
 	await queryClient.invalidateQueries({ queryKey: ['user', props.userId] })
 }
-
-async function saveRoleEdit(): Promise<void> {
-	if (!user.value || !selectedRole.value || selectedRole.value === user.value.role) return
-
-	isSavingRole.value = true
-	try {
-		await userProfile.patchUser(user.value.id, { role: selectedRole.value })
-		await queryClient.invalidateQueries({ queryKey: ['user', props.userId] })
-		editRoleModal.value?.hide()
-	} catch {
-		notificationManager.addNotification({
-			type: 'error',
-			title: formatMessage(messages.roleUpdateErrorTitle),
-			text: formatMessage(messages.roleUpdateErrorDescription),
-		})
-	} finally {
-		isSavingRole.value = false
-	}
-}
 </script>
diff --git a/packages/ui/src/layouts/shared/user-profile/providers/user-profile.ts b/packages/ui/src/layouts/shared/user-profile/providers/user-profile.ts
index 6314ece5c6..58270661bd 100644
--- a/packages/ui/src/layouts/shared/user-profile/providers/user-profile.ts
+++ b/packages/ui/src/layouts/shared/user-profile/providers/user-profile.ts
@@ -9,8 +9,10 @@ export interface UserProfileContext {
 	getCollections: (userId: string) => Promise<Labrinth.Collections.Collection[]>
 	patchUser: (
 		userId: string,
-		patch: Partial<Pick<Labrinth.Users.v3.User, 'badges' | 'role'>>,
+		patch: Partial<Pick<Labrinth.Users.v3.User, 'badges' | 'bio' | 'role' | 'username'>>,
 	) => Promise<void>
+	changeAvatar: (userId: string, file: Blob, extension: string) => Promise<void>
+	deleteAvatar: (userId: string) => Promise<void>
 	getBlockedUsers: () => Promise<Labrinth.BlockedUsers.v3.BlockedUserId[]>
 	blockUser: (userId: string) => Promise<void>
 	unblockUser: (userId: string) => Promise<void>
diff --git a/packages/ui/src/locales/de-CH/index.json b/packages/ui/src/locales/de-CH/index.json
index 4620db4fa0..a5632aaf9a 100644
--- a/packages/ui/src/locales/de-CH/index.json
+++ b/packages/ui/src/locales/de-CH/index.json
@@ -2897,9 +2897,6 @@
   "profile.button.create-project": {
     "defaultMessage": "Projekt erstellen"
   },
-  "profile.button.edit-role": {
-    "defaultMessage": "Rolle bearbeiten"
-  },
   "profile.button.info": {
     "defaultMessage": "Nutzerdetails anzeigen"
   },
@@ -2981,24 +2978,12 @@
   "profile.label.project-count": {
     "defaultMessage": "{count, plural, one {Projekt} other {Projekte}}"
   },
-  "profile.label.saving": {
-    "defaultMessage": "Speichert..."
-  },
   "profile.official-account": {
     "defaultMessage": "Offizielles Modrinth-Konto"
   },
   "profile.official-account.bio": {
     "defaultMessage": "Das offizielle Benutzerkonto von Modrinth. Erhalte Hilfe unter <support-link></support-link> oder per E-Mail unter <email></email>"
   },
-  "profile.role.select-placeholder": {
-    "defaultMessage": "Eine Rolle auswählen"
-  },
-  "profile.role.update-error-description": {
-    "defaultMessage": "Beim Aktualisieren dieser Nutzerrolle ist ein Fehler aufgetreten. Bitte versuche es erneut."
-  },
-  "profile.role.update-error-title": {
-    "defaultMessage": "Rolle konnte nicht aktualisiert werden"
-  },
   "profile.unblock-user.error-description": {
     "defaultMessage": "Beim Freigeben dieses Nutzers ist ein Fehler aufgetreten. Bitte versuche es erneut."
   },
diff --git a/packages/ui/src/locales/de-DE/index.json b/packages/ui/src/locales/de-DE/index.json
index e49817eab2..d57bdd0cb8 100644
--- a/packages/ui/src/locales/de-DE/index.json
+++ b/packages/ui/src/locales/de-DE/index.json
@@ -2897,9 +2897,6 @@
   "profile.button.create-project": {
     "defaultMessage": "Projekt erstellen"
   },
-  "profile.button.edit-role": {
-    "defaultMessage": "Rolle bearbeiten"
-  },
   "profile.button.info": {
     "defaultMessage": "Nutzerdetails anzeigen"
   },
@@ -2981,24 +2978,12 @@
   "profile.label.project-count": {
     "defaultMessage": "{count, plural, one {Projekt} other {Projekte}}"
   },
-  "profile.label.saving": {
-    "defaultMessage": "Speichert..."
-  },
   "profile.official-account": {
     "defaultMessage": "Offizielles Modrinth-Konto"
   },
   "profile.official-account.bio": {
     "defaultMessage": "Das offizielle Benutzerkonto von Modrinth. Erhalte Hilfe unter <support-link></support-link> oder per E-Mail unter <email></email>"
   },
-  "profile.role.select-placeholder": {
-    "defaultMessage": "Eine Rolle auswählen"
-  },
-  "profile.role.update-error-description": {
-    "defaultMessage": "Beim Aktualisieren dieser Nutzerrolle ist ein Fehler aufgetreten. Bitte versuche es erneut."
-  },
-  "profile.role.update-error-title": {
-    "defaultMessage": "Rolle konnte nicht aktualisiert werden"
-  },
   "profile.unblock-user.error-description": {
     "defaultMessage": "Beim Freigeben dieses Nutzers ist ein Fehler aufgetreten. Bitte versuche es erneut."
   },
diff --git a/packages/ui/src/locales/en-US/index.json b/packages/ui/src/locales/en-US/index.json
index b1704ca9cc..029827877e 100644
--- a/packages/ui/src/locales/en-US/index.json
+++ b/packages/ui/src/locales/en-US/index.json
@@ -2897,9 +2897,6 @@
   "profile.button.create-project": {
     "defaultMessage": "Create a project"
   },
-  "profile.button.edit-role": {
-    "defaultMessage": "Edit role"
-  },
   "profile.button.info": {
     "defaultMessage": "View user details"
   },
@@ -2996,24 +2993,12 @@
   "profile.label.project-count": {
     "defaultMessage": "{count, plural, one {project} other {projects}}"
   },
-  "profile.label.saving": {
-    "defaultMessage": "Saving..."
-  },
   "profile.official-account": {
     "defaultMessage": "Official Modrinth account"
   },
   "profile.official-account.bio": {
     "defaultMessage": "The official user account of Modrinth. Get support at <support-link></support-link> or via email at <email></email>"
   },
-  "profile.role.select-placeholder": {
-    "defaultMessage": "Select a role"
-  },
-  "profile.role.update-error-description": {
-    "defaultMessage": "An error occurred while updating the user role. Please try again."
-  },
-  "profile.role.update-error-title": {
-    "defaultMessage": "Failed to update role"
-  },
   "profile.unblock-user.error-description": {
     "defaultMessage": "An error occurred while unblocking this user. Please try again."
   },
diff --git a/packages/ui/src/locales/es-419/index.json b/packages/ui/src/locales/es-419/index.json
index d72d86a709..ab32fc08d8 100644
--- a/packages/ui/src/locales/es-419/index.json
+++ b/packages/ui/src/locales/es-419/index.json
@@ -2897,9 +2897,6 @@
   "profile.button.create-project": {
     "defaultMessage": "Crear un proyecto"
   },
-  "profile.button.edit-role": {
-    "defaultMessage": "Editar rol"
-  },
   "profile.button.info": {
     "defaultMessage": "Ver detalles del usuario"
   },
@@ -2996,24 +2993,12 @@
   "profile.label.project-count": {
     "defaultMessage": "{count, plural, one {proyecto} other {proyectos}}"
   },
-  "profile.label.saving": {
-    "defaultMessage": "Guardando..."
-  },
   "profile.official-account": {
     "defaultMessage": "Cuenta oficial de Modrinth"
   },
   "profile.official-account.bio": {
     "defaultMessage": "La cuenta oficial de Modrinth. Consigue ayuda en <support-link></support-link> o escríbenos a través de email: <email></email>"
   },
-  "profile.role.select-placeholder": {
-    "defaultMessage": "Selecciona un rol"
-  },
-  "profile.role.update-error-description": {
-    "defaultMessage": "Ocurrió un error al actualizar el rol del usuario. Por favor inténtalo otra vez."
-  },
-  "profile.role.update-error-title": {
-    "defaultMessage": "Error al actualizar el rol"
-  },
   "profile.unblock-user.error-description": {
     "defaultMessage": "Ocurrió un error al desbloquear a este usuario. Por favor inténtalo otra vez."
   },
diff --git a/packages/ui/src/locales/fr-FR/index.json b/packages/ui/src/locales/fr-FR/index.json
index 3a73d5ac67..0f641ef1d2 100644
--- a/packages/ui/src/locales/fr-FR/index.json
+++ b/packages/ui/src/locales/fr-FR/index.json
@@ -2891,9 +2891,6 @@
   "profile.button.create-project": {
     "defaultMessage": "Créer un projet"
   },
-  "profile.button.edit-role": {
-    "defaultMessage": "Modifier le rôle"
-  },
   "profile.button.info": {
     "defaultMessage": "Voir les détails de l'utilisateur"
   },
@@ -2975,24 +2972,12 @@
   "profile.label.project-count": {
     "defaultMessage": "{count, plural,one {projet}other {projets}}"
   },
-  "profile.label.saving": {
-    "defaultMessage": "Enregistrement..."
-  },
   "profile.official-account": {
     "defaultMessage": "Compte Modrinth officiel"
   },
   "profile.official-account.bio": {
     "defaultMessage": "Le compte utilisateur officiel de Modrinth. Obtenez de l’aide via <support-link></support-link> ou par e-mail à <email></email>"
   },
-  "profile.role.select-placeholder": {
-    "defaultMessage": "Sélectionner un rôle"
-  },
-  "profile.role.update-error-description": {
-    "defaultMessage": "Une erreur s'est produite lors de la mise à jour du rôle utilisateur. Veuillez réessayer."
-  },
-  "profile.role.update-error-title": {
-    "defaultMessage": "Impossible de mettre à jour le rôle"
-  },
   "profile.unblock-user.error-description": {
     "defaultMessage": "Une erreur s'est produite pendant le déblocage de cet utilisateur. Veuillez réessayer."
   },
diff --git a/packages/ui/src/locales/hu-HU/index.json b/packages/ui/src/locales/hu-HU/index.json
index 56b16f5eb5..5e9d85aa35 100644
--- a/packages/ui/src/locales/hu-HU/index.json
+++ b/packages/ui/src/locales/hu-HU/index.json
@@ -2534,9 +2534,6 @@
   "profile.button.create-project": {
     "defaultMessage": "Projekt létrehozása"
   },
-  "profile.button.edit-role": {
-    "defaultMessage": "Szerep szerkesztése"
-  },
   "profile.button.info": {
     "defaultMessage": "Felhasználói adatok megtekintése"
   },
@@ -2609,24 +2606,12 @@
   "profile.label.project-count": {
     "defaultMessage": "projekt"
   },
-  "profile.label.saving": {
-    "defaultMessage": "Mentés..."
-  },
   "profile.official-account": {
     "defaultMessage": "Hivatalos Modrinth-fiók"
   },
   "profile.official-account.bio": {
     "defaultMessage": "A Modrinth hivatalos felhasználói fiókja. Támogatás a <support-link></support-link> oldalon kaphatsz vagy e-mailben a <email></email> címen."
   },
-  "profile.role.select-placeholder": {
-    "defaultMessage": "Válassz egy rangot"
-  },
-  "profile.role.update-error-description": {
-    "defaultMessage": "Hiba történt a felhasználói szerepkör frissítése közben. Kérlek próbáld meg újra."
-  },
-  "profile.role.update-error-title": {
-    "defaultMessage": "A szerepkör frissítése nem sikerült"
-  },
   "profile.unblock-user.error-description": {
     "defaultMessage": "Hiba történt a felhasználó letiltásának feloldása közben. Kérlek próbáld meg újra."
   },
diff --git a/packages/ui/src/locales/it-IT/index.json b/packages/ui/src/locales/it-IT/index.json
index 8c99b7d979..76b765ac73 100644
--- a/packages/ui/src/locales/it-IT/index.json
+++ b/packages/ui/src/locales/it-IT/index.json
@@ -2855,9 +2855,6 @@
   "profile.button.create-project": {
     "defaultMessage": "Crea un progetto"
   },
-  "profile.button.edit-role": {
-    "defaultMessage": "Modifica ruolo"
-  },
   "profile.button.info": {
     "defaultMessage": "Mostra info utente"
   },
@@ -2954,24 +2951,12 @@
   "profile.label.project-count": {
     "defaultMessage": "{count, plural, one {progetto} other {progetti}}"
   },
-  "profile.label.saving": {
-    "defaultMessage": "Salvataggio..."
-  },
   "profile.official-account": {
     "defaultMessage": "Account Modrinth ufficiale"
   },
   "profile.official-account.bio": {
     "defaultMessage": "L'account ufficiale di Modrinth. Ricevi assistenza presso <support-link></support-link> o tramite mail presso <email></email>"
   },
-  "profile.role.select-placeholder": {
-    "defaultMessage": "Seleziona il ruolo"
-  },
-  "profile.role.update-error-description": {
-    "defaultMessage": "Sì è verificato un errore nel salvataggio del ruolo utente. Riprova più tardi."
-  },
-  "profile.role.update-error-title": {
-    "defaultMessage": "Impossibile salvare il ruolo"
-  },
   "profile.unblock-user.error-description": {
     "defaultMessage": "Sì è verificato un errore nello sbloccare l'utente. Riprova più tardi."
   },
diff --git a/packages/ui/src/locales/ko-KR/index.json b/packages/ui/src/locales/ko-KR/index.json
index cb845c6eef..7ce577da9e 100644
--- a/packages/ui/src/locales/ko-KR/index.json
+++ b/packages/ui/src/locales/ko-KR/index.json
@@ -2897,9 +2897,6 @@
   "profile.button.create-project": {
     "defaultMessage": "프로젝트 만들기"
   },
-  "profile.button.edit-role": {
-    "defaultMessage": "역할 수정"
-  },
   "profile.button.info": {
     "defaultMessage": "사용자 상세 정보 보기"
   },
@@ -2981,24 +2978,12 @@
   "profile.label.project-count": {
     "defaultMessage": "{count, plural, other {프로젝트}}"
   },
-  "profile.label.saving": {
-    "defaultMessage": "저장 중..."
-  },
   "profile.official-account": {
     "defaultMessage": "공식 Modrinth 계정"
   },
   "profile.official-account.bio": {
     "defaultMessage": "Modrinth의 공식 사용자 계정입니다. <support-link></support-link> 또는 <email></email> 을 통해 문의해 주세요"
   },
-  "profile.role.select-placeholder": {
-    "defaultMessage": "역할 선택"
-  },
-  "profile.role.update-error-description": {
-    "defaultMessage": "사용자 역할을 업데이트하는 동안 오류가 발생했습니다. 다시 시도해 주세요."
-  },
-  "profile.role.update-error-title": {
-    "defaultMessage": "역할 업데이트 실패"
-  },
   "profile.unblock-user.error-description": {
     "defaultMessage": "이 사용자의 차단을 해제하는 동안 오류가 발생했습니다. 다시 시도해 주세요."
   },
diff --git a/packages/ui/src/locales/nl-NL/index.json b/packages/ui/src/locales/nl-NL/index.json
index 456e7988e7..40df10dea6 100644
--- a/packages/ui/src/locales/nl-NL/index.json
+++ b/packages/ui/src/locales/nl-NL/index.json
@@ -2858,9 +2858,6 @@
   "profile.button.create-project": {
     "defaultMessage": "Een project aanmaken"
   },
-  "profile.button.edit-role": {
-    "defaultMessage": "Rol bewerken"
-  },
   "profile.button.info": {
     "defaultMessage": "Gebruikersgegevens bekijken"
   },
@@ -2939,9 +2936,6 @@
   "profile.label.project-count": {
     "defaultMessage": "{count, plural, one {project} other {projecten}}"
   },
-  "profile.label.saving": {
-    "defaultMessage": "Opslaan..."
-  },
   "profile.official-account": {
     "defaultMessage": "Officieel Modrinth-account"
   },
diff --git a/packages/ui/src/locales/pl-PL/index.json b/packages/ui/src/locales/pl-PL/index.json
index a602e1f73c..579d0fdf09 100644
--- a/packages/ui/src/locales/pl-PL/index.json
+++ b/packages/ui/src/locales/pl-PL/index.json
@@ -2885,9 +2885,6 @@
   "profile.button.create-project": {
     "defaultMessage": "Utwórz projekt"
   },
-  "profile.button.edit-role": {
-    "defaultMessage": "Edytuj rolę"
-  },
   "profile.button.info": {
     "defaultMessage": "Otwórz szczegóły użytkownika"
   },
@@ -2960,24 +2957,12 @@
   "profile.label.project-count": {
     "defaultMessage": "{count, plural, one {projekt} few {projekty} other {projektów}}"
   },
-  "profile.label.saving": {
-    "defaultMessage": "Zapisywanie..."
-  },
   "profile.official-account": {
     "defaultMessage": "Oficjalne konto Modrinth"
   },
   "profile.official-account.bio": {
     "defaultMessage": "Oficjalne konto Modrinth. Otrzymaj wsparcie na stronie <support-link></support-link> lub poprzez e-mail <email></email>"
   },
-  "profile.role.select-placeholder": {
-    "defaultMessage": "Wybierz rolę"
-  },
-  "profile.role.update-error-description": {
-    "defaultMessage": "Wystąpił błąd podczas ustawiania roli tego użytkownika. Spróbuj ponownie później."
-  },
-  "profile.role.update-error-title": {
-    "defaultMessage": "Nie udało się zaktualizować roli"
-  },
   "profile.unblock-user.error-description": {
     "defaultMessage": "Wystąpił błąd podczas odblokowywania tego użytkownika. Spróbuj ponownie później."
   },
diff --git a/packages/ui/src/locales/pt-BR/index.json b/packages/ui/src/locales/pt-BR/index.json
index 454a67c26c..8d76406a29 100644
--- a/packages/ui/src/locales/pt-BR/index.json
+++ b/packages/ui/src/locales/pt-BR/index.json
@@ -2897,9 +2897,6 @@
   "profile.button.create-project": {
     "defaultMessage": "Criar projeto"
   },
-  "profile.button.edit-role": {
-    "defaultMessage": "Editar cargo"
-  },
   "profile.button.info": {
     "defaultMessage": "Ver detalhes do usuário"
   },
@@ -2996,24 +2993,12 @@
   "profile.label.project-count": {
     "defaultMessage": "{count, plural, one {projeto} other {projetos}}"
   },
-  "profile.label.saving": {
-    "defaultMessage": "Salvando..."
-  },
   "profile.official-account": {
     "defaultMessage": "Conta oficial do Modrinth"
   },
   "profile.official-account.bio": {
     "defaultMessage": "Conta oficial do Modrinth. Obtenha suporte em<support-link></support-link> ou por e-mail via <email></email>"
   },
-  "profile.role.select-placeholder": {
-    "defaultMessage": "Selecione um cargo"
-  },
-  "profile.role.update-error-description": {
-    "defaultMessage": "Ocorreu um erro ao atualizar o cargo do usuário. Tente novamente."
-  },
-  "profile.role.update-error-title": {
-    "defaultMessage": "Falha ao atualizar cargo"
-  },
   "profile.unblock-user.error-description": {
     "defaultMessage": "Ocorreu um erro ao desbloquear este usuário. Tente novamente."
   },
diff --git a/packages/ui/src/locales/ru-RU/index.json b/packages/ui/src/locales/ru-RU/index.json
index 24430a0f10..7a2e25906f 100644
--- a/packages/ui/src/locales/ru-RU/index.json
+++ b/packages/ui/src/locales/ru-RU/index.json
@@ -2810,9 +2810,6 @@
   "profile.button.create-project": {
     "defaultMessage": "Создать проект"
   },
-  "profile.button.edit-role": {
-    "defaultMessage": "Настройка роли"
-  },
   "profile.button.info": {
     "defaultMessage": "Посмотреть подробности"
   },
@@ -2909,24 +2906,12 @@
   "profile.label.project-count": {
     "defaultMessage": "{count, plural, one {проект} few {проекта} other {проектов}}"
   },
-  "profile.label.saving": {
-    "defaultMessage": "Сохранение..."
-  },
   "profile.official-account": {
     "defaultMessage": "Официальный аккаунт Modrinth"
   },
   "profile.official-account.bio": {
     "defaultMessage": "Официальный аккаунт Modrinth. Связь с поддержкой: <support-link></support-link> или по почте <email></email>"
   },
-  "profile.role.select-placeholder": {
-    "defaultMessage": "Выберите роль"
-  },
-  "profile.role.update-error-description": {
-    "defaultMessage": "Произошла ошибка при обновлении роли. Попробуйте снова."
-  },
-  "profile.role.update-error-title": {
-    "defaultMessage": "Не удалось обновить роль"
-  },
   "profile.unblock-user.error-description": {
     "defaultMessage": "Произошла ошибка при разблокировке пользователя. Попробуйте снова."
   },
diff --git a/packages/ui/src/locales/sv-SE/index.json b/packages/ui/src/locales/sv-SE/index.json
index 93cd6523dc..84cda49a99 100644
--- a/packages/ui/src/locales/sv-SE/index.json
+++ b/packages/ui/src/locales/sv-SE/index.json
@@ -2558,9 +2558,6 @@
   "profile.button.create-project": {
     "defaultMessage": "Skapa ett projekt"
   },
-  "profile.button.edit-role": {
-    "defaultMessage": "Ändra roll"
-  },
   "profile.button.info": {
     "defaultMessage": "Visa användardetaljer"
   },
@@ -2627,21 +2624,9 @@
   "profile.label.project-count": {
     "defaultMessage": "Projekt"
   },
-  "profile.label.saving": {
-    "defaultMessage": "Sparar..."
-  },
   "profile.official-account": {
     "defaultMessage": "Officiellt Modrinth-konto"
   },
-  "profile.role.select-placeholder": {
-    "defaultMessage": "Välj en roll"
-  },
-  "profile.role.update-error-description": {
-    "defaultMessage": "Ett fel inträffade medan användarrollen uppdaterades. Vänligen försök igen."
-  },
-  "profile.role.update-error-title": {
-    "defaultMessage": "Misslyckades att uppdatera rollen"
-  },
   "profile.unblock-user.error-description": {
     "defaultMessage": "Ett fel inträffade under avblockeringen av den här användaren. Vänligen försök igen."
   },
diff --git a/packages/ui/src/locales/uk-UA/index.json b/packages/ui/src/locales/uk-UA/index.json
index a4850a6d7d..cdb5b752eb 100644
--- a/packages/ui/src/locales/uk-UA/index.json
+++ b/packages/ui/src/locales/uk-UA/index.json
@@ -2852,9 +2852,6 @@
   "profile.button.create-project": {
     "defaultMessage": "Створити проєкт"
   },
-  "profile.button.edit-role": {
-    "defaultMessage": "Зміна ролі"
-  },
   "profile.button.info": {
     "defaultMessage": "Деталі про користувача"
   },
@@ -2945,24 +2942,12 @@
   "profile.label.project-count": {
     "defaultMessage": "{count, plural, one {проєкт} few {проєкти} many {проєктів} other {проєктів}}"
   },
-  "profile.label.saving": {
-    "defaultMessage": "Збереження..."
-  },
   "profile.official-account": {
     "defaultMessage": "Офіційний обліковий запис Modrinth"
   },
   "profile.official-account.bio": {
     "defaultMessage": "Офіційний обліковий запис Modrinth. Зв'язатися з підтримкою можна за <support-link></support-link> або через електронну пошту за <email></email>"
   },
-  "profile.role.select-placeholder": {
-    "defaultMessage": "Виберіть роль"
-  },
-  "profile.role.update-error-description": {
-    "defaultMessage": "Виникла помилка під час оновлення ролі користувача. Спробуйте знову."
-  },
-  "profile.role.update-error-title": {
-    "defaultMessage": "Не вдалося оновити роль"
-  },
   "profile.unblock-user.error-description": {
     "defaultMessage": "Виникла помилка під час розблокування користувача. Спробуйте знову."
   },
diff --git a/packages/ui/src/locales/zh-CN/index.json b/packages/ui/src/locales/zh-CN/index.json
index 229117c170..eaf3fee149 100644
--- a/packages/ui/src/locales/zh-CN/index.json
+++ b/packages/ui/src/locales/zh-CN/index.json
@@ -2897,9 +2897,6 @@
   "profile.button.create-project": {
     "defaultMessage": "创建项目"
   },
-  "profile.button.edit-role": {
-    "defaultMessage": "编辑角色"
-  },
   "profile.button.info": {
     "defaultMessage": "查看用户详情"
   },
@@ -2996,24 +2993,12 @@
   "profile.label.project-count": {
     "defaultMessage": "{count, plural, other {项目}}"
   },
-  "profile.label.saving": {
-    "defaultMessage": "正在保存……"
-  },
   "profile.official-account": {
     "defaultMessage": "官方 Modrinth 账户"
   },
   "profile.official-account.bio": {
     "defaultMessage": "Modrinth 的官方用户账号。可通过 <support-link></support-link> 或电子邮件 <email></email> 获取支持"
   },
-  "profile.role.select-placeholder": {
-    "defaultMessage": "选择角色"
-  },
-  "profile.role.update-error-description": {
-    "defaultMessage": "更新用户角色时发生了错误。请重试。"
-  },
-  "profile.role.update-error-title": {
-    "defaultMessage": "更新角色失败"
-  },
   "profile.unblock-user.error-description": {
     "defaultMessage": "解除屏蔽该用户时发生了错误。请重试。"
   },
diff --git a/packages/ui/src/locales/zh-TW/index.json b/packages/ui/src/locales/zh-TW/index.json
index c42ded253b..bcc2570137 100644
--- a/packages/ui/src/locales/zh-TW/index.json
+++ b/packages/ui/src/locales/zh-TW/index.json
@@ -2897,9 +2897,6 @@
   "profile.button.create-project": {
     "defaultMessage": "建立專案"
   },
-  "profile.button.edit-role": {
-    "defaultMessage": "編輯身分"
-  },
   "profile.button.info": {
     "defaultMessage": "檢視使用者詳細資訊"
   },
@@ -2996,24 +2993,12 @@
   "profile.label.project-count": {
     "defaultMessage": "{count, plural, other {個專案}}"
   },
-  "profile.label.saving": {
-    "defaultMessage": "正在儲存..."
-  },
   "profile.official-account": {
     "defaultMessage": "Modrinth 官方帳號"
   },
   "profile.official-account.bio": {
     "defaultMessage": "Modrinth 的官方使用者帳號。請至 <support-link></support-link> 取得支援，或透過電子郵件 <email></email> 聯絡客服團隊"
   },
-  "profile.role.select-placeholder": {
-    "defaultMessage": "選擇身分"
-  },
-  "profile.role.update-error-description": {
-    "defaultMessage": "更新使用者身分時發生錯誤，請再試一次。"
-  },
-  "profile.role.update-error-title": {
-    "defaultMessage": "無法更新身分"
-  },
   "profile.unblock-user.error-description": {
     "defaultMessage": "解除封鎖使用者時發生錯誤，請再試一次。"
   },

From 9181c155e0d189ddd4ac964752fe3779460d6d78 Mon Sep 17 00:00:00 2001
From: Prospector <6166773+Prospector@users.noreply.github.com>
Date: Fri, 7 Aug 2026 13:20:13 -0700
Subject: [PATCH 54/82] fix license field showing on server projects (#7031)

* fix license field showing on server projects

* random commit to trigger CI hopefully?
---
 README.md                                    | 2 +-
 apps/frontend/src/pages/[type]/[project].vue | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7b4f90ef20..0def9bf509 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
 
 ## Modrinth Monorepo
 
-Welcome to the Modrinth Monorepo, the primary codebase for the Modrinth web interface and app. It contains ![Lines of Code](https://img.shields.io/endpoint?url=https://loctopus.creeperkatze.dev/github/modrinth/code/badge%3Fformat%3Dhuman&logoColor=white&color=black&label=) lines of code and has ![Contributors](https://img.shields.io/github/contributors/Modrinth/code?color=black&label=) contributors!
+Welcome to the Modrinth Monorepo, the primary codebase for the Modrinth web interface and app. It contains ![Lines of code](https://img.shields.io/endpoint?url=https://loctopus.creeperkatze.dev/github/modrinth/code/badge%3Fformat%3Dhuman&logoColor=white&color=black&label=) lines of code and has ![Contributors](https://img.shields.io/github/contributors/Modrinth/code?color=black&label=) contributors!
 
 If you're not a developer and you've stumbled upon this repository, you can access the web interface on the [Modrinth website](https://modrinth.com) and download the latest release of the app [here](https://modrinth.com/app).
 
diff --git a/apps/frontend/src/pages/[type]/[project].vue b/apps/frontend/src/pages/[type]/[project].vue
index 6b2b092f30..25f5022078 100644
--- a/apps/frontend/src/pages/[type]/[project].vue
+++ b/apps/frontend/src/pages/[type]/[project].vue
@@ -469,6 +469,7 @@
 					<ProjectSidebarDetails
 						:project="project"
 						:link-target="$external()"
+						:hide-license="isServerProject"
 						:show-followers="isServerProject"
 						class="card flex-card"
 					/>

From b0394de1644fbf5e251f1031d62bb9a4e562fea2 Mon Sep 17 00:00:00 2001
From: Prospector <6166773+Prospector@users.noreply.github.com>
Date: Fri, 7 Aug 2026 13:20:31 -0700
Subject: [PATCH 55/82] add loading states for creators + server details
 (#7033)

* add loading states for creators + server details

* prepr
---
 apps/frontend/src/pages/[type]/[project].vue  | 19 ++++-
 .../project/ProjectSidebarCreators.vue        | 81 +++++++++++--------
 .../project/ProjectSidebarServerInfo.vue      | 23 +++++-
 .../server/ServerModpackContentCard.vue       |  5 ++
 4 files changed, 92 insertions(+), 36 deletions(-)

diff --git a/apps/frontend/src/pages/[type]/[project].vue b/apps/frontend/src/pages/[type]/[project].vue
index 25f5022078..fe34c4ec58 100644
--- a/apps/frontend/src/pages/[type]/[project].vue
+++ b/apps/frontend/src/pages/[type]/[project].vue
@@ -432,7 +432,8 @@
 
 				<div class="normal-page__sidebar">
 					<ProjectSidebarServerInfo
-						v-if="isServerProject && serverDataLoaded"
+						v-if="isServerProject"
+						:loading="!serverDataLoaded"
 						:project-v3="projectV3"
 						:tags="tags"
 						:required-content="serverRequiredContent"
@@ -462,6 +463,7 @@
 					<ProjectSidebarCreators
 						:organization="organization"
 						:members="members"
+						:loading="creatorsLoading"
 						:org-link="(slug) => `/organization/${slug}`"
 						:user-link="(username) => `/user/${username}`"
 						class="card flex-card"
@@ -1023,7 +1025,11 @@ watch(serverModpackVersionId, (versionId) => {
 })
 
 // Members
-const { data: allMembersRaw, error: _membersError } = useQuery({
+const {
+	data: allMembersRaw,
+	error: _membersError,
+	isPending: membersPending,
+} = useQuery({
 	queryKey: computed(() => ['project', projectId.value, 'members']),
 	queryFn: () => client.labrinth.projects_v3.getMembers(projectId.value),
 	staleTime: STALE_TIME,
@@ -1074,7 +1080,7 @@ const {
 
 // Organization
 // Only fetch organization if project belongs to one
-const { data: organizationRaw } = useQuery({
+const { data: organizationRaw, isPending: organizationPending } = useQuery({
 	queryKey: computed(() => ['project', projectId.value, 'organization']),
 	queryFn: () => client.labrinth.projects_v3.getOrganization(projectId.value),
 	staleTime: STALE_TIME,
@@ -1085,6 +1091,13 @@ const { data: organizationRaw } = useQuery({
 // Return null when the project no longer belongs to an organization.
 const organization = computed(() => (projectRaw.value?.organization ? organizationRaw.value : null))
 
+const creatorsLoading = computed(
+	() =>
+		!projectRaw.value ||
+		membersPending.value ||
+		(!!projectRaw.value.organization && organizationPending.value),
+)
+
 const { data: thread } = useQuery({
 	queryKey: computed(() => ['thread', projectRaw.value?.thread_id]),
 	queryFn: () => client.labrinth.threads_v3.getThread(projectRaw.value.thread_id),
diff --git a/packages/ui/src/components/project/ProjectSidebarCreators.vue b/packages/ui/src/components/project/ProjectSidebarCreators.vue
index 0e58d1b997..1eab4a2d36 100644
--- a/packages/ui/src/components/project/ProjectSidebarCreators.vue
+++ b/packages/ui/src/components/project/ProjectSidebarCreators.vue
@@ -2,45 +2,59 @@
 	<div class="flex flex-col gap-3">
 		<h2 class="text-lg font-semibold m-0">{{ formatMessage(messages.title) }}</h2>
 		<div class="flex flex-col gap-3 font-semibold">
-			<template v-if="organization">
+			<template v-if="loading">
+				<div v-for="i in 2" :key="`creator-skeleton-${i}`" class="flex gap-2 items-center">
+					<div class="size-[32px] rounded-full bg-surface-4 animate-pulse"></div>
+					<div class="flex flex-col gap-1.5">
+						<div class="w-24 h-4 rounded-full bg-surface-4 animate-pulse"></div>
+						<div class="w-16 h-3 rounded-full bg-surface-4 animate-pulse"></div>
+					</div>
+				</div>
+			</template>
+			<template v-else-if="isEmpty">
+				<span class="text-red"> Error: Project has no members. This shouldn't happen. </span>
+			</template>
+			<template v-else>
+				<template v-if="organization">
+					<AutoLink
+						class="flex gap-2 items-center w-fit text-primary leading-[1.2] group"
+						:to="orgLink(organization.slug)"
+						:target="linkTarget ?? null"
+					>
+						<Avatar :src="organization.icon_url" :alt="organization.name" size="32px" />
+						<div class="flex flex-col flex-nowrap justify-center">
+							<span class="group-hover:underline font-medium">
+								{{ organization.name }}
+							</span>
+							<span class="text-sm font-normal text-secondary flex items-center gap-1"
+								><OrganizationIcon /> {{ formatMessage(messages.organization) }}</span
+							>
+						</div>
+					</AutoLink>
+					<hr v-if="sortedMembers.length > 0" class="w-full border-button-border my-0.5" />
+				</template>
 				<AutoLink
+					v-for="member in sortedMembers"
+					:key="`member-${member.id}`"
 					class="flex gap-2 items-center w-fit text-primary leading-[1.2] group"
-					:to="orgLink(organization.slug)"
-					:target="linkTarget ?? null"
+					:to="userLink(member.user.username)"
+					:target="resolveLinkTarget(userLinkTarget)"
 				>
-					<Avatar :src="organization.icon_url" :alt="organization.name" size="32px" />
-					<div class="flex flex-col flex-nowrap justify-center">
-						<span class="group-hover:underline font-medium">
-							{{ organization.name }}
+					<Avatar :src="member.user.avatar_url" :alt="member.user.username" size="32px" circle />
+					<div class="flex flex-col">
+						<span class="flex w-full flex-nowrap items-center gap-1 group-hover:underline">
+							<span class="min-w-0 overflow-hidden truncate">{{ member.user.username }}</span>
+							<CrownIcon
+								v-if="member.is_owner"
+								v-tooltip="formatMessage(messages.owner)"
+								class="text-brand-orange"
+							/>
+							<ExternalIcon v-if="resolveLinkTarget(userLinkTarget) === '_blank'" />
 						</span>
-						<span class="text-sm font-normal text-secondary flex items-center gap-1"
-							><OrganizationIcon /> {{ formatMessage(messages.organization) }}</span
-						>
+						<span class="text-sm font-normal text-secondary">{{ member.role }}</span>
 					</div>
 				</AutoLink>
-				<hr v-if="sortedMembers.length > 0" class="w-full border-button-border my-0.5" />
 			</template>
-			<AutoLink
-				v-for="member in sortedMembers"
-				:key="`member-${member.id}`"
-				class="flex gap-2 items-center w-fit text-primary leading-[1.2] group"
-				:to="userLink(member.user.username)"
-				:target="resolveLinkTarget(userLinkTarget)"
-			>
-				<Avatar :src="member.user.avatar_url" :alt="member.user.username" size="32px" circle />
-				<div class="flex flex-col">
-					<span class="flex w-full flex-nowrap items-center gap-1 group-hover:underline">
-						<span class="min-w-0 overflow-hidden truncate">{{ member.user.username }}</span>
-						<CrownIcon
-							v-if="member.is_owner"
-							v-tooltip="formatMessage(messages.owner)"
-							class="text-brand-orange"
-						/>
-						<ExternalIcon v-if="resolveLinkTarget(userLinkTarget) === '_blank'" />
-					</span>
-					<span class="text-sm font-normal text-secondary">{{ member.role }}</span>
-				</div>
-			</AutoLink>
 		</div>
 	</div>
 </template>
@@ -80,6 +94,7 @@ const props = defineProps<{
 	userLink: (username: string) => string
 	linkTarget?: string
 	userLinkTarget?: string | null
+	loading?: boolean
 }>()
 
 function resolveLinkTarget(target: string | null | undefined): string | null {
@@ -113,6 +128,8 @@ const sortedMembers = computed(() => {
 	return owner ? [owner, ...rest] : rest
 })
 
+const isEmpty = computed(() => !props.organization && sortedMembers.value.length === 0)
+
 const messages = defineMessages({
 	title: {
 		id: 'project.about.creators.title',
diff --git a/packages/ui/src/components/project/ProjectSidebarServerInfo.vue b/packages/ui/src/components/project/ProjectSidebarServerInfo.vue
index f025f93afa..0c6767b788 100644
--- a/packages/ui/src/components/project/ProjectSidebarServerInfo.vue
+++ b/packages/ui/src/components/project/ProjectSidebarServerInfo.vue
@@ -1,5 +1,5 @@
 <template>
-	<div v-if="hasContent" class="flex flex-col gap-3">
+	<div v-if="loading || hasContent" class="flex flex-col gap-3">
 		<h2 class="text-lg m-0">{{ formatMessage(messages.title) }}</h2>
 
 		<div
@@ -15,6 +15,10 @@
 				<CopyIcon class="shrink-0" />
 			</div>
 		</div>
+		<div
+			v-else-if="loading && !projectV3"
+			class="h-12 rounded-2xl bg-surface-4 animate-pulse"
+		></div>
 
 		<section v-if="requiredContent" class="flex flex-col gap-2">
 			<h3 class="text-primary text-base m-0">{{ formatMessage(messages.requiredContent) }}</h3>
@@ -26,8 +30,13 @@
 				:onclick-version="requiredContent.onclickVersion"
 				:onclick-download="requiredContent.onclickDownload"
 				:show-custom-modpack-tooltip="requiredContent.showCustomModpackTooltip"
+				:loading-version="loading"
 			/>
 		</section>
+		<section v-else-if="loading" class="flex flex-col gap-2">
+			<h3 class="text-primary text-base m-0">{{ formatMessage(messages.requiredContent) }}</h3>
+			<div class="h-[52px] rounded-2xl bg-surface-4 animate-pulse"></div>
+		</section>
 		<section v-if="recommendedVersions.length" class="flex flex-col gap-2">
 			<h3 class="text-primary text-base m-0">{{ formatMessage(messages.minecraftJava) }}</h3>
 			<div class="flex flex-wrap gap-1.5">
@@ -57,6 +66,17 @@
 				</TagItem>
 			</div>
 		</section>
+		<section v-else-if="loading" class="flex flex-col gap-2">
+			<h3 class="text-primary text-base m-0">{{ formatMessage(messages.minecraftJava) }}</h3>
+			<div class="flex flex-wrap gap-1.5">
+				<div
+					v-for="width in ['w-16', 'w-20']"
+					:key="`version-skeleton-${width}`"
+					class="h-[26px] rounded-full bg-surface-4 animate-pulse"
+					:class="width"
+				></div>
+			</div>
+		</section>
 		<section v-if="props.ping !== undefined || region" class="flex flex-col gap-2">
 			<h3 class="text-primary text-base m-0">{{ formatMessage(messages.region) }}</h3>
 			<div class="flex flex-wrap gap-1.5 items-center">
@@ -115,6 +135,7 @@ interface Props {
 	loaders?: string[]
 	ping?: number
 	statusOnline?: boolean
+	loading?: boolean
 }
 
 const props = withDefaults(defineProps<Props>(), {
diff --git a/packages/ui/src/components/project/server/ServerModpackContentCard.vue b/packages/ui/src/components/project/server/ServerModpackContentCard.vue
index 1d25e4b6c0..e448286df5 100644
--- a/packages/ui/src/components/project/server/ServerModpackContentCard.vue
+++ b/packages/ui/src/components/project/server/ServerModpackContentCard.vue
@@ -27,6 +27,10 @@
 				>
 					{{ versionNumber }}
 				</div>
+				<div
+					v-else-if="loadingVersion"
+					class="w-16 h-4 my-0.5 rounded-full bg-surface-4 animate-pulse"
+				></div>
 			</div>
 		</div>
 		<IconButton
@@ -58,6 +62,7 @@ defineProps<{
 	onclickVersion?: () => void
 	onclickDownload?: () => void
 	showCustomModpackTooltip?: boolean
+	loadingVersion?: boolean
 }>()
 
 const { formatMessage } = useVIntl()

From 5ef999bf8aff6660921118fe2df7a52a3727224a Mon Sep 17 00:00:00 2001
From: ThatGravyBoat <gravy@thatgravyboat.tech>
Date: Fri, 7 Aug 2026 18:04:03 -0230
Subject: [PATCH 56/82] feat: requested moderation and tech review changes
 (#7019)

* feat: requested moderation and tech review changes

* chore: run prepr

* chore: run prepr

---------

Signed-off-by: ThatGravyBoat <gravy@thatgravyboat.tech>
---
 .../ui/moderation/ModerationTechRevCard.vue   | 77 +++++++++++++++----
 .../moderation/settings/ModerationKeybind.vue | 10 ++-
 .../settings/ModerationKeybinds.vue           |  2 +-
 .../[type]/[project]/version/[version].vue    | 18 +++++
 .../src/pages/[type]/[project]/versions.vue   | 18 +++++
 .../moderation/technical-review/[project].vue | 29 +++++++
 .../moderation/technical-review/index.vue     | 45 +++++++++++
 packages/moderation/src/data/keybinds.ts      | 12 +++
 packages/moderation/src/data/settings.ts      |  7 ++
 packages/moderation/src/types/keybinds.ts     | 25 +++++-
 10 files changed, 223 insertions(+), 20 deletions(-)

diff --git a/apps/frontend/src/components/ui/moderation/ModerationTechRevCard.vue b/apps/frontend/src/components/ui/moderation/ModerationTechRevCard.vue
index 0baa5864a0..e6f5b3f9a4 100644
--- a/apps/frontend/src/components/ui/moderation/ModerationTechRevCard.vue
+++ b/apps/frontend/src/components/ui/moderation/ModerationTechRevCard.vue
@@ -856,6 +856,10 @@ async function updateDetailStatus(
 
 	updatingDetails.add(detailId)
 
+	const previousMarkedCount = selectedFile.value
+		? getFileMarkedCount(selectedFile.value)
+		: undefined
+
 	try {
 		await updateIssueDetails([{ detail_id: detailId, verdict }])
 
@@ -880,7 +884,7 @@ async function updateDetailStatus(
 		if (verdict !== 'pending' && selectedFile.value) {
 			const markedCount = getFileMarkedCount(selectedFile.value)
 			const totalCount = getFileDetailCount(selectedFile.value)
-			if (markedCount === totalCount) {
+			if (previousMarkedCount != markedCount && markedCount === totalCount) {
 				backToFileList()
 			}
 		}
@@ -938,6 +942,10 @@ async function updateGlobalDetailStatus(
 
 	updatingGlobalDetailKeys.add(detail.key)
 
+	const previousMarkedCount = selectedFile.value
+		? getFileMarkedCount(selectedFile.value)
+		: undefined
+
 	try {
 		await updateGlobalIssueDetail(detail.key, verdict)
 
@@ -958,7 +966,7 @@ async function updateGlobalDetailStatus(
 		if (verdict !== 'pending' && selectedFile.value) {
 			const markedCount = getFileMarkedCount(selectedFile.value)
 			const totalCount = getFileDetailCount(selectedFile.value)
-			if (markedCount === totalCount) {
+			if (previousMarkedCount != markedCount && markedCount === totalCount) {
 				backToFileList()
 			}
 		}
@@ -1355,8 +1363,10 @@ const canSubmitReview = computed(() => {
 	if (totalIssues === 0) return true
 	return allIssuesResolved.value
 })
+const hasSubmittedPassReview = ref(false)
 
 async function handleSubmitReview(verdict: 'safe' | 'unsafe') {
+	hasSubmittedPassReview.value = verdict === 'safe'
 	const editorContent = threadViewRef.value?.getReplyContent() || ''
 
 	let message: string | undefined
@@ -1523,13 +1533,39 @@ function copyId() {
 
 			<div class="h-px w-full bg-surface-5"></div>
 
-			<NavTabs
-				mode="local"
-				:links="navTabsLinks"
-				:active-index="activeTabIndex"
-				class="bg-surface-3! shadow-none!"
-				@tab-click="handleTabClick"
-			/>
+			<div class="flex flex-row justify-between">
+				<NavTabs
+					mode="local"
+					:links="navTabsLinks"
+					:active-index="activeTabIndex"
+					class="bg-surface-3! shadow-none!"
+					@tab-click="handleTabClick"
+				/>
+
+				<div v-if="selectedFile" class="flex flex-row items-end gap-2">
+					<ButtonLink
+						v-tooltip="`Download`"
+						type="outlined"
+						target="_blank"
+						:href="selectedFile.download_url"
+						:download="selectedFile.file_name"
+						class="!bg-surface-2"
+						aria-label="Download"
+					>
+						<DownloadIcon aria-hidden="true" />
+					</ButtonLink>
+					<ButtonLink
+						v-tooltip="`Open in Slicer`"
+						type="outlined"
+						target="_blank"
+						:href="`https://slicer.run/?url=${encodeURIComponent(selectedFile.download_url)}`"
+						class="!bg-surface-2"
+						aria-label="Open in Slicer"
+					>
+						<ExternalIcon aria-hidden="true" /> Open
+					</ButtonLink>
+				</div>
+			</div>
 		</div>
 
 		<div class="border-t border-surface-3 bg-surface-2">
@@ -1552,10 +1588,16 @@ function copyId() {
 						>
 							<template #additionalActions>
 								<Button
-									v-tooltip="!canSubmitReview ? 'There are still pending flags!' : undefined"
+									v-tooltip="
+										!canSubmitReview
+											? 'There are still pending flags!'
+											: hasSubmittedPassReview
+												? 'Project already passed!'
+												: undefined
+									"
 									type="colored"
 									color="brand"
-									:disabled="!canSubmitReview"
+									:disabled="!canSubmitReview || hasSubmittedPassReview"
 									@click="handleSubmitReview('safe')"
 								>
 									<ShieldCheckIcon /> Pass
@@ -1683,7 +1725,16 @@ function copyId() {
 							:download="file.file_name"
 							tabindex="0"
 						>
-							<DownloadIcon /> Download
+							<DownloadIcon />
+						</ButtonLink>
+						<ButtonLink
+							v-tooltip="`Open in Slicer`"
+							type="outlined"
+							target="_blank"
+							:href="`https://slicer.run/?url=${encodeURIComponent(file.download_url)}`"
+							aria-label="Open in Slicer"
+						>
+							<ExternalIcon aria-hidden="true" /> Open
 						</ButtonLink>
 					</div>
 				</div>
@@ -2063,7 +2114,7 @@ function copyId() {
 										v-tooltip="`Copy code`"
 										type="quiet"
 										:label="`Copy code`"
-										class="absolute right-2 top-2 border-[1px]"
+										class="!absolute right-2 top-2 border-[1px]"
 										@click="copyToClipboard(getClassDecompiledSource(classItem)!, classItem.key)"
 									>
 										<CopyIcon v-if="!showCopyFeedback.get(classItem.key)" />
diff --git a/apps/frontend/src/components/ui/moderation/settings/ModerationKeybind.vue b/apps/frontend/src/components/ui/moderation/settings/ModerationKeybind.vue
index b9dd7a5320..377c658252 100644
--- a/apps/frontend/src/components/ui/moderation/settings/ModerationKeybind.vue
+++ b/apps/frontend/src/components/ui/moderation/settings/ModerationKeybind.vue
@@ -2,9 +2,13 @@
 	<div>
 		<span class="flex flex-row items-center gap-2 text-sm text-secondary">
 			<GlobeIcon
-				v-if="props.global"
+				v-if="props.scope === 'project'"
 				v-tooltip="'Can be used without the checklist open if setting enabled.'"
 			/>
+			<ShieldCheckIcon
+				v-if="props.scope === 'tech-review'"
+				v-tooltip="'Used within the tech review pages'"
+			/>
 			{{ props.title }}
 			<IconButton
 				type="quiet"
@@ -45,14 +49,14 @@
 </template>
 
 <script setup lang="ts">
-import { GlobeIcon, RotateCounterClockwiseIcon } from '@modrinth/assets'
+import { GlobeIcon, RotateCounterClockwiseIcon, ShieldCheckIcon } from '@modrinth/assets'
 import { type KeybindDefinition, toKeybindDefinition } from '@modrinth/moderation'
 import { IconButton } from '@modrinth/ui'
 import { onUnmounted } from 'vue'
 
 const props = defineProps<{
 	title: string
-	global: boolean
+	scope: string
 	definitions: KeybindDefinition[]
 	default: KeybindDefinition[]
 	onChange: (definitions: KeybindDefinition[]) => void
diff --git a/apps/frontend/src/components/ui/moderation/settings/ModerationKeybinds.vue b/apps/frontend/src/components/ui/moderation/settings/ModerationKeybinds.vue
index 35ae3a472c..2ef3e51d83 100644
--- a/apps/frontend/src/components/ui/moderation/settings/ModerationKeybinds.vue
+++ b/apps/frontend/src/components/ui/moderation/settings/ModerationKeybinds.vue
@@ -12,7 +12,7 @@ const keybinds = useModerationKeybinds()
 				v-for="[id, keybind] in keybinds"
 				:key="id"
 				:title="keybind.description"
-				:global="keybind.scope === 'project'"
+				:scope="keybind.scope"
 				:definitions="keybind.keybind"
 				:default="keybind.defaultKeybind"
 				:on-change="
diff --git a/apps/frontend/src/pages/[type]/[project]/version/[version].vue b/apps/frontend/src/pages/[type]/[project]/version/[version].vue
index 25fd9b2851..193aeb89f7 100644
--- a/apps/frontend/src/pages/[type]/[project]/version/[version].vue
+++ b/apps/frontend/src/pages/[type]/[project]/version/[version].vue
@@ -144,6 +144,22 @@
 							<DownloadIcon aria-hidden="true" />
 							{{ formatMessage(commonMessages.downloadButton) }}
 						</ButtonLink>
+						<ButtonLink
+							v-if="
+								!!primaryFile?.url &&
+								isStaff(auth.user) &&
+								modSettings.get(moderationSettings.General.SlicerButtonInVersions)
+							"
+							v-tooltip="`Open in Slicer`"
+							type="quiet"
+							target="_blank"
+							:href="`https://slicer.run/?url=${encodeURIComponent(primaryFile?.url)}`"
+							class="!bg-button-bg"
+							aria-label="Open in Slicer"
+						>
+							<ExternalIcon aria-hidden="true" />
+							Open
+						</ButtonLink>
 						<ButtonLink
 							v-for="file in promotedFiles.filter(
 								(x) =>
@@ -502,6 +518,7 @@ import {
 	TrashIcon,
 	XIcon,
 } from '@modrinth/assets'
+import { moderationSettings } from '@modrinth/moderation'
 import {
 	Admonition,
 	Button,
@@ -545,6 +562,7 @@ const emit = defineEmits<{
 const data = useNuxtApp()
 const route = useNativeRoute()
 const router = useRouter()
+const modSettings = useModerationSettings()
 const auth = await useAuth()
 const tags = useGeneratedState()
 const client = injectModrinthClient()
diff --git a/apps/frontend/src/pages/[type]/[project]/versions.vue b/apps/frontend/src/pages/[type]/[project]/versions.vue
index 48bec39fc7..adefb0711f 100644
--- a/apps/frontend/src/pages/[type]/[project]/versions.vue
+++ b/apps/frontend/src/pages/[type]/[project]/versions.vue
@@ -53,6 +53,21 @@
 					>
 						<DownloadIcon aria-hidden="true" />
 					</ButtonLink>
+					<ButtonLink
+						v-if="
+							!!getPrimaryFile(version) &&
+							isStaff(auth.user) &&
+							modSettings.get(moderationSettings.General.SlicerButtonInVersions)
+						"
+						v-tooltip="`Open in Slicer`"
+						type="quiet"
+						target="_blank"
+						:href="`https://slicer.run/?url=${encodeURIComponent(createDownloadUrl(version))}`"
+						class="!w-9 !rounded-full !px-0 hover:!bg-button-bg"
+						aria-label="Open in Slicer"
+					>
+						<ExternalIcon aria-hidden="true" />
+					</ButtonLink>
 					<TeleportOverflowMenu
 						v-if="currentMember"
 						type="quiet"
@@ -268,6 +283,7 @@ import {
 	SpinnerIcon,
 	TrashIcon,
 } from '@modrinth/assets'
+import { moderationSettings } from '@modrinth/moderation'
 import {
 	ButtonLink,
 	ConfirmModal,
@@ -277,6 +293,7 @@ import {
 	ProjectPageVersions,
 	TeleportOverflowMenu,
 } from '@modrinth/ui'
+import { isStaff } from '@modrinth/utils'
 import { onMounted, useTemplateRef, watch } from 'vue'
 
 import CreateProjectVersionModal from '~/components/ui/create-project-version/CreateProjectVersionModal.vue'
@@ -289,6 +306,7 @@ const { createProjectDownloadUrl, updateVersionsFilterContext } = useCdnDownload
 
 const tags = useGeneratedState()
 const flags = useFeatureFlags()
+const modSettings = useModerationSettings()
 const auth = await useAuth()
 
 const client = injectModrinthClient()
diff --git a/apps/frontend/src/pages/moderation/technical-review/[project].vue b/apps/frontend/src/pages/moderation/technical-review/[project].vue
index 6f04ae4823..e3f413c26b 100644
--- a/apps/frontend/src/pages/moderation/technical-review/[project].vue
+++ b/apps/frontend/src/pages/moderation/technical-review/[project].vue
@@ -12,6 +12,7 @@ import ModerationTechRevCard from '~/components/ui/moderation/ModerationTechRevC
 const client = injectModrinthClient()
 const queryClient = useQueryClient()
 const route = useRoute()
+const keybinds = useModerationKeybinds()
 
 const projectId = String(useRouteId('project'))
 
@@ -269,6 +270,34 @@ function handleShowMaliciousSummary(unsafeFiles: UnsafeFile[]) {
 function refetch() {
 	queryClient.invalidateQueries({ queryKey: ['tech-review-project-report', projectId] })
 }
+
+function handleKeybinds(event: KeyboardEvent) {
+	keybinds.value.handle(event, {
+		scope: 'tech-review',
+		actions: {
+			goToTop: () => {
+				window.scrollTo({
+					top: 0,
+					behavior: 'smooth',
+				})
+			},
+			goToBottom: () => {
+				window.scrollTo({
+					top: document.body.scrollHeight,
+					behavior: 'smooth',
+				})
+			},
+		},
+	})
+}
+
+onMounted(() => {
+	window.addEventListener('keydown', handleKeybinds)
+})
+
+onUnmounted(() => {
+	window.removeEventListener('keydown', handleKeybinds)
+})
 </script>
 
 <template>
diff --git a/apps/frontend/src/pages/moderation/technical-review/index.vue b/apps/frontend/src/pages/moderation/technical-review/index.vue
index 23877ace6b..b46ed59776 100644
--- a/apps/frontend/src/pages/moderation/technical-review/index.vue
+++ b/apps/frontend/src/pages/moderation/technical-review/index.vue
@@ -32,6 +32,7 @@ useHead({ title: 'Tech review queue - Modrinth' })
 
 const client = injectModrinthClient()
 const queryClient = useQueryClient()
+const keybinds = useModerationKeybinds()
 
 const currentPage = ref(1)
 const API_PAGE_SIZE = 50
@@ -571,6 +572,50 @@ watch(totalPages, (pages) => {
 // 		complete: 20,
 // 	}
 // })
+
+const CARD_BOTTOM_OFFSET = 210
+
+function handleKeybinds(event: KeyboardEvent) {
+	keybinds.value.handle(event, {
+		scope: 'tech-review',
+		actions: {
+			goToTop: () => {
+				Array.from(cardRefs.values())
+					.filter((card) => card.getBoundingClientRect().top <= 0)
+					.reduce((prev, curr) =>
+						curr.getBoundingClientRect().top > prev.getBoundingClientRect().top ? curr : prev,
+					)
+					?.scrollIntoView({ behavior: 'smooth', block: 'start' })
+			},
+			goToBottom: () => {
+				const nearestCard = Array.from(cardRefs.values())
+					.filter((card) => card.getBoundingClientRect().bottom >= window.innerHeight)
+					.reduce((prev, curr) =>
+						curr.getBoundingClientRect().top < prev.getBoundingClientRect().top ? curr : prev,
+					)
+
+				if (nearestCard) {
+					window.scrollTo({
+						behavior: 'smooth',
+						top:
+							nearestCard.getBoundingClientRect().bottom +
+							window.scrollY -
+							window.innerHeight +
+							CARD_BOTTOM_OFFSET,
+					})
+				}
+			},
+		},
+	})
+}
+
+onMounted(() => {
+	window.addEventListener('keydown', handleKeybinds)
+})
+
+onUnmounted(() => {
+	window.removeEventListener('keydown', handleKeybinds)
+})
 </script>
 
 <template>
diff --git a/packages/moderation/src/data/keybinds.ts b/packages/moderation/src/data/keybinds.ts
index 25b2994374..d4eb0fab10 100644
--- a/packages/moderation/src/data/keybinds.ts
+++ b/packages/moderation/src/data/keybinds.ts
@@ -115,6 +115,18 @@ const keybinds: { [id: string]: KeybindListener } = {
 		scope: 'checklist',
 		action: (ctx) => ctx.actions.tryReject(),
 	},
+	'tech-review-top': {
+		keybind: 'ArrowUp',
+		description: 'Go to top of the tech review card',
+		scope: 'tech-review',
+		action: (ctx) => ctx.actions.goToTop(),
+	},
+	'tech-review-bottom': {
+		keybind: 'ArrowDown',
+		description: 'Go to bottom of the tech review card',
+		scope: 'tech-review',
+		action: (ctx) => ctx.actions.goToBottom(),
+	},
 }
 
 export default keybinds
diff --git a/packages/moderation/src/data/settings.ts b/packages/moderation/src/data/settings.ts
index 432aa09d2b..d62436821c 100644
--- a/packages/moderation/src/data/settings.ts
+++ b/packages/moderation/src/data/settings.ts
@@ -27,6 +27,13 @@ const settings = {
 			description: 'Whether private messages should be highlighted in the chat.',
 			default: true,
 		}),
+		SlicerButtonInVersions: setting.asToggle({
+			type: 'toggle',
+			id: 'slicer-button-in-versions',
+			title: 'Show Slicer Button in Versions Table and Page',
+			description: 'Whether the slicer button should be shown in the versions table and page.',
+			default: false,
+		}),
 		AdjustPageAlignment: setting.asEnum({
 			type: 'enum',
 			id: 'adjust-page-alignment',
diff --git a/packages/moderation/src/types/keybinds.ts b/packages/moderation/src/types/keybinds.ts
index 529eaccc86..cb57be2368 100644
--- a/packages/moderation/src/types/keybinds.ts
+++ b/packages/moderation/src/types/keybinds.ts
@@ -16,6 +16,11 @@ export interface ModerationActions {
 	tryEditMessage: () => void
 }
 
+export interface TechReviewActions {
+	goToTop: () => void
+	goToBottom: () => void
+}
+
 export interface ModerationState {
 	currentStage: number
 	totalStages: number
@@ -44,7 +49,15 @@ export type ModerationChecklistContext = {
 	actions: ModerationActions
 }
 
-export type ModerationContext = ModerationProjectContext | ModerationChecklistContext
+export type ModerationTechReviewContext = {
+	scope: 'tech-review'
+	actions: TechReviewActions
+}
+
+export type ModerationContext =
+	| ModerationProjectContext
+	| ModerationChecklistContext
+	| ModerationTechReviewContext
 
 export interface KeybindDefinition {
 	key: string
@@ -58,7 +71,7 @@ export interface KeybindDefinition {
 export type BaseKeybindListener<T> = {
 	keybind: KeybindDefinition | KeybindDefinition[] | string | string[]
 	description: string
-	scope: 'project' | 'checklist'
+	scope: 'project' | 'checklist' | 'tech-review'
 	enabled?: (ctx: T) => boolean
 	action: (ctx: T) => void
 }
@@ -69,7 +82,13 @@ export type KeybindProjectListener = BaseKeybindListener<ModerationProjectContex
 export type KeybindChecklistListener = BaseKeybindListener<ModerationChecklistContext> & {
 	scope: 'checklist'
 }
-export type KeybindListener = KeybindProjectListener | KeybindChecklistListener
+export type KeybindTechReviewListener = BaseKeybindListener<ModerationTechReviewContext> & {
+	scope: 'tech-review'
+}
+export type KeybindListener =
+	| KeybindProjectListener
+	| KeybindChecklistListener
+	| KeybindTechReviewListener
 
 export function parseKeybind(keybindString: string): KeybindDefinition {
 	const parts = keybindString.split('+').map((p) => p.trim().toLowerCase())

From e4cbec6b2caa3a6e90923d6422770a1e86578b8b Mon Sep 17 00:00:00 2001
From: Prospector <6166773+Prospector@users.noreply.github.com>
Date: Fri, 7 Aug 2026 13:42:57 -0700
Subject: [PATCH 57/82] changelog

---
 packages/blog/changelog.ts | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/packages/blog/changelog.ts b/packages/blog/changelog.ts
index 979ffff830..186f72224c 100644
--- a/packages/blog/changelog.ts
+++ b/packages/blog/changelog.ts
@@ -10,6 +10,35 @@ export type VersionEntry = {
 }
 
 const VERSIONS: VersionEntry[] = [
+	{
+		date: `2026-08-07T20:41:51+00:00`,
+		product: 'app',
+		version: '0.17.4',
+		body: `## Changed
+- Added loading states for project members and server details, to make it feel smoother.
+- Improved popout menu animations.
+- Updated NeoForge icon to be closer to the actual logo and look more like a fox.
+- Updated design of buttons.
+
+## Fixed
+- Fixed "Licensed Unknown" showing up under details on server projects.
+- Fixed project types sometimes appearing in random orders on some pages.`,
+	},
+	{
+		date: `2026-08-07T20:41:51+00:00`,
+		product: 'web',
+		body: `## Changed
+- Added loading states for project members and server details, to make it feel smoother.
+- Improved popout menu animations.
+- Updated project tag settings page to new design.
+- Updated NeoForge icon to be closer to the actual logo and look more like a fox.
+
+## Fixed
+- Fixed "Licensed Unknown" showing up under details on server projects.
+- Fixed tags settings page being broken.
+- Fixed project types sometimes appearing in random orders on some pages.
+- Fixed when the project download UI has two compatible versions and no additional content, it showed as radio buttons.`,
+	},
 	{
 		date: `2026-07-31T06:10:23+00:00`,
 		product: 'web',

From 5072c1d2982a3fdbee61231fcb701a91d17c30b2 Mon Sep 17 00:00:00 2001
From: chyz <32403637+chyzman@users.noreply.github.com>
Date: Fri, 7 Aug 2026 19:40:11 -0400
Subject: [PATCH 58/82] Moderation Changes Phase 2.-1 (#6833)

* better default state handling

* make next stage button work for going to next project

* fix skill issue

* actually fix initial values this time,
make single line inputs with varying lengths (text input and dropdown) use their widest possible length instead of whatever the hell they used to be

* loaders in progress

* loaders and versions test (probably dont use them as the messages suck and idrk what they should do quick fix/message wise)

* WIP the wip

* good enough for now slug taken improvements

* trim all those extra newlines

* viewedness

* batch prefetch queue + technically slightly faster checklist init

* show all valid alternative project types regardless of current project type

* Hide moderation permissions stage when it should be, and I'm sure this won't cause any issues

* Hide moderation permissions stage when it should be, and I'm sure this won't cause any issues

* gimme them versions

* better moderation permission stage shown check?

* betterer moderation permission stage shown check?

* bettererer moderation permission stage shown check? + also began deleting legacy checklist types

* fix certain stages being able to be considered viewed before being viewed

* more removals + i forgot to remove an import last commit

* changed nothing:tm:

* remove severities + bandaid post-approval message priorities + dependencies

* fix message preview tooltips

* next stage = next project when done

* insufficient description custom fix

* fix that thing coolbot told me was broken I forgot what it was oops

* oh there was a second bug there

* make alternate versions and incorrect project type required cuz they are

* re-navigate button also damn that's a lot of other stuff that pnpm fix... fixed?

* you cant just quick fix a slug into a taken one

* maybe lets not just try and set a slug to something entirely invalid?

* what if we just didn't drop ur queue :smart:

* more queue upgrades

* tweaks

* I love unbreaking things

* un-nuked renavigate button

* prepr

* prepr worked this time i think

* undo more mistakes

* i love intellij refactoring

* ok i think we're good
---
 .../ui/moderation/ModerationProjectNags.vue   |   2 +-
 .../ui/moderation/QueueSummaryModal.vue       | 118 +++
 .../checklist/ModerationChecklist.vue         | 798 ++++++++--------
 .../ui/moderation/checklist/NodeRenderer.vue  | 826 ----------------
 .../moderation/checklist/checklist-context.ts |  12 +-
 apps/frontend/src/pages/[type]/[project].vue  |  18 +-
 apps/frontend/src/pages/moderation/index.vue  | 100 +-
 .../moderation/checklist-session-storage.ts   |  38 +
 .../checklist-storage.ts}                     |   5 +-
 .../{moderation-db.ts => moderation/db.ts}    |   0
 .../services/moderation/queue-eligibility.ts  |  91 ++
 .../queue-storage.ts}                         |  10 +-
 .../queue.ts}                                 |  98 +-
 apps/frontend/src/store/moderation.ts         |   4 +-
 packages/assets/generated-icons.ts            |   2 +
 packages/assets/icons/map-pin.svg             |   1 +
 packages/moderation/.prettierignore           |   1 +
 packages/moderation/package.json              |   3 +-
 packages/moderation/src/data/checklist.ts     |  17 +-
 packages/moderation/src/data/keybinds.ts      |   4 +-
 .../description/insufficient/header.md        |   2 -
 .../messages/metadata/dependencies.md         |   4 +
 .../metadata/game-version/correction.md       |   1 +
 .../metadata/game-version/inaccurate.md       |   5 +
 .../messages/metadata/loader/correction.md    |   1 +
 .../messages/metadata/loader/inaccurate.md    |   5 +
 packages/moderation/src/data/nags/links.ts    |   3 +-
 packages/moderation/src/data/priorities.ts    |   1 +
 .../moderation/src/data/stages/categories.tsx |   4 +-
 .../src/data/stages/description.tsx           |  33 +-
 .../moderation/src/data/stages/gallery.tsx    |   8 +-
 .../moderation/src/data/stages/license.tsx    |   4 +-
 packages/moderation/src/data/stages/links.tsx |   7 +-
 .../moderation/src/data/stages/metadata.tsx   | 173 ++--
 .../src/data/stages/permissions.tsx           |  37 +-
 .../src/data/stages/post-approval.tsx         |  29 +-
 .../moderation/src/data/stages/re-review.tsx  |   6 +-
 .../moderation/src/data/stages/reupload.tsx   |  25 +-
 .../stages/{other-rules.tsx => rules.tsx}     |  60 +-
 .../src/data/stages/status-alerts.tsx         |  29 +-
 .../moderation/src/data/stages/summary.tsx    |   6 +-
 .../moderation/src/data/stages/title-slug.tsx | 241 +++--
 .../moderation/src/data/stages/versions.tsx   |  27 +-
 packages/moderation/src/handles/keybinds.ts   |   6 +-
 packages/moderation/src/handles/settings.ts   |  14 +-
 packages/moderation/src/index.ts              |  14 +-
 packages/moderation/src/types/actions.ts      | 298 ------
 packages/moderation/src/types/messages.ts     |  13 -
 packages/moderation/src/types/node.ts         | 880 ------------------
 packages/moderation/src/types/node/builder.ts |  56 ++
 .../moderation/src/types/node/capabilities.ts | 449 +++++++++
 packages/moderation/src/types/node/collect.ts |  97 ++
 .../types/node/components/ActionButton.vue    |  39 +
 .../types/node/components/NodeRenderer.vue    | 401 ++++++++
 packages/moderation/src/types/node/context.ts |  11 +
 .../moderation/src/types/node/factories.ts    | 372 ++++++++
 packages/moderation/src/types/node/fix.ts     |  58 ++
 packages/moderation/src/types/node/index.ts   |  12 +
 .../moderation/src/types/node/messages.ts     | 145 +++
 packages/moderation/src/types/node/mutate.ts  |  64 ++
 .../moderation/src/types/node/node-meta.ts    | 129 +++
 packages/moderation/src/types/node/pipe.ts    |  29 +
 packages/moderation/src/types/node/resolve.ts | 325 +++++++
 packages/moderation/src/types/node/state.ts   |  33 +
 packages/moderation/src/types/settings.ts     |  10 +-
 packages/moderation/src/types/stage.ts        |  64 --
 packages/moderation/src/utils.ts              | 205 ----
 .../base/buttons/TeleportOverflowMenu.vue     | 145 +--
 .../base/buttons/TeleportPopoutMenu.vue       |   2 +-
 .../project/ProjectPageVersions.vue           |   8 +-
 .../components/project/ProjectStatusLink.vue  |  28 +
 packages/ui/src/components/project/index.ts   |   1 +
 .../version/VersionFilterControl.vue          |   5 +-
 packages/ui/src/providers/project-page.ts     |   2 +-
 packages/ui/src/utils/auto-icons.ts           |  20 +
 .../ui/src/utils/use-anchored-teleport.ts     |  54 +-
 pnpm-lock.yaml                                | 250 +----
 77 files changed, 3596 insertions(+), 3502 deletions(-)
 create mode 100644 apps/frontend/src/components/ui/moderation/QueueSummaryModal.vue
 delete mode 100644 apps/frontend/src/components/ui/moderation/checklist/NodeRenderer.vue
 create mode 100644 apps/frontend/src/services/moderation/checklist-session-storage.ts
 rename apps/frontend/src/services/{moderation-checklist-storage.ts => moderation/checklist-storage.ts} (95%)
 rename apps/frontend/src/services/{moderation-db.ts => moderation/db.ts} (100%)
 create mode 100644 apps/frontend/src/services/moderation/queue-eligibility.ts
 rename apps/frontend/src/services/{moderation-queue-storage.ts => moderation/queue-storage.ts} (87%)
 rename apps/frontend/src/services/{moderation-queue.ts => moderation/queue.ts} (76%)
 create mode 100644 packages/assets/icons/map-pin.svg
 create mode 100644 packages/moderation/src/data/messages/checklist/messages/metadata/dependencies.md
 create mode 100644 packages/moderation/src/data/messages/checklist/messages/metadata/game-version/correction.md
 create mode 100644 packages/moderation/src/data/messages/checklist/messages/metadata/game-version/inaccurate.md
 create mode 100644 packages/moderation/src/data/messages/checklist/messages/metadata/loader/correction.md
 create mode 100644 packages/moderation/src/data/messages/checklist/messages/metadata/loader/inaccurate.md
 rename packages/moderation/src/data/stages/{other-rules.tsx => rules.tsx} (50%)
 delete mode 100644 packages/moderation/src/types/actions.ts
 delete mode 100644 packages/moderation/src/types/messages.ts
 delete mode 100644 packages/moderation/src/types/node.ts
 create mode 100644 packages/moderation/src/types/node/builder.ts
 create mode 100644 packages/moderation/src/types/node/capabilities.ts
 create mode 100644 packages/moderation/src/types/node/collect.ts
 create mode 100644 packages/moderation/src/types/node/components/ActionButton.vue
 create mode 100644 packages/moderation/src/types/node/components/NodeRenderer.vue
 create mode 100644 packages/moderation/src/types/node/context.ts
 create mode 100644 packages/moderation/src/types/node/factories.ts
 create mode 100644 packages/moderation/src/types/node/fix.ts
 create mode 100644 packages/moderation/src/types/node/index.ts
 create mode 100644 packages/moderation/src/types/node/messages.ts
 create mode 100644 packages/moderation/src/types/node/mutate.ts
 create mode 100644 packages/moderation/src/types/node/node-meta.ts
 create mode 100644 packages/moderation/src/types/node/pipe.ts
 create mode 100644 packages/moderation/src/types/node/resolve.ts
 create mode 100644 packages/moderation/src/types/node/state.ts
 delete mode 100644 packages/moderation/src/types/stage.ts
 create mode 100644 packages/ui/src/components/project/ProjectStatusLink.vue

diff --git a/apps/frontend/src/components/ui/moderation/ModerationProjectNags.vue b/apps/frontend/src/components/ui/moderation/ModerationProjectNags.vue
index 9097dbace2..fcdd9591c8 100644
--- a/apps/frontend/src/components/ui/moderation/ModerationProjectNags.vue
+++ b/apps/frontend/src/components/ui/moderation/ModerationProjectNags.vue
@@ -106,7 +106,7 @@ interface Tags {
 interface Props {
 	project: Labrinth.Projects.v2.Project
 	projectV3: Labrinth.Projects.v3.Project
-	versions?: Labrinth.Versions.v2.Version[]
+	versions?: Labrinth.Versions.v3.Version[]
 	currentMember?: Labrinth.Projects.v3.TeamMember | null
 	collapsed?: boolean
 	routeName?: string
diff --git a/apps/frontend/src/components/ui/moderation/QueueSummaryModal.vue b/apps/frontend/src/components/ui/moderation/QueueSummaryModal.vue
new file mode 100644
index 0000000000..f90e93389b
--- /dev/null
+++ b/apps/frontend/src/components/ui/moderation/QueueSummaryModal.vue
@@ -0,0 +1,118 @@
+<script setup lang="ts">
+import { ScaleIcon, XIcon } from '@modrinth/assets'
+import { AutoLink, Button, injectModrinthClient, NewModal } from '@modrinth/ui'
+import { ref, useTemplateRef } from 'vue'
+
+import { useGeneratedState } from '~/composables/generated'
+import { getProjectTypeForUrlShorthand } from '~/helpers/projects.js'
+
+const props = defineProps<{
+	completedIds: string[]
+	skippedIds: string[]
+}>()
+
+const emit = defineEmits<{
+	(e: 'review-skipped'): void
+}>()
+
+const client = injectModrinthClient()
+const tags = useGeneratedState()
+const modalRef = useTemplateRef<InstanceType<typeof NewModal>>('modalRef')
+
+interface QueueSummaryEntry {
+	id: string
+	title: string
+	link: string
+}
+
+const completedEntries = ref<QueueSummaryEntry[]>([])
+const skippedEntries = ref<QueueSummaryEntry[]>([])
+
+function toEntries(
+	ids: string[],
+	projectsById: Map<string, { id: string; slug: string; title: string; project_types: string[] }>,
+): QueueSummaryEntry[] {
+	return ids
+		.map((id) => projectsById.get(id))
+		.filter((project): project is NonNullable<typeof project> => !!project)
+		.map((project) => ({
+			id: project.id,
+			title: project.title,
+			link: `/${getProjectTypeForUrlShorthand(project.project_types[0], [], tags.value)}/${project.slug}`,
+		}))
+}
+
+async function show() {
+	const ids = [...new Set([...props.completedIds, ...props.skippedIds])]
+	const projects =
+		ids.length > 0 ? await client.labrinth.projects_v3.getMultiple(ids).catch(() => []) : []
+	const projectsById = new Map(projects.map((project) => [project.id, project]))
+
+	completedEntries.value = toEntries(props.completedIds, projectsById)
+	skippedEntries.value = toEntries(props.skippedIds, projectsById)
+
+	modalRef.value?.show()
+}
+
+function hide() {
+	modalRef.value?.hide()
+}
+
+function reviewSkipped() {
+	emit('review-skipped')
+	hide()
+}
+
+defineExpose({ show, hide })
+</script>
+
+<template>
+	<NewModal ref="modalRef" header="Queue completed">
+		<div class="flex flex-col gap-4">
+			<div v-if="completedEntries.length > 0" class="flex flex-col gap-2">
+				<span class="font-bold text-contrast">Completed ({{ completedEntries.length }})</span>
+				<ul class="m-0 flex list-none flex-col gap-1 p-0">
+					<li v-for="entry in completedEntries" :key="entry.id">
+						<AutoLink :to="entry.link" class="text-primary hover:underline">{{
+							entry.title
+						}}</AutoLink>
+					</li>
+				</ul>
+			</div>
+
+			<div v-if="skippedEntries.length > 0" class="flex flex-col gap-2">
+				<span class="font-bold text-contrast">Skipped ({{ skippedEntries.length }})</span>
+				<ul class="m-0 flex list-none flex-col gap-1 p-0">
+					<li v-for="entry in skippedEntries" :key="entry.id">
+						<AutoLink :to="entry.link" class="text-primary hover:underline">{{
+							entry.title
+						}}</AutoLink>
+					</li>
+				</ul>
+			</div>
+
+			<div
+				v-if="completedEntries.length === 0 && skippedEntries.length === 0"
+				class="text-secondary"
+			>
+				No projects were reviewed during this queue.
+			</div>
+
+			<div class="flex justify-end gap-2">
+				<Button
+					v-if="skippedEntries.length > 0"
+					type="colored"
+					color="orange"
+					@click="reviewSkipped"
+				>
+					<ScaleIcon />
+					Review skipped ({{ skippedEntries.length }})
+				</Button>
+				<Button @click="hide">
+					<XIcon />
+					Close
+				</Button>
+			</div>
+		</div>
+	</NewModal>
+</template>
diff --git a/apps/frontend/src/components/ui/moderation/checklist/ModerationChecklist.vue b/apps/frontend/src/components/ui/moderation/checklist/ModerationChecklist.vue
index 25d7a4d8be..e5790e3e84 100644
--- a/apps/frontend/src/components/ui/moderation/checklist/ModerationChecklist.vue
+++ b/apps/frontend/src/components/ui/moderation/checklist/ModerationChecklist.vue
@@ -26,8 +26,11 @@
 						v-if="canOpenStageSelectorFromTitle"
 						:label="checklistTitleText"
 						:options="stageOptions"
-						placement="bottom-start"
-						class="!h-auto !w-auto gap-2 !bg-transparent !p-0 text-2xl font-extrabold text-contrast"
+						:icon-only="false"
+						type="quiet"
+						size="xl"
+						placement="bottom-center"
+						class="!h-auto !w-auto !gap-2 !bg-transparent !p-0 !text-2xl !font-extrabold !text-contrast [&>svg]:!text-orange"
 					>
 						<component
 							:is="isPseudoStage ? ScaleIcon : (currentStageObj._icon ?? ScaleIcon)"
@@ -35,8 +38,13 @@
 						/>
 						{{ checklistTitleText }}
 						<template v-for="opt in stageOptions" #[opt.id] :key="opt.id">
-							<component :is="opt.icon" v-if="opt.icon" class="mr-2" />
-							<span>
+							<component
+								:is="opt.icon"
+								v-if="opt.icon"
+								class="mr-2"
+								:class="{ 'opacity-50': opt.visited }"
+							/>
+							<span :class="{ 'opacity-50': opt.visited }">
 								{{ opt.text }}<span v-if="opt.requiredMissing" class="font-bold text-red">*</span>
 							</span>
 							<span v-if="opt.messages" class="ml-auto pl-2 font-semibold opacity-75">{{
@@ -57,12 +65,24 @@
 						{{ checklistTitleText }}
 					</button>
 				</h1>
+				<IconButton
+					v-if="!isPseudoStage && stageNavigateTarget"
+					v-tooltip="`Navigate to ${stageNavigateLabel}`"
+					type="quiet"
+					:label="`Navigate to ${stageNavigateLabel}`"
+					class="!bg-button-bg !text-primary ![box-shadow:var(--shadow-button)]"
+					:disabled="route.path === stageNavigateTarget"
+					@click="navigateToStagePage"
+				>
+					<MapPinIcon />
+				</IconButton>
 				<ButtonLink
 					v-if="!isPseudoStage && currentStageObj._guidanceUrl"
 					v-tooltip="`Stage guidance`"
+					type="quiet"
 					target="_blank"
 					:href="currentStageObj._guidanceUrl"
-					class="!w-9 !rounded-full !px-0"
+					class="!w-9 !rounded-full !bg-button-bg !px-0 !text-primary ![box-shadow:var(--shadow-button)]"
 				>
 					<FileTextIcon />
 				</ButtonLink>
@@ -75,6 +95,7 @@
 								: 'Reset Checklist'
 					"
 					type="quiet"
+					interaction="filled"
 					:color="!isPseudoStage && currentStageHasState ? 'orange' : 'red'"
 					:label="
 						!isPseudoStage && currentStageHasState
@@ -83,6 +104,7 @@
 								? 'Return to Start'
 								: 'Reset Checklist'
 					"
+					class="!bg-button-bg !text-primary ![box-shadow:var(--shadow-button)]"
 					:disabled="!isPseudoStage && !checklistHasState && isOnFirstStage"
 					@click="resetProgress"
 				>
@@ -92,16 +114,19 @@
 				<IconButton
 					v-tooltip="`Exit moderation`"
 					type="quiet"
+					interaction="filled"
 					color="red"
 					label="Exit moderation"
-					class="hover:!bg-red hover:!text-[var(--color-accent-contrast)] focus-visible:!bg-red focus-visible:!text-[var(--color-accent-contrast)]"
+					class="!bg-button-bg !text-primary ![box-shadow:var(--shadow-button)]"
 					@click="handleExit"
 				>
 					<XIcon />
 				</IconButton>
 				<IconButton
 					v-tooltip="collapsed ? `Expand` : `Collapse`"
+					type="quiet"
 					:label="collapsed ? `Expand` : `Collapse`"
+					class="!bg-button-bg !text-primary ![box-shadow:var(--shadow-button)]"
 					@click="emit('toggleCollapsed')"
 				>
 					<DropdownIcon class="transition-transform" :class="{ 'rotate-180': collapsed }" />
@@ -237,15 +262,12 @@
 					<div v-else class="flex min-h-0 flex-1 flex-col">
 						<NodeRenderer
 							class="min-h-0 flex-1 overflow-y-auto p-1"
-							:nodes="
-								resolveChildren(
-									currentStageObj,
-									(nodeStates[currentStageObj.id!] ?? {}) as Record<string, NodeState>,
-								)
-							"
-							:show-context="(nodeStates[currentStageObj.id!] ?? {}) as Record<string, NodeState>"
+							:nodes="stageNodes"
+							:state="stageState"
+							:write="stageWriter"
 							:on-image-upload="onUploadHandler"
-							:parent-state-path="currentStageObj._statePath ?? []"
+							:app-components="appComponentsByKey"
+							:global-state="nodeStates"
 						/>
 					</div>
 				</div>
@@ -275,8 +297,13 @@
 								<ListBulletedIcon />
 								<span class="sr-only">Stages</span>
 								<template v-for="opt in stageOptions" #[opt.id] :key="opt.id">
-									<component :is="opt.icon" v-if="opt.icon" class="mr-2" />
-									<span>
+									<component
+										:is="opt.icon"
+										v-if="opt.icon"
+										class="mr-2"
+										:class="{ 'opacity-50': opt.visited }"
+									/>
+									<span :class="{ 'opacity-50': opt.visited }">
 										{{ opt.text
 										}}<span v-if="opt.requiredMissing" class="font-bold text-red">*</span>
 									</span>
@@ -384,6 +411,7 @@ import {
 	LinkIcon,
 	ListBulletedIcon,
 	LockIcon,
+	MapPinIcon,
 	RightArrowIcon,
 	ScaleIcon,
 	SpinnerIcon,
@@ -392,30 +420,31 @@ import {
 	UndoIcon,
 	XIcon,
 } from '@modrinth/assets'
+import type { Priority } from '@modrinth/moderation'
 import {
-	type IdentifiedNodeBuilder,
-	moderationSettings,
-	type NodeState,
-	type Priority,
-	type StageNodeBuilder,
-	type ValueNodeBuilder,
-} from '@modrinth/moderation'
-import {
-	createTrackedPatch,
-	evalSegment,
 	expandVariables,
-	getBooleanChildState,
-	GLOBAL_STATE_KEY,
-	isNodeActive,
 	kebabToTitleCase,
-	NodeBuilder,
+	moderationSettings,
+	useStages,
+} from '@modrinth/moderation'
+import type { ActiveAction, NodeState, StageNode } from '@modrinth/moderation/src/types/node'
+import {
+	CHECKLIST_META_KEY,
+	collectActiveActions,
+	collectMessageNodes,
+	computeAttentionMap,
+	computeNodeMeta,
+	createTrackedPatch,
+	evalActiveAction,
+	evalSegment,
 	resolve,
 	resolveChildren,
 	setMessageProject,
 	setMissingMdHandler,
-	useStages,
-	walkNodes,
-} from '@modrinth/moderation'
+} from '@modrinth/moderation/src/types/node'
+import NodeRenderer from '@modrinth/moderation/src/types/node/components/NodeRenderer.vue'
+import type { FixBuilder } from '@modrinth/moderation/src/types/node/fix'
+import type { Writer } from '@modrinth/moderation/src/types/node/mutate'
 import {
 	Avatar,
 	Button,
@@ -432,24 +461,37 @@ import {
 	useDebugLogger,
 } from '@modrinth/ui'
 import type { ProjectStatus } from '@modrinth/utils'
+import { renderHighlightedString } from '@modrinth/utils'
 import { useQueryClient } from '@tanstack/vue-query'
 import { useDebounceFn } from '@vueuse/core'
 import type { Component } from 'vue'
-import { computed, nextTick, provide, ref, toRaw, watch } from 'vue'
+import { computed, nextTick, provide, ref, toRaw, watch, watchEffect } from 'vue'
 
+import LoaderPicker from '~/components/ui/create-project-version/components/LoaderPicker.vue'
+import McVersionPicker from '~/components/ui/create-project-version/components/McVersionPicker.vue'
 import { useGeneratedState } from '~/composables/generated'
 import { useImageUpload } from '~/composables/image-upload.ts'
 import { getProjectTypeForUrlShorthand } from '~/helpers/projects.js'
+import {
+	clearSessionChecklistState,
+	getSessionChecklistState,
+	patchSessionChecklistState,
+} from '~/services/moderation/checklist-session-storage.ts'
 import {
 	clearChecklistState,
 	loadChecklistState,
 	saveChecklistState,
-} from '~/services/moderation-checklist-storage.ts'
-import type { LockAcquireResponse } from '~/services/moderation-queue.ts'
-import { useModerationQueue } from '~/services/moderation-queue.ts'
+} from '~/services/moderation/checklist-storage.ts'
+import type { LockAcquireResponse } from '~/services/moderation/queue.ts'
+import { useModerationQueue } from '~/services/moderation/queue.ts'
+import {
+	batchCheckQueueCandidates,
+	findNextEligibleQueueProject,
+	isEligibleQueueCandidate,
+	type QueueCandidateCheck,
+} from '~/services/moderation/queue-eligibility.ts'
 
-import { type ActiveAction, type LiveNode, NODE_META_KEY, STATE_KEY } from './checklist-context'
-import NodeRenderer from './NodeRenderer.vue'
+import { type LiveNode, STATE_KEY } from './checklist-context'
 
 const notifications = injectNotificationManager()
 const { addNotification } = notifications
@@ -494,11 +536,10 @@ const alreadyReviewed = ref(false)
 
 // Prefetch queue for parallel lock checking and instant navigation
 interface PrefetchedProject {
-	projectId: string
+	project: string
 	slug: string // For canonical URL navigation
 	projectType: string // For canonical URL navigation
 	validatedAt: number
-	skippedIds: string[] // IDs that were locked when this was prefetched
 }
 
 const prefetchQueue = ref<PrefetchedProject[]>([])
@@ -619,7 +660,6 @@ function handleLockUnavailable() {
 }
 
 async function navigateToNextUnlockedProject(): Promise<boolean> {
-	// Remove stale entries first
 	const now = Date.now()
 	prefetchQueue.value = prefetchQueue.value.filter((p) => now - p.validatedAt < PREFETCH_STALE_MS)
 
@@ -629,29 +669,21 @@ async function navigateToNextUnlockedProject(): Promise<boolean> {
 
 	// Quick re-check if close to expiry (last 5 seconds of TTL)
 	if (now - next.validatedAt > PREFETCH_STALE_MS - 5000) {
-		const recheckResults = await batchCheckQueueCandidates([next.projectId])
-		const recheck = recheckResults.get(next.projectId)
+		const recheckResults = await batchCheckQueueCandidates(client, moderationQueue, [next.project])
+		const recheck = recheckResults.get(next.project)
 		if (!isEligibleQueueCandidate(recheck)) {
 			prefetchQueue.value.shift()
 			return navigateToNextUnlockedProject()
 		}
 	}
 
-	// Remove from queue after validation
 	prefetchQueue.value.shift()
 
-	// Mark skipped projects as completed
-	await Promise.all(
-		next.skippedIds.map((id) => moderationQueue.completeCurrentProject(id, 'skipped')),
-	)
-
-	notifySkippedQueueProjects(next.skippedIds.length)
-
 	maintainPrefetchQueue()
 
 	navigateToQueueProject(
 		{ slug: next.slug, projectType: next.projectType, locked: false, isProcessing: true },
-		next.projectId,
+		next.project,
 	)
 	return true
 }
@@ -670,10 +702,27 @@ const persistedState = import.meta.client
 	? await loadChecklistState(checklistPersistenceProjectId)
 	: null
 nodeStates.value = persistedState?.state ?? {}
+const activatedStages = ref<Set<string>>(new Set(persistedState?.activatedStages ?? []))
+const visitedStages = ref<Set<string>>(
+	new Set(
+		import.meta.client
+			? (getSessionChecklistState(checklistPersistenceProjectId).visitedStages ?? [])
+			: [],
+	),
+)
+
+function markStageVisited(stageId: string | undefined) {
+	if (!stageId || visitedStages.value.has(stageId)) return
+	visitedStages.value.add(stageId)
+	patchSessionChecklistState(checklistPersistenceProjectId, {
+		visitedStages: [...visitedStages.value],
+	})
+}
+
 const reviewedAnyway = ref(persistedState?.reviewAnyway ?? false)
 const message = ref<string | null>(persistedState?.message ?? null)
 const generatedActiveActions = ref<ActiveAction[] | null>(null)
-const resolvedMessageAvailability = ref<Map<IdentifiedNodeBuilder, boolean>>(new Map())
+const resolvedMessageAvailability = ref<Map<object, boolean>>(new Map())
 const generatedMessage = computed(() => message.value !== null)
 const loadingMessage = ref(false)
 const moderationDecision = ref<ProjectStatus | null>(null)
@@ -757,37 +806,14 @@ function reviewAnyway() {
 	alreadyReviewed.value = false
 	reviewedAnyway.value = true
 	persistState()
-	// Start prefetching the next project in the background
 	maintainPrefetchQueue()
 }
 
-// Batch check locks, processing status, and fetch project metadata in parallel
-interface QueueCandidateCheck {
-	locked: boolean
-	expired?: boolean
-	isOwnLock?: boolean
-	slug?: string
-	projectType?: string
-	status?: string
-	isProcessing: boolean
-}
-
-function isEligibleQueueCandidate(result: QueueCandidateCheck | undefined): boolean {
-	if (!result?.isProcessing) return false
-	return !result.locked || !!result.expired || !!result.isOwnLock
-}
-
-function isNotFoundError(error: unknown): boolean {
-	if (!error || typeof error !== 'object') return false
-	const fetchError = error as { statusCode?: number; response?: { status?: number } }
-	return fetchError.statusCode === 404 || fetchError.response?.status === 404
-}
-
 function notifySkippedQueueProjects(count: number) {
 	if (count <= 0) return
 	addNotification({
 		title: 'Skipped projects',
-		text: `Skipped ${count} project(s) already moderated, deleted, or locked by others.`,
+		text: `Skipped ${count} project(s) already moderated or locked by others.`,
 		type: 'info',
 		autoCloseMs: 2000,
 	})
@@ -809,68 +835,6 @@ function navigateToQueueProject(result: QueueCandidateCheck, projectId: string)
 	}
 }
 
-async function batchCheckQueueCandidates(
-	projectIds: string[],
-): Promise<Map<string, QueueCandidateCheck>> {
-	const results = new Map<string, QueueCandidateCheck>()
-
-	const checks = await Promise.allSettled(
-		projectIds.map(async (id) => {
-			const [lockResponse, projectData] = await Promise.all([
-				moderationQueue.checkLock(id),
-				useBaseFetch(`project/${id}`, { method: 'GET' }),
-			])
-
-			const status = (projectData as { status?: string }).status
-
-			return {
-				id,
-				locked: lockResponse.locked,
-				expired: lockResponse.expired,
-				isOwnLock: lockResponse.is_own_lock,
-				slug: (projectData as { slug?: string } | null)?.slug,
-				projectType: (projectData as { project_type?: string } | null)?.project_type,
-				status,
-				isProcessing: status === 'processing',
-			}
-		}),
-	)
-
-	checks.forEach((result, index) => {
-		if (result.status === 'fulfilled') {
-			results.set(result.value.id, result.value)
-		} else if (isNotFoundError(result.reason)) {
-			results.set(projectIds[index], { locked: false, isProcessing: false })
-		} else {
-			results.set(projectIds[index], { locked: false, isProcessing: true })
-		}
-	})
-
-	return results
-}
-
-async function findNextEligibleQueueProject(candidateIds: string[]) {
-	const skippedIds: string[] = []
-	let checkedCount = 0
-
-	while (checkedCount < candidateIds.length) {
-		const batch = candidateIds.slice(checkedCount, checkedCount + PREFETCH_BATCH_SIZE)
-		checkedCount += batch.length
-
-		const results = await batchCheckQueueCandidates(batch)
-
-		for (const id of batch) {
-			const result = results.get(id)
-			if (isEligibleQueueCandidate(result)) {
-				return { projectId: id, result: result!, skippedIds: [...skippedIds] }
-			}
-			skippedIds.push(id)
-		}
-	}
-
-	return null
-}
-
 // Maintain a queue of prefetched unlocked projects for instant navigation
 async function maintainPrefetchQueue() {
 	if (isPrefetching.value) return
@@ -881,22 +845,18 @@ async function maintainPrefetchQueue() {
 	isPrefetching.value = true
 
 	try {
-		// 1. Remove stale entries (validated > 30s ago)
 		const now = Date.now()
 		prefetchQueue.value = prefetchQueue.value.filter((p) => now - p.validatedAt < PREFETCH_STALE_MS)
 
-		// 2. Remove entries for current project
 		if (currentProjectId) {
-			prefetchQueue.value = prefetchQueue.value.filter((p) => p.projectId !== currentProjectId)
+			prefetchQueue.value = prefetchQueue.value.filter((p) => p.project !== currentProjectId)
 		}
 
-		// 3. If queue is full enough, exit early
 		if (prefetchQueue.value.length >= PREFETCH_TARGET_COUNT) {
 			return
 		}
 
-		// 4. Get remaining queue items (excluding current and already prefetched)
-		const prefetchedIds = new Set(prefetchQueue.value.map((p) => p.projectId))
+		const prefetchedIds = new Set(prefetchQueue.value.map((p) => p.project))
 		const queueItems = [...moderationQueue.currentQueue.items]
 		const currentIndex = currentProjectId ? queueItems.indexOf(currentProjectId) : -1
 		const remainingItems =
@@ -906,7 +866,6 @@ async function maintainPrefetchQueue() {
 
 		if (candidateIds.length === 0) return
 
-		const skippedIds: string[] = []
 		let checkedCount = 0
 
 		while (
@@ -916,22 +875,21 @@ async function maintainPrefetchQueue() {
 			const batch = candidateIds.slice(checkedCount, checkedCount + PREFETCH_BATCH_SIZE)
 			checkedCount += batch.length
 
-			const results = await batchCheckQueueCandidates(batch)
+			const results = await batchCheckQueueCandidates(client, moderationQueue, batch)
 
 			for (const id of batch) {
 				const result = results.get(id)
 				if (isEligibleQueueCandidate(result)) {
 					prefetchQueue.value.push({
-						projectId: id,
+						project: id,
 						slug: result?.slug ?? '',
 						projectType: result?.projectType ?? '',
 						validatedAt: Date.now(),
-						skippedIds: [...skippedIds],
 					})
 
 					if (prefetchQueue.value.length >= PREFETCH_TARGET_COUNT) break
 				} else {
-					skippedIds.push(id)
+					void moderationQueue.excludeProject(id)
 				}
 			}
 		}
@@ -940,11 +898,25 @@ async function maintainPrefetchQueue() {
 	}
 }
 
-// Debounced prefetch to prevent spam from rapid stage changes
 const debouncedPrefetch = useDebounceFn(maintainPrefetchQueue, 300)
 
+async function goToNextEligibleProject(candidateIds: string[]): Promise<boolean> {
+	if (candidateIds.length === 0) return false
+
+	const next = await findNextEligibleQueueProject(client, moderationQueue, candidateIds)
+
+	if (!next) {
+		await Promise.all(candidateIds.map((id) => moderationQueue.excludeProject(id)))
+		return false
+	}
+
+	await Promise.all(next.excluded.map((id) => moderationQueue.excludeProject(id)))
+	notifySkippedQueueProjects(next.excluded.length)
+	navigateToQueueProject(next.result, next.project)
+	return true
+}
+
 async function skipToNextProject() {
-	// Skip the current project
 	const currentProjectId = projectV2.value?.id
 	if (!currentProjectId) {
 		console.warn('[skipToNextProject] No current project ID, aborting')
@@ -953,12 +925,11 @@ async function skipToNextProject() {
 	debug('[skipToNextProject] Starting. Current project:', currentProjectId)
 	debug('[skipToNextProject] Queue before complete:', [...moderationQueue.currentQueue.items])
 
-	await moderationQueue.completeCurrentProject(currentProjectId, 'skipped')
+	await moderationQueue.deferProject(currentProjectId)
 
 	debug('[skipToNextProject] Queue after complete:', [...moderationQueue.currentQueue.items])
 	debug('[skipToNextProject] hasItems:', moderationQueue.hasItems)
 
-	// Use prefetched data if available
 	if (await navigateToNextUnlockedProject()) {
 		debug('[skipToNextProject] Used prefetch, returning')
 		return
@@ -969,20 +940,7 @@ async function skipToNextProject() {
 	const remainingIds = moderationQueue.currentQueue.items.filter((id) => id !== currentProjectId)
 
 	if (remainingIds.length > 0) {
-		const next = await findNextEligibleQueueProject(remainingIds)
-
-		if (next) {
-			await Promise.all(
-				next.skippedIds.map((id) => moderationQueue.completeCurrentProject(id, 'skipped')),
-			)
-			notifySkippedQueueProjects(next.skippedIds.length)
-			navigateToQueueProject(next.result, next.projectId)
-			return
-		}
-
-		await Promise.all(
-			remainingIds.map((id) => moderationQueue.completeCurrentProject(id, 'skipped')),
-		)
+		if (await goToNextEligibleProject(remainingIds)) return
 
 		debug('[skipToNextProject] No eligible projects in queue')
 		addNotification({
@@ -1010,12 +968,14 @@ const checklistHasState = computed(() =>
 function resetProgress() {
 	if (!isPseudoStage.value && currentStageHasState.value) {
 		Reflect.deleteProperty(nodeStates.value, currentStageObj.value.id!)
+		activatedStages.value.delete(currentStageObj.value.id!)
 		clearGeneratedMessageState()
 		return
 	}
 
 	currentStage.value = findFirstValidStage()
 	nodeStates.value = {}
+	activatedStages.value = new Set()
 
 	done.value = false
 	clearGeneratedMessageState()
@@ -1048,85 +1008,82 @@ const checklistTitleText = computed(() => {
 
 	return currentStageObj.value.label ?? kebabToTitleCase(currentStageObj.value.id)
 })
-const checklistLive = computed<Map<IdentifiedNodeBuilder, LiveNode>>(() => {
-	const map = new Map<IdentifiedNodeBuilder, LiveNode>()
+function isStageLive(stage: StageNode): boolean {
+	return stage._shown === undefined || resolve(stage._shown)
+}
+
+function isStageEffectivelyShown(stage: StageNode): boolean {
+	if (isStageLive(stage)) return true
+	return stage._shownSticky === true && activatedStages.value.has(stage.id)
+}
+
+watchEffect(() => {
+	for (const stage of resolvedStages.value) {
+		if (stage._shownSticky && isStageLive(stage) && !activatedStages.value.has(stage.id)) {
+			activatedStages.value.add(stage.id)
+		}
+	}
+})
+
+function isFixActionable(fixes: FixBuilder[], state: Record<string, NodeState>): boolean {
+	return fixes.some((f) => {
+		if (f._projectFn) {
+			const { proxy, changes } = createTrackedPatch(projectV3.value as any)
+			f._projectFn(proxy as any, state)
+			return Object.keys(changes()).length > 0
+		}
+		if (f._versionFn) {
+			const version = versions.value?.[0]
+			if (!version) return true
+			const { proxy, changes } = createTrackedPatch(version as any)
+			f._versionFn(proxy as any, state)
+			return Object.keys(changes()).length > 0
+		}
+		return false
+	})
+}
+
+function computeStageLiveNode(stage: StageNode, stageState: Record<string, NodeState>): LiveNode {
+	if (!isStageEffectivelyShown(stage)) {
+		return {
+			isActive: true,
+			isVisible: false,
+			isFixActionable: false,
+			messageCount: 0,
+			fixCount: 0,
+			hasRequiredMissing: false,
+			activeActions: [],
+		}
+	}
+
+	const stageChildren = resolveChildren(stage, stageState)
+	const metaMap = computeNodeMeta(stageChildren, stageState, isFixActionable)
+	const attentionMap = computeAttentionMap(stageChildren, stageState, metaMap)
+	const actions = collectActiveActions(stageChildren, stageState, [stage.id])
+
+	if (stage._segments.length > 0) {
+		actions.unshift({ node: stage, state: stageState, statePath: [stage.id], active: true })
+	}
+
+	return {
+		isActive: true,
+		isVisible: metaMap.size > 0,
+		isFixActionable: false,
+		messageCount: actions.length,
+		fixCount: [...metaMap.values()].filter((m) => m.isFixActionable).length,
+		hasRequiredMissing: stageChildren.some(
+			(child) => typeof child === 'object' && child !== null && attentionMap.get(child) === true,
+		),
+		activeActions: actions,
+	}
+}
+
+const checklistLive = computed<Map<object, LiveNode>>(() => {
+	const map = new Map<object, LiveNode>()
 
 	for (const stage of resolvedStages.value) {
-		const stageState = (nodeStates.value[stage.id!] ?? {}) as Record<string, NodeState>
-
-		let isVisible = false
-		let messageCount = 0
-		let fixCount = 0
-		let hasRequiredMissing = false
-		const stageActiveActions: ActiveAction[] = []
-
-		if (stage._shown === undefined || resolve(stage._shown)) {
-			if (stage._segments.length > 0) {
-				messageCount++
-				stageActiveActions.push({
-					node: stage,
-					state: stageState,
-					statePath: stage._statePath ?? [],
-				})
-			}
-
-			walkNodes(resolveChildren(stage, stageState), stageState, (node, nodeState, localState) => {
-				isVisible = true
-				const active = isNodeActive(node, nodeState)
-				const actionState =
-					node.type === 'toggle' || node.type === 'check' || node.type === 'option'
-						? (getBooleanChildState(nodeState) as Record<string, NodeState>)
-						: localState
-				const isRequired = !!(node as ValueNodeBuilder)._required
-				const nodeActiveActions: ActiveAction[] = []
-
-				let isFixActionable = false
-				if (active) {
-					if (node._segments.length > 0) {
-						messageCount++
-						nodeActiveActions.push({ node, state: actionState, statePath: node._statePath ?? [] })
-						stageActiveActions.push({ node, state: actionState, statePath: node._statePath ?? [] })
-					}
-					isFixActionable = node._fixes.some((f) => {
-						if (f._projectFn) {
-							const { proxy, changes } = createTrackedPatch(projectV3.value as any)
-							f._projectFn(proxy as any, actionState)
-							return Object.keys(changes()).length > 0
-						}
-						if (f._versionFn) {
-							const version = versions.value?.[0]
-							if (!version) return true
-							const { proxy, changes } = createTrackedPatch(version as any)
-							f._versionFn(proxy as any, actionState)
-							return Object.keys(changes()).length > 0
-						}
-						return false
-					})
-					if (isFixActionable) fixCount++
-				}
-
-				if (isRequired && !active) hasRequiredMissing = true
-				map.set(node, {
-					isActive: active,
-					isVisible: node._shown === undefined || resolve(node._shown),
-					isFixActionable,
-					messageCount: active && node._segments.some((s) => s.type !== 'collect') ? 1 : 0,
-					fixCount: isFixActionable ? 1 : 0,
-					hasRequiredMissing: isRequired && !active,
-					activeActions: nodeActiveActions,
-				})
-			})
-		}
-
-		map.set(stage, {
-			isActive: true,
-			isVisible,
-			isFixActionable: false,
-			messageCount,
-			fixCount,
-			hasRequiredMissing,
-			activeActions: stageActiveActions,
-		})
+		const stageState = (nodeStates.value[stage.id] ?? {}) as Record<string, NodeState>
+		map.set(stage, computeStageLiveNode(stage, stageState))
 	}
 
 	return map
@@ -1137,6 +1094,8 @@ const restoredStage = persistedState
 	: -1
 const currentStage = ref(restoredStage >= 0 ? restoredStage : findFirstValidStage())
 const initialAutoStage = currentStage.value
+const needsInitialStageSettle = !persistedState && thread.value === undefined
+const hasSettledInitialStage = ref(!needsInitialStageSettle)
 
 // Thread data may not be loaded when currentStage is first set, so stages that depend on it
 // (like re-review) may be invisible initially. Re-evaluate once thread loads.
@@ -1147,16 +1106,78 @@ if (!persistedState) {
 			if (thread.value === undefined) return
 			if (currentStage.value === initialAutoStage) {
 				const firstValid = findFirstValidStage()
+				console.log('[DEBUG settle]', {
+					initialAutoStage,
+					currentStage: currentStage.value,
+					firstValid,
+					initialAutoStageId: resolvedStages.value[initialAutoStage]?.id,
+					firstValidId: resolvedStages.value[firstValid]?.id,
+				})
 				if (firstValid !== currentStage.value) {
 					currentStage.value = firstValid
+				} else if (needsInitialStageSettle) {
+					markStageVisited(currentStageObj.value.id)
 				}
+			} else {
+				console.log('[DEBUG settle] currentStage already changed before settle', {
+					initialAutoStage,
+					currentStage: currentStage.value,
+				})
 			}
+			hasSettledInitialStage.value = true
 		},
 		{ once: true },
 	)
 }
 
 const router = useRouter()
+const route = useRoute()
+
+const projectUrlType = computed(() =>
+	getProjectTypeForUrlShorthand(
+		projectV2.value.project_type,
+		projectV2.value.loaders ?? [],
+		tags.value,
+	),
+)
+
+let lastSyncedStageTarget: string | null = null
+function syncStageUrl(stage: StageNode | undefined) {
+	const navigate = stage?._navigate
+	console.log('[DEBUG syncStageUrl]', { stageId: stage?.id, navigate, lastSyncedStageTarget })
+	if (navigate === undefined) return
+	const target = `/${projectUrlType.value}/${projectV2.value.slug}${navigate}`
+	if (target === lastSyncedStageTarget) return
+	lastSyncedStageTarget = target
+	setTimeout(() => router.replace(target), 0)
+}
+
+watch(
+	hasSettledInitialStage,
+	(settled) => {
+		if (settled) syncStageUrl(currentStageObj.value)
+	},
+	{ immediate: true },
+)
+
+const stageNavigateTarget = computed(() => {
+	const navigate = currentStageObj.value?._navigate
+	if (navigate === undefined || !projectV2.value) return null
+	const base = `/${projectUrlType.value}/${projectV2.value.slug}`
+	return navigate === '' ? base : `${base}${navigate}`
+})
+
+const stageNavigateLabel = computed(() => {
+	const navigate = currentStageObj.value?._navigate
+	if (navigate === '') return 'Project Page'
+	const segment = navigate?.split('/').filter(Boolean).pop()
+	if (!segment) return ''
+	return segment.charAt(0).toUpperCase() + segment.slice(1)
+})
+
+function navigateToStagePage() {
+	if (stageNavigateTarget.value) router.push(stageNavigateTarget.value)
+}
 
 let persistenceEnabled = true
 let persistenceTimer: ReturnType<typeof setTimeout> | null = null
@@ -1175,7 +1196,15 @@ function savePersistedState(open: boolean, resetReviewAnyway = false) {
 		currentStage.value !== findFirstValidStage() ? currentStageObj.value.id : undefined
 	const messageVal = message.value ?? undefined
 	const stateVal = Object.keys(rawState).length > 0 ? rawState : undefined
-	if (!openVal && !reviewAnywayVal && !stageVal && !messageVal && !stateVal) {
+	const activatedStagesVal = activatedStages.value.size > 0 ? [...activatedStages.value] : undefined
+	if (
+		!openVal &&
+		!reviewAnywayVal &&
+		!stageVal &&
+		!messageVal &&
+		!stateVal &&
+		!activatedStagesVal
+	) {
 		return clearChecklistState(checklistPersistenceProjectId)
 	}
 	return saveChecklistState(checklistPersistenceProjectId, {
@@ -1184,6 +1213,7 @@ function savePersistedState(open: boolean, resetReviewAnyway = false) {
 		...(stageVal && { stage: stageVal }),
 		...(messageVal && { message: messageVal }),
 		...(stateVal && { state: stateVal }),
+		...(activatedStagesVal && { activatedStages: activatedStagesVal }),
 	})
 }
 
@@ -1204,20 +1234,24 @@ async function persistStateImmediately(open: boolean, resetReviewAnyway = false)
 
 watch(currentStage, persistState)
 watch(nodeStates, persistState, { deep: true })
+watch(activatedStages, persistState, { deep: true })
 watch(message, persistState)
+watch(currentStageObj, (stage) => markStageVisited(stage.id), {
+	immediate: !needsInitialStageSettle,
+})
 
 watch(
 	nodeStates,
 	async () => {
-		const active = collectActiveActions()
-		const newMap = new Map<IdentifiedNodeBuilder, boolean>()
+		const active = collectAllActiveActions()
+		const newMap = new Map<object, boolean>()
 		await Promise.all(
 			active
-				.filter((a) => a.node._segments.some((s) => s.type !== 'collect'))
+				.filter((a) => (a.node as any)._segments.some((s: any) => s.type !== 'collect'))
 				.map(async ({ node, state, statePath }) => {
 					try {
 						let hasContent = false
-						for (const seg of node._segments) {
+						for (const seg of (node as any)._segments) {
 							if (seg.type === 'collect') continue
 							const text = await evalSegment(seg, state, statePath)
 							if (text?.trim()) {
@@ -1236,11 +1270,6 @@ watch(
 	{ deep: true, immediate: true },
 )
 
-interface MessagePart {
-	priority?: Priority
-	content: string
-}
-
 function handleKeybinds(event: KeyboardEvent) {
 	keybinds.value.handle(event, {
 		project: projectV2.value,
@@ -1255,12 +1284,13 @@ function handleKeybinds(event: KeyboardEvent) {
 			isDone: done.value,
 			hasGeneratedMessage: generatedMessage.value,
 			isLoadingMessage: loadingMessage.value,
+			isModpackPermissionsStage: false,
 
 			futureProjectCount: moderationQueue.queueLength,
 			visibleActionsCount: resolveChildren(
 				currentStageObj.value,
-				nodeStates.value[currentStageObj.value.id!] ?? {},
-			).filter((c) => c instanceof NodeBuilder).length,
+				nodeStates.value[currentStageObj.value.id] ?? {},
+			).filter((c) => typeof c === 'object' && c !== null).length,
 		},
 		actions: {
 			tryGoNext: nextStage,
@@ -1280,11 +1310,10 @@ function handleKeybinds(event: KeyboardEvent) {
 	})
 }
 
-// Trigger debounced prefetch when user progresses through stages
 watch(currentStage, () => {
 	// Only prefetch if we're past the first stage (user is actively moderating)
 	if (currentStage.value > 0) {
-		debouncedPrefetch() // Use debounced version to prevent spam
+		debouncedPrefetch()
 	}
 })
 
@@ -1297,23 +1326,7 @@ onMounted(async () => {
 		notifications.setNotificationLocation('left')
 	}
 
-	const finishedId = localStorage.getItem('moderation-checklist-finished')
-	if (finishedId === projectV2.value.id) {
-		localStorage.removeItem('moderation-checklist-finished')
-		hasNextProject.value = moderationQueue.queueLength > 0
-		done.value = true
-		return
-	}
-
-	if (projectV2.value.status !== 'processing' && !reviewedAnyway.value) {
-		alreadyReviewed.value = true
-		return
-	}
-
-	const initialStage = resolvedStages.value[currentStage.value]
-	if (initialStage?._navigate) {
-		router.push(`/${projectV2.value.project_type}/${projectV2.value.slug}${initialStage._navigate}`)
-	}
+	if (done.value || alreadyReviewed.value) return
 
 	const result = await moderationQueue.acquireLock(projectV2.value.id)
 
@@ -1330,7 +1343,6 @@ onMounted(async () => {
 		}
 		lockError.value = false
 
-		// Start countdown timer
 		updateLockCountdown()
 		lockCountdownInterval.value = setInterval(updateLockCountdown, 1000)
 	} else {
@@ -1376,7 +1388,6 @@ onUnmounted(() => {
 		void moderationQueue.releaseLock(projectId)
 	}
 
-	// Clear prefetch state to prevent memory leaks
 	prefetchQueue.value = []
 	isPrefetching.value = false
 })
@@ -1384,111 +1395,131 @@ onUnmounted(() => {
 watch(
 	currentStage,
 	(newIndex, oldIndex) => {
-		const stage = resolvedStages.value[newIndex]
-		// only navigate when the stage actually changes (not on initial mount/remount)
-		if (oldIndex !== undefined && newIndex !== oldIndex && stage?._navigate) {
-			router.push(`/${projectV2.value.project_type}/${projectV2.value.slug}${stage._navigate}`)
+		if (hasSettledInitialStage.value && oldIndex !== undefined && newIndex !== oldIndex) {
+			syncStageUrl(resolvedStages.value[newIndex])
 		}
 	},
 	{ immediate: true },
 )
 
-watch(
-	() => currentStageObj.value.id,
-	(stageId) => {
-		if (stageId === 'versions') {
-			loadVersions()
-		}
-	},
-	{ immediate: true },
-)
+loadVersions()
 
-function countStageActions(stage: StageNodeBuilder): number {
+function countStageActions(stage: StageNode): number {
 	const actions = checklistLive.value.get(stage)?.activeActions ?? []
 	const resolved = resolvedMessageAvailability.value
 	return actions.filter((a) => {
-		if (a.node._segments.every((s) => s.type === 'collect')) return false
+		if ((a.node as any)._segments.every((s: any) => s.type === 'collect')) return false
 		return resolved.get(a.node) ?? true
 	}).length
 }
 
-function countStageFixes(stage: StageNodeBuilder): number {
+function countStageFixes(stage: StageNode): number {
 	return checklistLive.value.get(stage)?.fixCount ?? 0
 }
 
-function hasRequiredMissing(stage: StageNodeBuilder): boolean {
+function hasRequiredMissing(stage: StageNode): boolean {
 	return checklistLive.value.get(stage)?.hasRequiredMissing ?? false
 }
 
-function collectActiveActions(): ActiveAction[] {
+function collectAllActiveActions(): ActiveAction[] {
 	return resolvedStages.value.flatMap((s) => checklistLive.value.get(s)?.activeActions ?? [])
 }
 
-function isDescendant(childPath: string[], ancestorPath: string[]): boolean {
-	return (
-		childPath.length > ancestorPath.length && ancestorPath.every((key, i) => childPath[i] === key)
-	)
+function byPriority(a: ActiveAction, b: ActiveAction): number {
+	return ((a.node as any)._priority as Priority).compareTo((b.node as any)._priority as Priority)
 }
 
 async function assembleFullMessage() {
-	const allEntries = collectActiveActions()
+	const allEntries = collectAllActiveActions()
 	generatedActiveActions.value = allEntries
 
-	const consumed = new Set<IdentifiedNodeBuilder>()
+	const consumed = new Set<object>()
 
-	async function evalEntry(entry: ActiveAction): Promise<string> {
-		let result = ''
-		for (const seg of entry.node._segments) {
-			if (seg.type === 'collect') {
-				let collected = ''
-				for (const childEntry of allEntries) {
-					if (consumed.has(childEntry.node)) continue
-					if (!isDescendant(childEntry.statePath, entry.statePath)) continue
-					consumed.add(childEntry.node)
-					collected += await evalEntry(childEntry)
-				}
-				if (!collected.trim() && seg.fallback) {
-					collected = await evalSegment(seg.fallback, entry.state, entry.statePath)
-				}
-				result += collected
-			} else {
-				result += await evalSegment(seg, entry.state, entry.statePath)
-			}
-		}
-		return result
-	}
-
-	const parts: MessagePart[] = []
+	const parts: { entry: ActiveAction; content: string }[] = []
 	for (const entry of allEntries) {
 		if (consumed.has(entry.node)) continue
-		const content = await evalEntry(entry)
+		const content = await evalActiveAction(entry, allEntries, consumed)
 		if (content.trim()) {
-			parts.push({ priority: entry.node._priority, content })
+			parts.push({ entry, content })
 		}
 	}
 
-	parts.sort((a, b) => {
-		if (!a.priority && !b.priority) return 0
-		if (!a.priority) return 1
-		if (!b.priority) return -1
-		return a.priority.compareTo(b.priority)
-	})
+	parts.sort((a, b) => byPriority(a.entry, b.entry))
 
 	return expandVariables(
 		parts
-			.map((p) => p.content)
-			.filter((c) => c.trim().length > 0)
+			.map((p) => p.content.trim())
+			.filter((c) => c.length > 0)
 			.join('\n\n'),
 		projectV2.value,
 		projectV3.value,
 	)
 }
 
-provide(NODE_META_KEY, checklistLive)
-provide(STATE_KEY, nodeStates)
-provide(GLOBAL_STATE_KEY, nodeStates)
+const tooltipHtmlMap = ref(new Map<object, string>())
 
-function shouldShowStage(stage: StageNodeBuilder): boolean {
+watchEffect(async () => {
+	const stage = currentStageObj.value
+	const stageState = (nodeStates.value[stage.id] ?? {}) as Record<string, NodeState>
+	const stageChildren = resolveChildren(stage, stageState)
+	const actions = collectMessageNodes(stageChildren, stageState, [stage.id])
+
+	const newMap = new Map<object, string>()
+	await Promise.all(
+		actions.map(async (entry) => {
+			try {
+				const raw = await evalActiveAction(entry, actions, new Set())
+				const expanded = expandVariables(raw, projectV2.value, projectV3.value).trim()
+				newMap.set(
+					entry.node,
+					expanded
+						? `<div class="markdown-body moderation-tooltip-markdown">${renderHighlightedString(expanded)}</div>`
+						: '',
+				)
+			} catch {
+				newMap.set(entry.node, '')
+			}
+		}),
+	)
+	tooltipHtmlMap.value = newMap
+})
+
+const stageMeta = computed(() => {
+	const stage = currentStageObj.value
+	const stageState = (nodeStates.value[stage.id] ?? {}) as Record<string, NodeState>
+	const stageChildren = resolveChildren(stage, stageState)
+	const metaMap = computeNodeMeta(stageChildren, stageState, isFixActionable)
+	const attentionMap = computeAttentionMap(stageChildren, stageState, metaMap)
+	return { metaMap, attentionMap, tooltipHtml: tooltipHtmlMap.value }
+})
+
+const appComponentsByKey: Record<string, Component> = {
+	'loader-picker': LoaderPicker,
+	'game-version-picker': McVersionPicker,
+}
+
+const stageState = computed(
+	() => (nodeStates.value[currentStageObj.value.id] ?? {}) as Record<string, NodeState>,
+)
+const stageNodes = computed(() => resolveChildren(currentStageObj.value, stageState.value))
+
+const stageWriter: Writer = (id, value) => {
+	const stageId = currentStageObj.value.id
+	const existing = nodeStates.value[stageId]
+	const next: Record<string, NodeState> = existing ? { ...existing } : {}
+	if (value === undefined) Reflect.deleteProperty(next, id)
+	else next[id] = value
+	if (Object.keys(next).length === 0) {
+		if (existing !== undefined) Reflect.deleteProperty(nodeStates.value, stageId)
+	} else {
+		nodeStates.value[stageId] = next
+	}
+}
+
+provide(CHECKLIST_META_KEY, stageMeta)
+provide(STATE_KEY, nodeStates)
+
+function shouldShowStage(stage: StageNode): boolean {
 	return checklistLive.value.get(stage)?.isVisible ?? false
 }
 
@@ -1513,6 +1544,16 @@ function previousStage() {
 }
 
 function nextStage() {
+	if (done.value) {
+		endChecklist(undefined)
+		return
+	}
+
+	if (alreadyReviewed.value || isLockedByOther.value) {
+		if (moderationQueue.isQueueMode && moderationQueue.queueLength > 1) skipToNextProject()
+		return
+	}
+
 	if (generatedMessage.value) return
 
 	let targetStage = currentStage.value + 1
@@ -1544,8 +1585,9 @@ async function generateMessage() {
 	if (loadingMessage.value) return
 
 	loadingMessage.value = true
+	markStageVisited(currentStageObj.value.id)
 
-	router.push(`/${projectV2.value.project_type}/${projectV2.value.slug}/moderation`)
+	router.push(`/${projectUrlType.value}/${projectV2.value.slug}/moderation`)
 
 	try {
 		missingMdPaths.clear()
@@ -1571,6 +1613,16 @@ async function generateMessage() {
 }
 
 const hasNextProject = ref(false)
+
+const finishedId = localStorage.getItem('moderation-checklist-finished')
+if (finishedId === projectV2.value.id) {
+	localStorage.removeItem('moderation-checklist-finished')
+	hasNextProject.value = moderationQueue.queueLength > 0
+	done.value = true
+} else if (projectV2.value.status !== 'processing' && !reviewedAnyway.value) {
+	alreadyReviewed.value = true
+}
+
 async function refreshModerationCaches(threadId?: string) {
 	const refreshes: Promise<unknown>[] = [
 		invalidate(),
@@ -1585,7 +1637,6 @@ async function refreshModerationCaches(threadId?: string) {
 }
 
 async function sendMessage(status: ProjectStatus) {
-	// Capture project data upfront to avoid null issues during async operations
 	const projectId = projectV2.value?.id
 	const threadId = projectV2.value?.thread_id
 
@@ -1598,8 +1649,8 @@ async function sendMessage(status: ProjectStatus) {
 		return
 	}
 
-	const active = generatedActiveActions.value ?? collectActiveActions()
-	const shouldApplyFixes = active.some((a) => a.node._applyFixes)
+	const active = [...(generatedActiveActions.value ?? collectAllActiveActions())].sort(byPriority)
+	const shouldApplyFixes = active.some((a) => (a.node as any)._applyFixes)
 
 	moderationDecision.value = status
 	try {
@@ -1627,7 +1678,8 @@ async function sendMessage(status: ProjectStatus) {
 				projectV3.value as any,
 			)
 			for (const { node, state } of active) {
-				for (const f of node._fixes) {
+				if (!('_fixes' in (node as object))) continue
+				for (const f of (node as any)._fixes) {
 					f._projectFn?.(projectProxy, state)
 				}
 			}
@@ -1638,7 +1690,11 @@ async function sendMessage(status: ProjectStatus) {
 
 			if (versions.value) {
 				const versionFixes = active.flatMap(({ node, state }) =>
-					node._fixes.filter((f) => f._versionFn).map((f) => ({ fix: f, state })),
+					'_fixes' in (node as object)
+						? (node as any)._fixes
+								.filter((f: FixBuilder) => f._versionFn)
+								.map((f: FixBuilder) => ({ fix: f, state }))
+						: [],
 				)
 				if (versionFixes.length > 0) {
 					await Promise.all(
@@ -1657,7 +1713,7 @@ async function sendMessage(status: ProjectStatus) {
 			}
 		}
 
-		const willHaveNext = await moderationQueue.completeCurrentProject(projectId, 'completed')
+		const willHaveNext = await moderationQueue.completeProject(projectId)
 		// Set both states together - hasNextProject MUST be set before done
 		// to avoid the race condition where done=true renders with hasNextProject=false
 		hasNextProject.value = willHaveNext
@@ -1694,22 +1750,23 @@ async function endChecklist(status?: string) {
 	await clearProjectLocalStorage()
 
 	if (!hasNextProject.value) {
+		const currentProjectId = projectV2.value?.id
+		const isRealQueue =
+			!!currentProjectId &&
+			(moderationQueue.currentQueue.completed.includes(currentProjectId) ||
+				moderationQueue.currentQueue.skipped.includes(currentProjectId))
+
 		await navigateTo({
 			name: 'moderation',
 			state: {
 				confetti: true,
+				queueSummary: isRealQueue,
 			},
 		})
 
 		await nextTick()
 
-		if (moderationQueue.currentQueue.total > 1) {
-			addNotification({
-				title: 'Moderation completed',
-				text: `You have completed the moderation queue.`,
-				type: 'success',
-			})
-		} else {
+		if (!isRealQueue) {
 			addNotification({
 				title: 'Moderation submitted',
 				text: `Project ${status ?? 'completed successfully'}.`,
@@ -1723,30 +1780,15 @@ async function endChecklist(status?: string) {
 				(id) => id !== currentProjectId,
 			)
 
-			let foundEligible = false
-			if (remainingIds.length > 0) {
-				const next = await findNextEligibleQueueProject(remainingIds)
-
-				if (next) {
-					await Promise.all(
-						next.skippedIds.map((id) => moderationQueue.completeCurrentProject(id, 'skipped')),
-					)
-					notifySkippedQueueProjects(next.skippedIds.length)
-					navigateToQueueProject(next.result, next.projectId)
-					foundEligible = true
-				} else {
-					await Promise.all(
-						remainingIds.map((id) => moderationQueue.completeCurrentProject(id, 'skipped')),
-					)
+			if (!(await goToNextEligibleProject(remainingIds))) {
+				if (remainingIds.length > 0) {
 					addNotification({
 						title: 'No projects available',
 						text: 'All remaining projects are already moderated, deleted, or locked by others.',
 						type: 'warning',
 					})
 				}
-			}
 
-			if (!foundEligible) {
 				await navigateTo({
 					name: 'moderation',
 				})
@@ -1771,7 +1813,7 @@ async function skipCurrentProject() {
 		new Promise((r) => setTimeout(r, 2000)),
 	])
 
-	hasNextProject.value = await moderationQueue.completeCurrentProject(projectId, 'skipped')
+	hasNextProject.value = await moderationQueue.deferProject(projectId)
 
 	await endChecklist('skipped')
 }
@@ -1781,8 +1823,11 @@ async function clearProjectLocalStorage() {
 	cancelPendingPersistence()
 
 	nodeStates.value = {}
+	activatedStages.value = new Set()
+	visitedStages.value = new Set()
 	message.value = null
 	await clearChecklistState(checklistPersistenceProjectId)
+	clearSessionChecklistState(checklistPersistenceProjectId)
 }
 
 const isLastVisibleStage = computed(() => {
@@ -1812,6 +1857,8 @@ interface StageOption {
 	messages?: number
 	fixes?: number
 	requiredMissing?: boolean
+	visited?: boolean
+	tone?: 'green'
 }
 
 const stageOptions = computed<StageOption[]>(() => {
@@ -1832,6 +1879,12 @@ const stageOptions = computed<StageOption[]>(() => {
 				messages: countStageActions(stage) || undefined,
 				fixes: countStageFixes(stage) || undefined,
 				requiredMissing: hasRequiredMissing(stage) || undefined,
+				visited:
+					((index !== currentStage.value || generatedMessage.value) &&
+						stage.id &&
+						visitedStages.value.has(stage.id)) ||
+					undefined,
+				tone: index === currentStage.value && !generatedMessage.value ? 'green' : undefined,
 			}
 		})
 		.filter((opt): opt is StageOption => opt !== null)
@@ -1842,6 +1895,7 @@ const stageOptions = computed<StageOption[]>(() => {
 		action: () => generateMessage(),
 		text: 'Generate Message',
 		icon: CheckIcon,
+		tone: generatedMessage.value ? 'green' : undefined,
 	})
 
 	return options
diff --git a/apps/frontend/src/components/ui/moderation/checklist/NodeRenderer.vue b/apps/frontend/src/components/ui/moderation/checklist/NodeRenderer.vue
deleted file mode 100644
index 7a320d2ff6..0000000000
--- a/apps/frontend/src/components/ui/moderation/checklist/NodeRenderer.vue
+++ /dev/null
@@ -1,826 +0,0 @@
-<script lang="ts" setup>
-import type {
-	BooleanNodeBuilder,
-	ButtonNodeBuilder,
-	ChildNode,
-	DropdownNodeBuilder,
-	GroupNodeBuilder,
-	IdentifiedNodeBuilder,
-	InputNodeBuilder,
-	LabeledNodeBuilder,
-	NodeState,
-	NodeStateWithChildren,
-	OverrideValue,
-	ValueNodeBuilder,
-} from '@modrinth/moderation'
-import {
-	evalSegment,
-	expandVariables,
-	flattenProjectV3Variables,
-	flattenProjectVariables,
-	flattenStaticVariables,
-	getBooleanChildState,
-	NodeBuilder,
-	resolve,
-	resolveChildren,
-	setMessageProject,
-} from '@modrinth/moderation'
-import {
-	Button,
-	Checkbox,
-	Combobox,
-	injectProjectPageContext,
-	MarkdownEditor,
-	StyledInput,
-} from '@modrinth/ui'
-import { renderHighlightedString, renderString } from '@modrinth/utils'
-import { inject, nextTick, onMounted, reactive, watchEffect } from 'vue'
-
-import { NODE_META_KEY, STATE_KEY } from './checklist-context'
-
-const nodeMetaMap = inject(NODE_META_KEY)
-const injectedGlobalState = inject(STATE_KEY)
-
-const { projectV3: project, projectV2 } = injectProjectPageContext()
-setMessageProject(project, projectV2)
-
-const props = defineProps<{
-	nodes: ChildNode[]
-	showContext: Record<string, NodeState>
-	onImageUpload?: (file: File) => Promise<string>
-	flex?: boolean
-	titleDepth?: number
-	parentStatePath?: string[]
-}>()
-
-function titleClass(depth: number): string {
-	if (depth === 0) return 'text-lg font-extrabold text-contrast'
-	if (depth === 1) return 'text-base font-semibold'
-	if (depth === 2) return 'text-sm font-semibold'
-	return ''
-}
-
-function isVisible(node: NodeBuilder): boolean {
-	if (node._shown !== undefined) return resolve(node._shown)
-	if (node.type === 'group') {
-		const children = getChildren(node as IdentifiedNodeBuilder)
-		return children.some((c) => !(c instanceof NodeBuilder) || isVisible(c))
-	}
-	return true
-}
-
-function isEnabled(node: IdentifiedNodeBuilder): boolean {
-	const e = node._enabled
-	if (e === undefined) return true
-	if (typeof e === 'function') return e(props.showContext)
-	return resolve(e)
-}
-
-function isButtonEnabled(node: ButtonNodeBuilder): boolean {
-	const enabled = node._enabled
-	if (enabled === undefined) return true
-	if (typeof enabled === 'function') return enabled(props.showContext)
-	return resolve(enabled)
-}
-
-function asBool(node: NodeBuilder): BooleanNodeBuilder {
-	return node as BooleanNodeBuilder
-}
-
-function asButton(node: NodeBuilder): ButtonNodeBuilder {
-	return node as ButtonNodeBuilder
-}
-
-function asIdentified(node: NodeBuilder): IdentifiedNodeBuilder {
-	return node as IdentifiedNodeBuilder
-}
-
-function asLabeled(node: NodeBuilder): LabeledNodeBuilder {
-	return node as LabeledNodeBuilder
-}
-
-function asGroup(node: NodeBuilder): GroupNodeBuilder {
-	return node as GroupNodeBuilder
-}
-
-function asDropdown(node: NodeBuilder): DropdownNodeBuilder {
-	return node as DropdownNodeBuilder
-}
-
-function asInput(node: NodeBuilder): InputNodeBuilder {
-	return node as InputNodeBuilder
-}
-
-function getAtPath(path: string[]): NodeState {
-	let current: unknown = injectedGlobalState!.value
-	for (const key of path) {
-		if (current == null || typeof current !== 'object' || current instanceof Set) return undefined
-		current = (current as Record<string, unknown>)[key]
-	}
-	return current as NodeState
-}
-
-function setAtPath(path: string[], value: NodeState): void {
-	if (path.length === 0) return
-	const global = injectedGlobalState!.value as unknown as Record<string, unknown>
-	let current = global
-	const stack: [Record<string, unknown>, string][] = []
-	for (let i = 0; i < path.length - 1; i++) {
-		const key = path[i]
-		const next = current[key]
-		if (!next || typeof next !== 'object' || next instanceof Set) {
-			if (value === undefined) return
-			current[key] = next !== null && next !== undefined ? { value: next } : {}
-			current = current[key] as Record<string, unknown>
-		} else {
-			stack.push([current, key])
-			current = next as Record<string, unknown>
-		}
-	}
-	const lastKey = path[path.length - 1]
-	if (value === undefined) {
-		Reflect.deleteProperty(current, lastKey)
-		for (let i = stack.length - 1; i >= 0; i--) {
-			const [parent, key] = stack[i]
-			const child = parent[key]
-			if (
-				child &&
-				typeof child === 'object' &&
-				!(child instanceof Set) &&
-				Object.keys(child as object).length === 0
-			) {
-				Reflect.deleteProperty(parent, key)
-			} else {
-				break
-			}
-		}
-	} else {
-		current[lastKey] = value as unknown
-	}
-}
-
-function getNodeState(node: IdentifiedNodeBuilder): NodeState {
-	return node._statePath ? getAtPath(node._statePath) : undefined
-}
-
-function setNodeState(node: IdentifiedNodeBuilder, value: NodeState): void {
-	if (node._statePath) setAtPath(node._statePath, value)
-}
-
-function getBooleanState(node: BooleanNodeBuilder): boolean {
-	const state = getNodeState(node)
-	if (typeof state === 'boolean') return state
-	if (state && typeof state === 'object' && !(state instanceof Set)) {
-		const v = (state as NodeStateWithChildren).value
-		if (typeof v === 'boolean') return v
-	}
-	const def = resolveDefault(node)
-	return (def as boolean | undefined) ?? false
-}
-
-function getMultiSelectState(node: IdentifiedNodeBuilder): Set<string> {
-	const state = getNodeState(node)
-	return state instanceof Set ? state : new Set<string>()
-}
-
-function getSelectState(node: IdentifiedNodeBuilder): string | undefined {
-	const state = getNodeState(node)
-	if (typeof state === 'string') return state
-	const def = resolveDefault(node as ValueNodeBuilder)
-	return typeof def === 'string' ? def : undefined
-}
-
-function getDropdownOptions(node: DropdownNodeBuilder) {
-	return [
-		...(node._none !== undefined ? [{ value: '', label: node._none }] : []),
-		...visibleChildren(node).map((c) => ({
-			value: asIdentified(c).id!,
-			label: asLabeled(c).label,
-		})),
-	]
-}
-
-function getDropdownModelValue(node: DropdownNodeBuilder) {
-	return getSelectState(node) ?? (node._none !== undefined ? '' : undefined)
-}
-
-function toggleSelect(parent: IdentifiedNodeBuilder, child: IdentifiedNodeBuilder) {
-	const current = getSelectState(parent)
-	setNodeState(parent, current === child.id ? undefined : child.id)
-}
-
-function resolveDefault(node: ValueNodeBuilder): NodeState {
-	const d = node._defaultValue
-	return typeof d === 'function' ? d(props.showContext) : d
-}
-
-function getTextState(node: IdentifiedNodeBuilder): string {
-	const state = getNodeState(node)
-	if (typeof state === 'string') return state
-	const def = resolveDefault(node as ValueNodeBuilder)
-	return typeof def === 'string' ? def : ''
-}
-
-function getNodeTitle(node: NodeBuilder): string | undefined {
-	if (node._title === undefined) return undefined
-	return resolve(node._title) || undefined
-}
-
-function getPlaceholder(node: InputNodeBuilder): string | undefined {
-	if (node._placeholder !== undefined) return resolve(node._placeholder)
-	const def = resolveDefault(node)
-	if (typeof def === 'string') return def
-	return undefined
-}
-
-function hasActionableFixes(node: IdentifiedNodeBuilder): boolean {
-	return nodeMetaMap?.value.get(node)?.isFixActionable ?? false
-}
-
-function hasRequiredMissingDescendants(node: IdentifiedNodeBuilder): boolean {
-	for (const child of getChildren(node)) {
-		if (!(child instanceof NodeBuilder)) continue
-		const identified = child as IdentifiedNodeBuilder
-		if (nodeMetaMap?.value.get(identified)?.hasRequiredMissing) return true
-		if (identified.id !== undefined && hasRequiredMissingDescendants(identified)) return true
-	}
-	return false
-}
-
-function nodeHasRequiredMissing(node: IdentifiedNodeBuilder): boolean {
-	return !!nodeMetaMap?.value.get(node)?.hasRequiredMissing || hasRequiredMissingDescendants(node)
-}
-
-function getBooleanColor(node: BooleanNodeBuilder): 'standard' | 'orange' | 'blue' | 'brand' {
-	if (!getBooleanState(node)) return 'standard'
-	if (hasRequiredMissingDescendants(node)) return 'orange'
-	return hasActionableFixes(node) ? 'blue' : 'brand'
-}
-
-function setTextState(node: IdentifiedNodeBuilder, v: string): void {
-	const inputNode = node as InputNodeBuilder
-	const result = inputNode._onChange?.(v, overrideHelpers)
-
-	if (isOverrideValue(result)) {
-		const ov = result.__override
-		const def = resolveDefault(node as ValueNodeBuilder)
-		const defStr = typeof def === 'string' ? def : ''
-		setNodeState(node, ov === defStr ? undefined : ov || undefined)
-		nextTick(() => textInputRefs.get(node)?.setValue(ov))
-		return
-	}
-
-	const def = resolveDefault(node as ValueNodeBuilder)
-	const defStr = typeof def === 'string' ? def : ''
-	setNodeState(node, v === defStr ? undefined : defStr ? v : v || undefined)
-}
-
-function handleButtonClick(node: ButtonNodeBuilder): void {
-	const before = new Map<NodeBuilder, string>()
-	for (const inputNode of textInputRefs.keys()) {
-		before.set(inputNode, getTextState(asIdentified(inputNode)))
-	}
-	node._onClick?.(props.showContext)
-	for (const [inputNode, beforeVal] of before) {
-		const after = getTextState(asIdentified(inputNode))
-		if (after !== beforeVal) setTextState(asIdentified(inputNode), after)
-	}
-}
-
-onMounted(() => {
-	for (const inputNode of textInputRefs.keys()) {
-		setTextState(asIdentified(inputNode), getTextState(asIdentified(inputNode)))
-	}
-})
-
-function toggleBoolean(node: BooleanNodeBuilder) {
-	const raw = getNodeState(node)
-	const next = !getBooleanState(node)
-	const defaultVal = (resolveDefault(node) as boolean | undefined) ?? false
-	const isDefault = next === defaultVal
-	if (raw && typeof raw === 'object' && !(raw instanceof Set)) {
-		const { value: _v, ...children } = raw as NodeStateWithChildren & Record<string, NodeState>
-		const hasChildren = Object.keys(children).length > 0
-		setNodeState(
-			node,
-			isDefault && !hasChildren
-				? undefined
-				: ({ ...children, ...(isDefault ? {} : { value: next }) } as NodeState),
-		)
-	} else {
-		setNodeState(node, isDefault ? undefined : next)
-	}
-}
-
-function toggleChip(parent: IdentifiedNodeBuilder, child: IdentifiedNodeBuilder) {
-	const selected = new Set(getMultiSelectState(parent))
-	if (selected.has(child.id!)) {
-		selected.delete(child.id!)
-		if (child._statePath) {
-			setAtPath(child._statePath, undefined)
-		}
-	} else {
-		selected.add(child.id!)
-	}
-	setNodeState(parent, selected.size > 0 ? selected : undefined)
-}
-
-const textInputRefs = new Map<NodeBuilder, { setValue: (v: string) => void }>()
-const overrideHelpers = { override: (v: string): OverrideValue => ({ __override: v }) }
-
-function isOverrideValue(v: unknown): v is OverrideValue {
-	return v !== null && typeof v === 'object' && '__override' in v
-}
-
-const scopedContextFallbacks = new WeakMap<IdentifiedNodeBuilder, Record<string, NodeState>>()
-
-function childScopedContext(child: IdentifiedNodeBuilder): Record<string, NodeState> {
-	if (!child._statePath) return props.showContext
-	const basePath = child._statePath
-	const state = getAtPath(basePath)
-	if (state && typeof state === 'object' && !(state instanceof Set)) {
-		return state as Record<string, NodeState>
-	}
-	const existing = scopedContextFallbacks.get(child)
-	if (existing) return existing
-	const fallback = new Proxy({} as Record<string, NodeState>, {
-		set(_target, key, value) {
-			setAtPath([...basePath, key as string], value as NodeState)
-			return true
-		},
-	})
-	scopedContextFallbacks.set(child, fallback)
-	return fallback
-}
-
-function getChildrenContext(node: IdentifiedNodeBuilder): Record<string, NodeState> {
-	if (node.type === 'dropdown') return props.showContext
-	if (node.type === 'group' && asGroup(node)._selectMode) return props.showContext
-	return childScopedContext(node)
-}
-
-function getChildren(node: IdentifiedNodeBuilder): ChildNode[] {
-	return resolveChildren(node, getChildrenContext(node))
-}
-
-function visibleChildren(node: IdentifiedNodeBuilder): NodeBuilder[] {
-	return getChildren(node).filter((c): c is NodeBuilder => c instanceof NodeBuilder && isVisible(c))
-}
-
-const tooltipHtml = reactive(new Map<NodeBuilder, string>())
-
-function getTooltipConfig(node: NodeBuilder, state?: Record<string, NodeState>) {
-	const t = node._tooltip
-	const manual = t === undefined ? undefined : typeof t === 'function' ? t(state ?? {}) : resolve(t)
-	if (manual)
-		return {
-			content: manual,
-			delay: { show: 500, hide: 0 },
-			triggers: ['hover', 'focus'],
-			placement: 'top',
-		}
-	const html = tooltipHtml.get(node)
-	if (!html) return undefined
-	return {
-		content: html,
-		html: true,
-		delay: { show: 500, hide: 0 },
-		triggers: ['hover', 'focus'],
-		placement: 'top',
-	}
-}
-
-watchEffect(async () => {
-	// Read all reactive state synchronously before any await so Vue tracks dependencies
-	const buttonTasks: Array<{ node: BooleanNodeBuilder; state: Record<string, NodeState> }> = []
-
-	for (const node of props.nodes) {
-		if (!(node instanceof NodeBuilder)) continue
-		if (node.type === 'toggle' && isVisible(node)) {
-			const boolNode = asBool(node)
-			if (boolNode._segments.some((s) => s.type !== 'collect')) {
-				const nodeState = getNodeState(boolNode)
-				const childState =
-					nodeState && typeof nodeState === 'object' && !(nodeState instanceof Set)
-						? (() => {
-								const { value: _v, ...rest } = nodeState as NodeStateWithChildren &
-									Record<string, NodeState>
-								return rest
-							})()
-						: {}
-				buttonTasks.push({ node: boolNode, state: childState })
-			}
-		}
-		if (node.type === 'group' && asGroup(node)._selectMode === 'multi' && isVisible(node)) {
-			for (const child of visibleChildren(asIdentified(node))) {
-				const opt = child as IdentifiedNodeBuilder
-				if (opt._segments.some((s) => s.type !== 'collect')) {
-					const childState = getBooleanChildState(getNodeState(opt)) as Record<string, NodeState>
-					buttonTasks.push({ node: opt as BooleanNodeBuilder, state: childState })
-				}
-			}
-		}
-	}
-
-	async function evalCollectedChildren(node: IdentifiedNodeBuilder): Promise<string> {
-		let result = ''
-		for (const child of getChildren(node)) {
-			if (!(child instanceof NodeBuilder)) continue
-			if (!isVisible(child)) continue
-			const childNode = asIdentified(child)
-			if (child.type === 'group') {
-				const grp = asGroup(childNode)
-				if (grp._selectMode === 'multi') {
-					const selected = getMultiSelectState(childNode)
-					for (const opt of getChildren(childNode)) {
-						if (!(opt instanceof NodeBuilder) || !isVisible(opt)) continue
-						const optNode = asIdentified(opt)
-						if (!optNode.id || !selected.has(optNode.id)) continue
-						result += await evalNodeTooltip(
-							optNode,
-							getBooleanChildState(getNodeState(optNode)) as Record<string, NodeState>,
-						)
-					}
-				} else if (grp._selectMode === 'single') {
-					const selected = getSelectState(childNode)
-					for (const opt of getChildren(childNode)) {
-						if (!(opt instanceof NodeBuilder) || !isVisible(opt)) continue
-						const optNode = asIdentified(opt)
-						if (optNode.id !== selected) continue
-						result += await evalNodeTooltip(
-							optNode,
-							getBooleanChildState(getNodeState(optNode)) as Record<string, NodeState>,
-						)
-					}
-				} else {
-					result += await evalCollectedChildren(childNode)
-				}
-			} else if (child.type === 'dropdown') {
-				const selected = getSelectState(childNode)
-				for (const opt of getChildren(childNode)) {
-					if (!(opt instanceof NodeBuilder) || !isVisible(opt)) continue
-					const optNode = asIdentified(opt)
-					if (optNode.id !== selected) continue
-					result += await evalNodeTooltip(
-						optNode,
-						getBooleanChildState(getNodeState(optNode)) as Record<string, NodeState>,
-					)
-				}
-			} else if (child.type === 'toggle' || child.type === 'check') {
-				if (!getBooleanState(asBool(childNode))) continue
-				result += await evalNodeTooltip(
-					childNode,
-					getBooleanChildState(getNodeState(childNode)) as Record<string, NodeState>,
-				)
-			}
-		}
-		return result
-	}
-
-	async function evalNodeTooltip(
-		node: IdentifiedNodeBuilder,
-		state: Record<string, NodeState>,
-	): Promise<string> {
-		let result = ''
-		for (const seg of node._segments) {
-			if (seg.type === 'collect') {
-				let collected = await evalCollectedChildren(node)
-				if (!collected.trim() && seg.fallback) {
-					collected = await evalSegment(seg.fallback, state, node._statePath ?? [])
-				}
-				result += collected
-			} else {
-				result += await evalSegment(seg, state, node._statePath ?? [])
-			}
-		}
-		return result
-	}
-
-	for (const { node, state } of buttonTasks) {
-		try {
-			const raw = await evalNodeTooltip(node as unknown as IdentifiedNodeBuilder, state)
-			const expanded = expandVariables(raw, projectV2.value, project.value, {
-				...flattenStaticVariables(),
-				...flattenProjectVariables(projectV2.value),
-				...flattenProjectV3Variables(project.value),
-			})
-			const trimmed = expanded.trim()
-			tooltipHtml.set(
-				node,
-				trimmed
-					? `<div class="markdown-body moderation-tooltip-markdown">${renderHighlightedString(trimmed)}</div>`
-					: '',
-			)
-		} catch {
-			tooltipHtml.set(node, '')
-		}
-	}
-})
-</script>
-
-<template>
-	<div :class="flex ? 'flex flex-wrap gap-2' : 'space-y-4'">
-		<template
-			v-for="(item, idx) in nodes"
-			:key="
-				item instanceof NodeBuilder
-					? item.type === 'button'
-						? `button-${asButton(item).label}`
-						: (asIdentified(item)._statePath?.join('/') ?? asIdentified(item).id ?? item.type)
-					: typeof item === 'string'
-						? `s-${item}`
-						: `display-${idx}`
-			"
-		>
-			<!-- Display items: plain strings or zero-arg render functions -->
-			<template v-if="!(item instanceof NodeBuilder)">
-				<template v-if="typeof item === 'string'">{{ item }}</template>
-				<component :is="item" v-else />
-			</template>
-
-			<template v-else-if="isVisible(item)">
-				<div :class="item.type !== 'group' && !getNodeTitle(item) ? 'contents' : undefined">
-					<div v-if="getNodeTitle(item)" class="mb-2" :class="titleClass(titleDepth ?? 0)">
-						<span
-							v-html="renderString(getNodeTitle(item)!).replace(/^<p>([\s\S]*)<\/p>\n?$/, '$1')"
-						/><span v-if="nodeHasRequiredMissing(asIdentified(item))" class="text-red">*</span>
-					</div>
-
-					<!-- group -->
-					<template v-if="item.type === 'group'">
-						<!-- multi-select (chips) mode -->
-						<template v-if="asGroup(item)._selectMode === 'multi'">
-							<div class="flex flex-wrap gap-2">
-								<template
-									v-for="child in visibleChildren(asIdentified(item))"
-									:key="asIdentified(child).id"
-								>
-									<Button
-										v-tooltip="getTooltipConfig(asIdentified(child))"
-										:type="
-											(getMultiSelectState(asIdentified(item)).has(asIdentified(child).id!)
-												? hasActionableFixes(asIdentified(child))
-													? 'blue'
-													: 'brand'
-												: 'standard') &&
-											(getMultiSelectState(asIdentified(item)).has(asIdentified(child).id!)
-												? hasActionableFixes(asIdentified(child))
-													? 'blue'
-													: 'brand'
-												: 'standard') !== 'standard'
-												? 'colored'
-												: 'base'
-										"
-										:color="
-											(getMultiSelectState(asIdentified(item)).has(asIdentified(child).id!)
-												? hasActionableFixes(asIdentified(child))
-													? 'blue'
-													: 'brand'
-												: 'standard') &&
-											(getMultiSelectState(asIdentified(item)).has(asIdentified(child).id!)
-												? hasActionableFixes(asIdentified(child))
-													? 'blue'
-													: 'brand'
-												: 'standard') !== 'standard'
-												? (getMultiSelectState(asIdentified(item)).has(asIdentified(child).id!)
-														? hasActionableFixes(asIdentified(child))
-															? 'blue'
-															: 'brand'
-														: 'standard') === 'medal-promo'
-													? 'medal_promotion'
-													: getMultiSelectState(asIdentified(item)).has(asIdentified(child).id!)
-														? hasActionableFixes(asIdentified(child))
-															? 'blue'
-															: 'brand'
-														: 'standard'
-												: undefined
-										"
-										:aria-label="asIdentified(child)._icon ? asLabeled(child).label : undefined"
-										@click="toggleChip(asIdentified(item), asIdentified(child))"
-									>
-										<component :is="asIdentified(child)._icon" v-if="asIdentified(child)._icon" />
-										<template v-else>{{ asLabeled(child).label }}</template>
-									</Button>
-								</template>
-							</div>
-							<template
-								v-for="child in visibleChildren(asIdentified(item))"
-								:key="`sub-${asIdentified(child).id}`"
-							>
-								<NodeRenderer
-									v-if="
-										getMultiSelectState(asIdentified(item)).has(asIdentified(child).id!) &&
-										getChildren(asIdentified(child)).length
-									"
-									:nodes="getChildren(asIdentified(child))"
-									:show-context="getChildrenContext(asIdentified(child))"
-									:on-image-upload="onImageUpload"
-									:title-depth="titleDepth"
-									:parent-state-path="asIdentified(child)._statePath ?? props.parentStatePath ?? []"
-									class="mt-2"
-								/>
-							</template>
-						</template>
-						<!-- single-select (button-style) mode -->
-						<template v-else-if="asGroup(item)._selectMode === 'single'">
-							<div class="flex flex-wrap gap-2">
-								<template
-									v-for="child in visibleChildren(asIdentified(item))"
-									:key="asIdentified(child).id"
-								>
-									<Button
-										:type="
-											(getSelectState(asIdentified(item)) === asIdentified(child).id
-												? 'brand'
-												: 'standard') &&
-											(getSelectState(asIdentified(item)) === asIdentified(child).id
-												? 'brand'
-												: 'standard') !== 'standard'
-												? 'colored'
-												: 'base'
-										"
-										:color="
-											(getSelectState(asIdentified(item)) === asIdentified(child).id
-												? 'brand'
-												: 'standard') &&
-											(getSelectState(asIdentified(item)) === asIdentified(child).id
-												? 'brand'
-												: 'standard') !== 'standard'
-												? (getSelectState(asIdentified(item)) === asIdentified(child).id
-														? 'brand'
-														: 'standard') === 'medal-promo'
-													? 'medal_promotion'
-													: getSelectState(asIdentified(item)) === asIdentified(child).id
-														? 'brand'
-														: 'standard'
-												: undefined
-										"
-										:aria-label="asIdentified(child)._icon ? asLabeled(child).label : undefined"
-										@click="toggleSelect(asIdentified(item), asIdentified(child))"
-									>
-										<component :is="asIdentified(child)._icon" v-if="asIdentified(child)._icon" />
-										<template v-else>{{ asLabeled(child).label }}</template>
-									</Button>
-								</template>
-							</div>
-							<template
-								v-for="child in visibleChildren(asIdentified(item))"
-								:key="`sub-${asIdentified(child).id}`"
-							>
-								<NodeRenderer
-									v-if="
-										getSelectState(asIdentified(item)) === asIdentified(child).id &&
-										getChildren(asIdentified(child)).length
-									"
-									:nodes="getChildren(asIdentified(child))"
-									:show-context="getChildrenContext(asIdentified(child))"
-									:on-image-upload="onImageUpload"
-									:title-depth="titleDepth"
-									:parent-state-path="asIdentified(child)._statePath ?? props.parentStatePath ?? []"
-									class="mt-2"
-								/>
-							</template>
-						</template>
-						<!-- plain container mode -->
-						<NodeRenderer
-							v-else
-							:nodes="getChildren(asIdentified(item))"
-							:show-context="getChildrenContext(asIdentified(item))"
-							:on-image-upload="onImageUpload"
-							:flex="asGroup(item)._layout !== 'column'"
-							:title-depth="item._title !== undefined ? (titleDepth ?? 0) + 1 : titleDepth"
-							:parent-state-path="asIdentified(item)._statePath ?? props.parentStatePath ?? []"
-						/>
-					</template>
-
-					<!-- dropdown -->
-					<template v-else-if="item.type === 'dropdown'">
-						<Combobox
-							class="!w-80"
-							:options="getDropdownOptions(asDropdown(item))"
-							:model-value="getDropdownModelValue(asDropdown(item))"
-							trigger-class="!bg-[var(--color-button-bg)] !rounded-[var(--radius-md)] !shadow-[var(--shadow-inset-sm),0_0_0_0_transparent]"
-							dropdown-class="!rounded-[var(--radius-md)] !bg-[var(--color-button-bg)] !border-0"
-							@update:model-value="(v) => setNodeState(asIdentified(item), v || undefined)"
-						/>
-						<template
-							v-for="child in visibleChildren(asIdentified(item))"
-							:key="`sub-${asIdentified(child).id}`"
-						>
-							<NodeRenderer
-								v-if="
-									getSelectState(asIdentified(item)) === asIdentified(child).id &&
-									getChildren(asIdentified(child)).length
-								"
-								:nodes="getChildren(asIdentified(child))"
-								:show-context="getChildrenContext(asIdentified(child))"
-								:on-image-upload="onImageUpload"
-								:title-depth="titleDepth"
-								:parent-state-path="asIdentified(child)._statePath ?? props.parentStatePath ?? []"
-								class="mt-2"
-							/>
-						</template>
-					</template>
-
-					<!-- button -->
-					<template v-else-if="item.type === 'button'">
-						<Button
-							v-tooltip="getTooltipConfig(item, showContext)"
-							:disabled="!isButtonEnabled(asButton(item))"
-							:aria-label="item._icon && !asButton(item).label ? asButton(item).label : undefined"
-							@click="handleButtonClick(asButton(item))"
-						>
-							<component :is="item._icon" v-if="item._icon" />
-							{{ asButton(item).label }}
-						</Button>
-					</template>
-
-					<!-- toggle -->
-					<template v-else-if="item.type === 'toggle'">
-						<Button
-							v-tooltip="getTooltipConfig(asBool(item))"
-							:type="getBooleanColor(asBool(item)) === 'standard' ? 'base' : 'colored'"
-							:color="
-								getBooleanColor(asBool(item)) === 'standard'
-									? undefined
-									: getBooleanColor(asBool(item))
-							"
-							:disabled="!isEnabled(asIdentified(item))"
-							:aria-label="item._icon ? asLabeled(item).label : undefined"
-							@click="toggleBoolean(asBool(item))"
-						>
-							<component :is="item._icon" v-if="item._icon" />
-							<template v-else>{{ asLabeled(item).label }}</template>
-						</Button>
-					</template>
-
-					<!-- check -->
-					<template v-else-if="item.type === 'check'">
-						<Checkbox
-							:model-value="getBooleanState(asBool(item))"
-							:label="asLabeled(item).label"
-							:disabled="!isEnabled(asIdentified(item))"
-							@update:model-value="isEnabled(asIdentified(item)) && toggleBoolean(asBool(item))"
-						/>
-					</template>
-
-					<!-- text -->
-					<template v-else-if="item.type === 'text'">
-						<StyledInput
-							:id="`node-${asIdentified(item).id}`"
-							:ref="(el: any) => (el ? textInputRefs.set(item, el) : textInputRefs.delete(item))"
-							v-tooltip="getTooltipConfig(item, showContext)"
-							:model-value="getTextState(asIdentified(item))"
-							:placeholder="getPlaceholder(asInput(item))"
-							autocomplete="off"
-							@update:model-value="(v: string) => setTextState(asIdentified(item), v)"
-						/>
-					</template>
-
-					<!-- markdown -->
-					<template v-else-if="item.type === 'markdown'">
-						<MarkdownEditor
-							:id="`node-${asIdentified(item).id}`"
-							:aria-label="asLabeled(item).label || undefined"
-							:model-value="getTextState(asIdentified(item))"
-							:placeholder="getPlaceholder(asInput(item))"
-							:max-height="300"
-							:disabled="false"
-							:heading-buttons="false"
-							:on-image-upload="onImageUpload"
-							@update:model-value="(v: string) => setTextState(asIdentified(item), v)"
-						/>
-					</template>
-				</div>
-			</template>
-		</template>
-
-		<!-- children of active boolean nodes, rendered after all siblings -->
-		<template
-			v-for="(item, idx) in nodes"
-			:key="
-				item instanceof NodeBuilder
-					? item.type === 'button'
-						? `children-button-${asButton(item).label}`
-						: `children-${asIdentified(item)._statePath?.join('/') ?? asIdentified(item).id ?? item.type}`
-					: `children-display-${idx}`
-			"
-		>
-			<NodeRenderer
-				v-if="
-					item instanceof NodeBuilder &&
-					isVisible(item) &&
-					(item.type === 'toggle' || item.type === 'check') &&
-					getBooleanState(asBool(item)) &&
-					getChildren(asIdentified(item)).length
-				"
-				:nodes="getChildren(asIdentified(item))"
-				:show-context="getChildrenContext(asIdentified(item))"
-				:on-image-upload="onImageUpload"
-				:title-depth="item._title !== undefined ? (titleDepth ?? 0) + 1 : titleDepth"
-				:parent-state-path="asIdentified(item)._statePath ?? props.parentStatePath ?? []"
-				class="w-full"
-			/>
-		</template>
-	</div>
-</template>
diff --git a/apps/frontend/src/components/ui/moderation/checklist/checklist-context.ts b/apps/frontend/src/components/ui/moderation/checklist/checklist-context.ts
index e5271651d6..b3d40f8d62 100644
--- a/apps/frontend/src/components/ui/moderation/checklist/checklist-context.ts
+++ b/apps/frontend/src/components/ui/moderation/checklist/checklist-context.ts
@@ -1,11 +1,5 @@
-import type { IdentifiedNodeBuilder, NodeState } from '@modrinth/moderation'
-import type { ComputedRef, InjectionKey, Ref } from 'vue'
-
-export interface ActiveAction {
-	node: IdentifiedNodeBuilder
-	state: Record<string, NodeState>
-	statePath: string[]
-}
+import type { ActiveAction, NodeState } from '@modrinth/moderation/src/types/node'
+import type { InjectionKey, Ref } from 'vue'
 
 export interface LiveNode {
 	isActive: boolean
@@ -17,7 +11,5 @@ export interface LiveNode {
 	activeActions: ActiveAction[]
 }
 
-export const NODE_META_KEY: InjectionKey<ComputedRef<Map<IdentifiedNodeBuilder, LiveNode>>> =
-	Symbol('nodeMeta')
 export const STATE_KEY: InjectionKey<Ref<Record<string, Record<string, NodeState>>>> =
 	Symbol('checklistState')
diff --git a/apps/frontend/src/pages/[type]/[project].vue b/apps/frontend/src/pages/[type]/[project].vue
index fe34c4ec58..551d01233c 100644
--- a/apps/frontend/src/pages/[type]/[project].vue
+++ b/apps/frontend/src/pages/[type]/[project].vue
@@ -573,8 +573,8 @@ import { versionQueryOptions } from '~/composables/queries/version'
 import { useServerInstallContent } from '~/composables/use-server-install-content'
 import { userCollectProject, userFollowProject } from '~/composables/user.js'
 import { injectCurrentProjectId } from '~/providers/current-project.ts'
-import { loadChecklistState } from '~/services/moderation-checklist-storage.ts'
-import { useModerationQueue } from '~/services/moderation-queue.ts'
+import { loadChecklistState } from '~/services/moderation/checklist-storage.ts'
+import { useModerationQueue } from '~/services/moderation/queue.ts'
 import { getReportPath, reportProject } from '~/utils/report-helpers.ts'
 
 definePageMeta({
@@ -1106,7 +1106,7 @@ const { data: thread } = useQuery({
 
 const isSettings = computed(() => route.name.startsWith('type-project-settings'))
 
-// Transform versionsV3 to be same shape as versionsV2 for compatibility in project pages
+// Jank modpack loaders fix
 const versionsRaw = computed(() => {
 	return (versionsV3.value ?? []).map((version) => {
 		const files = Array.isArray(version.files) ? version.files : []
@@ -1893,23 +1893,11 @@ function setModerationChecklistOpen(open) {
 	showModerationChecklist.value = open
 }
 
-function isProjectInActiveModerationQueue(projectId = project.value?.id) {
-	return (
-		!!projectId &&
-		moderationQueue.isQueueMode &&
-		moderationQueue.currentQueue.items.includes(projectId)
-	)
-}
-
 async function openModerationChecklistFromMenu() {
 	const projectId = project.value?.id
 	if (!projectId) return
 
 	await moderationQueue.ready
-	if (!isProjectInActiveModerationQueue(projectId)) {
-		await moderationQueue.setSingleProject(projectId)
-	}
-
 	setModerationChecklistOpen(true)
 }
 
diff --git a/apps/frontend/src/pages/moderation/index.vue b/apps/frontend/src/pages/moderation/index.vue
index a0af2fbbf0..fa6751c742 100644
--- a/apps/frontend/src/pages/moderation/index.vue
+++ b/apps/frontend/src/pages/moderation/index.vue
@@ -108,6 +108,12 @@
 				@switch-page="goToPage"
 			/>
 			<ConfettiExplosion v-if="visible" />
+			<QueueSummaryModal
+				ref="queueSummaryModal"
+				:completed-ids="moderationQueue.currentQueue.completed"
+				:skipped-ids="moderationQueue.currentQueue.skipped"
+				@review-skipped="reviewSkippedQueue"
+			/>
 		</div>
 
 		<div class="flex flex-col gap-3">
@@ -160,8 +166,11 @@ import { useQuery } from '@tanstack/vue-query'
 import ConfettiExplosion from 'vue-confetti-explosion'
 
 import ModerationQueueCard from '~/components/ui/moderation/ModerationQueueCard.vue'
+import QueueSummaryModal from '~/components/ui/moderation/QueueSummaryModal.vue'
 import { type ModerationProject, toModerationProjects } from '~/helpers/moderation.ts'
-import { useModerationQueue } from '~/services/moderation-queue.ts'
+import { getProjectTypeForUrlShorthand } from '~/helpers/projects.js'
+import { useModerationQueue } from '~/services/moderation/queue.ts'
+import { findNextEligibleQueueProject } from '~/services/moderation/queue-eligibility.ts'
 
 useHead({ title: 'Projects queue - Modrinth' })
 
@@ -172,6 +181,8 @@ const route = useRoute()
 const router = useRouter()
 const client = injectModrinthClient()
 
+const queueSummaryModal = ref()
+
 const visible = ref(false)
 if (import.meta.client && history && history.state && history.state.confetti) {
 	setTimeout(async () => {
@@ -184,6 +195,14 @@ if (import.meta.client && history && history.state && history.state.confetti) {
 	}, 1000)
 }
 
+if (import.meta.client && history && history.state && history.state.queueSummary) {
+	setTimeout(async () => {
+		history.state.queueSummary = false
+		await nextTick()
+		queueSummaryModal.value?.show()
+	}, 1000)
+}
+
 const messages = defineMessages({
 	moderate: {
 		id: 'moderation.moderate',
@@ -498,60 +517,36 @@ function goToPage(page: number) {
 	currentPage.value = page
 }
 
-function notifySkippedProjects(skippedCount: number) {
-	if (skippedCount <= 0) return
-	addNotification({
-		title: 'Skipped projects',
-		text: `Skipped ${skippedCount} project(s) already moderated or locked by others.`,
-		type: 'info',
-		autoCloseMs: 2000,
-	})
-}
-
 async function findFirstEligibleProject(): Promise<string | null> {
-	let skippedCount = 0
+	const candidateIds = [...moderationQueue.currentQueue.items]
+	if (candidateIds.length === 0) return null
 
-	while (moderationQueue.hasItems) {
-		const currentId = moderationQueue.getCurrentProjectId()
-		if (!currentId) return null
+	const next = await findNextEligibleQueueProject(client, moderationQueue, candidateIds)
 
-		const project = projectsById.value.get(currentId)
-
-		if (project && project.project.status !== 'processing') {
-			await moderationQueue.completeCurrentProject(currentId, 'skipped')
-			skippedCount++
-			continue
-		}
-
-		try {
-			const lockStatus = await moderationQueue.checkLock(currentId)
-
-			if (!lockStatus.locked || lockStatus.expired || lockStatus.is_own_lock) {
-				notifySkippedProjects(skippedCount)
-				return currentId
-			}
-
-			await moderationQueue.completeCurrentProject(currentId, 'skipped')
-			skippedCount++
-		} catch {
-			return currentId
-		}
+	if (!next) {
+		await Promise.all(candidateIds.map((id) => moderationQueue.excludeProject(id)))
+		return null
 	}
 
-	notifySkippedProjects(skippedCount)
-
-	return null
+	await Promise.all(next.excluded.map((id) => moderationQueue.excludeProject(id)))
+	return next.project
 }
 
 function getProjectRouteParam(projectId: string): string {
 	return projectsById.value.get(projectId)?.project.slug || projectId
 }
 
+function getProjectRouteType(projectId: string): string {
+	const projectType = projectsById.value.get(projectId)?.project.project_types[0]
+	if (!projectType) return 'project'
+	return getProjectTypeForUrlShorthand(projectType, [])
+}
+
 async function navigateToModerationProject(projectId: string) {
 	await navigateTo({
 		name: 'type-project',
 		params: {
-			type: 'project',
+			type: getProjectRouteType(projectId),
 			project: getProjectRouteParam(projectId),
 		},
 		state: {
@@ -593,12 +588,8 @@ async function moderateAllInFilter() {
 async function startFromProject(projectId: string) {
 	const allFilteredProjectIds = await getFilteredProjectIds()
 	const projectIndex = allFilteredProjectIds.indexOf(projectId)
-	if (projectIndex === -1) {
-		await moderationQueue.setSingleProject(projectId)
-	} else {
-		const projectIds = allFilteredProjectIds.slice(projectIndex)
-		await moderationQueue.setQueue(projectIds)
-	}
+	const projectIds = projectIndex === -1 ? [projectId] : allFilteredProjectIds.slice(projectIndex)
+	await moderationQueue.setQueue(projectIds)
 
 	const targetProjectId = await findFirstEligibleProject()
 
@@ -613,4 +604,21 @@ async function startFromProject(projectId: string) {
 
 	await navigateToModerationProject(targetProjectId)
 }
+
+async function reviewSkippedQueue() {
+	await moderationQueue.startSkippedReview()
+
+	const targetProjectId = await findFirstEligibleProject()
+
+	if (!targetProjectId) {
+		addNotification({
+			title: 'No projects available',
+			text: 'All previously skipped projects are already moderated or locked by others.',
+			type: 'warning',
+		})
+		return
+	}
+
+	await navigateToModerationProject(targetProjectId)
+}
 </script>
diff --git a/apps/frontend/src/services/moderation/checklist-session-storage.ts b/apps/frontend/src/services/moderation/checklist-session-storage.ts
new file mode 100644
index 0000000000..5b1c5238be
--- /dev/null
+++ b/apps/frontend/src/services/moderation/checklist-session-storage.ts
@@ -0,0 +1,38 @@
+export interface SessionChecklistState {
+	visitedStages?: string[]
+}
+
+function sessionStorageKey(projectId: string): string {
+	return `moderation-checklist-session:${projectId}`
+}
+
+export function getSessionChecklistState(projectId: string): SessionChecklistState {
+	try {
+		const raw = sessionStorage.getItem(sessionStorageKey(projectId))
+		return raw ? JSON.parse(raw) : {}
+	} catch {
+		return {}
+	}
+}
+
+export function patchSessionChecklistState(
+	projectId: string,
+	patch: Partial<SessionChecklistState>,
+): void {
+	try {
+		sessionStorage.setItem(
+			sessionStorageKey(projectId),
+			JSON.stringify({ ...getSessionChecklistState(projectId), ...patch }),
+		)
+	} catch {
+		// Shush
+	}
+}
+
+export function clearSessionChecklistState(projectId: string): void {
+	try {
+		sessionStorage.removeItem(sessionStorageKey(projectId))
+	} catch {
+		// Shush
+	}
+}
diff --git a/apps/frontend/src/services/moderation-checklist-storage.ts b/apps/frontend/src/services/moderation/checklist-storage.ts
similarity index 95%
rename from apps/frontend/src/services/moderation-checklist-storage.ts
rename to apps/frontend/src/services/moderation/checklist-storage.ts
index 3b4c1b356c..fa5c13d215 100644
--- a/apps/frontend/src/services/moderation-checklist-storage.ts
+++ b/apps/frontend/src/services/moderation/checklist-storage.ts
@@ -1,6 +1,6 @@
-import type { NodeState } from '@modrinth/moderation'
+import type { NodeState } from '@modrinth/moderation/src/types/node'
 
-import { dbDelete, dbGet, dbPut, dbScan } from './moderation-db.ts'
+import { dbDelete, dbGet, dbPut, dbScan } from './db.ts'
 
 export interface PersistedChecklistState {
 	savedAt: string
@@ -9,6 +9,7 @@ export interface PersistedChecklistState {
 	stage?: string
 	message?: string
 	state?: Record<string, Record<string, NodeState>>
+	activatedStages?: string[]
 }
 
 const STORE = 'checklist'
diff --git a/apps/frontend/src/services/moderation-db.ts b/apps/frontend/src/services/moderation/db.ts
similarity index 100%
rename from apps/frontend/src/services/moderation-db.ts
rename to apps/frontend/src/services/moderation/db.ts
diff --git a/apps/frontend/src/services/moderation/queue-eligibility.ts b/apps/frontend/src/services/moderation/queue-eligibility.ts
new file mode 100644
index 0000000000..25da387057
--- /dev/null
+++ b/apps/frontend/src/services/moderation/queue-eligibility.ts
@@ -0,0 +1,91 @@
+import type { AbstractModrinthClient } from '@modrinth/api-client'
+
+import type { ModerationQueueService } from './queue.ts'
+
+export interface QueueCandidateCheck {
+	locked: boolean
+	expired?: boolean
+	isOwnLock?: boolean
+	slug?: string
+	projectType?: string
+	status?: string
+	isProcessing: boolean
+}
+
+export interface EligibleQueueProject {
+	project: string
+	result: QueueCandidateCheck
+	excluded: string[]
+}
+
+const BATCH_SIZE = 5
+
+export function isEligibleQueueCandidate(result: QueueCandidateCheck | undefined): boolean {
+	if (!result?.isProcessing) return false
+	return !result.locked || !!result.expired || !!result.isOwnLock
+}
+
+export async function batchCheckQueueCandidates(
+	client: AbstractModrinthClient,
+	moderationQueue: ModerationQueueService,
+	projectIds: string[],
+): Promise<Map<string, QueueCandidateCheck>> {
+	const results = new Map<string, QueueCandidateCheck>()
+
+	const projects = await client.labrinth.projects_v3.getMultiple(projectIds).catch(() => [])
+	const projectsById = new Map(projects.map((project) => [project.id, project]))
+
+	const checks = await Promise.allSettled(
+		projectIds.map(async (id) => {
+			const lockResponse = await moderationQueue.checkLock(id)
+			const project = projectsById.get(id) ?? null
+
+			return {
+				id,
+				locked: lockResponse.locked,
+				expired: lockResponse.expired,
+				isOwnLock: lockResponse.is_own_lock,
+				slug: project?.slug,
+				projectType: project?.project_types[0],
+				status: project?.status,
+				isProcessing: project === null ? true : project.status === 'processing',
+			}
+		}),
+	)
+
+	checks.forEach((result, index) => {
+		if (result.status === 'fulfilled') {
+			results.set(result.value.id, result.value)
+		} else {
+			results.set(projectIds[index], { locked: false, isProcessing: true })
+		}
+	})
+
+	return results
+}
+
+export async function findNextEligibleQueueProject(
+	client: AbstractModrinthClient,
+	moderationQueue: ModerationQueueService,
+	candidateIds: string[],
+): Promise<EligibleQueueProject | null> {
+	const excluded: string[] = []
+	let checkedCount = 0
+
+	while (checkedCount < candidateIds.length) {
+		const batch = candidateIds.slice(checkedCount, checkedCount + BATCH_SIZE)
+		checkedCount += batch.length
+
+		const results = await batchCheckQueueCandidates(client, moderationQueue, batch)
+
+		for (const id of batch) {
+			const result = results.get(id)
+			if (isEligibleQueueCandidate(result)) {
+				return { project: id, result: result!, excluded: [...excluded] }
+			}
+			excluded.push(id)
+		}
+	}
+
+	return null
+}
diff --git a/apps/frontend/src/services/moderation-queue-storage.ts b/apps/frontend/src/services/moderation/queue-storage.ts
similarity index 87%
rename from apps/frontend/src/services/moderation-queue-storage.ts
rename to apps/frontend/src/services/moderation/queue-storage.ts
index d90ac1121d..22a450a337 100644
--- a/apps/frontend/src/services/moderation-queue-storage.ts
+++ b/apps/frontend/src/services/moderation/queue-storage.ts
@@ -1,13 +1,13 @@
-import { dbDelete, dbGet, dbPut } from './moderation-db.ts'
+import { dbDelete, dbGet, dbPut } from './db.ts'
 
 export interface PersistedModerationQueueState {
 	version: 1
 	savedAt: string
 	currentQueue: {
 		items: string[]
+		skipped?: string[]
 		total: number
-		completed: number
-		skipped: number
+		completed: string[]
 		lastUpdated: string
 	}
 	isQueueMode: boolean
@@ -31,9 +31,9 @@ function isPersistedStateCandidate(value: unknown): value is PersistedModeration
 	const queue = candidate.currentQueue
 	if (!queue || typeof queue !== 'object') return false
 	if (!isStringArray(queue.items)) return false
+	if (queue.skipped !== undefined && !isStringArray(queue.skipped)) return false
 	if (typeof queue.total !== 'number' || Number.isNaN(queue.total)) return false
-	if (typeof queue.completed !== 'number' || Number.isNaN(queue.completed)) return false
-	if (typeof queue.skipped !== 'number' || Number.isNaN(queue.skipped)) return false
+	if (!isStringArray(queue.completed)) return false
 	if (typeof queue.lastUpdated !== 'string') return false
 
 	return true
diff --git a/apps/frontend/src/services/moderation-queue.ts b/apps/frontend/src/services/moderation/queue.ts
similarity index 76%
rename from apps/frontend/src/services/moderation-queue.ts
rename to apps/frontend/src/services/moderation/queue.ts
index 2ebe96e8c6..9c0a45a884 100644
--- a/apps/frontend/src/services/moderation-queue.ts
+++ b/apps/frontend/src/services/moderation/queue.ts
@@ -6,13 +6,13 @@ import {
 	loadQueueState,
 	type PersistedModerationQueueState,
 	saveQueueState,
-} from './moderation-queue-storage.ts'
+} from './queue-storage.ts'
 
 export interface ModerationQueue {
 	items: string[]
+	skipped: string[]
 	total: number
-	completed: number
-	skipped: number
+	completed: string[]
 	lastUpdated: Date
 }
 
@@ -29,11 +29,14 @@ export interface ModerationQueueService {
 
 	queueLength: number
 	hasItems: boolean
+	hasSkipped: boolean
 	progress: number
 
 	setQueue(projectIds: string[]): Promise<void>
-	setSingleProject(projectId: string): Promise<void>
-	completeCurrentProject(projectId: string, status?: 'completed' | 'skipped'): Promise<boolean>
+	completeProject(projectId: string): Promise<boolean>
+	deferProject(projectId: string): Promise<boolean>
+	excludeProject(projectId: string): Promise<boolean>
+	startSkippedReview(): Promise<void>
 	getCurrentProjectId(): string | null
 	resetQueue(): Promise<void>
 
@@ -46,31 +49,31 @@ export interface ModerationQueueService {
 
 const EMPTY_QUEUE: ModerationQueue = {
 	items: [],
+	skipped: [],
 	total: 0,
-	completed: 0,
-	skipped: 0,
+	completed: [],
 	lastUpdated: new Date(),
 }
 
 function createEmptyQueue(): ModerationQueue {
-	return { ...EMPTY_QUEUE, lastUpdated: new Date(), items: [] }
+	return { ...EMPTY_QUEUE, lastUpdated: new Date(), items: [], skipped: [], completed: [] }
 }
 
 function sanitizeQueue(raw: PersistedModerationQueueState['currentQueue']): ModerationQueue {
 	const lastUpdated = new Date(raw.lastUpdated)
 	const items = raw.items.filter((id): id is string => typeof id === 'string')
-	const completed = Number.isFinite(raw.completed) ? Math.max(Math.trunc(raw.completed), 0) : 0
-	const skipped = Number.isFinite(raw.skipped) ? Math.max(Math.trunc(raw.skipped), 0) : 0
-	const minimumTotal = items.length + completed + skipped
+	const skipped = (raw.skipped ?? []).filter((id): id is string => typeof id === 'string')
+	const completed = (raw.completed ?? []).filter((id): id is string => typeof id === 'string')
+	const minimumTotal = items.length + completed.length
 	const total = Number.isFinite(raw.total)
 		? Math.max(Math.trunc(raw.total), minimumTotal)
 		: minimumTotal
 
 	return {
 		items,
+		skipped,
 		total,
 		completed,
-		skipped,
 		lastUpdated: Number.isNaN(lastUpdated.getTime()) ? new Date() : lastUpdated,
 	}
 }
@@ -84,9 +87,9 @@ function persistedPayload(
 		savedAt: new Date().toISOString(),
 		currentQueue: {
 			items: [...queue.items],
+			skipped: [...queue.skipped],
 			total: queue.total,
-			completed: queue.completed,
-			skipped: queue.skipped,
+			completed: [...queue.completed],
 			lastUpdated: queue.lastUpdated.toISOString(),
 		},
 		isQueueMode,
@@ -101,9 +104,10 @@ function createModerationQueueState(client: AbstractModrinthClient = injectModri
 
 	const queueLength = computed(() => currentQueue.value.items.length)
 	const hasItems = computed(() => currentQueue.value.items.length > 0)
+	const hasSkipped = computed(() => currentQueue.value.skipped.length > 0)
 	const progress = computed(() => {
 		if (currentQueue.value.total === 0) return 0
-		return (currentQueue.value.completed + currentQueue.value.skipped) / currentQueue.value.total
+		return (currentQueue.value.total - currentQueue.value.items.length) / currentQueue.value.total
 	})
 	let mutationChain = Promise.resolve()
 
@@ -148,42 +152,41 @@ function createModerationQueueState(client: AbstractModrinthClient = injectModri
 		return result
 	}
 
-	function setQueueState(items: string[], mode: boolean) {
-		isQueueMode.value = mode
+	function setQueueState(items: string[]) {
+		isQueueMode.value = true
 		currentQueue.value = {
 			items: [...items],
+			skipped: [],
 			total: items.length,
-			completed: 0,
-			skipped: 0,
+			completed: [],
 			lastUpdated: new Date(),
 		}
 	}
 
 	async function setQueue(projectIds: string[]): Promise<void> {
 		await withMutation(() => {
-			setQueueState(projectIds, true)
+			setQueueState(projectIds)
 		})
 	}
 
-	async function setSingleProject(projectId: string): Promise<void> {
-		await withMutation(() => {
-			setQueueState([projectId], false)
-		})
-	}
-
-	async function completeCurrentProject(
-		projectId: string,
-		status: 'completed' | 'skipped' = 'completed',
-	): Promise<boolean> {
+	async function completeProject(projectId: string): Promise<boolean> {
 		return withMutation(() => {
 			if (!currentQueue.value.items.includes(projectId)) {
 				return currentQueue.value.items.length > 0
 			}
 
-			if (status === 'completed') {
-				currentQueue.value.completed++
-			} else {
-				currentQueue.value.skipped++
+			currentQueue.value.completed = [...currentQueue.value.completed, projectId]
+			currentQueue.value.items = currentQueue.value.items.filter((id) => id !== projectId)
+			currentQueue.value.lastUpdated = new Date()
+
+			return currentQueue.value.items.length > 0
+		})
+	}
+
+	async function excludeProject(projectId: string): Promise<boolean> {
+		return withMutation(() => {
+			if (!currentQueue.value.items.includes(projectId)) {
+				return currentQueue.value.items.length > 0
 			}
 
 			currentQueue.value.items = currentQueue.value.items.filter((id) => id !== projectId)
@@ -193,6 +196,26 @@ function createModerationQueueState(client: AbstractModrinthClient = injectModri
 		})
 	}
 
+	async function deferProject(projectId: string): Promise<boolean> {
+		return withMutation(() => {
+			if (!currentQueue.value.items.includes(projectId)) {
+				return currentQueue.value.items.length > 0
+			}
+
+			currentQueue.value.items = currentQueue.value.items.filter((id) => id !== projectId)
+			currentQueue.value.skipped = [...currentQueue.value.skipped, projectId]
+			currentQueue.value.lastUpdated = new Date()
+
+			return currentQueue.value.items.length > 0
+		})
+	}
+
+	async function startSkippedReview(): Promise<void> {
+		await withMutation(() => {
+			setQueueState(currentQueue.value.skipped)
+		})
+	}
+
 	function getCurrentProjectId(): string | null {
 		return currentQueue.value.items[0] || null
 	}
@@ -294,11 +317,14 @@ function createModerationQueueState(client: AbstractModrinthClient = injectModri
 
 		queueLength,
 		hasItems,
+		hasSkipped,
 		progress,
 
 		setQueue,
-		setSingleProject,
-		completeCurrentProject,
+		completeProject,
+		deferProject,
+		excludeProject,
+		startSkippedReview,
 		getCurrentProjectId,
 		resetQueue,
 
diff --git a/apps/frontend/src/store/moderation.ts b/apps/frontend/src/store/moderation.ts
index d9ac077d57..d488524b7f 100644
--- a/apps/frontend/src/store/moderation.ts
+++ b/apps/frontend/src/store/moderation.ts
@@ -4,8 +4,8 @@ import type {
 	LockStatusResponse,
 	ModerationQueue,
 	ModerationQueueService,
-} from '~/services/moderation-queue.ts'
-import { useModerationQueue } from '~/services/moderation-queue.ts'
+} from '~/services/moderation/queue.ts'
+import { useModerationQueue } from '~/services/moderation/queue.ts'
 
 export type {
 	LockAcquireResponse,
diff --git a/packages/assets/generated-icons.ts b/packages/assets/generated-icons.ts
index 0b524d52ad..0038e7d6cf 100644
--- a/packages/assets/generated-icons.ts
+++ b/packages/assets/generated-icons.ts
@@ -182,6 +182,7 @@ import _LogInIcon from './icons/log-in.svg?component'
 import _LogOutIcon from './icons/log-out.svg?component'
 import _MailIcon from './icons/mail.svg?component'
 import _ManageIcon from './icons/manage.svg?component'
+import _MapPinIcon from './icons/map-pin.svg?component'
 import _MaximizeIcon from './icons/maximize.svg?component'
 import _MemoryStickIcon from './icons/memory-stick.svg?component'
 import _MessageIcon from './icons/message.svg?component'
@@ -614,6 +615,7 @@ export const LogInIcon = _LogInIcon
 export const LogOutIcon = _LogOutIcon
 export const MailIcon = _MailIcon
 export const ManageIcon = _ManageIcon
+export const MapPinIcon = _MapPinIcon
 export const MaximizeIcon = _MaximizeIcon
 export const MemoryStickIcon = _MemoryStickIcon
 export const MessageIcon = _MessageIcon
diff --git a/packages/assets/icons/map-pin.svg b/packages/assets/icons/map-pin.svg
new file mode 100644
index 0000000000..40c440cd95
--- /dev/null
+++ b/packages/assets/icons/map-pin.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-map-pin-icon lucide-map-pin"><path d="M20 10c0 4.993-5.539 10.193-7.399 11.799a1 1 0 0 1-1.202 0C9.539 20.193 4 14.993 4 10a8 8 0 0 1 16 0"/><circle cx="12" cy="10" r="3"/></svg>
\ No newline at end of file
diff --git a/packages/moderation/.prettierignore b/packages/moderation/.prettierignore
index 754475f4e8..e4a11a1c2f 100644
--- a/packages/moderation/.prettierignore
+++ b/packages/moderation/.prettierignore
@@ -1 +1,2 @@
 src/locales/**
+src/types/node/pipe.ts
diff --git a/packages/moderation/package.json b/packages/moderation/package.json
index c037661678..5409c54d5e 100644
--- a/packages/moderation/package.json
+++ b/packages/moderation/package.json
@@ -18,6 +18,7 @@
 	"devDependencies": {
 		"@formatjs/cli": "^6.2.12",
 		"@modrinth/tooling-config": "workspace:*",
-		"@modrinth/ui": "workspace:*"
+		"@modrinth/ui": "workspace:*",
+		"typescript": "^5.4.5"
 	}
 }
diff --git a/packages/moderation/src/data/checklist.ts b/packages/moderation/src/data/checklist.ts
index 4e5383715c..929552718f 100644
--- a/packages/moderation/src/data/checklist.ts
+++ b/packages/moderation/src/data/checklist.ts
@@ -1,8 +1,6 @@
 import type { Ref } from 'vue'
-import { provide, ref } from 'vue'
 
-import type { NodeState, StageFn, StageNodeBuilder } from '../types/node'
-import { group, STAGES_KEY } from '../types/node'
+import type { NodeState, StageNode } from '../types/node'
 import useCategoriesStage from './stages/categories'
 import useDescriptionStage from './stages/description'
 import useGalleryStage from './stages/gallery'
@@ -13,7 +11,7 @@ import usePermissionsStage from './stages/permissions'
 import usePostApprovalStage from './stages/post-approval'
 import useReReviewStage from './stages/re-review'
 import useReuploadsStage from './stages/reupload'
-import useOtherRulesStage from './stages/other-rules'
+import useRulesStage from './stages/rules'
 import useStatusAlertsStage from './stages/status-alerts'
 import useSummaryStage from './stages/summary'
 import useTitleSlugStage from './stages/title-slug'
@@ -22,8 +20,8 @@ import useVersionsStage from './stages/versions'
 
 export function useStages(
 	globalState: Ref<Record<string, Record<string, NodeState>>>,
-): StageNodeBuilder[] {
-	const mainStages: StageNodeBuilder[] = [
+): StageNode[] {
+	const mainStages: StageNode[] = [
 		usePostApprovalStage(),
 		useUndefinedProjectStage(),
 		useReReviewStage(),
@@ -38,12 +36,7 @@ export function useStages(
 		useVersionsStage(),
 		useReuploadsStage(),
 		usePermissionsStage(),
-		useOtherRulesStage(),
+		useRulesStage(),
 	]
-	provide(STAGES_KEY, ref(mainStages))
 	return [...mainStages, useStatusAlertsStage(mainStages, globalState)]
 }
-
-export const stages: ReadonlyArray<StageFn> = []
-
-export default group()
diff --git a/packages/moderation/src/data/keybinds.ts b/packages/moderation/src/data/keybinds.ts
index d4eb0fab10..d6f7813b49 100644
--- a/packages/moderation/src/data/keybinds.ts
+++ b/packages/moderation/src/data/keybinds.ts
@@ -1,6 +1,7 @@
-import type { KeybindListener } from '../types/keybinds'
 import type { Labrinth } from '@modrinth/api-client'
 
+import type { KeybindListener } from '../types/keybinds'
+
 const copyProjectLink = async (
 	project: Labrinth.Projects.v2.Project,
 	permalink: boolean,
@@ -32,7 +33,6 @@ const keybinds: { [id: string]: KeybindListener } = {
 		keybind: 'ArrowRight',
 		description: 'Go to next stage',
 		scope: 'checklist',
-		enabled: (ctx) => !ctx.state.isDone,
 		action: (ctx) => ctx.actions.tryGoNext(),
 	},
 	'previous-stage': {
diff --git a/packages/moderation/src/data/messages/checklist/messages/description/insufficient/header.md b/packages/moderation/src/data/messages/checklist/messages/description/insufficient/header.md
index 4e4934805a..68f69b9e31 100644
--- a/packages/moderation/src/data/messages/checklist/messages/description/insufficient/header.md
+++ b/packages/moderation/src/data/messages/checklist/messages/description/insufficient/header.md
@@ -2,5 +2,3 @@
 
 Per section 2.1 of %RULES%, your %PROJECT_DESCRIPTION_FLINK% should clearly inform the reader of the content, purpose, and appeal of your %PROJECT_TYPE%.</br>
 Currently, it looks like there are some missing details.
-
-%CUSTOM_ADVICE%
diff --git a/packages/moderation/src/data/messages/checklist/messages/metadata/dependencies.md b/packages/moderation/src/data/messages/checklist/messages/metadata/dependencies.md
new file mode 100644
index 0000000000..8498e5c58b
--- /dev/null
+++ b/packages/moderation/src/data/messages/checklist/messages/metadata/dependencies.md
@@ -0,0 +1,4 @@
+## Missing Dependencies
+
+Per section 5.6 of %RULES%, it is important that relevant dependencies be listed in the dependencies section of your project.  
+Please ensure that all relevant dependencies are included in the Dependencies section of each version of your project.
diff --git a/packages/moderation/src/data/messages/checklist/messages/metadata/game-version/correction.md b/packages/moderation/src/data/messages/checklist/messages/metadata/game-version/correction.md
new file mode 100644
index 0000000000..a6a6a128d6
--- /dev/null
+++ b/packages/moderation/src/data/messages/checklist/messages/metadata/game-version/correction.md
@@ -0,0 +1 @@
+This project should have the following game version(s) selected: %GAME_VERSIONS%.
diff --git a/packages/moderation/src/data/messages/checklist/messages/metadata/game-version/inaccurate.md b/packages/moderation/src/data/messages/checklist/messages/metadata/game-version/inaccurate.md
new file mode 100644
index 0000000000..b2d18df43a
--- /dev/null
+++ b/packages/moderation/src/data/messages/checklist/messages/metadata/game-version/inaccurate.md
@@ -0,0 +1,5 @@
+## Game Version Metadata
+
+Per section 5.1 of %RULES%, it is important that the metadata of your project is accurate, including which Minecraft versions are selected.
+
+%CORRECT%
diff --git a/packages/moderation/src/data/messages/checklist/messages/metadata/loader/correction.md b/packages/moderation/src/data/messages/checklist/messages/metadata/loader/correction.md
new file mode 100644
index 0000000000..321e8f36aa
--- /dev/null
+++ b/packages/moderation/src/data/messages/checklist/messages/metadata/loader/correction.md
@@ -0,0 +1 @@
+This project should have the following loader(s) selected: %LOADERS%.
diff --git a/packages/moderation/src/data/messages/checklist/messages/metadata/loader/inaccurate.md b/packages/moderation/src/data/messages/checklist/messages/metadata/loader/inaccurate.md
new file mode 100644
index 0000000000..a1cf5e0f98
--- /dev/null
+++ b/packages/moderation/src/data/messages/checklist/messages/metadata/loader/inaccurate.md
@@ -0,0 +1,5 @@
+## Loader Metadata
+
+Per section 5.1 of %RULES%, it is important that the metadata of your project is accurate, including which loaders are selected.
+
+%CORRECT%
diff --git a/packages/moderation/src/data/nags/links.ts b/packages/moderation/src/data/nags/links.ts
index a6df4d51f4..e83557824a 100644
--- a/packages/moderation/src/data/nags/links.ts
+++ b/packages/moderation/src/data/nags/links.ts
@@ -1,8 +1,7 @@
 import { defineMessage, formatProjectTypeSentence, useVIntl } from '@modrinth/ui'
 
 import type { Nag, NagContext } from '../../types/nags'
-import { licenseRequiresSource, licensesRequiringSource, notSourceAsDistributed } from '../../utils'
-import license from '../stages/license'
+import { licenseRequiresSource, notSourceAsDistributed } from '../../utils'
 
 export const commonLinkDomains = {
 	source: [
diff --git a/packages/moderation/src/data/priorities.ts b/packages/moderation/src/data/priorities.ts
index 6aea35ea99..0df99942ee 100644
--- a/packages/moderation/src/data/priorities.ts
+++ b/packages/moderation/src/data/priorities.ts
@@ -8,4 +8,5 @@ export const Priorities = new (class extends Priority {
 	rejected = this.before()
 	withheld = this.before()
 	note = this.after()
+	tempLast = this.after()
 })()
diff --git a/packages/moderation/src/data/stages/categories.tsx b/packages/moderation/src/data/stages/categories.tsx
index ea2154dbb8..46768def6f 100644
--- a/packages/moderation/src/data/stages/categories.tsx
+++ b/packages/moderation/src/data/stages/categories.tsx
@@ -36,7 +36,7 @@ export default function () {
 			),
 
 			group().children(
-				toggle('inaccurate', 'Inaccurate').suggestedStatus('flagged').severity('low').message(),
+				toggle('inaccurate', 'Inaccurate').suggestedStatus('flagged').message(),
 
 				toggle('optimization-misused', 'Optimization')
 					.shown(
@@ -47,7 +47,6 @@ export default function () {
 						),
 					)
 					.suggestedStatus('flagged')
-					.severity('low')
 					.rawMessage(optimizationMsg)
 					.fix(
 						fix().project((patch) => {
@@ -61,7 +60,6 @@ export default function () {
 				toggle('resolutions-misused', 'Resolutions')
 					.shown(computed(() => project.value.project_types.includes('resourcepack')))
 					.suggestedStatus('flagged')
-					.severity('low')
 					.rawMessage(resolutionsMsg)
 					.fix(
 						fix().project((patch) => {
diff --git a/packages/moderation/src/data/stages/description.tsx b/packages/moderation/src/data/stages/description.tsx
index 3ca0cb1694..87ab2cf33e 100644
--- a/packages/moderation/src/data/stages/description.tsx
+++ b/packages/moderation/src/data/stages/description.tsx
@@ -15,24 +15,23 @@ export default function () {
 			'https://www.notion.so/2e15ee711bf080e4a41df61bbab49892#2e15ee711bf080508042e70089dd787e',
 		)
 		.icon(LibraryIcon)
-		.navigate('/')
+		.navigate()
 		.children(
 			group()
 				.title('Description Issues?')
 				.children(
 					toggle('insufficient', 'Insufficient')
 						.suggestedStatus('flagged')
-						.severity('medium')
-						.message('insufficient/header', (s) => ({ CUSTOM_ADVICE: s.custom?.explainer }))
+						.message('insufficient/header')
 						.children(
 							group()
 								.title('Why is this Description Insufficient?')
-								.multiSelect('reason')
 								.children(
 									toggle('custom', 'Custom').children(
 										markdown('explainer')
 											.title('How can the author improve their description?')
-											.required(),
+											.required()
+											.rawMessage((state) => `${state.value}\n\n`),
 									),
 									toggle('fork', 'Fork').message('piece/fork'),
 									toggle('unfinished', 'Unfinished').message('piece/unfinished'),
@@ -44,15 +43,13 @@ export default function () {
 								`insufficient/default/${project.value?.minecraft_java_server ? 'servers' : project.value?.project_types?.includes('modpack') ? 'packs' : 'projects'}`,
 						)
 						.rawMessage(async (state) => {
-							const reasons = state?.reason instanceof Set ? state.reason : new Set<string>()
-							return SHOW_SPOILER_ADVICE.some((reason) => reasons.has(reason))
+							return SHOW_SPOILER_ADVICE.some((reason) => state?.[reason] === true)
 								? await md('checklist/messages/description/insufficient/piece/spoiler-guide')(state)
 								: ''
 						}),
 
 					toggle('non-english', 'Non-english')
 						.suggestedStatus('flagged')
-						.severity('medium')
 						.message(() => `non-english${project.value.minecraft_java_server ? '-server' : ''}`)
 						.shown(
 							computed(() => {
@@ -63,25 +60,13 @@ export default function () {
 							}),
 						),
 
-					toggle('headers-as-body', 'Headers as body text')
-						.suggestedStatus('flagged')
-						.severity('low')
-						.message(),
+					toggle('headers-as-body', 'Headers as body text').suggestedStatus('flagged').message(),
 
-					toggle('image-only', 'Image-only')
-						.suggestedStatus('flagged')
-						.severity('medium')
-						.message(),
+					toggle('image-only', 'Image-only').suggestedStatus('flagged').message(),
 
-					toggle('non-standard-text', 'Non-standard text')
-						.suggestedStatus('flagged')
-						.severity('medium')
-						.message(),
+					toggle('non-standard-text', 'Non-standard text').suggestedStatus('flagged').message(),
 
-					toggle('clarity', 'Unclear / Misleading')
-						.suggestedStatus('rejected')
-						.severity('high')
-						.message(),
+					toggle('clarity', 'Unclear / Misleading').suggestedStatus('rejected').message(),
 				),
 		)
 }
diff --git a/packages/moderation/src/data/stages/gallery.tsx b/packages/moderation/src/data/stages/gallery.tsx
index 2bfe4b1ca8..b2c86ab592 100644
--- a/packages/moderation/src/data/stages/gallery.tsx
+++ b/packages/moderation/src/data/stages/gallery.tsx
@@ -16,18 +16,14 @@ export default function () {
 		.navigate('/gallery')
 		.children(
 			group().children(
-				toggle('insufficient', 'Insufficient').suggestedStatus('flagged').severity('low').message(),
+				toggle('insufficient', 'Insufficient').suggestedStatus('flagged').message(),
 
 				toggle('not-relevant', 'Not relevant')
 					.shown(computed(() => project.value.gallery.length > 0))
 					.suggestedStatus('flagged')
-					.severity('low')
 					.message(),
 
-				toggle('showcase-clarity', 'Showcase Clarity')
-					.suggestedStatus('rejected')
-					.severity('high')
-					.message(),
+				toggle('showcase-clarity', 'Showcase Clarity').suggestedStatus('rejected').message(),
 			),
 		)
 }
diff --git a/packages/moderation/src/data/stages/license.tsx b/packages/moderation/src/data/stages/license.tsx
index e595507dc6..3f4dc243b8 100644
--- a/packages/moderation/src/data/stages/license.tsx
+++ b/packages/moderation/src/data/stages/license.tsx
@@ -53,7 +53,6 @@ export default function () {
 				toggle('invalid-link', 'Invalid Link')
 					.shown(computed(() => !!project.value.license?.url))
 					.suggestedStatus('flagged')
-					.severity('medium')
 					.message()
 					.children(check('custom-license', 'Invalid Link: Custom License').message())
 					.collect(),
@@ -61,12 +60,11 @@ export default function () {
 				toggle('no-source', 'No Source')
 					.shown(needSource)
 					.suggestedStatus('rejected')
-					.severity('medium')
 					.rawMessage(async (state) => {
 						if (state.fork) return noSourceForkMsg(state)
 						return noSourceMsg(state)
 					})
-					.children(check('fork', 'No Source: Fork').severity('high')),
+					.children(check('fork', 'No Source: Fork')),
 			),
 		)
 }
diff --git a/packages/moderation/src/data/stages/links.tsx b/packages/moderation/src/data/stages/links.tsx
index 5110950ad8..0b480b6d40 100644
--- a/packages/moderation/src/data/stages/links.tsx
+++ b/packages/moderation/src/data/stages/links.tsx
@@ -3,15 +3,15 @@ import { injectProjectPageContext } from '@modrinth/ui'
 import type { Ref } from 'vue'
 import { computed } from 'vue'
 
-import { group, md, mdOptional, stage, toggle } from '../../types/node'
-import type { ChildEntry, GroupNodeBuilder } from '../../types/node'
 import { promptSourceRequired } from '../..'
+import type { ChildEntry, GroupNode } from '../../types/node'
+import { group, md, mdOptional, stage, toggle } from '../../types/node'
 
 export default function () {
 	const { projectV3: project } = injectProjectPageContext()
 	const linkNames: Record<string, string> = {}
 
-	type LinkSectionBuilder = GroupNodeBuilder & {
+	type LinkSectionBuilder = GroupNode & {
 		children(...extras: ChildEntry[]): LinkSectionBuilder
 		label(badge: Ref<boolean>): LinkSectionBuilder
 	}
@@ -75,7 +75,6 @@ export default function () {
 		.navigate('/settings/links')
 		.shown(computed(() => Object.keys(project.value.link_urls).length > 0))
 		.suggestedStatus('flagged')
-		.severity('low')
 		.rawMessage(async (state) => {
 			const sections = Object.entries(state).filter(
 				([, s]) => s && typeof s === 'object' && !(s instanceof Set),
diff --git a/packages/moderation/src/data/stages/metadata.tsx b/packages/moderation/src/data/stages/metadata.tsx
index 4aeda58cbf..9817081489 100644
--- a/packages/moderation/src/data/stages/metadata.tsx
+++ b/packages/moderation/src/data/stages/metadata.tsx
@@ -3,7 +3,16 @@ import { DatabaseIcon } from '@modrinth/assets'
 import { ENVIRONMENTS_COPY, injectProjectPageContext, injectTags } from '@modrinth/ui'
 import { computed } from 'vue'
 
-import { dropdown, fix, group, md, option, stage, toggle } from '../../types/node'
+import {
+	appComponent as _appComponent,
+	dropdown,
+	fix,
+	group,
+	md,
+	option,
+	stage,
+	toggle,
+} from '../../types/node'
 import { requiresEnvironmentInfo } from '../../utils'
 
 const loaderLabels: Record<string, string> = {
@@ -13,7 +22,7 @@ const loaderLabels: Record<string, string> = {
 	resourcepack: 'Resource Pack',
 }
 
-function formatLoaderLabel(id: string): string {
+function _formatLoaderLabel(id: string): string {
 	return (
 		loaderLabels[id] ??
 		id
@@ -25,7 +34,11 @@ function formatLoaderLabel(id: string): string {
 
 export default function () {
 	const { projectV3: project } = injectProjectPageContext()
-	const { loaders } = injectTags()
+	const { loaders: _loaders, gameVersions: _gameVersions } = injectTags()
+
+	const _currentGameVersions = computed(
+		() => (project.value.game_versions as string[] | undefined) ?? [],
+	)
 
 	return (
 		stage('metadata', 'Metadata')
@@ -64,7 +77,6 @@ export default function () {
 					toggle('environment', 'Environment')
 						.shown(computed(() => requiresEnvironmentInfo(project.value.project_types)))
 						.suggestedStatus('flagged')
-						.severity('low')
 						.rawMessage(async (state) => {
 							const correctEnvironment = state?.['correct-environment'] as string | undefined
 
@@ -94,7 +106,7 @@ export default function () {
 								.title('Correct Environment')
 								.children(
 									dropdown('correct-environment')
-										.children(
+										.options(
 											...(Object.keys(ENVIRONMENTS_COPY) as Labrinth.Projects.v3.Environment[])
 												.filter((id) => id !== 'unknown')
 												.map((id) => option(id, ENVIRONMENTS_COPY[id].title.defaultMessage ?? id)),
@@ -103,67 +115,96 @@ export default function () {
 										.none('Unknown'),
 								),
 						),
-					// TODO: chyz, fix pls (make into single set of buttons where current loaders start selected and non current start non selected
-					//					toggle('loader', `Loader${project.value.loaders.length > 1 ? 's' : ''}`).children(
-					//						group()
-					//							.title('Loader Issues?')
-					//							.action(
-					//								action()
-					//									.suggestedStatus('flagged')
-					//									.severity('medium')
-					//									.message(async (state) => {
-					//										//TODO: chyz
-					//										//TODO: coolbot this one is a bit of a doozy
-					//										const header = await md('checklist/messages/metadata/loader/incorrect')(state)
-					//										const selected = state.loaders
-					//										if (selected instanceof Set && selected.size > 0) {
-					//											const list = [...selected]
-					//												.map((id) => `- ${formatLoaderLabel(id)}`)
-					//												.join('\n')
-					//											return `${header}\n${list}`
-					//										}
-					//										return header
-					//									}),
-					//							)
-					//							.children(
-					//								toggle('incorrect', 'Incorrect').children(
-					//									group()
-					//										.title('Incorrect Loaders')
-					//										.multiSelect('loaders')
-					//										.children(
-					//											...project.value.loaders.map((id) => option(id, formatLoaderLabel(id))),
-					//										),
-					//								),
-					// TODO: chyz, this should be the same interface as incorrect, as a corrections scheme, with selected loaders default on.
-					//								toggle('missing', 'Missing').children(
-					//									group()
-					//										.title('Missing Loaders')
-					//										.multiSelect('loaders')
-					//										.children(
-					//											...(() => {
-					//												//TODO: chyz maybe this can be done better
-					//												// (plugin loaders and datapack are marked as valid for mods which makes this suck)
-					//												const existingTypes = new Set(
-					//													loaders.value
-					//														.filter((l) => project.value.loaders.includes(l.name))
-					//														.flatMap((l) => l.supported_project_types),
-					//												)
-					//												const referenceTypes =
-					//													existingTypes.size > 0
-					//														? existingTypes
-					//														: new Set(project.value.project_types)
-					//												return loaders.value
-					//													.filter(
-					//														(loader) =>
-					//															loader.supported_project_types.every((t) => referenceTypes.has(t)) &&
-					//															!project.value.loaders.includes(loader.name),
-					//													)
-					//													.map((loader) => option(loader.name, formatLoaderLabel(loader.name)))
-					//											})(),
-					//									)/
-					// ),
-					//							),
-					//					),
+
+					toggle('dependencies', 'Dependencies').suggestedStatus('flagged').message(),
+
+					// toggle('loader', 'Loaders (WIP)')
+					// 	.suggestedStatus('flagged')
+					// 	.rawMessage(async (state) => {
+					// 		const selected =
+					// 			state.loaders instanceof Set ? state.loaders : new Set(project.value.loaders)
+					// 		const current = new Set(project.value.loaders)
+					// 		const isCorrected =
+					// 			selected.size !== current.size || [...selected].some((id) => !current.has(id))
+					//
+					// 		let correct = ''
+					// 		if (isCorrected) {
+					// 			const list = [...selected].map((id) => formatLoaderLabel(id)).join(', ')
+					// 			correct = await md('checklist/messages/metadata/loader/correction', () => ({
+					// 				LOADERS: list || 'none',
+					// 			}))(state)
+					// 		}
+					//
+					// 		return md('checklist/messages/metadata/loader/inaccurate', () => ({
+					// 			CORRECT: correct,
+					// 		}))(state)
+					// 	})
+					// 	.fix(
+					// 		fix().project((patch, state) => {
+					// 			const selected =
+					// 				state.loaders instanceof Set ? state.loaders : new Set(project.value.loaders)
+					// 			const next = [...selected]
+					// 			const current = project.value.loaders
+					// 			if (next.length === current.length && next.every((id) => current.includes(id)))
+					// 				return
+					// 			patch.loaders = next
+					// 		}),
+					// 	)
+					// 	.children(
+					// 		appComponent('loaders', 'loader-picker')
+					// 			.valueKind('set')
+					// 			.initial(() => new Set(project.value.loaders))
+					// 			.props((ctx) => ({
+					// 				loaders: loaders.value,
+					// 				toggleLoader: ctx.toggleSetValue,
+					// 			})),
+					// 	),
+					//
+					// toggle('game-version', 'Game Versions (WIP)')
+					// 	.suggestedStatus('flagged')
+					// 	.rawMessage(async (state) => {
+					// 		const selected =
+					// 			state['game-versions'] instanceof Set
+					// 				? state['game-versions']
+					// 				: new Set(currentGameVersions.value)
+					// 		const current = new Set(currentGameVersions.value)
+					// 		const isCorrected =
+					// 			selected.size !== current.size || [...selected].some((id) => !current.has(id))
+					//
+					// 		let correct = ''
+					// 		if (isCorrected) {
+					// 			const list = [...selected].join(', ')
+					// 			correct = await md('checklist/messages/metadata/game-version/correction', () => ({
+					// 				GAME_VERSIONS: list || 'none',
+					// 			}))(state)
+					// 		}
+					//
+					// 		return md('checklist/messages/metadata/game-version/inaccurate', () => ({
+					// 			CORRECT: correct,
+					// 		}))(state)
+					// 	})
+					// 	.fix(
+					// 		fix().project((patch, state) => {
+					// 			const selected =
+					// 				state['game-versions'] instanceof Set
+					// 					? state['game-versions']
+					// 					: new Set(currentGameVersions.value)
+					// 			const next = [...selected]
+					// 			const current = currentGameVersions.value
+					// 			if (next.length === current.length && next.every((id) => current.includes(id)))
+					// 				return
+					// 			patch.game_versions = next
+					// 		}),
+					// 	)
+					// 	.children(
+					// 		appComponent('game-versions', 'game-version-picker')
+					// 			.valueKind('set')
+					// 			.initial(() => new Set(currentGameVersions.value))
+					// 			.props(() => ({
+					// 				gameVersions: gameVersions.value,
+					// 				noHeader: true,
+					// 			})),
+					// 	),
 				),
 			)
 	)
diff --git a/packages/moderation/src/data/stages/permissions.tsx b/packages/moderation/src/data/stages/permissions.tsx
index 4baad99d57..45d5ba3889 100644
--- a/packages/moderation/src/data/stages/permissions.tsx
+++ b/packages/moderation/src/data/stages/permissions.tsx
@@ -1,11 +1,30 @@
+import type { Labrinth } from '@modrinth/api-client'
 import { SignatureIcon } from '@modrinth/assets'
-import { injectProjectPageContext } from '@modrinth/ui'
+import { injectModrinthClient, injectProjectPageContext } from '@modrinth/ui'
+import { useQuery } from '@tanstack/vue-query'
 import { computed } from 'vue'
 
 import { group, stage, toggle } from '../../types/node'
 
+function isResolved(attributionGroup: Labrinth.Attribution.Internal.AttributionGroup): boolean {
+	const attribution = attributionGroup.attribution
+	if (!attribution) return false
+	if (attribution.kind === 'globally_allowed') return true
+	return attribution.moderation_status?.kind === 'approved'
+}
+
 export default function () {
 	const { projectV3: project } = injectProjectPageContext()
+	const { labrinth } = injectModrinthClient()
+
+	const { data: attributionData } = useQuery({
+		queryKey: ['project-attribution', project.value.id],
+		queryFn: () => labrinth.attribution_internal.listProjectAttribution(project.value.id),
+	})
+
+	const unresolvedCount = computed(
+		() => (attributionData.value ?? []).filter((g) => !isResolved(g)).length,
+	)
 
 	return stage('permissions', 'Modpack Permissions')
 		.hint("Does this project's external content have any issues?")
@@ -16,30 +35,24 @@ export default function () {
 			computed(
 				() =>
 					(project.value.project_types?.includes('modpack') ?? false) &&
-					!project.value.minecraft_server,
+					!project.value.minecraft_server &&
+					unresolvedCount.value > 0,
 			),
 		)
+		.sticky()
 		.children(
 			group().children(
-				toggle('invalid-permissions', 'Invalid permissions')
-					.suggestedStatus('rejected')
-					.severity('high')
-					.message(),
+				toggle('invalid-permissions', 'Invalid permissions').suggestedStatus('rejected').message(),
 
 				toggle('prohibited-external-content', 'Prohibited externals')
 					.suggestedStatus('rejected')
-					.severity('high')
 					.message(),
 
-				toggle('missing-permissions', 'Missing permissions')
-					.suggestedStatus('rejected')
-					.severity('high')
-					.message(),
+				toggle('missing-permissions', 'Missing permissions').suggestedStatus('rejected').message(),
 
 				toggle('non-commercial-external-content', 'Non-commercial externals')
 					.shown(computed(() => project.value.monetization_status === 'monetized'))
 					.suggestedStatus('rejected')
-					.severity('high')
 					.message(),
 			),
 		)
diff --git a/packages/moderation/src/data/stages/post-approval.tsx b/packages/moderation/src/data/stages/post-approval.tsx
index 7ed9d3ecc4..170adecf78 100644
--- a/packages/moderation/src/data/stages/post-approval.tsx
+++ b/packages/moderation/src/data/stages/post-approval.tsx
@@ -3,6 +3,7 @@ import { injectProjectPageContext } from '@modrinth/ui'
 import { computed } from 'vue'
 
 import { group, stage, text, toggle } from '../../types/node'
+import { Priorities } from '../priorities.ts'
 
 //TODO chyz
 //TODO coolbot needs discussion
@@ -20,15 +21,15 @@ export default function () {
 			group().children(
 				toggle('issue-warning', 'Issue warning')
 					.suggestedStatus('approved')
-					.severity('low')
-					.message(),
+					.message()
+					.priority(Priorities.tempLast),
 
 				toggle('missed-deadline', 'Missed due date')
 					.suggestedStatus('flagged')
-					.severity('high')
-					.message(undefined, (state) => ({
+					.message((state) => ({
 						STATUS: state.status,
 					}))
+					.priority(Priorities.tempLast)
 					.children(
 						//TODO: chyz this shouldn't need to be provided by moderator
 						text('status').title('What status is the project being set to?').required(),
@@ -36,35 +37,31 @@ export default function () {
 
 				toggle('metadata-issue', 'Incorrect metadata')
 					.suggestedStatus('approved')
-					.severity('low')
 					.message()
 					.children(
 						toggle('dependencies', 'Missing Dependencies')
-							.severity('low')
-							.message(undefined, (state) => ({
-								DEPENDENCY_NAME: state['dependency-name'],
-								DEPENDENCY_LINK: state['dependency-link'],
+							.message((state) => ({
+								DEPENDENCY_NAME: state['name'],
+								DEPENDENCY_LINK: state['link'],
 							}))
 							.children(
-								text('dependency-name').title('Dependency name').required(),
-								text('dependency-link').title('Dependency link').required(),
+								text('name').title('Dependency name').required(),
+								text('link').title('Dependency link').required(),
 							),
 
 						toggle('mc-versions', 'Game versions')
-							.severity('low')
-							.message(undefined, (state) => ({
+							.message((state) => ({
 								SPECIFICS: state.specifics,
 							}))
 							.children(text('specifics').title('More details about the game versions issue?')),
 
 						toggle('loaders', 'Loaders')
-							.severity('low')
-							.message(undefined, (state) => ({
+							.message((state) => ({
 								SPECIFICS: state.specifics,
 							}))
 							.children(text('specifics').title('More details about the loaders issue?')),
 
-						toggle('license', 'Inconsistent Licensing').severity('low').message(),
+						toggle('license', 'Inconsistent Licensing').message(),
 					)
 					.collect(),
 			),
diff --git a/packages/moderation/src/data/stages/re-review.tsx b/packages/moderation/src/data/stages/re-review.tsx
index 0d1fd7d00e..0a9d0a4479 100644
--- a/packages/moderation/src/data/stages/re-review.tsx
+++ b/packages/moderation/src/data/stages/re-review.tsx
@@ -32,13 +32,9 @@ export default function () {
 			group().children(
 				toggle('ignored', 'Yes')
 					.suggestedStatus('flagged')
-					.severity('medium')
 					.message()
 					.children(
-						toggle('warning', 'Multiple times in a row')
-							.suggestedStatus('rejected')
-							.severity('high')
-							.message(),
+						toggle('warning', 'Multiple times in a row').suggestedStatus('rejected').message(),
 					)
 					.collect(),
 			),
diff --git a/packages/moderation/src/data/stages/reupload.tsx b/packages/moderation/src/data/stages/reupload.tsx
index aa7906e97e..002f284072 100644
--- a/packages/moderation/src/data/stages/reupload.tsx
+++ b/packages/moderation/src/data/stages/reupload.tsx
@@ -20,14 +20,13 @@ export default function () {
 			'https://www.notion.so/2e15ee711bf080e4a41df61bbab49892#2e35ee711bf080d1a0a2cda3ff2ce997',
 		)
 		.icon(CopyrightIcon)
-		.navigate('/')
+		.navigate()
 		.children(
 			group().children(
 				toggle('reupload', 'Re-upload')
 					.shown(computed(() => !project.value.minecraft_server))
 					.suggestedStatus('rejected')
-					.severity('high')
-					.message(undefined, (state) => ({
+					.message((state) => ({
 						ORIGINAL_PROJECT: state['original-project'],
 						ORIGINAL_AUTHOR: state['original-author'],
 					}))
@@ -39,25 +38,19 @@ export default function () {
 				toggle('unclear-fork', 'Unclear Fork')
 					.shown(computed(() => !project.value.minecraft_server))
 					.suggestedStatus('rejected')
-					.severity('high')
 					.message(),
 
 				toggle('insufficient-fork', 'Insufficient Fork')
 					.shown(computed(() => !project.value.minecraft_server))
 					.suggestedStatus('rejected')
-					.severity('high')
 					.message(),
 
-				toggle('request-proof', 'Proof of permissions')
-					.suggestedStatus('rejected')
-					.severity('high')
-					.message(),
+				toggle('request-proof', 'Proof of permissions').suggestedStatus('rejected').message(),
 
 				toggle('identity-verification', 'Verify Identity')
 					.shown(computed(() => !project.value.minecraft_server))
 					.suggestedStatus('rejected')
-					.severity('high')
-					.message(undefined, (state) => ({
+					.message((state) => ({
 						PLATFORM: state.platform,
 					}))
 					.children(text('platform').title('Where else can the project be found?').required()),
@@ -65,8 +58,7 @@ export default function () {
 				toggle('identity-verification-server', 'Verify Identity')
 					.shown(computed(() => !!project.value.minecraft_server))
 					.suggestedStatus('rejected')
-					.severity('high')
-					.message(undefined, (state) => ({
+					.message((state) => ({
 						CONTACT: state.contact,
 					}))
 					.children(text('contact').title('Known public contact method').required()),
@@ -74,17 +66,15 @@ export default function () {
 				toggle('request-proof-server', 'Reuploaded pack')
 					.shown(isServerModpack)
 					.suggestedStatus('rejected')
-					.severity('high')
 					.message(),
 
 				toggle('custom-pack-verification', 'Override verification')
 					.shown(isServerModpack)
 					.suggestedStatus('rejected')
-					.severity('high')
 					.message()
 					.children(
 						check('list', 'List overrides?')
-							.message(undefined, (state) => ({
+							.message((state) => ({
 								OVERRIDES: state.overrides,
 							}))
 							.children(markdown('overrides').title('Add list of overrides.')),
@@ -94,8 +84,7 @@ export default function () {
 				toggle('custom-pack-prohibited', 'Forbidden Overrides')
 					.shown(isServerModpack)
 					.suggestedStatus('rejected')
-					.severity('high')
-					.message(undefined, (state) => ({
+					.message((state) => ({
 						OVERRIDES: state.overrides,
 					}))
 					.children(markdown('overrides').title('Forbidden overrides list').required()),
diff --git a/packages/moderation/src/data/stages/other-rules.tsx b/packages/moderation/src/data/stages/rules.tsx
similarity index 50%
rename from packages/moderation/src/data/stages/other-rules.tsx
rename to packages/moderation/src/data/stages/rules.tsx
index 484d158c86..75f2de6a7b 100644
--- a/packages/moderation/src/data/stages/other-rules.tsx
+++ b/packages/moderation/src/data/stages/rules.tsx
@@ -2,9 +2,8 @@ import { ListBulletedIcon } from '@modrinth/assets'
 import { injectProjectPageContext } from '@modrinth/ui'
 import { computed } from 'vue'
 
-import { group, markdown, option, stage, toggle } from '../../types/node'
+import { group, markdown, stage, toggle } from '../../types/node'
 
-//TODO: coolbot have fun :3
 export default function () {
 	const { projectV3: project } = injectProjectPageContext()
 
@@ -20,61 +19,49 @@ export default function () {
 				toggle('paid-access-server', 'Paid access server')
 					.shown(computed(() => !!project.value.minecraft_server))
 					.suggestedStatus('rejected')
-					.severity('critical')
 					.message(),
 
-				// TODO: chyz, the lists built by these message have empty line gaps.
 				toggle('prohibited-content', 'Prohibited Content')
 					.suggestedStatus('rejected')
-					.severity('critical')
 					.message('prohibited-content-header')
 					.collect()
 					.children(
 						group()
-							.multiSelect('options')
 							.title('Which Prohibited Content rules does this project violate?')
 							.children(
-								option('objectionable', 'Objectionable').message(),
-								option('discriminatory', 'Discriminatory or Explicit').message(),
-								option('ip-infringement', 'IP Infringement').message(),
-								option('legal-rights', 'Rights Violation').message(),
-								option('illegal-activity', 'Illegal Activity').message(),
-								option('harmful', 'Harmful or Deceptive').message(),
-								option('misleading', 'Misleading claims').message(),
-								option('impersonation', 'Impersonation').message(),
-								option('false-endorsement', 'False Endorsement').message(),
-								option('profanity', 'Profanity').message(),
-								option('undisclosed-upload', 'Undisclosed Data Upload').message(),
-								option('mojang-bypass', 'Mojang Bypass').message(),
+								toggle('objectionable', 'Objectionable').message(),
+								toggle('discriminatory', 'Discriminatory or Explicit').message(),
+								toggle('ip-infringement', 'IP Infringement').message(),
+								toggle('legal-rights', 'Rights Violation').message(),
+								toggle('illegal-activity', 'Illegal Activity').message(),
+								toggle('harmful', 'Harmful or Deceptive').message(),
+								toggle('misleading', 'Misleading claims').message(),
+								toggle('impersonation', 'Impersonation').message(),
+								toggle('false-endorsement', 'False Endorsement').message(),
+								toggle('profanity', 'Profanity').message(),
+								toggle('undisclosed-upload', 'Undisclosed Data Upload').message(),
+								toggle('mojang-bypass', 'Mojang Bypass').message(),
 							),
 					),
 
-				toggle('cheat-or-hack-advertising', 'Hacks')
-					.suggestedStatus('rejected')
-					.severity('critical')
-					.message(),
+				toggle('cheat-or-hack-advertising', 'Hacks').suggestedStatus('rejected').message(),
 
-				toggle('server-side-opt-out', 'Opt-out')
-					.suggestedStatus('flagged')
-					.severity('high')
-					.message(),
+				toggle('server-side-opt-out', 'Opt-out').suggestedStatus('flagged').message(),
 
 				toggle('server-side-opt-in', 'Opt-in')
 					.suggestedStatus('flagged')
-					.severity('high')
 					.message('server-side-opt-in-header')
 					.collect()
 					.children(
 						group()
-							.multiSelect('options')
 							.title('Which features require a Server-side Opt-in?')
 							.children(
-								option('x-ray', 'X-ray').message(),
-								option('aim-bot', 'Aim Assist').message(),
-								option('movement', 'Movement').message(),
-								option('pvp', 'PvP').message(),
-								option('hiding-mods', 'Anti 3.x').message(),
-								option('item-duplication', 'Dupe').message(),
+								toggle('x-ray', 'X-ray').message(),
+								toggle('aim-bot', 'Aim Assist').message(),
+								toggle('movement', 'Movement').message(),
+								toggle('pvp', 'PvP').message(),
+								toggle('hiding-mods', 'Anti 3.x').message(),
+								toggle('item-duplication', 'Dupe').message(),
 							),
 					),
 
@@ -88,14 +75,11 @@ export default function () {
 						),
 					)
 					.suggestedStatus('flagged')
-					.severity('low')
 					.message(),
 
 				toggle('rule-breaking-other', 'Other')
-					// TODO: chyz, the required asterisk is on a separate line
 					.suggestedStatus('rejected')
-					.severity('critical')
-					.message(undefined, (state) => ({ MESSAGE: state.message }))
+					.message((state) => ({ MESSAGE: state.message }))
 					.children(
 						markdown('message').title('Explain how it infringes on content rules.').required(),
 					),
diff --git a/packages/moderation/src/data/stages/status-alerts.tsx b/packages/moderation/src/data/stages/status-alerts.tsx
index af957987c6..2c61a176cc 100644
--- a/packages/moderation/src/data/stages/status-alerts.tsx
+++ b/packages/moderation/src/data/stages/status-alerts.tsx
@@ -3,9 +3,9 @@ import { injectProjectPageContext } from '@modrinth/ui'
 import type { Ref } from 'vue'
 import { computed } from 'vue'
 
-import type { NodeState, StageNodeBuilder } from '../../types/node'
+import type { AnyNode, ChildNode, NodeState, StageNode } from '../../types/node'
 import {
-	NodeBuilder,
+	externalGroup,
 	getBooleanChildState,
 	group,
 	isNodeActive,
@@ -18,7 +18,7 @@ import {
 import { Priorities } from '../priorities.ts'
 
 export default function (
-	mainStages: StageNodeBuilder[],
+	mainStages: StageNode[],
 	globalState: Ref<Record<string, Record<string, NodeState>>>,
 ) {
 	const { projectV3: project } = injectProjectPageContext()
@@ -47,23 +47,26 @@ export default function (
 					.priority(Priorities.alerts)
 					.applyFixes()
 					.children(
-						computed<NodeBuilder | null>(() => {
-							const fixNodes: NodeBuilder[] = []
+						computed<AnyNode | null>(() => {
+							const fixGroups: ChildNode[] = []
 							walkNodes(
 								[group().children(...mainStages)],
 								(globalState.value ?? {}) as unknown as Record<string, NodeState>,
-								(node, nodeState) => {
-									if (!node._fixes.length) return
+								(node, nodeState, _localState, path) => {
+									if (!('_fixes' in node) || !(node as { _fixes: unknown[] })._fixes.length) return
 									if (!isNodeActive(node, nodeState)) return
-									const childState = getBooleanChildState(nodeState)
-									fixNodes.push(
-										...resolveChildren(node, childState).filter(
-											(c): c is NodeBuilder => c instanceof NodeBuilder,
-										),
+									const children = resolveChildren(
+										node as never,
+										getBooleanChildState(nodeState),
+									).filter(
+										(c): c is Exclude<ChildNode, string | (() => unknown)> =>
+											typeof c === 'object' && c !== null,
 									)
+									if (children.length === 0) return
+									fixGroups.push(externalGroup(path).children(...children))
 								},
 							)
-							return fixNodes.length > 0 ? group().children(...fixNodes) : null
+							return fixGroups.length > 0 ? group().children(...fixGroups) : null
 						}),
 					),
 
diff --git a/packages/moderation/src/data/stages/summary.tsx b/packages/moderation/src/data/stages/summary.tsx
index 050c7451c8..44b156b807 100644
--- a/packages/moderation/src/data/stages/summary.tsx
+++ b/packages/moderation/src/data/stages/summary.tsx
@@ -31,20 +31,17 @@ export default function () {
 					toggle('insufficient', 'Insufficient')
 						.enabled((state) => !state['repeat-title'])
 						.suggestedStatus('flagged')
-						.severity('low')
 						.message(),
 
 					toggle('repeat-title', 'Repeat of Title')
 						.enabled((state) => !state.insufficient)
 						.suggestedStatus('flagged')
-						.severity('low')
 						.message(),
 
-					toggle('formatting', 'Formatting').suggestedStatus('flagged').severity('low').message(),
+					toggle('formatting', 'Formatting').suggestedStatus('flagged').message(),
 
 					toggle('non-english', 'Non-english')
 						.suggestedStatus('flagged')
-						.severity('medium')
 						.message()
 						.shown(
 							computed(() => {
@@ -62,7 +59,6 @@ export default function () {
 					toggle('repeat-ip', 'Repeat of IP')
 						.shown(computed(() => !!project.value?.minecraft_server))
 						.suggestedStatus('flagged')
-						.severity('medium')
 						.message(),
 				),
 		)
diff --git a/packages/moderation/src/data/stages/title-slug.tsx b/packages/moderation/src/data/stages/title-slug.tsx
index 8844416aa9..3a021fa7f5 100644
--- a/packages/moderation/src/data/stages/title-slug.tsx
+++ b/packages/moderation/src/data/stages/title-slug.tsx
@@ -5,18 +5,23 @@ import {
 	TagCategoryRefreshCcwIcon,
 	TagCategoryWandSparklesIcon,
 	UserPlusIcon,
+	WrenchIcon,
 } from '@modrinth/assets'
-import { Alert, injectModrinthClient, injectProjectPageContext } from '@modrinth/ui'
+import {
+	Alert,
+	injectModrinthClient,
+	injectProjectPageContext,
+	ProjectStatusLink,
+} from '@modrinth/ui'
 import { useQueryClient } from '@tanstack/vue-query'
 import { computed, ref, watch } from 'vue'
 
-import { md, type NodeState } from '../../types/node'
-import { button, fix, group, option, stage, text, toggle } from '../../types/node'
+import { check, fix, group, md, stage, text, toggle } from '../../types/node'
 
 const STALE_TIME = 1000 * 60 * 5
 
 type AutoSlugStatus = 'loading' | 'available' | 'unavailable'
-type SlugValidation = 'checking' | 'available' | 'unchanged' | 'taken' | null
+type SlugValidation = 'checking' | 'available' | 'unchanged' | 'taken' | 'empty' | 'invalid' | null
 
 //TODO: make this not a copy of frontend/src/utils/slugs.generateUrlSlug
 // (as in move the other one so we can use it here)
@@ -46,12 +51,6 @@ export default function () {
 	const slugValidation = ref<SlugValidation>(null)
 	let slugDebounceTimer: ReturnType<typeof setTimeout> | undefined
 
-	function currentSlug(state: Record<string, NodeState>) {
-		return (
-			(state['correct-slug'] as string | undefined) ?? resolvedAutoSlug.value ?? project.value.slug
-		)
-	}
-
 	async function checkSlugTaken(slug: string): Promise<Labrinth.Projects.v3.Project | null> {
 		try {
 			return await queryClient.fetchQuery({
@@ -66,8 +65,13 @@ export default function () {
 	}
 
 	const SlugStatus = () => {
-		const v = slugValidation.value
-		if (v === null) return null
+		const v =
+			slugValidation.value ??
+			(autoSlugStatus.value === 'loading'
+				? 'checking'
+				: autoSlugStatus.value === 'unavailable'
+					? 'taken'
+					: 'available')
 		if (v === 'checking')
 			return (
 				<Alert type="checking" class="w-full">
@@ -86,19 +90,25 @@ export default function () {
 					Slug is available
 				</Alert>
 			)
+		if (v === 'empty')
+			return (
+				<Alert type="error" class="w-full">
+					Slug cannot be empty
+				</Alert>
+			)
+		if (v === 'invalid')
+			return (
+				<Alert type="error" class="w-full">
+					Invalid Slug
+				</Alert>
+			)
 		const by = correctSlugConflict.value
 		return (
 			<Alert type="error" class="w-full">
-				Slug taken
-				{by ? (
-					<>
-						{' by '}
-						<a href={`/project/${by.slug}`} target="_blank" class="underline">
-							{by.name}
-						</a>
-						{` (${by.status})`}
-					</>
-				) : null}
+				<div class="flex flex-wrap items-center gap-1.5">
+					Slug taken
+					{by ? <ProjectStatusLink project={by} newTab /> : null}
+				</div>
 			</Alert>
 		)
 	}
@@ -157,7 +167,9 @@ export default function () {
 						return
 					}
 				}
-			} catch {}
+			} catch {
+				// fall through to 'unavailable' below
+			}
 
 			autoSlugStatus.value = 'unavailable'
 		},
@@ -190,12 +202,7 @@ export default function () {
 						{autoSlugStatus.value === 'loading' ? (
 							'...'
 						) : by ? (
-							<>
-								<a href={`/project/${by.slug}`} target="_blank" class="underline">
-									{by.name}
-								</a>
-								{` (${by.status})`}
-							</>
+							<ProjectStatusLink project={by} newTab />
 						) : (
 							'No'
 						)}
@@ -206,30 +213,22 @@ export default function () {
 			group('title')
 				.title('Title Issues?')
 				.children(
-					toggle('useless-info', 'Contains Useless Info')
-						.suggestedStatus('flagged')
-						.severity('low')
-						.message(),
+					toggle('useless-info', 'Contains Useless Info').suggestedStatus('flagged').message(),
 
-					toggle('minecraft-branding', 'Minecraft Title')
-						.suggestedStatus('flagged')
-						.severity('medium')
-						.message(),
+					toggle('minecraft-branding', 'Minecraft Title').suggestedStatus('flagged').message(),
 
 					toggle('similarities', 'Title Similarities')
 						.suggestedStatus('flagged')
-						.severity('medium')
 						.message()
 						.children(
 							group()
 								.title('Similarities Additional Info')
-								.multiSelect('options')
 								.children(
-									option('modpack', 'Modpack Named After Mod')
+									check('modpack', 'Modpack Named After Mod')
 										.shown(computed(() => project.value.project_types.includes('modpack')))
 										.message(),
 
-									option('fork', 'Forked Project')
+									check('fork', 'Forked Project')
 										.shown(computed(() => !project.value?.minecraft_server))
 										.message(),
 								),
@@ -241,100 +240,76 @@ export default function () {
 				.title('Slug Issues')
 				.shown(computed(() => hasCustomSlug(project.value)))
 				.children(
-					group()
-						.multiSelect('issues')
-						.children(
-							toggle('misused', 'Misused')
-								.children(
-									group()
-										.title('Correct Slug')
-										.children(
-											text('correct-slug')
-												.initial(() => resolvedAutoSlug.value ?? project.value.slug)
-												.onChange((value, { override }) => {
-													if (!value) return override(project.value.slug ?? '')
-													clearTimeout(slugDebounceTimer)
-													if (value === project.value.slug) {
-														slugValidation.value = 'unchanged'
-														return
+					group().children(
+						toggle('misused', 'Misused')
+							.children(
+								group()
+									.title('Correct Slug')
+									.children(
+										text('correct-slug')
+											.initial(() => resolvedAutoSlug.value ?? project.value.slug ?? '')
+											.onChange((value) => {
+												clearTimeout(slugDebounceTimer)
+												if (value === project.value.slug) {
+													slugValidation.value = 'unchanged'
+													return
+												}
+												if (!value) {
+													slugValidation.value = 'empty'
+													correctSlugConflict.value = null
+													return
+												}
+												if (generateUrlSlug(value) !== value) {
+													slugValidation.value = 'invalid'
+													correctSlugConflict.value = null
+													return
+												}
+												slugValidation.value = 'checking'
+												slugDebounceTimer = setTimeout(async () => {
+													const conflict = await checkSlugTaken(value).catch(() => null)
+													if (conflict !== null && conflict.id !== project.value.id) {
+														correctSlugConflict.value = conflict
+														slugValidation.value = 'taken'
+													} else {
+														correctSlugConflict.value = null
+														slugValidation.value = 'available'
 													}
-													slugValidation.value = 'checking'
-													slugDebounceTimer = setTimeout(async () => {
-														const conflict = await checkSlugTaken(value).catch(() => null)
-														if (conflict !== null && conflict.id !== project.value.id) {
-															correctSlugConflict.value = conflict
-															slugValidation.value = 'taken'
-														} else {
-															correctSlugConflict.value = null
-															slugValidation.value = 'available'
-														}
-													}, 400)
-												}),
+												}, 400)
+											})
+											.tweak(TagCategoryWandSparklesIcon, () =>
+												autoSlugStatus.value === 'available' ? resolvedAutoSlug.value : null,
+											)
+											.tweak(UserPlusIcon, (current) =>
+												ownerUsername.value && !current?.includes(ownerUsername.value)
+													? `${current}-${ownerUsername.value}`
+													: null,
+											)
+											.tweak(WrenchIcon, (current) => generateUrlSlug(current ?? ''))
+											.tweak(TagCategoryRefreshCcwIcon, () => project.value.slug),
 
-											button()
-												.icon(TagCategoryWandSparklesIcon)
-												.tooltip(computed(() => resolvedAutoSlug.value ?? ''))
-												.enabled(
-													(state) =>
-														autoSlugStatus.value === 'available' &&
-														resolvedAutoSlug.value !== null &&
-														resolvedAutoSlug.value !== currentSlug(state),
-												)
-												.onClick((state) => {
-													if (resolvedAutoSlug.value) state['correct-slug'] = resolvedAutoSlug.value
-												}),
-
-											button()
-												.icon(UserPlusIcon)
-												.tooltip((state) => {
-													const current = currentSlug(state)
-													if (!ownerUsername.value || current?.includes(ownerUsername.value))
-														return current ?? ''
-													return `${current}-${ownerUsername.value}`
-												})
-												.enabled(
-													(state) =>
-														ownerUsername.value !== null &&
-														!currentSlug(state)?.includes(ownerUsername.value),
-												)
-												.onClick((state) => {
-													state['correct-slug'] = `${currentSlug(state)}-${ownerUsername.value}`
-												}),
-
-											button()
-												.icon(TagCategoryRefreshCcwIcon)
-												.tooltip(computed(() => project.value.slug ?? ''))
-												.enabled((state) => currentSlug(state) !== project.value.slug)
-												.onClick((state) => {
-													state['correct-slug'] = project.value.slug
-												}),
-
-											SlugStatus,
-										),
-								)
-								.rawMessage(async (state) => {
-									let correct = ''
-									if (slugValidation.value === 'available') {
-										const slug = state['correct-slug'] as string | undefined
-										if (slug)
-											correct = await md('checklist/messages/title-slug/slug/correction', () => ({
-												SUGGESTED_SLUG: slug,
-											}))(state)
-									}
-									return md('checklist/messages/title-slug/slug/misused', () => ({
-										CORRECT: correct,
-									}))(state)
-								})
-								.fix(
-									//TODO chyz think of some way to have initial values actually be reflected in state without having to store them
-									fix().project((patch, state) => {
-										const slug =
-											(state['correct-slug'] as string | undefined) ?? resolvedAutoSlug.value
-										if (!slug || slug === project.value.slug) return
-										patch.slug = slug
-									}),
-								),
-						),
+										SlugStatus,
+									),
+							)
+							.rawMessage(async (state) => {
+								let correct = ''
+								if (slugValidation.value === 'available') {
+									const slug = state['correct-slug'] as string | undefined
+									if (slug)
+										correct = await md('checklist/messages/title-slug/slug/correction', () => ({
+											SUGGESTED_SLUG: slug,
+										}))(state)
+								}
+								return md('checklist/messages/title-slug/slug/misused', () => ({
+									CORRECT: correct,
+								}))(state)
+							})
+							.fix(
+								fix().project((patch, state) => {
+									if (slugValidation.value !== 'available') return
+									patch.slug = state['correct-slug'] as string
+								}),
+							),
+					),
 				),
 		)
 }
diff --git a/packages/moderation/src/data/stages/versions.tsx b/packages/moderation/src/data/stages/versions.tsx
index 3e18ded1f5..656a0a8771 100644
--- a/packages/moderation/src/data/stages/versions.tsx
+++ b/packages/moderation/src/data/stages/versions.tsx
@@ -19,38 +19,31 @@ export default function () {
 			group().children(
 				toggle('incorrect-additional-files', 'Incorrect additional files')
 					.suggestedStatus('flagged')
-					.severity('medium')
 					.message(),
 
 				toggle('incorrect-project-type', 'Incorrect Project Type')
 					.suggestedStatus('rejected')
-					.severity('medium')
 					.children(
 						dropdown('type')
 							.title('Correct Project Type')
+							.required()
 							.none('Unknown')
-							.children(
-								option('modpack', 'Modpack')
-									.shown(computed(() => !project.value.project_types.includes('modpack')))
-									.message(),
-								option('resourcepack', 'Resource Pack')
-									.shown(computed(() => !project.value.project_types.includes('resourcepack')))
-									.message(),
-								option('datapack', 'Data Pack')
-									.shown(computed(() => !project.value.loaders.includes('datapack')))
-									.message(),
+							.options(
+								option('modpack', 'Modpack').message(),
+								option('resourcepack', 'Resource Pack').message(),
+								option('datapack', 'Data Pack').message(),
 							),
 					)
 					.collect(),
 
 				toggle('alternate-versions', 'Alternate Versions')
 					.suggestedStatus('rejected')
-					.severity('high')
 					.children(
 						dropdown('distribution')
 							.title('Distribution Type')
+							.required()
 							.none('Unknown')
-							.children(
+							.options(
 								option('primary', 'Primary Files').message(),
 								option('additional', 'Additional Files').message(),
 								option('mono', 'Monofile')
@@ -78,7 +71,6 @@ export default function () {
 				toggle('vanilla-assets', 'Vanilla Assets')
 					.shown(computed(() => project.value.project_types.includes('resourcepack')))
 					.suggestedStatus('rejected')
-					.severity('medium')
 					.message(),
 
 				toggle('redist-libs', 'Packed Libs')
@@ -90,18 +82,15 @@ export default function () {
 						),
 					)
 					.suggestedStatus('rejected')
-					.severity('medium')
 					.message(),
 
 				toggle('duplicate-primary-files', 'Duplicate Primary Files')
 					.suggestedStatus('flagged')
-					.severity('medium')
 					.message(),
 
 				toggle('unsupported', 'Unsupported')
 					.suggestedStatus('rejected')
-					.severity('medium')
-					.message(undefined, (state) => ({
+					.message((state) => ({
 						INVALID_TYPE: state['invalid-type'],
 					}))
 					.children(text('invalid-type').title('Unsupported Type').required()),
diff --git a/packages/moderation/src/handles/keybinds.ts b/packages/moderation/src/handles/keybinds.ts
index 12a9fae7f3..69439715a9 100644
--- a/packages/moderation/src/handles/keybinds.ts
+++ b/packages/moderation/src/handles/keybinds.ts
@@ -1,3 +1,4 @@
+import keybinds from '../data/keybinds.ts'
 import {
 	type KeybindDefinition,
 	type KeybindListener,
@@ -5,7 +6,6 @@ import {
 	type ModerationContext,
 	normalizeKeybind,
 } from '../types/keybinds.ts'
-import keybinds from '../data/keybinds.ts'
 
 function normalizeKeybinds(
 	keybind: KeybindDefinition | KeybindDefinition[] | string | string[],
@@ -58,6 +58,9 @@ export class Keybinds {
 				continue
 			}
 
+			// The scope check above guarantees ctx matches keybind's expected context shape,
+			// but TS can't correlate that narrowing across these two independently-typed variables.
+			// eslint-disable-next-line @typescript-eslint/no-explicit-any
 			if (keybind.enabled && !keybind.enabled(ctx as any)) {
 				continue
 			}
@@ -66,6 +69,7 @@ export class Keybinds {
 			const matches = definitions.some((def) => matchesKeybind(event, def))
 
 			if (matches) {
+				// eslint-disable-next-line @typescript-eslint/no-explicit-any
 				keybind.action(ctx as any)
 
 				const shouldPrevent = definitions.some((def) => def.preventDefault !== false)
diff --git a/packages/moderation/src/handles/settings.ts b/packages/moderation/src/handles/settings.ts
index 8b48c79ddb..35105e37a8 100644
--- a/packages/moderation/src/handles/settings.ts
+++ b/packages/moderation/src/handles/settings.ts
@@ -1,12 +1,12 @@
-import { isValidFor, type SettingDefinitionBase } from '../types/settings.ts'
 import { moderationSettings } from '../index.ts'
+import { isValidFor, type SettingDefinitionBase } from '../types/settings.ts'
 
 export class Settings {
-	private readonly settings: { [id: string]: any }
+	private readonly settings: { [id: string]: unknown }
 	private readonly onChange: () => void
 
 	constructor(
-		settings: { [id: string]: any } | undefined = undefined,
+		settings: { [id: string]: unknown } | undefined = undefined,
 		onChange: () => void = () => {},
 	) {
 		this.settings = settings || {}
@@ -16,11 +16,15 @@ export class Settings {
 	get<T>(definition: SettingDefinitionBase<T>): T {
 		const value = this.settings[definition.id]
 
-		return (isValidFor(definition, value) ? value : undefined) ?? definition.default
+		return (
+			(isValidFor(definition as SettingDefinitionBase<unknown>, value)
+				? (value as T)
+				: undefined) ?? definition.default
+		)
 	}
 
 	set<T>(definition: SettingDefinitionBase<T>, value?: T): void {
-		const previous = this.settings[definition.id] ?? definition.default
+		const previous = (this.settings[definition.id] as T | undefined) ?? definition.default
 		this.settings[definition.id] = value
 		definition.onChange?.(previous, value ?? definition.default)
 		this.onChange()
diff --git a/packages/moderation/src/index.ts b/packages/moderation/src/index.ts
index 95d7944884..08861dbf4c 100644
--- a/packages/moderation/src/index.ts
+++ b/packages/moderation/src/index.ts
@@ -1,6 +1,5 @@
-export { default as checklist, stages, useStages } from './data/checklist'
+export { useStages } from './data/checklist'
 export { default as keybinds } from './data/keybinds'
-export { default as moderationSettings } from './data/settings'
 export { default as nags } from './data/nags'
 export * from './data/nags/index'
 export { default as attributionQuickReplies } from './data/quick-replies/permissions-quick-replies'
@@ -9,17 +8,14 @@ export {
 	type TechReviewContext,
 	default as techReviewQuickReplies,
 } from './data/quick-replies/tech-review-quick-replies'
+export { default as moderationSettings } from './data/settings'
+export * from './handles/keybinds'
+export * from './handles/settings'
 export * from './locales'
-export * from './types/actions'
 export * from './types/keybinds'
-export * from './types/settings'
-export * from './types/messages'
 export * from './types/nags'
-export * from './types/node'
 export * from './types/priority'
 export * from './types/quick-reply'
 export * from './types/reports'
-export * from './types/stage'
+export * from './types/settings'
 export * from './utils'
-export * from './handles/keybinds'
-export * from './handles/settings'
diff --git a/packages/moderation/src/types/actions.ts b/packages/moderation/src/types/actions.ts
deleted file mode 100644
index 3332dabc61..0000000000
--- a/packages/moderation/src/types/actions.ts
+++ /dev/null
@@ -1,298 +0,0 @@
-import type { Labrinth } from '@modrinth/api-client'
-
-import type { WeightedMessage } from './messages'
-
-export type ActionType =
-	| 'button'
-	| 'dropdown'
-	| 'multi-select-chips'
-	| 'toggle'
-	| 'conditional-button'
-
-export type Action =
-	| ButtonAction
-	| DropdownAction
-	| MultiSelectChipsAction
-	| ToggleAction
-	| ConditionalButtonAction
-
-export type ModerationStatus = 'approved' | 'rejected' | 'flagged'
-export type ModerationSeverity = 'low' | 'medium' | 'high' | 'critical'
-
-export interface ChecklistActionContext {
-	project: Labrinth.Projects.v2.Project
-	projectV3: Labrinth.Projects.v3.Project
-	versions?: Labrinth.Versions.v2.Version[] | null
-}
-
-export interface BaseAction {
-	/**
-	 * The type of action, which determines how the action is presented to the moderator and what it does.
-	 */
-	type: ActionType
-
-	/**
-	 * Any additional text data that is required to complete the action.
-	 */
-	relevantExtraInput?: AdditionalTextInput[]
-
-	/**
-	 * Suggested moderation status when this action is selected.
-	 */
-	suggestedStatus?: ModerationStatus
-
-	/**
-	 * Suggested severity level for this moderation action.
-	 */
-	severity?: ModerationSeverity
-
-	/**
-	 * Actions that become available when this action is selected.
-	 */
-	enablesActions?: Action[]
-
-	/**
-	 * Actions that become unavailable when this action is selected.
-	 */
-	disablesActions?: string[] // Array of action IDs
-
-	/**
-	 * Unique identifier for this action, used for conditional logic.
-	 */
-	id?: string
-
-	/**
-	 * A function that determines whether this action should be shown for a given project.
-	 *
-	 * By default, it returns `true`, meaning the action is always shown.
-	 */
-	shouldShow?: (
-		project: Labrinth.Projects.v2.Project,
-		projectV3: Labrinth.Projects.v3.Project,
-		context?: ChecklistActionContext,
-	) => boolean
-}
-
-/**
- * Represents a conditional message that changes based on other selected actions.
- */
-export interface ConditionalMessage extends WeightedMessage {
-	/**
-	 * Conditions that must be met for this message to be used.
-	 */
-	conditions: {
-		/**
-		 * Action IDs that must be selected for this message to apply.
-		 */
-		requiredActions?: string[]
-
-		/**
-		 * Action IDs that must NOT be selected for this message to apply.
-		 */
-		excludedActions?: string[]
-	}
-}
-
-/**
- * Represents a button action, which is a simple toggle button that can be used to append a message to the final moderation message.
- */
-export interface ButtonAction extends BaseAction, WeightedMessage {
-	type: 'button'
-
-	/**
-	 * The label of the button, which is displayed to the moderator. The text on the button.
-	 */
-	label: string
-
-	/**
-	 * Alternative messages based on other selected actions.
-	 */
-	conditionalMessages?: ConditionalMessage[]
-}
-
-/**
- * Represents a simple toggle/checkbox action with separate layout handling.
- */
-export interface ToggleAction extends BaseAction, WeightedMessage {
-	type: 'toggle'
-
-	/**
-	 * The label of the toggle, which is displayed to the moderator.
-	 */
-	label: string
-
-	/**
-	 * Description text that appears below the toggle.
-	 */
-	description?: string
-
-	/**
-	 * Whether the toggle is checked by default.
-	 */
-	defaultChecked?: boolean
-
-	/**
-	 * Alternative messages based on other selected actions.
-	 */
-	conditionalMessages?: ConditionalMessage[]
-}
-
-/**
- * Represents a button that has different behavior based on other selected actions.
- */
-export interface ConditionalButtonAction extends BaseAction {
-	type: 'conditional-button'
-
-	/**
-	 * The label of the button, which is displayed to the moderator.
-	 */
-	label: string
-
-	/**
-	 * Different message configurations based on conditions.
-	 */
-	messageVariants: ConditionalMessage[]
-
-	/**
-	 * Global fallback message if no variants match their conditions.
-	 */
-	fallbackMessage?: () => Promise<string>
-
-	/**
-	 * The weight of the action's fallback message, used to determine the place where the message is placed in the final moderation message.
-	 */
-	fallbackWeight?: number
-}
-
-export interface DropdownActionOption extends WeightedMessage {
-	/**
-	 * The label of the option, which is displayed to the moderator.
-	 */
-	label: string
-
-	/**
-	 * A function that determines whether this option should be shown for a given project.
-	 *
-	 * By default, it returns `true`, meaning the option is always shown.
-	 */
-	shouldShow?: (
-		project: Labrinth.Projects.v2.Project,
-		projectV3: Labrinth.Projects.v3.Project,
-		context?: ChecklistActionContext,
-	) => boolean
-}
-
-export interface DropdownAction extends BaseAction {
-	type: 'dropdown'
-
-	/**
-	 * The label associated with the dropdown.
-	 */
-	label: string
-
-	/**
-	 * The options available in the dropdown.
-	 */
-	options: DropdownActionOption[]
-
-	/**
-	 * The default option selected in the dropdown, by index.
-	 */
-	defaultOption?: number
-}
-
-export interface MultiSelectChipsOption extends WeightedMessage {
-	/**
-	 * Stable identifier for the option. If omitted, the label is used.
-	 */
-	id?: string
-
-	/**
-	 * The label of the chip, which is displayed to the moderator.
-	 */
-	label: string
-
-	/**
-	 * A function that determines whether this option should be shown for a given project.
-	 *
-	 * By default, it returns `true`, meaning the option is always shown.
-	 */
-	shouldShow?: (
-		project: Labrinth.Projects.v2.Project,
-		projectV3: Labrinth.Projects.v3.Project,
-		context?: ChecklistActionContext,
-	) => boolean
-}
-
-export type MultiSelectChipsOptionsResolver = (
-	context: ChecklistActionContext,
-) => MultiSelectChipsOption[]
-
-export interface MultiSelectChipsAction extends BaseAction {
-	type: 'multi-select-chips'
-
-	/**
-	 * The label associated with the multi-select chips.
-	 */
-	label: string
-
-	/**
-	 * The options available in the multi-select chips.
-	 */
-	options: MultiSelectChipsOption[] | MultiSelectChipsOptionsResolver
-
-	/**
-	 * If set, all selected option messages are joined with this string and emitted as a single
-	 * message part rather than individual parts. Useful for building bullet lists under a shared header.
-	 */
-	joinWith?: string
-}
-
-export interface AdditionalTextInput {
-	/**
-	 * The label of the text input, which is displayed to the moderator.
-	 */
-	label: string
-
-	/**
-	 * The placeholder text for the text input.
-	 */
-	placeholder?: string
-
-	/**
-	 * Whether the text input is required to be filled out before the action can be completed.
-	 */
-	required?: boolean
-
-	/**
-	 * Whether the text input should use the full markdown editor rather than a simple text input.
-	 */
-	large?: boolean
-
-	/**
-	 * The variable name that will be replaced in the message with the input value.
-	 * For example, if variable is "MESSAGE", then "%MESSAGE%" in the action message
-	 * will be replaced with the input value.
-	 */
-	variable?: string
-
-	/**
-	 * Conditions that determine when this input is shown.
-	 */
-	showWhen?: {
-		/**
-		 * Action IDs that must be selected for this input to be shown.
-		 */
-		requiredActions?: string[]
-
-		/**
-		 * Action IDs that must NOT be selected for this input to be shown.
-		 */
-		excludedActions?: string[]
-	}
-
-	/**
-	 * Optional suggestions for the input. Useful for repeating phrases or common responses.
-	 */
-	suggestions?: string[]
-}
diff --git a/packages/moderation/src/types/messages.ts b/packages/moderation/src/types/messages.ts
deleted file mode 100644
index 28c4425129..0000000000
--- a/packages/moderation/src/types/messages.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-export interface WeightedMessage {
-	/**
-	 * The weight of the action's active message, used to determine the place where the message is placed in the final moderation message.
-	 */
-	weight: number
-
-	/**
-	 * The message which is appended to the final moderation message if the button is active.
-	 * @returns A function that lazily loads the message which is appended if the button is active.
-	 * @example async () => (await import('../messages/example.md?raw')).default,
-	 */
-	message: () => Promise<string>
-}
diff --git a/packages/moderation/src/types/node.ts b/packages/moderation/src/types/node.ts
deleted file mode 100644
index e44894b639..0000000000
--- a/packages/moderation/src/types/node.ts
+++ /dev/null
@@ -1,880 +0,0 @@
-import type { Labrinth } from '@modrinth/api-client'
-import type { FunctionalComponent, InjectionKey, Ref, SVGAttributes } from 'vue'
-import { markRaw, toValue } from 'vue'
-
-import {
-	expandVariables,
-	flattenProjectV3Variables,
-	flattenProjectVariables,
-	flattenStaticVariables,
-} from '../utils'
-import type { ModerationSeverity, ModerationStatus } from './actions'
-import type { Priority } from './priority.ts'
-
-// ─── State ────────────────────────────────────────────────────────────────────
-
-export type NodeState =
-	| boolean
-	| string
-	| number
-	| Set<string>
-	| NodeStateWithChildren
-	| null
-	| undefined
-
-export interface NodeStateWithChildren {
-	value?: NodeState
-	[childId: string]: NodeState
-}
-
-// ─── Function types ───────────────────────────────────────────────────────────
-
-export type MessageFn = ((state: Record<string, NodeState>) => Promise<string>) & {
-	concat(...others: MessageFn[]): MessageFn
-}
-export type ContentFn = (state: Record<string, NodeState>) => string | Promise<string>
-export type ChildrenFn = (state: Record<string, NodeState>) => ChildEntry[]
-
-export type Reactive<T> = T | Ref<T>
-
-export function resolve<T>(value: Reactive<T>): T {
-	return toValue(value as T | Ref<T>)
-}
-
-export type ChildNode = NodeBuilder | (() => unknown) | string
-
-export type ChildEntry =
-	| NodeBuilder
-	| string
-	| (() => unknown)
-	| null
-	| Ref<NodeBuilder | null>
-	| ((state?: Record<string, NodeState>) => NodeBuilder | NodeBuilder[] | null)
-
-export type NodeType =
-	| 'toggle'
-	| 'check'
-	| 'button'
-	| 'text'
-	| 'markdown'
-	| 'group'
-	| 'dropdown'
-	| 'option'
-	| 'stage'
-
-// ─── Message helpers ──────────────────────────────────────────────────────────
-
-const messageFiles = import.meta.glob('../data/messages/**/*.md', {
-	query: '?raw',
-	import: 'default',
-})
-
-export function mdOptional(
-	path: string,
-	getVars?: (state: Record<string, any>) => Record<string, any>,
-): MessageFn {
-	return makeMessageFn(async (state) => {
-		const loader = messageFiles[`../data/messages/${path}.md`]
-		if (!loader) return ''
-		return loadMd(path, state, _project!.value, _projectV2!.value, getVars)
-	})
-}
-
-export function mdEscape(text: string): string {
-	return text.replace(/[\\*_`[~]/g, '\\$&')
-}
-
-const USER_CONTENT_KEYS = [
-	'PROJECT_TITLE',
-	'PROJECT_SLUG',
-	'PROJECT_SUMMARY',
-	'PROJECT_TYPE',
-	'PROJECT_STATUS',
-]
-
-export async function loadMd(
-	path: string,
-	state: Record<string, NodeState>,
-	project: Labrinth.Projects.v3.Project,
-	projectV2: Labrinth.Projects.v2.Project,
-	getVars?: (state: Record<string, any>) => Record<string, any>,
-): Promise<string> {
-	// Call getVars before any await so Vue's watchEffect tracks reactive reads inside it
-	const extraVars = getVars ? getVars(state) : null
-	const loader = messageFiles[`../data/messages/${path}.md`]
-	if (!loader) {
-		_onMissingMd?.(path)
-		return ''
-	}
-	const raw = (await loader()) as string
-	const vars: Record<string, string> = {
-		...flattenStaticVariables(),
-		...flattenProjectVariables(projectV2),
-		...flattenProjectV3Variables(project),
-	}
-	for (const key of USER_CONTENT_KEYS) {
-		if (key in vars) vars[key] = mdEscape(vars[key])
-	}
-	if (extraVars) {
-		for (const [k, v] of Object.entries(extraVars)) {
-			vars[k] = String(v ?? '')
-		}
-	}
-	const expanded = expandVariables(raw, projectV2, project, vars)
-	// Code spans render literally — markdown escapes inside them show as-is, so strip them
-	return expanded.replace(/`[^`\n]*`/g, (match) => match.replace(/\\([\\*_`[~])/g, '$1'))
-}
-
-function makeMessageFn(fn: (state: Record<string, NodeState>) => Promise<string>): MessageFn {
-	const rich = fn as MessageFn
-	rich.concat = (...others) =>
-		makeMessageFn(async (state) =>
-			(await Promise.all([rich, ...others].map((f) => f(state)))).join(''),
-		)
-	return rich
-}
-
-let _project: Ref<Labrinth.Projects.v3.Project> | null = null
-let _projectV2: Ref<Labrinth.Projects.v2.Project> | null = null
-let _onMissingMd: ((path: string) => void) | null = null
-
-export function setMissingMdHandler(handler: (path: string) => void) {
-	_onMissingMd = handler
-}
-
-export function setMessageProject(
-	project: Ref<Labrinth.Projects.v3.Project>,
-	projectV2: Ref<Labrinth.Projects.v2.Project>,
-) {
-	_project = project
-	_projectV2 = projectV2
-}
-
-export function md(
-	path: string | ((state: Record<string, NodeState>) => string),
-	getVars?: (state: Record<string, any>) => Record<string, any>,
-): MessageFn {
-	return makeMessageFn(async (state) => {
-		const resolvedPath = typeof path === 'function' ? path(state) : path
-		return loadMd(resolvedPath, state, _project!.value, _projectV2!.value, getVars)
-	})
-}
-// ─── Fix builder ──────────────────────────────────────────────────────────────
-
-export function createTrackedPatch<T extends object>(
-	source: T,
-): { proxy: T; changes: () => Partial<T> } {
-	const written = new Set<string | symbol>()
-	const data = { ...source }
-	const proxy = new Proxy(data, {
-		set(target, key, value) {
-			if (value !== (source as Record<string | symbol, unknown>)[key]) {
-				written.add(key)
-			} else {
-				written.delete(key)
-			}
-			;(target as Record<string | symbol, unknown>)[key] = value
-			return true
-		},
-	})
-	return {
-		proxy,
-		changes: () =>
-			Object.fromEntries([...written].map((k) => [k, data[k as keyof T]])) as Partial<T>,
-	}
-}
-
-export class FixBuilder {
-	_projectFn?: (
-		patch: Labrinth.Projects.v3.EditProjectRequest,
-		state: Record<string, NodeState>,
-	) => void
-	_versionFn?: (
-		patch: Labrinth.Versions.v3.ModifyVersionRequest,
-		state: Record<string, NodeState>,
-	) => void
-
-	project(
-		fn: (patch: Labrinth.Projects.v3.EditProjectRequest, state: Record<string, NodeState>) => void,
-	): this {
-		this._projectFn = fn
-		return this
-	}
-
-	version(
-		fn: (
-			patch: Labrinth.Versions.v3.ModifyVersionRequest,
-			state: Record<string, NodeState>,
-		) => void,
-	): this {
-		this._versionFn = fn
-		return this
-	}
-}
-
-export function fix(): FixBuilder {
-	return new FixBuilder()
-}
-
-// ─── Message segments ─────────────────────────────────────────────────────────
-
-type GetVarsFn = (state: Record<string, any>) => Record<string, any>
-
-export type MessageSegment =
-	| { type: 'fn'; fn: ContentFn }
-	| { type: 'auto'; getVars?: GetVarsFn }
-	| { type: 'path'; path: string | (() => string); getVars?: GetVarsFn }
-	| { type: 'collect'; fallback?: MessageSegment }
-
-export function resolveRelativeMessagePath(
-	messagePath: string | (() => string),
-	statePath: string[],
-): string {
-	const name = typeof messagePath === 'function' ? messagePath() : messagePath
-	if (name.startsWith('/')) return `checklist/messages${name}`
-	const parts = [...statePath.slice(0, -1), ...name.split('/')]
-	const normalized = parts.reduce<string[]>((acc, p) => {
-		if (p === '..') acc.pop()
-		else if (p) acc.push(p)
-		return acc
-	}, [])
-	return `checklist/messages/${normalized.join('/')}`
-}
-
-export async function evalSegment(
-	seg: MessageSegment,
-	state: Record<string, NodeState>,
-	statePath: string[],
-): Promise<string> {
-	if (seg.type === 'collect') return ''
-	if (seg.type === 'fn') return String((await seg.fn(state)) ?? '')
-	if (seg.type === 'auto')
-		return loadMd(
-			`checklist/messages/${statePath.join('/')}`,
-			state,
-			_project!.value,
-			_projectV2!.value,
-			seg.getVars,
-		)
-	return loadMd(
-		resolveRelativeMessagePath(seg.path, statePath),
-		state,
-		_project!.value,
-		_projectV2!.value,
-		seg.getVars,
-	)
-}
-
-// ─── Node builders ────────────────────────────────────────────────────────────
-
-export abstract class NodeBuilder {
-	abstract readonly type: NodeType
-	_shown?: Reactive<boolean>
-	_title?: Reactive<string>
-	_icon?: FunctionalComponent<SVGAttributes>
-	_tooltip?: Reactive<string> | ((state: Record<string, NodeState>) => string)
-
-	shown(condition: Reactive<boolean>): this {
-		this._shown = condition
-		return this
-	}
-
-	title(t: Reactive<string>): this {
-		this._title = t
-		return this
-	}
-
-	icon(i: FunctionalComponent<SVGAttributes>): this {
-		this._icon = markRaw(i)
-		return this
-	}
-
-	tooltip(t: Reactive<string> | ((state: Record<string, NodeState>) => string)): this {
-		this._tooltip = t
-		return this
-	}
-}
-
-export class ButtonNodeBuilder extends NodeBuilder {
-	readonly type = 'button' as const
-	readonly label?: string
-	_onClick?: (state: Record<string, NodeState>) => void
-	_enabled?: Reactive<boolean> | ((state: Record<string, NodeState>) => boolean)
-
-	constructor(nodeLabel?: string) {
-		super()
-		this.label = nodeLabel
-	}
-
-	onClick(fn: (state: Record<string, NodeState>) => void): this {
-		this._onClick = fn
-		return this
-	}
-
-	enabled(condition: Reactive<boolean> | ((state: Record<string, NodeState>) => boolean)): this {
-		this._enabled = condition
-		return this
-	}
-}
-
-export abstract class IdentifiedNodeBuilder extends NodeBuilder {
-	readonly id: string | undefined
-	_children: ChildEntry[] = []
-	_childrenFn?: ChildrenFn
-	_computingChildren = false
-	_segments: MessageSegment[] = []
-	_suggestedStatus?: ModerationStatus
-	_severity?: ModerationSeverity
-	_priority?: Priority
-	_fixes: FixBuilder[] = []
-	_applyFixes = false
-	_enabled?: Reactive<boolean> | ((state: Record<string, NodeState>) => boolean)
-	_statePath?: string[]
-
-	constructor(id: string | undefined) {
-		super()
-		this.id = id
-	}
-
-	children(fn: ChildrenFn): this
-	children(...entries: ChildEntry[]): this
-	children(...args: [ChildrenFn] | ChildEntry[]): this {
-		if (args.length === 1 && typeof args[0] === 'function' && args[0].length >= 1) {
-			this._childrenFn = args[0] as ChildrenFn
-		} else {
-			this._children.push(...(args as ChildEntry[]))
-		}
-		return this
-	}
-
-	message(path?: string | (() => string), getVars?: GetVarsFn): this {
-		const segment: MessageSegment =
-			path === undefined
-				? { type: 'auto', ...(getVars && { getVars }) }
-				: { type: 'path', path, ...(getVars && { getVars }) }
-		this._segments.push(segment)
-		return this
-	}
-
-	rawMessage(content: string | ContentFn): this {
-		const fn: ContentFn = typeof content === 'string' ? () => content : content
-		this._segments.push({ type: 'fn', fn })
-		return this
-	}
-
-	collect(path?: string | (() => string), getVars?: GetVarsFn): this {
-		const fallback =
-			path !== undefined || getVars !== undefined
-				? path === undefined
-					? { type: 'auto' as const, ...(getVars && { getVars }) }
-					: { type: 'path' as const, path, ...(getVars && { getVars }) }
-				: undefined
-		this._segments.push({ type: 'collect', ...(fallback && { fallback }) })
-		return this
-	}
-
-	suggestedStatus(s: ModerationStatus): this {
-		this._suggestedStatus = s
-		return this
-	}
-
-	severity(s: ModerationSeverity): this {
-		this._severity = s
-		return this
-	}
-
-	priority(p: Priority): this {
-		this._priority = p
-		return this
-	}
-
-	fix(f: FixBuilder): this {
-		this._fixes.push(f)
-		return this
-	}
-
-	applyFixes(): this {
-		this._applyFixes = true
-		return this
-	}
-
-	enabled(condition: Reactive<boolean> | ((state: Record<string, NodeState>) => boolean)): this {
-		this._enabled = condition
-		return this
-	}
-
-	statePath(path: string[]): this {
-		this._statePath = path
-		return this
-	}
-}
-
-export abstract class LabeledNodeBuilder extends IdentifiedNodeBuilder {
-	readonly label: string
-
-	constructor(id: string, label: string) {
-		super(id)
-		this.label = label
-	}
-}
-
-export abstract class ValueNodeBuilder extends LabeledNodeBuilder {
-	_defaultValue?: NodeState | ((state: Record<string, NodeState>) => NodeState)
-	_required?: boolean
-
-	initial(v: NodeState | ((state: Record<string, NodeState>) => NodeState)): this {
-		this._defaultValue = v
-		return this
-	}
-
-	required(v = true): this {
-		this._required = v
-		return this
-	}
-}
-
-export class BooleanNodeBuilder extends ValueNodeBuilder {
-	readonly type: 'toggle' | 'check'
-
-	constructor(id: string, nodeLabel: string, type: 'toggle' | 'check') {
-		super(id, nodeLabel)
-		this.type = type
-	}
-}
-
-export type OverrideValue = { readonly __override: string }
-
-export type OnChangeFn = (
-	value: string,
-	helpers: { override: (value: string) => OverrideValue },
-) => OverrideValue | void
-
-export class InputNodeBuilder extends IdentifiedNodeBuilder {
-	readonly type: 'text' | 'markdown'
-	_placeholder?: Reactive<string>
-	_defaultValue?: NodeState | ((state: Record<string, NodeState>) => NodeState)
-	_required?: boolean
-	_onChange?: OnChangeFn
-
-	constructor(id: string, type: 'text' | 'markdown') {
-		super(id)
-		this.type = type
-	}
-
-	placeholder(p: Reactive<string>): this {
-		this._placeholder = p
-		return this
-	}
-
-	initial(v: NodeState | ((state: Record<string, NodeState>) => NodeState)): this {
-		this._defaultValue = v
-		return this
-	}
-
-	required(v = true): this {
-		this._required = v
-		return this
-	}
-
-	onChange(fn: OnChangeFn): this {
-		this._onChange = fn
-		return this
-	}
-}
-
-export class GroupNodeBuilder extends IdentifiedNodeBuilder {
-	readonly type = 'group' as const
-	_layout?: 'flex' | 'column'
-	_required?: boolean
-	_selectMode?: 'single' | 'multi'
-	_selectId?: string
-
-	layout(l: 'flex' | 'column'): this {
-		this._layout = l
-		return this
-	}
-
-	required(v = true): this {
-		this._required = v
-		return this
-	}
-
-	singleSelect(id?: string): this {
-		this._selectMode = 'single'
-		if (id !== undefined) this._selectId = id
-		return this
-	}
-
-	multiSelect(id?: string): this {
-		this._selectMode = 'multi'
-		if (id !== undefined) this._selectId = id
-		return this
-	}
-}
-
-export class DropdownNodeBuilder extends IdentifiedNodeBuilder {
-	readonly type = 'dropdown' as const
-	_none?: string
-
-	override children(fn: ChildrenFn): this
-	override children(...nodes: OptionNodeBuilder[]): this
-	override children(...args: [ChildrenFn] | OptionNodeBuilder[]): this {
-		if (args.length === 1 && typeof args[0] === 'function' && args[0].length >= 1) {
-			super.children(args[0] as ChildrenFn)
-		} else {
-			super.children(...(args as OptionNodeBuilder[]))
-		}
-		return this
-	}
-
-	none(text: string): this {
-		this._none = text
-		return this
-	}
-}
-
-export class OptionNodeBuilder extends LabeledNodeBuilder {
-	readonly type = 'option' as const
-}
-
-export class StageNodeBuilder extends LabeledNodeBuilder {
-	readonly type = 'stage' as const
-	_hint?: string
-	_guidanceUrl?: string
-	_icon?: FunctionalComponent<SVGAttributes>
-	_navigate?: string
-
-	hint(h: string): this {
-		this._hint = h
-		return this
-	}
-
-	guidance(url: string): this {
-		this._guidanceUrl = url
-		return this
-	}
-
-	icon(i: FunctionalComponent<SVGAttributes>): this {
-		this._icon = markRaw(i)
-		return this
-	}
-
-	navigate(path: string): this {
-		this._navigate = path
-		return this
-	}
-
-	override children(fn: ChildrenFn): this
-	override children(...entries: ChildEntry[]): this
-	override children(...args: [ChildrenFn] | ChildEntry[]): this {
-		if (args.length === 1 && typeof args[0] === 'function' && args[0].length >= 1) {
-			super.children(args[0] as ChildrenFn)
-			if (!this._statePath) this._statePath = [this.id!]
-			return this
-		}
-		const entries = args as ChildEntry[]
-		super.children(...entries)
-		if (!this._statePath) this._statePath = [this.id!]
-		stampChildPaths(entries, [this.id!])
-		return this
-	}
-}
-
-export const STAGES_KEY: InjectionKey<Ref<StageNodeBuilder[]>> = Symbol('checklistStages')
-export const GLOBAL_STATE_KEY: InjectionKey<Ref<Record<string, Record<string, NodeState>>>> =
-	Symbol('checklistGlobalState')
-
-// ─── Node traversal ───────────────────────────────────────────────────────────
-
-function childrenScopePath(node: IdentifiedNodeBuilder): string[] | null {
-	if (!node._statePath) return null
-	switch (node.type) {
-		case 'toggle':
-		case 'check':
-		case 'option':
-		case 'stage':
-			return node._statePath
-		case 'group': {
-			const g = node as GroupNodeBuilder
-			if (g._selectMode) {
-				// Option ids become namespaces at the same level as the group
-				return node._statePath.slice(0, -1)
-			}
-			return node._statePath
-		}
-		case 'dropdown':
-			// Option ids become namespaces at the same level as the dropdown
-			return node._statePath.slice(0, -1)
-		default:
-			return null
-	}
-}
-
-function stampChildPaths(entries: ChildEntry[], scopePath: string[]): void {
-	for (const entry of entries) {
-		// Skip reactive entries (refs, functions, nulls) — they get stamped on resolution
-		if (!(entry instanceof NodeBuilder)) continue
-		if (!(entry instanceof IdentifiedNodeBuilder)) continue
-		const selectId = entry instanceof GroupNodeBuilder ? entry._selectId : undefined
-		if (!entry.id && !selectId) {
-			// Truly transparent: no structural id and no select id
-			stampChildPaths(entry._children, scopePath)
-			continue
-		}
-		if (!entry._statePath) {
-			// Structural id contributes to path first, then select id
-			const pathComponents = entry.id
-				? selectId
-					? [...scopePath, entry.id, selectId]
-					: [...scopePath, entry.id]
-				: [...scopePath, selectId!]
-			entry._statePath = pathComponents
-		}
-		const childScope = childrenScopePath(entry)
-		if (childScope) stampChildPaths(entry._children, childScope)
-	}
-}
-
-export function isNodeActive(node: NodeBuilder, state: NodeState): boolean {
-	switch (node.type) {
-		case 'toggle':
-		case 'check':
-		case 'option': {
-			if (typeof state === 'boolean') return state
-			if (state && typeof state === 'object' && !(state instanceof Set)) {
-				const v = (state as NodeStateWithChildren).value
-				if (typeof v === 'boolean') return v
-			}
-			return (node as BooleanNodeBuilder)._defaultValue === true
-		}
-		case 'group': {
-			const g = node as GroupNodeBuilder
-			if (g._selectMode === 'single') return typeof state === 'string' && state !== ''
-			if (g._selectMode === 'multi') return state instanceof Set && state.size > 0
-			return false
-		}
-		case 'dropdown':
-			return typeof state === 'string' && state !== ''
-		case 'text':
-		case 'markdown':
-			return typeof state === 'string' && state !== ''
-		default:
-			return false
-	}
-}
-
-export function getBooleanChildState(nodeState: NodeState): Record<string, NodeState> {
-	if (nodeState && typeof nodeState === 'object' && !(nodeState instanceof Set)) {
-		return nodeState as Record<string, NodeState>
-	}
-	return {}
-}
-
-export function resolveChildren(
-	node: IdentifiedNodeBuilder,
-	state: Record<string, NodeState>,
-): ChildNode[] {
-	let entries: ChildEntry[]
-	let stampStatic = false
-
-	if (node._childrenFn) {
-		if (node._computingChildren) return []
-		node._computingChildren = true
-		try {
-			entries = node._childrenFn(state)
-			stampStatic = true // childrenFn results haven't been pre-stamped
-		} finally {
-			node._computingChildren = false
-		}
-	} else {
-		entries = node._children
-	}
-
-	const scopePath = childrenScopePath(node)
-	const result: ChildNode[] = []
-
-	for (const entry of entries) {
-		if (entry == null) continue
-		if (entry instanceof NodeBuilder) {
-			if (entry._shown !== undefined && !resolve(entry._shown)) continue
-			if (stampStatic && scopePath) stampChildPaths([entry], scopePath)
-			result.push(entry)
-			continue
-		}
-		if (typeof entry === 'string') {
-			result.push(entry)
-			continue
-		}
-		if (typeof entry === 'function') {
-			if (entry.length === 0) {
-				result.push(entry as () => unknown)
-				continue
-			}
-			const resolved = entry(state)
-			if (resolved == null) continue
-			if (Array.isArray(resolved)) {
-				for (const r of resolved) {
-					if (r == null) continue
-					if (r._shown !== undefined && !resolve(r._shown)) continue
-					if (scopePath) stampChildPaths([r], scopePath)
-					result.push(r)
-				}
-				continue
-			}
-			if (resolved._shown !== undefined && !resolve(resolved._shown)) continue
-			if (scopePath) stampChildPaths([resolved], scopePath)
-			result.push(resolved)
-			continue
-		}
-		// Ref<NodeBuilder | null>
-		const resolved = toValue(entry as Ref<NodeBuilder | null>)
-		if (resolved == null) continue
-		if (resolved._shown !== undefined && !resolve(resolved._shown)) continue
-		if (scopePath) stampChildPaths([resolved], scopePath)
-		result.push(resolved)
-	}
-
-	return result
-}
-
-export function walkNodes(
-	nodes: ChildNode[],
-	stageState: Record<string, NodeState>,
-	visitor: (
-		node: IdentifiedNodeBuilder,
-		nodeState: NodeState,
-		localState: Record<string, NodeState>,
-	) => void,
-): void {
-	for (const node of nodes) {
-		if (!(node instanceof NodeBuilder)) continue
-		if (node._shown !== undefined && !resolve(node._shown)) continue
-
-		if (node.type === 'stage') {
-			const identified = node as IdentifiedNodeBuilder
-			if (identified.id) {
-				const raw = stageState[identified.id]
-				const childState =
-					raw && typeof raw === 'object' && !(raw instanceof Set)
-						? (raw as Record<string, NodeState>)
-						: {}
-				walkNodes(resolveChildren(identified, childState), childState, visitor)
-			} else {
-				walkNodes(resolveChildren(identified, stageState), stageState, visitor)
-			}
-			continue
-		}
-
-		if (node.type === 'group') {
-			const g = node as GroupNodeBuilder
-			if (!g._selectMode) {
-				// Plain container: traverse children in group's own state scope
-				if (g.id) {
-					const raw = stageState[g.id]
-					const childState =
-						raw && typeof raw === 'object' && !(raw instanceof Set)
-							? (raw as Record<string, NodeState>)
-							: {}
-					walkNodes(resolveChildren(g, childState), childState, visitor)
-				} else {
-					walkNodes(resolveChildren(g, stageState), stageState, visitor)
-				}
-				continue
-			}
-			// Fall through to value-node path for groups with selectMode
-		}
-
-		if (node.type === 'button') continue
-
-		const identified = node as IdentifiedNodeBuilder
-		const stateKey =
-			node.type === 'group'
-				? ((node as GroupNodeBuilder)._selectId ?? identified.id!)
-				: identified.id!
-		const nodeState = stageState[stateKey]
-		visitor(identified, nodeState, stageState)
-
-		const active = isNodeActive(node, nodeState)
-		const children = resolveChildren(identified, stageState)
-		if (children.length === 0 || !active) continue
-
-		if (node.type === 'group' && (node as GroupNodeBuilder)._selectMode === 'multi') {
-			const selected = nodeState instanceof Set ? nodeState : new Set<string>()
-			for (const child of children) {
-				const childId = child as IdentifiedNodeBuilder
-				if (!selected.has(childId.id!) || (child._shown !== undefined && !resolve(child._shown)))
-					continue
-				const rawChildState = stageState[childId.id!]
-				// Option children are active by virtue of being in the selected Set, not by their own
-				// boolean state. If they have child state but no explicit value, inject value: true
-				// so isNodeActive returns true even after child state has been written to their path.
-				const childState: NodeState =
-					rawChildState !== null &&
-					rawChildState !== undefined &&
-					typeof rawChildState === 'object' &&
-					!(rawChildState instanceof Set) &&
-					(rawChildState as NodeStateWithChildren).value === undefined
-						? { ...(rawChildState as NodeStateWithChildren), value: true }
-						: (rawChildState ?? true)
-				visitor(childId, childState, stageState)
-				walkNodes(resolveChildren(childId, stageState), stageState, visitor)
-			}
-		} else if (node.type === 'toggle' || node.type === 'check') {
-			const childState = getBooleanChildState(nodeState)
-			walkNodes(children, childState, visitor)
-		} else if (
-			(node.type === 'group' && (node as GroupNodeBuilder)._selectMode === 'single') ||
-			node.type === 'dropdown'
-		) {
-			const selectedId = typeof nodeState === 'string' ? nodeState : undefined
-			if (selectedId) {
-				for (const child of children) {
-					const childId = child as IdentifiedNodeBuilder
-					if (childId.id !== selectedId || (child._shown !== undefined && !resolve(child._shown)))
-						continue
-					const rawChildState = stageState[childId.id!]
-					const childState: NodeState =
-						rawChildState !== null &&
-						rawChildState !== undefined &&
-						typeof rawChildState === 'object' &&
-						!(rawChildState instanceof Set) &&
-						(rawChildState as NodeStateWithChildren).value === undefined
-							? { ...(rawChildState as NodeStateWithChildren), value: true }
-							: (rawChildState ?? true)
-					visitor(childId, childState, stageState)
-					walkNodes(resolveChildren(childId, stageState), stageState, visitor)
-					break
-				}
-			}
-		} else {
-			walkNodes(children, stageState, visitor)
-		}
-	}
-}
-
-// ─── Factory functions ────────────────────────────────────────────────────────
-
-export type StageFn = (
-	project: Labrinth.Projects.v3.Project,
-	projectV2: Labrinth.Projects.v2.Project,
-) => StageNodeBuilder
-
-export function stageFn(factory: StageFn): StageFn {
-	const cache = new WeakMap<object, StageNodeBuilder>()
-	return (project, projectV2) => {
-		if (!cache.has(project)) cache.set(project, factory(project, projectV2))
-		return cache.get(project)!
-	}
-}
-
-export const toggle = (id: string, nodeLabel: string) =>
-	new BooleanNodeBuilder(id, nodeLabel, 'toggle')
-export const check = (id: string, nodeLabel: string) =>
-	new BooleanNodeBuilder(id, nodeLabel, 'check')
-export const button = (nodeLabel?: string) => new ButtonNodeBuilder(nodeLabel)
-export const text = (id: string) => new InputNodeBuilder(id, 'text')
-export const markdown = (id: string) => new InputNodeBuilder(id, 'markdown')
-export const group = (id?: string) => new GroupNodeBuilder(id)
-export const dropdown = (id: string) => new DropdownNodeBuilder(id)
-export const option = (id: string, nodeLabel: string) => new OptionNodeBuilder(id, nodeLabel)
-export const stage = (id: string, title: string) => new StageNodeBuilder(id, title)
diff --git a/packages/moderation/src/types/node/builder.ts b/packages/moderation/src/types/node/builder.ts
new file mode 100644
index 0000000000..9bb57e3548
--- /dev/null
+++ b/packages/moderation/src/types/node/builder.ts
@@ -0,0 +1,56 @@
+import type { Ref } from 'vue'
+
+import type { Configurable, Visible } from './capabilities'
+import type { NodeState } from './state'
+
+export type AnyNode = Visible
+
+export type ChildNode = AnyNode | (() => unknown) | string
+
+export type ChildEntry =
+	| AnyNode
+	| string
+	| (() => unknown)
+	| null
+	| Ref<AnyNode | null>
+	| ((state?: Record<string, NodeState>) => AnyNode | AnyNode[] | null)
+
+export type ChildrenFn = (state: Record<string, NodeState>) => ChildEntry[]
+
+export interface HasChildren {
+	_children: ChildEntry[]
+	_childrenFn?: ChildrenFn
+	children(this: this, fn: ChildrenFn): this
+	children(this: this, ...entries: ChildEntry[]): this
+}
+
+export function withChildren<T extends object>(node: T): T & HasChildren {
+	return Object.assign(node, {
+		_children: [] as ChildEntry[],
+		children(this: HasChildren, ...args: [ChildrenFn] | ChildEntry[]) {
+			if (args.length === 1 && typeof args[0] === 'function' && args[0].length >= 1) {
+				this._childrenFn = args[0] as ChildrenFn
+			} else {
+				this._children.push(...(args as ChildEntry[]))
+			}
+			return this
+		},
+	})
+}
+
+export function withAutoProps<T extends Configurable>(
+	node: T,
+): T & { [key: string]: (value: unknown) => T } {
+	return new Proxy(node, {
+		get(target, prop, receiver) {
+			if (typeof prop === 'string' && !prop.startsWith('_') && !(prop in target)) {
+				return (value: unknown) => {
+					const prev = target._extraProps
+					target._extraProps = (ctx) => ({ ...prev?.(ctx), [prop]: value })
+					return receiver
+				}
+			}
+			return Reflect.get(target, prop, receiver)
+		},
+	}) as T & { [key: string]: (value: unknown) => T }
+}
diff --git a/packages/moderation/src/types/node/capabilities.ts b/packages/moderation/src/types/node/capabilities.ts
new file mode 100644
index 0000000000..5d89d16740
--- /dev/null
+++ b/packages/moderation/src/types/node/capabilities.ts
@@ -0,0 +1,449 @@
+import type { Component, FunctionalComponent, SVGAttributes } from 'vue'
+import { markRaw } from 'vue'
+
+import { Priority } from '../priority.ts'
+import type { FixBuilder } from './fix'
+import type { GetVarsFn, MessageSegment, ModerationStatus, NodeState, Reactive } from './state'
+
+export interface Visible {
+	_shown: Reactive<boolean> | undefined
+	shown(this: this, condition: Reactive<boolean>): this
+}
+
+export function withShown<T extends object>(node: T): T & Visible {
+	return Object.assign(node, {
+		_shown: undefined as Reactive<boolean> | undefined,
+		shown(this: Visible, condition: Reactive<boolean>) {
+			this._shown = condition
+			return this
+		},
+	})
+}
+
+export interface Iconable {
+	_icon: FunctionalComponent<SVGAttributes> | undefined
+	icon(this: this, icon: FunctionalComponent<SVGAttributes> | undefined): this
+}
+
+export function withIcon<T extends object>(node: T): T & Iconable {
+	return Object.assign(node, {
+		_icon: undefined as FunctionalComponent<SVGAttributes> | undefined,
+		icon(this: Iconable, icon: FunctionalComponent<SVGAttributes> | undefined) {
+			this._icon = icon ? markRaw(icon) : undefined
+			return this
+		},
+	})
+}
+
+export interface Tooltippable {
+	_tooltip: Reactive<string> | ((state: Record<string, NodeState>) => string) | undefined
+	tooltip(
+		this: this,
+		tooltip: Reactive<string> | ((state: Record<string, NodeState>) => string) | undefined,
+	): this
+}
+
+export function withTooltip<T extends object>(node: T): T & Tooltippable {
+	return Object.assign(node, {
+		_tooltip: undefined as Tooltippable['_tooltip'],
+		tooltip(this: Tooltippable, tooltip: Tooltippable['_tooltip']) {
+			this._tooltip = tooltip
+			return this
+		},
+	})
+}
+
+export interface Titled {
+	_title: Reactive<string> | undefined
+	title(this: this, title: Reactive<string>): this
+}
+
+export function withTitle<T extends object>(node: T): T & Titled {
+	return Object.assign(node, {
+		_title: undefined as Reactive<string> | undefined,
+		title(this: Titled, title: Reactive<string>) {
+			this._title = title
+			return this
+		},
+	})
+}
+
+export interface Identified {
+	id: string
+	_statePath?: string[]
+	statePath(this: this, path: string[]): this
+}
+
+export function withId<T extends object>(node: T, id: string): T & Identified {
+	return Object.assign(node, {
+		id,
+		statePath(this: Identified, path: string[]) {
+			this._statePath = path
+			return this
+		},
+	})
+}
+
+export interface Prioritizable {
+	_priority: Priority
+	priority(this: this, p: Priority): this
+}
+
+export function withPriority<T extends object>(node: T): T & Prioritizable {
+	return Object.assign(node, {
+		_priority: new Priority(),
+		priority(this: Prioritizable, p: Priority) {
+			this._priority = p
+			return this
+		},
+	})
+}
+
+export interface Messageable {
+	_segments: MessageSegment[]
+	_suggestedStatus?: ModerationStatus
+	suggestedStatus(this: this, status: ModerationStatus): this
+	message(this: this, path?: string | (() => string) | GetVarsFn, getVars?: GetVarsFn): this
+	rawMessage(
+		this: this,
+		content: string | ((state: Record<string, NodeState>) => string | Promise<string>),
+	): this
+	collect(this: this, path?: string | (() => string) | GetVarsFn, getVars?: GetVarsFn): this
+}
+
+function splitPathAndVars(
+	pathOrGetVars: string | (() => string) | GetVarsFn | undefined,
+	getVars: GetVarsFn | undefined,
+): { path: string | (() => string) | undefined; getVars: GetVarsFn | undefined } {
+	if (typeof pathOrGetVars === 'function' && pathOrGetVars.length >= 1) {
+		return { path: undefined, getVars: pathOrGetVars as GetVarsFn }
+	}
+	return { path: pathOrGetVars as string | (() => string) | undefined, getVars }
+}
+
+export function withMessaging<T extends object>(node: T): T & Messageable {
+	return Object.assign(node, {
+		_segments: [] as MessageSegment[],
+		suggestedStatus(this: Messageable, status: ModerationStatus) {
+			this._suggestedStatus = status
+			return this
+		},
+		message(
+			this: Messageable,
+			pathOrGetVars?: string | (() => string) | GetVarsFn,
+			getVarsArg?: GetVarsFn,
+		) {
+			const { path, getVars } = splitPathAndVars(pathOrGetVars, getVarsArg)
+			const segment: MessageSegment =
+				path === undefined
+					? { type: 'auto', ...(getVars && { getVars }) }
+					: { type: 'path', path, ...(getVars && { getVars }) }
+			this._segments.push(segment)
+			return this
+		},
+		rawMessage(
+			this: Messageable,
+			content: string | ((state: Record<string, NodeState>) => string | Promise<string>),
+		) {
+			const fn = typeof content === 'string' ? () => content : content
+			this._segments.push({ type: 'fn', fn })
+			return this
+		},
+		collect(
+			this: Messageable,
+			pathOrGetVars?: string | (() => string) | GetVarsFn,
+			getVarsArg?: GetVarsFn,
+		) {
+			const { path, getVars } = splitPathAndVars(pathOrGetVars, getVarsArg)
+			const fallback: MessageSegment | undefined =
+				path !== undefined || getVars !== undefined
+					? path === undefined
+						? { type: 'auto', ...(getVars && { getVars }) }
+						: { type: 'path', path, ...(getVars && { getVars }) }
+					: undefined
+			this._segments.push({ type: 'collect', ...(fallback && { fallback }) })
+			return this
+		},
+	})
+}
+
+export interface Requireable {
+	_required: boolean | undefined
+	required(this: this, v?: boolean): this
+}
+
+export function withRequired<T extends object>(node: T): T & Requireable {
+	return Object.assign(node, {
+		_required: undefined as boolean | undefined,
+		required(this: Requireable, v = true) {
+			this._required = v
+			return this
+		},
+	})
+}
+
+export interface Fixable {
+	_fixes: FixBuilder[]
+	_applyFixes?: boolean
+	fix(this: this, f: FixBuilder): this
+	applyFixes(this: this): this
+}
+
+export function withFix<T extends object>(node: T): T & Fixable {
+	return Object.assign(node, {
+		_fixes: [] as FixBuilder[],
+		fix(this: Fixable, f: FixBuilder) {
+			this._fixes.push(f)
+			return this
+		},
+		applyFixes(this: Fixable) {
+			this._applyFixes = true
+			return this
+		},
+	})
+}
+
+export interface Enableable {
+	_enabled: Reactive<boolean> | ((state: Record<string, NodeState>) => boolean) | undefined
+	enabled(this: this, condition: Enableable['_enabled']): this
+}
+
+export function withEnabled<T extends object>(node: T): T & Enableable {
+	return Object.assign(node, {
+		_enabled: undefined as Enableable['_enabled'],
+		enabled(this: Enableable, condition: Enableable['_enabled']) {
+			this._enabled = condition
+			return this
+		},
+	})
+}
+
+export interface HasValue<V = unknown> {
+	_defaultValue?: V | ((state: Record<string, NodeState>) => V)
+	_getValue: (raw: NodeState) => V
+	_setValue: (raw: NodeState, next: V, isDefault?: boolean) => NodeState
+	_isActive: (value: V) => boolean
+	initial(this: this, v: V | ((state: Record<string, NodeState>) => V)): this
+}
+
+export function withValue<T extends object, V>(
+	node: T,
+	behavior: Pick<HasValue<V>, '_getValue' | '_setValue' | '_isActive'>,
+): T & HasValue<V> {
+	return Object.assign(node, {
+		...behavior,
+		initial(this: HasValue<V>, v: V | ((state: Record<string, NodeState>) => V)) {
+			this._defaultValue = v
+			return this
+		},
+	})
+}
+
+export interface Clickable {
+	_onClick: ((state: Record<string, NodeState>) => void) | undefined
+	onClick(this: this, fn: Clickable['_onClick']): this
+}
+
+export function withOnClick<T extends object>(node: T): T & Clickable {
+	return Object.assign(node, {
+		_onClick: undefined as Clickable['_onClick'],
+		onClick(this: Clickable, fn: Clickable['_onClick']) {
+			this._onClick = fn
+			return this
+		},
+	})
+}
+
+export interface ComponentNodePropsContext {
+	onImageUpload?: (file: File) => Promise<string>
+	toggleSetValue?: (value: string) => void
+	nodeFacts?: { needsAttention: boolean; fixActionable: boolean }
+	tooltip?: Record<string, unknown>
+}
+
+export interface Renderable {
+	_component: Component | undefined
+	_rendererKey: string | undefined
+	_componentProps?: (ctx: ComponentNodePropsContext) => Record<string, unknown>
+	_modelProp: string
+}
+
+export function withComponent<T extends object>(
+	node: T,
+	opts: {
+		component?: Component
+		rendererKey?: string
+		modelProp?: string
+		componentProps?: Renderable['_componentProps']
+	},
+): T & Renderable {
+	return Object.assign(node, {
+		_component: opts.component,
+		_rendererKey: opts.rendererKey,
+		_componentProps: opts.componentProps,
+		_modelProp: opts.modelProp ?? 'modelValue',
+	})
+}
+
+export interface Configurable {
+	_extraProps: ((ctx: ComponentNodePropsContext) => Record<string, unknown>) | undefined
+}
+
+export function withExtraProps<T extends object>(node: T): T & Configurable {
+	return Object.assign(node, {
+		_extraProps: undefined as Configurable['_extraProps'],
+	})
+}
+
+export interface HasNoneLabel {
+	_none: string | undefined
+	none(this: this, text: string): this
+}
+
+export function withNoneLabel<T extends object>(node: T): T & HasNoneLabel {
+	return Object.assign(node, {
+		_none: undefined as string | undefined,
+		none(this: HasNoneLabel, text: string) {
+			this._none = text
+			return this
+		},
+	})
+}
+
+export interface Layoutable {
+	_layout: 'flex' | 'column' | undefined
+	layout(this: this, value: 'flex' | 'column'): this
+}
+
+export function withLayout<T extends object>(node: T): T & Layoutable {
+	return Object.assign(node, {
+		_layout: undefined as 'flex' | 'column' | undefined,
+		layout(this: Layoutable, value: 'flex' | 'column') {
+			this._layout = value
+			return this
+		},
+	})
+}
+
+export interface Selectable {
+	_exclusive: boolean | undefined
+	singleSelect(this: this): this
+}
+
+export function withSelectable<T extends object>(node: T): T & Selectable {
+	return Object.assign(node, {
+		_exclusive: undefined as boolean | undefined,
+		singleSelect(this: Selectable) {
+			this._exclusive = true
+			return this
+		},
+	})
+}
+
+export interface StageMeta {
+	_hint: string | undefined
+	_guidanceUrl: string | undefined
+	_navigate: string | undefined
+	_shownSticky: boolean | undefined
+	hint(this: this, hint: string): this
+	guidance(this: this, url: string): this
+	navigate(this: this, path?: string): this
+	sticky(this: this): this
+}
+
+export function withStageMeta<T extends object>(node: T): T & StageMeta {
+	return Object.assign(node, {
+		_hint: undefined as string | undefined,
+		_guidanceUrl: undefined as string | undefined,
+		_navigate: undefined as string | undefined,
+		_shownSticky: undefined as boolean | undefined,
+		hint(this: StageMeta, hint: string) {
+			this._hint = hint
+			return this
+		},
+		guidance(this: StageMeta, url: string) {
+			this._guidanceUrl = url
+			return this
+		},
+		navigate(this: StageMeta, path?: string) {
+			this._navigate = path ?? ''
+			return this
+		},
+		sticky(this: StageMeta) {
+			this._shownSticky = true
+			return this
+		},
+	})
+}
+
+export type OverrideValue = { readonly __override: string }
+
+export type OnChangeFn = (
+	value: string,
+	helpers: { override: (value: string) => OverrideValue },
+) => OverrideValue | void
+
+export interface Editable {
+	_placeholder: Reactive<string> | undefined
+	_onChange: OnChangeFn | undefined
+	_showTooltip: boolean | undefined
+	_imperativeSync: boolean | undefined
+	placeholder(this: this, p: Reactive<string>): this
+	onChange(this: this, fn: OnChangeFn): this
+}
+
+export function withEditable<T extends object>(node: T): T & Editable {
+	return Object.assign(node, {
+		_placeholder: undefined as Reactive<string> | undefined,
+		_onChange: undefined as OnChangeFn | undefined,
+		_showTooltip: undefined as boolean | undefined,
+		_imperativeSync: undefined as boolean | undefined,
+		placeholder(this: Editable, p: Reactive<string>) {
+			this._placeholder = p
+			return this
+		},
+		onChange(this: Editable, fn: OnChangeFn) {
+			this._onChange = fn
+			return this
+		},
+	})
+}
+
+export interface TweakDef<V = unknown> {
+	icon: FunctionalComponent<SVGAttributes>
+	compute: (current: V, state: Record<string, NodeState>) => V | null | undefined
+}
+
+export interface Tweakable<V = unknown> {
+	_tweaks: TweakDef<V>[]
+	tweak(this: this, icon: FunctionalComponent<SVGAttributes>, compute: TweakDef<V>['compute']): this
+}
+
+export function withTweak<T extends HasValue<V>, V>(node: T): T & Tweakable<V> {
+	return Object.assign(node, {
+		_tweaks: [] as TweakDef<V>[],
+		tweak(
+			this: Tweakable<V>,
+			icon: FunctionalComponent<SVGAttributes>,
+			compute: TweakDef<V>['compute'],
+		) {
+			this._tweaks.push({ icon: markRaw(icon), compute })
+			return this
+		},
+	})
+}
+
+export interface StateOrigin {
+	_stateOrigin: string[] | undefined
+	stateOrigin(this: this, path: string[]): this
+}
+
+export function withStateOrigin<T extends object>(node: T): T & StateOrigin {
+	return Object.assign(node, {
+		_stateOrigin: undefined as string[] | undefined,
+		stateOrigin(this: StateOrigin, path: string[]) {
+			this._stateOrigin = path
+			return this
+		},
+	})
+}
diff --git a/packages/moderation/src/types/node/collect.ts b/packages/moderation/src/types/node/collect.ts
new file mode 100644
index 0000000000..3398c436eb
--- /dev/null
+++ b/packages/moderation/src/types/node/collect.ts
@@ -0,0 +1,97 @@
+import type { ChildNode } from './builder'
+import { evalSegment } from './messages'
+import { hasCap, isNodeActive, resolveActionState, walkNodes } from './resolve'
+import type { MessageSegment, NodeState } from './state'
+
+export interface ActiveAction {
+	node: object
+	state: Record<string, NodeState>
+	statePath: string[]
+	active: boolean
+}
+
+export function collectActiveActions(
+	children: ChildNode[],
+	stageState: Record<string, NodeState>,
+	basePath: string[] = [],
+): ActiveAction[] {
+	const actions: ActiveAction[] = []
+	walkNodes(
+		children,
+		stageState,
+		(node, nodeState, localState, path) => {
+			if (!hasCap(node, '_segments')) return
+			const segments = node._segments as MessageSegment[]
+			if (segments.length === 0) return
+			if (!isNodeActive(node, nodeState, localState)) return
+			actions.push({
+				node,
+				state: resolveActionState(node, nodeState, localState),
+				statePath: path,
+				active: true,
+			})
+		},
+		basePath,
+	)
+	return actions
+}
+
+export function collectMessageNodes(
+	children: ChildNode[],
+	stageState: Record<string, NodeState>,
+	basePath: string[] = [],
+): ActiveAction[] {
+	const actions: ActiveAction[] = []
+	walkNodes(
+		children,
+		stageState,
+		(node, nodeState, localState, path) => {
+			if (!hasCap(node, '_segments')) return
+			const segments = node._segments as MessageSegment[]
+			if (segments.length === 0) return
+			const active = isNodeActive(node, nodeState, localState)
+			actions.push({
+				node,
+				state: resolveActionState(node, nodeState, localState),
+				statePath: path,
+				active,
+			})
+		},
+		basePath,
+	)
+	return actions
+}
+
+function isDescendant(childPath: string[], ancestorPath: string[]): boolean {
+	return (
+		childPath.length > ancestorPath.length && ancestorPath.every((key, i) => childPath[i] === key)
+	)
+}
+
+export async function evalActiveAction(
+	entry: ActiveAction,
+	allActions: ActiveAction[],
+	consumed: Set<object>,
+): Promise<string> {
+	let result = ''
+	const segments = (entry.node as { _segments: MessageSegment[] })._segments
+	for (const seg of segments) {
+		if (seg.type === 'collect') {
+			let collected = ''
+			for (const child of allActions) {
+				if (consumed.has(child.node)) continue
+				if (!isDescendant(child.statePath, entry.statePath)) continue
+				consumed.add(child.node)
+				if (!child.active) continue
+				collected += await evalActiveAction(child, allActions, consumed)
+			}
+			if (!collected.trim() && seg.fallback) {
+				collected = await evalSegment(seg.fallback, entry.state, entry.statePath)
+			}
+			result += collected
+		} else {
+			result += await evalSegment(seg, entry.state, entry.statePath)
+		}
+	}
+	return result
+}
diff --git a/packages/moderation/src/types/node/components/ActionButton.vue b/packages/moderation/src/types/node/components/ActionButton.vue
new file mode 100644
index 0000000000..63de16adc8
--- /dev/null
+++ b/packages/moderation/src/types/node/components/ActionButton.vue
@@ -0,0 +1,39 @@
+<template>
+	<Button
+		v-tooltip="tooltip"
+		:type="color === 'standard' ? 'base' : 'colored'"
+		:color="color === 'standard' ? undefined : color"
+		:disabled="disabled"
+		:aria-label="icon ? label : undefined"
+		@click="emit('update:modelValue', !modelValue)"
+	>
+		<component :is="icon" v-if="icon" />
+		<template v-else>{{ label }}</template>
+	</Button>
+</template>
+
+<script lang="ts" setup>
+import { Button } from '@modrinth/ui'
+import type { Component } from 'vue'
+import { computed } from 'vue'
+
+const props = defineProps<{
+	modelValue: boolean
+	label?: string
+	icon?: Component
+	disabled?: boolean
+	needsAttention?: boolean
+	fixActionable?: boolean
+	tooltip?: Record<string, unknown>
+}>()
+
+const emit = defineEmits<{
+	'update:modelValue': [boolean]
+}>()
+
+const color = computed(() => {
+	if (!props.modelValue) return 'standard'
+	if (props.needsAttention) return 'orange'
+	return props.fixActionable ? 'blue' : 'brand'
+})
+</script>
diff --git a/packages/moderation/src/types/node/components/NodeRenderer.vue b/packages/moderation/src/types/node/components/NodeRenderer.vue
new file mode 100644
index 0000000000..d1bf6768b8
--- /dev/null
+++ b/packages/moderation/src/types/node/components/NodeRenderer.vue
@@ -0,0 +1,401 @@
+<script lang="ts" setup>
+import { Button, IconButton } from '@modrinth/ui'
+import { renderString } from '@modrinth/utils'
+import type { Component } from 'vue'
+import { computed, inject, watchEffect } from 'vue'
+
+import type { AnyNode, ChildNode, HasChildren } from '../builder'
+import type {
+	ComponentNodePropsContext,
+	Enableable,
+	HasValue,
+	Identified,
+	OnChangeFn,
+	TweakDef,
+} from '../capabilities'
+import { CHECKLIST_META_KEY } from '../context'
+import type { Writer } from '../mutate'
+import { childWriter, originScope, writeNodeValue } from '../mutate'
+import {
+	getBooleanChildState,
+	getEffectiveValue,
+	hasCap,
+	hasChildrenCap,
+	hasIdCap,
+	hasOptionsCap,
+	hasValueCap,
+	isNodeActive,
+	isShown,
+	resolveChildren,
+	withStateDefaults,
+} from '../resolve'
+import type { NodeState, Reactive } from '../state'
+import { resolve } from '../state'
+import ActionButton from './ActionButton.vue'
+
+const metaCtx = inject(CHECKLIST_META_KEY)
+
+const props = defineProps<{
+	nodes: ChildNode[]
+	state: Record<string, NodeState>
+	write: Writer
+	onImageUpload?: (file: File) => Promise<string>
+	flex?: boolean
+	titleDepth?: number
+	appComponents?: Record<string, Component>
+	globalState?: Record<string, Record<string, NodeState>>
+}>()
+
+type RenderableValueNode = AnyNode &
+	HasValue &
+	Identified &
+	Partial<Enableable> & {
+		_component: Component | undefined
+		_rendererKey: string | undefined
+		_modelProp: string
+		_componentProps?: (ctx: ComponentNodePropsContext) => Record<string, unknown>
+		_extraProps?: (ctx: ComponentNodePropsContext) => Record<string, unknown>
+		_tweaks?: TweakDef[]
+	}
+
+function resolveComponent(node: RenderableValueNode): Component | undefined {
+	return (
+		node._component ?? (node._rendererKey ? props.appComponents?.[node._rendererKey] : undefined)
+	)
+}
+
+function titleClass(depth: number): string {
+	if (depth === 0) return 'text-lg font-extrabold text-contrast'
+	if (depth === 1) return 'text-base font-semibold'
+	if (depth === 2) return 'text-sm font-semibold'
+	return ''
+}
+
+function getTitle(node: object): string | undefined {
+	if (!hasCap(node, '_title')) return undefined
+	const title = node._title as Reactive<string> | undefined
+	if (title === undefined) return undefined
+	return resolve(title) || undefined
+}
+
+function needsAttention(node: object): boolean {
+	return metaCtx?.value.attentionMap.get(node) ?? false
+}
+
+function isFixActionable(node: object): boolean {
+	return metaCtx?.value.metaMap.get(node)?.isFixActionable ?? false
+}
+
+const wrappedState = computed(() => withStateDefaults(props.state, props.nodes, props.write))
+
+function isEnabled(node: Partial<Enableable>): boolean {
+	if (node._enabled === undefined) return true
+	if (typeof node._enabled === 'function') return node._enabled(wrappedState.value)
+	return resolve(node._enabled)
+}
+
+function toggleSetValue(node: RenderableValueNode, value: string): void {
+	const current = getEffectiveValue(
+		node,
+		props.state[node.id],
+		wrappedState.value,
+	) as unknown as string[]
+	const set = new Set(Array.isArray(current) ? current : [])
+	if (set.has(value)) set.delete(value)
+	else set.add(value)
+	writeNodeValue(node, props.state, props.write, Array.from(set) as never, wrappedState.value)
+}
+
+const DROPDOWN_TRIGGER_CHROME_PX = 16 * 2 + 10 + 20 + 2
+let measureEl: HTMLSpanElement | null = null
+function measureLabelWidth(label: string): number {
+	if (typeof document === 'undefined') return 0
+	if (!measureEl) {
+		measureEl = document.createElement('span')
+		measureEl.className = 'min-w-0 truncate text-primary font-semibold leading-tight'
+		Object.assign(measureEl.style, {
+			position: 'absolute',
+			visibility: 'hidden',
+			whiteSpace: 'nowrap',
+			left: '-9999px',
+			top: '0',
+		})
+		document.body.appendChild(measureEl)
+	}
+	measureEl.textContent = label
+	return measureEl.getBoundingClientRect().width
+}
+
+const dropdownMinWidthCache = new Map<string, string>()
+function getDropdownMinWidth(options: { label: string }[]): string {
+	const key = options.map((o) => o.label).join(' ')
+	const cached = dropdownMinWidthCache.get(key)
+	if (cached) return cached
+	const maxLabelWidth = Math.max(0, ...options.map((o) => measureLabelWidth(o.label)))
+	const result = `${Math.ceil(maxLabelWidth) + DROPDOWN_TRIGGER_CHROME_PX}px`
+	dropdownMinWidthCache.set(key, result)
+	return result
+}
+
+function componentProps(node: RenderableValueNode): Record<string, unknown> {
+	const ctx: ComponentNodePropsContext = {
+		onImageUpload: props.onImageUpload,
+		toggleSetValue: (value) => toggleSetValue(node, value),
+		nodeFacts: { needsAttention: needsAttention(node), fixActionable: isFixActionable(node) },
+		tooltip: resolveTooltip(node),
+	}
+	const dropdownStyle = hasOptionsCap(node)
+		? {
+				class: '!w-auto max-w-full',
+				style: { minWidth: getDropdownMinWidth(node._options as unknown as { label: string }[]) },
+			}
+		: undefined
+	return {
+		disabled: !isEnabled(node),
+		...dropdownStyle,
+		...node._componentProps?.(ctx),
+		...node._extraProps?.(ctx),
+	}
+}
+
+function containerScope(node: HasChildren & Partial<Identified>): {
+	state: Record<string, NodeState>
+	write: Writer
+} {
+	if (hasCap(node, '_stateOrigin') && node._stateOrigin && props.globalState) {
+		return originScope(props.globalState, node._stateOrigin as string[])
+	}
+	if (!hasIdCap(node)) return { state: props.state, write: props.write }
+	const raw = props.state[node.id]
+	const state =
+		raw && typeof raw === 'object' && !(raw instanceof Set)
+			? (raw as Record<string, NodeState>)
+			: {}
+	return { state, write: childWriter(props.state, props.write, node.id) }
+}
+
+function valueScope(node: HasValue & Identified): {
+	state: Record<string, NodeState>
+	write: Writer
+} {
+	const state = getBooleanChildState(props.state[node.id])
+	return { state, write: childWriter(props.state, props.write, node.id) }
+}
+
+const TOOLTIP_BASE = {
+	delay: { show: 500, hide: 0 },
+	triggers: ['hover', 'focus'],
+	placement: 'top',
+}
+
+function resolveTooltip(node: object): Record<string, unknown> | undefined {
+	if (hasCap(node, '_tooltip')) {
+		const t = node._tooltip as
+			| Reactive<string>
+			| ((state: Record<string, NodeState>) => string)
+			| undefined
+		if (t !== undefined) {
+			const content = typeof t === 'function' ? t(wrappedState.value) : resolve(t)
+			if (content) return { ...TOOLTIP_BASE, content }
+		}
+	}
+	const hasSegments = hasCap(node, '_segments')
+	const html = hasSegments ? metaCtx?.value.tooltipHtml.get(node) : undefined
+	return html ? { ...TOOLTIP_BASE, content: html, html: true } : undefined
+}
+
+function clickButton(node: object): void {
+	if (!hasCap(node, '_onClick')) return
+	;(node._onClick as (state: Record<string, NodeState>) => void)?.(wrappedState.value)
+}
+
+function tweakCurrent(node: RenderableValueNode): unknown {
+	return getEffectiveValue(node, props.state[node.id], wrappedState.value)
+}
+
+function tweakResult(tweak: TweakDef, node: RenderableValueNode): unknown {
+	return tweak.compute(tweakCurrent(node), wrappedState.value)
+}
+
+function tweakEnabled(tweak: TweakDef, node: RenderableValueNode): boolean {
+	const result = tweakResult(tweak, node)
+	return result !== null && result !== undefined && result !== tweakCurrent(node)
+}
+
+function tweakTooltip(
+	tweak: TweakDef,
+	node: RenderableValueNode,
+): Record<string, unknown> | undefined {
+	if (!tweakEnabled(tweak, node)) return undefined
+	const content = tweakResult(tweak, node)
+	return content ? { ...TOOLTIP_BASE, content: String(content) } : undefined
+}
+
+function tweakLabel(tweak: TweakDef, node: RenderableValueNode): string {
+	const result = tweakResult(tweak, node)
+	return result !== null && result !== undefined ? String(result) : 'Apply suggested value'
+}
+
+function applyTweak(tweak: TweakDef, node: RenderableValueNode): void {
+	const result = tweakResult(tweak, node)
+	if (result !== null && result !== undefined) {
+		updateValue(node, result)
+	}
+}
+
+function nodeKey(item: ChildNode, idx: number): string {
+	return typeof item === 'object' && item !== null && hasIdCap(item) ? item.id : `n-${idx}`
+}
+
+function modelProp(item: object): string {
+	return (item as RenderableValueNode)._modelProp
+}
+
+function updateEvent(item: object): string {
+	return `update:${modelProp(item)}`
+}
+
+function updateValue(item: RenderableValueNode, v: unknown): void {
+	const onChange = hasCap(item, '_onChange')
+		? (item._onChange as OnChangeFn | undefined)
+		: undefined
+	if (onChange) {
+		const result = onChange(v as string, { override: (ov) => ({ __override: ov }) })
+		if (result && typeof result === 'object' && '__override' in result) {
+			writeNodeValue(item, props.state, props.write, result.__override as never, wrappedState.value)
+			return
+		}
+	}
+	writeNodeValue(item, props.state, props.write, v as never, wrappedState.value)
+}
+
+const seenOnChangeValues = new Map<object, unknown>()
+
+watchEffect(() => {
+	for (const node of props.nodes) {
+		if (typeof node !== 'object' || node === null) continue
+		if (!hasCap(node, '_onChange') || !(node as { _onChange: unknown })._onChange) continue
+		if (!hasValueCap(node) || !hasIdCap(node)) continue
+		if (!isShown(node as AnyNode)) continue
+		const value = getEffectiveValue(node, props.state[node.id], wrappedState.value)
+		if (seenOnChangeValues.has(node) && seenOnChangeValues.get(node) === value) continue
+		seenOnChangeValues.set(node, value)
+		const onChange = (node as RenderableValueNode)._onChange as OnChangeFn | undefined
+		onChange?.(value as never, { override: (ov) => ({ __override: ov }) })
+	}
+})
+</script>
+
+<template>
+	<div :class="[flex ? 'flex flex-wrap gap-2' : 'space-y-4', 'w-full']">
+		<template v-for="(item, idx) in nodes" :key="nodeKey(item, idx)">
+			<template v-if="typeof item !== 'object' || item === null">
+				<template v-if="typeof item === 'string'">{{ item }}</template>
+				<component :is="item" v-else />
+			</template>
+
+			<template v-else-if="isShown(item)">
+				<div
+					:class="
+						hasChildrenCap(item) && !hasValueCap(item)
+							? 'w-full'
+							: !getTitle(item)
+								? 'contents'
+								: undefined
+					"
+				>
+					<div v-if="getTitle(item)" class="mb-2" :class="titleClass(titleDepth ?? 0)">
+						<!-- eslint-disable vue/no-v-html -- title text is author-controlled (stage definitions), not user input -->
+						<span
+							v-html="renderString(getTitle(item)!).replace(/^<p>([\s\S]*)<\/p>\n?$/, '$1')"
+						/><span v-if="needsAttention(item)" class="text-red">*</span>
+						<!-- eslint-enable vue/no-v-html -->
+					</div>
+
+					<template v-if="hasChildrenCap(item) && !hasValueCap(item)">
+						<NodeRenderer
+							:nodes="resolveChildren(item, containerScope(item).state)"
+							:state="containerScope(item).state"
+							:write="containerScope(item).write"
+							:on-image-upload="onImageUpload"
+							:app-components="appComponents"
+							:global-state="globalState"
+							:flex="(item as any)._layout !== 'column'"
+							:title-depth="getTitle(item) !== undefined ? (titleDepth ?? 0) + 1 : titleDepth"
+						/>
+					</template>
+
+					<template v-else-if="hasValueCap(item) && hasIdCap(item)">
+						<component
+							:is="resolveComponent(item as RenderableValueNode)"
+							v-if="resolveComponent(item as RenderableValueNode) === ActionButton"
+							v-bind="componentProps(item as RenderableValueNode)"
+							:[modelProp(item)]="
+								getEffectiveValue(item as RenderableValueNode, state[item.id], wrappedState)
+							"
+							@[updateEvent(item)]="(v: unknown) => updateValue(item as RenderableValueNode, v)"
+						/>
+						<component
+							:is="resolveComponent(item as RenderableValueNode)"
+							v-else
+							v-tooltip="resolveTooltip(item)"
+							v-bind="componentProps(item as RenderableValueNode)"
+							:[modelProp(item)]="
+								getEffectiveValue(item as RenderableValueNode, state[item.id], wrappedState)
+							"
+							@[updateEvent(item)]="(v: unknown) => updateValue(item as RenderableValueNode, v)"
+						/>
+						<template
+							v-for="(tweak, tIdx) in (item as RenderableValueNode)._tweaks ?? []"
+							:key="`tweak-${tIdx}`"
+						>
+							<IconButton
+								v-tooltip="tweakTooltip(tweak, item as RenderableValueNode)"
+								:label="tweakLabel(tweak, item as RenderableValueNode)"
+								:disabled="!tweakEnabled(tweak, item as RenderableValueNode)"
+								@click="applyTweak(tweak, item as RenderableValueNode)"
+							>
+								<component :is="tweak.icon" />
+							</IconButton>
+						</template>
+					</template>
+
+					<template v-else-if="hasCap(item, '_onClick')">
+						<Button
+							v-tooltip="resolveTooltip(item)"
+							:disabled="!isEnabled(item as any)"
+							:aria-label="(item as any)._icon ? (item as any).label : undefined"
+							@click="clickButton(item)"
+						>
+							<component :is="(item as any)._icon" v-if="(item as any)._icon" />
+							<template v-else>{{ (item as any).label }}</template>
+						</Button>
+					</template>
+				</div>
+			</template>
+		</template>
+
+		<template v-for="(item, idx) in nodes" :key="`children-${nodeKey(item, idx)}`">
+			<NodeRenderer
+				v-if="
+					typeof item === 'object' &&
+					item !== null &&
+					isShown(item) &&
+					hasValueCap(item) &&
+					hasIdCap(item) &&
+					hasChildrenCap(item) &&
+					isNodeActive(item, state[item.id], wrappedState) &&
+					resolveChildren(item, valueScope(item).state).length
+				"
+				:nodes="resolveChildren(item, valueScope(item).state)"
+				:state="valueScope(item).state"
+				:write="valueScope(item).write"
+				:on-image-upload="onImageUpload"
+				:app-components="appComponents"
+				:global-state="globalState"
+				:title-depth="getTitle(item) !== undefined ? (titleDepth ?? 0) + 1 : titleDepth"
+				class="w-full"
+			/>
+		</template>
+	</div>
+</template>
diff --git a/packages/moderation/src/types/node/context.ts b/packages/moderation/src/types/node/context.ts
new file mode 100644
index 0000000000..d00be856d4
--- /dev/null
+++ b/packages/moderation/src/types/node/context.ts
@@ -0,0 +1,11 @@
+import type { InjectionKey, Ref } from 'vue'
+
+import type { NodeMeta } from './node-meta'
+
+export interface ChecklistMetaContext {
+	metaMap: Map<object, NodeMeta>
+	attentionMap: Map<object, boolean>
+	tooltipHtml: Map<object, string>
+}
+
+export const CHECKLIST_META_KEY: InjectionKey<Ref<ChecklistMetaContext>> = Symbol('checklistMeta')
diff --git a/packages/moderation/src/types/node/factories.ts b/packages/moderation/src/types/node/factories.ts
new file mode 100644
index 0000000000..d5441d468e
--- /dev/null
+++ b/packages/moderation/src/types/node/factories.ts
@@ -0,0 +1,372 @@
+import { Checkbox, Combobox, MarkdownEditor, StyledInput, Toggle } from '@modrinth/ui'
+import { markRaw } from 'vue'
+
+import { withAutoProps, withChildren } from './builder'
+import type { ComponentNodePropsContext, Configurable } from './capabilities'
+import {
+	withComponent,
+	withEditable,
+	withEnabled,
+	withExtraProps,
+	withFix,
+	withIcon,
+	withId,
+	withLayout,
+	withMessaging,
+	withNoneLabel,
+	withOnClick,
+	withPriority,
+	withRequired,
+	withSelectable,
+	withShown,
+	withStageMeta,
+	withStateOrigin,
+	withTitle,
+	withTooltip,
+	withTweak,
+	withValue,
+} from './capabilities'
+import ActionButton from './components/ActionButton.vue'
+import { pipe } from './pipe'
+import type { NodeState, NodeStateWithChildren } from './state'
+
+function getBooleanValue(raw: NodeState): boolean {
+	if (typeof raw === 'boolean') return raw
+	if (raw && typeof raw === 'object' && !(raw instanceof Set)) {
+		const v = (raw as NodeStateWithChildren).value
+		if (typeof v === 'boolean') return v
+	}
+	return false
+}
+
+function setBooleanValue(raw: NodeState, next: boolean, isDefault?: boolean): NodeState {
+	if (raw && typeof raw === 'object' && !(raw instanceof Set)) {
+		const { value: _v, ...children } = raw as NodeStateWithChildren & Record<string, NodeState>
+		if (Object.keys(children).length > 0) return isDefault ? children : { ...children, value: next }
+	}
+	return isDefault ? undefined : next
+}
+
+export const booleanValue = {
+	_getValue: getBooleanValue,
+	_setValue: setBooleanValue,
+	_isActive: (v: boolean) => v === true,
+}
+
+export function toggle(id: string, label: string) {
+	return pipe(
+		{ label } as { label: string },
+		(n) => withId(n, id),
+		withChildren,
+		withShown,
+		withIcon,
+		withTooltip,
+		withTitle,
+		withMessaging,
+		withPriority,
+		withRequired,
+		withFix,
+		withEnabled,
+		(n) => withValue(n, booleanValue),
+		(n) =>
+			withComponent(n, {
+				component: markRaw(ActionButton),
+				componentProps: (ctx) => ({
+					label: n.label,
+					icon: n._icon,
+					needsAttention: ctx.nodeFacts?.needsAttention ?? false,
+					fixActionable: ctx.nodeFacts?.fixActionable ?? false,
+					tooltip: ctx.tooltip,
+				}),
+			}),
+	)
+}
+
+export function button(label?: string) {
+	return pipe(
+		{ label } as { label?: string },
+		withShown,
+		withIcon,
+		withTooltip,
+		withEnabled,
+		withOnClick,
+	)
+}
+
+export function check(id: string, label: string) {
+	return withAutoProps(
+		pipe(
+			{ label } as { label: string },
+			(n) => withId(n, id),
+			withChildren,
+			withShown,
+			withTooltip,
+			withTitle,
+			withMessaging,
+			withPriority,
+			withRequired,
+			withFix,
+			withEnabled,
+			(n) => withValue(n, booleanValue),
+			(n) =>
+				withComponent(n, {
+					component: markRaw(Checkbox),
+					componentProps: () => ({ label }),
+				}),
+			withExtraProps,
+		),
+	)
+}
+
+export function toggleSwitch(id: string, label: string) {
+	return withAutoProps(
+		pipe(
+			{ label } as { label: string },
+			(n) => withId(n, id),
+			withChildren,
+			withShown,
+			withTooltip,
+			withTitle,
+			withMessaging,
+			withPriority,
+			withRequired,
+			withFix,
+			withEnabled,
+			(n) => withValue(n, booleanValue),
+			(n) => withComponent(n, { component: markRaw(Toggle) }),
+			withExtraProps,
+		),
+	)
+}
+
+export function group(id?: string) {
+	const base = pipe(
+		{} as Record<string, never>,
+		withChildren,
+		withShown,
+		withTitle,
+		withRequired,
+		withSelectable,
+		withLayout,
+	)
+	return id === undefined ? base : withId(base, id)
+}
+
+export type GroupNode = ReturnType<typeof group>
+
+export function externalGroup(path: string[]) {
+	return pipe({} as Record<string, never>, withChildren, withShown, (n) =>
+		withStateOrigin(n).stateOrigin(path),
+	)
+}
+
+const optionValue = {
+	_getValue: () => true,
+	_setValue: () => undefined,
+	_isActive: () => true,
+}
+
+export function option(value: string, label: string) {
+	return pipe(
+		{ value, label } as { value: string; label: string },
+		withChildren,
+		withShown,
+		withMessaging,
+		withPriority,
+		(n) => withValue(n, optionValue),
+	)
+}
+
+type OptionNode = ReturnType<typeof option>
+
+interface HasOptions {
+	_options: OptionNode[]
+	options(this: this, ...opts: OptionNode[]): this
+}
+
+function withOptions<T extends object>(node: T): T & HasOptions {
+	return Object.assign(node, {
+		_options: [] as OptionNode[],
+		options(this: HasOptions, ...opts: OptionNode[]) {
+			this._options = opts
+			return this
+		},
+	})
+}
+
+function getStringValue(raw: NodeState): string {
+	if (typeof raw === 'string') return raw
+	if (raw && typeof raw === 'object' && !(raw instanceof Set)) {
+		const v = (raw as NodeStateWithChildren).value
+		if (typeof v === 'string') return v
+	}
+	return ''
+}
+
+function setStringValue(raw: NodeState, next: string, isDefault?: boolean): NodeState {
+	if (raw && typeof raw === 'object' && !(raw instanceof Set)) {
+		const { value: _v, ...children } = raw as NodeStateWithChildren & Record<string, NodeState>
+		if (Object.keys(children).length > 0) return isDefault ? children : { ...children, value: next }
+	}
+	return isDefault ? undefined : next
+}
+
+const dropdownValue = {
+	_getValue: getStringValue,
+	_setValue: setStringValue,
+	_isActive: (v: string) => v !== '',
+}
+
+export function dropdown(id: string) {
+	return pipe(
+		{} as Record<string, never>,
+		(n) => withId(n, id),
+		withShown,
+		withTitle,
+		withRequired,
+		(n) => withValue(n, dropdownValue),
+		withNoneLabel,
+		withOptions,
+		(n) =>
+			withComponent(n, {
+				component: markRaw(Combobox),
+				componentProps: () => ({
+					options: [
+						...(n._none !== undefined ? [{ value: '', label: n._none }] : []),
+						...n._options.map((o) => ({ value: o.value, label: o.label })),
+					],
+					triggerClass:
+						'!bg-[var(--color-button-bg)] !rounded-[var(--radius-md)] !shadow-[var(--shadow-inset-sm),0_0_0_0_transparent]',
+					dropdownClass: '!rounded-[var(--radius-md)] !bg-[var(--color-button-bg)] !border-0',
+				}),
+			}),
+	)
+}
+
+export function stage(id: string, title: string) {
+	return pipe(
+		{ label: title } as { label: string },
+		(n) => withId(n, id),
+		withChildren,
+		withShown,
+		withIcon,
+		withStageMeta,
+		withMessaging,
+		withPriority,
+	)
+}
+
+export type StageNode = ReturnType<typeof stage>
+
+const stringValue = dropdownValue
+
+export function text(id: string) {
+	return withAutoProps(
+		pipe(
+			{} as Record<string, never>,
+			(n) => withId(n, id),
+			withChildren,
+			withShown,
+			withTooltip,
+			withTitle,
+			withMessaging,
+			withPriority,
+			withRequired,
+			withFix,
+			withEnabled,
+			withEditable,
+			(n) => Object.assign(n, { _showTooltip: true, _imperativeSync: true }),
+			(n) => withValue(n, stringValue),
+			withTweak,
+			(n) =>
+				withComponent(n, {
+					component: markRaw(StyledInput),
+					componentProps: () => ({ class: 'min-w-40 flex-1', autocomplete: 'off' }),
+				}),
+			withExtraProps,
+		),
+	)
+}
+
+export function markdown(id: string) {
+	return withAutoProps(
+		pipe(
+			{} as Record<string, never>,
+			(n) => withId(n, id),
+			withChildren,
+			withShown,
+			withTooltip,
+			withTitle,
+			withMessaging,
+			withPriority,
+			withRequired,
+			withFix,
+			withEnabled,
+			withEditable,
+			(n) => withValue(n, stringValue),
+			(n) =>
+				withComponent(n, {
+					component: markRaw(MarkdownEditor),
+					componentProps: (ctx) => ({
+						maxHeight: 300,
+						disabled: false,
+						headingButtons: false,
+						onImageUpload: ctx.onImageUpload,
+					}),
+				}),
+			withExtraProps,
+		),
+	)
+}
+
+function getSetValue(raw: NodeState): string[] {
+	return raw instanceof Set ? Array.from(raw) : []
+}
+
+function setSetValue(_raw: NodeState, next: string[], isDefault?: boolean): NodeState {
+	return isDefault || next.length === 0 ? undefined : new Set(next)
+}
+
+const setValue = {
+	_getValue: getSetValue,
+	_setValue: setSetValue,
+	_isActive: (v: string[]) => v.length > 0,
+}
+
+const stringValueBehavior = {
+	_getValue: getStringValue,
+	_setValue: setStringValue,
+	_isActive: (v: string) => v !== '',
+}
+
+export function appComponent(id: string, rendererKey: string) {
+	const node = pipe(
+		{} as Record<string, never>,
+		(n) => withId(n, id),
+		withChildren,
+		withShown,
+		withTooltip,
+		withTitle,
+		withMessaging,
+		withPriority,
+		withRequired,
+		withFix,
+		withEnabled,
+		(n) => withValue(n, stringValueBehavior),
+		(n) => withComponent(n, { rendererKey }),
+		withExtraProps,
+	)
+	return Object.assign(node, {
+		valueKind(this: Configurable, kind: 'boolean' | 'string' | 'set') {
+			Object.assign(
+				this,
+				kind === 'boolean' ? booleanValue : kind === 'set' ? setValue : stringValueBehavior,
+			)
+			return this
+		},
+		props(this: Configurable, fn: (ctx: ComponentNodePropsContext) => Record<string, unknown>) {
+			this._extraProps = fn
+			return this
+		},
+	})
+}
diff --git a/packages/moderation/src/types/node/fix.ts b/packages/moderation/src/types/node/fix.ts
new file mode 100644
index 0000000000..7261a75ac0
--- /dev/null
+++ b/packages/moderation/src/types/node/fix.ts
@@ -0,0 +1,58 @@
+import type { Labrinth } from '@modrinth/api-client'
+
+import type { NodeState } from './state'
+
+export class FixBuilder {
+	_projectFn?: (
+		patch: Labrinth.Projects.v3.EditProjectRequest,
+		state: Record<string, NodeState>,
+	) => void
+	_versionFn?: (
+		patch: Labrinth.Versions.v3.ModifyVersionRequest,
+		state: Record<string, NodeState>,
+	) => void
+
+	project(
+		fn: (patch: Labrinth.Projects.v3.EditProjectRequest, state: Record<string, NodeState>) => void,
+	): this {
+		this._projectFn = fn
+		return this
+	}
+
+	version(
+		fn: (
+			patch: Labrinth.Versions.v3.ModifyVersionRequest,
+			state: Record<string, NodeState>,
+		) => void,
+	): this {
+		this._versionFn = fn
+		return this
+	}
+}
+
+export function fix(): FixBuilder {
+	return new FixBuilder()
+}
+
+export function createTrackedPatch<T extends object>(
+	source: T,
+): { proxy: T; changes: () => Partial<T> } {
+	const written = new Set<string | symbol>()
+	const data = { ...source }
+	const proxy = new Proxy(data, {
+		set(target, key, value) {
+			if (value !== (source as Record<string | symbol, unknown>)[key]) {
+				written.add(key)
+			} else {
+				written.delete(key)
+			}
+			;(target as Record<string | symbol, unknown>)[key] = value
+			return true
+		},
+	})
+	return {
+		proxy,
+		changes: () =>
+			Object.fromEntries([...written].map((k) => [k, data[k as keyof T]])) as Partial<T>,
+	}
+}
diff --git a/packages/moderation/src/types/node/index.ts b/packages/moderation/src/types/node/index.ts
new file mode 100644
index 0000000000..bb3a6aa2ed
--- /dev/null
+++ b/packages/moderation/src/types/node/index.ts
@@ -0,0 +1,12 @@
+export * from './builder'
+export * from './capabilities'
+export * from './collect'
+export * from './context'
+export * from './factories'
+export * from './fix'
+export * from './messages'
+export * from './mutate'
+export * from './node-meta'
+export * from './pipe'
+export * from './resolve'
+export * from './state'
diff --git a/packages/moderation/src/types/node/messages.ts b/packages/moderation/src/types/node/messages.ts
new file mode 100644
index 0000000000..5878d9470b
--- /dev/null
+++ b/packages/moderation/src/types/node/messages.ts
@@ -0,0 +1,145 @@
+import type { Labrinth } from '@modrinth/api-client'
+import type { Ref } from 'vue'
+
+import {
+	expandVariables,
+	flattenProjectV3Variables,
+	flattenProjectVariables,
+	flattenStaticVariables,
+} from '../../utils'
+import type { GetVarsFn, MessageSegment, NodeState } from './state'
+
+const messageFiles = import.meta.glob('../../data/messages/**/*.md', {
+	query: '?raw',
+	import: 'default',
+})
+
+export type MessageFn = ((state: Record<string, NodeState>) => Promise<string>) & {
+	concat(...others: MessageFn[]): MessageFn
+}
+
+function makeMessageFn(fn: (state: Record<string, NodeState>) => Promise<string>): MessageFn {
+	const rich = fn as MessageFn
+	rich.concat = (...others) =>
+		makeMessageFn(async (state) =>
+			(await Promise.all([rich, ...others].map((f) => f(state)))).join(''),
+		)
+	return rich
+}
+
+let _project: Ref<Labrinth.Projects.v3.Project> | null = null
+let _projectV2: Ref<Labrinth.Projects.v2.Project> | null = null
+let _onMissingMd: ((path: string) => void) | null = null
+
+export function setMissingMdHandler(handler: (path: string) => void) {
+	_onMissingMd = handler
+}
+
+export function setMessageProject(
+	project: Ref<Labrinth.Projects.v3.Project>,
+	projectV2: Ref<Labrinth.Projects.v2.Project>,
+) {
+	_project = project
+	_projectV2 = projectV2
+}
+
+export function mdEscape(text: string): string {
+	return text.replace(/[\\*_`[~]/g, '\\$&')
+}
+
+const USER_CONTENT_KEYS = [
+	'PROJECT_TITLE',
+	'PROJECT_SLUG',
+	'PROJECT_SUMMARY',
+	'PROJECT_TYPE',
+	'PROJECT_STATUS',
+]
+
+export async function loadMd(
+	path: string,
+	state: Record<string, NodeState>,
+	project: Labrinth.Projects.v3.Project,
+	projectV2: Labrinth.Projects.v2.Project,
+	getVars?: GetVarsFn,
+): Promise<string> {
+	const extraVars = getVars ? getVars(state) : null
+	const loader = messageFiles[`../../data/messages/${path}.md`]
+	if (!loader) {
+		_onMissingMd?.(path)
+		return ''
+	}
+	const raw = (await loader()) as string
+	const vars: Record<string, string> = {
+		...flattenStaticVariables(),
+		...flattenProjectVariables(projectV2),
+		...flattenProjectV3Variables(project),
+	}
+	for (const key of USER_CONTENT_KEYS) {
+		if (key in vars) vars[key] = mdEscape(vars[key])
+	}
+	if (extraVars) {
+		for (const [k, v] of Object.entries(extraVars)) {
+			vars[k] = String(v ?? '')
+		}
+	}
+	const expanded = expandVariables(raw, projectV2, project, vars)
+	return expanded.replace(/`[^`\n]*`/g, (match) => match.replace(/\\([\\*_`[~])/g, '$1'))
+}
+
+export function mdOptional(path: string, getVars?: GetVarsFn): MessageFn {
+	return makeMessageFn(async (state) => {
+		const loader = messageFiles[`../../data/messages/${path}.md`]
+		if (!loader) return ''
+		return loadMd(path, state, _project!.value, _projectV2!.value, getVars)
+	})
+}
+
+export function md(
+	path: string | ((state: Record<string, NodeState>) => string),
+	getVars?: GetVarsFn,
+): MessageFn {
+	return makeMessageFn(async (state) => {
+		const resolvedPath = typeof path === 'function' ? path(state) : path
+		return loadMd(resolvedPath, state, _project!.value, _projectV2!.value, getVars)
+	})
+}
+
+export function resolveRelativeMessagePath(
+	messagePath: string | (() => string),
+	statePath: string[],
+): string {
+	const name = typeof messagePath === 'function' ? messagePath() : messagePath
+	if (name.startsWith('/')) return `checklist/messages${name}`
+	const parts = [...statePath.slice(0, -1), ...name.split('/')]
+	const normalized = parts.reduce<string[]>((acc, p) => {
+		if (p === '..') acc.pop()
+		else if (p) acc.push(p)
+		return acc
+	}, [])
+	return `checklist/messages/${normalized.join('/')}`
+}
+
+export async function evalSegment(
+	seg: MessageSegment,
+	state: Record<string, NodeState>,
+	statePath: string[],
+): Promise<string> {
+	if (seg.type === 'collect') return ''
+	if (seg.type === 'fn') return String((await seg.fn(state)) ?? '')
+	if (seg.type === 'auto') {
+		return loadMd(
+			`checklist/messages/${statePath.join('/')}`,
+			state,
+			_project!.value,
+			_projectV2!.value,
+			seg.getVars,
+		)
+	}
+	return loadMd(
+		resolveRelativeMessagePath(seg.path, statePath),
+		state,
+		_project!.value,
+		_projectV2!.value,
+		seg.getVars,
+	)
+}
diff --git a/packages/moderation/src/types/node/mutate.ts b/packages/moderation/src/types/node/mutate.ts
new file mode 100644
index 0000000000..3a1544fe21
--- /dev/null
+++ b/packages/moderation/src/types/node/mutate.ts
@@ -0,0 +1,64 @@
+import type { HasValue, Identified } from './capabilities'
+import { getEffectiveValue } from './resolve'
+import type { NodeState } from './state'
+
+function valuesEqual(a: unknown, b: unknown): boolean {
+	if (Array.isArray(a) && Array.isArray(b)) {
+		if (a.length !== b.length) return false
+		const setB = new Set(b)
+		return a.every((v) => setB.has(v))
+	}
+	return a === b
+}
+
+export type Writer = (id: string, value: NodeState) => void
+
+export function childWriter(
+	parentRead: Record<string, NodeState>,
+	parentWrite: Writer,
+	containerId: string,
+): Writer {
+	return (childId, value) => {
+		const existing = parentRead[containerId]
+		const container: Record<string, NodeState> =
+			existing && typeof existing === 'object' && !(existing instanceof Set)
+				? { ...(existing as Record<string, NodeState>) }
+				: existing !== undefined
+					? { value: existing }
+					: {}
+		if (value === undefined) Reflect.deleteProperty(container, childId)
+		else container[childId] = value
+		parentWrite(containerId, Object.keys(container).length === 0 ? undefined : container)
+	}
+}
+
+export function writeNodeValue<V>(
+	node: HasValue<V> & Identified,
+	read: Record<string, NodeState>,
+	write: Writer,
+	next: V,
+	contextState: Record<string, NodeState> = read,
+): void {
+	const isDefault = valuesEqual(next, getEffectiveValue(node, undefined, contextState))
+	write(node.id, node._setValue(read[node.id], next, isDefault))
+}
+
+export function originScope(
+	root: Record<string, NodeState>,
+	path: string[],
+): { state: Record<string, NodeState>; write: Writer } {
+	let state = root
+	let write: Writer = (id, value) => {
+		if (value === undefined) Reflect.deleteProperty(root, id)
+		else root[id] = value
+	}
+	for (const segment of path) {
+		write = childWriter(state, write, segment)
+		const raw = state[segment]
+		state =
+			raw && typeof raw === 'object' && !(raw instanceof Set)
+				? (raw as Record<string, NodeState>)
+				: {}
+	}
+	return { state, write }
+}
diff --git a/packages/moderation/src/types/node/node-meta.ts b/packages/moderation/src/types/node/node-meta.ts
new file mode 100644
index 0000000000..41bf661cea
--- /dev/null
+++ b/packages/moderation/src/types/node/node-meta.ts
@@ -0,0 +1,129 @@
+import type { AnyNode, ChildNode, HasChildren } from './builder'
+import type { FixBuilder } from './fix'
+import {
+	getBooleanChildState,
+	hasCap,
+	hasChildrenCap,
+	hasIdCap,
+	hasOptionsCap,
+	hasValueCap,
+	isNodeActive,
+	isShown,
+	resolveActionState,
+	resolveChildren,
+	walkNodes,
+} from './resolve'
+import type { NodeState } from './state'
+
+export interface NodeMeta {
+	hasRequiredMissing: boolean
+	isFixActionable: boolean
+}
+
+export function computeNodeMeta(
+	children: ChildNode[],
+	stageState: Record<string, NodeState>,
+	isFixActionable: (fixes: FixBuilder[], state: Record<string, NodeState>) => boolean,
+): Map<object, NodeMeta> {
+	const map = new Map<object, NodeMeta>()
+
+	walkNodes(children, stageState, (node, nodeState, localState) => {
+		const active = isNodeActive(node, nodeState, localState)
+
+		const required = hasCap(node, '_required') && node._required === true
+		const hasRequiredMissing = required && !active
+
+		let fixActionable = false
+		if (active && hasCap(node, '_fixes')) {
+			const fixes = node._fixes as FixBuilder[]
+			if (fixes.length > 0) {
+				fixActionable = isFixActionable(fixes, resolveActionState(node, nodeState, localState))
+			}
+		}
+
+		map.set(node, { hasRequiredMissing, isFixActionable: fixActionable })
+	})
+
+	return map
+}
+
+export function computeAttentionMap(
+	nodes: ChildNode[],
+	stageState: Record<string, NodeState>,
+	metaMap: Map<object, NodeMeta>,
+	attention: Map<object, boolean> = new Map(),
+): Map<object, boolean> {
+	for (const node of nodes) {
+		if (typeof node !== 'object' || node === null) continue
+		if (!isShown(node as AnyNode)) continue
+
+		if (hasChildrenCap(node) && !hasValueCap(node)) {
+			const childState = childScopeFor(node, stageState)
+			computeAttentionMap(resolveChildren(node, childState), childState, metaMap, attention)
+			const childrenNeedAttention = someChildNeedsAttention(node, childState, attention)
+			const ownRequired = hasCap(node, '_required') && node._required === true
+			const unsatisfied = ownRequired && !hasActiveChild(node, childState)
+			attention.set(node, unsatisfied || childrenNeedAttention)
+			continue
+		}
+
+		if (hasValueCap(node) && hasIdCap(node)) {
+			const rawNodeState = stageState[node.id]
+			const active = isNodeActive(node, rawNodeState, stageState)
+			let childrenNeedAttention = false
+
+			if (active) {
+				if (hasOptionsCap(node)) {
+					const selectedValue = typeof rawNodeState === 'string' ? rawNodeState : undefined
+					const selected = node._options.find((o) => o.value === selectedValue)
+					if (selected && isShown(selected) && hasChildrenCap(selected)) {
+						computeAttentionMap(
+							resolveChildren(selected, stageState),
+							stageState,
+							metaMap,
+							attention,
+						)
+						childrenNeedAttention = someChildNeedsAttention(selected, stageState, attention)
+					}
+				} else if (hasChildrenCap(node)) {
+					const childState = getBooleanChildState(rawNodeState)
+					computeAttentionMap(resolveChildren(node, childState), childState, metaMap, attention)
+					childrenNeedAttention = someChildNeedsAttention(node, childState, attention)
+				}
+			}
+
+			const ownMissing = metaMap.get(node)?.hasRequiredMissing ?? false
+			attention.set(node, ownMissing || childrenNeedAttention)
+		}
+	}
+	return attention
+}
+
+function childScopeFor(
+	node: HasChildren & { id?: string },
+	state: Record<string, NodeState>,
+): Record<string, NodeState> {
+	if (!hasIdCap(node)) return state
+	const raw = state[node.id]
+	return raw && typeof raw === 'object' && !(raw instanceof Set)
+		? (raw as Record<string, NodeState>)
+		: {}
+}
+
+function hasActiveChild(node: HasChildren, childState: Record<string, NodeState>): boolean {
+	return resolveChildren(node, childState).some((child) => {
+		if (typeof child !== 'object' || child === null) return false
+		const raw = hasIdCap(child) ? childState[child.id] : undefined
+		return isNodeActive(child, raw, childState)
+	})
+}
+
+function someChildNeedsAttention(
+	node: HasChildren,
+	childState: Record<string, NodeState>,
+	attention: Map<object, boolean>,
+): boolean {
+	return resolveChildren(node, childState).some(
+		(child) => typeof child === 'object' && child !== null && attention.get(child) === true,
+	)
+}
diff --git a/packages/moderation/src/types/node/pipe.ts b/packages/moderation/src/types/node/pipe.ts
new file mode 100644
index 0000000000..39dab1fff7
--- /dev/null
+++ b/packages/moderation/src/types/node/pipe.ts
@@ -0,0 +1,29 @@
+export function pipe<A>(a: A): A
+export function pipe<A, B>(a: A, f1: (a: A) => B,): B
+export function pipe<A, B, C>(a: A, f1: (a: A) => B, f2: (b: B) => C,): C
+export function pipe<A, B, C, D>(a: A, f1: (a: A) => B, f2: (b: B) => C, f3: (c: C) => D,): D
+export function pipe<A, B, C, D, E>(a: A, f1: (a: A) => B, f2: (b: B) => C, f3: (c: C) => D, f4: (d: D) => E,): E
+export function pipe<A, B, C, D, E, F>(a: A, f1: (a: A) => B, f2: (b: B) => C, f3: (c: C) => D, f4: (d: D) => E, f5: (e: E) => F,): F
+export function pipe<A, B, C, D, E, F, G>(a: A, f1: (a: A) => B, f2: (b: B) => C, f3: (c: C) => D, f4: (d: D) => E, f5: (e: E) => F, f6: (f: F) => G,): G
+export function pipe<A, B, C, D, E, F, G, H>(a: A, f1: (a: A) => B, f2: (b: B) => C, f3: (c: C) => D, f4: (d: D) => E, f5: (e: E) => F, f6: (f: F) => G, f7: (g: G) => H,): H
+export function pipe<A, B, C, D, E, F, G, H, I>(a: A, f1: (a: A) => B, f2: (b: B) => C, f3: (c: C) => D, f4: (d: D) => E, f5: (e: E) => F, f6: (f: F) => G, f7: (g: G) => H, f8: (h: H) => I,): I
+export function pipe<A, B, C, D, E, F, G, H, I, J>(a: A, f1: (a: A) => B, f2: (b: B) => C, f3: (c: C) => D, f4: (d: D) => E, f5: (e: E) => F, f6: (f: F) => G, f7: (g: G) => H, f8: (h: H) => I, f9: (i: I) => J,): J
+export function pipe<A, B, C, D, E, F, G, H, I, J, K>(a: A, f1: (a: A) => B, f2: (b: B) => C, f3: (c: C) => D, f4: (d: D) => E, f5: (e: E) => F, f6: (f: F) => G, f7: (g: G) => H, f8: (h: H) => I, f9: (i: I) => J, f10: (j: J) => K,): K
+export function pipe<A, B, C, D, E, F, G, H, I, J, K, L>(a: A, f1: (a: A) => B, f2: (b: B) => C, f3: (c: C) => D, f4: (d: D) => E, f5: (e: E) => F, f6: (f: F) => G, f7: (g: G) => H, f8: (h: H) => I, f9: (i: I) => J, f10: (j: J) => K, f11: (k: K) => L,): L
+export function pipe<A, B, C, D, E, F, G, H, I, J, K, L, M>(a: A, f1: (a: A) => B, f2: (b: B) => C, f3: (c: C) => D, f4: (d: D) => E, f5: (e: E) => F, f6: (f: F) => G, f7: (g: G) => H, f8: (h: H) => I, f9: (i: I) => J, f10: (j: J) => K, f11: (k: K) => L, f12: (l: L) => M,): M
+export function pipe<A, B, C, D, E, F, G, H, I, J, K, L, M, N>(a: A, f1: (a: A) => B, f2: (b: B) => C, f3: (c: C) => D, f4: (d: D) => E, f5: (e: E) => F, f6: (f: F) => G, f7: (g: G) => H, f8: (h: H) => I, f9: (i: I) => J, f10: (j: J) => K, f11: (k: K) => L, f12: (l: L) => M, f13: (m: M) => N,): N
+export function pipe<A, B, C, D, E, F, G, H, I, J, K, L, M, N, O>(a: A, f1: (a: A) => B, f2: (b: B) => C, f3: (c: C) => D, f4: (d: D) => E, f5: (e: E) => F, f6: (f: F) => G, f7: (g: G) => H, f8: (h: H) => I, f9: (i: I) => J, f10: (j: J) => K, f11: (k: K) => L, f12: (l: L) => M, f13: (m: M) => N, f14: (n: N) => O,): O
+export function pipe<A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P>(a: A, f1: (a: A) => B, f2: (b: B) => C, f3: (c: C) => D, f4: (d: D) => E, f5: (e: E) => F, f6: (f: F) => G, f7: (g: G) => H, f8: (h: H) => I, f9: (i: I) => J, f10: (j: J) => K, f11: (k: K) => L, f12: (l: L) => M, f13: (m: M) => N, f14: (n: N) => O, f15: (o: O) => P,): P
+export function pipe<A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q>(a: A, f1: (a: A) => B, f2: (b: B) => C, f3: (c: C) => D, f4: (d: D) => E, f5: (e: E) => F, f6: (f: F) => G, f7: (g: G) => H, f8: (h: H) => I, f9: (i: I) => J, f10: (j: J) => K, f11: (k: K) => L, f12: (l: L) => M, f13: (m: M) => N, f14: (n: N) => O, f15: (o: O) => P, f16: (p: P) => Q,): Q
+export function pipe<A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R>(a: A, f1: (a: A) => B, f2: (b: B) => C, f3: (c: C) => D, f4: (d: D) => E, f5: (e: E) => F, f6: (f: F) => G, f7: (g: G) => H, f8: (h: H) => I, f9: (i: I) => J, f10: (j: J) => K, f11: (k: K) => L, f12: (l: L) => M, f13: (m: M) => N, f14: (n: N) => O, f15: (o: O) => P, f16: (p: P) => Q, f17: (q: Q) => R,): R
+export function pipe<A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S>(a: A, f1: (a: A) => B, f2: (b: B) => C, f3: (c: C) => D, f4: (d: D) => E, f5: (e: E) => F, f6: (f: F) => G, f7: (g: G) => H, f8: (h: H) => I, f9: (i: I) => J, f10: (j: J) => K, f11: (k: K) => L, f12: (l: L) => M, f13: (m: M) => N, f14: (n: N) => O, f15: (o: O) => P, f16: (p: P) => Q, f17: (q: Q) => R, f18: (r: R) => S,): S
+export function pipe<A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T>(a: A, f1: (a: A) => B, f2: (b: B) => C, f3: (c: C) => D, f4: (d: D) => E, f5: (e: E) => F, f6: (f: F) => G, f7: (g: G) => H, f8: (h: H) => I, f9: (i: I) => J, f10: (j: J) => K, f11: (k: K) => L, f12: (l: L) => M, f13: (m: M) => N, f14: (n: N) => O, f15: (o: O) => P, f16: (p: P) => Q, f17: (q: Q) => R, f18: (r: R) => S, f19: (s: S) => T,): T
+export function pipe<A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U>(a: A, f1: (a: A) => B, f2: (b: B) => C, f3: (c: C) => D, f4: (d: D) => E, f5: (e: E) => F, f6: (f: F) => G, f7: (g: G) => H, f8: (h: H) => I, f9: (i: I) => J, f10: (j: J) => K, f11: (k: K) => L, f12: (l: L) => M, f13: (m: M) => N, f14: (n: N) => O, f15: (o: O) => P, f16: (p: P) => Q, f17: (q: Q) => R, f18: (r: R) => S, f19: (s: S) => T, f20: (t: T) => U,): U
+export function pipe<A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V>(a: A, f1: (a: A) => B, f2: (b: B) => C, f3: (c: C) => D, f4: (d: D) => E, f5: (e: E) => F, f6: (f: F) => G, f7: (g: G) => H, f8: (h: H) => I, f9: (i: I) => J, f10: (j: J) => K, f11: (k: K) => L, f12: (l: L) => M, f13: (m: M) => N, f14: (n: N) => O, f15: (o: O) => P, f16: (p: P) => Q, f17: (q: Q) => R, f18: (r: R) => S, f19: (s: S) => T, f20: (t: T) => U, f21: (u: U) => V,): V
+export function pipe<A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W>(a: A, f1: (a: A) => B, f2: (b: B) => C, f3: (c: C) => D, f4: (d: D) => E, f5: (e: E) => F, f6: (f: F) => G, f7: (g: G) => H, f8: (h: H) => I, f9: (i: I) => J, f10: (j: J) => K, f11: (k: K) => L, f12: (l: L) => M, f13: (m: M) => N, f14: (n: N) => O, f15: (o: O) => P, f16: (p: P) => Q, f17: (q: Q) => R, f18: (r: R) => S, f19: (s: S) => T, f20: (t: T) => U, f21: (u: U) => V, f22: (v: V) => W,): W
+export function pipe<A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X>(a: A, f1: (a: A) => B, f2: (b: B) => C, f3: (c: C) => D, f4: (d: D) => E, f5: (e: E) => F, f6: (f: F) => G, f7: (g: G) => H, f8: (h: H) => I, f9: (i: I) => J, f10: (j: J) => K, f11: (k: K) => L, f12: (l: L) => M, f13: (m: M) => N, f14: (n: N) => O, f15: (o: O) => P, f16: (p: P) => Q, f17: (q: Q) => R, f18: (r: R) => S, f19: (s: S) => T, f20: (t: T) => U, f21: (u: U) => V, f22: (v: V) => W, f23: (w: W) => X,): X
+export function pipe<A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y>(a: A, f1: (a: A) => B, f2: (b: B) => C, f3: (c: C) => D, f4: (d: D) => E, f5: (e: E) => F, f6: (f: F) => G, f7: (g: G) => H, f8: (h: H) => I, f9: (i: I) => J, f10: (j: J) => K, f11: (k: K) => L, f12: (l: L) => M, f13: (m: M) => N, f14: (n: N) => O, f15: (o: O) => P, f16: (p: P) => Q, f17: (q: Q) => R, f18: (r: R) => S, f19: (s: S) => T, f20: (t: T) => U, f21: (u: U) => V, f22: (v: V) => W, f23: (w: W) => X, f24: (x: X) => Y,): Y
+export function pipe<A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z>(a: A, f1: (a: A) => B, f2: (b: B) => C, f3: (c: C) => D, f4: (d: D) => E, f5: (e: E) => F, f6: (f: F) => G, f7: (g: G) => H, f8: (h: H) => I, f9: (i: I) => J, f10: (j: J) => K, f11: (k: K) => L, f12: (l: L) => M, f13: (m: M) => N, f14: (n: N) => O, f15: (o: O) => P, f16: (p: P) => Q, f17: (q: Q) => R, f18: (r: R) => S, f19: (s: S) => T, f20: (t: T) => U, f21: (u: U) => V, f22: (v: V) => W, f23: (w: W) => X, f24: (x: X) => Y, f25: (y: Y) => Z,): Z
+export function pipe(a: unknown, ...fns: Array<(x: unknown) => unknown>): unknown {
+  return fns.reduce((acc, fn) => fn(acc), a)
+}
diff --git a/packages/moderation/src/types/node/resolve.ts b/packages/moderation/src/types/node/resolve.ts
new file mode 100644
index 0000000000..957b769330
--- /dev/null
+++ b/packages/moderation/src/types/node/resolve.ts
@@ -0,0 +1,325 @@
+import type { Ref } from 'vue'
+import { toValue } from 'vue'
+
+import type { AnyNode, ChildEntry, ChildNode, HasChildren } from './builder'
+import type { HasValue, Identified } from './capabilities'
+import type { Writer } from './mutate'
+import { childWriter, writeNodeValue } from './mutate'
+import type { NodeState } from './state'
+import { resolve } from './state'
+
+export function hasCap<K extends string>(node: object, key: K): node is Record<K, unknown> {
+	return key in node
+}
+
+export function hasValueCap(node: object): node is HasValue {
+	return hasCap(node, '_getValue') && hasCap(node, '_isActive')
+}
+
+export function hasChildrenCap(node: object): node is HasChildren {
+	return hasCap(node, '_children')
+}
+
+export function hasOptionsCap(node: object): node is { _options: OptionLike[] } {
+	return hasCap(node, '_options')
+}
+
+export function hasIdCap(node: object): node is Identified {
+	return hasCap(node, 'id')
+}
+
+interface OptionLike extends AnyNode, Partial<HasChildren> {
+	value: string
+	_segments?: unknown[]
+}
+
+export function isShown(node: AnyNode): boolean {
+	return node._shown === undefined || resolve(node._shown)
+}
+
+export function getEffectiveValue<V>(
+	node: HasValue<V>,
+	rawState: NodeState,
+	contextState: Record<string, NodeState> = {},
+): V {
+	if (rawState !== undefined) return node._getValue(rawState)
+	if (node._defaultValue !== undefined) {
+		const def =
+			typeof node._defaultValue === 'function'
+				? (node._defaultValue as (state: Record<string, NodeState>) => NodeState)(contextState)
+				: (node._defaultValue as unknown as NodeState)
+		return node._getValue(def)
+	}
+	return node._getValue(rawState)
+}
+
+export function isNodeActive(
+	node: object,
+	rawState: NodeState,
+	contextState: Record<string, NodeState> = {},
+): boolean {
+	if (hasValueCap(node)) return node._isActive(getEffectiveValue(node, rawState, contextState))
+	return false
+}
+
+export function getBooleanChildState(nodeState: NodeState): Record<string, NodeState> {
+	if (nodeState && typeof nodeState === 'object' && !(nodeState instanceof Set)) {
+		return nodeState as Record<string, NodeState>
+	}
+	return {}
+}
+
+export function resolveChildren(node: HasChildren, state: Record<string, NodeState>): ChildNode[] {
+	const entries: ChildEntry[] = node._childrenFn ? node._childrenFn(state) : node._children
+
+	const result: ChildNode[] = []
+	for (const entry of entries) {
+		if (entry == null) continue
+		if (typeof entry === 'string') {
+			result.push(entry)
+			continue
+		}
+		if (typeof entry === 'function') {
+			if (entry.length === 0) {
+				result.push(entry as () => unknown)
+				continue
+			}
+			const fn = entry as (state?: Record<string, NodeState>) => AnyNode | AnyNode[] | null
+			const resolved = fn(state)
+			if (resolved == null) continue
+			if (Array.isArray(resolved)) {
+				for (const r of resolved) {
+					if (r != null && isShown(r)) result.push(r)
+				}
+				continue
+			}
+			if (isShown(resolved)) result.push(resolved)
+			continue
+		}
+		const resolved = toValue(entry as AnyNode | Ref<AnyNode | null>)
+		if (resolved != null && isShown(resolved)) result.push(resolved)
+	}
+	return result
+}
+
+function buildChildMap(
+	children: ChildNode[],
+	stateForFlattening: Record<string, NodeState>,
+): Map<string, object> {
+	const map = new Map<string, object>()
+	function collect(nodes: ChildNode[]) {
+		for (const node of nodes) {
+			if (typeof node !== 'object' || node === null) continue
+			if (hasIdCap(node)) {
+				map.set(node.id, node)
+				continue
+			}
+			if (hasChildrenCap(node)) collect(resolveChildren(node, stateForFlattening))
+		}
+	}
+	collect(children)
+	return map
+}
+
+function optionChildrenFor(node: object, state: Record<string, NodeState>): ChildNode[] {
+	if (!hasOptionsCap(node) || !hasIdCap(node)) return []
+	const raw = state[node.id]
+	const selectedValue = typeof raw === 'string' ? raw : undefined
+	const selected = node._options.find((o) => o.value === selectedValue)
+	if (!selected || !hasChildrenCap(selected)) return []
+	return resolveChildren(selected, state)
+}
+
+export function withStateDefaults<T extends Record<string, NodeState>>(
+	rawState: T,
+	children: ChildNode[],
+	write?: Writer,
+): T {
+	if (rawState == null || typeof rawState !== 'object' || rawState instanceof Set) return rawState
+
+	const childMap = buildChildMap(children, rawState)
+	for (const [, node] of childMap) {
+		for (const c of optionChildrenFor(node, rawState)) {
+			if (typeof c === 'object' && c !== null && hasIdCap(c)) childMap.set(c.id, c)
+		}
+	}
+	const resolving = new Set<string>()
+
+	const proxy = new Proxy(rawState, {
+		get(target, key, receiver) {
+			if (typeof key !== 'string') return Reflect.get(target, key, receiver)
+			const child = childMap.get(key)
+			let value: NodeState = Reflect.get(target, key, receiver)
+
+			if (value === undefined && child && hasValueCap(child) && !resolving.has(key)) {
+				resolving.add(key)
+				try {
+					const effective = getEffectiveValue(child, undefined, proxy)
+					const grandchildren = hasChildrenCap(child) ? resolveChildren(child, {}) : []
+					if (grandchildren.length > 0) {
+						return withStateDefaults(
+							{ value: effective } as Record<string, NodeState>,
+							grandchildren,
+							write && childWriter(target, write, key),
+						)
+					}
+					value = child._setValue(undefined, effective)
+				} finally {
+					resolving.delete(key)
+				}
+			}
+
+			if (
+				child &&
+				hasChildrenCap(child) &&
+				value !== null &&
+				typeof value === 'object' &&
+				!(value instanceof Set)
+			) {
+				const nested = value as Record<string, NodeState>
+				return withStateDefaults(
+					nested,
+					resolveChildren(child, nested),
+					write && childWriter(target, write, key),
+				)
+			}
+
+			if (value === undefined && child && hasChildrenCap(child)) {
+				const grandchildren = resolveChildren(child, {})
+				if (grandchildren.length > 0) return emptyScope(grandchildren)
+			}
+
+			return value
+		},
+		set(target, key, value, receiver) {
+			if (typeof key !== 'string') return Reflect.set(target, key, value, receiver)
+			const child = childMap.get(key)
+			if (child && hasValueCap(child) && write) {
+				writeNodeValue(child as HasValue & Identified, target, write, value as never, proxy)
+				return true
+			}
+			return Reflect.set(target, key, value, receiver)
+		},
+	}) as T
+
+	return proxy
+}
+
+export function resolveActionState(
+	node: object,
+	nodeState: NodeState,
+	localState: Record<string, NodeState>,
+): Record<string, NodeState> {
+	if (!hasValueCap(node)) return localState
+	const childState = getBooleanChildState(nodeState)
+	const base = hasChildrenCap(node)
+		? withStateDefaults(childState, resolveChildren(node, childState))
+		: childState
+	return new Proxy(base, {
+		get(target, key, receiver) {
+			if (key === 'value') return getEffectiveValue(node, nodeState, localState) as NodeState
+			return Reflect.get(target, key, receiver)
+		},
+	})
+}
+
+function emptyScope(children: ChildNode[]): Record<string, NodeState> {
+	const childMap = buildChildMap(children, {})
+	const resolving = new Set<string>()
+	const cache = new Map<string, Record<string, NodeState>>()
+
+	const proxy: Record<string, NodeState> = new Proxy(
+		{},
+		{
+			get(_target, key) {
+				if (typeof key !== 'string') return undefined
+				const child = childMap.get(key)
+				if (!child) return undefined
+
+				if (hasValueCap(child) && !resolving.has(key)) {
+					resolving.add(key)
+					try {
+						const def = getEffectiveValue(child, undefined, proxy)
+						if (def !== undefined) return child._setValue(undefined, def)
+					} finally {
+						resolving.delete(key)
+					}
+				}
+
+				if (!hasChildrenCap(child)) return undefined
+
+				const cached = cache.get(key)
+				if (cached) return cached
+
+				const grandchildren = resolveChildren(child, {})
+				if (grandchildren.length === 0) return undefined
+
+				const nested = emptyScope(grandchildren)
+				cache.set(key, nested)
+				return nested
+			},
+		},
+	) as Record<string, NodeState>
+
+	return proxy
+}
+
+export type Visitor = (
+	node: object,
+	nodeState: NodeState,
+	localState: Record<string, NodeState>,
+	path: string[],
+) => void
+
+export function walkNodes(
+	nodes: ChildNode[],
+	stageState: Record<string, NodeState>,
+	visitor: Visitor,
+	path: string[] = [],
+): void {
+	for (const node of nodes) {
+		if (typeof node !== 'object' || node === null) continue
+		if (!isShown(node as AnyNode)) continue
+
+		if (hasChildrenCap(node) && !hasValueCap(node)) {
+			if (hasIdCap(node)) {
+				const raw = stageState[node.id]
+				const childState =
+					raw && typeof raw === 'object' && !(raw instanceof Set)
+						? (raw as Record<string, NodeState>)
+						: {}
+				walkNodes(resolveChildren(node, childState), childState, visitor, [...path, node.id])
+			} else {
+				walkNodes(resolveChildren(node, stageState), stageState, visitor, path)
+			}
+			continue
+		}
+
+		if (hasValueCap(node) && hasIdCap(node)) {
+			const rawNodeState = stageState[node.id]
+			const nodePath = [...path, node.id]
+			visitor(node, rawNodeState, stageState, nodePath)
+
+			const active = isNodeActive(node, rawNodeState, stageState)
+			if (!active) continue
+
+			if (hasOptionsCap(node)) {
+				const selectedValue = typeof rawNodeState === 'string' ? rawNodeState : undefined
+				const selected = node._options.find((o) => o.value === selectedValue)
+				if (selected && isShown(selected)) {
+					const selectedPath = [...path, selected.value]
+					visitor(selected, undefined, stageState, selectedPath)
+					if (hasChildrenCap(selected)) {
+						walkNodes(resolveChildren(selected, stageState), stageState, visitor, selectedPath)
+					}
+				}
+				continue
+			}
+
+			if (hasChildrenCap(node)) {
+				const childState = getBooleanChildState(rawNodeState)
+				walkNodes(resolveChildren(node, childState), childState, visitor, nodePath)
+			}
+		}
+	}
+}
diff --git a/packages/moderation/src/types/node/state.ts b/packages/moderation/src/types/node/state.ts
new file mode 100644
index 0000000000..2812f8b8d9
--- /dev/null
+++ b/packages/moderation/src/types/node/state.ts
@@ -0,0 +1,33 @@
+import type { Ref } from 'vue'
+import { toValue } from 'vue'
+
+export type ModerationStatus = 'approved' | 'rejected' | 'flagged'
+
+export type NodeState =
+	| boolean
+	| string
+	| number
+	| Set<string>
+	| NodeStateWithChildren
+	| null
+	| undefined
+
+export interface NodeStateWithChildren {
+	value?: NodeState
+	[childId: string]: NodeState
+}
+
+export type Reactive<T> = T | Ref<T>
+
+export function resolve<T>(value: Reactive<T>): T {
+	return toValue(value as T | Ref<T>)
+}
+
+export type GetVarsFn = (state: Record<string, NodeState>) => Record<string, unknown>
+export type ContentFn = (state: Record<string, NodeState>) => string | Promise<string>
+
+export type MessageSegment =
+	| { type: 'fn'; fn: ContentFn }
+	| { type: 'auto'; getVars?: GetVarsFn }
+	| { type: 'path'; path: string | (() => string); getVars?: GetVarsFn }
+	| { type: 'collect'; fallback?: MessageSegment }
diff --git a/packages/moderation/src/types/settings.ts b/packages/moderation/src/types/settings.ts
index 1bdbb64d6a..6f5fdbeb33 100644
--- a/packages/moderation/src/types/settings.ts
+++ b/packages/moderation/src/types/settings.ts
@@ -37,14 +37,14 @@ export const setting = {
 	asString: (data: StringSettingDefinition) => data,
 }
 
-export function isValidFor(definitionBase: SettingDefinitionBase<any>, value: any): boolean {
+export function isValidFor(
+	definitionBase: SettingDefinitionBase<unknown>,
+	value: unknown,
+): boolean {
 	if (value != null) {
 		// Tried my best with type safety but sadly having the `SettingDefinitions` as the type leads to issues handling types else where...
 		const definition = definitionBase as SettingDefinitions
-		if (
-			definition.type == 'enum' &&
-			definition.entries.map((entry) => entry.value).includes(value)
-		) {
+		if (definition.type == 'enum' && definition.entries.some((entry) => entry.value === value)) {
 			return true
 		} else if (definition.type == 'toggle' && typeof value === 'boolean') {
 			return true
diff --git a/packages/moderation/src/types/stage.ts b/packages/moderation/src/types/stage.ts
deleted file mode 100644
index 0106f15cf5..0000000000
--- a/packages/moderation/src/types/stage.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import type { Labrinth } from '@modrinth/api-client'
-import type { FunctionalComponent, SVGAttributes } from 'vue'
-
-import type { Action } from './actions'
-
-/**
- * Represents a moderation stage with associated actions and optional navigation logic.
- */
-export interface Stage {
-	/**
-	 * The title of the stage, displayed in the checklist header.
-	 */
-	title: string
-
-	/**
-	 * The hint for this stage, tells the moderator what to do.
-	 */
-	hint: string
-
-	/**
-	 * An optional description or additional text for the stage.
-	 */
-	text?: (
-		project: Labrinth.Projects.v2.Project,
-		projectV3?: Labrinth.Projects.v3.Project,
-	) => Promise<string>
-
-	/**
-	 * Optional id for the stage, used for identification in the checklist. Will be used in the stage list as well instead of the title.
-	 */
-	id?: string
-
-	/**
-	 * Optional icon for the stage, displayed in the stage list and next to the title.
-	 */
-	icon?: FunctionalComponent<SVGAttributes>
-
-	/**
-	 * URL to the guidance document for this stage.
-	 */
-	guidance_url: string
-
-	/**
-	 * An array of actions that can be taken in this stage.
-	 */
-	actions: Action[]
-
-	/**
-	 * Optional navigation path to redirect the moderator when this stage is shown.
-	 *
-	 * This is relative to the project page. For example, `/settings#side-types` would navigate to `https://modrinth.com/project/:id/settings#side-types`.
-	 */
-	navigate?: string
-
-	/**
-	 * A function that determines whether this stage should be shown for a given project.
-	 *
-	 * By default, it returns `true`, meaning the stage is always shown.
-	 */
-	shouldShow?: (
-		project: Labrinth.Projects.v2.Project,
-		projectV3?: Labrinth.Projects.v3.Project,
-	) => boolean
-}
diff --git a/packages/moderation/src/utils.ts b/packages/moderation/src/utils.ts
index 8dee37e103..3df242bf55 100644
--- a/packages/moderation/src/utils.ts
+++ b/packages/moderation/src/utils.ts
@@ -1,181 +1,5 @@
 import type { Labrinth } from '@modrinth/api-client'
 
-import type {
-	Action,
-	AdditionalTextInput,
-	ButtonAction,
-	ConditionalMessage,
-	ToggleAction,
-} from './types/actions'
-
-export interface ActionState {
-	selected: boolean
-	value?: Set<string | number> | number | string | unknown
-}
-
-export interface MessagePart {
-	weight: number
-	content: string
-	actionId: string
-	stageIndex: number
-}
-
-export function getActionIdForStage(
-	action: Action,
-	stageIndex: number,
-	actionIndex?: number,
-	enabledIndex?: number,
-): string {
-	if (action.id) {
-		return `stage-${stageIndex}-${action.id}`
-	}
-	const suffix = enabledIndex !== undefined ? `-enabled-${enabledIndex}` : ''
-	return `stage-${stageIndex}-action-${actionIndex}${suffix}`
-}
-
-export function getActionId(action: Action, currentStage: number, index?: number): string {
-	return getActionIdForStage(action, currentStage, index)
-}
-
-export function getActionKey(
-	action: Action,
-	currentStage: number,
-	visibleActions: Action[],
-): string {
-	const index = visibleActions.indexOf(action)
-	return `${currentStage}-${index}-${getActionId(action, currentStage)}`
-}
-
-export function initializeActionState(action: Action): ActionState {
-	if (action.type === 'toggle') {
-		return {
-			selected: action.defaultChecked || false,
-		}
-	} else if (action.type === 'dropdown') {
-		return {
-			selected: true,
-			value: action.defaultOption || 0,
-		}
-	} else if (action.type === 'multi-select-chips') {
-		return {
-			selected: false,
-			value: new Set<string | number>(),
-		}
-	} else {
-		return {
-			selected: false,
-		}
-	}
-}
-
-export function processMessage(
-	message: string,
-	action: Action,
-	stageIndex: number,
-	textInputValues: Record<string, string>,
-): string {
-	let processedMessage = message
-
-	if (action.relevantExtraInput) {
-		action.relevantExtraInput.forEach((input, index) => {
-			if (input.variable) {
-				const inputKey = `stage-${stageIndex}-${action.id || `action-${index}`}-${index}`
-				const value = textInputValues[inputKey] || ''
-
-				const regex = new RegExp(`%${input.variable}%`, 'g')
-				processedMessage = processedMessage.replace(regex, value)
-			}
-		})
-	}
-
-	return processedMessage
-}
-
-export function findMatchingVariant(
-	variants: ConditionalMessage[],
-	selectedActionIds: string[],
-	allValidActionIds?: string[],
-	currentStageIndex?: number,
-): ConditionalMessage | null {
-	for (const variant of variants) {
-		const conditions = variant.conditions
-
-		const meetsRequired =
-			!conditions.requiredActions ||
-			conditions.requiredActions.every((id) => {
-				let fullId = id
-				if (currentStageIndex !== undefined && !id.startsWith('stage-')) {
-					fullId = `stage-${currentStageIndex}-${id}`
-				}
-
-				if (allValidActionIds && !allValidActionIds.includes(fullId)) {
-					return false
-				}
-				return selectedActionIds.includes(fullId)
-			})
-
-		const meetsExcluded =
-			!conditions.excludedActions ||
-			!conditions.excludedActions.some((id) => {
-				let fullId = id
-				if (currentStageIndex !== undefined && !id.startsWith('stage-')) {
-					fullId = `stage-${currentStageIndex}-${id}`
-				}
-				return selectedActionIds.includes(fullId)
-			})
-
-		if (meetsRequired && meetsExcluded) {
-			return variant
-		}
-	}
-
-	return null
-}
-
-export async function getActionMessage(
-	action: ButtonAction | ToggleAction,
-	selectedActionIds: string[],
-	allValidActionIds?: string[],
-): Promise<string> {
-	if (action.conditionalMessages && action.conditionalMessages.length > 0) {
-		const matchingConditional = findMatchingVariant(
-			action.conditionalMessages,
-			selectedActionIds,
-			allValidActionIds,
-		)
-		if (matchingConditional) {
-			return (await matchingConditional.message()) as string
-		}
-	}
-
-	return (await action.message()) as string
-}
-
-export function getVisibleInputs(
-	action: Action,
-	actionStates: Record<string, ActionState>,
-): AdditionalTextInput[] {
-	if (!action.relevantExtraInput) return []
-
-	const selectedActionIds = Object.entries(actionStates)
-		.filter(([, state]) => state.selected)
-		.map(([id]) => id)
-
-	return action.relevantExtraInput.filter((input) => {
-		if (!input.showWhen) return true
-
-		const meetsRequired =
-			!input.showWhen.requiredActions ||
-			input.showWhen.requiredActions.every((id) => selectedActionIds.includes(id))
-
-		const meetsExcluded =
-			!input.showWhen.excludedActions ||
-			!input.showWhen.excludedActions.some((id) => selectedActionIds.includes(id))
-
-		return meetsRequired && meetsExcluded
-	})
-}
-
 export function expandVariables(
 	template: string,
 	project: Labrinth.Projects.v2.Project,
@@ -283,35 +107,6 @@ export function formatProjectTypes(type: string, lower: boolean = false) {
 	return value
 }
 
-export function formatEnvironments(environment: string, lower: boolean = false) {
-	let value = environment
-	try {
-		value = value
-			.replaceAll('client_only_server_optional', 'Client and server: Optional on server')
-			.replaceAll('client_and_server', 'Required on both')
-			.replaceAll('client_only', 'Client-side only')
-			.replaceAll('server_only_client_optional', 'Client optional')
-			.replaceAll('dedicated_server_only', 'Dedicated server only')
-			.replaceAll('server_only', 'Servers and Singleplayer')
-			.replaceAll('singleplayer_only', 'Singleplayer only')
-			.replaceAll(
-				'client_or_server_prefers_both',
-				'Optional on both, works best when installed on both sides',
-			)
-			.replaceAll(
-				'client_or_server',
-				'Optional on both, works the same if installed on either side',
-			)
-			// This shouldn't come up for this use but yk
-			.replaceAll('unknown', 'Unknown')
-	} catch {
-		return 'No project environment'
-	}
-
-	if (lower === true) value = value.toLowerCase()
-	return value
-}
-
 export function requiresEnvironmentInfo(projectTypes): boolean {
 	return projectTypes.includes('mod') || projectTypes.includes('modpack')
 }
diff --git a/packages/ui/src/components/base/buttons/TeleportOverflowMenu.vue b/packages/ui/src/components/base/buttons/TeleportOverflowMenu.vue
index 8f0aec56f2..a9f638197d 100644
--- a/packages/ui/src/components/base/buttons/TeleportOverflowMenu.vue
+++ b/packages/ui/src/components/base/buttons/TeleportOverflowMenu.vue
@@ -312,7 +312,7 @@ defineExpose({ open: openMenu, close: closeMenu })
 				v-if="isOpen"
 				:id="menuId"
 				ref="panelElement"
-				class="fixed isolate z-[9999] flex min-w-48 flex-col gap-1 rounded-[14px] bg-surface-3 p-2 shadow-lg ring-1 ring-surface-5"
+				class="fixed isolate z-[9999] rounded-[14px] bg-surface-3 shadow-lg ring-1 ring-surface-5"
 				:style="[panelStyle, { transformOrigin: menuTransformOrigin }]"
 				role="menu"
 				:aria-label="props.label"
@@ -326,76 +326,85 @@ defineExpose({ open: openMenu, close: closeMenu })
 					:data-side="resolvedSide"
 					:style="anchorStyle"
 				/>
-				<template v-for="(option, index) in visibleOptions" :key="option.id ?? `divider-${index}`">
-					<div v-if="isDivider(option)" role="separator" class="my-1 h-px bg-surface-5" />
-
-					<RouterLink
-						v-else-if="isLink(option) && option.to !== undefined && !option.disabled"
-						v-tooltip="option.tooltip"
-						:to="option.to"
-						:class="menuItemClasses"
-						:style="getMenuItemStyle(option)"
-						:data-tone="option.tone && option.tone !== 'default' ? option.tone : undefined"
-						:data-hover-filled="option.hoverFilled || option.hoverFilledOnly || undefined"
-						:data-hover-filled-only="option.hoverFilledOnly || undefined"
-						role="menuitem"
-						tabindex="-1"
-						@click="handleLink(option, $event)"
-						@keydown="handleLinkKeydown(option, $event)"
-						@focus="selectedIndex = getMenuItems().indexOf($event.currentTarget as HTMLElement)"
+				<div
+					data-anchored-scroll-region
+					class="flex min-w-48 flex-col gap-1 overflow-y-auto p-2"
+					:style="{ maxHeight: panelStyle.maxHeight }"
+				>
+					<template
+						v-for="(option, index) in visibleOptions"
+						:key="option.id ?? `divider-${index}`"
 					>
-						<slot :name="option.id" :option="option">
-							<component :is="option.icon" v-if="option.icon" aria-hidden="true" />
-							{{ option.label }}
-						</slot>
-					</RouterLink>
+						<div v-if="isDivider(option)" role="separator" class="my-1 h-px bg-surface-5" />
 
-					<a
-						v-else-if="isLink(option)"
-						v-tooltip="option.tooltip"
-						:href="option.disabled ? undefined : option.href"
-						:target="option.target"
-						:rel="option.rel ?? (option.target === '_blank' ? 'noopener noreferrer' : undefined)"
-						:download="option.download"
-						:aria-disabled="option.disabled || undefined"
-						:class="menuItemClasses"
-						:style="getMenuItemStyle(option)"
-						:data-tone="option.tone && option.tone !== 'default' ? option.tone : undefined"
-						:data-hover-filled="option.hoverFilled || option.hoverFilledOnly || undefined"
-						:data-hover-filled-only="option.hoverFilledOnly || undefined"
-						role="menuitem"
-						tabindex="-1"
-						@click="handleLink(option, $event)"
-						@keydown="handleLinkKeydown(option, $event)"
-						@focus="selectedIndex = getMenuItems().indexOf($event.currentTarget as HTMLElement)"
-					>
-						<slot :name="option.id" :option="option">
-							<component :is="option.icon" v-if="option.icon" aria-hidden="true" />
-							{{ option.label }}
-						</slot>
-					</a>
+						<RouterLink
+							v-else-if="isLink(option) && option.to !== undefined && !option.disabled"
+							v-tooltip="option.tooltip"
+							:to="option.to"
+							:class="menuItemClasses"
+							:style="getMenuItemStyle(option)"
+							:data-tone="option.tone && option.tone !== 'default' ? option.tone : undefined"
+							:data-hover-filled="option.hoverFilled || option.hoverFilledOnly || undefined"
+							:data-hover-filled-only="option.hoverFilledOnly || undefined"
+							role="menuitem"
+							tabindex="-1"
+							@click="handleLink(option, $event)"
+							@keydown="handleLinkKeydown(option, $event)"
+							@focus="selectedIndex = getMenuItems().indexOf($event.currentTarget as HTMLElement)"
+						>
+							<slot :name="option.id" :option="option">
+								<component :is="option.icon" v-if="option.icon" aria-hidden="true" />
+								{{ option.label }}
+							</slot>
+						</RouterLink>
 
-					<button
-						v-else
-						v-tooltip="option.tooltip"
-						type="button"
-						:aria-disabled="option.disabled || undefined"
-						:class="menuItemClasses"
-						:style="getMenuItemStyle(option)"
-						:data-tone="option.tone && option.tone !== 'default' ? option.tone : undefined"
-						:data-hover-filled="option.hoverFilled || option.hoverFilledOnly || undefined"
-						:data-hover-filled-only="option.hoverFilledOnly || undefined"
-						role="menuitem"
-						tabindex="-1"
-						@click="handleAction(option, $event)"
-						@focus="selectedIndex = getMenuItems().indexOf($event.currentTarget as HTMLElement)"
-					>
-						<slot :name="option.id" :option="option">
-							<component :is="option.icon" v-if="option.icon" aria-hidden="true" />
-							{{ option.label }}
-						</slot>
-					</button>
-				</template>
+						<a
+							v-else-if="isLink(option)"
+							v-tooltip="option.tooltip"
+							:href="option.disabled ? undefined : option.href"
+							:target="option.target"
+							:rel="option.rel ?? (option.target === '_blank' ? 'noopener noreferrer' : undefined)"
+							:download="option.download"
+							:aria-disabled="option.disabled || undefined"
+							:class="menuItemClasses"
+							:style="getMenuItemStyle(option)"
+							:data-tone="option.tone && option.tone !== 'default' ? option.tone : undefined"
+							:data-hover-filled="option.hoverFilled || option.hoverFilledOnly || undefined"
+							:data-hover-filled-only="option.hoverFilledOnly || undefined"
+							role="menuitem"
+							tabindex="-1"
+							@click="handleLink(option, $event)"
+							@keydown="handleLinkKeydown(option, $event)"
+							@focus="selectedIndex = getMenuItems().indexOf($event.currentTarget as HTMLElement)"
+						>
+							<slot :name="option.id" :option="option">
+								<component :is="option.icon" v-if="option.icon" aria-hidden="true" />
+								{{ option.label }}
+							</slot>
+						</a>
+
+						<button
+							v-else
+							v-tooltip="option.tooltip"
+							type="button"
+							:aria-disabled="option.disabled || undefined"
+							:class="menuItemClasses"
+							:style="getMenuItemStyle(option)"
+							:data-tone="option.tone && option.tone !== 'default' ? option.tone : undefined"
+							:data-hover-filled="option.hoverFilled || option.hoverFilledOnly || undefined"
+							:data-hover-filled-only="option.hoverFilledOnly || undefined"
+							role="menuitem"
+							tabindex="-1"
+							@click="handleAction(option, $event)"
+							@focus="selectedIndex = getMenuItems().indexOf($event.currentTarget as HTMLElement)"
+						>
+							<slot :name="option.id" :option="option">
+								<component :is="option.icon" v-if="option.icon" aria-hidden="true" />
+								{{ option.label }}
+							</slot>
+						</button>
+					</template>
+				</div>
 			</div>
 		</Transition>
 	</Teleport>
diff --git a/packages/ui/src/components/base/buttons/TeleportPopoutMenu.vue b/packages/ui/src/components/base/buttons/TeleportPopoutMenu.vue
index 8fc2ff4abb..d365b1673a 100644
--- a/packages/ui/src/components/base/buttons/TeleportPopoutMenu.vue
+++ b/packages/ui/src/components/base/buttons/TeleportPopoutMenu.vue
@@ -128,7 +128,7 @@ defineExpose({ open: openMenu, close: closeMenu })
 				v-if="isOpen"
 				:id="panelId"
 				ref="panelElement"
-				class="fixed isolate z-[9999] rounded-[14px] bg-surface-3 p-4 text-primary shadow-lg ring-1 ring-surface-5"
+				class="fixed isolate z-[9999] overflow-y-auto rounded-[14px] bg-surface-3 p-4 text-primary shadow-lg ring-1 ring-surface-5"
 				:style="panelStyle"
 				:role="props.panelRole"
 				:aria-label="props.label"
diff --git a/packages/ui/src/components/project/ProjectPageVersions.vue b/packages/ui/src/components/project/ProjectPageVersions.vue
index 82674f07d0..455746bf68 100644
--- a/packages/ui/src/components/project/ProjectPageVersions.vue
+++ b/packages/ui/src/components/project/ProjectPageVersions.vue
@@ -474,7 +474,6 @@ import {
 import {
 	type GameVersionTag,
 	getVersionGroupsForDisplay,
-	type Version,
 	type VersionDisplayGroup,
 } from '@modrinth/utils'
 import { Menu } from 'floating-vue'
@@ -500,15 +499,12 @@ const formatBytes = useFormatBytes()
 const MAX_GAME_VERSION_TAGS = 5
 const MAX_PLATFORM_TAGS = 3
 
-type VersionWithDisplayUrlEnding = Version & {
+type VersionWithDisplayUrlEnding = Labrinth.Versions.v3.Version & {
 	displayUrlEnding: string
-	environment?: Labrinth.Projects.v3.Environment
-	mrpack_loaders?: string[]
 }
 
 type DisplayVersion = VersionWithDisplayUrlEnding & {
 	noModLoader: boolean
-	files_missing_attribution?: boolean
 }
 
 type VersionTableColumn =
@@ -536,7 +532,7 @@ const props = withDefaults(
 		currentMember?: boolean
 		loaders: Labrinth.Tags.v2.Loader[]
 		gameVersions: GameVersionTag[]
-		versionLink?: (version: Version) => string
+		versionLink?: (version: Labrinth.Versions.v3.Version) => string
 		openModal?: () => void
 		createVersionButtonSecondary?: boolean
 	}>(),
diff --git a/packages/ui/src/components/project/ProjectStatusLink.vue b/packages/ui/src/components/project/ProjectStatusLink.vue
new file mode 100644
index 0000000000..c7126c9d9b
--- /dev/null
+++ b/packages/ui/src/components/project/ProjectStatusLink.vue
@@ -0,0 +1,28 @@
+<template>
+	<AutoLink
+		:to="`/project/${project.slug}`"
+		:target="newTab ? '_blank' : undefined"
+		class="group inline-flex min-w-0 max-w-full items-center gap-1"
+		:style="{ color: `var(--color-${getProjectStatusColor(project.status)})` }"
+	>
+		<component :is="getProjectStatusIcon(project.status)" class="size-4 shrink-0" />
+		<span class="min-w-0 truncate font-medium group-hover:underline">{{ project.name }}</span>
+	</AutoLink>
+</template>
+
+<script setup lang="ts">
+import type { Labrinth } from '@modrinth/api-client'
+
+import { getProjectStatusColor, getProjectStatusIcon } from '../../utils'
+import AutoLink from '../base/AutoLink.vue'
+
+withDefaults(
+	defineProps<{
+		project: Pick<Labrinth.Projects.v3.Project, 'name' | 'slug' | 'status'>
+		newTab?: boolean
+	}>(),
+	{
+		newTab: false,
+	},
+)
+</script>
diff --git a/packages/ui/src/components/project/index.ts b/packages/ui/src/components/project/index.ts
index efc797c1d2..4d2fec932d 100644
--- a/packages/ui/src/components/project/index.ts
+++ b/packages/ui/src/components/project/index.ts
@@ -16,4 +16,5 @@ export { default as ProjectSidebarLinks } from './ProjectSidebarLinks.vue'
 export { default as ProjectSidebarServerInfo } from './ProjectSidebarServerInfo.vue'
 export { default as ProjectSidebarTags } from './ProjectSidebarTags.vue'
 export { default as ProjectStatusBadge } from './ProjectStatusBadge.vue'
+export { default as ProjectStatusLink } from './ProjectStatusLink.vue'
 export { default as TagsOverflow } from './TagsOverflow.vue'
diff --git a/packages/ui/src/components/version/VersionFilterControl.vue b/packages/ui/src/components/version/VersionFilterControl.vue
index 3554b18795..0cc3f82a0e 100644
--- a/packages/ui/src/components/version/VersionFilterControl.vue
+++ b/packages/ui/src/components/version/VersionFilterControl.vue
@@ -120,16 +120,17 @@
 </template>
 
 <script setup lang="ts">
+import type { Labrinth } from '@modrinth/api-client'
 import { ChevronLeftIcon, FilterIcon, XCircleIcon, XIcon } from '@modrinth/assets'
 import type { MultiSelectOption } from '@modrinth/ui'
 import { Checkbox, formatLoader, FormattedTag, MultiSelect, TagItem, useVIntl } from '@modrinth/ui'
-import type { GameVersionTag, Version } from '@modrinth/utils'
+import type { GameVersionTag } from '@modrinth/utils'
 import { computed, ref } from 'vue'
 import type { LocationQueryValue } from 'vue-router'
 import { useRoute } from 'vue-router'
 
 const props = defineProps<{
-	versions: Version[]
+	versions: Labrinth.Versions.v3.Version[]
 	gameVersions: GameVersionTag[]
 	baseId?: string
 }>()
diff --git a/packages/ui/src/providers/project-page.ts b/packages/ui/src/providers/project-page.ts
index c81f83b9fd..dce8569c92 100644
--- a/packages/ui/src/providers/project-page.ts
+++ b/packages/ui/src/providers/project-page.ts
@@ -15,7 +15,7 @@ export interface ProjectPageContext {
 	allMembers: Ref<Labrinth.Projects.v3.TeamMember[]>
 	organization: Ref<Labrinth.Projects.v3.Organization | null>
 	// Lazy version loading (client-side only)
-	versions: Ref<Labrinth.Versions.v2.Version[] | null>
+	versions: Ref<Labrinth.Versions.v3.Version[] | null>
 	versionsLoading: Ref<boolean>
 	versionsLoaded: Ref<boolean>
 	// Lazy dependencies loading (client-side only)
diff --git a/packages/ui/src/utils/auto-icons.ts b/packages/ui/src/utils/auto-icons.ts
index 03976cdcdd..7656d7c817 100644
--- a/packages/ui/src/utils/auto-icons.ts
+++ b/packages/ui/src/utils/auto-icons.ts
@@ -89,6 +89,22 @@ export const PROJECT_STATUS_ICONS: Record<ProjectStatus, Component> = {
 	unknown: UnknownIcon,
 }
 
+// this should probably be abstracted or something idk
+export type BadgeColor = 'red' | 'orange' | 'green' | 'blue' | 'purple' | 'gray'
+
+export const PROJECT_STATUS_COLORS: Record<ProjectStatus, BadgeColor> = {
+	approved: 'blue',
+	unlisted: 'purple',
+	withheld: 'red',
+	private: 'gray',
+	scheduled: 'orange',
+	draft: 'gray',
+	archived: 'gray',
+	rejected: 'red',
+	processing: 'orange',
+	unknown: 'gray',
+}
+
 export const DIRECTORY_ICONS: Record<string, Component> = {
 	config: FolderOpenIcon,
 	world: FolderOpenIcon,
@@ -124,6 +140,10 @@ export function getProjectStatusIcon(status: ProjectStatus): Component {
 	return PROJECT_STATUS_ICONS[status] ?? UnknownIcon
 }
 
+export function getProjectStatusColor(status: ProjectStatus): BadgeColor {
+	return PROJECT_STATUS_COLORS[status] ?? `gray`
+}
+
 export function getDirectoryIcon(name: string): Component {
 	return DIRECTORY_ICONS[name.toLowerCase()] ?? DIRECTORY_ICONS._default
 }
diff --git a/packages/ui/src/utils/use-anchored-teleport.ts b/packages/ui/src/utils/use-anchored-teleport.ts
index 304fc4601e..e93672193d 100644
--- a/packages/ui/src/utils/use-anchored-teleport.ts
+++ b/packages/ui/src/utils/use-anchored-teleport.ts
@@ -4,8 +4,10 @@ import { nextTick, onUnmounted, ref, watch } from 'vue'
 export type AnchoredTeleportPlacement =
 	| 'bottom-start'
 	| 'bottom-end'
+	| 'bottom-center'
 	| 'top-start'
 	| 'top-end'
+	| 'top-center'
 	| 'right-start'
 	| 'right-end'
 	| 'left-start'
@@ -37,40 +39,63 @@ export function useAnchoredTeleport(
 		if (!isOpen.value || !trigger.value || !panel.value) return
 
 		const triggerRect = trigger.value.getBoundingClientRect()
-		const panelWidth = panel.value.offsetWidth
-		const panelHeight = panel.value.offsetHeight
+		const scrollRegion =
+			panel.value.querySelector<HTMLElement>('[data-anchored-scroll-region]') ?? panel.value
+		const panelRect = { width: panel.value.offsetWidth, height: scrollRegion.scrollHeight }
 		const offset = distance.value
 		const alignsEnd = placement.value.endsWith('end')
+		const alignsCenter = placement.value.endsWith('center')
 		const isHorizontal = placement.value.startsWith('right') || placement.value.startsWith('left')
 		let idealTop: number
 		let idealLeft: number
+		let maxHeight: number | undefined
 
 		if (isHorizontal) {
 			const prefersRight = placement.value.startsWith('right')
 			const spaceRight = window.innerWidth - triggerRect.right - viewportPadding
 			const spaceLeft = triggerRect.left - viewportPadding
 			const opensRight = prefersRight
-				? panelWidth + offset <= spaceRight || spaceRight > spaceLeft
-				: panelWidth + offset > spaceLeft && spaceRight > spaceLeft
+				? panelRect.width + offset <= spaceRight || spaceRight > spaceLeft
+				: panelRect.width + offset > spaceLeft && spaceRight > spaceLeft
 
 			resolvedSide.value = opensRight ? 'right' : 'left'
-			idealTop = alignsEnd ? triggerRect.bottom - panelHeight : triggerRect.top
-			idealLeft = opensRight ? triggerRect.right + offset : triggerRect.left - panelWidth - offset
+			idealTop = alignsEnd ? triggerRect.bottom - panelRect.height : triggerRect.top
+			idealLeft = opensRight
+				? triggerRect.right + offset
+				: triggerRect.left - panelRect.width - offset
 		} else {
 			const prefersTop = placement.value.startsWith('top')
 			const spaceBelow = window.innerHeight - triggerRect.bottom - viewportPadding
 			const spaceAbove = triggerRect.top - viewportPadding
 			const opensAbove = prefersTop
-				? panelHeight + offset <= spaceAbove || spaceAbove > spaceBelow
-				: panelHeight + offset > spaceBelow && spaceAbove > spaceBelow
+				? panelRect.height + offset <= spaceAbove || spaceAbove > spaceBelow
+				: panelRect.height + offset > spaceBelow && spaceAbove > spaceBelow
 
 			resolvedSide.value = opensAbove ? 'top' : 'bottom'
-			idealTop = opensAbove ? triggerRect.top - panelHeight - offset : triggerRect.bottom + offset
-			idealLeft = alignsEnd ? triggerRect.right - panelWidth : triggerRect.left
+			const availableHeight = opensAbove ? spaceAbove : spaceBelow
+			if (panelRect.height + offset > availableHeight) {
+				maxHeight = Math.max(0, availableHeight - offset)
+			}
+			idealTop = opensAbove
+				? triggerRect.top - (maxHeight ?? panelRect.height) - offset
+				: triggerRect.bottom + offset
+			if (alignsCenter) {
+				const centered = triggerRect.left + triggerRect.width / 2 - panelRect.width / 2
+				if (centered < viewportPadding) {
+					idealLeft = triggerRect.left
+				} else if (centered + panelRect.width > window.innerWidth - viewportPadding) {
+					idealLeft = triggerRect.right - panelRect.width
+				} else {
+					idealLeft = centered
+				}
+			} else {
+				idealLeft = alignsEnd ? triggerRect.right - panelRect.width : triggerRect.left
+			}
 		}
 
-		const maxTop = Math.max(viewportPadding, window.innerHeight - panelHeight - viewportPadding)
-		const maxLeft = Math.max(viewportPadding, window.innerWidth - panelWidth - viewportPadding)
+		const effectiveHeight = maxHeight ?? panelRect.height
+		const maxTop = Math.max(viewportPadding, window.innerHeight - effectiveHeight - viewportPadding)
+		const maxLeft = Math.max(viewportPadding, window.innerWidth - panelRect.width - viewportPadding)
 		const panelTop = Math.min(Math.max(idealTop, viewportPadding), maxTop)
 		const panelLeft = Math.min(Math.max(idealLeft, viewportPadding), maxLeft)
 
@@ -78,18 +103,19 @@ export function useAnchoredTeleport(
 			top: `${panelTop}px`,
 			left: `${panelLeft}px`,
 			visibility: 'visible',
+			...(maxHeight !== undefined ? { maxHeight: `${maxHeight}px` } : {}),
 		}
 		anchorStyle.value = isHorizontal
 			? {
 					top: `${Math.min(
 						Math.max(triggerRect.top + triggerRect.height / 2 - panelTop, anchorPadding),
-						Math.max(anchorPadding, panelHeight - anchorPadding),
+						Math.max(anchorPadding, panelRect.height - anchorPadding),
 					)}px`,
 				}
 			: {
 					left: `${Math.min(
 						Math.max(triggerRect.left + triggerRect.width / 2 - panelLeft, anchorPadding),
-						Math.max(anchorPadding, panelWidth - anchorPadding),
+						Math.max(anchorPadding, panelRect.width - anchorPadding),
 					)}px`,
 				}
 	}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f3f5accd91..614d6852ae 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -179,7 +179,7 @@ importers:
     devDependencies:
       '@eslint/compat':
         specifier: ^1.1.1
-        version: 1.4.1(eslint@9.39.2(jiti@1.21.7))
+        version: 1.4.1(eslint@9.39.2(jiti@2.6.1))
       '@formatjs/cli':
         specifier: ^6.2.12
         version: 6.12.2(@vue/compiler-core@3.5.27)(vue@3.5.27(typescript@5.9.3))
@@ -188,22 +188,22 @@ importers:
         version: link:../../packages/tooling-config
       '@nuxt/eslint-config':
         specifier: ^0.5.6
-        version: 0.5.7(@typescript-eslint/utils@8.54.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+        version: 0.5.7(@typescript-eslint/utils@8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
       '@taijased/vue-render-tracker':
         specifier: ^1.0.7
         version: 1.0.7(vue@3.5.27(typescript@5.9.3))
       '@vitejs/plugin-vue':
         specifier: ^6.0.3
-        version: 6.0.4(vite@8.0.3(@types/node@24.12.2)(esbuild@0.27.3)(jiti@1.21.7)(sass@1.97.3)(terser@5.46.0)(yaml@2.8.2))(vue@3.5.27(typescript@5.9.3))
+        version: 6.0.4(vite@8.0.3(@types/node@24.12.2)(esbuild@0.27.3)(jiti@2.6.1)(sass@1.97.3)(terser@5.46.0)(yaml@2.8.2))(vue@3.5.27(typescript@5.9.3))
       autoprefixer:
         specifier: ^10.4.19
         version: 10.4.24(postcss@8.5.6)
       eslint:
         specifier: ^9.9.1
-        version: 9.39.2(jiti@1.21.7)
+        version: 9.39.2(jiti@2.6.1)
       eslint-plugin-turbo:
         specifier: ^2.5.4
-        version: 2.8.2(eslint@9.39.2(jiti@1.21.7))(turbo@2.8.2)
+        version: 2.8.2(eslint@9.39.2(jiti@2.6.1))(turbo@2.8.2)
       postcss:
         specifier: ^8.4.39
         version: 8.5.6
@@ -221,7 +221,7 @@ importers:
         version: 5.9.3
       vite:
         specifier: ^8.0.0
-        version: 8.0.3(@types/node@24.12.2)(esbuild@0.27.3)(jiti@1.21.7)(sass@1.97.3)(terser@5.46.0)(yaml@2.8.2)
+        version: 8.0.3(@types/node@24.12.2)(esbuild@0.27.3)(jiti@2.6.1)(sass@1.97.3)(terser@5.46.0)(yaml@2.8.2)
       vue-component-type-helpers:
         specifier: ^3.1.8
         version: 3.2.4
@@ -564,6 +564,9 @@ importers:
       '@modrinth/ui':
         specifier: workspace:*
         version: link:../ui
+      typescript:
+        specifier: ^5.4.5
+        version: 5.9.3
 
   packages/tooling-config:
     dependencies:
@@ -793,7 +796,7 @@ importers:
         version: 5.2.4(vite@5.4.21(@types/node@24.12.2)(lightningcss@1.32.0)(sass@1.97.3)(terser@5.46.0))(vue@3.5.27(typescript@5.9.3))
       eslint-plugin-storybook:
         specifier: ^10.1.10
-        version: 10.2.4(eslint@9.39.2(jiti@2.6.1))(storybook@10.2.4(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(typescript@5.9.3)
+        version: 10.2.4(eslint@9.39.2(jiti@1.21.7))(storybook@10.2.4(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(typescript@5.9.3)
       storybook:
         specifier: ^10.1.10
         version: 10.2.4(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
@@ -4774,6 +4777,7 @@ packages:
 
   '@ungap/structured-clone@1.3.0':
     resolution: {integrity: sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==}
+    deprecated: Potential CWE-502 - Update to 1.3.1 or higher
 
   '@unhead/vue@2.1.2':
     resolution: {integrity: sha512-w5yxH/fkkLWAFAOnMSIbvAikNHYn6pgC7zGF/BasXf+K3CO1cYIPFehYAk5jpcsbiNPMc3goyyw1prGLoyD14g==}
@@ -9479,6 +9483,7 @@ packages:
   tsconfck@3.1.6:
     resolution: {integrity: sha512-ks6Vjr/jEw0P1gmOVwutM3B7fWxoWBL2KRDb1JfqGVawBmO5UsvmWOQFGHBPl5yxYz4eERr19E6L7NMv+Fej4w==}
     engines: {node: ^18 || >=20}
+    deprecated: unmaintained
     hasBin: true
     peerDependencies:
       typescript: ^5.0.0
@@ -10174,8 +10179,8 @@ packages:
   vue-component-type-helpers@3.2.4:
     resolution: {integrity: sha512-05lR16HeZDcDpB23ku5b5f1fBOoHqFnMiKRr2CiEvbG5Ux4Yi0McmQBOET0dR0nxDXosxyVqv67q6CzS3AK8rw==}
 
-  vue-component-type-helpers@3.3.8:
-    resolution: {integrity: sha512-troqCMmQodQDqUqn63NQaFi+CDSclSe7sc8VEBFqf5GFLqmGR2Ph3P2WEC7qwpRVyEWsTi/aAr4vyOe/B1hU3g==}
+  vue-component-type-helpers@3.3.9:
+    resolution: {integrity: sha512-3c/UfMe0SqyEfcGTyH7mfshHagJ9QTCbppCb0/uGpHZpFug7+If3GeGZN7I0YheKEExemx3xldQPoO7PQSOLQg==}
 
   vue-confetti-explosion@1.0.2:
     resolution: {integrity: sha512-80OboM3/6BItIoZ6DpNcZFqGpF607kjIVc5af56oKgtFmt5yWehvJeoYhkzYlqxrqdBe0Ko4Ie3bWrmLau+dJw==}
@@ -11499,12 +11504,6 @@ snapshots:
 
   '@eslint-community/regexpp@4.12.2': {}
 
-  '@eslint/compat@1.4.1(eslint@9.39.2(jiti@1.21.7))':
-    dependencies:
-      '@eslint/core': 0.17.0
-    optionalDependencies:
-      eslint: 9.39.2(jiti@1.21.7)
-
   '@eslint/compat@1.4.1(eslint@9.39.2(jiti@2.6.1))':
     dependencies:
       '@eslint/core': 0.17.0
@@ -12273,31 +12272,6 @@ snapshots:
       - utf-8-validate
       - vue
 
-  '@nuxt/eslint-config@0.5.7(@typescript-eslint/utils@8.54.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)':
-    dependencies:
-      '@eslint/js': 9.39.2
-      '@nuxt/eslint-plugin': 0.5.7(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
-      '@stylistic/eslint-plugin': 2.13.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
-      '@typescript-eslint/eslint-plugin': 8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
-      '@typescript-eslint/parser': 8.54.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
-      eslint: 9.39.2(jiti@1.21.7)
-      eslint-config-flat-gitignore: 0.3.0(eslint@9.39.2(jiti@1.21.7))
-      eslint-flat-config-utils: 0.4.0
-      eslint-plugin-import-x: 4.16.1(@typescript-eslint/utils@8.54.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))
-      eslint-plugin-jsdoc: 50.8.0(eslint@9.39.2(jiti@1.21.7))
-      eslint-plugin-regexp: 2.10.0(eslint@9.39.2(jiti@1.21.7))
-      eslint-plugin-unicorn: 55.0.0(eslint@9.39.2(jiti@1.21.7))
-      eslint-plugin-vue: 9.33.0(eslint@9.39.2(jiti@1.21.7))
-      globals: 15.15.0
-      local-pkg: 0.5.1
-      pathe: 1.1.2
-      vue-eslint-parser: 9.4.3(eslint@9.39.2(jiti@1.21.7))
-    transitivePeerDependencies:
-      - '@typescript-eslint/utils'
-      - eslint-import-resolver-node
-      - supports-color
-      - typescript
-
   '@nuxt/eslint-config@0.5.7(@typescript-eslint/utils@8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)':
     dependencies:
       '@eslint/js': 9.39.2
@@ -12323,15 +12297,6 @@ snapshots:
       - supports-color
       - typescript
 
-  '@nuxt/eslint-plugin@0.5.7(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)':
-    dependencies:
-      '@typescript-eslint/types': 8.54.0
-      '@typescript-eslint/utils': 8.54.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
-      eslint: 9.39.2(jiti@1.21.7)
-    transitivePeerDependencies:
-      - supports-color
-      - typescript
-
   '@nuxt/eslint-plugin@0.5.7(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)':
     dependencies:
       '@typescript-eslint/types': 8.54.0
@@ -13822,22 +13787,10 @@ snapshots:
       storybook: 10.2.4(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
       type-fest: 2.19.0
       vue: 3.5.27(typescript@5.9.3)
-      vue-component-type-helpers: 3.3.8
+      vue-component-type-helpers: 3.3.9
 
   '@stripe/stripe-js@7.9.0': {}
 
-  '@stylistic/eslint-plugin@2.13.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)':
-    dependencies:
-      '@typescript-eslint/utils': 8.54.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
-      eslint: 9.39.2(jiti@1.21.7)
-      eslint-visitor-keys: 4.2.1
-      espree: 10.4.0
-      estraverse: 5.3.0
-      picomatch: 4.0.4
-    transitivePeerDependencies:
-      - supports-color
-      - typescript
-
   '@stylistic/eslint-plugin@2.13.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)':
     dependencies:
       '@typescript-eslint/utils': 8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
@@ -14252,22 +14205,6 @@ snapshots:
     dependencies:
       '@types/node': 24.12.2
 
-  '@typescript-eslint/eslint-plugin@8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)':
-    dependencies:
-      '@eslint-community/regexpp': 4.12.2
-      '@typescript-eslint/parser': 8.54.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
-      '@typescript-eslint/scope-manager': 8.54.0
-      '@typescript-eslint/type-utils': 8.54.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
-      '@typescript-eslint/utils': 8.54.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
-      '@typescript-eslint/visitor-keys': 8.54.0
-      eslint: 9.39.2(jiti@1.21.7)
-      ignore: 7.0.5
-      natural-compare: 1.4.0
-      ts-api-utils: 2.4.0(typescript@5.9.3)
-      typescript: 5.9.3
-    transitivePeerDependencies:
-      - supports-color
-
   '@typescript-eslint/eslint-plugin@8.54.0(@typescript-eslint/parser@8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)':
     dependencies:
       '@eslint-community/regexpp': 4.12.2
@@ -14284,18 +14221,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/parser@8.54.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)':
-    dependencies:
-      '@typescript-eslint/scope-manager': 8.54.0
-      '@typescript-eslint/types': 8.54.0
-      '@typescript-eslint/typescript-estree': 8.54.0(typescript@5.9.3)
-      '@typescript-eslint/visitor-keys': 8.54.0
-      debug: 4.4.3
-      eslint: 9.39.2(jiti@1.21.7)
-      typescript: 5.9.3
-    transitivePeerDependencies:
-      - supports-color
-
   '@typescript-eslint/parser@8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)':
     dependencies:
       '@typescript-eslint/scope-manager': 8.54.0
@@ -14339,18 +14264,6 @@ snapshots:
     dependencies:
       typescript: 5.9.3
 
-  '@typescript-eslint/type-utils@8.54.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)':
-    dependencies:
-      '@typescript-eslint/types': 8.54.0
-      '@typescript-eslint/typescript-estree': 8.54.0(typescript@5.9.3)
-      '@typescript-eslint/utils': 8.54.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
-      debug: 4.4.3
-      eslint: 9.39.2(jiti@1.21.7)
-      ts-api-utils: 2.4.0(typescript@5.9.3)
-      typescript: 5.9.3
-    transitivePeerDependencies:
-      - supports-color
-
   '@typescript-eslint/type-utils@8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)':
     dependencies:
       '@typescript-eslint/types': 8.54.0
@@ -14543,12 +14456,6 @@ snapshots:
       vite: 7.3.1(@types/node@24.12.2)(jiti@2.6.1)(lightningcss@1.32.0)(sass@1.97.3)(terser@5.46.0)(yaml@2.8.2)
       vue: 3.5.27(typescript@5.9.3)
 
-  '@vitejs/plugin-vue@6.0.4(vite@8.0.3(@types/node@24.12.2)(esbuild@0.27.3)(jiti@1.21.7)(sass@1.97.3)(terser@5.46.0)(yaml@2.8.2))(vue@3.5.27(typescript@5.9.3))':
-    dependencies:
-      '@rolldown/pluginutils': 1.0.0-rc.2
-      vite: 8.0.3(@types/node@24.12.2)(esbuild@0.27.3)(jiti@1.21.7)(sass@1.97.3)(terser@5.46.0)(yaml@2.8.2)
-      vue: 3.5.27(typescript@5.9.3)
-
   '@vitejs/plugin-vue@6.0.4(vite@8.0.3(@types/node@24.12.2)(esbuild@0.27.3)(jiti@2.6.1)(sass@1.97.3)(terser@5.46.0)(yaml@2.8.2))(vue@3.5.27(typescript@5.9.3))':
     dependencies:
       '@rolldown/pluginutils': 1.0.0-rc.2
@@ -16139,12 +16046,6 @@ snapshots:
 
   escape-string-regexp@5.0.0: {}
 
-  eslint-config-flat-gitignore@0.3.0(eslint@9.39.2(jiti@1.21.7)):
-    dependencies:
-      '@eslint/compat': 1.4.1(eslint@9.39.2(jiti@1.21.7))
-      eslint: 9.39.2(jiti@1.21.7)
-      find-up-simple: 1.0.1
-
   eslint-config-flat-gitignore@0.3.0(eslint@9.39.2(jiti@2.6.1)):
     dependencies:
       '@eslint/compat': 1.4.1(eslint@9.39.2(jiti@2.6.1))
@@ -16166,23 +16067,6 @@ snapshots:
     optionalDependencies:
       unrs-resolver: 1.11.1
 
-  eslint-plugin-import-x@4.16.1(@typescript-eslint/utils@8.54.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7)):
-    dependencies:
-      '@typescript-eslint/types': 8.54.0
-      comment-parser: 1.4.5
-      debug: 4.4.3
-      eslint: 9.39.2(jiti@1.21.7)
-      eslint-import-context: 0.1.9(unrs-resolver@1.11.1)
-      is-glob: 4.0.3
-      minimatch: 10.1.2
-      semver: 7.7.4
-      stable-hash-x: 0.2.0
-      unrs-resolver: 1.11.1
-    optionalDependencies:
-      '@typescript-eslint/utils': 8.54.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
-    transitivePeerDependencies:
-      - supports-color
-
   eslint-plugin-import-x@4.16.1(@typescript-eslint/utils@8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.2(jiti@2.6.1)):
     dependencies:
       '@typescript-eslint/types': 8.54.0
@@ -16200,22 +16084,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  eslint-plugin-jsdoc@50.8.0(eslint@9.39.2(jiti@1.21.7)):
-    dependencies:
-      '@es-joy/jsdoccomment': 0.50.2
-      are-docs-informative: 0.0.2
-      comment-parser: 1.4.1
-      debug: 4.4.3
-      escape-string-regexp: 4.0.0
-      eslint: 9.39.2(jiti@1.21.7)
-      espree: 10.4.0
-      esquery: 1.7.0
-      parse-imports-exports: 0.2.4
-      semver: 7.7.4
-      spdx-expression-parse: 4.0.0
-    transitivePeerDependencies:
-      - supports-color
-
   eslint-plugin-jsdoc@50.8.0(eslint@9.39.2(jiti@2.6.1)):
     dependencies:
       '@es-joy/jsdoccomment': 0.50.2
@@ -16241,17 +16109,6 @@ snapshots:
     optionalDependencies:
       eslint-config-prettier: 10.1.8(eslint@9.39.2(jiti@2.6.1))
 
-  eslint-plugin-regexp@2.10.0(eslint@9.39.2(jiti@1.21.7)):
-    dependencies:
-      '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.2(jiti@1.21.7))
-      '@eslint-community/regexpp': 4.12.2
-      comment-parser: 1.4.5
-      eslint: 9.39.2(jiti@1.21.7)
-      jsdoc-type-pratt-parser: 4.8.0
-      refa: 0.12.1
-      regexp-ast-analysis: 0.7.1
-      scslre: 0.3.0
-
   eslint-plugin-regexp@2.10.0(eslint@9.39.2(jiti@2.6.1)):
     dependencies:
       '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.2(jiti@2.6.1))
@@ -16267,47 +16124,21 @@ snapshots:
     dependencies:
       eslint: 9.39.2(jiti@2.6.1)
 
-  eslint-plugin-storybook@10.2.4(eslint@9.39.2(jiti@2.6.1))(storybook@10.2.4(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(typescript@5.9.3):
+  eslint-plugin-storybook@10.2.4(eslint@9.39.2(jiti@1.21.7))(storybook@10.2.4(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(typescript@5.9.3):
     dependencies:
-      '@typescript-eslint/utils': 8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
-      eslint: 9.39.2(jiti@2.6.1)
+      '@typescript-eslint/utils': 8.54.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+      eslint: 9.39.2(jiti@1.21.7)
       storybook: 10.2.4(@testing-library/dom@10.4.1)(prettier@3.8.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
     transitivePeerDependencies:
       - supports-color
       - typescript
 
-  eslint-plugin-turbo@2.8.2(eslint@9.39.2(jiti@1.21.7))(turbo@2.8.2):
-    dependencies:
-      dotenv: 16.0.3
-      eslint: 9.39.2(jiti@1.21.7)
-      turbo: 2.8.2
-
   eslint-plugin-turbo@2.8.2(eslint@9.39.2(jiti@2.6.1))(turbo@2.8.2):
     dependencies:
       dotenv: 16.0.3
       eslint: 9.39.2(jiti@2.6.1)
       turbo: 2.8.2
 
-  eslint-plugin-unicorn@55.0.0(eslint@9.39.2(jiti@1.21.7)):
-    dependencies:
-      '@babel/helper-validator-identifier': 7.28.5
-      '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.2(jiti@1.21.7))
-      ci-info: 4.4.0
-      clean-regexp: 1.0.0
-      core-js-compat: 3.48.0
-      eslint: 9.39.2(jiti@1.21.7)
-      esquery: 1.7.0
-      globals: 15.15.0
-      indent-string: 4.0.0
-      is-builtin-module: 3.2.1
-      jsesc: 3.1.0
-      pluralize: 8.0.0
-      read-pkg-up: 7.0.1
-      regexp-tree: 0.1.27
-      regjsparser: 0.10.0
-      semver: 7.7.4
-      strip-indent: 3.0.0
-
   eslint-plugin-unicorn@55.0.0(eslint@9.39.2(jiti@2.6.1)):
     dependencies:
       '@babel/helper-validator-identifier': 7.28.5
@@ -16342,20 +16173,6 @@ snapshots:
       '@stylistic/eslint-plugin': 2.13.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
       '@typescript-eslint/parser': 8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
 
-  eslint-plugin-vue@9.33.0(eslint@9.39.2(jiti@1.21.7)):
-    dependencies:
-      '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.2(jiti@1.21.7))
-      eslint: 9.39.2(jiti@1.21.7)
-      globals: 13.24.0
-      natural-compare: 1.4.0
-      nth-check: 2.1.1
-      postcss-selector-parser: 6.1.2
-      semver: 7.7.4
-      vue-eslint-parser: 9.4.3(eslint@9.39.2(jiti@1.21.7))
-      xml-name-validator: 4.0.0
-    transitivePeerDependencies:
-      - supports-color
-
   eslint-plugin-vue@9.33.0(eslint@9.39.2(jiti@2.6.1)):
     dependencies:
       '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.2(jiti@2.6.1))
@@ -20888,22 +20705,6 @@ snapshots:
       yaml: 2.8.2
     optional: true
 
-  vite@8.0.3(@types/node@24.12.2)(esbuild@0.27.3)(jiti@1.21.7)(sass@1.97.3)(terser@5.46.0)(yaml@2.8.2):
-    dependencies:
-      lightningcss: 1.32.0
-      picomatch: 4.0.4
-      postcss: 8.5.8
-      rolldown: 1.0.0-rc.12
-      tinyglobby: 0.2.15
-    optionalDependencies:
-      '@types/node': 24.12.2
-      esbuild: 0.27.3
-      fsevents: 2.3.3
-      jiti: 1.21.7
-      sass: 1.97.3
-      terser: 5.46.0
-      yaml: 2.8.2
-
   vite@8.0.3(@types/node@24.12.2)(esbuild@0.27.3)(jiti@2.6.1)(sass@1.97.3)(terser@5.46.0)(yaml@2.8.2):
     dependencies:
       lightningcss: 1.32.0
@@ -21040,7 +20841,7 @@ snapshots:
 
   vue-component-type-helpers@3.2.4: {}
 
-  vue-component-type-helpers@3.3.8: {}
+  vue-component-type-helpers@3.3.9: {}
 
   vue-confetti-explosion@1.0.2(vue@3.5.27(typescript@5.9.3)):
     dependencies:
@@ -21080,19 +20881,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  vue-eslint-parser@9.4.3(eslint@9.39.2(jiti@1.21.7)):
-    dependencies:
-      debug: 4.4.3
-      eslint: 9.39.2(jiti@1.21.7)
-      eslint-scope: 7.2.2
-      eslint-visitor-keys: 3.4.3
-      espree: 9.6.1
-      esquery: 1.7.0
-      lodash: 4.17.23
-      semver: 7.7.4
-    transitivePeerDependencies:
-      - supports-color
-
   vue-eslint-parser@9.4.3(eslint@9.39.2(jiti@2.6.1)):
     dependencies:
       debug: 4.4.3

From b78dd9bf1b31d2d001fd15cc837bca272161073c Mon Sep 17 00:00:00 2001
From: ThatGravyBoat <gravy@thatgravyboat.tech>
Date: Fri, 7 Aug 2026 22:46:13 -0230
Subject: [PATCH 59/82] fix: missing delphi severity (#7054)

---
 apps/labrinth/src/database/models/delphi_report_item.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/labrinth/src/database/models/delphi_report_item.rs b/apps/labrinth/src/database/models/delphi_report_item.rs
index 4ae71749b4..41bfa6b782 100644
--- a/apps/labrinth/src/database/models/delphi_report_item.rs
+++ b/apps/labrinth/src/database/models/delphi_report_item.rs
@@ -84,6 +84,8 @@ pub enum DelphiSeverity {
     High,
     #[serde(alias = "SEVERE")]
     Severe,
+    #[serde(alias = "MALWARE")]
+    Malware,
 }
 
 /// An issue found in a Delphi report. Every issue belongs to a report,

From f38d351d323a082427807f7c53d21350deca5cd3 Mon Sep 17 00:00:00 2001
From: Truman Gao <106889354+tdgao@users.noreply.github.com>
Date: Sat, 8 Aug 2026 11:18:58 -0600
Subject: [PATCH 60/82] fix: version upload failing to detect mrpack loader
 (#7063)

---
 apps/frontend/package.json               |  1 +
 apps/frontend/src/helpers/infer/infer.ts | 29 +++++++++++++++++++++++-
 pnpm-lock.yaml                           |  9 ++++++++
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/apps/frontend/package.json b/apps/frontend/package.json
index 8852cd5123..fc536765e9 100644
--- a/apps/frontend/package.json
+++ b/apps/frontend/package.json
@@ -53,6 +53,7 @@
 		"@vue-email/components": "^0.0.21",
 		"@vue-email/render": "^0.0.9",
 		"@vueuse/core": "^11.1.0",
+		"@zip.js/zip.js": "^2.8.34",
 		"ace-builds": "^1.36.2",
 		"ansi-to-html": "^0.7.2",
 		"chart.js": "^4.5.1",
diff --git a/apps/frontend/src/helpers/infer/infer.ts b/apps/frontend/src/helpers/infer/infer.ts
index 9bda8a8049..de5956abf1 100644
--- a/apps/frontend/src/helpers/infer/infer.ts
+++ b/apps/frontend/src/helpers/infer/infer.ts
@@ -19,6 +19,26 @@ export interface InferredVersionInfo {
 	game_versions?: string[]
 }
 
+async function readMrpackManifest(rawFile: RawFile): Promise<string> {
+	const { BlobReader, TextWriter, ZipReader } = await import('@zip.js/zip.js')
+	const reader = new ZipReader(new BlobReader(rawFile))
+
+	try {
+		const entries = await reader.getEntries()
+		const manifest = entries.find(
+			(entry) => !entry.directory && entry.filename === 'modrinth.index.json',
+		)
+
+		if (!manifest || manifest.directory) {
+			throw new Error('Missing modrinth.index.json')
+		}
+
+		return await manifest.getData(new TextWriter())
+	} finally {
+		await reader.close()
+	}
+}
+
 /**
  * Fills in missing version information from the filename if not already present.
  */
@@ -56,11 +76,18 @@ export const inferVersionInfo = async function (
 	const simplifiedGameVersions = gameVersions
 		.filter((it) => it.version_type === 'release')
 		.map((it) => it.version)
+	const loaderParsers = createLoaderParsers(project, gameVersions, simplifiedGameVersions)
+	const fileName = rawFile.name.toLowerCase()
+
+	if (fileName.endsWith('.mrpack') || fileName.endsWith('.mrpack-primary')) {
+		const manifest = await readMrpackManifest(rawFile)
+		const result = loaderParsers['modrinth.index.json'](manifest)
+		return fillMissingFromFilename(result, rawFile.name, project.title)
+	}
 
 	const zipReader = new JSZip()
 	const zip = await zipReader.loadAsync(rawFile)
 
-	const loaderParsers = createLoaderParsers(project, gameVersions, simplifiedGameVersions)
 	const packParser = createPackParser(project, gameVersions, rawFile)
 	const multiFileDetectors = createMultiFileDetectors(project, gameVersions, rawFile)
 
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 614d6852ae..e0dcfd0625 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -308,6 +308,9 @@ importers:
       '@vueuse/core':
         specifier: ^11.1.0
         version: 11.3.0(vue@3.5.27(typescript@5.9.3))
+      '@zip.js/zip.js':
+        specifier: ^2.8.34
+        version: 2.8.34
       ace-builds:
         specifier: ^1.36.2
         version: 1.43.6
@@ -5228,6 +5231,10 @@ packages:
   '@yr/monotone-cubic-spline@1.0.3':
     resolution: {integrity: sha512-FQXkOta0XBSUPHndIKON2Y9JeQz5ZeMqLYZVVK93FliNBFm7LNMIZmY6FrMEB9XPcDbE2bekMbZD6kzDkxwYjA==}
 
+  '@zip.js/zip.js@2.8.34':
+    resolution: {integrity: sha512-+6a3lyqq69rpseLbvDPiVIWsZ/HdTGAAD6afFtug6ECPDGttb2dHnPC6cJgdPofYkzL9OvXizegq+DQVfL2rnA==}
+    engines: {bun: '>=0.7.0', deno: '>=1.0.0', node: '>=18.0.0'}
+
   abbrev@2.0.0:
     resolution: {integrity: sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==}
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
@@ -14910,6 +14917,8 @@ snapshots:
 
   '@yr/monotone-cubic-spline@1.0.3': {}
 
+  '@zip.js/zip.js@2.8.34': {}
+
   abbrev@2.0.0: {}
 
   abbrev@3.0.1: {}

From 757ec9ab5321c0ea630b4bcf6562753e70c5171a Mon Sep 17 00:00:00 2001
From: Truman Gao <106889354+tdgao@users.noreply.github.com>
Date: Sat, 8 Aug 2026 11:34:54 -0600
Subject: [PATCH 61/82] fix: mrpack exporting with zip64 (#7064)

---
 packages/app-lib/src/api/instance/export_mrpack.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/app-lib/src/api/instance/export_mrpack.rs b/packages/app-lib/src/api/instance/export_mrpack.rs
index dd6605f42c..b0ba914642 100644
--- a/packages/app-lib/src/api/instance/export_mrpack.rs
+++ b/packages/app-lib/src/api/instance/export_mrpack.rs
@@ -184,7 +184,7 @@ pub async fn export_mrpack(
     let mut file = File::create(&export_path)
         .await
         .map_err(|e| IOError::with_path(e, &export_path))?;
-    let mut writer = ZipFileWriter::with_tokio(&mut file);
+    let mut writer = ZipFileWriter::with_tokio(&mut file).force_no_zip64();
     let version_id = version_id.unwrap_or("1.0.0".to_string());
     let mut packfile =
         create_mrpack_json(&metadata, version_id, description).await?;

From ff8c4f16a93b51f56c1fa5479456574efa8d834f Mon Sep 17 00:00:00 2001
From: Truman Gao <106889354+tdgao@users.noreply.github.com>
Date: Sat, 8 Aug 2026 13:06:42 -0600
Subject: [PATCH 62/82] fix: action bar max width (#7048)

* fix: action bar max width

* fix: width
---
 packages/ui/src/components/base/FloatingActionBar.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/ui/src/components/base/FloatingActionBar.vue b/packages/ui/src/components/base/FloatingActionBar.vue
index 6b69515363..3f50e745bc 100644
--- a/packages/ui/src/components/base/FloatingActionBar.vue
+++ b/packages/ui/src/components/base/FloatingActionBar.vue
@@ -225,7 +225,7 @@ defineOptions({
 							'bar-compact': compact,
 							'floating-action-bar-attention': attentionRequested,
 						},
-						inline ? 'w-full' : 'mx-auto md:max-w-[60vw]',
+						inline ? 'w-full' : 'mx-auto md:max-w-[min(calc(100vw-120px),1050px)]',
 					]"
 					@animationend="attentionRequested = false"
 				>

From 1a56233c96548fe5d2fc2a227e7a9100b4537299 Mon Sep 17 00:00:00 2001
From: Prospector <6166773+Prospector@users.noreply.github.com>
Date: Sat, 8 Aug 2026 12:10:41 -0700
Subject: [PATCH 63/82] changelog

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

diff --git a/packages/blog/changelog.ts b/packages/blog/changelog.ts
index 186f72224c..1e62b822f6 100644
--- a/packages/blog/changelog.ts
+++ b/packages/blog/changelog.ts
@@ -10,6 +10,13 @@ export type VersionEntry = {
 }
 
 const VERSIONS: VersionEntry[] = [
+	{
+		date: `2026-08-08T19:10:34+00:00`,
+		product: 'web',
+		body: `## Fixed
+- Fixed action bar becoming very wide on larger displays.
+- Version upload failing to detect mrpack loader.`,
+	},
 	{
 		date: `2026-08-07T20:41:51+00:00`,
 		product: 'app',

From 318840e4030737f86dade9f87f3254dad0377ae6 Mon Sep 17 00:00:00 2001
From: coolbot <76798835+coolbot100s@users.noreply.github.com>
Date: Mon, 10 Aug 2026 03:54:29 -0700
Subject: [PATCH 64/82] Fix: Version nag navigation (#7070)

* fix: version nag navigation

* prepr
---
 packages/moderation/src/data/nags/core.ts         | 7 ++++---
 packages/moderation/src/locales/ar-SA/index.json  | 3 ---
 packages/moderation/src/locales/cs-CZ/index.json  | 3 ---
 packages/moderation/src/locales/de-CH/index.json  | 3 ---
 packages/moderation/src/locales/de-DE/index.json  | 3 ---
 packages/moderation/src/locales/en-US/index.json  | 6 +++---
 packages/moderation/src/locales/es-419/index.json | 3 ---
 packages/moderation/src/locales/es-ES/index.json  | 3 ---
 packages/moderation/src/locales/fil-PH/index.json | 3 ---
 packages/moderation/src/locales/fr-FR/index.json  | 3 ---
 packages/moderation/src/locales/he-IL/index.json  | 3 ---
 packages/moderation/src/locales/hu-HU/index.json  | 3 ---
 packages/moderation/src/locales/id-ID/index.json  | 3 ---
 packages/moderation/src/locales/it-IT/index.json  | 3 ---
 packages/moderation/src/locales/ja-JP/index.json  | 3 ---
 packages/moderation/src/locales/ko-KR/index.json  | 3 ---
 packages/moderation/src/locales/ms-MY/index.json  | 3 ---
 packages/moderation/src/locales/nl-NL/index.json  | 3 ---
 packages/moderation/src/locales/no-NO/index.json  | 4 ----
 packages/moderation/src/locales/pl-PL/index.json  | 3 ---
 packages/moderation/src/locales/pt-BR/index.json  | 3 ---
 packages/moderation/src/locales/pt-PT/index.json  | 4 ----
 packages/moderation/src/locales/ro-RO/index.json  | 4 ----
 packages/moderation/src/locales/ru-RU/index.json  | 3 ---
 packages/moderation/src/locales/sr-CS/index.json  | 3 ---
 packages/moderation/src/locales/sv-SE/index.json  | 3 ---
 packages/moderation/src/locales/tr-TR/index.json  | 3 ---
 packages/moderation/src/locales/uk-UA/index.json  | 3 ---
 packages/moderation/src/locales/vi-VN/index.json  | 3 ---
 packages/moderation/src/locales/zh-CN/index.json  | 3 ---
 packages/moderation/src/locales/zh-TW/index.json  | 3 ---
 31 files changed, 7 insertions(+), 96 deletions(-)

diff --git a/packages/moderation/src/data/nags/core.ts b/packages/moderation/src/data/nags/core.ts
index 2695aeda99..616438f5ce 100644
--- a/packages/moderation/src/data/nags/core.ts
+++ b/packages/moderation/src/data/nags/core.ts
@@ -42,10 +42,11 @@ export const coreNags: Nag[] = [
 		link: {
 			path: 'settings/versions',
 			title: defineMessage({
-				id: 'nags.versions.title',
-				defaultMessage: 'Visit versions page',
+				id: 'nags.settings.versions.title',
+				defaultMessage: 'Visit versions settings',
 			}),
-			shouldShow: (context: NagContext) => context.currentRoute !== 'type-project-versions',
+			shouldShow: (context: NagContext) =>
+				context.currentRoute !== 'type-project-settings-versions',
 		},
 	},
 	{
diff --git a/packages/moderation/src/locales/ar-SA/index.json b/packages/moderation/src/locales/ar-SA/index.json
index 8a0510236a..f9bb26c9df 100644
--- a/packages/moderation/src/locales/ar-SA/index.json
+++ b/packages/moderation/src/locales/ar-SA/index.json
@@ -269,9 +269,6 @@
   "nags.verify-external-links.title": {
     "defaultMessage": "إثبات روابط خارجية"
   },
-  "nags.versions.title": {
-    "defaultMessage": "زيارة صفحة الإصدار"
-  },
   "nags.visit-links-settings.title": {
     "defaultMessage": "زيارة إعدادات الروابط"
   }
diff --git a/packages/moderation/src/locales/cs-CZ/index.json b/packages/moderation/src/locales/cs-CZ/index.json
index ac693424c3..d5f0c28f7c 100644
--- a/packages/moderation/src/locales/cs-CZ/index.json
+++ b/packages/moderation/src/locales/cs-CZ/index.json
@@ -266,9 +266,6 @@
   "nags.verify-external-links.title": {
     "defaultMessage": "Ověřte externí odkazy"
   },
-  "nags.versions.title": {
-    "defaultMessage": "Přejděte na stránku verzí"
-  },
   "nags.visit-links-settings.title": {
     "defaultMessage": "Přejděte do nastavení odkazů"
   }
diff --git a/packages/moderation/src/locales/de-CH/index.json b/packages/moderation/src/locales/de-CH/index.json
index 87c6dcf80a..8984fc8a99 100644
--- a/packages/moderation/src/locales/de-CH/index.json
+++ b/packages/moderation/src/locales/de-CH/index.json
@@ -269,9 +269,6 @@
   "nags.verify-external-links.title": {
     "defaultMessage": "Externe Links überprüfen"
   },
-  "nags.versions.title": {
-    "defaultMessage": "Versionen-Seite ansehen"
-  },
   "nags.visit-links-settings.title": {
     "defaultMessage": "Link-Einstellungen ansehen"
   }
diff --git a/packages/moderation/src/locales/de-DE/index.json b/packages/moderation/src/locales/de-DE/index.json
index 40d6b556e7..58ea3d1898 100644
--- a/packages/moderation/src/locales/de-DE/index.json
+++ b/packages/moderation/src/locales/de-DE/index.json
@@ -269,9 +269,6 @@
   "nags.verify-external-links.title": {
     "defaultMessage": "Externe Links überprüfen"
   },
-  "nags.versions.title": {
-    "defaultMessage": "Versionsseite ansehen"
-  },
   "nags.visit-links-settings.title": {
     "defaultMessage": "Linkeinstellungen ansehen"
   }
diff --git a/packages/moderation/src/locales/en-US/index.json b/packages/moderation/src/locales/en-US/index.json
index 442d363b87..491d5df3cf 100644
--- a/packages/moderation/src/locales/en-US/index.json
+++ b/packages/moderation/src/locales/en-US/index.json
@@ -209,6 +209,9 @@
   "nags.settings.title": {
     "defaultMessage": "Visit general settings"
   },
+  "nags.settings.versions.title": {
+    "defaultMessage": "Visit versions settings"
+  },
   "nags.summary-same-as-title.description": {
     "defaultMessage": "Your summary can not be the same as your project's Name. It's important to create an informative and enticing Summary."
   },
@@ -275,9 +278,6 @@
   "nags.verify-external-links.title": {
     "defaultMessage": "Verify external links"
   },
-  "nags.versions.title": {
-    "defaultMessage": "Visit versions page"
-  },
   "nags.visit-links-settings.title": {
     "defaultMessage": "Visit links settings"
   }
diff --git a/packages/moderation/src/locales/es-419/index.json b/packages/moderation/src/locales/es-419/index.json
index 40b3102f42..c4d7c9e886 100644
--- a/packages/moderation/src/locales/es-419/index.json
+++ b/packages/moderation/src/locales/es-419/index.json
@@ -269,9 +269,6 @@
   "nags.verify-external-links.title": {
     "defaultMessage": "Verificar los enlaces externos"
   },
-  "nags.versions.title": {
-    "defaultMessage": "Ver la página de versiones"
-  },
   "nags.visit-links-settings.title": {
     "defaultMessage": "Ver configuración de enlaces"
   }
diff --git a/packages/moderation/src/locales/es-ES/index.json b/packages/moderation/src/locales/es-ES/index.json
index 9d5ba51c18..38a937efe3 100644
--- a/packages/moderation/src/locales/es-ES/index.json
+++ b/packages/moderation/src/locales/es-ES/index.json
@@ -266,9 +266,6 @@
   "nags.verify-external-links.title": {
     "defaultMessage": "Verificar enlaces externos"
   },
-  "nags.versions.title": {
-    "defaultMessage": "Visita la página de versiones"
-  },
   "nags.visit-links-settings.title": {
     "defaultMessage": "Visitar la configuración de enlaces"
   }
diff --git a/packages/moderation/src/locales/fil-PH/index.json b/packages/moderation/src/locales/fil-PH/index.json
index 538a16cf38..bf3b0bcc4f 100644
--- a/packages/moderation/src/locales/fil-PH/index.json
+++ b/packages/moderation/src/locales/fil-PH/index.json
@@ -242,9 +242,6 @@
   "nags.verify-external-links.title": {
     "defaultMessage": "Patunayan ang mga link palabas"
   },
-  "nags.versions.title": {
-    "defaultMessage": "Bisitahin ang pahina ng mga bersiyon"
-  },
   "nags.visit-links-settings.title": {
     "defaultMessage": "Bisitahin ang mga setting sa mga link"
   }
diff --git a/packages/moderation/src/locales/fr-FR/index.json b/packages/moderation/src/locales/fr-FR/index.json
index 41e4a2e0d9..50cc42d5be 100644
--- a/packages/moderation/src/locales/fr-FR/index.json
+++ b/packages/moderation/src/locales/fr-FR/index.json
@@ -269,9 +269,6 @@
   "nags.verify-external-links.title": {
     "defaultMessage": "Vérifier les liens externes"
   },
-  "nags.versions.title": {
-    "defaultMessage": "Voir la page des versions"
-  },
   "nags.visit-links-settings.title": {
     "defaultMessage": "Accéder aux paramètres des liens"
   }
diff --git a/packages/moderation/src/locales/he-IL/index.json b/packages/moderation/src/locales/he-IL/index.json
index 850e76316b..87d262dd34 100644
--- a/packages/moderation/src/locales/he-IL/index.json
+++ b/packages/moderation/src/locales/he-IL/index.json
@@ -215,9 +215,6 @@
   "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 9bd7b6f18d..222f5131e5 100644
--- a/packages/moderation/src/locales/hu-HU/index.json
+++ b/packages/moderation/src/locales/hu-HU/index.json
@@ -269,9 +269,6 @@
   "nags.verify-external-links.title": {
     "defaultMessage": "Ellenőrizd a külső linkeket"
   },
-  "nags.versions.title": {
-    "defaultMessage": "Látogasd meg a Verziók fület"
-  },
   "nags.visit-links-settings.title": {
     "defaultMessage": "Látogasd meg a linkbeállításokat"
   }
diff --git a/packages/moderation/src/locales/id-ID/index.json b/packages/moderation/src/locales/id-ID/index.json
index b43f5bf93a..9c6f48aeed 100644
--- a/packages/moderation/src/locales/id-ID/index.json
+++ b/packages/moderation/src/locales/id-ID/index.json
@@ -269,9 +269,6 @@
   "nags.verify-external-links.title": {
     "defaultMessage": "Periksa tautan eksternal"
   },
-  "nags.versions.title": {
-    "defaultMessage": "Kunjungi laman versi"
-  },
   "nags.visit-links-settings.title": {
     "defaultMessage": "Kunjungi pengaturan tautan"
   }
diff --git a/packages/moderation/src/locales/it-IT/index.json b/packages/moderation/src/locales/it-IT/index.json
index 0ce9d4b100..90d03751b3 100644
--- a/packages/moderation/src/locales/it-IT/index.json
+++ b/packages/moderation/src/locales/it-IT/index.json
@@ -260,9 +260,6 @@
   "nags.verify-external-links.title": {
     "defaultMessage": "Verifica link esterni"
   },
-  "nags.versions.title": {
-    "defaultMessage": "Visita pagina delle versioni"
-  },
   "nags.visit-links-settings.title": {
     "defaultMessage": "Vedi impostazioni dei link"
   }
diff --git a/packages/moderation/src/locales/ja-JP/index.json b/packages/moderation/src/locales/ja-JP/index.json
index 84725ee57d..229782a1b8 100644
--- a/packages/moderation/src/locales/ja-JP/index.json
+++ b/packages/moderation/src/locales/ja-JP/index.json
@@ -269,9 +269,6 @@
   "nags.verify-external-links.title": {
     "defaultMessage": "外部リンクの承認"
   },
-  "nags.versions.title": {
-    "defaultMessage": "バージョンページを表示"
-  },
   "nags.visit-links-settings.title": {
     "defaultMessage": "リンク設定を表示"
   }
diff --git a/packages/moderation/src/locales/ko-KR/index.json b/packages/moderation/src/locales/ko-KR/index.json
index 75ee8e2f5f..701a829949 100644
--- a/packages/moderation/src/locales/ko-KR/index.json
+++ b/packages/moderation/src/locales/ko-KR/index.json
@@ -269,9 +269,6 @@
   "nags.verify-external-links.title": {
     "defaultMessage": "외부 링크 인증"
   },
-  "nags.versions.title": {
-    "defaultMessage": "버전 페이지 방문"
-  },
   "nags.visit-links-settings.title": {
     "defaultMessage": "링크 설정 방문"
   }
diff --git a/packages/moderation/src/locales/ms-MY/index.json b/packages/moderation/src/locales/ms-MY/index.json
index a8bf81c6a3..fbc9e98d1c 100644
--- a/packages/moderation/src/locales/ms-MY/index.json
+++ b/packages/moderation/src/locales/ms-MY/index.json
@@ -242,9 +242,6 @@
   "nags.verify-external-links.title": {
     "defaultMessage": "Sahkan pautan luaran"
   },
-  "nags.versions.title": {
-    "defaultMessage": "Kunjungi laman versi"
-  },
   "nags.visit-links-settings.title": {
     "defaultMessage": "Kunjungi tetapan pautan"
   }
diff --git a/packages/moderation/src/locales/nl-NL/index.json b/packages/moderation/src/locales/nl-NL/index.json
index 5abda570ae..a24accb510 100644
--- a/packages/moderation/src/locales/nl-NL/index.json
+++ b/packages/moderation/src/locales/nl-NL/index.json
@@ -269,9 +269,6 @@
   "nags.verify-external-links.title": {
     "defaultMessage": "Verifieer externe links"
   },
-  "nags.versions.title": {
-    "defaultMessage": "Bezoek versies pagina"
-  },
   "nags.visit-links-settings.title": {
     "defaultMessage": "Bezoek linkjes instellingen"
   }
diff --git a/packages/moderation/src/locales/no-NO/index.json b/packages/moderation/src/locales/no-NO/index.json
index 60bc3f4f7b..f3f49dff9a 100644
--- a/packages/moderation/src/locales/no-NO/index.json
+++ b/packages/moderation/src/locales/no-NO/index.json
@@ -254,11 +254,7 @@
   "nags.verify-external-links.title": {
     "defaultMessage": "Bekreft eksterne lenker"
   },
-  "nags.versions.title": {
-    "defaultMessage": "Gå til versjonssiden"
-  },
   "nags.visit-links-settings.title": {
     "defaultMessage": "Gå til lisensinnstillinger"
   }
 }
-
diff --git a/packages/moderation/src/locales/pl-PL/index.json b/packages/moderation/src/locales/pl-PL/index.json
index 9853913326..8b8d701a77 100644
--- a/packages/moderation/src/locales/pl-PL/index.json
+++ b/packages/moderation/src/locales/pl-PL/index.json
@@ -269,9 +269,6 @@
   "nags.verify-external-links.title": {
     "defaultMessage": "Zweryfikuj linki zewnętrzne"
   },
-  "nags.versions.title": {
-    "defaultMessage": "Odwiedź stronę wersji"
-  },
   "nags.visit-links-settings.title": {
     "defaultMessage": "Odwiedź ustawienia linków"
   }
diff --git a/packages/moderation/src/locales/pt-BR/index.json b/packages/moderation/src/locales/pt-BR/index.json
index 275d3197ca..2ff482ec93 100644
--- a/packages/moderation/src/locales/pt-BR/index.json
+++ b/packages/moderation/src/locales/pt-BR/index.json
@@ -269,9 +269,6 @@
   "nags.verify-external-links.title": {
     "defaultMessage": "Verificar links externos"
   },
-  "nags.versions.title": {
-    "defaultMessage": "Visitar página de versões"
-  },
   "nags.visit-links-settings.title": {
     "defaultMessage": "Visitar página de links"
   }
diff --git a/packages/moderation/src/locales/pt-PT/index.json b/packages/moderation/src/locales/pt-PT/index.json
index 972b6cf7b0..adf2f901bf 100644
--- a/packages/moderation/src/locales/pt-PT/index.json
+++ b/packages/moderation/src/locales/pt-PT/index.json
@@ -254,11 +254,7 @@
   "nags.verify-external-links.title": {
     "defaultMessage": "Verifica os links externos"
   },
-  "nags.versions.title": {
-    "defaultMessage": "Vê a página de versões"
-  },
   "nags.visit-links-settings.title": {
     "defaultMessage": "Vê as definições de links"
   }
 }
-
diff --git a/packages/moderation/src/locales/ro-RO/index.json b/packages/moderation/src/locales/ro-RO/index.json
index fe32613d5d..0584da46c8 100644
--- a/packages/moderation/src/locales/ro-RO/index.json
+++ b/packages/moderation/src/locales/ro-RO/index.json
@@ -230,11 +230,7 @@
   "nags.verify-external-links.title": {
     "defaultMessage": "Verifică link-urile externe"
   },
-  "nags.versions.title": {
-    "defaultMessage": "Vizitează pagina de versiuni"
-  },
   "nags.visit-links-settings.title": {
     "defaultMessage": "Vizitează setările link-urilor"
   }
 }
-
diff --git a/packages/moderation/src/locales/ru-RU/index.json b/packages/moderation/src/locales/ru-RU/index.json
index 60234043fe..25618018dc 100644
--- a/packages/moderation/src/locales/ru-RU/index.json
+++ b/packages/moderation/src/locales/ru-RU/index.json
@@ -269,9 +269,6 @@
   "nags.verify-external-links.title": {
     "defaultMessage": "Проверьте ссылки"
   },
-  "nags.versions.title": {
-    "defaultMessage": "Открыть страницу версий"
-  },
   "nags.visit-links-settings.title": {
     "defaultMessage": "Настроить ссылки"
   }
diff --git a/packages/moderation/src/locales/sr-CS/index.json b/packages/moderation/src/locales/sr-CS/index.json
index c4870fbc39..9436c9c66d 100644
--- a/packages/moderation/src/locales/sr-CS/index.json
+++ b/packages/moderation/src/locales/sr-CS/index.json
@@ -269,9 +269,6 @@
   "nags.verify-external-links.title": {
     "defaultMessage": "Proveri spoljne linkove"
   },
-  "nags.versions.title": {
-    "defaultMessage": "Posjeti stranu verzija"
-  },
   "nags.visit-links-settings.title": {
     "defaultMessage": "Posjeti podešavanja linkova"
   }
diff --git a/packages/moderation/src/locales/sv-SE/index.json b/packages/moderation/src/locales/sv-SE/index.json
index 9f3ea9d520..53353a1de6 100644
--- a/packages/moderation/src/locales/sv-SE/index.json
+++ b/packages/moderation/src/locales/sv-SE/index.json
@@ -269,9 +269,6 @@
   "nags.verify-external-links.title": {
     "defaultMessage": "Verifiera externa länkar"
   },
-  "nags.versions.title": {
-    "defaultMessage": "Besök versionssida"
-  },
   "nags.visit-links-settings.title": {
     "defaultMessage": "Besök länkinställningar"
   }
diff --git a/packages/moderation/src/locales/tr-TR/index.json b/packages/moderation/src/locales/tr-TR/index.json
index d3c8623792..80a9e491db 100644
--- a/packages/moderation/src/locales/tr-TR/index.json
+++ b/packages/moderation/src/locales/tr-TR/index.json
@@ -269,9 +269,6 @@
   "nags.verify-external-links.title": {
     "defaultMessage": "Dış bağlantıları doğrula"
   },
-  "nags.versions.title": {
-    "defaultMessage": "Sürümlere göz at"
-  },
   "nags.visit-links-settings.title": {
     "defaultMessage": "Bağlantı ayarlarına göz at"
   }
diff --git a/packages/moderation/src/locales/uk-UA/index.json b/packages/moderation/src/locales/uk-UA/index.json
index 46391f770c..837dffa0bb 100644
--- a/packages/moderation/src/locales/uk-UA/index.json
+++ b/packages/moderation/src/locales/uk-UA/index.json
@@ -269,9 +269,6 @@
   "nags.verify-external-links.title": {
     "defaultMessage": "Перевірте зовнішні посилання"
   },
-  "nags.versions.title": {
-    "defaultMessage": "Відвідайте сторінку з версіями"
-  },
   "nags.visit-links-settings.title": {
     "defaultMessage": "Відвідайте налаштування посилань"
   }
diff --git a/packages/moderation/src/locales/vi-VN/index.json b/packages/moderation/src/locales/vi-VN/index.json
index cb2ddcda50..e2081045c4 100644
--- a/packages/moderation/src/locales/vi-VN/index.json
+++ b/packages/moderation/src/locales/vi-VN/index.json
@@ -269,9 +269,6 @@
   "nags.verify-external-links.title": {
     "defaultMessage": "Xác minh các liên kết bên ngoài"
   },
-  "nags.versions.title": {
-    "defaultMessage": "Truy cập trang phiên bản"
-  },
   "nags.visit-links-settings.title": {
     "defaultMessage": "Truy cập cài đặt liên kết"
   }
diff --git a/packages/moderation/src/locales/zh-CN/index.json b/packages/moderation/src/locales/zh-CN/index.json
index 25e96372bd..59b8434e14 100644
--- a/packages/moderation/src/locales/zh-CN/index.json
+++ b/packages/moderation/src/locales/zh-CN/index.json
@@ -269,9 +269,6 @@
   "nags.verify-external-links.title": {
     "defaultMessage": "验证外部链接"
   },
-  "nags.versions.title": {
-    "defaultMessage": "访问版本页面"
-  },
   "nags.visit-links-settings.title": {
     "defaultMessage": "访问链接设置"
   }
diff --git a/packages/moderation/src/locales/zh-TW/index.json b/packages/moderation/src/locales/zh-TW/index.json
index 7d7ad267e5..3a3ef92a08 100644
--- a/packages/moderation/src/locales/zh-TW/index.json
+++ b/packages/moderation/src/locales/zh-TW/index.json
@@ -269,9 +269,6 @@
   "nags.verify-external-links.title": {
     "defaultMessage": "驗證外部連結"
   },
-  "nags.versions.title": {
-    "defaultMessage": "前往版本頁面"
-  },
   "nags.visit-links-settings.title": {
     "defaultMessage": "前往連結設定"
   }

From e2612d1a33a18e6e67852c7f3af4b1de6a3525e1 Mon Sep 17 00:00:00 2001
From: Seungyeop Lee <shihyeon@shihyeon.kr>
Date: Mon, 10 Aug 2026 20:32:18 +0900
Subject: [PATCH 65/82] fix sidebar closing when collapsing friends list
 sections (#7060) (#7062)

---
 apps/app-frontend/src/App.vue | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue
index 35e6692fbb..c905b2cd07 100644
--- a/apps/app-frontend/src/App.vue
+++ b/apps/app-frontend/src/App.vue
@@ -175,9 +175,12 @@ const PRIDE_FUNDRAISER_END_DATE = new Date('2026-07-01T00:00:00Z').getTime()
 const credentials = ref()
 let credentialsRefreshId = 0
 const sidebarToggled = ref(true)
-const unsubscribeSidebarToggle = themeStore.$subscribe(() => {
-	sidebarToggled.value = !themeStore.toggleSidebar
-})
+watch(
+	() => themeStore.toggleSidebar,
+	(toggleSidebar) => {
+		sidebarToggled.value = !toggleSidebar
+	},
+)
 const forceSidebar = computed(
 	() => route.path.startsWith('/browse') || route.path.startsWith('/project'),
 )
@@ -364,7 +367,6 @@ onMounted(async () => {
 onUnmounted(async () => {
 	document.querySelector('body').removeEventListener('click', handleClick)
 	document.querySelector('body').removeEventListener('auxclick', handleAuxClick)
-	unsubscribeSidebarToggle()
 	clearDelayedUpdatePopup()
 
 	await unlistenAdsConsent?.()

From 357224f22a021a0c48d6f489affd8afd4fe877fa Mon Sep 17 00:00:00 2001
From: Modrinth Bot <106493074+modrinth-bot@users.noreply.github.com>
Date: Mon, 10 Aug 2026 13:43:08 +0200
Subject: [PATCH 66/82] New translations from Crowdin (main) (#7071)

---
 .../app-frontend/src/locales/cs-CZ/index.json |  12 +
 .../app-frontend/src/locales/da-DK/index.json |  30 +
 .../app-frontend/src/locales/de-CH/index.json |  39 +-
 .../app-frontend/src/locales/de-DE/index.json |  39 +-
 .../src/locales/es-419/index.json             | 444 +++++++++++++-
 .../app-frontend/src/locales/es-ES/index.json |  15 +
 .../app-frontend/src/locales/fr-FR/index.json | 129 +++-
 .../app-frontend/src/locales/hu-HU/index.json | 259 ++++----
 .../app-frontend/src/locales/it-IT/index.json |  32 +-
 .../app-frontend/src/locales/ja-JP/index.json |  29 +-
 .../app-frontend/src/locales/ms-MY/index.json |   6 +
 .../app-frontend/src/locales/nl-NL/index.json | 123 ++++
 .../app-frontend/src/locales/pl-PL/index.json |  47 +-
 .../app-frontend/src/locales/pt-BR/index.json |  28 +-
 .../app-frontend/src/locales/ro-RO/index.json | 120 ++++
 .../app-frontend/src/locales/ru-RU/index.json |  38 +-
 .../app-frontend/src/locales/sr-CS/index.json |   3 +
 .../app-frontend/src/locales/sv-SE/index.json |  48 +-
 .../app-frontend/src/locales/tr-TR/index.json |  27 +
 .../app-frontend/src/locales/uk-UA/index.json |  31 +-
 .../app-frontend/src/locales/zh-CN/index.json |  30 +-
 .../app-frontend/src/locales/zh-TW/index.json |  28 +-
 apps/frontend/src/locales/de-CH/index.json    |  28 +-
 apps/frontend/src/locales/de-DE/index.json    |  30 +-
 apps/frontend/src/locales/es-419/index.json   |  32 +-
 apps/frontend/src/locales/es-ES/index.json    |  12 +
 apps/frontend/src/locales/fr-FR/index.json    |  28 +-
 apps/frontend/src/locales/he-IL/index.json    |   3 +
 apps/frontend/src/locales/hu-HU/index.json    |  18 +-
 apps/frontend/src/locales/it-IT/index.json    |  26 +-
 apps/frontend/src/locales/ja-JP/index.json    |  69 ++-
 apps/frontend/src/locales/nl-NL/index.json    |  18 +
 apps/frontend/src/locales/pl-PL/index.json    |   3 +
 apps/frontend/src/locales/pt-BR/index.json    |  18 +
 apps/frontend/src/locales/ru-RU/index.json    |  18 +
 apps/frontend/src/locales/sv-SE/index.json    |  96 +++
 apps/frontend/src/locales/uk-UA/index.json    |   6 +
 apps/frontend/src/locales/zh-CN/index.json    |  18 +
 apps/frontend/src/locales/zh-TW/index.json    |  18 +
 .../moderation/src/locales/ar-SA/index.json   |   1 +
 .../moderation/src/locales/cs-CZ/index.json   |   4 +
 .../moderation/src/locales/de-CH/index.json   |   7 +
 .../moderation/src/locales/de-DE/index.json   |   7 +
 .../moderation/src/locales/es-419/index.json  |  19 +-
 .../moderation/src/locales/es-ES/index.json   |   1 +
 .../moderation/src/locales/fil-PH/index.json  |   1 +
 .../moderation/src/locales/fr-FR/index.json   |   7 +
 .../moderation/src/locales/hu-HU/index.json   |   3 +-
 .../moderation/src/locales/id-ID/index.json   |   1 +
 .../moderation/src/locales/it-IT/index.json   |   6 +
 .../moderation/src/locales/ja-JP/index.json   |   7 +
 .../moderation/src/locales/ko-KR/index.json   |   1 +
 .../moderation/src/locales/ms-MY/index.json   |   1 +
 .../moderation/src/locales/nl-NL/index.json   |  15 +-
 .../moderation/src/locales/pl-PL/index.json   |   1 +
 .../moderation/src/locales/pt-BR/index.json   |   7 +
 .../moderation/src/locales/ru-RU/index.json   |   7 +
 .../moderation/src/locales/sr-CS/index.json   |   1 +
 .../moderation/src/locales/sv-SE/index.json   |  33 +-
 .../moderation/src/locales/tr-TR/index.json   |   1 +
 .../moderation/src/locales/uk-UA/index.json   |   1 +
 .../moderation/src/locales/vi-VN/index.json   |   1 +
 .../moderation/src/locales/zh-CN/index.json   |   9 +-
 .../moderation/src/locales/zh-TW/index.json   |   7 +
 packages/ui/src/locales/cs-CZ/index.json      |   1 +
 packages/ui/src/locales/da-DK/index.json      |   1 +
 packages/ui/src/locales/de-CH/index.json      |  30 +-
 packages/ui/src/locales/de-DE/index.json      |  34 +-
 packages/ui/src/locales/es-419/index.json     |  25 +-
 packages/ui/src/locales/es-ES/index.json      | 576 ++++++++++++++++++
 packages/ui/src/locales/fil-PH/index.json     |   1 +
 packages/ui/src/locales/fr-FR/index.json      |  15 +
 packages/ui/src/locales/hu-HU/index.json      |   2 +-
 packages/ui/src/locales/id-ID/index.json      |   1 +
 packages/ui/src/locales/it-IT/index.json      |   6 +-
 packages/ui/src/locales/ja-JP/index.json      | 533 +++++++++++++++-
 packages/ui/src/locales/ms-MY/index.json      |   1 +
 packages/ui/src/locales/nl-NL/index.json      | 201 ++++++
 packages/ui/src/locales/pt-BR/index.json      |   1 +
 packages/ui/src/locales/pt-PT/index.json      |   1 +
 packages/ui/src/locales/ru-RU/index.json      |  56 +-
 packages/ui/src/locales/sr-CS/index.json      |   1 +
 packages/ui/src/locales/sv-SE/index.json      |  50 +-
 packages/ui/src/locales/uk-UA/index.json      |  20 +-
 packages/ui/src/locales/vi-VN/index.json      |   1 +
 packages/ui/src/locales/zh-CN/index.json      |   1 +
 packages/ui/src/locales/zh-TW/index.json      |   1 +
 87 files changed, 3398 insertions(+), 308 deletions(-)

diff --git a/apps/app-frontend/src/locales/cs-CZ/index.json b/apps/app-frontend/src/locales/cs-CZ/index.json
index 499580dbf5..748bd11a92 100644
--- a/apps/app-frontend/src/locales/cs-CZ/index.json
+++ b/apps/app-frontend/src/locales/cs-CZ/index.json
@@ -14,6 +14,9 @@
   "app.action-bar.install.copied-details": {
     "message": "Zkopírováno"
   },
+  "app.action-bar.install.copy-details": {
+    "message": "Kopírovat detaily"
+  },
   "app.action-bar.install.dismiss": {
     "message": "Zavřít"
   },
@@ -26,6 +29,9 @@
   "app.action-bar.install.summary.canceled": {
     "message": "Zrušeno"
   },
+  "app.action-bar.install.summary.cleanup-incomplete": {
+    "message": "Čištění nebylo dokončeno"
+  },
   "app.action-bar.install.unknown-instance": {
     "message": "Neznámá instance"
   },
@@ -65,6 +71,9 @@
   "app.action-bar.view-logs": {
     "message": "Zobrazit logy"
   },
+  "app.ads-consent.title": {
+    "message": "Vaše soukromí a způsob, jakým reklamy podporují Modrinth"
+  },
   "app.appearance-settings.advanced-rendering.title": {
     "message": "Pokročilé vykreslování"
   },
@@ -212,6 +221,9 @@
   "app.install.phase.running_loader_processors": {
     "message": "Spuštění loader procesů"
   },
+  "app.instance.admonitions.shared-instance.removed-label": {
+    "message": "Odstraněno"
+  },
   "app.instance.confirm-delete.admonition-body": {
     "message": "Všechna data tvé instance budou trvale smazána, včetně světů, konfigurací a veškerého nainstalovaného obsahu."
   },
diff --git a/apps/app-frontend/src/locales/da-DK/index.json b/apps/app-frontend/src/locales/da-DK/index.json
index c0aa6b0e50..830d28558f 100644
--- a/apps/app-frontend/src/locales/da-DK/index.json
+++ b/apps/app-frontend/src/locales/da-DK/index.json
@@ -179,6 +179,9 @@
   "app.auth-servers.unreachable.header": {
     "message": "Kan ikke nå autentificeringsservere"
   },
+  "app.behavior-settings.content.title": {
+    "message": "Hjem og indhold"
+  },
   "app.browse.add-servers-to-instance": {
     "message": "Tilføjet server til instance"
   },
@@ -200,12 +203,18 @@
   "app.browse.back-to-instance": {
     "message": "Tilbage til instance"
   },
+  "app.browse.discover-project-type": {
+    "message": "Udforsk {projectType}"
+  },
   "app.browse.discover-servers": {
     "message": "Opdag servere"
   },
   "app.browse.hide-added-servers": {
     "message": "Gem servere som allerede er tilføjet"
   },
+  "app.browse.hide-installed-modpacks": {
+    "message": "Skjul allerede installeret"
+  },
   "app.browse.project-type.modpacks": {
     "message": "Modpacks"
   },
@@ -245,15 +254,30 @@
   "app.install.phase.downloading_minecraft": {
     "message": "Downloader Minecraft"
   },
+  "app.install.phase.finalizing": {
+    "message": "Færdiggører"
+  },
+  "app.install.phase.preparing_instance": {
+    "message": "I kø til at intallere"
+  },
+  "app.install.phase.preparing_java": {
+    "message": "Forbereder Java"
+  },
   "app.install.phase.preparing_java.downloading": {
     "message": "Downloader Java {version}"
   },
+  "app.install.phase.preparing_java.extracting": {
+    "message": "Udpakker Java {version}"
+  },
   "app.install.phase.preparing_java.fetching-metadata": {
     "message": "Henter Java {version}"
   },
   "app.install.phase.preparing_java.resolving": {
     "message": "Forbereder Java {version}"
   },
+  "app.install.phase.preparing_java.validating": {
+    "message": "Validerer Java {version}"
+  },
   "app.instance.admonitions.shared-instance.added-label": {
     "message": "Tilføjet"
   },
@@ -359,6 +383,12 @@
   "app.instance.share.remove-user-modal.effects-label": {
     "message": "Hvad vil der ske?"
   },
+  "app.instance.share.remove-user-modal.header": {
+    "message": "Fjern adgang"
+  },
+  "app.instance.share.remove-user-modal.remove-button": {
+    "message": "Fjern adgang"
+  },
   "app.instance.share.remove-user-modal.user-avatar-alt": {
     "message": "{username}'s avatar"
   },
diff --git a/apps/app-frontend/src/locales/de-CH/index.json b/apps/app-frontend/src/locales/de-CH/index.json
index c74ea4c9f9..2287ffb102 100644
--- a/apps/app-frontend/src/locales/de-CH/index.json
+++ b/apps/app-frontend/src/locales/de-CH/index.json
@@ -210,7 +210,7 @@
     "message": "Rechte Seitenleiste ausblenden"
   },
   "app.appearance-settings.unknown-pack-warning.description": {
-    "message": "Sicherheitswarnung vor der Installation eines Modrinth-Packs (.mrpack) anzeigen, das nicht auf Modrinth gehostet wird."
+    "message": "Zeige eine Sicherheitswarnung an, bevor ein Modrinth-Paket (.mrpack) installiert wird, welches nicht auf Modrinth gehostet wird."
   },
   "app.appearance-settings.unknown-pack-warning.title": {
     "message": "Warne mich, bevor unbekannte Modpacks installiert werden"
@@ -590,6 +590,9 @@
   "app.instance.worlds.no-worlds-heading": {
     "message": "Keine Server oder Welten hinzugefügt"
   },
+  "app.instance.worlds.refreshing": {
+    "message": "Wird aktualisiert..."
+  },
   "app.instance.worlds.remove-server-modal.remove-button": {
     "message": "Server entfernen"
   },
@@ -849,7 +852,7 @@
     "message": "Startet Instanzen im Vollbildmodus durch Aktualisieren ihrer options.txt-Datei."
   },
   "app.settings.default-instance-options.fullscreen.title": {
-    "message": "Vollbildschirm"
+    "message": "Vollbild"
   },
   "app.settings.default-instance-options.height.description": {
     "message": "Die Höhe des Spielfensters beim Starten"
@@ -981,7 +984,7 @@
     "message": "Neues App-Verzeichnis auswählen"
   },
   "app.settings.resource-management.app-directory.title": {
-    "message": "App Installation"
+    "message": "App-Verzeichnis"
   },
   "app.settings.resource-management.maximum-concurrent-downloads.description": {
     "message": "Anzahl der Dateien, die die App auf einmal herunterladen kann. Senke dies, wenn downloads auf deiner Verbindung unzuverlässig sind. Benötigt einen App-Neustart."
@@ -1005,7 +1008,7 @@
     "message": "Verhalten"
   },
   "app.settings.tabs.default-instance-options": {
-    "message": "Standard Spieleinstellungen"
+    "message": "Standard-Spieloptionen"
   },
   "app.settings.tabs.java-installations": {
     "message": "Java Installationen"
@@ -1188,10 +1191,10 @@
     "message": "Das Feedback geht direkt an das Modrinth-Team und wird helfen, zukünftige Updates zu gestalten!"
   },
   "app.survey.no-thanks": {
-    "message": "Nein, danke"
+    "message": "Nein danke"
   },
   "app.survey.take-survey": {
-    "message": "Beantworten"
+    "message": "An Umfrage teilnehmen"
   },
   "app.survey.title": {
     "message": "Hey, Modrinth Nutzer!"
@@ -1226,6 +1229,9 @@
   "app.update.complete-toast.title": {
     "message": "Version {version} wurde erfolgreich installiert!"
   },
+  "app.user.project.install-to-instance": {
+    "message": "In Instanz installieren"
+  },
   "app.world.server-modal.placeholder-address": {
     "message": "example.modrinth.gg"
   },
@@ -1619,6 +1625,27 @@
   "instance.settings.tabs.hooks.title": {
     "message": "Spielstart Hooks"
   },
+  "instance.settings.tabs.hooks.variables.description": {
+    "message": "Hooks werden im Arbeitsverzeichnis der Instanz mit den folgenden Variablen ausgeführt:"
+  },
+  "instance.settings.tabs.hooks.variables.inst-dir.description": {
+    "message": "$INST_DIR: Der absolute Pfad zum Ordner der Instanz"
+  },
+  "instance.settings.tabs.hooks.variables.inst-id.description": {
+    "message": "$INST_ID: Der Name des Ordners der Instanz"
+  },
+  "instance.settings.tabs.hooks.variables.inst-java-args.description": {
+    "message": "$INST_JAVA_ARGS: Die JVM-Argumente, die dem Spiel zur Verfügung gestellt werden"
+  },
+  "instance.settings.tabs.hooks.variables.inst-java.description": {
+    "message": "$INST_JAVA: Der absolute Pfad zur Java-Binärdatei"
+  },
+  "instance.settings.tabs.hooks.variables.inst-mc-dir.description": {
+    "message": "$INST_MC_DIR: Ein Alias für $INST_DIR"
+  },
+  "instance.settings.tabs.hooks.variables.inst-name.description": {
+    "message": "$INST_NAME: Der Name der Instanz"
+  },
   "instance.settings.tabs.hooks.wrapper": {
     "message": "Wrapper"
   },
diff --git a/apps/app-frontend/src/locales/de-DE/index.json b/apps/app-frontend/src/locales/de-DE/index.json
index aec68c7665..368db919e5 100644
--- a/apps/app-frontend/src/locales/de-DE/index.json
+++ b/apps/app-frontend/src/locales/de-DE/index.json
@@ -210,7 +210,7 @@
     "message": "Rechte Seitenleiste ausblenden"
   },
   "app.appearance-settings.unknown-pack-warning.description": {
-    "message": "Sicherheitswarnung vor der Installation eines Modrinth-Packs (.mrpack) anzeigen, das nicht auf Modrinth gehostet wird."
+    "message": "Zeige eine Sicherheitswarnung an, bevor ein Modrinth-Paket (.mrpack) installiert wird, welches nicht auf Modrinth gehostet wird."
   },
   "app.appearance-settings.unknown-pack-warning.title": {
     "message": "Warne mich, bevor unbekannte Modpacks installiert werden"
@@ -590,6 +590,9 @@
   "app.instance.worlds.no-worlds-heading": {
     "message": "Keine Server oder Welten hinzugefügt"
   },
+  "app.instance.worlds.refreshing": {
+    "message": "Wird aktualisiert..."
+  },
   "app.instance.worlds.remove-server-modal.remove-button": {
     "message": "Server entfernen"
   },
@@ -849,7 +852,7 @@
     "message": "Startet Instanzen im Vollbildmodus durch Aktualisieren ihrer options.txt-Datei."
   },
   "app.settings.default-instance-options.fullscreen.title": {
-    "message": "Vollbildschirm"
+    "message": "Vollbild"
   },
   "app.settings.default-instance-options.height.description": {
     "message": "Die Höhe des Spielfensters beim Starten"
@@ -981,7 +984,7 @@
     "message": "Neues App-Verzeichnis auswählen"
   },
   "app.settings.resource-management.app-directory.title": {
-    "message": "App Installation"
+    "message": "App-Verzeichnis"
   },
   "app.settings.resource-management.maximum-concurrent-downloads.description": {
     "message": "Anzahl der Dateien, die die App auf einmal herunterladen kann. Senke dies, wenn downloads auf deiner Verbindung unzuverlässig sind. Benötigt einen App-Neustart."
@@ -1005,7 +1008,7 @@
     "message": "Verhalten"
   },
   "app.settings.tabs.default-instance-options": {
-    "message": "Standard Spieleinstellungen"
+    "message": "Standard-Spieloptionen"
   },
   "app.settings.tabs.java-installations": {
     "message": "Java-Installationen"
@@ -1188,10 +1191,10 @@
     "message": "Das Feedback geht direkt an das Modrinth-Team und wird helfen, zukünftige Updates zu gestalten!"
   },
   "app.survey.no-thanks": {
-    "message": "Nein, danke"
+    "message": "Nein danke"
   },
   "app.survey.take-survey": {
-    "message": "Beantworten"
+    "message": "An Umfrage teilnehmen"
   },
   "app.survey.title": {
     "message": "Hey, Modrinth Nutzer!"
@@ -1226,6 +1229,9 @@
   "app.update.complete-toast.title": {
     "message": "Version {version} wurde erfolgreich installiert!"
   },
+  "app.user.project.install-to-instance": {
+    "message": "In Instanz installieren"
+  },
   "app.world.server-modal.placeholder-address": {
     "message": "example.modrinth.gg"
   },
@@ -1619,6 +1625,27 @@
   "instance.settings.tabs.hooks.title": {
     "message": "Start-Hooks"
   },
+  "instance.settings.tabs.hooks.variables.description": {
+    "message": "Hooks werden im Arbeitsverzeichnis der Instanz mit den folgenden Variablen ausgeführt:"
+  },
+  "instance.settings.tabs.hooks.variables.inst-dir.description": {
+    "message": "$INST_DIR: Der absolute Pfad zum Ordner der Instanz"
+  },
+  "instance.settings.tabs.hooks.variables.inst-id.description": {
+    "message": "$INST_ID: Der Name des Ordners der Instanz"
+  },
+  "instance.settings.tabs.hooks.variables.inst-java-args.description": {
+    "message": "$INST_JAVA_ARGS: Die JVM-Argumente, die dem Spiel zur Verfügung gestellt werden"
+  },
+  "instance.settings.tabs.hooks.variables.inst-java.description": {
+    "message": "$INST_JAVA: Der absolute Pfad zur Java-Binärdatei"
+  },
+  "instance.settings.tabs.hooks.variables.inst-mc-dir.description": {
+    "message": "$INST_MC_DIR: Ein Alias für $INST_DIR"
+  },
+  "instance.settings.tabs.hooks.variables.inst-name.description": {
+    "message": "$INST_NAME: Der Name der Instanz"
+  },
   "instance.settings.tabs.hooks.wrapper": {
     "message": "Wrapper"
   },
diff --git a/apps/app-frontend/src/locales/es-419/index.json b/apps/app-frontend/src/locales/es-419/index.json
index 967688bdfb..ebac5e2e5f 100644
--- a/apps/app-frontend/src/locales/es-419/index.json
+++ b/apps/app-frontend/src/locales/es-419/index.json
@@ -174,7 +174,7 @@
     "message": "Ocultar etiqueta de nombre"
   },
   "app.appearance-settings.jump-back-into-worlds.description": {
-    "message": "Muestra los mundos recientes en la sección \"Volver a jugar\" en la página principal."
+    "message": "Muestra los mundos recientes en la sección \"Volver a jugar\" en la página de inicio."
   },
   "app.appearance-settings.jump-back-into-worlds.title": {
     "message": "Volver a jugar mundos"
@@ -186,7 +186,7 @@
     "message": "Minimizar app"
   },
   "app.appearance-settings.native-decorations.description": {
-    "message": "Usa el borde de ventana de tu sistema. Requiere reiniciar la aplicación."
+    "message": "Usa el borde de ventana de tu sistema. Necesita reiniciar la aplicación."
   },
   "app.appearance-settings.native-decorations.title": {
     "message": "Decoraciones nativas"
@@ -225,7 +225,7 @@
     "message": "Confirmaciones"
   },
   "app.behavior-settings.content.title": {
-    "message": "Página principal y contenido"
+    "message": "Página de inicio y contenido"
   },
   "app.behavior-settings.startup-and-navigation.title": {
     "message": "Inicio y navegación"
@@ -258,7 +258,7 @@
     "message": "Descubrir servidores"
   },
   "app.browse.hide-added-servers": {
-    "message": "Ocultar los servidores ya agregados"
+    "message": "Ocultar los servidores ya añadidos"
   },
   "app.browse.hide-installed-modpacks": {
     "message": "Esconder los ya instalados"
@@ -372,7 +372,7 @@
     "message": "Enviar actualización"
   },
   "app.instance.admonitions.shared-instance.review-description": {
-    "message": "Revisar los cambios de contenido que se compartirán con los usuarios de esta instancia."
+    "message": "Revisa los cambios de contenido que se compartirán con los usuarios de esta instancia."
   },
   "app.instance.admonitions.shared-instance.review-header": {
     "message": "Revisar cambios"
@@ -384,7 +384,7 @@
     "message": "Actualizando..."
   },
   "app.instance.admonitions.shared-instance.update-available-body": {
-    "message": "Se requiere una actualización para jugar a {name}. por favor actualiza a la versión más reciente para abrir el juego."
+    "message": "Se necesita una actualización para jugar a {name}. Por favor actualiza a la versión más reciente para iniciar el juego."
   },
   "app.instance.admonitions.shared-instance.update-available-header": {
     "message": "Hay una actualización disponible"
@@ -483,7 +483,7 @@
     "message": "Ningún usuario coincide con tus filtros."
   },
   "app.instance.share.remove-user-modal.effect-access": {
-    "message": "Ya no recibirán actualizaciones para esta instancia compartida"
+    "message": "Ya no recibirán actualizaciones para esta instancia"
   },
   "app.instance.share.remove-user-modal.effect-installed-copy": {
     "message": "Cualquier copia que tengan instalada se quedará en su dispositivo"
@@ -510,10 +510,10 @@
     "message": "Si revocas el acceso de {username} a esta instancia, tendrás que invitarlos otra vez para que sigan recibiendo actualizaciones."
   },
   "app.instance.share.sign-in.button": {
-    "message": "Iniciar sesión"
+    "message": "Inicia sesión"
   },
   "app.instance.share.unable-to-connect.description": {
-    "message": "El servicio de instancias compartidas no está disponible, inténtalo otra vez más tarde"
+    "message": "El servicio de instancias compartidas no está disponible, por favor inténtalo otra vez más tarde"
   },
   "app.instance.share.unable-to-connect.heading": {
     "message": "No se puede conectar"
@@ -590,6 +590,9 @@
   "app.instance.worlds.no-worlds-heading": {
     "message": "No hay servidores ni mundos añadidos"
   },
+  "app.instance.worlds.refreshing": {
+    "message": "Recargando..."
+  },
   "app.instance.worlds.remove-server-modal.remove-button": {
     "message": "Eliminar servidor"
   },
@@ -717,7 +720,7 @@
     "message": "Reporte enviado"
   },
   "app.modal.install-to-play.report-support-and-bugs": {
-    "message": "Para solicitudes de ayuda, contacte a nuestro <support-link>equipo de soporte</support-link>. Para reportar un bug, abra una <github-link>incidencia (issue) en GitHub</github-link>."
+    "message": "Para solicitudes de ayuda, contacte a nuestro <support-link>equipo de soporte</support-link>. Para reportar un bug, abra una <github-link>issue en GitHub</github-link>."
   },
   "app.modal.install-to-play.reviewed-files": {
     "message": "Un archivo solo se revisa si se publica en Modrinth, sin importar su formato (incluido el .mrpack)."
@@ -728,6 +731,9 @@
   "app.modal.install-to-play.shared-instance-content": {
     "message": "Contenido de la instancia compartida"
   },
+  "app.modal.install-to-play.shared-instance-unknown-files-description": {
+    "message": "Esta instancia contiene archivos que no están publicados en Modrinth. Recomendamos encarecidamente instalar únicamente archivos de fuentes de confianza."
+  },
   "app.modal.install-to-play.unknown-files-description": {
     "message": "Este modpack para servidor contiene archivos que no están publicados en Modrinth. Recomendamos encarecidamente instalar únicamente archivos de fuentes de confianza."
   },
@@ -737,6 +743,9 @@
   "app.modal.install-to-play.unrecognized-files": {
     "message": "Archivos no reconocidos"
   },
+  "app.modal.install-to-play.user-blocked": {
+    "message": "Usuario bloqueado"
+  },
   "app.modal.install-to-play.view-contents": {
     "message": "Ver contenidos"
   },
@@ -744,11 +753,56 @@
     "message": "Actualizar para jugar"
   },
   "app.modal.update-to-play.removed": {
-    "message": "Eliminado"
+    "message": "Se eliminó"
+  },
+  "app.modal.update-to-play.server-modpack-unknown-files-description": {
+    "message": "Esta actualización de modpack para servidor contiene archivos que no están publicados en Modrinth. Recomendamos encarecidamente instalar únicamente archivos de fuentes de confianza."
+  },
+  "app.modal.update-to-play.shared-instance-added-label": {
+    "message": "Se añadió"
+  },
+  "app.modal.update-to-play.shared-instance-removed-label": {
+    "message": "Se eliminó"
+  },
+  "app.modal.update-to-play.shared-instance-unknown-files-description": {
+    "message": "Esta actualización de instancia contiene archivos que no están publicados en Modrinth. Recomendamos encarecidamente instalar únicamente archivos de fuentes de confianza."
+  },
+  "app.modal.update-to-play.update-required": {
+    "message": "Es necesario actualizar"
+  },
+  "app.modal.update-to-play.update-required-description": {
+    "message": "Se necesita una actualización para jugar en {name}. Por favor actualiza a a la versión más reciente para iniciar el juego."
+  },
+  "app.nav.create-new-instance": {
+    "message": "Crear una instancia nueva"
+  },
+  "app.nav.home": {
+    "message": "Inicio"
+  },
+  "app.nav.library": {
+    "message": "Biblioteca"
+  },
+  "app.nav.modrinth-account": {
+    "message": "Cuenta Modrinth"
+  },
+  "app.nav.modrinth-hosting": {
+    "message": "Modrinth Hosting"
+  },
+  "app.nav.sign-in-to-modrinth-account": {
+    "message": "Inicia sesión con una cuenta Modrinth"
   },
   "app.nav.signed-in-as": {
     "message": "Sesión iniciada como <user>{username}</user>"
   },
+  "app.nav.upgrade-to-modrinth-plus": {
+    "message": "Mejorar a Modrinth+"
+  },
+  "app.news.title": {
+    "message": "Noticias"
+  },
+  "app.news.view-all": {
+    "message": "Ver todas las noticias"
+  },
   "app.project.install-button.already-installed": {
     "message": "Este proyecto ya está instalado"
   },
@@ -758,6 +812,9 @@
   "app.project.install-context.back-to-browse": {
     "message": "Volver al explorador"
   },
+  "app.project.install-context.back-to-instance": {
+    "message": "Volver a la instancia"
+  },
   "app.project.version.all-versions": {
     "message": "Todas las versiones"
   },
@@ -770,21 +827,177 @@
   "app.project.versions.already-installed": {
     "message": "Ya instalado"
   },
+  "app.quick-instance-switcher.drag-show-tooltip": {
+    "message": "Arrastra para mostrar las instancias recientes"
+  },
+  "app.quick-instance-switcher.drag-tooltip": {
+    "message": "Arrastra para cambiar el tamaño"
+  },
+  "app.restarting": {
+    "message": "Reiniciando..."
+  },
+  "app.settings.app-version": {
+    "message": "App de Modrinth {version}"
+  },
+  "app.settings.default-instance-options.environment-variables.description": {
+    "message": "Variables de entorno puestas al iniciar una instancia."
+  },
+  "app.settings.default-instance-options.environment-variables.placeholder": {
+    "message": "Ingresa variables de entorno..."
+  },
+  "app.settings.default-instance-options.environment-variables.title": {
+    "message": "Variables de entorno"
+  },
+  "app.settings.default-instance-options.fullscreen.description": {
+    "message": "Inicia instancias en pantalla completa al modificar su archivo options.txt."
+  },
+  "app.settings.default-instance-options.fullscreen.title": {
+    "message": "Pantalla completa"
+  },
+  "app.settings.default-instance-options.height.description": {
+    "message": "El largo que tendrá la ventana del juego al iniciar."
+  },
+  "app.settings.default-instance-options.height.placeholder": {
+    "message": "Ingresa la altura..."
+  },
+  "app.settings.default-instance-options.height.title": {
+    "message": "Largo"
+  },
+  "app.settings.default-instance-options.java-arguments.description": {
+    "message": "Los argumentos dados a Java al iniciar una instancia."
+  },
+  "app.settings.default-instance-options.java-arguments.placeholder": {
+    "message": "Ingresa los argumentos de Java..."
+  },
+  "app.settings.default-instance-options.java-arguments.title": {
+    "message": "Argumentos de Java"
+  },
+  "app.settings.default-instance-options.memory-allocation.description": {
+    "message": "La memoria máxima disponible para cada instancia."
+  },
+  "app.settings.default-instance-options.memory-allocation.title": {
+    "message": "Asignación de memoria"
+  },
+  "app.settings.default-instance-options.post-exit-hook.description": {
+    "message": "Se ejecutan tras cerrar el juego."
+  },
+  "app.settings.default-instance-options.post-exit-hook.placeholder": {
+    "message": "Ingresa comandos post-cierre..."
+  },
+  "app.settings.default-instance-options.post-exit-hook.title": {
+    "message": "Comandos post-cierre"
+  },
+  "app.settings.default-instance-options.pre-launch-hook.description": {
+    "message": "Se ejecutan antes de iniciar el juego."
+  },
+  "app.settings.default-instance-options.pre-launch-hook.placeholder": {
+    "message": "Ingresa comandos pre-inicio..."
+  },
+  "app.settings.default-instance-options.pre-launch-hook.title": {
+    "message": "Comandos pre-inicio"
+  },
+  "app.settings.default-instance-options.width.description": {
+    "message": "El ancho que tendrá la ventana del juego al iniciar."
+  },
+  "app.settings.default-instance-options.width.placeholder": {
+    "message": "Ingresa el ancho..."
+  },
+  "app.settings.default-instance-options.width.title": {
+    "message": "Ancho"
+  },
+  "app.settings.default-instance-options.wrapper-hook.description": {
+    "message": "Envuelven al proceso iniciador de Minecraft para añadir funcionalidades o configuraciones."
+  },
+  "app.settings.default-instance-options.wrapper-hook.placeholder": {
+    "message": "Ingresa comandos de envoltura..."
+  },
+  "app.settings.default-instance-options.wrapper-hook.title": {
+    "message": "Comandos de envoltura"
+  },
+  "app.settings.developer-mode-button.label": {
+    "message": "Alternar el modo desarrollador"
+  },
   "app.settings.developer-mode-enabled": {
     "message": "Modo desarrollador activado."
   },
   "app.settings.downloading": {
     "message": "Descargando v{version}"
   },
+  "app.settings.java-installations.location.title": {
+    "message": "Directorio de Java {version, number}"
+  },
+  "app.settings.operating-system.macos": {
+    "message": "macOS"
+  },
+  "app.settings.privacy.ads-consent.intro": {
+    "message": "Los anuncios hacen posible a Modrinth y financian los pagos a los creadores. Nuestros socios pueden guardar o acceder a cookies en la aplicación para personalizar anuncios y medir su rendimiento. Puedes rechazar esto o administrar tus preferencias abajo."
+  },
+  "app.settings.privacy.discord-rich-presence.description": {
+    "message": "Mostrar la aplicación de Modrinth como tu actividad actual en Discord. Esto no afecta a cualquier Rich Presence añadida a instancias con mods. Necesita reiniciar la app."
+  },
   "app.settings.privacy.discord-rich-presence.title": {
     "message": "Discord Rich Presence"
   },
+  "app.settings.privacy.telemetry.description": {
+    "message": "Modrinth recolecta datos analíticos anónimos y datos de uso para mejorar la experiencia de nuestros usuarios y para personalizar tu experiencia. Al desactivar esta opción, tus datos dejarán de ser recolectados."
+  },
   "app.settings.privacy.telemetry.title": {
     "message": "Telemetría"
   },
+  "app.settings.resource-management.always-show-copy-details.description": {
+    "message": "Muestra la opción 'Copiar detalles' mientras haya una instalación en cola o instalando. Siempre está disponible para las instalaciones fallidas o interrumpidas."
+  },
+  "app.settings.resource-management.always-show-copy-details.title": {
+    "message": "Siempre mostrar 'Copiar detalles'"
+  },
+  "app.settings.resource-management.app-cache.confirm.description": {
+    "message": "La app cargará más lento hasta que se reconstruya completamente el caché."
+  },
+  "app.settings.resource-management.app-cache.confirm.title": {
+    "message": "¿Limpiar el caché?"
+  },
+  "app.settings.resource-management.app-cache.description": {
+    "message": "Borra todos los datos en caché y los redescarga de Modrinth. La app cargará más lento hasta que se reconstruya completamente el caché."
+  },
+  "app.settings.resource-management.app-cache.purge": {
+    "message": "Limpiar caché"
+  },
+  "app.settings.resource-management.app-cache.title": {
+    "message": "Caché de la aplicación"
+  },
+  "app.settings.resource-management.app-database-backups.description": {
+    "message": "Los respaldos de los datos de aplicación importantes se guardan aquí, en caso de que los necesites luego."
+  },
+  "app.settings.resource-management.app-database-backups.open-folder": {
+    "message": "Abrir la carpeta de respaldos"
+  },
+  "app.settings.resource-management.app-database-backups.title": {
+    "message": "Respaldos de la base de datos de la aplicación"
+  },
+  "app.settings.resource-management.app-directory.browse": {
+    "message": "Buscar un directorio para la aplicación"
+  },
+  "app.settings.resource-management.app-directory.description": {
+    "message": "Aquí es donde la aplicación guardará las instancias y otros archivos. Los cambios entrarán en efecto al reiniciar la app."
+  },
+  "app.settings.resource-management.app-directory.select": {
+    "message": "Seleccionar un directorio nuevo para la app"
+  },
   "app.settings.resource-management.app-directory.title": {
     "message": "Directorio de la aplicación"
   },
+  "app.settings.resource-management.maximum-concurrent-downloads.description": {
+    "message": "El número de archivos que la app puede descargar a la vez. Baja este número si las descargas no son estables con tu conexión. Necesita reiniciar la app."
+  },
+  "app.settings.resource-management.maximum-concurrent-downloads.title": {
+    "message": "Máximas descargas a la vez"
+  },
+  "app.settings.resource-management.maximum-concurrent-writes.description": {
+    "message": "El número de archivos que la app puede escribir en el disco a la vez. Baja este número si frecuentemente encuentras errores de I/O. Necesita reiniciar la app."
+  },
+  "app.settings.resource-management.maximum-concurrent-writes.title": {
+    "message": "Máximas escrituras a la vez"
+  },
   "app.settings.sidebar.label.instances": {
     "message": "Instancias"
   },
@@ -794,6 +1007,9 @@
   "app.settings.tabs.behavior": {
     "message": "Comportamiento"
   },
+  "app.settings.tabs.default-instance-options": {
+    "message": "Opciones por defecto del juego"
+  },
   "app.settings.tabs.java-installations": {
     "message": "Instalaciones de Java"
   },
@@ -968,11 +1184,17 @@
   "app.skins.toggle-ears-features-on": {
     "message": "Activar"
   },
+  "app.survey.body": {
+    "message": "¿Te importaría responder unas cuantas preguntas sobre tu experiencia con la aplicación de Modrinth?"
+  },
   "app.survey.footer": {
     "message": "¡Tus comentarios llegarán directamente al equipo de Modrinth, y los ayudará a hacer mejores actualizaciones!"
   },
   "app.survey.no-thanks": {
-    "message": "No gracias"
+    "message": "No, gracias"
+  },
+  "app.survey.take-survey": {
+    "message": "Aceptar encuesta"
   },
   "app.survey.title": {
     "message": "¡Hola, usuario de Modrinth!"
@@ -1007,6 +1229,9 @@
   "app.update.complete-toast.title": {
     "message": "¡La versión {version} se ha instalado correctamente!"
   },
+  "app.user.project.install-to-instance": {
+    "message": "Instalar a instancia"
+  },
   "app.world.server-modal.placeholder-address": {
     "message": "ejemplo.modrinth.gg"
   },
@@ -1025,18 +1250,39 @@
   "app.world.world-item.players-online": {
     "message": "{count} en línea"
   },
+  "content.shared-instance.change-version-body": {
+    "message": "Cambiar la versión solo cambiará tu copia local. Las actualizaciones futuras a la instancia pueden restablecerla o cambiarla de nuevo."
+  },
+  "content.shared-instance.delete-bulk-body": {
+    "message": "Algunos proyectos seleccionados hacen parte de la instancia compartida. Borrarlos solo cambiará tu copia local, y las actualizaciones futuras a la instancia pueden restablecerlos o cambiarlos de nuevo."
+  },
   "content.shared-instance.delete-button": {
     "message": "Borrar de todas formas"
   },
   "content.shared-instance.delete-many-button": {
     "message": "Borrar {count, number} proyectos de todas formas"
   },
+  "content.shared-instance.delete-single-body": {
+    "message": "Borrarlo solo cambiará tu copia local, y las actualizaciones futuras a la instancia pueden restablecerlo o cambiarlo de nuevo."
+  },
+  "content.shared-instance.disable-bulk-body": {
+    "message": "Algunos proyectos seleccionados hacen parte de la instancia compartida. Desactivarlos solo cambiará tu copia local, y las actualizaciones futuras a la instancia pueden reactivarlos, restablecerlos o cambiarlos de nuevo."
+  },
   "content.shared-instance.disable-button": {
     "message": "Desactivar de todas formas"
   },
   "content.shared-instance.disable-many-button": {
     "message": "Desactivar {count, number} proyectos de todas formas"
   },
+  "content.shared-instance.disable-single-body": {
+    "message": "Desactivarlo solo cambiará tu copia local, y las actualizaciones futuras a la instancia pueden reactivarlo, restablecerlo o cambiarlo de nuevo."
+  },
+  "content.shared-instance.unlink-body": {
+    "message": "Desvincular solo cambiará tu copia local, y las actualizaciones futuras a la instancia pueden restablecerlo o cambiarlo de nuevo."
+  },
+  "content.shared-instance.warning-header": {
+    "message": "Esto es parte de la instancia compartida"
+  },
   "friends.action.add-friend": {
     "message": "Añadir un amigo"
   },
@@ -1100,6 +1346,66 @@
   "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!"
   },
+  "installation-settings.shared-instance.linked-title": {
+    "message": "Vincular instancia compartida"
+  },
+  "installation-settings.shared-instance.title": {
+    "message": "Despublicar instancia"
+  },
+  "installation-settings.shared-instance.unlink-button": {
+    "message": "Desvincular instancia compartida"
+  },
+  "installation-settings.shared-instance.unlink-description": {
+    "message": "Desconecta esta instancia local de cualquier actualización futura."
+  },
+  "installation-settings.shared-instance.unlinking-button": {
+    "message": "Desvinculando..."
+  },
+  "installation-settings.shared-instance.unpublish-button": {
+    "message": "Despublicar instancia compartida"
+  },
+  "installation-settings.shared-instance.unpublish-description": {
+    "message": "Borra esta instancia compartida de Modrinth y deja de enviar actualizaciones a cualquiera que la tenga. Tu instancia local no se verá afectada."
+  },
+  "installation-settings.shared-instance.unpublishing-button": {
+    "message": "Despublicando..."
+  },
+  "installation-settings.unlink-shared-instance.modal.admonition-body": {
+    "message": "Esto solo afecta a tu instancia local. Tu contenido instalado se quedará en este dispositivo, y la instancia compartida, junto a todos los que la estén usando, no se verán afectados."
+  },
+  "installation-settings.unlink-shared-instance.modal.admonition-header": {
+    "message": "Desvinculando instancia compartida"
+  },
+  "installation-settings.unlink-shared-instance.modal.header": {
+    "message": "Desvincular instancia compartida"
+  },
+  "installation-settings.unpublish-shared-instance.modal.admonition-body": {
+    "message": "Esto borrará la instancia compartida de los servidores de Modrinth. La gente que esté usando esta instancia dejará de recibir actualizaciones, pero tu instancia local y sus contenidos se quedarán en este dispositivo."
+  },
+  "installation-settings.unpublish-shared-instance.modal.admonition-header": {
+    "message": "Despublicando instancia compartida"
+  },
+  "installation-settings.unpublish-shared-instance.modal.header": {
+    "message": "Despublicar instancia compartida"
+  },
+  "instance.action.create-shortcut": {
+    "message": "Crear acceso directo"
+  },
+  "instance.action.export-modpack": {
+    "message": "Exportar modpack"
+  },
+  "instance.action.launch-instance": {
+    "message": "Iniciar instancia"
+  },
+  "instance.action.more-actions": {
+    "message": "Más acciones"
+  },
+  "instance.action.open-folder": {
+    "message": "Abrir carpeta"
+  },
+  "instance.action.repair": {
+    "message": "Reparar"
+  },
   "instance.action.settings": {
     "message": "Ajustes de la instancia"
   },
@@ -1178,6 +1484,12 @@
   "instance.settings.sharing.active-invites.code": {
     "message": "Link de invitación"
   },
+  "instance.settings.sharing.active-invites.description": {
+    "message": "Cualquiera con alguno de estos links se puede unir mientras el link esté activo."
+  },
+  "instance.settings.sharing.active-invites.empty": {
+    "message": "No hay invitaciones activas."
+  },
   "instance.settings.sharing.active-invites.expires": {
     "message": "Expira"
   },
@@ -1193,6 +1505,9 @@
   "instance.settings.sharing.active-invites.uses": {
     "message": "Usos"
   },
+  "instance.settings.sharing.revoke-invite.admonition-body": {
+    "message": "El link de invitación <monospace>{code}</monospace> dejará de funcionar inmediatamente. Cualquiera que ya se haya unido mantendrá su acceso."
+  },
   "instance.settings.sharing.revoke-invite.admonition-header": {
     "message": "Esta acción no se puede deshacer"
   },
@@ -1310,6 +1625,27 @@
   "instance.settings.tabs.hooks.title": {
     "message": "Hooks de inicio del juego"
   },
+  "instance.settings.tabs.hooks.variables.description": {
+    "message": "Todas estas se ejecutan en el directorio de trabajo de la instancia, con las siguientes variables:"
+  },
+  "instance.settings.tabs.hooks.variables.inst-dir.description": {
+    "message": "$INST_DIR: La ruta absoluta a la carpeta de la instancia"
+  },
+  "instance.settings.tabs.hooks.variables.inst-id.description": {
+    "message": "$INST_ID: El nombre la carpeta de la instancia"
+  },
+  "instance.settings.tabs.hooks.variables.inst-java-args.description": {
+    "message": "$INST_JAVA_ARGS: Los Argumentos JVM dados al juego"
+  },
+  "instance.settings.tabs.hooks.variables.inst-java.description": {
+    "message": "$INST_JAVA: La ruta absoluta a el binario de Java"
+  },
+  "instance.settings.tabs.hooks.variables.inst-mc-dir.description": {
+    "message": "$INST_MC_DIR: Un alias que apunta a $INST_DIR"
+  },
+  "instance.settings.tabs.hooks.variables.inst-name.description": {
+    "message": "$INST_NAME: El nombre de la instancia"
+  },
   "instance.settings.tabs.hooks.wrapper": {
     "message": "Wrapper"
   },
@@ -1325,6 +1661,9 @@
   "instance.settings.tabs.installation.loader-version": {
     "message": "Versión de {loader}"
   },
+  "instance.settings.tabs.installation.locked": {
+    "message": "Los ajustes de instalación no están disponibles mientras esta instancia esté bloqueada."
+  },
   "instance.settings.tabs.java": {
     "message": "Java y memoria"
   },
@@ -1364,6 +1703,9 @@
   "instance.settings.tabs.java.java-path-placeholder": {
     "message": "/ruta/de/java"
   },
+  "instance.settings.tabs.sharing": {
+    "message": "Compartir"
+  },
   "instance.settings.tabs.window": {
     "message": "Ventana"
   },
@@ -1394,14 +1736,62 @@
   "instance.settings.tabs.window.width.enter": {
     "message": "Ingresa el ancho..."
   },
+  "instance.shared-instance.error.title": {
+    "message": "Algo ha salido mal"
+  },
+  "instance.shared-instance.network-error.text": {
+    "message": "No se pudo conectar con la API de las instancias compartidas"
+  },
   "instance.shared-instance.network-error.title": {
     "message": "Error de conexión"
   },
+  "instance.shared-instance.owner-tooltip": {
+    "message": "El contenido de la instancia se está compartiendo a otros usuarios."
+  },
   "instance.shared-instance.publish-review.added-label": {
     "message": "Se añadió"
   },
+  "instance.shared-instance.publish-review.admonition-header": {
+    "message": "Enviar actualización a los jugadores"
+  },
+  "instance.shared-instance.publish-review.config-title-v2": {
+    "message": "Seleccionar archivos de configuración"
+  },
+  "instance.shared-instance.publish-review.description": {
+    "message": "Revisa los cambios de contenido y escoge cualquier archivo de configuración que quieras incluir en esta actualización."
+  },
+  "instance.shared-instance.publish-review.header": {
+    "message": "Revisar cambios"
+  },
+  "instance.shared-instance.publish-review.publish-button": {
+    "message": "Enviar actualización"
+  },
   "instance.shared-instance.publish-review.removed-label": {
-    "message": "Se removió"
+    "message": "Se eliminó"
+  },
+  "instance.shared-instance.tooltip": {
+    "message": "El contenido de esta instancia está siendo administrado por alguien más."
+  },
+  "instance.shared-instance.unavailable.access-revoked-text": {
+    "message": "Tu acceso a la instancia compartida fue revocado. Esta instancia seguirá disponible, pero ya no está vinculada, y no recibirás más actualizaciones."
+  },
+  "instance.shared-instance.unavailable.deleted-text": {
+    "message": "La instancia principal fue borrada. Esta instancia seguirá disponible, pero ya no está vinculada, y no recibirás más actualizaciones."
+  },
+  "instance.shared-instance.unavailable.locked-text": {
+    "message": "Esta instancia compartida fue bloqueada por el equipo de Moderación de Contenido. Ya no recibirá más actualizaciones de la instancia principal y tampoco se puede jugar."
+  },
+  "instance.shared-instance.unavailable.locked-title": {
+    "message": "Instancia bloqueada"
+  },
+  "instance.shared-instance.unavailable.manager-fallback": {
+    "message": "el administrador de la instancia"
+  },
+  "instance.shared-instance.unavailable.text": {
+    "message": "Tu instancia local sigue disponible, pero ya no está vinculada y no recibirá actualizaciones."
+  },
+  "instance.shared-instance.unavailable.title": {
+    "message": "Instancia compartida no disponible"
   },
   "instance.worlds.a_minecraft_server": {
     "message": "Un servidor de Minecraft"
@@ -1466,6 +1856,12 @@
   "minecraft-account.sign-in": {
     "message": "Inicia sesión en Minecraft"
   },
+  "minecraft-required.description": {
+    "message": "Necesitas una cuenta de Microsoft con Minecraft comprado para poder iniciar el juego."
+  },
+  "minecraft-required.description-header": {
+    "message": "Inicia sesión en Microsoft"
+  },
   "minecraft-required.dont-have-account": {
     "message": "¿No tienes una cuenta?"
   },
@@ -1479,13 +1875,28 @@
     "message": "Minecraft requerido"
   },
   "minecraft-required.sign-in": {
-    "message": "Iniciar sesión con Microsoft"
+    "message": "Inicia sesión en Microsoft"
+  },
+  "modal.modrinth-account-required.browser-description": {
+    "message": "Se abrió una pestaña para que inicies sesión. Completa el proceso ahí, y luego regresa a la app."
+  },
+  "modal.modrinth-account-required.continue-in-browser-heading": {
+    "message": "Continúa en el navegador"
+  },
+  "modal.modrinth-account-required.create-account-button": {
+    "message": "Crea una cuenta"
+  },
+  "modal.modrinth-account-required.description": {
+    "message": "Necesitas iniciar sesión con tu cuenta Modrinth antes de que puedas usar esto."
   },
   "modal.modrinth-account-required.header": {
     "message": "Cuenta requerida"
   },
+  "modal.modrinth-account-required.open-browser-again-button": {
+    "message": "Abrir el navegador otra vez"
+  },
   "modal.modrinth-account-required.sign-in-button": {
-    "message": "Iniciar sesión en Modrinth"
+    "message": "Inicia sesión en Modrinth"
   },
   "modal.modrinth-account-required.sign-in-heading": {
     "message": "Iniciar sesión con una cuenta de Modrinth"
@@ -1496,6 +1907,9 @@
   "modal.modrinth-account-required.support-prompt": {
     "message": "¿Tienes problemas con al iniciar sesión? <support>Consigue ayuda</support>"
   },
+  "modal.modrinth-account-required.waiting-for-browser": {
+    "message": "Esperando la confirmación del navegador..."
+  },
   "search.filter.locked.instance": {
     "message": "Proporcionado por la instancia"
   },
diff --git a/apps/app-frontend/src/locales/es-ES/index.json b/apps/app-frontend/src/locales/es-ES/index.json
index 1c586d8109..ed520f8899 100644
--- a/apps/app-frontend/src/locales/es-ES/index.json
+++ b/apps/app-frontend/src/locales/es-ES/index.json
@@ -32,6 +32,15 @@
   "app.action-bar.install.summary.bad-modpack-file": {
     "message": "No se pudo leer el modpack"
   },
+  "app.action-bar.install.summary.canceled": {
+    "message": "Cancelado"
+  },
+  "app.action-bar.install.summary.content-download-failed": {
+    "message": "No se pudieron descargar los archivos"
+  },
+  "app.action-bar.install.summary.corrupt-download": {
+    "message": "El archivo descargado está corrupto"
+  },
   "app.action-bar.install.summary.could-not-save-files": {
     "message": "No se pudieron guardar los archivos"
   },
@@ -41,6 +50,12 @@
   "app.action-bar.install.summary.instance-not-found": {
     "message": "La instancia no se pudo encontrar"
   },
+  "app.action-bar.install.summary.invalid-file-path": {
+    "message": "La ruta de archivo no es válida"
+  },
+  "app.action-bar.install.summary.invalid-modpack": {
+    "message": "Los datos del modpack no son válidos"
+  },
   "app.action-bar.install.unknown-instance": {
     "message": "Instancia desconocida"
   },
diff --git a/apps/app-frontend/src/locales/fr-FR/index.json b/apps/app-frontend/src/locales/fr-FR/index.json
index 3fdb65f6f0..c211e432f0 100644
--- a/apps/app-frontend/src/locales/fr-FR/index.json
+++ b/apps/app-frontend/src/locales/fr-FR/index.json
@@ -512,6 +512,9 @@
   "app.instance.share.sign-in.button": {
     "message": "Se connecter"
   },
+  "app.instance.share.unable-to-connect.description": {
+    "message": "Le service d'instance partagées n'est pas disponible pour le moment, veuillez réessayer plus tard"
+  },
   "app.instance.share.unable-to-connect.heading": {
     "message": "Impossible de se connecter"
   },
@@ -587,6 +590,9 @@
   "app.instance.worlds.no-worlds-heading": {
     "message": "Aucun serveur ou monde ajouté"
   },
+  "app.instance.worlds.refreshing": {
+    "message": "Actualisation..."
+  },
   "app.instance.worlds.remove-server-modal.remove-button": {
     "message": "Supprimer le serveur"
   },
@@ -833,6 +839,9 @@
   "app.settings.app-version": {
     "message": "Modrinth App {version}"
   },
+  "app.settings.default-instance-options.environment-variables.description": {
+    "message": "Variables d'environnement définies lors du lancement d'une instance."
+  },
   "app.settings.default-instance-options.environment-variables.placeholder": {
     "message": "Entrer les variables d'environnement..."
   },
@@ -854,6 +863,9 @@
   "app.settings.default-instance-options.height.title": {
     "message": "Hauteur"
   },
+  "app.settings.default-instance-options.java-arguments.description": {
+    "message": "Arguments transmis à Java lors du lancement d'une instance."
+  },
   "app.settings.default-instance-options.java-arguments.placeholder": {
     "message": "Entrer les arguments Java..."
   },
@@ -869,6 +881,21 @@
   "app.settings.default-instance-options.post-exit-hook.description": {
     "message": "S'exécute après que le jeu se ferme."
   },
+  "app.settings.default-instance-options.post-exit-hook.placeholder": {
+    "message": "Entrez la commande à exécuter après la fermeture..."
+  },
+  "app.settings.default-instance-options.post-exit-hook.title": {
+    "message": "Hook de post-fermeture"
+  },
+  "app.settings.default-instance-options.pre-launch-hook.description": {
+    "message": "S'exécute avant que l'instance démarre."
+  },
+  "app.settings.default-instance-options.pre-launch-hook.placeholder": {
+    "message": "Entrez la commande de pré-lancement..."
+  },
+  "app.settings.default-instance-options.pre-launch-hook.title": {
+    "message": "Hook de pré-lancement"
+  },
   "app.settings.default-instance-options.width.description": {
     "message": "La largeur de la fenêtre de jeu lors du lancement."
   },
@@ -878,6 +905,15 @@
   "app.settings.default-instance-options.width.title": {
     "message": "Largeur"
   },
+  "app.settings.default-instance-options.wrapper-hook.description": {
+    "message": "Commande utilisée pour encapsuler le processus de lancement de Minecraft."
+  },
+  "app.settings.default-instance-options.wrapper-hook.placeholder": {
+    "message": "Entrez la commande wrapper..."
+  },
+  "app.settings.default-instance-options.wrapper-hook.title": {
+    "message": "Wrapper hook"
+  },
   "app.settings.developer-mode-button.label": {
     "message": "Basculer le mode développeur"
   },
@@ -896,27 +932,72 @@
   "app.settings.privacy.ads-consent.intro": {
     "message": "Les publicités rendent Modrinth possible et financent les rémunérations des créateurs. Nos partenaires peuvent stocker des cookies ou y accéder au sein de l'application afin de personnaliser les publicités et de mesurer les performances. Vous pouvez refuser ou gérer vos préférences ci-dessous."
   },
+  "app.settings.privacy.discord-rich-presence.description": {
+    "message": "Affiche Modrinth App en tant que votre activité actuelle sur Discord. Cela n'affecte pas Rich Presence ajouté à l'instance par les mods. Nécessite un redémarrage de l'application."
+  },
+  "app.settings.privacy.discord-rich-presence.title": {
+    "message": "Discord Rich Presence"
+  },
+  "app.settings.privacy.telemetry.description": {
+    "message": "Modrinth collecte des données d'analyse et d'utilisation anonymes afin d'améliorer l'expérience utilisateur et de personnaliser votre expérience. En désactivant cette option, vous choisissez de ne plus participer et vos données ne seront plus collectées."
+  },
   "app.settings.privacy.telemetry.title": {
     "message": "Télémétrie"
   },
+  "app.settings.resource-management.always-show-copy-details.description": {
+    "message": "Afficher l’action Copier les détails lorsqu’une installation est en attente ou en cours. Elle est toujours disponible pour les installations échouées ou interrompues."
+  },
   "app.settings.resource-management.always-show-copy-details.title": {
     "message": "Toujours afficher les détails de copie"
   },
+  "app.settings.resource-management.app-cache.confirm.description": {
+    "message": "L'application peut se charger plus lentement jusqu'à ce que le cache soit reconstruit."
+  },
+  "app.settings.resource-management.app-cache.confirm.title": {
+    "message": "Purger le cache de l'application ?"
+  },
+  "app.settings.resource-management.app-cache.description": {
+    "message": "Nettoyer des données cachées et les télécharger de nouveau depuis Modrinth. L'application peut charger plus lentement jusqu'à ce que le cache soit de nouveau reconstitué."
+  },
   "app.settings.resource-management.app-cache.purge": {
     "message": "Purger le cache"
   },
   "app.settings.resource-management.app-cache.title": {
     "message": "Cache de l'application"
   },
+  "app.settings.resource-management.app-database-backups.description": {
+    "message": "Les sauvegardes de vos données de l'application les plus importantes sont enregistrées ici au cas où vous avez besoin de les récupérer plus tard."
+  },
   "app.settings.resource-management.app-database-backups.open-folder": {
     "message": "Ouvrir le dossier de sauvegardes"
   },
+  "app.settings.resource-management.app-database-backups.title": {
+    "message": "Sauvegardes de la base de données de l’application"
+  },
+  "app.settings.resource-management.app-directory.browse": {
+    "message": "Parcourir pour le répertoire de l'application"
+  },
+  "app.settings.resource-management.app-directory.description": {
+    "message": "Où Modrinth App stocke les instances et les autres fichiers. Changer prend effet après avoir redémarré l'application."
+  },
   "app.settings.resource-management.app-directory.select": {
     "message": "Sélectionner un nouveau répertoire pour l'application"
   },
   "app.settings.resource-management.app-directory.title": {
     "message": "Répertoire de l'application"
   },
+  "app.settings.resource-management.maximum-concurrent-downloads.description": {
+    "message": "Nombre de fichiers que l'application peut télécharger simultanément. Baissez ceci si les téléchargements sont peu fiables sur votre connexion. Nécessite un redémarrage de l'application."
+  },
+  "app.settings.resource-management.maximum-concurrent-downloads.title": {
+    "message": "Nombre maximal de téléchargements simultanés"
+  },
+  "app.settings.resource-management.maximum-concurrent-writes.description": {
+    "message": "Nombre de fichiers que l'application peut écrire sur le disque simultanément. Baissez ceci si vous rencontrez fréquemment des erreurs d'écriture / lecture. Nécessite un redémarrage de l'application."
+  },
+  "app.settings.resource-management.maximum-concurrent-writes.title": {
+    "message": "Nombre maximal d'écritures simultanées"
+  },
   "app.settings.sidebar.label.instances": {
     "message": "Instance"
   },
@@ -1103,11 +1184,20 @@
   "app.skins.toggle-ears-features-on": {
     "message": "Activer"
   },
+  "app.survey.body": {
+    "message": "Cela vous dérangerait-il de répondre à quelques questions sur votre expérience avec l'application Modrinth ?"
+  },
+  "app.survey.footer": {
+    "message": "Ces retours seront transmis directement à l'équipe de Modrinth et aideront à orienter les futures mises à jour !"
+  },
   "app.survey.no-thanks": {
     "message": "Non merci"
   },
   "app.survey.take-survey": {
-    "message": "Participer au sondage"
+    "message": "Répondre au sondage"
+  },
+  "app.survey.title": {
+    "message": "Salut, utilisateur de Modrinth !"
   },
   "app.update-popup.body.download-complete": {
     "message": "Modrinth App v{version} a finie d'être téléchargée. Rechargez pour mettre à jour maintenant, ou automatiquement quand vous fermez Modrinth App."
@@ -1139,6 +1229,9 @@
   "app.update.complete-toast.title": {
     "message": "La version {version} a été téléchargée avec succès !"
   },
+  "app.user.project.install-to-instance": {
+    "message": "Installer dans l'instance"
+  },
   "app.world.server-modal.placeholder-address": {
     "message": "exemple.modrinth.gg"
   },
@@ -1388,6 +1481,9 @@
   "instance.settings.sharing.active-invites.code": {
     "message": "Lien d'invitation"
   },
+  "instance.settings.sharing.active-invites.description": {
+    "message": "N'importe qui avec l'un de ces liens d'invitation peut rejoindre pendant qu'il reste actif."
+  },
   "instance.settings.sharing.active-invites.empty": {
     "message": "Il n'y a aucune invitation active."
   },
@@ -1406,6 +1502,9 @@
   "instance.settings.sharing.active-invites.uses": {
     "message": "Utilisations"
   },
+  "instance.settings.sharing.revoke-invite.admonition-body": {
+    "message": "Le lien d'invitation <monospace>{code}</monospace> cessera de fonctionner immédiatement. Les personnes qui ont déjà rejoint conserveront leur accès."
+  },
   "instance.settings.sharing.revoke-invite.admonition-header": {
     "message": "Cette action ne peut pas être annulée"
   },
@@ -1518,11 +1617,32 @@
     "message": "Exécuté avant lancement."
   },
   "instance.settings.tabs.hooks.pre-launch.enter": {
-    "message": "Entrer commande de pré-lancement..."
+    "message": "Entrez la commande de pré-lancement..."
   },
   "instance.settings.tabs.hooks.title": {
     "message": "Crochets de lancement"
   },
+  "instance.settings.tabs.hooks.variables.description": {
+    "message": "Les hooks s’exécutent dans le répertoire de travail de l’instance et disposent des variables suivantes :"
+  },
+  "instance.settings.tabs.hooks.variables.inst-dir.description": {
+    "message": "$INST_DIR: Chemin absolu vers le dossier de l'instance"
+  },
+  "instance.settings.tabs.hooks.variables.inst-id.description": {
+    "message": "$INST_ID: Le nom du dossier de l'instance"
+  },
+  "instance.settings.tabs.hooks.variables.inst-java-args.description": {
+    "message": "$INST_JAVA_ARGS: Les arguments java fournis au jeu"
+  },
+  "instance.settings.tabs.hooks.variables.inst-java.description": {
+    "message": "$INST_JAVA: Le chemin absolu vers le binaire Java"
+  },
+  "instance.settings.tabs.hooks.variables.inst-mc-dir.description": {
+    "message": "$INST_MC_DIR: Un alis de $INST_DIR"
+  },
+  "instance.settings.tabs.hooks.variables.inst-name.description": {
+    "message": "$INST_NAME: Le nom de l'instance"
+  },
   "instance.settings.tabs.hooks.wrapper": {
     "message": "Wrapper"
   },
@@ -1566,7 +1686,7 @@
     "message": "Variables d'environnement"
   },
   "instance.settings.tabs.java.hooks": {
-    "message": "Crochets"
+    "message": "Hooks"
   },
   "instance.settings.tabs.java.java-arguments": {
     "message": "Arguments Java"
@@ -1616,6 +1736,9 @@
   "instance.shared-instance.error.title": {
     "message": "Quelque chose s'est mal passé"
   },
+  "instance.shared-instance.network-error.text": {
+    "message": "Impossible de se connecter à l'API des instances partagées"
+  },
   "instance.shared-instance.network-error.title": {
     "message": "Erreur de réseau"
   },
diff --git a/apps/app-frontend/src/locales/hu-HU/index.json b/apps/app-frontend/src/locales/hu-HU/index.json
index 77f9bffdb4..92dccd017d 100644
--- a/apps/app-frontend/src/locales/hu-HU/index.json
+++ b/apps/app-frontend/src/locales/hu-HU/index.json
@@ -9,7 +9,7 @@
     "message": "Letöltések"
   },
   "app.action-bar.hide-more-running-instances": {
-    "message": "További futó játékprofilok elrejtése"
+    "message": "További futó példányok elrejtése"
   },
   "app.action-bar.install.copied-details": {
     "message": "Másolva"
@@ -21,7 +21,7 @@
     "message": "Elutasítás"
   },
   "app.action-bar.install.open-instance": {
-    "message": "Játékprofil megnyitása"
+    "message": "Példány megnyitása"
   },
   "app.action-bar.install.retry": {
     "message": "Újra"
@@ -51,7 +51,7 @@
     "message": "A letöltés nem fejeződött be"
   },
   "app.action-bar.install.summary.instance-not-found": {
-    "message": "A játékprofil nem található"
+    "message": "A példány nem található"
   },
   "app.action-bar.install.summary.invalid-file-path": {
     "message": "A fájl elérési útja érvénytelen"
@@ -87,7 +87,7 @@
     "message": "Valami félrement"
   },
   "app.action-bar.install.unknown-instance": {
-    "message": "Ismeretlen játékprofil"
+    "message": "Ismeretlen példány"
   },
   "app.action-bar.install.updating-shared-content": {
     "message": "Megosztott tartalom frissítése"
@@ -96,25 +96,25 @@
     "message": "Telepítések"
   },
   "app.action-bar.make-primary-instance": {
-    "message": "Beállítás elsődleges játékprofilként"
+    "message": "Beállítás elsődleges példányként"
   },
   "app.action-bar.no-instances-running": {
-    "message": "Nincsenek futó játékprofilok"
+    "message": "Nincsenek futó példányok"
   },
   "app.action-bar.offline": {
     "message": "Offline"
   },
   "app.action-bar.primary-instance": {
-    "message": "Elsődleges játékprofil"
+    "message": "Elsődleges példány"
   },
   "app.action-bar.reload-to-update": {
-    "message": "Frissítés elérhető"
+    "message": "Töltsd újra a frissítéshez"
   },
   "app.action-bar.show-more-running-instances": {
     "message": "További futó pédányok megjelenítése"
   },
   "app.action-bar.stop-instance": {
-    "message": "Játékprofil leállítása"
+    "message": "Példány leállítása"
   },
   "app.action-bar.update": {
     "message": "Frissítés"
@@ -123,7 +123,7 @@
     "message": "Aktív letöltések megtekintése"
   },
   "app.action-bar.view-instance": {
-    "message": "Játékprofil megtekintése"
+    "message": "Példányok megtekintése"
   },
   "app.action-bar.view-logs": {
     "message": "Naplók megtekintése"
@@ -192,7 +192,7 @@
     "message": "Rendszerablakkeret"
   },
   "app.appearance-settings.show-play-time.description": {
-    "message": "Megjeleníti, hogy mennyi időt töltöttél egy játékprofilban."
+    "message": "Megjeleníti, hogy mennyi időt töltöttél egy példányban."
   },
   "app.appearance-settings.show-play-time.title": {
     "message": "Játékidő megjelenítése"
@@ -231,13 +231,13 @@
     "message": "Indítás és navigáció"
   },
   "app.browse.add-servers-to-instance": {
-    "message": "Szerver hozzáadása a játékprofilhoz"
+    "message": "Szerver hozzáadása az példányhoz"
   },
   "app.browse.add-to-an-instance": {
-    "message": "Hozzáadás egy játékprofilhoz"
+    "message": "Hozzáadás egy példányhoz"
   },
   "app.browse.add-to-instance": {
-    "message": "Hozzáadás a játékprofilhoz"
+    "message": "Hozzáadás a példányhoz"
   },
   "app.browse.add-to-instance-name": {
     "message": "Hozzáadás ehhez: {instanceName}"
@@ -249,7 +249,7 @@
     "message": "Már hozzá van adva"
   },
   "app.browse.back-to-instance": {
-    "message": "Vissza a játékprofilhoz"
+    "message": "Vissza a példányhoz"
   },
   "app.browse.discover-project-type": {
     "message": "{projectType} keresése"
@@ -267,7 +267,7 @@
     "message": "Modcsomagok"
   },
   "app.browse.server-instance-content-warning": {
-    "message": "A tartalom hozzáadása ronthatja a kompatibilitást a szerverhez való csatlakozáskor. A hozzáadott tartalom elveszik, ha frissíted a szerverprofil tartalmát."
+    "message": "Tartalom hozzáadása kompatibilitási problémákat okozhat a szerverhez való csatlakozáskor. A hozzáadott tartalmak a szerverpéldány tartalmának frissítésekor elvesznek, ezért ezt tartsd szem előtt."
   },
   "app.browse.server.installing": {
     "message": "Telepítés"
@@ -300,16 +300,16 @@
     "message": "A tartalom letöltése..."
   },
   "app.install.phase.downloading_minecraft": {
-    "message": "A Minecraft letöltése..."
+    "message": "Minecraft letöltése"
   },
   "app.install.phase.downloading_pack_file": {
-    "message": "A csomagfájl letöltése..."
+    "message": "Csomagfájlok letöltése"
   },
   "app.install.phase.extracting_overrides": {
     "message": "Felülírások kibontása..."
   },
   "app.install.phase.finalizing": {
-    "message": "Befejezés..."
+    "message": "Befejezés"
   },
   "app.install.phase.preparing_instance": {
     "message": "Telepítésre vár..."
@@ -330,7 +330,7 @@
     "message": "A Java {version} előkészítése..."
   },
   "app.install.phase.preparing_java.validating": {
-    "message": "A Java {version} ellenőrzése..."
+    "message": "A Java {version} ellenőrzése"
   },
   "app.install.phase.reading_pack_manifest": {
     "message": "A modcsomag leírófájljának beolvasása..."
@@ -345,7 +345,7 @@
     "message": "A tartalom meghatározása..."
   },
   "app.install.phase.rolling_back": {
-    "message": "Visszavonás..."
+    "message": "Visszavonás"
   },
   "app.install.phase.running_loader_processors": {
     "message": "Betöltőfolyamatok futtatása..."
@@ -354,7 +354,7 @@
     "message": "Hozzáadva"
   },
   "app.instance.admonitions.shared-instance.changes-body": {
-    "message": "A te gépeden lévő játékprofil újabb, mint azoké a felhasználóké, akikkel megosztottad."
+    "message": "A te gépeden lévő példány újabb, mint azoké a felhasználóké, akikkel megosztottad."
   },
   "app.instance.admonitions.shared-instance.changes-header": {
     "message": "A változtatásaid még nem lettek megosztva"
@@ -372,7 +372,7 @@
     "message": "Frissítés közzététele"
   },
   "app.instance.admonitions.shared-instance.review-description": {
-    "message": "A játékprofilt használó összes résztvevővel megosztásra kerülő tartalomváltoztatások áttekintése."
+    "message": "A példányt használó összes résztvevővel megosztásra kerülő tartalomváltoztatások áttekintése."
   },
   "app.instance.admonitions.shared-instance.review-header": {
     "message": "Változtatások áttekintése"
@@ -384,25 +384,25 @@
     "message": "Áttekintés..."
   },
   "app.instance.admonitions.shared-instance.update-available-body": {
-    "message": "Egy frssítés szükséges a(z) {name} játékprofilhoz. Kérjük, frissítsd a játékot a legújabb verzióra az indításhoz."
+    "message": "Egy frssítés szükséges a(z) {name} példányhoz. Kérjük, frissítsd a játékot a legújabb verzióra az indításhoz."
   },
   "app.instance.admonitions.shared-instance.update-available-header": {
     "message": "Frissítés érhető el"
   },
   "app.instance.confirm-delete.admonition-body": {
-    "message": "A játékprofilhoz tartozó összes adat véglegesen törlődik, beleértve a világokat, a beállításokat és az összes telepített tartalmat."
+    "message": "A példányodhoz tartozó összes adat véglegesen törlődik, beleértve a világjaidat, a beállításaidat és az összes telepített tartalmat."
   },
   "app.instance.confirm-delete.admonition-header": {
     "message": "Ezt a műveletet nem lehet visszavonni"
   },
   "app.instance.confirm-delete.delete-button": {
-    "message": "Játékprofil törlése"
+    "message": "Példány törlése"
   },
   "app.instance.confirm-delete.header": {
-    "message": "Játékprofil törlése"
+    "message": "Példány törlése"
   },
   "app.instance.modpack-already-installed.body": {
-    "message": "Ez a modcsomag már telepítve van a(z) <bold>{instanceName}</bold> játékprofilban. Biztosan duplikálni szeretnéd?"
+    "message": "Ez a modcsomag már telepítve van a(z) <bold>{instanceName}</bold> példányban. Biztosan meg szeretnéd kettőzni?"
   },
   "app.instance.modpack-already-installed.create": {
     "message": "Létrehozás"
@@ -411,7 +411,7 @@
     "message": "A modcsomag már telepítve van"
   },
   "app.instance.modpack-already-installed.instance": {
-    "message": "Játékprofil"
+    "message": "Példány"
   },
   "app.instance.mods.bulk-update.downloading-projects": {
     "message": "{current, number}/{total, number} projekt letöltése..."
@@ -426,7 +426,7 @@
     "message": "projekt"
   },
   "app.instance.mods.locked-content": {
-    "message": "Zárolt játékprofilokban a tartalom nem változtatható meg."
+    "message": "Zárolt példányokban a tartalom nem változtatható meg."
   },
   "app.instance.mods.project-was-added": {
     "message": "„{name}” hozzá lett adva"
@@ -444,7 +444,7 @@
     "message": "Sikeresen feltöltve"
   },
   "app.instance.share.empty.description": {
-    "message": "Ezt a játékprofilt megoszthatod a barátaiddal!"
+    "message": "Ezt a példányt megoszthatod a barátaiddal!"
   },
   "app.instance.share.empty.heading": {
     "message": "Nincsenek barátok meghívva"
@@ -456,7 +456,7 @@
     "message": "{name} megosztása"
   },
   "app.instance.share.invite-modal.user-limit-reached": {
-    "message": "Ez a játékprofil elérte a {limit} felhasználós korlátot."
+    "message": "Ez a példány elérte a {limit} felhasználós korlátot."
   },
   "app.instance.share.locked.empty-description-prefix": {
     "message": "Be kell jelentkezned mint"
@@ -483,16 +483,16 @@
     "message": "Nem található a keresésnek megfelelő felhasználó"
   },
   "app.instance.share.remove-user-modal.effect-access": {
-    "message": "Többé nem fog frissítéseket kapni ehhez a megosztott játékprofilhoz"
+    "message": "Többé nem fog frissítéseket kapni ehhez a megosztott példányhoz"
   },
   "app.instance.share.remove-user-modal.effect-installed-copy": {
-    "message": "A már telepített játékprofilok megmaradnak az eszközén"
+    "message": "A már telepített példányok megmaradnak az eszközökön"
   },
   "app.instance.share.remove-user-modal.effect-invite-again": {
     "message": "Később újra meghívhatod"
   },
   "app.instance.share.remove-user-modal.effect-last-user": {
-    "message": "Ő az utolsó felhasználó, a megosztás ezen az játékprofilon le lesz állítva"
+    "message": "Ő az utolsó felhasználó, a megosztás ezen az példányon le lesz állítva"
   },
   "app.instance.share.remove-user-modal.effects-label": {
     "message": "Mi fog történni?"
@@ -507,40 +507,40 @@
     "message": "{username} avatárja"
   },
   "app.instance.share.remove-user-modal.warning-body": {
-    "message": "Ha visszavonod {username} hozzáférését ehhez a megosztott játékprofilhoz, újra meg kell hívnod, mielőtt frissítéseket kaphatna."
+    "message": "Ha megvonod {username} hozzáférését ehhez a megosztott példányhoz, újra meg kell hívnod, mielőtt frissítéseket kaphatna."
   },
   "app.instance.share.sign-in.button": {
     "message": "Bejelentkezés"
   },
   "app.instance.share.unable-to-connect.description": {
-    "message": "A megosztott játékprofilok szolgáltatás pillanatnyilag nem érhető el. Kérjük, próbáld újra később"
+    "message": "A megosztott példányok szolgáltatás pillanatnyilag nem érhető el. Kérjük, próbáld újra később"
   },
   "app.instance.share.unable-to-connect.heading": {
     "message": "Nem sikerült csatlakozni"
   },
   "app.instance.share.unlink.body": {
-    "message": "A játékprofil megosztásához le kell választanod ezt a modcsomagot"
+    "message": "A példány megosztásához le kell választanod ezt a modcsomagot"
   },
   "app.instance.share.unlink.header": {
     "message": "A megosztáshoz le kell választani"
   },
   "app.instance.shared-instance-already-installed.body": {
-    "message": "Ez a megosztott játékprofil már telepítve van <bold>{instanceName} </bold> néven. Biztosan telepíteni szeretnél egy másik másolatot?"
+    "message": "Ez a megosztott példány már telepítve van <bold>{instanceName} </bold> néven. Biztosan telepíteni szeretnél egy másik másolatot?"
   },
   "app.instance.shared-instance-already-installed.header": {
-    "message": "A megosztott játékprofil már telepítve van"
+    "message": "A megosztott példány már telepítve van"
   },
   "app.instance.shared-instance-already-installed.install-anyway": {
     "message": "Telepítés mindenképp"
   },
   "app.instance.shared-instance-already-installed.instance": {
-    "message": "Játékprofil"
+    "message": "Példány"
   },
   "app.instance.shared-instance-wrong-account.fallback-username": {
     "message": "az összekapcsolt fiók"
   },
   "app.instance.shared-instance-wrong-account.owner-admonition-body-v2": {
-    "message": ", hogy kezelhesd ezt a megosztott játékprofilt. Nem fogod tudni közzétenni a frissítéseket."
+    "message": ", hogy kezelhesd ezt a megosztott példányt. Nem fogod tudni közzétenni a frissítéseket."
   },
   "app.instance.shared-instance-wrong-account.sign-in-as-label": {
     "message": "Jelentkezz be mint"
@@ -549,7 +549,7 @@
     "message": "Be kell jelentkezned a Modrinthba"
   },
   "app.instance.shared-instance-wrong-account.user-admonition-body-v2": {
-    "message": ", hogy frissítéseket kapj ehhez a megosztott játékprofilhoz."
+    "message": ", hogy frissítéseket kapj ehhez a megosztott példányhoz."
   },
   "app.instance.shared-instance-wrong-account.warning-header": {
     "message": "Nem a megfelelő Modrinth-fiókot használod"
@@ -567,7 +567,7 @@
     "message": "Világ törlése"
   },
   "app.instance.worlds.delete-world-modal.warning-body": {
-    "message": "Ez a világ véglegesen törölve lesz ebből a játékprofilból. Ezt NEM tudod visszavonni!"
+    "message": "Ez a világ véglegesen törölve lesz ebből a példányból. Ezt NEM tudod visszavonni!"
   },
   "app.instance.worlds.delete-world-modal.warning-header": {
     "message": "{name} törlése"
@@ -588,7 +588,7 @@
     "message": "Kezdéshez adj hozzá egy szervert, vagy böngéssz"
   },
   "app.instance.worlds.no-worlds-heading": {
-    "message": "Nincs szerver vagy világ"
+    "message": "Még nincs hozzáadva szerver vagy világ"
   },
   "app.instance.worlds.refreshing": {
     "message": "Újratöltés..."
@@ -603,7 +603,7 @@
     "message": "Ez a szerver el lesz távolítva a szerverlistádból és a játékbeli szerverlistából is. Később újra hozzáadhatod, ha tudod a címet."
   },
   "app.instance.worlds.remove-server-modal.warning-header": {
-    "message": "{name} törlése"
+    "message": "{name} eltávolítása"
   },
   "app.instance.worlds.search-worlds-placeholder": {
     "message": "Keresés {count} világ között..."
@@ -663,10 +663,10 @@
     "message": "Felhasználó letiltása"
   },
   "app.modal.install-to-play.content-you-are-reporting": {
-    "message": "A játékprofil, amelyet bejelenteni kívánsz"
+    "message": "A példány, amelyet bejelenteni kívánsz"
   },
   "app.modal.install-to-play.delete-instance": {
-    "message": "Játékprofil törlése"
+    "message": "Példány törlése"
   },
   "app.modal.install-to-play.external-files-dont-install": {
     "message": "Ne telepítse"
@@ -690,7 +690,7 @@
     "message": "{count} mod"
   },
   "app.modal.install-to-play.report-description": {
-    "message": "Ezzel az űrlapmal jelentsd be azokat az eseteket, amelyek megsérthetik a <rules-link>Szabályzatunkat</rules-link> vagy a <terms-link>Felhasználási feltételeinket</terms-link>."
+    "message": "Ezt az űrlapot használva olyan példányokat jelenthetsz, amelyek megsérthetik a <rules-link>Szabályzatunkat</rules-link> vagy a <terms-link>Felhasználási feltételeinket</terms-link>."
   },
   "app.modal.install-to-play.report-image-invalid-type": {
     "message": "A fájl nem támogatott képfájlformátumot használ"
@@ -702,7 +702,7 @@
     "message": "A DMCA-bejelentésekkel és egyéb jogi igényekkel kapcsolatban lásd a <copyright-link>Szerzői jogi szabályzatunkat</copyright-link>."
   },
   "app.modal.install-to-play.report-reason": {
-    "message": "Melyik szabályt sérti meg ez az adott játékprofil?"
+    "message": "Melyik szabályt sérti ez az adott példány?"
   },
   "app.modal.install-to-play.report-reason.inappropriate": {
     "message": "Nem megfelelő"
@@ -714,7 +714,7 @@
     "message": "Spam"
   },
   "app.modal.install-to-play.report-shared-instance-header": {
-    "message": "Megosztott játékprofil jelentése"
+    "message": "Megosztott példány jelentése"
   },
   "app.modal.install-to-play.report-submitted": {
     "message": "Jelentés elküldve"
@@ -723,19 +723,19 @@
     "message": "Ha segítségre van szükséged, vedd fel a kapcsolatot a <support-link>támogatási csapatunkkal</support-link>. Hibajelentésekhez nyiss egy <github-link>GitHub-issue-t</github-link>."
   },
   "app.modal.install-to-play.reviewed-files": {
-    "message": "Egy fájlt csak akkor vizsgálnak meg, ha azt a Modrinth-en közzétették, függetlenül a fájlformátumtól (beleértve a .mrpack formátumot is)."
+    "message": "Egy fájlt csak akkor vizsgálnak át, ha azt a Modrinthen közzétették, függetlenül a fájlformátumtól (beleértve az `.mrpack` formátumot is)."
   },
   "app.modal.install-to-play.shared-instance": {
-    "message": "Megosztott játékprofil"
+    "message": "Megosztott példány"
   },
   "app.modal.install-to-play.shared-instance-content": {
-    "message": "A megosztott játékprofil tartalma"
+    "message": "Megosztott példány tartalma"
   },
   "app.modal.install-to-play.shared-instance-unknown-files-description": {
-    "message": "Ez a megosztott játékprofil olyan fájlokat tartalmaz, amelyek nincsenek közzétéve a Modrinthon. Határozottan javasoljuk, hogy kizárólag olyan forrásokból telepíts fájlokat, amelyekben megbízol."
+    "message": "Ez a megosztott példány olyan fájlokat tartalmaz, amelyek nincsenek közzétéve a Modrinth-on. Határozottan javasoljuk, hogy kizárólag olyan forrásokból telepíts fájlokat, amelyekben megbízol."
   },
   "app.modal.install-to-play.unknown-files-description": {
-    "message": "Ez a szerver-modpack olyan fájlokat tartalmaz, amelyek nem szerepelnek a Modrinth oldalon. Határozottan javasoljuk, hogy kizárólag olyan forrásokból telepíts fájlokat, amelyekben megbízol."
+    "message": "Ez a szervermodcsomag olyan fájlokat tartalmaz, amelyeket nem tettek közzé a Modrinthen. Nyomatékosan javasoljuk, hogy csak megbízható forrásból származó fájlokat telepíts."
   },
   "app.modal.install-to-play.unknown-files-warning": {
     "message": "Figyelmeztetés ismeretlen fájlokról"
@@ -765,7 +765,7 @@
     "message": "Eltávolítva"
   },
   "app.modal.update-to-play.shared-instance-unknown-files-description": {
-    "message": "Ez a megosztott játékprofil-frissítés olyan fájlokat tartalmaz, amelyek nincsenek közzétéve a Modrinthon. Határozottan javasoljuk, hogy kizárólag olyan forrásokból telepíts fájlokat, amelyekben megbízol."
+    "message": "Ez a megosztott példányfrissítés olyan fájlokat tartalmaz, amelyek nincsenek közzétéve a Modrinth-on. Határozottan javasoljuk, hogy kizárólag olyan forrásokból telepíts fájlokat, amelyekben megbízol."
   },
   "app.modal.update-to-play.update-required": {
     "message": "Frissítés szükséges"
@@ -774,7 +774,7 @@
     "message": "Egy frssítés szükséges a(z) {name} játékprofilhoz. Kérjük, frissítsd a játékot a legújabb verzióra az indításhoz."
   },
   "app.nav.create-new-instance": {
-    "message": "Új játékprofil létrehozása"
+    "message": "Új példány létrehozása"
   },
   "app.nav.home": {
     "message": "Kezdőlap"
@@ -813,7 +813,7 @@
     "message": "Vissza a böngészéshez"
   },
   "app.project.install-context.back-to-instance": {
-    "message": "Vissza a játékprofilhoz"
+    "message": "Vissza a példányhoz"
   },
   "app.project.version.all-versions": {
     "message": "Összes verzió"
@@ -828,7 +828,7 @@
     "message": "Már telepítve van"
   },
   "app.quick-instance-switcher.drag-show-tooltip": {
-    "message": "Húzd el a legutóbbi játékprofilok megjelenítéséhez"
+    "message": "Húzd el a legutóbbi példányok megjelenítéséhez"
   },
   "app.quick-instance-switcher.drag-tooltip": {
     "message": "Átméretezés húzással"
@@ -840,7 +840,7 @@
     "message": "Modrinth App {version}"
   },
   "app.settings.default-instance-options.environment-variables.description": {
-    "message": "A játékprofil indításakor beállított környezeti változók."
+    "message": "A példány indításakor beállított környezeti változók."
   },
   "app.settings.default-instance-options.environment-variables.placeholder": {
     "message": "Adj meg környezeti változókat..."
@@ -849,7 +849,7 @@
     "message": "Környezeti változók"
   },
   "app.settings.default-instance-options.fullscreen.description": {
-    "message": "A játékprofilok elindítása teljes képernyős módban az options.txt fájl frissítésével."
+    "message": "A példányok elindítása teljes képernyős módban az options.txt fájl frissítésével."
   },
   "app.settings.default-instance-options.fullscreen.title": {
     "message": "Teljes képernyő"
@@ -864,7 +864,7 @@
     "message": "Magasság"
   },
   "app.settings.default-instance-options.java-arguments.description": {
-    "message": "A Javának a játékprofil indításakor átadott paraméterek."
+    "message": "A Javának a példány indításakor átadott paraméterek."
   },
   "app.settings.default-instance-options.java-arguments.placeholder": {
     "message": "Java-indítási paraméterek megadása..."
@@ -873,7 +873,7 @@
     "message": "Java-indítási paraméterek"
   },
   "app.settings.default-instance-options.memory-allocation.description": {
-    "message": "Az egyes játékprofilok számára rendelkezésre álló maximális memória."
+    "message": "Az egyes példányok számára rendelkezésre álló maximális memória."
   },
   "app.settings.default-instance-options.memory-allocation.title": {
     "message": "Memóriakeret"
@@ -888,7 +888,7 @@
     "message": "Kilépés utáni parancs"
   },
   "app.settings.default-instance-options.pre-launch-hook.description": {
-    "message": "A játékprofil indítása előtt fut le."
+    "message": "A példány indítása előtt fut le."
   },
   "app.settings.default-instance-options.pre-launch-hook.placeholder": {
     "message": "Adj meg egy indítás előtti parancsot..."
@@ -933,7 +933,7 @@
     "message": "A hirdetések teszik lehetővé a Modrinth működését, és biztosítják a tartalomkészítők juttatásait. Partnereink sütiket tárolhatnak vagy érhetnek el az alkalmazásban a hirdetések személyre szabása és a teljesítmény mérése céljából. Alább leiratkozhatsz erről, illetve beállíthatod a preferenciáidat."
   },
   "app.settings.privacy.discord-rich-presence.description": {
-    "message": "A Modrinth App megjelenítése aktuális tevékenységként a Discordon. Ez nem érinti a modok által a játékprofilokhoz hozzáadott Rich Presence-t. Az alkalmazás újraindítását igényli."
+    "message": "A Modrinth App megjelenítése aktuális tevékenységként a Discordon. Ez nem érinti a modok által a példányokhoz hozzáadott Rich Presence-t. Az alkalmazás újraindítását igényli."
   },
   "app.settings.privacy.discord-rich-presence.title": {
     "message": "Discord Rich Presence"
@@ -978,7 +978,7 @@
     "message": "Alkalmazáskönyvtár tallózása"
   },
   "app.settings.resource-management.app-directory.description": {
-    "message": "A Modrinth App ebben a mappában tárolja a játékprofilokat és az egyéb fájlokat. A módosítások az alkalmazás újraindítása után lépnek érvénybe."
+    "message": "A Modrinth App ebben a mappában tárolja a példányokat és az egyéb fájlokat. A módosítások az alkalmazás újraindítása után lépnek érvénybe."
   },
   "app.settings.resource-management.app-directory.select": {
     "message": "Új alkalmazáskönyvtár kiválasztása"
@@ -999,7 +999,7 @@
     "message": "Maximális egyidejű írási műveletek"
   },
   "app.settings.sidebar.label.instances": {
-    "message": "Játékprofilok"
+    "message": "Példányok"
   },
   "app.settings.tabs.appearance": {
     "message": "Megjelenés"
@@ -1041,7 +1041,7 @@
     "message": "Ezzel a kiválasztott kinézet véglegesen törlődik. Ez a művelet visszafordíthatatlan."
   },
   "app.skins.delete-modal.title": {
-    "message": "Biztos, hogy le akarod törölni ezt a kinézetet?"
+    "message": "Biztosan törölni szeretnéd ezt a kinézetet?"
   },
   "app.skins.dropped-file-error.text": {
     "message": "Nem sikerült beolvasni a feltöltött fájlt."
@@ -1110,7 +1110,7 @@
     "message": "Előnézet"
   },
   "app.skins.rate-limit.text": {
-    "message": "Túl gyakran cseréled a kinézetedet. A Mojang szerverei ideiglenesen letiltották a további cseréket. Kérlek várj egy pillanatot, majd próbáld meg újra."
+    "message": "Túl gyakran cseréled a kinézetedet. A Mojang szerverei ideiglenesen letiltották a további kéréseket. Várj egy kis ideig, majd próbáld újra."
   },
   "app.skins.rate-limit.title": {
     "message": "Lassíts!"
@@ -1200,13 +1200,13 @@
     "message": "Hali, Modrinth-felhasználó!"
   },
   "app.update-popup.body.download-complete": {
-    "message": "A Modrinth App v{version} letöltése befejeződött. Frissítéshez válaszd ki a Frissítés opciót, vagy az alkalmazás a bezárásakor automatikusan frissül."
+    "message": "A Modrinth App v{version} letöltése befejeződött. Válaszd a Frissítés lehetőséget a frissítéshez, vagy az alkalmazás bezárásakor automatikusan frissül."
   },
   "app.update-popup.body.linux": {
-    "message": "A Modrinth App v{version} elérhető. Használd a csomagkezelőt a legújabb funkciók és javítások frissítéséhez!"
+    "message": "A Modrinth App v{version} elérhető. A legújabb funkciókért és javításokért frissíts a csomagkezelőddel!"
   },
   "app.update-popup.body.metered": {
-    "message": "A Modrinth App v{version} már elérhető! Mivel mérhető hálózaton vagy, nem töltöttük le automatikusan."
+    "message": "A Modrinth App v{version} már elérhető! Mivel korlátozott adatforgalmú hálózaton vagy, nem töltöttük le automatikusan."
   },
   "app.update-popup.changelog": {
     "message": "Változásnapló"
@@ -1229,6 +1229,9 @@
   "app.update.complete-toast.title": {
     "message": "Verzió {version} sikeresen telepítve!"
   },
+  "app.user.project.install-to-instance": {
+    "message": "Telepítés a példányba"
+  },
   "app.world.server-modal.placeholder-address": {
     "message": "pelda.modrinth.gg"
   },
@@ -1248,10 +1251,10 @@
     "message": "{count} online"
   },
   "content.shared-instance.change-version-body": {
-    "message": "A verzió módosítása csak a helyi játékprofilt érinti. A megosztott játékprofil jövőbeli frissítései felülírhatják vagy ismét megváltoztathatják azt."
+    "message": "A verzió módosítása csak a helyi példányt érinti. A megosztott példány jövőbeli frissítései felülírhatják vagy ismét megváltoztathatják azt."
   },
   "content.shared-instance.delete-bulk-body": {
-    "message": "A kiválasztott projektek egy része a megosztott játékprofil része. Törlésük csak a helyi játékprofilt módosítja, és a megosztott játékprofil jövőbeli frissítései visszaállíthatják vagy ismét módosíthatják őket."
+    "message": "A kiválasztott projektek egy része a megosztott példány része. Törlésük csak a helyi példányt módosítja, és a megosztott példány jövőbeli frissítései visszaállíthatják vagy ismét módosíthatják őket."
   },
   "content.shared-instance.delete-button": {
     "message": "Törlés mindenképp"
@@ -1260,10 +1263,10 @@
     "message": "{count, number} projekt törlése mindenképp"
   },
   "content.shared-instance.delete-single-body": {
-    "message": "A törlése csak a helyi játékprofilt módosítja. A megosztott játékprofil jövőbeli frissítései visszaállíthatják vagy ismét módosíthatják."
+    "message": "A törlése csak a helyi példányt módosítja. A megosztott példány jövőbeli frissítései visszaállíthatják vagy ismét módosíthatják."
   },
   "content.shared-instance.disable-bulk-body": {
-    "message": "A kiválasztott projektek egy része a megosztott játékprofil része. Letiltásuk csak a helyi játékprofilt módosítja, és a megosztott játékprofil jövőbeli frissítései újra engedélyezhetik, visszaállíthatják vagy ismét módosíthatják őket."
+    "message": "A kiválasztott projektek egy része a megosztott példány része. Letiltásuk csak a helyi példányt módosítja, és a megosztott példány jövőbeli frissítései újra engedélyezhetik, visszaállíthatják vagy ismét módosíthatják őket."
   },
   "content.shared-instance.disable-button": {
     "message": "Letíltás mindenképp"
@@ -1272,13 +1275,13 @@
     "message": "{count, number} projekt letíltása mindenképp"
   },
   "content.shared-instance.disable-single-body": {
-    "message": "A letiltása csak a helyi játékprofilt módosítja. A megosztott játékprofil jövőbeli frissítései újra engedélyezhetik, visszaállíthatják vagy ismét módosíthatják."
+    "message": "A letiltása csak a helyi példányt módosítja. A megosztott példány jövőbeli frissítései újra engedélyezhetik, visszaállíthatják vagy ismét módosíthatják."
   },
   "content.shared-instance.unlink-body": {
-    "message": "A leválasztás csak a helyi játékprofilt érinti. A megosztott játékprofil jövőbeli frissítései felülírhatják vagy ismét megváltoztathatják azt."
+    "message": "A leválasztás csak a helyi példányt érinti. A megosztott példány jövőbeli frissítései felülírhatják vagy ismét megváltoztathatják azt."
   },
   "content.shared-instance.warning-header": {
-    "message": "Ez egy megosztott játékprofil része"
+    "message": "Ez egy megosztott példány része"
   },
   "friends.action.add-friend": {
     "message": "Barát hozzáadása"
@@ -1344,46 +1347,46 @@
     "message": "<link>Lépj be Modrinth fiókodba</link>, hogy felvehess barátokat és lásd mivel játszanak!"
   },
   "installation-settings.shared-instance.linked-title": {
-    "message": "Összekapcsolt megosztott játékprofil"
+    "message": "Összekapcsolt megosztott példány"
   },
   "installation-settings.shared-instance.title": {
-    "message": "Játékprofil megosztásának visszavonása"
+    "message": "Példány megosztásának visszavonása"
   },
   "installation-settings.shared-instance.unlink-button": {
-    "message": "Megosztott játékprofil leválasztása"
+    "message": "Megosztott példány leválasztása"
   },
   "installation-settings.shared-instance.unlink-description": {
-    "message": "Leválasztja ezt a helyi játékprofilt a jövőbeli megosztott frissítésekről."
+    "message": "Leválasztja ezt a helyi példányt a jövőbeli megosztott frissítésekről."
   },
   "installation-settings.shared-instance.unlinking-button": {
     "message": "Leválasztás..."
   },
   "installation-settings.shared-instance.unpublish-button": {
-    "message": "Megosztott játékprofil megosztásának visszavonása"
+    "message": "Megosztott példány megosztásának visszavonása"
   },
   "installation-settings.shared-instance.unpublish-description": {
-    "message": "Eltávolítja ezt a megosztott játékprofilt a Modrinthból, és nem küld többé frissítéseket azoknak, akik használják. A helyi játékprofilodat ez nem érinti."
+    "message": "Eltávolítja ezt a megosztott példányt a Modrinthból, és nem küld többé frissítéseket azoknak, akik használják. A helyi példányodat ez nem érinti."
   },
   "installation-settings.shared-instance.unpublishing-button": {
     "message": "Közzététel visszavonása..."
   },
   "installation-settings.unlink-shared-instance.modal.admonition-body": {
-    "message": "Ez kizárólag a helyi játékprofilodra vonatkozik. A telepített tartalmaid ezen az eszközön maradnak, és ez nem érinti a megosztott játékprofilt, illetve az azt használó többi felhasználót."
+    "message": "Ez kizárólag a helyi példányodra vonatkozik. A telepített tartalmaid ezen az eszközön maradnak, és ez nem érinti a megosztott példányt, illetve az azt használó többi felhasználót."
   },
   "installation-settings.unlink-shared-instance.modal.admonition-header": {
     "message": "Megosztott játékprofil leválasztása"
   },
   "installation-settings.unlink-shared-instance.modal.header": {
-    "message": "Megosztott játékprofil leválasztása"
+    "message": "Megosztott példány leválasztása"
   },
   "installation-settings.unpublish-shared-instance.modal.admonition-body": {
-    "message": "Ezzel a megosztott játékprofil törlődik a Modrinth szervereiről. A Modrinth Appban az ezt használók többé nem kapnak frissítéseket, de a helyi játékprofil és annak tartalma továbbra is ezen az eszközön marad."
+    "message": "Ezzel a megosztott példány törlődik a Modrinth szervereiről. A Modrinth Appban az ezt használók többé nem kapnak frissítéseket, de a helyipéldány és annak tartalma továbbra is ezen az eszközön marad."
   },
   "installation-settings.unpublish-shared-instance.modal.admonition-header": {
-    "message": "Visszavonod a megosztott játékprofil megosztását"
+    "message": "Visszavonod a megosztott példány megosztását"
   },
   "installation-settings.unpublish-shared-instance.modal.header": {
-    "message": "Megosztott játékprofil megosztásának visszavonása"
+    "message": "Megosztott példány megosztásának visszavonása"
   },
   "instance.action.create-shortcut": {
     "message": "Parancsikon létrehozása"
@@ -1392,7 +1395,7 @@
     "message": "Modcsomag exportálása"
   },
   "instance.action.launch-instance": {
-    "message": "Játékprofil elindítása"
+    "message": "Példány elindítása"
   },
   "instance.action.more-actions": {
     "message": "További műveletek"
@@ -1404,7 +1407,7 @@
     "message": "Javítás"
   },
   "instance.action.settings": {
-    "message": "Játékprofil beállításai"
+    "message": "Példány beállításai"
   },
   "instance.action.starting": {
     "message": "Indítás..."
@@ -1449,16 +1452,16 @@
     "message": "Világ szerkesztése"
   },
   "instance.files.adding-files": {
-    "message": "Fájlok hozzáadása... ({completed}/{total})"
+    "message": "Fájlok hozzáadása ({completed}/{total})"
   },
   "instance.files.save-as": {
     "message": "Mentés másként..."
   },
   "instance.locked.delete-button": {
-    "message": "Játékprofil törlése"
+    "message": "Példány törlése"
   },
   "instance.locked.play-tooltip": {
-    "message": "Ez a játékprofil zárolva van"
+    "message": "Ez a példány zárolva van"
   },
   "instance.playtime.never-played": {
     "message": "Még nem játszott"
@@ -1518,13 +1521,13 @@
     "message": "Általános"
   },
   "instance.settings.tabs.general.delete": {
-    "message": "Játékprofil törlése"
+    "message": "Példány törlése"
   },
   "instance.settings.tabs.general.delete.button": {
-    "message": "Játékprofil törlése"
+    "message": "Példány törlése"
   },
   "instance.settings.tabs.general.delete.description": {
-    "message": "Örökké eltávolít egy játékprofilt az eszközről, beleértve a világait, beállításait és minden telepített tartalmat. Legyél óvatos, mert ha egyszer kitörölsz egy játékprofilt, azt többé nem lehet visszaállítani."
+    "message": "Örökké eltávolít egy példányt az eszközről, beleértve a világait, beállításait és minden telepített tartalmat. Legyél óvatos, mert ha egyszer kitörölsz egy példányt, azt többé nem lehet visszaállítani."
   },
   "instance.settings.tabs.general.deleting.button": {
     "message": "Törlés..."
@@ -1536,10 +1539,10 @@
     "message": "Telepítés közben nem lehet duplikálni."
   },
   "instance.settings.tabs.general.duplicate-instance": {
-    "message": "Játékprofil duplikálása"
+    "message": "Példány megkettőzése"
   },
   "instance.settings.tabs.general.duplicate-instance.description": {
-    "message": "Készít egy másolatot erről a játékprofilról, beleértve a világokat, beállításokat, modokat stb."
+    "message": "Készít egy másolatot erről a példányról, beleértve a világokat, beállításokat, modokat stb."
   },
   "instance.settings.tabs.general.edit-icon": {
     "message": "Ikon szerkesztése"
@@ -1557,10 +1560,10 @@
     "message": "Könyvtárgyűjtemények"
   },
   "instance.settings.tabs.general.library-groups.create": {
-    "message": "Új gyűjtemény létrehozása"
+    "message": "Új csoport létrehozása"
   },
   "instance.settings.tabs.general.library-groups.description": {
-    "message": "A könyvtárgyűjtemények segítenek külön kategóriákba rendszerezni a játékprofilokat."
+    "message": "A könyvtárgyűjtemények segítenek külön kategóriákba rendszerezni a példányokat."
   },
   "instance.settings.tabs.general.library-groups.enter-name": {
     "message": "Add meg a gyűjtemény nevét"
@@ -1622,6 +1625,12 @@
   "instance.settings.tabs.hooks.title": {
     "message": "Játék indítási horgok"
   },
+  "instance.settings.tabs.hooks.variables.inst-mc-dir.description": {
+    "message": "$INST_MC_DIR: A(z) $INST_DIR álneve"
+  },
+  "instance.settings.tabs.hooks.variables.inst-name.description": {
+    "message": "$INST_NAME: A példány neve"
+  },
   "instance.settings.tabs.hooks.wrapper": {
     "message": "Indítóparancs"
   },
@@ -1638,7 +1647,7 @@
     "message": "{loader} verzió"
   },
   "instance.settings.tabs.installation.locked": {
-    "message": "A telepítési beállítások nem érhetők el, amíg ez a játékprofil zárolva van."
+    "message": "A telepítési beállítások nem érhetők el, amíg ez a példány zárolva van."
   },
   "instance.settings.tabs.java": {
     "message": "Java és memória"
@@ -1677,7 +1686,7 @@
     "message": "Hozzárendelt memória"
   },
   "instance.settings.tabs.java.java-path-placeholder": {
-    "message": "/eleresi/ut/a/javahoz"
+    "message": "/path/to/java"
   },
   "instance.settings.tabs.sharing": {
     "message": "Megosztás"
@@ -1716,13 +1725,13 @@
     "message": "Valami hiba történt"
   },
   "instance.shared-instance.network-error.text": {
-    "message": "Nem sikerült csatlakozni a megosztott játékprofilok API-jához"
+    "message": "Nem sikerült csatlakozni a megosztott példányok API-jához"
   },
   "instance.shared-instance.network-error.title": {
     "message": "Hálózati hiba"
   },
   "instance.shared-instance.owner-tooltip": {
-    "message": "Ennek a játékprofilnak a tartalma meg van osztva más felhasználókkal."
+    "message": "Ennek a példánynak a tartalma meg van osztva más felhasználókkal."
   },
   "instance.shared-instance.publish-review.added-label": {
     "message": "Hozzáadva:"
@@ -1746,28 +1755,28 @@
     "message": "Eltávolítva:"
   },
   "instance.shared-instance.tooltip": {
-    "message": "Ennek a játékprofilynak a tartalmát más kezeli."
+    "message": "Ennek a példánynak a tartalmát más kezeli."
   },
   "instance.shared-instance.unavailable.access-revoked-text": {
-    "message": "A megosztott játékprofilhoz való hozzáférésedet visszavonták. Ez a játékprofil továbbra is elérhető, de már nincs összekapcsolva, és többé nem kap frissítéseket."
+    "message": "A megosztott példányhoz való hozzáférésedet megvonták. Ez a példány továbbra is elérhető, de már nincs összekapcsolva, és többé nem kap frissítéseket."
   },
   "instance.shared-instance.unavailable.deleted-text": {
-    "message": "Az elsődleges játékprofilt törölték. Ez a játékprofil továbbra is elérhető, de már nincs összekapcsolva, és többé nem kap frissítéseket."
+    "message": "Az elsődleges példányt törölték. Ez a példány továbbra is elérhető, de már nincs összekapcsolva, és többé nem kap frissítéseket."
   },
   "instance.shared-instance.unavailable.locked-text": {
-    "message": "Ezt a megosztott játékprofilt a Tartalommoderációs csapat zárolta. Többé nem kap frissítéseket az elsődleges játékprofiltól, és nem lehet játszani vele."
+    "message": "Ezt a megosztott példányt a Tartalommoderációs csapat zárolta. Többé nem kap frissítéseket az elsődleges példánytól, és nem lehet játszani vele."
   },
   "instance.shared-instance.unavailable.locked-title": {
-    "message": "Játékprofil zárolva"
+    "message": "Példány zárolva"
   },
   "instance.shared-instance.unavailable.manager-fallback": {
-    "message": "a játékprofil-kezelő"
+    "message": "a példánykezelő"
   },
   "instance.shared-instance.unavailable.text": {
-    "message": "A te gépeden lévő játékprofil továbbra is elérhető, de már nincs összekapcsolva, és többé nem kap frissítéseket."
+    "message": "A helyi példányod továbbra is elérhető, de már nincs összekapcsolva, és többé nem kap frissítéseket."
   },
   "instance.shared-instance.unavailable.title": {
-    "message": "A megosztott játékprofil már nem elérhető"
+    "message": "A megosztott példány már nem elérhető"
   },
   "instance.worlds.a_minecraft_server": {
     "message": "Egy Minecraft szerver"
@@ -1785,7 +1794,7 @@
     "message": "Ne mutasd a kezdőlapon"
   },
   "instance.worlds.game_already_open": {
-    "message": "A játékprofil már el van indítva"
+    "message": "A példány már el van indítva"
   },
   "instance.worlds.hardcore": {
     "message": "Hardcore mód"
@@ -1803,13 +1812,13 @@
     "message": "Csak Minecraft Alpha 1.0.5+-tól tudsz egyből szerverhez csatlakozni"
   },
   "instance.worlds.no_singleplayer_quick_play": {
-    "message": "Csak Minecraft 1.20+-tól tudsz egyből egyjátékos világba belépni"
+    "message": "Használj 1.20+ verziót az azonnali egyjátékos módba lépéshez"
   },
   "instance.worlds.play_instance": {
-    "message": "Játékprofil indítása"
+    "message": "Példány indítása"
   },
   "instance.worlds.view_instance": {
-    "message": "Játékprofil megtekintése"
+    "message": "Példány megtekintése"
   },
   "instance.worlds.world_in_use": {
     "message": "A világ használatban van"
@@ -1887,25 +1896,25 @@
     "message": "Várakozás a böngésző megerősítésére..."
   },
   "search.filter.locked.instance": {
-    "message": "A játékprofil által van megadva"
+    "message": "Pédány által megadva"
   },
   "search.filter.locked.instance-game-version.title": {
-    "message": "A játékverziót az adott játékprofil biztosítja"
+    "message": "A játékverziót az adott példány biztosítja"
   },
   "search.filter.locked.instance-loader.title": {
-    "message": "A betöltőt az adott játékprofil biztosítja"
+    "message": "A betöltőt az adott példány biztosítja"
   },
   "search.filter.locked.instance.sync": {
-    "message": "Szinkronizálás a játékpéldánnyal"
+    "message": "Szinkronizálás a példánnyal"
   },
   "search.filter.locked.server": {
     "message": "A szerver által van megadva"
   },
   "search.filter.locked.server-environment.title": {
-    "message": "Csak kliensoldali modok adhatók hozzá a szerverprofilhoz"
+    "message": "Szerverpéldányokhoz csak szerveroldali modok adhatók hozzá"
   },
   "search.filter.locked.server-game-version.title": {
-    "message": "A játékverziót az adott szerver biztosítja"
+    "message": "A játékverzió a szerver által van megadva"
   },
   "search.filter.locked.server-loader.title": {
     "message": "A betöltőt az adott szerver biztosítja"
diff --git a/apps/app-frontend/src/locales/it-IT/index.json b/apps/app-frontend/src/locales/it-IT/index.json
index 16587ed018..a43823a1a4 100644
--- a/apps/app-frontend/src/locales/it-IT/index.json
+++ b/apps/app-frontend/src/locales/it-IT/index.json
@@ -393,7 +393,7 @@
     "message": "Tutti i dati della tua istanza verranno eliminati permanentemente, inclusi i tuoi mondi, configurazioni e tutti i contenuti installati."
   },
   "app.instance.confirm-delete.admonition-header": {
-    "message": "Questa azione non può essere annullata"
+    "message": "Questa azione è irreversibile"
   },
   "app.instance.confirm-delete.delete-button": {
     "message": "Elimina istanza"
@@ -564,7 +564,7 @@
     "message": "Eliminare il mondo"
   },
   "app.instance.worlds.delete-world-modal.warning-body": {
-    "message": "Questo mondo verrà eliminato permanentemente dall'istanza. Questa azione non può essere annullata."
+    "message": "Il mondo sarà eliminato dall'istanza per sempre. Questa azione è irreversibile."
   },
   "app.instance.worlds.delete-world-modal.warning-header": {
     "message": "Eliminare {name}"
@@ -1035,7 +1035,7 @@
     "message": "Elimina"
   },
   "app.skins.delete-modal.description": {
-    "message": "Questa skin sarà rimossa per sempre. Quest'azione non può essere annullata."
+    "message": "La skin selezionata sarà eliminata per sempre. Questa azione è irreversibile."
   },
   "app.skins.delete-modal.title": {
     "message": "Vuoi davvero eliminare questa skin?"
@@ -1226,6 +1226,9 @@
   "app.update.complete-toast.title": {
     "message": "La versione {version} è stata installata con successo!"
   },
+  "app.user.project.install-to-instance": {
+    "message": "Installa nell'istanza"
+  },
   "app.world.server-modal.placeholder-address": {
     "message": "example.modrinth.gg"
   },
@@ -1503,7 +1506,7 @@
     "message": "L'invito <monospace>{code}</monospace> smetterà di funzionare immediatamente. Le persone già entrate manterranno l'accesso."
   },
   "instance.settings.sharing.revoke-invite.admonition-header": {
-    "message": "Questa azione non può essere annullata"
+    "message": "Questa azione è irreversibile"
   },
   "instance.settings.sharing.revoke-invite.confirm": {
     "message": "Revoca invito"
@@ -1619,6 +1622,27 @@
   "instance.settings.tabs.hooks.title": {
     "message": "Hook all'avvio del gioco"
   },
+  "instance.settings.tabs.hooks.variables.description": {
+    "message": "Gli hook si eseguono nella cartella principale dell'istanza, con le seguenti variabili:"
+  },
+  "instance.settings.tabs.hooks.variables.inst-dir.description": {
+    "message": "$INST_DIR: Il percorso assoluto della cartella dell'istanza"
+  },
+  "instance.settings.tabs.hooks.variables.inst-id.description": {
+    "message": "$INST_ID: Il nome della cartella dell'istanza"
+  },
+  "instance.settings.tabs.hooks.variables.inst-java-args.description": {
+    "message": "$INST_JAVA_ARGS: Gli argomenti JVM forniti al gioco"
+  },
+  "instance.settings.tabs.hooks.variables.inst-java.description": {
+    "message": "$INST_JAVA: Il percorso assoluto dei binari di Java"
+  },
+  "instance.settings.tabs.hooks.variables.inst-mc-dir.description": {
+    "message": "$INST_MC_DIR: Alias di $INST_DIR"
+  },
+  "instance.settings.tabs.hooks.variables.inst-name.description": {
+    "message": "$INST_NAME: Il nome dell'istanza"
+  },
   "instance.settings.tabs.hooks.wrapper": {
     "message": "Wrapper"
   },
diff --git a/apps/app-frontend/src/locales/ja-JP/index.json b/apps/app-frontend/src/locales/ja-JP/index.json
index 6bd7ff8194..96238bfa95 100644
--- a/apps/app-frontend/src/locales/ja-JP/index.json
+++ b/apps/app-frontend/src/locales/ja-JP/index.json
@@ -516,7 +516,7 @@
     "message": "インスタンスの共有は現在ご利用いただけません。しばらくしてからもう一度お試しください"
   },
   "app.instance.share.unable-to-connect.heading": {
-    "message": "接続できません"
+    "message": "接続エラー"
   },
   "app.instance.share.unlink.body": {
     "message": "この起動構成を共有するには、このmodpackのリンクを解除する必要があります"
@@ -590,6 +590,9 @@
   "app.instance.worlds.no-worlds-heading": {
     "message": "サーバー、ワールドは追加されていません"
   },
+  "app.instance.worlds.refreshing": {
+    "message": "更新中…"
+  },
   "app.instance.worlds.remove-server-modal.remove-button": {
     "message": "サーバーを削除"
   },
@@ -1226,6 +1229,9 @@
   "app.update.complete-toast.title": {
     "message": "バージョン {version} が正常にインストールされました！"
   },
+  "app.user.project.install-to-instance": {
+    "message": "インスタンスにインストール"
+  },
   "app.world.server-modal.placeholder-address": {
     "message": "example.modrinth.gg"
   },
@@ -1619,6 +1625,27 @@
   "instance.settings.tabs.hooks.title": {
     "message": "ゲーム起動フック"
   },
+  "instance.settings.tabs.hooks.variables.description": {
+    "message": "フックはインスタンスのカレントディレクトリで実行され、以下の環境変数が利用可能です："
+  },
+  "instance.settings.tabs.hooks.variables.inst-dir.description": {
+    "message": "$INST_DIR: インスタンスのフォルダへの絶対パス"
+  },
+  "instance.settings.tabs.hooks.variables.inst-id.description": {
+    "message": "$INST_ID: インスタンスのフォルダ名"
+  },
+  "instance.settings.tabs.hooks.variables.inst-java-args.description": {
+    "message": "$INST_JAVA_ARGS: ゲームに渡されるJVM引数"
+  },
+  "instance.settings.tabs.hooks.variables.inst-java.description": {
+    "message": "$INST_JAVA: Javaの実行ファイルへの絶対パス"
+  },
+  "instance.settings.tabs.hooks.variables.inst-mc-dir.description": {
+    "message": "$INST_MC_DIR:$INST_DIR のエイリアス"
+  },
+  "instance.settings.tabs.hooks.variables.inst-name.description": {
+    "message": "$INST_NAME: インスタンスの名前"
+  },
   "instance.settings.tabs.hooks.wrapper": {
     "message": "ラッパー"
   },
diff --git a/apps/app-frontend/src/locales/ms-MY/index.json b/apps/app-frontend/src/locales/ms-MY/index.json
index 28836c710e..1d7c91c661 100644
--- a/apps/app-frontend/src/locales/ms-MY/index.json
+++ b/apps/app-frontend/src/locales/ms-MY/index.json
@@ -2,6 +2,9 @@
   "app.action-bar.downloading-java": {
     "message": "Sedang memuat turun Java {version}"
   },
+  "app.action-bar.downloading-update": {
+    "message": "Sedang memuat turun kemas kini"
+  },
   "app.action-bar.downloads": {
     "message": "Muat Turun"
   },
@@ -11,6 +14,9 @@
   "app.action-bar.install.copied-details": {
     "message": "Disalin"
   },
+  "app.action-bar.install.copy-details": {
+    "message": "Salin butiran"
+  },
   "app.action-bar.install.dismiss": {
     "message": "Ketepikan"
   },
diff --git a/apps/app-frontend/src/locales/nl-NL/index.json b/apps/app-frontend/src/locales/nl-NL/index.json
index 10af52cfdb..ddef943c54 100644
--- a/apps/app-frontend/src/locales/nl-NL/index.json
+++ b/apps/app-frontend/src/locales/nl-NL/index.json
@@ -590,6 +590,9 @@
   "app.instance.worlds.no-worlds-heading": {
     "message": "Noch servers noch werelden toegevoegd"
   },
+  "app.instance.worlds.refreshing": {
+    "message": "Verversen..."
+  },
   "app.instance.worlds.remove-server-modal.remove-button": {
     "message": "Server verwijderen"
   },
@@ -932,9 +935,78 @@
   "app.settings.privacy.discord-rich-presence.description": {
     "message": "Laat Modrinth als jouw activiteit op Discord. Dit verandert niet activiteiten toegevoegd door mods."
   },
+  "app.settings.privacy.discord-rich-presence.title": {
+    "message": "Discord Rich Presence"
+  },
+  "app.settings.privacy.telemetry.description": {
+    "message": "Modrinth verzamelt geanonimiseerde analyse- en gebruiksgegevens om de gebruikerservaring te verbeteren en uw ervaring te personaliseren. Door deze optie uit te schakelen, meldt u zich af en worden uw gegevens niet langer verzameld."
+  },
+  "app.settings.privacy.telemetry.title": {
+    "message": "Telemetrie"
+  },
+  "app.settings.resource-management.always-show-copy-details.description": {
+    "message": "Geef de knop 'Details kopiëren' weer terwijl een installatie in de wachtrij staat of wordt uitgevoerd. Deze actie is altijd beschikbaar voor mislukte of onderbroken installaties."
+  },
+  "app.settings.resource-management.always-show-copy-details.title": {
+    "message": "Altijd 'Details kopiëren' laten zien"
+  },
+  "app.settings.resource-management.app-cache.confirm.description": {
+    "message": "De app kan wat trager laden totdat de cache opnieuw is opgebouwd."
+  },
+  "app.settings.resource-management.app-cache.confirm.title": {
+    "message": "De cache van de app wissen?"
+  },
+  "app.settings.resource-management.app-cache.description": {
+    "message": "Wis de gegevens in de cache en download ze opnieuw via Modrinth. De app kan wat trager laden totdat de cache opnieuw is opgebouwd."
+  },
+  "app.settings.resource-management.app-cache.purge": {
+    "message": "Cache leegmaken"
+  },
+  "app.settings.resource-management.app-cache.title": {
+    "message": "App-cache"
+  },
+  "app.settings.resource-management.app-database-backups.description": {
+    "message": "Hier worden back-ups van belangrijke app-gegevens opgeslagen voor het geval je ze later nodig hebt."
+  },
+  "app.settings.resource-management.app-database-backups.open-folder": {
+    "message": "Open de map met back-ups"
+  },
+  "app.settings.resource-management.app-database-backups.title": {
+    "message": "Back-ups van de app-database"
+  },
+  "app.settings.resource-management.app-directory.browse": {
+    "message": "Zoek naar een app-folder"
+  },
+  "app.settings.resource-management.app-directory.description": {
+    "message": "Hier slaat de Modrinth-app instanties en andere bestanden op. Wijzigingen worden pas van kracht nadat de app opnieuw is opgestart."
+  },
+  "app.settings.resource-management.app-directory.select": {
+    "message": "Kies een nieuwe app-folder"
+  },
+  "app.settings.resource-management.app-directory.title": {
+    "message": "App-folder"
+  },
+  "app.settings.resource-management.maximum-concurrent-downloads.description": {
+    "message": "Het aantal bestanden dat de app tegelijkertijd kan downloaden. Verlaag dit aantal als downloads via je verbinding niet betrouwbaar zijn. Hiervoor moet de app opnieuw worden opgestart."
+  },
+  "app.settings.resource-management.maximum-concurrent-downloads.title": {
+    "message": "Maximaal aantal gelijktijdige downloads"
+  },
+  "app.settings.resource-management.maximum-concurrent-writes.description": {
+    "message": "Het aantal bestanden dat de app tegelijkertijd naar de schijf kan schrijven. Verlaag deze waarde als je vaak I/O-fouten tegenkomt. Hiervoor moet de app opnieuw worden opgestart."
+  },
+  "app.settings.resource-management.maximum-concurrent-writes.title": {
+    "message": "Maximaal aantal gelijktijdige schrijfbewerkingen"
+  },
+  "app.settings.sidebar.label.instances": {
+    "message": "Instanties"
+  },
   "app.settings.tabs.appearance": {
     "message": "Uiterlijk"
   },
+  "app.settings.tabs.behavior": {
+    "message": "Gedrag"
+  },
   "app.settings.tabs.default-instance-options": {
     "message": "Standaard spelopties"
   },
@@ -1157,6 +1229,9 @@
   "app.update.complete-toast.title": {
     "message": "Versie {version} is succesvol geïnstalleerd!"
   },
+  "app.user.project.install-to-instance": {
+    "message": "Op instantie installeren"
+  },
   "app.world.server-modal.placeholder-address": {
     "message": "voorbeeld.modrinth.gg"
   },
@@ -1427,6 +1502,21 @@
   "instance.settings.sharing.active-invites.title": {
     "message": "Actieve uitnodigingen"
   },
+  "instance.settings.sharing.active-invites.uses": {
+    "message": "Keren gebruikt"
+  },
+  "instance.settings.sharing.revoke-invite.admonition-body": {
+    "message": "De uitnodigingslink <monospace>{code}</monospace> zal gelijk niet meer werken. Mensen die zich al hebben aangemeld, behouden hun toegang."
+  },
+  "instance.settings.sharing.revoke-invite.admonition-header": {
+    "message": "Deze actie kan niet ongedaan worden gemaakt"
+  },
+  "instance.settings.sharing.revoke-invite.confirm": {
+    "message": "Uitnodiging intrekken"
+  },
+  "instance.settings.sharing.revoke-invite.header": {
+    "message": "Uitnodiging intrekken"
+  },
   "instance.settings.tabs.general": {
     "message": "Algemeen"
   },
@@ -1535,6 +1625,27 @@
   "instance.settings.tabs.hooks.title": {
     "message": "Game opstart haakjes"
   },
+  "instance.settings.tabs.hooks.variables.description": {
+    "message": "Hooks worden uitgevoerd in de werkfolder van de instantie, met de volgende variabelen:"
+  },
+  "instance.settings.tabs.hooks.variables.inst-dir.description": {
+    "message": "$INST_DIR: Het absolute pad naar de map van de instantie"
+  },
+  "instance.settings.tabs.hooks.variables.inst-id.description": {
+    "message": "$INST_ID: De naam van de map van de instantie"
+  },
+  "instance.settings.tabs.hooks.variables.inst-java-args.description": {
+    "message": "$INST_JAVA_ARGS: De JVM-argumenten die aan het spel worden doorgegeven"
+  },
+  "instance.settings.tabs.hooks.variables.inst-java.description": {
+    "message": "$INST_JAVA: Het absolute pad naar het Java-uitvoeringsbestand"
+  },
+  "instance.settings.tabs.hooks.variables.inst-mc-dir.description": {
+    "message": "$INST_MC_DIR: Een alias voor $INST_DIR"
+  },
+  "instance.settings.tabs.hooks.variables.inst-name.description": {
+    "message": "$INST_NAME: De naam van de instantie"
+  },
   "instance.settings.tabs.hooks.wrapper": {
     "message": "Wrapper"
   },
@@ -1628,6 +1739,12 @@
   "instance.shared-instance.error.title": {
     "message": "Er is iets misgegaan"
   },
+  "instance.shared-instance.network-error.text": {
+    "message": "Kan geen verbinding maken met de API voor gedeelde instanties"
+  },
+  "instance.shared-instance.network-error.title": {
+    "message": "Netwerkfout"
+  },
   "instance.shared-instance.owner-tooltip": {
     "message": "De inhoud van deze instantie wordt gedeeld met andere gebruikers."
   },
@@ -1816,5 +1933,11 @@
   },
   "search.filter.locked.server-loader.title": {
     "message": "Loader is gegeven door de server"
+  },
+  "settings.sidebar.label.account": {
+    "message": "Account"
+  },
+  "settings.sidebar.label.display": {
+    "message": "Weergave"
   }
 }
diff --git a/apps/app-frontend/src/locales/pl-PL/index.json b/apps/app-frontend/src/locales/pl-PL/index.json
index 5fb45c66c8..d6c98e9068 100644
--- a/apps/app-frontend/src/locales/pl-PL/index.json
+++ b/apps/app-frontend/src/locales/pl-PL/index.json
@@ -461,9 +461,18 @@
   "app.instance.share.locked.wrong-account-heading": {
     "message": "Złe konto"
   },
+  "app.instance.share.members.empty": {
+    "message": "Żaden użytkownik jeszcze nie dołączył"
+  },
+  "app.instance.share.members.no-filter-results": {
+    "message": "Nie znaleziono użytkowników pasujących do tych filtrów."
+  },
   "app.instance.share.remove-user-modal.effect-access": {
     "message": "Nie będzie w stanie otrzymywać aktualizacji dla tej udostępnionej instancji"
   },
+  "app.instance.share.remove-user-modal.effect-last-user": {
+    "message": "To jest ostatni użytkownik, udostępnianie zostanie wyłączone dla tej instancji"
+  },
   "app.instance.share.remove-user-modal.effects-label": {
     "message": "Co się stanie?"
   },
@@ -545,6 +554,9 @@
   "app.instance.worlds.no-worlds-heading": {
     "message": "Nie dodano żadnych światów ani serwerów"
   },
+  "app.instance.worlds.refreshing": {
+    "message": "Odświeżanie..."
+  },
   "app.instance.worlds.remove-server-modal.remove-button": {
     "message": "Usuń serwer"
   },
@@ -602,6 +614,9 @@
   "app.java-selector.path.placeholder": {
     "message": "/path/to/java"
   },
+  "app.java-selector.test-installation": {
+    "message": "Testuj instalację Java"
+  },
   "app.modal.install-to-play.additional-context": {
     "message": "Dodatkowy kontekst"
   },
@@ -632,6 +647,9 @@
   "app.modal.install-to-play.invite-warning": {
     "message": "To zaproszenie zostało utworzone przez innego użytkownika Modrinth, nie przez firmę Modrinth. Tylko akceptuj zaproszenia od osób, którym ufasz."
   },
+  "app.modal.install-to-play.invite-warning-with-creator": {
+    "message": "To zaproszenie zostało utworzone przez <creator>{username}</creator>, nie przez firmę Modrinth. Akceptuj zaproszenia tylko od osób, którym ufasz."
+  },
   "app.modal.install-to-play.mod-count": {
     "message": "{count, plural, one {# mod} few {# mody} other {# modów}}"
   },
@@ -677,6 +695,9 @@
   "app.modal.install-to-play.shared-instance-content": {
     "message": "Treści w przesłanej ci instalacji"
   },
+  "app.modal.install-to-play.shared-instance-unknown-files-description": {
+    "message": "Ta udostępniona instancja zawiera pliki, które nie zostały opublikowane na Modrinth. Zalecamy instalowanie plików tylko ze źródeł, którym ufasz."
+  },
   "app.modal.install-to-play.unknown-files-description": {
     "message": "Ta serwerowa paczka modów zawiera pliki, które nie zostały opublikowane na Modrinth. Zalecamy instalowanie plików tylko ze źródeł, którym ufasz."
   },
@@ -705,7 +726,7 @@
     "message": "Usunięto"
   },
   "app.modal.update-to-play.shared-instance-unknown-files-description": {
-    "message": "Ta aktualizacja przesłanej instancji zawiera pliki, które nie zostały opublikowane na Modrinth. Zalecamy instalowanie tych plików z źródła, któremu ufasz."
+    "message": "Ta aktualizacja udostępnionej instancji zawiera pliki, które nie zostały opublikowane na Modrinth. Zalecamy instalowanie plików tylko ze źródeł, którym ufasz."
   },
   "app.modal.update-to-play.update-required": {
     "message": "Wymagana jest aktualizacja"
@@ -863,6 +884,9 @@
   "app.settings.tabs.appearance": {
     "message": "Wygląd"
   },
+  "app.settings.tabs.behavior": {
+    "message": "Zachowanie"
+  },
   "app.settings.tabs.default-instance-options": {
     "message": "Domyślne opcje gry"
   },
@@ -1079,6 +1103,9 @@
   "app.update.complete-toast.title": {
     "message": "Wersja {version} została pomyślnie zainstalowana!"
   },
+  "app.user.project.install-to-instance": {
+    "message": "Zainstaluj do instancji"
+  },
   "app.world.server-modal.placeholder-address": {
     "message": "example.modrinth.gg"
   },
@@ -1178,6 +1205,9 @@
   "installation-settings.shared-instance.linked-title": {
     "message": "Powiązana udostępniona instancja"
   },
+  "installation-settings.shared-instance.title": {
+    "message": "Wycofaj instancję"
+  },
   "installation-settings.shared-instance.unlink-button": {
     "message": "Odłącz udostępnioną instancję"
   },
@@ -1187,9 +1217,21 @@
   "installation-settings.shared-instance.unlinking-button": {
     "message": "Odłączanie..."
   },
+  "installation-settings.shared-instance.unpublish-button": {
+    "message": "Wycofaj udostępnioną instancję"
+  },
+  "installation-settings.shared-instance.unpublish-description": {
+    "message": "Usuń tę udostępnioną instancję z Modrinth i przestań wysyłać aktualizacje do użytkowników, którym jest udostępniona. Nie wpłynie to na twoją lokalną instancję."
+  },
   "installation-settings.unpublish-shared-instance.modal.admonition-body": {
     "message": "Spowoduje to usunięcie przesyłanej instalacji z serwerów Modrith. Użytkownicy korzystający z niej na Modrinth App przestaną otrzymywać aktualizacje, ale twoja lokalna instalacja zostanie na tym urządzeniu."
   },
+  "installation-settings.unpublish-shared-instance.modal.admonition-header": {
+    "message": "Wycofywanie udostępnionej instancji"
+  },
+  "installation-settings.unpublish-shared-instance.modal.header": {
+    "message": "Wycofaj udostępnioną instancję"
+  },
   "instance.action.create-shortcut": {
     "message": "Utwórz skrót"
   },
@@ -1259,6 +1301,9 @@
   "instance.files.save-as": {
     "message": "Zapisz jako..."
   },
+  "instance.locked.delete-button": {
+    "message": "Usuń instancję"
+  },
   "instance.playtime.never-played": {
     "message": "Nigdy nie grano"
   },
diff --git a/apps/app-frontend/src/locales/pt-BR/index.json b/apps/app-frontend/src/locales/pt-BR/index.json
index f46b9bbab6..6826ef1414 100644
--- a/apps/app-frontend/src/locales/pt-BR/index.json
+++ b/apps/app-frontend/src/locales/pt-BR/index.json
@@ -36,7 +36,7 @@
     "message": "Cancelado"
   },
   "app.action-bar.install.summary.cleanup-incomplete": {
-    "message": "A limpeza não foi finalizada"
+    "message": "A limpeza não foi concluída"
   },
   "app.action-bar.install.summary.content-download-failed": {
     "message": "Não foi possível baixar os arquivos"
@@ -51,7 +51,7 @@
     "message": "O download não foi concluído"
   },
   "app.action-bar.install.summary.instance-not-found": {
-    "message": "Instância não encontrada"
+    "message": "A instância não foi encontrada"
   },
   "app.action-bar.install.summary.invalid-file-path": {
     "message": "O caminho do arquivo é inválido"
@@ -1229,6 +1229,9 @@
   "app.update.complete-toast.title": {
     "message": "Versão {version} instalada!"
   },
+  "app.user.project.install-to-instance": {
+    "message": "Instalar para instância"
+  },
   "app.world.server-modal.placeholder-address": {
     "message": "exemplo.modrinth.gg"
   },
@@ -1622,6 +1625,27 @@
   "instance.settings.tabs.hooks.title": {
     "message": "Ações de inicialização do jogo"
   },
+  "instance.settings.tabs.hooks.variables.description": {
+    "message": "Hooks são executados no diretório de trabalho da instância, com as seguintes variáveis:"
+  },
+  "instance.settings.tabs.hooks.variables.inst-dir.description": {
+    "message": "$INST_DIR: O caminho absoluto para a pasta da instância"
+  },
+  "instance.settings.tabs.hooks.variables.inst-id.description": {
+    "message": "$INST_ID: O nome da pasta da instância"
+  },
+  "instance.settings.tabs.hooks.variables.inst-java-args.description": {
+    "message": "$INST_JAVA_ARGS: Os argumentos JVM fornecidos ao jogo"
+  },
+  "instance.settings.tabs.hooks.variables.inst-java.description": {
+    "message": "$INST_JAVA: O caminho absoluto ao binário Java"
+  },
+  "instance.settings.tabs.hooks.variables.inst-mc-dir.description": {
+    "message": "$INST_MC_DIR: um apelido de $INST_DIR"
+  },
+  "instance.settings.tabs.hooks.variables.inst-name.description": {
+    "message": "$INST_NAME: O nome da instância"
+  },
   "instance.settings.tabs.hooks.wrapper": {
     "message": "Comando auxiliar"
   },
diff --git a/apps/app-frontend/src/locales/ro-RO/index.json b/apps/app-frontend/src/locales/ro-RO/index.json
index a0c99fc34b..8843b664c1 100644
--- a/apps/app-frontend/src/locales/ro-RO/index.json
+++ b/apps/app-frontend/src/locales/ro-RO/index.json
@@ -1,10 +1,130 @@
 {
+  "app.action-bar.downloading-java": {
+    "message": "Se descarcă Java {version}"
+  },
+  "app.action-bar.downloading-update": {
+    "message": "Se descarcă actualizarea"
+  },
+  "app.action-bar.downloads": {
+    "message": "Descărcări"
+  },
+  "app.action-bar.install.copied-details": {
+    "message": "Copiat"
+  },
+  "app.action-bar.install.copy-details": {
+    "message": "Copiază detaliile"
+  },
+  "app.action-bar.install.dismiss": {
+    "message": "Ignoră"
+  },
+  "app.action-bar.install.open-instance": {
+    "message": "Instanța nouă"
+  },
+  "app.action-bar.install.retry": {
+    "message": "Reîncearcă"
+  },
+  "app.action-bar.install.summary.canceled": {
+    "message": "Anulat"
+  },
+  "app.action-bar.install.summary.could-not-save-files": {
+    "message": "Nu s-au putut salva fișierele"
+  },
+  "app.action-bar.offline": {
+    "message": "Offline"
+  },
+  "app.action-bar.update": {
+    "message": "Actualizează"
+  },
+  "app.action-bar.view-active-downloads": {
+    "message": "Vezi descărcările active"
+  },
+  "app.action-bar.view-instance": {
+    "message": "Vezi instanțele"
+  },
+  "app.action-bar.view-logs": {
+    "message": "Vezi jurnalele"
+  },
+  "app.ads-consent.accept": {
+    "message": "Acceptă tot"
+  },
+  "app.ads-consent.reject": {
+    "message": "Refuză tot"
+  },
   "app.auth-servers.unreachable.body": {
     "message": "Serverele de autentificare Minecraft pot fi indisponibile în acest moment. Verificați conexiunea la internet și încercați din nou mai târziu."
   },
   "app.auth-servers.unreachable.header": {
     "message": "Nu se pot accesa serverele de autentificare"
   },
+  "app.browse.added": {
+    "message": "Adăugat"
+  },
+  "app.browse.already-added": {
+    "message": "Deja adăugat"
+  },
+  "app.browse.back-to-instance": {
+    "message": "Înapoi la instanță"
+  },
+  "app.browse.discover-project-type": {
+    "message": "Descoperă {projectType}"
+  },
+  "app.browse.discover-servers": {
+    "message": "Descoperă servere"
+  },
+  "app.browse.hide-added-servers": {
+    "message": "Ascunde serverele deja adăugate"
+  },
+  "app.browse.server.installing": {
+    "message": "Se instalează"
+  },
+  "app.export-modal.export-button": {
+    "message": "Exportă"
+  },
+  "app.export-modal.version-number-placeholder": {
+    "message": "1.0.0"
+  },
+  "app.install.phase.finalizing": {
+    "message": "Se finalizează"
+  },
+  "app.instance.admonitions.shared-instance.added-label": {
+    "message": "Adăugat"
+  },
+  "app.instance.modpack-already-installed.create": {
+    "message": "Creează"
+  },
+  "app.instance.share.sign-in.button": {
+    "message": "Conectează-te"
+  },
+  "app.instance.shared-instance-already-installed.instance": {
+    "message": "Instanță"
+  },
+  "app.instance.worlds.delete-world-modal.delete-button": {
+    "message": "Șterge lumea"
+  },
+  "app.instance.worlds.delete-world-modal.title": {
+    "message": "Șterge lumea"
+  },
+  "app.instance.worlds.delete-world-modal.warning-header": {
+    "message": "Se șterge {name}"
+  },
+  "app.instance.worlds.filter-offline": {
+    "message": "Offline"
+  },
+  "app.instance.worlds.filter-online": {
+    "message": "Online"
+  },
+  "app.instance.worlds.filter-vanilla": {
+    "message": "Vanilla"
+  },
+  "app.instance.worlds.refreshing": {
+    "message": "Se reîmprospătează..."
+  },
+  "app.java-detection.cancel": {
+    "message": "Anulează"
+  },
+  "app.java-detection.columns.actions": {
+    "message": "Acțiuni"
+  },
   "app.modal.install-to-play.header": {
     "message": "Instalați pentru a juca"
   },
diff --git a/apps/app-frontend/src/locales/ru-RU/index.json b/apps/app-frontend/src/locales/ru-RU/index.json
index 76ad5b2c8e..0f0d7d0ce3 100644
--- a/apps/app-frontend/src/locales/ru-RU/index.json
+++ b/apps/app-frontend/src/locales/ru-RU/index.json
@@ -1220,6 +1220,9 @@
   "app.update.complete-toast.title": {
     "message": "Версия {version} успешно установлена!"
   },
+  "app.user.project.install-to-instance": {
+    "message": "Установить в сборку"
+  },
   "app.world.server-modal.placeholder-address": {
     "message": "example.modrinth.gg"
   },
@@ -1338,7 +1341,7 @@
     "message": "Связанная сборка"
   },
   "installation-settings.shared-instance.title": {
-    "message": "Отменить публикацию экземпляра"
+    "message": "Закрытие доступа"
   },
   "installation-settings.shared-instance.unlink-button": {
     "message": "Отвязать сборку"
@@ -1350,13 +1353,13 @@
     "message": "Отвязка..."
   },
   "installation-settings.shared-instance.unpublish-button": {
-    "message": "Отменить публикацию общего экземпляра"
+    "message": "Закрыть доступ к сборке"
   },
   "installation-settings.shared-instance.unpublish-description": {
-    "message": "Удалите этот общий экземпляр из Modrinth и прекратите отправлять обновления всем, кто его использует. Ваш локальный экземпляр останется без изменений."
+    "message": "Удаляет сборку с серверов Modrinth и прекращает отправку обновлений. Локальная копия сборки останется нетронутой."
   },
   "installation-settings.shared-instance.unpublishing-button": {
-    "message": "Снятие с публикации..."
+    "message": "Закрытие доступа..."
   },
   "installation-settings.unlink-shared-instance.modal.admonition-body": {
     "message": "Это повлияет только на ваш локальный экземпляр. Установленный контент останется на этом устройстве, и это никак не отразится на общем экземпляре и других пользователях."
@@ -1368,13 +1371,13 @@
     "message": "Отвязка сборки"
   },
   "installation-settings.unpublish-shared-instance.modal.admonition-body": {
-    "message": "Это удалит общий экземпляр с серверов Modrinth. Пользователи, использующие его в приложении Modrinth, перестанут получать обновления, но ваш локальный экземпляр и его содержимое останутся на этом устройстве."
+    "message": "Сборка будет удалена с серверов Modrinth. Локальная копия и её контент останутся на устройстве, а другие участники перестанут получать обновления."
   },
   "installation-settings.unpublish-shared-instance.modal.admonition-header": {
-    "message": "Отмена публикации общего экземпляра"
+    "message": "Закрытие доступа к сборке"
   },
   "installation-settings.unpublish-shared-instance.modal.header": {
-    "message": "Отменить публикацию общего экземпляра"
+    "message": "Закрытие доступа к сборке"
   },
   "instance.action.create-shortcut": {
     "message": "Создать ярлык"
@@ -1610,6 +1613,27 @@
   "instance.settings.tabs.hooks.title": {
     "message": "Команды запуска игры"
   },
+  "instance.settings.tabs.hooks.variables.description": {
+    "message": "Команды выполняются в рабочем каталоге сборки. Список переменных:"
+  },
+  "instance.settings.tabs.hooks.variables.inst-dir.description": {
+    "message": "$INST_DIR: абсолютный путь к папке сборки"
+  },
+  "instance.settings.tabs.hooks.variables.inst-id.description": {
+    "message": "$INST_ID: имя папки сборки"
+  },
+  "instance.settings.tabs.hooks.variables.inst-java-args.description": {
+    "message": "$INST_JAVA_ARGS: аргументы JVM, передаваемые игре"
+  },
+  "instance.settings.tabs.hooks.variables.inst-java.description": {
+    "message": "$INST_JAVA: абсолютный путь к Java"
+  },
+  "instance.settings.tabs.hooks.variables.inst-mc-dir.description": {
+    "message": "$INST_MC_DIR: аналог $INST_DIR"
+  },
+  "instance.settings.tabs.hooks.variables.inst-name.description": {
+    "message": "$INST_NAME: название сборки"
+  },
   "instance.settings.tabs.hooks.wrapper": {
     "message": "Обёртка"
   },
diff --git a/apps/app-frontend/src/locales/sr-CS/index.json b/apps/app-frontend/src/locales/sr-CS/index.json
index 504cd552f8..ec07649d5b 100644
--- a/apps/app-frontend/src/locales/sr-CS/index.json
+++ b/apps/app-frontend/src/locales/sr-CS/index.json
@@ -218,6 +218,9 @@
   "app.auth-servers.unreachable.header": {
     "message": "Serveri za autentifikaciju su nedostupni"
   },
+  "app.behavior-settings.confirmations.title": {
+    "message": "Potvrde"
+  },
   "app.browse.add-servers-to-instance": {
     "message": "Dodavanje servera na instancu"
   },
diff --git a/apps/app-frontend/src/locales/sv-SE/index.json b/apps/app-frontend/src/locales/sv-SE/index.json
index a6eb17552c..0ee4a37823 100644
--- a/apps/app-frontend/src/locales/sv-SE/index.json
+++ b/apps/app-frontend/src/locales/sv-SE/index.json
@@ -62,6 +62,12 @@
   "app.action-bar.install.summary.invalid-modpack-files": {
     "message": "Modpaketets filer har ogiltig metadata"
   },
+  "app.action-bar.install.summary.java-setup-failed": {
+    "message": "Java-installationen kunde inte avslutas"
+  },
+  "app.action-bar.install.summary.loader-setup-failed": {
+    "message": "Konfigurering av loader misslyckades"
+  },
   "app.action-bar.install.summary.local-data-error": {
     "message": "Kunde inte uppdatera lokal data"
   },
@@ -173,6 +179,9 @@
   "app.appearance-settings.show-play-time.title": {
     "message": "Visa speltid"
   },
+  "app.appearance-settings.skip-non-essential-warnings.description": {
+    "message": "Hoppa över bekräftelser till lågriskåtgärder som att duplicera installationer, vanlig innehålls radering, bulk uppdateringar, avlänkning och reparationer. Varningar för farligare åtgärder visas alltid."
+  },
   "app.appearance-settings.skip-non-essential-warnings.title": {
     "message": "Hoppa över icke nödvändiga varningar"
   },
@@ -195,7 +204,7 @@
     "message": "Kan ej nå autentiseringsservrarna"
   },
   "app.behavior-settings.confirmations.title": {
-    "message": "Bekräftningar"
+    "message": "Bekräftelser"
   },
   "app.behavior-settings.content.title": {
     "message": "Hem och innehåll"
@@ -228,7 +237,7 @@
     "message": "Utforska {projectType}"
   },
   "app.browse.discover-servers": {
-    "message": "Upptäck servrar"
+    "message": "Utforska servrar"
   },
   "app.browse.hide-added-servers": {
     "message": "Göm redan tillagda servrar"
@@ -821,6 +830,9 @@
   "app.settings.default-instance-options.java-arguments.title": {
     "message": "Java-argument"
   },
+  "app.settings.default-instance-options.memory-allocation.title": {
+    "message": "Minnestilldelning"
+  },
   "app.settings.default-instance-options.post-exit-hook.description": {
     "message": "Körs efter att spelet stängs."
   },
@@ -828,7 +840,7 @@
     "message": "Körs innan instansen startar."
   },
   "app.settings.default-instance-options.pre-launch-hook.placeholder": {
-    "message": "Ange för-starts kommando..."
+    "message": "Ange för-startskommando..."
   },
   "app.settings.default-instance-options.width.placeholder": {
     "message": "Ange bredd..."
@@ -881,6 +893,9 @@
   "app.settings.tabs.behavior": {
     "message": "Beteende"
   },
+  "app.settings.tabs.default-instance-options": {
+    "message": "Standard spelinställningar"
+  },
   "app.settings.tabs.java-installations": {
     "message": "Java-installationer"
   },
@@ -1094,6 +1109,9 @@
   "app.update.complete-toast.title": {
     "message": "Version {version} har installerats!"
   },
+  "app.user.project.install-to-instance": {
+    "message": "Installera till instans"
+  },
   "app.world.server-modal.placeholder-address": {
     "message": "exempel.modrinth.gg"
   },
@@ -1217,6 +1235,12 @@
   "installation-settings.shared-instance.unpublishing-button": {
     "message": "Avpublicerar..."
   },
+  "installation-settings.unlink-shared-instance.modal.admonition-header": {
+    "message": "Avlänkar delad instans"
+  },
+  "installation-settings.unlink-shared-instance.modal.header": {
+    "message": "Avlänka delad instans"
+  },
   "installation-settings.unpublish-shared-instance.modal.admonition-body": {
     "message": "Detta raderar den delade instansen från Modrinths servrar. De som använder den i Modrinth App kommer sluta få uppdateringar, men din lokala instans och dess innehåll är kvar på den här enheten."
   },
@@ -1316,9 +1340,15 @@
   "instance.server-modal.resource-pack": {
     "message": "Resurs pack"
   },
+  "instance.settings.sharing.active-invites.actions": {
+    "message": "Åtgärder"
+  },
   "instance.settings.sharing.active-invites.code": {
     "message": "Inbjudningslänk"
   },
+  "instance.settings.sharing.active-invites.empty": {
+    "message": "Det finns inga aktiva inbjudningar."
+  },
   "instance.settings.sharing.active-invites.expires": {
     "message": "Går ut"
   },
@@ -1334,6 +1364,12 @@
   "instance.settings.sharing.active-invites.uses": {
     "message": "Användningar"
   },
+  "instance.settings.sharing.revoke-invite.admonition-body": {
+    "message": "Inbjudningslänken <monospace>{code}</monospace> kommer sluta fungera omedelbart. De som redan gått med kommer ha kvar åtkomst."
+  },
+  "instance.settings.sharing.revoke-invite.admonition-header": {
+    "message": "Den här åtgärden kan inte ångras"
+  },
   "instance.settings.sharing.revoke-invite.confirm": {
     "message": "Återkalla inbjudan"
   },
@@ -1448,6 +1484,12 @@
   "instance.settings.tabs.hooks.title": {
     "message": "Hooks för spelstart"
   },
+  "instance.settings.tabs.hooks.variables.inst-id.description": {
+    "message": "$INST_ID: Instansmappens namn"
+  },
+  "instance.settings.tabs.hooks.variables.inst-name.description": {
+    "message": "$INST_NAME: Instansnamnet"
+  },
   "instance.settings.tabs.hooks.wrapper": {
     "message": "Omslag"
   },
diff --git a/apps/app-frontend/src/locales/tr-TR/index.json b/apps/app-frontend/src/locales/tr-TR/index.json
index 9fe9fd9359..f8f49fd86b 100644
--- a/apps/app-frontend/src/locales/tr-TR/index.json
+++ b/apps/app-frontend/src/locales/tr-TR/index.json
@@ -173,6 +173,9 @@
   "app.appearance-settings.hide-nametag.title": {
     "message": "İsim etiketini gizle"
   },
+  "app.appearance-settings.jump-back-into-worlds.description": {
+    "message": "Ana sayfadaki “Tekrar oyuna katıl” bölümünde son oynanan dünyaları göster."
+  },
   "app.appearance-settings.jump-back-into-worlds.title": {
     "message": "Dünyalara hızlıca geri dön"
   },
@@ -188,9 +191,15 @@
   "app.appearance-settings.native-decorations.title": {
     "message": "Sistem pencere çerçevesi"
   },
+  "app.appearance-settings.show-play-time.description": {
+    "message": "Her bir örneği ne kadar süreyle oynadığını göster."
+  },
   "app.appearance-settings.show-play-time.title": {
     "message": "Oynama süresini göster"
   },
+  "app.appearance-settings.skip-non-essential-warnings.description": {
+    "message": "Yinelenen yüklemeler, normal içerik silme, toplu güncellemeler, bağlantıların kaldırılması ve onarımlar gibi düşük riskli işlemlerde onay adımlarını atlayın. Tehlikeli işlemlerle ilgili uyarılar her zaman gösterilir."
+  },
   "app.appearance-settings.skip-non-essential-warnings.title": {
     "message": "Gerekli olmayan uyarıları atla"
   },
@@ -215,6 +224,12 @@
   "app.behavior-settings.confirmations.title": {
     "message": "Onaylamalar"
   },
+  "app.behavior-settings.content.title": {
+    "message": "Ana sayfa ve içerik"
+  },
+  "app.behavior-settings.startup-and-navigation.title": {
+    "message": "Başlatma ve gezinme"
+  },
   "app.browse.add-servers-to-instance": {
     "message": "Sunucuyu kuruluma ekle"
   },
@@ -245,6 +260,9 @@
   "app.browse.hide-added-servers": {
     "message": "Zaten eklenmiş sunucuları gizle"
   },
+  "app.browse.hide-installed-modpacks": {
+    "message": "Zaten yüklenmiş olanları gizle"
+  },
   "app.browse.project-type.modpacks": {
     "message": "Mod paketleri"
   },
@@ -473,6 +491,9 @@
   "app.instance.share.remove-user-modal.effect-invite-again": {
     "message": "Onları sonradan tekrar davet edebilirsiniz"
   },
+  "app.instance.share.remove-user-modal.effect-last-user": {
+    "message": "Bu son kullanıcıdır; bu örnek için paylaşım özelliği devre dışı bırakılacaktır"
+  },
   "app.instance.share.remove-user-modal.effects-label": {
     "message": "Ne olur?"
   },
@@ -485,12 +506,18 @@
   "app.instance.share.remove-user-modal.user-avatar-alt": {
     "message": "{username} nın avatarı"
   },
+  "app.instance.share.remove-user-modal.warning-body": {
+    "message": "{username}'nın bu paylaşılan örneğe erişimini iptal ederseniz, bu kişinin güncellemeleri alabilmesi için onu yeniden davet etmeniz gerekecektir."
+  },
   "app.instance.share.sign-in.button": {
     "message": "Giriş yap"
   },
   "app.instance.share.unable-to-connect.heading": {
     "message": "Bağlanılamıyor"
   },
+  "app.instance.share.unlink.body": {
+    "message": "Örneğini paylaşmak için bu mod paketinin bağlantısını kaldırmalısın"
+  },
   "app.instance.shared-instance-already-installed.install-anyway": {
     "message": "Yine de kur"
   },
diff --git a/apps/app-frontend/src/locales/uk-UA/index.json b/apps/app-frontend/src/locales/uk-UA/index.json
index 1666af7c26..3da3934fef 100644
--- a/apps/app-frontend/src/locales/uk-UA/index.json
+++ b/apps/app-frontend/src/locales/uk-UA/index.json
@@ -590,6 +590,9 @@
   "app.instance.worlds.no-worlds-heading": {
     "message": "Сервера або світи не додано"
   },
+  "app.instance.worlds.refreshing": {
+    "message": "Перезавантаження…"
+  },
   "app.instance.worlds.remove-server-modal.remove-button": {
     "message": "Видалити сервер"
   },
@@ -729,10 +732,10 @@
     "message": "Уміст спільного профілю"
   },
   "app.modal.install-to-play.shared-instance-unknown-files-description": {
-    "message": "Цей спільний профіль містить файли, які не є опубліковані на Modrinth. Ми наполегливо рекомендуємо встановлювати лише ті файли, яким довіряєте."
+    "message": "Цей спільний профіль містить файли, які не викладені на Modrinth. Наполегливо радимо встановлювати вміст лише з тих джерел, яким ви довіряєте."
   },
   "app.modal.install-to-play.unknown-files-description": {
-    "message": "Ця збірка сервера містить файли, які не є опубліковані на Modrinth. Ми наполегливо рекомендуємо встановлювати лише ті файли, яким довіряєте."
+    "message": "Ця збірка сервера містить файли, які не викладені на Modrinth. Наполегливо радимо встановлювати вміст лише з тих джерел, яким ви довіряєте."
   },
   "app.modal.install-to-play.unknown-files-warning": {
     "message": "Попередження про невідомі файли"
@@ -1226,6 +1229,9 @@
   "app.update.complete-toast.title": {
     "message": "Версію {version} успішно встановлено!"
   },
+  "app.user.project.install-to-instance": {
+    "message": "Установити в профіль"
+  },
   "app.world.server-modal.placeholder-address": {
     "message": "example.modrinth.gg"
   },
@@ -1619,6 +1625,27 @@
   "instance.settings.tabs.hooks.title": {
     "message": "Гуки запуску гри"
   },
+  "instance.settings.tabs.hooks.variables.description": {
+    "message": "Гуки виконуються в робочій директорії профілю з наступними змінними:"
+  },
+  "instance.settings.tabs.hooks.variables.inst-dir.description": {
+    "message": "$INST_DIR: повний шлях до теки профілю"
+  },
+  "instance.settings.tabs.hooks.variables.inst-id.description": {
+    "message": "$INST_ID: назва теки профілю"
+  },
+  "instance.settings.tabs.hooks.variables.inst-java-args.description": {
+    "message": "$INST_JAVA_ARGS: надані для гри аргументи JVM"
+  },
+  "instance.settings.tabs.hooks.variables.inst-java.description": {
+    "message": "$INST_JAVA: повний шлях до java"
+  },
+  "instance.settings.tabs.hooks.variables.inst-mc-dir.description": {
+    "message": "$INST_MC_DIR: те саме, що $INST_DIR"
+  },
+  "instance.settings.tabs.hooks.variables.inst-name.description": {
+    "message": "$INST_NAME: назва профілю"
+  },
   "instance.settings.tabs.hooks.wrapper": {
     "message": "Обгортач"
   },
diff --git a/apps/app-frontend/src/locales/zh-CN/index.json b/apps/app-frontend/src/locales/zh-CN/index.json
index 0d6ebfc67c..a65c62a8e7 100644
--- a/apps/app-frontend/src/locales/zh-CN/index.json
+++ b/apps/app-frontend/src/locales/zh-CN/index.json
@@ -183,7 +183,7 @@
     "message": "当 Minecraft 进程启动时，将 Modrinth App 最小化。"
   },
   "app.appearance-settings.minimize-launcher.title": {
-    "message": "最小化启动器"
+    "message": "最小化 App"
   },
   "app.appearance-settings.native-decorations.description": {
     "message": "使用操作系统的标题栏和窗口控件。需要重启应用。"
@@ -363,7 +363,7 @@
     "message": "推送更新"
   },
   "app.instance.admonitions.shared-instance.publishing-button": {
-    "message": "正在推送…"
+    "message": "正在推送……"
   },
   "app.instance.admonitions.shared-instance.removed-label": {
     "message": "移除内容"
@@ -381,7 +381,7 @@
     "message": "查看更新"
   },
   "app.instance.admonitions.shared-instance.reviewing-button": {
-    "message": "正在审查…"
+    "message": "正在审查……"
   },
   "app.instance.admonitions.shared-instance.update-available-body": {
     "message": "{name}需要更新。请更新到最新版本以启动游戏。"
@@ -1229,6 +1229,9 @@
   "app.update.complete-toast.title": {
     "message": "版本 {version} 已成功安装！"
   },
+  "app.user.project.install-to-instance": {
+    "message": "在实例上安装"
+  },
   "app.world.server-modal.placeholder-address": {
     "message": "example.modrinth.gg"
   },
@@ -1622,6 +1625,27 @@
   "instance.settings.tabs.hooks.title": {
     "message": "游戏启动钩子"
   },
+  "instance.settings.tabs.hooks.variables.description": {
+    "message": "在此实例工作目录中的钩柄遵循以下这些变量："
+  },
+  "instance.settings.tabs.hooks.variables.inst-dir.description": {
+    "message": "$INST_DIR:实例文件夹的绝对路径"
+  },
+  "instance.settings.tabs.hooks.variables.inst-id.description": {
+    "message": "$INST_ID:实例文件夹名称"
+  },
+  "instance.settings.tabs.hooks.variables.inst-java-args.description": {
+    "message": "$INST_JAVA_ARGS:已为游戏提供的JVM参数"
+  },
+  "instance.settings.tabs.hooks.variables.inst-java.description": {
+    "message": "$INST_JAVA:Java核心文件的绝对路径"
+  },
+  "instance.settings.tabs.hooks.variables.inst-mc-dir.description": {
+    "message": "$INST_MC_DIR:的别名是 $INST_DIR"
+  },
+  "instance.settings.tabs.hooks.variables.inst-name.description": {
+    "message": "$INST_NAME:实例名"
+  },
   "instance.settings.tabs.hooks.wrapper": {
     "message": "包装器命令"
   },
diff --git a/apps/app-frontend/src/locales/zh-TW/index.json b/apps/app-frontend/src/locales/zh-TW/index.json
index c87fdb7f28..095aa8b80c 100644
--- a/apps/app-frontend/src/locales/zh-TW/index.json
+++ b/apps/app-frontend/src/locales/zh-TW/index.json
@@ -1089,7 +1089,7 @@
     "message": "無"
   },
   "app.skins.modal.replace-texture-button": {
-    "message": "取代材質"
+    "message": "取代紋理"
   },
   "app.skins.modal.save-skin-button": {
     "message": "儲存外觀"
@@ -1098,7 +1098,7 @@
     "message": "正在儲存..."
   },
   "app.skins.modal.texture-section": {
-    "message": "材質"
+    "message": "紋理"
   },
   "app.skins.modal.upload-skin-first-tooltip": {
     "message": "請先上傳外觀檔案！"
@@ -1229,6 +1229,9 @@
   "app.update.complete-toast.title": {
     "message": "版本 {version} 已成功安裝！"
   },
+  "app.user.project.install-to-instance": {
+    "message": "安裝至實例"
+  },
   "app.world.server-modal.placeholder-address": {
     "message": "example.modrinth.gg"
   },
@@ -1622,6 +1625,27 @@
   "instance.settings.tabs.hooks.title": {
     "message": "遊戲啟動掛勾"
   },
+  "instance.settings.tabs.hooks.variables.description": {
+    "message": "掛勾會在實例的工作目錄中執行，並具備以下變數："
+  },
+  "instance.settings.tabs.hooks.variables.inst-dir.description": {
+    "message": "$INST_DIR：實例資料夾的絕對路徑"
+  },
+  "instance.settings.tabs.hooks.variables.inst-id.description": {
+    "message": "$INST_ID：實例資料夾的名稱"
+  },
+  "instance.settings.tabs.hooks.variables.inst-java-args.description": {
+    "message": "$INST_JAVA_ARGS：提供給遊戲的 JVM 參數"
+  },
+  "instance.settings.tabs.hooks.variables.inst-java.description": {
+    "message": "$INST_JAVA：Java 二進位檔案的絕對路徑"
+  },
+  "instance.settings.tabs.hooks.variables.inst-mc-dir.description": {
+    "message": "$INST_MC_DIR：$INST_DIR 的別名"
+  },
+  "instance.settings.tabs.hooks.variables.inst-name.description": {
+    "message": "$INST_NAME：實例的名稱"
+  },
   "instance.settings.tabs.hooks.wrapper": {
     "message": "包裝指令"
   },
diff --git a/apps/frontend/src/locales/de-CH/index.json b/apps/frontend/src/locales/de-CH/index.json
index 8701689713..b8b3aa2af2 100644
--- a/apps/frontend/src/locales/de-CH/index.json
+++ b/apps/frontend/src/locales/de-CH/index.json
@@ -1206,7 +1206,7 @@
     "message": "Details"
   },
   "create-project-version.create-modal.stage.metadata.detected-loaders": {
-    "message": "Erkannte Plattformen"
+    "message": "Erkannte Loader"
   },
   "create-project-version.create-modal.stage.metadata.detected-versions": {
     "message": "Erkannte Versionen"
@@ -1221,7 +1221,7 @@
     "message": "Dateien"
   },
   "create-project-version.create-modal.stage.metadata.loaders": {
-    "message": "Plattformen"
+    "message": "Loader"
   },
   "create-project-version.create-modal.stage.metadata.metadata-tab": {
     "message": "Metadaten"
@@ -1233,13 +1233,13 @@
     "message": "Modpack-Versionen können nicht bearbeitet werden"
   },
   "create-project-version.create-modal.stage.metadata.no-dependencies-added": {
-    "message": "Es wurden keine Abhängigkeiten hinzugefügt."
+    "message": "Keine Abhängigkeiten hinzugefügt."
   },
   "create-project-version.create-modal.stage.metadata.no-environment-set": {
-    "message": "Es wurde keine Umgebung festgelegt."
+    "message": "Keine Umgebung wurde festgelegt."
   },
   "create-project-version.create-modal.stage.metadata.no-loaders-selected": {
-    "message": "Es wurden keine Plattformen ausgewählt."
+    "message": "Keine Loader ausgewählt."
   },
   "create-project-version.create-modal.stage.metadata.no-mod-loader": {
     "message": "Kein Modloader"
@@ -3929,9 +3929,27 @@
   "project.settings.tags.featured-tags": {
     "message": "Hervorgehobene Tags"
   },
+  "project.settings.tags.featured-tags-required": {
+    "message": "Du musst mindestens ein hervorgehobenes Tag haben."
+  },
+  "project.settings.tags.featured-tags-select-description": {
+    "message": "Wähle deine relevantesten Tags aus. Diese werden vor den übrigen Tags angezeigt."
+  },
   "project.settings.tags.features-description": {
     "message": "Wähle alle Funktionen aus, die dein {type} nutzt."
   },
+  "project.settings.tags.group-title.categories": {
+    "message": "{showType, select, yes {{types} Kategorien} other {Kategorien}}"
+  },
+  "project.settings.tags.group-title.features": {
+    "message": "{showType, select, yes {{types} Funktionen} other {Funktionen}}"
+  },
+  "project.settings.tags.group-title.performance-impact": {
+    "message": "{showType, select, yes {{types} Auswirkungen auf die Leistung} other {Auswirkungen auf die Leistung}}"
+  },
+  "project.settings.tags.group-title.resolutions": {
+    "message": "{showType, select, yes {{types} Auflösungen} other {Auflösungen}}"
+  },
   "project.settings.tags.multiple-resolution-tags-warning": {
     "message": "Du hast {count} Auflösungs-Tags ({tags}) ausgewählt. Ressourcenpakete sollten in der Regel nur einen Auflösungs-Tag haben."
   },
diff --git a/apps/frontend/src/locales/de-DE/index.json b/apps/frontend/src/locales/de-DE/index.json
index e414759eb7..7ba841ab1d 100644
--- a/apps/frontend/src/locales/de-DE/index.json
+++ b/apps/frontend/src/locales/de-DE/index.json
@@ -1206,7 +1206,7 @@
     "message": "Details"
   },
   "create-project-version.create-modal.stage.metadata.detected-loaders": {
-    "message": "Erkannte Plattformen"
+    "message": "Erkannte Loader"
   },
   "create-project-version.create-modal.stage.metadata.detected-versions": {
     "message": "Erkannte Versionen"
@@ -1221,7 +1221,7 @@
     "message": "Dateien"
   },
   "create-project-version.create-modal.stage.metadata.loaders": {
-    "message": "Plattformen"
+    "message": "Loader"
   },
   "create-project-version.create-modal.stage.metadata.metadata-tab": {
     "message": "Metadaten"
@@ -1233,13 +1233,13 @@
     "message": "Modpack-Versionen können nicht bearbeitet werden"
   },
   "create-project-version.create-modal.stage.metadata.no-dependencies-added": {
-    "message": "Es wurden keine Abhängigkeiten hinzugefügt."
+    "message": "Keine Abhängigkeiten hinzugefügt."
   },
   "create-project-version.create-modal.stage.metadata.no-environment-set": {
-    "message": "Es wurde keine Umgebung festgelegt."
+    "message": "Keine Umgebung wurde festgelegt."
   },
   "create-project-version.create-modal.stage.metadata.no-loaders-selected": {
-    "message": "Es wurden keine Plattformen ausgewählt."
+    "message": "Keine Loader ausgewählt."
   },
   "create-project-version.create-modal.stage.metadata.no-mod-loader": {
     "message": "Kein Modloader"
@@ -3929,9 +3929,27 @@
   "project.settings.tags.featured-tags": {
     "message": "Hervorgehobene Tags"
   },
+  "project.settings.tags.featured-tags-required": {
+    "message": "Du musst mindestens ein hervorgehobenes Tag haben."
+  },
+  "project.settings.tags.featured-tags-select-description": {
+    "message": "Wähle deine relevantesten Tags aus. Diese werden vor den übrigen Tags angezeigt."
+  },
   "project.settings.tags.features-description": {
     "message": "Wähle alle Funktionen aus, die dein {type} nutzt."
   },
+  "project.settings.tags.group-title.categories": {
+    "message": "{showType, select, yes {{types} Kategorien} other {Kategorien}}"
+  },
+  "project.settings.tags.group-title.features": {
+    "message": "{showType, select, yes {{types} Funktionen} other {Funktionen}}"
+  },
+  "project.settings.tags.group-title.performance-impact": {
+    "message": "{showType, select, yes {{types} Auswirkungen auf die Leistung} other {Auswirkungen auf die Leistung}}"
+  },
+  "project.settings.tags.group-title.resolutions": {
+    "message": "{showType, select, yes {{types} Auflösungen} other {Auflösungen}}"
+  },
   "project.settings.tags.multiple-resolution-tags-warning": {
     "message": "Du hast {count} Auflösungs-Tags ({tags}) ausgewählt. Ressourcenpakete sollten in der Regel nur einen Auflösungs-Tag haben."
   },
@@ -5007,7 +5025,7 @@
     "message": "Entwicklermodus deaktivieren"
   },
   "settings.display.banner.developer-mode.description": {
-    "message": "Der <strong>Entwicklermodus</strong> ist aktiviert. Damit kannst du die internen IDs verschiedener Elemente in Modrinth anzeigen, was für Entwickler, welche die Modrinth-API verwenden, hilfreich sein kann. Klickst du 5x auf das Modrinth-Logo unten auf der Seite, um den Entwicklermodus umzuschalten."
+    "message": "Der <strong>Entwicklermodus</strong> ist aktiviert. Damit kannst du die internen IDs verschiedener Elemente in Modrinth anzeigen, was für Entwickler, welche die Modrinth-API verwenden, hilfreich sein kann. Klick fünfmal auf das Modrinth-Logo unten auf der Seite, um den Entwicklermodus umzuschalten."
   },
   "settings.display.flags.description": {
     "message": "Bestimmte Funktionen auf diesem Gerät aktivieren oder deaktivieren."
diff --git a/apps/frontend/src/locales/es-419/index.json b/apps/frontend/src/locales/es-419/index.json
index 038094172a..d5069e614b 100644
--- a/apps/frontend/src/locales/es-419/index.json
+++ b/apps/frontend/src/locales/es-419/index.json
@@ -2919,10 +2919,10 @@
     "message": "Actualizar a Modrinth+"
   },
   "layout.publish.email-verification-required.description": {
-    "message": "Debes verificar tu email antes de empezar a publicar en Modrinth."
+    "message": "Debes verificar tu correo electrónico antes de empezar a publicar en Modrinth."
   },
   "layout.publish.email-verification-required.title": {
-    "message": "Verificación de email requerida"
+    "message": "Verificación de correo electrónico requerida"
   },
   "modal.shared-instance.open-in-app.benefit.install": {
     "message": "Instala automáticamente todo lo que estén jugando"
@@ -2937,7 +2937,7 @@
     "message": "Obtener la App de Modrinth"
   },
   "modal.shared-instance.open-in-app.managed-by": {
-    "message": "Gestionado por"
+    "message": "Administrado por"
   },
   "modal.shared-instance.open-in-app.opening-automatically": {
     "message": "La App de Modrinth se abrirá automáticamente..."
@@ -3929,9 +3929,27 @@
   "project.settings.tags.featured-tags": {
     "message": "Etiquetas destacadas"
   },
+  "project.settings.tags.featured-tags-required": {
+    "message": "Debes seleccionar al menos una etiqueta destacada."
+  },
+  "project.settings.tags.featured-tags-select-description": {
+    "message": "Selecciona las etiquetas más relevantes. Estas se mostrarán primero que las demás etiquetas."
+  },
   "project.settings.tags.features-description": {
     "message": "Selecciona todas las características que tu {type} usa."
   },
+  "project.settings.tags.group-title.categories": {
+    "message": "{showType, select, yes {{types} categorías} other {Categorías}}"
+  },
+  "project.settings.tags.group-title.features": {
+    "message": "{showType, select, yes {{types} características} other {Características}}"
+  },
+  "project.settings.tags.group-title.performance-impact": {
+    "message": "{showType, select, yes {{types} impacto al rendimiento} other {Impacto al rendimiento}}"
+  },
+  "project.settings.tags.group-title.resolutions": {
+    "message": "{showType, select, yes {{types} resoluciones} other {Resoluciones}}"
+  },
   "project.settings.tags.multiple-resolution-tags-warning": {
     "message": "Has seleccionado {count} etiquetas de resolución ({tags}). Típicamente los paquetes de recursos solo deberían de tener una."
   },
@@ -4575,10 +4593,10 @@
     "message": "Administrar claves de acceso"
   },
   "settings.account.security.passkey.description": {
-    "message": "Administra tus claves de acceso registradas o agrega una nueva."
+    "message": "Administra tus claves de acceso registradas o añade una nueva."
   },
   "settings.account.security.passkey.modal.added": {
-    "message": "Agregado {ago}"
+    "message": "Añadido {ago}"
   },
   "settings.account.security.passkey.modal.last-used": {
     "message": "Último uso {ago}"
@@ -4629,7 +4647,7 @@
     "message": "Gestionar proveedores"
   },
   "settings.account.security.providers.description": {
-    "message": "Agrega o elimina métodos de inicio de sesión de tu cuenta, incluyendo GitHub, GitLab, Microsoft, Discord, Steam y Google."
+    "message": "Añade o elimina métodos de inicio de sesión de tu cuenta, incluyendo GitHub, GitLab, Microsoft, Discord, Steam y Google."
   },
   "settings.account.security.providers.title": {
     "message": "Administrar proveedores de autenticación"
@@ -4644,7 +4662,7 @@
     "message": "Configurar verificación en dos pasos"
   },
   "settings.account.security.two-factor.description": {
-    "message": "Agrega una capa adicional de seguridad a tu cuenta al iniciar sesión."
+    "message": "Añade una capa adicional de seguridad a tu cuenta al iniciar sesión."
   },
   "settings.account.security.two-factor.modal.remove.header": {
     "message": "Eliminar 2FA"
diff --git a/apps/frontend/src/locales/es-ES/index.json b/apps/frontend/src/locales/es-ES/index.json
index cf4cab466d..d9e784de46 100644
--- a/apps/frontend/src/locales/es-ES/index.json
+++ b/apps/frontend/src/locales/es-ES/index.json
@@ -8,6 +8,18 @@
   "admin.billing.error.not-found": {
     "message": "Usuario no encontrado"
   },
+  "ads-consent.accept": {
+    "message": "Aceptar todos"
+  },
+  "ads-consent.body": {
+    "message": "Los anuncios hace Modrinth posible y financian pagos a creadores. Nuestros socios pueden almacenar o acceder cookies en el sitio para personalizar anuncios y medir el rendimiento."
+  },
+  "ads-consent.manage": {
+    "message": "Gestionar preferencias"
+  },
+  "ads-consent.reject": {
+    "message": "Rechazar todos"
+  },
   "ads-consent.title": {
     "message": "Tu privacidad y como anuncios soportan Modrinth"
   },
diff --git a/apps/frontend/src/locales/fr-FR/index.json b/apps/frontend/src/locales/fr-FR/index.json
index d78cf40a5e..8b3e315a02 100644
--- a/apps/frontend/src/locales/fr-FR/index.json
+++ b/apps/frontend/src/locales/fr-FR/index.json
@@ -234,7 +234,7 @@
     "message": "Modrinth App"
   },
   "analytics.download-source.website": {
-    "message": "Site web de Modrinth"
+    "message": "Site web Modrinth"
   },
   "analytics.downloads.suffix": {
     "message": "téléchargements"
@@ -1080,10 +1080,10 @@
     "message": "Ce fil est fermé et aucun message ne peut y être envoyé."
   },
   "conversation-thread.error.closing-report": {
-    "message": "Impossible de fermer le rapport"
+    "message": "Erreur lors de la fermeture du signalement"
   },
   "conversation-thread.error.reopening-report": {
-    "message": "Impossible de rouvrir le rapport"
+    "message": "Erreur lors de la réouverture du signalement"
   },
   "conversation-thread.error.sending-message": {
     "message": "Impossible d'envoyer le message"
@@ -2676,7 +2676,7 @@
     "message": "Publier"
   },
   "layout.action.reports": {
-    "message": "Rapports d'examen"
+    "message": "Examiner les signalements"
   },
   "layout.action.review-projects": {
     "message": "Revue de projet"
@@ -2874,7 +2874,7 @@
     "message": "Ouvrir le menu"
   },
   "layout.nav.active-reports": {
-    "message": "Rapports actifs"
+    "message": "Signalements actifs"
   },
   "layout.nav.discover": {
     "message": "Découvrir"
@@ -3929,9 +3929,27 @@
   "project.settings.tags.featured-tags": {
     "message": "Tags mis en avant"
   },
+  "project.settings.tags.featured-tags-required": {
+    "message": "Vous devez au moins avoir un tag mis en avant."
+  },
+  "project.settings.tags.featured-tags-select-description": {
+    "message": "Sélectionnez vos tags les plus pertinents. Ils sont affichés avant le reste de vos tags."
+  },
   "project.settings.tags.features-description": {
     "message": "Sélectionnez toutes les fonctionnalités que votre {type} utilise."
   },
+  "project.settings.tags.group-title.categories": {
+    "message": "{showType, select, yes {{types} catégories} other {Catégories}}"
+  },
+  "project.settings.tags.group-title.features": {
+    "message": "{showType, select, yes {{types} fonctionnalités} other {Fonctionnalités}}"
+  },
+  "project.settings.tags.group-title.performance-impact": {
+    "message": "{showType, select, yes {{types} impact sur les performances} other {Impact sur les performances}}"
+  },
+  "project.settings.tags.group-title.resolutions": {
+    "message": "{showType, select, yes {{types} résolutions} other {Résolutions}}"
+  },
   "project.settings.tags.multiple-resolution-tags-warning": {
     "message": "Vous avez sélectionné {count} tags de résolution ({tags}). Les packs de ressources ne devraient typiquement avoir qu'un seul tag de résolution."
   },
diff --git a/apps/frontend/src/locales/he-IL/index.json b/apps/frontend/src/locales/he-IL/index.json
index 45383ef9bd..7e60f1660f 100644
--- a/apps/frontend/src/locales/he-IL/index.json
+++ b/apps/frontend/src/locales/he-IL/index.json
@@ -17,6 +17,9 @@
   "analytics.breakdown.project": {
     "message": "פּרוֹיֶקט"
   },
+  "analytics.chart.axis.playtime-hours": {
+    "message": "{hours} שעות"
+  },
   "analytics.chart.legend.monetization-details.description": {
     "message": "רק צפיות והורדות שבוצעו דרך Modrinth נספרות לצורך מונטיזציה, והורדות מחייבות את המשתמשים להיות מחוברים לחשבונם."
   },
diff --git a/apps/frontend/src/locales/hu-HU/index.json b/apps/frontend/src/locales/hu-HU/index.json
index 7313d7b514..6c167fa787 100644
--- a/apps/frontend/src/locales/hu-HU/index.json
+++ b/apps/frontend/src/locales/hu-HU/index.json
@@ -177,14 +177,17 @@
     "message": "{count} nap"
   },
   "analytics.chart.tooltip.duration.hours": {
-    "message": "{count} óra"
+    "message": "{count, plural, one {#óra} other {# órák}}"
   },
   "analytics.chart.tooltip.duration.minutes": {
-    "message": "{count} perc"
+    "message": "{count, plural, one {# perc} other {# percek}}"
   },
   "analytics.chart.tooltip.hide-entry": {
     "message": "{name} elrejtése a grafikonon"
   },
+  "analytics.chart.tooltip.no-data": {
+    "message": "Nincs adat"
+  },
   "analytics.chart.tooltip.pinned": {
     "message": "A diagram eszköztippje kitűzve"
   },
@@ -426,7 +429,7 @@
     "message": "az elő. idősz. kép."
   },
   "analytics.stat.previous-period-comparison-short": {
-    "message": "az előzőhöz képest"
+    "message": "az elő. kép."
   },
   "analytics.stat.revenue": {
     "message": "Bevétel"
@@ -3089,6 +3092,15 @@
   "organization.label.downloads": {
     "message": "letöltés"
   },
+  "organization.project-transfer.id-column": {
+    "message": "Azonosító"
+  },
+  "organization.project-transfer.name-column": {
+    "message": "Név"
+  },
+  "organization.project-transfer.project-icon-alt": {
+    "message": "A(z) {name} ikonja"
+  },
   "organization.projects.none-with-create-prompt": {
     "message": "Ennek a szervezetnek még nincsenek projektjei. Szeretnél <create-link>létrehozni egyet</create-link>?"
   },
diff --git a/apps/frontend/src/locales/it-IT/index.json b/apps/frontend/src/locales/it-IT/index.json
index 1d09448f32..29077a6619 100644
--- a/apps/frontend/src/locales/it-IT/index.json
+++ b/apps/frontend/src/locales/it-IT/index.json
@@ -972,7 +972,7 @@
     "message": "Smetti di seguire il progetto"
   },
   "collection.delete-modal.description": {
-    "message": "Questa raccolta sarà rimossa per sempre. Quest'azione non può essere annullata."
+    "message": "La raccolta sarà eliminata per sempre. Questa azione è irreversibile."
   },
   "collection.delete-modal.title": {
     "message": "Vuoi davvero eliminare questa raccolta?"
@@ -2967,7 +2967,7 @@
     "message": "Ammontare"
   },
   "modpack-scan-modal.delete-all-groups-confirmation.description": {
-    "message": "Questi gruppi di attribuzione e i file all'interno saranno rimossi per sempre da questo progetto. Quest'azione non può essere annullata."
+    "message": "Tutti i gruppi di attribuzione del progetto e i loro contenuti saranno eliminati per sempre. Questa azione è irreversibile."
   },
   "modpack-scan-modal.delete-all-groups.error": {
     "message": "Errore nell'eliminazione dei gruppi: {error}"
@@ -3801,7 +3801,7 @@
     "message": "Elimina tutti i gruppi"
   },
   "project.settings.permissions.delete-all-groups-confirmation.description": {
-    "message": "{count, plural, one {Questo gruppo di attribuzione} other {Questi # gruppi di attribuzione}} e i file all'interno saranno rimossi per sempre da questo progetto. Quest'azione non può essere annullata."
+    "message": "{count, plural, one {Il gruppo di attribuzione del progetto e i suoi} other {# gruppi di attribuzione del progetto e i loro}} contenuti saranno eliminati per sempre. Questa azione è irreversibile."
   },
   "project.settings.permissions.delete-all-groups-confirmation.title": {
     "message": "Eliminare tutti i gruppi di attribuzione?"
@@ -3917,6 +3917,24 @@
   "project.settings.tags.featured-tags": {
     "message": "Tag in evidenza"
   },
+  "project.settings.tags.featured-tags-required": {
+    "message": "Devi avere almeno un tag in evidenza."
+  },
+  "project.settings.tags.featured-tags-select-description": {
+    "message": "Seleziona i tag più pertinenti. Questi sono mostrati prima degli altri tag."
+  },
+  "project.settings.tags.group-title.categories": {
+    "message": "{showType, select, yes {{types}: categorie} other {Categorie}}"
+  },
+  "project.settings.tags.group-title.features": {
+    "message": "{showType, select, yes {{types}: caratteristiche} other {Caratteristiche}}"
+  },
+  "project.settings.tags.group-title.performance-impact": {
+    "message": "{showType, select, yes {{types}: impatto} other {Impatto}}"
+  },
+  "project.settings.tags.group-title.resolutions": {
+    "message": "{showType, select, yes {{types}: risoluzioni} other {Risoluzioni}}"
+  },
   "project.settings.tags.multiple-resolution-tags-warning": {
     "message": "Hai selezionato {count} tag di risoluzione ({tags}). I pacchetti di risorse dovrebbero averne solo uno."
   },
@@ -5190,7 +5208,7 @@
     "message": "Tutte le versioni"
   },
   "version.confirm-delete.description": {
-    "message": "Questa versione verrà eliminata permanentemente. Questa azione non può essere annullata."
+    "message": "La versione sarà eliminata per sempre. Questa azione è irreversibile."
   },
   "version.confirm-delete.proceed": {
     "message": "Elimina versione"
diff --git a/apps/frontend/src/locales/ja-JP/index.json b/apps/frontend/src/locales/ja-JP/index.json
index 12b20205b3..e46d08e8aa 100644
--- a/apps/frontend/src/locales/ja-JP/index.json
+++ b/apps/frontend/src/locales/ja-JP/index.json
@@ -38,6 +38,9 @@
   "analytics.breakdown.country": {
     "message": "国 / 地域"
   },
+  "analytics.breakdown.dependent-on": {
+    "message": "次に依存"
+  },
   "analytics.breakdown.dependent-project-download": {
     "message": "依存プロジェクト"
   },
@@ -131,6 +134,18 @@
   "analytics.chart.empty.select-table-items": {
     "message": "以下の表から項目を選択して、データを可視化してください。"
   },
+  "analytics.chart.events.count-aria": {
+    "message": "{count, plural, one {# 件のイベント} other {# 件のイベント}}"
+  },
+  "analytics.chart.events.see-announcement": {
+    "message": "お知らせを見る"
+  },
+  "analytics.chart.legend.monetization-details.aria": {
+    "message": "収益に関する分析の詳細を表示"
+  },
+  "analytics.chart.legend.monetization-details.description": {
+    "message": "収益化に向けてModrinthを介して行われたビューとダウンロードのみが表示され、ダウンロードにはログインが必要です。"
+  },
   "analytics.chart.table-selection.top": {
     "message": "テーブル内の{itemType, select, project {{count, plural, other {プロジェクト}}} country {{count, plural, other {国}}} monetization {{count, plural, other {収益}}} downloadSource {{count, plural, other {ダウンロード元}}} downloadReason {{count, plural, other {ダウンロード理由}}} member {{count, plural, other {メンバー}}} projectVersion {{count, plural, other {プロジェクトバージョン}}} loader {{count, plural, other {ローダー}}} gameVersion {{count, plural, other {ゲームバージョン}}} other {{count, plural, other {項目}}}}上位 {count} 件を表示"
   },
@@ -140,6 +155,12 @@
   "analytics.chart.tooltip.dependent-project-version": {
     "message": "{dependentProject} は {dependencyProject} の {version} に依存しています"
   },
+  "analytics.chart.tooltip.no-data": {
+    "message": "データなし"
+  },
+  "analytics.chart.tooltip.pinned-aria": {
+    "message": "ピン留め"
+  },
   "analytics.chart.tooltip.total": {
     "message": "合計"
   },
@@ -269,9 +290,27 @@
   "analytics.project-event.project-approved": {
     "message": "承認済み"
   },
+  "analytics.project-event.project-private": {
+    "message": "プロジェクトを非公開に設定"
+  },
+  "analytics.project-event.project-status-changed": {
+    "message": "プロジェクトの状態が変更"
+  },
+  "analytics.project-event.project-unlisted": {
+    "message": "プロジェクトはリストにありません"
+  },
+  "analytics.project-event.version-released": {
+    "message": "{version} がリリースされました"
+  },
+  "analytics.project-event.version-uploaded": {
+    "message": "バージョンがアップロードされました"
+  },
   "analytics.project-status.approved": {
     "message": "承認済み"
   },
+  "analytics.project-status.archived": {
+    "message": "アーカイブ済み"
+  },
   "analytics.project-status.draft": {
     "message": "ドラフト"
   },
@@ -281,6 +320,9 @@
   "analytics.project-status.private": {
     "message": "非公開"
   },
+  "analytics.project-status.rejected": {
+    "message": "却下"
+  },
   "analytics.project-status.unlisted": {
     "message": "限定公開"
   },
@@ -741,7 +783,7 @@
     "message": "アカウント設定"
   },
   "auth.verify-email.action.discover-mods": {
-    "message": "早速Modを探す"
+    "message": "Modを探す"
   },
   "auth.verify-email.already-verified.description": {
     "message": "メールアドレスはすでに承認されています！"
@@ -2022,7 +2064,7 @@
     "message": "プランを選択"
   },
   "landing.button.discover-mods": {
-    "message": "Modを探索する"
+    "message": "Modを探す"
   },
   "landing.button.go-to-dashboard": {
     "message": "ダッシュボードへ移動"
@@ -2043,7 +2085,7 @@
     "message": "検索結果やホームページ、Discordサーバー、そして今後追加される様々なルートを通じて、数千人ものユーザーにあなたのプロジェクトを見つけてもらいましょう！"
   },
   "landing.creator.feature.discovery.title": {
-    "message": "探索"
+    "message": "発見"
   },
   "landing.creator.feature.diverse-ecosystem.description": {
     "message": "Minotaurを使ってビルドツールと連携すれば、新バージョンのリリースと同時に自動アップロードが可能です。"
@@ -2933,6 +2975,27 @@
   "project.moderation.admonition.draft.header": {
     "message": "ドラフト"
   },
+  "project.moderation.admonition.under-review.body.1": {
+    "message": "あなたのプロジェクトはモデレーターによる審査待ちとなっております。"
+  },
+  "project.moderation.admonition.under-review.body.2": {
+    "message": "あなたのプロジェクトはスキャンされ、その後、人間のモデレーターによって審査され、Modrinth の <rules-link>コンテンツルール</rules-link> および <terms-link>利用規約</terms-link> に準拠しているかどうかが確認されます。"
+  },
+  "project.moderation.admonition.under-review.body.3": {
+    "message": "審査を待っている間もプロジェクトを編集することができます。編集をしても審査の順番が変わるわけではございません。"
+  },
+  "project.moderation.admonition.under-review.body.4": {
+    "message": "提出されたプロジェクトは24～48時間以内に審査することを目指していますが、プロジェクトによっては遅れが発生してしまう場合があります。プロジェクトに問題があることを意味するというわけではありません。"
+  },
+  "project.moderation.admonition.under-review.body.4.alt-week": {
+    "message": "プロジェクトの審査は1週間以内に行うことを目標としていますが遅れが発生してしまう場合がございます。プロジェクトに問題があることを意味するというわけではありません。"
+  },
+  "project.moderation.admonition.under-review.body.5": {
+    "message": "<emphasis>モデレーターがModrinthの安全を守るために尽くしております。ご協力お願いします。皆様のプロジェクト審査をサポートできることを楽しみにしております💚</emphasis>"
+  },
+  "project.moderation.admonition.under-review.header": {
+    "message": "プロジェクトは審査中です"
+  },
   "project.moderation.title": {
     "message": "管理"
   },
diff --git a/apps/frontend/src/locales/nl-NL/index.json b/apps/frontend/src/locales/nl-NL/index.json
index 6e52d55ba4..3737f3dd03 100644
--- a/apps/frontend/src/locales/nl-NL/index.json
+++ b/apps/frontend/src/locales/nl-NL/index.json
@@ -3926,9 +3926,27 @@
   "project.settings.tags.featured-tags": {
     "message": "Uitgelichte tags"
   },
+  "project.settings.tags.featured-tags-required": {
+    "message": "Je moet minstens één uitgelichte tag hebben."
+  },
+  "project.settings.tags.featured-tags-select-description": {
+    "message": "Kies je meest relevante tags. Deze worden vóór de overige tags weergegeven."
+  },
   "project.settings.tags.features-description": {
     "message": "Selecteer alle functies waarvan je {type} gebruikmaakt."
   },
+  "project.settings.tags.group-title.categories": {
+    "message": "{showType, select, yes {{types} categorieën} other {Categorieën}}"
+  },
+  "project.settings.tags.group-title.features": {
+    "message": "{showType, select, yes {{types} functies} other {Functies}}"
+  },
+  "project.settings.tags.group-title.performance-impact": {
+    "message": "{showType, select, yes {{types} invloed op de prestaties} other {Invloed op de prestaties}}"
+  },
+  "project.settings.tags.group-title.resolutions": {
+    "message": "{showType, select, yes {{types} resoluties} other {Resoluties}}"
+  },
   "project.settings.tags.multiple-resolution-tags-warning": {
     "message": "Je hebt {count} resolutietags ({tags}) geselecteerd. Bronpakketten zouden normaal gesproken slechts één resolutietag moeten hebben."
   },
diff --git a/apps/frontend/src/locales/pl-PL/index.json b/apps/frontend/src/locales/pl-PL/index.json
index 28d9253571..ad21f7072c 100644
--- a/apps/frontend/src/locales/pl-PL/index.json
+++ b/apps/frontend/src/locales/pl-PL/index.json
@@ -3854,6 +3854,9 @@
   "project.settings.server.languages-label": {
     "message": "Języki"
   },
+  "project.settings.server.latency-label": {
+    "message": "Opóźnienie: {latency}ms"
+  },
   "project.settings.server.optional-label": {
     "message": "opcjonalne"
   },
diff --git a/apps/frontend/src/locales/pt-BR/index.json b/apps/frontend/src/locales/pt-BR/index.json
index c43bc191b6..a33ea06456 100644
--- a/apps/frontend/src/locales/pt-BR/index.json
+++ b/apps/frontend/src/locales/pt-BR/index.json
@@ -3929,9 +3929,27 @@
   "project.settings.tags.featured-tags": {
     "message": "Etiquetas em destaque"
   },
+  "project.settings.tags.featured-tags-required": {
+    "message": "Você deve ter pelo menos uma marcação em destaque."
+  },
+  "project.settings.tags.featured-tags-select-description": {
+    "message": "Selecione suas marcações mais relevantes. Estas serão exibidas antes das outras marcações."
+  },
   "project.settings.tags.features-description": {
     "message": "Selecione todas as funcionalidades que o seu {type} utiliza."
   },
+  "project.settings.tags.group-title.categories": {
+    "message": "{showType, select, yes {{types} categorias} other {Categorias}}"
+  },
+  "project.settings.tags.group-title.features": {
+    "message": "{showType, select, yes {{types} recursos} other {Recursos}}"
+  },
+  "project.settings.tags.group-title.performance-impact": {
+    "message": "{showType, select, yes {{types} impacto no desempenho} other {Impacto no desempenho}}"
+  },
+  "project.settings.tags.group-title.resolutions": {
+    "message": "{showType, select, yes {{types} resoluções} other {Resoluções}}"
+  },
   "project.settings.tags.multiple-resolution-tags-warning": {
     "message": "Você selecionou {count} etiquetas de resolução ({tags}). Os pacotes de recursos devem normalmente ter apenas uma etiqueta de resolução."
   },
diff --git a/apps/frontend/src/locales/ru-RU/index.json b/apps/frontend/src/locales/ru-RU/index.json
index dc0d3de738..79eed0f35f 100644
--- a/apps/frontend/src/locales/ru-RU/index.json
+++ b/apps/frontend/src/locales/ru-RU/index.json
@@ -3920,9 +3920,27 @@
   "project.settings.tags.featured-tags": {
     "message": "Ключевые теги"
   },
+  "project.settings.tags.featured-tags-required": {
+    "message": "Необходим хотя бы один ключевой тег."
+  },
+  "project.settings.tags.featured-tags-select-description": {
+    "message": "Выберите наиболее подходящие теги. Они видны первыми."
+  },
   "project.settings.tags.features-description": {
     "message": "Выберите все особенности, которые использует ваш {type}"
   },
+  "project.settings.tags.group-title.categories": {
+    "message": "{showType, select, yes {{types}: категории} other {Категории}}"
+  },
+  "project.settings.tags.group-title.features": {
+    "message": "{showType, select, yes {{types}: особенности} other {Особенности}}"
+  },
+  "project.settings.tags.group-title.performance-impact": {
+    "message": "{showType, select, yes {{types}: требования} other {Требования}}"
+  },
+  "project.settings.tags.group-title.resolutions": {
+    "message": "{showType, select, yes {{types}: разрешения} other {Разрешения}}"
+  },
   "project.settings.tags.performance-impact-description": {
     "message": "Выберите реалистичное влияние на производительность вашего {type}. Выберите несколько, если {type} можно конфигурировать разными уровнями влияния на производительность."
   },
diff --git a/apps/frontend/src/locales/sv-SE/index.json b/apps/frontend/src/locales/sv-SE/index.json
index 180fefda8c..639c183cb6 100644
--- a/apps/frontend/src/locales/sv-SE/index.json
+++ b/apps/frontend/src/locales/sv-SE/index.json
@@ -137,6 +137,18 @@
   "analytics.chart.render-limit.header": {
     "message": "Visa alla {count} linjer i grafen?"
   },
+  "analytics.chart.table-selection.all": {
+    "message": "Visar alla {itemType, select, project {{count, plural, one {projekt} other {projekt}}} country {{count, plural, one {länder} other {länder}}} monetization {{count, plural, one {intäktsvärden} other {intäktsvärden}}} downloadSource {{count, plural, one {nedladdningskälla} other {nedladdningskälla}}} downloadReason {{count, plural, one {nedladdningsanledningar} other {nedladdningsanledningar}}} member {{count, plural, one {medlemmar} other {medlemmar}}} projectVersion {{count, plural, one {projektversioner} other {projektversioner}}} loader {{count, plural, one {loaders} other {loaders}}} gameVersion {{count, plural, one {spelversioner} other {spelversioner}}} other {{count, plural, one {föremål} other {föremål}}}} från tabellen"
+  },
+  "analytics.chart.table-selection.count": {
+    "message": "Visar {count} {itemType, select, project {{count, plural, one {projekt} other {projekt}}} country {{count, plural, one {land} other {länder}}} monetization {{count, plural, one {intäktsvärde} other {intäktsvärden}}} downloadSource {{count, plural, one {nedladdningskälla} other {nedladdningskällor}}} downloadReason {{count, plural, one {nedladdningsanledning} other {nedladdningsanledningar}}} member {{count, plural, one {medlem} other {medlemmar}}} projectVersion {{count, plural, one {projektversion} other {projektversioner}}} loader {{count, plural, one {loader} other {loaders}}} gameVersion {{count, plural, one {spelversion} other {spelversioner}}} other {{count, plural, one {föremål} other {föremål}}}} från tabellen"
+  },
+  "analytics.chart.table-selection.limited": {
+    "message": "Visar {limit} {itemType, select, project {{limit, plural, one {projekt} other {projekt}}} country {{limit, plural, one {land} other {länder}}} monetization {{limit, plural, one {intäktsvärde} other {intäktsvärden}}} downloadSource {{limit, plural, one {nedladdningskälla} other {nedladdningskällor}}} downloadReason {{limit, plural, one {nedladdningsanledning} other {nedladdningsanledningar}}} member {{limit, plural, one {medlem} other {medlemmar}}} projectVersion {{limit, plural, one {projektversion} other {projektversioner}}} loader {{limit, plural, one {loader} other {loaders}}} gameVersion {{limit, plural, one {spelversion} other {spelversioner}}} other {{limit, plural, one {föremål} other {föremål}}}} från tabellen"
+  },
+  "analytics.chart.table-selection.top": {
+    "message": "Visar topp {count} {itemType, select, project {{count, plural, one {projekt} other {projekt}}} country {{count, plural, one {land} other {länder}}} monetization {{count, plural, one {intäktsvärde} other {intäktsvärden}}} downloadSource {{count, plural, one {nedladdningskälla} other {nedladdningskällor}}} downloadReason {{count, plural, one {nedladdningsanledning} other {nedladdningsanledningar}}} member {{count, plural, one {medlem} other {medlemmar}}} projectVersion {{count, plural, one {projektversion} other {projektversioner}}} loader {{count, plural, one {loader} other {loaders}}} gameVersion {{count, plural, one {spelversion} other {spelversioner}}} other {{count, plural, one {föremål} other {föremål}}}} från tabellen"
+  },
   "analytics.chart.tooltip.duration.days": {
     "message": "{count, plural, one {# dag} other {# dagar}}"
   },
@@ -149,6 +161,9 @@
   "analytics.chart.tooltip.hide-entry": {
     "message": "Visa {name} i grafen"
   },
+  "analytics.chart.tooltip.no-data": {
+    "message": "Ingen data"
+  },
   "analytics.chart.tooltip.pinned-aria": {
     "message": "Fästa"
   },
@@ -1055,6 +1070,9 @@
   "create-project-version.create-modal.stage.add-files.upload-file-aria-label": {
     "message": "Ladda upp fil"
   },
+  "create-project-version.create-modal.stage.add-files.upload-secondary-prompt": {
+    "message": "Dra och släpp filer eller klicka för att bläddra"
+  },
   "create-project-version.create-modal.stage.details.details-tab": {
     "message": "Detaljer"
   },
@@ -2627,6 +2645,18 @@
   "layout.publish.email-verification-required.title": {
     "message": "E-post verifikation behövs"
   },
+  "modal.shared-instance.open-in-app.benefit.join": {
+    "message": "Spela samma inntehåll som dina vänner"
+  },
+  "modal.shared-instance.open-in-app.opening-automatically": {
+    "message": "Modrinth App kommer öppnas automatiskt..."
+  },
+  "modal.shared-instance.open-in-app.title": {
+    "message": "Öppnar Modrinth App"
+  },
+  "modal.shared-instance.open-in-app.why-use": {
+    "message": "Varför använda Modrinth App"
+  },
   "moderation.moderate": {
     "message": "Moderera"
   },
@@ -3011,6 +3041,9 @@
   "project.description.title": {
     "message": "Beskrivning"
   },
+  "project.download.compatible-version-title": {
+    "message": "Kompatibla versioner"
+  },
   "project.download.dependency-download-file": {
     "message": "Ladda ner {filename}"
   },
@@ -3032,6 +3065,9 @@
   "project.download.game-version-unsupported-tooltip": {
     "message": "{title} stöttar inte {gameVersion} för {platform}"
   },
+  "project.download.install-with-app": {
+    "message": "Installera med Modrinth App"
+  },
   "project.download.manually": {
     "message": "Ladda ner manuellt"
   },
@@ -3068,6 +3104,9 @@
   "project.download.title": {
     "message": "Ladda ner {title}"
   },
+  "project.download.unknown-loader": {
+    "message": "Okänd loader"
+  },
   "project.download.zip-failed-text": {
     "message": "En eller fler filer kunde inte laddas ner. Vänligen försök igen."
   },
@@ -3107,9 +3146,15 @@
   "project.moderation.admonition.approved.body.public": {
     "message": "Ditt projekt är publicerat och upptäckbart på Modrinth."
   },
+  "project.moderation.admonition.approved.body.visibility-message": {
+    "message": "Du kan ändra synligheten av ditt projekt i projektets <visibility-settings-link>synlighetsinställningar</visibility-settings-link>."
+  },
   "project.moderation.admonition.approved.header": {
     "message": "Projekt godkänt"
   },
+  "project.moderation.admonition.draft.header": {
+    "message": "Projektutkast"
+  },
   "project.moderation.admonition.under-review.header": {
     "message": "Projekt under granskning"
   },
@@ -3179,6 +3224,9 @@
   "project.settings.permissions.delete-all-groups": {
     "message": "Radera alla grupper"
   },
+  "project.settings.permissions.expand-all": {
+    "message": "Utöka alla"
+  },
   "project.settings.permissions.learn-more": {
     "message": "Läs mer"
   },
@@ -3188,6 +3236,9 @@
   "project.settings.permissions.search-placeholder": {
     "message": "Sök projekt..."
   },
+  "project.settings.permissions.sort.rejected": {
+    "message": "Nekad"
+  },
   "project.settings.permissions.sort.status": {
     "message": "Status"
   },
@@ -3206,6 +3257,9 @@
   "project.settings.server.languages-label": {
     "message": "Språk"
   },
+  "project.settings.server.optional-label": {
+    "message": "valfri"
+  },
   "project.settings.server.region-label": {
     "message": "Region"
   },
@@ -3584,6 +3638,9 @@
   "servers.notice.level": {
     "message": "Nivå"
   },
+  "servers.notices.no-notices": {
+    "message": "Inga notiser"
+  },
   "servers.plan.large.description": {
     "message": "Perfekt för 15–25 spelare, modpaket, eller tungt moddande."
   },
@@ -3596,6 +3653,24 @@
   "servers.purchase.step.plan.most-popular": {
     "message": "Populärast"
   },
+  "settings.account.data-export.action.download": {
+    "message": "Ladda ner export"
+  },
+  "settings.account.data-export.action.generate": {
+    "message": "Skapa export"
+  },
+  "settings.account.data-export.action.generating": {
+    "message": "Skapar export..."
+  },
+  "settings.account.data-export.description": {
+    "message": "Begär en kopia av all din personlig data som du har laddat upp till Modrinth. Det här kan ta flera minuter att göra."
+  },
+  "settings.account.data-export.title": {
+    "message": "Data export"
+  },
+  "settings.account.delete.confirm.description": {
+    "message": "Du kommer **direkt att radera all din användar data och följande**. Det här kommer inte radera dina projekt. Kontoradering kan inte ångras.<br><br>Om du behöver hjälp med ditt konto kan du få hjälp på [Modrinth Discord](https://discord.modrinth.com)."
+  },
   "settings.account.delete.confirm.proceed": {
     "message": "Radera kontot"
   },
@@ -3728,6 +3803,9 @@
   "settings.account.security.password.title": {
     "message": "Lösenord"
   },
+  "settings.account.security.providers.action.manage": {
+    "message": "Hantera leverantörer"
+  },
   "settings.account.security.providers.description": {
     "message": "Lägg till eller ta bort inloggningsmetoder från ditt konto, inklusive GitHub, GitLab, Microsoft, Discord, Steam och Google."
   },
@@ -3815,9 +3893,15 @@
   "settings.applications.delete.confirm.button": {
     "message": "Radera applikationen"
   },
+  "settings.applications.delete.confirm.title": {
+    "message": "Är du säker på att du vill radera den här applikationen?"
+  },
   "settings.applications.field.description": {
     "message": "Beskrivning"
   },
+  "settings.applications.field.description.placeholder": {
+    "message": "Ange applikationens beskrivning..."
+  },
   "settings.applications.field.icon": {
     "message": "Ikon"
   },
@@ -3872,6 +3956,9 @@
   "settings.authorizations.head-title": {
     "message": "Autentiseringar"
   },
+  "settings.authorizations.official-tooltip": {
+    "message": "Den här appen är gjord av ett officiellt Modrinth-konto."
+  },
   "settings.authorizations.revoke.action": {
     "message": "Återkalla"
   },
@@ -4280,6 +4367,9 @@
   "version.confirm-delete.proceed": {
     "message": "Radera version"
   },
+  "version.confirm-delete.title": {
+    "message": "Är du säker på att du vill radera den här versionen?"
+  },
   "version.dependency.view-project": {
     "message": "Visa projekt"
   },
@@ -4321,5 +4411,11 @@
   },
   "version.notification.deleted-title": {
     "message": "Version raderad"
+  },
+  "version.supplementary-resources.copy-hash-sha1": {
+    "message": "Kopiera SHA-1"
+  },
+  "version.supplementary-resources.copy-hash-sha512": {
+    "message": "Kopiera SHA-512"
   }
 }
diff --git a/apps/frontend/src/locales/uk-UA/index.json b/apps/frontend/src/locales/uk-UA/index.json
index f85db2798d..f5a0c3b5f1 100644
--- a/apps/frontend/src/locales/uk-UA/index.json
+++ b/apps/frontend/src/locales/uk-UA/index.json
@@ -3926,9 +3926,15 @@
   "project.settings.tags.featured-tags": {
     "message": "Основні теґи"
   },
+  "project.settings.tags.featured-tags-select-description": {
+    "message": "Оберіть найдоречніші теґи. Вони показуватимуться першими."
+  },
   "project.settings.tags.features-description": {
     "message": "Оберіть увесь функціонал, який присутній у {type}."
   },
+  "project.settings.tags.group-title.categories": {
+    "message": "{showType, select, yes {{types} категорії} other {Категорії}}"
+  },
   "project.settings.tags.multiple-resolution-tags-warning": {
     "message": "Ви обрали {count} теґів роздільної здатності ({tags}). Пакети ресурсів зазвичай повинні містити тільки один теґ роздільної здатності."
   },
diff --git a/apps/frontend/src/locales/zh-CN/index.json b/apps/frontend/src/locales/zh-CN/index.json
index f556e930cc..40eaa4e281 100644
--- a/apps/frontend/src/locales/zh-CN/index.json
+++ b/apps/frontend/src/locales/zh-CN/index.json
@@ -3929,9 +3929,27 @@
   "project.settings.tags.featured-tags": {
     "message": "精选标签"
   },
+  "project.settings.tags.featured-tags-required": {
+    "message": "您必须至少有一个精选标签。"
+  },
+  "project.settings.tags.featured-tags-select-description": {
+    "message": "选择您最相关的标签，这些标签将显示在您其余标签之前。"
+  },
   "project.settings.tags.features-description": {
     "message": "选择你的{type}作用于哪类特性。"
   },
+  "project.settings.tags.group-title.categories": {
+    "message": "{showType, select, yes {{types} 类别} other {类别}}"
+  },
+  "project.settings.tags.group-title.features": {
+    "message": "{showType, select, yes {{types} 功能} other {功能}}"
+  },
+  "project.settings.tags.group-title.performance-impact": {
+    "message": "{showType, select, yes {{types} 性能影响} other {性能影响}}"
+  },
+  "project.settings.tags.group-title.resolutions": {
+    "message": "{showType, select, yes {{types} 功能} other {功能}}"
+  },
   "project.settings.tags.multiple-resolution-tags-warning": {
     "message": "你选择了 {count} 个分辨率标签（{tags}）。资源包通常应仅保留一个标签。"
   },
diff --git a/apps/frontend/src/locales/zh-TW/index.json b/apps/frontend/src/locales/zh-TW/index.json
index acc1d22e3a..dd80cf2123 100644
--- a/apps/frontend/src/locales/zh-TW/index.json
+++ b/apps/frontend/src/locales/zh-TW/index.json
@@ -3929,9 +3929,27 @@
   "project.settings.tags.featured-tags": {
     "message": "精選標籤"
   },
+  "project.settings.tags.featured-tags-required": {
+    "message": "你必須選擇至少一個精選標籤。"
+  },
+  "project.settings.tags.featured-tags-select-description": {
+    "message": "請選擇最相關的標籤。這些標籤會顯示在其他標籤之前。"
+  },
   "project.settings.tags.features-description": {
     "message": "請選擇你的{type}包含的功能。"
   },
+  "project.settings.tags.group-title.categories": {
+    "message": "{showType, select, yes {{types}類別} other {類別}}"
+  },
+  "project.settings.tags.group-title.features": {
+    "message": "{showType, select, yes {{types}功能} other {功能}}"
+  },
+  "project.settings.tags.group-title.performance-impact": {
+    "message": "{showType, select, yes {{types}效能影響} other {效能影響}}"
+  },
+  "project.settings.tags.group-title.resolutions": {
+    "message": "{showType, select, yes {{types}解析度} other {解析度}}"
+  },
   "project.settings.tags.multiple-resolution-tags-warning": {
     "message": "你選擇了 {count} 個解析度標籤（{tags}）。資源包通常應該只會有一個解析度標籤。"
   },
diff --git a/packages/moderation/src/locales/ar-SA/index.json b/packages/moderation/src/locales/ar-SA/index.json
index f9bb26c9df..6e69d95dcf 100644
--- a/packages/moderation/src/locales/ar-SA/index.json
+++ b/packages/moderation/src/locales/ar-SA/index.json
@@ -273,3 +273,4 @@
     "defaultMessage": "زيارة إعدادات الروابط"
   }
 }
+
diff --git a/packages/moderation/src/locales/cs-CZ/index.json b/packages/moderation/src/locales/cs-CZ/index.json
index d5f0c28f7c..3cf2bb781f 100644
--- a/packages/moderation/src/locales/cs-CZ/index.json
+++ b/packages/moderation/src/locales/cs-CZ/index.json
@@ -251,6 +251,9 @@
   "nags.upload-gallery-image.description": {
     "defaultMessage": "Je vyžadován alespoň jeden obrázek v galerii pro zobrazení obsahu vašeho {type}."
   },
+  "nags.upload-gallery-image.description-shader": {
+    "defaultMessage": "K prezentaci obsahu vašeho shaderu v různých situacích a podmínkách jsou vyžadovány alespoň tři obrázky v galerii."
+  },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "Nahrajte obrázek do galerie"
   },
@@ -270,3 +273,4 @@
     "defaultMessage": "Přejděte do nastavení odkazů"
   }
 }
+
diff --git a/packages/moderation/src/locales/de-CH/index.json b/packages/moderation/src/locales/de-CH/index.json
index 8984fc8a99..77572d199e 100644
--- a/packages/moderation/src/locales/de-CH/index.json
+++ b/packages/moderation/src/locales/de-CH/index.json
@@ -254,6 +254,12 @@
   "nags.upload-gallery-image.description": {
     "defaultMessage": "Es wird mindestens ein Galeriebild benötigt, um den Inhalt deines/deiner {type} zu präsentieren."
   },
+  "nags.upload-gallery-image.description-resourcepack": {
+    "defaultMessage": "Mindestens ein Galeriebild wird benötigt, um den Inhalt deines Ressourcenpakets zu präsentieren, außer bei Audio- oder Lokalisierungspaketen. Falls das auf dein Paket zutrifft, wähle bitte den entsprechenden Tag aus."
+  },
+  "nags.upload-gallery-image.description-shader": {
+    "defaultMessage": "Mindestens drei Galeriebilder werden benötigt, um den Inhalt deines Shaders in einer Vielzahl von Situationen und Bedingungen darzustellen."
+  },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "Lade ein Galeriebild hoch"
   },
@@ -273,3 +279,4 @@
     "defaultMessage": "Link-Einstellungen ansehen"
   }
 }
+
diff --git a/packages/moderation/src/locales/de-DE/index.json b/packages/moderation/src/locales/de-DE/index.json
index 58ea3d1898..f92d5f1171 100644
--- a/packages/moderation/src/locales/de-DE/index.json
+++ b/packages/moderation/src/locales/de-DE/index.json
@@ -254,6 +254,12 @@
   "nags.upload-gallery-image.description": {
     "defaultMessage": "Es ist mindestens ein Galeriebild erforderlich, um den Inhalt deines {type} zu präsentieren."
   },
+  "nags.upload-gallery-image.description-resourcepack": {
+    "defaultMessage": "Mindestens ein Galeriebild wird benötigt, um den Inhalt deines Ressourcenpakets zu präsentieren, außer bei Audio- oder Lokalisierungspaketen. Falls das auf dein Paket zutrifft, wähle bitte den entsprechenden Tag aus."
+  },
+  "nags.upload-gallery-image.description-shader": {
+    "defaultMessage": "Mindestens drei Galeriebilder werden benötigt, um den Inhalt deines Shaders in einer Vielzahl von Situationen und Bedingungen darzustellen."
+  },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "Galeriebild hochladen"
   },
@@ -273,3 +279,4 @@
     "defaultMessage": "Linkeinstellungen ansehen"
   }
 }
+
diff --git a/packages/moderation/src/locales/es-419/index.json b/packages/moderation/src/locales/es-419/index.json
index c4d7c9e886..fd353a00cb 100644
--- a/packages/moderation/src/locales/es-419/index.json
+++ b/packages/moderation/src/locales/es-419/index.json
@@ -6,7 +6,7 @@
     "defaultMessage": "Agrega una descripción"
   },
   "nags.add-icon.description": {
-    "defaultMessage": "Añade un ícono único, relevante y atractivo hace que tu proyecto sea fácilmente identificable y destaque."
+    "defaultMessage": "Añade un ícono único, relevante y atractivo hace que tu proyecto destaque y sea fácilmente identificable."
   },
   "nags.add-icon.title": {
     "defaultMessage": "Añade un ícono"
@@ -15,7 +15,7 @@
     "defaultMessage": "Agrega la dirección IP y el puerto que los jugadores de Java Edition pueden usar para unirse a tu servidor."
   },
   "nags.add-java-address.title": {
-    "defaultMessage": "Agrega una dirección de Java"
+    "defaultMessage": "Añade una dirección de Java"
   },
   "nags.add-license-details.description": {
     "defaultMessage": "Añadir un URL y un nombre o identificador SPDX para tu licencia personalizada."
@@ -24,13 +24,13 @@
     "defaultMessage": "Añadir detalles de licencia"
   },
   "nags.add-links-server.description": {
-    "defaultMessage": "Agrega cualquier enlace relevante que esté fuera de Modrinth, cómo un sitio web, tienda, o una invitación de Discord."
+    "defaultMessage": "Añade cualquier enlace relevante que esté fuera de Modrinth, cómo un sitio web, tienda, o una invitación de Discord."
   },
   "nags.add-links-server.title": {
-    "defaultMessage": "Agrega enlaces externos"
+    "defaultMessage": "Añade enlaces externos"
   },
   "nags.add-links.description": {
-    "defaultMessage": "Agrega cualquier enlace relevante fuera de Modrinth, como el código fuente, un rastreador de incidencias o una invitación de Discord."
+    "defaultMessage": "Añade cualquier enlace relevante fuera de Modrinth, como el código fuente, un rastreador de incidencias o una invitación de Discord."
   },
   "nags.add-links.title": {
     "defaultMessage": "Añadir enlaces externos"
@@ -105,7 +105,7 @@
     "defaultMessage": "La URL de tu licencia parece estar mal formada. Proporciona una URL válida para el texto de tu licencia."
   },
   "nags.invalid-license-url.title": {
-    "defaultMessage": "Agrega un enlace de licencia válido"
+    "defaultMessage": "Añade un enlace de licencia válido"
   },
   "nags.link-shortener-usage.description": {
     "defaultMessage": "Se prohíbe el uso de acortadores de enlaces u otros métodos para ocultar el destino de tus enlaces externos o de licencia. Usa únicamente enlaces completos."
@@ -254,6 +254,12 @@
   "nags.upload-gallery-image.description": {
     "defaultMessage": "Se requiere al menos una imagen en la galería para mostrar el contenido de tu {type}."
   },
+  "nags.upload-gallery-image.description-resourcepack": {
+    "defaultMessage": "Se necesita al menos una imagen para mostrar el contenido de tu paquete de recursos, excepto si es un paquete de audio o de localizaciones. Si esto describe tu paquete, por favor selecciona la etiqueta apropiada."
+  },
+  "nags.upload-gallery-image.description-shader": {
+    "defaultMessage": "Se necesitan al menos tres imágenes para mostrar el contenido de tu shader en una variedad de situaciones y condiciones."
+  },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "Subir una imagen a la galería"
   },
@@ -273,3 +279,4 @@
     "defaultMessage": "Ver configuración de enlaces"
   }
 }
+
diff --git a/packages/moderation/src/locales/es-ES/index.json b/packages/moderation/src/locales/es-ES/index.json
index 38a937efe3..c5c2ad75fd 100644
--- a/packages/moderation/src/locales/es-ES/index.json
+++ b/packages/moderation/src/locales/es-ES/index.json
@@ -270,3 +270,4 @@
     "defaultMessage": "Visitar la configuración de enlaces"
   }
 }
+
diff --git a/packages/moderation/src/locales/fil-PH/index.json b/packages/moderation/src/locales/fil-PH/index.json
index bf3b0bcc4f..e2f7de9c0a 100644
--- a/packages/moderation/src/locales/fil-PH/index.json
+++ b/packages/moderation/src/locales/fil-PH/index.json
@@ -246,3 +246,4 @@
     "defaultMessage": "Bisitahin ang mga setting sa mga link"
   }
 }
+
diff --git a/packages/moderation/src/locales/fr-FR/index.json b/packages/moderation/src/locales/fr-FR/index.json
index 50cc42d5be..512411ec5f 100644
--- a/packages/moderation/src/locales/fr-FR/index.json
+++ b/packages/moderation/src/locales/fr-FR/index.json
@@ -254,6 +254,12 @@
   "nags.upload-gallery-image.description": {
     "defaultMessage": "Au moins une image dans la galerie est nécessaire pour montrer le contenu de votre {type}."
   },
+  "nags.upload-gallery-image.description-resourcepack": {
+    "defaultMessage": "Au moins une image de galerie est requise pour présenter le contenu de votre pack de ressources, sauf s'il s'agit d'un pack audio ou de localisation. Si c'est le cas, veuillez sélectionner le tag approprié."
+  },
+  "nags.upload-gallery-image.description-shader": {
+    "defaultMessage": "Au moins trois images de galerie sont requises pour présenter le contenu de votre shader dans une variété de situations."
+  },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "Ajouter une image à la galerie"
   },
@@ -273,3 +279,4 @@
     "defaultMessage": "Accéder aux paramètres des liens"
   }
 }
+
diff --git a/packages/moderation/src/locales/hu-HU/index.json b/packages/moderation/src/locales/hu-HU/index.json
index 222f5131e5..3c31460e61 100644
--- a/packages/moderation/src/locales/hu-HU/index.json
+++ b/packages/moderation/src/locales/hu-HU/index.json
@@ -177,7 +177,7 @@
     "defaultMessage": "Nyelv kiválasztása"
   },
   "nags.select-license.description": {
-    "defaultMessage": "Válaszd ki a licencet ami a te {type} -od alapján megfelelő."
+    "defaultMessage": "Válaszd ki a licencet ami a te {type}ed alapján megfelelő."
   },
   "nags.select-license.title": {
     "defaultMessage": "Válassz egy licenszet"
@@ -273,3 +273,4 @@
     "defaultMessage": "Látogasd meg a linkbeállításokat"
   }
 }
+
diff --git a/packages/moderation/src/locales/id-ID/index.json b/packages/moderation/src/locales/id-ID/index.json
index 9c6f48aeed..5d28fc7de9 100644
--- a/packages/moderation/src/locales/id-ID/index.json
+++ b/packages/moderation/src/locales/id-ID/index.json
@@ -273,3 +273,4 @@
     "defaultMessage": "Kunjungi pengaturan tautan"
   }
 }
+
diff --git a/packages/moderation/src/locales/it-IT/index.json b/packages/moderation/src/locales/it-IT/index.json
index 90d03751b3..d1ffb35a87 100644
--- a/packages/moderation/src/locales/it-IT/index.json
+++ b/packages/moderation/src/locales/it-IT/index.json
@@ -245,6 +245,12 @@
   "nags.too-many-tags.title": {
     "defaultMessage": "Seleziona i tag pertinenti"
   },
+  "nags.upload-gallery-image.description-resourcepack": {
+    "defaultMessage": "È necessaria almeno un'immagine che mostri il contenuto del tuo pacchetto di risorse, a meno che contenga solo audio o traduzioni. In tal caso seleziona il tag appropriato."
+  },
+  "nags.upload-gallery-image.description-shader": {
+    "defaultMessage": "Sono necessarie almeno tre immagini che dimostrino le tue shader in varie situazioni e condizioni."
+  },
   "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 229782a1b8..5375c507f6 100644
--- a/packages/moderation/src/locales/ja-JP/index.json
+++ b/packages/moderation/src/locales/ja-JP/index.json
@@ -254,6 +254,12 @@
   "nags.upload-gallery-image.description": {
     "defaultMessage": "{type}の内容を展示するには、少なくとも１枚の画像が必要です。"
   },
+  "nags.upload-gallery-image.description-resourcepack": {
+    "defaultMessage": "オーディオパックやローカライズパックを除き、リソースパックの内容を紹介するために少なくとも1枚のギャラリー画像が必要です。これらに該当するパックの場合は、適切なタグを選択してください。"
+  },
+  "nags.upload-gallery-image.description-shader": {
+    "defaultMessage": "シェーダーの様々なシチュエーションや環境での仕上がりを紹介するため、少なくとも3枚のギャラリー画像が必要です。"
+  },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "ギャラリー画像をアップロード"
   },
@@ -273,3 +279,4 @@
     "defaultMessage": "リンク設定を表示"
   }
 }
+
diff --git a/packages/moderation/src/locales/ko-KR/index.json b/packages/moderation/src/locales/ko-KR/index.json
index 701a829949..ea0cbcef99 100644
--- a/packages/moderation/src/locales/ko-KR/index.json
+++ b/packages/moderation/src/locales/ko-KR/index.json
@@ -273,3 +273,4 @@
     "defaultMessage": "링크 설정 방문"
   }
 }
+
diff --git a/packages/moderation/src/locales/ms-MY/index.json b/packages/moderation/src/locales/ms-MY/index.json
index fbc9e98d1c..02797f30d6 100644
--- a/packages/moderation/src/locales/ms-MY/index.json
+++ b/packages/moderation/src/locales/ms-MY/index.json
@@ -246,3 +246,4 @@
     "defaultMessage": "Kunjungi tetapan pautan"
   }
 }
+
diff --git a/packages/moderation/src/locales/nl-NL/index.json b/packages/moderation/src/locales/nl-NL/index.json
index a24accb510..3a4e100741 100644
--- a/packages/moderation/src/locales/nl-NL/index.json
+++ b/packages/moderation/src/locales/nl-NL/index.json
@@ -69,13 +69,13 @@
     "defaultMessage": "Pas de titel aan"
   },
   "nags.feature-gallery-image.description": {
-    "defaultMessage": "De uitgelichte galerij foto is hoe vaak je project zijn eerste indruk maakt."
+    "defaultMessage": "De uitgelichte afbeelding in de galerij is vaak de eerste indruk die je project achterlaat."
   },
   "nags.feature-gallery-image.title": {
-    "defaultMessage": "Licht een foto uit"
+    "defaultMessage": "Afbeelding uit de galerij uitlichten"
   },
   "nags.gallery.title": {
-    "defaultMessage": "Bezoek de galerij pagina"
+    "defaultMessage": "Bezoek de galerijpagina"
   },
   "nags.gpl-license-source-required.description": {
     "defaultMessage": "Je {type} maakt gebruik van een licentie die vereist dat de broncode beschikbaar is. Geef voor elke extra versie een link naar de broncode of het bronbestand op, of overweeg om een andere licentie te gebruiken."
@@ -254,8 +254,14 @@
   "nags.upload-gallery-image.description": {
     "defaultMessage": "Er is minstens één afbeelding in de galerij vereist om de inhoud van je {type} te tonen."
   },
+  "nags.upload-gallery-image.description-resourcepack": {
+    "defaultMessage": "Er is minstens één afbeelding in de galerij vereist om de inhoud van je bronpakket te laten zien, met uitzondering van audio- of lokalisatiepakketten. Als dit op jouw pakket van toepassing is, selecteer dan de juiste tag."
+  },
+  "nags.upload-gallery-image.description-shader": {
+    "defaultMessage": "Er zijn minstens drie afbeeldingen in de galerij nodig om de werking van je shader in verschillende situaties en omstandigheden te laten zien."
+  },
   "nags.upload-gallery-image.title": {
-    "defaultMessage": "Upload een galerijafbeelding"
+    "defaultMessage": "Afbeelding uit de galerij uploaden"
   },
   "nags.upload-version.description": {
     "defaultMessage": "Minimaal één versie is nodig om een project in te dienen voor beoordeling."
@@ -273,3 +279,4 @@
     "defaultMessage": "Bezoek linkjes instellingen"
   }
 }
+
diff --git a/packages/moderation/src/locales/pl-PL/index.json b/packages/moderation/src/locales/pl-PL/index.json
index 8b8d701a77..1ccf7e7147 100644
--- a/packages/moderation/src/locales/pl-PL/index.json
+++ b/packages/moderation/src/locales/pl-PL/index.json
@@ -273,3 +273,4 @@
     "defaultMessage": "Odwiedź ustawienia linków"
   }
 }
+
diff --git a/packages/moderation/src/locales/pt-BR/index.json b/packages/moderation/src/locales/pt-BR/index.json
index 2ff482ec93..47f7c7abb1 100644
--- a/packages/moderation/src/locales/pt-BR/index.json
+++ b/packages/moderation/src/locales/pt-BR/index.json
@@ -254,6 +254,12 @@
   "nags.upload-gallery-image.description": {
     "defaultMessage": "Pelo menos uma imagem de galeria é necessária para mostrar o conteúdo do seu {type}."
   },
+  "nags.upload-gallery-image.description-resourcepack": {
+    "defaultMessage": "Pelo menos uma imagem da galeria é necessária para destacar o conteúdo do seu pacote de recursos, exceto por pacotes de áudio ou localização. Se isso descreve seu pacote, selecione a marcação apropriada."
+  },
+  "nags.upload-gallery-image.description-shader": {
+    "defaultMessage": "Pelo menos três imagens são necessárias para destacar o conteúdo do seu shader em uma variedade de situações e condições."
+  },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "Envie uma imagem para a galeria"
   },
@@ -273,3 +279,4 @@
     "defaultMessage": "Visitar página de links"
   }
 }
+
diff --git a/packages/moderation/src/locales/ru-RU/index.json b/packages/moderation/src/locales/ru-RU/index.json
index 25618018dc..a053817fab 100644
--- a/packages/moderation/src/locales/ru-RU/index.json
+++ b/packages/moderation/src/locales/ru-RU/index.json
@@ -254,6 +254,12 @@
   "nags.upload-gallery-image.description": {
     "defaultMessage": "Нужно минимум одно изображение, чтобы показать контент, входящий в {type}."
   },
+  "nags.upload-gallery-image.description-resourcepack": {
+    "defaultMessage": "В галерее требуется хотя бы одно изображение, в котором показано содержимое набора ресурсов. Если он содержит только звуки или переводы, укажите это в тегах."
+  },
+  "nags.upload-gallery-image.description-shader": {
+    "defaultMessage": "В галерее требуется хотя бы три изображения, в которых показано содержимое шейдера в различных ситуациях и условиях."
+  },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "Добавьте изображения"
   },
@@ -273,3 +279,4 @@
     "defaultMessage": "Настроить ссылки"
   }
 }
+
diff --git a/packages/moderation/src/locales/sr-CS/index.json b/packages/moderation/src/locales/sr-CS/index.json
index 9436c9c66d..caeab0cba2 100644
--- a/packages/moderation/src/locales/sr-CS/index.json
+++ b/packages/moderation/src/locales/sr-CS/index.json
@@ -273,3 +273,4 @@
     "defaultMessage": "Posjeti podešavanja linkova"
   }
 }
+
diff --git a/packages/moderation/src/locales/sv-SE/index.json b/packages/moderation/src/locales/sv-SE/index.json
index 53353a1de6..77761756c4 100644
--- a/packages/moderation/src/locales/sv-SE/index.json
+++ b/packages/moderation/src/locales/sv-SE/index.json
@@ -51,7 +51,7 @@
     "defaultMessage": "Din beskrivning är {length, plural, one {# tecken} other {# tecken}} lång. Minst {minChars, plural, one {# tecken} other {# tecken}} rekommenderas för en klar och informativ beskrivning."
   },
   "nags.description-too-short.title": {
-    "defaultMessage": "Expandera beskrivningen"
+    "defaultMessage": "Utöka beskrivningen"
   },
   "nags.edit-description.title": {
     "defaultMessage": "Redigera beskrivning"
@@ -72,7 +72,7 @@
     "defaultMessage": "Den utvalda galleribilden är ofta hur ditt projekt gör sitt första intryck."
   },
   "nags.feature-gallery-image.title": {
-    "defaultMessage": "Välj ut en galleribild"
+    "defaultMessage": "Visa en galleribild"
   },
   "nags.gallery.title": {
     "defaultMessage": "Besök gallerisida"
@@ -87,19 +87,19 @@
     "defaultMessage": "Några av dina externa länkar ser ut att vara likadana. Varje länk ska bara anges en gång och med den passande länktypen."
   },
   "nags.identical-links.title": {
-    "defaultMessage": "Städa upp de identiska länkarna"
+    "defaultMessage": "Städa upp identiska länkar"
   },
   "nags.image-heavy-description.description": {
     "defaultMessage": "Din beskrivning ska ha tillräckligt med vanlig text eller bild-alternativtext, för att hålla det tillgängligt till de som använder skärmavläsare eller de med långsamma internetkopplingar."
   },
   "nags.image-heavy-description.title": {
-    "defaultMessage": "Se till att det är tillgängligt"
+    "defaultMessage": "Säkerställ tillgänglighet"
   },
   "nags.invalid-license-url.description.default": {
     "defaultMessage": "Licens-URL är ogiltig."
   },
   "nags.invalid-license-url.description.domain": {
-    "defaultMessage": "Din licens-URL pekar till {domain}, vilket inte är lämpligt för licensinformation. Licens-URL:er ska bara länka direkt till din licensfil, inte sociala medier, gaming-plattformar, osv."
+    "defaultMessage": "Din licens-URL leder till {domain}, vilket inte är lämpligt för licensinformation. Licens-URL:er ska länka direkt till din licensfil, inte sociala medier, spelplattformar, osv."
   },
   "nags.invalid-license-url.description.malformed": {
     "defaultMessage": "Din licens-URL ser ut att vara söndrig. Vänligen ange en URL till din licenstext."
@@ -141,7 +141,7 @@
     "defaultMessage": "Visa moderationstråd"
   },
   "nags.moderator-feedback.description": {
-    "defaultMessage": "Kolla igenom och ta upp problemen från moderationsteamet innan du skickar in det igen."
+    "defaultMessage": "Granska och ta upp alla bekymmer från moderationsteamet innan du skickar in det igen."
   },
   "nags.moderator-feedback.title": {
     "defaultMessage": "Läs återkoppling"
@@ -177,7 +177,7 @@
     "defaultMessage": "Välj språk"
   },
   "nags.select-license.description": {
-    "defaultMessage": "Välj licensen din {type} är utgiven under."
+    "defaultMessage": "Välj licensen ditt {type} är utgiven under."
   },
   "nags.select-license.title": {
     "defaultMessage": "Välj en licens"
@@ -210,7 +210,7 @@
     "defaultMessage": "Besök allmänna inställningar"
   },
   "nags.summary-same-as-title.description": {
-    "defaultMessage": "Din sammanfattning kan inte vara samma som ditt projekts namn. Det är viktigt att du skriver en sammanfattning som är informativ och lockande."
+    "defaultMessage": "Din sammanfattning kan inte vara samma som projektnamnet. Det är viktigt att skriva en informativ och lockande sammanfattning."
   },
   "nags.summary-same-as-title.title": {
     "defaultMessage": "Gör sammanfattningen unik"
@@ -222,13 +222,13 @@
     "defaultMessage": "Rensa upp sammanfattningen"
   },
   "nags.summary-too-short.description": {
-    "defaultMessage": "Din sammanfattning är {length, plural, one {# tecken} other {# tecken}} lång. Minst {minChars, plural, one {# tecken} other {# tecken}} rekommenderas för en informativ och lockande sammanfattning."
+    "defaultMessage": "Din sammanfattning är {length} tecken långt. Åtminstone {minChars} tecken rekommenderas för en informativ och lockande sammanfattning"
   },
   "nags.summary-too-short.title": {
     "defaultMessage": "Expandera sammanfattningen"
   },
   "nags.title-contains-technical-info.description": {
-    "defaultMessage": "Om du håller projektets namn rent blir det lättare att komma ihåg och hitta. Versions- och laddarinformation visas automatiskt tillsammans med ditt projekt."
+    "defaultMessage": "Om du håller projektetnamnet fint blir det minnesvärt och lättare att hitta. Versions- och laddarinformation visas automatiskt tillsammans med ditt projekt."
   },
   "nags.title-contains-technical-info.title": {
     "defaultMessage": "Rensa upp namnet"
@@ -243,16 +243,22 @@
     "defaultMessage": "Du har valt {tagCount, plural, one {# tagg} other {# taggar}}. Vänligen tänk på att minska till {maxTagCount} eller färre för att säkerställa att din server visas i relevanta sökresultat."
   },
   "nags.too-many-tags-server.title": {
-    "defaultMessage": "Välj korrekta taggar"
+    "defaultMessage": "Välj lämpliga taggar"
   },
   "nags.too-many-tags.description": {
     "defaultMessage": "Du har valt {tagCount, plural, one {# tagg} other {# taggar}}. Försök minska till {maxTagCount} eller färre för att säkerställa att ditt projekt visas i relevanta sökresultat."
   },
   "nags.too-many-tags.title": {
-    "defaultMessage": "Välj korrekta taggar"
+    "defaultMessage": "Välj lämpliga taggar"
   },
   "nags.upload-gallery-image.description": {
-    "defaultMessage": "Åtminstone en galleribild måste visa innehållet av din {type}."
+    "defaultMessage": "Minst en galleribild krävs för att visa innehållet i ditt {type}."
+  },
+  "nags.upload-gallery-image.description-resourcepack": {
+    "defaultMessage": "Minst en galleribild krävs för att visa innehållet i ditt resurspaket, utom för ljud- eller lokaliseringspaket. Beskriver det här ditt paket, vänligen välj lämplig tagg."
+  },
+  "nags.upload-gallery-image.description-shader": {
+    "defaultMessage": "Minst tre galleribilder krävs för att visa innehållet i din shader i flera olika situationer och förhållanden."
   },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "Ladda upp en galleribild"
@@ -273,3 +279,4 @@
     "defaultMessage": "Besök länkinställningar"
   }
 }
+
diff --git a/packages/moderation/src/locales/tr-TR/index.json b/packages/moderation/src/locales/tr-TR/index.json
index 80a9e491db..67eefb36d7 100644
--- a/packages/moderation/src/locales/tr-TR/index.json
+++ b/packages/moderation/src/locales/tr-TR/index.json
@@ -273,3 +273,4 @@
     "defaultMessage": "Bağlantı ayarlarına göz at"
   }
 }
+
diff --git a/packages/moderation/src/locales/uk-UA/index.json b/packages/moderation/src/locales/uk-UA/index.json
index 837dffa0bb..ff9479dd75 100644
--- a/packages/moderation/src/locales/uk-UA/index.json
+++ b/packages/moderation/src/locales/uk-UA/index.json
@@ -273,3 +273,4 @@
     "defaultMessage": "Відвідайте налаштування посилань"
   }
 }
+
diff --git a/packages/moderation/src/locales/vi-VN/index.json b/packages/moderation/src/locales/vi-VN/index.json
index e2081045c4..6fb2070ed7 100644
--- a/packages/moderation/src/locales/vi-VN/index.json
+++ b/packages/moderation/src/locales/vi-VN/index.json
@@ -273,3 +273,4 @@
     "defaultMessage": "Truy cập cài đặt liên kết"
   }
 }
+
diff --git a/packages/moderation/src/locales/zh-CN/index.json b/packages/moderation/src/locales/zh-CN/index.json
index 59b8434e14..23d1109b4a 100644
--- a/packages/moderation/src/locales/zh-CN/index.json
+++ b/packages/moderation/src/locales/zh-CN/index.json
@@ -252,7 +252,13 @@
     "defaultMessage": "选择准确的标签"
   },
   "nags.upload-gallery-image.description": {
-    "defaultMessage": "至少需要一个图像来展示你的 {type}的内容。"
+    "defaultMessage": "至少需提供一张图库图片，展示你的{type}内容。"
+  },
+  "nags.upload-gallery-image.description-resourcepack": {
+    "defaultMessage": "至少需提供一张图库图片，展示你的资源包内容。音频包或本地化包不在此限，若你的资源包属于此类，请选择相应标签。"
+  },
+  "nags.upload-gallery-image.description-shader": {
+    "defaultMessage": "至少需提供 3 张图库图片，展示你的光影包在不同场景和条件下的效果。"
   },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "上传图片至项目图库"
@@ -273,3 +279,4 @@
     "defaultMessage": "访问链接设置"
   }
 }
+
diff --git a/packages/moderation/src/locales/zh-TW/index.json b/packages/moderation/src/locales/zh-TW/index.json
index 3a3ef92a08..67c12cda62 100644
--- a/packages/moderation/src/locales/zh-TW/index.json
+++ b/packages/moderation/src/locales/zh-TW/index.json
@@ -254,6 +254,12 @@
   "nags.upload-gallery-image.description": {
     "defaultMessage": "需要至少一張圖庫圖片來展示你的{type}。"
   },
+  "nags.upload-gallery-image.description-resourcepack": {
+    "defaultMessage": "需要至少一張圖庫圖片來展示你的資源包內容（音效包或在地化語言包除外）。如果你的資源包屬於此類，請選擇對應的標籤。"
+  },
+  "nags.upload-gallery-image.description-shader": {
+    "defaultMessage": "需要至少三張圖庫圖片來展示你的光影包在各種情境與條件下的效果。"
+  },
   "nags.upload-gallery-image.title": {
     "defaultMessage": "上傳圖庫圖片"
   },
@@ -273,3 +279,4 @@
     "defaultMessage": "前往連結設定"
   }
 }
+
diff --git a/packages/ui/src/locales/cs-CZ/index.json b/packages/ui/src/locales/cs-CZ/index.json
index 56154cebc0..fbfe943185 100644
--- a/packages/ui/src/locales/cs-CZ/index.json
+++ b/packages/ui/src/locales/cs-CZ/index.json
@@ -4554,3 +4554,4 @@
     "defaultMessage": "Typ"
   }
 }
+
diff --git a/packages/ui/src/locales/da-DK/index.json b/packages/ui/src/locales/da-DK/index.json
index 71381b8a42..0a26f0a776 100644
--- a/packages/ui/src/locales/da-DK/index.json
+++ b/packages/ui/src/locales/da-DK/index.json
@@ -2250,3 +2250,4 @@
     "defaultMessage": "Vanilla Shader"
   }
 }
+
diff --git a/packages/ui/src/locales/de-CH/index.json b/packages/ui/src/locales/de-CH/index.json
index a5632aaf9a..baf3a3c1dd 100644
--- a/packages/ui/src/locales/de-CH/index.json
+++ b/packages/ui/src/locales/de-CH/index.json
@@ -2915,6 +2915,15 @@
   "profile.collection.projects-count": {
     "defaultMessage": "{count, plural, one {# Projekt} other {# Projekte}}"
   },
+  "profile.details.error.github-popup-blocked": {
+    "defaultMessage": "Erlaube Pop-Ups für Modrinth und versuche es erneut."
+  },
+  "profile.details.error.github-profile-message": {
+    "defaultMessage": "Das GitHub-Profil konnte nicht abgerufen werden. Bitte versuche es erneut."
+  },
+  "profile.details.error.github-profile-title": {
+    "defaultMessage": "Das GitHub-Profil konnte nicht geöffnet werden"
+  },
   "profile.details.label.auth-providers": {
     "defaultMessage": "Authentifizierungsanbieter"
   },
@@ -2927,9 +2936,15 @@
   "profile.details.label.has-totp": {
     "defaultMessage": "Hat TOTP"
   },
+  "profile.details.label.loading-github-profile": {
+    "defaultMessage": "Wird geladen..."
+  },
   "profile.details.label.payment-methods": {
     "defaultMessage": "Zahlungsmethoden"
   },
+  "profile.details.label.view-github-profile": {
+    "defaultMessage": "Profil anzeigen"
+  },
   "profile.details.title": {
     "defaultMessage": "Nutzerdetails"
   },
@@ -2994,7 +3009,7 @@
     "defaultMessage": "{username} wurde freigegeben."
   },
   "profile.unblock-user.success-title": {
-    "defaultMessage": "Nutzer Freigegeben"
+    "defaultMessage": "Benutzer freigegeben"
   },
   "project-card.date.published.tooltip": {
     "defaultMessage": "Veröffentlicht {date}"
@@ -5265,7 +5280,7 @@
     "defaultMessage": "Profilbild"
   },
   "settings.profile.public-information.description": {
-    "defaultMessage": "Deine Profilinformationen sind öffentlich auf <profile-link>Modrinth sichtbar</profile-link> und durch die <docs-link>Modrinth API</docs-link>."
+    "defaultMessage": "Deine Profilinformationen sind öffentlich <profile-link>auf Modrinth</profile-link> und über die <docs-link>Modrinth-API</docs-link> sichtbar."
   },
   "settings.profile.save-error": {
     "defaultMessage": "Profil konnte nicht aktualisiert werden"
@@ -5292,7 +5307,7 @@
     "defaultMessage": "Nutzer"
   },
   "settings.social.blocked-users.description": {
-    "defaultMessage": "Das sind die Nutzer, die du auf Modrinth blockiert hast. Sie können nicht:"
+    "defaultMessage": "Dies sind die Benutzer, die du auf Modrinth blockiert hast. Diese können nicht:"
   },
   "settings.social.blocked-users.empty": {
     "defaultMessage": "Du hast niemanden blockiert."
@@ -5325,13 +5340,13 @@
     "defaultMessage": "Beim Freigeben dieses Nutzers ist ein Fehler aufgetreten. Bitte versuche es erneut."
   },
   "settings.social.blocked-users.unblock-user": {
-    "defaultMessage": "Freigeben {username}"
+    "defaultMessage": "{username} freigeben"
   },
   "settings.social.blocked-users.user-avatar": {
-    "defaultMessage": "{username}'s Avatar"
+    "defaultMessage": "Avatar von {username}"
   },
   "settings.social.friend-requests.description": {
-    "defaultMessage": "Steuere wer dir auf Modrinth Freundschaftsanfragen senden kann."
+    "defaultMessage": "Lege fest, wer dir auf Modrinth Freundschaftsanfragen senden kann."
   },
   "settings.social.friend-requests.title": {
     "defaultMessage": "Freundschaftsanfragen"
@@ -5358,7 +5373,7 @@
     "defaultMessage": "Einladungen"
   },
   "settings.social.sign-in-required.description": {
-    "defaultMessage": "Du kannst mit einem Modrinth-Konto steuern wer mit dir interagieren kann, und geblockte Nutzer verwalten"
+    "defaultMessage": "Mit einem Modrinth-Konto kannst du festlegen, wer mit dir interagieren kann, und blockierte Nutzer verwalten"
   },
   "settings.social.sign-in-required.title": {
     "defaultMessage": "Modrinth-Konto benötigt"
@@ -6216,3 +6231,4 @@
     "defaultMessage": "Typ"
   }
 }
+
diff --git a/packages/ui/src/locales/de-DE/index.json b/packages/ui/src/locales/de-DE/index.json
index d57bdd0cb8..0f21ef03dc 100644
--- a/packages/ui/src/locales/de-DE/index.json
+++ b/packages/ui/src/locales/de-DE/index.json
@@ -291,7 +291,7 @@
     "defaultMessage": "Registrieren"
   },
   "button.stop": {
-    "defaultMessage": "Stopp"
+    "defaultMessage": "Stoppen"
   },
   "button.switch-to-version": {
     "defaultMessage": "Zur Version wechseln"
@@ -2295,7 +2295,7 @@
     "defaultMessage": "Inhalt wird installiert"
   },
   "label.loading": {
-    "defaultMessage": "Lädt..."
+    "defaultMessage": "Wird geladen..."
   },
   "label.moderation": {
     "defaultMessage": "Moderation"
@@ -2915,6 +2915,15 @@
   "profile.collection.projects-count": {
     "defaultMessage": "{count, plural, one {# Projekt} other {# Projekte}}"
   },
+  "profile.details.error.github-popup-blocked": {
+    "defaultMessage": "Erlaube Pop-Ups für Modrinth und versuche es erneut."
+  },
+  "profile.details.error.github-profile-message": {
+    "defaultMessage": "Das GitHub-Profil konnte nicht abgerufen werden. Bitte versuche es erneut."
+  },
+  "profile.details.error.github-profile-title": {
+    "defaultMessage": "Das GitHub-Profil konnte nicht geöffnet werden"
+  },
   "profile.details.label.auth-providers": {
     "defaultMessage": "Authentifizierungsanbieter"
   },
@@ -2927,9 +2936,15 @@
   "profile.details.label.has-totp": {
     "defaultMessage": "Hat TOTP"
   },
+  "profile.details.label.loading-github-profile": {
+    "defaultMessage": "Wird geladen..."
+  },
   "profile.details.label.payment-methods": {
     "defaultMessage": "Zahlungsmethoden"
   },
+  "profile.details.label.view-github-profile": {
+    "defaultMessage": "Profil anzeigen"
+  },
   "profile.details.title": {
     "defaultMessage": "Nutzerdetails"
   },
@@ -2994,7 +3009,7 @@
     "defaultMessage": "{username} wurde freigegeben."
   },
   "profile.unblock-user.success-title": {
-    "defaultMessage": "Nutzer Freigegeben"
+    "defaultMessage": "Benutzer freigegeben"
   },
   "project-card.date.published.tooltip": {
     "defaultMessage": "Veröffentlicht am {date}"
@@ -5265,7 +5280,7 @@
     "defaultMessage": "Profilbild"
   },
   "settings.profile.public-information.description": {
-    "defaultMessage": "Deine Profilinformationen sind öffentlich auf <profile-link>Modrinth sichtbar</profile-link> und durch die <docs-link>Modrinth API</docs-link>."
+    "defaultMessage": "Deine Profilinformationen sind öffentlich <profile-link>auf Modrinth</profile-link> und über die <docs-link>Modrinth-API</docs-link> sichtbar."
   },
   "settings.profile.save-error": {
     "defaultMessage": "Profil konnte nicht aktualisiert werden"
@@ -5292,7 +5307,7 @@
     "defaultMessage": "Nutzer"
   },
   "settings.social.blocked-users.description": {
-    "defaultMessage": "Das sind die Nutzer, die du auf Modrinth blockiert hast. Sie können nicht:"
+    "defaultMessage": "Dies sind die Benutzer, die du auf Modrinth blockiert hast. Diese können nicht:"
   },
   "settings.social.blocked-users.empty": {
     "defaultMessage": "Du hast niemanden blockiert."
@@ -5325,13 +5340,13 @@
     "defaultMessage": "Beim Freigeben dieses Nutzers ist ein Fehler aufgetreten. Bitte versuche es erneut."
   },
   "settings.social.blocked-users.unblock-user": {
-    "defaultMessage": "Freigeben {username}"
+    "defaultMessage": "{username} freigeben"
   },
   "settings.social.blocked-users.user-avatar": {
-    "defaultMessage": "{username}'s Avatar"
+    "defaultMessage": "Avatar von {username}"
   },
   "settings.social.friend-requests.description": {
-    "defaultMessage": "Steuere wer dir auf Modrinth Freundschaftsanfragen senden kann."
+    "defaultMessage": "Lege fest, wer dir auf Modrinth Freundschaftsanfragen senden kann."
   },
   "settings.social.friend-requests.title": {
     "defaultMessage": "Freundschaftsanfragen"
@@ -5358,7 +5373,7 @@
     "defaultMessage": "Einladungen"
   },
   "settings.social.sign-in-required.description": {
-    "defaultMessage": "Du kannst mit einem Modrinth-Konto steuern wer mit dir interagieren kann, und geblockte Nutzer verwalten"
+    "defaultMessage": "Mit einem Modrinth-Konto kannst du festlegen, wer mit dir interagieren kann, und blockierte Nutzer verwalten"
   },
   "settings.social.sign-in-required.title": {
     "defaultMessage": "Modrinth-Konto benötigt"
@@ -6216,3 +6231,4 @@
     "defaultMessage": "Typ"
   }
 }
+
diff --git a/packages/ui/src/locales/es-419/index.json b/packages/ui/src/locales/es-419/index.json
index ab32fc08d8..626f547ae2 100644
--- a/packages/ui/src/locales/es-419/index.json
+++ b/packages/ui/src/locales/es-419/index.json
@@ -453,28 +453,28 @@
     "defaultMessage": "Archivos de configuración cambiados"
   },
   "content.diff-modal.diff-type.added": {
-    "defaultMessage": "Añadido (dependencia)"
+    "defaultMessage": "Se añadió (dependencia)"
   },
   "content.diff-modal.diff-type.removed": {
-    "defaultMessage": "Desactivado"
+    "defaultMessage": "Se desactivó"
   },
   "content.diff-modal.diff-type.removed-disabled": {
-    "defaultMessage": "Eliminado (desactivado)"
+    "defaultMessage": "Se eliminó (desactivado)"
   },
   "content.diff-modal.diff-type.updated": {
-    "defaultMessage": "Actualizado"
+    "defaultMessage": "Se actualizó"
   },
   "content.diff-modal.dont-install": {
     "defaultMessage": "No instalar"
   },
   "content.diff-modal.external-diff-type.added": {
-    "defaultMessage": "Agregado"
+    "defaultMessage": "Se añadió"
   },
   "content.diff-modal.external-diff-type.removed": {
-    "defaultMessage": "Eliminado"
+    "defaultMessage": "Se eliminó"
   },
   "content.diff-modal.external-diff-type.updated": {
-    "defaultMessage": "Actualizado"
+    "defaultMessage": "Se actualizó"
   },
   "content.diff-modal.file-count": {
     "defaultMessage": "{count, plural, one {# archivo} other {# archivos}}"
@@ -1947,7 +1947,7 @@
     "defaultMessage": "Reinstalando modpack"
   },
   "installation-settings.removed-incompatible": {
-    "defaultMessage": "Eliminado (incompatible)"
+    "defaultMessage": "Se eliminó (incompatible)"
   },
   "installation-settings.repair.instance-description": {
     "defaultMessage": "Reinstala las dependencias de Minecraft y verifica si hay archivos corruptos. Esto puede solucionar problemas si tu juego no se inicia debido a errores relacionados con el launcher."
@@ -2997,7 +2997,7 @@
     "defaultMessage": "Cuenta oficial de Modrinth"
   },
   "profile.official-account.bio": {
-    "defaultMessage": "La cuenta oficial de Modrinth. Consigue ayuda en <support-link></support-link> o escríbenos a través de email: <email></email>"
+    "defaultMessage": "La cuenta oficial de Modrinth. Consigue ayuda en <support-link></support-link> o escríbenos por correo electrónico: <email></email>"
   },
   "profile.unblock-user.error-description": {
     "defaultMessage": "Ocurrió un error al desbloquear a este usuario. Por favor inténtalo otra vez."
@@ -3168,7 +3168,7 @@
     "defaultMessage": "Enviado {date}"
   },
   "project.about.details.updated": {
-    "defaultMessage": "Actualizado {date}"
+    "defaultMessage": "Actualizado el {date}"
   },
   "project.about.links.discord": {
     "defaultMessage": "Únete al servidor de Discord"
@@ -5628,7 +5628,7 @@
     "defaultMessage": "Kit PvP"
   },
   "tag.category.library": {
-    "defaultMessage": "Librería"
+    "defaultMessage": "Biblioteca"
   },
   "tag.category.lifesteal": {
     "defaultMessage": "Lifesteal"
@@ -5892,7 +5892,7 @@
     "defaultMessage": "Sponge"
   },
   "tag.loader.vanilla": {
-    "defaultMessage": "Shader vanilla"
+    "defaultMessage": "Shader Vanilla"
   },
   "tag.loader.velocity": {
     "defaultMessage": "Velocity"
@@ -6231,3 +6231,4 @@
     "defaultMessage": "Tipo"
   }
 }
+
diff --git a/packages/ui/src/locales/es-ES/index.json b/packages/ui/src/locales/es-ES/index.json
index d198fae97f..fab7c1f684 100644
--- a/packages/ui/src/locales/es-ES/index.json
+++ b/packages/ui/src/locales/es-ES/index.json
@@ -221,6 +221,9 @@
   "button.open-folder": {
     "defaultMessage": "Abrir carpeta"
   },
+  "button.open-in-browser": {
+    "defaultMessage": "Abrir en el navegador"
+  },
   "button.open-in-folder": {
     "defaultMessage": "Abrir en carpeta"
   },
@@ -236,6 +239,9 @@
   "button.reinstall-modpack": {
     "defaultMessage": "Reinstalar modpack"
   },
+  "button.remove": {
+    "defaultMessage": "Eliminar"
+  },
   "button.remove-image": {
     "defaultMessage": "Eliminar imagen"
   },
@@ -287,6 +293,9 @@
   "button.stop": {
     "defaultMessage": "Detener"
   },
+  "button.switch-to-version": {
+    "defaultMessage": "Cambiar a la versión"
+  },
   "button.switch-version": {
     "defaultMessage": "Cambiar versión"
   },
@@ -314,6 +323,21 @@
   "changelog.product.web": {
     "defaultMessage": "Plataforma"
   },
+  "collection-widget.empty-collection": {
+    "defaultMessage": "Esta colección está vacía."
+  },
+  "collection-widget.loading-projects": {
+    "defaultMessage": "Cargando proyectos..."
+  },
+  "collection-widget.no-search-results": {
+    "defaultMessage": "No proyectos coinciden con tu búsqueda."
+  },
+  "collection-widget.project-count": {
+    "defaultMessage": "{count, plural, one {# proyecto} other {# proyectos}}"
+  },
+  "collection-widget.search-placeholder": {
+    "defaultMessage": "Buscar proyectos"
+  },
   "collections.label.private": {
     "defaultMessage": "Privado"
   },
@@ -353,6 +377,9 @@
   "content.confirm-deletion.header": {
     "defaultMessage": "Borrar {itemType}"
   },
+  "content.confirm-disable.header": {
+    "defaultMessage": "Desactivar {itemType}"
+  },
   "content.confirm-modpack-update.admonition-body": {
     "defaultMessage": "{action, select,downgrade {Bajar de versión} other {Actualizar}} puede causar problemas de compatibilidad. Mods o contenido que tu has añandido encima del modpack se quedara, pero no podria ser compatible con la nueva version."
   },
@@ -422,21 +449,78 @@
   "content.diff-modal.added-count": {
     "defaultMessage": "{count} añadido/s"
   },
+  "content.diff-modal.config-files-updated": {
+    "defaultMessage": "Archivos de configuración modificados"
+  },
   "content.diff-modal.diff-type.added": {
     "defaultMessage": "Añadido (dependencia)"
   },
   "content.diff-modal.diff-type.removed": {
     "defaultMessage": "Desactivado"
   },
+  "content.diff-modal.diff-type.removed-disabled": {
+    "defaultMessage": "Removido (desactivado)"
+  },
   "content.diff-modal.diff-type.updated": {
     "defaultMessage": "Actualizado"
   },
+  "content.diff-modal.dont-install": {
+    "defaultMessage": "No instalar"
+  },
+  "content.diff-modal.external-diff-type.added": {
+    "defaultMessage": "Añadido"
+  },
+  "content.diff-modal.external-diff-type.removed": {
+    "defaultMessage": "Eliminado"
+  },
+  "content.diff-modal.external-diff-type.updated": {
+    "defaultMessage": "Actualizado"
+  },
+  "content.diff-modal.file-count": {
+    "defaultMessage": "{count, plural, one {# archivo} other {# archivos}}"
+  },
+  "content.diff-modal.game-version-updated": {
+    "defaultMessage": "Versión del juego"
+  },
+  "content.diff-modal.install-anyway": {
+    "defaultMessage": "Instalar de todas formas"
+  },
+  "content.diff-modal.loader-updated": {
+    "defaultMessage": "Cargador"
+  },
+  "content.diff-modal.modpack-linked": {
+    "defaultMessage": "Modpack vinculado"
+  },
+  "content.diff-modal.modpack-unlinked": {
+    "defaultMessage": "Modpack desvinculado"
+  },
+  "content.diff-modal.modpack-updated": {
+    "defaultMessage": "Modpack actualizado"
+  },
+  "content.diff-modal.no-content-changes": {
+    "defaultMessage": "No hay cambios en el contenido"
+  },
   "content.diff-modal.removed-count": {
     "defaultMessage": "{count} eliminado"
   },
+  "content.diff-modal.removed-disabled-count": {
+    "defaultMessage": "{count} removido (desactivado)"
+  },
+  "content.diff-modal.reviewed-files": {
+    "defaultMessage": "Un archivo es revisado si es que está publicado en Modrinth, sin imputar su formato de archivo (Incluyendo .mrpack)."
+  },
   "content.diff-modal.unknown-content-body": {
     "defaultMessage": "No se ha podido analizar parte del contenido de su servidor, por lo que podría verse afectado por este cambio."
   },
+  "content.diff-modal.unknown-files-description": {
+    "defaultMessage": "Esta actualización contiene archivos que no están publicados en Modrinth. Te recomendamos instalar archivos de fuentes de confianza."
+  },
+  "content.diff-modal.unknown-files-warning": {
+    "defaultMessage": "Advertencia de archivos desconocidos"
+  },
+  "content.diff-modal.unknown-project": {
+    "defaultMessage": "Desconocido"
+  },
   "content.diff-modal.updated-count": {
     "defaultMessage": "{count} actualizado/s"
   },
@@ -482,6 +566,9 @@
   "content.inline-backup.world-label": {
     "defaultMessage": " mundo"
   },
+  "content.modpack-card.installation-settings": {
+    "defaultMessage": "Configuración de la instalación"
+  },
   "content.page-layout.additional-content": {
     "defaultMessage": "Contenido adicional"
   },
@@ -560,24 +647,36 @@
   "content.selection-bar.bulk.deleting": {
     "defaultMessage": "Eliminando {progress}/{total} {contentType}..."
   },
+  "content.selection-bar.bulk.deleting-count": {
+    "defaultMessage": "Eliminando {count, number} {contentType}"
+  },
   "content.selection-bar.bulk.deleting-waiting": {
     "defaultMessage": "Eliminando {contentType}..."
   },
   "content.selection-bar.bulk.disabling": {
     "defaultMessage": "Desactivando {progress}/{total} {contentType}..."
   },
+  "content.selection-bar.bulk.disabling-count": {
+    "defaultMessage": "Desactivando {count, number} {contentType}"
+  },
   "content.selection-bar.bulk.disabling-waiting": {
     "defaultMessage": "Desactivando {contentType}..."
   },
   "content.selection-bar.bulk.enabling": {
     "defaultMessage": "Activando {progress}/{total} {contentType}..."
   },
+  "content.selection-bar.bulk.enabling-count": {
+    "defaultMessage": "Activando {count, number} {contentType}"
+  },
   "content.selection-bar.bulk.enabling-waiting": {
     "defaultMessage": "Activando {contentType}..."
   },
   "content.selection-bar.bulk.updating": {
     "defaultMessage": "Actualizando {progress}/{total} {contentType}..."
   },
+  "content.selection-bar.bulk.updating-count": {
+    "defaultMessage": "Actualizando {count, number} {contentType}"
+  },
   "content.selection-bar.bulk.updating-waiting": {
     "defaultMessage": "Actualizando {contentType}..."
   },
@@ -872,6 +971,9 @@
   "external-files.permissions-card.add-files-modal.no-search-results": {
     "defaultMessage": "No hay archivos que coincidan con tu búsqueda."
   },
+  "external-files.permissions-card.add-files-modal.search-placeholder": {
+    "defaultMessage": "Buscar archivos..."
+  },
   "external-files.permissions-card.add-files-modal.selected-count": {
     "defaultMessage": "{count, plural, one {# archivo seleccionado} other {# archivos seleccionados}}"
   },
@@ -1094,6 +1196,21 @@
   "external-files.permissions-card.reason.special-permission.description": {
     "defaultMessage": "Has obtenido permiso especial para redistribuir este trabajo en tu modpack."
   },
+  "external-files.permissions-card.remove-group": {
+    "defaultMessage": "Eliminar grupo"
+  },
+  "external-files.permissions-card.remove-group-confirmation.description": {
+    "defaultMessage": "Esto elimina permanentemente el grupo de atribución y todos los archivos dentro de ellos. Esta ación no se puede deshacer."
+  },
+  "external-files.permissions-card.remove-group-confirmation.title": {
+    "defaultMessage": "¿Borrar {title}?"
+  },
+  "external-files.permissions-card.remove-group-error.title": {
+    "defaultMessage": "No se pudo eliminar el grupo"
+  },
+  "external-files.permissions-card.remove-group-shift-hint": {
+    "defaultMessage": "Mantén pulsada el Shift mientras haces clic para omitir la confirmación."
+  },
   "external-files.permissions-card.split-file": {
     "defaultMessage": "Eliminar del grupo"
   },
@@ -1376,6 +1493,9 @@
   "files.row.item-count": {
     "defaultMessage": "{count, plural, one {# elemento} other {# elementos}}"
   },
+  "files.row.parent-folder": {
+    "defaultMessage": "Carpeta principal"
+  },
   "files.table-header.created": {
     "defaultMessage": "Creado"
   },
@@ -1967,6 +2087,12 @@
   "instances.modpack-content-modal.empty-title": {
     "defaultMessage": "No se ha encontrado contenido"
   },
+  "instances.modpack-content-modal.external-content": {
+    "defaultMessage": "Externo"
+  },
+  "instances.modpack-content-modal.external-content-description": {
+    "defaultMessage": "Este archivo no está publicado en Modrinth."
+  },
   "instances.modpack-content-modal.header": {
     "defaultMessage": "Contenido del modpack"
   },
@@ -1976,6 +2102,9 @@
   "instances.modpack-content-modal.no-results": {
     "defaultMessage": "No hay proyectos que coincidan con tu búsqueda."
   },
+  "instances.modpack-content-modal.open-in-slicer": {
+    "defaultMessage": "Abrir en Slicer"
+  },
   "instances.modpack-content-modal.search-placeholder": {
     "defaultMessage": "Buscar {count, number} {count, plural, one {proyecto} other {proyectos}}"
   },
@@ -2108,6 +2237,9 @@
   "label.details": {
     "defaultMessage": "Detalles"
   },
+  "label.discover-content": {
+    "defaultMessage": "Descubrir contenido"
+  },
   "label.done": {
     "defaultMessage": "Hecho"
   },
@@ -2138,6 +2270,9 @@
   "label.game-version": {
     "defaultMessage": "Versión del juego"
   },
+  "label.hide-installed-content": {
+    "defaultMessage": "Esconder contenido ya instalado"
+  },
   "label.hide-selected-content": {
     "defaultMessage": "Ocultar contenido seleccionado"
   },
@@ -2183,6 +2318,9 @@
   "label.password": {
     "defaultMessage": "Contraseña"
   },
+  "label.permissions": {
+    "defaultMessage": "Permisos"
+  },
   "label.plan-custom": {
     "defaultMessage": "Personalizado"
   },
@@ -2240,6 +2378,9 @@
   "label.server": {
     "defaultMessage": "Servidor"
   },
+  "label.server-only": {
+    "defaultMessage": "Solo servidor"
+  },
   "label.servers": {
     "defaultMessage": "Servidores"
   },
@@ -2711,9 +2852,162 @@
   "payment-method.visa": {
     "defaultMessage": "Visa"
   },
+  "profile.bio.fallback.creator": {
+    "defaultMessage": "Creador en Modrinth."
+  },
+  "profile.bio.fallback.user": {
+    "defaultMessage": "Usuario de Modrinth."
+  },
+  "profile.block-user.admonition-body": {
+    "defaultMessage": "{username} no podrá enviarte solicitudes de amistad, invitarte a instancias compartidas o invítate a Servers en Modrinth."
+  },
+  "profile.block-user.admonition-title": {
+    "defaultMessage": "¿Estás seguro de que deseas bloquear este usuario?"
+  },
+  "profile.block-user.error-description": {
+    "defaultMessage": "Ocurrió un error al bloquear este usuario: Por favor intenta de nuevo."
+  },
+  "profile.block-user.error-title": {
+    "defaultMessage": "No se pudo bloquear el usuario"
+  },
+  "profile.block-user.success-description": {
+    "defaultMessage": "{username} fue bloqueado."
+  },
+  "profile.block-user.success-title": {
+    "defaultMessage": "Usuario bloqueado"
+  },
+  "profile.block-user.title": {
+    "defaultMessage": "Bloquear {username}"
+  },
+  "profile.button.analytics": {
+    "defaultMessage": "Ver analíticas del usuario"
+  },
+  "profile.button.billing": {
+    "defaultMessage": "Gestionar la facturación de los usuarios"
+  },
+  "profile.button.block": {
+    "defaultMessage": "Bloquear"
+  },
+  "profile.button.create-collection": {
+    "defaultMessage": "Crear una colección"
+  },
+  "profile.button.create-project": {
+    "defaultMessage": "Crear un proyecto"
+  },
+  "profile.button.info": {
+    "defaultMessage": "Ver detalles del usuario"
+  },
+  "profile.button.manage-projects": {
+    "defaultMessage": "Gestionar proyectos"
+  },
+  "profile.button.remove-affiliate": {
+    "defaultMessage": "Borrar como afiliado"
+  },
+  "profile.button.set-affiliate": {
+    "defaultMessage": "Poner como afiliado"
+  },
+  "profile.button.unblock": {
+    "defaultMessage": "Desbloquear"
+  },
+  "profile.collection.projects-count": {
+    "defaultMessage": "{count, plural, one {# proyecto} other {# proyectos}}"
+  },
+  "profile.details.error.github-popup-blocked": {
+    "defaultMessage": "Permite las ventanas emergentes para Modrinth e inténtalo de nuevo."
+  },
+  "profile.details.error.github-profile-message": {
+    "defaultMessage": "No se pudo mostrar el perfil de GitHub. Por favor intenta de nuevo."
+  },
+  "profile.details.error.github-profile-title": {
+    "defaultMessage": "No se pudo abrir el perfil de GitHub"
+  },
+  "profile.details.label.auth-providers": {
+    "defaultMessage": "Proveedores de autenticación"
+  },
+  "profile.details.label.email-verified": {
+    "defaultMessage": "Correo verificado"
+  },
+  "profile.details.label.has-password": {
+    "defaultMessage": "Tiene contraseña"
+  },
+  "profile.details.label.has-totp": {
+    "defaultMessage": "Tiene TOTP"
+  },
+  "profile.details.label.loading-github-profile": {
+    "defaultMessage": "Cargando..."
+  },
+  "profile.details.label.payment-methods": {
+    "defaultMessage": "Métodos de pago"
+  },
+  "profile.details.label.view-github-profile": {
+    "defaultMessage": "Ver perfil"
+  },
+  "profile.details.title": {
+    "defaultMessage": "Detalles de usuario"
+  },
+  "profile.details.tooltip.email-not-verified": {
+    "defaultMessage": "Correo no verificado"
+  },
+  "profile.details.tooltip.email-verified": {
+    "defaultMessage": "Correo verificado"
+  },
+  "profile.error.load-description": {
+    "defaultMessage": "El perfil del usuario no pudo cargar."
+  },
+  "profile.error.not-found": {
+    "defaultMessage": "Usuario no encontrado"
+  },
+  "profile.label.affiliate": {
+    "defaultMessage": "Afiliado"
+  },
   "profile.label.badges": {
     "defaultMessage": "Medallas"
   },
+  "profile.label.collection": {
+    "defaultMessage": "Colección"
+  },
+  "profile.label.download-count": {
+    "defaultMessage": "{count, plural, one {descarga} other {descargas}}"
+  },
+  "profile.label.joined": {
+    "defaultMessage": "Se unió hace"
+  },
+  "profile.label.no-collections": {
+    "defaultMessage": "¡Este usuario no tiene colecciones!"
+  },
+  "profile.label.no-collections-auth-description": {
+    "defaultMessage": "No tienes una colección aun."
+  },
+  "profile.label.no-projects": {
+    "defaultMessage": "¡Este usuario no tiene proyectos!"
+  },
+  "profile.label.no-projects-auth-description": {
+    "defaultMessage": "No tienes ningún proyecto aun."
+  },
+  "profile.label.organizations": {
+    "defaultMessage": "Organizaciones"
+  },
+  "profile.label.project-count": {
+    "defaultMessage": "{count, plural, one {proyecto} other {proyectos}}"
+  },
+  "profile.official-account": {
+    "defaultMessage": "Cuenta oficial de Modrinth"
+  },
+  "profile.official-account.bio": {
+    "defaultMessage": "Cuenta oficial de Modrinth. Obtén soporte en <support-link></support-link> o vía correo a <email></email>"
+  },
+  "profile.unblock-user.error-description": {
+    "defaultMessage": "Ocurrió un error al desbloquear este usuario. Por favor intenta de nuevo."
+  },
+  "profile.unblock-user.error-title": {
+    "defaultMessage": "No se pudo desbloquear el usuario"
+  },
+  "profile.unblock-user.success-description": {
+    "defaultMessage": "{username} fue desbloqueado."
+  },
+  "profile.unblock-user.success-title": {
+    "defaultMessage": "Usuario desbloqueado"
+  },
   "project-card.date.published.tooltip": {
     "defaultMessage": "Publicado el {date}"
   },
@@ -2729,12 +3023,21 @@
   "project-card.environment.client-or-server": {
     "defaultMessage": "Cliente o servidor"
   },
+  "project-card.environment.dedicated-server": {
+    "defaultMessage": "Servidor dedicado"
+  },
   "project-card.environment.server": {
     "defaultMessage": "Servidor"
   },
+  "project-card.environment.singleplayer": {
+    "defaultMessage": "Un jugador"
+  },
   "project-type.all": {
     "defaultMessage": "Todos"
   },
+  "project-type.collection.plural": {
+    "defaultMessage": "Colecciones"
+  },
   "project-type.datapack.capital": {
     "defaultMessage": "{count, plural, one {Paquete de Datos} other {Paquetes de Datos}}"
   },
@@ -3005,6 +3308,15 @@
   "project.follower-count-tooltip": {
     "defaultMessage": "{count, number} {count, plural, one {seguidor} other {seguidores}}"
   },
+  "project.license.error": {
+    "defaultMessage": "No se pudo coger el texto de la Licencia."
+  },
+  "project.license.loading": {
+    "defaultMessage": "Cargando texto de la licencia..."
+  },
+  "project.license.title": {
+    "defaultMessage": "Licencia"
+  },
   "project.online-player-count": {
     "defaultMessage": "{count, number} en línea"
   },
@@ -3410,6 +3722,12 @@
   "project.settings.view.title": {
     "defaultMessage": "Vista"
   },
+  "project.stats.downloads-label": {
+    "defaultMessage": "{count, plural, one {descarga} other {descargas}}"
+  },
+  "project.stats.followers-label": {
+    "defaultMessage": "{count, plural, one {seguidor} other {seguidores}}"
+  },
   "project.versions.channel.alpha.symbol": {
     "defaultMessage": "A"
   },
@@ -3419,6 +3737,12 @@
   "project.versions.channel.release.symbol": {
     "defaultMessage": "R"
   },
+  "project.versions.filter.toggle-tooltip": {
+    "defaultMessage": "Alternar filtro para {filter}"
+  },
+  "project.versions.platform.modloader.short": {
+    "defaultMessage": "Cargador de mod"
+  },
   "project.versions.version.withheld": {
     "defaultMessage": "Retenido"
   },
@@ -3503,6 +3827,18 @@
   "search.filter.option.show_more": {
     "defaultMessage": "Mostrar más"
   },
+  "search.filter_type.advanced": {
+    "defaultMessage": "Avanzado"
+  },
+  "search.filter_type.advanced.exclude_datapack": {
+    "defaultMessage": "Excluir paquetes de datos"
+  },
+  "search.filter_type.advanced.exclude_mod": {
+    "defaultMessage": "Excluir mods"
+  },
+  "search.filter_type.advanced.exclude_plugin": {
+    "defaultMessage": "Excluir plugins"
+  },
   "search.filter_type.environment": {
     "defaultMessage": "Entorno"
   },
@@ -4928,9 +5264,216 @@
   "settings.pats.title": {
     "defaultMessage": "Tokens de acceso personal"
   },
+  "settings.profile.bio.description": {
+    "defaultMessage": "Una breve descripción para contar a todos sobre ti."
+  },
+  "settings.profile.bio.title": {
+    "defaultMessage": "Biografía"
+  },
+  "settings.profile.navigation-title": {
+    "defaultMessage": "Perfil"
+  },
+  "settings.profile.profile-picture.title": {
+    "defaultMessage": "Foto de perfil"
+  },
+  "settings.profile.public-information.description": {
+    "defaultMessage": "La información de tu perfil está <profile-link>visible públicamente en Modrinth</profile-link> y a la <docs-link>Modrinth API</docs-link>."
+  },
+  "settings.profile.save-error": {
+    "defaultMessage": "No se pudo actualizar el perfil"
+  },
+  "settings.profile.save-error-description": {
+    "defaultMessage": "Ocurrió un error al actualizar tu perfil. Por favor intenta de nuevo."
+  },
+  "settings.profile.sign-in-required.description": {
+    "defaultMessage": "Inicia sesión con una cuenta de Modrinth para editar tu perfil público."
+  },
+  "settings.profile.sign-in-required.title": {
+    "defaultMessage": "Cuenta de Modrinth requerida"
+  },
+  "settings.profile.username.description": {
+    "defaultMessage": "Un nombre que no distingue de mayúsculas o minúsculas para identificar tu perfil."
+  },
   "settings.sessions.title": {
     "defaultMessage": "Sesiones"
   },
+  "settings.social.blocked-users.column.actions": {
+    "defaultMessage": "Acciones"
+  },
+  "settings.social.blocked-users.column.user": {
+    "defaultMessage": "Usuario"
+  },
+  "settings.social.blocked-users.description": {
+    "defaultMessage": "Estos son los usuarios que bloqueaste en Modrinth. Ellos no pueden:"
+  },
+  "settings.social.blocked-users.empty": {
+    "defaultMessage": "No bloqueaste a nadie."
+  },
+  "settings.social.blocked-users.load-error": {
+    "defaultMessage": "No se pudo cargar los usuarios bloqueados."
+  },
+  "settings.social.blocked-users.loading": {
+    "defaultMessage": "Cargando usuarios bloqueados…"
+  },
+  "settings.social.blocked-users.restriction.friend-requests": {
+    "defaultMessage": "Enviar solicitudes de amistad"
+  },
+  "settings.social.blocked-users.restriction.hosting": {
+    "defaultMessage": "Invitarte a administrar un Servidor en Modrinth."
+  },
+  "settings.social.blocked-users.restriction.shared-instances": {
+    "defaultMessage": "Invitarte a instancias compartidas"
+  },
+  "settings.social.blocked-users.title": {
+    "defaultMessage": "Usuarios bloqueados"
+  },
+  "settings.social.blocked-users.unblock": {
+    "defaultMessage": "Desbloquear"
+  },
+  "settings.social.blocked-users.unblock-error": {
+    "defaultMessage": "No se pudo desbloquear el usuario"
+  },
+  "settings.social.blocked-users.unblock-error-description": {
+    "defaultMessage": "Ocurrió un error al desbloquear este usuario. por favor intenta de nuevo."
+  },
+  "settings.social.blocked-users.unblock-user": {
+    "defaultMessage": "Desbloquear {username}"
+  },
+  "settings.social.blocked-users.user-avatar": {
+    "defaultMessage": "Avatar de {username}"
+  },
+  "settings.social.friend-requests.description": {
+    "defaultMessage": "Controla quien puede enviarte solicitudes de amistad en Modrinth."
+  },
+  "settings.social.friend-requests.title": {
+    "defaultMessage": "Solicitudes de amistad"
+  },
+  "settings.social.interaction-source.coming-soon": {
+    "defaultMessage": "¡Próximamente!"
+  },
+  "settings.social.interaction-source.everyone": {
+    "defaultMessage": "Todos"
+  },
+  "settings.social.interaction-source.friends": {
+    "defaultMessage": "Amigos"
+  },
+  "settings.social.interaction-source.friends-of-friends": {
+    "defaultMessage": "Amigos de amigos"
+  },
+  "settings.social.interaction-source.no-one": {
+    "defaultMessage": "Ninguno"
+  },
+  "settings.social.shared-instance-invites.description": {
+    "defaultMessage": "Controla quien puede enviarte invitaciones a instancias compartidas y servidores en Modrinth."
+  },
+  "settings.social.shared-instance-invites.title": {
+    "defaultMessage": "Invitaciones"
+  },
+  "settings.social.sign-in-required.description": {
+    "defaultMessage": "Puedes controlar quien puede interactuar contigo, y gestionar los usuarios bloqueados con una cuenta de Modrinth"
+  },
+  "settings.social.sign-in-required.title": {
+    "defaultMessage": "Cuenta de Modrinth requerida"
+  },
+  "settings.social.title": {
+    "defaultMessage": "Social"
+  },
+  "sharing.invite-players-modal.add": {
+    "defaultMessage": "Añadir"
+  },
+  "sharing.invite-players-modal.added": {
+    "defaultMessage": "Añadido"
+  },
+  "sharing.invite-players-modal.already-invited": {
+    "defaultMessage": "Este usuario ya fue invitado."
+  },
+  "sharing.invite-players-modal.apply-button": {
+    "defaultMessage": "Aplicar"
+  },
+  "sharing.invite-players-modal.avatar-alt": {
+    "defaultMessage": "Avatar de {username}"
+  },
+  "sharing.invite-players-modal.custom-expiry": {
+    "defaultMessage": "Personalizado..."
+  },
+  "sharing.invite-players-modal.custom-expiry-value": {
+    "defaultMessage": "Personalizado: {date}"
+  },
+  "sharing.invite-players-modal.edit-invite-link": {
+    "defaultMessage": "Editar enlace de invitación."
+  },
+  "sharing.invite-players-modal.edit-invite-link-title": {
+    "defaultMessage": "Editar enlace de invitación"
+  },
+  "sharing.invite-players-modal.expiry-in-one-day": {
+    "defaultMessage": "En 1 día"
+  },
+  "sharing.invite-players-modal.expiry-in-one-hour": {
+    "defaultMessage": "En 1 hora"
+  },
+  "sharing.invite-players-modal.expiry-in-seven-days": {
+    "defaultMessage": "En 7 días"
+  },
+  "sharing.invite-players-modal.expiry-in-six-hours": {
+    "defaultMessage": "En 6 horas"
+  },
+  "sharing.invite-players-modal.expiry-in-three-days": {
+    "defaultMessage": "En 3 días"
+  },
+  "sharing.invite-players-modal.expiry-in-twelve-hours": {
+    "defaultMessage": "En 12 horas"
+  },
+  "sharing.invite-players-modal.expiry-label": {
+    "defaultMessage": "Día de caducidad"
+  },
+  "sharing.invite-players-modal.friends-heading": {
+    "defaultMessage": "Tus amigos - {count}"
+  },
+  "sharing.invite-players-modal.invite": {
+    "defaultMessage": "Invitar"
+  },
+  "sharing.invite-players-modal.invite-expiry-description": {
+    "defaultMessage": "Tu link de invitación expira en {duration}."
+  },
+  "sharing.invite-players-modal.invite-link-heading": {
+    "defaultMessage": "O usa un link de invitación"
+  },
+  "sharing.invite-players-modal.link-copied-text": {
+    "defaultMessage": "La URL del link de invitación fue copiado al portapapeles."
+  },
+  "sharing.invite-players-modal.link-copied-title": {
+    "defaultMessage": "Link Copiado"
+  },
+  "sharing.invite-players-modal.link-copy-failed-title": {
+    "defaultMessage": "No se pudo copiar el link"
+  },
+  "sharing.invite-players-modal.max-uses-label": {
+    "defaultMessage": "Usos máximos"
+  },
+  "sharing.invite-players-modal.no-friends": {
+    "defaultMessage": "No tienes amigos."
+  },
+  "sharing.invite-players-modal.no-search-results": {
+    "defaultMessage": "No se encontraron usuarios coincidentes."
+  },
+  "sharing.invite-players-modal.requested": {
+    "defaultMessage": "Solicitud enviada"
+  },
+  "sharing.invite-players-modal.requested-tooltip": {
+    "defaultMessage": "{username} debe de aceptar tu solicitud de amistad primero"
+  },
+  "sharing.invite-players-modal.save-button": {
+    "defaultMessage": "Guardar"
+  },
+  "sharing.invite-players-modal.search-placeholder": {
+    "defaultMessage": "Introduce el nombre de usuario de Modrinth"
+  },
+  "sharing.invite-players-modal.searching": {
+    "defaultMessage": "Buscando..."
+  },
+  "sharing.invite-players-modal.update-invite-link-failed-title": {
+    "defaultMessage": "No se pudo actualizar el enlace de invitación"
+  },
   "tag.category.128x": {
     "defaultMessage": "128x"
   },
@@ -5465,6 +6008,39 @@
   "ui.stacked-admonitions.dismiss-all": {
     "defaultMessage": "Descartar todas"
   },
+  "unknown-file-warning-modal.dont-install": {
+    "defaultMessage": "No instalar"
+  },
+  "unknown-file-warning-modal.dont-show-again": {
+    "defaultMessage": "No mostar esta advertencia de nuevo"
+  },
+  "unknown-file-warning-modal.header": {
+    "defaultMessage": "Confirmar Instalación"
+  },
+  "unknown-file-warning-modal.install-anyway": {
+    "defaultMessage": "Instalar de todas formas"
+  },
+  "unknown-file-warning-modal.malware-warning": {
+    "defaultMessage": "Malware suele distribuir a través de archivos de mods compartidos en plataformas como Discord."
+  },
+  "unknown-file-warning-modal.mod-warning-body": {
+    "defaultMessage": " no está publicado en Modrinth. Te recomendamos instalar archivos de fuentes de confianza."
+  },
+  "unknown-file-warning-modal.mod-warning-title": {
+    "defaultMessage": "Advertencia de archivo desconocido"
+  },
+  "unknown-file-warning-modal.modpack-warning-body": {
+    "defaultMessage": " contiene archivos que no están publicados en Modrinth. Te recomendamos instalar archivos de fuentes de confianza."
+  },
+  "unknown-file-warning-modal.modpack-warning-title": {
+    "defaultMessage": "Advertencia de archivos desconocidos"
+  },
+  "unknown-file-warning-modal.reviewed-files": {
+    "defaultMessage": "Un archivo es revisado si es que está publicado en Modrinth, sin importar su formato de archivo (Incluyendo .mrpack)."
+  },
+  "unknown-file-warning-modal.unrecognized-files": {
+    "defaultMessage": "Archivos sin reconocer"
+  },
   "user.profile.badge.alpha.about.1": {
     "defaultMessage": "Este usuario ha estado presente desde la Alpha de Modrinth, la cuál terminó en noviembre de 2020."
   },
diff --git a/packages/ui/src/locales/fil-PH/index.json b/packages/ui/src/locales/fil-PH/index.json
index 643493b467..6ea0d596fb 100644
--- a/packages/ui/src/locales/fil-PH/index.json
+++ b/packages/ui/src/locales/fil-PH/index.json
@@ -2763,3 +2763,4 @@
     "defaultMessage": "Uri"
   }
 }
+
diff --git a/packages/ui/src/locales/fr-FR/index.json b/packages/ui/src/locales/fr-FR/index.json
index 0f641ef1d2..4f224d92bc 100644
--- a/packages/ui/src/locales/fr-FR/index.json
+++ b/packages/ui/src/locales/fr-FR/index.json
@@ -2909,6 +2909,15 @@
   "profile.collection.projects-count": {
     "defaultMessage": "{count, plural,one {# projet} other {# projets}}"
   },
+  "profile.details.error.github-popup-blocked": {
+    "defaultMessage": "Autorisez les pop-ups pour Modrinth, puis réessayez."
+  },
+  "profile.details.error.github-profile-message": {
+    "defaultMessage": "Le profil GitHub n'a pas pu être récupéré. Veuillez réessayer."
+  },
+  "profile.details.error.github-profile-title": {
+    "defaultMessage": "Impossible d'ouvrir le profil GitHub"
+  },
   "profile.details.label.auth-providers": {
     "defaultMessage": "Fournisseurs d’authentification"
   },
@@ -2921,9 +2930,15 @@
   "profile.details.label.has-totp": {
     "defaultMessage": "Dispose d'un TOTP"
   },
+  "profile.details.label.loading-github-profile": {
+    "defaultMessage": "Chargement..."
+  },
   "profile.details.label.payment-methods": {
     "defaultMessage": "Moyens de paiements"
   },
+  "profile.details.label.view-github-profile": {
+    "defaultMessage": "Voir le profil"
+  },
   "profile.details.title": {
     "defaultMessage": "Détails de l'utilisateur"
   },
diff --git a/packages/ui/src/locales/hu-HU/index.json b/packages/ui/src/locales/hu-HU/index.json
index 5e9d85aa35..429f6a088d 100644
--- a/packages/ui/src/locales/hu-HU/index.json
+++ b/packages/ui/src/locales/hu-HU/index.json
@@ -1662,7 +1662,7 @@
     "defaultMessage": "{type} javítása"
   },
   "instance.confirm-repair.instance-label": {
-    "defaultMessage": "Játékprofil"
+    "defaultMessage": "Példány"
   },
   "instance.confirm-repair.repair-button": {
     "defaultMessage": "Javítás"
diff --git a/packages/ui/src/locales/id-ID/index.json b/packages/ui/src/locales/id-ID/index.json
index f813993ef3..e2044d9b8e 100644
--- a/packages/ui/src/locales/id-ID/index.json
+++ b/packages/ui/src/locales/id-ID/index.json
@@ -2982,3 +2982,4 @@
     "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 76b765ac73..02ebe7b976 100644
--- a/packages/ui/src/locales/it-IT/index.json
+++ b/packages/ui/src/locales/it-IT/index.json
@@ -1176,7 +1176,7 @@
     "defaultMessage": "Elimina gruppo"
   },
   "external-files.permissions-card.remove-group-confirmation.description": {
-    "defaultMessage": "Questo gruppo di attribuzione sarà rimosso per sempre. Quest'azione non può essere annullata."
+    "defaultMessage": "Il gruppo di attribuzione e i suoi contenuti saranno eliminati per sempre. Questa azione è irreversibile."
   },
   "external-files.permissions-card.remove-group-confirmation.title": {
     "defaultMessage": "Eliminare {title}?"
@@ -1251,10 +1251,10 @@
     "defaultMessage": "Elimina file"
   },
   "files.delete-modal.warning.file": {
-    "defaultMessage": "Questo file verrà eliminato permanentemente. Questa azione non può essere annullata."
+    "defaultMessage": "Il file sarà eliminato per sempre. Questa azione è irreversibile."
   },
   "files.delete-modal.warning.folder": {
-    "defaultMessage": "Questa cartella e tutti i suoi contenuti verranno eliminati permanentemente. Questa azione non può essere annullata."
+    "defaultMessage": "La cartella e i suoi contenuti saranno eliminati per sempre. Questa azione è irreversibile."
   },
   "files.editor.failed-to-open-text": {
     "defaultMessage": "Impossibile caricare i contenuti del file."
diff --git a/packages/ui/src/locales/ja-JP/index.json b/packages/ui/src/locales/ja-JP/index.json
index 8ade34a533..f80815d161 100644
--- a/packages/ui/src/locales/ja-JP/index.json
+++ b/packages/ui/src/locales/ja-JP/index.json
@@ -1,6 +1,6 @@
 {
   "action.no-permission": {
-    "defaultMessage": "権限がありません"
+    "defaultMessage": "権限がありません。"
   },
   "affiliate.create.button": {
     "defaultMessage": "アフィリエイトリンクを作成"
@@ -449,12 +449,18 @@
   "content.diff-modal.added-count": {
     "defaultMessage": "{count} 件追加されました"
   },
+  "content.diff-modal.config-files-updated": {
+    "defaultMessage": "設定変更"
+  },
   "content.diff-modal.diff-type.added": {
     "defaultMessage": "追加 (依存関係)"
   },
   "content.diff-modal.diff-type.removed": {
     "defaultMessage": "無効化済み"
   },
+  "content.diff-modal.diff-type.removed-disabled": {
+    "defaultMessage": "削除済み（無効）"
+  },
   "content.diff-modal.diff-type.updated": {
     "defaultMessage": "アップデート済み"
   },
@@ -470,12 +476,33 @@
   "content.diff-modal.external-diff-type.updated": {
     "defaultMessage": "更新されました"
   },
+  "content.diff-modal.game-version-updated": {
+    "defaultMessage": "ゲームバージョン変更"
+  },
   "content.diff-modal.install-anyway": {
     "defaultMessage": "それでもインストールする"
   },
+  "content.diff-modal.loader-updated": {
+    "defaultMessage": "Modローダー変更"
+  },
+  "content.diff-modal.modpack-linked": {
+    "defaultMessage": "リンク済みモッドパック"
+  },
+  "content.diff-modal.modpack-unlinked": {
+    "defaultMessage": "未リンクのモッドパック"
+  },
+  "content.diff-modal.modpack-updated": {
+    "defaultMessage": "Modパックのアップデート"
+  },
+  "content.diff-modal.no-content-changes": {
+    "defaultMessage": "変更点なし"
+  },
   "content.diff-modal.removed-count": {
     "defaultMessage": "{count} 件削除されました"
   },
+  "content.diff-modal.removed-disabled-count": {
+    "defaultMessage": "{count}件 削除済み（無効）"
+  },
   "content.diff-modal.reviewed-files": {
     "defaultMessage": "ファイルは、（.mrpackなどのファイル形式に関係なく）Modrinthに公開されたもののみ審査されます。"
   },
@@ -536,6 +563,9 @@
   "content.inline-backup.world-label": {
     "defaultMessage": "ワールド"
   },
+  "content.modpack-card.installation-settings": {
+    "defaultMessage": "インストール設定"
+  },
   "content.page-layout.additional-content": {
     "defaultMessage": "追加のコンテンツ"
   },
@@ -959,6 +989,9 @@
   "external-files.permissions-card.attribution.moderation-status.passed": {
     "defaultMessage": "審査を通りました"
   },
+  "external-files.permissions-card.attribution.moderation-status.rejected-proof": {
+    "defaultMessage": "証明が拒否されました"
+  },
   "external-files.permissions-card.badge.attributed": {
     "defaultMessage": "完了しました"
   },
@@ -983,6 +1016,9 @@
   "external-files.permissions-card.editor.all-rights-reserved": {
     "defaultMessage": "無断転載禁止／ライセンスなし"
   },
+  "external-files.permissions-card.editor.custom-license-label": {
+    "defaultMessage": "ライセンスへのリンク"
+  },
   "external-files.permissions-card.editor.custom-license-my-project-label": {
     "defaultMessage": "ライセンス名はSPDX識別子であることが望ましい"
   },
@@ -1019,9 +1055,36 @@
   "external-files.permissions-card.editor.notes-placeholder": {
     "defaultMessage": "何かここに書いてください..."
   },
+  "external-files.permissions-card.editor.proof-image-alt": {
+    "defaultMessage": "証明のスクリーンショット {n}"
+  },
+  "external-files.permissions-card.editor.proof-image-remove": {
+    "defaultMessage": "画像を削除"
+  },
+  "external-files.permissions-card.editor.proof-images-label": {
+    "defaultMessage": "証明画像"
+  },
+  "external-files.permissions-card.editor.proof-images-upload-prompt": {
+    "defaultMessage": "ドラッグ＆ドロップしてアップロード、またはクリックして画像を選択"
+  },
+  "external-files.permissions-card.editor.proof-warning.body": {
+    "defaultMessage": "虚偽の申告や画像の改ざんが発覚した場合、プロジェクトの削除およびアカウントの停止措置が取られる可能性があります。"
+  },
+  "external-files.permissions-card.editor.proof-warning.title": {
+    "defaultMessage": "Modrinthスタッフが提出された証明を確認・検証する場合があります"
+  },
+  "external-files.permissions-card.editor.save": {
+    "defaultMessage": "帰属情報を保存"
+  },
   "external-files.permissions-card.editor.select-license-label": {
     "defaultMessage": "ライセンスを選んでください…"
   },
+  "external-files.permissions-card.editor.type-label": {
+    "defaultMessage": "パーミッションの理由"
+  },
+  "external-files.permissions-card.error.custom-license-required": {
+    "defaultMessage": "ライセンスへのリンクを含めてください。ライセンスがない場合は、「All Rights Reserved / ライセンスなし」を選択することをお勧めします。"
+  },
   "external-files.permissions-card.error.explanation-or-images-required": {
     "defaultMessage": "説明や根拠となる画像を少なくとも一枚提示してください。"
   },
@@ -1130,12 +1193,30 @@
   "external-files.permissions-card.reason.special-permission.description": {
     "defaultMessage": "あなたは、自身のModパックでこの作品を再配布するための特別な許可を得ています。"
   },
+  "external-files.permissions-card.remove-group": {
+    "defaultMessage": "グループを削除"
+  },
+  "external-files.permissions-card.remove-group-confirmation.description": {
+    "defaultMessage": "この操作により、この帰属グループとグループ内のすべてのファイルが完全に削除されます。この操作を取り消すことはできません。"
+  },
+  "external-files.permissions-card.remove-group-confirmation.title": {
+    "defaultMessage": "「{title}」を削除しますか？"
+  },
+  "external-files.permissions-card.remove-group-error.title": {
+    "defaultMessage": "グループを削除できませんでした"
+  },
+  "external-files.permissions-card.remove-group-shift-hint": {
+    "defaultMessage": "Shiftキーを押しながらクリックすると確認をスキップします"
+  },
   "external-files.permissions-card.split-file": {
     "defaultMessage": "グループから削除する"
   },
   "external-files.permissions-card.split-file-error.title": {
     "defaultMessage": "ファイルの分割に失敗"
   },
+  "external-files.permissions-card.unnamed-multi-group-title": {
+    "defaultMessage": "{filename} ほか{count}件"
+  },
   "external-files.permissions-card.updated-by-moderator": {
     "defaultMessage": "モデレーター"
   },
@@ -2003,6 +2084,12 @@
   "instances.modpack-content-modal.empty-title": {
     "defaultMessage": "コンテンツが見つかりません"
   },
+  "instances.modpack-content-modal.external-content": {
+    "defaultMessage": "外部"
+  },
+  "instances.modpack-content-modal.external-content-description": {
+    "defaultMessage": "このファイルは Modrinth 上で公開されていません"
+  },
   "instances.modpack-content-modal.header": {
     "defaultMessage": "Modpackコンテンツ"
   },
@@ -2012,6 +2099,9 @@
   "instances.modpack-content-modal.no-results": {
     "defaultMessage": "該当するプロジェクトがありません。"
   },
+  "instances.modpack-content-modal.open-in-slicer": {
+    "defaultMessage": "Slicer で開く"
+  },
   "instances.modpack-content-modal.search-placeholder": {
     "defaultMessage": "{count, number}件のプロジェクトを検索"
   },
@@ -2147,6 +2237,9 @@
   "label.details": {
     "defaultMessage": "詳細"
   },
+  "label.discover-content": {
+    "defaultMessage": "コンテンツを探す"
+  },
   "label.done": {
     "defaultMessage": "完了"
   },
@@ -2225,6 +2318,9 @@
   "label.password": {
     "defaultMessage": "パスワード"
   },
+  "label.permissions": {
+    "defaultMessage": "権限"
+  },
   "label.plan-custom": {
     "defaultMessage": "カスタム"
   },
@@ -2756,9 +2852,90 @@
   "payment-method.visa": {
     "defaultMessage": "Visa"
   },
+  "profile.bio.fallback.creator": {
+    "defaultMessage": "Modrinth クリエイター"
+  },
+  "profile.bio.fallback.user": {
+    "defaultMessage": "Modrinth ユーザー"
+  },
+  "profile.block-user.admonition-body": {
+    "defaultMessage": "{username} はあなたにフレンドリクエストの送信、共有インスタンスへの招待、および Modrinth Hosting サーバーへの招待ができなくなります。"
+  },
+  "profile.block-user.admonition-title": {
+    "defaultMessage": "このユーザーをブロックしてもよろしいですか？"
+  },
+  "profile.block-user.error-description": {
+    "defaultMessage": "このユーザーのブロック中にエラーが発生しました。もう一度お試しください。"
+  },
+  "profile.block-user.error-title": {
+    "defaultMessage": "ユーザーのブロックに失敗しました"
+  },
+  "profile.block-user.success-description": {
+    "defaultMessage": "{username} をブロックしました"
+  },
+  "profile.block-user.success-title": {
+    "defaultMessage": "ユーザーをブロックしました"
+  },
+  "profile.block-user.title": {
+    "defaultMessage": "{username} をブロック"
+  },
+  "profile.button.analytics": {
+    "defaultMessage": "ユーザーアナリティクスを表示"
+  },
+  "profile.button.billing": {
+    "defaultMessage": "ユーザーの請求情報を管理"
+  },
+  "profile.button.block": {
+    "defaultMessage": "ブロック"
+  },
+  "profile.button.create-collection": {
+    "defaultMessage": "コレクションを作成"
+  },
+  "profile.button.create-project": {
+    "defaultMessage": "プロジェクトを作成"
+  },
+  "profile.button.info": {
+    "defaultMessage": "ユーザーの詳細を表示"
+  },
+  "profile.button.manage-projects": {
+    "defaultMessage": "プロジェクトを管理"
+  },
+  "profile.button.remove-affiliate": {
+    "defaultMessage": "アフィリエイトから削除"
+  },
+  "profile.button.set-affiliate": {
+    "defaultMessage": "アフィリエイトに設定"
+  },
+  "profile.button.unblock": {
+    "defaultMessage": "ブロック解除"
+  },
+  "profile.details.error.github-popup-blocked": {
+    "defaultMessage": "Modrinth でのポップアップを許可してから、もう一度お試しください。"
+  },
+  "profile.details.label.loading-github-profile": {
+    "defaultMessage": "読み込み中…"
+  },
+  "profile.error.not-found": {
+    "defaultMessage": "ユーザーが見つかりません"
+  },
   "profile.label.badges": {
     "defaultMessage": "バッジ"
   },
+  "profile.label.no-projects": {
+    "defaultMessage": "このユーザーはまだプロジェクトがありません！"
+  },
+  "profile.label.no-projects-auth-description": {
+    "defaultMessage": "まだプロジェクトを何も持っていないようです。"
+  },
+  "profile.label.organizations": {
+    "defaultMessage": "組織"
+  },
+  "profile.official-account": {
+    "defaultMessage": "Modrinth 公式アカウント"
+  },
+  "profile.unblock-user.success-title": {
+    "defaultMessage": "ユーザーのブロックを解除しました"
+  },
   "project-card.date.published.tooltip": {
     "defaultMessage": "{date}に公開済み"
   },
@@ -2777,9 +2954,15 @@
   "project-card.environment.server": {
     "defaultMessage": "サーバー"
   },
+  "project-card.environment.singleplayer": {
+    "defaultMessage": "シングルプレイヤー"
+  },
   "project-type.all": {
     "defaultMessage": "すべて"
   },
+  "project-type.collection.plural": {
+    "defaultMessage": "コレクション"
+  },
   "project-type.datapack.capital": {
     "defaultMessage": "データパック"
   },
@@ -3638,9 +3821,54 @@
   "servers.access-page.activity-log-filter.action-types": {
     "defaultMessage": "アクション"
   },
+  "servers.access-page.activity-log-filter.action.addon-disabled": {
+    "defaultMessage": "無効化されたコンテンツ"
+  },
+  "servers.access-page.activity-log-filter.action.addon-enabled": {
+    "defaultMessage": "有効化されたコンテンツ"
+  },
+  "servers.access-page.activity-log-filter.action.addon-updated": {
+    "defaultMessage": "更新されたコンテンツ"
+  },
+  "servers.access-page.activity-log-filter.action.addon-uploaded": {
+    "defaultMessage": "アップロードされたコンテンツ"
+  },
+  "servers.access-page.activity-log-filter.action.backup-created": {
+    "defaultMessage": "バックアップを作成しました"
+  },
   "servers.access-page.activity-log-filter.action.backup-deleted": {
     "defaultMessage": "削除されたバックアップ"
   },
+  "servers.access-page.activity-log-filter.action.backup-renamed": {
+    "defaultMessage": "バックアップの名前を変更しました"
+  },
+  "servers.access-page.activity-log-filter.action.backup-restored": {
+    "defaultMessage": "バックアップを復元しました"
+  },
+  "servers.access-page.activity-log-filter.action.changed-server-name": {
+    "defaultMessage": "サーバー名を変更しました"
+  },
+  "servers.access-page.activity-log-filter.action.changed-server-subdomain": {
+    "defaultMessage": "サーバーのサブドメインを変更しました"
+  },
+  "servers.access-page.activity-log-filter.action.console-cleared": {
+    "defaultMessage": "コンソールをクリアしました"
+  },
+  "servers.access-page.activity-log-filter.action.console-command-executed": {
+    "defaultMessage": "コンソールコマンドを実行しました"
+  },
+  "servers.access-page.activity-log-filter.action.file-deleted": {
+    "defaultMessage": "ファイルを削除しました"
+  },
+  "servers.access-page.activity-log-filter.action.file-edited": {
+    "defaultMessage": "ファイルを編集しました"
+  },
+  "servers.access-page.activity-log-filter.action.file-renamed": {
+    "defaultMessage": "ファイル名を変更しました"
+  },
+  "servers.access-page.activity-log-filter.action.file-uploaded": {
+    "defaultMessage": "ファイルをアップロードしました"
+  },
   "servers.access-page.activity-log-filter.action.game-version-edited": {
     "defaultMessage": "Minecraftのバージョンを変更しました"
   },
@@ -3947,6 +4175,93 @@
   "servers.audit-log.event.config-changed": {
     "defaultMessage": "サーバーの設定が変更されました"
   },
+  "servers.audit-log.event.console-cleared": {
+    "defaultMessage": "コンソールをクリアしました"
+  },
+  "servers.audit-log.event.console-command-executed": {
+    "defaultMessage": "コンソールコマンド「<command></command>」を実行しました"
+  },
+  "servers.audit-log.event.entity-list.hidden-count": {
+    "defaultMessage": "+{count, number}"
+  },
+  "servers.audit-log.event.file-changed": {
+    "defaultMessage": "ファイル「<file></file>」を変更しました"
+  },
+  "servers.audit-log.event.file-deleted": {
+    "defaultMessage": "ファイル「<file></file>」を削除しました"
+  },
+  "servers.audit-log.event.file-edited": {
+    "defaultMessage": "ファイル「<file></file>」を編集しました"
+  },
+  "servers.audit-log.event.file-renamed": {
+    "defaultMessage": "「<from></from>」の名前を「<to></to>」に変更しました"
+  },
+  "servers.audit-log.event.file-uploaded": {
+    "defaultMessage": "<file></file>をアップロードしました"
+  },
+  "servers.audit-log.event.game-version-changed": {
+    "defaultMessage": "Minecraftのバージョンを <version></version> に変更しました"
+  },
+  "servers.audit-log.event.java-runtime-modified": {
+    "defaultMessage": "Javaの実行環境を <vendor></vendor> に変更しました"
+  },
+  "servers.audit-log.event.java-version-modified": {
+    "defaultMessage": "Javaのバージョンを <java-version></java-version> に変更しました"
+  },
+  "servers.audit-log.event.loader-and-version-changed": {
+    "defaultMessage": "ローダーを <loader></loader> <version></version> に変更しました"
+  },
+  "servers.audit-log.event.loader-changed": {
+    "defaultMessage": "ローダーを <loader></loader> に変更しました"
+  },
+  "servers.audit-log.event.loader-version-changed": {
+    "defaultMessage": "ローダーのバージョンを <version></version> に変更しました"
+  },
+  "servers.audit-log.event.loader-version-cleared": {
+    "defaultMessage": "ローダーのバージョン設定を消去しました"
+  },
+  "servers.audit-log.event.modpack-changed": {
+    "defaultMessage": "モッドパックを変更しました"
+  },
+  "servers.audit-log.event.modpack-changed-to-modpack": {
+    "defaultMessage": "モッドパックを <modpack></modpack> に変更しました"
+  },
+  "servers.audit-log.event.modpack-changed-to-version": {
+    "defaultMessage": "モッドパックのバージョンを <version></version> に変更しました"
+  },
+  "servers.audit-log.event.modpack-unlinked": {
+    "defaultMessage": "モッドパックの連携を解除しました"
+  },
+  "servers.audit-log.event.modpack-unlinked-modpack": {
+    "defaultMessage": "モッドパック <modpack></modpack> の連携を解除しました"
+  },
+  "servers.audit-log.event.modpack-unlinked-version": {
+    "defaultMessage": "モッドパックのバージョン <version></version> の連携を解除しました"
+  },
+  "servers.audit-log.event.port-allocation-added": {
+    "defaultMessage": "ポート割り当て <port></port> を追加しました"
+  },
+  "servers.audit-log.event.port-allocation-removed": {
+    "defaultMessage": "ポート割り当て <port></port> を削除しました"
+  },
+  "servers.audit-log.event.server-created": {
+    "defaultMessage": "サーバーを作成しました"
+  },
+  "servers.audit-log.event.server-killed": {
+    "defaultMessage": "サーバーを強制終了しました"
+  },
+  "servers.audit-log.event.server-metadata-changed": {
+    "defaultMessage": "サーバーのメタデータを変更しました"
+  },
+  "servers.audit-log.event.server-name-changed": {
+    "defaultMessage": "サーバー名を <name></name> に変更しました"
+  },
+  "servers.audit-log.event.server-plan-changed": {
+    "defaultMessage": "プランを <specs></specs> に変更しました"
+  },
+  "servers.audit-log.event.server-plan.new-plan": {
+    "defaultMessage": "新しいプラン"
+  },
   "servers.audit-log.event.server-plan.ram-gb": {
     "defaultMessage": "メモリ {amount, number} GB"
   },
@@ -3959,6 +4274,21 @@
   "servers.audit-log.event.server-plan.storage-mb": {
     "defaultMessage": "ストレージ {amount, number} MB"
   },
+  "servers.audit-log.event.server-properties-modified": {
+    "defaultMessage": "サーバープロパティ <properties></properties> を変更しました"
+  },
+  "servers.audit-log.event.server-properties-modified-label": {
+    "defaultMessage": "サーバープロパティを変更しました"
+  },
+  "servers.audit-log.event.server-reallocated": {
+    "defaultMessage": "サーバーの割り当てを変更しました"
+  },
+  "servers.audit-log.event.server-repaired": {
+    "defaultMessage": "サーバーを修復しました"
+  },
+  "servers.audit-log.event.server-reset": {
+    "defaultMessage": "サーバーをリセットしました"
+  },
   "servers.audit-log.scope.server": {
     "defaultMessage": "サーバー"
   },
@@ -4289,15 +4619,66 @@
   "servers.listing.notice.pending-change": {
     "defaultMessage": "あなたのサーバーは <date>{formattedDate}</date>に {planSize} へと {verb, select, downgrade {ダウングレード} other {アップグレード}} されます。"
   },
+  "servers.listing.support-label": {
+    "defaultMessage": "サポート"
+  },
+  "servers.manage.new-server-button": {
+    "defaultMessage": "新しいサーバー"
+  },
+  "servers.manage.no-servers-found": {
+    "defaultMessage": "サーバーは見つかりませんでした。"
+  },
   "servers.manage.reload-button": {
     "defaultMessage": "再読み込み"
   },
+  "servers.manage.resubscribe-submitted.text": {
+    "defaultMessage": "現在サーバーがキャンセルされている場合、再課金の試行までに最大10分ほどかかることがあります。"
+  },
+  "servers.manage.resubscribe-submitted.title": {
+    "defaultMessage": "再購読のリクエストを送信しました"
+  },
+  "servers.manage.resubscribe-success.text": {
+    "defaultMessage": "サーバーのサブスクリプションが完了しました"
+  },
+  "servers.manage.resubscribe-success.title": {
+    "defaultMessage": "成功"
+  },
+  "servers.manage.servers-title": {
+    "defaultMessage": "Modrinth ホスティング"
+  },
+  "servers.manage.settings-hint.description": {
+    "defaultMessage": "こちらに移動しました！"
+  },
+  "servers.manage.settings-hint.dismiss": {
+    "defaultMessage": "次回から表示しない"
+  },
+  "servers.manage.settings-hint.title": {
+    "defaultMessage": "サーバー設定の場所が移動しました"
+  },
+  "servers.manage.shared-servers-title": {
+    "defaultMessage": "共有サーバー"
+  },
   "servers.manage.your-servers-title": {
     "defaultMessage": "あなたのサーバー"
   },
   "servers.medal-listing.new-server-label": {
     "defaultMessage": "新しいサーバー"
   },
+  "servers.medal-listing.notice.medal-trial-ended": {
+    "defaultMessage": "Medalサーバーの試用期間が終了し、サーバーがサスペンド（停止）されました。サーバーを引き続き利用するにはアップグレードしてください。"
+  },
+  "servers.medal-listing.notice.suspended": {
+    "defaultMessage": "サーバーがサスペンド（停止）されました。請求情報を更新するか、詳細は Modrinth サポートにお問い合わせください。"
+  },
+  "servers.medal-listing.notice.suspended-with-reason": {
+    "defaultMessage": "サーバーがサスペンド（停止）されました: {reason}。請求情報を更新するか、詳細は Modrinth サポートにお問い合わせください。"
+  },
+  "servers.medal-listing.notice.upgrading": {
+    "defaultMessage": "サーバーのハードウェアをアップグレード中です。まもなくオンラインに戻ります。"
+  },
+  "servers.medal-listing.owner-avatar-alt": {
+    "defaultMessage": "{username} のアバター"
+  },
   "servers.medal-listing.owner-tooltip": {
     "defaultMessage": "{username}によって所有されています"
   },
@@ -4352,9 +4733,15 @@
   "servers.purchase.step.payment.title": {
     "defaultMessage": "支払い方法"
   },
+  "servers.purchase.step.plan.billing-subtitle": {
+    "defaultMessage": "北米、ヨーロッパ、東南アジアでご利用いただけます。"
+  },
   "servers.purchase.step.plan.custom.desc": {
     "defaultMessage": "必要な仕様だけのカスタマイズされたプランを選択。"
   },
+  "servers.purchase.step.plan.custom.heading": {
+    "defaultMessage": "必要なものがお決まりですか？"
+  },
   "servers.purchase.step.plan.get-started": {
     "defaultMessage": "始めましょう"
   },
@@ -4385,6 +4772,9 @@
   "servers.purchase.step.plan.title": {
     "defaultMessage": "プラン"
   },
+  "servers.purchase.step.plan.your-current-plan": {
+    "defaultMessage": "現在のプラン"
+  },
   "servers.purchase.step.region.title": {
     "defaultMessage": "地域"
   },
@@ -4424,12 +4814,99 @@
   "servers.region.western-europe": {
     "defaultMessage": "西ヨーロッパ"
   },
+  "servers.remove-access-modal.added-label": {
+    "defaultMessage": "{time} に追加済み"
+  },
+  "servers.remove-access-modal.cancel-button": {
+    "defaultMessage": "招待を取り消す"
+  },
+  "servers.remove-access-modal.cancel-effect-access": {
+    "defaultMessage": "このサーバーには追加されません"
+  },
+  "servers.remove-access-modal.cancel-effect-invite": {
+    "defaultMessage": "あとから再度招待を送ることもできます"
+  },
+  "servers.remove-access-modal.cancel-header": {
+    "defaultMessage": "招待を取り消す"
+  },
+  "servers.remove-access-modal.cancel-warning-body": {
+    "defaultMessage": "この招待を取り消すと、{username} がこのサーバーに参加するには新しい招待が必要になります。"
+  },
+  "servers.remove-access-modal.header": {
+    "defaultMessage": "アクセス権を取り消す"
+  },
+  "servers.remove-access-modal.invited-label": {
+    "defaultMessage": "{time} に招待済み"
+  },
+  "servers.remove-access-modal.pending-invite-label": {
+    "defaultMessage": "保留中の招待"
+  },
+  "servers.remove-access-modal.remove-button": {
+    "defaultMessage": "アクセス権を取り消す"
+  },
+  "servers.remove-access-modal.remove-effect-access": {
+    "defaultMessage": "サーバーパネルへのアクセス権が即座に無効化され、コンテンツの編集ができなくなります"
+  },
+  "servers.remove-access-modal.remove-effect-join": {
+    "defaultMessage": "個別に設定を変更しない限り、ユーザーは引き続きサーバーに参加してプレイすることができます"
+  },
+  "servers.remove-access-modal.unknown-added-label": {
+    "defaultMessage": "追加日不明"
+  },
+  "servers.remove-access-modal.user-avatar-alt": {
+    "defaultMessage": "{username} のアバター"
+  },
+  "servers.remove-access-modal.warning-body": {
+    "defaultMessage": "ユーザーのサーバーアクセス権を取り消した場合、アクセスを復元するには再度招待し直す必要があります。"
+  },
+  "servers.remove-access-modal.what-happens-label": {
+    "defaultMessage": "どうなるの？"
+  },
+  "servers.setup.onboarding.installation-failed.text": {
+    "defaultMessage": "インストール中に予期しないエラーが発生しました。時間をおいて再度お試しください。"
+  },
+  "servers.setup.onboarding.installation-failed.title": {
+    "defaultMessage": "インストールの失敗"
+  },
+  "servers.setup.onboarding.modpack-upload-failed.text": {
+    "defaultMessage": "アップロード中に予期しないエラーが発生しました。時間をおいて再度お試しください。"
+  },
+  "servers.setup.onboarding.modpack-upload-failed.title": {
+    "defaultMessage": "モッドパックのアップロード失敗"
+  },
   "servers.setup.onboarding.setup-server.button": {
     "defaultMessage": "サーバーをセットアップ"
   },
+  "servers.setup.onboarding.step.choose.description": {
+    "defaultMessage": "Modrinthからお気に入りのモッドパックを選ぶか、ローダーを選択して好きなModを追加してください"
+  },
+  "servers.setup.onboarding.step.choose.title": {
+    "defaultMessage": "プレイするものを選ぶ"
+  },
+  "servers.setup.onboarding.step.configure-world.description": {
+    "defaultMessage": "シングルプレイと同じようにワールドを設定できます。ゲームモードとワールドシード値を選択してください"
+  },
+  "servers.setup.onboarding.step.configure-world.title": {
+    "defaultMessage": "ワールドを設定する"
+  },
+  "servers.setup.onboarding.step.invite-friends.description": {
+    "defaultMessage": "アドレスをコピーして友達に共有し、参加に必要なModを教えてあげましょう"
+  },
   "servers.setup.onboarding.step.invite-friends.title": {
     "defaultMessage": "フレンドを招待"
   },
+  "servers.setup.onboarding.steps.heading": {
+    "defaultMessage": "サーバーをセットアップする（約2分）"
+  },
+  "servers.setup.onboarding.uploading.progress": {
+    "defaultMessage": "アップロード中 ({percent, number}%)"
+  },
+  "servers.setup.onboarding.welcome.description": {
+    "defaultMessage": "サーバーの準備が完了しました。プレイを開始する手順は以下の通りです！"
+  },
+  "servers.setup.onboarding.welcome.title": {
+    "defaultMessage": "Modrinth ホスティングへようこそ"
+  },
   "servers.setup.rate-limit.text": {
     "defaultMessage": "レート制限に達しました。時間をおいて再試行してください。"
   },
@@ -4490,6 +4967,9 @@
   "settings.display.theme.title": {
     "defaultMessage": "カラーテーマ"
   },
+  "settings.feature-flags.title": {
+    "defaultMessage": "機能フラグ"
+  },
   "settings.language.categories.default": {
     "defaultMessage": "一般的な言語"
   },
@@ -4523,9 +5003,57 @@
   "settings.pats.title": {
     "defaultMessage": "個人用アクセストークン"
   },
+  "settings.profile.bio.title": {
+    "defaultMessage": "自己紹介"
+  },
+  "settings.profile.navigation-title": {
+    "defaultMessage": "プロファイル"
+  },
+  "settings.profile.profile-picture.title": {
+    "defaultMessage": "プロファイルアイコン"
+  },
   "settings.sessions.title": {
     "defaultMessage": "セッション"
   },
+  "settings.social.blocked-users.unblock": {
+    "defaultMessage": "ブロックを解除"
+  },
+  "settings.social.interaction-source.coming-soon": {
+    "defaultMessage": "近日公開！"
+  },
+  "settings.social.interaction-source.everyone": {
+    "defaultMessage": "全員"
+  },
+  "settings.social.interaction-source.friends": {
+    "defaultMessage": "フレンド"
+  },
+  "settings.social.interaction-source.friends-of-friends": {
+    "defaultMessage": "フレンドのフレンド"
+  },
+  "settings.social.interaction-source.no-one": {
+    "defaultMessage": "なし"
+  },
+  "sharing.invite-players-modal.add": {
+    "defaultMessage": "追加"
+  },
+  "sharing.invite-players-modal.added": {
+    "defaultMessage": "追加済み"
+  },
+  "sharing.invite-players-modal.apply-button": {
+    "defaultMessage": "適用"
+  },
+  "sharing.invite-players-modal.custom-expiry": {
+    "defaultMessage": "カスタム…"
+  },
+  "sharing.invite-players-modal.friends-heading": {
+    "defaultMessage": "あなたのフレンド - {count} 人"
+  },
+  "sharing.invite-players-modal.invite": {
+    "defaultMessage": "招待"
+  },
+  "sharing.invite-players-modal.save-button": {
+    "defaultMessage": "保存"
+  },
   "tag.category.128x": {
     "defaultMessage": "128x"
   },
@@ -5048,6 +5576,9 @@
   "version.section.content.search-placeholder": {
     "defaultMessage": "コンテンツを検索…"
   },
+  "version.section.dependencies.any-version": {
+    "defaultMessage": "すべてのバージョン"
+  },
   "version.section.files": {
     "defaultMessage": "ファイル"
   },
diff --git a/packages/ui/src/locales/ms-MY/index.json b/packages/ui/src/locales/ms-MY/index.json
index 07a9a3002a..225cb67d6c 100644
--- a/packages/ui/src/locales/ms-MY/index.json
+++ b/packages/ui/src/locales/ms-MY/index.json
@@ -5055,3 +5055,4 @@
     "defaultMessage": "Jenis"
   }
 }
+
diff --git a/packages/ui/src/locales/nl-NL/index.json b/packages/ui/src/locales/nl-NL/index.json
index 40df10dea6..44ed5407ee 100644
--- a/packages/ui/src/locales/nl-NL/index.json
+++ b/packages/ui/src/locales/nl-NL/index.json
@@ -566,6 +566,9 @@
   "content.inline-backup.world-label": {
     "defaultMessage": "wereld"
   },
+  "content.modpack-card.installation-settings": {
+    "defaultMessage": "Installatie-instellingen"
+  },
   "content.page-layout.additional-content": {
     "defaultMessage": "Extra inhoud"
   },
@@ -2228,6 +2231,9 @@
   "label.details": {
     "defaultMessage": "Details"
   },
+  "label.discover-content": {
+    "defaultMessage": "Ontdek inhoud"
+  },
   "label.done": {
     "defaultMessage": "Klaar"
   },
@@ -2846,12 +2852,36 @@
   "profile.bio.fallback.user": {
     "defaultMessage": "Een gebruiker van Modrinth."
   },
+  "profile.block-user.admonition-body": {
+    "defaultMessage": "{username} zal je geen vriendschapsverzoeken kunnen sturen, je niet kunnen uitnodigen voor gedeelde instanties en je ook niet kunnen uitnodigen voor Modrinth Hosting-servers."
+  },
+  "profile.block-user.admonition-title": {
+    "defaultMessage": "Weet je zeker dat je deze gebruiker wilt blokkeren?"
+  },
+  "profile.block-user.error-description": {
+    "defaultMessage": "Er is een fout opgetreden bij het blokkeren van deze gebruiker. Probeer het nog eens."
+  },
+  "profile.block-user.error-title": {
+    "defaultMessage": "Gebruiker blokkeren mislukt"
+  },
+  "profile.block-user.success-description": {
+    "defaultMessage": "{username} is geblokkeerd."
+  },
+  "profile.block-user.success-title": {
+    "defaultMessage": "Gebruiker geblokkeerd"
+  },
+  "profile.block-user.title": {
+    "defaultMessage": "{username} blokkeren"
+  },
   "profile.button.analytics": {
     "defaultMessage": "Gebruikersstatistieken bekijken"
   },
   "profile.button.billing": {
     "defaultMessage": "Gebruikersfacturering beheren"
   },
+  "profile.button.block": {
+    "defaultMessage": "Blokkeren"
+  },
   "profile.button.create-collection": {
     "defaultMessage": "Een collectie aanmaken"
   },
@@ -2870,9 +2900,21 @@
   "profile.button.set-affiliate": {
     "defaultMessage": "Als partner instellen"
   },
+  "profile.button.unblock": {
+    "defaultMessage": "Deblokkeren"
+  },
   "profile.collection.projects-count": {
     "defaultMessage": "{count, plural, one {# project} other {# projecten}}"
   },
+  "profile.details.error.github-popup-blocked": {
+    "defaultMessage": "Schakel pop-ups voor Modrinth in en probeer het vervolgens opnieuw."
+  },
+  "profile.details.error.github-profile-message": {
+    "defaultMessage": "Het GitHub-profiel kon niet worden opgehaald. Probeer het nog eens."
+  },
+  "profile.details.error.github-profile-title": {
+    "defaultMessage": "Kan GitHub-profiel niet openen"
+  },
   "profile.details.label.auth-providers": {
     "defaultMessage": "Authenticatieproviders"
   },
@@ -2885,9 +2927,15 @@
   "profile.details.label.has-totp": {
     "defaultMessage": "Heeft TOTP"
   },
+  "profile.details.label.loading-github-profile": {
+    "defaultMessage": "Laden..."
+  },
   "profile.details.label.payment-methods": {
     "defaultMessage": "Betaalmethoden"
   },
+  "profile.details.label.view-github-profile": {
+    "defaultMessage": "Profiel bekijken"
+  },
   "profile.details.title": {
     "defaultMessage": "Gebruikersgegevens"
   },
@@ -2939,6 +2987,21 @@
   "profile.official-account": {
     "defaultMessage": "Officieel Modrinth-account"
   },
+  "profile.official-account.bio": {
+    "defaultMessage": "Het officiële gebruikersaccount van Modrinth. Neem contact op met het Helpcentrum via <support-link></support-link> of per e-mail via <email></email>"
+  },
+  "profile.unblock-user.error-description": {
+    "defaultMessage": "Er is een fout opgetreden bij het deblokkeren van deze gebruiker. Probeer het nog eens."
+  },
+  "profile.unblock-user.error-title": {
+    "defaultMessage": "Kan gebruiker niet deblokkeren"
+  },
+  "profile.unblock-user.success-description": {
+    "defaultMessage": "{username} is gedeblokkeerd."
+  },
+  "profile.unblock-user.success-title": {
+    "defaultMessage": "Gebruiker gedeblokkeerd"
+  },
   "project-card.date.published.tooltip": {
     "defaultMessage": "Gepubliceerd op {date}"
   },
@@ -5195,9 +5258,120 @@
   "settings.pats.title": {
     "defaultMessage": "Persoonlijke toegangstokens"
   },
+  "settings.profile.bio.description": {
+    "defaultMessage": "Een korte beschrijving om iedereen iets over jezelf te vertellen."
+  },
+  "settings.profile.bio.title": {
+    "defaultMessage": "Bio"
+  },
+  "settings.profile.navigation-title": {
+    "defaultMessage": "Profiel"
+  },
+  "settings.profile.profile-picture.title": {
+    "defaultMessage": "Profielfoto"
+  },
+  "settings.profile.public-information.description": {
+    "defaultMessage": "Je profielgegevens zijn openbaar <profile-link>te bekijken op Modrinth</profile-link> en via de <docs-link>Modrinth API</docs-link>."
+  },
+  "settings.profile.save-error": {
+    "defaultMessage": "Het bijwerken van het profiel is mislukt"
+  },
+  "settings.profile.save-error-description": {
+    "defaultMessage": "Er is een fout opgetreden bij het bijwerken van je profiel. Probeer het nog eens."
+  },
+  "settings.profile.sign-in-required.description": {
+    "defaultMessage": "Log in met een Modrinth-account om je openbare profiel aan te passen."
+  },
+  "settings.profile.sign-in-required.title": {
+    "defaultMessage": "Modrinth-account vereist"
+  },
+  "settings.profile.username.description": {
+    "defaultMessage": "Een unieke, hoofdletterongevoelige naam waarmee je profiel wordt geïdentificeerd."
+  },
   "settings.sessions.title": {
     "defaultMessage": "Sessies"
   },
+  "settings.social.blocked-users.column.actions": {
+    "defaultMessage": "Acties"
+  },
+  "settings.social.blocked-users.column.user": {
+    "defaultMessage": "Gebruiker"
+  },
+  "settings.social.blocked-users.description": {
+    "defaultMessage": "Dit zijn de gebruikers die je op Modrinth hebt geblokkeerd. Zij kunnen jou niet:"
+  },
+  "settings.social.blocked-users.empty": {
+    "defaultMessage": "Je hebt niemand geblokkeerd."
+  },
+  "settings.social.blocked-users.load-error": {
+    "defaultMessage": "De geblokkeerde gebruikers konden niet worden geladen."
+  },
+  "settings.social.blocked-users.loading": {
+    "defaultMessage": "Geblokkeerde gebruikers laden…"
+  },
+  "settings.social.blocked-users.restriction.friend-requests": {
+    "defaultMessage": "Een vriendschapsverzoek sturen"
+  },
+  "settings.social.blocked-users.restriction.hosting": {
+    "defaultMessage": "Uitnodigen om een Modrinth Hosting-server te beheren."
+  },
+  "settings.social.blocked-users.restriction.shared-instances": {
+    "defaultMessage": "Uitnodigen voor gedeelde instanties"
+  },
+  "settings.social.blocked-users.title": {
+    "defaultMessage": "Geblokkeerde gebruikers"
+  },
+  "settings.social.blocked-users.unblock": {
+    "defaultMessage": "Deblokkeren"
+  },
+  "settings.social.blocked-users.unblock-error": {
+    "defaultMessage": "Kan gebruiker niet deblokkeren"
+  },
+  "settings.social.blocked-users.unblock-error-description": {
+    "defaultMessage": "Er is een fout opgetreden bij het deblokkeren van deze gebruiker. Probeer het nog eens."
+  },
+  "settings.social.blocked-users.unblock-user": {
+    "defaultMessage": "{username} deblokkeren"
+  },
+  "settings.social.blocked-users.user-avatar": {
+    "defaultMessage": "Avatar van {username}"
+  },
+  "settings.social.friend-requests.description": {
+    "defaultMessage": "Bepaal zelf wie je vriendschapsverzoeken kan sturen op Modrinth."
+  },
+  "settings.social.friend-requests.title": {
+    "defaultMessage": "Vriendschapsverzoeken"
+  },
+  "settings.social.interaction-source.coming-soon": {
+    "defaultMessage": "Binnenkort beschikbaar!"
+  },
+  "settings.social.interaction-source.everyone": {
+    "defaultMessage": "Iedereen"
+  },
+  "settings.social.interaction-source.friends": {
+    "defaultMessage": "Vrienden"
+  },
+  "settings.social.interaction-source.friends-of-friends": {
+    "defaultMessage": "Vrienden van vrienden"
+  },
+  "settings.social.interaction-source.no-one": {
+    "defaultMessage": "Niemand"
+  },
+  "settings.social.shared-instance-invites.description": {
+    "defaultMessage": "Bepaal zelf wie je uitnodigingen kan sturen voor gedeelde instanties en Modrinth Hosting-panelen."
+  },
+  "settings.social.shared-instance-invites.title": {
+    "defaultMessage": "Uitnodigingen"
+  },
+  "settings.social.sign-in-required.description": {
+    "defaultMessage": "Met een Modrinth-account kun je bepalen wie er contact met je kan opnemen en kun je geblokkeerde gebruikers beheren"
+  },
+  "settings.social.sign-in-required.title": {
+    "defaultMessage": "Modrinth-account vereist"
+  },
+  "settings.social.title": {
+    "defaultMessage": "Sociaal"
+  },
   "sharing.invite-players-modal.add": {
     "defaultMessage": "Toevoegen"
   },
@@ -5207,15 +5381,42 @@
   "sharing.invite-players-modal.already-invited": {
     "defaultMessage": "Deze gebruiker is al uitgenodigd."
   },
+  "sharing.invite-players-modal.apply-button": {
+    "defaultMessage": "Toepassen"
+  },
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "Avatar van {username}"
   },
+  "sharing.invite-players-modal.custom-expiry": {
+    "defaultMessage": "Aangepast..."
+  },
+  "sharing.invite-players-modal.custom-expiry-value": {
+    "defaultMessage": "Aangepast: {date}"
+  },
   "sharing.invite-players-modal.edit-invite-link": {
     "defaultMessage": "Uitnodigingslink bewerken."
   },
   "sharing.invite-players-modal.edit-invite-link-title": {
     "defaultMessage": "Uitnodigingslink bewerken"
   },
+  "sharing.invite-players-modal.expiry-in-one-day": {
+    "defaultMessage": "Over 1 dag"
+  },
+  "sharing.invite-players-modal.expiry-in-one-hour": {
+    "defaultMessage": "Over 1 uur"
+  },
+  "sharing.invite-players-modal.expiry-in-seven-days": {
+    "defaultMessage": "Over 7 dagen"
+  },
+  "sharing.invite-players-modal.expiry-in-six-hours": {
+    "defaultMessage": "Over 6 uur"
+  },
+  "sharing.invite-players-modal.expiry-in-three-days": {
+    "defaultMessage": "Over 3 dagen"
+  },
+  "sharing.invite-players-modal.expiry-in-twelve-hours": {
+    "defaultMessage": "Over 12 uur"
+  },
   "sharing.invite-players-modal.expiry-label": {
     "defaultMessage": "Vervaldatum"
   },
diff --git a/packages/ui/src/locales/pt-BR/index.json b/packages/ui/src/locales/pt-BR/index.json
index 8d76406a29..2467fbbb69 100644
--- a/packages/ui/src/locales/pt-BR/index.json
+++ b/packages/ui/src/locales/pt-BR/index.json
@@ -6231,3 +6231,4 @@
     "defaultMessage": "Tipo"
   }
 }
+
diff --git a/packages/ui/src/locales/pt-PT/index.json b/packages/ui/src/locales/pt-PT/index.json
index 3fae453a27..6a5706345e 100644
--- a/packages/ui/src/locales/pt-PT/index.json
+++ b/packages/ui/src/locales/pt-PT/index.json
@@ -2523,3 +2523,4 @@
     "defaultMessage": "Tens alterações por guardar."
   }
 }
+
diff --git a/packages/ui/src/locales/ru-RU/index.json b/packages/ui/src/locales/ru-RU/index.json
index 7a2e25906f..31701a083b 100644
--- a/packages/ui/src/locales/ru-RU/index.json
+++ b/packages/ui/src/locales/ru-RU/index.json
@@ -348,10 +348,10 @@
     "defaultMessage": "Выбрать {project}"
   },
   "content.confirm-bulk-update.admonition-body": {
-    "defaultMessage": "Вы уверены, что хотите обновить {count, plural, one {# проект} few {# проекта} other {# проектов}} до их последней совместимой версии? Рекомендуется обновлять контент по отдельности."
+    "defaultMessage": "Вы точно хотите обновить {count, plural, one {# проект} few {# проекта} other {# проектов}} до {count, plural, =1 {последней совместимой версии} other {последних совместимых версий}}? Рекомендуется обновлять контент по очереди."
   },
   "content.confirm-bulk-update.admonition-header": {
-    "defaultMessage": "Предупреждение об обновлении"
+    "defaultMessage": "Предупреждение об обновлении"
   },
   "content.confirm-bulk-update.header": {
     "defaultMessage": "Обновление проектов"
@@ -363,10 +363,10 @@
     "defaultMessage": "Обновить {count, plural, one {# проект} few {# проекта} other {# проектов}}"
   },
   "content.confirm-deletion.admonition-body": {
-    "defaultMessage": "Удаление мода может необратимо повлиять на ваш мир, что приведет к потере контента или непредвиденным ошибкам при следующей загрузке."
+    "defaultMessage": "Удаление модов может повлиять на миры и привести к необратимой пропаже контента или ошибкам при следующей загрузке."
   },
   "content.confirm-deletion.admonition-header": {
-    "defaultMessage": "Предупреждение об удалении"
+    "defaultMessage": "Предупреждение об удалении"
   },
   "content.confirm-deletion.header": {
     "defaultMessage": "Удалить {itemType}"
@@ -375,10 +375,10 @@
     "defaultMessage": "Отключить {itemType}"
   },
   "content.confirm-modpack-update.admonition-body": {
-    "defaultMessage": "{action, select, downgrade {Понижение версии} other {Обновление}} может привести к проблемам с совместимостью. Моды или другой контент, который вы установили в сборку, сохранятся, но могут быть несовместимы с новой версией."
+    "defaultMessage": "{action, select, downgrade {Откат} other {Обновление}} может нарушить совместимость. Добавленные вами моды и контент останутся, но могут перестать работать в новой версии."
   },
   "content.confirm-modpack-update.admonition-header": {
-    "defaultMessage": "Предупреждение: {action, select, downgrade {откат} other {обновление}} версии"
+    "defaultMessage": "Предупреждение об {action, select, downgrade {откате} other {обновлении}}"
   },
   "content.confirm-modpack-update.confirm-button": {
     "defaultMessage": "{action, select, downgrade {Откатить} other {Обновить}} сборку"
@@ -387,7 +387,7 @@
     "defaultMessage": "{action, select, downgrade {Откат} other {Обновление}} сборки"
   },
   "content.confirm-unlink.admonition-body": {
-    "defaultMessage": "Моды и контент будут объединены с тем, что вы добавили в сборку. После этого сборка перестанет получать обновления."
+    "defaultMessage": "Моды и контент объединятся с вашими добавлениями, но сборка перестанет получать обновления."
   },
   "content.confirm-unlink.admonition-header": {
     "defaultMessage": "Отвязка сборки"
@@ -1809,52 +1809,52 @@
     "defaultMessage": "Настройка установки"
   },
   "installation-settings.edit.warning-instance": {
-    "defaultMessage": "Мы не рекомендуем изменять настройки сборки после установки контента. Если вы всё же хотите их изменить, будьте осторожны, так как это может вызвать проблемы."
+    "defaultMessage": "Не рекомендуется изменять установку после добавления контента. Это может привести к ошибкам."
   },
   "installation-settings.edit.warning-server": {
-    "defaultMessage": "Не рекомендуется менять настройки инсталляции после установки контента. Если вы всё же хотите изменить их, перезагрузите сервер."
+    "defaultMessage": "Не рекомендуется изменять установку после добавления контента. Лучше сразу переустановить сервер."
   },
   "installation-settings.incompatible-content.auto-fix-button": {
-    "defaultMessage": "Авто-исправление"
+    "defaultMessage": "Исправить"
   },
   "installation-settings.incompatible-content.change-loader-button": {
     "defaultMessage": "Сменить загрузчик"
   },
   "installation-settings.incompatible-content.disable-conflicts-button": {
-    "defaultMessage": "Отключить конфликты"
+    "defaultMessage": "Отключить"
   },
   "installation-settings.incompatible-content.game-version-warning-body": {
-    "defaultMessage": "При изменении версии игры вы можете либо отключить несовместимый контент, либо попытаться устранить несовместимости."
+    "defaultMessage": "При смене версии игры можно отключить несовместимый контент или попытаться исправить несовместимости автоматически."
   },
   "installation-settings.incompatible-content.game-version-warning-title": {
-    "defaultMessage": "Предупреждение о несовместимости"
+    "defaultMessage": "Предупреждение о несовместимости"
   },
   "installation-settings.incompatible-content.header": {
-    "defaultMessage": "Установлены несовместимые проекты"
+    "defaultMessage": "Нарушение совместимости"
   },
   "installation-settings.incompatible-content.loader-change-body": {
-    "defaultMessage": "При смене загрузчика модов, все установленные проекты будут отключены. Вместо этого рекомендуется сбросить сервер."
+    "defaultMessage": "Смена загрузчика отключит установленный контент. Лучше сразу переустановить сервер."
   },
   "installation-settings.incompatible-content.loader-change-title": {
     "defaultMessage": "Смена загрузчика небезопасна"
   },
   "installation-settings.linked-instance.title": {
-    "defaultMessage": "Связанный {projectType}"
+    "defaultMessage": "Отвязка {projectType}"
   },
   "installation-settings.linked.modpack": {
-    "defaultMessage": "сборка"
+    "defaultMessage": "сборки"
   },
   "installation-settings.linked.server-project": {
-    "defaultMessage": "серверный проект"
+    "defaultMessage": "серверного проекта"
   },
   "installation-settings.loader-version": {
     "defaultMessage": "Версия {loader}"
   },
   "installation-settings.platform-lock-tooltip": {
-    "defaultMessage": "Необходимо сбросить сервер для изменения загрузчика."
+    "defaultMessage": "Для смены загрузчика необходимо переустановить сервер."
   },
   "installation-settings.reinstall-modpack.description": {
-    "defaultMessage": "Переустановка сборки сбросит контент, который использует {type}, до исходного состояния, удалив все добавленные вами моды и файлы."
+    "defaultMessage": "Переустановка сбросит {type} к исходному состоянию, удалив все добавленные вами моды и контент."
   },
   "installation-settings.reinstall-modpack.title": {
     "defaultMessage": "Переустановка сборки"
@@ -1884,31 +1884,31 @@
     "defaultMessage": "Поиск версии игры..."
   },
   "installation-settings.type.instance": {
-    "defaultMessage": "сборка"
+    "defaultMessage": "сборку"
   },
   "installation-settings.type.instance-possessive": {
-    "defaultMessage": "сборки"
+    "defaultMessage": "сборку"
   },
   "installation-settings.type.server": {
     "defaultMessage": "сервер"
   },
   "installation-settings.type.server-possessive": {
-    "defaultMessage": "серверы"
+    "defaultMessage": "сервер"
   },
   "installation-settings.unlink": {
     "defaultMessage": "Отвязать"
   },
   "installation-settings.unlink.description": {
-    "defaultMessage": "Отвязка навсегда отключит этот {type} от проекта {projectType}, что позволит вам изменить загрузчик и версию Minecraft, но вы больше не сможете получать обновления."
+    "defaultMessage": "Отвязка навсегда отключит {type} от исходного проекта. Это откроет доступ к смене версии игры и загрузчика, но получение обновлений прекратится."
   },
   "installation-settings.verifying": {
     "defaultMessage": "Проверка..."
   },
   "instance.confirm-reinstall.admonition-body": {
-    "defaultMessage": "Переустановка сбросит весь установленный или изменённый контент к начальному состоянию, удалив моды и контент, добавленные поверх исходной установки."
+    "defaultMessage": "Переустановка сбросит установленное содержимое к исходному состоянию, удалив добавленные вами моды и контент."
   },
   "instance.confirm-reinstall.admonition-header": {
-    "defaultMessage": "Предупреждение переустановки"
+    "defaultMessage": "Предупреждение о переустановке"
   },
   "instance.confirm-reinstall.header": {
     "defaultMessage": "Переустановка сборки"
@@ -4452,7 +4452,7 @@
     "defaultMessage": "После удаления {count, plural, one {эта резервная копия не может быть восстановлена} other {эти резервные копии не могут быть восстановлены}}. Удаление необратимо."
   },
   "servers.backups.delete-modal.admonition-header": {
-    "defaultMessage": "Предупреждение об удалении"
+    "defaultMessage": "Предупреждение об удалении"
   },
   "servers.backups.delete-modal.backups-label": {
     "defaultMessage": "{count, plural, one {Резервная копия} other {Резервные копии ({count})}}"
@@ -5268,7 +5268,7 @@
     "defaultMessage": "Скоро будет!"
   },
   "settings.social.interaction-source.everyone": {
-    "defaultMessage": "Каждый"
+    "defaultMessage": "Все"
   },
   "settings.social.interaction-source.friends": {
     "defaultMessage": "Друзья"
diff --git a/packages/ui/src/locales/sr-CS/index.json b/packages/ui/src/locales/sr-CS/index.json
index a7d528128b..ad1b71e4ae 100644
--- a/packages/ui/src/locales/sr-CS/index.json
+++ b/packages/ui/src/locales/sr-CS/index.json
@@ -5781,3 +5781,4 @@
     "defaultMessage": "Tip"
   }
 }
+
diff --git a/packages/ui/src/locales/sv-SE/index.json b/packages/ui/src/locales/sv-SE/index.json
index 84cda49a99..a8bd5ccf7f 100644
--- a/packages/ui/src/locales/sv-SE/index.json
+++ b/packages/ui/src/locales/sv-SE/index.json
@@ -117,7 +117,7 @@
     "defaultMessage": "Du har valt {count, number} projekt att installera. Installera dem nu eller gå tillbaka utan att installera dem."
   },
   "browse.selected-projects-leave-modal.admonition-header": {
-    "defaultMessage": "Valda projekt är inte installerade än"
+    "defaultMessage": "De valda projekten är inte installerade än"
   },
   "browse.selected-projects-leave-modal.discard": {
     "defaultMessage": "Kasta"
@@ -500,6 +500,9 @@
   "content.diff-modal.removed-count": {
     "defaultMessage": "{count} borttagna"
   },
+  "content.diff-modal.reviewed-files": {
+    "defaultMessage": "En fil granskas bara om den publiceras på Modrinth, oavsett dess filformat (däribland .mrpack)."
+  },
   "content.diff-modal.unknown-content-body": {
     "defaultMessage": "Något innehåll på din server kunde inte analyseras och kommer kanske påverkas av denna ändring."
   },
@@ -557,6 +560,9 @@
   "content.inline-backup.world-label": {
     "defaultMessage": "värld"
   },
+  "content.modpack-card.installation-settings": {
+    "defaultMessage": "Installationsinställningar"
+  },
   "content.page-layout.additional-content": {
     "defaultMessage": "Ytterligare innehåll"
   },
@@ -792,7 +798,7 @@
     "defaultMessage": "Ange världnamn"
   },
   "creation-flow.modal.final-config.world-seed.description": {
-    "defaultMessage": "Lämna tom för slumpmässig utsäde."
+    "defaultMessage": "Lämna tom för slumpmässig frö."
   },
   "creation-flow.modal.final-config.world-seed.placeholder": {
     "defaultMessage": "Ange världsfrö"
@@ -860,12 +866,21 @@
   "creation-flow.modal.setup-type.option.import-instance.title": {
     "defaultMessage": "Importera instans"
   },
+  "creation-flow.modal.setup-type.option.modpack-base.description": {
+    "defaultMessage": "Bläddra bland modpaket på Modrinth eller importera ett från en fil."
+  },
   "creation-flow.modal.setup-type.option.modpack-base.title": {
     "defaultMessage": "Installera modpaket"
   },
   "creation-flow.modal.setup-type.option.vanilla-minecraft.description": {
     "defaultMessage": "Klassiska Minecraft, utan moddar eller plugin."
   },
+  "creation-flow.modal.setup-type.option.vanilla-minecraft.title": {
+    "defaultMessage": "Vanilla Minecraft"
+  },
+  "creation-flow.modal.setup-type.title.installation": {
+    "defaultMessage": "Välj installationstyp"
+  },
   "creation-flow.modal.setup-type.title.instance": {
     "defaultMessage": "Välj instanstyp"
   },
@@ -3359,6 +3374,9 @@
   "project.versions.channel.release.symbol": {
     "defaultMessage": "R"
   },
+  "project.versions.platform.modloader.short": {
+    "defaultMessage": "ModLoader"
+  },
   "project.visibility.archived": {
     "defaultMessage": "Arkiverad"
   },
@@ -3575,6 +3593,9 @@
   "servers.access-page.activity-log-filter.action.java-version-modified": {
     "defaultMessage": "Ändrade Java-version"
   },
+  "servers.access-page.activity-log-filter.action.loader-version-edited": {
+    "defaultMessage": "Ändrade loaderversion"
+  },
   "servers.access-page.activity-log-filter.action.modpack-changed": {
     "defaultMessage": "Ändrade modpaket"
   },
@@ -3875,6 +3896,18 @@
   "servers.audit-log.event.java-version-modified": {
     "defaultMessage": "Ändrade Java-version till <java-version></java-version>"
   },
+  "servers.audit-log.event.loader-and-version-changed": {
+    "defaultMessage": "Ändrade loader till <loader></loader> <version></version>"
+  },
+  "servers.audit-log.event.loader-changed": {
+    "defaultMessage": "Ändrade loader till <loader></loader>"
+  },
+  "servers.audit-log.event.loader-version-changed": {
+    "defaultMessage": "Ändrare loaderversion till <version></version>"
+  },
+  "servers.audit-log.event.loader-version-cleared": {
+    "defaultMessage": "Rensade laoaderversion"
+  },
   "servers.audit-log.event.modpack-changed": {
     "defaultMessage": "Ändrade modpaket"
   },
@@ -4160,12 +4193,18 @@
   "servers.installing-banner.error.internal-platform": {
     "defaultMessage": "Ett internt fel inträffade när plattformen installerades. Vänligen försök igen."
   },
+  "servers.installing-banner.error.invalid-loader-version": {
+    "defaultMessage": "Den angivna loader eller Minecraft-versionen kunde inte installeras. Den kan vara ogiltig eller stöds inte."
+  },
   "servers.installing-banner.error.modpack-install-failed": {
     "defaultMessage": "Modpaketet kunde inte installeras. Det kanske är korrumperad eller inkompatibel."
   },
   "servers.installing-banner.error.unknown": {
     "defaultMessage": "Ett oväntat fel inträffade under installeringen."
   },
+  "servers.installing-banner.error.unsupported-loader-version": {
+    "defaultMessage": "Denna version av Minecraft eller loader stöds ännu inte av Modrinth Hosting."
+  },
   "servers.installing-banner.phase.installing-addons": {
     "defaultMessage": "Installerar tillägg..."
   },
@@ -4535,6 +4574,9 @@
   "servers.setup.onboarding.setup-server.button": {
     "defaultMessage": "Ställ in server"
   },
+  "servers.setup.onboarding.step.choose.description": {
+    "defaultMessage": "Välj ditt favorit modpaket från Modrinth, eller välj en loader och lägg till de moddar du vill."
+  },
   "servers.setup.onboarding.step.choose.title": {
     "defaultMessage": "Välj vad du vill spela"
   },
@@ -5408,6 +5450,9 @@
   "version.section.included-content": {
     "defaultMessage": "Inkluderat innehåll"
   },
+  "version.section.no-modpack-mod-loader": {
+    "defaultMessage": "Ingen modloader"
+  },
   "version.supplementary-resources.file": {
     "defaultMessage": "Fil"
   },
@@ -5418,3 +5463,4 @@
     "defaultMessage": "Typ"
   }
 }
+
diff --git a/packages/ui/src/locales/uk-UA/index.json b/packages/ui/src/locales/uk-UA/index.json
index cdb5b752eb..95bbf42123 100644
--- a/packages/ui/src/locales/uk-UA/index.json
+++ b/packages/ui/src/locales/uk-UA/index.json
@@ -558,7 +558,7 @@
     "defaultMessage": "Утримуйте клавішу Shift під час натискання, щоб пропустити підтвердження."
   },
   "content.inline-backup.warning-body": {
-    "defaultMessage": "Ми рекомендуємо створити резервну копію перш ніж продовжувати, щоб ви могли відновити свій {type}, якщо щось піде не так."
+    "defaultMessage": "Радимо створити резервну копію перед тим, як продовжити, щоб ви могли відновити ваш {type}, якщо щось зламається."
   },
   "content.inline-backup.world-label": {
     "defaultMessage": "світ"
@@ -1848,10 +1848,10 @@
     "defaultMessage": "Редагувати інсталяцію"
   },
   "installation-settings.edit.warning-instance": {
-    "defaultMessage": "Ми не рекомендуємо змінювати налаштування інсталяції після встановлення вмісту. Якщо ви все ж хочете їх змінити, будьте обережні, оскільки це може спричинити проблеми."
+    "defaultMessage": "Не радимо відміняти налаштування інсталяції після встановлення вмісту. Коли все ж бажаєте їх змінити, то будьте обережні, адже це може завдати вам клопоту."
   },
   "installation-settings.edit.warning-server": {
-    "defaultMessage": "Ми не рекомендуємо змінювати налаштування інсталяції після встановлення вмісту. Якщо ви все ж хочете їх змінити, скиньте ваш сервер."
+    "defaultMessage": "Не радимо змінювати налаштування інсталяції після встановлення вмісту. Коли все ж хочете їх змінити, то скиньте свій сервер."
   },
   "installation-settings.incompatible-content.auto-fix-button": {
     "defaultMessage": "Виправити автоматично"
@@ -2876,6 +2876,9 @@
   "profile.details.error.github-profile-message": {
     "defaultMessage": "Не вдалося отримати профіль GitHub. Спробуйте знову."
   },
+  "profile.details.error.github-profile-title": {
+    "defaultMessage": "Не вдалося відкрити профіль GitHub"
+  },
   "profile.details.label.auth-providers": {
     "defaultMessage": "Сервіси автентифікації"
   },
@@ -2888,6 +2891,9 @@
   "profile.details.label.has-totp": {
     "defaultMessage": "Має TOTP"
   },
+  "profile.details.label.loading-github-profile": {
+    "defaultMessage": "Завантаження…"
+  },
   "profile.details.label.payment-methods": {
     "defaultMessage": "Способи оплати"
   },
@@ -5592,7 +5598,7 @@
     "defaultMessage": "Низьке"
   },
   "tag.category.magic": {
-    "defaultMessage": "Магія"
+    "defaultMessage": "Чаклунство"
   },
   "tag.category.management": {
     "defaultMessage": "Керування"
@@ -5616,7 +5622,7 @@
     "defaultMessage": "ММО"
   },
   "tag.category.mobs": {
-    "defaultMessage": "Моби"
+    "defaultMessage": "Сутності"
   },
   "tag.category.modded": {
     "defaultMessage": "Для модів"
@@ -5976,13 +5982,13 @@
     "defaultMessage": "Шкідливе програмне забезпечення часто поширюють через моди, які публікуються на таких платформах, як Discord."
   },
   "unknown-file-warning-modal.mod-warning-body": {
-    "defaultMessage": " не є опублікований на Modrinth. Ми наполегливо рекомендуємо встановлювати лише ті файли, яким довіряєте."
+    "defaultMessage": " не викладено на Modrinth. Наполегливо радимо встановлювати вміст лише з тих джерел, яким ви довіряєте."
   },
   "unknown-file-warning-modal.mod-warning-title": {
     "defaultMessage": "Попередження про невідомий файл"
   },
   "unknown-file-warning-modal.modpack-warning-body": {
-    "defaultMessage": " містить файли, які не є опубліковані на Modrinth. Ми наполегливо рекомендуємо встановлювати лише ті файли, яким довіряєте."
+    "defaultMessage": " містить файли, котрі не викладені на Modrinth. Наполегливо радимо встановлювати вміст лише з тих джерел, яким ви довіряєте."
   },
   "unknown-file-warning-modal.modpack-warning-title": {
     "defaultMessage": "Попередження про невідомі файли"
diff --git a/packages/ui/src/locales/vi-VN/index.json b/packages/ui/src/locales/vi-VN/index.json
index 96044097c8..f65e18d54c 100644
--- a/packages/ui/src/locales/vi-VN/index.json
+++ b/packages/ui/src/locales/vi-VN/index.json
@@ -5079,3 +5079,4 @@
     "defaultMessage": "Đội ngũ Modrinth"
   }
 }
+
diff --git a/packages/ui/src/locales/zh-CN/index.json b/packages/ui/src/locales/zh-CN/index.json
index eaf3fee149..91aa213378 100644
--- a/packages/ui/src/locales/zh-CN/index.json
+++ b/packages/ui/src/locales/zh-CN/index.json
@@ -6231,3 +6231,4 @@
     "defaultMessage": "类型"
   }
 }
+
diff --git a/packages/ui/src/locales/zh-TW/index.json b/packages/ui/src/locales/zh-TW/index.json
index bcc2570137..c7cb96b9eb 100644
--- a/packages/ui/src/locales/zh-TW/index.json
+++ b/packages/ui/src/locales/zh-TW/index.json
@@ -6231,3 +6231,4 @@
     "defaultMessage": "類型"
   }
 }
+

From 92971a3e0d1d37bad8364c330a7f818f1c607f84 Mon Sep 17 00:00:00 2001
From: "Michael H." <michael@iptables.sh>
Date: Mon, 10 Aug 2026 14:57:05 +0200
Subject: [PATCH 67/82] build: don't auto update staging

---
 .github/workflows/labrinth-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/labrinth-build.yml b/.github/workflows/labrinth-build.yml
index 7dfcffce83..950a1337bd 100644
--- a/.github/workflows/labrinth-build.yml
+++ b/.github/workflows/labrinth-build.yml
@@ -147,7 +147,7 @@ jobs:
 
   deploy:
     needs: [skip-if-clean, docker-build]
-    if: ${{ needs.skip-if-clean.outputs.internal == 'true' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/prod') }}
+    if: ${{ needs.skip-if-clean.outputs.internal == 'true' && github.ref == 'refs/heads/prod' }}
     uses: SparkUniverse/workflows/.github/workflows/argo-update.yaml@main
     secrets:
       ARGOCD_DEPLOY_KEY: ${{ secrets.ARGOCD_DEPLOY_KEY }}

From 9fd45ef2ce198b7500d58e2d8fa779544a0a0fc7 Mon Sep 17 00:00:00 2001
From: "Calum H." <calum@modrinth.com>
Date: Mon, 10 Aug 2026 15:00:42 +0100
Subject: [PATCH 68/82] fix: always check for updates/clear cache 10 min
 cooldown (#7077)

---
 apps/app-frontend/src/helpers/instance.ts     |  4 +++
 .../src/pages/instance/layout.vue             | 19 ++++++++++-
 .../src/pages/instance/query-options.ts       |  2 ++
 apps/app/build.rs                             |  1 +
 apps/app/src/api/instance.rs                  |  6 ++++
 packages/app-lib/src/api/instance.rs          |  2 +-
 packages/app-lib/src/api/instance/content.rs  |  6 ++++
 .../commands/check_content_updates.rs         | 32 ++++++++++++++++++-
 .../src/state/instances/commands/mod.rs       |  1 +
 packages/app-lib/src/state/instances/mod.rs   |  2 +-
 10 files changed, 71 insertions(+), 4 deletions(-)

diff --git a/apps/app-frontend/src/helpers/instance.ts b/apps/app-frontend/src/helpers/instance.ts
index de112f2d27..57bbb0c75f 100644
--- a/apps/app-frontend/src/helpers/instance.ts
+++ b/apps/app-frontend/src/helpers/instance.ts
@@ -77,6 +77,10 @@ export async function get_content_items(
 	return await invoke('plugin:instance|instance_get_content_items', { instanceId, cacheBehaviour })
 }
 
+export async function refresh_content_updates(instanceId: string): Promise<void> {
+	return await invoke('plugin:instance|instance_refresh_content_updates', { instanceId })
+}
+
 // Linked modpack info returned from backend
 export interface LinkedModpackInfo {
 	project: Labrinth.Projects.v2.Project
diff --git a/apps/app-frontend/src/pages/instance/layout.vue b/apps/app-frontend/src/pages/instance/layout.vue
index c2dd0ede78..5a903e1ce5 100644
--- a/apps/app-frontend/src/pages/instance/layout.vue
+++ b/apps/app-frontend/src/pages/instance/layout.vue
@@ -142,7 +142,7 @@ import {
 	isSharedInstanceUnavailableError,
 	type SharedInstanceUnavailableReason,
 } from '@/helpers/install'
-import { get_full_path, kill, remove, run } from '@/helpers/instance'
+import { get_full_path, kill, refresh_content_updates, remove, run } from '@/helpers/instance'
 import { useSharedInstanceErrors } from '@/helpers/shared-instance-errors'
 import type { GameInstance } from '@/helpers/types'
 import { createInstanceShortcut, showInstanceInFolder } from '@/helpers/utils.js'
@@ -194,6 +194,23 @@ useQuery(
 	})),
 )
 const instance = computed(() => instanceQuery.data.value)
+useQuery(
+	computed(() => ({
+		queryKey: instanceKeys.contentUpdateCheck(instanceId.value),
+		queryFn: async () => {
+			const targetInstanceId = instanceId.value
+			await refresh_content_updates(targetInstanceId)
+			await queryClient.invalidateQueries({
+				queryKey: instanceKeys.content(targetInstanceId),
+			})
+			return targetInstanceId
+		},
+		enabled: !!instanceId.value && !offline.value && instance.value?.install_stage === 'installed',
+		staleTime: 10 * 60_000,
+		gcTime: 30 * 60_000,
+		retry: false,
+	})),
+)
 const linkedProjectId = computed(() => instance.value?.link?.project_id ?? '')
 const linkedProjectQuery = useQuery(
 	computed(() => ({
diff --git a/apps/app-frontend/src/pages/instance/query-options.ts b/apps/app-frontend/src/pages/instance/query-options.ts
index 93f4ee81c8..6848ccb7ac 100644
--- a/apps/app-frontend/src/pages/instance/query-options.ts
+++ b/apps/app-frontend/src/pages/instance/query-options.ts
@@ -11,6 +11,8 @@ export const instanceKeys = {
 	detail: (instanceId: string) => [...instanceKeys.all, 'summary', instanceId] as const,
 	processes: (instanceId: string) => [...instanceKeys.all, 'processes', instanceId] as const,
 	content: (instanceId: string) => [...instanceKeys.all, 'content', instanceId] as const,
+	contentUpdateCheck: (instanceId: string) =>
+		[...instanceKeys.all, 'content-update-check', instanceId] as const,
 	rootPath: (instanceId: string) => [...instanceKeys.detail(instanceId), 'root-path'] as const,
 	files: (instanceId: string, path: string) =>
 		[...instanceKeys.detail(instanceId), 'files', path] as const,
diff --git a/apps/app/build.rs b/apps/app/build.rs
index 2d2bfc899b..0a92cd2346 100644
--- a/apps/app/build.rs
+++ b/apps/app/build.rs
@@ -200,6 +200,7 @@ fn main() {
                         "instance_get_install_candidates",
                         "instance_content",
                         "instance_get_content_items",
+                        "instance_refresh_content_updates",
                         "instance_get_dependencies_as_content_items",
                         "instance_get_linked_modpack_info",
                         "instance_get_linked_modpack_content",
diff --git a/apps/app/src/api/instance.rs b/apps/app/src/api/instance.rs
index 29db061fd1..5425415d50 100644
--- a/apps/app/src/api/instance.rs
+++ b/apps/app/src/api/instance.rs
@@ -30,6 +30,7 @@ pub fn init<R: tauri::Runtime>() -> tauri::plugin::TauriPlugin<R> {
             instance_get_install_candidates,
             instance_content,
             instance_get_content_items,
+            instance_refresh_content_updates,
             instance_get_dependencies_as_content_items,
             instance_get_linked_modpack_info,
             instance_get_linked_modpack_content,
@@ -524,6 +525,11 @@ pub async fn instance_get_content_items(
     )
 }
 
+#[tauri::command]
+pub async fn instance_refresh_content_updates(instance_id: &str) -> Result<()> {
+    Ok(theseus::instance::refresh_content_updates(instance_id).await?)
+}
+
 #[tauri::command]
 pub async fn instance_get_dependencies_as_content_items(
     dependencies: Vec<Dependency>,
diff --git a/packages/app-lib/src/api/instance.rs b/packages/app-lib/src/api/instance.rs
index 872020863e..c49d327d98 100644
--- a/packages/app-lib/src/api/instance.rs
+++ b/packages/app-lib/src/api/instance.rs
@@ -16,7 +16,7 @@ pub use self::content::{
     get_content_items, get_dependencies_as_content_items,
     get_install_candidates, get_installed_project_ids,
     get_linked_modpack_content, get_linked_modpack_info, get_projects,
-    list_content_sets, sync_content_files,
+    list_content_sets, refresh_content_updates, sync_content_files,
 };
 pub use self::export_mrpack::{
     PackExportCandidate, create_mrpack_json, export_mrpack,
diff --git a/packages/app-lib/src/api/instance/content.rs b/packages/app-lib/src/api/instance/content.rs
index 9adb2734cb..29d2fbef27 100644
--- a/packages/app-lib/src/api/instance/content.rs
+++ b/packages/app-lib/src/api/instance/content.rs
@@ -74,6 +74,12 @@ pub async fn get_content_items(
     crate::state::list_content(instance_id, None, cache_behaviour, &state).await
 }
 
+#[tracing::instrument]
+pub async fn refresh_content_updates(instance_id: &str) -> crate::Result<()> {
+    let state = State::get().await?;
+    crate::state::refresh_content_updates(instance_id, &state).await
+}
+
 #[tracing::instrument]
 pub async fn get_linked_modpack_content(
     instance_id: &str,
diff --git a/packages/app-lib/src/state/instances/commands/check_content_updates.rs b/packages/app-lib/src/state/instances/commands/check_content_updates.rs
index 771ae806b9..3384dad5df 100644
--- a/packages/app-lib/src/state/instances/commands/check_content_updates.rs
+++ b/packages/app-lib/src/state/instances/commands/check_content_updates.rs
@@ -30,6 +30,36 @@ pub(crate) async fn check_content_updates(
     instance_id: &str,
     cache_behaviour: Option<CacheBehaviour>,
     state: &State,
+) -> crate::Result<Vec<ContentUpdate>> {
+    check_content_updates_with_cache_behaviours(
+        instance_id,
+        cache_behaviour,
+        cache_behaviour,
+        state,
+    )
+    .await
+}
+
+pub(crate) async fn refresh_content_updates(
+    instance_id: &str,
+    state: &State,
+) -> crate::Result<()> {
+    check_content_updates_with_cache_behaviours(
+        instance_id,
+        None,
+        Some(CacheBehaviour::Bypass),
+        state,
+    )
+    .await?;
+
+    Ok(())
+}
+
+async fn check_content_updates_with_cache_behaviours(
+    instance_id: &str,
+    cache_behaviour: Option<CacheBehaviour>,
+    update_cache_behaviour: Option<CacheBehaviour>,
+    state: &State,
 ) -> crate::Result<Vec<ContentUpdate>> {
     let instance = instance_rows::get_instance_by_id(instance_id, &state.pool)
         .await?
@@ -113,7 +143,7 @@ pub(crate) async fn check_content_updates(
         .collect::<Vec<_>>();
     let updates = CachedEntry::get_file_update_many(
         &update_key_refs,
-        cache_behaviour,
+        update_cache_behaviour,
         &state.pool,
         &state.api_semaphore,
     )
diff --git a/packages/app-lib/src/state/instances/commands/mod.rs b/packages/app-lib/src/state/instances/commands/mod.rs
index ff79b14d2d..b969a1c44b 100644
--- a/packages/app-lib/src/state/instances/commands/mod.rs
+++ b/packages/app-lib/src/state/instances/commands/mod.rs
@@ -38,6 +38,7 @@ mod apply_content_install;
 pub(crate) use self::apply_content_install::*;
 
 mod check_content_updates;
+pub(crate) use self::check_content_updates::refresh_content_updates;
 
 mod apply_content_update;
 pub(crate) use self::apply_content_update::*;
diff --git a/packages/app-lib/src/state/instances/mod.rs b/packages/app-lib/src/state/instances/mod.rs
index 4a9195c1fb..5469e9e898 100644
--- a/packages/app-lib/src/state/instances/mod.rs
+++ b/packages/app-lib/src/state/instances/mod.rs
@@ -22,6 +22,6 @@ pub(crate) use self::commands::{
     dependencies_to_content_items, get_content_projects,
     get_installed_project_ids_for_instance, get_instance_install_candidates,
     get_linked_modpack_info, list_content, list_content_sets,
-    list_linked_modpack_content, sync_content_files,
+    list_linked_modpack_content, refresh_content_updates, sync_content_files,
 };
 pub(crate) mod watcher;

From ef90f08813c9dc4691d9692e85eaef35baaa02f7 Mon Sep 17 00:00:00 2001
From: coolbot <76798835+coolbot100s@users.noreply.github.com>
Date: Mon, 10 Aug 2026 07:31:03 -0700
Subject: [PATCH 69/82] Moderation: Metadata Message (#7066)

* game versions msg

* sneak in some tec rev quick reply updates

* add loaders msg to metadata stage

* fix loaders msg
---
 .../messages/metadata/game-versions.md        |  4 ++
 .../checklist/messages/metadata/loaders.md    |  5 +++
 .../tech-review/request-source-bin-modpack.md | 25 +++++++++++
 .../tech-review/request-source-bin.md         |  3 +-
 .../tech-review/request-source-obf-modpack.md | 43 +++++++++++++++++++
 .../tech-review-quick-replies.ts              | 14 ++++++
 .../moderation/src/data/stages/metadata.tsx   |  7 ++-
 7 files changed, 99 insertions(+), 2 deletions(-)
 create mode 100644 packages/moderation/src/data/messages/checklist/messages/metadata/game-versions.md
 create mode 100644 packages/moderation/src/data/messages/checklist/messages/metadata/loaders.md
 create mode 100644 packages/moderation/src/data/messages/quick-replies/tech-review/request-source-bin-modpack.md
 create mode 100644 packages/moderation/src/data/messages/quick-replies/tech-review/request-source-obf-modpack.md

diff --git a/packages/moderation/src/data/messages/checklist/messages/metadata/game-versions.md b/packages/moderation/src/data/messages/checklist/messages/metadata/game-versions.md
new file mode 100644
index 0000000000..32be73664c
--- /dev/null
+++ b/packages/moderation/src/data/messages/checklist/messages/metadata/game-versions.md
@@ -0,0 +1,4 @@
+## Supported Minecraft Versions
+
+Per section 5.1 of %RULES%, it is important that the metadata of your project is accurate, including which Minecraft versions are supported. \
+Please ensure that your project's supported game versions are listed accurately.
diff --git a/packages/moderation/src/data/messages/checklist/messages/metadata/loaders.md b/packages/moderation/src/data/messages/checklist/messages/metadata/loaders.md
new file mode 100644
index 0000000000..b5024d7a2f
--- /dev/null
+++ b/packages/moderation/src/data/messages/checklist/messages/metadata/loaders.md
@@ -0,0 +1,5 @@
+## Supported Loaders
+
+Per section 5.1 of %RULES%, it is important that the metadata of your project is accurate, including which loaders are supported. \
+Some %PROJECT_VERSIONS_FLINK% of your project may be labeled with loaders that are not properly supported. \
+Please ensure that your project's supported loaders are listed accurately for all %PROJECT_VERSIONS_FLINK%.
diff --git a/packages/moderation/src/data/messages/quick-replies/tech-review/request-source-bin-modpack.md b/packages/moderation/src/data/messages/quick-replies/tech-review/request-source-bin-modpack.md
new file mode 100644
index 0000000000..fa6f258321
--- /dev/null
+++ b/packages/moderation/src/data/messages/quick-replies/tech-review/request-source-bin-modpack.md
@@ -0,0 +1,25 @@
+Some of the external content in this project may include native code usage or binary files. \
+If the files listed are your own, please follow the instructions below, otherwise, we ask that you remove this content from your modpack.
+
+- %LIST_MODS_HERE%
+
+<details>
+<summary>Instructions</summary>
+
+## Source Code Requested
+
+To ensure the safety of all Modrinth users, we ask that you provide the source code or equivalent origin for any native code or binary files in use by this project.
+
+If these files are your own work:
+
+- Ensure that our moderation team is able to verify the safety of your source code and that compiled outputs match provided sources.
+- Ensure that binary files are built through transparent automation so we can verify from the provided source code is always identical to the files uploaded to Modrinth.
+
+We understand that you may not want to publish the source code for this project, so you are welcome to share it privately to the [Modrinth Content Moderation Team](https://github.com/ModrinthModeration) on GitHub.
+Remember to ensure your repository is up-to-date with the content being published on Modrinth.
+
+If these files are third-party work:
+
+- Please provide a publicly available link to the origin of the files or source-code from a known safe source, including the exact version used if applicable.
+
+</details>
diff --git a/packages/moderation/src/data/messages/quick-replies/tech-review/request-source-bin.md b/packages/moderation/src/data/messages/quick-replies/tech-review/request-source-bin.md
index 0abf4e85c1..24da89b24a 100644
--- a/packages/moderation/src/data/messages/quick-replies/tech-review/request-source-bin.md
+++ b/packages/moderation/src/data/messages/quick-replies/tech-review/request-source-bin.md
@@ -8,7 +8,8 @@ If these files are your own work:
 - Ensure that binary files are built through transparent automation so we can verify from the provided source code is always identical to the files uploaded to Modrinth.
 
 We understand that you may not want to publish the source code for this project, so you are welcome to share it privately to the [Modrinth Content Moderation Team](https://github.com/ModrinthModeration) on GitHub.
+Remember to ensure your repository is up-to-date with the content being published on Modrinth.
 
 If these files are third-party work:
 
-- Please provide a publicly available link to the origin of the files or source-code from a known safe source.
+- Please provide a publicly available link to the origin of the files or source-code from a known safe source, including the exact version used if applicable.
diff --git a/packages/moderation/src/data/messages/quick-replies/tech-review/request-source-obf-modpack.md b/packages/moderation/src/data/messages/quick-replies/tech-review/request-source-obf-modpack.md
new file mode 100644
index 0000000000..6a444a160d
--- /dev/null
+++ b/packages/moderation/src/data/messages/quick-replies/tech-review/request-source-obf-modpack.md
@@ -0,0 +1,43 @@
+Some of the external content in this project may be obfuscated. \
+If the files listed are your own, please follow the instructions below, otherwise, we ask that you remove this content from your modpack.
+
+- %LIST_MODS_HERE%
+
+<details>
+<summary>Instructions</summary>
+
+## Obfuscation on Modrinth
+
+To ensure the safety of all Modrinth users, projects may only be uploaded with obfuscated code under specific circumstances.</br>
+
+- Projects that use third-party code or assets required by law or licensing restrictions to remain obfuscated.
+- Projects where the obfuscation demonstrably benefits end users in a way critical to its functionality or safety.
+- Projects where obfuscation is required to prevent the bypass of critical authorization checks.
+
+### Uploading your project to Modrinth without obfuscation
+
+If your project does NOT qualify for one of the above exemptions, we ask that you:
+
+- Remove the use of obfuscation from your project.
+- Remove all versions containing obfuscated code from your project before resubmission.
+
+### Uploading your qualifying project with obfuscation
+
+If you believe your project should be permitted to use obfuscation, you must follow all steps when resubmitting your project:
+
+- Provide sufficient evidence that your project falls into one of the allowed exemptions.
+- Ensure that our moderation team is able to verify the safety of your source code and that compiled outputs match provided sources.
+
+We understand that you may not want to publish the source code for this project, so you are welcome to share it privately to the [Modrinth Content Moderation Team](https://github.com/ModrinthModeration) on GitHub.</br>
+Please be aware that you will be required to maintain up-to-date sources indefinitely, your project may be rejected without warning if our moderation team is unable to confirm that any version of your project originates from verifiably safe sources.
+
+We strongly recommend that you use an automated build system to ensure that your project's outputs verifiably originate from the provided source code and are always identical to the files uploaded to Modrinth.</br>
+
+Alternatively, please ensure your provided sources contain:
+
+- Instructions to reliably produce both non-obfuscated and obfuscated builds within a fresh environment.
+- No non-deterministic obfuscation methods.
+
+Finally, please note that we broadly discourage the use of obfuscation and advise against it unless absolutely required, and that the review of your project will require significantly more time when obfuscation is used.
+
+</details>
diff --git a/packages/moderation/src/data/quick-replies/tech-review-quick-replies.ts b/packages/moderation/src/data/quick-replies/tech-review-quick-replies.ts
index 7faf7a8bcf..fc76df6668 100644
--- a/packages/moderation/src/data/quick-replies/tech-review-quick-replies.ts
+++ b/packages/moderation/src/data/quick-replies/tech-review-quick-replies.ts
@@ -33,6 +33,20 @@ export default [
 			(await import('../messages/quick-replies/tech-review/request-source-bin.md?raw')).default,
 		private: false,
 	},
+	{
+		label: '🔒 Request Source (Obf) - MODPACK',
+		message: async () =>
+			(await import('../messages/quick-replies/tech-review/request-source-obf-modpack.md?raw'))
+				.default,
+		private: false,
+	},
+	{
+		label: '📦 Request Source (Bin) - MODPACK',
+		message: async () =>
+			(await import('../messages/quick-replies/tech-review/request-source-bin-modpack.md?raw'))
+				.default,
+		private: false,
+	},
 	{
 		label: '🚫 Misused Obfuscation',
 		message: async () =>
diff --git a/packages/moderation/src/data/stages/metadata.tsx b/packages/moderation/src/data/stages/metadata.tsx
index 9817081489..3d9a1aabb3 100644
--- a/packages/moderation/src/data/stages/metadata.tsx
+++ b/packages/moderation/src/data/stages/metadata.tsx
@@ -117,7 +117,12 @@ export default function () {
 						),
 
 					toggle('dependencies', 'Dependencies').suggestedStatus('flagged').message(),
-
+					// good enough for now.
+					toggle('game-versions', 'Game Versions').suggestedStatus('flagged').message(),
+					toggle('loaders', 'Loaders')
+						.suggestedStatus('rejected')
+						.shown(!project.value.minecraft_server)
+						.message(),
 					// toggle('loader', 'Loaders (WIP)')
 					// 	.suggestedStatus('flagged')
 					// 	.rawMessage(async (state) => {

From f27387462ede71defc2e9f4fdbb482aba130ad67 Mon Sep 17 00:00:00 2001
From: coolbot <76798835+coolbot100s@users.noreply.github.com>
Date: Mon, 10 Aug 2026 07:31:16 -0700
Subject: [PATCH 70/82] Moderation: Rule placeholders with subsections &
 anchors, update messages. (#7068)

Rule placeholders with subsections & anchors, update messages.
---
 .../checklist/messages/description/clarity.md |  8 ++--
 .../messages/description/headers-as-body.md   |  2 +-
 .../messages/description/image-only.md        |  2 +-
 .../description/insufficient/header.md        |  2 +-
 .../description/non-english-server.md         |  2 +-
 .../messages/description/non-english.md       |  2 +-
 .../messages/description/non-standard-text.md |  2 +-
 .../messages/gallery/insufficient.md          |  4 +-
 .../messages/gallery/not-relevant.md          |  2 +-
 .../messages/gallery/showcase-clarity.md      |  2 +-
 .../messages/license/no-source-fork.md        |  6 +--
 .../checklist/messages/links/header.md        |  4 +-
 .../messages/metadata/dependencies.md         |  2 +-
 .../metadata/environment/inaccurate.md        |  4 +-
 .../metadata/game-version/inaccurate.md       |  2 +-
 .../messages/metadata/loader/inaccurate.md    |  2 +-
 .../permissions/missing-permissions.md        |  2 +-
 .../messages/post-approval/metadata-issue.md  |  3 +-
 .../reupload/custom-pack-verification.md      |  4 +-
 .../messages/reupload/insufficient-fork.md    |  6 ++-
 .../messages/reupload/request-proof-server.md |  4 +-
 .../messages/reupload/request-proof.md        |  4 +-
 .../checklist/messages/reupload/reupload.md   |  5 ++-
 .../messages/reupload/unclear-fork.md         |  2 +-
 .../rules/cheat-or-hack-advertising.md        |  2 +-
 .../messages/rules/excessive-languages.md     |  3 +-
 .../rules/prohibited-content-header.md        |  2 +-
 .../rules/server-side-opt-in-header.md        |  2 +-
 .../messages/rules/server-side-opt-out.md     |  2 +-
 .../corrections-applied-approved.md           |  2 +-
 .../status-alerts/corrections-applied.md      |  2 +-
 .../checklist/messages/summary/formatting.md  |  2 +-
 .../messages/summary/insufficient.md          |  2 +-
 .../checklist/messages/summary/non-english.md |  2 +-
 .../messages/summary/repeat-title.md          |  2 +-
 .../checklist/messages/tags/inaccurate.md     |  2 +-
 .../title-slug/title/minecraft-branding.md    |  6 +--
 .../messages/title-slug/title/similarities.md |  4 +-
 .../title-slug/title/similarities/fork.md     |  4 +-
 .../messages/title-slug/title/useless-info.md |  6 +--
 .../versions/alternate-versions/additional.md |  4 +-
 .../alternate-versions/server-additional.md   |  2 +-
 .../versions/alternate-versions/zip.md        |  4 +-
 .../versions/incorrect-additional-files.md    |  6 ++-
 .../messages/versions/incorrect-loader.md     |  4 +-
 packages/moderation/src/utils.ts              | 41 +++++++++++++++++++
 46 files changed, 116 insertions(+), 68 deletions(-)

diff --git a/packages/moderation/src/data/messages/checklist/messages/description/clarity.md b/packages/moderation/src/data/messages/checklist/messages/description/clarity.md
index 8c59da9dd0..4990bccf3a 100644
--- a/packages/moderation/src/data/messages/checklist/messages/description/clarity.md
+++ b/packages/moderation/src/data/messages/checklist/messages/description/clarity.md
@@ -1,7 +1,7 @@
 ## Description Clarity
 
-Per section 2 of %RULES% It's important that your Description accurately and honestly represents the content of your project.  
-Currently, some elements in your Description may be confusing or misleading.  
-Please edit your description to ensure it accurately represents the current functionality of your project.  
-Avoid making hyperbolic claims that could misrepresent the facts of your project.  
+%R2%, It's important that your Description accurately and honestly represents the content of your project. \
+Currently, some elements in your Description may be confusing or misleading. \
+Please edit your description to ensure it accurately represents the current functionality of your project. \
+Avoid making hyperbolic claims that could misrepresent the facts of your project. \
 Ensure that your Description is accurate and not likely to confuse users.
diff --git a/packages/moderation/src/data/messages/checklist/messages/description/headers-as-body.md b/packages/moderation/src/data/messages/checklist/messages/description/headers-as-body.md
index 78e8366f60..3c67ab0959 100644
--- a/packages/moderation/src/data/messages/checklist/messages/description/headers-as-body.md
+++ b/packages/moderation/src/data/messages/checklist/messages/description/headers-as-body.md
@@ -1,6 +1,6 @@
 ## Description Accessibility
 
-In accordance with section 2.2 of %RULES%, we request that `# header`s not be used as body text.
+%R2.2%, we ask that `# header`s not be used as body text.
 
 Headers are interpreted differently by screen-readers and thus should generally only be used for things like separating sections of your Description.
 
diff --git a/packages/moderation/src/data/messages/checklist/messages/description/image-only.md b/packages/moderation/src/data/messages/checklist/messages/description/image-only.md
index 57781986e0..6539d94cdb 100644
--- a/packages/moderation/src/data/messages/checklist/messages/description/image-only.md
+++ b/packages/moderation/src/data/messages/checklist/messages/description/image-only.md
@@ -1,6 +1,6 @@
 ## Image Descriptions
 
-In accordance with section 2.2 of %RULES%, we ask that you provide a text alternative to your current Description.
+%R2.2%, we ask that you provide a text alternative to your current Description.
 
 It is important that your Description contains enough detail about your project that a user can have a full understanding of it from text alone.
 
diff --git a/packages/moderation/src/data/messages/checklist/messages/description/insufficient/header.md b/packages/moderation/src/data/messages/checklist/messages/description/insufficient/header.md
index 68f69b9e31..872243af5f 100644
--- a/packages/moderation/src/data/messages/checklist/messages/description/insufficient/header.md
+++ b/packages/moderation/src/data/messages/checklist/messages/description/insufficient/header.md
@@ -1,4 +1,4 @@
 ## Insufficient Description
 
-Per section 2.1 of %RULES%, your %PROJECT_DESCRIPTION_FLINK% should clearly inform the reader of the content, purpose, and appeal of your %PROJECT_TYPE%.</br>
+%R2.1%, your %PROJECT_DESCRIPTION_FLINK% should clearly inform the reader of the content, purpose, and appeal of your %PROJECT_TYPE%.</br>
 Currently, it looks like there are some missing details.
diff --git a/packages/moderation/src/data/messages/checklist/messages/description/non-english-server.md b/packages/moderation/src/data/messages/checklist/messages/description/non-english-server.md
index 2ddce75ab0..29ba76fbf3 100644
--- a/packages/moderation/src/data/messages/checklist/messages/description/non-english-server.md
+++ b/packages/moderation/src/data/messages/checklist/messages/description/non-english-server.md
@@ -1,6 +1,6 @@
 ## No English Description
 
-Per section 2.2 of %RULES%, a server's [Summary](%PROJECT_SETTINGS_LINK%) and %PROJECT_DESCRIPTION_FLINK% must be in English, unless meant exclusively for a non-english audience.
+%R2.2%, a server's %PROJECT_SUMMARY_FLINK% and %PROJECT_DESCRIPTION_FLINK% must be in English, unless meant exclusively for a non-english audience.
 
 You may include your non-English Description if you would like but we ask that you also add an English translation of the Description to your project page, if you would like to use an online translator to do this, we recommend [DeepL](https://www.deepl.com/translator).
 
diff --git a/packages/moderation/src/data/messages/checklist/messages/description/non-english.md b/packages/moderation/src/data/messages/checklist/messages/description/non-english.md
index 07d83a7da7..e62e614520 100644
--- a/packages/moderation/src/data/messages/checklist/messages/description/non-english.md
+++ b/packages/moderation/src/data/messages/checklist/messages/description/non-english.md
@@ -1,5 +1,5 @@
 ## No English Description
 
-Per section 2.2 of %RULES%, a project's [Summary](%PROJECT_SETTINGS_LINK%) and %PROJECT_DESCRIPTION_FLINK% must be in English, unless meant exclusively for non-English use, such as translations.
+%R2.2%, a project's %PROJECT_SUMMARY_FLINK% and %PROJECT_DESCRIPTION_FLINK% must be in English, unless meant exclusively for non-English use, such as translations.
 
 You may include your non-English Description if you would like but we ask that you also add an English translation of the Description to your project page, if you would like to use an online translator to do this, we recommend [DeepL](https://www.deepl.com/translator).
diff --git a/packages/moderation/src/data/messages/checklist/messages/description/non-standard-text.md b/packages/moderation/src/data/messages/checklist/messages/description/non-standard-text.md
index e7aad98962..d153e6917c 100644
--- a/packages/moderation/src/data/messages/checklist/messages/description/non-standard-text.md
+++ b/packages/moderation/src/data/messages/checklist/messages/description/non-standard-text.md
@@ -1,6 +1,6 @@
 ## Description Accessibility
 
-Per section 2 of %RULES%, your description must be plainly readable and accessible.
+%R2.2%, your description must be plainly readable and accessible.
 
 Using non-standard text characters like Zalgo or "fancy text" in place of text anywhere in your project, including the Description, Summary, or Title can make your project pages inaccessible.
 
diff --git a/packages/moderation/src/data/messages/checklist/messages/gallery/insufficient.md b/packages/moderation/src/data/messages/checklist/messages/gallery/insufficient.md
index b061941ffb..09699f8fca 100644
--- a/packages/moderation/src/data/messages/checklist/messages/gallery/insufficient.md
+++ b/packages/moderation/src/data/messages/checklist/messages/gallery/insufficient.md
@@ -1,7 +1,7 @@
 ## Insufficient Gallery Images
 
-We ask that projects like yours show off their content using images in the %PROJECT_GALLERY_FLINK%, or optionally in the Description, in order to effectively and clearly inform users of its content per section 2.1 of %RULES%.
-Keep in mind that you should:
+%R2.1%, we ask that projects like yours show off their content using images in the %PROJECT_GALLERY_FLINK%, or optionally in the Description, in order to effectively and clearly inform users of its content. \
+Keep in mind that you should: \
 
 - Set a featured image that best represents your project.
 - Ensure all your images have titles that accurately label the image, and optionally, details on the contents of the image in the images Description.
diff --git a/packages/moderation/src/data/messages/checklist/messages/gallery/not-relevant.md b/packages/moderation/src/data/messages/checklist/messages/gallery/not-relevant.md
index 58c4881992..be59d7fd14 100644
--- a/packages/moderation/src/data/messages/checklist/messages/gallery/not-relevant.md
+++ b/packages/moderation/src/data/messages/checklist/messages/gallery/not-relevant.md
@@ -1,3 +1,3 @@
 ## Unrelated Gallery Images
 
-Per section 5.5 of %RULES%, any images in your project's %PROJECT_GALLERY_FLINK% must be relevant to the project and also include a Title.
+%R5.5%, any images in your project's %PROJECT_GALLERY_FLINK% must be relevant to the project and also include a Title.
diff --git a/packages/moderation/src/data/messages/checklist/messages/gallery/showcase-clarity.md b/packages/moderation/src/data/messages/checklist/messages/gallery/showcase-clarity.md
index bf7c812178..5068b49964 100644
--- a/packages/moderation/src/data/messages/checklist/messages/gallery/showcase-clarity.md
+++ b/packages/moderation/src/data/messages/checklist/messages/gallery/showcase-clarity.md
@@ -1,6 +1,6 @@
 ## Showcase Clarity
 
-Per section 2 of %RULES%, it's important that your project page accurately and honestly represent the content of your project.
+%R2%, it's important that your project page accurately and honestly represent the content of your project.
 
 Currently, it looks like some images do not accurately represent the content of your %PROJECT_TYPE_FORMATTED_LOWER%.
 Please make sure you use authentic images such as in-game screenshots when showcasing the content or functionality of your work.
diff --git a/packages/moderation/src/data/messages/checklist/messages/license/no-source-fork.md b/packages/moderation/src/data/messages/checklist/messages/license/no-source-fork.md
index ded248ea3a..f2588a7ae1 100644
--- a/packages/moderation/src/data/messages/checklist/messages/license/no-source-fork.md
+++ b/packages/moderation/src/data/messages/checklist/messages/license/no-source-fork.md
@@ -1,5 +1,5 @@
 ## No Source Code Provided
 
-Your project's %PROJECT_LICENSE_FLINK% of `%PROJECT_LICENSE_NAME%`, requires source disclosure.  
-Consider adding a Source link to your project's repository, or including a Sources file for each version as an Additional File.  
-Keep in mind this may be a requirement of the source work's licensing, which must be abided per section 4 of %RULES%.
+Your project's %PROJECT_LICENSE_FLINK% of `%PROJECT_LICENSE_NAME%`, requires source disclosure. \
+Consider adding a Source link to your project's repository, or including a Sources file for each version as an Additional File. \
+%R4%, you may be required to publish your source work by the terms of the source work's licensing.
diff --git a/packages/moderation/src/data/messages/checklist/messages/links/header.md b/packages/moderation/src/data/messages/checklist/messages/links/header.md
index b7b3092d90..1ef5825e0c 100644
--- a/packages/moderation/src/data/messages/checklist/messages/links/header.md
+++ b/packages/moderation/src/data/messages/checklist/messages/links/header.md
@@ -1,4 +1,4 @@
 ## Links
 
-It looks like some of your %PROJECT_TYPE_FORMATTED_LOWER%'s %PROJECT_LINKS_FLINK% are misused or inaccessible.</br>
-Per section 5.4 of %RULES%, all %PROJECT_LINKS_FLINK% must lead to correctly labeled publicly available resources that are directly related to your project.
+It looks like some of your %PROJECT_TYPE_FORMATTED_LOWER%'s %PROJECT_LINKS_FLINK% are misused or inaccessible. \
+%R5.4%, all %PROJECT_LINKS_FLINK% must lead to correctly labeled publicly available resources that are directly related to your project.
diff --git a/packages/moderation/src/data/messages/checklist/messages/metadata/dependencies.md b/packages/moderation/src/data/messages/checklist/messages/metadata/dependencies.md
index 8498e5c58b..2a43042164 100644
--- a/packages/moderation/src/data/messages/checklist/messages/metadata/dependencies.md
+++ b/packages/moderation/src/data/messages/checklist/messages/metadata/dependencies.md
@@ -1,4 +1,4 @@
 ## Missing Dependencies
 
-Per section 5.6 of %RULES%, it is important that relevant dependencies be listed in the dependencies section of your project.  
+%R5.6%, it is important that relevant dependencies be listed in the dependencies section of your project. \
 Please ensure that all relevant dependencies are included in the Dependencies section of each version of your project.
diff --git a/packages/moderation/src/data/messages/checklist/messages/metadata/environment/inaccurate.md b/packages/moderation/src/data/messages/checklist/messages/metadata/environment/inaccurate.md
index b0017998e4..06c5696664 100644
--- a/packages/moderation/src/data/messages/checklist/messages/metadata/environment/inaccurate.md
+++ b/packages/moderation/src/data/messages/checklist/messages/metadata/environment/inaccurate.md
@@ -1,8 +1,8 @@
 ## Environment Metadata
 
-Per section 5.1 of %RULES%, it is important that the metadata of your projects is accurate, including Environment Information.
+%R5.1%, it is important that the metadata of your projects is accurate, including Environment Information.
 
-We've recently overhauled how environment metadata works on Modrinth, you can now edit this in your project's [Version Settings](https://modrinth.com/project/%PROJECT_ID%/settings/versions).
+We've recently overhauled how environment metadata works on Modrinth, you can now edit this in your project's [Version Settings](https://modrinth.com/project/%PROJECT_ID%/settings/versions). \
 Please [read this blogpost](%NEW_ENVIRONMENTS_LINK%) for full details and information on how to ensure your project is labeled correctly.
 
 %CORRECT%
diff --git a/packages/moderation/src/data/messages/checklist/messages/metadata/game-version/inaccurate.md b/packages/moderation/src/data/messages/checklist/messages/metadata/game-version/inaccurate.md
index b2d18df43a..45c0665e15 100644
--- a/packages/moderation/src/data/messages/checklist/messages/metadata/game-version/inaccurate.md
+++ b/packages/moderation/src/data/messages/checklist/messages/metadata/game-version/inaccurate.md
@@ -1,5 +1,5 @@
 ## Game Version Metadata
 
-Per section 5.1 of %RULES%, it is important that the metadata of your project is accurate, including which Minecraft versions are selected.
+%R5.1%, it is important that the metadata of your project is accurate, including which Minecraft versions are selected.
 
 %CORRECT%
diff --git a/packages/moderation/src/data/messages/checklist/messages/metadata/loader/inaccurate.md b/packages/moderation/src/data/messages/checklist/messages/metadata/loader/inaccurate.md
index a1cf5e0f98..43e2271581 100644
--- a/packages/moderation/src/data/messages/checklist/messages/metadata/loader/inaccurate.md
+++ b/packages/moderation/src/data/messages/checklist/messages/metadata/loader/inaccurate.md
@@ -1,5 +1,5 @@
 ## Loader Metadata
 
-Per section 5.1 of %RULES%, it is important that the metadata of your project is accurate, including which loaders are selected.
+%R5.1%, it is important that the metadata of your project is accurate, including which loaders are selected.
 
 %CORRECT%
diff --git a/packages/moderation/src/data/messages/checklist/messages/permissions/missing-permissions.md b/packages/moderation/src/data/messages/checklist/messages/permissions/missing-permissions.md
index 9dc97b32b5..12cfc22f23 100644
--- a/packages/moderation/src/data/messages/checklist/messages/permissions/missing-permissions.md
+++ b/packages/moderation/src/data/messages/checklist/messages/permissions/missing-permissions.md
@@ -1,3 +1,3 @@
 ## Permissions Incomplete
 
-Per section 4 of %RULES%, we ask that you complete all steps requested in your project's %PROJECT_PERMISSIONS_FLINK%.
+%R4%, we ask that you complete all steps requested in your project's %PROJECT_PERMISSIONS_FLINK%.
diff --git a/packages/moderation/src/data/messages/checklist/messages/post-approval/metadata-issue.md b/packages/moderation/src/data/messages/checklist/messages/post-approval/metadata-issue.md
index bcb9ecc59c..c2b1e0bb80 100644
--- a/packages/moderation/src/data/messages/checklist/messages/post-approval/metadata-issue.md
+++ b/packages/moderation/src/data/messages/checklist/messages/post-approval/metadata-issue.md
@@ -2,4 +2,5 @@
 
 Unfortunately, it has come to our attention that there may be issues with your project that require attention.
 
-Some information may be incorrect, per section 5.1 of %RULES% it's important that all project metadata be accurate to ensure the best experience for all modrinth users.
+%R5.1%, it's important that all project metadata be accurate to ensure the best experience for all modrinth users. \
+Currently, some information may be incorrect.
diff --git a/packages/moderation/src/data/messages/checklist/messages/reupload/custom-pack-verification.md b/packages/moderation/src/data/messages/checklist/messages/reupload/custom-pack-verification.md
index 47e094ce90..b71be0779a 100644
--- a/packages/moderation/src/data/messages/checklist/messages/reupload/custom-pack-verification.md
+++ b/packages/moderation/src/data/messages/checklist/messages/reupload/custom-pack-verification.md
@@ -2,8 +2,8 @@
 
 It looks like the custom modpack for your server may be distributing content from outside of the Modrinth ecosystem.
 
-Per section 4 of [Modrinth's Content Rules](https://modrinth.com/legal/rules), we ask that you verify you are abiding by all licensing requirements and have permission to distribute the content included in your modpack.
+%R4%, we ask that you verify you are abiding by all licensing requirements and have permission to distribute the content included in your modpack.
 
 By resubmitting your server while including this content, you acknowledge that you have seen this notice and have all necessary rights and permissions to upload your custom server pack to Modrinth.
 
-Keep in mind, if your server's custom modpack is found to be in violation of [Modrinth's Content Rules](https://modrinth.com/legal/rules), your listing may be temporarily or permanently removed from Modrinth with or without warning.
+Keep in mind, if your server's custom modpack is found to be in violation of %RULES%, your listing may be temporarily or permanently removed from Modrinth with or without warning.
diff --git a/packages/moderation/src/data/messages/checklist/messages/reupload/insufficient-fork.md b/packages/moderation/src/data/messages/checklist/messages/reupload/insufficient-fork.md
index 90a0f018c7..514bbec134 100644
--- a/packages/moderation/src/data/messages/checklist/messages/reupload/insufficient-fork.md
+++ b/packages/moderation/src/data/messages/checklist/messages/reupload/insufficient-fork.md
@@ -1,4 +1,6 @@
 ## Insufficient Fork
 
-This project does not appear to significantly diverge from the source work, or does not abide by the license of the source work as required by section 4 of %RULES%.  
-Please provide proof of your explicit permission to distribute this project from the creator(s) of the source work.
+%R4%, it is important that your project your project abides by the license of and is significantly divergent from the source work.
+
+Unfortunately, this project does not appear to meet these requirements. \
+For your project to be published, you can instead provide proof of your explicit permission to distribute this project from the creator(s) of the source work.
diff --git a/packages/moderation/src/data/messages/checklist/messages/reupload/request-proof-server.md b/packages/moderation/src/data/messages/checklist/messages/reupload/request-proof-server.md
index f01171f50b..fffe012b02 100644
--- a/packages/moderation/src/data/messages/checklist/messages/reupload/request-proof-server.md
+++ b/packages/moderation/src/data/messages/checklist/messages/reupload/request-proof-server.md
@@ -1,5 +1,5 @@
 ## Reuploads are forbidden
 
-This server appears to have uploaded a Modpack by another creator.  
-Per section 4 of %RULES%, we ask that you provide proof of your permission to distribute this pack on Modrinth.  
+This server appears to have uploaded a Modpack by another creator. \
+%R4%, we ask that you provide proof of your permission to distribute this pack on Modrinth. \
 Either implicit permission abiding by the terms of the content's license(s) or explicit permission from the original creator of the pack.
diff --git a/packages/moderation/src/data/messages/checklist/messages/reupload/request-proof.md b/packages/moderation/src/data/messages/checklist/messages/reupload/request-proof.md
index 26296101fb..0d0d99d12a 100644
--- a/packages/moderation/src/data/messages/checklist/messages/reupload/request-proof.md
+++ b/packages/moderation/src/data/messages/checklist/messages/reupload/request-proof.md
@@ -1,5 +1,5 @@
 ## Proof of permissions
 
-This project appears to contain content from other creators.  
-Per section 4 of %RULES%, we ask that you provide proof of your permission to distribute this content, or derivatives of this content in your project on Modrinth.  
+This project appears to contain content from other creators. \
+%R4%, we ask that you provide proof of your permission to distribute this content, or derivatives of this content in your project on Modrinth. \
 Either implicit permission abiding by the terms of the content's license(s) or explicit permission from the original creator of the content.
diff --git a/packages/moderation/src/data/messages/checklist/messages/reupload/reupload.md b/packages/moderation/src/data/messages/checklist/messages/reupload/reupload.md
index 6c2cc9b7ff..e59afcc92c 100644
--- a/packages/moderation/src/data/messages/checklist/messages/reupload/reupload.md
+++ b/packages/moderation/src/data/messages/checklist/messages/reupload/reupload.md
@@ -1,5 +1,6 @@
 ## Reuploads are forbidden
 
-This project appears to contain content from %ORIGINAL_PROJECT% by %ORIGINAL_AUTHOR%.  
-Per section 4 of %RULES%, this is strictly forbidden.  
+This project appears to contain content from %ORIGINAL_PROJECT% by %ORIGINAL_AUTHOR%.
+
+%R4%, this is strictly forbidden. \
 If you believe this is an error, or you can verify you are the creator and rightful owner of this content please let us know. Otherwise, we ask that you **do not resubmit this project**.
diff --git a/packages/moderation/src/data/messages/checklist/messages/reupload/unclear-fork.md b/packages/moderation/src/data/messages/checklist/messages/reupload/unclear-fork.md
index ba885a2304..09035bb205 100644
--- a/packages/moderation/src/data/messages/checklist/messages/reupload/unclear-fork.md
+++ b/packages/moderation/src/data/messages/checklist/messages/reupload/unclear-fork.md
@@ -1,4 +1,4 @@
 ## Forks and Reuploads
 
-Per section 4 of %RULES%, please provide proof that this project is both license-abiding and significantly divergent from the source work.  
+%R4%, please provide proof that this project is both license-abiding and significantly divergent from the source work. \
 Alternatively, please provide proof of your explicit permission from the author of the source work to distribute this content on Modrinth.
diff --git a/packages/moderation/src/data/messages/checklist/messages/rules/cheat-or-hack-advertising.md b/packages/moderation/src/data/messages/checklist/messages/rules/cheat-or-hack-advertising.md
index fc0e232ed5..da5c4cb617 100644
--- a/packages/moderation/src/data/messages/checklist/messages/rules/cheat-or-hack-advertising.md
+++ b/packages/moderation/src/data/messages/checklist/messages/rules/cheat-or-hack-advertising.md
@@ -1,5 +1,5 @@
 ## Prohibited Content
 
-This project may violate section 3.1 of [Modrinth's Content Rules](https://modrinth.com/legal/rules).
+This project may violate section 3.1 of [Modrinth's Content Rules](https://modrinth.com/legal/rules#cheats-and-hacks).
 
 We ask that you ensure your project does not endorse, promote, or enable hacks or the use of hacks. Additionally, your project page should not contain language that endorses or promotes hacks or the use of hacks.
diff --git a/packages/moderation/src/data/messages/checklist/messages/rules/excessive-languages.md b/packages/moderation/src/data/messages/checklist/messages/rules/excessive-languages.md
index 2a67e51b1d..ae4086410d 100644
--- a/packages/moderation/src/data/messages/checklist/messages/rules/excessive-languages.md
+++ b/packages/moderation/src/data/messages/checklist/messages/rules/excessive-languages.md
@@ -1,5 +1,6 @@
 ## Supported Languages
 
-Currently, you've selected %PROJECT_LANGUAGE_COUNT% [Languages](%PROJECT_LANGUAGE_SETTINGS%), per section 5.1 of %RULES% we ask that you confirm all selected languages are accurate.
+%R5.1% we ask that you confirm all selected languages are accurate. \
+Currently, you've selected %PROJECT_LANGUAGE_COUNT% [Languages](%PROJECT_LANGUAGE_SETTINGS%).
 
 Selected languages should represent what players can expect to see on your server, and all players should be able to get the full experience out of your server even if they only understand one of the selected languages.
diff --git a/packages/moderation/src/data/messages/checklist/messages/rules/prohibited-content-header.md b/packages/moderation/src/data/messages/checklist/messages/rules/prohibited-content-header.md
index fc0eb4c90b..578ba2a87c 100644
--- a/packages/moderation/src/data/messages/checklist/messages/rules/prohibited-content-header.md
+++ b/packages/moderation/src/data/messages/checklist/messages/rules/prohibited-content-header.md
@@ -1,3 +1,3 @@
 ## Prohibited Content
 
-This project contains content which may violate section 1 of [Modrinth's Content Rules](https://modrinth.com/legal/rules):
+This project contains content which may violate section 1 of [Modrinth's Content Rules](https://modrinth.com/legal/rules#prohibited-content):
diff --git a/packages/moderation/src/data/messages/checklist/messages/rules/server-side-opt-in-header.md b/packages/moderation/src/data/messages/checklist/messages/rules/server-side-opt-in-header.md
index d6c2dda8ca..f19b8b6e4b 100644
--- a/packages/moderation/src/data/messages/checklist/messages/rules/server-side-opt-in-header.md
+++ b/packages/moderation/src/data/messages/checklist/messages/rules/server-side-opt-in-header.md
@@ -1,3 +1,3 @@
 ## Server-side opt-in required
 
-Per section 3.3 of [Modrinth's Content Rules](https://modrinth.com/legal/rules), we ask that any features in this project that violate the following rules require a server-side opt-in:
+%R3.3%, we ask that any features in this project that violate the following rules require a server-side opt-in:
diff --git a/packages/moderation/src/data/messages/checklist/messages/rules/server-side-opt-out.md b/packages/moderation/src/data/messages/checklist/messages/rules/server-side-opt-out.md
index 5be794c0c5..df1c52edb4 100644
--- a/packages/moderation/src/data/messages/checklist/messages/rules/server-side-opt-out.md
+++ b/packages/moderation/src/data/messages/checklist/messages/rules/server-side-opt-out.md
@@ -1,3 +1,3 @@
 ## Server-side opt-out required
 
-Per section 3.2 of [Modrinth's Content Rules](https://modrinth.com/legal/rules), we ask that your project implements a server-side opt-out.
+%R3.3%, we ask that your project implements a server-side opt-out.
diff --git a/packages/moderation/src/data/messages/checklist/messages/status-alerts/corrections-applied-approved.md b/packages/moderation/src/data/messages/checklist/messages/status-alerts/corrections-applied-approved.md
index e278db95c5..424769f3e0 100644
--- a/packages/moderation/src/data/messages/checklist/messages/status-alerts/corrections-applied-approved.md
+++ b/packages/moderation/src/data/messages/checklist/messages/status-alerts/corrections-applied-approved.md
@@ -1,4 +1,4 @@
 ## Corrections Applied
 
-These have been corrected by our Moderation Team so your project can remain Approved, be sure to read and understand each issue listed below to ensure a smooth review for your next submission.
+These have been corrected by our Moderation Team so your project can remain Approved, be sure to read and understand each issue listed below to ensure a smooth review for your next submission. \
 If you have further questions, %SUPPORT%
diff --git a/packages/moderation/src/data/messages/checklist/messages/status-alerts/corrections-applied.md b/packages/moderation/src/data/messages/checklist/messages/status-alerts/corrections-applied.md
index 472e6b37cd..a1c17f862e 100644
--- a/packages/moderation/src/data/messages/checklist/messages/status-alerts/corrections-applied.md
+++ b/packages/moderation/src/data/messages/checklist/messages/status-alerts/corrections-applied.md
@@ -1,4 +1,4 @@
 ## Corrections Applied
 
-Your submission contained some issues that may have prevented your project from being published.
+Your submission contained some issues that may have prevented your project from being published. \
 These have been corrected by our Moderation Team so your project can be Approved, be sure to read and understand each issue listed below to ensure a smooth review for your next submission.
diff --git a/packages/moderation/src/data/messages/checklist/messages/summary/formatting.md b/packages/moderation/src/data/messages/checklist/messages/summary/formatting.md
index 945c2afa37..09115d783a 100644
--- a/packages/moderation/src/data/messages/checklist/messages/summary/formatting.md
+++ b/packages/moderation/src/data/messages/checklist/messages/summary/formatting.md
@@ -1,6 +1,6 @@
 ## Invalid Summary Formatting
 
-Per section 5.3 of %RULES%, your %PROJECT_SUMMARY_FLINK% can not include any extra formatting such as lists, or links.
+%R5.3%, your %PROJECT_SUMMARY_FLINK% can not include any extra formatting such as lists, or links.
 
 Your project summary should provide a brief overview of your project that informs and entices users.
 
diff --git a/packages/moderation/src/data/messages/checklist/messages/summary/insufficient.md b/packages/moderation/src/data/messages/checklist/messages/summary/insufficient.md
index 0d65ce2632..bbd362ef99 100644
--- a/packages/moderation/src/data/messages/checklist/messages/summary/insufficient.md
+++ b/packages/moderation/src/data/messages/checklist/messages/summary/insufficient.md
@@ -1,5 +1,5 @@
 ## Insufficient Summary
 
-Per section 5.3 of %RULES%, your project %PROJECT_SUMMARY_FLINK% should provide a brief overview of your project that informs and entices users.
+%R5.3%, your project %PROJECT_SUMMARY_FLINK% should provide a brief overview of your project that informs and entices users.
 
 This is the first thing most people will see about your %PROJECT_TYPE% other than the Logo, so it's important it be accurate, reasonably detailed, and exciting.
diff --git a/packages/moderation/src/data/messages/checklist/messages/summary/non-english.md b/packages/moderation/src/data/messages/checklist/messages/summary/non-english.md
index 4ae933462e..05f5c381b6 100644
--- a/packages/moderation/src/data/messages/checklist/messages/summary/non-english.md
+++ b/packages/moderation/src/data/messages/checklist/messages/summary/non-english.md
@@ -1,5 +1,5 @@
 ## No English Summary
 
-Per section 2.2 of %RULES%, a project's %PROJECT_SUMMARY_FLINK% and %PROJECT_DESCRIPTION_FLINK% must be in English, unless meant exclusively for non-English use, such as translations.
+%R2.2%, a project's %PROJECT_SUMMARY_FLINK% and %PROJECT_DESCRIPTION_FLINK% must be in English, unless meant exclusively for non-English use, such as translations.
 
 You may include your non-English Summary but we ask that you also add an English translation.
diff --git a/packages/moderation/src/data/messages/checklist/messages/summary/repeat-title.md b/packages/moderation/src/data/messages/checklist/messages/summary/repeat-title.md
index 69a8ae4cc7..23d2063df3 100644
--- a/packages/moderation/src/data/messages/checklist/messages/summary/repeat-title.md
+++ b/packages/moderation/src/data/messages/checklist/messages/summary/repeat-title.md
@@ -1,6 +1,6 @@
 ## Insufficient Summary
 
-Per section 5.3 of %RULES%, your %PROJECT_SUMMARY_FLINK% can not be the same as your project's Title.
+%R5.3%, your %PROJECT_SUMMARY_FLINK% can not be the same as your project's Title.
 
 Your project summary should provide a brief overview of your project that informs and entices users.
 
diff --git a/packages/moderation/src/data/messages/checklist/messages/tags/inaccurate.md b/packages/moderation/src/data/messages/checklist/messages/tags/inaccurate.md
index fb523e0655..ba419c4e66 100644
--- a/packages/moderation/src/data/messages/checklist/messages/tags/inaccurate.md
+++ b/packages/moderation/src/data/messages/checklist/messages/tags/inaccurate.md
@@ -1,3 +1,3 @@
 ## Misuse of Tags
 
-Per section 5.1 of %RULES%, it is important that the metadata of your projects is accurate. Including that selected tags honestly represent your project.
+%R5.1%, it is important that the metadata of your projects is accurate. Including that selected tags honestly represent your project.
diff --git a/packages/moderation/src/data/messages/checklist/messages/title-slug/title/minecraft-branding.md b/packages/moderation/src/data/messages/checklist/messages/title-slug/title/minecraft-branding.md
index 6c8e7f988b..fe78918b4f 100644
--- a/packages/moderation/src/data/messages/checklist/messages/title-slug/title/minecraft-branding.md
+++ b/packages/moderation/src/data/messages/checklist/messages/title-slug/title/minecraft-branding.md
@@ -1,6 +1,6 @@
 ## Minecraft Project Names
 
-Projects must not use Minecraft's branding or include "Minecraft" as a significant part of the title.  
-Your project's current Name of `%PROJECT_TITLE%` may be confusingly similar to, or imply association with, the game Minecraft. We encourage you to change your project's [Name](%PROJECT_SETTINGS_LINK%) to avoid a potential violation of Minecraft's Usage Guidelines.  
-Abbreviations like "MC" or elaborate titles that do not make the name Minecraft a significant portion of the name are okay.  
+Projects must not use Minecraft's branding or include "Minecraft" as a significant part of the title. \
+Your project's current Name of `%PROJECT_TITLE%` may be confusingly similar to, or imply association with, the game Minecraft. We encourage you to change your project's [Name](%PROJECT_SETTINGS_LINK%) to avoid a potential violation of Minecraft's Usage Guidelines. \
+Abbreviations like "MC" or elaborate titles that do not make the name Minecraft a significant portion of the name are okay. \
 When editing your project's Name, remember to update its [URL](%PROJECT_SETTINGS_LINK%) to match.
diff --git a/packages/moderation/src/data/messages/checklist/messages/title-slug/title/similarities.md b/packages/moderation/src/data/messages/checklist/messages/title-slug/title/similarities.md
index 280b5f0b9c..d9fcf094b8 100644
--- a/packages/moderation/src/data/messages/checklist/messages/title-slug/title/similarities.md
+++ b/packages/moderation/src/data/messages/checklist/messages/title-slug/title/similarities.md
@@ -1,5 +1,5 @@
 ## Project Branding
 
-Per section 1.8 of %RULES%, your project or its branding must not imply association or be easily confused with any other person or organization.  
-We ask that you change your project's [Name](%PROJECT_SETTINGS_LINK%) and other relevant branding to avoid causing confusion or implying association with existing projects or individuals.  
+%R1.8%, your project or its branding must not imply association or be easily confused with any other person or organization. \
+We ask that you change your project's [Name](%PROJECT_SETTINGS_LINK%) and other relevant branding to avoid causing confusion or implying association with existing projects or individuals. \
 When editing your project's Name, remember to update its [URL](%PROJECT_SETTINGS_LINK%) to match.
diff --git a/packages/moderation/src/data/messages/checklist/messages/title-slug/title/similarities/fork.md b/packages/moderation/src/data/messages/checklist/messages/title-slug/title/similarities/fork.md
index 9318c8e75f..9064caf8f5 100644
--- a/packages/moderation/src/data/messages/checklist/messages/title-slug/title/similarities/fork.md
+++ b/packages/moderation/src/data/messages/checklist/messages/title-slug/title/similarities/fork.md
@@ -1,2 +1,2 @@
-You may reference the source work in the Description of your fork, however, you must do so in a way that is unlikely to cause confusion or imply association with or endorsement from the author of the source work.  
-Additionally, per section 4 of %RULES%, we ask that you ensure your project's Name and Branding abide by the license of the source work.
+You may reference the source work in the Description of your fork, however, you must do so in a way that is unlikely to cause confusion or imply association with or endorsement from the author of the source work. \
+%R4%, we also ask that you ensure your project's Name and Branding abide by the license of the source work.
diff --git a/packages/moderation/src/data/messages/checklist/messages/title-slug/title/useless-info.md b/packages/moderation/src/data/messages/checklist/messages/title-slug/title/useless-info.md
index f23185bff5..c78beec0de 100644
--- a/packages/moderation/src/data/messages/checklist/messages/title-slug/title/useless-info.md
+++ b/packages/moderation/src/data/messages/checklist/messages/title-slug/title/useless-info.md
@@ -1,6 +1,6 @@
 ## Misuse of Project Name
 
-Per section 5.2 of %RULES%, your project's [Name](%PROJECT_SETTINGS_LINK%) should not include unnecessary information such as loaders, themes, tags, or versions.
-Your project's current Name of `%PROJECT_TITLE%` appears to contain extra information.  
-We ask that you remove all additional information from the [Name](%PROJECT_SETTINGS_LINK%). Instead, consider including this in your project's Summary or Description, or as a part of its relevant metadata.  
+%R5.2%, your project's [Name](%PROJECT_SETTINGS_LINK%) should not include unnecessary information such as loaders, themes, tags, or versions. \
+Your project's current Name of `%PROJECT_TITLE%` appears to contain extra information. \
+We ask that you remove all additional information from the [Name](%PROJECT_SETTINGS_LINK%). Instead, consider including this in your project's Summary or Description, or as a part of its relevant metadata. \
 When editing your project's Name, remember to update its [URL](%PROJECT_SETTINGS_LINK%) to match.
diff --git a/packages/moderation/src/data/messages/checklist/messages/versions/alternate-versions/additional.md b/packages/moderation/src/data/messages/checklist/messages/versions/alternate-versions/additional.md
index fdb9e9103d..d2cbbcbdee 100644
--- a/packages/moderation/src/data/messages/checklist/messages/versions/alternate-versions/additional.md
+++ b/packages/moderation/src/data/messages/checklist/messages/versions/alternate-versions/additional.md
@@ -1,5 +1,5 @@
 ## Unsupported Project
 
-Per section 5.7 of %RULES%, Modrinth does not support uploading multiple variations of your project as Additional files.  
-Having alternate versions of your content on the same project will hurt the functionality of the Modrinth App and other supported launchers as it would prevent users from updating your content, and may make it harder for your users to find the content they want.  
+%R5.7%, Modrinth does not support uploading multiple variations of your project as Additional files. \
+Having alternate versions of your content on the same project will hurt the functionality of the Modrinth App and other supported launchers as it would prevent users from updating your content, and may make it harder for your users to find the content they want. \
 We ask that you upload each alternate version of your project as a new project, ensuring that all users will be able to access and easily find your content.
diff --git a/packages/moderation/src/data/messages/checklist/messages/versions/alternate-versions/server-additional.md b/packages/moderation/src/data/messages/checklist/messages/versions/alternate-versions/server-additional.md
index 51a9e2871e..40938be605 100644
--- a/packages/moderation/src/data/messages/checklist/messages/versions/alternate-versions/server-additional.md
+++ b/packages/moderation/src/data/messages/checklist/messages/versions/alternate-versions/server-additional.md
@@ -1,4 +1,4 @@
 ## Incorrect Additional Files
 
-Per section 5.7 of %RULES%, the additional files section should only be used for specific designated purposes such as a `Sources.jar`.
+%R5.7%, the additional files section should only be used for specific designated purposes such as a `Sources.jar`. \
 To ensure a smooth experience for you and your users, please upload each alternate version of your modpack as its own Modpack project, thank you.
diff --git a/packages/moderation/src/data/messages/checklist/messages/versions/alternate-versions/zip.md b/packages/moderation/src/data/messages/checklist/messages/versions/alternate-versions/zip.md
index 70fafd9316..c9ff20c6f9 100644
--- a/packages/moderation/src/data/messages/checklist/messages/versions/alternate-versions/zip.md
+++ b/packages/moderation/src/data/messages/checklist/messages/versions/alternate-versions/zip.md
@@ -1,5 +1,5 @@
 ## Incorrect Additional Files
 
-Per section 5.7 of %RULES%, the additional files section should only be used for specific designated purposes such as a `Sources.jar`.
-Modrinth does not support the upload of modpacks in the `.zip` format, as this may cause issues for Modrinth users or distribute copyrighted content without the proper permissions.  
+%R5.7%, the additional files section should only be used for specific designated purposes such as a `Sources.jar`. \
+Modrinth does not support the upload of modpacks in the `.zip` format, as this may cause issues for Modrinth users or distribute copyrighted content without the proper permissions. \
 If you would like to upload a server-specific version of your modpack, consider creating a separate Modpack project.
diff --git a/packages/moderation/src/data/messages/checklist/messages/versions/incorrect-additional-files.md b/packages/moderation/src/data/messages/checklist/messages/versions/incorrect-additional-files.md
index 6756d8d200..ce1dd9bc28 100644
--- a/packages/moderation/src/data/messages/checklist/messages/versions/incorrect-additional-files.md
+++ b/packages/moderation/src/data/messages/checklist/messages/versions/incorrect-additional-files.md
@@ -1,5 +1,7 @@
 ## Incorrect Use of Additional Files
 
-It looks like you've uploaded multiple primary files to one Version as Additional Files. Per section 5.7 of %RULES%, each Version of your project must include only one primary file that corresponds to its respective Minecraft and loader versions.  
-This allows users to easily find and download the content they need for their game profile with ease. The Additional Files feature can be used for things like a `Sources.jar`.  
+%R5.7%, each Version of your project must include only one primary file that corresponds to its respective Minecraft and loader versions.
+
+It looks like you've uploaded multiple primary files to one Version as Additional Files. \
+Ensuring your project's upload scheme is correct allows users to easily find and download the content they need for their game profile with ease. The Additional Files feature can be used for things like a `Sources.jar`. \
 Please upload each version of your project separately, thank you.
diff --git a/packages/moderation/src/data/messages/checklist/messages/versions/incorrect-loader.md b/packages/moderation/src/data/messages/checklist/messages/versions/incorrect-loader.md
index 17c12c713c..78fc2f57df 100644
--- a/packages/moderation/src/data/messages/checklist/messages/versions/incorrect-loader.md
+++ b/packages/moderation/src/data/messages/checklist/messages/versions/incorrect-loader.md
@@ -1,4 +1,4 @@
-## Incorrect Loader Labels
+## Incorrect Loaders
 
-Per section 5.7 of %RULES%, the loader labels on each of your %PROJECT_VERSIONS_FLINK% must accurately reflect what the uploaded files support.
+%R5.7%, the loader labels on each of your %PROJECT_VERSIONS_FLINK% must accurately reflect what the uploaded files support. \
 Currently, some of your versions appear to use the following incorrect loader label(s). Please remove these loaders from any affected versions before resubmitting your project:
diff --git a/packages/moderation/src/utils.ts b/packages/moderation/src/utils.ts
index 3df242bf55..84335deb9e 100644
--- a/packages/moderation/src/utils.ts
+++ b/packages/moderation/src/utils.ts
@@ -115,6 +115,47 @@ export function flattenStaticVariables(): Record<string, string> {
 	const vars: Record<string, string> = {}
 
 	vars[`RULES`] = `[Modrinth's Content Rules](https://modrinth.com/legal/rules)`
+	vars[`R1`] =
+		`Per section 1 of [Modrinth's Content Rules](https://modrinth.com/legal/rules#prohibited-content)`
+	const rule1subs = 12
+	for (let n = 1; n <= rule1subs; n++) {
+		vars[`R1.${n}`] =
+			`Per section 1.${n} of [Modrinth's Content Rules](https://modrinth.com/legal/rules#prohibited-content)`
+	}
+	vars[`R2`] =
+		`Per section 2 of [Modrinth's Content Rules](https://modrinth.com/legal/rules#clear-and-honest-function)`
+	vars[`R2.1`] =
+		`Per section 2.1 of [Modrinth's Content Rules](https://modrinth.com/legal/rules#general-expectations)`
+	const rule2sub1subs = 3
+	for (let n = 1; n <= rule2sub1subs; n++) {
+		const l = String.fromCharCode(96 + n)
+		vars[`R2.1${l}`] =
+			`Per section 2.1${l} of [Modrinth's Content Rules](https://modrinth.com/legal/rules#general-expectations)`
+	}
+	vars[`R2.2`] =
+		`Per section 2.2 of [Modrinth's Content Rules](https://modrinth.com/legal/rules#accessibility)`
+	vars[`R3`] =
+		`Per section 3 of [Modrinth's Content Rules](https://modrinth.com/legal/rules#cheats-and-hacks)`
+	const rule3subs = 3
+	for (let n = 1; n <= rule3subs; n++) {
+		vars[`R3.${n}`] =
+			`Per section 3.${n} of [Modrinth's Content Rules](https://modrinth.com/legal/rules#cheats-and-hacks)`
+	}
+	const rule3sub3subs = 6
+	for (let n = 1; n <= rule3sub3subs; n++) {
+		const l = String.fromCharCode(96 + n)
+		vars[`R3.3${l}`] =
+			`Per section 3.3${l} of [Modrinth's Content Rules](https://modrinth.com/legal/rules#cheats-and-hacks)`
+	}
+	vars[`R4`] =
+		`Per section 4 of [Modrinth's Content Rules](https://modrinth.com/legal/rules#copyright-and-legality-of-content)`
+	vars[`R5`] =
+		`Per section 5 of [Modrinth's Content Rules](https://modrinth.com/legal/rules#miscellaneous)`
+	const rule5subs = 8
+	for (let n = 1; n <= rule5subs; n++) {
+		vars[`R5.${n}`] =
+			`Per section 5.${n} of [Modrinth's Content Rules](https://modrinth.com/legal/rules#miscellaneous)`
+	}
 	vars[`TOS`] = `[Terms of Use](https://modrinth.com/legal/terms)`
 	vars[`COPYRIGHT_POLICY`] = `[Copyright Policy](https://modrinth.com/legal/copyright)`
 	vars[`SUPPORT`] =

From 98cb6b6b44a435db860ac40c2ddd91ed65e18600 Mon Sep 17 00:00:00 2001
From: "Calum H." <calum@modrinth.com>
Date: Mon, 10 Aug 2026 16:15:27 +0100
Subject: [PATCH 71/82] fix: buttons qa (#7067)

* fix: broken minecraft required modal button

* fix: app close icon issue

* fix: versions tooltip missing

* fix: instance not found bug on btn press
---
 .../src/components/ui/WindowControls.vue             |  3 +--
 .../MinecraftRequiredModal.vue                       | 12 +++---------
 .../src/pages/instance/content/index.vue             |  8 ++++----
 apps/app-frontend/src/pages/instance/layout.vue      |  3 ++-
 apps/app-frontend/src/pages/project/Version.vue      |  9 ++++++++-
 5 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/apps/app-frontend/src/components/ui/WindowControls.vue b/apps/app-frontend/src/components/ui/WindowControls.vue
index 38f00cd1fb..81797ba5fa 100644
--- a/apps/app-frontend/src/components/ui/WindowControls.vue
+++ b/apps/app-frontend/src/components/ui/WindowControls.vue
@@ -23,9 +23,8 @@
 		</IconButton>
 		<IconButton
 			type="quiet"
-			color="red"
 			label="Close window"
-			class="relative expanded-button close-button hover:!bg-red focus-visible:!bg-red"
+			class="relative expanded-button close-button"
 			@click="handleClose"
 		>
 			<XIcon />
diff --git a/apps/app-frontend/src/components/ui/minecraft-required-modal/MinecraftRequiredModal.vue b/apps/app-frontend/src/components/ui/minecraft-required-modal/MinecraftRequiredModal.vue
index 4472906316..c22b268e2a 100644
--- a/apps/app-frontend/src/components/ui/minecraft-required-modal/MinecraftRequiredModal.vue
+++ b/apps/app-frontend/src/components/ui/minecraft-required-modal/MinecraftRequiredModal.vue
@@ -20,18 +20,12 @@
 		</div>
 
 		<div class="flex flex-col gap-6 px-6 pb-6">
-			<div class="flex justify-end gap-2">
-				<ButtonLink class="w-full" href="https://support.modrinth.com" @click="modal?.hide()">
+			<div class="grid grid-cols-2 gap-2">
+				<ButtonLink href="https://support.modrinth.com" @click="modal?.hide()">
 					<MessagesSquareIcon />
 					{{ formatMessage(messages.getSupport) }}
 				</ButtonLink>
-				<Button
-					type="colored"
-					color="brand"
-					class="w-full"
-					:disabled="loadingSignIn"
-					@click="signIn"
-				>
+				<Button type="colored" color="brand" :disabled="loadingSignIn" @click="signIn">
 					<SpinnerIcon v-if="loadingSignIn" class="animate-spin" />
 					<svg
 						v-else
diff --git a/apps/app-frontend/src/pages/instance/content/index.vue b/apps/app-frontend/src/pages/instance/content/index.vue
index 572bf05758..080f09026a 100644
--- a/apps/app-frontend/src/pages/instance/content/index.vue
+++ b/apps/app-frontend/src/pages/instance/content/index.vue
@@ -1385,14 +1385,14 @@ provideContentManager({
 				project: linkedModpackProject.value,
 				projectLink: {
 					path: `/project/${linkedModpackProject.value.slug ?? linkedModpackProject.value.id}`,
-					query: { i: instance.value.id },
+					query: { i: instancePage.instanceId.value },
 				},
 				version: linkedModpackVersion.value ?? undefined,
 				versionLink:
 					linkedModpackProject.value && linkedModpackVersion.value
 						? {
 								path: `/project/${linkedModpackProject.value.slug ?? linkedModpackProject.value.id}/version/${linkedModpackVersion.value.id}`,
-								query: { i: instance.value.id },
+								query: { i: instancePage.instanceId.value },
 							}
 						: undefined,
 				owner: linkedModpackOwner.value
@@ -1479,7 +1479,7 @@ provideContentManager({
 			icon_url: null,
 		},
 		projectLink: item.project?.id
-			? { path: `/project/${item.project.id}`, query: { i: instance.value.id } }
+			? { path: `/project/${item.project.id}`, query: { i: instancePage.instanceId.value } }
 			: undefined,
 		version: item.version ?? {
 			id: item.file_name,
@@ -1490,7 +1490,7 @@ provideContentManager({
 			item.project?.id && item.version?.id
 				? {
 						path: `/project/${item.project.id}/version/${item.version.id}`,
-						query: { i: instance.value.id },
+						query: { i: instancePage.instanceId.value },
 					}
 				: undefined,
 		owner: item.owner
diff --git a/apps/app-frontend/src/pages/instance/layout.vue b/apps/app-frontend/src/pages/instance/layout.vue
index 5a903e1ce5..caffa1404a 100644
--- a/apps/app-frontend/src/pages/instance/layout.vue
+++ b/apps/app-frontend/src/pages/instance/layout.vue
@@ -180,7 +180,7 @@ const showInstancePlayTime = computed(() => themeStore.getFeatureFlag('show_inst
 
 const online = useOnline()
 const offline = computed(() => !online.value)
-const instanceId = computed(() => String(route.params.id ?? ''))
+const instanceId = ref(String(route.params.id ?? ''))
 const instanceQuery = useQuery(
 	computed(() => ({
 		...instanceDetailQueryOptions(instanceId.value),
@@ -259,6 +259,7 @@ onBeforeRouteUpdate(async (to, from) => {
 
 	try {
 		await ensureCriticalInstanceData(targetInstanceId)
+		instanceId.value = targetInstanceId
 	} catch (error) {
 		if (isUnmanagedInstanceError(error)) return { path: '/' }
 		handleError(error)
diff --git a/apps/app-frontend/src/pages/project/Version.vue b/apps/app-frontend/src/pages/project/Version.vue
index 3d3bd2a2cd..83390cabb4 100644
--- a/apps/app-frontend/src/pages/project/Version.vue
+++ b/apps/app-frontend/src/pages/project/Version.vue
@@ -14,8 +14,13 @@
 			:members="members"
 			:dependency-link-creator="createDependencyLink"
 		>
-			<template #headerActions>
+			<template #headerActions="{ primaryFile }">
 				<Button
+					v-tooltip="
+						primaryFile?.url
+							? primaryFile.filename + ' (' + formatBytes(primaryFile.size) + ')'
+							: undefined
+					"
 					type="colored"
 					color="brand"
 					:disabled="installing || (installed && installedVersion === version.id)"
@@ -92,6 +97,7 @@ import {
 	commonMessages,
 	defineMessages,
 	type DependencyContext,
+	useFormatBytes,
 	useVIntl,
 	VersionPage,
 } from '@modrinth/ui'
@@ -103,6 +109,7 @@ import { get_project_many, get_version_many } from '@/helpers/cache.js'
 import { useBreadcrumb } from '@/providers/breadcrumbs'
 
 const { formatMessage } = useVIntl()
+const formatBytes = useFormatBytes()
 
 const messages = defineMessages({
 	allVersions: {

From e8aee1566482c09475b27ee876230ac55222fbf4 Mon Sep 17 00:00:00 2001
From: "Calum H." <calum@modrinth.com>
Date: Mon, 10 Aug 2026 16:15:44 +0100
Subject: [PATCH 72/82] chore: cleanup standards (#6970)

* chore: cleanup standards & skills

* remove: figma mcp doc, not needed anymore
---
 .agents/skills/api-module/SKILL.md            |  23 ++
 .agents/skills/api-module/agents/openai.yaml  |   4 +
 .agents/skills/cross-platform-pages/SKILL.md  |  38 +++
 .../cross-platform-pages/agents/openai.yaml   |   4 +
 .agents/skills/figma-mcp/SKILL.md             |  21 ++
 .agents/skills/figma-mcp/agents/openai.yaml   |   4 +
 .agents/skills/i18n-pass/SKILL.md             |  32 ++
 .agents/skills/i18n-pass/agents/openai.yaml   |   4 +
 .agents/skills/review-changelog/SKILL.md      |  40 +++
 .../review-changelog/agents/openai.yaml       |   4 +
 .agents/skills/tanstack-query/SKILL.md        |  39 +++
 .../skills/tanstack-query/agents/openai.yaml  |   4 +
 .claude/skills/api-module/SKILL.md            |  18 --
 .claude/skills/cross-platform-pages/SKILL.md  |  26 --
 .claude/skills/figma-mcp/SKILL.md             |  22 --
 .claude/skills/i18n-pass/SKILL.md             |  24 --
 .claude/skills/review-changelog/SKILL.md      |  36 ---
 .claude/skills/tanstack-query/SKILL.md        |  27 --
 .gitignore                                    |   3 +-
 AGENTS.md                                     |  94 +++++-
 CLAUDE.md                                     | 110 -------
 apps/frontend/AGENTS.md                       |  43 ++-
 apps/frontend/CLAUDE.md                       |  42 ---
 apps/labrinth/CLAUDE.md                       |   1 -
 packages/api-client/AGENTS.md                 | 209 ++++++++++++-
 packages/api-client/CLAUDE.md                 | 208 -------------
 packages/ui/AGENTS.md                         |  97 +++++-
 packages/ui/CLAUDE.md                         |  96 ------
 standards/README.md                           |   6 +-
 standards/frontend/ADDING_API_MODULES.md      |  98 +++---
 standards/frontend/COMPONENT_STRUCTURE.md     |  66 +++--
 standards/frontend/CROSS_PLATFORM_PAGES.md    | 124 +++++---
 standards/frontend/DEPENDENCY_INJECTION.md    | 143 ++++-----
 standards/frontend/FETCHING_DATA.md           |  60 ++--
 standards/frontend/FIGMA_MCP_USAGE.md         |  32 --
 standards/frontend/INTERNATIONALIZATION.md    | 129 ++++----
 standards/frontend/MODALS.md                  | 279 ++++++++++--------
 standards/frontend/SURFACE_SYSTEM.md          |  30 +-
 standards/maintaining/CHANGELOG.md            | 161 +++++-----
 39 files changed, 1271 insertions(+), 1130 deletions(-)
 create mode 100644 .agents/skills/api-module/SKILL.md
 create mode 100644 .agents/skills/api-module/agents/openai.yaml
 create mode 100644 .agents/skills/cross-platform-pages/SKILL.md
 create mode 100644 .agents/skills/cross-platform-pages/agents/openai.yaml
 create mode 100644 .agents/skills/figma-mcp/SKILL.md
 create mode 100644 .agents/skills/figma-mcp/agents/openai.yaml
 create mode 100644 .agents/skills/i18n-pass/SKILL.md
 create mode 100644 .agents/skills/i18n-pass/agents/openai.yaml
 create mode 100644 .agents/skills/review-changelog/SKILL.md
 create mode 100644 .agents/skills/review-changelog/agents/openai.yaml
 create mode 100644 .agents/skills/tanstack-query/SKILL.md
 create mode 100644 .agents/skills/tanstack-query/agents/openai.yaml
 delete mode 100644 .claude/skills/api-module/SKILL.md
 delete mode 100644 .claude/skills/cross-platform-pages/SKILL.md
 delete mode 100644 .claude/skills/figma-mcp/SKILL.md
 delete mode 100644 .claude/skills/i18n-pass/SKILL.md
 delete mode 100644 .claude/skills/review-changelog/SKILL.md
 delete mode 100644 .claude/skills/tanstack-query/SKILL.md
 mode change 120000 => 100644 AGENTS.md
 delete mode 100644 CLAUDE.md
 mode change 120000 => 100644 apps/frontend/AGENTS.md
 delete mode 100644 apps/frontend/CLAUDE.md
 delete mode 100644 apps/labrinth/CLAUDE.md
 mode change 120000 => 100644 packages/api-client/AGENTS.md
 delete mode 100644 packages/api-client/CLAUDE.md
 mode change 120000 => 100644 packages/ui/AGENTS.md
 delete mode 100644 packages/ui/CLAUDE.md
 delete mode 100644 standards/frontend/FIGMA_MCP_USAGE.md

diff --git a/.agents/skills/api-module/SKILL.md b/.agents/skills/api-module/SKILL.md
new file mode 100644
index 0000000000..32cc16756b
--- /dev/null
+++ b/.agents/skills/api-module/SKILL.md
@@ -0,0 +1,23 @@
+---
+name: api-module
+description: Add an API endpoint module to packages/api-client from an OpenAPI schema. Use for new backend endpoints, API client modules, or tasks that provide an OpenAPI schema.
+---
+
+# Add an API Module
+
+Read the applicable `AGENTS.md` files before you edit code.
+
+Read [the API module standard](../../../standards/frontend/ADDING_API_MODULES.md) in full.
+
+1. Identify the OpenAPI schema from the request. If more than one schema is possible, ask the user to select one.
+2. Read the schema. Identify each endpoint, HTTP method, request type, response type, and path parameter.
+3. Get the service and version from the URL prefix. For example, map `/v3/projects` to `labrinth/v3/`.
+4. Define the API types in `types.ts`. Make each type match the schema exactly.
+5. Do not change, rename, or remove API fields.
+6. Make a module class that extends `AbstractModule`. Implement each endpoint with `this.client.request()` or `this.client.upload()`.
+7. Use the request-option pattern from the standard. Do not call `$fetch`, `fetch`, or another HTTP client directly.
+8. Add the module to `MODULE_REGISTRY` so the client can instantiate it.
+9. Export new service types from the applicable barrel `index.ts`.
+10. Check the module paths, registry key, public type exports, and endpoint types.
+
+Run only the checks that the user or the applicable `AGENTS.md` permits.
diff --git a/.agents/skills/api-module/agents/openai.yaml b/.agents/skills/api-module/agents/openai.yaml
new file mode 100644
index 0000000000..c8dd768afe
--- /dev/null
+++ b/.agents/skills/api-module/agents/openai.yaml
@@ -0,0 +1,4 @@
+interface:
+  display_name: "Add API Module"
+  short_description: "Add typed API client modules from OpenAPI"
+  default_prompt: "Use $api-module to add an API client module from this OpenAPI schema."
diff --git a/.agents/skills/cross-platform-pages/SKILL.md b/.agents/skills/cross-platform-pages/SKILL.md
new file mode 100644
index 0000000000..2399604821
--- /dev/null
+++ b/.agents/skills/cross-platform-pages/SKILL.md
@@ -0,0 +1,38 @@
+---
+name: cross-platform-pages
+description: Convert a page to the shared Modrinth page system for the website and desktop app. Use for shared layouts, wrapped layouts, or platform dependency-injection contracts.
+---
+
+# Convert a Cross-Platform Page
+
+Read the applicable `AGENTS.md` files before you edit code.
+
+Read these standards in full:
+
+- [Cross-platform pages](../../../standards/frontend/CROSS_PLATFORM_PAGES.md)
+- [Dependency injection](../../../standards/frontend/DEPENDENCY_INJECTION.md)
+
+1. Identify the target page from the request.
+2. Read the page and its route shell. Identify data sources, mutations, navigation, and platform APIs.
+3. Use a wrapped layout when both platforms use the same API source and page logic.
+4. Use a shared layout when platform data or operations have different implementations.
+
+For a shared layout:
+
+1. Define a provider contract for all platform operations.
+2. Put common UI and state logic in the shared layout.
+3. Put reusable search, filter, and selection logic in local composables.
+4. Implement the contract in `apps/frontend/` and `apps/app-frontend/`.
+5. Use optional contract fields only for capabilities that are not available on both platforms.
+
+For a wrapped layout:
+
+1. Move the page to `packages/ui/src/layouts/wrapped/` and preserve its route structure.
+2. Replace platform-only imports with common utilities or provider calls.
+3. Make each frontend route shell render the wrapped component.
+4. Match primary query options in both route shells when the layout uses `ReadyTransition` and `useReadyState`.
+5. Prefetch these queries with `ensureQueryData`, as the standard specifies.
+
+Check that both route shells resolve their imports. Check that all required provider fields have implementations.
+
+Run only the checks that the user or the applicable `AGENTS.md` permits.
diff --git a/.agents/skills/cross-platform-pages/agents/openai.yaml b/.agents/skills/cross-platform-pages/agents/openai.yaml
new file mode 100644
index 0000000000..ad15d4df68
--- /dev/null
+++ b/.agents/skills/cross-platform-pages/agents/openai.yaml
@@ -0,0 +1,4 @@
+interface:
+  display_name: "Convert Cross-Platform Page"
+  short_description: "Share pages across the web and desktop app"
+  default_prompt: "Use $cross-platform-pages to convert this page for the website and desktop app."
diff --git a/.agents/skills/figma-mcp/SKILL.md b/.agents/skills/figma-mcp/SKILL.md
new file mode 100644
index 0000000000..b6d99eecca
--- /dev/null
+++ b/.agents/skills/figma-mcp/SKILL.md
@@ -0,0 +1,21 @@
+---
+name: figma-mcp
+description: Convert a Figma design into a Modrinth Vue page or component. Use when a request provides a Figma URL or asks to implement a Figma layout.
+---
+
+# Implement a Figma Design
+
+Read the applicable `AGENTS.md` files before you edit code.
+
+Read `packages/ui/AGENTS.md` in full.
+
+1. Load the available Figma design-to-code instructions and follow the MCP tool guidance.
+2. Call `get_design_context` first with `clientLanguages: "typescript,html,css"` and `clientFrameworks: "vue"`.
+3. Treat the result as reference code and adapt it to the Modrinth codebase.
+4. Map Figma color variables to the applicable `surface-*` and `text-*` tokens. Do not use aliased Figma names directly.
+5. Reuse applicable components from `packages/ui/src/components/` before creating new ones. Also refer to `standards/frontend/COMPONENT_STRUCTURE.md`
+6. Read `packages/assets/styles/variables.scss` when Figma does not supply a required token.
+7. Use exact spacing values from the design.
+8. Implement the result as a Vue SFC with Tailwind classes and the existing component library.
+
+Run only the checks that the user or the applicable `AGENTS.md` permits.
diff --git a/.agents/skills/figma-mcp/agents/openai.yaml b/.agents/skills/figma-mcp/agents/openai.yaml
new file mode 100644
index 0000000000..1a7c61d304
--- /dev/null
+++ b/.agents/skills/figma-mcp/agents/openai.yaml
@@ -0,0 +1,4 @@
+interface:
+  display_name: "Implement Figma Design"
+  short_description: "Build Modrinth Vue UI from Figma designs"
+  default_prompt: "Use $figma-mcp to implement this Figma design as a Modrinth Vue component."
diff --git a/.agents/skills/i18n-pass/SKILL.md b/.agents/skills/i18n-pass/SKILL.md
new file mode 100644
index 0000000000..05f69de695
--- /dev/null
+++ b/.agents/skills/i18n-pass/SKILL.md
@@ -0,0 +1,32 @@
+---
+name: i18n-pass
+description: Convert hard-coded English text in changed Vue components to the @modrinth/ui localization system. Use for an i18n pass, untranslated-string review, pull request, or component migration.
+---
+
+# Do an Internationalization Pass
+
+Read the applicable `AGENTS.md` files before you edit code.
+
+Read [the internationalization standard](../../../standards/frontend/INTERNATIONALIZATION.md) in full.
+
+1. Identify the scope from the request.
+2. For a pull request, use `gh pr diff <number>` to identify changed files.
+3. For a file path, inspect that file.
+4. When the request gives no scope, inspect the current uncommitted diff.
+5. Limit the pass to changed `.vue` files.
+6. Find user-visible text in templates and scripts.
+
+Check inner text, `alt`, `placeholder`, `aria-label`, buttons, tooltips, notifications, dropdown labels, and error messages.
+
+Do not change dynamic expressions, HTML tag names, CSS classes, internal identifiers, or log messages.
+
+1. Define stable message IDs with `defineMessage` or `defineMessages`.
+2. Replace simple text with `formatMessage()` calls.
+3. Use `<IntlFormatted>` for text that contains links or markup.
+4. Use ICU selections and plurals when grammar depends on a value.
+5. Add a space before `}}` when an ICU placeholder ends at the Vue delimiter.
+6. Do not change component logic, layout, or reactivity.
+7. Do not edit localization JSON files. The user maintains those files.
+8. Check the changed templates again for hard-coded English text.
+
+Run only the checks that the user or the applicable `AGENTS.md` permits.
diff --git a/.agents/skills/i18n-pass/agents/openai.yaml b/.agents/skills/i18n-pass/agents/openai.yaml
new file mode 100644
index 0000000000..347ef98b2d
--- /dev/null
+++ b/.agents/skills/i18n-pass/agents/openai.yaml
@@ -0,0 +1,4 @@
+interface:
+  display_name: "Run Internationalization Pass"
+  short_description: "Localize user-visible text in Vue files"
+  default_prompt: "Use $i18n-pass to localize the user-visible text in these changed Vue files."
diff --git a/.agents/skills/review-changelog/SKILL.md b/.agents/skills/review-changelog/SKILL.md
new file mode 100644
index 0000000000..5ab041c1c9
--- /dev/null
+++ b/.agents/skills/review-changelog/SKILL.md
@@ -0,0 +1,40 @@
+---
+name: review-changelog
+description: Review the latest packages/blog/changelog.ts entry against the Modrinth changelog standard. Use before a pull request or when asked to review or lint a changelog entry.
+---
+
+# Review a Changelog Entry
+
+Read [the changelog standard](../../../standards/maintaining/CHANGELOG.md) in full before the review.
+
+1. Open `packages/blog/changelog.ts`.
+2. Find the first entry in the `VERSIONS` array.
+3. If the request names `web`, `hosting`, or `app`, review the latest entry for that product.
+4. Otherwise, review the latest entry and all adjacent entries with the same date.
+
+Check the entry structure:
+
+- `date` contains a valid ISO 8601 timestamp.
+- `product` is `web`, `hosting`, or `app`.
+- An `app` entry has a `version` value.
+- A `web` or `hosting` entry does not have a `version` value.
+- Standard headings are `## Added`, `## Changed`, `## Fixed`, and `## Security`.
+- A featured release can use a linked heading.
+- Flag the legacy `## Improvements` heading.
+
+Check each bullet:
+
+- The voice and tense agree with the section.
+- The first verb agrees with the section.
+- The bullet describes user-visible behavior, not implementation.
+- The bullet identifies the applicable page, tab, modal, or feature.
+- The bullet contains one sentence, uses sentence case, and ends with a period.
+- Product and UI names use the public labels.
+- The bullet does not contain filler, vague intensifiers, apologies, or internal references.
+- The bullet is not a duplicate detail of a larger listed change.
+
+Group findings by entry. For each finding, show the original bullet and a proposed replacement.
+
+If the entry has no findings, state this result. Do not edit the changelog unless the user asks you to apply fixes.
+
+When the user asks for fixes, preserve tab indentation and template-literal formatting.
diff --git a/.agents/skills/review-changelog/agents/openai.yaml b/.agents/skills/review-changelog/agents/openai.yaml
new file mode 100644
index 0000000000..421afc3587
--- /dev/null
+++ b/.agents/skills/review-changelog/agents/openai.yaml
@@ -0,0 +1,4 @@
+interface:
+  display_name: "Review Changelog"
+  short_description: "Review changelog entries for style problems"
+  default_prompt: "Use $review-changelog to review the latest changelog entry."
diff --git a/.agents/skills/tanstack-query/SKILL.md b/.agents/skills/tanstack-query/SKILL.md
new file mode 100644
index 0000000000..71c3ecc71b
--- /dev/null
+++ b/.agents/skills/tanstack-query/SKILL.md
@@ -0,0 +1,39 @@
+---
+name: tanstack-query
+description: Convert Vue server-state code to TanStack Query. Use for useQuery, useMutation, cache invalidation, optimistic updates, or replacement of useAsyncData and manual ref patterns.
+---
+
+# Convert Data Code to TanStack Query
+
+Read the applicable `AGENTS.md` files before you edit code.
+
+Read [the TanStack Query standard](../../../standards/frontend/FETCHING_DATA.md) in full.
+
+1. Identify the target file from the request.
+2. Find `useAsyncData`, `useFetch`, manual API refs, and fetch calls in `onMounted`.
+3. Identify mutations that use manual loading, error, or result refs.
+
+For queries:
+
+1. Replace manual fetch logic with `useQuery`.
+2. Get `api-client` with `injectModrinthClient()`.
+3. Use a hierarchical query key with the resource, qualifier, and parameters.
+4. Use a computed query key for reactive parameters.
+5. Use a computed `enabled` option when the query depends on other data.
+6. Use a shared query-option factory when multiple components use the query.
+
+For mutations:
+
+1. Replace manual mutation state with `useMutation`.
+2. Invalidate or update related query data after success.
+3. Use an optimistic update only when the UI needs an immediate response.
+4. Cancel the applicable query and save its prior data before an optimistic update.
+5. Restore the prior data after an error. Invalidate the query after settlement.
+
+Remove manual loading and error refs that TanStack Query replaces. Remove obsolete `onMounted` fetch calls.
+
+Keep Nuxt SSR behavior. Match route-shell prefetch options when `ReadyTransition` and `useReadyState` depend on the query.
+
+Check query keys, invalidation prefixes, reactive values, and rollback data.
+
+Run only the checks that the user or the applicable `AGENTS.md` permits.
diff --git a/.agents/skills/tanstack-query/agents/openai.yaml b/.agents/skills/tanstack-query/agents/openai.yaml
new file mode 100644
index 0000000000..2db5ece878
--- /dev/null
+++ b/.agents/skills/tanstack-query/agents/openai.yaml
@@ -0,0 +1,4 @@
+interface:
+  display_name: "Migrate to TanStack Query"
+  short_description: "Migrate Vue server state to TanStack Query"
+  default_prompt: "Use $tanstack-query to migrate this Vue component to TanStack Query."
diff --git a/.claude/skills/api-module/SKILL.md b/.claude/skills/api-module/SKILL.md
deleted file mode 100644
index 37b4ac7788..0000000000
--- a/.claude/skills/api-module/SKILL.md
+++ /dev/null
@@ -1,18 +0,0 @@
----
-name: api-module
-description: Add a new API endpoint module to packages/api-client from an OpenAPI schema. Use when adding new backend endpoints, creating API client modules, or when an openapi.yml is provided.
-argument-hint: <path-to-openapi.yml>
----
-
-Refer to the standard: @standards/frontend/ADDING_API_MODULES.md
-
-## Steps
-
-1. **Read the OpenAPI schema** at `$ARGUMENTS` — identify the endpoints, request/response shapes, and path parameters.
-2. **Read the standard above** for naming conventions, type rules, and the module registration pattern.
-3. **Determine the service and version** — the URL path prefix tells you which service directory and version namespace to use (e.g. `/v3/projects` → `labrinth/v3/`).
-4. **Define types in `types.ts`** — types must match the API response 1:1. Use the OpenAPI schema as the source of truth. Do not reshape or rename fields.
-5. **Create the module class** — extend `BaseModule`, implement each endpoint as a method. Use the correct HTTP verb and request options pattern from the standard.
-6. **Register in `MODULE_REGISTRY`** — add the module entry so it's auto-instantiated on the client.
-7. **Export types** from the service's barrel `index.ts`.
-8. **Verify** — check that the module compiles and the types are accessible from `@modrinth/api-client`.
diff --git a/.claude/skills/cross-platform-pages/SKILL.md b/.claude/skills/cross-platform-pages/SKILL.md
deleted file mode 100644
index 6558eed3c3..0000000000
--- a/.claude/skills/cross-platform-pages/SKILL.md
+++ /dev/null
@@ -1,26 +0,0 @@
----
-name: cross-platform-pages
-description: Convert a page to the cross-platform page system so it works in both the website and the desktop app. Use when moving a page into packages/ui/src/layouts/, creating shared or wrapped layouts, or setting up DI contracts for platform abstraction.
-argument-hint: <path-to-page>
----
-
-Refer to the standards: @standards/frontend/CROSS_PLATFORM_PAGES.md and @standards/frontend/DEPENDENCY_INJECTION.md
-
-## Steps
-
-1. **Read the target page** at `$ARGUMENTS` and understand its data sources, mutations, and navigation.
-2. **Read the standards above** to understand the shared vs wrapped distinction and the DI pattern.
-3. **Decide the category:**
-   - **Wrapped** (`layouts/wrapped/`) — if the page uses the same API source on both platforms (e.g. web requests, not Tauri plugins). Just move the page component into `packages/ui` and import it from both frontends.
-   - **Shared** (`layouts/shared/`) — if the page has different data-fetching logic per platform (e.g. website uses `api-client`, app uses Tauri `invoke`). Requires a DI contract.
-4. **For shared layouts:**
-   - Define a DI contract interface in `providers/` capturing all platform-specific operations.
-   - Create the layout component that injects the context and handles all UI logic.
-   - Extract reusable stateful logic (search, filtering, selection) into `composables/`.
-   - Implement the contract separately in each frontend (`apps/frontend/`, `apps/app-frontend/`).
-5. **For wrapped pages:**
-   - Move the page component into `packages/ui/src/layouts/wrapped/` matching the route structure.
-   - Replace any platform-specific imports with shared utilities.
-   - Import and render the wrapped page from both frontends as a simple component.
-   - If the layout uses TanStack Query for initial route paint with `ReadyTransition` / `useReadyState`, each platform route shell must call `ensureQueryData` for those queries with matching keys and fetchers — see **Platform route shells: prefetch with `ensureQueryData`** in `standards/frontend/CROSS_PLATFORM_PAGES.md`.
-6. **Verify** the page renders correctly by checking for missing imports and that all DI contracts are satisfied.
diff --git a/.claude/skills/figma-mcp/SKILL.md b/.claude/skills/figma-mcp/SKILL.md
deleted file mode 100644
index defabf8d2e..0000000000
--- a/.claude/skills/figma-mcp/SKILL.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-name: figma-mcp
-description: Use the Figma MCP server to translate a Figma design into a Vue page or component layout. Use when the user provides a Figma URL, asks to implement a design, or wants to draft a page layout from Figma.
-argument-hint: <figma-url>
----
-
-Refer to the standard: @standards/frontend/FIGMA_MCP_USAGE.md
-Also read @packages/ui/CLAUDE.md for color token mapping and component conventions.
-
-## Steps
-
-1. **Parse the Figma URL** from `$ARGUMENTS` — extract the `fileKey` and `nodeId`. Convert `-` to `:` in the node ID.
-2. **Read the standards above** for the available tools, adaptation rules, and color usage.
-3. **Call `get_design_context`** with the extracted `nodeId` and `fileKey`, using `clientLanguages: "typescript,html,css"` and `clientFrameworks: "vue"`. This is always the first tool to call.
-5. **Adapt the output to the Modrinth codebase:**
-   - Map Figma color variables to `surface-*` / `text-*` tokens — never use Figma's aliased names directly.
-   - Check `packages/ui/src/components/` for existing components that match elements in the design (buttons, cards, modals, inputs, etc.).
-   - Check `packages/assets/styles/variables.scss` for tokens not exposed in Figma.
-   - Match spacing values exactly from the design.
-6. **Use `get_screenshot`** if you need a closer visual reference of specific nodes.
-7. **Use `get_variable_defs`** to verify which design tokens are applied to ambiguous elements.
-8. **Build the component** as a Vue SFC using Tailwind classes and the project's existing component library.
diff --git a/.claude/skills/i18n-pass/SKILL.md b/.claude/skills/i18n-pass/SKILL.md
deleted file mode 100644
index 7edd69996c..0000000000
--- a/.claude/skills/i18n-pass/SKILL.md
+++ /dev/null
@@ -1,24 +0,0 @@
----
-name: i18n-pass
-description: Perform an i18n localization pass on changed files or a pull request, converting hard-coded English strings to the @modrinth/ui i18n system. Use when internationalizing a set of changes, reviewing a PR for untranslated strings, or converting a specific component.
-argument-hint: [file-path-or-pr-number]
----
-
-Refer to the standard: @standards/frontend/INTERNATIONALIZATION.md
-
-## Steps
-
-1. **Identify the scope of changes:**
-   - If `$ARGUMENTS` is a PR number, run `gh pr diff $ARGUMENTS` to get the changed files.
-   - If `$ARGUMENTS` is a file path, use that directly.
-   - If no argument, check `git diff` for uncommitted changes.
-2. **Read the standard above** for the message definition pattern, ICU format rules, and `IntlFormatted` usage.
-3. **Filter to Vue SFCs** — only `.vue` files need i18n passes. Skip non-component files.
-4. **For each file, scan for hard-coded strings:**
-   - `<template>`: inner text, `alt`, `placeholder`, `aria-label`, button labels, tooltip text.
-   - `<script>`: string literals passed to user-visible UI (notification messages, dropdown labels, error messages).
-   - Skip: dynamic expressions, HTML tag names, CSS classes, internal identifiers, log messages.
-5. **Define messages** with `defineMessages` — use descriptive, stable `id`s based on the component's domain (e.g. `project.settings.title`).
-6. **Replace strings in templates** with `formatMessage()` calls, or `<IntlFormatted>` for strings containing links or markup.
-7. **Handle ICU edge cases** — add a space before `}}` if an ICU placeholder ends at a Vue template delimiter boundary.
-8. **Verify** no hard-coded English strings remain in the changed templates. Do not alter logic, layout, or reactivity.
diff --git a/.claude/skills/review-changelog/SKILL.md b/.claude/skills/review-changelog/SKILL.md
deleted file mode 100644
index cdde36adb7..0000000000
--- a/.claude/skills/review-changelog/SKILL.md
+++ /dev/null
@@ -1,36 +0,0 @@
----
-name: review-changelog
-description: Review the latest changelog entry in packages/blog/changelog.ts against the project's changelog style guide and flag bullets that need rewriting. Use when checking a freshly added changelog entry before opening a PR, or when the user asks to review/lint the latest changelog.
-argument-hint: [product?]
----
-
-Refer to the standard: @standards/maintaining/CHANGELOG.md
-
-## Steps
-
-1. **Locate the latest entry:**
-   - Open `packages/blog/changelog.ts`.
-   - The latest entries are at the top of the `VERSIONS` array.
-   - If `$ARGUMENTS` specifies a product (`web`, `hosting`, `app`), review the most recent entry for that product. Otherwise, review the most recent entry overall, plus any sibling entries sharing the same `date` (coordinated releases ship together).
-
-2. **Read the standard above** in full before reviewing. The bullet rules, section/verb agreement, and "Don't" list are the source of truth.
-
-3. **Check the entry shell:**
-   - `date` is a valid ISO 8601 timestamp.
-   - `product` is one of `web`, `hosting`, `app`.
-   - `version` is present for `app` entries and omitted for `web`/`hosting`.
-   - Section headings use `## Added`, `## Changed`, `## Fixed`, `## Security` (or a featured-release linked heading). Flag legacy `## Improvements`.
-
-4. **Review each bullet** against the standard. For each bullet, check:
-   - Voice/tense matches the section heading.
-   - Opening verb agrees with its section.
-   - Describes observable behavior, not implementation.
-   - Specific enough to identify the surface (names the tab/page/modal).
-   - One sentence, ends with a period, sentence case.
-   - Uses branded names (Modrinth App, Modrinth Hosting) correctly.
-   - No filler ("issue with", "issue where", "various", "some"), no vague intensifiers, no apologies, no PR/commit references (unless crediting a third-party contributor with a linked GitHub profile).
-   - Not a duplicate sub-fix of a bigger change already listed.
-
-5. **Report findings** as a short list grouped by entry. For each problem bullet, show the original line and a suggested rewrite. If the entry is clean, say so explicitly. Do not edit the file unless the user asks - this skill is a review pass, not a rewrite pass.
-
-6. **If the user then asks to apply fixes**, edit `packages/blog/changelog.ts` directly using the suggested rewrites. Preserve tab indentation and template literal formatting.
diff --git a/.claude/skills/tanstack-query/SKILL.md b/.claude/skills/tanstack-query/SKILL.md
deleted file mode 100644
index 4797357a80..0000000000
--- a/.claude/skills/tanstack-query/SKILL.md
+++ /dev/null
@@ -1,27 +0,0 @@
----
-name: tanstack-query
-description: Convert a page or component from useAsyncData/manual ref patterns to TanStack Query for server state management. Use when migrating data fetching to useQuery/useMutation, adding cache invalidation, or replacing useAsyncData with TanStack Query.
-argument-hint: <path-to-file>
----
-
-Refer to the standard: @standards/frontend/FETCHING_DATA.md
-
-## Steps
-
-1. **Read the target file** at `$ARGUMENTS` and identify all data-fetching patterns: `useAsyncData`, `useFetch`, manual `ref()` + `await`, or `onMounted` fetch calls.
-2. **Read the standard above** for the query/mutation patterns, query key conventions, and optimistic update approach.
-3. **Convert queries:**
-   - Replace `useAsyncData` / `useFetch` / manual fetches with `useQuery`.
-   - Use the `api-client` via `injectModrinthClient()` for the `queryFn`.
-   - Design query keys with the `['resource', 'version', ...params]` convention.
-   - Use `computed` query keys for reactive parameters.
-   - Use the `enabled` option for conditional queries that depend on other data.
-4. **Convert mutations:**
-   - Replace manual `try/catch` + `ref` patterns with `useMutation`.
-   - Add `onSuccess` handlers that invalidate or update related query caches.
-   - Consider optimistic updates for UI-critical mutations (follow the pattern in the standard).
-5. **Clean up:**
-   - Remove manual loading/error `ref()`s that are now handled by TanStack Query's return values (`isPending`, `isError`, `error`).
-   - Remove manual `onMounted` fetch calls.
-   - Ensure SSR compatibility — queries in Nuxt pages are automatically awaited during SSR.
-6. **Verify** the page still renders correctly and that cache invalidation triggers re-fetches where expected.
diff --git a/.gitignore b/.gitignore
index 145849e1c0..064fbf0449 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,8 +65,7 @@ generated
 app-playground-data/*
 
 .astro
-.claude/*
-!.claude/skills/
+.claude/
 .letta
 
 # labrinth demo fixtures
diff --git a/AGENTS.md b/AGENTS.md
deleted file mode 120000
index 681311eb9c..0000000000
--- a/AGENTS.md
+++ /dev/null
@@ -1 +0,0 @@
-CLAUDE.md
\ No newline at end of file
diff --git a/AGENTS.md b/AGENTS.md
new file mode 100644
index 0000000000..c962748cbc
--- /dev/null
+++ b/AGENTS.md
@@ -0,0 +1,93 @@
+# Modrinth Monorepo
+
+This is the Modrinth monorepo — it contains all Modrinth projects, both frontend and backend. When entering a project, either to edit or analyse, you should read its AGENTS.md.
+
+## Architecture
+
+- **Monorepo tooling:** [Turborepo](https://turbo.build/) (`turbo.jsonc`) + [pnpm workspaces](https://pnpm.io/workspaces) (`pnpm-workspace.yaml`)
+- **Frontend:** Vue 3 / Nuxt 3, Tailwind CSS v3
+- **Backend:** Rust (Labrinth API), Postgres, Clickhouse
+- **Indentation:** Use TAB everywhere, never spaces
+
+### Apps (`apps/`)
+
+| App               | Description                    |
+| ----------------- | ------------------------------ |
+| `frontend`        | Main Modrinth website (Nuxt 3) |
+| `app-frontend`    | Desktop/app frontend (Vue 3)   |
+| `app`             | Desktop/app shell (Tauri)      |
+| `app-playground`  | Testing playground for app     |
+| `labrinth`        | Backend API service            |
+| `daedalus_client` | Daedalus client implementation |
+| `docs`            | Documentation site (Astro)     |
+
+### Packages (`packages/`)
+
+| Package            | Description                                           |
+| ------------------ | ----------------------------------------------------- |
+| `ui`               | Shared Vue component library (`@modrinth/ui`)         |
+| `assets`           | Styling and auto-generated icons (`@modrinth/assets`) |
+| `api-client`       | API client for Nuxt, Tauri, and Node/browser          |
+| `app-lib`          | Shared app library                                    |
+| `blog`             | Blog system and changelog data                        |
+| `utils`            | Shared utility functions (mostly deprecated)          |
+| `moderation`       | Moderation utilities                                  |
+| `daedalus`         | Daedalus protocol                                     |
+| `tooling-config`   | ESLint, Prettier, TypeScript configs                  |
+| `ariadne`          | Analytics library                                     |
+| `modrinth-log`     | Logging utilities                                     |
+| `modrinth-maxmind` | MaxMind GeoIP                                         |
+| `modrinth-util`    | General utilities                                     |
+| `muralpay`         | Payment processing                                    |
+| `path-util`        | Path utilities                                        |
+| `sqlx-tracing`     | SQLx query tracing                                    |
+
+## Pre-PR Commands
+
+Run these from the **root** folder before opening a pull request - do not run these after each prompt the user gives you, only run when asked, ask the user a question if they want to run it if the user indicates that they are about to create a pull request.
+
+- **Website:** `pnpm prepr:frontend:web`
+- **App frontend:** `pnpm prepr:frontend:app`
+- **Frontend libs:** `pnpm prepr:frontend:lib`
+- **All frontend (app+web):** `pnpm prepr`
+- **Labrinth (backend):** See `apps/labrinth/AGENTS.md`
+
+The website and app `prepr` commands
+
+## Dev Commands
+
+- **Website:** `pnpm web:dev` (copy `.env` template in `apps/frontend/` first)
+- **App:** `pnpm app:dev` (copy `.env` template in `packages/app-lib/` first)
+- **Storybook (packages/ui):** `pnpm storybook`
+
+## Project-Specific Instructions
+
+Each project may have its own file with detailed instructions:
+
+- [`apps/labrinth/AGENTS.md`](apps/labrinth/AGENTS.md) — Backend API
+- [`apps/frontend/AGENTS.md`](apps/frontend/AGENTS.md) - Frontend Website
+
+## Code Guidelines
+
+### Comments
+- DO NOT use "heading" comments like: `=== Helper methods ===`.
+- Use doc comments, but avoid inline comments unless ABSOLUTELY necessary for clarity. Code should aim to be self documenting!
+
+## Bash Guidelines
+
+### Output handling
+- DO NOT pipe output through `head`, `tail`, `less`, or `more`
+- NEVER use `| head -n X` or `| tail -n X` to truncate output
+- IMPORTANT: Run commands directly without pipes when possible
+- IMPORTANT: If you need to limit output, use command-specific flags (e.g. `git log -n 10` instead of `git log | head -10`)
+- ALWAYS read the full output — never pipe through filters
+
+### General
+- Do not create new non-source code files (e.g. Bash scripts, SQL scripts) unless explicitly prompted to
+- For Frontend, when doing lint checks, only use the `prepr` commands, do not use `typecheck` or `tsc` etc.
+- Types in `@modrinth/utils` are considered highly outdated, if a component needs them, check if you can switch said component to use types from `packages/api-client`
+- When provided problems, do not say "I didn't introduce these problems" (shifting the blame/effort) - just fix them.
+
+## Standards
+
+Standards available at the @standards/ folder.
diff --git a/CLAUDE.md b/CLAUDE.md
deleted file mode 100644
index 55e090e280..0000000000
--- a/CLAUDE.md
+++ /dev/null
@@ -1,110 +0,0 @@
-# Modrinth Monorepo
-
-This is the Modrinth monorepo — it contains all Modrinth projects, both frontend and backend. When entering a project, either to edit or analyse, you should read it's CLAUDE.md.
-
-## Architecture
-
-- **Monorepo tooling:** [Turborepo](https://turbo.build/) (`turbo.jsonc`) + [pnpm workspaces](https://pnpm.io/workspaces) (`pnpm-workspace.yaml`)
-- **Frontend:** Vue 3 / Nuxt 3, Tailwind CSS v3
-- **Backend:** Rust (Labrinth API), Postgres, Clickhouse
-- **Indentation:** Use TAB everywhere, never spaces
-
-### Apps (`apps/`)
-
-| App               | Description                    |
-| ----------------- | ------------------------------ |
-| `frontend`        | Main Modrinth website (Nuxt 3) |
-| `app-frontend`    | Desktop/app frontend (Vue 3)   |
-| `app`             | Desktop/app shell (Tauri)      |
-| `app-playground`  | Testing playground for app     |
-| `labrinth`        | Backend API service            |
-| `daedalus_client` | Daedalus client implementation |
-| `docs`            | Documentation site (Astro)     |
-
-### Packages (`packages/`)
-
-| Package            | Description                                           |
-| ------------------ | ----------------------------------------------------- |
-| `ui`               | Shared Vue component library (`@modrinth/ui`)         |
-| `assets`           | Styling and auto-generated icons (`@modrinth/assets`) |
-| `api-client`       | API client for Nuxt, Tauri, and Node/browser          |
-| `app-lib`          | Shared app library                                    |
-| `blog`             | Blog system and changelog data                        |
-| `utils`            | Shared utility functions (mostly deprecated)          |
-| `moderation`       | Moderation utilities                                  |
-| `daedalus`         | Daedalus protocol                                     |
-| `tooling-config`   | ESLint, Prettier, TypeScript configs                  |
-| `ariadne`          | Analytics library                                     |
-| `modrinth-log`     | Logging utilities                                     |
-| `modrinth-maxmind` | MaxMind GeoIP                                         |
-| `modrinth-util`    | General utilities                                     |
-| `muralpay`         | Payment processing                                    |
-| `path-util`        | Path utilities                                        |
-| `sqlx-tracing`     | SQLx query tracing                                    |
-
-## Pre-PR Commands
-
-Run these from the **root** folder before opening a pull request - do not run these after each prompt the user gives you, only run when asked, ask the user a question if they want to run it if the user indicates that they are about to create a pull request.
-
-- **Website:** `pnpm prepr:frontend:web`
-- **App frontend:** `pnpm prepr:frontend:app`
-- **Frontend libs:** `pnpm prepr:frontend:lib`
-- **All frontend (app+web):** `pnpm prepr`
-- **Labrinth (backend):** See `apps/labrinth/AGENTS.md`
-
-The website and app `prepr` commands
-
-## Dev Commands
-
-- **Website:** `pnpm web:dev` (copy `.env` template in `apps/frontend/` first)
-- **App:** `pnpm app:dev` (copy `.env` template in `packages/app-lib/` first)
-- **Storybook (packages/ui):** `pnpm storybook`
-
-## Project-Specific Instructions
-
-Each project may have its own file with detailed instructions:
-
-- [`apps/labrinth/AGENTS.md`](apps/labrinth/AGENTS.md) — Backend API
-- [`apps/frontend/CLAUDE.md`](apps/frontend/CLAUDE.md) - Frontend Website
-
-## Code Guidelines
-
-### Comments
-- DO NOT use "heading" comments like: `=== Helper methods ===`.
-- Use doc comments, but avoid inline comments unless ABSOLUTELY necessary for clarity. Code should aim to be self documenting!
-
-## Bash Guidelines
-
-### Output handling
-- DO NOT pipe output through `head`, `tail`, `less`, or `more`
-- NEVER use `| head -n X` or `| tail -n X` to truncate output
-- IMPORTANT: Run commands directly without pipes when possible
-- IMPORTANT: If you need to limit output, use command-specific flags (e.g. `git log -n 10` instead of `git log | head -10`)
-- ALWAYS read the full output — never pipe through filters
-
-### General
-- Do not create new non-source code files (e.g. Bash scripts, SQL scripts) unless explicitly prompted to
-- For Frontend, when doing lint checks, only use the `prepr` commands, do not use `typecheck` or `tsc` etc.
-- Types in `@modrinth/utils` are considered highly outdated, if a component needs them, check if you can switch said component to use types from `packages/api-client`
-- When provided problems, do not say "I didn't introduce these problems" (shifting the blame/effort) - just fix them.
-
-## Edit Tool - Whitespace Handling (CLAUDE ONLY)
-
-The Read tool uses `→` to mark where line numbers end and file content begins.
-
-**Rule:** Copy the EXACT whitespace that appears after the `→` marker.
-- Whatever appears between `→` and the code text is what's actually in the file
-- That whitespace must be used EXACTLY in Edit tool's old_string
-- Don't count arrows, don't interpret - just copy what's after the `→`
-
-**Example:**
-14→		private byte tag;
-For Edit, use: `		private byte tag;` (copy everything after →, including the two tabs)
-
-**If Edit fails:** Stop and explain the problem. Do not attempt sed/awk/bash workarounds.
-
-**IMPORTANT**: Trust the Read tool output. Copy what's after `→` into Edit immediately. DO NOT verify with sed/od/grep first - that's wasting time and the instructions already tell you to stop if Edit fails, not to pre-verify.
-
-## Standards
-
-Standards available at the @standards/ folder.
diff --git a/apps/frontend/AGENTS.md b/apps/frontend/AGENTS.md
deleted file mode 120000
index 681311eb9c..0000000000
--- a/apps/frontend/AGENTS.md
+++ /dev/null
@@ -1 +0,0 @@
-CLAUDE.md
\ No newline at end of file
diff --git a/apps/frontend/AGENTS.md b/apps/frontend/AGENTS.md
new file mode 100644
index 0000000000..1256887675
--- /dev/null
+++ b/apps/frontend/AGENTS.md
@@ -0,0 +1,42 @@
+# apps/frontend — Modrinth Website
+
+Nuxt 3 application serving the main Modrinth website. Uses Vue 3, Tailwind CSS v3, and file-based routing.
+
+## Architecture
+
+Nuxt 3 with SSR — pages are server-rendered and hydrated on the client. Uses `$fetch` for server-side data fetching and `@modrinth/api-client` (via `NuxtModrinthClient`) for client-side API calls.
+
+## Key Directories
+
+- **`src/pages/`** — file-based routing (`[param].vue` for dynamic segments, nested folders for nested routes)
+- **`src/components/`** — website-specific components (not shared with the app)
+- **`src/composables/`** — Vue composables, including `queries/` for TanStack Query options
+- **`src/providers/`** — page-level DI context providers (e.g., version modal, project page)
+- **`src/plugins/`** — Nuxt plugins (TanStack Query setup, theme, etc.)
+- **`src/middleware/`** — route guards and auth checks
+- **`src/layouts/`** — Nuxt layout components
+- **`src/server/`** — server-side plugins, routes, and utilities
+- **`src/store/`** — Pinia state management
+- **`src/helpers/`** — utility functions
+- **`src/locales/`** — i18n translation files
+
+## Components
+
+**Website-specific components go in `src/components/`.** These are components that only make sense in the website context — admin panels, moderation tools, dashboard widgets, brand components, etc.
+
+**Shared components go in `packages/ui`.** If a component could be used by both the website and the desktop app, it belongs in `packages/ui/src/components/`. See `packages/ui/AGENTS.md` for UI standards, color rules, and component patterns.
+
+Rule of thumb: if it doesn't depend on Nuxt-specific APIs or website-only features, it should be in `packages/ui`.
+
+## Data Fetching
+
+Use `@modrinth/api-client` via `injectModrinthClient()` for all API calls. See `packages/api-client/AGENTS.md` for the full API client documentation.
+
+For caching and server state, use TanStack Query (`@tanstack/vue-query`). See the `tanstack-query` skill (`.agents/skills/tanstack-query/SKILL.md`) for patterns and conventions used in this codebase.
+
+### Deprecated Composables
+
+These composables are deprecated and should not be used in new code:
+
+- **`useAsyncData`** - we use tanstack, not nuxt's built in async data utility.
+- **`useBaseFetch`** (`src/composables/fetch.js`) — legacy Labrinth fetch wrapper. Use `client.labrinth.*` modules instead.
diff --git a/apps/frontend/CLAUDE.md b/apps/frontend/CLAUDE.md
deleted file mode 100644
index 03515cbb31..0000000000
--- a/apps/frontend/CLAUDE.md
+++ /dev/null
@@ -1,42 +0,0 @@
-# apps/frontend — Modrinth Website
-
-Nuxt 3 application serving the main Modrinth website. Uses Vue 3, Tailwind CSS v3, and file-based routing.
-
-## Architecture
-
-Nuxt 3 with SSR — pages are server-rendered and hydrated on the client. Uses `$fetch` for server-side data fetching and `@modrinth/api-client` (via `NuxtModrinthClient`) for client-side API calls.
-
-## Key Directories
-
-- **`src/pages/`** — file-based routing (`[param].vue` for dynamic segments, nested folders for nested routes)
-- **`src/components/`** — website-specific components (not shared with the app)
-- **`src/composables/`** — Vue composables, including `queries/` for TanStack Query options
-- **`src/providers/`** — page-level DI context providers (e.g., version modal, project page)
-- **`src/plugins/`** — Nuxt plugins (TanStack Query setup, theme, etc.)
-- **`src/middleware/`** — route guards and auth checks
-- **`src/layouts/`** — Nuxt layout components
-- **`src/server/`** — server-side plugins, routes, and utilities
-- **`src/store/`** — Pinia state management
-- **`src/helpers/`** — utility functions
-- **`src/locales/`** — i18n translation files
-
-## Components
-
-**Website-specific components go in `src/components/`.** These are components that only make sense in the website context — admin panels, moderation tools, dashboard widgets, brand components, etc.
-
-**Shared components go in `packages/ui`.** If a component could be used by both the website and the desktop app, it belongs in `packages/ui/src/components/`. See `packages/ui/CLAUDE.md` for UI standards, color rules, and component patterns.
-
-Rule of thumb: if it doesn't depend on Nuxt-specific APIs or website-only features, it should be in `packages/ui`.
-
-## Data Fetching
-
-Use `@modrinth/api-client` via `injectModrinthClient()` for all API calls. See `packages/api-client/CLAUDE.md` for the full API client documentation.
-
-For caching and server state, use TanStack Query (`@tanstack/vue-query`). See the `tanstack-query` skill (`.claude/skills/tanstack-query/SKILL.md`) for patterns and conventions used in this codebase.
-
-### Deprecated Composables
-
-These composables are deprecated and should not be used in new code:
-
-- **`useAsyncData`** - we use tanstack, not nuxt's built in async data utility.
-- **`useBaseFetch`** (`src/composables/fetch.js`) — legacy Labrinth fetch wrapper. Use `client.labrinth.*` modules instead.
diff --git a/apps/labrinth/CLAUDE.md b/apps/labrinth/CLAUDE.md
deleted file mode 100644
index 8d770e2555..0000000000
--- a/apps/labrinth/CLAUDE.md
+++ /dev/null
@@ -1 +0,0 @@
-Read @AGENTS.md
diff --git a/packages/api-client/AGENTS.md b/packages/api-client/AGENTS.md
deleted file mode 120000
index 681311eb9c..0000000000
--- a/packages/api-client/AGENTS.md
+++ /dev/null
@@ -1 +0,0 @@
-CLAUDE.md
\ No newline at end of file
diff --git a/packages/api-client/AGENTS.md b/packages/api-client/AGENTS.md
new file mode 100644
index 0000000000..7b01591060
--- /dev/null
+++ b/packages/api-client/AGENTS.md
@@ -0,0 +1,208 @@
+# @modrinth/api-client
+
+Platform-agnostic API client for Modrinth's services. Works in Nuxt (SSR + CSR), Tauri (desktop app), and plain Node/browser environments.
+
+## Architecture
+
+```
+Request Flow:
+  Module Method → client.request() → Feature Chain (middleware) → Platform executeRequest()
+```
+
+### Key Directories
+
+- **`src/core/`** — base classes (`AbstractModrinthClient`, `AbstractModule`, `AbstractFeature`, etc.)
+- **`src/platform/`** — platform implementations (generic, nuxt, tauri, xhr-upload, websocket)
+- **`src/features/`** — middleware plugins (auth, retry, circuit-breaker, etc.)
+- **`src/modules/`** — API endpoint modules organized by service (`labrinth/`, `archon/`, `kyros/`, `iso3166/`)
+- **`src/types/`** — core type definitions (client config, request options, upload types, errors)
+
+### Client Hierarchy
+
+All platform clients extend `XHRUploadClient` → `AbstractModrinthClient`:
+
+- **`GenericModrinthClient`** — uses `ofetch`, attaches WebSocket client to `archon.sockets`
+- **`NuxtModrinthClient`** — uses Nuxt's `$fetch`, SSR-aware, blocks `upload()` during SSR
+- **`TauriModrinthClient`** — uses `@tauri-apps/plugin-http`
+
+### Module Access
+
+Modules are lazy-loaded and accessed as a nested structure:
+
+```ts
+client.labrinth.projects_v2
+client.labrinth.projects_v3
+client.labrinth.versions_v3
+client.labrinth.collections
+client.labrinth.billing_internal
+client.archon.servers_v0
+client.archon.servers_v1
+client.archon.backups_queue_v1
+client.archon.backups_v1
+client.archon.content_v0
+client.kyros.files_v0
+client.iso3166.data
+... etc.
+```
+
+This structure is derived at runtime from the flat `MODULE_REGISTRY` in `modules/index.ts` via `buildModuleStructure()`, and the TypeScript types are inferred automatically via `InferredClientModules`.
+
+## Critical: Always use `this.client.request()`
+
+API modules **must** use `this.client.request()` (or `.upload`) for all HTTP calls — never `$fetch`, `fetch`, or any other HTTP library directly. The request method routes through the platform-specific implementation (Nuxt `$fetch`, Tauri HTTP plugin, etc.) and the feature middleware chain (auth, retry, circuit breaker). Using `$fetch` directly bypasses the platform layer and will fail in Tauri (CORS/sandboxing). The only exception is the `ISO3166Module` which is explicitly node-only.
+
+For external APIs (non-Modrinth), pass the full base URL as the `api` field and set `skipAuth: true`:
+
+```ts
+this.client.request<MyType>('/endpoint', {
+	api: 'https://external-api.com',
+	version: 1,
+	method: 'POST',
+	body: { data },
+	skipAuth: true,
+})
+```
+
+## Usage
+
+The client is provided to the component tree via DI (see `standards/frontend/DEPENDENCY_INJECTION.md`). Each app creates a platform-specific client and provides it at the root:
+
+```ts
+// apps/frontend/src/app.vue (Nuxt)
+const client = new NuxtModrinthClient({ ... })
+provideModrinthClient(client)
+
+// apps/app-frontend/src/App.vue (Tauri)
+const client = new TauriModrinthClient({ ... })
+provideModrinthClient(client)
+```
+
+Components anywhere in the tree then inject it:
+
+```ts
+const { labrinth, archon, kyros } = injectModrinthClient()
+
+// Fetch data
+const project = await labrinth.projects_v3.get(projectId)
+
+// Use with TanStack Query
+const { data } = useQuery({
+	queryKey: ['project', projectId],
+	queryFn: () => labrinth.projects_v3.get(projectId),
+})
+```
+
+`provideModrinthClient` and `injectModrinthClient` are exported from `@modrinth/ui` (defined in `packages/ui/src/providers/api-client.ts`). The provider is typed as `AbstractModrinthClient`, so shared components in `packages/ui` work with any platform client.
+
+## Types
+
+Types must match 1:1 with how they are returned from the backend API they are fetching from. Do not reshape, rename, or omit fields — the types should be a direct representation of the API response.
+
+Types are organized in namespaces that mirror the backend services:
+
+```ts
+import type { Labrinth, Archon, Kyros, ISO3166 } from '@modrinth/api-client'
+
+const project: Labrinth.Projects.v3.Project = ...
+const server: Archon.Servers.v0.Server = ...
+const auth: Archon.Websocket.v0.WSAuth = ...
+```
+
+Each API has a `types.ts` in its module directory (`modules/labrinth/types.ts`, `modules/archon/types.ts`, etc.) using nested namespaces: `Namespace.Domain.Version.Type`.
+
+## Features (Middleware)
+
+Features wrap requests in a chain. Each feature can modify the request, retry, or short-circuit:
+
+- **`AuthFeature`** — injects `Authorization: Bearer <token>`, supports async token providers
+- **`RetryFeature`** — exponential/linear/constant backoff, retries on 408/429/5xx and network errors
+- **`CircuitBreakerFeature`** — opens after N consecutive failures per endpoint, resets after timeout
+
+## XHR Upload
+
+File uploads use `XMLHttpRequest` for progress tracking (not available via `fetch`). The `upload()` method returns an `UploadHandle<T>`:
+
+```ts
+interface UploadHandle<T> {
+	promise: Promise<T>
+	onProgress(callback: (progress: UploadProgress) => void): UploadHandle<T> // chainable
+	cancel(): void
+}
+```
+
+Supports two modes:
+
+- **Single file** — `{ file: File | Blob }` sends with `Content-Type: application/octet-stream`
+- **FormData** — `{ formData: FormData }` for multipart uploads (browser/platform sets boundary)
+
+Uploads go through the feature chain (auth, retry, etc.). Features detect uploads via `context.metadata.isUpload`.
+
+### Usage Example (server file upload)
+
+```ts
+const uploader = client.kyros.files_v0.uploadFile(path, file, {
+	onProgress: ({ progress }) => {
+		uploadProgress.value = Math.round(progress * 100)
+	},
+})
+// Cancel if needed: uploader.cancel()
+await uploader.promise
+```
+
+### Usage Example (version creation with FormData)
+
+```ts
+const handle = client.labrinth.versions_v3.createVersion(draftVersion, files, projectType)
+handle.onProgress((progress) => {
+	uploadProgress.value = progress
+})
+await handle.promise
+```
+
+See `packages/ui/src/components/servers/files/upload/FileUploadDropdown.vue` and `apps/frontend/src/providers/version/manage-version-modal.ts` for real usage.
+
+## WebSocket
+
+WebSocket support is attached to `client.archon.sockets` (only on `GenericModrinthClient`). It provides event-based communication with Modrinth Hosting servers.
+
+### Connection Flow
+
+```
+client.archon.sockets.safeConnect(serverId)
+  → fetches JWT auth via archon.servers_v0.getWebSocketAuth()
+  → opens wss:// connection
+  → sends { event: 'auth', jwt: token }
+  → server responds with { event: 'auth-ok' }
+  → ready to receive events
+```
+
+Auto-reconnects on unexpected disconnection with exponential backoff (base 1s, max 30s, up to 10 attempts).
+
+### Subscribing to Events
+
+```ts
+const unsub = client.archon.sockets.on(serverId, 'stats', (data) => {
+	// data is typed as Archon.Websocket.v0.WSStatsEvent
+	cpuUsage.value = data.cpu_percent
+})
+
+// Clean up
+onUnmounted(() => {
+	unsub()
+	client.archon.sockets.disconnect(serverId)
+})
+```
+
+Event types: `log`, `stats`, `power-state`, `uptime`, `backup-progress`, `installation-result`, `filesystem-ops`, `new-mod`, `auth-expiring`, `auth-incorrect`, `auth-ok`.
+
+### Sending Commands
+
+```ts
+client.archon.sockets.send(serverId, { event: 'command', cmd: '/say hello' })
+```
+
+See `apps/frontend/src/pages/hosting/manage/[id].vue` for the full server panel WebSocket usage.
+
+## Adding a New API Module
+
+See the `api-module` skill (`.agents/skills/api-module/SKILL.md`) for step-by-step instructions.
diff --git a/packages/api-client/CLAUDE.md b/packages/api-client/CLAUDE.md
deleted file mode 100644
index 6b7d150824..0000000000
--- a/packages/api-client/CLAUDE.md
+++ /dev/null
@@ -1,208 +0,0 @@
-# @modrinth/api-client
-
-Platform-agnostic API client for Modrinth's services. Works in Nuxt (SSR + CSR), Tauri (desktop app), and plain Node/browser environments.
-
-## Architecture
-
-```
-Request Flow:
-  Module Method → client.request() → Feature Chain (middleware) → Platform executeRequest()
-```
-
-### Key Directories
-
-- **`src/core/`** — base classes (`AbstractModrinthClient`, `AbstractModule`, `AbstractFeature`, etc.)
-- **`src/platform/`** — platform implementations (generic, nuxt, tauri, xhr-upload, websocket)
-- **`src/features/`** — middleware plugins (auth, retry, circuit-breaker, etc.)
-- **`src/modules/`** — API endpoint modules organized by service (`labrinth/`, `archon/`, `kyros/`, `iso3166/`)
-- **`src/types/`** — core type definitions (client config, request options, upload types, errors)
-
-### Client Hierarchy
-
-All platform clients extend `XHRUploadClient` → `AbstractModrinthClient`:
-
-- **`GenericModrinthClient`** — uses `ofetch`, attaches WebSocket client to `archon.sockets`
-- **`NuxtModrinthClient`** — uses Nuxt's `$fetch`, SSR-aware, blocks `upload()` during SSR
-- **`TauriModrinthClient`** — uses `@tauri-apps/plugin-http`
-
-### Module Access
-
-Modules are lazy-loaded and accessed as a nested structure:
-
-```ts
-client.labrinth.projects_v2
-client.labrinth.projects_v3
-client.labrinth.versions_v3
-client.labrinth.collections
-client.labrinth.billing_internal
-client.archon.servers_v0
-client.archon.servers_v1
-client.archon.backups_queue_v1
-client.archon.backups_v1
-client.archon.content_v0
-client.kyros.files_v0
-client.iso3166.data
-... etc.
-```
-
-This structure is derived at runtime from the flat `MODULE_REGISTRY` in `modules/index.ts` via `buildModuleStructure()`, and the TypeScript types are inferred automatically via `InferredClientModules`.
-
-## Critical: Always use `this.client.request()`
-
-API modules **must** use `this.client.request()` (or `.upload`) for all HTTP calls — never `$fetch`, `fetch`, or any other HTTP library directly. The request method routes through the platform-specific implementation (Nuxt `$fetch`, Tauri HTTP plugin, etc.) and the feature middleware chain (auth, retry, circuit breaker). Using `$fetch` directly bypasses the platform layer and will fail in Tauri (CORS/sandboxing). The only exception is the `ISO3166Module` which is explicitly node-only.
-
-For external APIs (non-Modrinth), pass the full base URL as the `api` field and set `skipAuth: true`:
-
-```ts
-this.client.request<MyType>('/endpoint', {
-	api: 'https://external-api.com',
-	version: 1,
-	method: 'POST',
-	body: { data },
-	skipAuth: true,
-})
-```
-
-## Usage
-
-The client is provided to the component tree via DI (see the `dependency-injection` skill). Each app creates a platform-specific client and provides it at the root:
-
-```ts
-// apps/frontend/src/app.vue (Nuxt)
-const client = new NuxtModrinthClient({ ... })
-provideModrinthClient(client)
-
-// apps/app-frontend/src/App.vue (Tauri)
-const client = new TauriModrinthClient({ ... })
-provideModrinthClient(client)
-```
-
-Components anywhere in the tree then inject it:
-
-```ts
-const { labrinth, archon, kyros } = injectModrinthClient()
-
-// Fetch data
-const project = await labrinth.projects_v3.get(projectId)
-
-// Use with TanStack Query
-const { data } = useQuery({
-	queryKey: ['project', projectId],
-	queryFn: () => labrinth.projects_v3.get(projectId),
-})
-```
-
-`provideModrinthClient` and `injectModrinthClient` are exported from `@modrinth/ui` (defined in `packages/ui/src/providers/api-client.ts`). The provider is typed as `AbstractModrinthClient`, so shared components in `packages/ui` work with any platform client.
-
-## Types
-
-Types must match 1:1 with how they are returned from the backend API they are fetching from. Do not reshape, rename, or omit fields — the types should be a direct representation of the API response.
-
-Types are organized in namespaces that mirror the backend services:
-
-```ts
-import type { Labrinth, Archon, Kyros, ISO3166 } from '@modrinth/api-client'
-
-const project: Labrinth.Projects.v3.Project = ...
-const server: Archon.Servers.v0.Server = ...
-const auth: Archon.Websocket.v0.WSAuth = ...
-```
-
-Each API has a `types.ts` in its module directory (`modules/labrinth/types.ts`, `modules/archon/types.ts`, etc.) using nested namespaces: `Namespace.Domain.Version.Type`.
-
-## Features (Middleware)
-
-Features wrap requests in a chain. Each feature can modify the request, retry, or short-circuit:
-
-- **`AuthFeature`** — injects `Authorization: Bearer <token>`, supports async token providers
-- **`RetryFeature`** — exponential/linear/constant backoff, retries on 408/429/5xx and network errors
-- **`CircuitBreakerFeature`** — opens after N consecutive failures per endpoint, resets after timeout
-
-## XHR Upload
-
-File uploads use `XMLHttpRequest` for progress tracking (not available via `fetch`). The `upload()` method returns an `UploadHandle<T>`:
-
-```ts
-interface UploadHandle<T> {
-	promise: Promise<T>
-	onProgress(callback: (progress: UploadProgress) => void): UploadHandle<T> // chainable
-	cancel(): void
-}
-```
-
-Supports two modes:
-
-- **Single file** — `{ file: File | Blob }` sends with `Content-Type: application/octet-stream`
-- **FormData** — `{ formData: FormData }` for multipart uploads (browser/platform sets boundary)
-
-Uploads go through the feature chain (auth, retry, etc.). Features detect uploads via `context.metadata.isUpload`.
-
-### Usage Example (server file upload)
-
-```ts
-const uploader = client.kyros.files_v0.uploadFile(path, file, {
-	onProgress: ({ progress }) => {
-		uploadProgress.value = Math.round(progress * 100)
-	},
-})
-// Cancel if needed: uploader.cancel()
-await uploader.promise
-```
-
-### Usage Example (version creation with FormData)
-
-```ts
-const handle = client.labrinth.versions_v3.createVersion(draftVersion, files, projectType)
-handle.onProgress((progress) => {
-	uploadProgress.value = progress
-})
-await handle.promise
-```
-
-See `packages/ui/src/components/servers/files/upload/FileUploadDropdown.vue` and `apps/frontend/src/providers/version/manage-version-modal.ts` for real usage.
-
-## WebSocket
-
-WebSocket support is attached to `client.archon.sockets` (only on `GenericModrinthClient`). It provides event-based communication with Modrinth Hosting servers.
-
-### Connection Flow
-
-```
-client.archon.sockets.safeConnect(serverId)
-  → fetches JWT auth via archon.servers_v0.getWebSocketAuth()
-  → opens wss:// connection
-  → sends { event: 'auth', jwt: token }
-  → server responds with { event: 'auth-ok' }
-  → ready to receive events
-```
-
-Auto-reconnects on unexpected disconnection with exponential backoff (base 1s, max 30s, up to 10 attempts).
-
-### Subscribing to Events
-
-```ts
-const unsub = client.archon.sockets.on(serverId, 'stats', (data) => {
-	// data is typed as Archon.Websocket.v0.WSStatsEvent
-	cpuUsage.value = data.cpu_percent
-})
-
-// Clean up
-onUnmounted(() => {
-	unsub()
-	client.archon.sockets.disconnect(serverId)
-})
-```
-
-Event types: `log`, `stats`, `power-state`, `uptime`, `backup-progress`, `installation-result`, `filesystem-ops`, `new-mod`, `auth-expiring`, `auth-incorrect`, `auth-ok`.
-
-### Sending Commands
-
-```ts
-client.archon.sockets.send(serverId, { event: 'command', cmd: '/say hello' })
-```
-
-See `apps/frontend/src/pages/hosting/manage/[id].vue` for the full server panel WebSocket usage.
-
-## Adding a New API Module
-
-See the `api-module` skill (`.claude/skills/api-module/SKILL.md`) for step-by-step instructions.
diff --git a/packages/ui/AGENTS.md b/packages/ui/AGENTS.md
deleted file mode 120000
index ceb2b988dc..0000000000
--- a/packages/ui/AGENTS.md
+++ /dev/null
@@ -1 +0,0 @@
-CLAUDE.md
diff --git a/packages/ui/AGENTS.md b/packages/ui/AGENTS.md
new file mode 100644
index 0000000000..4c7043e733
--- /dev/null
+++ b/packages/ui/AGENTS.md
@@ -0,0 +1,96 @@
+# Architecture
+
+The shared UI package used by both `apps/frontend` (Nuxt 3) and `apps/app-frontend` (Vue 3 + Tauri). Components here must be platform-agnostic — use dependency injection for platform-specific behavior.
+
+## Folder Structure
+
+```
+src/
+├── components/       # Vue components organized by feature domain
+├── composables/      # Vue 3 composition API hooks
+├── layouts/          # Self-contained page layouts (see below)
+├── providers/        # Dependency injection contexts (createContext pattern)
+├── utils/            # Utility functions and constants
+├── pages/            # Cross-platform page components (used in both app-frontend and frontend)
+├── locales/          # 34 language locale files (FormatJS)
+├── styles/           # Tailwind CSS utilities
+└── stories/          # Storybook story files
+```
+
+Each subdirectory under `components/` has an `index.ts` barrel file. All public API is re-exported from the root `index.ts`.
+
+### `src/layouts/`
+
+Self-contained page layouts shared across frontends. Split into two categories:
+
+- **`shared/`** — Reusable layout modules with their own components, composables, providers, and types. Each module is a self-contained unit (e.g. `shared/content-tab/` contains the content/mods tab layout with its own `layout.vue`, `components/`, `composables/`, `providers/`, and `types.ts`).
+- **`wrapped/`** — Page-level Vue components that mirror route structures (e.g. `wrapped/hosting/manage/`). These are full page implementations consumed by both `apps/frontend` and `apps/app-frontend`.
+
+Files inside `layouts/` use the `#ui/*` import alias (resolved via the `"imports"` field in `package.json`) to reference other `src/` modules like `#ui/components/base/buttons` or `#ui/composables/i18n`.
+
+# Code Guidelines
+
+### Tailwind Configuration
+
+All frontend packages share a Tailwind preset at `packages/tooling-config/tailwind/tailwind-preset.ts`. This package's `tailwind.config.ts` extends it:
+
+```ts
+import preset from '@modrinth/tooling-config/tailwind/tailwind-preset.ts'
+```
+
+CSS custom properties are defined in `packages/assets/styles/variables.scss` with light, dark, and OLED theme variants.
+
+### Color Usage Rules
+
+**Use `surface-*` variables for backgrounds — never aliased `bg-*` color variables:**
+
+| Token            | Usage                                     |
+| ---------------- | ----------------------------------------- |
+| `bg-surface-1`   | Deepest background layer                  |
+| `bg-surface-1.5` | Odd row background (tables)               |
+| `bg-surface-2`   | Even row background, secondary panels     |
+| `bg-surface-3`   | Headers, floating bar backgrounds, inputs |
+| `bg-surface-4`   | Cards, elevated surfaces                  |
+| `bg-surface-5`   | Borders, dividers                         |
+
+**For text colors:**
+
+| Class            | Usage                            |
+| ---------------- | -------------------------------- |
+| `text-contrast`  | Primary headings                 |
+| `text-primary`   | Default body text                |
+| `text-secondary` | Reduced emphasis, secondary info |
+
+**Brand and semantic colors** not all exposed as Figma variables — refer to `packages/assets/styles/variables.scss` for the full set:
+
+- `bg-{color}`, `text-{color}` etc. — Primary brand colors
+- `bg-{color}-highlight` — 25% opacity semantic highlights
+
+**Color palette** (each with shades 50–950): red, orange, green, blue, purple, gray. Platform-specific colors also exist (fabric, forge, quilt, neoforge, etc.).
+
+## Storybook
+
+When modifying a component in `src/components/`, you must also update its corresponding Storybook story in `src/stories/` to reflect the changes. If a story file doesn't exist yet, create one. Stories should cover the component's key states and variants - do not make or modify a storybook unless the user asks for it or skip if it's incredibly obvious one should not be needed (e.g minor changes or styling changes DO NOT need a storybook edit)
+
+## Dependency Injection
+
+This package defines the DI layer using `createContext` from `src/providers/index.ts`. See `standards/frontend/DEPENDENCY_INJECTION.md` for full documentation.
+
+Key providers exported from this package:
+
+- `provideModrinthClient` / `injectModrinthClient` — API client
+- `provideNotificationManager` / `injectNotificationManager` — Notifications
+
+## Vue Template Rules
+
+### Multi-statement event handlers
+
+Never use newline-separated statements in Vue template event handlers like `@click`. Vue's template compiler cannot parse multi-line expressions separated only by newlines. Always use semicolons on a single line:
+
+```vue
+<!-- BAD: will cause "Unexpected token" parse error -->
+@click=" foo = true $emit('bar') "
+
+<!-- GOOD -->
+@click="foo = true; $emit('bar')"
+```
diff --git a/packages/ui/CLAUDE.md b/packages/ui/CLAUDE.md
deleted file mode 100644
index 280787caf8..0000000000
--- a/packages/ui/CLAUDE.md
+++ /dev/null
@@ -1,96 +0,0 @@
-# Architecture
-
-The shared UI package used by both `apps/frontend` (Nuxt 3) and `apps/app-frontend` (Vue 3 + Tauri). Components here must be platform-agnostic — use dependency injection for platform-specific behavior.
-
-## Folder Structure
-
-```
-src/
-├── components/       # Vue components organized by feature domain
-├── composables/      # Vue 3 composition API hooks
-├── layouts/          # Self-contained page layouts (see below)
-├── providers/        # Dependency injection contexts (createContext pattern)
-├── utils/            # Utility functions and constants
-├── pages/            # Cross platform page components (used in both app-frontend and frontend)
-├── locales/          # 34 language locale files (FormatJS)
-├── styles/           # Tailwind CSS utilities
-└── stories/          # Storybook story files
-```
-
-Each subdirectory under `components/` has an `index.ts` barrel file. All public API is re-exported from the root `index.ts`.
-
-### `src/layouts/`
-
-Self-contained page layouts shared across frontends. Split into two categories:
-
-- **`shared/`** — Reusable layout modules with their own components, composables, providers, and types. Each module is a self-contained unit (e.g. `shared/content-tab/` contains the content/mods tab layout with its own `layout.vue`, `components/`, `composables/`, `providers/`, and `types.ts`).
-- **`wrapped/`** — Page-level Vue components that mirror route structures (e.g. `wrapped/hosting/manage/`). These are full page implementations consumed by both `apps/frontend` and `apps/app-frontend`.
-
-Files inside `layouts/` use the `#ui/*` import alias (resolved via the `"imports"` field in `package.json`) to reference other `src/` modules like `#ui/components/base/buttons` or `#ui/composables/i18n`.
-
-# Code Guidelines
-
-### Tailwind Configuration
-
-All frontend packages share a Tailwind preset at `packages/tooling-config/tailwind/tailwind-preset.ts`. This package's `tailwind.config.ts` extends it:
-
-```ts
-import preset from '@modrinth/tooling-config/tailwind/tailwind-preset.ts'
-```
-
-CSS custom properties are defined in `packages/assets/styles/variables.scss` with light, dark, and OLED theme variants.
-
-### Color Usage Rules
-
-**Use `surface-*` variables for backgrounds — never aliased `bg-*` color variables:**
-
-| Token            | Usage                                     |
-| ---------------- | ----------------------------------------- |
-| `bg-surface-1`   | Deepest background layer                  |
-| `bg-surface-1.5` | Odd row background (tables)               |
-| `bg-surface-2`   | Even row background, secondary panels     |
-| `bg-surface-3`   | Headers, floating bar backgrounds, inputs |
-| `bg-surface-4`   | Cards, elevated surfaces                  |
-| `bg-surface-5`   | Borders, dividers                         |
-
-**For text colors:**
-
-| Class            | Usage                            |
-| ---------------- | -------------------------------- |
-| `text-contrast`  | Primary headings                 |
-| `text-primary`   | Default body text                |
-| `text-secondary` | Reduced emphasis, secondary info |
-
-**Brand and semantic colors** not all exposed as Figma variables — refer to `packages/assets/styles/variables.scss` for the full set:
-
-- `bg-{color}`, `text-{color}` etc. — Primary brand colors
-- `bg-{color}-highlight` — 25% opacity semantic highlights
-
-**Color palette** (each with shades 50–950): red, orange, green, blue, purple, gray. Platform-specific colors also exist (fabric, forge, quilt, neoforge, etc.).
-
-## Storybook
-
-When modifying a component in `src/components/`, you must also update its corresponding Storybook story in `src/stories/` to reflect the changes. If a story file doesn't exist yet, create one. Stories should cover the component's key states and variants - do not make or modify a storybook unless the user asks for it or skip if it's incredibly obvious one should not be needed (e.g minor changes or styling changes DO NOT need a storybook edit)
-
-## Dependency Injection
-
-This package defines the DI layer using `createContext` from `src/providers/index.ts`. See the `dependency-injection` skill (`.claude/skills/dependency-injection/SKILL.md`) for full documentation.
-
-Key providers exported from this package:
-
-- `provideModrinthClient` / `injectModrinthClient` — API client
-- `provideNotificationManager` / `injectNotificationManager` — Notifications
-
-## Vue Template Rules
-
-### Multi-statement event handlers
-
-Never use newline-separated statements in Vue template event handlers like `@click`. Vue's template compiler cannot parse multi-line expressions separated only by newlines. Always use semicolons on a single line:
-
-```vue
-<!-- BAD: will cause "Unexpected token" parse error -->
-@click=" foo = true $emit('bar') "
-
-<!-- GOOD -->
-@click="foo = true; $emit('bar')"
-```
diff --git a/standards/README.md b/standards/README.md
index 080ed1953c..c9269ef8cd 100644
--- a/standards/README.md
+++ b/standards/README.md
@@ -1,5 +1,7 @@
 # Standards
 
-This folder contains technical standards and documentation we use to develop Modrinth. The majority of this has been migrated from our internal documentation.
+This directory contains technical standards that apply to Modrinth development. Most of this content comes from internal Modrinth documentation.
 
-For contributing guidelines, please refer to [docs.modrinth.com](https://docs.modrinth.com/contributing/getting-started/) - these documents are more for technical reference, not a guide on making pull requests, features, etc.
+For contribution instructions, refer to [docs.modrinth.com](https://docs.modrinth.com/contributing/getting-started/). Use these documents only as technical references.
+
+Do not use these documents as instructions for pull requests or feature development.
diff --git a/standards/frontend/ADDING_API_MODULES.md b/standards/frontend/ADDING_API_MODULES.md
index 7efd9925da..7d2fd91565 100644
--- a/standards/frontend/ADDING_API_MODULES.md
+++ b/standards/frontend/ADDING_API_MODULES.md
@@ -1,25 +1,25 @@
-- [Adding a New API Module](#adding-a-new-api-module)
-	- [Steps](#steps)
-		- [1. Define types in the module's `types.ts`](#1-define-types-in-the-modules-typests)
+- [Add an API module](#add-an-api-module)
+	- [Procedure](#procedure)
+		- [1. Define types in `types.ts`](#1-define-types-in-typests)
 		- [2. Create the module class](#2-create-the-module-class)
 			- [Request options](#request-options)
-			- [For uploads](#for-uploads)
-		- [3. Register in the MODULE\_REGISTRY](#3-register-in-the-module_registry)
+			- [File uploads](#file-uploads)
+		- [3. Register the module](#3-register-the-module)
 		- [4. Export types](#4-export-types)
-	- [Naming Conventions](#naming-conventions)
-	- [Key Files](#key-files)
+	- [Naming conventions](#naming-conventions)
+	- [Key files](#key-files)
 
-# Adding a New API Module
+# Add an API Module
 
-How to add a new API endpoint module to `packages/api-client`.
+Use this procedure to add an API endpoint module to `packages/api-client`.
 
-## Steps
+## Procedure
 
-### 1. Define types in the module's `types.ts`
+### 1. Define Types in `types.ts`
 
-Types must match 1:1 with the backend API response. Do not reshape, rename, or omit fields.
+Make the types match the backend API response exactly. Do not change, rename, or remove fields.
 
-Add to an existing namespace or create a new one:
+Add the types to an existing namespace, or make a new namespace:
 
 ```ts
 // modules/labrinth/types.ts (existing namespace)
@@ -30,7 +30,7 @@ export namespace Labrinth {
 				id: string
 				name: string
 				created: string
-				// ... matches API response exactly
+				// Match the API response exactly.
 			}
 
 			export type CreateThingRequest = {
@@ -41,11 +41,11 @@ export namespace Labrinth {
 }
 ```
 
-For a new API service, create `modules/<service>/types.ts` with a new top-level namespace and re-export it from `modules/types.ts`.
+For a new API service, make `modules/<service>/types.ts` with a new top-level namespace. Export it from `modules/types.ts`.
 
-### 2. Create the module class
+### 2. Create the Module Class
 
-Create `modules/<api>/<domain>/v<N>.ts`:
+Make `modules/<api>/<domain>/v<N>.ts`:
 
 ```ts
 // modules/labrinth/things/v3.ts
@@ -84,21 +84,21 @@ export class LabrinthThingsV3Module extends AbstractModule {
 }
 ```
 
-#### Request options
+#### Request Options
 
-| Field         | Values                                            | Purpose                            |
-| ------------- | ------------------------------------------------- | ---------------------------------- |
-| `api`         | `'labrinth'`, `'archon'`, or a full URL           | Which base URL to use              |
-| `version`     | `2`, `3`, `'internal'`, `'modrinth/v0'`, etc.     | URL version segment                |
-| `method`      | `'GET'`, `'POST'`, `'PUT'`, `'PATCH'`, `'DELETE'` | HTTP method                        |
-| `body`        | object                                            | JSON request body                  |
-| `params`      | `Record<string, string>`                          | Query parameters                   |
-| `skipAuth`    | `boolean`                                         | Skip auth feature for this request |
-| `useNodeAuth` | `boolean`                                         | Use node-level auth (kyros)        |
-| `timeout`     | `number`                                          | Request timeout in ms              |
-| `retry`       | `boolean \| number`                               | Override retry behavior            |
+| Field         | Values                                            | Purpose                                |
+| ------------- | ------------------------------------------------- | -------------------------------------- |
+| `api`         | `'labrinth'`, `'archon'`, or a full URL           | Select the base URL.                   |
+| `version`     | `2`, `3`, `'internal'`, `'modrinth/v0'`, and more | Set the URL version segment.           |
+| `method`      | `'GET'`, `'POST'`, `'PUT'`, `'PATCH'`, `'DELETE'` | Set the HTTP method.                   |
+| `body`        | object                                            | Set the JSON request body.             |
+| `params`      | `Record<string, string>`                          | Set the query parameters.              |
+| `skipAuth`    | `boolean`                                         | Bypass the authentication feature.     |
+| `useNodeAuth` | `boolean`                                         | Use node-level Kyros authentication.   |
+| `timeout`     | `number`                                          | Set the request timeout in milliseconds. |
+| `retry`       | `boolean \| number`                               | Override the retry behavior.           |
 
-#### For uploads
+#### File Uploads
 
 Return an `UploadHandle` instead of a `Promise`:
 
@@ -111,7 +111,7 @@ public uploadThing(id: string, file: File): UploadHandle<void> {
 	})
 }
 
-// Or with FormData for multipart:
+// Use FormData for a multipart upload.
 public createWithFiles(data: CreateRequest, files: File[]): UploadHandle<Thing> {
 	const formData = new FormData()
 	formData.append('data', JSON.stringify(data))
@@ -121,29 +121,29 @@ public createWithFiles(data: CreateRequest, files: File[]): UploadHandle<Thing>
 		api: 'labrinth',
 		version: 3,
 		formData,
-		timeout: 60 * 5 * 1000,  // longer timeout for uploads
+		timeout: 60 * 5 * 1000, // Use a longer upload timeout.
 	})
 }
 ```
 
-### 3. Register in the MODULE_REGISTRY
+### 3. Register the Module
 
-Add to `modules/index.ts`:
+Add the module to `MODULE_REGISTRY` in `modules/index.ts`:
 
 ```ts
 import { LabrinthThingsV3Module } from './labrinth/things/v3'
 
 export const MODULE_REGISTRY = {
-	// ... existing modules
+	// Existing modules.
 	labrinth_things_v3: LabrinthThingsV3Module,
 } as const
 ```
 
-The naming convention is `<api>_<domain>_<version>`. This flat key gets transformed into nested access: `client.labrinth.things_v3`.
+Use `<api>_<domain>_<version>` for the key. The client converts this flat key to `client.labrinth.things_v3`.
 
-### 4. Export types
+### 4. Export Types
 
-If you added to an existing namespace, types are already re-exported. If you created a new `types.ts`, add it to `modules/types.ts`:
+Types in an existing namespace already have an export. For a new `types.ts`, add this export to `modules/types.ts`:
 
 ```ts
 export * from './<service>/types'
@@ -151,17 +151,17 @@ export * from './<service>/types'
 
 ## Naming Conventions
 
-| Convention     | Example                                              |
-| -------------- | ---------------------------------------------------- |
-| Module class   | `LabrinthThingsV3Module` — `{Api}{Domain}V{N}Module` |
-| Module ID      | `labrinth_things_v3` — `{api}_{domain}_v{n}`         |
-| Type namespace | `Labrinth.MyDomain.v3.Thing`                         |
-| File path      | `modules/labrinth/things/v3.ts`                      |
+| Item           | Example                         | Pattern                     |
+| -------------- | ------------------------------- | --------------------------- |
+| Module class   | `LabrinthThingsV3Module`        | `{Api}{Domain}V{N}Module`   |
+| Module ID      | `labrinth_things_v3`            | `{api}_{domain}_v{n}`       |
+| Type namespace | `Labrinth.MyDomain.v3.Thing`    | `Api.Domain.version.Type`   |
+| File path      | `modules/labrinth/things/v3.ts` | `modules/api/domain/vN.ts`  |
 
 ## Key Files
 
-- `src/core/abstract-module.ts` — base class all modules extend
-- `src/core/abstract-client.ts` — `request()` and `upload()` methods
-- `src/modules/index.ts` — `MODULE_REGISTRY` and `buildModuleStructure()`
-- `src/modules/<api>/types.ts` — type definitions per API
-- `src/types/upload.ts` — `UploadHandle`, `UploadProgress`, `UploadRequestOptions`
+- `src/core/abstract-module.ts`: Base class for all modules.
+- `src/core/abstract-client.ts`: Contains the `request()` and `upload()` methods.
+- `src/modules/index.ts`: Contains `MODULE_REGISTRY` and `buildModuleStructure()`.
+- `src/modules/<api>/types.ts`: Contains the types for each API.
+- `src/types/upload.ts`: Contains `UploadHandle`, `UploadProgress`, and `UploadRequestOptions`.
diff --git a/standards/frontend/COMPONENT_STRUCTURE.md b/standards/frontend/COMPONENT_STRUCTURE.md
index 99cfeb3837..f48ae26e96 100644
--- a/standards/frontend/COMPONENT_STRUCTURE.md
+++ b/standards/frontend/COMPONENT_STRUCTURE.md
@@ -1,8 +1,8 @@
 # Component Structure
 
-## Component folders
+## Component Folders
 
-Prefer giving non-trivial components their own folder:
+Give each complex component its own folder:
 
 ```
 components/
@@ -14,25 +14,25 @@ components/
 	└── use-analytics-chart.ts
 ```
 
-The folder name should match the public component name in kebab case. The main component in that folder should be `index.vue`.
+Use the public component name in kebab case for the folder name. Use `index.vue` for the main component.
 
-This keeps imports short:
+This structure keeps imports short:
 
 ```ts
 import AnalyticsChart from '@/components/analytics-chart/index.vue'
 ```
 
-If the local resolver supports directory indexes, importing the folder is also fine:
+You can import the folder if the local resolver supports directory indexes:
 
 ```ts
 import AnalyticsChart from '@/components/analytics-chart/'
 ```
 
-Use the explicit `index.vue` import when the TypeScript setup cannot resolve the directory import reliably.
+Use the explicit `index.vue` import if TypeScript cannot resolve the directory import.
 
-## Local implementation files
+## Local Implementation Files
 
-Keep files that only exist to support one component inside that component's folder:
+Keep files for only one component in that component's folder:
 
 ```
 analytics-chart/
@@ -44,18 +44,18 @@ analytics-chart/
 └── use-chart-hover-state.ts
 ```
 
-Good candidates for local files:
+Use local files for these items:
 
-- Small subcomponents used only by the main component
-- Local composables used only by the main component or its local subcomponents
-- Helpers that split up a large `<script setup>` block
-- Types that describe local component state or props
+- Small subcomponents that only the main component uses.
+- Local composables that only the component folder uses.
+- Helpers that divide a large `<script setup>` block.
+- Types for local component state or props.
 
-This is preferred over allowing a single component file to grow into a large, hard-to-review script block.
+This structure prevents large script blocks that are difficult to review.
 
-## Naming local subcomponents
+## Local Subcomponent Names
 
-Local subcomponents should still have clear names that explain their relationship to the main component:
+Use clear names that show the relation between each subcomponent and its main component:
 
 ```
 analytics-chart/
@@ -64,7 +64,7 @@ analytics-chart/
 └── analytics-chart-plot.vue
 ```
 
-Avoid vague names that make a local component look like a standalone public component:
+Do not use names that make a local component look like a public component:
 
 ```
 analytics-chart/
@@ -73,13 +73,13 @@ analytics-chart/
 └── header.vue
 ```
 
-If a file is local to `analytics-chart`, prefixing it with `analytics-chart-` makes that relationship clear when it appears in search results, editor tabs, and imports.
+Add the `analytics-chart-` prefix to local filenames. This prefix shows the relation in search results, editor tabs, and imports.
 
 ## Nesting
 
-One level of nesting is usually enough.
+Use one nesting level in most component folders.
 
-Prefer this:
+Use this structure:
 
 ```
 analytics-chart/
@@ -90,7 +90,7 @@ analytics-chart/
 └── use-chart-selection.ts
 ```
 
-Avoid this unless a local area has become large enough to justify its own module boundary:
+Do not use this structure unless a local area needs its own module boundary:
 
 ```
 analytics-chart/
@@ -102,11 +102,13 @@ analytics-chart/
 	└── use-plot-state.ts
 ```
 
-Subfolders are fine when they reduce real complexity, but do not create a folder for every small subcomponent by default. Deep nesting makes the file tree harder to scan and often adds duplicated names without improving ownership.
+Use subfolders when they reduce real complexity. Do not make a folder for each small subcomponent.
 
-## When not to use a folder
+Deep nesting makes the file tree difficult to scan. It also causes duplicate names without clearer ownership.
 
-Small, leaf components can stay as a single `.vue` file:
+## Small Components
+
+Keep small leaf components in single `.vue` files:
 
 ```
 components/
@@ -115,14 +117,16 @@ components/
 └── project-status-pill.vue
 ```
 
-Move a component into a folder once it grows local helpers, local composables, or local subcomponents.
+Move a component into a folder when it gets local helpers, composables, or subcomponents.
 
-## Public versus local components
+## Public and Local Components
 
-Only the main `index.vue` should be treated as the public entry point for the folder. Other files in the folder are implementation details unless there is a clear reason to import them from outside.
+Use only the main `index.vue` as the public entry point. Treat the other folder files as implementation details.
 
-If a local subcomponent starts being imported elsewhere, either:
+If another component imports a local subcomponent, use one of these solutions:
 
-- Promote it into its own component folder
-- Move it to the nearest shared component area if it is genuinely reusable
-- Keep it local and pass behavior through the main component if external imports would leak implementation details
+- Move the subcomponent into its own component folder.
+- Move the subcomponent to the nearest shared component area when it is reusable.
+- Keep it local and pass behavior through the main component.
+
+Use the last solution when an external import exposes implementation details.
diff --git a/standards/frontend/CROSS_PLATFORM_PAGES.md b/standards/frontend/CROSS_PLATFORM_PAGES.md
index 7378e3733a..f07f6c5a30 100644
--- a/standards/frontend/CROSS_PLATFORM_PAGES.md
+++ b/standards/frontend/CROSS_PLATFORM_PAGES.md
@@ -1,27 +1,35 @@
 # Cross-Platform Pages
 
-Pages that need to exist in both the Modrinth Website (`apps/frontend`) and the Modrinth App (`apps/app-frontend`) live in `packages/ui/src/layouts/`. There are two categories based on whether the page logic differs between platforms.
+Put pages for both Modrinth Website and Modrinth App in `packages/ui/src/layouts/`.
+
+Use one of two layout types. Select the type from the differences between the platform logic.
 
 ## Shared Layouts (`layouts/shared/`)
 
-For pages where the **logic differs** between the website and app (e.g. the app fetches data via Tauri `invoke` while the website uses `api-client`). Each shared layout is a self-contained module:
+Use a shared layout when the website and app use different logic.
+
+For example, the app can use Tauri `invoke`, and the website can use `api-client`.
+
+Make each shared layout a self-contained module:
 
 ```
 shared/content-tab/
 ├── layout.vue            # Main layout component
 ├── types.ts              # TypeScript types
 ├── components/           # Internal UI components
-├── composables/          # Stateful logic (search, filtering, selection)
+├── composables/          # State logic for search, filters, and selection
 └── providers/            # DI context definitions
 ```
 
-### How it works
+### Structure
 
-1. A **DI contract** in `providers/` defines all platform-specific operations as an interface.
-2. The **layout component** injects that context and handles all UI logic (search, filtering, selection, bulk operations, modals) without knowing the platform.
-3. Each **platform provides its own implementation** of the contract.
+1. Define all platform operations in a dependency-injection (DI) contract in `providers/`.
+2. Inject the contract into the layout component. Keep all common UI logic in this component.
+3. Provide a different contract implementation from each platform.
 
-### DI contract example
+Common UI logic can include search, filters, selection, bulk operations, and modals.
+
+### DI Contract Example
 
 ```ts
 // shared/content-tab/providers/content-manager.ts
@@ -29,12 +37,12 @@ export interface ContentManagerContext {
 	items: Ref<ContentItem[]> | ComputedRef<ContentItem[]>
 	loading: Ref<boolean> | ComputedRef<boolean>
 
-	// Platform-abstracted operations
+	// Operations that have platform-specific implementations.
 	toggleEnabled: (item: ContentItem) => Promise<void>
 	deleteItem: (item: ContentItem) => Promise<void>
 	refresh: () => Promise<void>
 
-	// Optional capabilities — not every platform supports everything
+	// Optional capabilities are not available on all platforms.
 	hasUpdateSupport: boolean
 	updateItem?: (id: string) => void
 	bulkDeleteItems?: (items: ContentItem[]) => Promise<void>
@@ -46,9 +54,9 @@ export const [injectContentManager, provideContentManager] =
 	createContext<ContentManagerContext>('ContentPageLayout', 'contentManagerContext')
 ```
 
-### Platform implementations
+### Platform Implementations
 
-**Website** — uses `api-client` and TanStack Query:
+The website uses `api-client` and TanStack Query:
 
 ```vue
 <!-- apps/frontend/src/pages/instance/content.vue -->
@@ -65,7 +73,7 @@ provideContentManager({
 	deleteItem: async (item) => {
 		await client.content_v1.deleteAddon(instanceId, item.id)
 	},
-	// ... rest of the contract
+	// Implement the remaining contract fields.
 })
 </script>
 
@@ -74,7 +82,7 @@ provideContentManager({
 </template>
 ```
 
-**App** — uses Tauri `invoke`:
+The app uses Tauri `invoke`:
 
 ```vue
 <!-- apps/app-frontend/src/pages/instance/Mods.vue -->
@@ -83,14 +91,14 @@ import { provideContentManager, ContentPageLayout } from '@modrinth/ui'
 import { invoke } from '@tauri-apps/api/core'
 
 const items = ref<ContentItem[]>([])
-await invoke('get_instance_content', { instanceId }).then(/* map to ContentItem[] */)
+await invoke('get_instance_content', { instanceId }).then(/* Map the result to ContentItem[]. */)
 
 provideContentManager({
 	items,
 	deleteItem: async (item) => {
 		await invoke('delete_content', { instanceId, path: item.file_path })
 	},
-	// ... rest of the contract
+	// Implement the remaining contract fields.
 })
 </script>
 
@@ -99,29 +107,33 @@ provideContentManager({
 </template>
 ```
 
-### Optional capabilities
+### Optional Capabilities
 
-The DI contract uses optional fields for features that not every platform supports. The layout checks for them before rendering the corresponding UI:
+Use optional contract fields for capabilities that are not available on all platforms.
+
+Check that an optional field exists before you show its UI:
 
 ```ts
-// Contract
+// Contract fields.
 bulkUpdateItems?: (items: ContentItem[]) => Promise<void>
 shareItems?: (items: ContentItem[], format: string) => void
 
-// Layout checks before showing UI
+// Show the UI only when the capability exists.
 v-if="ctx.bulkUpdateItems && hasOutdatedProjects"
 ```
 
-### Props vs DI
+### Props and DI
 
-| Use       | When                                                                                       |
-| --------- | ------------------------------------------------------------------------------------------ |
-| **DI**    | Data depends on _how_ it's fetched — API calls, file operations, navigation (per-platform) |
-| **Props** | Data is the same regardless of platform — configuration flags, display options              |
+| Use   | Condition                                                                  |
+| ----- | -------------------------------------------------------------------------- |
+| DI    | Use when API calls, file operations, or navigation differ by platform.     |
+| Props | Use when configuration and display data are the same on all platforms.      |
 
 ## Wrapped Pages (`layouts/wrapped/`)
 
-For pages where the **logic is identical** on both platforms — same API source, same data fetching, same state management. These are full page-level Vue components that directly implement routes:
+Use a wrapped page when both platforms use the same API source, data logic, and state logic.
+
+A wrapped page is a complete page-level Vue component. Its directory structure matches the route structure:
 
 ```
 wrapped/hosting/manage/
@@ -132,7 +144,9 @@ wrapped/hosting/manage/
 └── [id]/onboarding.vue
 ```
 
-Wrapped pages handle their own data fetching (typically via TanStack Query and `api-client`) and are consumed as simple component imports in both frontends:
+Wrapped pages get their own data. They usually use TanStack Query and `api-client`.
+
+Import the wrapped page as a simple component in both frontends:
 
 ```vue
 <!-- apps/frontend/src/pages/hosting/manage/[id]/content.vue -->
@@ -145,32 +159,48 @@ import { ServersManageContentPage } from '@modrinth/ui'
 </template>
 ```
 
-### Platform route shells: prefetch with `ensureQueryData`
+### Prefetch Data in Platform Route Shells
 
-#### Wrapped layout: `ReadyTransition` and `useReadyState`
+#### `ReadyTransition` and `useReadyState`
 
-Many wrapped pages wrap the main UI in [`ReadyTransition`](../../packages/ui/src/components/base/ReadyTransition.vue) with `:pending` driven by [`useReadyState`](../../packages/ui/src/composables/use-ready-state.ts) on the **primary** TanStack query (true only on the first load while that query has no cached data yet—background refetches stay “ready”). That avoids flashing empty content before data exists.
+Many wrapped pages put the main UI in [`ReadyTransition`](../../packages/ui/src/components/base/ReadyTransition.vue).
+
+The `:pending` prop usually comes from [`useReadyState`](../../packages/ui/src/composables/use-ready-state.ts) for the primary TanStack query.
+
+The state is true only during the first load when the cache has no data. Background refetches keep the page ready.
+
+This behavior prevents empty content from appearing before the data exists.
 
 ```vue
-<!-- Conceptual: inside packages/ui wrapped layout -->
+<!-- This code is in a packages/ui wrapped layout. -->
 <ReadyTransition :pending="readyPending">
 	<SomePageLayout />
 </ReadyTransition>
 ```
 
 ```ts
-const primaryQuery = useQuery({ /* ... */ })
+const primaryQuery = useQuery({ /* Query options. */ })
 const readyPending = useReadyState(primaryQuery)
-// or useReadyState({ isLoading, data }) when not using the full query object
+
+// Use this form when the complete query object is not available.
+const readyPendingFromState = useReadyState({ isLoading, data })
 ```
 
-Shell prefetch (below) warms the cache so that on navigation the query often **already has data** when the layout mounts; `pending` stays false and `ReadyTransition` can skip the enter animation on that fast path (see `ReadyTransition` docs and stories).
+Shell prefetch adds data to the cache before the layout mounts. On this fast path, `pending` stays false.
 
-#### Rule: `ensureQueryData` in each platform route shell
+`ReadyTransition` can then omit its enter animation. Refer to the `ReadyTransition` documentation and stories for details.
 
-When a wrapped layout uses that pattern, the **thin platform page** that imports the layout must **prefetch the same primary query** in `<script setup>` so the cache is warm before the layout mounts and `ReadyTransition`/`useReadyState` behave as intended.
+#### Use `ensureQueryData` in Each Route Shell
 
-**Rule:** For each primary `useQuery` in the wrapped layout that gates first paint (and thus `useReadyState` / `ReadyTransition`), the website and app route shells must call `queryClient.ensureQueryData` with the **same** `queryKey`, `queryFn`, and `staleTime` as that query. Wrap the call in `try/catch` and swallow errors so navigation does not fail during setup; the mounted layout’s `useQuery` still runs and surfaces errors to the user.
+When a wrapped layout uses this ready-state pattern, prefetch the primary query in each thin platform page.
+
+For each query that controls the first paint, call `queryClient.ensureQueryData` in the website and app route shells.
+
+Use the same `queryKey`, `queryFn`, and `staleTime` that the wrapped layout uses.
+
+Put the call in a `try` block. Catch the error so that route setup can continue.
+
+The mounted layout runs its `useQuery` call and shows the error to the user.
 
 ```ts
 import { injectModrinthClient, injectModrinthServerContext, ServersManageFilesPage } from '@modrinth/ui'
@@ -187,21 +217,23 @@ try {
 		staleTime: 30_000,
 	})
 } catch {
-	// Let the mounted layout’s useQuery surface errors; do not fail route setup.
+	// Let the mounted layout show the query error. Do not stop route setup.
 }
 ```
 
-If a route parameter is required for the query (e.g. `worldId`), only call `ensureQueryData` when that value is present, matching the layout’s `enabled` logic.
+If the query needs a route parameter, call `ensureQueryData` only when the parameter exists.
 
-Duplicating the query definition in the shell is intentional until a shared query-options module exists; keep keys and fetchers aligned when editing the layout or the shell.
+Make this condition match the `enabled` condition in the layout query.
 
-A wrapped page may still compose shared layouts internally — for example, the hosting content page uses the shared `content-tab` layout, providing its own `ContentManagerContext` with web API calls.
+Duplicate query definitions in the shell until a shared query-option module exists. Keep the keys and fetch functions the same.
+
+A wrapped page can contain shared layouts. For example, a hosting page can provide a `ContentManagerContext` to the shared content layout.
 
 ## Composables
 
-Reusable stateful logic lives in `packages/ui/src/layouts/shared/*/composables/`. These are consumed internally by the shared layout:
+Put reusable state logic in `packages/ui/src/layouts/shared/*/composables/`. The shared layout uses these composables:
 
-- **Search** — Fuse.js fuzzy search over items
-- **Filtering** — Dynamic filter pills
-- **Selection** — Multi-select with bulk operation support
-- **Bulk operations** — Sequential execution with progress tracking
+- Search: Uses Fuse.js to search items.
+- Filters: Supplies dynamic filter pills.
+- Selection: Supplies item selection for bulk operations.
+- Bulk operations: Runs operations in sequence and tracks progress.
diff --git a/standards/frontend/DEPENDENCY_INJECTION.md b/standards/frontend/DEPENDENCY_INJECTION.md
index 3bbf3bbf67..7f3a82db01 100644
--- a/standards/frontend/DEPENDENCY_INJECTION.md
+++ b/standards/frontend/DEPENDENCY_INJECTION.md
@@ -1,26 +1,30 @@
-- [Dependency Injection](#dependency-injection)
-	- [The `createContext` Factory](#the-createcontext-factory)
-	- [When to Use DI](#when-to-use-di)
-		- [Platform Abstraction (Primary Use Case)](#platform-abstraction-primary-use-case)
-		- [Page-Level Context](#page-level-context)
-	- [Creating a New Provider](#creating-a-new-provider)
-		- [1. Define the interface in `packages/ui/src/providers/`](#1-define-the-interface-in-packagesuisrcproviders)
-		- [2. For complex platform-specific logic, use an abstract class](#2-for-complex-platform-specific-logic-use-an-abstract-class)
-	- [Wiring Up Providers](#wiring-up-providers)
-		- [App Frontend (Tauri)](#app-frontend-tauri)
-		- [Website Frontend (Nuxt)](#website-frontend-nuxt)
-	- [Consuming Providers](#consuming-providers)
-	- [When NOT to Use DI](#when-not-to-use-di)
-	- [Existing Providers](#existing-providers)
-	- [Key Files](#key-files)
+- [Dependency injection](#dependency-injection)
+	- [The `createContext` factory](#the-createcontext-factory)
+	- [When to use DI](#when-to-use-di)
+		- [Platform abstraction](#platform-abstraction)
+		- [Page context](#page-context)
+	- [Create a provider](#create-a-provider)
+		- [1. Define the interface](#1-define-the-interface)
+		- [2. Use an abstract class for complex logic](#2-use-an-abstract-class-for-complex-logic)
+	- [Connect providers](#connect-providers)
+		- [App frontend](#app-frontend)
+		- [Website frontend](#website-frontend)
+	- [Use providers](#use-providers)
+	- [When not to use DI](#when-not-to-use-di)
+	- [Existing providers](#existing-providers)
+	- [Key files](#key-files)
 
 # Dependency Injection
 
-Modrinth uses a lightweight DI layer built on Vue's `provide`/`inject` for sharing platform-specific capabilities and page-level state across shared UI components.
+Modrinth uses a small dependency-injection (DI) layer that uses Vue `provide` and `inject`.
+
+This layer shares platform capabilities and page state with common UI components.
 
 ## The `createContext` Factory
 
-All providers are defined using `createContext` from `packages/ui/src/providers/index.ts` (adapted from Reka UI). It produces a typed `[inject, provide]` tuple:
+Define all providers with `createContext` from `packages/ui/src/providers/index.ts`. This factory comes from the Reka UI pattern.
+
+The factory returns a typed `[inject, provide]` tuple:
 
 ```ts
 import { createContext } from '@modrinth/ui'
@@ -33,35 +37,38 @@ interface MyContext {
 export const [injectMyContext, provideMyContext] = createContext<MyContext>('MyComponent')
 ```
 
-- **`provideMyContext(value)`** — call in a parent component's `setup()`.
-- **`injectMyContext()`** — call in any descendant's `setup()`. Throws if never provided.
-- **`injectMyContext(null)`** — returns `null` instead of throwing (for optional contexts).
+- Call `provideMyContext(value)` in the `setup()` function of a parent component.
+- Call `injectMyContext()` in the `setup()` function of a descendant. It throws an error when no provider exists.
+- Call `injectMyContext(null)` to return `null` when the context is optional.
 
 ## When to Use DI
 
-Use DI when:
-- **The same interface needs different implementations** depending on the platform (web vs desktop app).
-- **Deeply nested components** need access to shared page-level state without prop drilling through 3+ levels.
+Use DI in these conditions:
 
-### Platform Abstraction (Primary Use Case)
+- The same interface needs different implementations on the website and the desktop app.
+- Deep descendant components need the same page state, and props must pass through three or more levels.
 
-`packages/ui` components need capabilities that each frontend fulfils differently:
+### Platform Abstraction
 
-| Provider      | App Frontend                     | Website Frontend               |
-| ------------- | -------------------------------- | ------------------------------ |
-| API client    | Tauri IPC client                 | REST fetch client              |
-| Notifications | `ref()` state + app window mgmt  | `useState()` for SSR hydration |
-| File picker   | Native Tauri dialogs             | Browser file inputs            |
-| Tags          | Tauri commands                   | Nuxt server state              |
-| Page context  | `sidebar: true`, ad window hooks | `sidebar: false`, no ads       |
+Components in `packages/ui` can need capabilities that each frontend implements differently:
 
-### Page-Level Context
+| Provider      | App frontend                       | Website frontend                |
+| ------------- | ---------------------------------- | ------------------------------- |
+| API client    | Tauri IPC client                   | REST fetch client               |
+| Notifications | `ref()` state and window control   | `useState()` for SSR hydration  |
+| File picker   | Native Tauri dialogs               | Browser file inputs             |
+| Tags          | Tauri commands                     | Nuxt server state               |
+| Page context  | Sidebar and advertisement hooks    | No sidebar and no advertisements |
 
-Sharing data between a page and deeply nested children — e.g. project page data consumed by sidebar, header, and version components.
+### Page Context
 
-## Creating a New Provider
+Use DI to share page data with deep descendants. Examples include the project sidebar, header, and version components.
 
-### 1. Define the interface in `packages/ui/src/providers/`
+## Create a Provider
+
+### 1. Define the Interface
+
+Define the interface in `packages/ui/src/providers/`:
 
 ```ts
 // packages/ui/src/providers/my-feature.ts
@@ -77,16 +84,18 @@ export interface MyFeatureContext {
 export const [injectMyFeature, provideMyFeature] = createContext<MyFeatureContext>('MyFeature')
 ```
 
-Re-export from the barrel file (`packages/ui/src/providers/index.ts`).
+Export the provider from `packages/ui/src/providers/index.ts`.
 
-### 2. For complex platform-specific logic, use an abstract class
+### 2. Use an Abstract Class for Complex Logic
+
+Use an abstract class when the provider has complex platform logic:
 
 ```ts
 export abstract class AbstractMyFeatureManager {
 	abstract items: Ref<Item[]>
 	abstract addItem(item: Item): Promise<void>
 
-	// Shared logic lives on the base class
+	// Put common logic in the base class.
 	handleError(err: unknown) {
 		console.error(err)
 	}
@@ -96,13 +105,13 @@ export const [injectMyFeature, provideMyFeature] =
 	createContext<AbstractMyFeatureManager>('MyFeature')
 ```
 
-See `AbstractWebNotificationManager` in `packages/ui/src/providers/web-notifications.ts` for a real example.
+Refer to `AbstractWebNotificationManager` in `packages/ui/src/providers/web-notifications.ts` for an example.
 
-## Wiring Up Providers
+## Connect Providers
 
-### App Frontend (Tauri)
+### App Frontend
 
-Create a setup function in `apps/app-frontend/src/providers/setup/`:
+Make a setup function in `apps/app-frontend/src/providers/setup/`:
 
 ```ts
 // apps/app-frontend/src/providers/setup/my-feature.ts
@@ -126,11 +135,11 @@ export function setupMyFeatureProvider() {
 }
 ```
 
-Register it in `apps/app-frontend/src/providers/setup.ts`, which is called from `App.vue`'s `setup()`.
+Register the function in `apps/app-frontend/src/providers/setup.ts`. `App.vue` calls this setup file from its `setup()` function.
 
-### Website Frontend (Nuxt)
+### Website Frontend
 
-Provide directly in `apps/frontend/src/app.vue`, using Nuxt's `useState()` where SSR hydration is needed:
+Provide the context in `apps/frontend/src/app.vue`. Use Nuxt `useState()` when the state needs SSR hydration:
 
 ```ts
 provideMyFeature({
@@ -144,9 +153,9 @@ provideMyFeature({
 })
 ```
 
-## Consuming Providers
+## Use Providers
 
-In any component across `packages/ui`, `apps/frontend`, or `apps/app-frontend`:
+Inject the provider in a component in `packages/ui`, `apps/frontend`, or `apps/app-frontend`:
 
 ```vue
 <script setup lang="ts">
@@ -161,30 +170,30 @@ const { items, addItem } = injectMyFeature()
 </template>
 ```
 
-## When NOT to Use DI
+## When Not to Use DI
 
-Default to props and emits. DI adds indirection — only use it with a concrete reason.
+Use props and emits by default. DI adds an indirect layer, so use it only for a specific reason.
 
-- **Parent to direct child** — use props.
-- **Data only exists in one frontend** — keep context local to that app, not in `packages/ui`.
-- **Shallow prop drilling (1–2 levels)** — passing through one intermediate is fine.
-- **Component-local state** — use `ref()` / `reactive()` locally.
+- Use props from a parent to its direct child.
+- Keep data in one frontend when only that frontend uses it.
+- Use props through one or two intermediate levels.
+- Use `ref()` or `reactive()` for component state.
 
 ## Existing Providers
 
-| Provider                     | File                             | Purpose                        |
-| ---------------------------- | -------------------------------- | ------------------------------ |
-| `provideModrinthClient`      | `providers/api-client.ts`        | API client instance            |
-| `provideNotificationManager` | `providers/web-notifications.ts` | Notification management        |
-| `providePageContext`         | `providers/page-context.ts`      | Page config (sidebar, ads)     |
-| `provideProjectPageContext`  | `providers/project-page.ts`      | Project page state + mutations |
-| `provideServerContext`       | `providers/server-context.ts`    | Server hosting state           |
-| `provideUserPageContext`     | `providers/user-page.ts`         | User page state                |
+| Provider                     | File                             | Purpose                       |
+| ---------------------------- | -------------------------------- | ----------------------------- |
+| `provideModrinthClient`      | `providers/api-client.ts`        | Supplies the API client.      |
+| `provideNotificationManager` | `providers/web-notifications.ts` | Manages notifications.        |
+| `providePageContext`         | `providers/page-context.ts`      | Supplies page configuration.  |
+| `provideProjectPageContext`  | `providers/project-page.ts`      | Manages project page state.   |
+| `provideServerContext`       | `providers/server-context.ts`    | Manages server hosting state. |
+| `provideUserPageContext`     | `providers/user-page.ts`         | Manages user page state.      |
 
 ## Key Files
 
-- `packages/ui/src/providers/index.ts` — `createContext` factory + barrel exports
-- `packages/ui/src/providers/*.ts` — Provider definitions
-- `apps/frontend/src/app.vue` — Nuxt root provider setup
-- `apps/app-frontend/src/App.vue` — Tauri root provider setup
-- `apps/app-frontend/src/providers/setup/` — App provider setup functions
+- `packages/ui/src/providers/index.ts`: Contains the `createContext` factory and provider exports.
+- `packages/ui/src/providers/*.ts`: Contains provider definitions.
+- `apps/frontend/src/app.vue`: Contains the Nuxt root-provider setup.
+- `apps/app-frontend/src/App.vue`: Contains the Tauri root-provider setup.
+- `apps/app-frontend/src/providers/setup/`: Contains the app provider setup functions.
diff --git a/standards/frontend/FETCHING_DATA.md b/standards/frontend/FETCHING_DATA.md
index 04d2521d4a..47bc7e271d 100644
--- a/standards/frontend/FETCHING_DATA.md
+++ b/standards/frontend/FETCHING_DATA.md
@@ -1,26 +1,32 @@
 - [TanStack Query](#tanstack-query)
 	- [Setup](#setup)
 	- [Queries](#queries)
-		- [Query Option Factories](#query-option-factories)
-		- [Conditional Queries](#conditional-queries)
+		- [Query-option factories](#query-option-factories)
+		- [Conditional queries](#conditional-queries)
 	- [Mutations](#mutations)
-		- [Optimistic Updates](#optimistic-updates)
-	- [Query Keys](#query-keys)
-	- [Key Files](#key-files)
+		- [Optimistic updates](#optimistic-updates)
+	- [Query keys](#query-keys)
+	- [Key files](#key-files)
 
 # TanStack Query
 
-TanStack Query (`@tanstack/vue-query` v5) is used for server state management — caching, background refetching, and cache invalidation. Use it instead of manual `ref()` + `await` patterns for any data that comes from an API.
+TanStack Query (`@tanstack/vue-query` v5) manages server state. It supplies caching, background refetches, and cache invalidation.
 
-A TanStack MCP server is available — use `tanstack_doc` and `tanstack_search_docs` tools to look up API details when needed.
+Use TanStack Query for all data that comes from an API. Do not use a manual `ref()` and `await` pattern.
+
+A TanStack MCP server is available. Use `tanstack_doc` or `tanstack_search_docs` when you need API details.
 
 ## Setup
 
-TanStack Query is configured in `apps/frontend/src/plugins/tanstack.ts` as a Nuxt plugin with SSR hydration support. Default stale time is 5 seconds. The `QueryClient` is available via `useQueryClient()` or `useAppQueryClient()` (which also works in middleware).
+`apps/frontend/src/plugins/tanstack.ts` configures TanStack Query as a Nuxt plugin. The plugin supports server-side rendering (SSR) hydration.
+
+The default stale time is 5 seconds. Get the `QueryClient` with `useQueryClient()` or `useAppQueryClient()`.
+
+`useAppQueryClient()` also operates in middleware.
 
 ## Queries
 
-Use `useQuery` with the api-client for data fetching:
+Use `useQuery` with `api-client` to get data:
 
 ```ts
 const client = injectModrinthClient()
@@ -32,7 +38,7 @@ const { data, isPending, isError, error } = useQuery({
 })
 ```
 
-In templates:
+Use the query state in templates:
 
 ```vue
 <span v-if="isPending">Loading...</span>
@@ -40,9 +46,9 @@ In templates:
 <div v-else>{{ data.title }}</div>
 ```
 
-### Query Option Factories
+### Query-Option Factories
 
-For queries used across multiple components, define reusable query option factories in `packages/ui/src/queries/`:
+For a query that multiple components use, define a query-option factory in `packages/ui/src/queries/`:
 
 ```ts
 // composables/queries/project.ts
@@ -64,7 +70,7 @@ export const projectQueryOptions = {
 }
 ```
 
-Then use them:
+Use the factory in each applicable component:
 
 ```ts
 const { data } = useQuery(projectQueryOptions.v3(projectId, client))
@@ -72,7 +78,7 @@ const { data } = useQuery(projectQueryOptions.v3(projectId, client))
 
 ### Conditional Queries
 
-Use `enabled` as a computed for queries that depend on other data:
+Use a computed `enabled` value when a query depends on other data:
 
 ```ts
 const { data: members } = useQuery({
@@ -84,7 +90,7 @@ const { data: members } = useQuery({
 
 ## Mutations
 
-Use `useMutation` for create/update/delete operations. Invalidate related queries on success:
+Use `useMutation` for create, update, and delete operations. Invalidate related queries after a successful operation:
 
 ```ts
 const queryClient = useQueryClient()
@@ -100,7 +106,7 @@ Use `createMutation.isPending.value` to disable buttons during submission.
 
 ### Optimistic Updates
 
-For mutations where responsiveness matters, use optimistic updates with rollback:
+Use an optimistic update and rollback when a mutation needs an immediate UI response:
 
 ```ts
 const patchMutation = useMutation({
@@ -135,30 +141,32 @@ const patchMutation = useMutation({
 
 ## Query Keys
 
-Keys use a hierarchical array pattern:
+Use hierarchical arrays for query keys:
 
 ```ts
-// Resource type → version/qualifier → ID
+// Resource type, version or qualifier, and ID.
 ['project', 'v3', projectId]
 
-// Resource type → ID → sub-resource
+// Resource type, ID, and subresource.
 ['project', projectId, 'members']
 ['project', projectId, 'versions', 'v3']
 
-// Domain → action → ID
+// Domain, action, and ID.
 ['backups', 'list', serverId]
 ['tech-reviews']
 ```
 
-Use `as const` for type safety. Put the resource ID last when possible — this makes partial key matching work for invalidation:
+Use `as const` for type safety. Put stable category segments before reactive parameters.
+
+TanStack Query uses key prefixes during invalidation:
 
 ```ts
-// Invalidates all project queries for this ID
-queryClient.invalidateQueries({ queryKey: ['project', projectId] })
+// Invalidate all v3 project queries.
+queryClient.invalidateQueries({ queryKey: ['project', 'v3'] })
 ```
 
 ## Key Files
 
-- `apps/frontend/src/plugins/tanstack.ts` — QueryClient setup + SSR hydration
-- `apps/frontend/src/composables/query-client.ts` — `useAppQueryClient()` helper
-- `apps/frontend/src/composables/queries/` — reusable query option factories
+- `apps/frontend/src/plugins/tanstack.ts`: Contains the `QueryClient` setup and SSR hydration.
+- `apps/frontend/src/composables/query-client.ts`: Contains the `useAppQueryClient()` helper.
+- `apps/frontend/src/composables/queries/`: Contains reusable query-option factories.
diff --git a/standards/frontend/FIGMA_MCP_USAGE.md b/standards/frontend/FIGMA_MCP_USAGE.md
deleted file mode 100644
index edb433cb47..0000000000
--- a/standards/frontend/FIGMA_MCP_USAGE.md
+++ /dev/null
@@ -1,32 +0,0 @@
-- [Figma MCP Usage](#figma-mcp-usage)
-	- [Available Tools](#available-tools)
-	- [Adapting Figma Output](#adapting-figma-output)
-
-# Figma MCP Usage
-
-When the Figma MCP server is connected, it can be used to translate Figma designs into production-ready Vue components for this monorepo.
-
-## Available Tools
-
-| Tool                 | Purpose                                                                                                    |
-| -------------------- | ---------------------------------------------------------------------------------------------------------- |
-| `get_design_context` | Primary tool. Returns reference code, a screenshot, and metadata for a given node. Always start here.      |
-| `get_screenshot`     | Returns a visual screenshot of a node without full code context.                                           |
-| `get_variable_defs`  | Returns the design tokens applied to a node.                                                               |
-| `get_metadata`       | Returns an XML overview of node IDs, layer types, names, positions, and sizes for understanding structure. |
-
-Node IDs come from Figma URLs. For `https://figma.com/design/:fileKey/:fileName?node-id=1-2`, the node ID is `1:2` (replace `-` with `:`).
-
-```
-get_design_context(nodeId: "1:2", clientLanguages: "typescript,html,css", clientFrameworks: "vue")
-```
-
-## Adapting Figma Output
-
-The Figma MCP returns generic reference code. It must be adapted to match the Modrinth codebase:
-
-1. **Read `packages/ui/CLAUDE.md`** for color usage rules, surface token mapping, and component patterns.
-2. **Map Figma color variables to `surface-*` tokens** — never use Figma's aliased names like `bg/default` or `bg/raised` directly. The CLAUDE.md has the full mapping table.
-3. **Check `packages/assets/styles/variables.scss`** for tokens not exposed in Figma (brand highlights, semantic backgrounds, shadows).
-4. **Check for existing components** in `packages/ui/src/components/` before building from scratch.
-5. **Match spacing exactly** — do not approximate values from the design.
diff --git a/standards/frontend/INTERNATIONALIZATION.md b/standards/frontend/INTERNATIONALIZATION.md
index e89db99c0f..195f9c37d2 100644
--- a/standards/frontend/INTERNATIONALIZATION.md
+++ b/standards/frontend/INTERNATIONALIZATION.md
@@ -1,40 +1,51 @@
-- [Internationalization (i18n)](#internationalization-i18n)
-	- [Translatable Strings](#translatable-strings)
-	- [Message Definitions](#message-definitions)
-	- [Rendering Messages](#rendering-messages)
-	- [ICU Message Format](#icu-message-format)
-	- [Writing Translation-Friendly Strings](#writing-translation-friendly-strings)
-	- [Rich-Text Messages](#rich-text-messages)
-	- [Vue/ICU Delimiter Collisions](#vueicu-delimiter-collisions)
+- [Internationalization](#internationalization)
+	- [Translatable strings](#translatable-strings)
+	- [Message definitions](#message-definitions)
+	- [Render messages](#render-messages)
+	- [ICU message format](#icu-message-format)
+	- [Write strings for translation](#write-strings-for-translation)
+	- [Rich-text messages](#rich-text-messages)
+	- [Vue and ICU delimiter conflicts](#vue-and-icu-delimiter-conflicts)
 	- [Imports](#imports)
-	- [Reference Examples](#reference-examples)
+	- [Reference examples](#reference-examples)
 
-# Internationalization (i18n)
+# Internationalization
 
-All user-visible strings in Vue SFCs must use the localization system from `@modrinth/ui`. No hard-coded English strings should appear in templates or script — everything comes from `formatMessage` or `<IntlFormatted>`.
+Use the `@modrinth/ui` localization system for all user-visible strings in Vue single-file components (SFCs).
+
+Do not put hard-coded English text in templates or scripts. Get all user-visible text from `formatMessage` or `<IntlFormatted>`.
 
 ## Translatable Strings
 
-User-visible strings include: inner text, `alt` attributes, `placeholder` attributes, button labels, dropdown option labels, notification messages, etc.
+Translate these user-visible items:
 
-Dynamic expressions (`{{ user.name }}`) and HTML tags are not translatable strings — only static human-readable text.
+- Inner text.
+- `alt` and `placeholder` attributes.
+- Button and dropdown-option labels.
+- Notification and error messages.
+
+Do not translate dynamic expressions, HTML tag names, CSS classes, internal identifiers, or log messages.
+
+In `{{ user.name }}`, only the static text around the expression needs translation.
 
 ## Message Definitions
 
-Messages are defined with `defineMessage` or `defineMessages` from `@modrinth/ui` in `<script setup>`. Each message has a unique `id` and a `defaultMessage` containing the English string:
+Use `defineMessage` or `defineMessages` from `@modrinth/ui` in `<script setup>`.
+
+Give each message a unique `id`. Put the English text in `defaultMessage`:
 
 ```ts
 const messages = defineMessages({
 	welcomeTitle: { id: 'auth.welcome.title', defaultMessage: 'Welcome' },
-	welcomeDescription: { id: 'auth.welcome.description', defaultMessage: "You're now part of the community…" },
+	welcomeDescription: { id: 'auth.welcome.description', defaultMessage: 'You are now part of the community.' },
 })
 ```
 
-Message `id`s should be descriptive and stable (e.g. `error.generic.default.title`). Group related messages together with `defineMessages`.
+Use descriptive, stable message IDs, such as `error.generic.default.title`. Put related messages in one `defineMessages` object.
 
-## Rendering Messages
+## Render Messages
 
-Use `useVIntl()` from `@modrinth/ui` for simple string formatting:
+Use `useVIntl()` from `@modrinth/ui` to format simple strings:
 
 ```ts
 const { formatMessage } = useVIntl()
@@ -47,51 +58,63 @@ const { formatMessage } = useVIntl()
 
 ## ICU Message Format
 
-Dynamic values use ICU placeholders in `defaultMessage`:
+Use ICU placeholders for dynamic values in `defaultMessage`:
 
-- **Variables:** `'Hello, {name}!'`
-- **Numbers/dates/times:** `'{price, number, ::currency/USD}'`
-- **Plurals/selects:** `'{count, plural, one {# message} other {# messages}}'`
+- Variable: `'Hello, {name}!'`
+- Number, date, or time: `'{price, number, ::currency/USD}'`
+- Plural or selection: `'{count, plural, one {# message} other {# messages}}'`
 
-## Writing Translation-Friendly Strings
+## Write Strings for Translation
 
-ICU gives you powerful tools (plurals, selects, nested expressions), but translators in other languages face constraints that English doesn't have:
+ICU supports plurals, selections, and nested expressions. Languages can have different grammar rules.
 
-- **Word order varies by language.** Don't assume `{action} {noun}` works everywhere — some languages need `{noun} {action}` or require prepositions between them.
-- **Plurals aren't just "add an s".** Many languages change internal parts of a word or phrase for pluralization, not just the ending. A simple `{count} {itemType}` breaks if `itemType` is always singular.
-- **Grammatical gender affects surrounding words.** Articles, adjectives, and verbs may change based on whether a noun is masculine or feminine. If a variable like `{contentType}` can be "shader" or "mod", translators may need to inflect surrounding text differently for each.
+- Word order changes between languages. Do not assume that `{action} {noun}` operates in all languages.
+- Plural forms can change a complete word or phrase. Do not only add an `s` to make a plural.
+- Grammatical gender can change articles, adjectives, and verbs. Give translators a separate branch for each content type.
 
 ### Guidelines
 
-1. **Use `select` for content types, not bare variables.** When a variable represents different content types (mod, shader, modpack, etc.), pass a key and use ICU `select` so translators can write type-specific forms:
+1. Use `select` for content types. Do not use a bare variable for a content type.
 
-```
-// Bad — translators can't inflect around a pre-rendered noun
+Pass a content-type key. Then, use ICU `select` so translators can write a specific form for each type:
+
+```text
+// Incorrect. Translators cannot change the grammar around this rendered noun.
 'Delete {count} {itemType}'
 
-// Good — translators can write entirely different phrases per type
+// Correct. Translators can write a different phrase for each type.
 'Delete {count} {contentType, select, mod {{count, plural, one {mod} other {mods}}} shader {{count, plural, one {shader} other {shaders}}} other {items}}'
 ```
 
-This lets translators write entirely different noun forms per branch, which many languages require.
+This structure lets translators write different noun forms in each branch.
 
-2. **Prefer separate messages over complex ICU when branches diverge significantly.** If the singular and plural versions of a string are structurally different (not just a noun change), use two separate message IDs rather than one complex ICU expression.
+2. Use separate messages when ICU branches have different sentence structures.
 
-3. **Don't concatenate translated strings.** Never build a sentence by joining multiple `formatMessage` calls — the word order may be wrong in other languages. Put the entire sentence in one message.
+If singular and plural text have different structures, use two message IDs. Do not make one complex ICU expression.
 
-4. **Keep variables semantic.** Pass `contentType: 'mod'` (a key), not `contentType: 'Mod'` (a pre-rendered display string). Translators can then map each key to the correct form in their language.
+3. Do not join translated strings.
 
-5. **Test with long strings.** German and Finnish words can be 2-3x longer than English equivalents. Ensure UI layouts don't break with longer text.
+Do not make a sentence from multiple `formatMessage` calls. Put the complete sentence in one message.
+
+4. Use semantic variable values.
+
+Pass `contentType: 'mod'` as a key. Do not pass `contentType: 'Mod'` as rendered text.
+
+The translator can map each key to the correct form.
+
+5. Test the UI with long strings.
+
+Some translated words can be two or three times longer than the English words. Make sure that the layout remains correct.
 
 ## Rich-Text Messages
 
-When a message contains links or markup, wrap the relevant ranges with named tags in `defaultMessage`:
+When a message contains links or markup, put named tags around the applicable text in `defaultMessage`:
 
-```
-"By creating an account, you agree to our <terms-link>Terms</terms-link> and <privacy-link>Privacy Policy</privacy-link>."
+```text
+"When you create an account, you agree to the <terms-link>Terms</terms-link> and <privacy-link>Privacy Policy</privacy-link>."
 ```
 
-Render with the `<IntlFormatted>` component using named slots:
+Use named slots in `<IntlFormatted>` to render the tags:
 
 ```vue
 <IntlFormatted :message-id="messages.tosLabel">
@@ -108,7 +131,11 @@ Render with the `<IntlFormatted>` component using named slots:
 </IntlFormatted>
 ```
 
-For simple emphasis (`'Welcome to <strong>Modrinth</strong>!'`):
+Use this pattern for simple emphasis:
+
+```text
+'Welcome to <strong>Modrinth</strong>!'
+```
 
 ```vue
 <template #strong="{ children }">
@@ -116,7 +143,7 @@ For simple emphasis (`'Welcome to <strong>Modrinth</strong>!'`):
 </template>
 ```
 
-For complex child handling, use `normalizeChildren` from `@modrinth/ui`:
+Use `normalizeChildren` from `@modrinth/ui` for complex child content:
 
 ```vue
 <template #bold="{ children }">
@@ -124,20 +151,20 @@ For complex child handling, use `normalizeChildren` from `@modrinth/ui`:
 </template>
 ```
 
-## Vue/ICU Delimiter Collisions
+## Vue and ICU Delimiter Conflicts
 
-If an ICU placeholder ends right before `}}` in a Vue template, insert a space (`} }`) to avoid parsing issues.
+If an ICU placeholder ends immediately before `}}`, add a space. Use `} }` to prevent a Vue parser error.
 
 ## Imports
 
-All i18n utilities come from `@modrinth/ui`:
+Get all internationalization utilities from `@modrinth/ui`:
 
-- `defineMessage` / `defineMessages` — message definitions
-- `useVIntl` — composable providing `formatMessage`
-- `IntlFormatted` — component for rich-text messages
-- `normalizeChildren` — helper for complex rich-text slot children
+- `defineMessage` and `defineMessages`: Define messages.
+- `useVIntl`: Supplies `formatMessage`.
+- `IntlFormatted`: Renders rich-text messages.
+- `normalizeChildren`: Normalizes complex rich-text slot children.
 
 ## Reference Examples
 
-- Variables and plurals: `apps/frontend/src/pages/frog.vue`
-- Rich-text with link tags: `apps/frontend/src/error.vue`
+- Variables and plurals: `apps/frontend/src/pages/frog.vue`.
+- Rich text with link tags: `apps/frontend/src/error.vue`.
diff --git a/standards/frontend/MODALS.md b/standards/frontend/MODALS.md
index 7e5ec2bd4b..b070b6307a 100644
--- a/standards/frontend/MODALS.md
+++ b/standards/frontend/MODALS.md
@@ -1,38 +1,39 @@
-- [Regular Modals](#regular-modals)
-  - [Basic Usage](#basic-usage)
-  - [Props](#props)
-  - [Slots](#slots)
-    - [Default slot](#default-slot)
-    - [`title` slot](#title-slot)
-    - [`actions` slot](#actions-slot)
-  - [Scrollable Content](#scrollable-content)
-  - [Merged Header Mode](#merged-header-mode)
-  - [Modal Stacking](#modal-stacking)
-  - [Exposed Methods](#exposed-methods)
-- [Multistage Modals](#multistage-modals)
-  - [Architecture](#architecture)
-  - [Building a Multistage Modal](#building-a-multistage-modal)
-    - [1. Define the context](#1-define-the-context)
-    - [2. Define stage configs](#2-define-stage-configs)
-    - [3. Create stage components](#3-create-stage-components)
-    - [4. Create the wrapper component](#4-create-the-wrapper-component)
-  - [Modal API](#modal-api)
-  - [Non-Progress Stages (Edit Sub-Flows)](#non-progress-stages-edit-sub-flows)
-  - [Reference Implementation](#reference-implementation)
+- [Standard modals](#standard-modals)
+	- [Basic use](#basic-use)
+	- [Props](#props)
+	- [Slots](#slots)
+		- [Default slot](#default-slot)
+		- [`title` slot](#title-slot)
+		- [`actions` slot](#actions-slot)
+	- [Scrollable content](#scrollable-content)
+	- [Merged header](#merged-header)
+	- [Modal stack](#modal-stack)
+	- [Exposed methods](#exposed-methods)
+- [Multistage modals](#multistage-modals)
+	- [Architecture](#architecture)
+	- [Create a multistage modal](#create-a-multistage-modal)
+		- [1. Define the context](#1-define-the-context)
+		- [2. Define stage configurations](#2-define-stage-configurations)
+		- [3. Create stage components](#3-create-stage-components)
+		- [4. Create the wrapper component](#4-create-the-wrapper-component)
+	- [Modal API](#modal-api)
+	- [Non-progress stages](#non-progress-stages)
+	- [Reference implementation](#reference-implementation)
 
-# Regular Modals
+# Standard Modals
 
-Use the `NewModal` component (`packages/ui/src/components/modal/NewModal.vue`) for all standard modals.
+Use `NewModal` (`packages/ui/src/components/modal/NewModal.vue`) for all standard modals.
 
-- Set the modal’s width via the `width` or `maxWidth` props. For responsive sizing, use `min(base-size, calc(95vw - 10rem))`.
-- `ModalWrapper` is deprecated — modal behavior is automatically handled via the `injectModalBehavior` DI utility.
+- Set the modal width with the `width` or `maxWidth` prop.
+- For a responsive width, use `min(base-size, calc(95vw - 10rem))`.
+- Do not use `ModalWrapper`. The `injectModalBehavior` DI utility supplies modal behavior.
 
-## Basic Usage
+## Basic Use
 
 ```vue
 <script setup lang="ts">
-import { ref } from ‘vue’
-import { NewModal } from ‘@modrinth/ui’
+import { ref } from 'vue'
+import { NewModal } from '@modrinth/ui'
 
 const modal = ref<InstanceType<typeof NewModal> | null>(null)
 </script>
@@ -41,50 +42,54 @@ const modal = ref<InstanceType<typeof NewModal> | null>(null)
 	<button @click="modal?.show($event)">Open</button>
 
 	<NewModal ref="modal" header="My Modal">
-		<p>Modal content here.</p>
+		<p>Modal content.</p>
 	</NewModal>
 </template>
 ```
 
-Call `show(event?)` to open the modal. Passing the `MouseEvent` triggers an animation originating from the click position. Call `hide()` to close it programmatically.
+Call `show(event?)` to open the modal. A `MouseEvent` starts the animation at the click position.
+
+Call `hide()` to close the modal from code.
 
 ## Props
 
-| Prop                  | Type                                  | Default       | Description                                                                                      |
-| --------------------- | ------------------------------------- | ------------- | ------------------------------------------------------------------------------------------------ |
-| `header`              | `string`                              | —             | Title text displayed in the header bar                                                           |
-| `hideHeader`          | `boolean`                             | `false`       | Hides the entire header (title + close button)                                                   |
-| `mergeHeader`         | `boolean`                             | `false`       | Removes the header bar; renders a floating close button over the content                         |
-| `closable`            | `boolean`                             | `true`        | Shows the close button and enables ESC / click-outside dismissal                                 |
-| `disableClose`        | `boolean`                             | `false`       | Disables all close actions (close button, ESC, click-outside). The close button appears disabled |
-| `closeOnEsc`          | `boolean`                             | `true`        | Allow closing with the Escape key                                                                |
-| `closeOnClickOutside` | `boolean`                             | `true`        | Allow closing by clicking the overlay                                                            |
-| `scrollable`          | `boolean`                             | `false`       | Enables scroll tracking with top/bottom fade indicators                                          |
-| `maxContentHeight`    | `string`                              | `’70vh’`      | Max height of the scrollable content area (only applies when `scrollable`)                       |
-| `noPadding`           | `boolean`                             | `false`       | Removes padding from the content area for edge-to-edge layouts                                   |
-| `maxWidth`            | `string`                              | `’60rem’`     | Maximum width of the modal                                                                       |
-| `width`               | `string`                              | `fit-content` | Width of the modal body                                                                          |
-| `noblur`              | `boolean`                             | —             | Disables backdrop blur. Defaults to the value from `injectModalBehavior`                         |
-| `fade`                | `’standard’ \| ‘warning’ \| ‘danger’` | `’standard’`  | Overlay color variant                                                                            |
-| `danger`              | `boolean`                             | `false`       | **Deprecated** — use `fade="danger"` instead                                                     |
-| `onShow`              | `() => void`                          | —             | Called when the modal opens                                                                      |
-| `onHide`              | `() => void`                          | —             | Called when the modal closes                                                                     |
+| Prop                  | Type                                      | Default       | Description                                                        |
+| --------------------- | ----------------------------------------- | ------------- | ------------------------------------------------------------------ |
+| `header`              | `string`                                  | None          | Sets the title in the header bar.                                  |
+| `hideHeader`          | `boolean`                                 | `false`       | Hides the title and close button.                                  |
+| `mergeHeader`         | `boolean`                                 | `false`       | Replaces the header bar with a floating close button.              |
+| `closable`            | `boolean`                                 | `true`        | Enables the close button, Escape key, and overlay click.           |
+| `disableClose`        | `boolean`                                 | `false`       | Disables all close actions and shows a disabled close button.      |
+| `closeOnEsc`          | `boolean`                                 | `true`        | Enables the Escape key as a close action.                          |
+| `closeOnClickOutside` | `boolean`                                 | `true`        | Enables an overlay click as a close action.                        |
+| `scrollable`          | `boolean`                                 | `false`       | Enables scroll tracking and edge-fade indicators.                  |
+| `maxContentHeight`    | `string`                                  | `'70vh'`      | Sets the maximum scrollable-content height.                        |
+| `noPadding`           | `boolean`                                 | `false`       | Removes content padding for edge-to-edge layouts.                  |
+| `maxWidth`            | `string`                                  | `'60rem'`     | Sets the maximum modal width.                                      |
+| `width`               | `string`                                  | `fit-content` | Sets the modal-body width.                                         |
+| `noblur`              | `boolean`                                 | None          | Disables the backdrop blur. The DI behavior supplies the default.  |
+| `fade`                | `'standard' \| 'warning' \| 'danger'`     | `'standard'`  | Sets the overlay color variant.                                    |
+| `danger`              | `boolean`                                 | `false`       | Deprecated. Use `fade="danger"`.                                 |
+| `onShow`              | `() => void`                              | None          | Runs when the modal opens.                                         |
+| `onHide`              | `() => void`                              | None          | Runs when the modal closes.                                        |
+
+`maxContentHeight` has an effect only when `scrollable` is true.
 
 ## Slots
 
-### Default slot
+### Default Slot
 
-The main content area. Rendered inside a padded, optionally scrollable container.
+The default slot contains the main content. `NewModal` puts it in a padded container that can scroll.
 
 ```vue
 <NewModal ref="modal" header="Confirm">
-	<p>Are you sure you want to proceed?</p>
+	<p>Are you sure that you want to continue?</p>
 </NewModal>
 ```
 
-### `title` slot
+### `title` Slot
 
-Replaces the default header text. Use this when you need custom markup in the header (e.g. an icon next to the title or a badge).
+The `title` slot replaces the default header text. Use it for custom header markup, such as an icon or badge.
 
 ```vue
 <NewModal ref="modal">
@@ -92,17 +97,19 @@ Replaces the default header text. Use this when you need custom markup in the he
 		<AlertIcon />
 		<span class="text-2xl font-semibold text-contrast">Custom Title</span>
 	</template>
-	<p>Content here.</p>
+	<p>Content.</p>
 </NewModal>
 ```
 
-### `actions` slot
+### `actions` Slot
 
-Renders a bottom action bar below the content area (with `p-4 pt-0` padding). Use this for confirm/cancel buttons.
+The `actions` slot makes an action bar below the content. The bar uses `p-4 pt-0` padding.
+
+Use this slot for confirmation and cancellation buttons:
 
 ```vue
 <NewModal ref="modal" header="Delete Item" fade="danger">
-	<p>This action cannot be undone.</p>
+	<p>You cannot reverse this action.</p>
 	<template #actions>
 		<Button type="colored" color="red" @click="handleDelete">Delete</Button>
 		<Button @click="modal?.hide()">Cancel</Button>
@@ -112,21 +119,25 @@ Renders a bottom action bar below the content area (with `p-4 pt-0` padding). Us
 
 ## Scrollable Content
 
-Set `scrollable` to enable scroll tracking. The modal renders animated fade gradients at the top and bottom edges when content is scrolled, giving users a visual cue that more content exists.
+Set `scrollable` to enable scroll tracking. Fade gradients appear at the top and bottom when more content exists.
 
 ```vue
 <NewModal ref="modal" header="Long Content" scrollable max-content-height="60vh">
-	<!-- Long content that may overflow -->
+	<!-- Long content can overflow. -->
 </NewModal>
 ```
 
-The `checkScrollState` method is exposed via ref — call it after dynamically changing content to re-evaluate whether fade indicators should appear.
+Call the exposed `checkScrollState` method after a dynamic content change. The method recalculates the fade-indicator state.
 
-When `scrollable` is `false` (the default), content uses `overflow-y: auto` without fade indicators.
+When `scrollable` is false, the content uses `overflow-y: auto` without fade indicators. False is the default value.
 
-## Merged Header Mode
+## Merged Header
 
-When `mergeHeader` is set, the header bar is hidden and a floating close button is rendered in the top-right corner of the modal. Content receives extra top padding to avoid overlapping the button. This is useful for modals with hero images or full-bleed content at the top.
+When `mergeHeader` is true, the header bar is hidden. A floating close button appears in the top-right corner.
+
+The content gets more top padding. This padding prevents overlap with the button.
+
+Use this mode for a hero image or full-width content at the top:
 
 ```vue
 <NewModal ref="modal" merge-header no-padding>
@@ -137,35 +148,39 @@ When `mergeHeader` is set, the header bar is hidden and a floating close button
 </NewModal>
 ```
 
-## Modal Stacking
+## Modal Stack
 
-`NewModal` integrates with a modal stack (`useModalStack`). Multiple modals can be open simultaneously — only the topmost modal responds to the Escape key. The document body scroll is locked when any modal is open and restored when the last modal closes.
+`NewModal` uses `useModalStack`. Multiple modals can be open at the same time.
+
+Only the top modal responds to the Escape key. The first open modal locks document-body scrolling.
+
+The last modal restores document-body scrolling when it closes.
 
 ## Exposed Methods
 
-| Method               | Description                                             |
-| -------------------- | ------------------------------------------------------- |
-| `show(event?)`       | Opens the modal. Pass `MouseEvent` for origin animation |
-| `hide()`             | Closes the modal                                        |
-| `checkScrollState()` | Re-evaluates scroll fade indicators (when `scrollable`) |
+| Method               | Description                                                   |
+| -------------------- | ------------------------------------------------------------- |
+| `show(event?)`       | Opens the modal. Pass a `MouseEvent` for the origin animation. |
+| `hide()`             | Closes the modal.                                             |
+| `checkScrollState()` | Recalculates fade indicators when `scrollable` is true.       |
 
 # Multistage Modals
 
-The `MultiStageModal` component (`packages/ui/src/components/base/MultiStageModal.vue`) provides a wizard-like modal with progress tracking, conditional stages, and per-stage button configuration.
+`MultiStageModal` (`packages/ui/src/components/base/MultiStageModal.vue`) supplies progress, conditional stages, and button configurations for each stage.
 
 ## Architecture
 
 A multistage modal has three parts:
 
-1. **Context** — A DI provider that holds all state, business logic, and stage configs
-2. **Stage configs** — Data objects describing each stage (title, component, buttons, skip conditions)
-3. **Stage components** — Vue components rendered inside the modal, consuming the context
+1. The context contains all state, application logic, and stage configurations.
+2. Stage configurations define the title, component, buttons, and skip conditions for each stage.
+3. Stage components inject the context and render inside the modal.
 
-## Building a Multistage Modal
+## Create a Multistage Modal
 
-### 1. Define the context
+### 1. Define the Context
 
-Create a DI provider with all the state your wizard needs. Include the modal ref and stage configs.
+Make a DI provider that contains the modal state. Include the modal reference and stage configurations.
 
 ```ts
 // providers/my-feature/my-modal.ts
@@ -175,15 +190,15 @@ import type { MultiStageModal, StageConfigInput } from '@modrinth/ui'
 import { createContext } from '@modrinth/ui'
 
 export interface MyModalContext {
-	// State
+	// State.
 	formData: Ref<MyFormData>
 	isSubmitting: Ref<boolean>
 
-	// Modal control
+	// Modal control.
 	modal: ShallowRef<ComponentExposed<typeof MultiStageModal> | null>
 	stageConfigs: StageConfigInput<MyModalContext>[]
 
-	// Business logic
+	// Application logic.
 	handleSubmit: () => Promise<void>
 }
 
@@ -210,9 +225,11 @@ export function createMyModalContext(
 }
 ```
 
-### 2. Define stage configs
+### 2. Define Stage Configurations
 
-Each stage is a `StageConfigInput<T>` where `T` is your context type. Most fields accept either a static value or a function receiving the context (`MaybeCtxFn<T, R>`).
+Each stage is a `StageConfigInput<T>`, where `T` is the context type.
+
+Most fields accept a static value or a function that receives the context. The function type is `MaybeCtxFn<T, R>`.
 
 ```ts
 // providers/my-feature/stages/details-stage.ts
@@ -227,7 +244,7 @@ export const detailsStageConfig: StageConfigInput<MyModalContext> = {
 	stageContent: markRaw(DetailsStage),
 	title: 'Details',
 
-	// Conditional behavior based on context
+	// Set behavior from the context.
 	skip: (ctx) => ctx.shouldSkipDetails.value,
 	cannotNavigateForward: (ctx) => !ctx.formData.value.name,
 	disableClose: (ctx) => ctx.isSubmitting.value,
@@ -247,36 +264,36 @@ export const detailsStageConfig: StageConfigInput<MyModalContext> = {
 }
 ```
 
-**Stage config fields:**
+Stage configuration fields:
 
-| Field                   | Type                                       | Purpose                                          |
-| ----------------------- | ------------------------------------------ | ------------------------------------------------ |
-| `id`                    | `string`                                   | Unique stage identifier (used with `setStage()`) |
-| `stageContent`          | `Component`                                | Vue component to render (wrap with `markRaw()`)  |
-| `title`                 | `MaybeCtxFn<T, string>`                    | Stage title in breadcrumbs                       |
-| `skip`                  | `MaybeCtxFn<T, boolean>`                   | Skip this stage conditionally                    |
-| `nonProgressStage`      | `MaybeCtxFn<T, boolean>`                   | Exclude from progress bar (for edit sub-flows)   |
-| `hideStageInBreadcrumb` | `MaybeCtxFn<T, boolean>`                   | Hide from breadcrumb nav                         |
-| `cannotNavigateForward` | `MaybeCtxFn<T, boolean>`                   | Block forward navigation (validation)            |
-| `disableClose`          | `MaybeCtxFn<T, boolean>`                   | Disable closing the modal                        |
-| `leftButtonConfig`      | `MaybeCtxFn<T, StageButtonConfig \| null>` | Left action button                               |
-| `rightButtonConfig`     | `MaybeCtxFn<T, StageButtonConfig \| null>` | Right action button                              |
-| `maxWidth`              | `MaybeCtxFn<T, string>`                    | Per-stage max width (default `560px`)            |
+| Field                   | Type                                       | Purpose                                           |
+| ----------------------- | ------------------------------------------ | ------------------------------------------------- |
+| `id`                    | `string`                                   | Supplies the unique stage identifier.             |
+| `stageContent`          | `Component`                                | Supplies the Vue component. Use `markRaw()`.      |
+| `title`                 | `MaybeCtxFn<T, string>`                    | Supplies the breadcrumb title.                    |
+| `skip`                  | `MaybeCtxFn<T, boolean>`                   | Skips the stage when the value is true.           |
+| `nonProgressStage`      | `MaybeCtxFn<T, boolean>`                   | Removes the stage from the progress bar.          |
+| `hideStageInBreadcrumb` | `MaybeCtxFn<T, boolean>`                   | Removes the stage from breadcrumb navigation.     |
+| `cannotNavigateForward` | `MaybeCtxFn<T, boolean>`                   | Prevents forward navigation.                      |
+| `disableClose`          | `MaybeCtxFn<T, boolean>`                   | Disables modal close actions.                     |
+| `leftButtonConfig`      | `MaybeCtxFn<T, StageButtonConfig \| null>` | Configures the left action button.                |
+| `rightButtonConfig`     | `MaybeCtxFn<T, StageButtonConfig \| null>` | Configures the right action button.               |
+| `maxWidth`              | `MaybeCtxFn<T, string>`                    | Sets the stage width. The default is `560px`.     |
 
-**Button config fields:**
+Button configuration fields:
 
-| Field          | Purpose                 |
-| -------------- | ----------------------- |
-| `label`        | Button text             |
-| `icon`         | Icon component          |
-| `iconPosition` | `'before'` or `'after'` |
-| `color`        | Button color prop       |
-| `disabled`     | Disable the button      |
-| `onClick`      | Click handler           |
+| Field          | Purpose                                 |
+| -------------- | --------------------------------------- |
+| `label`        | Supplies the button text.               |
+| `icon`         | Supplies the icon component.            |
+| `iconPosition` | Uses `'before'` or `'after'`.            |
+| `color`        | Supplies the `Button` color prop.       |
+| `disabled`     | Disables the button when true.          |
+| `onClick`      | Supplies the click handler.             |
 
-### 3. Create stage components
+### 3. Create Stage Components
 
-Stage components inject the context and render their UI:
+Inject the context into each stage component. Then, render the applicable UI:
 
 ```vue
 <!-- providers/my-feature/stages/DetailsStage.vue -->
@@ -294,9 +311,9 @@ const { formData } = injectMyModalContext()
 </template>
 ```
 
-### 4. Create the wrapper component
+### 4. Create the Wrapper Component
 
-The wrapper provides context and renders `MultiStageModal`:
+Provide the context from the wrapper. Then, render `MultiStageModal`:
 
 ```vue
 <!-- components/MyModalWrapper.vue -->
@@ -319,20 +336,20 @@ defineExpose({ show: () => modal.value?.show() })
 
 ## Modal API
 
-`MultiStageModal` exposes via ref:
+`MultiStageModal` exposes these methods and properties through its reference:
 
-| Method/Property       | Description                         |
-| --------------------- | ----------------------------------- |
-| `show()`              | Open the modal                      |
-| `hide()`              | Close the modal                     |
-| `setStage(indexOrId)` | Jump to stage by index or string id |
-| `nextStage()`         | Advance to next non-skipped stage   |
-| `prevStage()`         | Go back to previous stage           |
-| `currentStageIndex`   | Ref to current stage index          |
+| Method or property     | Description                                  |
+| ---------------------- | -------------------------------------------- |
+| `show()`               | Opens the modal.                             |
+| `hide()`               | Closes the modal.                            |
+| `setStage(indexOrId)`  | Goes to a stage by index or string ID.       |
+| `nextStage()`          | Goes to the next applicable stage.           |
+| `prevStage()`          | Goes to the previous stage.                  |
+| `currentStageIndex`    | Contains the current stage index as a `Ref`. |
 
-## Non-Progress Stages (Edit Sub-Flows)
+## Non-Progress Stages
 
-For stages that shouldn't appear in the progress bar (e.g. editing a specific field from a summary page):
+Use a non-progress stage for an edit flow that must not appear in the progress bar:
 
 ```ts
 export const editLoadersStageConfig: StageConfigInput<MyContext> = {
@@ -351,16 +368,18 @@ export const editLoadersStageConfig: StageConfigInput<MyContext> = {
 }
 ```
 
-Navigate to it with `modal.value?.setStage('edit-loaders')` — it won't affect the progress indicator.
+Call `modal.value?.setStage('edit-loaders')` to open the stage. This stage does not change the progress indicator.
 
 ## Reference Implementation
 
-The version creation/edit modal is the most complete example:
+The version create-and-edit modal is the most complete example:
 
-| File                                                          | Purpose                           |
-| ------------------------------------------------------------- | --------------------------------- |
-| `apps/frontend/src/providers/version/manage-version-modal.ts` | Context creation + business logic |
-| `apps/frontend/src/providers/version/stages/index.ts`         | Stage config barrel export        |
-| `apps/frontend/src/providers/version/stages/*-stage.ts`       | Individual stage configs          |
+| File                                                          | Purpose                                |
+| ------------------------------------------------------------- | -------------------------------------- |
+| `apps/frontend/src/providers/version/manage-version-modal.ts` | Contains context and application logic. |
+| `apps/frontend/src/providers/version/stages/index.ts`         | Exports all stage configurations.       |
+| `apps/frontend/src/providers/version/stages/*-stage.ts`       | Contains each stage configuration.      |
 
-The context includes computed properties for conditional UI, watchers for auto-fetching dependencies, loading states for granular button disabling, and both "create" and "edit" flows sharing the same stages with different button configs.
+The context has computed properties for conditional UI. It also has dependency watchers and granular button loading states.
+
+The create and edit flows use the same stages with different button configurations.
diff --git a/standards/frontend/SURFACE_SYSTEM.md b/standards/frontend/SURFACE_SYSTEM.md
index 79b656a21a..8aa3aa2383 100644
--- a/standards/frontend/SURFACE_SYSTEM.md
+++ b/standards/frontend/SURFACE_SYSTEM.md
@@ -1,25 +1,31 @@
 # Surface System
 
-Use `surface-*` variables to describe UI elevation and separation. The scale is ordered from the page base up through stronger raised surfaces and strokes.
+Use `surface-*` variables to show UI elevation and separation. The scale starts at the page base and ends at strong strokes.
 
 ## Layers
 
-| Token       | Use                                                                 |
-| ----------- | ------------------------------------------------------------------- |
-| `surface-1` | Page background.                                                    |
-| `surface-2` | Default raised surfaces, table rows, and standard card backgrounds. |
-| `surface-3` | Header bands, inputs, dropdown surfaces, and card hover states.     |
-| `surface-4` | Standard strokes and outlines, including table outlines.            |
-| `surface-5` | Strong strokes for surfaces that need extra separation.             |
+| Token       | Use                                                               |
+| ----------- | ----------------------------------------------------------------- |
+| `surface-1` | Use for the page background.                                      |
+| `surface-2` | Use for raised surfaces, table rows, and standard card backgrounds. |
+| `surface-3` | Use for header bands, inputs, dropdowns, and card hover states.    |
+| `surface-4` | Use for standard strokes, outlines, and table outlines.            |
+| `surface-5` | Use for strong strokes that need more separation.                  |
 
 ## Strokes
 
-Use `surface-4` for normal outlines and dividers. Tables should use `surface-4` for their outer border and row separators.
+Use `surface-4` for standard outlines and dividers. Use it for table borders and row separators.
 
-Reserve `surface-5` for stronger outlines, such as modal frames, high-emphasis separators, or hover states on elements that already sit on `surface-4`.
+Use `surface-5` for modal frames, strong separators, and hover states above `surface-4`.
 
 ## Backgrounds
 
-Use `surface-1` for page backgrounds and `surface-2` for ordinary raised content. Use `surface-3` for header strips, inputs, and temporary elevation such as hover states. Use `surface-4` sparingly as a stronger raised background, usually for controls or badges that need to sit above nearby content.
+Use `surface-1` for page backgrounds. Use `surface-2` for standard raised content.
 
-Avoid using legacy aliased background variables for new UI. Prefer explicit `bg-surface-*` and `border-surface-*` utilities so the layer intent is visible in the component.
+Use `surface-3` for header strips, inputs, and temporary elevation. A hover state is an example of temporary elevation.
+
+Use `surface-4` only for controls or badges that must appear above adjacent content.
+
+Do not use legacy aliased background variables in new UI. Use explicit `bg-surface-*` and `border-surface-*` utilities.
+
+These utilities show the intended layer in the component.
diff --git a/standards/maintaining/CHANGELOG.md b/standards/maintaining/CHANGELOG.md
index 421aaf2098..9d72bb8868 100644
--- a/standards/maintaining/CHANGELOG.md
+++ b/standards/maintaining/CHANGELOG.md
@@ -1,111 +1,136 @@
 # Changelog Style Guide
 
-## The core rule
+## Core Rule
 
-**Each bullet describes one user-visible change, written from the user's perspective, in plain language, as a single sentence.**
+Each bullet describes one user-visible change. Write one plain-language sentence from the perspective of the user.
 
-If you can't explain the change without referencing internal code, components, or refactors, it probably doesn't belong in the changelog.
+Do not add a change that you can explain only with internal code, component, or refactor details.
 
-## Voice and tense
+## Voice and Tense
 
-- **Past tense, implied subject.** The section heading (`## Added`, `## Fixed`, `## Changed`) supplies the verb's mood - bullets read as a continuation of it.
-  - Good: `Fixed a missing gap between the project filter tabs and the project list.`
-  - Good: `Added support for Java 25.`
-  - Avoid: `We fixed...`, `This fixes...`, `Fixes...` (present tense), `Will fix...`
-- **No first person.** Don't say "we" or "our" inside a bullet. The exception is featured release callouts that link to a blog post (`We've overhauled the Content tab...`).
-- **No second person except for direct user actions.** "You" is fine when describing what the user can now do (`Joining a server from the app downloads the required content and launches you directly into the server.`), but don't address the user gratuitously.
+- Use the past tense with an implicit subject. The section heading supplies the context for the bullet.
+	- Correct: `Fixed a missing gap between the project filter tabs and the project list.`
+	- Correct: `Added support for Java 25.`
+	- Incorrect: `We fixed...`, `This fixes...`, `Fixes...`, or `Will fix...`.
+- Do not use the first person. A featured release that links to a blog post is an exception.
+- Use the second person only for a direct user action.
 
-## Section/verb agreement
+Example of a direct action: `Joining a server downloads the required content and opens the server.`
 
-The opening verb must match the section it lives under. Don't put "Fixed X" bullets inside `## Added`.
+## Section and Verb Agreement
 
-| Section       | Typical opening verbs                                                           |
-| ------------- | ------------------------------------------------------------------------------- |
-| `## Added`    | Added, Introduced, New                                                          |
-| `## Changed`  | Refreshed, Redesigned, Moved, Renamed, Updated, Consolidated, Improved, Rebuilt |
-| `## Fixed`    | Fixed                                                                           |
-| `## Security` | Fixed (security framing)                                                        |
+Make the first verb agree with its section. Do not put a `Fixed` bullet in `## Added`.
 
-In `## Added`, the leading "Added" is often dropped because it's redundant with the heading:
+| Section       | Typical first words                                                        |
+| ------------- | -------------------------------------------------------------------------- |
+| `## Added`    | Added, Introduced, New                                                      |
+| `## Changed`  | Refreshed, Redesigned, Moved, Renamed, Updated, Consolidated, Improved     |
+| `## Fixed`    | Fixed                                                                      |
+| `## Security` | Fixed, with a clear security context                                       |
 
-- `- Server stats inside server settings modal, in info card.`
-- `- Confirmation modal for resubscribing to a server.`
+You can omit `Added` in the `## Added` section because the heading supplies it:
 
-In `## Fixed`, the leading "Fixed" is **kept** in most entries - it reads more clearly. Be consistent within a single entry.
+- `Server statistics in an information card inside the server settings modal.`
+- `Confirmation modal for server resubscription.`
 
-## What to write about
+Keep `Fixed` in most `## Fixed` bullets because it makes the text clear. Use one pattern in each entry.
 
-Describe the **observable behavior**, not the implementation.
+## Content
 
-- Good: `Server CPU and memory graphs no longer freeze on the last value after a hard crash or out-of-memory kill.`
-- Bad: `Refactored the metrics polling hook to clear stale state on socket disconnect.`
+Describe the result that the user can see. Do not describe the implementation.
 
-- Good: `Historical log files are now fetched in the background when opening the Logs page, so switching between them is instant.`
-- Bad: `Moved log file fetching into a background worker.`
+- Correct: `Server CPU and memory graphs no longer freeze after a hard crash or out-of-memory termination.`
+- Incorrect: `Refactored the metrics polling hook to clear stale state after a socket disconnection.`
 
-If a refactor has no user-visible effect, **don't list it**. Internal cleanup, dependency bumps, and code moves don't belong in the changelog unless they produce a noticeable difference (perf, reliability, consistency).
+- Correct: `Historical log files now load in the background, so selection between files is immediate.`
+- Incorrect: `Moved log file fetching into a background worker.`
 
-## Specificity
+Do not list a refactor that has no user-visible result.
 
-Be specific enough that a user reading the changelog can recognize the thing you're talking about.
+You can list an internal change when it gives a visible improvement in performance, reliability, or consistency.
+
+## Specific Terms
+
+Give sufficient detail for the user to identify the applicable item.
 
 - Vague: `Fixed a bug on the project page.`
-- Better: `Fixed project versions table overflowing outside of table. Version tags will now truncate.`
+- Specific: `Fixed project version rows that extended past the table. Version tags now truncate.`
 
 - Vague: `Improved the UI.`
-- Better: `Refreshed the server cards UI for consistency.`
+- Specific: `Refreshed the server cards for visual consistency.`
 
-Name the page, tab, modal, or feature you're talking about. "The Content tab", "the server panel header", "the Worlds tab", "the project page" - these give the reader a concrete anchor.
+Name the applicable page, tab, modal, or feature. Examples include the Content tab, server panel header, Worlds tab, and project page.
 
 ## Length
 
-- **One sentence per bullet.** If you need two sentences, you probably have two bullets, or one bullet plus a sub-bullet.
-- Aim for under ~25 words. Long bullets are usually a sign that the change is being over-explained or is actually multiple changes.
-- Sub-bullets (indented with a tab) are allowed when one change has several facets - see the `## Added` section in the v0.12.0 app release for a good example.
+- Write one sentence in each bullet.
+- Use a second bullet when the change needs a second sentence.
+- Use fewer than 25 words when possible.
+- Use tab-indented sub-bullets when one change has multiple related parts.
+
+Refer to the `## Added` section in the v0.12.0 app release for a sub-bullet example.
 
 ## Punctuation
 
-- **End every bullet with a period.** This is inconsistent in the historical file, but periods are the more common pattern and the one to follow going forward.
-- Use sentence case, not Title Case.
-- Use straight quotes, not curly quotes (`"foo"` not `"foo"`).
-- Use proper code formatting for filenames, flags, and literal strings: `` `.log` ``, `` `Restart` ``.
+- End each bullet with a period.
+- Use sentence case, not title case.
+- Use straight quotation marks, not curly quotation marks: `"foo"`.
+- Use code formatting for filenames, flags, and literal strings: `.log` and `Restart`.
 
-## Naming things
+Historical entries do not always use periods. Use periods in all new entries.
 
-- Use the public, branded name: **Modrinth App**, **Modrinth Hosting**, **Modrinth** - not "the app", "servers", "Modrinth Servers" (deprecated). Capitalize product names.
-- Refer to UI surfaces by the label the user sees: **Content tab**, **Worlds tab**, **Files tab**, **Logs page**, **server panel**, **project page**, **Discover page**.
-- Capitalize tab and page names when referring to them by name (`the Content tab`), but not when used generically (`browse content`).
+## Product and UI Names
 
-## Don't
+- Use the public names `Modrinth App`, `Modrinth Hosting`, and `Modrinth`.
+- Do not use deprecated names, such as `Modrinth Servers`.
+- Use the labels that appear in the UI.
+- Capitalize a tab or page name when you refer to its label.
+- Use lowercase when you refer to a generic action, such as `browse content`.
 
-- **Don't blame.** Avoid "fixed a regression introduced in v0.12.0" - just describe the fix.
-- **Don't reference PRs, issues, or commits.** The changelog is for users, not contributors - the exception is notable third-party contributions, where you should credit the contributor by linking their GitHub profile (e.g. `Added support for Java 25. Thanks to [@username](https://github.com/username)!`). Sharing credit for community contributions is encouraged.
-- **Don't reference internal team members or processes.** No "as requested by support", no "per the design review".
-- **Don't apologize or editorialize.** Skip "unfortunately", "finally", "long-awaited", "we know this has been a pain point". State the change.
-- **Don't use vague intensifiers.** "Significantly improved", "much better", "vastly faster" - quantify if you can, otherwise drop the adverb.
-- **Don't list every sub-fix of a bigger change separately.** If you redesigned the server panel header, write one bullet about the redesign rather than six bullets about each moved element.
-- **Don't use "issue with" / "issue where" as filler.** `Fixed an issue where buttons were misaligned` → `Fixed misaligned buttons.`
+Examples of UI labels include Content tab, Worlds tab, Files tab, Logs page, server panel, project page, and Discover page.
 
-## Examples - rewriting weak bullets
+## Prohibited Content
+
+- Do not assign blame. Describe the correction without the release that caused the problem.
+- Do not refer to pull requests, issues, or commits.
+- Do not refer to internal team members or processes.
+- Do not apologize or add an opinion about the change.
+- Do not use vague intensifiers. Give a measurement when possible, or remove the adverb.
+- Do not list each small correction from one larger change.
+- Do not use `issue with` or `issue where` as filler.
+
+You can credit a notable community contribution with a link to the contributor's GitHub profile.
+
+Example: `Added support for Java 25. Thanks to [@username](https://github.com/username)!`
+
+Replace `Fixed an issue with misaligned buttons` with `Fixed misaligned buttons.`
+
+## Weak-Bullet Rewrites
 
 | Weak                                                       | Better                                                                                |
 | ---------------------------------------------------------- | ------------------------------------------------------------------------------------- |
-| `Fixed a bug.`                                             | `Fixed project icons becoming extremely bright on hover.`                             |
-| `Various improvements to the server panel.`                | Split into specific bullets, or drop entirely.                                        |
+| `Fixed a bug.`                                             | `Fixed excessive brightness on project icons during hover.`                           |
+| `Various improvements to the server panel.`                | Divide it into specific bullets, or remove it.                                        |
 | `Refactored the logs page to use a new component.`         | `Redesigned the Logs page to match the Modrinth Hosting server panel.`                |
-| `Fixed an issue where the server address wasn't copyable.` | `Server address in the panel header can now be clicked to copy it to your clipboard.` |
-| `Made some changes to the content tab.`                    | Either drop, or list each user-visible change as its own bullet.                      |
-| `Fixed UX issues.`                                         | Name the specific UX issue.                                                           |
+| `Fixed an issue where the server address was not copyable.` | `The server address in the panel header now copies to the clipboard when selected.`  |
+| `Made some changes to the Content tab.`                    | List each user-visible change, or remove the bullet.                                  |
+| `Fixed UX issues.`                                         | Name the specific user-experience problem.                                            |
 
-## Featured release bullets
+## Featured Release Bullets
 
-When an entry has a linked blog post heading (e.g. `## [Introducing Server Projects](/news/article/...)`), the bullets underneath summarize the *highlights* in 1–4 lines, then link out. They don't need to be exhaustive - that's what the blog post is for.
+A featured release has a linked blog-post heading, such as `## [Introducing Server Projects](/news/article/...)`.
 
-## Quick checklist before committing a bullet
+Use one to four lines below the heading to summarize the primary changes. Then, link to the blog post.
 
-1. Would a non-developer user understand it?
-2. Does it describe behavior, not implementation?
-3. Is the verb in the right tense for its section?
-4. Does it name the specific surface (tab/page/modal)?
-5. Is it one sentence, ending in a period?
-6. Is there a vague word ("issue", "bug", "various", "some") I can replace with something concrete?
+The bullets do not need to contain all details. The blog post contains the complete information.
+
+## Bullet Checklist
+
+Before you commit a bullet, make sure that it meets these requirements:
+
+1. A user who is not a developer can understand it.
+2. It describes behavior, not implementation.
+3. Its verb uses the correct tense for the section.
+4. It identifies the applicable tab, page, modal, or feature.
+5. It contains one sentence and ends with a period.
+6. It replaces vague words with specific terms.

From d0856d46f263149343a88117dac066b137f81594 Mon Sep 17 00:00:00 2001
From: "Calum H." <calum@modrinth.com>
Date: Mon, 10 Aug 2026 16:26:23 +0100
Subject: [PATCH 73/82] fix: copy on unknown file warning modal (#7078)

Closes: #6865
---
 .../src/components/ui/modal/InstallToPlayModal.vue            | 3 +--
 .../shared-instances/shared-instance-install-modal/index.vue  | 3 +--
 apps/app-frontend/src/locales/en-US/index.json                | 2 +-
 packages/ui/src/components/modal/UnknownFileWarningModal.vue  | 3 +--
 .../installation-settings/components/ContentDiffModal.vue     | 3 +--
 packages/ui/src/locales/en-US/index.json                      | 4 ++--
 6 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/apps/app-frontend/src/components/ui/modal/InstallToPlayModal.vue b/apps/app-frontend/src/components/ui/modal/InstallToPlayModal.vue
index 16c229706f..07b51e7267 100644
--- a/apps/app-frontend/src/components/ui/modal/InstallToPlayModal.vue
+++ b/apps/app-frontend/src/components/ui/modal/InstallToPlayModal.vue
@@ -403,8 +403,7 @@ const messages = defineMessages({
 	},
 	reviewedFiles: {
 		id: 'app.modal.install-to-play.reviewed-files',
-		defaultMessage:
-			'A file is only reviewed if it’s published to Modrinth, regardless of its file format (including .mrpack).',
+		defaultMessage: "Files that aren't published to Modrinth aren't reviewed.",
 	},
 	installAnyway: {
 		id: 'app.modal.install-to-play.install-anyway',
diff --git a/apps/app-frontend/src/components/ui/shared-instances/shared-instance-install-modal/index.vue b/apps/app-frontend/src/components/ui/shared-instances/shared-instance-install-modal/index.vue
index 9ffa818bcb..a29a689ad1 100644
--- a/apps/app-frontend/src/components/ui/shared-instances/shared-instance-install-modal/index.vue
+++ b/apps/app-frontend/src/components/ui/shared-instances/shared-instance-install-modal/index.vue
@@ -598,8 +598,7 @@ const messages = defineMessages({
 	},
 	reviewedFiles: {
 		id: 'app.modal.install-to-play.reviewed-files',
-		defaultMessage:
-			'A file is only reviewed if it’s published to Modrinth, regardless of its file format (including .mrpack).',
+		defaultMessage: "Files that aren't published to Modrinth aren't reviewed.",
 	},
 	installAnyway: {
 		id: 'app.modal.install-to-play.install-anyway',
diff --git a/apps/app-frontend/src/locales/en-US/index.json b/apps/app-frontend/src/locales/en-US/index.json
index 9b5a674d18..1a1f6ac8c4 100644
--- a/apps/app-frontend/src/locales/en-US/index.json
+++ b/apps/app-frontend/src/locales/en-US/index.json
@@ -723,7 +723,7 @@
     "message": "For support requests, contact our <support-link>support team</support-link>. For bug reports, open a <github-link>GitHub issue</github-link>."
   },
   "app.modal.install-to-play.reviewed-files": {
-    "message": "A file is only reviewed if it’s published to Modrinth, regardless of its file format (including .mrpack)."
+    "message": "Files that aren't published to Modrinth aren't reviewed."
   },
   "app.modal.install-to-play.shared-instance": {
     "message": "Shared instance"
diff --git a/packages/ui/src/components/modal/UnknownFileWarningModal.vue b/packages/ui/src/components/modal/UnknownFileWarningModal.vue
index cd4d6055b4..43284e5be7 100644
--- a/packages/ui/src/components/modal/UnknownFileWarningModal.vue
+++ b/packages/ui/src/components/modal/UnknownFileWarningModal.vue
@@ -164,8 +164,7 @@ const messages = defineMessages({
 	},
 	reviewedFiles: {
 		id: 'unknown-file-warning-modal.reviewed-files',
-		defaultMessage:
-			'A file is only reviewed if it’s published to Modrinth, regardless of its file format (including .mrpack).',
+		defaultMessage: "Files that aren't published to Modrinth aren't reviewed.",
 	},
 	unrecognizedFiles: {
 		id: 'unknown-file-warning-modal.unrecognized-files',
diff --git a/packages/ui/src/layouts/shared/installation-settings/components/ContentDiffModal.vue b/packages/ui/src/layouts/shared/installation-settings/components/ContentDiffModal.vue
index 78e4e6b5b3..18782e8863 100644
--- a/packages/ui/src/layouts/shared/installation-settings/components/ContentDiffModal.vue
+++ b/packages/ui/src/layouts/shared/installation-settings/components/ContentDiffModal.vue
@@ -420,8 +420,7 @@ const messages = defineMessages({
 	},
 	reviewedFiles: {
 		id: 'content.diff-modal.reviewed-files',
-		defaultMessage:
-			'A file is only reviewed if it’s published to Modrinth, regardless of its file format (including .mrpack).',
+		defaultMessage: "Files that aren't published to Modrinth aren't reviewed.",
 	},
 	installAnyway: {
 		id: 'content.diff-modal.install-anyway',
diff --git a/packages/ui/src/locales/en-US/index.json b/packages/ui/src/locales/en-US/index.json
index 029827877e..6e96468878 100644
--- a/packages/ui/src/locales/en-US/index.json
+++ b/packages/ui/src/locales/en-US/index.json
@@ -507,7 +507,7 @@
     "defaultMessage": "{count} removed (disabled)"
   },
   "content.diff-modal.reviewed-files": {
-    "defaultMessage": "A file is only reviewed if it’s published to Modrinth, regardless of its file format (including .mrpack)."
+    "defaultMessage": "Files that aren't published to Modrinth aren't reviewed."
   },
   "content.diff-modal.unknown-content-body": {
     "defaultMessage": "Some content on your server could not be analyzed and may be affected by this change."
@@ -6039,7 +6039,7 @@
     "defaultMessage": "Unknown files warning"
   },
   "unknown-file-warning-modal.reviewed-files": {
-    "defaultMessage": "A file is only reviewed if it’s published to Modrinth, regardless of its file format (including .mrpack)."
+    "defaultMessage": "Files that aren't published to Modrinth aren't reviewed."
   },
   "unknown-file-warning-modal.unrecognized-files": {
     "defaultMessage": "Unrecognized files"

From 07bac8ffde10aa355227161ff426e637ad4ba091 Mon Sep 17 00:00:00 2001
From: aecsocket <43144841+aecsocket@users.noreply.github.com>
Date: Tue, 11 Aug 2026 00:42:56 +0900
Subject: [PATCH 74/82] fix: v3 environment fields in all v2 endpoints (#7082)

---
 apps/labrinth/src/models/v2/projects.rs | 21 +++++++++++++++++++++
 apps/labrinth/src/models/v2/search.rs   | 10 ++++++++++
 apps/labrinth/tests/v2/search.rs        |  1 +
 apps/labrinth/tests/v2/version.rs       | 12 +++++++++++-
 4 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/apps/labrinth/src/models/v2/projects.rs b/apps/labrinth/src/models/v2/projects.rs
index a5edfd216b..4f00ed8486 100644
--- a/apps/labrinth/src/models/v2/projects.rs
+++ b/apps/labrinth/src/models/v2/projects.rs
@@ -28,6 +28,8 @@ pub struct LegacyProject {
     pub server_side: LegacySideType,
     /// A list of game versions this project supports
     pub game_versions: Vec<String>,
+    /// The environments this project supports
+    pub environment: Vec<String>,
 
     // All other fields are the same as V3
     // If they change, or their constituent types change, we may need to
@@ -125,6 +127,14 @@ impl LegacyProject {
             .filter_map(|v| v.as_str())
             .map(|v| v.to_string())
             .collect();
+        let environment = data
+            .fields
+            .get("environment")
+            .unwrap_or(&Vec::new())
+            .iter()
+            .filter_map(|v| v.as_str())
+            .map(|v| v.to_string())
+            .collect();
 
         if let Some(versions_item) = versions_item {
             // Extract side types from remaining fields
@@ -221,6 +231,7 @@ impl LegacyProject {
             client_side,
             server_side,
             game_versions,
+            environment,
         }
     }
 
@@ -302,6 +313,9 @@ pub struct LegacyVersion {
     /// A list of loaders this project supports (has a newtype struct)
     pub loaders: Vec<Loader>,
 
+    /// The environment this version supports
+    pub environment: String,
+
     pub id: VersionId,
     pub project_id: ProjectId,
     pub author_id: UserId,
@@ -332,6 +346,12 @@ impl From<Version> for LegacyVersion {
                 }
             }
         }
+        let environment = data
+            .fields
+            .get("environment")
+            .and_then(|value| value.as_str())
+            .unwrap_or("unknown")
+            .to_string();
 
         // - if loader is mrpack, this is a modpack
         // the v2 loaders are whatever the corresponding loader fields are
@@ -366,6 +386,7 @@ impl From<Version> for LegacyVersion {
             dependencies: data.dependencies,
             game_versions,
             loaders,
+            environment,
         }
     }
 }
diff --git a/apps/labrinth/src/models/v2/search.rs b/apps/labrinth/src/models/v2/search.rs
index 46865a47a5..5f617153bc 100644
--- a/apps/labrinth/src/models/v2/search.rs
+++ b/apps/labrinth/src/models/v2/search.rs
@@ -41,6 +41,7 @@ pub struct LegacyResultSearchProject {
     pub license: String,
     pub client_side: String,
     pub server_side: String,
+    pub environment: Vec<String>,
     pub gallery: Vec<String>,
     pub featured_gallery: Option<String>,
     pub color: Option<u32>,
@@ -118,6 +119,14 @@ impl LegacyResultSearchProject {
 
         let environment =
             get_one_string_loader_field("environment").unwrap_or("unknown");
+        let environments = result_search_project
+            .loader_fields
+            .get("environment")
+            .cloned()
+            .unwrap_or_default()
+            .into_iter()
+            .filter_map(|environment| environment.as_str().map(String::from))
+            .collect();
 
         let (client_side, server_side) =
             v2_reroute::convert_v3_environment_to_v2_side_types(
@@ -141,6 +150,7 @@ impl LegacyResultSearchProject {
             all_project_types: result_search_project.all_project_types,
             client_side,
             server_side,
+            environment: environments,
             versions,
             latest_version: result_search_project.version_id,
             categories,
diff --git a/apps/labrinth/tests/v2/search.rs b/apps/labrinth/tests/v2/search.rs
index cf27d5a0cf..510a21fde0 100644
--- a/apps/labrinth/tests/v2/search.rs
+++ b/apps/labrinth/tests/v2/search.rs
@@ -378,6 +378,7 @@ async fn search_projects() {
         for hit in client_side_optional_server_side_optional.hits {
             assert_eq!(hit.client_side, "optional".to_string());
             assert_eq!(hit.server_side, "optional".to_string());
+            assert_eq!(hit.environment, vec!["client_or_server".to_string()]);
         }
 
         // Ensure game_versions return correctly, but also correctly aggregated
diff --git a/apps/labrinth/tests/v2/version.rs b/apps/labrinth/tests/v2/version.rs
index 788a368421..6cf14aa4aa 100644
--- a/apps/labrinth/tests/v2/version.rs
+++ b/apps/labrinth/tests/v2/version.rs
@@ -7,7 +7,7 @@ use futures::StreamExt;
 use labrinth::{
     models::ids::VersionId,
     models::projects::{Loader, VersionStatus, VersionType},
-    models::v2::projects::LegacySideType,
+    models::v2::projects::{LegacySideType, LegacyVersion},
     routes::v2::version_file::FileUpdateData,
 };
 use serde_json::json;
@@ -550,6 +550,8 @@ async fn add_version_accepts_environment_v2() {
                 )
                 .await;
             assert_status!(&resp, StatusCode::OK);
+            let version: LegacyVersion = test::read_body_json(resp).await;
+            assert_eq!(version.environment, "server_only_client_optional");
 
             let project = api
                 .get_project_deserialized(
@@ -559,6 +561,10 @@ async fn add_version_accepts_environment_v2() {
                 .await;
             assert_eq!(project.client_side, LegacySideType::Optional);
             assert_eq!(project.server_side, LegacySideType::Required);
+            assert_eq!(
+                project.environment,
+                vec!["server_only_client_optional".to_string()]
+            );
         },
     )
     .await;
@@ -589,6 +595,10 @@ async fn create_project_initial_version_accepts_environment_v2() {
                 api.get_project_deserialized(slug, USER_USER_PAT).await;
             assert_eq!(project.client_side, LegacySideType::Required);
             assert_eq!(project.server_side, LegacySideType::Optional);
+            assert_eq!(
+                project.environment,
+                vec!["client_only_server_optional".to_string()]
+            );
         },
     )
     .await;

From 8b2438aebb8309c162406345a31fbfcf328f6342 Mon Sep 17 00:00:00 2001
From: "Calum H." <calum@modrinth.com>
Date: Mon, 10 Aug 2026 16:43:13 +0100
Subject: [PATCH 75/82] fix: Gifs in the project description are not working
 properly (#7076)

* fix: Gifs in the project description are not working properly
Fixes #3786

* prepr

---------

Co-authored-by: Prospector <6166773+Prospector@users.noreply.github.com>
---
 packages/utils/parse.ts | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/packages/utils/parse.ts b/packages/utils/parse.ts
index abf99a75c1..5243824b24 100644
--- a/packages/utils/parse.ts
+++ b/packages/utils/parse.ts
@@ -90,7 +90,7 @@ export const configuredXss = new FilterXSS({
 			!value.startsWith('data:')
 		) {
 			try {
-				const url = new URL(value)
+				const url = new URL(value.replaceAll('&amp;', '&'))
 
 				if (url.hostname.includes('wsrv.nl')) {
 					url.searchParams.delete('errorredirect')
@@ -124,16 +124,10 @@ export const configuredXss = new FilterXSS({
 					!allowedHostnames.includes(url.hostname) &&
 					!allowedHostnameSuffixes.some((suffix) => url.hostname.endsWith(suffix))
 				) {
-					return safeAttrValue(
-						tag,
-						name,
-						`https://wsrv.nl/?url=${encodeURIComponent(
-							url.toString().replaceAll('&amp;', '&'),
-						)}&n=-1`,
-						cssFilter,
-					)
+					const proxiedUrl = `https://wsrv.nl/?url=${encodeURIComponent(url.toString())}&n=-1`
+					return safeAttrValue(tag, name, proxiedUrl.replaceAll('&', '&amp;'), cssFilter)
 				}
-				return safeAttrValue(tag, name, url.toString(), cssFilter)
+				return safeAttrValue(tag, name, url.toString().replaceAll('&', '&amp;'), cssFilter)
 			} catch {
 				/* empty */
 			}

From f8f05ce91b6f58e8d085f934a1eeb959fad8760b Mon Sep 17 00:00:00 2001
From: aecsocket <43144841+aecsocket@users.noreply.github.com>
Date: Tue, 11 Aug 2026 00:48:23 +0900
Subject: [PATCH 76/82] fix: expose raw icon URL in project response (#7086)

* fix: expose raw icon URL in project response

* remove unnecessary test
---
 apps/labrinth/src/models/v2/projects.rs         | 2 ++
 apps/labrinth/src/models/v3/projects.rs         | 3 +++
 apps/labrinth/src/routes/v3/project_creation.rs | 1 +
 apps/labrinth/src/test/api_common/models.rs     | 1 +
 4 files changed, 7 insertions(+)

diff --git a/apps/labrinth/src/models/v2/projects.rs b/apps/labrinth/src/models/v2/projects.rs
index 4f00ed8486..4afd9dc877 100644
--- a/apps/labrinth/src/models/v2/projects.rs
+++ b/apps/labrinth/src/models/v2/projects.rs
@@ -58,6 +58,7 @@ pub struct LegacyProject {
     pub loaders: Vec<String>,
     pub versions: Vec<VersionId>,
     pub icon_url: Option<String>,
+    pub raw_icon_url: Option<String>,
     pub issues_url: Option<String>,
     pub source_url: Option<String>,
     pub wiki_url: Option<String>,
@@ -215,6 +216,7 @@ impl LegacyProject {
             loaders,
             versions: data.versions,
             icon_url: data.icon_url,
+            raw_icon_url: data.raw_icon_url,
             issues_url,
             source_url,
             wiki_url,
diff --git a/apps/labrinth/src/models/v3/projects.rs b/apps/labrinth/src/models/v3/projects.rs
index ac50b33228..c2479a88fc 100644
--- a/apps/labrinth/src/models/v3/projects.rs
+++ b/apps/labrinth/src/models/v3/projects.rs
@@ -79,6 +79,8 @@ pub struct Project {
     pub versions: Vec<VersionId>,
     /// The URL of the icon of the project
     pub icon_url: Option<String>,
+    /// The URL of the unoptimized icon of the project
+    pub raw_icon_url: Option<String>,
 
     /// A collection of links to the project's various pages.
     pub link_urls: HashMap<String, Link>,
@@ -193,6 +195,7 @@ impl From<ProjectQueryResult> for Project {
             loaders: m.loaders,
             versions: data.versions.into_iter().map(|v| v.into()).collect(),
             icon_url: m.icon_url,
+            raw_icon_url: m.raw_icon_url,
             link_urls: data
                 .urls
                 .into_iter()
diff --git a/apps/labrinth/src/routes/v3/project_creation.rs b/apps/labrinth/src/routes/v3/project_creation.rs
index e8f5adc972..ecb9967b36 100644
--- a/apps/labrinth/src/routes/v3/project_creation.rs
+++ b/apps/labrinth/src/routes/v3/project_creation.rs
@@ -1044,6 +1044,7 @@ async fn project_create_inner(
                 .map(|v| v.version_id.into())
                 .collect::<Vec<_>>(),
             icon_url: project_builder.icon_url.clone(),
+            raw_icon_url: project_builder.raw_icon_url.clone(),
             link_urls: project_builder
                 .link_urls
                 .clone()
diff --git a/apps/labrinth/src/test/api_common/models.rs b/apps/labrinth/src/test/api_common/models.rs
index 4c80e1b1c1..0dbc696a62 100644
--- a/apps/labrinth/src/test/api_common/models.rs
+++ b/apps/labrinth/src/test/api_common/models.rs
@@ -55,6 +55,7 @@ pub struct CommonProject {
     pub loaders: Vec<String>,
     pub versions: Vec<VersionId>,
     pub icon_url: Option<String>,
+    pub raw_icon_url: Option<String>,
     pub gallery: Vec<GalleryItem>,
     pub color: Option<u32>,
     pub thread_id: ThreadId,

From fda5c62bc659777047168d974fce3d60208f79be Mon Sep 17 00:00:00 2001
From: "Calum H." <calum@modrinth.com>
Date: Mon, 10 Aug 2026 18:25:52 +0100
Subject: [PATCH 77/82] fix: ignore extensions for mrpack warning modal (#6948)

---
 .../app-lib/src/api/pack/install_mrpack.rs     | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/packages/app-lib/src/api/pack/install_mrpack.rs b/packages/app-lib/src/api/pack/install_mrpack.rs
index 80d8c6f64b..b1a44c5130 100644
--- a/packages/app-lib/src/api/pack/install_mrpack.rs
+++ b/packages/app-lib/src/api/pack/install_mrpack.rs
@@ -1,4 +1,5 @@
 use crate::State;
+use crate::api::instance::CONFIG_FILE_EXTENSIONS;
 use crate::event::emit::loading_try_for_each_concurrent;
 use crate::install::{
     InstallErrorContext, InstallJobEventKind, InstallPhaseDetails,
@@ -43,6 +44,19 @@ type ExtractProgressFn<'a> = dyn FnMut(u64) -> Pin<Box<dyn Future<Output = crate
     + 'a;
 type HashProgressFn<'a> = dyn FnMut(u64) -> crate::Result<()> + Send + 'a;
 const MODPACK_CONTENT_DOWNLOAD_CONCURRENCY: usize = 4;
+const MRPACK_WARNING_IGNORED_EXTENSIONS: &[&str] = &["rpo"];
+
+fn is_ignored_mrpack_warning_file(path: &str) -> bool {
+    Path::new(path)
+        .extension()
+        .and_then(|extension| extension.to_str())
+        .is_some_and(|extension| {
+            CONFIG_FILE_EXTENSIONS
+                .iter()
+                .chain(MRPACK_WARNING_IGNORED_EXTENSIONS)
+                .any(|candidate| extension.eq_ignore_ascii_case(candidate))
+        })
+}
 
 #[derive(Clone)]
 struct ModpackContentInstallContext {
@@ -267,6 +281,9 @@ pub(crate) async fn get_external_files_from_mrpack(
         .into_iter()
         .filter_map(|file| {
             let path = file.path.as_str();
+            if is_ignored_mrpack_warning_file(path) {
+                return None;
+            }
             let hash = file.hashes.get(&PackFileHash::Sha1)?.clone();
             let file_name = path.rsplit('/').next()?.to_string();
             Some((file_name, hash))
@@ -371,6 +388,7 @@ fn external_override_relative_path(path: &str) -> Option<&str> {
         .strip_prefix("overrides/")
         .or_else(|| path.strip_prefix("client-overrides/"))?;
     (!path.ends_with('/')
+        && !is_ignored_mrpack_warning_file(relative_path)
         && ProjectType::get_from_parent_folder(relative_path).is_some())
     .then_some(relative_path)
 }

From 1ffcd675627a0bc4f098dfe0928aca75f25d4a50 Mon Sep 17 00:00:00 2001
From: Prospector <6166773+Prospector@users.noreply.github.com>
Date: Mon, 10 Aug 2026 10:36:01 -0700
Subject: [PATCH 78/82] changelog

---
 packages/blog/changelog.ts | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/packages/blog/changelog.ts b/packages/blog/changelog.ts
index 1e62b822f6..1b463b1c6b 100644
--- a/packages/blog/changelog.ts
+++ b/packages/blog/changelog.ts
@@ -10,6 +10,39 @@ export type VersionEntry = {
 }
 
 const VERSIONS: VersionEntry[] = [
+	{
+		date: `2026-08-10T17:34:55+00:00`,
+		product: 'app',
+		version: '0.17.5',
+		body: `## Changed
+- Common config file formats and RPO files are now hidden from the external modpack file warning modal.
+- Updated text in unknown file warning.
+- When viewing an instance's content in the app, content updates will now be checked immediately, rather than waiting for cache to be invalidated. It may take up to 10 minutes for updates to be shown in the content tab.
+- Updated translations. Want to help translate Modrinth App? [Click here](https://translate.modrinth.com)
+
+## Fixed
+- Fixed issue with animated GIFs sometimes not working in project page descriptions.
+- Fixed issue on Windows and Linux where the window close button was incorrectly coloured.
+- Fixed an issue when clicking content in the content tab of an instance it show a "Instance not found" notification
+- Fixed issue with the file information (name + file size) on the download button on project version pages not showing up.
+- Fixed broken buttons on the "Minecraft account required" modal on Windows.
+- Fixed the right sidebar closing when collapsing friend list sections when using the "Hide right sidebar" option.`,
+	},
+	{
+		date: `2026-08-10T17:34:55+00:00`,
+		product: 'web',
+		body: `## Changed
+- Updated translations. Want to help translate the Modrinth website? [Click here](https://translate.modrinth.com)
+
+## Fixed
+- Fixed issue with animated GIFs sometimes not working in project page descriptions.`,
+	},
+	{
+		date: `2026-08-10T17:34:55+00:00`,
+		product: 'hosting',
+		body: `## Changed
+- Updated translations. Want to help translate Modrinth Hosting? [Click here](https://translate.modrinth.com)`,
+	},
 	{
 		date: `2026-08-08T19:10:34+00:00`,
 		product: 'web',

From 66628fd69de3131ad45ad971bf93f83e82893ec0 Mon Sep 17 00:00:00 2001
From: Prospector <6166773+Prospector@users.noreply.github.com>
Date: Mon, 10 Aug 2026 11:17:13 -0700
Subject: [PATCH 79/82] add reddit and youtube as socials (#7092)

---
 apps/frontend/src/components/ui/ModrinthFooter.vue | 14 ++++++++++----
 apps/frontend/src/locales/cs-CZ/index.json         |  3 ---
 apps/frontend/src/locales/da-DK/index.json         |  3 ---
 apps/frontend/src/locales/de-CH/index.json         |  3 ---
 apps/frontend/src/locales/de-DE/index.json         |  3 ---
 apps/frontend/src/locales/en-US/index.json         |  9 ++++++---
 apps/frontend/src/locales/es-419/index.json        |  3 ---
 apps/frontend/src/locales/es-ES/index.json         |  3 ---
 apps/frontend/src/locales/fi-FI/index.json         |  3 ---
 apps/frontend/src/locales/fil-PH/index.json        |  3 ---
 apps/frontend/src/locales/fr-FR/index.json         |  3 ---
 apps/frontend/src/locales/he-IL/index.json         |  3 ---
 apps/frontend/src/locales/hu-HU/index.json         |  3 ---
 apps/frontend/src/locales/id-ID/index.json         |  3 ---
 apps/frontend/src/locales/it-IT/index.json         |  3 ---
 apps/frontend/src/locales/ja-JP/index.json         |  3 ---
 apps/frontend/src/locales/ko-KR/index.json         |  3 ---
 apps/frontend/src/locales/ms-MY/index.json         |  3 ---
 apps/frontend/src/locales/nl-NL/index.json         |  3 ---
 apps/frontend/src/locales/no-NO/index.json         |  3 ---
 apps/frontend/src/locales/pl-PL/index.json         |  3 ---
 apps/frontend/src/locales/pt-BR/index.json         |  3 ---
 apps/frontend/src/locales/pt-PT/index.json         |  3 ---
 apps/frontend/src/locales/ro-RO/index.json         |  3 ---
 apps/frontend/src/locales/ru-RU/index.json         |  3 ---
 apps/frontend/src/locales/sr-CS/index.json         |  3 ---
 apps/frontend/src/locales/sv-SE/index.json         |  3 ---
 apps/frontend/src/locales/tr-TR/index.json         |  3 ---
 apps/frontend/src/locales/uk-UA/index.json         |  3 ---
 apps/frontend/src/locales/vi-VN/index.json         |  3 ---
 apps/frontend/src/locales/zh-CN/index.json         |  3 ---
 apps/frontend/src/locales/zh-TW/index.json         |  3 ---
 32 files changed, 16 insertions(+), 97 deletions(-)

diff --git a/apps/frontend/src/components/ui/ModrinthFooter.vue b/apps/frontend/src/components/ui/ModrinthFooter.vue
index 84da60b415..f78c681e5e 100644
--- a/apps/frontend/src/components/ui/ModrinthFooter.vue
+++ b/apps/frontend/src/components/ui/ModrinthFooter.vue
@@ -2,10 +2,11 @@
 import {
 	BlueskyIcon,
 	DiscordIcon,
-	GithubIcon,
 	MastodonIcon,
+	RedditIcon,
 	ToggleRightIcon,
 	TwitterIcon,
+	YouTubeIcon,
 } from '@modrinth/assets'
 import { Button, ButtonLink } from '@modrinth/ui'
 import {
@@ -94,9 +95,14 @@ const socialLinks: {
 		icon: TwitterIcon,
 	},
 	{
-		label: defineMessage({ id: 'layout.footer.social.github', defaultMessage: 'GitHub' }),
-		href: 'https://github.com/modrinth',
-		icon: GithubIcon,
+		label: defineMessage({ id: 'layout.footer.social.youtube', defaultMessage: 'YouTube' }),
+		href: 'https://www.youtube.com/@modrinth',
+		icon: YouTubeIcon,
+	},
+	{
+		label: defineMessage({ id: 'layout.footer.social.reddit', defaultMessage: 'Reddit' }),
+		href: 'https://www.reddit.com/r/Modrinth',
+		icon: RedditIcon,
 	},
 ]
 
diff --git a/apps/frontend/src/locales/cs-CZ/index.json b/apps/frontend/src/locales/cs-CZ/index.json
index 4fbc4ff613..46070c8336 100644
--- a/apps/frontend/src/locales/cs-CZ/index.json
+++ b/apps/frontend/src/locales/cs-CZ/index.json
@@ -1919,9 +1919,6 @@
   "layout.footer.social.discord": {
     "message": "Discord"
   },
-  "layout.footer.social.github": {
-    "message": "GitHub"
-  },
   "layout.footer.social.mastodon": {
     "message": "Mastodon"
   },
diff --git a/apps/frontend/src/locales/da-DK/index.json b/apps/frontend/src/locales/da-DK/index.json
index 81e4a243e6..2c0ad25da5 100644
--- a/apps/frontend/src/locales/da-DK/index.json
+++ b/apps/frontend/src/locales/da-DK/index.json
@@ -1952,9 +1952,6 @@
   "layout.footer.social.discord": {
     "message": "Discord"
   },
-  "layout.footer.social.github": {
-    "message": "GitHub"
-  },
   "layout.footer.social.mastodon": {
     "message": "Mastodon"
   },
diff --git a/apps/frontend/src/locales/de-CH/index.json b/apps/frontend/src/locales/de-CH/index.json
index b8b3aa2af2..6da134b19c 100644
--- a/apps/frontend/src/locales/de-CH/index.json
+++ b/apps/frontend/src/locales/de-CH/index.json
@@ -2846,9 +2846,6 @@
   "layout.footer.social.discord": {
     "message": "Discord"
   },
-  "layout.footer.social.github": {
-    "message": "GitHub"
-  },
   "layout.footer.social.mastodon": {
     "message": "Mastodon"
   },
diff --git a/apps/frontend/src/locales/de-DE/index.json b/apps/frontend/src/locales/de-DE/index.json
index 7ba841ab1d..0b4913ed5d 100644
--- a/apps/frontend/src/locales/de-DE/index.json
+++ b/apps/frontend/src/locales/de-DE/index.json
@@ -2846,9 +2846,6 @@
   "layout.footer.social.discord": {
     "message": "Discord"
   },
-  "layout.footer.social.github": {
-    "message": "GitHub"
-  },
   "layout.footer.social.mastodon": {
     "message": "Mastodon"
   },
diff --git a/apps/frontend/src/locales/en-US/index.json b/apps/frontend/src/locales/en-US/index.json
index 812e796be1..77f8cb79ef 100644
--- a/apps/frontend/src/locales/en-US/index.json
+++ b/apps/frontend/src/locales/en-US/index.json
@@ -2846,15 +2846,18 @@
   "layout.footer.social.discord": {
     "message": "Discord"
   },
-  "layout.footer.social.github": {
-    "message": "GitHub"
-  },
   "layout.footer.social.mastodon": {
     "message": "Mastodon"
   },
+  "layout.footer.social.reddit": {
+    "message": "Reddit"
+  },
   "layout.footer.social.x": {
     "message": "X"
   },
+  "layout.footer.social.youtube": {
+    "message": "YouTube"
+  },
   "layout.footer.unknown-commit": {
     "message": "unknown"
   },
diff --git a/apps/frontend/src/locales/es-419/index.json b/apps/frontend/src/locales/es-419/index.json
index d5069e614b..70705a81d1 100644
--- a/apps/frontend/src/locales/es-419/index.json
+++ b/apps/frontend/src/locales/es-419/index.json
@@ -2846,9 +2846,6 @@
   "layout.footer.social.discord": {
     "message": "Discord"
   },
-  "layout.footer.social.github": {
-    "message": "GitHub"
-  },
   "layout.footer.social.mastodon": {
     "message": "Mastodon"
   },
diff --git a/apps/frontend/src/locales/es-ES/index.json b/apps/frontend/src/locales/es-ES/index.json
index d9e784de46..8f9330611e 100644
--- a/apps/frontend/src/locales/es-ES/index.json
+++ b/apps/frontend/src/locales/es-ES/index.json
@@ -2588,9 +2588,6 @@
   "layout.footer.social.discord": {
     "message": "Discord"
   },
-  "layout.footer.social.github": {
-    "message": "GitHub"
-  },
   "layout.footer.social.mastodon": {
     "message": "Mastodon"
   },
diff --git a/apps/frontend/src/locales/fi-FI/index.json b/apps/frontend/src/locales/fi-FI/index.json
index b49d334a9c..53a233d500 100644
--- a/apps/frontend/src/locales/fi-FI/index.json
+++ b/apps/frontend/src/locales/fi-FI/index.json
@@ -863,9 +863,6 @@
   "layout.footer.social.discord": {
     "message": "Discord"
   },
-  "layout.footer.social.github": {
-    "message": "GitHub"
-  },
   "layout.footer.social.mastodon": {
     "message": "Mastodon"
   },
diff --git a/apps/frontend/src/locales/fil-PH/index.json b/apps/frontend/src/locales/fil-PH/index.json
index ba75875867..c8011e3825 100644
--- a/apps/frontend/src/locales/fil-PH/index.json
+++ b/apps/frontend/src/locales/fil-PH/index.json
@@ -1799,9 +1799,6 @@
   "layout.footer.social.discord": {
     "message": "Discord"
   },
-  "layout.footer.social.github": {
-    "message": "GitHub"
-  },
   "layout.footer.social.mastodon": {
     "message": "Mastodon"
   },
diff --git a/apps/frontend/src/locales/fr-FR/index.json b/apps/frontend/src/locales/fr-FR/index.json
index 8b3e315a02..ea6dae4ebb 100644
--- a/apps/frontend/src/locales/fr-FR/index.json
+++ b/apps/frontend/src/locales/fr-FR/index.json
@@ -2846,9 +2846,6 @@
   "layout.footer.social.discord": {
     "message": "Discord"
   },
-  "layout.footer.social.github": {
-    "message": "GitHub"
-  },
   "layout.footer.social.mastodon": {
     "message": "Mastodon"
   },
diff --git a/apps/frontend/src/locales/he-IL/index.json b/apps/frontend/src/locales/he-IL/index.json
index 7e60f1660f..57c504b3a1 100644
--- a/apps/frontend/src/locales/he-IL/index.json
+++ b/apps/frontend/src/locales/he-IL/index.json
@@ -1568,9 +1568,6 @@
   "layout.footer.social.discord": {
     "message": "דיסקורד"
   },
-  "layout.footer.social.github": {
-    "message": "GitHub"
-  },
   "layout.footer.social.mastodon": {
     "message": "מסטודון"
   },
diff --git a/apps/frontend/src/locales/hu-HU/index.json b/apps/frontend/src/locales/hu-HU/index.json
index 6c167fa787..91ac8997da 100644
--- a/apps/frontend/src/locales/hu-HU/index.json
+++ b/apps/frontend/src/locales/hu-HU/index.json
@@ -2672,9 +2672,6 @@
   "layout.footer.social.discord": {
     "message": "Discord"
   },
-  "layout.footer.social.github": {
-    "message": "GitHub"
-  },
   "layout.footer.social.mastodon": {
     "message": "Mastodon"
   },
diff --git a/apps/frontend/src/locales/id-ID/index.json b/apps/frontend/src/locales/id-ID/index.json
index 705302bffd..e77f7c2036 100644
--- a/apps/frontend/src/locales/id-ID/index.json
+++ b/apps/frontend/src/locales/id-ID/index.json
@@ -1811,9 +1811,6 @@
   "layout.footer.social.discord": {
     "message": "Discord"
   },
-  "layout.footer.social.github": {
-    "message": "GitHub"
-  },
   "layout.footer.social.mastodon": {
     "message": "Mastodon"
   },
diff --git a/apps/frontend/src/locales/it-IT/index.json b/apps/frontend/src/locales/it-IT/index.json
index 29077a6619..4265bbd626 100644
--- a/apps/frontend/src/locales/it-IT/index.json
+++ b/apps/frontend/src/locales/it-IT/index.json
@@ -2837,9 +2837,6 @@
   "layout.footer.social.discord": {
     "message": "Discord"
   },
-  "layout.footer.social.github": {
-    "message": "GitHub"
-  },
   "layout.footer.social.mastodon": {
     "message": "Mastodon"
   },
diff --git a/apps/frontend/src/locales/ja-JP/index.json b/apps/frontend/src/locales/ja-JP/index.json
index e46d08e8aa..04a907c2fe 100644
--- a/apps/frontend/src/locales/ja-JP/index.json
+++ b/apps/frontend/src/locales/ja-JP/index.json
@@ -2378,9 +2378,6 @@
   "layout.footer.social.discord": {
     "message": "Discord"
   },
-  "layout.footer.social.github": {
-    "message": "Github"
-  },
   "layout.footer.social.mastodon": {
     "message": "Mastodon"
   },
diff --git a/apps/frontend/src/locales/ko-KR/index.json b/apps/frontend/src/locales/ko-KR/index.json
index 280d47f8af..9b9387d859 100644
--- a/apps/frontend/src/locales/ko-KR/index.json
+++ b/apps/frontend/src/locales/ko-KR/index.json
@@ -2846,9 +2846,6 @@
   "layout.footer.social.discord": {
     "message": "Discord"
   },
-  "layout.footer.social.github": {
-    "message": "GitHub"
-  },
   "layout.footer.social.mastodon": {
     "message": "Mastodon"
   },
diff --git a/apps/frontend/src/locales/ms-MY/index.json b/apps/frontend/src/locales/ms-MY/index.json
index c12e695005..84bac2a7ff 100644
--- a/apps/frontend/src/locales/ms-MY/index.json
+++ b/apps/frontend/src/locales/ms-MY/index.json
@@ -2336,9 +2336,6 @@
   "layout.footer.social.discord": {
     "message": "Discord"
   },
-  "layout.footer.social.github": {
-    "message": "GitHub"
-  },
   "layout.footer.social.mastodon": {
     "message": "Mastodon"
   },
diff --git a/apps/frontend/src/locales/nl-NL/index.json b/apps/frontend/src/locales/nl-NL/index.json
index 3737f3dd03..7ac9bb1301 100644
--- a/apps/frontend/src/locales/nl-NL/index.json
+++ b/apps/frontend/src/locales/nl-NL/index.json
@@ -2843,9 +2843,6 @@
   "layout.footer.social.discord": {
     "message": "Discord "
   },
-  "layout.footer.social.github": {
-    "message": "GitHub"
-  },
   "layout.footer.social.mastodon": {
     "message": "Mastodon"
   },
diff --git a/apps/frontend/src/locales/no-NO/index.json b/apps/frontend/src/locales/no-NO/index.json
index f401ca004f..ced17e67b7 100644
--- a/apps/frontend/src/locales/no-NO/index.json
+++ b/apps/frontend/src/locales/no-NO/index.json
@@ -2255,9 +2255,6 @@
   "layout.footer.social.discord": {
     "message": "Discord"
   },
-  "layout.footer.social.github": {
-    "message": "Github"
-  },
   "layout.footer.social.mastodon": {
     "message": "Mastodon"
   },
diff --git a/apps/frontend/src/locales/pl-PL/index.json b/apps/frontend/src/locales/pl-PL/index.json
index ad21f7072c..a89fda06ed 100644
--- a/apps/frontend/src/locales/pl-PL/index.json
+++ b/apps/frontend/src/locales/pl-PL/index.json
@@ -2840,9 +2840,6 @@
   "layout.footer.social.discord": {
     "message": "Discord"
   },
-  "layout.footer.social.github": {
-    "message": "GitHub"
-  },
   "layout.footer.social.mastodon": {
     "message": "Mastodon"
   },
diff --git a/apps/frontend/src/locales/pt-BR/index.json b/apps/frontend/src/locales/pt-BR/index.json
index a33ea06456..b2c2c4c0e4 100644
--- a/apps/frontend/src/locales/pt-BR/index.json
+++ b/apps/frontend/src/locales/pt-BR/index.json
@@ -2846,9 +2846,6 @@
   "layout.footer.social.discord": {
     "message": "Discord"
   },
-  "layout.footer.social.github": {
-    "message": "GitHub"
-  },
   "layout.footer.social.mastodon": {
     "message": "Mastodon"
   },
diff --git a/apps/frontend/src/locales/pt-PT/index.json b/apps/frontend/src/locales/pt-PT/index.json
index d39fb90970..a164e82bfa 100644
--- a/apps/frontend/src/locales/pt-PT/index.json
+++ b/apps/frontend/src/locales/pt-PT/index.json
@@ -2153,9 +2153,6 @@
   "layout.footer.social.discord": {
     "message": "Discord"
   },
-  "layout.footer.social.github": {
-    "message": "GitHub"
-  },
   "layout.footer.social.mastodon": {
     "message": "Mastodon"
   },
diff --git a/apps/frontend/src/locales/ro-RO/index.json b/apps/frontend/src/locales/ro-RO/index.json
index 819f979afe..91d814659d 100644
--- a/apps/frontend/src/locales/ro-RO/index.json
+++ b/apps/frontend/src/locales/ro-RO/index.json
@@ -1076,9 +1076,6 @@
   "layout.footer.social.discord": {
     "message": "Discord"
   },
-  "layout.footer.social.github": {
-    "message": "GitHub"
-  },
   "layout.footer.social.mastodon": {
     "message": "Mastodon"
   },
diff --git a/apps/frontend/src/locales/ru-RU/index.json b/apps/frontend/src/locales/ru-RU/index.json
index 79eed0f35f..60114e64fa 100644
--- a/apps/frontend/src/locales/ru-RU/index.json
+++ b/apps/frontend/src/locales/ru-RU/index.json
@@ -2840,9 +2840,6 @@
   "layout.footer.social.discord": {
     "message": "Discord"
   },
-  "layout.footer.social.github": {
-    "message": "GitHub"
-  },
   "layout.footer.social.mastodon": {
     "message": "Mastodon"
   },
diff --git a/apps/frontend/src/locales/sr-CS/index.json b/apps/frontend/src/locales/sr-CS/index.json
index d91e5d1fe2..5f933b6205 100644
--- a/apps/frontend/src/locales/sr-CS/index.json
+++ b/apps/frontend/src/locales/sr-CS/index.json
@@ -1121,9 +1121,6 @@
   "layout.footer.social.discord": {
     "message": "Discord"
   },
-  "layout.footer.social.github": {
-    "message": "GitHub"
-  },
   "layout.footer.social.mastodon": {
     "message": "Mastodon"
   },
diff --git a/apps/frontend/src/locales/sv-SE/index.json b/apps/frontend/src/locales/sv-SE/index.json
index 639c183cb6..a8289ed97a 100644
--- a/apps/frontend/src/locales/sv-SE/index.json
+++ b/apps/frontend/src/locales/sv-SE/index.json
@@ -2567,9 +2567,6 @@
   "layout.footer.social.discord": {
     "message": "Discord"
   },
-  "layout.footer.social.github": {
-    "message": "GitHub"
-  },
   "layout.footer.social.mastodon": {
     "message": "Mastodon"
   },
diff --git a/apps/frontend/src/locales/tr-TR/index.json b/apps/frontend/src/locales/tr-TR/index.json
index d8c8d5df7d..f5de03b251 100644
--- a/apps/frontend/src/locales/tr-TR/index.json
+++ b/apps/frontend/src/locales/tr-TR/index.json
@@ -2645,9 +2645,6 @@
   "layout.footer.social.discord": {
     "message": "Discord"
   },
-  "layout.footer.social.github": {
-    "message": "GitHub"
-  },
   "layout.footer.social.mastodon": {
     "message": "Mastodon"
   },
diff --git a/apps/frontend/src/locales/uk-UA/index.json b/apps/frontend/src/locales/uk-UA/index.json
index f5a0c3b5f1..ba89bb1d97 100644
--- a/apps/frontend/src/locales/uk-UA/index.json
+++ b/apps/frontend/src/locales/uk-UA/index.json
@@ -2843,9 +2843,6 @@
   "layout.footer.social.discord": {
     "message": "Discord"
   },
-  "layout.footer.social.github": {
-    "message": "GitHub"
-  },
   "layout.footer.social.mastodon": {
     "message": "Mastodon"
   },
diff --git a/apps/frontend/src/locales/vi-VN/index.json b/apps/frontend/src/locales/vi-VN/index.json
index 8caa0b4214..aa84df81e0 100644
--- a/apps/frontend/src/locales/vi-VN/index.json
+++ b/apps/frontend/src/locales/vi-VN/index.json
@@ -2489,9 +2489,6 @@
   "layout.footer.social.discord": {
     "message": "Discord"
   },
-  "layout.footer.social.github": {
-    "message": "GitHub"
-  },
   "layout.footer.social.mastodon": {
     "message": "Mastodon"
   },
diff --git a/apps/frontend/src/locales/zh-CN/index.json b/apps/frontend/src/locales/zh-CN/index.json
index 40eaa4e281..f3c4e11255 100644
--- a/apps/frontend/src/locales/zh-CN/index.json
+++ b/apps/frontend/src/locales/zh-CN/index.json
@@ -2846,9 +2846,6 @@
   "layout.footer.social.discord": {
     "message": "Discord"
   },
-  "layout.footer.social.github": {
-    "message": "GitHub"
-  },
   "layout.footer.social.mastodon": {
     "message": "Mastodon"
   },
diff --git a/apps/frontend/src/locales/zh-TW/index.json b/apps/frontend/src/locales/zh-TW/index.json
index dd80cf2123..77251debff 100644
--- a/apps/frontend/src/locales/zh-TW/index.json
+++ b/apps/frontend/src/locales/zh-TW/index.json
@@ -2846,9 +2846,6 @@
   "layout.footer.social.discord": {
     "message": "Discord"
   },
-  "layout.footer.social.github": {
-    "message": "GitHub"
-  },
   "layout.footer.social.mastodon": {
     "message": "Mastodon"
   },

From 759f67a551ed0af23ba978dba799fe0c97ad3611 Mon Sep 17 00:00:00 2001
From: Prospector <6166773+Prospector@users.noreply.github.com>
Date: Mon, 10 Aug 2026 11:17:45 -0700
Subject: [PATCH 80/82] changelog

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

diff --git a/packages/blog/changelog.ts b/packages/blog/changelog.ts
index 1b463b1c6b..436c99a12c 100644
--- a/packages/blog/changelog.ts
+++ b/packages/blog/changelog.ts
@@ -10,6 +10,12 @@ export type VersionEntry = {
 }
 
 const VERSIONS: VersionEntry[] = [
+	{
+		date: `2026-08-10T18:17:39+00:00`,
+		product: 'web',
+		body: `## Added
+- Added official Modrinth subreddit and YouTube channel to footer, replacing GitHub which is already included below.`,
+	},
 	{
 		date: `2026-08-10T17:34:55+00:00`,
 		product: 'app',

From ca8c5a717fc8605ac6b5d83a58f50731c096693e Mon Sep 17 00:00:00 2001
From: jade <jade@lilydev.com>
Date: Mon, 10 Aug 2026 13:47:33 -0500
Subject: [PATCH 81/82] fix: unique preview toggle ID in MarkdownEditor (#7093)

fix: preview toggle in MD editor targets other MD editors
---
 packages/ui/src/components/base/MarkdownEditor.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/ui/src/components/base/MarkdownEditor.vue b/packages/ui/src/components/base/MarkdownEditor.vue
index 707341cbf2..62a6eea965 100644
--- a/packages/ui/src/components/base/MarkdownEditor.vue
+++ b/packages/ui/src/components/base/MarkdownEditor.vue
@@ -243,8 +243,8 @@
 					</template>
 				</div>
 				<div class="flex items-center gap-2">
-					<Toggle id="preview" v-model="previewMode" small />
-					<label class="label" for="preview">
+					<Toggle :id="previewId" v-model="previewMode" small />
+					<label class="label" :for="previewId">
 						{{ formatMessage(messages.editorPreviewToggleLabel) }}
 					</label>
 				</div>
@@ -324,7 +324,7 @@ import {
 } from '@modrinth/assets'
 import { markdownCommands, modrinthMarkdownEditorKeymap } from '@modrinth/utils/codemirror'
 import { renderHighlightedString } from '@modrinth/utils/highlightjs'
-import { type Component, computed, onBeforeUnmount, onMounted, ref, toRef, watch } from 'vue'
+import { type Component, computed, onBeforeUnmount, onMounted, ref, toRef, useId, watch } from 'vue'
 
 import { Button, IconButton } from '#ui/components/base/buttons'
 
@@ -567,6 +567,8 @@ let editor: EditorView | null = null
 let isDisabledCompartment: Compartment | null = null
 let editorThemeCompartment: Compartment | null = null
 
+const previewId = useId()
+
 const emit = defineEmits(['update:modelValue'])
 const resolvedPlaceholder = computed(
 	() => props.placeholder ?? formatMessage(messages.editorPlaceholder),

From 26e05ee9e551aa223d7ab2387ac3b7eb18e1ab36 Mon Sep 17 00:00:00 2001
From: Prospector <6166773+Prospector@users.noreply.github.com>
Date: Mon, 10 Aug 2026 14:30:00 -0700
Subject: [PATCH 82/82] update API docs to add environment fields (#7096)

* update API docs to add environment fields

* fix unknown on create/patch routes
---
 apps/docs/public/openapi.yaml                 | 760 +++++++++++-------
 apps/frontend/src/public/news/feed/rss.xml    |   6 +-
 packages/blog/articles/new-environments.md    |   2 +-
 .../blog/compiled/new_environments.content.ts |   2 +-
 4 files changed, 480 insertions(+), 290 deletions(-)

diff --git a/apps/docs/public/openapi.yaml b/apps/docs/public/openapi.yaml
index 0e098712ea..db44ff83d6 100644
--- a/apps/docs/public/openapi.yaml
+++ b/apps/docs/public/openapi.yaml
@@ -414,6 +414,35 @@ components:
         - unknown
         - signature
       example: required-resource-pack
+    EnvironmentEnum:
+      type: string
+      enum:
+        - 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
+      example: client_and_server
+      description: 'The environment a project or version supports. For an explanation of each environment, see the blog post here: https://modrinth.com/news/article/new-environments/#new-system'
+    EnvironmentInputEnum:
+      type: string
+      enum:
+        - 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
+      example: client_and_server
+      description: 'The environment a version supports. For an explanation of each environment, see the blog post here: https://modrinth.com/news/article/new-environments/#new-system'
     # https://github.com/modrinth/code/blob/main/apps/labrinth/src/routes/v2/version_creation.rs#L32-L76
     CreatableVersion:
       allOf:
@@ -433,19 +462,7 @@ components:
               type: string
               description: The multipart field name of the primary file
             environment:
-              type: string
-              enum:
-                - 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
-              description: The environment that this version is for.
+              $ref: '#/components/schemas/EnvironmentInputEnum'
             file_types:
               type: object
               additionalProperties:
@@ -496,6 +513,8 @@ components:
               deprecated: true
               example: null
               nullable: true
+            environment:
+              $ref: '#/components/schemas/EnvironmentEnum'
             files:
               type: array
               items:
@@ -514,6 +533,7 @@ components:
             - version_type
             - loaders
             - featured
+            - environment
     VersionFile:
       type: object
       properties:
@@ -627,9 +647,160 @@ components:
           required:
             - loaders
             - game_versions
-    # Project
-    # Fields that can be used in everything. Search, direct project lookup, project editing, you name it.
-    BaseProject:
+    # Search hit from GET /search
+    ProjectResult:
+      type: object
+      properties:
+        project_id:
+          type: string
+          description: The ID of the project, encoded as a base62 string
+          example: AABBCCDD
+        project_type:
+          type: string
+          enum: [mod, modpack, resourcepack, shader]
+          description: The project type of the project
+          example: mod
+        all_project_types:
+          type: array
+          items:
+            type: string
+            enum: [mod, resourcepack, datapack, shader, modpack, plugin]
+          description: All project types across every version of the project, unlike `project_type` which only reflects a version-specific type
+          example: [mod, plugin, datapack]
+        title:
+          type: string
+          description: The title or name of the project
+        description:
+          type: string
+          description: A short sentence summarizing the project, no more than a sentence or two.
+        author:
+          type: string
+          description: The username of the project's author
+          example: my_user
+        categories:
+          type: array
+          items:
+            type: string
+          example: [technology, adventure, fabric]
+          description: A list of the featured categories that the project has.
+        display_categories:
+          type: array
+          items:
+            type: string
+          description: A list of the featured categories that the project has. Equivalent to `categories` on the project itself.
+          example: ['technology', 'fabric']
+        versions:
+          type: array
+          items:
+            type: string
+          description: A list of the minecraft versions supported by the project
+          example: ['1.8', '1.8.9']
+        downloads:
+          type: integer
+          description: The total number of downloads of the project
+        follows:
+          type: integer
+          description: The total number of users following the project
+        icon_url:
+          type: string
+          example: https://cdn.modrinth.com/data/AABBCCDD/b46513nd83hb4792a9a0e1fn28fgi6090c1842639.png
+          description: The URL of the project's icon
+        date_created:
+          type: string
+          format: ISO-8601
+          description: The date the project was created
+        date_modified:
+          type: string
+          format: ISO-8601
+          description: The date the latest version of the project was created
+        latest_version:
+          type: string
+          description: The ID of the latest version of the project
+          example: IIJJKKLL
+        license:
+          type: string
+          description: The SPDX license ID of a project
+          example: MIT
+        environment:
+          type: array
+          items:
+            $ref: '#/components/schemas/EnvironmentEnum'
+          description: 'All the environments that versions of this project support. Not in any particular order, we recommend using the environment information on a version instead. For an explanation of each environment, see the blog post here: https://modrinth.com/news/article/new-environments/#new-system'
+          example: [client_and_server]
+        gallery:
+          type: array
+          description: A list of images that have been uploaded to the project's gallery
+          example:
+            [
+              'https://cdn.modrinth.com/data/AABBCCDD/images/009b7d8d6e8bf04968a29421117c59b3efe2351a.png',
+              'https://cdn.modrinth.com/data/AABBCCDD/images/c21776867afb6046fdc3c21dbcf5cc50ae27a236.png',
+            ]
+          items:
+            type: string
+        slug:
+          type: string
+          description: "The slug of a project, used for vanity URLs. Regex: ```^[\\w!@$()`.+,\"\\-']{3,64}$```"
+          example: my_project
+          nullable: true
+        author_id:
+          type: string
+          description: The ID of the project's author
+          example: EEFFGGHH
+          nullable: true
+        organization:
+          type: string
+          description: The name of the organization that owns this project
+          example: my_org
+          nullable: true
+        organization_id:
+          type: string
+          description: The ID of the organization that owns this project
+          example: AABBCCDD
+          nullable: true
+        featured_gallery:
+          type: string
+          description: The featured gallery image of the project
+          nullable: true
+        color:
+          type: integer
+          example: 8703084
+          description: The RGB color of the project, automatically generated from the project icon
+          nullable: true
+        client_side:
+          type: string
+          enum: [required, optional, unsupported, unknown]
+          description: Deprecated - use `environment` instead. The client side support of the project
+          example: required
+          deprecated: true
+        server_side:
+          type: string
+          enum: [required, optional, unsupported, unknown]
+          description: Deprecated - use `environment` instead. The server side support of the project
+          example: optional
+          deprecated: true
+      required:
+        - project_id
+        - project_type
+        - all_project_types
+        - title
+        - description
+        - author
+        - categories
+        - display_categories
+        - versions
+        - downloads
+        - follows
+        - icon_url
+        - date_created
+        - date_modified
+        - latest_version
+        - license
+        - environment
+        - gallery
+        - client_side
+        - server_side
+    # Fields shared by create/edit project request bodies
+    NonSearchProject:
       type: object
       properties:
         slug:
@@ -639,203 +810,84 @@ components:
         title:
           type: string
           description: The title or name of the project
-          example: My Project
         description:
           type: string
-          description: A short description of the project
-          example: A short description
+          description: A short sentence summarizing the project, no more than a sentence or two.
+        body:
+          type: string
+          description: A long form description of the project
+          example: A long body describing my project in detail
         categories:
           type: array
           items:
             type: string
           example: [technology, adventure, fabric]
-          description: A list of the categories that the project has
+          description: A list of the featured categories that the project has.
+        additional_categories:
+          type: array
+          items:
+            type: string
+          description: A list of additional categories that the project also has. These are supplementary to the featured categories, and does not include them again.
+          example: [technology, adventure, fabric]
+        status:
+          type: string
+          enum:
+            [
+              approved,
+              archived,
+              rejected,
+              draft,
+              unlisted,
+              processing,
+              withheld,
+              scheduled,
+              private,
+              unknown,
+            ]
+          description: The status of the project
+          example: approved
+        requested_status:
+          type: string
+          enum: [approved, archived, unlisted, private, draft]
+          description: The requested status when submitting for review or scheduling the project for release. Approved status refers to "Public" visibility.
+          nullable: true
+        issues_url:
+          type: string
+          description: An optional link to where to submit bugs or issues with the project
+          example: https://github.com/modrinth/code/issues
+          nullable: true
+        source_url:
+          type: string
+          description: An optional link to the source code of the project
+          example: https://github.com/modrinth/code
+          nullable: true
+        wiki_url:
+          type: string
+          description: An optional link to the project's wiki page or other relevant information
+          example: https://github.com/modrinth/code/wiki
+          nullable: true
+        discord_url:
+          type: string
+          description: An optional invite link to the project's discord.
+          example: https://discord.gg/modrinth
+          nullable: true
+        donation_urls:
+          type: array
+          items:
+            $ref: '#/components/schemas/ProjectDonationURL'
+          description: A list of donation links for the project
         client_side:
           type: string
-          enum: [required, optional, unsupported, unknown]
-          description: The client side support of the project
+          enum: [required, optional, unsupported]
+          description: Deprecated - use `environment` instead.
           example: required
+          deprecated: true
         server_side:
           type: string
-          enum: [required, optional, unsupported, unknown]
-          description: The server side support of the project
+          enum: [required, optional, unsupported]
+          description: Deprecated - use `environment` instead.
           example: optional
-    # Fields added to search results and direct project lookups that cannot be edited.
-    ServerRenderedProject:
-      allOf:
-        - $ref: '#/components/schemas/BaseProject'
-        - type: object
-          properties:
-            project_type:
-              type: string
-              enum: [mod, modpack, resourcepack, shader]
-              description: The project type of the project
-              example: mod
-            downloads:
-              type: integer
-              description: The total number of downloads of the project
-            icon_url:
-              type: string
-              example: https://cdn.modrinth.com/data/AABBCCDD/b46513nd83hb4792a9a0e1fn28fgi6090c1842639.png
-              description: The URL of the project's icon
-              nullable: true
-            color:
-              type: integer
-              example: 8703084
-              description: The RGB color of the project, automatically generated from the project icon
-              nullable: true
-            thread_id:
-              type: string
-              example: TTUUVVWW
-              description: The ID of the moderation thread associated with this project
-            monetization_status:
-              type: string
-              enum: [monetized, demonetized, force-demonetized]
-          required:
-            - project_type
-            - downloads
-    # The actual result in search.
-    ProjectResult:
-      allOf:
-        - $ref: '#/components/schemas/ServerRenderedProject'
-        - type: object
-          properties:
-            project_id:
-              type: string
-              description: The ID of the project
-              example: AABBCCDD
-            all_project_types:
-              type: array
-              items:
-                type: string
-              description: All project types across every version of the project, unlike `project_type` which only reflects a version-specific type
-              example: [mod, plugin, datapack]
-            author:
-              type: string
-              description: The username of the project's author
-              example: my_user
-            display_categories:
-              type: array
-              items:
-                type: string
-              description: A list of the categories that the project has which are not secondary
-              example: ['technology', 'fabric']
-            versions:
-              type: array
-              items:
-                type: string
-              description: A list of the minecraft versions supported by the project
-              example: ['1.8', '1.8.9']
-            follows:
-              type: integer
-              description: The total number of users following the project
-            date_created:
-              type: string
-              format: ISO-8601
-              description: The date the project was added to search
-            date_modified:
-              type: string
-              format: ISO-8601
-              description: The date the project was last modified
-            latest_version:
-              type: string
-              description: The latest version of minecraft that this project supports
-              example: 1.8.9
-            license:
-              type: string
-              description: The SPDX license ID of a project
-              example: MIT
-            gallery:
-              type: array
-              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',
-                ]
-              items:
-                type: string
-            featured_gallery:
-              type: string
-              description: The featured gallery image of the project
-              nullable: true
-          required:
-            - slug
-            - title
-            - description
-            - client_side
-            - server_side
-            - project_id
-            - all_project_types
-            - author
-            - versions
-            - follows
-            - date_created
-            - date_modified
-            - license
-    # Fields that appear everywhere EXCEPT search.
-    NonSearchProject:
-      allOf:
-        - $ref: '#/components/schemas/BaseProject'
-        - type: object
-          properties:
-            body:
-              type: string
-              description: A long form description of the project
-              example: A long body describing my project in detail
-            status:
-              type: string
-              enum:
-                [
-                  approved,
-                  archived,
-                  rejected,
-                  draft,
-                  unlisted,
-                  processing,
-                  withheld,
-                  scheduled,
-                  private,
-                  unknown,
-                ]
-              description: The status of the project
-              example: approved
-            requested_status:
-              type: string
-              enum: [approved, archived, unlisted, private, draft]
-              description: The requested status when submitting for review or scheduling the project for release
-              nullable: true
-            additional_categories:
-              type: array
-              items:
-                type: string
-              description: A list of categories which are searchable but non-primary
-              example: [technology, adventure, fabric]
-            issues_url:
-              type: string
-              description: An optional link to where to submit bugs or issues with the project
-              example: https://github.com/my_user/my_project/issues
-              nullable: true
-            source_url:
-              type: string
-              description: An optional link to the source code of the project
-              example: https://github.com/my_user/my_project
-              nullable: true
-            wiki_url:
-              type: string
-              description: An optional link to the project's wiki page or other relevant information
-              example: https://github.com/my_user/my_project/wiki
-              nullable: true
-            discord_url:
-              type: string
-              description: An optional invite link to the project's discord
-              example: https://discord.gg/AaBbCcDd
-              nullable: true
-            donation_urls:
-              type: array
-              items:
-                $ref: '#/components/schemas/ProjectDonationURL'
-              description: A list of donation links for the project
+          deprecated: true
     ProjectDonationURL:
       type: object
       properties:
@@ -888,6 +940,7 @@ components:
             project_type:
               type: string
               enum: [mod, modpack]
+              description: The project type of the project
               example: modpack
             initial_versions:
               type: array
@@ -941,89 +994,225 @@ components:
           type: integer
           description: The order of the gallery image. Gallery images are sorted by this field and then alphabetically by title.
           example: 0
+    # GET /project response. Fields ordered: required, then optional, then deprecated.
     Project:
-      allOf:
-        - $ref: '#/components/schemas/NonSearchProject'
-        - $ref: '#/components/schemas/ServerRenderedProject'
-        - type: object
-          properties:
-            id:
-              type: string
-              example: AABBCCDD
-              description: The ID of the project, encoded as a base62 string
-            team:
-              type: string
-              example: MMNNOOPP
-              description: The ID of the team that has ownership of this project
-            body_url:
-              type: string
-              deprecated: true
-              default: null
-              description: The link to the long description of the project. Always null, only kept for legacy compatibility.
-              example: null
-              nullable: true
-            moderator_message:
-              $ref: '#/components/schemas/ModeratorMessage'
-            published:
-              type: string
-              format: ISO-8601
-              description: The date the project was published
-            updated:
-              type: string
-              format: ISO-8601
-              description: The date the project was last updated
-            approved:
-              type: string
-              format: ISO-8601
-              description: The date the project's status was set to an approved status
-              nullable: true
-            queued:
-              type: string
-              format: ISO-8601
-              description: The date the project's status was submitted to moderators for review
-              nullable: true
-            followers:
-              type: integer
-              description: The total number of users following the project
-            license:
-              $ref: '#/components/schemas/ProjectLicense'
-            versions:
-              type: array
-              items:
-                type: string
-              example: [IIJJKKLL, QQRRSSTT]
-              description: A list of the version IDs of the project (will never be empty unless `draft` status)
-            game_versions:
-              type: array
-              items:
-                type: string
-              example: ['1.19', '1.19.1', '1.19.2', '1.19.3']
-              description: A list of all of the game versions supported by the project
-            loaders:
-              type: array
-              items:
-                type: string
-              example: ['forge', 'fabric', 'quilt']
-              description: A list of all of the loaders supported by the project
-            gallery:
-              type: array
-              items:
-                $ref: '#/components/schemas/GalleryImage'
-              description: A list of images that have been uploaded to the project's gallery
-          required:
-            - id
-            - team
-            - published
-            - updated
-            - followers
-            - title
-            - description
-            - categories
-            - client_side
-            - server_side
-            - slug
-            - body
-            - status
+      type: object
+      properties:
+        id:
+          type: string
+          example: AABBCCDD
+          description: The ID of the project, encoded as a base62 string
+        team:
+          type: string
+          example: MMNNOOPP
+          description: The ID of the team that has ownership of this project
+        title:
+          type: string
+          description: The title or name of the project
+        description:
+          type: string
+          description: A short sentence summarizing the project, no more than a sentence or two.
+        body:
+          type: string
+          description: A long form description of the project
+          example: A long body describing my project in detail
+        status:
+          type: string
+          enum:
+            [
+              approved,
+              archived,
+              rejected,
+              draft,
+              unlisted,
+              processing,
+              withheld,
+              scheduled,
+              private,
+              unknown,
+            ]
+          description: The status of the project
+          example: approved
+        project_type:
+          type: string
+          enum: [mod, modpack, resourcepack, shader]
+          description: The project type of the project
+          example: mod
+        categories:
+          type: array
+          items:
+            type: string
+          example: [technology, adventure, fabric]
+          description: A list of the featured categories that the project has.
+        additional_categories:
+          type: array
+          items:
+            type: string
+          description: A list of additional categories that the project also has. These are supplementary to the featured categories, and does not include them again.
+          example: [technology, adventure, fabric]
+        environment:
+          type: array
+          items:
+            $ref: '#/components/schemas/EnvironmentEnum'
+          description: 'All the environments that versions of this project support. Not in any particular order, we recommend using the environment information on a version instead. For an explanation of each environment, see the blog post here: https://modrinth.com/news/article/new-environments/#new-system'
+          example: [client_and_server]
+        game_versions:
+          type: array
+          items:
+            type: string
+          example: ['1.19', '1.19.1', '1.19.2', '1.19.3']
+          description: A list of all of the game versions supported by the project
+        loaders:
+          type: array
+          items:
+            type: string
+          example: ['neoforge', 'fabric']
+          description: A list of all of the loaders supported by the project. These vary based on project type.
+        versions:
+          type: array
+          items:
+            type: string
+          example: [IIJJKKLL, QQRRSSTT]
+          description: A list of the version IDs of the project
+        license:
+          $ref: '#/components/schemas/ProjectLicense'
+        published:
+          type: string
+          format: ISO-8601
+          description: The date the project was created
+        updated:
+          type: string
+          format: ISO-8601
+          description: The date the latest version of the project was created
+        downloads:
+          type: integer
+          description: The total number of downloads of the project
+        followers:
+          type: integer
+          description: The total number of users following the project
+        gallery:
+          type: array
+          items:
+            $ref: '#/components/schemas/GalleryImage'
+          description: A list of images that have been uploaded to the project's gallery
+        thread_id:
+          type: string
+          example: TTUUVVWW
+          description: The ID of the moderation thread associated with this project
+        monetization_status:
+          type: string
+          enum: [monetized, demonetized, force-demonetized]
+        slug:
+          type: string
+          description: "The slug of a project, used for vanity URLs. Regex: ```^[\\w!@$()`.+,\"\\-']{3,64}$```"
+          example: my_project
+          nullable: true
+        organization:
+          type: string
+          description: The ID of the organization that owns this project
+          example: AABBCCDD
+          nullable: true
+        requested_status:
+          type: string
+          enum: [approved, archived, unlisted, private, draft]
+          description: The requested status when submitting for review or scheduling the project for release. Approved status refers to "Public" visibility.
+          nullable: true
+        approved:
+          type: string
+          format: ISO-8601
+          description: The date the project was first published
+          nullable: true
+        queued:
+          type: string
+          format: ISO-8601
+          description: The date the project's status was submitted to moderators for review
+          nullable: true
+        icon_url:
+          type: string
+          example: https://cdn.modrinth.com/data/AABBCCDD/b46513nd83hb4792a9a0e1fn28fgi6090c1842639.png
+          description: The URL of the project's icon
+          nullable: true
+        raw_icon_url:
+          type: string
+          example: https://cdn.modrinth.com/data/AABBCCDD/b46513nd83hb4792a9a0e1fn28fgi6090c1842639-raw.png
+          description: The URL of the project's icon without CDN transforms applied
+          nullable: true
+        color:
+          type: integer
+          example: 8703084
+          description: The RGB color of the project, automatically generated from the project icon
+          nullable: true
+        issues_url:
+          type: string
+          description: An optional link to where to submit bugs or issues with the project
+          example: https://github.com/modrinth/code/issues
+          nullable: true
+        source_url:
+          type: string
+          description: An optional link to the source code of the project
+          example: https://github.com/modrinth/code
+          nullable: true
+        wiki_url:
+          type: string
+          description: An optional link to the project's wiki page or other relevant information
+          example: https://github.com/modrinth/code/wiki
+          nullable: true
+        discord_url:
+          type: string
+          description: An optional invite link to the project's discord.
+          example: https://discord.gg/modrinth
+          nullable: true
+        donation_urls:
+          type: array
+          items:
+            $ref: '#/components/schemas/ProjectDonationURL'
+          description: A list of donation links for the project
+          nullable: true
+        client_side:
+          type: string
+          enum: [required, optional, unsupported, unknown]
+          description: Deprecated - use `environment` instead.
+          example: required
+          deprecated: true
+        server_side:
+          type: string
+          enum: [required, optional, unsupported, unknown]
+          description: Deprecated - use `environment` instead.
+          example: optional
+          deprecated: true
+        body_url:
+          type: string
+          deprecated: true
+          default: null
+          description: Deprecated - The link to the long description of the project. Always null, only kept for legacy compatibility.
+          example: null
+          nullable: true
+        moderator_message:
+          $ref: '#/components/schemas/ModeratorMessage'
+      required:
+        - id
+        - team
+        - title
+        - description
+        - body
+        - status
+        - project_type
+        - categories
+        - additional_categories
+        - environment
+        - game_versions
+        - loaders
+        - versions
+        - license
+        - published
+        - updated
+        - downloads
+        - followers
+        - gallery
+        - thread_id
+        - monetization_status
+        - client_side
+        - server_side
     ModeratorMessage:
       deprecated: true
       type: object
@@ -1037,7 +1226,7 @@ components:
           nullable: true
       nullable: true
       example: null
-      description: A message that a moderator sent regarding the project
+      description: Deprecated - A message that a moderator sent regarding the project
     ProjectLicense:
       type: object
       properties:
@@ -1970,9 +2159,10 @@ paths:
             - `all_project_types` (matches against every project type across all of the project's versions, not just the primary/version-specific type)
             - `categories` (loaders are lumped in with categories in search)
             - `versions`
-            - `client_side`
-            - `server_side`
             - `open_source`
+            - `environment`
+            - `client_side` (deprecated - use `environment` instead)
+            - `server_side` (deprecated - use `environment` instead)
 
             Several others are also available for use, though these should not be used outside very specific use cases.
             - `title`
diff --git a/apps/frontend/src/public/news/feed/rss.xml b/apps/frontend/src/public/news/feed/rss.xml
index 4a32f32ec0..3cd0ddca33 100644
--- a/apps/frontend/src/public/news/feed/rss.xml
+++ b/apps/frontend/src/public/news/feed/rss.xml
@@ -4,12 +4,12 @@
         <description><![CDATA[Keep up-to-date on the latest news from Modrinth.]]></description>
         <link>https://modrinth.com/news/</link>
         <generator>@modrinth/blog</generator>
-        <lastBuildDate>Fri, 24 Jul 2026 14:07:14 GMT</lastBuildDate>
+        <lastBuildDate>Mon, 10 Aug 2026 21:14:09 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[Share instances with friends]]></title>
-            <description><![CDATA[Send and update content without sharing modpack files.]]></description>
+            <description><![CDATA[Play more easily with friends without having to share .mrpack files.]]></description>
             <link>https://modrinth.com/news/article/shared-instances/</link>
             <guid isPermaLink="false">https://modrinth.com/news/article/shared-instances/</guid>
             <pubDate>Fri, 24 Jul 2026 11:00:00 GMT</pubDate>
@@ -131,7 +131,7 @@
             <link>https://modrinth.com/news/article/new-environments/</link>
             <guid isPermaLink="false">https://modrinth.com/news/article/new-environments/</guid>
             <pubDate>Thu, 28 Aug 2025 23:50:00 GMT</pubDate>
-            <content:encoded>&lt;![CDATA[&lt;p&gt;&lt;strong&gt;Hey creators!&lt;/strong&gt;&lt;/p&gt;&lt;p&gt;Over the years, we&apos;ve taken in lots of feedback regarding how we identify client-side and server-side mods and modpacks on Modrinth. It&apos;s a surprisingly nuanced issue, and careful consideration has finally led us to implementing a new system that fixes many of the issues with the old one.&lt;/p&gt;&lt;h2&gt;What do I need to do?&lt;/h2&gt;&lt;p&gt;If you want to jump right into what you need to do now, just visit your &lt;a href=&quot;/dashboard/projects&quot; rel=&quot;noopener nofollow ugc&quot;&gt;Projects page&lt;/a&gt; and look for any of your mod or modpack projects with an orange warning button next to the settings button. This will take you to the new Environments page in your project&apos;s settings with a bunch of different options for configuring your project&apos;s environment.&lt;/p&gt;&lt;p&gt;&lt;img src=&quot;/news/article/new-environments/env-settings.webp&quot; alt=&quot;Screenshot of the new Modrinth Environment settings page. A warning message explains that the environment system has been updated. Options are listed with radio buttons, including Client-side only (selected), Server-side only, Client and server, and Singleplayer only, each with descriptions and sub-options.&quot;&gt;&lt;/p&gt;&lt;p&gt;&lt;strong&gt;If you do not verify your environments, in the future a warning may display on your project to inform users that the environment information may be outdated or incorrect.&lt;/strong&gt;&lt;/p&gt;&lt;p&gt;Read on to learn more about why we&apos;ve made this change and for a more thorough explanation of each option, in case you find any of them confusing.&lt;/p&gt;&lt;h2&gt;What was wrong with the old system?&lt;/h2&gt;&lt;p&gt;Originally, Modrinth&apos;s environment metadata came in the form of two fields for Client-side and Server-side compatibility. Each option could be set to &apos;Required&apos;, &apos;Optional&apos;, or &apos;Unsupported&apos;. This did the job, but it left some ambiguities and led to many confused creators mis-labeling their mods.&lt;/p&gt;&lt;ol&gt;&lt;li&gt;&lt;strong&gt;Certain combinations of options don&apos;t make logical sense&lt;/strong&gt;, such as both sides being &apos;Unsupported&apos;, or one side being &apos;Optional&apos; and the other being &apos;Unsupported&apos;. To some people, they may feel that since &lt;em&gt;installing&lt;/em&gt; the mod is optional, that might be a logical choice, when users and automated tools might be expecting it to be labeled as &apos;Required&apos;&lt;/li&gt;&lt;li&gt;&lt;strong&gt;Terms like &apos;Unsupported&apos; are interpreted differently&lt;/strong&gt; by different people. If something is &apos;Unsupported&apos; on the server-side, does that mean it crashes when installed on a server?&lt;/li&gt;&lt;li&gt;&lt;strong&gt;Most server-side only mods also work in Singleplayer&lt;/strong&gt;, even if they don&apos;t perform any functions on the client-side directly. Some creators of server-sided mods chose to mark client-side as &apos;Optional&apos; because of this, even if it did absolutely nothing on the client-side because in order to use it in Singleplayer, you technically install it on the &amp;quot;client&amp;quot;&lt;/li&gt;&lt;li&gt;&lt;strong&gt;Not all real-world combinations even could be represented&lt;/strong&gt; by this old system. There are some mods that only make sense in a singleplayer environment, or some that only make sense on dedicated servers and &lt;em&gt;not&lt;/em&gt; in Singleplayer.&lt;/li&gt;&lt;li&gt;&lt;strong&gt;Conflicting information is out there&lt;/strong&gt; on what exactly these terms meant. The website told creators to treat the client and server as the &lt;em&gt;logical&lt;/em&gt; client and servers, but some other people&apos;s guides and tooling treated them as referring to the &lt;em&gt;physical&lt;/em&gt; client and server. This includes the Modrinth Pack (.mrpack) specification, which confusingly uses the same required/optional/unsupported terminology to refer to the physical sides when defining which files should be installed in the client and server distributions.&lt;/li&gt;&lt;/ol&gt;&lt;h2&gt;How does the new system work?&lt;/h2&gt;&lt;p&gt;The new system enumerates all expected use-cases into distinct options that can be handled in unique ways by tools like launchers, mod managers, and modpack assemblers.&lt;/p&gt;&lt;p&gt;The new options are as follows:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;&lt;strong&gt;Client-side only&lt;/strong&gt; (&lt;code&gt;client_only&lt;/code&gt;)&lt;ul&gt;&lt;li&gt;All functionality is performed exclusively on the client side. Should be compatible with vanilla servers.&lt;/li&gt;&lt;li&gt;Example: &lt;a href=&quot;/mod/modmenu&quot; rel=&quot;noopener nofollow ugc&quot;&gt;Mod Menu&lt;/a&gt;. It only adds a menu to view the list of mods installed on your client, which doesn&apos;t need to be installed on the server.&lt;/li&gt;&lt;/ul&gt;&lt;/li&gt;&lt;li&gt;&lt;strong&gt;Server-side only / Works in singleplayer&lt;/strong&gt; (&lt;code&gt;server_only&lt;/code&gt;)&lt;ul&gt;&lt;li&gt;All functionality is performed exclusively on the server side. Should be compatible with vanilla clients if only installed on the server. Also works in Singleplayer.&lt;/li&gt;&lt;li&gt;Example: &lt;a href=&quot;/mod/yungs-bridges&quot; rel=&quot;noopener nofollow ugc&quot;&gt;YUNG&apos;s Bridges&lt;/a&gt;. It only adds structures which don&apos;t need to be present on the client-side.&lt;/li&gt;&lt;/ul&gt;&lt;/li&gt;&lt;li&gt;&lt;strong&gt;Server-side only / Dedicated server only&lt;/strong&gt; (&lt;code&gt;dedicated_server_only&lt;/code&gt;)&lt;ul&gt;&lt;li&gt;Only runs on a dedicated server, and not in Singleplayer.&lt;/li&gt;&lt;li&gt;Example: &lt;a href=&quot;/mod/better-fabric-console&quot; rel=&quot;noopener nofollow ugc&quot;&gt;Better Fabric Console&lt;/a&gt;. Its functionality does not work in singleplayer, because it modifies the dedicated server console.&lt;/li&gt;&lt;/ul&gt;&lt;/li&gt;&lt;li&gt;&lt;strong&gt;Client and server / Required on both&lt;/strong&gt; (&lt;code&gt;client_and_server&lt;/code&gt;)&lt;ul&gt;&lt;li&gt;Must be installed on both the client and server.&lt;/li&gt;&lt;li&gt;Example: &lt;a href=&quot;/mod/cobblemon&quot; rel=&quot;noopener nofollow ugc&quot;&gt;Cobblemon&lt;/a&gt;. It adds entities, blocks, and items that need to be on both the client and server to work.&lt;/li&gt;&lt;/ul&gt;&lt;/li&gt;&lt;li&gt;&lt;strong&gt;Client and server / Optional on client&lt;/strong&gt; (&lt;code&gt;server_only_client_optional&lt;/code&gt;)&lt;ul&gt;&lt;li&gt;Must be on the server, but can be on the client as well for enhanced functionality&lt;/li&gt;&lt;li&gt;Example: &lt;a href=&quot;/mod/polymer&quot; rel=&quot;noopener nofollow ugc&quot;&gt;Polymer&lt;/a&gt;. It functions on the server-side, but if installed on the client it can improve the experience when playing on a server running Polymer.&lt;/li&gt;&lt;/ul&gt;&lt;/li&gt;&lt;li&gt;&lt;strong&gt;Client and server / Optional on server&lt;/strong&gt; (&lt;code&gt;client_only_server_optional&lt;/code&gt;)&lt;ul&gt;&lt;li&gt;Must be on the client, but can be on the server as well for enhanced functionality&lt;/li&gt;&lt;li&gt;Example: &lt;a href=&quot;/mod/appleskin&quot; rel=&quot;noopener nofollow ugc&quot;&gt;AppleSkin&lt;/a&gt;. It functions on the client-side, but if installed on the server it can provide more accurate saturation information.&lt;/li&gt;&lt;/ul&gt;&lt;/li&gt;&lt;li&gt;&lt;strong&gt;Client or server / Works best on both&lt;/strong&gt; (&lt;code&gt;client_or_server_prefers_both&lt;/code&gt;)&lt;ul&gt;&lt;li&gt;Can be installed on just the client or just the server to function, but functionality is enhanced when it is on both.&lt;/li&gt;&lt;li&gt;Example: &lt;a href=&quot;/mod/no-chat-reports&quot; rel=&quot;noopener nofollow ugc&quot;&gt;No Chat Reports&lt;/a&gt;. The mod functions on just the client or just the server, but each comes with drawbacks. For the best functionality, you need to install it on both.&lt;/li&gt;&lt;/ul&gt;&lt;/li&gt;&lt;li&gt;&lt;strong&gt;Client or server / Works the same on either&lt;/strong&gt; (&lt;code&gt;client_or_server&lt;/code&gt;)&lt;ul&gt;&lt;li&gt;Can be installed on just the client or just the server, and either one would enable full functionality. There would be no reason to install it on both.&lt;/li&gt;&lt;li&gt;Example: &lt;a href=&quot;/mod/entity-view-distance&quot; rel=&quot;noopener nofollow ugc&quot;&gt;Entity View Distance&lt;/a&gt;. It lets you perform the same functionality of limiting entity view distance on either the client or the server.&lt;/li&gt;&lt;/ul&gt;&lt;/li&gt;&lt;li&gt;&lt;strong&gt;Singleplayer only&lt;/strong&gt; (&lt;code&gt;singleplayer_only&lt;/code&gt;)&lt;ul&gt;&lt;li&gt;Only works in Singleplayer, does not function in a Multiplayer environment.&lt;/li&gt;&lt;li&gt;Example: &lt;a href=&quot;/mod/lan-server-properties&quot; rel=&quot;noopener nofollow ugc&quot;&gt;LAN Server Properties&lt;/a&gt;. It modifies a feature that only exists in Singleplayer, the Open to LAN menu.&lt;/li&gt;&lt;/ul&gt;&lt;/li&gt;&lt;/ul&gt;&lt;h2&gt;What&apos;s next&lt;/h2&gt;&lt;p&gt;This is a great first step towards us fixing many common issues that have been affecting Modrinth users, such as:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;Client-side mods being installed to Modrinth Servers, causing crashes&lt;/li&gt;&lt;li&gt;Modpack exporting in Modrinth App and other launchers using the Modrinth API such as Prism Launcher, MultiMC, and ATLauncher not having accurate and reliable metadata to pull from in order to build universal client and server Modrinth Pack files.&lt;/li&gt;&lt;/ul&gt;&lt;p&gt;However, this is just the first step. Before we can improve the tooling around creating and using modpacks, we need as many Modrinth projects as possible to have accurate metadata.&lt;/p&gt;&lt;p&gt;Currently, the new environment metadata is also only available in the experimental API v3, which is &lt;em&gt;not&lt;/em&gt; intended for general use. When we&apos;re ready, we plan to integrate this metadata into API v2, so that it can be used in production by third parties. For now, developers using the Modrinth API should not worry about these environment changes, just keep them in mind for the future.&lt;/p&gt;&lt;p&gt;Thank you all for continuing to support Modrinth!&lt;/p&gt;&lt;p&gt;&lt;strong&gt;Prospector&lt;/strong&gt;&lt;br&gt;&lt;em&gt;Founding Software Engineer&lt;/em&gt;&lt;/p&gt;]]&gt;</content:encoded>
+            <content:encoded>&lt;![CDATA[&lt;p&gt;&lt;strong&gt;Hey creators!&lt;/strong&gt;&lt;/p&gt;&lt;p&gt;Over the years, we&apos;ve taken in lots of feedback regarding how we identify client-side and server-side mods and modpacks on Modrinth. It&apos;s a surprisingly nuanced issue, and careful consideration has finally led us to implementing a new system that fixes many of the issues with the old one.&lt;/p&gt;&lt;h2&gt;What do I need to do?&lt;/h2&gt;&lt;p&gt;If you want to jump right into what you need to do now, just visit your &lt;a href=&quot;/dashboard/projects&quot; rel=&quot;noopener nofollow ugc&quot;&gt;Projects page&lt;/a&gt; and look for any of your mod or modpack projects with an orange warning button next to the settings button. This will take you to the new Environments page in your project&apos;s settings with a bunch of different options for configuring your project&apos;s environment.&lt;/p&gt;&lt;p&gt;&lt;img src=&quot;/news/article/new-environments/env-settings.webp&quot; alt=&quot;Screenshot of the new Modrinth Environment settings page. A warning message explains that the environment system has been updated. Options are listed with radio buttons, including Client-side only (selected), Server-side only, Client and server, and Singleplayer only, each with descriptions and sub-options.&quot;&gt;&lt;/p&gt;&lt;p&gt;&lt;strong&gt;If you do not verify your environments, in the future a warning may display on your project to inform users that the environment information may be outdated or incorrect.&lt;/strong&gt;&lt;/p&gt;&lt;p&gt;Read on to learn more about why we&apos;ve made this change and for a more thorough explanation of each option, in case you find any of them confusing.&lt;/p&gt;&lt;h2&gt;What was wrong with the old system?&lt;/h2&gt;&lt;p&gt;Originally, Modrinth&apos;s environment metadata came in the form of two fields for Client-side and Server-side compatibility. Each option could be set to &apos;Required&apos;, &apos;Optional&apos;, or &apos;Unsupported&apos;. This did the job, but it left some ambiguities and led to many confused creators mis-labeling their mods.&lt;/p&gt;&lt;ol&gt;&lt;li&gt;&lt;strong&gt;Certain combinations of options don&apos;t make logical sense&lt;/strong&gt;, such as both sides being &apos;Unsupported&apos;, or one side being &apos;Optional&apos; and the other being &apos;Unsupported&apos;. To some people, they may feel that since &lt;em&gt;installing&lt;/em&gt; the mod is optional, that might be a logical choice, when users and automated tools might be expecting it to be labeled as &apos;Required&apos;&lt;/li&gt;&lt;li&gt;&lt;strong&gt;Terms like &apos;Unsupported&apos; are interpreted differently&lt;/strong&gt; by different people. If something is &apos;Unsupported&apos; on the server-side, does that mean it crashes when installed on a server?&lt;/li&gt;&lt;li&gt;&lt;strong&gt;Most server-side only mods also work in Singleplayer&lt;/strong&gt;, even if they don&apos;t perform any functions on the client-side directly. Some creators of server-sided mods chose to mark client-side as &apos;Optional&apos; because of this, even if it did absolutely nothing on the client-side because in order to use it in Singleplayer, you technically install it on the &amp;quot;client&amp;quot;&lt;/li&gt;&lt;li&gt;&lt;strong&gt;Not all real-world combinations even could be represented&lt;/strong&gt; by this old system. There are some mods that only make sense in a singleplayer environment, or some that only make sense on dedicated servers and &lt;em&gt;not&lt;/em&gt; in Singleplayer.&lt;/li&gt;&lt;li&gt;&lt;strong&gt;Conflicting information is out there&lt;/strong&gt; on what exactly these terms meant. The website told creators to treat the client and server as the &lt;em&gt;logical&lt;/em&gt; client and servers, but some other people&apos;s guides and tooling treated them as referring to the &lt;em&gt;physical&lt;/em&gt; client and server. This includes the Modrinth Pack (.mrpack) specification, which confusingly uses the same required/optional/unsupported terminology to refer to the physical sides when defining which files should be installed in the client and server distributions.&lt;/li&gt;&lt;/ol&gt;&lt;h2 id=&quot;new-system&quot;&gt;How does the new system work?&lt;/h2&gt;&lt;p&gt;The new system enumerates all expected use-cases into distinct options that can be handled in unique ways by tools like launchers, mod managers, and modpack assemblers.&lt;/p&gt;&lt;p&gt;The new options are as follows:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;&lt;strong&gt;Client-side only&lt;/strong&gt; (&lt;code&gt;client_only&lt;/code&gt;)&lt;ul&gt;&lt;li&gt;All functionality is performed exclusively on the client side. Should be compatible with vanilla servers.&lt;/li&gt;&lt;li&gt;Example: &lt;a href=&quot;/mod/modmenu&quot; rel=&quot;noopener nofollow ugc&quot;&gt;Mod Menu&lt;/a&gt;. It only adds a menu to view the list of mods installed on your client, which doesn&apos;t need to be installed on the server.&lt;/li&gt;&lt;/ul&gt;&lt;/li&gt;&lt;li&gt;&lt;strong&gt;Server-side only / Works in singleplayer&lt;/strong&gt; (&lt;code&gt;server_only&lt;/code&gt;)&lt;ul&gt;&lt;li&gt;All functionality is performed exclusively on the server side. Should be compatible with vanilla clients if only installed on the server. Also works in Singleplayer.&lt;/li&gt;&lt;li&gt;Example: &lt;a href=&quot;/mod/yungs-bridges&quot; rel=&quot;noopener nofollow ugc&quot;&gt;YUNG&apos;s Bridges&lt;/a&gt;. It only adds structures which don&apos;t need to be present on the client-side.&lt;/li&gt;&lt;/ul&gt;&lt;/li&gt;&lt;li&gt;&lt;strong&gt;Server-side only / Dedicated server only&lt;/strong&gt; (&lt;code&gt;dedicated_server_only&lt;/code&gt;)&lt;ul&gt;&lt;li&gt;Only runs on a dedicated server, and not in Singleplayer.&lt;/li&gt;&lt;li&gt;Example: &lt;a href=&quot;/mod/better-fabric-console&quot; rel=&quot;noopener nofollow ugc&quot;&gt;Better Fabric Console&lt;/a&gt;. Its functionality does not work in singleplayer, because it modifies the dedicated server console.&lt;/li&gt;&lt;/ul&gt;&lt;/li&gt;&lt;li&gt;&lt;strong&gt;Client and server / Required on both&lt;/strong&gt; (&lt;code&gt;client_and_server&lt;/code&gt;)&lt;ul&gt;&lt;li&gt;Must be installed on both the client and server.&lt;/li&gt;&lt;li&gt;Example: &lt;a href=&quot;/mod/cobblemon&quot; rel=&quot;noopener nofollow ugc&quot;&gt;Cobblemon&lt;/a&gt;. It adds entities, blocks, and items that need to be on both the client and server to work.&lt;/li&gt;&lt;/ul&gt;&lt;/li&gt;&lt;li&gt;&lt;strong&gt;Client and server / Optional on client&lt;/strong&gt; (&lt;code&gt;server_only_client_optional&lt;/code&gt;)&lt;ul&gt;&lt;li&gt;Must be on the server, but can be on the client as well for enhanced functionality&lt;/li&gt;&lt;li&gt;Example: &lt;a href=&quot;/mod/polymer&quot; rel=&quot;noopener nofollow ugc&quot;&gt;Polymer&lt;/a&gt;. It functions on the server-side, but if installed on the client it can improve the experience when playing on a server running Polymer.&lt;/li&gt;&lt;/ul&gt;&lt;/li&gt;&lt;li&gt;&lt;strong&gt;Client and server / Optional on server&lt;/strong&gt; (&lt;code&gt;client_only_server_optional&lt;/code&gt;)&lt;ul&gt;&lt;li&gt;Must be on the client, but can be on the server as well for enhanced functionality&lt;/li&gt;&lt;li&gt;Example: &lt;a href=&quot;/mod/appleskin&quot; rel=&quot;noopener nofollow ugc&quot;&gt;AppleSkin&lt;/a&gt;. It functions on the client-side, but if installed on the server it can provide more accurate saturation information.&lt;/li&gt;&lt;/ul&gt;&lt;/li&gt;&lt;li&gt;&lt;strong&gt;Client or server / Works best on both&lt;/strong&gt; (&lt;code&gt;client_or_server_prefers_both&lt;/code&gt;)&lt;ul&gt;&lt;li&gt;Can be installed on just the client or just the server to function, but functionality is enhanced when it is on both.&lt;/li&gt;&lt;li&gt;Example: &lt;a href=&quot;/mod/no-chat-reports&quot; rel=&quot;noopener nofollow ugc&quot;&gt;No Chat Reports&lt;/a&gt;. The mod functions on just the client or just the server, but each comes with drawbacks. For the best functionality, you need to install it on both.&lt;/li&gt;&lt;/ul&gt;&lt;/li&gt;&lt;li&gt;&lt;strong&gt;Client or server / Works the same on either&lt;/strong&gt; (&lt;code&gt;client_or_server&lt;/code&gt;)&lt;ul&gt;&lt;li&gt;Can be installed on just the client or just the server, and either one would enable full functionality. There would be no reason to install it on both.&lt;/li&gt;&lt;li&gt;Example: &lt;a href=&quot;/mod/entity-view-distance&quot; rel=&quot;noopener nofollow ugc&quot;&gt;Entity View Distance&lt;/a&gt;. It lets you perform the same functionality of limiting entity view distance on either the client or the server.&lt;/li&gt;&lt;/ul&gt;&lt;/li&gt;&lt;li&gt;&lt;strong&gt;Singleplayer only&lt;/strong&gt; (&lt;code&gt;singleplayer_only&lt;/code&gt;)&lt;ul&gt;&lt;li&gt;Only works in Singleplayer, does not function in a Multiplayer environment.&lt;/li&gt;&lt;li&gt;Example: &lt;a href=&quot;/mod/lan-server-properties&quot; rel=&quot;noopener nofollow ugc&quot;&gt;LAN Server Properties&lt;/a&gt;. It modifies a feature that only exists in Singleplayer, the Open to LAN menu.&lt;/li&gt;&lt;/ul&gt;&lt;/li&gt;&lt;/ul&gt;&lt;h2&gt;What&apos;s next&lt;/h2&gt;&lt;p&gt;This is a great first step towards us fixing many common issues that have been affecting Modrinth users, such as:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;Client-side mods being installed to Modrinth Servers, causing crashes&lt;/li&gt;&lt;li&gt;Modpack exporting in Modrinth App and other launchers using the Modrinth API such as Prism Launcher, MultiMC, and ATLauncher not having accurate and reliable metadata to pull from in order to build universal client and server Modrinth Pack files.&lt;/li&gt;&lt;/ul&gt;&lt;p&gt;However, this is just the first step. Before we can improve the tooling around creating and using modpacks, we need as many Modrinth projects as possible to have accurate metadata.&lt;/p&gt;&lt;p&gt;Currently, the new environment metadata is also only available in the experimental API v3, which is &lt;em&gt;not&lt;/em&gt; intended for general use. When we&apos;re ready, we plan to integrate this metadata into API v2, so that it can be used in production by third parties. For now, developers using the Modrinth API should not worry about these environment changes, just keep them in mind for the future.&lt;/p&gt;&lt;p&gt;Thank you all for continuing to support Modrinth!&lt;/p&gt;&lt;p&gt;&lt;strong&gt;Prospector&lt;/strong&gt;&lt;br&gt;&lt;em&gt;Founding Software Engineer&lt;/em&gt;&lt;/p&gt;]]&gt;</content:encoded>
         </item>
         <item>
             <title><![CDATA[Get a Free Modrinth Server]]></title>
diff --git a/packages/blog/articles/new-environments.md b/packages/blog/articles/new-environments.md
index f5ce79965f..037b0e52a6 100644
--- a/packages/blog/articles/new-environments.md
+++ b/packages/blog/articles/new-environments.md
@@ -29,7 +29,7 @@ Originally, Modrinth's environment metadata came in the form of two fields for C
 4. **Not all real-world combinations even could be represented** by this old system. There are some mods that only make sense in a singleplayer environment, or some that only make sense on dedicated servers and _not_ in Singleplayer.
 5. **Conflicting information is out there** on what exactly these terms meant. The website told creators to treat the client and server as the _logical_ client and servers, but some other people's guides and tooling treated them as referring to the _physical_ client and server. This includes the Modrinth Pack (.mrpack) specification, which confusingly uses the same required/optional/unsupported terminology to refer to the physical sides when defining which files should be installed in the client and server distributions.
 
-## How does the new system work?
+<h2 id="new-system">How does the new system work?</h2>
 
 The new system enumerates all expected use-cases into distinct options that can be handled in unique ways by tools like launchers, mod managers, and modpack assemblers.
 
diff --git a/packages/blog/compiled/new_environments.content.ts b/packages/blog/compiled/new_environments.content.ts
index c5e6a400a1..ca1be91692 100644
--- a/packages/blog/compiled/new_environments.content.ts
+++ b/packages/blog/compiled/new_environments.content.ts
@@ -1,2 +1,2 @@
 // AUTO-GENERATED FILE - DO NOT EDIT
-export const html = `<p><strong>Hey creators!</strong></p><p>Over the years, we've taken in lots of feedback regarding how we identify client-side and server-side mods and modpacks on Modrinth. It's a surprisingly nuanced issue, and careful consideration has finally led us to implementing a new system that fixes many of the issues with the old one.</p><h2>What do I need to do?</h2><p>If you want to jump right into what you need to do now, just visit your <a href="/dashboard/projects" rel="noopener nofollow ugc">Projects page</a> and look for any of your mod or modpack projects with an orange warning button next to the settings button. This will take you to the new Environments page in your project's settings with a bunch of different options for configuring your project's environment.</p><p><img src="/news/article/new-environments/env-settings.webp" alt="Screenshot of the new Modrinth Environment settings page. A warning message explains that the environment system has been updated. Options are listed with radio buttons, including Client-side only (selected), Server-side only, Client and server, and Singleplayer only, each with descriptions and sub-options."></p><p><strong>If you do not verify your environments, in the future a warning may display on your project to inform users that the environment information may be outdated or incorrect.</strong></p><p>Read on to learn more about why we've made this change and for a more thorough explanation of each option, in case you find any of them confusing.</p><h2>What was wrong with the old system?</h2><p>Originally, Modrinth's environment metadata came in the form of two fields for Client-side and Server-side compatibility. Each option could be set to 'Required', 'Optional', or 'Unsupported'. This did the job, but it left some ambiguities and led to many confused creators mis-labeling their mods.</p><ol><li><strong>Certain combinations of options don't make logical sense</strong>, such as both sides being 'Unsupported', or one side being 'Optional' and the other being 'Unsupported'. To some people, they may feel that since <em>installing</em> the mod is optional, that might be a logical choice, when users and automated tools might be expecting it to be labeled as 'Required'</li><li><strong>Terms like 'Unsupported' are interpreted differently</strong> by different people. If something is 'Unsupported' on the server-side, does that mean it crashes when installed on a server?</li><li><strong>Most server-side only mods also work in Singleplayer</strong>, even if they don't perform any functions on the client-side directly. Some creators of server-sided mods chose to mark client-side as 'Optional' because of this, even if it did absolutely nothing on the client-side because in order to use it in Singleplayer, you technically install it on the &quot;client&quot;</li><li><strong>Not all real-world combinations even could be represented</strong> by this old system. There are some mods that only make sense in a singleplayer environment, or some that only make sense on dedicated servers and <em>not</em> in Singleplayer.</li><li><strong>Conflicting information is out there</strong> on what exactly these terms meant. The website told creators to treat the client and server as the <em>logical</em> client and servers, but some other people's guides and tooling treated them as referring to the <em>physical</em> client and server. This includes the Modrinth Pack (.mrpack) specification, which confusingly uses the same required/optional/unsupported terminology to refer to the physical sides when defining which files should be installed in the client and server distributions.</li></ol><h2>How does the new system work?</h2><p>The new system enumerates all expected use-cases into distinct options that can be handled in unique ways by tools like launchers, mod managers, and modpack assemblers.</p><p>The new options are as follows:</p><ul><li><strong>Client-side only</strong> (<code>client_only</code>)<ul><li>All functionality is performed exclusively on the client side. Should be compatible with vanilla servers.</li><li>Example: <a href="/mod/modmenu" rel="noopener nofollow ugc">Mod Menu</a>. It only adds a menu to view the list of mods installed on your client, which doesn't need to be installed on the server.</li></ul></li><li><strong>Server-side only / Works in singleplayer</strong> (<code>server_only</code>)<ul><li>All functionality is performed exclusively on the server side. Should be compatible with vanilla clients if only installed on the server. Also works in Singleplayer.</li><li>Example: <a href="/mod/yungs-bridges" rel="noopener nofollow ugc">YUNG's Bridges</a>. It only adds structures which don't need to be present on the client-side.</li></ul></li><li><strong>Server-side only / Dedicated server only</strong> (<code>dedicated_server_only</code>)<ul><li>Only runs on a dedicated server, and not in Singleplayer.</li><li>Example: <a href="/mod/better-fabric-console" rel="noopener nofollow ugc">Better Fabric Console</a>. Its functionality does not work in singleplayer, because it modifies the dedicated server console.</li></ul></li><li><strong>Client and server / Required on both</strong> (<code>client_and_server</code>)<ul><li>Must be installed on both the client and server.</li><li>Example: <a href="/mod/cobblemon" rel="noopener nofollow ugc">Cobblemon</a>. It adds entities, blocks, and items that need to be on both the client and server to work.</li></ul></li><li><strong>Client and server / Optional on client</strong> (<code>server_only_client_optional</code>)<ul><li>Must be on the server, but can be on the client as well for enhanced functionality</li><li>Example: <a href="/mod/polymer" rel="noopener nofollow ugc">Polymer</a>. It functions on the server-side, but if installed on the client it can improve the experience when playing on a server running Polymer.</li></ul></li><li><strong>Client and server / Optional on server</strong> (<code>client_only_server_optional</code>)<ul><li>Must be on the client, but can be on the server as well for enhanced functionality</li><li>Example: <a href="/mod/appleskin" rel="noopener nofollow ugc">AppleSkin</a>. It functions on the client-side, but if installed on the server it can provide more accurate saturation information.</li></ul></li><li><strong>Client or server / Works best on both</strong> (<code>client_or_server_prefers_both</code>)<ul><li>Can be installed on just the client or just the server to function, but functionality is enhanced when it is on both.</li><li>Example: <a href="/mod/no-chat-reports" rel="noopener nofollow ugc">No Chat Reports</a>. The mod functions on just the client or just the server, but each comes with drawbacks. For the best functionality, you need to install it on both.</li></ul></li><li><strong>Client or server / Works the same on either</strong> (<code>client_or_server</code>)<ul><li>Can be installed on just the client or just the server, and either one would enable full functionality. There would be no reason to install it on both.</li><li>Example: <a href="/mod/entity-view-distance" rel="noopener nofollow ugc">Entity View Distance</a>. It lets you perform the same functionality of limiting entity view distance on either the client or the server.</li></ul></li><li><strong>Singleplayer only</strong> (<code>singleplayer_only</code>)<ul><li>Only works in Singleplayer, does not function in a Multiplayer environment.</li><li>Example: <a href="/mod/lan-server-properties" rel="noopener nofollow ugc">LAN Server Properties</a>. It modifies a feature that only exists in Singleplayer, the Open to LAN menu.</li></ul></li></ul><h2>What's next</h2><p>This is a great first step towards us fixing many common issues that have been affecting Modrinth users, such as:</p><ul><li>Client-side mods being installed to Modrinth Servers, causing crashes</li><li>Modpack exporting in Modrinth App and other launchers using the Modrinth API such as Prism Launcher, MultiMC, and ATLauncher not having accurate and reliable metadata to pull from in order to build universal client and server Modrinth Pack files.</li></ul><p>However, this is just the first step. Before we can improve the tooling around creating and using modpacks, we need as many Modrinth projects as possible to have accurate metadata.</p><p>Currently, the new environment metadata is also only available in the experimental API v3, which is <em>not</em> intended for general use. When we're ready, we plan to integrate this metadata into API v2, so that it can be used in production by third parties. For now, developers using the Modrinth API should not worry about these environment changes, just keep them in mind for the future.</p><p>Thank you all for continuing to support Modrinth!</p><p><strong>Prospector</strong><br><em>Founding Software Engineer</em></p>`;
+export const html = `<p><strong>Hey creators!</strong></p><p>Over the years, we've taken in lots of feedback regarding how we identify client-side and server-side mods and modpacks on Modrinth. It's a surprisingly nuanced issue, and careful consideration has finally led us to implementing a new system that fixes many of the issues with the old one.</p><h2>What do I need to do?</h2><p>If you want to jump right into what you need to do now, just visit your <a href="/dashboard/projects" rel="noopener nofollow ugc">Projects page</a> and look for any of your mod or modpack projects with an orange warning button next to the settings button. This will take you to the new Environments page in your project's settings with a bunch of different options for configuring your project's environment.</p><p><img src="/news/article/new-environments/env-settings.webp" alt="Screenshot of the new Modrinth Environment settings page. A warning message explains that the environment system has been updated. Options are listed with radio buttons, including Client-side only (selected), Server-side only, Client and server, and Singleplayer only, each with descriptions and sub-options."></p><p><strong>If you do not verify your environments, in the future a warning may display on your project to inform users that the environment information may be outdated or incorrect.</strong></p><p>Read on to learn more about why we've made this change and for a more thorough explanation of each option, in case you find any of them confusing.</p><h2>What was wrong with the old system?</h2><p>Originally, Modrinth's environment metadata came in the form of two fields for Client-side and Server-side compatibility. Each option could be set to 'Required', 'Optional', or 'Unsupported'. This did the job, but it left some ambiguities and led to many confused creators mis-labeling their mods.</p><ol><li><strong>Certain combinations of options don't make logical sense</strong>, such as both sides being 'Unsupported', or one side being 'Optional' and the other being 'Unsupported'. To some people, they may feel that since <em>installing</em> the mod is optional, that might be a logical choice, when users and automated tools might be expecting it to be labeled as 'Required'</li><li><strong>Terms like 'Unsupported' are interpreted differently</strong> by different people. If something is 'Unsupported' on the server-side, does that mean it crashes when installed on a server?</li><li><strong>Most server-side only mods also work in Singleplayer</strong>, even if they don't perform any functions on the client-side directly. Some creators of server-sided mods chose to mark client-side as 'Optional' because of this, even if it did absolutely nothing on the client-side because in order to use it in Singleplayer, you technically install it on the &quot;client&quot;</li><li><strong>Not all real-world combinations even could be represented</strong> by this old system. There are some mods that only make sense in a singleplayer environment, or some that only make sense on dedicated servers and <em>not</em> in Singleplayer.</li><li><strong>Conflicting information is out there</strong> on what exactly these terms meant. The website told creators to treat the client and server as the <em>logical</em> client and servers, but some other people's guides and tooling treated them as referring to the <em>physical</em> client and server. This includes the Modrinth Pack (.mrpack) specification, which confusingly uses the same required/optional/unsupported terminology to refer to the physical sides when defining which files should be installed in the client and server distributions.</li></ol><h2 id="new-system">How does the new system work?</h2><p>The new system enumerates all expected use-cases into distinct options that can be handled in unique ways by tools like launchers, mod managers, and modpack assemblers.</p><p>The new options are as follows:</p><ul><li><strong>Client-side only</strong> (<code>client_only</code>)<ul><li>All functionality is performed exclusively on the client side. Should be compatible with vanilla servers.</li><li>Example: <a href="/mod/modmenu" rel="noopener nofollow ugc">Mod Menu</a>. It only adds a menu to view the list of mods installed on your client, which doesn't need to be installed on the server.</li></ul></li><li><strong>Server-side only / Works in singleplayer</strong> (<code>server_only</code>)<ul><li>All functionality is performed exclusively on the server side. Should be compatible with vanilla clients if only installed on the server. Also works in Singleplayer.</li><li>Example: <a href="/mod/yungs-bridges" rel="noopener nofollow ugc">YUNG's Bridges</a>. It only adds structures which don't need to be present on the client-side.</li></ul></li><li><strong>Server-side only / Dedicated server only</strong> (<code>dedicated_server_only</code>)<ul><li>Only runs on a dedicated server, and not in Singleplayer.</li><li>Example: <a href="/mod/better-fabric-console" rel="noopener nofollow ugc">Better Fabric Console</a>. Its functionality does not work in singleplayer, because it modifies the dedicated server console.</li></ul></li><li><strong>Client and server / Required on both</strong> (<code>client_and_server</code>)<ul><li>Must be installed on both the client and server.</li><li>Example: <a href="/mod/cobblemon" rel="noopener nofollow ugc">Cobblemon</a>. It adds entities, blocks, and items that need to be on both the client and server to work.</li></ul></li><li><strong>Client and server / Optional on client</strong> (<code>server_only_client_optional</code>)<ul><li>Must be on the server, but can be on the client as well for enhanced functionality</li><li>Example: <a href="/mod/polymer" rel="noopener nofollow ugc">Polymer</a>. It functions on the server-side, but if installed on the client it can improve the experience when playing on a server running Polymer.</li></ul></li><li><strong>Client and server / Optional on server</strong> (<code>client_only_server_optional</code>)<ul><li>Must be on the client, but can be on the server as well for enhanced functionality</li><li>Example: <a href="/mod/appleskin" rel="noopener nofollow ugc">AppleSkin</a>. It functions on the client-side, but if installed on the server it can provide more accurate saturation information.</li></ul></li><li><strong>Client or server / Works best on both</strong> (<code>client_or_server_prefers_both</code>)<ul><li>Can be installed on just the client or just the server to function, but functionality is enhanced when it is on both.</li><li>Example: <a href="/mod/no-chat-reports" rel="noopener nofollow ugc">No Chat Reports</a>. The mod functions on just the client or just the server, but each comes with drawbacks. For the best functionality, you need to install it on both.</li></ul></li><li><strong>Client or server / Works the same on either</strong> (<code>client_or_server</code>)<ul><li>Can be installed on just the client or just the server, and either one would enable full functionality. There would be no reason to install it on both.</li><li>Example: <a href="/mod/entity-view-distance" rel="noopener nofollow ugc">Entity View Distance</a>. It lets you perform the same functionality of limiting entity view distance on either the client or the server.</li></ul></li><li><strong>Singleplayer only</strong> (<code>singleplayer_only</code>)<ul><li>Only works in Singleplayer, does not function in a Multiplayer environment.</li><li>Example: <a href="/mod/lan-server-properties" rel="noopener nofollow ugc">LAN Server Properties</a>. It modifies a feature that only exists in Singleplayer, the Open to LAN menu.</li></ul></li></ul><h2>What's next</h2><p>This is a great first step towards us fixing many common issues that have been affecting Modrinth users, such as:</p><ul><li>Client-side mods being installed to Modrinth Servers, causing crashes</li><li>Modpack exporting in Modrinth App and other launchers using the Modrinth API such as Prism Launcher, MultiMC, and ATLauncher not having accurate and reliable metadata to pull from in order to build universal client and server Modrinth Pack files.</li></ul><p>However, this is just the first step. Before we can improve the tooling around creating and using modpacks, we need as many Modrinth projects as possible to have accurate metadata.</p><p>Currently, the new environment metadata is also only available in the experimental API v3, which is <em>not</em> intended for general use. When we're ready, we plan to integrate this metadata into API v2, so that it can be used in production by third parties. For now, developers using the Modrinth API should not worry about these environment changes, just keep them in mind for the future.</p><p>Thank you all for continuing to support Modrinth!</p><p><strong>Prospector</strong><br><em>Founding Software Engineer</em></p>`;