tombi

Improve directory moving error messages
Fix canceling app directory change
2026-08-01 13:45:53 +00:00 · 2026-04-16 13:06:32 +01:00 · 2026-04-15 14:16:01 +01:00 · 2026-04-15 14:16:00 +01:00 · 2026-04-15 09:12:31 +00:00 · 2026-04-13 18:10:24 +00:00
614 changed files with 44396 additions and 20048 deletions
@@ -1,7 +1,7 @@
 name: Changelog Comment

 on:
-  pull_request:
+  pull_request_target:
    types: [opened, reopened]
  workflow_dispatch:
    inputs:
@@ -27,12 +27,15 @@ on:
        options:
          - prod
          - staging
+          - prod-with-staging-archon
        default: prod
        required: false

 jobs:
  build:
    name: Build
+    env:
+      VITE_STRIPE_PUBLISHABLE_KEY: pk_live_51JbFxJJygY5LJFfKLVVldb10HlLt24p421OWRsTOWc5sXYFOnFUXWieSc6HD3PHo25ktx8db1WcHr36XGFvZFVUz00V9ixrCs5
    strategy:
      fail-fast: false
      matrix:
@@ -9,6 +9,7 @@ jobs:
    name: Release Modrinth App
    if: >-
      github.event.workflow_run.conclusion == 'success' &&
+      github.event.workflow_run.event == 'push' &&
      startsWith(github.event.workflow_run.head_branch, 'v')
    runs-on: ubuntu-latest

@@ -23,6 +24,25 @@ jobs:
      - name: 📥 Check out code
        uses: actions/checkout@v4

+      - name: 🔒 Verify ref is a tag
+        env:
+          GH_TOKEN: ${{ github.token }}
+          HEAD_SHA: ${{ github.event.workflow_run.head_sha }}
+        run: |
+          tag_sha=$(gh api "repos/${{ github.repository }}/git/refs/tags/${VERSION_TAG}" --jq '.object.sha' 2>/dev/null || true)
+          if [ -z "$tag_sha" ]; then
+            echo "::error::${VERSION_TAG} is not a git tag in this repo"
+            exit 1
+          fi
+          if [ "$tag_sha" != "$HEAD_SHA" ]; then
+            commit_sha=$(gh api "repos/${{ github.repository }}/git/tags/${tag_sha}" --jq '.object.sha' 2>/dev/null || echo "$tag_sha")
+            if [ "$commit_sha" != "$HEAD_SHA" ]; then
+              echo "::error::Tag ${VERSION_TAG} (${commit_sha}) does not match build head_sha (${HEAD_SHA})"
+              exit 1
+            fi
+          fi
+          echo "Verified ${VERSION_TAG} is a tag pointing at ${HEAD_SHA}"
+
      - name: 📥 Download Modrinth App artifacts
        uses: dawidd6/action-download-artifact@v11
        with:
@@ -32,12 +52,32 @@ jobs:
          branch: ${{ env.VERSION_TAG }}
          use_unzip: true

+      - name: 📝 Extract app changelog
+        env:
+          VERSION: ${{ env.VERSION_TAG }}
+        run: |
+          node <<'EOF'
+          const fs = require('fs');
+          const version = process.env.VERSION.replace(/^v/, '');
+          const src = fs.readFileSync('packages/blog/changelog.ts', 'utf8');
+          const escaped = version.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+          const re = new RegExp("product:\\s*'app',\\s*version:\\s*'" + escaped + "',\\s*body:\\s*`([\\s\\S]*?)`,\\s*\\}");
+          const m = src.match(re);
+          if (!m) {
+            console.error(`No app changelog entry found for version ${version}`);
+            process.exit(1);
+          }
+          fs.writeFileSync('release-notes.md', m[1]);
+          console.log(`Extracted changelog for app ${version}:`);
+          console.log(m[1]);
+          EOF
+
      - name: 🛠️ Generate version manifest
        run: |
          # Reference: https://tauri.app/plugin/updater/#server-support
          jq -nc \
            --arg versionTag "${VERSION_TAG#v}" \
-            --arg releaseNotes "See the full changelog at https://modrinth.com/news/changelog" \
+            --rawfile releaseNotes release-notes.md \
            --rawfile macOsAarch64UpdateArtifactSignature "${MACOS_UNIVERSAL_BUNDLE_ARTIFACT_NAME}/universal-apple-darwin/release/bundle/macos/Modrinth App.app.tar.gz.sig" \
            --rawfile macOsX64UpdateArtifactSignature "${MACOS_UNIVERSAL_BUNDLE_ARTIFACT_NAME}/universal-apple-darwin/release/bundle/macos/Modrinth App.app.tar.gz.sig" \
            --rawfile linuxX64UpdateArtifactSignature "${LINUX_X64_BUNDLE_ARTIFACT_NAME}/release/bundle/appimage/Modrinth App_${VERSION_TAG#v}_amd64.AppImage.tar.gz.sig" \
@@ -120,7 +160,7 @@ jobs:

          gh release create "$VERSION_TAG" \
            --title "Modrinth App ${VERSION}" \
-            --notes "See the full changelog at https://modrinth.com/news/changelog" \
+            --notes-file release-notes.md \
            "${WINDOWS_X64_BUNDLE_ARTIFACT_NAME}/release/bundle/nsis/Modrinth App_${VERSION}_x64-setup.exe" \
            "${MACOS_UNIVERSAL_BUNDLE_ARTIFACT_NAME}/universal-apple-darwin/release/bundle/dmg/Modrinth App_${VERSION}_universal.dmg" \
            "${LINUX_X64_BUNDLE_ARTIFACT_NAME}/release/bundle/appimage/Modrinth App_${VERSION}_amd64.AppImage" \
@@ -29,5 +29,7 @@
 	},
 	"[rust]": {
 		"editor.defaultFormatter": "rust-lang.rust-analyzer"
-	}
+	},
+	"css.lint.unknownAtRules": "ignore",
+	"scss.lint.unknownAtRules": "ignore"
 }
@@ -86,6 +86,7 @@ Each project may have its own `CLAUDE.md` with detailed instructions:
 - 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)

@@ -4973,7 +4973,7 @@ dependencies = [
 "urlencoding",
 "utoipa",
 "utoipa-actix-web",
- "utoipa-swagger-ui",
+ "utoipa-scalar",
 "uuid 1.18.1",
 "validator",
 "webp",
@@ -7950,40 +7950,6 @@ dependencies = [
 "zeroize",
 ]

-[[package]]
-name = "rust-embed"
-version = "8.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb44e1917075637ee8c7bcb865cf8830e3a92b5b1189e44e3a0ab5a0d5be314b"
-dependencies = [
- "rust-embed-impl",
- "rust-embed-utils",
- "walkdir",
-]
-
-[[package]]
-name = "rust-embed-impl"
-version = "8.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "382499b49db77a7c19abd2a574f85ada7e9dbe125d5d1160fa5cad7c4cf71fc9"
-dependencies = [
- "proc-macro2",
- "quote",
- "rust-embed-utils",
- "syn 2.0.106",
- "walkdir",
-]
-
-[[package]]
-name = "rust-embed-utils"
-version = "8.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21fcbee55c2458836bcdbfffb6ec9ba74bbc23ca7aa6816015a3dd2c4d8fc185"
-dependencies = [
- "sha2",
- "walkdir",
-]
-
 [[package]]
 name = "rust-ini"
 version = "0.21.3"
@@ -10189,6 +10155,7 @@ dependencies = [
 "either",
 "encoding_rs",
 "enumset",
+ "eyre",
 "flate2",
 "fs4",
 "futures",
@@ -10241,6 +10208,7 @@ dependencies = [
 name = "theseus_gui"
 version = "1.0.0-local"
 dependencies = [
+ "async_zip",
 "chrono",
 "daedalus",
 "dashmap",
@@ -10258,6 +10226,7 @@ dependencies = [
 "tauri-build",
 "tauri-plugin-deep-link",
 "tauri-plugin-dialog",
+ "tauri-plugin-fs",
 "tauri-plugin-http",
 "tauri-plugin-opener",
 "tauri-plugin-os",
@@ -11197,30 +11166,17 @@ dependencies = [
 ]

 [[package]]
-name = "utoipa-swagger-ui"
-version = "9.0.2"
+name = "utoipa-scalar"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d047458f1b5b65237c2f6dc6db136945667f40a7668627b3490b9513a3d43a55"
+checksum = "59559e1509172f6b26c1cdbc7247c4ddd1ac6560fe94b584f81ee489b141f719"
 dependencies = [
 "actix-web",
- "base64 0.22.1",
- "mime_guess",
- "regex",
- "rust-embed",
 "serde",
 "serde_json",
- "url",
 "utoipa",
- "utoipa-swagger-ui-vendored",
- "zip 3.0.0",
 ]

-[[package]]
-name = "utoipa-swagger-ui-vendored"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2eebbbfe4093922c2b6734d7c679ebfebd704a0d7e56dfcb0d05818ce28977d"
-
 [[package]]
 name = "uuid"
 version = "0.8.2"
@@ -12605,20 +12561,6 @@ dependencies = [
 "syn 2.0.106",
 ]

-[[package]]
-name = "zip"
-version = "3.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12598812502ed0105f607f941c386f43d441e00148fce9dec3ca5ffb0bde9308"
-dependencies = [
- "arbitrary",
- "crc32fast",
- "flate2",
- "indexmap 2.11.4",
- "memchr",
- "zopfli",
-]
-
 [[package]]
 name = "zip"
 version = "4.6.1"
@@ -179,6 +179,7 @@ tauri = "2.8.5"
 tauri-build = "2.4.1"
 tauri-plugin-deep-link = "2.4.3"
 tauri-plugin-dialog = "2.4.0"
+tauri-plugin-fs = "2.4.5"
 tauri-plugin-http = "2.5.7"
 tauri-plugin-opener = "2.5.0"
 tauri-plugin-os = "2.3.1"
@@ -207,7 +208,7 @@ url = "2.5.7"
 urlencoding = "2.1.3"
 utoipa = { version = "5.4.0", features = ["actix_extras", "chrono", "decimal"] }
 utoipa-actix-web = { version = "0.1.2" }
-utoipa-swagger-ui = { version = "9.0.2", features = ["actix-web", "vendored"] }
+utoipa-scalar = { version = "0.3.0", default-features = false }
 uuid = "1.18.1"
 validator = "0.20.0"
 webp = { version = "0.3.1", default-features = false }
@@ -22,6 +22,7 @@
 		"@tanstack/vue-query": "^5.90.7",
 		"@tauri-apps/api": "^2.5.0",
 		"@tauri-apps/plugin-dialog": "^2.2.1",
+		"@tauri-apps/plugin-fs": "^2.4.5",
 		"@tauri-apps/plugin-http": "~2.5.7",
 		"@tauri-apps/plugin-opener": "^2.2.6",
 		"@tauri-apps/plugin-os": "^2.2.1",
@@ -58,7 +59,7 @@
 		"sass": "^1.74.1",
 		"tailwindcss": "^3.4.4",
 		"typescript": "^5.5.4",
-		"vite": "^6.0.0",
+		"vite": "^8.0.0",
 		"vue-component-type-helpers": "^3.1.8",
 		"vue-tsc": "^2.1.6"
 	},
@@ -1,5 +1,12 @@
 <script setup>
-import { AuthFeature, PanelVersionFeature, TauriModrinthClient } from '@modrinth/api-client'
+import {
+	AuthFeature,
+	NodeAuthFeature,
+	nodeAuthState,
+	PanelVersionFeature,
+	TauriModrinthClient,
+	VerboseLoggingFeature,
+} from '@modrinth/api-client'
 import {
 	ArrowBigUpDashIcon,
 	ChangeSkinIcon,
@@ -19,7 +26,7 @@ import {
 	RefreshCwIcon,
 	RestoreIcon,
 	RightArrowIcon,
-	ServerIcon,
+	ServerStackIcon,
 	SettingsIcon,
 	UserIcon,
 	WorldIcon,
@@ -80,6 +87,7 @@ import QuickInstanceSwitcher from '@/components/ui/QuickInstanceSwitcher.vue'
 import RunningAppBar from '@/components/ui/RunningAppBar.vue'
 import SplashScreen from '@/components/ui/SplashScreen.vue'
 import { useCheckDisableMouseover } from '@/composables/macCssFix.js'
+import { config } from '@/config'
 import { hide_ads_window, init_ads_window, show_ads_window } from '@/helpers/ads.js'
 import { debugAnalytics, initAnalytics, trackEvent } from '@/helpers/analytics'
 import { check_reachable } from '@/helpers/auth.js'
@@ -106,6 +114,7 @@ import {
 } from '@/providers/download-progress.ts'
 import { createServerInstall, provideServerInstall } from '@/providers/server-install'
 import { setupProviders } from '@/providers/setup'
+import { setupAuthProvider } from '@/providers/setup/auth'
 import { useError } from '@/store/error.js'
 import { useLoading, useTheming } from '@/store/state'

@@ -126,17 +135,34 @@ const { addPopupNotification } = popupNotificationManager

 const tauriApiClient = new TauriModrinthClient({
 	userAgent: `modrinth/theseus/${getVersion()} (support@modrinth.com)`,
+	labrinthBaseUrl: config.labrinthBaseUrl,
+	archonBaseUrl: config.archonBaseUrl,
 	features: [
+		new NodeAuthFeature({
+			getAuth: () => nodeAuthState.getAuth?.() ?? null,
+			refreshAuth: async () => {
+				if (nodeAuthState.refreshAuth) {
+					await nodeAuthState.refreshAuth()
+				}
+			},
+		}),
 		new AuthFeature({
-			token: async () => (await getCreds()).session,
+			token: async () => (await getCreds())?.session,
 		}),
 		new PanelVersionFeature(),
+		new VerboseLoggingFeature(),
 	],
 })
 provideModrinthClient(tauriApiClient)
 providePageContext({
 	hierarchicalSidebarAvailable: ref(true),
 	showAds: ref(false),
+	featureFlags: {
+		serverRamAsBytesAlwaysOn: computed(() =>
+			themeStore.getFeatureFlag('server_ram_as_bytes_always_on'),
+		),
+	},
+	openExternalUrl: (url) => openUrl(url),
 })
 provideModalBehavior({
 	noblur: computed(() => !themeStore.advancedRendering),
@@ -394,17 +420,30 @@ const handleClose = async () => {
 }

 const router = useRouter()
+const route = useRoute()
+
+const loading = useLoading()
+loading.setEnabled(false)
+loading.startLoading()
+
+let suspensePending = false
+
+router.beforeEach(() => {
+	suspensePending = false
+	loading.startLoading()
+})
 router.afterEach((to, from, failure) => {
 	trackEvent('PageView', {
 		path: to.path,
 		fromPath: from.path,
 		failed: failure,
 	})
+	setTimeout(() => {
+		if (!suspensePending) {
+			loading.stopLoading()
+		}
+	}, 100)
 })
-const route = useRoute()
-
-const loading = useLoading()
-loading.setEnabled(false)

 const error = useError()
 const errorModal = ref()
@@ -454,6 +493,10 @@ const credentials = ref()

 const modrinthLoginFlowWaitModal = ref()

+setupAuthProvider(credentials, async (_redirectPath) => {
+	await signIn()
+})
+
 async function fetchCredentials() {
 	const creds = await getCreds().catch(handleError)
 	if (creds && creds.user_id) {
@@ -977,13 +1020,6 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
 			<NavButton v-if="themeStore.featureFlags.worlds_tab" v-tooltip.right="'Worlds'" to="/worlds">
 				<WorldIcon />
 			</NavButton>
-			<NavButton
-				v-if="themeStore.featureFlags.servers_in_app"
-				v-tooltip.right="'Servers'"
-				to="/hosting/manage"
-			>
-				<ServerIcon />
-			</NavButton>
 			<NavButton
 				v-tooltip.right="'Discover content'"
 				to="/browse/modpack"
@@ -998,6 +1034,7 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
 			<NavButton
 				v-tooltip.right="'Library'"
 				to="/library"
+				:is-primary="(r) => r.path === '/library' || r.path === '/library'"
 				:is-subpage="
 					() =>
 						route.path.startsWith('/instance') ||
@@ -1007,6 +1044,14 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
 			>
 				<LibraryIcon />
 			</NavButton>
+			<NavButton
+				v-tooltip.right="'Modrinth Hosting'"
+				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/'"
+			>
+				<ServerStackIcon />
+			</NavButton>
 			<div class="h-px w-6 mx-auto my-2 bg-surface-5"></div>
 			<suspense>
 				<QuickInstanceSwitcher />
@@ -1176,7 +1221,7 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
 				</div>
 			</transition>
 			<div
-				class="loading-indicator-container h-8 fixed z-50"
+				class="loading-indicator-container h-8 fixed z-50 pointer-events-none"
 				:style="{
 					top: 'calc(var(--top-bar-height))',
 					left: 'calc(var(--left-bar-width))',
@@ -1219,7 +1264,15 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
 			</Admonition>
 			<RouterView v-slot="{ Component }">
 				<template v-if="Component">
-					<Suspense @pending="loading.startLoading()" @resolve="loading.stopLoading()">
+					<Suspense
+						@pending="
+							() => {
+								suspensePending = true
+								loading.startLoading()
+							}
+						"
+						@resolve="loading.stopLoading()"
+					>
 						<component :is="Component"></component>
 					</Suspense>
 				</template>
@@ -1245,11 +1298,7 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
 					</div>
 					<div class="py-4 border-0 border-b-[1px] border-[--brand-gradient-border] border-solid">
 						<suspense>
-							<FriendsList
-								:credentials="credentials"
-								:sign-in="() => signIn()"
-								:refresh-credentials="fetchCredentials"
-							/>
+							<FriendsList :credentials="credentials" :sign-in="() => signIn()" />
 						</suspense>
 					</div>
 					<div v-if="news && news.length > 0" class="p-4 pr-1 flex flex-col items-center">
@@ -1282,8 +1331,8 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
 		</div>
 	</div>
 	<I18nDebugPanel />
-	<NotificationPanel has-sidebar />
-	<PopupNotificationPanel has-sidebar />
+	<NotificationPanel :has-sidebar="sidebarVisible" />
+	<PopupNotificationPanel :has-sidebar="sidebarVisible" />
 	<ErrorModal ref="errorModal" />
 	<MinecraftAuthErrorModal ref="minecraftAuthErrorModal" />
 	<ContentInstallModal
@@ -45,6 +45,14 @@
 	color-scheme: dark;
 	--view-width: calc(100% - 5rem);
 	--expanded-view-width: calc(100% - 13rem);
+	--medal-promotion-bg: #000;
+	--medal-promotion-bg-orange: rgba(208, 246, 255, 0.25);
+	--medal-promotion-text-orange: #42abff;
+	--medal-promotion-bg-gradient: linear-gradient(
+		90deg,
+		rgba(66, 170, 255, 0.15),
+		rgba(0, 0, 0, 0) 100%
+	);
 }

 body {
@@ -77,12 +85,10 @@ body {
 }

 a {
-	color: var(--color-link);
+	color: inherit;
 	text-decoration: none;
-
-	&:hover {
-		text-decoration: none;
-	}
+	-webkit-font-smoothing: antialiased;
+	will-change: filter;
 }

 .badge {
@@ -174,4 +180,63 @@ img {
 	}
 }

+button,
+input[type='button'] {
+	cursor: pointer;
+	border: none;
+	outline: 2px solid transparent;
+}
+
@import '@modrinth/assets/omorphia.scss';
+
+input {
+	border-radius: var(--size-rounded-sm);
+	box-sizing: border-box;
+	border: 2px solid transparent;
+	// safari iOS rounds inputs by default
+	// set the appearance to none to prevent this
+	appearance: none !important;
+}
+
+pre {
+	font-weight: var(--font-weight-regular);
+}
+
+input,
+textarea {
+	background: var(--color-button-bg);
+	color: var(--color-text);
+	padding: 0.5rem 1rem;
+	font-weight: var(--font-weight-medium);
+	border: none;
+	outline: 2px solid transparent;
+	box-shadow:
+		var(--shadow-inset-sm),
+		0 0 0 0 transparent;
+	transition: box-shadow 0.1s ease-in-out;
+	min-height: 36px;
+
+	&:focus,
+	&:focus-visible {
+		box-shadow:
+			inset 0 0 0 transparent,
+			0 0 0 0.25rem var(--color-brand-shadow);
+		color: var(--color-button-text-active);
+	}
+
+	&:disabled,
+	&[disabled='true'] {
+		opacity: 0.6;
+		pointer-events: none;
+		cursor: not-allowed;
+	}
+
+	&:focus::placeholder {
+		opacity: 0.8;
+	}
+
+	&::placeholder {
+		color: var(--color-button-text);
+		opacity: 0.6;
+	}
+}
@@ -3,6 +3,7 @@
 		ref="outerRef"
 		data-tauri-drag-region
 		class="min-w-0 overflow-hidden pl-3"
+		:class="{ 'breadcrumb-fade-mask': isOverflowing }"
 		:style="isOverflowing ? { '--scroll-distance': `-${overflowAmount}px` } : undefined"
 		@mouseenter="onMouseEnter"
 		@mouseleave="onMouseLeave"
@@ -128,6 +129,16 @@ watch(breadcrumbs, () => {
 </script>

 <style scoped>
+.breadcrumb-fade-mask {
+	mask-image: linear-gradient(
+		to right,
+		transparent,
+		black 12px,
+		black calc(100% - 12px),
+		transparent
+	);
+}
+
 .breadcrumbs-scroll {
 	animation: breadcrumb-scroll 10s ease-in-out infinite;
 }
@@ -6,6 +6,7 @@ import {
 	HammerIcon,
 	LogInIcon,
 	UpdatedIcon,
+	WrenchIcon,
 	XIcon,
 } from '@modrinth/assets'
 import { ButtonStyled, Collapsible, injectNotificationManager } from '@modrinth/ui'
@@ -155,7 +156,7 @@ async function copyToClipboard(text) {

 <template>
 	<ModalWrapper ref="errorModal" :header="title" :closable="closable">
-		<div class="modal-body">
+		<div class="modal-body max-w-[550px]">
 			<div class="markdown-body">
 				<template v-if="errorType === 'minecraft_auth'">
 					<template v-if="metadata.network">
@@ -280,7 +281,7 @@ async function copyToClipboard(text) {
 					{{ debugInfo }}
 				</template>
 				<template v-if="hasDebugInfo">
-					<hr />
+					<div class="w-full h-[1px] bg-surface-5 mb-3"></div>
 					<p>
 						If nothing is working and you need help, visit
 						<a :href="supportLink">our support page</a>
@@ -296,28 +297,47 @@ async function copyToClipboard(text) {
 				<ButtonStyled v-if="closable">
 					<button @click="errorModal.hide()"><XIcon /> Close</button>
 				</ButtonStyled>
-				<ButtonStyled v-if="hasDebugInfo">
-					<button :disabled="copied" @click="copyToClipboard(debugInfo)">
-						<template v-if="copied"> <CheckIcon class="text-green" /> Copied! </template>
-						<template v-else> <CopyIcon /> Copy debug info </template>
-					</button>
-				</ButtonStyled>
 			</div>
 			<template v-if="hasDebugInfo">
-				<div class="bg-button-bg rounded-xl mt-2 overflow-clip">
-					<button
-						class="flex items-center justify-between w-full bg-transparent border-0 px-4 py-3 cursor-pointer"
-						@click="errorCollapsed = !errorCollapsed"
-					>
-						<span class="text-contrast font-extrabold m-0">Debug information:</span>
-						<DropdownIcon
-							class="h-5 w-5 text-secondary transition-transform"
-							:class="{ 'rotate-180': !errorCollapsed }"
-						/>
-					</button>
-					<Collapsible :collapsed="errorCollapsed">
-						<pre class="m-0 px-4 py-3 bg-bg rounded-none">{{ debugInfo }}</pre>
-					</Collapsible>
+				<div class="flex flex-col gap-2">
+					<div class="w-full h-[1px] bg-surface-5"></div>
+
+					<div class="overflow-clip">
+						<button
+							class="flex items-center justify-between w-full bg-transparent border-0 py-4 cursor-pointer"
+							@click="errorCollapsed = !errorCollapsed"
+						>
+							<span class="flex items-center gap-2 text-contrast font-extrabold m-0">
+								<WrenchIcon class="h-4 w-4" />
+								Debug information
+							</span>
+							<DropdownIcon
+								class="h-5 w-5 text-secondary transition-transform"
+								:class="{ 'rotate-180': !errorCollapsed }"
+							/>
+						</button>
+						<Collapsible :collapsed="errorCollapsed">
+							<div
+								class="p-3 bg-surface-2 rounded-2xl text-xs grid grid-cols-[1fr_auto] max-w-full items-start"
+							>
+								<div
+									class="m-0 p-0 rounded-none bg-transparent text-sm font-mono break-words overflow-auto"
+								>
+									{{ 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>
+							</div>
+						</Collapsible>
+					</div>
 				</div>
 			</template>
 		</div>
@@ -2,6 +2,7 @@
 import { GameIcon, LeftArrowIcon } from '@modrinth/assets'
 import { Avatar, ButtonStyled, FormattedTag } from '@modrinth/ui'
 import { convertFileSrc } from '@tauri-apps/api/core'
+import { computed } from 'vue'

 type Instance = {
 	game_version: string
@@ -12,18 +13,23 @@ type Instance = {
 	name: string
 }

-defineProps<{
-	instance: Instance
-}>()
+const props = withDefaults(
+	defineProps<{
+		instance: Instance
+		backTab?: string
+	}>(),
+	{ backTab: undefined },
+)
+
+const instanceLink = computed(() => {
+	const base = `/instance/${encodeURIComponent(props.instance.path)}`
+	return props.backTab ? `${base}/${props.backTab}` : base
+})
 </script>

 <template>
 	<div class="flex justify-between items-center border-0 border-b border-solid border-divider pb-4">
-		<router-link
-			:to="`/instance/${encodeURIComponent(instance.path)}`"
-			tabindex="-1"
-			class="flex flex-col gap-4 text-primary"
-		>
+		<router-link :to="instanceLink" tabindex="-1" class="flex flex-col gap-4 text-primary">
 			<span class="flex items-center gap-2">
 				<Avatar
 					:src="instance.icon_path ? convertFileSrc(instance.icon_path) : undefined"
@@ -43,9 +49,7 @@ defineProps<{
 			</span>
 		</router-link>
 		<ButtonStyled>
-			<router-link :to="`/instance/${encodeURIComponent(instance.path)}`">
-				<LeftArrowIcon /> Back to instance
-			</router-link>
+			<router-link :to="instanceLink"> <LeftArrowIcon /> Back to instance </router-link>
 		</ButtonStyled>
 	</div>
 </template>
@@ -3,6 +3,7 @@
 		v-if="typeof to === 'string'"
 		:to="to"
 		v-bind="$attrs"
+		:active-class="isSubpage ? '' : undefined"
 		:class="{
 			'router-link-active': isPrimary && isPrimary(route),
 			'subpage-active': isSubpage && isSubpage(route),
@@ -1,185 +0,0 @@
-<template>
-	<nav
-		v-if="filteredLinks.length > 1"
-		ref="scrollContainer"
-		class="card-shadow experimental-styles-within relative flex w-fit overflow-clip rounded-full bg-bg-raised p-1 text-sm font-bold"
-	>
-		<RouterLink
-			v-for="(link, index) in filteredLinks"
-			v-show="link.shown === undefined ? true : link.shown"
-			:key="index"
-			ref="tabLinkElements"
-			:to="query ? (link.href ? `?${query}=${link.href}` : '?') : link.href"
-			:class="`button-animation z-[1] flex flex-row items-center gap-2 px-4 py-2 focus:rounded-full ${activeIndex === index && !subpageSelected ? 'text-button-textSelected' : activeIndex === index && subpageSelected ? 'text-contrast' : 'text-primary'}`"
-		>
-			<component :is="link.icon" v-if="link.icon" class="size-5" />
-			<span class="text-nowrap">{{ link.label }}</span>
-		</RouterLink>
-		<div
-			:class="[
-				'pointer-events-none absolute h-[calc(100%-0.5rem)] overflow-hidden rounded-full p-1',
-				subpageSelected ? 'bg-button-bg' : 'bg-button-bgSelected',
-				{ 'navtabs-transition': transitionsEnabled },
-			]"
-			:style="{
-				left: sliderLeftPx,
-				top: sliderTopPx,
-				right: sliderRightPx,
-				bottom: sliderBottomPx,
-				opacity: sliderReady && activeIndex !== -1 ? 1 : 0,
-			}"
-			aria-hidden="true"
-		></div>
-	</nav>
-</template>
-
-<script setup lang="ts">
-import { computed, nextTick, onMounted, onUnmounted, ref, watch } from 'vue'
-import type { RouteLocationRaw } from 'vue-router'
-import { RouterLink, useRoute } from 'vue-router'
-
-const route = useRoute()
-
-interface Tab {
-	label: string
-	href: string | RouteLocationRaw
-	shown?: boolean
-	icon?: unknown
-	subpages?: string[]
-}
-
-const props = defineProps<{
-	links: Tab[]
-	query?: string
-}>()
-
-const scrollContainer = ref<HTMLElement | null>(null)
-const sliderLeft = ref(4)
-const sliderTop = ref(4)
-const sliderRight = ref(4)
-const sliderBottom = ref(4)
-const activeIndex = ref(-1)
-const subpageSelected = ref(false)
-const sliderReady = ref(false)
-const transitionsEnabled = ref(false)
-const sliderDelays = ref({ left: '0ms', top: '0ms', right: '0ms', bottom: '0ms' })
-
-const filteredLinks = computed(() =>
-	props.links.filter((x) => (x.shown === undefined ? true : x.shown)),
-)
-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 leftDelay = computed(() => sliderDelays.value.left)
-const rightDelay = computed(() => sliderDelays.value.right)
-const topDelay = computed(() => sliderDelays.value.top)
-const bottomDelay = computed(() => sliderDelays.value.bottom)
-
-function pickLink() {
-	let index = -1
-	subpageSelected.value = false
-	for (let i = filteredLinks.value.length - 1; i >= 0; i--) {
-		const link = filteredLinks.value[i]
-
-		if (route.path === (typeof link.href === 'string' ? link.href : link.href.path)) {
-			index = i
-			break
-		} else if (link.subpages && link.subpages.some((subpage) => route.path.includes(subpage))) {
-			index = i
-			subpageSelected.value = true
-			break
-		}
-	}
-	activeIndex.value = index
-
-	if (activeIndex.value !== -1) {
-		startAnimation()
-	} else {
-		sliderLeft.value = 0
-		sliderRight.value = 0
-	}
-}
-
-function getTabElement(index: number): HTMLElement | null {
-	if (index === -1) return null
-	const container = scrollContainer.value
-	if (!container) return null
-	const tabs = container.querySelectorAll('.button-animation')
-	return (tabs[index] as HTMLElement) ?? null
-}
-
-function startAnimation() {
-	const el = getTabElement(activeIndex.value)
-	if (!el?.offsetParent) return
-
-	const parent = el.offsetParent as HTMLElement
-	const newValues = {
-		left: el.offsetLeft,
-		top: el.offsetTop,
-		right: parent.offsetWidth - el.offsetLeft - el.offsetWidth,
-		bottom: parent.offsetHeight - el.offsetTop - el.offsetHeight,
-	}
-
-	const isInitialPosition = sliderLeft.value === 4 && sliderRight.value === 4
-
-	if (isInitialPosition) {
-		sliderLeft.value = newValues.left
-		sliderRight.value = newValues.right
-		sliderTop.value = newValues.top
-		sliderBottom.value = newValues.bottom
-		sliderReady.value = true
-		requestAnimationFrame(() => {
-			transitionsEnabled.value = true
-		})
-	} else {
-		const STAGGER_DELAY = '200ms'
-		sliderDelays.value = {
-			left: newValues.left < sliderLeft.value ? '0ms' : STAGGER_DELAY,
-			right: newValues.left < sliderLeft.value ? STAGGER_DELAY : '0ms',
-			top: newValues.top < sliderTop.value ? '0ms' : STAGGER_DELAY,
-			bottom: newValues.top < sliderTop.value ? STAGGER_DELAY : '0ms',
-		}
-		sliderLeft.value = newValues.left
-		sliderRight.value = newValues.right
-		sliderTop.value = newValues.top
-		sliderBottom.value = newValues.bottom
-	}
-}
-
-onMounted(async () => {
-	window.addEventListener('resize', pickLink)
-	await nextTick()
-	pickLink()
-})
-
-onUnmounted(() => {
-	window.removeEventListener('resize', pickLink)
-})
-
-watch(
-	filteredLinks,
-	async () => {
-		await nextTick()
-		pickLink()
-	},
-	{ deep: true },
-)
-
-watch(route, async () => {
-	await nextTick()
-	pickLink()
-})
-</script>
-<style scoped>
-.navtabs-transition {
-	/* Delay on opacity is to hide any jankiness as the page loads */
-	transition:
-		left 150ms cubic-bezier(0.4, 0, 0.2, 1) v-bind(leftDelay),
-		right 150ms cubic-bezier(0.4, 0, 0.2, 1) v-bind(rightDelay),
-		top 150ms cubic-bezier(0.4, 0, 0.2, 1) v-bind(topDelay),
-		bottom 150ms cubic-bezier(0.4, 0, 0.2, 1) v-bind(bottomDelay),
-		opacity 250ms cubic-bezier(0.5, 0, 0.2, 1) 50ms;
-}
-</style>
@@ -1,142 +0,0 @@
-<template>
-	<ProjectCard
-		:title="project.name"
-		:link="
-			() => {
-				emit('open')
-				$router.push({
-					path: `/project/${project.project_id ?? project.id}`,
-					query: { i: props.instance ? props.instance.path : undefined },
-				})
-			}
-		"
-		:author="{ name: project.author, link: `https://modrinth.com/user/${project.author}` }"
-		:icon-url="project.icon_url"
-		:summary="project.summary"
-		:tags="project.display_categories"
-		:all-tags="project.categories"
-		:downloads="project.downloads"
-		:followers="project.follows"
-		:date-updated="project.date_modified"
-		:banner="project.featured_gallery ?? undefined"
-		:color="project.color ?? undefined"
-		:environment="
-			['mod', 'modpack'].includes(projectType)
-				? {
-						clientSide: project.client_side?.[0],
-						serverSide: project.server_side?.[0],
-					}
-				: undefined
-		"
-		layout="list"
-	>
-		<template #actions>
-			<ButtonStyled color="brand" type="outlined">
-				<button
-					:disabled="installed || installing"
-					class="shrink-0 no-wrap"
-					@click.stop="install()"
-				>
-					<SpinnerIcon v-if="installing" class="animate-spin" />
-					<template v-else-if="!installed">
-						<DownloadIcon v-if="modpack || instance" />
-						<PlusIcon v-else />
-					</template>
-					<CheckIcon v-else />
-					{{
-						installing
-							? 'Installing'
-							: installed
-								? 'Installed'
-								: modpack || instance
-									? 'Install'
-									: 'Add to an instance'
-					}}
-				</button>
-			</ButtonStyled>
-		</template>
-	</ProjectCard>
-</template>
-
-<script setup>
-import { CheckIcon, DownloadIcon, PlusIcon, SpinnerIcon } from '@modrinth/assets'
-import { ButtonStyled, injectNotificationManager, ProjectCard } from '@modrinth/ui'
-import dayjs from 'dayjs'
-import relativeTime from 'dayjs/plugin/relativeTime'
-import { computed, ref } from 'vue'
-import { useRouter } from 'vue-router'
-
-import { injectContentInstall } from '@/providers/content-install'
-
-const { install: installVersion } = injectContentInstall()
-
-dayjs.extend(relativeTime)
-
-const { handleError } = injectNotificationManager()
-
-const router = useRouter()
-
-const props = defineProps({
-	backgroundImage: {
-		type: String,
-		default: null,
-	},
-	project: {
-		type: Object,
-		required: true,
-	},
-	instance: {
-		type: Object,
-		default: null,
-	},
-	featured: {
-		type: Boolean,
-		default: false,
-	},
-	installed: {
-		type: Boolean,
-		default: false,
-	},
-	projectType: {
-		type: String,
-		default: undefined,
-	},
-	activeLoader: {
-		type: String,
-		default: null,
-	},
-	activeGameVersion: {
-		type: String,
-		default: null,
-	},
-})
-
-const emit = defineEmits(['open', 'install'])
-
-const installing = ref(false)
-
-async function install() {
-	installing.value = true
-	await installVersion(
-		props.project.project_id ?? props.project.id,
-		null,
-		props.instance ? props.instance.path : null,
-		'SearchCard',
-		(versionId) => {
-			installing.value = false
-			if (versionId) {
-				emit('install', props.project.project_id ?? props.project.id)
-			}
-		},
-		(profile) => {
-			router.push(`/instance/${profile}`)
-		},
-		{
-			preferredLoader: props.activeLoader ?? undefined,
-			preferredGameVersion: props.activeGameVersion ?? undefined,
-		},
-	).catch(handleError)
-}
-
-const modpack = computed(() => props.project.project_types?.includes('modpack'))
-</script>
@@ -1,11 +1,9 @@
 <script setup>
-import { Button, injectNotificationManager } from '@modrinth/ui'
+import { Button, injectNotificationManager, ProjectCard } from '@modrinth/ui'
 import { ref } from 'vue'

 import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
-import SearchCard from '@/components/ui/SearchCard.vue'
-import { get_project, get_version } from '@/helpers/cache.js'
-import { get_categories } from '@/helpers/tags.js'
+import { get_project_v3, get_version } from '@/helpers/cache.js'
 import { injectContentInstall } from '@/providers/content-install'

 const { handleError } = injectNotificationManager()
@@ -14,26 +12,22 @@ const { install: installVersion } = injectContentInstall()
 const confirmModal = ref(null)
 const project = ref(null)
 const version = ref(null)
-const categories = ref(null)
 const installing = ref(false)

 defineExpose({
 	async show(event) {
 		if (event.event === 'InstallVersion') {
 			version.value = await get_version(event.id, 'must_revalidate').catch(handleError)
-			project.value = await get_project(version.value.project_id, 'must_revalidate').catch(
+			project.value = await get_project_v3(version.value.project_id, 'must_revalidate').catch(
 				handleError,
 			)
 		} else {
-			project.value = await get_project(event.id, 'must_revalidate').catch(handleError)
+			project.value = await get_project_v3(event.id, 'must_revalidate').catch(handleError)
 			version.value = await get_version(
 				project.value.versions[project.value.versions.length - 1],
 				'must_revalidate',
 			).catch(handleError)
 		}
-		categories.value = (await get_categories().catch(handleError)).filter(
-			(cat) => project.value.categories.includes(cat.name) && cat.project_type === 'mod',
-		)
 		confirmModal.value.show()
 	},
 })
@@ -52,13 +46,22 @@ async function install() {
 </script>

 <template>
-	<ModalWrapper ref="confirmModal" :header="`Install ${project?.title}`">
+	<ModalWrapper ref="confirmModal" :header="`Install ${project?.name}`">
 		<div class="modal-body">
-			<SearchCard
-				:project="project"
+			<ProjectCard
+				:title="project.name"
+				:link="() => confirmModal.hide()"
+				:icon-url="project.icon_url"
+				:summary="project.summary"
+				:tags="project.display_categories"
+				:all-tags="project.categories"
+				:downloads="project.downloads"
+				:followers="project.follows"
+				:date-updated="project.date_modified"
+				:banner="project.featured_gallery ?? undefined"
+				:color="project.color ?? undefined"
+				layout="list"
 				class="project-card"
-				:categories="categories"
-				@open="confirmModal.hide()"
 			/>
 			<div class="button-row">
 				<div class="markdown-body">
@@ -30,19 +30,19 @@ const deleteConfirmModal = ref()

 const { instance } = injectInstanceSettings()

-const title = ref(instance.name)
-const icon: Ref<string | undefined> = ref(instance.icon_path)
-const groups = ref(instance.groups)
+const title = ref(instance.value.name)
+const icon: Ref<string | undefined> = ref(instance.value.icon_path)
+const groups = ref([...instance.value.groups])

 const newCategoryInput = ref('')

-const installing = computed(() => instance.install_stage !== 'installed')
+const installing = computed(() => instance.value.install_stage !== 'installed')

 async function duplicateProfile() {
-	await duplicate(instance.path).catch(handleError)
+	await duplicate(instance.value.path).catch(handleError)
 	trackEvent('InstanceDuplicate', {
-		loader: instance.loader,
-		game_version: instance.game_version,
+		loader: instance.value.loader,
+		game_version: instance.value.game_version,
 	})
 }

@@ -53,7 +53,7 @@ const availableGroups = computed(() => [

 async function resetIcon() {
 	icon.value = undefined
-	await edit_icon(instance.path, null).catch(handleError)
+	await edit_icon(instance.value.path, null).catch(handleError)
 	trackEvent('InstanceRemoveIcon')
 }

@@ -71,7 +71,7 @@ async function setIcon() {
 	if (!value) return

 	icon.value = value
-	await edit_icon(instance.path, icon.value).catch(handleError)
+	await edit_icon(instance.value.path, icon.value).catch(handleError)

 	trackEvent('InstanceSetIcon')
 }
@@ -102,7 +102,7 @@ watch(
 	[title, groups, groups],
 	async () => {
 		if (removing.value) return
-		await edit(instance.path, editProfileObject.value).catch(handleError)
+		await edit(instance.value.path, editProfileObject.value).catch(handleError)
 	},
 	{ deep: true },
 )
@@ -110,11 +110,11 @@ watch(
 const removing = ref(false)
 async function removeProfile() {
 	removing.value = true
-	const path = instance.path
+	const path = instance.value.path

 	trackEvent('InstanceRemove', {
-		loader: instance.loader,
-		game_version: instance.game_version,
+		loader: instance.value.loader,
+		game_version: instance.value.game_version,
 	})

 	await router.push({ path: '/' })
@@ -198,45 +198,48 @@ const messages = defineMessages({
 <template>
 	<ConfirmDeleteInstanceModal ref="deleteConfirmModal" @delete="removeProfile" />
 	<div class="block">
-		<div class="float-end ml-4 relative group">
-			<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"
-				:options="[
-					{
-						id: 'select',
-						action: () => setIcon(),
-					},
-					{
-						id: 'remove',
-						color: 'danger',
-						action: () => resetIcon(),
-						shown: !!icon,
-					},
-				]"
-			>
-				<Avatar
-					:src="icon ? convertFileSrc(icon) : icon"
-					size="108px"
-					class="!border-4 group-hover:brightness-75"
-					:tint-by="instance.path"
-					no-shadow
-				/>
-				<div class="absolute top-0 right-0 m-2">
-					<div
-						class="p-2 m-0 text-primary flex items-center justify-center aspect-square bg-button-bg rounded-full border-button-border border-solid border-[1px] hovering-icon-shadow"
+		<div class="float-end ml-10 relative group w-fit">
+			<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"
+						:options="[
+							{
+								id: 'select',
+								action: () => setIcon(),
+							},
+							{
+								id: 'remove',
+								color: 'danger',
+								action: () => resetIcon(),
+								shown: !!icon,
+							},
+						]"
 					>
-						<EditIcon aria-hidden="true" class="h-4 w-4 text-primary" />
-					</div>
+						<Avatar
+							:src="icon ? convertFileSrc(icon) : icon"
+							size="108px"
+							class="transition-[filter] group-hover:brightness-75"
+							:tint-by="instance.path"
+							no-shadow
+						/>
+						<div
+							class="absolute top-0 h-full w-full flex items-center justify-center opacity-0 transition-all group-hover:opacity-100"
+						>
+							<EditIcon aria-hidden="true" class="h-10 w-10 text-primary" />
+						</div>
+						<template #select>
+							<UploadIcon />
+							{{ icon ? formatMessage(messages.replaceIcon) : formatMessage(messages.selectIcon) }}
+						</template>
+						<template #remove> <TrashIcon /> {{ formatMessage(messages.removeIcon) }} </template>
+					</OverflowMenu>
 				</div>
-				<template #select>
-					<UploadIcon />
-					{{ icon ? formatMessage(messages.replaceIcon) : formatMessage(messages.selectIcon) }}
-				</template>
-				<template #remove> <TrashIcon /> {{ formatMessage(messages.removeIcon) }} </template>
-			</OverflowMenu>
+			</div>
 		</div>
-		<label for="instance-name" class="m-0 mb-1 text-lg font-extrabold text-contrast block">
+		<label for="instance-name" class="m-0 text-lg font-semibold text-contrast block">
 			{{ formatMessage(messages.name) }}
 		</label>
 		<div class="flex">
@@ -249,76 +252,82 @@ const messages = defineMessages({
 			/>
 		</div>
 		<template v-if="instance.install_stage == 'installed'">
-			<div>
-				<h2
-					id="duplicate-instance-label"
-					class="m-0 mt-4 mb-1 text-lg font-extrabold text-contrast block"
-				>
+			<div class="flex flex-col gap-2.5 mt-6">
+				<h2 id="duplicate-instance-label" class="m-0 text-lg font-semibold text-contrast block">
 					{{ formatMessage(messages.duplicateInstance) }}
 				</h2>
-				<p class="m-0 mb-2">
+				<ButtonStyled>
+					<button
+						v-tooltip="installing ? formatMessage(messages.duplicateButtonTooltipInstalling) : null"
+						aria-labelledby="duplicate-instance-label"
+						:disabled="installing"
+						class="w-max !shadow-none"
+						@click="duplicateProfile"
+					>
+						<CopyIcon /> {{ formatMessage(messages.duplicateButton) }}
+					</button>
+				</ButtonStyled>
+				<p class="m-0">
 					{{ formatMessage(messages.duplicateInstanceDescription) }}
 				</p>
 			</div>
-			<ButtonStyled>
+		</template>
+		<div class="flex flex-col gap-2.5 mt-6">
+			<h2 class="m-0 text-lg font-semibold text-contrast block">
+				{{ formatMessage(messages.libraryGroups) }}
+			</h2>
+
+			<div class="flex flex-col gap-1">
+				<Checkbox
+					v-for="group in availableGroups"
+					:key="group"
+					:model-value="groups.includes(group)"
+					:label="group"
+					@click="toggleGroup(group)"
+				/>
+				<div class="flex gap-2 items-center">
+					<StyledInput
+						v-model="newCategoryInput"
+						:placeholder="formatMessage(messages.libraryGroupsEnterName)"
+						class="w-full max-w-[300px]"
+						@submit="() => addCategory"
+					/>
+					<ButtonStyled>
+						<button class="w-fit !shadow-none" @click="() => addCategory()">
+							<PlusIcon /> {{ formatMessage(messages.libraryGroupsCreate) }}
+						</button>
+					</ButtonStyled>
+				</div>
+			</div>
+			<p class="m-0">
+				{{ formatMessage(messages.libraryGroupsDescription) }}
+			</p>
+		</div>
+
+		<div class="flex flex-col gap-2.5 mt-6">
+			<h2 id="delete-instance-label" class="m-0 text-lg font-semibold text-contrast block">
+				{{ formatMessage(messages.deleteInstance) }}
+			</h2>
+			<ButtonStyled color="red">
 				<button
-					v-tooltip="installing ? formatMessage(messages.duplicateButtonTooltipInstalling) : null"
-					aria-labelledby="duplicate-instance-label"
-					:disabled="installing"
-					@click="duplicateProfile"
+					aria-labelledby="delete-instance-label"
+					:disabled="removing"
+					class="w-fit !shadow-none"
+					@click="deleteConfirmModal.show()"
 				>
-					<CopyIcon /> {{ formatMessage(messages.duplicateButton) }}
+					<SpinnerIcon v-if="removing" class="animate-spin" />
+					<TrashIcon v-else />
+					{{
+						removing
+							? formatMessage(messages.deletingInstanceButton)
+							: formatMessage(messages.deleteInstanceButton)
+					}}
 				</button>
 			</ButtonStyled>
-		</template>
-		<h2 class="m-0 mt-4 mb-1 text-lg font-extrabold text-contrast block">
-			{{ formatMessage(messages.libraryGroups) }}
-		</h2>
-		<p class="m-0 mb-2">
-			{{ formatMessage(messages.libraryGroupsDescription) }}
-		</p>
-		<div class="flex flex-col gap-1">
-			<Checkbox
-				v-for="group in availableGroups"
-				:key="group"
-				:model-value="groups.includes(group)"
-				:label="group"
-				@click="toggleGroup(group)"
-			/>
-			<div class="flex gap-2 items-center">
-				<StyledInput
-					v-model="newCategoryInput"
-					:placeholder="formatMessage(messages.libraryGroupsEnterName)"
-					@submit="() => addCategory"
-				/>
-				<ButtonStyled>
-					<button class="w-fit" @click="() => addCategory()">
-						<PlusIcon /> {{ formatMessage(messages.libraryGroupsCreate) }}
-					</button>
-				</ButtonStyled>
-			</div>
+			<p class="m-0">
+				{{ formatMessage(messages.deleteInstanceDescription) }}
+			</p>
 		</div>
-		<h2 id="delete-instance-label" class="m-0 mt-4 mb-1 text-lg font-extrabold text-contrast block">
-			{{ formatMessage(messages.deleteInstance) }}
-		</h2>
-		<p class="m-0 mb-2">
-			{{ formatMessage(messages.deleteInstanceDescription) }}
-		</p>
-		<ButtonStyled color="red">
-			<button
-				aria-labelledby="delete-instance-label"
-				:disabled="removing"
-				@click="deleteConfirmModal.show()"
-			>
-				<SpinnerIcon v-if="removing" class="animate-spin" />
-				<TrashIcon v-else />
-				{{
-					removing
-						? formatMessage(messages.deletingInstanceButton)
-						: formatMessage(messages.deleteInstanceButton)
-				}}
-			</button>
-		</ButtonStyled>
 	</div>
 </template>
 <style scoped lang="scss">
@@ -22,9 +22,11 @@ const { instance } = injectInstanceSettings()
 const globalSettings = (await get().catch(handleError)) as AppSettings

 const overrideHooks = ref(
-	!!instance.hooks.pre_launch || !!instance.hooks.wrapper || !!instance.hooks.post_exit,
+	!!instance.value.hooks.pre_launch ||
+		!!instance.value.hooks.wrapper ||
+		!!instance.value.hooks.post_exit,
 )
-const hooks = ref(instance.hooks ?? globalSettings.hooks)
+const hooks = ref(instance.value.hooks ?? globalSettings.hooks)

 const editProfileObject = computed(() => {
 	const editProfile: {
@@ -40,7 +42,7 @@ const editProfileObject = computed(() => {
 watch(
 	[overrideHooks, hooks],
 	async () => {
-		await edit(instance.path, editProfileObject.value)
+		await edit(instance.value.path, editProfileObject.value)
 	},
 	{ deep: true },
 )
@@ -99,57 +101,57 @@ const messages = defineMessages({

 <template>
 	<div>
-		<h2 class="m-0 mb-1 text-lg font-extrabold text-contrast">
+		<h2 class="m-0 m-0 text-lg font-semibold text-contrast">
 			{{ formatMessage(messages.hooks) }}
 		</h2>
+		<Checkbox v-model="overrideHooks" :label="formatMessage(messages.customHooks)" class="my-2.5" />
 		<p class="m-0">
 			{{ formatMessage(messages.hooksDescription) }}
 		</p>
-		<Checkbox v-model="overrideHooks" :label="formatMessage(messages.customHooks)" class="mt-2" />

-		<h2 class="mt-2 mb-1 text-lg font-extrabold text-contrast">
+		<h2 class="mt-6 m-0 text-lg font-semibold text-contrast">
 			{{ formatMessage(messages.preLaunch) }}
 		</h2>
-		<p class="m-0">
-			{{ formatMessage(messages.preLaunchDescription) }}
-		</p>
 		<StyledInput
 			id="pre-launch"
 			v-model="hooks.pre_launch"
 			autocomplete="off"
 			:disabled="!overrideHooks"
 			:placeholder="formatMessage(messages.preLaunchEnter)"
-			wrapper-class="w-full mt-2"
+			wrapper-class="w-full my-2.5"
 		/>
+		<p class="m-0">
+			{{ formatMessage(messages.preLaunchDescription) }}
+		</p>

-		<h2 class="mt-4 mb-1 text-lg font-extrabold text-contrast">
+		<h2 class="mt-6 m-0 text-lg font-semibold text-contrast">
 			{{ formatMessage(messages.wrapper) }}
 		</h2>
-		<p class="m-0">
-			{{ formatMessage(messages.wrapperDescription) }}
-		</p>
 		<StyledInput
 			id="wrapper"
 			v-model="hooks.wrapper"
 			autocomplete="off"
 			:disabled="!overrideHooks"
 			:placeholder="formatMessage(messages.wrapperEnter)"
-			wrapper-class="w-full mt-2"
+			wrapper-class="w-full my-2.5"
 		/>
+		<p class="m-0">
+			{{ formatMessage(messages.wrapperDescription) }}
+		</p>

-		<h2 class="mt-4 mb-1 text-lg font-extrabold text-contrast">
+		<h2 class="mt-6 m-0 text-lg font-semibold text-contrast">
 			{{ formatMessage(messages.postExit) }}
 		</h2>
-		<p class="m-0">
-			{{ formatMessage(messages.postExitDescription) }}
-		</p>
 		<StyledInput
 			id="post-exit"
 			v-model="hooks.post_exit"
 			autocomplete="off"
 			:disabled="!overrideHooks"
 			:placeholder="formatMessage(messages.postExitEnter)"
-			wrapper-class="w-full mt-2"
+			wrapper-class="w-full my-2.5"
 		/>
+		<p class="m-0">
+			{{ formatMessage(messages.postExitDescription) }}
+		</p>
 	</div>
 </template>
@@ -73,9 +73,9 @@ const [
 ])

 const { data: modpackInfo } = useQuery({
-	queryKey: computed(() => ['linkedModpackInfo', instance.path]),
-	queryFn: () => get_linked_modpack_info(instance.path, 'must_revalidate'),
-	enabled: computed(() => !!instance.linked_data?.project_id && !offline),
+	queryKey: computed(() => ['linkedModpackInfo', instance.value.path]),
+	queryFn: () => get_linked_modpack_info(instance.value.path, 'must_revalidate'),
+	enabled: computed(() => !!instance.value.linked_data?.project_id && !offline),
 })

 const repairing = ref(false)
@@ -101,13 +101,13 @@ function getManifest(loader: string) {
 provideAppBackup({
 	async createBackup() {
 		const allProfiles = await list()
-		const prefix = `${instance.name} - Backup #`
+		const prefix = `${instance.value.name} - Backup #`
 		const existingNums = allProfiles
 			.filter((p) => p.name.startsWith(prefix))
 			.map((p) => parseInt(p.name.slice(prefix.length), 10))
 			.filter((n) => !isNaN(n))
 		const nextNum = existingNums.length > 0 ? Math.max(...existingNums) + 1 : 1
-		const newPath = await duplicate(instance.path)
+		const newPath = await duplicate(instance.value.path)
 		await edit(newPath, { name: `${prefix}${nextNum}` })
 	},
 })
@@ -118,27 +118,30 @@ provideInstallationSettings({
 		const rows = [
 			{
 				label: formatMessage(commonMessages.platformLabel),
-				value: formatLoaderLabel(instance.loader),
+				value: formatLoaderLabel(instance.value.loader),
 			},
 			{
 				label: formatMessage(commonMessages.gameVersionLabel),
-				value: instance.game_version,
+				value: instance.value.game_version,
 			},
 		]
-		if (instance.loader !== 'vanilla' && instance.loader_version) {
+		if (instance.value.loader !== 'vanilla' && instance.value.loader_version) {
 			rows.push({
 				label: formatMessage(messages.loaderVersion, {
-					loader: formatLoaderLabel(instance.loader),
+					loader: formatLoaderLabel(instance.value.loader),
 				}),
-				value: instance.loader_version,
+				value: instance.value.loader_version,
 			})
 		}
 		return rows
 	}),
-	isLinked: computed(() => !!instance.linked_data?.locked),
+	isLinked: computed(() => !!instance.value.linked_data?.locked),
 	isBusy: computed(
 		() =>
-			instance.install_stage !== 'installed' || repairing.value || reinstalling.value || !!offline,
+			instance.value.install_stage !== 'installed' ||
+			repairing.value ||
+			reinstalling.value ||
+			!!offline,
 	),
 	modpack: computed(() => {
 		if (!modpackInfo.value) return null
@@ -149,9 +152,9 @@ provideInstallationSettings({
 			versionNumber: modpackInfo.value.version?.version_number,
 		}
 	}),
-	currentPlatform: computed(() => instance.loader),
-	currentGameVersion: computed(() => instance.game_version),
-	currentLoaderVersion: computed(() => instance.loader_version ?? ''),
+	currentPlatform: computed(() => instance.value.loader),
+	currentGameVersion: computed(() => instance.value.game_version),
+	currentLoaderVersion: computed(() => instance.value.loader_version ?? ''),
 	availablePlatforms: loaders?.value?.map((x) => x.name) ?? [],

 	resolveGameVersions(loader, showSnapshots) {
@@ -194,50 +197,50 @@ provideInstallationSettings({
 		if (platform !== 'vanilla' && loaderVersionId) {
 			editProfile.loader_version = loaderVersionId
 		}
-		await edit(instance.path, editProfile).catch(handleError)
+		await edit(instance.value.path, editProfile).catch(handleError)
 	},

 	afterSave: async () => {
-		await install(instance.path, false).catch(handleError)
+		await install(instance.value.path, false).catch(handleError)
 		trackEvent('InstanceRepair', {
-			loader: instance.loader,
-			game_version: instance.game_version,
+			loader: instance.value.loader,
+			game_version: instance.value.game_version,
 		})
 	},

 	async repair() {
 		repairing.value = true
-		await install(instance.path, true).catch(handleError)
+		await install(instance.value.path, true).catch(handleError)
 		repairing.value = false
 		trackEvent('InstanceRepair', {
-			loader: instance.loader,
-			game_version: instance.game_version,
+			loader: instance.value.loader,
+			game_version: instance.value.game_version,
 		})
 	},

 	async reinstallModpack() {
 		reinstalling.value = true
-		await update_repair_modrinth(instance.path).catch(handleError)
+		await update_repair_modrinth(instance.value.path).catch(handleError)
 		reinstalling.value = false
 		trackEvent('InstanceRepair', {
-			loader: instance.loader,
-			game_version: instance.game_version,
+			loader: instance.value.loader,
+			game_version: instance.value.game_version,
 		})
 	},

 	async unlinkModpack() {
-		await edit(instance.path, {
+		await edit(instance.value.path, {
 			linked_data: null as unknown as undefined,
 		})
 		await queryClient.invalidateQueries({
-			queryKey: ['linkedModpackInfo', instance.path],
+			queryKey: ['linkedModpackInfo', instance.value.path],
 		})
 		onUnlinked()
 	},

 	getCachedModpackVersions: () => null,
 	async fetchModpackVersions() {
-		const versions = await get_project_versions(instance.linked_data!.project_id!).catch(
+		const versions = await get_project_versions(instance.value.linked_data!.project_id!).catch(
 			handleError,
 		)
 		return (versions ?? []) as Labrinth.Versions.v2.Version[]
@@ -250,20 +253,20 @@ provideInstallationSettings({
 	},

 	async onModpackVersionConfirm(version) {
-		await update_managed_modrinth_version(instance.path, version.id)
+		await update_managed_modrinth_version(instance.value.path, version.id)
 		await queryClient.invalidateQueries({
-			queryKey: ['linkedModpackInfo', instance.path],
+			queryKey: ['linkedModpackInfo', instance.value.path],
 		})
 	},

 	updaterModalProps: computed(() => ({
 		isApp: true,
 		currentVersionId:
-			modpackInfo.value?.update_version_id ?? instance.linked_data?.version_id ?? '',
+			modpackInfo.value?.update_version_id ?? instance.value.linked_data?.version_id ?? '',
 		projectIconUrl: modpackInfo.value?.project?.icon_url,
 		projectName: modpackInfo.value?.project?.title ?? 'Modpack',
-		currentGameVersion: instance.game_version,
-		currentLoader: instance.loader,
+		currentGameVersion: instance.value.game_version,
+		currentLoader: instance.value.loader,
 	})),

 	isServer: false,
@@ -25,20 +25,24 @@ const { instance } = injectInstanceSettings()

 const globalSettings = (await get().catch(handleError)) as unknown as AppSettings

-const overrideJavaInstall = ref(!!instance.java_path)
-const optimalJava = readonly(await get_optimal_jre_key(instance.path).catch(handleError))
-const javaInstall = ref({ path: optimalJava.path ?? instance.java_path })
+const overrideJavaInstall = ref(!!instance.value.java_path)
+const optimalJava = readonly(await get_optimal_jre_key(instance.value.path).catch(handleError))
+const javaInstall = ref({ path: optimalJava.path ?? instance.value.java_path })

-const overrideJavaArgs = ref((instance.extra_launch_args?.length ?? 0) > 0)
-const javaArgs = ref((instance.extra_launch_args ?? globalSettings.extra_launch_args).join(' '))
-
-const overrideEnvVars = ref((instance.custom_env_vars?.length ?? 0) > 0)
-const envVars = ref(
-	(instance.custom_env_vars ?? globalSettings.custom_env_vars).map((x) => x.join('=')).join(' '),
+const overrideJavaArgs = ref((instance.value.extra_launch_args?.length ?? 0) > 0)
+const javaArgs = ref(
+	(instance.value.extra_launch_args ?? globalSettings.extra_launch_args).join(' '),
 )

-const overrideMemorySettings = ref(!!instance.memory)
-const memory = ref(instance.memory ?? globalSettings.memory)
+const overrideEnvVars = ref((instance.value.custom_env_vars?.length ?? 0) > 0)
+const envVars = ref(
+	(instance.value.custom_env_vars ?? globalSettings.custom_env_vars)
+		.map((x) => x.join('='))
+		.join(' '),
+)
+
+const overrideMemorySettings = ref(!!instance.value.memory)
+const memory = ref(instance.value.memory ?? globalSettings.memory)
 const { maxMemory, snapPoints } = (await useMemorySlider().catch(handleError)) as unknown as {
 	maxMemory: number
 	snapPoints: number[]
@@ -76,7 +80,7 @@ watch(
 		memory,
 	],
 	async () => {
-		await edit(instance.path, editProfileObject.value)
+		await edit(instance.value.path, editProfileObject.value)
 	},
 	{ deep: true },
 )
@@ -107,10 +111,10 @@ const messages = defineMessages({

 <template>
 	<div>
-		<h2 id="project-name" class="m-0 mb-1 text-lg font-extrabold text-contrast block">
+		<h2 id="project-name" class="m-0 mb-2.5 text-lg font-semibold text-contrast block">
 			{{ formatMessage(messages.javaInstallation) }}
 		</h2>
-		<Checkbox v-model="overrideJavaInstall" label="Custom Java installation" class="mb-2" />
+		<Checkbox v-model="overrideJavaInstall" label="Custom Java installation" class="mb-2.5" />
 		<template v-if="!overrideJavaInstall">
 			<div class="flex my-2 items-center gap-2 font-semibold">
 				<template v-if="javaInstall">
@@ -140,10 +144,10 @@ const messages = defineMessages({
 			</div>
 		</template>
 		<JavaSelector v-if="overrideJavaInstall || !javaInstall" v-model="javaInstall" />
-		<h2 id="project-name" class="mt-4 mb-1 text-lg font-extrabold text-contrast block">
+		<h2 id="project-name" class="mt-6 mb-2.5 text-lg font-semibold text-contrast block">
 			{{ formatMessage(messages.javaMemory) }}
 		</h2>
-		<Checkbox v-model="overrideMemorySettings" label="Custom memory allocation" class="mb-2" />
+		<Checkbox v-model="overrideMemorySettings" label="Custom memory allocation" class="mb-2.5" />
 		<Slider
 			id="max-memory"
 			v-model="memory.maximum"
@@ -155,7 +159,7 @@ const messages = defineMessages({
 			:snap-range="512"
 			unit="MB"
 		/>
-		<h2 id="project-name" class="mt-4 mb-1 text-lg font-extrabold text-contrast block">
+		<h2 id="project-name" class="mt-6 mb-2.5 text-lg font-semibold text-contrast block">
 			{{ formatMessage(messages.javaArguments) }}
 		</h2>
 		<Checkbox v-model="overrideJavaArgs" label="Custom java arguments" class="my-2" />
@@ -167,10 +171,10 @@ const messages = defineMessages({
 			placeholder="Enter java arguments..."
 			wrapper-class="w-full"
 		/>
-		<h2 id="project-name" class="mt-4 mb-1 text-lg font-extrabold text-contrast block">
+		<h2 id="project-name" class="mt-6 mb-2.5 text-lg font-semibold text-contrast block">
 			{{ formatMessage(messages.javaEnvironmentVariables) }}
 		</h2>
-		<Checkbox v-model="overrideEnvVars" label="Custom environment variables" class="mb-2" />
+		<Checkbox v-model="overrideEnvVars" label="Custom environment variables" class="mb-2.5" />
 		<StyledInput
 			id="env-vars"
 			v-model="envVars"
@@ -22,12 +22,14 @@ const { instance } = injectInstanceSettings()

 const globalSettings = (await get().catch(handleError)) as AppSettings

-const overrideWindowSettings = ref(!!instance.game_resolution || !!instance.force_fullscreen)
+const overrideWindowSettings = ref(
+	!!instance.value.game_resolution || !!instance.value.force_fullscreen,
+)
 const resolution: Ref<[number, number]> = ref(
-	instance.game_resolution ?? (globalSettings.game_resolution.slice() as [number, number]),
+	instance.value.game_resolution ?? (globalSettings.game_resolution.slice() as [number, number]),
 )
 const fullscreenSetting: Ref<boolean> = ref(
-	instance.force_fullscreen ?? globalSettings.force_fullscreen,
+	instance.value.force_fullscreen ?? globalSettings.force_fullscreen,
 )

 const editProfileObject = computed(() => {
@@ -46,7 +48,7 @@ const editProfileObject = computed(() => {
 watch(
 	[overrideWindowSettings, resolution, fullscreenSetting],
 	async () => {
-		await edit(instance.path, editProfileObject.value)
+		await edit(instance.value.path, editProfileObject.value)
 	},
 	{ deep: true },
 )
@@ -92,14 +94,14 @@ const messages = defineMessages({
 </script>

 <template>
-	<div>
+	<div class="flex flex-col gap-6">
 		<Checkbox
 			v-model="overrideWindowSettings"
 			:label="formatMessage(messages.customWindowSettings)"
 		/>
-		<div class="mt-2 flex items-center gap-4 justify-between">
-			<div>
-				<h2 class="m-0 mb-1 text-lg font-extrabold text-contrast">
+		<div class="flex items-center gap-4 justify-between">
+			<div class="flex flex-col gap-1">
+				<h2 class="m-0 text-lg font-semibold text-contrast">
 					{{ formatMessage(messages.fullscreen) }}
 				</h2>
 				<p class="m-0">
@@ -118,9 +120,9 @@ const messages = defineMessages({
 			/>
 		</div>

-		<div class="mt-4 flex items-center gap-4 justify-between">
-			<div>
-				<h2 class="m-0 mb-1 text-lg font-extrabold text-contrast">
+		<div class="flex items-center gap-4 justify-between">
+			<div class="flex flex-col gap-1">
+				<h2 class="m-0 text-lg font-semibold text-contrast">
 					{{ formatMessage(messages.width) }}
 				</h2>
 				<p class="m-0">
@@ -137,9 +139,9 @@ const messages = defineMessages({
 			/>
 		</div>

-		<div class="mt-4 flex items-center gap-4 justify-between">
-			<div>
-				<h2 class="m-0 mb-1 text-lg font-extrabold text-contrast">
+		<div class="flex items-center gap-4 justify-between">
+			<div class="flex flex-col gap-1">
+				<h2 class="m-0 text-lg font-semibold text-contrast">
 					{{ formatMessage(messages.height) }}
 				</h2>
 				<p class="m-0">
@@ -6,12 +6,13 @@ import {
 	LanguagesIcon,
 	ModrinthIcon,
 	PaintbrushIcon,
-	ReportIcon,
 	SettingsIcon,
 	ShieldIcon,
+	ToggleRightIcon,
 } from '@modrinth/assets'
 import {
 	commonMessages,
+	commonSettingsMessages,
 	defineMessage,
 	defineMessages,
 	ProgressBar,
@@ -95,11 +96,8 @@ const tabs = [
 		content: ResourceManagementSettings,
 	},
 	{
-		name: defineMessage({
-			id: 'app.settings.tabs.feature-flags',
-			defaultMessage: 'Feature flags',
-		}),
-		icon: ReportIcon,
+		name: commonSettingsMessages.featureFlags,
+		icon: ToggleRightIcon,
 		content: FeatureFlagSettings,
 		developerOnly: true,
 	},
@@ -179,7 +177,7 @@ const messages = defineMessages({
 					>
 						<ModrinthIcon class="w-6 h-6" />
 					</button>
-					<div>
+					<div class="max-w-[200px]">
 						<p class="m-0">Modrinth App {{ version }}</p>
 						<p class="m-0">
 							<span v-if="osPlatform === 'macos'">macOS</span>
@@ -44,8 +44,10 @@ const emit = defineEmits<{
 const isMinecraftServer = ref(false)
 const handleUnlinked = () => emit('unlinked')

+const instanceRef = computed(() => props.instance)
+
 provideInstanceSettings({
-	instance: props.instance,
+	instance: instanceRef,
 	offline: props.offline,
 	isMinecraftServer,
 	onUnlinked: handleUnlinked,
@@ -1,21 +1,31 @@
 <template>
 	<NewModal ref="modal" :header="formatMessage(messages.header)" fade="warning" max-width="500px">
-		<Admonition type="warning" :header="formatMessage(messages.admonitionHeader)">
-			{{ formatMessage(messages.admonitionBody, { instanceName }) }}
-		</Admonition>
+		<p class="m-0 text-secondary">
+			<IntlFormatted :message-id="messages.body" :values="{ instanceName }">
+				<template #bold="{ children }">
+					<span class="font-medium text-contrast"><component :is="() => children" /></span>
+				</template>
+			</IntlFormatted>
+		</p>

 		<template #actions>
 			<div class="flex gap-2 justify-end">
 				<ButtonStyled type="outlined">
-					<button class="!border !border-surface-4" @click="handleGoToInstance">
-						<ExternalIcon />
-						{{ formatMessage(messages.goToInstance) }}
+					<button class="!border !border-surface-4" @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.createAnyway) }}
+						{{ formatMessage(messages.create) }}
 					</button>
 				</ButtonStyled>
 			</div>
@@ -24,8 +34,15 @@
 </template>

 <script setup lang="ts">
-import { ExternalIcon, PlusIcon } from '@modrinth/assets'
-import { Admonition, ButtonStyled, defineMessages, NewModal, useVIntl } from '@modrinth/ui'
+import { PlusIcon, RightArrowIcon, XIcon } from '@modrinth/assets'
+import {
+	ButtonStyled,
+	commonMessages,
+	defineMessages,
+	IntlFormatted,
+	NewModal,
+	useVIntl,
+} from '@modrinth/ui'
 import { ref } from 'vue'

 const { formatMessage } = useVIntl()
@@ -35,21 +52,18 @@ const messages = defineMessages({
 		id: 'app.instance.modpack-already-installed.header',
 		defaultMessage: 'Modpack already installed',
 	},
-	admonitionHeader: {
-		id: 'app.instance.modpack-already-installed.admonition-header',
-		defaultMessage: 'Duplicate modpack',
+	body: {
+		id: 'app.instance.modpack-already-installed.body',
+		defaultMessage:
+			'This modpack is already installed in the <bold>{instanceName}</bold> instance. Are you sure you want to duplicate it?',
 	},
-	admonitionBody: {
-		id: 'app.instance.modpack-already-installed.admonition-body',
-		defaultMessage: 'This modpack is already installed in the "{instanceName}" instance.',
+	instance: {
+		id: 'app.instance.modpack-already-installed.instance',
+		defaultMessage: 'Instance',
 	},
-	goToInstance: {
-		id: 'app.instance.modpack-already-installed.go-to-instance',
-		defaultMessage: 'Go to instance',
-	},
-	createAnyway: {
-		id: 'app.instance.modpack-already-installed.create-anyway',
-		defaultMessage: 'Create anyway',
+	create: {
+		id: 'app.instance.modpack-already-installed.create',
+		defaultMessage: 'Create',
 	},
 })

@@ -68,6 +82,10 @@ function show(name: string, path: string) {
 	modal.value?.show()
 }

+function handleCancel() {
+	modal.value?.hide()
+}
+
 function handleGoToInstance() {
 	modal.value?.hide()
 	emit('go-to-instance', instancePath.value)
@@ -21,7 +21,7 @@ watch(
 )
 </script>
 <template>
-	<h2 class="m-0 text-lg font-extrabold text-contrast">Color theme</h2>
+	<h2 class="m-0 text-lg font-semibold text-contrast">Color theme</h2>
 	<p class="m-0 mt-1">Select your preferred color theme for Modrinth App.</p>

 	<ThemeSelector
@@ -36,9 +36,9 @@ watch(
 		system-theme-color="system"
 	/>

-	<div class="mt-4 flex items-center justify-between">
+	<div class="mt-6 flex items-center justify-between">
 		<div>
-			<h2 class="m-0 text-lg font-extrabold text-contrast">Advanced rendering</h2>
+			<h2 class="m-0 text-lg font-semibold text-contrast">Advanced rendering</h2>
 			<p class="m-0 mt-1">
 				Enables advanced rendering such as blur effects that may cause performance issues without
 				hardware-accelerated rendering.
@@ -57,48 +57,48 @@ watch(
 		/>
 	</div>

-	<div class="mt-4 flex items-center justify-between">
+	<div class="mt-6 flex items-center justify-between">
 		<div>
-			<h2 class="m-0 text-lg font-extrabold text-contrast">Hide nametag</h2>
+			<h2 class="m-0 text-lg font-semibold text-contrast">Hide nametag</h2>
 			<p class="m-0 mt-1">Disables the nametag above your player on the skins page.</p>
 		</div>
 		<Toggle id="hide-nametag-skins-page" v-model="settings.hide_nametag_skins_page" />
 	</div>

-	<div v-if="os !== 'MacOS'" class="mt-4 flex items-center justify-between gap-4">
+	<div v-if="os !== 'MacOS'" class="mt-6 flex items-center justify-between gap-4">
 		<div>
-			<h2 class="m-0 text-lg font-extrabold text-contrast">Native decorations</h2>
+			<h2 class="m-0 text-lg font-semibold text-contrast">Native decorations</h2>
 			<p class="m-0 mt-1">Use system window frame (app restart required).</p>
 		</div>
 		<Toggle id="native-decorations" v-model="settings.native_decorations" />
 	</div>

-	<div class="mt-4 flex items-center justify-between">
+	<div class="mt-6 flex items-center justify-between">
 		<div>
-			<h2 class="m-0 text-lg font-extrabold text-contrast">Minimize launcher</h2>
+			<h2 class="m-0 text-lg font-semibold text-contrast">Minimize launcher</h2>
 			<p class="m-0 mt-1">Minimize the launcher when a Minecraft process starts.</p>
 		</div>
 		<Toggle id="minimize-launcher" v-model="settings.hide_on_process_start" />
 	</div>

-	<div class="mt-4 flex items-center justify-between">
+	<div class="mt-6 flex items-center justify-between">
 		<div>
-			<h2 class="m-0 text-lg font-extrabold text-contrast">Default landing page</h2>
+			<h2 class="m-0 text-lg font-semibold text-contrast">Default landing page</h2>
 			<p class="m-0 mt-1">Change the page to which the launcher opens on.</p>
 		</div>
 		<Combobox
 			id="opening-page"
 			v-model="settings.default_page"
 			name="Opening page dropdown"
-			class="w-40"
+			class="max-w-40"
 			:options="['Home', 'Library'].map((v) => ({ value: v, label: v }))"
 			:display-value="settings.default_page ?? 'Select an option'"
 		/>
 	</div>

-	<div class="mt-4 flex items-center justify-between">
+	<div class="mt-6 flex items-center justify-between">
 		<div>
-			<h2 class="m-0 text-lg font-extrabold text-contrast">Jump back into worlds</h2>
+			<h2 class="m-0 text-lg font-semibold text-contrast">Jump back into worlds</h2>
 			<p class="m-0 mt-1">Includes recent worlds in the "Jump back in" section on the Home page.</p>
 		</div>
 		<Toggle
@@ -113,9 +113,9 @@ watch(
 		/>
 	</div>

-	<div class="mt-4 flex items-center justify-between">
+	<div class="mt-6 flex items-center justify-between">
 		<div>
-			<h2 class="m-0 text-lg font-extrabold text-contrast">Toggle sidebar</h2>
+			<h2 class="m-0 text-lg font-semibold text-contrast">Toggle sidebar</h2>
 			<p class="m-0 mt-1">Enables the ability to toggle the sidebar.</p>
 		</div>
 		<Toggle
@@ -52,127 +52,135 @@ watch(

 <template>
 	<div>
-		<h2 class="m-0 text-lg font-extrabold text-contrast">Window size</h2>
+		<div class="flex flex-col gap-6">
+			<div class="flex items-center justify-between gap-4">
+				<div class="flex flex-col gap-1">
+					<h3 class="m-0 text-lg font-semibold text-contrast">Fullscreen</h3>
+					<p class="m-0 leading-tight">
+						Overwrites the options.txt file to start in full screen when launched.
+					</p>
+				</div>

-		<div class="flex items-center justify-between gap-4">
-			<div>
-				<h3 class="mt-2 m-0 text-base font-extrabold text-primary">Fullscreen</h3>
-				<p class="m-0 mt-1 mb-2 leading-tight text-secondary">
-					Overwrites the options.txt file to start in full screen when launched.
-				</p>
+				<Toggle id="fullscreen" v-model="settings.force_fullscreen" />
 			</div>

-			<Toggle id="fullscreen" v-model="settings.force_fullscreen" />
-		</div>
+			<div class="flex items-center justify-between gap-4">
+				<div class="flex flex-col gap-1">
+					<h3 class="m-0 text-lg font-semibold text-contrast">Width</h3>
+					<p class="m-0 leading-tight">The width of the game window when launched.</p>
+				</div>

-		<div class="flex items-center justify-between gap-4">
-			<div>
-				<h3 class="mt-2 m-0 text-base font-extrabold text-primary">Width</h3>
-				<p class="m-0 mt-1 mb-2 leading-tight text-secondary">
-					The width of the game window when launched.
-				</p>
+				<StyledInput
+					id="width"
+					v-model="settings.game_resolution[0]"
+					:disabled="settings.force_fullscreen"
+					autocomplete="off"
+					type="number"
+					placeholder="Enter width..."
+				/>
 			</div>

-			<StyledInput
-				id="width"
-				v-model="settings.game_resolution[0]"
-				:disabled="settings.force_fullscreen"
-				autocomplete="off"
-				type="number"
-				placeholder="Enter width..."
-			/>
+			<div class="flex items-center justify-between gap-4">
+				<div class="flex flex-col gap-1">
+					<h3 class="m-0 text-lg font-semibold text-contrast">Height</h3>
+					<p class="m-0 leading-tight">The height of the game window when launched.</p>
+				</div>
+
+				<StyledInput
+					id="height"
+					v-model="settings.game_resolution[1]"
+					:disabled="settings.force_fullscreen"
+					autocomplete="off"
+					type="number"
+					placeholder="Enter height..."
+				/>
+			</div>
 		</div>

-		<div class="flex items-center justify-between gap-4">
-			<div>
-				<h3 class="mt-2 m-0 text-base font-extrabold text-primary">Height</h3>
-				<p class="m-0 mt-1 mb-2 leading-tight text-secondary">
-					The height of the game window when launched.
-				</p>
+		<hr class="my-6 bg-button-border border-none h-[1px]" />
+
+		<div class="flex flex-col gap-6">
+			<div class="flex flex-col gap-2.5">
+				<h2 class="m-0 text-lg font-semibold text-contrast">Memory allocated</h2>
+				<Slider
+					id="max-memory"
+					v-model="settings.memory.maximum"
+					:min="512"
+					:max="maxMemory"
+					:step="64"
+					:snap-points="snapPoints"
+					:snap-range="512"
+					unit="MB"
+				/>
+				<p class="m-0 mt-1 leading-tight">The memory allocated to each instance when it is ran.</p>
 			</div>

-			<StyledInput
-				id="height"
-				v-model="settings.game_resolution[1]"
-				:disabled="settings.force_fullscreen"
-				autocomplete="off"
-				type="number"
-				placeholder="Enter height..."
-			/>
+			<div class="flex flex-col gap-2.5">
+				<h2 class="m-0 text-lg font-semibold text-contrast">Java arguments</h2>
+				<StyledInput
+					id="java-args"
+					v-model="settings.launchArgs"
+					autocomplete="off"
+					type="text"
+					placeholder="Enter java arguments..."
+					wrapper-class="w-full"
+				/>
+			</div>
+
+			<div class="flex flex-col gap-2.5">
+				<h2 class="m-0 text-lg font-semibold text-contrast">Environmental variables</h2>
+				<StyledInput
+					id="env-vars"
+					v-model="settings.envVars"
+					autocomplete="off"
+					type="text"
+					placeholder="Enter environmental variables..."
+					wrapper-class="w-full"
+				/>
+			</div>
 		</div>

-		<hr class="mt-4 bg-button-border border-none h-[1px]" />
+		<hr class="my-6 bg-button-border border-none h-[1px]" />

-		<h2 class="mt-4 m-0 text-lg font-extrabold text-contrast">Memory allocated</h2>
-		<p class="m-0 mt-1 leading-tight">The memory allocated to each instance when it is ran.</p>
-		<Slider
-			id="max-memory"
-			v-model="settings.memory.maximum"
-			:min="512"
-			:max="maxMemory"
-			:step="64"
-			:snap-points="snapPoints"
-			:snap-range="512"
-			unit="MB"
-		/>
+		<div class="flex flex-col gap-6">
+			<div class="flex flex-col gap-2.5">
+				<h3 class="m-0 text-lg font-semibold text-contrast">Pre launch hook</h3>
+				<StyledInput
+					id="pre-launch"
+					v-model="settings.hooks.pre_launch"
+					autocomplete="off"
+					type="text"
+					placeholder="Enter pre-launch command..."
+					wrapper-class="w-full"
+				/>
+				<p class="m-0 leading-tight">Ran before the instance is launched.</p>
+			</div>

-		<h2 class="mt-4 mb-2 text-lg font-extrabold text-contrast">Java arguments</h2>
-		<StyledInput
-			id="java-args"
-			v-model="settings.launchArgs"
-			autocomplete="off"
-			type="text"
-			placeholder="Enter java arguments..."
-			wrapper-class="w-full"
-		/>
+			<div class="flex flex-col gap-2.5">
+				<h3 class="m-0 text-lg font-semibold text-contrast">Wrapper hook</h3>
+				<StyledInput
+					id="wrapper"
+					v-model="settings.hooks.wrapper"
+					autocomplete="off"
+					type="text"
+					placeholder="Enter wrapper command..."
+					wrapper-class="w-full"
+				/>
+				<p class="m-0 leading-tight">Wrapper command for launching Minecraft.</p>
+			</div>

-		<h2 class="mt-4 mb-2 text-lg font-extrabold text-contrast">Environmental variables</h2>
-		<StyledInput
-			id="env-vars"
-			v-model="settings.envVars"
-			autocomplete="off"
-			type="text"
-			placeholder="Enter environmental variables..."
-			wrapper-class="w-full"
-		/>
-
-		<hr class="mt-4 bg-button-border border-none h-[1px]" />
-
-		<h2 class="mt-4 m-0 text-lg font-extrabold text-contrast">Hooks</h2>
-
-		<h3 class="mt-2 m-0 text-base font-extrabold text-primary">Pre launch</h3>
-		<p class="m-0 mt-1 mb-2 leading-tight text-secondary">Ran before the instance is launched.</p>
-		<StyledInput
-			id="pre-launch"
-			v-model="settings.hooks.pre_launch"
-			autocomplete="off"
-			type="text"
-			placeholder="Enter pre-launch command..."
-			wrapper-class="w-full"
-		/>
-
-		<h3 class="mt-2 m-0 text-base font-extrabold text-primary">Wrapper</h3>
-		<p class="m-0 mt-1 mb-2 leading-tight text-secondary">
-			Wrapper command for launching Minecraft.
-		</p>
-		<StyledInput
-			id="wrapper"
-			v-model="settings.hooks.wrapper"
-			autocomplete="off"
-			type="text"
-			placeholder="Enter wrapper command..."
-			wrapper-class="w-full"
-		/>
-
-		<h3 class="mt-2 m-0 text-base font-extrabold text-primary">Post exit</h3>
-		<p class="m-0 mt-1 mb-2 leading-tight text-secondary">Ran after the game closes.</p>
-		<StyledInput
-			id="post-exit"
-			v-model="settings.hooks.post_exit"
-			autocomplete="off"
-			type="text"
-			placeholder="Enter post-exit command..."
-			wrapper-class="w-full"
-		/>
+			<div class="flex flex-col gap-2.5">
+				<h3 class="m-0 text-lg font-semibold text-contrast">Post exit hook</h3>
+				<StyledInput
+					id="post-exit"
+					v-model="settings.hooks.post_exit"
+					autocomplete="off"
+					type="text"
+					placeholder="Enter post-exit command..."
+					wrapper-class="w-full"
+				/>
+				<p class="m-0 leading-tight">Ran after the game closes.</p>
+			</div>
+		</div>
 	</div>
 </template>
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { Toggle } from '@modrinth/ui'
+import { ButtonStyled, Toggle } from '@modrinth/ui'
 import { ref, watch } from 'vue'

 import { get as getSettings, set as setSettings } from '@/helpers/settings.ts'
@@ -25,17 +25,28 @@ watch(
 )
 </script>
 <template>
-	<div v-for="option in options" :key="option" class="mt-4 flex items-center justify-between">
-		<div>
-			<h2 class="m-0 text-lg font-extrabold text-contrast capitalize">
-				{{ option.replaceAll('_', ' ') }}
-			</h2>
+	<div class="flex flex-col gap-2.5 min-w-[600px]">
+		<div v-for="option in options" :key="option" class="flex items-center justify-between">
+			<div>
+				<h2 class="m-0 text-lg font-semibold text-contrast capitalize">
+					{{ option.replaceAll('_', ' ') }}
+				</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>
+				<Toggle
+					id="advanced-rendering"
+					:model-value="themeStore.getFeatureFlag(option)"
+					@update:model-value="() => setFeatureFlag(option, !themeStore.getFeatureFlag(option))"
+				/>
+			</div>
 		</div>
-
-		<Toggle
-			id="advanced-rendering"
-			:model-value="themeStore.getFeatureFlag(option)"
-			@update:model-value="() => setFeatureFlag(option, !themeStore.getFeatureFlag(option))"
-		/>
 	</div>
 </template>
@@ -21,15 +21,21 @@ async function updateJavaVersion(version) {
 }
 </script>
 <template>
-	<div v-for="(javaVersion, index) in [25, 21, 17, 8]" :key="`java-${javaVersion}`">
-		<h2 class="m-0 text-lg font-extrabold text-contrast" :class="{ 'mt-4': index !== 0 }">
-			Java {{ javaVersion }} location
-		</h2>
-		<JavaSelector
-			:id="'java-selector-' + javaVersion"
-			v-model="javaVersions[javaVersion]"
-			:version="javaVersion"
-			@update:model-value="updateJavaVersion"
-		/>
+	<div class="flex flex-col gap-6">
+		<div
+			v-for="(javaVersion, index) in [25, 21, 17, 8]"
+			:key="`java-${javaVersion}`"
+			class="flex flex-col gap-2.5"
+		>
+			<h2 class="m-0 text-lg font-semibold text-contrast" :class="{ 'mt-4': index !== 0 }">
+				Java {{ javaVersion }} location
+			</h2>
+			<JavaSelector
+				:id="'java-selector-' + javaVersion"
+				v-model="javaVersions[javaVersion]"
+				:version="javaVersion"
+				@update:model-value="updateJavaVersion"
+			/>
+		</div>
 	</div>
 </template>
@@ -43,7 +43,7 @@ async function onLocaleChange(newLocale: string) {
 </script>

 <template>
-	<h2 class="m-0 text-lg font-extrabold text-contrast">Language</h2>
+	<h2 class="m-0 text-lg font-semibold text-contrast">Language</h2>

 	<Admonition type="warning" class="mt-2 mb-4">
 		{{ formatMessage(languageSelectorMessages.languageWarning, { platform }) }}
@@ -25,8 +25,8 @@ watch(
 <template>
 	<div class="flex items-center justify-between gap-4">
 		<div>
-			<h2 class="m-0 text-lg font-extrabold text-contrast">Personalized ads</h2>
-			<p class="m-0 text-sm">
+			<h2 class="m-0 text-lg font-semibold text-contrast">Personalized ads</h2>
+			<p class="m-0 mt-1 text-sm">
 				Modrinth's ad provider, Aditude, shows ads based on your preferences. By disabling this
 				option, you opt out and ads will no longer be shown based on your interests.
 			</p>
@@ -36,8 +36,8 @@ watch(

 	<div class="mt-4 flex items-center justify-between gap-4">
 		<div>
-			<h2 class="m-0 text-lg font-extrabold text-contrast">Telemetry</h2>
-			<p class="m-0 text-sm">
+			<h2 class="m-0 text-lg font-semibold text-contrast">Telemetry</h2>
+			<p class="m-0 mt-1 text-sm">
 				Modrinth collects anonymized analytics and usage data to improve our user experience and
 				customize your experience. By disabling this option, you opt out and your data will no
 				longer be collected.
@@ -48,8 +48,8 @@ watch(

 	<div class="mt-4 flex items-center justify-between gap-4">
 		<div>
-			<h2 class="m-0 text-lg font-extrabold text-contrast">Discord RPC</h2>
-			<p class="m-0 text-sm">
+			<h2 class="m-0 text-lg font-semibold text-contrast">Discord RPC</h2>
+			<p class="m-0 mt-1 text-sm">
 				Manages the Discord Rich Presence integration. Disabling this will cause 'Modrinth' to no
 				longer show up as a game or app you are using on your Discord profile.
 			</p>
@@ -62,67 +62,77 @@ async function findLauncherDir() {
 </script>

 <template>
-	<h2 class="m-0 text-lg font-extrabold text-contrast">App directory</h2>
-	<p class="m-0 mt-1 mb-2 leading-tight text-secondary">
-		The directory where the launcher stores all of its files. Changes will be applied after
-		restarting the launcher.
-	</p>
+	<div class="flex flex-col gap-6">
+		<div class="flex flex-col gap-2.5">
+			<h2 class="m-0 text-lg font-semibold text-contrast">App directory</h2>
+			<StyledInput
+				id="appDir"
+				v-model="settings.custom_dir"
+				:icon="BoxIcon"
+				type="text"
+				wrapper-class="w-full"
+			>
+				<template #right>
+					<Button class="ml-1.5" @click="findLauncherDir">
+						<FolderSearchIcon />
+					</Button>
+				</template>
+			</StyledInput>
+			<p class="m-0 leading-tight text-secondary">
+				The directory where the launcher stores all of its files. Changes will be applied after
+				restarting the launcher.
+			</p>
+		</div>

-	<div class="m-1 my-2">
-		<StyledInput
-			id="appDir"
-			v-model="settings.custom_dir"
-			:icon="BoxIcon"
-			type="text"
-			wrapper-class="w-full"
-		>
-			<template #right>
-				<Button class="r-btn" @click="findLauncherDir">
-					<FolderSearchIcon />
-				</Button>
-			</template>
-		</StyledInput>
+		<div class="flex flex-col gap-2.5">
+			<ConfirmModalWrapper
+				ref="purgeCacheConfirmModal"
+				title="Are you sure you want to purge the cache?"
+				description="If you proceed, your entire cache will be purged. This may slow down the app temporarily."
+				:has-to-type="false"
+				proceed-label="Purge cache"
+				:show-ad-on-close="false"
+				@proceed="purgeCache"
+			/>
+			<h2 class="m-0 text-lg font-semibold text-contrast">App cache</h2>
+			<button id="purge-cache" class="btn min-w-max" @click="$refs.purgeCacheConfirmModal.show()">
+				<TrashIcon />
+				Purge cache
+			</button>
+			<p class="m-0 leading-tight text-secondary">
+				The Modrinth app stores a cache of data to speed up loading. This can be purged to force the
+				app to reload data. This may slow down the app temporarily.
+			</p>
+		</div>
+
+		<div class="flex flex-col gap-2.5">
+			<h2 class="m-0 text-lg font-semibold text-contrast mt-4">Maximum concurrent downloads</h2>
+			<Slider
+				id="max-downloads"
+				v-model="settings.max_concurrent_downloads"
+				:min="1"
+				:max="10"
+				:step="1"
+			/>
+			<p class="m-0 leading-tight text-secondary">
+				The maximum amount of files the launcher can download at the same time. Set this to a lower
+				value if you have a poor internet connection. (app restart required to take effect)
+			</p>
+		</div>
+
+		<div class="flex flex-col gap-2.5">
+			<h2 class="mt-0 m-0 text-lg font-semibold text-contrast">Maximum concurrent writes</h2>
+			<Slider
+				id="max-writes"
+				v-model="settings.max_concurrent_writes"
+				:min="1"
+				:max="50"
+				:step="1"
+			/>
+			<p class="m-0 leading-tight text-secondary">
+				The maximum amount of files the launcher can write to the disk at once. Set this to a lower
+				value if you are frequently getting I/O errors. (app restart required to take effect)
+			</p>
+		</div>
 	</div>
-
-	<div>
-		<ConfirmModalWrapper
-			ref="purgeCacheConfirmModal"
-			title="Are you sure you want to purge the cache?"
-			description="If you proceed, your entire cache will be purged. This may slow down the app temporarily."
-			:has-to-type="false"
-			proceed-label="Purge cache"
-			:show-ad-on-close="false"
-			@proceed="purgeCache"
-		/>
-
-		<h2 class="m-0 text-lg font-extrabold text-contrast">App cache</h2>
-		<p class="m-0 mt-1 mb-2 leading-tight text-secondary">
-			The Modrinth app stores a cache of data to speed up loading. This can be purged to force the
-			app to reload data. This may slow down the app temporarily.
-		</p>
-	</div>
-	<button id="purge-cache" class="btn min-w-max" @click="$refs.purgeCacheConfirmModal.show()">
-		<TrashIcon />
-		Purge cache
-	</button>
-
-	<h2 class="m-0 text-lg font-extrabold text-contrast mt-4">Maximum concurrent downloads</h2>
-	<p class="m-0 mt-1 mb-2 leading-tight text-secondary">
-		The maximum amount of files the launcher can download at the same time. Set this to a lower
-		value if you have a poor internet connection. (app restart required to take effect)
-	</p>
-	<Slider
-		id="max-downloads"
-		v-model="settings.max_concurrent_downloads"
-		:min="1"
-		:max="10"
-		:step="1"
-	/>
-
-	<h2 class="mt-4 m-0 text-lg font-extrabold text-contrast">Maximum concurrent writes</h2>
-	<p class="m-0 mt-1 mb-2 leading-tight text-secondary">
-		The maximum amount of files the launcher can write to the disk at once. Set this to a lower
-		value if you are frequently getting I/O errors. (app restart required to take effect)
-	</p>
-	<Slider id="max-writes" v-model="settings.max_concurrent_writes" :min="1" :max="50" :step="1" />
 </template>
@@ -189,6 +189,22 @@ const messages = defineMessages({
 		id: 'instance.worlds.linked_server',
 		defaultMessage: 'Managed by server project',
 	},
+	incompatibleVersion: {
+		id: 'app.world.world-item.incompatible-version',
+		defaultMessage: 'Incompatible version {version}',
+	},
+	playersOnline: {
+		id: 'app.world.world-item.players-online',
+		defaultMessage: '{count} online',
+	},
+	offline: {
+		id: 'app.world.world-item.offline',
+		defaultMessage: 'Offline',
+	},
+	notPlayedYet: {
+		id: 'app.world.world-item.not-played-yet',
+		defaultMessage: 'Not played yet',
+	},
 })
 </script>
 <template>
@@ -243,13 +259,17 @@ const messages = defineMessages({
 					>
 						<template v-if="refreshing">
 							<SpinnerIcon aria-hidden="true" class="animate-spin shrink-0" />
-							Loading...
+							{{ formatMessage(commonMessages.loadingLabel) }}
 						</template>
 						<template v-else-if="serverStatus">
 							<template v-if="serverIncompatible">
 								<IssuesIcon class="shrink-0 text-orange" aria-hidden="true" />
 								<span class="text-orange">
-									Incompatible version {{ serverStatus.version?.name }}
+									{{
+										formatMessage(messages.incompatibleVersion, {
+											version: serverStatus.version?.name,
+										})
+									}}
 								</span>
 							</template>
 							<template v-else>
@@ -265,8 +285,11 @@ const messages = defineMessages({
 								/>
 								<Tooltip :disabled="!hasPlayersTooltip">
 									<span :class="{ 'cursor-help': hasPlayersTooltip }">
-										{{ formatNumber(serverStatus.players?.online) }}
-										online
+										{{
+											formatMessage(messages.playersOnline, {
+												count: formatNumber(serverStatus.players?.online ?? 0),
+											})
+										}}
 									</span>
 									<template #popper>
 										<div class="flex flex-col gap-1">
@@ -280,7 +303,7 @@ const messages = defineMessages({
 						</template>
 						<template v-else>
 							<NoSignalIcon aria-hidden="true" stroke-width="3px" class="shrink-0" />
-							Offline
+							{{ formatMessage(messages.offline) }}
 						</template>
 					</div>
 				</div>
@@ -299,7 +322,7 @@ const messages = defineMessages({
 								})
 							}}
 						</template>
-						<template v-else> Not played yet </template>
+						<template v-else> {{ formatMessage(messages.notPlayedYet) }} </template>
 					</div>
 					<template v-if="instancePath">
 						•
@@ -5,12 +5,11 @@ import {
 	commonMessages,
 	defineMessages,
 	injectNotificationManager,
+	NewModal,
 	useVIntl,
 } from '@modrinth/ui'
 import { ref } from 'vue'

-import InstanceModalTitlePrefix from '@/components/ui/modal/InstanceModalTitlePrefix.vue'
-import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
 import ServerModalBody from '@/components/ui/world/modal/ServerModalBody.vue'
 import type { GameInstance } from '@/helpers/types'
 import { add_server_to_profile, type ServerPackStatus, type ServerWorld } from '@/helpers/worlds.ts'
@@ -26,10 +25,10 @@ const props = defineProps<{
 	instance: GameInstance
 }>()

-const modal = ref()
+const modal = ref<InstanceType<typeof NewModal>>()

-const name = ref()
-const address = ref()
+const name = ref('')
+const address = ref('')
 const resourcePack = ref<ServerPackStatus>('enabled')

 async function addServer(play: boolean) {
@@ -60,11 +59,11 @@ function show() {
 	name.value = ''
 	address.value = ''
 	resourcePack.value = 'enabled'
-	modal.value.show()
+	modal.value?.show()
 }

 function hide() {
-	modal.value.hide()
+	modal.value?.hide()
 }

 const messages = defineMessages({
@@ -85,37 +84,33 @@ const messages = defineMessages({
 defineExpose({ show, hide })
 </script>
 <template>
-	<ModalWrapper ref="modal">
-		<template #title>
-			<span class="flex items-center gap-2 text-lg font-semibold text-primary">
-				<InstanceModalTitlePrefix :instance="instance" />
-				<span class="font-extrabold text-contrast">{{ formatMessage(messages.title) }}</span>
-			</span>
-		</template>
+	<NewModal ref="modal" :header="formatMessage(messages.title)" width="500px" max-width="500px">
 		<ServerModalBody
 			v-model:name="name"
 			v-model:address="address"
 			v-model:resource-pack="resourcePack"
 		/>
-		<div class="flex gap-2 mt-4">
-			<ButtonStyled color="brand">
-				<button :disabled="!address" @click="addServer(true)">
-					<PlayIcon />
-					{{ formatMessage(messages.addAndPlay) }}
-				</button>
-			</ButtonStyled>
-			<ButtonStyled>
-				<button :disabled="!address" @click="addServer(false)">
-					<PlusIcon />
-					{{ formatMessage(messages.addServer) }}
-				</button>
-			</ButtonStyled>
-			<ButtonStyled>
-				<button @click="hide()">
-					<XIcon />
-					{{ formatMessage(commonMessages.cancelButton) }}
-				</button>
-			</ButtonStyled>
-		</div>
-	</ModalWrapper>
+		<template #actions>
+			<div class="flex gap-2 justify-end">
+				<ButtonStyled type="outlined">
+					<button class="!border !border-surface-4" @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>
+			</div>
+		</template>
+	</NewModal>
 </template>
@@ -5,11 +5,11 @@ import {
 	commonMessages,
 	defineMessage,
 	injectNotificationManager,
+	NewModal,
 	useVIntl,
 } from '@modrinth/ui'
 import { computed, ref } from 'vue'

-import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
 import HideFromHomeOption from '@/components/ui/world/modal/HideFromHomeOption.vue'
 import ServerModalBody from '@/components/ui/world/modal/ServerModalBody.vue'
 import type { GameInstance } from '@/helpers/types'
@@ -32,7 +32,7 @@ const props = defineProps<{
 	instance: GameInstance
 }>()

-const modal = ref()
+const modal = ref<InstanceType<typeof NewModal>>()

 const name = ref<string>('')
 const address = ref<string>('')
@@ -81,11 +81,11 @@ function show(server: ServerWorld) {
 	index.value = server.index
 	displayStatus.value = server.display_status
 	hideFromHome.value = server.display_status === 'hidden'
-	modal.value.show()
+	modal.value?.show()
 }

 function hide() {
-	modal.value.hide()
+	modal.value?.hide()
 }

 defineExpose({ show })
@@ -96,29 +96,28 @@ const titleMessage = defineMessage({
 })
 </script>
 <template>
-	<ModalWrapper ref="modal">
-		<template #title>
-			<span class="font-extrabold text-lg text-contrast">{{ formatMessage(titleMessage) }}</span>
-		</template>
+	<NewModal ref="modal" :header="formatMessage(titleMessage)" width="500px" max-width="500px">
 		<ServerModalBody
 			v-model:name="name"
 			v-model:address="address"
 			v-model:resource-pack="resourcePack"
 		/>
 		<HideFromHomeOption v-model="hideFromHome" class="mt-3" />
-		<div class="flex gap-2 mt-4">
-			<ButtonStyled color="brand">
-				<button :disabled="!address" @click="saveServer">
-					<SaveIcon />
-					{{ formatMessage(commonMessages.saveChangesButton) }}
-				</button>
-			</ButtonStyled>
-			<ButtonStyled>
-				<button @click="hide()">
-					<XIcon />
-					{{ formatMessage(commonMessages.cancelButton) }}
-				</button>
-			</ButtonStyled>
-		</div>
-	</ModalWrapper>
+		<template #actions>
+			<div class="flex gap-2 justify-end">
+				<ButtonStyled type="outlined">
+					<button class="!border !border-surface-4" @click="hide()">
+						<XIcon />
+						{{ formatMessage(commonMessages.cancelButton) }}
+					</button>
+				</ButtonStyled>
+				<ButtonStyled color="brand">
+					<button :disabled="!address" @click="saveServer">
+						<SaveIcon />
+						{{ formatMessage(commonMessages.saveChangesButton) }}
+					</button>
+				</ButtonStyled>
+			</div>
+		</template>
+	</NewModal>
 </template>
@@ -49,34 +49,40 @@ const messages = defineMessages({
 		id: 'instance.server-modal.placeholder-name',
 		defaultMessage: 'Minecraft Server',
 	},
+	placeholderAddress: {
+		id: 'app.world.server-modal.placeholder-address',
+		defaultMessage: 'example.modrinth.gg',
+	},
+	selectAnOption: {
+		id: 'app.world.server-modal.select-an-option',
+		defaultMessage: 'Select an option',
+	},
 })

 defineExpose({ resourcePackOptions })
 </script>
 <template>
-	<div class="w-[450px]">
-		<h2 class="text-lg font-extrabold text-contrast mt-0 mb-1">
-			{{ formatMessage(messages.name) }}
-		</h2>
-		<StyledInput
-			v-model="name"
-			:placeholder="formatMessage(messages.placeholderName)"
-			autocomplete="off"
-			wrapper-class="w-full"
-		/>
-		<h2 class="text-lg font-extrabold text-contrast mt-3 mb-1">
-			{{ formatMessage(messages.address) }}
-		</h2>
-		<StyledInput
-			v-model="address"
-			placeholder="example.modrinth.gg"
-			autocomplete="off"
-			wrapper-class="w-full"
-		/>
-		<h2 class="text-lg font-extrabold text-contrast mt-3 mb-1">
-			{{ formatMessage(messages.resourcePack) }}
-		</h2>
-		<div>
+	<div class="space-y-4 w-full">
+		<label class="flex flex-col gap-2">
+			<span class="font-semibold text-contrast">{{ formatMessage(messages.name) }}</span>
+			<StyledInput
+				v-model="name"
+				:placeholder="formatMessage(messages.placeholderName)"
+				autocomplete="off"
+				wrapper-class="w-full"
+			/>
+		</label>
+		<label class="flex flex-col gap-2">
+			<span class="font-semibold text-contrast">{{ formatMessage(messages.address) }}</span>
+			<StyledInput
+				v-model="address"
+				:placeholder="formatMessage(messages.placeholderAddress)"
+				autocomplete="off"
+				wrapper-class="w-full"
+			/>
+		</label>
+		<label class="flex flex-col gap-2">
+			<span class="font-semibold text-contrast">{{ formatMessage(messages.resourcePack) }}</span>
 			<Combobox
 				v-model="resourcePack"
 				:options="
@@ -89,9 +95,9 @@ defineExpose({ resourcePackOptions })
 				:display-value="
 					resourcePack
 						? formatMessage(resourcePackOptionMessages[resourcePack])
-						: 'Select an option'
+						: formatMessage(messages.selectAnOption)
 				"
 			/>
-		</div>
+		</label>
 	</div>
 </template>
@@ -0,0 +1,99 @@
+import { createConsoleState } from '@modrinth/ui'
+
+import { clear_log_buffer, get_live_log_buffer, get_logs } from '@/helpers/logs'
+
+type ConsoleState = ReturnType<typeof createConsoleState>
+
+interface LogEntry {
+	filename: string
+	name?: string
+	log_type: string
+	stdout?: string
+	age?: number
+	live?: boolean
+}
+
+interface InstanceConsoleEntry {
+	liveConsole: ConsoleState
+	historicalConsole: ConsoleState
+	historicalCache: Map<string, string>
+	logList: LogEntry[] | null
+}
+
+const instances = new Map<string, InstanceConsoleEntry>()
+
+function getOrCreate(profilePathId: string): InstanceConsoleEntry {
+	let entry = instances.get(profilePathId)
+	if (entry) return entry
+
+	entry = {
+		liveConsole: createConsoleState(),
+		historicalConsole: createConsoleState(),
+		historicalCache: new Map(),
+		logList: null,
+	}
+	instances.set(profilePathId, entry)
+	return entry
+}
+
+async function hydrate(profilePathId: string): Promise<void> {
+	const entry = getOrCreate(profilePathId)
+	if (entry.liveConsole.output.value.length > 0) return
+
+	const buffer = await get_live_log_buffer(profilePathId)
+	if (buffer) {
+		entry.liveConsole.addLegacyLog(buffer)
+	}
+}
+
+async function getHistoricalLogs(profilePathId: string, instancePath: string): Promise<LogEntry[]> {
+	const entry = getOrCreate(profilePathId)
+	if (entry.logList) return entry.logList
+
+	const logs: LogEntry[] = await get_logs(instancePath, false)
+	entry.logList = logs
+
+	for (const log of logs) {
+		if (log.stdout && log.stdout !== '') {
+			entry.historicalCache.set(log.filename, log.stdout)
+		}
+	}
+
+	return logs
+}
+
+function getHistoricalContent(profilePathId: string, filename: string): string | undefined {
+	return instances.get(profilePathId)?.historicalCache.get(filename)
+}
+
+function invalidate(profilePathId: string): void {
+	const entry = instances.get(profilePathId)
+	if (!entry) return
+	entry.historicalCache.clear()
+	entry.logList = null
+}
+
+async function clearLive(profilePathId: string): Promise<void> {
+	const entry = getOrCreate(profilePathId)
+	entry.liveConsole.clear()
+	await clear_log_buffer(profilePathId).catch(() => {})
+}
+
+async function destroy(profilePathId: string): Promise<void> {
+	instances.delete(profilePathId)
+	await clear_log_buffer(profilePathId).catch(() => {})
+}
+
+export function useInstanceConsole(profilePathId: string) {
+	const entry = getOrCreate(profilePathId)
+	return {
+		liveConsole: entry.liveConsole,
+		historicalConsole: entry.historicalConsole,
+		hydrate: () => hydrate(profilePathId),
+		getHistoricalLogs: (instancePath: string) => getHistoricalLogs(profilePathId, instancePath),
+		getHistoricalContent: (filename: string) => getHistoricalContent(profilePathId, filename),
+		invalidate: () => invalidate(profilePathId),
+		clearLive: () => clearLive(profilePathId),
+		destroy: () => destroy(profilePathId),
+	}
+}
@@ -0,0 +1,18 @@
+const trimTrailingSlash = (url: string) => url.replace(/\/$/, '')
+
+const siteUrl = trimTrailingSlash(import.meta.env.MODRINTH_URL || 'https://modrinth.com')
+const labrinthBaseUrl = trimTrailingSlash(
+	import.meta.env.MODRINTH_API_BASE_URL || 'https://api.modrinth.com',
+)
+const archonBaseUrl = trimTrailingSlash(
+	import.meta.env.MODRINTH_ARCHON_BASE_URL || 'https://archon.modrinth.com',
+)
+
+export const config = {
+	siteUrl,
+	stripePublishableKey:
+		import.meta.env.VITE_STRIPE_PUBLISHABLE_KEY ||
+		'pk_test_51JbFxJJygY5LJFfKV50mnXzz3YLvBVe2Gd1jn7ljWAkaBlRz3VQdxN9mXcPSrFbSqxwAb0svte9yhnsmm7qHfcWn00R611Ce7b',
+	labrinthBaseUrl,
+	archonBaseUrl,
+}
@@ -97,3 +97,23 @@ export async function warning_listener(callback) {
 export async function friend_listener(callback) {
 	return await listen('friend', (event) => callback(event.payload))
 }
+
+/// Payload for the 'log' event
+/*
+    LogPayload {
+        profile_path_id: string,
+        type: "log4j" | "legacy",
+        // log4j fields (when type === "log4j"):
+        timestamp_millis?: number,
+        logger_name?: string,
+        level?: string,
+        thread_name?: string,
+        message?: string,
+        throwable?: string,
+        // legacy fields (when type === "legacy"):
+        message?: string,
+    }
+*/
+export async function log_listener(callback) {
+	return await listen('log', (event) => callback(event.payload))
+}
@@ -63,3 +63,13 @@ export async function delete_logs(profilePath) {
 export async function get_latest_log_cursor(profilePath, cursor) {
 	return await invoke('plugin:logs|logs_get_latest_log_cursor', { profilePath, cursor })
 }
+
+/// Get all buffered live log lines for a profile from the Rust ring buffer
+export async function get_live_log_buffer(profilePath) {
+	return await invoke('plugin:logs|logs_get_live_log_buffer', { profilePath })
+}
+
+/// Clear the live log buffer for a profile on the Rust side
+export async function clear_log_buffer(profilePath) {
+	return await invoke('plugin:logs|logs_clear_live_log_buffer', { profilePath })
+}
@@ -30,6 +30,8 @@ export type ServerWorld = BaseWorld & {
 	index: number
 	address: string
 	pack_status: ServerPackStatus
+	project_id?: string
+	content_kind?: string
 }

 export type World = SingleplayerWorld | ServerWorld
@@ -140,12 +142,16 @@ export async function add_server_to_profile(
 	name: string,
 	address: string,
 	packStatus: ServerPackStatus,
+	projectId?: string,
+	contentKind?: string,
 ): Promise<number> {
 	return await invoke('plugin:worlds|add_server_to_profile', {
 		path,
 		name,
 		address,
 		packStatus,
+		projectId,
+		contentKind,
 	})
 }

@@ -6,7 +6,7 @@
    "message": "تعذر الوصول إلى خوادم المصادقة"
  },
  "app.export-modal.description-placeholder": {
-    "message": "ادخل وصف التعديل..."
+    "message": "أدخل وصف التعديل..."
  },
  "app.export-modal.export-button": {
    "message": "تصدير"
@@ -41,35 +41,14 @@
  "app.instance.confirm-delete.header": {
    "message": "حذف المثيل"
  },
-  "app.instance.modpack-already-installed.admonition-body": {
-    "message": "تم تثبيت حزمة التعديل هذه بالفعل في مثيل \"{instanceName}\"."
-  },
-  "app.instance.modpack-already-installed.admonition-header": {
-    "message": "حزمة تعديل مكررة"
-  },
-  "app.instance.modpack-already-installed.create-anyway": {
-    "message": "إنشاء على أي حال"
-  },
-  "app.instance.modpack-already-installed.go-to-instance": {
-    "message": "انتقل إلى المثال"
-  },
  "app.instance.modpack-already-installed.header": {
    "message": "تم تثبيت حزمة التعديل بالفعل"
  },
  "app.instance.mods.content-type-project": {
    "message": "مشروع"
  },
-  "app.instance.mods.copy-link": {
-    "message": "نسخ الرابط"
-  },
-  "app.instance.mods.installing": {
-    "message": "جاري التثبيت..."
-  },
-  "app.instance.mods.modpack-fallback": {
-    "message": "حزمة التعديل"
-  },
  "app.instance.mods.project-was-added": {
-    "message": "تمت إضافة \"{name}\"."
+    "message": "تمت إضافة \"{name}\""
  },
  "app.instance.mods.projects-were-added": {
    "message": "تمت إضافة {count} من المشاريع"
@@ -80,18 +59,9 @@
  "app.instance.mods.share-title": {
    "message": "مشاركة محتوى حزمة التعديل"
  },
-  "app.instance.mods.show-file": {
-    "message": "عرض الملف"
-  },
  "app.instance.mods.successfully-uploaded": {
    "message": "تم الرفع بنجاح"
  },
-  "app.instance.mods.unknown-version": {
-    "message": "غير معروف"
-  },
-  "app.instance.mods.updating": {
-    "message": "جارٍ التحديث..."
-  },
  "app.modal.install-to-play.content-required": {
    "message": "المحتوى مطلوب"
  },
@@ -102,7 +72,7 @@
    "message": "تثبيت"
  },
  "app.modal.install-to-play.mod-count": {
-    "message": ""
+    "message": "{count, plural, one {# تعديل} other {# تعديلات}}"
  },
  "app.modal.install-to-play.required-modpack": {
    "message": "حزمة التعديل مطلوبة"
@@ -111,10 +81,10 @@
    "message": "يتطلب هذا الخادم تعديلات للعب. انقر فوق \"تثبيت\" لإعداد الملفات المطلوبة من Modrinth، ثم قم بتشغيله مباشرة إلى الخادم."
  },
  "app.modal.install-to-play.shared-instance": {
-    "message": "حُزْمَة مشاركة"
+    "message": "حزمة مشتركة"
  },
  "app.modal.install-to-play.shared-server-instance": {
-    "message": "حُزْمَة خادم مشاركة"
+    "message": "حزمة خادم مشتركة"
  },
  "app.modal.install-to-play.view-contents": {
    "message": "عرض المحتويات"
@@ -140,9 +110,6 @@
  "app.settings.tabs.default-instance-options": {
    "message": "خيارات النسخة الافتراضية"
  },
-  "app.settings.tabs.feature-flags": {
-    "message": "أعلام الميزات"
-  },
  "app.settings.tabs.java-installations": {
    "message": "تثبيتات جافا"
  },
@@ -467,9 +434,6 @@
  "instance.worlds.dont_show_on_home": {
    "message": "عدم العرض في الصفحة الرئيسية"
  },
-  "instance.worlds.filter.available": {
-    "message": "متاح"
-  },
  "instance.worlds.game_already_open": {
    "message": "النسخة مفتوحة بالفعل"
  },
@@ -494,12 +458,6 @@
  "instance.worlds.play_instance": {
    "message": "تشغيل النسخة"
  },
-  "instance.worlds.type.server": {
-    "message": "الخادم"
-  },
-  "instance.worlds.type.singleplayer": {
-    "message": "لعب فردي"
-  },
  "instance.worlds.view_instance": {
    "message": "عرض النسخة"
  },
@@ -47,9 +47,6 @@
  "app.settings.tabs.default-instance-options": {
    "message": "Výchozí možnosti instance"
  },
-  "app.settings.tabs.feature-flags": {
-    "message": "Vlajky funkcí"
-  },
  "app.settings.tabs.java-installations": {
    "message": "Instalace Javy"
  },
@@ -350,9 +347,6 @@
  "instance.worlds.dont_show_on_home": {
    "message": "Nezobrazuje na domovské stránce"
  },
-  "instance.worlds.filter.available": {
-    "message": "Dostupné"
-  },
  "instance.worlds.game_already_open": {
    "message": "Instance je již otevřená"
  },
@@ -374,12 +368,6 @@
  "instance.worlds.play_instance": {
    "message": "Hrát instanci"
  },
-  "instance.worlds.type.server": {
-    "message": "Server"
-  },
-  "instance.worlds.type.singleplayer": {
-    "message": "Hra pro jednoho hráče"
-  },
  "instance.worlds.view_instance": {
    "message": "Zobrazit instanci"
  },
@@ -44,15 +44,6 @@
  "app.instance.mods.content-type-project": {
    "message": "projekt"
  },
-  "app.instance.mods.copy-link": {
-    "message": "Kopier link"
-  },
-  "app.instance.mods.installing": {
-    "message": "Installer..."
-  },
-  "app.instance.mods.modpack-fallback": {
-    "message": "Modpack"
-  },
  "app.instance.mods.project-was-added": {
    "message": "\"{name}\" blev tilføjet"
  },
@@ -65,18 +56,9 @@
  "app.instance.mods.share-title": {
    "message": "Deler modpack indhold"
  },
-  "app.instance.mods.show-file": {
-    "message": "Vis filer"
-  },
  "app.instance.mods.successfully-uploaded": {
    "message": "Uploadet"
  },
-  "app.instance.mods.unknown-version": {
-    "message": "Ukendt"
-  },
-  "app.instance.mods.updating": {
-    "message": "Opdatere..."
-  },
  "app.modal.install-to-play.content-required": {
    "message": "Indhold krævet"
  },
@@ -125,9 +107,6 @@
  "app.settings.tabs.default-instance-options": {
    "message": "Standardindstillinger for instans"
  },
-  "app.settings.tabs.feature-flags": {
-    "message": "Funktionsflags"
-  },
  "app.settings.tabs.java-installations": {
    "message": "Javainstallationer"
  },
@@ -452,9 +431,6 @@
  "instance.worlds.dont_show_on_home": {
    "message": "Vis ikke på forsiden"
  },
-  "instance.worlds.filter.available": {
-    "message": "Tilgængelig"
-  },
  "instance.worlds.game_already_open": {
    "message": "Instance allerede åben"
  },
@@ -479,12 +455,6 @@
  "instance.worlds.play_instance": {
    "message": "Spil instance"
  },
-  "instance.worlds.type.server": {
-    "message": "Server"
-  },
-  "instance.worlds.type.singleplayer": {
-    "message": "Singleplayer"
-  },
  "instance.worlds.view_instance": {
    "message": "Se instance"
  },
@@ -5,6 +5,39 @@
  "app.auth-servers.unreachable.header": {
    "message": "Authentifizierungsserver sind nicht erreichbar"
  },
+  "app.browse.add-server-to-instance": {
+    "message": "Server zu Instanz hinzufügen"
+  },
+  "app.browse.add-servers-to-instance": {
+    "message": "Server zu deiner Instanz hinzufügen"
+  },
+  "app.browse.add-to-instance": {
+    "message": "Zu Instanz hinzufügen"
+  },
+  "app.browse.add-to-instance-name": {
+    "message": "Zu {instanceName} hinzufügen"
+  },
+  "app.browse.added": {
+    "message": "Hinzugefügt"
+  },
+  "app.browse.already-added": {
+    "message": "Bereits hinzugefügt"
+  },
+  "app.browse.discover-content": {
+    "message": "Inhalte entdecken"
+  },
+  "app.browse.discover-servers": {
+    "message": "Server entdecken"
+  },
+  "app.browse.hide-added-servers": {
+    "message": "Hinzugefügte Server ausblenden"
+  },
+  "app.browse.hide-installed-content": {
+    "message": "Installierte Inhalte ausblenden"
+  },
+  "app.browse.install-content-to-instance": {
+    "message": "Inhalt in Instanz installieren"
+  },
  "app.export-modal.description-placeholder": {
    "message": "Modpaketbeschreibung eingeben..."
  },
@@ -41,33 +74,21 @@
  "app.instance.confirm-delete.header": {
    "message": "Instanz löschen"
  },
-  "app.instance.modpack-already-installed.admonition-body": {
-    "message": "Dieses Modpack ist bereits in der Instanz „{instanceName}“ installiert."
+  "app.instance.modpack-already-installed.body": {
+    "message": "Dieses Modpack ist bereits in der Instanz <bold>{instanceName}</bold> installiert. Möchtest du es wirklich duplizieren?"
  },
-  "app.instance.modpack-already-installed.admonition-header": {
-    "message": "Modpack duplizieren"
-  },
-  "app.instance.modpack-already-installed.create-anyway": {
-    "message": "Trotzdem erstellen"
-  },
-  "app.instance.modpack-already-installed.go-to-instance": {
-    "message": "Gehe zu Instanz"
+  "app.instance.modpack-already-installed.create": {
+    "message": "Erstellen"
  },
  "app.instance.modpack-already-installed.header": {
    "message": "Modpack bereits installiert"
  },
+  "app.instance.modpack-already-installed.instance": {
+    "message": "Instanz"
+  },
  "app.instance.mods.content-type-project": {
    "message": "Projekt"
  },
-  "app.instance.mods.copy-link": {
-    "message": "Link kopieren"
-  },
-  "app.instance.mods.installing": {
-    "message": "Wird installiert..."
-  },
-  "app.instance.mods.modpack-fallback": {
-    "message": "Modpaket"
-  },
  "app.instance.mods.project-was-added": {
    "message": "\"{name}\" wurde hinzugefügt"
  },
@@ -80,17 +101,53 @@
  "app.instance.mods.share-title": {
    "message": "Modpaketinhalte teilen"
  },
-  "app.instance.mods.show-file": {
-    "message": "Datei anzeigen"
-  },
  "app.instance.mods.successfully-uploaded": {
    "message": "Erfolgreich hochgeladen"
  },
-  "app.instance.mods.unknown-version": {
-    "message": "Unbekannt"
+  "app.instance.worlds.add-server": {
+    "message": "Server hinzufügen"
  },
-  "app.instance.mods.updating": {
-    "message": "Wird aktualisiert..."
+  "app.instance.worlds.browse-servers": {
+    "message": "Server durchsuchen"
+  },
+  "app.instance.worlds.delete-world-description": {
+    "message": "„{name}“ wird **endgültig gelöscht**, und es gibt keine Möglichkeit, sie wiederherzustellen."
+  },
+  "app.instance.worlds.delete-world-title": {
+    "message": "Möchtest du diese Welt wirklich endgültig löschen?"
+  },
+  "app.instance.worlds.filter-modded": {
+    "message": "Modifiziert"
+  },
+  "app.instance.worlds.filter-offline": {
+    "message": "Offline"
+  },
+  "app.instance.worlds.filter-online": {
+    "message": "Online"
+  },
+  "app.instance.worlds.filter-vanilla": {
+    "message": "Vanilla"
+  },
+  "app.instance.worlds.no-worlds-description": {
+    "message": "Füge einen Server hinzu oder durchsuche, um loszulegen"
+  },
+  "app.instance.worlds.no-worlds-heading": {
+    "message": "Keine Server oder Welten hinzugefügt"
+  },
+  "app.instance.worlds.remove-server-description": {
+    "message": "„{name}“ wird aus deiner Liste entfernt, auch im Spiel, und es gibt keine Möglichkeit, ihn wiederherzustellen."
+  },
+  "app.instance.worlds.remove-server-description-with-address": {
+    "message": "„{name}“ ({address}) wird aus deiner Liste entfernt, inklusive im Spiel, und es gibt keine Möglichkeit, ihn wiederherzustellen."
+  },
+  "app.instance.worlds.remove-server-title": {
+    "message": "Möchtest du {name} wirklich entfernen?"
+  },
+  "app.instance.worlds.search-worlds-placeholder": {
+    "message": "Durchsuche {count} Welten..."
+  },
+  "app.instance.worlds.this-server": {
+    "message": "dieser Server"
  },
  "app.modal.install-to-play.content-required": {
    "message": "Inhalte benötigt"
@@ -140,9 +197,6 @@
  "app.settings.tabs.default-instance-options": {
    "message": "Standard Instanz-Einstellungen"
  },
-  "app.settings.tabs.feature-flags": {
-    "message": "Funktionsflaggen"
-  },
  "app.settings.tabs.java-installations": {
    "message": "Java Installationen"
  },
@@ -197,6 +251,24 @@
  "app.update.reload-to-update": {
    "message": "Lade neu um Aktualisierung zu installieren"
  },
+  "app.world.server-modal.placeholder-address": {
+    "message": "example.modrinth.gg"
+  },
+  "app.world.server-modal.select-an-option": {
+    "message": "Wählen eine Option"
+  },
+  "app.world.world-item.incompatible-version": {
+    "message": "Inkompatible Version {version}"
+  },
+  "app.world.world-item.not-played-yet": {
+    "message": "Noch nicht gespielt"
+  },
+  "app.world.world-item.offline": {
+    "message": "Offline"
+  },
+  "app.world.world-item.players-online": {
+    "message": "{count} online"
+  },
  "friends.action.add-friend": {
    "message": "Freund hinzufügen"
  },
@@ -296,6 +368,12 @@
  "instance.edit-world.title": {
    "message": "Welt bearbeiten"
  },
+  "instance.files.adding-files": {
+    "message": "Dateien werden hinzugefügt ({completed}/{total})"
+  },
+  "instance.files.save-as": {
+    "message": "Speichern unter..."
+  },
  "instance.server-modal.address": {
    "message": "Adresse"
  },
@@ -467,9 +545,6 @@
  "instance.worlds.dont_show_on_home": {
    "message": "Nicht auf Startseite anzeigen"
  },
-  "instance.worlds.filter.available": {
-    "message": "Verfügbar"
-  },
  "instance.worlds.game_already_open": {
    "message": "Instanz ist bereits geöffnet"
  },
@@ -494,12 +569,6 @@
  "instance.worlds.play_instance": {
    "message": "Instanz Spielen"
  },
-  "instance.worlds.type.server": {
-    "message": "Server"
-  },
-  "instance.worlds.type.singleplayer": {
-    "message": "Einzelspieler"
-  },
  "instance.worlds.view_instance": {
    "message": "Instanz anzeigen"
  },
@@ -5,6 +5,39 @@
  "app.auth-servers.unreachable.header": {
    "message": "Authentifizierungsserver sind nicht erreichbar"
  },
+  "app.browse.add-server-to-instance": {
+    "message": "Server zu Instanz hinzufügen"
+  },
+  "app.browse.add-servers-to-instance": {
+    "message": "Server zu deiner Instanz hinzufügen"
+  },
+  "app.browse.add-to-instance": {
+    "message": "Zu Instanz hinzufügen"
+  },
+  "app.browse.add-to-instance-name": {
+    "message": "Zu {instanceName} hinzufügen"
+  },
+  "app.browse.added": {
+    "message": "Hinzugefügt"
+  },
+  "app.browse.already-added": {
+    "message": "Bereits hinzugefügt"
+  },
+  "app.browse.discover-content": {
+    "message": "Inhalte entdecken"
+  },
+  "app.browse.discover-servers": {
+    "message": "Server entdecken"
+  },
+  "app.browse.hide-added-servers": {
+    "message": "Hinzugefügte Server ausblenden"
+  },
+  "app.browse.hide-installed-content": {
+    "message": "Installierte Inhalte ausblenden"
+  },
+  "app.browse.install-content-to-instance": {
+    "message": "Inhalt in Instanz installieren"
+  },
  "app.export-modal.description-placeholder": {
    "message": "Beschreibung des Modpacks eingeben..."
  },
@@ -41,33 +74,21 @@
  "app.instance.confirm-delete.header": {
    "message": "Instanz löschen"
  },
-  "app.instance.modpack-already-installed.admonition-body": {
-    "message": "Dieses Modpack ist bereits in der Instanz „{instanceName}“ installiert."
+  "app.instance.modpack-already-installed.body": {
+    "message": "Dieses Modpack ist bereits in der Instanz <bold>{instanceName}</bold> installiert. Möchtest du es wirklich duplizieren?"
  },
-  "app.instance.modpack-already-installed.admonition-header": {
-    "message": "Modpack duplizieren"
-  },
-  "app.instance.modpack-already-installed.create-anyway": {
-    "message": "Trotzdem erstellen"
-  },
-  "app.instance.modpack-already-installed.go-to-instance": {
-    "message": "Gehe zu Instanz"
+  "app.instance.modpack-already-installed.create": {
+    "message": "Erstellen"
  },
  "app.instance.modpack-already-installed.header": {
    "message": "Modpack bereits installiert"
  },
+  "app.instance.modpack-already-installed.instance": {
+    "message": "Instanz"
+  },
  "app.instance.mods.content-type-project": {
    "message": "Projekt"
  },
-  "app.instance.mods.copy-link": {
-    "message": "Link kopieren"
-  },
-  "app.instance.mods.installing": {
-    "message": "Wird installiert..."
-  },
-  "app.instance.mods.modpack-fallback": {
-    "message": "Modpack"
-  },
  "app.instance.mods.project-was-added": {
    "message": "\"{name}\" wurde hinzugefügt"
  },
@@ -80,17 +101,53 @@
  "app.instance.mods.share-title": {
    "message": "Modpackinhalte teilen"
  },
-  "app.instance.mods.show-file": {
-    "message": "Datei anzeigen"
-  },
  "app.instance.mods.successfully-uploaded": {
    "message": "Erfolgreich hochgeladen"
  },
-  "app.instance.mods.unknown-version": {
-    "message": "Unbekannt"
+  "app.instance.worlds.add-server": {
+    "message": "Server hinzufügen"
  },
-  "app.instance.mods.updating": {
-    "message": "Wird aktualisiert..."
+  "app.instance.worlds.browse-servers": {
+    "message": "Server durchsuchen"
+  },
+  "app.instance.worlds.delete-world-description": {
+    "message": "„{name}“ wird **endgültig gelöscht**, und es gibt keine Möglichkeit, sie wiederherzustellen."
+  },
+  "app.instance.worlds.delete-world-title": {
+    "message": "Möchtest du diese Welt wirklich endgültig löschen?"
+  },
+  "app.instance.worlds.filter-modded": {
+    "message": "Modifiziert"
+  },
+  "app.instance.worlds.filter-offline": {
+    "message": "Offline"
+  },
+  "app.instance.worlds.filter-online": {
+    "message": "Online"
+  },
+  "app.instance.worlds.filter-vanilla": {
+    "message": "Vanilla"
+  },
+  "app.instance.worlds.no-worlds-description": {
+    "message": "Füge einen Server hinzu oder durchsuche, um loszulegen"
+  },
+  "app.instance.worlds.no-worlds-heading": {
+    "message": "Keine Server oder Welten hinzugefügt"
+  },
+  "app.instance.worlds.remove-server-description": {
+    "message": "„{name}“ wird aus deiner Liste entfernt, auch im Spiel, und es gibt keine Möglichkeit, ihn wiederherzustellen."
+  },
+  "app.instance.worlds.remove-server-description-with-address": {
+    "message": "„{name}“ ({address}) wird aus deiner Liste entfernt, inklusive im Spiel, und es gibt keine Möglichkeit, ihn wiederherzustellen."
+  },
+  "app.instance.worlds.remove-server-title": {
+    "message": "Möchtest du {name} wirklich entfernen?"
+  },
+  "app.instance.worlds.search-worlds-placeholder": {
+    "message": "Durchsuche {count} Welten..."
+  },
+  "app.instance.worlds.this-server": {
+    "message": "dieser Server"
  },
  "app.modal.install-to-play.content-required": {
    "message": "Inhalte benötigt"
@@ -140,9 +197,6 @@
  "app.settings.tabs.default-instance-options": {
    "message": "Standard Instanz-Einstellungen"
  },
-  "app.settings.tabs.feature-flags": {
-    "message": "Funktionsflags"
-  },
  "app.settings.tabs.java-installations": {
    "message": "Java-Installationen"
  },
@@ -197,6 +251,24 @@
  "app.update.reload-to-update": {
    "message": "Neu laden, um das Update zu installieren"
  },
+  "app.world.server-modal.placeholder-address": {
+    "message": "example.modrinth.gg"
+  },
+  "app.world.server-modal.select-an-option": {
+    "message": "Wählen eine Option"
+  },
+  "app.world.world-item.incompatible-version": {
+    "message": "Inkompatible Version {version}"
+  },
+  "app.world.world-item.not-played-yet": {
+    "message": "Noch nicht gespielt"
+  },
+  "app.world.world-item.offline": {
+    "message": "Offline"
+  },
+  "app.world.world-item.players-online": {
+    "message": "{count} online"
+  },
  "friends.action.add-friend": {
    "message": "Freund hinzufügen"
  },
@@ -296,6 +368,12 @@
  "instance.edit-world.title": {
    "message": "Welt bearbeiten"
  },
+  "instance.files.adding-files": {
+    "message": "Dateien werden hinzugefügt ({completed}/{total})"
+  },
+  "instance.files.save-as": {
+    "message": "Speichern unter..."
+  },
  "instance.server-modal.address": {
    "message": "Adresse"
  },
@@ -467,9 +545,6 @@
  "instance.worlds.dont_show_on_home": {
    "message": "Nicht auf der Startseite anzeigen"
  },
-  "instance.worlds.filter.available": {
-    "message": "Verfügbar"
-  },
  "instance.worlds.game_already_open": {
    "message": "Instanz ist bereits geöffnet"
  },
@@ -494,12 +569,6 @@
  "instance.worlds.play_instance": {
    "message": "Instanz spielen"
  },
-  "instance.worlds.type.server": {
-    "message": "Server"
-  },
-  "instance.worlds.type.singleplayer": {
-    "message": "Einzelspieler"
-  },
  "instance.worlds.view_instance": {
    "message": "Instanz anzeigen"
  },
@@ -5,6 +5,39 @@
  "app.auth-servers.unreachable.header": {
    "message": "Cannot reach authentication servers"
  },
+  "app.browse.add-server-to-instance": {
+    "message": "Add server to instance"
+  },
+  "app.browse.add-servers-to-instance": {
+    "message": "Add servers to your instance"
+  },
+  "app.browse.add-to-instance": {
+    "message": "Add to instance"
+  },
+  "app.browse.add-to-instance-name": {
+    "message": "Add to {instanceName}"
+  },
+  "app.browse.added": {
+    "message": "Added"
+  },
+  "app.browse.already-added": {
+    "message": "Already added"
+  },
+  "app.browse.discover-content": {
+    "message": "Discover content"
+  },
+  "app.browse.discover-servers": {
+    "message": "Discover servers"
+  },
+  "app.browse.hide-added-servers": {
+    "message": "Hide added servers"
+  },
+  "app.browse.hide-installed-content": {
+    "message": "Hide installed content"
+  },
+  "app.browse.install-content-to-instance": {
+    "message": "Install content to instance"
+  },
  "app.export-modal.description-placeholder": {
    "message": "Enter modpack description..."
  },
@@ -41,33 +74,21 @@
  "app.instance.confirm-delete.header": {
    "message": "Delete instance"
  },
-  "app.instance.modpack-already-installed.admonition-body": {
-    "message": "This modpack is already installed in the \"{instanceName}\" instance."
+  "app.instance.modpack-already-installed.body": {
+    "message": "This modpack is already installed in the <bold>{instanceName}</bold> instance. Are you sure you want to duplicate it?"
  },
-  "app.instance.modpack-already-installed.admonition-header": {
-    "message": "Duplicate modpack"
-  },
-  "app.instance.modpack-already-installed.create-anyway": {
-    "message": "Create anyway"
-  },
-  "app.instance.modpack-already-installed.go-to-instance": {
-    "message": "Go to instance"
+  "app.instance.modpack-already-installed.create": {
+    "message": "Create"
  },
  "app.instance.modpack-already-installed.header": {
    "message": "Modpack already installed"
  },
+  "app.instance.modpack-already-installed.instance": {
+    "message": "Instance"
+  },
  "app.instance.mods.content-type-project": {
    "message": "project"
  },
-  "app.instance.mods.copy-link": {
-    "message": "Copy link"
-  },
-  "app.instance.mods.installing": {
-    "message": "Installing..."
-  },
-  "app.instance.mods.modpack-fallback": {
-    "message": "Modpack"
-  },
  "app.instance.mods.project-was-added": {
    "message": "\"{name}\" was added"
  },
@@ -80,17 +101,53 @@
  "app.instance.mods.share-title": {
    "message": "Sharing modpack content"
  },
-  "app.instance.mods.show-file": {
-    "message": "Show file"
-  },
  "app.instance.mods.successfully-uploaded": {
    "message": "Successfully uploaded"
  },
-  "app.instance.mods.unknown-version": {
-    "message": "Unknown"
+  "app.instance.worlds.add-server": {
+    "message": "Add server"
  },
-  "app.instance.mods.updating": {
-    "message": "Updating..."
+  "app.instance.worlds.browse-servers": {
+    "message": "Browse servers"
+  },
+  "app.instance.worlds.delete-world-description": {
+    "message": "'{name}' will be **permanently deleted**, and there will be no way to recover it."
+  },
+  "app.instance.worlds.delete-world-title": {
+    "message": "Are you sure you want to permanently delete this world?"
+  },
+  "app.instance.worlds.filter-modded": {
+    "message": "Modded"
+  },
+  "app.instance.worlds.filter-offline": {
+    "message": "Offline"
+  },
+  "app.instance.worlds.filter-online": {
+    "message": "Online"
+  },
+  "app.instance.worlds.filter-vanilla": {
+    "message": "Vanilla"
+  },
+  "app.instance.worlds.no-worlds-description": {
+    "message": "Add a server or browse to get started"
+  },
+  "app.instance.worlds.no-worlds-heading": {
+    "message": "No servers or worlds added"
+  },
+  "app.instance.worlds.remove-server-description": {
+    "message": "'{name}' will be removed from your list, including in-game, and there will be no way to recover it."
+  },
+  "app.instance.worlds.remove-server-description-with-address": {
+    "message": "'{name}' ({address}) will be removed from your list, including in-game, and there will be no way to recover it."
+  },
+  "app.instance.worlds.remove-server-title": {
+    "message": "Are you sure you want to remove {name}?"
+  },
+  "app.instance.worlds.search-worlds-placeholder": {
+    "message": "Search {count} worlds..."
+  },
+  "app.instance.worlds.this-server": {
+    "message": "this server"
  },
  "app.modal.install-to-play.content-required": {
    "message": "Content required"
@@ -140,9 +197,6 @@
  "app.settings.tabs.default-instance-options": {
    "message": "Default instance options"
  },
-  "app.settings.tabs.feature-flags": {
-    "message": "Feature flags"
-  },
  "app.settings.tabs.java-installations": {
    "message": "Java installations"
  },
@@ -197,6 +251,24 @@
  "app.update.reload-to-update": {
    "message": "Reload to install update"
  },
+  "app.world.server-modal.placeholder-address": {
+    "message": "example.modrinth.gg"
+  },
+  "app.world.server-modal.select-an-option": {
+    "message": "Select an option"
+  },
+  "app.world.world-item.incompatible-version": {
+    "message": "Incompatible version {version}"
+  },
+  "app.world.world-item.not-played-yet": {
+    "message": "Not played yet"
+  },
+  "app.world.world-item.offline": {
+    "message": "Offline"
+  },
+  "app.world.world-item.players-online": {
+    "message": "{count} online"
+  },
  "friends.action.add-friend": {
    "message": "Add a friend"
  },
@@ -296,6 +368,12 @@
  "instance.edit-world.title": {
    "message": "Edit world"
  },
+  "instance.files.adding-files": {
+    "message": "Adding files ({completed}/{total})"
+  },
+  "instance.files.save-as": {
+    "message": "Save as..."
+  },
  "instance.server-modal.address": {
    "message": "Address"
  },
@@ -467,9 +545,6 @@
  "instance.worlds.dont_show_on_home": {
    "message": "Don't show on Home"
  },
-  "instance.worlds.filter.available": {
-    "message": "Available"
-  },
  "instance.worlds.game_already_open": {
    "message": "Instance is already open"
  },
@@ -494,12 +569,6 @@
  "instance.worlds.play_instance": {
    "message": "Play instance"
  },
-  "instance.worlds.type.server": {
-    "message": "Server"
-  },
-  "instance.worlds.type.singleplayer": {
-    "message": "Singleplayer"
-  },
  "instance.worlds.view_instance": {
    "message": "View instance"
  },
@@ -5,8 +5,41 @@
  "app.auth-servers.unreachable.header": {
    "message": "No se puede acceder a los servidores de autenticación"
  },
+  "app.browse.add-server-to-instance": {
+    "message": "Añadir servidor a la instancia"
+  },
+  "app.browse.add-servers-to-instance": {
+    "message": "Añadir servidor a tu instancia"
+  },
+  "app.browse.add-to-instance": {
+    "message": "Añadir a la instancia"
+  },
+  "app.browse.add-to-instance-name": {
+    "message": "Añadir a {instanceName}"
+  },
+  "app.browse.added": {
+    "message": "Añadido"
+  },
+  "app.browse.already-added": {
+    "message": "Ya está añadido"
+  },
+  "app.browse.discover-content": {
+    "message": "Descubrir contenido"
+  },
+  "app.browse.discover-servers": {
+    "message": "Descubrir servidores"
+  },
+  "app.browse.hide-added-servers": {
+    "message": "Ocultar servidores añadidos"
+  },
+  "app.browse.hide-installed-content": {
+    "message": "Ocultar contenido instalado"
+  },
+  "app.browse.install-content-to-instance": {
+    "message": "Instalar contenido a una instancia"
+  },
  "app.export-modal.description-placeholder": {
-    "message": "Escribe la descripción del modpack..."
+    "message": "Colocá la descripción del modpack..."
  },
  "app.export-modal.export-button": {
    "message": "Exportar"
@@ -21,16 +54,16 @@
    "message": "Nombre del modpack"
  },
  "app.export-modal.select-files-label": {
-    "message": "Seleccione archivos y carpetas para incluir en el paquete"
+    "message": "Selelecciona archivos y carpetas para incluir en el pack"
  },
  "app.export-modal.version-number-label": {
-    "message": "Número de versión"
+    "message": "Nombre de la versión"
  },
  "app.export-modal.version-number-placeholder": {
    "message": "1.0.0"
  },
  "app.instance.confirm-delete.admonition-body": {
-    "message": "Todos los datos de su instancia se eliminarán permanentemente, incluidos sus mundos, configuraciones y todo el contenido instalado."
+    "message": "Todos los datos de tu instancia se eliminarán permanentemente, incluidos tus mundos, configuraciones y todo el contenido instalado."
  },
  "app.instance.confirm-delete.admonition-header": {
    "message": "Esta acción no se puede deshacer"
@@ -41,56 +74,80 @@
  "app.instance.confirm-delete.header": {
    "message": "Eliminar instancia"
  },
-  "app.instance.modpack-already-installed.admonition-body": {
-    "message": "Este modpack ya está instalado en la instancia \"{instanceName}\"."
+  "app.instance.modpack-already-installed.body": {
+    "message": "Este modpack ya está instalado en la instancia <bold>{instanceName}</bold>. ¿Estás seguro qué quieres duplicarlo?"
  },
-  "app.instance.modpack-already-installed.admonition-header": {
-    "message": "Modpack duplicado"
-  },
-  "app.instance.modpack-already-installed.create-anyway": {
-    "message": "Crea de todos modos"
-  },
-  "app.instance.modpack-already-installed.go-to-instance": {
-    "message": "Ir a la instancia"
+  "app.instance.modpack-already-installed.create": {
+    "message": "Crear"
  },
  "app.instance.modpack-already-installed.header": {
-    "message": "Modpack ya está instalado"
+    "message": "Este modpack ya esta instalado"
+  },
+  "app.instance.modpack-already-installed.instance": {
+    "message": "Instancia"
  },
  "app.instance.mods.content-type-project": {
    "message": "proyecto"
  },
-  "app.instance.mods.copy-link": {
-    "message": "Copiar enlace"
-  },
-  "app.instance.mods.installing": {
-    "message": "Instalando..."
-  },
-  "app.instance.mods.modpack-fallback": {
-    "message": "Modpack"
-  },
  "app.instance.mods.project-was-added": {
-    "message": "Se ha añadido \"{name}\""
+    "message": "\"{name}\" fue añadido"
  },
  "app.instance.mods.projects-were-added": {
-    "message": "Se han añadido {count} proyectos"
+    "message": "Se agregaron {count} proyectos"
  },
  "app.instance.mods.share-text": {
-    "message": "¡Echa un vistazo a los proyectos que utilizo en mi modpack!"
+    "message": "¡Echa un vistazo a los proyectos que estoy usando en mi paquete de mods!"
  },
  "app.instance.mods.share-title": {
-    "message": "Compartir contenido del modpack"
-  },
-  "app.instance.mods.show-file": {
-    "message": "Mostrar archivo"
+    "message": "Compartiendo contenido del modpack"
  },
  "app.instance.mods.successfully-uploaded": {
-    "message": "Se ha subido correctamente"
+    "message": "Subido correctamente"
  },
-  "app.instance.mods.unknown-version": {
-    "message": "Desconocido"
+  "app.instance.worlds.add-server": {
+    "message": "Añadir servidor"
  },
-  "app.instance.mods.updating": {
-    "message": "Actualizando..."
+  "app.instance.worlds.browse-servers": {
+    "message": "Explorar servidores"
+  },
+  "app.instance.worlds.delete-world-description": {
+    "message": "'{name}' será **permanentemente eliminado**, y habrá forma de recuperarlo."
+  },
+  "app.instance.worlds.delete-world-title": {
+    "message": "¿Estás seguro de qué quieres eliminar permanentemente este mundo?"
+  },
+  "app.instance.worlds.filter-modded": {
+    "message": "Modeado"
+  },
+  "app.instance.worlds.filter-offline": {
+    "message": "Sin conexión"
+  },
+  "app.instance.worlds.filter-online": {
+    "message": "En línea"
+  },
+  "app.instance.worlds.filter-vanilla": {
+    "message": "Vanilla"
+  },
+  "app.instance.worlds.no-worlds-description": {
+    "message": "Añadir un servidor o explora para comenzar"
+  },
+  "app.instance.worlds.no-worlds-heading": {
+    "message": "No hay servidores o mundos añadidos"
+  },
+  "app.instance.worlds.remove-server-description": {
+    "message": "'{name}' será eliminado de tu lista, incluyendo dentro del juego, y no habrá forma de recuperarlo."
+  },
+  "app.instance.worlds.remove-server-description-with-address": {
+    "message": "'{name}' ({address}) será eliminado de tu lista, incluyendo dentro del juego, y no habrá forma de recuperarlo."
+  },
+  "app.instance.worlds.remove-server-title": {
+    "message": "¿Estás seguro de qué quieres eliminar {name}?"
+  },
+  "app.instance.worlds.search-worlds-placeholder": {
+    "message": "Buscar {count} mundos..."
+  },
+  "app.instance.worlds.this-server": {
+    "message": "este servidor"
  },
  "app.modal.install-to-play.content-required": {
    "message": "Contenido requerido"
@@ -140,9 +197,6 @@
  "app.settings.tabs.default-instance-options": {
    "message": "Opciones predeterminadas de la instancia"
  },
-  "app.settings.tabs.feature-flags": {
-    "message": "Funciones experimentales"
-  },
  "app.settings.tabs.java-installations": {
    "message": "Instalaciones de Java"
  },
@@ -197,6 +251,24 @@
  "app.update.reload-to-update": {
    "message": "Recarga para instalar la actualización"
  },
+  "app.world.server-modal.placeholder-address": {
+    "message": "ejemplo.modrinth.gg"
+  },
+  "app.world.server-modal.select-an-option": {
+    "message": "Selecciona una opción"
+  },
+  "app.world.world-item.incompatible-version": {
+    "message": "Versión {version} incompatible"
+  },
+  "app.world.world-item.not-played-yet": {
+    "message": "No se ha jugado aún"
+  },
+  "app.world.world-item.offline": {
+    "message": "Desconectado"
+  },
+  "app.world.world-item.players-online": {
+    "message": "{count} en línea"
+  },
  "friends.action.add-friend": {
    "message": "Añadir un amigo"
  },
@@ -296,6 +368,12 @@
  "instance.edit-world.title": {
    "message": "Editar mundo"
  },
+  "instance.files.adding-files": {
+    "message": "Añadiendo archivos ({completed}/{total})"
+  },
+  "instance.files.save-as": {
+    "message": "Guardar como..."
+  },
  "instance.server-modal.address": {
    "message": "Dirección IP"
  },
@@ -467,9 +545,6 @@
  "instance.worlds.dont_show_on_home": {
    "message": "No mostrar en la página de inicio"
  },
-  "instance.worlds.filter.available": {
-    "message": "Disponible"
-  },
  "instance.worlds.game_already_open": {
    "message": "La instancia ya está abierta"
  },
@@ -494,12 +569,6 @@
  "instance.worlds.play_instance": {
    "message": "Iniciar instancia"
  },
-  "instance.worlds.type.server": {
-    "message": "Servidor"
-  },
-  "instance.worlds.type.singleplayer": {
-    "message": "Un jugador"
-  },
  "instance.worlds.view_instance": {
    "message": "Ver instancia"
  },
@@ -5,6 +5,39 @@
  "app.auth-servers.unreachable.header": {
    "message": "No se puede conectar con los servidores de autenticación"
  },
+  "app.browse.add-server-to-instance": {
+    "message": "Añadir servidor a la instancia"
+  },
+  "app.browse.add-servers-to-instance": {
+    "message": "Añadir servidor a tu instancia"
+  },
+  "app.browse.add-to-instance": {
+    "message": "Añadir a la instancia"
+  },
+  "app.browse.add-to-instance-name": {
+    "message": "Añadir a {instanceName}"
+  },
+  "app.browse.added": {
+    "message": "Añadido"
+  },
+  "app.browse.already-added": {
+    "message": "Ya está añadido"
+  },
+  "app.browse.discover-content": {
+    "message": "Descubrir contenido"
+  },
+  "app.browse.discover-servers": {
+    "message": "Descubrir servidores"
+  },
+  "app.browse.hide-added-servers": {
+    "message": "Ocultar servidores añadidos"
+  },
+  "app.browse.hide-installed-content": {
+    "message": "Ocultar contenido instalado"
+  },
+  "app.browse.install-content-to-instance": {
+    "message": "Instalar contenido a una instancia"
+  },
  "app.export-modal.description-placeholder": {
    "message": "Escribe la descripción del modpack..."
  },
@@ -41,33 +74,21 @@
  "app.instance.confirm-delete.header": {
    "message": "Eliminar instancia"
  },
-  "app.instance.modpack-already-installed.admonition-body": {
-    "message": "Este modpack ya está instalado en la instancia \"{instanceName}\"."
+  "app.instance.modpack-already-installed.body": {
+    "message": "Este modpack ya está instalado en la instancia <bold>{instanceName}</bold>. ¿Estás seguro qué quieres duplicarlo?"
  },
-  "app.instance.modpack-already-installed.admonition-header": {
-    "message": "Modpack duplicado"
-  },
-  "app.instance.modpack-already-installed.create-anyway": {
-    "message": "Crea de todos modos"
-  },
-  "app.instance.modpack-already-installed.go-to-instance": {
-    "message": "Ir a la instancia"
+  "app.instance.modpack-already-installed.create": {
+    "message": "Crear"
  },
  "app.instance.modpack-already-installed.header": {
    "message": "Modpack ya está instalado"
  },
+  "app.instance.modpack-already-installed.instance": {
+    "message": "Instancia"
+  },
  "app.instance.mods.content-type-project": {
    "message": "proyecto"
  },
-  "app.instance.mods.copy-link": {
-    "message": "Copiar enlace"
-  },
-  "app.instance.mods.installing": {
-    "message": "Instalando..."
-  },
-  "app.instance.mods.modpack-fallback": {
-    "message": "Modpack"
-  },
  "app.instance.mods.project-was-added": {
    "message": "Se ha añadido \"{name}\""
  },
@@ -80,17 +101,53 @@
  "app.instance.mods.share-title": {
    "message": "Compartir contenido del modpack"
  },
-  "app.instance.mods.show-file": {
-    "message": "Mostrar archivo"
-  },
  "app.instance.mods.successfully-uploaded": {
    "message": "Se ha subido correctamente"
  },
-  "app.instance.mods.unknown-version": {
-    "message": "Desconocido"
+  "app.instance.worlds.add-server": {
+    "message": "Añadir servidor"
  },
-  "app.instance.mods.updating": {
-    "message": "Actualizando..."
+  "app.instance.worlds.browse-servers": {
+    "message": "Explorar servidores"
+  },
+  "app.instance.worlds.delete-world-description": {
+    "message": "'{name}' será **permanentemente eliminado**, y habrá forma de recuperarlo."
+  },
+  "app.instance.worlds.delete-world-title": {
+    "message": "¿Estás seguro de qué quieres eliminar permanentemente este mundo?"
+  },
+  "app.instance.worlds.filter-modded": {
+    "message": "Modeado"
+  },
+  "app.instance.worlds.filter-offline": {
+    "message": "Sin conexión"
+  },
+  "app.instance.worlds.filter-online": {
+    "message": "En línea"
+  },
+  "app.instance.worlds.filter-vanilla": {
+    "message": "Vanilla"
+  },
+  "app.instance.worlds.no-worlds-description": {
+    "message": "Añadir un servidor o explora para comenzar"
+  },
+  "app.instance.worlds.no-worlds-heading": {
+    "message": "No hay servidores o mundos añadidos"
+  },
+  "app.instance.worlds.remove-server-description": {
+    "message": "'{name}' será eliminado de tu lista, incluyendo dentro del juego, y no habrá forma de recuperarlo."
+  },
+  "app.instance.worlds.remove-server-description-with-address": {
+    "message": "'{name}' ({address}) será eliminado de tu lista, incluyendo dentro del juego, y no habrá forma de recuperarlo."
+  },
+  "app.instance.worlds.remove-server-title": {
+    "message": "¿Estás seguro de qué quieres eliminar {name}?"
+  },
+  "app.instance.worlds.search-worlds-placeholder": {
+    "message": "Buscar {count} mundos..."
+  },
+  "app.instance.worlds.this-server": {
+    "message": "este servidor"
  },
  "app.modal.install-to-play.content-required": {
    "message": "Contenido obligatorio"
@@ -140,9 +197,6 @@
  "app.settings.tabs.default-instance-options": {
    "message": "Opciones predeterminadas de la instancia"
  },
-  "app.settings.tabs.feature-flags": {
-    "message": "Funciones experimentales"
-  },
  "app.settings.tabs.java-installations": {
    "message": "Instalaciones de Java"
  },
@@ -197,6 +251,24 @@
  "app.update.reload-to-update": {
    "message": "Recarga para instalar la actualización"
  },
+  "app.world.server-modal.placeholder-address": {
+    "message": "ejemplo.modrinth.gg"
+  },
+  "app.world.server-modal.select-an-option": {
+    "message": "Selecciona una opción"
+  },
+  "app.world.world-item.incompatible-version": {
+    "message": "Versión {version} incompatible"
+  },
+  "app.world.world-item.not-played-yet": {
+    "message": "No se ha jugado aún"
+  },
+  "app.world.world-item.offline": {
+    "message": "Desconectado"
+  },
+  "app.world.world-item.players-online": {
+    "message": "{count} en línea"
+  },
  "friends.action.add-friend": {
    "message": "Agrega a un amigo"
  },
@@ -296,6 +368,12 @@
  "instance.edit-world.title": {
    "message": "Editar mundo"
  },
+  "instance.files.adding-files": {
+    "message": "Añadiendo archivos ({completed}/{total})"
+  },
+  "instance.files.save-as": {
+    "message": "Guardar como..."
+  },
  "instance.server-modal.address": {
    "message": "Dirección IP"
  },
@@ -467,9 +545,6 @@
  "instance.worlds.dont_show_on_home": {
    "message": "No mostrar en Inicio"
  },
-  "instance.worlds.filter.available": {
-    "message": "Disponible"
-  },
  "instance.worlds.game_already_open": {
    "message": "La instancia ya está abierta"
  },
@@ -494,12 +569,6 @@
  "instance.worlds.play_instance": {
    "message": "Jugar instancia"
  },
-  "instance.worlds.type.server": {
-    "message": "Servidor"
-  },
-  "instance.worlds.type.singleplayer": {
-    "message": "Un jugador"
-  },
  "instance.worlds.view_instance": {
    "message": "Ver instancia"
  },
@@ -71,9 +71,6 @@
  "app.settings.tabs.default-instance-options": {
    "message": "Oletusinstanssin asetukset"
  },
-  "app.settings.tabs.feature-flags": {
-    "message": "Ominaisuuskytkimet"
-  },
  "app.settings.tabs.java-installations": {
    "message": "Java asennukset"
  },
@@ -398,9 +395,6 @@
  "instance.worlds.dont_show_on_home": {
    "message": "Älä näytä koti näkymässä"
  },
-  "instance.worlds.filter.available": {
-    "message": "Saatavilla"
-  },
  "instance.worlds.game_already_open": {
    "message": "Instanssi on jo avattu"
  },
@@ -425,12 +419,6 @@
  "instance.worlds.play_instance": {
    "message": "Pelaa instanssia"
  },
-  "instance.worlds.type.server": {
-    "message": "Palvelin"
-  },
-  "instance.worlds.type.singleplayer": {
-    "message": "Yksinpeli"
-  },
  "instance.worlds.view_instance": {
    "message": "Näytä instanssi"
  },
@@ -26,18 +26,9 @@
  "app.instance.mods.content-type-project": {
    "message": "proyekto"
  },
-  "app.instance.mods.copy-link": {
-    "message": "Kopyahin ang link"
-  },
-  "app.instance.mods.modpack-fallback": {
-    "message": "Modpack"
-  },
  "app.instance.mods.project-was-added": {
    "message": "Ang \"{name}\" ay nadagdag"
  },
-  "app.instance.mods.unknown-version": {
-    "message": "Hindi kilala"
-  },
  "app.modal.install-to-play.content-required": {
    "message": "Nangangailangan ng kontento"
  },
@@ -86,9 +77,6 @@
  "app.settings.tabs.default-instance-options": {
    "message": "Mga pagpipilian sa default na instansiya"
  },
-  "app.settings.tabs.feature-flags": {
-    "message": "Mga hudyat ng tampok"
-  },
  "app.settings.tabs.java-installations": {
    "message": "Mga instalasyon ng Java"
  },
@@ -413,9 +401,6 @@
  "instance.worlds.dont_show_on_home": {
    "message": "Huwag ipakita sa Home"
  },
-  "instance.worlds.filter.available": {
-    "message": "Magagamit"
-  },
  "instance.worlds.game_already_open": {
    "message": "Bukas naman ang instansiya"
  },
@@ -440,12 +425,6 @@
  "instance.worlds.play_instance": {
    "message": "Laruin ang instansiya"
  },
-  "instance.worlds.type.server": {
-    "message": "Server"
-  },
-  "instance.worlds.type.singleplayer": {
-    "message": "Pang-isahang laro"
-  },
  "instance.worlds.view_instance": {
    "message": "Tingnan ang instansiya"
  },
@@ -5,6 +5,39 @@
  "app.auth-servers.unreachable.header": {
    "message": "Impossible de contacter les serveurs d'authentification"
  },
+  "app.browse.add-server-to-instance": {
+    "message": "Ajouter le serveur a l'instance"
+  },
+  "app.browse.add-servers-to-instance": {
+    "message": "Ajouter des serveurs a votre instance"
+  },
+  "app.browse.add-to-instance": {
+    "message": "Ajouter à l'instance"
+  },
+  "app.browse.add-to-instance-name": {
+    "message": "Ajouter à {instanceName}"
+  },
+  "app.browse.added": {
+    "message": "Ajouté"
+  },
+  "app.browse.already-added": {
+    "message": "Déjà ajouté"
+  },
+  "app.browse.discover-content": {
+    "message": "Découvrir du contenu"
+  },
+  "app.browse.discover-servers": {
+    "message": "Découvrir des serveurs"
+  },
+  "app.browse.hide-added-servers": {
+    "message": "Masquer les serveurs ajoutés"
+  },
+  "app.browse.hide-installed-content": {
+    "message": "Masquer le contenu installé"
+  },
+  "app.browse.install-content-to-instance": {
+    "message": "Installer du contenu à l'instance"
+  },
  "app.export-modal.description-placeholder": {
    "message": "Saisir la description du modpack..."
  },
@@ -41,33 +74,21 @@
  "app.instance.confirm-delete.header": {
    "message": "Supprimer l'instance"
  },
-  "app.instance.modpack-already-installed.admonition-body": {
-    "message": "Ce modpack est déjà installé dans l’instance « {instanceName} »."
+  "app.instance.modpack-already-installed.body": {
+    "message": "Ce modpack est déjà installé sur l'instance <bold>{instanceName}</bold>. Êtes-vous sûr.e de vouloir le dupliquer ?"
  },
-  "app.instance.modpack-already-installed.admonition-header": {
-    "message": "Dupliquer le modpack"
-  },
-  "app.instance.modpack-already-installed.create-anyway": {
-    "message": "Créer quand même"
-  },
-  "app.instance.modpack-already-installed.go-to-instance": {
-    "message": "Aller à l’instance"
+  "app.instance.modpack-already-installed.create": {
+    "message": "Créer"
  },
  "app.instance.modpack-already-installed.header": {
    "message": "Modpack déjà installé"
  },
+  "app.instance.modpack-already-installed.instance": {
+    "message": "Instance"
+  },
  "app.instance.mods.content-type-project": {
    "message": "projet"
  },
-  "app.instance.mods.copy-link": {
-    "message": "Copier le lien"
-  },
-  "app.instance.mods.installing": {
-    "message": "Installation..."
-  },
-  "app.instance.mods.modpack-fallback": {
-    "message": "Modpack"
-  },
  "app.instance.mods.project-was-added": {
    "message": "« {name} » a été ajouté"
  },
@@ -80,17 +101,53 @@
  "app.instance.mods.share-title": {
    "message": "Partagez le contenu de votre modpack"
  },
-  "app.instance.mods.show-file": {
-    "message": "Montrer le fichier"
-  },
  "app.instance.mods.successfully-uploaded": {
    "message": "Mis en ligne avec succès"
  },
-  "app.instance.mods.unknown-version": {
-    "message": "Inconnu"
+  "app.instance.worlds.add-server": {
+    "message": "Ajouter le serveur"
  },
-  "app.instance.mods.updating": {
-    "message": "Mise à jour..."
+  "app.instance.worlds.browse-servers": {
+    "message": "Parcourir des serveurs"
+  },
+  "app.instance.worlds.delete-world-description": {
+    "message": "« {name} » sera supprimé **pour toujours**, et il sera impossible de le récupérer."
+  },
+  "app.instance.worlds.delete-world-title": {
+    "message": "Étes-vous sûr.e de vouloir supprimer ce monde pour toujours ?"
+  },
+  "app.instance.worlds.filter-modded": {
+    "message": "Moddé"
+  },
+  "app.instance.worlds.filter-offline": {
+    "message": "Hors ligne"
+  },
+  "app.instance.worlds.filter-online": {
+    "message": "En ligne"
+  },
+  "app.instance.worlds.filter-vanilla": {
+    "message": "Vanilla"
+  },
+  "app.instance.worlds.no-worlds-description": {
+    "message": "Ajouter un serveur ou parcourir pour commencer"
+  },
+  "app.instance.worlds.no-worlds-heading": {
+    "message": "Aucun serveur ou monde ajoutés"
+  },
+  "app.instance.worlds.remove-server-description": {
+    "message": "« {name} » sera retiré de votre liste, y compris en jeu, et il sera impossible de le récupérer."
+  },
+  "app.instance.worlds.remove-server-description-with-address": {
+    "message": "« {name} » ({address}) sera retiré de votre liste, y compris en jeu, et il sera impossible de le récupérer."
+  },
+  "app.instance.worlds.remove-server-title": {
+    "message": "Êtes-vous sûr.e de vouloir retirer {name} ?"
+  },
+  "app.instance.worlds.search-worlds-placeholder": {
+    "message": "Rechercher {count} mondes..."
+  },
+  "app.instance.worlds.this-server": {
+    "message": "ce serveur"
  },
  "app.modal.install-to-play.content-required": {
    "message": "Contenu requis"
@@ -140,9 +197,6 @@
  "app.settings.tabs.default-instance-options": {
    "message": "Options d’instance par défaut"
  },
-  "app.settings.tabs.feature-flags": {
-    "message": "Menu de fonctionnalité"
-  },
  "app.settings.tabs.java-installations": {
    "message": "Installations de Java"
  },
@@ -197,6 +251,24 @@
  "app.update.reload-to-update": {
    "message": "Relancez l'application pour installer la mise à jour"
  },
+  "app.world.server-modal.placeholder-address": {
+    "message": "exemple.modrinth.gg"
+  },
+  "app.world.server-modal.select-an-option": {
+    "message": "Sélectionner une option"
+  },
+  "app.world.world-item.incompatible-version": {
+    "message": "Version {version} incompatible"
+  },
+  "app.world.world-item.not-played-yet": {
+    "message": "Pas encore joué"
+  },
+  "app.world.world-item.offline": {
+    "message": "Hors ligne"
+  },
+  "app.world.world-item.players-online": {
+    "message": "{count, plural, =0 {Personne en ligne} one {# est en ligne} other {# sont en ligne}}"
+  },
  "friends.action.add-friend": {
    "message": "Ajouter un ami"
  },
@@ -296,6 +368,12 @@
  "instance.edit-world.title": {
    "message": "Modifier le monde"
  },
+  "instance.files.adding-files": {
+    "message": "Ajout de fichiers ({completed}/{total})"
+  },
+  "instance.files.save-as": {
+    "message": "Sauvegarder en tant que..."
+  },
  "instance.server-modal.address": {
    "message": "Adresse"
  },
@@ -467,9 +545,6 @@
  "instance.worlds.dont_show_on_home": {
    "message": "Ne pas montrer dans l'Accueil"
  },
-  "instance.worlds.filter.available": {
-    "message": "Disponible"
-  },
  "instance.worlds.game_already_open": {
    "message": "L'instance est déjà ouverte"
  },
@@ -494,12 +569,6 @@
  "instance.worlds.play_instance": {
    "message": "Jouer à l'instance"
  },
-  "instance.worlds.type.server": {
-    "message": "Serveur"
-  },
-  "instance.worlds.type.singleplayer": {
-    "message": "Solo"
-  },
  "instance.worlds.view_instance": {
    "message": "Voir l'instance"
  },
@@ -5,6 +5,9 @@
  "app.auth-servers.unreachable.header": {
    "message": "לא ניתן לגשת לשרתי האימות"
  },
+  "app.browse.hide-installed-content": {
+    "message": "הסתר תוכן מותקן"
+  },
  "app.export-modal.description-placeholder": {
    "message": "הזן את תיאור חבילת המודים..."
  },
@@ -41,18 +44,12 @@
  "app.instance.confirm-delete.header": {
    "message": "מחיקת התקנה"
  },
+  "app.instance.modpack-already-installed.create": {
+    "message": "צור"
+  },
  "app.instance.mods.content-type-project": {
    "message": "פרויקט"
  },
-  "app.instance.mods.copy-link": {
-    "message": "העתק קישור"
-  },
-  "app.instance.mods.installing": {
-    "message": "מתקין..."
-  },
-  "app.instance.mods.modpack-fallback": {
-    "message": "חבילת מודים"
-  },
  "app.instance.mods.project-was-added": {
    "message": "\"{name}\" נוסף"
  },
@@ -65,17 +62,17 @@
  "app.instance.mods.share-title": {
    "message": "משתף את התוכן של חבילת המודים"
  },
-  "app.instance.mods.show-file": {
-    "message": "מצא קובץ"
-  },
  "app.instance.mods.successfully-uploaded": {
    "message": "הועלה בהצלחה"
  },
-  "app.instance.mods.unknown-version": {
-    "message": "לא ידוע"
+  "app.instance.worlds.add-server": {
+    "message": "הוסף שרת"
  },
-  "app.instance.mods.updating": {
-    "message": "מעדכן..."
+  "app.instance.worlds.delete-world-title": {
+    "message": "האם אתה בטוח שברצונך למחוק לצמיתות את העולם הזה?"
+  },
+  "app.instance.worlds.no-worlds-heading": {
+    "message": "אין שרתים אן עולמות שנוספו"
  },
  "app.modal.install-to-play.content-required": {
    "message": "תוכן נדרש"
@@ -125,9 +122,6 @@
  "app.settings.tabs.default-instance-options": {
    "message": "אפשרויות ברירת מחדל של התקנה"
  },
-  "app.settings.tabs.feature-flags": {
-    "message": "הגדרות ניסיוניות"
-  },
  "app.settings.tabs.java-installations": {
    "message": "התקנות ג'אווה"
  },
@@ -281,6 +275,9 @@
  "instance.edit-world.title": {
    "message": "ערוך עולם"
  },
+  "instance.files.save-as": {
+    "message": "שמור כ..."
+  },
  "instance.server-modal.address": {
    "message": "כתובת"
  },
@@ -452,9 +449,6 @@
  "instance.worlds.dont_show_on_home": {
    "message": "אל תציג בדף הבית"
  },
-  "instance.worlds.filter.available": {
-    "message": "זמין"
-  },
  "instance.worlds.game_already_open": {
    "message": "התקנה כבר פתוחה"
  },
@@ -479,12 +473,6 @@
  "instance.worlds.play_instance": {
    "message": "שחק בהתקנה"
  },
-  "instance.worlds.type.server": {
-    "message": "שרת"
-  },
-  "instance.worlds.type.singleplayer": {
-    "message": "שחקן יחיד"
-  },
  "instance.worlds.view_instance": {
    "message": "הצג התקנה"
  },
@@ -5,6 +5,39 @@
  "app.auth-servers.unreachable.header": {
    "message": "Nem lehet elérni a hitelesítési kiszolgálókat"
  },
+  "app.browse.add-server-to-instance": {
+    "message": "Szerver hozzáadása a profilhoz"
+  },
+  "app.browse.add-servers-to-instance": {
+    "message": "Szerverek hozzáadása a profilodhoz"
+  },
+  "app.browse.add-to-instance": {
+    "message": "Hozzáadás a profilhoz"
+  },
+  "app.browse.add-to-instance-name": {
+    "message": "Hozzáadás ehhez: {instanceName}"
+  },
+  "app.browse.added": {
+    "message": "Hozzáadva"
+  },
+  "app.browse.already-added": {
+    "message": "Már hozzá van adva"
+  },
+  "app.browse.discover-content": {
+    "message": "Tartalom böngészése"
+  },
+  "app.browse.discover-servers": {
+    "message": "Szerverek böngészése"
+  },
+  "app.browse.hide-added-servers": {
+    "message": "Hozzáadott szerverek elrejtése"
+  },
+  "app.browse.hide-installed-content": {
+    "message": "A telepített tartalmak elrejtése"
+  },
+  "app.browse.install-content-to-instance": {
+    "message": "Tartalom letöltése a profilhoz"
+  },
  "app.export-modal.description-placeholder": {
    "message": "Írd be a modcsomag leírását..."
  },
@@ -41,33 +74,21 @@
  "app.instance.confirm-delete.header": {
    "message": "Profil törlése"
  },
-  "app.instance.modpack-already-installed.admonition-body": {
-    "message": "Ez a modcsomag már telepítve van a „{instanceName}” profilban."
+  "app.instance.modpack-already-installed.body": {
+    "message": "Ez a modcsomag már telepítve van a(z) <bold>{instanceName}</bold> profilban. Biztosan duplikálni szeretnéd?"
  },
-  "app.instance.modpack-already-installed.admonition-header": {
-    "message": "Modcsomag duplikálása"
-  },
-  "app.instance.modpack-already-installed.create-anyway": {
-    "message": "Létrehozás mindenképpen"
-  },
-  "app.instance.modpack-already-installed.go-to-instance": {
-    "message": "Profil megnyitása"
+  "app.instance.modpack-already-installed.create": {
+    "message": "Létrehozás"
  },
  "app.instance.modpack-already-installed.header": {
    "message": "A modcsomag már telepítve van"
  },
+  "app.instance.modpack-already-installed.instance": {
+    "message": "Profil"
+  },
  "app.instance.mods.content-type-project": {
    "message": "projekt"
  },
-  "app.instance.mods.copy-link": {
-    "message": "Link másolása"
-  },
-  "app.instance.mods.installing": {
-    "message": "Telepítés..."
-  },
-  "app.instance.mods.modpack-fallback": {
-    "message": "Modcsomag"
-  },
  "app.instance.mods.project-was-added": {
    "message": " „{name}” hozzá lett adva"
  },
@@ -80,17 +101,47 @@
  "app.instance.mods.share-title": {
    "message": "Modcsomag-tartalmak megosztása"
  },
-  "app.instance.mods.show-file": {
-    "message": "Fájl megjelenítése"
-  },
  "app.instance.mods.successfully-uploaded": {
    "message": "Sikeresen feltöltve"
  },
-  "app.instance.mods.unknown-version": {
-    "message": "Ismeretlen"
+  "app.instance.worlds.add-server": {
+    "message": "Szerver hozzáadása"
  },
-  "app.instance.mods.updating": {
-    "message": "Frissítés..."
+  "app.instance.worlds.browse-servers": {
+    "message": "Szerverek böngészése"
+  },
+  "app.instance.worlds.delete-world-description": {
+    "message": "'{name}' **véglegesen törlődik**, és azt semmilyen módon nem lehet majd helyreállítani."
+  },
+  "app.instance.worlds.delete-world-title": {
+    "message": "Biztosan véglegesen törölni szeretnéd ezt a világot?"
+  },
+  "app.instance.worlds.filter-modded": {
+    "message": "Modolt"
+  },
+  "app.instance.worlds.filter-offline": {
+    "message": "Offline"
+  },
+  "app.instance.worlds.filter-online": {
+    "message": "Online"
+  },
+  "app.instance.worlds.filter-vanilla": {
+    "message": "Vanilla"
+  },
+  "app.instance.worlds.no-worlds-description": {
+    "message": "Kezdéshez adj hozzá egy szervert, vagy böngéssz"
+  },
+  "app.instance.worlds.no-worlds-heading": {
+    "message": "Nincs szerver vagy világ"
+  },
+  "app.instance.worlds.remove-server-title": {
+    "message": "Biztosan el akarod távolítani ezt: {name}?"
+  },
+  "app.instance.worlds.search-worlds-placeholder": {
+    "message": "Keresés {count} világ között..."
+  },
+  "app.instance.worlds.this-server": {
+    "message": "ez a szerver"
  },
  "app.modal.install-to-play.content-required": {
    "message": "Szükséges tartalom"
@@ -102,7 +153,7 @@
    "message": "Telepítés"
  },
  "app.modal.install-to-play.mod-count": {
-    "message": "{count, plural,one {# mod}other {# modok}}"
+    "message": "{count} mod"
  },
  "app.modal.install-to-play.required-modpack": {
    "message": "Szükséges modcsomag"
@@ -140,9 +191,6 @@
  "app.settings.tabs.default-instance-options": {
    "message": "Alapértelmezett profil beállítások"
  },
-  "app.settings.tabs.feature-flags": {
-    "message": "Funkciójelzők"
-  },
  "app.settings.tabs.java-installations": {
    "message": "Telepített Java példányok"
  },
@@ -197,6 +245,24 @@
  "app.update.reload-to-update": {
    "message": "A telepítéshez újraindítás szükséges"
  },
+  "app.world.server-modal.placeholder-address": {
+    "message": "example.modrinth.gg"
+  },
+  "app.world.server-modal.select-an-option": {
+    "message": "Válassz egy lehetőséget"
+  },
+  "app.world.world-item.incompatible-version": {
+    "message": "Inkompatibilis verzió: {version}"
+  },
+  "app.world.world-item.not-played-yet": {
+    "message": "Még nem játszottál"
+  },
+  "app.world.world-item.offline": {
+    "message": "Offline"
+  },
+  "app.world.world-item.players-online": {
+    "message": "{count} online"
+  },
  "friends.action.add-friend": {
    "message": "Barát hozzáadása"
  },
@@ -296,6 +362,12 @@
  "instance.edit-world.title": {
    "message": "Világ szerkesztése"
  },
+  "instance.files.adding-files": {
+    "message": "Fájlok hozzáadása ({completed}/{total})"
+  },
+  "instance.files.save-as": {
+    "message": "Mentés másként..."
+  },
  "instance.server-modal.address": {
    "message": "Cím"
  },
@@ -467,9 +539,6 @@
  "instance.worlds.dont_show_on_home": {
    "message": "Ne mutasd a kezdőlapon"
  },
-  "instance.worlds.filter.available": {
-    "message": "Elérhető"
-  },
  "instance.worlds.game_already_open": {
    "message": "A profil már meg van nyitva"
  },
@@ -494,12 +563,6 @@
  "instance.worlds.play_instance": {
    "message": "Játék a profillal"
  },
-  "instance.worlds.type.server": {
-    "message": "Szerver"
-  },
-  "instance.worlds.type.singleplayer": {
-    "message": "Egyjátékos"
-  },
  "instance.worlds.view_instance": {
    "message": "Profil megtekintése"
  },
@@ -513,13 +576,13 @@
    "message": "A játékverzió a profil által van megadva"
  },
  "search.filter.locked.instance-loader.title": {
-    "message": "A modbetöltő a profil által van megadva"
+    "message": "A betöltő a profil által van megadva"
  },
  "search.filter.locked.instance.sync": {
    "message": "Profil szinkronizálása"
  },
  "search.filter.locked.server": {
-    "message": "A szerver biztosítja"
+    "message": "A szerver által van megadva"
  },
  "search.filter.locked.server-environment.title": {
    "message": "Csak kliensoldali modok adhatók hozzá a szerverprofilhoz"
@@ -528,6 +591,6 @@
    "message": "A játékverziót a szerver biztosítja"
  },
  "search.filter.locked.server-loader.title": {
-    "message": "A betöltőt a szerver biztosítja"
+    "message": "A betöltő a szerver által van megadva"
  }
 }
@@ -41,33 +41,12 @@
  "app.instance.confirm-delete.header": {
    "message": "Hapus instans"
  },
-  "app.instance.modpack-already-installed.admonition-body": {
-    "message": "Paket mod ini telah terpasang pada instans \"{instanceName}\"."
-  },
-  "app.instance.modpack-already-installed.admonition-header": {
-    "message": "Gandakan paket mod"
-  },
-  "app.instance.modpack-already-installed.create-anyway": {
-    "message": "Tetap buat"
-  },
-  "app.instance.modpack-already-installed.go-to-instance": {
-    "message": "Pergi ke instans"
-  },
  "app.instance.modpack-already-installed.header": {
    "message": "Paket mod telah terpasang"
  },
  "app.instance.mods.content-type-project": {
    "message": "proyek"
  },
-  "app.instance.mods.copy-link": {
-    "message": "Salin tautan"
-  },
-  "app.instance.mods.installing": {
-    "message": "Memasang..."
-  },
-  "app.instance.mods.modpack-fallback": {
-    "message": "Paket Mod"
-  },
  "app.instance.mods.project-was-added": {
    "message": "\"{name}\" telah ditambahkan"
  },
@@ -80,18 +59,9 @@
  "app.instance.mods.share-title": {
    "message": "Membagi konten paket mod"
  },
-  "app.instance.mods.show-file": {
-    "message": "Tampilkan berkas"
-  },
  "app.instance.mods.successfully-uploaded": {
    "message": "Berhasil diunggah"
  },
-  "app.instance.mods.unknown-version": {
-    "message": "Tidak diketahui"
-  },
-  "app.instance.mods.updating": {
-    "message": "Memperbarui..."
-  },
  "app.modal.install-to-play.content-required": {
    "message": "Konten diperlukan"
  },
@@ -140,9 +110,6 @@
  "app.settings.tabs.default-instance-options": {
    "message": "Pilihan instans bawaan"
  },
-  "app.settings.tabs.feature-flags": {
-    "message": "Bendera fitur"
-  },
  "app.settings.tabs.java-installations": {
    "message": "Pemasangan Java"
  },
@@ -467,9 +434,6 @@
  "instance.worlds.dont_show_on_home": {
    "message": "Jangan tampilkan di Beranda"
  },
-  "instance.worlds.filter.available": {
-    "message": "Tersedia"
-  },
  "instance.worlds.game_already_open": {
    "message": "Instans telah dibuka"
  },
@@ -494,12 +458,6 @@
  "instance.worlds.play_instance": {
    "message": "Mainkan instans"
  },
-  "instance.worlds.type.server": {
-    "message": "Server"
-  },
-  "instance.worlds.type.singleplayer": {
-    "message": "Bermain sendiri"
-  },
  "instance.worlds.view_instance": {
    "message": "Lihat instans"
  },
@@ -5,6 +5,39 @@
  "app.auth-servers.unreachable.header": {
    "message": "Impossibile raggiungere i server di autenticazione"
  },
+  "app.browse.add-server-to-instance": {
+    "message": "Aggiungi server all'istanza"
+  },
+  "app.browse.add-servers-to-instance": {
+    "message": "Aggiungi server alla tua istanza"
+  },
+  "app.browse.add-to-instance": {
+    "message": "Aggiungi all'istanza"
+  },
+  "app.browse.add-to-instance-name": {
+    "message": "Aggiungi a {instanceName}"
+  },
+  "app.browse.added": {
+    "message": "Aggiunto"
+  },
+  "app.browse.already-added": {
+    "message": "Già aggiunto"
+  },
+  "app.browse.discover-content": {
+    "message": "Esplora contenuti"
+  },
+  "app.browse.discover-servers": {
+    "message": "Esplora i server"
+  },
+  "app.browse.hide-added-servers": {
+    "message": "Nascondi server aggiunti"
+  },
+  "app.browse.hide-installed-content": {
+    "message": "Nascondi contenuti installati"
+  },
+  "app.browse.install-content-to-instance": {
+    "message": "Installa nella istanza"
+  },
  "app.export-modal.description-placeholder": {
    "message": "Inserisci descrizione del pacchetto..."
  },
@@ -41,33 +74,21 @@
  "app.instance.confirm-delete.header": {
    "message": "Elimina istanza"
  },
-  "app.instance.modpack-already-installed.admonition-body": {
-    "message": "Questo pacchetto è già stato installato nell'istanza \"{instanceName}\"."
+  "app.instance.modpack-already-installed.body": {
+    "message": "Questo pacchetto di mod è già installato nell'istanza <bold>{instanceName}</bold>. Vuoi davvero duplicarlo?"
  },
-  "app.instance.modpack-already-installed.admonition-header": {
-    "message": "Pacchetto duplicato"
-  },
-  "app.instance.modpack-already-installed.create-anyway": {
-    "message": "Crea comunque"
-  },
-  "app.instance.modpack-already-installed.go-to-instance": {
-    "message": "Vai all'istanza"
+  "app.instance.modpack-already-installed.create": {
+    "message": "Crea"
  },
  "app.instance.modpack-already-installed.header": {
    "message": "Pacchetto già installato"
  },
+  "app.instance.modpack-already-installed.instance": {
+    "message": "Istanza"
+  },
  "app.instance.mods.content-type-project": {
    "message": "progetto"
  },
-  "app.instance.mods.copy-link": {
-    "message": "Copia link"
-  },
-  "app.instance.mods.installing": {
-    "message": "Installando..."
-  },
-  "app.instance.mods.modpack-fallback": {
-    "message": "Pacchetto di mod"
-  },
  "app.instance.mods.project-was-added": {
    "message": "\"{name}\" è stato aggiunto"
  },
@@ -80,17 +101,53 @@
  "app.instance.mods.share-title": {
    "message": "Condivisione del pacchetto"
  },
-  "app.instance.mods.show-file": {
-    "message": "Mostra file"
-  },
  "app.instance.mods.successfully-uploaded": {
    "message": "Caricato con successo"
  },
-  "app.instance.mods.unknown-version": {
-    "message": "Sconosciuta"
+  "app.instance.worlds.add-server": {
+    "message": "Aggiungi server"
  },
-  "app.instance.mods.updating": {
-    "message": "Aggiornando..."
+  "app.instance.worlds.browse-servers": {
+    "message": "Esplora i server"
+  },
+  "app.instance.worlds.delete-world-description": {
+    "message": "\"{name}\" verrà eliminato permanentemente e non ci sarà modo di recuperarlo."
+  },
+  "app.instance.worlds.delete-world-title": {
+    "message": "Vuoi davvero eliminare permanentemente questo mondo?"
+  },
+  "app.instance.worlds.filter-modded": {
+    "message": "Moddato"
+  },
+  "app.instance.worlds.filter-offline": {
+    "message": "Offline"
+  },
+  "app.instance.worlds.filter-online": {
+    "message": "Online"
+  },
+  "app.instance.worlds.filter-vanilla": {
+    "message": "Vanilla"
+  },
+  "app.instance.worlds.no-worlds-description": {
+    "message": "Inizia esplorando o aggiungendo un server"
+  },
+  "app.instance.worlds.no-worlds-heading": {
+    "message": "Nessun server o mondi aggiunti"
+  },
+  "app.instance.worlds.remove-server-description": {
+    "message": "\"{name}\" sarà rimosso dalla tua lista, inclusa quella in-gioco, e non ci sarà modo di recuperarlo."
+  },
+  "app.instance.worlds.remove-server-description-with-address": {
+    "message": "\"{name}\" ({address}) sarà rimosso dalla tua lista, inclusa quella in-gioco, e non ci sarà modo di recuperarlo."
+  },
+  "app.instance.worlds.remove-server-title": {
+    "message": "Vuoi davvero rimuovere {name}?"
+  },
+  "app.instance.worlds.search-worlds-placeholder": {
+    "message": "Cerca tra {count} mondi..."
+  },
+  "app.instance.worlds.this-server": {
+    "message": "questo server"
  },
  "app.modal.install-to-play.content-required": {
    "message": "Contenuto richiesto"
@@ -140,9 +197,6 @@
  "app.settings.tabs.default-instance-options": {
    "message": "Opzioni d'istanza predefinite"
  },
-  "app.settings.tabs.feature-flags": {
-    "message": "Flag di funzionalità"
-  },
  "app.settings.tabs.java-installations": {
    "message": "Installazioni Java"
  },
@@ -197,6 +251,24 @@
  "app.update.reload-to-update": {
    "message": "Ricarica per installare l'aggiornamento"
  },
+  "app.world.server-modal.placeholder-address": {
+    "message": "example.modrinth.gg"
+  },
+  "app.world.server-modal.select-an-option": {
+    "message": "Seleziona un'opzione"
+  },
+  "app.world.world-item.incompatible-version": {
+    "message": "Versione {version} incompatibile"
+  },
+  "app.world.world-item.not-played-yet": {
+    "message": "Mai avviato"
+  },
+  "app.world.world-item.offline": {
+    "message": "Offline"
+  },
+  "app.world.world-item.players-online": {
+    "message": "{count} online"
+  },
  "friends.action.add-friend": {
    "message": "Stringi un'amicizia"
  },
@@ -296,6 +368,12 @@
  "instance.edit-world.title": {
    "message": "Modifica mondo"
  },
+  "instance.files.adding-files": {
+    "message": "Aggiungendo i file ({completed}/{total})..."
+  },
+  "instance.files.save-as": {
+    "message": "Salva come..."
+  },
  "instance.server-modal.address": {
    "message": "Indirizzo"
  },
@@ -467,9 +545,6 @@
  "instance.worlds.dont_show_on_home": {
    "message": "Non mostrare nella home"
  },
-  "instance.worlds.filter.available": {
-    "message": "Disponibile"
-  },
  "instance.worlds.game_already_open": {
    "message": "Istanza già aperta"
  },
@@ -494,12 +569,6 @@
  "instance.worlds.play_instance": {
    "message": "Avvia istanza"
  },
-  "instance.worlds.type.server": {
-    "message": "Server"
-  },
-  "instance.worlds.type.singleplayer": {
-    "message": "Giocatore singolo"
-  },
  "instance.worlds.view_instance": {
    "message": "Mostra istanza"
  },
@@ -5,6 +5,39 @@
  "app.auth-servers.unreachable.header": {
    "message": "認証サーバーにアクセスできません"
  },
+  "app.browse.add-server-to-instance": {
+    "message": "サーバーをインスタンスに追加"
+  },
+  "app.browse.add-servers-to-instance": {
+    "message": "サーバーを自身のインスタンスに追加"
+  },
+  "app.browse.add-to-instance": {
+    "message": "インスタンスに追加"
+  },
+  "app.browse.add-to-instance-name": {
+    "message": "{instanceName} に追加"
+  },
+  "app.browse.added": {
+    "message": "追加済み"
+  },
+  "app.browse.already-added": {
+    "message": "すでに追加済み"
+  },
+  "app.browse.discover-content": {
+    "message": "コンテンツを探す"
+  },
+  "app.browse.discover-servers": {
+    "message": "サーバーを探す"
+  },
+  "app.browse.hide-added-servers": {
+    "message": "追加済みのサーバーを隠す"
+  },
+  "app.browse.hide-installed-content": {
+    "message": "インストール済みのコンテンツを隠す"
+  },
+  "app.browse.install-content-to-instance": {
+    "message": "コンテンツをインスタンスにインストールする"
+  },
  "app.export-modal.description-placeholder": {
    "message": "Modパックの説明を入力…"
  },
@@ -41,33 +74,21 @@
  "app.instance.confirm-delete.header": {
    "message": "インスタンスを削除"
  },
-  "app.instance.modpack-already-installed.admonition-body": {
-    "message": "このModパックは「{instanceName}」インスタンスにすでにインストールされています。"
+  "app.instance.modpack-already-installed.body": {
+    "message": "このModpackは既に <bold>{instanceName}</bold> インスタンスにインストール済みです。本当に複製しますか？"
  },
-  "app.instance.modpack-already-installed.admonition-header": {
-    "message": "重複したModパック"
-  },
-  "app.instance.modpack-already-installed.create-anyway": {
-    "message": "とにかく作成する"
-  },
-  "app.instance.modpack-already-installed.go-to-instance": {
-    "message": "インスタンスに移動"
+  "app.instance.modpack-already-installed.create": {
+    "message": "新規作成"
  },
  "app.instance.modpack-already-installed.header": {
    "message": "Modパックはすでにインストール済み"
  },
+  "app.instance.modpack-already-installed.instance": {
+    "message": "インスタンス"
+  },
  "app.instance.mods.content-type-project": {
    "message": "プロジェクト"
  },
-  "app.instance.mods.copy-link": {
-    "message": "リンクをコピー"
-  },
-  "app.instance.mods.installing": {
-    "message": "インストール中…"
-  },
-  "app.instance.mods.modpack-fallback": {
-    "message": "Modパック"
-  },
  "app.instance.mods.project-was-added": {
    "message": "「{name}」が追加されました"
  },
@@ -80,17 +101,53 @@
  "app.instance.mods.share-title": {
    "message": "Modパックのコンテンツを共有"
  },
-  "app.instance.mods.show-file": {
-    "message": "ファイルを表示"
-  },
  "app.instance.mods.successfully-uploaded": {
    "message": "アップロードに成功しました"
  },
-  "app.instance.mods.unknown-version": {
-    "message": "不明"
+  "app.instance.worlds.add-server": {
+    "message": "サーバーを追加"
  },
-  "app.instance.mods.updating": {
-    "message": "アップデート中…"
+  "app.instance.worlds.browse-servers": {
+    "message": "サーバーを探す"
+  },
+  "app.instance.worlds.delete-world-description": {
+    "message": "'{name}' は **完全に削除**され、元に戻すことはできません。"
+  },
+  "app.instance.worlds.delete-world-title": {
+    "message": "本当にこのワールドを完全に削除しますか？"
+  },
+  "app.instance.worlds.filter-modded": {
+    "message": "Mod導入済み"
+  },
+  "app.instance.worlds.filter-offline": {
+    "message": "オフライン"
+  },
+  "app.instance.worlds.filter-online": {
+    "message": "オンライン"
+  },
+  "app.instance.worlds.filter-vanilla": {
+    "message": "バニラ(Mod非導入)"
+  },
+  "app.instance.worlds.no-worlds-description": {
+    "message": "サーバーを追加、またはブラウズして始める"
+  },
+  "app.instance.worlds.no-worlds-heading": {
+    "message": "サーバー、ワールドは追加されていません"
+  },
+  "app.instance.worlds.remove-server-description": {
+    "message": "'{name}' はゲーム内を含むサーバーリストから削除され、元に戻すことはできません。"
+  },
+  "app.instance.worlds.remove-server-description-with-address": {
+    "message": "'{name}' ({address}) はゲーム内を含むサーバーリストから削除され、元に戻すことはできません。"
+  },
+  "app.instance.worlds.remove-server-title": {
+    "message": "本当に {name} を削除しますか？"
+  },
+  "app.instance.worlds.search-worlds-placeholder": {
+    "message": "{count} 個のワールドを検索..."
+  },
+  "app.instance.worlds.this-server": {
+    "message": "このサーバー"
  },
  "app.modal.install-to-play.content-required": {
    "message": "必須コンテンツ"
@@ -140,9 +197,6 @@
  "app.settings.tabs.default-instance-options": {
    "message": "インスタンスの基本設定"
  },
-  "app.settings.tabs.feature-flags": {
-    "message": "機能設定"
-  },
  "app.settings.tabs.java-installations": {
    "message": "Javaのインストール設定"
  },
@@ -197,6 +251,24 @@
  "app.update.reload-to-update": {
    "message": "再起動して今すぐ更新"
  },
+  "app.world.server-modal.placeholder-address": {
+    "message": "example.modrinth.gg"
+  },
+  "app.world.server-modal.select-an-option": {
+    "message": "オプションを選択"
+  },
+  "app.world.world-item.incompatible-version": {
+    "message": "互換性の無いバージョン {version}"
+  },
+  "app.world.world-item.not-played-yet": {
+    "message": "未プレイ"
+  },
+  "app.world.world-item.offline": {
+    "message": "オフライン"
+  },
+  "app.world.world-item.players-online": {
+    "message": "{count} 人がオンライン"
+  },
  "friends.action.add-friend": {
    "message": "フレンドを追加"
  },
@@ -210,10 +282,10 @@
    "message": "フレンドを追加中"
  },
  "friends.add-friend.username.description": {
-    "message": "これはMinecraftユーザーネームと違う可能性があります！"
+    "message": "これはMinecraftユーザー名とは異なる可能性があります！"
  },
  "friends.add-friend.username.placeholder": {
-    "message": "Modrinthユーザーネームを入力..."
+    "message": "Modrinthユーザー名を入力…"
  },
  "friends.add-friend.username.title": {
    "message": "あなたのフレンドのModrinthユーザー名は何ですか？"
@@ -296,6 +368,12 @@
  "instance.edit-world.title": {
    "message": "ワールドを編集"
  },
+  "instance.files.adding-files": {
+    "message": "ファイルを追加中 ({completed}/{total})"
+  },
+  "instance.files.save-as": {
+    "message": "名前をつけて保存..."
+  },
  "instance.server-modal.address": {
    "message": "アドレス"
  },
@@ -467,9 +545,6 @@
  "instance.worlds.dont_show_on_home": {
    "message": "ホームに表示しない"
  },
-  "instance.worlds.filter.available": {
-    "message": "利用可能"
-  },
  "instance.worlds.game_already_open": {
    "message": "インスタンスは既に開いています"
  },
@@ -494,12 +569,6 @@
  "instance.worlds.play_instance": {
    "message": "インスタンスを起動"
  },
-  "instance.worlds.type.server": {
-    "message": "サーバー"
-  },
-  "instance.worlds.type.singleplayer": {
-    "message": "シングルプレイ"
-  },
  "instance.worlds.view_instance": {
    "message": "インスタンスを表示する"
  },
@@ -5,8 +5,149 @@
  "app.auth-servers.unreachable.header": {
    "message": "인증 서버에 연결할 수 없습니다"
  },
-  "app.instance.mods.updating": {
-    "message": "업데이트 중..."
+  "app.browse.add-server-to-instance": {
+    "message": "인스턴스에 서버 추가"
+  },
+  "app.browse.add-servers-to-instance": {
+    "message": "인스턴스에 서버 추가"
+  },
+  "app.browse.add-to-instance": {
+    "message": "인스턴스에 추가"
+  },
+  "app.browse.add-to-instance-name": {
+    "message": "{instanceName}에 추가"
+  },
+  "app.browse.added": {
+    "message": "추가됨"
+  },
+  "app.browse.already-added": {
+    "message": "이미 추가됨"
+  },
+  "app.browse.discover-content": {
+    "message": "콘텐츠 탐색하기"
+  },
+  "app.browse.discover-servers": {
+    "message": "서버 탐색하기"
+  },
+  "app.browse.hide-added-servers": {
+    "message": "추가된 서버 숨기기"
+  },
+  "app.browse.hide-installed-content": {
+    "message": "설치된 콘텐츠 숨기기"
+  },
+  "app.browse.install-content-to-instance": {
+    "message": "인스턴스에 콘텐츠 설치"
+  },
+  "app.export-modal.description-placeholder": {
+    "message": "모드팩 설명 입력..."
+  },
+  "app.export-modal.export-button": {
+    "message": "내보내기"
+  },
+  "app.export-modal.header": {
+    "message": "모드팩 내보내기"
+  },
+  "app.export-modal.modpack-name-label": {
+    "message": "모드팩 이름"
+  },
+  "app.export-modal.modpack-name-placeholder": {
+    "message": "모드팩 이름"
+  },
+  "app.export-modal.select-files-label": {
+    "message": "팩에 포함할 파일과 폴더 선택"
+  },
+  "app.export-modal.version-number-label": {
+    "message": "버전 구분"
+  },
+  "app.export-modal.version-number-placeholder": {
+    "message": "1.0.0"
+  },
+  "app.instance.confirm-delete.admonition-body": {
+    "message": "인스턴스의 모든 데이터가 삭제됩니다. 세계 폴더, 설정 폴더 등 설치된 모든 컨텐츠가 포함됩니다."
+  },
+  "app.instance.confirm-delete.admonition-header": {
+    "message": "이 작업은 되돌릴 수 없습니다"
+  },
+  "app.instance.confirm-delete.delete-button": {
+    "message": "인스턴스 삭제"
+  },
+  "app.instance.confirm-delete.header": {
+    "message": "인스턴스 삭제"
+  },
+  "app.instance.modpack-already-installed.body": {
+    "message": "이 모드팩은 이미 <bold>{instanceName}</bold> 인스턴스에 설치되어 있습니다. 정말로 복제하시겠습니까?"
+  },
+  "app.instance.modpack-already-installed.create": {
+    "message": "생성"
+  },
+  "app.instance.modpack-already-installed.header": {
+    "message": "모드팩 이미 설치됨"
+  },
+  "app.instance.modpack-already-installed.instance": {
+    "message": "인스턴스"
+  },
+  "app.instance.mods.content-type-project": {
+    "message": "프로젝트"
+  },
+  "app.instance.mods.project-was-added": {
+    "message": "\"{name}\" 추가됨"
+  },
+  "app.instance.mods.projects-were-added": {
+    "message": "프로젝트 {count}개 추가됨"
+  },
+  "app.instance.mods.share-text": {
+    "message": "제 모드팩에 사용중인 프로젝트를 확인해 보세요!"
+  },
+  "app.instance.mods.share-title": {
+    "message": "모드팩 콘텐츠 공유"
+  },
+  "app.instance.mods.successfully-uploaded": {
+    "message": "업로드 성공"
+  },
+  "app.instance.worlds.add-server": {
+    "message": "서버 추가"
+  },
+  "app.instance.worlds.browse-servers": {
+    "message": "서버 탐색하기"
+  },
+  "app.instance.worlds.delete-world-description": {
+    "message": "'{name}'이(가) **영구적으로 삭제**되며, 복구할 수 없습니다."
+  },
+  "app.instance.worlds.delete-world-title": {
+    "message": "정말로 이 세계를 영구적으로 삭제하시겠습니까?"
+  },
+  "app.instance.worlds.filter-modded": {
+    "message": "수정됨"
+  },
+  "app.instance.worlds.filter-offline": {
+    "message": "오프라인"
+  },
+  "app.instance.worlds.filter-online": {
+    "message": "온라인"
+  },
+  "app.instance.worlds.filter-vanilla": {
+    "message": "바닐라"
+  },
+  "app.instance.worlds.no-worlds-description": {
+    "message": "서버를 추가하거나 탐색하여 시작"
+  },
+  "app.instance.worlds.no-worlds-heading": {
+    "message": "추가된 서버 또는 세계 없음"
+  },
+  "app.instance.worlds.remove-server-description": {
+    "message": "'{name}'이(가) 게임 내를 포함한 모든 목록에서 삭제되며, 복구할 수 없습니다."
+  },
+  "app.instance.worlds.remove-server-description-with-address": {
+    "message": "'{name}' ({address})이(가) 게임 내를 포함한 모든 목록에서 삭제되며, 복구할 수 없습니다."
+  },
+  "app.instance.worlds.remove-server-title": {
+    "message": "정말로 {name}을(를) 제거하시겠습니까?"
+  },
+  "app.instance.worlds.search-worlds-placeholder": {
+    "message": "{count}개의 세계 검색..."
+  },
+  "app.instance.worlds.this-server": {
+    "message": "이 서버"
  },
  "app.modal.install-to-play.content-required": {
    "message": "콘텐츠 설치 필요"
@@ -56,9 +197,6 @@
  "app.settings.tabs.default-instance-options": {
    "message": "기본 인스턴스 옵션"
  },
-  "app.settings.tabs.feature-flags": {
-    "message": "기능 플래그"
-  },
  "app.settings.tabs.java-installations": {
    "message": "Java 설치"
  },
@@ -78,7 +216,7 @@
    "message": "Modrinth App v{version} 다운로드가 완료되었습니다. 새로고침하거나 Modrinth App을 종료하면 자동으로 업데이트됩니다."
  },
  "app.update-popup.body.linux": {
-    "message": "Modrinth App v{version} 버전을 사용할 수 있습니다. 최신 기능과 오류 수정을 적용하려면 패키지 관리자를 통해 업데이트하세요!"
+    "message": "Modrinth App v{version}을 사용할 수 있습니다. 최신 기능과 오류 수정을 적용하려면 패키지 관리자를 통해 업데이트하세요!"
  },
  "app.update-popup.body.metered": {
    "message": "Modrinth App v{version}을 지금 사용할 수 있습니다! 데이터 통신 연결을 사용 중이므로, 자동으로 다운로드하지 않았습니다."
@@ -87,7 +225,7 @@
    "message": "변경 내역"
  },
  "app.update-popup.download": {
-    "message": "({size}) 다운로드"
+    "message": "다운로드 ({size})"
  },
  "app.update-popup.download-complete": {
    "message": "다운로드 완료"
@@ -113,6 +251,24 @@
  "app.update.reload-to-update": {
    "message": "새로고침하여 업데이트 설치"
  },
+  "app.world.server-modal.placeholder-address": {
+    "message": "example.modrinth.gg"
+  },
+  "app.world.server-modal.select-an-option": {
+    "message": "옵션 선택"
+  },
+  "app.world.world-item.incompatible-version": {
+    "message": "{version} 버전에 호환되지 않음"
+  },
+  "app.world.world-item.not-played-yet": {
+    "message": "플레이 안 함"
+  },
+  "app.world.world-item.offline": {
+    "message": "오프라인"
+  },
+  "app.world.world-item.players-online": {
+    "message": "{count}명 온라인"
+  },
  "friends.action.add-friend": {
    "message": "친구 추가"
  },
@@ -165,7 +321,7 @@
    "message": "대기 중"
  },
  "friends.no-friends-match": {
-    "message": "\"{query}\" 이름과 일치하는 친구 없음"
+    "message": "\"{query}\"과(와) 일치하는 친구 없음"
  },
  "friends.search-friends-placeholder": {
    "message": "친구 검색 중..."
@@ -212,6 +368,12 @@
  "instance.edit-world.title": {
    "message": "세계 편집"
  },
+  "instance.files.adding-files": {
+    "message": "파일 추가 중 ({completed}/{total})"
+  },
+  "instance.files.save-as": {
+    "message": "다른 이름으로 저장..."
+  },
  "instance.server-modal.address": {
    "message": "주소"
  },
@@ -258,7 +420,7 @@
    "message": "아이콘 제거"
  },
  "instance.settings.tabs.general.edit-icon.replace": {
-    "message": "아이콘 대체"
+    "message": "아이콘 교체"
  },
  "instance.settings.tabs.general.edit-icon.select": {
    "message": "아이콘 선택"
@@ -383,9 +545,6 @@
  "instance.worlds.dont_show_on_home": {
    "message": "홈에서 숨기기"
  },
-  "instance.worlds.filter.available": {
-    "message": "이용 가능"
-  },
  "instance.worlds.game_already_open": {
    "message": "이미 실행된 인스턴스"
  },
@@ -410,12 +569,6 @@
  "instance.worlds.play_instance": {
    "message": "인스턴스 플레이"
  },
-  "instance.worlds.type.server": {
-    "message": "서버"
-  },
-  "instance.worlds.type.singleplayer": {
-    "message": "싱글 플레이"
-  },
  "instance.worlds.view_instance": {
    "message": "인스턴스 보기"
  },
@@ -5,6 +5,39 @@
  "app.auth-servers.unreachable.header": {
    "message": "Tidak dapat mencapai pelayan pengesahan"
  },
+  "app.browse.add-server-to-instance": {
+    "message": "Tambahkan pelayan ke dalam pemasangan"
+  },
+  "app.browse.add-servers-to-instance": {
+    "message": "Tambahkan pelayan ke dalam pemasangan anda"
+  },
+  "app.browse.add-to-instance": {
+    "message": "Tambahkan ke dalam pemasangan"
+  },
+  "app.browse.add-to-instance-name": {
+    "message": "Tambahkan ke {instanceName}"
+  },
+  "app.browse.added": {
+    "message": "Ditambah"
+  },
+  "app.browse.already-added": {
+    "message": "Sudah ditambah"
+  },
+  "app.browse.discover-content": {
+    "message": "Temui kandungan"
+  },
+  "app.browse.discover-servers": {
+    "message": "Temui pelayan"
+  },
+  "app.browse.hide-added-servers": {
+    "message": "Sembunyikan pelayan yang ditambah"
+  },
+  "app.browse.hide-installed-content": {
+    "message": "Sembunyikan kandungan yang dipasang"
+  },
+  "app.browse.install-content-to-instance": {
+    "message": "Pasang kandungan ke dalam pemasangan"
+  },
  "app.export-modal.description-placeholder": {
    "message": "Masukkan keterangan pek mod..."
  },
@@ -41,27 +74,21 @@
  "app.instance.confirm-delete.header": {
    "message": "Padam pemasangan"
  },
-  "app.instance.modpack-already-installed.admonition-body": {
-    "message": "Pek mod ini sudah pun dipasang di dalam pemasangan \"{instanceName}\"."
+  "app.instance.modpack-already-installed.body": {
+    "message": "Pek mod ini telah dipasang dalam pemasangan <bold>{instanceName}</bold>. Adakah anda pasti mahu menduakannya?"
  },
-  "app.instance.modpack-already-installed.go-to-instance": {
-    "message": "Pergi ke pemasangan"
+  "app.instance.modpack-already-installed.create": {
+    "message": "Cipta"
  },
  "app.instance.modpack-already-installed.header": {
    "message": "Pek mod sudah dipasang"
  },
+  "app.instance.modpack-already-installed.instance": {
+    "message": "Pemasangan"
+  },
  "app.instance.mods.content-type-project": {
    "message": "projek"
  },
-  "app.instance.mods.copy-link": {
-    "message": "Salin pautan"
-  },
-  "app.instance.mods.installing": {
-    "message": "Sedang memasang..."
-  },
-  "app.instance.mods.modpack-fallback": {
-    "message": "Pek Mod"
-  },
  "app.instance.mods.project-was-added": {
    "message": "\"{name}\" telah ditambahkan"
  },
@@ -74,17 +101,53 @@
  "app.instance.mods.share-title": {
    "message": "Berkongsi kandungan pek mod"
  },
-  "app.instance.mods.show-file": {
-    "message": "Tunjukkan fail"
-  },
  "app.instance.mods.successfully-uploaded": {
    "message": "Berjaya dimuat naik"
  },
-  "app.instance.mods.unknown-version": {
-    "message": "Tidak Diketahui"
+  "app.instance.worlds.add-server": {
+    "message": "Tambah pelayan"
  },
-  "app.instance.mods.updating": {
-    "message": "Sedang mengemas kini..."
+  "app.instance.worlds.browse-servers": {
+    "message": "Layari pelayan"
+  },
+  "app.instance.worlds.delete-world-description": {
+    "message": "'{name}' akan **dipadamkan secara kekal**, dan tiada cara untuk memulihkannya."
+  },
+  "app.instance.worlds.delete-world-title": {
+    "message": "Adakah anda pasti mahu memadamkan dunia ini secara kekal?"
+  },
+  "app.instance.worlds.filter-modded": {
+    "message": "Diubah Suai"
+  },
+  "app.instance.worlds.filter-offline": {
+    "message": "Luar Talian"
+  },
+  "app.instance.worlds.filter-online": {
+    "message": "Dalam Talian"
+  },
+  "app.instance.worlds.filter-vanilla": {
+    "message": "Vanila"
+  },
+  "app.instance.worlds.no-worlds-description": {
+    "message": "Tambah sebuah pelayan atau layari untuk bermula"
+  },
+  "app.instance.worlds.no-worlds-heading": {
+    "message": "Tiada pelayan atau dunia ditambah"
+  },
+  "app.instance.worlds.remove-server-description": {
+    "message": "'{name}' akan dialih keluar daripada senarai anda, termasuk dalam permainan, dan tiada cara untuk memulihkannya."
+  },
+  "app.instance.worlds.remove-server-description-with-address": {
+    "message": "'{name}' ({address}) akan dialih keluar daripada senarai anda, termasuk dalam permainan, dan tiada cara untuk memulihkannya."
+  },
+  "app.instance.worlds.remove-server-title": {
+    "message": "Adakah anda pasti mahu mengalih keluar {name}?"
+  },
+  "app.instance.worlds.search-worlds-placeholder": {
+    "message": "Cari {count} dunia..."
+  },
+  "app.instance.worlds.this-server": {
+    "message": "pelayan ini"
  },
  "app.modal.install-to-play.content-required": {
    "message": "Kandungan yang diperlukan"
@@ -134,9 +197,6 @@
  "app.settings.tabs.default-instance-options": {
    "message": "Tetapan lalai pemasangan"
  },
-  "app.settings.tabs.feature-flags": {
-    "message": "Penetapan ciri"
-  },
  "app.settings.tabs.java-installations": {
    "message": "Pemasangan Java"
  },
@@ -191,6 +251,24 @@
  "app.update.reload-to-update": {
    "message": "Muat semula untuk memasang kemas kini"
  },
+  "app.world.server-modal.placeholder-address": {
+    "message": "example.modrinth.gg"
+  },
+  "app.world.server-modal.select-an-option": {
+    "message": "Pilih pilihan anda"
+  },
+  "app.world.world-item.incompatible-version": {
+    "message": "Versi tidak serasi: {version}"
+  },
+  "app.world.world-item.not-played-yet": {
+    "message": "Belum dimainkan"
+  },
+  "app.world.world-item.offline": {
+    "message": "Luar Talian"
+  },
+  "app.world.world-item.players-online": {
+    "message": "{count} dalam talian"
+  },
  "friends.action.add-friend": {
    "message": "Tambah rakan"
  },
@@ -290,6 +368,12 @@
  "instance.edit-world.title": {
    "message": "Sunting dunia"
  },
+  "instance.files.adding-files": {
+    "message": "Sedang menambah fail ({completed}/{total})"
+  },
+  "instance.files.save-as": {
+    "message": "Simpan sebagai..."
+  },
  "instance.server-modal.address": {
    "message": "Alamat"
  },
@@ -461,9 +545,6 @@
  "instance.worlds.dont_show_on_home": {
    "message": "Jangan tunjukkan pada Laman Utama"
  },
-  "instance.worlds.filter.available": {
-    "message": "Tersedia"
-  },
  "instance.worlds.game_already_open": {
    "message": "Pemasangan sudah pun dibuka"
  },
@@ -488,12 +569,6 @@
  "instance.worlds.play_instance": {
    "message": "Mainkan pemasangan"
  },
-  "instance.worlds.type.server": {
-    "message": "Pelayan"
-  },
-  "instance.worlds.type.singleplayer": {
-    "message": "Ekapemain"
-  },
  "instance.worlds.view_instance": {
    "message": "Lihat pemasangan"
  },
@@ -41,33 +41,12 @@
  "app.instance.confirm-delete.header": {
    "message": "Verwijder instantie"
  },
-  "app.instance.modpack-already-installed.admonition-body": {
-    "message": "Deze modpack is al geïnstalleerd in de \"{instanceName}\" instantie."
-  },
-  "app.instance.modpack-already-installed.admonition-header": {
-    "message": "Dupliceer modpack"
-  },
-  "app.instance.modpack-already-installed.create-anyway": {
-    "message": "Maak toch"
-  },
-  "app.instance.modpack-already-installed.go-to-instance": {
-    "message": "Ga naar instantie"
-  },
  "app.instance.modpack-already-installed.header": {
    "message": "Modpack is al geïnstalleerd"
  },
  "app.instance.mods.content-type-project": {
    "message": "project"
  },
-  "app.instance.mods.copy-link": {
-    "message": "Kopieer link"
-  },
-  "app.instance.mods.installing": {
-    "message": "Aan het installeren..."
-  },
-  "app.instance.mods.modpack-fallback": {
-    "message": "Modpack"
-  },
  "app.instance.mods.project-was-added": {
    "message": "\"{name}\" was toegevoegd"
  },
@@ -80,18 +59,9 @@
  "app.instance.mods.share-title": {
    "message": "Modpack-inhoud delen"
  },
-  "app.instance.mods.show-file": {
-    "message": "Bestand weergeven"
-  },
  "app.instance.mods.successfully-uploaded": {
    "message": "Succesvol geüpload"
  },
-  "app.instance.mods.unknown-version": {
-    "message": "Onbekend"
-  },
-  "app.instance.mods.updating": {
-    "message": "Aan het updaten..."
-  },
  "app.modal.install-to-play.content-required": {
    "message": "Content vereist"
  },
@@ -140,9 +110,6 @@
  "app.settings.tabs.default-instance-options": {
    "message": "Standaardopties voor instantie"
  },
-  "app.settings.tabs.feature-flags": {
-    "message": "Feature flags"
-  },
  "app.settings.tabs.java-installations": {
    "message": "Java installaties"
  },
@@ -467,9 +434,6 @@
  "instance.worlds.dont_show_on_home": {
    "message": "Niet tonen op de startpagina"
  },
-  "instance.worlds.filter.available": {
-    "message": "Beschikbaar"
-  },
  "instance.worlds.game_already_open": {
    "message": "Instantie is al open"
  },
@@ -494,12 +458,6 @@
  "instance.worlds.play_instance": {
    "message": "Speel instantie"
  },
-  "instance.worlds.type.server": {
-    "message": "Server"
-  },
-  "instance.worlds.type.singleplayer": {
-    "message": "Alleen spelen"
-  },
  "instance.worlds.view_instance": {
    "message": "Bekijk instantie"
  },
@@ -41,9 +41,6 @@
  "app.settings.tabs.default-instance-options": {
    "message": "Standard instansinstillinger"
  },
-  "app.settings.tabs.feature-flags": {
-    "message": "Funksjonsflagg"
-  },
  "app.settings.tabs.java-installations": {
    "message": "Java installasjoner"
  },
@@ -341,9 +338,6 @@
  "instance.worlds.dont_show_on_home": {
    "message": "Ikke vis på Hjem"
  },
-  "instance.worlds.filter.available": {
-    "message": "Tilgjengelig"
-  },
  "instance.worlds.game_already_open": {
    "message": "Instansen er allerede open"
  },
@@ -365,12 +359,6 @@
  "instance.worlds.play_instance": {
    "message": "Spill instans"
  },
-  "instance.worlds.type.server": {
-    "message": "Server"
-  },
-  "instance.worlds.type.singleplayer": {
-    "message": "Enkeltspillermodus"
-  },
  "instance.worlds.view_instance": {
    "message": "Vis instans"
  },
@@ -5,6 +5,42 @@
  "app.auth-servers.unreachable.header": {
    "message": "Nie udało się połączyć się z serwerami uwierzytelniania"
  },
+  "app.browse.add-server-to-instance": {
+    "message": "Dodaj serwer do instancji"
+  },
+  "app.browse.add-servers-to-instance": {
+    "message": "Dodaj serwery do swojej instancji"
+  },
+  "app.browse.add-to-instance": {
+    "message": "Dodaj do instancji"
+  },
+  "app.browse.add-to-instance-name": {
+    "message": "Dodaj do {instanceName}"
+  },
+  "app.browse.added": {
+    "message": "Dodano"
+  },
+  "app.browse.already-added": {
+    "message": "Już dodano"
+  },
+  "app.browse.discover-content": {
+    "message": "Odkrywaj zawartość"
+  },
+  "app.browse.discover-servers": {
+    "message": "Odkryj serwery"
+  },
+  "app.browse.hide-added-servers": {
+    "message": "Ukryj dodane serwery"
+  },
+  "app.browse.hide-installed-content": {
+    "message": "Ukryj zainstalowane zasoby"
+  },
+  "app.browse.install-content-to-instance": {
+    "message": "Zainstaluj zasoby do instancji"
+  },
+  "app.export-modal.description-placeholder": {
+    "message": "Wprowadź opis paczki modów..."
+  },
  "app.export-modal.export-button": {
    "message": "Eksportuj"
  },
@@ -38,45 +74,81 @@
  "app.instance.confirm-delete.header": {
    "message": "Usuń instancję"
  },
-  "app.instance.modpack-already-installed.admonition-body": {
-    "message": "Ta paczka modów jest już zainstalowana w instancji \"{instanceName}\"."
+  "app.instance.modpack-already-installed.body": {
+    "message": "Ta paczka modów jest już zainstalowana w instancji <bold>{instanceName}</bold>. Czy na pewno chcesz utworzyć duplikat?"
  },
-  "app.instance.modpack-already-installed.admonition-header": {
-    "message": "Duplikat paczki modów"
-  },
-  "app.instance.modpack-already-installed.create-anyway": {
-    "message": "Utwórz mimo to"
-  },
-  "app.instance.modpack-already-installed.go-to-instance": {
-    "message": "Przejdź do instancji"
+  "app.instance.modpack-already-installed.create": {
+    "message": "Utwórz"
  },
  "app.instance.modpack-already-installed.header": {
    "message": "Paczka modów jest już zainstalowana"
  },
+  "app.instance.modpack-already-installed.instance": {
+    "message": "Instalacja"
+  },
  "app.instance.mods.content-type-project": {
    "message": "projekt"
  },
-  "app.instance.mods.copy-link": {
-    "message": "Kopiuj łącze"
-  },
-  "app.instance.mods.installing": {
-    "message": "Instalowanie..."
-  },
-  "app.instance.mods.modpack-fallback": {
-    "message": "Paczka modów"
-  },
  "app.instance.mods.project-was-added": {
    "message": "Dodano \"{name}\""
  },
  "app.instance.mods.projects-were-added": {
    "message": "Dodano {count} {count, plural, one {projekt} few {projekty} other {projektów}}"
  },
-  "app.instance.mods.show-file": {
-    "message": "Pokaż plik"
+  "app.instance.mods.share-text": {
+    "message": "Sprawdź projekty, które używam w mojej paczce modów!"
+  },
+  "app.instance.mods.share-title": {
+    "message": "Udostępnianie zawartości paczki modów"
  },
  "app.instance.mods.successfully-uploaded": {
    "message": "Przesyłanie powiodło się"
  },
+  "app.instance.worlds.add-server": {
+    "message": "Dodaj serwer"
+  },
+  "app.instance.worlds.browse-servers": {
+    "message": "Szukaj serwerów"
+  },
+  "app.instance.worlds.delete-world-description": {
+    "message": "'{name}' zostanie **permanentnie usunięty**, i nie ma możliwości go odzyskać."
+  },
+  "app.instance.worlds.delete-world-title": {
+    "message": "Czy na pewno chcesz trwale usunąć ten świat?"
+  },
+  "app.instance.worlds.filter-modded": {
+    "message": "Zmodowany"
+  },
+  "app.instance.worlds.filter-offline": {
+    "message": "Offline"
+  },
+  "app.instance.worlds.filter-online": {
+    "message": "Online"
+  },
+  "app.instance.worlds.filter-vanilla": {
+    "message": "Vanilla"
+  },
+  "app.instance.worlds.no-worlds-description": {
+    "message": "Dodaj serwer lub szukaj, aby rozpocząć"
+  },
+  "app.instance.worlds.no-worlds-heading": {
+    "message": "Nie dodano żadnych światów ani serwerów"
+  },
+  "app.instance.worlds.remove-server-description": {
+    "message": "'{name}' zostanie usunięty z twojej listy, również z gry, i nie będzie możliwości go odzyskać."
+  },
+  "app.instance.worlds.remove-server-description-with-address": {
+    "message": "'{name}' ({address}) zostanie usunięty z twojej listy, również z gry, i nie będzie możliwości go odzyskać."
+  },
+  "app.instance.worlds.remove-server-title": {
+    "message": "Czy jesteś pewny, że chcesz usunąć {name}?"
+  },
+  "app.instance.worlds.search-worlds-placeholder": {
+    "message": "Szukaj wśród {count} światów..."
+  },
+  "app.instance.worlds.this-server": {
+    "message": "ten serwer"
+  },
  "app.modal.install-to-play.content-required": {
    "message": "Wymagane treści"
  },
@@ -125,9 +197,6 @@
  "app.settings.tabs.default-instance-options": {
    "message": "Domyślne opcje instancji"
  },
-  "app.settings.tabs.feature-flags": {
-    "message": "Flagi funkcji"
-  },
  "app.settings.tabs.java-installations": {
    "message": "Instalacje Java"
  },
@@ -182,6 +251,24 @@
  "app.update.reload-to-update": {
    "message": "Załaduj ponownie, aby zainstalować aktualizację"
  },
+  "app.world.server-modal.placeholder-address": {
+    "message": "example.modrinth.gg"
+  },
+  "app.world.server-modal.select-an-option": {
+    "message": "Wybierz opcję"
+  },
+  "app.world.world-item.incompatible-version": {
+    "message": "Niekompatybilna wersja {version}"
+  },
+  "app.world.world-item.not-played-yet": {
+    "message": "Jeszcze nie grano"
+  },
+  "app.world.world-item.offline": {
+    "message": "Offline"
+  },
+  "app.world.world-item.players-online": {
+    "message": "{count} online"
+  },
  "friends.action.add-friend": {
    "message": "Dodaj znajomego"
  },
@@ -281,6 +368,12 @@
  "instance.edit-world.title": {
    "message": "Edytuj świat"
  },
+  "instance.files.adding-files": {
+    "message": "Dodawanie plików ({completed}/{total})"
+  },
+  "instance.files.save-as": {
+    "message": "Zapisz jako..."
+  },
  "instance.server-modal.address": {
    "message": "Adres"
  },
@@ -452,9 +545,6 @@
  "instance.worlds.dont_show_on_home": {
    "message": "Nie pokazuj na stronie głównej"
  },
-  "instance.worlds.filter.available": {
-    "message": "Dostępny"
-  },
  "instance.worlds.game_already_open": {
    "message": "Instancja jest już otwarta"
  },
@@ -479,12 +569,6 @@
  "instance.worlds.play_instance": {
    "message": "Zagraj"
  },
-  "instance.worlds.type.server": {
-    "message": "Serwer"
-  },
-  "instance.worlds.type.singleplayer": {
-    "message": "Tryb jednoosobowy"
-  },
  "instance.worlds.view_instance": {
    "message": "Zobacz instancję"
  },
@@ -5,6 +5,39 @@
  "app.auth-servers.unreachable.header": {
    "message": "Não foi possível acessar os servidores de autenticação"
  },
+  "app.browse.add-server-to-instance": {
+    "message": "Adicionar servidor à instância"
+  },
+  "app.browse.add-servers-to-instance": {
+    "message": "Adicionar servidores à sua instância"
+  },
+  "app.browse.add-to-instance": {
+    "message": "Adicionar à instância"
+  },
+  "app.browse.add-to-instance-name": {
+    "message": "Adicionar a {instanceName}"
+  },
+  "app.browse.added": {
+    "message": "Adicionado"
+  },
+  "app.browse.already-added": {
+    "message": "Já adicionado"
+  },
+  "app.browse.discover-content": {
+    "message": "Descubra conteúdo"
+  },
+  "app.browse.discover-servers": {
+    "message": "Descubra servidores"
+  },
+  "app.browse.hide-added-servers": {
+    "message": "Ocultar servidores adicionados"
+  },
+  "app.browse.hide-installed-content": {
+    "message": "Ocultar conteúdo instalado"
+  },
+  "app.browse.install-content-to-instance": {
+    "message": "Instalar conteúdo na instância"
+  },
  "app.export-modal.description-placeholder": {
    "message": "Insira a descrição do pacote de mods..."
  },
@@ -41,33 +74,21 @@
  "app.instance.confirm-delete.header": {
    "message": "Excluir instância"
  },
-  "app.instance.modpack-already-installed.admonition-body": {
-    "message": "Este pacote de mods já está instalado na instância \"{instanceName}\"."
+  "app.instance.modpack-already-installed.body": {
+    "message": "Este pacote de mods já está instalado na instância <bold>{instanceName}</bold>. Tem certeza de que deseja duplicá-lo?"
  },
-  "app.instance.modpack-already-installed.admonition-header": {
-    "message": "Pacote de mods duplicado"
-  },
-  "app.instance.modpack-already-installed.create-anyway": {
-    "message": "Criar mesmo assim"
-  },
-  "app.instance.modpack-already-installed.go-to-instance": {
-    "message": "Ir para a instância"
+  "app.instance.modpack-already-installed.create": {
+    "message": "Criar"
  },
  "app.instance.modpack-already-installed.header": {
    "message": "O pacote de mods já está instalado"
  },
+  "app.instance.modpack-already-installed.instance": {
+    "message": "Instância"
+  },
  "app.instance.mods.content-type-project": {
    "message": "projeto"
  },
-  "app.instance.mods.copy-link": {
-    "message": "Copiar link"
-  },
-  "app.instance.mods.installing": {
-    "message": "Instalando..."
-  },
-  "app.instance.mods.modpack-fallback": {
-    "message": "Pacote de mods"
-  },
  "app.instance.mods.project-was-added": {
    "message": "\"{name}\" foi adicionado"
  },
@@ -80,17 +101,53 @@
  "app.instance.mods.share-title": {
    "message": "Compartilhando conteúdo do pacote de mods\n\n\n    \t\t\t\t\t\t\n    \t\t\t\t\t\t\t\n    \t\t\t\t\t\t\n    \t\t\t\t\t\t"
  },
-  "app.instance.mods.show-file": {
-    "message": "Mostrar arquivo"
-  },
  "app.instance.mods.successfully-uploaded": {
    "message": "Enviado com sucesso"
  },
-  "app.instance.mods.unknown-version": {
-    "message": "Desconhecido"
+  "app.instance.worlds.add-server": {
+    "message": "Adicionar servidor"
  },
-  "app.instance.mods.updating": {
-    "message": "Atualizando..."
+  "app.instance.worlds.browse-servers": {
+    "message": "Explorar servidores"
+  },
+  "app.instance.worlds.delete-world-description": {
+    "message": "'{name}' será excluído permanentemente, e não haverá como recuperá-lo."
+  },
+  "app.instance.worlds.delete-world-title": {
+    "message": "Tem certeza de que deseja excluir este mundo permanentemente?"
+  },
+  "app.instance.worlds.filter-modded": {
+    "message": "Modificado"
+  },
+  "app.instance.worlds.filter-offline": {
+    "message": "Offline"
+  },
+  "app.instance.worlds.filter-online": {
+    "message": "Online"
+  },
+  "app.instance.worlds.filter-vanilla": {
+    "message": "Jogo padrão"
+  },
+  "app.instance.worlds.no-worlds-description": {
+    "message": "Adicione um servidor ou explore para começar"
+  },
+  "app.instance.worlds.no-worlds-heading": {
+    "message": "Nenhum servidor ou mundo adicionado"
+  },
+  "app.instance.worlds.remove-server-description": {
+    "message": "'{name}' será removido da sua lista, inclusive no jogo, e não haverá como recuperá-lo."
+  },
+  "app.instance.worlds.remove-server-description-with-address": {
+    "message": "'{name}' ({address}) será removido da sua lista, inclusive no jogo, e não haverá como recuperá-lo."
+  },
+  "app.instance.worlds.remove-server-title": {
+    "message": "Tem certeza de que deseja remover {name}?"
+  },
+  "app.instance.worlds.search-worlds-placeholder": {
+    "message": "Buscar {count} mundos..."
+  },
+  "app.instance.worlds.this-server": {
+    "message": "este servidor"
  },
  "app.modal.install-to-play.content-required": {
    "message": "Conteúdo necessário"
@@ -140,9 +197,6 @@
  "app.settings.tabs.default-instance-options": {
    "message": "Opções da instância"
  },
-  "app.settings.tabs.feature-flags": {
-    "message": "Sinalização de recursos"
-  },
  "app.settings.tabs.java-installations": {
    "message": "Instalações do Java"
  },
@@ -197,6 +251,24 @@
  "app.update.reload-to-update": {
    "message": "Recarregue para instalar a atualização"
  },
+  "app.world.server-modal.placeholder-address": {
+    "message": "exemplo.modrinth.gg"
+  },
+  "app.world.server-modal.select-an-option": {
+    "message": "Selecione uma opção"
+  },
+  "app.world.world-item.incompatible-version": {
+    "message": "Versão incompatível {version}"
+  },
+  "app.world.world-item.not-played-yet": {
+    "message": "Ainda não jogado"
+  },
+  "app.world.world-item.offline": {
+    "message": "Offline"
+  },
+  "app.world.world-item.players-online": {
+    "message": "{count} online"
+  },
  "friends.action.add-friend": {
    "message": "Adicionar um amigo"
  },
@@ -296,6 +368,12 @@
  "instance.edit-world.title": {
    "message": "Editar mundo"
  },
+  "instance.files.adding-files": {
+    "message": "Adicionando arquivos ({completed}/{total})"
+  },
+  "instance.files.save-as": {
+    "message": "Salvar como..."
+  },
  "instance.server-modal.address": {
    "message": "Endereço"
  },
@@ -467,9 +545,6 @@
  "instance.worlds.dont_show_on_home": {
    "message": "Não mostrar na tela inicial"
  },
-  "instance.worlds.filter.available": {
-    "message": "Disponível"
-  },
  "instance.worlds.game_already_open": {
    "message": "A instância já está aberta"
  },
@@ -494,12 +569,6 @@
  "instance.worlds.play_instance": {
    "message": "Jogar na instância"
  },
-  "instance.worlds.type.server": {
-    "message": "Servidor"
-  },
-  "instance.worlds.type.singleplayer": {
-    "message": "Um jogador"
-  },
  "instance.worlds.view_instance": {
    "message": "Ver instância"
  },
@@ -5,6 +5,153 @@
  "app.auth-servers.unreachable.header": {
    "message": "Não foi possível alcançar os servidores de autenticação"
  },
+  "app.browse.add-server-to-instance": {
+    "message": "Adicionar servidor à instância"
+  },
+  "app.browse.add-servers-to-instance": {
+    "message": "Adicionar servidores à tua instância"
+  },
+  "app.browse.add-to-instance": {
+    "message": "Adicionar à instância"
+  },
+  "app.browse.add-to-instance-name": {
+    "message": "Adicionar a {instanceName}"
+  },
+  "app.browse.added": {
+    "message": "Adicionado"
+  },
+  "app.browse.already-added": {
+    "message": "Já adicionado"
+  },
+  "app.browse.discover-content": {
+    "message": "Descobrir conteúdo"
+  },
+  "app.browse.discover-servers": {
+    "message": "Descobrir servidores"
+  },
+  "app.browse.hide-added-servers": {
+    "message": "Esconder servidores adicionados"
+  },
+  "app.browse.hide-installed-content": {
+    "message": "Esconder conteúdo instalado"
+  },
+  "app.browse.install-content-to-instance": {
+    "message": "Instalar conteúdo à instância"
+  },
+  "app.export-modal.description-placeholder": {
+    "message": "Insere a descrição do modpack..."
+  },
+  "app.export-modal.export-button": {
+    "message": "Exportar"
+  },
+  "app.export-modal.header": {
+    "message": "Exportar modpack"
+  },
+  "app.export-modal.modpack-name-label": {
+    "message": "Nome do Modpack"
+  },
+  "app.export-modal.modpack-name-placeholder": {
+    "message": "Nome do Modpack"
+  },
+  "app.export-modal.select-files-label": {
+    "message": "Seleciona as pastas e ficheiros a incluir no pack"
+  },
+  "app.export-modal.version-number-label": {
+    "message": "Número da versão"
+  },
+  "app.export-modal.version-number-placeholder": {
+    "message": "1.0.0"
+  },
+  "app.instance.confirm-delete.admonition-body": {
+    "message": "Todos os dados da tua instância vão ser permanentemente apagados, incluídos os teus mundos, definições, e todos os conteúdos instalados."
+  },
+  "app.instance.confirm-delete.admonition-header": {
+    "message": "Esta ação não pode ser desfeita"
+  },
+  "app.instance.confirm-delete.delete-button": {
+    "message": "Apagar instância"
+  },
+  "app.instance.confirm-delete.header": {
+    "message": "Apagar instância"
+  },
+  "app.instance.modpack-already-installed.body": {
+    "message": "Este modpack já está instalado na instância <bold>{instanceName}</bold>. Tens a certeza que o queres duplicar?"
+  },
+  "app.instance.modpack-already-installed.create": {
+    "message": "Criar"
+  },
+  "app.instance.modpack-already-installed.header": {
+    "message": "Modpack já instalado"
+  },
+  "app.instance.modpack-already-installed.instance": {
+    "message": "Instância"
+  },
+  "app.instance.mods.content-type-project": {
+    "message": "projeto"
+  },
+  "app.instance.mods.project-was-added": {
+    "message": "\"{name}\" foi adicionado"
+  },
+  "app.instance.mods.projects-were-added": {
+    "message": "{count} projetos foram adicionados"
+  },
+  "app.instance.mods.share-text": {
+    "message": "Vê os projetos que estou a usar no meu modpack!"
+  },
+  "app.instance.mods.share-title": {
+    "message": "Partilhar conteúdo do modpack"
+  },
+  "app.instance.mods.successfully-uploaded": {
+    "message": "Carregado com sucesso"
+  },
+  "app.instance.worlds.add-server": {
+    "message": "Adicionar servidor"
+  },
+  "app.instance.worlds.browse-servers": {
+    "message": "Procurar servidores"
+  },
+  "app.instance.worlds.delete-world-description": {
+    "message": "\"{name}\" vai ser **apagado permanentemente**, e não haverá maneira de o recuperar."
+  },
+  "app.instance.worlds.delete-world-title": {
+    "message": "Tens a certeza que queres apagar permanentemente este mundo?"
+  },
+  "app.instance.worlds.filter-modded": {
+    "message": "Com Mods"
+  },
+  "app.instance.worlds.filter-offline": {
+    "message": "Offline"
+  },
+  "app.instance.worlds.filter-online": {
+    "message": "Online"
+  },
+  "app.instance.worlds.filter-vanilla": {
+    "message": "Sem mods"
+  },
+  "app.instance.worlds.no-worlds-description": {
+    "message": "Adiciona um servidor ou procura um para começar"
+  },
+  "app.instance.worlds.no-worlds-heading": {
+    "message": "Sem servidores ou mundos adicionados"
+  },
+  "app.instance.worlds.remove-server-description": {
+    "message": "\"{name}\" vai ser removido da tua lista, incluindo dentro do jogo, e não haverá maneira de o recuperar."
+  },
+  "app.instance.worlds.remove-server-description-with-address": {
+    "message": "\"{name}\" ({address}) vai ser removido da tua lista, incluindo dentro do jogo, e não haverá maneira de o recuperar."
+  },
+  "app.instance.worlds.remove-server-title": {
+    "message": "Tens a certeza que queres remover {name}?"
+  },
+  "app.instance.worlds.search-worlds-placeholder": {
+    "message": "Pesquisar {count} mundos..."
+  },
+  "app.instance.worlds.this-server": {
+    "message": "este servidor"
+  },
+  "app.modal.install-to-play.content-required": {
+    "message": "Conteúdo necessário"
+  },
  "app.modal.install-to-play.header": {
    "message": "Instala para jogar"
  },
@@ -14,12 +161,21 @@
  "app.modal.install-to-play.mod-count": {
    "message": "{count, plural, one {mod} other {mods}}"
  },
+  "app.modal.install-to-play.required-modpack": {
+    "message": "Modpack requerido"
+  },
+  "app.modal.install-to-play.server-requires-mods": {
+    "message": "Este servidor requer mods para jogares. Clica Instalar para transferir os ficheiros necessários do Modrinth, e então entrar diretamente no servidor."
+  },
  "app.modal.install-to-play.shared-instance": {
    "message": "Instância partilhada"
  },
  "app.modal.install-to-play.shared-server-instance": {
    "message": "Instância de servidor partilhada"
  },
+  "app.modal.install-to-play.view-contents": {
+    "message": "Ver conteúdo"
+  },
  "app.modal.update-to-play.header": {
    "message": "Atualiza para jogar"
  },
@@ -41,9 +197,6 @@
  "app.settings.tabs.default-instance-options": {
    "message": "Opções padrão de instância"
  },
-  "app.settings.tabs.feature-flags": {
-    "message": "Flags de funcionalidades"
-  },
  "app.settings.tabs.java-installations": {
    "message": "Instalações Java"
  },
@@ -56,6 +209,33 @@
  "app.settings.tabs.resource-management": {
    "message": "Gestão de recursos"
  },
+  "app.update-popup.body": {
+    "message": "Modrinth App v{version} está pronta para ser instalada! Recarrega para atualizar agora, ou automaticamente quando fechares a Modrinth App."
+  },
+  "app.update-popup.body.download-complete": {
+    "message": "Modrinth App v{version} acabou de ser transferida. Recarrega para atualizar agora, ou automaticamente quando fechares a Modrinth App."
+  },
+  "app.update-popup.body.linux": {
+    "message": "Modrinth App v{version} está disponível. Usa o teu gestor de pacotes para atualizar e receber as correções e recursos mais recentes!"
+  },
+  "app.update-popup.body.metered": {
+    "message": "Modrinth App v{version} está disponível! Como estás numa rede com tráfego limitado, não a transferimos automaticamente."
+  },
+  "app.update-popup.changelog": {
+    "message": "Lista de alterações"
+  },
+  "app.update-popup.download": {
+    "message": "Transferir ({size})"
+  },
+  "app.update-popup.download-complete": {
+    "message": "Transferência concluída"
+  },
+  "app.update-popup.reload": {
+    "message": "Recarregar"
+  },
+  "app.update-popup.title": {
+    "message": "Atualização disponível"
+  },
  "app.update.complete-toast.text": {
    "message": "Clica aqui para ver a lista de alterações."
  },
@@ -71,6 +251,24 @@
  "app.update.reload-to-update": {
    "message": "Recarrega para instalar a atualização"
  },
+  "app.world.server-modal.placeholder-address": {
+    "message": "exemplo.modrinth.gg"
+  },
+  "app.world.server-modal.select-an-option": {
+    "message": "Seleciona uma opção"
+  },
+  "app.world.world-item.incompatible-version": {
+    "message": "Versão incompatível {version}"
+  },
+  "app.world.world-item.not-played-yet": {
+    "message": "Ainda não jogado"
+  },
+  "app.world.world-item.offline": {
+    "message": "Offline"
+  },
+  "app.world.world-item.players-online": {
+    "message": "{count} online"
+  },
  "friends.action.add-friend": {
    "message": "Adicionar um amigo"
  },
@@ -170,6 +368,12 @@
  "instance.edit-world.title": {
    "message": "Editar mundo"
  },
+  "instance.files.adding-files": {
+    "message": "Adicionando ficheiros ({completed}/{total})"
+  },
+  "instance.files.save-as": {
+    "message": "Guardar como..."
+  },
  "instance.server-modal.address": {
    "message": "Endereço"
  },
@@ -341,9 +545,6 @@
  "instance.worlds.dont_show_on_home": {
    "message": "Não mostrar na página Inicial"
  },
-  "instance.worlds.filter.available": {
-    "message": "Disponível"
-  },
  "instance.worlds.game_already_open": {
    "message": "Instância já está aberta"
  },
@@ -353,6 +554,9 @@
  "instance.worlds.incompatible_server": {
    "message": "Servidor é incompatível"
  },
+  "instance.worlds.linked_server": {
+    "message": "Gerido pelo projeto do servidor"
+  },
  "instance.worlds.no_contact": {
    "message": "Servidor não conseguiu ser contactado"
  },
@@ -365,12 +569,6 @@
  "instance.worlds.play_instance": {
    "message": "Jogar instância"
  },
-  "instance.worlds.type.server": {
-    "message": "Servidor"
-  },
-  "instance.worlds.type.singleplayer": {
-    "message": "Um jogador"
-  },
  "instance.worlds.view_instance": {
    "message": "Ver instância"
  },
@@ -388,5 +586,17 @@
  },
  "search.filter.locked.instance.sync": {
    "message": "Sincronizar com a instância"
+  },
+  "search.filter.locked.server": {
+    "message": "Fornecido pelo servidor"
+  },
+  "search.filter.locked.server-environment.title": {
+    "message": "Apenas mods no cliente podem ser adicionados à instância de servidor"
+  },
+  "search.filter.locked.server-game-version.title": {
+    "message": "Versão do jogo é fornecida pelo servidor"
+  },
+  "search.filter.locked.server-loader.title": {
+    "message": "Carregador é fornecido pelo servidor"
  }
 }
@@ -5,9 +5,6 @@
  "app.auth-servers.unreachable.header": {
    "message": "Nu se pot accesa serverele de autentificare"
  },
-  "app.instance.mods.copy-link": {
-    "message": "Copiază linkul"
-  },
  "app.modal.install-to-play.content-required": {
    "message": "Conținut necesar"
  },
@@ -56,9 +53,6 @@
  "app.settings.tabs.default-instance-options": {
    "message": "Opțiuni implicite instanță"
  },
-  "app.settings.tabs.feature-flags": {
-    "message": "Controale funcționalitate"
-  },
  "app.settings.tabs.java-installations": {
    "message": "Instalări Java"
  },
@@ -383,9 +377,6 @@
  "instance.worlds.dont_show_on_home": {
    "message": "Nu afișa în pagina principală"
  },
-  "instance.worlds.filter.available": {
-    "message": "Disponibil"
-  },
  "instance.worlds.game_already_open": {
    "message": "Instanța este deja deschisă"
  },
@@ -410,12 +401,6 @@
  "instance.worlds.play_instance": {
    "message": "Joacă pe instanța"
  },
-  "instance.worlds.type.server": {
-    "message": "Server"
-  },
-  "instance.worlds.type.singleplayer": {
-    "message": "Un singur jucător"
-  },
  "instance.worlds.view_instance": {
    "message": "Afișează instanța"
  },
@@ -5,6 +5,39 @@
  "app.auth-servers.unreachable.header": {
    "message": "Нет связи с серверами аутентификации"
  },
+  "app.browse.add-server-to-instance": {
+    "message": "Добавить сервер в сборку"
+  },
+  "app.browse.add-servers-to-instance": {
+    "message": "Добавление серверов в сборку"
+  },
+  "app.browse.add-to-instance": {
+    "message": "Добавить в сборку"
+  },
+  "app.browse.add-to-instance-name": {
+    "message": "Добавить в {instanceName}"
+  },
+  "app.browse.added": {
+    "message": "Добавлено"
+  },
+  "app.browse.already-added": {
+    "message": "Уже добавлено"
+  },
+  "app.browse.discover-content": {
+    "message": "Поиск проектов"
+  },
+  "app.browse.discover-servers": {
+    "message": "Поиск серверов"
+  },
+  "app.browse.hide-added-servers": {
+    "message": "Скрывать добавленные"
+  },
+  "app.browse.hide-installed-content": {
+    "message": "Скрывать установленные"
+  },
+  "app.browse.install-content-to-instance": {
+    "message": "Установить контент в сборку"
+  },
  "app.export-modal.description-placeholder": {
    "message": "Введите описание сборки..."
  },
@@ -12,7 +45,7 @@
    "message": "Экспортировать"
  },
  "app.export-modal.header": {
-    "message": "Экспорт модпака"
+    "message": "Экспорт сборки модов"
  },
  "app.export-modal.modpack-name-label": {
    "message": "Название сборки"
@@ -21,7 +54,7 @@
    "message": "Название сборки"
  },
  "app.export-modal.select-files-label": {
-    "message": "Выберите элементы экспорта в модпак"
+    "message": "Выберите файлы или папки для включения в сборку"
  },
  "app.export-modal.version-number-label": {
    "message": "Номер версии"
@@ -41,33 +74,21 @@
  "app.instance.confirm-delete.header": {
    "message": "Удаление сборки"
  },
-  "app.instance.modpack-already-installed.admonition-body": {
-    "message": "Этот модпак уже установлен в инстанции \"{instanceName}\"."
+  "app.instance.modpack-already-installed.body": {
+    "message": "Эта сборка модов уже установлена в сборку <bold>{instanceName}</bold>. Вы уверены, что хотите дублировать её?"
  },
-  "app.instance.modpack-already-installed.admonition-header": {
-    "message": "Дублировать модпак"
-  },
-  "app.instance.modpack-already-installed.create-anyway": {
-    "message": "Всё равно создать"
-  },
-  "app.instance.modpack-already-installed.go-to-instance": {
-    "message": "К инстанции"
+  "app.instance.modpack-already-installed.create": {
+    "message": "Создать"
  },
  "app.instance.modpack-already-installed.header": {
-    "message": "Модпак уже установлен"
+    "message": "Сборка модов уже установлена"
+  },
+  "app.instance.modpack-already-installed.instance": {
+    "message": "Сборка"
  },
  "app.instance.mods.content-type-project": {
    "message": "проект"
  },
-  "app.instance.mods.copy-link": {
-    "message": "Копировать ссылку"
-  },
-  "app.instance.mods.installing": {
-    "message": "Установка..."
-  },
-  "app.instance.mods.modpack-fallback": {
-    "message": "Сборка"
-  },
  "app.instance.mods.project-was-added": {
    "message": "\"{name}\" был добавлен"
  },
@@ -75,22 +96,58 @@
    "message": "Проектов добавлено: {count}"
  },
  "app.instance.mods.share-text": {
-    "message": "Посмотрите проекты, в моём модпаке!"
+    "message": "Посмотрите проекты, которые я использую в своей сборке модов!"
  },
  "app.instance.mods.share-title": {
    "message": "Содержимое сборки"
  },
-  "app.instance.mods.show-file": {
-    "message": "Показать в папке"
-  },
  "app.instance.mods.successfully-uploaded": {
    "message": "Успешно загружено"
  },
-  "app.instance.mods.unknown-version": {
-    "message": "Неизвестно"
+  "app.instance.worlds.add-server": {
+    "message": "Добавить сервер"
  },
-  "app.instance.mods.updating": {
-    "message": "Обновление..."
+  "app.instance.worlds.browse-servers": {
+    "message": "Найти серверы"
+  },
+  "app.instance.worlds.delete-world-description": {
+    "message": "'{name}' будет **удалён навсегда**, и будет невозможно восстановить."
+  },
+  "app.instance.worlds.delete-world-title": {
+    "message": "Вы уверены, что хотите удалить этот мир навсегда?"
+  },
+  "app.instance.worlds.filter-modded": {
+    "message": "Со сборкой"
+  },
+  "app.instance.worlds.filter-offline": {
+    "message": "Не в сети"
+  },
+  "app.instance.worlds.filter-online": {
+    "message": "В сети"
+  },
+  "app.instance.worlds.filter-vanilla": {
+    "message": "Не модифицировано"
+  },
+  "app.instance.worlds.no-worlds-description": {
+    "message": "Добавить сервер или найти, чтобы начать"
+  },
+  "app.instance.worlds.no-worlds-heading": {
+    "message": "Сервера или мира не добавлены"
+  },
+  "app.instance.worlds.remove-server-description": {
+    "message": "'{name}' будет удален из вашего списка, включая в игре, и восстановить будет невозможно."
+  },
+  "app.instance.worlds.remove-server-description-with-address": {
+    "message": "'{name}' ({address}) будет удален из вашего списка, включая в игре, и восстановить будет невозможно."
+  },
+  "app.instance.worlds.remove-server-title": {
+    "message": "Вы уверены, что хотите удалить {name}?"
+  },
+  "app.instance.worlds.search-worlds-placeholder": {
+    "message": "Поиск по {count, plural, one {# миру} other {# мирам}}..."
+  },
+  "app.instance.worlds.this-server": {
+    "message": "Этот сервер"
  },
  "app.modal.install-to-play.content-required": {
    "message": "Требуется дополнительный контент"
@@ -140,9 +197,6 @@
  "app.settings.tabs.default-instance-options": {
    "message": "Предустановки"
  },
-  "app.settings.tabs.feature-flags": {
-    "message": "Флаги функций"
-  },
  "app.settings.tabs.java-installations": {
    "message": "Установки Java"
  },
@@ -197,6 +251,24 @@
  "app.update.reload-to-update": {
    "message": "Перезапустить и обновить"
  },
+  "app.world.server-modal.placeholder-address": {
+    "message": "example.modrinth.gg"
+  },
+  "app.world.server-modal.select-an-option": {
+    "message": "Выберите вариант"
+  },
+  "app.world.world-item.incompatible-version": {
+    "message": "Несовместимая версия {version}"
+  },
+  "app.world.world-item.not-played-yet": {
+    "message": "Ещё не играли"
+  },
+  "app.world.world-item.offline": {
+    "message": "Не в сети"
+  },
+  "app.world.world-item.players-online": {
+    "message": "{count} в игре"
+  },
  "friends.action.add-friend": {
    "message": "Добавить в друзья"
  },
@@ -258,7 +330,7 @@
    "message": "{title} — {count}"
  },
  "friends.sign-in-to-add-friends": {
-    "message": "<link>Войдите в аккаунт Modrinth</link>, вы сможете добавлять друзей и видеть их статус!"
+    "message": "<link>Войдите в аккаунт Modrinth</link>, чтобы добавлять друзей и видеть, во что они играют!"
  },
  "instance.add-server.add-and-play": {
    "message": "Добавить и играть"
@@ -296,6 +368,12 @@
  "instance.edit-world.title": {
    "message": "Настройка мира"
  },
+  "instance.files.adding-files": {
+    "message": "Добавление файлов ({completed}/{total})"
+  },
+  "instance.files.save-as": {
+    "message": "Сохранить как..."
+  },
  "instance.server-modal.address": {
    "message": "Адрес"
  },
@@ -467,9 +545,6 @@
  "instance.worlds.dont_show_on_home": {
    "message": "Не показывать на главной"
  },
-  "instance.worlds.filter.available": {
-    "message": "Доступно"
-  },
  "instance.worlds.game_already_open": {
    "message": "Сборка уже запущена"
  },
@@ -494,12 +569,6 @@
  "instance.worlds.play_instance": {
    "message": "Запустить сборку"
  },
-  "instance.worlds.type.server": {
-    "message": "Сервер"
-  },
-  "instance.worlds.type.singleplayer": {
-    "message": "Одиночная игра"
-  },
  "instance.worlds.view_instance": {
    "message": "Посмотреть сборку"
  },
@@ -8,24 +8,9 @@
  "app.export-modal.version-number-placeholder": {
    "message": "1.0.0"
  },
-  "app.instance.mods.copy-link": {
-    "message": "Kopiraj link"
-  },
-  "app.instance.mods.installing": {
-    "message": "Instaliranje..."
-  },
-  "app.instance.mods.show-file": {
-    "message": "Prikaži datoteku"
-  },
  "app.instance.mods.successfully-uploaded": {
    "message": "Uspešno otpremljeno"
  },
-  "app.instance.mods.unknown-version": {
-    "message": "Nepoznato"
-  },
-  "app.instance.mods.updating": {
-    "message": "Ažuriranje..."
-  },
  "app.settings.tabs.appearance": {
    "message": "Izgled"
  },
@@ -5,6 +5,39 @@
  "app.auth-servers.unreachable.header": {
    "message": "Kan ej nå autentiseringsservrarna"
  },
+  "app.browse.add-server-to-instance": {
+    "message": "Lägg till server till instans"
+  },
+  "app.browse.add-servers-to-instance": {
+    "message": "Lägg till servrar till din instans"
+  },
+  "app.browse.add-to-instance": {
+    "message": "Lägg till i instans"
+  },
+  "app.browse.add-to-instance-name": {
+    "message": "Lägg till i {instanceName}"
+  },
+  "app.browse.added": {
+    "message": "Tillagd"
+  },
+  "app.browse.already-added": {
+    "message": "Redan tillagd"
+  },
+  "app.browse.discover-content": {
+    "message": "Upptäck innehåll"
+  },
+  "app.browse.discover-servers": {
+    "message": "Upptäck servrar"
+  },
+  "app.browse.hide-added-servers": {
+    "message": "Dölj tillagda servrar"
+  },
+  "app.browse.hide-installed-content": {
+    "message": "Dölj installerat innehåll"
+  },
+  "app.browse.install-content-to-instance": {
+    "message": "Installera innehåll till instans"
+  },
  "app.export-modal.description-placeholder": {
    "message": "Ange modpaketets beskrivning..."
  },
@@ -41,21 +74,21 @@
  "app.instance.confirm-delete.header": {
    "message": "Radera instans"
  },
-  "app.instance.modpack-already-installed.create-anyway": {
-    "message": "Skapa ändå"
+  "app.instance.modpack-already-installed.body": {
+    "message": "Detta modpaket är redan installerat i instansen <bold>{instanceName}</bold>. Är du säker på att du vill duplicera det?"
+  },
+  "app.instance.modpack-already-installed.create": {
+    "message": "Skapa"
+  },
+  "app.instance.modpack-already-installed.header": {
+    "message": "Modpaket redan installerat"
+  },
+  "app.instance.modpack-already-installed.instance": {
+    "message": "Instans"
  },
  "app.instance.mods.content-type-project": {
    "message": "projekt"
  },
-  "app.instance.mods.copy-link": {
-    "message": "Kopiera länk"
-  },
-  "app.instance.mods.installing": {
-    "message": "Installerar..."
-  },
-  "app.instance.mods.modpack-fallback": {
-    "message": "Modpaket"
-  },
  "app.instance.mods.project-was-added": {
    "message": "\"{name}\" lades till"
  },
@@ -68,17 +101,53 @@
  "app.instance.mods.share-title": {
    "message": "Delar innehåll från modpaket"
  },
-  "app.instance.mods.show-file": {
-    "message": "Visa fil"
-  },
  "app.instance.mods.successfully-uploaded": {
    "message": "Uppladdning lyckades"
  },
-  "app.instance.mods.unknown-version": {
-    "message": "Okänt"
+  "app.instance.worlds.add-server": {
+    "message": "Lägg till server"
  },
-  "app.instance.mods.updating": {
-    "message": "Uppdaterar..."
+  "app.instance.worlds.browse-servers": {
+    "message": "Utforska servrar"
+  },
+  "app.instance.worlds.delete-world-description": {
+    "message": "'{name}' kommer bli **permanent borttagen**, och det kommer inte finnas något sätt att återskapa den."
+  },
+  "app.instance.worlds.delete-world-title": {
+    "message": "Är du säker på att du vill permanent radera denna värld?"
+  },
+  "app.instance.worlds.filter-modded": {
+    "message": "Moddade"
+  },
+  "app.instance.worlds.filter-offline": {
+    "message": "Offline"
+  },
+  "app.instance.worlds.filter-online": {
+    "message": "Online"
+  },
+  "app.instance.worlds.filter-vanilla": {
+    "message": "Vanilla"
+  },
+  "app.instance.worlds.no-worlds-description": {
+    "message": "Lägg till en server eller utforska för att komma igång"
+  },
+  "app.instance.worlds.no-worlds-heading": {
+    "message": "Inga servrar eller världar tillagda"
+  },
+  "app.instance.worlds.remove-server-description": {
+    "message": "'{name}' kommer bli borttagen från din lista, inklusive i spelet, och det kommer inte finnas något sätt att återskapa den."
+  },
+  "app.instance.worlds.remove-server-description-with-address": {
+    "message": "'{name}' ({address}) kommer bli borttagen från din lista, inklusive i spelet, och det kommer inte finnas något sätt att återskapa den."
+  },
+  "app.instance.worlds.remove-server-title": {
+    "message": "Är du säker på att du vill radera {name}?"
+  },
+  "app.instance.worlds.search-worlds-placeholder": {
+    "message": "Sök {count} världar..."
+  },
+  "app.instance.worlds.this-server": {
+    "message": "denna server"
  },
  "app.modal.install-to-play.content-required": {
    "message": "Innehåll krävs"
@@ -128,9 +197,6 @@
  "app.settings.tabs.default-instance-options": {
    "message": "Standardinställningar för instanser"
  },
-  "app.settings.tabs.feature-flags": {
-    "message": "Funktionsflaggor"
-  },
  "app.settings.tabs.java-installations": {
    "message": "Java-installationer"
  },
@@ -185,6 +251,24 @@
  "app.update.reload-to-update": {
    "message": "Ladda om för att installera uppdatering"
  },
+  "app.world.server-modal.placeholder-address": {
+    "message": "example.modrinth.gg"
+  },
+  "app.world.server-modal.select-an-option": {
+    "message": "Välj ett alternativ"
+  },
+  "app.world.world-item.incompatible-version": {
+    "message": "Inkompatibel version {version}"
+  },
+  "app.world.world-item.not-played-yet": {
+    "message": "Inte spelad än"
+  },
+  "app.world.world-item.offline": {
+    "message": "Offline"
+  },
+  "app.world.world-item.players-online": {
+    "message": "{count} online"
+  },
  "friends.action.add-friend": {
    "message": "Lägg till en vän"
  },
@@ -284,6 +368,12 @@
  "instance.edit-world.title": {
    "message": "Redigera värld"
  },
+  "instance.files.adding-files": {
+    "message": "Lägger till filer ({completed}/{total})"
+  },
+  "instance.files.save-as": {
+    "message": "Spara som..."
+  },
  "instance.server-modal.address": {
    "message": "Adress"
  },
@@ -455,9 +545,6 @@
  "instance.worlds.dont_show_on_home": {
    "message": "Visa inte på Startsidan"
  },
-  "instance.worlds.filter.available": {
-    "message": "Tillgängliga"
-  },
  "instance.worlds.game_already_open": {
    "message": "Instans är redan öppen"
  },
@@ -482,12 +569,6 @@
  "instance.worlds.play_instance": {
    "message": "Spela instans"
  },
-  "instance.worlds.type.server": {
-    "message": "Server"
-  },
-  "instance.worlds.type.singleplayer": {
-    "message": "Enspelarläge"
-  },
  "instance.worlds.view_instance": {
    "message": "Visa instans"
  },
@@ -1,34 +1,142 @@
 {
+  "app.auth-servers.unreachable.body": {
+    "message": "เซิร์ฟเวอร์ตรวจสอบสิทธิ์ของ Minecraft อาจใช้งานไม่ได้ในขณะนี้ โปรดตรวจสอบการเชื่อมต่ออินเทอร์เน็ตของคุณและลองใหม่อีกครั้งในภายหลัง"
+  },
+  "app.browse.add-server-to-instance": {
+    "message": "เพิ่มเซิร์ฟเวอร์ลงในอินสแตนซ์"
+  },
+  "app.browse.added": {
+    "message": "เพิ่ม"
+  },
+  "app.export-modal.description-placeholder": {
+    "message": "กรอกคำอธิบายมอดแพ็ก.."
+  },
+  "app.export-modal.modpack-name-label": {
+    "message": "ชื่อมอดแพ็ก"
+  },
+  "app.export-modal.version-number-placeholder": {
+    "message": "1.0.0"
+  },
+  "app.instance.confirm-delete.admonition-body": {
+    "message": "ข้อมูลทั้งหมดในอินสแตนซ์ของคุณจะถูกลบอย่างถาวร รวมถึงโลก การตั้งค่า และเนื้อหาที่ติดตั้งไว้ทั้งหมด"
+  },
+  "app.instance.confirm-delete.admonition-header": {
+    "message": "การดำเนินการนี้ไม่สามารถย้อนคืนได้"
+  },
+  "app.instance.confirm-delete.delete-button": {
+    "message": "ลบอินสแตนซ์"
+  },
+  "app.instance.modpack-already-installed.body": {
+    "message": "มอดแพ็กนี้ถูกติดตั้งไว้ในอินสแตนซ์ <bold>{instanceName}</bold> อยู่แล้ว คุณแน่ใจหรือไม่ว่าต้องการสร้างสำเนาซ้ำ?"
+  },
+  "app.instance.modpack-already-installed.create": {
+    "message": "สร้าง"
+  },
+  "app.instance.modpack-already-installed.header": {
+    "message": "ติดตั้งมอดแพ็กนี้อยู่แล้ว"
+  },
+  "app.instance.modpack-already-installed.instance": {
+    "message": "อินสแตนซ์"
+  },
+  "app.instance.mods.content-type-project": {
+    "message": "โปรเจกต์"
+  },
+  "app.instance.mods.project-was-added": {
+    "message": "เพิ่ม \"{name}\" เรียบร้อยแล้ว"
+  },
+  "app.instance.mods.projects-were-added": {
+    "message": "เพิ่ม {count} โปรเจกต์เรียบร้อยแล้ว"
+  },
+  "app.instance.mods.share-text": {
+    "message": "มาตรวจดูโปรเจกต์ต่าง ๆ ที่ฉันใช้ในมอดแพ็กนี้กัน!"
+  },
+  "app.instance.mods.successfully-uploaded": {
+    "message": "อัปโหลดสำเร็จ"
+  },
+  "app.instance.worlds.browse-servers": {
+    "message": "ค้นหาเซิฟเวอร์"
+  },
+  "app.instance.worlds.delete-world-description": {
+    "message": "'{name}' จะถูกลบอย่างถาวร** และจะไม่สามารถกู้คืนได้**"
+  },
+  "app.instance.worlds.delete-world-title": {
+    "message": "คุณแน่ใจหรือไม่ว่าต้องการลบโลกนี้อย่างถาวร?"
+  },
+  "app.instance.worlds.filter-modded": {
+    "message": "แบบมีมอด"
+  },
+  "app.instance.worlds.filter-offline": {
+    "message": "ออฟไลน์"
+  },
+  "app.instance.worlds.filter-online": {
+    "message": "ออนไลน์"
+  },
+  "app.instance.worlds.filter-vanilla": {
+    "message": "ต้นฉบับ"
+  },
+  "app.instance.worlds.no-worlds-description": {
+    "message": "เพิ่มเซิร์ฟเวอร์หรือสำรวจเพื่อเริ่มต้น"
+  },
+  "app.instance.worlds.no-worlds-heading": {
+    "message": "ไม่มีเซิร์ฟเวอร์หรือโลกที่เพิ่มไว้"
+  },
+  "app.instance.worlds.remove-server-description": {
+    "message": "'{name}' จะถูกลบออกจากรายชื่อของคุณ รวมถึงในเกมด้วย และจะไม่สามารถกู้คืนได้"
+  },
+  "app.instance.worlds.remove-server-description-with-address": {
+    "message": "'{name}' ({address}) จะถูกลบออกจากรายชื่อของคุณ รวมถึงในเกมด้วย และจะไม่สามารถกู้คืนได้"
+  },
+  "app.instance.worlds.remove-server-title": {
+    "message": "คุณแน่ใจหรือไม่ว่าต้องการลบ {name}?"
+  },
+  "app.instance.worlds.search-worlds-placeholder": {
+    "message": "ค้นหา {count} โลก"
+  },
+  "app.instance.worlds.this-server": {
+    "message": "เซิร์ฟเวอร์อันนี้"
+  },
+  "app.modal.install-to-play.content-required": {
+    "message": "จำเป็นต้องมีเนื้อหา"
+  },
  "app.modal.install-to-play.header": {
    "message": "ติดตั้งเพื่อเล่น"
  },
  "app.modal.install-to-play.install-button": {
    "message": "ติดตั้ง"
  },
+  "app.modal.install-to-play.required-modpack": {
+    "message": "มอดแพ็กที่จำเป็น"
+  },
+  "app.modal.install-to-play.server-requires-mods": {
+    "message": "เซิร์ฟเวอร์นี้จำเป็นต้องใช้มอดเพื่อเข้าเล่น คลิกติดตั้ง เพื่อตั้งค่าไฟล์ที่จำเป็นจาก Modrinth จากนั้นจึงจะเข้าสู่เซิร์ฟเวอร์โดยตรงได้"
+  },
+  "app.modal.install-to-play.shared-instance": {
+    "message": "อินสแตนซ์ที่ใช้ร่วมกัน"
+  },
+  "app.modal.install-to-play.shared-server-instance": {
+    "message": "อินสแตนซ์เซิร์ฟเวอร์ที่ใช้ร่วมกัน"
+  },
  "app.modal.update-to-play.header": {
    "message": "อัปเดตเพื่อเล่น"
  },
  "app.modal.update-to-play.update-required": {
-    "message": "ต้องมีการอัปเดต"
+    "message": "จำเป็นต้องอัปเดต"
  },
  "app.modal.update-to-play.update-required-description": {
-    "message": "ต้องอัปเดตอย่างหนึ่งเพื่อเล่น {name}. โปรดอัปเดตให้เป็นเวอร์ชั่นล่าสุดเพื่อเปิดเกมใ"
+    "message": "จำเป็นต้องอัปเดตเพื่อเล่น {name} กรุณาอัปเดตเป็นเวอร์ชันล่าสุดเพื่อเปิดเกม"
  },
  "app.settings.developer-mode-enabled": {
-    "message": "กำลังอยู่ในโหมดผู้พัฒนา"
+    "message": "โหมดนักพัฒนาเปิดอยู่"
  },
  "app.settings.downloading": {
    "message": "ดาวน์โหลด เวอร์ชั่น{version}"
  },
  "app.settings.tabs.appearance": {
-    "message": "รูปลักษณ์"
+    "message": "หน้าตา"
  },
  "app.settings.tabs.default-instance-options": {
    "message": "ตัวเลือกอินสแตนซ์เริ่มต้น"
  },
-  "app.settings.tabs.feature-flags": {
-    "message": "ระบบควบคุมการเปิดใช้งานฟีเจอร์"
-  },
  "app.settings.tabs.java-installations": {
    "message": "การจัดการ Java ที่ติดตั้ง"
  },
@@ -41,6 +149,15 @@
  "app.settings.tabs.resource-management": {
    "message": "การจัดการทรัพยากร"
  },
+  "app.update-popup.body.linux": {
+    "message": "Modrinth App v{version} พร้อมให้อัปเดตแล้ว โปรดใช้ตัวจัดการแพ็กเกจ ของคุณเพื่ออัปเดตฟีเจอร์ใหม่และตัวแก้ไขล่าสุด!"
+  },
+  "app.update-popup.download-complete": {
+    "message": "ดาวน์โหลดเสร็จสมบูรณ์"
+  },
+  "app.update-popup.title": {
+    "message": "มีการอัปเดตใหม่"
+  },
  "app.update.complete-toast.text": {
    "message": "คลิกที่นี่เพื่อดูบันทึกการเปลี่ยนแปลง"
  },
@@ -56,6 +173,18 @@
  "app.update.reload-to-update": {
    "message": "รีโหลดเพื่อติดตั้งอัพเดต"
  },
+  "app.world.server-modal.placeholder-address": {
+    "message": "example.modrinth.gg"
+  },
+  "app.world.world-item.incompatible-version": {
+    "message": "เวอร์ชัน {version} ไม่รองรับ"
+  },
+  "app.world.world-item.offline": {
+    "message": "ออฟไลน์"
+  },
+  "app.world.world-item.players-online": {
+    "message": "{count} ออนไลน์"
+  },
  "friends.action.add-friend": {
    "message": "เพิ่มเพื่อน"
  },
@@ -101,6 +230,9 @@
  "friends.heading.online": {
    "message": "ออฟไลน์"
  },
+  "friends.heading.pending": {
+    "message": "กําลังดำเนินการ"
+  },
  "friends.no-friends-match": {
    "message": "ไม่มีเพื่อนชื่อว่า \"{query}\""
  },
@@ -149,6 +281,12 @@
  "instance.edit-world.title": {
    "message": "แก้ไขโลก"
  },
+  "instance.files.adding-files": {
+    "message": "กำลังเพิ่มไฟล์ ({completed}/{total})"
+  },
+  "instance.files.save-as": {
+    "message": "บันทึกเป็น..."
+  },
  "instance.server-modal.address": {
    "message": "ที่อยู่เซิร์ฟเวอร์"
  },
@@ -215,13 +353,130 @@
  "instance.settings.tabs.general.name": {
    "message": "ชื่อ"
  },
+  "instance.settings.tabs.hooks": {
+    "message": "ตัวดักการปล่อย"
+  },
  "instance.settings.tabs.hooks.custom-hooks": {
    "message": "กำหนดเอง"
  },
+  "instance.settings.tabs.hooks.description": {
+    "message": "ตัวดักจับช่วยให้ผู้ใช้ระดับสูงสามารถรันคำสั่งระบบบางอย่างได้ ทั้งก่อนและหลังการเปิดเกม"
+  },
+  "instance.settings.tabs.hooks.post-exit.enter": {
+    "message": "ป้อนคำสั่งหลังจบการทำงาน..."
+  },
+  "instance.settings.tabs.hooks.pre-launch": {
+    "message": "ก่อนรัน"
+  },
+  "instance.settings.tabs.hooks.title": {
+    "message": "ฮุกการเปิดเกม"
+  },
+  "instance.settings.tabs.hooks.wrapper": {
+    "message": "ตัวห่อหุ้ม"
+  },
+  "instance.settings.tabs.hooks.wrapper.description": {
+    "message": "คำสั่งตัวห่อหุ้มสำหรับเปิด ไมน์คราฟต์"
+  },
+  "instance.settings.tabs.hooks.wrapper.enter": {
+    "message": "ป้อนตัวห่อหุ้มคำสั่ง..."
+  },
  "instance.settings.tabs.installation": {
    "message": "การติดตั้ง"
  },
  "instance.settings.tabs.installation.loader-version": {
    "message": "เวอร์ชั่น {loader}"
+  },
+  "instance.settings.tabs.java": {
+    "message": "Java และ หน่วยความจำ"
+  },
+  "instance.settings.tabs.java.hooks": {
+    "message": "ฮุก"
+  },
+  "instance.settings.tabs.java.java-arguments": {
+    "message": "อาร์กิวเมนต์ Java"
+  },
+  "instance.settings.tabs.java.java-installation": {
+    "message": "การติดตั้ง Java"
+  },
+  "instance.settings.tabs.java.java-memory": {
+    "message": "หน่วยความจำที่จัดสรร"
+  },
+  "instance.settings.tabs.window": {
+    "message": "หน้าต่าง"
+  },
+  "instance.settings.tabs.window.fullscreen": {
+    "message": "เต็มหน้าจอ"
+  },
+  "instance.settings.tabs.window.fullscreen.description": {
+    "message": "ทำให้เกมเปิดในโหมดเต็มหน้าจอเมื่อเริ่มเกม (โดยใช้ไฟล์ options.txt)"
+  },
+  "instance.settings.tabs.window.height": {
+    "message": "ความสูง"
+  },
+  "instance.settings.tabs.window.height.description": {
+    "message": "ความสูงของหน้าต่างเมื่อรันเกม"
+  },
+  "instance.settings.tabs.window.height.enter": {
+    "message": "ป้อนความสูง..."
+  },
+  "instance.settings.tabs.window.width": {
+    "message": "ความกว้าง"
+  },
+  "instance.settings.tabs.window.width.description": {
+    "message": "ความกว้างของหน้าต่างเมื่อรันเกม"
+  },
+  "instance.settings.tabs.window.width.enter": {
+    "message": "ป้อนความกว้าง..."
+  },
+  "instance.worlds.a_minecraft_server": {
+    "message": "เซิร์ฟเวอร์ ไมน์คราฟต์"
+  },
+  "instance.worlds.cant_connect": {
+    "message": "ไม่สามารถเชื่อมต่อกับเซิร์ฟเวอร์ได้"
+  },
+  "instance.worlds.copy_address": {
+    "message": "คัดลอกที่อยู่"
+  },
+  "instance.worlds.dont_show_on_home": {
+    "message": "ไม่ต้องแสดงในหน้าแรก"
+  },
+  "instance.worlds.game_already_open": {
+    "message": "อินสแตนซ์ถูกเปิดอยู่แล้ว"
+  },
+  "instance.worlds.hardcore": {
+    "message": "โหมดฮาร์ดคอร์"
+  },
+  "instance.worlds.incompatible_server": {
+    "message": "เซิร์ฟเวอร์ไม่รองรับ"
+  },
+  "instance.worlds.linked_server": {
+    "message": "จัดการโดยโปรเจกต์เซิร์ฟเวอร์"
+  },
+  "instance.worlds.no_contact": {
+    "message": "ไม่สามารถติดต่อเซิร์ฟเวอร์ได้"
+  },
+  "instance.worlds.no_server_quick_play": {
+    "message": "คุณสามารถเข้าสู่เซิร์ฟเวอร์ได้โดยตรงบน Minecraft Alpha 1.0.5 ขึ้นไปเท่านั้น"
+  },
+  "instance.worlds.no_singleplayer_quick_play": {
+    "message": "คุณสามารถเข้าสู่โลกผู้เล่นคนเดียวได้โดยตรงบน Minecraft 1.20 ขึ้นไปเท่านั้น"
+  },
+  "instance.worlds.play_instance": {
+    "message": "เริ่มเล่นอินสแตนซ์"
+  },
+  "instance.worlds.view_instance": {
+    "message": "ดูอินสแตนซ์"
+  },
+  "instance.worlds.world_in_use": {
+    "message": "โลกนี้กำลังถูกใช้งานอยู่"
+  },
+  "search.filter.locked.instance": {
+    "message": "อินสแตนซ์เป็นผู้จัดเตรียม"
+  },
+  "search.filter.locked.server": {
+    "message": "เซิร์ฟเวอร์เป็นผู้จัดเตรียม"
+  },
+  "search.filter.locked.server-game-version.title": {
+    "message": "เซิร์ฟเวอร์เป็นผู้จัดเตรียมเวอร์ชันเกม"
  }
 }
@@ -5,6 +5,39 @@
  "app.auth-servers.unreachable.header": {
    "message": "Doğrulama sunucularına erişilemedi"
  },
+  "app.browse.add-server-to-instance": {
+    "message": "Sunucuya içerik ekle"
+  },
+  "app.browse.add-servers-to-instance": {
+    "message": "İçeriğe sunucu ekle"
+  },
+  "app.browse.add-to-instance": {
+    "message": "İçerik ekle"
+  },
+  "app.browse.add-to-instance-name": {
+    "message": "{instanceName} içeriğine ekle"
+  },
+  "app.browse.added": {
+    "message": "Eklendi"
+  },
+  "app.browse.already-added": {
+    "message": "Zaten eklendi"
+  },
+  "app.browse.discover-content": {
+    "message": "İçerikleri keşfet"
+  },
+  "app.browse.discover-servers": {
+    "message": "Sunucuları keşfet"
+  },
+  "app.browse.hide-added-servers": {
+    "message": "Eklenen sunucuları gizle\n"
+  },
+  "app.browse.hide-installed-content": {
+    "message": "Yüklü İçerikleri Gizle"
+  },
+  "app.browse.install-content-to-instance": {
+    "message": "İçeriği profile yükle"
+  },
  "app.export-modal.description-placeholder": {
    "message": "Mod paketi açıklaması yazın..."
  },
@@ -20,33 +53,42 @@
  "app.export-modal.modpack-name-placeholder": {
    "message": "Modpaketi adı"
  },
+  "app.export-modal.select-files-label": {
+    "message": "Pakete dahil edilecek dosya ve klasörleri seçin"
+  },
  "app.export-modal.version-number-label": {
    "message": "Sürüm numarası"
  },
  "app.export-modal.version-number-placeholder": {
    "message": "1.0.0"
  },
+  "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."
+  },
  "app.instance.confirm-delete.admonition-header": {
    "message": "Bu eylem geri alınamaz"
  },
-  "app.instance.modpack-already-installed.create-anyway": {
-    "message": "Yinede oluştur"
+  "app.instance.confirm-delete.delete-button": {
+    "message": "İçeriği Sil"
+  },
+  "app.instance.confirm-delete.header": {
+    "message": "İçeriği Sil"
+  },
+  "app.instance.modpack-already-installed.body": {
+    "message": "Bu mod paketi zaten <bold>{instanceName}</bold> örneğinde yüklü. Kopyalamak istediğinizden emin misiniz?"
+  },
+  "app.instance.modpack-already-installed.create": {
+    "message": "Oluştur"
  },
  "app.instance.modpack-already-installed.header": {
    "message": "Modpaketi zaten kurulu"
  },
+  "app.instance.modpack-already-installed.instance": {
+    "message": "İçerik"
+  },
  "app.instance.mods.content-type-project": {
    "message": "proje"
  },
-  "app.instance.mods.copy-link": {
-    "message": "Bağlantıyı kopyala"
-  },
-  "app.instance.mods.installing": {
-    "message": "Kuruluyor..."
-  },
-  "app.instance.mods.modpack-fallback": {
-    "message": "Modpaketi"
-  },
  "app.instance.mods.project-was-added": {
    "message": "\"{name}\" eklendi"
  },
@@ -56,17 +98,56 @@
  "app.instance.mods.share-text": {
    "message": "Modpaketimde kullandığım projelere göz at!"
  },
-  "app.instance.mods.show-file": {
-    "message": "Dosya göster"
+  "app.instance.mods.share-title": {
+    "message": "Mod paketi içeriğini paylaşıyorsunuz"
  },
  "app.instance.mods.successfully-uploaded": {
    "message": "Başarı ile yüklendi"
  },
-  "app.instance.mods.unknown-version": {
-    "message": "Bilinmeyen"
+  "app.instance.worlds.add-server": {
+    "message": "Sunucu Ekle"
  },
-  "app.instance.mods.updating": {
-    "message": "Güncelleniyor..."
+  "app.instance.worlds.browse-servers": {
+    "message": "Sunucuya göz at"
+  },
+  "app.instance.worlds.delete-world-description": {
+    "message": "'{name}' kalıcı olarak silinecek ve geri getirilmesi mümkün olmayacaktır."
+  },
+  "app.instance.worlds.delete-world-title": {
+    "message": "Bu dünyayı kalıcı olarak silmek istediğinizden emin misiniz?"
+  },
+  "app.instance.worlds.filter-modded": {
+    "message": "Modlu"
+  },
+  "app.instance.worlds.filter-offline": {
+    "message": "Çevrimdışı"
+  },
+  "app.instance.worlds.filter-online": {
+    "message": "Çevrimiçi"
+  },
+  "app.instance.worlds.filter-vanilla": {
+    "message": "Vanilla"
+  },
+  "app.instance.worlds.no-worlds-description": {
+    "message": "Başlamak için bir sunucu ekleyin veya göz atın"
+  },
+  "app.instance.worlds.no-worlds-heading": {
+    "message": "Eklenmiş sunucu veya dünya yok"
+  },
+  "app.instance.worlds.remove-server-description": {
+    "message": "'{name}' oyun içi dahil olmak üzere listenizden kaldırılacak ve geri getirilmesi mümkün olmayacaktır."
+  },
+  "app.instance.worlds.remove-server-description-with-address": {
+    "message": "'{name}' ({address}) oyun içi dahil olmak üzere listenizden kaldırılacak ve geri getirilmesi mümkün olmayacaktır."
+  },
+  "app.instance.worlds.remove-server-title": {
+    "message": "{name} öğesini kaldırmak istediğinizden emin misiniz?"
+  },
+  "app.instance.worlds.search-worlds-placeholder": {
+    "message": "{count} dünya ara..."
+  },
+  "app.instance.worlds.this-server": {
+    "message": "bu sunucu"
  },
  "app.modal.install-to-play.content-required": {
    "message": "İçerik gerekli"
@@ -116,9 +197,6 @@
  "app.settings.tabs.default-instance-options": {
    "message": "Varsayılan profil seçenekleri"
  },
-  "app.settings.tabs.feature-flags": {
-    "message": "Özellik bayrakları"
-  },
  "app.settings.tabs.java-installations": {
    "message": "Java kurulumları"
  },
@@ -173,6 +251,24 @@
  "app.update.reload-to-update": {
    "message": "Güncellemeyi kurmak için yeniden yükleyin"
  },
+  "app.world.server-modal.placeholder-address": {
+    "message": "example.modrinth.gg"
+  },
+  "app.world.server-modal.select-an-option": {
+    "message": "Bir seçenek seçin"
+  },
+  "app.world.world-item.incompatible-version": {
+    "message": "Uyumsuz sürüm {version}"
+  },
+  "app.world.world-item.not-played-yet": {
+    "message": "Henüz oynanmadı"
+  },
+  "app.world.world-item.offline": {
+    "message": "Çevrimdışı"
+  },
+  "app.world.world-item.players-online": {
+    "message": "{count} çevrimiçi"
+  },
  "friends.action.add-friend": {
    "message": "Bir arkadaş ekle"
  },
@@ -272,6 +368,12 @@
  "instance.edit-world.title": {
    "message": "Dünyayı düzenle"
  },
+  "instance.files.adding-files": {
+    "message": "Dosyalar ekleniyor ({completed}/{total})"
+  },
+  "instance.files.save-as": {
+    "message": "Farklı kaydet..."
+  },
  "instance.server-modal.address": {
    "message": "Adres"
  },
@@ -443,9 +545,6 @@
  "instance.worlds.dont_show_on_home": {
    "message": "Ana sayfada gösterme"
  },
-  "instance.worlds.filter.available": {
-    "message": "Kullanılabilir"
-  },
  "instance.worlds.game_already_open": {
    "message": "Bu kurulum zaten açık"
  },
@@ -470,12 +569,6 @@
  "instance.worlds.play_instance": {
    "message": "Kurulumu oyna"
  },
-  "instance.worlds.type.server": {
-    "message": "Sunucu"
-  },
-  "instance.worlds.type.singleplayer": {
-    "message": "Tek Oyunculu"
-  },
  "instance.worlds.view_instance": {
    "message": "Kurulumu gör"
  },
@@ -5,6 +5,39 @@
  "app.auth-servers.unreachable.header": {
    "message": "Не вдається зв’язатися зі серверами автентифікації"
  },
+  "app.browse.add-server-to-instance": {
+    "message": "Додати сервер до профілю"
+  },
+  "app.browse.add-servers-to-instance": {
+    "message": "Додати сервера до вашого профілю"
+  },
+  "app.browse.add-to-instance": {
+    "message": "Додати до профілю"
+  },
+  "app.browse.add-to-instance-name": {
+    "message": "Додати до «{instanceName}»"
+  },
+  "app.browse.added": {
+    "message": "Додано"
+  },
+  "app.browse.already-added": {
+    "message": "Уже додано"
+  },
+  "app.browse.discover-content": {
+    "message": "Дослідити вміст"
+  },
+  "app.browse.discover-servers": {
+    "message": "Дослідити сервера"
+  },
+  "app.browse.hide-added-servers": {
+    "message": "Сховати додані сервера"
+  },
+  "app.browse.hide-installed-content": {
+    "message": "Сховати встановлений уміст"
+  },
+  "app.browse.install-content-to-instance": {
+    "message": "Установити вміст в профіль"
+  },
  "app.export-modal.description-placeholder": {
    "message": "Уведіть опис збірки…"
  },
@@ -41,33 +74,21 @@
  "app.instance.confirm-delete.header": {
    "message": "Видалити профіль"
  },
-  "app.instance.modpack-already-installed.admonition-body": {
-    "message": "Цю збірку вже встановлено в профілі «{instanceName}»."
+  "app.instance.modpack-already-installed.body": {
+    "message": "Ця збірка вже встановлена в профілі <bold>«{instanceName}»</bold>. Ви впевнені, що хочете її скопіювати?"
  },
-  "app.instance.modpack-already-installed.admonition-header": {
-    "message": "Дублікат збірки"
-  },
-  "app.instance.modpack-already-installed.create-anyway": {
-    "message": "Все одно створити"
-  },
-  "app.instance.modpack-already-installed.go-to-instance": {
-    "message": "Перейти до профілю"
+  "app.instance.modpack-already-installed.create": {
+    "message": "Створити"
  },
  "app.instance.modpack-already-installed.header": {
    "message": "Збірку вже встановлено"
  },
+  "app.instance.modpack-already-installed.instance": {
+    "message": "Профіль"
+  },
  "app.instance.mods.content-type-project": {
    "message": "проєкт"
  },
-  "app.instance.mods.copy-link": {
-    "message": "Копіювати посилання"
-  },
-  "app.instance.mods.installing": {
-    "message": "Установлення…"
-  },
-  "app.instance.mods.modpack-fallback": {
-    "message": "Збірка"
-  },
  "app.instance.mods.project-was-added": {
    "message": "«{name}» було додано"
  },
@@ -80,17 +101,53 @@
  "app.instance.mods.share-title": {
    "message": "Поширення вмісту збірки"
  },
-  "app.instance.mods.show-file": {
-    "message": "Показати файл"
-  },
  "app.instance.mods.successfully-uploaded": {
    "message": "Успішно вивантажено"
  },
-  "app.instance.mods.unknown-version": {
-    "message": "Невідомо"
+  "app.instance.worlds.add-server": {
+    "message": "Додати сервер"
  },
-  "app.instance.mods.updating": {
-    "message": "Оновлення…"
+  "app.instance.worlds.browse-servers": {
+    "message": "Переглянути сервера"
+  },
+  "app.instance.worlds.delete-world-description": {
+    "message": "«{name}» буде **назавжди видалено** й у вас не буде можливости відновлення."
+  },
+  "app.instance.worlds.delete-world-title": {
+    "message": "Ви впевнені, що хочете назавжди видалити цей світ?"
+  },
+  "app.instance.worlds.filter-modded": {
+    "message": "Модифікований"
+  },
+  "app.instance.worlds.filter-offline": {
+    "message": "Поза мережею"
+  },
+  "app.instance.worlds.filter-online": {
+    "message": "У мережі"
+  },
+  "app.instance.worlds.filter-vanilla": {
+    "message": "Ванільний"
+  },
+  "app.instance.worlds.no-worlds-description": {
+    "message": "Додати сервер або переглянути, щоб почати"
+  },
+  "app.instance.worlds.no-worlds-heading": {
+    "message": "Сервера або світи не додано"
+  },
+  "app.instance.worlds.remove-server-description": {
+    "message": "«{name}» буде видалено з вашого списку, включно в грі, і без можливости відновлення."
+  },
+  "app.instance.worlds.remove-server-description-with-address": {
+    "message": "«{name}» ({address}) буде видалено з вашого списку, включно в грі, і без можливости відновлення."
+  },
+  "app.instance.worlds.remove-server-title": {
+    "message": "Ви впевнені, що хочете видалити «{name}»?"
+  },
+  "app.instance.worlds.search-worlds-placeholder": {
+    "message": "Пошук {count} світів…"
+  },
+  "app.instance.worlds.this-server": {
+    "message": "цей сервер"
  },
  "app.modal.install-to-play.content-required": {
    "message": "Потрібний уміст"
@@ -140,9 +197,6 @@
  "app.settings.tabs.default-instance-options": {
    "message": "Усталені налашт. профілю"
  },
-  "app.settings.tabs.feature-flags": {
-    "message": "Спеціальні функції"
-  },
  "app.settings.tabs.java-installations": {
    "message": "Інсталяції Java"
  },
@@ -197,6 +251,24 @@
  "app.update.reload-to-update": {
    "message": "Перезавантажте, щоб установити оновлення"
  },
+  "app.world.server-modal.placeholder-address": {
+    "message": "example.modrinth.gg"
+  },
+  "app.world.server-modal.select-an-option": {
+    "message": "Виберіть опцію"
+  },
+  "app.world.world-item.incompatible-version": {
+    "message": "Несумісна версія {version}"
+  },
+  "app.world.world-item.not-played-yet": {
+    "message": "Ще не зіграно"
+  },
+  "app.world.world-item.offline": {
+    "message": "Поза мережею"
+  },
+  "app.world.world-item.players-online": {
+    "message": "{count} у мережі"
+  },
  "friends.action.add-friend": {
    "message": "Додати друга"
  },
@@ -296,6 +368,12 @@
  "instance.edit-world.title": {
    "message": "Редагувати світ"
  },
+  "instance.files.adding-files": {
+    "message": "Додавання файлів ({completed}/{total})"
+  },
+  "instance.files.save-as": {
+    "message": "Зберегти як…"
+  },
  "instance.server-modal.address": {
    "message": "Адреса"
  },
@@ -467,9 +545,6 @@
  "instance.worlds.dont_show_on_home": {
    "message": "Не показувати на головній"
  },
-  "instance.worlds.filter.available": {
-    "message": "Доступно"
-  },
  "instance.worlds.game_already_open": {
    "message": "Профіль вже запущений"
  },
@@ -494,12 +569,6 @@
  "instance.worlds.play_instance": {
    "message": "Грати у профіль"
  },
-  "instance.worlds.type.server": {
-    "message": "Сервер"
-  },
-  "instance.worlds.type.singleplayer": {
-    "message": "Гра наодинці"
-  },
  "instance.worlds.view_instance": {
    "message": "Переглянути профіль"
  },
@@ -5,6 +5,39 @@
  "app.auth-servers.unreachable.header": {
    "message": "Không thể kết nối đến máy chủ xác thực"
  },
+  "app.browse.add-server-to-instance": {
+    "message": "Thêm máy chủ vào hồ sơ"
+  },
+  "app.browse.add-servers-to-instance": {
+    "message": "Thêm máy chủ vào hồ sơ của bạn"
+  },
+  "app.browse.add-to-instance": {
+    "message": "Thêm vào hồ sơ"
+  },
+  "app.browse.add-to-instance-name": {
+    "message": "Thêm vào {instanceName}"
+  },
+  "app.browse.added": {
+    "message": "Đã thêm"
+  },
+  "app.browse.already-added": {
+    "message": "Đã được thêm"
+  },
+  "app.browse.discover-content": {
+    "message": "Khám phá nội dung"
+  },
+  "app.browse.discover-servers": {
+    "message": "Khám phá máy chủ"
+  },
+  "app.browse.hide-added-servers": {
+    "message": "Ẩn các máy chủ đã thêm"
+  },
+  "app.browse.hide-installed-content": {
+    "message": "Ẩn các nội dung đã được tải xuống"
+  },
+  "app.browse.install-content-to-instance": {
+    "message": "Tải nội dung này vào hồ sơ"
+  },
  "app.export-modal.description-placeholder": {
    "message": "Thêm miêu tả cho gói modpack..."
  },
@@ -41,33 +74,21 @@
  "app.instance.confirm-delete.header": {
    "message": "Xoá hồ sơ"
  },
-  "app.instance.modpack-already-installed.admonition-body": {
-    "message": "Modpack này đã được cài đặt trong phiên chơi \"{instanceName}\"."
+  "app.instance.modpack-already-installed.body": {
+    "message": "Gói modpack này đã được cài đặt trong hồ sơ <bold>{instanceName}</bold> rồi. Bạn có chắc chắn muốn sao chép nó không?"
  },
-  "app.instance.modpack-already-installed.admonition-header": {
-    "message": "Nhân bản modpack"
-  },
-  "app.instance.modpack-already-installed.create-anyway": {
-    "message": "Vẫn tiếp tục tạo"
-  },
-  "app.instance.modpack-already-installed.go-to-instance": {
-    "message": "Đi đến phiên chơi"
+  "app.instance.modpack-already-installed.create": {
+    "message": "Khởi tạo"
  },
  "app.instance.modpack-already-installed.header": {
    "message": "Modpack đã được cài đặt"
  },
+  "app.instance.modpack-already-installed.instance": {
+    "message": "Hồ sơ"
+  },
  "app.instance.mods.content-type-project": {
    "message": "Dự án"
  },
-  "app.instance.mods.copy-link": {
-    "message": "Sao chép liên kết"
-  },
-  "app.instance.mods.installing": {
-    "message": "Đang tải xuống..."
-  },
-  "app.instance.mods.modpack-fallback": {
-    "message": "Modpack"
-  },
  "app.instance.mods.project-was-added": {
    "message": "\"{name}\" đã được thêm"
  },
@@ -80,17 +101,53 @@
  "app.instance.mods.share-title": {
    "message": "Chia sẻ hồ sơ modpack"
  },
-  "app.instance.mods.show-file": {
-    "message": "Hiện tệp"
-  },
  "app.instance.mods.successfully-uploaded": {
    "message": "Tải lên thành công"
  },
-  "app.instance.mods.unknown-version": {
-    "message": "Không rõ"
+  "app.instance.worlds.add-server": {
+    "message": "Thêm máy chủ"
  },
-  "app.instance.mods.updating": {
-    "message": "Đang cập nhật..."
+  "app.instance.worlds.browse-servers": {
+    "message": "Tìm kiếm máy chủ"
+  },
+  "app.instance.worlds.delete-world-description": {
+    "message": "'{name}' sẽ bị **xóa vĩnh viễn** và không có cách nào khôi phục lại."
+  },
+  "app.instance.worlds.delete-world-title": {
+    "message": "Bạn có chắc cắn rằng bạn muốn xoá vĩnh viễn thế giới này không?"
+  },
+  "app.instance.worlds.filter-modded": {
+    "message": "Modded"
+  },
+  "app.instance.worlds.filter-offline": {
+    "message": "Ngoại tuyến"
+  },
+  "app.instance.worlds.filter-online": {
+    "message": "Trực tuyến"
+  },
+  "app.instance.worlds.filter-vanilla": {
+    "message": "Vanilla"
+  },
+  "app.instance.worlds.no-worlds-description": {
+    "message": "Thêm một máy chủ hoặc tìm kiếm để bắt đầu"
+  },
+  "app.instance.worlds.no-worlds-heading": {
+    "message": "Không có máy chủ hay thế giới nào đã được thêm"
+  },
+  "app.instance.worlds.remove-server-description": {
+    "message": "'{name}' sẽ bị xóa khỏi danh sách của bạn, kể cả trong game, và bạn sẽ không có cách nào để khôi phục lại."
+  },
+  "app.instance.worlds.remove-server-description-with-address": {
+    "message": "'{name}' ({address}) sẽ bị xóa khỏi danh sách của bạn, kể cả trong game, và bạn sẽ không có cách nào để khôi phục lại."
+  },
+  "app.instance.worlds.remove-server-title": {
+    "message": "Bạn có chắc chắn rằng bạn muốn xoá {name}?"
+  },
+  "app.instance.worlds.search-worlds-placeholder": {
+    "message": "Tìm kiếm {count} world..."
+  },
+  "app.instance.worlds.this-server": {
+    "message": "Máy chủ này"
  },
  "app.modal.install-to-play.content-required": {
    "message": "Nội dung bắt buộc"
@@ -140,9 +197,6 @@
  "app.settings.tabs.default-instance-options": {
    "message": "Tuỳ chọn hồ sơ khởi chạy mặc định"
  },
-  "app.settings.tabs.feature-flags": {
-    "message": "Các cờ tính năng"
-  },
  "app.settings.tabs.java-installations": {
    "message": "Các bản cài Java"
  },
@@ -197,6 +251,24 @@
  "app.update.reload-to-update": {
    "message": "Hãy khởi động lại để cài đặt bản cập nhật"
  },
+  "app.world.server-modal.placeholder-address": {
+    "message": "example.modrinth.gg"
+  },
+  "app.world.server-modal.select-an-option": {
+    "message": "Chọn một tuỳ chọn"
+  },
+  "app.world.world-item.incompatible-version": {
+    "message": "Không phù hợp với phiên bản {version}"
+  },
+  "app.world.world-item.not-played-yet": {
+    "message": "Chưa từng được chơi"
+  },
+  "app.world.world-item.offline": {
+    "message": "Ngoại tuyến"
+  },
+  "app.world.world-item.players-online": {
+    "message": "{count} đang trực tuyến"
+  },
  "friends.action.add-friend": {
    "message": "Thêm một người bạn"
  },
@@ -296,6 +368,12 @@
  "instance.edit-world.title": {
    "message": "Chỉnh sửa thế giới"
  },
+  "instance.files.adding-files": {
+    "message": "Đang thêm dữ liệu ({completed}/{total})"
+  },
+  "instance.files.save-as": {
+    "message": "Lưu như..."
+  },
  "instance.server-modal.address": {
    "message": "Địa chỉ"
  },
@@ -467,9 +545,6 @@
  "instance.worlds.dont_show_on_home": {
    "message": "Không hiện ở Trang chủ"
  },
-  "instance.worlds.filter.available": {
-    "message": "Có sẵn"
-  },
  "instance.worlds.game_already_open": {
    "message": "Bản này đã mở sẵn"
  },
@@ -494,12 +569,6 @@
  "instance.worlds.play_instance": {
    "message": "Chơi phiên bản này"
  },
-  "instance.worlds.type.server": {
-    "message": "Máy chủ"
-  },
-  "instance.worlds.type.singleplayer": {
-    "message": "Chế độ một người chơi"
-  },
  "instance.worlds.view_instance": {
    "message": "Xem phiên bản"
  },
@@ -5,6 +5,39 @@
  "app.auth-servers.unreachable.header": {
    "message": "无法连接到身份验证服务器"
  },
+  "app.browse.add-server-to-instance": {
+    "message": "将服务器添加到实例"
+  },
+  "app.browse.add-servers-to-instance": {
+    "message": "将服务器添加到你的实例"
+  },
+  "app.browse.add-to-instance": {
+    "message": "添加到实例"
+  },
+  "app.browse.add-to-instance-name": {
+    "message": "添加到 {instanceName}"
+  },
+  "app.browse.added": {
+    "message": "已添加"
+  },
+  "app.browse.already-added": {
+    "message": "已添加过"
+  },
+  "app.browse.discover-content": {
+    "message": "发现内容"
+  },
+  "app.browse.discover-servers": {
+    "message": "发现服务器"
+  },
+  "app.browse.hide-added-servers": {
+    "message": "隐藏已添加的服务器"
+  },
+  "app.browse.hide-installed-content": {
+    "message": "隐藏已安装的实例"
+  },
+  "app.browse.install-content-to-instance": {
+    "message": "将内容安装到实例中"
+  },
  "app.export-modal.description-placeholder": {
    "message": "输入整合包描述……"
  },
@@ -41,33 +74,21 @@
  "app.instance.confirm-delete.header": {
    "message": "删除实例"
  },
-  "app.instance.modpack-already-installed.admonition-body": {
-    "message": "这个整合包已经安装在\"{instanceName}\"实例中了。"
+  "app.instance.modpack-already-installed.body": {
+    "message": "该整合包已经被安装到实例<bold>{instanceName}</bold>中了。你确定要重复安装吗？"
  },
-  "app.instance.modpack-already-installed.admonition-header": {
-    "message": "重复的整合包"
-  },
-  "app.instance.modpack-already-installed.create-anyway": {
-    "message": "在任何地方创建"
-  },
-  "app.instance.modpack-already-installed.go-to-instance": {
-    "message": "前往实例"
+  "app.instance.modpack-already-installed.create": {
+    "message": "创建"
  },
  "app.instance.modpack-already-installed.header": {
    "message": "整合包已安装"
  },
+  "app.instance.modpack-already-installed.instance": {
+    "message": "实例"
+  },
  "app.instance.mods.content-type-project": {
    "message": "项目"
  },
-  "app.instance.mods.copy-link": {
-    "message": "复制链接"
-  },
-  "app.instance.mods.installing": {
-    "message": "正在安装……"
-  },
-  "app.instance.mods.modpack-fallback": {
-    "message": "整合包"
-  },
  "app.instance.mods.project-was-added": {
    "message": "已添加“{name}”"
  },
@@ -80,17 +101,53 @@
  "app.instance.mods.share-title": {
    "message": "分享整合包内容"
  },
-  "app.instance.mods.show-file": {
-    "message": "显示文件"
-  },
  "app.instance.mods.successfully-uploaded": {
    "message": "上传成功"
  },
-  "app.instance.mods.unknown-version": {
-    "message": "未知"
+  "app.instance.worlds.add-server": {
+    "message": "添加服务器"
  },
-  "app.instance.mods.updating": {
-    "message": "更新中……"
+  "app.instance.worlds.browse-servers": {
+    "message": "浏览服务器"
+  },
+  "app.instance.worlds.delete-world-description": {
+    "message": "“{name}”将被**永久删除**，并且无法恢复。"
+  },
+  "app.instance.worlds.delete-world-title": {
+    "message": "你确定要永久删除这个世界吗？"
+  },
+  "app.instance.worlds.filter-modded": {
+    "message": "修改版"
+  },
+  "app.instance.worlds.filter-offline": {
+    "message": "离线"
+  },
+  "app.instance.worlds.filter-online": {
+    "message": "在线"
+  },
+  "app.instance.worlds.filter-vanilla": {
+    "message": "原版"
+  },
+  "app.instance.worlds.no-worlds-description": {
+    "message": "添加一个服务器或点击浏览来开始"
+  },
+  "app.instance.worlds.no-worlds-heading": {
+    "message": "未添加服务器或世界"
+  },
+  "app.instance.worlds.remove-server-description": {
+    "message": "将从你的列表中删除“{name}”，包括游戏内，并且无法恢复。"
+  },
+  "app.instance.worlds.remove-server-description-with-address": {
+    "message": "将从你的列表中删除“{name}”（{address}），包括游戏内，并且无法恢复。"
+  },
+  "app.instance.worlds.remove-server-title": {
+    "message": "你确定要删除 {name} 吗？"
+  },
+  "app.instance.worlds.search-worlds-placeholder": {
+    "message": "搜索 {count} 个世界……"
+  },
+  "app.instance.worlds.this-server": {
+    "message": "此服务器"
  },
  "app.modal.install-to-play.content-required": {
    "message": "内容需求"
@@ -140,9 +197,6 @@
  "app.settings.tabs.default-instance-options": {
    "message": "默认实例选项"
  },
-  "app.settings.tabs.feature-flags": {
-    "message": "功能开关"
-  },
  "app.settings.tabs.java-installations": {
    "message": "Java 管理"
  },
@@ -197,6 +251,24 @@
  "app.update.reload-to-update": {
    "message": "重启以安装更新"
  },
+  "app.world.server-modal.placeholder-address": {
+    "message": "example.modrinth.gg"
+  },
+  "app.world.server-modal.select-an-option": {
+    "message": "选择一个选项"
+  },
+  "app.world.world-item.incompatible-version": {
+    "message": "不兼容的版本 {version}"
+  },
+  "app.world.world-item.not-played-yet": {
+    "message": "暂未游玩"
+  },
+  "app.world.world-item.offline": {
+    "message": "离线"
+  },
+  "app.world.world-item.players-online": {
+    "message": "{count} 人在线"
+  },
  "friends.action.add-friend": {
    "message": "添加好友"
  },
@@ -213,7 +285,7 @@
    "message": "这可能与对方的 Minecraft 用户名不同！"
  },
  "friends.add-friend.username.placeholder": {
-    "message": "输入 Modrinth 用户名…"
+    "message": "输入 Modrinth 用户名……"
  },
  "friends.add-friend.username.title": {
    "message": "你好友的 Modrinth 用户名是什么？"
@@ -296,6 +368,12 @@
  "instance.edit-world.title": {
    "message": "编辑存档"
  },
+  "instance.files.adding-files": {
+    "message": "正在添加文件（{completed}/{total}）"
+  },
+  "instance.files.save-as": {
+    "message": "保存为……"
+  },
  "instance.server-modal.address": {
    "message": "地址"
  },
@@ -467,9 +545,6 @@
  "instance.worlds.dont_show_on_home": {
    "message": "在主界面隐藏"
  },
-  "instance.worlds.filter.available": {
-    "message": "可用"
-  },
  "instance.worlds.game_already_open": {
    "message": "实例已启动"
  },
@@ -494,12 +569,6 @@
  "instance.worlds.play_instance": {
    "message": "游玩实例"
  },
-  "instance.worlds.type.server": {
-    "message": "服务器"
-  },
-  "instance.worlds.type.singleplayer": {
-    "message": "单人游戏"
-  },
  "instance.worlds.view_instance": {
    "message": "查看实例"
  },
@@ -5,6 +5,39 @@
  "app.auth-servers.unreachable.header": {
    "message": "無法連線到驗證伺服器"
  },
+  "app.browse.add-server-to-instance": {
+    "message": "新增此伺服器到實例中"
+  },
+  "app.browse.add-servers-to-instance": {
+    "message": "新增伺服器到實例中"
+  },
+  "app.browse.add-to-instance": {
+    "message": "新增至實例"
+  },
+  "app.browse.add-to-instance-name": {
+    "message": "新增到 {instanceName}"
+  },
+  "app.browse.added": {
+    "message": "已新增"
+  },
+  "app.browse.already-added": {
+    "message": "已新增"
+  },
+  "app.browse.discover-content": {
+    "message": "探索內容"
+  },
+  "app.browse.discover-servers": {
+    "message": "探索伺服器"
+  },
+  "app.browse.hide-added-servers": {
+    "message": "隱藏已新增的伺服器"
+  },
+  "app.browse.hide-installed-content": {
+    "message": "隱藏已安裝的內容"
+  },
+  "app.browse.install-content-to-instance": {
+    "message": "安裝至實例中"
+  },
  "app.export-modal.description-placeholder": {
    "message": "輸入模組包描述..."
  },
@@ -41,33 +74,21 @@
  "app.instance.confirm-delete.header": {
    "message": "刪除實例"
  },
-  "app.instance.modpack-already-installed.admonition-body": {
-    "message": "這個模組包已經安裝在「{instanceName}」實例中了。"
+  "app.instance.modpack-already-installed.body": {
+    "message": "此模組包已經安裝在<bold>{instanceName}</bold> 實例中了，您確定要再次安裝嗎？"
  },
-  "app.instance.modpack-already-installed.admonition-header": {
-    "message": "複製模組包"
-  },
-  "app.instance.modpack-already-installed.create-anyway": {
-    "message": "仍要建立"
-  },
-  "app.instance.modpack-already-installed.go-to-instance": {
-    "message": "前往實例"
+  "app.instance.modpack-already-installed.create": {
+    "message": "建立"
  },
  "app.instance.modpack-already-installed.header": {
    "message": "模組包已經安裝"
  },
+  "app.instance.modpack-already-installed.instance": {
+    "message": "實例"
+  },
  "app.instance.mods.content-type-project": {
    "message": "專案"
  },
-  "app.instance.mods.copy-link": {
-    "message": "複製連結"
-  },
-  "app.instance.mods.installing": {
-    "message": "安裝中..."
-  },
-  "app.instance.mods.modpack-fallback": {
-    "message": "模組包"
-  },
  "app.instance.mods.project-was-added": {
    "message": "新增了「{name}」"
  },
@@ -80,17 +101,53 @@
  "app.instance.mods.share-title": {
    "message": "分享模組包內容"
  },
-  "app.instance.mods.show-file": {
-    "message": "顯示檔案"
-  },
  "app.instance.mods.successfully-uploaded": {
    "message": "上傳成功"
  },
-  "app.instance.mods.unknown-version": {
-    "message": "未知"
+  "app.instance.worlds.add-server": {
+    "message": "新增伺服器"
  },
-  "app.instance.mods.updating": {
-    "message": "更新中..."
+  "app.instance.worlds.browse-servers": {
+    "message": "瀏覽伺服器"
+  },
+  "app.instance.worlds.delete-world-description": {
+    "message": "「{name}」將會被**永久刪除**，且無法還原。"
+  },
+  "app.instance.worlds.delete-world-title": {
+    "message": "你確定要永久刪除這個世界嗎？"
+  },
+  "app.instance.worlds.filter-modded": {
+    "message": "模組"
+  },
+  "app.instance.worlds.filter-offline": {
+    "message": "離線"
+  },
+  "app.instance.worlds.filter-online": {
+    "message": "線上"
+  },
+  "app.instance.worlds.filter-vanilla": {
+    "message": "原版"
+  },
+  "app.instance.worlds.no-worlds-description": {
+    "message": "新增伺服器或瀏覽以開始使用"
+  },
+  "app.instance.worlds.no-worlds-heading": {
+    "message": "未新增任何伺服器或世界"
+  },
+  "app.instance.worlds.remove-server-description": {
+    "message": "「{name}」將從你的清單中移除（包含遊戲內），且無法還原。"
+  },
+  "app.instance.worlds.remove-server-description-with-address": {
+    "message": "「{name}」({address}) 將從你的清單中移除（包含遊戲內），且無法還原。"
+  },
+  "app.instance.worlds.remove-server-title": {
+    "message": "你確定要移除「{name}」嗎？"
+  },
+  "app.instance.worlds.search-worlds-placeholder": {
+    "message": "搜尋 {count} 個世界..."
+  },
+  "app.instance.worlds.this-server": {
+    "message": "這個伺服器"
  },
  "app.modal.install-to-play.content-required": {
    "message": "所需內容"
@@ -140,9 +197,6 @@
  "app.settings.tabs.default-instance-options": {
    "message": "預設實例選項"
  },
-  "app.settings.tabs.feature-flags": {
-    "message": "功能開關"
-  },
  "app.settings.tabs.java-installations": {
    "message": "Java 安裝"
  },
@@ -197,6 +251,24 @@
  "app.update.reload-to-update": {
    "message": "重新載入即可安裝更新"
  },
+  "app.world.server-modal.placeholder-address": {
+    "message": "example.modrinth.gg"
+  },
+  "app.world.server-modal.select-an-option": {
+    "message": "選擇選項"
+  },
+  "app.world.world-item.incompatible-version": {
+    "message": "不相容的版本 {version}"
+  },
+  "app.world.world-item.not-played-yet": {
+    "message": "尚未遊玩"
+  },
+  "app.world.world-item.offline": {
+    "message": "離線"
+  },
+  "app.world.world-item.players-online": {
+    "message": "{count} 人在線上"
+  },
  "friends.action.add-friend": {
    "message": "新增好友"
  },
@@ -296,6 +368,12 @@
  "instance.edit-world.title": {
    "message": "編輯世界"
  },
+  "instance.files.adding-files": {
+    "message": "正在新增檔案 ({completed}/{total})"
+  },
+  "instance.files.save-as": {
+    "message": "另存新檔..."
+  },
  "instance.server-modal.address": {
    "message": "位址"
  },
@@ -467,9 +545,6 @@
  "instance.worlds.dont_show_on_home": {
    "message": "不要在首頁顯示"
  },
-  "instance.worlds.filter.available": {
-    "message": "可用"
-  },
  "instance.worlds.game_already_open": {
    "message": "實例已經開啟"
  },
@@ -494,12 +569,6 @@
  "instance.worlds.play_instance": {
    "message": "遊戲實例"
  },
-  "instance.worlds.type.server": {
-    "message": "伺服器"
-  },
-  "instance.worlds.type.singleplayer": {
-    "message": "單人遊戲"
-  },
  "instance.worlds.view_instance": {
    "message": "檢視實例"
  },
@@ -0,0 +1,26 @@
+<script setup lang="ts">
+import type { Labrinth } from '@modrinth/api-client'
+import { injectModrinthClient, ServersManagePageIndex } from '@modrinth/ui'
+import { useQuery } from '@tanstack/vue-query'
+import { computed } from 'vue'
+
+import { config } from '../config'
+
+const stripePublishableKey = (config.stripePublishableKey as string) || ''
+
+const client = injectModrinthClient()
+
+const { data: products } = useQuery({
+	queryKey: ['billing', 'products'],
+	queryFn: () => client.labrinth.billing_internal.getProducts(),
+})
+
+const resolvedProducts = computed<Labrinth.Billing.Internal.Product[]>(() => products.value ?? [])
+</script>
+
+<template>
+	<ServersManagePageIndex
+		:stripe-publishable-key="stripePublishableKey"
+		:products="resolvedProducts"
+	/>
+</template>
@@ -0,0 +1,9 @@
+<script setup lang="ts">
+import { injectModrinthServerContext, ServersManageBackupsPage } from '@modrinth/ui'
+
+const { isServerRunning } = injectModrinthServerContext()
+</script>
+
+<template>
+	<ServersManageBackupsPage :is-server-running="isServerRunning" />
+</template>
@@ -0,0 +1,7 @@
+<script setup lang="ts">
+import { ServersManageContentPage } from '@modrinth/ui'
+</script>
+
+<template>
+	<ServersManageContentPage />
+</template>
@@ -0,0 +1,7 @@
+<script setup lang="ts">
+import { ServersManageFilesPage } from '@modrinth/ui'
+</script>
+
+<template>
+	<ServersManageFilesPage />
+</template>
@@ -0,0 +1,113 @@
+<template>
+	<div class="h-full w-full py-6">
+		<ServersManageRootLayout
+			:server-id="serverId"
+			:reload-page="() => router.go(0)"
+			:resolve-viewer="resolveViewer"
+			:show-copy-id-action="themeStore.devMode"
+			:navigate-to-billing="() => openUrl('https://modrinth.com/settings/billing')"
+			:navigate-to-servers="() => router.push('/hosting/manage')"
+			:browse-modpacks="
+				({ serverId: sid, worldId: wid, from }) => {
+					router.push({
+						path: '/browse/modpack',
+						query: { sid, wid: wid ?? undefined, from },
+					})
+				}
+			"
+			:browse-content="
+				({ serverId: sid, worldId: wid, type }) => {
+					router.push({
+						path: `/browse/${type}`,
+						query: { sid, wid: wid ?? undefined },
+					})
+				}
+			"
+		>
+			<template #default="{ onReinstall, onReinstallFailed }">
+				<RouterView v-slot="{ Component }">
+					<template v-if="Component">
+						<Suspense>
+							<component
+								:is="Component"
+								@reinstall="onReinstall"
+								@reinstall-failed="onReinstallFailed"
+							/>
+							<template #fallback>
+								<LoadingIndicator />
+							</template>
+						</Suspense>
+					</template>
+				</RouterView>
+			</template>
+		</ServersManageRootLayout>
+	</div>
+</template>
+
+<script setup lang="ts">
+import type { Archon, Labrinth } from '@modrinth/api-client'
+import { injectAuth, LoadingIndicator, ServersManageRootLayout } from '@modrinth/ui'
+import { useQuery } from '@tanstack/vue-query'
+import { openUrl } from '@tauri-apps/plugin-opener'
+import { computed, watch } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+
+import { get_user } from '@/helpers/cache'
+import { get as getCreds } from '@/helpers/mr_auth'
+import { useBreadcrumbs } from '@/store/breadcrumbs'
+import { useTheming } from '@/store/theme'
+
+const route = useRoute()
+const router = useRouter()
+const auth = injectAuth()
+const themeStore = useTheming()
+const breadcrumbs = useBreadcrumbs()
+
+const serverId = computed(() => {
+	const rawId = route.params.id
+	return Array.isArray(rawId) ? rawId[0] : (rawId ?? '')
+})
+
+const { data: serverData } = useQuery({
+	queryKey: computed(() => ['servers', 'detail', serverId.value]),
+	queryFn: () => null as unknown as Archon.Servers.v0.Server,
+	enabled: false,
+})
+
+watch(
+	serverData,
+	(server) => {
+		if (server?.name) {
+			breadcrumbs.setName('Server', server.name)
+			breadcrumbs.setContext({
+				name: server.name,
+				link: `/hosting/manage/${serverId.value}/content`,
+			})
+		}
+	},
+	{ immediate: true },
+)
+
+watch(
+	() => auth.user.value,
+	(user, previousUser) => {
+		if (user || !previousUser) return
+		if (route.path === '/hosting/manage' || route.path === '/hosting/manage/') return
+		void router.replace('/hosting/manage')
+	},
+)
+
+async function resolveViewer(): Promise<{ userId: string | null; userRole: string | null }> {
+	const credentials = await getCreds().catch(() => null)
+	if (!credentials?.user_id) {
+		return { userId: null, userRole: null }
+	}
+
+	const user = await get_user(credentials.user_id, 'bypass').catch(() => null)
+	const typedUser = user as Labrinth.Users.v2.User | null
+	return {
+		userId: credentials.user_id,
+		userRole: typedUser?.role ?? null,
+	}
+}
+</script>
@@ -0,0 +1,7 @@
+<script setup lang="ts">
+import { ServersManageOverviewPage } from '@modrinth/ui'
+</script>
+
+<template>
+	<ServersManageOverviewPage />
+</template>
@@ -0,0 +1,7 @@
+import Backups from './Backups.vue'
+import Content from './Content.vue'
+import Files from './Files.vue'
+import Index from './Index.vue'
+import Overview from './Overview.vue'
+
+export { Backups, Content, Files, Index, Overview }
@@ -1,6 +1,7 @@
 import Browse from './Browse.vue'
 import Index from './Index.vue'
+import Servers from './Servers.vue'
 import Skins from './Skins.vue'
 import Worlds from './Worlds.vue'

-export { Browse, Index, Skins, Worlds }
+export { Browse, Index, Servers, Skins, Worlds }
@@ -0,0 +1,345 @@
+<script setup lang="ts">
+import type { EditingFile, FileItem, UploadState } from '@modrinth/ui'
+import {
+	commonMessages,
+	defineMessages,
+	FilePageLayout,
+	injectNotificationManager,
+	provideFileManager,
+	useDebugLogger,
+	useVIntl,
+} from '@modrinth/ui'
+import { invoke } from '@tauri-apps/api/core'
+import {
+	mkdir,
+	readDir,
+	readFile as readFileBytes,
+	readTextFile,
+	remove,
+	rename,
+	stat,
+	writeFile as writeFileBytes,
+	writeTextFile,
+} from '@tauri-apps/plugin-fs'
+import { onUnmounted, ref, watch } from 'vue'
+
+import { profile_listener } from '@/helpers/events'
+import { get_full_path } from '@/helpers/profile'
+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
+}>()
+
+const { formatMessage } = useVIntl()
+const { addNotification } = injectNotificationManager()
+const debug = useDebugLogger('Files')
+
+const messages = defineMessages({
+	saveAs: {
+		id: 'instance.files.save-as',
+		defaultMessage: 'Save as...',
+	},
+	addingFiles: {
+		id: 'instance.files.adding-files',
+		defaultMessage: 'Adding files ({completed}/{total})',
+	},
+})
+
+const instanceRoot = ref('')
+const items = ref<FileItem[]>([])
+const loading = ref(true)
+const error = ref<Error | null>(null)
+const currentPath = ref('')
+const editingFile = ref<EditingFile | null>(null)
+
+debug('setup: start, instance.path =', props.instance.path)
+
+instanceRoot.value = await get_full_path(props.instance.path)
+debug('setup: instanceRoot =', instanceRoot.value)
+await refresh()
+debug('setup: refresh complete, items =', items.value.length, 'error =', error.value)
+
+function resolvePath(relativePath: string): string {
+	return relativePath ? `${instanceRoot.value}/${relativePath}` : instanceRoot.value
+}
+
+async function listDirectory(dirPath: string): Promise<FileItem[]> {
+	const absPath = resolvePath(dirPath)
+	debug('listDirectory: dirPath =', dirPath, 'absPath =', absPath)
+	const entries = await readDir(absPath)
+	debug('listDirectory: got', entries.length, 'entries')
+
+	const results = await Promise.all(
+		entries.map(async (entry) => {
+			const entryAbsPath = `${absPath}/${entry.name}`
+			let metadata
+			try {
+				metadata = await stat(entryAbsPath)
+			} catch {
+				debug('listDirectory: stat failed for', entry.name, '- skipping')
+				return null
+			}
+			const item: FileItem = {
+				name: entry.name,
+				type: entry.isDirectory ? 'directory' : 'file',
+				path: dirPath ? `${dirPath}/${entry.name}` : entry.name,
+				modified: metadata.mtime ? Math.floor(metadata.mtime.getTime() / 1000) : 0,
+				created: metadata.birthtime ? Math.floor(metadata.birthtime.getTime() / 1000) : 0,
+			}
+			if (!entry.isDirectory) {
+				item.size = metadata.size
+			}
+			if (entry.isDirectory) {
+				try {
+					const children = await readDir(entryAbsPath)
+					item.count = children.length
+				} catch {
+					item.count = 0
+				}
+			}
+			return item
+		}),
+	)
+	return results.filter((item): item is FileItem => item !== null)
+}
+
+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
+	}
+}
+
+function navigateTo(path: string) {
+	debug('navigateTo:', path)
+	currentPath.value = path.startsWith('/') ? path.slice(1) : path
+	refresh()
+}
+
+function startEditing(file: EditingFile) {
+	editingFile.value = file
+}
+
+function stopEditing() {
+	editingFile.value = null
+}
+
+async function handleCreateItem(name: string, type: 'file' | 'directory') {
+	const targetPath = currentPath.value ? `${currentPath.value}/${name}` : name
+	const absPath = resolvePath(targetPath)
+	try {
+		if (type === 'directory') {
+			await mkdir(absPath)
+		} else {
+			await writeTextFile(absPath, '')
+		}
+		await refresh()
+	} catch (e) {
+		addNotification({
+			title: formatMessage(commonMessages.createFailedLabel),
+			text: e instanceof Error ? e.message : '',
+			type: 'error',
+		})
+	}
+}
+
+async function handleRenameItem(path: string, newName: string) {
+	const oldAbs = resolvePath(path)
+	const parentDir = path.includes('/') ? path.substring(0, path.lastIndexOf('/')) : ''
+	const newPath = parentDir ? `${parentDir}/${newName}` : newName
+	const newAbs = resolvePath(newPath)
+	try {
+		await rename(oldAbs, newAbs)
+		await refresh()
+	} catch (e) {
+		addNotification({
+			title: formatMessage(commonMessages.renameFailedLabel),
+			text: e instanceof Error ? e.message : '',
+			type: 'error',
+		})
+	}
+}
+
+async function handleMoveItem(source: string, destination: string) {
+	try {
+		await rename(resolvePath(source), resolvePath(destination))
+		await refresh()
+	} catch (e) {
+		addNotification({
+			title: formatMessage(commonMessages.moveFailedLabel),
+			text: e instanceof Error ? e.message : '',
+			type: 'error',
+		})
+	}
+}
+
+async function handleDeleteItem(path: string, recursive: boolean) {
+	try {
+		await remove(resolvePath(path), { recursive })
+		await refresh()
+	} catch (e) {
+		addNotification({
+			title: formatMessage(commonMessages.deleteFailedLabel),
+			text: e instanceof Error ? e.message : '',
+			type: 'error',
+		})
+	}
+}
+
+async function handleReadFile(path: string): Promise<string> {
+	return await readTextFile(resolvePath(path))
+}
+
+async function handleReadFileAsBlob(path: string): Promise<Blob> {
+	const bytes = await readFileBytes(resolvePath(path))
+	return new Blob([bytes])
+}
+
+async function handleWriteFile(path: string, content: string) {
+	await writeTextFile(resolvePath(path), content)
+}
+
+async function handleDownloadFile(path: string, _fileName: string) {
+	await invoke('plugin:files|file_save_as', {
+		instancePath: props.instance.path,
+		filePath: path,
+	})
+}
+
+const uploadState = ref<UploadState>({
+	isUploading: false,
+	currentFileName: null,
+	currentFileProgress: 0,
+	uploadedBytes: 0,
+	totalBytes: 0,
+	completedFiles: 0,
+	totalFiles: 0,
+})
+
+async function handleUploadFiles(files: File[]) {
+	if (files.length === 0) return
+
+	uploadState.value = {
+		isUploading: true,
+		currentFileName: '',
+		currentFileProgress: 0,
+		uploadedBytes: 0,
+		totalBytes: files.reduce((sum, f) => sum + f.size, 0),
+		completedFiles: 0,
+		totalFiles: files.length,
+	}
+	try {
+		for (const file of files) {
+			uploadState.value.currentFileName = file.name
+			const buffer = await file.arrayBuffer()
+			const targetPath = resolvePath(
+				currentPath.value ? `${currentPath.value}/${file.name}` : file.name,
+			)
+			await writeFileBytes(targetPath, new Uint8Array(buffer))
+			uploadState.value.completedFiles++
+			uploadState.value.uploadedBytes += file.size
+			uploadState.value.currentFileProgress = 1
+		}
+	} catch (e) {
+		addNotification({
+			title: formatMessage(commonMessages.uploadFailedLabel),
+			text: e instanceof Error ? e.message : '',
+			type: 'error',
+		})
+	} finally {
+		uploadState.value.isUploading = false
+		await refresh()
+	}
+}
+
+async function handleExtractFile(path: string, override: boolean, dry: boolean) {
+	try {
+		return await invoke('plugin:files|file_extract_zip', {
+			instancePath: props.instance.path,
+			filePath: path,
+			overrideConflicts: override,
+			dryRun: dry,
+		})
+	} catch (e) {
+		addNotification({
+			title: formatMessage(commonMessages.extractFailedLabel),
+			text: e instanceof Error ? e.message : '',
+			type: 'error',
+		})
+	}
+}
+
+debug('setup: registering profile_listener')
+const unlistenProfiles = await profile_listener(
+	async (event: { event: string; profile_path_id: string }) => {
+		debug('profile_listener: event =', event.event, 'path =', event.profile_path_id)
+		if (event.profile_path_id === props.instance.path && event.event === 'synced') {
+			debug('profile_listener: synced event matched, calling refresh')
+			await refresh()
+		}
+	},
+)
+debug('setup: profile_listener registered')
+
+onUnmounted(() => {
+	unlistenProfiles()
+})
+
+watch(
+	() => props.instance.path,
+	async () => {
+		debug('watch instance.path: changed to', props.instance.path)
+		instanceRoot.value = await get_full_path(props.instance.path)
+		currentPath.value = ''
+		await refresh()
+	},
+)
+
+provideFileManager({
+	items,
+	loading,
+	error,
+	currentPath,
+	navigateTo,
+	editingFile,
+	startEditing,
+	stopEditing,
+	createItem: handleCreateItem,
+	renameItem: handleRenameItem,
+	moveItem: handleMoveItem,
+	deleteItem: handleDeleteItem,
+	readFile: handleReadFile,
+	readFileAsBlob: handleReadFileAsBlob,
+	writeFile: handleWriteFile,
+	downloadFile: handleDownloadFile,
+	uploadFiles: handleUploadFiles,
+	uploadState,
+	extractFile: handleExtractFile,
+	refresh,
+	basePath: instanceRoot,
+	openInFolder: (path: string) => highlightInFolder(path),
+	downloadButtonLabel: formatMessage(messages.saveAs),
+	uploadingLabel: (completed: number, total: number) =>
+		formatMessage(messages.addingFiles, { completed, total }),
+})
+</script>
+
+<template>
+	<FilePageLayout :show-refresh-button="true" />
+</template>
@@ -3,6 +3,7 @@
 		<div class="p-6 pr-2 pb-4" @contextmenu.prevent.stop="(event) => handleRightClick(event)">
 			<ExportModal ref="exportModal" :instance="instance" />
 			<InstanceSettingsModal
+				:key="instance.path"
 				ref="settingsModal"
 				:instance="instance"
 				:offline="offline"
@@ -36,27 +37,6 @@
 								</template>
 								<template v-else> Never played </template>
 							</div>
-
-							<div v-if="linkedProjectV3" class="w-1.5 h-1.5 rounded-full bg-surface-5"></div>
-
-							<div
-								v-if="linkedProjectV3"
-								class="flex gap-1.5 items-center font-medium text-primary"
-							>
-								Linked to
-								<Avatar
-									:src="linkedProjectV3.icon_url"
-									:alt="linkedProjectV3.name"
-									:tint-by="instance.path"
-									size="24px"
-								/>
-								<router-link
-									:to="`/project/${linkedProjectV3.slug ?? linkedProjectV3.id}`"
-									class="hover:underline text-primary truncate"
-								>
-									{{ linkedProjectV3.name }}
-								</router-link>
-							</div>
 						</template>

 						<template v-else>
@@ -134,9 +114,9 @@
 							</button>
 						</ButtonStyled>
 						<ButtonStyled v-else-if="playing === true" color="red" size="large">
-							<button @click="stopInstance('InstancePage')">
+							<button :disabled="stopping" @click="stopInstance('InstancePage')">
 								<StopCircleIcon />
-								Stop
+								{{ stopping ? 'Stopping...' : 'Stop' }}
 							</button>
 						</ButtonStyled>
 						<ButtonStyled
@@ -192,7 +172,7 @@
 							color="brand"
 							size="large"
 						>
-							<button disabled>Loading...</button>
+							<button disabled>Starting...</button>
 						</ButtonStyled>
 						<ButtonStyled circular size="large">
 							<button v-tooltip="'Instance settings'" @click="settingsModal?.show()">
@@ -285,6 +265,7 @@
 <script setup lang="ts">
 import type { Labrinth } from '@modrinth/api-client'
 import {
+	BoxesIcon,
 	CheckCircleIcon,
 	ClipboardCopyIcon,
 	DownloadIcon,
@@ -302,6 +283,7 @@ import {
 	ServerIcon,
 	SettingsIcon,
 	StopCircleIcon,
+	TerminalSquareIcon,
 	UpdatedIcon,
 	UserPlusIcon,
 	XIcon,
@@ -312,6 +294,7 @@ import {
 	ContentPageHeader,
 	injectNotificationManager,
 	LoadingIndicator,
+	NavTabs,
 	OverflowMenu,
 	ServerOnlinePlayers,
 	ServerPing,
@@ -329,7 +312,7 @@ import ContextMenu from '@/components/ui/ContextMenu.vue'
 import ExportModal from '@/components/ui/ExportModal.vue'
 import InstanceSettingsModal from '@/components/ui/modal/InstanceSettingsModal.vue'
 import UpdateToPlayModal from '@/components/ui/modal/UpdateToPlayModal.vue'
-import NavTabs from '@/components/ui/NavTabs.vue'
+import { useInstanceConsole } from '@/composables/useInstanceConsole'
 import { trackEvent } from '@/helpers/analytics'
 import { get_project_v3 } from '@/helpers/cache.js'
 import { process_listener, profile_listener } from '@/helpers/events'
@@ -363,6 +346,7 @@ window.addEventListener('online', () => {
 const instance = ref<GameInstance>()
 const playing = ref(false)
 const loading = ref(false)
+const stopping = ref(false)
 const exportModal = ref<InstanceType<typeof ExportModal>>()
 const updateToPlayModal = ref<InstanceType<typeof UpdateToPlayModal>>()

@@ -451,14 +435,22 @@ const tabs = computed(() => [
 	{
 		label: 'Content',
 		href: `${basePath.value}`,
+		icon: BoxesIcon,
+	},
+	{
+		label: 'Files',
+		href: `${basePath.value}/files`,
+		icon: FolderOpenIcon,
 	},
 	{
 		label: 'Worlds',
 		href: `${basePath.value}/worlds`,
+		icon: GlobeIcon,
 	},
 	{
 		label: 'Logs',
 		href: `${basePath.value}/logs`,
+		icon: TerminalSquareIcon,
 	},
 ])

@@ -504,8 +496,10 @@ const startInstance = async (context: string) => {
 }

 const stopInstance = async (context: string) => {
-	playing.value = false
+	stopping.value = true
 	await kill(route.params.id as string).catch(handleError)
+	stopping.value = false
+	playing.value = false

 	if (!instance.value) return
 	trackEvent('InstanceStop', {
@@ -654,6 +648,11 @@ const timePlayedHumanized = computed(() => {
 onUnmounted(() => {
 	unlistenProcesses()
 	unlistenProfiles()
+	const profilePath = route.params.id
+	if (profilePath) {
+		const { destroy } = useInstanceConsole(profilePath)
+		destroy()
+	}
 })
 </script>

@@ -1,127 +1,24 @@
 <template>
-	<Card class="log-card">
-		<div class="button-row">
-			<DropdownSelect
-				v-model="selectedLogIndex"
-				:default-value="0"
-				name="Log date"
-				:options="logs.map((_, index) => index)"
-				:display-name="(option) => logs[option]?.name"
-				:disabled="logs.length === 0"
-			/>
-			<div class="button-group">
-				<Button :disabled="!logs[selectedLogIndex]" @click="copyLog()">
-					<ClipboardCopyIcon v-if="!copied" />
-					<CheckIcon v-else />
-					{{ copied ? 'Copied' : 'Copy' }}
-				</Button>
-				<Button color="primary" :disabled="offline || !logs[selectedLogIndex]" @click="share">
-					<ShareIcon aria-hidden="true" />
-					Share
-				</Button>
-				<Button
-					v-if="logs[selectedLogIndex] && logs[selectedLogIndex].live === true"
-					@click="clearLiveLog()"
-				>
-					<TrashIcon aria-hidden="true" />
-					Clear
-				</Button>
-
-				<Button
-					v-else
-					:disabled="!logs[selectedLogIndex] || logs[selectedLogIndex].live === true"
-					color="danger"
-					@click="deleteLog()"
-				>
-					<TrashIcon aria-hidden="true" />
-					Delete
-				</Button>
-			</div>
-		</div>
-		<div class="button-row">
-			<StyledInput
-				id="text-filter"
-				v-model="searchFilter"
-				autocomplete="off"
-				:icon="SearchIcon"
-				type="search"
-				input-class="text-filter"
-				placeholder="Type to filter logs..."
-			/>
-			<div class="filter-group">
-				<Checkbox
-					v-for="level in levels"
-					:key="level.toLowerCase()"
-					v-model="levelFilters[level.toLowerCase()]"
-					class="filter-checkbox"
-				>
-					{{ level }}
-				</Checkbox>
-			</div>
-		</div>
-		<div class="log-text">
-			<RecycleScroller
-				v-slot="{ item }"
-				ref="logContainer"
-				class="scroller"
-				:items="displayProcessedLogs"
-				direction="vertical"
-				:item-size="20"
-				key-field="id"
-				buffer="200"
-			>
-				<div class="user no-wrap">
-					<span :style="{ color: item.prefixColor, 'font-weight': item.weight }">{{
-						item.prefix
-					}}</span>
-					<span :style="{ color: item.textColor }">{{ item.text }}</span>
-				</div>
-			</RecycleScroller>
-		</div>
-		<ShareModalWrapper
-			ref="shareModal"
-			header="Share Log"
-			share-title="Instance Log"
-			share-text="Check out this log from an instance on the Modrinth App"
-			:open-in-new-tab="false"
-			link
-		/>
-	</Card>
+	<div class="flex flex-col gap-4 h-full">
+		<ConsolePageLayout />
+	</div>
 </template>

 <script setup>
-import 'vue-virtual-scroller/dist/vue-virtual-scroller.css'
-
-import { CheckIcon, ClipboardCopyIcon, SearchIcon, ShareIcon, TrashIcon } from '@modrinth/assets'
 import {
-	Button,
-	Card,
-	Checkbox,
-	DropdownSelect,
+	ConsolePageLayout,
+	injectModrinthClient,
 	injectNotificationManager,
-	StyledInput,
+	provideConsoleManager,
 } from '@modrinth/ui'
-import dayjs from 'dayjs'
-import isToday from 'dayjs/plugin/isToday'
-import isYesterday from 'dayjs/plugin/isYesterday'
-import { ofetch } from 'ofetch'
-import { computed, nextTick, onBeforeUnmount, onMounted, onUnmounted, ref, watch } from 'vue'
+import { computed, onUnmounted, ref, shallowRef, triggerRef, watch, watchEffect } from 'vue'
 import { useRoute } from 'vue-router'
-import { RecycleScroller } from 'vue-virtual-scroller'

-import ShareModalWrapper from '@/components/ui/modal/ShareModalWrapper.vue'
-import { process_listener } from '@/helpers/events.js'
-import {
-	delete_logs_by_filename,
-	get_latest_log_cursor,
-	get_logs,
-	get_output_by_filename,
-} from '@/helpers/logs.js'
-import { get_by_profile_path } from '@/helpers/process.js'
-
-dayjs.extend(isToday)
-dayjs.extend(isYesterday)
+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'

+const client = injectModrinthClient()
 const { handleError } = injectNotificationManager()
 const route = useRoute()

@@ -158,414 +55,181 @@ const props = defineProps({
 	},
 })

-const currentLiveLog = ref(null)
-const currentLiveLogCursor = ref(0)
-const emptyText = ['No live game detected.', 'Start your game to proceed.']
+const profilePathId = computed(() => route.params.id)
+const {
+	liveConsole,
+	historicalConsole,
+	hydrate,
+	getHistoricalLogs,
+	getHistoricalContent,
+	invalidate,
+	clearLive,
+} = useInstanceConsole(profilePathId.value)

-const logs = ref([])
-await setLogs()
+await hydrate()

-const logsColored = true
+function buildLogList(rawLogs) {
+	return [
+		{ name: 'Live Log', live: true },
+		...rawLogs
+			.filter(
+				(log) =>
+					log.filename !== 'latest_stdout.log' &&
+					log.filename !== 'latest_stdout' &&
+					log.filename !== 'launcher_log.txt' &&
+					log.stdout !== '' &&
+					(log.filename.includes('.log') || log.filename.endsWith('.txt')),
+			)
+			.map((log) => ({
+				...log,
+				name: log.filename || 'Unknown',
+			})),
+	]
+}
+
+const logs = ref(buildLogList([]))
+
+void getHistoricalLogs(props.instance.path)
+	.then((allLogs) => {
+		logs.value = buildLogList(allLogs)
+	})
+	.catch(handleError)

 const selectedLogIndex = ref(0)
-const copied = ref(false)
-const logContainer = ref(null)
-const interval = ref(null)
-const userScrolled = ref(false)
-const isAutoScrolling = ref(false)
-const shareModal = ref(null)
+const isLive = computed(() => selectedLogIndex.value === 0)

-const levels = ['Comment', 'Error', 'Warn', 'Info', 'Debug', 'Trace']
-const levelFilters = ref({})
-levels.forEach((level) => {
-	levelFilters.value[level.toLowerCase()] = true
+const filteredLogs = computed(() =>
+	props.playing ? logs.value.filter((l) => l.live || l.name !== 'latest.log') : logs.value,
+)
+
+const logSources = computed(() =>
+	filteredLogs.value.map((l, i) => ({
+		id: String(i),
+		name: l?.name ?? `Log ${i}`,
+		live: l?.live ?? false,
+	})),
+)
+
+const activeConsole = computed(() => (isLive.value ? liveConsole : historicalConsole))
+
+const logLines = shallowRef(activeConsole.value.output.value)
+watchEffect(() => {
+	logLines.value = activeConsole.value.output.value
+	triggerRef(logLines)
 })
-const searchFilter = ref('')

-function shouldDisplay(processedLine) {
-	if (!processedLine.level) {
-		return true
-	}
+const crashAnalysis = ref(null)

-	if (!levelFilters.value[processedLine.level.toLowerCase()]) {
-		return false
-	}
-	if (searchFilter.value !== '') {
-		if (!processedLine.text.toLowerCase().includes(searchFilter.value.toLowerCase())) {
-			return false
+async function analyseForCrash() {
+	const lines = liveConsole.output.value
+	if (lines.length === 0) return
+
+	const content = lines.map((l) => l.text).join('\n')
+	try {
+		const data = await client.mclogs.insights_v1.analyse(content)
+		if (data.analysis?.problems?.length > 0) {
+			crashAnalysis.value = data
 		}
+	} catch {
+		// Crash analysis is best-effort
 	}
-	return true
 }

-// Selects from the processed logs which ones should be displayed (shouldDisplay)
-// In addition, splits each line by \n. Each split line is given the same properties as the original line
-const displayProcessedLogs = computed(() => {
-	return processedLogs.value.filter((l) => shouldDisplay(l))
+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
 })

-const processedLogs = computed(() => {
-	// split based on newline and timestamp lookahead
-	// (not just newline because of multiline messages)
-	const splitPattern = /\n(?=(?:#|\[\d\d:\d\d:\d\d\]))/
-
-	const lines = logs.value[selectedLogIndex.value]?.stdout.split(splitPattern) || []
-	const processed = []
-	let id = 0
-	for (let i = 0; i < lines.length; i++) {
-		// Then split off of \n.
-		// Lines that are not the first have prefix = null
-		const text = getLineText(lines[i])
-		const prefix = getLinePrefix(lines[i])
-		const prefixColor = getLineColor(lines[i], true)
-		const textColor = getLineColor(lines[i], false)
-		const weight = getLineWeight(lines[i])
-		const level = getLineLevel(lines[i])
-		text.split('\n').forEach((line, index) => {
-			processed.push({
-				id: id,
-				text: line,
-				prefix: index === 0 ? prefix : null,
-				prefixColor: prefixColor,
-				textColor: textColor,
-				weight: weight,
-				level: level,
-			})
-			id += 1
-		})
-	}
-	return processed
-})
-
-async function getLiveStdLog() {
-	if (route.params.id) {
-		const processes = await get_by_profile_path(route.params.id).catch(handleError)
-		let returnValue
-		if (processes.length === 0) {
-			returnValue = emptyText.join('\n')
-		} else {
-			const logCursor = await get_latest_log_cursor(
-				props.instance.path,
-				currentLiveLogCursor.value,
-			).catch(handleError)
-			if (logCursor.new_file) {
-				currentLiveLog.value = ''
-			}
-			currentLiveLog.value = currentLiveLog.value + logCursor.output
-			currentLiveLogCursor.value = logCursor.cursor
-			returnValue = currentLiveLog.value
-		}
-		return { name: 'Live Log', stdout: returnValue, live: true }
-	}
-	return null
-}
-
-async function getLogs() {
-	return (await get_logs(props.instance.path, true).catch(handleError))
-		.filter(
-			// filter out latest_stdout.log or anything without .log in it
-			(log) =>
-				log.filename !== 'latest_stdout.log' &&
-				log.filename !== 'latest_stdout' &&
-				log.stdout !== '' &&
-				(log.filename.includes('.log') || log.filename.endsWith('.txt')),
-		)
-		.map((log) => {
-			log.name = log.filename || 'Unknown'
-			log.stdout = 'Loading...'
-			return log
-		})
-}
-
-async function setLogs() {
-	const [liveStd, allLogs] = await Promise.all([getLiveStdLog(), getLogs()])
-	logs.value = [liveStd, ...allLogs]
-}
-
-const copyLog = () => {
-	if (logs.value.length > 0 && logs.value[selectedLogIndex.value]) {
-		navigator.clipboard.writeText(logs.value[selectedLogIndex.value].stdout)
-		copied.value = true
-	}
-}
-
-const share = async () => {
-	if (logs.value.length > 0 && logs.value[selectedLogIndex.value]) {
-		const url = await ofetch('https://api.mclo.gs/1/log', {
-			method: 'POST',
-			headers: {
-				'Content-Type': 'application/x-www-form-urlencoded',
-			},
-			body: `content=${encodeURIComponent(logs.value[selectedLogIndex.value].stdout)}`,
-		}).catch(handleError)
-
-		shareModal.value.show(url.url)
-	}
-}
-
-watch(selectedLogIndex, async (newIndex) => {
-	copied.value = false
-	userScrolled.value = false
-
-	if (logs.value.length > 1 && newIndex !== 0) {
-		logs.value[newIndex].stdout = 'Loading...'
-		logs.value[newIndex].stdout = await get_output_by_filename(
-			props.instance.path,
-			logs.value[newIndex].log_type,
-			logs.value[newIndex].filename,
-		).catch(handleError)
-	}
-})
-
-if (logs.value.length > 1 && !props.playing) {
-	selectedLogIndex.value = 1
-} else {
+async function deleteSelectedLog() {
+	const log = selectedLog.value
+	if (!log || log.live) return
+	await delete_logs_by_filename(props.instance.path, log.log_type, log.filename)
+	invalidate()
+	const freshLogs = await getHistoricalLogs(props.instance.path)
+	logs.value = buildLogList(freshLogs)
 	selectedLogIndex.value = 0
 }

-const deleteLog = async () => {
-	if (logs.value[selectedLogIndex.value] && selectedLogIndex.value !== 0) {
-		const deleteIndex = selectedLogIndex.value
-		selectedLogIndex.value = deleteIndex - 1
-		await delete_logs_by_filename(
-			props.instance.path,
-			logs.value[deleteIndex].log_type,
-			logs.value[deleteIndex].filename,
-		).catch(handleError)
-		await setLogs()
+provideConsoleManager({
+	logLines,
+	logSources,
+	activeLogSourceIndex: selectedLogIndex,
+	showCommandInput: false,
+	loading: ref(false),
+	onClear: () => {
+		if (!isLive.value) return
+		void clearLive()
+	},
+	onDelete: deleteSelectedLog,
+	deleteDisabled,
+	deleteDisabledTooltip: 'Cannot delete latest.log while the instance is running',
+	shareDisabled: computed(() => props.offline),
+	emptyStateType: 'instance',
+	crashAnalysis,
+	onDismissCrash: () => {
+		crashAnalysis.value = null
+	},
+})
+
+watch(selectedLogIndex, async (newIndex) => {
+	if (newIndex === 0) return
+	const log = filteredLogs.value[newIndex]
+	if (!log) return
+
+	const cached = getHistoricalContent(log.filename)
+	if (cached) {
+		historicalConsole.clear()
+		historicalConsole.addLegacyLog(cached)
+		return
 	}
+
+	const output = await get_output_by_filename(
+		props.instance.path,
+		log.log_type,
+		log.filename,
+	).catch(handleError)
+	if (output) {
+		historicalConsole.clear()
+		historicalConsole.addLegacyLog(output)
+	}
+})
+
+selectedLogIndex.value = 0
+
+if (!props.playing) {
+	void analyseForCrash()
 }

-const clearLiveLog = async () => {
-	currentLiveLog.value = ''
-	// does not reset cursor
-}
+const unlistenLog = await log_listener((payload) => {
+	if (payload.profile_path_id !== profilePathId.value) return

-const isLineLevel = (text, level) => {
-	if ((text.includes('/INFO') || text.includes('[System] [CHAT]')) && level === 'info') {
-		return true
+	if (payload.type === 'log4j') {
+		liveConsole.addLog4jEvent(payload)
+	} else if (payload.type === 'legacy') {
+		liveConsole.addLegacyLog(payload.message)
 	}
-
-	if (text.includes('/WARN') && level === 'warn') {
-		return true
-	}
-
-	if (text.includes('/DEBUG') && level === 'debug') {
-		return true
-	}
-
-	if (text.includes('/TRACE') && level === 'trace') {
-		return true
-	}
-
-	const errorTriggers = ['/ERROR', 'Exception:', ':?]', 'Error', '[thread', '	at']
-	if (level === 'error') {
-		for (const trigger of errorTriggers) {
-			if (text.includes(trigger)) return true
-		}
-	}
-
-	if (text.trim()[0] === '#' && level === 'comment') {
-		return true
-	}
-	return false
-}
-
-const getLineWeight = (text) => {
-	if (
-		!logsColored ||
-		isLineLevel(text, 'info') ||
-		isLineLevel(text, 'debug') ||
-		isLineLevel(text, 'trace')
-	) {
-		return 'normal'
-	}
-
-	if (isLineLevel(text, 'error') || isLineLevel(text, 'warn')) {
-		return 'bold'
-	}
-}
-
-const getLineLevel = (text) => {
-	for (const level of levels) {
-		if (isLineLevel(text, level.toLowerCase())) {
-			return level
-		}
-	}
-}
-
-const getLineColor = (text, prefix) => {
-	if (isLineLevel(text, 'comment')) {
-		return 'var(--color-green)'
-	}
-
-	if (!logsColored || text.includes('[System] [CHAT]')) {
-		return 'var(--color-white)'
-	}
-	if (
-		(isLineLevel(text, 'info') || isLineLevel(text, 'debug') || isLineLevel(text, 'trace')) &&
-		prefix
-	) {
-		return 'var(--color-blue)'
-	}
-	if (isLineLevel(text, 'warn')) {
-		return 'var(--color-orange)'
-	}
-	if (isLineLevel(text, 'error')) {
-		return 'var(--color-red)'
-	}
-}
-
-const getLinePrefix = (text) => {
-	if (text.includes(']:')) {
-		return text.split(']:')[0] + ']:'
-	}
-}
-
-const getLineText = (text) => {
-	if (text.includes(']:')) {
-		if (text.split(']:').length > 2) {
-			return text.split(']:').slice(1).join(']:')
-		}
-		return text.split(']:')[1]
-	} else {
-		return text
-	}
-}
-
-function handleUserScroll() {
-	if (!isAutoScrolling.value) {
-		userScrolled.value = true
-	}
-}
-
-interval.value = setInterval(async () => {
-	if (logs.value.length > 0) {
-		logs.value[0] = await getLiveStdLog()
-		const scroll = logContainer.value.getScroll()
-
-		// Allow resetting of userScrolled if the user scrolls to the bottom
-		if (selectedLogIndex.value === 0) {
-			if (scroll.end >= logContainer.value.$el.scrollHeight - 10) userScrolled.value = false
-			if (!userScrolled.value) {
-				await nextTick()
-				isAutoScrolling.value = true
-				logContainer.value.scrollToItem(displayProcessedLogs.value.length - 1)
-				setTimeout(() => (isAutoScrolling.value = false), 50)
-			}
-		}
-	}
-}, 250)
+})

 const unlistenProcesses = await process_listener(async (e) => {
+	if (e.profile_path_id !== profilePathId.value) return
 	if (e.event === 'launched') {
-		currentLiveLog.value = ''
-		currentLiveLogCursor.value = 0
+		liveConsole.clear()
+		invalidate()
 		selectedLogIndex.value = 0
 	}
 	if (e.event === 'finished') {
-		currentLiveLog.value = ''
-		currentLiveLogCursor.value = 0
-		userScrolled.value = false
-		await setLogs()
-		selectedLogIndex.value = 1
+		invalidate()
+		const freshLogs = await getHistoricalLogs(props.instance.path)
+		logs.value = buildLogList(freshLogs)
+		void analyseForCrash()
 	}
 })

-onMounted(() => {
-	logContainer.value.$el.addEventListener('scroll', handleUserScroll)
-})
-
-onBeforeUnmount(() => {
-	logContainer.value.$el.removeEventListener('scroll', handleUserScroll)
-})
 onUnmounted(() => {
-	clearInterval(interval.value)
+	unlistenLog()
 	unlistenProcesses()
 })
 </script>
-
-<style scoped lang="scss">
-.log-card {
-	display: flex;
-	flex-direction: column;
-	gap: 1rem;
-	height: 100vh;
-}
-
-.button-row {
-	display: flex;
-	flex-direction: row;
-	justify-content: space-between;
-	gap: 0.5rem;
-}
-
-.button-group {
-	display: flex;
-	flex-direction: row;
-	gap: 0.5rem;
-}
-
-.log-text {
-	width: 100%;
-	height: 100%;
-	font-family: var(--mono-font);
-	background-color: var(--color-accent-contrast);
-	color: var(--color-contrast);
-	border-radius: var(--radius-lg);
-	padding-top: 1.5rem;
-	overflow-x: auto; /* Enables horizontal scrolling */
-	overflow-y: hidden; /* Disables vertical scrolling on this wrapper */
-	white-space: nowrap; /* Keeps content on a single line */
-	white-space: normal;
-	color-scheme: dark;
-}
-
-.filter-checkbox {
-	margin-bottom: 0.3rem;
-	font-size: 1rem;
-
-	svg {
-		display: flex;
-		align-self: center;
-		justify-self: center;
-	}
-}
-
-.filter-group {
-	display: flex;
-	padding: 0.6rem;
-	flex-direction: row;
-	overflow: auto;
-	gap: 0.5rem;
-
-	&::-webkit-scrollbar-track,
-	&::-webkit-scrollbar-thumb {
-		border-radius: 10px;
-	}
-}
-
-:deep(.vue-recycle-scroller__item-wrapper) {
-	overflow: visible; /* Enables horizontal scrolling */
-}
-
-:deep(.vue-recycle-scroller) {
-	&::-webkit-scrollbar-corner {
-		background-color: var(--color-bg);
-		border-radius: 0 0 10px 0;
-	}
-}
-
-.scroller {
-	height: 100%;
-}
-
-.user {
-	height: 32%;
-	padding: 0 1.5rem;
-	display: flex;
-
-	align-items: center;
-	user-select: text;
-}
-</style>
@@ -13,6 +13,7 @@
 				:modpack-icon-url="linkedModpackProject?.icon_url ?? undefined"
 				:enable-toggle="!props.isServerInstance"
 				:get-overflow-options="getOverflowOptions"
+				:switch-version="handleSwitchVersion"
 				@update:enabled="handleModpackContentToggle"
 				@bulk:enable="handleModpackContentBulkToggle"
 				@bulk:disable="handleModpackContentBulkToggle"
@@ -47,7 +48,7 @@
 				"
 				:project-name="
 					updatingModpack
-						? (linkedModpackProject?.title ?? formatMessage(messages.modpackFallback))
+						? (linkedModpackProject?.title ?? formatMessage(commonMessages.modpackLabel))
 						: (updatingProject?.project?.title ?? updatingProject?.file_name)
 				"
 				:loading="loadingVersions"
@@ -65,7 +66,9 @@
 import type { Labrinth } from '@modrinth/api-client'
 import { ClipboardCopyIcon, FolderOpenIcon } from '@modrinth/assets'
 import {
+	commonMessages,
 	ConfirmModpackUpdateModal,
+	ContentCardLayout as ContentPageLayout,
 	type ContentItem,
 	type ContentModpackCardCategory,
 	type ContentModpackCardProject,
@@ -82,7 +85,6 @@ import {
 	useDebugLogger,
 	useVIntl,
 } from '@modrinth/ui'
-import { ContentCardLayout as ContentPageLayout } from '@modrinth/ui'
 import { getCurrentWebview } from '@tauri-apps/api/webview'
 import { open } from '@tauri-apps/plugin-dialog'
 import { openUrl } from '@tauri-apps/plugin-opener'
@@ -125,10 +127,6 @@ const messages = defineMessages({
 		id: 'app.instance.mods.share-text',
 		defaultMessage: "Check out the projects I'm using in my modpack!",
 	},
-	modpackFallback: {
-		id: 'app.instance.mods.modpack-fallback',
-		defaultMessage: 'Modpack',
-	},
 	successfullyUploaded: {
 		id: 'app.instance.mods.successfully-uploaded',
 		defaultMessage: 'Successfully uploaded',
@@ -141,30 +139,10 @@ const messages = defineMessages({
 		id: 'app.instance.mods.projects-were-added',
 		defaultMessage: '{count} projects were added',
 	},
-	updating: {
-		id: 'app.instance.mods.updating',
-		defaultMessage: 'Updating...',
-	},
-	installing: {
-		id: 'app.instance.mods.installing',
-		defaultMessage: 'Installing...',
-	},
 	contentTypeProject: {
 		id: 'app.instance.mods.content-type-project',
 		defaultMessage: 'project',
 	},
-	unknownVersion: {
-		id: 'app.instance.mods.unknown-version',
-		defaultMessage: 'Unknown',
-	},
-	showFile: {
-		id: 'app.instance.mods.show-file',
-		defaultMessage: 'Show file',
-	},
-	copyLink: {
-		id: 'app.instance.mods.copy-link',
-		defaultMessage: 'Copy link',
-	},
 })

 let savedModalState: ModpackContentModalState | null = null
@@ -283,7 +261,7 @@ async function handleUploadFiles() {
 	}
 }

-async function _toggleDisableMod(mod: ContentItem) {
+async function toggleDisableMod(mod: ContentItem) {
 	try {
 		mod.file_path = await toggle_disable_project(props.instance.path, mod.file_path!)
 		mod.enabled = !mod.enabled
@@ -301,7 +279,7 @@ async function _toggleDisableMod(mod: ContentItem) {
 	}
 }

-const toggleDisableMod = useDebounceFn(_toggleDisableMod, 20)
+const toggleDisableDebounced = useDebounceFn(toggleDisableMod, 20)

 async function removeMod(mod: ContentItem) {
 	await remove_project(props.instance.path, mod.file_path!).catch(handleError)
@@ -354,6 +332,12 @@ async function updateProject(mod: ContentItem) {
 }

 async function switchProjectVersion(mod: ContentItem, version: Labrinth.Versions.v2.Version) {
+	isBulkOperating.value = true
+	mod.installing = true
+	if (mod.version) {
+		mod.version.id = version.id
+		mod.version.version_number = version.version_number
+	}
 	try {
 		await remove_project(props.instance.path, mod.file_path!)
 		const newPath = await add_project_from_version(props.instance.path, version.id)
@@ -364,20 +348,12 @@ async function switchProjectVersion(mod: ContentItem, version: Labrinth.Versions
 		}

 		mod.file_path = newPath
-		if (mod.version) {
-			mod.version.id = version.id
-			mod.version.version_number = version.version_number
-		}
-
-		trackEvent('InstanceProjectSwitchVersion', {
-			loader: props.instance.loader,
-			game_version: props.instance.game_version,
-			id: mod.project?.id,
-			name: mod.project?.title ?? mod.file_name,
-			project_type: mod.project_type,
-		})
 	} catch (err) {
 		handleError(err as Error)
+	} finally {
+		mod.installing = false
+		isBulkOperating.value = false
+		await initProjects()
 	}
 }

@@ -468,11 +444,11 @@ async function handleSwitchVersion(item: ContentItem) {
 }

 async function handleModpackContentToggle(item: ContentItem) {
-	await toggleDisableMod(item)
+	await toggleDisableDebounced(item)
 }

 async function handleModpackContentBulkToggle(items: ContentItem[]) {
-	await Promise.all(items.map((item) => _toggleDisableMod(item)))
+	await Promise.all(items.map((item) => toggleDisableMod(item)))
 }

 async function handleModpackContent() {
@@ -539,7 +515,7 @@ async function fetchAndSpliceVersion(
 async function handleVersionSelect(version: Labrinth.Versions.v2.Version) {
 	if (version.changelog != null) return
 	loadingChangelog.value = true
-	await fetchAndSpliceVersion(version.id, 'must_revalidate', handleError)
+	await fetchAndSpliceVersion(version.id, 'must_revalidate', handleError as (err: unknown) => void)
 	loadingChangelog.value = false
 }

@@ -660,14 +636,14 @@ function getOverflowOptions(item: ContentItem): OverflowMenuOption[] {
 	const options: OverflowMenuOption[] = []

 	options.push({
-		id: formatMessage(messages.showFile),
+		id: formatMessage(commonMessages.showFileButton),
 		icon: FolderOpenIcon,
 		action: () => highlightModInProfile(props.instance.path, item.file_path),
 	})

 	if (item.project?.slug) {
 		options.push({
-			id: formatMessage(messages.copyLink),
+			id: formatMessage(commonMessages.copyLinkButton),
 			icon: ClipboardCopyIcon,
 			action: async () => {
 				await navigator.clipboard.writeText(
@@ -718,18 +694,13 @@ async function initProjects(cacheBehaviour?: CacheBehaviour) {

 		if (allCategories && modpackInfo.project.categories) {
 			const seen = new Set<string>()
-			linkedModpackCategories.value = allCategories
-				.filter((cat: { name: string }) => {
-					if (modpackInfo.project.categories.includes(cat.name) && !seen.has(cat.name)) {
-						seen.add(cat.name)
-						return true
-					}
-					return false
-				})
-				.map((cat: { name: string }) => ({
-					...cat,
-					name: cat.name.charAt(0).toUpperCase() + cat.name.slice(1),
-				}))
+			linkedModpackCategories.value = allCategories.filter((cat: { name: string }) => {
+				if (modpackInfo.project.categories.includes(cat.name) && !seen.has(cat.name)) {
+					seen.add(cat.name)
+					return true
+				}
+				return false
+			})
 		} else {
 			linkedModpackCategories.value = []
 		}
@@ -799,8 +770,8 @@ provideContentManager({
 					hasUpdate: linkedModpackHasUpdate.value,
 					disabled: isModpackUpdating.value,
 					disabledText: isModpackUpdating.value
-						? formatMessage(messages.updating)
-						: formatMessage(messages.installing),
+						? formatMessage(commonMessages.updatingLabel)
+						: formatMessage(commonMessages.installingLabel),
 				}
 			: null,
 	),
@@ -808,13 +779,18 @@ provideContentManager({
 	isBusy: isInstanceBusy,
 	isBulkOperating,
 	contentTypeLabel: ref(formatMessage(messages.contentTypeProject)),
-	toggleEnabled: toggleDisableMod,
-	bulkEnableItems: (items) =>
-		Promise.all(items.map((item) => _toggleDisableMod(item))).then(() => {}),
-	bulkDisableItems: (items) =>
-		Promise.all(items.map((item) => _toggleDisableMod(item))).then(() => {}),
+	toggleEnabled: toggleDisableDebounced,
+	bulkEnableItems: (items: ContentItem[]) =>
+		Promise.all(items.filter((item) => !item.enabled).map((item) => toggleDisableMod(item))).then(
+			() => {},
+		),
+	bulkDisableItems: (items: ContentItem[]) =>
+		Promise.all(items.filter((item) => item.enabled).map((item) => toggleDisableMod(item))).then(
+			() => {},
+		),
 	deleteItem: removeMod,
-	bulkDeleteItems: (items) => Promise.all(items.map((item) => removeMod(item))).then(() => {}),
+	bulkDeleteItems: (items: ContentItem[]) =>
+		Promise.all(items.map((item) => removeMod(item))).then(() => {}),
 	refresh: () => initProjects('must_revalidate'),
 	browse: handleBrowseContent,
 	uploadFiles: handleUploadFiles,
@@ -830,7 +806,7 @@ provideContentManager({
 	showContentHint,
 	dismissContentHint,
 	shareItems: handleShareItems,
-	mapToTableItem: (item) => ({
+	mapToTableItem: (item: ContentItem) => ({
 		id: item.id,
 		project: item.project ?? {
 			id: item.file_name,
@@ -843,7 +819,7 @@ provideContentManager({
 			: undefined,
 		version: item.version ?? {
 			id: item.file_name,
-			version_number: formatMessage(messages.unknownVersion),
+			version_number: formatMessage(commonMessages.unknownLabel),
 			file_name: item.file_name,
 		},
 		versionLink:
@@ -860,6 +836,7 @@ provideContentManager({
 				}
 			: undefined,
 		enabled: item.enabled,
+		installing: item.installing,
 	}),
 	filterPersistKey: props.instance.path,
 })
@@ -15,48 +15,88 @@
 	<EditWorldModal ref="editWorldModal" :instance="instance" @submit="editWorld" />
 	<ConfirmModalWrapper
 		ref="removeServerModal"
-		:title="`Are you sure you want to remove ${serverToRemove?.name ?? 'this server'}?`"
-		:description="`'${serverToRemove?.name}'${serverToRemove?.address === serverToRemove?.name ? ' ' : ` (${serverToRemove?.address})`} will be removed from your list, including in-game, and there will be no way to recover it.`"
+		:title="
+			formatMessage(messages.removeServerTitle, {
+				name: serverToRemove?.name ?? formatMessage(messages.thisServer),
+			})
+		"
+		:description="
+			serverToRemove?.address === serverToRemove?.name
+				? formatMessage(messages.removeServerDescription, { name: serverToRemove?.name })
+				: formatMessage(messages.removeServerDescriptionWithAddress, {
+						name: serverToRemove?.name,
+						address: serverToRemove?.address,
+					})
+		"
 		:markdown="false"
 		@proceed="proceedRemoveServer"
 	/>
 	<ConfirmModalWrapper
 		ref="deleteWorldModal"
-		:title="`Are you sure you want to permanently delete this world?`"
-		:description="`'${worldToDelete?.name}' will be **permanently deleted**, and there will be no way to recover it.`"
+		:title="formatMessage(messages.deleteWorldTitle)"
+		:description="formatMessage(messages.deleteWorldDescription, { name: worldToDelete?.name })"
 		@proceed="proceedDeleteWorld"
 	/>
 	<div v-if="dedupedWorlds.length > 0" class="flex flex-col gap-4">
-		<div class="flex flex-wrap gap-2 items-center">
+		<div class="flex flex-wrap items-center gap-2">
 			<StyledInput
 				v-model="searchFilter"
 				:icon="SearchIcon"
 				type="text"
-				placeholder="Search worlds..."
 				autocomplete="off"
+				:spellcheck="false"
+				input-class="!h-10"
+				wrapper-class="flex-1 min-w-0"
 				clearable
-				wrapper-class="flex-grow"
+				:placeholder="
+					formatMessage(messages.searchWorldsPlaceholder, { count: dedupedWorlds.length })
+				"
 			/>
-			<ButtonStyled>
-				<button :disabled="refreshingAll" @click="refreshAllWorlds">
-					<template v-if="refreshingAll">
-						<SpinnerIcon class="animate-spin" />
-						Refreshing...
-					</template>
-					<template v-else>
-						<UpdatedIcon />
-						Refresh
-					</template>
+			<div class="flex gap-2">
+				<ButtonStyled type="outlined">
+					<button class="!h-10 !border-button-bg !border-[1px]" @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="
+							router.push({ path: '/browse/server', query: { i: instance.path, from: 'worlds' } })
+						"
+					>
+						<CompassIcon class="size-5" />
+						<span>{{ formatMessage(messages.browseServers) }}</span>
+					</button>
+				</ButtonStyled>
+			</div>
+		</div>
+		<div class="flex flex-wrap items-center justify-between gap-2">
+			<div class="flex flex-wrap items-center gap-1.5">
+				<FilterIcon class="size-5 text-secondary" />
+				<button
+					:class="filterPillClass(selectedFilters.length === 0)"
+					@click="selectedFilters = []"
+				>
+					{{ formatMessage(commonMessages.allProjectType) }}
 				</button>
-			</ButtonStyled>
-			<ButtonStyled>
-				<button @click="addServerModal?.show()">
-					<PlusIcon />
-					Add a server
+				<button
+					v-for="option in filterOptions"
+					:key="option.id"
+					:class="filterPillClass(selectedFilters.includes(option.id))"
+					@click="toggleFilter(option.id)"
+				>
+					{{ option.label }}
+				</button>
+			</div>
+			<ButtonStyled type="transparent" hover-color-fill="none">
+				<button :disabled="refreshingAll" @click="refreshAllWorlds">
+					<RefreshCwIcon :class="refreshingAll ? 'animate-spin' : ''" />
+					{{ formatMessage(commonMessages.refreshButton) }}
 				</button>
 			</ButtonStyled>
 		</div>
-		<FilterBar v-model="filters" :options="filterOptions" show-all-options />
 		<div class="flex flex-col w-full gap-2">
 			<WorldItem
 				v-for="world in filteredWorlds"
@@ -92,51 +132,49 @@
 			/>
 		</div>
 	</div>
-	<div v-else class="w-full max-w-[48rem] mx-auto flex flex-col mt-6">
-		<RadialHeader class="">
-			<div class="flex items-center gap-6 w-[32rem] mx-auto">
-				<img src="@/assets/sad-modrinth-bot.webp" alt="" aria-hidden="true" class="h-24" />
-				<span class="text-contrast font-bold text-xl"> You don't have any worlds yet. </span>
-			</div>
-		</RadialHeader>
-		<div class="flex gap-2 mt-4 mx-auto">
-			<ButtonStyled>
-				<button @click="addServerModal?.show()">
-					<PlusIcon aria-hidden="true" />
-					Add a server
+	<EmptyState
+		v-else
+		type="empty-inbox"
+		:heading="formatMessage(messages.noWorldsHeading)"
+		:description="formatMessage(messages.noWorldsDescription)"
+	>
+		<template #actions>
+			<ButtonStyled type="outlined">
+				<button class="!h-10 !border-button-bg !border-[1px]" @click="addServerModal?.show()">
+					<PlusIcon class="size-5" />
+					{{ formatMessage(messages.addServer) }}
 				</button>
 			</ButtonStyled>
-			<ButtonStyled>
-				<button :disabled="refreshingAll" @click="refreshAllWorlds">
-					<template v-if="refreshingAll">
-						<SpinnerIcon aria-hidden="true" class="animate-spin" />
-						Refreshing...
-					</template>
-					<template v-else>
-						<UpdatedIcon aria-hidden="true" />
-						Refresh
-					</template>
+			<ButtonStyled color="brand">
+				<button
+					class="!h-10 flex items-center gap-2"
+					@click="
+						router.push({ path: '/browse/server', query: { i: instance.path, from: 'worlds' } })
+					"
+				>
+					<CompassIcon class="size-5" />
+					<span>{{ formatMessage(messages.browseServers) }}</span>
 				</button>
 			</ButtonStyled>
-		</div>
-	</div>
+		</template>
+	</EmptyState>
 </template>
 <script setup lang="ts">
-import { PlusIcon, SearchIcon, SpinnerIcon, UpdatedIcon } from '@modrinth/assets'
+import { CompassIcon, FilterIcon, PlusIcon, RefreshCwIcon, SearchIcon } from '@modrinth/assets'
 import {
 	ButtonStyled,
+	commonMessages,
 	defineMessages,
-	FilterBar,
-	type FilterBarOption,
+	EmptyState,
 	GAME_MODES,
 	type GameVersion,
 	injectNotificationManager,
-	RadialHeader,
 	StyledInput,
+	useVIntl,
 } from '@modrinth/ui'
 import { platform } from '@tauri-apps/plugin-os'
 import { computed, onUnmounted, ref, watch } from 'vue'
-import { useRoute } from 'vue-router'
+import { useRoute, useRouter } from 'vue-router'

 import type ContextMenu from '@/components/ui/ContextMenu.vue'
 import ConfirmModalWrapper from '@/components/ui/modal/ConfirmModalWrapper.vue'
@@ -176,11 +214,80 @@ import {
 	type World,
 } from '@/helpers/worlds.ts'
 import { injectServerInstall } from '@/providers/server-install'
+import { handleSevereError } from '@/store/error.js'
 import { ensureManagedServerWorldExists, getServerAddress } from '@/store/install'

+const messages = defineMessages({
+	removeServerTitle: {
+		id: 'app.instance.worlds.remove-server-title',
+		defaultMessage: 'Are you sure you want to remove {name}?',
+	},
+	removeServerDescription: {
+		id: 'app.instance.worlds.remove-server-description',
+		defaultMessage:
+			"'{name}' will be removed from your list, including in-game, and there will be no way to recover it.",
+	},
+	removeServerDescriptionWithAddress: {
+		id: 'app.instance.worlds.remove-server-description-with-address',
+		defaultMessage:
+			"'{name}' ({address}) will be removed from your list, including in-game, and there will be no way to recover it.",
+	},
+	deleteWorldTitle: {
+		id: 'app.instance.worlds.delete-world-title',
+		defaultMessage: 'Are you sure you want to permanently delete this world?',
+	},
+	deleteWorldDescription: {
+		id: 'app.instance.worlds.delete-world-description',
+		defaultMessage:
+			"'{name}' will be **permanently deleted**, and there will be no way to recover it.",
+	},
+	searchWorldsPlaceholder: {
+		id: 'app.instance.worlds.search-worlds-placeholder',
+		defaultMessage: 'Search {count} worlds...',
+	},
+	addServer: {
+		id: 'app.instance.worlds.add-server',
+		defaultMessage: 'Add server',
+	},
+	browseServers: {
+		id: 'app.instance.worlds.browse-servers',
+		defaultMessage: 'Browse servers',
+	},
+	noWorldsHeading: {
+		id: 'app.instance.worlds.no-worlds-heading',
+		defaultMessage: 'No servers or worlds added',
+	},
+	noWorldsDescription: {
+		id: 'app.instance.worlds.no-worlds-description',
+		defaultMessage: 'Add a server or browse to get started',
+	},
+	thisServer: {
+		id: 'app.instance.worlds.this-server',
+		defaultMessage: 'this server',
+	},
+	vanillaFilter: {
+		id: 'app.instance.worlds.filter-vanilla',
+		defaultMessage: 'Vanilla',
+	},
+	moddedFilter: {
+		id: 'app.instance.worlds.filter-modded',
+		defaultMessage: 'Modded',
+	},
+	onlineFilter: {
+		id: 'app.instance.worlds.filter-online',
+		defaultMessage: 'Online',
+	},
+	offlineFilter: {
+		id: 'app.instance.worlds.filter-offline',
+		defaultMessage: 'Offline',
+	},
+})
+
+const { formatMessage } = useVIntl()
 const { handleError } = injectNotificationManager()
 const { playServerProject } = injectServerInstall()
 const route = useRoute()
+const router = useRouter()

 const addServerModal = ref<InstanceType<typeof AddServerModal>>()
 const editServerModal = ref<InstanceType<typeof EditServerModal>>()
@@ -211,9 +318,32 @@ function play(world: World) {
 	emit('play', world)
 }

-const filters = ref<string[]>([])
+const selectedFilters = ref<string[]>([])
 const searchFilter = ref('')

+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-surface-5 bg-surface-4 text-primary hover:bg-surface-5',
+	]
+}
+
+function toggleFilter(id: string) {
+	const idx = selectedFilters.value.indexOf(id)
+	if (idx >= 0) {
+		selectedFilters.value.splice(idx, 1)
+	} else {
+		selectedFilters.value.push(id)
+		if (id === 'singleplayer') {
+			selectedFilters.value = selectedFilters.value.filter((f) => f !== 'online' && f !== 'offline')
+		} else if (id === 'online' || id === 'offline') {
+			selectedFilters.value = selectedFilters.value.filter((f) => f !== 'singleplayer')
+		}
+	}
+}
+
 const refreshingAll = ref(false)
 const hadNoWorlds = ref(true)
 const startingInstance = ref(false)
@@ -227,9 +357,7 @@ const MAX_LINUX_REFRESHES = 3
 const isLinux = platform() === 'linux'
 const linuxRefreshCount = ref(0)

-const protocolVersion = ref<ProtocolVersion | null>(
-	await get_profile_protocol_version(instance.value.path),
-)
+const protocolVersion = ref<ProtocolVersion | null>(null)
 const managedServerName = ref<string | null>(null)
 const managedServerAddress = ref<string | null>(null)

@@ -294,22 +422,27 @@ watch(
 	{ immediate: true },
 )

-const unlistenProfile = await profile_listener(async (e: ProfileEvent) => {
-	if (e.profile_path_id !== instance.value.path) return
+const [unlistenProfile, , resolvedProtocolVersion, resolvedGameVersions] = await Promise.all([
+	profile_listener(async (e: ProfileEvent) => {
+		if (e.profile_path_id !== instance.value.path) return

-	console.info(`Handling profile event '${e.event}' for profile: ${e.profile_path_id}`)
+		console.info(`Handling profile event '${e.event}' for profile: ${e.profile_path_id}`)

-	if (e.event === 'servers_updated') {
-		if (isLinux && linuxRefreshCount.value >= MAX_LINUX_REFRESHES) return
-		if (isLinux) linuxRefreshCount.value++
+		if (e.event === 'servers_updated') {
+			if (isLinux && linuxRefreshCount.value >= MAX_LINUX_REFRESHES) return
+			if (isLinux) linuxRefreshCount.value++

-		await refreshAllWorlds()
-	}
+			await refreshAllWorlds()
+		}

-	await handleDefaultProfileUpdateEvent(worlds.value, instance.value.path, e)
-})
+		await handleDefaultProfileUpdateEvent(worlds.value, instance.value.path, e)
+	}),
+	refreshAllWorlds(),
+	get_profile_protocol_version(instance.value.path).catch(() => null),
+	get_game_versions().catch(() => [] as GameVersion[]),
+])

-await refreshAllWorlds()
+protocolVersion.value = resolvedProtocolVersion

 async function refreshServer(address: string) {
 	if (!serverData.value[address]) {
@@ -371,6 +504,12 @@ async function editServer(server: ServerWorld) {
 async function removeServer(server: ServerWorld) {
 	await remove_server_from_profile(instance.value.path, server.index).catch(handleError)
 	worlds.value = worlds.value.filter((w) => w.type !== 'server' || w.index !== server.index)
+	let serverIdx = 0
+	for (const w of worlds.value) {
+		if (w.type === 'server') {
+			w.index = serverIdx++
+		}
+	}
 }

 async function editWorld(path: string, name: string, removeIcon: boolean) {
@@ -393,7 +532,7 @@ async function deleteWorld(world: SingleplayerWorld) {
 }

 function handleJoinError(err: Error) {
-	handleError(err)
+	handleSevereError(err, { profilePath: instance.value.path })
 	startingInstance.value = false
 	worldPlaying.value = undefined
 }
@@ -453,7 +592,7 @@ function worldsMatch(world: World, other: World | undefined) {
 	return false
 }

-const gameVersions = ref<GameVersion[]>(await get_game_versions().catch(() => []))
+const gameVersions = ref<GameVersion[]>(resolvedGameVersions)
 const supportsServerQuickPlay = computed(() =>
 	hasServerQuickPlaySupport(gameVersions.value, instance.value.game_version),
 )
@@ -498,58 +637,83 @@ const dedupedWorlds = computed(() => {
 })

 const filterOptions = computed(() => {
-	const options: FilterBarOption[] = []
-
+	const options: { id: string; label: string }[] = []
+	const hasSingleplayer = dedupedWorlds.value.some((x) => x.type === 'singleplayer')
 	const hasServer = dedupedWorlds.value.some((x) => x.type === 'server')

-	if (dedupedWorlds.value.some((x) => x.type === 'singleplayer') && hasServer) {
-		options.push({
-			id: 'singleplayer',
-			message: messages.singleplayer,
-		})
-		options.push({
-			id: 'server',
-			message: messages.server,
-		})
+	const hasStatusFilter =
+		selectedFilters.value.includes('online') || selectedFilters.value.includes('offline')
+
+	if (hasSingleplayer && hasServer && !hasStatusFilter) {
+		options.push({ id: 'singleplayer', label: formatMessage(commonMessages.singleplayerLabel) })
 	}

 	if (hasServer) {
-		// add available filter if there's any offline ("unavailable") servers AND there's any singleplayer worlds or available servers
-		if (
-			dedupedWorlds.value.some(
-				(x) =>
-					x.type === 'server' &&
-					!serverData.value[x.address]?.status &&
-					!serverData.value[x.address]?.refreshing,
-			) &&
-			dedupedWorlds.value.some(
-				(x) =>
-					x.type === 'singleplayer' ||
-					(x.type === 'server' &&
-						serverData.value[x.address]?.status &&
-						!serverData.value[x.address]?.refreshing),
-			)
-		) {
-			options.push({
-				id: 'available',
-				message: messages.available,
-			})
+		const servers = dedupedWorlds.value.filter((x) => x.type === 'server')
+		const hasVanilla = servers.some((x) => x.content_kind !== 'modpack')
+		const hasModded = servers.some((x) => x.content_kind === 'modpack')
+		if (hasVanilla && hasModded) {
+			options.push({ id: 'vanilla', label: formatMessage(messages.vanillaFilter) })
+			options.push({ id: 'modded', label: formatMessage(messages.moddedFilter) })
+		}
+		if (!selectedFilters.value.includes('singleplayer')) {
+			const hasOnline = servers.some((x) => !!serverData.value[x.address]?.status)
+			const hasOffline = servers.some((x) => !serverData.value[x.address]?.status)
+			if (hasOnline && hasOffline) {
+				options.push({ id: 'online', label: formatMessage(messages.onlineFilter) })
+				options.push({ id: 'offline', label: formatMessage(messages.offlineFilter) })
+			}
 		}
 	}

 	return options
 })

+watch(filterOptions, (options) => {
+	const validIds = new Set(options.map((opt) => opt.id))
+	const cleaned = selectedFilters.value.filter((f) => validIds.has(f))
+	if (cleaned.length !== selectedFilters.value.length) {
+		selectedFilters.value = cleaned
+	}
+})
+
 const filteredWorlds = computed(() =>
 	dedupedWorlds.value.filter((x) => {
-		const availableFilter = filters.value.includes('available')
-		const typeFilter = filters.value.includes('server') || filters.value.includes('singleplayer')
+		if (searchFilter.value && !x.name.toLowerCase().includes(searchFilter.value.toLowerCase())) {
+			return false
+		}

-		return (
-			(!typeFilter || filters.value.includes(x.type)) &&
-			(!availableFilter || x.type !== 'server' || serverData.value[x.address]?.status) &&
-			(!searchFilter.value || x.name.toLowerCase().includes(searchFilter.value.toLowerCase()))
-		)
+		if (selectedFilters.value.length === 0) return true
+
+		const hasSingleplayerFilter = selectedFilters.value.includes('singleplayer')
+		const typeFilters = selectedFilters.value.filter((f) => f === 'vanilla' || f === 'modded')
+		const statusFilters = selectedFilters.value.filter((f) => f === 'online' || f === 'offline')
+
+		if (x.type === 'singleplayer') {
+			return hasSingleplayerFilter || (typeFilters.length === 0 && statusFilters.length === 0)
+		}
+
+		if (hasSingleplayerFilter && typeFilters.length === 0 && statusFilters.length === 0) {
+			return false
+		}
+
+		let passesType = true
+		if (typeFilters.length > 0) {
+			const isModded = x.content_kind === 'modpack'
+			passesType =
+				(typeFilters.includes('modded') && isModded) ||
+				(typeFilters.includes('vanilla') && !isModded)
+		}
+
+		let passesStatus = true
+		if (statusFilters.length > 0) {
+			const isOnline = !!serverData.value[x.address]?.status
+			passesStatus =
+				(statusFilters.includes('online') && isOnline) ||
+				(statusFilters.includes('offline') && !isOnline)
+		}
+
+		return passesType && passesStatus
 	}),
 )

@@ -588,19 +752,4 @@ async function proceedDeleteWorld() {
 onUnmounted(() => {
 	unlistenProfile()
 })
-
-const messages = defineMessages({
-	singleplayer: {
-		id: 'instance.worlds.type.singleplayer',
-		defaultMessage: 'Singleplayer',
-	},
-	server: {
-		id: 'instance.worlds.type.server',
-		defaultMessage: 'Server',
-	},
-	available: {
-		id: 'instance.worlds.filter.available',
-		defaultMessage: 'Available',
-	},
-})
 </script>
@@ -1,7 +1,8 @@
+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 Worlds from './Worlds.vue'

-export { Index, Logs, Mods, Overview, Worlds }
+export { Files, Index, Logs, Mods, Overview, Worlds }
@@ -1,11 +1,10 @@
 <script setup lang="ts">
 import { PlusIcon } from '@modrinth/assets'
-import { Button, injectNotificationManager } from '@modrinth/ui'
+import { Button, injectNotificationManager, NavTabs } from '@modrinth/ui'
 import { inject, onUnmounted, ref, shallowRef } from 'vue'
 import { useRoute } from 'vue-router'

 import { NewInstanceImage } from '@/assets/icons'
-import NavTabs from '@/components/ui/NavTabs.vue'
 import { profile_listener } from '@/helpers/events.js'
 import { list } from '@/helpers/profile.js'
 import { useBreadcrumbs } from '@/store/breadcrumbs.js'
@@ -5,7 +5,7 @@
 				v-if="!isServerProject"
 				:project="data"
 				:tags="{ loaders: allLoaders, gameVersions: allGameVersions }"
-				:v3-metadata="projectV3"
+				:project-v3="projectV3"
 				class="project-sidebar-section"
 			/>
 			<ProjectSidebarServerInfo
@@ -170,10 +170,7 @@
 						},
 						{
 							label: 'Versions',
-							href: {
-								path: `/project/${$route.params.id}/versions`,
-								query: instanceFilters,
-							},
+							href: versionsHref,
 							subpages: ['version'],
 							shown: projectV3?.minecraft_server == null,
 						},
@@ -224,6 +221,7 @@ import {
 import {
 	ButtonStyled,
 	injectNotificationManager,
+	NavTabs,
 	OverflowMenu,
 	ProjectBackgroundGradient,
 	ProjectHeader,
@@ -242,7 +240,6 @@ import { useRoute, useRouter } from 'vue-router'

 import ContextMenu from '@/components/ui/ContextMenu.vue'
 import InstanceIndicator from '@/components/ui/InstanceIndicator.vue'
-import NavTabs from '@/components/ui/NavTabs.vue'
 import {
 	get_organization,
 	get_project,
@@ -318,6 +315,21 @@ const instanceFilters = computed(() => {
 	return { l: loaders, g: instance.value.game_version }
 })

+const versionsHref = computed(() => {
+	const base = `/project/${route.params.id}/versions`
+	const filters = instanceFilters.value
+	const params = new URLSearchParams()
+	for (const [key, val] of Object.entries(filters)) {
+		if (Array.isArray(val)) {
+			for (const v of val) params.append(key, v)
+		} else if (val) {
+			params.append(key, String(val))
+		}
+	}
+	const qs = params.toString()
+	return qs ? `${base}?${qs}` : base
+})
+
 const [allLoaders, allGameVersions] = await Promise.all([
 	get_loaders().catch(handleError).then(ref),
 	get_game_versions().catch(handleError).then(ref),
@@ -133,6 +133,8 @@ export function createContentInstall(opts: {
 			title: string
 			icon_url?: string | null
 			project_type?: string
+			organization?: string | null
+			team?: string
 		},
 		version?: Labrinth.Versions.v2.Version,
 	) {
@@ -164,6 +166,60 @@ export function createContentInstall(opts: {
 		if (items.some((i) => i.file_name === placeholder.file_name)) return
 		next.set(instancePath, [...items, placeholder])
 		installingItems.value = next
+
+		if (project.organization) {
+			get_organization(project.organization)
+				.then((org: { id: string; slug: string; name: string; icon_url?: string }) => {
+					updateInstallingItem(instancePath, placeholder.file_name, {
+						owner: {
+							id: org.id,
+							name: org.name,
+							avatar_url: org.icon_url,
+							type: 'organization',
+						},
+					})
+				})
+				.catch(() => {})
+		} else if (project.team) {
+			get_team(project.team)
+				.then(
+					(
+						members: {
+							user: { id: string; username: string; avatar_url?: string }
+							is_owner: boolean
+						}[],
+					) => {
+						const owner = members.find((m) => m.is_owner)
+						if (owner) {
+							updateInstallingItem(instancePath, placeholder.file_name, {
+								owner: {
+									id: owner.user.id,
+									name: owner.user.username,
+									avatar_url: owner.user.avatar_url,
+									type: 'user',
+								},
+							})
+						}
+					},
+				)
+				.catch(() => {})
+		}
+	}
+
+	function updateInstallingItem(
+		instancePath: string,
+		fileName: string,
+		updates: Partial<ContentItem>,
+	) {
+		const next = new Map(installingItems.value)
+		const items = next.get(instancePath)
+		if (!items) return
+		const index = items.findIndex((i) => i.file_name === fileName)
+		if (index === -1) return
+		const updated = [...items]
+		updated[index] = { ...updated[index], ...updates }
+		next.set(instancePath, updated)
+		installingItems.value = next
 	}

 	function removeInstallingItems(instancePath: string, projectIds: string[]) {
@@ -1,10 +1,10 @@
 import { createContext } from '@modrinth/ui'
-import type { Ref } from 'vue'
+import type { ComputedRef, Ref } from 'vue'

 import type { GameInstance } from '@/helpers/types'

 export interface InstanceSettingsContext {
-	instance: GameInstance
+	instance: ComputedRef<GameInstance>
 	offline?: boolean
 	isMinecraftServer: Ref<boolean>
 	onUnlinked: () => void
@@ -0,0 +1,31 @@
+import type { Labrinth } from '@modrinth/api-client'
+import { type AuthProvider, provideAuth } from '@modrinth/ui'
+import { computed, type Ref, ref, watchEffect } from 'vue'
+
+type AppCredentials = {
+	session?: string | null
+	user?: Labrinth.Users.v2.User | null
+}
+
+export function setupAuthProvider(
+	credentials: Ref<AppCredentials | null | undefined>,
+	requestSignIn: (redirectPath: string) => void | Promise<void>,
+) {
+	const sessionToken = ref<string | null>(null)
+	const user = ref<Labrinth.Users.v2.User | null>(null)
+	const isReady = computed(() => credentials.value !== undefined)
+
+	const authProvider: AuthProvider = {
+		session_token: sessionToken,
+		user,
+		isReady,
+		requestSignIn,
+	}
+
+	watchEffect(() => {
+		sessionToken.value = credentials.value?.session ?? null
+		user.value = credentials.value?.user ?? null
+	})
+
+	provideAuth(authProvider)
+}
@@ -0,0 +1,393 @@
+import type { Archon, Labrinth } from '@modrinth/api-client'
+import {
+	createContext,
+	type CreationFlowContextValue,
+	injectModrinthClient,
+	injectNotificationManager,
+} from '@modrinth/ui'
+import { computed, type ComputedRef, nextTick, type Ref, ref, watch } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+
+type ServerFlowFrom = 'onboarding' | 'reset-server'
+type ServerInstallableType = 'modpack' | 'mod' | 'plugin' | 'datapack'
+
+type InstallableSearchResult = Labrinth.Search.v3.ResultSearchProject & {
+	installing?: boolean
+	installed?: boolean
+}
+
+interface ServerModpackSelectionRequest {
+	projectId: string
+	versionId: string
+	name: string
+	iconUrl?: string
+}
+
+interface ServerSetupModalHandle {
+	show: () => void | Promise<void>
+	hide: () => void
+	ctx?: CreationFlowContextValue | null
+}
+
+export interface ServerInstallContentContext {
+	serverIdQuery: ComputedRef<string | null>
+	worldIdQuery: ComputedRef<string | null>
+	browseFrom: ComputedRef<string | null>
+	serverFlowFrom: ComputedRef<ServerFlowFrom | null>
+	isFromWorlds: ComputedRef<boolean>
+	isServerContext: ComputedRef<boolean>
+	isSetupServerContext: ComputedRef<boolean>
+	effectiveServerWorldId: ComputedRef<string | null>
+	serverContextServerData: Ref<Archon.Servers.v0.Server | null>
+	serverContentProjectIds: Ref<Set<string>>
+	serverBackUrl: ComputedRef<string>
+	serverBackLabel: ComputedRef<string>
+	serverBrowseHeading: ComputedRef<string>
+	initServerContext: () => Promise<void>
+	watchServerContextChanges: () => void
+	searchServerModpacks: (
+		query: string,
+		limit?: number,
+	) => Promise<Labrinth.Projects.v2.SearchResult>
+	getServerProjectVersions: (projectId: string) => Promise<{ id: string }[]>
+	enforceSetupModpackRoute: (currentProjectType: string | undefined) => void
+	installProjectToServer: (project: InstallableSearchResult) => Promise<boolean>
+	onServerFlowBack: () => void
+	handleServerModpackFlowCreate: (config: CreationFlowContextValue) => Promise<void>
+	markServerProjectInstalled: (id: string) => void
+}
+
+export const [injectServerInstallContent, provideServerInstallContent] =
+	createContext<ServerInstallContentContext>('Browse', 'serverInstallContent')
+
+function readQueryString(value: unknown): string | null {
+	if (Array.isArray(value)) return value[0] ?? null
+	return typeof value === 'string' && value.length > 0 ? value : null
+}
+
+export function createServerInstallContent(opts: {
+	serverSetupModalRef: Ref<ServerSetupModalHandle | null>
+}) {
+	const { serverSetupModalRef } = opts
+	const route = useRoute()
+	const router = useRouter()
+	const client = injectModrinthClient()
+	const { handleError } = injectNotificationManager()
+
+	const serverIdQuery = computed(() => readQueryString(route.query.sid))
+	const worldIdQuery = computed(() => readQueryString(route.query.wid))
+	const browseFrom = computed(() => readQueryString(route.query.from))
+	const serverFlowFrom = computed<ServerFlowFrom | null>(() =>
+		browseFrom.value === 'onboarding' || browseFrom.value === 'reset-server'
+			? browseFrom.value
+			: null,
+	)
+
+	const isFromWorlds = computed(() => browseFrom.value === 'worlds')
+	const isServerContext = computed(() => !!serverIdQuery.value)
+	const isSetupServerContext = computed(() => !!serverIdQuery.value && !!serverFlowFrom.value)
+
+	const serverContextWorldId = ref<string | null>(worldIdQuery.value)
+	const serverContextServerData = ref<Archon.Servers.v0.Server | null>(null)
+	const serverContentProjectIds = ref<Set<string>>(new Set())
+	const effectiveServerWorldId = computed(() => worldIdQuery.value ?? serverContextWorldId.value)
+
+	const serverBackUrl = computed(() => {
+		const sid = serverIdQuery.value
+		if (!sid) return '/hosting/manage'
+		if (serverFlowFrom.value === 'onboarding') {
+			return `/hosting/manage/${sid}?resumeModal=setup-type`
+		}
+		if (serverFlowFrom.value === 'reset-server') {
+			return `/hosting/manage/${sid}?openSettings=installation`
+		}
+		return `/hosting/manage/${sid}/content`
+	})
+	const serverBackLabel = computed(() => {
+		if (serverFlowFrom.value === 'onboarding') return 'Back to setup'
+		if (serverFlowFrom.value === 'reset-server') return 'Cancel reset'
+		return 'Back to server'
+	})
+	const serverBrowseHeading = computed(() => {
+		if (serverFlowFrom.value === 'reset-server') {
+			return 'Select modpack to install after reset'
+		}
+		return 'Install content to server'
+	})
+
+	async function resolveServerContextWorldId(serverId: string) {
+		try {
+			const server = await client.archon.servers_v1.get(serverId)
+			const activeWorld = server.worlds.find((world) => world.is_active)
+			return activeWorld?.id ?? server.worlds[0]?.id ?? null
+		} catch (err) {
+			handleError(err as Error)
+			return null
+		}
+	}
+
+	async function refreshServerInstalledContent(serverId: string, worldId: string) {
+		try {
+			const content = await client.archon.content_v1.getAddons(serverId, worldId)
+			const ids = new Set(
+				(content.addons ?? [])
+					.map((addon) => addon.project_id)
+					.filter((projectId): projectId is string => !!projectId),
+			)
+			serverContentProjectIds.value = ids
+		} catch (err) {
+			handleError(err as Error)
+		}
+	}
+
+	async function initServerContext() {
+		const sid = serverIdQuery.value
+		if (!sid) return
+
+		try {
+			serverContextServerData.value = await client.archon.servers_v0.get(sid)
+		} catch (err) {
+			handleError(err as Error)
+		}
+
+		let resolvedWorldId = effectiveServerWorldId.value
+		if (!resolvedWorldId) {
+			resolvedWorldId = await resolveServerContextWorldId(sid)
+			if (resolvedWorldId) {
+				serverContextWorldId.value = resolvedWorldId
+			}
+		}
+
+		if (resolvedWorldId) {
+			await refreshServerInstalledContent(sid, resolvedWorldId)
+		}
+	}
+
+	function watchServerContextChanges() {
+		watch([serverIdQuery, effectiveServerWorldId], async ([sid, wid], [prevSid, prevWid]) => {
+			if (!sid) {
+				serverContextServerData.value = null
+				serverContentProjectIds.value = new Set()
+				return
+			}
+
+			if (sid !== prevSid) {
+				serverContentProjectIds.value = new Set()
+				try {
+					serverContextServerData.value = await client.archon.servers_v0.get(sid)
+				} catch (err) {
+					handleError(err as Error)
+				}
+			}
+
+			if (wid && (sid !== prevSid || wid !== prevWid)) {
+				await refreshServerInstalledContent(sid, wid)
+			}
+		})
+	}
+
+	function normalizeLoader(loader: string) {
+		return loader.toLowerCase().replaceAll('_', '').replaceAll('-', '').replaceAll(' ', '')
+	}
+
+	function getCompatibleLoaders(loader: string) {
+		const normalized = normalizeLoader(loader)
+		if (!normalized) return new Set<string>()
+		if (normalized === 'paper' || normalized === 'purpur' || normalized === 'spigot') {
+			return new Set(['paper', 'purpur', 'spigot', 'bukkit'])
+		}
+		if (normalized === 'neoforge' || normalized === 'neo') {
+			return new Set(['neoforge', 'neo'])
+		}
+		return new Set([normalized])
+	}
+
+	function enforceSetupModpackRoute(currentProjectType: string | undefined) {
+		if (!isSetupServerContext.value || currentProjectType === 'modpack') return
+		router.replace({
+			path: '/browse/modpack',
+			query: route.query,
+		})
+	}
+
+	async function searchServerModpacks(query: string, limit: number = 10) {
+		return client.labrinth.projects_v2.search({
+			query: query || undefined,
+			new_filters:
+				'project_types = "modpack" AND (client_side = "optional" OR client_side = "required") AND server_side = "required"',
+			limit,
+		})
+	}
+
+	async function getServerProjectVersions(projectId: string) {
+		const versions = await client.labrinth.versions_v3.getProjectVersions(projectId)
+		return versions.map((version) => ({ id: version.id }))
+	}
+
+	async function openServerModpackInstallFlow(request: ServerModpackSelectionRequest) {
+		if (!serverIdQuery.value || !effectiveServerWorldId.value) {
+			throw new Error('Missing server context')
+		}
+
+		const modalInstance = serverSetupModalRef.value
+		if (!modalInstance) return
+
+		modalInstance.show()
+		await nextTick()
+
+		const ctx = modalInstance.ctx
+		if (!ctx) return
+
+		ctx.setupType.value = 'modpack'
+		ctx.modpackSelection.value = {
+			projectId: request.projectId,
+			versionId: request.versionId,
+			name: request.name,
+			iconUrl: request.iconUrl,
+		}
+		ctx.modal.value?.setStage('final-config')
+	}
+
+	function getCurrentServerInstallType(): ServerInstallableType {
+		const raw = Array.isArray(route.params.projectType)
+			? route.params.projectType[0]
+			: route.params.projectType
+		if (raw === 'modpack' || raw === 'mod' || raw === 'plugin' || raw === 'datapack') {
+			return raw
+		}
+		throw new Error('This content type cannot be installed to a server from browse.')
+	}
+
+	async function installProjectToServer(project: InstallableSearchResult) {
+		const contentType = getCurrentServerInstallType()
+		const sid = serverIdQuery.value
+		const wid = effectiveServerWorldId.value
+		if (!sid || !wid) {
+			throw new Error('No server world is available for install.')
+		}
+
+		if (contentType === 'modpack') {
+			const versions = await client.labrinth.versions_v2.getProjectVersions(project.project_id, {
+				include_changelog: false,
+			})
+			const versionId = versions[0]?.id ?? project.version_id
+			if (!versionId) {
+				throw new Error('No version found for this modpack')
+			}
+
+			await openServerModpackInstallFlow({
+				projectId: project.project_id,
+				versionId,
+				name: project.name,
+				iconUrl: project.icon_url ?? undefined,
+			})
+			return false
+		}
+
+		const versions = await client.labrinth.versions_v2.getProjectVersions(project.project_id, {
+			include_changelog: false,
+		})
+		const serverLoader = (serverContextServerData.value?.loader ?? '').toLowerCase()
+		const serverGameVersion = (serverContextServerData.value?.mc_version ?? '').trim()
+		const compatibleLoaders = getCompatibleLoaders(serverLoader)
+
+		const hasGameVersionMatch = (version: Labrinth.Versions.v2.Version) =>
+			!serverGameVersion || version.game_versions.includes(serverGameVersion)
+		const hasLoaderMatch = (version: Labrinth.Versions.v2.Version) => {
+			if (contentType === 'datapack') return true
+			if (compatibleLoaders.size === 0) return true
+			return version.loaders.some((loader) => compatibleLoaders.has(normalizeLoader(loader)))
+		}
+
+		let matchingVersion = versions.find(
+			(version) => hasGameVersionMatch(version) && hasLoaderMatch(version),
+		)
+		if (!matchingVersion) {
+			matchingVersion = versions.find((version) => hasLoaderMatch(version))
+		}
+		if (!matchingVersion) {
+			matchingVersion = versions.find((version) => hasGameVersionMatch(version))
+		}
+		if (!matchingVersion) {
+			matchingVersion = versions[0]
+		}
+		if (!matchingVersion) {
+			throw new Error('No installable version was found for this project.')
+		}
+
+		await client.archon.content_v1.addAddon(sid, wid, {
+			project_id: matchingVersion.project_id,
+			version_id: matchingVersion.id,
+		})
+
+		serverContentProjectIds.value = new Set([...serverContentProjectIds.value, project.project_id])
+		return true
+	}
+
+	function onServerFlowBack() {
+		serverSetupModalRef.value?.hide()
+	}
+
+	async function handleServerModpackFlowCreate(config: CreationFlowContextValue) {
+		const sid = serverIdQuery.value
+		const wid = effectiveServerWorldId.value
+		if (!sid || !wid || !config.modpackSelection.value) {
+			config.loading.value = false
+			return
+		}
+
+		try {
+			await client.archon.content_v1.installContent(sid, wid, {
+				content_variant: 'modpack',
+				spec: {
+					platform: 'modrinth',
+					project_id: config.modpackSelection.value.projectId,
+					version_id: config.modpackSelection.value.versionId,
+				},
+				soft_override: false,
+				properties: config.buildProperties(),
+			} satisfies Archon.Content.v1.InstallWorldContent)
+			serverSetupModalRef.value?.hide()
+
+			if (serverFlowFrom.value === 'onboarding') {
+				await client.archon.servers_v1.endIntro(sid)
+				await router.push(`/hosting/manage/${sid}/content`)
+				return
+			}
+
+			await router.push(`/hosting/manage/${sid}?openSettings=installation`)
+		} catch (err) {
+			handleError(err as Error)
+			config.loading.value = false
+		}
+	}
+
+	function markServerProjectInstalled(id: string) {
+		serverContentProjectIds.value = new Set([...serverContentProjectIds.value, id])
+	}
+
+	return {
+		serverIdQuery,
+		worldIdQuery,
+		browseFrom,
+		serverFlowFrom,
+		isFromWorlds,
+		isServerContext,
+		isSetupServerContext,
+		effectiveServerWorldId,
+		serverContextServerData,
+		serverContentProjectIds,
+		serverBackUrl,
+		serverBackLabel,
+		serverBrowseHeading,
+		initServerContext,
+		watchServerContextChanges,
+		searchServerModpacks,
+		getServerProjectVersions,
+		enforceSetupModpackRoute,
+		installProjectToServer,
+		onServerFlowBack,
+		handleServerModpackFlowCreate,
+		markServerProjectInstalled,
+	}
+}
@@ -1,7 +1,7 @@
-import { ServersManagePageIndex } from '@modrinth/ui'
 import { createRouter, createWebHistory } from 'vue-router'

 import * as Pages from '@/pages'
+import * as Hosting from '@/pages/hosting/manage'
 import * as Instance from '@/pages/instance'
 import * as Library from '@/pages/library'
 import * as Project from '@/pages/project'
@@ -31,17 +31,57 @@ export default new createRouter({
 		{
 			path: '/hosting/manage/',
 			name: 'Servers',
-			component: ServersManagePageIndex,
+			component: Pages.Servers,
 			meta: {
 				breadcrumb: [{ name: 'Servers' }],
 			},
 		},
+		{
+			path: '/hosting/manage/:id',
+			name: 'ServerManage',
+			component: Hosting.Index,
+			children: [
+				{
+					path: '',
+					name: 'ServerManageOverview',
+					component: Hosting.Overview,
+					meta: {
+						breadcrumb: [{ name: '?Server' }],
+					},
+				},
+				{
+					path: 'content',
+					name: 'ServerManageContent',
+					component: Hosting.Content,
+					meta: {
+						breadcrumb: [{ name: '?Server' }],
+					},
+				},
+				{
+					path: 'files',
+					name: 'ServerManageFiles',
+					component: Hosting.Files,
+					meta: {
+						breadcrumb: [{ name: '?Server' }],
+					},
+				},
+				{
+					path: 'backups',
+					name: 'ServerManageBackups',
+					component: Hosting.Backups,
+					meta: {
+						breadcrumb: [{ name: '?Server' }],
+					},
+				},
+			],
+		},
 		{
 			path: '/browse/:projectType',
 			name: 'Discover content',
 			component: Pages.Browse,
 			meta: {
-				breadcrumb: [{ name: 'Discover content' }],
+				useContext: true,
+				breadcrumb: [{ name: '?BrowseTitle' }],
 			},
 		},
 		{
@@ -87,6 +127,13 @@ export default new createRouter({
 				},
 			],
 		},
+		{
+			path: '/:projectType(mod|plugin|datapack|resourcepack|shader|modpack)/:id/:rest(.*)*',
+			redirect: (to) => {
+				const rest = to.params.rest ? `/${[].concat(to.params.rest).join('/')}` : ''
+				return `/project/${to.params.id}${rest}${to.hash}`
+			},
+		},
 		{
 			path: '/project/:id',
 			name: 'Project',
@@ -178,6 +225,15 @@ export default new createRouter({
 						breadcrumb: [{ name: '?Instance', link: '/instance/{id}/' }, { name: 'Content' }],
 					},
 				},
+				{
+					path: 'files',
+					name: 'Files',
+					component: Instance.Files,
+					meta: {
+						useRootContext: true,
+						breadcrumb: [{ name: '?Instance', link: '/instance/{id}/' }, { name: 'Files' }],
+					},
+				},
 				{
 					path: 'logs',
 					name: 'Logs',
@@ -192,7 +248,8 @@ export default new createRouter({
 	],
 	linkActiveClass: 'router-link-active',
 	linkExactActiveClass: 'router-link-exact-active',
-	scrollBehavior() {
+	scrollBehavior(to, from) {
+		if (to.path === from.path) return
 		// Sometimes Vue's scroll behavior is not working as expected, so we need to manually scroll to top (especially on Linux)
 		document.querySelector('.app-viewport')?.scrollTo(0, 0)
 		return {
@@ -2,7 +2,7 @@

 import dayjs from 'dayjs'

-import { get_project, get_version_many } from '@/helpers/cache.js'
+import { get_project, get_version, get_version_many } from '@/helpers/cache.js'
 import { add_project_from_version, check_installed } from '@/helpers/profile.js'
 import {
 	add_server_to_profile,
@@ -49,32 +49,137 @@ export const isVersionCompatible = (version, project, instance) => {
 }

 export const installVersionDependencies = async (profile, version, onDepInstalling) => {
-	for (const dep of version.dependencies) {
-		if (dep.dependency_type !== 'required') continue
-		// disallow fabric api install on quilt
-		if (dep.project_id === 'P7dR8mSH' && profile.loader === 'quilt') continue
-		if (dep.version_id) {
-			if (dep.project_id && (await check_installed(profile.path, dep.project_id))) continue
-			if (dep.project_id && onDepInstalling) {
-				const depProject = await get_project(dep.project_id, 'bypass').catch(() => null)
-				if (depProject) onDepInstalling(depProject)
-			}
-			await add_project_from_version(profile.path, dep.version_id)
-		} else {
-			if (dep.project_id && (await check_installed(profile.path, dep.project_id))) continue
+	const projectNames = new Map()
+	const storeProjectName = (p) => {
+		if (p?.id && p.title) projectNames.set(p.id, p.title)
+	}

-			const depProject = await get_project(dep.project_id, 'bypass')
-			if (onDepInstalling) onDepInstalling(depProject)
+	const visitedVersions = new Set()
+	const announcedProjects = new Set()
+	const queuedVersionIds = new Set()
+	const queuedProjectVersions = new Map()
+	const queuedInstalls = []
+	const installedProjectCache = new Map()

-			const depVersions = (await get_version_many(depProject.versions, 'bypass')).sort(
-				(a, b) => dayjs(b.date_published) - dayjs(a.date_published),
-			)
-
-			const latest = findPreferredVersion(depVersions, dep, profile)
-			if (latest) {
-				await add_project_from_version(profile.path, latest.id)
-			}
+	const isProjectInstalled = async (projectId) => {
+		if (!projectId) return false
+		if (installedProjectCache.has(projectId)) {
+			return installedProjectCache.get(projectId)
 		}
+		const installed = await check_installed(profile.path, projectId)
+		installedProjectCache.set(projectId, installed)
+		return installed
+	}
+
+	const queueInstall = async (projectId, resolvedVersion) => {
+		if (!resolvedVersion?.id) return false
+
+		const versionId = resolvedVersion.id
+		const resolvedProjectId = projectId ?? resolvedVersion.project_id ?? null
+
+		if (resolvedProjectId) {
+			if (await isProjectInstalled(resolvedProjectId)) return false
+
+			const existingVersionId = queuedProjectVersions.get(resolvedProjectId)
+			if (existingVersionId && existingVersionId !== versionId) return false
+			if (existingVersionId === versionId) return false
+		}
+
+		if (queuedVersionIds.has(versionId)) return false
+
+		queuedVersionIds.add(versionId)
+		if (resolvedProjectId) {
+			queuedProjectVersions.set(resolvedProjectId, versionId)
+		}
+		queuedInstalls.push({ versionId, projectId: resolvedProjectId })
+		return true
+	}
+
+	const announceDependency = async (projectId, resolvedVersion) => {
+		if (!onDepInstalling || !projectId) return
+		if (announcedProjects.has(projectId)) return
+
+		const depProject = await get_project(projectId, 'bypass').catch(() => null)
+		if (!depProject) return
+
+		storeProjectName(depProject)
+		onDepInstalling(depProject, resolvedVersion ?? undefined)
+		announcedProjects.add(projectId)
+	}
+
+	const resolveDependency = async (dep) => {
+		let depVersion = null
+		let depProjectId = dep.project_id ?? null
+
+		if (dep.version_id) {
+			depVersion = await get_version(dep.version_id, 'bypass').catch(() => null)
+			if (!depVersion) return null
+
+			depProjectId = depProjectId ?? depVersion.project_id ?? null
+			if (depProjectId && !projectNames.has(depProjectId)) {
+				const p = await get_project(depProjectId, 'bypass').catch(() => null)
+				storeProjectName(p)
+			}
+		} else if (dep.project_id) {
+			const depProject = await get_project(dep.project_id, 'bypass').catch(() => null)
+			if (!depProject) return null
+
+			storeProjectName(depProject)
+
+			const depVersions = await get_version_many(depProject.versions, 'bypass').catch(() => [])
+			depVersion = findPreferredVersion(
+				depVersions.sort((a, b) => dayjs(b.date_published) - dayjs(a.date_published)),
+				dep,
+				profile,
+			)
+			if (!depVersion) return null
+
+			depProjectId = dep.project_id
+		} else {
+			return null
+		}
+
+		return { depVersion, depProjectId }
+	}
+
+	const collectDependenciesForVersion = async (inputVersion) => {
+		if (!inputVersion?.id || visitedVersions.has(inputVersion.id)) return
+		visitedVersions.add(inputVersion.id)
+
+		if (inputVersion.project_id && !projectNames.has(inputVersion.project_id)) {
+			const p = await get_project(inputVersion.project_id, 'bypass').catch(() => null)
+			storeProjectName(p)
+		}
+
+		for (const dep of inputVersion.dependencies ?? []) {
+			if (dep.dependency_type !== 'required') continue
+			if (dep.project_id === 'P7dR8mSH' && profile.loader === 'quilt') continue
+
+			const resolved = await resolveDependency(dep, inputVersion)
+			if (!resolved) continue
+
+			const { depVersion, depProjectId } = resolved
+			const queued = await queueInstall(depProjectId, depVersion)
+			if (queued && depProjectId) {
+				await announceDependency(depProjectId, depVersion)
+			}
+
+			await collectDependenciesForVersion(depVersion)
+		}
+	}
+
+	await collectDependenciesForVersion(version)
+
+	if (queuedInstalls.length === 0) return
+
+	const batchSize = 8
+	for (let i = 0; i < queuedInstalls.length; i += batchSize) {
+		const batch = queuedInstalls.slice(i, i + batchSize)
+		await Promise.all(
+			batch.map(async ({ versionId }) => {
+				await add_project_from_version(profile.path, versionId)
+			}),
+		)
 	}
 }

@@ -5,8 +5,8 @@ export const DEFAULT_FEATURE_FLAGS = {
 	page_path: false,
 	worlds_tab: false,
 	worlds_in_home: true,
-	servers_in_app: false,
 	server_project_qa: false,
+	server_ram_as_bytes_always_on: false,
 	i18n_debug: false,
 }

@@ -3,7 +3,7 @@
 		"target": "ES2020",
 		"useDefineForClassFields": true,
 		"module": "ESNext",
-		"lib": ["ES2020", "DOM", "DOM.Iterable"],
+		"lib": ["ES2021", "DOM", "DOM.Iterable"],
 		"skipLibCheck": true,

 		"moduleResolution": "bundler",
@@ -16,6 +16,8 @@

 		"strict": true,

+		"types": ["vite/client"],
+
 		"paths": {
 			"@/*": ["./src/*"]
 		}
@@ -1,4 +1,5 @@
 import vue from '@vitejs/plugin-vue'
+import { existsSync, readFileSync } from 'fs'
 import { resolve } from 'path'
 import { defineConfig } from 'vite'
 import svgLoader from 'vite-svg-loader'
@@ -6,6 +7,23 @@ import svgLoader from 'vite-svg-loader'
 import tauriConf from '../app/tauri.conf.json'

 const projectRootDir = resolve(__dirname)
+const appLibEnvDir = resolve(projectRootDir, '../../packages/app-lib')
+
+// Load .env from app-lib manually instead of using Vite's envDir, which would auto-load .env.local and override values
+const envFilePath = resolve(appLibEnvDir, '.env')
+if (existsSync(envFilePath)) {
+	for (const line of readFileSync(envFilePath, 'utf-8').split('\n')) {
+		const trimmed = line.trim()
+		if (!trimmed || trimmed.startsWith('#')) continue
+		const eqIndex = trimmed.indexOf('=')
+		if (eqIndex === -1) continue
+		const key = trimmed.slice(0, eqIndex)
+		const value = trimmed.slice(eqIndex + 1)
+		if (!(key in process.env)) {
+			process.env[key] = value
+		}
+	}
+}

 // https://vitejs.dev/config/
 export default defineConfig({
@@ -68,16 +86,19 @@ export default defineConfig({
 	},
 	// to make use of `TAURI_ENV_DEBUG` and other env variables
 	// https://v2.tauri.app/reference/environment-variables/#tauri-cli-hook-commands
-	envPrefix: ['VITE_', 'TAURI_'],
+	envPrefix: ['VITE_', 'TAURI_', 'MODRINTH_'],
 	build: {
+		rolldownOptions: {
+			onwarn(warning, defaultHandler) {
+				if (warning.code === 'INEFFECTIVE_DYNAMIC_IMPORT') return
+				defaultHandler(warning)
+			},
+		},
 		// Tauri supports es2021
 		target: process.env.TAURI_ENV_PLATFORM == 'windows' ? 'chrome105' : 'safari13', // eslint-disable-line turbo/no-undeclared-env-vars
 		// don't minify for debug builds
-		minify: !process.env.TAURI_ENV_DEBUG ? 'esbuild' : false, // eslint-disable-line turbo/no-undeclared-env-vars
+		minify: !process.env.TAURI_ENV_DEBUG, // eslint-disable-line turbo/no-undeclared-env-vars
 		// produce sourcemaps for debug builds
 		sourcemap: !!process.env.TAURI_ENV_DEBUG, // eslint-disable-line turbo/no-undeclared-env-vars
-		commonjsOptions: {
-			esmExternals: true,
-		},
 	},
 })
--- a/Show More
+++ b/Show More