From 7a72556c757fb3c9cab79c5b5919bd34807c8b20 Mon Sep 17 00:00:00 2001
From: "Calum H. (IMB11)" <contact@cal.engineer>
Date: Tue, 1 Sep 2026 12:29:31 +0100
Subject: [PATCH 01/33] draft: options.txt syncing

---
 .../instances/InstancesSyncedSettings.vue     | 221 +++++-
 .../game-settings/GameSettingRow.vue          | 260 +++++++
 .../game-settings/GameSettingsModal.vue       | 664 ++++++++++++++++++
 .../game-settings/game-setting-editors.ts     | 147 ++++
 .../game-settings/game-setting-messages.ts    | 468 ++++++++++++
 apps/app-frontend/src/helpers/game-options.ts | 176 +++++
 apps/app-frontend/src/helpers/instance.ts     |   3 +
 apps/app-frontend/src/helpers/types.d.ts      |   1 +
 .../synced-options-settings.vue               |  19 +-
 apps/app/build.rs                             |   4 +
 apps/app/src/api/instance.rs                  |  30 +
 ...926ef4cd958146c16797d589f347626dbab7e.json |  12 +
 ...fbd69200515a3e90400d7d002acd86cf03a8c.json |  12 +
 ...165d10b9a34a68eb4e85b7380eee167db92b0.json |  50 ++
 ...edac01d302922e9f44c4375046cc7ab5c367b.json |  12 +
 ...f719165ad8b7fe31ec84b8a6b31a45a00e634.json |  26 +
 ...5ed33f902980977f795d38f062bf7438c8334.json |  12 +
 ...6c0c2b1a888ea6c6c0542f4713b03bbafea7b.json |  12 +
 ...13d164438273c75ad4f22a4b81003e737da67.json |  32 +
 ...40087e771dfafc968144db5978c570e68a884.json |  12 +
 ...55a1a303360c04d865980ce37248b05ea3994.json |  12 +
 ...5dcf59f91565296e9ae97d210249cdcc29cfc.json |  26 +
 ...4bbbe293834ffd7b86b260a7bccb6c8028d92.json |  12 +
 ...f2dcb14f952cc7bcbb4661ff8abd4e168ee1c.json |  12 +
 ...bd64a1c6bb5fc5f3c0082500afdcfa7340efa.json |  63 +-
 ...40fb48d24b62a5ddddfc6de2f14b80d2bfc7c.json |  20 +
 ...fa810ad8ca5f246c4d81ad4bcd5866ee10f2c.json |  12 +
 ...f046e42ee66e31d99b8ff28917f58b4a937f6.json |  12 +
 ...1be42650f58edf2045fe1b85d418a537382e2.json |  12 +
 ...08acd794a400abeca0027cc6b21f5bd466e79.json |  12 +
 ...6d3d8c7b10211f275e0db81fa1eda5196c2e5.json |  12 +
 ...3a4767d4e9a28626c754bb4e8e7030b73ead7.json |  12 +
 ...65d017d21a6c6476d0f2ae09c076d75f0dda3.json |   4 +-
 ...2335be017bc4398a15149753bf31b2acac938.json |  12 +
 ...ca83c2626f097de53ec537f59b76fdb21eccb.json |  12 +
 ...98455c6db66d485824f27ab198c3f00de1770.json |  63 +-
 ...13a985f60f680c77885917f560760b5818b71.json |  12 +
 ...513dca33a6931b29489f59afddfc325d6258a.json |  12 +
 ...1f2783cbdd25a4c65031de3c0b2ed78acc0a2.json |  12 +
 ...b977c166ea70f3ec8f5a2aa8f067fa2f44733.json |  12 +
 ...ed581944cc9d9c335d1bc1c070863f93b276f.json |  12 +
 ...0ce434011c2e6bf3b76e0f8dd7d162ebb95ae.json |  12 +
 ...f5fe9c28436566c4d7b74bbcb9a82cb553959.json |  12 +
 ...8ee2852552b5b06a38deb6311a3bf2098cee8.json |  12 +
 ...d55605696d030a31be35669d8d0ee129c3f49.json |  12 +
 ...b1beaaca1254a4abcf2955c7af3bc5086f9cc.json |  20 +
 ...9103b04b9e94bbd663ec205002e3ab2ff6756.json |  12 +
 .../20260827120000_game-options-sync.sql      |  65 ++
 packages/app-lib/src/api/instance.rs          |  20 +-
 .../api/instance/game_options/api_types.rs    | 213 ++++++
 .../instance/game_options/instance_support.rs | 512 ++++++++++++++
 .../instance/game_options/launch_overrides.rs | 145 ++++
 .../src/api/instance/game_options/mod.rs      |  64 ++
 .../api/instance/game_options/options_file.rs | 317 +++++++++
 .../api/instance/game_options/pack_updates.rs | 236 +++++++
 .../game_options/read_instance_changes.rs     | 432 ++++++++++++
 .../instance/game_options/settings_editor.rs  | 518 ++++++++++++++
 .../instance/game_options/source_selection.rs | 421 +++++++++++
 .../supported_settings/accessibility.rs       |  51 ++
 .../game_options/supported_settings/chat.rs   |  57 ++
 .../supported_settings/controls.rs            | 221 ++++++
 .../supported_settings/known_vanilla_keys.rs  | 269 +++++++
 .../supported_settings/legacy_key_bindings.rs | 112 +++
 .../game_options/supported_settings/mod.rs    | 264 +++++++
 .../game_options/supported_settings/sound.rs  |  74 ++
 .../supported_settings/version_changes.rs     | 660 +++++++++++++++++
 .../game_options/supported_settings/video.rs  | 162 +++++
 .../game_options/write_shared_settings.rs     | 353 ++++++++++
 .../src/api/instance/synced_options/files.rs  |  23 +
 .../src/api/instance/synced_options/mod.rs    |   9 +-
 .../instance/synced_options/orchestration.rs  | 242 ++++++-
 .../app-lib/src/api/pack/install_mrpack.rs    |  48 +-
 packages/app-lib/src/install/runner.rs        |   1 +
 .../app-lib/src/install/shared_instance.rs    |  26 +
 packages/app-lib/src/launcher/mod.rs          |  57 +-
 .../adapters/sqlite/instance_rows.rs          |   2 +
 .../state/instances/commands/game_options.rs  | 136 ++++
 .../src/state/instances/commands/mod.rs       |   3 +
 packages/app-lib/src/state/instances/mod.rs   |   9 +
 .../src/state/instances/model/game_options.rs |  93 +++
 .../src/state/instances/model/instance.rs     |   7 +-
 .../app-lib/src/state/instances/model/mod.rs  |   7 +
 .../app-lib/src/state/instances/watcher.rs    |  70 +-
 packages/app-lib/src/state/mod.rs             |   9 +
 84 files changed, 8366 insertions(+), 163 deletions(-)
 create mode 100644 apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingRow.vue
 create mode 100644 apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingsModal.vue
 create mode 100644 apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-editors.ts
 create mode 100644 apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-messages.ts
 create mode 100644 apps/app-frontend/src/helpers/game-options.ts
 create mode 100644 packages/app-lib/.sqlx/query-006f7c73e672da9d9d607e58ce0926ef4cd958146c16797d589f347626dbab7e.json
 create mode 100644 packages/app-lib/.sqlx/query-06e155e02c8d097e32f18b161b3fbd69200515a3e90400d7d002acd86cf03a8c.json
 create mode 100644 packages/app-lib/.sqlx/query-083e4766729cc70fd43bcc2b920165d10b9a34a68eb4e85b7380eee167db92b0.json
 create mode 100644 packages/app-lib/.sqlx/query-117563d32f10e1e0f678d606aa5edac01d302922e9f44c4375046cc7ab5c367b.json
 create mode 100644 packages/app-lib/.sqlx/query-1499ce88ed936711e88354f6123f719165ad8b7fe31ec84b8a6b31a45a00e634.json
 create mode 100644 packages/app-lib/.sqlx/query-1d66f3fb56c2e74146f8bc3b2985ed33f902980977f795d38f062bf7438c8334.json
 create mode 100644 packages/app-lib/.sqlx/query-253ab2ee7d3504fbc1b098739d06c0c2b1a888ea6c6c0542f4713b03bbafea7b.json
 create mode 100644 packages/app-lib/.sqlx/query-27958cce6c5ed137310edc76fd113d164438273c75ad4f22a4b81003e737da67.json
 create mode 100644 packages/app-lib/.sqlx/query-39459b06ceb9ca531c476c6a77e40087e771dfafc968144db5978c570e68a884.json
 create mode 100644 packages/app-lib/.sqlx/query-465bc85ac3abc47c9179cf2f09e55a1a303360c04d865980ce37248b05ea3994.json
 create mode 100644 packages/app-lib/.sqlx/query-51adcaf25852937edaf46a304e85dcf59f91565296e9ae97d210249cdcc29cfc.json
 create mode 100644 packages/app-lib/.sqlx/query-58dbcc46287aa386bb87bebc0a94bbbe293834ffd7b86b260a7bccb6c8028d92.json
 create mode 100644 packages/app-lib/.sqlx/query-6b6645cbfb273b6c37f4c472d5df2dcb14f952cc7bcbb4661ff8abd4e168ee1c.json
 create mode 100644 packages/app-lib/.sqlx/query-7062aaed9cde80d865cf4c845cb40fb48d24b62a5ddddfc6de2f14b80d2bfc7c.json
 create mode 100644 packages/app-lib/.sqlx/query-71952a8ac14cf790a5b93eb722efa810ad8ca5f246c4d81ad4bcd5866ee10f2c.json
 create mode 100644 packages/app-lib/.sqlx/query-738203b62c0c38211bb535a3595f046e42ee66e31d99b8ff28917f58b4a937f6.json
 create mode 100644 packages/app-lib/.sqlx/query-76896bb2061e4c839a53bed4a221be42650f58edf2045fe1b85d418a537382e2.json
 create mode 100644 packages/app-lib/.sqlx/query-7874719d05692b28b1c2cdbd6f208acd794a400abeca0027cc6b21f5bd466e79.json
 create mode 100644 packages/app-lib/.sqlx/query-7a91c72a32d0d8cf712ddcbe9746d3d8c7b10211f275e0db81fa1eda5196c2e5.json
 create mode 100644 packages/app-lib/.sqlx/query-838b438f2dfa21885848b2eaf013a4767d4e9a28626c754bb4e8e7030b73ead7.json
 create mode 100644 packages/app-lib/.sqlx/query-8e5cb4f707e7adae2d7fce146402335be017bc4398a15149753bf31b2acac938.json
 create mode 100644 packages/app-lib/.sqlx/query-91c09c88e89aadbf34fd823f119ca83c2626f097de53ec537f59b76fdb21eccb.json
 create mode 100644 packages/app-lib/.sqlx/query-aaaf087deec439148bc1aa7365913a985f60f680c77885917f560760b5818b71.json
 create mode 100644 packages/app-lib/.sqlx/query-aabd92c612d1c2b66c50385cb7a513dca33a6931b29489f59afddfc325d6258a.json
 create mode 100644 packages/app-lib/.sqlx/query-b6583d5f711af94f3f21c0fbd6d1f2783cbdd25a4c65031de3c0b2ed78acc0a2.json
 create mode 100644 packages/app-lib/.sqlx/query-c4c56a28a27c15ef48df89f5145b977c166ea70f3ec8f5a2aa8f067fa2f44733.json
 create mode 100644 packages/app-lib/.sqlx/query-c640d4a60e6eb04fb484e3c99bfed581944cc9d9c335d1bc1c070863f93b276f.json
 create mode 100644 packages/app-lib/.sqlx/query-c6eb6fd3bd76b37eacf442bdc1a0ce434011c2e6bf3b76e0f8dd7d162ebb95ae.json
 create mode 100644 packages/app-lib/.sqlx/query-d125cb88ef6a465b49ae207f5abf5fe9c28436566c4d7b74bbcb9a82cb553959.json
 create mode 100644 packages/app-lib/.sqlx/query-d642bafe7282bde2908f9add0ad8ee2852552b5b06a38deb6311a3bf2098cee8.json
 create mode 100644 packages/app-lib/.sqlx/query-d808d8eded7c18861d5e865bda7d55605696d030a31be35669d8d0ee129c3f49.json
 create mode 100644 packages/app-lib/.sqlx/query-ec00a599037bcf5fb080eb0f7cab1beaaca1254a4abcf2955c7af3bc5086f9cc.json
 create mode 100644 packages/app-lib/.sqlx/query-fc51a02b2fa872f4b105b0eb25f9103b04b9e94bbd663ec205002e3ab2ff6756.json
 create mode 100644 packages/app-lib/migrations/20260827120000_game-options-sync.sql
 create mode 100644 packages/app-lib/src/api/instance/game_options/api_types.rs
 create mode 100644 packages/app-lib/src/api/instance/game_options/instance_support.rs
 create mode 100644 packages/app-lib/src/api/instance/game_options/launch_overrides.rs
 create mode 100644 packages/app-lib/src/api/instance/game_options/mod.rs
 create mode 100644 packages/app-lib/src/api/instance/game_options/options_file.rs
 create mode 100644 packages/app-lib/src/api/instance/game_options/pack_updates.rs
 create mode 100644 packages/app-lib/src/api/instance/game_options/read_instance_changes.rs
 create mode 100644 packages/app-lib/src/api/instance/game_options/settings_editor.rs
 create mode 100644 packages/app-lib/src/api/instance/game_options/source_selection.rs
 create mode 100644 packages/app-lib/src/api/instance/game_options/supported_settings/accessibility.rs
 create mode 100644 packages/app-lib/src/api/instance/game_options/supported_settings/chat.rs
 create mode 100644 packages/app-lib/src/api/instance/game_options/supported_settings/controls.rs
 create mode 100644 packages/app-lib/src/api/instance/game_options/supported_settings/known_vanilla_keys.rs
 create mode 100644 packages/app-lib/src/api/instance/game_options/supported_settings/legacy_key_bindings.rs
 create mode 100644 packages/app-lib/src/api/instance/game_options/supported_settings/mod.rs
 create mode 100644 packages/app-lib/src/api/instance/game_options/supported_settings/sound.rs
 create mode 100644 packages/app-lib/src/api/instance/game_options/supported_settings/version_changes.rs
 create mode 100644 packages/app-lib/src/api/instance/game_options/supported_settings/video.rs
 create mode 100644 packages/app-lib/src/api/instance/game_options/write_shared_settings.rs
 create mode 100644 packages/app-lib/src/state/instances/commands/game_options.rs
 create mode 100644 packages/app-lib/src/state/instances/model/game_options.rs

diff --git a/apps/app-frontend/src/components/ui/settings/instances/InstancesSyncedSettings.vue b/apps/app-frontend/src/components/ui/settings/instances/InstancesSyncedSettings.vue
index 548abba7af..eba48797c7 100644
--- a/apps/app-frontend/src/components/ui/settings/instances/InstancesSyncedSettings.vue
+++ b/apps/app-frontend/src/components/ui/settings/instances/InstancesSyncedSettings.vue
@@ -26,7 +26,16 @@ import type { Component } from 'vue'
 import { computed, ref, shallowRef, watch } from 'vue'
 
 import WorldItem from '@/components/ui/world/WorldItem.vue'
+import GameSettingsModal from '@/components/ui/settings/instances/game-settings/GameSettingsModal.vue'
+import {
+	formatSourceDisabledReason,
+	formatSourceSettingsSummary,
+} from '@/components/ui/settings/instances/game-settings/game-setting-messages'
 import useMemorySlider from '@/composables/useMemorySlider'
+import {
+	type GameOptionsSourceCandidate,
+	list_game_options_sync_sources,
+} from '@/helpers/game-options'
 import {
 	get_command_history,
 	get_global_synced_options,
@@ -65,6 +74,23 @@ const messages = defineMessages({
 	// 	id: 'app.settings.synced-options.folder',
 	// 	defaultMessage: 'Synced folder',
 	// },
+	gameSettings: {
+		id: 'app.settings.synced-options.game-settings',
+		defaultMessage: 'Game settings',
+	},
+	gameSettingsDescription: {
+		id: 'app.settings.synced-options.game-settings.description',
+		defaultMessage:
+			'You can choose which options to sync across instances so they apply on top of a modpack’s options.txt.',
+	},
+	gameSettingsButton: {
+		id: 'app.settings.synced-options.game-settings.button',
+		defaultMessage: 'Settings',
+	},
+	gameSettingsDisabledTooltip: {
+		id: 'app.settings.synced-options.game-settings.disabled-tooltip',
+		defaultMessage: 'Enable game settings sync before choosing individual settings.',
+	},
 	multiplayerServers: {
 		id: 'app.settings.synced-options.multiplayer-servers',
 		defaultMessage: 'Sync multiplayer servers',
@@ -105,6 +131,11 @@ const messages = defineMessages({
 		id: 'app.settings.synced-options.choose-sync-source.creative-hotbars-description',
 		defaultMessage: 'Pick the instance whose saved creative hotbars become the shared copy.',
 	},
+	gameSettingsSyncSourceDescription: {
+		id: 'app.settings.synced-options.choose-sync-source.game-settings-description',
+		defaultMessage:
+			'Pick the instance whose options.txt values become the shared game settings baseline.',
+	},
 	searchInstance: {
 		id: 'app.settings.synced-options.choose-sync-source.search-placeholder',
 		defaultMessage: 'Search instance',
@@ -292,8 +323,14 @@ const globalRows: Array<{
 	option: SyncedOption
 	title: keyof typeof messages
 	description?: keyof typeof messages
-	editable?: 'servers' | 'commands'
+	editable?: 'game-settings' | 'servers' | 'commands'
 }> = [
+	{
+		option: 'game_options',
+		title: 'gameSettings',
+		description: 'gameSettingsDescription',
+		editable: 'game-settings',
+	},
 	{
 		option: 'multiplayer_servers',
 		title: 'multiplayerServers',
@@ -316,6 +353,7 @@ const globalRows: Array<{
 const globalSyncedOptionsQueryKey = ['global-synced-options'] as const
 const globalSyncedOptionsMutationKey = ['global-synced-options', 'set'] as const
 const defaultGlobalOptions: GlobalSyncedOptions = {
+	game_options: false,
 	command_history: false,
 	multiplayer_servers: false,
 	creative_hotbars: false,
@@ -332,6 +370,7 @@ const baseOption = ref<SyncedOption | null>(null)
 const baseInstanceId = ref(instances.value[0]?.id ?? '')
 const baseInstanceSearch = ref('')
 const baseModal = ref<InstanceType<typeof NewModal> | null>(null)
+const gameSettingsModal = ref<InstanceType<typeof GameSettingsModal> | null>(null)
 const commandHistoryModal = ref<InstanceType<typeof NewModal> | null>(null)
 const serverEditorModal = ref<InstanceType<typeof NewModal> | null>(null)
 const editServerModal = ref<InstanceType<typeof NewModal> | null>(null)
@@ -345,6 +384,20 @@ const syncedServers = ref<SyncedServer[]>(
 const editedServer = ref<SyncedServer | null>(null)
 const serverData = ref<Record<string, ServerData>>({})
 const editorComponent = shallowRef<Component | null>(null)
+const gameOptionSources = ref<GameOptionsSourceCandidate[]>([])
+const baseSourcesLoading = ref(false)
+let baseSourceGeneration = 0
+
+type BaseSourceCandidate = {
+	id: string
+	name: string
+	icon_path?: string | null
+	game_version?: string | null
+	eligible: boolean
+	disabled_reason?: GameOptionsSourceCandidate['disabled_reason']
+	recognized_setting_count?: number
+	custom_setting_count?: number
+}
 
 const syncedServerCards = computed(() =>
 	syncedServers.value.map((server, index) => ({
@@ -368,6 +421,8 @@ const syncedServerCards = computed(() =>
 
 const baseInstanceDescription = computed(() => {
 	switch (baseOption.value) {
+		case 'game_options':
+			return formatMessage(messages.gameSettingsSyncSourceDescription)
 		case 'multiplayer_servers':
 			return formatMessage(messages.multiplayerServersSyncSourceDescription)
 		case 'command_history':
@@ -381,10 +436,44 @@ const baseInstanceDescription = computed(() => {
 
 const filteredBaseInstances = computed(() => {
 	const search = baseInstanceSearch.value.trim().toLowerCase()
-	if (!search) return instances.value
-	return instances.value.filter((instance) => instance.name.toLowerCase().includes(search))
+	const candidates: BaseSourceCandidate[] =
+		baseOption.value === 'game_options'
+			? gameOptionSources.value.map((source) => ({
+					id: source.source_id,
+					name: source.name,
+					icon_path: source.icon_path,
+					game_version: source.game_version,
+					eligible: source.eligible,
+					disabled_reason: source.disabled_reason,
+					recognized_setting_count: source.recognized_setting_count,
+					custom_setting_count: source.custom_setting_count,
+				}))
+			: instances.value.map((instance) => ({
+					id: instance.id,
+					name: instance.name,
+					icon_path: instance.icon_path,
+					game_version: instance.game_version,
+					eligible: true,
+				}))
+	if (!search) return candidates
+	return candidates.filter((instance) => instance.name.toLowerCase().includes(search))
 })
 
+function baseSourceDescription(source: BaseSourceCandidate): string | null {
+	if (source.disabled_reason) {
+		return formatSourceDisabledReason(formatMessage, source.disabled_reason)
+	}
+	if (
+		source.recognized_setting_count === undefined ||
+		source.custom_setting_count === undefined
+	)
+		return null
+	return formatSourceSettingsSummary(formatMessage, {
+		recognized_setting_count: source.recognized_setting_count,
+		custom_setting_count: source.custom_setting_count,
+	})
+}
+
 async function invalidateSyncedOptions() {
 	await Promise.all([
 		queryClient.invalidateQueries({ queryKey: instanceKeys.all }),
@@ -407,10 +496,12 @@ const globalOptionMutation = useMutation({
 		await queryClient.cancelQueries({ queryKey: globalSyncedOptionsQueryKey })
 		const previous = globalOptions.value[option]
 
-		queryClient.setQueryData<GlobalSyncedOptions>(globalSyncedOptionsQueryKey, (current) => ({
-			...(current ?? defaultGlobalOptions),
-			[option]: enabled,
-		}))
+		if (option !== 'game_options' || !enabled) {
+			queryClient.setQueryData<GlobalSyncedOptions>(globalSyncedOptionsQueryKey, (current) => ({
+				...(current ?? defaultGlobalOptions),
+				[option]: enabled,
+			}))
+		}
 
 		return { previous }
 	},
@@ -421,7 +512,8 @@ const globalOptionMutation = useMutation({
 		}))
 		handleError(error)
 	},
-	onSuccess: async (_options, { option, enabled }) => {
+	onSuccess: async (options, { option, enabled }) => {
+		queryClient.setQueryData(globalSyncedOptionsQueryKey, options)
 		if (enabled) baseModal.value?.hide()
 		if (enabled && option === 'multiplayer_servers') {
 			syncedServers.value = await list_synced_servers().catch((error) => {
@@ -441,21 +533,59 @@ function applyGlobalOption(option: SyncedOption, enabled: boolean, baseInstanceI
 	globalOptionMutation.mutate({ option, enabled, baseInstanceId })
 }
 
-function toggleGlobalOption(option: SyncedOption, enabled: boolean) {
-	if (!enabled) {
-		applyGlobalOption(option, false)
+async function chooseBaseInstance(option: SyncedOption) {
+	const generation = ++baseSourceGeneration
+	baseOption.value = option
+	baseInstanceSearch.value = ''
+	baseSourcesLoading.value = option === 'game_options'
+	baseModal.value?.show()
+
+	if (option === 'game_options') {
+		try {
+			const sources = await list_game_options_sync_sources()
+			if (generation !== baseSourceGeneration || baseOption.value !== option) return
+			gameOptionSources.value = sources
+			baseInstanceId.value =
+				gameOptionSources.value.find((source) => source.eligible)?.source_id ?? ''
+		} catch (error) {
+			if (generation !== baseSourceGeneration || baseOption.value !== option) return
+			gameOptionSources.value = []
+			baseInstanceId.value = ''
+			handleError(error)
+		} finally {
+			if (generation === baseSourceGeneration && baseOption.value === option) {
+				baseSourcesLoading.value = false
+			}
+		}
 		return
 	}
 
-	baseOption.value = option
 	baseInstanceId.value = instances.value[0]?.id ?? ''
-	baseInstanceSearch.value = ''
-	baseModal.value?.show()
 }
 
-function confirmBaseInstance() {
+function toggleGlobalOption(option: SyncedOption, enabled: boolean) {
+	if (enabled && option !== 'screenshots') {
+		void chooseBaseInstance(option)
+		return
+	}
+	applyGlobalOption(option, enabled)
+}
+
+async function confirmBaseInstance() {
 	if (!baseOption.value || !baseInstanceId.value) return
-	applyGlobalOption(baseOption.value, true, baseInstanceId.value)
+	try {
+		await globalOptionMutation.mutateAsync({
+			option: baseOption.value,
+			enabled: true,
+			baseInstanceId: baseInstanceId.value,
+		})
+	} catch {
+		return
+	}
+}
+
+function openGameSettings() {
+	gameSettingsModal.value?.show()
 }
 
 async function openCommandHistoryEditor() {
@@ -569,6 +699,8 @@ watch(
 
 <template>
 	<div>
+		<GameSettingsModal ref="gameSettingsModal" @saved="invalidateSyncedOptions" />
+
 		<NewModal
 			ref="baseModal"
 			:header="formatMessage(messages.chooseSyncSourceTitle)"
@@ -576,6 +708,7 @@ watch(
 			actions-divider
 			max-width="560px"
 			width="560px"
+			:disable-close="globalOptionMutation.isPending.value"
 		>
 			<p class="m-0 border-0 border-b border-solid border-surface-5 p-6 text-primary">
 				{{ baseInstanceDescription }}
@@ -591,8 +724,11 @@ watch(
 					class="shrink-0"
 				/>
 
+				<div v-if="baseSourcesLoading" class="flex flex-1 items-center justify-center">
+					<RefreshCwIcon class="size-5 animate-spin text-secondary" />
+				</div>
 				<div
-					v-if="filteredBaseInstances.length === 0"
+					v-else-if="filteredBaseInstances.length === 0"
 					class="flex flex-1 items-center justify-center text-secondary"
 				>
 					{{ formatMessage(messages.noInstancesFound) }}
@@ -607,8 +743,9 @@ watch(
 						v-for="instance in filteredBaseInstances"
 						:key="instance.id"
 						:checked="baseInstanceId === instance.id"
-						class="h-10"
-						@click="baseInstanceId = instance.id"
+						:disabled="!instance.eligible"
+						class="min-h-10"
+						@click="instance.eligible && (baseInstanceId = instance.id)"
 					>
 						<span class="size-5 shrink-0 overflow-hidden rounded-[6px]">
 							<Avatar
@@ -619,23 +756,40 @@ watch(
 								no-shadow
 							/>
 						</span>
-						<span class="truncate">{{ instance.name }}</span>
+						<span class="flex min-w-0 flex-1 flex-col">
+							<span class="truncate">{{ instance.name }}</span>
+							<span
+								v-if="instance.game_version || baseSourceDescription(instance)"
+								class="truncate text-xs font-normal text-secondary"
+							>
+								<span v-if="instance.game_version">{{ instance.game_version }}</span>
+								<span v-if="instance.game_version && baseSourceDescription(instance)" aria-hidden="true">
+									·
+								</span>
+								<span v-if="baseSourceDescription(instance)">{{ baseSourceDescription(instance) }}</span>
+							</span>
+						</span>
 					</CheckCircleButton>
 				</div>
 			</div>
 			<template #actions>
 				<div class="flex justify-end gap-2 p-2">
-					<Button type="outlined" @click="baseModal?.hide()">
+					<Button
+						type="outlined"
+						:disabled="globalOptionMutation.isPending.value"
+						@click="baseModal?.hide()"
+					>
 						<XIcon />
 						{{ formatMessage(commonMessages.cancelButton) }}
 					</Button>
 					<Button
 						type="colored"
 						color="brand"
-						:disabled="!baseInstanceId || globalOptionMutation.isPending.value"
+						:disabled="!baseInstanceId || baseSourcesLoading || globalOptionMutation.isPending.value"
+						:loading="globalOptionMutation.isPending.value"
 						@click="confirmBaseInstance"
 					>
-						<RefreshCwIcon />
+						<RefreshCwIcon v-if="!globalOptionMutation.isPending.value" />
 						{{ formatMessage(messages.syncButton) }}
 					</Button>
 				</div>
@@ -774,7 +928,25 @@ watch(
 						</div>
 						<div class="flex shrink-0 items-center gap-2">
 							<span
-								v-if="row.editable"
+								v-if="row.editable === 'game-settings'"
+								v-tooltip="
+									!globalOptions.game_options
+										? formatMessage(messages.gameSettingsDisabledTooltip)
+										: formatMessage(messages.gameSettingsButton)
+								"
+								class="flex"
+							>
+								<Button
+									type="outlined"
+									size="sm"
+									:disabled="!globalOptions.game_options || globalOptionMutation.isPending.value"
+									@click="openGameSettings"
+								>
+									{{ formatMessage(messages.gameSettingsButton) }}
+								</Button>
+							</span>
+							<span
+								v-else-if="row.editable"
 								v-tooltip="
 									row.editable === 'servers' && syncedServers.length === 0
 										? formatMessage(messages.noServersSyncedYet)
@@ -800,6 +972,7 @@ watch(
 							<Toggle
 								:id="`global-sync-${row.option}`"
 								:model-value="globalOptions[row.option]"
+								:disabled="globalOptionMutation.isPending.value"
 								@update:model-value="(enabled) => toggleGlobalOption(row.option, enabled)"
 							/>
 						</div>
diff --git a/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingRow.vue b/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingRow.vue
new file mode 100644
index 0000000000..d78bbbfeb7
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingRow.vue
@@ -0,0 +1,260 @@
+<script setup lang="ts">
+import { UnknownIcon } from '@modrinth/assets'
+import { Button, ButtonGroup, defineMessages, Input, Toggle, useVIntl } from '@modrinth/ui'
+import { computed } from 'vue'
+
+import type { EditableGameSetting, GameOptionCanonicalValue } from '@/helpers/game-options'
+
+import {
+	canonicalBooleanValue,
+	canonicalValueFromInput,
+	canonicalValueText,
+} from './game-setting-editors'
+import {
+	formatCompatibilitySubtitle,
+	formatCompatibilityTooltip,
+	formatGameSettingChoice,
+	formatGameSettingDescription,
+	formatGameSettingLabel,
+	formatGameSettingValidation,
+	presentationMessages,
+	shouldShowCompatibilityIndicator,
+} from './game-setting-messages'
+
+const props = withDefaults(
+	defineProps<{
+		setting: EditableGameSetting
+		disabled?: boolean
+	}>(),
+	{
+		disabled: false,
+	},
+)
+
+const emit = defineEmits<{
+	'update:sync-enabled': [enabled: boolean]
+	'update:canonical-value': [value: GameOptionCanonicalValue | null]
+}>()
+
+const { formatMessage } = useVIntl()
+
+const messages = defineMessages({
+	valueLabel: {
+		id: 'app.settings.synced-options.game-settings.value-label',
+		defaultMessage: 'Setting value',
+	},
+	on: {
+		id: 'app.settings.synced-options.game-settings.value-on',
+		defaultMessage: 'On',
+	},
+	off: {
+		id: 'app.settings.synced-options.game-settings.value-off',
+		defaultMessage: 'Off',
+	},
+	mixed: {
+		id: 'app.settings.synced-options.game-settings.value-mixed',
+		defaultMessage: 'Mixed',
+	},
+	unset: {
+		id: 'app.settings.synced-options.game-settings.value-unset',
+		defaultMessage: 'Choose a value',
+	},
+	savedNotSynced: {
+		id: 'app.settings.synced-options.game-settings.saved-not-synced',
+		defaultMessage: 'Saved, not synced',
+	},
+	compatibilityDetails: {
+		id: 'app.settings.synced-options.game-settings.compatibility-details',
+		defaultMessage: 'Compatibility details',
+	},
+	syncSetting: {
+		id: 'app.settings.synced-options.game-settings.sync-setting',
+		defaultMessage: 'Sync {setting}',
+	},
+})
+
+const settingLabel = computed(() => formatGameSettingLabel(formatMessage, props.setting))
+const settingDescription = computed(() =>
+	formatGameSettingDescription(formatMessage, props.setting),
+)
+const valueText = computed(() => canonicalValueText(props.setting))
+const booleanValue = computed(() => canonicalBooleanValue(props.setting))
+const numberScale = computed(() => (props.setting.editor.unit === 'percent' ? 100 : 1))
+const inputMin = computed(() =>
+	props.setting.editor.min === null || props.setting.editor.min === undefined
+		? undefined
+		: props.setting.editor.min * numberScale.value,
+)
+const inputMax = computed(() =>
+	props.setting.editor.max === null || props.setting.editor.max === undefined
+		? undefined
+		: props.setting.editor.max * numberScale.value,
+)
+const inputStep = computed(() =>
+	props.setting.editor.step === null || props.setting.editor.step === undefined
+		? undefined
+		: props.setting.editor.step * numberScale.value,
+)
+const editorDisabled = computed(
+	() => props.disabled || props.setting.controlled,
+)
+const syncToggleDisabled = computed(
+	() =>
+		props.disabled ||
+		props.setting.controlled ||
+		(!props.setting.sync_enabled &&
+			(!!props.setting.validation_error ||
+				['mixed', 'unset', 'invalid'].includes(props.setting.value_state) ||
+				(props.setting.compatibility.total_participating > 0 &&
+					props.setting.compatibility.will_receive === 0))),
+)
+const placeholder = computed(() => {
+	if (props.setting.value_state === 'mixed') return formatMessage(messages.mixed)
+	if (props.setting.value_state === 'unset') return formatMessage(messages.unset)
+	if (props.setting.editor.type === 'external_raw') {
+		return formatMessage(presentationMessages.customValuePlaceholder)
+	}
+	return undefined
+})
+const compatibilityTone = computed(() =>
+	props.setting.compatibility.left_local > 0
+		? 'text-orange'
+		: 'text-secondary',
+)
+const compatibilityTooltip = computed(() =>
+	formatCompatibilityTooltip(formatMessage, props.setting),
+)
+const compatibilitySubtitle = computed(() =>
+	formatCompatibilitySubtitle(formatMessage, props.setting),
+)
+const validationMessage = computed(() =>
+	formatGameSettingValidation(formatMessage, props.setting.validation_error),
+)
+const syncDisabledReason = computed(() => {
+	if (validationMessage.value) return validationMessage.value
+	if (props.setting.value_state === 'invalid') {
+		return formatMessage(presentationMessages.validationInvalidValue)
+	}
+	if (props.setting.value_state === 'mixed' || props.setting.value_state === 'unset') {
+		return formatMessage(presentationMessages.validationMissingValue)
+	}
+	if (props.setting.controlled) {
+		return formatMessage(presentationMessages.bucketLauncherControlled, { count: 1 })
+	}
+	if (
+		props.setting.compatibility.total_participating > 0 &&
+		props.setting.compatibility.will_receive === 0
+	) {
+		return formatMessage(presentationMessages.compatibilityNone)
+	}
+	return undefined
+})
+
+function updateValue(value: string | number | boolean | undefined) {
+	emit('update:canonical-value', canonicalValueFromInput(props.setting, value))
+}
+
+function updateSelectValue(event: Event) {
+	updateValue((event.target as HTMLSelectElement).value)
+}
+</script>
+
+<template>
+	<div class="flex min-w-0 items-center gap-4 border-0 border-b border-solid border-surface-5 py-3">
+		<div class="min-w-0 flex-1">
+			<div class="flex items-center gap-2">
+				<h3 class="m-0 truncate text-base font-semibold text-contrast">
+					{{ settingLabel }}
+				</h3>
+				<span
+					v-if="shouldShowCompatibilityIndicator(setting)"
+					v-tooltip="compatibilityTooltip"
+					tabindex="0"
+					role="img"
+					:aria-label="formatMessage(messages.compatibilityDetails)"
+					class="flex shrink-0 rounded-md outline-none focus-visible:ring-4 focus-visible:ring-brand-shadow"
+					:class="compatibilityTone"
+				>
+					<UnknownIcon class="size-4" aria-hidden="true" />
+				</span>
+			</div>
+			<p v-if="settingDescription" class="m-0 mt-0.5 text-sm text-primary">
+				{{ settingDescription }}
+			</p>
+			<p class="m-0 mt-0.5 text-xs text-secondary">
+				{{ validationMessage ?? compatibilitySubtitle }}
+				<span v-if="!setting.sync_enabled">
+					· {{ formatMessage(messages.savedNotSynced) }}
+				</span>
+			</p>
+		</div>
+
+		<div class="flex shrink-0 items-center gap-3">
+			<span class="sr-only">{{ formatMessage(messages.valueLabel) }}</span>
+			<ButtonGroup
+				v-if="setting.editor.type === 'bool'"
+				:label="formatMessage(messages.valueLabel)"
+			>
+				<Button
+					size="sm"
+					:type="booleanValue === true ? 'colored' : 'outlined'"
+					:color="booleanValue === true ? 'brand' : undefined"
+					:disabled="editorDisabled"
+					:aria-pressed="booleanValue === true"
+					@click="updateValue(true)"
+				>
+					{{ formatMessage(messages.on) }}
+				</Button>
+				<Button
+					size="sm"
+					:type="booleanValue === false ? 'colored' : 'outlined'"
+					:color="booleanValue === false ? 'brand' : undefined"
+					:disabled="editorDisabled"
+					:aria-pressed="booleanValue === false"
+					@click="updateValue(false)"
+				>
+					{{ formatMessage(messages.off) }}
+				</Button>
+			</ButtonGroup>
+
+			<select
+				v-else-if="setting.editor.type === 'enum'"
+				:value="valueText"
+				:disabled="editorDisabled"
+				:aria-label="formatMessage(messages.valueLabel)"
+				class="h-9 w-48 rounded-xl border border-solid border-surface-5 bg-surface-4 px-3 text-sm font-medium text-primary outline-none focus-visible:ring-4 focus-visible:ring-brand-shadow disabled:cursor-not-allowed disabled:opacity-50"
+				@change="updateSelectValue"
+			>
+				<option v-if="!valueText" value="" disabled>{{ placeholder }}</option>
+				<option v-for="choice in setting.editor.choices ?? []" :key="choice.value" :value="choice.value">
+					{{ formatGameSettingChoice(formatMessage, setting.option_id, choice.value) }}
+				</option>
+			</select>
+
+			<Input
+				v-else
+				:model-value="valueText"
+				:size="'small'"
+				:type="setting.editor.type === 'integer' || setting.editor.type === 'decimal' ? 'number' : 'text'"
+				:min="inputMin"
+				:max="inputMax"
+				:step="inputStep"
+				:placeholder="placeholder"
+				:disabled="editorDisabled"
+				:aria-label="formatMessage(messages.valueLabel)"
+				wrapper-class="w-48"
+				@update:model-value="updateValue"
+			/>
+
+			<span v-tooltip="syncToggleDisabled ? syncDisabledReason : undefined" class="flex">
+				<Toggle
+					:id="`sync-game-setting-${setting.option_id}`"
+					:model-value="setting.sync_enabled"
+					:disabled="syncToggleDisabled"
+					:aria-label="formatMessage(messages.syncSetting, { setting: settingLabel })"
+					@update:model-value="(enabled) => emit('update:sync-enabled', enabled)"
+				/>
+			</span>
+		</div>
+	</div>
+</template>
diff --git a/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingsModal.vue b/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingsModal.vue
new file mode 100644
index 0000000000..f33758dfe9
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingsModal.vue
@@ -0,0 +1,664 @@
+<script setup lang="ts">
+import {
+	EyeIcon,
+	LanguagesIcon,
+	MessageIcon,
+	MonitorIcon,
+	RefreshCwIcon,
+	SaveIcon,
+	SearchIcon,
+	SettingsIcon,
+	ShirtIcon,
+	SpinnerIcon,
+	TagCategoryAudioIcon,
+	TagCategoryGamepad2Icon,
+	WrenchIcon,
+	XIcon,
+} from '@modrinth/assets'
+import {
+	Button,
+	ButtonGroup,
+	commonMessages,
+	ConfirmLeaveModal,
+	defineMessages,
+	injectNotificationManager,
+	Input,
+	NewModal,
+	Tabs,
+	type TabsTab,
+	useVIntl,
+} from '@modrinth/ui'
+import type { Component } from 'vue'
+import { computed, onUnmounted, ref } from 'vue'
+
+import {
+	get_synced_game_options_config,
+	type EditableGameSetting,
+	type GameOptionCanonicalValue,
+	type GameSettingCategory,
+	type GameSettingsEditorState,
+	preview_synced_game_option_changes,
+	save_synced_game_option_changes,
+	type UpdateGameSettingsRequest,
+} from '@/helpers/game-options'
+
+import GameSettingRow from './GameSettingRow.vue'
+import {
+	cloneGameSettingsState,
+	gameSettingChanges,
+	settingCanBeEnabled,
+	settingSearchText,
+} from './game-setting-editors'
+import {
+	formatGameSettingCategory,
+	formatGameSettingDescription,
+	formatGameSettingLabel,
+} from './game-setting-messages'
+
+const emit = defineEmits<{
+	saved: []
+}>()
+
+const { formatMessage } = useVIntl()
+const { addNotification, handleError } = injectNotificationManager()
+
+const messages = defineMessages({
+	title: {
+		id: 'app.settings.synced-options.game-settings.title',
+		defaultMessage: 'Sync game settings',
+	},
+	search: {
+		id: 'app.settings.synced-options.game-settings.search',
+		defaultMessage: 'Search settings...',
+	},
+	all: {
+		id: 'app.settings.synced-options.game-settings.filter.all',
+		defaultMessage: 'All',
+	},
+	on: {
+		id: 'app.settings.synced-options.game-settings.filter.on',
+		defaultMessage: 'On',
+	},
+	off: {
+		id: 'app.settings.synced-options.game-settings.filter.off',
+		defaultMessage: 'Off',
+	},
+	enableAll: {
+		id: 'app.settings.synced-options.game-settings.enable-all',
+		defaultMessage: 'Enable all',
+	},
+	enableAllCount: {
+		id: 'app.settings.synced-options.game-settings.enable-all-count',
+		defaultMessage: 'Enable all ({count})',
+	},
+	disableAll: {
+		id: 'app.settings.synced-options.game-settings.disable-all',
+		defaultMessage: 'Disable all',
+	},
+	disableAllCount: {
+		id: 'app.settings.synced-options.game-settings.disable-all-count',
+		defaultMessage: 'Disable all ({count})',
+	},
+	customEmpty: {
+		id: 'app.settings.synced-options.game-settings.custom-empty',
+		defaultMessage:
+			'Mod-added options will appear here after they are discovered in a participating instance.',
+	},
+	empty: {
+		id: 'app.settings.synced-options.game-settings.empty',
+		defaultMessage: 'No settings match these filters.',
+	},
+	loading: {
+		id: 'app.settings.synced-options.game-settings.loading',
+		defaultMessage: 'Loading game settings...',
+	},
+	loadFailed: {
+		id: 'app.settings.synced-options.game-settings.load-failed',
+		defaultMessage: 'Game settings could not be loaded.',
+	},
+	retry: {
+		id: 'app.settings.synced-options.game-settings.retry',
+		defaultMessage: 'Retry',
+	},
+	saveSettings: {
+		id: 'app.settings.synced-options.game-settings.save',
+		defaultMessage: 'Save settings',
+	},
+	saved: {
+		id: 'app.settings.synced-options.game-settings.saved',
+		defaultMessage: 'Game settings saved',
+	},
+	savedSummary: {
+		id: 'app.settings.synced-options.game-settings.saved-summary',
+		defaultMessage:
+			'{applied, plural, one {# setting applied} other {# settings applied}}, {migrated, plural, one {# migrated} other {# migrated}}, {deferred, plural, one {# deferred} other {# deferred}}, {unsupported, plural, one {# unsupported} other {# unsupported}}, {failed, plural, one {# failed} other {# failed}}.',
+	},
+	previewFailed: {
+		id: 'app.settings.synced-options.game-settings.preview-failed',
+		defaultMessage: 'Compatibility could not be refreshed. Review the values or try again.',
+	},
+	conflictTitle: {
+		id: 'app.settings.synced-options.game-settings.conflict-title',
+		defaultMessage: 'Game settings changed elsewhere',
+	},
+	conflictText: {
+		id: 'app.settings.synced-options.game-settings.conflict-text',
+		defaultMessage:
+			'The latest values have been loaded. Review the conflicting settings before saving again.',
+	},
+})
+
+type SelectionFilter = 'all' | 'on' | 'off'
+
+const modal = ref<InstanceType<typeof NewModal> | null>(null)
+const confirmLeaveModal = ref<InstanceType<typeof ConfirmLeaveModal> | null>(null)
+const baseState = ref<GameSettingsEditorState | null>(null)
+const draftState = ref<GameSettingsEditorState | null>(null)
+const activeCategoryId = ref('')
+const search = ref('')
+const selectionFilter = ref<SelectionFilter>('all')
+const loading = ref(false)
+const saving = ref(false)
+const previewing = ref(false)
+const loadError = ref(false)
+const previewError = ref(false)
+const touchedValueOptionIds = ref<Set<string>>(new Set())
+let allowClose = false
+let previewTimer: ReturnType<typeof setTimeout> | null = null
+let previewGeneration = 0
+let loadGeneration = 0
+
+const categoryIcons: Record<string, Component> = {
+	skin_customization: ShirtIcon,
+	video: MonitorIcon,
+	video_settings: MonitorIcon,
+	language: LanguagesIcon,
+	music_and_sound: TagCategoryAudioIcon,
+	controls: TagCategoryGamepad2Icon,
+	chat: MessageIcon,
+	chat_settings: MessageIcon,
+	accessibility: EyeIcon,
+	custom: WrenchIcon,
+	custom_settings: WrenchIcon,
+}
+
+const filterTabs = computed<TabsTab[]>(() => [
+	{ value: 'all', label: formatMessage(messages.all) },
+	{ value: 'on', label: formatMessage(messages.on) },
+	{ value: 'off', label: formatMessage(messages.off) },
+])
+
+const categories = computed<GameSettingCategory[]>(() => {
+	if (!draftState.value) return []
+
+	const settings = draftState.value.settings
+	const visible = draftState.value.categories.filter(
+		(category) =>
+			category.is_custom || settings.some((setting) => setting.category_id === category.id),
+	)
+	if (!visible.some((category) => category.is_custom || category.id === 'custom_settings')) {
+		visible.push({
+			id: 'custom_settings',
+			is_custom: true,
+		})
+	}
+	return visible
+})
+
+const activeCategory = computed(() =>
+	categories.value.find((category) => category.id === activeCategoryId.value),
+)
+
+const categorySettings = computed(() => {
+	if (!draftState.value) return []
+
+	const query = search.value.trim().toLocaleLowerCase()
+	return draftState.value.settings.filter((setting) => {
+		if (!query && setting.category_id !== activeCategoryId.value) return false
+		if (
+			query &&
+			!settingSearchText(
+				setting,
+				formatGameSettingLabel(formatMessage, setting),
+				formatGameSettingDescription(formatMessage, setting),
+			).includes(query)
+		)
+			return false
+		if (selectionFilter.value === 'on' && !setting.sync_enabled) return false
+		if (selectionFilter.value === 'off' && setting.sync_enabled) return false
+		return true
+	})
+})
+
+const dirtyChanges = computed(() =>
+	gameSettingChanges(baseState.value, draftState.value, touchedValueOptionIds.value),
+)
+const isDirty = computed(() => dirtyChanges.value.length > 0)
+const dirtyOptionIds = computed(
+	() => new Set(dirtyChanges.value.map((change) => change.option_id)),
+)
+const hasBlockingDraft = computed(
+	() =>
+		draftState.value?.settings.some(
+			(setting) =>
+				dirtyOptionIds.value.has(setting.option_id) &&
+				setting.sync_enabled &&
+				(!!setting.validation_error || ['mixed', 'unset', 'invalid'].includes(setting.value_state)),
+		) ?? false,
+)
+const enableCandidates = computed(() =>
+	categorySettings.value.filter((setting) => !setting.sync_enabled && settingCanBeEnabled(setting)),
+)
+const disableCandidates = computed(() =>
+	categorySettings.value.filter((setting) => setting.sync_enabled && !setting.controlled),
+)
+
+function categoryIcon(category: GameSettingCategory): Component {
+	return categoryIcons[category.id] ?? SettingsIcon
+}
+
+function setSelectionFilter(value: string | number) {
+	selectionFilter.value = value as SelectionFilter
+}
+
+function editorRequest(): UpdateGameSettingsRequest | null {
+	if (!baseState.value || !draftState.value) return null
+	return {
+		expected_summary_revision: draftState.value.summary_revision,
+		expected_canonical_revision: draftState.value.canonical_revision,
+		expected_catalog_revision: draftState.value.catalog_revision,
+		changes: dirtyChanges.value,
+	}
+}
+
+async function load() {
+	const generation = ++loadGeneration
+	previewGeneration++
+	loading.value = true
+	loadError.value = false
+	previewError.value = false
+	try {
+		const state = await get_synced_game_options_config()
+		if (generation !== loadGeneration) return
+		baseState.value = cloneGameSettingsState(state)
+		draftState.value = cloneGameSettingsState(state)
+		touchedValueOptionIds.value = new Set()
+		const currentCategoryExists = categories.value.some(
+			(category) => category.id === activeCategoryId.value,
+		)
+		if (!currentCategoryExists) activeCategoryId.value = categories.value[0]?.id ?? 'custom_settings'
+	} catch (error) {
+		if (generation !== loadGeneration) return
+		loadError.value = true
+		handleError(error)
+	} finally {
+		if (generation === loadGeneration) loading.value = false
+	}
+}
+
+function show() {
+	allowClose = false
+	search.value = ''
+	selectionFilter.value = 'all'
+	modal.value?.show()
+	void load()
+}
+
+function hide() {
+	modal.value?.hide()
+}
+
+function reset() {
+	if (previewTimer) clearTimeout(previewTimer)
+	previewTimer = null
+	previewGeneration++
+	loadGeneration++
+	baseState.value = null
+	draftState.value = null
+	loading.value = false
+	saving.value = false
+	previewing.value = false
+	loadError.value = false
+	previewError.value = false
+	touchedValueOptionIds.value = new Set()
+	allowClose = false
+}
+
+function beforeHide(): boolean {
+	if (allowClose || !isDirty.value) return true
+	void confirmDiscard()
+	return false
+}
+
+async function confirmDiscard() {
+	const discard = await confirmLeaveModal.value?.prompt()
+	if (!discard) return
+	allowClose = true
+	modal.value?.hide()
+}
+
+function settingById(optionId: string): EditableGameSetting | undefined {
+	return draftState.value?.settings.find((setting) => setting.option_id === optionId)
+}
+
+function setSyncEnabled(optionId: string, enabled: boolean) {
+	const setting = settingById(optionId)
+	if (!setting) return
+	setting.sync_enabled = enabled
+	setting.validation_error = null
+	schedulePreview()
+}
+
+function setCanonicalValue(optionId: string, value: GameOptionCanonicalValue | null) {
+	const setting = settingById(optionId)
+	if (!setting) return
+	touchedValueOptionIds.value = new Set(touchedValueOptionIds.value).add(optionId)
+	setting.canonical_value = value
+	setting.value_state = value ? 'canonical' : 'unset'
+	setting.validation_error = null
+	schedulePreview()
+}
+
+function enableVisible() {
+	if (saving.value) return
+	for (const setting of enableCandidates.value) setting.sync_enabled = true
+	schedulePreview()
+}
+
+function disableVisible() {
+	if (saving.value) return
+	for (const setting of disableCandidates.value) setting.sync_enabled = false
+	schedulePreview()
+}
+
+function schedulePreview() {
+	previewError.value = false
+	previewGeneration++
+	previewing.value = true
+	if (previewTimer) clearTimeout(previewTimer)
+	previewTimer = setTimeout(() => void preview(), 350)
+}
+
+function mergePreview(preview: GameSettingsEditorState) {
+	if (!baseState.value || !draftState.value) return
+	const previousBase = baseState.value
+	const dirtyIds = new Set(
+		gameSettingChanges(
+			previousBase,
+			draftState.value,
+			touchedValueOptionIds.value,
+		).map((change) => change.option_id),
+	)
+	const stagedSettings = new Map(
+		draftState.value.settings
+			.filter((setting) => dirtyIds.has(setting.option_id))
+			.map((setting) => [setting.option_id, setting]),
+	)
+	const previousBaseSettings = new Map(
+		previousBase.settings.map((setting) => [setting.option_id, setting]),
+	)
+	baseState.value = {
+		...cloneGameSettingsState(preview),
+		settings: preview.settings.map((setting) =>
+			dirtyIds.has(setting.option_id)
+				? (previousBaseSettings.get(setting.option_id) ?? setting)
+				: setting,
+		),
+	}
+	draftState.value = {
+		...preview,
+		settings: preview.settings.map((setting) => {
+			const staged = stagedSettings.get(setting.option_id)
+			if (!staged) return setting
+			return {
+				...setting,
+				sync_enabled: staged.sync_enabled,
+				canonical_value: staged.canonical_value,
+				option_revision: staged.option_revision,
+			}
+		}),
+	}
+}
+
+async function preview() {
+	const request = editorRequest()
+	if (!request || request.changes.length === 0) {
+		previewGeneration++
+		previewing.value = false
+		if (baseState.value) draftState.value = cloneGameSettingsState(baseState.value)
+		return
+	}
+
+	const generation = ++previewGeneration
+	previewing.value = true
+	try {
+		const previewState = await preview_synced_game_option_changes(request)
+		if (generation !== previewGeneration) return
+		mergePreview(previewState)
+		previewError.value = false
+	} catch {
+		if (generation === previewGeneration) previewError.value = true
+	} finally {
+		if (generation === previewGeneration) previewing.value = false
+	}
+}
+
+async function save() {
+	const request = editorRequest()
+	if (!request || request.changes.length === 0) return
+
+	if (previewTimer) clearTimeout(previewTimer)
+	previewTimer = null
+	previewGeneration++
+	saving.value = true
+	try {
+		const result = await save_synced_game_option_changes(request)
+		if (result.conflicts?.length) {
+			const refreshed = result.state ?? (await get_synced_game_options_config())
+			const previousDraft = draftState.value
+			const stagedChanges = new Map(request.changes.map((change) => [change.option_id, change]))
+			const conflicts = new Set(result.conflicts)
+			baseState.value = cloneGameSettingsState(refreshed)
+			draftState.value = cloneGameSettingsState(refreshed)
+
+			for (const setting of draftState.value.settings) {
+				const previous = previousDraft?.settings.find(
+					(candidate) => candidate.option_id === setting.option_id,
+				)
+				if (conflicts.has(setting.option_id)) {
+					setting.validation_error = 'changed_since_opened'
+					continue
+				}
+				const change = stagedChanges.get(setting.option_id)
+				if (!change || !previous) continue
+				if (change.sync_enabled !== undefined) setting.sync_enabled = previous.sync_enabled
+				if (change.canonical_value !== undefined) {
+					setting.canonical_value = previous.canonical_value
+					setting.value_state = previous.value_state
+				}
+			}
+
+			addNotification({
+				type: 'warning',
+				title: formatMessage(messages.conflictTitle),
+				text: formatMessage(messages.conflictText),
+			})
+			if (
+				gameSettingChanges(
+					baseState.value,
+					draftState.value,
+					touchedValueOptionIds.value,
+				).length > 0
+			) {
+				schedulePreview()
+			}
+			return
+		}
+
+		addNotification({
+			type: result.failed > 0 ? 'warning' : 'success',
+			title: formatMessage(messages.saved),
+			text: formatMessage(messages.savedSummary, {
+				applied: result.applied,
+				migrated: result.migrated,
+				deferred: result.deferred,
+				unsupported: result.unsupported,
+				failed: result.failed,
+			}),
+		})
+		emit('saved')
+		allowClose = true
+		modal.value?.hide()
+	} catch (error) {
+		handleError(error)
+	} finally {
+		saving.value = false
+	}
+}
+
+onUnmounted(() => {
+	if (previewTimer) clearTimeout(previewTimer)
+})
+
+defineExpose({ show, hide })
+</script>
+
+<template>
+	<NewModal
+		ref="modal"
+		:header="formatMessage(messages.title)"
+		:no-padding="true"
+		:actions-divider="true"
+		:before-hide="beforeHide"
+		:on-after-hide="reset"
+		:disable-close="saving"
+		max-width="930px"
+		width="930px"
+	>
+		<div class="grid h-[550px] min-h-0 grid-cols-[272px_minmax(0,1fr)] bg-surface-2">
+			<aside class="flex min-h-0 flex-col gap-2 border-0 border-r border-solid border-surface-5 bg-surface-3 p-4">
+				<Input
+					v-model="search"
+					:icon="SearchIcon"
+					type="search"
+					autocomplete="off"
+					:placeholder="formatMessage(messages.search)"
+					wrapper-class="w-full shrink-0"
+				/>
+
+				<nav class="flex min-h-0 flex-col overflow-y-auto" :aria-label="formatMessage(messages.title)">
+					<button
+						v-for="category in categories"
+						:key="category.id"
+						type="button"
+						class="flex cursor-pointer items-center gap-2 rounded-[14px] border-0 px-4 py-2.5 text-left font-semibold outline-none transition-colors focus-visible:ring-4 focus-visible:ring-brand-shadow"
+						:class="
+							category.id === activeCategoryId
+								? 'bg-highlight-green text-green'
+								: 'bg-transparent text-primary hover:bg-surface-4'
+						"
+						@click="activeCategoryId = category.id; search = ''"
+					>
+						<component :is="categoryIcon(category)" class="size-5 shrink-0" />
+						<span class="truncate">{{ formatGameSettingCategory(formatMessage, category) }}</span>
+					</button>
+				</nav>
+			</aside>
+
+			<main class="flex min-h-0 min-w-0 flex-col bg-surface-2">
+				<div class="flex shrink-0 flex-wrap items-center justify-between gap-3 p-6">
+					<div class="flex items-center gap-2">
+						<Tabs
+							:value="selectionFilter"
+							:tabs="filterTabs"
+							@update:value="setSelectionFilter"
+						/>
+						<SpinnerIcon v-if="previewing" class="size-5 animate-spin text-secondary" />
+					</div>
+					<ButtonGroup>
+						<Button
+							size="sm"
+							:disabled="saving || enableCandidates.length === 0"
+							@click="enableVisible"
+						>
+							{{
+								enableCandidates.length
+									? formatMessage(messages.enableAllCount, { count: enableCandidates.length })
+									: formatMessage(messages.enableAll)
+							}}
+						</Button>
+						<Button
+							size="sm"
+							:disabled="saving || disableCandidates.length === 0"
+							@click="disableVisible"
+						>
+							{{
+								disableCandidates.length
+									? formatMessage(messages.disableAllCount, { count: disableCandidates.length })
+									: formatMessage(messages.disableAll)
+							}}
+						</Button>
+					</ButtonGroup>
+				</div>
+
+				<div v-if="loading" class="flex flex-1 items-center justify-center gap-2 text-secondary">
+					<SpinnerIcon class="size-5 animate-spin" />
+					{{ formatMessage(messages.loading) }}
+				</div>
+				<div v-else-if="loadError" class="flex flex-1 flex-col items-center justify-center gap-3 text-secondary">
+					<p class="m-0">{{ formatMessage(messages.loadFailed) }}</p>
+					<Button @click="load">
+						<RefreshCwIcon />
+						{{ formatMessage(messages.retry) }}
+					</Button>
+				</div>
+				<div v-else class="min-h-0 flex-1 overflow-y-auto px-6 py-2">
+					<p v-if="previewError" class="m-0 border-0 border-b border-solid border-surface-5 py-3 text-sm text-orange">
+						{{ formatMessage(messages.previewFailed) }}
+					</p>
+					<div
+						v-if="categorySettings.length === 0"
+						class="flex h-full min-h-40 items-center justify-center px-8 text-center text-secondary"
+					>
+						{{
+							activeCategory?.is_custom && !search
+								? formatMessage(messages.customEmpty)
+								: formatMessage(messages.empty)
+						}}
+					</div>
+					<GameSettingRow
+						v-for="setting in categorySettings"
+						:key="setting.option_id"
+						:setting="setting"
+						:disabled="saving"
+						@update:sync-enabled="setSyncEnabled(setting.option_id, $event)"
+						@update:canonical-value="setCanonicalValue(setting.option_id, $event)"
+					/>
+				</div>
+			</main>
+		</div>
+
+		<template #actions>
+			<div class="flex justify-end gap-2 p-2">
+				<Button type="outlined" :disabled="saving" @click="modal?.hide()">
+					<XIcon />
+					{{ formatMessage(commonMessages.cancelButton) }}
+				</Button>
+				<Button
+					type="colored"
+					color="brand"
+					:disabled="
+						!isDirty || loading || previewing || saving || previewError || hasBlockingDraft
+					"
+					:loading="saving"
+					@click="save"
+				>
+					<SaveIcon v-if="!saving" />
+					{{ formatMessage(messages.saveSettings) }}
+				</Button>
+			</div>
+		</template>
+	</NewModal>
+
+	<ConfirmLeaveModal ref="confirmLeaveModal" />
+</template>
diff --git a/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-editors.ts b/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-editors.ts
new file mode 100644
index 0000000000..59e59e60fb
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-editors.ts
@@ -0,0 +1,147 @@
+import type {
+	EditableGameSetting,
+	GameOptionCanonicalValue,
+	GameSettingChange,
+	GameSettingsEditorState,
+} from '@/helpers/game-options'
+
+export function cloneGameSettingsState(state: GameSettingsEditorState): GameSettingsEditorState {
+	return structuredClone(state)
+}
+
+export function canonicalValuesEqual(
+	left: GameOptionCanonicalValue | null | undefined,
+	right: GameOptionCanonicalValue | null | undefined,
+): boolean {
+	return JSON.stringify(left ?? null) === JSON.stringify(right ?? null)
+}
+
+export function gameSettingChanges(
+	base: GameSettingsEditorState | null,
+	draft: GameSettingsEditorState | null,
+	forcedValueOptionIds: ReadonlySet<string> = new Set(),
+): GameSettingChange[] {
+	if (!base || !draft) return []
+
+	const baseSettings = new Map(base.settings.map((setting) => [setting.option_id, setting]))
+	return draft.settings.flatMap((setting) => {
+		const previous = baseSettings.get(setting.option_id)
+		if (!previous) return []
+
+		const syncChanged = previous.sync_enabled !== setting.sync_enabled
+		const valueChanged = !canonicalValuesEqual(
+			previous.canonical_value,
+			setting.canonical_value,
+		)
+		const promoteLocalValue =
+			forcedValueOptionIds.has(setting.option_id) &&
+			previous.value_state !== 'canonical' &&
+			setting.canonical_value !== null &&
+			setting.canonical_value !== undefined
+		if (!syncChanged && !valueChanged && !promoteLocalValue) return []
+
+		return [
+			{
+				option_id: setting.option_id,
+				base_option_revision: previous.option_revision,
+				...(syncChanged ? { sync_enabled: setting.sync_enabled } : {}),
+				...(valueChanged || promoteLocalValue
+					? { canonical_value: setting.canonical_value ?? null }
+					: {}),
+			},
+		]
+	})
+}
+
+export function canonicalValueText(setting: EditableGameSetting): string {
+	const value = setting.canonical_value
+	if (!value) return ''
+
+	switch (value.type) {
+		case 'bool':
+			return value.value ? 'true' : 'false'
+		case 'integer':
+			return String(value.value)
+		case 'decimal':
+			return setting.editor.unit === 'percent'
+				? String(Number((Number(value.value) * 100).toFixed(8)))
+				: value.value
+		case 'string_list':
+			return value.value.join(', ')
+		default:
+			return value.value
+	}
+}
+
+export function canonicalBooleanValue(setting: EditableGameSetting): boolean | undefined {
+	return setting.canonical_value?.type === 'bool' ? setting.canonical_value.value : undefined
+}
+
+export function canonicalValueFromInput(
+	setting: EditableGameSetting,
+	value: string | number | boolean | undefined,
+): GameOptionCanonicalValue | null {
+	if (value === undefined || value === '') return null
+
+	switch (setting.editor.type) {
+		case 'bool':
+			return { type: 'bool', value: Boolean(value) }
+		case 'integer': {
+			const parsed = Number(value)
+			return Number.isSafeInteger(parsed) ? { type: 'integer', value: parsed } : null
+		}
+		case 'decimal': {
+			const parsed = Number(value)
+			if (!Number.isFinite(parsed)) return null
+			return {
+				type: 'decimal',
+				value:
+					setting.editor.unit === 'percent'
+						? String(Number((parsed / 100).toFixed(8)))
+						: String(value),
+			}
+		}
+		case 'enum':
+			return { type: 'enum', value: String(value) }
+		case 'string_list':
+			return {
+				type: 'string_list',
+				value: String(value)
+					.split(',')
+					.map((item) => item.trim())
+					.filter(Boolean),
+			}
+		case 'key_binding':
+			return { type: 'key_binding', value: String(value) }
+		case 'external_raw':
+			return { type: 'external_raw', value: String(value) }
+		default:
+			return { type: 'text', value: String(value) }
+	}
+}
+
+export function settingSearchText(
+	setting: EditableGameSetting,
+	label: string,
+	description: string,
+): string {
+	return [
+		label,
+		description,
+		setting.option_id,
+		setting.raw_key,
+	]
+		.filter(Boolean)
+		.join(' ')
+		.toLocaleLowerCase()
+}
+
+export function settingCanBeEnabled(setting: EditableGameSetting): boolean {
+	return (
+		!setting.controlled &&
+		!setting.validation_error &&
+		!['mixed', 'unset', 'invalid'].includes(setting.value_state) &&
+		(setting.compatibility.total_participating === 0 ||
+			setting.compatibility.will_receive > 0)
+	)
+}
diff --git a/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-messages.ts b/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-messages.ts
new file mode 100644
index 0000000000..96db3156f4
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-messages.ts
@@ -0,0 +1,468 @@
+import { defineMessages, type MessageDescriptor, type VIntlFormatters } from '@modrinth/ui'
+
+import type {
+	EditableGameSetting,
+	GameOptionCompatibilityBucket,
+	GameOptionValidationError,
+	GameOptionsSourceCandidate,
+	GameOptionsSourceDisabledReason,
+	GameSettingCategory,
+} from '@/helpers/game-options'
+
+type FormatMessage = VIntlFormatters['formatMessage']
+
+const settingMessages = defineMessages({
+	fovLabel: { id: 'app.settings.game-options.setting.fov.label', defaultMessage: 'Field of view' },
+	fovDescription: { id: 'app.settings.game-options.setting.fov.description', defaultMessage: 'The camera field of view.' },
+	graphicsLabel: { id: 'app.settings.game-options.setting.graphics.label', defaultMessage: 'Graphics' },
+	graphicsDescription: { id: 'app.settings.game-options.setting.graphics.description', defaultMessage: 'The overall graphics quality preset.' },
+	ambientOcclusionLabel: { id: 'app.settings.game-options.setting.ambient-occlusion.label', defaultMessage: 'Smooth lighting' },
+	ambientOcclusionDescription: { id: 'app.settings.game-options.setting.ambient-occlusion.description', defaultMessage: 'Smooth lighting on block faces.' },
+	renderDistanceLabel: { id: 'app.settings.game-options.setting.render-distance.label', defaultMessage: 'Render distance' },
+	renderDistanceDescription: { id: 'app.settings.game-options.setting.render-distance.description', defaultMessage: 'How far terrain is rendered.' },
+	simulationDistanceLabel: { id: 'app.settings.game-options.setting.simulation-distance.label', defaultMessage: 'Simulation distance' },
+	simulationDistanceDescription: { id: 'app.settings.game-options.setting.simulation-distance.description', defaultMessage: 'How far the world is simulated.' },
+	guiScaleLabel: { id: 'app.settings.game-options.setting.gui-scale.label', defaultMessage: 'GUI scale' },
+	guiScaleDescription: { id: 'app.settings.game-options.setting.gui-scale.description', defaultMessage: 'The size of the game interface.' },
+	particlesLabel: { id: 'app.settings.game-options.setting.particles.label', defaultMessage: 'Particles' },
+	particlesDescription: { id: 'app.settings.game-options.setting.particles.description', defaultMessage: 'How many particles are shown.' },
+	cloudsLabel: { id: 'app.settings.game-options.setting.clouds.label', defaultMessage: 'Clouds' },
+	cloudsDescription: { id: 'app.settings.game-options.setting.clouds.description', defaultMessage: 'The cloud rendering quality.' },
+	entityShadowsLabel: { id: 'app.settings.game-options.setting.entity-shadows.label', defaultMessage: 'Entity shadows' },
+	entityShadowsDescription: { id: 'app.settings.game-options.setting.entity-shadows.description', defaultMessage: 'Show shadows beneath entities.' },
+	viewBobbingLabel: { id: 'app.settings.game-options.setting.view-bobbing.label', defaultMessage: 'View bobbing' },
+	viewBobbingDescription: { id: 'app.settings.game-options.setting.view-bobbing.description', defaultMessage: 'Move the camera while walking.' },
+	vsyncLabel: { id: 'app.settings.game-options.setting.vsync.label', defaultMessage: 'VSync' },
+	vsyncDescription: { id: 'app.settings.game-options.setting.vsync.description', defaultMessage: 'Synchronize frames with the display.' },
+	fullscreenLabel: { id: 'app.settings.game-options.setting.fullscreen.label', defaultMessage: 'Fullscreen' },
+	fullscreenDescription: { id: 'app.settings.game-options.setting.fullscreen.description', defaultMessage: 'Start the game in fullscreen.' },
+	maxFramerateLabel: { id: 'app.settings.game-options.setting.max-framerate.label', defaultMessage: 'Maximum framerate' },
+	maxFramerateDescription: { id: 'app.settings.game-options.setting.max-framerate.description', defaultMessage: 'The maximum rendered frames per second.' },
+	mipmapLevelsLabel: { id: 'app.settings.game-options.setting.mipmap-levels.label', defaultMessage: 'Mipmap levels' },
+	mipmapLevelsDescription: { id: 'app.settings.game-options.setting.mipmap-levels.description', defaultMessage: 'Texture smoothing at a distance.' },
+	biomeBlendRadiusLabel: { id: 'app.settings.game-options.setting.biome-blend-radius.label', defaultMessage: 'Biome blend' },
+	biomeBlendRadiusDescription: { id: 'app.settings.game-options.setting.biome-blend-radius.description', defaultMessage: 'How smoothly biome colors blend.' },
+	languageLabel: { id: 'app.settings.game-options.setting.language.label', defaultMessage: 'Language' },
+	languageDescription: { id: 'app.settings.game-options.setting.language.description', defaultMessage: 'The language used by Minecraft.' },
+	masterVolumeLabel: { id: 'app.settings.game-options.setting.master-volume.label', defaultMessage: 'Master volume' },
+	masterVolumeDescription: { id: 'app.settings.game-options.setting.master-volume.description', defaultMessage: 'Overall game volume.' },
+	musicVolumeLabel: { id: 'app.settings.game-options.setting.music-volume.label', defaultMessage: 'Music' },
+	musicVolumeDescription: { id: 'app.settings.game-options.setting.music-volume.description', defaultMessage: 'Music volume.' },
+	musicToastLabel: { id: 'app.settings.game-options.setting.music-toast.label', defaultMessage: 'Music notification' },
+	musicToastDescription: { id: 'app.settings.game-options.setting.music-toast.description', defaultMessage: 'Choose when Minecraft pauses music and shows its title.' },
+	blocksVolumeLabel: { id: 'app.settings.game-options.setting.blocks-volume.label', defaultMessage: 'Blocks' },
+	blocksVolumeDescription: { id: 'app.settings.game-options.setting.blocks-volume.description', defaultMessage: 'Block sound volume.' },
+	hostileVolumeLabel: { id: 'app.settings.game-options.setting.hostile-volume.label', defaultMessage: 'Hostile creatures' },
+	hostileVolumeDescription: { id: 'app.settings.game-options.setting.hostile-volume.description', defaultMessage: 'Hostile creature volume.' },
+	playersVolumeLabel: { id: 'app.settings.game-options.setting.players-volume.label', defaultMessage: 'Players' },
+	playersVolumeDescription: { id: 'app.settings.game-options.setting.players-volume.description', defaultMessage: 'Player sound volume.' },
+	voiceVolumeLabel: { id: 'app.settings.game-options.setting.voice-volume.label', defaultMessage: 'Voice and speech' },
+	voiceVolumeDescription: { id: 'app.settings.game-options.setting.voice-volume.description', defaultMessage: 'Voice and speech volume.' },
+	sensitivityLabel: { id: 'app.settings.game-options.setting.sensitivity.label', defaultMessage: 'Mouse sensitivity' },
+	sensitivityDescription: { id: 'app.settings.game-options.setting.sensitivity.description', defaultMessage: 'Mouse look sensitivity.' },
+	invertMouseLabel: { id: 'app.settings.game-options.setting.invert-mouse.label', defaultMessage: 'Invert mouse' },
+	invertMouseDescription: { id: 'app.settings.game-options.setting.invert-mouse.description', defaultMessage: 'Invert vertical mouse movement.' },
+	autoJumpLabel: { id: 'app.settings.game-options.setting.auto-jump.label', defaultMessage: 'Auto-jump' },
+	autoJumpDescription: { id: 'app.settings.game-options.setting.auto-jump.description', defaultMessage: 'Automatically jump at small obstacles.' },
+	toggleCrouchLabel: { id: 'app.settings.game-options.setting.toggle-crouch.label', defaultMessage: 'Toggle crouch' },
+	toggleCrouchDescription: { id: 'app.settings.game-options.setting.toggle-crouch.description', defaultMessage: 'Press once to remain crouched.' },
+	toggleSprintLabel: { id: 'app.settings.game-options.setting.toggle-sprint.label', defaultMessage: 'Toggle sprint' },
+	toggleSprintDescription: { id: 'app.settings.game-options.setting.toggle-sprint.description', defaultMessage: 'Press once to remain sprinting.' },
+	discreteMouseScrollLabel: { id: 'app.settings.game-options.setting.discrete-mouse-scroll.label', defaultMessage: 'Discrete scrolling' },
+	discreteMouseScrollDescription: { id: 'app.settings.game-options.setting.discrete-mouse-scroll.description', defaultMessage: 'Use discrete mouse-wheel steps.' },
+	keyForwardLabel: { id: 'app.settings.game-options.setting.key-forward.label', defaultMessage: 'Move forward' },
+	keyForwardDescription: { id: 'app.settings.game-options.setting.key-forward.description', defaultMessage: 'The key used to move forward.' },
+	keyLeftLabel: { id: 'app.settings.game-options.setting.key-left.label', defaultMessage: 'Strafe left' },
+	keyLeftDescription: { id: 'app.settings.game-options.setting.key-left.description', defaultMessage: 'The key used to move left.' },
+	keyBackLabel: { id: 'app.settings.game-options.setting.key-back.label', defaultMessage: 'Move backward' },
+	keyBackDescription: { id: 'app.settings.game-options.setting.key-back.description', defaultMessage: 'The key used to move backward.' },
+	keyRightLabel: { id: 'app.settings.game-options.setting.key-right.label', defaultMessage: 'Strafe right' },
+	keyRightDescription: { id: 'app.settings.game-options.setting.key-right.description', defaultMessage: 'The key used to move right.' },
+	keyJumpLabel: { id: 'app.settings.game-options.setting.key-jump.label', defaultMessage: 'Jump' },
+	keyJumpDescription: { id: 'app.settings.game-options.setting.key-jump.description', defaultMessage: 'The key used to jump.' },
+	keySneakLabel: { id: 'app.settings.game-options.setting.key-sneak.label', defaultMessage: 'Sneak' },
+	keySneakDescription: { id: 'app.settings.game-options.setting.key-sneak.description', defaultMessage: 'The key used to sneak.' },
+	keySprintLabel: { id: 'app.settings.game-options.setting.key-sprint.label', defaultMessage: 'Sprint' },
+	keySprintDescription: { id: 'app.settings.game-options.setting.key-sprint.description', defaultMessage: 'The key used to sprint.' },
+	keyInventoryLabel: { id: 'app.settings.game-options.setting.key-inventory.label', defaultMessage: 'Inventory' },
+	keyInventoryDescription: { id: 'app.settings.game-options.setting.key-inventory.description', defaultMessage: 'The key used to open the inventory.' },
+	keySwapOffhandLabel: { id: 'app.settings.game-options.setting.key-swap-offhand.label', defaultMessage: 'Swap offhand' },
+	keySwapOffhandDescription: { id: 'app.settings.game-options.setting.key-swap-offhand.description', defaultMessage: 'The key used to swap the held item.' },
+	keyDropLabel: { id: 'app.settings.game-options.setting.key-drop.label', defaultMessage: 'Drop item' },
+	keyDropDescription: { id: 'app.settings.game-options.setting.key-drop.description', defaultMessage: 'The key used to drop an item.' },
+	keyUseLabel: { id: 'app.settings.game-options.setting.key-use.label', defaultMessage: 'Use item' },
+	keyUseDescription: { id: 'app.settings.game-options.setting.key-use.description', defaultMessage: 'The key used to use an item.' },
+	keyAttackLabel: { id: 'app.settings.game-options.setting.key-attack.label', defaultMessage: 'Attack' },
+	keyAttackDescription: { id: 'app.settings.game-options.setting.key-attack.description', defaultMessage: 'The key used to attack.' },
+	keyPickItemLabel: { id: 'app.settings.game-options.setting.key-pick-item.label', defaultMessage: 'Pick block' },
+	keyPickItemDescription: { id: 'app.settings.game-options.setting.key-pick-item.description', defaultMessage: 'The key used to pick a block.' },
+	keyChatLabel: { id: 'app.settings.game-options.setting.key-chat.label', defaultMessage: 'Open chat' },
+	keyChatDescription: { id: 'app.settings.game-options.setting.key-chat.description', defaultMessage: 'The key used to open chat.' },
+	keyPlayerListLabel: { id: 'app.settings.game-options.setting.key-player-list.label', defaultMessage: 'Player list' },
+	keyPlayerListDescription: { id: 'app.settings.game-options.setting.key-player-list.description', defaultMessage: 'The key used to show the player list.' },
+	keyCommandLabel: { id: 'app.settings.game-options.setting.key-command.label', defaultMessage: 'Command' },
+	keyCommandDescription: { id: 'app.settings.game-options.setting.key-command.description', defaultMessage: 'The key used to enter a command.' },
+	keyScreenshotLabel: { id: 'app.settings.game-options.setting.key-screenshot.label', defaultMessage: 'Screenshot' },
+	keyScreenshotDescription: { id: 'app.settings.game-options.setting.key-screenshot.description', defaultMessage: 'The key used to take a screenshot.' },
+	keyPerspectiveLabel: { id: 'app.settings.game-options.setting.key-perspective.label', defaultMessage: 'Change perspective' },
+	keyPerspectiveDescription: { id: 'app.settings.game-options.setting.key-perspective.description', defaultMessage: 'The key used to change camera perspective.' },
+	keyFullscreenLabel: { id: 'app.settings.game-options.setting.key-fullscreen.label', defaultMessage: 'Toggle fullscreen' },
+	keyFullscreenDescription: { id: 'app.settings.game-options.setting.key-fullscreen.description', defaultMessage: 'The key used to toggle fullscreen.' },
+	keyAdvancementsLabel: { id: 'app.settings.game-options.setting.key-advancements.label', defaultMessage: 'Advancements' },
+	keyAdvancementsDescription: { id: 'app.settings.game-options.setting.key-advancements.description', defaultMessage: 'The key used to open advancements.' },
+	chatVisibilityLabel: { id: 'app.settings.game-options.setting.chat-visibility.label', defaultMessage: 'Chat visibility' },
+	chatVisibilityDescription: { id: 'app.settings.game-options.setting.chat-visibility.description', defaultMessage: 'Choose which chat messages are visible.' },
+	chatColorsLabel: { id: 'app.settings.game-options.setting.chat-colors.label', defaultMessage: 'Chat colors' },
+	chatColorsDescription: { id: 'app.settings.game-options.setting.chat-colors.description', defaultMessage: 'Show colors in chat messages.' },
+	chatLinksLabel: { id: 'app.settings.game-options.setting.chat-links.label', defaultMessage: 'Web links' },
+	chatLinksDescription: { id: 'app.settings.game-options.setting.chat-links.description', defaultMessage: 'Allow links in chat.' },
+	chatLinksPromptLabel: { id: 'app.settings.game-options.setting.chat-links-prompt.label', defaultMessage: 'Prompt on links' },
+	chatLinksPromptDescription: { id: 'app.settings.game-options.setting.chat-links-prompt.description', defaultMessage: 'Ask before opening links from chat.' },
+	chatOpacityLabel: { id: 'app.settings.game-options.setting.chat-opacity.label', defaultMessage: 'Chat opacity' },
+	chatOpacityDescription: { id: 'app.settings.game-options.setting.chat-opacity.description', defaultMessage: 'The opacity of chat text.' },
+	chatScaleLabel: { id: 'app.settings.game-options.setting.chat-scale.label', defaultMessage: 'Chat scale' },
+	chatScaleDescription: { id: 'app.settings.game-options.setting.chat-scale.description', defaultMessage: 'The size of the chat interface.' },
+	narratorLabel: { id: 'app.settings.game-options.setting.narrator.label', defaultMessage: 'Narrator' },
+	narratorDescription: { id: 'app.settings.game-options.setting.narrator.description', defaultMessage: 'Choose what the narrator reads.' },
+	subtitlesLabel: { id: 'app.settings.game-options.setting.subtitles.label', defaultMessage: 'Subtitles' },
+	subtitlesDescription: { id: 'app.settings.game-options.setting.subtitles.description', defaultMessage: 'Show captions for nearby sounds.' },
+	highContrastLabel: { id: 'app.settings.game-options.setting.high-contrast.label', defaultMessage: 'High contrast' },
+	highContrastDescription: { id: 'app.settings.game-options.setting.high-contrast.description', defaultMessage: 'Use high-contrast resource styling.' },
+	darkSplashLabel: { id: 'app.settings.game-options.setting.dark-splash.label', defaultMessage: 'Monochrome logo' },
+	darkSplashDescription: { id: 'app.settings.game-options.setting.dark-splash.description', defaultMessage: 'Use a dark loading screen background.' },
+	notificationTimeLabel: { id: 'app.settings.game-options.setting.notification-time.label', defaultMessage: 'Notification time' },
+	notificationTimeDescription: { id: 'app.settings.game-options.setting.notification-time.description', defaultMessage: 'How long notifications remain visible.' },
+	mainHandLabel: { id: 'app.settings.game-options.setting.main-hand.label', defaultMessage: 'Main hand' },
+	mainHandDescription: { id: 'app.settings.game-options.setting.main-hand.description', defaultMessage: 'The hand used for held items.' },
+	capeLabel: { id: 'app.settings.game-options.setting.cape.label', defaultMessage: 'Cape' },
+	capeDescription: { id: 'app.settings.game-options.setting.cape.description', defaultMessage: 'Show the cape skin layer.' },
+	hatLabel: { id: 'app.settings.game-options.setting.hat.label', defaultMessage: 'Hat' },
+	hatDescription: { id: 'app.settings.game-options.setting.hat.description', defaultMessage: 'Show the hat skin layer.' },
+	jacketLabel: { id: 'app.settings.game-options.setting.jacket.label', defaultMessage: 'Jacket' },
+	jacketDescription: { id: 'app.settings.game-options.setting.jacket.description', defaultMessage: 'Show the jacket skin layer.' },
+	allowServerListingLabel: { id: 'app.settings.game-options.setting.allow-server-listing.label', defaultMessage: 'Server listings' },
+	allowServerListingDescription: { id: 'app.settings.game-options.setting.allow-server-listing.description', defaultMessage: 'Allow servers to list this player online.' },
+	realmsNotificationsLabel: { id: 'app.settings.game-options.setting.realms-notifications.label', defaultMessage: 'Realms notifications' },
+	realmsNotificationsDescription: { id: 'app.settings.game-options.setting.realms-notifications.description', defaultMessage: 'Show notifications from Realms.' },
+	customDescription: { id: 'app.settings.game-options.setting.custom.description', defaultMessage: 'A setting stored in options.txt by a mod or an unrecognized client extension.' },
+})
+
+const categoryMessages = defineMessages({
+	skinCustomizationLabel: { id: 'app.settings.game-options.category.skin-customization.label', defaultMessage: 'Skin customization' },
+	skinCustomizationDescription: { id: 'app.settings.game-options.category.skin-customization.description', defaultMessage: 'Skin layers and main hand' },
+	videoLabel: { id: 'app.settings.game-options.category.video.label', defaultMessage: 'Video' },
+	videoDescription: { id: 'app.settings.game-options.category.video.description', defaultMessage: 'Camera and display settings' },
+	languageLabel: { id: 'app.settings.game-options.category.language.label', defaultMessage: 'Language' },
+	languageDescription: { id: 'app.settings.game-options.category.language.description', defaultMessage: 'Game language' },
+	musicAndSoundLabel: { id: 'app.settings.game-options.category.music-and-sound.label', defaultMessage: 'Music and sound' },
+	musicAndSoundDescription: { id: 'app.settings.game-options.category.music-and-sound.description', defaultMessage: 'Volume and audio preferences' },
+	controlsLabel: { id: 'app.settings.game-options.category.controls.label', defaultMessage: 'Controls' },
+	controlsDescription: { id: 'app.settings.game-options.category.controls.description', defaultMessage: 'Mouse, movement, and key bindings' },
+	chatLabel: { id: 'app.settings.game-options.category.chat.label', defaultMessage: 'Chat' },
+	chatDescription: { id: 'app.settings.game-options.category.chat.description', defaultMessage: 'Chat visibility and appearance' },
+	accessibilityLabel: { id: 'app.settings.game-options.category.accessibility.label', defaultMessage: 'Accessibility' },
+	accessibilityDescription: { id: 'app.settings.game-options.category.accessibility.description', defaultMessage: 'Accessibility preferences' },
+	onlineLabel: { id: 'app.settings.game-options.category.online.label', defaultMessage: 'Online' },
+	onlineDescription: { id: 'app.settings.game-options.category.online.description', defaultMessage: 'Online and Realms preferences' },
+	customLabel: { id: 'app.settings.game-options.category.custom.label', defaultMessage: 'Custom settings' },
+	customDescription: { id: 'app.settings.game-options.category.custom.description', defaultMessage: 'Settings added by mods or unrecognized clients' },
+})
+
+const choiceMessages = defineMessages({
+	fast: { id: 'app.settings.game-options.choice.fast', defaultMessage: 'Fast' },
+	fancy: { id: 'app.settings.game-options.choice.fancy', defaultMessage: 'Fancy' },
+	fabulous: { id: 'app.settings.game-options.choice.fabulous', defaultMessage: 'Fabulous' },
+	left: { id: 'app.settings.game-options.choice.left', defaultMessage: 'Left' },
+	right: { id: 'app.settings.game-options.choice.right', defaultMessage: 'Right' },
+	shown: { id: 'app.settings.game-options.choice.shown', defaultMessage: 'Shown' },
+	commandsOnly: { id: 'app.settings.game-options.choice.commands-only', defaultMessage: 'Commands only' },
+	hidden: { id: 'app.settings.game-options.choice.hidden', defaultMessage: 'Hidden' },
+	all: { id: 'app.settings.game-options.choice.all', defaultMessage: 'All' },
+	decreased: { id: 'app.settings.game-options.choice.decreased', defaultMessage: 'Decreased' },
+	minimal: { id: 'app.settings.game-options.choice.minimal', defaultMessage: 'Minimal' },
+	off: { id: 'app.settings.game-options.choice.off', defaultMessage: 'Off' },
+	chat: { id: 'app.settings.game-options.choice.chat', defaultMessage: 'Chat' },
+	system: { id: 'app.settings.game-options.choice.system', defaultMessage: 'System' },
+	on: { id: 'app.settings.game-options.choice.on', defaultMessage: 'On' },
+	minimum: { id: 'app.settings.game-options.choice.minimum', defaultMessage: 'Minimum' },
+	maximum: { id: 'app.settings.game-options.choice.maximum', defaultMessage: 'Maximum' },
+	never: { id: 'app.settings.game-options.choice.never', defaultMessage: 'Never' },
+	pause: { id: 'app.settings.game-options.choice.pause', defaultMessage: 'Pause' },
+	pauseAndToast: { id: 'app.settings.game-options.choice.pause-and-toast', defaultMessage: 'Pause and show toast' },
+})
+
+export const presentationMessages = defineMessages({
+	customValuePlaceholder: { id: 'app.settings.game-options.custom-value.placeholder', defaultMessage: 'Raw options.txt value' },
+	validationLocalValueNeedsSaving: { id: 'app.settings.game-options.validation.local-value-needs-saving', defaultMessage: 'Save this local value to resume syncing this setting.' },
+	validationMissingValue: { id: 'app.settings.game-options.validation.missing-value', defaultMessage: 'Choose a value before enabling sync.' },
+	validationNoCompatibleInstances: { id: 'app.settings.game-options.validation.no-compatible-instances', defaultMessage: 'This setting is not compatible with any participating instances.' },
+	validationInvalidValue: { id: 'app.settings.game-options.validation.invalid-value', defaultMessage: 'Enter a valid value for this setting.' },
+	validationChangedSinceOpened: { id: 'app.settings.game-options.validation.changed-since-opened', defaultMessage: 'Changed elsewhere. Review this setting before saving again.' },
+	compatibilityNoParticipants: { id: 'app.settings.game-options.compatibility.no-participants', defaultMessage: 'Will sync when an instance participates' },
+	compatibilityNone: { id: 'app.settings.game-options.compatibility.none', defaultMessage: 'Not compatible with current instances' },
+	compatibilityAll: { id: 'app.settings.game-options.compatibility.all', defaultMessage: 'Syncs to all {count, plural, one {# instance} other {# instances}}' },
+	compatibilityAllDisabled: { id: 'app.settings.game-options.compatibility.all-disabled', defaultMessage: 'Would sync to all {count, plural, one {# instance} other {# instances}}' },
+	compatibilitySome: { id: 'app.settings.game-options.compatibility.some', defaultMessage: 'Syncs to {recipients} of {total, plural, one {# instance} other {# instances}}' },
+	compatibilitySomeDisabled: { id: 'app.settings.game-options.compatibility.some-disabled', defaultMessage: 'Would sync to {recipients} of {total, plural, one {# instance} other {# instances}}' },
+	compatibilityTooltipNoParticipants: { id: 'app.settings.game-options.compatibility.tooltip.no-participants', defaultMessage: 'This setting will begin syncing when an instance participates.' },
+	compatibilityTooltipRecipients: { id: 'app.settings.game-options.compatibility.tooltip.recipients', defaultMessage: 'This setting will sync to {recipients} of {total, plural, one {# participating instance} other {# participating instances}}.' },
+	bucketLauncherControlled: { id: 'app.settings.game-options.compatibility.reason.launcher-controlled', defaultMessage: '{count, plural, one {# instance has this setting controlled by its launch settings.} other {# instances have this setting controlled by their launch settings.}}' },
+	bucketCatalogUncovered: { id: 'app.settings.game-options.compatibility.reason.catalog-uncovered', defaultMessage: '{count, plural, one {# instance uses a Minecraft version this setting catalog does not cover.} other {# instances use Minecraft versions this setting catalog does not cover.}}' },
+	bucketInspectionFailed: { id: 'app.settings.game-options.compatibility.reason.inspection-failed', defaultMessage: '{count, plural, one {# instance could not be inspected, so its local value is kept.} other {# instances could not be inspected, so their local values are kept.}}' },
+	bucketWaitingForOptionsFile: { id: 'app.settings.game-options.compatibility.reason.waiting-for-options-file', defaultMessage: '{count, plural, one {# instance is waiting for Minecraft to create options.txt.} other {# instances are waiting for Minecraft to create options.txt.}}' },
+	bucketUnsupportedValue: { id: 'app.settings.game-options.compatibility.reason.unsupported-value', defaultMessage: '{count, plural, one {# instance cannot represent the selected value.} other {# instances cannot represent the selected value.}}' },
+	bucketMigratesOnWrite: { id: 'app.settings.game-options.compatibility.reason.migrates-on-write', defaultMessage: '{count, plural, one {# instance will migrate this setting when options.txt is written.} other {# instances will migrate this setting when their options.txt files are written.}}' },
+	bucketWaitingForCompatibleBase: { id: 'app.settings.game-options.compatibility.reason.waiting-for-compatible-base', defaultMessage: '{count, plural, one {# instance is waiting for a compatible modpack options.txt base.} other {# instances are waiting for a compatible modpack options.txt base.}}' },
+	bucketMissingSetting: { id: 'app.settings.game-options.compatibility.reason.missing-setting', defaultMessage: '{count, plural, one {# instance does not currently contain this setting.} other {# instances do not currently contain this setting.}}' },
+	bucketVersionsAndKeys: { id: 'app.settings.game-options.compatibility.bucket-context.versions-and-keys', defaultMessage: 'Minecraft versions: {versions}. options.txt keys: {keys}.' },
+	bucketVersions: { id: 'app.settings.game-options.compatibility.bucket-context.versions', defaultMessage: 'Minecraft versions: {versions}.' },
+	bucketKeys: { id: 'app.settings.game-options.compatibility.bucket-context.keys', defaultMessage: 'options.txt keys: {keys}.' },
+	sourceInstallingOrUpdating: { id: 'app.settings.game-options.source.disabled.installing-or-updating', defaultMessage: 'Installing or updating' },
+	sourceRunning: { id: 'app.settings.game-options.source.disabled.running', defaultMessage: 'Currently running' },
+	sourceUnsupportedVersion: { id: 'app.settings.game-options.source.disabled.unsupported-version', defaultMessage: 'Unsupported Minecraft version' },
+	sourceMissingOptionsFile: { id: 'app.settings.game-options.source.disabled.missing-options-file', defaultMessage: 'No options.txt file' },
+	sourceNoSyncableSettings: { id: 'app.settings.game-options.source.disabled.no-syncable-settings', defaultMessage: 'No syncable settings found' },
+	sourceUnreadableOptionsFile: { id: 'app.settings.game-options.source.disabled.unreadable-options-file', defaultMessage: 'options.txt could not be read' },
+	sourceSettingsSummary: { id: 'app.settings.game-options.source.settings-summary', defaultMessage: '{recognized, plural, one {# recognized setting} other {# recognized settings}}, {custom, plural, one {# custom setting} other {# custom settings}}' },
+})
+
+const knownSettings: Record<string, { label: MessageDescriptor; description: MessageDescriptor }> = {
+	fov: { label: settingMessages.fovLabel, description: settingMessages.fovDescription },
+	graphics: { label: settingMessages.graphicsLabel, description: settingMessages.graphicsDescription },
+	ambient_occlusion: { label: settingMessages.ambientOcclusionLabel, description: settingMessages.ambientOcclusionDescription },
+	render_distance: { label: settingMessages.renderDistanceLabel, description: settingMessages.renderDistanceDescription },
+	simulation_distance: { label: settingMessages.simulationDistanceLabel, description: settingMessages.simulationDistanceDescription },
+	gui_scale: { label: settingMessages.guiScaleLabel, description: settingMessages.guiScaleDescription },
+	particles: { label: settingMessages.particlesLabel, description: settingMessages.particlesDescription },
+	clouds: { label: settingMessages.cloudsLabel, description: settingMessages.cloudsDescription },
+	entity_shadows: { label: settingMessages.entityShadowsLabel, description: settingMessages.entityShadowsDescription },
+	view_bobbing: { label: settingMessages.viewBobbingLabel, description: settingMessages.viewBobbingDescription },
+	vsync: { label: settingMessages.vsyncLabel, description: settingMessages.vsyncDescription },
+	fullscreen: { label: settingMessages.fullscreenLabel, description: settingMessages.fullscreenDescription },
+	max_framerate: { label: settingMessages.maxFramerateLabel, description: settingMessages.maxFramerateDescription },
+	mipmap_levels: { label: settingMessages.mipmapLevelsLabel, description: settingMessages.mipmapLevelsDescription },
+	biome_blend_radius: { label: settingMessages.biomeBlendRadiusLabel, description: settingMessages.biomeBlendRadiusDescription },
+	language: { label: settingMessages.languageLabel, description: settingMessages.languageDescription },
+	master_volume: { label: settingMessages.masterVolumeLabel, description: settingMessages.masterVolumeDescription },
+	music_volume: { label: settingMessages.musicVolumeLabel, description: settingMessages.musicVolumeDescription },
+	music_toast: { label: settingMessages.musicToastLabel, description: settingMessages.musicToastDescription },
+	blocks_volume: { label: settingMessages.blocksVolumeLabel, description: settingMessages.blocksVolumeDescription },
+	hostile_volume: { label: settingMessages.hostileVolumeLabel, description: settingMessages.hostileVolumeDescription },
+	players_volume: { label: settingMessages.playersVolumeLabel, description: settingMessages.playersVolumeDescription },
+	voice_volume: { label: settingMessages.voiceVolumeLabel, description: settingMessages.voiceVolumeDescription },
+	sensitivity: { label: settingMessages.sensitivityLabel, description: settingMessages.sensitivityDescription },
+	invert_mouse: { label: settingMessages.invertMouseLabel, description: settingMessages.invertMouseDescription },
+	auto_jump: { label: settingMessages.autoJumpLabel, description: settingMessages.autoJumpDescription },
+	toggle_crouch: { label: settingMessages.toggleCrouchLabel, description: settingMessages.toggleCrouchDescription },
+	toggle_sprint: { label: settingMessages.toggleSprintLabel, description: settingMessages.toggleSprintDescription },
+	discrete_mouse_scroll: { label: settingMessages.discreteMouseScrollLabel, description: settingMessages.discreteMouseScrollDescription },
+	'key.forward': { label: settingMessages.keyForwardLabel, description: settingMessages.keyForwardDescription },
+	'key.left': { label: settingMessages.keyLeftLabel, description: settingMessages.keyLeftDescription },
+	'key.back': { label: settingMessages.keyBackLabel, description: settingMessages.keyBackDescription },
+	'key.right': { label: settingMessages.keyRightLabel, description: settingMessages.keyRightDescription },
+	'key.jump': { label: settingMessages.keyJumpLabel, description: settingMessages.keyJumpDescription },
+	'key.sneak': { label: settingMessages.keySneakLabel, description: settingMessages.keySneakDescription },
+	'key.sprint': { label: settingMessages.keySprintLabel, description: settingMessages.keySprintDescription },
+	'key.inventory': { label: settingMessages.keyInventoryLabel, description: settingMessages.keyInventoryDescription },
+	'key.swap_offhand': { label: settingMessages.keySwapOffhandLabel, description: settingMessages.keySwapOffhandDescription },
+	'key.drop': { label: settingMessages.keyDropLabel, description: settingMessages.keyDropDescription },
+	'key.use': { label: settingMessages.keyUseLabel, description: settingMessages.keyUseDescription },
+	'key.attack': { label: settingMessages.keyAttackLabel, description: settingMessages.keyAttackDescription },
+	'key.pick_item': { label: settingMessages.keyPickItemLabel, description: settingMessages.keyPickItemDescription },
+	'key.chat': { label: settingMessages.keyChatLabel, description: settingMessages.keyChatDescription },
+	'key.player_list': { label: settingMessages.keyPlayerListLabel, description: settingMessages.keyPlayerListDescription },
+	'key.command': { label: settingMessages.keyCommandLabel, description: settingMessages.keyCommandDescription },
+	'key.screenshot': { label: settingMessages.keyScreenshotLabel, description: settingMessages.keyScreenshotDescription },
+	'key.perspective': { label: settingMessages.keyPerspectiveLabel, description: settingMessages.keyPerspectiveDescription },
+	'key.fullscreen': { label: settingMessages.keyFullscreenLabel, description: settingMessages.keyFullscreenDescription },
+	'key.advancements': { label: settingMessages.keyAdvancementsLabel, description: settingMessages.keyAdvancementsDescription },
+	chat_visibility: { label: settingMessages.chatVisibilityLabel, description: settingMessages.chatVisibilityDescription },
+	chat_colors: { label: settingMessages.chatColorsLabel, description: settingMessages.chatColorsDescription },
+	chat_links: { label: settingMessages.chatLinksLabel, description: settingMessages.chatLinksDescription },
+	chat_links_prompt: { label: settingMessages.chatLinksPromptLabel, description: settingMessages.chatLinksPromptDescription },
+	chat_opacity: { label: settingMessages.chatOpacityLabel, description: settingMessages.chatOpacityDescription },
+	chat_scale: { label: settingMessages.chatScaleLabel, description: settingMessages.chatScaleDescription },
+	narrator: { label: settingMessages.narratorLabel, description: settingMessages.narratorDescription },
+	subtitles: { label: settingMessages.subtitlesLabel, description: settingMessages.subtitlesDescription },
+	high_contrast: { label: settingMessages.highContrastLabel, description: settingMessages.highContrastDescription },
+	dark_splash: { label: settingMessages.darkSplashLabel, description: settingMessages.darkSplashDescription },
+	notification_time: { label: settingMessages.notificationTimeLabel, description: settingMessages.notificationTimeDescription },
+	main_hand: { label: settingMessages.mainHandLabel, description: settingMessages.mainHandDescription },
+	cape: { label: settingMessages.capeLabel, description: settingMessages.capeDescription },
+	hat: { label: settingMessages.hatLabel, description: settingMessages.hatDescription },
+	jacket: { label: settingMessages.jacketLabel, description: settingMessages.jacketDescription },
+	allow_server_listing: { label: settingMessages.allowServerListingLabel, description: settingMessages.allowServerListingDescription },
+	realms_notifications: { label: settingMessages.realmsNotificationsLabel, description: settingMessages.realmsNotificationsDescription },
+}
+
+const categories: Record<string, { label: MessageDescriptor; description: MessageDescriptor }> = {
+	skin_customization: { label: categoryMessages.skinCustomizationLabel, description: categoryMessages.skinCustomizationDescription },
+	video: { label: categoryMessages.videoLabel, description: categoryMessages.videoDescription },
+	video_settings: { label: categoryMessages.videoLabel, description: categoryMessages.videoDescription },
+	language: { label: categoryMessages.languageLabel, description: categoryMessages.languageDescription },
+	music_and_sound: { label: categoryMessages.musicAndSoundLabel, description: categoryMessages.musicAndSoundDescription },
+	controls: { label: categoryMessages.controlsLabel, description: categoryMessages.controlsDescription },
+	chat: { label: categoryMessages.chatLabel, description: categoryMessages.chatDescription },
+	chat_settings: { label: categoryMessages.chatLabel, description: categoryMessages.chatDescription },
+	accessibility: { label: categoryMessages.accessibilityLabel, description: categoryMessages.accessibilityDescription },
+	online: { label: categoryMessages.onlineLabel, description: categoryMessages.onlineDescription },
+	custom: { label: categoryMessages.customLabel, description: categoryMessages.customDescription },
+	custom_settings: { label: categoryMessages.customLabel, description: categoryMessages.customDescription },
+}
+
+const choices: Record<string, MessageDescriptor> = {
+	'graphics:fast': choiceMessages.fast,
+	'graphics:fancy': choiceMessages.fancy,
+	'graphics:fabulous': choiceMessages.fabulous,
+	'main_hand:left': choiceMessages.left,
+	'main_hand:right': choiceMessages.right,
+	'chat_visibility:0': choiceMessages.shown,
+	'chat_visibility:1': choiceMessages.commandsOnly,
+	'chat_visibility:2': choiceMessages.hidden,
+	'particles:0': choiceMessages.all,
+	'particles:1': choiceMessages.decreased,
+	'particles:2': choiceMessages.minimal,
+	'narrator:0': choiceMessages.off,
+	'narrator:1': choiceMessages.all,
+	'narrator:2': choiceMessages.chat,
+	'narrator:3': choiceMessages.system,
+	'clouds:false': choiceMessages.off,
+	'clouds:fast': choiceMessages.fast,
+	'clouds:true': choiceMessages.fancy,
+	'ambient_occlusion:off': choiceMessages.off,
+	'ambient_occlusion:on': choiceMessages.on,
+	'ambient_occlusion:minimum': choiceMessages.minimum,
+	'ambient_occlusion:maximum': choiceMessages.maximum,
+	'music_toast:never': choiceMessages.never,
+	'music_toast:pause': choiceMessages.pause,
+	'music_toast:pause_and_toast': choiceMessages.pauseAndToast,
+}
+
+const bucketReasonMessages: Record<
+	NonNullable<GameOptionCompatibilityBucket['reason']>,
+	MessageDescriptor
+> = {
+	launcher_controlled: presentationMessages.bucketLauncherControlled,
+	catalog_uncovered: presentationMessages.bucketCatalogUncovered,
+	inspection_failed: presentationMessages.bucketInspectionFailed,
+	waiting_for_options_file: presentationMessages.bucketWaitingForOptionsFile,
+	unsupported_value: presentationMessages.bucketUnsupportedValue,
+	migrates_on_write: presentationMessages.bucketMigratesOnWrite,
+	waiting_for_compatible_base: presentationMessages.bucketWaitingForCompatibleBase,
+	missing_setting: presentationMessages.bucketMissingSetting,
+}
+
+const validationMessages: Record<GameOptionValidationError, MessageDescriptor> = {
+	local_value_needs_saving: presentationMessages.validationLocalValueNeedsSaving,
+	missing_value: presentationMessages.validationMissingValue,
+	no_compatible_instances: presentationMessages.validationNoCompatibleInstances,
+	invalid_value: presentationMessages.validationInvalidValue,
+	changed_since_opened: presentationMessages.validationChangedSinceOpened,
+}
+
+const sourceDisabledMessages: Record<GameOptionsSourceDisabledReason, MessageDescriptor> = {
+	installing_or_updating: presentationMessages.sourceInstallingOrUpdating,
+	running: presentationMessages.sourceRunning,
+	unsupported_version: presentationMessages.sourceUnsupportedVersion,
+	missing_options_file: presentationMessages.sourceMissingOptionsFile,
+	no_syncable_settings: presentationMessages.sourceNoSyncableSettings,
+	unreadable_options_file: presentationMessages.sourceUnreadableOptionsFile,
+}
+
+export function formatGameSettingLabel(formatMessage: FormatMessage, setting: EditableGameSetting): string {
+	if (setting.kind === 'external') return setting.raw_key ?? setting.option_id
+	const definition = knownSettings[setting.option_id]
+	return definition ? formatMessage(definition.label) : setting.option_id
+}
+
+export function formatGameSettingDescription(formatMessage: FormatMessage, setting: EditableGameSetting): string {
+	if (setting.kind === 'external') return formatMessage(settingMessages.customDescription)
+	const definition = knownSettings[setting.option_id]
+	return definition ? formatMessage(definition.description) : ''
+}
+
+export function formatGameSettingCategory(formatMessage: FormatMessage, category: GameSettingCategory): string {
+	const definition = categories[category.id]
+	return definition ? formatMessage(definition.label) : category.id
+}
+
+export function formatGameSettingChoice(formatMessage: FormatMessage, optionId: string, value: string): string {
+	const message = choices[`${optionId}:${value}`]
+	return message ? formatMessage(message) : value
+}
+
+export function formatGameSettingValidation(formatMessage: FormatMessage, error: GameOptionValidationError | null | undefined): string | null {
+	return error ? formatMessage(validationMessages[error]) : null
+}
+
+export function formatCompatibilitySubtitle(formatMessage: FormatMessage, setting: EditableGameSetting): string {
+	const { total_participating: total, will_receive: recipients } = setting.compatibility
+	if (total === 0) return formatMessage(presentationMessages.compatibilityNoParticipants)
+	if (recipients === 0) return formatMessage(presentationMessages.compatibilityNone)
+	if (recipients === total) {
+		return formatMessage(
+			setting.sync_enabled
+				? presentationMessages.compatibilityAll
+				: presentationMessages.compatibilityAllDisabled,
+			{ count: total },
+		)
+	}
+	return formatMessage(
+		setting.sync_enabled
+			? presentationMessages.compatibilitySome
+			: presentationMessages.compatibilitySomeDisabled,
+		{ recipients, total },
+	)
+}
+
+export function formatCompatibilityTooltip(formatMessage: FormatMessage, setting: EditableGameSetting): string {
+	const summary = setting.compatibility
+	const lines = [
+		summary.total_participating === 0
+			? formatMessage(presentationMessages.compatibilityTooltipNoParticipants)
+			: formatMessage(presentationMessages.compatibilityTooltipRecipients, {
+					recipients: summary.will_receive,
+					total: summary.total_participating,
+				}),
+	]
+
+	for (const bucket of summary.buckets) {
+		if (bucket.reason) {
+			lines.push(formatMessage(bucketReasonMessages[bucket.reason], { count: bucket.instance_count }))
+		}
+		const versions = bucket.game_versions.join(', ')
+		const keys = [...bucket.write_keys, ...bucket.eventual_keys].join(', ')
+		if (versions && keys) {
+			lines.push(formatMessage(presentationMessages.bucketVersionsAndKeys, { versions, keys }))
+		} else if (versions) {
+			lines.push(formatMessage(presentationMessages.bucketVersions, { versions }))
+		} else if (keys) {
+			lines.push(formatMessage(presentationMessages.bucketKeys, { keys }))
+		}
+	}
+
+	return lines.join('\n')
+}
+
+export function shouldShowCompatibilityIndicator(setting: EditableGameSetting): boolean {
+	return setting.compatibility.buckets.some(
+		(bucket) =>
+			bucket.mapping !== 'direct' ||
+			bucket.status !== 'ready' ||
+			bucket.eventual_keys.length > 0,
+	)
+}
+
+export function formatSourceDisabledReason(formatMessage: FormatMessage, reason: GameOptionsSourceDisabledReason | null | undefined): string | null {
+	return reason ? formatMessage(sourceDisabledMessages[reason]) : null
+}
+
+export function formatSourceSettingsSummary(
+	formatMessage: FormatMessage,
+	source: Pick<GameOptionsSourceCandidate, 'recognized_setting_count' | 'custom_setting_count'>,
+): string {
+	return formatMessage(presentationMessages.sourceSettingsSummary, {
+		recognized: source.recognized_setting_count,
+		custom: source.custom_setting_count,
+	})
+}
diff --git a/apps/app-frontend/src/helpers/game-options.ts b/apps/app-frontend/src/helpers/game-options.ts
new file mode 100644
index 0000000000..5482231dde
--- /dev/null
+++ b/apps/app-frontend/src/helpers/game-options.ts
@@ -0,0 +1,176 @@
+import { invoke } from '@tauri-apps/api/core'
+
+export type GameOptionCanonicalValue =
+	| { type: 'bool'; value: boolean }
+	| { type: 'integer'; value: number }
+	| { type: 'decimal'; value: string }
+	| { type: 'enum'; value: string }
+	| { type: 'text'; value: string }
+	| { type: 'string_list'; value: string[] }
+	| { type: 'key_binding'; value: string }
+	| { type: 'external_raw'; value: string }
+
+export type GameOptionValueState = 'canonical' | 'uniform_local' | 'mixed' | 'unset' | 'invalid'
+
+export type GameOptionCompatibilityStatus =
+	| 'ready'
+	| 'deferred'
+	| 'waiting_for_file'
+	| 'waiting_for_base'
+	| 'not_available'
+	| 'unsupported_value'
+	| 'unmappable'
+	| 'catalog_uncovered'
+	| 'controlled'
+	| 'degraded'
+
+export type GameOptionMappingKind = 'direct' | 'legacy' | 'migrated' | 'lossless' | 'lossy'
+
+export type GameOptionCompatibilityReason =
+	| 'launcher_controlled'
+	| 'catalog_uncovered'
+	| 'inspection_failed'
+	| 'waiting_for_options_file'
+	| 'unsupported_value'
+	| 'migrates_on_write'
+	| 'waiting_for_compatible_base'
+	| 'missing_setting'
+
+export type GameOptionCompatibilityBucket = {
+	instance_count: number
+	write_keys: string[]
+	eventual_keys: string[]
+	game_versions: string[]
+	status: GameOptionCompatibilityStatus
+	mapping?: GameOptionMappingKind | null
+	reason?: GameOptionCompatibilityReason | null
+}
+
+export type GameOptionCompatibilitySummary = {
+	total_participating: number
+	will_receive: number
+	write_now: number
+	left_local: number
+	buckets: GameOptionCompatibilityBucket[]
+}
+
+export type GameOptionEditorChoice = {
+	value: string
+}
+
+export type GameOptionEditor = {
+	type:
+		| 'bool'
+		| 'integer'
+		| 'decimal'
+		| 'enum'
+		| 'text'
+		| 'string_list'
+		| 'key_binding'
+		| 'external_raw'
+	min?: number | null
+	max?: number | null
+	step?: number | null
+	unit?: string | null
+	choices?: GameOptionEditorChoice[]
+}
+
+export type GameSettingCategory = {
+	id: string
+	is_custom?: boolean
+}
+
+export type GameOptionValidationError =
+	| 'local_value_needs_saving'
+	| 'missing_value'
+	| 'no_compatible_instances'
+	| 'invalid_value'
+	| 'changed_since_opened'
+
+export type EditableGameSetting = {
+	option_id: string
+	category_id: string
+	kind: 'vanilla' | 'external'
+	raw_key?: string | null
+	sync_enabled: boolean
+	canonical_value?: GameOptionCanonicalValue | null
+	value_state: GameOptionValueState
+	option_revision: number
+	editor: GameOptionEditor
+	compatibility: GameOptionCompatibilitySummary
+	validation_error?: GameOptionValidationError | null
+	controlled?: boolean
+}
+
+export type GameSettingsEditorState = {
+	summary_revision: string
+	canonical_revision: number
+	catalog_revision: number
+	total_participating: number
+	categories: GameSettingCategory[]
+	settings: EditableGameSetting[]
+}
+
+export type GameSettingChange = {
+	option_id: string
+	base_option_revision: number
+	sync_enabled?: boolean
+	canonical_value?: GameOptionCanonicalValue | null
+}
+
+export type UpdateGameSettingsRequest = {
+	expected_summary_revision: string
+	expected_canonical_revision: number
+	expected_catalog_revision: number
+	changes: GameSettingChange[]
+}
+
+export type GameOptionsSourceCandidate = {
+	source_id: string
+	instance_id: string
+	name: string
+	icon_path?: string | null
+	game_version?: string | null
+	eligible: boolean
+	disabled_reason?: GameOptionsSourceDisabledReason | null
+	recognized_setting_count: number
+	custom_setting_count: number
+}
+
+export type GameOptionsSourceDisabledReason =
+	| 'installing_or_updating'
+	| 'running'
+	| 'unsupported_version'
+	| 'missing_options_file'
+	| 'no_syncable_settings'
+	| 'unreadable_options_file'
+
+export type SaveGameSettingsResult = {
+	state?: GameSettingsEditorState
+	applied: number
+	migrated: number
+	deferred: number
+	unsupported: number
+	failed: number
+	conflicts?: string[]
+}
+
+export async function list_game_options_sync_sources(): Promise<GameOptionsSourceCandidate[]> {
+	return await invoke('plugin:instance|instance_list_game_options_sync_sources')
+}
+
+export async function get_synced_game_options_config(): Promise<GameSettingsEditorState> {
+	return await invoke('plugin:instance|instance_get_synced_game_options_config')
+}
+
+export async function preview_synced_game_option_changes(
+	request: UpdateGameSettingsRequest,
+): Promise<GameSettingsEditorState> {
+	return await invoke('plugin:instance|instance_preview_synced_game_option_changes', { request })
+}
+
+export async function save_synced_game_option_changes(
+	request: UpdateGameSettingsRequest,
+): Promise<SaveGameSettingsResult> {
+	return await invoke('plugin:instance|instance_save_synced_game_option_changes', { request })
+}
diff --git a/apps/app-frontend/src/helpers/instance.ts b/apps/app-frontend/src/helpers/instance.ts
index 49297e1699..417b010c71 100644
--- a/apps/app-frontend/src/helpers/instance.ts
+++ b/apps/app-frontend/src/helpers/instance.ts
@@ -289,6 +289,7 @@ export async function set_synced_option(
 }
 
 export type SyncedOption =
+	| 'game_options'
 	| 'command_history'
 	| 'multiplayer_servers'
 	| 'creative_hotbars'
@@ -347,6 +348,8 @@ export async function set_global_synced_option(
 	})
 }
 
+export * from './game-options'
+
 export async function get_command_history(): Promise<string> {
 	return await invoke('plugin:instance|instance_get_command_history')
 }
diff --git a/apps/app-frontend/src/helpers/types.d.ts b/apps/app-frontend/src/helpers/types.d.ts
index 1a4b78908b..4972790ebb 100644
--- a/apps/app-frontend/src/helpers/types.d.ts
+++ b/apps/app-frontend/src/helpers/types.d.ts
@@ -17,6 +17,7 @@ export type GameInstance = {
 
 	group_ids: string[]
 	synced_options: {
+		game_options: boolean
 		command_history: boolean
 		multiplayer_servers: boolean
 		creative_hotbars: boolean
diff --git a/apps/app-frontend/src/pages/instance/components/settings-modal/synced-options-settings.vue b/apps/app-frontend/src/pages/instance/components/settings-modal/synced-options-settings.vue
index 3410a58c7b..06b6e38ca7 100644
--- a/apps/app-frontend/src/pages/instance/components/settings-modal/synced-options-settings.vue
+++ b/apps/app-frontend/src/pages/instance/components/settings-modal/synced-options-settings.vue
@@ -43,6 +43,15 @@ const messages = defineMessages({
 		id: 'instance.settings.tabs.synced-options.open-app-settings',
 		defaultMessage: 'Manage synced settings',
 	},
+	gameSettings: {
+		id: 'instance.settings.tabs.synced-options.game-settings',
+		defaultMessage: 'Game settings',
+	},
+	gameSettingsDescription: {
+		id: 'instance.settings.tabs.synced-options.game-settings.description',
+		defaultMessage:
+			'Apply the selected shared game settings on top of this instance’s options.txt.',
+	},
 	multiplayerServers: {
 		id: 'instance.settings.tabs.synced-options.multiplayer-servers',
 		defaultMessage: 'Unsync multiplayer servers',
@@ -115,6 +124,11 @@ const rows: Array<{
 	title: keyof typeof messages
 	description?: keyof typeof messages
 }> = [
+	{
+		option: 'game_options',
+		title: 'gameSettings',
+		description: 'gameSettingsDescription',
+	},
 	{
 		option: 'multiplayer_servers',
 		title: 'multiplayerServers',
@@ -374,6 +388,9 @@ function resolveHotbars(resolution: SyncedOptionJoinResolution) {
 					<p v-if="row.description" class="m-0 text-secondary">
 						{{ formatMessage(messages[row.description]) }}
 					</p>
+					<p v-if="disabledReason(row.option)" class="m-0 text-xs text-orange">
+						{{ disabledReason(row.option) }}
+					</p>
 				</div>
 				<div class="flex shrink-0 items-center">
 					<span v-tooltip="disabledReason(row.option)" class="flex">
@@ -383,7 +400,7 @@ function resolveHotbars(resolution: SyncedOptionJoinResolution) {
 							:disabled="
 								previewingOption !== null ||
 								overviewQuery.isPending.value ||
-								!!disabledReason(row.option)
+								(!!disabledReason(row.option) && !enabled(row.option))
 							"
 							@update:model-value="(excluded) => setExcluded(row.option, excluded)"
 						/>
diff --git a/apps/app/build.rs b/apps/app/build.rs
index 41f80995c5..443e22191c 100644
--- a/apps/app/build.rs
+++ b/apps/app/build.rs
@@ -237,6 +237,10 @@ fn main() {
                         "instance_get_synced_options_overview",
                         "instance_get_global_synced_options",
                         "instance_set_global_synced_option",
+                        "instance_list_game_options_sync_sources",
+                        "instance_get_synced_game_options_config",
+                        "instance_preview_synced_game_option_changes",
+                        "instance_save_synced_game_option_changes",
                         "instance_get_command_history",
                         "instance_set_command_history",
                         "instance_open_synced_options_folder",
diff --git a/apps/app/src/api/instance.rs b/apps/app/src/api/instance.rs
index c536756ee8..c6dbf7f084 100644
--- a/apps/app/src/api/instance.rs
+++ b/apps/app/src/api/instance.rs
@@ -66,6 +66,10 @@ pub fn init<R: tauri::Runtime>() -> tauri::plugin::TauriPlugin<R> {
             instance_get_synced_options_overview,
             instance_get_global_synced_options,
             instance_set_global_synced_option,
+            instance_list_game_options_sync_sources,
+            instance_get_synced_game_options_config,
+            instance_preview_synced_game_option_changes,
+            instance_save_synced_game_option_changes,
             instance_get_command_history,
             instance_set_command_history,
             instance_open_synced_options_folder,
@@ -854,6 +858,32 @@ pub async fn instance_set_global_synced_option(
     .await?)
 }
 
+#[tauri::command]
+pub async fn instance_list_game_options_sync_sources()
+-> Result<Vec<theseus::instance::GameOptionsSourceCandidate>> {
+    Ok(theseus::instance::list_game_options_sync_sources().await?)
+}
+
+#[tauri::command]
+pub async fn instance_get_synced_game_options_config()
+-> Result<theseus::instance::GameSettingsEditorState> {
+    Ok(theseus::instance::get_synced_game_options_config().await?)
+}
+
+#[tauri::command]
+pub async fn instance_preview_synced_game_option_changes(
+    request: theseus::instance::UpdateGameSettingsRequest,
+) -> Result<theseus::instance::GameSettingsEditorState> {
+    Ok(theseus::instance::preview_synced_game_option_changes(request).await?)
+}
+
+#[tauri::command]
+pub async fn instance_save_synced_game_option_changes(
+    request: theseus::instance::UpdateGameSettingsRequest,
+) -> Result<theseus::instance::SaveGameSettingsResult> {
+    Ok(theseus::instance::save_synced_game_option_changes(request).await?)
+}
+
 #[tauri::command]
 pub async fn instance_get_command_history() -> Result<String> {
     Ok(theseus::instance::get_command_history().await?)
diff --git a/packages/app-lib/.sqlx/query-006f7c73e672da9d9d607e58ce0926ef4cd958146c16797d589f347626dbab7e.json b/packages/app-lib/.sqlx/query-006f7c73e672da9d9d607e58ce0926ef4cd958146c16797d589f347626dbab7e.json
new file mode 100644
index 0000000000..febf70e225
--- /dev/null
+++ b/packages/app-lib/.sqlx/query-006f7c73e672da9d9d607e58ce0926ef4cd958146c16797d589f347626dbab7e.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n\t\t\t\tUPDATE synced_game_option_values\n\t\t\t\tSET seeded = 0, revision = ?, updated_at = ?\n\t\t\t\tWHERE option_id = ?\n\t\t\t\t",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 3
+    },
+    "nullable": []
+  },
+  "hash": "006f7c73e672da9d9d607e58ce0926ef4cd958146c16797d589f347626dbab7e"
+}
diff --git a/packages/app-lib/.sqlx/query-06e155e02c8d097e32f18b161b3fbd69200515a3e90400d7d002acd86cf03a8c.json b/packages/app-lib/.sqlx/query-06e155e02c8d097e32f18b161b3fbd69200515a3e90400d7d002acd86cf03a8c.json
new file mode 100644
index 0000000000..6a55bbe060
--- /dev/null
+++ b/packages/app-lib/.sqlx/query-06e155e02c8d097e32f18b161b3fbd69200515a3e90400d7d002acd86cf03a8c.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n\t\t\tINSERT INTO synced_game_option_values\n\t\t\t\t(option_id, kind, raw_key, canonical_type,\n\t\t\t\t canonical_value_json, value_codec, seeded, revision, origin,\n\t\t\t\t source_game_version, source_instance_id, updated_at)\n\t\t\tVALUES (?, 'vanilla', NULL, ?, ?, 'catalog', 1, ?,\n\t\t\t\t'source_seed', ?, ?, ?)\n\t\t\tON CONFLICT(option_id) DO UPDATE SET\n\t\t\t\tkind = 'vanilla', raw_key = NULL,\n\t\t\t\tcanonical_type = excluded.canonical_type,\n\t\t\t\tcanonical_value_json = excluded.canonical_value_json,\n\t\t\t\tvalue_codec = excluded.value_codec, seeded = 1,\n\t\t\t\trevision = excluded.revision, origin = 'source_seed',\n\t\t\t\tsource_game_version = excluded.source_game_version,\n\t\t\t\tsource_instance_id = excluded.source_instance_id,\n\t\t\t\tupdated_at = excluded.updated_at\n\t\t\t",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 7
+    },
+    "nullable": []
+  },
+  "hash": "06e155e02c8d097e32f18b161b3fbd69200515a3e90400d7d002acd86cf03a8c"
+}
diff --git a/packages/app-lib/.sqlx/query-083e4766729cc70fd43bcc2b920165d10b9a34a68eb4e85b7380eee167db92b0.json b/packages/app-lib/.sqlx/query-083e4766729cc70fd43bcc2b920165d10b9a34a68eb4e85b7380eee167db92b0.json
new file mode 100644
index 0000000000..13c3f23991
--- /dev/null
+++ b/packages/app-lib/.sqlx/query-083e4766729cc70fd43bcc2b920165d10b9a34a68eb4e85b7380eee167db92b0.json
@@ -0,0 +1,50 @@
+{
+  "db_name": "SQLite",
+  "query": "\n\t\tSELECT option_id, kind, raw_key, canonical_value_json,\n\t\t\tseeded AS \"seeded!: bool\", revision AS \"revision!: i64\"\n\t\tFROM synced_game_option_values\n\t\t",
+  "describe": {
+    "columns": [
+      {
+        "name": "option_id",
+        "ordinal": 0,
+        "type_info": "Text"
+      },
+      {
+        "name": "kind",
+        "ordinal": 1,
+        "type_info": "Text"
+      },
+      {
+        "name": "raw_key",
+        "ordinal": 2,
+        "type_info": "Text"
+      },
+      {
+        "name": "canonical_value_json",
+        "ordinal": 3,
+        "type_info": "Text"
+      },
+      {
+        "name": "seeded!: bool",
+        "ordinal": 4,
+        "type_info": "Integer"
+      },
+      {
+        "name": "revision!: i64",
+        "ordinal": 5,
+        "type_info": "Integer"
+      }
+    ],
+    "parameters": {
+      "Right": 0
+    },
+    "nullable": [
+      false,
+      false,
+      true,
+      true,
+      false,
+      false
+    ]
+  },
+  "hash": "083e4766729cc70fd43bcc2b920165d10b9a34a68eb4e85b7380eee167db92b0"
+}
diff --git a/packages/app-lib/.sqlx/query-117563d32f10e1e0f678d606aa5edac01d302922e9f44c4375046cc7ab5c367b.json b/packages/app-lib/.sqlx/query-117563d32f10e1e0f678d606aa5edac01d302922e9f44c4375046cc7ab5c367b.json
new file mode 100644
index 0000000000..ed1f3b3d6b
--- /dev/null
+++ b/packages/app-lib/.sqlx/query-117563d32f10e1e0f678d606aa5edac01d302922e9f44c4375046cc7ab5c367b.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "UPDATE synced_game_option_values\n\t\t SET seeded = 0, revision = revision + 1, updated_at = ?",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 1
+    },
+    "nullable": []
+  },
+  "hash": "117563d32f10e1e0f678d606aa5edac01d302922e9f44c4375046cc7ab5c367b"
+}
diff --git a/packages/app-lib/.sqlx/query-1499ce88ed936711e88354f6123f719165ad8b7fe31ec84b8a6b31a45a00e634.json b/packages/app-lib/.sqlx/query-1499ce88ed936711e88354f6123f719165ad8b7fe31ec84b8a6b31a45a00e634.json
new file mode 100644
index 0000000000..c45e5afbd2
--- /dev/null
+++ b/packages/app-lib/.sqlx/query-1499ce88ed936711e88354f6123f719165ad8b7fe31ec84b8a6b31a45a00e634.json
@@ -0,0 +1,26 @@
+{
+  "db_name": "SQLite",
+  "query": "\n\t\t\tSELECT had_file AS \"had_file!: bool\", document\n\t\t\tFROM instance_game_option_update_state\n\t\t\tWHERE instance_id = ?\n\t\t\t",
+  "describe": {
+    "columns": [
+      {
+        "name": "had_file!: bool",
+        "ordinal": 0,
+        "type_info": "Integer"
+      },
+      {
+        "name": "document",
+        "ordinal": 1,
+        "type_info": "Blob"
+      }
+    ],
+    "parameters": {
+      "Right": 1
+    },
+    "nullable": [
+      false,
+      true
+    ]
+  },
+  "hash": "1499ce88ed936711e88354f6123f719165ad8b7fe31ec84b8a6b31a45a00e634"
+}
diff --git a/packages/app-lib/.sqlx/query-1d66f3fb56c2e74146f8bc3b2985ed33f902980977f795d38f062bf7438c8334.json b/packages/app-lib/.sqlx/query-1d66f3fb56c2e74146f8bc3b2985ed33f902980977f795d38f062bf7438c8334.json
new file mode 100644
index 0000000000..a2107b6181
--- /dev/null
+++ b/packages/app-lib/.sqlx/query-1d66f3fb56c2e74146f8bc3b2985ed33f902980977f795d38f062bf7438c8334.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n\t\tINSERT INTO instance_sync_preferences (instance_id, feature, enabled)\n\t\tVALUES (?, 'game_options', 1)\n\t\tON CONFLICT(instance_id, feature) DO UPDATE SET enabled = 1\n\t\t",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 1
+    },
+    "nullable": []
+  },
+  "hash": "1d66f3fb56c2e74146f8bc3b2985ed33f902980977f795d38f062bf7438c8334"
+}
diff --git a/packages/app-lib/.sqlx/query-253ab2ee7d3504fbc1b098739d06c0c2b1a888ea6c6c0542f4713b03bbafea7b.json b/packages/app-lib/.sqlx/query-253ab2ee7d3504fbc1b098739d06c0c2b1a888ea6c6c0542f4713b03bbafea7b.json
new file mode 100644
index 0000000000..23c97c1373
--- /dev/null
+++ b/packages/app-lib/.sqlx/query-253ab2ee7d3504fbc1b098739d06c0c2b1a888ea6c6c0542f4713b03bbafea7b.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n\t\t\tINSERT INTO synced_game_option_state (singleton, revision, catalog_revision)\n\t\t\tVALUES (1, ?, ?)\n\t\t\tON CONFLICT(singleton) DO UPDATE SET\n\t\t\t\trevision = excluded.revision,\n\t\t\t\tcatalog_revision = excluded.catalog_revision\n\t\t\t",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 2
+    },
+    "nullable": []
+  },
+  "hash": "253ab2ee7d3504fbc1b098739d06c0c2b1a888ea6c6c0542f4713b03bbafea7b"
+}
diff --git a/packages/app-lib/.sqlx/query-27958cce6c5ed137310edc76fd113d164438273c75ad4f22a4b81003e737da67.json b/packages/app-lib/.sqlx/query-27958cce6c5ed137310edc76fd113d164438273c75ad4f22a4b81003e737da67.json
new file mode 100644
index 0000000000..8a610b1624
--- /dev/null
+++ b/packages/app-lib/.sqlx/query-27958cce6c5ed137310edc76fd113d164438273c75ad4f22a4b81003e737da67.json
@@ -0,0 +1,32 @@
+{
+  "db_name": "SQLite",
+  "query": "\n\t\tSELECT option_id, enabled AS \"enabled!: bool\",\n\t\t\trevision AS \"revision!: i64\"\n\t\tFROM synced_game_option_preferences\n\t\t",
+  "describe": {
+    "columns": [
+      {
+        "name": "option_id",
+        "ordinal": 0,
+        "type_info": "Text"
+      },
+      {
+        "name": "enabled!: bool",
+        "ordinal": 1,
+        "type_info": "Integer"
+      },
+      {
+        "name": "revision!: i64",
+        "ordinal": 2,
+        "type_info": "Integer"
+      }
+    ],
+    "parameters": {
+      "Right": 0
+    },
+    "nullable": [
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "27958cce6c5ed137310edc76fd113d164438273c75ad4f22a4b81003e737da67"
+}
diff --git a/packages/app-lib/.sqlx/query-39459b06ceb9ca531c476c6a77e40087e771dfafc968144db5978c570e68a884.json b/packages/app-lib/.sqlx/query-39459b06ceb9ca531c476c6a77e40087e771dfafc968144db5978c570e68a884.json
new file mode 100644
index 0000000000..47604ee881
--- /dev/null
+++ b/packages/app-lib/.sqlx/query-39459b06ceb9ca531c476c6a77e40087e771dfafc968144db5978c570e68a884.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n\t\t\t\tINSERT INTO synced_game_option_values\n\t\t\t\t\t(option_id, kind, raw_key, canonical_type,\n\t\t\t\t\t canonical_value_json, value_codec, seeded, revision, origin,\n\t\t\t\t\t source_game_version, source_instance_id, updated_at)\n\t\t\t\tVALUES (?, 'vanilla', NULL, ?, ?, 'catalog', 1, 1,\n\t\t\t\t\t'instance', ?, ?, ?)\n\t\t\t\t",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 6
+    },
+    "nullable": []
+  },
+  "hash": "39459b06ceb9ca531c476c6a77e40087e771dfafc968144db5978c570e68a884"
+}
diff --git a/packages/app-lib/.sqlx/query-465bc85ac3abc47c9179cf2f09e55a1a303360c04d865980ce37248b05ea3994.json b/packages/app-lib/.sqlx/query-465bc85ac3abc47c9179cf2f09e55a1a303360c04d865980ce37248b05ea3994.json
new file mode 100644
index 0000000000..3b9d6a7504
--- /dev/null
+++ b/packages/app-lib/.sqlx/query-465bc85ac3abc47c9179cf2f09e55a1a303360c04d865980ce37248b05ea3994.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n\t\tINSERT INTO instance_game_option_pack_bases\n\t\t\t(instance_id, pack_version_id, source, sha1, encoding, document)\n\t\tVALUES (?, ?, ?, ?, ?, ?)\n\t\tON CONFLICT(instance_id) DO UPDATE SET\n\t\t\tpack_version_id = excluded.pack_version_id,\n\t\t\tsource = excluded.source, sha1 = excluded.sha1,\n\t\t\tencoding = excluded.encoding, document = excluded.document\n\t\t",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 6
+    },
+    "nullable": []
+  },
+  "hash": "465bc85ac3abc47c9179cf2f09e55a1a303360c04d865980ce37248b05ea3994"
+}
diff --git a/packages/app-lib/.sqlx/query-51adcaf25852937edaf46a304e85dcf59f91565296e9ae97d210249cdcc29cfc.json b/packages/app-lib/.sqlx/query-51adcaf25852937edaf46a304e85dcf59f91565296e9ae97d210249cdcc29cfc.json
new file mode 100644
index 0000000000..15b644e71a
--- /dev/null
+++ b/packages/app-lib/.sqlx/query-51adcaf25852937edaf46a304e85dcf59f91565296e9ae97d210249cdcc29cfc.json
@@ -0,0 +1,26 @@
+{
+  "db_name": "SQLite",
+  "query": "\n\t\tSELECT revision AS \"revision!: i64\",\n\t\t\tcatalog_revision AS \"catalog_revision!: i64\"\n\t\tFROM synced_game_option_state\n\t\tWHERE singleton = 1\n\t\t",
+  "describe": {
+    "columns": [
+      {
+        "name": "revision!: i64",
+        "ordinal": 0,
+        "type_info": "Integer"
+      },
+      {
+        "name": "catalog_revision!: i64",
+        "ordinal": 1,
+        "type_info": "Integer"
+      }
+    ],
+    "parameters": {
+      "Right": 0
+    },
+    "nullable": [
+      false,
+      false
+    ]
+  },
+  "hash": "51adcaf25852937edaf46a304e85dcf59f91565296e9ae97d210249cdcc29cfc"
+}
diff --git a/packages/app-lib/.sqlx/query-58dbcc46287aa386bb87bebc0a94bbbe293834ffd7b86b260a7bccb6c8028d92.json b/packages/app-lib/.sqlx/query-58dbcc46287aa386bb87bebc0a94bbbe293834ffd7b86b260a7bccb6c8028d92.json
new file mode 100644
index 0000000000..aedb979da8
--- /dev/null
+++ b/packages/app-lib/.sqlx/query-58dbcc46287aa386bb87bebc0a94bbbe293834ffd7b86b260a7bccb6c8028d92.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n\t\t\t\t\tUPDATE synced_game_option_values\n\t\t\t\t\tSET canonical_value_json = NULL, seeded = 0, revision = ?,\n\t\t\t\t\t\torigin = 'app_editor', source_game_version = NULL,\n\t\t\t\t\t\tsource_instance_id = NULL, updated_at = ?\n\t\t\t\t\tWHERE option_id = ?\n\t\t\t\t\t",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 3
+    },
+    "nullable": []
+  },
+  "hash": "58dbcc46287aa386bb87bebc0a94bbbe293834ffd7b86b260a7bccb6c8028d92"
+}
diff --git a/packages/app-lib/.sqlx/query-6b6645cbfb273b6c37f4c472d5df2dcb14f952cc7bcbb4661ff8abd4e168ee1c.json b/packages/app-lib/.sqlx/query-6b6645cbfb273b6c37f4c472d5df2dcb14f952cc7bcbb4661ff8abd4e168ee1c.json
new file mode 100644
index 0000000000..2ade965808
--- /dev/null
+++ b/packages/app-lib/.sqlx/query-6b6645cbfb273b6c37f4c472d5df2dcb14f952cc7bcbb4661ff8abd4e168ee1c.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n\t\t\tINSERT INTO synced_game_option_values\n\t\t\t\t(option_id, kind, raw_key, canonical_type,\n\t\t\t\t canonical_value_json, value_codec, seeded, revision, origin,\n\t\t\t\t source_game_version, source_instance_id, updated_at)\n\t\t\tVALUES (?, 'external', ?, 'external_raw', ?, 'exact_raw',\n\t\t\t\t1, ?, 'instance', ?, ?, ?)\n\t\t\tON CONFLICT(option_id) DO UPDATE SET\n\t\t\t\traw_key = excluded.raw_key,\n\t\t\t\tcanonical_value_json = excluded.canonical_value_json,\n\t\t\t\tseeded = 1, revision = excluded.revision,\n\t\t\t\torigin = 'instance',\n\t\t\t\tsource_game_version = excluded.source_game_version,\n\t\t\t\tsource_instance_id = excluded.source_instance_id,\n\t\t\t\tupdated_at = excluded.updated_at\n\t\t\t",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 7
+    },
+    "nullable": []
+  },
+  "hash": "6b6645cbfb273b6c37f4c472d5df2dcb14f952cc7bcbb4661ff8abd4e168ee1c"
+}
diff --git a/packages/app-lib/.sqlx/query-6f17b1880668e6efb235eaa3808bd64a1c6bb5fc5f3c0082500afdcfa7340efa.json b/packages/app-lib/.sqlx/query-6f17b1880668e6efb235eaa3808bd64a1c6bb5fc5f3c0082500afdcfa7340efa.json
index f702c75af1..c59ac318b0 100644
--- a/packages/app-lib/.sqlx/query-6f17b1880668e6efb235eaa3808bd64a1c6bb5fc5f3c0082500afdcfa7340efa.json
+++ b/packages/app-lib/.sqlx/query-6f17b1880668e6efb235eaa3808bd64a1c6bb5fc5f3c0082500afdcfa7340efa.json
@@ -3,17 +3,60 @@
   "query": "\n\t\tSELECT\n\t\t\tscreenshots.id,\n\t\t\tscreenshots.instance_id,\n\t\t\tscreenshots.file_name,\n\t\t\tscreenshots.content_hash,\n\t\t\tscreenshots.file_size,\n\t\t\tscreenshots.modified_at,\n\t\t\tscreenshots.created_at,\n\t\t\tmemberships.group_id AS \"group_id?\"\n\t\tFROM screenshots\n\t\tLEFT JOIN screenshot_group_memberships memberships\n\t\t\tON memberships.screenshot_id = screenshots.id\n\t\tWHERE screenshots.instance_id = ? AND screenshots.file_name = ?\n\t\t",
   "describe": {
     "columns": [
-      { "name": "id", "ordinal": 0, "type_info": "Text" },
-      { "name": "instance_id", "ordinal": 1, "type_info": "Text" },
-      { "name": "file_name", "ordinal": 2, "type_info": "Text" },
-      { "name": "content_hash", "ordinal": 3, "type_info": "Text" },
-      { "name": "file_size", "ordinal": 4, "type_info": "Integer" },
-      { "name": "modified_at", "ordinal": 5, "type_info": "Integer" },
-      { "name": "created_at", "ordinal": 6, "type_info": "Integer" },
-      { "name": "group_id?", "ordinal": 7, "type_info": "Text" }
+      {
+        "name": "id",
+        "ordinal": 0,
+        "type_info": "Text"
+      },
+      {
+        "name": "instance_id",
+        "ordinal": 1,
+        "type_info": "Text"
+      },
+      {
+        "name": "file_name",
+        "ordinal": 2,
+        "type_info": "Text"
+      },
+      {
+        "name": "content_hash",
+        "ordinal": 3,
+        "type_info": "Text"
+      },
+      {
+        "name": "file_size",
+        "ordinal": 4,
+        "type_info": "Integer"
+      },
+      {
+        "name": "modified_at",
+        "ordinal": 5,
+        "type_info": "Integer"
+      },
+      {
+        "name": "created_at",
+        "ordinal": 6,
+        "type_info": "Integer"
+      },
+      {
+        "name": "group_id?",
+        "ordinal": 7,
+        "type_info": "Text"
+      }
     ],
-    "parameters": { "Right": 2 },
-    "nullable": [false, false, false, false, false, false, false, false]
+    "parameters": {
+      "Right": 2
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false
+    ]
   },
   "hash": "6f17b1880668e6efb235eaa3808bd64a1c6bb5fc5f3c0082500afdcfa7340efa"
 }
diff --git a/packages/app-lib/.sqlx/query-7062aaed9cde80d865cf4c845cb40fb48d24b62a5ddddfc6de2f14b80d2bfc7c.json b/packages/app-lib/.sqlx/query-7062aaed9cde80d865cf4c845cb40fb48d24b62a5ddddfc6de2f14b80d2bfc7c.json
new file mode 100644
index 0000000000..e75f23a5df
--- /dev/null
+++ b/packages/app-lib/.sqlx/query-7062aaed9cde80d865cf4c845cb40fb48d24b62a5ddddfc6de2f14b80d2bfc7c.json
@@ -0,0 +1,20 @@
+{
+  "db_name": "SQLite",
+  "query": "\n\t\tSELECT EXISTS(\n\t\t\tSELECT 1 FROM synced_game_option_state WHERE singleton = 1\n\t\t) AS \"exists!: bool\"\n\t\t",
+  "describe": {
+    "columns": [
+      {
+        "name": "exists!: bool",
+        "ordinal": 0,
+        "type_info": "Integer"
+      }
+    ],
+    "parameters": {
+      "Right": 0
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "7062aaed9cde80d865cf4c845cb40fb48d24b62a5ddddfc6de2f14b80d2bfc7c"
+}
diff --git a/packages/app-lib/.sqlx/query-71952a8ac14cf790a5b93eb722efa810ad8ca5f246c4d81ad4bcd5866ee10f2c.json b/packages/app-lib/.sqlx/query-71952a8ac14cf790a5b93eb722efa810ad8ca5f246c4d81ad4bcd5866ee10f2c.json
new file mode 100644
index 0000000000..14c51887ab
--- /dev/null
+++ b/packages/app-lib/.sqlx/query-71952a8ac14cf790a5b93eb722efa810ad8ca5f246c4d81ad4bcd5866ee10f2c.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n\t\tINSERT INTO instance_game_option_update_state\n\t\t\t(instance_id, had_file, sha1, document)\n\t\tVALUES (?, ?, ?, ?)\n\t\tON CONFLICT(instance_id) DO UPDATE SET\n\t\t\thad_file = excluded.had_file, sha1 = excluded.sha1,\n\t\t\tdocument = excluded.document\n\t\t",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 4
+    },
+    "nullable": []
+  },
+  "hash": "71952a8ac14cf790a5b93eb722efa810ad8ca5f246c4d81ad4bcd5866ee10f2c"
+}
diff --git a/packages/app-lib/.sqlx/query-738203b62c0c38211bb535a3595f046e42ee66e31d99b8ff28917f58b4a937f6.json b/packages/app-lib/.sqlx/query-738203b62c0c38211bb535a3595f046e42ee66e31d99b8ff28917f58b4a937f6.json
new file mode 100644
index 0000000000..8a7b463f43
--- /dev/null
+++ b/packages/app-lib/.sqlx/query-738203b62c0c38211bb535a3595f046e42ee66e31d99b8ff28917f58b4a937f6.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n\t\t\tUPDATE synced_game_option_state\n\t\t\tSET revision = ?, catalog_revision = ?\n\t\t\tWHERE singleton = 1\n\t\t\t",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 2
+    },
+    "nullable": []
+  },
+  "hash": "738203b62c0c38211bb535a3595f046e42ee66e31d99b8ff28917f58b4a937f6"
+}
diff --git a/packages/app-lib/.sqlx/query-76896bb2061e4c839a53bed4a221be42650f58edf2045fe1b85d418a537382e2.json b/packages/app-lib/.sqlx/query-76896bb2061e4c839a53bed4a221be42650f58edf2045fe1b85d418a537382e2.json
new file mode 100644
index 0000000000..92962fa3b2
--- /dev/null
+++ b/packages/app-lib/.sqlx/query-76896bb2061e4c839a53bed4a221be42650f58edf2045fe1b85d418a537382e2.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n\t\t\tINSERT INTO sync_feature_settings\n\t\t\t\t(feature, globally_enabled, new_instance_default)\n\t\t\tVALUES (?, ?, 1)\n\t\t\tON CONFLICT(feature) DO UPDATE SET\n\t\t\t\tglobally_enabled = excluded.globally_enabled\n\t\t\t",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 2
+    },
+    "nullable": []
+  },
+  "hash": "76896bb2061e4c839a53bed4a221be42650f58edf2045fe1b85d418a537382e2"
+}
diff --git a/packages/app-lib/.sqlx/query-7874719d05692b28b1c2cdbd6f208acd794a400abeca0027cc6b21f5bd466e79.json b/packages/app-lib/.sqlx/query-7874719d05692b28b1c2cdbd6f208acd794a400abeca0027cc6b21f5bd466e79.json
new file mode 100644
index 0000000000..5fd42152fa
--- /dev/null
+++ b/packages/app-lib/.sqlx/query-7874719d05692b28b1c2cdbd6f208acd794a400abeca0027cc6b21f5bd466e79.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n\t\t\t\tINSERT INTO synced_game_option_preferences\n\t\t\t\t\t(option_id, enabled, source, revision)\n\t\t\t\tVALUES (?, ?, ?, ?)\n\t\t\t\tON CONFLICT(option_id) DO UPDATE SET\n\t\t\t\t\tenabled = excluded.enabled, source = 'user',\n\t\t\t\t\trevision = excluded.revision\n\t\t\t\t",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 4
+    },
+    "nullable": []
+  },
+  "hash": "7874719d05692b28b1c2cdbd6f208acd794a400abeca0027cc6b21f5bd466e79"
+}
diff --git a/packages/app-lib/.sqlx/query-7a91c72a32d0d8cf712ddcbe9746d3d8c7b10211f275e0db81fa1eda5196c2e5.json b/packages/app-lib/.sqlx/query-7a91c72a32d0d8cf712ddcbe9746d3d8c7b10211f275e0db81fa1eda5196c2e5.json
new file mode 100644
index 0000000000..9428856bff
--- /dev/null
+++ b/packages/app-lib/.sqlx/query-7a91c72a32d0d8cf712ddcbe9746d3d8c7b10211f275e0db81fa1eda5196c2e5.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "DELETE FROM instance_game_option_update_state WHERE instance_id = ?",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 1
+    },
+    "nullable": []
+  },
+  "hash": "7a91c72a32d0d8cf712ddcbe9746d3d8c7b10211f275e0db81fa1eda5196c2e5"
+}
diff --git a/packages/app-lib/.sqlx/query-838b438f2dfa21885848b2eaf013a4767d4e9a28626c754bb4e8e7030b73ead7.json b/packages/app-lib/.sqlx/query-838b438f2dfa21885848b2eaf013a4767d4e9a28626c754bb4e8e7030b73ead7.json
new file mode 100644
index 0000000000..e3b11b7fb6
--- /dev/null
+++ b/packages/app-lib/.sqlx/query-838b438f2dfa21885848b2eaf013a4767d4e9a28626c754bb4e8e7030b73ead7.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n\t\t\t\tUPDATE synced_game_option_preferences\n\t\t\t\tSET enabled = 0, source = 'catalog_default', revision = ?\n\t\t\t\tWHERE option_id = ?\n\t\t\t\t",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 2
+    },
+    "nullable": []
+  },
+  "hash": "838b438f2dfa21885848b2eaf013a4767d4e9a28626c754bb4e8e7030b73ead7"
+}
diff --git a/packages/app-lib/.sqlx/query-8aae262e7a2e6375164af3b296465d017d21a6c6476d0f2ae09c076d75f0dda3.json b/packages/app-lib/.sqlx/query-8aae262e7a2e6375164af3b296465d017d21a6c6476d0f2ae09c076d75f0dda3.json
index be54b69428..792ed44226 100644
--- a/packages/app-lib/.sqlx/query-8aae262e7a2e6375164af3b296465d017d21a6c6476d0f2ae09c076d75f0dda3.json
+++ b/packages/app-lib/.sqlx/query-8aae262e7a2e6375164af3b296465d017d21a6c6476d0f2ae09c076d75f0dda3.json
@@ -3,7 +3,9 @@
   "query": "\n\t\tUPDATE screenshots\n\t\tSET\n\t\t\tinstance_id = ?,\n\t\t\tfile_name = ?,\n\t\t\tcontent_hash = ?,\n\t\t\tfile_size = ?,\n\t\t\tmodified_at = ?,\n\t\t\tcreated_at = ?\n\t\tWHERE id = ?\n\t\t",
   "describe": {
     "columns": [],
-    "parameters": { "Right": 7 },
+    "parameters": {
+      "Right": 7
+    },
     "nullable": []
   },
   "hash": "8aae262e7a2e6375164af3b296465d017d21a6c6476d0f2ae09c076d75f0dda3"
diff --git a/packages/app-lib/.sqlx/query-8e5cb4f707e7adae2d7fce146402335be017bc4398a15149753bf31b2acac938.json b/packages/app-lib/.sqlx/query-8e5cb4f707e7adae2d7fce146402335be017bc4398a15149753bf31b2acac938.json
new file mode 100644
index 0000000000..abda3d314d
--- /dev/null
+++ b/packages/app-lib/.sqlx/query-8e5cb4f707e7adae2d7fce146402335be017bc4398a15149753bf31b2acac938.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n\t\t\t\tUPDATE synced_game_option_values\n\t\t\t\tSET canonical_type = ?, canonical_value_json = ?, seeded = 1,\n\t\t\t\t\trevision = ?, origin = 'instance', source_game_version = ?,\n\t\t\t\t\tsource_instance_id = ?, updated_at = ?\n\t\t\t\tWHERE option_id = ? AND revision = ?\n\t\t\t\t",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 8
+    },
+    "nullable": []
+  },
+  "hash": "8e5cb4f707e7adae2d7fce146402335be017bc4398a15149753bf31b2acac938"
+}
diff --git a/packages/app-lib/.sqlx/query-91c09c88e89aadbf34fd823f119ca83c2626f097de53ec537f59b76fdb21eccb.json b/packages/app-lib/.sqlx/query-91c09c88e89aadbf34fd823f119ca83c2626f097de53ec537f59b76fdb21eccb.json
new file mode 100644
index 0000000000..8e3e5f818d
--- /dev/null
+++ b/packages/app-lib/.sqlx/query-91c09c88e89aadbf34fd823f119ca83c2626f097de53ec537f59b76fdb21eccb.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n\t\t\t\tINSERT INTO synced_game_option_values\n\t\t\t\t\t(option_id, kind, raw_key, canonical_type,\n\t\t\t\t\t canonical_value_json, value_codec, seeded, revision, origin,\n\t\t\t\t\t source_game_version, source_instance_id, updated_at)\n\t\t\t\tVALUES (?, ?, ?, ?, ?, ?, 1, ?, 'app_editor', ?, NULL, ?)\n\t\t\t\tON CONFLICT(option_id) DO UPDATE SET\n\t\t\t\t\tkind = excluded.kind, raw_key = excluded.raw_key,\n\t\t\t\t\tcanonical_type = excluded.canonical_type,\n\t\t\t\t\tcanonical_value_json = excluded.canonical_value_json,\n\t\t\t\t\tvalue_codec = excluded.value_codec, seeded = 1,\n\t\t\t\t\trevision = excluded.revision, origin = 'app_editor',\n\t\t\t\t\tsource_game_version = NULL, source_instance_id = NULL,\n\t\t\t\t\tupdated_at = excluded.updated_at\n\t\t\t\t",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 9
+    },
+    "nullable": []
+  },
+  "hash": "91c09c88e89aadbf34fd823f119ca83c2626f097de53ec537f59b76fdb21eccb"
+}
diff --git a/packages/app-lib/.sqlx/query-a83e168791306f30ee6f03a274398455c6db66d485824f27ab198c3f00de1770.json b/packages/app-lib/.sqlx/query-a83e168791306f30ee6f03a274398455c6db66d485824f27ab198c3f00de1770.json
index 96a168d698..42a1914756 100644
--- a/packages/app-lib/.sqlx/query-a83e168791306f30ee6f03a274398455c6db66d485824f27ab198c3f00de1770.json
+++ b/packages/app-lib/.sqlx/query-a83e168791306f30ee6f03a274398455c6db66d485824f27ab198c3f00de1770.json
@@ -3,17 +3,60 @@
   "query": "\n\t\tSELECT\n\t\t\tscreenshots.id,\n\t\t\tscreenshots.instance_id,\n\t\t\tscreenshots.file_name,\n\t\t\tscreenshots.content_hash,\n\t\t\tscreenshots.file_size,\n\t\t\tscreenshots.modified_at,\n\t\t\tscreenshots.created_at,\n\t\t\tmemberships.group_id AS \"group_id?\"\n\t\tFROM screenshots\n\t\tLEFT JOIN screenshot_group_memberships memberships\n\t\t\tON memberships.screenshot_id = screenshots.id\n\t\tWHERE screenshots.instance_id = ?\n\t\tORDER BY screenshots.file_name, screenshots.id\n\t\t",
   "describe": {
     "columns": [
-      { "name": "id", "ordinal": 0, "type_info": "Text" },
-      { "name": "instance_id", "ordinal": 1, "type_info": "Text" },
-      { "name": "file_name", "ordinal": 2, "type_info": "Text" },
-      { "name": "content_hash", "ordinal": 3, "type_info": "Text" },
-      { "name": "file_size", "ordinal": 4, "type_info": "Integer" },
-      { "name": "modified_at", "ordinal": 5, "type_info": "Integer" },
-      { "name": "created_at", "ordinal": 6, "type_info": "Integer" },
-      { "name": "group_id?", "ordinal": 7, "type_info": "Text" }
+      {
+        "name": "id",
+        "ordinal": 0,
+        "type_info": "Text"
+      },
+      {
+        "name": "instance_id",
+        "ordinal": 1,
+        "type_info": "Text"
+      },
+      {
+        "name": "file_name",
+        "ordinal": 2,
+        "type_info": "Text"
+      },
+      {
+        "name": "content_hash",
+        "ordinal": 3,
+        "type_info": "Text"
+      },
+      {
+        "name": "file_size",
+        "ordinal": 4,
+        "type_info": "Integer"
+      },
+      {
+        "name": "modified_at",
+        "ordinal": 5,
+        "type_info": "Integer"
+      },
+      {
+        "name": "created_at",
+        "ordinal": 6,
+        "type_info": "Integer"
+      },
+      {
+        "name": "group_id?",
+        "ordinal": 7,
+        "type_info": "Text"
+      }
     ],
-    "parameters": { "Right": 1 },
-    "nullable": [false, false, false, false, false, false, false, false]
+    "parameters": {
+      "Right": 1
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false
+    ]
   },
   "hash": "a83e168791306f30ee6f03a274398455c6db66d485824f27ab198c3f00de1770"
 }
diff --git a/packages/app-lib/.sqlx/query-aaaf087deec439148bc1aa7365913a985f60f680c77885917f560760b5818b71.json b/packages/app-lib/.sqlx/query-aaaf087deec439148bc1aa7365913a985f60f680c77885917f560760b5818b71.json
new file mode 100644
index 0000000000..9d86ed1c80
--- /dev/null
+++ b/packages/app-lib/.sqlx/query-aaaf087deec439148bc1aa7365913a985f60f680c77885917f560760b5818b71.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n\t\t\tINSERT INTO synced_game_option_preferences\n\t\t\t\t(option_id, enabled, source, revision)\n\t\t\tVALUES (?, 1, 'discovery_default', ?)\n\t\t\tON CONFLICT(option_id) DO NOTHING\n\t\t\t",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 2
+    },
+    "nullable": []
+  },
+  "hash": "aaaf087deec439148bc1aa7365913a985f60f680c77885917f560760b5818b71"
+}
diff --git a/packages/app-lib/.sqlx/query-aabd92c612d1c2b66c50385cb7a513dca33a6931b29489f59afddfc325d6258a.json b/packages/app-lib/.sqlx/query-aabd92c612d1c2b66c50385cb7a513dca33a6931b29489f59afddfc325d6258a.json
new file mode 100644
index 0000000000..62468c4072
--- /dev/null
+++ b/packages/app-lib/.sqlx/query-aabd92c612d1c2b66c50385cb7a513dca33a6931b29489f59afddfc325d6258a.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n\t\tINSERT INTO synced_game_option_state (singleton, revision, catalog_revision)\n\t\tVALUES (1, 0, ?)\n\t\tON CONFLICT(singleton) DO UPDATE SET\n\t\t\tcatalog_revision = excluded.catalog_revision\n\t\t",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 1
+    },
+    "nullable": []
+  },
+  "hash": "aabd92c612d1c2b66c50385cb7a513dca33a6931b29489f59afddfc325d6258a"
+}
diff --git a/packages/app-lib/.sqlx/query-b6583d5f711af94f3f21c0fbd6d1f2783cbdd25a4c65031de3c0b2ed78acc0a2.json b/packages/app-lib/.sqlx/query-b6583d5f711af94f3f21c0fbd6d1f2783cbdd25a4c65031de3c0b2ed78acc0a2.json
new file mode 100644
index 0000000000..98379f4567
--- /dev/null
+++ b/packages/app-lib/.sqlx/query-b6583d5f711af94f3f21c0fbd6d1f2783cbdd25a4c65031de3c0b2ed78acc0a2.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n\t\tDELETE FROM instance_sync_checkpoints\n\t\tWHERE instance_id = ? AND feature = ?\n\t\t",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 2
+    },
+    "nullable": []
+  },
+  "hash": "b6583d5f711af94f3f21c0fbd6d1f2783cbdd25a4c65031de3c0b2ed78acc0a2"
+}
diff --git a/packages/app-lib/.sqlx/query-c4c56a28a27c15ef48df89f5145b977c166ea70f3ec8f5a2aa8f067fa2f44733.json b/packages/app-lib/.sqlx/query-c4c56a28a27c15ef48df89f5145b977c166ea70f3ec8f5a2aa8f067fa2f44733.json
new file mode 100644
index 0000000000..e66fc41ac2
--- /dev/null
+++ b/packages/app-lib/.sqlx/query-c4c56a28a27c15ef48df89f5145b977c166ea70f3ec8f5a2aa8f067fa2f44733.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n\t\t\tINSERT INTO synced_game_option_preferences\n\t\t\t\t(option_id, enabled, source, revision)\n\t\t\tVALUES (?, ?, 'catalog_default', ?)\n\t\t\tON CONFLICT(option_id) DO NOTHING\n\t\t\t",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 3
+    },
+    "nullable": []
+  },
+  "hash": "c4c56a28a27c15ef48df89f5145b977c166ea70f3ec8f5a2aa8f067fa2f44733"
+}
diff --git a/packages/app-lib/.sqlx/query-c640d4a60e6eb04fb484e3c99bfed581944cc9d9c335d1bc1c070863f93b276f.json b/packages/app-lib/.sqlx/query-c640d4a60e6eb04fb484e3c99bfed581944cc9d9c335d1bc1c070863f93b276f.json
new file mode 100644
index 0000000000..4cd45d9eb4
--- /dev/null
+++ b/packages/app-lib/.sqlx/query-c640d4a60e6eb04fb484e3c99bfed581944cc9d9c335d1bc1c070863f93b276f.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n\t\tINSERT INTO sync_feature_settings\n\t\t\t(feature, globally_enabled, new_instance_default)\n\t\tVALUES ('game_options', 1, 1)\n\t\tON CONFLICT(feature) DO UPDATE SET globally_enabled = 1\n\t\t",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 0
+    },
+    "nullable": []
+  },
+  "hash": "c640d4a60e6eb04fb484e3c99bfed581944cc9d9c335d1bc1c070863f93b276f"
+}
diff --git a/packages/app-lib/.sqlx/query-c6eb6fd3bd76b37eacf442bdc1a0ce434011c2e6bf3b76e0f8dd7d162ebb95ae.json b/packages/app-lib/.sqlx/query-c6eb6fd3bd76b37eacf442bdc1a0ce434011c2e6bf3b76e0f8dd7d162ebb95ae.json
new file mode 100644
index 0000000000..6f8f90cc3f
--- /dev/null
+++ b/packages/app-lib/.sqlx/query-c6eb6fd3bd76b37eacf442bdc1a0ce434011c2e6bf3b76e0f8dd7d162ebb95ae.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n\t\tUPDATE synced_game_option_state\n\t\tSET revision = ?, catalog_revision = ?\n\t\tWHERE singleton = 1\n\t\t",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 2
+    },
+    "nullable": []
+  },
+  "hash": "c6eb6fd3bd76b37eacf442bdc1a0ce434011c2e6bf3b76e0f8dd7d162ebb95ae"
+}
diff --git a/packages/app-lib/.sqlx/query-d125cb88ef6a465b49ae207f5abf5fe9c28436566c4d7b74bbcb9a82cb553959.json b/packages/app-lib/.sqlx/query-d125cb88ef6a465b49ae207f5abf5fe9c28436566c4d7b74bbcb9a82cb553959.json
new file mode 100644
index 0000000000..49ede7fd95
--- /dev/null
+++ b/packages/app-lib/.sqlx/query-d125cb88ef6a465b49ae207f5abf5fe9c28436566c4d7b74bbcb9a82cb553959.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n\t\t\t\tINSERT INTO synced_game_option_preferences\n\t\t\t\t\t(option_id, enabled, source, revision)\n\t\t\t\tVALUES (?, ?, 'catalog_default', 1)\n\t\t\t\t",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 2
+    },
+    "nullable": []
+  },
+  "hash": "d125cb88ef6a465b49ae207f5abf5fe9c28436566c4d7b74bbcb9a82cb553959"
+}
diff --git a/packages/app-lib/.sqlx/query-d642bafe7282bde2908f9add0ad8ee2852552b5b06a38deb6311a3bf2098cee8.json b/packages/app-lib/.sqlx/query-d642bafe7282bde2908f9add0ad8ee2852552b5b06a38deb6311a3bf2098cee8.json
new file mode 100644
index 0000000000..bcc43e347e
--- /dev/null
+++ b/packages/app-lib/.sqlx/query-d642bafe7282bde2908f9add0ad8ee2852552b5b06a38deb6311a3bf2098cee8.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n\t\t\t\tUPDATE synced_game_option_state\n\t\t\t\tSET revision = ?, catalog_revision = ?\n\t\t\t\tWHERE singleton = 1\n\t\t\t\t",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 2
+    },
+    "nullable": []
+  },
+  "hash": "d642bafe7282bde2908f9add0ad8ee2852552b5b06a38deb6311a3bf2098cee8"
+}
diff --git a/packages/app-lib/.sqlx/query-d808d8eded7c18861d5e865bda7d55605696d030a31be35669d8d0ee129c3f49.json b/packages/app-lib/.sqlx/query-d808d8eded7c18861d5e865bda7d55605696d030a31be35669d8d0ee129c3f49.json
new file mode 100644
index 0000000000..2a540dc417
--- /dev/null
+++ b/packages/app-lib/.sqlx/query-d808d8eded7c18861d5e865bda7d55605696d030a31be35669d8d0ee129c3f49.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n\t\tUPDATE instance_sync_checkpoints\n\t\tSET status = 'ready', link_mode = NULL\n\t\tWHERE instance_id = ? AND feature = ? AND variant = ?\n\t\t",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 3
+    },
+    "nullable": []
+  },
+  "hash": "d808d8eded7c18861d5e865bda7d55605696d030a31be35669d8d0ee129c3f49"
+}
diff --git a/packages/app-lib/.sqlx/query-ec00a599037bcf5fb080eb0f7cab1beaaca1254a4abcf2955c7af3bc5086f9cc.json b/packages/app-lib/.sqlx/query-ec00a599037bcf5fb080eb0f7cab1beaaca1254a4abcf2955c7af3bc5086f9cc.json
new file mode 100644
index 0000000000..c62a0ff0ca
--- /dev/null
+++ b/packages/app-lib/.sqlx/query-ec00a599037bcf5fb080eb0f7cab1beaaca1254a4abcf2955c7af3bc5086f9cc.json
@@ -0,0 +1,20 @@
+{
+  "db_name": "SQLite",
+  "query": "\n\t\tSELECT globally_enabled AS \"globally_enabled!: bool\"\n\t\tFROM sync_feature_settings\n\t\tWHERE feature = 'game_options'\n\t\t",
+  "describe": {
+    "columns": [
+      {
+        "name": "globally_enabled!: bool",
+        "ordinal": 0,
+        "type_info": "Integer"
+      }
+    ],
+    "parameters": {
+      "Right": 0
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "ec00a599037bcf5fb080eb0f7cab1beaaca1254a4abcf2955c7af3bc5086f9cc"
+}
diff --git a/packages/app-lib/.sqlx/query-fc51a02b2fa872f4b105b0eb25f9103b04b9e94bbd663ec205002e3ab2ff6756.json b/packages/app-lib/.sqlx/query-fc51a02b2fa872f4b105b0eb25f9103b04b9e94bbd663ec205002e3ab2ff6756.json
new file mode 100644
index 0000000000..1b53825df0
--- /dev/null
+++ b/packages/app-lib/.sqlx/query-fc51a02b2fa872f4b105b0eb25f9103b04b9e94bbd663ec205002e3ab2ff6756.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n\t\t\tINSERT INTO synced_game_option_values\n\t\t\t\t(option_id, kind, raw_key, canonical_type,\n\t\t\t\t canonical_value_json, value_codec, seeded, revision, origin,\n\t\t\t\t source_game_version, source_instance_id, updated_at)\n\t\t\tVALUES (?, 'external', ?, 'external_raw', ?, 'exact_raw',\n\t\t\t\t1, ?, 'source_seed', ?, ?, ?)\n\t\t\tON CONFLICT(option_id) DO UPDATE SET\n\t\t\t\traw_key = excluded.raw_key,\n\t\t\t\tcanonical_value_json = excluded.canonical_value_json,\n\t\t\t\tseeded = 1, revision = excluded.revision,\n\t\t\t\torigin = 'source_seed',\n\t\t\t\tsource_game_version = excluded.source_game_version,\n\t\t\t\tsource_instance_id = excluded.source_instance_id,\n\t\t\t\tupdated_at = excluded.updated_at\n\t\t\t",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 7
+    },
+    "nullable": []
+  },
+  "hash": "fc51a02b2fa872f4b105b0eb25f9103b04b9e94bbd663ec205002e3ab2ff6756"
+}
diff --git a/packages/app-lib/migrations/20260827120000_game-options-sync.sql b/packages/app-lib/migrations/20260827120000_game-options-sync.sql
new file mode 100644
index 0000000000..93529e7502
--- /dev/null
+++ b/packages/app-lib/migrations/20260827120000_game-options-sync.sql
@@ -0,0 +1,65 @@
+-- Game-settings sync starts off. The user must choose which instance supplies
+-- the initial values before it can be enabled.
+INSERT INTO sync_feature_settings
+	(feature, globally_enabled, new_instance_default)
+VALUES ('game_options', 0, 1);
+
+INSERT INTO instance_sync_preferences (instance_id, feature, enabled)
+SELECT id, 'game_options', 0
+FROM instances;
+
+-- Tracks changes to the shared values. The catalog revision changes when we add
+-- or update support for Minecraft versions.
+CREATE TABLE synced_game_option_state (
+	singleton INTEGER PRIMARY KEY NOT NULL CHECK (singleton = 1),
+	revision INTEGER NOT NULL CHECK (revision >= 0),
+	catalog_revision INTEGER NOT NULL CHECK (catalog_revision >= 1)
+);
+
+-- Stores the value shared for each setting, including settings added by mods.
+-- A NULL value means the setting was found but has no shared value yet.
+CREATE TABLE synced_game_option_values (
+	option_id TEXT PRIMARY KEY NOT NULL,
+	kind TEXT NOT NULL CHECK (kind IN ('vanilla', 'external')),
+	raw_key TEXT,
+	canonical_type TEXT NOT NULL,
+	canonical_value_json TEXT,
+	value_codec TEXT NOT NULL,
+	seeded INTEGER NOT NULL CHECK (seeded IN (0, 1)),
+	revision INTEGER NOT NULL CHECK (revision >= 0),
+	origin TEXT NOT NULL CHECK (origin IN ('app_editor', 'instance', 'source_seed')),
+	source_game_version TEXT,
+	source_instance_id TEXT,
+	updated_at INTEGER NOT NULL
+);
+
+-- Stores which settings the user chose to sync. This is separate from the values
+-- so turning a setting off does not forget its last value.
+CREATE TABLE synced_game_option_preferences (
+	option_id TEXT PRIMARY KEY NOT NULL,
+	enabled INTEGER NOT NULL CHECK (enabled IN (0, 1)),
+	source TEXT NOT NULL CHECK (source IN ('catalog_default', 'discovery_default', 'user')),
+	revision INTEGER NOT NULL CHECK (revision >= 0)
+);
+
+-- Keeps the options.txt supplied by the installed modpack. After a pack update,
+-- the user's shared settings are applied to this file again.
+CREATE TABLE instance_game_option_pack_bases (
+	instance_id TEXT PRIMARY KEY NOT NULL,
+	pack_version_id TEXT,
+	source TEXT NOT NULL CHECK (source IN ('client_overrides', 'overrides', 'none')),
+	sha1 TEXT,
+	encoding TEXT,
+	document BLOB,
+	FOREIGN KEY (instance_id) REFERENCES instances (id) ON DELETE CASCADE
+);
+
+-- Temporarily keeps the local options.txt while the installer removes the old
+-- pack. It is restored when the new pack does not include its own options.txt.
+CREATE TABLE instance_game_option_update_state (
+	instance_id TEXT PRIMARY KEY NOT NULL,
+	had_file INTEGER NOT NULL CHECK (had_file IN (0, 1)),
+	sha1 TEXT,
+	document BLOB,
+	FOREIGN KEY (instance_id) REFERENCES instances (id) ON DELETE CASCADE
+);
diff --git a/packages/app-lib/src/api/instance.rs b/packages/app-lib/src/api/instance.rs
index 1b5f1baf68..62b131e31d 100644
--- a/packages/app-lib/src/api/instance.rs
+++ b/packages/app-lib/src/api/instance.rs
@@ -3,6 +3,7 @@
 mod content;
 mod content_set_diff;
 mod export_mrpack;
+mod game_options;
 mod get;
 mod groups;
 mod icon;
@@ -27,6 +28,23 @@ pub use self::export_mrpack::{
     PackExportCandidate, create_mrpack_json, export_mrpack,
     get_pack_export_candidates, get_pack_export_candidates_for_parent,
 };
+pub use self::game_options::{
+    CanonicalValue as GameOptionCanonicalValue, EditableGameSetting,
+    GameOptionCompatibility, GameOptionCompatibilityBucket,
+    GameOptionCompatibilityReason, GameOptionCompatibilityStatus,
+    GameOptionEditorChoice, GameOptionEditorDefinition, GameOptionKind,
+    GameOptionMappingKind, GameOptionValidationIssue, GameOptionValueState,
+    GameOptionsSourceCandidate, GameOptionsSourceIssue, GameSettingCategory,
+    GameSettingChange, GameSettingsEditorState, SaveGameSettingsResult,
+    UpdateGameSettingsRequest,
+    apply_launcher_overrides as apply_game_options_launcher_overrides,
+    capture_pack_base as capture_game_options_pack_base,
+    get_config as get_synced_game_options_config,
+    list_sync_sources as list_game_options_sync_sources,
+    preview_changes as preview_synced_game_option_changes,
+    save_changes as save_synced_game_option_changes,
+    sync_before_launch as sync_game_options_before_launch,
+};
 pub use self::get::{get, get_many, list};
 pub use self::groups::{
     FAVORITES_GROUP_ID, InstanceGroup, InstanceGroupMembershipUpdate,
@@ -103,7 +121,7 @@ pub use self::synced_options::{
 pub(crate) use self::synced_options::{
     monitor_persisted_processes, prepare_instance_update,
     reconcile_changed_file as reconcile_synced_option_file,
-    remove_generated_instance_files,
+    reconcile_instance_after_pack_update, remove_generated_instance_files,
 };
 pub use self::synced_options::{
     reconcile_all as reconcile_all_synced_options,
diff --git a/packages/app-lib/src/api/instance/game_options/api_types.rs b/packages/app-lib/src/api/instance/game_options/api_types.rs
new file mode 100644
index 0000000000..849593be4c
--- /dev/null
+++ b/packages/app-lib/src/api/instance/game_options/api_types.rs
@@ -0,0 +1,213 @@
+use crate::state::{CanonicalValue, GameOptionKind};
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Copy, Debug, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
+pub enum GameOptionsSourceIssue {
+    InstallingOrUpdating,
+    Running,
+    UnsupportedVersion,
+    MissingOptionsFile,
+    NoSyncableSettings,
+    UnreadableOptionsFile,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct GameOptionsSourceCandidate {
+    pub source_id: String,
+    pub instance_id: String,
+    pub name: String,
+    pub icon_path: Option<String>,
+    pub game_version: Option<String>,
+    pub eligible: bool,
+    pub disabled_reason: Option<GameOptionsSourceIssue>,
+    pub recognized_setting_count: u32,
+    pub custom_setting_count: u32,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct GameSettingCategory {
+    pub id: String,
+    pub is_custom: bool,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct GameOptionEditorDefinition {
+    #[serde(rename = "type")]
+    pub type_: String,
+    pub min: Option<f64>,
+    pub max: Option<f64>,
+    pub step: Option<f64>,
+    pub unit: Option<String>,
+    pub choices: Vec<GameOptionEditorChoice>,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct GameOptionEditorChoice {
+    pub value: String,
+}
+
+#[derive(Clone, Copy, Debug, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
+pub enum GameOptionCompatibilityStatus {
+    Ready,
+    Deferred,
+    WaitingForFile,
+    WaitingForBase,
+    NotAvailable,
+    UnsupportedValue,
+    Unmappable,
+    CatalogUncovered,
+    Controlled,
+    Degraded,
+}
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
+pub enum GameOptionMappingKind {
+    Direct,
+    Legacy,
+    Migrated,
+    Lossless,
+    Lossy,
+}
+
+#[derive(Clone, Copy, Debug, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
+pub enum GameOptionCompatibilityReason {
+    LauncherControlled,
+    CatalogUncovered,
+    InspectionFailed,
+    WaitingForOptionsFile,
+    UnsupportedValue,
+    MigratesOnWrite,
+    WaitingForCompatibleBase,
+    MissingSetting,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct GameOptionCompatibilityBucket {
+    pub instance_count: u32,
+    pub write_keys: Vec<String>,
+    pub eventual_keys: Vec<String>,
+    pub game_versions: Vec<String>,
+    pub status: GameOptionCompatibilityStatus,
+    pub mapping: Option<GameOptionMappingKind>,
+    pub reason: Option<GameOptionCompatibilityReason>,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct GameOptionCompatibility {
+    pub total_participating: u32,
+    pub will_receive: u32,
+    pub write_now: u32,
+    pub left_local: u32,
+    pub buckets: Vec<GameOptionCompatibilityBucket>,
+}
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
+pub enum GameOptionValueState {
+    Canonical,
+    UniformLocal,
+    Mixed,
+    Unset,
+    Invalid,
+}
+
+#[derive(Clone, Copy, Debug, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
+pub enum GameOptionValidationIssue {
+    LocalValueNeedsSaving,
+    MissingValue,
+    NoCompatibleInstances,
+    InvalidValue,
+    ChangedSinceOpened,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct EditableGameSetting {
+    pub option_id: String,
+    pub category_id: String,
+    pub kind: GameOptionKind,
+    pub raw_key: Option<String>,
+    pub sync_enabled: bool,
+    pub canonical_value: Option<CanonicalValue>,
+    pub value_state: GameOptionValueState,
+    pub option_revision: u64,
+    pub editor: GameOptionEditorDefinition,
+    pub compatibility: GameOptionCompatibility,
+    pub validation_error: Option<GameOptionValidationIssue>,
+    pub controlled: bool,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct GameSettingsEditorState {
+    pub summary_revision: String,
+    pub canonical_revision: u64,
+    pub catalog_revision: u32,
+    pub total_participating: u32,
+    pub categories: Vec<GameSettingCategory>,
+    pub settings: Vec<EditableGameSetting>,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct UpdateGameSettingsRequest {
+    pub expected_summary_revision: String,
+    pub expected_canonical_revision: u64,
+    pub expected_catalog_revision: u32,
+    pub changes: Vec<GameSettingChange>,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct GameSettingChange {
+    pub option_id: String,
+    pub base_option_revision: u64,
+    pub sync_enabled: Option<bool>,
+    #[serde(
+        default,
+        with = "serde_with::rust::double_option",
+        skip_serializing_if = "Option::is_none"
+    )]
+    pub canonical_value: Option<Option<CanonicalValue>>,
+}
+
+#[derive(Clone, Debug, Default, Serialize, Deserialize)]
+pub struct SaveGameSettingsResult {
+    pub state: Option<GameSettingsEditorState>,
+    pub applied: u32,
+    pub migrated: u32,
+    pub deferred: u32,
+    pub unsupported: u32,
+    pub failed: u32,
+    pub conflicts: Vec<String>,
+}
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+pub(in crate::api::instance) enum SyncReason {
+    Normal,
+    BeforePackUpdate,
+    PackExtracted,
+    BeforeLaunch,
+}
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+pub(super) enum SyncOutcome {
+    Applied,
+    Migrated,
+    Unchanged,
+    Deferred,
+    WaitingForFile,
+}
+
+pub(super) fn canonical_values_equal(
+    left: &CanonicalValue,
+    right: &CanonicalValue,
+) -> bool {
+    match (left, right) {
+        (CanonicalValue::Decimal(left), CanonicalValue::Decimal(right)) => {
+            left.parse::<f64>().ok() == right.parse::<f64>().ok()
+        }
+        _ => left == right,
+    }
+}
diff --git a/packages/app-lib/src/api/instance/game_options/instance_support.rs b/packages/app-lib/src/api/instance/game_options/instance_support.rs
new file mode 100644
index 0000000000..18a0e4aab6
--- /dev/null
+++ b/packages/app-lib/src/api/instance/game_options/instance_support.rs
@@ -0,0 +1,512 @@
+//! Works out which instances can receive each shared setting.
+
+use super::super::synced_options;
+use super::CATALOG_REVISION;
+use super::api_types::*;
+use super::options_file::{
+    GameOptionsDocument, options_path, read_document, sha1_bytes,
+};
+use super::supported_settings::*;
+use crate::state::{
+    CanonicalValue, InstanceMetadata, State, StoredOption,
+    game_options_sync_is_enabled,
+};
+use std::collections::BTreeMap;
+
+/// The instance data needed to decide whether a setting can be synced.
+#[derive(Clone)]
+pub(super) struct ParticipatingInstance {
+    metadata: InstanceMetadata,
+    deferred: bool,
+    fullscreen_controlled: bool,
+    pub(super) document: Option<GameOptionsDocument>,
+    inspection_error: Option<String>,
+}
+
+/// Loads every instance with game-settings sync turned on.
+///
+/// An instance may not have an `options.txt` until its first launch. It still takes
+/// part in sync, but its settings are marked as waiting for the file.
+pub(super) async fn load_participating_instances(
+    state: &State,
+) -> crate::Result<Vec<ParticipatingInstance>> {
+    if !game_options_sync_is_enabled(&state.pool).await? {
+        return Ok(Vec::new());
+    }
+    let settings = crate::state::Settings::get(&state.pool).await?;
+    let instances = crate::state::list_instances(&state.pool).await?;
+    let mut participants = Vec::new();
+    for metadata in instances {
+        if !metadata.synced_options.game_options {
+            continue;
+        }
+        let deferred = synced_options::sync_files_are_protected(&metadata)
+            || synced_options::instance_is_running(&metadata, state).await?;
+        let path = options_path(&metadata, state);
+        let (document, inspection_error) = if path.exists() {
+            match read_document(&path).await {
+                Ok((document, _)) => (Some(document), None),
+                Err(error) => {
+                    tracing::warn!(
+                        "Could not inspect game options compatibility for {}: {error}",
+                        metadata.instance.id
+                    );
+                    (None, Some(error.to_string()))
+                }
+            }
+        } else {
+            (None, None)
+        };
+        participants.push(ParticipatingInstance {
+            fullscreen_controlled: metadata
+                .launch_overrides
+                .force_fullscreen
+                .is_some()
+                || settings.force_fullscreen,
+            metadata,
+            deferred,
+            document,
+            inspection_error,
+        });
+    }
+    Ok(participants)
+}
+
+pub(super) fn summary_revision(
+    canonical_revision: u64,
+    participants: &[ParticipatingInstance],
+) -> String {
+    let mut summary = format!("{CATALOG_REVISION}:{canonical_revision}");
+    let mut participants = participants.iter().collect::<Vec<_>>();
+    participants.sort_by(|left, right| {
+        left.metadata.instance.id.cmp(&right.metadata.instance.id)
+    });
+    for participant in participants {
+        summary.push('|');
+        summary.push_str(&participant.metadata.instance.id);
+        summary.push(':');
+        summary
+            .push_str(&participant.metadata.applied_content_set.game_version);
+        summary.push(':');
+        summary.push_str(if participant.deferred {
+            "deferred"
+        } else {
+            "ready"
+        });
+        summary.push(':');
+        summary.push_str(if participant.inspection_error.is_some() {
+            "degraded"
+        } else if participant.document.is_some() {
+            "file"
+        } else {
+            "missing"
+        });
+        summary.push(':');
+        summary.push_str(if participant.fullscreen_controlled {
+            "fullscreen-controlled"
+        } else {
+            "fullscreen-shared"
+        });
+    }
+    sha1_bytes(summary.as_bytes())
+}
+/// Counts which instances can receive a setting now, later, or not at all.
+///
+/// The settings screen uses these results for its preview, and the file writer uses
+/// the same checks when it saves. A setting shown as blocked therefore cannot be
+/// written behind the user's back.
+pub(super) fn describe_instance_support(
+    definition: Option<&SupportedSetting>,
+    stored: &StoredOption,
+    value: Option<&CanonicalValue>,
+    participants: &[ParticipatingInstance],
+) -> GameOptionCompatibility {
+    let total = participants.len() as u32;
+    let mut will_receive = 0;
+    let mut write_now = 0;
+    let mut buckets: BTreeMap<
+        (String, String, String, String),
+        GameOptionCompatibilityBucket,
+    > = BTreeMap::new();
+
+    for participant in participants {
+        let version = participant
+            .metadata
+            .applied_content_set
+            .game_version
+            .clone();
+        // Check launcher-controlled settings first. Finding the key in options.txt
+        // does not make a launcher-owned setting safe to overwrite.
+        let (status, key, mapping, reason) = if stored.option_id == "fullscreen"
+            && participant.fullscreen_controlled
+        {
+            (
+                GameOptionCompatibilityStatus::Controlled,
+                None,
+                None,
+                Some(GameOptionCompatibilityReason::LauncherControlled),
+            )
+        } else if definition.is_some()
+            && !supported_settings_cover_game_version(&version)
+        {
+            (
+                GameOptionCompatibilityStatus::CatalogUncovered,
+                None,
+                None,
+                Some(GameOptionCompatibilityReason::CatalogUncovered),
+            )
+        } else if participant.inspection_error.is_some() {
+            (
+                GameOptionCompatibilityStatus::Degraded,
+                None,
+                None,
+                Some(GameOptionCompatibilityReason::InspectionFailed),
+            )
+        } else {
+            match &participant.document {
+                None => {
+                    // An instance that has not launched yet has no options.txt. If we know
+                    // the key Minecraft will create, wait for the file instead of excluding it.
+                    if definition.is_none()
+                        && stored.raw_key.is_some()
+                        && matches!(value, Some(CanonicalValue::ExternalRaw(_)))
+                    {
+                        (
+						GameOptionCompatibilityStatus::WaitingForFile,
+						stored.raw_key.clone(),
+						Some(GameOptionMappingKind::Direct),
+						Some(GameOptionCompatibilityReason::WaitingForOptionsFile),
+					)
+                    } else if let Some((key, mapping)) =
+                        definition.and_then(|definition| {
+                            physical_variant_for_version(definition, &version)
+                                .map(|variant| (variant.key, variant.mapping))
+                                .or_else(|| {
+                                    definition
+                                        .versioned_keys
+                                        .is_empty()
+                                        .then(|| {
+                                            definition
+										.keys
+										.first()
+										.copied()
+										.map(|key| (key, GameOptionMappingKind::Direct))
+                                        })
+                                        .flatten()
+                                })
+                        })
+                    {
+                        let representable = value.is_none_or(|value| {
+                            definition.is_some_and(|definition| {
+                                encode_value(
+                                    definition, key, value, &version, None,
+                                )
+                                .is_some()
+                            })
+                        });
+                        if representable {
+                            (
+							GameOptionCompatibilityStatus::WaitingForFile,
+							Some(key.to_string()),
+							Some(mapping),
+							Some(GameOptionCompatibilityReason::WaitingForOptionsFile),
+						)
+                        } else {
+                            (
+							GameOptionCompatibilityStatus::UnsupportedValue,
+							Some(key.to_string()),
+							None,
+							Some(GameOptionCompatibilityReason::UnsupportedValue),
+						)
+                        }
+                    } else {
+                        (
+                            GameOptionCompatibilityStatus::NotAvailable,
+                            None,
+                            None,
+                            Some(GameOptionCompatibilityReason::MissingSetting),
+                        )
+                    }
+                }
+                Some(document) => {
+                    // Vanilla keys sometimes change between versions. Replace an old key with
+                    // its newer name only when we know the value can be converted safely.
+                    let key = target_physical_key(
+                        definition, stored, document, &version,
+                    );
+                    if let Some(key) = key {
+                        let needs_alias_migration =
+                            definition.is_some_and(|definition| {
+                                alias_migration_needed(
+                                    definition, document, &key,
+                                )
+                            });
+                        let representable = match (definition, value) {
+                            (Some(definition), Some(value)) => encode_value(
+                                definition,
+                                &key,
+                                value,
+                                &version,
+                                document.value(&key),
+                            )
+                            .is_some(),
+                            (None, Some(CanonicalValue::ExternalRaw(_))) => {
+                                true
+                            }
+                            _ => false,
+                        };
+                        if !representable {
+                            (
+							GameOptionCompatibilityStatus::UnsupportedValue,
+							Some(key.to_string()),
+							None,
+							Some(GameOptionCompatibilityReason::UnsupportedValue),
+						)
+                        } else {
+                            let mapped = if needs_alias_migration {
+                                Some(GameOptionMappingKind::Migrated)
+                            } else {
+                                definition.and_then(|definition| {
+                                    physical_variant_for_present_key(
+                                        definition, &key, &version,
+                                    )
+                                    .map(|variant| variant.mapping)
+                                    .or_else(|| {
+                                        (matches!(
+                                            definition.encoding,
+                                            ValueEncoding::KeyBinding
+                                        ) && document.value(&key).is_some_and(
+                                            |raw| {
+                                                split_key_binding(raw)
+                                                    .0
+                                                    .parse::<i32>()
+                                                    .is_ok()
+                                            },
+                                        ))
+                                        .then_some(
+                                            GameOptionMappingKind::Migrated,
+                                        )
+                                    })
+                                })
+                            };
+                            let legacy = definition.is_some_and(|definition| {
+                                definition.keys.first().copied()
+                                    != Some(key.as_str())
+                            });
+                            (
+							if participant.deferred {
+								GameOptionCompatibilityStatus::Deferred
+							} else {
+								GameOptionCompatibilityStatus::Ready
+							},
+							Some(key.to_string()),
+							Some(mapped.unwrap_or(if legacy {
+								GameOptionMappingKind::Legacy
+							} else {
+								GameOptionMappingKind::Direct
+							})),
+							needs_alias_migration
+								.then_some(GameOptionCompatibilityReason::MigratesOnWrite),
+						)
+                        }
+                    } else if let Some(definition) =
+                        definition.filter(|definition| {
+                            (definition.versioned_keys.is_empty()
+                                || physical_variant_for_version(
+                                    definition, &version,
+                                )
+                                .is_some())
+                                && definition
+                                    .keys
+                                    .iter()
+                                    .any(|key| document.value(key).is_some())
+                        })
+                    {
+                        let eventual_key =
+                            physical_variant_for_version(definition, &version)
+                                .map(|variant| variant.key.to_string())
+                                .or_else(|| {
+                                    definition
+                                        .keys
+                                        .iter()
+                                        .find(|key| {
+                                            document.value(key).is_some()
+                                        })
+                                        .map(|key| (*key).to_string())
+                                });
+                        let representable = eventual_key
+                            .as_deref()
+                            .zip(value)
+                            .is_some_and(|(key, value)| {
+                                encode_value(
+                                    definition, key, value, &version, None,
+                                )
+                                .is_some()
+                            });
+                        if representable {
+                            (
+							GameOptionCompatibilityStatus::WaitingForBase,
+							eventual_key,
+							Some(GameOptionMappingKind::Migrated),
+							Some(GameOptionCompatibilityReason::WaitingForCompatibleBase),
+						)
+                        } else {
+                            (
+							GameOptionCompatibilityStatus::UnsupportedValue,
+							eventual_key,
+							None,
+							Some(GameOptionCompatibilityReason::UnsupportedValue),
+						)
+                        }
+                    } else {
+                        (
+                            GameOptionCompatibilityStatus::NotAvailable,
+                            None,
+                            None,
+                            Some(GameOptionCompatibilityReason::MissingSetting),
+                        )
+                    }
+                }
+            }
+        };
+
+        let receives = matches!(
+            status,
+            GameOptionCompatibilityStatus::Ready
+                | GameOptionCompatibilityStatus::Deferred
+                | GameOptionCompatibilityStatus::WaitingForFile
+                | GameOptionCompatibilityStatus::WaitingForBase
+        );
+        if receives {
+            will_receive += 1;
+        }
+        if matches!(status, GameOptionCompatibilityStatus::Ready) {
+            write_now += 1;
+        }
+        let status_key = serde_json::to_string(&status).unwrap_or_default();
+        let key_name = key.clone().unwrap_or_default();
+        let mapping_key = mapping
+            .as_ref()
+            .and_then(|mapping| serde_json::to_string(mapping).ok())
+            .unwrap_or_default();
+        let reason_key = reason
+            .as_ref()
+            .and_then(|reason| serde_json::to_string(reason).ok())
+            .unwrap_or_default();
+        // Group instances with the same result to keep the response small. Keep their
+        // Minecraft versions so the UI can explain which versions are affected.
+        let bucket = buckets
+            .entry((status_key, key_name.clone(), mapping_key, reason_key))
+            .or_insert_with(|| GameOptionCompatibilityBucket {
+                instance_count: 0,
+                write_keys: if matches!(
+                    status,
+                    GameOptionCompatibilityStatus::Ready
+                        | GameOptionCompatibilityStatus::Deferred
+                ) {
+                    key.clone().into_iter().collect()
+                } else {
+                    Vec::new()
+                },
+                eventual_keys: if matches!(
+                    status,
+                    GameOptionCompatibilityStatus::WaitingForFile
+                        | GameOptionCompatibilityStatus::WaitingForBase
+                ) {
+                    key.clone().into_iter().collect()
+                } else {
+                    Vec::new()
+                },
+                game_versions: vec![version.clone()],
+                status,
+                mapping,
+                reason,
+            });
+        bucket.instance_count += 1;
+        if !bucket.game_versions.contains(&version) {
+            bucket.game_versions.push(version);
+            bucket.game_versions.sort();
+        }
+    }
+
+    let left_local = total.saturating_sub(will_receive);
+    GameOptionCompatibility {
+        total_participating: total,
+        will_receive,
+        write_now,
+        left_local,
+        buckets: buckets.into_values().collect(),
+    }
+}
+
+/// Uses the local value only when every readable instance currently agrees on it.
+pub(super) fn find_common_local_value(
+    definition: Option<&SupportedSetting>,
+    stored: &StoredOption,
+    participants: &[ParticipatingInstance],
+) -> (Option<CanonicalValue>, GameOptionValueState) {
+    let mut values = Vec::new();
+    let mut invalid = false;
+    for participant in participants {
+        if stored.option_id == "fullscreen" && participant.fullscreen_controlled
+        {
+            continue;
+        }
+        if definition.is_some()
+            && !supported_settings_cover_game_version(
+                &participant.metadata.applied_content_set.game_version,
+            )
+        {
+            continue;
+        }
+        let Some(document) = &participant.document else {
+            continue;
+        };
+        let key = if let Some(definition) = definition {
+            observed_physical_key(
+                definition,
+                document,
+                &participant.metadata.applied_content_set.game_version,
+            )
+        } else {
+            target_physical_key(
+                None,
+                stored,
+                document,
+                &participant.metadata.applied_content_set.game_version,
+            )
+        };
+        let Some(key) = key else {
+            continue;
+        };
+        let Some(raw_value) = document.value(&key) else {
+            continue;
+        };
+        let value = if let Some(definition) = definition {
+            decode_value(definition, &key, raw_value)
+        } else {
+            Some(CanonicalValue::ExternalRaw(raw_value.to_string()))
+        };
+        if let Some(value) = value
+            .filter(|value| validate_canonical_value(definition, value).is_ok())
+        {
+            values.push(value);
+        } else {
+            invalid = true;
+        }
+    }
+    if invalid && values.is_empty() {
+        return (None, GameOptionValueState::Invalid);
+    }
+    let Some(first) = values.first().cloned() else {
+        return (None, GameOptionValueState::Unset);
+    };
+    if values
+        .iter()
+        .all(|value| canonical_values_equal(value, &first))
+    {
+        (Some(first), GameOptionValueState::UniformLocal)
+    } else {
+        (None, GameOptionValueState::Mixed)
+    }
+}
diff --git a/packages/app-lib/src/api/instance/game_options/launch_overrides.rs b/packages/app-lib/src/api/instance/game_options/launch_overrides.rs
new file mode 100644
index 0000000000..93d5a4f207
--- /dev/null
+++ b/packages/app-lib/src/api/instance/game_options/launch_overrides.rs
@@ -0,0 +1,145 @@
+//! Updates shared settings, then applies launcher settings before Minecraft starts.
+
+use super::super::synced_options;
+use super::CATALOG_REVISION;
+use super::api_types::SyncReason;
+use super::options_file::{
+    GameOptionsDocument, input_error, options_path, read_document, sha1_bytes,
+    validate_raw_key_value,
+};
+use super::read_instance_changes::previous_applied_settings;
+use super::supported_settings::setting_by_file_key;
+use super::write_shared_settings::{
+    sync_instance_options, sync_is_active_for_instance,
+};
+use crate::state::{
+    GameOptionsProjection, InstanceMetadata, ProjectedField, ProjectionOrigin,
+    State, SyncedOption, load_game_options_sync_state,
+};
+use crate::util::io;
+use std::collections::HashSet;
+
+pub(super) async fn currently_launcher_owned_keys(
+    metadata: &InstanceMetadata,
+    state: &State,
+) -> crate::Result<HashSet<String>> {
+    let settings = crate::state::Settings::get(&state.pool).await?;
+    let mut keys = HashSet::new();
+    if metadata.launch_overrides.force_fullscreen.is_some()
+        || settings.force_fullscreen
+    {
+        keys.insert("fullscreen".to_string());
+    }
+    Ok(keys)
+}
+
+/// Reads changes made in Minecraft and writes the latest shared values before launch.
+pub async fn sync_before_launch(instance_id: &str) -> crate::Result<()> {
+    let state = State::get().await?;
+    let _guard = state.lock_synced_options().await;
+    let metadata = crate::state::get_instance(instance_id, &state.pool)
+        .await?
+        .ok_or_else(|| input_error("Unknown instance"))?;
+    if sync_is_active_for_instance(&metadata, &state).await? {
+        let _ = sync_instance_options(
+            &metadata,
+            &state,
+            SyncReason::BeforeLaunch,
+            true,
+        )
+        .await?;
+    }
+    Ok(())
+}
+
+/// Applies launcher settings, such as forced fullscreen, after shared settings.
+///
+/// We remember these separately so the next sync does not mistake them for changes
+/// made by the player.
+pub async fn apply_launcher_overrides(
+    instance_id: &str,
+    overrides: &[(String, String)],
+) -> crate::Result<()> {
+    if overrides.is_empty() {
+        return Ok(());
+    }
+    let state = State::get().await?;
+    let _guard = state.lock_synced_options().await;
+    let metadata = crate::state::get_instance(instance_id, &state.pool)
+        .await?
+        .ok_or_else(|| input_error("Unknown instance"))?;
+    let path = options_path(&metadata, &state);
+    let (mut document, input_bytes) = if path.exists() {
+        read_document(&path).await?
+    } else {
+        (GameOptionsDocument::empty(), Vec::new())
+    };
+    let input_sha1 = sha1_bytes(&input_bytes);
+    let checkpoint = synced_options::checkpoint(
+        instance_id,
+        SyncedOption::GameOptions,
+        "default",
+        &state,
+    )
+    .await?;
+    let mut projection = checkpoint
+        .as_ref()
+        .filter(|checkpoint| checkpoint.expected_sha1 == input_sha1)
+        .and_then(|checkpoint| {
+            previous_applied_settings(checkpoint.merge_base.as_deref())
+        })
+        .unwrap_or(GameOptionsProjection {
+            schema_version: 1,
+            target_game_version: metadata
+                .applied_content_set
+                .game_version
+                .clone(),
+            input_sha1: input_sha1.clone(),
+            canonical_revision: load_game_options_sync_state(
+                &state.pool,
+                CATALOG_REVISION,
+            )
+            .await?
+            .0,
+            fields: Vec::new(),
+        });
+
+    for (key, value) in overrides {
+        validate_raw_key_value(key, value)?;
+        document.set(key, value, true)?;
+        projection.fields.retain(|field| field.physical_key != *key);
+        let option_id = setting_by_file_key(key)
+            .map(|definition| definition.id.to_string())
+            .unwrap_or_else(|| format!("launcher:{key}"));
+        projection.fields.push(ProjectedField {
+            option_id,
+            physical_key: key.clone(),
+            raw_value: value.clone(),
+            origin: ProjectionOrigin::LauncherOverride,
+            migrated: false,
+        });
+    }
+    let output_bytes = document.serialize()?;
+    let output_sha1 = sha1_bytes(&output_bytes);
+    projection.input_sha1 = input_sha1;
+    let projection_bytes = serde_json::to_vec(&projection)?;
+    synced_options::begin_checkpoint(
+        instance_id,
+        SyncedOption::GameOptions,
+        "default",
+        &output_sha1,
+        Some(&projection_bytes),
+        projection.canonical_revision as i64,
+        &state,
+    )
+    .await?;
+    io::write(&path, output_bytes).await?;
+    synced_options::finish_plain_checkpoint(
+        instance_id,
+        SyncedOption::GameOptions,
+        "default",
+        &state,
+    )
+    .await?;
+    Ok(())
+}
diff --git a/packages/app-lib/src/api/instance/game_options/mod.rs b/packages/app-lib/src/api/instance/game_options/mod.rs
new file mode 100644
index 0000000000..a0877f475b
--- /dev/null
+++ b/packages/app-lib/src/api/instance/game_options/mod.rs
@@ -0,0 +1,64 @@
+//! Syncs selected values from Minecraft's `options.txt` between instances.
+//!
+//! When sync is first enabled, the user chooses an instance to supply the initial
+//! values. Each instance keeps its own `options.txt`; we update only the selected
+//! settings and leave modpack defaults, comments, and disabled settings alone.
+//!
+//! Before writing a file, we compare it with what Modrinth wrote last time. This
+//! lets changes made in Minecraft become the new shared values. When multiple
+//! instances change the same setting, the latest change processed by sync wins.
+//!
+//! Minecraft has renamed and reformatted settings over time. `supported_settings`
+//! contains the file keys and conversions for the versions we support. Any other
+//! key is treated as a custom setting and copied as-is to every synced instance.
+//! Custom settings can be turned off individually in the settings screen.
+//!
+//! Launcher-enforced settings, such as fullscreen, are applied last and are not
+//! mistaken for changes made by the player.
+
+mod api_types;
+mod instance_support;
+mod launch_overrides;
+mod options_file;
+mod pack_updates;
+mod read_instance_changes;
+mod settings_editor;
+mod source_selection;
+mod supported_settings;
+mod write_shared_settings;
+
+pub use crate::state::{CanonicalValue, GameOptionKind};
+pub use api_types::{
+    EditableGameSetting, GameOptionCompatibility,
+    GameOptionCompatibilityBucket, GameOptionCompatibilityReason,
+    GameOptionCompatibilityStatus, GameOptionEditorChoice,
+    GameOptionEditorDefinition, GameOptionMappingKind,
+    GameOptionValidationIssue, GameOptionValueState,
+    GameOptionsSourceCandidate, GameOptionsSourceIssue, GameSettingCategory,
+    GameSettingChange, GameSettingsEditorState, SaveGameSettingsResult,
+    UpdateGameSettingsRequest,
+};
+pub use launch_overrides::{apply_launcher_overrides, sync_before_launch};
+pub use pack_updates::capture_pack_base;
+pub use settings_editor::{get_config, preview_changes, save_changes};
+pub use source_selection::list_sync_sources;
+
+pub(in crate::api::instance) use api_types::SyncReason;
+pub(in crate::api::instance) use pack_updates::{
+    detach_instance, prepare_instance_update_with_state,
+};
+pub(in crate::api::instance) use source_selection::initialize_from_source_instance;
+pub(in crate::api::instance) use write_shared_settings::sync_instance_with_state;
+
+pub(in crate::api::instance) async fn canonical_exists(
+    state: &crate::state::State,
+) -> crate::Result<bool> {
+    crate::state::shared_game_options_exist(&state.pool).await
+}
+
+const OPTIONS_FILE: &str = "options.txt";
+const CATALOG_REVISION: u32 = 2;
+const MAX_OPTIONS_BYTES: usize = 2 * 1024 * 1024;
+const MAX_OPTIONS_LINES: usize = 16_384;
+const MAX_KEY_BYTES: usize = 1_024;
+const MAX_VALUE_BYTES: usize = 32 * 1024;
diff --git a/packages/app-lib/src/api/instance/game_options/options_file.rs b/packages/app-lib/src/api/instance/game_options/options_file.rs
new file mode 100644
index 0000000000..b413d5776d
--- /dev/null
+++ b/packages/app-lib/src/api/instance/game_options/options_file.rs
@@ -0,0 +1,317 @@
+//! Reads and edits `options.txt` without changing unrelated lines or file formatting.
+
+use super::super::synced_options;
+use super::{
+    MAX_KEY_BYTES, MAX_OPTIONS_BYTES, MAX_OPTIONS_LINES, MAX_VALUE_BYTES,
+    OPTIONS_FILE,
+};
+use crate::ErrorKind;
+use crate::state::{InstanceMetadata, State};
+use crate::util::io;
+use encoding_rs::{Encoding, UTF_8, UTF_16BE, UTF_16LE};
+use sha1_smol::Sha1;
+use std::collections::HashMap;
+use std::path::{Path, PathBuf};
+
+#[derive(Clone)]
+pub(super) struct GameOptionsDocument {
+    pub(super) encoding: &'static Encoding,
+    pub(super) bom: Bom,
+    pub(super) default_line_ending: String,
+    pub(super) lines: Vec<GameOptionsLine>,
+}
+
+#[derive(Clone, Copy)]
+pub(super) enum Bom {
+    None,
+    Utf8,
+    Utf16Le,
+    Utf16Be,
+}
+
+#[derive(Clone)]
+pub(super) struct GameOptionsLine {
+    pub(super) raw: String,
+    pub(super) ending: String,
+    pub(super) entry: Option<GameOptionsEntry>,
+}
+
+#[derive(Clone)]
+pub(super) struct GameOptionsEntry {
+    pub(super) key: String,
+    pub(super) value: String,
+    pub(super) changed: bool,
+}
+
+impl GameOptionsDocument {
+    pub(super) fn empty() -> Self {
+        Self {
+            encoding: UTF_8,
+            bom: Bom::None,
+            default_line_ending: "\n".to_string(),
+            lines: Vec::new(),
+        }
+    }
+
+    pub(super) fn parse(bytes: &[u8]) -> crate::Result<Self> {
+        if bytes.len() > MAX_OPTIONS_BYTES {
+            return Err(input_error("options.txt is too large to sync safely"));
+        }
+
+        let (bom, encoding, contents) =
+            if bytes.starts_with(&[0xEF, 0xBB, 0xBF]) {
+                (Bom::Utf8, UTF_8, &bytes[3..])
+            } else if bytes.starts_with(&[0xFF, 0xFE]) {
+                (Bom::Utf16Le, UTF_16LE, &bytes[2..])
+            } else if bytes.starts_with(&[0xFE, 0xFF]) {
+                (Bom::Utf16Be, UTF_16BE, &bytes[2..])
+            } else {
+                let mut detector = chardetng::EncodingDetector::new();
+                detector.feed(bytes, true);
+                (Bom::None, detector.guess(None, true), bytes)
+            };
+        let (decoded, decode_errors) =
+            encoding.decode_without_bom_handling(contents);
+        if decode_errors {
+            return Err(input_error(
+                "options.txt contains bytes that cannot be decoded losslessly",
+            ));
+        }
+        let roundtrip = encode_without_bom(encoding, &decoded)?;
+        if roundtrip.as_slice() != contents {
+            return Err(input_error(
+                "options.txt encoding cannot be round-tripped safely",
+            ));
+        }
+
+        let mut lines = Vec::new();
+        let mut start = 0;
+        let source: &str = decoded.as_ref();
+        for (index, byte) in source.as_bytes().iter().enumerate() {
+            if *byte != b'\n' {
+                continue;
+            }
+            let raw_end =
+                if index > start && source.as_bytes()[index - 1] == b'\r' {
+                    index - 1
+                } else {
+                    index
+                };
+            let ending = if raw_end == index { "\n" } else { "\r\n" };
+            lines.push(Self::parse_line(&source[start..raw_end], ending));
+            start = index + 1;
+        }
+        if start < source.len() {
+            lines.push(Self::parse_line(&source[start..], ""));
+        }
+        if lines.len() > MAX_OPTIONS_LINES {
+            return Err(input_error(
+                "options.txt has too many lines to sync safely",
+            ));
+        }
+        let default_line_ending = lines
+            .iter()
+            .find(|line| !line.ending.is_empty())
+            .map(|line| line.ending.clone())
+            .unwrap_or_else(|| "\n".to_string());
+        Ok(Self {
+            encoding,
+            bom,
+            default_line_ending,
+            lines,
+        })
+    }
+
+    pub(super) fn parse_line(raw: &str, ending: &str) -> GameOptionsLine {
+        let entry = raw.split_once(':').and_then(|(key, value)| {
+            if key.is_empty()
+                || key.len() > MAX_KEY_BYTES
+                || value.len() > MAX_VALUE_BYTES
+            {
+                None
+            } else {
+                Some(GameOptionsEntry {
+                    key: key.to_string(),
+                    value: value.to_string(),
+                    changed: false,
+                })
+            }
+        });
+        GameOptionsLine {
+            raw: raw.to_string(),
+            ending: ending.to_string(),
+            entry,
+        }
+    }
+
+    pub(super) fn effective_entries(&self) -> HashMap<&str, (usize, usize)> {
+        let mut entries = HashMap::new();
+        for (index, line) in self.lines.iter().enumerate() {
+            if let Some(entry) = &line.entry {
+                entries
+                    .entry(entry.key.as_str())
+                    .and_modify(|value: &mut (usize, usize)| {
+                        value.0 = index;
+                        value.1 += 1;
+                    })
+                    .or_insert((index, 1));
+            }
+        }
+        entries
+    }
+
+    pub(super) fn value(&self, key: &str) -> Option<&str> {
+        let (index, _) = self.effective_entries().get(key).copied()?;
+        self.lines[index]
+            .entry
+            .as_ref()
+            .map(|entry| entry.value.as_str())
+    }
+
+    pub(super) fn set(
+        &mut self,
+        key: &str,
+        value: &str,
+        insert: bool,
+    ) -> crate::Result<bool> {
+        validate_raw_key_value(key, value)?;
+        if let Some((index, _)) = self.effective_entries().get(key).copied() {
+            let entry = self.lines[index].entry.as_mut().expect("entry index");
+            if entry.value == value {
+                return Ok(false);
+            }
+            entry.value = value.to_string();
+            entry.changed = true;
+            return Ok(true);
+        }
+        if !insert {
+            return Ok(false);
+        }
+
+        let ending = if let Some(last) = self.lines.last_mut() {
+            if last.ending.is_empty() {
+                last.ending = self.default_line_ending.clone();
+                String::new()
+            } else {
+                self.default_line_ending.clone()
+            }
+        } else {
+            self.default_line_ending.clone()
+        };
+        self.lines.push(GameOptionsLine {
+            raw: String::new(),
+            ending,
+            entry: Some(GameOptionsEntry {
+                key: key.to_string(),
+                value: value.to_string(),
+                changed: true,
+            }),
+        });
+        Ok(true)
+    }
+
+    pub(super) fn serialize(&self) -> crate::Result<Vec<u8>> {
+        let mut text = String::new();
+        for line in &self.lines {
+            match &line.entry {
+                Some(entry) if entry.changed => {
+                    text.push_str(&entry.key);
+                    text.push(':');
+                    text.push_str(&entry.value);
+                }
+                _ => text.push_str(&line.raw),
+            }
+            text.push_str(&line.ending);
+        }
+        let encoded = encode_without_bom(self.encoding, &text)?;
+        let bom: &[u8] = match self.bom {
+            Bom::None => &[],
+            Bom::Utf8 => &[0xEF, 0xBB, 0xBF],
+            Bom::Utf16Le => &[0xFF, 0xFE],
+            Bom::Utf16Be => &[0xFE, 0xFF],
+        };
+        let mut result = Vec::with_capacity(bom.len() + encoded.len());
+        result.extend_from_slice(bom);
+        result.extend_from_slice(&encoded);
+        Ok(result)
+    }
+}
+
+pub(super) fn encode_without_bom(
+    encoding: &'static Encoding,
+    text: &str,
+) -> crate::Result<Vec<u8>> {
+    if encoding == UTF_16LE || encoding == UTF_16BE {
+        let mut encoded = Vec::with_capacity(text.len().saturating_mul(2));
+        for unit in text.encode_utf16() {
+            let bytes = if encoding == UTF_16LE {
+                unit.to_le_bytes()
+            } else {
+                unit.to_be_bytes()
+            };
+            encoded.extend_from_slice(&bytes);
+        }
+        return Ok(encoded);
+    }
+
+    let (encoded, _, had_errors) = encoding.encode(text);
+    if had_errors {
+        return Err(input_error(
+            "A synced option value cannot be represented in this file's encoding",
+        ));
+    }
+    Ok(encoded.into_owned())
+}
+
+pub(super) fn input_error(message: impl Into<String>) -> crate::Error {
+    ErrorKind::InputError(message.into()).into()
+}
+
+pub(super) fn validate_raw_key_value(
+    key: &str,
+    value: &str,
+) -> crate::Result<()> {
+    if key.is_empty()
+        || key.len() > MAX_KEY_BYTES
+        || key.contains(':')
+        || key.chars().any(char::is_control)
+    {
+        return Err(input_error("Invalid options.txt setting key"));
+    }
+    if value.len() > MAX_VALUE_BYTES
+        || value
+            .chars()
+            .any(|character| character.is_control() && character != '\t')
+    {
+        return Err(input_error("Invalid options.txt setting value"));
+    }
+    Ok(())
+}
+
+pub(super) fn options_path(
+    metadata: &InstanceMetadata,
+    state: &State,
+) -> PathBuf {
+    synced_options::instance_dir(metadata, state).join(OPTIONS_FILE)
+}
+
+pub(super) fn sha1_bytes(bytes: &[u8]) -> String {
+    Sha1::from(bytes).digest().to_string()
+}
+
+/// Reads an `options.txt` only when it is safe to rewrite.
+///
+/// The parser keeps its text encoding, line endings, comments, and duplicate keys.
+pub(super) async fn read_document(
+    path: &Path,
+) -> crate::Result<(GameOptionsDocument, Vec<u8>)> {
+    let metadata = tokio::fs::symlink_metadata(path)
+        .await
+        .map_err(|error| io::IOError::with_path(error, path))?;
+    if metadata.file_type().is_symlink() {
+        return Err(input_error("Refusing to sync a symlinked options.txt"));
+    }
+    let bytes = io::read(path).await?;
+    let document = GameOptionsDocument::parse(&bytes)?;
+    Ok((document, bytes))
+}
diff --git a/packages/app-lib/src/api/instance/game_options/pack_updates.rs b/packages/app-lib/src/api/instance/game_options/pack_updates.rs
new file mode 100644
index 0000000000..c771672115
--- /dev/null
+++ b/packages/app-lib/src/api/instance/game_options/pack_updates.rs
@@ -0,0 +1,236 @@
+//! Keeps game settings intact when a modpack is installed or updated.
+
+use super::MAX_OPTIONS_BYTES;
+use super::api_types::SyncReason;
+use super::options_file::{input_error, options_path, sha1_bytes};
+use super::write_shared_settings::{
+    sync_instance_options, sync_is_active_for_instance,
+};
+use crate::state::{InstanceLink, InstanceMetadata, State, SyncedOption};
+use crate::util::io;
+use encoding_rs::{UTF_8, UTF_16BE, UTF_16LE};
+
+fn detected_encoding_name(bytes: &[u8]) -> String {
+    if bytes.starts_with(&[0xFF, 0xFE]) {
+        return UTF_16LE.name().to_string();
+    }
+    if bytes.starts_with(&[0xFE, 0xFF]) {
+        return UTF_16BE.name().to_string();
+    }
+    if bytes.starts_with(&[0xEF, 0xBB, 0xBF]) {
+        return UTF_8.name().to_string();
+    }
+    let mut detector = chardetng::EncodingDetector::new();
+    detector.feed(bytes, true);
+    detector.guess(None, true).name().to_string()
+}
+
+fn pack_version_id(metadata: &InstanceMetadata) -> Option<&str> {
+    match &metadata.link {
+        InstanceLink::ModrinthModpack { version_id, .. } => Some(version_id),
+        InstanceLink::ServerProjectModpack {
+            content_version_id, ..
+        } => Some(content_version_id),
+        InstanceLink::ImportedModpack { version_id, .. } => {
+            version_id.as_deref()
+        }
+        InstanceLink::SharedInstance {
+            modpack_version_id, ..
+        } => modpack_version_id.as_deref(),
+        _ => None,
+    }
+}
+
+pub(in crate::api::instance) async fn detach_instance(
+    metadata: &InstanceMetadata,
+    state: &State,
+) -> crate::Result<()> {
+    let feature = SyncedOption::GameOptions.as_str();
+    sqlx::query!(
+        "
+		DELETE FROM instance_sync_checkpoints
+		WHERE instance_id = ? AND feature = ?
+		",
+        metadata.instance.id,
+        feature,
+    )
+    .execute(&state.pool)
+    .await?;
+    Ok(())
+}
+
+/// Before replacing modpack files, saves `options.txt` and shares any settings the
+/// player changed in Minecraft.
+pub(in crate::api::instance) async fn prepare_instance_update_with_state(
+    metadata: &InstanceMetadata,
+    state: &State,
+) -> crate::Result<()> {
+    sqlx::query!(
+        "DELETE FROM instance_game_option_update_state WHERE instance_id = ?",
+        metadata.instance.id,
+    )
+    .execute(&state.pool)
+    .await?;
+    if sync_is_active_for_instance(metadata, state).await? {
+        let _ = sync_instance_options(
+            metadata,
+            state,
+            SyncReason::BeforePackUpdate,
+            true,
+        )
+        .await?;
+    }
+    let path = options_path(metadata, state);
+    let (had_file, bytes, sha1) = if path.exists() {
+        let file_metadata = tokio::fs::symlink_metadata(&path)
+            .await
+            .map_err(|error| io::IOError::with_path(error, &path))?;
+        if file_metadata.file_type().is_symlink() {
+            return Err(input_error(
+                "Refusing to prepare a symlinked options.txt for a modpack update",
+            ));
+        }
+        if file_metadata.len() > MAX_OPTIONS_BYTES as u64 {
+            return Err(input_error(
+                "options.txt is too large to preserve for a modpack update",
+            ));
+        }
+        let bytes = io::read(&path).await?;
+        (true, Some(bytes.clone()), Some(sha1_bytes(&bytes)))
+    } else {
+        (false, None, None)
+    };
+    sqlx::query!(
+        "
+		INSERT INTO instance_game_option_update_state
+			(instance_id, had_file, sha1, document)
+		VALUES (?, ?, ?, ?)
+		ON CONFLICT(instance_id) DO UPDATE SET
+			had_file = excluded.had_file, sha1 = excluded.sha1,
+			document = excluded.document
+		",
+        metadata.instance.id,
+        had_file,
+        sha1,
+        bytes,
+    )
+    .execute(&state.pool)
+    .await?;
+    Ok(())
+}
+
+/// Keeps the new modpack's `options.txt` as its default, then reapplies the user's
+/// shared settings.
+pub async fn capture_pack_base(
+    instance_id: &str,
+    source: Option<&str>,
+) -> crate::Result<()> {
+    if !matches!(source, None | Some("client_overrides") | Some("overrides")) {
+        return Err(input_error("Unknown modpack options.txt source"));
+    }
+    let state = State::get().await?;
+    let _guard = state.lock_synced_options().await;
+    let metadata = crate::state::get_instance(instance_id, &state.pool)
+        .await?
+        .ok_or_else(|| input_error("Unknown instance"))?;
+    let path = options_path(&metadata, &state);
+    let feature = SyncedOption::GameOptions.as_str();
+    sqlx::query!(
+        "
+		DELETE FROM instance_sync_checkpoints
+		WHERE instance_id = ? AND feature = ?
+		",
+        instance_id,
+        feature,
+    )
+    .execute(&state.pool)
+    .await?;
+
+    if source.is_none() {
+        let pending = sqlx::query!(
+            r#"
+			SELECT had_file AS "had_file!: bool", document
+			FROM instance_game_option_update_state
+			WHERE instance_id = ?
+			"#,
+            instance_id,
+        )
+        .fetch_optional(&state.pool)
+        .await?;
+        if let Some(pending) = pending {
+            if pending.had_file {
+                if let Some(document) = pending.document {
+                    io::write(&path, document).await?;
+                }
+            } else if path.exists() {
+                io::remove_file(&path).await?;
+            }
+        }
+    }
+
+    let (document_bytes, sha1, encoding) = if path.exists() {
+        let file_metadata = tokio::fs::symlink_metadata(&path)
+            .await
+            .map_err(|error| io::IOError::with_path(error, &path))?;
+        if file_metadata.file_type().is_symlink() {
+            return Err(input_error(
+                "Refusing to capture a symlinked options.txt",
+            ));
+        }
+        let bytes = io::read(&path).await?;
+        if bytes.len() > MAX_OPTIONS_BYTES {
+            return Err(input_error(
+                "The modpack options.txt is too large to capture for syncing",
+            ));
+        }
+        let sha1 = sha1_bytes(&bytes);
+        let encoding = detected_encoding_name(&bytes);
+        (Some(bytes), Some(sha1), Some(encoding))
+    } else {
+        (None, None, None)
+    };
+    let source_name = source.unwrap_or("none");
+    let version_id = pack_version_id(&metadata);
+    sqlx::query!(
+        "
+		INSERT INTO instance_game_option_pack_bases
+			(instance_id, pack_version_id, source, sha1, encoding, document)
+		VALUES (?, ?, ?, ?, ?, ?)
+		ON CONFLICT(instance_id) DO UPDATE SET
+			pack_version_id = excluded.pack_version_id,
+			source = excluded.source, sha1 = excluded.sha1,
+			encoding = excluded.encoding, document = excluded.document
+		",
+        instance_id,
+        version_id,
+        source_name,
+        sha1,
+        encoding,
+        document_bytes,
+    )
+    .execute(&state.pool)
+    .await?;
+    sqlx::query!(
+        "DELETE FROM instance_game_option_update_state WHERE instance_id = ?",
+        instance_id,
+    )
+    .execute(&state.pool)
+    .await?;
+
+    if sync_is_active_for_instance(&metadata, &state).await? {
+        if let Err(error) = sync_instance_options(
+            &metadata,
+            &state,
+            SyncReason::PackExtracted,
+            false,
+        )
+        .await
+        {
+            tracing::warn!(
+                "Captured the modpack options.txt for {}, but shared settings could not be overlaid yet: {error}",
+                metadata.instance.id
+            );
+        }
+    }
+    Ok(())
+}
diff --git a/packages/app-lib/src/api/instance/game_options/read_instance_changes.rs b/packages/app-lib/src/api/instance/game_options/read_instance_changes.rs
new file mode 100644
index 0000000000..16d9f02f8e
--- /dev/null
+++ b/packages/app-lib/src/api/instance/game_options/read_instance_changes.rs
@@ -0,0 +1,432 @@
+//! Finds settings changed in Minecraft and shares those changes with other instances.
+
+use super::super::synced_options;
+use super::CATALOG_REVISION;
+use super::api_types::canonical_values_equal;
+use super::launch_overrides::currently_launcher_owned_keys;
+use super::options_file::{GameOptionsDocument, validate_raw_key_value};
+use super::supported_settings::*;
+use crate::state::{
+    CanonicalValue, GameOptionKind, GameOptionsProjection, InstanceMetadata,
+    ProjectionOrigin, State, SyncedOption, load_game_option_preferences,
+    load_game_options_sync_state, load_shared_game_options,
+};
+use chrono::Utc;
+use std::collections::HashSet;
+
+pub(super) fn custom_setting_id(key: &str) -> String {
+    format!("external:{key}")
+}
+
+pub(super) fn previous_applied_settings(
+    bytes: Option<&[u8]>,
+) -> Option<GameOptionsProjection> {
+    serde_json::from_slice(bytes?).ok()
+}
+
+pub(super) async fn launcher_keys_for_document(
+    instance_id: &str,
+    input_sha1: &str,
+    state: &State,
+) -> crate::Result<HashSet<String>> {
+    Ok(synced_options::checkpoint(
+        instance_id,
+        SyncedOption::GameOptions,
+        "default",
+        state,
+    )
+    .await?
+    .filter(|checkpoint| checkpoint.expected_sha1 == input_sha1)
+    .and_then(|checkpoint| {
+        previous_applied_settings(checkpoint.merge_base.as_deref())
+    })
+    .into_iter()
+    .flat_map(|projection| projection.fields.into_iter())
+    .filter(|field| field.origin == ProjectionOrigin::LauncherOverride)
+    .map(|field| field.physical_key)
+    .collect())
+}
+
+/// Compares `options.txt` with what Modrinth last wrote. A valid change becomes
+/// the new shared value unless the launcher made it.
+pub(super) async fn read_instance_changes_into_shared_settings(
+    metadata: &InstanceMetadata,
+    document: &GameOptionsDocument,
+    projection: Option<&GameOptionsProjection>,
+    state: &State,
+) -> crate::Result<bool> {
+    let values = load_shared_game_options(&state.pool).await?;
+    let preferences = load_game_option_preferences(&state.pool).await?;
+    let currently_launcher_owned =
+        currently_launcher_owned_keys(metadata, state).await?;
+    let Some(projection) = projection else {
+        return discover_custom_settings(
+            metadata,
+            document,
+            &currently_launcher_owned,
+            state,
+        )
+        .await;
+    };
+    let mut launcher_keys = projection
+        .fields
+        .iter()
+        .filter(|field| field.origin == ProjectionOrigin::LauncherOverride)
+        .map(|field| field.physical_key.clone())
+        .collect::<HashSet<_>>();
+    launcher_keys.extend(currently_launcher_owned);
+    let now = Utc::now().timestamp();
+    let mut updates = Vec::new();
+
+    for field in &projection.fields {
+        if field.origin == ProjectionOrigin::LauncherOverride
+            || launcher_keys.contains(&field.physical_key)
+            || !preferences
+                .get(&field.option_id)
+                .is_some_and(|preference| preference.enabled)
+        {
+            continue;
+        }
+        let Some(stored) = values.get(&field.option_id) else {
+            continue;
+        };
+        if matches!(stored.kind, GameOptionKind::External)
+            && stored.raw_key.is_none()
+        {
+            continue;
+        }
+        if stored
+            .raw_key
+            .as_deref()
+            .is_some_and(|key| setting_by_file_key(key).is_some())
+        {
+            continue;
+        }
+        let definition = setting_by_id(&field.option_id);
+        if definition.is_some()
+            && !supported_settings_cover_game_version(
+                &metadata.applied_content_set.game_version,
+            )
+        {
+            continue;
+        }
+        let current_key = if document.value(&field.physical_key).is_some() {
+            Some(field.physical_key.clone())
+        } else if let Some(definition) = definition {
+            observed_physical_key(
+                definition,
+                document,
+                &metadata.applied_content_set.game_version,
+            )
+        } else {
+            target_physical_key(
+                None,
+                stored,
+                document,
+                &metadata.applied_content_set.game_version,
+            )
+        };
+        let Some(current_key) = current_key else {
+            continue;
+        };
+        if launcher_keys.contains(&current_key) {
+            continue;
+        }
+        let Some(current_raw) = document.value(&current_key) else {
+            continue;
+        };
+        if current_key == field.physical_key && current_raw == field.raw_value {
+            continue;
+        }
+        let projected_candidate = if let Some(definition) = definition {
+            decode_value(definition, &field.physical_key, &field.raw_value)
+        } else if matches!(stored.kind, GameOptionKind::External) {
+            Some(CanonicalValue::ExternalRaw(field.raw_value.clone()))
+        } else {
+            None
+        };
+        let candidate = if let Some(definition) = definition {
+            decode_value(definition, &current_key, current_raw)
+        } else if matches!(stored.kind, GameOptionKind::External) {
+            Some(CanonicalValue::ExternalRaw(current_raw.to_string()))
+        } else {
+            None
+        };
+        let Some(candidate) = candidate else {
+            continue;
+        };
+        if validate_canonical_value(definition, &candidate).is_err() {
+            continue;
+        }
+        if projected_candidate.as_ref().is_some_and(|projected| {
+            canonical_values_equal(projected, &candidate)
+        }) {
+            continue;
+        }
+        if stored
+            .value
+            .as_ref()
+            .is_some_and(|current| canonical_values_equal(current, &candidate))
+        {
+            continue;
+        }
+        let ambiguous_lossy_migration = definition.is_some_and(|definition| {
+            matches!(definition.encoding, ValueEncoding::AmbientOcclusion)
+                && matches!(field.raw_value.as_str(), "1" | "2")
+                && current_raw == "true"
+        });
+        if ambiguous_lossy_migration {
+            continue;
+        }
+        updates.push((field.option_id.clone(), candidate, stored.revision));
+    }
+
+    let mut changed = false;
+    if !updates.is_empty() {
+        let (canonical_revision, _) =
+            load_game_options_sync_state(&state.pool, CATALOG_REVISION).await?;
+        let mut tx = state.pool.begin().await?;
+        for (option_id, candidate, revision) in updates {
+            let next_revision = revision.saturating_add(1) as i64;
+            let current_revision = revision as i64;
+            let value_json = serde_json::to_string(&candidate)?;
+            let canonical_type = candidate.type_name();
+            sqlx::query!(
+                "
+				UPDATE synced_game_option_values
+				SET canonical_type = ?, canonical_value_json = ?, seeded = 1,
+					revision = ?, origin = 'instance', source_game_version = ?,
+					source_instance_id = ?, updated_at = ?
+				WHERE option_id = ? AND revision = ?
+				",
+                canonical_type,
+                value_json,
+                next_revision,
+                metadata.applied_content_set.game_version,
+                metadata.instance.id,
+                now,
+                option_id,
+                current_revision,
+            )
+            .execute(&mut *tx)
+            .await?;
+            changed = true;
+        }
+        if changed {
+            let next_revision = canonical_revision.saturating_add(1) as i64;
+            sqlx::query!(
+                "
+				UPDATE synced_game_option_state
+				SET revision = ?, catalog_revision = ?
+				WHERE singleton = 1
+				",
+                next_revision,
+                CATALOG_REVISION as i64,
+            )
+            .execute(&mut *tx)
+            .await?;
+        }
+        tx.commit().await?;
+    }
+    Ok(
+        discover_custom_settings(metadata, document, &launcher_keys, state)
+            .await?
+            || changed,
+    )
+}
+
+/// Finds settings added by mods and adds them to the shared settings list.
+pub(super) async fn discover_custom_settings(
+    metadata: &InstanceMetadata,
+    document: &GameOptionsDocument,
+    excluded_keys: &HashSet<String>,
+    state: &State,
+) -> crate::Result<bool> {
+    let existing = load_shared_game_options(&state.pool).await?;
+    let preferences = load_game_option_preferences(&state.pool).await?;
+    let (canonical_revision, _) =
+        load_game_options_sync_state(&state.pool, CATALOG_REVISION).await?;
+    let entries = document.effective_entries();
+    let now = Utc::now().timestamp();
+    let mut discovered = false;
+    let mut tx = state.pool.begin().await?;
+    let game_version = metadata.applied_content_set.game_version.as_str();
+
+    for definition in all_supported_settings() {
+        for key in definition.keys {
+            let custom_id = custom_setting_id(key);
+            let Some(custom) = existing.get(&custom_id) else {
+                continue;
+            };
+            if !custom.seeded {
+                continue;
+            }
+            let revision = custom.revision.saturating_add(1) as i64;
+            sqlx::query!(
+                "
+				UPDATE synced_game_option_values
+				SET seeded = 0, revision = ?, updated_at = ?
+				WHERE option_id = ?
+				",
+                revision,
+                now,
+                custom_id,
+            )
+            .execute(&mut *tx)
+            .await?;
+            sqlx::query!(
+                "
+				UPDATE synced_game_option_preferences
+				SET enabled = 0, source = 'catalog_default', revision = ?
+				WHERE option_id = ?
+				",
+                revision,
+                custom_id,
+            )
+            .execute(&mut *tx)
+            .await?;
+            discovered = true;
+        }
+    }
+
+    if supported_settings_cover_game_version(game_version) {
+        for definition in all_supported_settings() {
+            if existing.contains_key(definition.id) {
+                continue;
+            }
+            let discovered_value = definition.keys.iter().find_map(|key| {
+                if excluded_keys.contains(*key) {
+                    return None;
+                }
+                let raw = document.value(key)?;
+                decode_value_for_version(definition, key, raw, game_version)
+            });
+            let Some(value) = discovered_value else {
+                continue;
+            };
+            let value_json = serde_json::to_string(&value)?;
+            let canonical_type = value.type_name();
+            sqlx::query!(
+                "
+				INSERT INTO synced_game_option_values
+					(option_id, kind, raw_key, canonical_type,
+					 canonical_value_json, value_codec, seeded, revision, origin,
+					 source_game_version, source_instance_id, updated_at)
+				VALUES (?, 'vanilla', NULL, ?, ?, 'catalog', 1, 1,
+					'instance', ?, ?, ?)
+				",
+                definition.id,
+                canonical_type,
+                value_json,
+                game_version,
+                metadata.instance.id,
+                now,
+            )
+            .execute(&mut *tx)
+            .await?;
+            sqlx::query!(
+                "
+				INSERT INTO synced_game_option_preferences
+					(option_id, enabled, source, revision)
+				VALUES (?, ?, 'catalog_default', 1)
+				",
+                definition.id,
+                definition.default_on,
+            )
+            .execute(&mut *tx)
+            .await?;
+            discovered = true;
+        }
+    }
+
+    for (key, (index, _)) in entries {
+        if excluded_keys.contains(key)
+            || setting_by_file_key(key).is_some()
+            || is_never_sync_key(key)
+        {
+            continue;
+        }
+        let Some(entry) = &document.lines[index].entry else {
+            continue;
+        };
+        if validate_raw_key_value(key, &entry.value).is_err() {
+            continue;
+        }
+        let option_id = custom_setting_id(key);
+        let should_seed =
+            existing.get(&option_id).is_none_or(|stored| !stored.seeded);
+        if !should_seed {
+            continue;
+        }
+        let revision = existing
+            .get(&option_id)
+            .map(|stored| stored.revision)
+            .unwrap_or(0)
+            .max(
+                preferences
+                    .get(&option_id)
+                    .map(|preference| preference.revision)
+                    .unwrap_or(0),
+            )
+            .saturating_add(1) as i64;
+        let value = CanonicalValue::ExternalRaw(entry.value.clone());
+        let value_json = serde_json::to_string(&value)?;
+        sqlx::query!(
+            "
+			INSERT INTO synced_game_option_values
+				(option_id, kind, raw_key, canonical_type,
+				 canonical_value_json, value_codec, seeded, revision, origin,
+				 source_game_version, source_instance_id, updated_at)
+			VALUES (?, 'external', ?, 'external_raw', ?, 'exact_raw',
+				1, ?, 'instance', ?, ?, ?)
+			ON CONFLICT(option_id) DO UPDATE SET
+				raw_key = excluded.raw_key,
+				canonical_value_json = excluded.canonical_value_json,
+				seeded = 1, revision = excluded.revision,
+				origin = 'instance',
+				source_game_version = excluded.source_game_version,
+				source_instance_id = excluded.source_instance_id,
+				updated_at = excluded.updated_at
+			",
+            option_id,
+            key,
+            value_json,
+            revision,
+            game_version,
+            metadata.instance.id,
+            now,
+        )
+        .execute(&mut *tx)
+        .await?;
+        sqlx::query!(
+            "
+			INSERT INTO synced_game_option_preferences
+				(option_id, enabled, source, revision)
+			VALUES (?, 1, 'discovery_default', ?)
+			ON CONFLICT(option_id) DO NOTHING
+			",
+            option_id,
+            revision,
+        )
+        .execute(&mut *tx)
+        .await?;
+        discovered = true;
+    }
+
+    if discovered {
+        let next_revision = canonical_revision.saturating_add(1) as i64;
+        sqlx::query!(
+            "
+			UPDATE synced_game_option_state
+			SET revision = ?, catalog_revision = ?
+			WHERE singleton = 1
+			",
+            next_revision,
+            CATALOG_REVISION as i64,
+        )
+        .execute(&mut *tx)
+        .await?;
+    }
+    tx.commit().await?;
+    Ok(discovered)
+}
diff --git a/packages/app-lib/src/api/instance/game_options/settings_editor.rs b/packages/app-lib/src/api/instance/game_options/settings_editor.rs
new file mode 100644
index 0000000000..f4c2b669cb
--- /dev/null
+++ b/packages/app-lib/src/api/instance/game_options/settings_editor.rs
@@ -0,0 +1,518 @@
+//! Loads, previews, and saves the game settings shown in the app.
+
+use super::CATALOG_REVISION;
+use super::api_types::*;
+use super::instance_support::{
+    describe_instance_support, find_common_local_value,
+    load_participating_instances, summary_revision,
+};
+use super::options_file::input_error;
+use super::supported_settings::*;
+use super::write_shared_settings::sync_all_participating_instances;
+use crate::state::{
+    CanonicalValue, GameOptionKind, State, StoredOption,
+    game_options_sync_is_enabled, load_game_option_preferences,
+    load_game_options_sync_state, load_shared_game_options,
+};
+use chrono::Utc;
+
+fn validation_issue(
+    sync_enabled: bool,
+    value_state: GameOptionValueState,
+    value: Option<&CanonicalValue>,
+    compatibility: &GameOptionCompatibility,
+) -> Option<GameOptionValidationIssue> {
+    if !sync_enabled {
+        return None;
+    }
+    if value_state == GameOptionValueState::UniformLocal {
+        return Some(GameOptionValidationIssue::LocalValueNeedsSaving);
+    }
+    if value.is_none() {
+        return Some(GameOptionValidationIssue::MissingValue);
+    }
+    if compatibility.total_participating > 0 && compatibility.will_receive == 0
+    {
+        return Some(GameOptionValidationIssue::NoCompatibleInstances);
+    }
+    None
+}
+
+/// Loads everything shown in the game-settings modal.
+///
+/// It returns message IDs and setting details; the frontend provides the translated
+/// labels and explanations.
+pub(super) async fn load_settings_editor(
+    state: &State,
+) -> crate::Result<GameSettingsEditorState> {
+    let (canonical_revision, catalog_revision) =
+        load_game_options_sync_state(&state.pool, CATALOG_REVISION).await?;
+    let values = load_shared_game_options(&state.pool).await?;
+    let preferences = load_game_option_preferences(&state.pool).await?;
+    let participants = load_participating_instances(state).await?;
+    let mut settings = Vec::new();
+
+    for definition in all_supported_settings() {
+        let retained = values.contains_key(definition.id)
+            || preferences.contains_key(definition.id);
+        let observed = participants.iter().any(|participant| {
+            participant.document.as_ref().is_some_and(|document| {
+                definition
+                    .keys
+                    .iter()
+                    .any(|key| document.value(key).is_some())
+            })
+        });
+        if !retained && !observed {
+            continue;
+        }
+        let stored = values.get(definition.id).cloned().unwrap_or_else(|| {
+            StoredOption {
+                option_id: definition.id.to_string(),
+                kind: GameOptionKind::Vanilla,
+                raw_key: None,
+                value: None,
+                seeded: false,
+                revision: 0,
+            }
+        });
+        let preference = preferences.get(definition.id);
+        let (canonical_value, value_state) = if stored.seeded {
+            (stored.value.clone(), GameOptionValueState::Canonical)
+        } else {
+            find_common_local_value(Some(definition), &stored, &participants)
+        };
+        let compatibility = describe_instance_support(
+            Some(definition),
+            &stored,
+            canonical_value.as_ref(),
+            &participants,
+        );
+        let sync_enabled =
+            preference.map(|value| value.enabled).unwrap_or(false);
+        let validation_error = validation_issue(
+            sync_enabled,
+            value_state,
+            canonical_value.as_ref(),
+            &compatibility,
+        );
+        settings.push(EditableGameSetting {
+            option_id: definition.id.to_string(),
+            category_id: definition.category.to_string(),
+            kind: GameOptionKind::Vanilla,
+            raw_key: None,
+            sync_enabled,
+            canonical_value,
+            value_state,
+            option_revision: stored
+                .revision
+                .max(preference.map(|value| value.revision).unwrap_or(0)),
+            editor: editor_for(definition),
+            compatibility,
+            validation_error,
+            controlled: false,
+        });
+    }
+
+    let mut custom_values = values
+        .values()
+        .filter(|value| {
+            matches!(value.kind, GameOptionKind::External)
+                && value
+                    .raw_key
+                    .as_deref()
+                    .is_none_or(|key| setting_by_file_key(key).is_none())
+        })
+        .cloned()
+        .collect::<Vec<_>>();
+    custom_values.sort_by(|left, right| left.raw_key.cmp(&right.raw_key));
+    for stored in custom_values {
+        let preference = preferences.get(&stored.option_id);
+        let (canonical_value, value_state) = if stored.seeded {
+            (stored.value.clone(), GameOptionValueState::Canonical)
+        } else {
+            find_common_local_value(None, &stored, &participants)
+        };
+        let compatibility = describe_instance_support(
+            None,
+            &stored,
+            canonical_value.as_ref(),
+            &participants,
+        );
+        let sync_enabled = preference.is_some_and(|value| value.enabled);
+        let validation_error = validation_issue(
+            sync_enabled,
+            value_state,
+            canonical_value.as_ref(),
+            &compatibility,
+        );
+        settings.push(EditableGameSetting {
+            option_id: stored.option_id.clone(),
+            category_id: "custom".to_string(),
+            kind: GameOptionKind::External,
+            raw_key: stored.raw_key.clone(),
+            sync_enabled,
+            canonical_value,
+            value_state,
+            option_revision: stored
+                .revision
+                .max(preference.map(|value| value.revision).unwrap_or(0)),
+            editor: custom_setting_editor(),
+            compatibility,
+            validation_error,
+            controlled: false,
+        });
+    }
+
+    let category_definitions = [
+        "skin_customization",
+        "video",
+        "language",
+        "music_and_sound",
+        "controls",
+        "chat",
+        "accessibility",
+        "online",
+        "custom",
+    ];
+    let categories = category_definitions
+        .into_iter()
+        .filter(|id| {
+            *id == "custom"
+                || settings.iter().any(|setting| setting.category_id == *id)
+        })
+        .map(|id| GameSettingCategory {
+            id: id.to_string(),
+            is_custom: id == "custom",
+        })
+        .collect();
+
+    Ok(GameSettingsEditorState {
+        summary_revision: summary_revision(canonical_revision, &participants),
+        canonical_revision,
+        catalog_revision,
+        total_participating: participants.len() as u32,
+        categories,
+        settings,
+    })
+}
+
+pub async fn get_config() -> crate::Result<GameSettingsEditorState> {
+    let state = State::get().await?;
+    let _guard = state.lock_synced_options().await;
+    load_settings_editor(&state).await
+}
+
+/// Previews how the user's unsaved changes would apply to their instances.
+pub async fn preview_changes(
+    request: UpdateGameSettingsRequest,
+) -> crate::Result<GameSettingsEditorState> {
+    let state = State::get().await?;
+    let _guard = state.lock_synced_options().await;
+    if request.expected_catalog_revision != CATALOG_REVISION {
+        return Ok(load_settings_editor(&state).await?);
+    }
+    let mut editor_state = load_settings_editor(&state).await?;
+    let participants = load_participating_instances(&state).await?;
+    for change in request.changes {
+        let Some(setting) = editor_state
+            .settings
+            .iter_mut()
+            .find(|setting| setting.option_id == change.option_id)
+        else {
+            continue;
+        };
+        if setting.option_revision != change.base_option_revision {
+            setting.validation_error =
+                Some(GameOptionValidationIssue::ChangedSinceOpened);
+            continue;
+        }
+        if let Some(value) = change.canonical_value {
+            let definition = setting_by_id(&setting.option_id);
+            if let Some(value) = value {
+                if validate_canonical_value(definition, &value).is_err() {
+                    setting.validation_error =
+                        Some(GameOptionValidationIssue::InvalidValue);
+                } else {
+                    setting.canonical_value = Some(value);
+                    setting.value_state = GameOptionValueState::Canonical;
+                    setting.validation_error = None;
+                }
+            } else {
+                setting.canonical_value = None;
+                setting.value_state = GameOptionValueState::Unset;
+                setting.validation_error = None;
+            }
+        }
+        if let Some(enabled) = change.sync_enabled {
+            setting.sync_enabled = enabled;
+        }
+        let stored = StoredOption {
+            option_id: setting.option_id.clone(),
+            kind: setting.kind,
+            raw_key: setting.raw_key.clone(),
+            value: setting.canonical_value.clone(),
+            seeded: setting.canonical_value.is_some(),
+            revision: setting.option_revision,
+        };
+        setting.compatibility = describe_instance_support(
+            setting_by_id(&setting.option_id),
+            &stored,
+            setting.canonical_value.as_ref(),
+            &participants,
+        );
+        if setting.sync_enabled && setting.canonical_value.is_none() {
+            setting.validation_error =
+                Some(GameOptionValidationIssue::MissingValue);
+        } else if setting.sync_enabled
+            && setting.compatibility.total_participating > 0
+            && setting.compatibility.will_receive == 0
+        {
+            setting.validation_error =
+                Some(GameOptionValidationIssue::NoCompatibleInstances);
+        }
+    }
+    Ok(editor_state)
+}
+
+/// Saves changes if nothing has changed since the modal opened, then updates each
+/// instance that can receive them.
+pub async fn save_changes(
+    request: UpdateGameSettingsRequest,
+) -> crate::Result<SaveGameSettingsResult> {
+    let state = State::get().await?;
+    let _guard = state.lock_synced_options().await;
+    if !game_options_sync_is_enabled(&state.pool).await? {
+        return Err(input_error(
+            "Turn on game-settings sync before editing shared values.",
+        ));
+    }
+    let current_editor = load_settings_editor(&state).await?;
+    let UpdateGameSettingsRequest {
+        expected_summary_revision,
+        expected_canonical_revision,
+        expected_catalog_revision,
+        changes,
+    } = request;
+    if expected_catalog_revision != CATALOG_REVISION
+        || expected_summary_revision != current_editor.summary_revision
+        || expected_canonical_revision != current_editor.canonical_revision
+    {
+        return Ok(SaveGameSettingsResult {
+            state: Some(current_editor),
+            conflicts: changes
+                .into_iter()
+                .map(|change| change.option_id)
+                .collect(),
+            ..SaveGameSettingsResult::default()
+        });
+    }
+    let stored_values = load_shared_game_options(&state.pool).await?;
+    let participants = load_participating_instances(&state).await?;
+    let mut conflicts = Vec::new();
+    let mut accepted = Vec::new();
+
+    for mut change in changes {
+        let Some(setting) = current_editor
+            .settings
+            .iter()
+            .find(|setting| setting.option_id == change.option_id)
+        else {
+            return Err(input_error(format!(
+                "Unknown game setting {}",
+                change.option_id
+            )));
+        };
+        if setting.option_revision != change.base_option_revision {
+            conflicts.push(change.option_id);
+            continue;
+        }
+        if let Some(Some(value)) = &change.canonical_value {
+            validate_canonical_value(setting_by_id(&setting.option_id), value)?;
+        }
+        let resulting_enabled =
+            change.sync_enabled.unwrap_or(setting.sync_enabled);
+        let stored_seeded = stored_values
+            .get(&setting.option_id)
+            .is_some_and(|stored| stored.seeded);
+        if resulting_enabled
+            && !stored_seeded
+            && change.canonical_value.is_none()
+            && setting.canonical_value.is_some()
+        {
+            change.canonical_value = Some(setting.canonical_value.clone());
+        }
+        let resulting_value = match &change.canonical_value {
+            Some(value) => value.as_ref(),
+            None => setting.canonical_value.as_ref(),
+        };
+        if resulting_enabled {
+            if resulting_value.is_none() {
+                return Err(input_error(format!(
+                    "Choose a value before enabling {}",
+                    setting.option_id
+                )));
+            }
+            let projected = StoredOption {
+                option_id: setting.option_id.clone(),
+                kind: setting.kind,
+                raw_key: setting.raw_key.clone(),
+                value: resulting_value.cloned(),
+                seeded: resulting_value.is_some(),
+                revision: setting.option_revision,
+            };
+            let compatibility = describe_instance_support(
+                setting_by_id(&setting.option_id),
+                &projected,
+                resulting_value,
+                &participants,
+            );
+            if compatibility.total_participating > 0
+                && compatibility.will_receive == 0
+            {
+                return Err(input_error(format!(
+                    "{} is not compatible with any participating instance",
+                    setting.option_id
+                )));
+            }
+        }
+        accepted.push((setting.clone(), change));
+    }
+
+    let mut changed = false;
+    let mut tx = state.pool.begin().await?;
+    for (setting, change) in accepted {
+        let value_changed =
+            change.canonical_value.as_ref().is_some_and(|value| {
+                setting.value_state != GameOptionValueState::Canonical
+                    || value.as_ref() != setting.canonical_value.as_ref()
+            });
+        let selection_changed = change
+            .sync_enabled
+            .is_some_and(|enabled| enabled != setting.sync_enabled);
+        if !value_changed && !selection_changed {
+            continue;
+        }
+        changed = true;
+        let revision = setting.option_revision.saturating_add(1) as i64;
+        if let Some(value) = change.canonical_value {
+            let now = Utc::now().timestamp();
+            if let Some(value) = value {
+                let value_json = serde_json::to_string(&value)?;
+                let canonical_type = value.type_name();
+                let kind = if matches!(setting.kind, GameOptionKind::External) {
+                    "external"
+                } else {
+                    "vanilla"
+                };
+                let raw_key = setting.raw_key.as_deref();
+                let value_codec = if setting_by_id(&setting.option_id).is_some()
+                {
+                    "catalog"
+                } else {
+                    "exact_raw"
+                };
+                let source_game_version: Option<&str> = None;
+                sqlx::query!(
+                    "
+				INSERT INTO synced_game_option_values
+					(option_id, kind, raw_key, canonical_type,
+					 canonical_value_json, value_codec, seeded, revision, origin,
+					 source_game_version, source_instance_id, updated_at)
+				VALUES (?, ?, ?, ?, ?, ?, 1, ?, 'app_editor', ?, NULL, ?)
+				ON CONFLICT(option_id) DO UPDATE SET
+					kind = excluded.kind, raw_key = excluded.raw_key,
+					canonical_type = excluded.canonical_type,
+					canonical_value_json = excluded.canonical_value_json,
+					value_codec = excluded.value_codec, seeded = 1,
+					revision = excluded.revision, origin = 'app_editor',
+					source_game_version = NULL, source_instance_id = NULL,
+					updated_at = excluded.updated_at
+				",
+                    setting.option_id,
+                    kind,
+                    raw_key,
+                    canonical_type,
+                    value_json,
+                    value_codec,
+                    revision,
+                    source_game_version,
+                    now,
+                )
+                .execute(&mut *tx)
+                .await?;
+            } else {
+                sqlx::query!(
+                    "
+					UPDATE synced_game_option_values
+					SET canonical_value_json = NULL, seeded = 0, revision = ?,
+						origin = 'app_editor', source_game_version = NULL,
+						source_instance_id = NULL, updated_at = ?
+					WHERE option_id = ?
+					",
+                    revision,
+                    now,
+                    setting.option_id,
+                )
+                .execute(&mut *tx)
+                .await?;
+            }
+        }
+        if let Some(enabled) = change.sync_enabled {
+            sqlx::query!(
+                "
+				INSERT INTO synced_game_option_preferences
+					(option_id, enabled, source, revision)
+				VALUES (?, ?, ?, ?)
+				ON CONFLICT(option_id) DO UPDATE SET
+					enabled = excluded.enabled, source = 'user',
+					revision = excluded.revision
+				",
+                setting.option_id,
+                enabled,
+                "user",
+                revision,
+            )
+            .execute(&mut *tx)
+            .await?;
+        }
+    }
+    if changed {
+        let next_revision =
+            current_editor.canonical_revision.saturating_add(1) as i64;
+        let catalog_revision = CATALOG_REVISION as i64;
+        sqlx::query!(
+            "
+			INSERT INTO synced_game_option_state (singleton, revision, catalog_revision)
+			VALUES (1, ?, ?)
+			ON CONFLICT(singleton) DO UPDATE SET
+				revision = excluded.revision,
+				catalog_revision = excluded.catalog_revision
+			",
+            next_revision,
+            catalog_revision,
+        )
+        .execute(&mut *tx)
+        .await?;
+    }
+    tx.commit().await?;
+
+    let projection = if changed {
+        sync_all_participating_instances(&state).await
+    } else {
+        SaveGameSettingsResult {
+            state: None,
+            applied: 0,
+            migrated: 0,
+            deferred: 0,
+            unsupported: 0,
+            failed: 0,
+            conflicts: Vec::new(),
+        }
+    };
+    Ok(SaveGameSettingsResult {
+        state: Some(load_settings_editor(&state).await?),
+        conflicts,
+        ..projection
+    })
+}
diff --git a/packages/app-lib/src/api/instance/game_options/source_selection.rs b/packages/app-lib/src/api/instance/game_options/source_selection.rs
new file mode 100644
index 0000000000..45a889e628
--- /dev/null
+++ b/packages/app-lib/src/api/instance/game_options/source_selection.rs
@@ -0,0 +1,421 @@
+//! Finds eligible source instances and copies the first shared settings from one.
+
+use super::super::synced_options;
+use super::CATALOG_REVISION;
+use super::api_types::{GameOptionsSourceCandidate, GameOptionsSourceIssue};
+use super::launch_overrides::currently_launcher_owned_keys;
+use super::options_file::{
+    input_error, options_path, read_document, sha1_bytes,
+    validate_raw_key_value,
+};
+use super::read_instance_changes::{
+    custom_setting_id, launcher_keys_for_document,
+};
+use super::supported_settings::*;
+use crate::state::{
+    CanonicalValue, InstanceMetadata, State, load_game_option_preferences,
+    load_game_options_sync_state, load_shared_game_options,
+};
+use chrono::Utc;
+
+/// Uses the selected instance's `options.txt` as the initial shared settings.
+pub(in crate::api::instance) async fn initialize_from_source_instance(
+    metadata: &InstanceMetadata,
+    state: &State,
+) -> crate::Result<()> {
+    let path = options_path(metadata, state);
+    if !path.exists() {
+        return Err(input_error(
+            "Launch the source instance once so Minecraft can create options.txt.",
+        ));
+    }
+    let (document, input_bytes) = read_document(&path).await?;
+    let input_sha1 = sha1_bytes(&input_bytes);
+    let mut launcher_keys =
+        launcher_keys_for_document(&metadata.instance.id, &input_sha1, state)
+            .await?;
+    launcher_keys.extend(currently_launcher_owned_keys(metadata, state).await?);
+    let entries = document.effective_entries();
+    let current_values = load_shared_game_options(&state.pool).await?;
+    let current_preferences = load_game_option_preferences(&state.pool).await?;
+    let (current_revision, _) =
+        load_game_options_sync_state(&state.pool, CATALOG_REVISION).await?;
+    let now = Utc::now().timestamp();
+    let source_version = metadata.applied_content_set.game_version.as_str();
+    let source_id = metadata.instance.id.as_str();
+    let mut tx = state.pool.begin().await?;
+    let catalog_revision = CATALOG_REVISION as i64;
+
+    sqlx::query!(
+        "
+		INSERT INTO sync_feature_settings
+			(feature, globally_enabled, new_instance_default)
+		VALUES ('game_options', 1, 1)
+		ON CONFLICT(feature) DO UPDATE SET globally_enabled = 1
+		",
+    )
+    .execute(&mut *tx)
+    .await?;
+    sqlx::query!(
+        "
+		INSERT INTO instance_sync_preferences (instance_id, feature, enabled)
+		VALUES (?, 'game_options', 1)
+		ON CONFLICT(instance_id, feature) DO UPDATE SET enabled = 1
+		",
+        source_id,
+    )
+    .execute(&mut *tx)
+    .await?;
+    sqlx::query!(
+        "
+		INSERT INTO synced_game_option_state (singleton, revision, catalog_revision)
+		VALUES (1, 0, ?)
+		ON CONFLICT(singleton) DO UPDATE SET
+			catalog_revision = excluded.catalog_revision
+		",
+        catalog_revision,
+    )
+    .execute(&mut *tx)
+    .await?;
+    sqlx::query!(
+        "UPDATE synced_game_option_values
+		 SET seeded = 0, revision = revision + 1, updated_at = ?",
+        now,
+    )
+    .execute(&mut *tx)
+    .await?;
+    for definition in all_supported_settings() {
+        for key in definition.keys {
+            let custom_id = custom_setting_id(key);
+            let Some(custom) = current_values.get(&custom_id) else {
+                continue;
+            };
+            let revision = custom
+                .revision
+                .max(
+                    current_preferences
+                        .get(&custom_id)
+                        .map(|preference| preference.revision)
+                        .unwrap_or(0),
+                )
+                .saturating_add(1) as i64;
+            sqlx::query!(
+                "
+				UPDATE synced_game_option_values
+				SET seeded = 0, revision = ?, updated_at = ?
+				WHERE option_id = ?
+				",
+                revision,
+                now,
+                custom_id,
+            )
+            .execute(&mut *tx)
+            .await?;
+            sqlx::query!(
+                "
+				UPDATE synced_game_option_preferences
+				SET enabled = 0, source = 'catalog_default', revision = ?
+				WHERE option_id = ?
+				",
+                revision,
+                custom_id,
+            )
+            .execute(&mut *tx)
+            .await?;
+        }
+    }
+    let mut seeded_any = false;
+
+    for definition in all_supported_settings() {
+        if !supported_settings_cover_game_version(source_version) {
+            break;
+        }
+        let found = definition.keys.iter().find_map(|key| {
+            if launcher_keys.contains(*key) {
+                return None;
+            }
+            let (index, _) = entries.get(*key).copied()?;
+            let entry = document.lines[index].entry.as_ref()?;
+            decode_value_for_version(
+                definition,
+                key,
+                &entry.value,
+                source_version,
+            )
+            .map(|value| ((*key).to_string(), value))
+        });
+        let Some((_physical_key, value)) = found else {
+            continue;
+        };
+        seeded_any = true;
+        let option_revision = current_values
+            .get(definition.id)
+            .map(|value| value.revision)
+            .unwrap_or(0)
+            .max(
+                current_preferences
+                    .get(definition.id)
+                    .map(|value| value.revision)
+                    .unwrap_or(0),
+            )
+            .saturating_add(1) as i64;
+        let value_json = serde_json::to_string(&value)?;
+        let canonical_type = value.type_name();
+        sqlx::query!(
+            "
+			INSERT INTO synced_game_option_values
+				(option_id, kind, raw_key, canonical_type,
+				 canonical_value_json, value_codec, seeded, revision, origin,
+				 source_game_version, source_instance_id, updated_at)
+			VALUES (?, 'vanilla', NULL, ?, ?, 'catalog', 1, ?,
+				'source_seed', ?, ?, ?)
+			ON CONFLICT(option_id) DO UPDATE SET
+				kind = 'vanilla', raw_key = NULL,
+				canonical_type = excluded.canonical_type,
+				canonical_value_json = excluded.canonical_value_json,
+				value_codec = excluded.value_codec, seeded = 1,
+				revision = excluded.revision, origin = 'source_seed',
+				source_game_version = excluded.source_game_version,
+				source_instance_id = excluded.source_instance_id,
+				updated_at = excluded.updated_at
+			",
+            definition.id,
+            canonical_type,
+            value_json,
+            option_revision,
+            source_version,
+            source_id,
+            now,
+        )
+        .execute(&mut *tx)
+        .await?;
+        let default_enabled = definition.default_on;
+        sqlx::query!(
+            "
+			INSERT INTO synced_game_option_preferences
+				(option_id, enabled, source, revision)
+			VALUES (?, ?, 'catalog_default', ?)
+			ON CONFLICT(option_id) DO NOTHING
+			",
+            definition.id,
+            default_enabled,
+            option_revision,
+        )
+        .execute(&mut *tx)
+        .await?;
+    }
+
+    for (key, (index, _)) in entries {
+        if launcher_keys.contains(key)
+            || setting_by_file_key(key).is_some()
+            || is_never_sync_key(key)
+        {
+            continue;
+        }
+        let Some(entry) = &document.lines[index].entry else {
+            continue;
+        };
+        if validate_raw_key_value(key, &entry.value).is_err() {
+            continue;
+        }
+        let option_id = custom_setting_id(key);
+        let value = CanonicalValue::ExternalRaw(entry.value.clone());
+        seeded_any = true;
+        let option_revision = current_values
+            .get(&option_id)
+            .map(|value| value.revision)
+            .unwrap_or(0)
+            .max(
+                current_preferences
+                    .get(&option_id)
+                    .map(|value| value.revision)
+                    .unwrap_or(0),
+            )
+            .saturating_add(1) as i64;
+        let value_json = serde_json::to_string(&value)?;
+        sqlx::query!(
+            "
+			INSERT INTO synced_game_option_values
+				(option_id, kind, raw_key, canonical_type,
+				 canonical_value_json, value_codec, seeded, revision, origin,
+				 source_game_version, source_instance_id, updated_at)
+			VALUES (?, 'external', ?, 'external_raw', ?, 'exact_raw',
+				1, ?, 'source_seed', ?, ?, ?)
+			ON CONFLICT(option_id) DO UPDATE SET
+				raw_key = excluded.raw_key,
+				canonical_value_json = excluded.canonical_value_json,
+				seeded = 1, revision = excluded.revision,
+				origin = 'source_seed',
+				source_game_version = excluded.source_game_version,
+				source_instance_id = excluded.source_instance_id,
+				updated_at = excluded.updated_at
+			",
+            option_id,
+            key,
+            value_json,
+            option_revision,
+            source_version,
+            source_id,
+            now,
+        )
+        .execute(&mut *tx)
+        .await?;
+        sqlx::query!(
+            "
+			INSERT INTO synced_game_option_preferences
+				(option_id, enabled, source, revision)
+			VALUES (?, 1, 'discovery_default', ?)
+			ON CONFLICT(option_id) DO NOTHING
+			",
+            option_id,
+            option_revision,
+        )
+        .execute(&mut *tx)
+        .await?;
+    }
+    if !seeded_any {
+        return Err(input_error(
+            "The selected options.txt has no settings that can be safely used as a sync baseline.",
+        ));
+    }
+
+    let next_revision = current_revision.saturating_add(1) as i64;
+    sqlx::query!(
+        "
+		UPDATE synced_game_option_state
+		SET revision = ?, catalog_revision = ?
+		WHERE singleton = 1
+		",
+        next_revision,
+        catalog_revision,
+    )
+    .execute(&mut *tx)
+    .await?;
+    tx.commit().await?;
+    Ok(())
+}
+
+pub async fn list_sync_sources()
+-> crate::Result<Vec<GameOptionsSourceCandidate>> {
+    let state = State::get().await?;
+    let _guard = state.lock_synced_options().await;
+    let instances = crate::state::list_instances(&state.pool).await?;
+    let mut sources = Vec::with_capacity(instances.len());
+    for metadata in instances {
+        let path = options_path(&metadata, &state);
+        let version_supported = supported_settings_cover_game_version(
+            &metadata.applied_content_set.game_version,
+        );
+        let mut eligible = true;
+        let mut disabled_reason = None;
+        let mut recognized_setting_count = 0;
+        let mut custom_setting_count = 0;
+        if synced_options::sync_files_are_protected(&metadata) {
+            eligible = false;
+            disabled_reason =
+                Some(GameOptionsSourceIssue::InstallingOrUpdating);
+        } else if synced_options::instance_is_running(&metadata, &state).await?
+        {
+            eligible = false;
+            disabled_reason = Some(GameOptionsSourceIssue::Running);
+        } else if !path.exists() {
+            eligible = false;
+            disabled_reason = Some(GameOptionsSourceIssue::MissingOptionsFile);
+        } else {
+            match read_document(&path).await {
+                Ok((document, input_bytes)) => {
+                    let mut launcher_keys = launcher_keys_for_document(
+                        &metadata.instance.id,
+                        &sha1_bytes(&input_bytes),
+                        &state,
+                    )
+                    .await?;
+                    launcher_keys.extend(
+                        currently_launcher_owned_keys(&metadata, &state)
+                            .await?,
+                    );
+                    let entries = document.effective_entries();
+                    let source_version =
+                        metadata.applied_content_set.game_version.as_str();
+                    let recognized = if version_supported {
+                        all_supported_settings()
+                            .filter(|setting| {
+                                setting.keys.iter().any(|key| {
+                                    if launcher_keys.contains(*key) {
+                                        return false;
+                                    }
+                                    document.value(key).is_some_and(|raw| {
+                                        decode_value_for_version(
+                                            setting,
+                                            key,
+                                            raw,
+                                            source_version,
+                                        )
+                                        .is_some()
+                                    })
+                                })
+                            })
+                            .count()
+                    } else {
+                        0
+                    };
+                    let custom = entries
+                        .into_iter()
+                        .filter(|(key, (index, _))| {
+                            !launcher_keys.contains(*key)
+                                && setting_by_file_key(key).is_none()
+                                && !is_never_sync_key(key)
+                                && document.lines[*index]
+                                    .entry
+                                    .as_ref()
+                                    .is_some_and(|entry| {
+                                        validate_raw_key_value(
+                                            key,
+                                            &entry.value,
+                                        )
+                                        .is_ok()
+                                    })
+                        })
+                        .count();
+                    if recognized + custom == 0 {
+                        eligible = false;
+                        disabled_reason = Some(if version_supported {
+                            GameOptionsSourceIssue::NoSyncableSettings
+                        } else {
+                            GameOptionsSourceIssue::UnsupportedVersion
+                        });
+                    } else {
+                        recognized_setting_count = recognized as u32;
+                        custom_setting_count = custom as u32;
+                    }
+                }
+                Err(error) => {
+                    tracing::warn!(
+                        "Could not inspect {} as a game-settings source: {error}",
+                        metadata.instance.id
+                    );
+                    eligible = false;
+                    disabled_reason =
+                        Some(GameOptionsSourceIssue::UnreadableOptionsFile);
+                }
+            }
+        }
+        sources.push(GameOptionsSourceCandidate {
+            source_id: metadata.instance.id.clone(),
+            instance_id: metadata.instance.id,
+            name: metadata.instance.name,
+            icon_path: metadata.instance.icon_path,
+            game_version: Some(metadata.applied_content_set.game_version),
+            eligible,
+            disabled_reason,
+            recognized_setting_count,
+            custom_setting_count,
+        });
+    }
+    sources.sort_by(|left, right| {
+        left.name
+            .cmp(&right.name)
+            .then(left.instance_id.cmp(&right.instance_id))
+    });
+    Ok(sources)
+}
diff --git a/packages/app-lib/src/api/instance/game_options/supported_settings/accessibility.rs b/packages/app-lib/src/api/instance/game_options/supported_settings/accessibility.rs
new file mode 100644
index 0000000000..d6b5a4c8e4
--- /dev/null
+++ b/packages/app-lib/src/api/instance/game_options/supported_settings/accessibility.rs
@@ -0,0 +1,51 @@
+use super::{BOOL, SettingEditor, SupportedSetting, ValueEncoding, setting};
+
+const NARRATOR: &[&str] = &["0", "1", "2", "3"];
+
+pub(super) const SETTINGS: &[SupportedSetting] = &[
+    setting(
+        "narrator",
+        &["narrator"],
+        "accessibility",
+        true,
+        SettingEditor::Enum(NARRATOR),
+        ValueEncoding::Enum(NARRATOR),
+    ),
+    setting(
+        "subtitles",
+        &["showSubtitles"],
+        "accessibility",
+        true,
+        BOOL,
+        ValueEncoding::Bool,
+    ),
+    setting(
+        "high_contrast",
+        &["highContrast"],
+        "accessibility",
+        true,
+        BOOL,
+        ValueEncoding::Bool,
+    ),
+    setting(
+        "dark_splash",
+        &["darkMojangStudiosBackground"],
+        "accessibility",
+        true,
+        BOOL,
+        ValueEncoding::Bool,
+    ),
+    setting(
+        "notification_time",
+        &["notificationDisplayTime"],
+        "accessibility",
+        true,
+        SettingEditor::Decimal {
+            min: 0.5,
+            max: 10.0,
+            step: 0.5,
+            unit: Some("multiplier"),
+        },
+        ValueEncoding::Decimal,
+    ),
+];
diff --git a/packages/app-lib/src/api/instance/game_options/supported_settings/chat.rs b/packages/app-lib/src/api/instance/game_options/supported_settings/chat.rs
new file mode 100644
index 0000000000..cb8e91b337
--- /dev/null
+++ b/packages/app-lib/src/api/instance/game_options/supported_settings/chat.rs
@@ -0,0 +1,57 @@
+use super::{
+    BOOL, SettingEditor, SupportedSetting, UNIT_INTERVAL, ValueEncoding,
+    setting,
+};
+
+const VISIBILITY: &[&str] = &["0", "1", "2"];
+
+pub(super) const SETTINGS: &[SupportedSetting] = &[
+    setting(
+        "chat_visibility",
+        &["chatVisibility"],
+        "chat",
+        true,
+        SettingEditor::Enum(VISIBILITY),
+        ValueEncoding::Enum(VISIBILITY),
+    ),
+    setting(
+        "chat_colors",
+        &["chatColors"],
+        "chat",
+        true,
+        BOOL,
+        ValueEncoding::Bool,
+    ),
+    setting(
+        "chat_links",
+        &["chatLinks"],
+        "chat",
+        true,
+        BOOL,
+        ValueEncoding::Bool,
+    ),
+    setting(
+        "chat_links_prompt",
+        &["chatLinksPrompt"],
+        "chat",
+        true,
+        BOOL,
+        ValueEncoding::Bool,
+    ),
+    setting(
+        "chat_opacity",
+        &["chatOpacity"],
+        "chat",
+        true,
+        UNIT_INTERVAL,
+        ValueEncoding::Decimal,
+    ),
+    setting(
+        "chat_scale",
+        &["chatScale"],
+        "chat",
+        true,
+        UNIT_INTERVAL,
+        ValueEncoding::Decimal,
+    ),
+];
diff --git a/packages/app-lib/src/api/instance/game_options/supported_settings/controls.rs b/packages/app-lib/src/api/instance/game_options/supported_settings/controls.rs
new file mode 100644
index 0000000000..2d7d3f8289
--- /dev/null
+++ b/packages/app-lib/src/api/instance/game_options/supported_settings/controls.rs
@@ -0,0 +1,221 @@
+use super::{
+    BOOL, SettingEditor, SupportedSetting, ValueEncoding, setting,
+    version_changes, versioned_setting,
+};
+
+pub(super) const SETTINGS: &[SupportedSetting] = &[
+    setting(
+        "sensitivity",
+        &["mouseSensitivity"],
+        "controls",
+        true,
+        SettingEditor::Decimal {
+            min: 0.0,
+            max: 1.0,
+            step: 0.005,
+            unit: Some("percent"),
+        },
+        ValueEncoding::Decimal,
+    ),
+    setting(
+        "invert_mouse",
+        &["invertYMouse"],
+        "controls",
+        true,
+        BOOL,
+        ValueEncoding::Bool,
+    ),
+    setting(
+        "auto_jump",
+        &["autoJump"],
+        "controls",
+        true,
+        BOOL,
+        ValueEncoding::Bool,
+    ),
+    setting(
+        "toggle_crouch",
+        &["toggleCrouch"],
+        "controls",
+        true,
+        BOOL,
+        ValueEncoding::Bool,
+    ),
+    setting(
+        "toggle_sprint",
+        &["toggleSprint"],
+        "controls",
+        true,
+        BOOL,
+        ValueEncoding::Bool,
+    ),
+    setting(
+        "discrete_mouse_scroll",
+        &["discrete_mouse_scroll"],
+        "controls",
+        true,
+        BOOL,
+        ValueEncoding::Bool,
+    ),
+    setting(
+        "key.forward",
+        &["key_key.forward"],
+        "controls",
+        true,
+        SettingEditor::KeyBinding,
+        ValueEncoding::KeyBinding,
+    ),
+    setting(
+        "key.left",
+        &["key_key.left"],
+        "controls",
+        true,
+        SettingEditor::KeyBinding,
+        ValueEncoding::KeyBinding,
+    ),
+    setting(
+        "key.back",
+        &["key_key.back"],
+        "controls",
+        true,
+        SettingEditor::KeyBinding,
+        ValueEncoding::KeyBinding,
+    ),
+    setting(
+        "key.right",
+        &["key_key.right"],
+        "controls",
+        true,
+        SettingEditor::KeyBinding,
+        ValueEncoding::KeyBinding,
+    ),
+    setting(
+        "key.jump",
+        &["key_key.jump"],
+        "controls",
+        true,
+        SettingEditor::KeyBinding,
+        ValueEncoding::KeyBinding,
+    ),
+    setting(
+        "key.sneak",
+        &["key_key.sneak"],
+        "controls",
+        true,
+        SettingEditor::KeyBinding,
+        ValueEncoding::KeyBinding,
+    ),
+    setting(
+        "key.sprint",
+        &["key_key.sprint"],
+        "controls",
+        true,
+        SettingEditor::KeyBinding,
+        ValueEncoding::KeyBinding,
+    ),
+    setting(
+        "key.inventory",
+        &["key_key.inventory"],
+        "controls",
+        true,
+        SettingEditor::KeyBinding,
+        ValueEncoding::KeyBinding,
+    ),
+    versioned_setting(
+        "key.swap_offhand",
+        &["key_key.swapOffhand", "key_key.swapHands"],
+        version_changes::SWAP_OFFHAND_KEYS,
+        "controls",
+        true,
+        SettingEditor::KeyBinding,
+        ValueEncoding::KeyBinding,
+    ),
+    setting(
+        "key.drop",
+        &["key_key.drop"],
+        "controls",
+        true,
+        SettingEditor::KeyBinding,
+        ValueEncoding::KeyBinding,
+    ),
+    setting(
+        "key.use",
+        &["key_key.use"],
+        "controls",
+        true,
+        SettingEditor::KeyBinding,
+        ValueEncoding::KeyBinding,
+    ),
+    setting(
+        "key.attack",
+        &["key_key.attack"],
+        "controls",
+        true,
+        SettingEditor::KeyBinding,
+        ValueEncoding::KeyBinding,
+    ),
+    setting(
+        "key.pick_item",
+        &["key_key.pickItem"],
+        "controls",
+        true,
+        SettingEditor::KeyBinding,
+        ValueEncoding::KeyBinding,
+    ),
+    setting(
+        "key.chat",
+        &["key_key.chat"],
+        "controls",
+        true,
+        SettingEditor::KeyBinding,
+        ValueEncoding::KeyBinding,
+    ),
+    setting(
+        "key.player_list",
+        &["key_key.playerlist"],
+        "controls",
+        true,
+        SettingEditor::KeyBinding,
+        ValueEncoding::KeyBinding,
+    ),
+    setting(
+        "key.command",
+        &["key_key.command"],
+        "controls",
+        true,
+        SettingEditor::KeyBinding,
+        ValueEncoding::KeyBinding,
+    ),
+    setting(
+        "key.screenshot",
+        &["key_key.screenshot"],
+        "controls",
+        true,
+        SettingEditor::KeyBinding,
+        ValueEncoding::KeyBinding,
+    ),
+    setting(
+        "key.perspective",
+        &["key_key.togglePerspective"],
+        "controls",
+        true,
+        SettingEditor::KeyBinding,
+        ValueEncoding::KeyBinding,
+    ),
+    setting(
+        "key.fullscreen",
+        &["key_key.fullscreen"],
+        "controls",
+        true,
+        SettingEditor::KeyBinding,
+        ValueEncoding::KeyBinding,
+    ),
+    setting(
+        "key.advancements",
+        &["key_key.advancements"],
+        "controls",
+        true,
+        SettingEditor::KeyBinding,
+        ValueEncoding::KeyBinding,
+    ),
+];
diff --git a/packages/app-lib/src/api/instance/game_options/supported_settings/known_vanilla_keys.rs b/packages/app-lib/src/api/instance/game_options/supported_settings/known_vanilla_keys.rs
new file mode 100644
index 0000000000..780f8300bc
--- /dev/null
+++ b/packages/app-lib/src/api/instance/game_options/supported_settings/known_vanilla_keys.rs
@@ -0,0 +1,269 @@
+// Never treat these Minecraft keys as settings added by mods. NEVER_SYNC_KEYS are
+// not safe to share; KNOWN_VANILLA_KEYS are Minecraft settings the editor does not
+// support yet.
+pub(super) const NEVER_SYNC_KEYS: &[&str] = &[
+    "version",
+    "resourcePacks",
+    "incompatibleResourcePacks",
+    "lastServer",
+    "startedCleanly",
+    "tutorialStep",
+    "joinedFirstServer",
+    "onboardAccessibility",
+    "soundDevice",
+    "fullscreenResolution",
+    "overrideWidth",
+    "overrideHeight",
+    "preferredGraphicsBackend",
+    "difficulty",
+    "snooperEnabled",
+    "touchscreen",
+    "heldItemTooltips",
+    "useVbo",
+    "fboEnable",
+    "saturation",
+    "anaglyph3d",
+    "advancedOpengl",
+    "streamBytesPerPixel",
+    "streamMicVolume",
+    "streamGameVolume",
+    "streamKbps",
+    "streamFps",
+    "streamCompression",
+    "streamSendMetadata",
+    "streamPreferredServer",
+    "streamChatEnabled",
+    "streamChatUserFilter",
+    "streamMicToggleBehavior",
+    "fpsLimit",
+    "music",
+    "skin",
+    "sound",
+    "viewDistance",
+    "anisotropicFiltering",
+    "clouds",
+    "showCape",
+    "allowBlockAlternatives",
+    "key_key.streamCommercial",
+    "key_key.streamPauseUnpause",
+    "key_key.streamStartStop",
+    "key_key.streamToggleMic",
+    "streamSystemVolume",
+    "showInventoryAchievementHint",
+    "enableWeakAttacks",
+    "chatPreview",
+    "skipRealms32bitWarning",
+    "showNowPlayingToast",
+    "key_Build",
+    "key_Load location",
+    "key_Save location",
+    "showFrameRate",
+    "limitFramerate",
+    "key_key.fog",
+    "chunksPerFrame",
+    "uploadsPerFrame",
+    "onlyShowSignedChat",
+    "skipFriendsListPromo",
+    "postProcessEnable",
+    "soundCategory_animals",
+    "soundCategory_blocks",
+    "soundCategory_mobs",
+    "soundCategory_players",
+    "soundCategory_records",
+    "shieldAnimation",
+    "serverTextures",
+];
+
+pub(super) const KNOWN_VANILLA_KEYS: &[&str] = &[
+    "version",
+    "ao",
+    "biomeBlendRadius",
+    "chunkSectionFadeInTime",
+    "cutoutLeaves",
+    "enableVsync",
+    "entityDistanceScaling",
+    "entityShadows",
+    "forceUnicodeFont",
+    "japaneseGlyphVariants",
+    "fov",
+    "fovEffectScale",
+    "darknessEffectScale",
+    "glintSpeed",
+    "glintStrength",
+    "preferredGraphicsBackend",
+    "graphicsPreset",
+    "prioritizeChunkUpdates",
+    "fullscreen",
+    "exclusiveFullscreen",
+    "gamma",
+    "guiScale",
+    "maxAnisotropyBit",
+    "textureFiltering",
+    "maxFps",
+    "improvedTransparency",
+    "inactivityFpsLimit",
+    "mipmapLevels",
+    "narrator",
+    "particles",
+    "reducedDebugInfo",
+    "renderClouds",
+    "cloudRange",
+    "renderDistance",
+    "simulationDistance",
+    "screenEffectScale",
+    "soundDevice",
+    "vignette",
+    "weatherRadius",
+    "autoJump",
+    "rotateWithMinecart",
+    "operatorItemsTab",
+    "autoSuggestions",
+    "chatColors",
+    "chatLinks",
+    "chatLinksPrompt",
+    "discrete_mouse_scroll",
+    "invertXMouse",
+    "invertYMouse",
+    "realmsNotifications",
+    "showSubtitles",
+    "directionalAudio",
+    "bobView",
+    "toggleCrouch",
+    "toggleSprint",
+    "toggleAttack",
+    "toggleUse",
+    "sprintWindow",
+    "darkMojangStudiosBackground",
+    "hideLightningFlashes",
+    "hideSplashTexts",
+    "mouseSensitivity",
+    "damageTiltStrength",
+    "highContrast",
+    "highContrastBlockOutline",
+    "narratorHotKey",
+    "resourcePacks",
+    "incompatibleResourcePacks",
+    "lastServer",
+    "lang",
+    "chatVisibility",
+    "chatOpacity",
+    "chatLineSpacing",
+    "textBackgroundOpacity",
+    "backgroundForChatOnly",
+    "hideServerAddress",
+    "advancedItemTooltips",
+    "pauseOnLostFocus",
+    "overrideWidth",
+    "overrideHeight",
+    "chatHeightFocused",
+    "chatDelay",
+    "chatHeightUnfocused",
+    "chatScale",
+    "chatWidth",
+    "notificationDisplayTime",
+    "useNativeTransport",
+    "mainHand",
+    "attackIndicator",
+    "tutorialStep",
+    "mouseWheelSensitivity",
+    "rawMouseInput",
+    "allowCursorChanges",
+    "glDebugVerbosity",
+    "skipMultiplayerWarning",
+    "hideMatchedNames",
+    "joinedFirstServer",
+    "syncChunkWrites",
+    "showAutosaveIndicator",
+    "allowServerListing",
+    "inGameNotification",
+    "sharePresence",
+    "onlyShowSecureChat",
+    "saveChatDrafts",
+    "panoramaScrollSpeed",
+    "telemetryOptInExtra",
+    "onboardAccessibility",
+    "menuBackgroundBlurriness",
+    "startedCleanly",
+    "musicToast",
+    "musicFrequency",
+    "key_key.attack",
+    "key_key.use",
+    "key_key.forward",
+    "key_key.left",
+    "key_key.back",
+    "key_key.right",
+    "key_key.jump",
+    "key_key.sneak",
+    "key_key.sprint",
+    "key_key.drop",
+    "key_key.inventory",
+    "key_key.chat",
+    "key_key.playerlist",
+    "key_key.pickItem",
+    "key_key.command",
+    "key_key.friends",
+    "key_key.socialInteractions",
+    "key_key.toggleGui",
+    "key_key.toggleSpectatorShaderEffects",
+    "key_key.screenshot",
+    "key_key.togglePerspective",
+    "key_key.smoothCamera",
+    "key_key.fullscreen",
+    "key_key.spectatorOutlines",
+    "key_key.spectatorHotbar",
+    "key_key.swapOffhand",
+    "key_key.saveToolbarActivator",
+    "key_key.loadToolbarActivator",
+    "key_key.advancements",
+    "key_key.quickActions",
+    "key_key.debug.overlay",
+    "key_key.debug.modifier",
+    "key_key.hotbar.1",
+    "key_key.hotbar.2",
+    "key_key.hotbar.3",
+    "key_key.hotbar.4",
+    "key_key.hotbar.5",
+    "key_key.hotbar.6",
+    "key_key.hotbar.7",
+    "key_key.hotbar.8",
+    "key_key.hotbar.9",
+    "key_key.debug.reloadChunk",
+    "key_key.debug.showHitboxes",
+    "key_key.debug.clearChat",
+    "key_key.debug.crash",
+    "key_key.debug.showChunkBorders",
+    "key_key.debug.showAdvancedTooltips",
+    "key_key.debug.copyRecreateCommand",
+    "key_key.debug.spectate",
+    "key_key.debug.switchGameMode",
+    "key_key.debug.debugOptions",
+    "key_key.debug.focusPause",
+    "key_key.debug.dumpDynamicTextures",
+    "key_key.debug.reloadResourcePacks",
+    "key_key.debug.profiling",
+    "key_key.debug.copyLocation",
+    "key_key.debug.dumpVersion",
+    "key_key.debug.profilingChart",
+    "key_key.debug.fpsCharts",
+    "key_key.debug.networkCharts",
+    "key_key.debug.lightmapTexture",
+    "soundCategory_master",
+    "soundCategory_music",
+    "soundCategory_record",
+    "soundCategory_weather",
+    "soundCategory_block",
+    "soundCategory_hostile",
+    "soundCategory_neutral",
+    "soundCategory_player",
+    "soundCategory_ambient",
+    "soundCategory_voice",
+    "soundCategory_ui",
+    "modelPart_cape",
+    "modelPart_jacket",
+    "modelPart_left_sleeve",
+    "modelPart_right_sleeve",
+    "modelPart_left_pants_leg",
+    "modelPart_right_pants_leg",
+    "modelPart_hat",
+    "fullscreenResolution",
+];
diff --git a/packages/app-lib/src/api/instance/game_options/supported_settings/legacy_key_bindings.rs b/packages/app-lib/src/api/instance/game_options/supported_settings/legacy_key_bindings.rs
new file mode 100644
index 0000000000..f926d9d7a3
--- /dev/null
+++ b/packages/app-lib/src/api/instance/game_options/supported_settings/legacy_key_bindings.rs
@@ -0,0 +1,112 @@
+// Before Minecraft 1.13, options.txt stored key bindings as numbers. This table
+// converts those numbers to the key names used by current versions.
+pub(in crate::api::instance) const LEGACY_KEY_BINDINGS: &[(i32, &str)] = &[
+    (0, "key.keyboard.unknown"),
+    (1, "key.keyboard.escape"),
+    (2, "key.keyboard.1"),
+    (3, "key.keyboard.2"),
+    (4, "key.keyboard.3"),
+    (5, "key.keyboard.4"),
+    (6, "key.keyboard.5"),
+    (7, "key.keyboard.6"),
+    (8, "key.keyboard.7"),
+    (9, "key.keyboard.8"),
+    (10, "key.keyboard.9"),
+    (11, "key.keyboard.0"),
+    (12, "key.keyboard.minus"),
+    (13, "key.keyboard.equal"),
+    (14, "key.keyboard.backspace"),
+    (15, "key.keyboard.tab"),
+    (16, "key.keyboard.q"),
+    (17, "key.keyboard.w"),
+    (18, "key.keyboard.e"),
+    (19, "key.keyboard.r"),
+    (20, "key.keyboard.t"),
+    (21, "key.keyboard.y"),
+    (22, "key.keyboard.u"),
+    (23, "key.keyboard.i"),
+    (24, "key.keyboard.o"),
+    (25, "key.keyboard.p"),
+    (26, "key.keyboard.left.bracket"),
+    (27, "key.keyboard.right.bracket"),
+    (28, "key.keyboard.enter"),
+    (29, "key.keyboard.left.control"),
+    (30, "key.keyboard.a"),
+    (31, "key.keyboard.s"),
+    (32, "key.keyboard.d"),
+    (33, "key.keyboard.f"),
+    (34, "key.keyboard.g"),
+    (35, "key.keyboard.h"),
+    (36, "key.keyboard.j"),
+    (37, "key.keyboard.k"),
+    (38, "key.keyboard.l"),
+    (39, "key.keyboard.semicolon"),
+    (40, "key.keyboard.apostrophe"),
+    (41, "key.keyboard.grave.accent"),
+    (42, "key.keyboard.left.shift"),
+    (43, "key.keyboard.backslash"),
+    (44, "key.keyboard.z"),
+    (45, "key.keyboard.x"),
+    (46, "key.keyboard.c"),
+    (47, "key.keyboard.v"),
+    (48, "key.keyboard.b"),
+    (49, "key.keyboard.n"),
+    (50, "key.keyboard.m"),
+    (51, "key.keyboard.comma"),
+    (52, "key.keyboard.period"),
+    (53, "key.keyboard.slash"),
+    (54, "key.keyboard.right.shift"),
+    (55, "key.keyboard.keypad.multiply"),
+    (56, "key.keyboard.left.alt"),
+    (57, "key.keyboard.space"),
+    (58, "key.keyboard.caps.lock"),
+    (59, "key.keyboard.f1"),
+    (60, "key.keyboard.f2"),
+    (61, "key.keyboard.f3"),
+    (62, "key.keyboard.f4"),
+    (63, "key.keyboard.f5"),
+    (64, "key.keyboard.f6"),
+    (65, "key.keyboard.f7"),
+    (66, "key.keyboard.f8"),
+    (67, "key.keyboard.f9"),
+    (68, "key.keyboard.f10"),
+    (69, "key.keyboard.num.lock"),
+    (70, "key.keyboard.scroll.lock"),
+    (71, "key.keyboard.keypad.7"),
+    (72, "key.keyboard.keypad.8"),
+    (73, "key.keyboard.keypad.9"),
+    (74, "key.keyboard.keypad.subtract"),
+    (75, "key.keyboard.keypad.4"),
+    (76, "key.keyboard.keypad.5"),
+    (77, "key.keyboard.keypad.6"),
+    (78, "key.keyboard.keypad.add"),
+    (79, "key.keyboard.keypad.1"),
+    (80, "key.keyboard.keypad.2"),
+    (81, "key.keyboard.keypad.3"),
+    (82, "key.keyboard.keypad.0"),
+    (83, "key.keyboard.keypad.decimal"),
+    (87, "key.keyboard.f11"),
+    (88, "key.keyboard.f12"),
+    (100, "key.keyboard.f13"),
+    (101, "key.keyboard.f14"),
+    (102, "key.keyboard.f15"),
+    (141, "key.keyboard.keypad.equal"),
+    (156, "key.keyboard.keypad.enter"),
+    (157, "key.keyboard.right.control"),
+    (181, "key.keyboard.keypad.divide"),
+    (183, "key.keyboard.print.screen"),
+    (184, "key.keyboard.right.alt"),
+    (197, "key.keyboard.pause"),
+    (199, "key.keyboard.home"),
+    (200, "key.keyboard.up"),
+    (201, "key.keyboard.page.up"),
+    (203, "key.keyboard.left"),
+    (205, "key.keyboard.right"),
+    (207, "key.keyboard.end"),
+    (208, "key.keyboard.down"),
+    (209, "key.keyboard.page.down"),
+    (210, "key.keyboard.insert"),
+    (211, "key.keyboard.delete"),
+    (219, "key.keyboard.left.win"),
+    (220, "key.keyboard.right.win"),
+];
diff --git a/packages/app-lib/src/api/instance/game_options/supported_settings/mod.rs b/packages/app-lib/src/api/instance/game_options/supported_settings/mod.rs
new file mode 100644
index 0000000000..cc2d87e0b7
--- /dev/null
+++ b/packages/app-lib/src/api/instance/game_options/supported_settings/mod.rs
@@ -0,0 +1,264 @@
+//! Defines the Minecraft settings Modrinth knows how to read and write.
+//!
+//! File keys and version conversions live here. The frontend supplies the labels
+//! and translations shown to the user.
+
+mod accessibility;
+mod chat;
+mod controls;
+mod known_vanilla_keys;
+mod legacy_key_bindings;
+mod sound;
+mod version_changes;
+mod video;
+
+use super::api_types::{
+    GameOptionEditorChoice, GameOptionEditorDefinition, GameOptionMappingKind,
+};
+
+use known_vanilla_keys::{KNOWN_VANILLA_KEYS, NEVER_SYNC_KEYS};
+pub(in crate::api::instance) use legacy_key_bindings::LEGACY_KEY_BINDINGS;
+pub(in crate::api::instance) use version_changes::*;
+
+#[derive(Clone, Copy)]
+pub(super) enum SettingEditor {
+    Boolean,
+    Integer {
+        min: i64,
+        max: i64,
+        step: i64,
+    },
+    Decimal {
+        min: f64,
+        max: f64,
+        step: f64,
+        unit: Option<&'static str>,
+    },
+    Enum(&'static [&'static str]),
+    Language,
+    KeyBinding,
+}
+
+#[derive(Clone, Copy, Eq, PartialEq)]
+pub(super) enum ValueEncoding {
+    Bool,
+    Integer,
+    Decimal,
+    Enum(&'static [&'static str]),
+    Text,
+    Graphics,
+    AmbientOcclusion,
+    MusicToast,
+    Fov,
+    KeyBinding,
+}
+
+pub(super) struct SupportedSetting {
+    pub(super) id: &'static str,
+    pub(super) keys: &'static [&'static str],
+    pub(super) versioned_keys: &'static [VersionedKey],
+    pub(super) category: &'static str,
+    pub(super) default_on: bool,
+    pub(super) editor: SettingEditor,
+    pub(super) encoding: ValueEncoding,
+}
+
+#[derive(Clone, Copy)]
+pub(super) struct VersionedKey {
+    pub(super) key: &'static str,
+    pub(super) since: &'static str,
+    pub(super) until: &'static str,
+    pub(super) mapping: GameOptionMappingKind,
+}
+
+pub(super) const BOOL: SettingEditor = SettingEditor::Boolean;
+pub(super) const UNIT_INTERVAL: SettingEditor = SettingEditor::Decimal {
+    min: 0.0,
+    max: 1.0,
+    step: 0.01,
+    unit: Some("percent"),
+};
+
+pub(super) const fn setting(
+    id: &'static str,
+    keys: &'static [&'static str],
+    category: &'static str,
+    default_on: bool,
+    editor: SettingEditor,
+    encoding: ValueEncoding,
+) -> SupportedSetting {
+    SupportedSetting {
+        id,
+        keys,
+        versioned_keys: &[],
+        category,
+        default_on,
+        editor,
+        encoding,
+    }
+}
+
+pub(super) const fn versioned_setting(
+    id: &'static str,
+    keys: &'static [&'static str],
+    versioned_keys: &'static [VersionedKey],
+    category: &'static str,
+    default_on: bool,
+    editor: SettingEditor,
+    encoding: ValueEncoding,
+) -> SupportedSetting {
+    SupportedSetting {
+        id,
+        keys,
+        versioned_keys,
+        category,
+        default_on,
+        editor,
+        encoding,
+    }
+}
+
+const SETTING_GROUPS: &[&[SupportedSetting]] = &[
+    video::SETTINGS,
+    sound::SETTINGS,
+    controls::SETTINGS,
+    chat::SETTINGS,
+    accessibility::SETTINGS,
+    GENERAL_SETTINGS,
+];
+
+const MAIN_HAND: &[&str] = &["left", "right"];
+
+// These settings all use the common value formats above, so they can stay together.
+const GENERAL_SETTINGS: &[SupportedSetting] = &[
+    setting(
+        "main_hand",
+        &["mainHand"],
+        "skin_customization",
+        true,
+        SettingEditor::Enum(MAIN_HAND),
+        ValueEncoding::Enum(MAIN_HAND),
+    ),
+    setting(
+        "cape",
+        &["modelPart_cape"],
+        "skin_customization",
+        true,
+        BOOL,
+        ValueEncoding::Bool,
+    ),
+    setting(
+        "hat",
+        &["modelPart_hat"],
+        "skin_customization",
+        true,
+        BOOL,
+        ValueEncoding::Bool,
+    ),
+    setting(
+        "jacket",
+        &["modelPart_jacket"],
+        "skin_customization",
+        true,
+        BOOL,
+        ValueEncoding::Bool,
+    ),
+    setting(
+        "allow_server_listing",
+        &["allowServerListing"],
+        "online",
+        true,
+        BOOL,
+        ValueEncoding::Bool,
+    ),
+    setting(
+        "realms_notifications",
+        &["realmsNotifications"],
+        "online",
+        true,
+        BOOL,
+        ValueEncoding::Bool,
+    ),
+];
+
+pub(super) fn all_supported_settings()
+-> impl Iterator<Item = &'static SupportedSetting> {
+    SETTING_GROUPS.iter().flat_map(|group| group.iter())
+}
+
+pub(super) fn setting_by_id(
+    option_id: &str,
+) -> Option<&'static SupportedSetting> {
+    all_supported_settings().find(|setting| setting.id == option_id)
+}
+
+pub(super) fn setting_by_file_key(
+    key: &str,
+) -> Option<&'static SupportedSetting> {
+    all_supported_settings().find(|setting| setting.keys.contains(&key))
+}
+
+pub(super) fn is_never_sync_key(key: &str) -> bool {
+    NEVER_SYNC_KEYS.contains(&key)
+        || KNOWN_VANILLA_KEYS.contains(&key)
+        || key.starts_with("skip")
+        || key.starts_with("hideBundleTutorial")
+        || key.starts_with("key_") && !key.starts_with("key_key.")
+}
+
+pub(super) fn editor_for(
+    setting: &SupportedSetting,
+) -> GameOptionEditorDefinition {
+    let mut editor = GameOptionEditorDefinition {
+        type_: String::new(),
+        min: None,
+        max: None,
+        step: None,
+        unit: None,
+        choices: Vec::new(),
+    };
+    match setting.editor {
+        SettingEditor::Boolean => editor.type_ = "bool".to_string(),
+        SettingEditor::Integer { min, max, step } => {
+            editor.type_ = "integer".to_string();
+            editor.min = Some(min as f64);
+            editor.max = Some(max as f64);
+            editor.step = Some(step as f64);
+        }
+        SettingEditor::Decimal {
+            min,
+            max,
+            step,
+            unit,
+        } => {
+            editor.type_ = "decimal".to_string();
+            editor.min = Some(min);
+            editor.max = Some(max);
+            editor.step = Some(step);
+            editor.unit = unit.map(str::to_string);
+        }
+        SettingEditor::Enum(choices) => {
+            editor.type_ = "enum".to_string();
+            editor.choices = choices
+                .iter()
+                .map(|value| GameOptionEditorChoice {
+                    value: (*value).to_string(),
+                })
+                .collect();
+        }
+        SettingEditor::Language => editor.type_ = "text".to_string(),
+        SettingEditor::KeyBinding => editor.type_ = "key_binding".to_string(),
+    }
+    editor
+}
+
+pub(super) fn custom_setting_editor() -> GameOptionEditorDefinition {
+    GameOptionEditorDefinition {
+        type_: "external_raw".to_string(),
+        min: None,
+        max: None,
+        step: None,
+        unit: None,
+        choices: Vec::new(),
+    }
+}
diff --git a/packages/app-lib/src/api/instance/game_options/supported_settings/sound.rs b/packages/app-lib/src/api/instance/game_options/supported_settings/sound.rs
new file mode 100644
index 0000000000..fde0f1fe93
--- /dev/null
+++ b/packages/app-lib/src/api/instance/game_options/supported_settings/sound.rs
@@ -0,0 +1,74 @@
+use super::{
+    SettingEditor, SupportedSetting, UNIT_INTERVAL, ValueEncoding, setting,
+    version_changes, versioned_setting,
+};
+
+const MUSIC_TOAST: &[&str] = &["never", "pause", "pause_and_toast"];
+
+pub(super) const SETTINGS: &[SupportedSetting] = &[
+    setting(
+        "language",
+        &["lang"],
+        "language",
+        true,
+        SettingEditor::Language,
+        ValueEncoding::Text,
+    ),
+    setting(
+        "master_volume",
+        &["soundCategory_master"],
+        "music_and_sound",
+        true,
+        UNIT_INTERVAL,
+        ValueEncoding::Decimal,
+    ),
+    setting(
+        "music_volume",
+        &["soundCategory_music"],
+        "music_and_sound",
+        true,
+        UNIT_INTERVAL,
+        ValueEncoding::Decimal,
+    ),
+    versioned_setting(
+        "music_toast",
+        &["musicToast", "showNowPlayingToast"],
+        version_changes::MUSIC_TOAST_KEYS,
+        "music_and_sound",
+        true,
+        SettingEditor::Enum(MUSIC_TOAST),
+        ValueEncoding::MusicToast,
+    ),
+    setting(
+        "blocks_volume",
+        &["soundCategory_block"],
+        "music_and_sound",
+        true,
+        UNIT_INTERVAL,
+        ValueEncoding::Decimal,
+    ),
+    setting(
+        "hostile_volume",
+        &["soundCategory_hostile"],
+        "music_and_sound",
+        true,
+        UNIT_INTERVAL,
+        ValueEncoding::Decimal,
+    ),
+    setting(
+        "players_volume",
+        &["soundCategory_player"],
+        "music_and_sound",
+        true,
+        UNIT_INTERVAL,
+        ValueEncoding::Decimal,
+    ),
+    setting(
+        "voice_volume",
+        &["soundCategory_voice"],
+        "music_and_sound",
+        true,
+        UNIT_INTERVAL,
+        ValueEncoding::Decimal,
+    ),
+];
diff --git a/packages/app-lib/src/api/instance/game_options/supported_settings/version_changes.rs b/packages/app-lib/src/api/instance/game_options/supported_settings/version_changes.rs
new file mode 100644
index 0000000000..5e8c123026
--- /dev/null
+++ b/packages/app-lib/src/api/instance/game_options/supported_settings/version_changes.rs
@@ -0,0 +1,660 @@
+//! Handles settings Minecraft renamed or stored differently between versions.
+
+use super::super::api_types::canonical_values_equal;
+use super::super::options_file::{
+    GameOptionsDocument, input_error, validate_raw_key_value,
+};
+use super::{
+    GameOptionMappingKind, LEGACY_KEY_BINDINGS, SettingEditor,
+    SupportedSetting, ValueEncoding, VersionedKey,
+};
+use crate::state::{CanonicalValue, StoredOption};
+
+const GRAPHICS_VALUES: &[&str] = &["fast", "fancy", "fabulous"];
+const MUSIC_TOAST_VALUES: &[&str] = &["never", "pause", "pause_and_toast"];
+
+pub(in crate::api::instance) const GRAPHICS_KEYS: &[VersionedKey] = &[
+    VersionedKey {
+        key: "fancyGraphics",
+        since: "1.0",
+        until: "1.16.1",
+        mapping: GameOptionMappingKind::Legacy,
+    },
+    VersionedKey {
+        key: "graphicsMode",
+        since: "1.16",
+        until: "1.21.10",
+        mapping: GameOptionMappingKind::Migrated,
+    },
+    VersionedKey {
+        key: "graphicsPreset",
+        since: "1.21.11",
+        until: "26.2",
+        mapping: GameOptionMappingKind::Direct,
+    },
+];
+
+pub(in crate::api::instance) const AMBIENT_OCCLUSION_KEYS: &[VersionedKey] = &[
+    VersionedKey {
+        key: "ao",
+        since: "1.0",
+        until: "1.19.3",
+        mapping: GameOptionMappingKind::Legacy,
+    },
+    VersionedKey {
+        key: "ao",
+        since: "1.19.4",
+        until: "26.2",
+        mapping: GameOptionMappingKind::Migrated,
+    },
+];
+
+pub(in crate::api::instance) const MUSIC_TOAST_KEYS: &[VersionedKey] = &[
+    VersionedKey {
+        key: "showNowPlayingToast",
+        since: "1.21.6",
+        until: "1.21.10",
+        mapping: GameOptionMappingKind::Legacy,
+    },
+    VersionedKey {
+        key: "musicToast",
+        since: "1.21.11",
+        until: "26.2",
+        mapping: GameOptionMappingKind::Direct,
+    },
+];
+
+pub(in crate::api::instance) const SWAP_OFFHAND_KEYS: &[VersionedKey] = &[
+    VersionedKey {
+        key: "key_key.swapHands",
+        since: "1.0",
+        until: "1.15.2",
+        mapping: GameOptionMappingKind::Legacy,
+    },
+    VersionedKey {
+        key: "key_key.swapOffhand",
+        since: "1.16",
+        until: "26.2",
+        mapping: GameOptionMappingKind::Direct,
+    },
+];
+
+pub(in crate::api::instance) fn release_version(
+    version: &str,
+) -> Option<(u32, u32, u32)> {
+    let components = version
+        .split('.')
+        .map(|component| component.parse::<u32>())
+        .collect::<Result<Vec<_>, _>>()
+        .ok()?;
+    match components.as_slice() {
+        [major, minor] => Some((*major, *minor, 0)),
+        [major, minor, patch] => Some((*major, *minor, *patch)),
+        _ => None,
+    }
+}
+
+pub(in crate::api::instance) fn physical_variant_for_version<'a>(
+    definition: &'a SupportedSetting,
+    version: &str,
+) -> Option<&'a VersionedKey> {
+    let version = release_version(version)?;
+    definition.versioned_keys.iter().find(|variant| {
+        let Some(since) = release_version(variant.since) else {
+            return false;
+        };
+        let Some(until) = release_version(variant.until) else {
+            return false;
+        };
+        version >= since && version <= until
+    })
+}
+
+pub(in crate::api::instance) fn physical_variant_for_present_key<'a>(
+    definition: &'a SupportedSetting,
+    key: &str,
+    version: &str,
+) -> Option<&'a VersionedKey> {
+    let version = release_version(version)?;
+    definition.versioned_keys.iter().rev().find(|variant| {
+        variant.key == key
+            && release_version(variant.since)
+                .is_some_and(|since| since <= version)
+            && release_version(variant.until)
+                .is_some_and(|until| version <= until)
+    })
+}
+
+pub(in crate::api::instance) fn uses_modern_key_tokens(version: &str) -> bool {
+    release_version(version).is_some_and(|version| version >= (1, 13, 0))
+}
+
+pub(in crate::api::instance) fn split_key_binding(
+    value: &str,
+) -> (&str, Option<&str>) {
+    value
+        .split_once(':')
+        .map_or((value, None), |(key, modifier)| (key, Some(modifier)))
+}
+
+pub(in crate::api::instance) fn append_key_modifier(
+    mut key: String,
+    modifier: Option<&str>,
+) -> String {
+    if let Some(modifier) = modifier {
+        key.push(':');
+        key.push_str(modifier);
+    }
+    key
+}
+
+pub(in crate::api::instance) fn legacy_key_binding_to_token(
+    value: &str,
+) -> Option<String> {
+    let (key, modifier) = split_key_binding(value);
+    let key = key.parse::<i32>().ok()?;
+    let token = match key {
+        -100 => "key.mouse.left".to_string(),
+        -99 => "key.mouse.right".to_string(),
+        -98 => "key.mouse.middle".to_string(),
+        -97..=-85 => format!("key.mouse.{}", key + 101),
+        _ => LEGACY_KEY_BINDINGS
+            .iter()
+            .find(|(legacy, _)| *legacy == key)
+            .map(|(_, token)| (*token).to_string())?,
+    };
+    Some(append_key_modifier(token, modifier))
+}
+
+pub(in crate::api::instance) fn token_key_binding_to_legacy(
+    value: &str,
+) -> Option<String> {
+    let (token, modifier) = split_key_binding(value);
+    let key = match token {
+        "key.mouse.left" => -100,
+        "key.mouse.right" => -99,
+        "key.mouse.middle" => -98,
+        _ => {
+            if let Some(button) = token.strip_prefix("key.mouse.") {
+                let button = button.parse::<i32>().ok()?;
+                if !(4..=16).contains(&button) {
+                    return None;
+                }
+                button - 101
+            } else {
+                LEGACY_KEY_BINDINGS
+                    .iter()
+                    .find(|(_, candidate)| *candidate == token)
+                    .map(|(legacy, _)| *legacy)?
+            }
+        }
+    };
+    Some(append_key_modifier(key.to_string(), modifier))
+}
+
+pub(in crate::api::instance) fn valid_modern_key_binding(value: &str) -> bool {
+    let (key, modifier) = split_key_binding(value);
+    let key_valid = ["key.keyboard.", "key.mouse.", "scancode."]
+        .into_iter()
+        .find_map(|prefix| key.strip_prefix(prefix))
+        .is_some_and(|identifier| {
+            !identifier.is_empty()
+                && identifier.chars().all(|character| {
+                    character.is_ascii_alphanumeric()
+                        || matches!(character, '.' | '_' | '-')
+                })
+        });
+    key_valid
+        && modifier.is_none_or(|modifier| {
+            !modifier.is_empty()
+                && modifier.len() <= 64
+                && modifier.chars().all(|character| {
+                    character.is_ascii_alphanumeric()
+                        || matches!(character, '.' | '_' | '-' | ':' | '+')
+                })
+        })
+}
+
+pub(in crate::api::instance) fn supported_settings_cover_game_version(
+    version: &str,
+) -> bool {
+    if version.contains('w') || version.contains("snapshot") {
+        return false;
+    }
+    let components = version
+        .split('.')
+        .map(|component| component.parse::<u32>())
+        .collect::<Result<Vec<_>, _>>();
+    let Ok(components) = components else {
+        return false;
+    };
+    match components.as_slice() {
+        [1, minor] => *minor <= 21,
+        [1, minor, patch] => *minor < 21 || (*minor == 21 && *patch <= 11),
+        [26, minor] | [26, minor, _] => (1..=2).contains(minor),
+        _ => false,
+    }
+}
+
+pub(in crate::api::instance) fn decode_value(
+    definition: &SupportedSetting,
+    physical_key: &str,
+    raw: &str,
+) -> Option<CanonicalValue> {
+    match definition.encoding {
+        ValueEncoding::Bool => match raw {
+            "true" => Some(CanonicalValue::Bool(true)),
+            "false" => Some(CanonicalValue::Bool(false)),
+            _ => None,
+        },
+        ValueEncoding::Integer => {
+            raw.parse::<i64>().ok().map(CanonicalValue::Integer)
+        }
+        ValueEncoding::Decimal => raw
+            .parse::<f64>()
+            .ok()
+            .filter(|value| value.is_finite())
+            .map(|_| CanonicalValue::Decimal(raw.to_string())),
+        ValueEncoding::Enum(choices) => choices
+            .contains(&raw)
+            .then(|| CanonicalValue::Enum(raw.to_string())),
+        ValueEncoding::Text => Some(CanonicalValue::Text(raw.to_string())),
+        ValueEncoding::KeyBinding => {
+            if valid_modern_key_binding(raw) {
+                Some(CanonicalValue::KeyBinding(raw.to_string()))
+            } else {
+                legacy_key_binding_to_token(raw).map(CanonicalValue::KeyBinding)
+            }
+        }
+        ValueEncoding::Fov => raw.parse::<f64>().ok().and_then(|value| {
+            let degrees = value * 40.0 + 70.0;
+            (value.is_finite()
+                && (-1.0..=1.0).contains(&value)
+                && (degrees - degrees.round()).abs() <= 0.000_001)
+                .then(|| CanonicalValue::Integer(degrees.round() as i64))
+        }),
+        ValueEncoding::Graphics => {
+            let value = match physical_key {
+                "fancyGraphics" => match raw {
+                    "false" => "fast",
+                    "true" => "fancy",
+                    _ => return None,
+                },
+                "graphicsMode" => match raw {
+                    "0" => "fast",
+                    "1" => "fancy",
+                    "2" => "fabulous",
+                    _ => return None,
+                },
+                "graphicsPreset" if GRAPHICS_VALUES.contains(&raw) => raw,
+                _ => return None,
+            };
+            Some(CanonicalValue::Enum(value.to_string()))
+        }
+        ValueEncoding::AmbientOcclusion => {
+            let value = match raw {
+                "false" | "0" => "off",
+                "true" => "on",
+                "1" => "minimum",
+                "2" => "maximum",
+                _ => return None,
+            };
+            Some(CanonicalValue::Enum(value.to_string()))
+        }
+        ValueEncoding::MusicToast => {
+            let value = match (physical_key, raw) {
+                ("showNowPlayingToast", "false") => "never",
+                ("showNowPlayingToast", "true") => "pause_and_toast",
+                ("musicToast", "never" | "pause" | "pause_and_toast") => raw,
+                _ => return None,
+            };
+            Some(CanonicalValue::Enum(value.to_string()))
+        }
+    }
+}
+
+pub(in crate::api::instance) fn encode_value(
+    definition: &SupportedSetting,
+    physical_key: &str,
+    value: &CanonicalValue,
+    game_version: &str,
+    current_raw: Option<&str>,
+) -> Option<String> {
+    if let Some(current_raw) = current_raw
+        && physical_representation_supported_for_target(
+            definition,
+            physical_key,
+            current_raw,
+            game_version,
+        )
+        && decode_value(definition, physical_key, current_raw)
+            .as_ref()
+            .is_some_and(|current| canonical_values_equal(current, value))
+    {
+        return Some(current_raw.to_string());
+    }
+    match (definition.encoding, value) {
+        (ValueEncoding::Bool, CanonicalValue::Bool(value)) => {
+            Some(value.to_string())
+        }
+        (ValueEncoding::Integer, CanonicalValue::Integer(value)) => {
+            Some(value.to_string())
+        }
+        (ValueEncoding::Decimal, CanonicalValue::Decimal(value)) => {
+            Some(value.clone())
+        }
+        (ValueEncoding::Decimal, CanonicalValue::Integer(value)) => {
+            Some(value.to_string())
+        }
+        (ValueEncoding::Enum(choices), CanonicalValue::Enum(value))
+            if choices.contains(&value.as_str()) =>
+        {
+            Some(value.clone())
+        }
+        (ValueEncoding::Text, CanonicalValue::Text(value)) => {
+            Some(value.clone())
+        }
+        (ValueEncoding::KeyBinding, CanonicalValue::KeyBinding(value))
+            if valid_modern_key_binding(value) =>
+        {
+            if !uses_modern_key_tokens(game_version) {
+                token_key_binding_to_legacy(value)
+            } else {
+                Some(value.clone())
+            }
+        }
+        (ValueEncoding::Fov, CanonicalValue::Integer(value))
+            if (30..=110).contains(value) =>
+        {
+            let normalized = (*value as f64 - 70.0) / 40.0;
+            Some(format_decimal(normalized))
+        }
+        (ValueEncoding::Graphics, CanonicalValue::Enum(value)) => {
+            match physical_key {
+                "fancyGraphics" => match value.as_str() {
+                    "fast" => Some("false".to_string()),
+                    "fancy" => Some("true".to_string()),
+                    _ => None,
+                },
+                "graphicsMode" => match value.as_str() {
+                    "fast" => Some("0".to_string()),
+                    "fancy" => Some("1".to_string()),
+                    "fabulous" => Some("2".to_string()),
+                    _ => None,
+                },
+                "graphicsPreset"
+                    if GRAPHICS_VALUES.contains(&value.as_str()) =>
+                {
+                    Some(value.clone())
+                }
+                _ => None,
+            }
+        }
+        (ValueEncoding::AmbientOcclusion, CanonicalValue::Enum(value)) => {
+            let target_is_legacy = release_version(game_version)
+                .is_some_and(|version| version <= (1, 19, 3));
+            if target_is_legacy {
+                match value.as_str() {
+                    "off" => Some("0".to_string()),
+                    "minimum" => Some("1".to_string()),
+                    "maximum" => Some("2".to_string()),
+                    _ => None,
+                }
+            } else {
+                match value.as_str() {
+                    "off" => Some("false".to_string()),
+                    "on" => Some("true".to_string()),
+                    _ => None,
+                }
+            }
+        }
+        (ValueEncoding::MusicToast, CanonicalValue::Enum(value)) => {
+            match physical_key {
+                "showNowPlayingToast" => match value.as_str() {
+                    "never" => Some("false".to_string()),
+                    "pause_and_toast" => Some("true".to_string()),
+                    _ => None,
+                },
+                "musicToast"
+                    if MUSIC_TOAST_VALUES.contains(&value.as_str()) =>
+                {
+                    Some(value.clone())
+                }
+                _ => None,
+            }
+        }
+        _ => None,
+    }
+}
+
+pub(in crate::api::instance) fn validate_canonical_value(
+    definition: Option<&SupportedSetting>,
+    value: &CanonicalValue,
+) -> crate::Result<()> {
+    if let Some(definition) = definition {
+        let type_valid = match definition.encoding {
+            ValueEncoding::Bool => matches!(value, CanonicalValue::Bool(_)),
+            ValueEncoding::Integer => {
+                matches!(value, CanonicalValue::Integer(_))
+            }
+            ValueEncoding::Decimal => matches!(
+                value,
+                CanonicalValue::Decimal(_) | CanonicalValue::Integer(_)
+            ),
+            ValueEncoding::Enum(_)
+            | ValueEncoding::Graphics
+            | ValueEncoding::AmbientOcclusion
+            | ValueEncoding::MusicToast => {
+                matches!(value, CanonicalValue::Enum(_))
+            }
+            ValueEncoding::Text => matches!(value, CanonicalValue::Text(_)),
+            ValueEncoding::Fov => matches!(value, CanonicalValue::Integer(_)),
+            ValueEncoding::KeyBinding => {
+                matches!(value, CanonicalValue::KeyBinding(_))
+            }
+        };
+        if !type_valid {
+            return Err(input_error(format!(
+                "Invalid value type for {}",
+                definition.id
+            )));
+        }
+        match (definition.editor, value) {
+            (
+                SettingEditor::Integer { min, max, step },
+                CanonicalValue::Integer(value),
+            ) if *value < min
+                || *value > max
+                || step > 0 && (*value - min) % step != 0 =>
+            {
+                return Err(input_error(format!(
+                    "{} is outside its supported range or increment",
+                    definition.id
+                )));
+            }
+            (
+                SettingEditor::Decimal { min, max, step, .. },
+                CanonicalValue::Decimal(value),
+            ) => {
+                let parsed = value
+                    .parse::<f64>()
+                    .map_err(|_| input_error("Invalid decimal value"))?;
+                let increment = (parsed - min) / step;
+                if !parsed.is_finite()
+                    || parsed < min
+                    || parsed > max
+                    || step > 0.0
+                        && (increment - increment.round()).abs() > 0.000_001
+                {
+                    return Err(input_error(format!(
+                        "{} is outside its supported range or increment",
+                        definition.id
+                    )));
+                }
+            }
+            (
+                SettingEditor::Decimal { min, max, step, .. },
+                CanonicalValue::Integer(value),
+            ) => {
+                let parsed = *value as f64;
+                let increment = (parsed - min) / step;
+                if parsed < min
+                    || parsed > max
+                    || step > 0.0
+                        && (increment - increment.round()).abs() > 0.000_001
+                {
+                    return Err(input_error(format!(
+                        "{} is outside its supported range or increment",
+                        definition.id
+                    )));
+                }
+            }
+            (SettingEditor::Enum(choices), CanonicalValue::Enum(value))
+                if !choices.iter().any(|choice| *choice == value.as_str()) =>
+            {
+                return Err(input_error(format!(
+                    "Invalid choice for {}",
+                    definition.id
+                )));
+            }
+            (SettingEditor::Language, CanonicalValue::Text(value))
+                if value.is_empty()
+                    || value.len() > 64
+                    || value.chars().any(char::is_control) =>
+            {
+                return Err(input_error("Invalid language value"));
+            }
+            (SettingEditor::KeyBinding, CanonicalValue::KeyBinding(value))
+                if value.len() > 256
+                    || value.contains(['\r', '\n'])
+                    || !valid_modern_key_binding(value) =>
+            {
+                return Err(input_error("Invalid key binding value"));
+            }
+            _ => {}
+        }
+    } else if let CanonicalValue::ExternalRaw(raw) = value {
+        validate_raw_key_value("external", raw)?;
+    } else {
+        return Err(input_error("Custom settings require a raw string value"));
+    }
+    Ok(())
+}
+
+pub(in crate::api::instance) fn decode_value_for_version(
+    definition: &SupportedSetting,
+    physical_key: &str,
+    raw: &str,
+    game_version: &str,
+) -> Option<CanonicalValue> {
+    let value = decode_value(definition, physical_key, raw)?;
+    validate_canonical_value(Some(definition), &value).ok()?;
+    let target_key = if definition.versioned_keys.is_empty() {
+        physical_key
+    } else {
+        physical_variant_for_version(definition, game_version)?.key
+    };
+    encode_value(definition, target_key, &value, game_version, None)?;
+    Some(value)
+}
+
+pub(in crate::api::instance) fn target_physical_key(
+    definition: Option<&SupportedSetting>,
+    stored: &StoredOption,
+    document: &GameOptionsDocument,
+    game_version: &str,
+) -> Option<String> {
+    if let Some(definition) = definition {
+        if !definition.versioned_keys.is_empty() {
+            observed_physical_key(definition, document, game_version)?;
+            return physical_variant_for_version(definition, game_version)
+                .map(|variant| variant.key.to_string());
+        }
+        definition
+            .keys
+            .iter()
+            .find(|key| document.value(key).is_some())
+            .map(|key| (*key).to_string())
+    } else {
+        stored.raw_key.clone()
+    }
+}
+
+pub(in crate::api::instance) fn observed_physical_key(
+    definition: &SupportedSetting,
+    document: &GameOptionsDocument,
+    game_version: &str,
+) -> Option<String> {
+    if let Some(target) = physical_variant_for_version(definition, game_version)
+        && document.value(target.key).is_some()
+    {
+        return Some(target.key.to_string());
+    }
+    definition
+        .keys
+        .iter()
+        .find(|key| document.value(key).is_some())
+        .map(|key| (*key).to_string())
+}
+
+pub(in crate::api::instance) fn alias_migration_needed(
+    definition: &SupportedSetting,
+    document: &GameOptionsDocument,
+    target_key: &str,
+) -> bool {
+    document.value(target_key).is_none()
+        && definition
+            .keys
+            .iter()
+            .any(|key| *key != target_key && document.value(key).is_some())
+}
+
+pub(in crate::api::instance) fn physical_representation_supported_for_target(
+    definition: &SupportedSetting,
+    physical_key: &str,
+    raw: &str,
+    game_version: &str,
+) -> bool {
+    let Some(target_version) = release_version(game_version) else {
+        return false;
+    };
+    if matches!(definition.encoding, ValueEncoding::KeyBinding) {
+        return if target_version >= (1, 13, 0) {
+            valid_modern_key_binding(raw)
+        } else {
+            legacy_key_binding_to_token(raw).is_some()
+        };
+    }
+    if matches!(definition.encoding, ValueEncoding::AmbientOcclusion) {
+        return if target_version >= (1, 19, 4) {
+            matches!(raw, "true" | "false")
+        } else {
+            matches!(raw, "0" | "1" | "2")
+        };
+    }
+
+    let mut variants = definition
+        .versioned_keys
+        .iter()
+        .filter(|variant| variant.key == physical_key)
+        .peekable();
+    if variants.peek().is_none() {
+        return true;
+    }
+    variants.any(|variant| {
+        release_version(variant.since)
+            .is_some_and(|since| since <= target_version)
+            && release_version(variant.until)
+                .is_some_and(|until| target_version <= until)
+    })
+}
+
+pub(in crate::api::instance) fn format_decimal(value: f64) -> String {
+    let value = format!("{value:.8}");
+    let value = value.trim_end_matches('0').trim_end_matches('.');
+    if value == "-0" {
+        "0".to_string()
+    } else {
+        value.to_string()
+    }
+}
diff --git a/packages/app-lib/src/api/instance/game_options/supported_settings/video.rs b/packages/app-lib/src/api/instance/game_options/supported_settings/video.rs
new file mode 100644
index 0000000000..da2adc9dcb
--- /dev/null
+++ b/packages/app-lib/src/api/instance/game_options/supported_settings/video.rs
@@ -0,0 +1,162 @@
+use super::{
+    BOOL, SettingEditor, SupportedSetting, ValueEncoding, setting,
+    version_changes, versioned_setting,
+};
+
+const GRAPHICS: &[&str] = &["fast", "fancy", "fabulous"];
+const AMBIENT_OCCLUSION: &[&str] = &["off", "on", "minimum", "maximum"];
+const PARTICLES: &[&str] = &["0", "1", "2"];
+const CLOUDS: &[&str] = &["false", "fast", "true"];
+
+pub(super) const SETTINGS: &[SupportedSetting] = &[
+    setting(
+        "fov",
+        &["fov"],
+        "video",
+        true,
+        SettingEditor::Integer {
+            min: 30,
+            max: 110,
+            step: 1,
+        },
+        ValueEncoding::Fov,
+    ),
+    versioned_setting(
+        "graphics",
+        &["graphicsPreset", "graphicsMode", "fancyGraphics"],
+        version_changes::GRAPHICS_KEYS,
+        "video",
+        false,
+        SettingEditor::Enum(GRAPHICS),
+        ValueEncoding::Graphics,
+    ),
+    versioned_setting(
+        "ambient_occlusion",
+        &["ao"],
+        version_changes::AMBIENT_OCCLUSION_KEYS,
+        "video",
+        true,
+        SettingEditor::Enum(AMBIENT_OCCLUSION),
+        ValueEncoding::AmbientOcclusion,
+    ),
+    setting(
+        "render_distance",
+        &["renderDistance"],
+        "video",
+        false,
+        SettingEditor::Integer {
+            min: 2,
+            max: 64,
+            step: 1,
+        },
+        ValueEncoding::Integer,
+    ),
+    setting(
+        "simulation_distance",
+        &["simulationDistance"],
+        "video",
+        false,
+        SettingEditor::Integer {
+            min: 2,
+            max: 64,
+            step: 1,
+        },
+        ValueEncoding::Integer,
+    ),
+    setting(
+        "gui_scale",
+        &["guiScale"],
+        "video",
+        false,
+        SettingEditor::Integer {
+            min: 0,
+            max: 8,
+            step: 1,
+        },
+        ValueEncoding::Integer,
+    ),
+    setting(
+        "particles",
+        &["particles"],
+        "video",
+        false,
+        SettingEditor::Enum(PARTICLES),
+        ValueEncoding::Enum(PARTICLES),
+    ),
+    setting(
+        "clouds",
+        &["renderClouds"],
+        "video",
+        false,
+        SettingEditor::Enum(CLOUDS),
+        ValueEncoding::Enum(CLOUDS),
+    ),
+    setting(
+        "entity_shadows",
+        &["entityShadows"],
+        "video",
+        true,
+        BOOL,
+        ValueEncoding::Bool,
+    ),
+    setting(
+        "view_bobbing",
+        &["bobView"],
+        "video",
+        true,
+        BOOL,
+        ValueEncoding::Bool,
+    ),
+    setting(
+        "vsync",
+        &["enableVsync"],
+        "video",
+        false,
+        BOOL,
+        ValueEncoding::Bool,
+    ),
+    setting(
+        "fullscreen",
+        &["fullscreen"],
+        "video",
+        false,
+        BOOL,
+        ValueEncoding::Bool,
+    ),
+    setting(
+        "max_framerate",
+        &["maxFps"],
+        "video",
+        false,
+        SettingEditor::Integer {
+            min: 10,
+            max: 260,
+            step: 10,
+        },
+        ValueEncoding::Integer,
+    ),
+    setting(
+        "mipmap_levels",
+        &["mipmapLevels"],
+        "video",
+        false,
+        SettingEditor::Integer {
+            min: 0,
+            max: 4,
+            step: 1,
+        },
+        ValueEncoding::Integer,
+    ),
+    setting(
+        "biome_blend_radius",
+        &["biomeBlendRadius"],
+        "video",
+        false,
+        SettingEditor::Integer {
+            min: 0,
+            max: 7,
+            step: 1,
+        },
+        ValueEncoding::Integer,
+    ),
+];
diff --git a/packages/app-lib/src/api/instance/game_options/write_shared_settings.rs b/packages/app-lib/src/api/instance/game_options/write_shared_settings.rs
new file mode 100644
index 0000000000..374d8da673
--- /dev/null
+++ b/packages/app-lib/src/api/instance/game_options/write_shared_settings.rs
@@ -0,0 +1,353 @@
+//! Writes shared settings into an instance without replacing the rest of `options.txt`.
+
+use super::super::synced_options::{self, CheckpointStatus};
+use super::CATALOG_REVISION;
+use super::api_types::{
+    GameOptionMappingKind, SaveGameSettingsResult, SyncOutcome, SyncReason,
+};
+use super::options_file::{
+    GameOptionsDocument, options_path, read_document, sha1_bytes,
+};
+use super::read_instance_changes::{
+    discover_custom_settings, previous_applied_settings,
+    read_instance_changes_into_shared_settings,
+};
+use super::supported_settings::*;
+use crate::state::{
+    CanonicalValue, GameOptionsProjection, InstanceMetadata, ProjectedField,
+    ProjectionOrigin, State, SyncedOption, game_options_sync_is_enabled,
+    load_game_option_preferences, load_game_options_sync_state,
+    load_shared_game_options,
+};
+use crate::util::io;
+use std::collections::HashSet;
+
+pub(super) async fn sync_is_active_for_instance(
+    metadata: &InstanceMetadata,
+    state: &State,
+) -> crate::Result<bool> {
+    Ok(metadata.synced_options.game_options
+        && game_options_sync_is_enabled(&state.pool).await?)
+}
+
+/// Updates the enabled settings in memory and records the exact keys and values
+/// Modrinth wrote, so changes made later in Minecraft can be recognized.
+pub(super) async fn apply_shared_settings_to_document(
+    metadata: &InstanceMetadata,
+    document: &mut GameOptionsDocument,
+    state: &State,
+) -> crate::Result<Vec<ProjectedField>> {
+    let values = load_shared_game_options(&state.pool).await?;
+    let preferences = load_game_option_preferences(&state.pool).await?;
+    let settings = crate::state::Settings::get(&state.pool).await?;
+    let mut fields = Vec::new();
+    for (option_id, preference) in preferences {
+        if !preference.enabled {
+            continue;
+        }
+        if option_id == "fullscreen"
+            && (metadata.launch_overrides.force_fullscreen.is_some()
+                || settings.force_fullscreen)
+        {
+            continue;
+        }
+        let Some(stored) = values.get(&option_id) else {
+            continue;
+        };
+        let Some(value) = stored.value.as_ref().filter(|_| stored.seeded)
+        else {
+            continue;
+        };
+        let definition = setting_by_id(&option_id);
+        if definition.is_some()
+            && !supported_settings_cover_game_version(
+                &metadata.applied_content_set.game_version,
+            )
+        {
+            continue;
+        }
+        if definition.is_none()
+            && stored
+                .raw_key
+                .as_deref()
+                .is_some_and(|key| setting_by_file_key(key).is_some())
+        {
+            continue;
+        }
+        let Some(key) = target_physical_key(
+            definition,
+            stored,
+            document,
+            &metadata.applied_content_set.game_version,
+        ) else {
+            continue;
+        };
+        let migrated = definition.is_some_and(|definition| {
+            alias_migration_needed(definition, document, &key)
+                || document.value(&key).is_some_and(|raw| {
+                    !physical_representation_supported_for_target(
+                        definition,
+                        &key,
+                        raw,
+                        &metadata.applied_content_set.game_version,
+                    )
+                })
+        });
+        let raw_value = if let Some(definition) = definition {
+            let Some(raw_value) = encode_value(
+                definition,
+                &key,
+                value,
+                &metadata.applied_content_set.game_version,
+                document.value(&key),
+            ) else {
+                continue;
+            };
+            raw_value
+        } else if let CanonicalValue::ExternalRaw(raw_value) = value {
+            raw_value.clone()
+        } else {
+            continue;
+        };
+        document.set(&key, &raw_value, definition.is_none() || migrated)?;
+        fields.push(ProjectedField {
+            option_id,
+            physical_key: key,
+            raw_value,
+            origin: ProjectionOrigin::Shared,
+            migrated,
+        });
+    }
+    Ok(fields)
+}
+
+/// Reads local changes, applies shared values, and stores the keys and values it
+/// wrote so the next sync can tell what changed.
+pub(super) async fn sync_instance_options(
+    metadata: &InstanceMetadata,
+    state: &State,
+    reason: SyncReason,
+    allow_publish: bool,
+) -> crate::Result<SyncOutcome> {
+    if synced_options::instance_is_running(metadata, state).await? {
+        return Ok(SyncOutcome::Deferred);
+    }
+    if reason != SyncReason::PackExtracted
+        && reason != SyncReason::BeforePackUpdate
+        && synced_options::sync_files_are_protected(metadata)
+    {
+        return Ok(SyncOutcome::Deferred);
+    }
+    let path = options_path(metadata, state);
+    if !path.exists() {
+        return Ok(SyncOutcome::WaitingForFile);
+    }
+    let (mut document, input_bytes) = read_document(&path).await?;
+    let input_sha1 = sha1_bytes(&input_bytes);
+    let checkpoint = synced_options::checkpoint(
+        &metadata.instance.id,
+        SyncedOption::GameOptions,
+        "default",
+        state,
+    )
+    .await?;
+    let prior_projection = checkpoint.as_ref().and_then(|checkpoint| {
+        previous_applied_settings(checkpoint.merge_base.as_deref())
+    });
+    let should_publish = allow_publish
+        && reason != SyncReason::PackExtracted
+        && checkpoint.as_ref().is_none_or(|checkpoint| {
+            match checkpoint.status {
+                CheckpointStatus::Ready => {
+                    checkpoint.expected_sha1 != input_sha1
+                }
+                CheckpointStatus::Pending => {
+                    checkpoint.expected_sha1 != input_sha1
+                        && prior_projection.as_ref().is_none_or(|projection| {
+                            projection.input_sha1 != input_sha1
+                        })
+                }
+            }
+        });
+    let canonical_changed = if should_publish {
+        read_instance_changes_into_shared_settings(
+            metadata,
+            &document,
+            prior_projection.as_ref(),
+            state,
+        )
+        .await?
+    } else if allow_publish && reason != SyncReason::PackExtracted {
+        let launcher_keys = prior_projection
+            .as_ref()
+            .into_iter()
+            .flat_map(|projection| projection.fields.iter())
+            .filter(|field| field.origin == ProjectionOrigin::LauncherOverride)
+            .map(|field| field.physical_key.clone())
+            .collect::<HashSet<_>>();
+        discover_custom_settings(metadata, &document, &launcher_keys, state)
+            .await?
+    } else {
+        false
+    };
+    if reason == SyncReason::BeforePackUpdate {
+        if canonical_changed {
+            let _ = Box::pin(sync_other_participating_instances(
+                state,
+                Some(&metadata.instance.id),
+            ))
+            .await;
+        }
+        return Ok(SyncOutcome::Unchanged);
+    }
+
+    let fields =
+        apply_shared_settings_to_document(metadata, &mut document, state)
+            .await?;
+    let used_migration = fields.iter().any(|field| {
+        field.migrated
+            || setting_by_id(&field.option_id).is_some_and(|definition| {
+                (matches!(definition.encoding, ValueEncoding::KeyBinding)
+                    && split_key_binding(&field.raw_value)
+                        .0
+                        .parse::<i32>()
+                        .is_ok())
+                    || physical_variant_for_present_key(
+                        definition,
+                        &field.physical_key,
+                        &metadata.applied_content_set.game_version,
+                    )
+                    .map(|variant| {
+                        variant.mapping != GameOptionMappingKind::Direct
+                    })
+                    .unwrap_or_else(|| {
+                        definition.keys.first().copied()
+                            != Some(field.physical_key.as_str())
+                    })
+            })
+    });
+    let output_bytes = document.serialize()?;
+    let output_sha1 = sha1_bytes(&output_bytes);
+    let (canonical_revision, _) =
+        load_game_options_sync_state(&state.pool, CATALOG_REVISION).await?;
+    let projection = GameOptionsProjection {
+        schema_version: 1,
+        target_game_version: metadata.applied_content_set.game_version.clone(),
+        input_sha1,
+        canonical_revision,
+        fields,
+    };
+    let projection_bytes = serde_json::to_vec(&projection)?;
+    synced_options::begin_checkpoint(
+        &metadata.instance.id,
+        SyncedOption::GameOptions,
+        "default",
+        &output_sha1,
+        Some(&projection_bytes),
+        canonical_revision as i64,
+        state,
+    )
+    .await?;
+    let changed = output_bytes != input_bytes;
+    if changed {
+        io::write(&path, output_bytes).await?;
+    }
+    synced_options::finish_plain_checkpoint(
+        &metadata.instance.id,
+        SyncedOption::GameOptions,
+        "default",
+        state,
+    )
+    .await?;
+    if canonical_changed {
+        let _ = Box::pin(sync_other_participating_instances(
+            state,
+            Some(&metadata.instance.id),
+        ))
+        .await;
+    }
+    Ok(if changed && used_migration {
+        SyncOutcome::Migrated
+    } else if changed {
+        SyncOutcome::Applied
+    } else {
+        SyncOutcome::Unchanged
+    })
+}
+
+pub(in crate::api::instance) async fn sync_instance_with_state(
+    metadata: &InstanceMetadata,
+    state: &State,
+    reason: SyncReason,
+) -> crate::Result<()> {
+    sync_instance_options(metadata, state, reason, true).await?;
+    Ok(())
+}
+
+pub(super) async fn sync_other_participating_instances(
+    state: &State,
+    excluded_instance_id: Option<&str>,
+) -> SaveGameSettingsResult {
+    let mut result = SaveGameSettingsResult {
+        state: None,
+        applied: 0,
+        migrated: 0,
+        deferred: 0,
+        unsupported: 0,
+        failed: 0,
+        conflicts: Vec::new(),
+    };
+    match game_options_sync_is_enabled(&state.pool).await {
+        Ok(true) => {}
+        Ok(false) => return result,
+        Err(error) => {
+            tracing::warn!(
+                "Failed to inspect global game-options state before fan-out: {error}"
+            );
+            result.failed += 1;
+            return result;
+        }
+    }
+    let instances = match crate::state::list_instances(&state.pool).await {
+        Ok(instances) => instances,
+        Err(error) => {
+            tracing::warn!(
+                "Failed to list instances for game-options fan-out: {error}"
+            );
+            result.failed += 1;
+            return result;
+        }
+    };
+    for metadata in instances {
+        if excluded_instance_id == Some(metadata.instance.id.as_str())
+            || !metadata.synced_options.game_options
+        {
+            continue;
+        }
+        match sync_instance_options(&metadata, state, SyncReason::Normal, true)
+            .await
+        {
+            Ok(SyncOutcome::Applied | SyncOutcome::Unchanged) => {
+                result.applied += 1
+            }
+            Ok(SyncOutcome::Migrated) => result.migrated += 1,
+            Ok(SyncOutcome::Deferred | SyncOutcome::WaitingForFile) => {
+                result.deferred += 1
+            }
+            Err(error) => {
+                tracing::warn!(
+                    "Failed to project synced game options into {}: {error}",
+                    metadata.instance.id
+                );
+                result.failed += 1;
+            }
+        }
+    }
+    result
+}
+
+pub(super) async fn sync_all_participating_instances(
+    state: &State,
+) -> SaveGameSettingsResult {
+    sync_other_participating_instances(state, None).await
+}
diff --git a/packages/app-lib/src/api/instance/synced_options/files.rs b/packages/app-lib/src/api/instance/synced_options/files.rs
index 92c457894b..23ff80fc41 100644
--- a/packages/app-lib/src/api/instance/synced_options/files.rs
+++ b/packages/app-lib/src/api/instance/synced_options/files.rs
@@ -87,6 +87,7 @@ pub(in crate::api::instance) fn instance_option_enabled(
     option: SyncedOption,
 ) -> bool {
     match option {
+        SyncedOption::GameOptions => metadata.synced_options.game_options,
         SyncedOption::CommandHistory => metadata.synced_options.command_history,
         SyncedOption::MultiplayerServers => {
             metadata.synced_options.multiplayer_servers
@@ -217,6 +218,28 @@ pub(in crate::api::instance) async fn finish_checkpoint(
     Ok(())
 }
 
+pub(in crate::api::instance) async fn finish_plain_checkpoint(
+    instance_id: &str,
+    option: SyncedOption,
+    variant: &str,
+    state: &State,
+) -> crate::Result<()> {
+    let option_name = option.as_str();
+    sqlx::query!(
+        "
+		UPDATE instance_sync_checkpoints
+		SET status = 'ready', link_mode = NULL
+		WHERE instance_id = ? AND feature = ? AND variant = ?
+		",
+        instance_id,
+        option_name,
+        variant,
+    )
+    .execute(&state.pool)
+    .await?;
+    Ok(())
+}
+
 pub(in crate::api::instance) async fn checkpoint(
     instance_id: &str,
     option: SyncedOption,
diff --git a/packages/app-lib/src/api/instance/synced_options/mod.rs b/packages/app-lib/src/api/instance/synced_options/mod.rs
index c5862f0b55..fa550b2d3f 100644
--- a/packages/app-lib/src/api/instance/synced_options/mod.rs
+++ b/packages/app-lib/src/api/instance/synced_options/mod.rs
@@ -8,9 +8,10 @@ const HOTBAR_FILE: &str = "hotbar.nbt";
 
 pub use self::command_history::{get_command_history, set_command_history};
 pub(super) use self::files::{
-    CheckpointStatus, checkpoint, detach_link, ensure_link, finish_checkpoint,
-    instance_dir, instance_is_running, instance_option_enabled, nbt_from_bytes,
-    nbt_to_bytes, read_nbt_file, safe_instance_id, sha1_bytes, sha1_file,
+    CheckpointStatus, begin_checkpoint, checkpoint, detach_link, ensure_link,
+    finish_checkpoint, finish_plain_checkpoint, instance_dir,
+    instance_is_running, instance_option_enabled, nbt_from_bytes, nbt_to_bytes,
+    read_nbt_file, safe_instance_id, sha1_bytes, sha1_file,
     sync_files_are_protected,
 };
 pub(super) use self::orchestration::instance_option_supported;
@@ -24,5 +25,5 @@ pub use self::orchestration::{
 };
 pub(crate) use self::orchestration::{
     monitor_persisted_processes, prepare_instance_update,
-    remove_generated_instance_files,
+    reconcile_instance_after_pack_update, remove_generated_instance_files,
 };
diff --git a/packages/app-lib/src/api/instance/synced_options/orchestration.rs b/packages/app-lib/src/api/instance/synced_options/orchestration.rs
index 32888467e4..5fb15ebc12 100644
--- a/packages/app-lib/src/api/instance/synced_options/orchestration.rs
+++ b/packages/app-lib/src/api/instance/synced_options/orchestration.rs
@@ -50,6 +50,7 @@ pub enum SyncedOptionJoinResolution {
 
 #[derive(Clone, Copy, Debug, Default, Serialize, Deserialize)]
 pub struct GlobalSyncedOptions {
+    pub game_options: bool,
     pub command_history: bool,
     pub multiplayer_servers: bool,
     pub creative_hotbars: bool,
@@ -59,6 +60,7 @@ pub struct GlobalSyncedOptions {
 impl GlobalSyncedOptions {
     pub fn get(self, option: SyncedOption) -> bool {
         match option {
+            SyncedOption::GameOptions => self.game_options,
             SyncedOption::CommandHistory => self.command_history,
             SyncedOption::MultiplayerServers => self.multiplayer_servers,
             SyncedOption::CreativeHotbars => self.creative_hotbars,
@@ -68,6 +70,7 @@ impl GlobalSyncedOptions {
 
     fn set(&mut self, option: SyncedOption, enabled: bool) {
         match option {
+            SyncedOption::GameOptions => self.game_options = enabled,
             SyncedOption::CommandHistory => self.command_history = enabled,
             SyncedOption::MultiplayerServers => {
                 self.multiplayer_servers = enabled
@@ -223,7 +226,7 @@ async fn version_capability(
     option: SyncedOption,
     state: &State,
 ) -> CapabilityStatus {
-    if option == SyncedOption::Screenshots {
+    if matches!(option, SyncedOption::GameOptions | SyncedOption::Screenshots) {
         return CapabilityStatus::Supported;
     }
 
@@ -237,6 +240,7 @@ async fn version_capability(
 		);
     };
     let cutoff_id = match option {
+        SyncedOption::GameOptions => unreachable!(),
         // Mojang's manifest does not include Beta 1.8 Pre-release as a
         // separate entry, so b1.8 is the first resolvable version at that
         // boundary.
@@ -270,6 +274,7 @@ async fn version_capability(
 
     CapabilityStatus::Unsupported(
 		match option {
+			SyncedOption::GameOptions => unreachable!(),
 			SyncedOption::MultiplayerServers => {
 				"Multiplayer server syncing requires Minecraft Beta 1.8 Pre-release or newer."
 			}
@@ -292,42 +297,103 @@ pub async fn set_global_option(
 ) -> crate::Result<GlobalSyncedOptions> {
     let state = State::get().await?;
     let _guard = state.lock_synced_options().await;
+    let was_enabled = get_global_options_with_state(&state).await?.get(option);
 
-    if enabled && option != SyncedOption::Screenshots {
+    if enabled && !was_enabled && option != SyncedOption::Screenshots {
         let base_instance_id = base_instance_id.ok_or_else(|| {
             ErrorKind::InputError(
                 "Choose an instance to use as the sync source.".to_string(),
             )
         })?;
-        return enable_global_option_from_base(
-            option,
-            base_instance_id,
-            &state,
-        )
-        .await;
+        if option == SyncedOption::GameOptions {
+            let source = crate::state::get_instance(
+                base_instance_id,
+                &state.pool,
+            )
+            .await?
+            .ok_or_else(|| {
+                ErrorKind::InputError(
+                    "Unknown sync source instance.".to_string(),
+                )
+            })?;
+            if sync_files_are_protected(&source)
+                || instance_is_running(&source, &state).await?
+            {
+                return Err(ErrorKind::InputError(
+                    "Close the source instance before using it for syncing."
+                        .to_string(),
+                )
+                .into());
+            }
+            match capability_status(&source, option, true, &state).await {
+                CapabilityStatus::Supported => {}
+                CapabilityStatus::Unsupported(reason)
+                | CapabilityStatus::Indeterminate(reason) => {
+                    return Err(ErrorKind::InputError(reason).into());
+                }
+            }
+            seed_from_instance(&source, option, &state).await?;
+        } else {
+            return enable_global_option_from_base(
+                option,
+                base_instance_id,
+                &state,
+            )
+            .await;
+        }
     }
 
-    set_global_option_enabled(option, enabled, &state).await?;
+    if !(enabled && !was_enabled && option == SyncedOption::GameOptions) {
+        set_global_option_enabled(option, enabled, &state).await?;
+    }
 
-    let instances = crate::state::list_instances(&state.pool).await?;
-    for metadata in instances {
-        if sync_files_are_protected(&metadata)
-            || instance_is_running(&metadata, &state).await?
-        {
-            continue;
+    let instances = match crate::state::list_instances(&state.pool).await {
+        Ok(instances) => instances,
+        Err(error) if option == SyncedOption::GameOptions => {
+            tracing::warn!(
+                "Game-settings sync changed, but participating instances could not be listed yet: {error}"
+            );
+            return get_global_options_with_state(&state).await;
         }
-        if !instance_option_enabled(&metadata, option) {
-            detach_option(&metadata, option, &state).await?;
+        Err(error) => return Err(error),
+    };
+    for metadata in instances {
+        let running = match instance_is_running(&metadata, &state).await {
+            Ok(running) => running,
+            Err(error) if option == SyncedOption::GameOptions => {
+                tracing::warn!(
+                    "Game-settings sync changed, but {} could not be inspected yet: {error}",
+                    metadata.instance.id
+                );
+                continue;
+            }
+            Err(error) => return Err(error),
+        };
+        if sync_files_are_protected(&metadata) || running {
             continue;
         }
-        match capability_status(&metadata, option, enabled, &state).await {
-            CapabilityStatus::Supported => {
-                reconcile_option(&metadata, option, &state).await?
+        let result = if !instance_option_enabled(&metadata, option) {
+            detach_option(&metadata, option, &state).await
+        } else {
+            match capability_status(&metadata, option, enabled, &state).await {
+                CapabilityStatus::Supported => {
+                    reconcile_option(&metadata, option, &state).await
+                }
+                CapabilityStatus::Unsupported(_) => {
+                    detach_option(&metadata, option, &state).await
+                }
+                CapabilityStatus::Indeterminate(_) => Ok(()),
             }
-            CapabilityStatus::Unsupported(_) => {
-                detach_option(&metadata, option, &state).await?
+        };
+        if let Err(error) = result {
+            if option == SyncedOption::GameOptions {
+                tracing::warn!(
+                    "Game-settings sync changed, but {} could not be reconciled yet: {error}",
+                    metadata.instance.id
+                );
+                continue;
             }
-            CapabilityStatus::Indeterminate(_) => {}
+            return Err(error);
         }
     }
 
@@ -451,7 +517,8 @@ pub async fn set_instance_option(
     let metadata = crate::state::get_instance(instance_id, &state.pool)
         .await?
         .ok_or_else(|| ErrorKind::InputError("Unknown instance".to_string()))?;
-    if instance_option_enabled(&metadata, option) == enabled {
+    let previous_enabled = instance_option_enabled(&metadata, option);
+    if previous_enabled == enabled {
         return Ok(metadata);
     }
     let global = get_global_options_with_state(&state).await?;
@@ -504,7 +571,9 @@ pub async fn set_instance_option(
                     )
                     .await?;
                 }
-                SyncedOption::CreativeHotbars | SyncedOption::Screenshots => {
+                SyncedOption::GameOptions
+                | SyncedOption::CreativeHotbars
+                | SyncedOption::Screenshots => {
                     unreachable!()
                 }
             },
@@ -527,10 +596,28 @@ pub async fn set_instance_option(
     )
     .await?;
     if can_reconcile {
-        if enabled {
-            ensure_option(&metadata, option, &state).await?;
+        let result = if enabled {
+            ensure_option(&metadata, option, &state).await
         } else {
-            detach_option(&metadata, option, &state).await?;
+            detach_option(&metadata, option, &state).await
+        };
+        if let Err(error) = result {
+            if option == SyncedOption::GameOptions {
+                if let Err(rollback_error) =
+                    instance_rows::set_instance_sync_preference(
+                        instance_id,
+                        option,
+                        previous_enabled,
+                        &state.pool,
+                    )
+                    .await
+                {
+                    tracing::error!(
+                        "Failed to roll back the game-settings sync preference for {instance_id}: {rollback_error}"
+                    );
+                }
+            }
+            return Err(error);
         }
     }
 
@@ -584,6 +671,7 @@ async fn instance_option_join_action(
         return Ok(SyncedOptionJoinAction::SeedShared);
     }
     Ok(match option {
+        SyncedOption::GameOptions => SyncedOptionJoinAction::Attach,
         SyncedOption::CommandHistory | SyncedOption::MultiplayerServers => {
             SyncedOptionJoinAction::Merge
         }
@@ -605,7 +693,7 @@ pub async fn reconcile_all() -> crate::Result<()> {
     let instances = crate::state::list_instances(&state.pool).await?;
     for metadata in instances {
         if let Err(error) =
-            reconcile_instance_with_state(&metadata, &state).await
+            reconcile_instance_with_state(&metadata, &state, false).await
         {
             tracing::warn!(
                 "Failed to reconcile synced options for {}: {error}",
@@ -668,7 +756,18 @@ pub async fn reconcile_instance(instance_id: &str) -> crate::Result<()> {
     let metadata = crate::state::get_instance(instance_id, &state.pool)
         .await?
         .ok_or_else(|| ErrorKind::InputError("Unknown instance".to_string()))?;
-    reconcile_instance_with_state(&metadata, &state).await
+    reconcile_instance_with_state(&metadata, &state, false).await
+}
+
+pub(crate) async fn reconcile_instance_after_pack_update(
+    instance_id: &str,
+) -> crate::Result<()> {
+    let state = State::get().await?;
+    let _guard = state.lock_synced_options().await;
+    let metadata = crate::state::get_instance(instance_id, &state.pool)
+        .await?
+        .ok_or_else(|| ErrorKind::InputError("Unknown instance".to_string()))?;
+    reconcile_instance_with_state(&metadata, &state, true).await
 }
 
 pub(crate) async fn prepare_instance_update(
@@ -680,10 +779,24 @@ pub(crate) async fn prepare_instance_update(
         .await?
         .ok_or_else(|| ErrorKind::InputError("Unknown instance".to_string()))?;
     for option in [
+        SyncedOption::GameOptions,
         SyncedOption::CommandHistory,
         SyncedOption::CreativeHotbars,
         SyncedOption::MultiplayerServers,
     ] {
+        if option == SyncedOption::GameOptions {
+            if let Err(error) =
+                super::super::game_options::prepare_instance_update_with_state(
+                    &metadata, &state,
+                )
+                .await
+            {
+                tracing::warn!(
+                    "The modpack update will continue, but options.txt could not be prepared for game-settings sync: {error}"
+                );
+            }
+            continue;
+        }
         if instance_option_enabled(&metadata, option) {
             detach_option(&metadata, option, &state).await?;
         }
@@ -694,8 +807,9 @@ pub(crate) async fn prepare_instance_update(
 async fn reconcile_instance_with_state(
     metadata: &InstanceMetadata,
     state: &State,
+    allow_protected: bool,
 ) -> crate::Result<()> {
-    if sync_files_are_protected(metadata)
+    if (!allow_protected && sync_files_are_protected(metadata))
         || instance_is_running(metadata, state).await?
     {
         return Ok(());
@@ -710,7 +824,28 @@ async fn reconcile_instance_with_state(
             .await
         {
             CapabilityStatus::Supported => {
-                reconcile_option(metadata, option, state).await?
+                let result = if option == SyncedOption::GameOptions
+                    && allow_protected
+                {
+                    super::super::game_options::sync_instance_with_state(
+                        metadata,
+                        state,
+                        super::super::game_options::SyncReason::PackExtracted,
+                    )
+                    .await
+                } else {
+                    reconcile_option(metadata, option, state).await
+                };
+                if let Err(error) = result {
+                    if option == SyncedOption::GameOptions {
+                        tracing::warn!(
+                            "Game settings could not be reconciled for {}, continuing with the remaining synced options: {error}",
+                            metadata.instance.id
+                        );
+                    } else {
+                        return Err(error);
+                    }
+                }
             }
             CapabilityStatus::Unsupported(_) => {
                 detach_option(metadata, option, state).await?
@@ -727,6 +862,14 @@ async fn reconcile_option(
     state: &State,
 ) -> crate::Result<()> {
     match option {
+        SyncedOption::GameOptions => {
+            super::super::game_options::sync_instance_with_state(
+                metadata,
+                state,
+                super::super::game_options::SyncReason::Normal,
+            )
+            .await
+        }
         SyncedOption::CommandHistory => {
             reconcile_command_history(metadata, state).await
         }
@@ -753,6 +896,19 @@ pub async fn reconcile_changed_file(
         return Ok(());
     }
     match file_name {
+        "options.txt" => {
+            if option_effective(&metadata, SyncedOption::GameOptions, &state)
+                .await?
+            {
+                super::super::game_options::sync_instance_with_state(
+                    &metadata,
+                    &state,
+                    super::super::game_options::SyncReason::Normal,
+                )
+                .await?;
+            }
+            Ok(())
+        }
         COMMAND_HISTORY_FILE => {
             reconcile_command_history(&metadata, &state).await
         }
@@ -812,6 +968,7 @@ async fn backup_instance_option_file(
 ) -> crate::Result<()> {
     let directory = instance_dir(metadata, state);
     let path = match option {
+        SyncedOption::GameOptions => directory.join("options.txt"),
         SyncedOption::CommandHistory => directory.join(COMMAND_HISTORY_FILE),
         SyncedOption::CreativeHotbars => directory.join(HOTBAR_FILE),
         SyncedOption::MultiplayerServers => directory.join("servers.dat"),
@@ -860,6 +1017,12 @@ pub(super) async fn seed_from_instance(
     create_synced_directories(state).await?;
     let instance_dir = instance_dir(metadata, state);
     match option {
+        SyncedOption::GameOptions => {
+            super::super::game_options::initialize_from_source_instance(
+                metadata, state,
+            )
+            .await?;
+        }
         SyncedOption::CommandHistory => {
             let path = instance_dir.join(COMMAND_HISTORY_FILE);
             let contents = if path.exists() {
@@ -913,6 +1076,14 @@ async fn ensure_option(
     state: &State,
 ) -> crate::Result<()> {
     match option {
+        SyncedOption::GameOptions => {
+            super::super::game_options::sync_instance_with_state(
+                metadata,
+                state,
+                super::super::game_options::SyncReason::Normal,
+            )
+            .await
+        }
         SyncedOption::CommandHistory => {
             ensure_command_history(metadata, state).await
         }
@@ -931,6 +1102,9 @@ async fn detach_option(
 ) -> crate::Result<()> {
     let instance_dir = instance_dir(metadata, state);
     match option {
+        SyncedOption::GameOptions => {
+            super::super::game_options::detach_instance(metadata, state).await
+        }
         SyncedOption::CommandHistory => {
             detach_link(
                 &command_history_path(state),
@@ -960,6 +1134,9 @@ async fn canonical_exists(
     state: &State,
 ) -> crate::Result<bool> {
     Ok(match option {
+        SyncedOption::GameOptions => {
+            super::super::game_options::canonical_exists(state).await?
+        }
         SyncedOption::CommandHistory => command_history_path(state).exists(),
         SyncedOption::CreativeHotbars => hotbar_state_exists(state).await?,
         SyncedOption::MultiplayerServers => {
@@ -997,6 +1174,7 @@ fn is_linked_server_project(link: &InstanceLink) -> bool {
 
 fn option_from_str(value: &str) -> Option<SyncedOption> {
     match value {
+        "game_options" => Some(SyncedOption::GameOptions),
         "command_history" => Some(SyncedOption::CommandHistory),
         "multiplayer_servers" => Some(SyncedOption::MultiplayerServers),
         "creative_hotbars" => Some(SyncedOption::CreativeHotbars),
diff --git a/packages/app-lib/src/api/pack/install_mrpack.rs b/packages/app-lib/src/api/pack/install_mrpack.rs
index c70b472113..0d2f1072a3 100644
--- a/packages/app-lib/src/api/pack/install_mrpack.rs
+++ b/packages/app-lib/src/api/pack/install_mrpack.rs
@@ -630,8 +630,6 @@ pub(crate) async fn install_zipped_mrpack_files_with_reporter(
         );
     }
 
-    crate::api::instance::prepare_instance_update(&instance_id).await?;
-
     set_instance_information(
         instance_id.clone(),
         &description,
@@ -957,6 +955,11 @@ pub(crate) async fn install_zipped_mrpack_files_with_reporter(
     )
     .await?;
 
+    let has_client_options_override =
+        zip_reader.file().entries().iter().any(|file| {
+            file.filename().as_str().unwrap_or_default()
+                == "client-overrides/options.txt"
+        });
     let override_file_entries = zip_reader
         .file()
         .entries()
@@ -964,10 +967,13 @@ pub(crate) async fn install_zipped_mrpack_files_with_reporter(
         .enumerate()
         .filter_map(|(index, file)| {
             let filename = file.filename().as_str().unwrap_or_default();
-            ((filename.starts_with("overrides/")
+            let is_override = (filename.starts_with("overrides/")
                 || filename.starts_with("client-overrides/"))
-                && !filename.ends_with('/'))
-            .then(|| (index, file.clone()))
+                && !filename.ends_with('/');
+            let shadowed_game_options = has_client_options_override
+                && filename == "overrides/options.txt";
+            (is_override && !shadowed_game_options)
+                .then(|| (index, file.clone()))
         })
         .collect::<Vec<_>>();
     let override_total_bytes = override_file_entries
@@ -979,6 +985,15 @@ pub(crate) async fn install_zipped_mrpack_files_with_reporter(
         filename == "overrides/servers.dat"
             || filename == "client-overrides/servers.dat"
     });
+    let game_options_override_source = if has_client_options_override {
+        Some("client_overrides")
+    } else if override_file_entries.iter().any(|(_, file)| {
+        file.filename().as_str().unwrap_or_default() == "overrides/options.txt"
+    }) {
+        Some("overrides")
+    } else {
+        None
+    };
     let progress = (override_total_bytes > 0).then_some(InstallProgress {
         current: 0,
         total: override_total_bytes,
@@ -1034,8 +1049,8 @@ pub(crate) async fn install_zipped_mrpack_files_with_reporter(
                 file.filename().as_str().unwrap().to_string(),
             )?;
         let relative_override_file_path = relative_override_file_path
-            .strip_prefix("overrides")
-            .or_else(|_| relative_override_file_path.strip_prefix("client-overrides"))
+			.strip_prefix("overrides")
+			.or_else(|_| relative_override_file_path.strip_prefix("client-overrides"))
             .map_err(|_| {
                 crate::Error::from(crate::ErrorKind::OtherError(
                     format!("Failed to strip override prefix from override file path: {relative_override_file_path}")
@@ -1141,7 +1156,17 @@ pub(crate) async fn install_zipped_mrpack_files_with_reporter(
         )
         .await?;
     }
-    crate::api::instance::reconcile_instance_synced_options(&instance_id)
+    if let Err(error) = crate::api::instance::capture_game_options_pack_base(
+        &instance_id,
+        game_options_override_source,
+    )
+    .await
+    {
+        tracing::warn!(
+            "The modpack was installed, but its options.txt could not be captured for game-settings sync: {error}"
+        );
+    }
+    crate::api::instance::reconcile_instance_after_pack_update(&instance_id)
         .await?;
 
     // If the icon doesn't exist, we expect icon.png to be a potential icon.
@@ -1299,8 +1324,11 @@ pub async fn remove_all_related_files(
             .map_err(|_| {
                 crate::Error::from(crate::ErrorKind::OtherError(
                     format!("Failed to strip override prefix from override file path: {relative_override_file_path}")
-                ))
-            })?;
+				))
+			})?;
+        if relative_override_file_path.as_str() == "options.txt" {
+            continue;
+        }
 
         // Remove this file if a corresponding one exists in the filesystem
         match io::remove_file(
diff --git a/packages/app-lib/src/install/runner.rs b/packages/app-lib/src/install/runner.rs
index 6eed6d2e71..54eabb0288 100644
--- a/packages/app-lib/src/install/runner.rs
+++ b/packages/app-lib/src/install/runner.rs
@@ -1021,6 +1021,7 @@ async fn run_request(
         } => {
             prepare_existing_rollback(job_state, state, &instance_id).await?;
             lock_existing_instance(&instance_id, state).await?;
+            crate::api::instance::prepare_instance_update(&instance_id).await?;
             let disabled_project_ids = remove_existing_pack_content(
                 job_id,
                 job_state,
diff --git a/packages/app-lib/src/install/shared_instance.rs b/packages/app-lib/src/install/shared_instance.rs
index 36cbbc1577..cb347d6494 100644
--- a/packages/app-lib/src/install/shared_instance.rs
+++ b/packages/app-lib/src/install/shared_instance.rs
@@ -225,6 +225,7 @@ pub(super) async fn apply_shared_instance_update(
     let plan = SharedInstanceApplyPlan::build(&metadata, data, state).await?;
 
     if plan.configuration_changed {
+        crate::api::instance::prepare_instance_update(instance_id).await?;
         remove_existing_shared_instance_content(instance_id, state).await?;
         Box::pin(apply_shared_instance_content(
             job_id,
@@ -234,6 +235,23 @@ pub(super) async fn apply_shared_instance_update(
             data,
         ))
         .await?;
+        if data.modpack.is_none() {
+            if let Err(error) =
+                crate::api::instance::capture_game_options_pack_base(
+                    instance_id,
+                    None,
+                )
+                .await
+            {
+                tracing::warn!(
+                    "The shared instance was updated, but its local options.txt could not be restored after removing the previous pack: {error}"
+                );
+            }
+            crate::api::instance::reconcile_instance_after_pack_update(
+                instance_id,
+            )
+            .await?;
+        }
         return Ok(());
     }
 
@@ -579,6 +597,14 @@ pub(super) async fn apply_shared_instance_content(
     .await?;
 
     if let Some(modpack) = data.modpack.clone() {
+        crate::api::instance::edit(
+            instance_id,
+            crate::state::EditInstance {
+                link: Some(shared_instance_link(Some(&modpack))),
+                ..Default::default()
+            },
+        )
+        .await?;
         let location = shared_instance_pack_location(modpack);
         update_progress(
             job_id,
diff --git a/packages/app-lib/src/launcher/mod.rs b/packages/app-lib/src/launcher/mod.rs
index 009edc06c3..1bb0fa0c83 100644
--- a/packages/app-lib/src/launcher/mod.rs
+++ b/packages/app-lib/src/launcher/mod.rs
@@ -25,9 +25,7 @@ use chrono::Utc;
 use daedalus as d;
 use daedalus::minecraft::{LoggingSide, RuleAction, VersionInfo};
 use daedalus::modded::{LoaderVersion, Manifest};
-use regex::Regex;
 use serde::Deserialize;
-use std::fmt::Write;
 use std::path::PathBuf;
 use tokio::process::Command;
 
@@ -1067,49 +1065,22 @@ pub async fn launch_minecraft(
 
     command.envs(env_args.iter().cloned());
 
-    // Overwrites the minecraft options.txt file with the settings from the profile
-    // Uses 'a:b' syntax which is not quite yaml
-    if !mc_set_options.is_empty() {
-        let options_path = instance_path.join("options.txt");
-
-        let (mut options_string, input_encoding) = if options_path.exists() {
-            io::read_any_encoding_to_string(&options_path).await?
-        } else {
-            (String::new(), encoding_rs::UTF_8)
-        };
-
-        // UTF-16 encodings may be successfully detected and read, but we cannot encode
-        // them back, and it's technically possible that the game client strongly expects
-        // such encoding
-        if input_encoding != input_encoding.output_encoding() {
-            return Err(crate::ErrorKind::LauncherError(format!(
-                "The instance options.txt file uses an unsupported encoding: {}. \
-                Please either turn off instance options that need to modify this file, \
-                or convert the file to an encoding that both the game and this app support, \
-                such as UTF-8.",
-                input_encoding.name()
-            ))
-            .into());
-        }
-
-        for (key, value) in mc_set_options {
-            let re = Regex::new(&format!(r"(?m)^{}:.*$", regex::escape(key)))?;
-            // check if the regex exists in the file
-            if !re.is_match(&options_string) {
-                // The key was not found in the file, so append it
-                write!(&mut options_string, "\n{key}:{value}").unwrap();
-            } else {
-                let replaced_string = re
-                    .replace_all(&options_string, &format!("{key}:{value}"))
-                    .to_string();
-                options_string = replaced_string;
-            }
-        }
-
-        io::write(&options_path, input_encoding.encode(&options_string).0)
-            .await?;
+    if let Err(error) =
+        crate::api::instance::sync_game_options_before_launch(&instance.id)
+            .await
+    {
+        tracing::warn!(
+            "Failed to reconcile game options before launching {}: {error}",
+            instance.id
+        );
     }
 
+    crate::api::instance::apply_game_options_launcher_overrides(
+        &instance.id,
+        mc_set_options,
+    )
+    .await?;
+
     crate::state::instances::commands::set_instance_last_played(
         &instance.id,
         Utc::now(),
diff --git a/packages/app-lib/src/state/instances/adapters/sqlite/instance_rows.rs b/packages/app-lib/src/state/instances/adapters/sqlite/instance_rows.rs
index 2cc2c3007e..a311c83034 100644
--- a/packages/app-lib/src/state/instances/adapters/sqlite/instance_rows.rs
+++ b/packages/app-lib/src/state/instances/adapters/sqlite/instance_rows.rs
@@ -528,6 +528,7 @@ pub(crate) async fn get_instance_sync_preferences(
     .collect::<HashSet<_>>();
 
     Ok(InstanceSyncedOptions {
+        game_options: enabled_features.contains("game_options"),
         command_history: enabled_features.contains("command_history"),
         multiplayer_servers: enabled_features.contains("multiplayer_servers"),
         creative_hotbars: enabled_features.contains("creative_hotbars"),
@@ -555,6 +556,7 @@ async fn attach_sync_preferences(
             .filter(|row| row.instance_id == record.instance.id)
         {
             match row.feature.as_str() {
+                "game_options" => record.synced_options.game_options = true,
                 "command_history" => {
                     record.synced_options.command_history = true
                 }
diff --git a/packages/app-lib/src/state/instances/commands/game_options.rs b/packages/app-lib/src/state/instances/commands/game_options.rs
new file mode 100644
index 0000000000..c75692f416
--- /dev/null
+++ b/packages/app-lib/src/state/instances/commands/game_options.rs
@@ -0,0 +1,136 @@
+use crate::state::{GameOptionKind, StoredOption, StoredPreference};
+use sqlx::SqlitePool;
+use std::collections::HashMap;
+
+/// Returns whether an instance has supplied the first set of shared values.
+///
+/// The values are kept when sync is turned off, so this is separate from checking
+/// whether sync is currently enabled.
+pub(crate) async fn shared_game_options_exist(
+    pool: &SqlitePool,
+) -> crate::Result<bool> {
+    let exists = sqlx::query_scalar!(
+        r#"
+		SELECT EXISTS(
+			SELECT 1 FROM synced_game_option_state WHERE singleton = 1
+		) AS "exists!: bool"
+		"#,
+    )
+    .fetch_one(pool)
+    .await?;
+    Ok(exists)
+}
+
+/// Returns whether game-settings sync is enabled for the app.
+pub(crate) async fn game_options_sync_is_enabled(
+    pool: &SqlitePool,
+) -> crate::Result<bool> {
+    let enabled = sqlx::query_scalar!(
+        r#"
+		SELECT globally_enabled AS "globally_enabled!: bool"
+		FROM sync_feature_settings
+		WHERE feature = 'game_options'
+		"#,
+    )
+    .fetch_optional(pool)
+    .await?
+    .unwrap_or(false);
+    Ok(enabled)
+}
+
+/// Loads two version numbers: one for the shared values and one for the list of
+/// Minecraft settings Modrinth knows how to sync.
+///
+/// If the code contains a newer list than the database remembers, use the newer
+/// version without writing to the database just to update this number.
+pub(crate) async fn load_game_options_sync_state(
+    pool: &SqlitePool,
+    current_catalog_revision: u32,
+) -> crate::Result<(u64, u32)> {
+    let row = sqlx::query!(
+        r#"
+		SELECT revision AS "revision!: i64",
+			catalog_revision AS "catalog_revision!: i64"
+		FROM synced_game_option_state
+		WHERE singleton = 1
+		"#,
+    )
+    .fetch_optional(pool)
+    .await?;
+    Ok(row
+        .map(|row| {
+            (
+                row.revision.max(0) as u64,
+                (row.catalog_revision.max(1) as u32)
+                    .max(current_catalog_revision),
+            )
+        })
+        .unwrap_or((0, current_catalog_revision)))
+}
+
+/// Loads every shared setting, including ones that are currently turned off or
+/// belong to mods that are not installed in any synced instance right now.
+pub(crate) async fn load_shared_game_options(
+    pool: &SqlitePool,
+) -> crate::Result<HashMap<String, StoredOption>> {
+    let rows = sqlx::query!(
+        r#"
+		SELECT option_id, kind, raw_key, canonical_value_json,
+			seeded AS "seeded!: bool", revision AS "revision!: i64"
+		FROM synced_game_option_values
+		"#,
+    )
+    .fetch_all(pool)
+    .await?;
+    let mut values = HashMap::with_capacity(rows.len());
+    for row in rows {
+        let value = row
+            .canonical_value_json
+            .as_deref()
+            .map(serde_json::from_str)
+            .transpose()?;
+        values.insert(
+            row.option_id.clone(),
+            StoredOption {
+                option_id: row.option_id,
+                kind: if row.kind == "external" {
+                    GameOptionKind::External
+                } else {
+                    GameOptionKind::Vanilla
+                },
+                raw_key: row.raw_key,
+                value,
+                seeded: row.seeded,
+                revision: row.revision.max(0) as u64,
+            },
+        );
+    }
+    Ok(values)
+}
+
+/// Loads whether sync is turned on for each setting.
+pub(crate) async fn load_game_option_preferences(
+    pool: &SqlitePool,
+) -> crate::Result<HashMap<String, StoredPreference>> {
+    let rows = sqlx::query!(
+        r#"
+		SELECT option_id, enabled AS "enabled!: bool",
+			revision AS "revision!: i64"
+		FROM synced_game_option_preferences
+		"#,
+    )
+    .fetch_all(pool)
+    .await?;
+    Ok(rows
+        .into_iter()
+        .map(|row| {
+            (
+                row.option_id,
+                StoredPreference {
+                    enabled: row.enabled,
+                    revision: row.revision.max(0) as u64,
+                },
+            )
+        })
+        .collect())
+}
diff --git a/packages/app-lib/src/state/instances/commands/mod.rs b/packages/app-lib/src/state/instances/commands/mod.rs
index c6a01bf927..6b1c893ff3 100644
--- a/packages/app-lib/src/state/instances/commands/mod.rs
+++ b/packages/app-lib/src/state/instances/commands/mod.rs
@@ -14,6 +14,9 @@ pub(crate) use self::get_instance::{
     get_instance, get_instance_metadata, get_instances_metadata, list_instances,
 };
 
+mod game_options;
+pub(crate) use self::game_options::*;
+
 mod list_content;
 pub(crate) use self::list_content::{
     dependencies_to_content_items, get_content_projects,
diff --git a/packages/app-lib/src/state/instances/mod.rs b/packages/app-lib/src/state/instances/mod.rs
index 3be87083a7..9e6f48cc94 100644
--- a/packages/app-lib/src/state/instances/mod.rs
+++ b/packages/app-lib/src/state/instances/mod.rs
@@ -3,6 +3,10 @@ pub use self::content::*;
 
 mod model;
 pub use self::model::*;
+pub(crate) use self::model::{
+    GameOptionsProjection, ProjectedField, ProjectionOrigin, StoredOption,
+    StoredPreference,
+};
 
 pub(crate) mod adapters;
 pub(crate) mod commands;
@@ -24,4 +28,9 @@ pub(crate) use self::commands::{
     get_linked_modpack_info, list_content, list_content_sets,
     list_linked_modpack_content, refresh_content_updates, sync_content_files,
 };
+pub(crate) use self::commands::{
+    game_options_sync_is_enabled, load_game_option_preferences,
+    load_game_options_sync_state, load_shared_game_options,
+    shared_game_options_exist,
+};
 pub(crate) mod watcher;
diff --git a/packages/app-lib/src/state/instances/model/game_options.rs b/packages/app-lib/src/state/instances/model/game_options.rs
new file mode 100644
index 0000000000..bbc38449d3
--- /dev/null
+++ b/packages/app-lib/src/state/instances/model/game_options.rs
@@ -0,0 +1,93 @@
+use serde::{Deserialize, Serialize};
+
+/// The value shared between instances for one Minecraft setting.
+///
+/// Minecraft versions sometimes store the same setting in different ways. We
+/// convert those formats into one of these values before syncing them.
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(tag = "type", content = "value", rename_all = "snake_case")]
+pub enum CanonicalValue {
+    Bool(bool),
+    Integer(i64),
+    Decimal(String),
+    Enum(String),
+    Text(String),
+    StringList(Vec<String>),
+    KeyBinding(String),
+    ExternalRaw(String),
+}
+
+impl CanonicalValue {
+    pub(crate) fn type_name(&self) -> &'static str {
+        match self {
+            Self::Bool(_) => "bool",
+            Self::Integer(_) => "integer",
+            Self::Decimal(_) => "decimal",
+            Self::Enum(_) => "enum",
+            Self::Text(_) => "text",
+            Self::StringList(_) => "string_list",
+            Self::KeyBinding(_) => "key_binding",
+            Self::ExternalRaw(_) => "external_raw",
+        }
+    }
+}
+
+/// Whether a setting comes from Minecraft itself or was added by a mod.
+#[derive(Clone, Copy, Debug, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
+pub enum GameOptionKind {
+    Vanilla,
+    External,
+}
+
+/// A shared game setting loaded from the database.
+#[derive(Clone)]
+pub(crate) struct StoredOption {
+    pub(crate) option_id: String,
+    pub(crate) kind: GameOptionKind,
+    pub(crate) raw_key: Option<String>,
+    pub(crate) value: Option<CanonicalValue>,
+    pub(crate) seeded: bool,
+    pub(crate) revision: u64,
+}
+
+/// Whether the user chose to sync this setting.
+///
+/// This is stored separately so turning sync off does not forget its value.
+#[derive(Clone)]
+pub(crate) struct StoredPreference {
+    pub(crate) enabled: bool,
+    pub(crate) revision: u64,
+}
+
+/// A snapshot of the settings Modrinth last wrote to an instance's `options.txt`.
+///
+/// On the next sync, we compare the file with this snapshot to find changes the
+/// player made in Minecraft.
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub(crate) struct GameOptionsProjection {
+    pub(crate) schema_version: u32,
+    pub(crate) target_game_version: String,
+    pub(crate) input_sha1: String,
+    pub(crate) canonical_revision: u64,
+    pub(crate) fields: Vec<ProjectedField>,
+}
+
+/// One setting from the last-written snapshot, using its actual file key and value.
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub(crate) struct ProjectedField {
+    pub(crate) option_id: String,
+    pub(crate) physical_key: String,
+    pub(crate) raw_value: String,
+    pub(crate) origin: ProjectionOrigin,
+    #[serde(default)]
+    pub(crate) migrated: bool,
+}
+
+/// Why Modrinth wrote a setting to `options.txt`.
+#[derive(Clone, Copy, Debug, Eq, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
+pub(crate) enum ProjectionOrigin {
+    Shared,
+    LauncherOverride,
+}
diff --git a/packages/app-lib/src/state/instances/model/instance.rs b/packages/app-lib/src/state/instances/model/instance.rs
index 8c2f157e6c..81e836a942 100644
--- a/packages/app-lib/src/state/instances/model/instance.rs
+++ b/packages/app-lib/src/state/instances/model/instance.rs
@@ -27,6 +27,8 @@ pub struct InstanceIconConfig {
     Clone, Copy, Debug, Default, Eq, PartialEq, Serialize, Deserialize,
 )]
 pub struct InstanceSyncedOptions {
+    #[serde(default)]
+    pub game_options: bool,
     pub command_history: bool,
     pub multiplayer_servers: bool,
     pub creative_hotbars: bool,
@@ -36,6 +38,7 @@ pub struct InstanceSyncedOptions {
 #[derive(Clone, Copy, Debug, Eq, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "snake_case")]
 pub enum SyncedOption {
+    GameOptions,
     CommandHistory,
     MultiplayerServers,
     CreativeHotbars,
@@ -45,6 +48,7 @@ pub enum SyncedOption {
 impl SyncedOption {
     pub fn as_str(self) -> &'static str {
         match self {
+            Self::GameOptions => "game_options",
             Self::CommandHistory => "command_history",
             Self::MultiplayerServers => "multiplayer_servers",
             Self::CreativeHotbars => "creative_hotbars",
@@ -52,7 +56,8 @@ impl SyncedOption {
         }
     }
 
-    pub const ALL: [Self; 4] = [
+    pub const ALL: [Self; 5] = [
+        Self::GameOptions,
         Self::CommandHistory,
         Self::MultiplayerServers,
         Self::CreativeHotbars,
diff --git a/packages/app-lib/src/state/instances/model/mod.rs b/packages/app-lib/src/state/instances/model/mod.rs
index c505c5e6ca..9a049cc1b2 100644
--- a/packages/app-lib/src/state/instances/model/mod.rs
+++ b/packages/app-lib/src/state/instances/model/mod.rs
@@ -15,6 +15,13 @@ pub use self::content_set_sync_state::*;
 mod file;
 pub use self::file::*;
 
+mod game_options;
+pub use self::game_options::{CanonicalValue, GameOptionKind};
+pub(crate) use self::game_options::{
+    GameOptionsProjection, ProjectedField, ProjectionOrigin, StoredOption,
+    StoredPreference,
+};
+
 mod instance;
 pub use self::instance::*;
 
diff --git a/packages/app-lib/src/state/instances/watcher.rs b/packages/app-lib/src/state/instances/watcher.rs
index 02112f1ac0..3053d18add 100644
--- a/packages/app-lib/src/state/instances/watcher.rs
+++ b/packages/app-lib/src/state/instances/watcher.rs
@@ -8,7 +8,11 @@ use crate::state::{
 use crate::worlds::WorldType;
 use notify::{RecommendedWatcher, RecursiveMode};
 use notify_debouncer_mini::{DebounceEventResult, Debouncer, new_debouncer};
-use std::{collections::HashMap, sync::Arc, time::Duration};
+use std::{
+    collections::{HashMap, HashSet},
+    sync::Arc,
+    time::Duration,
+};
 use tokio::sync::{RwLock, mpsc::channel};
 
 use super::adapters::sqlite::instance_rows;
@@ -20,7 +24,7 @@ pub struct FileWatcher {
 
 pub async fn init_watcher() -> crate::Result<FileWatcher> {
     let (tx, mut rx) = channel(1);
-    let instance_ids = Arc::new(RwLock::new(HashMap::new()));
+    let instance_ids = Arc::new(RwLock::new(HashMap::<String, String>::new()));
     let event_instance_ids = instance_ids.clone();
 
     let file_watcher = new_debouncer(
@@ -41,6 +45,8 @@ pub async fn init_watcher() -> crate::Result<FileWatcher> {
                     let instance_ids = event_instance_ids.read().await;
                     let mut visited_instances = Vec::new();
                     let mut visited_screenshot_instances = Vec::new();
+                    let mut synced_option_files =
+                        HashMap::<String, HashSet<String>>::new();
 
                     for e in &events {
                         let mut instance_path = None;
@@ -76,6 +82,24 @@ pub async fn init_watcher() -> crate::Result<FileWatcher> {
                             let is_screenshot_event = first_file_name
                                 .as_ref()
                                 .is_some_and(|name| *name == "screenshots");
+                            if let Some(file_name) = first_file_name
+                                .as_ref()
+                                .and_then(|name| name.to_str())
+                                .filter(|name| {
+                                    matches!(
+                                        *name,
+                                        "command_history.txt"
+                                            | "hotbar.nbt"
+                                            | "options.txt"
+                                            | "servers.dat"
+                                    )
+                                })
+                            {
+                                synced_option_files
+                                    .entry(instance_id.clone())
+                                    .or_default()
+                                    .insert(file_name.to_owned());
+                            }
                             if first_file_name
                                 .as_ref()
                                 .is_some_and(|x| *x == "crash-reports")
@@ -169,18 +193,6 @@ pub async fn init_watcher() -> crate::Result<FileWatcher> {
                                                 },
                                             )
                                         });
-                                    let synced_option_file = first_file_name
-                                        .as_ref()
-                                        .and_then(|name| name.to_str())
-                                        .filter(|name| {
-                                            matches!(
-                                                *name,
-                                                "command_history.txt"
-                                                    | "hotbar.nbt"
-                                                    | "servers.dat"
-                                            )
-                                        })
-                                        .map(ToOwned::to_owned);
                                     tokio::spawn(async move {
                                         if sync_content
                                             && let Ok(state) =
@@ -196,18 +208,6 @@ pub async fn init_watcher() -> crate::Result<FileWatcher> {
                                                 "Failed to sync instance content after filesystem change: {error}"
                                             );
 										}
-                                        if let Some(file_name) = synced_option_file
-											&& let Err(error) =
-												crate::api::instance::reconcile_synced_option_file(
-													&emit_instance_id,
-													&file_name,
-												)
-												.await
-										{
-											tracing::error!(
-												"Failed to reconcile {file_name} after filesystem change: {error}"
-											);
-										}
                                         if reconcile_screenshots
                                             && let Err(error) =
                                                 crate::api::instance::reconcile_screenshots(
@@ -235,6 +235,24 @@ pub async fn init_watcher() -> crate::Result<FileWatcher> {
                             }
                         }
                     }
+
+                    for (instance_id, file_names) in synced_option_files {
+                        tokio::spawn(async move {
+                            for file_name in file_names {
+                                if let Err(error) =
+                                    crate::api::instance::reconcile_synced_option_file(
+                                        &instance_id,
+                                        &file_name,
+                                    )
+                                    .await
+                                {
+                                    tracing::error!(
+                                        "Failed to reconcile {file_name} after filesystem change: {error}"
+                                    );
+                                }
+                            }
+                        });
+                    }
                 }
                 Err(error) => tracing::warn!("Unable to watch file: {error}"),
             }
diff --git a/packages/app-lib/src/state/mod.rs b/packages/app-lib/src/state/mod.rs
index f0a186a2ca..e3d4843578 100644
--- a/packages/app-lib/src/state/mod.rs
+++ b/packages/app-lib/src/state/mod.rs
@@ -17,6 +17,15 @@ pub use self::instance_types::*;
 
 pub(crate) mod instances;
 pub use self::instances::*;
+pub(crate) use self::instances::{
+    GameOptionsProjection, ProjectedField, ProjectionOrigin, StoredOption,
+    StoredPreference,
+};
+pub(crate) use self::instances::{
+    game_options_sync_is_enabled, load_game_option_preferences,
+    load_game_options_sync_state, load_shared_game_options,
+    shared_game_options_exist,
+};
 
 mod settings;
 pub use self::settings::*;

From 8ae5918a695eccb07f808670116f6a43f78f00bf Mon Sep 17 00:00:00 2001
From: "Calum H. (IMB11)" <contact@cal.engineer>
Date: Tue, 1 Sep 2026 14:13:02 +0100
Subject: [PATCH 02/33] feat: qa

---
 .../instances/InstancesSyncedSettings.vue     | 101 ++---
 .../game-settings/GameKeybindInput.vue        | 242 ++++++++++
 .../game-settings/GameSettingRow.vue          | 188 ++++----
 .../game-settings/GameSettingsModal.vue       | 330 ++++++++------
 .../instances/game-settings/game-keybinds.ts  | 423 ++++++++++++++++++
 .../game-settings/game-setting-messages.ts    | 249 ++++-------
 ...80a97310f308b3aa25c322d499b32d549f7b7.json |  32 --
 ...21065f5e35f321954a9d5ae9cde907d5ce823.json |  38 --
 ...1be42650f58edf2045fe1b85d418a537382e2.json |  12 -
 packages/app-lib/src/api/instance.rs          |   4 +
 .../api/instance/game_options/fullscreen.rs   | 112 +++++
 .../instance/game_options/instance_support.rs |  55 +--
 .../instance/game_options/launch_overrides.rs |  12 +-
 .../src/api/instance/game_options/mod.rs      |   8 +-
 .../game_options/read_instance_changes.rs     |  14 +-
 .../instance/game_options/settings_editor.rs  |  11 +
 .../instance/game_options/source_selection.rs |  24 +-
 .../supported_settings/version_changes.rs     |  52 ++-
 .../game_options/supported_settings/video.rs  |   2 +-
 .../game_options/write_shared_settings.rs     |   6 +-
 packages/app-lib/src/api/instance/run.rs      |  15 +-
 packages/app-lib/src/api/settings.rs          |  47 +-
 packages/ui/src/components/base/Slider.vue    |   3 +-
 packages/ui/src/components/modal/NewModal.vue |  32 +-
 .../ui/src/components/modal/TabbedModal.vue   |  30 +-
 .../ui/src/stories/modal/NewModal.stories.ts  |   6 +-
 .../src/stories/modal/TabbedModal.stories.ts  |  33 ++
 27 files changed, 1496 insertions(+), 585 deletions(-)
 create mode 100644 apps/app-frontend/src/components/ui/settings/instances/game-settings/GameKeybindInput.vue
 create mode 100644 apps/app-frontend/src/components/ui/settings/instances/game-settings/game-keybinds.ts
 delete mode 100644 packages/app-lib/.sqlx/query-1fb66446c3ba0f52e682f8aae4b80a97310f308b3aa25c322d499b32d549f7b7.json
 delete mode 100644 packages/app-lib/.sqlx/query-6d7ebc0f233dc730fa8c99c750421065f5e35f321954a9d5ae9cde907d5ce823.json
 delete mode 100644 packages/app-lib/.sqlx/query-76896bb2061e4c839a53bed4a221be42650f58edf2045fe1b85d418a537382e2.json
 create mode 100644 packages/app-lib/src/api/instance/game_options/fullscreen.rs

diff --git a/apps/app-frontend/src/components/ui/settings/instances/InstancesSyncedSettings.vue b/apps/app-frontend/src/components/ui/settings/instances/InstancesSyncedSettings.vue
index eba48797c7..0bcc08d717 100644
--- a/apps/app-frontend/src/components/ui/settings/instances/InstancesSyncedSettings.vue
+++ b/apps/app-frontend/src/components/ui/settings/instances/InstancesSyncedSettings.vue
@@ -23,14 +23,10 @@ import {
 } from '@modrinth/ui'
 import { useMutation, useQuery, useQueryClient } from '@tanstack/vue-query'
 import type { Component } from 'vue'
-import { computed, ref, shallowRef, watch } from 'vue'
+import { computed, nextTick, ref, shallowRef, watch } from 'vue'
 
 import WorldItem from '@/components/ui/world/WorldItem.vue'
 import GameSettingsModal from '@/components/ui/settings/instances/game-settings/GameSettingsModal.vue'
-import {
-	formatSourceDisabledReason,
-	formatSourceSettingsSummary,
-} from '@/components/ui/settings/instances/game-settings/game-setting-messages'
 import useMemorySlider from '@/composables/useMemorySlider'
 import {
 	type GameOptionsSourceCandidate,
@@ -76,16 +72,15 @@ const messages = defineMessages({
 	// },
 	gameSettings: {
 		id: 'app.settings.synced-options.game-settings',
-		defaultMessage: 'Game settings',
+		defaultMessage: 'Sync game options',
 	},
 	gameSettingsDescription: {
 		id: 'app.settings.synced-options.game-settings.description',
-		defaultMessage:
-			'You can choose which options to sync across instances so they apply on top of a modpack’s options.txt.',
+		defaultMessage: 'Use the same graphics, keybinds, and other game settings across your instances',
 	},
 	gameSettingsButton: {
 		id: 'app.settings.synced-options.game-settings.button',
-		defaultMessage: 'Settings',
+		defaultMessage: 'Edit game settings',
 	},
 	gameSettingsDisabledTooltip: {
 		id: 'app.settings.synced-options.game-settings.disabled-tooltip',
@@ -133,8 +128,7 @@ const messages = defineMessages({
 	},
 	gameSettingsSyncSourceDescription: {
 		id: 'app.settings.synced-options.choose-sync-source.game-settings-description',
-		defaultMessage:
-			'Pick the instance whose options.txt values become the shared game settings baseline.',
+		defaultMessage: 'Choose which instance to copy game settings from.',
 	},
 	searchInstance: {
 		id: 'app.settings.synced-options.choose-sync-source.search-placeholder',
@@ -392,11 +386,7 @@ type BaseSourceCandidate = {
 	id: string
 	name: string
 	icon_path?: string | null
-	game_version?: string | null
 	eligible: boolean
-	disabled_reason?: GameOptionsSourceCandidate['disabled_reason']
-	recognized_setting_count?: number
-	custom_setting_count?: number
 }
 
 const syncedServerCards = computed(() =>
@@ -442,38 +432,18 @@ const filteredBaseInstances = computed(() => {
 					id: source.source_id,
 					name: source.name,
 					icon_path: source.icon_path,
-					game_version: source.game_version,
 					eligible: source.eligible,
-					disabled_reason: source.disabled_reason,
-					recognized_setting_count: source.recognized_setting_count,
-					custom_setting_count: source.custom_setting_count,
 				}))
 			: instances.value.map((instance) => ({
 					id: instance.id,
 					name: instance.name,
 					icon_path: instance.icon_path,
-					game_version: instance.game_version,
 					eligible: true,
 				}))
 	if (!search) return candidates
 	return candidates.filter((instance) => instance.name.toLowerCase().includes(search))
 })
 
-function baseSourceDescription(source: BaseSourceCandidate): string | null {
-	if (source.disabled_reason) {
-		return formatSourceDisabledReason(formatMessage, source.disabled_reason)
-	}
-	if (
-		source.recognized_setting_count === undefined ||
-		source.custom_setting_count === undefined
-	)
-		return null
-	return formatSourceSettingsSummary(formatMessage, {
-		recognized_setting_count: source.recognized_setting_count,
-		custom_setting_count: source.custom_setting_count,
-	})
-}
-
 async function invalidateSyncedOptions() {
 	await Promise.all([
 		queryClient.invalidateQueries({ queryKey: instanceKeys.all }),
@@ -514,7 +484,9 @@ const globalOptionMutation = useMutation({
 	},
 	onSuccess: async (options, { option, enabled }) => {
 		queryClient.setQueryData(globalSyncedOptionsQueryKey, options)
-		if (enabled) baseModal.value?.hide()
+		if (option === 'game_options') {
+			await refreshSettings()
+		}
 		if (enabled && option === 'multiplayer_servers') {
 			syncedServers.value = await list_synced_servers().catch((error) => {
 				handleError(error)
@@ -579,6 +551,8 @@ async function confirmBaseInstance() {
 			enabled: true,
 			baseInstanceId: baseInstanceId.value,
 		})
+		await nextTick()
+		baseModal.value?.hide()
 	} catch {
 		return
 	}
@@ -666,11 +640,32 @@ async function removeSyncedServer(serverId: string) {
 	}
 }
 
-const fetchSettings = await get()
-fetchSettings.launchArgs = fetchSettings.extra_launch_args.join(' ')
-fetchSettings.envVars = serializeEnvVars(fetchSettings.custom_env_vars)
+function addEditableSettingsFields(fetchSettings: Awaited<ReturnType<typeof get>>) {
+	return Object.assign(fetchSettings, {
+		launchArgs: fetchSettings.extra_launch_args.join(' '),
+		envVars: serializeEnvVars(fetchSettings.custom_env_vars),
+	})
+}
 
-const settings = ref(fetchSettings)
+const settings = ref(addEditableSettingsFields(await get()))
+let applyingFetchedSettings = false
+
+async function refreshSettings() {
+	try {
+		const refreshedSettings = addEditableSettingsFields(await get())
+		applyingFetchedSettings = true
+		settings.value = refreshedSettings
+		await nextTick()
+	} catch (error) {
+		handleError(error)
+	} finally {
+		applyingFetchedSettings = false
+	}
+}
+
+async function handleGameSettingsSaved() {
+	await Promise.all([invalidateSyncedOptions(), refreshSettings()])
+}
 
 const { maxMemory, snapPoints } = (await useMemorySlider().catch(handleError)) as unknown as {
 	maxMemory: number
@@ -680,6 +675,7 @@ const { maxMemory, snapPoints } = (await useMemorySlider().catch(handleError)) a
 watch(
 	settings,
 	async () => {
+		if (applyingFetchedSettings) return
 		const setSettings = JSON.parse(JSON.stringify(settings.value))
 
 		setSettings.extra_launch_args = setSettings.launchArgs.trim().split(/\s+/).filter(Boolean)
@@ -699,7 +695,7 @@ watch(
 
 <template>
 	<div>
-		<GameSettingsModal ref="gameSettingsModal" @saved="invalidateSyncedOptions" />
+		<GameSettingsModal ref="gameSettingsModal" @saved="handleGameSettingsSaved" />
 
 		<NewModal
 			ref="baseModal"
@@ -756,19 +752,7 @@ watch(
 								no-shadow
 							/>
 						</span>
-						<span class="flex min-w-0 flex-1 flex-col">
-							<span class="truncate">{{ instance.name }}</span>
-							<span
-								v-if="instance.game_version || baseSourceDescription(instance)"
-								class="truncate text-xs font-normal text-secondary"
-							>
-								<span v-if="instance.game_version">{{ instance.game_version }}</span>
-								<span v-if="instance.game_version && baseSourceDescription(instance)" aria-hidden="true">
-									·
-								</span>
-								<span v-if="baseSourceDescription(instance)">{{ baseSourceDescription(instance) }}</span>
-							</span>
-						</span>
+						<span class="min-w-0 flex-1 truncate">{{ instance.name }}</span>
 					</CheckCircleButton>
 				</div>
 			</div>
@@ -936,14 +920,15 @@ watch(
 								"
 								class="flex"
 							>
-								<Button
+								<IconButton
 									type="outlined"
-									size="sm"
+									circular
 									:disabled="!globalOptions.game_options || globalOptionMutation.isPending.value"
+									:label="formatMessage(messages.gameSettingsButton)"
 									@click="openGameSettings"
 								>
-									{{ formatMessage(messages.gameSettingsButton) }}
-								</Button>
+									<EditIcon />
+								</IconButton>
 							</span>
 							<span
 								v-else-if="row.editable"
diff --git a/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameKeybindInput.vue b/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameKeybindInput.vue
new file mode 100644
index 0000000000..bb166bc596
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameKeybindInput.vue
@@ -0,0 +1,242 @@
+<script setup lang="ts">
+import { TriangleAlertIcon } from '@modrinth/assets'
+import { Button, defineMessages, useVIntl } from '@modrinth/ui'
+import { computed, onBeforeUnmount, ref, useId } from 'vue'
+
+import {
+	activateKeybindRecording,
+	deactivateKeybindRecording,
+	formatMinecraftKeybind,
+	minecraftKeyTokenFromKeyboardEvent,
+	minecraftMouseTokenFromButton,
+} from './game-keybinds'
+
+const props = withDefaults(
+	defineProps<{
+		modelValue: string
+		settingLabel: string
+		conflicts?: string[]
+		mixed?: boolean
+		disabled?: boolean
+	}>(),
+	{
+		conflicts: () => [],
+		mixed: false,
+		disabled: false,
+	},
+)
+
+const emit = defineEmits<{
+	'update:model-value': [value: string]
+}>()
+
+const { formatMessage, locale } = useVIntl()
+const statusId = useId()
+const recording = ref(false)
+const statusMessage = ref('')
+const controlElement = ref<HTMLElement | null>(null)
+let suppressNextClick = false
+
+const messages = defineMessages({
+	listen: {
+		id: 'app.settings.game-options.keybind.listen',
+		defaultMessage: 'Press a key…',
+	},
+	choose: {
+		id: 'app.settings.game-options.keybind.choose',
+		defaultMessage: 'Choose a key',
+	},
+	mixed: {
+		id: 'app.settings.game-options.keybind.mixed',
+		defaultMessage: 'Different across instances',
+	},
+	change: {
+		id: 'app.settings.game-options.keybind.change',
+		defaultMessage: '{setting}: {binding}. Activate to change the binding.',
+	},
+	listeningStatus: {
+		id: 'app.settings.game-options.keybind.listening-status',
+		defaultMessage: 'Listening for a key or mouse button. Press Escape to clear this binding.',
+	},
+	unsupportedStatus: {
+		id: 'app.settings.game-options.keybind.unsupported-status',
+		defaultMessage: 'That input cannot be used by Minecraft. Press another key.',
+	},
+	cancelledStatus: {
+		id: 'app.settings.game-options.keybind.cancelled-status',
+		defaultMessage: 'Key binding change cancelled.',
+	},
+	assignedStatus: {
+		id: 'app.settings.game-options.keybind.assigned-status',
+		defaultMessage: '{setting} is now bound to {binding}.',
+	},
+	conflict: {
+		id: 'app.settings.game-options.keybind.conflict',
+		defaultMessage: 'This key is also used for {settings}.',
+	},
+})
+
+const isMac = /Mac|iPhone|iPad|iPod/.test(navigator.platform)
+const bindingLabel = computed(() => {
+	if (props.mixed) return formatMessage(messages.mixed)
+	if (!props.modelValue) return formatMessage(messages.choose)
+	return formatMinecraftKeybind(formatMessage, props.modelValue, isMac)
+})
+const visibleLabel = computed(() =>
+	recording.value ? formatMessage(messages.listen) : bindingLabel.value,
+)
+const conflictSettings = computed(() =>
+	new Intl.ListFormat(locale.value, { style: 'long', type: 'conjunction' }).format(props.conflicts),
+)
+const conflictMessage = computed(() =>
+	props.conflicts.length
+		? formatMessage(messages.conflict, { settings: conflictSettings.value })
+		: '',
+)
+const accessibleLabel = computed(() => {
+	if (recording.value) {
+		return `${props.settingLabel}. ${formatMessage(messages.listeningStatus)}`
+	}
+	const change = formatMessage(messages.change, {
+		setting: props.settingLabel,
+		binding: bindingLabel.value,
+	})
+	return conflictMessage.value ? `${change} ${conflictMessage.value}` : change
+})
+
+function startRecording() {
+	if (props.disabled || recording.value) return
+	activateKeybindRecording(cancelRecording)
+	recording.value = true
+	statusMessage.value = formatMessage(messages.listeningStatus)
+	window.addEventListener('keydown', handleKeydown, true)
+	window.addEventListener('pointerdown', handlePointerDown, true)
+}
+
+function stopRecording() {
+	recording.value = false
+	window.removeEventListener('keydown', handleKeydown, true)
+	window.removeEventListener('pointerdown', handlePointerDown, true)
+	deactivateKeybindRecording(cancelRecording)
+}
+
+function cancelRecording() {
+	if (!recording.value) return
+	stopRecording()
+	statusMessage.value = formatMessage(messages.cancelledStatus)
+}
+
+function assign(value: string) {
+	if (!recording.value) return
+	stopRecording()
+	emit('update:model-value', value)
+	statusMessage.value = formatMessage(messages.assignedStatus, {
+		setting: props.settingLabel,
+		binding: formatMinecraftKeybind(formatMessage, value, isMac),
+	})
+}
+
+function handleClick(event: MouseEvent) {
+	if (suppressNextClick) {
+		suppressNextClick = false
+		event.preventDefault()
+		event.stopPropagation()
+		return
+	}
+	startRecording()
+}
+
+function handleKeydown(event: KeyboardEvent) {
+	if (!recording.value) return
+
+	event.preventDefault()
+	event.stopPropagation()
+	if (event.code === 'Escape') {
+		assign('key.keyboard.unknown')
+		return
+	}
+	if (event.repeat) return
+
+	const token = event.isComposing ? null : minecraftKeyTokenFromKeyboardEvent(event)
+	if (!token) {
+		statusMessage.value = formatMessage(messages.unsupportedStatus)
+		return
+	}
+	assign(token)
+}
+
+function handlePointerDown(event: PointerEvent) {
+	if (!recording.value) return
+	if (event.pointerType !== 'mouse') return
+	const otherKeybindControl =
+		event.target instanceof Element
+			? event.target.closest<HTMLElement>('[data-game-keybind-control]')
+			: null
+	if (otherKeybindControl && otherKeybindControl !== controlElement.value) return
+
+	event.preventDefault()
+	event.stopPropagation()
+	const token = minecraftMouseTokenFromButton(event.button)
+	if (!token) {
+		statusMessage.value = formatMessage(messages.unsupportedStatus)
+		return
+	}
+	suppressNextClick = event.button === 0 && otherKeybindControl === controlElement.value
+	assign(token)
+}
+
+onBeforeUnmount(cancelRecording)
+</script>
+
+<template>
+	<div class="flex w-full min-w-0 items-center gap-1.5">
+		<span
+			ref="controlElement"
+			data-game-keybind-control
+			v-tooltip="!recording && conflictMessage ? conflictMessage : undefined"
+			class="flex min-w-0 flex-1"
+		>
+			<Button
+				type="base"
+				size="lg"
+				:disabled="disabled"
+				:aria-label="accessibleLabel"
+				:aria-describedby="recording ? statusId : undefined"
+				class="keybind-button !w-full overflow-hidden"
+				:class="{
+					'!bg-brand-highlight !text-brand !shadow-[inset_0_0_0_1px_var(--color-brand)]':
+						recording,
+					'keybind-button--conflict': !recording && conflicts.length,
+				}"
+				@click="handleClick"
+				@contextmenu.prevent.stop
+				@auxclick.prevent.stop
+			>
+				<span class="flex min-w-0 flex-row items-center justify-center gap-2">
+					<TriangleAlertIcon
+						v-if="!recording && conflicts.length"
+						class="keybind-conflict-icon order-first size-4 shrink-0"
+						aria-hidden="true"
+					/>
+					<span class="order-last min-w-0 truncate">{{ visibleLabel }}</span>
+				</span>
+			</Button>
+		</span>
+
+		<span :id="statusId" class="visually-hidden" role="status" aria-live="polite">
+			{{ statusMessage }}
+		</span>
+	</div>
+</template>
+
+<style scoped>
+.keybind-button.keybind-button--conflict {
+	background-color: var(--color-orange-highlight) !important;
+	color: var(--color-orange) !important;
+	box-shadow: inset 0 0 0 1px var(--color-orange) !important;
+}
+
+.keybind-button.keybind-button--conflict .keybind-conflict-icon {
+	color: var(--color-orange) !important;
+}
+</style>
diff --git a/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingRow.vue b/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingRow.vue
index d78bbbfeb7..a3d05c9b86 100644
--- a/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingRow.vue
+++ b/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingRow.vue
@@ -1,6 +1,14 @@
 <script setup lang="ts">
 import { UnknownIcon } from '@modrinth/assets'
-import { Button, ButtonGroup, defineMessages, Input, Toggle, useVIntl } from '@modrinth/ui'
+import {
+	Combobox,
+	type ComboboxOption,
+	defineMessages,
+	Input,
+	Slider,
+	Toggle,
+	useVIntl,
+} from '@modrinth/ui'
 import { computed } from 'vue'
 
 import type { EditableGameSetting, GameOptionCanonicalValue } from '@/helpers/game-options'
@@ -10,8 +18,8 @@ import {
 	canonicalValueFromInput,
 	canonicalValueText,
 } from './game-setting-editors'
+import GameKeybindInput from './GameKeybindInput.vue'
 import {
-	formatCompatibilitySubtitle,
 	formatCompatibilityTooltip,
 	formatGameSettingChoice,
 	formatGameSettingDescription,
@@ -24,9 +32,11 @@ import {
 const props = withDefaults(
 	defineProps<{
 		setting: EditableGameSetting
+		keybindConflicts?: string[]
 		disabled?: boolean
 	}>(),
 	{
+		keybindConflicts: () => [],
 		disabled: false,
 	},
 )
@@ -41,7 +51,7 @@ const { formatMessage } = useVIntl()
 const messages = defineMessages({
 	valueLabel: {
 		id: 'app.settings.synced-options.game-settings.value-label',
-		defaultMessage: 'Setting value',
+		defaultMessage: 'Value',
 	},
 	on: {
 		id: 'app.settings.synced-options.game-settings.value-on',
@@ -53,23 +63,19 @@ const messages = defineMessages({
 	},
 	mixed: {
 		id: 'app.settings.synced-options.game-settings.value-mixed',
-		defaultMessage: 'Mixed',
+		defaultMessage: 'Different across instances',
 	},
 	unset: {
 		id: 'app.settings.synced-options.game-settings.value-unset',
 		defaultMessage: 'Choose a value',
 	},
-	savedNotSynced: {
-		id: 'app.settings.synced-options.game-settings.saved-not-synced',
-		defaultMessage: 'Saved, not synced',
-	},
 	compatibilityDetails: {
 		id: 'app.settings.synced-options.game-settings.compatibility-details',
-		defaultMessage: 'Compatibility details',
+		defaultMessage: 'Why this setting may not sync',
 	},
 	syncSetting: {
 		id: 'app.settings.synced-options.game-settings.sync-setting',
-		defaultMessage: 'Sync {setting}',
+		defaultMessage: 'Sync {setting} across instances',
 	},
 })
 
@@ -78,6 +84,22 @@ const settingDescription = computed(() =>
 	formatGameSettingDescription(formatMessage, props.setting),
 )
 const valueText = computed(() => canonicalValueText(props.setting))
+const enumOptions = computed<ComboboxOption<string>[]>(() =>
+	(props.setting.editor.choices ?? []).map((choice) => ({
+		value: choice.value,
+		label: formatGameSettingChoice(formatMessage, props.setting.option_id, choice.value),
+	})),
+)
+const booleanOptions = computed<ComboboxOption<boolean>[]>(() => [
+	{ value: true, label: formatMessage(messages.on) },
+	{ value: false, label: formatMessage(messages.off) },
+])
+const isVolumeSlider = computed(
+	() =>
+		props.setting.category_id === 'music_and_sound' &&
+		props.setting.editor.unit === 'percent' &&
+		props.setting.editor.type === 'decimal',
+)
 const booleanValue = computed(() => canonicalBooleanValue(props.setting))
 const numberScale = computed(() => (props.setting.editor.unit === 'percent' ? 100 : 1))
 const inputMin = computed(() =>
@@ -95,6 +117,10 @@ const inputStep = computed(() =>
 		? undefined
 		: props.setting.editor.step * numberScale.value,
 )
+const sliderValue = computed(() => {
+	const value = Number(valueText.value)
+	return Number.isFinite(value) ? value : (inputMin.value ?? 0)
+})
 const editorDisabled = computed(
 	() => props.disabled || props.setting.controlled,
 )
@@ -116,20 +142,18 @@ const placeholder = computed(() => {
 	}
 	return undefined
 })
-const compatibilityTone = computed(() =>
-	props.setting.compatibility.left_local > 0
-		? 'text-orange'
-		: 'text-secondary',
-)
 const compatibilityTooltip = computed(() =>
 	formatCompatibilityTooltip(formatMessage, props.setting),
 )
-const compatibilitySubtitle = computed(() =>
-	formatCompatibilitySubtitle(formatMessage, props.setting),
-)
 const validationMessage = computed(() =>
 	formatGameSettingValidation(formatMessage, props.setting.validation_error),
 )
+const detailsTooltip = computed(() => validationMessage.value ?? compatibilityTooltip.value)
+const compatibilityTone = computed(() =>
+	validationMessage.value || props.setting.compatibility.left_local > 0
+		? 'text-orange'
+		: 'text-secondary',
+)
 const syncDisabledReason = computed(() => {
 	if (validationMessage.value) return validationMessage.value
 	if (props.setting.value_state === 'invalid') {
@@ -153,22 +177,25 @@ const syncDisabledReason = computed(() => {
 function updateValue(value: string | number | boolean | undefined) {
 	emit('update:canonical-value', canonicalValueFromInput(props.setting, value))
 }
-
-function updateSelectValue(event: Event) {
-	updateValue((event.target as HTMLSelectElement).value)
-}
 </script>
 
 <template>
-	<div class="flex min-w-0 items-center gap-4 border-0 border-b border-solid border-surface-5 py-3">
-		<div class="min-w-0 flex-1">
+	<div
+		class="grid min-w-0 items-center gap-3 border-0 border-b border-solid border-surface-5 py-3"
+		:class="
+			isVolumeSlider
+				? 'grid-cols-[minmax(8rem,0.5fr)_minmax(0,1.5fr)_4rem]'
+				: 'grid-cols-[minmax(0,1fr)_12rem_4rem]'
+		"
+	>
+		<div class="min-w-0">
 			<div class="flex items-center gap-2">
 				<h3 class="m-0 truncate text-base font-semibold text-contrast">
 					{{ settingLabel }}
 				</h3>
 				<span
-					v-if="shouldShowCompatibilityIndicator(setting)"
-					v-tooltip="compatibilityTooltip"
+					v-if="validationMessage || shouldShowCompatibilityIndicator(setting)"
+					v-tooltip="detailsTooltip"
 					tabindex="0"
 					role="img"
 					:aria-label="formatMessage(messages.compatibilityDetails)"
@@ -181,60 +208,56 @@ function updateSelectValue(event: Event) {
 			<p v-if="settingDescription" class="m-0 mt-0.5 text-sm text-primary">
 				{{ settingDescription }}
 			</p>
-			<p class="m-0 mt-0.5 text-xs text-secondary">
-				{{ validationMessage ?? compatibilitySubtitle }}
-				<span v-if="!setting.sync_enabled">
-					· {{ formatMessage(messages.savedNotSynced) }}
-				</span>
-			</p>
 		</div>
 
-		<div class="flex shrink-0 items-center gap-3">
-			<span class="sr-only">{{ formatMessage(messages.valueLabel) }}</span>
-			<ButtonGroup
-				v-if="setting.editor.type === 'bool'"
-				:label="formatMessage(messages.valueLabel)"
-			>
-				<Button
-					size="sm"
-					:type="booleanValue === true ? 'colored' : 'outlined'"
-					:color="booleanValue === true ? 'brand' : undefined"
-					:disabled="editorDisabled"
-					:aria-pressed="booleanValue === true"
-					@click="updateValue(true)"
-				>
-					{{ formatMessage(messages.on) }}
-				</Button>
-				<Button
-					size="sm"
-					:type="booleanValue === false ? 'colored' : 'outlined'"
-					:color="booleanValue === false ? 'brand' : undefined"
-					:disabled="editorDisabled"
-					:aria-pressed="booleanValue === false"
-					@click="updateValue(false)"
-				>
-					{{ formatMessage(messages.off) }}
-				</Button>
-			</ButtonGroup>
+		<div class="flex min-w-0 items-center">
+			<Slider
+				v-if="isVolumeSlider"
+				:model-value="sliderValue"
+				:min="inputMin ?? 0"
+				:max="inputMax ?? 100"
+				:step="inputStep ?? 1"
+				:snap-points="[0, 50, 100]"
+				:snap-range="5"
+				:disabled="editorDisabled"
+				@update:model-value="updateValue"
+			/>
 
-			<select
+			<Combobox
+				v-else-if="setting.editor.type === 'bool'"
+				:model-value="booleanValue"
+				:options="booleanOptions"
+				:placeholder="placeholder"
+				:disabled="editorDisabled"
+				:aria-label="formatMessage(messages.valueLabel)"
+				class="min-w-0"
+				@update:model-value="updateValue"
+			/>
+
+			<Combobox
 				v-else-if="setting.editor.type === 'enum'"
-				:value="valueText"
+				:model-value="valueText"
+				:options="enumOptions"
+				:placeholder="placeholder"
 				:disabled="editorDisabled"
 				:aria-label="formatMessage(messages.valueLabel)"
-				class="h-9 w-48 rounded-xl border border-solid border-surface-5 bg-surface-4 px-3 text-sm font-medium text-primary outline-none focus-visible:ring-4 focus-visible:ring-brand-shadow disabled:cursor-not-allowed disabled:opacity-50"
-				@change="updateSelectValue"
-			>
-				<option v-if="!valueText" value="" disabled>{{ placeholder }}</option>
-				<option v-for="choice in setting.editor.choices ?? []" :key="choice.value" :value="choice.value">
-					{{ formatGameSettingChoice(formatMessage, setting.option_id, choice.value) }}
-				</option>
-			</select>
+				class="min-w-0"
+				@update:model-value="updateValue"
+			/>
+
+			<GameKeybindInput
+				v-else-if="setting.editor.type === 'key_binding'"
+				:model-value="valueText"
+				:setting-label="settingLabel"
+				:conflicts="keybindConflicts"
+				:mixed="setting.value_state === 'mixed'"
+				:disabled="editorDisabled"
+				@update:model-value="updateValue"
+			/>
 
 			<Input
 				v-else
 				:model-value="valueText"
-				:size="'small'"
 				:type="setting.editor.type === 'integer' || setting.editor.type === 'decimal' ? 'number' : 'text'"
 				:min="inputMin"
 				:max="inputMax"
@@ -242,19 +265,22 @@ function updateSelectValue(event: Event) {
 				:placeholder="placeholder"
 				:disabled="editorDisabled"
 				:aria-label="formatMessage(messages.valueLabel)"
-				wrapper-class="w-48"
+				wrapper-class="w-full"
 				@update:model-value="updateValue"
 			/>
-
-			<span v-tooltip="syncToggleDisabled ? syncDisabledReason : undefined" class="flex">
-				<Toggle
-					:id="`sync-game-setting-${setting.option_id}`"
-					:model-value="setting.sync_enabled"
-					:disabled="syncToggleDisabled"
-					:aria-label="formatMessage(messages.syncSetting, { setting: settingLabel })"
-					@update:model-value="(enabled) => emit('update:sync-enabled', enabled)"
-				/>
-			</span>
 		</div>
+
+		<span
+			v-tooltip="syncToggleDisabled ? syncDisabledReason : undefined"
+			class="flex justify-center"
+		>
+			<Toggle
+				:id="`sync-game-setting-${setting.option_id}`"
+				:model-value="setting.sync_enabled"
+				:disabled="syncToggleDisabled"
+				:aria-label="formatMessage(messages.syncSetting, { setting: settingLabel })"
+				@update:model-value="(enabled) => emit('update:sync-enabled', enabled)"
+			/>
+		</span>
 	</div>
 </template>
diff --git a/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingsModal.vue b/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingsModal.vue
index f33758dfe9..78c364e2de 100644
--- a/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingsModal.vue
+++ b/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingsModal.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import {
 	EyeIcon,
+	FilterIcon,
 	LanguagesIcon,
 	MessageIcon,
 	MonitorIcon,
@@ -21,15 +22,17 @@ import {
 	commonMessages,
 	ConfirmLeaveModal,
 	defineMessages,
+	FloatingActionBar,
 	injectNotificationManager,
 	Input,
-	NewModal,
+	TabbedModal,
+	type TabbedModalTab,
 	Tabs,
 	type TabsTab,
 	useVIntl,
 } from '@modrinth/ui'
 import type { Component } from 'vue'
-import { computed, onUnmounted, ref } from 'vue'
+import { computed, nextTick, onUnmounted, ref } from 'vue'
 
 import {
 	get_synced_game_options_config,
@@ -49,10 +52,11 @@ import {
 	settingCanBeEnabled,
 	settingSearchText,
 } from './game-setting-editors'
+import { minecraftKeybindConflictKey } from './game-keybinds'
 import {
-	formatGameSettingCategory,
 	formatGameSettingDescription,
 	formatGameSettingLabel,
+	gameSettingCategoryMessage,
 } from './game-setting-messages'
 
 const emit = defineEmits<{
@@ -65,7 +69,7 @@ const { addNotification, handleError } = injectNotificationManager()
 const messages = defineMessages({
 	title: {
 		id: 'app.settings.synced-options.game-settings.title',
-		defaultMessage: 'Sync game settings',
+		defaultMessage: 'Game settings',
 	},
 	search: {
 		id: 'app.settings.synced-options.game-settings.search',
@@ -77,44 +81,44 @@ const messages = defineMessages({
 	},
 	on: {
 		id: 'app.settings.synced-options.game-settings.filter.on',
-		defaultMessage: 'On',
+		defaultMessage: 'Syncing',
 	},
 	off: {
 		id: 'app.settings.synced-options.game-settings.filter.off',
-		defaultMessage: 'Off',
+		defaultMessage: 'Not syncing',
 	},
 	enableAll: {
 		id: 'app.settings.synced-options.game-settings.enable-all',
-		defaultMessage: 'Enable all',
+		defaultMessage: 'Sync all',
 	},
 	enableAllCount: {
 		id: 'app.settings.synced-options.game-settings.enable-all-count',
-		defaultMessage: 'Enable all ({count})',
+		defaultMessage: 'Sync all ({count})',
 	},
 	disableAll: {
 		id: 'app.settings.synced-options.game-settings.disable-all',
-		defaultMessage: 'Disable all',
+		defaultMessage: 'Stop syncing all',
 	},
 	disableAllCount: {
 		id: 'app.settings.synced-options.game-settings.disable-all-count',
-		defaultMessage: 'Disable all ({count})',
+		defaultMessage: 'Stop syncing all ({count})',
 	},
 	customEmpty: {
 		id: 'app.settings.synced-options.game-settings.custom-empty',
 		defaultMessage:
-			'Mod-added options will appear here after they are discovered in a participating instance.',
+			'Settings added by mods will appear here after Modrinth finds them in one of your instances.',
 	},
 	empty: {
 		id: 'app.settings.synced-options.game-settings.empty',
-		defaultMessage: 'No settings match these filters.',
+		defaultMessage: 'No settings match your search or filter.',
 	},
 	loading: {
 		id: 'app.settings.synced-options.game-settings.loading',
-		defaultMessage: 'Loading game settings...',
+		defaultMessage: 'Loading settings...',
 	},
 	loadFailed: {
 		id: 'app.settings.synced-options.game-settings.load-failed',
-		defaultMessage: 'Game settings could not be loaded.',
+		defaultMessage: 'We couldn’t load your game settings.',
 	},
 	retry: {
 		id: 'app.settings.synced-options.game-settings.retry',
@@ -122,35 +126,46 @@ const messages = defineMessages({
 	},
 	saveSettings: {
 		id: 'app.settings.synced-options.game-settings.save',
-		defaultMessage: 'Save settings',
+		defaultMessage: 'Save changes',
+	},
+	unsavedChanges: {
+		id: 'app.settings.synced-options.game-settings.unsaved-changes',
+		defaultMessage: 'You have unsaved changes.',
 	},
 	saved: {
 		id: 'app.settings.synced-options.game-settings.saved',
-		defaultMessage: 'Game settings saved',
+		defaultMessage: 'Game settings updated',
 	},
 	savedSummary: {
 		id: 'app.settings.synced-options.game-settings.saved-summary',
-		defaultMessage:
-			'{applied, plural, one {# setting applied} other {# settings applied}}, {migrated, plural, one {# migrated} other {# migrated}}, {deferred, plural, one {# deferred} other {# deferred}}, {unsupported, plural, one {# unsupported} other {# unsupported}}, {failed, plural, one {# failed} other {# failed}}.',
+		defaultMessage: 'Your changes were saved.',
+	},
+	savedLater: {
+		id: 'app.settings.synced-options.game-settings.saved-later',
+		defaultMessage: 'Your changes were saved and will finish syncing when your instances are ready.',
+	},
+	savedWithProblems: {
+		id: 'app.settings.synced-options.game-settings.saved-with-problems',
+		defaultMessage: 'Your changes were saved, but some instances could not be updated.',
 	},
 	previewFailed: {
 		id: 'app.settings.synced-options.game-settings.preview-failed',
-		defaultMessage: 'Compatibility could not be refreshed. Review the values or try again.',
+		defaultMessage: 'We couldn’t check which instances support your changes. Try again.',
 	},
 	conflictTitle: {
 		id: 'app.settings.synced-options.game-settings.conflict-title',
-		defaultMessage: 'Game settings changed elsewhere',
+		defaultMessage: 'These settings changed elsewhere',
 	},
 	conflictText: {
 		id: 'app.settings.synced-options.game-settings.conflict-text',
 		defaultMessage:
-			'The latest values have been loaded. Review the conflicting settings before saving again.',
+			'We loaded the latest settings. Check your changes, then save again.',
 	},
 })
 
 type SelectionFilter = 'all' | 'on' | 'off'
 
-const modal = ref<InstanceType<typeof NewModal> | null>(null)
+const modal = ref<InstanceType<typeof TabbedModal> | null>(null)
 const confirmLeaveModal = ref<InstanceType<typeof ConfirmLeaveModal> | null>(null)
 const baseState = ref<GameSettingsEditorState | null>(null)
 const draftState = ref<GameSettingsEditorState | null>(null)
@@ -159,7 +174,6 @@ const search = ref('')
 const selectionFilter = ref<SelectionFilter>('all')
 const loading = ref(false)
 const saving = ref(false)
-const previewing = ref(false)
 const loadError = ref(false)
 const previewError = ref(false)
 const touchedValueOptionIds = ref<Set<string>>(new Set())
@@ -205,6 +219,13 @@ const categories = computed<GameSettingCategory[]>(() => {
 	return visible
 })
 
+const categoryTabs = computed<TabbedModalTab[]>(() =>
+	categories.value.map((category) => ({
+		name: gameSettingCategoryMessage(category),
+		icon: categoryIcon(category),
+	})),
+)
+
 const activeCategory = computed(() =>
 	categories.value.find((category) => category.id === activeCategoryId.value),
 )
@@ -230,6 +251,36 @@ const categorySettings = computed(() => {
 	})
 })
 
+const keybindConflicts = computed(() => {
+	if (!draftState.value) return new Map<string, string[]>()
+
+	const bindings = new Map<string, EditableGameSetting[]>()
+	for (const setting of draftState.value.settings) {
+		if (
+			setting.editor.type !== 'key_binding' ||
+			setting.canonical_value?.type !== 'key_binding'
+		)
+			continue
+		const key = minecraftKeybindConflictKey(setting.canonical_value.value)
+		if (!key) continue
+		bindings.set(key, [...(bindings.get(key) ?? []), setting])
+	}
+
+	const conflicts = new Map<string, string[]>()
+	for (const settings of bindings.values()) {
+		if (settings.length < 2) continue
+		for (const setting of settings) {
+			conflicts.set(
+				setting.option_id,
+				settings
+					.filter((candidate) => candidate.option_id !== setting.option_id)
+					.map((candidate) => formatGameSettingLabel(formatMessage, candidate)),
+			)
+		}
+	}
+	return conflicts
+})
+
 const dirtyChanges = computed(() =>
 	gameSettingChanges(baseState.value, draftState.value, touchedValueOptionIds.value),
 )
@@ -261,6 +312,14 @@ function setSelectionFilter(value: string | number) {
 	selectionFilter.value = value as SelectionFilter
 }
 
+function changeCategory(_fromIndex: number, toIndex: number): boolean {
+	const category = categories.value[toIndex]
+	if (!category) return false
+	activeCategoryId.value = category.id
+	search.value = ''
+	return true
+}
+
 function editorRequest(): UpdateGameSettingsRequest | null {
 	if (!baseState.value || !draftState.value) return null
 	return {
@@ -287,6 +346,10 @@ async function load() {
 			(category) => category.id === activeCategoryId.value,
 		)
 		if (!currentCategoryExists) activeCategoryId.value = categories.value[0]?.id ?? 'custom_settings'
+		const activeCategoryIndex = categories.value.findIndex(
+			(category) => category.id === activeCategoryId.value,
+		)
+		if (activeCategoryIndex >= 0) modal.value?.setTab(activeCategoryIndex)
 	} catch (error) {
 		if (generation !== loadGeneration) return
 		loadError.value = true
@@ -317,7 +380,6 @@ function reset() {
 	draftState.value = null
 	loading.value = false
 	saving.value = false
-	previewing.value = false
 	loadError.value = false
 	previewError.value = false
 	touchedValueOptionIds.value = new Set()
@@ -342,39 +404,56 @@ function settingById(optionId: string): EditableGameSetting | undefined {
 }
 
 function setSyncEnabled(optionId: string, enabled: boolean) {
-	const setting = settingById(optionId)
-	if (!setting) return
-	setting.sync_enabled = enabled
-	setting.validation_error = null
+	if (!draftState.value) return
+	draftState.value.settings = draftState.value.settings.map((setting) =>
+		setting.option_id === optionId
+			? { ...setting, sync_enabled: enabled, validation_error: null }
+			: setting,
+	)
 	schedulePreview()
 }
 
 function setCanonicalValue(optionId: string, value: GameOptionCanonicalValue | null) {
-	const setting = settingById(optionId)
-	if (!setting) return
+	if (!draftState.value || !settingById(optionId)) return
 	touchedValueOptionIds.value = new Set(touchedValueOptionIds.value).add(optionId)
-	setting.canonical_value = value
-	setting.value_state = value ? 'canonical' : 'unset'
-	setting.validation_error = null
+	draftState.value.settings = draftState.value.settings.map((setting) =>
+		setting.option_id === optionId
+			? {
+					...setting,
+					canonical_value: value,
+					value_state: value ? 'canonical' : 'unset',
+					validation_error: null,
+				}
+			: setting,
+	)
 	schedulePreview()
 }
 
 function enableVisible() {
-	if (saving.value) return
-	for (const setting of enableCandidates.value) setting.sync_enabled = true
+	if (saving.value || !draftState.value) return
+	const optionIds = new Set(enableCandidates.value.map((setting) => setting.option_id))
+	draftState.value.settings = draftState.value.settings.map((setting) =>
+		optionIds.has(setting.option_id)
+			? { ...setting, sync_enabled: true, validation_error: null }
+			: setting,
+	)
 	schedulePreview()
 }
 
 function disableVisible() {
-	if (saving.value) return
-	for (const setting of disableCandidates.value) setting.sync_enabled = false
+	if (saving.value || !draftState.value) return
+	const optionIds = new Set(disableCandidates.value.map((setting) => setting.option_id))
+	draftState.value.settings = draftState.value.settings.map((setting) =>
+		optionIds.has(setting.option_id)
+			? { ...setting, sync_enabled: false, validation_error: null }
+			: setting,
+	)
 	schedulePreview()
 }
 
 function schedulePreview() {
 	previewError.value = false
 	previewGeneration++
-	previewing.value = true
 	if (previewTimer) clearTimeout(previewTimer)
 	previewTimer = setTimeout(() => void preview(), 350)
 }
@@ -397,40 +476,36 @@ function mergePreview(preview: GameSettingsEditorState) {
 	const previousBaseSettings = new Map(
 		previousBase.settings.map((setting) => [setting.option_id, setting]),
 	)
-	baseState.value = {
-		...cloneGameSettingsState(preview),
-		settings: preview.settings.map((setting) =>
-			dirtyIds.has(setting.option_id)
-				? (previousBaseSettings.get(setting.option_id) ?? setting)
-				: setting,
-		),
-	}
-	draftState.value = {
-		...preview,
-		settings: preview.settings.map((setting) => {
-			const staged = stagedSettings.get(setting.option_id)
-			if (!staged) return setting
-			return {
-				...setting,
-				sync_enabled: staged.sync_enabled,
-				canonical_value: staged.canonical_value,
-				option_revision: staged.option_revision,
-			}
-		}),
-	}
+	const nextBase = cloneGameSettingsState(preview)
+	const nextDraft = cloneGameSettingsState(preview)
+	nextBase.settings = nextBase.settings.map((setting) =>
+		dirtyIds.has(setting.option_id)
+			? { ...(previousBaseSettings.get(setting.option_id) ?? setting) }
+			: setting,
+	)
+	nextDraft.settings = nextDraft.settings.map((setting) => {
+		const staged = stagedSettings.get(setting.option_id)
+		if (!staged) return setting
+		return {
+			...setting,
+			sync_enabled: staged.sync_enabled,
+			canonical_value: staged.canonical_value,
+			option_revision: staged.option_revision,
+		}
+	})
+	baseState.value = nextBase
+	draftState.value = nextDraft
 }
 
 async function preview() {
 	const request = editorRequest()
 	if (!request || request.changes.length === 0) {
 		previewGeneration++
-		previewing.value = false
 		if (baseState.value) draftState.value = cloneGameSettingsState(baseState.value)
 		return
 	}
 
 	const generation = ++previewGeneration
-	previewing.value = true
 	try {
 		const previewState = await preview_synced_game_option_changes(request)
 		if (generation !== previewGeneration) return
@@ -438,8 +513,6 @@ async function preview() {
 		previewError.value = false
 	} catch {
 		if (generation === previewGeneration) previewError.value = true
-	} finally {
-		if (generation === previewGeneration) previewing.value = false
 	}
 }
 
@@ -495,19 +568,22 @@ async function save() {
 			return
 		}
 
+		const savedWithProblems = result.failed > 0 || result.unsupported > 0
 		addNotification({
-			type: result.failed > 0 ? 'warning' : 'success',
+			type: savedWithProblems ? 'warning' : 'success',
 			title: formatMessage(messages.saved),
-			text: formatMessage(messages.savedSummary, {
-				applied: result.applied,
-				migrated: result.migrated,
-				deferred: result.deferred,
-				unsupported: result.unsupported,
-				failed: result.failed,
-			}),
+			text: formatMessage(
+				savedWithProblems
+					? messages.savedWithProblems
+					: result.deferred > 0
+						? messages.savedLater
+						: messages.savedSummary,
+			),
 		})
 		emit('saved')
 		allowClose = true
+		saving.value = false
+		await nextTick()
 		modal.value?.hide()
 	} catch (error) {
 		handleError(error)
@@ -524,19 +600,20 @@ defineExpose({ show, hide })
 </script>
 
 <template>
-	<NewModal
+	<TabbedModal
 		ref="modal"
+		:tabs="categoryTabs"
 		:header="formatMessage(messages.title)"
-		:no-padding="true"
-		:actions-divider="true"
 		:before-hide="beforeHide"
+		:before-tab-change="changeCategory"
 		:on-after-hide="reset"
 		:disable-close="saving"
-		max-width="930px"
-		width="930px"
+		:floating-action-bar-shown="isDirty"
+		:max-width="'min(930px, calc(95vw - 2rem))'"
+		:width="'min(930px, calc(95vw - 2rem))'"
 	>
-		<div class="grid h-[550px] min-h-0 grid-cols-[272px_minmax(0,1fr)] bg-surface-2">
-			<aside class="flex min-h-0 flex-col gap-2 border-0 border-r border-solid border-surface-5 bg-surface-3 p-4">
+		<template #sidebar-header>
+			<div class="pb-4">
 				<Input
 					v-model="search"
 					:icon="SearchIcon"
@@ -545,39 +622,22 @@ defineExpose({ show, hide })
 					:placeholder="formatMessage(messages.search)"
 					wrapper-class="w-full shrink-0"
 				/>
+			</div>
+		</template>
 
-				<nav class="flex min-h-0 flex-col overflow-y-auto" :aria-label="formatMessage(messages.title)">
-					<button
-						v-for="category in categories"
-						:key="category.id"
-						type="button"
-						class="flex cursor-pointer items-center gap-2 rounded-[14px] border-0 px-4 py-2.5 text-left font-semibold outline-none transition-colors focus-visible:ring-4 focus-visible:ring-brand-shadow"
-						:class="
-							category.id === activeCategoryId
-								? 'bg-highlight-green text-green'
-								: 'bg-transparent text-primary hover:bg-surface-4'
-						"
-						@click="activeCategoryId = category.id; search = ''"
-					>
-						<component :is="categoryIcon(category)" class="size-5 shrink-0" />
-						<span class="truncate">{{ formatGameSettingCategory(formatMessage, category) }}</span>
-					</button>
-				</nav>
-			</aside>
-
-			<main class="flex min-h-0 min-w-0 flex-col bg-surface-2">
-				<div class="flex shrink-0 flex-wrap items-center justify-between gap-3 p-6">
+		<template #content>
+			<div class="flex min-h-full min-w-0 flex-col">
+				<div class="flex shrink-0 flex-wrap items-center justify-between gap-3 pb-3 pt-2">
 					<div class="flex items-center gap-2">
+						<FilterIcon class="size-5 shrink-0 text-secondary" aria-hidden="true" />
 						<Tabs
 							:value="selectionFilter"
 							:tabs="filterTabs"
 							@update:value="setSelectionFilter"
 						/>
-						<SpinnerIcon v-if="previewing" class="size-5 animate-spin text-secondary" />
 					</div>
 					<ButtonGroup>
 						<Button
-							size="sm"
 							:disabled="saving || enableCandidates.length === 0"
 							@click="enableVisible"
 						>
@@ -588,7 +648,6 @@ defineExpose({ show, hide })
 							}}
 						</Button>
 						<Button
-							size="sm"
 							:disabled="saving || disableCandidates.length === 0"
 							@click="disableVisible"
 						>
@@ -601,18 +660,24 @@ defineExpose({ show, hide })
 					</ButtonGroup>
 				</div>
 
-				<div v-if="loading" class="flex flex-1 items-center justify-center gap-2 text-secondary">
+				<div
+					v-if="loading"
+					class="flex min-h-40 flex-1 items-center justify-center gap-2 text-secondary"
+				>
 					<SpinnerIcon class="size-5 animate-spin" />
 					{{ formatMessage(messages.loading) }}
 				</div>
-				<div v-else-if="loadError" class="flex flex-1 flex-col items-center justify-center gap-3 text-secondary">
+				<div
+					v-else-if="loadError"
+					class="flex min-h-40 flex-1 flex-col items-center justify-center gap-3 text-secondary"
+				>
 					<p class="m-0">{{ formatMessage(messages.loadFailed) }}</p>
 					<Button @click="load">
 						<RefreshCwIcon />
 						{{ formatMessage(messages.retry) }}
 					</Button>
 				</div>
-				<div v-else class="min-h-0 flex-1 overflow-y-auto px-6 py-2">
+				<div v-else class="min-h-0 flex-1">
 					<p v-if="previewError" class="m-0 border-0 border-b border-solid border-surface-5 py-3 text-sm text-orange">
 						{{ formatMessage(messages.previewFailed) }}
 					</p>
@@ -630,35 +695,46 @@ defineExpose({ show, hide })
 						v-for="setting in categorySettings"
 						:key="setting.option_id"
 						:setting="setting"
+						:keybind-conflicts="keybindConflicts.get(setting.option_id)"
 						:disabled="saving"
 						@update:sync-enabled="setSyncEnabled(setting.option_id, $event)"
 						@update:canonical-value="setCanonicalValue(setting.option_id, $event)"
 					/>
 				</div>
-			</main>
-		</div>
-
-		<template #actions>
-			<div class="flex justify-end gap-2 p-2">
-				<Button type="outlined" :disabled="saving" @click="modal?.hide()">
-					<XIcon />
-					{{ formatMessage(commonMessages.cancelButton) }}
-				</Button>
-				<Button
-					type="colored"
-					color="brand"
-					:disabled="
-						!isDirty || loading || previewing || saving || previewError || hasBlockingDraft
-					"
-					:loading="saving"
-					@click="save"
-				>
-					<SaveIcon v-if="!saving" />
-					{{ formatMessage(messages.saveSettings) }}
-				</Button>
 			</div>
 		</template>
-	</NewModal>
+
+		<template #floating-action-bar>
+			<FloatingActionBar
+				v-if="isDirty"
+				:shown="true"
+				:inline="true"
+				:aria-label="formatMessage(messages.title)"
+			>
+				<p class="m-0 text-sm font-semibold md:text-base">
+					{{ formatMessage(messages.unsavedChanges) }}
+				</p>
+				<div class="ml-auto flex gap-2">
+					<Button type="outlined" :disabled="saving" @click="modal?.hide()">
+						<XIcon />
+						{{ formatMessage(commonMessages.cancelButton) }}
+					</Button>
+					<Button
+						type="colored"
+						color="brand"
+						:disabled="
+							!isDirty || loading || saving || previewError || hasBlockingDraft
+						"
+						:loading="saving"
+						@click="save"
+					>
+						<SaveIcon v-if="!saving" />
+						{{ formatMessage(messages.saveSettings) }}
+					</Button>
+				</div>
+			</FloatingActionBar>
+		</template>
+	</TabbedModal>
 
 	<ConfirmLeaveModal ref="confirmLeaveModal" />
 </template>
diff --git a/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-keybinds.ts b/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-keybinds.ts
new file mode 100644
index 0000000000..f0edeef140
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-keybinds.ts
@@ -0,0 +1,423 @@
+import { defineMessages, type MessageDescriptor, type VIntlFormatters } from '@modrinth/ui'
+
+type FormatMessage = VIntlFormatters['formatMessage']
+
+type StopKeybindRecording = () => void
+let stopActiveKeybindRecording: StopKeybindRecording | null = null
+
+export function activateKeybindRecording(stop: StopKeybindRecording) {
+	if (stopActiveKeybindRecording === stop) return
+	const stopPrevious = stopActiveKeybindRecording
+	stopActiveKeybindRecording = stop
+	stopPrevious?.()
+}
+
+export function deactivateKeybindRecording(stop: StopKeybindRecording) {
+	if (stopActiveKeybindRecording === stop) {
+		stopActiveKeybindRecording = null
+	}
+}
+
+const keyMessages = defineMessages({
+	unbound: {
+		id: 'app.settings.game-options.keybind.key.unbound',
+		defaultMessage: 'Unbound',
+	},
+	escape: {
+		id: 'app.settings.game-options.keybind.key.escape',
+		defaultMessage: 'Escape',
+	},
+	backspace: {
+		id: 'app.settings.game-options.keybind.key.backspace',
+		defaultMessage: 'Backspace',
+	},
+	tab: {
+		id: 'app.settings.game-options.keybind.key.tab',
+		defaultMessage: 'Tab',
+	},
+	enter: {
+		id: 'app.settings.game-options.keybind.key.enter',
+		defaultMessage: 'Enter',
+	},
+	leftControl: {
+		id: 'app.settings.game-options.keybind.key.left-control',
+		defaultMessage: 'Left Ctrl',
+	},
+	rightControl: {
+		id: 'app.settings.game-options.keybind.key.right-control',
+		defaultMessage: 'Right Ctrl',
+	},
+	leftShift: {
+		id: 'app.settings.game-options.keybind.key.left-shift',
+		defaultMessage: 'Left Shift',
+	},
+	rightShift: {
+		id: 'app.settings.game-options.keybind.key.right-shift',
+		defaultMessage: 'Right Shift',
+	},
+	leftAlt: {
+		id: 'app.settings.game-options.keybind.key.left-alt',
+		defaultMessage: 'Left Alt',
+	},
+	rightAlt: {
+		id: 'app.settings.game-options.keybind.key.right-alt',
+		defaultMessage: 'Right Alt',
+	},
+	space: {
+		id: 'app.settings.game-options.keybind.key.space',
+		defaultMessage: 'Space',
+	},
+	capsLock: {
+		id: 'app.settings.game-options.keybind.key.caps-lock',
+		defaultMessage: 'Caps Lock',
+	},
+	numLock: {
+		id: 'app.settings.game-options.keybind.key.num-lock',
+		defaultMessage: 'Num Lock',
+	},
+	scrollLock: {
+		id: 'app.settings.game-options.keybind.key.scroll-lock',
+		defaultMessage: 'Scroll Lock',
+	},
+	printScreen: {
+		id: 'app.settings.game-options.keybind.key.print-screen',
+		defaultMessage: 'Print Screen',
+	},
+	pause: {
+		id: 'app.settings.game-options.keybind.key.pause',
+		defaultMessage: 'Pause',
+	},
+	home: {
+		id: 'app.settings.game-options.keybind.key.home',
+		defaultMessage: 'Home',
+	},
+	end: {
+		id: 'app.settings.game-options.keybind.key.end',
+		defaultMessage: 'End',
+	},
+	pageUp: {
+		id: 'app.settings.game-options.keybind.key.page-up',
+		defaultMessage: 'Page Up',
+	},
+	pageDown: {
+		id: 'app.settings.game-options.keybind.key.page-down',
+		defaultMessage: 'Page Down',
+	},
+	insert: {
+		id: 'app.settings.game-options.keybind.key.insert',
+		defaultMessage: 'Insert',
+	},
+	delete: {
+		id: 'app.settings.game-options.keybind.key.delete',
+		defaultMessage: 'Delete',
+	},
+	arrowUp: {
+		id: 'app.settings.game-options.keybind.key.arrow-up',
+		defaultMessage: 'Up Arrow',
+	},
+	arrowDown: {
+		id: 'app.settings.game-options.keybind.key.arrow-down',
+		defaultMessage: 'Down Arrow',
+	},
+	arrowLeft: {
+		id: 'app.settings.game-options.keybind.key.arrow-left',
+		defaultMessage: 'Left Arrow',
+	},
+	arrowRight: {
+		id: 'app.settings.game-options.keybind.key.arrow-right',
+		defaultMessage: 'Right Arrow',
+	},
+	leftSuper: {
+		id: 'app.settings.game-options.keybind.key.left-super',
+		defaultMessage: 'Left Super',
+	},
+	rightSuper: {
+		id: 'app.settings.game-options.keybind.key.right-super',
+		defaultMessage: 'Right Super',
+	},
+	leftCommand: {
+		id: 'app.settings.game-options.keybind.key.left-command',
+		defaultMessage: 'Left Command',
+	},
+	rightCommand: {
+		id: 'app.settings.game-options.keybind.key.right-command',
+		defaultMessage: 'Right Command',
+	},
+	menu: {
+		id: 'app.settings.game-options.keybind.key.menu',
+		defaultMessage: 'Menu',
+	},
+	keypadKey: {
+		id: 'app.settings.game-options.keybind.key.keypad-key',
+		defaultMessage: 'Numpad {key}',
+	},
+	leftMouse: {
+		id: 'app.settings.game-options.keybind.mouse.left',
+		defaultMessage: 'Left Mouse',
+	},
+	rightMouse: {
+		id: 'app.settings.game-options.keybind.mouse.right',
+		defaultMessage: 'Right Mouse',
+	},
+	middleMouse: {
+		id: 'app.settings.game-options.keybind.mouse.middle',
+		defaultMessage: 'Middle Mouse',
+	},
+	mouseButton: {
+		id: 'app.settings.game-options.keybind.mouse.button',
+		defaultMessage: 'Mouse {button}',
+	},
+	scancode: {
+		id: 'app.settings.game-options.keybind.scancode',
+		defaultMessage: 'Scancode {code}',
+	},
+	unknownKey: {
+		id: 'app.settings.game-options.keybind.key.unknown',
+		defaultMessage: 'Unknown key',
+	},
+	controlModifier: {
+		id: 'app.settings.game-options.keybind.modifier.control',
+		defaultMessage: 'Ctrl',
+	},
+	shiftModifier: {
+		id: 'app.settings.game-options.keybind.modifier.shift',
+		defaultMessage: 'Shift',
+	},
+	altModifier: {
+		id: 'app.settings.game-options.keybind.modifier.alt',
+		defaultMessage: 'Alt',
+	},
+	commandModifier: {
+		id: 'app.settings.game-options.keybind.modifier.command',
+		defaultMessage: 'Command',
+	},
+	superModifier: {
+		id: 'app.settings.game-options.keybind.modifier.super',
+		defaultMessage: 'Super',
+	},
+})
+
+const keyboardCodeTokens: Record<string, string> = {
+	Escape: 'escape',
+	Minus: 'minus',
+	Equal: 'equal',
+	Backspace: 'backspace',
+	Tab: 'tab',
+	BracketLeft: 'left.bracket',
+	BracketRight: 'right.bracket',
+	Enter: 'enter',
+	ControlLeft: 'left.control',
+	Semicolon: 'semicolon',
+	Quote: 'apostrophe',
+	Backquote: 'grave.accent',
+	ShiftLeft: 'left.shift',
+	Backslash: 'backslash',
+	Comma: 'comma',
+	Period: 'period',
+	Slash: 'slash',
+	ShiftRight: 'right.shift',
+	AltLeft: 'left.alt',
+	Space: 'space',
+	CapsLock: 'caps.lock',
+	NumLock: 'num.lock',
+	ScrollLock: 'scroll.lock',
+	NumpadSubtract: 'keypad.subtract',
+	NumpadAdd: 'keypad.add',
+	NumpadDecimal: 'keypad.decimal',
+	NumpadComma: 'keypad.decimal',
+	NumpadEqual: 'keypad.equal',
+	NumpadEnter: 'keypad.enter',
+	ControlRight: 'right.control',
+	NumpadDivide: 'keypad.divide',
+	NumpadMultiply: 'keypad.multiply',
+	PrintScreen: 'print.screen',
+	AltRight: 'right.alt',
+	Pause: 'pause',
+	Home: 'home',
+	ArrowUp: 'up',
+	PageUp: 'page.up',
+	ArrowLeft: 'left',
+	ArrowRight: 'right',
+	End: 'end',
+	ArrowDown: 'down',
+	PageDown: 'page.down',
+	Insert: 'insert',
+	Delete: 'delete',
+	MetaLeft: 'left.win',
+	MetaRight: 'right.win',
+	ContextMenu: 'menu',
+}
+
+const keyboardLabels: Record<string, MessageDescriptor | string> = {
+	escape: keyMessages.escape,
+	minus: '-',
+	equal: '=',
+	backspace: keyMessages.backspace,
+	tab: keyMessages.tab,
+	'left.bracket': '[',
+	'right.bracket': ']',
+	enter: keyMessages.enter,
+	'left.control': keyMessages.leftControl,
+	semicolon: ';',
+	apostrophe: "'",
+	'grave.accent': '`',
+	'left.shift': keyMessages.leftShift,
+	backslash: '\\',
+	comma: ',',
+	period: '.',
+	slash: '/',
+	'right.shift': keyMessages.rightShift,
+	'left.alt': keyMessages.leftAlt,
+	space: keyMessages.space,
+	'caps.lock': keyMessages.capsLock,
+	'num.lock': keyMessages.numLock,
+	'scroll.lock': keyMessages.scrollLock,
+	'keypad.subtract': '-',
+	'keypad.add': '+',
+	'keypad.decimal': '.',
+	'keypad.equal': '=',
+	'keypad.enter': keyMessages.enter,
+	'right.control': keyMessages.rightControl,
+	'keypad.divide': '/',
+	'keypad.multiply': '*',
+	'print.screen': keyMessages.printScreen,
+	'right.alt': keyMessages.rightAlt,
+	pause: keyMessages.pause,
+	home: keyMessages.home,
+	up: keyMessages.arrowUp,
+	'page.up': keyMessages.pageUp,
+	left: keyMessages.arrowLeft,
+	right: keyMessages.arrowRight,
+	end: keyMessages.end,
+	down: keyMessages.arrowDown,
+	'page.down': keyMessages.pageDown,
+	insert: keyMessages.insert,
+	delete: keyMessages.delete,
+	menu: keyMessages.menu,
+}
+
+function splitKeybind(value: string): [key: string, modifier?: string] {
+	const separator = value.indexOf(':')
+	return separator === -1
+		? [value]
+		: [value.slice(0, separator), value.slice(separator + 1)]
+}
+
+function keyboardIdentifierFromCode(code: string): string | null {
+	const letter = /^Key([A-Z])$/.exec(code)
+	if (letter) return letter[1].toLowerCase()
+
+	const digit = /^Digit([0-9])$/.exec(code)
+	if (digit) return digit[1]
+
+	const functionKey = /^F([1-9]|1[0-9]|2[0-5])$/.exec(code)
+	if (functionKey) return `f${functionKey[1]}`
+
+	const keypadDigit = /^Numpad([0-9])$/.exec(code)
+	if (keypadDigit) return `keypad.${keypadDigit[1]}`
+
+	return keyboardCodeTokens[code] ?? null
+}
+
+export function minecraftKeyTokenFromKeyboardEvent(event: KeyboardEvent): string | null {
+	const identifier = keyboardIdentifierFromCode(event.code)
+	return identifier ? `key.keyboard.${identifier}` : null
+}
+
+export function minecraftMouseTokenFromButton(button: number): string | null {
+	if (!Number.isInteger(button) || button < 0 || button > 15) return null
+	if (button === 0) return 'key.mouse.left'
+	if (button === 1) return 'key.mouse.middle'
+	if (button === 2) return 'key.mouse.right'
+	return `key.mouse.${button + 1}`
+}
+
+function formatKeyboardLabel(
+	formatMessage: FormatMessage,
+	identifier: string,
+	isMac: boolean,
+): string {
+	if (identifier === 'unknown') return formatMessage(keyMessages.unbound)
+	if (/^[a-z]$/.test(identifier)) return identifier.toUpperCase()
+	if (/^[0-9]$/.test(identifier)) return identifier
+	if (/^f([1-9]|1[0-9]|2[0-5])$/.test(identifier)) return identifier.toUpperCase()
+
+	const keypad = /^keypad\.(.+)$/.exec(identifier)
+	if (keypad) {
+		const label = keyboardLabels[identifier]
+		const key = typeof label === 'string' ? label : label ? formatMessage(label) : keypad[1]
+		return formatMessage(keyMessages.keypadKey, { key })
+	}
+
+	if (identifier === 'left.win') {
+		return formatMessage(isMac ? keyMessages.leftCommand : keyMessages.leftSuper)
+	}
+	if (identifier === 'right.win') {
+		return formatMessage(isMac ? keyMessages.rightCommand : keyMessages.rightSuper)
+	}
+
+	const label = keyboardLabels[identifier]
+	if (typeof label === 'string') return label
+	if (label) return formatMessage(label)
+	return identifier
+		.split('.')
+		.map((part) => `${part.charAt(0).toUpperCase()}${part.slice(1)}`)
+		.join(' ')
+}
+
+function formatModifier(formatMessage: FormatMessage, modifier: string, isMac: boolean): string {
+	switch (modifier.toUpperCase()) {
+		case 'CONTROL':
+		case 'CTRL':
+			return formatMessage(keyMessages.controlModifier)
+		case 'SHIFT':
+			return formatMessage(keyMessages.shiftModifier)
+		case 'ALT':
+			return formatMessage(keyMessages.altModifier)
+		case 'META':
+		case 'SUPER':
+			return formatMessage(isMac ? keyMessages.commandModifier : keyMessages.superModifier)
+		default:
+			return modifier
+	}
+}
+
+export function formatMinecraftKeybind(
+	formatMessage: FormatMessage,
+	value: string,
+	isMac: boolean,
+): string {
+	const [key, modifier] = splitKeybind(value)
+	let label: string
+
+	if (key.startsWith('key.keyboard.')) {
+		label = formatKeyboardLabel(formatMessage, key.slice('key.keyboard.'.length), isMac)
+	} else if (key === 'key.mouse.left') {
+		label = formatMessage(keyMessages.leftMouse)
+	} else if (key === 'key.mouse.right') {
+		label = formatMessage(keyMessages.rightMouse)
+	} else if (key === 'key.mouse.middle') {
+		label = formatMessage(keyMessages.middleMouse)
+	} else if (key.startsWith('key.mouse.')) {
+		label = formatMessage(keyMessages.mouseButton, {
+			button: key.slice('key.mouse.'.length),
+		})
+	} else if (key.startsWith('scancode.')) {
+		label = formatMessage(keyMessages.scancode, { code: key.slice('scancode.'.length) })
+	} else {
+		label = formatMessage(keyMessages.unknownKey)
+	}
+
+	if (!modifier || key === 'key.keyboard.unknown') return label
+	const modifiers = modifier
+		.split(/[+:]/)
+		.filter(Boolean)
+		.map((part) => formatModifier(formatMessage, part, isMac))
+	return [...modifiers, label].join(' + ')
+}
+
+export function minecraftKeybindConflictKey(value: string): string | null {
+	const normalized = value.trim().toLowerCase()
+	if (!normalized || normalized === 'key.keyboard.unknown') return null
+	return normalized
+}
diff --git a/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-messages.ts b/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-messages.ts
index 96db3156f4..3deaec05c3 100644
--- a/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-messages.ts
+++ b/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-messages.ts
@@ -2,7 +2,6 @@ import { defineMessages, type MessageDescriptor, type VIntlFormatters } from '@m
 
 import type {
 	EditableGameSetting,
-	GameOptionCompatibilityBucket,
 	GameOptionValidationError,
 	GameOptionsSourceCandidate,
 	GameOptionsSourceDisabledReason,
@@ -13,53 +12,37 @@ type FormatMessage = VIntlFormatters['formatMessage']
 
 const settingMessages = defineMessages({
 	fovLabel: { id: 'app.settings.game-options.setting.fov.label', defaultMessage: 'Field of view' },
-	fovDescription: { id: 'app.settings.game-options.setting.fov.description', defaultMessage: 'The camera field of view.' },
 	graphicsLabel: { id: 'app.settings.game-options.setting.graphics.label', defaultMessage: 'Graphics' },
-	graphicsDescription: { id: 'app.settings.game-options.setting.graphics.description', defaultMessage: 'The overall graphics quality preset.' },
+	graphicsDescription: { id: 'app.settings.game-options.setting.graphics.description', defaultMessage: 'Controls Minecraft\'s graphics quality and performance.' },
 	ambientOcclusionLabel: { id: 'app.settings.game-options.setting.ambient-occlusion.label', defaultMessage: 'Smooth lighting' },
-	ambientOcclusionDescription: { id: 'app.settings.game-options.setting.ambient-occlusion.description', defaultMessage: 'Smooth lighting on block faces.' },
 	renderDistanceLabel: { id: 'app.settings.game-options.setting.render-distance.label', defaultMessage: 'Render distance' },
-	renderDistanceDescription: { id: 'app.settings.game-options.setting.render-distance.description', defaultMessage: 'How far terrain is rendered.' },
 	simulationDistanceLabel: { id: 'app.settings.game-options.setting.simulation-distance.label', defaultMessage: 'Simulation distance' },
 	simulationDistanceDescription: { id: 'app.settings.game-options.setting.simulation-distance.description', defaultMessage: 'How far the world is simulated.' },
 	guiScaleLabel: { id: 'app.settings.game-options.setting.gui-scale.label', defaultMessage: 'GUI scale' },
 	guiScaleDescription: { id: 'app.settings.game-options.setting.gui-scale.description', defaultMessage: 'The size of the game interface.' },
 	particlesLabel: { id: 'app.settings.game-options.setting.particles.label', defaultMessage: 'Particles' },
-	particlesDescription: { id: 'app.settings.game-options.setting.particles.description', defaultMessage: 'How many particles are shown.' },
 	cloudsLabel: { id: 'app.settings.game-options.setting.clouds.label', defaultMessage: 'Clouds' },
-	cloudsDescription: { id: 'app.settings.game-options.setting.clouds.description', defaultMessage: 'The cloud rendering quality.' },
 	entityShadowsLabel: { id: 'app.settings.game-options.setting.entity-shadows.label', defaultMessage: 'Entity shadows' },
-	entityShadowsDescription: { id: 'app.settings.game-options.setting.entity-shadows.description', defaultMessage: 'Show shadows beneath entities.' },
 	viewBobbingLabel: { id: 'app.settings.game-options.setting.view-bobbing.label', defaultMessage: 'View bobbing' },
 	viewBobbingDescription: { id: 'app.settings.game-options.setting.view-bobbing.description', defaultMessage: 'Move the camera while walking.' },
 	vsyncLabel: { id: 'app.settings.game-options.setting.vsync.label', defaultMessage: 'VSync' },
 	vsyncDescription: { id: 'app.settings.game-options.setting.vsync.description', defaultMessage: 'Synchronize frames with the display.' },
 	fullscreenLabel: { id: 'app.settings.game-options.setting.fullscreen.label', defaultMessage: 'Fullscreen' },
-	fullscreenDescription: { id: 'app.settings.game-options.setting.fullscreen.description', defaultMessage: 'Start the game in fullscreen.' },
 	maxFramerateLabel: { id: 'app.settings.game-options.setting.max-framerate.label', defaultMessage: 'Maximum framerate' },
-	maxFramerateDescription: { id: 'app.settings.game-options.setting.max-framerate.description', defaultMessage: 'The maximum rendered frames per second.' },
 	mipmapLevelsLabel: { id: 'app.settings.game-options.setting.mipmap-levels.label', defaultMessage: 'Mipmap levels' },
 	mipmapLevelsDescription: { id: 'app.settings.game-options.setting.mipmap-levels.description', defaultMessage: 'Texture smoothing at a distance.' },
 	biomeBlendRadiusLabel: { id: 'app.settings.game-options.setting.biome-blend-radius.label', defaultMessage: 'Biome blend' },
 	biomeBlendRadiusDescription: { id: 'app.settings.game-options.setting.biome-blend-radius.description', defaultMessage: 'How smoothly biome colors blend.' },
 	languageLabel: { id: 'app.settings.game-options.setting.language.label', defaultMessage: 'Language' },
-	languageDescription: { id: 'app.settings.game-options.setting.language.description', defaultMessage: 'The language used by Minecraft.' },
 	masterVolumeLabel: { id: 'app.settings.game-options.setting.master-volume.label', defaultMessage: 'Master volume' },
-	masterVolumeDescription: { id: 'app.settings.game-options.setting.master-volume.description', defaultMessage: 'Overall game volume.' },
 	musicVolumeLabel: { id: 'app.settings.game-options.setting.music-volume.label', defaultMessage: 'Music' },
-	musicVolumeDescription: { id: 'app.settings.game-options.setting.music-volume.description', defaultMessage: 'Music volume.' },
 	musicToastLabel: { id: 'app.settings.game-options.setting.music-toast.label', defaultMessage: 'Music notification' },
 	musicToastDescription: { id: 'app.settings.game-options.setting.music-toast.description', defaultMessage: 'Choose when Minecraft pauses music and shows its title.' },
 	blocksVolumeLabel: { id: 'app.settings.game-options.setting.blocks-volume.label', defaultMessage: 'Blocks' },
-	blocksVolumeDescription: { id: 'app.settings.game-options.setting.blocks-volume.description', defaultMessage: 'Block sound volume.' },
 	hostileVolumeLabel: { id: 'app.settings.game-options.setting.hostile-volume.label', defaultMessage: 'Hostile creatures' },
-	hostileVolumeDescription: { id: 'app.settings.game-options.setting.hostile-volume.description', defaultMessage: 'Hostile creature volume.' },
 	playersVolumeLabel: { id: 'app.settings.game-options.setting.players-volume.label', defaultMessage: 'Players' },
-	playersVolumeDescription: { id: 'app.settings.game-options.setting.players-volume.description', defaultMessage: 'Player sound volume.' },
 	voiceVolumeLabel: { id: 'app.settings.game-options.setting.voice-volume.label', defaultMessage: 'Voice and speech' },
-	voiceVolumeDescription: { id: 'app.settings.game-options.setting.voice-volume.description', defaultMessage: 'Voice and speech volume.' },
 	sensitivityLabel: { id: 'app.settings.game-options.setting.sensitivity.label', defaultMessage: 'Mouse sensitivity' },
-	sensitivityDescription: { id: 'app.settings.game-options.setting.sensitivity.description', defaultMessage: 'Mouse look sensitivity.' },
 	invertMouseLabel: { id: 'app.settings.game-options.setting.invert-mouse.label', defaultMessage: 'Invert mouse' },
 	invertMouseDescription: { id: 'app.settings.game-options.setting.invert-mouse.description', defaultMessage: 'Invert vertical mouse movement.' },
 	autoJumpLabel: { id: 'app.settings.game-options.setting.auto-jump.label', defaultMessage: 'Auto-jump' },
@@ -71,49 +54,27 @@ const settingMessages = defineMessages({
 	discreteMouseScrollLabel: { id: 'app.settings.game-options.setting.discrete-mouse-scroll.label', defaultMessage: 'Discrete scrolling' },
 	discreteMouseScrollDescription: { id: 'app.settings.game-options.setting.discrete-mouse-scroll.description', defaultMessage: 'Use discrete mouse-wheel steps.' },
 	keyForwardLabel: { id: 'app.settings.game-options.setting.key-forward.label', defaultMessage: 'Move forward' },
-	keyForwardDescription: { id: 'app.settings.game-options.setting.key-forward.description', defaultMessage: 'The key used to move forward.' },
 	keyLeftLabel: { id: 'app.settings.game-options.setting.key-left.label', defaultMessage: 'Strafe left' },
-	keyLeftDescription: { id: 'app.settings.game-options.setting.key-left.description', defaultMessage: 'The key used to move left.' },
 	keyBackLabel: { id: 'app.settings.game-options.setting.key-back.label', defaultMessage: 'Move backward' },
-	keyBackDescription: { id: 'app.settings.game-options.setting.key-back.description', defaultMessage: 'The key used to move backward.' },
 	keyRightLabel: { id: 'app.settings.game-options.setting.key-right.label', defaultMessage: 'Strafe right' },
-	keyRightDescription: { id: 'app.settings.game-options.setting.key-right.description', defaultMessage: 'The key used to move right.' },
 	keyJumpLabel: { id: 'app.settings.game-options.setting.key-jump.label', defaultMessage: 'Jump' },
-	keyJumpDescription: { id: 'app.settings.game-options.setting.key-jump.description', defaultMessage: 'The key used to jump.' },
 	keySneakLabel: { id: 'app.settings.game-options.setting.key-sneak.label', defaultMessage: 'Sneak' },
-	keySneakDescription: { id: 'app.settings.game-options.setting.key-sneak.description', defaultMessage: 'The key used to sneak.' },
 	keySprintLabel: { id: 'app.settings.game-options.setting.key-sprint.label', defaultMessage: 'Sprint' },
-	keySprintDescription: { id: 'app.settings.game-options.setting.key-sprint.description', defaultMessage: 'The key used to sprint.' },
 	keyInventoryLabel: { id: 'app.settings.game-options.setting.key-inventory.label', defaultMessage: 'Inventory' },
-	keyInventoryDescription: { id: 'app.settings.game-options.setting.key-inventory.description', defaultMessage: 'The key used to open the inventory.' },
 	keySwapOffhandLabel: { id: 'app.settings.game-options.setting.key-swap-offhand.label', defaultMessage: 'Swap offhand' },
-	keySwapOffhandDescription: { id: 'app.settings.game-options.setting.key-swap-offhand.description', defaultMessage: 'The key used to swap the held item.' },
 	keyDropLabel: { id: 'app.settings.game-options.setting.key-drop.label', defaultMessage: 'Drop item' },
-	keyDropDescription: { id: 'app.settings.game-options.setting.key-drop.description', defaultMessage: 'The key used to drop an item.' },
 	keyUseLabel: { id: 'app.settings.game-options.setting.key-use.label', defaultMessage: 'Use item' },
-	keyUseDescription: { id: 'app.settings.game-options.setting.key-use.description', defaultMessage: 'The key used to use an item.' },
 	keyAttackLabel: { id: 'app.settings.game-options.setting.key-attack.label', defaultMessage: 'Attack' },
-	keyAttackDescription: { id: 'app.settings.game-options.setting.key-attack.description', defaultMessage: 'The key used to attack.' },
 	keyPickItemLabel: { id: 'app.settings.game-options.setting.key-pick-item.label', defaultMessage: 'Pick block' },
-	keyPickItemDescription: { id: 'app.settings.game-options.setting.key-pick-item.description', defaultMessage: 'The key used to pick a block.' },
 	keyChatLabel: { id: 'app.settings.game-options.setting.key-chat.label', defaultMessage: 'Open chat' },
-	keyChatDescription: { id: 'app.settings.game-options.setting.key-chat.description', defaultMessage: 'The key used to open chat.' },
 	keyPlayerListLabel: { id: 'app.settings.game-options.setting.key-player-list.label', defaultMessage: 'Player list' },
-	keyPlayerListDescription: { id: 'app.settings.game-options.setting.key-player-list.description', defaultMessage: 'The key used to show the player list.' },
 	keyCommandLabel: { id: 'app.settings.game-options.setting.key-command.label', defaultMessage: 'Command' },
-	keyCommandDescription: { id: 'app.settings.game-options.setting.key-command.description', defaultMessage: 'The key used to enter a command.' },
 	keyScreenshotLabel: { id: 'app.settings.game-options.setting.key-screenshot.label', defaultMessage: 'Screenshot' },
-	keyScreenshotDescription: { id: 'app.settings.game-options.setting.key-screenshot.description', defaultMessage: 'The key used to take a screenshot.' },
 	keyPerspectiveLabel: { id: 'app.settings.game-options.setting.key-perspective.label', defaultMessage: 'Change perspective' },
-	keyPerspectiveDescription: { id: 'app.settings.game-options.setting.key-perspective.description', defaultMessage: 'The key used to change camera perspective.' },
 	keyFullscreenLabel: { id: 'app.settings.game-options.setting.key-fullscreen.label', defaultMessage: 'Toggle fullscreen' },
-	keyFullscreenDescription: { id: 'app.settings.game-options.setting.key-fullscreen.description', defaultMessage: 'The key used to toggle fullscreen.' },
 	keyAdvancementsLabel: { id: 'app.settings.game-options.setting.key-advancements.label', defaultMessage: 'Advancements' },
-	keyAdvancementsDescription: { id: 'app.settings.game-options.setting.key-advancements.description', defaultMessage: 'The key used to open advancements.' },
 	chatVisibilityLabel: { id: 'app.settings.game-options.setting.chat-visibility.label', defaultMessage: 'Chat visibility' },
-	chatVisibilityDescription: { id: 'app.settings.game-options.setting.chat-visibility.description', defaultMessage: 'Choose which chat messages are visible.' },
 	chatColorsLabel: { id: 'app.settings.game-options.setting.chat-colors.label', defaultMessage: 'Chat colors' },
-	chatColorsDescription: { id: 'app.settings.game-options.setting.chat-colors.description', defaultMessage: 'Show colors in chat messages.' },
 	chatLinksLabel: { id: 'app.settings.game-options.setting.chat-links.label', defaultMessage: 'Web links' },
 	chatLinksDescription: { id: 'app.settings.game-options.setting.chat-links.description', defaultMessage: 'Allow links in chat.' },
 	chatLinksPromptLabel: { id: 'app.settings.game-options.setting.chat-links-prompt.label', defaultMessage: 'Prompt on links' },
@@ -121,7 +82,6 @@ const settingMessages = defineMessages({
 	chatOpacityLabel: { id: 'app.settings.game-options.setting.chat-opacity.label', defaultMessage: 'Chat opacity' },
 	chatOpacityDescription: { id: 'app.settings.game-options.setting.chat-opacity.description', defaultMessage: 'The opacity of chat text.' },
 	chatScaleLabel: { id: 'app.settings.game-options.setting.chat-scale.label', defaultMessage: 'Chat scale' },
-	chatScaleDescription: { id: 'app.settings.game-options.setting.chat-scale.description', defaultMessage: 'The size of the chat interface.' },
 	narratorLabel: { id: 'app.settings.game-options.setting.narrator.label', defaultMessage: 'Narrator' },
 	narratorDescription: { id: 'app.settings.game-options.setting.narrator.description', defaultMessage: 'Choose what the narrator reads.' },
 	subtitlesLabel: { id: 'app.settings.game-options.setting.subtitles.label', defaultMessage: 'Subtitles' },
@@ -143,8 +103,6 @@ const settingMessages = defineMessages({
 	allowServerListingLabel: { id: 'app.settings.game-options.setting.allow-server-listing.label', defaultMessage: 'Server listings' },
 	allowServerListingDescription: { id: 'app.settings.game-options.setting.allow-server-listing.description', defaultMessage: 'Allow servers to list this player online.' },
 	realmsNotificationsLabel: { id: 'app.settings.game-options.setting.realms-notifications.label', defaultMessage: 'Realms notifications' },
-	realmsNotificationsDescription: { id: 'app.settings.game-options.setting.realms-notifications.description', defaultMessage: 'Show notifications from Realms.' },
-	customDescription: { id: 'app.settings.game-options.setting.custom.description', defaultMessage: 'A setting stored in options.txt by a mod or an unrecognized client extension.' },
 })
 
 const categoryMessages = defineMessages({
@@ -165,13 +123,14 @@ const categoryMessages = defineMessages({
 	onlineLabel: { id: 'app.settings.game-options.category.online.label', defaultMessage: 'Online' },
 	onlineDescription: { id: 'app.settings.game-options.category.online.description', defaultMessage: 'Online and Realms preferences' },
 	customLabel: { id: 'app.settings.game-options.category.custom.label', defaultMessage: 'Custom settings' },
-	customDescription: { id: 'app.settings.game-options.category.custom.description', defaultMessage: 'Settings added by mods or unrecognized clients' },
+	customDescription: { id: 'app.settings.game-options.category.custom.description', defaultMessage: 'Settings added by mods' },
 })
 
 const choiceMessages = defineMessages({
 	fast: { id: 'app.settings.game-options.choice.fast', defaultMessage: 'Fast' },
 	fancy: { id: 'app.settings.game-options.choice.fancy', defaultMessage: 'Fancy' },
 	fabulous: { id: 'app.settings.game-options.choice.fabulous', defaultMessage: 'Fabulous' },
+	custom: { id: 'app.settings.game-options.choice.custom', defaultMessage: 'Custom' },
 	left: { id: 'app.settings.game-options.choice.left', defaultMessage: 'Left' },
 	right: { id: 'app.settings.game-options.choice.right', defaultMessage: 'Right' },
 	shown: { id: 'app.settings.game-options.choice.shown', defaultMessage: 'Shown' },
@@ -192,31 +151,23 @@ const choiceMessages = defineMessages({
 })
 
 export const presentationMessages = defineMessages({
-	customValuePlaceholder: { id: 'app.settings.game-options.custom-value.placeholder', defaultMessage: 'Raw options.txt value' },
-	validationLocalValueNeedsSaving: { id: 'app.settings.game-options.validation.local-value-needs-saving', defaultMessage: 'Save this local value to resume syncing this setting.' },
-	validationMissingValue: { id: 'app.settings.game-options.validation.missing-value', defaultMessage: 'Choose a value before enabling sync.' },
-	validationNoCompatibleInstances: { id: 'app.settings.game-options.validation.no-compatible-instances', defaultMessage: 'This setting is not compatible with any participating instances.' },
-	validationInvalidValue: { id: 'app.settings.game-options.validation.invalid-value', defaultMessage: 'Enter a valid value for this setting.' },
-	validationChangedSinceOpened: { id: 'app.settings.game-options.validation.changed-since-opened', defaultMessage: 'Changed elsewhere. Review this setting before saving again.' },
-	compatibilityNoParticipants: { id: 'app.settings.game-options.compatibility.no-participants', defaultMessage: 'Will sync when an instance participates' },
-	compatibilityNone: { id: 'app.settings.game-options.compatibility.none', defaultMessage: 'Not compatible with current instances' },
-	compatibilityAll: { id: 'app.settings.game-options.compatibility.all', defaultMessage: 'Syncs to all {count, plural, one {# instance} other {# instances}}' },
-	compatibilityAllDisabled: { id: 'app.settings.game-options.compatibility.all-disabled', defaultMessage: 'Would sync to all {count, plural, one {# instance} other {# instances}}' },
-	compatibilitySome: { id: 'app.settings.game-options.compatibility.some', defaultMessage: 'Syncs to {recipients} of {total, plural, one {# instance} other {# instances}}' },
-	compatibilitySomeDisabled: { id: 'app.settings.game-options.compatibility.some-disabled', defaultMessage: 'Would sync to {recipients} of {total, plural, one {# instance} other {# instances}}' },
-	compatibilityTooltipNoParticipants: { id: 'app.settings.game-options.compatibility.tooltip.no-participants', defaultMessage: 'This setting will begin syncing when an instance participates.' },
-	compatibilityTooltipRecipients: { id: 'app.settings.game-options.compatibility.tooltip.recipients', defaultMessage: 'This setting will sync to {recipients} of {total, plural, one {# participating instance} other {# participating instances}}.' },
-	bucketLauncherControlled: { id: 'app.settings.game-options.compatibility.reason.launcher-controlled', defaultMessage: '{count, plural, one {# instance has this setting controlled by its launch settings.} other {# instances have this setting controlled by their launch settings.}}' },
-	bucketCatalogUncovered: { id: 'app.settings.game-options.compatibility.reason.catalog-uncovered', defaultMessage: '{count, plural, one {# instance uses a Minecraft version this setting catalog does not cover.} other {# instances use Minecraft versions this setting catalog does not cover.}}' },
-	bucketInspectionFailed: { id: 'app.settings.game-options.compatibility.reason.inspection-failed', defaultMessage: '{count, plural, one {# instance could not be inspected, so its local value is kept.} other {# instances could not be inspected, so their local values are kept.}}' },
-	bucketWaitingForOptionsFile: { id: 'app.settings.game-options.compatibility.reason.waiting-for-options-file', defaultMessage: '{count, plural, one {# instance is waiting for Minecraft to create options.txt.} other {# instances are waiting for Minecraft to create options.txt.}}' },
-	bucketUnsupportedValue: { id: 'app.settings.game-options.compatibility.reason.unsupported-value', defaultMessage: '{count, plural, one {# instance cannot represent the selected value.} other {# instances cannot represent the selected value.}}' },
-	bucketMigratesOnWrite: { id: 'app.settings.game-options.compatibility.reason.migrates-on-write', defaultMessage: '{count, plural, one {# instance will migrate this setting when options.txt is written.} other {# instances will migrate this setting when their options.txt files are written.}}' },
-	bucketWaitingForCompatibleBase: { id: 'app.settings.game-options.compatibility.reason.waiting-for-compatible-base', defaultMessage: '{count, plural, one {# instance is waiting for a compatible modpack options.txt base.} other {# instances are waiting for a compatible modpack options.txt base.}}' },
-	bucketMissingSetting: { id: 'app.settings.game-options.compatibility.reason.missing-setting', defaultMessage: '{count, plural, one {# instance does not currently contain this setting.} other {# instances do not currently contain this setting.}}' },
-	bucketVersionsAndKeys: { id: 'app.settings.game-options.compatibility.bucket-context.versions-and-keys', defaultMessage: 'Minecraft versions: {versions}. options.txt keys: {keys}.' },
-	bucketVersions: { id: 'app.settings.game-options.compatibility.bucket-context.versions', defaultMessage: 'Minecraft versions: {versions}.' },
-	bucketKeys: { id: 'app.settings.game-options.compatibility.bucket-context.keys', defaultMessage: 'options.txt keys: {keys}.' },
+	customValuePlaceholder: { id: 'app.settings.game-options.custom-value.placeholder', defaultMessage: 'Enter a value' },
+	validationLocalValueNeedsSaving: { id: 'app.settings.game-options.validation.local-value-needs-saving', defaultMessage: 'Save this value before turning sync back on.' },
+	validationMissingValue: { id: 'app.settings.game-options.validation.missing-value', defaultMessage: 'Choose a value first.' },
+	validationNoCompatibleInstances: { id: 'app.settings.game-options.validation.no-compatible-instances', defaultMessage: 'Some of your instances cannot use this setting' },
+	validationInvalidValue: { id: 'app.settings.game-options.validation.invalid-value', defaultMessage: 'Choose a valid value.' },
+	validationChangedSinceOpened: { id: 'app.settings.game-options.validation.changed-since-opened', defaultMessage: 'This setting changed elsewhere. Check it and try again.' },
+	compatibilityNoParticipants: { id: 'app.settings.game-options.compatibility.no-participants', defaultMessage: 'Add an instance to start syncing' },
+	compatibilityNone: { id: 'app.settings.game-options.compatibility.none', defaultMessage: 'Some of your instances cannot use this setting' },
+	compatibilityAll: { id: 'app.settings.game-options.compatibility.all', defaultMessage: 'Syncs to {count, plural, one {# instance} other {# instances}}' },
+	compatibilityAllDisabled: { id: 'app.settings.game-options.compatibility.all-disabled', defaultMessage: 'Sync is off' },
+	compatibilitySome: { id: 'app.settings.game-options.compatibility.some', defaultMessage: 'Some of your instances cannot use this setting' },
+	compatibilitySomeDisabled: { id: 'app.settings.game-options.compatibility.some-disabled', defaultMessage: 'Some of your instances cannot use this setting' },
+	compatibilityTooltipNoParticipants: { id: 'app.settings.game-options.compatibility.tooltip.no-participants', defaultMessage: 'Add an instance to start syncing this setting.' },
+	compatibilityTooltipAll: { id: 'app.settings.game-options.compatibility.tooltip.all', defaultMessage: 'All of your instances can use this setting.' },
+	compatibilityTooltipLimited: { id: 'app.settings.game-options.compatibility.tooltip.recipients', defaultMessage: 'Some of your instances cannot use this setting' },
+	compatibilityTooltipWaiting: { id: 'app.settings.game-options.compatibility.tooltip.waiting', defaultMessage: '{count, plural, one {Launch this instance once before syncing this setting.} other {Launch these instances once before syncing this setting.}}' },
+	bucketLauncherControlled: { id: 'app.settings.game-options.compatibility.reason.launcher-controlled', defaultMessage: 'This setting is managed by Modrinth’s launch settings.' },
 	sourceInstallingOrUpdating: { id: 'app.settings.game-options.source.disabled.installing-or-updating', defaultMessage: 'Installing or updating' },
 	sourceRunning: { id: 'app.settings.game-options.source.disabled.running', defaultMessage: 'Currently running' },
 	sourceUnsupportedVersion: { id: 'app.settings.game-options.source.disabled.unsupported-version', defaultMessage: 'Unsupported Minecraft version' },
@@ -226,62 +177,62 @@ export const presentationMessages = defineMessages({
 	sourceSettingsSummary: { id: 'app.settings.game-options.source.settings-summary', defaultMessage: '{recognized, plural, one {# recognized setting} other {# recognized settings}}, {custom, plural, one {# custom setting} other {# custom settings}}' },
 })
 
-const knownSettings: Record<string, { label: MessageDescriptor; description: MessageDescriptor }> = {
-	fov: { label: settingMessages.fovLabel, description: settingMessages.fovDescription },
+const knownSettings: Record<string, { label: MessageDescriptor; description?: MessageDescriptor }> = {
+	fov: { label: settingMessages.fovLabel },
 	graphics: { label: settingMessages.graphicsLabel, description: settingMessages.graphicsDescription },
-	ambient_occlusion: { label: settingMessages.ambientOcclusionLabel, description: settingMessages.ambientOcclusionDescription },
-	render_distance: { label: settingMessages.renderDistanceLabel, description: settingMessages.renderDistanceDescription },
+	ambient_occlusion: { label: settingMessages.ambientOcclusionLabel },
+	render_distance: { label: settingMessages.renderDistanceLabel },
 	simulation_distance: { label: settingMessages.simulationDistanceLabel, description: settingMessages.simulationDistanceDescription },
 	gui_scale: { label: settingMessages.guiScaleLabel, description: settingMessages.guiScaleDescription },
-	particles: { label: settingMessages.particlesLabel, description: settingMessages.particlesDescription },
-	clouds: { label: settingMessages.cloudsLabel, description: settingMessages.cloudsDescription },
-	entity_shadows: { label: settingMessages.entityShadowsLabel, description: settingMessages.entityShadowsDescription },
+	particles: { label: settingMessages.particlesLabel },
+	clouds: { label: settingMessages.cloudsLabel },
+	entity_shadows: { label: settingMessages.entityShadowsLabel },
 	view_bobbing: { label: settingMessages.viewBobbingLabel, description: settingMessages.viewBobbingDescription },
 	vsync: { label: settingMessages.vsyncLabel, description: settingMessages.vsyncDescription },
-	fullscreen: { label: settingMessages.fullscreenLabel, description: settingMessages.fullscreenDescription },
-	max_framerate: { label: settingMessages.maxFramerateLabel, description: settingMessages.maxFramerateDescription },
+	fullscreen: { label: settingMessages.fullscreenLabel },
+	max_framerate: { label: settingMessages.maxFramerateLabel },
 	mipmap_levels: { label: settingMessages.mipmapLevelsLabel, description: settingMessages.mipmapLevelsDescription },
 	biome_blend_radius: { label: settingMessages.biomeBlendRadiusLabel, description: settingMessages.biomeBlendRadiusDescription },
-	language: { label: settingMessages.languageLabel, description: settingMessages.languageDescription },
-	master_volume: { label: settingMessages.masterVolumeLabel, description: settingMessages.masterVolumeDescription },
-	music_volume: { label: settingMessages.musicVolumeLabel, description: settingMessages.musicVolumeDescription },
+	language: { label: settingMessages.languageLabel },
+	master_volume: { label: settingMessages.masterVolumeLabel },
+	music_volume: { label: settingMessages.musicVolumeLabel },
 	music_toast: { label: settingMessages.musicToastLabel, description: settingMessages.musicToastDescription },
-	blocks_volume: { label: settingMessages.blocksVolumeLabel, description: settingMessages.blocksVolumeDescription },
-	hostile_volume: { label: settingMessages.hostileVolumeLabel, description: settingMessages.hostileVolumeDescription },
-	players_volume: { label: settingMessages.playersVolumeLabel, description: settingMessages.playersVolumeDescription },
-	voice_volume: { label: settingMessages.voiceVolumeLabel, description: settingMessages.voiceVolumeDescription },
-	sensitivity: { label: settingMessages.sensitivityLabel, description: settingMessages.sensitivityDescription },
+	blocks_volume: { label: settingMessages.blocksVolumeLabel },
+	hostile_volume: { label: settingMessages.hostileVolumeLabel },
+	players_volume: { label: settingMessages.playersVolumeLabel },
+	voice_volume: { label: settingMessages.voiceVolumeLabel },
+	sensitivity: { label: settingMessages.sensitivityLabel },
 	invert_mouse: { label: settingMessages.invertMouseLabel, description: settingMessages.invertMouseDescription },
 	auto_jump: { label: settingMessages.autoJumpLabel, description: settingMessages.autoJumpDescription },
 	toggle_crouch: { label: settingMessages.toggleCrouchLabel, description: settingMessages.toggleCrouchDescription },
 	toggle_sprint: { label: settingMessages.toggleSprintLabel, description: settingMessages.toggleSprintDescription },
 	discrete_mouse_scroll: { label: settingMessages.discreteMouseScrollLabel, description: settingMessages.discreteMouseScrollDescription },
-	'key.forward': { label: settingMessages.keyForwardLabel, description: settingMessages.keyForwardDescription },
-	'key.left': { label: settingMessages.keyLeftLabel, description: settingMessages.keyLeftDescription },
-	'key.back': { label: settingMessages.keyBackLabel, description: settingMessages.keyBackDescription },
-	'key.right': { label: settingMessages.keyRightLabel, description: settingMessages.keyRightDescription },
-	'key.jump': { label: settingMessages.keyJumpLabel, description: settingMessages.keyJumpDescription },
-	'key.sneak': { label: settingMessages.keySneakLabel, description: settingMessages.keySneakDescription },
-	'key.sprint': { label: settingMessages.keySprintLabel, description: settingMessages.keySprintDescription },
-	'key.inventory': { label: settingMessages.keyInventoryLabel, description: settingMessages.keyInventoryDescription },
-	'key.swap_offhand': { label: settingMessages.keySwapOffhandLabel, description: settingMessages.keySwapOffhandDescription },
-	'key.drop': { label: settingMessages.keyDropLabel, description: settingMessages.keyDropDescription },
-	'key.use': { label: settingMessages.keyUseLabel, description: settingMessages.keyUseDescription },
-	'key.attack': { label: settingMessages.keyAttackLabel, description: settingMessages.keyAttackDescription },
-	'key.pick_item': { label: settingMessages.keyPickItemLabel, description: settingMessages.keyPickItemDescription },
-	'key.chat': { label: settingMessages.keyChatLabel, description: settingMessages.keyChatDescription },
-	'key.player_list': { label: settingMessages.keyPlayerListLabel, description: settingMessages.keyPlayerListDescription },
-	'key.command': { label: settingMessages.keyCommandLabel, description: settingMessages.keyCommandDescription },
-	'key.screenshot': { label: settingMessages.keyScreenshotLabel, description: settingMessages.keyScreenshotDescription },
-	'key.perspective': { label: settingMessages.keyPerspectiveLabel, description: settingMessages.keyPerspectiveDescription },
-	'key.fullscreen': { label: settingMessages.keyFullscreenLabel, description: settingMessages.keyFullscreenDescription },
-	'key.advancements': { label: settingMessages.keyAdvancementsLabel, description: settingMessages.keyAdvancementsDescription },
-	chat_visibility: { label: settingMessages.chatVisibilityLabel, description: settingMessages.chatVisibilityDescription },
-	chat_colors: { label: settingMessages.chatColorsLabel, description: settingMessages.chatColorsDescription },
+	'key.forward': { label: settingMessages.keyForwardLabel },
+	'key.left': { label: settingMessages.keyLeftLabel },
+	'key.back': { label: settingMessages.keyBackLabel },
+	'key.right': { label: settingMessages.keyRightLabel },
+	'key.jump': { label: settingMessages.keyJumpLabel },
+	'key.sneak': { label: settingMessages.keySneakLabel },
+	'key.sprint': { label: settingMessages.keySprintLabel },
+	'key.inventory': { label: settingMessages.keyInventoryLabel },
+	'key.swap_offhand': { label: settingMessages.keySwapOffhandLabel },
+	'key.drop': { label: settingMessages.keyDropLabel },
+	'key.use': { label: settingMessages.keyUseLabel },
+	'key.attack': { label: settingMessages.keyAttackLabel },
+	'key.pick_item': { label: settingMessages.keyPickItemLabel },
+	'key.chat': { label: settingMessages.keyChatLabel },
+	'key.player_list': { label: settingMessages.keyPlayerListLabel },
+	'key.command': { label: settingMessages.keyCommandLabel },
+	'key.screenshot': { label: settingMessages.keyScreenshotLabel },
+	'key.perspective': { label: settingMessages.keyPerspectiveLabel },
+	'key.fullscreen': { label: settingMessages.keyFullscreenLabel },
+	'key.advancements': { label: settingMessages.keyAdvancementsLabel },
+	chat_visibility: { label: settingMessages.chatVisibilityLabel },
+	chat_colors: { label: settingMessages.chatColorsLabel },
 	chat_links: { label: settingMessages.chatLinksLabel, description: settingMessages.chatLinksDescription },
 	chat_links_prompt: { label: settingMessages.chatLinksPromptLabel, description: settingMessages.chatLinksPromptDescription },
 	chat_opacity: { label: settingMessages.chatOpacityLabel, description: settingMessages.chatOpacityDescription },
-	chat_scale: { label: settingMessages.chatScaleLabel, description: settingMessages.chatScaleDescription },
+	chat_scale: { label: settingMessages.chatScaleLabel },
 	narrator: { label: settingMessages.narratorLabel, description: settingMessages.narratorDescription },
 	subtitles: { label: settingMessages.subtitlesLabel, description: settingMessages.subtitlesDescription },
 	high_contrast: { label: settingMessages.highContrastLabel, description: settingMessages.highContrastDescription },
@@ -292,7 +243,7 @@ const knownSettings: Record<string, { label: MessageDescriptor; description: Mes
 	hat: { label: settingMessages.hatLabel, description: settingMessages.hatDescription },
 	jacket: { label: settingMessages.jacketLabel, description: settingMessages.jacketDescription },
 	allow_server_listing: { label: settingMessages.allowServerListingLabel, description: settingMessages.allowServerListingDescription },
-	realms_notifications: { label: settingMessages.realmsNotificationsLabel, description: settingMessages.realmsNotificationsDescription },
+	realms_notifications: { label: settingMessages.realmsNotificationsLabel },
 }
 
 const categories: Record<string, { label: MessageDescriptor; description: MessageDescriptor }> = {
@@ -314,6 +265,7 @@ const choices: Record<string, MessageDescriptor> = {
 	'graphics:fast': choiceMessages.fast,
 	'graphics:fancy': choiceMessages.fancy,
 	'graphics:fabulous': choiceMessages.fabulous,
+	'graphics:custom': choiceMessages.custom,
 	'main_hand:left': choiceMessages.left,
 	'main_hand:right': choiceMessages.right,
 	'chat_visibility:0': choiceMessages.shown,
@@ -338,20 +290,6 @@ const choices: Record<string, MessageDescriptor> = {
 	'music_toast:pause_and_toast': choiceMessages.pauseAndToast,
 }
 
-const bucketReasonMessages: Record<
-	NonNullable<GameOptionCompatibilityBucket['reason']>,
-	MessageDescriptor
-> = {
-	launcher_controlled: presentationMessages.bucketLauncherControlled,
-	catalog_uncovered: presentationMessages.bucketCatalogUncovered,
-	inspection_failed: presentationMessages.bucketInspectionFailed,
-	waiting_for_options_file: presentationMessages.bucketWaitingForOptionsFile,
-	unsupported_value: presentationMessages.bucketUnsupportedValue,
-	migrates_on_write: presentationMessages.bucketMigratesOnWrite,
-	waiting_for_compatible_base: presentationMessages.bucketWaitingForCompatibleBase,
-	missing_setting: presentationMessages.bucketMissingSetting,
-}
-
 const validationMessages: Record<GameOptionValidationError, MessageDescriptor> = {
 	local_value_needs_saving: presentationMessages.validationLocalValueNeedsSaving,
 	missing_value: presentationMessages.validationMissingValue,
@@ -376,14 +314,22 @@ export function formatGameSettingLabel(formatMessage: FormatMessage, setting: Ed
 }
 
 export function formatGameSettingDescription(formatMessage: FormatMessage, setting: EditableGameSetting): string {
-	if (setting.kind === 'external') return formatMessage(settingMessages.customDescription)
+	if (setting.kind === 'external') return ''
 	const definition = knownSettings[setting.option_id]
-	return definition ? formatMessage(definition.description) : ''
+	return definition?.description ? formatMessage(definition.description) : ''
+}
+
+export function gameSettingCategoryMessage(category: GameSettingCategory): MessageDescriptor {
+	return (
+		categories[category.id]?.label ?? {
+			id: `app.settings.game-options.category.${category.id}.label`,
+			defaultMessage: category.id,
+		}
+	)
 }
 
 export function formatGameSettingCategory(formatMessage: FormatMessage, category: GameSettingCategory): string {
-	const definition = categories[category.id]
-	return definition ? formatMessage(definition.label) : category.id
+	return formatMessage(gameSettingCategoryMessage(category))
 }
 
 export function formatGameSettingChoice(formatMessage: FormatMessage, optionId: string, value: string): string {
@@ -417,39 +363,28 @@ export function formatCompatibilitySubtitle(formatMessage: FormatMessage, settin
 
 export function formatCompatibilityTooltip(formatMessage: FormatMessage, setting: EditableGameSetting): string {
 	const summary = setting.compatibility
-	const lines = [
-		summary.total_participating === 0
-			? formatMessage(presentationMessages.compatibilityTooltipNoParticipants)
-			: formatMessage(presentationMessages.compatibilityTooltipRecipients, {
-					recipients: summary.will_receive,
-					total: summary.total_participating,
-				}),
-	]
-
-	for (const bucket of summary.buckets) {
-		if (bucket.reason) {
-			lines.push(formatMessage(bucketReasonMessages[bucket.reason], { count: bucket.instance_count }))
-		}
-		const versions = bucket.game_versions.join(', ')
-		const keys = [...bucket.write_keys, ...bucket.eventual_keys].join(', ')
-		if (versions && keys) {
-			lines.push(formatMessage(presentationMessages.bucketVersionsAndKeys, { versions, keys }))
-		} else if (versions) {
-			lines.push(formatMessage(presentationMessages.bucketVersions, { versions }))
-		} else if (keys) {
-			lines.push(formatMessage(presentationMessages.bucketKeys, { keys }))
-		}
+	if (summary.total_participating === 0) {
+		return formatMessage(presentationMessages.compatibilityTooltipNoParticipants)
 	}
-
-	return lines.join('\n')
+	if (summary.left_local > 0) {
+		return formatMessage(presentationMessages.compatibilityTooltipLimited)
+	}
+	const waiting = summary.buckets
+		.filter((bucket) => bucket.status === 'waiting_for_file' || bucket.status === 'waiting_for_base')
+		.reduce((count, bucket) => count + bucket.instance_count, 0)
+	if (waiting > 0) {
+		return formatMessage(presentationMessages.compatibilityTooltipWaiting, { count: waiting })
+	}
+	return formatMessage(presentationMessages.compatibilityTooltipAll)
 }
 
 export function shouldShowCompatibilityIndicator(setting: EditableGameSetting): boolean {
-	return setting.compatibility.buckets.some(
-		(bucket) =>
-			bucket.mapping !== 'direct' ||
-			bucket.status !== 'ready' ||
-			bucket.eventual_keys.length > 0,
+	return (
+		setting.compatibility.left_local > 0 ||
+		setting.compatibility.buckets.some(
+			(bucket) =>
+				bucket.status === 'waiting_for_file' || bucket.status === 'waiting_for_base',
+		)
 	)
 }
 
diff --git a/packages/app-lib/.sqlx/query-1fb66446c3ba0f52e682f8aae4b80a97310f308b3aa25c322d499b32d549f7b7.json b/packages/app-lib/.sqlx/query-1fb66446c3ba0f52e682f8aae4b80a97310f308b3aa25c322d499b32d549f7b7.json
deleted file mode 100644
index 9d10b4b7be..0000000000
--- a/packages/app-lib/.sqlx/query-1fb66446c3ba0f52e682f8aae4b80a97310f308b3aa25c322d499b32d549f7b7.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "\n\t\tSELECT instances.id, instances.name, instances.path\n\t\tFROM instances\n\t\tINNER JOIN instance_sync_preferences preferences\n\t\t\tON preferences.instance_id = instances.id\n\t\tWHERE preferences.feature = 'screenshots'\n\t\t\tAND preferences.enabled = 1\n\t\t\tAND EXISTS (\n\t\t\t\tSELECT 1\n\t\t\t\tFROM sync_feature_settings\n\t\t\t\tWHERE feature = 'screenshots' AND globally_enabled = 1\n\t\t\t)\n\t\tORDER BY instances.name, instances.id\n\t\t",
-  "describe": {
-    "columns": [
-      {
-        "name": "id",
-        "ordinal": 0,
-        "type_info": "Text"
-      },
-      {
-        "name": "name",
-        "ordinal": 1,
-        "type_info": "Text"
-      },
-      {
-        "name": "path",
-        "ordinal": 2,
-        "type_info": "Text"
-      }
-    ],
-    "parameters": {
-      "Right": 0
-    },
-    "nullable": [
-      false,
-      false,
-      false
-    ]
-  },
-  "hash": "1fb66446c3ba0f52e682f8aae4b80a97310f308b3aa25c322d499b32d549f7b7"
-}
diff --git a/packages/app-lib/.sqlx/query-6d7ebc0f233dc730fa8c99c750421065f5e35f321954a9d5ae9cde907d5ce823.json b/packages/app-lib/.sqlx/query-6d7ebc0f233dc730fa8c99c750421065f5e35f321954a9d5ae9cde907d5ce823.json
deleted file mode 100644
index 2826fb40ac..0000000000
--- a/packages/app-lib/.sqlx/query-6d7ebc0f233dc730fa8c99c750421065f5e35f321954a9d5ae9cde907d5ce823.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "\n            SELECT\n                id, active, session_id, expires\n            FROM modrinth_users\n            ",
-  "describe": {
-    "columns": [
-      {
-        "name": "id",
-        "ordinal": 0,
-        "type_info": "Text"
-      },
-      {
-        "name": "active",
-        "ordinal": 1,
-        "type_info": "Integer"
-      },
-      {
-        "name": "session_id",
-        "ordinal": 2,
-        "type_info": "Text"
-      },
-      {
-        "name": "expires",
-        "ordinal": 3,
-        "type_info": "Integer"
-      }
-    ],
-    "parameters": {
-      "Right": 0
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      false
-    ]
-  },
-  "hash": "6d7ebc0f233dc730fa8c99c750421065f5e35f321954a9d5ae9cde907d5ce823"
-}
diff --git a/packages/app-lib/.sqlx/query-76896bb2061e4c839a53bed4a221be42650f58edf2045fe1b85d418a537382e2.json b/packages/app-lib/.sqlx/query-76896bb2061e4c839a53bed4a221be42650f58edf2045fe1b85d418a537382e2.json
deleted file mode 100644
index 92962fa3b2..0000000000
--- a/packages/app-lib/.sqlx/query-76896bb2061e4c839a53bed4a221be42650f58edf2045fe1b85d418a537382e2.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "\n\t\t\tINSERT INTO sync_feature_settings\n\t\t\t\t(feature, globally_enabled, new_instance_default)\n\t\t\tVALUES (?, ?, 1)\n\t\t\tON CONFLICT(feature) DO UPDATE SET\n\t\t\t\tglobally_enabled = excluded.globally_enabled\n\t\t\t",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": []
-  },
-  "hash": "76896bb2061e4c839a53bed4a221be42650f58edf2045fe1b85d418a537382e2"
-}
diff --git a/packages/app-lib/src/api/instance.rs b/packages/app-lib/src/api/instance.rs
index 62b131e31d..ab473c65ab 100644
--- a/packages/app-lib/src/api/instance.rs
+++ b/packages/app-lib/src/api/instance.rs
@@ -45,6 +45,10 @@ pub use self::game_options::{
     save_changes as save_synced_game_option_changes,
     sync_before_launch as sync_game_options_before_launch,
 };
+pub(crate) use self::game_options::{
+    shared_fullscreen_value, sync_all_participating_instances,
+    update_shared_fullscreen_from_app,
+};
 pub use self::get::{get, get_many, list};
 pub use self::groups::{
     FAVORITES_GROUP_ID, InstanceGroup, InstanceGroupMembershipUpdate,
diff --git a/packages/app-lib/src/api/instance/game_options/fullscreen.rs b/packages/app-lib/src/api/instance/game_options/fullscreen.rs
new file mode 100644
index 0000000000..b1964851b3
--- /dev/null
+++ b/packages/app-lib/src/api/instance/game_options/fullscreen.rs
@@ -0,0 +1,112 @@
+//! Keeps the app-wide fullscreen setting aligned with the shared Minecraft value.
+
+use super::CATALOG_REVISION;
+use crate::state::{
+    CanonicalValue, State, load_game_option_preferences,
+    load_game_options_sync_state, load_shared_game_options,
+};
+use chrono::Utc;
+use sqlx::{Sqlite, Transaction};
+
+const FULLSCREEN_OPTION_ID: &str = "fullscreen";
+
+pub(crate) async fn shared_fullscreen_value(
+    state: &State,
+) -> crate::Result<Option<bool>> {
+    let values = load_shared_game_options(&state.pool).await?;
+    Ok(values.get(FULLSCREEN_OPTION_ID).and_then(|stored| {
+        if !stored.seeded {
+            return None;
+        }
+        match stored.value.as_ref() {
+            Some(CanonicalValue::Bool(value)) => Some(*value),
+            _ => None,
+        }
+    }))
+}
+
+pub(crate) async fn update_shared_fullscreen_from_app(
+    state: &State,
+    value: bool,
+) -> crate::Result<bool> {
+    let values = load_shared_game_options(&state.pool).await?;
+    let preferences = load_game_option_preferences(&state.pool).await?;
+    let stored = values.get(FULLSCREEN_OPTION_ID);
+    let preference = preferences.get(FULLSCREEN_OPTION_ID);
+    let value_matches = stored.is_some_and(|stored| {
+        stored.seeded
+            && matches!(
+                stored.value.as_ref(),
+                Some(CanonicalValue::Bool(current)) if *current == value
+            )
+    });
+    let sync_enabled = preference.is_some_and(|preference| preference.enabled);
+    if value_matches && sync_enabled {
+        return Ok(false);
+    }
+
+    let option_revision = stored
+        .map(|stored| stored.revision)
+        .unwrap_or(0)
+        .max(preference.map(|preference| preference.revision).unwrap_or(0))
+        .saturating_add(1) as i64;
+    let (canonical_revision, _) =
+        load_game_options_sync_state(&state.pool, CATALOG_REVISION).await?;
+    let next_canonical_revision = canonical_revision.saturating_add(1) as i64;
+    let canonical = CanonicalValue::Bool(value);
+    let value_json = serde_json::to_string(&canonical)?;
+    let canonical_type = canonical.type_name();
+    let now = Utc::now().timestamp();
+    let catalog_revision = CATALOG_REVISION as i64;
+    let kind = "vanilla";
+    let raw_key: Option<&str> = None;
+    let value_codec = "catalog";
+    let source_game_version: Option<&str> = None;
+    let mut tx = state.pool.begin().await?;
+
+    sqlx::query!(
+        "\n\t\t\t\tINSERT INTO synced_game_option_values\n\t\t\t\t\t(option_id, kind, raw_key, canonical_type,\n\t\t\t\t\t canonical_value_json, value_codec, seeded, revision, origin,\n\t\t\t\t\t source_game_version, source_instance_id, updated_at)\n\t\t\t\tVALUES (?, ?, ?, ?, ?, ?, 1, ?, 'app_editor', ?, NULL, ?)\n\t\t\t\tON CONFLICT(option_id) DO UPDATE SET\n\t\t\t\t\tkind = excluded.kind, raw_key = excluded.raw_key,\n\t\t\t\t\tcanonical_type = excluded.canonical_type,\n\t\t\t\t\tcanonical_value_json = excluded.canonical_value_json,\n\t\t\t\t\tvalue_codec = excluded.value_codec, seeded = 1,\n\t\t\t\t\trevision = excluded.revision, origin = 'app_editor',\n\t\t\t\t\tsource_game_version = NULL, source_instance_id = NULL,\n\t\t\t\t\tupdated_at = excluded.updated_at\n\t\t\t\t",
+        FULLSCREEN_OPTION_ID,
+        kind,
+        raw_key,
+        canonical_type,
+        value_json,
+        value_codec,
+        option_revision,
+        source_game_version,
+        now,
+    )
+    .execute(&mut *tx)
+    .await?;
+    sqlx::query!(
+        "\n\t\t\t\tINSERT INTO synced_game_option_preferences\n\t\t\t\t\t(option_id, enabled, source, revision)\n\t\t\t\tVALUES (?, ?, ?, ?)\n\t\t\t\tON CONFLICT(option_id) DO UPDATE SET\n\t\t\t\t\tenabled = excluded.enabled, source = 'user',\n\t\t\t\t\trevision = excluded.revision\n\t\t\t\t",
+        FULLSCREEN_OPTION_ID,
+        true,
+        "user",
+        option_revision,
+    )
+    .execute(&mut *tx)
+    .await?;
+    sqlx::query!(
+        "\n\t\t\tINSERT INTO synced_game_option_state (singleton, revision, catalog_revision)\n\t\t\tVALUES (1, ?, ?)\n\t\t\tON CONFLICT(singleton) DO UPDATE SET\n\t\t\t\trevision = excluded.revision,\n\t\t\t\tcatalog_revision = excluded.catalog_revision\n\t\t\t",
+        next_canonical_revision,
+        catalog_revision,
+    )
+    .execute(&mut *tx)
+    .await?;
+    tx.commit().await?;
+    Ok(true)
+}
+
+pub(super) async fn update_app_fullscreen_setting(
+    tx: &mut Transaction<'_, Sqlite>,
+    value: &CanonicalValue,
+) -> crate::Result<()> {
+    let CanonicalValue::Bool(value) = value else {
+        return Ok(());
+    };
+    let mut settings = crate::state::Settings::get(&mut **tx).await?;
+    settings.force_fullscreen = *value;
+    settings.update(&mut **tx).await?;
+    Ok(())
+}
diff --git a/packages/app-lib/src/api/instance/game_options/instance_support.rs b/packages/app-lib/src/api/instance/game_options/instance_support.rs
index 18a0e4aab6..417c2f0986 100644
--- a/packages/app-lib/src/api/instance/game_options/instance_support.rs
+++ b/packages/app-lib/src/api/instance/game_options/instance_support.rs
@@ -33,7 +33,6 @@ pub(super) async fn load_participating_instances(
     if !game_options_sync_is_enabled(&state.pool).await? {
         return Ok(Vec::new());
     }
-    let settings = crate::state::Settings::get(&state.pool).await?;
     let instances = crate::state::list_instances(&state.pool).await?;
     let mut participants = Vec::new();
     for metadata in instances {
@@ -61,8 +60,7 @@ pub(super) async fn load_participating_instances(
             fullscreen_controlled: metadata
                 .launch_overrides
                 .force_fullscreen
-                .is_some()
-                || settings.force_fullscreen,
+                .is_some(),
             metadata,
             deferred,
             document,
@@ -241,20 +239,22 @@ pub(super) fn describe_instance_support(
                                     definition, document, &key,
                                 )
                             });
-                        let representable = match (definition, value) {
-                            (Some(definition), Some(value)) => encode_value(
-                                definition,
-                                &key,
-                                value,
-                                &version,
-                                document.value(&key),
-                            )
-                            .is_some(),
-                            (None, Some(CanonicalValue::ExternalRaw(_))) => {
-                                true
+                        let representable = value.is_none_or(|value| {
+                            match definition {
+                                Some(definition) => encode_value(
+                                    definition,
+                                    &key,
+                                    value,
+                                    &version,
+                                    document.value(&key),
+                                )
+                                .is_some(),
+                                None => matches!(
+                                    value,
+                                    CanonicalValue::ExternalRaw(_)
+                                ),
                             }
-                            _ => false,
-                        };
+                        });
                         if !representable {
                             (
 							GameOptionCompatibilityStatus::UnsupportedValue,
@@ -334,15 +334,20 @@ pub(super) fn describe_instance_support(
                                         })
                                         .map(|key| (*key).to_string())
                                 });
-                        let representable = eventual_key
-                            .as_deref()
-                            .zip(value)
-                            .is_some_and(|(key, value)| {
-                                encode_value(
-                                    definition, key, value, &version, None,
-                                )
-                                .is_some()
-                            });
+                        let representable = eventual_key.as_deref().is_some_and(
+                            |key| {
+                                value.is_none_or(|value| {
+                                    encode_value(
+                                        definition,
+                                        key,
+                                        value,
+                                        &version,
+                                        None,
+                                    )
+                                    .is_some()
+                                })
+                            },
+                        );
                         if representable {
                             (
 							GameOptionCompatibilityStatus::WaitingForBase,
diff --git a/packages/app-lib/src/api/instance/game_options/launch_overrides.rs b/packages/app-lib/src/api/instance/game_options/launch_overrides.rs
index 93d5a4f207..2a8a55e2a6 100644
--- a/packages/app-lib/src/api/instance/game_options/launch_overrides.rs
+++ b/packages/app-lib/src/api/instance/game_options/launch_overrides.rs
@@ -19,18 +19,14 @@ use crate::state::{
 use crate::util::io;
 use std::collections::HashSet;
 
-pub(super) async fn currently_launcher_owned_keys(
+pub(super) fn currently_launcher_owned_keys(
     metadata: &InstanceMetadata,
-    state: &State,
-) -> crate::Result<HashSet<String>> {
-    let settings = crate::state::Settings::get(&state.pool).await?;
+) -> HashSet<String> {
     let mut keys = HashSet::new();
-    if metadata.launch_overrides.force_fullscreen.is_some()
-        || settings.force_fullscreen
-    {
+    if metadata.launch_overrides.force_fullscreen.is_some() {
         keys.insert("fullscreen".to_string());
     }
-    Ok(keys)
+    keys
 }
 
 /// Reads changes made in Minecraft and writes the latest shared values before launch.
diff --git a/packages/app-lib/src/api/instance/game_options/mod.rs b/packages/app-lib/src/api/instance/game_options/mod.rs
index a0877f475b..4d6c6576d9 100644
--- a/packages/app-lib/src/api/instance/game_options/mod.rs
+++ b/packages/app-lib/src/api/instance/game_options/mod.rs
@@ -17,6 +17,7 @@
 //! mistaken for changes made by the player.
 
 mod api_types;
+mod fullscreen;
 mod instance_support;
 mod launch_overrides;
 mod options_file;
@@ -43,6 +44,11 @@ pub use pack_updates::capture_pack_base;
 pub use settings_editor::{get_config, preview_changes, save_changes};
 pub use source_selection::list_sync_sources;
 
+pub(crate) use fullscreen::{
+    shared_fullscreen_value, update_shared_fullscreen_from_app,
+};
+pub(crate) use write_shared_settings::sync_all_participating_instances;
+
 pub(in crate::api::instance) use api_types::SyncReason;
 pub(in crate::api::instance) use pack_updates::{
     detach_instance, prepare_instance_update_with_state,
@@ -57,7 +63,7 @@ pub(in crate::api::instance) async fn canonical_exists(
 }
 
 const OPTIONS_FILE: &str = "options.txt";
-const CATALOG_REVISION: u32 = 2;
+const CATALOG_REVISION: u32 = 3;
 const MAX_OPTIONS_BYTES: usize = 2 * 1024 * 1024;
 const MAX_OPTIONS_LINES: usize = 16_384;
 const MAX_KEY_BYTES: usize = 1_024;
diff --git a/packages/app-lib/src/api/instance/game_options/read_instance_changes.rs b/packages/app-lib/src/api/instance/game_options/read_instance_changes.rs
index 16d9f02f8e..75891d7743 100644
--- a/packages/app-lib/src/api/instance/game_options/read_instance_changes.rs
+++ b/packages/app-lib/src/api/instance/game_options/read_instance_changes.rs
@@ -3,6 +3,7 @@
 use super::super::synced_options;
 use super::CATALOG_REVISION;
 use super::api_types::canonical_values_equal;
+use super::fullscreen::update_app_fullscreen_setting;
 use super::launch_overrides::currently_launcher_owned_keys;
 use super::options_file::{GameOptionsDocument, validate_raw_key_value};
 use super::supported_settings::*;
@@ -57,8 +58,7 @@ pub(super) async fn read_instance_changes_into_shared_settings(
 ) -> crate::Result<bool> {
     let values = load_shared_game_options(&state.pool).await?;
     let preferences = load_game_option_preferences(&state.pool).await?;
-    let currently_launcher_owned =
-        currently_launcher_owned_keys(metadata, state).await?;
+    let currently_launcher_owned = currently_launcher_owned_keys(metadata);
     let Some(projection) = projection else {
         return discover_custom_settings(
             metadata,
@@ -74,6 +74,9 @@ pub(super) async fn read_instance_changes_into_shared_settings(
         .filter(|field| field.origin == ProjectionOrigin::LauncherOverride)
         .map(|field| field.physical_key.clone())
         .collect::<HashSet<_>>();
+    if !currently_launcher_owned.contains("fullscreen") {
+        launcher_keys.remove("fullscreen");
+    }
     launcher_keys.extend(currently_launcher_owned);
     let now = Utc::now().timestamp();
     let mut updates = Vec::new();
@@ -182,11 +185,15 @@ pub(super) async fn read_instance_changes_into_shared_settings(
     }
 
     let mut changed = false;
+    let mut fullscreen_value = None;
     if !updates.is_empty() {
         let (canonical_revision, _) =
             load_game_options_sync_state(&state.pool, CATALOG_REVISION).await?;
         let mut tx = state.pool.begin().await?;
         for (option_id, candidate, revision) in updates {
+            if option_id == "fullscreen" {
+                fullscreen_value = Some(candidate.clone());
+            }
             let next_revision = revision.saturating_add(1) as i64;
             let current_revision = revision as i64;
             let value_json = serde_json::to_string(&candidate)?;
@@ -226,6 +233,9 @@ pub(super) async fn read_instance_changes_into_shared_settings(
             .execute(&mut *tx)
             .await?;
         }
+        if let Some(value) = fullscreen_value.as_ref() {
+            update_app_fullscreen_setting(&mut tx, value).await?;
+        }
         tx.commit().await?;
     }
     Ok(
diff --git a/packages/app-lib/src/api/instance/game_options/settings_editor.rs b/packages/app-lib/src/api/instance/game_options/settings_editor.rs
index f4c2b669cb..7d0d61ef40 100644
--- a/packages/app-lib/src/api/instance/game_options/settings_editor.rs
+++ b/packages/app-lib/src/api/instance/game_options/settings_editor.rs
@@ -2,6 +2,7 @@
 
 use super::CATALOG_REVISION;
 use super::api_types::*;
+use super::fullscreen::update_app_fullscreen_setting;
 use super::instance_support::{
     describe_instance_support, find_common_local_value,
     load_participating_instances, summary_revision,
@@ -380,6 +381,7 @@ pub async fn save_changes(
     }
 
     let mut changed = false;
+    let mut fullscreen_value = None;
     let mut tx = state.pool.begin().await?;
     for (setting, change) in accepted {
         let value_changed =
@@ -393,6 +395,12 @@ pub async fn save_changes(
         if !value_changed && !selection_changed {
             continue;
         }
+        if value_changed
+            && setting.option_id == "fullscreen"
+            && let Some(Some(value)) = change.canonical_value.as_ref()
+        {
+            fullscreen_value = Some(value.clone());
+        }
         changed = true;
         let revision = setting.option_revision.saturating_add(1) as i64;
         if let Some(value) = change.canonical_value {
@@ -495,6 +503,9 @@ pub async fn save_changes(
         .execute(&mut *tx)
         .await?;
     }
+    if let Some(value) = fullscreen_value.as_ref() {
+        update_app_fullscreen_setting(&mut tx, value).await?;
+    }
     tx.commit().await?;
 
     let projection = if changed {
diff --git a/packages/app-lib/src/api/instance/game_options/source_selection.rs b/packages/app-lib/src/api/instance/game_options/source_selection.rs
index 45a889e628..b02e0317b8 100644
--- a/packages/app-lib/src/api/instance/game_options/source_selection.rs
+++ b/packages/app-lib/src/api/instance/game_options/source_selection.rs
@@ -3,6 +3,7 @@
 use super::super::synced_options;
 use super::CATALOG_REVISION;
 use super::api_types::{GameOptionsSourceCandidate, GameOptionsSourceIssue};
+use super::fullscreen::update_app_fullscreen_setting;
 use super::launch_overrides::currently_launcher_owned_keys;
 use super::options_file::{
     input_error, options_path, read_document, sha1_bytes,
@@ -34,7 +35,11 @@ pub(in crate::api::instance) async fn initialize_from_source_instance(
     let mut launcher_keys =
         launcher_keys_for_document(&metadata.instance.id, &input_sha1, state)
             .await?;
-    launcher_keys.extend(currently_launcher_owned_keys(metadata, state).await?);
+    let currently_launcher_owned = currently_launcher_owned_keys(metadata);
+    if !currently_launcher_owned.contains("fullscreen") {
+        launcher_keys.remove("fullscreen");
+    }
+    launcher_keys.extend(currently_launcher_owned);
     let entries = document.effective_entries();
     let current_values = load_shared_game_options(&state.pool).await?;
     let current_preferences = load_game_option_preferences(&state.pool).await?;
@@ -125,6 +130,7 @@ pub(in crate::api::instance) async fn initialize_from_source_instance(
         }
     }
     let mut seeded_any = false;
+    let mut fullscreen_value = None;
 
     for definition in all_supported_settings() {
         if !supported_settings_cover_game_version(source_version) {
@@ -147,6 +153,9 @@ pub(in crate::api::instance) async fn initialize_from_source_instance(
         let Some((_physical_key, value)) = found else {
             continue;
         };
+        if definition.id == "fullscreen" {
+            fullscreen_value = Some(value.clone());
+        }
         seeded_any = true;
         let option_revision = current_values
             .get(definition.id)
@@ -291,6 +300,9 @@ pub(in crate::api::instance) async fn initialize_from_source_instance(
     )
     .execute(&mut *tx)
     .await?;
+    if let Some(value) = fullscreen_value.as_ref() {
+        update_app_fullscreen_setting(&mut tx, value).await?;
+    }
     tx.commit().await?;
     Ok(())
 }
@@ -330,10 +342,12 @@ pub async fn list_sync_sources()
                         &state,
                     )
                     .await?;
-                    launcher_keys.extend(
-                        currently_launcher_owned_keys(&metadata, &state)
-                            .await?,
-                    );
+                    let currently_launcher_owned =
+                        currently_launcher_owned_keys(&metadata);
+                    if !currently_launcher_owned.contains("fullscreen") {
+                        launcher_keys.remove("fullscreen");
+                    }
+                    launcher_keys.extend(currently_launcher_owned);
                     let entries = document.effective_entries();
                     let source_version =
                         metadata.applied_content_set.game_version.as_str();
diff --git a/packages/app-lib/src/api/instance/game_options/supported_settings/version_changes.rs b/packages/app-lib/src/api/instance/game_options/supported_settings/version_changes.rs
index 5e8c123026..725611b5b9 100644
--- a/packages/app-lib/src/api/instance/game_options/supported_settings/version_changes.rs
+++ b/packages/app-lib/src/api/instance/game_options/supported_settings/version_changes.rs
@@ -10,9 +10,21 @@ use super::{
 };
 use crate::state::{CanonicalValue, StoredOption};
 
-const GRAPHICS_VALUES: &[&str] = &["fast", "fancy", "fabulous"];
+const GRAPHICS_VALUES: &[&str] = &["fast", "fancy", "fabulous", "custom"];
 const MUSIC_TOAST_VALUES: &[&str] = &["never", "pause", "pause_and_toast"];
 
+fn decode_string_token(raw: &str) -> Option<String> {
+    if raw.starts_with('"') {
+        serde_json::from_str(raw).ok()
+    } else {
+        Some(raw.to_string())
+    }
+}
+
+fn encode_string_token(value: &str) -> Option<String> {
+    serde_json::to_string(value).ok()
+}
+
 pub(in crate::api::instance) const GRAPHICS_KEYS: &[VersionedKey] = &[
     VersionedKey {
         key: "fancyGraphics",
@@ -255,9 +267,12 @@ pub(in crate::api::instance) fn decode_value(
             .ok()
             .filter(|value| value.is_finite())
             .map(|_| CanonicalValue::Decimal(raw.to_string())),
-        ValueEncoding::Enum(choices) => choices
-            .contains(&raw)
-            .then(|| CanonicalValue::Enum(raw.to_string())),
+        ValueEncoding::Enum(choices) => {
+            let value = decode_string_token(raw)?;
+            choices
+                .contains(&value.as_str())
+                .then(|| CanonicalValue::Enum(value))
+        }
         ValueEncoding::Text => Some(CanonicalValue::Text(raw.to_string())),
         ValueEncoding::KeyBinding => {
             if valid_modern_key_binding(raw) {
@@ -274,19 +289,24 @@ pub(in crate::api::instance) fn decode_value(
                 .then(|| CanonicalValue::Integer(degrees.round() as i64))
         }),
         ValueEncoding::Graphics => {
+            let raw = decode_string_token(raw)?;
             let value = match physical_key {
-                "fancyGraphics" => match raw {
+                "fancyGraphics" => match raw.as_str() {
                     "false" => "fast",
                     "true" => "fancy",
                     _ => return None,
                 },
-                "graphicsMode" => match raw {
+                "graphicsMode" => match raw.as_str() {
                     "0" => "fast",
                     "1" => "fancy",
                     "2" => "fabulous",
                     _ => return None,
                 },
-                "graphicsPreset" if GRAPHICS_VALUES.contains(&raw) => raw,
+                "graphicsPreset"
+                    if GRAPHICS_VALUES.contains(&raw.as_str()) =>
+                {
+                    raw.as_str()
+                }
                 _ => return None,
             };
             Some(CanonicalValue::Enum(value.to_string()))
@@ -302,10 +322,14 @@ pub(in crate::api::instance) fn decode_value(
             Some(CanonicalValue::Enum(value.to_string()))
         }
         ValueEncoding::MusicToast => {
-            let value = match (physical_key, raw) {
+            let raw = decode_string_token(raw)?;
+            let value = match (physical_key, raw.as_str()) {
                 ("showNowPlayingToast", "false") => "never",
                 ("showNowPlayingToast", "true") => "pause_and_toast",
-                ("musicToast", "never" | "pause" | "pause_and_toast") => raw,
+                (
+                    "musicToast",
+                    "never" | "pause" | "pause_and_toast",
+                ) => raw.as_str(),
                 _ => return None,
             };
             Some(CanonicalValue::Enum(value.to_string()))
@@ -349,7 +373,11 @@ pub(in crate::api::instance) fn encode_value(
         (ValueEncoding::Enum(choices), CanonicalValue::Enum(value))
             if choices.contains(&value.as_str()) =>
         {
-            Some(value.clone())
+            if current_raw.is_some_and(|raw| raw.starts_with('"')) {
+                encode_string_token(value)
+            } else {
+                Some(value.clone())
+            }
         }
         (ValueEncoding::Text, CanonicalValue::Text(value)) => {
             Some(value.clone())
@@ -385,7 +413,7 @@ pub(in crate::api::instance) fn encode_value(
                 "graphicsPreset"
                     if GRAPHICS_VALUES.contains(&value.as_str()) =>
                 {
-                    Some(value.clone())
+                    encode_string_token(value)
                 }
                 _ => None,
             }
@@ -418,7 +446,7 @@ pub(in crate::api::instance) fn encode_value(
                 "musicToast"
                     if MUSIC_TOAST_VALUES.contains(&value.as_str()) =>
                 {
-                    Some(value.clone())
+                    encode_string_token(value)
                 }
                 _ => None,
             }
diff --git a/packages/app-lib/src/api/instance/game_options/supported_settings/video.rs b/packages/app-lib/src/api/instance/game_options/supported_settings/video.rs
index da2adc9dcb..2f1261daef 100644
--- a/packages/app-lib/src/api/instance/game_options/supported_settings/video.rs
+++ b/packages/app-lib/src/api/instance/game_options/supported_settings/video.rs
@@ -3,7 +3,7 @@ use super::{
     version_changes, versioned_setting,
 };
 
-const GRAPHICS: &[&str] = &["fast", "fancy", "fabulous"];
+const GRAPHICS: &[&str] = &["fast", "fancy", "fabulous", "custom"];
 const AMBIENT_OCCLUSION: &[&str] = &["off", "on", "minimum", "maximum"];
 const PARTICLES: &[&str] = &["0", "1", "2"];
 const CLOUDS: &[&str] = &["false", "fast", "true"];
diff --git a/packages/app-lib/src/api/instance/game_options/write_shared_settings.rs b/packages/app-lib/src/api/instance/game_options/write_shared_settings.rs
index 374d8da673..b49111004b 100644
--- a/packages/app-lib/src/api/instance/game_options/write_shared_settings.rs
+++ b/packages/app-lib/src/api/instance/game_options/write_shared_settings.rs
@@ -39,15 +39,13 @@ pub(super) async fn apply_shared_settings_to_document(
 ) -> crate::Result<Vec<ProjectedField>> {
     let values = load_shared_game_options(&state.pool).await?;
     let preferences = load_game_option_preferences(&state.pool).await?;
-    let settings = crate::state::Settings::get(&state.pool).await?;
     let mut fields = Vec::new();
     for (option_id, preference) in preferences {
         if !preference.enabled {
             continue;
         }
         if option_id == "fullscreen"
-            && (metadata.launch_overrides.force_fullscreen.is_some()
-                || settings.force_fullscreen)
+            && metadata.launch_overrides.force_fullscreen.is_some()
         {
             continue;
         }
@@ -346,7 +344,7 @@ pub(super) async fn sync_other_participating_instances(
     result
 }
 
-pub(super) async fn sync_all_participating_instances(
+pub(crate) async fn sync_all_participating_instances(
     state: &State,
 ) -> SaveGameSettingsResult {
     sync_other_participating_instances(state, None).await
diff --git a/packages/app-lib/src/api/instance/run.rs b/packages/app-lib/src/api/instance/run.rs
index 17de3a88f3..cc62c16614 100644
--- a/packages/app-lib/src/api/instance/run.rs
+++ b/packages/app-lib/src/api/instance/run.rs
@@ -2,6 +2,7 @@ use super::content::get_projects;
 use crate::server_address::ServerAddress;
 use crate::state::{
     Credentials, InstanceLink, ProcessMetadata, Settings, State,
+    game_options_sync_is_enabled, load_game_option_preferences,
 };
 use crate::util::fetch;
 use crate::util::io::IOError;
@@ -67,6 +68,18 @@ async fn run_credentials(
                 "Tried to run a nonexistent instance {instance_id}!"
             ))
         })?;
+    let instance_sync_preferences =
+        crate::state::instances::adapters::sqlite::instance_rows::get_instance_sync_preferences(
+            instance_id,
+            &state.pool,
+        )
+        .await?;
+    let fullscreen_is_shared = game_options_sync_is_enabled(&state.pool).await?
+        && instance_sync_preferences.game_options
+        && load_game_option_preferences(&state.pool)
+            .await?
+            .get("fullscreen")
+            .is_some_and(|preference| preference.enabled);
     if crate::state::instances::adapters::sqlite::instance_rows::is_instance_quarantined(
         instance_id,
         &state.pool,
@@ -214,7 +227,7 @@ async fn run_credentials(
     let mut mc_set_options: Vec<(String, String)> = vec![];
     if let Some(fullscreen) = context.launch_overrides.force_fullscreen {
         mc_set_options.push(("fullscreen".to_string(), fullscreen.to_string()));
-    } else if settings.force_fullscreen {
+    } else if settings.force_fullscreen && !fullscreen_is_shared {
         mc_set_options.push(("fullscreen".to_string(), "true".to_string()));
     }
 
diff --git a/packages/app-lib/src/api/settings.rs b/packages/app-lib/src/api/settings.rs
index a0c1294e50..dbbc51cf6c 100644
--- a/packages/app-lib/src/api/settings.rs
+++ b/packages/app-lib/src/api/settings.rs
@@ -9,7 +9,17 @@ pub use crate::{
 #[tracing::instrument]
 pub async fn get() -> crate::Result<Settings> {
     let state = State::get().await?;
-    let settings = Settings::get(&state.pool).await?;
+    let _guard = state.lock_synced_options().await;
+    let mut settings = Settings::get(&state.pool).await?;
+    if crate::state::game_options_sync_is_enabled(&state.pool).await?
+        && let Some(fullscreen) =
+            crate::api::instance::shared_fullscreen_value(&state).await?
+    {
+        if settings.force_fullscreen != fullscreen {
+            settings.force_fullscreen = fullscreen;
+            settings.update(&state.pool).await?;
+        }
+    }
     Ok(settings)
 }
 
@@ -17,8 +27,43 @@ pub async fn get() -> crate::Result<Settings> {
 #[tracing::instrument]
 pub async fn set(settings: Settings) -> crate::Result<()> {
     let state = State::get().await?;
+    let _guard = state.lock_synced_options().await;
+    let current_settings = Settings::get(&state.pool).await?;
+    let game_options_sync_enabled =
+        crate::state::game_options_sync_is_enabled(&state.pool).await?;
+    let current_fullscreen = if game_options_sync_enabled {
+        crate::api::instance::shared_fullscreen_value(&state)
+            .await?
+            .unwrap_or(current_settings.force_fullscreen)
+    } else {
+        current_settings.force_fullscreen
+    };
+    let fullscreen_changed = current_fullscreen != settings.force_fullscreen;
+    let shared_fullscreen_changed = if game_options_sync_enabled
+        && fullscreen_changed
+    {
+        crate::api::instance::update_shared_fullscreen_from_app(
+            &state,
+            settings.force_fullscreen,
+        )
+        .await?
+    } else {
+        false
+    };
     settings.update(&state.pool).await?;
 
+    if shared_fullscreen_changed {
+        let result =
+            crate::api::instance::sync_all_participating_instances(&state)
+                .await;
+        if result.failed > 0 {
+            tracing::warn!(
+                "Fullscreen was saved, but {} synced instance(s) could not be updated",
+                result.failed
+            );
+        }
+    }
+
     Ok(())
 }
 
diff --git a/packages/ui/src/components/base/Slider.vue b/packages/ui/src/components/base/Slider.vue
index fe3c3e451a..de289abe62 100644
--- a/packages/ui/src/components/base/Slider.vue
+++ b/packages/ui/src/components/base/Slider.vue
@@ -92,7 +92,8 @@ const props = withDefaults(defineProps<Props>(), {
 const currentValue = ref(clampValue(props.modelValue))
 const currentPercentage = computed(() => getPercentage(currentValue.value))
 const valueInputWidth = computed(
-	() => `calc(${Math.max(String(currentValue.value).length, 1)}ch + 2.125rem)`,
+	() =>
+		`calc(${Math.max(String(props.min).length, String(props.max).length, 1)}ch + 2.125rem)`,
 )
 const visibleSnapPoints = computed(() =>
 	props.snapPoints.filter((snapPoint) => snapPoint >= props.min && snapPoint <= props.max),
diff --git a/packages/ui/src/components/modal/NewModal.vue b/packages/ui/src/components/modal/NewModal.vue
index 80be8dfcfa..ea7d4fe1b9 100644
--- a/packages/ui/src/components/modal/NewModal.vue
+++ b/packages/ui/src/components/modal/NewModal.vue
@@ -1,8 +1,15 @@
 <template>
 	<Teleport to="body">
-		<div v-if="open" class="modal-root" data-modal-root :data-modal-id="modalId">
+		<div
+			v-if="open"
+			class="modal-root"
+			data-modal-root
+			:data-modal-id="modalId"
+			:data-modal-depth="stackDepth"
+		>
 			<div
 				:class="{ shown: visible }"
+				:style="{ zIndex: stackTauriZ }"
 				class="tauri-overlay"
 				data-tauri-drag-region
 				@pointerdown="onTauriOverlayPointerDown"
@@ -17,9 +24,14 @@
 					},
 					computedFade,
 				]"
+				:style="{ zIndex: stackOverlayZ }"
 				@click="() => (closeOnClickOutside && closable ? hide() : {})"
 			/>
-			<div class="modal-container" :class="{ shown: visible }">
+			<div
+				class="modal-container"
+				:class="{ shown: visible }"
+				:style="{ zIndex: stackContainerZ }"
+			>
 				<div
 					ref="modalBodyRef"
 					role="dialog"
@@ -267,10 +279,13 @@ function getFocusableElements(): HTMLElement[] {
 	return Array.from(modalBodyRef.value.querySelectorAll<HTMLElement>(FOCUSABLE_SELECTOR))
 }
 
-function renderedModalDepth(): number {
-	return Array.from(document.querySelectorAll<HTMLElement>('[data-modal-root]')).filter(
-		(root) => root.dataset.modalId !== modalId,
-	).length
+function nextRenderedModalDepth(): number {
+	return Array.from(document.querySelectorAll<HTMLElement>('[data-modal-root]'))
+		.filter((root) => root.dataset.modalId !== modalId)
+		.reduce((nextDepth, root) => {
+			const depth = Number(root.dataset.modalDepth)
+			return Number.isFinite(depth) ? Math.max(nextDepth, depth + 1) : nextDepth + 1
+		}, 0)
 }
 
 function show(event?: MouseEvent) {
@@ -280,7 +295,7 @@ function show(event?: MouseEvent) {
 	}
 	props.onShow?.()
 	const wasEmpty = modalStackSize() === 0
-	stackDepth.value = Math.max(modalStackSize(), renderedModalDepth())
+	stackDepth.value = Math.max(modalStackSize(), nextRenderedModalDepth())
 	open.value = true
 	previousFocusEl = document.activeElement
 	pushModal()
@@ -436,7 +451,6 @@ defineOptions({
 	left: 0;
 	width: 100%;
 	height: 100px;
-	z-index: v-bind(stackTauriZ);
 
 	&.shown {
 		opacity: 1;
@@ -447,7 +461,6 @@ defineOptions({
 .modal-overlay {
 	position: fixed;
 	inset: -5rem;
-	z-index: v-bind(stackOverlayZ);
 	opacity: 0;
 	visibility: hidden;
 	pointer-events: none;
@@ -505,7 +518,6 @@ defineOptions({
 	display: flex;
 	justify-content: center;
 	align-items: center;
-	z-index: v-bind(stackContainerZ);
 	visibility: hidden;
 	pointer-events: none;
 	transform: translate(v-bind(mouseXOffset), v-bind(mouseYOffset));
diff --git a/packages/ui/src/components/modal/TabbedModal.vue b/packages/ui/src/components/modal/TabbedModal.vue
index accfe2abe4..99a607949b 100644
--- a/packages/ui/src/components/modal/TabbedModal.vue
+++ b/packages/ui/src/components/modal/TabbedModal.vue
@@ -18,6 +18,14 @@ export interface Tab {
 	shown?: boolean
 }
 
+defineSlots<{
+	title?(): unknown
+	'sidebar-header'?(): unknown
+	footer?(): unknown
+	content?(props: { tab: Tab | undefined; index: number }): unknown
+	'floating-action-bar'?(): unknown
+}>()
+
 const { formatMessage } = useVIntl()
 
 const props = withDefaults(
@@ -28,10 +36,12 @@ const props = withDefaults(
 		width?: string
 		closable?: boolean
 		onHide?: () => void
+		onAfterHide?: () => void
 		onShow?: () => void
 		beforeHide?: () => boolean
 		beforeTabChange?: (fromIndex: number, toIndex: number) => boolean
 		floatingActionBarShown?: boolean
+		disableClose?: boolean
 	}>(),
 	{
 		header: undefined,
@@ -39,10 +49,12 @@ const props = withDefaults(
 		width: undefined,
 		closable: true,
 		onHide: undefined,
+		onAfterHide: undefined,
 		onShow: undefined,
 		beforeHide: undefined,
 		beforeTabChange: undefined,
 		floatingActionBarShown: false,
+		disableClose: false,
 	},
 )
 
@@ -102,8 +114,10 @@ defineExpose({ show, hide, selectedTab, setTab })
 		:width="width"
 		:closable="closable"
 		:on-hide="onHide"
+		:on-after-hide="onAfterHide"
 		:on-show="onShow"
 		:before-hide="beforeHide"
+		:disable-close="disableClose"
 		no-padding
 	>
 		<template v-if="$slots.title" #title>
@@ -113,6 +127,8 @@ defineExpose({ show, hide, selectedTab, setTab })
 			<div
 				class="flex min-w-0 max-h-[min(65vh,600px)] flex-col border-0 border-r-[1px] border-solid border-divider pr-4"
 			>
+				<slot name="sidebar-header" />
+
 				<div class="relative min-h-0 flex-1">
 					<Transition
 						enter-active-class="transition-all duration-200 ease-out"
@@ -205,12 +221,14 @@ defineExpose({ show, hide, selectedTab, setTab })
 					:class="floatingActionBarShown ? 'pb-24' : 'pb-6'"
 					@scroll="checkScrollState"
 				>
-					<Suspense>
-						<component
-							:is="visibleTabs[selectedTab]?.content"
-							v-if="visibleTabs[selectedTab]?.content"
-						/>
-					</Suspense>
+					<slot name="content" :tab="visibleTabs[selectedTab]" :index="selectedTab">
+						<Suspense>
+							<component
+								:is="visibleTabs[selectedTab]?.content"
+								v-if="visibleTabs[selectedTab]?.content"
+							/>
+						</Suspense>
+					</slot>
 				</div>
 
 				<Transition
diff --git a/packages/ui/src/stories/modal/NewModal.stories.ts b/packages/ui/src/stories/modal/NewModal.stories.ts
index f2931cceae..11d9f3ac3b 100644
--- a/packages/ui/src/stories/modal/NewModal.stories.ts
+++ b/packages/ui/src/stories/modal/NewModal.stories.ts
@@ -73,9 +73,9 @@ export const Stacked: Story = {
 				<NewModal ref="parentModalRef" header="Parent Modal">
 					<p>The child modal should appear above this surface and backdrop.</p>
 					<Button type="colored" color="brand" @click="openChildModal">Open Child Modal</Button>
-				</NewModal>
-				<NewModal ref="childModalRef" header="Child Modal" max-width="500px">
-					<p>This modal is the topmost layer.</p>
+					<NewModal ref="childModalRef" header="Child Modal" max-width="500px">
+						<p>This modal is the topmost layer.</p>
+					</NewModal>
 				</NewModal>
 			</div>
 		`,
diff --git a/packages/ui/src/stories/modal/TabbedModal.stories.ts b/packages/ui/src/stories/modal/TabbedModal.stories.ts
index 5d85e192ef..483dc98376 100644
--- a/packages/ui/src/stories/modal/TabbedModal.stories.ts
+++ b/packages/ui/src/stories/modal/TabbedModal.stories.ts
@@ -107,6 +107,39 @@ export const WithTitleSlot: StoryObj = {
 	}),
 }
 
+export const WithContentSlot: StoryObj = {
+	render: () => ({
+		components: { TabbedModal, Button },
+		setup() {
+			const modalRef = ref<InstanceType<typeof TabbedModal> | null>(null)
+			const tabs = [
+				{
+					name: { id: 'general', defaultMessage: 'General' },
+					icon: InfoIcon,
+				},
+				{
+					name: { id: 'appearance', defaultMessage: 'Appearance' },
+					icon: PaintbrushIcon,
+				},
+			]
+			return { modalRef, tabs }
+		},
+		template: /* html */ `
+			<div>
+				<Button type="colored" color="brand" @click="modalRef?.show()">Open with Content Slot</Button>
+				<TabbedModal ref="modalRef" header="Settings" :tabs="tabs">
+					<template #content="{ tab, index }">
+						<div class="space-y-4 py-2">
+							<h2 class="m-0 text-xl font-bold text-contrast">{{ tab?.name.defaultMessage }}</h2>
+							<p class="m-0 text-secondary">Content supplied by the parent for tab {{ index + 1 }}.</p>
+						</div>
+					</template>
+				</TabbedModal>
+			</div>
+		`,
+	}),
+}
+
 export const WithFooter: StoryObj = {
 	render: () => ({
 		components: { TabbedModal, Button },

From b9fb781f633758c455e0b028d0719c0cf142582f Mon Sep 17 00:00:00 2001
From: "Calum H. (IMB11)" <contact@cal.engineer>
Date: Tue, 1 Sep 2026 14:18:02 +0100
Subject: [PATCH 03/33] fix: msgs

---
 .../game-settings/game-setting-messages.ts    | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-messages.ts b/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-messages.ts
index 3deaec05c3..e939009da7 100644
--- a/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-messages.ts
+++ b/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-messages.ts
@@ -13,31 +13,31 @@ type FormatMessage = VIntlFormatters['formatMessage']
 const settingMessages = defineMessages({
 	fovLabel: { id: 'app.settings.game-options.setting.fov.label', defaultMessage: 'Field of view' },
 	graphicsLabel: { id: 'app.settings.game-options.setting.graphics.label', defaultMessage: 'Graphics' },
-	graphicsDescription: { id: 'app.settings.game-options.setting.graphics.description', defaultMessage: 'Controls Minecraft\'s graphics quality and performance.' },
+	graphicsDescription: { id: 'app.settings.game-options.setting.graphics.description', defaultMessage: 'Controls visual quality and performance.' },
 	ambientOcclusionLabel: { id: 'app.settings.game-options.setting.ambient-occlusion.label', defaultMessage: 'Smooth lighting' },
 	renderDistanceLabel: { id: 'app.settings.game-options.setting.render-distance.label', defaultMessage: 'Render distance' },
 	simulationDistanceLabel: { id: 'app.settings.game-options.setting.simulation-distance.label', defaultMessage: 'Simulation distance' },
-	simulationDistanceDescription: { id: 'app.settings.game-options.setting.simulation-distance.description', defaultMessage: 'How far the world is simulated.' },
+	simulationDistanceDescription: { id: 'app.settings.game-options.setting.simulation-distance.description', defaultMessage: 'How far away entities update and blocks and fluids tick.' },
 	guiScaleLabel: { id: 'app.settings.game-options.setting.gui-scale.label', defaultMessage: 'GUI scale' },
-	guiScaleDescription: { id: 'app.settings.game-options.setting.gui-scale.description', defaultMessage: 'The size of the game interface.' },
+	guiScaleDescription: { id: 'app.settings.game-options.setting.gui-scale.description', defaultMessage: 'The size of the game interface and HUD.' },
 	particlesLabel: { id: 'app.settings.game-options.setting.particles.label', defaultMessage: 'Particles' },
 	cloudsLabel: { id: 'app.settings.game-options.setting.clouds.label', defaultMessage: 'Clouds' },
 	entityShadowsLabel: { id: 'app.settings.game-options.setting.entity-shadows.label', defaultMessage: 'Entity shadows' },
 	viewBobbingLabel: { id: 'app.settings.game-options.setting.view-bobbing.label', defaultMessage: 'View bobbing' },
-	viewBobbingDescription: { id: 'app.settings.game-options.setting.view-bobbing.description', defaultMessage: 'Move the camera while walking.' },
+	viewBobbingDescription: { id: 'app.settings.game-options.setting.view-bobbing.description', defaultMessage: 'Add a bobbing motion to the camera while walking.' },
 	vsyncLabel: { id: 'app.settings.game-options.setting.vsync.label', defaultMessage: 'VSync' },
-	vsyncDescription: { id: 'app.settings.game-options.setting.vsync.description', defaultMessage: 'Synchronize frames with the display.' },
+	vsyncDescription: { id: 'app.settings.game-options.setting.vsync.description', defaultMessage: 'Limit the frame rate to the display refresh rate to prevent screen tearing.' },
 	fullscreenLabel: { id: 'app.settings.game-options.setting.fullscreen.label', defaultMessage: 'Fullscreen' },
 	maxFramerateLabel: { id: 'app.settings.game-options.setting.max-framerate.label', defaultMessage: 'Maximum framerate' },
 	mipmapLevelsLabel: { id: 'app.settings.game-options.setting.mipmap-levels.label', defaultMessage: 'Mipmap levels' },
 	mipmapLevelsDescription: { id: 'app.settings.game-options.setting.mipmap-levels.description', defaultMessage: 'Texture smoothing at a distance.' },
 	biomeBlendRadiusLabel: { id: 'app.settings.game-options.setting.biome-blend-radius.label', defaultMessage: 'Biome blend' },
-	biomeBlendRadiusDescription: { id: 'app.settings.game-options.setting.biome-blend-radius.description', defaultMessage: 'How smoothly biome colors blend.' },
+	biomeBlendRadiusDescription: { id: 'app.settings.game-options.setting.biome-blend-radius.description', defaultMessage: 'The distance over which biome colors transition.' },
 	languageLabel: { id: 'app.settings.game-options.setting.language.label', defaultMessage: 'Language' },
 	masterVolumeLabel: { id: 'app.settings.game-options.setting.master-volume.label', defaultMessage: 'Master volume' },
 	musicVolumeLabel: { id: 'app.settings.game-options.setting.music-volume.label', defaultMessage: 'Music' },
 	musicToastLabel: { id: 'app.settings.game-options.setting.music-toast.label', defaultMessage: 'Music notification' },
-	musicToastDescription: { id: 'app.settings.game-options.setting.music-toast.description', defaultMessage: 'Choose when Minecraft pauses music and shows its title.' },
+	musicToastDescription: { id: 'app.settings.game-options.setting.music-toast.description', defaultMessage: 'Choose whether music titles appear in the pause menu and as toasts.' },
 	blocksVolumeLabel: { id: 'app.settings.game-options.setting.blocks-volume.label', defaultMessage: 'Blocks' },
 	hostileVolumeLabel: { id: 'app.settings.game-options.setting.hostile-volume.label', defaultMessage: 'Hostile creatures' },
 	playersVolumeLabel: { id: 'app.settings.game-options.setting.players-volume.label', defaultMessage: 'Players' },
@@ -46,13 +46,13 @@ const settingMessages = defineMessages({
 	invertMouseLabel: { id: 'app.settings.game-options.setting.invert-mouse.label', defaultMessage: 'Invert mouse' },
 	invertMouseDescription: { id: 'app.settings.game-options.setting.invert-mouse.description', defaultMessage: 'Invert vertical mouse movement.' },
 	autoJumpLabel: { id: 'app.settings.game-options.setting.auto-jump.label', defaultMessage: 'Auto-jump' },
-	autoJumpDescription: { id: 'app.settings.game-options.setting.auto-jump.description', defaultMessage: 'Automatically jump at small obstacles.' },
+	autoJumpDescription: { id: 'app.settings.game-options.setting.auto-jump.description', defaultMessage: 'Automatically jump up one-block-high obstacles.' },
 	toggleCrouchLabel: { id: 'app.settings.game-options.setting.toggle-crouch.label', defaultMessage: 'Toggle crouch' },
 	toggleCrouchDescription: { id: 'app.settings.game-options.setting.toggle-crouch.description', defaultMessage: 'Press once to remain crouched.' },
 	toggleSprintLabel: { id: 'app.settings.game-options.setting.toggle-sprint.label', defaultMessage: 'Toggle sprint' },
 	toggleSprintDescription: { id: 'app.settings.game-options.setting.toggle-sprint.description', defaultMessage: 'Press once to remain sprinting.' },
 	discreteMouseScrollLabel: { id: 'app.settings.game-options.setting.discrete-mouse-scroll.label', defaultMessage: 'Discrete scrolling' },
-	discreteMouseScrollDescription: { id: 'app.settings.game-options.setting.discrete-mouse-scroll.description', defaultMessage: 'Use discrete mouse-wheel steps.' },
+	discreteMouseScrollDescription: { id: 'app.settings.game-options.setting.discrete-mouse-scroll.description', defaultMessage: 'Treat each mouse-wheel input as a single scroll step.' },
 	keyForwardLabel: { id: 'app.settings.game-options.setting.key-forward.label', defaultMessage: 'Move forward' },
 	keyLeftLabel: { id: 'app.settings.game-options.setting.key-left.label', defaultMessage: 'Strafe left' },
 	keyBackLabel: { id: 'app.settings.game-options.setting.key-back.label', defaultMessage: 'Move backward' },
@@ -76,7 +76,7 @@ const settingMessages = defineMessages({
 	chatVisibilityLabel: { id: 'app.settings.game-options.setting.chat-visibility.label', defaultMessage: 'Chat visibility' },
 	chatColorsLabel: { id: 'app.settings.game-options.setting.chat-colors.label', defaultMessage: 'Chat colors' },
 	chatLinksLabel: { id: 'app.settings.game-options.setting.chat-links.label', defaultMessage: 'Web links' },
-	chatLinksDescription: { id: 'app.settings.game-options.setting.chat-links.description', defaultMessage: 'Allow links in chat.' },
+	chatLinksDescription: { id: 'app.settings.game-options.setting.chat-links.description', defaultMessage: 'Allow web links in chat to be opened.' },
 	chatLinksPromptLabel: { id: 'app.settings.game-options.setting.chat-links-prompt.label', defaultMessage: 'Prompt on links' },
 	chatLinksPromptDescription: { id: 'app.settings.game-options.setting.chat-links-prompt.description', defaultMessage: 'Ask before opening links from chat.' },
 	chatOpacityLabel: { id: 'app.settings.game-options.setting.chat-opacity.label', defaultMessage: 'Chat opacity' },
@@ -85,23 +85,23 @@ const settingMessages = defineMessages({
 	narratorLabel: { id: 'app.settings.game-options.setting.narrator.label', defaultMessage: 'Narrator' },
 	narratorDescription: { id: 'app.settings.game-options.setting.narrator.description', defaultMessage: 'Choose what the narrator reads.' },
 	subtitlesLabel: { id: 'app.settings.game-options.setting.subtitles.label', defaultMessage: 'Subtitles' },
-	subtitlesDescription: { id: 'app.settings.game-options.setting.subtitles.description', defaultMessage: 'Show captions for nearby sounds.' },
+	subtitlesDescription: { id: 'app.settings.game-options.setting.subtitles.description', defaultMessage: 'Show captions for sounds played in the game.' },
 	highContrastLabel: { id: 'app.settings.game-options.setting.high-contrast.label', defaultMessage: 'High contrast' },
-	highContrastDescription: { id: 'app.settings.game-options.setting.high-contrast.description', defaultMessage: 'Use high-contrast resource styling.' },
+	highContrastDescription: { id: 'app.settings.game-options.setting.high-contrast.description', defaultMessage: 'Enhance the contrast of interface elements.' },
 	darkSplashLabel: { id: 'app.settings.game-options.setting.dark-splash.label', defaultMessage: 'Monochrome logo' },
-	darkSplashDescription: { id: 'app.settings.game-options.setting.dark-splash.description', defaultMessage: 'Use a dark loading screen background.' },
+	darkSplashDescription: { id: 'app.settings.game-options.setting.dark-splash.description', defaultMessage: 'Change the Mojang Studios loading screen from red to black.' },
 	notificationTimeLabel: { id: 'app.settings.game-options.setting.notification-time.label', defaultMessage: 'Notification time' },
-	notificationTimeDescription: { id: 'app.settings.game-options.setting.notification-time.description', defaultMessage: 'How long notifications remain visible.' },
+	notificationTimeDescription: { id: 'app.settings.game-options.setting.notification-time.description', defaultMessage: 'How long toast notifications remain visible.' },
 	mainHandLabel: { id: 'app.settings.game-options.setting.main-hand.label', defaultMessage: 'Main hand' },
-	mainHandDescription: { id: 'app.settings.game-options.setting.main-hand.description', defaultMessage: 'The hand used for held items.' },
+	mainHandDescription: { id: 'app.settings.game-options.setting.main-hand.description', defaultMessage: 'Choose whether the main hand is left or right.' },
 	capeLabel: { id: 'app.settings.game-options.setting.cape.label', defaultMessage: 'Cape' },
-	capeDescription: { id: 'app.settings.game-options.setting.cape.description', defaultMessage: 'Show the cape skin layer.' },
+	capeDescription: { id: 'app.settings.game-options.setting.cape.description', defaultMessage: 'Show the player\'s cape, including its elytra texture.' },
 	hatLabel: { id: 'app.settings.game-options.setting.hat.label', defaultMessage: 'Hat' },
 	hatDescription: { id: 'app.settings.game-options.setting.hat.description', defaultMessage: 'Show the hat skin layer.' },
 	jacketLabel: { id: 'app.settings.game-options.setting.jacket.label', defaultMessage: 'Jacket' },
 	jacketDescription: { id: 'app.settings.game-options.setting.jacket.description', defaultMessage: 'Show the jacket skin layer.' },
 	allowServerListingLabel: { id: 'app.settings.game-options.setting.allow-server-listing.label', defaultMessage: 'Server listings' },
-	allowServerListingDescription: { id: 'app.settings.game-options.setting.allow-server-listing.description', defaultMessage: 'Allow servers to list this player online.' },
+	allowServerListingDescription: { id: 'app.settings.game-options.setting.allow-server-listing.description', defaultMessage: 'Allow the player\'s name to appear in server listings.' },
 	realmsNotificationsLabel: { id: 'app.settings.game-options.setting.realms-notifications.label', defaultMessage: 'Realms notifications' },
 })
 
@@ -146,8 +146,8 @@ const choiceMessages = defineMessages({
 	minimum: { id: 'app.settings.game-options.choice.minimum', defaultMessage: 'Minimum' },
 	maximum: { id: 'app.settings.game-options.choice.maximum', defaultMessage: 'Maximum' },
 	never: { id: 'app.settings.game-options.choice.never', defaultMessage: 'Never' },
-	pause: { id: 'app.settings.game-options.choice.pause', defaultMessage: 'Pause' },
-	pauseAndToast: { id: 'app.settings.game-options.choice.pause-and-toast', defaultMessage: 'Pause and show toast' },
+	pause: { id: 'app.settings.game-options.choice.pause', defaultMessage: 'Pause menu' },
+	pauseAndToast: { id: 'app.settings.game-options.choice.pause-and-toast', defaultMessage: 'Pause menu and toast' },
 })
 
 export const presentationMessages = defineMessages({

From a85c464295e9114723dde1d8ed694c43f61ad089 Mon Sep 17 00:00:00 2001
From: "Calum H. (IMB11)" <contact@cal.engineer>
Date: Tue, 1 Sep 2026 14:18:49 +0100
Subject: [PATCH 04/33] fix: lint + prepr

---
 .../instances/InstancesSyncedSettings.vue     |   9 +-
 .../game-settings/GameKeybindInput.vue        |   5 +-
 .../game-settings/GameSettingRow.vue          |  10 +-
 .../game-settings/GameSettingsModal.vue       |  64 +-
 .../instances/game-settings/game-keybinds.ts  |   4 +-
 .../game-settings/game-setting-editors.ts     |  15 +-
 .../game-settings/game-setting-messages.ts    | 925 ++++++++++++++----
 .../app-frontend/src/locales/en-US/index.json | 735 ++++++++++++++
 .../api/instance/game_options/fullscreen.rs   |   6 +-
 .../instance/game_options/instance_support.rs |  20 +-
 .../supported_settings/version_changes.rs     |  11 +-
 packages/app-lib/src/api/instance/run.rs      |   3 +-
 .../instance/synced_options/orchestration.rs  |  36 +-
 packages/app-lib/src/api/settings.rs          |  21 +-
 packages/ui/src/components/base/Slider.vue    |   3 +-
 packages/ui/src/components/modal/NewModal.vue |   6 +-
 16 files changed, 1534 insertions(+), 339 deletions(-)

diff --git a/apps/app-frontend/src/components/ui/settings/instances/InstancesSyncedSettings.vue b/apps/app-frontend/src/components/ui/settings/instances/InstancesSyncedSettings.vue
index 0bcc08d717..bab4918f47 100644
--- a/apps/app-frontend/src/components/ui/settings/instances/InstancesSyncedSettings.vue
+++ b/apps/app-frontend/src/components/ui/settings/instances/InstancesSyncedSettings.vue
@@ -25,8 +25,8 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/vue-query'
 import type { Component } from 'vue'
 import { computed, nextTick, ref, shallowRef, watch } from 'vue'
 
-import WorldItem from '@/components/ui/world/WorldItem.vue'
 import GameSettingsModal from '@/components/ui/settings/instances/game-settings/GameSettingsModal.vue'
+import WorldItem from '@/components/ui/world/WorldItem.vue'
 import useMemorySlider from '@/composables/useMemorySlider'
 import {
 	type GameOptionsSourceCandidate,
@@ -76,7 +76,8 @@ const messages = defineMessages({
 	},
 	gameSettingsDescription: {
 		id: 'app.settings.synced-options.game-settings.description',
-		defaultMessage: 'Use the same graphics, keybinds, and other game settings across your instances',
+		defaultMessage:
+			'Use the same graphics, keybinds, and other game settings across your instances',
 	},
 	gameSettingsButton: {
 		id: 'app.settings.synced-options.game-settings.button',
@@ -769,7 +770,9 @@ watch(
 					<Button
 						type="colored"
 						color="brand"
-						:disabled="!baseInstanceId || baseSourcesLoading || globalOptionMutation.isPending.value"
+						:disabled="
+							!baseInstanceId || baseSourcesLoading || globalOptionMutation.isPending.value
+						"
 						:loading="globalOptionMutation.isPending.value"
 						@click="confirmBaseInstance"
 					>
diff --git a/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameKeybindInput.vue b/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameKeybindInput.vue
index bb166bc596..0abda0ee45 100644
--- a/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameKeybindInput.vue
+++ b/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameKeybindInput.vue
@@ -192,8 +192,8 @@ onBeforeUnmount(cancelRecording)
 	<div class="flex w-full min-w-0 items-center gap-1.5">
 		<span
 			ref="controlElement"
-			data-game-keybind-control
 			v-tooltip="!recording && conflictMessage ? conflictMessage : undefined"
+			data-game-keybind-control
 			class="flex min-w-0 flex-1"
 		>
 			<Button
@@ -204,8 +204,7 @@ onBeforeUnmount(cancelRecording)
 				:aria-describedby="recording ? statusId : undefined"
 				class="keybind-button !w-full overflow-hidden"
 				:class="{
-					'!bg-brand-highlight !text-brand !shadow-[inset_0_0_0_1px_var(--color-brand)]':
-						recording,
+					'!bg-brand-highlight !text-brand !shadow-[inset_0_0_0_1px_var(--color-brand)]': recording,
 					'keybind-button--conflict': !recording && conflicts.length,
 				}"
 				@click="handleClick"
diff --git a/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingRow.vue b/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingRow.vue
index a3d05c9b86..3fb2c2ed08 100644
--- a/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingRow.vue
+++ b/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingRow.vue
@@ -18,7 +18,6 @@ import {
 	canonicalValueFromInput,
 	canonicalValueText,
 } from './game-setting-editors'
-import GameKeybindInput from './GameKeybindInput.vue'
 import {
 	formatCompatibilityTooltip,
 	formatGameSettingChoice,
@@ -28,6 +27,7 @@ import {
 	presentationMessages,
 	shouldShowCompatibilityIndicator,
 } from './game-setting-messages'
+import GameKeybindInput from './GameKeybindInput.vue'
 
 const props = withDefaults(
 	defineProps<{
@@ -121,9 +121,7 @@ const sliderValue = computed(() => {
 	const value = Number(valueText.value)
 	return Number.isFinite(value) ? value : (inputMin.value ?? 0)
 })
-const editorDisabled = computed(
-	() => props.disabled || props.setting.controlled,
-)
+const editorDisabled = computed(() => props.disabled || props.setting.controlled)
 const syncToggleDisabled = computed(
 	() =>
 		props.disabled ||
@@ -258,7 +256,9 @@ function updateValue(value: string | number | boolean | undefined) {
 			<Input
 				v-else
 				:model-value="valueText"
-				:type="setting.editor.type === 'integer' || setting.editor.type === 'decimal' ? 'number' : 'text'"
+				:type="
+					setting.editor.type === 'integer' || setting.editor.type === 'decimal' ? 'number' : 'text'
+				"
 				:min="inputMin"
 				:max="inputMax"
 				:step="inputStep"
diff --git a/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingsModal.vue b/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingsModal.vue
index 78c364e2de..c7815e8e29 100644
--- a/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingsModal.vue
+++ b/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingsModal.vue
@@ -35,29 +35,29 @@ import type { Component } from 'vue'
 import { computed, nextTick, onUnmounted, ref } from 'vue'
 
 import {
-	get_synced_game_options_config,
 	type EditableGameSetting,
 	type GameOptionCanonicalValue,
 	type GameSettingCategory,
 	type GameSettingsEditorState,
+	get_synced_game_options_config,
 	preview_synced_game_option_changes,
 	save_synced_game_option_changes,
 	type UpdateGameSettingsRequest,
 } from '@/helpers/game-options'
 
-import GameSettingRow from './GameSettingRow.vue'
+import { minecraftKeybindConflictKey } from './game-keybinds'
 import {
 	cloneGameSettingsState,
 	gameSettingChanges,
 	settingCanBeEnabled,
 	settingSearchText,
 } from './game-setting-editors'
-import { minecraftKeybindConflictKey } from './game-keybinds'
 import {
 	formatGameSettingDescription,
 	formatGameSettingLabel,
 	gameSettingCategoryMessage,
 } from './game-setting-messages'
+import GameSettingRow from './GameSettingRow.vue'
 
 const emit = defineEmits<{
 	saved: []
@@ -142,7 +142,8 @@ const messages = defineMessages({
 	},
 	savedLater: {
 		id: 'app.settings.synced-options.game-settings.saved-later',
-		defaultMessage: 'Your changes were saved and will finish syncing when your instances are ready.',
+		defaultMessage:
+			'Your changes were saved and will finish syncing when your instances are ready.',
 	},
 	savedWithProblems: {
 		id: 'app.settings.synced-options.game-settings.saved-with-problems',
@@ -158,8 +159,7 @@ const messages = defineMessages({
 	},
 	conflictText: {
 		id: 'app.settings.synced-options.game-settings.conflict-text',
-		defaultMessage:
-			'We loaded the latest settings. Check your changes, then save again.',
+		defaultMessage: 'We loaded the latest settings. Check your changes, then save again.',
 	},
 })
 
@@ -256,10 +256,7 @@ const keybindConflicts = computed(() => {
 
 	const bindings = new Map<string, EditableGameSetting[]>()
 	for (const setting of draftState.value.settings) {
-		if (
-			setting.editor.type !== 'key_binding' ||
-			setting.canonical_value?.type !== 'key_binding'
-		)
+		if (setting.editor.type !== 'key_binding' || setting.canonical_value?.type !== 'key_binding')
 			continue
 		const key = minecraftKeybindConflictKey(setting.canonical_value.value)
 		if (!key) continue
@@ -285,9 +282,7 @@ const dirtyChanges = computed(() =>
 	gameSettingChanges(baseState.value, draftState.value, touchedValueOptionIds.value),
 )
 const isDirty = computed(() => dirtyChanges.value.length > 0)
-const dirtyOptionIds = computed(
-	() => new Set(dirtyChanges.value.map((change) => change.option_id)),
-)
+const dirtyOptionIds = computed(() => new Set(dirtyChanges.value.map((change) => change.option_id)))
 const hasBlockingDraft = computed(
 	() =>
 		draftState.value?.settings.some(
@@ -345,7 +340,8 @@ async function load() {
 		const currentCategoryExists = categories.value.some(
 			(category) => category.id === activeCategoryId.value,
 		)
-		if (!currentCategoryExists) activeCategoryId.value = categories.value[0]?.id ?? 'custom_settings'
+		if (!currentCategoryExists)
+			activeCategoryId.value = categories.value[0]?.id ?? 'custom_settings'
 		const activeCategoryIndex = categories.value.findIndex(
 			(category) => category.id === activeCategoryId.value,
 		)
@@ -462,11 +458,9 @@ function mergePreview(preview: GameSettingsEditorState) {
 	if (!baseState.value || !draftState.value) return
 	const previousBase = baseState.value
 	const dirtyIds = new Set(
-		gameSettingChanges(
-			previousBase,
-			draftState.value,
-			touchedValueOptionIds.value,
-		).map((change) => change.option_id),
+		gameSettingChanges(previousBase, draftState.value, touchedValueOptionIds.value).map(
+			(change) => change.option_id,
+		),
 	)
 	const stagedSettings = new Map(
 		draftState.value.settings
@@ -557,11 +551,8 @@ async function save() {
 				text: formatMessage(messages.conflictText),
 			})
 			if (
-				gameSettingChanges(
-					baseState.value,
-					draftState.value,
-					touchedValueOptionIds.value,
-				).length > 0
+				gameSettingChanges(baseState.value, draftState.value, touchedValueOptionIds.value).length >
+				0
 			) {
 				schedulePreview()
 			}
@@ -630,27 +621,17 @@ defineExpose({ show, hide })
 				<div class="flex shrink-0 flex-wrap items-center justify-between gap-3 pb-3 pt-2">
 					<div class="flex items-center gap-2">
 						<FilterIcon class="size-5 shrink-0 text-secondary" aria-hidden="true" />
-						<Tabs
-							:value="selectionFilter"
-							:tabs="filterTabs"
-							@update:value="setSelectionFilter"
-						/>
+						<Tabs :value="selectionFilter" :tabs="filterTabs" @update:value="setSelectionFilter" />
 					</div>
 					<ButtonGroup>
-						<Button
-							:disabled="saving || enableCandidates.length === 0"
-							@click="enableVisible"
-						>
+						<Button :disabled="saving || enableCandidates.length === 0" @click="enableVisible">
 							{{
 								enableCandidates.length
 									? formatMessage(messages.enableAllCount, { count: enableCandidates.length })
 									: formatMessage(messages.enableAll)
 							}}
 						</Button>
-						<Button
-							:disabled="saving || disableCandidates.length === 0"
-							@click="disableVisible"
-						>
+						<Button :disabled="saving || disableCandidates.length === 0" @click="disableVisible">
 							{{
 								disableCandidates.length
 									? formatMessage(messages.disableAllCount, { count: disableCandidates.length })
@@ -678,7 +659,10 @@ defineExpose({ show, hide })
 					</Button>
 				</div>
 				<div v-else class="min-h-0 flex-1">
-					<p v-if="previewError" class="m-0 border-0 border-b border-solid border-surface-5 py-3 text-sm text-orange">
+					<p
+						v-if="previewError"
+						class="m-0 border-0 border-b border-solid border-surface-5 py-3 text-sm text-orange"
+					>
 						{{ formatMessage(messages.previewFailed) }}
 					</p>
 					<div
@@ -722,9 +706,7 @@ defineExpose({ show, hide })
 					<Button
 						type="colored"
 						color="brand"
-						:disabled="
-							!isDirty || loading || saving || previewError || hasBlockingDraft
-						"
+						:disabled="!isDirty || loading || saving || previewError || hasBlockingDraft"
 						:loading="saving"
 						@click="save"
 					>
diff --git a/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-keybinds.ts b/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-keybinds.ts
index f0edeef140..dd05a361cf 100644
--- a/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-keybinds.ts
+++ b/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-keybinds.ts
@@ -298,9 +298,7 @@ const keyboardLabels: Record<string, MessageDescriptor | string> = {
 
 function splitKeybind(value: string): [key: string, modifier?: string] {
 	const separator = value.indexOf(':')
-	return separator === -1
-		? [value]
-		: [value.slice(0, separator), value.slice(separator + 1)]
+	return separator === -1 ? [value] : [value.slice(0, separator), value.slice(separator + 1)]
 }
 
 function keyboardIdentifierFromCode(code: string): string | null {
diff --git a/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-editors.ts b/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-editors.ts
index 59e59e60fb..f215d4ba56 100644
--- a/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-editors.ts
+++ b/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-editors.ts
@@ -29,10 +29,7 @@ export function gameSettingChanges(
 		if (!previous) return []
 
 		const syncChanged = previous.sync_enabled !== setting.sync_enabled
-		const valueChanged = !canonicalValuesEqual(
-			previous.canonical_value,
-			setting.canonical_value,
-		)
+		const valueChanged = !canonicalValuesEqual(previous.canonical_value, setting.canonical_value)
 		const promoteLocalValue =
 			forcedValueOptionIds.has(setting.option_id) &&
 			previous.value_state !== 'canonical' &&
@@ -125,12 +122,7 @@ export function settingSearchText(
 	label: string,
 	description: string,
 ): string {
-	return [
-		label,
-		description,
-		setting.option_id,
-		setting.raw_key,
-	]
+	return [label, description, setting.option_id, setting.raw_key]
 		.filter(Boolean)
 		.join(' ')
 		.toLocaleLowerCase()
@@ -141,7 +133,6 @@ export function settingCanBeEnabled(setting: EditableGameSetting): boolean {
 		!setting.controlled &&
 		!setting.validation_error &&
 		!['mixed', 'unset', 'invalid'].includes(setting.value_state) &&
-		(setting.compatibility.total_participating === 0 ||
-			setting.compatibility.will_receive > 0)
+		(setting.compatibility.total_participating === 0 || setting.compatibility.will_receive > 0)
 	)
 }
diff --git a/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-messages.ts b/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-messages.ts
index e939009da7..bcf6b8a5ec 100644
--- a/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-messages.ts
+++ b/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-messages.ts
@@ -2,9 +2,9 @@ import { defineMessages, type MessageDescriptor, type VIntlFormatters } from '@m
 
 import type {
 	EditableGameSetting,
-	GameOptionValidationError,
 	GameOptionsSourceCandidate,
 	GameOptionsSourceDisabledReason,
+	GameOptionValidationError,
 	GameSettingCategory,
 } from '@/helpers/game-options'
 
@@ -12,118 +12,418 @@ type FormatMessage = VIntlFormatters['formatMessage']
 
 const settingMessages = defineMessages({
 	fovLabel: { id: 'app.settings.game-options.setting.fov.label', defaultMessage: 'Field of view' },
-	graphicsLabel: { id: 'app.settings.game-options.setting.graphics.label', defaultMessage: 'Graphics' },
-	graphicsDescription: { id: 'app.settings.game-options.setting.graphics.description', defaultMessage: 'Controls visual quality and performance.' },
-	ambientOcclusionLabel: { id: 'app.settings.game-options.setting.ambient-occlusion.label', defaultMessage: 'Smooth lighting' },
-	renderDistanceLabel: { id: 'app.settings.game-options.setting.render-distance.label', defaultMessage: 'Render distance' },
-	simulationDistanceLabel: { id: 'app.settings.game-options.setting.simulation-distance.label', defaultMessage: 'Simulation distance' },
-	simulationDistanceDescription: { id: 'app.settings.game-options.setting.simulation-distance.description', defaultMessage: 'How far away entities update and blocks and fluids tick.' },
-	guiScaleLabel: { id: 'app.settings.game-options.setting.gui-scale.label', defaultMessage: 'GUI scale' },
-	guiScaleDescription: { id: 'app.settings.game-options.setting.gui-scale.description', defaultMessage: 'The size of the game interface and HUD.' },
-	particlesLabel: { id: 'app.settings.game-options.setting.particles.label', defaultMessage: 'Particles' },
+	graphicsLabel: {
+		id: 'app.settings.game-options.setting.graphics.label',
+		defaultMessage: 'Graphics',
+	},
+	graphicsDescription: {
+		id: 'app.settings.game-options.setting.graphics.description',
+		defaultMessage: 'Controls visual quality and performance.',
+	},
+	ambientOcclusionLabel: {
+		id: 'app.settings.game-options.setting.ambient-occlusion.label',
+		defaultMessage: 'Smooth lighting',
+	},
+	renderDistanceLabel: {
+		id: 'app.settings.game-options.setting.render-distance.label',
+		defaultMessage: 'Render distance',
+	},
+	simulationDistanceLabel: {
+		id: 'app.settings.game-options.setting.simulation-distance.label',
+		defaultMessage: 'Simulation distance',
+	},
+	simulationDistanceDescription: {
+		id: 'app.settings.game-options.setting.simulation-distance.description',
+		defaultMessage: 'How far away entities update and blocks and fluids tick.',
+	},
+	guiScaleLabel: {
+		id: 'app.settings.game-options.setting.gui-scale.label',
+		defaultMessage: 'GUI scale',
+	},
+	guiScaleDescription: {
+		id: 'app.settings.game-options.setting.gui-scale.description',
+		defaultMessage: 'The size of the game interface and HUD.',
+	},
+	particlesLabel: {
+		id: 'app.settings.game-options.setting.particles.label',
+		defaultMessage: 'Particles',
+	},
 	cloudsLabel: { id: 'app.settings.game-options.setting.clouds.label', defaultMessage: 'Clouds' },
-	entityShadowsLabel: { id: 'app.settings.game-options.setting.entity-shadows.label', defaultMessage: 'Entity shadows' },
-	viewBobbingLabel: { id: 'app.settings.game-options.setting.view-bobbing.label', defaultMessage: 'View bobbing' },
-	viewBobbingDescription: { id: 'app.settings.game-options.setting.view-bobbing.description', defaultMessage: 'Add a bobbing motion to the camera while walking.' },
+	entityShadowsLabel: {
+		id: 'app.settings.game-options.setting.entity-shadows.label',
+		defaultMessage: 'Entity shadows',
+	},
+	viewBobbingLabel: {
+		id: 'app.settings.game-options.setting.view-bobbing.label',
+		defaultMessage: 'View bobbing',
+	},
+	viewBobbingDescription: {
+		id: 'app.settings.game-options.setting.view-bobbing.description',
+		defaultMessage: 'Add a bobbing motion to the camera while walking.',
+	},
 	vsyncLabel: { id: 'app.settings.game-options.setting.vsync.label', defaultMessage: 'VSync' },
-	vsyncDescription: { id: 'app.settings.game-options.setting.vsync.description', defaultMessage: 'Limit the frame rate to the display refresh rate to prevent screen tearing.' },
-	fullscreenLabel: { id: 'app.settings.game-options.setting.fullscreen.label', defaultMessage: 'Fullscreen' },
-	maxFramerateLabel: { id: 'app.settings.game-options.setting.max-framerate.label', defaultMessage: 'Maximum framerate' },
-	mipmapLevelsLabel: { id: 'app.settings.game-options.setting.mipmap-levels.label', defaultMessage: 'Mipmap levels' },
-	mipmapLevelsDescription: { id: 'app.settings.game-options.setting.mipmap-levels.description', defaultMessage: 'Texture smoothing at a distance.' },
-	biomeBlendRadiusLabel: { id: 'app.settings.game-options.setting.biome-blend-radius.label', defaultMessage: 'Biome blend' },
-	biomeBlendRadiusDescription: { id: 'app.settings.game-options.setting.biome-blend-radius.description', defaultMessage: 'The distance over which biome colors transition.' },
-	languageLabel: { id: 'app.settings.game-options.setting.language.label', defaultMessage: 'Language' },
-	masterVolumeLabel: { id: 'app.settings.game-options.setting.master-volume.label', defaultMessage: 'Master volume' },
-	musicVolumeLabel: { id: 'app.settings.game-options.setting.music-volume.label', defaultMessage: 'Music' },
-	musicToastLabel: { id: 'app.settings.game-options.setting.music-toast.label', defaultMessage: 'Music notification' },
-	musicToastDescription: { id: 'app.settings.game-options.setting.music-toast.description', defaultMessage: 'Choose whether music titles appear in the pause menu and as toasts.' },
-	blocksVolumeLabel: { id: 'app.settings.game-options.setting.blocks-volume.label', defaultMessage: 'Blocks' },
-	hostileVolumeLabel: { id: 'app.settings.game-options.setting.hostile-volume.label', defaultMessage: 'Hostile creatures' },
-	playersVolumeLabel: { id: 'app.settings.game-options.setting.players-volume.label', defaultMessage: 'Players' },
-	voiceVolumeLabel: { id: 'app.settings.game-options.setting.voice-volume.label', defaultMessage: 'Voice and speech' },
-	sensitivityLabel: { id: 'app.settings.game-options.setting.sensitivity.label', defaultMessage: 'Mouse sensitivity' },
-	invertMouseLabel: { id: 'app.settings.game-options.setting.invert-mouse.label', defaultMessage: 'Invert mouse' },
-	invertMouseDescription: { id: 'app.settings.game-options.setting.invert-mouse.description', defaultMessage: 'Invert vertical mouse movement.' },
-	autoJumpLabel: { id: 'app.settings.game-options.setting.auto-jump.label', defaultMessage: 'Auto-jump' },
-	autoJumpDescription: { id: 'app.settings.game-options.setting.auto-jump.description', defaultMessage: 'Automatically jump up one-block-high obstacles.' },
-	toggleCrouchLabel: { id: 'app.settings.game-options.setting.toggle-crouch.label', defaultMessage: 'Toggle crouch' },
-	toggleCrouchDescription: { id: 'app.settings.game-options.setting.toggle-crouch.description', defaultMessage: 'Press once to remain crouched.' },
-	toggleSprintLabel: { id: 'app.settings.game-options.setting.toggle-sprint.label', defaultMessage: 'Toggle sprint' },
-	toggleSprintDescription: { id: 'app.settings.game-options.setting.toggle-sprint.description', defaultMessage: 'Press once to remain sprinting.' },
-	discreteMouseScrollLabel: { id: 'app.settings.game-options.setting.discrete-mouse-scroll.label', defaultMessage: 'Discrete scrolling' },
-	discreteMouseScrollDescription: { id: 'app.settings.game-options.setting.discrete-mouse-scroll.description', defaultMessage: 'Treat each mouse-wheel input as a single scroll step.' },
-	keyForwardLabel: { id: 'app.settings.game-options.setting.key-forward.label', defaultMessage: 'Move forward' },
-	keyLeftLabel: { id: 'app.settings.game-options.setting.key-left.label', defaultMessage: 'Strafe left' },
-	keyBackLabel: { id: 'app.settings.game-options.setting.key-back.label', defaultMessage: 'Move backward' },
-	keyRightLabel: { id: 'app.settings.game-options.setting.key-right.label', defaultMessage: 'Strafe right' },
+	vsyncDescription: {
+		id: 'app.settings.game-options.setting.vsync.description',
+		defaultMessage: 'Limit the frame rate to the display refresh rate to prevent screen tearing.',
+	},
+	fullscreenLabel: {
+		id: 'app.settings.game-options.setting.fullscreen.label',
+		defaultMessage: 'Fullscreen',
+	},
+	maxFramerateLabel: {
+		id: 'app.settings.game-options.setting.max-framerate.label',
+		defaultMessage: 'Maximum framerate',
+	},
+	mipmapLevelsLabel: {
+		id: 'app.settings.game-options.setting.mipmap-levels.label',
+		defaultMessage: 'Mipmap levels',
+	},
+	mipmapLevelsDescription: {
+		id: 'app.settings.game-options.setting.mipmap-levels.description',
+		defaultMessage: 'Texture smoothing at a distance.',
+	},
+	biomeBlendRadiusLabel: {
+		id: 'app.settings.game-options.setting.biome-blend-radius.label',
+		defaultMessage: 'Biome blend',
+	},
+	biomeBlendRadiusDescription: {
+		id: 'app.settings.game-options.setting.biome-blend-radius.description',
+		defaultMessage: 'The distance over which biome colors transition.',
+	},
+	languageLabel: {
+		id: 'app.settings.game-options.setting.language.label',
+		defaultMessage: 'Language',
+	},
+	masterVolumeLabel: {
+		id: 'app.settings.game-options.setting.master-volume.label',
+		defaultMessage: 'Master volume',
+	},
+	musicVolumeLabel: {
+		id: 'app.settings.game-options.setting.music-volume.label',
+		defaultMessage: 'Music',
+	},
+	musicToastLabel: {
+		id: 'app.settings.game-options.setting.music-toast.label',
+		defaultMessage: 'Music notification',
+	},
+	musicToastDescription: {
+		id: 'app.settings.game-options.setting.music-toast.description',
+		defaultMessage: 'Choose whether music titles appear in the pause menu and as toasts.',
+	},
+	blocksVolumeLabel: {
+		id: 'app.settings.game-options.setting.blocks-volume.label',
+		defaultMessage: 'Blocks',
+	},
+	hostileVolumeLabel: {
+		id: 'app.settings.game-options.setting.hostile-volume.label',
+		defaultMessage: 'Hostile creatures',
+	},
+	playersVolumeLabel: {
+		id: 'app.settings.game-options.setting.players-volume.label',
+		defaultMessage: 'Players',
+	},
+	voiceVolumeLabel: {
+		id: 'app.settings.game-options.setting.voice-volume.label',
+		defaultMessage: 'Voice and speech',
+	},
+	sensitivityLabel: {
+		id: 'app.settings.game-options.setting.sensitivity.label',
+		defaultMessage: 'Mouse sensitivity',
+	},
+	invertMouseLabel: {
+		id: 'app.settings.game-options.setting.invert-mouse.label',
+		defaultMessage: 'Invert mouse',
+	},
+	invertMouseDescription: {
+		id: 'app.settings.game-options.setting.invert-mouse.description',
+		defaultMessage: 'Invert vertical mouse movement.',
+	},
+	autoJumpLabel: {
+		id: 'app.settings.game-options.setting.auto-jump.label',
+		defaultMessage: 'Auto-jump',
+	},
+	autoJumpDescription: {
+		id: 'app.settings.game-options.setting.auto-jump.description',
+		defaultMessage: 'Automatically jump up one-block-high obstacles.',
+	},
+	toggleCrouchLabel: {
+		id: 'app.settings.game-options.setting.toggle-crouch.label',
+		defaultMessage: 'Toggle crouch',
+	},
+	toggleCrouchDescription: {
+		id: 'app.settings.game-options.setting.toggle-crouch.description',
+		defaultMessage: 'Press once to remain crouched.',
+	},
+	toggleSprintLabel: {
+		id: 'app.settings.game-options.setting.toggle-sprint.label',
+		defaultMessage: 'Toggle sprint',
+	},
+	toggleSprintDescription: {
+		id: 'app.settings.game-options.setting.toggle-sprint.description',
+		defaultMessage: 'Press once to remain sprinting.',
+	},
+	discreteMouseScrollLabel: {
+		id: 'app.settings.game-options.setting.discrete-mouse-scroll.label',
+		defaultMessage: 'Discrete scrolling',
+	},
+	discreteMouseScrollDescription: {
+		id: 'app.settings.game-options.setting.discrete-mouse-scroll.description',
+		defaultMessage: 'Treat each mouse-wheel input as a single scroll step.',
+	},
+	keyForwardLabel: {
+		id: 'app.settings.game-options.setting.key-forward.label',
+		defaultMessage: 'Move forward',
+	},
+	keyLeftLabel: {
+		id: 'app.settings.game-options.setting.key-left.label',
+		defaultMessage: 'Strafe left',
+	},
+	keyBackLabel: {
+		id: 'app.settings.game-options.setting.key-back.label',
+		defaultMessage: 'Move backward',
+	},
+	keyRightLabel: {
+		id: 'app.settings.game-options.setting.key-right.label',
+		defaultMessage: 'Strafe right',
+	},
 	keyJumpLabel: { id: 'app.settings.game-options.setting.key-jump.label', defaultMessage: 'Jump' },
-	keySneakLabel: { id: 'app.settings.game-options.setting.key-sneak.label', defaultMessage: 'Sneak' },
-	keySprintLabel: { id: 'app.settings.game-options.setting.key-sprint.label', defaultMessage: 'Sprint' },
-	keyInventoryLabel: { id: 'app.settings.game-options.setting.key-inventory.label', defaultMessage: 'Inventory' },
-	keySwapOffhandLabel: { id: 'app.settings.game-options.setting.key-swap-offhand.label', defaultMessage: 'Swap offhand' },
-	keyDropLabel: { id: 'app.settings.game-options.setting.key-drop.label', defaultMessage: 'Drop item' },
-	keyUseLabel: { id: 'app.settings.game-options.setting.key-use.label', defaultMessage: 'Use item' },
-	keyAttackLabel: { id: 'app.settings.game-options.setting.key-attack.label', defaultMessage: 'Attack' },
-	keyPickItemLabel: { id: 'app.settings.game-options.setting.key-pick-item.label', defaultMessage: 'Pick block' },
-	keyChatLabel: { id: 'app.settings.game-options.setting.key-chat.label', defaultMessage: 'Open chat' },
-	keyPlayerListLabel: { id: 'app.settings.game-options.setting.key-player-list.label', defaultMessage: 'Player list' },
-	keyCommandLabel: { id: 'app.settings.game-options.setting.key-command.label', defaultMessage: 'Command' },
-	keyScreenshotLabel: { id: 'app.settings.game-options.setting.key-screenshot.label', defaultMessage: 'Screenshot' },
-	keyPerspectiveLabel: { id: 'app.settings.game-options.setting.key-perspective.label', defaultMessage: 'Change perspective' },
-	keyFullscreenLabel: { id: 'app.settings.game-options.setting.key-fullscreen.label', defaultMessage: 'Toggle fullscreen' },
-	keyAdvancementsLabel: { id: 'app.settings.game-options.setting.key-advancements.label', defaultMessage: 'Advancements' },
-	chatVisibilityLabel: { id: 'app.settings.game-options.setting.chat-visibility.label', defaultMessage: 'Chat visibility' },
-	chatColorsLabel: { id: 'app.settings.game-options.setting.chat-colors.label', defaultMessage: 'Chat colors' },
-	chatLinksLabel: { id: 'app.settings.game-options.setting.chat-links.label', defaultMessage: 'Web links' },
-	chatLinksDescription: { id: 'app.settings.game-options.setting.chat-links.description', defaultMessage: 'Allow web links in chat to be opened.' },
-	chatLinksPromptLabel: { id: 'app.settings.game-options.setting.chat-links-prompt.label', defaultMessage: 'Prompt on links' },
-	chatLinksPromptDescription: { id: 'app.settings.game-options.setting.chat-links-prompt.description', defaultMessage: 'Ask before opening links from chat.' },
-	chatOpacityLabel: { id: 'app.settings.game-options.setting.chat-opacity.label', defaultMessage: 'Chat opacity' },
-	chatOpacityDescription: { id: 'app.settings.game-options.setting.chat-opacity.description', defaultMessage: 'The opacity of chat text.' },
-	chatScaleLabel: { id: 'app.settings.game-options.setting.chat-scale.label', defaultMessage: 'Chat scale' },
-	narratorLabel: { id: 'app.settings.game-options.setting.narrator.label', defaultMessage: 'Narrator' },
-	narratorDescription: { id: 'app.settings.game-options.setting.narrator.description', defaultMessage: 'Choose what the narrator reads.' },
-	subtitlesLabel: { id: 'app.settings.game-options.setting.subtitles.label', defaultMessage: 'Subtitles' },
-	subtitlesDescription: { id: 'app.settings.game-options.setting.subtitles.description', defaultMessage: 'Show captions for sounds played in the game.' },
-	highContrastLabel: { id: 'app.settings.game-options.setting.high-contrast.label', defaultMessage: 'High contrast' },
-	highContrastDescription: { id: 'app.settings.game-options.setting.high-contrast.description', defaultMessage: 'Enhance the contrast of interface elements.' },
-	darkSplashLabel: { id: 'app.settings.game-options.setting.dark-splash.label', defaultMessage: 'Monochrome logo' },
-	darkSplashDescription: { id: 'app.settings.game-options.setting.dark-splash.description', defaultMessage: 'Change the Mojang Studios loading screen from red to black.' },
-	notificationTimeLabel: { id: 'app.settings.game-options.setting.notification-time.label', defaultMessage: 'Notification time' },
-	notificationTimeDescription: { id: 'app.settings.game-options.setting.notification-time.description', defaultMessage: 'How long toast notifications remain visible.' },
-	mainHandLabel: { id: 'app.settings.game-options.setting.main-hand.label', defaultMessage: 'Main hand' },
-	mainHandDescription: { id: 'app.settings.game-options.setting.main-hand.description', defaultMessage: 'Choose whether the main hand is left or right.' },
+	keySneakLabel: {
+		id: 'app.settings.game-options.setting.key-sneak.label',
+		defaultMessage: 'Sneak',
+	},
+	keySprintLabel: {
+		id: 'app.settings.game-options.setting.key-sprint.label',
+		defaultMessage: 'Sprint',
+	},
+	keyInventoryLabel: {
+		id: 'app.settings.game-options.setting.key-inventory.label',
+		defaultMessage: 'Inventory',
+	},
+	keySwapOffhandLabel: {
+		id: 'app.settings.game-options.setting.key-swap-offhand.label',
+		defaultMessage: 'Swap offhand',
+	},
+	keyDropLabel: {
+		id: 'app.settings.game-options.setting.key-drop.label',
+		defaultMessage: 'Drop item',
+	},
+	keyUseLabel: {
+		id: 'app.settings.game-options.setting.key-use.label',
+		defaultMessage: 'Use item',
+	},
+	keyAttackLabel: {
+		id: 'app.settings.game-options.setting.key-attack.label',
+		defaultMessage: 'Attack',
+	},
+	keyPickItemLabel: {
+		id: 'app.settings.game-options.setting.key-pick-item.label',
+		defaultMessage: 'Pick block',
+	},
+	keyChatLabel: {
+		id: 'app.settings.game-options.setting.key-chat.label',
+		defaultMessage: 'Open chat',
+	},
+	keyPlayerListLabel: {
+		id: 'app.settings.game-options.setting.key-player-list.label',
+		defaultMessage: 'Player list',
+	},
+	keyCommandLabel: {
+		id: 'app.settings.game-options.setting.key-command.label',
+		defaultMessage: 'Command',
+	},
+	keyScreenshotLabel: {
+		id: 'app.settings.game-options.setting.key-screenshot.label',
+		defaultMessage: 'Screenshot',
+	},
+	keyPerspectiveLabel: {
+		id: 'app.settings.game-options.setting.key-perspective.label',
+		defaultMessage: 'Change perspective',
+	},
+	keyFullscreenLabel: {
+		id: 'app.settings.game-options.setting.key-fullscreen.label',
+		defaultMessage: 'Toggle fullscreen',
+	},
+	keyAdvancementsLabel: {
+		id: 'app.settings.game-options.setting.key-advancements.label',
+		defaultMessage: 'Advancements',
+	},
+	chatVisibilityLabel: {
+		id: 'app.settings.game-options.setting.chat-visibility.label',
+		defaultMessage: 'Chat visibility',
+	},
+	chatColorsLabel: {
+		id: 'app.settings.game-options.setting.chat-colors.label',
+		defaultMessage: 'Chat colors',
+	},
+	chatLinksLabel: {
+		id: 'app.settings.game-options.setting.chat-links.label',
+		defaultMessage: 'Web links',
+	},
+	chatLinksDescription: {
+		id: 'app.settings.game-options.setting.chat-links.description',
+		defaultMessage: 'Allow web links in chat to be opened.',
+	},
+	chatLinksPromptLabel: {
+		id: 'app.settings.game-options.setting.chat-links-prompt.label',
+		defaultMessage: 'Prompt on links',
+	},
+	chatLinksPromptDescription: {
+		id: 'app.settings.game-options.setting.chat-links-prompt.description',
+		defaultMessage: 'Ask before opening links from chat.',
+	},
+	chatOpacityLabel: {
+		id: 'app.settings.game-options.setting.chat-opacity.label',
+		defaultMessage: 'Chat opacity',
+	},
+	chatOpacityDescription: {
+		id: 'app.settings.game-options.setting.chat-opacity.description',
+		defaultMessage: 'The opacity of chat text.',
+	},
+	chatScaleLabel: {
+		id: 'app.settings.game-options.setting.chat-scale.label',
+		defaultMessage: 'Chat scale',
+	},
+	narratorLabel: {
+		id: 'app.settings.game-options.setting.narrator.label',
+		defaultMessage: 'Narrator',
+	},
+	narratorDescription: {
+		id: 'app.settings.game-options.setting.narrator.description',
+		defaultMessage: 'Choose what the narrator reads.',
+	},
+	subtitlesLabel: {
+		id: 'app.settings.game-options.setting.subtitles.label',
+		defaultMessage: 'Subtitles',
+	},
+	subtitlesDescription: {
+		id: 'app.settings.game-options.setting.subtitles.description',
+		defaultMessage: 'Show captions for sounds played in the game.',
+	},
+	highContrastLabel: {
+		id: 'app.settings.game-options.setting.high-contrast.label',
+		defaultMessage: 'High contrast',
+	},
+	highContrastDescription: {
+		id: 'app.settings.game-options.setting.high-contrast.description',
+		defaultMessage: 'Enhance the contrast of interface elements.',
+	},
+	darkSplashLabel: {
+		id: 'app.settings.game-options.setting.dark-splash.label',
+		defaultMessage: 'Monochrome logo',
+	},
+	darkSplashDescription: {
+		id: 'app.settings.game-options.setting.dark-splash.description',
+		defaultMessage: 'Change the Mojang Studios loading screen from red to black.',
+	},
+	notificationTimeLabel: {
+		id: 'app.settings.game-options.setting.notification-time.label',
+		defaultMessage: 'Notification time',
+	},
+	notificationTimeDescription: {
+		id: 'app.settings.game-options.setting.notification-time.description',
+		defaultMessage: 'How long toast notifications remain visible.',
+	},
+	mainHandLabel: {
+		id: 'app.settings.game-options.setting.main-hand.label',
+		defaultMessage: 'Main hand',
+	},
+	mainHandDescription: {
+		id: 'app.settings.game-options.setting.main-hand.description',
+		defaultMessage: 'Choose whether the main hand is left or right.',
+	},
 	capeLabel: { id: 'app.settings.game-options.setting.cape.label', defaultMessage: 'Cape' },
-	capeDescription: { id: 'app.settings.game-options.setting.cape.description', defaultMessage: 'Show the player\'s cape, including its elytra texture.' },
+	capeDescription: {
+		id: 'app.settings.game-options.setting.cape.description',
+		defaultMessage: "Show the player's cape, including its elytra texture.",
+	},
 	hatLabel: { id: 'app.settings.game-options.setting.hat.label', defaultMessage: 'Hat' },
-	hatDescription: { id: 'app.settings.game-options.setting.hat.description', defaultMessage: 'Show the hat skin layer.' },
+	hatDescription: {
+		id: 'app.settings.game-options.setting.hat.description',
+		defaultMessage: 'Show the hat skin layer.',
+	},
 	jacketLabel: { id: 'app.settings.game-options.setting.jacket.label', defaultMessage: 'Jacket' },
-	jacketDescription: { id: 'app.settings.game-options.setting.jacket.description', defaultMessage: 'Show the jacket skin layer.' },
-	allowServerListingLabel: { id: 'app.settings.game-options.setting.allow-server-listing.label', defaultMessage: 'Server listings' },
-	allowServerListingDescription: { id: 'app.settings.game-options.setting.allow-server-listing.description', defaultMessage: 'Allow the player\'s name to appear in server listings.' },
-	realmsNotificationsLabel: { id: 'app.settings.game-options.setting.realms-notifications.label', defaultMessage: 'Realms notifications' },
+	jacketDescription: {
+		id: 'app.settings.game-options.setting.jacket.description',
+		defaultMessage: 'Show the jacket skin layer.',
+	},
+	allowServerListingLabel: {
+		id: 'app.settings.game-options.setting.allow-server-listing.label',
+		defaultMessage: 'Server listings',
+	},
+	allowServerListingDescription: {
+		id: 'app.settings.game-options.setting.allow-server-listing.description',
+		defaultMessage: "Allow the player's name to appear in server listings.",
+	},
+	realmsNotificationsLabel: {
+		id: 'app.settings.game-options.setting.realms-notifications.label',
+		defaultMessage: 'Realms notifications',
+	},
 })
 
 const categoryMessages = defineMessages({
-	skinCustomizationLabel: { id: 'app.settings.game-options.category.skin-customization.label', defaultMessage: 'Skin customization' },
-	skinCustomizationDescription: { id: 'app.settings.game-options.category.skin-customization.description', defaultMessage: 'Skin layers and main hand' },
+	skinCustomizationLabel: {
+		id: 'app.settings.game-options.category.skin-customization.label',
+		defaultMessage: 'Skin customization',
+	},
+	skinCustomizationDescription: {
+		id: 'app.settings.game-options.category.skin-customization.description',
+		defaultMessage: 'Skin layers and main hand',
+	},
 	videoLabel: { id: 'app.settings.game-options.category.video.label', defaultMessage: 'Video' },
-	videoDescription: { id: 'app.settings.game-options.category.video.description', defaultMessage: 'Camera and display settings' },
-	languageLabel: { id: 'app.settings.game-options.category.language.label', defaultMessage: 'Language' },
-	languageDescription: { id: 'app.settings.game-options.category.language.description', defaultMessage: 'Game language' },
-	musicAndSoundLabel: { id: 'app.settings.game-options.category.music-and-sound.label', defaultMessage: 'Music and sound' },
-	musicAndSoundDescription: { id: 'app.settings.game-options.category.music-and-sound.description', defaultMessage: 'Volume and audio preferences' },
-	controlsLabel: { id: 'app.settings.game-options.category.controls.label', defaultMessage: 'Controls' },
-	controlsDescription: { id: 'app.settings.game-options.category.controls.description', defaultMessage: 'Mouse, movement, and key bindings' },
+	videoDescription: {
+		id: 'app.settings.game-options.category.video.description',
+		defaultMessage: 'Camera and display settings',
+	},
+	languageLabel: {
+		id: 'app.settings.game-options.category.language.label',
+		defaultMessage: 'Language',
+	},
+	languageDescription: {
+		id: 'app.settings.game-options.category.language.description',
+		defaultMessage: 'Game language',
+	},
+	musicAndSoundLabel: {
+		id: 'app.settings.game-options.category.music-and-sound.label',
+		defaultMessage: 'Music and sound',
+	},
+	musicAndSoundDescription: {
+		id: 'app.settings.game-options.category.music-and-sound.description',
+		defaultMessage: 'Volume and audio preferences',
+	},
+	controlsLabel: {
+		id: 'app.settings.game-options.category.controls.label',
+		defaultMessage: 'Controls',
+	},
+	controlsDescription: {
+		id: 'app.settings.game-options.category.controls.description',
+		defaultMessage: 'Mouse, movement, and key bindings',
+	},
 	chatLabel: { id: 'app.settings.game-options.category.chat.label', defaultMessage: 'Chat' },
-	chatDescription: { id: 'app.settings.game-options.category.chat.description', defaultMessage: 'Chat visibility and appearance' },
-	accessibilityLabel: { id: 'app.settings.game-options.category.accessibility.label', defaultMessage: 'Accessibility' },
-	accessibilityDescription: { id: 'app.settings.game-options.category.accessibility.description', defaultMessage: 'Accessibility preferences' },
+	chatDescription: {
+		id: 'app.settings.game-options.category.chat.description',
+		defaultMessage: 'Chat visibility and appearance',
+	},
+	accessibilityLabel: {
+		id: 'app.settings.game-options.category.accessibility.label',
+		defaultMessage: 'Accessibility',
+	},
+	accessibilityDescription: {
+		id: 'app.settings.game-options.category.accessibility.description',
+		defaultMessage: 'Accessibility preferences',
+	},
 	onlineLabel: { id: 'app.settings.game-options.category.online.label', defaultMessage: 'Online' },
-	onlineDescription: { id: 'app.settings.game-options.category.online.description', defaultMessage: 'Online and Realms preferences' },
-	customLabel: { id: 'app.settings.game-options.category.custom.label', defaultMessage: 'Custom settings' },
-	customDescription: { id: 'app.settings.game-options.category.custom.description', defaultMessage: 'Settings added by mods' },
+	onlineDescription: {
+		id: 'app.settings.game-options.category.online.description',
+		defaultMessage: 'Online and Realms preferences',
+	},
+	customLabel: {
+		id: 'app.settings.game-options.category.custom.label',
+		defaultMessage: 'Custom settings',
+	},
+	customDescription: {
+		id: 'app.settings.game-options.category.custom.description',
+		defaultMessage: 'Settings added by mods',
+	},
 })
 
 const choiceMessages = defineMessages({
@@ -134,7 +434,10 @@ const choiceMessages = defineMessages({
 	left: { id: 'app.settings.game-options.choice.left', defaultMessage: 'Left' },
 	right: { id: 'app.settings.game-options.choice.right', defaultMessage: 'Right' },
 	shown: { id: 'app.settings.game-options.choice.shown', defaultMessage: 'Shown' },
-	commandsOnly: { id: 'app.settings.game-options.choice.commands-only', defaultMessage: 'Commands only' },
+	commandsOnly: {
+		id: 'app.settings.game-options.choice.commands-only',
+		defaultMessage: 'Commands only',
+	},
 	hidden: { id: 'app.settings.game-options.choice.hidden', defaultMessage: 'Hidden' },
 	all: { id: 'app.settings.game-options.choice.all', defaultMessage: 'All' },
 	decreased: { id: 'app.settings.game-options.choice.decreased', defaultMessage: 'Decreased' },
@@ -147,118 +450,286 @@ const choiceMessages = defineMessages({
 	maximum: { id: 'app.settings.game-options.choice.maximum', defaultMessage: 'Maximum' },
 	never: { id: 'app.settings.game-options.choice.never', defaultMessage: 'Never' },
 	pause: { id: 'app.settings.game-options.choice.pause', defaultMessage: 'Pause menu' },
-	pauseAndToast: { id: 'app.settings.game-options.choice.pause-and-toast', defaultMessage: 'Pause menu and toast' },
+	pauseAndToast: {
+		id: 'app.settings.game-options.choice.pause-and-toast',
+		defaultMessage: 'Pause menu and toast',
+	},
 })
 
 export const presentationMessages = defineMessages({
-	customValuePlaceholder: { id: 'app.settings.game-options.custom-value.placeholder', defaultMessage: 'Enter a value' },
-	validationLocalValueNeedsSaving: { id: 'app.settings.game-options.validation.local-value-needs-saving', defaultMessage: 'Save this value before turning sync back on.' },
-	validationMissingValue: { id: 'app.settings.game-options.validation.missing-value', defaultMessage: 'Choose a value first.' },
-	validationNoCompatibleInstances: { id: 'app.settings.game-options.validation.no-compatible-instances', defaultMessage: 'Some of your instances cannot use this setting' },
-	validationInvalidValue: { id: 'app.settings.game-options.validation.invalid-value', defaultMessage: 'Choose a valid value.' },
-	validationChangedSinceOpened: { id: 'app.settings.game-options.validation.changed-since-opened', defaultMessage: 'This setting changed elsewhere. Check it and try again.' },
-	compatibilityNoParticipants: { id: 'app.settings.game-options.compatibility.no-participants', defaultMessage: 'Add an instance to start syncing' },
-	compatibilityNone: { id: 'app.settings.game-options.compatibility.none', defaultMessage: 'Some of your instances cannot use this setting' },
-	compatibilityAll: { id: 'app.settings.game-options.compatibility.all', defaultMessage: 'Syncs to {count, plural, one {# instance} other {# instances}}' },
-	compatibilityAllDisabled: { id: 'app.settings.game-options.compatibility.all-disabled', defaultMessage: 'Sync is off' },
-	compatibilitySome: { id: 'app.settings.game-options.compatibility.some', defaultMessage: 'Some of your instances cannot use this setting' },
-	compatibilitySomeDisabled: { id: 'app.settings.game-options.compatibility.some-disabled', defaultMessage: 'Some of your instances cannot use this setting' },
-	compatibilityTooltipNoParticipants: { id: 'app.settings.game-options.compatibility.tooltip.no-participants', defaultMessage: 'Add an instance to start syncing this setting.' },
-	compatibilityTooltipAll: { id: 'app.settings.game-options.compatibility.tooltip.all', defaultMessage: 'All of your instances can use this setting.' },
-	compatibilityTooltipLimited: { id: 'app.settings.game-options.compatibility.tooltip.recipients', defaultMessage: 'Some of your instances cannot use this setting' },
-	compatibilityTooltipWaiting: { id: 'app.settings.game-options.compatibility.tooltip.waiting', defaultMessage: '{count, plural, one {Launch this instance once before syncing this setting.} other {Launch these instances once before syncing this setting.}}' },
-	bucketLauncherControlled: { id: 'app.settings.game-options.compatibility.reason.launcher-controlled', defaultMessage: 'This setting is managed by Modrinth’s launch settings.' },
-	sourceInstallingOrUpdating: { id: 'app.settings.game-options.source.disabled.installing-or-updating', defaultMessage: 'Installing or updating' },
-	sourceRunning: { id: 'app.settings.game-options.source.disabled.running', defaultMessage: 'Currently running' },
-	sourceUnsupportedVersion: { id: 'app.settings.game-options.source.disabled.unsupported-version', defaultMessage: 'Unsupported Minecraft version' },
-	sourceMissingOptionsFile: { id: 'app.settings.game-options.source.disabled.missing-options-file', defaultMessage: 'No options.txt file' },
-	sourceNoSyncableSettings: { id: 'app.settings.game-options.source.disabled.no-syncable-settings', defaultMessage: 'No syncable settings found' },
-	sourceUnreadableOptionsFile: { id: 'app.settings.game-options.source.disabled.unreadable-options-file', defaultMessage: 'options.txt could not be read' },
-	sourceSettingsSummary: { id: 'app.settings.game-options.source.settings-summary', defaultMessage: '{recognized, plural, one {# recognized setting} other {# recognized settings}}, {custom, plural, one {# custom setting} other {# custom settings}}' },
+	customValuePlaceholder: {
+		id: 'app.settings.game-options.custom-value.placeholder',
+		defaultMessage: 'Enter a value',
+	},
+	validationLocalValueNeedsSaving: {
+		id: 'app.settings.game-options.validation.local-value-needs-saving',
+		defaultMessage: 'Save this value before turning sync back on.',
+	},
+	validationMissingValue: {
+		id: 'app.settings.game-options.validation.missing-value',
+		defaultMessage: 'Choose a value first.',
+	},
+	validationNoCompatibleInstances: {
+		id: 'app.settings.game-options.validation.no-compatible-instances',
+		defaultMessage: 'Some of your instances cannot use this setting',
+	},
+	validationInvalidValue: {
+		id: 'app.settings.game-options.validation.invalid-value',
+		defaultMessage: 'Choose a valid value.',
+	},
+	validationChangedSinceOpened: {
+		id: 'app.settings.game-options.validation.changed-since-opened',
+		defaultMessage: 'This setting changed elsewhere. Check it and try again.',
+	},
+	compatibilityNoParticipants: {
+		id: 'app.settings.game-options.compatibility.no-participants',
+		defaultMessage: 'Add an instance to start syncing',
+	},
+	compatibilityNone: {
+		id: 'app.settings.game-options.compatibility.none',
+		defaultMessage: 'Some of your instances cannot use this setting',
+	},
+	compatibilityAll: {
+		id: 'app.settings.game-options.compatibility.all',
+		defaultMessage: 'Syncs to {count, plural, one {# instance} other {# instances}}',
+	},
+	compatibilityAllDisabled: {
+		id: 'app.settings.game-options.compatibility.all-disabled',
+		defaultMessage: 'Sync is off',
+	},
+	compatibilitySome: {
+		id: 'app.settings.game-options.compatibility.some',
+		defaultMessage: 'Some of your instances cannot use this setting',
+	},
+	compatibilitySomeDisabled: {
+		id: 'app.settings.game-options.compatibility.some-disabled',
+		defaultMessage: 'Some of your instances cannot use this setting',
+	},
+	compatibilityTooltipNoParticipants: {
+		id: 'app.settings.game-options.compatibility.tooltip.no-participants',
+		defaultMessage: 'Add an instance to start syncing this setting.',
+	},
+	compatibilityTooltipAll: {
+		id: 'app.settings.game-options.compatibility.tooltip.all',
+		defaultMessage: 'All of your instances can use this setting.',
+	},
+	compatibilityTooltipLimited: {
+		id: 'app.settings.game-options.compatibility.tooltip.recipients',
+		defaultMessage: 'Some of your instances cannot use this setting',
+	},
+	compatibilityTooltipWaiting: {
+		id: 'app.settings.game-options.compatibility.tooltip.waiting',
+		defaultMessage:
+			'{count, plural, one {Launch this instance once before syncing this setting.} other {Launch these instances once before syncing this setting.}}',
+	},
+	bucketLauncherControlled: {
+		id: 'app.settings.game-options.compatibility.reason.launcher-controlled',
+		defaultMessage: 'This setting is managed by Modrinth’s launch settings.',
+	},
+	sourceInstallingOrUpdating: {
+		id: 'app.settings.game-options.source.disabled.installing-or-updating',
+		defaultMessage: 'Installing or updating',
+	},
+	sourceRunning: {
+		id: 'app.settings.game-options.source.disabled.running',
+		defaultMessage: 'Currently running',
+	},
+	sourceUnsupportedVersion: {
+		id: 'app.settings.game-options.source.disabled.unsupported-version',
+		defaultMessage: 'Unsupported Minecraft version',
+	},
+	sourceMissingOptionsFile: {
+		id: 'app.settings.game-options.source.disabled.missing-options-file',
+		defaultMessage: 'No options.txt file',
+	},
+	sourceNoSyncableSettings: {
+		id: 'app.settings.game-options.source.disabled.no-syncable-settings',
+		defaultMessage: 'No syncable settings found',
+	},
+	sourceUnreadableOptionsFile: {
+		id: 'app.settings.game-options.source.disabled.unreadable-options-file',
+		defaultMessage: 'options.txt could not be read',
+	},
+	sourceSettingsSummary: {
+		id: 'app.settings.game-options.source.settings-summary',
+		defaultMessage:
+			'{recognized, plural, one {# recognized setting} other {# recognized settings}}, {custom, plural, one {# custom setting} other {# custom settings}}',
+	},
 })
 
-const knownSettings: Record<string, { label: MessageDescriptor; description?: MessageDescriptor }> = {
-	fov: { label: settingMessages.fovLabel },
-	graphics: { label: settingMessages.graphicsLabel, description: settingMessages.graphicsDescription },
-	ambient_occlusion: { label: settingMessages.ambientOcclusionLabel },
-	render_distance: { label: settingMessages.renderDistanceLabel },
-	simulation_distance: { label: settingMessages.simulationDistanceLabel, description: settingMessages.simulationDistanceDescription },
-	gui_scale: { label: settingMessages.guiScaleLabel, description: settingMessages.guiScaleDescription },
-	particles: { label: settingMessages.particlesLabel },
-	clouds: { label: settingMessages.cloudsLabel },
-	entity_shadows: { label: settingMessages.entityShadowsLabel },
-	view_bobbing: { label: settingMessages.viewBobbingLabel, description: settingMessages.viewBobbingDescription },
-	vsync: { label: settingMessages.vsyncLabel, description: settingMessages.vsyncDescription },
-	fullscreen: { label: settingMessages.fullscreenLabel },
-	max_framerate: { label: settingMessages.maxFramerateLabel },
-	mipmap_levels: { label: settingMessages.mipmapLevelsLabel, description: settingMessages.mipmapLevelsDescription },
-	biome_blend_radius: { label: settingMessages.biomeBlendRadiusLabel, description: settingMessages.biomeBlendRadiusDescription },
-	language: { label: settingMessages.languageLabel },
-	master_volume: { label: settingMessages.masterVolumeLabel },
-	music_volume: { label: settingMessages.musicVolumeLabel },
-	music_toast: { label: settingMessages.musicToastLabel, description: settingMessages.musicToastDescription },
-	blocks_volume: { label: settingMessages.blocksVolumeLabel },
-	hostile_volume: { label: settingMessages.hostileVolumeLabel },
-	players_volume: { label: settingMessages.playersVolumeLabel },
-	voice_volume: { label: settingMessages.voiceVolumeLabel },
-	sensitivity: { label: settingMessages.sensitivityLabel },
-	invert_mouse: { label: settingMessages.invertMouseLabel, description: settingMessages.invertMouseDescription },
-	auto_jump: { label: settingMessages.autoJumpLabel, description: settingMessages.autoJumpDescription },
-	toggle_crouch: { label: settingMessages.toggleCrouchLabel, description: settingMessages.toggleCrouchDescription },
-	toggle_sprint: { label: settingMessages.toggleSprintLabel, description: settingMessages.toggleSprintDescription },
-	discrete_mouse_scroll: { label: settingMessages.discreteMouseScrollLabel, description: settingMessages.discreteMouseScrollDescription },
-	'key.forward': { label: settingMessages.keyForwardLabel },
-	'key.left': { label: settingMessages.keyLeftLabel },
-	'key.back': { label: settingMessages.keyBackLabel },
-	'key.right': { label: settingMessages.keyRightLabel },
-	'key.jump': { label: settingMessages.keyJumpLabel },
-	'key.sneak': { label: settingMessages.keySneakLabel },
-	'key.sprint': { label: settingMessages.keySprintLabel },
-	'key.inventory': { label: settingMessages.keyInventoryLabel },
-	'key.swap_offhand': { label: settingMessages.keySwapOffhandLabel },
-	'key.drop': { label: settingMessages.keyDropLabel },
-	'key.use': { label: settingMessages.keyUseLabel },
-	'key.attack': { label: settingMessages.keyAttackLabel },
-	'key.pick_item': { label: settingMessages.keyPickItemLabel },
-	'key.chat': { label: settingMessages.keyChatLabel },
-	'key.player_list': { label: settingMessages.keyPlayerListLabel },
-	'key.command': { label: settingMessages.keyCommandLabel },
-	'key.screenshot': { label: settingMessages.keyScreenshotLabel },
-	'key.perspective': { label: settingMessages.keyPerspectiveLabel },
-	'key.fullscreen': { label: settingMessages.keyFullscreenLabel },
-	'key.advancements': { label: settingMessages.keyAdvancementsLabel },
-	chat_visibility: { label: settingMessages.chatVisibilityLabel },
-	chat_colors: { label: settingMessages.chatColorsLabel },
-	chat_links: { label: settingMessages.chatLinksLabel, description: settingMessages.chatLinksDescription },
-	chat_links_prompt: { label: settingMessages.chatLinksPromptLabel, description: settingMessages.chatLinksPromptDescription },
-	chat_opacity: { label: settingMessages.chatOpacityLabel, description: settingMessages.chatOpacityDescription },
-	chat_scale: { label: settingMessages.chatScaleLabel },
-	narrator: { label: settingMessages.narratorLabel, description: settingMessages.narratorDescription },
-	subtitles: { label: settingMessages.subtitlesLabel, description: settingMessages.subtitlesDescription },
-	high_contrast: { label: settingMessages.highContrastLabel, description: settingMessages.highContrastDescription },
-	dark_splash: { label: settingMessages.darkSplashLabel, description: settingMessages.darkSplashDescription },
-	notification_time: { label: settingMessages.notificationTimeLabel, description: settingMessages.notificationTimeDescription },
-	main_hand: { label: settingMessages.mainHandLabel, description: settingMessages.mainHandDescription },
-	cape: { label: settingMessages.capeLabel, description: settingMessages.capeDescription },
-	hat: { label: settingMessages.hatLabel, description: settingMessages.hatDescription },
-	jacket: { label: settingMessages.jacketLabel, description: settingMessages.jacketDescription },
-	allow_server_listing: { label: settingMessages.allowServerListingLabel, description: settingMessages.allowServerListingDescription },
-	realms_notifications: { label: settingMessages.realmsNotificationsLabel },
-}
+const knownSettings: Record<string, { label: MessageDescriptor; description?: MessageDescriptor }> =
+	{
+		fov: { label: settingMessages.fovLabel },
+		graphics: {
+			label: settingMessages.graphicsLabel,
+			description: settingMessages.graphicsDescription,
+		},
+		ambient_occlusion: { label: settingMessages.ambientOcclusionLabel },
+		render_distance: { label: settingMessages.renderDistanceLabel },
+		simulation_distance: {
+			label: settingMessages.simulationDistanceLabel,
+			description: settingMessages.simulationDistanceDescription,
+		},
+		gui_scale: {
+			label: settingMessages.guiScaleLabel,
+			description: settingMessages.guiScaleDescription,
+		},
+		particles: { label: settingMessages.particlesLabel },
+		clouds: { label: settingMessages.cloudsLabel },
+		entity_shadows: { label: settingMessages.entityShadowsLabel },
+		view_bobbing: {
+			label: settingMessages.viewBobbingLabel,
+			description: settingMessages.viewBobbingDescription,
+		},
+		vsync: { label: settingMessages.vsyncLabel, description: settingMessages.vsyncDescription },
+		fullscreen: { label: settingMessages.fullscreenLabel },
+		max_framerate: { label: settingMessages.maxFramerateLabel },
+		mipmap_levels: {
+			label: settingMessages.mipmapLevelsLabel,
+			description: settingMessages.mipmapLevelsDescription,
+		},
+		biome_blend_radius: {
+			label: settingMessages.biomeBlendRadiusLabel,
+			description: settingMessages.biomeBlendRadiusDescription,
+		},
+		language: { label: settingMessages.languageLabel },
+		master_volume: { label: settingMessages.masterVolumeLabel },
+		music_volume: { label: settingMessages.musicVolumeLabel },
+		music_toast: {
+			label: settingMessages.musicToastLabel,
+			description: settingMessages.musicToastDescription,
+		},
+		blocks_volume: { label: settingMessages.blocksVolumeLabel },
+		hostile_volume: { label: settingMessages.hostileVolumeLabel },
+		players_volume: { label: settingMessages.playersVolumeLabel },
+		voice_volume: { label: settingMessages.voiceVolumeLabel },
+		sensitivity: { label: settingMessages.sensitivityLabel },
+		invert_mouse: {
+			label: settingMessages.invertMouseLabel,
+			description: settingMessages.invertMouseDescription,
+		},
+		auto_jump: {
+			label: settingMessages.autoJumpLabel,
+			description: settingMessages.autoJumpDescription,
+		},
+		toggle_crouch: {
+			label: settingMessages.toggleCrouchLabel,
+			description: settingMessages.toggleCrouchDescription,
+		},
+		toggle_sprint: {
+			label: settingMessages.toggleSprintLabel,
+			description: settingMessages.toggleSprintDescription,
+		},
+		discrete_mouse_scroll: {
+			label: settingMessages.discreteMouseScrollLabel,
+			description: settingMessages.discreteMouseScrollDescription,
+		},
+		'key.forward': { label: settingMessages.keyForwardLabel },
+		'key.left': { label: settingMessages.keyLeftLabel },
+		'key.back': { label: settingMessages.keyBackLabel },
+		'key.right': { label: settingMessages.keyRightLabel },
+		'key.jump': { label: settingMessages.keyJumpLabel },
+		'key.sneak': { label: settingMessages.keySneakLabel },
+		'key.sprint': { label: settingMessages.keySprintLabel },
+		'key.inventory': { label: settingMessages.keyInventoryLabel },
+		'key.swap_offhand': { label: settingMessages.keySwapOffhandLabel },
+		'key.drop': { label: settingMessages.keyDropLabel },
+		'key.use': { label: settingMessages.keyUseLabel },
+		'key.attack': { label: settingMessages.keyAttackLabel },
+		'key.pick_item': { label: settingMessages.keyPickItemLabel },
+		'key.chat': { label: settingMessages.keyChatLabel },
+		'key.player_list': { label: settingMessages.keyPlayerListLabel },
+		'key.command': { label: settingMessages.keyCommandLabel },
+		'key.screenshot': { label: settingMessages.keyScreenshotLabel },
+		'key.perspective': { label: settingMessages.keyPerspectiveLabel },
+		'key.fullscreen': { label: settingMessages.keyFullscreenLabel },
+		'key.advancements': { label: settingMessages.keyAdvancementsLabel },
+		chat_visibility: { label: settingMessages.chatVisibilityLabel },
+		chat_colors: { label: settingMessages.chatColorsLabel },
+		chat_links: {
+			label: settingMessages.chatLinksLabel,
+			description: settingMessages.chatLinksDescription,
+		},
+		chat_links_prompt: {
+			label: settingMessages.chatLinksPromptLabel,
+			description: settingMessages.chatLinksPromptDescription,
+		},
+		chat_opacity: {
+			label: settingMessages.chatOpacityLabel,
+			description: settingMessages.chatOpacityDescription,
+		},
+		chat_scale: { label: settingMessages.chatScaleLabel },
+		narrator: {
+			label: settingMessages.narratorLabel,
+			description: settingMessages.narratorDescription,
+		},
+		subtitles: {
+			label: settingMessages.subtitlesLabel,
+			description: settingMessages.subtitlesDescription,
+		},
+		high_contrast: {
+			label: settingMessages.highContrastLabel,
+			description: settingMessages.highContrastDescription,
+		},
+		dark_splash: {
+			label: settingMessages.darkSplashLabel,
+			description: settingMessages.darkSplashDescription,
+		},
+		notification_time: {
+			label: settingMessages.notificationTimeLabel,
+			description: settingMessages.notificationTimeDescription,
+		},
+		main_hand: {
+			label: settingMessages.mainHandLabel,
+			description: settingMessages.mainHandDescription,
+		},
+		cape: { label: settingMessages.capeLabel, description: settingMessages.capeDescription },
+		hat: { label: settingMessages.hatLabel, description: settingMessages.hatDescription },
+		jacket: { label: settingMessages.jacketLabel, description: settingMessages.jacketDescription },
+		allow_server_listing: {
+			label: settingMessages.allowServerListingLabel,
+			description: settingMessages.allowServerListingDescription,
+		},
+		realms_notifications: { label: settingMessages.realmsNotificationsLabel },
+	}
 
 const categories: Record<string, { label: MessageDescriptor; description: MessageDescriptor }> = {
-	skin_customization: { label: categoryMessages.skinCustomizationLabel, description: categoryMessages.skinCustomizationDescription },
+	skin_customization: {
+		label: categoryMessages.skinCustomizationLabel,
+		description: categoryMessages.skinCustomizationDescription,
+	},
 	video: { label: categoryMessages.videoLabel, description: categoryMessages.videoDescription },
-	video_settings: { label: categoryMessages.videoLabel, description: categoryMessages.videoDescription },
-	language: { label: categoryMessages.languageLabel, description: categoryMessages.languageDescription },
-	music_and_sound: { label: categoryMessages.musicAndSoundLabel, description: categoryMessages.musicAndSoundDescription },
-	controls: { label: categoryMessages.controlsLabel, description: categoryMessages.controlsDescription },
+	video_settings: {
+		label: categoryMessages.videoLabel,
+		description: categoryMessages.videoDescription,
+	},
+	language: {
+		label: categoryMessages.languageLabel,
+		description: categoryMessages.languageDescription,
+	},
+	music_and_sound: {
+		label: categoryMessages.musicAndSoundLabel,
+		description: categoryMessages.musicAndSoundDescription,
+	},
+	controls: {
+		label: categoryMessages.controlsLabel,
+		description: categoryMessages.controlsDescription,
+	},
 	chat: { label: categoryMessages.chatLabel, description: categoryMessages.chatDescription },
-	chat_settings: { label: categoryMessages.chatLabel, description: categoryMessages.chatDescription },
-	accessibility: { label: categoryMessages.accessibilityLabel, description: categoryMessages.accessibilityDescription },
+	chat_settings: {
+		label: categoryMessages.chatLabel,
+		description: categoryMessages.chatDescription,
+	},
+	accessibility: {
+		label: categoryMessages.accessibilityLabel,
+		description: categoryMessages.accessibilityDescription,
+	},
 	online: { label: categoryMessages.onlineLabel, description: categoryMessages.onlineDescription },
 	custom: { label: categoryMessages.customLabel, description: categoryMessages.customDescription },
-	custom_settings: { label: categoryMessages.customLabel, description: categoryMessages.customDescription },
+	custom_settings: {
+		label: categoryMessages.customLabel,
+		description: categoryMessages.customDescription,
+	},
 }
 
 const choices: Record<string, MessageDescriptor> = {
@@ -307,13 +778,19 @@ const sourceDisabledMessages: Record<GameOptionsSourceDisabledReason, MessageDes
 	unreadable_options_file: presentationMessages.sourceUnreadableOptionsFile,
 }
 
-export function formatGameSettingLabel(formatMessage: FormatMessage, setting: EditableGameSetting): string {
+export function formatGameSettingLabel(
+	formatMessage: FormatMessage,
+	setting: EditableGameSetting,
+): string {
 	if (setting.kind === 'external') return setting.raw_key ?? setting.option_id
 	const definition = knownSettings[setting.option_id]
 	return definition ? formatMessage(definition.label) : setting.option_id
 }
 
-export function formatGameSettingDescription(formatMessage: FormatMessage, setting: EditableGameSetting): string {
+export function formatGameSettingDescription(
+	formatMessage: FormatMessage,
+	setting: EditableGameSetting,
+): string {
 	if (setting.kind === 'external') return ''
 	const definition = knownSettings[setting.option_id]
 	return definition?.description ? formatMessage(definition.description) : ''
@@ -328,20 +805,33 @@ export function gameSettingCategoryMessage(category: GameSettingCategory): Messa
 	)
 }
 
-export function formatGameSettingCategory(formatMessage: FormatMessage, category: GameSettingCategory): string {
+export function formatGameSettingCategory(
+	formatMessage: FormatMessage,
+	category: GameSettingCategory,
+): string {
 	return formatMessage(gameSettingCategoryMessage(category))
 }
 
-export function formatGameSettingChoice(formatMessage: FormatMessage, optionId: string, value: string): string {
+export function formatGameSettingChoice(
+	formatMessage: FormatMessage,
+	optionId: string,
+	value: string,
+): string {
 	const message = choices[`${optionId}:${value}`]
 	return message ? formatMessage(message) : value
 }
 
-export function formatGameSettingValidation(formatMessage: FormatMessage, error: GameOptionValidationError | null | undefined): string | null {
+export function formatGameSettingValidation(
+	formatMessage: FormatMessage,
+	error: GameOptionValidationError | null | undefined,
+): string | null {
 	return error ? formatMessage(validationMessages[error]) : null
 }
 
-export function formatCompatibilitySubtitle(formatMessage: FormatMessage, setting: EditableGameSetting): string {
+export function formatCompatibilitySubtitle(
+	formatMessage: FormatMessage,
+	setting: EditableGameSetting,
+): string {
 	const { total_participating: total, will_receive: recipients } = setting.compatibility
 	if (total === 0) return formatMessage(presentationMessages.compatibilityNoParticipants)
 	if (recipients === 0) return formatMessage(presentationMessages.compatibilityNone)
@@ -361,7 +851,10 @@ export function formatCompatibilitySubtitle(formatMessage: FormatMessage, settin
 	)
 }
 
-export function formatCompatibilityTooltip(formatMessage: FormatMessage, setting: EditableGameSetting): string {
+export function formatCompatibilityTooltip(
+	formatMessage: FormatMessage,
+	setting: EditableGameSetting,
+): string {
 	const summary = setting.compatibility
 	if (summary.total_participating === 0) {
 		return formatMessage(presentationMessages.compatibilityTooltipNoParticipants)
@@ -370,7 +863,9 @@ export function formatCompatibilityTooltip(formatMessage: FormatMessage, setting
 		return formatMessage(presentationMessages.compatibilityTooltipLimited)
 	}
 	const waiting = summary.buckets
-		.filter((bucket) => bucket.status === 'waiting_for_file' || bucket.status === 'waiting_for_base')
+		.filter(
+			(bucket) => bucket.status === 'waiting_for_file' || bucket.status === 'waiting_for_base',
+		)
 		.reduce((count, bucket) => count + bucket.instance_count, 0)
 	if (waiting > 0) {
 		return formatMessage(presentationMessages.compatibilityTooltipWaiting, { count: waiting })
@@ -382,13 +877,15 @@ export function shouldShowCompatibilityIndicator(setting: EditableGameSetting):
 	return (
 		setting.compatibility.left_local > 0 ||
 		setting.compatibility.buckets.some(
-			(bucket) =>
-				bucket.status === 'waiting_for_file' || bucket.status === 'waiting_for_base',
+			(bucket) => bucket.status === 'waiting_for_file' || bucket.status === 'waiting_for_base',
 		)
 	)
 }
 
-export function formatSourceDisabledReason(formatMessage: FormatMessage, reason: GameOptionsSourceDisabledReason | null | undefined): string | null {
+export function formatSourceDisabledReason(
+	formatMessage: FormatMessage,
+	reason: GameOptionsSourceDisabledReason | null | undefined,
+): string | null {
 	return reason ? formatMessage(sourceDisabledMessages[reason]) : null
 }
 
diff --git a/apps/app-frontend/src/locales/en-US/index.json b/apps/app-frontend/src/locales/en-US/index.json
index ae7fcb2314..907a7c867b 100644
--- a/apps/app-frontend/src/locales/en-US/index.json
+++ b/apps/app-frontend/src/locales/en-US/index.json
@@ -1619,6 +1619,630 @@
   "app.settings.downloading": {
     "message": "Downloading v{version}"
   },
+  "app.settings.game-options.category.accessibility.description": {
+    "message": "Accessibility preferences"
+  },
+  "app.settings.game-options.category.accessibility.label": {
+    "message": "Accessibility"
+  },
+  "app.settings.game-options.category.chat.description": {
+    "message": "Chat visibility and appearance"
+  },
+  "app.settings.game-options.category.chat.label": {
+    "message": "Chat"
+  },
+  "app.settings.game-options.category.controls.description": {
+    "message": "Mouse, movement, and key bindings"
+  },
+  "app.settings.game-options.category.controls.label": {
+    "message": "Controls"
+  },
+  "app.settings.game-options.category.custom.description": {
+    "message": "Settings added by mods"
+  },
+  "app.settings.game-options.category.custom.label": {
+    "message": "Custom settings"
+  },
+  "app.settings.game-options.category.language.description": {
+    "message": "Game language"
+  },
+  "app.settings.game-options.category.language.label": {
+    "message": "Language"
+  },
+  "app.settings.game-options.category.music-and-sound.description": {
+    "message": "Volume and audio preferences"
+  },
+  "app.settings.game-options.category.music-and-sound.label": {
+    "message": "Music and sound"
+  },
+  "app.settings.game-options.category.online.description": {
+    "message": "Online and Realms preferences"
+  },
+  "app.settings.game-options.category.online.label": {
+    "message": "Online"
+  },
+  "app.settings.game-options.category.skin-customization.description": {
+    "message": "Skin layers and main hand"
+  },
+  "app.settings.game-options.category.skin-customization.label": {
+    "message": "Skin customization"
+  },
+  "app.settings.game-options.category.video.description": {
+    "message": "Camera and display settings"
+  },
+  "app.settings.game-options.category.video.label": {
+    "message": "Video"
+  },
+  "app.settings.game-options.choice.all": {
+    "message": "All"
+  },
+  "app.settings.game-options.choice.chat": {
+    "message": "Chat"
+  },
+  "app.settings.game-options.choice.commands-only": {
+    "message": "Commands only"
+  },
+  "app.settings.game-options.choice.custom": {
+    "message": "Custom"
+  },
+  "app.settings.game-options.choice.decreased": {
+    "message": "Decreased"
+  },
+  "app.settings.game-options.choice.fabulous": {
+    "message": "Fabulous"
+  },
+  "app.settings.game-options.choice.fancy": {
+    "message": "Fancy"
+  },
+  "app.settings.game-options.choice.fast": {
+    "message": "Fast"
+  },
+  "app.settings.game-options.choice.hidden": {
+    "message": "Hidden"
+  },
+  "app.settings.game-options.choice.left": {
+    "message": "Left"
+  },
+  "app.settings.game-options.choice.maximum": {
+    "message": "Maximum"
+  },
+  "app.settings.game-options.choice.minimal": {
+    "message": "Minimal"
+  },
+  "app.settings.game-options.choice.minimum": {
+    "message": "Minimum"
+  },
+  "app.settings.game-options.choice.never": {
+    "message": "Never"
+  },
+  "app.settings.game-options.choice.off": {
+    "message": "Off"
+  },
+  "app.settings.game-options.choice.on": {
+    "message": "On"
+  },
+  "app.settings.game-options.choice.pause": {
+    "message": "Pause menu"
+  },
+  "app.settings.game-options.choice.pause-and-toast": {
+    "message": "Pause menu and toast"
+  },
+  "app.settings.game-options.choice.right": {
+    "message": "Right"
+  },
+  "app.settings.game-options.choice.shown": {
+    "message": "Shown"
+  },
+  "app.settings.game-options.choice.system": {
+    "message": "System"
+  },
+  "app.settings.game-options.compatibility.all": {
+    "message": "Syncs to {count, plural, one {# instance} other {# instances}}"
+  },
+  "app.settings.game-options.compatibility.all-disabled": {
+    "message": "Sync is off"
+  },
+  "app.settings.game-options.compatibility.no-participants": {
+    "message": "Add an instance to start syncing"
+  },
+  "app.settings.game-options.compatibility.none": {
+    "message": "Some of your instances cannot use this setting"
+  },
+  "app.settings.game-options.compatibility.reason.launcher-controlled": {
+    "message": "This setting is managed by Modrinth’s launch settings."
+  },
+  "app.settings.game-options.compatibility.some": {
+    "message": "Some of your instances cannot use this setting"
+  },
+  "app.settings.game-options.compatibility.some-disabled": {
+    "message": "Some of your instances cannot use this setting"
+  },
+  "app.settings.game-options.compatibility.tooltip.all": {
+    "message": "All of your instances can use this setting."
+  },
+  "app.settings.game-options.compatibility.tooltip.no-participants": {
+    "message": "Add an instance to start syncing this setting."
+  },
+  "app.settings.game-options.compatibility.tooltip.recipients": {
+    "message": "Some of your instances cannot use this setting"
+  },
+  "app.settings.game-options.compatibility.tooltip.waiting": {
+    "message": "{count, plural, one {Launch this instance once before syncing this setting.} other {Launch these instances once before syncing this setting.}}"
+  },
+  "app.settings.game-options.custom-value.placeholder": {
+    "message": "Enter a value"
+  },
+  "app.settings.game-options.keybind.assigned-status": {
+    "message": "{setting} is now bound to {binding}."
+  },
+  "app.settings.game-options.keybind.cancelled-status": {
+    "message": "Key binding change cancelled."
+  },
+  "app.settings.game-options.keybind.change": {
+    "message": "{setting}: {binding}. Activate to change the binding."
+  },
+  "app.settings.game-options.keybind.choose": {
+    "message": "Choose a key"
+  },
+  "app.settings.game-options.keybind.conflict": {
+    "message": "This key is also used for {settings}."
+  },
+  "app.settings.game-options.keybind.key.arrow-down": {
+    "message": "Down Arrow"
+  },
+  "app.settings.game-options.keybind.key.arrow-left": {
+    "message": "Left Arrow"
+  },
+  "app.settings.game-options.keybind.key.arrow-right": {
+    "message": "Right Arrow"
+  },
+  "app.settings.game-options.keybind.key.arrow-up": {
+    "message": "Up Arrow"
+  },
+  "app.settings.game-options.keybind.key.backspace": {
+    "message": "Backspace"
+  },
+  "app.settings.game-options.keybind.key.caps-lock": {
+    "message": "Caps Lock"
+  },
+  "app.settings.game-options.keybind.key.delete": {
+    "message": "Delete"
+  },
+  "app.settings.game-options.keybind.key.end": {
+    "message": "End"
+  },
+  "app.settings.game-options.keybind.key.enter": {
+    "message": "Enter"
+  },
+  "app.settings.game-options.keybind.key.escape": {
+    "message": "Escape"
+  },
+  "app.settings.game-options.keybind.key.home": {
+    "message": "Home"
+  },
+  "app.settings.game-options.keybind.key.insert": {
+    "message": "Insert"
+  },
+  "app.settings.game-options.keybind.key.keypad-key": {
+    "message": "Numpad {key}"
+  },
+  "app.settings.game-options.keybind.key.left-alt": {
+    "message": "Left Alt"
+  },
+  "app.settings.game-options.keybind.key.left-command": {
+    "message": "Left Command"
+  },
+  "app.settings.game-options.keybind.key.left-control": {
+    "message": "Left Ctrl"
+  },
+  "app.settings.game-options.keybind.key.left-shift": {
+    "message": "Left Shift"
+  },
+  "app.settings.game-options.keybind.key.left-super": {
+    "message": "Left Super"
+  },
+  "app.settings.game-options.keybind.key.menu": {
+    "message": "Menu"
+  },
+  "app.settings.game-options.keybind.key.num-lock": {
+    "message": "Num Lock"
+  },
+  "app.settings.game-options.keybind.key.page-down": {
+    "message": "Page Down"
+  },
+  "app.settings.game-options.keybind.key.page-up": {
+    "message": "Page Up"
+  },
+  "app.settings.game-options.keybind.key.pause": {
+    "message": "Pause"
+  },
+  "app.settings.game-options.keybind.key.print-screen": {
+    "message": "Print Screen"
+  },
+  "app.settings.game-options.keybind.key.right-alt": {
+    "message": "Right Alt"
+  },
+  "app.settings.game-options.keybind.key.right-command": {
+    "message": "Right Command"
+  },
+  "app.settings.game-options.keybind.key.right-control": {
+    "message": "Right Ctrl"
+  },
+  "app.settings.game-options.keybind.key.right-shift": {
+    "message": "Right Shift"
+  },
+  "app.settings.game-options.keybind.key.right-super": {
+    "message": "Right Super"
+  },
+  "app.settings.game-options.keybind.key.scroll-lock": {
+    "message": "Scroll Lock"
+  },
+  "app.settings.game-options.keybind.key.space": {
+    "message": "Space"
+  },
+  "app.settings.game-options.keybind.key.tab": {
+    "message": "Tab"
+  },
+  "app.settings.game-options.keybind.key.unbound": {
+    "message": "Unbound"
+  },
+  "app.settings.game-options.keybind.key.unknown": {
+    "message": "Unknown key"
+  },
+  "app.settings.game-options.keybind.listen": {
+    "message": "Press a key…"
+  },
+  "app.settings.game-options.keybind.listening-status": {
+    "message": "Listening for a key or mouse button. Press Escape to clear this binding."
+  },
+  "app.settings.game-options.keybind.mixed": {
+    "message": "Different across instances"
+  },
+  "app.settings.game-options.keybind.modifier.alt": {
+    "message": "Alt"
+  },
+  "app.settings.game-options.keybind.modifier.command": {
+    "message": "Command"
+  },
+  "app.settings.game-options.keybind.modifier.control": {
+    "message": "Ctrl"
+  },
+  "app.settings.game-options.keybind.modifier.shift": {
+    "message": "Shift"
+  },
+  "app.settings.game-options.keybind.modifier.super": {
+    "message": "Super"
+  },
+  "app.settings.game-options.keybind.mouse.button": {
+    "message": "Mouse {button}"
+  },
+  "app.settings.game-options.keybind.mouse.left": {
+    "message": "Left Mouse"
+  },
+  "app.settings.game-options.keybind.mouse.middle": {
+    "message": "Middle Mouse"
+  },
+  "app.settings.game-options.keybind.mouse.right": {
+    "message": "Right Mouse"
+  },
+  "app.settings.game-options.keybind.scancode": {
+    "message": "Scancode {code}"
+  },
+  "app.settings.game-options.keybind.unsupported-status": {
+    "message": "That input cannot be used by Minecraft. Press another key."
+  },
+  "app.settings.game-options.setting.allow-server-listing.description": {
+    "message": "Allow the player's name to appear in server listings."
+  },
+  "app.settings.game-options.setting.allow-server-listing.label": {
+    "message": "Server listings"
+  },
+  "app.settings.game-options.setting.ambient-occlusion.label": {
+    "message": "Smooth lighting"
+  },
+  "app.settings.game-options.setting.auto-jump.description": {
+    "message": "Automatically jump up one-block-high obstacles."
+  },
+  "app.settings.game-options.setting.auto-jump.label": {
+    "message": "Auto-jump"
+  },
+  "app.settings.game-options.setting.biome-blend-radius.description": {
+    "message": "The distance over which biome colors transition."
+  },
+  "app.settings.game-options.setting.biome-blend-radius.label": {
+    "message": "Biome blend"
+  },
+  "app.settings.game-options.setting.blocks-volume.label": {
+    "message": "Blocks"
+  },
+  "app.settings.game-options.setting.cape.description": {
+    "message": "Show the player's cape, including its elytra texture."
+  },
+  "app.settings.game-options.setting.cape.label": {
+    "message": "Cape"
+  },
+  "app.settings.game-options.setting.chat-colors.label": {
+    "message": "Chat colors"
+  },
+  "app.settings.game-options.setting.chat-links-prompt.description": {
+    "message": "Ask before opening links from chat."
+  },
+  "app.settings.game-options.setting.chat-links-prompt.label": {
+    "message": "Prompt on links"
+  },
+  "app.settings.game-options.setting.chat-links.description": {
+    "message": "Allow web links in chat to be opened."
+  },
+  "app.settings.game-options.setting.chat-links.label": {
+    "message": "Web links"
+  },
+  "app.settings.game-options.setting.chat-opacity.description": {
+    "message": "The opacity of chat text."
+  },
+  "app.settings.game-options.setting.chat-opacity.label": {
+    "message": "Chat opacity"
+  },
+  "app.settings.game-options.setting.chat-scale.label": {
+    "message": "Chat scale"
+  },
+  "app.settings.game-options.setting.chat-visibility.label": {
+    "message": "Chat visibility"
+  },
+  "app.settings.game-options.setting.clouds.label": {
+    "message": "Clouds"
+  },
+  "app.settings.game-options.setting.dark-splash.description": {
+    "message": "Change the Mojang Studios loading screen from red to black."
+  },
+  "app.settings.game-options.setting.dark-splash.label": {
+    "message": "Monochrome logo"
+  },
+  "app.settings.game-options.setting.discrete-mouse-scroll.description": {
+    "message": "Treat each mouse-wheel input as a single scroll step."
+  },
+  "app.settings.game-options.setting.discrete-mouse-scroll.label": {
+    "message": "Discrete scrolling"
+  },
+  "app.settings.game-options.setting.entity-shadows.label": {
+    "message": "Entity shadows"
+  },
+  "app.settings.game-options.setting.fov.label": {
+    "message": "Field of view"
+  },
+  "app.settings.game-options.setting.fullscreen.label": {
+    "message": "Fullscreen"
+  },
+  "app.settings.game-options.setting.graphics.description": {
+    "message": "Controls visual quality and performance."
+  },
+  "app.settings.game-options.setting.graphics.label": {
+    "message": "Graphics"
+  },
+  "app.settings.game-options.setting.gui-scale.description": {
+    "message": "The size of the game interface and HUD."
+  },
+  "app.settings.game-options.setting.gui-scale.label": {
+    "message": "GUI scale"
+  },
+  "app.settings.game-options.setting.hat.description": {
+    "message": "Show the hat skin layer."
+  },
+  "app.settings.game-options.setting.hat.label": {
+    "message": "Hat"
+  },
+  "app.settings.game-options.setting.high-contrast.description": {
+    "message": "Enhance the contrast of interface elements."
+  },
+  "app.settings.game-options.setting.high-contrast.label": {
+    "message": "High contrast"
+  },
+  "app.settings.game-options.setting.hostile-volume.label": {
+    "message": "Hostile creatures"
+  },
+  "app.settings.game-options.setting.invert-mouse.description": {
+    "message": "Invert vertical mouse movement."
+  },
+  "app.settings.game-options.setting.invert-mouse.label": {
+    "message": "Invert mouse"
+  },
+  "app.settings.game-options.setting.jacket.description": {
+    "message": "Show the jacket skin layer."
+  },
+  "app.settings.game-options.setting.jacket.label": {
+    "message": "Jacket"
+  },
+  "app.settings.game-options.setting.key-advancements.label": {
+    "message": "Advancements"
+  },
+  "app.settings.game-options.setting.key-attack.label": {
+    "message": "Attack"
+  },
+  "app.settings.game-options.setting.key-back.label": {
+    "message": "Move backward"
+  },
+  "app.settings.game-options.setting.key-chat.label": {
+    "message": "Open chat"
+  },
+  "app.settings.game-options.setting.key-command.label": {
+    "message": "Command"
+  },
+  "app.settings.game-options.setting.key-drop.label": {
+    "message": "Drop item"
+  },
+  "app.settings.game-options.setting.key-forward.label": {
+    "message": "Move forward"
+  },
+  "app.settings.game-options.setting.key-fullscreen.label": {
+    "message": "Toggle fullscreen"
+  },
+  "app.settings.game-options.setting.key-inventory.label": {
+    "message": "Inventory"
+  },
+  "app.settings.game-options.setting.key-jump.label": {
+    "message": "Jump"
+  },
+  "app.settings.game-options.setting.key-left.label": {
+    "message": "Strafe left"
+  },
+  "app.settings.game-options.setting.key-perspective.label": {
+    "message": "Change perspective"
+  },
+  "app.settings.game-options.setting.key-pick-item.label": {
+    "message": "Pick block"
+  },
+  "app.settings.game-options.setting.key-player-list.label": {
+    "message": "Player list"
+  },
+  "app.settings.game-options.setting.key-right.label": {
+    "message": "Strafe right"
+  },
+  "app.settings.game-options.setting.key-screenshot.label": {
+    "message": "Screenshot"
+  },
+  "app.settings.game-options.setting.key-sneak.label": {
+    "message": "Sneak"
+  },
+  "app.settings.game-options.setting.key-sprint.label": {
+    "message": "Sprint"
+  },
+  "app.settings.game-options.setting.key-swap-offhand.label": {
+    "message": "Swap offhand"
+  },
+  "app.settings.game-options.setting.key-use.label": {
+    "message": "Use item"
+  },
+  "app.settings.game-options.setting.language.label": {
+    "message": "Language"
+  },
+  "app.settings.game-options.setting.main-hand.description": {
+    "message": "Choose whether the main hand is left or right."
+  },
+  "app.settings.game-options.setting.main-hand.label": {
+    "message": "Main hand"
+  },
+  "app.settings.game-options.setting.master-volume.label": {
+    "message": "Master volume"
+  },
+  "app.settings.game-options.setting.max-framerate.label": {
+    "message": "Maximum framerate"
+  },
+  "app.settings.game-options.setting.mipmap-levels.description": {
+    "message": "Texture smoothing at a distance."
+  },
+  "app.settings.game-options.setting.mipmap-levels.label": {
+    "message": "Mipmap levels"
+  },
+  "app.settings.game-options.setting.music-toast.description": {
+    "message": "Choose whether music titles appear in the pause menu and as toasts."
+  },
+  "app.settings.game-options.setting.music-toast.label": {
+    "message": "Music notification"
+  },
+  "app.settings.game-options.setting.music-volume.label": {
+    "message": "Music"
+  },
+  "app.settings.game-options.setting.narrator.description": {
+    "message": "Choose what the narrator reads."
+  },
+  "app.settings.game-options.setting.narrator.label": {
+    "message": "Narrator"
+  },
+  "app.settings.game-options.setting.notification-time.description": {
+    "message": "How long toast notifications remain visible."
+  },
+  "app.settings.game-options.setting.notification-time.label": {
+    "message": "Notification time"
+  },
+  "app.settings.game-options.setting.particles.label": {
+    "message": "Particles"
+  },
+  "app.settings.game-options.setting.players-volume.label": {
+    "message": "Players"
+  },
+  "app.settings.game-options.setting.realms-notifications.label": {
+    "message": "Realms notifications"
+  },
+  "app.settings.game-options.setting.render-distance.label": {
+    "message": "Render distance"
+  },
+  "app.settings.game-options.setting.sensitivity.label": {
+    "message": "Mouse sensitivity"
+  },
+  "app.settings.game-options.setting.simulation-distance.description": {
+    "message": "How far away entities update and blocks and fluids tick."
+  },
+  "app.settings.game-options.setting.simulation-distance.label": {
+    "message": "Simulation distance"
+  },
+  "app.settings.game-options.setting.subtitles.description": {
+    "message": "Show captions for sounds played in the game."
+  },
+  "app.settings.game-options.setting.subtitles.label": {
+    "message": "Subtitles"
+  },
+  "app.settings.game-options.setting.toggle-crouch.description": {
+    "message": "Press once to remain crouched."
+  },
+  "app.settings.game-options.setting.toggle-crouch.label": {
+    "message": "Toggle crouch"
+  },
+  "app.settings.game-options.setting.toggle-sprint.description": {
+    "message": "Press once to remain sprinting."
+  },
+  "app.settings.game-options.setting.toggle-sprint.label": {
+    "message": "Toggle sprint"
+  },
+  "app.settings.game-options.setting.view-bobbing.description": {
+    "message": "Add a bobbing motion to the camera while walking."
+  },
+  "app.settings.game-options.setting.view-bobbing.label": {
+    "message": "View bobbing"
+  },
+  "app.settings.game-options.setting.voice-volume.label": {
+    "message": "Voice and speech"
+  },
+  "app.settings.game-options.setting.vsync.description": {
+    "message": "Limit the frame rate to the display refresh rate to prevent screen tearing."
+  },
+  "app.settings.game-options.setting.vsync.label": {
+    "message": "VSync"
+  },
+  "app.settings.game-options.source.disabled.installing-or-updating": {
+    "message": "Installing or updating"
+  },
+  "app.settings.game-options.source.disabled.missing-options-file": {
+    "message": "No options.txt file"
+  },
+  "app.settings.game-options.source.disabled.no-syncable-settings": {
+    "message": "No syncable settings found"
+  },
+  "app.settings.game-options.source.disabled.running": {
+    "message": "Currently running"
+  },
+  "app.settings.game-options.source.disabled.unreadable-options-file": {
+    "message": "options.txt could not be read"
+  },
+  "app.settings.game-options.source.disabled.unsupported-version": {
+    "message": "Unsupported Minecraft version"
+  },
+  "app.settings.game-options.source.settings-summary": {
+    "message": "{recognized, plural, one {# recognized setting} other {# recognized settings}}, {custom, plural, one {# custom setting} other {# custom settings}}"
+  },
+  "app.settings.game-options.validation.changed-since-opened": {
+    "message": "This setting changed elsewhere. Check it and try again."
+  },
+  "app.settings.game-options.validation.invalid-value": {
+    "message": "Choose a valid value."
+  },
+  "app.settings.game-options.validation.local-value-needs-saving": {
+    "message": "Save this value before turning sync back on."
+  },
+  "app.settings.game-options.validation.missing-value": {
+    "message": "Choose a value first."
+  },
+  "app.settings.game-options.validation.no-compatible-instances": {
+    "message": "Some of your instances cannot use this setting"
+  },
   "app.settings.java-installations.location.title": {
     "message": "Java {version, number} location"
   },
@@ -1703,6 +2327,9 @@
   "app.settings.synced-options.choose-sync-source.creative-hotbars-description": {
     "message": "Pick the instance whose saved creative hotbars become the shared copy."
   },
+  "app.settings.synced-options.choose-sync-source.game-settings-description": {
+    "message": "Choose which instance to copy game settings from."
+  },
   "app.settings.synced-options.choose-sync-source.multiplayer-servers-description": {
     "message": "Pick the instance whose multiplayer servers become the shared copy."
   },
@@ -1733,6 +2360,108 @@
   "app.settings.synced-options.creative-hotbars.description": {
     "message": "Use the same saved creative hotbars across your instances."
   },
+  "app.settings.synced-options.game-settings": {
+    "message": "Sync game options"
+  },
+  "app.settings.synced-options.game-settings.button": {
+    "message": "Edit game settings"
+  },
+  "app.settings.synced-options.game-settings.compatibility-details": {
+    "message": "Why this setting may not sync"
+  },
+  "app.settings.synced-options.game-settings.conflict-text": {
+    "message": "We loaded the latest settings. Check your changes, then save again."
+  },
+  "app.settings.synced-options.game-settings.conflict-title": {
+    "message": "These settings changed elsewhere"
+  },
+  "app.settings.synced-options.game-settings.custom-empty": {
+    "message": "Settings added by mods will appear here after Modrinth finds them in one of your instances."
+  },
+  "app.settings.synced-options.game-settings.description": {
+    "message": "Use the same graphics, keybinds, and other game settings across your instances"
+  },
+  "app.settings.synced-options.game-settings.disable-all": {
+    "message": "Stop syncing all"
+  },
+  "app.settings.synced-options.game-settings.disable-all-count": {
+    "message": "Stop syncing all ({count})"
+  },
+  "app.settings.synced-options.game-settings.disabled-tooltip": {
+    "message": "Enable game settings sync before choosing individual settings."
+  },
+  "app.settings.synced-options.game-settings.empty": {
+    "message": "No settings match your search or filter."
+  },
+  "app.settings.synced-options.game-settings.enable-all": {
+    "message": "Sync all"
+  },
+  "app.settings.synced-options.game-settings.enable-all-count": {
+    "message": "Sync all ({count})"
+  },
+  "app.settings.synced-options.game-settings.filter.all": {
+    "message": "All"
+  },
+  "app.settings.synced-options.game-settings.filter.off": {
+    "message": "Not syncing"
+  },
+  "app.settings.synced-options.game-settings.filter.on": {
+    "message": "Syncing"
+  },
+  "app.settings.synced-options.game-settings.load-failed": {
+    "message": "We couldn’t load your game settings."
+  },
+  "app.settings.synced-options.game-settings.loading": {
+    "message": "Loading settings..."
+  },
+  "app.settings.synced-options.game-settings.preview-failed": {
+    "message": "We couldn’t check which instances support your changes. Try again."
+  },
+  "app.settings.synced-options.game-settings.retry": {
+    "message": "Retry"
+  },
+  "app.settings.synced-options.game-settings.save": {
+    "message": "Save changes"
+  },
+  "app.settings.synced-options.game-settings.saved": {
+    "message": "Game settings updated"
+  },
+  "app.settings.synced-options.game-settings.saved-later": {
+    "message": "Your changes were saved and will finish syncing when your instances are ready."
+  },
+  "app.settings.synced-options.game-settings.saved-summary": {
+    "message": "Your changes were saved."
+  },
+  "app.settings.synced-options.game-settings.saved-with-problems": {
+    "message": "Your changes were saved, but some instances could not be updated."
+  },
+  "app.settings.synced-options.game-settings.search": {
+    "message": "Search settings..."
+  },
+  "app.settings.synced-options.game-settings.sync-setting": {
+    "message": "Sync {setting} across instances"
+  },
+  "app.settings.synced-options.game-settings.title": {
+    "message": "Game settings"
+  },
+  "app.settings.synced-options.game-settings.unsaved-changes": {
+    "message": "You have unsaved changes."
+  },
+  "app.settings.synced-options.game-settings.value-label": {
+    "message": "Value"
+  },
+  "app.settings.synced-options.game-settings.value-mixed": {
+    "message": "Different across instances"
+  },
+  "app.settings.synced-options.game-settings.value-off": {
+    "message": "Off"
+  },
+  "app.settings.synced-options.game-settings.value-on": {
+    "message": "On"
+  },
+  "app.settings.synced-options.game-settings.value-unset": {
+    "message": "Choose a value"
+  },
   "app.settings.synced-options.multiplayer-servers": {
     "message": "Sync multiplayer servers"
   },
@@ -2726,6 +3455,12 @@
   "instance.settings.tabs.synced-options.creative-hotbars.override-description": {
     "message": "Keep this instance's saved creative hotbars separate from synced hotbars."
   },
+  "instance.settings.tabs.synced-options.game-settings": {
+    "message": "Game settings"
+  },
+  "instance.settings.tabs.synced-options.game-settings.description": {
+    "message": "Apply the selected shared game settings on top of this instance’s options.txt."
+  },
   "instance.settings.tabs.synced-options.hotbars-conflict.backup-description": {
     "message": "The version being replaced will be backed up before anything changes."
   },
diff --git a/packages/app-lib/src/api/instance/game_options/fullscreen.rs b/packages/app-lib/src/api/instance/game_options/fullscreen.rs
index b1964851b3..10fa7820d6 100644
--- a/packages/app-lib/src/api/instance/game_options/fullscreen.rs
+++ b/packages/app-lib/src/api/instance/game_options/fullscreen.rs
@@ -48,7 +48,11 @@ pub(crate) async fn update_shared_fullscreen_from_app(
     let option_revision = stored
         .map(|stored| stored.revision)
         .unwrap_or(0)
-        .max(preference.map(|preference| preference.revision).unwrap_or(0))
+        .max(
+            preference
+                .map(|preference| preference.revision)
+                .unwrap_or(0),
+        )
         .saturating_add(1) as i64;
     let (canonical_revision, _) =
         load_game_options_sync_state(&state.pool, CATALOG_REVISION).await?;
diff --git a/packages/app-lib/src/api/instance/game_options/instance_support.rs b/packages/app-lib/src/api/instance/game_options/instance_support.rs
index 417c2f0986..22f4c27eef 100644
--- a/packages/app-lib/src/api/instance/game_options/instance_support.rs
+++ b/packages/app-lib/src/api/instance/game_options/instance_support.rs
@@ -239,8 +239,8 @@ pub(super) fn describe_instance_support(
                                     definition, document, &key,
                                 )
                             });
-                        let representable = value.is_none_or(|value| {
-                            match definition {
+                        let representable =
+                            value.is_none_or(|value| match definition {
                                 Some(definition) => encode_value(
                                     definition,
                                     &key,
@@ -253,8 +253,7 @@ pub(super) fn describe_instance_support(
                                     value,
                                     CanonicalValue::ExternalRaw(_)
                                 ),
-                            }
-                        });
+                            });
                         if !representable {
                             (
 							GameOptionCompatibilityStatus::UnsupportedValue,
@@ -334,20 +333,15 @@ pub(super) fn describe_instance_support(
                                         })
                                         .map(|key| (*key).to_string())
                                 });
-                        let representable = eventual_key.as_deref().is_some_and(
-                            |key| {
+                        let representable =
+                            eventual_key.as_deref().is_some_and(|key| {
                                 value.is_none_or(|value| {
                                     encode_value(
-                                        definition,
-                                        key,
-                                        value,
-                                        &version,
-                                        None,
+                                        definition, key, value, &version, None,
                                     )
                                     .is_some()
                                 })
-                            },
-                        );
+                            });
                         if representable {
                             (
 							GameOptionCompatibilityStatus::WaitingForBase,
diff --git a/packages/app-lib/src/api/instance/game_options/supported_settings/version_changes.rs b/packages/app-lib/src/api/instance/game_options/supported_settings/version_changes.rs
index 725611b5b9..2a5c3fb277 100644
--- a/packages/app-lib/src/api/instance/game_options/supported_settings/version_changes.rs
+++ b/packages/app-lib/src/api/instance/game_options/supported_settings/version_changes.rs
@@ -302,9 +302,7 @@ pub(in crate::api::instance) fn decode_value(
                     "2" => "fabulous",
                     _ => return None,
                 },
-                "graphicsPreset"
-                    if GRAPHICS_VALUES.contains(&raw.as_str()) =>
-                {
+                "graphicsPreset" if GRAPHICS_VALUES.contains(&raw.as_str()) => {
                     raw.as_str()
                 }
                 _ => return None,
@@ -326,10 +324,9 @@ pub(in crate::api::instance) fn decode_value(
             let value = match (physical_key, raw.as_str()) {
                 ("showNowPlayingToast", "false") => "never",
                 ("showNowPlayingToast", "true") => "pause_and_toast",
-                (
-                    "musicToast",
-                    "never" | "pause" | "pause_and_toast",
-                ) => raw.as_str(),
+                ("musicToast", "never" | "pause" | "pause_and_toast") => {
+                    raw.as_str()
+                }
                 _ => return None,
             };
             Some(CanonicalValue::Enum(value.to_string()))
diff --git a/packages/app-lib/src/api/instance/run.rs b/packages/app-lib/src/api/instance/run.rs
index cc62c16614..25626c1db3 100644
--- a/packages/app-lib/src/api/instance/run.rs
+++ b/packages/app-lib/src/api/instance/run.rs
@@ -74,7 +74,8 @@ async fn run_credentials(
             &state.pool,
         )
         .await?;
-    let fullscreen_is_shared = game_options_sync_is_enabled(&state.pool).await?
+    let fullscreen_is_shared = game_options_sync_is_enabled(&state.pool)
+        .await?
         && instance_sync_preferences.game_options
         && load_game_option_preferences(&state.pool)
             .await?
diff --git a/packages/app-lib/src/api/instance/synced_options/orchestration.rs b/packages/app-lib/src/api/instance/synced_options/orchestration.rs
index 5fb15ebc12..5ccbf5b549 100644
--- a/packages/app-lib/src/api/instance/synced_options/orchestration.rs
+++ b/packages/app-lib/src/api/instance/synced_options/orchestration.rs
@@ -226,7 +226,10 @@ async fn version_capability(
     option: SyncedOption,
     state: &State,
 ) -> CapabilityStatus {
-    if matches!(option, SyncedOption::GameOptions | SyncedOption::Screenshots) {
+    if matches!(
+        option,
+        SyncedOption::GameOptions | SyncedOption::Screenshots
+    ) {
         return CapabilityStatus::Supported;
     }
 
@@ -306,16 +309,14 @@ pub async fn set_global_option(
             )
         })?;
         if option == SyncedOption::GameOptions {
-            let source = crate::state::get_instance(
-                base_instance_id,
-                &state.pool,
-            )
-            .await?
-            .ok_or_else(|| {
-                ErrorKind::InputError(
-                    "Unknown sync source instance.".to_string(),
-                )
-            })?;
+            let source =
+                crate::state::get_instance(base_instance_id, &state.pool)
+                    .await?
+                    .ok_or_else(|| {
+                        ErrorKind::InputError(
+                            "Unknown sync source instance.".to_string(),
+                        )
+                    })?;
             if sync_files_are_protected(&source)
                 || instance_is_running(&source, &state).await?
             {
@@ -824,18 +825,17 @@ async fn reconcile_instance_with_state(
             .await
         {
             CapabilityStatus::Supported => {
-                let result = if option == SyncedOption::GameOptions
-                    && allow_protected
-                {
-                    super::super::game_options::sync_instance_with_state(
+                let result =
+                    if option == SyncedOption::GameOptions && allow_protected {
+                        super::super::game_options::sync_instance_with_state(
                         metadata,
                         state,
                         super::super::game_options::SyncReason::PackExtracted,
                     )
                     .await
-                } else {
-                    reconcile_option(metadata, option, state).await
-                };
+                    } else {
+                        reconcile_option(metadata, option, state).await
+                    };
                 if let Err(error) = result {
                     if option == SyncedOption::GameOptions {
                         tracing::warn!(
diff --git a/packages/app-lib/src/api/settings.rs b/packages/app-lib/src/api/settings.rs
index dbbc51cf6c..264dcbd954 100644
--- a/packages/app-lib/src/api/settings.rs
+++ b/packages/app-lib/src/api/settings.rs
@@ -39,17 +39,16 @@ pub async fn set(settings: Settings) -> crate::Result<()> {
         current_settings.force_fullscreen
     };
     let fullscreen_changed = current_fullscreen != settings.force_fullscreen;
-    let shared_fullscreen_changed = if game_options_sync_enabled
-        && fullscreen_changed
-    {
-        crate::api::instance::update_shared_fullscreen_from_app(
-            &state,
-            settings.force_fullscreen,
-        )
-        .await?
-    } else {
-        false
-    };
+    let shared_fullscreen_changed =
+        if game_options_sync_enabled && fullscreen_changed {
+            crate::api::instance::update_shared_fullscreen_from_app(
+                &state,
+                settings.force_fullscreen,
+            )
+            .await?
+        } else {
+            false
+        };
     settings.update(&state.pool).await?;
 
     if shared_fullscreen_changed {
diff --git a/packages/ui/src/components/base/Slider.vue b/packages/ui/src/components/base/Slider.vue
index de289abe62..38432f352c 100644
--- a/packages/ui/src/components/base/Slider.vue
+++ b/packages/ui/src/components/base/Slider.vue
@@ -92,8 +92,7 @@ const props = withDefaults(defineProps<Props>(), {
 const currentValue = ref(clampValue(props.modelValue))
 const currentPercentage = computed(() => getPercentage(currentValue.value))
 const valueInputWidth = computed(
-	() =>
-		`calc(${Math.max(String(props.min).length, String(props.max).length, 1)}ch + 2.125rem)`,
+	() => `calc(${Math.max(String(props.min).length, String(props.max).length, 1)}ch + 2.125rem)`,
 )
 const visibleSnapPoints = computed(() =>
 	props.snapPoints.filter((snapPoint) => snapPoint >= props.min && snapPoint <= props.max),
diff --git a/packages/ui/src/components/modal/NewModal.vue b/packages/ui/src/components/modal/NewModal.vue
index ea7d4fe1b9..d6722abb38 100644
--- a/packages/ui/src/components/modal/NewModal.vue
+++ b/packages/ui/src/components/modal/NewModal.vue
@@ -27,11 +27,7 @@
 				:style="{ zIndex: stackOverlayZ }"
 				@click="() => (closeOnClickOutside && closable ? hide() : {})"
 			/>
-			<div
-				class="modal-container"
-				:class="{ shown: visible }"
-				:style="{ zIndex: stackContainerZ }"
-			>
+			<div class="modal-container" :class="{ shown: visible }" :style="{ zIndex: stackContainerZ }">
 				<div
 					ref="modalBodyRef"
 					role="dialog"

From c689997c086ad07da7138675ac36d6d05337cabe Mon Sep 17 00:00:00 2001
From: "Calum H. (IMB11)" <contact@cal.engineer>
Date: Tue, 1 Sep 2026 17:26:44 +0100
Subject: [PATCH 05/33] fix: qa

---
 .../game-settings/GameSettingRow.vue          | 20 +++++---
 .../game-settings/GameSettingsModal.vue       | 50 ++++++++++++++-----
 .../game-settings/game-setting-editors.ts     |  4 +-
 .../app-frontend/src/locales/en-US/index.json |  3 ++
 .../components/settings-modal/index.vue       | 13 ++++-
 .../instance-settings-context.ts              |  2 +-
 .../synced-options-settings.vue               | 16 +++++-
 .../api/instance/game_options/fullscreen.rs   | 13 ++++-
 .../game_options/read_instance_changes.rs     |  2 +-
 .../instance/game_options/settings_editor.rs  | 12 +++--
 .../instance/game_options/source_selection.rs |  8 ++-
 packages/ui/src/components/base/Slider.vue    |  2 +-
 12 files changed, 114 insertions(+), 31 deletions(-)

diff --git a/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingRow.vue b/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingRow.vue
index 3fb2c2ed08..ac8547a22f 100644
--- a/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingRow.vue
+++ b/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingRow.vue
@@ -7,9 +7,10 @@ import {
 	Input,
 	Slider,
 	Toggle,
+	truncatedTooltip,
 	useVIntl,
 } from '@modrinth/ui'
-import { computed } from 'vue'
+import { computed, ref } from 'vue'
 
 import type { EditableGameSetting, GameOptionCanonicalValue } from '@/helpers/game-options'
 
@@ -47,6 +48,7 @@ const emit = defineEmits<{
 }>()
 
 const { formatMessage } = useVIntl()
+const settingLabelRef = ref<HTMLElement | null>(null)
 
 const messages = defineMessages({
 	valueLabel: {
@@ -121,7 +123,9 @@ const sliderValue = computed(() => {
 	const value = Number(valueText.value)
 	return Number.isFinite(value) ? value : (inputMin.value ?? 0)
 })
-const editorDisabled = computed(() => props.disabled || props.setting.controlled)
+const editorDisabled = computed(
+	() => props.disabled || props.setting.controlled || !props.setting.sync_enabled,
+)
 const syncToggleDisabled = computed(
 	() =>
 		props.disabled ||
@@ -179,16 +183,20 @@ function updateValue(value: string | number | boolean | undefined) {
 
 <template>
 	<div
-		class="grid min-w-0 items-center gap-3 border-0 border-b border-solid border-surface-5 py-3"
+		class="grid min-w-0 items-center gap-3 py-3"
 		:class="
 			isVolumeSlider
-				? 'grid-cols-[minmax(8rem,0.5fr)_minmax(0,1.5fr)_4rem]'
+				? 'grid-cols-[minmax(10rem,0.65fr)_minmax(0,1.35fr)_4rem]'
 				: 'grid-cols-[minmax(0,1fr)_12rem_4rem]'
 		"
 	>
 		<div class="min-w-0">
 			<div class="flex items-center gap-2">
-				<h3 class="m-0 truncate text-base font-semibold text-contrast">
+				<h3
+					ref="settingLabelRef"
+					v-tooltip="truncatedTooltip(settingLabelRef, settingLabel)"
+					class="m-0 truncate text-lg font-semibold text-contrast"
+				>
 					{{ settingLabel }}
 				</h3>
 				<span
@@ -203,7 +211,7 @@ function updateValue(value: string | number | boolean | undefined) {
 					<UnknownIcon class="size-4" aria-hidden="true" />
 				</span>
 			</div>
-			<p v-if="settingDescription" class="m-0 mt-0.5 text-sm text-primary">
+			<p v-if="settingDescription" class="m-0 mt-0.5 text-primary">
 				{{ settingDescription }}
 			</p>
 		</div>
diff --git a/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingsModal.vue b/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingsModal.vue
index c7815e8e29..da8d132f41 100644
--- a/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingsModal.vue
+++ b/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingsModal.vue
@@ -32,7 +32,7 @@ import {
 	useVIntl,
 } from '@modrinth/ui'
 import type { Component } from 'vue'
-import { computed, nextTick, onUnmounted, ref } from 'vue'
+import { computed, onUnmounted, ref } from 'vue'
 
 import {
 	type EditableGameSetting,
@@ -47,6 +47,7 @@ import {
 
 import { minecraftKeybindConflictKey } from './game-keybinds'
 import {
+	canonicalValuesEqual,
 	cloneGameSettingsState,
 	gameSettingChanges,
 	settingCanBeEnabled,
@@ -395,6 +396,16 @@ async function confirmDiscard() {
 	modal.value?.hide()
 }
 
+function cancelChanges() {
+	if (saving.value || !baseState.value) return
+	if (previewTimer) clearTimeout(previewTimer)
+	previewTimer = null
+	previewGeneration++
+	draftState.value = cloneGameSettingsState(baseState.value)
+	touchedValueOptionIds.value = new Set()
+	previewError.value = false
+}
+
 function settingById(optionId: string): EditableGameSetting | undefined {
 	return draftState.value?.settings.find((setting) => setting.option_id === optionId)
 }
@@ -410,15 +421,29 @@ function setSyncEnabled(optionId: string, enabled: boolean) {
 }
 
 function setCanonicalValue(optionId: string, value: GameOptionCanonicalValue | null) {
-	if (!draftState.value || !settingById(optionId)) return
-	touchedValueOptionIds.value = new Set(touchedValueOptionIds.value).add(optionId)
+	if (!draftState.value) return
+	const currentSetting = settingById(optionId)
+	const baseSetting = baseState.value?.settings.find((setting) => setting.option_id === optionId)
+	if (!currentSetting) return
+
+	const revertedToBase =
+		!!baseSetting &&
+		!canonicalValuesEqual(currentSetting.canonical_value, baseSetting.canonical_value) &&
+		canonicalValuesEqual(value, baseSetting.canonical_value)
+	const touchedOptionIds = new Set(touchedValueOptionIds.value)
+	if (revertedToBase) {
+		touchedOptionIds.delete(optionId)
+	} else {
+		touchedOptionIds.add(optionId)
+	}
+	touchedValueOptionIds.value = touchedOptionIds
 	draftState.value.settings = draftState.value.settings.map((setting) =>
 		setting.option_id === optionId
 			? {
 					...setting,
 					canonical_value: value,
-					value_state: value ? 'canonical' : 'unset',
-					validation_error: null,
+					value_state: revertedToBase ? baseSetting.value_state : value ? 'canonical' : 'unset',
+					validation_error: revertedToBase ? baseSetting.validation_error : null,
 				}
 			: setting,
 	)
@@ -571,11 +596,12 @@ async function save() {
 						: messages.savedSummary,
 			),
 		})
+		const refreshed = result.state ?? (await get_synced_game_options_config())
+		baseState.value = cloneGameSettingsState(refreshed)
+		draftState.value = cloneGameSettingsState(refreshed)
+		touchedValueOptionIds.value = new Set()
+		previewError.value = false
 		emit('saved')
-		allowClose = true
-		saving.value = false
-		await nextTick()
-		modal.value?.hide()
 	} catch (error) {
 		handleError(error)
 	} finally {
@@ -600,8 +626,8 @@ defineExpose({ show, hide })
 		:on-after-hide="reset"
 		:disable-close="saving"
 		:floating-action-bar-shown="isDirty"
-		:max-width="'min(930px, calc(95vw - 2rem))'"
-		:width="'min(930px, calc(95vw - 2rem))'"
+		:max-width="'min(1080px, calc(95vw - 2rem))'"
+		:width="'min(1080px, calc(95vw - 2rem))'"
 	>
 		<template #sidebar-header>
 			<div class="pb-4">
@@ -699,7 +725,7 @@ defineExpose({ show, hide })
 					{{ formatMessage(messages.unsavedChanges) }}
 				</p>
 				<div class="ml-auto flex gap-2">
-					<Button type="outlined" :disabled="saving" @click="modal?.hide()">
+					<Button type="outlined" :disabled="saving" @click="cancelChanges">
 						<XIcon />
 						{{ formatMessage(commonMessages.cancelButton) }}
 					</Button>
diff --git a/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-editors.ts b/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-editors.ts
index f215d4ba56..b494e25b73 100644
--- a/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-editors.ts
+++ b/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-editors.ts
@@ -1,3 +1,5 @@
+import { toRaw } from 'vue'
+
 import type {
 	EditableGameSetting,
 	GameOptionCanonicalValue,
@@ -6,7 +8,7 @@ import type {
 } from '@/helpers/game-options'
 
 export function cloneGameSettingsState(state: GameSettingsEditorState): GameSettingsEditorState {
-	return structuredClone(state)
+	return structuredClone(toRaw(state))
 }
 
 export function canonicalValuesEqual(
diff --git a/apps/app-frontend/src/locales/en-US/index.json b/apps/app-frontend/src/locales/en-US/index.json
index 907a7c867b..c29d603c1f 100644
--- a/apps/app-frontend/src/locales/en-US/index.json
+++ b/apps/app-frontend/src/locales/en-US/index.json
@@ -3461,6 +3461,9 @@
   "instance.settings.tabs.synced-options.game-settings.description": {
     "message": "Apply the selected shared game settings on top of this instance’s options.txt."
   },
+  "instance.settings.tabs.synced-options.game-settings.disabled-in-app": {
+    "message": "Game settings syncing is turned off in app settings."
+  },
   "instance.settings.tabs.synced-options.hotbars-conflict.backup-description": {
     "message": "The version being replaced will be backed up before anything changes."
   },
diff --git a/apps/app-frontend/src/pages/instance/components/settings-modal/index.vue b/apps/app-frontend/src/pages/instance/components/settings-modal/index.vue
index ac96db7719..b04e73c82c 100644
--- a/apps/app-frontend/src/pages/instance/components/settings-modal/index.vue
+++ b/apps/app-frontend/src/pages/instance/components/settings-modal/index.vue
@@ -49,9 +49,17 @@ const handleUnlinked = () => emit('unlinked')
 
 const instanceRef = computed(() => props.instance)
 const tabbedModal = ref<InstanceType<typeof TabbedModal> | null>(null)
+let onAfterClose: (() => void) | undefined
 
-function hide() {
-	tabbedModal.value?.hide()
+function hide(callback?: () => void) {
+	onAfterClose = callback
+	if (!tabbedModal.value?.hide()) onAfterClose = undefined
+}
+
+function handleAfterHide() {
+	const callback = onAfterClose
+	onAfterClose = undefined
+	callback?.()
 }
 
 provideInstanceSettings({
@@ -181,6 +189,7 @@ defineExpose({ show, hide })
 	<TabbedModal
 		ref="tabbedModal"
 		:tabs="tabs"
+		:on-after-hide="handleAfterHide"
 		:max-width="'min(928px, calc(95vw - 10rem))'"
 		:width="'min(928px, calc(95vw - 10rem))'"
 	>
diff --git a/apps/app-frontend/src/pages/instance/components/settings-modal/instance-settings-context.ts b/apps/app-frontend/src/pages/instance/components/settings-modal/instance-settings-context.ts
index d6aa632d57..543fd81052 100644
--- a/apps/app-frontend/src/pages/instance/components/settings-modal/instance-settings-context.ts
+++ b/apps/app-frontend/src/pages/instance/components/settings-modal/instance-settings-context.ts
@@ -8,7 +8,7 @@ export interface InstanceSettingsContext {
 	offline?: boolean
 	isMinecraftServer: Ref<boolean>
 	onUnlinked: () => void
-	closeModal?: () => void
+	closeModal?: (onAfterClose?: () => void) => void
 }
 
 export const [injectInstanceSettings, provideInstanceSettings] =
diff --git a/apps/app-frontend/src/pages/instance/components/settings-modal/synced-options-settings.vue b/apps/app-frontend/src/pages/instance/components/settings-modal/synced-options-settings.vue
index 06b6e38ca7..460c07d3ea 100644
--- a/apps/app-frontend/src/pages/instance/components/settings-modal/synced-options-settings.vue
+++ b/apps/app-frontend/src/pages/instance/components/settings-modal/synced-options-settings.vue
@@ -52,6 +52,10 @@ const messages = defineMessages({
 		defaultMessage:
 			'Apply the selected shared game settings on top of this instance’s options.txt.',
 	},
+	gameSettingsDisabled: {
+		id: 'instance.settings.tabs.synced-options.game-settings.disabled-in-app',
+		defaultMessage: 'Game settings syncing is turned off in app settings.',
+	},
 	multiplayerServers: {
 		id: 'instance.settings.tabs.synced-options.multiplayer-servers',
 		defaultMessage: 'Unsync multiplayer servers',
@@ -114,6 +118,7 @@ const messages = defineMessages({
 type InstanceSyncedOption = Exclude<SyncedOption, 'screenshots'>
 
 const globalDisabledMessages: Record<InstanceSyncedOption, keyof typeof messages> = {
+	game_options: 'gameSettingsDisabled',
 	multiplayer_servers: 'multiplayerServersDisabled',
 	command_history: 'commandHistoryDisabled',
 	creative_hotbars: 'creativeHotbarsDisabled',
@@ -174,6 +179,10 @@ function excluded(option: InstanceSyncedOption): boolean {
 	)
 }
 
+function enabled(option: InstanceSyncedOption): boolean {
+	return instance.value.synced_options[option]
+}
+
 function setPreviewExcluded(option: InstanceSyncedOption, value?: boolean) {
 	if (value === undefined) {
 		const { [option]: _, ...next } = previewExcluded.value
@@ -191,8 +200,11 @@ function disabledReason(option: InstanceSyncedOption): string | undefined {
 }
 
 function showAppSyncedOptions(): void {
-	closeModal?.()
-	openAppSettingsSyncedOptions()
+	if (closeModal) {
+		closeModal(openAppSettingsSyncedOptions)
+	} else {
+		openAppSettingsSyncedOptions()
+	}
 }
 
 type SyncedOptionMutationVariables = {
diff --git a/packages/app-lib/src/api/instance/game_options/fullscreen.rs b/packages/app-lib/src/api/instance/game_options/fullscreen.rs
index 10fa7820d6..d52df69396 100644
--- a/packages/app-lib/src/api/instance/game_options/fullscreen.rs
+++ b/packages/app-lib/src/api/instance/game_options/fullscreen.rs
@@ -13,6 +13,13 @@ const FULLSCREEN_OPTION_ID: &str = "fullscreen";
 pub(crate) async fn shared_fullscreen_value(
     state: &State,
 ) -> crate::Result<Option<bool>> {
+    let preferences = load_game_option_preferences(&state.pool).await?;
+    if !preferences
+        .get(FULLSCREEN_OPTION_ID)
+        .is_some_and(|preference| preference.enabled)
+    {
+        return Ok(None);
+    }
     let values = load_shared_game_options(&state.pool).await?;
     Ok(values.get(FULLSCREEN_OPTION_ID).and_then(|stored| {
         if !stored.seeded {
@@ -41,7 +48,7 @@ pub(crate) async fn update_shared_fullscreen_from_app(
             )
     });
     let sync_enabled = preference.is_some_and(|preference| preference.enabled);
-    if value_matches && sync_enabled {
+    if !sync_enabled || value_matches {
         return Ok(false);
     }
 
@@ -105,7 +112,11 @@ pub(crate) async fn update_shared_fullscreen_from_app(
 pub(super) async fn update_app_fullscreen_setting(
     tx: &mut Transaction<'_, Sqlite>,
     value: &CanonicalValue,
+    sync_enabled: bool,
 ) -> crate::Result<()> {
+    if !sync_enabled {
+        return Ok(());
+    }
     let CanonicalValue::Bool(value) = value else {
         return Ok(());
     };
diff --git a/packages/app-lib/src/api/instance/game_options/read_instance_changes.rs b/packages/app-lib/src/api/instance/game_options/read_instance_changes.rs
index 75891d7743..d2f4a17200 100644
--- a/packages/app-lib/src/api/instance/game_options/read_instance_changes.rs
+++ b/packages/app-lib/src/api/instance/game_options/read_instance_changes.rs
@@ -234,7 +234,7 @@ pub(super) async fn read_instance_changes_into_shared_settings(
             .await?;
         }
         if let Some(value) = fullscreen_value.as_ref() {
-            update_app_fullscreen_setting(&mut tx, value).await?;
+            update_app_fullscreen_setting(&mut tx, value, true).await?;
         }
         tx.commit().await?;
     }
diff --git a/packages/app-lib/src/api/instance/game_options/settings_editor.rs b/packages/app-lib/src/api/instance/game_options/settings_editor.rs
index 7d0d61ef40..245696cb58 100644
--- a/packages/app-lib/src/api/instance/game_options/settings_editor.rs
+++ b/packages/app-lib/src/api/instance/game_options/settings_editor.rs
@@ -384,6 +384,8 @@ pub async fn save_changes(
     let mut fullscreen_value = None;
     let mut tx = state.pool.begin().await?;
     for (setting, change) in accepted {
+        let resulting_enabled =
+            change.sync_enabled.unwrap_or(setting.sync_enabled);
         let value_changed =
             change.canonical_value.as_ref().is_some_and(|value| {
                 setting.value_state != GameOptionValueState::Canonical
@@ -395,9 +397,13 @@ pub async fn save_changes(
         if !value_changed && !selection_changed {
             continue;
         }
-        if value_changed
+        if resulting_enabled
             && setting.option_id == "fullscreen"
-            && let Some(Some(value)) = change.canonical_value.as_ref()
+            && let Some(value) = change
+                .canonical_value
+                .as_ref()
+                .and_then(|value| value.as_ref())
+                .or(setting.canonical_value.as_ref())
         {
             fullscreen_value = Some(value.clone());
         }
@@ -504,7 +510,7 @@ pub async fn save_changes(
         .await?;
     }
     if let Some(value) = fullscreen_value.as_ref() {
-        update_app_fullscreen_setting(&mut tx, value).await?;
+        update_app_fullscreen_setting(&mut tx, value, true).await?;
     }
     tx.commit().await?;
 
diff --git a/packages/app-lib/src/api/instance/game_options/source_selection.rs b/packages/app-lib/src/api/instance/game_options/source_selection.rs
index b02e0317b8..dec2aff873 100644
--- a/packages/app-lib/src/api/instance/game_options/source_selection.rs
+++ b/packages/app-lib/src/api/instance/game_options/source_selection.rs
@@ -131,6 +131,7 @@ pub(in crate::api::instance) async fn initialize_from_source_instance(
     }
     let mut seeded_any = false;
     let mut fullscreen_value = None;
+    let mut fullscreen_sync_enabled = false;
 
     for definition in all_supported_settings() {
         if !supported_settings_cover_game_version(source_version) {
@@ -155,6 +156,10 @@ pub(in crate::api::instance) async fn initialize_from_source_instance(
         };
         if definition.id == "fullscreen" {
             fullscreen_value = Some(value.clone());
+            fullscreen_sync_enabled = current_preferences
+                .get(definition.id)
+                .map(|preference| preference.enabled)
+                .unwrap_or(definition.default_on);
         }
         seeded_any = true;
         let option_revision = current_values
@@ -301,7 +306,8 @@ pub(in crate::api::instance) async fn initialize_from_source_instance(
     .execute(&mut *tx)
     .await?;
     if let Some(value) = fullscreen_value.as_ref() {
-        update_app_fullscreen_setting(&mut tx, value).await?;
+        update_app_fullscreen_setting(&mut tx, value, fullscreen_sync_enabled)
+            .await?;
     }
     tx.commit().await?;
     Ok(())
diff --git a/packages/ui/src/components/base/Slider.vue b/packages/ui/src/components/base/Slider.vue
index 38432f352c..f2d590f8b3 100644
--- a/packages/ui/src/components/base/Slider.vue
+++ b/packages/ui/src/components/base/Slider.vue
@@ -31,7 +31,7 @@
 				:min="min"
 				:max="max"
 				:step="step"
-				class="slider absolute top-0 h-10 min-h-0 appearance-none border-0 bg-transparent p-0 shadow-none outline-none"
+				class="slider absolute top-0 h-10 min-h-0 appearance-none overflow-visible border-0 bg-transparent p-0 shadow-none outline-none"
 				:class="disabled ? 'cursor-not-allowed' : 'cursor-pointer'"
 				:disabled="disabled"
 				@input="onInputWithSnap(($event.target as HTMLInputElement).value)"

From 489f93e07dd1363667567110fac8bab829c3dbdb Mon Sep 17 00:00:00 2001
From: "Calum H. (IMB11)" <contact@cal.engineer>
Date: Tue, 1 Sep 2026 17:32:46 +0100
Subject: [PATCH 06/33] chore: cleanup structure in app-lib

---
 packages/app-lib/src/api/instance.rs          |  5 ++--
 .../game_options/api_types.rs                 |  0
 .../game_options/catalog}/accessibility.rs    |  0
 .../game_options/catalog}/chat.rs             |  0
 .../game_options/catalog}/controls.rs         |  0
 .../catalog}/known_vanilla_keys.rs            |  0
 .../catalog}/legacy_key_bindings.rs           |  0
 .../game_options/catalog}/mod.rs              |  0
 .../game_options/catalog}/sound.rs            |  0
 .../game_options/catalog}/version_changes.rs  |  0
 .../game_options/catalog}/video.rs            |  0
 .../game_options/fullscreen.rs                |  0
 .../game_options/instance_support.rs          |  4 ++--
 .../game_options/launch_overrides.rs          |  4 ++--
 .../{ => synced_options}/game_options/mod.rs  |  4 ++--
 .../game_options/options_file.rs              |  2 +-
 .../game_options/pack_updates.rs              |  0
 .../game_options/read_instance_changes.rs     |  4 ++--
 .../game_options/settings_editor.rs           |  2 +-
 .../game_options/source_selection.rs          |  4 ++--
 .../game_options/write_shared_settings.rs     |  4 ++--
 .../src/api/instance/synced_options/mod.rs    |  1 +
 .../instance/synced_options/orchestration.rs  | 24 +++++++++----------
 23 files changed, 29 insertions(+), 29 deletions(-)
 rename packages/app-lib/src/api/instance/{ => synced_options}/game_options/api_types.rs (100%)
 rename packages/app-lib/src/api/instance/{game_options/supported_settings => synced_options/game_options/catalog}/accessibility.rs (100%)
 rename packages/app-lib/src/api/instance/{game_options/supported_settings => synced_options/game_options/catalog}/chat.rs (100%)
 rename packages/app-lib/src/api/instance/{game_options/supported_settings => synced_options/game_options/catalog}/controls.rs (100%)
 rename packages/app-lib/src/api/instance/{game_options/supported_settings => synced_options/game_options/catalog}/known_vanilla_keys.rs (100%)
 rename packages/app-lib/src/api/instance/{game_options/supported_settings => synced_options/game_options/catalog}/legacy_key_bindings.rs (100%)
 rename packages/app-lib/src/api/instance/{game_options/supported_settings => synced_options/game_options/catalog}/mod.rs (100%)
 rename packages/app-lib/src/api/instance/{game_options/supported_settings => synced_options/game_options/catalog}/sound.rs (100%)
 rename packages/app-lib/src/api/instance/{game_options/supported_settings => synced_options/game_options/catalog}/version_changes.rs (100%)
 rename packages/app-lib/src/api/instance/{game_options/supported_settings => synced_options/game_options/catalog}/video.rs (100%)
 rename packages/app-lib/src/api/instance/{ => synced_options}/game_options/fullscreen.rs (100%)
 rename packages/app-lib/src/api/instance/{ => synced_options}/game_options/instance_support.rs (99%)
 rename packages/app-lib/src/api/instance/{ => synced_options}/game_options/launch_overrides.rs (98%)
 rename packages/app-lib/src/api/instance/{ => synced_options}/game_options/mod.rs (96%)
 rename packages/app-lib/src/api/instance/{ => synced_options}/game_options/options_file.rs (99%)
 rename packages/app-lib/src/api/instance/{ => synced_options}/game_options/pack_updates.rs (100%)
 rename packages/app-lib/src/api/instance/{ => synced_options}/game_options/read_instance_changes.rs (99%)
 rename packages/app-lib/src/api/instance/{ => synced_options}/game_options/settings_editor.rs (99%)
 rename packages/app-lib/src/api/instance/{ => synced_options}/game_options/source_selection.rs (99%)
 rename packages/app-lib/src/api/instance/{ => synced_options}/game_options/write_shared_settings.rs (99%)

diff --git a/packages/app-lib/src/api/instance.rs b/packages/app-lib/src/api/instance.rs
index ab473c65ab..ef49e17ec8 100644
--- a/packages/app-lib/src/api/instance.rs
+++ b/packages/app-lib/src/api/instance.rs
@@ -3,7 +3,6 @@
 mod content;
 mod content_set_diff;
 mod export_mrpack;
-mod game_options;
 mod get;
 mod groups;
 mod icon;
@@ -28,7 +27,7 @@ pub use self::export_mrpack::{
     PackExportCandidate, create_mrpack_json, export_mrpack,
     get_pack_export_candidates, get_pack_export_candidates_for_parent,
 };
-pub use self::game_options::{
+pub use self::synced_options::game_options::{
     CanonicalValue as GameOptionCanonicalValue, EditableGameSetting,
     GameOptionCompatibility, GameOptionCompatibilityBucket,
     GameOptionCompatibilityReason, GameOptionCompatibilityStatus,
@@ -45,7 +44,7 @@ pub use self::game_options::{
     save_changes as save_synced_game_option_changes,
     sync_before_launch as sync_game_options_before_launch,
 };
-pub(crate) use self::game_options::{
+pub(crate) use self::synced_options::game_options::{
     shared_fullscreen_value, sync_all_participating_instances,
     update_shared_fullscreen_from_app,
 };
diff --git a/packages/app-lib/src/api/instance/game_options/api_types.rs b/packages/app-lib/src/api/instance/synced_options/game_options/api_types.rs
similarity index 100%
rename from packages/app-lib/src/api/instance/game_options/api_types.rs
rename to packages/app-lib/src/api/instance/synced_options/game_options/api_types.rs
diff --git a/packages/app-lib/src/api/instance/game_options/supported_settings/accessibility.rs b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/accessibility.rs
similarity index 100%
rename from packages/app-lib/src/api/instance/game_options/supported_settings/accessibility.rs
rename to packages/app-lib/src/api/instance/synced_options/game_options/catalog/accessibility.rs
diff --git a/packages/app-lib/src/api/instance/game_options/supported_settings/chat.rs b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/chat.rs
similarity index 100%
rename from packages/app-lib/src/api/instance/game_options/supported_settings/chat.rs
rename to packages/app-lib/src/api/instance/synced_options/game_options/catalog/chat.rs
diff --git a/packages/app-lib/src/api/instance/game_options/supported_settings/controls.rs b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/controls.rs
similarity index 100%
rename from packages/app-lib/src/api/instance/game_options/supported_settings/controls.rs
rename to packages/app-lib/src/api/instance/synced_options/game_options/catalog/controls.rs
diff --git a/packages/app-lib/src/api/instance/game_options/supported_settings/known_vanilla_keys.rs b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/known_vanilla_keys.rs
similarity index 100%
rename from packages/app-lib/src/api/instance/game_options/supported_settings/known_vanilla_keys.rs
rename to packages/app-lib/src/api/instance/synced_options/game_options/catalog/known_vanilla_keys.rs
diff --git a/packages/app-lib/src/api/instance/game_options/supported_settings/legacy_key_bindings.rs b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/legacy_key_bindings.rs
similarity index 100%
rename from packages/app-lib/src/api/instance/game_options/supported_settings/legacy_key_bindings.rs
rename to packages/app-lib/src/api/instance/synced_options/game_options/catalog/legacy_key_bindings.rs
diff --git a/packages/app-lib/src/api/instance/game_options/supported_settings/mod.rs b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/mod.rs
similarity index 100%
rename from packages/app-lib/src/api/instance/game_options/supported_settings/mod.rs
rename to packages/app-lib/src/api/instance/synced_options/game_options/catalog/mod.rs
diff --git a/packages/app-lib/src/api/instance/game_options/supported_settings/sound.rs b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/sound.rs
similarity index 100%
rename from packages/app-lib/src/api/instance/game_options/supported_settings/sound.rs
rename to packages/app-lib/src/api/instance/synced_options/game_options/catalog/sound.rs
diff --git a/packages/app-lib/src/api/instance/game_options/supported_settings/version_changes.rs b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/version_changes.rs
similarity index 100%
rename from packages/app-lib/src/api/instance/game_options/supported_settings/version_changes.rs
rename to packages/app-lib/src/api/instance/synced_options/game_options/catalog/version_changes.rs
diff --git a/packages/app-lib/src/api/instance/game_options/supported_settings/video.rs b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/video.rs
similarity index 100%
rename from packages/app-lib/src/api/instance/game_options/supported_settings/video.rs
rename to packages/app-lib/src/api/instance/synced_options/game_options/catalog/video.rs
diff --git a/packages/app-lib/src/api/instance/game_options/fullscreen.rs b/packages/app-lib/src/api/instance/synced_options/game_options/fullscreen.rs
similarity index 100%
rename from packages/app-lib/src/api/instance/game_options/fullscreen.rs
rename to packages/app-lib/src/api/instance/synced_options/game_options/fullscreen.rs
diff --git a/packages/app-lib/src/api/instance/game_options/instance_support.rs b/packages/app-lib/src/api/instance/synced_options/game_options/instance_support.rs
similarity index 99%
rename from packages/app-lib/src/api/instance/game_options/instance_support.rs
rename to packages/app-lib/src/api/instance/synced_options/game_options/instance_support.rs
index 22f4c27eef..0107168443 100644
--- a/packages/app-lib/src/api/instance/game_options/instance_support.rs
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/instance_support.rs
@@ -1,12 +1,12 @@
 //! Works out which instances can receive each shared setting.
 
-use super::super::synced_options;
+use super::super as synced_options;
 use super::CATALOG_REVISION;
 use super::api_types::*;
 use super::options_file::{
     GameOptionsDocument, options_path, read_document, sha1_bytes,
 };
-use super::supported_settings::*;
+use super::catalog::*;
 use crate::state::{
     CanonicalValue, InstanceMetadata, State, StoredOption,
     game_options_sync_is_enabled,
diff --git a/packages/app-lib/src/api/instance/game_options/launch_overrides.rs b/packages/app-lib/src/api/instance/synced_options/game_options/launch_overrides.rs
similarity index 98%
rename from packages/app-lib/src/api/instance/game_options/launch_overrides.rs
rename to packages/app-lib/src/api/instance/synced_options/game_options/launch_overrides.rs
index 2a8a55e2a6..8a395b7d60 100644
--- a/packages/app-lib/src/api/instance/game_options/launch_overrides.rs
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/launch_overrides.rs
@@ -1,6 +1,6 @@
 //! Updates shared settings, then applies launcher settings before Minecraft starts.
 
-use super::super::synced_options;
+use super::super as synced_options;
 use super::CATALOG_REVISION;
 use super::api_types::SyncReason;
 use super::options_file::{
@@ -8,7 +8,7 @@ use super::options_file::{
     validate_raw_key_value,
 };
 use super::read_instance_changes::previous_applied_settings;
-use super::supported_settings::setting_by_file_key;
+use super::catalog::setting_by_file_key;
 use super::write_shared_settings::{
     sync_instance_options, sync_is_active_for_instance,
 };
diff --git a/packages/app-lib/src/api/instance/game_options/mod.rs b/packages/app-lib/src/api/instance/synced_options/game_options/mod.rs
similarity index 96%
rename from packages/app-lib/src/api/instance/game_options/mod.rs
rename to packages/app-lib/src/api/instance/synced_options/game_options/mod.rs
index 4d6c6576d9..1f358b1cbc 100644
--- a/packages/app-lib/src/api/instance/game_options/mod.rs
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/mod.rs
@@ -8,7 +8,7 @@
 //! lets changes made in Minecraft become the new shared values. When multiple
 //! instances change the same setting, the latest change processed by sync wins.
 //!
-//! Minecraft has renamed and reformatted settings over time. `supported_settings`
+//! Minecraft has renamed and reformatted settings over time. `catalog`
 //! contains the file keys and conversions for the versions we support. Any other
 //! key is treated as a custom setting and copied as-is to every synced instance.
 //! Custom settings can be turned off individually in the settings screen.
@@ -17,6 +17,7 @@
 //! mistaken for changes made by the player.
 
 mod api_types;
+mod catalog;
 mod fullscreen;
 mod instance_support;
 mod launch_overrides;
@@ -25,7 +26,6 @@ mod pack_updates;
 mod read_instance_changes;
 mod settings_editor;
 mod source_selection;
-mod supported_settings;
 mod write_shared_settings;
 
 pub use crate::state::{CanonicalValue, GameOptionKind};
diff --git a/packages/app-lib/src/api/instance/game_options/options_file.rs b/packages/app-lib/src/api/instance/synced_options/game_options/options_file.rs
similarity index 99%
rename from packages/app-lib/src/api/instance/game_options/options_file.rs
rename to packages/app-lib/src/api/instance/synced_options/game_options/options_file.rs
index b413d5776d..429f94cbe5 100644
--- a/packages/app-lib/src/api/instance/game_options/options_file.rs
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/options_file.rs
@@ -1,6 +1,6 @@
 //! Reads and edits `options.txt` without changing unrelated lines or file formatting.
 
-use super::super::synced_options;
+use super::super as synced_options;
 use super::{
     MAX_KEY_BYTES, MAX_OPTIONS_BYTES, MAX_OPTIONS_LINES, MAX_VALUE_BYTES,
     OPTIONS_FILE,
diff --git a/packages/app-lib/src/api/instance/game_options/pack_updates.rs b/packages/app-lib/src/api/instance/synced_options/game_options/pack_updates.rs
similarity index 100%
rename from packages/app-lib/src/api/instance/game_options/pack_updates.rs
rename to packages/app-lib/src/api/instance/synced_options/game_options/pack_updates.rs
diff --git a/packages/app-lib/src/api/instance/game_options/read_instance_changes.rs b/packages/app-lib/src/api/instance/synced_options/game_options/read_instance_changes.rs
similarity index 99%
rename from packages/app-lib/src/api/instance/game_options/read_instance_changes.rs
rename to packages/app-lib/src/api/instance/synced_options/game_options/read_instance_changes.rs
index d2f4a17200..970944821f 100644
--- a/packages/app-lib/src/api/instance/game_options/read_instance_changes.rs
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/read_instance_changes.rs
@@ -1,12 +1,12 @@
 //! Finds settings changed in Minecraft and shares those changes with other instances.
 
-use super::super::synced_options;
+use super::super as synced_options;
 use super::CATALOG_REVISION;
 use super::api_types::canonical_values_equal;
 use super::fullscreen::update_app_fullscreen_setting;
 use super::launch_overrides::currently_launcher_owned_keys;
 use super::options_file::{GameOptionsDocument, validate_raw_key_value};
-use super::supported_settings::*;
+use super::catalog::*;
 use crate::state::{
     CanonicalValue, GameOptionKind, GameOptionsProjection, InstanceMetadata,
     ProjectionOrigin, State, SyncedOption, load_game_option_preferences,
diff --git a/packages/app-lib/src/api/instance/game_options/settings_editor.rs b/packages/app-lib/src/api/instance/synced_options/game_options/settings_editor.rs
similarity index 99%
rename from packages/app-lib/src/api/instance/game_options/settings_editor.rs
rename to packages/app-lib/src/api/instance/synced_options/game_options/settings_editor.rs
index 245696cb58..285b5147c6 100644
--- a/packages/app-lib/src/api/instance/game_options/settings_editor.rs
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/settings_editor.rs
@@ -8,7 +8,7 @@ use super::instance_support::{
     load_participating_instances, summary_revision,
 };
 use super::options_file::input_error;
-use super::supported_settings::*;
+use super::catalog::*;
 use super::write_shared_settings::sync_all_participating_instances;
 use crate::state::{
     CanonicalValue, GameOptionKind, State, StoredOption,
diff --git a/packages/app-lib/src/api/instance/game_options/source_selection.rs b/packages/app-lib/src/api/instance/synced_options/game_options/source_selection.rs
similarity index 99%
rename from packages/app-lib/src/api/instance/game_options/source_selection.rs
rename to packages/app-lib/src/api/instance/synced_options/game_options/source_selection.rs
index dec2aff873..108d08e634 100644
--- a/packages/app-lib/src/api/instance/game_options/source_selection.rs
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/source_selection.rs
@@ -1,6 +1,6 @@
 //! Finds eligible source instances and copies the first shared settings from one.
 
-use super::super::synced_options;
+use super::super as synced_options;
 use super::CATALOG_REVISION;
 use super::api_types::{GameOptionsSourceCandidate, GameOptionsSourceIssue};
 use super::fullscreen::update_app_fullscreen_setting;
@@ -12,7 +12,7 @@ use super::options_file::{
 use super::read_instance_changes::{
     custom_setting_id, launcher_keys_for_document,
 };
-use super::supported_settings::*;
+use super::catalog::*;
 use crate::state::{
     CanonicalValue, InstanceMetadata, State, load_game_option_preferences,
     load_game_options_sync_state, load_shared_game_options,
diff --git a/packages/app-lib/src/api/instance/game_options/write_shared_settings.rs b/packages/app-lib/src/api/instance/synced_options/game_options/write_shared_settings.rs
similarity index 99%
rename from packages/app-lib/src/api/instance/game_options/write_shared_settings.rs
rename to packages/app-lib/src/api/instance/synced_options/game_options/write_shared_settings.rs
index b49111004b..f482fcce60 100644
--- a/packages/app-lib/src/api/instance/game_options/write_shared_settings.rs
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/write_shared_settings.rs
@@ -1,6 +1,6 @@
 //! Writes shared settings into an instance without replacing the rest of `options.txt`.
 
-use super::super::synced_options::{self, CheckpointStatus};
+use super::super::{self as synced_options, CheckpointStatus};
 use super::CATALOG_REVISION;
 use super::api_types::{
     GameOptionMappingKind, SaveGameSettingsResult, SyncOutcome, SyncReason,
@@ -12,7 +12,7 @@ use super::read_instance_changes::{
     discover_custom_settings, previous_applied_settings,
     read_instance_changes_into_shared_settings,
 };
-use super::supported_settings::*;
+use super::catalog::*;
 use crate::state::{
     CanonicalValue, GameOptionsProjection, InstanceMetadata, ProjectedField,
     ProjectionOrigin, State, SyncedOption, game_options_sync_is_enabled,
diff --git a/packages/app-lib/src/api/instance/synced_options/mod.rs b/packages/app-lib/src/api/instance/synced_options/mod.rs
index fa550b2d3f..75518875db 100644
--- a/packages/app-lib/src/api/instance/synced_options/mod.rs
+++ b/packages/app-lib/src/api/instance/synced_options/mod.rs
@@ -1,5 +1,6 @@
 mod command_history;
 mod files;
+pub(super) mod game_options;
 mod hotbars;
 mod orchestration;
 
diff --git a/packages/app-lib/src/api/instance/synced_options/orchestration.rs b/packages/app-lib/src/api/instance/synced_options/orchestration.rs
index 5ccbf5b549..97ab21728d 100644
--- a/packages/app-lib/src/api/instance/synced_options/orchestration.rs
+++ b/packages/app-lib/src/api/instance/synced_options/orchestration.rs
@@ -787,7 +787,7 @@ pub(crate) async fn prepare_instance_update(
     ] {
         if option == SyncedOption::GameOptions {
             if let Err(error) =
-                super::super::game_options::prepare_instance_update_with_state(
+                super::game_options::prepare_instance_update_with_state(
                     &metadata, &state,
                 )
                 .await
@@ -827,10 +827,10 @@ async fn reconcile_instance_with_state(
             CapabilityStatus::Supported => {
                 let result =
                     if option == SyncedOption::GameOptions && allow_protected {
-                        super::super::game_options::sync_instance_with_state(
+                        super::game_options::sync_instance_with_state(
                         metadata,
                         state,
-                        super::super::game_options::SyncReason::PackExtracted,
+                        super::game_options::SyncReason::PackExtracted,
                     )
                     .await
                     } else {
@@ -863,10 +863,10 @@ async fn reconcile_option(
 ) -> crate::Result<()> {
     match option {
         SyncedOption::GameOptions => {
-            super::super::game_options::sync_instance_with_state(
+            super::game_options::sync_instance_with_state(
                 metadata,
                 state,
-                super::super::game_options::SyncReason::Normal,
+                super::game_options::SyncReason::Normal,
             )
             .await
         }
@@ -900,10 +900,10 @@ pub async fn reconcile_changed_file(
             if option_effective(&metadata, SyncedOption::GameOptions, &state)
                 .await?
             {
-                super::super::game_options::sync_instance_with_state(
+                super::game_options::sync_instance_with_state(
                     &metadata,
                     &state,
-                    super::super::game_options::SyncReason::Normal,
+                    super::game_options::SyncReason::Normal,
                 )
                 .await?;
             }
@@ -1018,7 +1018,7 @@ pub(super) async fn seed_from_instance(
     let instance_dir = instance_dir(metadata, state);
     match option {
         SyncedOption::GameOptions => {
-            super::super::game_options::initialize_from_source_instance(
+            super::game_options::initialize_from_source_instance(
                 metadata, state,
             )
             .await?;
@@ -1077,10 +1077,10 @@ async fn ensure_option(
 ) -> crate::Result<()> {
     match option {
         SyncedOption::GameOptions => {
-            super::super::game_options::sync_instance_with_state(
+            super::game_options::sync_instance_with_state(
                 metadata,
                 state,
-                super::super::game_options::SyncReason::Normal,
+                super::game_options::SyncReason::Normal,
             )
             .await
         }
@@ -1103,7 +1103,7 @@ async fn detach_option(
     let instance_dir = instance_dir(metadata, state);
     match option {
         SyncedOption::GameOptions => {
-            super::super::game_options::detach_instance(metadata, state).await
+            super::game_options::detach_instance(metadata, state).await
         }
         SyncedOption::CommandHistory => {
             detach_link(
@@ -1135,7 +1135,7 @@ async fn canonical_exists(
 ) -> crate::Result<bool> {
     Ok(match option {
         SyncedOption::GameOptions => {
-            super::super::game_options::canonical_exists(state).await?
+            super::game_options::canonical_exists(state).await?
         }
         SyncedOption::CommandHistory => command_history_path(state).exists(),
         SyncedOption::CreativeHotbars => hotbar_state_exists(state).await?,

From 05c22cd6ad64fc1b555e2bb31ab92dbd138f9b84 Mon Sep 17 00:00:00 2001
From: "Calum H. (IMB11)" <contact@cal.engineer>
Date: Tue, 1 Sep 2026 18:02:43 +0100
Subject: [PATCH 07/33] chore: 26.3 + history readme

---
 .../game_options/catalog/README.md            | 232 ++++++++++++++++++
 .../catalog/known_vanilla_keys.rs             |   7 +-
 .../game_options/catalog/version_changes.rs   |  10 +-
 .../synced_options/game_options/mod.rs        |   5 +-
 4 files changed, 247 insertions(+), 7 deletions(-)
 create mode 100644 packages/app-lib/src/api/instance/synced_options/game_options/catalog/README.md

diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/catalog/README.md b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/README.md
new file mode 100644
index 0000000000..51a850451e
--- /dev/null
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/README.md
@@ -0,0 +1,232 @@
+# options.txt catalog history
+
+## Legacy
+
+- Infdev/Alpha: removed `key_Build`, `key_Load location`, `key_Save location`, and `showFrameRate`.
+- Beta 1.1: removed `key_Back`, `key_Chat`, `key_Drop`, `key_Forward`, `key_Inventory`, `key_Jump`, `key_Left`, `key_Right`, `key_Sneak`, and `key_Toggle fog`.
+- Beta 1.7/1.8: removed `limitFramerate` and `key_key.fog`.
+
+## 1.4.2
+
+- Added `pauseOnLostFocus`.
+
+## 1.7
+
+- Added `soundCategory_master`, `soundCategory_music`, `soundCategory_record`, `soundCategory_weather`, `soundCategory_block`, `soundCategory_hostile`, `soundCategory_neutral`, `soundCategory_player`, and `soundCategory_ambient`.
+
+## 1.7.2
+
+- Added `forceUnicodeFont`.
+- Removed `fpsLimit`, `music`, `skin`, `sound`, and `viewDistance`.
+
+## 1.7.6
+
+- Removed `serverTextures`.
+- Moved server resource-pack acceptance to a per-server Prompt/Enabled/Disabled setting.
+
+## 1.8
+
+- Removed `advancedOpengl`, `anisotropicFiltering`, `clouds`, and `showCape`.
+
+## 1.9
+
+- Removed `allowBlockAlternatives`.
+- Removed `key_key.streamCommercial`, `key_key.streamPauseUnpause`, `key_key.streamStartStop`, and `key_key.streamToggleMic`.
+- Removed `streamBytesPerPixel`, `streamChatEnabled`, `streamChatUserFilter`, `streamCompression`, `streamFps`, `streamKbps`, `streamMicToggleBehavior`, `streamMicVolume`, `streamPreferredServer`, `streamSendMetadata`, and `streamSystemVolume`.
+
+## 1.10
+
+- Added `version`.
+- Added `autoJump`.
+
+## 1.12
+
+- Added `narrator`.
+- Added `tutorialStep`.
+- Added `key_key.saveToolbarActivator`.
+- Removed `showInventoryAchievementHint`.
+
+## 1.13
+
+- Added `biomeBlendRadius`.
+- Added `autoSuggestions`.
+- Added `mouseWheelSensitivity`.
+- Added `glDebugVerbosity`.
+- Changed numeric LWJGL2 key values to `key.*` and `key.mouse.*` tokens.
+- Changed keyboard tokens from `key.*` to `key.keyboard.*`.
+- Removed `anaglyph3d`.
+
+## 1.14
+
+- Added `discrete_mouse_scroll`.
+- Removed `enableWeakAttacks`, `fboEnable`, `saturation`, and `useVbo`.
+
+## 1.14.4
+
+- Added `rawMouseInput`.
+
+## 1.15
+
+- Added `toggleCrouch`.
+
+## 1.15.2
+
+- Added `skipMultiplayerWarning`.
+
+## 1.16
+
+- Added `entityDistanceScaling`.
+- Added `chatLineSpacing`.
+- Added `chatDelay`.
+- Added `syncChunkWrites`.
+- Renamed `key_key.swapHands` to `key_key.swapOffhand`.
+
+## 1.16.2
+
+- Added `fovEffectScale`.
+- Added `screenEffectScale`.
+- Replaced `fancyGraphics` with numeric `graphicsMode`.
+
+## 1.16.4
+
+- Added `hideMatchedNames`.
+- Added `key_key.socialInteractions`.
+- Added `joinedFirstServer`.
+
+## 1.17
+
+- Added `darkMojangStudiosBackground`.
+
+## 1.18
+
+- Added `prioritizeChunkUpdates`.
+- Added `simulationDistance`.
+- Added `soundDevice`.
+- Added `hideLightningFlashes`.
+- Added `showAutosaveIndicator`.
+- Added `allowServerListing`.
+- Removed `snooperEnabled`.
+
+## 1.19
+
+- Added `darknessEffectScale`.
+- Added `directionalAudio`.
+- Added `onlyShowSecureChat`.
+- Removed `difficulty`.
+
+## 1.19.3
+
+- Added `operatorItemsTab`.
+- Added `panoramaScrollSpeed`.
+- Added `telemetryOptInExtra`.
+- Removed `chatPreview`.
+
+## 1.19.4
+
+- Added `glintSpeed`.
+- Added `damageTiltStrength`.
+- Added `onboardAccessibility`.
+- Added `highContrast`.
+- Removed `heldItemTooltips`.
+
+## 1.20.2
+
+- Added `narratorHotKey`.
+
+## 1.20.3
+
+- Added `hideSplashTexts`.
+
+## 1.20.5
+
+- Added `japaneseGlyphVariants`.
+- Added `menuBackgroundBlurriness`.
+- Removed `skipRealms32bitWarning`.
+
+## 1.21.1
+
+- Removed `hideBundleTutorial`.
+
+## 1.21.2
+
+- Added `inactivityFpsLimit`.
+- Added `rotateWithMinecart`.
+- Added `highContrastBlockOutline`.
+
+## 1.21.5
+
+- Added `startedCleanly`.
+
+## 1.21.6
+
+- Added `cloudRange`.
+- Added `musicFrequency`.
+- Added `key_key.quickActions`.
+- Added `soundCategory_ui`.
+
+## 1.21.9
+
+- Added `invertXMouse`.
+- Added `toggleAttack`.
+- Added `allowCursorChanges`.
+- Added `saveChatDrafts`.
+- Added `key_key.spectatorHotbar`.
+
+## 1.21.11
+
+- Added `chunkSectionFadeInTime`.
+- Added `graphicsPreset`.
+- Added `cutoutLeaves`.
+- Added `weatherRadius`.
+- Added `maxAnisotropyBit`.
+- Added `textureFiltering`.
+- Added `improvedTransparency`.
+- Added `vignette`.
+- Added `musicToast`.
+- Added `key_key.toggleGui`.
+- Added `key_key.debug.overlay`.
+- Added `key_key.debug.reloadChunk`.
+- Replaced `graphicsMode` with `graphicsPreset` and separate graphics-detail fields.
+- Replaced `showNowPlayingToast` with `musicToast`.
+
+## 26.1
+
+- Added `exclusiveFullscreen`.
+- Added `key_key.debug.lightmapTexture`.
+
+## 26.2
+
+- Added `preferredGraphicsBackend`.
+- Added `inGameNotification`.
+- Added `key_key.friends`.
+- Removed `touchscreen`.
+
+## 26.3
+
+- Added `debugGuiScale`.
+- Added `quitShortcuts`.
+- Added `ctrlClickEmulatesRightClick`.
+- Added `macFullscreenMenuVisibility`.
+- Added `key_key.debug.improvedTransparency`.
+- Removed `rawMouseInput`.
+
+## Vanilla migrations
+
+Vanilla does these migrations for us
+
+| options.txt data version | Change                                                                                                                 |
+| ------------------------ | ---------------------------------------------------------------------------------------------------------------------- |
+| 505                      | Set `useVbo=true`.                                                                                                     |
+| 816                      | Lowercase `lang`.                                                                                                      |
+| 1344                     | Convert numeric LWJGL2 key mappings to token names; convert `-100`, `-99`, and `-98` to left, right, and middle mouse. |
+| 1446                     | Convert `key.*` keyboard tokens to `key.keyboard.*`; retain mouse and scancode forms.                                  |
+| 1936                     | Derive text background opacity from chat opacity.                                                                      |
+| 2556                     | Convert `fancyGraphics=true` to `graphicsMode=1`; convert other values to `graphicsMode=0`.                            |
+| 2558                     | Rename `key_key.swapHands` to `key_key.swapOffhand`.                                                                   |
+| 3201                     | Rename `programer_art` to `programmer_art` in `resourcePacks` and `incompatibleResourcePacks`.                         |
+| 3214                     | Convert ambient occlusion `0` to `false`; convert `1` and `2` to `true`.                                               |
+| 3319                     | Set `onboardAccessibility=false` for upgraded files.                                                                   |
+| 3943                     | Convert menu blur from a float to `round(value * 10)`; use `5` on conversion failure.                                  |
+| 4651                     | Expand `graphicsMode` into graphics-detail fields and set `graphicsPreset=custom`.                                     |
+| 4661                     | Convert `showNowPlayingToast=false` to `musicToast=never`; convert `true` to `musicToast=pause_and_toast`.             |
+| 4892                     | Set `preferredGraphicsBackend=default`.                                                                                |
diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/catalog/known_vanilla_keys.rs b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/known_vanilla_keys.rs
index 780f8300bc..9511ac1692 100644
--- a/packages/app-lib/src/api/instance/synced_options/game_options/catalog/known_vanilla_keys.rs
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/known_vanilla_keys.rs
@@ -72,6 +72,7 @@ pub(super) const NEVER_SYNC_KEYS: &[&str] = &[
     "soundCategory_records",
     "shieldAnimation",
     "serverTextures",
+    "rawMouseInput",
 ];
 
 pub(super) const KNOWN_VANILLA_KEYS: &[&str] = &[
@@ -95,8 +96,10 @@ pub(super) const KNOWN_VANILLA_KEYS: &[&str] = &[
     "prioritizeChunkUpdates",
     "fullscreen",
     "exclusiveFullscreen",
+    "macFullscreenMenuVisibility",
     "gamma",
     "guiScale",
+    "debugGuiScale",
     "maxAnisotropyBit",
     "textureFiltering",
     "maxFps",
@@ -166,8 +169,9 @@ pub(super) const KNOWN_VANILLA_KEYS: &[&str] = &[
     "attackIndicator",
     "tutorialStep",
     "mouseWheelSensitivity",
-    "rawMouseInput",
     "allowCursorChanges",
+    "quitShortcuts",
+    "ctrlClickEmulatesRightClick",
     "glDebugVerbosity",
     "skipMultiplayerWarning",
     "hideMatchedNames",
@@ -247,6 +251,7 @@ pub(super) const KNOWN_VANILLA_KEYS: &[&str] = &[
     "key_key.debug.fpsCharts",
     "key_key.debug.networkCharts",
     "key_key.debug.lightmapTexture",
+    "key_key.debug.improvedTransparency",
     "soundCategory_master",
     "soundCategory_music",
     "soundCategory_record",
diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/catalog/version_changes.rs b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/version_changes.rs
index 2a5c3fb277..a405292e83 100644
--- a/packages/app-lib/src/api/instance/synced_options/game_options/catalog/version_changes.rs
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/version_changes.rs
@@ -41,7 +41,7 @@ pub(in crate::api::instance) const GRAPHICS_KEYS: &[VersionedKey] = &[
     VersionedKey {
         key: "graphicsPreset",
         since: "1.21.11",
-        until: "26.2",
+        until: "26.3",
         mapping: GameOptionMappingKind::Direct,
     },
 ];
@@ -56,7 +56,7 @@ pub(in crate::api::instance) const AMBIENT_OCCLUSION_KEYS: &[VersionedKey] = &[
     VersionedKey {
         key: "ao",
         since: "1.19.4",
-        until: "26.2",
+        until: "26.3",
         mapping: GameOptionMappingKind::Migrated,
     },
 ];
@@ -71,7 +71,7 @@ pub(in crate::api::instance) const MUSIC_TOAST_KEYS: &[VersionedKey] = &[
     VersionedKey {
         key: "musicToast",
         since: "1.21.11",
-        until: "26.2",
+        until: "26.3",
         mapping: GameOptionMappingKind::Direct,
     },
 ];
@@ -86,7 +86,7 @@ pub(in crate::api::instance) const SWAP_OFFHAND_KEYS: &[VersionedKey] = &[
     VersionedKey {
         key: "key_key.swapOffhand",
         since: "1.16",
-        until: "26.2",
+        until: "26.3",
         mapping: GameOptionMappingKind::Direct,
     },
 ];
@@ -243,7 +243,7 @@ pub(in crate::api::instance) fn supported_settings_cover_game_version(
     match components.as_slice() {
         [1, minor] => *minor <= 21,
         [1, minor, patch] => *minor < 21 || (*minor == 21 && *patch <= 11),
-        [26, minor] | [26, minor, _] => (1..=2).contains(minor),
+        [26, minor] | [26, minor, _] => (1..=3).contains(minor),
         _ => false,
     }
 }
diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/mod.rs b/packages/app-lib/src/api/instance/synced_options/game_options/mod.rs
index 1f358b1cbc..c450c7e512 100644
--- a/packages/app-lib/src/api/instance/synced_options/game_options/mod.rs
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/mod.rs
@@ -13,6 +13,9 @@
 //! key is treated as a custom setting and copied as-is to every synced instance.
 //! Custom settings can be turned off individually in the settings screen.
 //!
+//! `catalog` will need to be checked every time a Minecraft update comes out. For maintenance reasons we will just
+//! do this for major releases, no snapshots/pre-releases.
+//!
 //! Launcher-enforced settings, such as fullscreen, are applied last and are not
 //! mistaken for changes made by the player.
 
@@ -63,7 +66,7 @@ pub(in crate::api::instance) async fn canonical_exists(
 }
 
 const OPTIONS_FILE: &str = "options.txt";
-const CATALOG_REVISION: u32 = 3;
+const CATALOG_REVISION: u32 = 4;
 const MAX_OPTIONS_BYTES: usize = 2 * 1024 * 1024;
 const MAX_OPTIONS_LINES: usize = 16_384;
 const MAX_KEY_BYTES: usize = 1_024;

From 8900a76316efde1a5590f45248d2c1b615160e00 Mon Sep 17 00:00:00 2001
From: "Calum H. (IMB11)" <contact@cal.engineer>
Date: Tue, 1 Sep 2026 21:09:21 +0100
Subject: [PATCH 08/33] fix: qa

---
 .../instances/InstancesSyncedSettings.vue     |  14 +-
 .../game-settings/GameSettingsModal.vue       |   7 +-
 .../app-frontend/src/locales/en-US/index.json |   6 +-
 .../synced-options-settings.vue               |  48 ++++++-
 packages/app-lib/src/api/instance.rs          |  42 +++---
 .../game_options/catalog/video.rs             |  16 +--
 .../game_options/instance_support.rs          |   2 +-
 .../game_options/launch_overrides.rs          |   4 +-
 .../synced_options/game_options/mod.rs        |   2 +-
 .../game_options/pack_updates.rs              | 125 ++++++++++++++----
 .../game_options/read_instance_changes.rs     |   2 +-
 .../game_options/settings_editor.rs           |   2 +-
 .../game_options/source_selection.rs          |   2 +-
 .../game_options/write_shared_settings.rs     |  66 ++++++---
 .../instance/synced_options/orchestration.rs  |  48 ++++---
 .../app-lib/src/api/pack/install_mrpack.rs    |  33 +++--
 packages/app-lib/src/install/runner.rs        |  10 ++
 packages/app-lib/src/launcher/mod.rs          |  11 ++
 18 files changed, 327 insertions(+), 113 deletions(-)

diff --git a/apps/app-frontend/src/components/ui/settings/instances/InstancesSyncedSettings.vue b/apps/app-frontend/src/components/ui/settings/instances/InstancesSyncedSettings.vue
index bab4918f47..e137305098 100644
--- a/apps/app-frontend/src/components/ui/settings/instances/InstancesSyncedSettings.vue
+++ b/apps/app-frontend/src/components/ui/settings/instances/InstancesSyncedSettings.vue
@@ -77,7 +77,7 @@ const messages = defineMessages({
 	gameSettingsDescription: {
 		id: 'app.settings.synced-options.game-settings.description',
 		defaultMessage:
-			'Use the same graphics, keybinds, and other game settings across your instances',
+			'Use the same graphics, keybinds, and other game settings across your instances.',
 	},
 	gameSettingsButton: {
 		id: 'app.settings.synced-options.game-settings.button',
@@ -511,7 +511,6 @@ async function chooseBaseInstance(option: SyncedOption) {
 	baseOption.value = option
 	baseInstanceSearch.value = ''
 	baseSourcesLoading.value = option === 'game_options'
-	baseModal.value?.show()
 
 	if (option === 'game_options') {
 		try {
@@ -525,15 +524,26 @@ async function chooseBaseInstance(option: SyncedOption) {
 			gameOptionSources.value = []
 			baseInstanceId.value = ''
 			handleError(error)
+			return
 		} finally {
 			if (generation === baseSourceGeneration && baseOption.value === option) {
 				baseSourcesLoading.value = false
 			}
 		}
+		if (!baseInstanceId.value) {
+			applyGlobalOption(option, true)
+			return
+		}
+		baseModal.value?.show()
 		return
 	}
 
+	if (instances.value.length === 0) {
+		applyGlobalOption(option, true)
+		return
+	}
 	baseInstanceId.value = instances.value[0]?.id ?? ''
+	baseModal.value?.show()
 }
 
 function toggleGlobalOption(option: SyncedOption, enabled: boolean) {
diff --git a/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingsModal.vue b/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingsModal.vue
index da8d132f41..31dd2cb941 100644
--- a/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingsModal.vue
+++ b/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingsModal.vue
@@ -481,14 +481,15 @@ function schedulePreview() {
 
 function mergePreview(preview: GameSettingsEditorState) {
 	if (!baseState.value || !draftState.value) return
-	const previousBase = baseState.value
+	const previousBase = cloneGameSettingsState(baseState.value)
+	const previousDraft = cloneGameSettingsState(draftState.value)
 	const dirtyIds = new Set(
-		gameSettingChanges(previousBase, draftState.value, touchedValueOptionIds.value).map(
+		gameSettingChanges(previousBase, previousDraft, touchedValueOptionIds.value).map(
 			(change) => change.option_id,
 		),
 	)
 	const stagedSettings = new Map(
-		draftState.value.settings
+		previousDraft.settings
 			.filter((setting) => dirtyIds.has(setting.option_id))
 			.map((setting) => [setting.option_id, setting]),
 	)
diff --git a/apps/app-frontend/src/locales/en-US/index.json b/apps/app-frontend/src/locales/en-US/index.json
index c29d603c1f..6577264e9c 100644
--- a/apps/app-frontend/src/locales/en-US/index.json
+++ b/apps/app-frontend/src/locales/en-US/index.json
@@ -2379,7 +2379,7 @@
     "message": "Settings added by mods will appear here after Modrinth finds them in one of your instances."
   },
   "app.settings.synced-options.game-settings.description": {
-    "message": "Use the same graphics, keybinds, and other game settings across your instances"
+    "message": "Use the same graphics, keybinds, and other game settings across your instances."
   },
   "app.settings.synced-options.game-settings.disable-all": {
     "message": "Stop syncing all"
@@ -3456,10 +3456,10 @@
     "message": "Keep this instance's saved creative hotbars separate from synced hotbars."
   },
   "instance.settings.tabs.synced-options.game-settings": {
-    "message": "Game settings"
+    "message": "Unsync game settings"
   },
   "instance.settings.tabs.synced-options.game-settings.description": {
-    "message": "Apply the selected shared game settings on top of this instance’s options.txt."
+    "message": "Keep this instance's options.txt separate from the synced copy"
   },
   "instance.settings.tabs.synced-options.game-settings.disabled-in-app": {
     "message": "Game settings syncing is turned off in app settings."
diff --git a/apps/app-frontend/src/pages/instance/components/settings-modal/synced-options-settings.vue b/apps/app-frontend/src/pages/instance/components/settings-modal/synced-options-settings.vue
index 460c07d3ea..d48d8a924a 100644
--- a/apps/app-frontend/src/pages/instance/components/settings-modal/synced-options-settings.vue
+++ b/apps/app-frontend/src/pages/instance/components/settings-modal/synced-options-settings.vue
@@ -4,6 +4,7 @@ import {
 	Button,
 	commonMessages,
 	defineMessages,
+	IconButton,
 	injectNotificationManager,
 	NewModal,
 	Toggle,
@@ -12,6 +13,7 @@ import {
 import { useMutation, useQuery, useQueryClient } from '@tanstack/vue-query'
 import { computed, inject, ref } from 'vue'
 
+import GameSettingsModal from '@/components/ui/settings/instances/game-settings/GameSettingsModal.vue'
 import {
 	get_synced_option_join_preview,
 	get_synced_options_overview,
@@ -45,12 +47,15 @@ const messages = defineMessages({
 	},
 	gameSettings: {
 		id: 'instance.settings.tabs.synced-options.game-settings',
-		defaultMessage: 'Game settings',
+		defaultMessage: 'Unsync game settings',
 	},
 	gameSettingsDescription: {
 		id: 'instance.settings.tabs.synced-options.game-settings.description',
-		defaultMessage:
-			'Apply the selected shared game settings on top of this instance’s options.txt.',
+		defaultMessage: "Keep this instance's options.txt separate from the synced copy",
+	},
+	editGameSettings: {
+		id: 'app.settings.synced-options.game-settings.button',
+		defaultMessage: 'Edit game settings',
 	},
 	gameSettingsDisabled: {
 		id: 'instance.settings.tabs.synced-options.game-settings.disabled-in-app',
@@ -165,6 +170,7 @@ const capabilities = computed(
 				[],
 		),
 )
+const gameSettingsModal = ref<InstanceType<typeof GameSettingsModal> | null>(null)
 const hotbarResolutionModal = ref<InstanceType<typeof NewModal> | null>(null)
 const previewingOption = ref<InstanceSyncedOption | null>(null)
 const previewExcluded = ref<Partial<Record<InstanceSyncedOption, boolean>>>({})
@@ -207,6 +213,17 @@ function showAppSyncedOptions(): void {
 	}
 }
 
+function openGameSettings(): void {
+	gameSettingsModal.value?.show()
+}
+
+async function handleGameSettingsSaved(): Promise<void> {
+	await Promise.all([
+		queryClient.invalidateQueries({ queryKey: instanceKeys.all }),
+		queryClient.invalidateQueries({ queryKey: ['instance-synced-options'] }),
+	])
+}
+
 type SyncedOptionMutationVariables = {
 	option: InstanceSyncedOption
 	enabled: boolean
@@ -330,6 +347,8 @@ function resolveHotbars(resolution: SyncedOptionJoinResolution) {
 
 <template>
 	<div class="flex flex-col gap-6">
+		<GameSettingsModal ref="gameSettingsModal" @saved="handleGameSettingsSaved" />
+
 		<NewModal
 			ref="hotbarResolutionModal"
 			:header="formatMessage(messages.hotbarConflictTitle)"
@@ -400,11 +419,26 @@ function resolveHotbars(resolution: SyncedOptionJoinResolution) {
 					<p v-if="row.description" class="m-0 text-secondary">
 						{{ formatMessage(messages[row.description]) }}
 					</p>
-					<p v-if="disabledReason(row.option)" class="m-0 text-xs text-orange">
-						{{ disabledReason(row.option) }}
-					</p>
 				</div>
-				<div class="flex shrink-0 items-center">
+				<div class="flex shrink-0 items-center gap-2">
+					<span
+						v-if="
+							row.option === 'game_options' &&
+							enabled(row.option) &&
+							overviewQuery.data.value?.global_options.game_options
+						"
+						v-tooltip="formatMessage(messages.editGameSettings)"
+						class="flex"
+					>
+						<IconButton
+							type="outlined"
+							circular
+							:label="formatMessage(messages.editGameSettings)"
+							@click="openGameSettings"
+						>
+							<EditIcon />
+						</IconButton>
+					</span>
 					<span v-tooltip="disabledReason(row.option)" class="flex">
 						<Toggle
 							:id="`exclude-${row.option}`"
diff --git a/packages/app-lib/src/api/instance.rs b/packages/app-lib/src/api/instance.rs
index ef49e17ec8..45ce389c09 100644
--- a/packages/app-lib/src/api/instance.rs
+++ b/packages/app-lib/src/api/instance.rs
@@ -27,27 +27,6 @@ pub use self::export_mrpack::{
     PackExportCandidate, create_mrpack_json, export_mrpack,
     get_pack_export_candidates, get_pack_export_candidates_for_parent,
 };
-pub use self::synced_options::game_options::{
-    CanonicalValue as GameOptionCanonicalValue, EditableGameSetting,
-    GameOptionCompatibility, GameOptionCompatibilityBucket,
-    GameOptionCompatibilityReason, GameOptionCompatibilityStatus,
-    GameOptionEditorChoice, GameOptionEditorDefinition, GameOptionKind,
-    GameOptionMappingKind, GameOptionValidationIssue, GameOptionValueState,
-    GameOptionsSourceCandidate, GameOptionsSourceIssue, GameSettingCategory,
-    GameSettingChange, GameSettingsEditorState, SaveGameSettingsResult,
-    UpdateGameSettingsRequest,
-    apply_launcher_overrides as apply_game_options_launcher_overrides,
-    capture_pack_base as capture_game_options_pack_base,
-    get_config as get_synced_game_options_config,
-    list_sync_sources as list_game_options_sync_sources,
-    preview_changes as preview_synced_game_option_changes,
-    save_changes as save_synced_game_option_changes,
-    sync_before_launch as sync_game_options_before_launch,
-};
-pub(crate) use self::synced_options::game_options::{
-    shared_fullscreen_value, sync_all_participating_instances,
-    update_shared_fullscreen_from_app,
-};
 pub use self::get::{get, get_many, list};
 pub use self::groups::{
     FAVORITES_GROUP_ID, InstanceGroup, InstanceGroupMembershipUpdate,
@@ -112,6 +91,27 @@ pub use self::shared::{
     remove_shared_instance_users, revoke_shared_instance_invite,
     unlink_shared_instance, unpublish_shared_instance, update_shared_instance,
 };
+pub use self::synced_options::game_options::{
+    CanonicalValue as GameOptionCanonicalValue, EditableGameSetting,
+    GameOptionCompatibility, GameOptionCompatibilityBucket,
+    GameOptionCompatibilityReason, GameOptionCompatibilityStatus,
+    GameOptionEditorChoice, GameOptionEditorDefinition, GameOptionKind,
+    GameOptionMappingKind, GameOptionValidationIssue, GameOptionValueState,
+    GameOptionsPackSource, GameOptionsSourceCandidate, GameOptionsSourceIssue,
+    GameSettingCategory, GameSettingChange, GameSettingsEditorState,
+    SaveGameSettingsResult, UpdateGameSettingsRequest,
+    apply_launcher_overrides as apply_game_options_launcher_overrides,
+    capture_pack_base as capture_game_options_pack_base,
+    get_config as get_synced_game_options_config,
+    list_sync_sources as list_game_options_sync_sources,
+    preview_changes as preview_synced_game_option_changes,
+    save_changes as save_synced_game_option_changes,
+    sync_before_launch as sync_game_options_before_launch,
+};
+pub(crate) use self::synced_options::game_options::{
+    shared_fullscreen_value, sync_all_participating_instances,
+    update_shared_fullscreen_from_app,
+};
 pub use self::synced_options::{
     GlobalSyncedOptions, SyncedOptionCapability, SyncedOptionJoinAction,
     SyncedOptionJoinPreview, SyncedOptionJoinResolution, SyncedOptionsOverview,
diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/catalog/video.rs b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/video.rs
index 2f1261daef..467ee62615 100644
--- a/packages/app-lib/src/api/instance/synced_options/game_options/catalog/video.rs
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/video.rs
@@ -26,7 +26,7 @@ pub(super) const SETTINGS: &[SupportedSetting] = &[
         &["graphicsPreset", "graphicsMode", "fancyGraphics"],
         version_changes::GRAPHICS_KEYS,
         "video",
-        false,
+        true,
         SettingEditor::Enum(GRAPHICS),
         ValueEncoding::Graphics,
     ),
@@ -67,7 +67,7 @@ pub(super) const SETTINGS: &[SupportedSetting] = &[
         "gui_scale",
         &["guiScale"],
         "video",
-        false,
+        true,
         SettingEditor::Integer {
             min: 0,
             max: 8,
@@ -79,7 +79,7 @@ pub(super) const SETTINGS: &[SupportedSetting] = &[
         "particles",
         &["particles"],
         "video",
-        false,
+        true,
         SettingEditor::Enum(PARTICLES),
         ValueEncoding::Enum(PARTICLES),
     ),
@@ -87,7 +87,7 @@ pub(super) const SETTINGS: &[SupportedSetting] = &[
         "clouds",
         &["renderClouds"],
         "video",
-        false,
+        true,
         SettingEditor::Enum(CLOUDS),
         ValueEncoding::Enum(CLOUDS),
     ),
@@ -111,7 +111,7 @@ pub(super) const SETTINGS: &[SupportedSetting] = &[
         "vsync",
         &["enableVsync"],
         "video",
-        false,
+        true,
         BOOL,
         ValueEncoding::Bool,
     ),
@@ -119,7 +119,7 @@ pub(super) const SETTINGS: &[SupportedSetting] = &[
         "fullscreen",
         &["fullscreen"],
         "video",
-        false,
+        true,
         BOOL,
         ValueEncoding::Bool,
     ),
@@ -127,7 +127,7 @@ pub(super) const SETTINGS: &[SupportedSetting] = &[
         "max_framerate",
         &["maxFps"],
         "video",
-        false,
+        true,
         SettingEditor::Integer {
             min: 10,
             max: 260,
@@ -151,7 +151,7 @@ pub(super) const SETTINGS: &[SupportedSetting] = &[
         "biome_blend_radius",
         &["biomeBlendRadius"],
         "video",
-        false,
+        true,
         SettingEditor::Integer {
             min: 0,
             max: 7,
diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/instance_support.rs b/packages/app-lib/src/api/instance/synced_options/game_options/instance_support.rs
index 0107168443..6550af9fa3 100644
--- a/packages/app-lib/src/api/instance/synced_options/game_options/instance_support.rs
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/instance_support.rs
@@ -3,10 +3,10 @@
 use super::super as synced_options;
 use super::CATALOG_REVISION;
 use super::api_types::*;
+use super::catalog::*;
 use super::options_file::{
     GameOptionsDocument, options_path, read_document, sha1_bytes,
 };
-use super::catalog::*;
 use crate::state::{
     CanonicalValue, InstanceMetadata, State, StoredOption,
     game_options_sync_is_enabled,
diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/launch_overrides.rs b/packages/app-lib/src/api/instance/synced_options/game_options/launch_overrides.rs
index 8a395b7d60..2f3295f88a 100644
--- a/packages/app-lib/src/api/instance/synced_options/game_options/launch_overrides.rs
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/launch_overrides.rs
@@ -3,12 +3,13 @@
 use super::super as synced_options;
 use super::CATALOG_REVISION;
 use super::api_types::SyncReason;
+use super::catalog::setting_by_file_key;
 use super::options_file::{
     GameOptionsDocument, input_error, options_path, read_document, sha1_bytes,
     validate_raw_key_value,
 };
+use super::pack_updates::materialize_yosbr_options_if_missing;
 use super::read_instance_changes::previous_applied_settings;
-use super::catalog::setting_by_file_key;
 use super::write_shared_settings::{
     sync_instance_options, sync_is_active_for_instance,
 };
@@ -36,6 +37,7 @@ pub async fn sync_before_launch(instance_id: &str) -> crate::Result<()> {
     let metadata = crate::state::get_instance(instance_id, &state.pool)
         .await?
         .ok_or_else(|| input_error("Unknown instance"))?;
+    materialize_yosbr_options_if_missing(&metadata, &state).await?;
     if sync_is_active_for_instance(&metadata, &state).await? {
         let _ = sync_instance_options(
             &metadata,
diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/mod.rs b/packages/app-lib/src/api/instance/synced_options/game_options/mod.rs
index c450c7e512..1d4ace410b 100644
--- a/packages/app-lib/src/api/instance/synced_options/game_options/mod.rs
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/mod.rs
@@ -43,7 +43,7 @@ pub use api_types::{
     UpdateGameSettingsRequest,
 };
 pub use launch_overrides::{apply_launcher_overrides, sync_before_launch};
-pub use pack_updates::capture_pack_base;
+pub use pack_updates::{GameOptionsPackSource, capture_pack_base};
 pub use settings_editor::{get_config, preview_changes, save_changes};
 pub use source_selection::list_sync_sources;
 
diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/pack_updates.rs b/packages/app-lib/src/api/instance/synced_options/game_options/pack_updates.rs
index c771672115..5c1cc57d52 100644
--- a/packages/app-lib/src/api/instance/synced_options/game_options/pack_updates.rs
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/pack_updates.rs
@@ -9,6 +9,33 @@ use super::write_shared_settings::{
 use crate::state::{InstanceLink, InstanceMetadata, State, SyncedOption};
 use crate::util::io;
 use encoding_rs::{UTF_8, UTF_16BE, UTF_16LE};
+use std::io::ErrorKind;
+use std::path::Path;
+
+const YOSBR_OPTIONS_PATH: &str = "config/yosbr/options.txt";
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+pub enum GameOptionsPackSource {
+    ClientOverrides,
+    Overrides,
+    ClientOverridesYosbr,
+    OverridesYosbr,
+}
+
+impl GameOptionsPackSource {
+    fn as_str(self) -> &'static str {
+        match self {
+            Self::ClientOverrides | Self::ClientOverridesYosbr => {
+                "client_overrides"
+            }
+            Self::Overrides | Self::OverridesYosbr => "overrides",
+        }
+    }
+
+    fn is_yosbr(self) -> bool {
+        matches!(self, Self::ClientOverridesYosbr | Self::OverridesYosbr)
+    }
+}
 
 fn detected_encoding_name(bytes: &[u8]) -> String {
     if bytes.starts_with(&[0xFF, 0xFE]) {
@@ -41,6 +68,61 @@ fn pack_version_id(metadata: &InstanceMetadata) -> Option<&str> {
     }
 }
 
+async fn read_pack_options(
+    path: &Path,
+    name: &str,
+) -> crate::Result<Option<(Vec<u8>, String, String)>> {
+    let metadata = match tokio::fs::symlink_metadata(path).await {
+        Ok(metadata) => metadata,
+        Err(error) if error.kind() == ErrorKind::NotFound => return Ok(None),
+        Err(error) => return Err(io::IOError::with_path(error, path).into()),
+    };
+    if metadata.file_type().is_symlink() {
+        return Err(input_error(format!(
+            "Refusing to capture a symlinked {name}"
+        )));
+    }
+    if metadata.len() > MAX_OPTIONS_BYTES as u64 {
+        return Err(input_error(format!(
+            "The modpack {name} is too large to capture for syncing"
+        )));
+    }
+    let bytes = io::read(path).await?;
+    let sha1 = sha1_bytes(&bytes);
+    let encoding = detected_encoding_name(&bytes);
+    Ok(Some((bytes, sha1, encoding)))
+}
+
+async fn options_target_exists(path: &Path) -> crate::Result<bool> {
+    match tokio::fs::symlink_metadata(path).await {
+        Ok(metadata) if metadata.file_type().is_symlink() => {
+            Err(input_error("Refusing to replace a symlinked options.txt"))
+        }
+        Ok(_) => Ok(true),
+        Err(error) if error.kind() == ErrorKind::NotFound => Ok(false),
+        Err(error) => Err(io::IOError::with_path(error, path).into()),
+    }
+}
+
+pub(super) async fn materialize_yosbr_options_if_missing(
+    metadata: &InstanceMetadata,
+    state: &State,
+) -> crate::Result<()> {
+    let path = options_path(metadata, state);
+    if options_target_exists(&path).await? {
+        return Ok(());
+    }
+    let template_path =
+        super::super::instance_dir(metadata, state).join(YOSBR_OPTIONS_PATH);
+    let Some((bytes, _, _)) =
+        read_pack_options(&template_path, "YOSBR options.txt").await?
+    else {
+        return Ok(());
+    };
+    io::write(&path, bytes).await?;
+    Ok(())
+}
+
 pub(in crate::api::instance) async fn detach_instance(
     metadata: &InstanceMetadata,
     state: &State,
@@ -123,11 +205,8 @@ pub(in crate::api::instance) async fn prepare_instance_update_with_state(
 /// shared settings.
 pub async fn capture_pack_base(
     instance_id: &str,
-    source: Option<&str>,
+    source: Option<GameOptionsPackSource>,
 ) -> crate::Result<()> {
-    if !matches!(source, None | Some("client_overrides") | Some("overrides")) {
-        return Err(input_error("Unknown modpack options.txt source"));
-    }
     let state = State::get().await?;
     let _guard = state.lock_synced_options().await;
     let metadata = crate::state::get_instance(instance_id, &state.pool)
@@ -168,28 +247,28 @@ pub async fn capture_pack_base(
         }
     }
 
-    let (document_bytes, sha1, encoding) = if path.exists() {
-        let file_metadata = tokio::fs::symlink_metadata(&path)
-            .await
-            .map_err(|error| io::IOError::with_path(error, &path))?;
-        if file_metadata.file_type().is_symlink() {
-            return Err(input_error(
-                "Refusing to capture a symlinked options.txt",
-            ));
-        }
-        let bytes = io::read(&path).await?;
-        if bytes.len() > MAX_OPTIONS_BYTES {
-            return Err(input_error(
-                "The modpack options.txt is too large to capture for syncing",
-            ));
+    let captured = if source.is_some_and(GameOptionsPackSource::is_yosbr) {
+        let template_path = super::super::instance_dir(&metadata, &state)
+            .join(YOSBR_OPTIONS_PATH);
+        let template = read_pack_options(&template_path, "YOSBR options.txt")
+            .await?
+            .ok_or_else(|| {
+                input_error("The modpack YOSBR options.txt is missing")
+            })?;
+        if !options_target_exists(&path).await? {
+            io::write(&path, template.0.clone()).await?;
         }
-        let sha1 = sha1_bytes(&bytes);
-        let encoding = detected_encoding_name(&bytes);
-        (Some(bytes), Some(sha1), Some(encoding))
+        Some(template)
     } else {
-        (None, None, None)
+        read_pack_options(&path, "options.txt").await?
     };
-    let source_name = source.unwrap_or("none");
+    let (document_bytes, sha1, encoding) = captured
+        .map(|(document, sha1, encoding)| {
+            (Some(document), Some(sha1), Some(encoding))
+        })
+        .unwrap_or((None, None, None));
+    let source_name =
+        source.map(GameOptionsPackSource::as_str).unwrap_or("none");
     let version_id = pack_version_id(&metadata);
     sqlx::query!(
         "
diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/read_instance_changes.rs b/packages/app-lib/src/api/instance/synced_options/game_options/read_instance_changes.rs
index 970944821f..f05f641f99 100644
--- a/packages/app-lib/src/api/instance/synced_options/game_options/read_instance_changes.rs
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/read_instance_changes.rs
@@ -3,10 +3,10 @@
 use super::super as synced_options;
 use super::CATALOG_REVISION;
 use super::api_types::canonical_values_equal;
+use super::catalog::*;
 use super::fullscreen::update_app_fullscreen_setting;
 use super::launch_overrides::currently_launcher_owned_keys;
 use super::options_file::{GameOptionsDocument, validate_raw_key_value};
-use super::catalog::*;
 use crate::state::{
     CanonicalValue, GameOptionKind, GameOptionsProjection, InstanceMetadata,
     ProjectionOrigin, State, SyncedOption, load_game_option_preferences,
diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/settings_editor.rs b/packages/app-lib/src/api/instance/synced_options/game_options/settings_editor.rs
index 285b5147c6..94d15b3d08 100644
--- a/packages/app-lib/src/api/instance/synced_options/game_options/settings_editor.rs
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/settings_editor.rs
@@ -2,13 +2,13 @@
 
 use super::CATALOG_REVISION;
 use super::api_types::*;
+use super::catalog::*;
 use super::fullscreen::update_app_fullscreen_setting;
 use super::instance_support::{
     describe_instance_support, find_common_local_value,
     load_participating_instances, summary_revision,
 };
 use super::options_file::input_error;
-use super::catalog::*;
 use super::write_shared_settings::sync_all_participating_instances;
 use crate::state::{
     CanonicalValue, GameOptionKind, State, StoredOption,
diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/source_selection.rs b/packages/app-lib/src/api/instance/synced_options/game_options/source_selection.rs
index 108d08e634..9559aefa76 100644
--- a/packages/app-lib/src/api/instance/synced_options/game_options/source_selection.rs
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/source_selection.rs
@@ -3,6 +3,7 @@
 use super::super as synced_options;
 use super::CATALOG_REVISION;
 use super::api_types::{GameOptionsSourceCandidate, GameOptionsSourceIssue};
+use super::catalog::*;
 use super::fullscreen::update_app_fullscreen_setting;
 use super::launch_overrides::currently_launcher_owned_keys;
 use super::options_file::{
@@ -12,7 +13,6 @@ use super::options_file::{
 use super::read_instance_changes::{
     custom_setting_id, launcher_keys_for_document,
 };
-use super::catalog::*;
 use crate::state::{
     CanonicalValue, InstanceMetadata, State, load_game_option_preferences,
     load_game_options_sync_state, load_shared_game_options,
diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/write_shared_settings.rs b/packages/app-lib/src/api/instance/synced_options/game_options/write_shared_settings.rs
index f482fcce60..8e24568a61 100644
--- a/packages/app-lib/src/api/instance/synced_options/game_options/write_shared_settings.rs
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/write_shared_settings.rs
@@ -5,14 +5,15 @@ use super::CATALOG_REVISION;
 use super::api_types::{
     GameOptionMappingKind, SaveGameSettingsResult, SyncOutcome, SyncReason,
 };
+use super::catalog::*;
 use super::options_file::{
     GameOptionsDocument, options_path, read_document, sha1_bytes,
 };
+use super::pack_updates::materialize_yosbr_options_if_missing;
 use super::read_instance_changes::{
     discover_custom_settings, previous_applied_settings,
     read_instance_changes_into_shared_settings,
 };
-use super::catalog::*;
 use crate::state::{
     CanonicalValue, GameOptionsProjection, InstanceMetadata, ProjectedField,
     ProjectionOrigin, State, SyncedOption, game_options_sync_is_enabled,
@@ -35,6 +36,7 @@ pub(super) async fn sync_is_active_for_instance(
 pub(super) async fn apply_shared_settings_to_document(
     metadata: &InstanceMetadata,
     document: &mut GameOptionsDocument,
+    add_missing_keys: bool,
     state: &State,
 ) -> crate::Result<Vec<ProjectedField>> {
     let values = load_shared_game_options(&state.pool).await?;
@@ -72,12 +74,29 @@ pub(super) async fn apply_shared_settings_to_document(
         {
             continue;
         }
-        let Some(key) = target_physical_key(
-            definition,
-            stored,
-            document,
-            &metadata.applied_content_set.game_version,
-        ) else {
+        let target_version = &metadata.applied_content_set.game_version;
+        let key =
+            target_physical_key(definition, stored, document, target_version)
+                .or_else(|| {
+                    if !add_missing_keys {
+                        return None;
+                    }
+                    definition.and_then(|definition| {
+                        if definition.versioned_keys.is_empty() {
+                            definition
+                                .keys
+                                .first()
+                                .map(|key| (*key).to_string())
+                        } else {
+                            physical_variant_for_version(
+                                definition,
+                                target_version,
+                            )
+                            .map(|variant| variant.key.to_string())
+                        }
+                    })
+                });
+        let Some(key) = key else {
             continue;
         };
         let migrated = definition.is_some_and(|definition| {
@@ -137,10 +156,19 @@ pub(super) async fn sync_instance_options(
         return Ok(SyncOutcome::Deferred);
     }
     let path = options_path(metadata, state);
-    if !path.exists() {
-        return Ok(SyncOutcome::WaitingForFile);
+    let file_was_missing = !path.exists();
+    if file_was_missing && reason != SyncReason::BeforePackUpdate {
+        materialize_yosbr_options_if_missing(metadata, state).await?;
     }
-    let (mut document, input_bytes) = read_document(&path).await?;
+    let creating_empty_document =
+        !path.exists() && reason != SyncReason::BeforePackUpdate;
+    let (mut document, input_bytes) = if path.exists() {
+        read_document(&path).await?
+    } else if creating_empty_document {
+        (GameOptionsDocument::empty(), Vec::new())
+    } else {
+        return Ok(SyncOutcome::WaitingForFile);
+    };
     let input_sha1 = sha1_bytes(&input_bytes);
     let checkpoint = synced_options::checkpoint(
         &metadata.instance.id,
@@ -153,6 +181,7 @@ pub(super) async fn sync_instance_options(
         previous_applied_settings(checkpoint.merge_base.as_deref())
     });
     let should_publish = allow_publish
+        && !file_was_missing
         && reason != SyncReason::PackExtracted
         && checkpoint.as_ref().is_none_or(|checkpoint| {
             match checkpoint.status {
@@ -175,7 +204,10 @@ pub(super) async fn sync_instance_options(
             state,
         )
         .await?
-    } else if allow_publish && reason != SyncReason::PackExtracted {
+    } else if allow_publish
+        && !file_was_missing
+        && reason != SyncReason::PackExtracted
+    {
         let launcher_keys = prior_projection
             .as_ref()
             .into_iter()
@@ -199,9 +231,13 @@ pub(super) async fn sync_instance_options(
         return Ok(SyncOutcome::Unchanged);
     }
 
-    let fields =
-        apply_shared_settings_to_document(metadata, &mut document, state)
-            .await?;
+    let fields = apply_shared_settings_to_document(
+        metadata,
+        &mut document,
+        creating_empty_document,
+        state,
+    )
+    .await?;
     let used_migration = fields.iter().any(|field| {
         field.migrated
             || setting_by_id(&field.option_id).is_some_and(|definition| {
@@ -246,7 +282,7 @@ pub(super) async fn sync_instance_options(
         state,
     )
     .await?;
-    let changed = output_bytes != input_bytes;
+    let changed = file_was_missing || output_bytes != input_bytes;
     if changed {
         io::write(&path, output_bytes).await?;
     }
diff --git a/packages/app-lib/src/api/instance/synced_options/orchestration.rs b/packages/app-lib/src/api/instance/synced_options/orchestration.rs
index 97ab21728d..6af1c03545 100644
--- a/packages/app-lib/src/api/instance/synced_options/orchestration.rs
+++ b/packages/app-lib/src/api/instance/synced_options/orchestration.rs
@@ -302,12 +302,15 @@ pub async fn set_global_option(
     let _guard = state.lock_synced_options().await;
     let was_enabled = get_global_options_with_state(&state).await?.get(option);
 
-    if enabled && !was_enabled && option != SyncedOption::Screenshots {
-        let base_instance_id = base_instance_id.ok_or_else(|| {
-            ErrorKind::InputError(
-                "Choose an instance to use as the sync source.".to_string(),
-            )
-        })?;
+    let initializing_game_options_from_base = enabled
+        && !was_enabled
+        && option == SyncedOption::GameOptions
+        && base_instance_id.is_some();
+    if enabled
+        && !was_enabled
+        && option != SyncedOption::Screenshots
+        && let Some(base_instance_id) = base_instance_id
+    {
         if option == SyncedOption::GameOptions {
             let source =
                 crate::state::get_instance(base_instance_id, &state.pool)
@@ -344,7 +347,7 @@ pub async fn set_global_option(
         }
     }
 
-    if !(enabled && !was_enabled && option == SyncedOption::GameOptions) {
+    if !initializing_game_options_from_base {
         set_global_option_enabled(option, enabled, &state).await?;
     }
 
@@ -827,12 +830,12 @@ async fn reconcile_instance_with_state(
             CapabilityStatus::Supported => {
                 let result =
                     if option == SyncedOption::GameOptions && allow_protected {
-                        super::game_options::sync_instance_with_state(
-                        metadata,
-                        state,
-                        super::game_options::SyncReason::PackExtracted,
-                    )
-                    .await
+                        reconcile_game_options(
+                            metadata,
+                            state,
+                            super::game_options::SyncReason::PackExtracted,
+                        )
+                        .await
                     } else {
                         reconcile_option(metadata, option, state).await
                     };
@@ -863,7 +866,7 @@ async fn reconcile_option(
 ) -> crate::Result<()> {
     match option {
         SyncedOption::GameOptions => {
-            super::game_options::sync_instance_with_state(
+            reconcile_game_options(
                 metadata,
                 state,
                 super::game_options::SyncReason::Normal,
@@ -883,6 +886,21 @@ async fn reconcile_option(
     }
 }
 
+async fn reconcile_game_options(
+    metadata: &InstanceMetadata,
+    state: &State,
+    reason: super::game_options::SyncReason,
+) -> crate::Result<()> {
+    if !canonical_exists(SyncedOption::GameOptions, state).await? {
+        let source = instance_dir(metadata, state).join("options.txt");
+        if !source.exists() {
+            return Ok(());
+        }
+        seed_from_instance(metadata, SyncedOption::GameOptions, state).await?;
+    }
+    super::game_options::sync_instance_with_state(metadata, state, reason).await
+}
+
 pub async fn reconcile_changed_file(
     instance_id: &str,
     file_name: &str,
@@ -900,7 +918,7 @@ pub async fn reconcile_changed_file(
             if option_effective(&metadata, SyncedOption::GameOptions, &state)
                 .await?
             {
-                super::game_options::sync_instance_with_state(
+                reconcile_game_options(
                     &metadata,
                     &state,
                     super::game_options::SyncReason::Normal,
diff --git a/packages/app-lib/src/api/pack/install_mrpack.rs b/packages/app-lib/src/api/pack/install_mrpack.rs
index 0d2f1072a3..b3f981496e 100644
--- a/packages/app-lib/src/api/pack/install_mrpack.rs
+++ b/packages/app-lib/src/api/pack/install_mrpack.rs
@@ -1,5 +1,6 @@
 use crate::State;
 use crate::api::instance::CONFIG_FILE_EXTENSIONS;
+use crate::api::instance::GameOptionsPackSource;
 use crate::event::emit::loading_try_for_each_concurrent;
 use crate::install::{
     InstallErrorContext, InstallJobEventKind, InstallPhaseDetails,
@@ -955,11 +956,19 @@ pub(crate) async fn install_zipped_mrpack_files_with_reporter(
     )
     .await?;
 
+    let has_override =
+        |path: &str| {
+            zip_reader.file().entries().iter().any(|file| {
+                file.filename().as_str().unwrap_or_default() == path
+            })
+        };
     let has_client_options_override =
-        zip_reader.file().entries().iter().any(|file| {
-            file.filename().as_str().unwrap_or_default()
-                == "client-overrides/options.txt"
-        });
+        has_override("client-overrides/options.txt");
+    let has_options_override = has_override("overrides/options.txt");
+    let has_client_yosbr_options_override =
+        has_override("client-overrides/config/yosbr/options.txt");
+    let has_yosbr_options_override =
+        has_override("overrides/config/yosbr/options.txt");
     let override_file_entries = zip_reader
         .file()
         .entries()
@@ -972,7 +981,9 @@ pub(crate) async fn install_zipped_mrpack_files_with_reporter(
                 && !filename.ends_with('/');
             let shadowed_game_options = has_client_options_override
                 && filename == "overrides/options.txt";
-            (is_override && !shadowed_game_options)
+            let shadowed_yosbr_options = has_client_yosbr_options_override
+                && filename == "overrides/config/yosbr/options.txt";
+            (is_override && !shadowed_game_options && !shadowed_yosbr_options)
                 .then(|| (index, file.clone()))
         })
         .collect::<Vec<_>>();
@@ -986,11 +997,13 @@ pub(crate) async fn install_zipped_mrpack_files_with_reporter(
             || filename == "client-overrides/servers.dat"
     });
     let game_options_override_source = if has_client_options_override {
-        Some("client_overrides")
-    } else if override_file_entries.iter().any(|(_, file)| {
-        file.filename().as_str().unwrap_or_default() == "overrides/options.txt"
-    }) {
-        Some("overrides")
+        Some(GameOptionsPackSource::ClientOverrides)
+    } else if has_options_override {
+        Some(GameOptionsPackSource::Overrides)
+    } else if has_client_yosbr_options_override {
+        Some(GameOptionsPackSource::ClientOverridesYosbr)
+    } else if has_yosbr_options_override {
+        Some(GameOptionsPackSource::OverridesYosbr)
     } else {
         None
     };
diff --git a/packages/app-lib/src/install/runner.rs b/packages/app-lib/src/install/runner.rs
index 54eabb0288..2add5d541a 100644
--- a/packages/app-lib/src/install/runner.rs
+++ b/packages/app-lib/src/install/runner.rs
@@ -693,6 +693,16 @@ async fn run_job(job_id: Uuid) -> crate::Result<()> {
             if let Some(record) =
                 store::complete_success(job_id, &job_state, &state).await?
             {
+                if let Err(error) =
+                    crate::api::instance::reconcile_instance_synced_options(
+                        &instance_id,
+                    )
+                    .await
+                {
+                    tracing::warn!(
+                        "Failed to reconcile synced options after installing {instance_id}: {error}"
+                    );
+                }
                 recovery::clear_staging_dir(&job_state).await;
                 if let Err(error) =
                     emit_instance(&instance_id, InstancePayloadType::Edited)
diff --git a/packages/app-lib/src/launcher/mod.rs b/packages/app-lib/src/launcher/mod.rs
index 1bb0fa0c83..060cfefec8 100644
--- a/packages/app-lib/src/launcher/mod.rs
+++ b/packages/app-lib/src/launcher/mod.rs
@@ -671,6 +671,17 @@ pub async fn install_minecraft_with_reporter(
 			&state.pool,
 		)
 		.await?;
+		if let Err(error) =
+			crate::api::instance::reconcile_instance_synced_options(
+				&instance.id,
+			)
+			.await
+		{
+			tracing::warn!(
+				"Failed to reconcile synced options after installing {}: {error}",
+				instance.id
+			);
+		}
 		emit_instance(&instance.id, InstancePayloadType::Edited).await?;
 	}
     if let Some(loading_bar) = &loading_bar {

From 037f41ec18f7e056876e573f3c1ddd22a5eaba56 Mon Sep 17 00:00:00 2001
From: "Calum H. (IMB11)" <contact@cal.engineer>
Date: Tue, 1 Sep 2026 21:20:02 +0100
Subject: [PATCH 09/33] fix: qa

---
 .../game-settings/GameSettingRow.vue          |  16 +-
 .../game-settings/GameSettingsModal.vue       |  47 +-
 apps/app-frontend/src/helpers/game-options.ts |  26 ++
 .../synced-options-settings.vue               |  19 +-
 apps/app/build.rs                             |   3 +
 apps/app/src/api/instance.rs                  |  38 ++
 packages/app-lib/src/api/instance.rs          |   3 +
 .../game_options/local_settings_editor.rs     | 429 ++++++++++++++++++
 .../synced_options/game_options/mod.rs        |   6 +
 9 files changed, 569 insertions(+), 18 deletions(-)
 create mode 100644 packages/app-lib/src/api/instance/synced_options/game_options/local_settings_editor.rs

diff --git a/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingRow.vue b/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingRow.vue
index ac8547a22f..dda6a1aa7c 100644
--- a/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingRow.vue
+++ b/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingRow.vue
@@ -35,10 +35,12 @@ const props = withDefaults(
 		setting: EditableGameSetting
 		keybindConflicts?: string[]
 		disabled?: boolean
+		showSyncToggle?: boolean
 	}>(),
 	{
 		keybindConflicts: () => [],
 		disabled: false,
+		showSyncToggle: true,
 	},
 )
 
@@ -124,7 +126,10 @@ const sliderValue = computed(() => {
 	return Number.isFinite(value) ? value : (inputMin.value ?? 0)
 })
 const editorDisabled = computed(
-	() => props.disabled || props.setting.controlled || !props.setting.sync_enabled,
+	() =>
+		props.disabled ||
+		props.setting.controlled ||
+		(props.showSyncToggle && !props.setting.sync_enabled),
 )
 const syncToggleDisabled = computed(
 	() =>
@@ -186,8 +191,12 @@ function updateValue(value: string | number | boolean | undefined) {
 		class="grid min-w-0 items-center gap-3 py-3"
 		:class="
 			isVolumeSlider
-				? 'grid-cols-[minmax(10rem,0.65fr)_minmax(0,1.35fr)_4rem]'
-				: 'grid-cols-[minmax(0,1fr)_12rem_4rem]'
+				? showSyncToggle
+					? 'grid-cols-[minmax(10rem,0.65fr)_minmax(0,1.35fr)_4rem]'
+					: 'grid-cols-[minmax(10rem,0.65fr)_minmax(0,1.35fr)]'
+				: showSyncToggle
+					? 'grid-cols-[minmax(0,1fr)_12rem_4rem]'
+					: 'grid-cols-[minmax(0,1fr)_12rem]'
 		"
 	>
 		<div class="min-w-0">
@@ -279,6 +288,7 @@ function updateValue(value: string | number | boolean | undefined) {
 		</div>
 
 		<span
+			v-if="showSyncToggle"
 			v-tooltip="syncToggleDisabled ? syncDisabledReason : undefined"
 			class="flex justify-center"
 		>
diff --git a/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingsModal.vue b/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingsModal.vue
index 31dd2cb941..a7a9f80683 100644
--- a/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingsModal.vue
+++ b/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingsModal.vue
@@ -39,8 +39,11 @@ import {
 	type GameOptionCanonicalValue,
 	type GameSettingCategory,
 	type GameSettingsEditorState,
+	get_local_game_options_config,
 	get_synced_game_options_config,
+	preview_local_game_option_changes,
 	preview_synced_game_option_changes,
+	save_local_game_option_changes,
 	save_synced_game_option_changes,
 	type UpdateGameSettingsRequest,
 } from '@/helpers/game-options'
@@ -60,6 +63,10 @@ import {
 } from './game-setting-messages'
 import GameSettingRow from './GameSettingRow.vue'
 
+const props = defineProps<{
+	instanceId?: string
+}>()
+
 const emit = defineEmits<{
 	saved: []
 }>()
@@ -183,6 +190,8 @@ let previewTimer: ReturnType<typeof setTimeout> | null = null
 let previewGeneration = 0
 let loadGeneration = 0
 
+const isLocalEditor = computed(() => !!props.instanceId)
+
 const categoryIcons: Record<string, Component> = {
 	skin_customization: ShirtIcon,
 	video: MonitorIcon,
@@ -246,8 +255,10 @@ const categorySettings = computed(() => {
 			).includes(query)
 		)
 			return false
-		if (selectionFilter.value === 'on' && !setting.sync_enabled) return false
-		if (selectionFilter.value === 'off' && setting.sync_enabled) return false
+		if (!isLocalEditor.value && selectionFilter.value === 'on' && !setting.sync_enabled)
+			return false
+		if (!isLocalEditor.value && selectionFilter.value === 'off' && setting.sync_enabled)
+			return false
 		return true
 	})
 })
@@ -289,7 +300,7 @@ const hasBlockingDraft = computed(
 		draftState.value?.settings.some(
 			(setting) =>
 				dirtyOptionIds.value.has(setting.option_id) &&
-				setting.sync_enabled &&
+				(isLocalEditor.value || setting.sync_enabled) &&
 				(!!setting.validation_error || ['mixed', 'unset', 'invalid'].includes(setting.value_state)),
 		) ?? false,
 )
@@ -333,7 +344,9 @@ async function load() {
 	loadError.value = false
 	previewError.value = false
 	try {
-		const state = await get_synced_game_options_config()
+		const state = props.instanceId
+			? await get_local_game_options_config(props.instanceId)
+			: await get_synced_game_options_config()
 		if (generation !== loadGeneration) return
 		baseState.value = cloneGameSettingsState(state)
 		draftState.value = cloneGameSettingsState(state)
@@ -527,7 +540,9 @@ async function preview() {
 
 	const generation = ++previewGeneration
 	try {
-		const previewState = await preview_synced_game_option_changes(request)
+		const previewState = props.instanceId
+			? await preview_local_game_option_changes(props.instanceId, request)
+			: await preview_synced_game_option_changes(request)
 		if (generation !== previewGeneration) return
 		mergePreview(previewState)
 		previewError.value = false
@@ -545,9 +560,15 @@ async function save() {
 	previewGeneration++
 	saving.value = true
 	try {
-		const result = await save_synced_game_option_changes(request)
+		const result = props.instanceId
+			? await save_local_game_option_changes(props.instanceId, request)
+			: await save_synced_game_option_changes(request)
 		if (result.conflicts?.length) {
-			const refreshed = result.state ?? (await get_synced_game_options_config())
+			const refreshed =
+				result.state ??
+				(props.instanceId
+					? await get_local_game_options_config(props.instanceId)
+					: await get_synced_game_options_config())
 			const previousDraft = draftState.value
 			const stagedChanges = new Map(request.changes.map((change) => [change.option_id, change]))
 			const conflicts = new Set(result.conflicts)
@@ -597,7 +618,11 @@ async function save() {
 						: messages.savedSummary,
 			),
 		})
-		const refreshed = result.state ?? (await get_synced_game_options_config())
+		const refreshed =
+			result.state ??
+			(props.instanceId
+				? await get_local_game_options_config(props.instanceId)
+				: await get_synced_game_options_config())
 		baseState.value = cloneGameSettingsState(refreshed)
 		draftState.value = cloneGameSettingsState(refreshed)
 		touchedValueOptionIds.value = new Set()
@@ -645,7 +670,10 @@ defineExpose({ show, hide })
 
 		<template #content>
 			<div class="flex min-h-full min-w-0 flex-col">
-				<div class="flex shrink-0 flex-wrap items-center justify-between gap-3 pb-3 pt-2">
+				<div
+					v-if="!isLocalEditor"
+					class="flex shrink-0 flex-wrap items-center justify-between gap-3 pb-3 pt-2"
+				>
 					<div class="flex items-center gap-2">
 						<FilterIcon class="size-5 shrink-0 text-secondary" aria-hidden="true" />
 						<Tabs :value="selectionFilter" :tabs="filterTabs" @update:value="setSelectionFilter" />
@@ -708,6 +736,7 @@ defineExpose({ show, hide })
 						:setting="setting"
 						:keybind-conflicts="keybindConflicts.get(setting.option_id)"
 						:disabled="saving"
+						:show-sync-toggle="!isLocalEditor"
 						@update:sync-enabled="setSyncEnabled(setting.option_id, $event)"
 						@update:canonical-value="setCanonicalValue(setting.option_id, $event)"
 					/>
diff --git a/apps/app-frontend/src/helpers/game-options.ts b/apps/app-frontend/src/helpers/game-options.ts
index 5482231dde..9c9c692bc8 100644
--- a/apps/app-frontend/src/helpers/game-options.ts
+++ b/apps/app-frontend/src/helpers/game-options.ts
@@ -174,3 +174,29 @@ export async function save_synced_game_option_changes(
 ): Promise<SaveGameSettingsResult> {
 	return await invoke('plugin:instance|instance_save_synced_game_option_changes', { request })
 }
+
+export async function get_local_game_options_config(
+	instanceId: string,
+): Promise<GameSettingsEditorState> {
+	return await invoke('plugin:instance|instance_get_local_game_options_config', { instanceId })
+}
+
+export async function preview_local_game_option_changes(
+	instanceId: string,
+	request: UpdateGameSettingsRequest,
+): Promise<GameSettingsEditorState> {
+	return await invoke('plugin:instance|instance_preview_local_game_option_changes', {
+		instanceId,
+		request,
+	})
+}
+
+export async function save_local_game_option_changes(
+	instanceId: string,
+	request: UpdateGameSettingsRequest,
+): Promise<SaveGameSettingsResult> {
+	return await invoke('plugin:instance|instance_save_local_game_option_changes', {
+		instanceId,
+		request,
+	})
+}
diff --git a/apps/app-frontend/src/pages/instance/components/settings-modal/synced-options-settings.vue b/apps/app-frontend/src/pages/instance/components/settings-modal/synced-options-settings.vue
index d48d8a924a..c433a3dc13 100644
--- a/apps/app-frontend/src/pages/instance/components/settings-modal/synced-options-settings.vue
+++ b/apps/app-frontend/src/pages/instance/components/settings-modal/synced-options-settings.vue
@@ -175,6 +175,12 @@ const hotbarResolutionModal = ref<InstanceType<typeof NewModal> | null>(null)
 const previewingOption = ref<InstanceSyncedOption | null>(null)
 const previewExcluded = ref<Partial<Record<InstanceSyncedOption, boolean>>>({})
 
+const gameSettingsInstanceId = computed(() =>
+	overviewQuery.data.value?.global_options.game_options && enabled('game_options')
+		? undefined
+		: instance.value.id,
+)
+
 function excluded(option: InstanceSyncedOption): boolean {
 	const preview = previewExcluded.value[option]
 	if (preview !== undefined) return preview
@@ -347,7 +353,11 @@ function resolveHotbars(resolution: SyncedOptionJoinResolution) {
 
 <template>
 	<div class="flex flex-col gap-6">
-		<GameSettingsModal ref="gameSettingsModal" @saved="handleGameSettingsSaved" />
+		<GameSettingsModal
+			ref="gameSettingsModal"
+			:instance-id="gameSettingsInstanceId"
+			@saved="handleGameSettingsSaved"
+		/>
 
 		<NewModal
 			ref="hotbarResolutionModal"
@@ -422,17 +432,14 @@ function resolveHotbars(resolution: SyncedOptionJoinResolution) {
 				</div>
 				<div class="flex shrink-0 items-center gap-2">
 					<span
-						v-if="
-							row.option === 'game_options' &&
-							enabled(row.option) &&
-							overviewQuery.data.value?.global_options.game_options
-						"
+						v-if="row.option === 'game_options'"
 						v-tooltip="formatMessage(messages.editGameSettings)"
 						class="flex"
 					>
 						<IconButton
 							type="outlined"
 							circular
+							:disabled="mutation.isPending.value || overviewQuery.isPending.value"
 							:label="formatMessage(messages.editGameSettings)"
 							@click="openGameSettings"
 						>
diff --git a/apps/app/build.rs b/apps/app/build.rs
index 443e22191c..46c2d2ef8f 100644
--- a/apps/app/build.rs
+++ b/apps/app/build.rs
@@ -241,6 +241,9 @@ fn main() {
                         "instance_get_synced_game_options_config",
                         "instance_preview_synced_game_option_changes",
                         "instance_save_synced_game_option_changes",
+                        "instance_get_local_game_options_config",
+                        "instance_preview_local_game_option_changes",
+                        "instance_save_local_game_option_changes",
                         "instance_get_command_history",
                         "instance_set_command_history",
                         "instance_open_synced_options_folder",
diff --git a/apps/app/src/api/instance.rs b/apps/app/src/api/instance.rs
index c6dbf7f084..7273247f73 100644
--- a/apps/app/src/api/instance.rs
+++ b/apps/app/src/api/instance.rs
@@ -70,6 +70,9 @@ pub fn init<R: tauri::Runtime>() -> tauri::plugin::TauriPlugin<R> {
             instance_get_synced_game_options_config,
             instance_preview_synced_game_option_changes,
             instance_save_synced_game_option_changes,
+            instance_get_local_game_options_config,
+            instance_preview_local_game_option_changes,
+            instance_save_local_game_option_changes,
             instance_get_command_history,
             instance_set_command_history,
             instance_open_synced_options_folder,
@@ -884,6 +887,41 @@ pub async fn instance_save_synced_game_option_changes(
     Ok(theseus::instance::save_synced_game_option_changes(request).await?)
 }
 
+#[tauri::command]
+pub async fn instance_get_local_game_options_config(
+    instance_id: &str,
+) -> Result<theseus::instance::GameSettingsEditorState> {
+    Ok(theseus::instance::get_local_game_options_config(instance_id).await?)
+}
+
+#[tauri::command]
+pub async fn instance_preview_local_game_option_changes(
+    instance_id: &str,
+    request: theseus::instance::UpdateGameSettingsRequest,
+) -> Result<theseus::instance::GameSettingsEditorState> {
+    Ok(
+        theseus::instance::preview_local_game_option_changes(
+            instance_id,
+            request,
+        )
+        .await?,
+    )
+}
+
+#[tauri::command]
+pub async fn instance_save_local_game_option_changes(
+    instance_id: &str,
+    request: theseus::instance::UpdateGameSettingsRequest,
+) -> Result<theseus::instance::SaveGameSettingsResult> {
+    Ok(
+        theseus::instance::save_local_game_option_changes(
+            instance_id,
+            request,
+        )
+        .await?,
+    )
+}
+
 #[tauri::command]
 pub async fn instance_get_command_history() -> Result<String> {
     Ok(theseus::instance::get_command_history().await?)
diff --git a/packages/app-lib/src/api/instance.rs b/packages/app-lib/src/api/instance.rs
index 45ce389c09..7b7f198c07 100644
--- a/packages/app-lib/src/api/instance.rs
+++ b/packages/app-lib/src/api/instance.rs
@@ -103,8 +103,11 @@ pub use self::synced_options::game_options::{
     apply_launcher_overrides as apply_game_options_launcher_overrides,
     capture_pack_base as capture_game_options_pack_base,
     get_config as get_synced_game_options_config,
+    get_local_config as get_local_game_options_config,
     list_sync_sources as list_game_options_sync_sources,
+    preview_local_changes as preview_local_game_option_changes,
     preview_changes as preview_synced_game_option_changes,
+    save_local_changes as save_local_game_option_changes,
     save_changes as save_synced_game_option_changes,
     sync_before_launch as sync_game_options_before_launch,
 };
diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/local_settings_editor.rs b/packages/app-lib/src/api/instance/synced_options/game_options/local_settings_editor.rs
new file mode 100644
index 0000000000..d66434c5f1
--- /dev/null
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/local_settings_editor.rs
@@ -0,0 +1,429 @@
+//! Loads and saves the game settings stored by one unsynced instance.
+
+use super::super as synced_options;
+use super::CATALOG_REVISION;
+use super::api_types::*;
+use super::catalog::*;
+use super::launch_overrides::currently_launcher_owned_keys;
+use super::options_file::{
+    GameOptionsDocument, input_error, options_path, read_document, sha1_bytes,
+    validate_raw_key_value,
+};
+use super::read_instance_changes::custom_setting_id;
+use crate::state::{CanonicalValue, GameOptionKind, InstanceMetadata, State};
+use crate::util::io;
+use std::collections::HashSet;
+
+fn compatibility(controlled: bool) -> GameOptionCompatibility {
+    if controlled {
+        GameOptionCompatibility {
+            total_participating: 1,
+            will_receive: 0,
+            write_now: 0,
+            left_local: 1,
+            buckets: vec![GameOptionCompatibilityBucket {
+                instance_count: 1,
+                write_keys: Vec::new(),
+                eventual_keys: Vec::new(),
+                game_versions: Vec::new(),
+                status: GameOptionCompatibilityStatus::Controlled,
+                mapping: None,
+                reason: Some(
+                    GameOptionCompatibilityReason::LauncherControlled,
+                ),
+            }],
+        }
+    } else {
+        GameOptionCompatibility {
+            total_participating: 1,
+            will_receive: 1,
+            write_now: 1,
+            left_local: 0,
+            buckets: Vec::new(),
+        }
+    }
+}
+
+fn categories(settings: &[EditableGameSetting]) -> Vec<GameSettingCategory> {
+    [
+        "skin_customization",
+        "video",
+        "language",
+        "music_and_sound",
+        "controls",
+        "chat",
+        "accessibility",
+        "online",
+        "custom",
+    ]
+    .into_iter()
+    .filter(|id| settings.iter().any(|setting| setting.category_id == *id))
+    .map(|id| GameSettingCategory {
+        id: id.to_string(),
+        is_custom: id == "custom",
+    })
+    .collect()
+}
+
+fn editor_revision(metadata: &InstanceMetadata, input_bytes: &[u8]) -> String {
+    sha1_bytes(
+        format!(
+            "{CATALOG_REVISION}:{}:{}",
+            metadata.applied_content_set.game_version,
+            sha1_bytes(input_bytes)
+        )
+        .as_bytes(),
+    )
+}
+
+async fn load_instance_document(
+    instance_id: &str,
+    state: &State,
+) -> crate::Result<(
+    InstanceMetadata,
+    GameOptionsDocument,
+    Vec<u8>,
+    HashSet<String>,
+)> {
+    let metadata = crate::state::get_instance(instance_id, &state.pool)
+        .await?
+        .ok_or_else(|| input_error("Unknown instance"))?;
+    if crate::state::game_options_sync_is_enabled(&state.pool).await?
+        && metadata.synced_options.game_options
+    {
+        return Err(input_error(
+            "This instance is using synced game settings.",
+        ));
+    }
+    if synced_options::sync_files_are_protected(&metadata) {
+        return Err(input_error(
+            "Game settings cannot be edited while this instance is installing or updating.",
+        ));
+    }
+    if synced_options::instance_is_running(&metadata, state).await? {
+        return Err(input_error(
+            "Game settings cannot be edited while this instance is running.",
+        ));
+    }
+    let path = options_path(&metadata, state);
+    if !path.exists() {
+        return Err(input_error(
+            "Launch this instance once so Minecraft can create options.txt.",
+        ));
+    }
+    let (document, input_bytes) = read_document(&path).await?;
+    let mut controlled_keys = currently_launcher_owned_keys(&metadata);
+    if metadata.launch_overrides.force_fullscreen.is_none()
+        && crate::state::Settings::get(&state.pool)
+            .await?
+            .force_fullscreen
+    {
+        controlled_keys.insert("fullscreen".to_string());
+    }
+    Ok((metadata, document, input_bytes, controlled_keys))
+}
+
+fn build_editor_state(
+    metadata: &InstanceMetadata,
+    document: &GameOptionsDocument,
+    input_bytes: &[u8],
+    controlled_keys: &HashSet<String>,
+) -> GameSettingsEditorState {
+    let game_version = metadata.applied_content_set.game_version.as_str();
+    let mut settings = Vec::new();
+
+    if supported_settings_cover_game_version(game_version) {
+        for definition in all_supported_settings() {
+            let Some(physical_key) =
+                observed_physical_key(definition, document, game_version)
+            else {
+                continue;
+            };
+            let Some(value) = document.value(&physical_key).and_then(|raw| {
+                decode_value_for_version(
+                    definition,
+                    &physical_key,
+                    raw,
+                    game_version,
+                )
+            }) else {
+                continue;
+            };
+            let controlled = controlled_keys.contains(definition.id);
+            settings.push(EditableGameSetting {
+                option_id: definition.id.to_string(),
+                category_id: definition.category.to_string(),
+                kind: GameOptionKind::Vanilla,
+                raw_key: None,
+                sync_enabled: true,
+                canonical_value: Some(value),
+                value_state: GameOptionValueState::Canonical,
+                option_revision: 0,
+                editor: editor_for(definition),
+                compatibility: compatibility(controlled),
+                validation_error: None,
+                controlled,
+            });
+        }
+    }
+
+    let mut custom_settings = document
+        .effective_entries()
+        .into_iter()
+        .filter_map(|(key, (index, _))| {
+            if controlled_keys.contains(key)
+                || setting_by_file_key(key).is_some()
+                || is_never_sync_key(key)
+            {
+                return None;
+            }
+            let entry = document.lines[index].entry.as_ref()?;
+            validate_raw_key_value(key, &entry.value).ok()?;
+            Some(EditableGameSetting {
+                option_id: custom_setting_id(key),
+                category_id: "custom".to_string(),
+                kind: GameOptionKind::External,
+                raw_key: Some(key.to_string()),
+                sync_enabled: true,
+                canonical_value: Some(CanonicalValue::ExternalRaw(
+                    entry.value.clone(),
+                )),
+                value_state: GameOptionValueState::Canonical,
+                option_revision: 0,
+                editor: custom_setting_editor(),
+                compatibility: compatibility(false),
+                validation_error: None,
+                controlled: false,
+            })
+        })
+        .collect::<Vec<_>>();
+    custom_settings.sort_by(|left, right| left.raw_key.cmp(&right.raw_key));
+    settings.extend(custom_settings);
+
+    GameSettingsEditorState {
+        summary_revision: editor_revision(metadata, input_bytes),
+        canonical_revision: 0,
+        catalog_revision: CATALOG_REVISION,
+        total_participating: 1,
+        categories: categories(&settings),
+        settings,
+    }
+}
+
+fn encode_setting_value(
+    metadata: &InstanceMetadata,
+    document: &GameOptionsDocument,
+    setting: &EditableGameSetting,
+    value: &CanonicalValue,
+) -> crate::Result<(String, String)> {
+    let game_version = metadata.applied_content_set.game_version.as_str();
+    if let Some(definition) = setting_by_id(&setting.option_id) {
+        validate_canonical_value(Some(definition), value)?;
+        let key = observed_physical_key(definition, document, game_version)
+            .ok_or_else(|| {
+                input_error(format!(
+                    "{} is no longer present in options.txt",
+                    setting.option_id
+                ))
+            })?;
+        let raw = encode_value(
+            definition,
+            &key,
+            value,
+            game_version,
+            document.value(&key),
+        )
+        .ok_or_else(|| {
+            input_error(format!(
+                "{} cannot be represented by this Minecraft version",
+                setting.option_id
+            ))
+        })?;
+        Ok((key, raw))
+    } else {
+        validate_canonical_value(None, value)?;
+        let key = setting
+            .raw_key
+            .clone()
+            .ok_or_else(|| input_error("Custom setting is missing its file key"))?;
+        let CanonicalValue::ExternalRaw(raw) = value else {
+            return Err(input_error(
+                "Custom settings require a raw string value",
+            ));
+        };
+        validate_raw_key_value(&key, raw)?;
+        Ok((key, raw.clone()))
+    }
+}
+
+async fn load_editor(
+    instance_id: &str,
+    state: &State,
+) -> crate::Result<GameSettingsEditorState> {
+    let (metadata, document, input_bytes, controlled_keys) =
+        load_instance_document(instance_id, state).await?;
+    Ok(build_editor_state(
+        &metadata,
+        &document,
+        &input_bytes,
+        &controlled_keys,
+    ))
+}
+
+pub async fn get_config(
+    instance_id: &str,
+) -> crate::Result<GameSettingsEditorState> {
+    let state = State::get().await?;
+    let _guard = state.lock_synced_options().await;
+    load_editor(instance_id, &state).await
+}
+
+pub async fn preview_changes(
+    instance_id: &str,
+    request: UpdateGameSettingsRequest,
+) -> crate::Result<GameSettingsEditorState> {
+    let state = State::get().await?;
+    let _guard = state.lock_synced_options().await;
+    let (metadata, document, input_bytes, controlled_keys) =
+        load_instance_document(instance_id, &state).await?;
+    let mut editor = build_editor_state(
+        &metadata,
+        &document,
+        &input_bytes,
+        &controlled_keys,
+    );
+    let stale = request.expected_catalog_revision != CATALOG_REVISION
+        || request.expected_summary_revision != editor.summary_revision
+        || request.expected_canonical_revision != editor.canonical_revision;
+
+    for change in request.changes {
+        let Some(setting) = editor
+            .settings
+            .iter_mut()
+            .find(|setting| setting.option_id == change.option_id)
+        else {
+            continue;
+        };
+        if stale || change.base_option_revision != setting.option_revision {
+            setting.validation_error =
+                Some(GameOptionValidationIssue::ChangedSinceOpened);
+            continue;
+        }
+        if change.sync_enabled.is_some() {
+            setting.validation_error =
+                Some(GameOptionValidationIssue::InvalidValue);
+            continue;
+        }
+        if let Some(value) = change.canonical_value {
+            match value {
+                Some(value)
+                    if encode_setting_value(
+                        &metadata,
+                        &document,
+                        setting,
+                        &value,
+                    )
+                    .is_ok() =>
+                {
+                    setting.canonical_value = Some(value);
+                    setting.value_state = GameOptionValueState::Canonical;
+                    setting.validation_error = None;
+                }
+                _ => {
+                    setting.canonical_value = None;
+                    setting.value_state = GameOptionValueState::Invalid;
+                    setting.validation_error =
+                        Some(GameOptionValidationIssue::InvalidValue);
+                }
+            }
+        }
+    }
+    Ok(editor)
+}
+
+pub async fn save_changes(
+    instance_id: &str,
+    request: UpdateGameSettingsRequest,
+) -> crate::Result<SaveGameSettingsResult> {
+    let state = State::get().await?;
+    let _guard = state.lock_synced_options().await;
+    let (metadata, mut document, input_bytes, controlled_keys) =
+        load_instance_document(instance_id, &state).await?;
+    let current_editor = build_editor_state(
+        &metadata,
+        &document,
+        &input_bytes,
+        &controlled_keys,
+    );
+    let UpdateGameSettingsRequest {
+        expected_summary_revision,
+        expected_canonical_revision,
+        expected_catalog_revision,
+        changes,
+    } = request;
+    if expected_catalog_revision != CATALOG_REVISION
+        || expected_summary_revision != current_editor.summary_revision
+        || expected_canonical_revision != current_editor.canonical_revision
+    {
+        return Ok(SaveGameSettingsResult {
+            state: Some(current_editor),
+            conflicts: changes
+                .into_iter()
+                .map(|change| change.option_id)
+                .collect(),
+            ..SaveGameSettingsResult::default()
+        });
+    }
+
+    let mut changed = false;
+    for change in changes {
+        let setting = current_editor
+            .settings
+            .iter()
+            .find(|setting| setting.option_id == change.option_id)
+            .ok_or_else(|| {
+                input_error(format!(
+                    "Unknown game setting {}",
+                    change.option_id
+                ))
+            })?;
+        if setting.controlled {
+            return Err(input_error(format!(
+                "{} is controlled by the instance's launcher settings",
+                setting.option_id
+            )));
+        }
+        if change.base_option_revision != setting.option_revision {
+            return Ok(SaveGameSettingsResult {
+                state: Some(current_editor),
+                conflicts: vec![change.option_id],
+                ..SaveGameSettingsResult::default()
+            });
+        }
+        if change.sync_enabled.is_some() {
+            return Err(input_error(
+                "Sync selection cannot be changed in the instance editor",
+            ));
+        }
+        let Some(Some(value)) = change.canonical_value else {
+            return Err(input_error(format!(
+                "Choose a value for {}",
+                setting.option_id
+            )));
+        };
+        let (key, raw) =
+            encode_setting_value(&metadata, &document, setting, &value)?;
+        changed |= document.set(&key, &raw, false)?;
+    }
+
+    if changed {
+        io::write(options_path(&metadata, &state), document.serialize()?)
+            .await?;
+    }
+    let refreshed = load_editor(instance_id, &state).await?;
+    Ok(SaveGameSettingsResult {
+        state: Some(refreshed),
+        applied: u32::from(changed),
+        ..SaveGameSettingsResult::default()
+    })
+}
diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/mod.rs b/packages/app-lib/src/api/instance/synced_options/game_options/mod.rs
index 1d4ace410b..aae0abfa8b 100644
--- a/packages/app-lib/src/api/instance/synced_options/game_options/mod.rs
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/mod.rs
@@ -24,6 +24,7 @@ mod catalog;
 mod fullscreen;
 mod instance_support;
 mod launch_overrides;
+mod local_settings_editor;
 mod options_file;
 mod pack_updates;
 mod read_instance_changes;
@@ -43,6 +44,11 @@ pub use api_types::{
     UpdateGameSettingsRequest,
 };
 pub use launch_overrides::{apply_launcher_overrides, sync_before_launch};
+pub use local_settings_editor::{
+    get_config as get_local_config,
+    preview_changes as preview_local_changes,
+    save_changes as save_local_changes,
+};
 pub use pack_updates::{GameOptionsPackSource, capture_pack_base};
 pub use settings_editor::{get_config, preview_changes, save_changes};
 pub use source_selection::list_sync_sources;

From a97b79d2a1a8fc94c0ea26f60c69109f70f5cd93 Mon Sep 17 00:00:00 2001
From: "Calum H. (IMB11)" <contact@cal.engineer>
Date: Tue, 1 Sep 2026 21:52:00 +0100
Subject: [PATCH 10/33] fix: qa

---
 .../game-settings/GameKeybindInput.vue        |   1 +
 .../game-settings/GameSettingRow.vue          |  56 +++---
 .../game-settings/GameSettingsModal.vue       | 172 +++++++-----------
 .../game-setting-boolean-control.vue          |  53 ++++++
 .../app-frontend/src/locales/en-US/index.json |  32 +---
 5 files changed, 169 insertions(+), 145 deletions(-)
 create mode 100644 apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-boolean-control.vue

diff --git a/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameKeybindInput.vue b/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameKeybindInput.vue
index 0abda0ee45..e77d04f838 100644
--- a/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameKeybindInput.vue
+++ b/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameKeybindInput.vue
@@ -206,6 +206,7 @@ onBeforeUnmount(cancelRecording)
 				:class="{
 					'!bg-brand-highlight !text-brand !shadow-[inset_0_0_0_1px_var(--color-brand)]': recording,
 					'keybind-button--conflict': !recording && conflicts.length,
+					'!bg-transparent': !recording && !conflicts.length,
 				}"
 				@click="handleClick"
 				@contextmenu.prevent.stop
diff --git a/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingRow.vue b/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingRow.vue
index dda6a1aa7c..3970cffde1 100644
--- a/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingRow.vue
+++ b/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingRow.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
-import { UnknownIcon } from '@modrinth/assets'
+import { LinkIcon, UnknownIcon, UnlinkIcon } from '@modrinth/assets'
 import {
 	Combobox,
 	type ComboboxOption,
 	defineMessages,
+	IconButton,
 	Input,
 	Slider,
-	Toggle,
 	truncatedTooltip,
 	useVIntl,
 } from '@modrinth/ui'
@@ -14,6 +14,7 @@ import { computed, ref } from 'vue'
 
 import type { EditableGameSetting, GameOptionCanonicalValue } from '@/helpers/game-options'
 
+import GameSettingBooleanControl from './game-setting-boolean-control.vue'
 import {
 	canonicalBooleanValue,
 	canonicalValueFromInput,
@@ -81,6 +82,10 @@ const messages = defineMessages({
 		id: 'app.settings.synced-options.game-settings.sync-setting',
 		defaultMessage: 'Sync {setting} across instances',
 	},
+	unsyncSetting: {
+		id: 'app.settings.synced-options.game-settings.unsync-setting',
+		defaultMessage: 'Stop syncing {setting} across instances',
+	},
 })
 
 const settingLabel = computed(() => formatGameSettingLabel(formatMessage, props.setting))
@@ -94,10 +99,6 @@ const enumOptions = computed<ComboboxOption<string>[]>(() =>
 		label: formatGameSettingChoice(formatMessage, props.setting.option_id, choice.value),
 	})),
 )
-const booleanOptions = computed<ComboboxOption<boolean>[]>(() => [
-	{ value: true, label: formatMessage(messages.on) },
-	{ value: false, label: formatMessage(messages.off) },
-])
 const isVolumeSlider = computed(
 	() =>
 		props.setting.category_id === 'music_and_sound' &&
@@ -180,6 +181,11 @@ const syncDisabledReason = computed(() => {
 	}
 	return undefined
 })
+const syncActionLabel = computed(() =>
+	formatMessage(props.setting.sync_enabled ? messages.unsyncSetting : messages.syncSetting, {
+		setting: settingLabel.value,
+	}),
+)
 
 function updateValue(value: string | number | boolean | undefined) {
 	emit('update:canonical-value', canonicalValueFromInput(props.setting, value))
@@ -188,14 +194,14 @@ function updateValue(value: string | number | boolean | undefined) {
 
 <template>
 	<div
-		class="grid min-w-0 items-center gap-3 py-3"
+		class="grid min-h-[54px] min-w-0 items-center gap-2"
 		:class="
 			isVolumeSlider
 				? showSyncToggle
-					? 'grid-cols-[minmax(10rem,0.65fr)_minmax(0,1.35fr)_4rem]'
+					? 'grid-cols-[minmax(10rem,0.65fr)_minmax(0,1.35fr)_2.25rem]'
 					: 'grid-cols-[minmax(10rem,0.65fr)_minmax(0,1.35fr)]'
 				: showSyncToggle
-					? 'grid-cols-[minmax(0,1fr)_12rem_4rem]'
+					? 'grid-cols-[minmax(0,1fr)_12rem_2.25rem]'
 					: 'grid-cols-[minmax(0,1fr)_12rem]'
 		"
 	>
@@ -225,7 +231,7 @@ function updateValue(value: string | number | boolean | undefined) {
 			</p>
 		</div>
 
-		<div class="flex min-w-0 items-center">
+		<div class="flex min-w-0 items-center justify-end">
 			<Slider
 				v-if="isVolumeSlider"
 				:model-value="sliderValue"
@@ -238,14 +244,14 @@ function updateValue(value: string | number | boolean | undefined) {
 				@update:model-value="updateValue"
 			/>
 
-			<Combobox
+			<GameSettingBooleanControl
 				v-else-if="setting.editor.type === 'bool'"
 				:model-value="booleanValue"
-				:options="booleanOptions"
+				:label="formatMessage(messages.valueLabel)"
+				:on-label="formatMessage(messages.on)"
+				:off-label="formatMessage(messages.off)"
 				:placeholder="placeholder"
 				:disabled="editorDisabled"
-				:aria-label="formatMessage(messages.valueLabel)"
-				class="min-w-0"
 				@update:model-value="updateValue"
 			/>
 
@@ -256,6 +262,7 @@ function updateValue(value: string | number | boolean | undefined) {
 				:placeholder="placeholder"
 				:disabled="editorDisabled"
 				:aria-label="formatMessage(messages.valueLabel)"
+				trigger-class="!bg-transparent"
 				class="min-w-0"
 				@update:model-value="updateValue"
 			/>
@@ -282,7 +289,7 @@ function updateValue(value: string | number | boolean | undefined) {
 				:placeholder="placeholder"
 				:disabled="editorDisabled"
 				:aria-label="formatMessage(messages.valueLabel)"
-				wrapper-class="w-full"
+				wrapper-class="w-full !bg-transparent"
 				@update:model-value="updateValue"
 			/>
 		</div>
@@ -292,13 +299,20 @@ function updateValue(value: string | number | boolean | undefined) {
 			v-tooltip="syncToggleDisabled ? syncDisabledReason : undefined"
 			class="flex justify-center"
 		>
-			<Toggle
-				:id="`sync-game-setting-${setting.option_id}`"
-				:model-value="setting.sync_enabled"
+			<IconButton
+				:label="syncActionLabel"
 				:disabled="syncToggleDisabled"
-				:aria-label="formatMessage(messages.syncSetting, { setting: settingLabel })"
-				@update:model-value="(enabled) => emit('update:sync-enabled', enabled)"
-			/>
+				:aria-pressed="setting.sync_enabled"
+				:class="
+					setting.sync_enabled
+						? '!bg-highlight-green !text-green !shadow-[inset_0_0_0_1px_var(--color-green)] [&>svg]:!text-green'
+						: ''
+				"
+				@click="emit('update:sync-enabled', !setting.sync_enabled)"
+			>
+				<LinkIcon v-if="setting.sync_enabled" />
+				<UnlinkIcon v-else />
+			</IconButton>
 		</span>
 	</div>
 </template>
diff --git a/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingsModal.vue b/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingsModal.vue
index a7a9f80683..583fbede14 100644
--- a/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingsModal.vue
+++ b/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingsModal.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import {
 	EyeIcon,
-	FilterIcon,
 	LanguagesIcon,
+	LinkIcon,
 	MessageIcon,
 	MonitorIcon,
 	RefreshCwIcon,
@@ -13,12 +13,12 @@ import {
 	SpinnerIcon,
 	TagCategoryAudioIcon,
 	TagCategoryGamepad2Icon,
+	UnlinkIcon,
 	WrenchIcon,
 	XIcon,
 } from '@modrinth/assets'
 import {
 	Button,
-	ButtonGroup,
 	commonMessages,
 	ConfirmLeaveModal,
 	defineMessages,
@@ -27,8 +27,6 @@ import {
 	Input,
 	TabbedModal,
 	type TabbedModalTab,
-	Tabs,
-	type TabsTab,
 	useVIntl,
 } from '@modrinth/ui'
 import type { Component } from 'vue'
@@ -79,37 +77,26 @@ const messages = defineMessages({
 		id: 'app.settings.synced-options.game-settings.title',
 		defaultMessage: 'Game settings',
 	},
+	syncTitle: {
+		id: 'app.settings.synced-options.game-settings.sync-title',
+		defaultMessage: 'Sync game settings',
+	},
+	syncedOptionsDescription: {
+		id: 'app.settings.synced-options.game-settings.description',
+		defaultMessage:
+			'Synced options are applied to every instance and override the values included with a modpack.',
+	},
 	search: {
 		id: 'app.settings.synced-options.game-settings.search',
 		defaultMessage: 'Search settings...',
 	},
-	all: {
-		id: 'app.settings.synced-options.game-settings.filter.all',
-		defaultMessage: 'All',
-	},
-	on: {
-		id: 'app.settings.synced-options.game-settings.filter.on',
-		defaultMessage: 'Syncing',
-	},
-	off: {
-		id: 'app.settings.synced-options.game-settings.filter.off',
-		defaultMessage: 'Not syncing',
-	},
 	enableAll: {
 		id: 'app.settings.synced-options.game-settings.enable-all',
-		defaultMessage: 'Sync all',
-	},
-	enableAllCount: {
-		id: 'app.settings.synced-options.game-settings.enable-all-count',
-		defaultMessage: 'Sync all ({count})',
+		defaultMessage: 'Sync tab',
 	},
 	disableAll: {
 		id: 'app.settings.synced-options.game-settings.disable-all',
-		defaultMessage: 'Stop syncing all',
-	},
-	disableAllCount: {
-		id: 'app.settings.synced-options.game-settings.disable-all-count',
-		defaultMessage: 'Stop syncing all ({count})',
+		defaultMessage: 'Unsync all',
 	},
 	customEmpty: {
 		id: 'app.settings.synced-options.game-settings.custom-empty',
@@ -134,7 +121,7 @@ const messages = defineMessages({
 	},
 	saveSettings: {
 		id: 'app.settings.synced-options.game-settings.save',
-		defaultMessage: 'Save changes',
+		defaultMessage: 'Save settings',
 	},
 	unsavedChanges: {
 		id: 'app.settings.synced-options.game-settings.unsaved-changes',
@@ -157,10 +144,6 @@ const messages = defineMessages({
 		id: 'app.settings.synced-options.game-settings.saved-with-problems',
 		defaultMessage: 'Your changes were saved, but some instances could not be updated.',
 	},
-	previewFailed: {
-		id: 'app.settings.synced-options.game-settings.preview-failed',
-		defaultMessage: 'We couldn’t check which instances support your changes. Try again.',
-	},
 	conflictTitle: {
 		id: 'app.settings.synced-options.game-settings.conflict-title',
 		defaultMessage: 'These settings changed elsewhere',
@@ -171,19 +154,15 @@ const messages = defineMessages({
 	},
 })
 
-type SelectionFilter = 'all' | 'on' | 'off'
-
 const modal = ref<InstanceType<typeof TabbedModal> | null>(null)
 const confirmLeaveModal = ref<InstanceType<typeof ConfirmLeaveModal> | null>(null)
 const baseState = ref<GameSettingsEditorState | null>(null)
 const draftState = ref<GameSettingsEditorState | null>(null)
 const activeCategoryId = ref('')
 const search = ref('')
-const selectionFilter = ref<SelectionFilter>('all')
 const loading = ref(false)
 const saving = ref(false)
 const loadError = ref(false)
-const previewError = ref(false)
 const touchedValueOptionIds = ref<Set<string>>(new Set())
 let allowClose = false
 let previewTimer: ReturnType<typeof setTimeout> | null = null
@@ -206,12 +185,6 @@ const categoryIcons: Record<string, Component> = {
 	custom_settings: WrenchIcon,
 }
 
-const filterTabs = computed<TabsTab[]>(() => [
-	{ value: 'all', label: formatMessage(messages.all) },
-	{ value: 'on', label: formatMessage(messages.on) },
-	{ value: 'off', label: formatMessage(messages.off) },
-])
-
 const categories = computed<GameSettingCategory[]>(() => {
 	if (!draftState.value) return []
 
@@ -255,10 +228,6 @@ const categorySettings = computed(() => {
 			).includes(query)
 		)
 			return false
-		if (!isLocalEditor.value && selectionFilter.value === 'on' && !setting.sync_enabled)
-			return false
-		if (!isLocalEditor.value && selectionFilter.value === 'off' && setting.sync_enabled)
-			return false
 		return true
 	})
 })
@@ -310,15 +279,22 @@ const enableCandidates = computed(() =>
 const disableCandidates = computed(() =>
 	categorySettings.value.filter((setting) => setting.sync_enabled && !setting.controlled),
 )
+const toggleableCategorySettings = computed(() =>
+	categorySettings.value.filter((setting) => !setting.controlled),
+)
+const allCategorySettingsSynced = computed(
+	() =>
+		toggleableCategorySettings.value.length > 0 &&
+		toggleableCategorySettings.value.every((setting) => setting.sync_enabled),
+)
+const modalTitle = computed(() =>
+	formatMessage(isLocalEditor.value ? messages.title : messages.syncTitle),
+)
 
 function categoryIcon(category: GameSettingCategory): Component {
 	return categoryIcons[category.id] ?? SettingsIcon
 }
 
-function setSelectionFilter(value: string | number) {
-	selectionFilter.value = value as SelectionFilter
-}
-
 function changeCategory(_fromIndex: number, toIndex: number): boolean {
 	const category = categories.value[toIndex]
 	if (!category) return false
@@ -342,7 +318,6 @@ async function load() {
 	previewGeneration++
 	loading.value = true
 	loadError.value = false
-	previewError.value = false
 	try {
 		const state = props.instanceId
 			? await get_local_game_options_config(props.instanceId)
@@ -372,7 +347,6 @@ async function load() {
 function show() {
 	allowClose = false
 	search.value = ''
-	selectionFilter.value = 'all'
 	modal.value?.show()
 	void load()
 }
@@ -391,7 +365,6 @@ function reset() {
 	loading.value = false
 	saving.value = false
 	loadError.value = false
-	previewError.value = false
 	touchedValueOptionIds.value = new Set()
 	allowClose = false
 }
@@ -416,7 +389,6 @@ function cancelChanges() {
 	previewGeneration++
 	draftState.value = cloneGameSettingsState(baseState.value)
 	touchedValueOptionIds.value = new Set()
-	previewError.value = false
 }
 
 function settingById(optionId: string): EditableGameSetting | undefined {
@@ -485,8 +457,15 @@ function disableVisible() {
 	schedulePreview()
 }
 
+function toggleVisibleSync() {
+	if (allCategorySettingsSynced.value) {
+		disableVisible()
+	} else {
+		enableVisible()
+	}
+}
+
 function schedulePreview() {
-	previewError.value = false
 	previewGeneration++
 	if (previewTimer) clearTimeout(previewTimer)
 	previewTimer = setTimeout(() => void preview(), 350)
@@ -545,9 +524,8 @@ async function preview() {
 			: await preview_synced_game_option_changes(request)
 		if (generation !== previewGeneration) return
 		mergePreview(previewState)
-		previewError.value = false
 	} catch {
-		if (generation === previewGeneration) previewError.value = true
+		return
 	}
 }
 
@@ -626,7 +604,6 @@ async function save() {
 		baseState.value = cloneGameSettingsState(refreshed)
 		draftState.value = cloneGameSettingsState(refreshed)
 		touchedValueOptionIds.value = new Set()
-		previewError.value = false
 		emit('saved')
 	} catch (error) {
 		handleError(error)
@@ -646,7 +623,7 @@ defineExpose({ show, hide })
 	<TabbedModal
 		ref="modal"
 		:tabs="categoryTabs"
-		:header="formatMessage(messages.title)"
+		:header="modalTitle"
 		:before-hide="beforeHide"
 		:before-tab-change="changeCategory"
 		:on-after-hide="reset"
@@ -672,28 +649,28 @@ defineExpose({ show, hide })
 			<div class="flex min-h-full min-w-0 flex-col">
 				<div
 					v-if="!isLocalEditor"
-					class="flex shrink-0 flex-wrap items-center justify-between gap-3 pb-3 pt-2"
+					class="flex shrink-0 flex-wrap items-start justify-between gap-4 pb-4"
 				>
-					<div class="flex items-center gap-2">
-						<FilterIcon class="size-5 shrink-0 text-secondary" aria-hidden="true" />
-						<Tabs :value="selectionFilter" :tabs="filterTabs" @update:value="setSelectionFilter" />
-					</div>
-					<ButtonGroup>
-						<Button :disabled="saving || enableCandidates.length === 0" @click="enableVisible">
-							{{
-								enableCandidates.length
-									? formatMessage(messages.enableAllCount, { count: enableCandidates.length })
-									: formatMessage(messages.enableAll)
-							}}
-						</Button>
-						<Button :disabled="saving || disableCandidates.length === 0" @click="disableVisible">
-							{{
-								disableCandidates.length
-									? formatMessage(messages.disableAllCount, { count: disableCandidates.length })
-									: formatMessage(messages.disableAll)
-							}}
-						</Button>
-					</ButtonGroup>
+					<p class="m-0 min-w-60 flex-1 text-primary">
+						{{ formatMessage(messages.syncedOptionsDescription) }}
+					</p>
+					<Button
+						class="w-48 justify-center"
+						size="lg"
+						:disabled="
+							saving ||
+							(allCategorySettingsSynced
+								? disableCandidates.length === 0
+								: enableCandidates.length === 0)
+						"
+						@click="toggleVisibleSync"
+					>
+						<LinkIcon v-if="allCategorySettingsSynced" />
+						<UnlinkIcon v-else />
+						{{
+							formatMessage(allCategorySettingsSynced ? messages.disableAll : messages.enableAll)
+						}}
+					</Button>
 				</div>
 
 				<div
@@ -714,12 +691,6 @@ defineExpose({ show, hide })
 					</Button>
 				</div>
 				<div v-else class="min-h-0 flex-1">
-					<p
-						v-if="previewError"
-						class="m-0 border-0 border-b border-solid border-surface-5 py-3 text-sm text-orange"
-					>
-						{{ formatMessage(messages.previewFailed) }}
-					</p>
 					<div
 						v-if="categorySettings.length === 0"
 						class="flex h-full min-h-40 items-center justify-center px-8 text-center text-secondary"
@@ -730,27 +701,24 @@ defineExpose({ show, hide })
 								: formatMessage(messages.empty)
 						}}
 					</div>
-					<GameSettingRow
-						v-for="setting in categorySettings"
-						:key="setting.option_id"
-						:setting="setting"
-						:keybind-conflicts="keybindConflicts.get(setting.option_id)"
-						:disabled="saving"
-						:show-sync-toggle="!isLocalEditor"
-						@update:sync-enabled="setSyncEnabled(setting.option_id, $event)"
-						@update:canonical-value="setCanonicalValue(setting.option_id, $event)"
-					/>
+					<div v-else class="flex flex-col gap-4">
+						<GameSettingRow
+							v-for="setting in categorySettings"
+							:key="setting.option_id"
+							:setting="setting"
+							:keybind-conflicts="keybindConflicts.get(setting.option_id)"
+							:disabled="saving"
+							:show-sync-toggle="!isLocalEditor"
+							@update:sync-enabled="setSyncEnabled(setting.option_id, $event)"
+							@update:canonical-value="setCanonicalValue(setting.option_id, $event)"
+						/>
+					</div>
 				</div>
 			</div>
 		</template>
 
 		<template #floating-action-bar>
-			<FloatingActionBar
-				v-if="isDirty"
-				:shown="true"
-				:inline="true"
-				:aria-label="formatMessage(messages.title)"
-			>
+			<FloatingActionBar v-if="isDirty" :shown="true" :inline="true" :aria-label="modalTitle">
 				<p class="m-0 text-sm font-semibold md:text-base">
 					{{ formatMessage(messages.unsavedChanges) }}
 				</p>
@@ -762,7 +730,7 @@ defineExpose({ show, hide })
 					<Button
 						type="colored"
 						color="brand"
-						:disabled="!isDirty || loading || saving || previewError || hasBlockingDraft"
+						:disabled="!isDirty || loading || saving || hasBlockingDraft"
 						:loading="saving"
 						@click="save"
 					>
diff --git a/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-boolean-control.vue b/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-boolean-control.vue
new file mode 100644
index 0000000000..c3cb41cd89
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-boolean-control.vue
@@ -0,0 +1,53 @@
+<script setup lang="ts">
+defineProps<{
+	modelValue?: boolean
+	disabled?: boolean
+	label: string
+	onLabel: string
+	offLabel: string
+	placeholder?: string
+}>()
+
+const emit = defineEmits<{
+	'update:model-value': [value: boolean]
+}>()
+</script>
+
+<template>
+	<div
+		v-tooltip="modelValue === undefined ? placeholder : undefined"
+		role="group"
+		:aria-label="label"
+		class="inline-flex h-9 items-center gap-0.5 rounded-xl border border-solid border-surface-5 bg-transparent p-px shadow-sm"
+		:class="disabled ? 'opacity-50' : ''"
+	>
+		<button
+			type="button"
+			:aria-pressed="modelValue === true"
+			:disabled="disabled"
+			class="flex h-8 cursor-pointer items-center rounded-[10px] border border-solid px-3 text-base font-medium leading-5 text-contrast transition-all active:scale-[0.97] focus-visible:outline-none focus-visible:ring-4 focus-visible:ring-brand-shadow disabled:cursor-not-allowed"
+			:class="
+				modelValue === true
+					? 'border-green bg-highlight-green text-green'
+					: 'border-transparent bg-transparent hover:bg-surface-4'
+			"
+			@click="emit('update:model-value', true)"
+		>
+			{{ onLabel }}
+		</button>
+		<button
+			type="button"
+			:aria-pressed="modelValue === false"
+			:disabled="disabled"
+			class="flex h-8 cursor-pointer items-center rounded-[10px] border border-solid px-3 text-base font-medium leading-5 text-contrast transition-all active:scale-[0.97] focus-visible:outline-none focus-visible:ring-4 focus-visible:ring-brand-shadow disabled:cursor-not-allowed"
+			:class="
+				modelValue === false
+					? 'border-surface-5 bg-surface-4'
+					: 'border-transparent bg-transparent hover:bg-surface-4'
+			"
+			@click="emit('update:model-value', false)"
+		>
+			{{ offLabel }}
+		</button>
+	</div>
+</template>
diff --git a/apps/app-frontend/src/locales/en-US/index.json b/apps/app-frontend/src/locales/en-US/index.json
index 6577264e9c..66ad06bc1c 100644
--- a/apps/app-frontend/src/locales/en-US/index.json
+++ b/apps/app-frontend/src/locales/en-US/index.json
@@ -2379,13 +2379,10 @@
     "message": "Settings added by mods will appear here after Modrinth finds them in one of your instances."
   },
   "app.settings.synced-options.game-settings.description": {
-    "message": "Use the same graphics, keybinds, and other game settings across your instances."
+    "message": "Synced options are applied to every instance and override the values included with a modpack."
   },
   "app.settings.synced-options.game-settings.disable-all": {
-    "message": "Stop syncing all"
-  },
-  "app.settings.synced-options.game-settings.disable-all-count": {
-    "message": "Stop syncing all ({count})"
+    "message": "Unsync all"
   },
   "app.settings.synced-options.game-settings.disabled-tooltip": {
     "message": "Enable game settings sync before choosing individual settings."
@@ -2394,19 +2391,7 @@
     "message": "No settings match your search or filter."
   },
   "app.settings.synced-options.game-settings.enable-all": {
-    "message": "Sync all"
-  },
-  "app.settings.synced-options.game-settings.enable-all-count": {
-    "message": "Sync all ({count})"
-  },
-  "app.settings.synced-options.game-settings.filter.all": {
-    "message": "All"
-  },
-  "app.settings.synced-options.game-settings.filter.off": {
-    "message": "Not syncing"
-  },
-  "app.settings.synced-options.game-settings.filter.on": {
-    "message": "Syncing"
+    "message": "Sync tab"
   },
   "app.settings.synced-options.game-settings.load-failed": {
     "message": "We couldn’t load your game settings."
@@ -2414,14 +2399,11 @@
   "app.settings.synced-options.game-settings.loading": {
     "message": "Loading settings..."
   },
-  "app.settings.synced-options.game-settings.preview-failed": {
-    "message": "We couldn’t check which instances support your changes. Try again."
-  },
   "app.settings.synced-options.game-settings.retry": {
     "message": "Retry"
   },
   "app.settings.synced-options.game-settings.save": {
-    "message": "Save changes"
+    "message": "Save settings"
   },
   "app.settings.synced-options.game-settings.saved": {
     "message": "Game settings updated"
@@ -2441,12 +2423,18 @@
   "app.settings.synced-options.game-settings.sync-setting": {
     "message": "Sync {setting} across instances"
   },
+  "app.settings.synced-options.game-settings.sync-title": {
+    "message": "Sync game settings"
+  },
   "app.settings.synced-options.game-settings.title": {
     "message": "Game settings"
   },
   "app.settings.synced-options.game-settings.unsaved-changes": {
     "message": "You have unsaved changes."
   },
+  "app.settings.synced-options.game-settings.unsync-setting": {
+    "message": "Stop syncing {setting} across instances"
+  },
   "app.settings.synced-options.game-settings.value-label": {
     "message": "Value"
   },

From fda3f77479f968a58b64a87eb1139044414deb62 Mon Sep 17 00:00:00 2001
From: "Calum H. (IMB11)" <contact@cal.engineer>
Date: Tue, 1 Sep 2026 23:52:09 +0100
Subject: [PATCH 11/33] fix: qa

---
 .../game-settings/game-setting-editors.ts     |   2 +-
 .../game-settings/game-setting-messages.ts    |  30 +-
 apps/app-frontend/src/helpers/game-options.ts |   1 -
 .../synced_options/game_options/api_types.rs  |   9 -
 .../game_options/catalog/sound.rs             |  40 +
 .../game_options/catalog/version_changes.rs   |  29 +-
 .../game_options/instance_support.rs          |   5 +-
 .../game_options/launch_overrides.rs          |  96 +--
 .../game_options/local_settings_editor.rs     |   5 -
 .../synced_options/game_options/mod.rs        |  17 +-
 .../game_options/pack_updates.rs              |  21 +-
 .../game_options/read_instance_changes.rs     | 147 +---
 .../game_options/settings_editor.rs           |   4 +-
 .../game_options/source_selection.rs          |  37 +-
 .../game_options/write_shared_settings.rs     | 681 +++++++++---------
 .../instance/synced_options/orchestration.rs  | 110 +--
 packages/app-lib/src/state/instances/mod.rs   |   3 +-
 .../src/state/instances/model/game_options.rs |  32 -
 .../app-lib/src/state/instances/model/mod.rs  |   3 +-
 .../app-lib/src/state/instances/watcher.rs    |   5 +-
 packages/app-lib/src/state/mod.rs             |   3 +-
 packages/app-lib/src/state/process.rs         |  14 -
 22 files changed, 532 insertions(+), 762 deletions(-)

diff --git a/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-editors.ts b/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-editors.ts
index b494e25b73..d7da23253d 100644
--- a/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-editors.ts
+++ b/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-editors.ts
@@ -63,7 +63,7 @@ export function canonicalValueText(setting: EditableGameSetting): string {
 			return String(value.value)
 		case 'decimal':
 			return setting.editor.unit === 'percent'
-				? String(Number((Number(value.value) * 100).toFixed(8)))
+				? (Number(value.value) * 100).toFixed(0)
 				: value.value
 		case 'string_list':
 			return value.value.join(', ')
diff --git a/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-messages.ts b/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-messages.ts
index bcf6b8a5ec..7887ad8d7e 100644
--- a/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-messages.ts
+++ b/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-messages.ts
@@ -110,6 +110,14 @@ const settingMessages = defineMessages({
 		id: 'app.settings.game-options.setting.music-toast.description',
 		defaultMessage: 'Choose whether music titles appear in the pause menu and as toasts.',
 	},
+	recordVolumeLabel: {
+		id: 'app.settings.game-options.setting.record-volume.label',
+		defaultMessage: 'Jukebox/Note Blocks',
+	},
+	weatherVolumeLabel: {
+		id: 'app.settings.game-options.setting.weather-volume.label',
+		defaultMessage: 'Weather',
+	},
 	blocksVolumeLabel: {
 		id: 'app.settings.game-options.setting.blocks-volume.label',
 		defaultMessage: 'Blocks',
@@ -118,14 +126,26 @@ const settingMessages = defineMessages({
 		id: 'app.settings.game-options.setting.hostile-volume.label',
 		defaultMessage: 'Hostile creatures',
 	},
+	neutralVolumeLabel: {
+		id: 'app.settings.game-options.setting.neutral-volume.label',
+		defaultMessage: 'Friendly creatures',
+	},
 	playersVolumeLabel: {
 		id: 'app.settings.game-options.setting.players-volume.label',
 		defaultMessage: 'Players',
 	},
+	ambientVolumeLabel: {
+		id: 'app.settings.game-options.setting.ambient-volume.label',
+		defaultMessage: 'Ambient/Environment',
+	},
 	voiceVolumeLabel: {
 		id: 'app.settings.game-options.setting.voice-volume.label',
 		defaultMessage: 'Voice and speech',
 	},
+	uiVolumeLabel: {
+		id: 'app.settings.game-options.setting.ui-volume.label',
+		defaultMessage: 'UI',
+	},
 	sensitivityLabel: {
 		id: 'app.settings.game-options.setting.sensitivity.label',
 		defaultMessage: 'Mouse sensitivity',
@@ -530,10 +550,6 @@ export const presentationMessages = defineMessages({
 		id: 'app.settings.game-options.source.disabled.installing-or-updating',
 		defaultMessage: 'Installing or updating',
 	},
-	sourceRunning: {
-		id: 'app.settings.game-options.source.disabled.running',
-		defaultMessage: 'Currently running',
-	},
 	sourceUnsupportedVersion: {
 		id: 'app.settings.game-options.source.disabled.unsupported-version',
 		defaultMessage: 'Unsupported Minecraft version',
@@ -599,10 +615,15 @@ const knownSettings: Record<string, { label: MessageDescriptor; description?: Me
 			label: settingMessages.musicToastLabel,
 			description: settingMessages.musicToastDescription,
 		},
+		record_volume: { label: settingMessages.recordVolumeLabel },
+		weather_volume: { label: settingMessages.weatherVolumeLabel },
 		blocks_volume: { label: settingMessages.blocksVolumeLabel },
 		hostile_volume: { label: settingMessages.hostileVolumeLabel },
+		neutral_volume: { label: settingMessages.neutralVolumeLabel },
 		players_volume: { label: settingMessages.playersVolumeLabel },
+		ambient_volume: { label: settingMessages.ambientVolumeLabel },
 		voice_volume: { label: settingMessages.voiceVolumeLabel },
+		ui_volume: { label: settingMessages.uiVolumeLabel },
 		sensitivity: { label: settingMessages.sensitivityLabel },
 		invert_mouse: {
 			label: settingMessages.invertMouseLabel,
@@ -771,7 +792,6 @@ const validationMessages: Record<GameOptionValidationError, MessageDescriptor> =
 
 const sourceDisabledMessages: Record<GameOptionsSourceDisabledReason, MessageDescriptor> = {
 	installing_or_updating: presentationMessages.sourceInstallingOrUpdating,
-	running: presentationMessages.sourceRunning,
 	unsupported_version: presentationMessages.sourceUnsupportedVersion,
 	missing_options_file: presentationMessages.sourceMissingOptionsFile,
 	no_syncable_settings: presentationMessages.sourceNoSyncableSettings,
diff --git a/apps/app-frontend/src/helpers/game-options.ts b/apps/app-frontend/src/helpers/game-options.ts
index 9c9c692bc8..2ddefffa5e 100644
--- a/apps/app-frontend/src/helpers/game-options.ts
+++ b/apps/app-frontend/src/helpers/game-options.ts
@@ -139,7 +139,6 @@ export type GameOptionsSourceCandidate = {
 
 export type GameOptionsSourceDisabledReason =
 	| 'installing_or_updating'
-	| 'running'
 	| 'unsupported_version'
 	| 'missing_options_file'
 	| 'no_syncable_settings'
diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/api_types.rs b/packages/app-lib/src/api/instance/synced_options/game_options/api_types.rs
index 849593be4c..478d3ddd9b 100644
--- a/packages/app-lib/src/api/instance/synced_options/game_options/api_types.rs
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/api_types.rs
@@ -5,7 +5,6 @@ use serde::{Deserialize, Serialize};
 #[serde(rename_all = "snake_case")]
 pub enum GameOptionsSourceIssue {
     InstallingOrUpdating,
-    Running,
     UnsupportedVersion,
     MissingOptionsFile,
     NoSyncableSettings,
@@ -183,14 +182,6 @@ pub struct SaveGameSettingsResult {
     pub conflicts: Vec<String>,
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq)]
-pub(in crate::api::instance) enum SyncReason {
-    Normal,
-    BeforePackUpdate,
-    PackExtracted,
-    BeforeLaunch,
-}
-
 #[derive(Clone, Copy, Debug, Eq, PartialEq)]
 pub(super) enum SyncOutcome {
     Applied,
diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/catalog/sound.rs b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/sound.rs
index fde0f1fe93..0b4ae4a267 100644
--- a/packages/app-lib/src/api/instance/synced_options/game_options/catalog/sound.rs
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/sound.rs
@@ -39,6 +39,22 @@ pub(super) const SETTINGS: &[SupportedSetting] = &[
         SettingEditor::Enum(MUSIC_TOAST),
         ValueEncoding::MusicToast,
     ),
+    setting(
+        "record_volume",
+        &["soundCategory_record"],
+        "music_and_sound",
+        true,
+        UNIT_INTERVAL,
+        ValueEncoding::Decimal,
+    ),
+    setting(
+        "weather_volume",
+        &["soundCategory_weather"],
+        "music_and_sound",
+        true,
+        UNIT_INTERVAL,
+        ValueEncoding::Decimal,
+    ),
     setting(
         "blocks_volume",
         &["soundCategory_block"],
@@ -55,6 +71,14 @@ pub(super) const SETTINGS: &[SupportedSetting] = &[
         UNIT_INTERVAL,
         ValueEncoding::Decimal,
     ),
+    setting(
+        "neutral_volume",
+        &["soundCategory_neutral"],
+        "music_and_sound",
+        true,
+        UNIT_INTERVAL,
+        ValueEncoding::Decimal,
+    ),
     setting(
         "players_volume",
         &["soundCategory_player"],
@@ -63,6 +87,14 @@ pub(super) const SETTINGS: &[SupportedSetting] = &[
         UNIT_INTERVAL,
         ValueEncoding::Decimal,
     ),
+    setting(
+        "ambient_volume",
+        &["soundCategory_ambient"],
+        "music_and_sound",
+        true,
+        UNIT_INTERVAL,
+        ValueEncoding::Decimal,
+    ),
     setting(
         "voice_volume",
         &["soundCategory_voice"],
@@ -71,4 +103,12 @@ pub(super) const SETTINGS: &[SupportedSetting] = &[
         UNIT_INTERVAL,
         ValueEncoding::Decimal,
     ),
+    setting(
+        "ui_volume",
+        &["soundCategory_ui"],
+        "music_and_sound",
+        true,
+        UNIT_INTERVAL,
+        ValueEncoding::Decimal,
+    ),
 ];
diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/catalog/version_changes.rs b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/version_changes.rs
index a405292e83..a9efcebc02 100644
--- a/packages/app-lib/src/api/instance/synced_options/game_options/catalog/version_changes.rs
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/version_changes.rs
@@ -452,9 +452,10 @@ pub(in crate::api::instance) fn encode_value(
     }
 }
 
-pub(in crate::api::instance) fn validate_canonical_value(
+fn validate_value(
     definition: Option<&SupportedSetting>,
     value: &CanonicalValue,
+    enforce_editor_increment: bool,
 ) -> crate::Result<()> {
     if let Some(definition) = definition {
         let type_valid = match definition.encoding {
@@ -490,7 +491,9 @@ pub(in crate::api::instance) fn validate_canonical_value(
                 CanonicalValue::Integer(value),
             ) if *value < min
                 || *value > max
-                || step > 0 && (*value - min) % step != 0 =>
+                || enforce_editor_increment
+                    && step > 0
+                    && (*value - min) % step != 0 =>
             {
                 return Err(input_error(format!(
                     "{} is outside its supported range or increment",
@@ -508,7 +511,8 @@ pub(in crate::api::instance) fn validate_canonical_value(
                 if !parsed.is_finite()
                     || parsed < min
                     || parsed > max
-                    || step > 0.0
+                    || enforce_editor_increment
+                        && step > 0.0
                         && (increment - increment.round()).abs() > 0.000_001
                 {
                     return Err(input_error(format!(
@@ -525,7 +529,8 @@ pub(in crate::api::instance) fn validate_canonical_value(
                 let increment = (parsed - min) / step;
                 if parsed < min
                     || parsed > max
-                    || step > 0.0
+                    || enforce_editor_increment
+                        && step > 0.0
                         && (increment - increment.round()).abs() > 0.000_001
                 {
                     return Err(input_error(format!(
@@ -566,6 +571,20 @@ pub(in crate::api::instance) fn validate_canonical_value(
     Ok(())
 }
 
+pub(in crate::api::instance) fn validate_canonical_value(
+    definition: Option<&SupportedSetting>,
+    value: &CanonicalValue,
+) -> crate::Result<()> {
+    validate_value(definition, value, true)
+}
+
+pub(in crate::api::instance) fn validate_file_value(
+    definition: Option<&SupportedSetting>,
+    value: &CanonicalValue,
+) -> crate::Result<()> {
+    validate_value(definition, value, false)
+}
+
 pub(in crate::api::instance) fn decode_value_for_version(
     definition: &SupportedSetting,
     physical_key: &str,
@@ -573,7 +592,7 @@ pub(in crate::api::instance) fn decode_value_for_version(
     game_version: &str,
 ) -> Option<CanonicalValue> {
     let value = decode_value(definition, physical_key, raw)?;
-    validate_canonical_value(Some(definition), &value).ok()?;
+    validate_file_value(Some(definition), &value).ok()?;
     let target_key = if definition.versioned_keys.is_empty() {
         physical_key
     } else {
diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/instance_support.rs b/packages/app-lib/src/api/instance/synced_options/game_options/instance_support.rs
index 6550af9fa3..be678994f6 100644
--- a/packages/app-lib/src/api/instance/synced_options/game_options/instance_support.rs
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/instance_support.rs
@@ -39,8 +39,7 @@ pub(super) async fn load_participating_instances(
         if !metadata.synced_options.game_options {
             continue;
         }
-        let deferred = synced_options::sync_files_are_protected(&metadata)
-            || synced_options::instance_is_running(&metadata, state).await?;
+        let deferred = synced_options::sync_files_are_protected(&metadata);
         let path = options_path(&metadata, state);
         let (document, inspection_error) = if path.exists() {
             match read_document(&path).await {
@@ -487,7 +486,7 @@ pub(super) fn find_common_local_value(
             Some(CanonicalValue::ExternalRaw(raw_value.to_string()))
         };
         if let Some(value) = value
-            .filter(|value| validate_canonical_value(definition, value).is_ok())
+            .filter(|value| validate_file_value(definition, value).is_ok())
         {
             values.push(value);
         } else {
diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/launch_overrides.rs b/packages/app-lib/src/api/instance/synced_options/game_options/launch_overrides.rs
index 2f3295f88a..a095bb5398 100644
--- a/packages/app-lib/src/api/instance/synced_options/game_options/launch_overrides.rs
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/launch_overrides.rs
@@ -1,22 +1,14 @@
-//! Updates shared settings, then applies launcher settings before Minecraft starts.
+//! Writes synced settings and launcher overrides before Minecraft starts.
 
-use super::super as synced_options;
-use super::CATALOG_REVISION;
-use super::api_types::SyncReason;
-use super::catalog::setting_by_file_key;
 use super::options_file::{
     GameOptionsDocument, input_error, options_path, read_document, sha1_bytes,
     validate_raw_key_value,
 };
-use super::pack_updates::materialize_yosbr_options_if_missing;
-use super::read_instance_changes::previous_applied_settings;
 use super::write_shared_settings::{
-    sync_instance_options, sync_is_active_for_instance,
-};
-use crate::state::{
-    GameOptionsProjection, InstanceMetadata, ProjectedField, ProjectionOrigin,
-    State, SyncedOption, load_game_options_sync_state,
+    apply_shared_settings_to_instance, remember_processed_sha,
+    sync_is_active_for_instance,
 };
+use crate::state::{InstanceMetadata, State};
 use crate::util::io;
 use std::collections::HashSet;
 
@@ -30,30 +22,23 @@ pub(super) fn currently_launcher_owned_keys(
     keys
 }
 
-/// Reads changes made in Minecraft and writes the latest shared values before launch.
+/// Writes canonical settings to `options.txt` before launch.
 pub async fn sync_before_launch(instance_id: &str) -> crate::Result<()> {
     let state = State::get().await?;
     let _guard = state.lock_synced_options().await;
     let metadata = crate::state::get_instance(instance_id, &state.pool)
         .await?
         .ok_or_else(|| input_error("Unknown instance"))?;
-    materialize_yosbr_options_if_missing(&metadata, &state).await?;
     if sync_is_active_for_instance(&metadata, &state).await? {
-        let _ = sync_instance_options(
-            &metadata,
-            &state,
-            SyncReason::BeforeLaunch,
-            true,
-        )
-        .await?;
+        let _ =
+            apply_shared_settings_to_instance(&metadata, &state, false).await?;
     }
     Ok(())
 }
 
 /// Applies launcher settings, such as forced fullscreen, after shared settings.
 ///
-/// We remember these separately so the next sync does not mistake them for changes
-/// made by the player.
+/// Stores the written file's hash so the watcher ignores the app's write.
 pub async fn apply_launcher_overrides(
     instance_id: &str,
     overrides: &[(String, String)],
@@ -72,72 +57,15 @@ pub async fn apply_launcher_overrides(
     } else {
         (GameOptionsDocument::empty(), Vec::new())
     };
-    let input_sha1 = sha1_bytes(&input_bytes);
-    let checkpoint = synced_options::checkpoint(
-        instance_id,
-        SyncedOption::GameOptions,
-        "default",
-        &state,
-    )
-    .await?;
-    let mut projection = checkpoint
-        .as_ref()
-        .filter(|checkpoint| checkpoint.expected_sha1 == input_sha1)
-        .and_then(|checkpoint| {
-            previous_applied_settings(checkpoint.merge_base.as_deref())
-        })
-        .unwrap_or(GameOptionsProjection {
-            schema_version: 1,
-            target_game_version: metadata
-                .applied_content_set
-                .game_version
-                .clone(),
-            input_sha1: input_sha1.clone(),
-            canonical_revision: load_game_options_sync_state(
-                &state.pool,
-                CATALOG_REVISION,
-            )
-            .await?
-            .0,
-            fields: Vec::new(),
-        });
-
     for (key, value) in overrides {
         validate_raw_key_value(key, value)?;
         document.set(key, value, true)?;
-        projection.fields.retain(|field| field.physical_key != *key);
-        let option_id = setting_by_file_key(key)
-            .map(|definition| definition.id.to_string())
-            .unwrap_or_else(|| format!("launcher:{key}"));
-        projection.fields.push(ProjectedField {
-            option_id,
-            physical_key: key.clone(),
-            raw_value: value.clone(),
-            origin: ProjectionOrigin::LauncherOverride,
-            migrated: false,
-        });
     }
     let output_bytes = document.serialize()?;
     let output_sha1 = sha1_bytes(&output_bytes);
-    projection.input_sha1 = input_sha1;
-    let projection_bytes = serde_json::to_vec(&projection)?;
-    synced_options::begin_checkpoint(
-        instance_id,
-        SyncedOption::GameOptions,
-        "default",
-        &output_sha1,
-        Some(&projection_bytes),
-        projection.canonical_revision as i64,
-        &state,
-    )
-    .await?;
-    io::write(&path, output_bytes).await?;
-    synced_options::finish_plain_checkpoint(
-        instance_id,
-        SyncedOption::GameOptions,
-        "default",
-        &state,
-    )
-    .await?;
+    if output_bytes != input_bytes {
+        io::write(&path, output_bytes).await?;
+    }
+    remember_processed_sha(instance_id, &output_sha1, &state).await?;
     Ok(())
 }
diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/local_settings_editor.rs b/packages/app-lib/src/api/instance/synced_options/game_options/local_settings_editor.rs
index d66434c5f1..98bd098252 100644
--- a/packages/app-lib/src/api/instance/synced_options/game_options/local_settings_editor.rs
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/local_settings_editor.rs
@@ -100,11 +100,6 @@ async fn load_instance_document(
             "Game settings cannot be edited while this instance is installing or updating.",
         ));
     }
-    if synced_options::instance_is_running(&metadata, state).await? {
-        return Err(input_error(
-            "Game settings cannot be edited while this instance is running.",
-        ));
-    }
     let path = options_path(&metadata, state);
     if !path.exists() {
         return Err(input_error(
diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/mod.rs b/packages/app-lib/src/api/instance/synced_options/game_options/mod.rs
index aae0abfa8b..862eb02606 100644
--- a/packages/app-lib/src/api/instance/synced_options/game_options/mod.rs
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/mod.rs
@@ -4,9 +4,9 @@
 //! values. Each instance keeps its own `options.txt`; we update only the selected
 //! settings and leave modpack defaults, comments, and disabled settings alone.
 //!
-//! Before writing a file, we compare it with what Modrinth wrote last time. This
-//! lets changes made in Minecraft become the new shared values. When multiple
-//! instances change the same setting, the latest change processed by sync wins.
+//! The watcher imports enabled values whenever `options.txt` changes. After the
+//! app writes the file, it stores the file hash and ignores the matching watcher
+//! event. On conflict, the latest save is persisted.
 //!
 //! Minecraft has renamed and reformatted settings over time. `catalog`
 //! contains the file keys and conversions for the versions we support. Any other
@@ -16,8 +16,8 @@
 //! `catalog` will need to be checked every time a Minecraft update comes out. For maintenance reasons we will just
 //! do this for major releases, no snapshots/pre-releases.
 //!
-//! Launcher-enforced settings, such as fullscreen, are applied last and are not
-//! mistaken for changes made by the player.
+//! Launcher-enforced settings, such as fullscreen, are applied last and excluded
+//! when importing `options.txt`.
 
 mod api_types;
 mod catalog;
@@ -58,12 +58,13 @@ pub(crate) use fullscreen::{
 };
 pub(crate) use write_shared_settings::sync_all_participating_instances;
 
-pub(in crate::api::instance) use api_types::SyncReason;
 pub(in crate::api::instance) use pack_updates::{
     detach_instance, prepare_instance_update_with_state,
 };
 pub(in crate::api::instance) use source_selection::initialize_from_source_instance;
-pub(in crate::api::instance) use write_shared_settings::sync_instance_with_state;
+pub(in crate::api::instance) use write_shared_settings::{
+    apply_instance_with_state, capture_instance_file_change,
+};
 
 pub(in crate::api::instance) async fn canonical_exists(
     state: &crate::state::State,
@@ -72,7 +73,7 @@ pub(in crate::api::instance) async fn canonical_exists(
 }
 
 const OPTIONS_FILE: &str = "options.txt";
-const CATALOG_REVISION: u32 = 4;
+const CATALOG_REVISION: u32 = 5;
 const MAX_OPTIONS_BYTES: usize = 2 * 1024 * 1024;
 const MAX_OPTIONS_LINES: usize = 16_384;
 const MAX_KEY_BYTES: usize = 1_024;
diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/pack_updates.rs b/packages/app-lib/src/api/instance/synced_options/game_options/pack_updates.rs
index 5c1cc57d52..a0d4c0b74c 100644
--- a/packages/app-lib/src/api/instance/synced_options/game_options/pack_updates.rs
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/pack_updates.rs
@@ -1,10 +1,10 @@
 //! Keeps game settings intact when a modpack is installed or updated.
 
 use super::MAX_OPTIONS_BYTES;
-use super::api_types::SyncReason;
 use super::options_file::{input_error, options_path, sha1_bytes};
 use super::write_shared_settings::{
-    sync_instance_options, sync_is_active_for_instance,
+    apply_shared_settings_to_instance, capture_instance_options,
+    sync_is_active_for_instance,
 };
 use crate::state::{InstanceLink, InstanceMetadata, State, SyncedOption};
 use crate::util::io;
@@ -154,13 +154,7 @@ pub(in crate::api::instance) async fn prepare_instance_update_with_state(
     .execute(&state.pool)
     .await?;
     if sync_is_active_for_instance(metadata, state).await? {
-        let _ = sync_instance_options(
-            metadata,
-            state,
-            SyncReason::BeforePackUpdate,
-            true,
-        )
-        .await?;
+        let _ = capture_instance_options(metadata, state, true).await?;
     }
     let path = options_path(metadata, state);
     let (had_file, bytes, sha1) = if path.exists() {
@@ -297,13 +291,8 @@ pub async fn capture_pack_base(
     .await?;
 
     if sync_is_active_for_instance(&metadata, &state).await? {
-        if let Err(error) = sync_instance_options(
-            &metadata,
-            &state,
-            SyncReason::PackExtracted,
-            false,
-        )
-        .await
+        if let Err(error) =
+            apply_shared_settings_to_instance(&metadata, &state, true).await
         {
             tracing::warn!(
                 "Captured the modpack options.txt for {}, but shared settings could not be overlaid yet: {error}",
diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/read_instance_changes.rs b/packages/app-lib/src/api/instance/synced_options/game_options/read_instance_changes.rs
index f05f641f99..b4022f44b2 100644
--- a/packages/app-lib/src/api/instance/synced_options/game_options/read_instance_changes.rs
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/read_instance_changes.rs
@@ -1,6 +1,5 @@
-//! Finds settings changed in Minecraft and shares those changes with other instances.
+//! Imports saved `options.txt` settings into the canonical values.
 
-use super::super as synced_options;
 use super::CATALOG_REVISION;
 use super::api_types::canonical_values_equal;
 use super::catalog::*;
@@ -8,9 +7,9 @@ use super::fullscreen::update_app_fullscreen_setting;
 use super::launch_overrides::currently_launcher_owned_keys;
 use super::options_file::{GameOptionsDocument, validate_raw_key_value};
 use crate::state::{
-    CanonicalValue, GameOptionKind, GameOptionsProjection, InstanceMetadata,
-    ProjectionOrigin, State, SyncedOption, load_game_option_preferences,
-    load_game_options_sync_state, load_shared_game_options,
+    CanonicalValue, GameOptionKind, InstanceMetadata, State,
+    load_game_option_preferences, load_game_options_sync_state,
+    load_shared_game_options,
 };
 use chrono::Utc;
 use std::collections::HashSet;
@@ -19,80 +18,25 @@ pub(super) fn custom_setting_id(key: &str) -> String {
     format!("external:{key}")
 }
 
-pub(super) fn previous_applied_settings(
-    bytes: Option<&[u8]>,
-) -> Option<GameOptionsProjection> {
-    serde_json::from_slice(bytes?).ok()
-}
-
-pub(super) async fn launcher_keys_for_document(
-    instance_id: &str,
-    input_sha1: &str,
-    state: &State,
-) -> crate::Result<HashSet<String>> {
-    Ok(synced_options::checkpoint(
-        instance_id,
-        SyncedOption::GameOptions,
-        "default",
-        state,
-    )
-    .await?
-    .filter(|checkpoint| checkpoint.expected_sha1 == input_sha1)
-    .and_then(|checkpoint| {
-        previous_applied_settings(checkpoint.merge_base.as_deref())
-    })
-    .into_iter()
-    .flat_map(|projection| projection.fields.into_iter())
-    .filter(|field| field.origin == ProjectionOrigin::LauncherOverride)
-    .map(|field| field.physical_key)
-    .collect())
-}
-
-/// Compares `options.txt` with what Modrinth last wrote. A valid change becomes
-/// the new shared value unless the launcher made it.
+/// Imports every enabled setting present in `options.txt`. The caller skips file
+/// hashes produced by app writes.
 pub(super) async fn read_instance_changes_into_shared_settings(
     metadata: &InstanceMetadata,
     document: &GameOptionsDocument,
-    projection: Option<&GameOptionsProjection>,
     state: &State,
 ) -> crate::Result<bool> {
     let values = load_shared_game_options(&state.pool).await?;
     let preferences = load_game_option_preferences(&state.pool).await?;
-    let currently_launcher_owned = currently_launcher_owned_keys(metadata);
-    let Some(projection) = projection else {
-        return discover_custom_settings(
-            metadata,
-            document,
-            &currently_launcher_owned,
-            state,
-        )
-        .await;
-    };
-    let mut launcher_keys = projection
-        .fields
-        .iter()
-        .filter(|field| field.origin == ProjectionOrigin::LauncherOverride)
-        .map(|field| field.physical_key.clone())
-        .collect::<HashSet<_>>();
-    if !currently_launcher_owned.contains("fullscreen") {
-        launcher_keys.remove("fullscreen");
-    }
-    launcher_keys.extend(currently_launcher_owned);
+    let launcher_keys = currently_launcher_owned_keys(metadata);
     let now = Utc::now().timestamp();
     let mut updates = Vec::new();
-
-    for field in &projection.fields {
-        if field.origin == ProjectionOrigin::LauncherOverride
-            || launcher_keys.contains(&field.physical_key)
-            || !preferences
-                .get(&field.option_id)
-                .is_some_and(|preference| preference.enabled)
+    for (option_id, stored) in &values {
+        if !preferences
+            .get(option_id)
+            .is_some_and(|preference| preference.enabled)
         {
             continue;
         }
-        let Some(stored) = values.get(&field.option_id) else {
-            continue;
-        };
         if matches!(stored.kind, GameOptionKind::External)
             && stored.raw_key.is_none()
         {
@@ -105,7 +49,7 @@ pub(super) async fn read_instance_changes_into_shared_settings(
         {
             continue;
         }
-        let definition = setting_by_id(&field.option_id);
+        let definition = setting_by_id(option_id);
         if definition.is_some()
             && !supported_settings_cover_game_version(
                 &metadata.applied_content_set.game_version,
@@ -113,21 +57,14 @@ pub(super) async fn read_instance_changes_into_shared_settings(
         {
             continue;
         }
-        let current_key = if document.value(&field.physical_key).is_some() {
-            Some(field.physical_key.clone())
-        } else if let Some(definition) = definition {
+        let current_key = if let Some(definition) = definition {
             observed_physical_key(
                 definition,
                 document,
                 &metadata.applied_content_set.game_version,
             )
         } else {
-            target_physical_key(
-                None,
-                stored,
-                document,
-                &metadata.applied_content_set.game_version,
-            )
+            stored.raw_key.clone()
         };
         let Some(current_key) = current_key else {
             continue;
@@ -138,19 +75,17 @@ pub(super) async fn read_instance_changes_into_shared_settings(
         let Some(current_raw) = document.value(&current_key) else {
             continue;
         };
-        if current_key == field.physical_key && current_raw == field.raw_value {
-            continue;
-        }
-        let projected_candidate = if let Some(definition) = definition {
-            decode_value(definition, &field.physical_key, &field.raw_value)
-        } else if matches!(stored.kind, GameOptionKind::External) {
-            Some(CanonicalValue::ExternalRaw(field.raw_value.clone()))
-        } else {
-            None
-        };
         let candidate = if let Some(definition) = definition {
-            decode_value(definition, &current_key, current_raw)
+            decode_value_for_version(
+                definition,
+                &current_key,
+                current_raw,
+                &metadata.applied_content_set.game_version,
+            )
         } else if matches!(stored.kind, GameOptionKind::External) {
+            if validate_raw_key_value(&current_key, current_raw).is_err() {
+                continue;
+            }
             Some(CanonicalValue::ExternalRaw(current_raw.to_string()))
         } else {
             None
@@ -158,14 +93,6 @@ pub(super) async fn read_instance_changes_into_shared_settings(
         let Some(candidate) = candidate else {
             continue;
         };
-        if validate_canonical_value(definition, &candidate).is_err() {
-            continue;
-        }
-        if projected_candidate.as_ref().is_some_and(|projected| {
-            canonical_values_equal(projected, &candidate)
-        }) {
-            continue;
-        }
         if stored
             .value
             .as_ref()
@@ -173,15 +100,7 @@ pub(super) async fn read_instance_changes_into_shared_settings(
         {
             continue;
         }
-        let ambiguous_lossy_migration = definition.is_some_and(|definition| {
-            matches!(definition.encoding, ValueEncoding::AmbientOcclusion)
-                && matches!(field.raw_value.as_str(), "1" | "2")
-                && current_raw == "true"
-        });
-        if ambiguous_lossy_migration {
-            continue;
-        }
-        updates.push((field.option_id.clone(), candidate, stored.revision));
+        updates.push((option_id.to_string(), candidate, stored.revision));
     }
 
     let mut changed = false;
@@ -191,14 +110,11 @@ pub(super) async fn read_instance_changes_into_shared_settings(
             load_game_options_sync_state(&state.pool, CATALOG_REVISION).await?;
         let mut tx = state.pool.begin().await?;
         for (option_id, candidate, revision) in updates {
-            if option_id == "fullscreen" {
-                fullscreen_value = Some(candidate.clone());
-            }
             let next_revision = revision.saturating_add(1) as i64;
             let current_revision = revision as i64;
             let value_json = serde_json::to_string(&candidate)?;
             let canonical_type = candidate.type_name();
-            sqlx::query!(
+            let result = sqlx::query!(
                 "
 				UPDATE synced_game_option_values
 				SET canonical_type = ?, canonical_value_json = ?, seeded = 1,
@@ -217,6 +133,12 @@ pub(super) async fn read_instance_changes_into_shared_settings(
             )
             .execute(&mut *tx)
             .await?;
+            if result.rows_affected() == 0 {
+                continue;
+            }
+            if option_id == "fullscreen" {
+                fullscreen_value = Some(candidate.clone());
+            }
             changed = true;
         }
         if changed {
@@ -238,11 +160,10 @@ pub(super) async fn read_instance_changes_into_shared_settings(
         }
         tx.commit().await?;
     }
-    Ok(
+    let discovered =
         discover_custom_settings(metadata, document, &launcher_keys, state)
-            .await?
-            || changed,
-    )
+            .await?;
+    Ok(discovered || changed)
 }
 
 /// Finds settings added by mods and adds them to the shared settings list.
diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/settings_editor.rs b/packages/app-lib/src/api/instance/synced_options/game_options/settings_editor.rs
index 94d15b3d08..4162c29a75 100644
--- a/packages/app-lib/src/api/instance/synced_options/game_options/settings_editor.rs
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/settings_editor.rs
@@ -514,7 +514,7 @@ pub async fn save_changes(
     }
     tx.commit().await?;
 
-    let projection = if changed {
+    let write_result = if changed {
         sync_all_participating_instances(&state).await
     } else {
         SaveGameSettingsResult {
@@ -530,6 +530,6 @@ pub async fn save_changes(
     Ok(SaveGameSettingsResult {
         state: Some(load_settings_editor(&state).await?),
         conflicts,
-        ..projection
+        ..write_result
     })
 }
diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/source_selection.rs b/packages/app-lib/src/api/instance/synced_options/game_options/source_selection.rs
index 9559aefa76..f3272ba33b 100644
--- a/packages/app-lib/src/api/instance/synced_options/game_options/source_selection.rs
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/source_selection.rs
@@ -7,12 +7,9 @@ use super::catalog::*;
 use super::fullscreen::update_app_fullscreen_setting;
 use super::launch_overrides::currently_launcher_owned_keys;
 use super::options_file::{
-    input_error, options_path, read_document, sha1_bytes,
-    validate_raw_key_value,
-};
-use super::read_instance_changes::{
-    custom_setting_id, launcher_keys_for_document,
+    input_error, options_path, read_document, validate_raw_key_value,
 };
+use super::read_instance_changes::custom_setting_id;
 use crate::state::{
     CanonicalValue, InstanceMetadata, State, load_game_option_preferences,
     load_game_options_sync_state, load_shared_game_options,
@@ -30,16 +27,8 @@ pub(in crate::api::instance) async fn initialize_from_source_instance(
             "Launch the source instance once so Minecraft can create options.txt.",
         ));
     }
-    let (document, input_bytes) = read_document(&path).await?;
-    let input_sha1 = sha1_bytes(&input_bytes);
-    let mut launcher_keys =
-        launcher_keys_for_document(&metadata.instance.id, &input_sha1, state)
-            .await?;
-    let currently_launcher_owned = currently_launcher_owned_keys(metadata);
-    if !currently_launcher_owned.contains("fullscreen") {
-        launcher_keys.remove("fullscreen");
-    }
-    launcher_keys.extend(currently_launcher_owned);
+    let (document, _) = read_document(&path).await?;
+    let launcher_keys = currently_launcher_owned_keys(metadata);
     let entries = document.effective_entries();
     let current_values = load_shared_game_options(&state.pool).await?;
     let current_preferences = load_game_option_preferences(&state.pool).await?;
@@ -332,28 +321,14 @@ pub async fn list_sync_sources()
             eligible = false;
             disabled_reason =
                 Some(GameOptionsSourceIssue::InstallingOrUpdating);
-        } else if synced_options::instance_is_running(&metadata, &state).await?
-        {
-            eligible = false;
-            disabled_reason = Some(GameOptionsSourceIssue::Running);
         } else if !path.exists() {
             eligible = false;
             disabled_reason = Some(GameOptionsSourceIssue::MissingOptionsFile);
         } else {
             match read_document(&path).await {
-                Ok((document, input_bytes)) => {
-                    let mut launcher_keys = launcher_keys_for_document(
-                        &metadata.instance.id,
-                        &sha1_bytes(&input_bytes),
-                        &state,
-                    )
-                    .await?;
-                    let currently_launcher_owned =
+                Ok((document, _)) => {
+                    let launcher_keys =
                         currently_launcher_owned_keys(&metadata);
-                    if !currently_launcher_owned.contains("fullscreen") {
-                        launcher_keys.remove("fullscreen");
-                    }
-                    launcher_keys.extend(currently_launcher_owned);
                     let entries = document.effective_entries();
                     let source_version =
                         metadata.applied_content_set.game_version.as_str();
diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/write_shared_settings.rs b/packages/app-lib/src/api/instance/synced_options/game_options/write_shared_settings.rs
index 8e24568a61..06bff8c3da 100644
--- a/packages/app-lib/src/api/instance/synced_options/game_options/write_shared_settings.rs
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/write_shared_settings.rs
@@ -1,387 +1,358 @@
-//! Writes shared settings into an instance without replacing the rest of `options.txt`.
+//! Imports `options.txt` saves and copies canonical values to synced instances.
 
-use super::super::{self as synced_options, CheckpointStatus};
+use super::super as synced_options;
 use super::CATALOG_REVISION;
 use super::api_types::{
-    GameOptionMappingKind, SaveGameSettingsResult, SyncOutcome, SyncReason,
+	GameOptionMappingKind, SaveGameSettingsResult, SyncOutcome,
 };
 use super::catalog::*;
 use super::options_file::{
-    GameOptionsDocument, options_path, read_document, sha1_bytes,
+	GameOptionsDocument, options_path, read_document, sha1_bytes,
 };
 use super::pack_updates::materialize_yosbr_options_if_missing;
-use super::read_instance_changes::{
-    discover_custom_settings, previous_applied_settings,
-    read_instance_changes_into_shared_settings,
-};
+use super::read_instance_changes::read_instance_changes_into_shared_settings;
+use super::source_selection::initialize_from_source_instance;
 use crate::state::{
-    CanonicalValue, GameOptionsProjection, InstanceMetadata, ProjectedField,
-    ProjectionOrigin, State, SyncedOption, game_options_sync_is_enabled,
-    load_game_option_preferences, load_game_options_sync_state,
-    load_shared_game_options,
+	CanonicalValue, InstanceMetadata, State, SyncedOption,
+	game_options_sync_is_enabled, load_game_option_preferences,
+	load_game_options_sync_state, load_shared_game_options,
 };
 use crate::util::io;
-use std::collections::HashSet;
+
+struct AppliedSettings {
+	count: usize,
+	used_migration: bool,
+}
 
 pub(super) async fn sync_is_active_for_instance(
-    metadata: &InstanceMetadata,
-    state: &State,
+	metadata: &InstanceMetadata,
+	state: &State,
 ) -> crate::Result<bool> {
-    Ok(metadata.synced_options.game_options
-        && game_options_sync_is_enabled(&state.pool).await?)
+	Ok(metadata.synced_options.game_options
+		&& game_options_sync_is_enabled(&state.pool).await?)
+}
+
+pub(super) async fn remember_processed_sha(
+	instance_id: &str,
+	sha1: &str,
+	state: &State,
+) -> crate::Result<()> {
+	let (canonical_revision, _) =
+		load_game_options_sync_state(&state.pool, CATALOG_REVISION).await?;
+	synced_options::begin_checkpoint(
+		instance_id,
+		SyncedOption::GameOptions,
+		"default",
+		sha1,
+		None,
+		canonical_revision as i64,
+		state,
+	)
+	.await?;
+	synced_options::finish_plain_checkpoint(
+		instance_id,
+		SyncedOption::GameOptions,
+		"default",
+		state,
+	)
+	.await
+}
+
+async fn apply_shared_settings_to_document(
+	metadata: &InstanceMetadata,
+	document: &mut GameOptionsDocument,
+	state: &State,
+) -> crate::Result<AppliedSettings> {
+	let values = load_shared_game_options(&state.pool).await?;
+	let preferences = load_game_option_preferences(&state.pool).await?;
+	let mut count = 0;
+	let mut used_migration = false;
+
+	for (option_id, preference) in preferences {
+		if !preference.enabled {
+			continue;
+		}
+		if option_id == "fullscreen"
+			&& metadata.launch_overrides.force_fullscreen.is_some()
+		{
+			continue;
+		}
+		let Some(stored) = values.get(&option_id) else {
+			continue;
+		};
+		let Some(value) = stored.value.as_ref().filter(|_| stored.seeded)
+		else {
+			continue;
+		};
+		let definition = setting_by_id(&option_id);
+		if definition.is_some()
+			&& !supported_settings_cover_game_version(
+				&metadata.applied_content_set.game_version,
+			)
+		{
+			continue;
+		}
+		if definition.is_none()
+			&& stored
+				.raw_key
+				.as_deref()
+				.is_some_and(|key| setting_by_file_key(key).is_some())
+		{
+			continue;
+		}
+
+		let target_version = &metadata.applied_content_set.game_version;
+		let key = target_physical_key(
+			definition,
+			stored,
+			document,
+			target_version,
+		)
+		.or_else(|| {
+			definition.and_then(|definition| {
+				if definition.versioned_keys.is_empty() {
+					definition.keys.first().map(|key| (*key).to_string())
+				} else {
+					physical_variant_for_version(definition, target_version)
+						.map(|variant| variant.key.to_string())
+				}
+			})
+		})
+		.or_else(|| stored.raw_key.clone());
+		let Some(key) = key else {
+			continue;
+		};
+
+		let migrated = definition.is_some_and(|definition| {
+			alias_migration_needed(definition, document, &key)
+				|| document.value(&key).is_some_and(|raw| {
+					!physical_representation_supported_for_target(
+						definition,
+						&key,
+						raw,
+						target_version,
+					)
+				})
+		});
+		let raw_value = if let Some(definition) = definition {
+			let Some(raw_value) = encode_value(
+				definition,
+				&key,
+				value,
+				target_version,
+				document.value(&key),
+			) else {
+				continue;
+			};
+			raw_value
+		} else if let CanonicalValue::ExternalRaw(raw_value) = value {
+			raw_value.clone()
+		} else {
+			continue;
+		};
+
+		document.set(&key, &raw_value, definition.is_none() || migrated)?;
+		count += 1;
+		used_migration |= migrated
+			|| definition.is_some_and(|definition| {
+				(matches!(definition.encoding, ValueEncoding::KeyBinding)
+					&& split_key_binding(&raw_value).0.parse::<i32>().is_ok())
+					|| physical_variant_for_present_key(
+						definition,
+						&key,
+						target_version,
+					)
+					.map(|variant| {
+						variant.mapping != GameOptionMappingKind::Direct
+					})
+					.unwrap_or_else(|| {
+						definition.keys.first().copied() != Some(key.as_str())
+					})
+			});
+	}
+
+	Ok(AppliedSettings {
+		count,
+		used_migration,
+	})
 }
 
-/// Updates the enabled settings in memory and records the exact keys and values
-/// Modrinth wrote, so changes made later in Minecraft can be recognized.
-pub(super) async fn apply_shared_settings_to_document(
-    metadata: &InstanceMetadata,
-    document: &mut GameOptionsDocument,
-    add_missing_keys: bool,
-    state: &State,
-) -> crate::Result<Vec<ProjectedField>> {
-    let values = load_shared_game_options(&state.pool).await?;
-    let preferences = load_game_option_preferences(&state.pool).await?;
-    let mut fields = Vec::new();
-    for (option_id, preference) in preferences {
-        if !preference.enabled {
-            continue;
-        }
-        if option_id == "fullscreen"
-            && metadata.launch_overrides.force_fullscreen.is_some()
-        {
-            continue;
-        }
-        let Some(stored) = values.get(&option_id) else {
-            continue;
-        };
-        let Some(value) = stored.value.as_ref().filter(|_| stored.seeded)
-        else {
-            continue;
-        };
-        let definition = setting_by_id(&option_id);
-        if definition.is_some()
-            && !supported_settings_cover_game_version(
-                &metadata.applied_content_set.game_version,
-            )
-        {
-            continue;
-        }
-        if definition.is_none()
-            && stored
-                .raw_key
-                .as_deref()
-                .is_some_and(|key| setting_by_file_key(key).is_some())
-        {
-            continue;
-        }
-        let target_version = &metadata.applied_content_set.game_version;
-        let key =
-            target_physical_key(definition, stored, document, target_version)
-                .or_else(|| {
-                    if !add_missing_keys {
-                        return None;
-                    }
-                    definition.and_then(|definition| {
-                        if definition.versioned_keys.is_empty() {
-                            definition
-                                .keys
-                                .first()
-                                .map(|key| (*key).to_string())
-                        } else {
-                            physical_variant_for_version(
-                                definition,
-                                target_version,
-                            )
-                            .map(|variant| variant.key.to_string())
-                        }
-                    })
-                });
-        let Some(key) = key else {
-            continue;
-        };
-        let migrated = definition.is_some_and(|definition| {
-            alias_migration_needed(definition, document, &key)
-                || document.value(&key).is_some_and(|raw| {
-                    !physical_representation_supported_for_target(
-                        definition,
-                        &key,
-                        raw,
-                        &metadata.applied_content_set.game_version,
-                    )
-                })
-        });
-        let raw_value = if let Some(definition) = definition {
-            let Some(raw_value) = encode_value(
-                definition,
-                &key,
-                value,
-                &metadata.applied_content_set.game_version,
-                document.value(&key),
-            ) else {
-                continue;
-            };
-            raw_value
-        } else if let CanonicalValue::ExternalRaw(raw_value) = value {
-            raw_value.clone()
-        } else {
-            continue;
-        };
-        document.set(&key, &raw_value, definition.is_none() || migrated)?;
-        fields.push(ProjectedField {
-            option_id,
-            physical_key: key,
-            raw_value,
-            origin: ProjectionOrigin::Shared,
-            migrated,
-        });
-    }
-    Ok(fields)
+pub(super) async fn apply_shared_settings_to_instance(
+	metadata: &InstanceMetadata,
+	state: &State,
+	allow_protected: bool,
+) -> crate::Result<SyncOutcome> {
+	if !allow_protected && synced_options::sync_files_are_protected(metadata) {
+		return Ok(SyncOutcome::Deferred);
+	}
+	if !sync_is_active_for_instance(metadata, state).await? {
+		return Ok(SyncOutcome::Unchanged);
+	}
+
+	let path = options_path(metadata, state);
+	if !path.exists() {
+		materialize_yosbr_options_if_missing(metadata, state).await?;
+	}
+	let file_was_missing = !path.exists();
+	let (mut document, input_bytes) = if path.exists() {
+		read_document(&path).await?
+	} else {
+		(GameOptionsDocument::empty(), Vec::new())
+	};
+	let applied =
+		apply_shared_settings_to_document(metadata, &mut document, state).await?;
+	if file_was_missing && applied.count == 0 {
+		return Ok(SyncOutcome::WaitingForFile);
+	}
+
+	let output_bytes = document.serialize()?;
+	let output_sha1 = sha1_bytes(&output_bytes);
+	let changed = file_was_missing || output_bytes != input_bytes;
+	if changed {
+		io::write(&path, output_bytes).await?;
+	}
+	remember_processed_sha(&metadata.instance.id, &output_sha1, state).await?;
+
+	Ok(if changed && applied.used_migration {
+		SyncOutcome::Migrated
+	} else if changed {
+		SyncOutcome::Applied
+	} else {
+		SyncOutcome::Unchanged
+	})
 }
 
-/// Reads local changes, applies shared values, and stores the keys and values it
-/// wrote so the next sync can tell what changed.
-pub(super) async fn sync_instance_options(
-    metadata: &InstanceMetadata,
-    state: &State,
-    reason: SyncReason,
-    allow_publish: bool,
+pub(super) async fn capture_instance_options(
+	metadata: &InstanceMetadata,
+	state: &State,
+	allow_protected: bool,
 ) -> crate::Result<SyncOutcome> {
-    if synced_options::instance_is_running(metadata, state).await? {
-        return Ok(SyncOutcome::Deferred);
-    }
-    if reason != SyncReason::PackExtracted
-        && reason != SyncReason::BeforePackUpdate
-        && synced_options::sync_files_are_protected(metadata)
-    {
-        return Ok(SyncOutcome::Deferred);
-    }
-    let path = options_path(metadata, state);
-    let file_was_missing = !path.exists();
-    if file_was_missing && reason != SyncReason::BeforePackUpdate {
-        materialize_yosbr_options_if_missing(metadata, state).await?;
-    }
-    let creating_empty_document =
-        !path.exists() && reason != SyncReason::BeforePackUpdate;
-    let (mut document, input_bytes) = if path.exists() {
-        read_document(&path).await?
-    } else if creating_empty_document {
-        (GameOptionsDocument::empty(), Vec::new())
-    } else {
-        return Ok(SyncOutcome::WaitingForFile);
-    };
-    let input_sha1 = sha1_bytes(&input_bytes);
-    let checkpoint = synced_options::checkpoint(
-        &metadata.instance.id,
-        SyncedOption::GameOptions,
-        "default",
-        state,
-    )
-    .await?;
-    let prior_projection = checkpoint.as_ref().and_then(|checkpoint| {
-        previous_applied_settings(checkpoint.merge_base.as_deref())
-    });
-    let should_publish = allow_publish
-        && !file_was_missing
-        && reason != SyncReason::PackExtracted
-        && checkpoint.as_ref().is_none_or(|checkpoint| {
-            match checkpoint.status {
-                CheckpointStatus::Ready => {
-                    checkpoint.expected_sha1 != input_sha1
-                }
-                CheckpointStatus::Pending => {
-                    checkpoint.expected_sha1 != input_sha1
-                        && prior_projection.as_ref().is_none_or(|projection| {
-                            projection.input_sha1 != input_sha1
-                        })
-                }
-            }
-        });
-    let canonical_changed = if should_publish {
-        read_instance_changes_into_shared_settings(
-            metadata,
-            &document,
-            prior_projection.as_ref(),
-            state,
-        )
-        .await?
-    } else if allow_publish
-        && !file_was_missing
-        && reason != SyncReason::PackExtracted
-    {
-        let launcher_keys = prior_projection
-            .as_ref()
-            .into_iter()
-            .flat_map(|projection| projection.fields.iter())
-            .filter(|field| field.origin == ProjectionOrigin::LauncherOverride)
-            .map(|field| field.physical_key.clone())
-            .collect::<HashSet<_>>();
-        discover_custom_settings(metadata, &document, &launcher_keys, state)
-            .await?
-    } else {
-        false
-    };
-    if reason == SyncReason::BeforePackUpdate {
-        if canonical_changed {
-            let _ = Box::pin(sync_other_participating_instances(
-                state,
-                Some(&metadata.instance.id),
-            ))
-            .await;
-        }
-        return Ok(SyncOutcome::Unchanged);
-    }
+	if !allow_protected && synced_options::sync_files_are_protected(metadata) {
+		return Ok(SyncOutcome::Deferred);
+	}
+	if !sync_is_active_for_instance(metadata, state).await? {
+		return Ok(SyncOutcome::Unchanged);
+	}
 
-    let fields = apply_shared_settings_to_document(
-        metadata,
-        &mut document,
-        creating_empty_document,
-        state,
-    )
-    .await?;
-    let used_migration = fields.iter().any(|field| {
-        field.migrated
-            || setting_by_id(&field.option_id).is_some_and(|definition| {
-                (matches!(definition.encoding, ValueEncoding::KeyBinding)
-                    && split_key_binding(&field.raw_value)
-                        .0
-                        .parse::<i32>()
-                        .is_ok())
-                    || physical_variant_for_present_key(
-                        definition,
-                        &field.physical_key,
-                        &metadata.applied_content_set.game_version,
-                    )
-                    .map(|variant| {
-                        variant.mapping != GameOptionMappingKind::Direct
-                    })
-                    .unwrap_or_else(|| {
-                        definition.keys.first().copied()
-                            != Some(field.physical_key.as_str())
-                    })
-            })
-    });
-    let output_bytes = document.serialize()?;
-    let output_sha1 = sha1_bytes(&output_bytes);
-    let (canonical_revision, _) =
-        load_game_options_sync_state(&state.pool, CATALOG_REVISION).await?;
-    let projection = GameOptionsProjection {
-        schema_version: 1,
-        target_game_version: metadata.applied_content_set.game_version.clone(),
-        input_sha1,
-        canonical_revision,
-        fields,
-    };
-    let projection_bytes = serde_json::to_vec(&projection)?;
-    synced_options::begin_checkpoint(
-        &metadata.instance.id,
-        SyncedOption::GameOptions,
-        "default",
-        &output_sha1,
-        Some(&projection_bytes),
-        canonical_revision as i64,
-        state,
-    )
-    .await?;
-    let changed = file_was_missing || output_bytes != input_bytes;
-    if changed {
-        io::write(&path, output_bytes).await?;
-    }
-    synced_options::finish_plain_checkpoint(
-        &metadata.instance.id,
-        SyncedOption::GameOptions,
-        "default",
-        state,
-    )
-    .await?;
-    if canonical_changed {
-        let _ = Box::pin(sync_other_participating_instances(
-            state,
-            Some(&metadata.instance.id),
-        ))
-        .await;
-    }
-    Ok(if changed && used_migration {
-        SyncOutcome::Migrated
-    } else if changed {
-        SyncOutcome::Applied
-    } else {
-        SyncOutcome::Unchanged
-    })
+	let path = options_path(metadata, state);
+	if !path.exists() {
+		return Ok(SyncOutcome::WaitingForFile);
+	}
+	let (document, input_bytes) = read_document(&path).await?;
+	let input_sha1 = sha1_bytes(&input_bytes);
+	let checkpoint = synced_options::checkpoint(
+		&metadata.instance.id,
+		SyncedOption::GameOptions,
+		"default",
+		state,
+	)
+	.await?;
+	if checkpoint
+		.as_ref()
+		.is_some_and(|checkpoint| checkpoint.expected_sha1 == input_sha1)
+	{
+		return Ok(SyncOutcome::Unchanged);
+	}
+
+	let canonical_changed = if crate::state::shared_game_options_exist(
+		&state.pool,
+	)
+	.await?
+	{
+		read_instance_changes_into_shared_settings(metadata, &document, state)
+			.await?
+	} else {
+		initialize_from_source_instance(metadata, state).await?;
+		true
+	};
+	remember_processed_sha(&metadata.instance.id, &input_sha1, state).await?;
+
+	if canonical_changed {
+		let _ =
+			sync_other_participating_instances(state, Some(&metadata.instance.id))
+				.await;
+	}
+	Ok(SyncOutcome::Unchanged)
+}
+
+pub(in crate::api::instance) async fn capture_instance_file_change(
+	metadata: &InstanceMetadata,
+	state: &State,
+) -> crate::Result<()> {
+	capture_instance_options(metadata, state, false).await?;
+	Ok(())
 }
 
-pub(in crate::api::instance) async fn sync_instance_with_state(
-    metadata: &InstanceMetadata,
-    state: &State,
-    reason: SyncReason,
+pub(in crate::api::instance) async fn apply_instance_with_state(
+	metadata: &InstanceMetadata,
+	state: &State,
 ) -> crate::Result<()> {
-    sync_instance_options(metadata, state, reason, true).await?;
-    Ok(())
+	apply_shared_settings_to_instance(metadata, state, false).await?;
+	Ok(())
 }
 
 pub(super) async fn sync_other_participating_instances(
-    state: &State,
-    excluded_instance_id: Option<&str>,
+	state: &State,
+	excluded_instance_id: Option<&str>,
 ) -> SaveGameSettingsResult {
-    let mut result = SaveGameSettingsResult {
-        state: None,
-        applied: 0,
-        migrated: 0,
-        deferred: 0,
-        unsupported: 0,
-        failed: 0,
-        conflicts: Vec::new(),
-    };
-    match game_options_sync_is_enabled(&state.pool).await {
-        Ok(true) => {}
-        Ok(false) => return result,
-        Err(error) => {
-            tracing::warn!(
-                "Failed to inspect global game-options state before fan-out: {error}"
-            );
-            result.failed += 1;
-            return result;
-        }
-    }
-    let instances = match crate::state::list_instances(&state.pool).await {
-        Ok(instances) => instances,
-        Err(error) => {
-            tracing::warn!(
-                "Failed to list instances for game-options fan-out: {error}"
-            );
-            result.failed += 1;
-            return result;
-        }
-    };
-    for metadata in instances {
-        if excluded_instance_id == Some(metadata.instance.id.as_str())
-            || !metadata.synced_options.game_options
-        {
-            continue;
-        }
-        match sync_instance_options(&metadata, state, SyncReason::Normal, true)
-            .await
-        {
-            Ok(SyncOutcome::Applied | SyncOutcome::Unchanged) => {
-                result.applied += 1
-            }
-            Ok(SyncOutcome::Migrated) => result.migrated += 1,
-            Ok(SyncOutcome::Deferred | SyncOutcome::WaitingForFile) => {
-                result.deferred += 1
-            }
-            Err(error) => {
-                tracing::warn!(
-                    "Failed to project synced game options into {}: {error}",
-                    metadata.instance.id
-                );
-                result.failed += 1;
-            }
-        }
-    }
-    result
+	let mut result = SaveGameSettingsResult {
+		state: None,
+		applied: 0,
+		migrated: 0,
+		deferred: 0,
+		unsupported: 0,
+		failed: 0,
+		conflicts: Vec::new(),
+	};
+	match game_options_sync_is_enabled(&state.pool).await {
+		Ok(true) => {}
+		Ok(false) => return result,
+		Err(error) => {
+			tracing::warn!(
+				"Failed to inspect global game-options state before fan-out: {error}"
+			);
+			result.failed += 1;
+			return result;
+		}
+	}
+	let instances = match crate::state::list_instances(&state.pool).await {
+		Ok(instances) => instances,
+		Err(error) => {
+			tracing::warn!(
+				"Failed to list instances for game-options fan-out: {error}"
+			);
+			result.failed += 1;
+			return result;
+		}
+	};
+	for metadata in instances {
+		if excluded_instance_id == Some(metadata.instance.id.as_str())
+			|| !metadata.synced_options.game_options
+		{
+			continue;
+		}
+		match apply_shared_settings_to_instance(&metadata, state, false).await {
+			Ok(SyncOutcome::Applied | SyncOutcome::Unchanged) => {
+				result.applied += 1
+			}
+			Ok(SyncOutcome::Migrated) => result.migrated += 1,
+			Ok(SyncOutcome::Deferred | SyncOutcome::WaitingForFile) => {
+				result.deferred += 1
+			}
+			Err(error) => {
+				tracing::warn!(
+					"Failed to write synced game options into {}: {error}",
+					metadata.instance.id
+				);
+				result.failed += 1;
+			}
+		}
+	}
+	result
 }
 
 pub(crate) async fn sync_all_participating_instances(
-    state: &State,
+	state: &State,
 ) -> SaveGameSettingsResult {
-    sync_other_participating_instances(state, None).await
+	sync_other_participating_instances(state, None).await
 }
diff --git a/packages/app-lib/src/api/instance/synced_options/orchestration.rs b/packages/app-lib/src/api/instance/synced_options/orchestration.rs
index 6af1c03545..abdd54cb9d 100644
--- a/packages/app-lib/src/api/instance/synced_options/orchestration.rs
+++ b/packages/app-lib/src/api/instance/synced_options/orchestration.rs
@@ -320,11 +320,9 @@ pub async fn set_global_option(
                             "Unknown sync source instance.".to_string(),
                         )
                     })?;
-            if sync_files_are_protected(&source)
-                || instance_is_running(&source, &state).await?
-            {
+            if sync_files_are_protected(&source) {
                 return Err(ErrorKind::InputError(
-                    "Close the source instance before using it for syncing."
+                    "Wait for the source instance to finish installing or updating."
                         .to_string(),
                 )
                 .into());
@@ -362,17 +360,8 @@ pub async fn set_global_option(
         Err(error) => return Err(error),
     };
     for metadata in instances {
-        let running = match instance_is_running(&metadata, &state).await {
-            Ok(running) => running,
-            Err(error) if option == SyncedOption::GameOptions => {
-                tracing::warn!(
-                    "Game-settings sync changed, but {} could not be inspected yet: {error}",
-                    metadata.instance.id
-                );
-                continue;
-            }
-            Err(error) => return Err(error),
-        };
+        let running = option != SyncedOption::GameOptions
+            && instance_is_running(&metadata, &state).await?;
         if sync_files_are_protected(&metadata) || running {
             continue;
         }
@@ -527,7 +516,8 @@ pub async fn set_instance_option(
     }
     let global = get_global_options_with_state(&state).await?;
     let can_reconcile = !sync_files_are_protected(&metadata)
-        && !instance_is_running(&metadata, &state).await?;
+        && (option == SyncedOption::GameOptions
+            || !instance_is_running(&metadata, &state).await?);
     if enabled {
         let eligibility =
             capability(&metadata, option, global.get(option), &state).await;
@@ -537,7 +527,11 @@ pub async fn set_instance_option(
             )
             .into());
         }
-        if option != SyncedOption::Screenshots && !can_reconcile {
+        if !matches!(
+            option,
+            SyncedOption::GameOptions | SyncedOption::Screenshots
+        ) && !can_reconcile
+        {
             return Err(ErrorKind::InputError(
                 "Close the instance before including it in file syncing."
                     .to_string(),
@@ -650,7 +644,10 @@ pub async fn get_instance_option_join_preview(
         )
         .into());
     }
-    if option != SyncedOption::Screenshots
+    if !matches!(
+        option,
+        SyncedOption::GameOptions | SyncedOption::Screenshots
+    )
         && (sync_files_are_protected(&metadata)
             || instance_is_running(&metadata, &state).await?)
     {
@@ -731,13 +728,6 @@ pub(crate) async fn monitor_persisted_processes() -> crate::Result<()> {
                             .await;
                     }
                     Ok(false) => {
-                        if let Err(error) =
-                            reconcile_instance(&instance_id).await
-                        {
-                            tracing::warn!(
-                                "Failed to reconcile synced options after a persisted process exited for {instance_id}: {error}"
-                            );
-                        }
                         break;
                     }
                     Err(error) => {
@@ -828,17 +818,10 @@ async fn reconcile_instance_with_state(
             .await
         {
             CapabilityStatus::Supported => {
-                let result =
-                    if option == SyncedOption::GameOptions && allow_protected {
-                        reconcile_game_options(
-                            metadata,
-                            state,
-                            super::game_options::SyncReason::PackExtracted,
-                        )
-                        .await
-                    } else {
-                        reconcile_option(metadata, option, state).await
-                    };
+                if option == SyncedOption::GameOptions {
+                    continue;
+                }
+                let result = reconcile_option(metadata, option, state).await;
                 if let Err(error) = result {
                     if option == SyncedOption::GameOptions {
                         tracing::warn!(
@@ -866,12 +849,8 @@ async fn reconcile_option(
 ) -> crate::Result<()> {
     match option {
         SyncedOption::GameOptions => {
-            reconcile_game_options(
-                metadata,
-                state,
-                super::game_options::SyncReason::Normal,
-            )
-            .await
+            super::game_options::apply_instance_with_state(metadata, state)
+                .await
         }
         SyncedOption::CommandHistory => {
             reconcile_command_history(metadata, state).await
@@ -886,21 +865,6 @@ async fn reconcile_option(
     }
 }
 
-async fn reconcile_game_options(
-    metadata: &InstanceMetadata,
-    state: &State,
-    reason: super::game_options::SyncReason,
-) -> crate::Result<()> {
-    if !canonical_exists(SyncedOption::GameOptions, state).await? {
-        let source = instance_dir(metadata, state).join("options.txt");
-        if !source.exists() {
-            return Ok(());
-        }
-        seed_from_instance(metadata, SyncedOption::GameOptions, state).await?;
-    }
-    super::game_options::sync_instance_with_state(metadata, state, reason).await
-}
-
 pub async fn reconcile_changed_file(
     instance_id: &str,
     file_name: &str,
@@ -915,13 +879,15 @@ pub async fn reconcile_changed_file(
     }
     match file_name {
         "options.txt" => {
-            if option_effective(&metadata, SyncedOption::GameOptions, &state)
-                .await?
-            {
-                reconcile_game_options(
-                    &metadata,
-                    &state,
-                    super::game_options::SyncReason::Normal,
+            let participates = option_participates(
+                &metadata,
+                SyncedOption::GameOptions,
+                &state,
+            )
+            .await?;
+            if participates {
+                super::game_options::capture_instance_file_change(
+                    &metadata, &state,
                 )
                 .await?;
             }
@@ -1095,12 +1061,8 @@ async fn ensure_option(
 ) -> crate::Result<()> {
     match option {
         SyncedOption::GameOptions => {
-            super::game_options::sync_instance_with_state(
-                metadata,
-                state,
-                super::game_options::SyncReason::Normal,
-            )
-            .await
+            super::game_options::apply_instance_with_state(metadata, state)
+                .await
         }
         SyncedOption::CommandHistory => {
             ensure_command_history(metadata, state).await
@@ -1174,6 +1136,14 @@ pub(super) async fn option_effective(
     {
         return Ok(false);
     }
+    option_participates(metadata, option, state).await
+}
+
+async fn option_participates(
+    metadata: &InstanceMetadata,
+    option: SyncedOption,
+    state: &State,
+) -> crate::Result<bool> {
     let global = get_global_options_with_state(state).await?;
     Ok(instance_option_enabled(metadata, option)
         && capability(metadata, option, global.get(option), state)
diff --git a/packages/app-lib/src/state/instances/mod.rs b/packages/app-lib/src/state/instances/mod.rs
index 9e6f48cc94..11a229d77e 100644
--- a/packages/app-lib/src/state/instances/mod.rs
+++ b/packages/app-lib/src/state/instances/mod.rs
@@ -4,8 +4,7 @@ pub use self::content::*;
 mod model;
 pub use self::model::*;
 pub(crate) use self::model::{
-    GameOptionsProjection, ProjectedField, ProjectionOrigin, StoredOption,
-    StoredPreference,
+    StoredOption, StoredPreference,
 };
 
 pub(crate) mod adapters;
diff --git a/packages/app-lib/src/state/instances/model/game_options.rs b/packages/app-lib/src/state/instances/model/game_options.rs
index bbc38449d3..24e2f3a90f 100644
--- a/packages/app-lib/src/state/instances/model/game_options.rs
+++ b/packages/app-lib/src/state/instances/model/game_options.rs
@@ -59,35 +59,3 @@ pub(crate) struct StoredPreference {
     pub(crate) enabled: bool,
     pub(crate) revision: u64,
 }
-
-/// A snapshot of the settings Modrinth last wrote to an instance's `options.txt`.
-///
-/// On the next sync, we compare the file with this snapshot to find changes the
-/// player made in Minecraft.
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub(crate) struct GameOptionsProjection {
-    pub(crate) schema_version: u32,
-    pub(crate) target_game_version: String,
-    pub(crate) input_sha1: String,
-    pub(crate) canonical_revision: u64,
-    pub(crate) fields: Vec<ProjectedField>,
-}
-
-/// One setting from the last-written snapshot, using its actual file key and value.
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub(crate) struct ProjectedField {
-    pub(crate) option_id: String,
-    pub(crate) physical_key: String,
-    pub(crate) raw_value: String,
-    pub(crate) origin: ProjectionOrigin,
-    #[serde(default)]
-    pub(crate) migrated: bool,
-}
-
-/// Why Modrinth wrote a setting to `options.txt`.
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub(crate) enum ProjectionOrigin {
-    Shared,
-    LauncherOverride,
-}
diff --git a/packages/app-lib/src/state/instances/model/mod.rs b/packages/app-lib/src/state/instances/model/mod.rs
index 9a049cc1b2..0624286cb4 100644
--- a/packages/app-lib/src/state/instances/model/mod.rs
+++ b/packages/app-lib/src/state/instances/model/mod.rs
@@ -18,8 +18,7 @@ pub use self::file::*;
 mod game_options;
 pub use self::game_options::{CanonicalValue, GameOptionKind};
 pub(crate) use self::game_options::{
-    GameOptionsProjection, ProjectedField, ProjectionOrigin, StoredOption,
-    StoredPreference,
+    StoredOption, StoredPreference,
 };
 
 mod instance;
diff --git a/packages/app-lib/src/state/instances/watcher.rs b/packages/app-lib/src/state/instances/watcher.rs
index 3053d18add..0315895759 100644
--- a/packages/app-lib/src/state/instances/watcher.rs
+++ b/packages/app-lib/src/state/instances/watcher.rs
@@ -68,8 +68,9 @@ pub async fn init_watcher() -> crate::Result<FileWatcher> {
                         if let Some(instance_path) = instance_path {
                             let instance_path_str =
                                 instance_path.to_string_lossy().to_string();
-                            let Some(instance_id) =
-                                instance_ids.get(&instance_path_str).cloned()
+                            let Some(instance_id) = instance_ids
+                                .get(&instance_path_str)
+                                .cloned()
                             else {
                                 continue;
                             };
diff --git a/packages/app-lib/src/state/mod.rs b/packages/app-lib/src/state/mod.rs
index e3d4843578..e7b5473c40 100644
--- a/packages/app-lib/src/state/mod.rs
+++ b/packages/app-lib/src/state/mod.rs
@@ -18,8 +18,7 @@ pub use self::instance_types::*;
 pub(crate) mod instances;
 pub use self::instances::*;
 pub(crate) use self::instances::{
-    GameOptionsProjection, ProjectedField, ProjectionOrigin, StoredOption,
-    StoredPreference,
+    StoredOption, StoredPreference,
 };
 pub(crate) use self::instances::{
     game_options_sync_is_enabled, load_game_option_preferences,
diff --git a/packages/app-lib/src/state/process.rs b/packages/app-lib/src/state/process.rs
index 3b80a78bda..b9d7465b89 100644
--- a/packages/app-lib/src/state/process.rs
+++ b/packages/app-lib/src/state/process.rs
@@ -940,20 +940,6 @@ impl Process {
         // Now fully complete- update playtime one last time
         update_playtime(&mut last_updated_playtime, &instance_id, true).await;
 
-        let reconcile_instance_id = instance_id.clone();
-        tokio::spawn(async move {
-            if let Err(error) =
-                crate::api::instance::reconcile_instance_synced_options(
-                    &reconcile_instance_id,
-                )
-                .await
-            {
-                tracing::warn!(
-                    "Failed to reconcile synced options after Minecraft exited for {reconcile_instance_id}: {error}"
-                );
-            }
-        });
-
         // Publish play time update
         // Allow failure, it will be stored locally and sent next time
         // Sent in another thread as first call may take a couple seconds and hold up process ending

From 52c7b9e779a6be40cb7788c74edd6deb0a891576 Mon Sep 17 00:00:00 2001
From: "Calum H." <calum@modrinth.com>
Date: Wed, 2 Sep 2026 13:47:15 +0100
Subject: [PATCH 12/33] feat: full writeup of options.txt catalog history

Signed-off-by: Calum H. <calum@modrinth.com>
---
 .../game_options/catalog/README.md            | 848 ++++++++++++++----
 1 file changed, 687 insertions(+), 161 deletions(-)

diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/catalog/README.md b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/README.md
index 51a850451e..678ca49b81 100644
--- a/packages/app-lib/src/api/instance/synced_options/game_options/catalog/README.md
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/README.md
@@ -1,232 +1,758 @@
-# options.txt catalog history
+# Minecraft `options.txt` history
+
+Generated using `optionstxt_diff_calc.py` in `scripts` folder.
+
+## Summary
+
+|   # | Version                        | Supported keys | Fresh keys | Supported + | Supported − | Type Δ |  Fresh + | Fresh − |
+| --: | ------------------------------ | -------------: | ---------: | ----------: | ----------: | -----: | -------: | ------: |
+|   1 | <code>1.0</code>               |             32 |         32 |    baseline |           — |      — | baseline |       — |
+|   2 | <code>1.1</code>               |             33 |         33 |           1 |           0 |      0 |        1 |       0 |
+|   3 | <code>1.2.1</code>             |             33 |         33 |           0 |           0 |      0 |        0 |       0 |
+|   4 | <code>1.2.2</code>             |             33 |         33 |           0 |           0 |      0 |        0 |       0 |
+|   5 | <code>1.2.3</code>             |             33 |         33 |           0 |           0 |      0 |        0 |       0 |
+|   6 | <code>1.2.4</code>             |             33 |         33 |           0 |           0 |      0 |        0 |       0 |
+|   7 | <code>1.2.5</code>             |             33 |         33 |           0 |           0 |      0 |        0 |       0 |
+|   8 | <code>1.3.1</code>             |             43 |         43 |          10 |           0 |      0 |       10 |       0 |
+|   9 | <code>1.3.2</code>             |             44 |         44 |           1 |           0 |      0 |        1 |       0 |
+|  10 | <code>1.4.2</code>             |             47 |         47 |           3 |           0 |      0 |        3 |       0 |
+|  11 | <code>1.4.4</code>             |             48 |         48 |           1 |           0 |      0 |        1 |       0 |
+|  12 | <code>1.4.5</code>             |             48 |         48 |           0 |           0 |      0 |        0 |       0 |
+|  13 | <code>1.4.6</code>             |             51 |         51 |           3 |           0 |      0 |        3 |       0 |
+|  14 | <code>1.4.7</code>             |             51 |         51 |           0 |           0 |      0 |        0 |       0 |
+|  15 | <code>1.5.1</code>             |             55 |         55 |           4 |           0 |      1 |        4 |       0 |
+|  16 | <code>1.5.2</code>             |             55 |         55 |           0 |           0 |      0 |        0 |       0 |
+|  17 | <code>1.6.1</code>             |             55 |         55 |           0 |           0 |      0 |        0 |       0 |
+|  18 | <code>1.6.2</code>             |             55 |         55 |           0 |           0 |      0 |        0 |       0 |
+|  19 | <code>1.6.4</code>             |             55 |         55 |           0 |           0 |      0 |        0 |       0 |
+|  20 | <code>1.7.2</code>             |             81 |         81 |          31 |           5 |      0 |       31 |       5 |
+|  21 | <code>1.7.3</code>             |             97 |         97 |          16 |           0 |      0 |       16 |       0 |
+|  22 | <code>1.7.4</code>             |             97 |         97 |           0 |           0 |      0 |        0 |       0 |
+|  23 | <code>1.7.5</code>             |             97 |         97 |           0 |           0 |      0 |        0 |       0 |
+|  24 | <code>1.7.6</code>             |             96 |         96 |           0 |           1 |      0 |        0 |       1 |
+|  25 | <code>1.7.7</code>             |             96 |         96 |           0 |           0 |      0 |        0 |       0 |
+|  26 | <code>1.7.8</code>             |             96 |         96 |           0 |           0 |      0 |        0 |       0 |
+|  27 | <code>1.7.9</code>             |             96 |         96 |           0 |           0 |      0 |        0 |       0 |
+|  28 | <code>1.7.10</code>            |             96 |         96 |           0 |           0 |      0 |        0 |       0 |
+|  29 | <code>1.8</code>               |            104 |        104 |          12 |           4 |      0 |       12 |       4 |
+|  30 | <code>1.8.1</code>             |            106 |        106 |           2 |           0 |      1 |        2 |       0 |
+|  31 | <code>1.8.2</code>             |            106 |        106 |           0 |           0 |      0 |        0 |       0 |
+|  32 | <code>1.8.3</code>             |            106 |        106 |           0 |           0 |      0 |        0 |       0 |
+|  33 | <code>1.8.4</code>             |            106 |        106 |           0 |           0 |      0 |        0 |       0 |
+|  34 | <code>1.8.5</code>             |            106 |        106 |           0 |           0 |      0 |        0 |       0 |
+|  35 | <code>1.8.6</code>             |            106 |        106 |           0 |           0 |      0 |        0 |       0 |
+|  36 | <code>1.8.7</code>             |            106 |        106 |           0 |           0 |      0 |        0 |       0 |
+|  37 | <code>1.8.8</code>             |            107 |        107 |           1 |           0 |      0 |        1 |       0 |
+|  38 | <code>1.8.9</code>             |            108 |        108 |           1 |           0 |      0 |        1 |       0 |
+|  39 | <code>1.9</code>               |             97 |         97 |           5 |          16 |      0 |        5 |      16 |
+|  40 | <code>1.9.1</code>             |             98 |         98 |           1 |           0 |      0 |        1 |       0 |
+|  41 | <code>1.9.2</code>             |             98 |         98 |           0 |           0 |      0 |        0 |       0 |
+|  42 | <code>1.9.3</code>             |             98 |         98 |           0 |           0 |      0 |        0 |       0 |
+|  43 | <code>1.9.4</code>             |             98 |         98 |           0 |           0 |      0 |        0 |       0 |
+|  44 | <code>1.10</code>              |            100 |        100 |           2 |           0 |      0 |        2 |       0 |
+|  45 | <code>1.10.1</code>            |            100 |        100 |           0 |           0 |      0 |        0 |       0 |
+|  46 | <code>1.10.2</code>            |            100 |        100 |           0 |           0 |      0 |        0 |       0 |
+|  47 | <code>1.11</code>              |            100 |        100 |           0 |           0 |      0 |        0 |       0 |
+|  48 | <code>1.11.1</code>            |            100 |        100 |           0 |           0 |      0 |        0 |       0 |
+|  49 | <code>1.11.2</code>            |            100 |        100 |           0 |           0 |      0 |        0 |       0 |
+|  50 | <code>1.12</code>              |            104 |        104 |           5 |           1 |      0 |        5 |       1 |
+|  51 | <code>1.12.1</code>            |            104 |        104 |           0 |           0 |      0 |        0 |       0 |
+|  52 | <code>1.12.2</code>            |            104 |        104 |           0 |           0 |      0 |        0 |       0 |
+|  53 | <code>1.13</code>              |            108 |        107 |           5 |           1 |      1 |        4 |       1 |
+|  54 | <code>1.13.1</code>            |            108 |        107 |           0 |           0 |      0 |        0 |       0 |
+|  55 | <code>1.13.2</code>            |            108 |        107 |           0 |           0 |      0 |        0 |       0 |
+|  56 | <code>1.14</code>              |            108 |        106 |           3 |           3 |      0 |        3 |       4 |
+|  57 | <code>1.14.1</code>            |            108 |        106 |           0 |           0 |      0 |        0 |       0 |
+|  58 | <code>1.14.2</code>            |            108 |        106 |           0 |           0 |      0 |        0 |       0 |
+|  59 | <code>1.14.3</code>            |            108 |        106 |           0 |           0 |      0 |        0 |       0 |
+|  60 | <code>1.14.4</code>            |            109 |        107 |           1 |           0 |      0 |        1 |       0 |
+|  61 | <code>1.15</code>              |            111 |        109 |           2 |           0 |      0 |        2 |       0 |
+|  62 | <code>1.15.1</code>            |            111 |        109 |           0 |           0 |      0 |        0 |       0 |
+|  63 | <code>1.15.2</code>            |            112 |        110 |           1 |           0 |      0 |        1 |       0 |
+|  64 | <code>1.16</code>              |            118 |        114 |           6 |           0 |      0 |        6 |       2 |
+|  65 | <code>1.16.1</code>            |            118 |        114 |           0 |           0 |      0 |        0 |       0 |
+|  66 | <code>1.16.2</code>            |            120 |        116 |           2 |           0 |      0 |        2 |       0 |
+|  67 | <code>1.16.3</code>            |            120 |        116 |           0 |           0 |      0 |        0 |       0 |
+|  68 | <code>1.16.4</code>            |            123 |        119 |           3 |           0 |      0 |        3 |       0 |
+|  69 | <code>1.16.5</code>            |            123 |        119 |           0 |           0 |      0 |        0 |       0 |
+|  70 | <code>1.17</code>              |            125 |        121 |           2 |           0 |      0 |        2 |       0 |
+|  71 | <code>1.17.1</code>            |            125 |        121 |           0 |           0 |      0 |        0 |       0 |
+|  72 | <code>1.18</code>              |            130 |        126 |           6 |           1 |      0 |        6 |       1 |
+|  73 | <code>1.18.1</code>            |            130 |        126 |           0 |           0 |      0 |        0 |       0 |
+|  74 | <code>1.18.2</code>            |            131 |        127 |           1 |           0 |      0 |        1 |       0 |
+|  75 | <code>1.19</code>              |            134 |        130 |           4 |           1 |      1 |        4 |       1 |
+|  76 | <code>1.19.1</code>            |            134 |        130 |           0 |           0 |      1 |        0 |       0 |
+|  77 | <code>1.19.2</code>            |            134 |        130 |           0 |           0 |      0 |        0 |       0 |
+|  78 | <code>1.19.3</code>            |            136 |        132 |           3 |           1 |      1 |        3 |       1 |
+|  79 | <code>1.19.4</code>            |            141 |        137 |           6 |           1 |      0 |        6 |       1 |
+|  80 | <code>1.20</code>              |            141 |        137 |           0 |           0 |      0 |        0 |       0 |
+|  81 | <code>1.20.1</code>            |            141 |        137 |           0 |           0 |      0 |        0 |       0 |
+|  82 | <code>1.20.2</code>            |            142 |        138 |           1 |           0 |      0 |        1 |       0 |
+|  83 | <code>1.20.3</code>            |            143 |        139 |           1 |           0 |      0 |        1 |       0 |
+|  84 | <code>1.20.4</code>            |            143 |        139 |           0 |           0 |      0 |        0 |       0 |
+|  85 | <code>1.20.5</code>            |            144 |        140 |           2 |           1 |      0 |        2 |       1 |
+|  86 | <code>1.20.6</code>            |            144 |        140 |           0 |           0 |      0 |        0 |       0 |
+|  87 | <code>1.21</code>              |            144 |        140 |           0 |           0 |      1 |        0 |       0 |
+|  88 | <code>1.21.1</code>            |            144 |        140 |           0 |           0 |      0 |        0 |       0 |
+|  89 | <code>1.21.2</code>            |            146 |        142 |           3 |           1 |      0 |        3 |       1 |
+|  90 | <code>1.21.3</code>            |            146 |        142 |           0 |           0 |      0 |        0 |       0 |
+|  91 | <code>1.21.4</code>            |            146 |        142 |           0 |           0 |      0 |        0 |       0 |
+|  92 | <code>1.21.5</code>            |            147 |        143 |           1 |           0 |      0 |        1 |       0 |
+|  93 | <code>1.21.6</code>            |            152 |        148 |           5 |           0 |      0 |        5 |       0 |
+|  94 | <code>1.21.7</code>            |            152 |        148 |           0 |           0 |      0 |        0 |       0 |
+|  95 | <code>1.21.8</code>            |            152 |        148 |           0 |           0 |      0 |        0 |       0 |
+|  96 | <code>1.21.9</code>            |            159 |        155 |           7 |           0 |      0 |        7 |       0 |
+|  97 | <code>1.21.10</code>           |            159 |        155 |           0 |           0 |      0 |        0 |       0 |
+|  98 | <code>1.21.11</code>           |            191 |        185 |          32 |           0 |      0 |       32 |       2 |
+|  99 | <code>26.1</code>              |            193 |        187 |           2 |           0 |      0 |        2 |       0 |
+| 100 | <code>26.1.1</code>            |            193 |        187 |           0 |           0 |      0 |        0 |       0 |
+| 101 | <code>26.1.2</code>            |            193 |        187 |           0 |           0 |      0 |        0 |       0 |
+| 102 | <code>26.2</code>              |            196 |        190 |           4 |           1 |      0 |        4 |       1 |
+| 103 | <code>26.3 (26.3-pre-1)</code> |            200 |        194 |           5 |           1 |      0 |        5 |       1 |
+
+## Changes
+
+<details>
+<summary>1.0 (baseline)</summary>
+
+- Baseline supported entries: <code>advancedOpengl</code>, <code>anaglyph3d</code>, <code>ao</code>, <code>bobView</code>, <code>clouds</code>, <code>difficulty</code>, <code>fancyGraphics</code>, <code>fov</code>, <code>fpsLimit</code>, <code>gamma</code>, <code>guiScale</code>, <code>invertYMouse</code>, <code>key_key.attack</code>, <code>key_key.back</code>, <code>key_key.chat</code>, <code>key_key.drop</code>, <code>key_key.forward</code>, <code>key_key.inventory</code>, <code>key_key.jump</code>, <code>key_key.left</code>, <code>key_key.pickItem</code>, <code>key_key.playerlist</code>, <code>key_key.right</code>, <code>key_key.sneak</code>, <code>key_key.use</code>, <code>lastServer</code>, <code>mouseSensitivity</code>, <code>music</code>, <code>particles</code>, <code>skin</code>, <code>sound</code>, <code>viewDistance</code>
+- Baseline fresh-file entries: <code>advancedOpengl</code>, <code>anaglyph3d</code>, <code>ao</code>, <code>bobView</code>, <code>clouds</code>, <code>difficulty</code>, <code>fancyGraphics</code>, <code>fov</code>, <code>fpsLimit</code>, <code>gamma</code>, <code>guiScale</code>, <code>invertYMouse</code>, <code>key_key.attack</code>, <code>key_key.back</code>, <code>key_key.chat</code>, <code>key_key.drop</code>, <code>key_key.forward</code>, <code>key_key.inventory</code>, <code>key_key.jump</code>, <code>key_key.left</code>, <code>key_key.pickItem</code>, <code>key_key.playerlist</code>, <code>key_key.right</code>, <code>key_key.sneak</code>, <code>key_key.use</code>, <code>lastServer</code>, <code>mouseSensitivity</code>, <code>music</code>, <code>particles</code>, <code>skin</code>, <code>sound</code>, <code>viewDistance</code>
+
+</details>
+
+<details>
+<summary>1.1 (from 1.0)</summary>
+
+- Supported entries added: <code>lang</code>
+- Fresh file added: <code>lang</code>
+
+</details>
+
+<details>
+<summary>1.3.1 (from 1.2.5)</summary>
+
+- Supported entries added: <code>chatColors</code>, <code>chatLinks</code>, <code>chatLinksPrompt</code>, <code>chatOpacity</code>, <code>chatVisibility</code>, <code>enableVsync</code>, <code>fullscreen</code>, <code>key_key.command</code>, <code>serverTextures</code>, <code>snooperEnabled</code>
+- Fresh file added: <code>chatColors</code>, <code>chatLinks</code>, <code>chatLinksPrompt</code>, <code>chatOpacity</code>, <code>chatVisibility</code>, <code>enableVsync</code>, <code>fullscreen</code>, <code>key_key.command</code>, <code>serverTextures</code>, <code>snooperEnabled</code>
+
+</details>
+
+<details>
+<summary>1.3.2 (from 1.3.1)</summary>
+
+- Supported entries added: <code>hideServerAddress</code>
+- Fresh file added: <code>hideServerAddress</code>
+
+</details>
+
+<details>
+<summary>1.4.2 (from 1.3.2)</summary>
+
+- Supported entries added: <code>advancedItemTooltips</code>, <code>pauseOnLostFocus</code>, <code>showCape</code>
+- Fresh file added: <code>advancedItemTooltips</code>, <code>pauseOnLostFocus</code>, <code>showCape</code>
 
-## Legacy
+</details>
 
-- Infdev/Alpha: removed `key_Build`, `key_Load location`, `key_Save location`, and `showFrameRate`.
-- Beta 1.1: removed `key_Back`, `key_Chat`, `key_Drop`, `key_Forward`, `key_Inventory`, `key_Jump`, `key_Left`, `key_Right`, `key_Sneak`, and `key_Toggle fog`.
-- Beta 1.7/1.8: removed `limitFramerate` and `key_key.fog`.
+<details>
+<summary>1.4.4 (from 1.4.2)</summary>
 
-## 1.4.2
+- Supported entries added: <code>touchscreen</code>
+- Fresh file added: <code>touchscreen</code>
 
-- Added `pauseOnLostFocus`.
+</details>
 
-## 1.7
+<details>
+<summary>1.4.6 (from 1.4.5)</summary>
 
-- Added `soundCategory_master`, `soundCategory_music`, `soundCategory_record`, `soundCategory_weather`, `soundCategory_block`, `soundCategory_hostile`, `soundCategory_neutral`, `soundCategory_player`, and `soundCategory_ambient`.
+- Supported entries added: <code>heldItemTooltips</code>, <code>overrideHeight</code>, <code>overrideWidth</code>
+- Fresh file added: <code>heldItemTooltips</code>, <code>overrideHeight</code>, <code>overrideWidth</code>
 
-## 1.7.2
+</details>
 
-- Added `forceUnicodeFont`.
-- Removed `fpsLimit`, `music`, `skin`, `sound`, and `viewDistance`.
+<details>
+<summary>1.5.1 (from 1.4.7)</summary>
 
-## 1.7.6
+- Supported entries added: <code>chatHeightFocused</code>, <code>chatHeightUnfocused</code>, <code>chatScale</code>, <code>chatWidth</code>
+- Type changed: <code>ao</code> — <code>boolean</code> → <code>enum</code>
+- Fresh file added: <code>chatHeightFocused</code>, <code>chatHeightUnfocused</code>, <code>chatScale</code>, <code>chatWidth</code>
 
-- Removed `serverTextures`.
-- Moved server resource-pack acceptance to a per-server Prompt/Enabled/Disabled setting.
+</details>
 
-## 1.8
+<details>
+<summary>1.7.2 (from 1.6.4)</summary>
 
-- Removed `advancedOpengl`, `anisotropicFiltering`, `clouds`, and `showCape`.
+- Supported entries added: <code>anisotropicFiltering</code>, <code>fboEnable</code>, <code>forceUnicodeFont</code>, <code>key_key.hotbar.1</code>, <code>key_key.hotbar.2</code>, <code>key_key.hotbar.3</code>, <code>key_key.hotbar.4</code>, <code>key_key.hotbar.5</code>, <code>key_key.hotbar.6</code>, <code>key_key.hotbar.7</code>, <code>key_key.hotbar.8</code>, <code>key_key.hotbar.9</code>, <code>key_key.screenshot</code>, <code>key_key.smoothCamera</code>, <code>key_key.sprint</code>, <code>key_key.togglePerspective</code>, <code>maxFps</code>, <code>mipmapLevels</code>, <code>renderDistance</code>, <code>resourcePacks</code>, <code>saturation</code>, <code>showInventoryAchievementHint</code>, <code>soundCategory_ambient</code>, <code>soundCategory_block</code>, <code>soundCategory_hostile</code>, <code>soundCategory_master</code>, <code>soundCategory_music</code>, <code>soundCategory_neutral</code>, <code>soundCategory_player</code>, <code>soundCategory_record</code>, <code>soundCategory_weather</code>
+- Supported entries removed: <code>fpsLimit</code>, <code>music</code>, <code>skin</code>, <code>sound</code>, <code>viewDistance</code>
+- Fresh file added: <code>anisotropicFiltering</code>, <code>fboEnable</code>, <code>forceUnicodeFont</code>, <code>key_key.hotbar.1</code>, <code>key_key.hotbar.2</code>, <code>key_key.hotbar.3</code>, <code>key_key.hotbar.4</code>, <code>key_key.hotbar.5</code>, <code>key_key.hotbar.6</code>, <code>key_key.hotbar.7</code>, <code>key_key.hotbar.8</code>, <code>key_key.hotbar.9</code>, <code>key_key.screenshot</code>, <code>key_key.smoothCamera</code>, <code>key_key.sprint</code>, <code>key_key.togglePerspective</code>, <code>maxFps</code>, <code>mipmapLevels</code>, <code>renderDistance</code>, <code>resourcePacks</code>, <code>saturation</code>, <code>showInventoryAchievementHint</code>, <code>soundCategory_ambient</code>, <code>soundCategory_block</code>, <code>soundCategory_hostile</code>, <code>soundCategory_master</code>, <code>soundCategory_music</code>, <code>soundCategory_neutral</code>, <code>soundCategory_player</code>, <code>soundCategory_record</code>, <code>soundCategory_weather</code>
+- Fresh file removed: <code>fpsLimit</code>, <code>music</code>, <code>skin</code>, <code>sound</code>, <code>viewDistance</code>
 
-## 1.9
+</details>
 
-- Removed `allowBlockAlternatives`.
-- Removed `key_key.streamCommercial`, `key_key.streamPauseUnpause`, `key_key.streamStartStop`, and `key_key.streamToggleMic`.
-- Removed `streamBytesPerPixel`, `streamChatEnabled`, `streamChatUserFilter`, `streamCompression`, `streamFps`, `streamKbps`, `streamMicToggleBehavior`, `streamMicVolume`, `streamPreferredServer`, `streamSendMetadata`, and `streamSystemVolume`.
+<details>
+<summary>1.7.3 (from 1.7.2)</summary>
 
-## 1.10
+- Supported entries added: <code>key_key.fullscreen</code>, <code>key_key.streamCommercial</code>, <code>key_key.streamPauseUnpause</code>, <code>key_key.streamStartStop</code>, <code>key_key.streamToggleMic</code>, <code>streamBytesPerPixel</code>, <code>streamChatEnabled</code>, <code>streamChatUserFilter</code>, <code>streamCompression</code>, <code>streamFps</code>, <code>streamKbps</code>, <code>streamMicToggleBehavior</code>, <code>streamMicVolume</code>, <code>streamPreferredServer</code>, <code>streamSendMetadata</code>, <code>streamSystemVolume</code>
+- Fresh file added: <code>key_key.fullscreen</code>, <code>key_key.streamCommercial</code>, <code>key_key.streamPauseUnpause</code>, <code>key_key.streamStartStop</code>, <code>key_key.streamToggleMic</code>, <code>streamBytesPerPixel</code>, <code>streamChatEnabled</code>, <code>streamChatUserFilter</code>, <code>streamCompression</code>, <code>streamFps</code>, <code>streamKbps</code>, <code>streamMicToggleBehavior</code>, <code>streamMicVolume</code>, <code>streamPreferredServer</code>, <code>streamSendMetadata</code>, <code>streamSystemVolume</code>
 
-- Added `version`.
-- Added `autoJump`.
+</details>
 
-## 1.12
+<details>
+<summary>1.7.6 (from 1.7.5)</summary>
 
-- Added `narrator`.
-- Added `tutorialStep`.
-- Added `key_key.saveToolbarActivator`.
-- Removed `showInventoryAchievementHint`.
+- Supported entries removed: <code>serverTextures</code>
+- Fresh file removed: <code>serverTextures</code>
 
-## 1.13
+</details>
 
-- Added `biomeBlendRadius`.
-- Added `autoSuggestions`.
-- Added `mouseWheelSensitivity`.
-- Added `glDebugVerbosity`.
-- Changed numeric LWJGL2 key values to `key.*` and `key.mouse.*` tokens.
-- Changed keyboard tokens from `key.*` to `key.keyboard.*`.
-- Removed `anaglyph3d`.
+<details>
+<summary>1.8 (from 1.7.10)</summary>
 
-## 1.14
+- Supported entries added: <code>allowBlockAlternatives</code>, <code>key_key.spectatorOutlines</code>, <code>modelPart_cape</code>, <code>modelPart_hat</code>, <code>modelPart_jacket</code>, <code>modelPart_left_pants_leg</code>, <code>modelPart_left_sleeve</code>, <code>modelPart_right_pants_leg</code>, <code>modelPart_right_sleeve</code>, <code>reducedDebugInfo</code>, <code>renderClouds</code>, <code>useVbo</code>
+- Supported entries removed: <code>advancedOpengl</code>, <code>anisotropicFiltering</code>, <code>clouds</code>, <code>showCape</code>
+- Fresh file added: <code>allowBlockAlternatives</code>, <code>key_key.spectatorOutlines</code>, <code>modelPart_cape</code>, <code>modelPart_hat</code>, <code>modelPart_jacket</code>, <code>modelPart_left_pants_leg</code>, <code>modelPart_left_sleeve</code>, <code>modelPart_right_pants_leg</code>, <code>modelPart_right_sleeve</code>, <code>reducedDebugInfo</code>, <code>renderClouds</code>, <code>useVbo</code>
+- Fresh file removed: <code>advancedOpengl</code>, <code>anisotropicFiltering</code>, <code>clouds</code>, <code>showCape</code>
 
-- Added `discrete_mouse_scroll`.
-- Removed `enableWeakAttacks`, `fboEnable`, `saturation`, and `useVbo`.
+</details>
 
-## 1.14.4
+<details>
+<summary>1.8.1 (from 1.8)</summary>
 
-- Added `rawMouseInput`.
+- Supported entries added: <code>entityShadows</code>, <code>useNativeTransport</code>
+- Type changed: <code>renderClouds</code> — <code>boolean</code> → <code>enum</code>
+- Fresh file added: <code>entityShadows</code>, <code>useNativeTransport</code>
 
-## 1.15
+</details>
 
-- Added `toggleCrouch`.
+<details>
+<summary>1.8.8 (from 1.8.7)</summary>
 
-## 1.15.2
+- Supported entries added: <code>incompatibleResourcePacks</code>
+- Fresh file added: <code>incompatibleResourcePacks</code>
 
-- Added `skipMultiplayerWarning`.
+</details>
 
-## 1.16
+<details>
+<summary>1.8.9 (from 1.8.8)</summary>
 
-- Added `entityDistanceScaling`.
-- Added `chatLineSpacing`.
-- Added `chatDelay`.
-- Added `syncChunkWrites`.
-- Renamed `key_key.swapHands` to `key_key.swapOffhand`.
+- Supported entries added: <code>realmsNotifications</code>
+- Fresh file added: <code>realmsNotifications</code>
 
-## 1.16.2
+</details>
 
-- Added `fovEffectScale`.
-- Added `screenEffectScale`.
-- Replaced `fancyGraphics` with numeric `graphicsMode`.
+<details>
+<summary>1.9 (from 1.8.9)</summary>
 
-## 1.16.4
+- Supported entries added: <code>attackIndicator</code>, <code>key_key.swapHands</code>, <code>mainHand</code>, <code>showSubtitles</code>, <code>soundCategory_voice</code>
+- Supported entries removed: <code>allowBlockAlternatives</code>, <code>key_key.streamCommercial</code>, <code>key_key.streamPauseUnpause</code>, <code>key_key.streamStartStop</code>, <code>key_key.streamToggleMic</code>, <code>streamBytesPerPixel</code>, <code>streamChatEnabled</code>, <code>streamChatUserFilter</code>, <code>streamCompression</code>, <code>streamFps</code>, <code>streamKbps</code>, <code>streamMicToggleBehavior</code>, <code>streamMicVolume</code>, <code>streamPreferredServer</code>, <code>streamSendMetadata</code>, <code>streamSystemVolume</code>
+- Fresh file added: <code>attackIndicator</code>, <code>key_key.swapHands</code>, <code>mainHand</code>, <code>showSubtitles</code>, <code>soundCategory_voice</code>
+- Fresh file removed: <code>allowBlockAlternatives</code>, <code>key_key.streamCommercial</code>, <code>key_key.streamPauseUnpause</code>, <code>key_key.streamStartStop</code>, <code>key_key.streamToggleMic</code>, <code>streamBytesPerPixel</code>, <code>streamChatEnabled</code>, <code>streamChatUserFilter</code>, <code>streamCompression</code>, <code>streamFps</code>, <code>streamKbps</code>, <code>streamMicToggleBehavior</code>, <code>streamMicVolume</code>, <code>streamPreferredServer</code>, <code>streamSendMetadata</code>, <code>streamSystemVolume</code>
 
-- Added `hideMatchedNames`.
-- Added `key_key.socialInteractions`.
-- Added `joinedFirstServer`.
+</details>
 
-## 1.17
+<details>
+<summary>1.9.1 (from 1.9)</summary>
 
-- Added `darkMojangStudiosBackground`.
+- Supported entries added: <code>enableWeakAttacks</code>
+- Fresh file added: <code>enableWeakAttacks</code>
 
-## 1.18
+</details>
 
-- Added `prioritizeChunkUpdates`.
-- Added `simulationDistance`.
-- Added `soundDevice`.
-- Added `hideLightningFlashes`.
-- Added `showAutosaveIndicator`.
-- Added `allowServerListing`.
-- Removed `snooperEnabled`.
+<details>
+<summary>1.10 (from 1.9.4)</summary>
 
-## 1.19
+- Supported entries added: <code>autoJump</code>, <code>version</code>
+- Fresh file added: <code>autoJump</code>, <code>version</code>
 
-- Added `darknessEffectScale`.
-- Added `directionalAudio`.
-- Added `onlyShowSecureChat`.
-- Removed `difficulty`.
+</details>
 
-## 1.19.3
+<details>
+<summary>1.12 (from 1.11.2)</summary>
 
-- Added `operatorItemsTab`.
-- Added `panoramaScrollSpeed`.
-- Added `telemetryOptInExtra`.
-- Removed `chatPreview`.
+- Supported entries added: <code>key_key.advancements</code>, <code>key_key.loadToolbarActivator</code>, <code>key_key.saveToolbarActivator</code>, <code>narrator</code>, <code>tutorialStep</code>
+- Supported entries removed: <code>showInventoryAchievementHint</code>
+- Fresh file added: <code>key_key.advancements</code>, <code>key_key.loadToolbarActivator</code>, <code>key_key.saveToolbarActivator</code>, <code>narrator</code>, <code>tutorialStep</code>
+- Fresh file removed: <code>showInventoryAchievementHint</code>
 
-## 1.19.4
+</details>
 
-- Added `glintSpeed`.
-- Added `damageTiltStrength`.
-- Added `onboardAccessibility`.
-- Added `highContrast`.
-- Removed `heldItemTooltips`.
+<details>
+<summary>1.13 (from 1.12.2)</summary>
 
-## 1.20.2
+- Supported entries added: <code>autoSuggestions</code>, <code>biomeBlendRadius</code>, <code>fullscreenResolution</code>, <code>glDebugVerbosity</code>, <code>mouseWheelSensitivity</code>
+- Supported entries removed: <code>anaglyph3d</code>
+- Type changed: <code>guiScale</code> — <code>enum</code> → <code>integer</code>
+- Fresh file added: <code>autoSuggestions</code>, <code>biomeBlendRadius</code>, <code>glDebugVerbosity</code>, <code>mouseWheelSensitivity</code>
+- Fresh file removed: <code>anaglyph3d</code>
 
-- Added `narratorHotKey`.
+</details>
 
-## 1.20.3
+<details>
+<summary>1.14 (from 1.13.2)</summary>
 
-- Added `hideSplashTexts`.
+- Supported entries added: <code>backgroundForChatOnly</code>, <code>discrete_mouse_scroll</code>, <code>textBackgroundOpacity</code>
+- Supported entries removed: <code>enableWeakAttacks</code>, <code>fboEnable</code>, <code>saturation</code>
+- Fresh file added: <code>backgroundForChatOnly</code>, <code>discrete_mouse_scroll</code>, <code>textBackgroundOpacity</code>
+- Fresh file removed: <code>enableWeakAttacks</code>, <code>fboEnable</code>, <code>saturation</code>, <code>useVbo</code>
 
-## 1.20.5
+</details>
 
-- Added `japaneseGlyphVariants`.
-- Added `menuBackgroundBlurriness`.
-- Removed `skipRealms32bitWarning`.
+<details>
+<summary>1.14.4 (from 1.14.3)</summary>
 
-## 1.21.1
+- Supported entries added: <code>rawMouseInput</code>
+- Fresh file added: <code>rawMouseInput</code>
 
-- Removed `hideBundleTutorial`.
+</details>
 
-## 1.21.2
+<details>
+<summary>1.15 (from 1.14.4)</summary>
 
-- Added `inactivityFpsLimit`.
-- Added `rotateWithMinecart`.
-- Added `highContrastBlockOutline`.
+- Supported entries added: <code>toggleCrouch</code>, <code>toggleSprint</code>
+- Fresh file added: <code>toggleCrouch</code>, <code>toggleSprint</code>
 
-## 1.21.5
+</details>
 
-- Added `startedCleanly`.
+<details>
+<summary>1.15.2 (from 1.15.1)</summary>
 
-## 1.21.6
+- Supported entries added: <code>skipMultiplayerWarning</code>
+- Fresh file added: <code>skipMultiplayerWarning</code>
 
-- Added `cloudRange`.
-- Added `musicFrequency`.
-- Added `key_key.quickActions`.
-- Added `soundCategory_ui`.
+</details>
 
-## 1.21.9
+<details>
+<summary>1.16 (from 1.15.2)</summary>
 
-- Added `invertXMouse`.
-- Added `toggleAttack`.
-- Added `allowCursorChanges`.
-- Added `saveChatDrafts`.
-- Added `key_key.spectatorHotbar`.
+- Supported entries added: <code>chatDelay</code>, <code>chatLineSpacing</code>, <code>entityDistanceScaling</code>, <code>graphicsMode</code>, <code>key_key.swapOffhand</code>, <code>syncChunkWrites</code>
+- Fresh file added: <code>chatDelay</code>, <code>chatLineSpacing</code>, <code>entityDistanceScaling</code>, <code>graphicsMode</code>, <code>key_key.swapOffhand</code>, <code>syncChunkWrites</code>
+- Fresh file removed: <code>fancyGraphics</code>, <code>key_key.swapHands</code>
 
-## 1.21.11
+</details>
 
-- Added `chunkSectionFadeInTime`.
-- Added `graphicsPreset`.
-- Added `cutoutLeaves`.
-- Added `weatherRadius`.
-- Added `maxAnisotropyBit`.
-- Added `textureFiltering`.
-- Added `improvedTransparency`.
-- Added `vignette`.
-- Added `musicToast`.
-- Added `key_key.toggleGui`.
-- Added `key_key.debug.overlay`.
-- Added `key_key.debug.reloadChunk`.
-- Replaced `graphicsMode` with `graphicsPreset` and separate graphics-detail fields.
-- Replaced `showNowPlayingToast` with `musicToast`.
+<details>
+<summary>1.16.2 (from 1.16.1)</summary>
 
-## 26.1
+- Supported entries added: <code>fovEffectScale</code>, <code>screenEffectScale</code>
+- Fresh file added: <code>fovEffectScale</code>, <code>screenEffectScale</code>
 
-- Added `exclusiveFullscreen`.
-- Added `key_key.debug.lightmapTexture`.
+</details>
 
-## 26.2
+<details>
+<summary>1.16.4 (from 1.16.3)</summary>
 
-- Added `preferredGraphicsBackend`.
-- Added `inGameNotification`.
-- Added `key_key.friends`.
-- Removed `touchscreen`.
+- Supported entries added: <code>hideMatchedNames</code>, <code>joinedFirstServer</code>, <code>key_key.socialInteractions</code>
+- Fresh file added: <code>hideMatchedNames</code>, <code>joinedFirstServer</code>, <code>key_key.socialInteractions</code>
 
-## 26.3
+</details>
 
-- Added `debugGuiScale`.
-- Added `quitShortcuts`.
-- Added `ctrlClickEmulatesRightClick`.
-- Added `macFullscreenMenuVisibility`.
-- Added `key_key.debug.improvedTransparency`.
-- Removed `rawMouseInput`.
+<details>
+<summary>1.17 (from 1.16.5)</summary>
 
-## Vanilla migrations
+- Supported entries added: <code>darkMojangStudiosBackground</code>, <code>hideBundleTutorial</code>
+- Fresh file added: <code>darkMojangStudiosBackground</code>, <code>hideBundleTutorial</code>
 
-Vanilla does these migrations for us
+</details>
 
-| options.txt data version | Change                                                                                                                 |
-| ------------------------ | ---------------------------------------------------------------------------------------------------------------------- |
-| 505                      | Set `useVbo=true`.                                                                                                     |
-| 816                      | Lowercase `lang`.                                                                                                      |
-| 1344                     | Convert numeric LWJGL2 key mappings to token names; convert `-100`, `-99`, and `-98` to left, right, and middle mouse. |
-| 1446                     | Convert `key.*` keyboard tokens to `key.keyboard.*`; retain mouse and scancode forms.                                  |
-| 1936                     | Derive text background opacity from chat opacity.                                                                      |
-| 2556                     | Convert `fancyGraphics=true` to `graphicsMode=1`; convert other values to `graphicsMode=0`.                            |
-| 2558                     | Rename `key_key.swapHands` to `key_key.swapOffhand`.                                                                   |
-| 3201                     | Rename `programer_art` to `programmer_art` in `resourcePacks` and `incompatibleResourcePacks`.                         |
-| 3214                     | Convert ambient occlusion `0` to `false`; convert `1` and `2` to `true`.                                               |
-| 3319                     | Set `onboardAccessibility=false` for upgraded files.                                                                   |
-| 3943                     | Convert menu blur from a float to `round(value * 10)`; use `5` on conversion failure.                                  |
-| 4651                     | Expand `graphicsMode` into graphics-detail fields and set `graphicsPreset=custom`.                                     |
-| 4661                     | Convert `showNowPlayingToast=false` to `musicToast=never`; convert `true` to `musicToast=pause_and_toast`.             |
-| 4892                     | Set `preferredGraphicsBackend=default`.                                                                                |
+<details>
+<summary>1.18 (from 1.17.1)</summary>
+
+- Supported entries added: <code>allowServerListing</code>, <code>hideLightningFlashes</code>, <code>prioritizeChunkUpdates</code>, <code>showAutosaveIndicator</code>, <code>simulationDistance</code>, <code>soundDevice</code>
+- Supported entries removed: <code>snooperEnabled</code>
+- Fresh file added: <code>allowServerListing</code>, <code>hideLightningFlashes</code>, <code>prioritizeChunkUpdates</code>, <code>showAutosaveIndicator</code>, <code>simulationDistance</code>, <code>soundDevice</code>
+- Fresh file removed: <code>snooperEnabled</code>
+
+</details>
+
+<details>
+<summary>1.18.2 (from 1.18.1)</summary>
+
+- Supported entries added: <code>skipRealms32bitWarning</code>
+- Fresh file added: <code>skipRealms32bitWarning</code>
+
+</details>
+
+<details>
+<summary>1.19 (from 1.18.2)</summary>
+
+- Supported entries added: <code>chatPreview</code>, <code>darknessEffectScale</code>, <code>directionalAudio</code>, <code>onlyShowSecureChat</code>
+- Supported entries removed: <code>difficulty</code>
+- Type changed: <code>fov</code> — <code>decimal</code> → <code>integer</code>
+- Fresh file added: <code>chatPreview</code>, <code>darknessEffectScale</code>, <code>directionalAudio</code>, <code>onlyShowSecureChat</code>
+- Fresh file removed: <code>difficulty</code>
+
+</details>
+
+<details>
+<summary>1.19.1 (from 1.19)</summary>
+
+- Type changed: <code>chatPreview</code> — <code>boolean</code> → <code>enum</code>
+
+</details>
+
+<details>
+<summary>1.19.3 (from 1.19.2)</summary>
+
+- Supported entries added: <code>operatorItemsTab</code>, <code>panoramaScrollSpeed</code>, <code>telemetryOptInExtra</code>
+- Supported entries removed: <code>chatPreview</code>
+- Type changed: <code>ao</code> — <code>enum</code> → <code>boolean</code>
+- Fresh file added: <code>operatorItemsTab</code>, <code>panoramaScrollSpeed</code>, <code>telemetryOptInExtra</code>
+- Fresh file removed: <code>chatPreview</code>
+
+</details>
+
+<details>
+<summary>1.19.4 (from 1.19.3)</summary>
+
+- Supported entries added: <code>damageTiltStrength</code>, <code>glintSpeed</code>, <code>glintStrength</code>, <code>highContrast</code>, <code>notificationDisplayTime</code>, <code>onboardAccessibility</code>
+- Supported entries removed: <code>heldItemTooltips</code>
+- Fresh file added: <code>damageTiltStrength</code>, <code>glintSpeed</code>, <code>glintStrength</code>, <code>highContrast</code>, <code>notificationDisplayTime</code>, <code>onboardAccessibility</code>
+- Fresh file removed: <code>heldItemTooltips</code>
+
+</details>
+
+<details>
+<summary>1.20.2 (from 1.20.1)</summary>
+
+- Supported entries added: <code>narratorHotkey</code>
+- Fresh file added: <code>narratorHotkey</code>
+
+</details>
+
+<details>
+<summary>1.20.3 (from 1.20.2)</summary>
+
+- Supported entries added: <code>hideSplashTexts</code>
+- Fresh file added: <code>hideSplashTexts</code>
+
+</details>
+
+<details>
+<summary>1.20.5 (from 1.20.4)</summary>
+
+- Supported entries added: <code>japaneseGlyphVariants</code>, <code>menuBackgroundBlurriness</code>
+- Supported entries removed: <code>skipRealms32bitWarning</code>
+- Fresh file added: <code>japaneseGlyphVariants</code>, <code>menuBackgroundBlurriness</code>
+- Fresh file removed: <code>skipRealms32bitWarning</code>
+
+</details>
+
+<details>
+<summary>1.21 (from 1.20.6)</summary>
+
+- Type changed: <code>menuBackgroundBlurriness</code> — <code>decimal</code> → <code>integer</code>
+
+</details>
+
+<details>
+<summary>1.21.2 (from 1.21.1)</summary>
+
+- Supported entries added: <code>highContrastBlockOutline</code>, <code>inactivityFpsLimit</code>, <code>rotateWithMinecart</code>
+- Supported entries removed: <code>hideBundleTutorial</code>
+- Fresh file added: <code>highContrastBlockOutline</code>, <code>inactivityFpsLimit</code>, <code>rotateWithMinecart</code>
+- Fresh file removed: <code>hideBundleTutorial</code>
+
+</details>
+
+<details>
+<summary>1.21.5 (from 1.21.4)</summary>
+
+- Supported entries added: <code>startedCleanly</code>
+- Fresh file added: <code>startedCleanly</code>
+
+</details>
+
+<details>
+<summary>1.21.6 (from 1.21.5)</summary>
+
+- Supported entries added: <code>cloudRange</code>, <code>key_key.quickActions</code>, <code>musicFrequency</code>, <code>showNowPlayingToast</code>, <code>soundCategory_ui</code>
+- Fresh file added: <code>cloudRange</code>, <code>key_key.quickActions</code>, <code>musicFrequency</code>, <code>showNowPlayingToast</code>, <code>soundCategory_ui</code>
+
+</details>
+
+<details>
+<summary>1.21.9 (from 1.21.8)</summary>
+
+- Supported entries added: <code>allowCursorChanges</code>, <code>invertXMouse</code>, <code>key_key.spectatorHotbar</code>, <code>saveChatDrafts</code>, <code>sprintWindow</code>, <code>toggleAttack</code>, <code>toggleUse</code>
+- Fresh file added: <code>allowCursorChanges</code>, <code>invertXMouse</code>, <code>key_key.spectatorHotbar</code>, <code>saveChatDrafts</code>, <code>sprintWindow</code>, <code>toggleAttack</code>, <code>toggleUse</code>
+
+</details>
+
+<details>
+<summary>1.21.11 (from 1.21.10)</summary>
+
+- Supported entries added: <code>chunkSectionFadeInTime</code>, <code>cutoutLeaves</code>, <code>graphicsPreset</code>, <code>improvedTransparency</code>, <code>key_key.debug.clearChat</code>, <code>key_key.debug.copyLocation</code>, <code>key_key.debug.copyRecreateCommand</code>, <code>key_key.debug.crash</code>, <code>key_key.debug.debugOptions</code>, <code>key_key.debug.dumpDynamicTextures</code>, <code>key_key.debug.dumpVersion</code>, <code>key_key.debug.focusPause</code>, <code>key_key.debug.fpsCharts</code>, <code>key_key.debug.modifier</code>, <code>key_key.debug.networkCharts</code>, <code>key_key.debug.overlay</code>, <code>key_key.debug.profiling</code>, <code>key_key.debug.profilingChart</code>, <code>key_key.debug.reloadChunk</code>, <code>key_key.debug.reloadResourcePacks</code>, <code>key_key.debug.showAdvancedTooltips</code>, <code>key_key.debug.showChunkBorders</code>, <code>key_key.debug.showHitboxes</code>, <code>key_key.debug.spectate</code>, <code>key_key.debug.switchGameMode</code>, <code>key_key.toggleGui</code>, <code>key_key.toggleSpectatorShaderEffects</code>, <code>maxAnisotropyBit</code>, <code>musicToast</code>, <code>textureFiltering</code>, <code>vignette</code>, <code>weatherRadius</code>
+- Fresh file added: <code>chunkSectionFadeInTime</code>, <code>cutoutLeaves</code>, <code>graphicsPreset</code>, <code>improvedTransparency</code>, <code>key_key.debug.clearChat</code>, <code>key_key.debug.copyLocation</code>, <code>key_key.debug.copyRecreateCommand</code>, <code>key_key.debug.crash</code>, <code>key_key.debug.debugOptions</code>, <code>key_key.debug.dumpDynamicTextures</code>, <code>key_key.debug.dumpVersion</code>, <code>key_key.debug.focusPause</code>, <code>key_key.debug.fpsCharts</code>, <code>key_key.debug.modifier</code>, <code>key_key.debug.networkCharts</code>, <code>key_key.debug.overlay</code>, <code>key_key.debug.profiling</code>, <code>key_key.debug.profilingChart</code>, <code>key_key.debug.reloadChunk</code>, <code>key_key.debug.reloadResourcePacks</code>, <code>key_key.debug.showAdvancedTooltips</code>, <code>key_key.debug.showChunkBorders</code>, <code>key_key.debug.showHitboxes</code>, <code>key_key.debug.spectate</code>, <code>key_key.debug.switchGameMode</code>, <code>key_key.toggleGui</code>, <code>key_key.toggleSpectatorShaderEffects</code>, <code>maxAnisotropyBit</code>, <code>musicToast</code>, <code>textureFiltering</code>, <code>vignette</code>, <code>weatherRadius</code>
+- Fresh file removed: <code>graphicsMode</code>, <code>showNowPlayingToast</code>
+
+</details>
+
+<details>
+<summary>26.1 (from 1.21.11)</summary>
+
+- Supported entries added: <code>exclusiveFullscreen</code>, <code>key_key.debug.lightmapTexture</code>
+- Fresh file added: <code>exclusiveFullscreen</code>, <code>key_key.debug.lightmapTexture</code>
+
+</details>
+
+<details>
+<summary>26.2 (from 26.1.2)</summary>
+
+- Supported entries added: <code>inGameNotification</code>, <code>key_key.friends</code>, <code>preferredGraphicsBackend</code>, <code>sharePresence</code>
+- Supported entries removed: <code>touchscreen</code>
+- Fresh file added: <code>inGameNotification</code>, <code>key_key.friends</code>, <code>preferredGraphicsBackend</code>, <code>sharePresence</code>
+- Fresh file removed: <code>touchscreen</code>
+
+</details>
+
+<details>
+<summary>26.3 (from 26.2)</summary>
+
+- Supported entries added: <code>ctrlClickEmulatesRightClick</code>, <code>debugGuiScale</code>, <code>key_key.debug.improvedTransparency</code>, <code>macFullscreenMenuVisibility</code>, <code>quitShortcuts</code>
+- Supported entries removed: <code>rawMouseInput</code>
+- Fresh file added: <code>ctrlClickEmulatesRightClick</code>, <code>debugGuiScale</code>, <code>key_key.debug.improvedTransparency</code>, <code>macFullscreenMenuVisibility</code>, <code>quitShortcuts</code>
+- Fresh file removed: <code>rawMouseInput</code>
+
+</details>
+
+## Option type history
+
+| Key                                               | Version range and type                                                                                                                         | Observed versions           |
+| ------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------- |
+| <code>advancedItemTooltips</code>                 | <code>1.4.2–26.3</code>: <code>boolean</code>                                                                                                  | <code>1.4.2–26.3</code>     |
+| <code>advancedOpengl</code>                       | <code>1.0–1.7.10</code>: <code>boolean</code>                                                                                                  | <code>1.0–1.7.10</code>     |
+| <code>allowBlockAlternatives</code>               | <code>1.8–1.8.9</code>: <code>boolean</code>                                                                                                   | <code>1.8–1.8.9</code>      |
+| <code>allowCursorChanges</code>                   | <code>1.21.9–26.3</code>: <code>boolean</code>                                                                                                 | <code>1.21.9–26.3</code>    |
+| <code>allowServerListing</code>                   | <code>1.18–26.3</code>: <code>boolean</code>                                                                                                   | <code>1.18–26.3</code>      |
+| <code>anaglyph3d</code>                           | <code>1.0–1.12.2</code>: <code>boolean</code>                                                                                                  | <code>1.0–1.12.2</code>     |
+| <code>anisotropicFiltering</code>                 | <code>1.7.2–1.7.10</code>: <code>integer</code>                                                                                                | <code>1.7.2–1.7.10</code>   |
+| <code>ao</code>                                   | <code>1.0–1.4.7</code>: <code>boolean</code><br><code>1.5.1–1.19.2</code>: <code>enum</code><br><code>1.19.3–26.3</code>: <code>boolean</code> | <code>1.0–26.3</code>       |
+| <code>attackIndicator</code>                      | <code>1.9–26.3</code>: <code>enum</code>                                                                                                       | <code>1.9–26.3</code>       |
+| <code>autoJump</code>                             | <code>1.10–26.3</code>: <code>boolean</code>                                                                                                   | <code>1.10–26.3</code>      |
+| <code>autoSuggestions</code>                      | <code>1.13–26.3</code>: <code>boolean</code>                                                                                                   | <code>1.13–26.3</code>      |
+| <code>backgroundForChatOnly</code>                | <code>1.14–26.3</code>: <code>boolean</code>                                                                                                   | <code>1.14–26.3</code>      |
+| <code>biomeBlendRadius</code>                     | <code>1.13–26.3</code>: <code>integer</code>                                                                                                   | <code>1.13–26.3</code>      |
+| <code>bobView</code>                              | <code>1.0–26.3</code>: <code>boolean</code>                                                                                                    | <code>1.0–26.3</code>       |
+| <code>chatColors</code>                           | <code>1.3.1–26.3</code>: <code>boolean</code>                                                                                                  | <code>1.3.1–26.3</code>     |
+| <code>chatDelay</code>                            | <code>1.16–26.3</code>: <code>decimal</code>                                                                                                   | <code>1.16–26.3</code>      |
+| <code>chatHeightFocused</code>                    | <code>1.5.1–26.3</code>: <code>decimal</code>                                                                                                  | <code>1.5.1–26.3</code>     |
+| <code>chatHeightUnfocused</code>                  | <code>1.5.1–26.3</code>: <code>decimal</code>                                                                                                  | <code>1.5.1–26.3</code>     |
+| <code>chatLineSpacing</code>                      | <code>1.16–26.3</code>: <code>decimal</code>                                                                                                   | <code>1.16–26.3</code>      |
+| <code>chatLinks</code>                            | <code>1.3.1–26.3</code>: <code>boolean</code>                                                                                                  | <code>1.3.1–26.3</code>     |
+| <code>chatLinksPrompt</code>                      | <code>1.3.1–26.3</code>: <code>boolean</code>                                                                                                  | <code>1.3.1–26.3</code>     |
+| <code>chatOpacity</code>                          | <code>1.3.1–26.3</code>: <code>decimal</code>                                                                                                  | <code>1.3.1–26.3</code>     |
+| <code>chatPreview</code>                          | <code>1.19</code>: <code>boolean</code><br><code>1.19.1–1.19.2</code>: <code>enum</code>                                                       | <code>1.19–1.19.2</code>    |
+| <code>chatScale</code>                            | <code>1.5.1–26.3</code>: <code>decimal</code>                                                                                                  | <code>1.5.1–26.3</code>     |
+| <code>chatVisibility</code>                       | <code>1.3.1–26.3</code>: <code>enum</code>                                                                                                     | <code>1.3.1–26.3</code>     |
+| <code>chatWidth</code>                            | <code>1.5.1–26.3</code>: <code>decimal</code>                                                                                                  | <code>1.5.1–26.3</code>     |
+| <code>chunkSectionFadeInTime</code>               | <code>1.21.11–26.3</code>: <code>decimal</code>                                                                                                | <code>1.21.11–26.3</code>   |
+| <code>cloudRange</code>                           | <code>1.21.6–26.3</code>: <code>integer</code>                                                                                                 | <code>1.21.6–26.3</code>    |
+| <code>clouds</code>                               | <code>1.0–1.7.10</code>: <code>boolean</code>                                                                                                  | <code>1.0–1.7.10</code>     |
+| <code>ctrlClickEmulatesRightClick</code>          | <code>26.3</code>: <code>boolean</code>                                                                                                        | <code>26.3</code>           |
+| <code>cutoutLeaves</code>                         | <code>1.21.11–26.3</code>: <code>boolean</code>                                                                                                | <code>1.21.11–26.3</code>   |
+| <code>damageTiltStrength</code>                   | <code>1.19.4–26.3</code>: <code>decimal</code>                                                                                                 | <code>1.19.4–26.3</code>    |
+| <code>darkMojangStudiosBackground</code>          | <code>1.17–26.3</code>: <code>boolean</code>                                                                                                   | <code>1.17–26.3</code>      |
+| <code>darknessEffectScale</code>                  | <code>1.19–26.3</code>: <code>decimal</code>                                                                                                   | <code>1.19–26.3</code>      |
+| <code>debugGuiScale</code>                        | <code>26.3</code>: <code>integer</code>                                                                                                        | <code>26.3</code>           |
+| <code>difficulty</code>                           | <code>1.0–1.18.2</code>: <code>enum</code>                                                                                                     | <code>1.0–1.18.2</code>     |
+| <code>directionalAudio</code>                     | <code>1.19–26.3</code>: <code>boolean</code>                                                                                                   | <code>1.19–26.3</code>      |
+| <code>discrete_mouse_scroll</code>                | <code>1.14–26.3</code>: <code>boolean</code>                                                                                                   | <code>1.14–26.3</code>      |
+| <code>enableVsync</code>                          | <code>1.3.1–26.3</code>: <code>boolean</code>                                                                                                  | <code>1.3.1–26.3</code>     |
+| <code>enableWeakAttacks</code>                    | <code>1.9.1–1.13.2</code>: <code>boolean</code>                                                                                                | <code>1.9.1–1.13.2</code>   |
+| <code>entityDistanceScaling</code>                | <code>1.16–26.3</code>: <code>decimal</code>                                                                                                   | <code>1.16–26.3</code>      |
+| <code>entityShadows</code>                        | <code>1.8.1–26.3</code>: <code>boolean</code>                                                                                                  | <code>1.8.1–26.3</code>     |
+| <code>exclusiveFullscreen</code>                  | <code>26.1–26.3</code>: <code>boolean</code>                                                                                                   | <code>26.1–26.3</code>      |
+| <code>fancyGraphics</code>                        | <code>1.0–26.3</code>: <code>boolean</code>                                                                                                    | <code>1.0–1.15.2</code>     |
+| <code>fboEnable</code>                            | <code>1.7.2–1.13.2</code>: <code>boolean</code>                                                                                                | <code>1.7.2–1.13.2</code>   |
+| <code>forceUnicodeFont</code>                     | <code>1.7.2–26.3</code>: <code>boolean</code>                                                                                                  | <code>1.7.2–26.3</code>     |
+| <code>fov</code>                                  | <code>1.0–1.18.2</code>: <code>decimal</code><br><code>1.19–26.3</code>: <code>integer</code>                                                  | <code>1.0–26.3</code>       |
+| <code>fovEffectScale</code>                       | <code>1.16.2–26.3</code>: <code>decimal</code>                                                                                                 | <code>1.16.2–26.3</code>    |
+| <code>fpsLimit</code>                             | <code>1.0–1.6.4</code>: <code>enum</code>                                                                                                      | <code>1.0–1.6.4</code>      |
+| <code>fullscreen</code>                           | <code>1.3.1–26.3</code>: <code>boolean</code>                                                                                                  | <code>1.3.1–26.3</code>     |
+| <code>fullscreenResolution</code>                 | <code>1.13–26.3</code>: <code>compound</code>                                                                                                  | —                           |
+| <code>gamma</code>                                | <code>1.0–26.3</code>: <code>decimal</code>                                                                                                    | <code>1.0–26.3</code>       |
+| <code>glDebugVerbosity</code>                     | <code>1.13–26.3</code>: <code>integer</code>                                                                                                   | <code>1.13–26.3</code>      |
+| <code>glintSpeed</code>                           | <code>1.19.4–26.3</code>: <code>decimal</code>                                                                                                 | <code>1.19.4–26.3</code>    |
+| <code>glintStrength</code>                        | <code>1.19.4–26.3</code>: <code>decimal</code>                                                                                                 | <code>1.19.4–26.3</code>    |
+| <code>graphicsMode</code>                         | <code>1.16–26.3</code>: <code>enum</code>                                                                                                      | <code>1.16–1.21.10</code>   |
+| <code>graphicsPreset</code>                       | <code>1.21.11–26.3</code>: <code>enum</code>                                                                                                   | <code>1.21.11–26.3</code>   |
+| <code>guiScale</code>                             | <code>1.0–1.12.2</code>: <code>enum</code><br><code>1.13–26.3</code>: <code>integer</code>                                                     | <code>1.0–26.3</code>       |
+| <code>heldItemTooltips</code>                     | <code>1.4.6–1.19.3</code>: <code>boolean</code>                                                                                                | <code>1.4.6–1.19.3</code>   |
+| <code>hideBundleTutorial</code>                   | <code>1.17–1.21.1</code>: <code>boolean</code>                                                                                                 | <code>1.17–1.21.1</code>    |
+| <code>hideLightningFlashes</code>                 | <code>1.18–26.3</code>: <code>boolean</code>                                                                                                   | <code>1.18–26.3</code>      |
+| <code>hideMatchedNames</code>                     | <code>1.16.4–26.3</code>: <code>boolean</code>                                                                                                 | <code>1.16.4–26.3</code>    |
+| <code>hideServerAddress</code>                    | <code>1.3.2–26.3</code>: <code>boolean</code>                                                                                                  | <code>1.3.2–26.3</code>     |
+| <code>hideSplashTexts</code>                      | <code>1.20.3–26.3</code>: <code>boolean</code>                                                                                                 | <code>1.20.3–26.3</code>    |
+| <code>highContrast</code>                         | <code>1.19.4–26.3</code>: <code>boolean</code>                                                                                                 | <code>1.19.4–26.3</code>    |
+| <code>highContrastBlockOutline</code>             | <code>1.21.2–26.3</code>: <code>boolean</code>                                                                                                 | <code>1.21.2–26.3</code>    |
+| <code>improvedTransparency</code>                 | <code>1.21.11–26.3</code>: <code>boolean</code>                                                                                                | <code>1.21.11–26.3</code>   |
+| <code>inGameNotification</code>                   | <code>26.2–26.3</code>: <code>boolean</code>                                                                                                   | <code>26.2–26.3</code>      |
+| <code>inactivityFpsLimit</code>                   | <code>1.21.2–26.3</code>: <code>enum</code>                                                                                                    | <code>1.21.2–26.3</code>    |
+| <code>incompatibleResourcePacks</code>            | <code>1.8.8–26.3</code>: <code>string_list</code>                                                                                              | <code>1.8.8–26.3</code>     |
+| <code>invertXMouse</code>                         | <code>1.21.9–26.3</code>: <code>boolean</code>                                                                                                 | <code>1.21.9–26.3</code>    |
+| <code>invertYMouse</code>                         | <code>1.0–26.3</code>: <code>boolean</code>                                                                                                    | <code>1.0–26.3</code>       |
+| <code>japaneseGlyphVariants</code>                | <code>1.20.5–26.3</code>: <code>boolean</code>                                                                                                 | <code>1.20.5–26.3</code>    |
+| <code>joinedFirstServer</code>                    | <code>1.16.4–26.3</code>: <code>boolean</code>                                                                                                 | <code>1.16.4–26.3</code>    |
+| <code>key_key.advancements</code>                 | <code>1.12–26.3</code>: <code>key_binding</code>                                                                                               | <code>1.12–26.3</code>      |
+| <code>key_key.attack</code>                       | <code>1.0–26.3</code>: <code>key_binding</code>                                                                                                | <code>1.0–26.3</code>       |
+| <code>key_key.back</code>                         | <code>1.0–26.3</code>: <code>key_binding</code>                                                                                                | <code>1.0–26.3</code>       |
+| <code>key_key.chat</code>                         | <code>1.0–26.3</code>: <code>key_binding</code>                                                                                                | <code>1.0–26.3</code>       |
+| <code>key_key.command</code>                      | <code>1.3.1–26.3</code>: <code>key_binding</code>                                                                                              | <code>1.3.1–26.3</code>     |
+| <code>key_key.debug.clearChat</code>              | <code>1.21.11–26.3</code>: <code>key_binding</code>                                                                                            | <code>1.21.11–26.3</code>   |
+| <code>key_key.debug.copyLocation</code>           | <code>1.21.11–26.3</code>: <code>key_binding</code>                                                                                            | <code>1.21.11–26.3</code>   |
+| <code>key_key.debug.copyRecreateCommand</code>    | <code>1.21.11–26.3</code>: <code>key_binding</code>                                                                                            | <code>1.21.11–26.3</code>   |
+| <code>key_key.debug.crash</code>                  | <code>1.21.11–26.3</code>: <code>key_binding</code>                                                                                            | <code>1.21.11–26.3</code>   |
+| <code>key_key.debug.debugOptions</code>           | <code>1.21.11–26.3</code>: <code>key_binding</code>                                                                                            | <code>1.21.11–26.3</code>   |
+| <code>key_key.debug.dumpDynamicTextures</code>    | <code>1.21.11–26.3</code>: <code>key_binding</code>                                                                                            | <code>1.21.11–26.3</code>   |
+| <code>key_key.debug.dumpVersion</code>            | <code>1.21.11–26.3</code>: <code>key_binding</code>                                                                                            | <code>1.21.11–26.3</code>   |
+| <code>key_key.debug.focusPause</code>             | <code>1.21.11–26.3</code>: <code>key_binding</code>                                                                                            | <code>1.21.11–26.3</code>   |
+| <code>key_key.debug.fpsCharts</code>              | <code>1.21.11–26.3</code>: <code>key_binding</code>                                                                                            | <code>1.21.11–26.3</code>   |
+| <code>key_key.debug.improvedTransparency</code>   | <code>26.3</code>: <code>key_binding</code>                                                                                                    | <code>26.3</code>           |
+| <code>key_key.debug.lightmapTexture</code>        | <code>26.1–26.3</code>: <code>key_binding</code>                                                                                               | <code>26.1–26.3</code>      |
+| <code>key_key.debug.modifier</code>               | <code>1.21.11–26.3</code>: <code>key_binding</code>                                                                                            | <code>1.21.11–26.3</code>   |
+| <code>key_key.debug.networkCharts</code>          | <code>1.21.11–26.3</code>: <code>key_binding</code>                                                                                            | <code>1.21.11–26.3</code>   |
+| <code>key_key.debug.overlay</code>                | <code>1.21.11–26.3</code>: <code>key_binding</code>                                                                                            | <code>1.21.11–26.3</code>   |
+| <code>key_key.debug.profiling</code>              | <code>1.21.11–26.3</code>: <code>key_binding</code>                                                                                            | <code>1.21.11–26.3</code>   |
+| <code>key_key.debug.profilingChart</code>         | <code>1.21.11–26.3</code>: <code>key_binding</code>                                                                                            | <code>1.21.11–26.3</code>   |
+| <code>key_key.debug.reloadChunk</code>            | <code>1.21.11–26.3</code>: <code>key_binding</code>                                                                                            | <code>1.21.11–26.3</code>   |
+| <code>key_key.debug.reloadResourcePacks</code>    | <code>1.21.11–26.3</code>: <code>key_binding</code>                                                                                            | <code>1.21.11–26.3</code>   |
+| <code>key_key.debug.showAdvancedTooltips</code>   | <code>1.21.11–26.3</code>: <code>key_binding</code>                                                                                            | <code>1.21.11–26.3</code>   |
+| <code>key_key.debug.showChunkBorders</code>       | <code>1.21.11–26.3</code>: <code>key_binding</code>                                                                                            | <code>1.21.11–26.3</code>   |
+| <code>key_key.debug.showHitboxes</code>           | <code>1.21.11–26.3</code>: <code>key_binding</code>                                                                                            | <code>1.21.11–26.3</code>   |
+| <code>key_key.debug.spectate</code>               | <code>1.21.11–26.3</code>: <code>key_binding</code>                                                                                            | <code>1.21.11–26.3</code>   |
+| <code>key_key.debug.switchGameMode</code>         | <code>1.21.11–26.3</code>: <code>key_binding</code>                                                                                            | <code>1.21.11–26.3</code>   |
+| <code>key_key.drop</code>                         | <code>1.0–26.3</code>: <code>key_binding</code>                                                                                                | <code>1.0–26.3</code>       |
+| <code>key_key.forward</code>                      | <code>1.0–26.3</code>: <code>key_binding</code>                                                                                                | <code>1.0–26.3</code>       |
+| <code>key_key.friends</code>                      | <code>26.2–26.3</code>: <code>key_binding</code>                                                                                               | <code>26.2–26.3</code>      |
+| <code>key_key.fullscreen</code>                   | <code>1.7.3–26.3</code>: <code>key_binding</code>                                                                                              | <code>1.7.3–26.3</code>     |
+| <code>key_key.hotbar.1</code>                     | <code>1.7.2–26.3</code>: <code>key_binding</code>                                                                                              | <code>1.7.2–26.3</code>     |
+| <code>key_key.hotbar.2</code>                     | <code>1.7.2–26.3</code>: <code>key_binding</code>                                                                                              | <code>1.7.2–26.3</code>     |
+| <code>key_key.hotbar.3</code>                     | <code>1.7.2–26.3</code>: <code>key_binding</code>                                                                                              | <code>1.7.2–26.3</code>     |
+| <code>key_key.hotbar.4</code>                     | <code>1.7.2–26.3</code>: <code>key_binding</code>                                                                                              | <code>1.7.2–26.3</code>     |
+| <code>key_key.hotbar.5</code>                     | <code>1.7.2–26.3</code>: <code>key_binding</code>                                                                                              | <code>1.7.2–26.3</code>     |
+| <code>key_key.hotbar.6</code>                     | <code>1.7.2–26.3</code>: <code>key_binding</code>                                                                                              | <code>1.7.2–26.3</code>     |
+| <code>key_key.hotbar.7</code>                     | <code>1.7.2–26.3</code>: <code>key_binding</code>                                                                                              | <code>1.7.2–26.3</code>     |
+| <code>key_key.hotbar.8</code>                     | <code>1.7.2–26.3</code>: <code>key_binding</code>                                                                                              | <code>1.7.2–26.3</code>     |
+| <code>key_key.hotbar.9</code>                     | <code>1.7.2–26.3</code>: <code>key_binding</code>                                                                                              | <code>1.7.2–26.3</code>     |
+| <code>key_key.inventory</code>                    | <code>1.0–26.3</code>: <code>key_binding</code>                                                                                                | <code>1.0–26.3</code>       |
+| <code>key_key.jump</code>                         | <code>1.0–26.3</code>: <code>key_binding</code>                                                                                                | <code>1.0–26.3</code>       |
+| <code>key_key.left</code>                         | <code>1.0–26.3</code>: <code>key_binding</code>                                                                                                | <code>1.0–26.3</code>       |
+| <code>key_key.loadToolbarActivator</code>         | <code>1.12–26.3</code>: <code>key_binding</code>                                                                                               | <code>1.12–26.3</code>      |
+| <code>key_key.pickItem</code>                     | <code>1.0–26.3</code>: <code>key_binding</code>                                                                                                | <code>1.0–26.3</code>       |
+| <code>key_key.playerlist</code>                   | <code>1.0–26.3</code>: <code>key_binding</code>                                                                                                | <code>1.0–26.3</code>       |
+| <code>key_key.quickActions</code>                 | <code>1.21.6–26.3</code>: <code>key_binding</code>                                                                                             | <code>1.21.6–26.3</code>    |
+| <code>key_key.right</code>                        | <code>1.0–26.3</code>: <code>key_binding</code>                                                                                                | <code>1.0–26.3</code>       |
+| <code>key_key.saveToolbarActivator</code>         | <code>1.12–26.3</code>: <code>key_binding</code>                                                                                               | <code>1.12–26.3</code>      |
+| <code>key_key.screenshot</code>                   | <code>1.7.2–26.3</code>: <code>key_binding</code>                                                                                              | <code>1.7.2–26.3</code>     |
+| <code>key_key.smoothCamera</code>                 | <code>1.7.2–26.3</code>: <code>key_binding</code>                                                                                              | <code>1.7.2–26.3</code>     |
+| <code>key_key.sneak</code>                        | <code>1.0–26.3</code>: <code>key_binding</code>                                                                                                | <code>1.0–26.3</code>       |
+| <code>key_key.socialInteractions</code>           | <code>1.16.4–26.3</code>: <code>key_binding</code>                                                                                             | <code>1.16.4–26.3</code>    |
+| <code>key_key.spectatorHotbar</code>              | <code>1.21.9–26.3</code>: <code>key_binding</code>                                                                                             | <code>1.21.9–26.3</code>    |
+| <code>key_key.spectatorOutlines</code>            | <code>1.8–26.3</code>: <code>key_binding</code>                                                                                                | <code>1.8–26.3</code>       |
+| <code>key_key.sprint</code>                       | <code>1.7.2–26.3</code>: <code>key_binding</code>                                                                                              | <code>1.7.2–26.3</code>     |
+| <code>key_key.streamCommercial</code>             | <code>1.7.3–1.8.9</code>: <code>key_binding</code>                                                                                             | <code>1.7.3–1.8.9</code>    |
+| <code>key_key.streamPauseUnpause</code>           | <code>1.7.3–1.8.9</code>: <code>key_binding</code>                                                                                             | <code>1.7.3–1.8.9</code>    |
+| <code>key_key.streamStartStop</code>              | <code>1.7.3–1.8.9</code>: <code>key_binding</code>                                                                                             | <code>1.7.3–1.8.9</code>    |
+| <code>key_key.streamToggleMic</code>              | <code>1.7.3–1.8.9</code>: <code>key_binding</code>                                                                                             | <code>1.7.3–1.8.9</code>    |
+| <code>key_key.swapHands</code>                    | <code>1.9–26.3</code>: <code>key_binding</code>                                                                                                | <code>1.9–1.15.2</code>     |
+| <code>key_key.swapOffhand</code>                  | <code>1.16–26.3</code>: <code>key_binding</code>                                                                                               | <code>1.16–26.3</code>      |
+| <code>key_key.toggleGui</code>                    | <code>1.21.11–26.3</code>: <code>key_binding</code>                                                                                            | <code>1.21.11–26.3</code>   |
+| <code>key_key.togglePerspective</code>            | <code>1.7.2–26.3</code>: <code>key_binding</code>                                                                                              | <code>1.7.2–26.3</code>     |
+| <code>key_key.toggleSpectatorShaderEffects</code> | <code>1.21.11–26.3</code>: <code>key_binding</code>                                                                                            | <code>1.21.11–26.3</code>   |
+| <code>key_key.use</code>                          | <code>1.0–26.3</code>: <code>key_binding</code>                                                                                                | <code>1.0–26.3</code>       |
+| <code>lang</code>                                 | <code>1.1–26.3</code>: <code>string</code>                                                                                                     | <code>1.1–26.3</code>       |
+| <code>lastServer</code>                           | <code>1.0–26.3</code>: <code>string</code>                                                                                                     | <code>1.0–26.3</code>       |
+| <code>macFullscreenMenuVisibility</code>          | <code>26.3</code>: <code>boolean</code>                                                                                                        | <code>26.3</code>           |
+| <code>mainHand</code>                             | <code>1.9–26.3</code>: <code>enum</code>                                                                                                       | <code>1.9–26.3</code>       |
+| <code>maxAnisotropyBit</code>                     | <code>1.21.11–26.3</code>: <code>integer</code>                                                                                                | <code>1.21.11–26.3</code>   |
+| <code>maxFps</code>                               | <code>1.7.2–26.3</code>: <code>integer</code>                                                                                                  | <code>1.7.2–26.3</code>     |
+| <code>menuBackgroundBlurriness</code>             | <code>1.20.5–1.20.6</code>: <code>decimal</code><br><code>1.21–26.3</code>: <code>integer</code>                                               | <code>1.20.5–26.3</code>    |
+| <code>mipmapLevels</code>                         | <code>1.7.2–26.3</code>: <code>integer</code>                                                                                                  | <code>1.7.2–26.3</code>     |
+| <code>modelPart_cape</code>                       | <code>1.8–26.3</code>: <code>boolean</code>                                                                                                    | <code>1.8–26.3</code>       |
+| <code>modelPart_hat</code>                        | <code>1.8–26.3</code>: <code>boolean</code>                                                                                                    | <code>1.8–26.3</code>       |
+| <code>modelPart_jacket</code>                     | <code>1.8–26.3</code>: <code>boolean</code>                                                                                                    | <code>1.8–26.3</code>       |
+| <code>modelPart_left_pants_leg</code>             | <code>1.8–26.3</code>: <code>boolean</code>                                                                                                    | <code>1.8–26.3</code>       |
+| <code>modelPart_left_sleeve</code>                | <code>1.8–26.3</code>: <code>boolean</code>                                                                                                    | <code>1.8–26.3</code>       |
+| <code>modelPart_right_pants_leg</code>            | <code>1.8–26.3</code>: <code>boolean</code>                                                                                                    | <code>1.8–26.3</code>       |
+| <code>modelPart_right_sleeve</code>               | <code>1.8–26.3</code>: <code>boolean</code>                                                                                                    | <code>1.8–26.3</code>       |
+| <code>mouseSensitivity</code>                     | <code>1.0–26.3</code>: <code>decimal</code>                                                                                                    | <code>1.0–26.3</code>       |
+| <code>mouseWheelSensitivity</code>                | <code>1.13–26.3</code>: <code>decimal</code>                                                                                                   | <code>1.13–26.3</code>      |
+| <code>music</code>                                | <code>1.0–1.6.4</code>: <code>decimal</code>                                                                                                   | <code>1.0–1.6.4</code>      |
+| <code>musicFrequency</code>                       | <code>1.21.6–26.3</code>: <code>enum</code>                                                                                                    | <code>1.21.6–26.3</code>    |
+| <code>musicToast</code>                           | <code>1.21.11–26.3</code>: <code>enum</code>                                                                                                   | <code>1.21.11–26.3</code>   |
+| <code>narrator</code>                             | <code>1.12–26.3</code>: <code>enum</code>                                                                                                      | <code>1.12–26.3</code>      |
+| <code>narratorHotkey</code>                       | <code>1.20.2–26.3</code>: <code>boolean</code>                                                                                                 | <code>1.20.2–26.3</code>    |
+| <code>notificationDisplayTime</code>              | <code>1.19.4–26.3</code>: <code>decimal</code>                                                                                                 | <code>1.19.4–26.3</code>    |
+| <code>onboardAccessibility</code>                 | <code>1.19.4–26.3</code>: <code>boolean</code>                                                                                                 | <code>1.19.4–26.3</code>    |
+| <code>onlyShowSecureChat</code>                   | <code>1.19–26.3</code>: <code>boolean</code>                                                                                                   | <code>1.19–26.3</code>      |
+| <code>operatorItemsTab</code>                     | <code>1.19.3–26.3</code>: <code>boolean</code>                                                                                                 | <code>1.19.3–26.3</code>    |
+| <code>overrideHeight</code>                       | <code>1.4.6–26.3</code>: <code>integer</code>                                                                                                  | <code>1.4.6–26.3</code>     |
+| <code>overrideWidth</code>                        | <code>1.4.6–26.3</code>: <code>integer</code>                                                                                                  | <code>1.4.6–26.3</code>     |
+| <code>panoramaScrollSpeed</code>                  | <code>1.19.3–26.3</code>: <code>decimal</code>                                                                                                 | <code>1.19.3–26.3</code>    |
+| <code>particles</code>                            | <code>1.0–26.3</code>: <code>enum</code>                                                                                                       | <code>1.0–26.3</code>       |
+| <code>pauseOnLostFocus</code>                     | <code>1.4.2–26.3</code>: <code>boolean</code>                                                                                                  | <code>1.4.2–26.3</code>     |
+| <code>preferredGraphicsBackend</code>             | <code>26.2–26.3</code>: <code>enum</code>                                                                                                      | <code>26.2–26.3</code>      |
+| <code>prioritizeChunkUpdates</code>               | <code>1.18–26.3</code>: <code>enum</code>                                                                                                      | <code>1.18–26.3</code>      |
+| <code>quitShortcuts</code>                        | <code>26.3</code>: <code>boolean</code>                                                                                                        | <code>26.3</code>           |
+| <code>rawMouseInput</code>                        | <code>1.14.4–26.2</code>: <code>boolean</code>                                                                                                 | <code>1.14.4–26.2</code>    |
+| <code>realmsNotifications</code>                  | <code>1.8.9–26.3</code>: <code>boolean</code>                                                                                                  | <code>1.8.9–26.3</code>     |
+| <code>reducedDebugInfo</code>                     | <code>1.8–26.3</code>: <code>boolean</code>                                                                                                    | <code>1.8–26.3</code>       |
+| <code>renderClouds</code>                         | <code>1.8</code>: <code>boolean</code><br><code>1.8.1–26.3</code>: <code>enum</code>                                                           | <code>1.8–26.3</code>       |
+| <code>renderDistance</code>                       | <code>1.7.2–26.3</code>: <code>integer</code>                                                                                                  | <code>1.7.2–26.3</code>     |
+| <code>resourcePacks</code>                        | <code>1.7.2–26.3</code>: <code>string_list</code>                                                                                              | <code>1.7.2–26.3</code>     |
+| <code>rotateWithMinecart</code>                   | <code>1.21.2–26.3</code>: <code>boolean</code>                                                                                                 | <code>1.21.2–26.3</code>    |
+| <code>saturation</code>                           | <code>1.7.2–1.13.2</code>: <code>decimal</code>                                                                                                | <code>1.7.2–1.13.2</code>   |
+| <code>saveChatDrafts</code>                       | <code>1.21.9–26.3</code>: <code>boolean</code>                                                                                                 | <code>1.21.9–26.3</code>    |
+| <code>screenEffectScale</code>                    | <code>1.16.2–26.3</code>: <code>decimal</code>                                                                                                 | <code>1.16.2–26.3</code>    |
+| <code>serverTextures</code>                       | <code>1.3.1–1.7.5</code>: <code>boolean</code>                                                                                                 | <code>1.3.1–1.7.5</code>    |
+| <code>sharePresence</code>                        | <code>26.2–26.3</code>: <code>enum</code>                                                                                                      | <code>26.2–26.3</code>      |
+| <code>showAutosaveIndicator</code>                | <code>1.18–26.3</code>: <code>boolean</code>                                                                                                   | <code>1.18–26.3</code>      |
+| <code>showCape</code>                             | <code>1.4.2–1.7.10</code>: <code>boolean</code>                                                                                                | <code>1.4.2–1.7.10</code>   |
+| <code>showInventoryAchievementHint</code>         | <code>1.7.2–1.11.2</code>: <code>boolean</code>                                                                                                | <code>1.7.2–1.11.2</code>   |
+| <code>showNowPlayingToast</code>                  | <code>1.21.6–26.3</code>: <code>boolean</code>                                                                                                 | <code>1.21.6–1.21.10</code> |
+| <code>showSubtitles</code>                        | <code>1.9–26.3</code>: <code>boolean</code>                                                                                                    | <code>1.9–26.3</code>       |
+| <code>simulationDistance</code>                   | <code>1.18–26.3</code>: <code>integer</code>                                                                                                   | <code>1.18–26.3</code>      |
+| <code>skin</code>                                 | <code>1.0–1.6.4</code>: <code>string</code>                                                                                                    | <code>1.0–1.6.4</code>      |
+| <code>skipMultiplayerWarning</code>               | <code>1.15.2–26.3</code>: <code>boolean</code>                                                                                                 | <code>1.15.2–26.3</code>    |
+| <code>skipRealms32bitWarning</code>               | <code>1.18.2–1.20.4</code>: <code>boolean</code>                                                                                               | <code>1.18.2–1.20.4</code>  |
+| <code>snooperEnabled</code>                       | <code>1.3.1–1.17.1</code>: <code>boolean</code>                                                                                                | <code>1.3.1–1.17.1</code>   |
+| <code>sound</code>                                | <code>1.0–1.6.4</code>: <code>decimal</code>                                                                                                   | <code>1.0–1.6.4</code>      |
+| <code>soundCategory_ambient</code>                | <code>1.7.2–26.3</code>: <code>decimal</code>                                                                                                  | <code>1.7.2–26.3</code>     |
+| <code>soundCategory_block</code>                  | <code>1.7.2–26.3</code>: <code>decimal</code>                                                                                                  | <code>1.7.2–26.3</code>     |
+| <code>soundCategory_hostile</code>                | <code>1.7.2–26.3</code>: <code>decimal</code>                                                                                                  | <code>1.7.2–26.3</code>     |
+| <code>soundCategory_master</code>                 | <code>1.7.2–26.3</code>: <code>decimal</code>                                                                                                  | <code>1.7.2–26.3</code>     |
+| <code>soundCategory_music</code>                  | <code>1.7.2–26.3</code>: <code>decimal</code>                                                                                                  | <code>1.7.2–26.3</code>     |
+| <code>soundCategory_neutral</code>                | <code>1.7.2–26.3</code>: <code>decimal</code>                                                                                                  | <code>1.7.2–26.3</code>     |
+| <code>soundCategory_player</code>                 | <code>1.7.2–26.3</code>: <code>decimal</code>                                                                                                  | <code>1.7.2–26.3</code>     |
+| <code>soundCategory_record</code>                 | <code>1.7.2–26.3</code>: <code>decimal</code>                                                                                                  | <code>1.7.2–26.3</code>     |
+| <code>soundCategory_ui</code>                     | <code>1.21.6–26.3</code>: <code>decimal</code>                                                                                                 | <code>1.21.6–26.3</code>    |
+| <code>soundCategory_voice</code>                  | <code>1.9–26.3</code>: <code>decimal</code>                                                                                                    | <code>1.9–26.3</code>       |
+| <code>soundCategory_weather</code>                | <code>1.7.2–26.3</code>: <code>decimal</code>                                                                                                  | <code>1.7.2–26.3</code>     |
+| <code>soundDevice</code>                          | <code>1.18–26.3</code>: <code>string</code>                                                                                                    | <code>1.18–26.3</code>      |
+| <code>sprintWindow</code>                         | <code>1.21.9–26.3</code>: <code>integer</code>                                                                                                 | <code>1.21.9–26.3</code>    |
+| <code>startedCleanly</code>                       | <code>1.21.5–26.3</code>: <code>boolean</code>                                                                                                 | <code>1.21.5–26.3</code>    |
+| <code>streamBytesPerPixel</code>                  | <code>1.7.3–1.8.9</code>: <code>decimal</code>                                                                                                 | <code>1.7.3–1.8.9</code>    |
+| <code>streamChatEnabled</code>                    | <code>1.7.3–1.8.9</code>: <code>enum</code>                                                                                                    | <code>1.7.3–1.8.9</code>    |
+| <code>streamChatUserFilter</code>                 | <code>1.7.3–1.8.9</code>: <code>enum</code>                                                                                                    | <code>1.7.3–1.8.9</code>    |
+| <code>streamCompression</code>                    | <code>1.7.3–1.8.9</code>: <code>enum</code>                                                                                                    | <code>1.7.3–1.8.9</code>    |
+| <code>streamFps</code>                            | <code>1.7.3–1.8.9</code>: <code>decimal</code>                                                                                                 | <code>1.7.3–1.8.9</code>    |
+| <code>streamKbps</code>                           | <code>1.7.3–1.8.9</code>: <code>decimal</code>                                                                                                 | <code>1.7.3–1.8.9</code>    |
+| <code>streamMicToggleBehavior</code>              | <code>1.7.3–1.8.9</code>: <code>enum</code>                                                                                                    | <code>1.7.3–1.8.9</code>    |
+| <code>streamMicVolume</code>                      | <code>1.7.3–1.8.9</code>: <code>decimal</code>                                                                                                 | <code>1.7.3–1.8.9</code>    |
+| <code>streamPreferredServer</code>                | <code>1.7.3–1.8.9</code>: <code>string</code>                                                                                                  | <code>1.7.3–1.8.9</code>    |
+| <code>streamSendMetadata</code>                   | <code>1.7.3–1.8.9</code>: <code>boolean</code>                                                                                                 | <code>1.7.3–1.8.9</code>    |
+| <code>streamSystemVolume</code>                   | <code>1.7.3–1.8.9</code>: <code>decimal</code>                                                                                                 | <code>1.7.3–1.8.9</code>    |
+| <code>syncChunkWrites</code>                      | <code>1.16–26.3</code>: <code>boolean</code>                                                                                                   | <code>1.16–26.3</code>      |
+| <code>telemetryOptInExtra</code>                  | <code>1.19.3–26.3</code>: <code>boolean</code>                                                                                                 | <code>1.19.3–26.3</code>    |
+| <code>textBackgroundOpacity</code>                | <code>1.14–26.3</code>: <code>decimal</code>                                                                                                   | <code>1.14–26.3</code>      |
+| <code>textureFiltering</code>                     | <code>1.21.11–26.3</code>: <code>enum</code>                                                                                                   | <code>1.21.11–26.3</code>   |
+| <code>toggleAttack</code>                         | <code>1.21.9–26.3</code>: <code>boolean</code>                                                                                                 | <code>1.21.9–26.3</code>    |
+| <code>toggleCrouch</code>                         | <code>1.15–26.3</code>: <code>boolean</code>                                                                                                   | <code>1.15–26.3</code>      |
+| <code>toggleSprint</code>                         | <code>1.15–26.3</code>: <code>boolean</code>                                                                                                   | <code>1.15–26.3</code>      |
+| <code>toggleUse</code>                            | <code>1.21.9–26.3</code>: <code>boolean</code>                                                                                                 | <code>1.21.9–26.3</code>    |
+| <code>touchscreen</code>                          | <code>1.4.4–26.1.2</code>: <code>boolean</code>                                                                                                | <code>1.4.4–26.1.2</code>   |
+| <code>tutorialStep</code>                         | <code>1.12–26.3</code>: <code>enum</code>                                                                                                      | <code>1.12–26.3</code>      |
+| <code>useNativeTransport</code>                   | <code>1.8.1–26.3</code>: <code>boolean</code>                                                                                                  | <code>1.8.1–26.3</code>     |
+| <code>useVbo</code>                               | <code>1.8–26.3</code>: <code>boolean</code>                                                                                                    | <code>1.8–1.13.2</code>     |
+| <code>version</code>                              | <code>1.10–26.3</code>: <code>integer</code>                                                                                                   | <code>1.10–26.3</code>      |
+| <code>viewDistance</code>                         | <code>1.0–1.6.4</code>: <code>enum</code>                                                                                                      | <code>1.0–1.6.4</code>      |
+| <code>vignette</code>                             | <code>1.21.11–26.3</code>: <code>boolean</code>                                                                                                | <code>1.21.11–26.3</code>   |
+| <code>weatherRadius</code>                        | <code>1.21.11–26.3</code>: <code>integer</code>                                                                                                | <code>1.21.11–26.3</code>   |

From 82e0b85b7f90c5b9d627248c2e9cc9581cfac35d Mon Sep 17 00:00:00 2001
From: "Calum H." <calum@modrinth.com>
Date: Wed, 2 Sep 2026 13:56:40 +0100
Subject: [PATCH 13/33] Add enum types

Signed-off-by: Calum H. <calum@modrinth.com>
---
 .../game_options/catalog/README.md            | 52 +++++++++----------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/catalog/README.md b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/README.md
index 678ca49b81..1bc263fbcf 100644
--- a/packages/app-lib/src/api/instance/synced_options/game_options/catalog/README.md
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/README.md
@@ -524,8 +524,8 @@ Generated using `optionstxt_diff_calc.py` in `scripts` folder.
 | <code>allowServerListing</code>                   | <code>1.18–26.3</code>: <code>boolean</code>                                                                                                   | <code>1.18–26.3</code>      |
 | <code>anaglyph3d</code>                           | <code>1.0–1.12.2</code>: <code>boolean</code>                                                                                                  | <code>1.0–1.12.2</code>     |
 | <code>anisotropicFiltering</code>                 | <code>1.7.2–1.7.10</code>: <code>integer</code>                                                                                                | <code>1.7.2–1.7.10</code>   |
-| <code>ao</code>                                   | <code>1.0–1.4.7</code>: <code>boolean</code><br><code>1.5.1–1.19.2</code>: <code>enum</code><br><code>1.19.3–26.3</code>: <code>boolean</code> | <code>1.0–26.3</code>       |
-| <code>attackIndicator</code>                      | <code>1.9–26.3</code>: <code>enum</code>                                                                                                       | <code>1.9–26.3</code>       |
+| <code>ao</code>                                   | <code>1.0–1.4.7</code>: <code>boolean</code><br><code>1.5.1–1.19.2</code>: <code>enum (0, 1, 2)</code><br><code>1.19.3–26.3</code>: <code>boolean</code> | <code>1.0–26.3</code>       |
+| <code>attackIndicator</code>                      | <code>1.9–26.3</code>: <code>enum (0, 1, 2)</code>                                                                                                       | <code>1.9–26.3</code>       |
 | <code>autoJump</code>                             | <code>1.10–26.3</code>: <code>boolean</code>                                                                                                   | <code>1.10–26.3</code>      |
 | <code>autoSuggestions</code>                      | <code>1.13–26.3</code>: <code>boolean</code>                                                                                                   | <code>1.13–26.3</code>      |
 | <code>backgroundForChatOnly</code>                | <code>1.14–26.3</code>: <code>boolean</code>                                                                                                   | <code>1.14–26.3</code>      |
@@ -539,9 +539,9 @@ Generated using `optionstxt_diff_calc.py` in `scripts` folder.
 | <code>chatLinks</code>                            | <code>1.3.1–26.3</code>: <code>boolean</code>                                                                                                  | <code>1.3.1–26.3</code>     |
 | <code>chatLinksPrompt</code>                      | <code>1.3.1–26.3</code>: <code>boolean</code>                                                                                                  | <code>1.3.1–26.3</code>     |
 | <code>chatOpacity</code>                          | <code>1.3.1–26.3</code>: <code>decimal</code>                                                                                                  | <code>1.3.1–26.3</code>     |
-| <code>chatPreview</code>                          | <code>1.19</code>: <code>boolean</code><br><code>1.19.1–1.19.2</code>: <code>enum</code>                                                       | <code>1.19–1.19.2</code>    |
+| <code>chatPreview</code>                          | <code>1.19</code>: <code>boolean</code><br><code>1.19.1–1.19.2</code>: <code>enum (0, 1, 2)</code>                                                       | <code>1.19–1.19.2</code>    |
 | <code>chatScale</code>                            | <code>1.5.1–26.3</code>: <code>decimal</code>                                                                                                  | <code>1.5.1–26.3</code>     |
-| <code>chatVisibility</code>                       | <code>1.3.1–26.3</code>: <code>enum</code>                                                                                                     | <code>1.3.1–26.3</code>     |
+| <code>chatVisibility</code>                       | <code>1.3.1–26.3</code>: <code>enum (0, 1, 2)</code>                                                                                                     | <code>1.3.1–26.3</code>     |
 | <code>chatWidth</code>                            | <code>1.5.1–26.3</code>: <code>decimal</code>                                                                                                  | <code>1.5.1–26.3</code>     |
 | <code>chunkSectionFadeInTime</code>               | <code>1.21.11–26.3</code>: <code>decimal</code>                                                                                                | <code>1.21.11–26.3</code>   |
 | <code>cloudRange</code>                           | <code>1.21.6–26.3</code>: <code>integer</code>                                                                                                 | <code>1.21.6–26.3</code>    |
@@ -552,7 +552,7 @@ Generated using `optionstxt_diff_calc.py` in `scripts` folder.
 | <code>darkMojangStudiosBackground</code>          | <code>1.17–26.3</code>: <code>boolean</code>                                                                                                   | <code>1.17–26.3</code>      |
 | <code>darknessEffectScale</code>                  | <code>1.19–26.3</code>: <code>decimal</code>                                                                                                   | <code>1.19–26.3</code>      |
 | <code>debugGuiScale</code>                        | <code>26.3</code>: <code>integer</code>                                                                                                        | <code>26.3</code>           |
-| <code>difficulty</code>                           | <code>1.0–1.18.2</code>: <code>enum</code>                                                                                                     | <code>1.0–1.18.2</code>     |
+| <code>difficulty</code>                           | <code>1.0–1.18.2</code>: <code>enum (0, 1, 2, 3)</code>                                                                                                     | <code>1.0–1.18.2</code>     |
 | <code>directionalAudio</code>                     | <code>1.19–26.3</code>: <code>boolean</code>                                                                                                   | <code>1.19–26.3</code>      |
 | <code>discrete_mouse_scroll</code>                | <code>1.14–26.3</code>: <code>boolean</code>                                                                                                   | <code>1.14–26.3</code>      |
 | <code>enableVsync</code>                          | <code>1.3.1–26.3</code>: <code>boolean</code>                                                                                                  | <code>1.3.1–26.3</code>     |
@@ -565,16 +565,16 @@ Generated using `optionstxt_diff_calc.py` in `scripts` folder.
 | <code>forceUnicodeFont</code>                     | <code>1.7.2–26.3</code>: <code>boolean</code>                                                                                                  | <code>1.7.2–26.3</code>     |
 | <code>fov</code>                                  | <code>1.0–1.18.2</code>: <code>decimal</code><br><code>1.19–26.3</code>: <code>integer</code>                                                  | <code>1.0–26.3</code>       |
 | <code>fovEffectScale</code>                       | <code>1.16.2–26.3</code>: <code>decimal</code>                                                                                                 | <code>1.16.2–26.3</code>    |
-| <code>fpsLimit</code>                             | <code>1.0–1.6.4</code>: <code>enum</code>                                                                                                      | <code>1.0–1.6.4</code>      |
+| <code>fpsLimit</code>                             | <code>1.0–1.6.4</code>: <code>enum (0, 1, 2)</code>                                                                                                      | <code>1.0–1.6.4</code>      |
 | <code>fullscreen</code>                           | <code>1.3.1–26.3</code>: <code>boolean</code>                                                                                                  | <code>1.3.1–26.3</code>     |
 | <code>fullscreenResolution</code>                 | <code>1.13–26.3</code>: <code>compound</code>                                                                                                  | —                           |
 | <code>gamma</code>                                | <code>1.0–26.3</code>: <code>decimal</code>                                                                                                    | <code>1.0–26.3</code>       |
 | <code>glDebugVerbosity</code>                     | <code>1.13–26.3</code>: <code>integer</code>                                                                                                   | <code>1.13–26.3</code>      |
 | <code>glintSpeed</code>                           | <code>1.19.4–26.3</code>: <code>decimal</code>                                                                                                 | <code>1.19.4–26.3</code>    |
 | <code>glintStrength</code>                        | <code>1.19.4–26.3</code>: <code>decimal</code>                                                                                                 | <code>1.19.4–26.3</code>    |
-| <code>graphicsMode</code>                         | <code>1.16–26.3</code>: <code>enum</code>                                                                                                      | <code>1.16–1.21.10</code>   |
-| <code>graphicsPreset</code>                       | <code>1.21.11–26.3</code>: <code>enum</code>                                                                                                   | <code>1.21.11–26.3</code>   |
-| <code>guiScale</code>                             | <code>1.0–1.12.2</code>: <code>enum</code><br><code>1.13–26.3</code>: <code>integer</code>                                                     | <code>1.0–26.3</code>       |
+| <code>graphicsMode</code>                         | <code>1.16–26.3</code>: <code>enum (0, 1, 2)</code>                                                                                                      | <code>1.16–1.21.10</code>   |
+| <code>graphicsPreset</code>                       | <code>1.21.11–26.3</code>: <code>enum (custom, fabulous, fancy, fast)</code>                                                                                                   | <code>1.21.11–26.3</code>   |
+| <code>guiScale</code>                             | <code>1.0–1.12.2</code>: <code>enum (0, 1, 2, 3)</code><br><code>1.13–26.3</code>: <code>integer</code>                                                     | <code>1.0–26.3</code>       |
 | <code>heldItemTooltips</code>                     | <code>1.4.6–1.19.3</code>: <code>boolean</code>                                                                                                | <code>1.4.6–1.19.3</code>   |
 | <code>hideBundleTutorial</code>                   | <code>1.17–1.21.1</code>: <code>boolean</code>                                                                                                 | <code>1.17–1.21.1</code>    |
 | <code>hideLightningFlashes</code>                 | <code>1.18–26.3</code>: <code>boolean</code>                                                                                                   | <code>1.18–26.3</code>      |
@@ -585,7 +585,7 @@ Generated using `optionstxt_diff_calc.py` in `scripts` folder.
 | <code>highContrastBlockOutline</code>             | <code>1.21.2–26.3</code>: <code>boolean</code>                                                                                                 | <code>1.21.2–26.3</code>    |
 | <code>improvedTransparency</code>                 | <code>1.21.11–26.3</code>: <code>boolean</code>                                                                                                | <code>1.21.11–26.3</code>   |
 | <code>inGameNotification</code>                   | <code>26.2–26.3</code>: <code>boolean</code>                                                                                                   | <code>26.2–26.3</code>      |
-| <code>inactivityFpsLimit</code>                   | <code>1.21.2–26.3</code>: <code>enum</code>                                                                                                    | <code>1.21.2–26.3</code>    |
+| <code>inactivityFpsLimit</code>                   | <code>1.21.2–26.3</code>: <code>enum (afk, minimized)</code>                                                                                                    | <code>1.21.2–26.3</code>    |
 | <code>incompatibleResourcePacks</code>            | <code>1.8.8–26.3</code>: <code>string_list</code>                                                                                              | <code>1.8.8–26.3</code>     |
 | <code>invertXMouse</code>                         | <code>1.21.9–26.3</code>: <code>boolean</code>                                                                                                 | <code>1.21.9–26.3</code>    |
 | <code>invertYMouse</code>                         | <code>1.0–26.3</code>: <code>boolean</code>                                                                                                    | <code>1.0–26.3</code>       |
@@ -661,7 +661,7 @@ Generated using `optionstxt_diff_calc.py` in `scripts` folder.
 | <code>lang</code>                                 | <code>1.1–26.3</code>: <code>string</code>                                                                                                     | <code>1.1–26.3</code>       |
 | <code>lastServer</code>                           | <code>1.0–26.3</code>: <code>string</code>                                                                                                     | <code>1.0–26.3</code>       |
 | <code>macFullscreenMenuVisibility</code>          | <code>26.3</code>: <code>boolean</code>                                                                                                        | <code>26.3</code>           |
-| <code>mainHand</code>                             | <code>1.9–26.3</code>: <code>enum</code>                                                                                                       | <code>1.9–26.3</code>       |
+| <code>mainHand</code>                             | <code>1.9–26.3</code>: <code>enum (left, right)</code>                                                                                                       | <code>1.9–26.3</code>       |
 | <code>maxAnisotropyBit</code>                     | <code>1.21.11–26.3</code>: <code>integer</code>                                                                                                | <code>1.21.11–26.3</code>   |
 | <code>maxFps</code>                               | <code>1.7.2–26.3</code>: <code>integer</code>                                                                                                  | <code>1.7.2–26.3</code>     |
 | <code>menuBackgroundBlurriness</code>             | <code>1.20.5–1.20.6</code>: <code>decimal</code><br><code>1.21–26.3</code>: <code>integer</code>                                               | <code>1.20.5–26.3</code>    |
@@ -676,9 +676,9 @@ Generated using `optionstxt_diff_calc.py` in `scripts` folder.
 | <code>mouseSensitivity</code>                     | <code>1.0–26.3</code>: <code>decimal</code>                                                                                                    | <code>1.0–26.3</code>       |
 | <code>mouseWheelSensitivity</code>                | <code>1.13–26.3</code>: <code>decimal</code>                                                                                                   | <code>1.13–26.3</code>      |
 | <code>music</code>                                | <code>1.0–1.6.4</code>: <code>decimal</code>                                                                                                   | <code>1.0–1.6.4</code>      |
-| <code>musicFrequency</code>                       | <code>1.21.6–26.3</code>: <code>enum</code>                                                                                                    | <code>1.21.6–26.3</code>    |
-| <code>musicToast</code>                           | <code>1.21.11–26.3</code>: <code>enum</code>                                                                                                   | <code>1.21.11–26.3</code>   |
-| <code>narrator</code>                             | <code>1.12–26.3</code>: <code>enum</code>                                                                                                      | <code>1.12–26.3</code>      |
+| <code>musicFrequency</code>                       | <code>1.21.6–26.3</code>: <code>enum (CONSTANT, DEFAULT, FREQUENT)</code>                                                                                                    | <code>1.21.6–26.3</code>    |
+| <code>musicToast</code>                           | <code>1.21.11–26.3</code>: <code>enum (never, pause, pause_and_toast)</code>                                                                                                   | <code>1.21.11–26.3</code>   |
+| <code>narrator</code>                             | <code>1.12–26.3</code>: <code>enum (0, 1, 2, 3)</code>                                                                                                      | <code>1.12–26.3</code>      |
 | <code>narratorHotkey</code>                       | <code>1.20.2–26.3</code>: <code>boolean</code>                                                                                                 | <code>1.20.2–26.3</code>    |
 | <code>notificationDisplayTime</code>              | <code>1.19.4–26.3</code>: <code>decimal</code>                                                                                                 | <code>1.19.4–26.3</code>    |
 | <code>onboardAccessibility</code>                 | <code>1.19.4–26.3</code>: <code>boolean</code>                                                                                                 | <code>1.19.4–26.3</code>    |
@@ -687,15 +687,15 @@ Generated using `optionstxt_diff_calc.py` in `scripts` folder.
 | <code>overrideHeight</code>                       | <code>1.4.6–26.3</code>: <code>integer</code>                                                                                                  | <code>1.4.6–26.3</code>     |
 | <code>overrideWidth</code>                        | <code>1.4.6–26.3</code>: <code>integer</code>                                                                                                  | <code>1.4.6–26.3</code>     |
 | <code>panoramaScrollSpeed</code>                  | <code>1.19.3–26.3</code>: <code>decimal</code>                                                                                                 | <code>1.19.3–26.3</code>    |
-| <code>particles</code>                            | <code>1.0–26.3</code>: <code>enum</code>                                                                                                       | <code>1.0–26.3</code>       |
+| <code>particles</code>                            | <code>1.0–26.3</code>: <code>enum (0, 1, 2)</code>                                                                                                       | <code>1.0–26.3</code>       |
 | <code>pauseOnLostFocus</code>                     | <code>1.4.2–26.3</code>: <code>boolean</code>                                                                                                  | <code>1.4.2–26.3</code>     |
-| <code>preferredGraphicsBackend</code>             | <code>26.2–26.3</code>: <code>enum</code>                                                                                                      | <code>26.2–26.3</code>      |
-| <code>prioritizeChunkUpdates</code>               | <code>1.18–26.3</code>: <code>enum</code>                                                                                                      | <code>1.18–26.3</code>      |
+| <code>preferredGraphicsBackend</code>             | <code>26.2–26.3</code>: <code>enum (default, opengl, vulkan)</code>                                                                                                      | <code>26.2–26.3</code>      |
+| <code>prioritizeChunkUpdates</code>               | <code>1.18–26.3</code>: <code>enum (0, 1, 2)</code>                                                                                                      | <code>1.18–26.3</code>      |
 | <code>quitShortcuts</code>                        | <code>26.3</code>: <code>boolean</code>                                                                                                        | <code>26.3</code>           |
 | <code>rawMouseInput</code>                        | <code>1.14.4–26.2</code>: <code>boolean</code>                                                                                                 | <code>1.14.4–26.2</code>    |
 | <code>realmsNotifications</code>                  | <code>1.8.9–26.3</code>: <code>boolean</code>                                                                                                  | <code>1.8.9–26.3</code>     |
 | <code>reducedDebugInfo</code>                     | <code>1.8–26.3</code>: <code>boolean</code>                                                                                                    | <code>1.8–26.3</code>       |
-| <code>renderClouds</code>                         | <code>1.8</code>: <code>boolean</code><br><code>1.8.1–26.3</code>: <code>enum</code>                                                           | <code>1.8–26.3</code>       |
+| <code>renderClouds</code>                         | <code>1.8</code>: <code>boolean</code><br><code>1.8.1–26.3</code>: <code>enum (false, fast, true)</code>                                                           | <code>1.8–26.3</code>       |
 | <code>renderDistance</code>                       | <code>1.7.2–26.3</code>: <code>integer</code>                                                                                                  | <code>1.7.2–26.3</code>     |
 | <code>resourcePacks</code>                        | <code>1.7.2–26.3</code>: <code>string_list</code>                                                                                              | <code>1.7.2–26.3</code>     |
 | <code>rotateWithMinecart</code>                   | <code>1.21.2–26.3</code>: <code>boolean</code>                                                                                                 | <code>1.21.2–26.3</code>    |
@@ -703,7 +703,7 @@ Generated using `optionstxt_diff_calc.py` in `scripts` folder.
 | <code>saveChatDrafts</code>                       | <code>1.21.9–26.3</code>: <code>boolean</code>                                                                                                 | <code>1.21.9–26.3</code>    |
 | <code>screenEffectScale</code>                    | <code>1.16.2–26.3</code>: <code>decimal</code>                                                                                                 | <code>1.16.2–26.3</code>    |
 | <code>serverTextures</code>                       | <code>1.3.1–1.7.5</code>: <code>boolean</code>                                                                                                 | <code>1.3.1–1.7.5</code>    |
-| <code>sharePresence</code>                        | <code>26.2–26.3</code>: <code>enum</code>                                                                                                      | <code>26.2–26.3</code>      |
+| <code>sharePresence</code>                        | <code>26.2–26.3</code>: <code>enum (all, limited, none)</code>                                                                                                      | <code>26.2–26.3</code>      |
 | <code>showAutosaveIndicator</code>                | <code>1.18–26.3</code>: <code>boolean</code>                                                                                                   | <code>1.18–26.3</code>      |
 | <code>showCape</code>                             | <code>1.4.2–1.7.10</code>: <code>boolean</code>                                                                                                | <code>1.4.2–1.7.10</code>   |
 | <code>showInventoryAchievementHint</code>         | <code>1.7.2–1.11.2</code>: <code>boolean</code>                                                                                                | <code>1.7.2–1.11.2</code>   |
@@ -730,12 +730,12 @@ Generated using `optionstxt_diff_calc.py` in `scripts` folder.
 | <code>sprintWindow</code>                         | <code>1.21.9–26.3</code>: <code>integer</code>                                                                                                 | <code>1.21.9–26.3</code>    |
 | <code>startedCleanly</code>                       | <code>1.21.5–26.3</code>: <code>boolean</code>                                                                                                 | <code>1.21.5–26.3</code>    |
 | <code>streamBytesPerPixel</code>                  | <code>1.7.3–1.8.9</code>: <code>decimal</code>                                                                                                 | <code>1.7.3–1.8.9</code>    |
-| <code>streamChatEnabled</code>                    | <code>1.7.3–1.8.9</code>: <code>enum</code>                                                                                                    | <code>1.7.3–1.8.9</code>    |
-| <code>streamChatUserFilter</code>                 | <code>1.7.3–1.8.9</code>: <code>enum</code>                                                                                                    | <code>1.7.3–1.8.9</code>    |
-| <code>streamCompression</code>                    | <code>1.7.3–1.8.9</code>: <code>enum</code>                                                                                                    | <code>1.7.3–1.8.9</code>    |
+| <code>streamChatEnabled</code>                    | <code>1.7.3–1.8.9</code>: <code>enum (0, 1, 2)</code>                                                                                                    | <code>1.7.3–1.8.9</code>    |
+| <code>streamChatUserFilter</code>                 | <code>1.7.3–1.8.9</code>: <code>enum (0, 1, 2)</code>                                                                                                    | <code>1.7.3–1.8.9</code>    |
+| <code>streamCompression</code>                    | <code>1.7.3–1.8.9</code>: <code>enum (0, 1, 2)</code>                                                                                                    | <code>1.7.3–1.8.9</code>    |
 | <code>streamFps</code>                            | <code>1.7.3–1.8.9</code>: <code>decimal</code>                                                                                                 | <code>1.7.3–1.8.9</code>    |
 | <code>streamKbps</code>                           | <code>1.7.3–1.8.9</code>: <code>decimal</code>                                                                                                 | <code>1.7.3–1.8.9</code>    |
-| <code>streamMicToggleBehavior</code>              | <code>1.7.3–1.8.9</code>: <code>enum</code>                                                                                                    | <code>1.7.3–1.8.9</code>    |
+| <code>streamMicToggleBehavior</code>              | <code>1.7.3–1.8.9</code>: <code>enum (0, 1)</code>                                                                                                    | <code>1.7.3–1.8.9</code>    |
 | <code>streamMicVolume</code>                      | <code>1.7.3–1.8.9</code>: <code>decimal</code>                                                                                                 | <code>1.7.3–1.8.9</code>    |
 | <code>streamPreferredServer</code>                | <code>1.7.3–1.8.9</code>: <code>string</code>                                                                                                  | <code>1.7.3–1.8.9</code>    |
 | <code>streamSendMetadata</code>                   | <code>1.7.3–1.8.9</code>: <code>boolean</code>                                                                                                 | <code>1.7.3–1.8.9</code>    |
@@ -743,16 +743,16 @@ Generated using `optionstxt_diff_calc.py` in `scripts` folder.
 | <code>syncChunkWrites</code>                      | <code>1.16–26.3</code>: <code>boolean</code>                                                                                                   | <code>1.16–26.3</code>      |
 | <code>telemetryOptInExtra</code>                  | <code>1.19.3–26.3</code>: <code>boolean</code>                                                                                                 | <code>1.19.3–26.3</code>    |
 | <code>textBackgroundOpacity</code>                | <code>1.14–26.3</code>: <code>decimal</code>                                                                                                   | <code>1.14–26.3</code>      |
-| <code>textureFiltering</code>                     | <code>1.21.11–26.3</code>: <code>enum</code>                                                                                                   | <code>1.21.11–26.3</code>   |
+| <code>textureFiltering</code>                     | <code>1.21.11–26.3</code>: <code>enum (0, 1, 2)</code>                                                                                                   | <code>1.21.11–26.3</code>   |
 | <code>toggleAttack</code>                         | <code>1.21.9–26.3</code>: <code>boolean</code>                                                                                                 | <code>1.21.9–26.3</code>    |
 | <code>toggleCrouch</code>                         | <code>1.15–26.3</code>: <code>boolean</code>                                                                                                   | <code>1.15–26.3</code>      |
 | <code>toggleSprint</code>                         | <code>1.15–26.3</code>: <code>boolean</code>                                                                                                   | <code>1.15–26.3</code>      |
 | <code>toggleUse</code>                            | <code>1.21.9–26.3</code>: <code>boolean</code>                                                                                                 | <code>1.21.9–26.3</code>    |
 | <code>touchscreen</code>                          | <code>1.4.4–26.1.2</code>: <code>boolean</code>                                                                                                | <code>1.4.4–26.1.2</code>   |
-| <code>tutorialStep</code>                         | <code>1.12–26.3</code>: <code>enum</code>                                                                                                      | <code>1.12–26.3</code>      |
+| <code>tutorialStep</code>                         | <code>1.12–26.3</code>: <code>enum (craft_planks, find_tree, movement, none, open_inventory, punch_tree)</code>                                                                                                      | <code>1.12–26.3</code>      |
 | <code>useNativeTransport</code>                   | <code>1.8.1–26.3</code>: <code>boolean</code>                                                                                                  | <code>1.8.1–26.3</code>     |
 | <code>useVbo</code>                               | <code>1.8–26.3</code>: <code>boolean</code>                                                                                                    | <code>1.8–1.13.2</code>     |
 | <code>version</code>                              | <code>1.10–26.3</code>: <code>integer</code>                                                                                                   | <code>1.10–26.3</code>      |
-| <code>viewDistance</code>                         | <code>1.0–1.6.4</code>: <code>enum</code>                                                                                                      | <code>1.0–1.6.4</code>      |
+| <code>viewDistance</code>                         | <code>1.0–1.6.4</code>: <code>enum (0, 1, 2, 3)</code>                                                                                                      | <code>1.0–1.6.4</code>      |
 | <code>vignette</code>                             | <code>1.21.11–26.3</code>: <code>boolean</code>                                                                                                | <code>1.21.11–26.3</code>   |
 | <code>weatherRadius</code>                        | <code>1.21.11–26.3</code>: <code>integer</code>                                                                                                | <code>1.21.11–26.3</code>   |

From 37f6364b8d8d91c649caea1771356d2bc8c567ae Mon Sep 17 00:00:00 2001
From: "Calum H. (IMB11)" <contact@cal.engineer>
Date: Wed, 2 Sep 2026 16:20:04 +0100
Subject: [PATCH 14/33] fix: qa

---
 .../instances/InstancesSyncedSettings.vue     |  90 ++-
 .../game-settings/GameKeybindInput.vue        |   2 +-
 .../game-settings/GameSettingRow.vue          |   7 +-
 .../game-settings/GameSettingsModal.vue       |  35 +-
 .../game-setting-boolean-control.vue          |   6 +-
 .../game-settings/game-setting-messages.ts    | 663 ++++++++++++++++++
 apps/app-frontend/src/helpers/instance.ts     |   4 +
 .../app-frontend/src/locales/en-US/index.json | 444 +++++++++++-
 apps/app/build.rs                             |   1 +
 apps/app/src/api/instance.rs                  |  24 +-
 packages/app-lib/src/api/instance.rs          |   5 +-
 .../game_options/catalog/accessibility.rs     | 168 ++++-
 .../game_options/catalog/chat.rs              | 151 +++-
 .../game_options/catalog/controls.rs          | 446 ++++++++----
 .../catalog/known_vanilla_keys.rs             |  25 +-
 .../game_options/catalog/mod.rs               | 200 +++++-
 .../game_options/catalog/sound.rs             | 109 ++-
 .../game_options/catalog/version_changes.rs   | 305 +++++++-
 .../game_options/catalog/video.rs             | 314 ++++++++-
 .../game_options/instance_support.rs          |  48 +-
 .../game_options/local_settings_editor.rs     |  16 +-
 .../synced_options/game_options/mod.rs        |   5 +-
 .../game_options/write_shared_settings.rs     | 580 ++++++++-------
 .../src/api/instance/synced_options/mod.rs    |   8 +-
 .../instance/synced_options/orchestration.rs  |  17 +-
 packages/app-lib/src/state/instances/mod.rs   |   4 +-
 .../app-lib/src/state/instances/model/mod.rs  |   4 +-
 .../app-lib/src/state/instances/watcher.rs    |   5 +-
 packages/app-lib/src/state/mod.rs             |   4 +-
 packages/ui/src/components/base/Slider.vue    |   4 +
 30 files changed, 3057 insertions(+), 637 deletions(-)

diff --git a/apps/app-frontend/src/components/ui/settings/instances/InstancesSyncedSettings.vue b/apps/app-frontend/src/components/ui/settings/instances/InstancesSyncedSettings.vue
index e137305098..cd1ba1b4cd 100644
--- a/apps/app-frontend/src/components/ui/settings/instances/InstancesSyncedSettings.vue
+++ b/apps/app-frontend/src/components/ui/settings/instances/InstancesSyncedSettings.vue
@@ -35,6 +35,7 @@ import {
 import {
 	get_command_history,
 	get_global_synced_options,
+	get_initialized_synced_options,
 	getInstanceIconUrl,
 	type GlobalSyncedOptions,
 	list as listInstances,
@@ -87,6 +88,10 @@ const messages = defineMessages({
 		id: 'app.settings.synced-options.game-settings.disabled-tooltip',
 		defaultMessage: 'Enable game settings sync before choosing individual settings.',
 	},
+	gameSettingsUnavailableTooltip: {
+		id: 'app.settings.synced-options.game-settings.unavailable-tooltip',
+		defaultMessage: 'Choose an instance with an options.txt file before editing game settings.',
+	},
 	multiplayerServers: {
 		id: 'app.settings.synced-options.multiplayer-servers',
 		defaultMessage: 'Sync multiplayer servers',
@@ -171,6 +176,14 @@ const messages = defineMessages({
 		id: 'app.settings.synced-options.multiplayer-servers.none-synced-yet',
 		defaultMessage: 'No servers synced yet',
 	},
+	noInstancesToEdit: {
+		id: 'app.settings.synced-options.edit.no-instances',
+		defaultMessage: 'Add an instance before editing synced data.',
+	},
+	noSyncedDataToEdit: {
+		id: 'app.settings.synced-options.edit.no-synced-data',
+		defaultMessage: 'Choose a sync source before editing this setting.',
+	},
 	windowSectionTitle: {
 		id: 'app.settings.default-instance-options.window.title',
 		defaultMessage: 'Window',
@@ -346,6 +359,7 @@ const globalRows: Array<{
 ]
 
 const globalSyncedOptionsQueryKey = ['global-synced-options'] as const
+const initializedSyncedOptionsQueryKey = ['initialized-synced-options'] as const
 const globalSyncedOptionsMutationKey = ['global-synced-options', 'set'] as const
 const defaultGlobalOptions: GlobalSyncedOptions = {
 	game_options: false,
@@ -359,7 +373,14 @@ const globalOptionsQuery = useQuery({
 	queryKey: globalSyncedOptionsQueryKey,
 	queryFn: get_global_synced_options,
 })
+const initializedOptionsQuery = useQuery({
+	queryKey: initializedSyncedOptionsQueryKey,
+	queryFn: get_initialized_synced_options,
+})
 const globalOptions = computed(() => globalOptionsQuery.data.value ?? defaultGlobalOptions)
+const initializedOptions = computed(
+	() => initializedOptionsQuery.data.value ?? defaultGlobalOptions,
+)
 const instances = ref(await listInstances().catch(() => []))
 const baseOption = ref<SyncedOption | null>(null)
 const baseInstanceId = ref(instances.value[0]?.id ?? '')
@@ -450,9 +471,42 @@ async function invalidateSyncedOptions() {
 		queryClient.invalidateQueries({ queryKey: instanceKeys.all }),
 		queryClient.invalidateQueries({ queryKey: ['instance-synced-options'] }),
 		queryClient.invalidateQueries({ queryKey: globalSyncedOptionsQueryKey }),
+		queryClient.invalidateQueries({ queryKey: initializedSyncedOptionsQueryKey }),
 	])
 }
 
+function canEditGlobalOption(row: (typeof globalRows)[number]): boolean {
+	return (
+		!!row.editable &&
+		instances.value.length > 0 &&
+		globalOptions.value[row.option] &&
+		initializedOptions.value[row.option] &&
+		(row.editable !== 'servers' || syncedServers.value.length > 0)
+	)
+}
+
+function editGlobalOptionTooltip(row: (typeof globalRows)[number]): string {
+	if (!globalOptions.value[row.option] && row.editable === 'game-settings') {
+		return formatMessage(messages.gameSettingsDisabledTooltip)
+	}
+	if (instances.value.length === 0) {
+		return formatMessage(messages.noInstancesToEdit)
+	}
+	if (!initializedOptions.value[row.option]) {
+		return formatMessage(
+			row.editable === 'game-settings'
+				? messages.gameSettingsUnavailableTooltip
+				: messages.noSyncedDataToEdit,
+		)
+	}
+	if (row.editable === 'servers' && syncedServers.value.length === 0) {
+		return formatMessage(messages.noServersSyncedYet)
+	}
+	return formatMessage(
+		row.editable === 'game-settings' ? messages.gameSettingsButton : commonMessages.editButton,
+	)
+}
+
 type GlobalOptionMutationVariables = {
 	option: SyncedOption
 	enabled: boolean
@@ -796,7 +850,8 @@ watch(
 		<NewModal
 			ref="commandHistoryModal"
 			:header="formatMessage(messages.commandHistoryEditorTitle)"
-			class="command-history-modal"
+			no-padding
+			actions-divider
 			max-width="700px"
 			width="700px"
 		>
@@ -807,7 +862,7 @@ watch(
 				lang="mcfunction"
 				theme="modrinth"
 				:print-margin="false"
-				class="command-history-editor ace-modrinth rounded-[20px] !border !border-solid !border-surface-5"
+				class="command-history-editor ace-modrinth"
 				style="height: 420px; font-size: 0.875rem"
 			/>
 			<template #actions>
@@ -926,38 +981,31 @@ watch(
 						<div class="flex shrink-0 items-center gap-2">
 							<span
 								v-if="row.editable === 'game-settings'"
-								v-tooltip="
-									!globalOptions.game_options
-										? formatMessage(messages.gameSettingsDisabledTooltip)
-										: formatMessage(messages.gameSettingsButton)
-								"
+								v-tooltip="editGlobalOptionTooltip(row)"
 								class="flex"
 							>
 								<IconButton
 									type="outlined"
 									circular
-									:disabled="!globalOptions.game_options || globalOptionMutation.isPending.value"
+									:disabled="
+										!canEditGlobalOption(row) ||
+										initializedOptionsQuery.isPending.value ||
+										globalOptionMutation.isPending.value
+									"
 									:label="formatMessage(messages.gameSettingsButton)"
 									@click="openGameSettings"
 								>
 									<EditIcon />
 								</IconButton>
 							</span>
-							<span
-								v-else-if="row.editable"
-								v-tooltip="
-									row.editable === 'servers' && syncedServers.length === 0
-										? formatMessage(messages.noServersSyncedYet)
-										: formatMessage(commonMessages.editButton)
-								"
-								class="flex"
-							>
+							<span v-else-if="row.editable" v-tooltip="editGlobalOptionTooltip(row)" class="flex">
 								<IconButton
 									type="outlined"
 									circular
 									:disabled="
-										!globalOptions[row.option] ||
-										(row.editable === 'servers' && syncedServers.length === 0)
+										!canEditGlobalOption(row) ||
+										initializedOptionsQuery.isPending.value ||
+										globalOptionMutation.isPending.value
 									"
 									:label="formatMessage(commonMessages.editButton)"
 									@click="
@@ -1191,8 +1239,4 @@ watch(
 .command-history-editor.ace-modrinth.ace_multiselect .ace_selection.ace_start {
 	box-shadow: 0 0 3px 0 var(--surface-2);
 }
-
-.command-history-modal > [data-modal-content] {
-	padding-bottom: 0;
-}
 </style>
diff --git a/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameKeybindInput.vue b/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameKeybindInput.vue
index e77d04f838..d043d23920 100644
--- a/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameKeybindInput.vue
+++ b/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameKeybindInput.vue
@@ -206,7 +206,7 @@ onBeforeUnmount(cancelRecording)
 				:class="{
 					'!bg-brand-highlight !text-brand !shadow-[inset_0_0_0_1px_var(--color-brand)]': recording,
 					'keybind-button--conflict': !recording && conflicts.length,
-					'!bg-transparent': !recording && !conflicts.length,
+					'!bg-transparent !text-secondary': !recording && !conflicts.length,
 				}"
 				@click="handleClick"
 				@contextmenu.prevent.stop
diff --git a/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingRow.vue b/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingRow.vue
index 3970cffde1..f3bf0f4b75 100644
--- a/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingRow.vue
+++ b/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingRow.vue
@@ -205,7 +205,7 @@ function updateValue(value: string | number | boolean | undefined) {
 					: 'grid-cols-[minmax(0,1fr)_12rem]'
 		"
 	>
-		<div class="min-w-0">
+		<div class="min-w-0 pr-2">
 			<div class="flex items-center gap-2">
 				<h3
 					ref="settingLabelRef"
@@ -241,6 +241,8 @@ function updateValue(value: string | number | boolean | undefined) {
 				:snap-points="[0, 50, 100]"
 				:snap-range="5"
 				:disabled="editorDisabled"
+				value-input-appearance="transparent"
+				class="[&_input]:!text-secondary"
 				@update:model-value="updateValue"
 			/>
 
@@ -262,7 +264,7 @@ function updateValue(value: string | number | boolean | undefined) {
 				:placeholder="placeholder"
 				:disabled="editorDisabled"
 				:aria-label="formatMessage(messages.valueLabel)"
-				trigger-class="!bg-transparent"
+				trigger-class="!bg-transparent !text-secondary"
 				class="min-w-0"
 				@update:model-value="updateValue"
 			/>
@@ -290,6 +292,7 @@ function updateValue(value: string | number | boolean | undefined) {
 				:disabled="editorDisabled"
 				:aria-label="formatMessage(messages.valueLabel)"
 				wrapper-class="w-full !bg-transparent"
+				input-class="!text-secondary"
 				@update:model-value="updateValue"
 			/>
 		</div>
diff --git a/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingsModal.vue b/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingsModal.vue
index 583fbede14..f4de08ced1 100644
--- a/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingsModal.vue
+++ b/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingsModal.vue
@@ -654,23 +654,24 @@ defineExpose({ show, hide })
 					<p class="m-0 min-w-60 flex-1 text-primary">
 						{{ formatMessage(messages.syncedOptionsDescription) }}
 					</p>
-					<Button
-						class="w-48 justify-center"
-						size="lg"
-						:disabled="
-							saving ||
-							(allCategorySettingsSynced
-								? disableCandidates.length === 0
-								: enableCandidates.length === 0)
-						"
-						@click="toggleVisibleSync"
-					>
-						<LinkIcon v-if="allCategorySettingsSynced" />
-						<UnlinkIcon v-else />
-						{{
-							formatMessage(allCategorySettingsSynced ? messages.disableAll : messages.enableAll)
-						}}
-					</Button>
+					<div class="ml-auto flex w-48 justify-end">
+						<Button
+							size="lg"
+							:disabled="
+								saving ||
+								(allCategorySettingsSynced
+									? disableCandidates.length === 0
+									: enableCandidates.length === 0)
+							"
+							@click="toggleVisibleSync"
+						>
+							<LinkIcon v-if="allCategorySettingsSynced" />
+							<UnlinkIcon v-else />
+							{{
+								formatMessage(allCategorySettingsSynced ? messages.disableAll : messages.enableAll)
+							}}
+						</Button>
+					</div>
 				</div>
 
 				<div
diff --git a/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-boolean-control.vue b/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-boolean-control.vue
index c3cb41cd89..45601bb28f 100644
--- a/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-boolean-control.vue
+++ b/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-boolean-control.vue
@@ -25,10 +25,10 @@ const emit = defineEmits<{
 			type="button"
 			:aria-pressed="modelValue === true"
 			:disabled="disabled"
-			class="flex h-8 cursor-pointer items-center rounded-[10px] border border-solid px-3 text-base font-medium leading-5 text-contrast transition-all active:scale-[0.97] focus-visible:outline-none focus-visible:ring-4 focus-visible:ring-brand-shadow disabled:cursor-not-allowed"
+			class="flex h-8 cursor-pointer items-center rounded-[10px] border border-solid px-3 text-base font-medium leading-5 text-secondary transition-all active:scale-[0.97] focus-visible:outline-none focus-visible:ring-4 focus-visible:ring-brand-shadow disabled:cursor-not-allowed"
 			:class="
 				modelValue === true
-					? 'border-green bg-highlight-green text-green'
+					? 'border-green bg-highlight-green !text-green'
 					: 'border-transparent bg-transparent hover:bg-surface-4'
 			"
 			@click="emit('update:model-value', true)"
@@ -39,7 +39,7 @@ const emit = defineEmits<{
 			type="button"
 			:aria-pressed="modelValue === false"
 			:disabled="disabled"
-			class="flex h-8 cursor-pointer items-center rounded-[10px] border border-solid px-3 text-base font-medium leading-5 text-contrast transition-all active:scale-[0.97] focus-visible:outline-none focus-visible:ring-4 focus-visible:ring-brand-shadow disabled:cursor-not-allowed"
+			class="flex h-8 cursor-pointer items-center rounded-[10px] border border-solid px-3 text-base font-medium leading-5 text-secondary transition-all active:scale-[0.97] focus-visible:outline-none focus-visible:ring-4 focus-visible:ring-brand-shadow disabled:cursor-not-allowed"
 			:class="
 				modelValue === false
 					? 'border-surface-5 bg-surface-4'
diff --git a/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-messages.ts b/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-messages.ts
index 7887ad8d7e..372b4996e0 100644
--- a/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-messages.ts
+++ b/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-messages.ts
@@ -380,6 +380,488 @@ const settingMessages = defineMessages({
 	},
 })
 
+const catalogSettingMessages = defineMessages({
+	brightnessLabel: {
+		id: 'app.settings.game-options.setting.brightness.label',
+		defaultMessage: 'Brightness',
+	},
+	legacyViewDistanceLabel: {
+		id: 'app.settings.game-options.setting.legacy-view-distance.label',
+		defaultMessage: 'View distance',
+	},
+	entityDistanceLabel: {
+		id: 'app.settings.game-options.setting.entity-distance.label',
+		defaultMessage: 'Entity distance',
+	},
+	debugGuiScaleLabel: {
+		id: 'app.settings.game-options.setting.debug-gui-scale.label',
+		defaultMessage: 'Debug GUI scale',
+	},
+	graphicsBackendLabel: {
+		id: 'app.settings.game-options.setting.graphics-backend.label',
+		defaultMessage: 'Graphics backend',
+	},
+	cloudRangeLabel: {
+		id: 'app.settings.game-options.setting.cloud-range.label',
+		defaultMessage: 'Cloud distance',
+	},
+	exclusiveFullscreenLabel: {
+		id: 'app.settings.game-options.setting.exclusive-fullscreen.label',
+		defaultMessage: 'Exclusive fullscreen',
+	},
+	macFullscreenMenuLabel: {
+		id: 'app.settings.game-options.setting.mac-fullscreen-menu.label',
+		defaultMessage: 'Show macOS menu in fullscreen',
+	},
+	legacyFramerateLimitLabel: {
+		id: 'app.settings.game-options.setting.legacy-framerate-limit.label',
+		defaultMessage: 'Framerate limit',
+	},
+	inactivityFramerateLimitLabel: {
+		id: 'app.settings.game-options.setting.inactivity-framerate-limit.label',
+		defaultMessage: 'Reduced framerate',
+	},
+	prioritizeChunkUpdatesLabel: {
+		id: 'app.settings.game-options.setting.prioritize-chunk-updates.label',
+		defaultMessage: 'Prioritize chunk updates',
+	},
+	attackIndicatorLabel: {
+		id: 'app.settings.game-options.setting.attack-indicator.label',
+		defaultMessage: 'Attack indicator',
+	},
+	reducedDebugInfoLabel: {
+		id: 'app.settings.game-options.setting.reduced-debug-info.label',
+		defaultMessage: 'Reduced debug information',
+	},
+	chunkFadeTimeLabel: {
+		id: 'app.settings.game-options.setting.chunk-fade-time.label',
+		defaultMessage: 'Chunk fade time',
+	},
+	cutoutLeavesLabel: {
+		id: 'app.settings.game-options.setting.cutout-leaves.label',
+		defaultMessage: 'Cutout leaves',
+	},
+	improvedTransparencyLabel: {
+		id: 'app.settings.game-options.setting.improved-transparency.label',
+		defaultMessage: 'Improved transparency',
+	},
+	textureFilteringLabel: {
+		id: 'app.settings.game-options.setting.texture-filtering.label',
+		defaultMessage: 'Texture filtering',
+	},
+	anisotropyLabel: {
+		id: 'app.settings.game-options.setting.anisotropy.label',
+		defaultMessage: 'Anisotropy',
+	},
+	vignetteLabel: {
+		id: 'app.settings.game-options.setting.vignette.label',
+		defaultMessage: 'Vignette',
+	},
+	weatherRadiusLabel: {
+		id: 'app.settings.game-options.setting.weather-radius.label',
+		defaultMessage: 'Weather radius',
+	},
+	advancedOpenGlLabel: {
+		id: 'app.settings.game-options.setting.advanced-opengl.label',
+		defaultMessage: 'Advanced OpenGL',
+	},
+	anaglyph3dLabel: {
+		id: 'app.settings.game-options.setting.anaglyph-3d.label',
+		defaultMessage: '3D anaglyph',
+	},
+	anisotropicFilteringLabel: {
+		id: 'app.settings.game-options.setting.anisotropic-filtering.label',
+		defaultMessage: 'Anisotropic filtering',
+	},
+	alternateBlocksLabel: {
+		id: 'app.settings.game-options.setting.alternate-blocks.label',
+		defaultMessage: 'Alternate blocks',
+	},
+	heldItemTooltipsLabel: {
+		id: 'app.settings.game-options.setting.held-item-tooltips.label',
+		defaultMessage: 'Held item tooltips',
+	},
+	useVboLabel: {
+		id: 'app.settings.game-options.setting.use-vbo.label',
+		defaultMessage: 'Use VBOs',
+	},
+	forceUnicodeFontLabel: {
+		id: 'app.settings.game-options.setting.force-unicode-font.label',
+		defaultMessage: 'Force Unicode font',
+	},
+	japaneseGlyphVariantsLabel: {
+		id: 'app.settings.game-options.setting.japanese-glyph-variants.label',
+		defaultMessage: 'Japanese glyph variants',
+	},
+	musicFrequencyLabel: {
+		id: 'app.settings.game-options.setting.music-frequency.label',
+		defaultMessage: 'Music frequency',
+	},
+	directionalAudioLabel: {
+		id: 'app.settings.game-options.setting.directional-audio.label',
+		defaultMessage: 'Directional audio',
+	},
+	invertHorizontalMouseLabel: {
+		id: 'app.settings.game-options.setting.invert-horizontal-mouse.label',
+		defaultMessage: 'Invert horizontal mouse',
+	},
+	toggleAttackLabel: {
+		id: 'app.settings.game-options.setting.toggle-attack.label',
+		defaultMessage: 'Toggle attack',
+	},
+	toggleUseLabel: {
+		id: 'app.settings.game-options.setting.toggle-use.label',
+		defaultMessage: 'Toggle use',
+	},
+	mouseWheelSensitivityLabel: {
+		id: 'app.settings.game-options.setting.mouse-wheel-sensitivity.label',
+		defaultMessage: 'Mouse wheel sensitivity',
+	},
+	rawMouseInputLabel: {
+		id: 'app.settings.game-options.setting.raw-mouse-input.label',
+		defaultMessage: 'Raw mouse input',
+	},
+	touchscreenLabel: {
+		id: 'app.settings.game-options.setting.touchscreen.label',
+		defaultMessage: 'Touchscreen mode',
+	},
+	allowCursorChangesLabel: {
+		id: 'app.settings.game-options.setting.allow-cursor-changes.label',
+		defaultMessage: 'Allow cursor changes',
+	},
+	sprintWindowLabel: {
+		id: 'app.settings.game-options.setting.sprint-window.label',
+		defaultMessage: 'Sprint window',
+	},
+	operatorItemsTabLabel: {
+		id: 'app.settings.game-options.setting.operator-items-tab.label',
+		defaultMessage: 'Operator items tab',
+	},
+	ctrlClickRightClickLabel: {
+		id: 'app.settings.game-options.setting.ctrl-click-right-click.label',
+		defaultMessage: 'Control-click as right-click',
+	},
+	quitShortcutsLabel: {
+		id: 'app.settings.game-options.setting.quit-shortcuts.label',
+		defaultMessage: 'Quit shortcuts',
+	},
+	chatWidthLabel: {
+		id: 'app.settings.game-options.setting.chat-width.label',
+		defaultMessage: 'Chat width',
+	},
+	focusedChatHeightLabel: {
+		id: 'app.settings.game-options.setting.focused-chat-height.label',
+		defaultMessage: 'Focused chat height',
+	},
+	unfocusedChatHeightLabel: {
+		id: 'app.settings.game-options.setting.unfocused-chat-height.label',
+		defaultMessage: 'Unfocused chat height',
+	},
+	chatLineSpacingLabel: {
+		id: 'app.settings.game-options.setting.chat-line-spacing.label',
+		defaultMessage: 'Chat line spacing',
+	},
+	chatDelayLabel: {
+		id: 'app.settings.game-options.setting.chat-delay.label',
+		defaultMessage: 'Chat delay',
+	},
+	textBackgroundOpacityLabel: {
+		id: 'app.settings.game-options.setting.text-background-opacity.label',
+		defaultMessage: 'Text background opacity',
+	},
+	chatBackgroundOnlyLabel: {
+		id: 'app.settings.game-options.setting.chat-background-only.label',
+		defaultMessage: 'Chat background only',
+	},
+	autoSuggestionsLabel: {
+		id: 'app.settings.game-options.setting.auto-suggestions.label',
+		defaultMessage: 'Command suggestions',
+	},
+	secureChatOnlyLabel: {
+		id: 'app.settings.game-options.setting.secure-chat-only.label',
+		defaultMessage: 'Only show secure chat',
+	},
+	saveChatDraftsLabel: {
+		id: 'app.settings.game-options.setting.save-chat-drafts.label',
+		defaultMessage: 'Save chat drafts',
+	},
+	hideMatchedNamesLabel: {
+		id: 'app.settings.game-options.setting.hide-matched-names.label',
+		defaultMessage: 'Hide matched names',
+	},
+	chatPreviewLabel: {
+		id: 'app.settings.game-options.setting.chat-preview.label',
+		defaultMessage: 'Chat preview',
+	},
+	fovEffectsLabel: {
+		id: 'app.settings.game-options.setting.fov-effects.label',
+		defaultMessage: 'FOV effects',
+	},
+	screenEffectsLabel: {
+		id: 'app.settings.game-options.setting.screen-effects.label',
+		defaultMessage: 'Screen effects',
+	},
+	darknessPulsingLabel: {
+		id: 'app.settings.game-options.setting.darkness-pulsing.label',
+		defaultMessage: 'Darkness pulsing',
+	},
+	damageTiltLabel: {
+		id: 'app.settings.game-options.setting.damage-tilt.label',
+		defaultMessage: 'Damage tilt',
+	},
+	glintSpeedLabel: {
+		id: 'app.settings.game-options.setting.glint-speed.label',
+		defaultMessage: 'Glint speed',
+	},
+	glintStrengthLabel: {
+		id: 'app.settings.game-options.setting.glint-strength.label',
+		defaultMessage: 'Glint strength',
+	},
+	hideLightningFlashesLabel: {
+		id: 'app.settings.game-options.setting.hide-lightning-flashes.label',
+		defaultMessage: 'Hide lightning flashes',
+	},
+	hideSplashTextsLabel: {
+		id: 'app.settings.game-options.setting.hide-splash-texts.label',
+		defaultMessage: 'Hide splash texts',
+	},
+	highContrastOutlineLabel: {
+		id: 'app.settings.game-options.setting.high-contrast-outline.label',
+		defaultMessage: 'High contrast block outline',
+	},
+	narratorHotkeyLabel: {
+		id: 'app.settings.game-options.setting.narrator-hotkey.label',
+		defaultMessage: 'Narrator hotkey',
+	},
+	autosaveIndicatorLabel: {
+		id: 'app.settings.game-options.setting.autosave-indicator.label',
+		defaultMessage: 'Autosave indicator',
+	},
+	panoramaSpeedLabel: {
+		id: 'app.settings.game-options.setting.panorama-speed.label',
+		defaultMessage: 'Panorama speed',
+	},
+	menuBackgroundBlurLabel: {
+		id: 'app.settings.game-options.setting.menu-background-blur.label',
+		defaultMessage: 'Menu background blur',
+	},
+	rotateWithMinecartLabel: {
+		id: 'app.settings.game-options.setting.rotate-with-minecart.label',
+		defaultMessage: 'Rotate with minecart',
+	},
+	leftSleeveLabel: {
+		id: 'app.settings.game-options.setting.left-sleeve.label',
+		defaultMessage: 'Left sleeve',
+	},
+	rightSleeveLabel: {
+		id: 'app.settings.game-options.setting.right-sleeve.label',
+		defaultMessage: 'Right sleeve',
+	},
+	leftPantsLegLabel: {
+		id: 'app.settings.game-options.setting.left-pants-leg.label',
+		defaultMessage: 'Left pants leg',
+	},
+	rightPantsLegLabel: {
+		id: 'app.settings.game-options.setting.right-pants-leg.label',
+		defaultMessage: 'Right pants leg',
+	},
+	hideServerAddressLabel: {
+		id: 'app.settings.game-options.setting.hide-server-address.label',
+		defaultMessage: 'Hide server address',
+	},
+	serverTexturesLabel: {
+		id: 'app.settings.game-options.setting.server-textures.label',
+		defaultMessage: 'Server textures',
+	},
+	snooperLabel: {
+		id: 'app.settings.game-options.setting.snooper.label',
+		defaultMessage: 'Snooper',
+	},
+	extraTelemetryLabel: {
+		id: 'app.settings.game-options.setting.extra-telemetry.label',
+		defaultMessage: 'Optional telemetry',
+	},
+	inGameNotificationsLabel: {
+		id: 'app.settings.game-options.setting.in-game-notifications.label',
+		defaultMessage: 'In-game notifications',
+	},
+	sharePresenceLabel: {
+		id: 'app.settings.game-options.setting.share-presence.label',
+		defaultMessage: 'Share presence',
+	},
+})
+
+const catalogKeyMessages = defineMessages({
+	smoothCameraLabel: {
+		id: 'app.settings.game-options.setting.key-smooth-camera.label',
+		defaultMessage: 'Toggle cinematic camera',
+	},
+	spectatorOutlinesLabel: {
+		id: 'app.settings.game-options.setting.key-spectator-outlines.label',
+		defaultMessage: 'Highlight spectators',
+	},
+	saveToolbarLabel: {
+		id: 'app.settings.game-options.setting.key-save-toolbar.label',
+		defaultMessage: 'Save toolbar',
+	},
+	loadToolbarLabel: {
+		id: 'app.settings.game-options.setting.key-load-toolbar.label',
+		defaultMessage: 'Load toolbar',
+	},
+	socialInteractionsLabel: {
+		id: 'app.settings.game-options.setting.key-social-interactions.label',
+		defaultMessage: 'Social interactions',
+	},
+	quickActionsLabel: {
+		id: 'app.settings.game-options.setting.key-quick-actions.label',
+		defaultMessage: 'Quick actions',
+	},
+	spectatorHotbarLabel: {
+		id: 'app.settings.game-options.setting.key-spectator-hotbar.label',
+		defaultMessage: 'Spectator hotbar',
+	},
+	friendsLabel: {
+		id: 'app.settings.game-options.setting.key-friends.label',
+		defaultMessage: 'Friends',
+	},
+	toggleGuiLabel: {
+		id: 'app.settings.game-options.setting.key-toggle-gui.label',
+		defaultMessage: 'Toggle HUD',
+	},
+	toggleSpectatorShaderLabel: {
+		id: 'app.settings.game-options.setting.key-toggle-spectator-shader.label',
+		defaultMessage: 'Toggle spectator shader',
+	},
+	hotbar1Label: {
+		id: 'app.settings.game-options.setting.key-hotbar-1.label',
+		defaultMessage: 'Hotbar 1',
+	},
+	hotbar2Label: {
+		id: 'app.settings.game-options.setting.key-hotbar-2.label',
+		defaultMessage: 'Hotbar 2',
+	},
+	hotbar3Label: {
+		id: 'app.settings.game-options.setting.key-hotbar-3.label',
+		defaultMessage: 'Hotbar 3',
+	},
+	hotbar4Label: {
+		id: 'app.settings.game-options.setting.key-hotbar-4.label',
+		defaultMessage: 'Hotbar 4',
+	},
+	hotbar5Label: {
+		id: 'app.settings.game-options.setting.key-hotbar-5.label',
+		defaultMessage: 'Hotbar 5',
+	},
+	hotbar6Label: {
+		id: 'app.settings.game-options.setting.key-hotbar-6.label',
+		defaultMessage: 'Hotbar 6',
+	},
+	hotbar7Label: {
+		id: 'app.settings.game-options.setting.key-hotbar-7.label',
+		defaultMessage: 'Hotbar 7',
+	},
+	hotbar8Label: {
+		id: 'app.settings.game-options.setting.key-hotbar-8.label',
+		defaultMessage: 'Hotbar 8',
+	},
+	hotbar9Label: {
+		id: 'app.settings.game-options.setting.key-hotbar-9.label',
+		defaultMessage: 'Hotbar 9',
+	},
+	debugOverlayLabel: {
+		id: 'app.settings.game-options.setting.key-debug-overlay.label',
+		defaultMessage: 'Debug overlay',
+	},
+	debugModifierLabel: {
+		id: 'app.settings.game-options.setting.key-debug-modifier.label',
+		defaultMessage: 'Debug modifier',
+	},
+	debugReloadChunksLabel: {
+		id: 'app.settings.game-options.setting.key-debug-reload-chunks.label',
+		defaultMessage: 'Reload chunks',
+	},
+	debugHitboxesLabel: {
+		id: 'app.settings.game-options.setting.key-debug-hitboxes.label',
+		defaultMessage: 'Show hitboxes',
+	},
+	debugClearChatLabel: {
+		id: 'app.settings.game-options.setting.key-debug-clear-chat.label',
+		defaultMessage: 'Clear chat',
+	},
+	debugCrashLabel: {
+		id: 'app.settings.game-options.setting.key-debug-crash.label',
+		defaultMessage: 'Trigger debug crash',
+	},
+	debugChunkBordersLabel: {
+		id: 'app.settings.game-options.setting.key-debug-chunk-borders.label',
+		defaultMessage: 'Show chunk borders',
+	},
+	debugAdvancedTooltipsLabel: {
+		id: 'app.settings.game-options.setting.key-debug-advanced-tooltips.label',
+		defaultMessage: 'Show advanced tooltips',
+	},
+	debugCopyRecreateCommandLabel: {
+		id: 'app.settings.game-options.setting.key-debug-copy-recreate-command.label',
+		defaultMessage: 'Copy recreate command',
+	},
+	debugSpectateLabel: {
+		id: 'app.settings.game-options.setting.key-debug-spectate.label',
+		defaultMessage: 'Spectate entity',
+	},
+	debugSwitchGameModeLabel: {
+		id: 'app.settings.game-options.setting.key-debug-switch-game-mode.label',
+		defaultMessage: 'Switch game mode',
+	},
+	debugOptionsLabel: {
+		id: 'app.settings.game-options.setting.key-debug-options.label',
+		defaultMessage: 'Debug options',
+	},
+	debugFocusPauseLabel: {
+		id: 'app.settings.game-options.setting.key-debug-focus-pause.label',
+		defaultMessage: 'Pause on lost focus',
+	},
+	debugDumpDynamicTexturesLabel: {
+		id: 'app.settings.game-options.setting.key-debug-dump-dynamic-textures.label',
+		defaultMessage: 'Dump dynamic textures',
+	},
+	debugReloadResourcePacksLabel: {
+		id: 'app.settings.game-options.setting.key-debug-reload-resource-packs.label',
+		defaultMessage: 'Reload resource packs',
+	},
+	debugProfilingLabel: {
+		id: 'app.settings.game-options.setting.key-debug-profiling.label',
+		defaultMessage: 'Start profiling',
+	},
+	debugCopyLocationLabel: {
+		id: 'app.settings.game-options.setting.key-debug-copy-location.label',
+		defaultMessage: 'Copy location',
+	},
+	debugDumpVersionLabel: {
+		id: 'app.settings.game-options.setting.key-debug-dump-version.label',
+		defaultMessage: 'Dump version',
+	},
+	debugProfilingChartLabel: {
+		id: 'app.settings.game-options.setting.key-debug-profiling-chart.label',
+		defaultMessage: 'Profiling chart',
+	},
+	debugFpsChartsLabel: {
+		id: 'app.settings.game-options.setting.key-debug-fps-charts.label',
+		defaultMessage: 'FPS charts',
+	},
+	debugNetworkChartsLabel: {
+		id: 'app.settings.game-options.setting.key-debug-network-charts.label',
+		defaultMessage: 'Network charts',
+	},
+	debugLightmapTextureLabel: {
+		id: 'app.settings.game-options.setting.key-debug-lightmap-texture.label',
+		defaultMessage: 'Lightmap texture',
+	},
+	debugImprovedTransparencyLabel: {
+		id: 'app.settings.game-options.setting.key-debug-improved-transparency.label',
+		defaultMessage: 'Improved transparency debug view',
+	},
+})
+
 const categoryMessages = defineMessages({
 	skinCustomizationLabel: {
 		id: 'app.settings.game-options.category.skin-customization.label',
@@ -474,6 +956,29 @@ const choiceMessages = defineMessages({
 		id: 'app.settings.game-options.choice.pause-and-toast',
 		defaultMessage: 'Pause menu and toast',
 	},
+	far: { id: 'app.settings.game-options.choice.far', defaultMessage: 'Far' },
+	normal: { id: 'app.settings.game-options.choice.normal', defaultMessage: 'Normal' },
+	short: { id: 'app.settings.game-options.choice.short', defaultMessage: 'Short' },
+	tiny: { id: 'app.settings.game-options.choice.tiny', defaultMessage: 'Tiny' },
+	maxFps: { id: 'app.settings.game-options.choice.max-fps', defaultMessage: 'Max FPS' },
+	balanced: { id: 'app.settings.game-options.choice.balanced', defaultMessage: 'Balanced' },
+	powerSaver: { id: 'app.settings.game-options.choice.power-saver', defaultMessage: 'Power saver' },
+	whileAfk: { id: 'app.settings.game-options.choice.while-afk', defaultMessage: 'While AFK' },
+	whenMinimized: {
+		id: 'app.settings.game-options.choice.when-minimized',
+		defaultMessage: 'When minimized',
+	},
+	none: { id: 'app.settings.game-options.choice.none', defaultMessage: 'None' },
+	byPlayer: { id: 'app.settings.game-options.choice.by-player', defaultMessage: 'By player' },
+	nearby: { id: 'app.settings.game-options.choice.nearby', defaultMessage: 'Nearby' },
+	crosshair: { id: 'app.settings.game-options.choice.crosshair', defaultMessage: 'Crosshair' },
+	hotbar: { id: 'app.settings.game-options.choice.hotbar', defaultMessage: 'Hotbar' },
+	constant: { id: 'app.settings.game-options.choice.constant', defaultMessage: 'Constant' },
+	default: { id: 'app.settings.game-options.choice.default', defaultMessage: 'Default' },
+	frequent: { id: 'app.settings.game-options.choice.frequent', defaultMessage: 'Frequent' },
+	limited: { id: 'app.settings.game-options.choice.limited', defaultMessage: 'Limited' },
+	openGl: { id: 'app.settings.game-options.choice.opengl', defaultMessage: 'OpenGL' },
+	vulkan: { id: 'app.settings.game-options.choice.vulkan', defaultMessage: 'Vulkan' },
 })
 
 export const presentationMessages = defineMessages({
@@ -712,6 +1217,137 @@ const knownSettings: Record<string, { label: MessageDescriptor; description?: Me
 			description: settingMessages.allowServerListingDescription,
 		},
 		realms_notifications: { label: settingMessages.realmsNotificationsLabel },
+		brightness: { label: catalogSettingMessages.brightnessLabel },
+		legacy_view_distance: { label: catalogSettingMessages.legacyViewDistanceLabel },
+		entity_distance: { label: catalogSettingMessages.entityDistanceLabel },
+		debug_gui_scale: { label: catalogSettingMessages.debugGuiScaleLabel },
+		graphics_backend: { label: catalogSettingMessages.graphicsBackendLabel },
+		cloud_range: { label: catalogSettingMessages.cloudRangeLabel },
+		exclusive_fullscreen: { label: catalogSettingMessages.exclusiveFullscreenLabel },
+		mac_fullscreen_menu: { label: catalogSettingMessages.macFullscreenMenuLabel },
+		legacy_framerate_limit: { label: catalogSettingMessages.legacyFramerateLimitLabel },
+		inactivity_framerate_limit: {
+			label: catalogSettingMessages.inactivityFramerateLimitLabel,
+		},
+		prioritize_chunk_updates: { label: catalogSettingMessages.prioritizeChunkUpdatesLabel },
+		attack_indicator: { label: catalogSettingMessages.attackIndicatorLabel },
+		reduced_debug_info: { label: catalogSettingMessages.reducedDebugInfoLabel },
+		chunk_fade_time: { label: catalogSettingMessages.chunkFadeTimeLabel },
+		cutout_leaves: { label: catalogSettingMessages.cutoutLeavesLabel },
+		improved_transparency: { label: catalogSettingMessages.improvedTransparencyLabel },
+		texture_filtering: { label: catalogSettingMessages.textureFilteringLabel },
+		anisotropy: { label: catalogSettingMessages.anisotropyLabel },
+		vignette: { label: catalogSettingMessages.vignetteLabel },
+		weather_radius: { label: catalogSettingMessages.weatherRadiusLabel },
+		advanced_opengl: { label: catalogSettingMessages.advancedOpenGlLabel },
+		anaglyph_3d: { label: catalogSettingMessages.anaglyph3dLabel },
+		anisotropic_filtering: { label: catalogSettingMessages.anisotropicFilteringLabel },
+		alternate_blocks: { label: catalogSettingMessages.alternateBlocksLabel },
+		held_item_tooltips: { label: catalogSettingMessages.heldItemTooltipsLabel },
+		use_vbo: { label: catalogSettingMessages.useVboLabel },
+		force_unicode_font: { label: catalogSettingMessages.forceUnicodeFontLabel },
+		japanese_glyph_variants: { label: catalogSettingMessages.japaneseGlyphVariantsLabel },
+		music_frequency: { label: catalogSettingMessages.musicFrequencyLabel },
+		directional_audio: { label: catalogSettingMessages.directionalAudioLabel },
+		invert_horizontal_mouse: { label: catalogSettingMessages.invertHorizontalMouseLabel },
+		toggle_attack: { label: catalogSettingMessages.toggleAttackLabel },
+		toggle_use: { label: catalogSettingMessages.toggleUseLabel },
+		mouse_wheel_sensitivity: { label: catalogSettingMessages.mouseWheelSensitivityLabel },
+		raw_mouse_input: { label: catalogSettingMessages.rawMouseInputLabel },
+		touchscreen: { label: catalogSettingMessages.touchscreenLabel },
+		allow_cursor_changes: { label: catalogSettingMessages.allowCursorChangesLabel },
+		sprint_window: { label: catalogSettingMessages.sprintWindowLabel },
+		operator_items_tab: { label: catalogSettingMessages.operatorItemsTabLabel },
+		ctrl_click_right_click: { label: catalogSettingMessages.ctrlClickRightClickLabel },
+		quit_shortcuts: { label: catalogSettingMessages.quitShortcutsLabel },
+		chat_width: { label: catalogSettingMessages.chatWidthLabel },
+		focused_chat_height: { label: catalogSettingMessages.focusedChatHeightLabel },
+		unfocused_chat_height: { label: catalogSettingMessages.unfocusedChatHeightLabel },
+		chat_line_spacing: { label: catalogSettingMessages.chatLineSpacingLabel },
+		chat_delay: { label: catalogSettingMessages.chatDelayLabel },
+		text_background_opacity: { label: catalogSettingMessages.textBackgroundOpacityLabel },
+		chat_background_only: { label: catalogSettingMessages.chatBackgroundOnlyLabel },
+		auto_suggestions: { label: catalogSettingMessages.autoSuggestionsLabel },
+		secure_chat_only: { label: catalogSettingMessages.secureChatOnlyLabel },
+		save_chat_drafts: { label: catalogSettingMessages.saveChatDraftsLabel },
+		hide_matched_names: { label: catalogSettingMessages.hideMatchedNamesLabel },
+		chat_preview: { label: catalogSettingMessages.chatPreviewLabel },
+		fov_effects: { label: catalogSettingMessages.fovEffectsLabel },
+		screen_effects: { label: catalogSettingMessages.screenEffectsLabel },
+		darkness_pulsing: { label: catalogSettingMessages.darknessPulsingLabel },
+		damage_tilt: { label: catalogSettingMessages.damageTiltLabel },
+		glint_speed: { label: catalogSettingMessages.glintSpeedLabel },
+		glint_strength: { label: catalogSettingMessages.glintStrengthLabel },
+		hide_lightning_flashes: { label: catalogSettingMessages.hideLightningFlashesLabel },
+		hide_splash_texts: { label: catalogSettingMessages.hideSplashTextsLabel },
+		high_contrast_outline: { label: catalogSettingMessages.highContrastOutlineLabel },
+		narrator_hotkey: { label: catalogSettingMessages.narratorHotkeyLabel },
+		autosave_indicator: { label: catalogSettingMessages.autosaveIndicatorLabel },
+		panorama_speed: { label: catalogSettingMessages.panoramaSpeedLabel },
+		menu_background_blur: { label: catalogSettingMessages.menuBackgroundBlurLabel },
+		rotate_with_minecart: { label: catalogSettingMessages.rotateWithMinecartLabel },
+		left_sleeve: { label: catalogSettingMessages.leftSleeveLabel },
+		right_sleeve: { label: catalogSettingMessages.rightSleeveLabel },
+		left_pants_leg: { label: catalogSettingMessages.leftPantsLegLabel },
+		right_pants_leg: { label: catalogSettingMessages.rightPantsLegLabel },
+		hide_server_address: { label: catalogSettingMessages.hideServerAddressLabel },
+		server_textures: { label: catalogSettingMessages.serverTexturesLabel },
+		snooper: { label: catalogSettingMessages.snooperLabel },
+		extra_telemetry: { label: catalogSettingMessages.extraTelemetryLabel },
+		in_game_notifications: { label: catalogSettingMessages.inGameNotificationsLabel },
+		share_presence: { label: catalogSettingMessages.sharePresenceLabel },
+		'key.smooth_camera': { label: catalogKeyMessages.smoothCameraLabel },
+		'key.spectator_outlines': { label: catalogKeyMessages.spectatorOutlinesLabel },
+		'key.save_toolbar': { label: catalogKeyMessages.saveToolbarLabel },
+		'key.load_toolbar': { label: catalogKeyMessages.loadToolbarLabel },
+		'key.social_interactions': { label: catalogKeyMessages.socialInteractionsLabel },
+		'key.quick_actions': { label: catalogKeyMessages.quickActionsLabel },
+		'key.spectator_hotbar': { label: catalogKeyMessages.spectatorHotbarLabel },
+		'key.friends': { label: catalogKeyMessages.friendsLabel },
+		'key.toggle_gui': { label: catalogKeyMessages.toggleGuiLabel },
+		'key.toggle_spectator_shader': { label: catalogKeyMessages.toggleSpectatorShaderLabel },
+		'key.hotbar.1': { label: catalogKeyMessages.hotbar1Label },
+		'key.hotbar.2': { label: catalogKeyMessages.hotbar2Label },
+		'key.hotbar.3': { label: catalogKeyMessages.hotbar3Label },
+		'key.hotbar.4': { label: catalogKeyMessages.hotbar4Label },
+		'key.hotbar.5': { label: catalogKeyMessages.hotbar5Label },
+		'key.hotbar.6': { label: catalogKeyMessages.hotbar6Label },
+		'key.hotbar.7': { label: catalogKeyMessages.hotbar7Label },
+		'key.hotbar.8': { label: catalogKeyMessages.hotbar8Label },
+		'key.hotbar.9': { label: catalogKeyMessages.hotbar9Label },
+		'key.debug.overlay': { label: catalogKeyMessages.debugOverlayLabel },
+		'key.debug.modifier': { label: catalogKeyMessages.debugModifierLabel },
+		'key.debug.reload_chunks': { label: catalogKeyMessages.debugReloadChunksLabel },
+		'key.debug.hitboxes': { label: catalogKeyMessages.debugHitboxesLabel },
+		'key.debug.clear_chat': { label: catalogKeyMessages.debugClearChatLabel },
+		'key.debug.crash': { label: catalogKeyMessages.debugCrashLabel },
+		'key.debug.chunk_borders': { label: catalogKeyMessages.debugChunkBordersLabel },
+		'key.debug.advanced_tooltips': {
+			label: catalogKeyMessages.debugAdvancedTooltipsLabel,
+		},
+		'key.debug.copy_recreate_command': {
+			label: catalogKeyMessages.debugCopyRecreateCommandLabel,
+		},
+		'key.debug.spectate': { label: catalogKeyMessages.debugSpectateLabel },
+		'key.debug.switch_game_mode': { label: catalogKeyMessages.debugSwitchGameModeLabel },
+		'key.debug.options': { label: catalogKeyMessages.debugOptionsLabel },
+		'key.debug.focus_pause': { label: catalogKeyMessages.debugFocusPauseLabel },
+		'key.debug.dump_dynamic_textures': {
+			label: catalogKeyMessages.debugDumpDynamicTexturesLabel,
+		},
+		'key.debug.reload_resource_packs': {
+			label: catalogKeyMessages.debugReloadResourcePacksLabel,
+		},
+		'key.debug.profiling': { label: catalogKeyMessages.debugProfilingLabel },
+		'key.debug.copy_location': { label: catalogKeyMessages.debugCopyLocationLabel },
+		'key.debug.dump_version': { label: catalogKeyMessages.debugDumpVersionLabel },
+		'key.debug.profiling_chart': { label: catalogKeyMessages.debugProfilingChartLabel },
+		'key.debug.fps_charts': { label: catalogKeyMessages.debugFpsChartsLabel },
+		'key.debug.network_charts': { label: catalogKeyMessages.debugNetworkChartsLabel },
+		'key.debug.lightmap_texture': { label: catalogKeyMessages.debugLightmapTextureLabel },
+		'key.debug.improved_transparency': {
+			label: catalogKeyMessages.debugImprovedTransparencyLabel,
+		},
 	}
 
 const categories: Record<string, { label: MessageDescriptor; description: MessageDescriptor }> = {
@@ -780,6 +1416,33 @@ const choices: Record<string, MessageDescriptor> = {
 	'music_toast:never': choiceMessages.never,
 	'music_toast:pause': choiceMessages.pause,
 	'music_toast:pause_and_toast': choiceMessages.pauseAndToast,
+	'legacy_view_distance:0': choiceMessages.far,
+	'legacy_view_distance:1': choiceMessages.normal,
+	'legacy_view_distance:2': choiceMessages.short,
+	'legacy_view_distance:3': choiceMessages.tiny,
+	'legacy_framerate_limit:0': choiceMessages.maxFps,
+	'legacy_framerate_limit:1': choiceMessages.balanced,
+	'legacy_framerate_limit:2': choiceMessages.powerSaver,
+	'inactivity_framerate_limit:afk': choiceMessages.whileAfk,
+	'inactivity_framerate_limit:minimized': choiceMessages.whenMinimized,
+	'prioritize_chunk_updates:0': choiceMessages.none,
+	'prioritize_chunk_updates:1': choiceMessages.byPlayer,
+	'prioritize_chunk_updates:2': choiceMessages.nearby,
+	'attack_indicator:0': choiceMessages.off,
+	'attack_indicator:1': choiceMessages.crosshair,
+	'attack_indicator:2': choiceMessages.hotbar,
+	'chat_preview:0': choiceMessages.off,
+	'chat_preview:1': choiceMessages.commandsOnly,
+	'chat_preview:2': choiceMessages.on,
+	'music_frequency:CONSTANT': choiceMessages.constant,
+	'music_frequency:DEFAULT': choiceMessages.default,
+	'music_frequency:FREQUENT': choiceMessages.frequent,
+	'share_presence:all': choiceMessages.all,
+	'share_presence:limited': choiceMessages.limited,
+	'share_presence:none': choiceMessages.none,
+	'graphics_backend:default': choiceMessages.default,
+	'graphics_backend:opengl': choiceMessages.openGl,
+	'graphics_backend:vulkan': choiceMessages.vulkan,
 }
 
 const validationMessages: Record<GameOptionValidationError, MessageDescriptor> = {
diff --git a/apps/app-frontend/src/helpers/instance.ts b/apps/app-frontend/src/helpers/instance.ts
index 417b010c71..ef22c538c3 100644
--- a/apps/app-frontend/src/helpers/instance.ts
+++ b/apps/app-frontend/src/helpers/instance.ts
@@ -336,6 +336,10 @@ export async function get_global_synced_options(): Promise<GlobalSyncedOptions>
 	return await invoke('plugin:instance|instance_get_global_synced_options')
 }
 
+export async function get_initialized_synced_options(): Promise<GlobalSyncedOptions> {
+	return await invoke('plugin:instance|instance_get_initialized_synced_options')
+}
+
 export async function set_global_synced_option(
 	option: SyncedOption,
 	enabled: boolean,
diff --git a/apps/app-frontend/src/locales/en-US/index.json b/apps/app-frontend/src/locales/en-US/index.json
index 66ad06bc1c..21216186d6 100644
--- a/apps/app-frontend/src/locales/en-US/index.json
+++ b/apps/app-frontend/src/locales/en-US/index.json
@@ -1676,33 +1676,63 @@
   "app.settings.game-options.choice.all": {
     "message": "All"
   },
+  "app.settings.game-options.choice.balanced": {
+    "message": "Balanced"
+  },
+  "app.settings.game-options.choice.by-player": {
+    "message": "By player"
+  },
   "app.settings.game-options.choice.chat": {
     "message": "Chat"
   },
   "app.settings.game-options.choice.commands-only": {
     "message": "Commands only"
   },
+  "app.settings.game-options.choice.constant": {
+    "message": "Constant"
+  },
+  "app.settings.game-options.choice.crosshair": {
+    "message": "Crosshair"
+  },
   "app.settings.game-options.choice.custom": {
     "message": "Custom"
   },
   "app.settings.game-options.choice.decreased": {
     "message": "Decreased"
   },
+  "app.settings.game-options.choice.default": {
+    "message": "Default"
+  },
   "app.settings.game-options.choice.fabulous": {
     "message": "Fabulous"
   },
   "app.settings.game-options.choice.fancy": {
     "message": "Fancy"
   },
+  "app.settings.game-options.choice.far": {
+    "message": "Far"
+  },
   "app.settings.game-options.choice.fast": {
     "message": "Fast"
   },
+  "app.settings.game-options.choice.frequent": {
+    "message": "Frequent"
+  },
   "app.settings.game-options.choice.hidden": {
     "message": "Hidden"
   },
+  "app.settings.game-options.choice.hotbar": {
+    "message": "Hotbar"
+  },
   "app.settings.game-options.choice.left": {
     "message": "Left"
   },
+  "app.settings.game-options.choice.limited": {
+    "message": "Limited"
+  },
+  "app.settings.game-options.choice.max-fps": {
+    "message": "Max FPS"
+  },
   "app.settings.game-options.choice.maximum": {
     "message": "Maximum"
   },
@@ -1712,30 +1742,60 @@
   "app.settings.game-options.choice.minimum": {
     "message": "Minimum"
   },
+  "app.settings.game-options.choice.nearby": {
+    "message": "Nearby"
+  },
   "app.settings.game-options.choice.never": {
     "message": "Never"
   },
+  "app.settings.game-options.choice.none": {
+    "message": "None"
+  },
+  "app.settings.game-options.choice.normal": {
+    "message": "Normal"
+  },
   "app.settings.game-options.choice.off": {
     "message": "Off"
   },
   "app.settings.game-options.choice.on": {
     "message": "On"
   },
+  "app.settings.game-options.choice.opengl": {
+    "message": "OpenGL"
+  },
   "app.settings.game-options.choice.pause": {
     "message": "Pause menu"
   },
   "app.settings.game-options.choice.pause-and-toast": {
     "message": "Pause menu and toast"
   },
+  "app.settings.game-options.choice.power-saver": {
+    "message": "Power saver"
+  },
   "app.settings.game-options.choice.right": {
     "message": "Right"
   },
+  "app.settings.game-options.choice.short": {
+    "message": "Short"
+  },
   "app.settings.game-options.choice.shown": {
     "message": "Shown"
   },
   "app.settings.game-options.choice.system": {
     "message": "System"
   },
+  "app.settings.game-options.choice.tiny": {
+    "message": "Tiny"
+  },
+  "app.settings.game-options.choice.vulkan": {
+    "message": "Vulkan"
+  },
+  "app.settings.game-options.choice.when-minimized": {
+    "message": "When minimized"
+  },
+  "app.settings.game-options.choice.while-afk": {
+    "message": "While AFK"
+  },
   "app.settings.game-options.compatibility.all": {
     "message": "Syncs to {count, plural, one {# instance} other {# instances}}"
   },
@@ -1931,21 +1991,51 @@
   "app.settings.game-options.keybind.unsupported-status": {
     "message": "That input cannot be used by Minecraft. Press another key."
   },
+  "app.settings.game-options.setting.advanced-opengl.label": {
+    "message": "Advanced OpenGL"
+  },
+  "app.settings.game-options.setting.allow-cursor-changes.label": {
+    "message": "Allow cursor changes"
+  },
   "app.settings.game-options.setting.allow-server-listing.description": {
     "message": "Allow the player's name to appear in server listings."
   },
   "app.settings.game-options.setting.allow-server-listing.label": {
     "message": "Server listings"
   },
+  "app.settings.game-options.setting.alternate-blocks.label": {
+    "message": "Alternate blocks"
+  },
   "app.settings.game-options.setting.ambient-occlusion.label": {
     "message": "Smooth lighting"
   },
+  "app.settings.game-options.setting.ambient-volume.label": {
+    "message": "Ambient/Environment"
+  },
+  "app.settings.game-options.setting.anaglyph-3d.label": {
+    "message": "3D anaglyph"
+  },
+  "app.settings.game-options.setting.anisotropic-filtering.label": {
+    "message": "Anisotropic filtering"
+  },
+  "app.settings.game-options.setting.anisotropy.label": {
+    "message": "Anisotropy"
+  },
+  "app.settings.game-options.setting.attack-indicator.label": {
+    "message": "Attack indicator"
+  },
   "app.settings.game-options.setting.auto-jump.description": {
     "message": "Automatically jump up one-block-high obstacles."
   },
   "app.settings.game-options.setting.auto-jump.label": {
     "message": "Auto-jump"
   },
+  "app.settings.game-options.setting.auto-suggestions.label": {
+    "message": "Command suggestions"
+  },
+  "app.settings.game-options.setting.autosave-indicator.label": {
+    "message": "Autosave indicator"
+  },
   "app.settings.game-options.setting.biome-blend-radius.description": {
     "message": "The distance over which biome colors transition."
   },
@@ -1955,15 +2045,27 @@
   "app.settings.game-options.setting.blocks-volume.label": {
     "message": "Blocks"
   },
+  "app.settings.game-options.setting.brightness.label": {
+    "message": "Brightness"
+  },
   "app.settings.game-options.setting.cape.description": {
     "message": "Show the player's cape, including its elytra texture."
   },
   "app.settings.game-options.setting.cape.label": {
     "message": "Cape"
   },
+  "app.settings.game-options.setting.chat-background-only.label": {
+    "message": "Chat background only"
+  },
   "app.settings.game-options.setting.chat-colors.label": {
     "message": "Chat colors"
   },
+  "app.settings.game-options.setting.chat-delay.label": {
+    "message": "Chat delay"
+  },
+  "app.settings.game-options.setting.chat-line-spacing.label": {
+    "message": "Chat line spacing"
+  },
   "app.settings.game-options.setting.chat-links-prompt.description": {
     "message": "Ask before opening links from chat."
   },
@@ -1982,36 +2084,93 @@
   "app.settings.game-options.setting.chat-opacity.label": {
     "message": "Chat opacity"
   },
+  "app.settings.game-options.setting.chat-preview.label": {
+    "message": "Chat preview"
+  },
   "app.settings.game-options.setting.chat-scale.label": {
     "message": "Chat scale"
   },
   "app.settings.game-options.setting.chat-visibility.label": {
     "message": "Chat visibility"
   },
+  "app.settings.game-options.setting.chat-width.label": {
+    "message": "Chat width"
+  },
+  "app.settings.game-options.setting.chunk-fade-time.label": {
+    "message": "Chunk fade time"
+  },
+  "app.settings.game-options.setting.cloud-range.label": {
+    "message": "Cloud distance"
+  },
   "app.settings.game-options.setting.clouds.label": {
     "message": "Clouds"
   },
+  "app.settings.game-options.setting.ctrl-click-right-click.label": {
+    "message": "Control-click as right-click"
+  },
+  "app.settings.game-options.setting.cutout-leaves.label": {
+    "message": "Cutout leaves"
+  },
+  "app.settings.game-options.setting.damage-tilt.label": {
+    "message": "Damage tilt"
+  },
   "app.settings.game-options.setting.dark-splash.description": {
     "message": "Change the Mojang Studios loading screen from red to black."
   },
   "app.settings.game-options.setting.dark-splash.label": {
     "message": "Monochrome logo"
   },
+  "app.settings.game-options.setting.darkness-pulsing.label": {
+    "message": "Darkness pulsing"
+  },
+  "app.settings.game-options.setting.debug-gui-scale.label": {
+    "message": "Debug GUI scale"
+  },
+  "app.settings.game-options.setting.directional-audio.label": {
+    "message": "Directional audio"
+  },
   "app.settings.game-options.setting.discrete-mouse-scroll.description": {
     "message": "Treat each mouse-wheel input as a single scroll step."
   },
   "app.settings.game-options.setting.discrete-mouse-scroll.label": {
     "message": "Discrete scrolling"
   },
+  "app.settings.game-options.setting.entity-distance.label": {
+    "message": "Entity distance"
+  },
   "app.settings.game-options.setting.entity-shadows.label": {
     "message": "Entity shadows"
   },
+  "app.settings.game-options.setting.exclusive-fullscreen.label": {
+    "message": "Exclusive fullscreen"
+  },
+  "app.settings.game-options.setting.extra-telemetry.label": {
+    "message": "Optional telemetry"
+  },
+  "app.settings.game-options.setting.focused-chat-height.label": {
+    "message": "Focused chat height"
+  },
+  "app.settings.game-options.setting.force-unicode-font.label": {
+    "message": "Force Unicode font"
+  },
+  "app.settings.game-options.setting.fov-effects.label": {
+    "message": "FOV effects"
+  },
   "app.settings.game-options.setting.fov.label": {
     "message": "Field of view"
   },
   "app.settings.game-options.setting.fullscreen.label": {
     "message": "Fullscreen"
   },
+  "app.settings.game-options.setting.glint-speed.label": {
+    "message": "Glint speed"
+  },
+  "app.settings.game-options.setting.glint-strength.label": {
+    "message": "Glint strength"
+  },
+  "app.settings.game-options.setting.graphics-backend.label": {
+    "message": "Graphics backend"
+  },
   "app.settings.game-options.setting.graphics.description": {
     "message": "Controls visual quality and performance."
   },
@@ -2030,6 +2189,24 @@
   "app.settings.game-options.setting.hat.label": {
     "message": "Hat"
   },
+  "app.settings.game-options.setting.held-item-tooltips.label": {
+    "message": "Held item tooltips"
+  },
+  "app.settings.game-options.setting.hide-lightning-flashes.label": {
+    "message": "Hide lightning flashes"
+  },
+  "app.settings.game-options.setting.hide-matched-names.label": {
+    "message": "Hide matched names"
+  },
+  "app.settings.game-options.setting.hide-server-address.label": {
+    "message": "Hide server address"
+  },
+  "app.settings.game-options.setting.hide-splash-texts.label": {
+    "message": "Hide splash texts"
+  },
+  "app.settings.game-options.setting.high-contrast-outline.label": {
+    "message": "High contrast block outline"
+  },
   "app.settings.game-options.setting.high-contrast.description": {
     "message": "Enhance the contrast of interface elements."
   },
@@ -2039,6 +2216,18 @@
   "app.settings.game-options.setting.hostile-volume.label": {
     "message": "Hostile creatures"
   },
+  "app.settings.game-options.setting.improved-transparency.label": {
+    "message": "Improved transparency"
+  },
+  "app.settings.game-options.setting.in-game-notifications.label": {
+    "message": "In-game notifications"
+  },
+  "app.settings.game-options.setting.inactivity-framerate-limit.label": {
+    "message": "Reduced framerate"
+  },
+  "app.settings.game-options.setting.invert-horizontal-mouse.label": {
+    "message": "Invert horizontal mouse"
+  },
   "app.settings.game-options.setting.invert-mouse.description": {
     "message": "Invert vertical mouse movement."
   },
@@ -2051,6 +2240,9 @@
   "app.settings.game-options.setting.jacket.label": {
     "message": "Jacket"
   },
+  "app.settings.game-options.setting.japanese-glyph-variants.label": {
+    "message": "Japanese glyph variants"
+  },
   "app.settings.game-options.setting.key-advancements.label": {
     "message": "Advancements"
   },
@@ -2066,15 +2258,114 @@
   "app.settings.game-options.setting.key-command.label": {
     "message": "Command"
   },
+  "app.settings.game-options.setting.key-debug-advanced-tooltips.label": {
+    "message": "Show advanced tooltips"
+  },
+  "app.settings.game-options.setting.key-debug-chunk-borders.label": {
+    "message": "Show chunk borders"
+  },
+  "app.settings.game-options.setting.key-debug-clear-chat.label": {
+    "message": "Clear chat"
+  },
+  "app.settings.game-options.setting.key-debug-copy-location.label": {
+    "message": "Copy location"
+  },
+  "app.settings.game-options.setting.key-debug-copy-recreate-command.label": {
+    "message": "Copy recreate command"
+  },
+  "app.settings.game-options.setting.key-debug-crash.label": {
+    "message": "Trigger debug crash"
+  },
+  "app.settings.game-options.setting.key-debug-dump-dynamic-textures.label": {
+    "message": "Dump dynamic textures"
+  },
+  "app.settings.game-options.setting.key-debug-dump-version.label": {
+    "message": "Dump version"
+  },
+  "app.settings.game-options.setting.key-debug-focus-pause.label": {
+    "message": "Pause on lost focus"
+  },
+  "app.settings.game-options.setting.key-debug-fps-charts.label": {
+    "message": "FPS charts"
+  },
+  "app.settings.game-options.setting.key-debug-hitboxes.label": {
+    "message": "Show hitboxes"
+  },
+  "app.settings.game-options.setting.key-debug-improved-transparency.label": {
+    "message": "Improved transparency debug view"
+  },
+  "app.settings.game-options.setting.key-debug-lightmap-texture.label": {
+    "message": "Lightmap texture"
+  },
+  "app.settings.game-options.setting.key-debug-modifier.label": {
+    "message": "Debug modifier"
+  },
+  "app.settings.game-options.setting.key-debug-network-charts.label": {
+    "message": "Network charts"
+  },
+  "app.settings.game-options.setting.key-debug-options.label": {
+    "message": "Debug options"
+  },
+  "app.settings.game-options.setting.key-debug-overlay.label": {
+    "message": "Debug overlay"
+  },
+  "app.settings.game-options.setting.key-debug-profiling-chart.label": {
+    "message": "Profiling chart"
+  },
+  "app.settings.game-options.setting.key-debug-profiling.label": {
+    "message": "Start profiling"
+  },
+  "app.settings.game-options.setting.key-debug-reload-chunks.label": {
+    "message": "Reload chunks"
+  },
+  "app.settings.game-options.setting.key-debug-reload-resource-packs.label": {
+    "message": "Reload resource packs"
+  },
+  "app.settings.game-options.setting.key-debug-spectate.label": {
+    "message": "Spectate entity"
+  },
+  "app.settings.game-options.setting.key-debug-switch-game-mode.label": {
+    "message": "Switch game mode"
+  },
   "app.settings.game-options.setting.key-drop.label": {
     "message": "Drop item"
   },
   "app.settings.game-options.setting.key-forward.label": {
     "message": "Move forward"
   },
+  "app.settings.game-options.setting.key-friends.label": {
+    "message": "Friends"
+  },
   "app.settings.game-options.setting.key-fullscreen.label": {
     "message": "Toggle fullscreen"
   },
+  "app.settings.game-options.setting.key-hotbar-1.label": {
+    "message": "Hotbar 1"
+  },
+  "app.settings.game-options.setting.key-hotbar-2.label": {
+    "message": "Hotbar 2"
+  },
+  "app.settings.game-options.setting.key-hotbar-3.label": {
+    "message": "Hotbar 3"
+  },
+  "app.settings.game-options.setting.key-hotbar-4.label": {
+    "message": "Hotbar 4"
+  },
+  "app.settings.game-options.setting.key-hotbar-5.label": {
+    "message": "Hotbar 5"
+  },
+  "app.settings.game-options.setting.key-hotbar-6.label": {
+    "message": "Hotbar 6"
+  },
+  "app.settings.game-options.setting.key-hotbar-7.label": {
+    "message": "Hotbar 7"
+  },
+  "app.settings.game-options.setting.key-hotbar-8.label": {
+    "message": "Hotbar 8"
+  },
+  "app.settings.game-options.setting.key-hotbar-9.label": {
+    "message": "Hotbar 9"
+  },
   "app.settings.game-options.setting.key-inventory.label": {
     "message": "Inventory"
   },
@@ -2084,6 +2375,9 @@
   "app.settings.game-options.setting.key-left.label": {
     "message": "Strafe left"
   },
+  "app.settings.game-options.setting.key-load-toolbar.label": {
+    "message": "Load toolbar"
+  },
   "app.settings.game-options.setting.key-perspective.label": {
     "message": "Change perspective"
   },
@@ -2093,27 +2387,66 @@
   "app.settings.game-options.setting.key-player-list.label": {
     "message": "Player list"
   },
+  "app.settings.game-options.setting.key-quick-actions.label": {
+    "message": "Quick actions"
+  },
   "app.settings.game-options.setting.key-right.label": {
     "message": "Strafe right"
   },
+  "app.settings.game-options.setting.key-save-toolbar.label": {
+    "message": "Save toolbar"
+  },
   "app.settings.game-options.setting.key-screenshot.label": {
     "message": "Screenshot"
   },
+  "app.settings.game-options.setting.key-smooth-camera.label": {
+    "message": "Toggle cinematic camera"
+  },
   "app.settings.game-options.setting.key-sneak.label": {
     "message": "Sneak"
   },
+  "app.settings.game-options.setting.key-social-interactions.label": {
+    "message": "Social interactions"
+  },
+  "app.settings.game-options.setting.key-spectator-hotbar.label": {
+    "message": "Spectator hotbar"
+  },
+  "app.settings.game-options.setting.key-spectator-outlines.label": {
+    "message": "Highlight spectators"
+  },
   "app.settings.game-options.setting.key-sprint.label": {
     "message": "Sprint"
   },
   "app.settings.game-options.setting.key-swap-offhand.label": {
     "message": "Swap offhand"
   },
+  "app.settings.game-options.setting.key-toggle-gui.label": {
+    "message": "Toggle HUD"
+  },
+  "app.settings.game-options.setting.key-toggle-spectator-shader.label": {
+    "message": "Toggle spectator shader"
+  },
   "app.settings.game-options.setting.key-use.label": {
     "message": "Use item"
   },
   "app.settings.game-options.setting.language.label": {
     "message": "Language"
   },
+  "app.settings.game-options.setting.left-pants-leg.label": {
+    "message": "Left pants leg"
+  },
+  "app.settings.game-options.setting.left-sleeve.label": {
+    "message": "Left sleeve"
+  },
+  "app.settings.game-options.setting.legacy-framerate-limit.label": {
+    "message": "Framerate limit"
+  },
+  "app.settings.game-options.setting.legacy-view-distance.label": {
+    "message": "View distance"
+  },
+  "app.settings.game-options.setting.mac-fullscreen-menu.label": {
+    "message": "Show macOS menu in fullscreen"
+  },
   "app.settings.game-options.setting.main-hand.description": {
     "message": "Choose whether the main hand is left or right."
   },
@@ -2126,12 +2459,21 @@
   "app.settings.game-options.setting.max-framerate.label": {
     "message": "Maximum framerate"
   },
+  "app.settings.game-options.setting.menu-background-blur.label": {
+    "message": "Menu background blur"
+  },
   "app.settings.game-options.setting.mipmap-levels.description": {
     "message": "Texture smoothing at a distance."
   },
   "app.settings.game-options.setting.mipmap-levels.label": {
     "message": "Mipmap levels"
   },
+  "app.settings.game-options.setting.mouse-wheel-sensitivity.label": {
+    "message": "Mouse wheel sensitivity"
+  },
+  "app.settings.game-options.setting.music-frequency.label": {
+    "message": "Music frequency"
+  },
   "app.settings.game-options.setting.music-toast.description": {
     "message": "Choose whether music titles appear in the pause menu and as toasts."
   },
@@ -2141,45 +2483,111 @@
   "app.settings.game-options.setting.music-volume.label": {
     "message": "Music"
   },
+  "app.settings.game-options.setting.narrator-hotkey.label": {
+    "message": "Narrator hotkey"
+  },
   "app.settings.game-options.setting.narrator.description": {
     "message": "Choose what the narrator reads."
   },
   "app.settings.game-options.setting.narrator.label": {
     "message": "Narrator"
   },
+  "app.settings.game-options.setting.neutral-volume.label": {
+    "message": "Friendly creatures"
+  },
   "app.settings.game-options.setting.notification-time.description": {
     "message": "How long toast notifications remain visible."
   },
   "app.settings.game-options.setting.notification-time.label": {
     "message": "Notification time"
   },
+  "app.settings.game-options.setting.operator-items-tab.label": {
+    "message": "Operator items tab"
+  },
+  "app.settings.game-options.setting.panorama-speed.label": {
+    "message": "Panorama speed"
+  },
   "app.settings.game-options.setting.particles.label": {
     "message": "Particles"
   },
   "app.settings.game-options.setting.players-volume.label": {
     "message": "Players"
   },
+  "app.settings.game-options.setting.prioritize-chunk-updates.label": {
+    "message": "Prioritize chunk updates"
+  },
+  "app.settings.game-options.setting.quit-shortcuts.label": {
+    "message": "Quit shortcuts"
+  },
+  "app.settings.game-options.setting.raw-mouse-input.label": {
+    "message": "Raw mouse input"
+  },
   "app.settings.game-options.setting.realms-notifications.label": {
     "message": "Realms notifications"
   },
+  "app.settings.game-options.setting.record-volume.label": {
+    "message": "Jukebox/Note Blocks"
+  },
+  "app.settings.game-options.setting.reduced-debug-info.label": {
+    "message": "Reduced debug information"
+  },
   "app.settings.game-options.setting.render-distance.label": {
     "message": "Render distance"
   },
+  "app.settings.game-options.setting.right-pants-leg.label": {
+    "message": "Right pants leg"
+  },
+  "app.settings.game-options.setting.right-sleeve.label": {
+    "message": "Right sleeve"
+  },
+  "app.settings.game-options.setting.rotate-with-minecart.label": {
+    "message": "Rotate with minecart"
+  },
+  "app.settings.game-options.setting.save-chat-drafts.label": {
+    "message": "Save chat drafts"
+  },
+  "app.settings.game-options.setting.screen-effects.label": {
+    "message": "Screen effects"
+  },
+  "app.settings.game-options.setting.secure-chat-only.label": {
+    "message": "Only show secure chat"
+  },
   "app.settings.game-options.setting.sensitivity.label": {
     "message": "Mouse sensitivity"
   },
+  "app.settings.game-options.setting.server-textures.label": {
+    "message": "Server textures"
+  },
+  "app.settings.game-options.setting.share-presence.label": {
+    "message": "Share presence"
+  },
   "app.settings.game-options.setting.simulation-distance.description": {
     "message": "How far away entities update and blocks and fluids tick."
   },
   "app.settings.game-options.setting.simulation-distance.label": {
     "message": "Simulation distance"
   },
+  "app.settings.game-options.setting.snooper.label": {
+    "message": "Snooper"
+  },
+  "app.settings.game-options.setting.sprint-window.label": {
+    "message": "Sprint window"
+  },
   "app.settings.game-options.setting.subtitles.description": {
     "message": "Show captions for sounds played in the game."
   },
   "app.settings.game-options.setting.subtitles.label": {
     "message": "Subtitles"
   },
+  "app.settings.game-options.setting.text-background-opacity.label": {
+    "message": "Text background opacity"
+  },
+  "app.settings.game-options.setting.texture-filtering.label": {
+    "message": "Texture filtering"
+  },
+  "app.settings.game-options.setting.toggle-attack.label": {
+    "message": "Toggle attack"
+  },
   "app.settings.game-options.setting.toggle-crouch.description": {
     "message": "Press once to remain crouched."
   },
@@ -2192,12 +2600,30 @@
   "app.settings.game-options.setting.toggle-sprint.label": {
     "message": "Toggle sprint"
   },
+  "app.settings.game-options.setting.toggle-use.label": {
+    "message": "Toggle use"
+  },
+  "app.settings.game-options.setting.touchscreen.label": {
+    "message": "Touchscreen mode"
+  },
+  "app.settings.game-options.setting.ui-volume.label": {
+    "message": "UI"
+  },
+  "app.settings.game-options.setting.unfocused-chat-height.label": {
+    "message": "Unfocused chat height"
+  },
+  "app.settings.game-options.setting.use-vbo.label": {
+    "message": "Use VBOs"
+  },
   "app.settings.game-options.setting.view-bobbing.description": {
     "message": "Add a bobbing motion to the camera while walking."
   },
   "app.settings.game-options.setting.view-bobbing.label": {
     "message": "View bobbing"
   },
+  "app.settings.game-options.setting.vignette.label": {
+    "message": "Vignette"
+  },
   "app.settings.game-options.setting.voice-volume.label": {
     "message": "Voice and speech"
   },
@@ -2207,6 +2633,12 @@
   "app.settings.game-options.setting.vsync.label": {
     "message": "VSync"
   },
+  "app.settings.game-options.setting.weather-radius.label": {
+    "message": "Weather radius"
+  },
+  "app.settings.game-options.setting.weather-volume.label": {
+    "message": "Weather"
+  },
   "app.settings.game-options.source.disabled.installing-or-updating": {
     "message": "Installing or updating"
   },
@@ -2216,9 +2648,6 @@
   "app.settings.game-options.source.disabled.no-syncable-settings": {
     "message": "No syncable settings found"
   },
-  "app.settings.game-options.source.disabled.running": {
-    "message": "Currently running"
-  },
   "app.settings.game-options.source.disabled.unreadable-options-file": {
     "message": "options.txt could not be read"
   },
@@ -2360,6 +2789,12 @@
   "app.settings.synced-options.creative-hotbars.description": {
     "message": "Use the same saved creative hotbars across your instances."
   },
+  "app.settings.synced-options.edit.no-instances": {
+    "message": "Add an instance before editing synced data."
+  },
+  "app.settings.synced-options.edit.no-synced-data": {
+    "message": "Choose a sync source before editing this setting."
+  },
   "app.settings.synced-options.game-settings": {
     "message": "Sync game options"
   },
@@ -2429,6 +2864,9 @@
   "app.settings.synced-options.game-settings.title": {
     "message": "Game settings"
   },
+  "app.settings.synced-options.game-settings.unavailable-tooltip": {
+    "message": "Choose an instance with an options.txt file before editing game settings."
+  },
   "app.settings.synced-options.game-settings.unsaved-changes": {
     "message": "You have unsaved changes."
   },
diff --git a/apps/app/build.rs b/apps/app/build.rs
index 46c2d2ef8f..f51ea5f0a5 100644
--- a/apps/app/build.rs
+++ b/apps/app/build.rs
@@ -236,6 +236,7 @@ fn main() {
                         "instance_get_synced_option_join_preview",
                         "instance_get_synced_options_overview",
                         "instance_get_global_synced_options",
+                        "instance_get_initialized_synced_options",
                         "instance_set_global_synced_option",
                         "instance_list_game_options_sync_sources",
                         "instance_get_synced_game_options_config",
diff --git a/apps/app/src/api/instance.rs b/apps/app/src/api/instance.rs
index 7273247f73..baccddb5f0 100644
--- a/apps/app/src/api/instance.rs
+++ b/apps/app/src/api/instance.rs
@@ -65,6 +65,7 @@ pub fn init<R: tauri::Runtime>() -> tauri::plugin::TauriPlugin<R> {
             instance_get_synced_option_join_preview,
             instance_get_synced_options_overview,
             instance_get_global_synced_options,
+            instance_get_initialized_synced_options,
             instance_set_global_synced_option,
             instance_list_game_options_sync_sources,
             instance_get_synced_game_options_config,
@@ -847,6 +848,12 @@ pub async fn instance_get_global_synced_options()
     Ok(theseus::instance::get_global_synced_options().await?)
 }
 
+#[tauri::command]
+pub async fn instance_get_initialized_synced_options()
+-> Result<theseus::instance::GlobalSyncedOptions> {
+    Ok(theseus::instance::get_initialized_synced_options().await?)
+}
+
 #[tauri::command]
 pub async fn instance_set_global_synced_option(
     option: InstanceSyncedOption,
@@ -899,13 +906,11 @@ pub async fn instance_preview_local_game_option_changes(
     instance_id: &str,
     request: theseus::instance::UpdateGameSettingsRequest,
 ) -> Result<theseus::instance::GameSettingsEditorState> {
-    Ok(
-        theseus::instance::preview_local_game_option_changes(
-            instance_id,
-            request,
-        )
-        .await?,
+    Ok(theseus::instance::preview_local_game_option_changes(
+        instance_id,
+        request,
     )
+    .await?)
 }
 
 #[tauri::command]
@@ -914,11 +919,8 @@ pub async fn instance_save_local_game_option_changes(
     request: theseus::instance::UpdateGameSettingsRequest,
 ) -> Result<theseus::instance::SaveGameSettingsResult> {
     Ok(
-        theseus::instance::save_local_game_option_changes(
-            instance_id,
-            request,
-        )
-        .await?,
+        theseus::instance::save_local_game_option_changes(instance_id, request)
+            .await?,
     )
 }
 
diff --git a/packages/app-lib/src/api/instance.rs b/packages/app-lib/src/api/instance.rs
index 7b7f198c07..107e98f306 100644
--- a/packages/app-lib/src/api/instance.rs
+++ b/packages/app-lib/src/api/instance.rs
@@ -105,10 +105,10 @@ pub use self::synced_options::game_options::{
     get_config as get_synced_game_options_config,
     get_local_config as get_local_game_options_config,
     list_sync_sources as list_game_options_sync_sources,
-    preview_local_changes as preview_local_game_option_changes,
     preview_changes as preview_synced_game_option_changes,
-    save_local_changes as save_local_game_option_changes,
+    preview_local_changes as preview_local_game_option_changes,
     save_changes as save_synced_game_option_changes,
+    save_local_changes as save_local_game_option_changes,
     sync_before_launch as sync_game_options_before_launch,
 };
 pub(crate) use self::synced_options::game_options::{
@@ -120,6 +120,7 @@ pub use self::synced_options::{
     SyncedOptionJoinPreview, SyncedOptionJoinResolution, SyncedOptionsOverview,
     get_capabilities as get_synced_option_capabilities, get_command_history,
     get_global_options as get_global_synced_options,
+    get_initialized_options as get_initialized_synced_options,
     get_instance_option_join_preview as get_synced_option_join_preview,
     get_overview as get_synced_options_overview, get_synced_options_folder,
     set_command_history, set_global_option as set_global_synced_option,
diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/catalog/accessibility.rs b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/accessibility.rs
index d6b5a4c8e4..a4a99128f0 100644
--- a/packages/app-lib/src/api/instance/synced_options/game_options/catalog/accessibility.rs
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/accessibility.rs
@@ -1,43 +1,56 @@
-use super::{BOOL, SettingEditor, SupportedSetting, ValueEncoding, setting};
+use super::{
+    BOOL, SettingEditor, SupportedSetting, UNIT_INTERVAL, ValueEncoding,
+    ranged_setting, version_changes, versioned_setting,
+};
 
 const NARRATOR: &[&str] = &["0", "1", "2", "3"];
 
 pub(super) const SETTINGS: &[SupportedSetting] = &[
-    setting(
+    ranged_setting(
         "narrator",
         &["narrator"],
+        "1.12",
+        "26.3",
         "accessibility",
         true,
         SettingEditor::Enum(NARRATOR),
         ValueEncoding::Enum(NARRATOR),
     ),
-    setting(
+    ranged_setting(
         "subtitles",
         &["showSubtitles"],
+        "1.9",
+        "26.3",
         "accessibility",
         true,
         BOOL,
         ValueEncoding::Bool,
     ),
-    setting(
+    ranged_setting(
         "high_contrast",
         &["highContrast"],
+        "1.19.4",
+        "26.3",
         "accessibility",
         true,
         BOOL,
         ValueEncoding::Bool,
     ),
-    setting(
+    ranged_setting(
         "dark_splash",
         &["darkMojangStudiosBackground"],
+        "1.17",
+        "26.3",
         "accessibility",
         true,
         BOOL,
         ValueEncoding::Bool,
     ),
-    setting(
+    ranged_setting(
         "notification_time",
         &["notificationDisplayTime"],
+        "1.19.4",
+        "26.3",
         "accessibility",
         true,
         SettingEditor::Decimal {
@@ -48,4 +61,147 @@ pub(super) const SETTINGS: &[SupportedSetting] = &[
         },
         ValueEncoding::Decimal,
     ),
+    ranged_setting(
+        "fov_effects",
+        &["fovEffectScale"],
+        "1.16.2",
+        "26.3",
+        "accessibility",
+        true,
+        UNIT_INTERVAL,
+        ValueEncoding::Decimal,
+    ),
+    ranged_setting(
+        "screen_effects",
+        &["screenEffectScale"],
+        "1.16.2",
+        "26.3",
+        "accessibility",
+        true,
+        UNIT_INTERVAL,
+        ValueEncoding::Decimal,
+    ),
+    ranged_setting(
+        "darkness_pulsing",
+        &["darknessEffectScale"],
+        "1.19",
+        "26.3",
+        "accessibility",
+        true,
+        UNIT_INTERVAL,
+        ValueEncoding::Decimal,
+    ),
+    ranged_setting(
+        "damage_tilt",
+        &["damageTiltStrength"],
+        "1.19.4",
+        "26.3",
+        "accessibility",
+        true,
+        UNIT_INTERVAL,
+        ValueEncoding::Decimal,
+    ),
+    ranged_setting(
+        "glint_speed",
+        &["glintSpeed"],
+        "1.19.4",
+        "26.3",
+        "accessibility",
+        true,
+        UNIT_INTERVAL,
+        ValueEncoding::Decimal,
+    ),
+    ranged_setting(
+        "glint_strength",
+        &["glintStrength"],
+        "1.19.4",
+        "26.3",
+        "accessibility",
+        true,
+        UNIT_INTERVAL,
+        ValueEncoding::Decimal,
+    ),
+    ranged_setting(
+        "hide_lightning_flashes",
+        &["hideLightningFlashes"],
+        "1.18",
+        "26.3",
+        "accessibility",
+        true,
+        BOOL,
+        ValueEncoding::Bool,
+    ),
+    ranged_setting(
+        "hide_splash_texts",
+        &["hideSplashTexts"],
+        "1.20.3",
+        "26.3",
+        "accessibility",
+        true,
+        BOOL,
+        ValueEncoding::Bool,
+    ),
+    ranged_setting(
+        "high_contrast_outline",
+        &["highContrastBlockOutline"],
+        "1.21.2",
+        "26.3",
+        "accessibility",
+        true,
+        BOOL,
+        ValueEncoding::Bool,
+    ),
+    ranged_setting(
+        "narrator_hotkey",
+        &["narratorHotkey"],
+        "1.20.2",
+        "26.3",
+        "accessibility",
+        true,
+        BOOL,
+        ValueEncoding::Bool,
+    ),
+    ranged_setting(
+        "autosave_indicator",
+        &["showAutosaveIndicator"],
+        "1.18",
+        "26.3",
+        "accessibility",
+        true,
+        BOOL,
+        ValueEncoding::Bool,
+    ),
+    ranged_setting(
+        "panorama_speed",
+        &["panoramaScrollSpeed"],
+        "1.19.3",
+        "26.3",
+        "accessibility",
+        true,
+        UNIT_INTERVAL,
+        ValueEncoding::Decimal,
+    ),
+    versioned_setting(
+        "menu_background_blur",
+        &["menuBackgroundBlurriness"],
+        version_changes::MENU_BACKGROUND_BLUR_KEYS,
+        "accessibility",
+        true,
+        SettingEditor::Integer {
+            min: 0,
+            max: 10,
+            step: 1,
+        },
+        ValueEncoding::MenuBackgroundBlur,
+    ),
+    ranged_setting(
+        "rotate_with_minecart",
+        &["rotateWithMinecart"],
+        "1.21.2",
+        "26.3",
+        "accessibility",
+        true,
+        BOOL,
+        ValueEncoding::Bool,
+    ),
 ];
diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/catalog/chat.rs b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/chat.rs
index cb8e91b337..f8d161f586 100644
--- a/packages/app-lib/src/api/instance/synced_options/game_options/catalog/chat.rs
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/chat.rs
@@ -1,57 +1,194 @@
 use super::{
     BOOL, SettingEditor, SupportedSetting, UNIT_INTERVAL, ValueEncoding,
-    setting,
+    ranged_setting, version_changes, versioned_setting,
 };
 
 const VISIBILITY: &[&str] = &["0", "1", "2"];
+const CHAT_PREVIEW: &[&str] = &["0", "1", "2"];
 
 pub(super) const SETTINGS: &[SupportedSetting] = &[
-    setting(
+    ranged_setting(
         "chat_visibility",
         &["chatVisibility"],
+        "1.3.1",
+        "26.3",
         "chat",
         true,
         SettingEditor::Enum(VISIBILITY),
         ValueEncoding::Enum(VISIBILITY),
     ),
-    setting(
+    ranged_setting(
         "chat_colors",
         &["chatColors"],
+        "1.3.1",
+        "26.3",
         "chat",
         true,
         BOOL,
         ValueEncoding::Bool,
     ),
-    setting(
+    ranged_setting(
         "chat_links",
         &["chatLinks"],
+        "1.3.1",
+        "26.3",
         "chat",
         true,
         BOOL,
         ValueEncoding::Bool,
     ),
-    setting(
+    ranged_setting(
         "chat_links_prompt",
         &["chatLinksPrompt"],
+        "1.3.1",
+        "26.3",
         "chat",
         true,
         BOOL,
         ValueEncoding::Bool,
     ),
-    setting(
+    ranged_setting(
         "chat_opacity",
         &["chatOpacity"],
+        "1.3.1",
+        "26.3",
         "chat",
         true,
         UNIT_INTERVAL,
         ValueEncoding::Decimal,
     ),
-    setting(
+    ranged_setting(
         "chat_scale",
         &["chatScale"],
+        "1.5.1",
+        "26.3",
         "chat",
         true,
         UNIT_INTERVAL,
         ValueEncoding::Decimal,
     ),
+    ranged_setting(
+        "chat_width",
+        &["chatWidth"],
+        "1.5.1",
+        "26.3",
+        "chat",
+        true,
+        UNIT_INTERVAL,
+        ValueEncoding::Decimal,
+    ),
+    ranged_setting(
+        "focused_chat_height",
+        &["chatHeightFocused"],
+        "1.5.1",
+        "26.3",
+        "chat",
+        true,
+        UNIT_INTERVAL,
+        ValueEncoding::Decimal,
+    ),
+    ranged_setting(
+        "unfocused_chat_height",
+        &["chatHeightUnfocused"],
+        "1.5.1",
+        "26.3",
+        "chat",
+        true,
+        UNIT_INTERVAL,
+        ValueEncoding::Decimal,
+    ),
+    ranged_setting(
+        "chat_line_spacing",
+        &["chatLineSpacing"],
+        "1.16",
+        "26.3",
+        "chat",
+        true,
+        UNIT_INTERVAL,
+        ValueEncoding::Decimal,
+    ),
+    ranged_setting(
+        "chat_delay",
+        &["chatDelay"],
+        "1.16",
+        "26.3",
+        "chat",
+        true,
+        SettingEditor::Decimal {
+            min: 0.0,
+            max: 6.0,
+            step: 0.1,
+            unit: Some("seconds"),
+        },
+        ValueEncoding::Decimal,
+    ),
+    ranged_setting(
+        "text_background_opacity",
+        &["textBackgroundOpacity"],
+        "1.14",
+        "26.3",
+        "chat",
+        true,
+        UNIT_INTERVAL,
+        ValueEncoding::Decimal,
+    ),
+    ranged_setting(
+        "chat_background_only",
+        &["backgroundForChatOnly"],
+        "1.14",
+        "26.3",
+        "chat",
+        true,
+        BOOL,
+        ValueEncoding::Bool,
+    ),
+    ranged_setting(
+        "auto_suggestions",
+        &["autoSuggestions"],
+        "1.13",
+        "26.3",
+        "chat",
+        true,
+        BOOL,
+        ValueEncoding::Bool,
+    ),
+    ranged_setting(
+        "secure_chat_only",
+        &["onlyShowSecureChat"],
+        "1.19",
+        "26.3",
+        "chat",
+        true,
+        BOOL,
+        ValueEncoding::Bool,
+    ),
+    ranged_setting(
+        "save_chat_drafts",
+        &["saveChatDrafts"],
+        "1.21.9",
+        "26.3",
+        "chat",
+        true,
+        BOOL,
+        ValueEncoding::Bool,
+    ),
+    ranged_setting(
+        "hide_matched_names",
+        &["hideMatchedNames"],
+        "1.16.4",
+        "26.3",
+        "chat",
+        true,
+        BOOL,
+        ValueEncoding::Bool,
+    ),
+    versioned_setting(
+        "chat_preview",
+        &["chatPreview"],
+        version_changes::CHAT_PREVIEW_KEYS,
+        "chat",
+        true,
+        SettingEditor::Enum(CHAT_PREVIEW),
+        ValueEncoding::ChatPreview,
+    ),
 ];
diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/catalog/controls.rs b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/controls.rs
index 2d7d3f8289..9e996c15d8 100644
--- a/packages/app-lib/src/api/instance/synced_options/game_options/catalog/controls.rs
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/controls.rs
@@ -1,8 +1,23 @@
 use super::{
-    BOOL, SettingEditor, SupportedSetting, ValueEncoding, setting,
-    version_changes, versioned_setting,
+    BOOL, SettingEditor, SupportedSetting, ValueEncoding, ranged_setting,
+    setting, version_changes, versioned_setting,
 };
 
+macro_rules! key_setting {
+    ($id:literal, $key:literal, $since:literal, $until:literal) => {
+        ranged_setting(
+            $id,
+            &[$key],
+            $since,
+            $until,
+            "controls",
+            true,
+            SettingEditor::KeyBinding,
+            ValueEncoding::KeyBinding,
+        )
+    };
+}
+
 pub(super) const SETTINGS: &[SupportedSetting] = &[
     setting(
         "sensitivity",
@@ -25,102 +40,164 @@ pub(super) const SETTINGS: &[SupportedSetting] = &[
         BOOL,
         ValueEncoding::Bool,
     ),
-    setting(
+    ranged_setting(
+        "invert_horizontal_mouse",
+        &["invertXMouse"],
+        "1.21.9",
+        "26.3",
+        "controls",
+        true,
+        BOOL,
+        ValueEncoding::Bool,
+    ),
+    ranged_setting(
         "auto_jump",
         &["autoJump"],
+        "1.10",
+        "26.3",
         "controls",
         true,
         BOOL,
         ValueEncoding::Bool,
     ),
-    setting(
+    ranged_setting(
         "toggle_crouch",
         &["toggleCrouch"],
+        "1.15",
+        "26.3",
         "controls",
         true,
         BOOL,
         ValueEncoding::Bool,
     ),
-    setting(
+    ranged_setting(
         "toggle_sprint",
         &["toggleSprint"],
+        "1.15",
+        "26.3",
         "controls",
         true,
         BOOL,
         ValueEncoding::Bool,
     ),
-    setting(
-        "discrete_mouse_scroll",
-        &["discrete_mouse_scroll"],
+    ranged_setting(
+        "toggle_attack",
+        &["toggleAttack"],
+        "1.21.9",
+        "26.3",
         "controls",
         true,
         BOOL,
         ValueEncoding::Bool,
     ),
-    setting(
-        "key.forward",
-        &["key_key.forward"],
+    ranged_setting(
+        "toggle_use",
+        &["toggleUse"],
+        "1.21.9",
+        "26.3",
         "controls",
         true,
-        SettingEditor::KeyBinding,
-        ValueEncoding::KeyBinding,
+        BOOL,
+        ValueEncoding::Bool,
     ),
-    setting(
-        "key.left",
-        &["key_key.left"],
+    ranged_setting(
+        "discrete_mouse_scroll",
+        &["discrete_mouse_scroll"],
+        "1.14",
+        "26.3",
         "controls",
         true,
-        SettingEditor::KeyBinding,
-        ValueEncoding::KeyBinding,
+        BOOL,
+        ValueEncoding::Bool,
     ),
-    setting(
-        "key.back",
-        &["key_key.back"],
+    ranged_setting(
+        "mouse_wheel_sensitivity",
+        &["mouseWheelSensitivity"],
+        "1.13",
+        "26.3",
         "controls",
         true,
-        SettingEditor::KeyBinding,
-        ValueEncoding::KeyBinding,
+        SettingEditor::UnboundedDecimal,
+        ValueEncoding::Decimal,
     ),
-    setting(
-        "key.right",
-        &["key_key.right"],
+    ranged_setting(
+        "raw_mouse_input",
+        &["rawMouseInput"],
+        "1.14.4",
+        "26.2",
         "controls",
-        true,
-        SettingEditor::KeyBinding,
-        ValueEncoding::KeyBinding,
+        false,
+        BOOL,
+        ValueEncoding::Bool,
     ),
-    setting(
-        "key.jump",
-        &["key_key.jump"],
+    ranged_setting(
+        "touchscreen",
+        &["touchscreen"],
+        "1.4.4",
+        "26.1.2",
         "controls",
-        true,
-        SettingEditor::KeyBinding,
-        ValueEncoding::KeyBinding,
+        false,
+        BOOL,
+        ValueEncoding::Bool,
     ),
-    setting(
-        "key.sneak",
-        &["key_key.sneak"],
+    ranged_setting(
+        "allow_cursor_changes",
+        &["allowCursorChanges"],
+        "1.21.9",
+        "26.3",
         "controls",
         true,
-        SettingEditor::KeyBinding,
-        ValueEncoding::KeyBinding,
+        BOOL,
+        ValueEncoding::Bool,
     ),
-    setting(
-        "key.sprint",
-        &["key_key.sprint"],
+    ranged_setting(
+        "sprint_window",
+        &["sprintWindow"],
+        "1.21.9",
+        "26.3",
         "controls",
         true,
-        SettingEditor::KeyBinding,
-        ValueEncoding::KeyBinding,
+        SettingEditor::UnboundedInteger,
+        ValueEncoding::Integer,
     ),
-    setting(
-        "key.inventory",
-        &["key_key.inventory"],
+    ranged_setting(
+        "operator_items_tab",
+        &["operatorItemsTab"],
+        "1.19.3",
+        "26.3",
         "controls",
         true,
-        SettingEditor::KeyBinding,
-        ValueEncoding::KeyBinding,
+        BOOL,
+        ValueEncoding::Bool,
+    ),
+    ranged_setting(
+        "ctrl_click_right_click",
+        &["ctrlClickEmulatesRightClick"],
+        "26.3",
+        "26.3",
+        "controls",
+        false,
+        BOOL,
+        ValueEncoding::Bool,
+    ),
+    ranged_setting(
+        "quit_shortcuts",
+        &["quitShortcuts"],
+        "26.3",
+        "26.3",
+        "controls",
+        false,
+        BOOL,
+        ValueEncoding::Bool,
     ),
+    key_setting!("key.forward", "key_key.forward", "1.0", "26.3"),
+    key_setting!("key.left", "key_key.left", "1.0", "26.3"),
+    key_setting!("key.back", "key_key.back", "1.0", "26.3"),
+    key_setting!("key.right", "key_key.right", "1.0", "26.3"),
+    key_setting!("key.jump", "key_key.jump", "1.0", "26.3"),
+    key_setting!("key.sneak", "key_key.sneak", "1.0", "26.3"),
+    key_setting!("key.sprint", "key_key.sprint", "1.7.2", "26.3"),
+    key_setting!("key.inventory", "key_key.inventory", "1.0", "26.3"),
     versioned_setting(
         "key.swap_offhand",
         &["key_key.swapOffhand", "key_key.swapHands"],
@@ -130,92 +207,207 @@ pub(super) const SETTINGS: &[SupportedSetting] = &[
         SettingEditor::KeyBinding,
         ValueEncoding::KeyBinding,
     ),
-    setting(
-        "key.drop",
-        &["key_key.drop"],
-        "controls",
-        true,
-        SettingEditor::KeyBinding,
-        ValueEncoding::KeyBinding,
+    key_setting!("key.drop", "key_key.drop", "1.0", "26.3"),
+    key_setting!("key.use", "key_key.use", "1.0", "26.3"),
+    key_setting!("key.attack", "key_key.attack", "1.0", "26.3"),
+    key_setting!("key.pick_item", "key_key.pickItem", "1.0", "26.3"),
+    key_setting!("key.chat", "key_key.chat", "1.0", "26.3"),
+    key_setting!("key.player_list", "key_key.playerlist", "1.0", "26.3"),
+    key_setting!("key.command", "key_key.command", "1.3.1", "26.3"),
+    key_setting!("key.screenshot", "key_key.screenshot", "1.7.2", "26.3"),
+    key_setting!(
+        "key.perspective",
+        "key_key.togglePerspective",
+        "1.7.2",
+        "26.3"
     ),
-    setting(
-        "key.use",
-        &["key_key.use"],
-        "controls",
-        true,
-        SettingEditor::KeyBinding,
-        ValueEncoding::KeyBinding,
+    key_setting!("key.fullscreen", "key_key.fullscreen", "1.7.3", "26.3"),
+    key_setting!("key.advancements", "key_key.advancements", "1.12", "26.3"),
+    key_setting!("key.smooth_camera", "key_key.smoothCamera", "1.7.2", "26.3"),
+    key_setting!(
+        "key.spectator_outlines",
+        "key_key.spectatorOutlines",
+        "1.8",
+        "26.3"
     ),
-    setting(
-        "key.attack",
-        &["key_key.attack"],
-        "controls",
-        true,
-        SettingEditor::KeyBinding,
-        ValueEncoding::KeyBinding,
+    key_setting!(
+        "key.save_toolbar",
+        "key_key.saveToolbarActivator",
+        "1.12",
+        "26.3"
     ),
-    setting(
-        "key.pick_item",
-        &["key_key.pickItem"],
-        "controls",
-        true,
-        SettingEditor::KeyBinding,
-        ValueEncoding::KeyBinding,
+    key_setting!(
+        "key.load_toolbar",
+        "key_key.loadToolbarActivator",
+        "1.12",
+        "26.3"
     ),
-    setting(
-        "key.chat",
-        &["key_key.chat"],
-        "controls",
-        true,
-        SettingEditor::KeyBinding,
-        ValueEncoding::KeyBinding,
+    key_setting!(
+        "key.social_interactions",
+        "key_key.socialInteractions",
+        "1.16.4",
+        "26.3"
     ),
-    setting(
-        "key.player_list",
-        &["key_key.playerlist"],
-        "controls",
-        true,
-        SettingEditor::KeyBinding,
-        ValueEncoding::KeyBinding,
+    key_setting!(
+        "key.quick_actions",
+        "key_key.quickActions",
+        "1.21.6",
+        "26.3"
     ),
-    setting(
-        "key.command",
-        &["key_key.command"],
-        "controls",
-        true,
-        SettingEditor::KeyBinding,
-        ValueEncoding::KeyBinding,
+    key_setting!(
+        "key.spectator_hotbar",
+        "key_key.spectatorHotbar",
+        "1.21.9",
+        "26.3"
     ),
-    setting(
-        "key.screenshot",
-        &["key_key.screenshot"],
-        "controls",
-        true,
-        SettingEditor::KeyBinding,
-        ValueEncoding::KeyBinding,
+    key_setting!("key.friends", "key_key.friends", "26.2", "26.3"),
+    key_setting!("key.toggle_gui", "key_key.toggleGui", "1.21.11", "26.3"),
+    key_setting!(
+        "key.toggle_spectator_shader",
+        "key_key.toggleSpectatorShaderEffects",
+        "1.21.11",
+        "26.3"
     ),
-    setting(
-        "key.perspective",
-        &["key_key.togglePerspective"],
-        "controls",
-        true,
-        SettingEditor::KeyBinding,
-        ValueEncoding::KeyBinding,
+    key_setting!("key.hotbar.1", "key_key.hotbar.1", "1.7.2", "26.3"),
+    key_setting!("key.hotbar.2", "key_key.hotbar.2", "1.7.2", "26.3"),
+    key_setting!("key.hotbar.3", "key_key.hotbar.3", "1.7.2", "26.3"),
+    key_setting!("key.hotbar.4", "key_key.hotbar.4", "1.7.2", "26.3"),
+    key_setting!("key.hotbar.5", "key_key.hotbar.5", "1.7.2", "26.3"),
+    key_setting!("key.hotbar.6", "key_key.hotbar.6", "1.7.2", "26.3"),
+    key_setting!("key.hotbar.7", "key_key.hotbar.7", "1.7.2", "26.3"),
+    key_setting!("key.hotbar.8", "key_key.hotbar.8", "1.7.2", "26.3"),
+    key_setting!("key.hotbar.9", "key_key.hotbar.9", "1.7.2", "26.3"),
+    key_setting!(
+        "key.debug.overlay",
+        "key_key.debug.overlay",
+        "1.21.11",
+        "26.3"
     ),
-    setting(
-        "key.fullscreen",
-        &["key_key.fullscreen"],
-        "controls",
-        true,
-        SettingEditor::KeyBinding,
-        ValueEncoding::KeyBinding,
+    key_setting!(
+        "key.debug.modifier",
+        "key_key.debug.modifier",
+        "1.21.11",
+        "26.3"
     ),
-    setting(
-        "key.advancements",
-        &["key_key.advancements"],
-        "controls",
-        true,
-        SettingEditor::KeyBinding,
-        ValueEncoding::KeyBinding,
+    key_setting!(
+        "key.debug.reload_chunks",
+        "key_key.debug.reloadChunk",
+        "1.21.11",
+        "26.3"
+    ),
+    key_setting!(
+        "key.debug.hitboxes",
+        "key_key.debug.showHitboxes",
+        "1.21.11",
+        "26.3"
+    ),
+    key_setting!(
+        "key.debug.clear_chat",
+        "key_key.debug.clearChat",
+        "1.21.11",
+        "26.3"
+    ),
+    key_setting!("key.debug.crash", "key_key.debug.crash", "1.21.11", "26.3"),
+    key_setting!(
+        "key.debug.chunk_borders",
+        "key_key.debug.showChunkBorders",
+        "1.21.11",
+        "26.3"
+    ),
+    key_setting!(
+        "key.debug.advanced_tooltips",
+        "key_key.debug.showAdvancedTooltips",
+        "1.21.11",
+        "26.3"
+    ),
+    key_setting!(
+        "key.debug.copy_recreate_command",
+        "key_key.debug.copyRecreateCommand",
+        "1.21.11",
+        "26.3"
+    ),
+    key_setting!(
+        "key.debug.spectate",
+        "key_key.debug.spectate",
+        "1.21.11",
+        "26.3"
+    ),
+    key_setting!(
+        "key.debug.switch_game_mode",
+        "key_key.debug.switchGameMode",
+        "1.21.11",
+        "26.3"
+    ),
+    key_setting!(
+        "key.debug.options",
+        "key_key.debug.debugOptions",
+        "1.21.11",
+        "26.3"
+    ),
+    key_setting!(
+        "key.debug.focus_pause",
+        "key_key.debug.focusPause",
+        "1.21.11",
+        "26.3"
+    ),
+    key_setting!(
+        "key.debug.dump_dynamic_textures",
+        "key_key.debug.dumpDynamicTextures",
+        "1.21.11",
+        "26.3"
+    ),
+    key_setting!(
+        "key.debug.reload_resource_packs",
+        "key_key.debug.reloadResourcePacks",
+        "1.21.11",
+        "26.3"
+    ),
+    key_setting!(
+        "key.debug.profiling",
+        "key_key.debug.profiling",
+        "1.21.11",
+        "26.3"
+    ),
+    key_setting!(
+        "key.debug.copy_location",
+        "key_key.debug.copyLocation",
+        "1.21.11",
+        "26.3"
+    ),
+    key_setting!(
+        "key.debug.dump_version",
+        "key_key.debug.dumpVersion",
+        "1.21.11",
+        "26.3"
+    ),
+    key_setting!(
+        "key.debug.profiling_chart",
+        "key_key.debug.profilingChart",
+        "1.21.11",
+        "26.3"
+    ),
+    key_setting!(
+        "key.debug.fps_charts",
+        "key_key.debug.fpsCharts",
+        "1.21.11",
+        "26.3"
+    ),
+    key_setting!(
+        "key.debug.network_charts",
+        "key_key.debug.networkCharts",
+        "1.21.11",
+        "26.3"
+    ),
+    key_setting!(
+        "key.debug.lightmap_texture",
+        "key_key.debug.lightmapTexture",
+        "26.1",
+        "26.3"
+    ),
+    key_setting!(
+        "key.debug.improved_transparency",
+        "key_key.debug.improvedTransparency",
+        "26.3",
+        "26.3"
     ),
 ];
diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/catalog/known_vanilla_keys.rs b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/known_vanilla_keys.rs
index 9511ac1692..ece5c71fc7 100644
--- a/packages/app-lib/src/api/instance/synced_options/game_options/catalog/known_vanilla_keys.rs
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/known_vanilla_keys.rs
@@ -1,6 +1,6 @@
 // Never treat these Minecraft keys as settings added by mods. NEVER_SYNC_KEYS are
-// not safe to share; KNOWN_VANILLA_KEYS are Minecraft settings the editor does not
-// support yet.
+// not safe or useful to share; KNOWN_VANILLA_KEYS covers the vanilla catalog,
+// including entries that have a dedicated editor.
 pub(super) const NEVER_SYNC_KEYS: &[&str] = &[
     "version",
     "resourcePacks",
@@ -14,16 +14,9 @@ pub(super) const NEVER_SYNC_KEYS: &[&str] = &[
     "fullscreenResolution",
     "overrideWidth",
     "overrideHeight",
-    "preferredGraphicsBackend",
     "difficulty",
-    "snooperEnabled",
-    "touchscreen",
-    "heldItemTooltips",
-    "useVbo",
     "fboEnable",
     "saturation",
-    "anaglyph3d",
-    "advancedOpengl",
     "streamBytesPerPixel",
     "streamMicVolume",
     "streamGameVolume",
@@ -35,15 +28,7 @@ pub(super) const NEVER_SYNC_KEYS: &[&str] = &[
     "streamChatEnabled",
     "streamChatUserFilter",
     "streamMicToggleBehavior",
-    "fpsLimit",
-    "music",
     "skin",
-    "sound",
-    "viewDistance",
-    "anisotropicFiltering",
-    "clouds",
-    "showCape",
-    "allowBlockAlternatives",
     "key_key.streamCommercial",
     "key_key.streamPauseUnpause",
     "key_key.streamStartStop",
@@ -51,9 +36,7 @@ pub(super) const NEVER_SYNC_KEYS: &[&str] = &[
     "streamSystemVolume",
     "showInventoryAchievementHint",
     "enableWeakAttacks",
-    "chatPreview",
     "skipRealms32bitWarning",
-    "showNowPlayingToast",
     "key_Build",
     "key_Load location",
     "key_Save location",
@@ -71,8 +54,6 @@ pub(super) const NEVER_SYNC_KEYS: &[&str] = &[
     "soundCategory_players",
     "soundCategory_records",
     "shieldAnimation",
-    "serverTextures",
-    "rawMouseInput",
 ];
 
 pub(super) const KNOWN_VANILLA_KEYS: &[&str] = &[
@@ -143,7 +124,7 @@ pub(super) const KNOWN_VANILLA_KEYS: &[&str] = &[
     "damageTiltStrength",
     "highContrast",
     "highContrastBlockOutline",
-    "narratorHotKey",
+    "narratorHotkey",
     "resourcePacks",
     "incompatibleResourcePacks",
     "lastServer",
diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/catalog/mod.rs b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/mod.rs
index cc2d87e0b7..5389446c2f 100644
--- a/packages/app-lib/src/api/instance/synced_options/game_options/catalog/mod.rs
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/mod.rs
@@ -23,11 +23,13 @@ pub(in crate::api::instance) use version_changes::*;
 #[derive(Clone, Copy)]
 pub(super) enum SettingEditor {
     Boolean,
+    UnboundedInteger,
     Integer {
         min: i64,
         max: i64,
         step: i64,
     },
+    UnboundedDecimal,
     Decimal {
         min: f64,
         max: f64,
@@ -45,9 +47,14 @@ pub(super) enum ValueEncoding {
     Integer,
     Decimal,
     Enum(&'static [&'static str]),
+    QuotedEnum(&'static [&'static str]),
     Text,
     Graphics,
     AmbientOcclusion,
+    ChatPreview,
+    Clouds,
+    GuiScale,
+    MenuBackgroundBlur,
     MusicToast,
     Fov,
     KeyBinding,
@@ -57,6 +64,10 @@ pub(super) struct SupportedSetting {
     pub(super) id: &'static str,
     pub(super) keys: &'static [&'static str],
     pub(super) versioned_keys: &'static [VersionedKey],
+    /// The README's observed range: versions whose fresh options file contains
+    /// this key. Versioned settings carry the same ranges on each physical key.
+    pub(super) since: &'static str,
+    pub(super) until: &'static str,
     pub(super) category: &'static str,
     pub(super) default_on: bool,
     pub(super) editor: SettingEditor,
@@ -91,6 +102,31 @@ pub(super) const fn setting(
         id,
         keys,
         versioned_keys: &[],
+        since: "1.0",
+        until: "26.3",
+        category,
+        default_on,
+        editor,
+        encoding,
+    }
+}
+
+pub(super) const fn ranged_setting(
+    id: &'static str,
+    keys: &'static [&'static str],
+    since: &'static str,
+    until: &'static str,
+    category: &'static str,
+    default_on: bool,
+    editor: SettingEditor,
+    encoding: ValueEncoding,
+) -> SupportedSetting {
+    SupportedSetting {
+        id,
+        keys,
+        versioned_keys: &[],
+        since,
+        until,
         category,
         default_on,
         editor,
@@ -111,6 +147,8 @@ pub(super) const fn versioned_setting(
         id,
         keys,
         versioned_keys,
+        since: "1.0",
+        until: "26.3",
         category,
         default_on,
         editor,
@@ -128,57 +166,169 @@ const SETTING_GROUPS: &[&[SupportedSetting]] = &[
 ];
 
 const MAIN_HAND: &[&str] = &["left", "right"];
+const SHARE_PRESENCE: &[&str] = &["all", "limited", "none"];
 
 // These settings all use the common value formats above, so they can stay together.
 const GENERAL_SETTINGS: &[SupportedSetting] = &[
-    setting(
+    ranged_setting(
         "main_hand",
         &["mainHand"],
+        "1.9",
+        "26.3",
         "skin_customization",
         true,
         SettingEditor::Enum(MAIN_HAND),
         ValueEncoding::Enum(MAIN_HAND),
     ),
-    setting(
+    versioned_setting(
         "cape",
-        &["modelPart_cape"],
+        &["modelPart_cape", "showCape"],
+        version_changes::CAPE_KEYS,
         "skin_customization",
         true,
         BOOL,
         ValueEncoding::Bool,
     ),
-    setting(
+    ranged_setting(
         "hat",
         &["modelPart_hat"],
+        "1.8",
+        "26.3",
         "skin_customization",
         true,
         BOOL,
         ValueEncoding::Bool,
     ),
-    setting(
+    ranged_setting(
         "jacket",
         &["modelPart_jacket"],
+        "1.8",
+        "26.3",
+        "skin_customization",
+        true,
+        BOOL,
+        ValueEncoding::Bool,
+    ),
+    ranged_setting(
+        "left_sleeve",
+        &["modelPart_left_sleeve"],
+        "1.8",
+        "26.3",
+        "skin_customization",
+        true,
+        BOOL,
+        ValueEncoding::Bool,
+    ),
+    ranged_setting(
+        "right_sleeve",
+        &["modelPart_right_sleeve"],
+        "1.8",
+        "26.3",
+        "skin_customization",
+        true,
+        BOOL,
+        ValueEncoding::Bool,
+    ),
+    ranged_setting(
+        "left_pants_leg",
+        &["modelPart_left_pants_leg"],
+        "1.8",
+        "26.3",
+        "skin_customization",
+        true,
+        BOOL,
+        ValueEncoding::Bool,
+    ),
+    ranged_setting(
+        "right_pants_leg",
+        &["modelPart_right_pants_leg"],
+        "1.8",
+        "26.3",
         "skin_customization",
         true,
         BOOL,
         ValueEncoding::Bool,
     ),
-    setting(
+    ranged_setting(
         "allow_server_listing",
         &["allowServerListing"],
+        "1.18",
+        "26.3",
         "online",
         true,
         BOOL,
         ValueEncoding::Bool,
     ),
-    setting(
+    ranged_setting(
         "realms_notifications",
         &["realmsNotifications"],
+        "1.8.9",
+        "26.3",
         "online",
         true,
         BOOL,
         ValueEncoding::Bool,
     ),
+    ranged_setting(
+        "hide_server_address",
+        &["hideServerAddress"],
+        "1.3.2",
+        "26.3",
+        "online",
+        true,
+        BOOL,
+        ValueEncoding::Bool,
+    ),
+    ranged_setting(
+        "server_textures",
+        &["serverTextures"],
+        "1.3.1",
+        "1.7.5",
+        "online",
+        true,
+        BOOL,
+        ValueEncoding::Bool,
+    ),
+    ranged_setting(
+        "snooper",
+        &["snooperEnabled"],
+        "1.3.1",
+        "1.17.1",
+        "online",
+        true,
+        BOOL,
+        ValueEncoding::Bool,
+    ),
+    ranged_setting(
+        "extra_telemetry",
+        &["telemetryOptInExtra"],
+        "1.19.3",
+        "26.3",
+        "online",
+        true,
+        BOOL,
+        ValueEncoding::Bool,
+    ),
+    ranged_setting(
+        "in_game_notifications",
+        &["inGameNotification"],
+        "26.2",
+        "26.3",
+        "online",
+        true,
+        BOOL,
+        ValueEncoding::Bool,
+    ),
+    ranged_setting(
+        "share_presence",
+        &["sharePresence"],
+        "26.2",
+        "26.3",
+        "online",
+        true,
+        SettingEditor::Enum(SHARE_PRESENCE),
+        ValueEncoding::QuotedEnum(SHARE_PRESENCE),
+    ),
 ];
 
 pub(super) fn all_supported_settings()
@@ -198,6 +348,34 @@ pub(super) fn setting_by_file_key(
     all_supported_settings().find(|setting| setting.keys.contains(&key))
 }
 
+pub(super) fn setting_available_for_version(
+    setting: &SupportedSetting,
+    version: &str,
+) -> bool {
+    if !setting.versioned_keys.is_empty() {
+        return physical_variant_for_version(setting, version).is_some();
+    }
+    let Some(version) = release_version(version) else {
+        return false;
+    };
+    release_version(setting.since).is_some_and(|since| since <= version)
+        && release_version(setting.until).is_some_and(|until| version <= until)
+}
+
+pub(super) fn target_key_for_version<'a>(
+    setting: &'a SupportedSetting,
+    version: &str,
+) -> Option<&'a str> {
+    if setting.versioned_keys.is_empty() {
+        setting_available_for_version(setting, version)
+            .then(|| setting.keys.first().copied())
+            .flatten()
+    } else {
+        physical_variant_for_version(setting, version)
+            .map(|variant| variant.key)
+    }
+}
+
 pub(super) fn is_never_sync_key(key: &str) -> bool {
     NEVER_SYNC_KEYS.contains(&key)
         || KNOWN_VANILLA_KEYS.contains(&key)
@@ -219,12 +397,20 @@ pub(super) fn editor_for(
     };
     match setting.editor {
         SettingEditor::Boolean => editor.type_ = "bool".to_string(),
+        SettingEditor::UnboundedInteger => {
+            editor.type_ = "integer".to_string();
+            editor.step = Some(1.0);
+        }
         SettingEditor::Integer { min, max, step } => {
             editor.type_ = "integer".to_string();
             editor.min = Some(min as f64);
             editor.max = Some(max as f64);
             editor.step = Some(step as f64);
         }
+        SettingEditor::UnboundedDecimal => {
+            editor.type_ = "decimal".to_string();
+            editor.step = Some(0.01);
+        }
         SettingEditor::Decimal {
             min,
             max,
diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/catalog/sound.rs b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/sound.rs
index 0b4ae4a267..30774dfe3e 100644
--- a/packages/app-lib/src/api/instance/synced_options/game_options/catalog/sound.rs
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/sound.rs
@@ -1,34 +1,51 @@
 use super::{
-    SettingEditor, SupportedSetting, UNIT_INTERVAL, ValueEncoding, setting,
-    version_changes, versioned_setting,
+    BOOL, SettingEditor, SupportedSetting, UNIT_INTERVAL, ValueEncoding,
+    ranged_setting, version_changes, versioned_setting,
 };
 
 const MUSIC_TOAST: &[&str] = &["never", "pause", "pause_and_toast"];
+const MUSIC_FREQUENCY: &[&str] = &["CONSTANT", "DEFAULT", "FREQUENT"];
 
 pub(super) const SETTINGS: &[SupportedSetting] = &[
-    setting(
+    ranged_setting(
         "language",
         &["lang"],
+        "1.1",
+        "26.3",
         "language",
         true,
         SettingEditor::Language,
         ValueEncoding::Text,
     ),
-    setting(
-        "master_volume",
-        &["soundCategory_master"],
-        "music_and_sound",
+    ranged_setting(
+        "force_unicode_font",
+        &["forceUnicodeFont"],
+        "1.7.2",
+        "26.3",
+        "language",
         true,
-        UNIT_INTERVAL,
-        ValueEncoding::Decimal,
+        BOOL,
+        ValueEncoding::Bool,
     ),
-    setting(
-        "music_volume",
-        &["soundCategory_music"],
+    ranged_setting(
+        "japanese_glyph_variants",
+        &["japaneseGlyphVariants"],
+        "1.20.5",
+        "26.3",
+        "language",
+        true,
+        BOOL,
+        ValueEncoding::Bool,
+    ),
+    ranged_setting(
+        "directional_audio",
+        &["directionalAudio"],
+        "1.19",
+        "26.3",
         "music_and_sound",
         true,
-        UNIT_INTERVAL,
-        ValueEncoding::Decimal,
+        BOOL,
+        ValueEncoding::Bool,
     ),
     versioned_setting(
         "music_toast",
@@ -39,73 +56,119 @@ pub(super) const SETTINGS: &[SupportedSetting] = &[
         SettingEditor::Enum(MUSIC_TOAST),
         ValueEncoding::MusicToast,
     ),
-    setting(
+    ranged_setting(
+        "music_frequency",
+        &["musicFrequency"],
+        "1.21.6",
+        "26.3",
+        "music_and_sound",
+        true,
+        SettingEditor::Enum(MUSIC_FREQUENCY),
+        ValueEncoding::QuotedEnum(MUSIC_FREQUENCY),
+    ),
+    versioned_setting(
+        "master_volume",
+        &["soundCategory_master", "sound"],
+        version_changes::MASTER_VOLUME_KEYS,
+        "music_and_sound",
+        true,
+        UNIT_INTERVAL,
+        ValueEncoding::Decimal,
+    ),
+    versioned_setting(
+        "music_volume",
+        &["soundCategory_music", "music"],
+        version_changes::MUSIC_VOLUME_KEYS,
+        "music_and_sound",
+        true,
+        UNIT_INTERVAL,
+        ValueEncoding::Decimal,
+    ),
+    ranged_setting(
         "record_volume",
         &["soundCategory_record"],
+        "1.7.2",
+        "26.3",
         "music_and_sound",
         true,
         UNIT_INTERVAL,
         ValueEncoding::Decimal,
     ),
-    setting(
+    ranged_setting(
         "weather_volume",
         &["soundCategory_weather"],
+        "1.7.2",
+        "26.3",
         "music_and_sound",
         true,
         UNIT_INTERVAL,
         ValueEncoding::Decimal,
     ),
-    setting(
+    ranged_setting(
         "blocks_volume",
         &["soundCategory_block"],
+        "1.7.2",
+        "26.3",
         "music_and_sound",
         true,
         UNIT_INTERVAL,
         ValueEncoding::Decimal,
     ),
-    setting(
+    ranged_setting(
         "hostile_volume",
         &["soundCategory_hostile"],
+        "1.7.2",
+        "26.3",
         "music_and_sound",
         true,
         UNIT_INTERVAL,
         ValueEncoding::Decimal,
     ),
-    setting(
+    ranged_setting(
         "neutral_volume",
         &["soundCategory_neutral"],
+        "1.7.2",
+        "26.3",
         "music_and_sound",
         true,
         UNIT_INTERVAL,
         ValueEncoding::Decimal,
     ),
-    setting(
+    ranged_setting(
         "players_volume",
         &["soundCategory_player"],
+        "1.7.2",
+        "26.3",
         "music_and_sound",
         true,
         UNIT_INTERVAL,
         ValueEncoding::Decimal,
     ),
-    setting(
+    ranged_setting(
         "ambient_volume",
         &["soundCategory_ambient"],
+        "1.7.2",
+        "26.3",
         "music_and_sound",
         true,
         UNIT_INTERVAL,
         ValueEncoding::Decimal,
     ),
-    setting(
+    ranged_setting(
         "voice_volume",
         &["soundCategory_voice"],
+        "1.9",
+        "26.3",
         "music_and_sound",
         true,
         UNIT_INTERVAL,
         ValueEncoding::Decimal,
     ),
-    setting(
+    ranged_setting(
         "ui_volume",
         &["soundCategory_ui"],
+        "1.21.6",
+        "26.3",
         "music_and_sound",
         true,
         UNIT_INTERVAL,
diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/catalog/version_changes.rs b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/version_changes.rs
index a9efcebc02..1d81cc00df 100644
--- a/packages/app-lib/src/api/instance/synced_options/game_options/catalog/version_changes.rs
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/version_changes.rs
@@ -7,10 +7,12 @@ use super::super::options_file::{
 use super::{
     GameOptionMappingKind, LEGACY_KEY_BINDINGS, SettingEditor,
     SupportedSetting, ValueEncoding, VersionedKey,
+    setting_available_for_version,
 };
 use crate::state::{CanonicalValue, StoredOption};
 
 const GRAPHICS_VALUES: &[&str] = &["fast", "fancy", "fabulous", "custom"];
+const CLOUD_VALUES: &[&str] = &["false", "fast", "true"];
 const MUSIC_TOAST_VALUES: &[&str] = &["never", "pause", "pause_and_toast"];
 
 fn decode_string_token(raw: &str) -> Option<String> {
@@ -29,7 +31,7 @@ pub(in crate::api::instance) const GRAPHICS_KEYS: &[VersionedKey] = &[
     VersionedKey {
         key: "fancyGraphics",
         since: "1.0",
-        until: "1.16.1",
+        until: "1.15.2",
         mapping: GameOptionMappingKind::Legacy,
     },
     VersionedKey {
@@ -50,15 +52,133 @@ pub(in crate::api::instance) const AMBIENT_OCCLUSION_KEYS: &[VersionedKey] = &[
     VersionedKey {
         key: "ao",
         since: "1.0",
-        until: "1.19.3",
+        until: "1.4.7",
+        mapping: GameOptionMappingKind::Legacy,
+    },
+    VersionedKey {
+        key: "ao",
+        since: "1.5.1",
+        until: "1.19.2",
         mapping: GameOptionMappingKind::Legacy,
     },
     VersionedKey {
         key: "ao",
-        since: "1.19.4",
+        since: "1.19.3",
         until: "26.3",
+        mapping: GameOptionMappingKind::Direct,
+    },
+];
+
+pub(in crate::api::instance) const FOV_KEYS: &[VersionedKey] = &[
+    VersionedKey {
+        key: "fov",
+        since: "1.0",
+        until: "1.18.2",
+        mapping: GameOptionMappingKind::Legacy,
+    },
+    VersionedKey {
+        key: "fov",
+        since: "1.19",
+        until: "26.3",
+        mapping: GameOptionMappingKind::Direct,
+    },
+];
+
+pub(in crate::api::instance) const CLOUD_KEYS: &[VersionedKey] = &[
+    VersionedKey {
+        key: "clouds",
+        since: "1.0",
+        until: "1.7.10",
+        mapping: GameOptionMappingKind::Legacy,
+    },
+    VersionedKey {
+        key: "renderClouds",
+        since: "1.8",
+        until: "1.8",
         mapping: GameOptionMappingKind::Migrated,
     },
+    VersionedKey {
+        key: "renderClouds",
+        since: "1.8.1",
+        until: "26.3",
+        mapping: GameOptionMappingKind::Direct,
+    },
+];
+
+pub(in crate::api::instance) const CHAT_PREVIEW_KEYS: &[VersionedKey] = &[
+    VersionedKey {
+        key: "chatPreview",
+        since: "1.19",
+        until: "1.19",
+        mapping: GameOptionMappingKind::Legacy,
+    },
+    VersionedKey {
+        key: "chatPreview",
+        since: "1.19.1",
+        until: "1.19.2",
+        mapping: GameOptionMappingKind::Direct,
+    },
+];
+
+pub(in crate::api::instance) const MENU_BACKGROUND_BLUR_KEYS:
+    &[VersionedKey] = &[
+    VersionedKey {
+        key: "menuBackgroundBlurriness",
+        since: "1.20.5",
+        until: "1.20.6",
+        mapping: GameOptionMappingKind::Legacy,
+    },
+    VersionedKey {
+        key: "menuBackgroundBlurriness",
+        since: "1.21",
+        until: "26.3",
+        mapping: GameOptionMappingKind::Direct,
+    },
+];
+
+pub(in crate::api::instance) const MASTER_VOLUME_KEYS: &[VersionedKey] = &[
+    VersionedKey {
+        key: "sound",
+        since: "1.0",
+        until: "1.6.4",
+        mapping: GameOptionMappingKind::Legacy,
+    },
+    VersionedKey {
+        key: "soundCategory_master",
+        since: "1.7.2",
+        until: "26.3",
+        mapping: GameOptionMappingKind::Direct,
+    },
+];
+
+pub(in crate::api::instance) const MUSIC_VOLUME_KEYS: &[VersionedKey] = &[
+    VersionedKey {
+        key: "music",
+        since: "1.0",
+        until: "1.6.4",
+        mapping: GameOptionMappingKind::Legacy,
+    },
+    VersionedKey {
+        key: "soundCategory_music",
+        since: "1.7.2",
+        until: "26.3",
+        mapping: GameOptionMappingKind::Direct,
+    },
+];
+
+pub(in crate::api::instance) const CAPE_KEYS: &[VersionedKey] = &[
+    VersionedKey {
+        key: "showCape",
+        since: "1.4.2",
+        until: "1.7.10",
+        mapping: GameOptionMappingKind::Legacy,
+    },
+    VersionedKey {
+        key: "modelPart_cape",
+        since: "1.8",
+        until: "26.3",
+        mapping: GameOptionMappingKind::Direct,
+    },
 ];
 
 pub(in crate::api::instance) const MUSIC_TOAST_KEYS: &[VersionedKey] = &[
@@ -79,7 +199,7 @@ pub(in crate::api::instance) const MUSIC_TOAST_KEYS: &[VersionedKey] = &[
 pub(in crate::api::instance) const SWAP_OFFHAND_KEYS: &[VersionedKey] = &[
     VersionedKey {
         key: "key_key.swapHands",
-        since: "1.0",
+        since: "1.9",
         until: "1.15.2",
         mapping: GameOptionMappingKind::Legacy,
     },
@@ -273,6 +393,12 @@ pub(in crate::api::instance) fn decode_value(
                 .contains(&value.as_str())
                 .then(|| CanonicalValue::Enum(value))
         }
+        ValueEncoding::QuotedEnum(choices) => {
+            let value = decode_string_token(raw)?;
+            choices
+                .contains(&value.as_str())
+                .then(|| CanonicalValue::Enum(value))
+        }
         ValueEncoding::Text => Some(CanonicalValue::Text(raw.to_string())),
         ValueEncoding::KeyBinding => {
             if valid_modern_key_binding(raw) {
@@ -282,12 +408,23 @@ pub(in crate::api::instance) fn decode_value(
             }
         }
         ValueEncoding::Fov => raw.parse::<f64>().ok().and_then(|value| {
+            if value.fract() == 0.0 && (30.0..=110.0).contains(&value) {
+                return Some(CanonicalValue::Integer(value as i64));
+            }
             let degrees = value * 40.0 + 70.0;
             (value.is_finite()
                 && (-1.0..=1.0).contains(&value)
                 && (degrees - degrees.round()).abs() <= 0.000_001)
                 .then(|| CanonicalValue::Integer(degrees.round() as i64))
         }),
+        ValueEncoding::GuiScale => {
+            raw.parse::<i64>().ok().map(CanonicalValue::Integer)
+        }
+        ValueEncoding::MenuBackgroundBlur => raw
+            .parse::<f64>()
+            .ok()
+            .filter(|value| value.is_finite() && value.fract() == 0.0)
+            .map(|value| CanonicalValue::Integer(value as i64)),
         ValueEncoding::Graphics => {
             let raw = decode_string_token(raw)?;
             let value = match physical_key {
@@ -319,6 +456,21 @@ pub(in crate::api::instance) fn decode_value(
             };
             Some(CanonicalValue::Enum(value.to_string()))
         }
+        ValueEncoding::ChatPreview => {
+            let value = match raw {
+                "false" | "0" => "0",
+                "1" => "1",
+                "true" | "2" => "2",
+                _ => return None,
+            };
+            Some(CanonicalValue::Enum(value.to_string()))
+        }
+        ValueEncoding::Clouds => {
+            let raw = decode_string_token(raw)?;
+            CLOUD_VALUES
+                .contains(&raw.as_str())
+                .then(|| CanonicalValue::Enum(raw))
+        }
         ValueEncoding::MusicToast => {
             let raw = decode_string_token(raw)?;
             let value = match (physical_key, raw.as_str()) {
@@ -341,6 +493,9 @@ pub(in crate::api::instance) fn encode_value(
     game_version: &str,
     current_raw: Option<&str>,
 ) -> Option<String> {
+    if !setting_available_for_version(definition, game_version) {
+        return None;
+    }
     if let Some(current_raw) = current_raw
         && physical_representation_supported_for_target(
             definition,
@@ -376,6 +531,11 @@ pub(in crate::api::instance) fn encode_value(
                 Some(value.clone())
             }
         }
+        (ValueEncoding::QuotedEnum(choices), CanonicalValue::Enum(value))
+            if choices.contains(&value.as_str()) =>
+        {
+            encode_string_token(value)
+        }
         (ValueEncoding::Text, CanonicalValue::Text(value)) => {
             Some(value.clone())
         }
@@ -391,8 +551,33 @@ pub(in crate::api::instance) fn encode_value(
         (ValueEncoding::Fov, CanonicalValue::Integer(value))
             if (30..=110).contains(value) =>
         {
-            let normalized = (*value as f64 - 70.0) / 40.0;
-            Some(format_decimal(normalized))
+            if release_version(game_version)
+                .is_some_and(|version| version >= (1, 19, 0))
+            {
+                Some(value.to_string())
+            } else {
+                let normalized = (*value as f64 - 70.0) / 40.0;
+                Some(format_decimal(normalized))
+            }
+        }
+        (ValueEncoding::GuiScale, CanonicalValue::Integer(value))
+            if (0..=8).contains(value)
+                && (release_version(game_version)
+                    .is_some_and(|version| version >= (1, 13, 0))
+                    || *value <= 3) =>
+        {
+            Some(value.to_string())
+        }
+        (ValueEncoding::MenuBackgroundBlur, CanonicalValue::Integer(value))
+            if (0..=10).contains(value) =>
+        {
+            if release_version(game_version)
+                .is_some_and(|version| version >= (1, 21, 0))
+            {
+                Some(value.to_string())
+            } else {
+                Some(format!("{value}.0"))
+            }
         }
         (ValueEncoding::Graphics, CanonicalValue::Enum(value)) => {
             match physical_key {
@@ -416,9 +601,8 @@ pub(in crate::api::instance) fn encode_value(
             }
         }
         (ValueEncoding::AmbientOcclusion, CanonicalValue::Enum(value)) => {
-            let target_is_legacy = release_version(game_version)
-                .is_some_and(|version| version <= (1, 19, 3));
-            if target_is_legacy {
+            let version = release_version(game_version)?;
+            if ((1, 5, 1)..=(1, 19, 2)).contains(&version) {
                 match value.as_str() {
                     "off" => Some("0".to_string()),
                     "minimum" => Some("1".to_string()),
@@ -433,6 +617,32 @@ pub(in crate::api::instance) fn encode_value(
                 }
             }
         }
+        (ValueEncoding::ChatPreview, CanonicalValue::Enum(value)) => {
+            if release_version(game_version) == Some((1, 19, 0)) {
+                match value.as_str() {
+                    "0" => Some("false".to_string()),
+                    "2" => Some("true".to_string()),
+                    _ => None,
+                }
+            } else if matches!(value.as_str(), "0" | "1" | "2") {
+                Some(value.clone())
+            } else {
+                None
+            }
+        }
+        (ValueEncoding::Clouds, CanonicalValue::Enum(value)) => {
+            let version = release_version(game_version)?;
+            if version <= (1, 8, 0) {
+                match value.as_str() {
+                    "false" | "true" => Some(value.clone()),
+                    _ => None,
+                }
+            } else if CLOUD_VALUES.contains(&value.as_str()) {
+                Some(value.clone())
+            } else {
+                None
+            }
+        }
         (ValueEncoding::MusicToast, CanonicalValue::Enum(value)) => {
             match physical_key {
                 "showNowPlayingToast" => match value.as_str() {
@@ -460,7 +670,9 @@ fn validate_value(
     if let Some(definition) = definition {
         let type_valid = match definition.encoding {
             ValueEncoding::Bool => matches!(value, CanonicalValue::Bool(_)),
-            ValueEncoding::Integer => {
+            ValueEncoding::Integer
+            | ValueEncoding::GuiScale
+            | ValueEncoding::MenuBackgroundBlur => {
                 matches!(value, CanonicalValue::Integer(_))
             }
             ValueEncoding::Decimal => matches!(
@@ -468,8 +680,11 @@ fn validate_value(
                 CanonicalValue::Decimal(_) | CanonicalValue::Integer(_)
             ),
             ValueEncoding::Enum(_)
+            | ValueEncoding::QuotedEnum(_)
             | ValueEncoding::Graphics
             | ValueEncoding::AmbientOcclusion
+            | ValueEncoding::ChatPreview
+            | ValueEncoding::Clouds
             | ValueEncoding::MusicToast => {
                 matches!(value, CanonicalValue::Enum(_))
             }
@@ -486,6 +701,16 @@ fn validate_value(
             )));
         }
         match (definition.editor, value) {
+            (
+                SettingEditor::UnboundedDecimal,
+                CanonicalValue::Decimal(value),
+            ) if value
+                .parse::<f64>()
+                .ok()
+                .is_none_or(|value| !value.is_finite()) =>
+            {
+                return Err(input_error("Invalid decimal value"));
+            }
             (
                 SettingEditor::Integer { min, max, step },
                 CanonicalValue::Integer(value),
@@ -591,6 +816,9 @@ pub(in crate::api::instance) fn decode_value_for_version(
     raw: &str,
     game_version: &str,
 ) -> Option<CanonicalValue> {
+    if !setting_available_for_version(definition, game_version) {
+        return None;
+    }
     let value = decode_value(definition, physical_key, raw)?;
     validate_file_value(Some(definition), &value).ok()?;
     let target_key = if definition.versioned_keys.is_empty() {
@@ -609,6 +837,9 @@ pub(in crate::api::instance) fn target_physical_key(
     game_version: &str,
 ) -> Option<String> {
     if let Some(definition) = definition {
+        if !setting_available_for_version(definition, game_version) {
+            return None;
+        }
         if !definition.versioned_keys.is_empty() {
             observed_physical_key(definition, document, game_version)?;
             return physical_variant_for_version(definition, game_version)
@@ -629,6 +860,9 @@ pub(in crate::api::instance) fn observed_physical_key(
     document: &GameOptionsDocument,
     game_version: &str,
 ) -> Option<String> {
+    if !setting_available_for_version(definition, game_version) {
+        return None;
+    }
     if let Some(target) = physical_variant_for_version(definition, game_version)
         && document.value(target.key).is_some()
     {
@@ -659,6 +893,9 @@ pub(in crate::api::instance) fn physical_representation_supported_for_target(
     raw: &str,
     game_version: &str,
 ) -> bool {
+    if !setting_available_for_version(definition, game_version) {
+        return false;
+    }
     let Some(target_version) = release_version(game_version) else {
         return false;
     };
@@ -670,12 +907,58 @@ pub(in crate::api::instance) fn physical_representation_supported_for_target(
         };
     }
     if matches!(definition.encoding, ValueEncoding::AmbientOcclusion) {
-        return if target_version >= (1, 19, 4) {
+        return if ((1, 5, 1)..=(1, 19, 2)).contains(&target_version) {
+            matches!(raw, "0" | "1" | "2")
+        } else {
+            matches!(raw, "true" | "false")
+        };
+    }
+    if matches!(definition.encoding, ValueEncoding::Fov) {
+        return if target_version >= (1, 19, 0) {
+            raw.parse::<i64>()
+                .is_ok_and(|value| (30..=110).contains(&value))
+        } else {
+            raw.parse::<f64>().is_ok_and(|value| {
+                value.is_finite() && (-1.0..=1.0).contains(&value)
+            })
+        };
+    }
+    if matches!(definition.encoding, ValueEncoding::ChatPreview) {
+        return if target_version == (1, 19, 0) {
             matches!(raw, "true" | "false")
         } else {
             matches!(raw, "0" | "1" | "2")
         };
     }
+    if matches!(definition.encoding, ValueEncoding::GuiScale) {
+        return raw.parse::<i64>().is_ok_and(|value| {
+            if target_version >= (1, 13, 0) {
+                (0..=8).contains(&value)
+            } else {
+                (0..=3).contains(&value)
+            }
+        });
+    }
+    if matches!(definition.encoding, ValueEncoding::MenuBackgroundBlur) {
+        return if target_version >= (1, 21, 0) {
+            raw.parse::<i64>()
+                .is_ok_and(|value| (0..=10).contains(&value))
+        } else {
+            raw.parse::<f64>().is_ok_and(|value| {
+                value.is_finite()
+                    && value.fract() == 0.0
+                    && (0.0..=10.0).contains(&value)
+            })
+        };
+    }
+    if matches!(definition.encoding, ValueEncoding::Clouds) {
+        return if target_version <= (1, 8, 0) {
+            matches!(raw, "true" | "false")
+        } else {
+            decode_string_token(raw)
+                .is_some_and(|value| CLOUD_VALUES.contains(&value.as_str()))
+        };
+    }
 
     let mut variants = definition
         .versioned_keys
diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/catalog/video.rs b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/video.rs
index 467ee62615..7a2a7b54e1 100644
--- a/packages/app-lib/src/api/instance/synced_options/game_options/catalog/video.rs
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/video.rs
@@ -1,17 +1,25 @@
 use super::{
-    BOOL, SettingEditor, SupportedSetting, ValueEncoding, setting,
-    version_changes, versioned_setting,
+    BOOL, SettingEditor, SupportedSetting, UNIT_INTERVAL, ValueEncoding,
+    ranged_setting, setting, version_changes, versioned_setting,
 };
 
 const GRAPHICS: &[&str] = &["fast", "fancy", "fabulous", "custom"];
 const AMBIENT_OCCLUSION: &[&str] = &["off", "on", "minimum", "maximum"];
 const PARTICLES: &[&str] = &["0", "1", "2"];
 const CLOUDS: &[&str] = &["false", "fast", "true"];
+const ATTACK_INDICATOR: &[&str] = &["0", "1", "2"];
+const INACTIVITY_FPS_LIMIT: &[&str] = &["afk", "minimized"];
+const PRIORITIZE_CHUNK_UPDATES: &[&str] = &["0", "1", "2"];
+const TEXTURE_FILTERING: &[&str] = &["0", "1", "2"];
+const GRAPHICS_BACKEND: &[&str] = &["default", "opengl", "vulkan"];
+const LEGACY_FPS_LIMIT: &[&str] = &["0", "1", "2"];
+const LEGACY_VIEW_DISTANCE: &[&str] = &["0", "1", "2", "3"];
 
 pub(super) const SETTINGS: &[SupportedSetting] = &[
-    setting(
+    versioned_setting(
         "fov",
         &["fov"],
+        version_changes::FOV_KEYS,
         "video",
         true,
         SettingEditor::Integer {
@@ -40,8 +48,18 @@ pub(super) const SETTINGS: &[SupportedSetting] = &[
         ValueEncoding::AmbientOcclusion,
     ),
     setting(
+        "brightness",
+        &["gamma"],
+        "video",
+        true,
+        UNIT_INTERVAL,
+        ValueEncoding::Decimal,
+    ),
+    ranged_setting(
         "render_distance",
         &["renderDistance"],
+        "1.7.2",
+        "26.3",
         "video",
         false,
         SettingEditor::Integer {
@@ -51,9 +69,21 @@ pub(super) const SETTINGS: &[SupportedSetting] = &[
         },
         ValueEncoding::Integer,
     ),
-    setting(
+    ranged_setting(
+        "legacy_view_distance",
+        &["viewDistance"],
+        "1.0",
+        "1.6.4",
+        "video",
+        false,
+        SettingEditor::Enum(LEGACY_VIEW_DISTANCE),
+        ValueEncoding::Enum(LEGACY_VIEW_DISTANCE),
+    ),
+    ranged_setting(
         "simulation_distance",
         &["simulationDistance"],
+        "1.18",
+        "26.3",
         "video",
         false,
         SettingEditor::Integer {
@@ -63,6 +93,21 @@ pub(super) const SETTINGS: &[SupportedSetting] = &[
         },
         ValueEncoding::Integer,
     ),
+    ranged_setting(
+        "entity_distance",
+        &["entityDistanceScaling"],
+        "1.16",
+        "26.3",
+        "video",
+        false,
+        SettingEditor::Decimal {
+            min: 0.5,
+            max: 5.0,
+            step: 0.25,
+            unit: Some("multiplier"),
+        },
+        ValueEncoding::Decimal,
+    ),
     setting(
         "gui_scale",
         &["guiScale"],
@@ -73,8 +118,28 @@ pub(super) const SETTINGS: &[SupportedSetting] = &[
             max: 8,
             step: 1,
         },
+        ValueEncoding::GuiScale,
+    ),
+    ranged_setting(
+        "debug_gui_scale",
+        &["debugGuiScale"],
+        "26.3",
+        "26.3",
+        "video",
+        true,
+        SettingEditor::UnboundedInteger,
         ValueEncoding::Integer,
     ),
+    ranged_setting(
+        "graphics_backend",
+        &["preferredGraphicsBackend"],
+        "26.2",
+        "26.3",
+        "video",
+        false,
+        SettingEditor::Enum(GRAPHICS_BACKEND),
+        ValueEncoding::QuotedEnum(GRAPHICS_BACKEND),
+    ),
     setting(
         "particles",
         &["particles"],
@@ -83,17 +148,30 @@ pub(super) const SETTINGS: &[SupportedSetting] = &[
         SettingEditor::Enum(PARTICLES),
         ValueEncoding::Enum(PARTICLES),
     ),
-    setting(
+    versioned_setting(
         "clouds",
-        &["renderClouds"],
+        &["renderClouds", "clouds"],
+        version_changes::CLOUD_KEYS,
         "video",
         true,
         SettingEditor::Enum(CLOUDS),
-        ValueEncoding::Enum(CLOUDS),
+        ValueEncoding::Clouds,
     ),
-    setting(
+    ranged_setting(
+        "cloud_range",
+        &["cloudRange"],
+        "1.21.6",
+        "26.3",
+        "video",
+        false,
+        SettingEditor::UnboundedInteger,
+        ValueEncoding::Integer,
+    ),
+    ranged_setting(
         "entity_shadows",
         &["entityShadows"],
+        "1.8.1",
+        "26.3",
         "video",
         true,
         BOOL,
@@ -107,25 +185,51 @@ pub(super) const SETTINGS: &[SupportedSetting] = &[
         BOOL,
         ValueEncoding::Bool,
     ),
-    setting(
+    ranged_setting(
         "vsync",
         &["enableVsync"],
+        "1.3.1",
+        "26.3",
         "video",
         true,
         BOOL,
         ValueEncoding::Bool,
     ),
-    setting(
+    ranged_setting(
         "fullscreen",
         &["fullscreen"],
+        "1.3.1",
+        "26.3",
         "video",
         true,
         BOOL,
         ValueEncoding::Bool,
     ),
-    setting(
+    ranged_setting(
+        "exclusive_fullscreen",
+        &["exclusiveFullscreen"],
+        "26.1",
+        "26.3",
+        "video",
+        false,
+        BOOL,
+        ValueEncoding::Bool,
+    ),
+    ranged_setting(
+        "mac_fullscreen_menu",
+        &["macFullscreenMenuVisibility"],
+        "26.3",
+        "26.3",
+        "video",
+        false,
+        BOOL,
+        ValueEncoding::Bool,
+    ),
+    ranged_setting(
         "max_framerate",
         &["maxFps"],
+        "1.7.2",
+        "26.3",
         "video",
         true,
         SettingEditor::Integer {
@@ -135,9 +239,31 @@ pub(super) const SETTINGS: &[SupportedSetting] = &[
         },
         ValueEncoding::Integer,
     ),
-    setting(
+    ranged_setting(
+        "legacy_framerate_limit",
+        &["fpsLimit"],
+        "1.0",
+        "1.6.4",
+        "video",
+        false,
+        SettingEditor::Enum(LEGACY_FPS_LIMIT),
+        ValueEncoding::Enum(LEGACY_FPS_LIMIT),
+    ),
+    ranged_setting(
+        "inactivity_framerate_limit",
+        &["inactivityFpsLimit"],
+        "1.21.2",
+        "26.3",
+        "video",
+        true,
+        SettingEditor::Enum(INACTIVITY_FPS_LIMIT),
+        ValueEncoding::QuotedEnum(INACTIVITY_FPS_LIMIT),
+    ),
+    ranged_setting(
         "mipmap_levels",
         &["mipmapLevels"],
+        "1.7.2",
+        "26.3",
         "video",
         false,
         SettingEditor::Integer {
@@ -147,9 +273,11 @@ pub(super) const SETTINGS: &[SupportedSetting] = &[
         },
         ValueEncoding::Integer,
     ),
-    setting(
+    ranged_setting(
         "biome_blend_radius",
         &["biomeBlendRadius"],
+        "1.13",
+        "26.3",
         "video",
         true,
         SettingEditor::Integer {
@@ -159,4 +287,164 @@ pub(super) const SETTINGS: &[SupportedSetting] = &[
         },
         ValueEncoding::Integer,
     ),
+    ranged_setting(
+        "prioritize_chunk_updates",
+        &["prioritizeChunkUpdates"],
+        "1.18",
+        "26.3",
+        "video",
+        true,
+        SettingEditor::Enum(PRIORITIZE_CHUNK_UPDATES),
+        ValueEncoding::Enum(PRIORITIZE_CHUNK_UPDATES),
+    ),
+    ranged_setting(
+        "attack_indicator",
+        &["attackIndicator"],
+        "1.9",
+        "26.3",
+        "video",
+        true,
+        SettingEditor::Enum(ATTACK_INDICATOR),
+        ValueEncoding::Enum(ATTACK_INDICATOR),
+    ),
+    ranged_setting(
+        "reduced_debug_info",
+        &["reducedDebugInfo"],
+        "1.8",
+        "26.3",
+        "video",
+        true,
+        BOOL,
+        ValueEncoding::Bool,
+    ),
+    ranged_setting(
+        "chunk_fade_time",
+        &["chunkSectionFadeInTime"],
+        "1.21.11",
+        "26.3",
+        "video",
+        false,
+        SettingEditor::UnboundedDecimal,
+        ValueEncoding::Decimal,
+    ),
+    ranged_setting(
+        "cutout_leaves",
+        &["cutoutLeaves"],
+        "1.21.11",
+        "26.3",
+        "video",
+        true,
+        BOOL,
+        ValueEncoding::Bool,
+    ),
+    ranged_setting(
+        "improved_transparency",
+        &["improvedTransparency"],
+        "1.21.11",
+        "26.3",
+        "video",
+        true,
+        BOOL,
+        ValueEncoding::Bool,
+    ),
+    ranged_setting(
+        "texture_filtering",
+        &["textureFiltering"],
+        "1.21.11",
+        "26.3",
+        "video",
+        false,
+        SettingEditor::Enum(TEXTURE_FILTERING),
+        ValueEncoding::Enum(TEXTURE_FILTERING),
+    ),
+    ranged_setting(
+        "anisotropy",
+        &["maxAnisotropyBit"],
+        "1.21.11",
+        "26.3",
+        "video",
+        false,
+        SettingEditor::UnboundedInteger,
+        ValueEncoding::Integer,
+    ),
+    ranged_setting(
+        "vignette",
+        &["vignette"],
+        "1.21.11",
+        "26.3",
+        "video",
+        true,
+        BOOL,
+        ValueEncoding::Bool,
+    ),
+    ranged_setting(
+        "weather_radius",
+        &["weatherRadius"],
+        "1.21.11",
+        "26.3",
+        "video",
+        false,
+        SettingEditor::UnboundedInteger,
+        ValueEncoding::Integer,
+    ),
+    ranged_setting(
+        "advanced_opengl",
+        &["advancedOpengl"],
+        "1.0",
+        "1.7.10",
+        "video",
+        false,
+        BOOL,
+        ValueEncoding::Bool,
+    ),
+    ranged_setting(
+        "anaglyph_3d",
+        &["anaglyph3d"],
+        "1.0",
+        "1.12.2",
+        "video",
+        true,
+        BOOL,
+        ValueEncoding::Bool,
+    ),
+    ranged_setting(
+        "anisotropic_filtering",
+        &["anisotropicFiltering"],
+        "1.7.2",
+        "1.7.10",
+        "video",
+        false,
+        SettingEditor::UnboundedInteger,
+        ValueEncoding::Integer,
+    ),
+    ranged_setting(
+        "alternate_blocks",
+        &["allowBlockAlternatives"],
+        "1.8",
+        "1.8.9",
+        "video",
+        true,
+        BOOL,
+        ValueEncoding::Bool,
+    ),
+    ranged_setting(
+        "held_item_tooltips",
+        &["heldItemTooltips"],
+        "1.4.6",
+        "1.19.3",
+        "video",
+        true,
+        BOOL,
+        ValueEncoding::Bool,
+    ),
+    ranged_setting(
+        "use_vbo",
+        &["useVbo"],
+        "1.8",
+        "1.13.2",
+        "video",
+        false,
+        BOOL,
+        ValueEncoding::Bool,
+    ),
 ];
diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/instance_support.rs b/packages/app-lib/src/api/instance/synced_options/game_options/instance_support.rs
index be678994f6..763e3d80d5 100644
--- a/packages/app-lib/src/api/instance/synced_options/game_options/instance_support.rs
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/instance_support.rs
@@ -176,21 +176,16 @@ pub(super) fn describe_instance_support(
 					)
                     } else if let Some((key, mapping)) =
                         definition.and_then(|definition| {
-                            physical_variant_for_version(definition, &version)
-                                .map(|variant| (variant.key, variant.mapping))
-                                .or_else(|| {
-                                    definition
-                                        .versioned_keys
-                                        .is_empty()
-                                        .then(|| {
-                                            definition
-										.keys
-										.first()
-										.copied()
-										.map(|key| (key, GameOptionMappingKind::Direct))
-                                        })
-                                        .flatten()
-                                })
+                            target_key_for_version(definition, &version).map(
+                                |key| {
+                                    let mapping = physical_variant_for_version(
+                                        definition, &version,
+                                    )
+                                    .map(|variant| variant.mapping)
+                                    .unwrap_or(GameOptionMappingKind::Direct);
+                                    (key, mapping)
+                                },
+                            )
                         })
                     {
                         let representable = value.is_none_or(|value| {
@@ -309,11 +304,7 @@ pub(super) fn describe_instance_support(
                         }
                     } else if let Some(definition) =
                         definition.filter(|definition| {
-                            (definition.versioned_keys.is_empty()
-                                || physical_variant_for_version(
-                                    definition, &version,
-                                )
-                                .is_some())
+                            setting_available_for_version(definition, &version)
                                 && definition
                                     .keys
                                     .iter()
@@ -321,17 +312,8 @@ pub(super) fn describe_instance_support(
                         })
                     {
                         let eventual_key =
-                            physical_variant_for_version(definition, &version)
-                                .map(|variant| variant.key.to_string())
-                                .or_else(|| {
-                                    definition
-                                        .keys
-                                        .iter()
-                                        .find(|key| {
-                                            document.value(key).is_some()
-                                        })
-                                        .map(|key| (*key).to_string())
-                                });
+                            target_key_for_version(definition, &version)
+                                .map(str::to_string);
                         let representable =
                             eventual_key.as_deref().is_some_and(|key| {
                                 value.is_none_or(|value| {
@@ -485,8 +467,8 @@ pub(super) fn find_common_local_value(
         } else {
             Some(CanonicalValue::ExternalRaw(raw_value.to_string()))
         };
-        if let Some(value) = value
-            .filter(|value| validate_file_value(definition, value).is_ok())
+        if let Some(value) =
+            value.filter(|value| validate_file_value(definition, value).is_ok())
         {
             values.push(value);
         } else {
diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/local_settings_editor.rs b/packages/app-lib/src/api/instance/synced_options/game_options/local_settings_editor.rs
index 98bd098252..a7e71f75ae 100644
--- a/packages/app-lib/src/api/instance/synced_options/game_options/local_settings_editor.rs
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/local_settings_editor.rs
@@ -28,9 +28,7 @@ fn compatibility(controlled: bool) -> GameOptionCompatibility {
                 game_versions: Vec::new(),
                 status: GameOptionCompatibilityStatus::Controlled,
                 mapping: None,
-                reason: Some(
-                    GameOptionCompatibilityReason::LauncherControlled,
-                ),
+                reason: Some(GameOptionCompatibilityReason::LauncherControlled),
             }],
         }
     } else {
@@ -237,10 +235,9 @@ fn encode_setting_value(
         Ok((key, raw))
     } else {
         validate_canonical_value(None, value)?;
-        let key = setting
-            .raw_key
-            .clone()
-            .ok_or_else(|| input_error("Custom setting is missing its file key"))?;
+        let key = setting.raw_key.clone().ok_or_else(|| {
+            input_error("Custom setting is missing its file key")
+        })?;
         let CanonicalValue::ExternalRaw(raw) = value else {
             return Err(input_error(
                 "Custom settings require a raw string value",
@@ -313,10 +310,7 @@ pub async fn preview_changes(
             match value {
                 Some(value)
                     if encode_setting_value(
-                        &metadata,
-                        &document,
-                        setting,
-                        &value,
+                        &metadata, &document, setting, &value,
                     )
                     .is_ok() =>
                 {
diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/mod.rs b/packages/app-lib/src/api/instance/synced_options/game_options/mod.rs
index 862eb02606..9dfe0dbecc 100644
--- a/packages/app-lib/src/api/instance/synced_options/game_options/mod.rs
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/mod.rs
@@ -45,8 +45,7 @@ pub use api_types::{
 };
 pub use launch_overrides::{apply_launcher_overrides, sync_before_launch};
 pub use local_settings_editor::{
-    get_config as get_local_config,
-    preview_changes as preview_local_changes,
+    get_config as get_local_config, preview_changes as preview_local_changes,
     save_changes as save_local_changes,
 };
 pub use pack_updates::{GameOptionsPackSource, capture_pack_base};
@@ -73,7 +72,7 @@ pub(in crate::api::instance) async fn canonical_exists(
 }
 
 const OPTIONS_FILE: &str = "options.txt";
-const CATALOG_REVISION: u32 = 5;
+const CATALOG_REVISION: u32 = 6;
 const MAX_OPTIONS_BYTES: usize = 2 * 1024 * 1024;
 const MAX_OPTIONS_LINES: usize = 16_384;
 const MAX_KEY_BYTES: usize = 1_024;
diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/write_shared_settings.rs b/packages/app-lib/src/api/instance/synced_options/game_options/write_shared_settings.rs
index 06bff8c3da..200c559c02 100644
--- a/packages/app-lib/src/api/instance/synced_options/game_options/write_shared_settings.rs
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/write_shared_settings.rs
@@ -3,356 +3,350 @@
 use super::super as synced_options;
 use super::CATALOG_REVISION;
 use super::api_types::{
-	GameOptionMappingKind, SaveGameSettingsResult, SyncOutcome,
+    GameOptionMappingKind, SaveGameSettingsResult, SyncOutcome,
 };
 use super::catalog::*;
 use super::options_file::{
-	GameOptionsDocument, options_path, read_document, sha1_bytes,
+    GameOptionsDocument, options_path, read_document, sha1_bytes,
 };
 use super::pack_updates::materialize_yosbr_options_if_missing;
 use super::read_instance_changes::read_instance_changes_into_shared_settings;
 use super::source_selection::initialize_from_source_instance;
 use crate::state::{
-	CanonicalValue, InstanceMetadata, State, SyncedOption,
-	game_options_sync_is_enabled, load_game_option_preferences,
-	load_game_options_sync_state, load_shared_game_options,
+    CanonicalValue, InstanceMetadata, State, SyncedOption,
+    game_options_sync_is_enabled, load_game_option_preferences,
+    load_game_options_sync_state, load_shared_game_options,
 };
 use crate::util::io;
 
 struct AppliedSettings {
-	count: usize,
-	used_migration: bool,
+    count: usize,
+    used_migration: bool,
 }
 
 pub(super) async fn sync_is_active_for_instance(
-	metadata: &InstanceMetadata,
-	state: &State,
+    metadata: &InstanceMetadata,
+    state: &State,
 ) -> crate::Result<bool> {
-	Ok(metadata.synced_options.game_options
-		&& game_options_sync_is_enabled(&state.pool).await?)
+    Ok(metadata.synced_options.game_options
+        && game_options_sync_is_enabled(&state.pool).await?)
 }
 
 pub(super) async fn remember_processed_sha(
-	instance_id: &str,
-	sha1: &str,
-	state: &State,
+    instance_id: &str,
+    sha1: &str,
+    state: &State,
 ) -> crate::Result<()> {
-	let (canonical_revision, _) =
-		load_game_options_sync_state(&state.pool, CATALOG_REVISION).await?;
-	synced_options::begin_checkpoint(
-		instance_id,
-		SyncedOption::GameOptions,
-		"default",
-		sha1,
-		None,
-		canonical_revision as i64,
-		state,
-	)
-	.await?;
-	synced_options::finish_plain_checkpoint(
-		instance_id,
-		SyncedOption::GameOptions,
-		"default",
-		state,
-	)
-	.await
+    let (canonical_revision, _) =
+        load_game_options_sync_state(&state.pool, CATALOG_REVISION).await?;
+    synced_options::begin_checkpoint(
+        instance_id,
+        SyncedOption::GameOptions,
+        "default",
+        sha1,
+        None,
+        canonical_revision as i64,
+        state,
+    )
+    .await?;
+    synced_options::finish_plain_checkpoint(
+        instance_id,
+        SyncedOption::GameOptions,
+        "default",
+        state,
+    )
+    .await
 }
 
 async fn apply_shared_settings_to_document(
-	metadata: &InstanceMetadata,
-	document: &mut GameOptionsDocument,
-	state: &State,
+    metadata: &InstanceMetadata,
+    document: &mut GameOptionsDocument,
+    state: &State,
 ) -> crate::Result<AppliedSettings> {
-	let values = load_shared_game_options(&state.pool).await?;
-	let preferences = load_game_option_preferences(&state.pool).await?;
-	let mut count = 0;
-	let mut used_migration = false;
+    let values = load_shared_game_options(&state.pool).await?;
+    let preferences = load_game_option_preferences(&state.pool).await?;
+    let mut count = 0;
+    let mut used_migration = false;
 
-	for (option_id, preference) in preferences {
-		if !preference.enabled {
-			continue;
-		}
-		if option_id == "fullscreen"
-			&& metadata.launch_overrides.force_fullscreen.is_some()
-		{
-			continue;
-		}
-		let Some(stored) = values.get(&option_id) else {
-			continue;
-		};
-		let Some(value) = stored.value.as_ref().filter(|_| stored.seeded)
-		else {
-			continue;
-		};
-		let definition = setting_by_id(&option_id);
-		if definition.is_some()
-			&& !supported_settings_cover_game_version(
-				&metadata.applied_content_set.game_version,
-			)
-		{
-			continue;
-		}
-		if definition.is_none()
-			&& stored
-				.raw_key
-				.as_deref()
-				.is_some_and(|key| setting_by_file_key(key).is_some())
-		{
-			continue;
-		}
+    for (option_id, preference) in preferences {
+        if !preference.enabled {
+            continue;
+        }
+        if option_id == "fullscreen"
+            && metadata.launch_overrides.force_fullscreen.is_some()
+        {
+            continue;
+        }
+        let Some(stored) = values.get(&option_id) else {
+            continue;
+        };
+        let Some(value) = stored.value.as_ref().filter(|_| stored.seeded)
+        else {
+            continue;
+        };
+        let definition = setting_by_id(&option_id);
+        if definition.is_some()
+            && !supported_settings_cover_game_version(
+                &metadata.applied_content_set.game_version,
+            )
+        {
+            continue;
+        }
+        if definition.is_none()
+            && stored
+                .raw_key
+                .as_deref()
+                .is_some_and(|key| setting_by_file_key(key).is_some())
+        {
+            continue;
+        }
 
-		let target_version = &metadata.applied_content_set.game_version;
-		let key = target_physical_key(
-			definition,
-			stored,
-			document,
-			target_version,
-		)
-		.or_else(|| {
-			definition.and_then(|definition| {
-				if definition.versioned_keys.is_empty() {
-					definition.keys.first().map(|key| (*key).to_string())
-				} else {
-					physical_variant_for_version(definition, target_version)
-						.map(|variant| variant.key.to_string())
-				}
-			})
-		})
-		.or_else(|| stored.raw_key.clone());
-		let Some(key) = key else {
-			continue;
-		};
+        let target_version = &metadata.applied_content_set.game_version;
+        let key =
+            target_physical_key(definition, stored, document, target_version)
+                .or_else(|| {
+                    definition.and_then(|definition| {
+                        target_key_for_version(definition, target_version)
+                            .map(str::to_string)
+                    })
+                })
+                .or_else(|| stored.raw_key.clone());
+        let Some(key) = key else {
+            continue;
+        };
 
-		let migrated = definition.is_some_and(|definition| {
-			alias_migration_needed(definition, document, &key)
-				|| document.value(&key).is_some_and(|raw| {
-					!physical_representation_supported_for_target(
-						definition,
-						&key,
-						raw,
-						target_version,
-					)
-				})
-		});
-		let raw_value = if let Some(definition) = definition {
-			let Some(raw_value) = encode_value(
-				definition,
-				&key,
-				value,
-				target_version,
-				document.value(&key),
-			) else {
-				continue;
-			};
-			raw_value
-		} else if let CanonicalValue::ExternalRaw(raw_value) = value {
-			raw_value.clone()
-		} else {
-			continue;
-		};
+        let migrated = definition.is_some_and(|definition| {
+            alias_migration_needed(definition, document, &key)
+                || document.value(&key).is_some_and(|raw| {
+                    !physical_representation_supported_for_target(
+                        definition,
+                        &key,
+                        raw,
+                        target_version,
+                    )
+                })
+        });
+        let raw_value = if let Some(definition) = definition {
+            let Some(raw_value) = encode_value(
+                definition,
+                &key,
+                value,
+                target_version,
+                document.value(&key),
+            ) else {
+                continue;
+            };
+            raw_value
+        } else if let CanonicalValue::ExternalRaw(raw_value) = value {
+            raw_value.clone()
+        } else {
+            continue;
+        };
 
-		document.set(&key, &raw_value, definition.is_none() || migrated)?;
-		count += 1;
-		used_migration |= migrated
-			|| definition.is_some_and(|definition| {
-				(matches!(definition.encoding, ValueEncoding::KeyBinding)
-					&& split_key_binding(&raw_value).0.parse::<i32>().is_ok())
-					|| physical_variant_for_present_key(
-						definition,
-						&key,
-						target_version,
-					)
-					.map(|variant| {
-						variant.mapping != GameOptionMappingKind::Direct
-					})
-					.unwrap_or_else(|| {
-						definition.keys.first().copied() != Some(key.as_str())
-					})
-			});
-	}
+        document.set(&key, &raw_value, definition.is_none() || migrated)?;
+        count += 1;
+        used_migration |= migrated
+            || definition.is_some_and(|definition| {
+                (matches!(definition.encoding, ValueEncoding::KeyBinding)
+                    && split_key_binding(&raw_value).0.parse::<i32>().is_ok())
+                    || physical_variant_for_present_key(
+                        definition,
+                        &key,
+                        target_version,
+                    )
+                    .map(|variant| {
+                        variant.mapping != GameOptionMappingKind::Direct
+                    })
+                    .unwrap_or_else(|| {
+                        definition.keys.first().copied() != Some(key.as_str())
+                    })
+            });
+    }
 
-	Ok(AppliedSettings {
-		count,
-		used_migration,
-	})
+    Ok(AppliedSettings {
+        count,
+        used_migration,
+    })
 }
 
 pub(super) async fn apply_shared_settings_to_instance(
-	metadata: &InstanceMetadata,
-	state: &State,
-	allow_protected: bool,
+    metadata: &InstanceMetadata,
+    state: &State,
+    allow_protected: bool,
 ) -> crate::Result<SyncOutcome> {
-	if !allow_protected && synced_options::sync_files_are_protected(metadata) {
-		return Ok(SyncOutcome::Deferred);
-	}
-	if !sync_is_active_for_instance(metadata, state).await? {
-		return Ok(SyncOutcome::Unchanged);
-	}
+    if !allow_protected && synced_options::sync_files_are_protected(metadata) {
+        return Ok(SyncOutcome::Deferred);
+    }
+    if !sync_is_active_for_instance(metadata, state).await? {
+        return Ok(SyncOutcome::Unchanged);
+    }
 
-	let path = options_path(metadata, state);
-	if !path.exists() {
-		materialize_yosbr_options_if_missing(metadata, state).await?;
-	}
-	let file_was_missing = !path.exists();
-	let (mut document, input_bytes) = if path.exists() {
-		read_document(&path).await?
-	} else {
-		(GameOptionsDocument::empty(), Vec::new())
-	};
-	let applied =
-		apply_shared_settings_to_document(metadata, &mut document, state).await?;
-	if file_was_missing && applied.count == 0 {
-		return Ok(SyncOutcome::WaitingForFile);
-	}
+    let path = options_path(metadata, state);
+    if !path.exists() {
+        materialize_yosbr_options_if_missing(metadata, state).await?;
+    }
+    let file_was_missing = !path.exists();
+    let (mut document, input_bytes) = if path.exists() {
+        read_document(&path).await?
+    } else {
+        (GameOptionsDocument::empty(), Vec::new())
+    };
+    let applied =
+        apply_shared_settings_to_document(metadata, &mut document, state)
+            .await?;
+    if file_was_missing && applied.count == 0 {
+        return Ok(SyncOutcome::WaitingForFile);
+    }
 
-	let output_bytes = document.serialize()?;
-	let output_sha1 = sha1_bytes(&output_bytes);
-	let changed = file_was_missing || output_bytes != input_bytes;
-	if changed {
-		io::write(&path, output_bytes).await?;
-	}
-	remember_processed_sha(&metadata.instance.id, &output_sha1, state).await?;
+    let output_bytes = document.serialize()?;
+    let output_sha1 = sha1_bytes(&output_bytes);
+    let changed = file_was_missing || output_bytes != input_bytes;
+    if changed {
+        io::write(&path, output_bytes).await?;
+    }
+    remember_processed_sha(&metadata.instance.id, &output_sha1, state).await?;
 
-	Ok(if changed && applied.used_migration {
-		SyncOutcome::Migrated
-	} else if changed {
-		SyncOutcome::Applied
-	} else {
-		SyncOutcome::Unchanged
-	})
+    Ok(if changed && applied.used_migration {
+        SyncOutcome::Migrated
+    } else if changed {
+        SyncOutcome::Applied
+    } else {
+        SyncOutcome::Unchanged
+    })
 }
 
 pub(super) async fn capture_instance_options(
-	metadata: &InstanceMetadata,
-	state: &State,
-	allow_protected: bool,
+    metadata: &InstanceMetadata,
+    state: &State,
+    allow_protected: bool,
 ) -> crate::Result<SyncOutcome> {
-	if !allow_protected && synced_options::sync_files_are_protected(metadata) {
-		return Ok(SyncOutcome::Deferred);
-	}
-	if !sync_is_active_for_instance(metadata, state).await? {
-		return Ok(SyncOutcome::Unchanged);
-	}
+    if !allow_protected && synced_options::sync_files_are_protected(metadata) {
+        return Ok(SyncOutcome::Deferred);
+    }
+    if !sync_is_active_for_instance(metadata, state).await? {
+        return Ok(SyncOutcome::Unchanged);
+    }
 
-	let path = options_path(metadata, state);
-	if !path.exists() {
-		return Ok(SyncOutcome::WaitingForFile);
-	}
-	let (document, input_bytes) = read_document(&path).await?;
-	let input_sha1 = sha1_bytes(&input_bytes);
-	let checkpoint = synced_options::checkpoint(
-		&metadata.instance.id,
-		SyncedOption::GameOptions,
-		"default",
-		state,
-	)
-	.await?;
-	if checkpoint
-		.as_ref()
-		.is_some_and(|checkpoint| checkpoint.expected_sha1 == input_sha1)
-	{
-		return Ok(SyncOutcome::Unchanged);
-	}
+    let path = options_path(metadata, state);
+    if !path.exists() {
+        return Ok(SyncOutcome::WaitingForFile);
+    }
+    let (document, input_bytes) = read_document(&path).await?;
+    let input_sha1 = sha1_bytes(&input_bytes);
+    let checkpoint = synced_options::checkpoint(
+        &metadata.instance.id,
+        SyncedOption::GameOptions,
+        "default",
+        state,
+    )
+    .await?;
+    if checkpoint
+        .as_ref()
+        .is_some_and(|checkpoint| checkpoint.expected_sha1 == input_sha1)
+    {
+        return Ok(SyncOutcome::Unchanged);
+    }
 
-	let canonical_changed = if crate::state::shared_game_options_exist(
-		&state.pool,
-	)
-	.await?
-	{
-		read_instance_changes_into_shared_settings(metadata, &document, state)
-			.await?
-	} else {
-		initialize_from_source_instance(metadata, state).await?;
-		true
-	};
-	remember_processed_sha(&metadata.instance.id, &input_sha1, state).await?;
+    let canonical_changed =
+        if crate::state::shared_game_options_exist(&state.pool).await? {
+            read_instance_changes_into_shared_settings(
+                metadata, &document, state,
+            )
+            .await?
+        } else {
+            initialize_from_source_instance(metadata, state).await?;
+            true
+        };
+    remember_processed_sha(&metadata.instance.id, &input_sha1, state).await?;
 
-	if canonical_changed {
-		let _ =
-			sync_other_participating_instances(state, Some(&metadata.instance.id))
-				.await;
-	}
-	Ok(SyncOutcome::Unchanged)
+    if canonical_changed {
+        let _ = sync_other_participating_instances(
+            state,
+            Some(&metadata.instance.id),
+        )
+        .await;
+    }
+    Ok(SyncOutcome::Unchanged)
 }
 
 pub(in crate::api::instance) async fn capture_instance_file_change(
-	metadata: &InstanceMetadata,
-	state: &State,
+    metadata: &InstanceMetadata,
+    state: &State,
 ) -> crate::Result<()> {
-	capture_instance_options(metadata, state, false).await?;
-	Ok(())
+    capture_instance_options(metadata, state, false).await?;
+    Ok(())
 }
 
 pub(in crate::api::instance) async fn apply_instance_with_state(
-	metadata: &InstanceMetadata,
-	state: &State,
+    metadata: &InstanceMetadata,
+    state: &State,
 ) -> crate::Result<()> {
-	apply_shared_settings_to_instance(metadata, state, false).await?;
-	Ok(())
+    apply_shared_settings_to_instance(metadata, state, false).await?;
+    Ok(())
 }
 
 pub(super) async fn sync_other_participating_instances(
-	state: &State,
-	excluded_instance_id: Option<&str>,
+    state: &State,
+    excluded_instance_id: Option<&str>,
 ) -> SaveGameSettingsResult {
-	let mut result = SaveGameSettingsResult {
-		state: None,
-		applied: 0,
-		migrated: 0,
-		deferred: 0,
-		unsupported: 0,
-		failed: 0,
-		conflicts: Vec::new(),
-	};
-	match game_options_sync_is_enabled(&state.pool).await {
-		Ok(true) => {}
-		Ok(false) => return result,
-		Err(error) => {
-			tracing::warn!(
-				"Failed to inspect global game-options state before fan-out: {error}"
-			);
-			result.failed += 1;
-			return result;
-		}
-	}
-	let instances = match crate::state::list_instances(&state.pool).await {
-		Ok(instances) => instances,
-		Err(error) => {
-			tracing::warn!(
-				"Failed to list instances for game-options fan-out: {error}"
-			);
-			result.failed += 1;
-			return result;
-		}
-	};
-	for metadata in instances {
-		if excluded_instance_id == Some(metadata.instance.id.as_str())
-			|| !metadata.synced_options.game_options
-		{
-			continue;
-		}
-		match apply_shared_settings_to_instance(&metadata, state, false).await {
-			Ok(SyncOutcome::Applied | SyncOutcome::Unchanged) => {
-				result.applied += 1
-			}
-			Ok(SyncOutcome::Migrated) => result.migrated += 1,
-			Ok(SyncOutcome::Deferred | SyncOutcome::WaitingForFile) => {
-				result.deferred += 1
-			}
-			Err(error) => {
-				tracing::warn!(
-					"Failed to write synced game options into {}: {error}",
-					metadata.instance.id
-				);
-				result.failed += 1;
-			}
-		}
-	}
-	result
+    let mut result = SaveGameSettingsResult {
+        state: None,
+        applied: 0,
+        migrated: 0,
+        deferred: 0,
+        unsupported: 0,
+        failed: 0,
+        conflicts: Vec::new(),
+    };
+    match game_options_sync_is_enabled(&state.pool).await {
+        Ok(true) => {}
+        Ok(false) => return result,
+        Err(error) => {
+            tracing::warn!(
+                "Failed to inspect global game-options state before fan-out: {error}"
+            );
+            result.failed += 1;
+            return result;
+        }
+    }
+    let instances = match crate::state::list_instances(&state.pool).await {
+        Ok(instances) => instances,
+        Err(error) => {
+            tracing::warn!(
+                "Failed to list instances for game-options fan-out: {error}"
+            );
+            result.failed += 1;
+            return result;
+        }
+    };
+    for metadata in instances {
+        if excluded_instance_id == Some(metadata.instance.id.as_str())
+            || !metadata.synced_options.game_options
+        {
+            continue;
+        }
+        match apply_shared_settings_to_instance(&metadata, state, false).await {
+            Ok(SyncOutcome::Applied | SyncOutcome::Unchanged) => {
+                result.applied += 1
+            }
+            Ok(SyncOutcome::Migrated) => result.migrated += 1,
+            Ok(SyncOutcome::Deferred | SyncOutcome::WaitingForFile) => {
+                result.deferred += 1
+            }
+            Err(error) => {
+                tracing::warn!(
+                    "Failed to write synced game options into {}: {error}",
+                    metadata.instance.id
+                );
+                result.failed += 1;
+            }
+        }
+    }
+    result
 }
 
 pub(crate) async fn sync_all_participating_instances(
-	state: &State,
+    state: &State,
 ) -> SaveGameSettingsResult {
-	sync_other_participating_instances(state, None).await
+    sync_other_participating_instances(state, None).await
 }
diff --git a/packages/app-lib/src/api/instance/synced_options/mod.rs b/packages/app-lib/src/api/instance/synced_options/mod.rs
index 75518875db..6fe52de2cf 100644
--- a/packages/app-lib/src/api/instance/synced_options/mod.rs
+++ b/packages/app-lib/src/api/instance/synced_options/mod.rs
@@ -19,10 +19,10 @@ pub(super) use self::orchestration::instance_option_supported;
 pub use self::orchestration::{
     GlobalSyncedOptions, SyncedOptionCapability, SyncedOptionJoinAction,
     SyncedOptionJoinPreview, SyncedOptionJoinResolution, SyncedOptionsOverview,
-    get_capabilities, get_global_options, get_instance_option_join_preview,
-    get_overview, get_synced_options_folder, reconcile_all,
-    reconcile_changed_file, reconcile_instance, set_global_option,
-    set_instance_option, synced_options_path,
+    get_capabilities, get_global_options, get_initialized_options,
+    get_instance_option_join_preview, get_overview, get_synced_options_folder,
+    reconcile_all, reconcile_changed_file, reconcile_instance,
+    set_global_option, set_instance_option, synced_options_path,
 };
 pub(crate) use self::orchestration::{
     monitor_persisted_processes, prepare_instance_update,
diff --git a/packages/app-lib/src/api/instance/synced_options/orchestration.rs b/packages/app-lib/src/api/instance/synced_options/orchestration.rs
index abdd54cb9d..e19301dfa7 100644
--- a/packages/app-lib/src/api/instance/synced_options/orchestration.rs
+++ b/packages/app-lib/src/api/instance/synced_options/orchestration.rs
@@ -105,6 +105,18 @@ pub async fn get_global_options() -> crate::Result<GlobalSyncedOptions> {
     get_global_options_with_state(&state).await
 }
 
+pub async fn get_initialized_options() -> crate::Result<GlobalSyncedOptions> {
+    let state = State::get().await?;
+    let _guard = state.lock_synced_options().await;
+    let mut options = GlobalSyncedOptions::default();
+
+    for option in SyncedOption::ALL {
+        options.set(option, canonical_exists(option, &state).await?);
+    }
+
+    Ok(options)
+}
+
 pub async fn get_synced_options_folder() -> crate::Result<PathBuf> {
     let state = State::get().await?;
     create_synced_directories(&state).await?;
@@ -647,9 +659,8 @@ pub async fn get_instance_option_join_preview(
     if !matches!(
         option,
         SyncedOption::GameOptions | SyncedOption::Screenshots
-    )
-        && (sync_files_are_protected(&metadata)
-            || instance_is_running(&metadata, &state).await?)
+    ) && (sync_files_are_protected(&metadata)
+        || instance_is_running(&metadata, &state).await?)
     {
         return Err(ErrorKind::InputError(
             "Close the instance before including it in file syncing."
diff --git a/packages/app-lib/src/state/instances/mod.rs b/packages/app-lib/src/state/instances/mod.rs
index 11a229d77e..cc98a00f7a 100644
--- a/packages/app-lib/src/state/instances/mod.rs
+++ b/packages/app-lib/src/state/instances/mod.rs
@@ -3,9 +3,7 @@ pub use self::content::*;
 
 mod model;
 pub use self::model::*;
-pub(crate) use self::model::{
-    StoredOption, StoredPreference,
-};
+pub(crate) use self::model::{StoredOption, StoredPreference};
 
 pub(crate) mod adapters;
 pub(crate) mod commands;
diff --git a/packages/app-lib/src/state/instances/model/mod.rs b/packages/app-lib/src/state/instances/model/mod.rs
index 0624286cb4..c921568a75 100644
--- a/packages/app-lib/src/state/instances/model/mod.rs
+++ b/packages/app-lib/src/state/instances/model/mod.rs
@@ -17,9 +17,7 @@ pub use self::file::*;
 
 mod game_options;
 pub use self::game_options::{CanonicalValue, GameOptionKind};
-pub(crate) use self::game_options::{
-    StoredOption, StoredPreference,
-};
+pub(crate) use self::game_options::{StoredOption, StoredPreference};
 
 mod instance;
 pub use self::instance::*;
diff --git a/packages/app-lib/src/state/instances/watcher.rs b/packages/app-lib/src/state/instances/watcher.rs
index 0315895759..3053d18add 100644
--- a/packages/app-lib/src/state/instances/watcher.rs
+++ b/packages/app-lib/src/state/instances/watcher.rs
@@ -68,9 +68,8 @@ pub async fn init_watcher() -> crate::Result<FileWatcher> {
                         if let Some(instance_path) = instance_path {
                             let instance_path_str =
                                 instance_path.to_string_lossy().to_string();
-                            let Some(instance_id) = instance_ids
-                                .get(&instance_path_str)
-                                .cloned()
+                            let Some(instance_id) =
+                                instance_ids.get(&instance_path_str).cloned()
                             else {
                                 continue;
                             };
diff --git a/packages/app-lib/src/state/mod.rs b/packages/app-lib/src/state/mod.rs
index e7b5473c40..9ec87e8444 100644
--- a/packages/app-lib/src/state/mod.rs
+++ b/packages/app-lib/src/state/mod.rs
@@ -17,9 +17,7 @@ pub use self::instance_types::*;
 
 pub(crate) mod instances;
 pub use self::instances::*;
-pub(crate) use self::instances::{
-    StoredOption, StoredPreference,
-};
+pub(crate) use self::instances::{StoredOption, StoredPreference};
 pub(crate) use self::instances::{
     game_options_sync_is_enabled, load_game_option_preferences,
     load_game_options_sync_state, load_shared_game_options,
diff --git a/packages/ui/src/components/base/Slider.vue b/packages/ui/src/components/base/Slider.vue
index f2d590f8b3..0132ee9243 100644
--- a/packages/ui/src/components/base/Slider.vue
+++ b/packages/ui/src/components/base/Slider.vue
@@ -46,6 +46,7 @@
 			:model-value="String(currentValue)"
 			type="number"
 			size="medium"
+			:appearance="valueInputAppearance"
 			wrapper-class="slider-value shrink-0"
 			input-class="!font-semibold"
 			:style="{ width: valueInputWidth }"
@@ -62,6 +63,7 @@
 import { computed, ref, watch } from 'vue'
 
 import Input from './inputs/Input.vue'
+import type { InputAppearance } from './inputs/types'
 
 const emit = defineEmits<{ 'update:modelValue': [number] }>()
 
@@ -75,6 +77,7 @@ interface Props {
 	snapRange?: number
 	disabled?: boolean
 	unit?: string
+	valueInputAppearance?: InputAppearance
 }
 
 const props = withDefaults(defineProps<Props>(), {
@@ -87,6 +90,7 @@ const props = withDefaults(defineProps<Props>(), {
 	snapRange: 100,
 	disabled: false,
 	unit: '',
+	valueInputAppearance: 'surface',
 })
 
 const currentValue = ref(clampValue(props.modelValue))

From 52a8e52b0e900a649f4a14d36f18f27db10ff5e1 Mon Sep 17 00:00:00 2001
From: "Calum H. (IMB11)" <contact@cal.engineer>
Date: Wed, 2 Sep 2026 16:33:44 +0100
Subject: [PATCH 15/33] fix: qa

---
 .../game-settings/GameSettingRow.vue          |   2 +-
 .../game-settings/GameSettingsModal.vue       | 175 +++++++++++-------
 packages/ui/src/components/base/Slider.vue    |   7 +-
 3 files changed, 114 insertions(+), 70 deletions(-)

diff --git a/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingRow.vue b/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingRow.vue
index f3bf0f4b75..69063af208 100644
--- a/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingRow.vue
+++ b/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingRow.vue
@@ -241,7 +241,7 @@ function updateValue(value: string | number | boolean | undefined) {
 				:snap-points="[0, 50, 100]"
 				:snap-range="5"
 				:disabled="editorDisabled"
-				value-input-appearance="transparent"
+				value-input-class="!bg-transparent"
 				class="[&_input]:!text-secondary"
 				@update:model-value="updateValue"
 			/>
diff --git a/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingsModal.vue b/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingsModal.vue
index f4de08ced1..a8717bd8e2 100644
--- a/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingsModal.vue
+++ b/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingsModal.vue
@@ -35,6 +35,7 @@ import { computed, onUnmounted, ref } from 'vue'
 import {
 	type EditableGameSetting,
 	type GameOptionCanonicalValue,
+	type GameSettingChange,
 	type GameSettingCategory,
 	type GameSettingsEditorState,
 	get_local_game_options_config,
@@ -127,23 +128,6 @@ const messages = defineMessages({
 		id: 'app.settings.synced-options.game-settings.unsaved-changes',
 		defaultMessage: 'You have unsaved changes.',
 	},
-	saved: {
-		id: 'app.settings.synced-options.game-settings.saved',
-		defaultMessage: 'Game settings updated',
-	},
-	savedSummary: {
-		id: 'app.settings.synced-options.game-settings.saved-summary',
-		defaultMessage: 'Your changes were saved.',
-	},
-	savedLater: {
-		id: 'app.settings.synced-options.game-settings.saved-later',
-		defaultMessage:
-			'Your changes were saved and will finish syncing when your instances are ready.',
-	},
-	savedWithProblems: {
-		id: 'app.settings.synced-options.game-settings.saved-with-problems',
-		defaultMessage: 'Your changes were saved, but some instances could not be updated.',
-	},
 	conflictTitle: {
 		id: 'app.settings.synced-options.game-settings.conflict-title',
 		defaultMessage: 'These settings changed elsewhere',
@@ -168,6 +152,7 @@ let allowClose = false
 let previewTimer: ReturnType<typeof setTimeout> | null = null
 let previewGeneration = 0
 let loadGeneration = 0
+let saveGeneration = 0
 
 const isLocalEditor = computed(() => !!props.instanceId)
 
@@ -360,6 +345,7 @@ function reset() {
 	previewTimer = null
 	previewGeneration++
 	loadGeneration++
+	saveGeneration++
 	baseState.value = null
 	draftState.value = null
 	loading.value = false
@@ -383,7 +369,7 @@ async function confirmDiscard() {
 }
 
 function cancelChanges() {
-	if (saving.value || !baseState.value) return
+	if (!baseState.value) return
 	if (previewTimer) clearTimeout(previewTimer)
 	previewTimer = null
 	previewGeneration++
@@ -436,7 +422,7 @@ function setCanonicalValue(optionId: string, value: GameOptionCanonicalValue | n
 }
 
 function enableVisible() {
-	if (saving.value || !draftState.value) return
+	if (!draftState.value) return
 	const optionIds = new Set(enableCandidates.value.map((setting) => setting.option_id))
 	draftState.value.settings = draftState.value.settings.map((setting) =>
 		optionIds.has(setting.option_id)
@@ -447,7 +433,7 @@ function enableVisible() {
 }
 
 function disableVisible() {
-	if (saving.value || !draftState.value) return
+	if (!draftState.value) return
 	const optionIds = new Set(disableCandidates.value.map((setting) => setting.option_id))
 	draftState.value.settings = draftState.value.settings.map((setting) =>
 		optionIds.has(setting.option_id)
@@ -495,7 +481,7 @@ function mergePreview(preview: GameSettingsEditorState) {
 			? { ...(previousBaseSettings.get(setting.option_id) ?? setting) }
 			: setting,
 	)
-	nextDraft.settings = nextDraft.settings.map((setting) => {
+	nextDraft.settings = nextDraft.settings.map((setting): EditableGameSetting => {
 		const staged = stagedSettings.get(setting.option_id)
 		if (!staged) return setting
 		return {
@@ -529,13 +515,63 @@ async function preview() {
 	}
 }
 
+function applyChangesToRefreshedState(
+	refreshed: GameSettingsEditorState,
+	stagedDraft: GameSettingsEditorState,
+	changes: GameSettingChange[],
+	touchedOptionIds: ReadonlySet<string>,
+	conflictOptionIds: ReadonlySet<string> = new Set(),
+) {
+	const changesById = new Map(changes.map((change) => [change.option_id, change]))
+	const stagedSettings = new Map(
+		stagedDraft.settings.map((setting) => [setting.option_id, setting]),
+	)
+	const nextBase = cloneGameSettingsState(refreshed)
+	const nextDraft = cloneGameSettingsState(refreshed)
+
+	nextDraft.settings = nextDraft.settings.map((setting) => {
+		const change = changesById.get(setting.option_id)
+		const staged = stagedSettings.get(setting.option_id)
+		if (!change || !staged) return setting
+
+		return {
+			...setting,
+			...(change.sync_enabled !== undefined ? { sync_enabled: staged.sync_enabled } : {}),
+			...(change.canonical_value !== undefined
+				? {
+						canonical_value: staged.canonical_value,
+						value_state: staged.value_state,
+					}
+				: {}),
+			validation_error: conflictOptionIds.has(setting.option_id)
+				? 'changed_since_opened'
+				: staged.validation_error,
+		}
+	})
+
+	baseState.value = nextBase
+	draftState.value = nextDraft
+	touchedValueOptionIds.value = new Set(
+		[...touchedOptionIds].filter(
+			(optionId) => changesById.get(optionId)?.canonical_value !== undefined,
+		),
+	)
+}
+
 async function save() {
+	if (saving.value) return
 	const request = editorRequest()
-	if (!request || request.changes.length === 0) return
+	if (!request || request.changes.length === 0 || !baseState.value || !draftState.value) return
 
 	if (previewTimer) clearTimeout(previewTimer)
 	previewTimer = null
 	previewGeneration++
+	const generation = ++saveGeneration
+	const previousBase = cloneGameSettingsState(baseState.value)
+	const optimisticState = cloneGameSettingsState(draftState.value)
+	const previouslyTouchedOptionIds = new Set(touchedValueOptionIds.value)
+	baseState.value = cloneGameSettingsState(optimisticState)
+	touchedValueOptionIds.value = new Set()
 	saving.value = true
 	try {
 		const result = props.instanceId
@@ -547,28 +583,26 @@ async function save() {
 				(props.instanceId
 					? await get_local_game_options_config(props.instanceId)
 					: await get_synced_game_options_config())
-			const previousDraft = draftState.value
-			const stagedChanges = new Map(request.changes.map((change) => [change.option_id, change]))
+			if (generation !== saveGeneration || !draftState.value) return
+			previewGeneration++
+			const stagedDraft = cloneGameSettingsState(draftState.value)
+			const retainedTouchedOptionIds = new Set([
+				...previouslyTouchedOptionIds,
+				...touchedValueOptionIds.value,
+			])
+			const stagedChanges = gameSettingChanges(
+				previousBase,
+				stagedDraft,
+				retainedTouchedOptionIds,
+			)
 			const conflicts = new Set(result.conflicts)
-			baseState.value = cloneGameSettingsState(refreshed)
-			draftState.value = cloneGameSettingsState(refreshed)
-
-			for (const setting of draftState.value.settings) {
-				const previous = previousDraft?.settings.find(
-					(candidate) => candidate.option_id === setting.option_id,
-				)
-				if (conflicts.has(setting.option_id)) {
-					setting.validation_error = 'changed_since_opened'
-					continue
-				}
-				const change = stagedChanges.get(setting.option_id)
-				if (!change || !previous) continue
-				if (change.sync_enabled !== undefined) setting.sync_enabled = previous.sync_enabled
-				if (change.canonical_value !== undefined) {
-					setting.canonical_value = previous.canonical_value
-					setting.value_state = previous.value_state
-				}
-			}
+			applyChangesToRefreshedState(
+				refreshed,
+				stagedDraft,
+				stagedChanges,
+				retainedTouchedOptionIds,
+				conflicts,
+			)
 
 			addNotification({
 				type: 'warning',
@@ -584,31 +618,45 @@ async function save() {
 			return
 		}
 
-		const savedWithProblems = result.failed > 0 || result.unsupported > 0
-		addNotification({
-			type: savedWithProblems ? 'warning' : 'success',
-			title: formatMessage(messages.saved),
-			text: formatMessage(
-				savedWithProblems
-					? messages.savedWithProblems
-					: result.deferred > 0
-						? messages.savedLater
-						: messages.savedSummary,
-			),
-		})
 		const refreshed =
 			result.state ??
 			(props.instanceId
 				? await get_local_game_options_config(props.instanceId)
 				: await get_synced_game_options_config())
-		baseState.value = cloneGameSettingsState(refreshed)
-		draftState.value = cloneGameSettingsState(refreshed)
-		touchedValueOptionIds.value = new Set()
+		if (generation !== saveGeneration) {
+			emit('saved')
+			return
+		}
+		if (!baseState.value || !draftState.value) return
+		previewGeneration++
+		const stagedDraft = cloneGameSettingsState(draftState.value)
+		const touchedSinceSave = new Set(touchedValueOptionIds.value)
+		const changesSinceSave = gameSettingChanges(
+			optimisticState,
+			stagedDraft,
+			touchedSinceSave,
+		)
+		applyChangesToRefreshedState(
+			refreshed,
+			stagedDraft,
+			changesSinceSave,
+			touchedSinceSave,
+		)
+		if (changesSinceSave.length > 0) schedulePreview()
 		emit('saved')
 	} catch (error) {
+		if (generation === saveGeneration && draftState.value) {
+			previewGeneration++
+			baseState.value = previousBase
+			touchedValueOptionIds.value = new Set([
+				...previouslyTouchedOptionIds,
+				...touchedValueOptionIds.value,
+			])
+			if (dirtyChanges.value.length > 0) schedulePreview()
+		}
 		handleError(error)
 	} finally {
-		saving.value = false
+		if (generation === saveGeneration) saving.value = false
 	}
 }
 
@@ -627,7 +675,6 @@ defineExpose({ show, hide })
 		:before-hide="beforeHide"
 		:before-tab-change="changeCategory"
 		:on-after-hide="reset"
-		:disable-close="saving"
 		:floating-action-bar-shown="isDirty"
 		:max-width="'min(1080px, calc(95vw - 2rem))'"
 		:width="'min(1080px, calc(95vw - 2rem))'"
@@ -658,10 +705,9 @@ defineExpose({ show, hide })
 						<Button
 							size="lg"
 							:disabled="
-								saving ||
-								(allCategorySettingsSynced
+								allCategorySettingsSynced
 									? disableCandidates.length === 0
-									: enableCandidates.length === 0)
+									: enableCandidates.length === 0
 							"
 							@click="toggleVisibleSync"
 						>
@@ -708,7 +754,6 @@ defineExpose({ show, hide })
 							:key="setting.option_id"
 							:setting="setting"
 							:keybind-conflicts="keybindConflicts.get(setting.option_id)"
-							:disabled="saving"
 							:show-sync-toggle="!isLocalEditor"
 							@update:sync-enabled="setSyncEnabled(setting.option_id, $event)"
 							@update:canonical-value="setCanonicalValue(setting.option_id, $event)"
@@ -724,7 +769,7 @@ defineExpose({ show, hide })
 					{{ formatMessage(messages.unsavedChanges) }}
 				</p>
 				<div class="ml-auto flex gap-2">
-					<Button type="outlined" :disabled="saving" @click="cancelChanges">
+					<Button type="outlined" @click="cancelChanges">
 						<XIcon />
 						{{ formatMessage(commonMessages.cancelButton) }}
 					</Button>
diff --git a/packages/ui/src/components/base/Slider.vue b/packages/ui/src/components/base/Slider.vue
index 0132ee9243..f625cc44c0 100644
--- a/packages/ui/src/components/base/Slider.vue
+++ b/packages/ui/src/components/base/Slider.vue
@@ -46,7 +46,7 @@
 			:model-value="String(currentValue)"
 			type="number"
 			size="medium"
-			:appearance="valueInputAppearance"
+			:class="valueInputClass"
 			wrapper-class="slider-value shrink-0"
 			input-class="!font-semibold"
 			:style="{ width: valueInputWidth }"
@@ -63,7 +63,6 @@
 import { computed, ref, watch } from 'vue'
 
 import Input from './inputs/Input.vue'
-import type { InputAppearance } from './inputs/types'
 
 const emit = defineEmits<{ 'update:modelValue': [number] }>()
 
@@ -77,7 +76,7 @@ interface Props {
 	snapRange?: number
 	disabled?: boolean
 	unit?: string
-	valueInputAppearance?: InputAppearance
+	valueInputClass?: string
 }
 
 const props = withDefaults(defineProps<Props>(), {
@@ -90,7 +89,7 @@ const props = withDefaults(defineProps<Props>(), {
 	snapRange: 100,
 	disabled: false,
 	unit: '',
-	valueInputAppearance: 'surface',
+	valueInputClass: '',
 })
 
 const currentValue = ref(clampValue(props.modelValue))

From 1cd782b6e882ad7fe9b31bd090d4e9e6d5c176cc Mon Sep 17 00:00:00 2001
From: "Calum H. (IMB11)" <contact@cal.engineer>
Date: Wed, 2 Sep 2026 21:03:26 +0100
Subject: [PATCH 16/33] fix: qa

---
 apps/app-frontend/src/App.vue                 |  78 +++-
 .../components/ui/QuickInstanceSwitcher.vue   |  17 +-
 .../components/ui/modal/AppSettingsModal.vue  |  11 +
 .../ui/settings/display/BehaviorSettings.vue  |  27 --
 .../ui/settings/display/FeaturesSettings.vue  | 324 ++++++++++++++
 .../instances/InstancesSyncedSettings.vue     | 408 +++++++++++++++---
 .../game-settings/GameKeybindInput.vue        |   8 +-
 .../game-settings/GameSettingRow.vue          |  41 +-
 .../game-settings/GameSettingsModal.vue       |  29 +-
 .../instances/game-settings/game-keybinds.ts  |   9 +-
 .../game-settings/game-setting-editors.ts     |  14 +-
 .../src/composables/use-app-settings.ts       |  11 +
 .../composables/use-quick-instance-limit.ts   |  28 ++
 apps/app-frontend/src/helpers/settings.ts     |   5 +
 apps/app-frontend/src/helpers/types.d.ts      |   5 +
 .../app-frontend/src/locales/en-US/index.json | 111 +++--
 .../components/settings-modal/index.vue       |  18 +-
 .../settings-modal/java-settings.vue          |  50 +--
 .../synced-options-settings.vue               |  71 ++-
 .../src/pages/instance/layout.vue             |  12 +-
 apps/labrinth/src/models/v3/preferences.rs    |  10 +
 .../api-client/src/modules/labrinth/types.ts  |   5 +
 ...01b9b6b187e7c75ca59fdffda2f0fb10e964.json} |   6 +-
 ...db30d98573c1ac04705da186d0cf88b20ca7.json} |  36 +-
 ...able-synced-options-for-fresh-installs.sql |   9 +
 ...0_promote-instance-navigation-settings.sql |  25 ++
 .../20260902140000_sync-features-setting.sql  |   5 +
 packages/app-lib/src/state/settings.rs        |  38 +-
 28 files changed, 1171 insertions(+), 240 deletions(-)
 create mode 100644 apps/app-frontend/src/components/ui/settings/display/FeaturesSettings.vue
 create mode 100644 apps/app-frontend/src/composables/use-quick-instance-limit.ts
 rename packages/app-lib/.sqlx/{query-88c6a22aa112f10dce9d42779f06c723b356263ffc83aabb645c9fb5b6d5aa7c.json => query-05b2976127c9c71488506c93b27801b9b6b187e7c75ca59fdffda2f0fb10e964.json} (78%)
 rename packages/app-lib/.sqlx/{query-29df6a29d9221b9bbea45e024fb26f5b6a3155788880369af940fcd268d3cb94.json => query-a37f3c9cc8c1d8aa620f83569633db30d98573c1ac04705da186d0cf88b20ca7.json} (82%)
 create mode 100644 packages/app-lib/migrations/20260902120000_enable-synced-options-for-fresh-installs.sql
 create mode 100644 packages/app-lib/migrations/20260902130000_promote-instance-navigation-settings.sql
 create mode 100644 packages/app-lib/migrations/20260902140000_sync-features-setting.sql

diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue
index 52f5c6d5c7..da83659c1c 100644
--- a/apps/app-frontend/src/App.vue
+++ b/apps/app-frontend/src/App.vue
@@ -106,6 +106,10 @@ import { useAppEvent } from '@/composables/use-app-event'
 import { useAppSettings } from '@/composables/use-app-settings.ts'
 import { useError } from '@/composables/use-error.js'
 import { useInstanceMetadataRefresh } from '@/composables/use-instance-metadata-refresh'
+import {
+	QUICK_INSTANCE_LIMIT_MAX,
+	useQuickInstanceLimit,
+} from '@/composables/use-quick-instance-limit.ts'
 import { isDarkTheme, useTheme } from '@/composables/use-theme.ts'
 import { config } from '@/config'
 import { getAccountAppearance, rememberAccountAppearance } from '@/helpers/account-appearance.ts'
@@ -189,6 +193,7 @@ import {
 
 const appSettings = useAppSettings()
 const appTheme = useTheme()
+const quickInstances = useQuickInstanceLimit()
 const router = useRouter()
 const route = useRoute()
 const { channel: appEventChannel, events: appEvents } = setupAppEventsProvider()
@@ -725,6 +730,11 @@ async function setupApp() {
 		toggle_sidebar,
 		sync_theme_across_devices,
 		sync_behavior_across_devices,
+		sync_features_across_devices,
+		show_files_tab_in_instances,
+		show_worlds_tab_in_instances,
+		show_screenshots_tab_in_instances,
+		show_skin_selector_in_sidebar,
 		developer_mode,
 		feature_flags,
 		pending_update_toast_for_version,
@@ -749,8 +759,13 @@ async function setupApp() {
 	appTheme.advancedRendering = advanced_rendering
 	appTheme.syncAcrossDevices = sync_theme_across_devices
 	appSettings.syncBehaviorAcrossDevices = sync_behavior_across_devices
+	appSettings.syncFeaturesAcrossDevices = sync_features_across_devices
 	appSettings.hideNametagSkinsPage = hide_nametag_skins_page
 	appSettings.toggleSidebar = toggle_sidebar
+	appSettings.showFilesTabInInstances = show_files_tab_in_instances
+	appSettings.showWorldsTabInInstances = show_worlds_tab_in_instances
+	appSettings.showScreenshotsTabInInstances = show_screenshots_tab_in_instances
+	appSettings.showSkinSelectorInSidebar = show_skin_selector_in_sidebar
 	appSettings.devMode = developer_mode
 	stateInitialized.value = true
 
@@ -1096,7 +1111,6 @@ watch(
 
 				if (behavior && appSettings.syncBehaviorAcrossDevices) {
 					const behaviorFeatureFlags = {
-						worlds_in_home: behavior.show_jump_in,
 						compact_instance_cards: behavior.compact_instance_cards,
 						show_instance_play_time: behavior.show_play_time,
 						skip_unknown_pack_warning: !behavior.warn_on_unknown_modpacks,
@@ -1119,7 +1133,6 @@ watch(
 						settings.hide_nametag_skins_page = behavior.hide_nametag
 						settingsChanged = true
 					}
-
 					const showAllScreenshots = behavior.show_all_screenshots
 					if (typeof showAllScreenshots === 'boolean') {
 						const globalSyncedOptions =
@@ -1146,6 +1159,61 @@ watch(
 					}
 				}
 
+				if (behavior && appSettings.syncFeaturesAcrossDevices) {
+					const featureFlags = {
+						worlds_in_home: behavior.show_jump_in,
+					}
+					const showFilesTab =
+						behavior.show_files_tab_in_instances ?? settings.show_files_tab_in_instances
+					const showWorldsTab =
+						behavior.show_worlds_tab_in_instances ?? settings.show_worlds_tab_in_instances
+					const showScreenshotsTab =
+						behavior.show_screenshots_tab_in_instances ?? settings.show_screenshots_tab_in_instances
+					const showSkinSelector =
+						behavior.show_skin_selector_in_sidebar ?? settings.show_skin_selector_in_sidebar
+					const quickInstanceCount = Math.min(
+						Math.max(
+							typeof behavior.quick_instance_count === 'number'
+								? behavior.quick_instance_count
+								: (quickInstances.limit.value ?? QUICK_INSTANCE_LIMIT_MAX),
+							0,
+						),
+						QUICK_INSTANCE_LIMIT_MAX,
+					)
+
+					appSettings.showFilesTabInInstances = showFilesTab
+					appSettings.showWorldsTabInInstances = showWorldsTab
+					appSettings.showScreenshotsTabInInstances = showScreenshotsTab
+					appSettings.showSkinSelectorInSidebar = showSkinSelector
+					Object.assign(appSettings.featureFlags, featureFlags)
+					quickInstances.setLimit(
+						quickInstanceCount >= QUICK_INSTANCE_LIMIT_MAX ? null : quickInstanceCount,
+					)
+
+					if (settings.show_files_tab_in_instances !== showFilesTab) {
+						settings.show_files_tab_in_instances = showFilesTab
+						settingsChanged = true
+					}
+					if (settings.show_worlds_tab_in_instances !== showWorldsTab) {
+						settings.show_worlds_tab_in_instances = showWorldsTab
+						settingsChanged = true
+					}
+					if (settings.show_screenshots_tab_in_instances !== showScreenshotsTab) {
+						settings.show_screenshots_tab_in_instances = showScreenshotsTab
+						settingsChanged = true
+					}
+					if (settings.show_skin_selector_in_sidebar !== showSkinSelector) {
+						settings.show_skin_selector_in_sidebar = showSkinSelector
+						settingsChanged = true
+					}
+					for (const [flag, value] of Object.entries(featureFlags)) {
+						if (settings.feature_flags[flag] !== value) {
+							settings.feature_flags[flag] = value
+							settingsChanged = true
+						}
+					}
+				}
+
 				if (settingsChanged) {
 					await setSettings(settings)
 				}
@@ -2082,7 +2150,11 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
 			>
 				<CompassIcon />
 			</NavButton>
-			<NavButton v-tooltip.right="formatMessage(appMessages.skinSelectorLabel)" to="/skins">
+			<NavButton
+				v-if="appSettings.showSkinSelectorInSidebar"
+				v-tooltip.right="formatMessage(appMessages.skinSelectorLabel)"
+				to="/skins"
+			>
 				<ShirtIcon />
 			</NavButton>
 			<NavButton
diff --git a/apps/app-frontend/src/components/ui/QuickInstanceSwitcher.vue b/apps/app-frontend/src/components/ui/QuickInstanceSwitcher.vue
index 99cc39a147..49e9bd103f 100644
--- a/apps/app-frontend/src/components/ui/QuickInstanceSwitcher.vue
+++ b/apps/app-frontend/src/components/ui/QuickInstanceSwitcher.vue
@@ -16,6 +16,7 @@ import { useRouter } from 'vue-router'
 import NavButton from '@/components/ui/NavButton.vue'
 import { useAppEvent } from '@/composables/use-app-event'
 import { handleSevereError } from '@/composables/use-error.js'
+import { useQuickInstanceLimit } from '@/composables/use-quick-instance-limit.ts'
 import { trackEvent } from '@/helpers/analytics'
 import { getInstanceIconUrl, kill, run } from '@/helpers/instance'
 import { get_all } from '@/helpers/process'
@@ -24,8 +25,6 @@ import { instanceListQueryOptions } from '@/pages/instance/query-options'
 
 const ITEM_SIZE = 52
 const APPROX_USED_VERTICAL_SPACE = 475 // doesn't need to be exact lol just close enough so there's a little gap and no overflow
-const STORAGE_KEY = 'modrinth-quick-instance-count'
-
 const { handleError } = injectNotificationManager()
 const instancesQuery = useQuery(instanceListQueryOptions())
 const router = useRouter()
@@ -54,12 +53,12 @@ const allInstances = computed(() =>
 	}),
 )
 const dragging = ref(false)
-
-const stored = localStorage.getItem(STORAGE_KEY)
-const userLimit = ref(stored === null ? null : Number(stored))
+const quickInstances = useQuickInstanceLimit()
 
 const maxVisible = computed(() => Math.min(maxAuto.value, allInstances.value.length))
-const visibleCount = computed(() => Math.min(userLimit.value ?? maxVisible.value, maxVisible.value))
+const visibleCount = computed(() =>
+	Math.min(quickInstances.limit.value ?? maxVisible.value, maxVisible.value),
+)
 const recentInstances = computed(() => allInstances.value.slice(0, visibleCount.value))
 const canDrag = computed(() => maxVisible.value > 0)
 const showOverdrag = ref(false)
@@ -74,11 +73,9 @@ const updateMaxAuto = () => {
 const setLimit = (count) => {
 	const clamped = Math.max(0, Math.min(count, maxVisible.value))
 	if (clamped >= maxVisible.value) {
-		userLimit.value = null
-		localStorage.removeItem(STORAGE_KEY)
+		quickInstances.setLimit(null)
 	} else {
-		userLimit.value = clamped
-		localStorage.setItem(STORAGE_KEY, String(clamped))
+		quickInstances.setLimit(clamped)
 	}
 }
 
diff --git a/apps/app-frontend/src/components/ui/modal/AppSettingsModal.vue b/apps/app-frontend/src/components/ui/modal/AppSettingsModal.vue
index 78b58fc443..a3e6285f9a 100644
--- a/apps/app-frontend/src/components/ui/modal/AppSettingsModal.vue
+++ b/apps/app-frontend/src/components/ui/modal/AppSettingsModal.vue
@@ -4,6 +4,7 @@ import {
 	GaugeIcon,
 	HeartHandshakeIcon,
 	LanguagesIcon,
+	LightBulbIcon,
 	ModrinthIcon,
 	PaintbrushIcon,
 	RefreshCwIcon,
@@ -32,6 +33,7 @@ import SocialSettings from '@/components/ui/settings/account/SocialSettings.vue'
 import AppearanceSettings from '@/components/ui/settings/display/AppearanceSettings.vue'
 import BehaviorSettings from '@/components/ui/settings/display/BehaviorSettings.vue'
 import FeatureFlagSettings from '@/components/ui/settings/display/FeatureFlagSettings.vue'
+import FeaturesSettings from '@/components/ui/settings/display/FeaturesSettings.vue'
 import LanguageSettings from '@/components/ui/settings/display/LanguageSettings.vue'
 import InstancesSyncedSettings from '@/components/ui/settings/instances/InstancesSyncedSettings.vue'
 import JavaSettings from '@/components/ui/settings/instances/JavaSettings.vue'
@@ -81,6 +83,15 @@ const tabs = [
 		icon: PaintbrushIcon,
 		content: AppearanceSettings,
 	},
+	{
+		name: defineMessage({
+			id: 'app.settings.tabs.features',
+			defaultMessage: 'Features',
+		}),
+		category: tabCategories.display,
+		icon: LightBulbIcon,
+		content: FeaturesSettings,
+	},
 	{
 		name: defineMessage({
 			id: 'app.settings.tabs.behavior',
diff --git a/apps/app-frontend/src/components/ui/settings/display/BehaviorSettings.vue b/apps/app-frontend/src/components/ui/settings/display/BehaviorSettings.vue
index 2a2cf1e1c5..b001da35eb 100644
--- a/apps/app-frontend/src/components/ui/settings/display/BehaviorSettings.vue
+++ b/apps/app-frontend/src/components/ui/settings/display/BehaviorSettings.vue
@@ -31,7 +31,6 @@ const { updatePreferences } = injectUserPreferences()
 const settingsModal = inject(appSettingsModalContextKey, null)
 const queryClient = useQueryClient()
 
-const worldsInHomeFlag: FeatureFlag = 'worlds_in_home'
 const compactInstanceCardsFlag: FeatureFlag = 'compact_instance_cards'
 const skipNonEssentialWarningsFlag: FeatureFlag = 'skip_non_essential_warnings'
 const skipUnknownPackWarningFlag: FeatureFlag = 'skip_unknown_pack_warning'
@@ -95,15 +94,6 @@ const messages = defineMessages({
 		id: 'app.appearance-settings.toggle-sidebar.description',
 		defaultMessage: 'Hide the right sidebar by default and add a button to show or hide it.',
 	},
-	jumpBackIntoWorldsTitle: {
-		id: 'app.appearance-settings.jump-back-into-worlds.title',
-		defaultMessage: 'Jump into worlds or instances',
-	},
-	jumpBackIntoWorldsDescription: {
-		id: 'app.appearance-settings.jump-back-into-worlds.description',
-		defaultMessage:
-			'Show recently played worlds or instances in the "Jump in" section on the Home page.',
-	},
 	compactModeTitle: {
 		id: 'app.appearance-settings.compact-mode.title',
 		defaultMessage: 'Compact mode',
@@ -152,7 +142,6 @@ type BehaviorSettingsState = {
 	syncBehaviorAcrossDevices: boolean
 	minimizeApp: boolean
 	hideRightSidebar: boolean
-	showJumpIn: boolean
 	showAllScreenshots: boolean
 	compactInstanceCards: boolean
 	showPlayTime: boolean
@@ -176,7 +165,6 @@ function getBehaviorSettingsState(
 		syncBehaviorAcrossDevices: settings.sync_behavior_across_devices,
 		minimizeApp: settings.hide_on_process_start,
 		hideRightSidebar: settings.toggle_sidebar,
-		showJumpIn: settings.feature_flags[worldsInHomeFlag] ?? DEFAULT_FEATURE_FLAGS[worldsInHomeFlag],
 		showAllScreenshots: globalSyncedOptions.screenshots,
 		compactInstanceCards:
 			settings.feature_flags[compactInstanceCardsFlag] ??
@@ -204,7 +192,6 @@ const { saved, current, changes, saving, hasChanges, reset, save } = useSavable(
 				behavior: {
 					minimize_app: value.minimizeApp,
 					hide_right_sidebar: value.hideRightSidebar,
-					show_jump_in: value.showJumpIn,
 					compact_instance_cards: value.compactInstanceCards,
 					show_play_time: value.showPlayTime,
 					hide_nametag: value.hideNametag,
@@ -223,7 +210,6 @@ const { saved, current, changes, saving, hasChanges, reset, save } = useSavable(
 			hide_nametag_skins_page: value.hideNametag,
 			feature_flags: {
 				...persistedSettings.value.feature_flags,
-				[worldsInHomeFlag]: value.showJumpIn,
 				[compactInstanceCardsFlag]: value.compactInstanceCards,
 				[showPlayTimeFlag]: value.showPlayTime,
 				[skipUnknownPackWarningFlag]: !value.warnOnUnknownModpacks,
@@ -248,7 +234,6 @@ const { saved, current, changes, saving, hasChanges, reset, save } = useSavable(
 		appSettings.setBehaviorSyncAcrossDevices(value.syncBehaviorAcrossDevices)
 		appSettings.toggleSidebar = value.hideRightSidebar
 		appSettings.hideNametagSkinsPage = value.hideNametag
-		appSettings.featureFlags[worldsInHomeFlag] = value.showJumpIn
 		appSettings.featureFlags[compactInstanceCardsFlag] = value.compactInstanceCards
 		appSettings.featureFlags[showPlayTimeFlag] = value.showPlayTime
 		appSettings.featureFlags[skipUnknownPackWarningFlag] = !value.warnOnUnknownModpacks
@@ -353,18 +338,6 @@ onBeforeUnmount(() => {
 				<Toggle id="show-all-screenshots" v-model="current.showAllScreenshots" />
 			</div>
 
-			<div class="flex items-center justify-between gap-4">
-				<div>
-					<h3 class="m-0 text-lg font-semibold text-contrast">
-						{{ formatMessage(messages.jumpBackIntoWorldsTitle) }}
-					</h3>
-					<p class="m-0 mt-1">
-						{{ formatMessage(messages.jumpBackIntoWorldsDescription) }}
-					</p>
-				</div>
-				<Toggle id="jump-back-into-worlds" v-model="current.showJumpIn" />
-			</div>
-
 			<div class="flex items-center justify-between gap-4">
 				<div>
 					<h3 class="m-0 text-lg font-semibold text-contrast">
diff --git a/apps/app-frontend/src/components/ui/settings/display/FeaturesSettings.vue b/apps/app-frontend/src/components/ui/settings/display/FeaturesSettings.vue
new file mode 100644
index 0000000000..3320c8c6fd
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/settings/display/FeaturesSettings.vue
@@ -0,0 +1,324 @@
+<script setup lang="ts">
+import {
+	defineMessages,
+	injectAuth,
+	injectUserPreferences,
+	Slider,
+	Toggle,
+	useSavable,
+	useVIntl,
+} from '@modrinth/ui'
+import { inject, onBeforeUnmount, onMounted, ref } from 'vue'
+
+import {
+	DEFAULT_FEATURE_FLAGS,
+	type FeatureFlag,
+	useAppSettings,
+} from '@/composables/use-app-settings.ts'
+import {
+	QUICK_INSTANCE_LIMIT_MAX,
+	useQuickInstanceLimit,
+} from '@/composables/use-quick-instance-limit.ts'
+import { type AppSettings, get, set } from '@/helpers/settings.ts'
+import { appSettingsModalContextKey } from '@/providers/app-settings-modal'
+
+const appSettings = useAppSettings()
+const { formatMessage } = useVIntl()
+const auth = injectAuth()
+const { updatePreferences } = injectUserPreferences()
+const settingsModal = inject(appSettingsModalContextKey, null)
+const quickInstances = useQuickInstanceLimit()
+
+const showJumpInFlag: FeatureFlag = 'worlds_in_home'
+
+const messages = defineMessages({
+	syncAcrossDevicesTitle: {
+		id: 'app.features-settings.sync-across-devices.title',
+		defaultMessage: 'Sync features across devices',
+	},
+	syncAcrossDevicesDescription: {
+		id: 'app.features-settings.sync-across-devices.description',
+		defaultMessage:
+			"Use these feature settings everywhere you're signed in. Turn this off to keep separate settings on this device.",
+	},
+	syncAcrossDevicesSignedOutTooltip: {
+		id: 'app.features-settings.sync-across-devices.signed-out-tooltip',
+		defaultMessage: 'Sign into a Modrinth account to sync settings.',
+	},
+	instancePagesTitle: {
+		id: 'app.features-settings.instance-pages.title',
+		defaultMessage: 'Instance pages',
+	},
+	showWorldsTabTitle: {
+		id: 'app.features-settings.show-worlds-tab.title',
+		defaultMessage: 'Show Worlds tab in instances',
+	},
+	showWorldsTabDescription: {
+		id: 'app.features-settings.show-worlds-tab.description',
+		defaultMessage: 'Browse and launch worlds from each instance.',
+	},
+	showFilesTabTitle: {
+		id: 'app.features-settings.show-files-tab.title',
+		defaultMessage: 'Show Files tab in instances',
+	},
+	showFilesTabDescription: {
+		id: 'app.features-settings.show-files-tab.description',
+		defaultMessage: 'Browse the files in each instance from its navigation.',
+	},
+	showScreenshotsTabTitle: {
+		id: 'app.features-settings.show-screenshots-tab.title',
+		defaultMessage: 'Show Screenshots tab in instances',
+	},
+	showScreenshotsTabDescription: {
+		id: 'app.features-settings.show-screenshots-tab.description',
+		defaultMessage: 'Browse screenshots from the instance where they were taken.',
+	},
+	sidebarTitle: {
+		id: 'app.features-settings.sidebar.title',
+		defaultMessage: 'Sidebar',
+	},
+	showSkinSelectorTitle: {
+		id: 'app.features-settings.show-skin-selector.title',
+		defaultMessage: 'Show skin selector in sidebar',
+	},
+	showSkinSelectorDescription: {
+		id: 'app.features-settings.show-skin-selector.description',
+		defaultMessage: 'Add a shortcut to the skin selector to the left sidebar.',
+	},
+	quickInstancesTitle: {
+		id: 'app.features-settings.quick-instances.title',
+		defaultMessage: 'Quick instances in sidebar',
+	},
+	quickInstancesDescription: {
+		id: 'app.features-settings.quick-instances.description',
+		defaultMessage:
+			'Choose the maximum number of recent instances shown in the left sidebar. You can also adjust this by dragging the divider.',
+	},
+	playPageTitle: {
+		id: 'app.features-settings.play-page.title',
+		defaultMessage: 'Play page',
+	},
+	showJumpInTitle: {
+		id: 'app.features-settings.show-jump-in.title',
+		defaultMessage: 'Show Jump in section',
+	},
+	showJumpInDescription: {
+		id: 'app.features-settings.show-jump-in.description',
+		defaultMessage: 'Show recently played worlds and instances at the top of the Play page.',
+	},
+})
+
+type FeaturesSettingsState = {
+	syncFeaturesAcrossDevices: boolean
+	showFilesTab: boolean
+	showWorldsTab: boolean
+	showScreenshotsTab: boolean
+	showSkinSelector: boolean
+	quickInstanceCount: number
+	showJumpIn: boolean
+}
+
+const persistedSettings = ref(await get())
+
+function getFeaturesSettingsState(settings: AppSettings): FeaturesSettingsState {
+	return {
+		syncFeaturesAcrossDevices: settings.sync_features_across_devices,
+		showFilesTab: settings.show_files_tab_in_instances,
+		showWorldsTab: settings.show_worlds_tab_in_instances,
+		showScreenshotsTab: settings.show_screenshots_tab_in_instances,
+		showSkinSelector: settings.show_skin_selector_in_sidebar,
+		quickInstanceCount: Math.min(
+			quickInstances.limit.value ?? QUICK_INSTANCE_LIMIT_MAX,
+			QUICK_INSTANCE_LIMIT_MAX,
+		),
+		showJumpIn: settings.feature_flags[showJumpInFlag] ?? DEFAULT_FEATURE_FLAGS[showJumpInFlag],
+	}
+}
+
+const { saved, current, changes, saving, hasChanges, reset, save } = useSavable(
+	() => getFeaturesSettingsState(persistedSettings.value),
+	async (changedValues) => {
+		const value = current.value
+
+		if (value.syncFeaturesAcrossDevices && auth.user.value) {
+			await updatePreferences({
+				behavior: {
+					show_jump_in: value.showJumpIn,
+					show_files_tab_in_instances: value.showFilesTab,
+					show_worlds_tab_in_instances: value.showWorldsTab,
+					show_screenshots_tab_in_instances: value.showScreenshotsTab,
+					show_skin_selector_in_sidebar: value.showSkinSelector,
+					quick_instance_count: value.quickInstanceCount,
+				},
+			})
+		}
+
+		const nextSettings: AppSettings = {
+			...persistedSettings.value,
+			sync_features_across_devices: value.syncFeaturesAcrossDevices,
+			show_files_tab_in_instances: value.showFilesTab,
+			show_worlds_tab_in_instances: value.showWorldsTab,
+			show_screenshots_tab_in_instances: value.showScreenshotsTab,
+			show_skin_selector_in_sidebar: value.showSkinSelector,
+			feature_flags: {
+				...persistedSettings.value.feature_flags,
+				[showJumpInFlag]: value.showJumpIn,
+			},
+		}
+
+		await set(nextSettings)
+		persistedSettings.value = nextSettings
+		appSettings.setFeaturesSyncAcrossDevices(value.syncFeaturesAcrossDevices)
+		appSettings.showFilesTabInInstances = value.showFilesTab
+		appSettings.showWorldsTabInInstances = value.showWorldsTab
+		appSettings.showScreenshotsTabInInstances = value.showScreenshotsTab
+		appSettings.showSkinSelectorInSidebar = value.showSkinSelector
+		appSettings.featureFlags[showJumpInFlag] = value.showJumpIn
+
+		if (changedValues.quickInstanceCount !== undefined) {
+			quickInstances.setLimit(
+				value.quickInstanceCount >= QUICK_INSTANCE_LIMIT_MAX ? null : value.quickInstanceCount,
+			)
+		}
+	},
+)
+
+async function saveFeaturesSettings(): Promise<void> {
+	try {
+		await save()
+	} catch {
+		return
+	}
+}
+
+onMounted(() => {
+	settingsModal?.registerUnsavedChangesController({
+		hasChanges: () => hasChanges.value,
+		getOriginal: () => saved.value,
+		getModified: () => changes.value,
+		isSaving: () => saving.value,
+		reset,
+		save: saveFeaturesSettings,
+	})
+})
+
+onBeforeUnmount(() => {
+	settingsModal?.registerUnsavedChangesController(null)
+})
+</script>
+
+<template>
+	<section class="border-0 border-b border-solid border-divider pb-6">
+		<div class="flex items-center justify-between gap-4">
+			<div>
+				<h2 id="sync-features-across-devices-label" class="m-0 text-lg font-semibold text-contrast">
+					{{ formatMessage(messages.syncAcrossDevicesTitle) }}
+				</h2>
+				<p class="m-0 mt-1 text-secondary">
+					{{ formatMessage(messages.syncAcrossDevicesDescription) }}
+				</p>
+			</div>
+			<span
+				v-tooltip="
+					!auth.user.value ? formatMessage(messages.syncAcrossDevicesSignedOutTooltip) : undefined
+				"
+				class="inline-flex shrink-0"
+			>
+				<Toggle
+					id="sync-features-across-devices"
+					:model-value="Boolean(auth.user.value) && current.syncFeaturesAcrossDevices"
+					:disabled="!auth.user.value"
+					aria-labelledby="sync-features-across-devices-label"
+					@update:model-value="current.syncFeaturesAcrossDevices = $event"
+				/>
+			</span>
+		</div>
+	</section>
+
+	<section class="mt-6">
+		<h2 class="m-0 text-xl font-semibold text-contrast">
+			{{ formatMessage(messages.instancePagesTitle) }}
+		</h2>
+		<div class="mt-4 flex flex-col gap-6">
+			<div class="flex items-center justify-between gap-4">
+				<div>
+					<h3 class="m-0 text-lg font-semibold text-contrast">
+						{{ formatMessage(messages.showWorldsTabTitle) }}
+					</h3>
+					<p class="m-0 mt-1">{{ formatMessage(messages.showWorldsTabDescription) }}</p>
+				</div>
+				<Toggle id="show-worlds-tab-in-instances" v-model="current.showWorldsTab" />
+			</div>
+
+			<div class="flex items-center justify-between gap-4">
+				<div>
+					<h3 class="m-0 text-lg font-semibold text-contrast">
+						{{ formatMessage(messages.showFilesTabTitle) }}
+					</h3>
+					<p class="m-0 mt-1">{{ formatMessage(messages.showFilesTabDescription) }}</p>
+				</div>
+				<Toggle id="show-files-tab-in-instances" v-model="current.showFilesTab" />
+			</div>
+
+			<div class="flex items-center justify-between gap-4">
+				<div>
+					<h3 class="m-0 text-lg font-semibold text-contrast">
+						{{ formatMessage(messages.showScreenshotsTabTitle) }}
+					</h3>
+					<p class="m-0 mt-1">
+						{{ formatMessage(messages.showScreenshotsTabDescription) }}
+					</p>
+				</div>
+				<Toggle id="show-screenshots-tab-in-instances" v-model="current.showScreenshotsTab" />
+			</div>
+		</div>
+	</section>
+
+	<section class="mt-8 border-0 border-t border-solid border-divider pt-6">
+		<h2 class="m-0 text-xl font-semibold text-contrast">
+			{{ formatMessage(messages.sidebarTitle) }}
+		</h2>
+		<div class="mt-4 flex flex-col gap-6">
+			<div class="flex items-center justify-between gap-4">
+				<div>
+					<h3 class="m-0 text-lg font-semibold text-contrast">
+						{{ formatMessage(messages.showSkinSelectorTitle) }}
+					</h3>
+					<p class="m-0 mt-1">{{ formatMessage(messages.showSkinSelectorDescription) }}</p>
+				</div>
+				<Toggle id="show-skin-selector-in-sidebar" v-model="current.showSkinSelector" />
+			</div>
+
+			<div class="flex flex-col gap-2.5">
+				<h3 class="m-0 text-lg font-semibold text-contrast">
+					{{ formatMessage(messages.quickInstancesTitle) }}
+				</h3>
+				<Slider
+					id="quick-instances-in-sidebar"
+					v-model="current.quickInstanceCount"
+					:min="0"
+					:max="QUICK_INSTANCE_LIMIT_MAX"
+					:step="1"
+				/>
+				<p class="m-0 leading-tight">
+					{{ formatMessage(messages.quickInstancesDescription) }}
+				</p>
+			</div>
+		</div>
+	</section>
+
+	<section class="mt-8 border-0 border-t border-solid border-divider pt-6">
+		<h2 class="m-0 text-xl font-semibold text-contrast">
+			{{ formatMessage(messages.playPageTitle) }}
+		</h2>
+		<div class="mt-4 flex items-center justify-between gap-4">
+			<div>
+				<h3 class="m-0 text-lg font-semibold text-contrast">
+					{{ formatMessage(messages.showJumpInTitle) }}
+				</h3>
+				<p class="m-0 mt-1">{{ formatMessage(messages.showJumpInDescription) }}</p>
+			</div>
+			<Toggle id="show-jump-in-section" v-model="current.showJumpIn" />
+		</div>
+	</section>
+</template>
diff --git a/apps/app-frontend/src/components/ui/settings/instances/InstancesSyncedSettings.vue b/apps/app-frontend/src/components/ui/settings/instances/InstancesSyncedSettings.vue
index cd1ba1b4cd..eb10daf39e 100644
--- a/apps/app-frontend/src/components/ui/settings/instances/InstancesSyncedSettings.vue
+++ b/apps/app-frontend/src/components/ui/settings/instances/InstancesSyncedSettings.vue
@@ -1,23 +1,33 @@
 <script setup lang="ts">
 import {
+	ClipboardCopyIcon,
 	EditIcon,
 	// FolderOpenIcon,
+	MoreVerticalIcon,
+	NoSignalIcon,
 	RefreshCwIcon,
 	SaveIcon,
 	SearchIcon,
+	SignalIcon,
+	TrashIcon,
 	XIcon,
 } from '@modrinth/assets'
 import {
 	Avatar,
 	Button,
+	type ButtonMenuOption,
 	CheckCircleButton,
 	commonMessages,
 	defineMessages,
+	FilterPills,
 	IconButton,
 	injectNotificationManager,
 	Input,
 	NewModal,
 	Slider,
+	Table,
+	type TableColumn,
+	TeleportOverflowMenu,
 	Toggle,
 	useVIntl,
 } from '@modrinth/ui'
@@ -26,12 +36,8 @@ import type { Component } from 'vue'
 import { computed, nextTick, ref, shallowRef, watch } from 'vue'
 
 import GameSettingsModal from '@/components/ui/settings/instances/game-settings/GameSettingsModal.vue'
-import WorldItem from '@/components/ui/world/WorldItem.vue'
 import useMemorySlider from '@/composables/useMemorySlider'
-import {
-	type GameOptionsSourceCandidate,
-	list_game_options_sync_sources,
-} from '@/helpers/game-options'
+import { list_game_options_sync_sources } from '@/helpers/game-options'
 import {
 	get_command_history,
 	get_global_synced_options,
@@ -49,6 +55,7 @@ import {
 	update_synced_server,
 } from '@/helpers/instance'
 import { get, parseEnvVars, serializeEnvVars, set } from '@/helpers/settings.ts'
+import { copyToClipboard } from '@/helpers/utils'
 import {
 	refreshServerData,
 	refreshServers,
@@ -88,9 +95,9 @@ const messages = defineMessages({
 		id: 'app.settings.synced-options.game-settings.disabled-tooltip',
 		defaultMessage: 'Enable game settings sync before choosing individual settings.',
 	},
-	gameSettingsUnavailableTooltip: {
-		id: 'app.settings.synced-options.game-settings.unavailable-tooltip',
-		defaultMessage: 'Choose an instance with an options.txt file before editing game settings.',
+	noGameOptionsToEdit: {
+		id: 'app.settings.synced-options.game-settings.no-options-to-edit',
+		defaultMessage: "You haven't got any options yet to edit",
 	},
 	multiplayerServers: {
 		id: 'app.settings.synced-options.multiplayer-servers',
@@ -168,6 +175,43 @@ const messages = defineMessages({
 		id: 'app.settings.synced-options.multiplayer-servers.address',
 		defaultMessage: 'Server address',
 	},
+	searchServers: {
+		id: 'app.settings.synced-options.multiplayer-servers.search',
+		defaultMessage:
+			'Search {count, number} {count, plural, one {synced server} other {synced servers}}...',
+	},
+	serverStatus: {
+		id: 'app.settings.synced-options.multiplayer-servers.status',
+		defaultMessage: 'Status',
+	},
+	onlineFilter: {
+		id: 'app.settings.synced-options.multiplayer-servers.filter-online',
+		defaultMessage: 'Online',
+	},
+	offlineFilter: {
+		id: 'app.settings.synced-options.multiplayer-servers.filter-offline',
+		defaultMessage: 'Offline',
+	},
+	playersOnline: {
+		id: 'app.settings.synced-options.multiplayer-servers.players-online',
+		defaultMessage: '{count, number} online',
+	},
+	noMatchingServers: {
+		id: 'app.settings.synced-options.multiplayer-servers.no-results',
+		defaultMessage: 'No synced servers match your search or filters.',
+	},
+	serverCount: {
+		id: 'app.settings.synced-options.multiplayer-servers.count',
+		defaultMessage: '{count, plural, one {# server} other {# servers}}',
+	},
+	moreServerOptions: {
+		id: 'app.settings.synced-options.multiplayer-servers.more-options',
+		defaultMessage: 'More server options',
+	},
+	copyServerAddress: {
+		id: 'app.settings.synced-options.multiplayer-servers.copy-address',
+		defaultMessage: 'Copy address',
+	},
 	noSyncedServers: {
 		id: 'app.settings.synced-options.multiplayer-servers.empty',
 		defaultMessage: 'No user-added servers are currently synced.',
@@ -360,6 +404,7 @@ const globalRows: Array<{
 
 const globalSyncedOptionsQueryKey = ['global-synced-options'] as const
 const initializedSyncedOptionsQueryKey = ['initialized-synced-options'] as const
+const gameOptionsSyncSourcesQueryKey = ['game-options-sync-sources'] as const
 const globalSyncedOptionsMutationKey = ['global-synced-options', 'set'] as const
 const defaultGlobalOptions: GlobalSyncedOptions = {
 	game_options: false,
@@ -377,11 +422,30 @@ const initializedOptionsQuery = useQuery({
 	queryKey: initializedSyncedOptionsQueryKey,
 	queryFn: get_initialized_synced_options,
 })
+const gameOptionSourcesQuery = useQuery({
+	queryKey: gameOptionsSyncSourcesQueryKey,
+	queryFn: list_game_options_sync_sources,
+})
 const globalOptions = computed(() => globalOptionsQuery.data.value ?? defaultGlobalOptions)
 const initializedOptions = computed(
 	() => initializedOptionsQuery.data.value ?? defaultGlobalOptions,
 )
+const gameOptionSources = computed(() => gameOptionSourcesQuery.data.value ?? [])
 const instances = ref(await listInstances().catch(() => []))
+const eligibleGameOptionSourceIds = computed(
+	() =>
+		new Set(
+			gameOptionSources.value.filter((source) => source.eligible).map((source) => source.source_id),
+		),
+)
+const hasGameOptionsToEdit = computed(
+	() =>
+		initializedOptions.value.game_options ||
+		instances.value.some(
+			(instance) =>
+				instance.synced_options.game_options && eligibleGameOptionSourceIds.value.has(instance.id),
+		),
+)
 const baseOption = ref<SyncedOption | null>(null)
 const baseInstanceId = ref(instances.value[0]?.id ?? '')
 const baseInstanceSearch = ref('')
@@ -399,8 +463,10 @@ const syncedServers = ref<SyncedServer[]>(
 )
 const editedServer = ref<SyncedServer | null>(null)
 const serverData = ref<Record<string, ServerData>>({})
+const serverSearch = ref('')
+const selectedServerFilters = ref<string[]>([])
+const refreshingAllSyncedServers = ref(false)
 const editorComponent = shallowRef<Component | null>(null)
-const gameOptionSources = ref<GameOptionsSourceCandidate[]>([])
 const baseSourcesLoading = ref(false)
 let baseSourceGeneration = 0
 
@@ -431,6 +497,74 @@ const syncedServerCards = computed(() =>
 	})),
 )
 
+type SyncedServerTableColumn = 'server' | 'status' | 'version' | 'actions'
+type SyncedServerTableRow = SyncedServer &
+	Record<SyncedServerTableColumn, unknown> & {
+		server: string
+		status: 'online' | 'offline'
+		version: string
+	}
+
+const syncedServerColumns = computed<TableColumn<SyncedServerTableColumn>[]>(() => [
+	{
+		key: 'server',
+		label: formatMessage(commonMessages.serverLabel),
+		width: '45%',
+		cellClass: '!h-16',
+	},
+	{
+		key: 'status',
+		label: formatMessage(messages.serverStatus),
+		width: '25%',
+		cellClass: '!h-16',
+	},
+	{
+		key: 'version',
+		label: formatMessage(commonMessages.versionLabel),
+		width: '22%',
+		cellClass: '!h-16',
+	},
+	{
+		key: 'actions',
+		label: formatMessage(commonMessages.actionsLabel),
+		align: 'right',
+		width: '6rem',
+		cellClass: '!h-16',
+	},
+])
+
+const syncedServerFilterOptions = computed(() => [
+	{ id: 'online', label: formatMessage(messages.onlineFilter) },
+	{ id: 'offline', label: formatMessage(messages.offlineFilter) },
+])
+
+const syncedServerRows = computed<SyncedServerTableRow[]>(() =>
+	syncedServers.value.map((server) => ({
+		...server,
+		server: server.name,
+		status: serverData.value[server.address]?.status ? 'online' : 'offline',
+		version: serverData.value[server.address]?.status?.version?.name ?? '',
+		actions: null,
+	})),
+)
+
+const statusFilteredSyncedServerRows = computed(() => {
+	if (selectedServerFilters.value.length === 0) return syncedServerRows.value
+	return syncedServerRows.value.filter((server) =>
+		selectedServerFilters.value.includes(server.status),
+	)
+})
+
+const filteredSyncedServerRows = computed(() => {
+	const search = serverSearch.value.trim().toLocaleLowerCase()
+	if (!search) return statusFilteredSyncedServerRows.value
+	return statusFilteredSyncedServerRows.value.filter(
+		(server) =>
+			server.name.toLocaleLowerCase().includes(search) ||
+			server.address.toLocaleLowerCase().includes(search),
+	)
+})
+
 const baseInstanceDescription = computed(() => {
 	switch (baseOption.value) {
 		case 'game_options':
@@ -476,35 +610,33 @@ async function invalidateSyncedOptions() {
 }
 
 function canEditGlobalOption(row: (typeof globalRows)[number]): boolean {
+	if (!row.editable || !globalOptions.value[row.option]) return false
+	if (row.editable === 'game-settings') return hasGameOptionsToEdit.value
 	return (
-		!!row.editable &&
 		instances.value.length > 0 &&
-		globalOptions.value[row.option] &&
 		initializedOptions.value[row.option] &&
 		(row.editable !== 'servers' || syncedServers.value.length > 0)
 	)
 }
 
 function editGlobalOptionTooltip(row: (typeof globalRows)[number]): string {
-	if (!globalOptions.value[row.option] && row.editable === 'game-settings') {
-		return formatMessage(messages.gameSettingsDisabledTooltip)
+	if (row.editable === 'game-settings') {
+		if (!hasGameOptionsToEdit.value) return formatMessage(messages.noGameOptionsToEdit)
+		if (!globalOptions.value[row.option]) {
+			return formatMessage(messages.gameSettingsDisabledTooltip)
+		}
+		return formatMessage(messages.gameSettingsButton)
 	}
 	if (instances.value.length === 0) {
 		return formatMessage(messages.noInstancesToEdit)
 	}
 	if (!initializedOptions.value[row.option]) {
-		return formatMessage(
-			row.editable === 'game-settings'
-				? messages.gameSettingsUnavailableTooltip
-				: messages.noSyncedDataToEdit,
-		)
+		return formatMessage(messages.noSyncedDataToEdit)
 	}
 	if (row.editable === 'servers' && syncedServers.value.length === 0) {
 		return formatMessage(messages.noServersSyncedYet)
 	}
-	return formatMessage(
-		row.editable === 'game-settings' ? messages.gameSettingsButton : commonMessages.editButton,
-	)
+	return formatMessage(commonMessages.editButton)
 }
 
 type GlobalOptionMutationVariables = {
@@ -568,14 +700,21 @@ async function chooseBaseInstance(option: SyncedOption) {
 
 	if (option === 'game_options') {
 		try {
-			const sources = await list_game_options_sync_sources()
+			const sources = await queryClient.fetchQuery({
+				queryKey: gameOptionsSyncSourcesQueryKey,
+				queryFn: list_game_options_sync_sources,
+				staleTime: 0,
+			})
 			if (generation !== baseSourceGeneration || baseOption.value !== option) return
-			gameOptionSources.value = sources
-			baseInstanceId.value =
-				gameOptionSources.value.find((source) => source.eligible)?.source_id ?? ''
+			const eligibleSources = sources.filter((source) => source.eligible)
+			baseInstanceId.value = eligibleSources[0]?.source_id ?? ''
+			if (eligibleSources.length === 1) {
+				applyGlobalOption(option, true, eligibleSources[0].source_id)
+				return
+			}
 		} catch (error) {
 			if (generation !== baseSourceGeneration || baseOption.value !== option) return
-			gameOptionSources.value = []
+			queryClient.setQueryData(gameOptionsSyncSourcesQueryKey, [])
 			baseInstanceId.value = ''
 			handleError(error)
 			return
@@ -597,6 +736,10 @@ async function chooseBaseInstance(option: SyncedOption) {
 		return
 	}
 	baseInstanceId.value = instances.value[0]?.id ?? ''
+	if (instances.value.length === 1) {
+		applyGlobalOption(option, true, baseInstanceId.value)
+		return
+	}
 	baseModal.value?.show()
 }
 
@@ -624,6 +767,7 @@ async function confirmBaseInstance() {
 }
 
 function openGameSettings() {
+	if (!hasGameOptionsToEdit.value) return
 	gameSettingsModal.value?.show()
 }
 
@@ -657,13 +801,11 @@ async function openServerEditor() {
 		handleError(error)
 		return []
 	})
+	serverSearch.value = ''
+	selectedServerFilters.value = []
 	serverData.value = {}
 	serverEditorModal.value?.show()
-	await refreshServers(
-		syncedServerCards.value.map(({ world }) => world),
-		serverData.value,
-		null,
-	)
+	await refreshAllSyncedServers()
 }
 
 function openSyncedServerEditor(server: SyncedServer) {
@@ -695,6 +837,51 @@ async function refreshSyncedServer(address: string) {
 	await refreshServerData(serverData.value[address], null, address)
 }
 
+async function refreshAllSyncedServers() {
+	if (refreshingAllSyncedServers.value) return
+	refreshingAllSyncedServers.value = true
+	try {
+		await refreshServers(
+			syncedServerCards.value.map(({ world }) => world),
+			serverData.value,
+			null,
+		)
+	} finally {
+		refreshingAllSyncedServers.value = false
+	}
+}
+
+function syncedServerMenuOptions(server: SyncedServer): ButtonMenuOption[] {
+	return [
+		{
+			id: 'refresh',
+			label: formatMessage(commonMessages.refreshButton),
+			icon: RefreshCwIcon,
+			action: () => void refreshSyncedServer(server.address),
+		},
+		{
+			id: 'copy-address',
+			label: formatMessage(messages.copyServerAddress),
+			icon: ClipboardCopyIcon,
+			action: () => copyToClipboard(server.address),
+		},
+		{
+			id: 'edit',
+			label: formatMessage(commonMessages.editButton),
+			icon: EditIcon,
+			action: () => openSyncedServerEditor(server),
+		},
+		{ type: 'divider' },
+		{
+			id: 'remove',
+			label: formatMessage(commonMessages.removeButton),
+			icon: TrashIcon,
+			tone: 'red',
+			action: () => void removeSyncedServer(server.id),
+		},
+	]
+}
+
 async function removeSyncedServer(serverId: string) {
 	try {
 		await remove_synced_server(serverId)
@@ -881,40 +1068,137 @@ watch(
 
 		<NewModal
 			ref="serverEditorModal"
-			:header="formatMessage(messages.serverEditorTitle)"
-			scrollable
-			actions-divider
 			no-padding
-			max-content-height="34.5rem"
-			max-width="750px"
-			width="750px"
+			:max-width="'min(928px, calc(95vw - 10rem))'"
+			:width="'min(928px, calc(95vw - 10rem))'"
 		>
-			<p v-if="syncedServers.length === 0" class="m-0 px-6 py-4 text-secondary">
-				{{ formatMessage(messages.noSyncedServers) }}
-			</p>
-			<div v-else class="flex flex-col gap-2 px-6 py-4">
-				<WorldItem
-					v-for="{ server, world } in syncedServerCards"
-					:key="server.id"
-					:world="world"
-					card-background="surface-2"
-					:show-play-button="false"
-					:refreshing="serverData[server.address]?.refreshing"
-					:server-status="serverData[server.address]?.status"
-					:rendered-motd="serverData[server.address]?.renderedMotd"
-					@refresh="refreshSyncedServer(server.address)"
-					@edit="openSyncedServerEditor(server)"
-					@delete="removeSyncedServer(server.id)"
-				/>
-			</div>
-			<template #actions>
-				<div class="flex justify-end">
-					<Button type="outlined" @click="serverEditorModal?.hide()">
-						<XIcon />
-						{{ formatMessage(commonMessages.closeButton) }}
-					</Button>
-				</div>
+			<template #title>
+				<span class="text-lg font-extrabold text-contrast">
+					{{ formatMessage(messages.serverEditorTitle) }}
+				</span>
 			</template>
+			<div class="flex h-[min(600px,calc(95vh-10rem))] flex-col">
+				<div
+					class="flex shrink-0 flex-col gap-4 border-0 border-b border-solid border-surface-4 px-6 py-4"
+				>
+					<Input
+						v-model="serverSearch"
+						:icon="SearchIcon"
+						type="search"
+						autocomplete="off"
+						:spellcheck="false"
+						:placeholder="formatMessage(messages.searchServers, { count: syncedServers.length })"
+						input-class="!h-10"
+						clearable
+					/>
+
+					<div class="flex flex-wrap items-center justify-between gap-3">
+						<FilterPills v-model="selectedServerFilters" :options="syncedServerFilterOptions">
+							<template #all>
+								{{ formatMessage(commonMessages.allProjectType) }}
+							</template>
+						</FilterPills>
+						<Button
+							type="quiet"
+							:disabled="refreshingAllSyncedServers || syncedServers.length === 0"
+							class="hover:!bg-transparent focus-visible:!bg-transparent"
+							@click="refreshAllSyncedServers"
+						>
+							<RefreshCwIcon :class="{ 'animate-spin': refreshingAllSyncedServers }" />
+							{{ formatMessage(commonMessages.refreshButton) }}
+						</Button>
+					</div>
+				</div>
+
+				<div class="flex min-h-0 flex-1 flex-col overflow-hidden">
+					<div
+						v-if="syncedServers.length === 0"
+						class="flex flex-1 items-center justify-center p-8 text-center text-secondary"
+					>
+						{{ formatMessage(messages.noSyncedServers) }}
+					</div>
+					<div
+						v-else-if="filteredSyncedServerRows.length === 0"
+						class="flex flex-1 items-center justify-center p-8 text-center text-secondary"
+					>
+						{{ formatMessage(messages.noMatchingServers) }}
+					</div>
+					<div v-else class="min-h-0 flex-1 overflow-y-auto">
+						<Table
+							:columns="syncedServerColumns"
+							:data="filteredSyncedServerRows"
+							row-key="id"
+							table-min-width="44rem"
+							class="!rounded-none !border-0"
+						>
+							<template #cell-server="{ row }">
+								<div class="flex min-w-0 items-center gap-3">
+									<Avatar
+										:src="serverData[row.address]?.status?.favicon"
+										:alt="row.name"
+										:tint-by="row.address"
+										size="32px"
+										no-shadow
+										class="shrink-0 !rounded-lg"
+									/>
+									<div class="flex min-w-0 flex-col">
+										<span class="truncate font-semibold text-contrast">{{ row.name }}</span>
+										<span class="truncate text-sm text-secondary">{{ row.address }}</span>
+									</div>
+								</div>
+							</template>
+							<template #cell-status="{ row }">
+								<span class="inline-flex items-center gap-1.5 font-medium">
+									<RefreshCwIcon
+										v-if="serverData[row.address]?.refreshing"
+										class="size-4 shrink-0 animate-spin"
+										aria-hidden="true"
+									/>
+									<SignalIcon
+										v-else-if="serverData[row.address]?.status"
+										class="size-4 shrink-0 text-green"
+										aria-hidden="true"
+									/>
+									<NoSignalIcon v-else class="size-4 shrink-0" aria-hidden="true" />
+									<template v-if="serverData[row.address]?.refreshing">
+										{{ formatMessage(commonMessages.loadingLabel) }}
+									</template>
+									<template v-else-if="serverData[row.address]?.status">
+										{{
+											formatMessage(messages.playersOnline, {
+												count: serverData[row.address]?.status?.players?.online ?? 0,
+											})
+										}}
+									</template>
+									<template v-else>{{ formatMessage(messages.offlineFilter) }}</template>
+								</span>
+							</template>
+							<template #cell-version="{ row }">
+								<span class="block truncate">{{ row.version || '—' }}</span>
+							</template>
+							<template #cell-actions="{ row }">
+								<div class="flex justify-end">
+									<TeleportOverflowMenu
+										type="quiet"
+										:label="formatMessage(messages.moreServerOptions)"
+										:options="syncedServerMenuOptions(row)"
+									>
+										<MoreVerticalIcon aria-hidden="true" />
+									</TeleportOverflowMenu>
+								</div>
+							</template>
+						</Table>
+					</div>
+				</div>
+
+				<div
+					class="flex shrink-0 items-center border-0 border-t border-solid border-surface-4 px-6 py-4"
+				>
+					<span class="font-medium text-primary">
+						{{ formatMessage(messages.serverCount, { count: syncedServers.length }) }}
+					</span>
+				</div>
+			</div>
 		</NewModal>
 
 		<NewModal
diff --git a/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameKeybindInput.vue b/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameKeybindInput.vue
index d043d23920..e62f065b52 100644
--- a/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameKeybindInput.vue
+++ b/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameKeybindInput.vue
@@ -71,8 +71,8 @@ const messages = defineMessages({
 		defaultMessage: '{setting} is now bound to {binding}.',
 	},
 	conflict: {
-		id: 'app.settings.game-options.keybind.conflict',
-		defaultMessage: 'This key is also used for {settings}.',
+		id: 'app.settings.game-options.keybind.conflict-description',
+		defaultMessage: 'This is already used by {settings}.',
 	},
 })
 
@@ -86,7 +86,9 @@ const visibleLabel = computed(() =>
 	recording.value ? formatMessage(messages.listen) : bindingLabel.value,
 )
 const conflictSettings = computed(() =>
-	new Intl.ListFormat(locale.value, { style: 'long', type: 'conjunction' }).format(props.conflicts),
+	new Intl.ListFormat(locale.value, { style: 'long', type: 'conjunction' }).format(
+		props.conflicts.map((setting) => `‘${setting}’`),
+	),
 )
 const conflictMessage = computed(() =>
 	props.conflicts.length
diff --git a/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingRow.vue b/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingRow.vue
index 69063af208..1b84721079 100644
--- a/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingRow.vue
+++ b/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingRow.vue
@@ -21,13 +21,11 @@ import {
 	canonicalValueText,
 } from './game-setting-editors'
 import {
-	formatCompatibilityTooltip,
 	formatGameSettingChoice,
 	formatGameSettingDescription,
 	formatGameSettingLabel,
 	formatGameSettingValidation,
 	presentationMessages,
-	shouldShowCompatibilityIndicator,
 } from './game-setting-messages'
 import GameKeybindInput from './GameKeybindInput.vue'
 
@@ -74,10 +72,6 @@ const messages = defineMessages({
 		id: 'app.settings.synced-options.game-settings.value-unset',
 		defaultMessage: 'Choose a value',
 	},
-	compatibilityDetails: {
-		id: 'app.settings.synced-options.game-settings.compatibility-details',
-		defaultMessage: 'Why this setting may not sync',
-	},
 	syncSetting: {
 		id: 'app.settings.synced-options.game-settings.sync-setting',
 		defaultMessage: 'Sync {setting} across instances',
@@ -86,6 +80,14 @@ const messages = defineMessages({
 		id: 'app.settings.synced-options.game-settings.unsync-setting',
 		defaultMessage: 'Stop syncing {setting} across instances',
 	},
+	syncedAcrossInstances: {
+		id: 'app.settings.synced-options.game-settings.synced-across-instances',
+		defaultMessage: 'Synced across instances',
+	},
+	notBeingSynced: {
+		id: 'app.settings.synced-options.game-settings.not-being-synced',
+		defaultMessage: 'Not being synced',
+	},
 })
 
 const settingLabel = computed(() => formatGameSettingLabel(formatMessage, props.setting))
@@ -150,18 +152,9 @@ const placeholder = computed(() => {
 	}
 	return undefined
 })
-const compatibilityTooltip = computed(() =>
-	formatCompatibilityTooltip(formatMessage, props.setting),
-)
 const validationMessage = computed(() =>
 	formatGameSettingValidation(formatMessage, props.setting.validation_error),
 )
-const detailsTooltip = computed(() => validationMessage.value ?? compatibilityTooltip.value)
-const compatibilityTone = computed(() =>
-	validationMessage.value || props.setting.compatibility.left_local > 0
-		? 'text-orange'
-		: 'text-secondary',
-)
 const syncDisabledReason = computed(() => {
 	if (validationMessage.value) return validationMessage.value
 	if (props.setting.value_state === 'invalid') {
@@ -186,6 +179,11 @@ const syncActionLabel = computed(() =>
 		setting: settingLabel.value,
 	}),
 )
+const syncStatusTooltip = computed(() =>
+	formatMessage(
+		props.setting.sync_enabled ? messages.syncedAcrossInstances : messages.notBeingSynced,
+	),
+)
 
 function updateValue(value: string | number | boolean | undefined) {
 	emit('update:canonical-value', canonicalValueFromInput(props.setting, value))
@@ -215,13 +213,12 @@ function updateValue(value: string | number | boolean | undefined) {
 					{{ settingLabel }}
 				</h3>
 				<span
-					v-if="validationMessage || shouldShowCompatibilityIndicator(setting)"
-					v-tooltip="detailsTooltip"
+					v-if="validationMessage"
+					v-tooltip="validationMessage"
 					tabindex="0"
 					role="img"
-					:aria-label="formatMessage(messages.compatibilityDetails)"
-					class="flex shrink-0 rounded-md outline-none focus-visible:ring-4 focus-visible:ring-brand-shadow"
-					:class="compatibilityTone"
+					:aria-label="validationMessage"
+					class="flex shrink-0 rounded-md text-orange outline-none focus-visible:ring-4 focus-visible:ring-brand-shadow"
 				>
 					<UnknownIcon class="size-4" aria-hidden="true" />
 				</span>
@@ -299,7 +296,7 @@ function updateValue(value: string | number | boolean | undefined) {
 
 		<span
 			v-if="showSyncToggle"
-			v-tooltip="syncToggleDisabled ? syncDisabledReason : undefined"
+			v-tooltip="syncToggleDisabled && syncDisabledReason ? syncDisabledReason : syncStatusTooltip"
 			class="flex justify-center"
 		>
 			<IconButton
@@ -308,7 +305,7 @@ function updateValue(value: string | number | boolean | undefined) {
 				:aria-pressed="setting.sync_enabled"
 				:class="
 					setting.sync_enabled
-						? '!bg-highlight-green !text-green !shadow-[inset_0_0_0_1px_var(--color-green)] [&>svg]:!text-green'
+						? '!bg-highlight-blue !text-blue !shadow-[inset_0_0_0_1px_var(--color-blue)] [&>svg]:!text-blue'
 						: ''
 				"
 				@click="emit('update:sync-enabled', !setting.sync_enabled)"
diff --git a/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingsModal.vue b/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingsModal.vue
index a8717bd8e2..a9a38425fc 100644
--- a/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingsModal.vue
+++ b/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingsModal.vue
@@ -35,8 +35,8 @@ import { computed, onUnmounted, ref } from 'vue'
 import {
 	type EditableGameSetting,
 	type GameOptionCanonicalValue,
-	type GameSettingChange,
 	type GameSettingCategory,
+	type GameSettingChange,
 	type GameSettingsEditorState,
 	get_local_game_options_config,
 	get_synced_game_options_config,
@@ -93,7 +93,7 @@ const messages = defineMessages({
 	},
 	enableAll: {
 		id: 'app.settings.synced-options.game-settings.enable-all',
-		defaultMessage: 'Sync tab',
+		defaultMessage: 'Sync all',
 	},
 	disableAll: {
 		id: 'app.settings.synced-options.game-settings.disable-all',
@@ -224,7 +224,7 @@ const keybindConflicts = computed(() => {
 	for (const setting of draftState.value.settings) {
 		if (setting.editor.type !== 'key_binding' || setting.canonical_value?.type !== 'key_binding')
 			continue
-		const key = minecraftKeybindConflictKey(setting.canonical_value.value)
+		const key = minecraftKeybindConflictKey(setting.option_id, setting.canonical_value.value)
 		if (!key) continue
 		bindings.set(key, [...(bindings.get(key) ?? []), setting])
 	}
@@ -590,11 +590,7 @@ async function save() {
 				...previouslyTouchedOptionIds,
 				...touchedValueOptionIds.value,
 			])
-			const stagedChanges = gameSettingChanges(
-				previousBase,
-				stagedDraft,
-				retainedTouchedOptionIds,
-			)
+			const stagedChanges = gameSettingChanges(previousBase, stagedDraft, retainedTouchedOptionIds)
 			const conflicts = new Set(result.conflicts)
 			applyChangesToRefreshedState(
 				refreshed,
@@ -631,17 +627,8 @@ async function save() {
 		previewGeneration++
 		const stagedDraft = cloneGameSettingsState(draftState.value)
 		const touchedSinceSave = new Set(touchedValueOptionIds.value)
-		const changesSinceSave = gameSettingChanges(
-			optimisticState,
-			stagedDraft,
-			touchedSinceSave,
-		)
-		applyChangesToRefreshedState(
-			refreshed,
-			stagedDraft,
-			changesSinceSave,
-			touchedSinceSave,
-		)
+		const changesSinceSave = gameSettingChanges(optimisticState, stagedDraft, touchedSinceSave)
+		applyChangesToRefreshedState(refreshed, stagedDraft, changesSinceSave, touchedSinceSave)
 		if (changesSinceSave.length > 0) schedulePreview()
 		emit('saved')
 	} catch (error) {
@@ -695,8 +682,8 @@ defineExpose({ show, hide })
 		<template #content>
 			<div class="flex min-h-full min-w-0 flex-col">
 				<div
-					v-if="!isLocalEditor"
-					class="flex shrink-0 flex-wrap items-start justify-between gap-4 pb-4"
+					v-if="!isLocalEditor && (loading || loadError || categorySettings.length > 0)"
+					class="mb-4 flex shrink-0 flex-wrap items-start justify-between gap-4 border-0 border-b border-solid border-divider pb-4"
 				>
 					<p class="m-0 min-w-60 flex-1 text-primary">
 						{{ formatMessage(messages.syncedOptionsDescription) }}
diff --git a/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-keybinds.ts b/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-keybinds.ts
index dd05a361cf..ec64a326e4 100644
--- a/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-keybinds.ts
+++ b/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-keybinds.ts
@@ -414,8 +414,13 @@ export function formatMinecraftKeybind(
 	return [...modifiers, label].join(' + ')
 }
 
-export function minecraftKeybindConflictKey(value: string): string | null {
+export function minecraftKeybindConflictKey(optionId: string, value: string): string | null {
 	const normalized = value.trim().toLowerCase()
 	if (!normalized || normalized === 'key.keyboard.unknown') return null
-	return normalized
+
+	if (optionId === 'key.debug.modifier') return null
+	if (optionId.startsWith('key.debug.') && optionId !== 'key.debug.overlay') {
+		return `debug:${normalized}`
+	}
+	return `direct:${normalized}`
 }
diff --git a/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-editors.ts b/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-editors.ts
index d7da23253d..60324f86a5 100644
--- a/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-editors.ts
+++ b/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-editors.ts
@@ -7,8 +7,20 @@ import type {
 	GameSettingsEditorState,
 } from '@/helpers/game-options'
 
+function clonePlainValue(value: unknown): unknown {
+	if (Array.isArray(value)) {
+		return toRaw(value).map(clonePlainValue)
+	}
+	if (value !== null && typeof value === 'object') {
+		return Object.fromEntries(
+			Object.entries(toRaw(value)).map(([key, nestedValue]) => [key, clonePlainValue(nestedValue)]),
+		)
+	}
+	return value
+}
+
 export function cloneGameSettingsState(state: GameSettingsEditorState): GameSettingsEditorState {
-	return structuredClone(toRaw(state))
+	return clonePlainValue(state) as GameSettingsEditorState
 }
 
 export function canonicalValuesEqual(
diff --git a/apps/app-frontend/src/composables/use-app-settings.ts b/apps/app-frontend/src/composables/use-app-settings.ts
index df46e24f6b..a7c9ea39f5 100644
--- a/apps/app-frontend/src/composables/use-app-settings.ts
+++ b/apps/app-frontend/src/composables/use-app-settings.ts
@@ -29,23 +29,34 @@ export type FeatureFlag = keyof typeof DEFAULT_FEATURE_FLAGS
 type FeatureFlags = Record<FeatureFlag, boolean>
 
 const syncBehaviorAcrossDevices = ref(false)
+const syncFeaturesAcrossDevices = ref(false)
 const featureFlags = reactive<FeatureFlags>({ ...DEFAULT_FEATURE_FLAGS })
 
 function setBehaviorSyncAcrossDevices(enabled: boolean): void {
 	syncBehaviorAcrossDevices.value = enabled
 }
 
+function setFeaturesSyncAcrossDevices(enabled: boolean): void {
+	syncFeaturesAcrossDevices.value = enabled
+}
+
 function getFeatureFlag(key: FeatureFlag): boolean {
 	return featureFlags[key] ?? DEFAULT_FEATURE_FLAGS[key]
 }
 
 const appSettings = reactive({
 	syncBehaviorAcrossDevices,
+	syncFeaturesAcrossDevices,
 	hideNametagSkinsPage: false,
 	toggleSidebar: false,
+	showFilesTabInInstances: true,
+	showWorldsTabInInstances: true,
+	showScreenshotsTabInInstances: false,
+	showSkinSelectorInSidebar: true,
 	devMode: false,
 	featureFlags,
 	setBehaviorSyncAcrossDevices,
+	setFeaturesSyncAcrossDevices,
 	getFeatureFlag,
 })
 
diff --git a/apps/app-frontend/src/composables/use-quick-instance-limit.ts b/apps/app-frontend/src/composables/use-quick-instance-limit.ts
new file mode 100644
index 0000000000..b504acf97b
--- /dev/null
+++ b/apps/app-frontend/src/composables/use-quick-instance-limit.ts
@@ -0,0 +1,28 @@
+import { ref } from 'vue'
+
+const STORAGE_KEY = 'modrinth-quick-instance-count'
+
+export const QUICK_INSTANCE_LIMIT_MAX = 20
+
+const storedLimit = Number.parseInt(localStorage.getItem(STORAGE_KEY) ?? '', 10)
+const quickInstanceLimit = ref<number | null>(
+	Number.isFinite(storedLimit) ? Math.max(0, storedLimit) : null,
+)
+
+function setQuickInstanceLimit(limit: number | null): void {
+	const normalizedLimit = limit === null ? null : Math.max(0, Math.round(limit))
+	quickInstanceLimit.value = normalizedLimit
+
+	if (normalizedLimit === null) {
+		localStorage.removeItem(STORAGE_KEY)
+	} else {
+		localStorage.setItem(STORAGE_KEY, String(normalizedLimit))
+	}
+}
+
+export function useQuickInstanceLimit() {
+	return {
+		limit: quickInstanceLimit,
+		setLimit: setQuickInstanceLimit,
+	}
+}
diff --git a/apps/app-frontend/src/helpers/settings.ts b/apps/app-frontend/src/helpers/settings.ts
index 340ce8a498..2d222e83e5 100644
--- a/apps/app-frontend/src/helpers/settings.ts
+++ b/apps/app-frontend/src/helpers/settings.ts
@@ -46,6 +46,11 @@ export type AppSettings = {
 	toggle_sidebar: boolean
 	sync_theme_across_devices: boolean
 	sync_behavior_across_devices: boolean
+	sync_features_across_devices: boolean
+	show_files_tab_in_instances: boolean
+	show_worlds_tab_in_instances: boolean
+	show_screenshots_tab_in_instances: boolean
+	show_skin_selector_in_sidebar: boolean
 
 	telemetry: boolean
 	discord_rpc: boolean
diff --git a/apps/app-frontend/src/helpers/types.d.ts b/apps/app-frontend/src/helpers/types.d.ts
index 4972790ebb..e055cbe2ce 100644
--- a/apps/app-frontend/src/helpers/types.d.ts
+++ b/apps/app-frontend/src/helpers/types.d.ts
@@ -227,6 +227,11 @@ type AppSettings = {
 	worlds_in_home: boolean
 	sync_theme_across_devices: boolean
 	sync_behavior_across_devices: boolean
+	sync_features_across_devices: boolean
+	show_files_tab_in_instances: boolean
+	show_worlds_tab_in_instances: boolean
+	show_screenshots_tab_in_instances: boolean
+	show_skin_selector_in_sidebar: boolean
 
 	telemetry: boolean
 	discord_rpc: boolean
diff --git a/apps/app-frontend/src/locales/en-US/index.json b/apps/app-frontend/src/locales/en-US/index.json
index 21216186d6..bf091eebaf 100644
--- a/apps/app-frontend/src/locales/en-US/index.json
+++ b/apps/app-frontend/src/locales/en-US/index.json
@@ -326,6 +326,51 @@
   "app.export-modal.version-number-placeholder": {
     "message": "1.0.0"
   },
+  "app.features-settings.instance-pages.title": {
+    "message": "Instance pages"
+  },
+  "app.features-settings.play-page.title": {
+    "message": "Play page"
+  },
+  "app.features-settings.quick-instances.description": {
+    "message": "Choose the maximum number of recent instances shown in the left sidebar. You can also adjust this by dragging the divider."
+  },
+  "app.features-settings.quick-instances.title": {
+    "message": "Quick instances in sidebar"
+  },
+  "app.features-settings.show-files-tab.description": {
+    "message": "Browse the files in each instance from its navigation."
+  },
+  "app.features-settings.show-files-tab.title": {
+    "message": "Show Files tab in instances"
+  },
+  "app.features-settings.show-jump-in.description": {
+    "message": "Show recently played worlds and instances at the top of the Play page."
+  },
+  "app.features-settings.show-jump-in.title": {
+    "message": "Show Jump in section"
+  },
+  "app.features-settings.show-screenshots-tab.description": {
+    "message": "Browse screenshots from the instance where they were taken."
+  },
+  "app.features-settings.show-screenshots-tab.title": {
+    "message": "Show Screenshots tab in instances"
+  },
+  "app.features-settings.show-skin-selector.description": {
+    "message": "Add a shortcut to the skin selector to the left sidebar."
+  },
+  "app.features-settings.show-skin-selector.title": {
+    "message": "Show skin selector in sidebar"
+  },
+  "app.features-settings.show-worlds-tab.description": {
+    "message": "Browse and launch worlds from each instance."
+  },
+  "app.features-settings.show-worlds-tab.title": {
+    "message": "Show Worlds tab in instances"
+  },
+  "app.features-settings.sidebar.title": {
+    "message": "Sidebar"
+  },
   "app.home.jump-back-in.actions.label": {
     "message": "Instance actions"
   },
@@ -1844,8 +1889,8 @@
   "app.settings.game-options.keybind.choose": {
     "message": "Choose a key"
   },
-  "app.settings.game-options.keybind.conflict": {
-    "message": "This key is also used for {settings}."
+  "app.settings.game-options.keybind.conflict-description": {
+    "message": "This is already used by {settings}."
   },
   "app.settings.game-options.keybind.key.arrow-down": {
     "message": "Down Arrow"
@@ -2801,9 +2846,6 @@
   "app.settings.synced-options.game-settings.button": {
     "message": "Edit game settings"
   },
-  "app.settings.synced-options.game-settings.compatibility-details": {
-    "message": "Why this setting may not sync"
-  },
   "app.settings.synced-options.game-settings.conflict-text": {
     "message": "We loaded the latest settings. Check your changes, then save again."
   },
@@ -2826,7 +2868,7 @@
     "message": "No settings match your search or filter."
   },
   "app.settings.synced-options.game-settings.enable-all": {
-    "message": "Sync tab"
+    "message": "Sync all"
   },
   "app.settings.synced-options.game-settings.load-failed": {
     "message": "We couldn’t load your game settings."
@@ -2834,24 +2876,18 @@
   "app.settings.synced-options.game-settings.loading": {
     "message": "Loading settings..."
   },
+  "app.settings.synced-options.game-settings.no-options-to-edit": {
+    "message": "You haven't got any options yet to edit"
+  },
+  "app.settings.synced-options.game-settings.not-being-synced": {
+    "message": "Not being synced"
+  },
   "app.settings.synced-options.game-settings.retry": {
     "message": "Retry"
   },
   "app.settings.synced-options.game-settings.save": {
     "message": "Save settings"
   },
-  "app.settings.synced-options.game-settings.saved": {
-    "message": "Game settings updated"
-  },
-  "app.settings.synced-options.game-settings.saved-later": {
-    "message": "Your changes were saved and will finish syncing when your instances are ready."
-  },
-  "app.settings.synced-options.game-settings.saved-summary": {
-    "message": "Your changes were saved."
-  },
-  "app.settings.synced-options.game-settings.saved-with-problems": {
-    "message": "Your changes were saved, but some instances could not be updated."
-  },
   "app.settings.synced-options.game-settings.search": {
     "message": "Search settings..."
   },
@@ -2861,12 +2897,12 @@
   "app.settings.synced-options.game-settings.sync-title": {
     "message": "Sync game settings"
   },
+  "app.settings.synced-options.game-settings.synced-across-instances": {
+    "message": "Synced across instances"
+  },
   "app.settings.synced-options.game-settings.title": {
     "message": "Game settings"
   },
-  "app.settings.synced-options.game-settings.unavailable-tooltip": {
-    "message": "Choose an instance with an options.txt file before editing game settings."
-  },
   "app.settings.synced-options.game-settings.unsaved-changes": {
     "message": "You have unsaved changes."
   },
@@ -2894,6 +2930,12 @@
   "app.settings.synced-options.multiplayer-servers.address": {
     "message": "Server address"
   },
+  "app.settings.synced-options.multiplayer-servers.copy-address": {
+    "message": "Copy address"
+  },
+  "app.settings.synced-options.multiplayer-servers.count": {
+    "message": "{count, plural, one {# server} other {# servers}}"
+  },
   "app.settings.synced-options.multiplayer-servers.description": {
     "message": "Use the same multiplayer servers across your instances."
   },
@@ -2903,18 +2945,42 @@
   "app.settings.synced-options.multiplayer-servers.empty": {
     "message": "No user-added servers are currently synced."
   },
+  "app.settings.synced-options.multiplayer-servers.filter-offline": {
+    "message": "Offline"
+  },
+  "app.settings.synced-options.multiplayer-servers.filter-online": {
+    "message": "Online"
+  },
+  "app.settings.synced-options.multiplayer-servers.more-options": {
+    "message": "More server options"
+  },
   "app.settings.synced-options.multiplayer-servers.name": {
     "message": "Server name"
   },
+  "app.settings.synced-options.multiplayer-servers.no-results": {
+    "message": "No synced servers match your search or filters."
+  },
   "app.settings.synced-options.multiplayer-servers.none-synced-yet": {
     "message": "No servers synced yet"
   },
+  "app.settings.synced-options.multiplayer-servers.players-online": {
+    "message": "{count, number} online"
+  },
+  "app.settings.synced-options.multiplayer-servers.search": {
+    "message": "Search {count, number} {count, plural, one {synced server} other {synced servers}}..."
+  },
+  "app.settings.synced-options.multiplayer-servers.status": {
+    "message": "Status"
+  },
   "app.settings.tabs.appearance": {
     "message": "Appearance"
   },
   "app.settings.tabs.behavior": {
     "message": "Behavior"
   },
+  "app.settings.tabs.features": {
+    "message": "Features"
+  },
   "app.settings.tabs.java-installations": {
     "message": "Java installations"
   },
@@ -3920,9 +3986,6 @@
   "instance.settings.tabs.synced-options.shared-settings.description": {
     "message": "Enable an override to keep a synced setting separate for this instance."
   },
-  "instance.settings.tabs.tab-visibility": {
-    "message": "Tabs"
-  },
   "instance.settings.tabs.window": {
     "message": "Custom window settings"
   },
diff --git a/apps/app-frontend/src/pages/instance/components/settings-modal/index.vue b/apps/app-frontend/src/pages/instance/components/settings-modal/index.vue
index b04e73c82c..e5c1de4cfc 100644
--- a/apps/app-frontend/src/pages/instance/components/settings-modal/index.vue
+++ b/apps/app-frontend/src/pages/instance/components/settings-modal/index.vue
@@ -1,13 +1,6 @@
 <script setup lang="ts">
 import type { Labrinth } from '@modrinth/api-client'
-import {
-	ChevronRightIcon,
-	EyeIcon,
-	InfoIcon,
-	Settings2Icon,
-	UsersIcon,
-	WrenchIcon,
-} from '@modrinth/assets'
+import { ChevronRightIcon, InfoIcon, Settings2Icon, UsersIcon, WrenchIcon } from '@modrinth/assets'
 import {
 	Avatar,
 	commonMessages,
@@ -26,7 +19,6 @@ import { get_loader_versions } from '@/helpers/metadata'
 import { get_game_versions, get_loaders } from '@/helpers/tags'
 import type { GameInstance } from '@/helpers/types'
 
-import BehaviorSettings from './behavior-settings.vue'
 import GeneralSettings from './general-settings.vue'
 import InstallationSettings from './installation-settings.vue'
 import { provideInstanceSettings } from './instance-settings-context.ts'
@@ -104,14 +96,6 @@ const tabs = computed<TabbedModalTab[]>(() => [
 		icon: WrenchIcon,
 		content: InstallationSettings,
 	},
-	{
-		name: defineMessage({
-			id: 'instance.settings.tabs.tab-visibility',
-			defaultMessage: 'Tabs',
-		}),
-		icon: EyeIcon,
-		content: BehaviorSettings,
-	},
 	{
 		name: defineMessage({
 			id: 'instance.settings.tabs.settings-overrides',
diff --git a/apps/app-frontend/src/pages/instance/components/settings-modal/java-settings.vue b/apps/app-frontend/src/pages/instance/components/settings-modal/java-settings.vue
index b3dadad3c1..a660b09eaf 100644
--- a/apps/app-frontend/src/pages/instance/components/settings-modal/java-settings.vue
+++ b/apps/app-frontend/src/pages/instance/components/settings-modal/java-settings.vue
@@ -208,6 +208,31 @@ const messages = defineMessages({
 	<div class="flex flex-col gap-6">
 		<JavaDetectionModal ref="javaDetectionModal" @submit="(val) => (javaPath = val.path)" />
 
+		<section class="flex flex-col">
+			<div class="flex items-center justify-between gap-4">
+				<div class="flex min-w-0 flex-col gap-1">
+					<h2 class="m-0 text-lg font-semibold text-contrast">
+						{{ formatMessage(messages.javaMemory) }}
+					</h2>
+					<p class="m-0">{{ formatMessage(messages.customMemoryAllocation) }}</p>
+				</div>
+				<Toggle id="override-memory-allocation" v-model="overrideMemorySettings" />
+			</div>
+			<div class="pt-3">
+				<Slider
+					id="max-memory"
+					v-model="memory.maximum"
+					:disabled="!overrideMemorySettings"
+					:min="512"
+					:max="maxMemory"
+					:step="64"
+					:snap-points="snapPoints"
+					:snap-range="512"
+					unit="MB"
+				/>
+			</div>
+		</section>
+
 		<section class="flex flex-col">
 			<div class="flex items-center justify-between gap-4">
 				<div class="flex min-w-0 flex-col gap-1">
@@ -303,31 +328,6 @@ const messages = defineMessages({
 			</div>
 		</section>
 
-		<section class="flex flex-col">
-			<div class="flex items-center justify-between gap-4">
-				<div class="flex min-w-0 flex-col gap-1">
-					<h2 class="m-0 text-lg font-semibold text-contrast">
-						{{ formatMessage(messages.javaMemory) }}
-					</h2>
-					<p class="m-0">{{ formatMessage(messages.customMemoryAllocation) }}</p>
-				</div>
-				<Toggle id="override-memory-allocation" v-model="overrideMemorySettings" />
-			</div>
-			<div class="pt-3">
-				<Slider
-					id="max-memory"
-					v-model="memory.maximum"
-					:disabled="!overrideMemorySettings"
-					:min="512"
-					:max="maxMemory"
-					:step="64"
-					:snap-points="snapPoints"
-					:snap-range="512"
-					unit="MB"
-				/>
-			</div>
-		</section>
-
 		<section class="flex flex-col">
 			<div class="flex items-center justify-between gap-4">
 				<div class="flex min-w-0 flex-col gap-1">
diff --git a/apps/app-frontend/src/pages/instance/components/settings-modal/synced-options-settings.vue b/apps/app-frontend/src/pages/instance/components/settings-modal/synced-options-settings.vue
index c433a3dc13..897377f793 100644
--- a/apps/app-frontend/src/pages/instance/components/settings-modal/synced-options-settings.vue
+++ b/apps/app-frontend/src/pages/instance/components/settings-modal/synced-options-settings.vue
@@ -14,9 +14,12 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/vue-query'
 import { computed, inject, ref } from 'vue'
 
 import GameSettingsModal from '@/components/ui/settings/instances/game-settings/GameSettingsModal.vue'
+import { list_game_options_sync_sources } from '@/helpers/game-options'
 import {
+	get_initialized_synced_options,
 	get_synced_option_join_preview,
 	get_synced_options_overview,
+	list as listInstances,
 	set_synced_option,
 	type SyncedOption,
 	type SyncedOptionJoinResolution,
@@ -57,6 +60,10 @@ const messages = defineMessages({
 		id: 'app.settings.synced-options.game-settings.button',
 		defaultMessage: 'Edit game settings',
 	},
+	noGameOptionsToEdit: {
+		id: 'app.settings.synced-options.game-settings.no-options-to-edit',
+		defaultMessage: "You haven't got any options yet to edit",
+	},
 	gameSettingsDisabled: {
 		id: 'instance.settings.tabs.synced-options.game-settings.disabled-in-app',
 		defaultMessage: 'Game settings syncing is turned off in app settings.',
@@ -162,6 +169,18 @@ const overviewQuery = useQuery(
 		queryFn: () => get_synced_options_overview(instance.value.id),
 	})),
 )
+const initializedOptionsQuery = useQuery({
+	queryKey: ['initialized-synced-options'],
+	queryFn: get_initialized_synced_options,
+})
+const instancesQuery = useQuery({
+	queryKey: instanceKeys.list(),
+	queryFn: listInstances,
+})
+const gameOptionSourcesQuery = useQuery({
+	queryKey: ['game-options-sync-sources'],
+	queryFn: list_game_options_sync_sources,
+})
 
 const capabilities = computed(
 	() =>
@@ -180,6 +199,39 @@ const gameSettingsInstanceId = computed(() =>
 		? undefined
 		: instance.value.id,
 )
+const eligibleGameOptionSourceIds = computed(
+	() =>
+		new Set(
+			(gameOptionSourcesQuery.data.value ?? [])
+				.filter((source) => source.eligible)
+				.map((source) => source.source_id),
+		),
+)
+const hasSyncedGameOptionsToEdit = computed(
+	() =>
+		initializedOptionsQuery.data.value?.game_options === true ||
+		(instancesQuery.data.value ?? []).some(
+			(candidate) =>
+				candidate.synced_options.game_options &&
+				eligibleGameOptionSourceIds.value.has(candidate.id),
+		),
+)
+const hasGameOptionsToEdit = computed(() =>
+	gameSettingsInstanceId.value
+		? eligibleGameOptionSourceIds.value.has(gameSettingsInstanceId.value)
+		: hasSyncedGameOptionsToEdit.value,
+)
+const gameOptionsAvailabilityPending = computed(
+	() =>
+		gameOptionSourcesQuery.isPending.value ||
+		(gameSettingsInstanceId.value === undefined &&
+			(initializedOptionsQuery.isPending.value || instancesQuery.isPending.value)),
+)
+const gameSettingsTooltip = computed(() =>
+	!gameOptionsAvailabilityPending.value && !hasGameOptionsToEdit.value
+		? formatMessage(messages.noGameOptionsToEdit)
+		: formatMessage(messages.editGameSettings),
+)
 
 function excluded(option: InstanceSyncedOption): boolean {
 	const preview = previewExcluded.value[option]
@@ -220,6 +272,7 @@ function showAppSyncedOptions(): void {
 }
 
 function openGameSettings(): void {
+	if (!hasGameOptionsToEdit.value || gameOptionsAvailabilityPending.value) return
 	gameSettingsModal.value?.show()
 }
 
@@ -227,6 +280,8 @@ async function handleGameSettingsSaved(): Promise<void> {
 	await Promise.all([
 		queryClient.invalidateQueries({ queryKey: instanceKeys.all }),
 		queryClient.invalidateQueries({ queryKey: ['instance-synced-options'] }),
+		queryClient.invalidateQueries({ queryKey: ['initialized-synced-options'] }),
+		queryClient.invalidateQueries({ queryKey: ['game-options-sync-sources'] }),
 	])
 }
 
@@ -296,6 +351,9 @@ const mutation = useMutation({
 		handleError(error)
 	},
 	onSettled: async (_data, _error, variables) => {
+		if (variables.option === 'game_options') {
+			await queryClient.invalidateQueries({ queryKey: ['game-options-sync-sources'] })
+		}
 		if (variables.option === 'multiplayer_servers') {
 			await queryClient.invalidateQueries({
 				queryKey: instanceKeys.worlds(instance.value.id),
@@ -431,15 +489,16 @@ function resolveHotbars(resolution: SyncedOptionJoinResolution) {
 					</p>
 				</div>
 				<div class="flex shrink-0 items-center gap-2">
-					<span
-						v-if="row.option === 'game_options'"
-						v-tooltip="formatMessage(messages.editGameSettings)"
-						class="flex"
-					>
+					<span v-if="row.option === 'game_options'" v-tooltip="gameSettingsTooltip" class="flex">
 						<IconButton
 							type="outlined"
 							circular
-							:disabled="mutation.isPending.value || overviewQuery.isPending.value"
+							:disabled="
+								mutation.isPending.value ||
+								overviewQuery.isPending.value ||
+								gameOptionsAvailabilityPending ||
+								!hasGameOptionsToEdit
+							"
 							:label="formatMessage(messages.editGameSettings)"
 							@click="openGameSettings"
 						>
diff --git a/apps/app-frontend/src/pages/instance/layout.vue b/apps/app-frontend/src/pages/instance/layout.vue
index 019183e489..78f49f250b 100644
--- a/apps/app-frontend/src/pages/instance/layout.vue
+++ b/apps/app-frontend/src/pages/instance/layout.vue
@@ -140,7 +140,6 @@ import {
 } from '@/helpers/install'
 import {
 	get_full_path,
-	get_global_synced_options,
 	getInstanceIconUrl,
 	kill,
 	refresh_content_updates,
@@ -233,10 +232,6 @@ useQuery(
 	})),
 )
 const instance = computed(() => instanceQuery.data.value)
-const globalSyncedOptionsQuery = useQuery({
-	queryKey: ['global-synced-options'],
-	queryFn: get_global_synced_options,
-})
 useQuery(
 	computed(() => ({
 		queryKey: instanceKeys.contentUpdateCheck(instanceId.value),
@@ -487,7 +482,7 @@ const tabs = computed(() => {
 		},
 	]
 
-	if (instance.value?.visible_tabs.files !== false) {
+	if (appSettings.showFilesTabInInstances) {
 		instanceTabs.push({
 			label: formatMessage(messages.filesTab),
 			href: `${basePath.value}/files`,
@@ -495,8 +490,7 @@ const tabs = computed(() => {
 		})
 	}
 
-	const screenshotsGloballyAvailable = globalSyncedOptionsQuery.data.value?.screenshots === true
-	if (!screenshotsGloballyAvailable || instance.value?.visible_tabs.screenshots !== false) {
+	if (appSettings.showScreenshotsTabInInstances) {
 		instanceTabs.push({
 			label: formatMessage(messages.screenshotsTab),
 			href: `${basePath.value}/screenshots`,
@@ -504,7 +498,7 @@ const tabs = computed(() => {
 		})
 	}
 
-	if (instance.value?.visible_tabs.worlds !== false) {
+	if (appSettings.showWorldsTabInInstances) {
 		instanceTabs.push({
 			label: formatMessage(messages.worldsTab),
 			href: `${basePath.value}/worlds`,
diff --git a/apps/labrinth/src/models/v3/preferences.rs b/apps/labrinth/src/models/v3/preferences.rs
index 4cc2345884..8eb54b34d2 100644
--- a/apps/labrinth/src/models/v3/preferences.rs
+++ b/apps/labrinth/src/models/v3/preferences.rs
@@ -45,6 +45,11 @@ pub struct BehaviorPreferences {
     pub show_play_time: bool,
     pub hide_nametag: bool,
     pub show_all_screenshots: bool,
+    pub show_files_tab_in_instances: bool,
+    pub show_worlds_tab_in_instances: bool,
+    pub show_screenshots_tab_in_instances: bool,
+    pub show_skin_selector_in_sidebar: bool,
+    pub quick_instance_count: u8,
     pub warn_on_unknown_modpacks: bool,
     pub skip_non_essential_warnings: bool,
 }
@@ -59,6 +64,11 @@ impl Default for BehaviorPreferences {
             show_play_time: true,
             hide_nametag: false,
             show_all_screenshots: true,
+            show_files_tab_in_instances: true,
+            show_worlds_tab_in_instances: true,
+            show_screenshots_tab_in_instances: false,
+            show_skin_selector_in_sidebar: true,
+            quick_instance_count: 20,
             warn_on_unknown_modpacks: true,
             skip_non_essential_warnings: false,
         }
diff --git a/packages/api-client/src/modules/labrinth/types.ts b/packages/api-client/src/modules/labrinth/types.ts
index 354cf4af33..0c9078a4a6 100644
--- a/packages/api-client/src/modules/labrinth/types.ts
+++ b/packages/api-client/src/modules/labrinth/types.ts
@@ -1733,6 +1733,11 @@ export namespace Labrinth {
 				show_play_time: boolean
 				hide_nametag: boolean
 				show_all_screenshots: boolean
+				show_files_tab_in_instances: boolean
+				show_worlds_tab_in_instances: boolean
+				show_screenshots_tab_in_instances: boolean
+				show_skin_selector_in_sidebar: boolean
+				quick_instance_count: number
 				warn_on_unknown_modpacks: boolean
 				skip_non_essential_warnings: boolean
 			}
diff --git a/packages/app-lib/.sqlx/query-88c6a22aa112f10dce9d42779f06c723b356263ffc83aabb645c9fb5b6d5aa7c.json b/packages/app-lib/.sqlx/query-05b2976127c9c71488506c93b27801b9b6b187e7c75ca59fdffda2f0fb10e964.json
similarity index 78%
rename from packages/app-lib/.sqlx/query-88c6a22aa112f10dce9d42779f06c723b356263ffc83aabb645c9fb5b6d5aa7c.json
rename to packages/app-lib/.sqlx/query-05b2976127c9c71488506c93b27801b9b6b187e7c75ca59fdffda2f0fb10e964.json
index fe54b8050f..955d9f2bb4 100644
--- a/packages/app-lib/.sqlx/query-88c6a22aa112f10dce9d42779f06c723b356263ffc83aabb645c9fb5b6d5aa7c.json
+++ b/packages/app-lib/.sqlx/query-05b2976127c9c71488506c93b27801b9b6b187e7c75ca59fdffda2f0fb10e964.json
@@ -1,12 +1,12 @@
 {
   "db_name": "SQLite",
-  "query": "\n            UPDATE settings\n            SET\n                max_concurrent_writes = $1,\n                max_concurrent_downloads = $2,\n\n                theme = $3,\n                locale = $4,\n                default_page = $5,\n                collapsed_navigation = $6,\n                advanced_rendering = $7,\n                native_decorations = $8,\n\n                discord_rpc = $9,\n                developer_mode = $10,\n                telemetry = $11,\n                personalized_ads = $12,\n\n                extra_launch_args = jsonb($13),\n                custom_env_vars = jsonb($14),\n                mc_memory_max = $15,\n                mc_force_fullscreen = $16,\n                mc_game_resolution_x = $17,\n                mc_game_resolution_y = $18,\n                hide_on_process_start = $19,\n\n                hook_pre_launch = $20,\n                hook_wrapper = $21,\n                hook_post_exit = $22,\n\n                custom_dir = $23,\n                prev_custom_dir = $24,\n                migrated = $25,\n\n                toggle_sidebar = $26,\n                feature_flags = $27,\n                hide_nametag_skins_page = $28,\n\n                skipped_update = $29,\n                pending_update_toast_for_version = $30,\n                auto_download_updates = $31,\n\n                sync_theme_across_devices = $32,\n                sync_behavior_across_devices = $33,\n\n                version = $34\n            ",
+  "query": "\n            UPDATE settings\n            SET\n                max_concurrent_writes = $1,\n                max_concurrent_downloads = $2,\n\n                theme = $3,\n                locale = $4,\n                default_page = $5,\n                collapsed_navigation = $6,\n                advanced_rendering = $7,\n                native_decorations = $8,\n\n                discord_rpc = $9,\n                developer_mode = $10,\n                telemetry = $11,\n                personalized_ads = $12,\n\n                extra_launch_args = jsonb($13),\n                custom_env_vars = jsonb($14),\n                mc_memory_max = $15,\n                mc_force_fullscreen = $16,\n                mc_game_resolution_x = $17,\n                mc_game_resolution_y = $18,\n                hide_on_process_start = $19,\n\n                hook_pre_launch = $20,\n                hook_wrapper = $21,\n                hook_post_exit = $22,\n\n                custom_dir = $23,\n                prev_custom_dir = $24,\n                migrated = $25,\n\n                toggle_sidebar = $26,\n                feature_flags = $27,\n                hide_nametag_skins_page = $28,\n\n                skipped_update = $29,\n                pending_update_toast_for_version = $30,\n                auto_download_updates = $31,\n\n                sync_theme_across_devices = $32,\n                sync_behavior_across_devices = $33,\n\t\t\t\tsync_features_across_devices = $34,\n\t\t\t\tshow_files_tab_in_instances = $35,\n\t\t\t\tshow_worlds_tab_in_instances = $36,\n\t\t\t\tshow_screenshots_tab_in_instances = $37,\n\t\t\t\tshow_skin_selector_in_sidebar = $38,\n\n\t\t\t\tversion = $39\n            ",
   "describe": {
     "columns": [],
     "parameters": {
-      "Right": 34
+      "Right": 39
     },
     "nullable": []
   },
-  "hash": "88c6a22aa112f10dce9d42779f06c723b356263ffc83aabb645c9fb5b6d5aa7c"
+  "hash": "05b2976127c9c71488506c93b27801b9b6b187e7c75ca59fdffda2f0fb10e964"
 }
diff --git a/packages/app-lib/.sqlx/query-29df6a29d9221b9bbea45e024fb26f5b6a3155788880369af940fcd268d3cb94.json b/packages/app-lib/.sqlx/query-a37f3c9cc8c1d8aa620f83569633db30d98573c1ac04705da186d0cf88b20ca7.json
similarity index 82%
rename from packages/app-lib/.sqlx/query-29df6a29d9221b9bbea45e024fb26f5b6a3155788880369af940fcd268d3cb94.json
rename to packages/app-lib/.sqlx/query-a37f3c9cc8c1d8aa620f83569633db30d98573c1ac04705da186d0cf88b20ca7.json
index 2b031b4401..7c0feed8ed 100644
--- a/packages/app-lib/.sqlx/query-29df6a29d9221b9bbea45e024fb26f5b6a3155788880369af940fcd268d3cb94.json
+++ b/packages/app-lib/.sqlx/query-a37f3c9cc8c1d8aa620f83569633db30d98573c1ac04705da186d0cf88b20ca7.json
@@ -1,6 +1,6 @@
 {
   "db_name": "SQLite",
-  "query": "\n            SELECT\n                max_concurrent_writes, max_concurrent_downloads,\n                theme, locale, default_page, collapsed_navigation, hide_nametag_skins_page, advanced_rendering, native_decorations,\n                discord_rpc, developer_mode, telemetry, personalized_ads,\n                json(extra_launch_args) extra_launch_args, json(custom_env_vars) custom_env_vars,\n                mc_memory_max, mc_force_fullscreen, mc_game_resolution_x, mc_game_resolution_y, hide_on_process_start,\n                hook_pre_launch, hook_wrapper, hook_post_exit,\n                custom_dir, prev_custom_dir, migrated, json(feature_flags) feature_flags, toggle_sidebar,\n                skipped_update, pending_update_toast_for_version, auto_download_updates,\n                sync_theme_across_devices, sync_behavior_across_devices,\n                version\n            FROM settings\n            ",
+  "query": "\n            SELECT\n                max_concurrent_writes, max_concurrent_downloads,\n                theme, locale, default_page, collapsed_navigation, hide_nametag_skins_page, advanced_rendering, native_decorations,\n                discord_rpc, developer_mode, telemetry, personalized_ads,\n                json(extra_launch_args) extra_launch_args, json(custom_env_vars) custom_env_vars,\n                mc_memory_max, mc_force_fullscreen, mc_game_resolution_x, mc_game_resolution_y, hide_on_process_start,\n                hook_pre_launch, hook_wrapper, hook_post_exit,\n                custom_dir, prev_custom_dir, migrated, json(feature_flags) feature_flags, toggle_sidebar,\n                skipped_update, pending_update_toast_for_version, auto_download_updates,\n\t\t\t\tsync_theme_across_devices, sync_behavior_across_devices, sync_features_across_devices,\n\t\t\t\tshow_files_tab_in_instances, show_worlds_tab_in_instances,\n\t\t\t\tshow_screenshots_tab_in_instances, show_skin_selector_in_sidebar,\n                version\n            FROM settings\n            ",
   "describe": {
     "columns": [
       {
@@ -169,9 +169,34 @@
         "type_info": "Integer"
       },
       {
-        "name": "version",
+        "name": "sync_features_across_devices",
         "ordinal": 33,
         "type_info": "Integer"
+      },
+      {
+        "name": "show_files_tab_in_instances",
+        "ordinal": 34,
+        "type_info": "Integer"
+      },
+      {
+        "name": "show_worlds_tab_in_instances",
+        "ordinal": 35,
+        "type_info": "Integer"
+      },
+      {
+        "name": "show_screenshots_tab_in_instances",
+        "ordinal": 36,
+        "type_info": "Integer"
+      },
+      {
+        "name": "show_skin_selector_in_sidebar",
+        "ordinal": 37,
+        "type_info": "Integer"
+      },
+      {
+        "name": "version",
+        "ordinal": 38,
+        "type_info": "Integer"
       }
     ],
     "parameters": {
@@ -211,8 +236,13 @@
       true,
       false,
       false,
+      false,
+      false,
+      false,
+      false,
+      false,
       false
     ]
   },
-  "hash": "29df6a29d9221b9bbea45e024fb26f5b6a3155788880369af940fcd268d3cb94"
+  "hash": "a37f3c9cc8c1d8aa620f83569633db30d98573c1ac04705da186d0cf88b20ca7"
 }
diff --git a/packages/app-lib/migrations/20260902120000_enable-synced-options-for-fresh-installs.sql b/packages/app-lib/migrations/20260902120000_enable-synced-options-for-fresh-installs.sql
new file mode 100644
index 0000000000..afa91ebd84
--- /dev/null
+++ b/packages/app-lib/migrations/20260902120000_enable-synced-options-for-fresh-installs.sql
@@ -0,0 +1,9 @@
+UPDATE sync_feature_settings
+SET globally_enabled = 1
+WHERE feature IN (
+	'game_options',
+	'multiplayer_servers',
+	'command_history',
+	'creative_hotbars'
+)
+	AND NOT EXISTS (SELECT 1 FROM instances);
diff --git a/packages/app-lib/migrations/20260902130000_promote-instance-navigation-settings.sql b/packages/app-lib/migrations/20260902130000_promote-instance-navigation-settings.sql
new file mode 100644
index 0000000000..e1b74cab94
--- /dev/null
+++ b/packages/app-lib/migrations/20260902130000_promote-instance-navigation-settings.sql
@@ -0,0 +1,25 @@
+ALTER TABLE settings
+ADD COLUMN show_files_tab_in_instances INTEGER NOT NULL DEFAULT TRUE CHECK (show_files_tab_in_instances IN (0, 1));
+
+ALTER TABLE settings
+ADD COLUMN show_worlds_tab_in_instances INTEGER NOT NULL DEFAULT TRUE CHECK (show_worlds_tab_in_instances IN (0, 1));
+
+ALTER TABLE settings
+ADD COLUMN show_screenshots_tab_in_instances INTEGER NOT NULL DEFAULT FALSE CHECK (show_screenshots_tab_in_instances IN (0, 1));
+
+ALTER TABLE settings
+ADD COLUMN show_skin_selector_in_sidebar INTEGER NOT NULL DEFAULT TRUE CHECK (show_skin_selector_in_sidebar IN (0, 1));
+
+UPDATE settings
+SET
+	show_files_tab_in_instances = COALESCE(json_extract(feature_flags, '$.show_files_tab_in_instances'), TRUE),
+	show_worlds_tab_in_instances = COALESCE(json_extract(feature_flags, '$.show_worlds_tab_in_instances'), TRUE),
+	show_screenshots_tab_in_instances = COALESCE(json_extract(feature_flags, '$.show_screenshots_tab_in_instances'), FALSE),
+	show_skin_selector_in_sidebar = COALESCE(json_extract(feature_flags, '$.show_skin_selector_in_sidebar'), TRUE),
+	feature_flags = json_remove(
+		feature_flags,
+		'$.show_files_tab_in_instances',
+		'$.show_worlds_tab_in_instances',
+		'$.show_screenshots_tab_in_instances',
+		'$.show_skin_selector_in_sidebar'
+	);
diff --git a/packages/app-lib/migrations/20260902140000_sync-features-setting.sql b/packages/app-lib/migrations/20260902140000_sync-features-setting.sql
new file mode 100644
index 0000000000..63e19f975b
--- /dev/null
+++ b/packages/app-lib/migrations/20260902140000_sync-features-setting.sql
@@ -0,0 +1,5 @@
+ALTER TABLE settings
+ADD COLUMN sync_features_across_devices INTEGER NOT NULL DEFAULT TRUE;
+
+UPDATE settings
+SET sync_features_across_devices = sync_behavior_across_devices;
diff --git a/packages/app-lib/src/state/settings.rs b/packages/app-lib/src/state/settings.rs
index 5dd0e79431..7e49d74084 100644
--- a/packages/app-lib/src/state/settings.rs
+++ b/packages/app-lib/src/state/settings.rs
@@ -21,6 +21,16 @@ pub struct Settings {
     pub toggle_sidebar: bool,
     pub sync_theme_across_devices: bool,
     pub sync_behavior_across_devices: bool,
+    #[serde(default = "default_true")]
+    pub sync_features_across_devices: bool,
+    #[serde(default = "default_true")]
+    pub show_files_tab_in_instances: bool,
+    #[serde(default = "default_true")]
+    pub show_worlds_tab_in_instances: bool,
+    #[serde(default)]
+    pub show_screenshots_tab_in_instances: bool,
+    #[serde(default = "default_true")]
+    pub show_skin_selector_in_sidebar: bool,
 
     pub telemetry: bool,
     pub discord_rpc: bool,
@@ -48,6 +58,10 @@ pub struct Settings {
     pub version: usize,
 }
 
+fn default_true() -> bool {
+    true
+}
+
 #[derive(Serialize, Deserialize, Debug, Clone, Copy, Eq, Hash, PartialEq)]
 #[serde(rename_all = "snake_case")]
 pub enum FeatureFlag {
@@ -92,7 +106,9 @@ impl Settings {
                 hook_pre_launch, hook_wrapper, hook_post_exit,
                 custom_dir, prev_custom_dir, migrated, json(feature_flags) feature_flags, toggle_sidebar,
                 skipped_update, pending_update_toast_for_version, auto_download_updates,
-                sync_theme_across_devices, sync_behavior_across_devices,
+				sync_theme_across_devices, sync_behavior_across_devices, sync_features_across_devices,
+				show_files_tab_in_instances, show_worlds_tab_in_instances,
+				show_screenshots_tab_in_instances, show_skin_selector_in_sidebar,
                 version
             FROM settings
             "
@@ -153,6 +169,14 @@ impl Settings {
             auto_download_updates: res.auto_download_updates.map(|x| x == 1),
             sync_theme_across_devices: res.sync_theme_across_devices == 1,
             sync_behavior_across_devices: res.sync_behavior_across_devices == 1,
+            sync_features_across_devices: res.sync_features_across_devices == 1,
+            show_files_tab_in_instances: res.show_files_tab_in_instances == 1,
+            show_worlds_tab_in_instances: res.show_worlds_tab_in_instances == 1,
+            show_screenshots_tab_in_instances: res
+                .show_screenshots_tab_in_instances
+                == 1,
+            show_skin_selector_in_sidebar: res.show_skin_selector_in_sidebar
+                == 1,
             version: res.version as usize,
         })
     }
@@ -215,8 +239,13 @@ impl Settings {
 
                 sync_theme_across_devices = $32,
                 sync_behavior_across_devices = $33,
+				sync_features_across_devices = $34,
+				show_files_tab_in_instances = $35,
+				show_worlds_tab_in_instances = $36,
+				show_screenshots_tab_in_instances = $37,
+				show_skin_selector_in_sidebar = $38,
 
-                version = $34
+				version = $39
             ",
             max_concurrent_writes,
             max_concurrent_downloads,
@@ -251,6 +280,11 @@ impl Settings {
             self.auto_download_updates,
             self.sync_theme_across_devices,
             self.sync_behavior_across_devices,
+            self.sync_features_across_devices,
+            self.show_files_tab_in_instances,
+            self.show_worlds_tab_in_instances,
+            self.show_screenshots_tab_in_instances,
+            self.show_skin_selector_in_sidebar,
             version,
         )
         .execute(exec)

From 992cd8ae3620175f9ec3d8d4f87605d2404c76bf Mon Sep 17 00:00:00 2001
From: "Calum H. (IMB11)" <contact@cal.engineer>
Date: Thu, 3 Sep 2026 14:31:59 +0100
Subject: [PATCH 17/33] qa: pass 4

---
 apps/app-frontend/src/App.vue                 | 35 ++++----
 .../ui/settings/display/BehaviorSettings.vue  | 59 +-------------
 .../ui/settings/display/FeaturesSettings.vue  | 81 +++++++++++++------
 .../game-settings/GameSettingRow.vue          | 20 +++--
 .../game-settings/game-setting-editors.ts     |  5 +-
 .../app-frontend/src/locales/ar-SA/index.json |  6 --
 .../app-frontend/src/locales/cs-CZ/index.json |  6 --
 .../app-frontend/src/locales/de-CH/index.json |  6 --
 .../app-frontend/src/locales/de-DE/index.json |  6 --
 .../app-frontend/src/locales/en-US/index.json | 38 ++++-----
 .../src/locales/es-419/index.json             |  6 --
 .../app-frontend/src/locales/es-ES/index.json |  6 --
 .../app-frontend/src/locales/fr-FR/index.json |  6 --
 .../app-frontend/src/locales/hu-HU/index.json |  6 --
 .../app-frontend/src/locales/it-IT/index.json |  6 --
 .../app-frontend/src/locales/ko-KR/index.json |  6 --
 .../app-frontend/src/locales/ru-RU/index.json |  6 --
 .../app-frontend/src/locales/sv-SE/index.json |  3 -
 .../app-frontend/src/locales/tr-TR/index.json |  6 --
 .../app-frontend/src/locales/vi-VN/index.json |  6 --
 .../app-frontend/src/locales/zh-CN/index.json |  6 --
 .../app-frontend/src/locales/zh-TW/index.json |  6 --
 .../src/pages/instance/worlds/index.vue       |  2 +-
 .../src/pages/discover/[type]/index.vue       |  9 ++-
 .../game_options/write_shared_settings.rs     |  2 +-
 .../api/instance/synced_servers/operations.rs | 43 +---------
 packages/blog/changelog.ts                    |  2 +-
 packages/ui/src/components/base/Slider.vue    | 41 ++++++----
 .../src/layouts/shared/browse-tab/layout.vue  |  2 +-
 .../components/ConsoleActionButtons.vue       |  2 +-
 .../ui/src/layouts/shared/console/layout.vue  | 15 +++-
 31 files changed, 163 insertions(+), 286 deletions(-)

diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue
index da83659c1c..f1826da265 100644
--- a/apps/app-frontend/src/App.vue
+++ b/apps/app-frontend/src/App.vue
@@ -1133,23 +1133,6 @@ watch(
 						settings.hide_nametag_skins_page = behavior.hide_nametag
 						settingsChanged = true
 					}
-					const showAllScreenshots = behavior.show_all_screenshots
-					if (typeof showAllScreenshots === 'boolean') {
-						const globalSyncedOptions =
-							globalSyncedOptionsQuery.data.value ??
-							(await queryClient.fetchQuery({
-								queryKey: ['global-synced-options'],
-								queryFn: get_global_synced_options,
-							}))
-						if (globalSyncedOptions.screenshots !== showAllScreenshots) {
-							const updatedGlobalSyncedOptions = await set_global_synced_option(
-								'screenshots',
-								showAllScreenshots,
-							)
-							queryClient.setQueryData(['global-synced-options'], updatedGlobalSyncedOptions)
-							await queryClient.invalidateQueries({ queryKey: screenshotKeys.all })
-						}
-					}
 
 					for (const [flag, value] of Object.entries(behaviorFeatureFlags)) {
 						if (settings.feature_flags[flag] !== value) {
@@ -1206,6 +1189,24 @@ watch(
 						settings.show_skin_selector_in_sidebar = showSkinSelector
 						settingsChanged = true
 					}
+					const showAllScreenshots = behavior.show_all_screenshots
+					if (typeof showAllScreenshots === 'boolean') {
+						const globalSyncedOptions =
+							globalSyncedOptionsQuery.data.value ??
+							(await queryClient.fetchQuery({
+								queryKey: ['global-synced-options'],
+								queryFn: get_global_synced_options,
+							}))
+						if (globalSyncedOptions.screenshots !== showAllScreenshots) {
+							const updatedGlobalSyncedOptions = await set_global_synced_option(
+								'screenshots',
+								showAllScreenshots,
+							)
+							queryClient.setQueryData(['global-synced-options'], updatedGlobalSyncedOptions)
+							await queryClient.invalidateQueries({ queryKey: screenshotKeys.all })
+						}
+					}
+
 					for (const [flag, value] of Object.entries(featureFlags)) {
 						if (settings.feature_flags[flag] !== value) {
 							settings.feature_flags[flag] = value
diff --git a/apps/app-frontend/src/components/ui/settings/display/BehaviorSettings.vue b/apps/app-frontend/src/components/ui/settings/display/BehaviorSettings.vue
index b001da35eb..142f21d5cd 100644
--- a/apps/app-frontend/src/components/ui/settings/display/BehaviorSettings.vue
+++ b/apps/app-frontend/src/components/ui/settings/display/BehaviorSettings.vue
@@ -7,7 +7,6 @@ import {
 	useSavable,
 	useVIntl,
 } from '@modrinth/ui'
-import { useQueryClient } from '@tanstack/vue-query'
 import { inject, onBeforeUnmount, onMounted, ref } from 'vue'
 
 import {
@@ -15,13 +14,7 @@ import {
 	type FeatureFlag,
 	useAppSettings,
 } from '@/composables/use-app-settings.ts'
-import {
-	get_global_synced_options,
-	type GlobalSyncedOptions,
-	set_global_synced_option,
-} from '@/helpers/instance.ts'
 import { type AppSettings, get, set } from '@/helpers/settings.ts'
-import { screenshotKeys } from '@/pages/instance/query-options.ts'
 import { appSettingsModalContextKey } from '@/providers/app-settings-modal'
 
 const appSettings = useAppSettings()
@@ -29,7 +22,6 @@ const { formatMessage } = useVIntl()
 const auth = injectAuth()
 const { updatePreferences } = injectUserPreferences()
 const settingsModal = inject(appSettingsModalContextKey, null)
-const queryClient = useQueryClient()
 
 const compactInstanceCardsFlag: FeatureFlag = 'compact_instance_cards'
 const skipNonEssentialWarningsFlag: FeatureFlag = 'skip_non_essential_warnings'
@@ -58,14 +50,6 @@ const messages = defineMessages({
 		id: 'app.behavior-settings.content.title',
 		defaultMessage: 'Home and content',
 	},
-	showAllScreenshotsTitle: {
-		id: 'app.behavior-settings.show-all-screenshots.title',
-		defaultMessage: 'Show all screenshots together',
-	},
-	showAllScreenshotsDescription: {
-		id: 'app.behavior-settings.show-all-screenshots.description',
-		defaultMessage: 'View screenshots from all your instances on the Screenshots page.',
-	},
 	confirmationsTitle: {
 		id: 'app.behavior-settings.confirmations.title',
 		defaultMessage: 'Confirmations',
@@ -142,7 +126,6 @@ type BehaviorSettingsState = {
 	syncBehaviorAcrossDevices: boolean
 	minimizeApp: boolean
 	hideRightSidebar: boolean
-	showAllScreenshots: boolean
 	compactInstanceCards: boolean
 	showPlayTime: boolean
 	hideNametag: boolean
@@ -150,22 +133,13 @@ type BehaviorSettingsState = {
 	skipNonEssentialWarnings: boolean
 }
 
-const [initialSettings, initialGlobalSyncedOptions] = await Promise.all([
-	get(),
-	get_global_synced_options(),
-])
-const persistedSettings = ref(initialSettings)
-const persistedGlobalSyncedOptions = ref(initialGlobalSyncedOptions)
+const persistedSettings = ref(await get())
 
-function getBehaviorSettingsState(
-	settings: AppSettings,
-	globalSyncedOptions: GlobalSyncedOptions,
-): BehaviorSettingsState {
+function getBehaviorSettingsState(settings: AppSettings): BehaviorSettingsState {
 	return {
 		syncBehaviorAcrossDevices: settings.sync_behavior_across_devices,
 		minimizeApp: settings.hide_on_process_start,
 		hideRightSidebar: settings.toggle_sidebar,
-		showAllScreenshots: globalSyncedOptions.screenshots,
 		compactInstanceCards:
 			settings.feature_flags[compactInstanceCardsFlag] ??
 			DEFAULT_FEATURE_FLAGS[compactInstanceCardsFlag],
@@ -183,7 +157,7 @@ function getBehaviorSettingsState(
 }
 
 const { saved, current, changes, saving, hasChanges, reset, save } = useSavable(
-	() => getBehaviorSettingsState(persistedSettings.value, persistedGlobalSyncedOptions.value),
+	() => getBehaviorSettingsState(persistedSettings.value),
 	async () => {
 		const value = current.value
 
@@ -195,7 +169,6 @@ const { saved, current, changes, saving, hasChanges, reset, save } = useSavable(
 					compact_instance_cards: value.compactInstanceCards,
 					show_play_time: value.showPlayTime,
 					hide_nametag: value.hideNametag,
-					show_all_screenshots: value.showAllScreenshots,
 					warn_on_unknown_modpacks: value.warnOnUnknownModpacks,
 					skip_non_essential_warnings: value.skipNonEssentialWarnings,
 				},
@@ -217,20 +190,8 @@ const { saved, current, changes, saving, hasChanges, reset, save } = useSavable(
 			},
 		}
 
-		const screenshotsChanged =
-			value.showAllScreenshots !== persistedGlobalSyncedOptions.value.screenshots
-		const [, updatedGlobalSyncedOptions] = await Promise.all([
-			set(nextSettings),
-			screenshotsChanged
-				? set_global_synced_option('screenshots', value.showAllScreenshots)
-				: Promise.resolve(persistedGlobalSyncedOptions.value),
-		])
+		await set(nextSettings)
 		persistedSettings.value = nextSettings
-		persistedGlobalSyncedOptions.value = updatedGlobalSyncedOptions
-		queryClient.setQueryData(['global-synced-options'], updatedGlobalSyncedOptions)
-		if (screenshotsChanged) {
-			await queryClient.invalidateQueries({ queryKey: screenshotKeys.all })
-		}
 		appSettings.setBehaviorSyncAcrossDevices(value.syncBehaviorAcrossDevices)
 		appSettings.toggleSidebar = value.hideRightSidebar
 		appSettings.hideNametagSkinsPage = value.hideNametag
@@ -326,18 +287,6 @@ onBeforeUnmount(() => {
 			{{ formatMessage(messages.contentTitle) }}
 		</h2>
 		<div class="mt-4 flex flex-col gap-6">
-			<div class="flex items-center justify-between gap-4">
-				<div>
-					<h3 class="m-0 text-lg font-semibold text-contrast">
-						{{ formatMessage(messages.showAllScreenshotsTitle) }}
-					</h3>
-					<p class="m-0 mt-1">
-						{{ formatMessage(messages.showAllScreenshotsDescription) }}
-					</p>
-				</div>
-				<Toggle id="show-all-screenshots" v-model="current.showAllScreenshots" />
-			</div>
-
 			<div class="flex items-center justify-between gap-4">
 				<div>
 					<h3 class="m-0 text-lg font-semibold text-contrast">
diff --git a/apps/app-frontend/src/components/ui/settings/display/FeaturesSettings.vue b/apps/app-frontend/src/components/ui/settings/display/FeaturesSettings.vue
index 3320c8c6fd..3091cbe0d3 100644
--- a/apps/app-frontend/src/components/ui/settings/display/FeaturesSettings.vue
+++ b/apps/app-frontend/src/components/ui/settings/display/FeaturesSettings.vue
@@ -8,6 +8,7 @@ import {
 	useSavable,
 	useVIntl,
 } from '@modrinth/ui'
+import { useQueryClient } from '@tanstack/vue-query'
 import { inject, onBeforeUnmount, onMounted, ref } from 'vue'
 
 import {
@@ -19,7 +20,13 @@ import {
 	QUICK_INSTANCE_LIMIT_MAX,
 	useQuickInstanceLimit,
 } from '@/composables/use-quick-instance-limit.ts'
+import {
+	get_global_synced_options,
+	type GlobalSyncedOptions,
+	set_global_synced_option,
+} from '@/helpers/instance.ts'
 import { type AppSettings, get, set } from '@/helpers/settings.ts'
+import { screenshotKeys } from '@/pages/instance/query-options.ts'
 import { appSettingsModalContextKey } from '@/providers/app-settings-modal'
 
 const appSettings = useAppSettings()
@@ -28,6 +35,7 @@ const auth = injectAuth()
 const { updatePreferences } = injectUserPreferences()
 const settingsModal = inject(appSettingsModalContextKey, null)
 const quickInstances = useQuickInstanceLimit()
+const queryClient = useQueryClient()
 
 const showJumpInFlag: FeatureFlag = 'worlds_in_home'
 
@@ -47,43 +55,40 @@ const messages = defineMessages({
 	},
 	instancePagesTitle: {
 		id: 'app.features-settings.instance-pages.title',
-		defaultMessage: 'Instance pages',
+		defaultMessage: 'Instances',
 	},
 	showWorldsTabTitle: {
 		id: 'app.features-settings.show-worlds-tab.title',
 		defaultMessage: 'Show Worlds tab in instances',
 	},
-	showWorldsTabDescription: {
-		id: 'app.features-settings.show-worlds-tab.description',
-		defaultMessage: 'Browse and launch worlds from each instance.',
-	},
 	showFilesTabTitle: {
 		id: 'app.features-settings.show-files-tab.title',
 		defaultMessage: 'Show Files tab in instances',
 	},
-	showFilesTabDescription: {
-		id: 'app.features-settings.show-files-tab.description',
-		defaultMessage: 'Browse the files in each instance from its navigation.',
-	},
 	showScreenshotsTabTitle: {
 		id: 'app.features-settings.show-screenshots-tab.title',
 		defaultMessage: 'Show Screenshots tab in instances',
 	},
-	showScreenshotsTabDescription: {
-		id: 'app.features-settings.show-screenshots-tab.description',
-		defaultMessage: 'Browse screenshots from the instance where they were taken.',
-	},
 	sidebarTitle: {
 		id: 'app.features-settings.sidebar.title',
 		defaultMessage: 'Sidebar',
 	},
+	showAllScreenshotsTitle: {
+		id: 'app.features-settings.show-all-screenshots.title',
+		defaultMessage: 'Show all screenshots in sidebar',
+	},
+	showAllScreenshotsDescription: {
+		id: 'app.features-settings.show-all-screenshots.description',
+		defaultMessage:
+			'Show a button in the left sidebar to view screenshots from all your instances.',
+	},
 	showSkinSelectorTitle: {
 		id: 'app.features-settings.show-skin-selector.title',
 		defaultMessage: 'Show skin selector in sidebar',
 	},
 	showSkinSelectorDescription: {
 		id: 'app.features-settings.show-skin-selector.description',
-		defaultMessage: 'Add a shortcut to the skin selector to the left sidebar.',
+		defaultMessage: 'Show a button in the left sidebar to open the skin selector.',
 	},
 	quickInstancesTitle: {
 		id: 'app.features-settings.quick-instances.title',
@@ -113,19 +118,29 @@ type FeaturesSettingsState = {
 	showFilesTab: boolean
 	showWorldsTab: boolean
 	showScreenshotsTab: boolean
+	showAllScreenshots: boolean
 	showSkinSelector: boolean
 	quickInstanceCount: number
 	showJumpIn: boolean
 }
 
-const persistedSettings = ref(await get())
+const [initialSettings, initialGlobalSyncedOptions] = await Promise.all([
+	get(),
+	get_global_synced_options(),
+])
+const persistedSettings = ref(initialSettings)
+const persistedGlobalSyncedOptions = ref(initialGlobalSyncedOptions)
 
-function getFeaturesSettingsState(settings: AppSettings): FeaturesSettingsState {
+function getFeaturesSettingsState(
+	settings: AppSettings,
+	globalSyncedOptions: GlobalSyncedOptions,
+): FeaturesSettingsState {
 	return {
 		syncFeaturesAcrossDevices: settings.sync_features_across_devices,
 		showFilesTab: settings.show_files_tab_in_instances,
 		showWorldsTab: settings.show_worlds_tab_in_instances,
 		showScreenshotsTab: settings.show_screenshots_tab_in_instances,
+		showAllScreenshots: globalSyncedOptions.screenshots,
 		showSkinSelector: settings.show_skin_selector_in_sidebar,
 		quickInstanceCount: Math.min(
 			quickInstances.limit.value ?? QUICK_INSTANCE_LIMIT_MAX,
@@ -136,7 +151,7 @@ function getFeaturesSettingsState(settings: AppSettings): FeaturesSettingsState
 }
 
 const { saved, current, changes, saving, hasChanges, reset, save } = useSavable(
-	() => getFeaturesSettingsState(persistedSettings.value),
+	() => getFeaturesSettingsState(persistedSettings.value, persistedGlobalSyncedOptions.value),
 	async (changedValues) => {
 		const value = current.value
 
@@ -147,6 +162,7 @@ const { saved, current, changes, saving, hasChanges, reset, save } = useSavable(
 					show_files_tab_in_instances: value.showFilesTab,
 					show_worlds_tab_in_instances: value.showWorldsTab,
 					show_screenshots_tab_in_instances: value.showScreenshotsTab,
+					show_all_screenshots: value.showAllScreenshots,
 					show_skin_selector_in_sidebar: value.showSkinSelector,
 					quick_instance_count: value.quickInstanceCount,
 				},
@@ -166,8 +182,20 @@ const { saved, current, changes, saving, hasChanges, reset, save } = useSavable(
 			},
 		}
 
-		await set(nextSettings)
+		const screenshotsChanged =
+			value.showAllScreenshots !== persistedGlobalSyncedOptions.value.screenshots
+		const [, updatedGlobalSyncedOptions] = await Promise.all([
+			set(nextSettings),
+			screenshotsChanged
+				? set_global_synced_option('screenshots', value.showAllScreenshots)
+				: Promise.resolve(persistedGlobalSyncedOptions.value),
+		])
 		persistedSettings.value = nextSettings
+		persistedGlobalSyncedOptions.value = updatedGlobalSyncedOptions
+		queryClient.setQueryData(['global-synced-options'], updatedGlobalSyncedOptions)
+		if (screenshotsChanged) {
+			await queryClient.invalidateQueries({ queryKey: screenshotKeys.all })
+		}
 		appSettings.setFeaturesSyncAcrossDevices(value.syncFeaturesAcrossDevices)
 		appSettings.showFilesTabInInstances = value.showFilesTab
 		appSettings.showWorldsTabInInstances = value.showWorldsTab
@@ -245,7 +273,6 @@ onBeforeUnmount(() => {
 					<h3 class="m-0 text-lg font-semibold text-contrast">
 						{{ formatMessage(messages.showWorldsTabTitle) }}
 					</h3>
-					<p class="m-0 mt-1">{{ formatMessage(messages.showWorldsTabDescription) }}</p>
 				</div>
 				<Toggle id="show-worlds-tab-in-instances" v-model="current.showWorldsTab" />
 			</div>
@@ -255,7 +282,6 @@ onBeforeUnmount(() => {
 					<h3 class="m-0 text-lg font-semibold text-contrast">
 						{{ formatMessage(messages.showFilesTabTitle) }}
 					</h3>
-					<p class="m-0 mt-1">{{ formatMessage(messages.showFilesTabDescription) }}</p>
 				</div>
 				<Toggle id="show-files-tab-in-instances" v-model="current.showFilesTab" />
 			</div>
@@ -265,9 +291,6 @@ onBeforeUnmount(() => {
 					<h3 class="m-0 text-lg font-semibold text-contrast">
 						{{ formatMessage(messages.showScreenshotsTabTitle) }}
 					</h3>
-					<p class="m-0 mt-1">
-						{{ formatMessage(messages.showScreenshotsTabDescription) }}
-					</p>
 				</div>
 				<Toggle id="show-screenshots-tab-in-instances" v-model="current.showScreenshotsTab" />
 			</div>
@@ -279,6 +302,18 @@ onBeforeUnmount(() => {
 			{{ formatMessage(messages.sidebarTitle) }}
 		</h2>
 		<div class="mt-4 flex flex-col gap-6">
+			<div class="flex items-center justify-between gap-4">
+				<div>
+					<h3 class="m-0 text-lg font-semibold text-contrast">
+						{{ formatMessage(messages.showAllScreenshotsTitle) }}
+					</h3>
+					<p class="m-0 mt-1">
+						{{ formatMessage(messages.showAllScreenshotsDescription) }}
+					</p>
+				</div>
+				<Toggle id="show-all-screenshots" v-model="current.showAllScreenshots" />
+			</div>
+
 			<div class="flex items-center justify-between gap-4">
 				<div>
 					<h3 class="m-0 text-lg font-semibold text-contrast">
diff --git a/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingRow.vue b/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingRow.vue
index 1b84721079..ca23e3b72b 100644
--- a/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingRow.vue
+++ b/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingRow.vue
@@ -101,11 +101,11 @@ const enumOptions = computed<ComboboxOption<string>[]>(() =>
 		label: formatGameSettingChoice(formatMessage, props.setting.option_id, choice.value),
 	})),
 )
-const isVolumeSlider = computed(
+const isSlider = computed(
 	() =>
-		props.setting.category_id === 'music_and_sound' &&
-		props.setting.editor.unit === 'percent' &&
-		props.setting.editor.type === 'decimal',
+		(props.setting.editor.type === 'integer' || props.setting.editor.type === 'decimal') &&
+		props.setting.editor.min != null &&
+		props.setting.editor.max != null,
 )
 const booleanValue = computed(() => canonicalBooleanValue(props.setting))
 const numberScale = computed(() => (props.setting.editor.unit === 'percent' ? 100 : 1))
@@ -125,8 +125,9 @@ const inputStep = computed(() =>
 		: props.setting.editor.step * numberScale.value,
 )
 const sliderValue = computed(() => {
+	if (valueText.value === '') return null
 	const value = Number(valueText.value)
-	return Number.isFinite(value) ? value : (inputMin.value ?? 0)
+	return Number.isFinite(value) ? value : null
 })
 const editorDisabled = computed(
 	() =>
@@ -194,7 +195,7 @@ function updateValue(value: string | number | boolean | undefined) {
 	<div
 		class="grid min-h-[54px] min-w-0 items-center gap-2"
 		:class="
-			isVolumeSlider
+			isSlider
 				? showSyncToggle
 					? 'grid-cols-[minmax(10rem,0.65fr)_minmax(0,1.35fr)_2.25rem]'
 					: 'grid-cols-[minmax(10rem,0.65fr)_minmax(0,1.35fr)]'
@@ -230,13 +231,16 @@ function updateValue(value: string | number | boolean | undefined) {
 
 		<div class="flex min-w-0 items-center justify-end">
 			<Slider
-				v-if="isVolumeSlider"
+				v-if="isSlider"
 				:model-value="sliderValue"
 				:min="inputMin ?? 0"
 				:max="inputMax ?? 100"
 				:step="inputStep ?? 1"
-				:snap-points="[0, 50, 100]"
+				:snap-points="setting.category_id === 'music_and_sound' ? [0, 50, 100] : []"
 				:snap-range="5"
+				:unit="setting.editor.unit === 'percent' ? '%' : undefined"
+				:placeholder="placeholder"
+				:aria-label="settingLabel"
 				:disabled="editorDisabled"
 				value-input-class="!bg-transparent"
 				class="[&_input]:!text-secondary"
diff --git a/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-editors.ts b/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-editors.ts
index 60324f86a5..b1aa518f93 100644
--- a/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-editors.ts
+++ b/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-editors.ts
@@ -72,11 +72,10 @@ export function canonicalValueText(setting: EditableGameSetting): string {
 		case 'bool':
 			return value.value ? 'true' : 'false'
 		case 'integer':
-			return String(value.value)
 		case 'decimal':
 			return setting.editor.unit === 'percent'
-				? (Number(value.value) * 100).toFixed(0)
-				: value.value
+				? String(Number((Number(value.value) * 100).toFixed(8)))
+				: String(value.value)
 		case 'string_list':
 			return value.value.join(', ')
 		default:
diff --git a/apps/app-frontend/src/locales/ar-SA/index.json b/apps/app-frontend/src/locales/ar-SA/index.json
index 4f777d659f..09012c1e5a 100644
--- a/apps/app-frontend/src/locales/ar-SA/index.json
+++ b/apps/app-frontend/src/locales/ar-SA/index.json
@@ -161,12 +161,6 @@
   "app.appearance-settings.hide-nametag.title": {
     "message": "إخفاء عرض الاسم"
   },
-  "app.appearance-settings.jump-back-into-worlds.description": {
-    "message": "عرض العوالم أو النسخ التي لعبتها مؤخرًا في قسم \"ابدأ اللعب\" بالصفحة الرئيسية."
-  },
-  "app.appearance-settings.jump-back-into-worlds.title": {
-    "message": "الدخول إلى العوالم أو النسخ"
-  },
   "app.appearance-settings.minimize-launcher.description": {
     "message": "تصغير تطبيق مودرينث عند بدء تشغيل ماين كرافت."
   },
diff --git a/apps/app-frontend/src/locales/cs-CZ/index.json b/apps/app-frontend/src/locales/cs-CZ/index.json
index 3b0d9b55fd..f25b9fdc41 100644
--- a/apps/app-frontend/src/locales/cs-CZ/index.json
+++ b/apps/app-frontend/src/locales/cs-CZ/index.json
@@ -167,12 +167,6 @@
   "app.appearance-settings.hide-nametag.title": {
     "message": "Skrýt jmenovku"
   },
-  "app.appearance-settings.jump-back-into-worlds.description": {
-    "message": "Zobrazit nedávno hrané světy nebo instance v \"Nedávno hrané\" sekci na domovské obrazovce."
-  },
-  "app.appearance-settings.jump-back-into-worlds.title": {
-    "message": "Hrát světy nebo instance"
-  },
   "app.appearance-settings.minimize-launcher.description": {
     "message": "Minimalizovat Modrinth aplikaci při spuštění Minecraftu."
   },
diff --git a/apps/app-frontend/src/locales/de-CH/index.json b/apps/app-frontend/src/locales/de-CH/index.json
index ccee306aa0..ad6587bcbe 100644
--- a/apps/app-frontend/src/locales/de-CH/index.json
+++ b/apps/app-frontend/src/locales/de-CH/index.json
@@ -167,12 +167,6 @@
   "app.appearance-settings.hide-nametag.title": {
     "message": "Namensschild ausblenden"
   },
-  "app.appearance-settings.jump-back-into-worlds.description": {
-    "message": "Zeige kürzlich gespielte Welten oder Instanzen im Abschnitt „Loslegen“ auf der Startseite an."
-  },
-  "app.appearance-settings.jump-back-into-worlds.title": {
-    "message": "Mit Welten oder Instanzen loslegen"
-  },
   "app.appearance-settings.minimize-launcher.description": {
     "message": "Minimiere die Modrinth App, wenn Minecraft startet."
   },
diff --git a/apps/app-frontend/src/locales/de-DE/index.json b/apps/app-frontend/src/locales/de-DE/index.json
index 775bd649c3..a42ec584c6 100644
--- a/apps/app-frontend/src/locales/de-DE/index.json
+++ b/apps/app-frontend/src/locales/de-DE/index.json
@@ -167,12 +167,6 @@
   "app.appearance-settings.hide-nametag.title": {
     "message": "Namensschild ausblenden"
   },
-  "app.appearance-settings.jump-back-into-worlds.description": {
-    "message": "Zeige kürzlich gespielte Welten oder Instanzen im Abschnitt „Loslegen“ auf der Startseite an."
-  },
-  "app.appearance-settings.jump-back-into-worlds.title": {
-    "message": "Mit Welten oder Instanzen loslegen"
-  },
   "app.appearance-settings.minimize-launcher.description": {
     "message": "Minimiere die Modrinth App, wenn Minecraft startet."
   },
diff --git a/apps/app-frontend/src/locales/en-US/index.json b/apps/app-frontend/src/locales/en-US/index.json
index bf091eebaf..9e64372d30 100644
--- a/apps/app-frontend/src/locales/en-US/index.json
+++ b/apps/app-frontend/src/locales/en-US/index.json
@@ -167,12 +167,6 @@
   "app.appearance-settings.hide-nametag.title": {
     "message": "Hide nametag"
   },
-  "app.appearance-settings.jump-back-into-worlds.description": {
-    "message": "Show recently played worlds or instances in the \"Jump in\" section on the Home page."
-  },
-  "app.appearance-settings.jump-back-into-worlds.title": {
-    "message": "Jump into worlds or instances"
-  },
   "app.appearance-settings.minimize-launcher.description": {
     "message": "Minimize Modrinth App when Minecraft starts."
   },
@@ -215,12 +209,6 @@
   "app.behavior-settings.content.title": {
     "message": "Home and content"
   },
-  "app.behavior-settings.show-all-screenshots.description": {
-    "message": "View screenshots from all your instances on the Screenshots page."
-  },
-  "app.behavior-settings.show-all-screenshots.title": {
-    "message": "Show all screenshots together"
-  },
   "app.behavior-settings.startup-and-navigation.title": {
     "message": "Startup and navigation"
   },
@@ -327,7 +315,7 @@
     "message": "1.0.0"
   },
   "app.features-settings.instance-pages.title": {
-    "message": "Instance pages"
+    "message": "Instances"
   },
   "app.features-settings.play-page.title": {
     "message": "Play page"
@@ -338,8 +326,11 @@
   "app.features-settings.quick-instances.title": {
     "message": "Quick instances in sidebar"
   },
-  "app.features-settings.show-files-tab.description": {
-    "message": "Browse the files in each instance from its navigation."
+  "app.features-settings.show-all-screenshots.description": {
+    "message": "Show a button in the left sidebar to view screenshots from all your instances."
+  },
+  "app.features-settings.show-all-screenshots.title": {
+    "message": "Show all screenshots in sidebar"
   },
   "app.features-settings.show-files-tab.title": {
     "message": "Show Files tab in instances"
@@ -350,27 +341,30 @@
   "app.features-settings.show-jump-in.title": {
     "message": "Show Jump in section"
   },
-  "app.features-settings.show-screenshots-tab.description": {
-    "message": "Browse screenshots from the instance where they were taken."
-  },
   "app.features-settings.show-screenshots-tab.title": {
     "message": "Show Screenshots tab in instances"
   },
   "app.features-settings.show-skin-selector.description": {
-    "message": "Add a shortcut to the skin selector to the left sidebar."
+    "message": "Show a button in the left sidebar to open the skin selector."
   },
   "app.features-settings.show-skin-selector.title": {
     "message": "Show skin selector in sidebar"
   },
-  "app.features-settings.show-worlds-tab.description": {
-    "message": "Browse and launch worlds from each instance."
-  },
   "app.features-settings.show-worlds-tab.title": {
     "message": "Show Worlds tab in instances"
   },
   "app.features-settings.sidebar.title": {
     "message": "Sidebar"
   },
+  "app.features-settings.sync-across-devices.description": {
+    "message": "Use these feature settings everywhere you're signed in. Turn this off to keep separate settings on this device."
+  },
+  "app.features-settings.sync-across-devices.signed-out-tooltip": {
+    "message": "Sign into a Modrinth account to sync settings."
+  },
+  "app.features-settings.sync-across-devices.title": {
+    "message": "Sync features across devices"
+  },
   "app.home.jump-back-in.actions.label": {
     "message": "Instance actions"
   },
diff --git a/apps/app-frontend/src/locales/es-419/index.json b/apps/app-frontend/src/locales/es-419/index.json
index 68f4eae890..43b4a2f841 100644
--- a/apps/app-frontend/src/locales/es-419/index.json
+++ b/apps/app-frontend/src/locales/es-419/index.json
@@ -167,12 +167,6 @@
   "app.appearance-settings.hide-nametag.title": {
     "message": "Ocultar etiqueta de nombre"
   },
-  "app.appearance-settings.jump-back-into-worlds.description": {
-    "message": "Muestra los mundos recientes en la sección \"Jugar\" en la página de inicio."
-  },
-  "app.appearance-settings.jump-back-into-worlds.title": {
-    "message": "Jugar en mundos o instancias"
-  },
   "app.appearance-settings.minimize-launcher.description": {
     "message": "Minimiza la app de Modrinth al iniciar Minecraft."
   },
diff --git a/apps/app-frontend/src/locales/es-ES/index.json b/apps/app-frontend/src/locales/es-ES/index.json
index ac0c6d6e80..007d3a80ab 100644
--- a/apps/app-frontend/src/locales/es-ES/index.json
+++ b/apps/app-frontend/src/locales/es-ES/index.json
@@ -167,12 +167,6 @@
   "app.appearance-settings.hide-nametag.title": {
     "message": "Ocultar etiqueta de nombre"
   },
-  "app.appearance-settings.jump-back-into-worlds.description": {
-    "message": "Mostrar los mundos o instancias reproducidos recientemente en la sección \"Comenzar\" de la página de inicio."
-  },
-  "app.appearance-settings.jump-back-into-worlds.title": {
-    "message": "Comenzar mundos o instancias"
-  },
   "app.appearance-settings.minimize-launcher.description": {
     "message": "Minimiza la aplicación Modrinth cuando se inicia Minecraft."
   },
diff --git a/apps/app-frontend/src/locales/fr-FR/index.json b/apps/app-frontend/src/locales/fr-FR/index.json
index 55fe8b13dd..74fb465d38 100644
--- a/apps/app-frontend/src/locales/fr-FR/index.json
+++ b/apps/app-frontend/src/locales/fr-FR/index.json
@@ -167,12 +167,6 @@
   "app.appearance-settings.hide-nametag.title": {
     "message": "Cacher le pseudo"
   },
-  "app.appearance-settings.jump-back-into-worlds.description": {
-    "message": "Affiche les mondes récemment joués dans la section \"Lancement rapide\" de la page principale."
-  },
-  "app.appearance-settings.jump-back-into-worlds.title": {
-    "message": "Lancement rapide dans les mondes ou les instances"
-  },
   "app.appearance-settings.minimize-launcher.description": {
     "message": "Minimiser Modrinth App quand Minecraft se lance."
   },
diff --git a/apps/app-frontend/src/locales/hu-HU/index.json b/apps/app-frontend/src/locales/hu-HU/index.json
index 8c54633968..cfb858ff42 100644
--- a/apps/app-frontend/src/locales/hu-HU/index.json
+++ b/apps/app-frontend/src/locales/hu-HU/index.json
@@ -167,12 +167,6 @@
   "app.appearance-settings.hide-nametag.title": {
     "message": "Névcímke eltüntetése"
   },
-  "app.appearance-settings.jump-back-into-worlds.description": {
-    "message": "A legutóbb játszott világok és játékprofilok megjelenítése a kezdőlap „Folytasd itt” részében."
-  },
-  "app.appearance-settings.jump-back-into-worlds.title": {
-    "message": "„Folytasd itt” a világokat és a játékprofilokat is"
-  },
   "app.appearance-settings.minimize-launcher.description": {
     "message": "A Modrinth App bezáródik a Minecraft indításakor"
   },
diff --git a/apps/app-frontend/src/locales/it-IT/index.json b/apps/app-frontend/src/locales/it-IT/index.json
index 88398232a4..9ae13ba742 100644
--- a/apps/app-frontend/src/locales/it-IT/index.json
+++ b/apps/app-frontend/src/locales/it-IT/index.json
@@ -167,12 +167,6 @@
   "app.appearance-settings.hide-nametag.title": {
     "message": "Nascondi nome"
   },
-  "app.appearance-settings.jump-back-into-worlds.description": {
-    "message": "Elenca i mondi o le istanze recenti nella sezione \"Avvio rapido\" della pagina Home."
-  },
-  "app.appearance-settings.jump-back-into-worlds.title": {
-    "message": "Avvio rapido di mondi o istanze"
-  },
   "app.appearance-settings.minimize-launcher.description": {
     "message": "Minimizza l'app all'avvio di Minecraft."
   },
diff --git a/apps/app-frontend/src/locales/ko-KR/index.json b/apps/app-frontend/src/locales/ko-KR/index.json
index 3ddcf6104a..0a59a9d477 100644
--- a/apps/app-frontend/src/locales/ko-KR/index.json
+++ b/apps/app-frontend/src/locales/ko-KR/index.json
@@ -167,12 +167,6 @@
   "app.appearance-settings.hide-nametag.title": {
     "message": "이름표 숨기기"
   },
-  "app.appearance-settings.jump-back-into-worlds.description": {
-    "message": "홈 화면 중 \"바로 입장\" 부분에 최근에 플레이한 세계나 인스턴스를 표시합니다."
-  },
-  "app.appearance-settings.jump-back-into-worlds.title": {
-    "message": "세계나 인스턴스로 바로 입장"
-  },
   "app.appearance-settings.minimize-launcher.description": {
     "message": "마인크래프트가 시작되면 Modrinth 앱을 최소화 합니다."
   },
diff --git a/apps/app-frontend/src/locales/ru-RU/index.json b/apps/app-frontend/src/locales/ru-RU/index.json
index 162095fa72..78c8ecc6cf 100644
--- a/apps/app-frontend/src/locales/ru-RU/index.json
+++ b/apps/app-frontend/src/locales/ru-RU/index.json
@@ -167,12 +167,6 @@
   "app.appearance-settings.hide-nametag.title": {
     "message": "Без имени над скином"
   },
-  "app.appearance-settings.jump-back-into-worlds.description": {
-    "message": "Показывать недавние миры или сборки в секции «Недавнее» на главной странице."
-  },
-  "app.appearance-settings.jump-back-into-worlds.title": {
-    "message": "Недавние миры или сборки"
-  },
   "app.appearance-settings.minimize-launcher.description": {
     "message": "Сворачивать Modrinth App при запуске Minecraft."
   },
diff --git a/apps/app-frontend/src/locales/sv-SE/index.json b/apps/app-frontend/src/locales/sv-SE/index.json
index d800d8ce32..9dbba4c09f 100644
--- a/apps/app-frontend/src/locales/sv-SE/index.json
+++ b/apps/app-frontend/src/locales/sv-SE/index.json
@@ -158,9 +158,6 @@
   "app.appearance-settings.hide-nametag.title": {
     "message": "Dölj namnskylt"
   },
-  "app.appearance-settings.jump-back-into-worlds.title": {
-    "message": "Hoppa in i världar eller instanser"
-  },
   "app.appearance-settings.minimize-launcher.description": {
     "message": "Minimera Modrinth App när Minecraft startar."
   },
diff --git a/apps/app-frontend/src/locales/tr-TR/index.json b/apps/app-frontend/src/locales/tr-TR/index.json
index 576b032063..de18f455df 100644
--- a/apps/app-frontend/src/locales/tr-TR/index.json
+++ b/apps/app-frontend/src/locales/tr-TR/index.json
@@ -167,12 +167,6 @@
   "app.appearance-settings.hide-nametag.title": {
     "message": "İsim etiketini gizle"
   },
-  "app.appearance-settings.jump-back-into-worlds.description": {
-    "message": "Ana sayfadaki \"Hemen Katıl\" bölümünde yakın zamanda oynanan dünyaları veya kurulumları göster."
-  },
-  "app.appearance-settings.jump-back-into-worlds.title": {
-    "message": "Dünyalara veya kurulumlara atlayın"
-  },
   "app.appearance-settings.minimize-launcher.description": {
     "message": "Minecraft başladığında Modrinth uygulamasını küçült."
   },
diff --git a/apps/app-frontend/src/locales/vi-VN/index.json b/apps/app-frontend/src/locales/vi-VN/index.json
index a11c0a5855..8bb887d7db 100644
--- a/apps/app-frontend/src/locales/vi-VN/index.json
+++ b/apps/app-frontend/src/locales/vi-VN/index.json
@@ -167,12 +167,6 @@
   "app.appearance-settings.hide-nametag.title": {
     "message": "Ẩn thẻ tên"
   },
-  "app.appearance-settings.jump-back-into-worlds.description": {
-    "message": "Hiển thị các thế giới hoặc phiên chơi gần đây trong mục \"Jump in\" trên trang chủ."
-  },
-  "app.appearance-settings.jump-back-into-worlds.title": {
-    "message": "Bước vào các thế giới hoặc các khu vực riêng biệt"
-  },
   "app.appearance-settings.minimize-launcher.description": {
     "message": "Thu nhỏ ứng dụng Modrinth khi Minecraft khởi động."
   },
diff --git a/apps/app-frontend/src/locales/zh-CN/index.json b/apps/app-frontend/src/locales/zh-CN/index.json
index f347fea4d2..33ee6a975d 100644
--- a/apps/app-frontend/src/locales/zh-CN/index.json
+++ b/apps/app-frontend/src/locales/zh-CN/index.json
@@ -167,12 +167,6 @@
   "app.appearance-settings.hide-nametag.title": {
     "message": "隐藏名牌"
   },
-  "app.appearance-settings.jump-back-into-worlds.description": {
-    "message": "在主页的“快速开始”区域显示最近运行过的世界或实例。"
-  },
-  "app.appearance-settings.jump-back-into-worlds.title": {
-    "message": "快速进入世界或实例"
-  },
   "app.appearance-settings.minimize-launcher.description": {
     "message": "当 Minecraft 进程启动时，将 Modrinth App 最小化。"
   },
diff --git a/apps/app-frontend/src/locales/zh-TW/index.json b/apps/app-frontend/src/locales/zh-TW/index.json
index 5dcd5c2d9c..bfb917c9fd 100644
--- a/apps/app-frontend/src/locales/zh-TW/index.json
+++ b/apps/app-frontend/src/locales/zh-TW/index.json
@@ -167,12 +167,6 @@
   "app.appearance-settings.hide-nametag.title": {
     "message": "隱藏名牌"
   },
-  "app.appearance-settings.jump-back-into-worlds.description": {
-    "message": "在首頁的「繼續遊玩」區塊中顯示最近遊玩的世界或實例。"
-  },
-  "app.appearance-settings.jump-back-into-worlds.title": {
-    "message": "繼續遊玩世界或實例"
-  },
   "app.appearance-settings.minimize-launcher.description": {
     "message": "當 Minecraft 啟動時將 Modrinth App 最小化。"
   },
diff --git a/apps/app-frontend/src/pages/instance/worlds/index.vue b/apps/app-frontend/src/pages/instance/worlds/index.vue
index 3d28bd9ce5..277f38ba8f 100644
--- a/apps/app-frontend/src/pages/instance/worlds/index.vue
+++ b/apps/app-frontend/src/pages/instance/worlds/index.vue
@@ -68,7 +68,7 @@
 				<Button
 					type="quiet"
 					:disabled="refreshingAll"
-					class="hover:!bg-transparent focus-visible:!bg-transparent"
+					class="!text-sm !font-medium"
 					@click="refreshAllWorlds"
 				>
 					<RefreshCwIcon :class="refreshingAll ? 'animate-spin' : ''" />
diff --git a/apps/frontend/src/pages/discover/[type]/index.vue b/apps/frontend/src/pages/discover/[type]/index.vue
index 10ef710b71..2edbb9d432 100644
--- a/apps/frontend/src/pages/discover/[type]/index.vue
+++ b/apps/frontend/src/pages/discover/[type]/index.vue
@@ -604,7 +604,7 @@ const { isStuck: isInstallHeaderStuck } = useStickyObserver(
 	<div
 		v-if="installContext"
 		ref="stickyInstallHeaderRef"
-		class="sticky top-0 z-20 -mx-6 border-0 border-solid border-divider bg-surface-1 px-6 pt-4"
+		class="sticky top-0 z-20 -mx-6 mb-2 border-0 border-solid border-divider bg-surface-1 px-6 pt-4"
 		:class="[isInstallHeaderStuck ? 'border-t' : '']"
 	>
 		<BrowseInstallHeader divider bottom-padding />
@@ -621,8 +621,11 @@ const { isStuck: isInstallHeaderStuck } = useStickyObserver(
 		"
 	>
 		<section
-			class="mt-6 flex min-w-0 flex-col gap-2 sm:mt-0"
-			:class="cosmetics.rightSearchLayout ? 'lg:order-1' : 'lg:order-2'"
+			class="flex min-w-0 flex-col gap-2"
+			:class="[
+				{ 'mt-6 sm:mt-0': !installContext },
+				cosmetics.rightSearchLayout ? 'lg:order-1' : 'lg:order-2',
+			]"
 		>
 			<BrowsePageLayout>
 				<template #display-mode-icon>
diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/write_shared_settings.rs b/packages/app-lib/src/api/instance/synced_options/game_options/write_shared_settings.rs
index 200c559c02..c9392da75f 100644
--- a/packages/app-lib/src/api/instance/synced_options/game_options/write_shared_settings.rs
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/write_shared_settings.rs
@@ -143,7 +143,7 @@ async fn apply_shared_settings_to_document(
             continue;
         };
 
-        document.set(&key, &raw_value, definition.is_none() || migrated)?;
+        document.set(&key, &raw_value, true)?;
         count += 1;
         used_migration |= migrated
             || definition.is_some_and(|definition| {
diff --git a/packages/app-lib/src/api/instance/synced_servers/operations.rs b/packages/app-lib/src/api/instance/synced_servers/operations.rs
index 1d93cec454..753391f9d4 100644
--- a/packages/app-lib/src/api/instance/synced_servers/operations.rs
+++ b/packages/app-lib/src/api/instance/synced_servers/operations.rs
@@ -172,48 +172,7 @@ pub(in crate::api::instance) async fn detach_servers(
 ) -> crate::Result<()> {
     let generated = generated_path(state, &metadata.instance.id);
     let local = instance_dir(metadata, state).join(SERVERS_FILE);
-    let Some(current_checkpoint) = checkpoint(
-        &metadata.instance.id,
-        SyncedOption::MultiplayerServers,
-        "default",
-        state,
-    )
-    .await?
-    else {
-        return detach_link(&generated, &local).await;
-    };
-    let linked_to_generated = tokio::fs::symlink_metadata(&local)
-        .await
-        .is_ok_and(|metadata| metadata.file_type().is_symlink())
-        && tokio::fs::read_link(&local)
-            .await
-            .is_ok_and(|target| target == generated);
-    let matches_checkpoint = local.exists()
-        && sha1_file(&local).await? == current_checkpoint.expected_sha1;
-    if current_checkpoint.status != CheckpointStatus::Ready
-        || (!linked_to_generated && !matches_checkpoint)
-    {
-        return detach_link(&generated, &local).await;
-    }
-
-    let current = read_servers(&local).await?;
-    let projections =
-        load_projection_entries(&metadata.instance.id, state).await?;
-    let projection_matches = match_projection_entries(&current, &projections);
-    let instance_servers = current
-        .into_iter()
-        .zip(projection_matches)
-        .filter_map(|(server, projection)| {
-            projection
-                .is_none_or(|projection| {
-                    projection.owner == ProjectionOwner::Instance
-                })
-                .then_some(server)
-        })
-        .collect::<Vec<_>>();
-
-    detach_link(&generated, &local).await?;
-    write_servers(&local, &instance_servers).await
+    detach_link(&generated, &local).await
 }
 
 pub(in crate::api::instance) async fn reconcile_servers(
diff --git a/packages/blog/changelog.ts b/packages/blog/changelog.ts
index 0cba2d0520..3f0965a18b 100644
--- a/packages/blog/changelog.ts
+++ b/packages/blog/changelog.ts
@@ -19,7 +19,7 @@ const VERSIONS: VersionEntry[] = [
 - Added a sync source picker when enabling command history, multiplayer servers, or creative hotbars sync.
 
 ## Changed
-- Moved the global Screenshots page toggle from Synced settings into Behavior settings as "Show all screenshots together".
+- Moved the global Screenshots page toggle from Synced settings into Features settings as "Show all screenshots in sidebar".
 - Screenshots tab on instances is now independent of sync settings.
 - Redesigned the slider control used for settings such as memory allocation.
 - Removed the blur censor tool in the screenshot editor. It did not work properly and was not functional as a censor.
diff --git a/packages/ui/src/components/base/Slider.vue b/packages/ui/src/components/base/Slider.vue
index f625cc44c0..5e00c10050 100644
--- a/packages/ui/src/components/base/Slider.vue
+++ b/packages/ui/src/components/base/Slider.vue
@@ -1,10 +1,17 @@
 <template>
 	<div class="flex w-full items-center gap-4">
-		<span class="shrink-0 whitespace-nowrap py-2 text-sm leading-5 text-secondary">
+		<span
+			v-if="currentValue !== null"
+			class="shrink-0 whitespace-nowrap py-2 text-sm leading-5 text-secondary"
+		>
 			{{ min }}
 		</span>
 
-		<div class="relative h-10 min-w-0 flex-1" :class="disabled ? 'opacity-50' : ''">
+		<div
+			v-if="currentValue !== null"
+			class="relative h-10 min-w-0 flex-1"
+			:class="disabled ? 'opacity-50' : ''"
+		>
 			<div
 				class="pointer-events-none absolute inset-x-0 top-1/2 h-1 -translate-y-1/2 rounded-full bg-surface-5"
 			>
@@ -26,7 +33,7 @@
 
 			<input
 				ref="input"
-				v-model="currentValue"
+				:value="currentValue"
 				type="range"
 				:min="min"
 				:max="max"
@@ -34,23 +41,29 @@
 				class="slider absolute top-0 h-10 min-h-0 appearance-none overflow-visible border-0 bg-transparent p-0 shadow-none outline-none"
 				:class="disabled ? 'cursor-not-allowed' : 'cursor-pointer'"
 				:disabled="disabled"
+				:aria-label="ariaLabel"
 				@input="onInputWithSnap(($event.target as HTMLInputElement).value)"
 			/>
 		</div>
 
-		<span class="shrink-0 whitespace-nowrap py-2 text-sm leading-5 text-secondary">
+		<span
+			v-if="currentValue !== null"
+			class="shrink-0 whitespace-nowrap py-2 text-sm leading-5 text-secondary"
+		>
 			{{ formatValue(max) }}
 		</span>
 
 		<Input
-			:model-value="String(currentValue)"
+			:model-value="currentValue === null ? '' : String(currentValue)"
 			type="number"
 			size="medium"
 			:class="valueInputClass"
 			wrapper-class="slider-value shrink-0"
 			input-class="!font-semibold"
-			:style="{ width: valueInputWidth }"
+			:style="{ width: currentValue === null ? '100%' : '5rem' }"
 			:disabled="disabled"
+			:placeholder="placeholder"
+			:aria-label="ariaLabel"
 			:min="min"
 			:max="max"
 			:step="step"
@@ -67,7 +80,7 @@ import Input from './inputs/Input.vue'
 const emit = defineEmits<{ 'update:modelValue': [number] }>()
 
 interface Props {
-	modelValue?: number
+	modelValue?: number | null
 	min: number
 	max: number
 	step?: number
@@ -77,6 +90,8 @@ interface Props {
 	disabled?: boolean
 	unit?: string
 	valueInputClass?: string
+	placeholder?: string
+	ariaLabel?: string
 }
 
 const props = withDefaults(defineProps<Props>(), {
@@ -92,11 +107,8 @@ const props = withDefaults(defineProps<Props>(), {
 	valueInputClass: '',
 })
 
-const currentValue = ref(clampValue(props.modelValue))
-const currentPercentage = computed(() => getPercentage(currentValue.value))
-const valueInputWidth = computed(
-	() => `calc(${Math.max(String(props.min).length, String(props.max).length, 1)}ch + 2.125rem)`,
-)
+const currentValue = ref(props.modelValue === null ? null : clampValue(props.modelValue))
+const currentPercentage = computed(() => getPercentage(currentValue.value ?? props.min))
 const visibleSnapPoints = computed(() =>
 	props.snapPoints.filter((snapPoint) => snapPoint >= props.min && snapPoint <= props.max),
 )
@@ -104,7 +116,7 @@ const visibleSnapPoints = computed(() =>
 watch(
 	() => props.modelValue,
 	(newValue) => {
-		currentValue.value = clampValue(newValue ?? props.min)
+		currentValue.value = newValue === null ? null : clampValue(newValue ?? props.min)
 	},
 )
 
@@ -128,7 +140,8 @@ function inputValueValid(inputValue: number) {
 
 	let newValue = inputValue
 	if (props.forceStep && props.step > 0) {
-		newValue -= newValue % props.step
+		newValue = props.min + Math.round((newValue - props.min) / props.step) * props.step
+		newValue = Number(newValue.toFixed(8))
 	}
 
 	currentValue.value = clampValue(newValue)
diff --git a/packages/ui/src/layouts/shared/browse-tab/layout.vue b/packages/ui/src/layouts/shared/browse-tab/layout.vue
index a2c46a1c2f..9fd80efec5 100644
--- a/packages/ui/src/layouts/shared/browse-tab/layout.vue
+++ b/packages/ui/src/layouts/shared/browse-tab/layout.vue
@@ -130,7 +130,7 @@ function getProjectCardTags(result: Labrinth.Search.v3.ResultSearchProject, disp
 	<template v-if="ctx.installContext?.value && ctx.variant !== 'web'">
 		<div
 			ref="stickyInstallHeaderRef"
-			class="sticky top-0 z-20 -mx-6 -mt-6 rounded-tl-[--radius-xl] border-0 border-b border-solid bg-surface-1 px-6 py-4 border-surface-5"
+			class="sticky top-0 z-20 -mx-6 -mt-6 mb-4 rounded-tl-[--radius-xl] border-0 border-b border-solid bg-surface-1 px-6 py-4 border-surface-5"
 			:class="[isInstallHeaderStuck ? 'border-t' : '']"
 		>
 			<BrowseInstallHeader />
diff --git a/packages/ui/src/layouts/shared/console/components/ConsoleActionButtons.vue b/packages/ui/src/layouts/shared/console/components/ConsoleActionButtons.vue
index 10671ffed7..e5a2febc96 100644
--- a/packages/ui/src/layouts/shared/console/components/ConsoleActionButtons.vue
+++ b/packages/ui/src/layouts/shared/console/components/ConsoleActionButtons.vue
@@ -33,7 +33,7 @@
 			<ShareIcon v-else />
 			Share
 		</Button>
-		<Button type="quiet" @click="emit('toggle-fullscreen')">
+		<Button type="quiet" class="!text-sm !font-medium" @click="emit('toggle-fullscreen')">
 			<ContractIcon v-if="fullscreen" />
 			<ExpandIcon v-else />
 			{{ fullscreen ? 'Collapse' : 'Expand' }}
diff --git a/packages/ui/src/layouts/shared/console/layout.vue b/packages/ui/src/layouts/shared/console/layout.vue
index 36d248529c..d6a04d753a 100644
--- a/packages/ui/src/layouts/shared/console/layout.vue
+++ b/packages/ui/src/layouts/shared/console/layout.vue
@@ -98,7 +98,7 @@
 <script setup lang="ts">
 import { SearchIcon, TrashIcon, XIcon } from '@modrinth/assets'
 import type { Terminal } from '@xterm/xterm'
-import { computed, isRef, nextTick, onBeforeUnmount, ref, watch } from 'vue'
+import { computed, isRef, nextTick, onBeforeUnmount, onMounted, ref, watch } from 'vue'
 
 import Admonition from '#ui/components/base/Admonition.vue'
 import BaseTerminal from '#ui/components/base/BaseTerminal.vue'
@@ -109,6 +109,7 @@ import Combobox from '#ui/components/base/Combobox.vue'
 import Input from '#ui/components/base/inputs/Input.vue'
 import NewModal from '#ui/components/modal/NewModal.vue'
 import ShareModal from '#ui/components/modal/ShareModal.vue'
+import { useModalStack } from '#ui/composables/modal-stack'
 import { injectModrinthClient } from '#ui/providers'
 import { injectModalBehavior } from '#ui/providers/modal-behavior'
 import { injectPageContext } from '#ui/providers/page-context'
@@ -133,6 +134,7 @@ const client = injectModrinthClient()
 const modalBehavior = injectModalBehavior()
 const pageContext = injectPageContext(null)
 const { addNotification } = injectNotificationManager()
+const { hasModal } = useModalStack()
 
 const crashHeader = computed(() => {
 	const problems = ctx.crashAnalysis?.value?.analysis.problems ?? []
@@ -192,7 +194,12 @@ function buildCombinedPredicate(): ((line: LogLine) => boolean) | null {
 	}
 }
 
+onMounted(() => {
+	window.addEventListener('keydown', handleWindowKeyDown, true)
+})
+
 onBeforeUnmount(() => {
+	window.removeEventListener('keydown', handleWindowKeyDown, true)
 	if (isFullscreen.value) {
 		document.body.style.overflow = ''
 		document.body.classList.remove(fullscreenBodyClass)
@@ -298,6 +305,12 @@ function rewriteFiltered() {
 	lastWrittenIndex = lines.length
 }
 
+function handleWindowKeyDown(event: KeyboardEvent) {
+	if (event.key !== 'Escape' || !isFullscreen.value || hasModal.value) return
+	event.preventDefault()
+	toggleFullscreen()
+}
+
 function toggleFullscreen() {
 	isFullscreen.value = !isFullscreen.value
 	if (isFullscreen.value) {

From d5caaa46062e52d4ddc3c64a234c8997d9a3cc8d Mon Sep 17 00:00:00 2001
From: "Calum H. (IMB11)" <contact@cal.engineer>
Date: Thu, 3 Sep 2026 17:39:28 +0100
Subject: [PATCH 18/33] qa

---
 apps/app-frontend/src/App.vue                 |  17 +-
 .../ui/instance/SyncedContentModal.vue        | 202 +++++
 .../apply-new-icons-modal.vue                 | 233 ------
 .../assets/01.png                             | Bin 5986 -> 0 bytes
 .../assets/02.png                             | Bin 5961 -> 0 bytes
 .../assets/03.png                             | Bin 5187 -> 0 bytes
 .../assets/04.png                             | Bin 7803 -> 0 bytes
 .../assets/05.png                             | Bin 5640 -> 0 bytes
 .../assets/06.png                             | Bin 5925 -> 0 bytes
 .../assets/07.png                             | Bin 6469 -> 0 bytes
 .../assets/08.png                             | Bin 5955 -> 0 bytes
 .../assets/09.png                             | Bin 4223 -> 0 bytes
 .../ui/new-icon-editor-notification/index.vue | 144 ----
 .../show-notification.ts                      |  12 -
 .../instances/InstancesSyncedSettings.vue     | 288 ++++----
 .../ui/settings/instances/SyncSourceModal.vue | 179 +++++
 .../settings/instances/SyncedPacksModal.vue   | 144 ++++
 .../ui/sync-instances-update-modal/index.vue  | 333 +++++++++
 .../use-sync-instances-update.ts              | 132 ++++
 .../instances/use-synced-pack-actions.ts      | 150 ++++
 apps/app-frontend/src/helpers/instance.ts     |   4 +-
 .../src/helpers/synced-options.ts             |  33 +
 apps/app-frontend/src/helpers/synced-packs.ts |  71 ++
 apps/app-frontend/src/helpers/types.d.ts      |   2 +
 .../app-frontend/src/locales/ar-SA/index.json |  42 --
 .../app-frontend/src/locales/cs-CZ/index.json |  42 --
 .../app-frontend/src/locales/de-CH/index.json |  42 --
 .../app-frontend/src/locales/de-DE/index.json |  42 --
 .../app-frontend/src/locales/en-US/index.json | 188 +++--
 .../src/locales/es-419/index.json             |  42 --
 .../app-frontend/src/locales/es-ES/index.json |  42 --
 .../app-frontend/src/locales/fr-FR/index.json |  42 --
 .../app-frontend/src/locales/hu-HU/index.json |  36 -
 .../app-frontend/src/locales/it-IT/index.json |  42 --
 .../app-frontend/src/locales/ja-JP/index.json |   3 -
 .../app-frontend/src/locales/ko-KR/index.json |  30 -
 .../app-frontend/src/locales/ms-MY/index.json |   3 -
 .../app-frontend/src/locales/pl-PL/index.json |  21 -
 .../app-frontend/src/locales/pt-BR/index.json |  30 -
 .../app-frontend/src/locales/ru-RU/index.json |  42 --
 .../app-frontend/src/locales/sv-SE/index.json |  36 -
 .../app-frontend/src/locales/tr-TR/index.json |  42 --
 .../app-frontend/src/locales/uk-UA/index.json |  24 -
 .../app-frontend/src/locales/vi-VN/index.json |  18 -
 .../app-frontend/src/locales/zh-CN/index.json |  42 --
 .../app-frontend/src/locales/zh-TW/index.json |  42 --
 .../synced-options-settings.vue               |  76 ++
 .../src/pages/instance/content/index.vue      |  35 +-
 apps/app/build.rs                             |   7 +
 apps/app/src/api/instance.rs                  |  71 ++
 .../20260903120000_synced-packs.sql           |  16 +
 packages/app-lib/src/api/instance.rs          |   8 +
 packages/app-lib/src/api/instance/content.rs  |   7 +-
 packages/app-lib/src/api/instance/projects.rs |  28 +-
 .../src/api/instance/synced_options/files.rs  |   2 +
 .../instance/synced_options/orchestration.rs  |  92 ++-
 .../src/api/instance/synced_packs/mod.rs      | 104 +++
 .../api/instance/synced_packs/operations.rs   | 563 ++++++++++++++
 .../instance/synced_packs/reconciliation.rs   | 689 ++++++++++++++++++
 .../src/api/instance/synced_packs/storage.rs  |  70 ++
 packages/app-lib/src/launcher/mod.rs          |   9 +
 .../adapters/sqlite/instance_rows.rs          |   4 +
 .../commands/apply_content_install.rs         |  30 +-
 .../state/instances/commands/list_content.rs  |   2 +
 .../app-lib/src/state/instances/content.rs    |   9 +
 .../src/state/instances/model/instance.rs     |  12 +-
 .../app-lib/src/state/instances/watcher.rs    |   5 +
 packages/app-lib/src/state/process.rs         |  12 +
 .../components/ContentCardItem.vue            |  39 +-
 .../components/ContentCardTable.vue           |  18 +-
 .../managed-content-modal/index.vue           | 117 +--
 .../src/layouts/shared/content-tab/layout.vue |  16 +-
 .../content-tab/providers/content-manager.ts  |   2 +
 .../src/layouts/shared/content-tab/types.ts   |   7 +
 packages/ui/src/locales/en-US/index.json      |  15 +
 75 files changed, 3511 insertions(+), 1391 deletions(-)
 create mode 100644 apps/app-frontend/src/components/ui/instance/SyncedContentModal.vue
 delete mode 100644 apps/app-frontend/src/components/ui/new-icon-editor-notification/apply-new-icons-modal.vue
 delete mode 100644 apps/app-frontend/src/components/ui/new-icon-editor-notification/assets/01.png
 delete mode 100644 apps/app-frontend/src/components/ui/new-icon-editor-notification/assets/02.png
 delete mode 100644 apps/app-frontend/src/components/ui/new-icon-editor-notification/assets/03.png
 delete mode 100644 apps/app-frontend/src/components/ui/new-icon-editor-notification/assets/04.png
 delete mode 100644 apps/app-frontend/src/components/ui/new-icon-editor-notification/assets/05.png
 delete mode 100644 apps/app-frontend/src/components/ui/new-icon-editor-notification/assets/06.png
 delete mode 100644 apps/app-frontend/src/components/ui/new-icon-editor-notification/assets/07.png
 delete mode 100644 apps/app-frontend/src/components/ui/new-icon-editor-notification/assets/08.png
 delete mode 100644 apps/app-frontend/src/components/ui/new-icon-editor-notification/assets/09.png
 delete mode 100644 apps/app-frontend/src/components/ui/new-icon-editor-notification/index.vue
 delete mode 100644 apps/app-frontend/src/components/ui/new-icon-editor-notification/show-notification.ts
 create mode 100644 apps/app-frontend/src/components/ui/settings/instances/SyncSourceModal.vue
 create mode 100644 apps/app-frontend/src/components/ui/settings/instances/SyncedPacksModal.vue
 create mode 100644 apps/app-frontend/src/components/ui/sync-instances-update-modal/index.vue
 create mode 100644 apps/app-frontend/src/components/ui/sync-instances-update-modal/use-sync-instances-update.ts
 create mode 100644 apps/app-frontend/src/composables/instances/use-synced-pack-actions.ts
 create mode 100644 apps/app-frontend/src/helpers/synced-options.ts
 create mode 100644 apps/app-frontend/src/helpers/synced-packs.ts
 create mode 100644 packages/app-lib/migrations/20260903120000_synced-packs.sql
 create mode 100644 packages/app-lib/src/api/instance/synced_packs/mod.rs
 create mode 100644 packages/app-lib/src/api/instance/synced_packs/operations.rs
 create mode 100644 packages/app-lib/src/api/instance/synced_packs/reconciliation.rs
 create mode 100644 packages/app-lib/src/api/instance/synced_packs/storage.rs

diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue
index f1826da265..27a6c05c65 100644
--- a/apps/app-frontend/src/App.vue
+++ b/apps/app-frontend/src/App.vue
@@ -91,8 +91,6 @@ import ModpackAlreadyInstalledModal from '@/components/ui/modal/ModpackAlreadyIn
 import ModrinthAccountRequiredModal from '@/components/ui/modal/ModrinthAccountRequiredModal.vue'
 import UpdateToPlayModal from '@/components/ui/modal/UpdateToPlayModal.vue'
 import NavButton from '@/components/ui/NavButton.vue'
-import NewIconEditorNotification from '@/components/ui/new-icon-editor-notification/index.vue'
-import { shouldShowNewIconEditorNotification } from '@/components/ui/new-icon-editor-notification/show-notification'
 import OnboardingChecklist from '@/components/ui/onboarding-checklist/index.vue'
 import PrideFundraiserBanner from '@/components/ui/PrideFundraiserBanner.vue'
 import PromotionWrapper from '@/components/ui/PromotionWrapper.vue'
@@ -100,6 +98,7 @@ import QuickInstanceSwitcher from '@/components/ui/QuickInstanceSwitcher.vue'
 import SharedInstanceInviteHandler from '@/components/ui/shared-instances/shared-instance-invite-handler/index.vue'
 import SplashScreen from '@/components/ui/SplashScreen.vue'
 import SurveyPopup from '@/components/ui/SurveyPopup.vue'
+import SyncInstancesUpdateModal from '@/components/ui/sync-instances-update-modal/index.vue'
 import WindowControls from '@/components/ui/WindowControls.vue'
 import { useCheckDisableMouseover } from '@/composables/macCssFix.js'
 import { useAppEvent } from '@/composables/use-app-event'
@@ -712,14 +711,6 @@ function handleAdsConsentRequired(required) {
 async function setupApp() {
 	await onboardingChecklist.initialize()
 
-	if (shouldShowNewIconEditorNotification(showChecklist.value)) {
-		addPopupNotification({
-			contentType: 'custom',
-			component: NewIconEditorNotification,
-			autoCloseMs: null,
-		})
-	}
-
 	const {
 		native_decorations,
 		theme,
@@ -768,6 +759,10 @@ async function setupApp() {
 	appSettings.showSkinSelectorInSidebar = show_skin_selector_in_sidebar
 	appSettings.devMode = developer_mode
 	stateInitialized.value = true
+	await nextTick()
+	if (!showChecklist.value) {
+		syncInstancesUpdateModal.value?.showOnce()
+	}
 
 	await getCurrentWindow().onResized(async () => {
 		isMaximized.value = await getCurrentWindow().isMaximized()
@@ -1053,6 +1048,7 @@ const updateToPlayModal = ref()
 
 const modrinthLoginModal = ref()
 const appSettingsModal = ref()
+const syncInstancesUpdateModal = ref()
 provide(appSettingsModalOpenProfileKey, () => appSettingsModal.value?.showProfile())
 provide(appSettingsModalOpenSyncedOptionsKey, () => appSettingsModal.value?.showSyncedOptions())
 
@@ -2104,6 +2100,7 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
 		<Suspense>
 			<AppSettingsModal ref="appSettingsModal" />
 		</Suspense>
+		<SyncInstancesUpdateModal ref="syncInstancesUpdateModal" />
 		<Suspense>
 			<ModrinthAccountRequiredModal ref="modrinthLoginModal" :request-auth="requestModrinthAuth" />
 		</Suspense>
diff --git a/apps/app-frontend/src/components/ui/instance/SyncedContentModal.vue b/apps/app-frontend/src/components/ui/instance/SyncedContentModal.vue
new file mode 100644
index 0000000000..7404786b67
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/instance/SyncedContentModal.vue
@@ -0,0 +1,202 @@
+<script setup lang="ts">
+import { LinkIcon, RightArrowIcon, TrashIcon, XIcon } from '@modrinth/assets'
+import {
+	Admonition,
+	Button,
+	commonMessages,
+	ContentCardItem,
+	type ContentItem,
+	defineMessages,
+	NewModal,
+	useVIntl,
+} from '@modrinth/ui'
+import { computed, onBeforeUnmount, ref } from 'vue'
+
+import type { SyncedPackAction } from '@/helpers/synced-packs'
+import type { DesyncServerMode } from '@/helpers/worlds'
+
+type Choice = 'confirm' | 'all' | DesyncServerMode | null
+const { formatMessage } = useVIntl()
+const modal = ref<InstanceType<typeof NewModal>>()
+const mode = ref<'change' | 'delete' | 'desync'>('change')
+const action = ref<SyncedPackAction>('disable')
+const items = ref<ContentItem[]>([])
+let resolveChoice: ((choice: Choice) => void) | undefined
+
+const messages = defineMessages({
+	warningTitle: { id: 'app.synced-content.warning.modal-title', defaultMessage: 'Sync warning' },
+	title: { id: 'app.synced-content.warning.title', defaultMessage: 'This content is synced' },
+	enable: {
+		id: 'app.synced-content.warning.enable',
+		defaultMessage:
+			'Enabling this content will also enable it in the other instances where it is synced. To change it only here, desync it first.',
+	},
+	disable: {
+		id: 'app.synced-content.warning.disable',
+		defaultMessage:
+			'Disabling this content will also disable it in the other instances where it is synced. To change it only here, desync it first.',
+	},
+	desyncTitle: { id: 'app.synced-content.desync.title', defaultMessage: 'Desync content' },
+	desyncDescription: {
+		id: 'app.synced-content.desync.description',
+		defaultMessage:
+			'This instance will keep its own copy. Do you want to keep this content synced in other instances, or remove it from them?',
+	},
+	keep: { id: 'app.synced-content.desync.keep', defaultMessage: 'Keep' },
+	remove: { id: 'app.synced-content.desync.remove', defaultMessage: 'Remove' },
+	deleteDescription: {
+		id: 'app.synced-content.delete.description',
+		defaultMessage: 'Deleting this content will delete it across all your instances',
+	},
+	mixedDeletion: {
+		id: 'app.synced-content.delete.mixed',
+		defaultMessage: 'Selected content that is not synced will only be deleted from this instance.',
+	},
+})
+
+const title = computed(
+	() =>
+		({
+			change: messages.warningTitle,
+			delete: messages.warningTitle,
+			desync: messages.desyncTitle,
+		})[mode.value],
+)
+const description = computed(() => {
+	if (mode.value === 'desync') return messages.desyncDescription
+	if (mode.value === 'delete') return messages.deleteDescription
+	return action.value === 'enable' ? messages.enable : messages.disable
+})
+
+function settle(choice: Choice) {
+	const resolve = resolveChoice
+	resolveChoice = undefined
+	resolve?.(choice)
+}
+
+function finish(choice: Choice) {
+	settle(choice)
+	modal.value?.hide()
+}
+
+function show() {
+	resolveChoice?.(null)
+	return new Promise<Choice>((resolve) => {
+		resolveChoice = resolve
+		modal.value?.show()
+	})
+}
+
+async function confirmChange(value: SyncedPackAction, content: ContentItem[]) {
+	mode.value = 'change'
+	action.value = value
+	items.value = content.filter((item) => item.synced_pack)
+	if (items.value.length === 0) return true
+	return (await show()) === 'confirm'
+}
+
+async function confirmDelete(content: ContentItem[]) {
+	mode.value = 'delete'
+	items.value = content
+	const choice = await show()
+	return choice === 'all' ? choice : null
+}
+
+async function confirmDesync(item: ContentItem) {
+	mode.value = 'desync'
+	items.value = [item]
+	const choice = await show()
+	return choice === 'keep_in_other_instances' || choice === 'remove_from_other_instances'
+		? choice
+		: null
+}
+
+onBeforeUnmount(() => resolveChoice?.(null))
+defineExpose({ confirmChange, confirmDelete, confirmDesync })
+</script>
+
+<template>
+	<NewModal
+		ref="modal"
+		:header="formatMessage(title)"
+		:fade="mode === 'delete' ? 'danger' : 'warning'"
+		max-width="560px"
+		@hide="settle(null)"
+	>
+		<div class="flex flex-col gap-6">
+			<Admonition
+				:type="mode === 'delete' ? 'critical' : 'warning'"
+				:header="formatMessage(messages.title)"
+			>
+				{{ formatMessage(description) }}
+			</Admonition>
+			<div v-if="mode === 'desync'" class="flex max-h-[212px] flex-col gap-2 overflow-y-auto">
+				<div
+					v-for="item in items"
+					:key="item.id"
+					class="rounded-xl border border-solid border-surface-5 p-4 !bg-surface-2"
+				>
+					<ContentCardItem
+						:project="
+							item.project ?? {
+								id: item.id,
+								slug: null,
+								title: item.embedded_metadata?.name ?? item.file_name,
+								icon_url: item.embedded_metadata?.icon_url ?? null,
+							}
+						"
+						:project-link="
+							!item.external && item.project?.id ? `/project/${item.project.id}` : undefined
+						"
+						:version="
+							item.version ?? {
+								id: item.id,
+								version_number:
+									item.embedded_metadata?.version ?? formatMessage(commonMessages.unknownLabel),
+								file_name: item.file_name,
+							}
+						"
+						:owner="item.owner"
+						hide-actions
+						inline
+					/>
+				</div>
+			</div>
+			<p
+				v-if="mode === 'delete' && items.some((item) => !item.synced_pack)"
+				class="m-0 text-secondary"
+			>
+				{{ formatMessage(messages.mixedDeletion) }}
+			</p>
+		</div>
+		<template #actions>
+			<div class="flex flex-wrap justify-end gap-2">
+				<Button type="outlined" class="!border !border-surface-5" @click="finish(null)"
+					><XIcon />{{ formatMessage(commonMessages.cancelButton) }}</Button
+				>
+				<template v-if="mode === 'desync'">
+					<Button @click="finish('keep_in_other_instances')"
+						><LinkIcon />{{ formatMessage(messages.keep) }}</Button
+					>
+					<Button type="colored" color="orange" @click="finish('remove_from_other_instances')"
+						><TrashIcon />{{ formatMessage(messages.remove) }}</Button
+					>
+				</template>
+				<Button
+					v-else
+					type="colored"
+					:color="mode === 'delete' ? 'red' : 'orange'"
+					@click="finish(mode === 'delete' ? 'all' : 'confirm')"
+				>
+					<TrashIcon v-if="mode === 'delete'" />
+					<RightArrowIcon v-else />
+					{{
+						formatMessage(
+							mode === 'delete' ? commonMessages.deleteLabel : commonMessages.continueButton,
+						)
+					}}
+				</Button>
+			</div>
+		</template>
+	</NewModal>
+</template>
diff --git a/apps/app-frontend/src/components/ui/new-icon-editor-notification/apply-new-icons-modal.vue b/apps/app-frontend/src/components/ui/new-icon-editor-notification/apply-new-icons-modal.vue
deleted file mode 100644
index 91c4d02a60..0000000000
--- a/apps/app-frontend/src/components/ui/new-icon-editor-notification/apply-new-icons-modal.vue
+++ /dev/null
@@ -1,233 +0,0 @@
-<script setup lang="ts">
-import { BanIcon, SpinnerIcon, TagCategoryWandSparklesIcon, XIcon } from '@modrinth/assets'
-import {
-	Avatar,
-	Button,
-	defineMessages,
-	IconButton,
-	injectNotificationManager,
-	NewModal,
-	useVIntl,
-} from '@modrinth/ui'
-import { nextTick, ref, useTemplateRef } from 'vue'
-
-import IconEditorModal from '@/components/ui/instance_settings/icon-editor-modal/index.vue'
-import { toError } from '@/helpers/errors'
-import { list as listInstances } from '@/helpers/instance'
-
-import icon01 from './assets/01.png'
-import icon02 from './assets/02.png'
-import icon03 from './assets/03.png'
-import icon04 from './assets/04.png'
-import icon05 from './assets/05.png'
-import icon06 from './assets/06.png'
-import icon07 from './assets/07.png'
-import icon08 from './assets/08.png'
-import icon09 from './assets/09.png'
-
-const emit = defineEmits<{
-	close: []
-}>()
-
-const modal = useTemplateRef<InstanceType<typeof NewModal>>('modal')
-const iconEditorModal = useTemplateRef<InstanceType<typeof IconEditorModal>>('iconEditorModal')
-const { formatMessage } = useVIntl()
-const { addNotification, handleError } = injectNotificationManager()
-const iconlessInstanceIds = ref<string[]>([])
-const loading = ref(false)
-const applying = ref(false)
-const icons = [icon01, icon02, icon03, icon04, icon05, icon06, icon07, icon08, icon09]
-
-const messages = defineMessages({
-	badge: {
-		id: 'app.icon-editor.apply-icons-modal.badge',
-		defaultMessage: 'New this update',
-	},
-	title: {
-		id: 'app.icon-editor.apply-icons-modal.title',
-		defaultMessage: 'Custom icon editor',
-	},
-	description: {
-		id: 'app.icon-editor.apply-icons-modal.description',
-		defaultMessage:
-			'Create custom icons for your instances right in the Modrinth App. Mix and match backgrounds with symbols from Minecraft and popular mods!',
-	},
-	instancesWithoutIcons: {
-		id: 'app.icon-editor.apply-icons-modal.instances-without-icons',
-		defaultMessage:
-			'{count, plural, one {# instance doesn’t} other {# instances don’t}} have icons yet. Want us to give {count, plural, one {it} other {them}} random ones to get started?',
-	},
-	skip: {
-		id: 'app.icon-editor.apply-icons-modal.skip',
-		defaultMessage: 'Skip',
-	},
-	randomIcons: {
-		id: 'app.icon-editor.apply-icons-modal.random-icons',
-		defaultMessage: 'Random icons',
-	},
-	close: {
-		id: 'app.icon-editor.apply-icons-modal.close',
-		defaultMessage: 'Close',
-	},
-	applyError: {
-		id: 'app.icon-editor.apply-icons-modal.apply-error',
-		defaultMessage: 'Failed to apply random icons to instances.',
-	},
-	applySuccess: {
-		id: 'app.icon-editor.apply-icons-modal.apply-success',
-		defaultMessage: 'Randomized icon for {num, plural, one {# instance} other {# instances}}.',
-	},
-})
-
-async function show() {
-	modal.value?.show()
-	loading.value = true
-	try {
-		iconlessInstanceIds.value = (await listInstances())
-			.filter((instance) => !instance.icon_path)
-			.map((instance) => instance.id)
-	} catch (error) {
-		handleError(toError(error))
-		iconlessInstanceIds.value = []
-	} finally {
-		loading.value = false
-	}
-}
-
-function hide() {
-	modal.value?.hide()
-}
-
-function handleHide() {
-	emit('close')
-}
-
-async function applyIcons() {
-	if (applying.value || loading.value) return
-
-	applying.value = true
-	const instanceCount = iconlessInstanceIds.value.length
-	let applied = false
-	try {
-		const results = await Promise.all(
-			iconlessInstanceIds.value.map(async (instanceId) => {
-				const generated = await iconEditorModal.value?.randomize()
-				if (!generated) return false
-
-				return (
-					(await iconEditorModal.value?.applyGeneratedIcon(instanceId, generated.config)) ?? false
-				)
-			}),
-		)
-		applied = results.every(Boolean)
-	} finally {
-		applying.value = false
-	}
-
-	if (applied) {
-		await nextTick()
-		hide()
-		addNotification({
-			type: 'success',
-			title: formatMessage(messages.applySuccess, { num: instanceCount }),
-		})
-	} else {
-		addNotification({
-			type: 'error',
-			title: formatMessage(messages.applyError),
-		})
-	}
-}
-
-defineExpose({ show, hide })
-</script>
-
-<template>
-	<NewModal
-		ref="modal"
-		hide-header
-		no-padding
-		width="770px"
-		max-width="calc(100vw - 2rem)"
-		:aria-label="formatMessage(messages.title)"
-		:on-after-hide="handleHide"
-		:disable-close="applying"
-		class="!overflow-hidden !rounded-[20px]"
-	>
-		<div class="grid w-[768px] max-w-full grid-cols-2">
-			<section class="flex min-w-0 flex-col gap-6 bg-surface-3 p-8">
-				<div
-					class="flex h-8 w-fit items-center rounded-full border border-solid border-brand bg-brand-highlight px-2.5 text-sm font-base leading-5 text-brand"
-				>
-					{{ formatMessage(messages.badge) }}
-				</div>
-
-				<div class="flex min-w-0 flex-col gap-4">
-					<h2 class="m-0 text-2xl font-semibold leading-6 text-contrast">
-						{{ formatMessage(messages.title) }}
-					</h2>
-					<p class="m-0 leading-6 text-primary">
-						{{ formatMessage(messages.description) }}
-					</p>
-					<p v-if="iconlessInstanceIds.length" class="m-0 leading-6 text-primary">
-						{{
-							formatMessage(messages.instancesWithoutIcons, {
-								count: iconlessInstanceIds.length,
-							})
-						}}
-					</p>
-				</div>
-
-				<div class="flex mt-auto items-center gap-2.5">
-					<Button size="lg" :disabled="applying" @click="hide">
-						<template v-if="iconlessInstanceIds.length === 0">
-							{{ formatMessage(messages.close) }}
-						</template>
-						<template v-else>
-							<BanIcon />
-							{{ formatMessage(messages.skip) }}
-						</template>
-					</Button>
-					<Button
-						v-if="iconlessInstanceIds.length !== 0"
-						type="colored"
-						color="brand"
-						size="lg"
-						:disabled="loading || applying"
-						@click="applyIcons"
-					>
-						<SpinnerIcon v-if="applying" class="animate-spin" />
-						<TagCategoryWandSparklesIcon v-else />
-						{{ formatMessage(messages.randomIcons) }}
-					</Button>
-				</div>
-			</section>
-
-			<section
-				class="relative flex min-w-0 items-center justify-center border-0 border-l border-solid border-surface-5 bg-surface-2 p-10"
-			>
-				<IconButton
-					type="quiet"
-					size="sm"
-					:label="formatMessage(messages.close)"
-					class="!absolute right-6 top-6 z-10"
-					:disabled="applying"
-					@click="hide"
-				>
-					<XIcon />
-				</IconButton>
-
-				<div class="grid size-60 grid-cols-3 grid-rows-3 gap-4" aria-hidden="true">
-					<Avatar
-						v-for="(icon, index) in icons"
-						:key="index"
-						:src="icon"
-						size="100%"
-						class="min-h-0 min-w-0 !rounded-2xl"
-					/>
-				</div>
-			</section>
-		</div>
-	</NewModal>
-	<IconEditorModal ref="iconEditorModal" />
-</template>
diff --git a/apps/app-frontend/src/components/ui/new-icon-editor-notification/assets/01.png b/apps/app-frontend/src/components/ui/new-icon-editor-notification/assets/01.png
deleted file mode 100644
index f996c89972db9dd5ac385207acb5e91ff1fa1e08..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5986
zcmV-o7oF&dP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH01k9TSaefwW^{L9
za%BKUX=iO=p0So=000)<Nkl<ZcmbtbX>eUvegB<%?^`83S+ZnnwdL4REZZTAlQ>X1
zDI^&}OG_aGooU*E&Xi#o)-T<r{m>a&KG10?OIe1c45h;i4P?4dNGA;x2s9=H5|hY|
zcUzJr*^>31o}S)%Pyc5>_dYpx!|^=p-n0Mr<($hVckku6ffD3ODDHg#xrrml4$UCy
zn?RT^*>=u37!yw{@$9#!3uCUYXimSYKFK-L(}=oGeI4!fIkc|KVsq|kY@U7saifA8
zDeQU(h)NSE-SH0e9(Wk7pbzyn<d4S;otS%@c7Gj0#4}F-mjvAPh3cB>XOM?2=C!Dm
zLo*RWCIs>kM?S-_{^B=q^?yHsPGugi2mylP1NVLaeYd{@)h1AFh{cl>y%t4$>Z#59
zb!h<8b9N)jpZj_oCdNboP{;zsEJyX|Kj7-qpCE$8xM2hcs*k<xt7zoLQK<v50Rj#Z
zyEz|9wUg8ekd*Zx=<egUZ86M_Nvy?HFAv+yLx$L2NELl~AXlHm+`s%Dal>5KvO&5c
zGrV5{U&~FPT-VD4OfI1RsP*X=1cq-VT~u43f96??qkduz*GJU_0lM2H6kPt)JNMe$
zUxPC_Ua#+u1NG?;BGxvE3o_%FAegelGhGNsa6nWV$N2C3vm8)sGP#gIup_Xei%;~e
z*w}2uiH)LIH~aF`b8;Q`oRoXNEiEd^zN&vQ0(#r?SRhVll^rKo4q!x%2?D;B9Y?*T
zsjb_>K)tJ<!gv@sZV-qv?LMXCyz<#mF4PnYG^LZ{nKwqg2eQp@AD8dU?t@#7absco
zn*O5HJHTds9Aj_)Dgw`XSp*Ee=KW|D1?AO*S|vM{v~s60t`}nl-%Payn(f`s^>O{6
zMaZzQ>!dbs<e6Iv!Vtu?2Rtz^muovta_cEk6GbTUR&fH`U-N+^0<!%R*mm#xP;Kc2
zq+Du@2dbCEsFiQ-WG~SDJ(*9+tEzW8!*Nc3_F3G#{o|yyHyk$v8VP!>!0yEZ-sph9
zt*?OOPN$e3^X3f%5;(RUekU>nv*hmnZG(R~eE*-LGjITnrju(QyK*8)1gB~JzwW0t
zD-?w4%U!({31O=*;m*lF!(ID7gUOx8FjD$YH0xQcHxBA~nYR{8%)z{OzsNdf+V~cG
zb2EXsCrf@q?d<o#rlxP_`#$t6me+xH439!ev7|jTU~4Ou*o@}YwD%_{JvH!8I5hP&
z6pEXwl5A{{i4f%iEG+NC(b@N*(zyFNmQo9dR=A=*j-B#_Mn)WOr6AQj!`TYXe(rUM
zdZr&lgFL$!f{l1WyZe8cXL}V3`kP42p7P{G8S8xvGm~Gz@W8wrDtZWZ%@hcDa^V`}
zUJmxo;{My;gEMmv;rONZpowvEV3PB6BSh^b&|>DC2dxvBQaeejMemss`u075sCV~0
zXvJDixdYU=r(zQ8WhKm*!*tp#appv%FZ&!0jeQmqBhMfV7389KE*~PBi_mO#u(95h
z)Dk5kH*R|O;}{wEK29#Y9T&^LPxgG9+c>ypaq~Zub!rPnSu)qxC~R-9;=S2n=$$$O
zcHf6z;I&?o|F)Two0U8)`yeLS4{n6rjQE=gmoPK@c}!3I8=|c16Gb611iTn8sNQLD
z_)e;V!}Y&f-ig_Z@4{mB%^DbP-2xv_gMOrRL&B}rI!P1}H}q9!!5;kN8o%5uDR&pn
z<=}}4ofEUw!e-~nqpM@jwy)s;v3qaNhHerp79vmVE;y<|GAAf+#=RT@MCp)ny0m-<
zFI@U#)H(+f2ryK3o-wza3g+#NxfdyZQV*<yJ@omQU#j?8)uF)mzkDY5vFxzVus#2M
z+%fS{3=J<^juf&PWr^y9asjjep7VsLUKatXj-t<22d6ImCeE(B3ysdWZTI(N_oG!2
z^SGM93n}P%tX~99%=77W2cyKCV*wQrLFo!Ew5w^O-Ip@Y<G|>rv1jzB5@NIYfMmW<
z%uv`Iqq@<Q<KX-tT*sJL#AeAtWU>+3%^1^}Z((fkyEs1gZY*xRjXGqL13XJ+s9;TY
zpxPCuDuHLe{)Lz?R$+nnS;f^M5zeZ5;nuEWdhl~NH2!tc<~khV){nGe5fcJ@iraSm
zz7+?EI-xZ46xXsKMq{&sRx?f@ZDob@!_uGNYW-IwOLLx9%1OA=VfbjDFwGv7eeLe*
z)P&4)g+o@uSl_?nwq2h^ska7L*Q2}e_(tfQECE@9LN1gX)YST7E5Bf1`x1_nK7@tK
z_u}-GKgDKem)SLZQBIn52Z!wOrZ15WSoZ<O76}c9y=~c_;qb&?VaL#%oy+WPD-M8O
z%Jj(yD^MWdNC#F(EYchxf$tIQ-a%dHiw?TD#}qk^bVI%;l$(9-#oxx<+8>~e9d>}o
zgZMFm*t9UYqHd&@BQnvGKe6vH*l3G7^)$YS`)~aWa>W21d^c1?6qqG_AfmQLy-Do6
z^=P5-Yn7%<w_UFYWEYE}6tjA*jazm<3aow;=Yt=K9ZUMi;0#8NncWN5oDrFNwxtnF
z>f%<tj358_DkdijnAn{o<rH3jle9n~A0f;H#LgXTrmeshCB8wi5qsa<Y|F{kS6Vpp
zi!v&giL0hP(N#Syz;>+uFOv4ua)DxX6I=UiEQ-P=aPh(>E-%$Fu}dJLaLw32czT&^
zKveCZO5Ps79^}^o6xSZsuE#j>Oc~{sy0y+h2+!~-Aegn|);>zEj^LR=$uf+kY`&)x
z<m}3~t`iHNI=O+li*@X~xd($glIBR*{fMZ(S!<!wiC+oawrn+)ljnNrbPeZEROS4}
zl^-uhIID9LNx63L$DXx_Ocuv@OU9M;p*E}|K<wXSm|Dx?#o;C>Ylb?Rr(-{_U}PkR
zJ<~lhsuQKv5@xG|Yn2=I1JXrE_Tt$MoIAcjrm^iNqcXf1V&Byq&KkEa@ZhiubDKM0
zz6fyLXsOPUzP<RnyPU&xvme8aEY9#NbWT9EA{jw#8)usM(GtaP<2g+3Et2;ayeuI9
zAK(qL>T4aGK30+97bs5#MWRA8LkUn?uCJy-LdnBk!j@~q#YQJErxSF<=-W!>a&F+s
zzrufR^a3|OgvpH(a&$NnYB=v-=)rd4j(HM^=btWPb+Ku6$uC=C%Ho{-Nd-T8d>KoZ
z>M#h*5Chz`P{7beh}-A$m?}FlWF9d?jjTYy4wHkFX9%)Qvx*FTV~_RCyJ00E|IISu
z#pf}-7GUyf5yyt>SS)sATUNy7q0r17yzqPleP<)wa;SuS?<+(E0eFFA{M>96&6ZAW
z835^*qmVWvRy}Yz5AEA3fFq;PJU7_1b7$j}88mq{Z6jIW9b4%<ARIR-?pQl5-wW*k
zdkO2yJ)4%D1WO8btdn?D*W38XQ>)mutB8rcc?4O{>x6TAg*okXxco@~NJy_-Y+&}8
zHB>7twTB>y!~tUWgUdPj?B^e>hi5jM7B=Q$SuwBD0dUwevSDn2!Ir_W6cOR8EBv5T
z4>4R-S<79dfy<=%$0`w?+(RyMN13Dx7iw5o*u>P{9t@3T$tO@q4$14w6v#QEF^$cZ
zL_nGJ$eHJ=Sf1a+c$G3m6tRIc{y;OtmA(!s;Q*~XM_-!|TACzxa?abNDuE^*Z0^GM
zYE`{~PKf|>sW9U>hzVReN=JuUEQAjlh>(@w&Jp^LEcVF$V;dQaQrD)+po$cL3W@30
zCg4sUuVUd`ggyIvF}|ljLd>M4s8$+?;sB?PR`JpcWjS_xgW;CdEUxsEnI)@}BXU&>
zF%B>0adDu9k<3l#^b8}cD3_cih|E3mCB0cmVy=_5QU_=eFb=$*<?+*G+{%E$gnW!u
zKLw}LvMROB&__zKoR6h`pnwhpBQ_`tbnItqSU6w9fjjz%N!pk{UdJzp-CHg0j@1k`
zX@NY68qWxguQcvtIRlov48C&C<6Ky&H#tm2bw97+={Km{X5?OyY^3@T;M%G1l@B*E
zA@-BohNw_Nd*wU<srrXBWNIzM7>UGuUmIt)DR*_x3OOkQ%66};H1UJ~T1K<lMrEZ<
z+>$&*G3D;LJhHSPqce-4jjU^It~+k!TkPF%E;FY;$;60>a6Lc3HCinRBz);W+Yx3m
zHVW0K?>LNT^}JQ4q=a$%W#u9-lZ6<lg;Fo<CZsTGJVQtkyAo(^x78XE>5ERJHXnJe
zXeQPai#;IIu4)Q+Y0a2}C)I5I8X*yp3}^KDo0ScioSOCu?ZCjs)J%u5tg(jh%y*oa
z0Eq<T!L=N&w6fS<kEo`GZN$d%T#*3IQruFbP6Ks@ne_~w9cts?)d;Kow4ZkO#;;Xa
zS_uYvZyvsq20_J&942Pel}u9<@NKRV0i{4<C!qQWOH2^78&dGic=692gHf)q(}&L9
zHz3Yrv8R&3gXanut%P{PT#<ke&=V7D7xv)Z#ViIJA*NPC>|M(s8H*Zk71t@;`ZN|n
z%=tN1HyBUQV9flamlQJjlgcbqxjl;;HKYFP5TV)w4~YT^s*yETNfv%iT|3f>^pK-)
z&q`kQ-CYhb$#<h!93|FQ{Fdo#4JEtAi*$8+wu9~1ubRvWbm-1Ft#UP|%lbVs$I?oJ
zb1xe7++)uwShg}er5tT3qg?9%sUw6!<T|<}Ri3GwhsgACZAw*Q6&R^SSZl1HP+73R
z$Tf<C<V~$!9}#9hr3rL4%N|NRhsYNOmK-0!oZNCaz!NJmSH~0*Y|34`U~(xPCL84_
zj<03u=y%yYkg_Qd!92H{wX2$olti`%Z$c|KfF2J4T|lSgKE84SVY^O7l}n3athO8*
zn6pC-jW+G#C{P7eOaTyv%6Um#b79W@8zpGD+#a2~<8hNTfvyuyf_)EF@MJ|J3=)7@
zId5(tw{pA-UTgEWU;);u+vnwH{*@9XWo24*=qq6}qG5a=regth{--(yR+~Gu={Q2A
zFRf^3igTtbP3*0?!5Ex4)FQ%_))8K$@TC*SAI#aCOm#^j$oKJ$S-%m}uyOu5)D~Vu
z-_)HLnEn-n#gg4iQt8`UDcpKb=BUX~-rV$nW>ITcEmy!uk+l%a@1w8RI1f)NNHe!V
zg0J$g2_@U2Z+CYorkys*r;lRpdtb!Hg`dM+*kB$Pi+x!4i+eXQxCKP9igzQ#U(Xi<
z1GA=Nm@T+|W~>o0ZGTi)!Cnp)TgNj+bVhE)mS{;MPjiYG*V(LKiA3W3w?B@}<+DmR
zS%OF%z^zHJY!Uib*pf$Qc9}FX0w)@j4g#Ng9i3YBxVpf(+X@MRmCtnPuA!16Ut$a4
zSIRY28Mr-~4Yq1)nE%07P(AmY6JezTn4-RwH!twfo>Hva=SSa&g_Zxt&emC(TQ`&Y
z@+qEUQvLDz0wJJC9^Zy)i{bQy<{TaeZanLzKJyR~)UF`Au>^a4Ev-H2eS>`I7jTo(
zCp<YveqaPcw>^Zy&fRv5iUqXdbIC*B3^I)bRqCZFJo%bOF@E7u+<M_l7{;=rmZz-(
zilc+e&snW*C?TJP@69N*YqwmoMJ~%yi4E&wsOPwoP`*|j(6hJ@c@8`AZ1!F>!e03N
z8s+jBJoq{c+<Xtx*p<<s$&gy*WgK8`jS|uqmFIUojK%Taz|^TP;I2zwmKTo9j??a{
z%`ofGT3Uj_AlS&A;HSQA0Zr(Y6cQM44L^Wmsnd&}<c^@69nn<P;Lv*gdk<syRS!sg
z)P3hzBS=y#wL16AAp_u_xm!~i6>w(%`>-(iR?M9FG$k*-gUs+W*!m)P!yPvICei>B
zH`mavEXr&Q?*cW!Oj{Pwv)T#q)96kt^iA8o+LEKNeH^1lehZnBIwNGpQ%%hy#r_W;
zkNNVZS<sg{B)kDXD)g_Km~Hm09>YDCzfQ-JOJGYsvm(XabdCyKH`DLznF`9)mQuLT
zzPqFfw30ODN-ae>6C4W<;7rd!v{}yI0#Uk%9f#kD(&Ry#w2>?7J5YWUEuME2Ne8s+
zRZ1K8(P>HY8XWT+6L{hvO28O=iV48h2M^)N?T0YB_ylfUJdYvf`|<9&9lWb6hC7&f
zNlq)fhM63hz&twj3NG*+c)s^;)H4GKYKj>KXYR$|f&0h+<?Wi5Y@rVa^u0%pcCC!4
zapfYyoij=a>2txDyL6JABq1W)C#k19RJk<z0Irq}V%LSQ<F<vbBCC_~T*J;ibE_T8
zZU@hMsg09-FVEu_#k+AeH|o0RK0PBhVdz!&6Wfn@fTt$Wb?(L+Wuis;erX<2Wo{PR
zMrW|8Q_>0vj!<Hu*n5`1Xk{3~OQd*z8$F{qIrBkWoO}xop8OQ{u0AQXt(wc+AB~;8
zz6S8sIKu2k59W(U$P|YOA<p!aFml(M&^Law-Jg#bAGPLa!ysPNMdT2bFU(RV>%>v)
zc=cPcX>uLRKOt6E8$zoP4M%A6XiTzR)to69OgH;?;n~9<#r*seIP}uTNIxu-iDde^
zQGoQho!NVXi1AW!KhF0aK$G{vr+N@&u>HVmv3>umDV?6RS*$<<29~m5fZV^abX+4N
zM`skPr;dW%G;;_4wZHi;)>%oXk-9yM#HTDN)$Gm>^$25%n2z~1@`AXH(evNL!E^tJ
z!FWaA?f_1`L}&VRbS|#zi~b9_5ghNk6V?21dLfi{AHvA(4<IV`J15NgFwS22wuGlW
zSg0%bgQO}Re=p@STeS)no_Y);uYV`1O%Fg1ScO0Wg6tOWcrKQ<x8~-Ry*=hB8_9O!
zl_<Bc=j~YC`C9CI>2tVc`CF8bbQzXa^x#DQZCLKxC)djoix-D?6RY>5Fg$_c&?LfK
zPuJdj2QG;a?xDdUQIrC?fAdd$laydZeKArPn!xM-_Ip?rA4a8bXRzcnJWk!TU^<@j
zFBTa(*o`{#YB(&nb_R!L{|@D&PvThqRam{{&6L*C!0x;W*+Or^d6Cn3_lA8=vnJQp
zr67hwmY~-_j^W8ax(}OI=G`YVhaUM0j6Lv9tT$8E-?Iijt0%wl)0Aec%i}U_K-#ZR
zC0JiZ+_xjax@Jvh$dc|7u2Ijrfc95Zr9}DH^Z)TF9RJ40)%vF4#ABa8e03hh4B*0H
z=K-3Z^ihJ;og44d6&vwcrDRNqH{QO}Jf)o`E>Em!`k7nc_U5<!`D=NRrd%(%5A&QS
zLn2^2@z^IVLM#G=E_muAzYA7gKt6Krar%27V@~YN62K)l^xweSWMBaCe$4*m8fo0C
zQ}cvgTHCG35_7n<dDk~ijB)R~A|~ZNs?6huA9*D44WUJVC_*NVe(c@IP$(+~*mSrb
z%NxW5u%D`=KTTowOaS)t8#RV?{Y)+*k+u#L6@$>PH*H@2F=TFD=JFWU(F)YxA{{k_
z<#{~)_wSJ~`Xzw?Q7RXX<A)!91OZ{IFT>?mm@b#*<<zwl+6^&%=%77CmPoQNcVExy
z5$-;6V5-fsvMxr>&HQE$o{#R5Dqb7&#HEL1J`|My>qiK-*)+H>^XV*&o_Y9#*!PzA
z%1_Q39h1KDRanv^@BXeANPk1DOeag!%dz$Xc2ZR)zeq_bKJMunFW!)6wnTlQ&rW~m
z%b0!ilTyUDD%bsZx=3be=Hd5a>b|$49;@$)ge%bQz;}P#ru@l$L;%)lLh892G=IDw
zmcx$q5heZ?E`|7sOKO|~yo>+yC{BL+%cxy`g&$9+i}1b2?|KkJ2kt@t)Qm(-j_R)W
zAv97^qg|N!x3|;WlN{5113bxPt&MeTT%JSu+>5yU;?tOa<_W61vCrrK4|W>%gV~H%
Q*8l(j07*qoM6N<$g1Wq&Bme*a

diff --git a/apps/app-frontend/src/components/ui/new-icon-editor-notification/assets/02.png b/apps/app-frontend/src/components/ui/new-icon-editor-notification/assets/02.png
deleted file mode 100644
index 371efe55ad2c72b699fd5909857a0b6a5555b88e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5961
zcmV-P7q;k$P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH01k9TSaefwW^{L9
za%BKUX=iO=p0So=000)mNkl<ZcmbVT36LDsdH%ZR-r4)mN_$AVlF)^aj6nj7Y#C&`
z3_d_U3KNnLV^YQx;Dq3mjbkHMjLTK2#Mpq#M;sF45DXy@s+_}sxep;g5*A`tD~VmL
z_L#kQX6K&i&i`Kbd;R)NuONQV>h5>`_tiT_@0xWs-b1U4G-7AxN3f-BC)PA>#)`Tw
zB&km{n|3kSgW-Qx$Mt3?bM1h4xkW%fl<{mOjj8-NMi$@3(b@fYHT4v7<uu+)Gv18=
z9d+IKME|w;Q1@OW&<LvtR4cU50xZh~THN8`9Q3RrB@kv0964pZ?LGwV#pasuQNpJ8
zaEKnlfJs*<4m>mZC>|cV8`HTl{6Pd@9RK`=n{j#HpQ4f{Wb^Ksb^uZego2AukP*nK
z$OAqBsofK`91kLh7*NkNh!`djAru4t<K(?~_}D$fBnx=21Ylgh<D&b~W^|*HBjjy`
zTks=lpqASjY&8h$L<4Gxp<}N~hhg~p<$AYY%wbnJ3Cvc<@ST_cBv2Ymy`!&b6YluH
z{b)fqN?8T@04P<?+U~eGSd6QEzB#7Xua3ce7HR<H4Dk+aFLAzY`)v(ldMN|6SPny(
z?K&d?80T-h;KyjD1=WJ9YXYDE03;Bmf3E0L=ZijlFMU48dzrOCclG?BIqa&C-C{U>
zZO6SF$3OxYrinXt-Ond7L#H;uEuE`@9D;{r&?Nzf$K{~)P^8Y#&Qb5S`mRZhs*YBP
zB!N_#;aI15FG+yUZ@d|;ro(yLa4wxoqF-8UjY~FaMO&ZaQB~obI;Ona0uhB6k|1XA
z***fQl1F!D%o&cK-*l6o08A`CbJmS~g1Xo;92dj-EQJ8J3xK5%N*}khyV%!)e-5)T
zw$|@EM}1e<DolY3r-fR=SSk!ORwko<`MPVRDsTdPZu8BklwH4W){2jytf7gxXsTzB
z+)%hGj9v|Abm`E=o?5);-_f!Cv082is6?R6f+me{B;m64*E$49MjEht&0bXV@QbmD
zGa93yOV@L$Iym#bVoW!V@t()A=E7g1>wOPl^R>4l(LRpl44@99*iU7sxR_Dg-TN7C
z3(WIZeH3=t8BsZ`-l0((8bxae1b@Hk>f~j6oHR5}u{ELODfI2S50Pkyn3F?1Ig1U~
zd>7G8|3-mMDG(-~L4_t^>KvLB4>e#%*B+Q#I(DMU2%x$Sg?lWjI+O9!jUFeQCgQ?o
zs3NKAs;b*kcT26v&9&1!gJ0#DX~g0&%(Xm>!nRuw?-=o5QW>X8mM*;tOdu)P(tZKV
z{+3M?+<O%A0isdTHfqINUt_C?GdxWbHMYPA*b^QyoFG;`CJ)|-YSrm4)BX5UL)hBi
zhG*Y6jAISgqiOqt9)c!nypAs{H~oyM(0*&0H^J;k_V5?oXw>MMM&%%531yD7`nCmV
zoDuITz+94IDKu?(nBrF_lPfQri`3vQlxd5Jp)?9hOGq6U!gZfoixsW)cyjPw7&~r2
zqT{4LRxp5|;LSIO{#nt`1LMWpDt2KOzW7=+HSU&_G-~Ha?g=lV&DB$3nMWw&MsyOr
z7u}AAra2Ttn=$-68RprYKx6@-m0w1Th$GLY`H^HD5<M+=c7F=>^&#|DZbJ3+r~L5P
zniOa-Cfexv#jg<o=DdxSo2muAK3f^n=lYBg0*IxFCTnIWi>`}rMN7vN7`u&F5;-f0
z`I8r7=ExN=%55kme}U$%Um+4UB@5Xe&1+WR#8d$X-^^fh`4?yi_50vdf%Ord8A2j}
zX&V}nnrPZOCISH{1`*y|)uO9bUl>$ff;cw_*<xlrj4%xnf>v$`i8=!<YhOn1?(ZYo
zu^+Mg^`s7W;Y2D&^JrbffJs++Y#LqRGOqYoC$jB7@vD_;UrbFBUAqzb(ynjstK<RQ
zYO9;5zTF5IuhC~iv%m^rL_af*wvZQkFU+q)L(fx)#42nMlS7NJswV1ME2v+2fMk9G
zkG=K?e*4xS=F&xMSe>LIh;x`lma?+Agms%s6ws|gIlbEFwIJ-UiVxjG2_^xk<&-K7
zz92;(50D7m7eifdD1@NE)eM=k&nm6N*x_pka0An)3s{=TkP4i}+&eRTcCz<*<U((t
zwLXkzj%M-oe;US-kqoZ@ndBx7+G~Dn28#>Fe2hT=v((Gft-T(NL6ZPI+EU+x#)3j%
z&q`aqh%Gnq2^@dz{YcN|5F+soMNH)97BM?GhVo(spWM@fg{2B{*~0j29(Vlf2p)JU
zg)I3<BW&Zj!*TK)pR2(`zf_n^sD@z~Y6V4nqS*m=QJB!zNrM?6HDX@=)ZgIX*luJk
z!y!V9<tP<oCQ|6HH*oo`E{X}NC{p6m))2!hgIWCDgQNJb7eiQspCaL=y1ugoOe(By
zzbPk~n!cN=xFRqtRyQ;h&g%sdpW!oV)j<Vxvi&7g*RRF{gIn-sD$GSY6eB`J4dfTH
zxUe^Z4{mNmTQZ6yg~`k*l*^4+ANmPeV!cx55hV7?IRaiz02#j<2#n=*(G60CGuaP)
zo*G1{#2O4giNfk3v^3SDcWpm@eRL%r*iSXRY=x@>BgAlO2?L{fG{nQqRw5B@#8sPr
zj*jHo8boVsn~sa^y1}4)oW1LPF#U6RO+cF`a&mp2puNO;_CAQ;VWi<Xj89E+cet*<
z7hUZMJa_N}{`SFl@Y3KSCKk&0=@ThbTr#t5KDPEw^faI6)dI|5IP^=L8<rGNqZ@c)
z;)|vX)I@P|o~4Xi0n)^}!YMSaJc`B9OXND%PMHTV+Vm`CXi@a__E7F);Eh9vurTx@
zqGaLcmMr|kf1bwb_Be6OM1^cZv1H-$jo-%B&QI2yt4j45aWGv1NRd?#Q~jl?$Fh!R
z!=K73$m)3lpAw$Ms_nO<y>lM<ZNJ6Hv$s;!xdTh}ClK8-h=vJ@{&EG(%+6tEY8EFB
z{01}WJc{%cra;L`QzFcfFT2QJy7sTIyYI`cEVxo_Dlo!}1m%YmjcFV#UvQwt@hbJy
zLj)l-f*1%Opx}sEM)&*op{-*McEv_R^El4_^c{Hn;D<5S7)BzV;9NK88ajR)qX(bH
zLOR0{U(A)svWL)87j+P!J@>4;4IkU^mr&v;uOP}`2*F2vX`~gR$T+~4`6&ph)>5^m
zYJE?nvW8|ObOUJH5kfraOk}zJJS8}h5(+&jgcCM$RPe|b3YeUn!tm=)Vj+`3xnf~{
zsYF)ZM4U{0g{T>#^}ANzz>!yBfC2|hzo_f5%kWqb;N7fzjRl2Y+*OyR`ga+Ix@~gc
zdKB_eDMnKRQ`p+}CR!8INY>RM7LH=%&~r%5rIF5-$nuxCm9LM5Xv{#Iq+na;)%eI+
z-}E5`_+ix%Gz`?l8mhN4ec`L1q*nCMU5TWy<^uI_Sd9s+(t3;^`!t7WVWEQg$qYtb
z9>S`{C(xA~!N4nzV_|+CrK*K&sY-%EsuBw$O2{YU5%f1-f{$;!vj(mp*H+^Kp-H5I
zt7+(qHO>MWwbhMmzhAGB1kLa)OkIu>BS2<~LR~^EL_tnEHIMl4|KgUbJJH%2LxGSF
zan6SkrZ_)I{(e={dAMTh554l6sc_rS;8j$a<r+dQ^q@<;o7^9Y9@0;ijPT3dMfyw#
z-)hKr+ZAWFUd;D=zPr|T-pj~iX6*}@XxxkA_6C&Mf-p;B42tckD4ANo_isEKpWV}o
z`nZF9V?2uH#9DlI>(59H8YB$tysBMAYKfAi{EUQ0P(++>*|z)rz`;qvrod=C_nnGe
zoHyZ4rLFzXo<vykU5u;q`JD`vp*epx_ToGD!0O(Qb9Y~f3R(7J@0>(AlfusUAXc`O
zr0B6*q>c)oWHf*N>mlUQEx6|VN6;Ma^3DJ=jwy^Uo}eezXCO)m!-~e$M66B%$d<53
z3D)2i`_#3D5W4Qtef!FJ0l3Xwks(SZ?z^**|Jfm|sSv}ina9Rn8onC`C+@}R(J?A<
z$FQomk53){eIqtTeuSl54vG4=D6KX5I-3X-tCVo*2fDCj)fW*fUBvgSlK(f&kc);z
zMsf@`|Igxq(PDm@Um=<kkJNFlGx+$Pj8GCM0V9Rhaq=u*yyRQ^D(p+JK->k~vz9I)
z-0H5A!g|D#WA0rNiLT-KXYtaheY~>0l&@gu*Z>;p<2ZEi5ITyz=xhA|>EI6JGP_}g
z4<M0Pa&?^4qQHt9^C&J|hKbBDPR{%uxl)?;GSOJq&Iyt)r(MZ#_*$_UA!f0Vn?hZ@
z36W4l!X@Aqc(V5}6-0;tR1qqIi;@&|Lm*-+&qC&HAGe(#$lFvBi~-a!hFoMAnYk%a
zcM?3(_tfY+XfV>4$sHghfUZU=eA-Q@WG|<9z(zFrCK*T*If@dqsqbNQegdiVFc;~3
zc?t8m6qZVhXs+u(XVV(Y=TqDsSgs{vpt5&HoVNPz8aO44^v(!iatrBFNOITk2*DTd
z;KK5Bh*Q#UA3Vu$#%G%LBeG!xJNI0Prmpn_l*RR*Df;+K0dX>LgL6N|#L}yLjcJhB
z=D&ow;Ri4`*M;oVU36>@RyFo<crE&P;RwG)9G=GUse>4pd=(|)o+z#HAkDTN{kNIg
zl%%Tq)m0iW#mY%nX!%q?MJi|xCx#%JYj~C-r(v%dq-ZaKQ)6T3-Fg9HEnV(DWavl|
zj-8rEvw00xHk>aR;BaXrs&n@f#+|%B9;4K_eKSYQ`NrT}4C%5}CZuf_F^kU$N22I%
zTaOK^&LcM)@n9Az;KC~K3adIVxN5r}GlD4Q<Gf;N)s`$%)#lVWsH`18e{V0Ie)@M9
z9UX;1dfQwdB{9xp^NP>mvU9%SaK?6k6JA8@JC~ir*uoGpRJS+WDo2%&R6aJja2ez#
zlW1?~LMKU#p*VfPEP=3u*}a@}*d4S40It}mZp~K4WItV&@~jeX{>T9oM_$Hsa~n<`
zdLEf<k*h#~>UUS2e>cuueFYcU41JYh2)2_OWA2RYH<O*f<iZK0$)GuOXMWsrZH>wO
zy9k1!;X15rT8sAjRmAbI%Qz2tPFTzGNhshWfak|`q?c<B!p=!P%DU~u@O?;){0uFL
zIAwKjVqq?i7{&4|to_vXJ8@qBUiutY#@k~rVLm&<&p$nP9L>oNvh*33<Az|a!w?ug
z+Y}?j*N|#7*L6a;H3xYwUXaplDpIb*IgIgP$WYRfi0PD)W6A;QI+ZYE;}0S|@sIrd
z?U^)2sfOQf#8Du9-MQ^nd}!mJIW8z1;fB$&D;&#0WeJn%B^Pmn>$qdJy|{!CA{I%a
zuVV|<2ihr9jJm|PJ(~rG<5Hy%z)U4X55v_DVaX+j0be8~r9_Ps4bvMZ5j{QjIHpH_
zh&nQUv$-OMD6<QbPiK{$U0ZI!MVr4O_p}JehC~Zl^b|B!1JbG+JSk#t_3>8pw46oX
z1y<JDA=4k_NxyH@M!14`j>MXt3aALF;w+7lDkZi;Bp2wV^jkPJ^j&UFB4z~d%okBl
zgecS6?OXmF7j3(lPiKC7V(}zq)8iDul{vl*v1STl$|MDO81SkU?B7JR2|aBa(9zKC
zGmyHfiZK;NRXWA9?2|SCp1Al1RSpN)1ViqObY=h($G=Hs>M$9uBAy+eBqErc0PEIW
zja}#7%Ek1^=nI%ikGd(SvoAAZ+xsq|q$q^x#Zin*A4Rc}b8|CtiY@(E(bQXWw(313
z(+mXED@`9m^?f`EaP>#(wq*rMhECmV{xpsrx)}|TJRu#%Thp`L+S`<8_Vj)f7oT@K
zMrH<ZYUT*l_X=E}d8N$FmrKO;<I@MRY1IW3*{!ClmlG*Z#<06(J=uzw<eV_n;$6K9
zCYpv9_6j(4B6!kkxe}mfa6x`q8)L0d7{~D2e?js5BE{g8<;@m|2vos|nP_O)hCRFf
zo`RJU_vHo7RnM}rIK4j6inX2FDU0jyv8A)QPoC+sGiu*59!NLXyfMDoW^H`KB*6K5
zJuUqe{$5Cf0iQKx;b?(k@MDK>LeiK+h5YZU<8%Da=$RU{HgCe7-S?6^Tforx>&TEl
zcL-_I_kAjTw{Jl=xv)qm%=eY?hvtz~!z=*yo?RFfcP9|H6v^d#X!}b;&fFkNFbt#7
z=la9~iL_==O4T$DAG{Hf;u!LT(2=P$D6=N<qiRmH9cRDq>o|PsMXKmdJK2}Z@g72Y
zHC?etLY||$Q$s5_suCDz1Vv?7iD3+1gm3!nl^`VR$`%(9p3aP+Gfp2At3roDzNk(n
z67DlgFrGVhJ&KW&Sdow5mC<Q(X$I=TA=t4-bgaFKl9a>z6gEFhi1)47%7c~&>9cOR
zeTZp<FkE0gdMF8(zSgKEmfBRcX8VMqCQ^iZc$lniSN}$e%p6LwtV@lgpmFN;;crph
zZV2<m5{BtxWw~e}N?b05>d@AEC5f4nfJDgm_jjH{LCZN53xvJH?PY9^VfqY~cfLPB
z3#wM>gwvaPro7W_WOe}Ifw5O{@y5Ndi;6Y1v>d<%zG@dptdH^n$4sV#g({_+F&phx
z16up8MkLls@pugDR-S`3E6yPo7pwWD2K(B}RZ8L1yN2MJ-&YeH5$CJHn|h|$UmatW
zrBKAi!0G)kUqA5#`Q0VwYl<6;G2`HU#Pke?NulT2J%5c+%I6m{W$wnxtU}ZKaU_x}
zu(5jwF5UJ=Sl@NNgS_pmgV;;uqG|dgPy@bazD}7V_E7)yMtUR#UU{bIclQ*=(3wkR
z_lSi9C!a(pQJ>t`L`lf{Rp-L0I`Ow7?UsCY+!y<kmJo%cJ+P}QFg&%N>TeZn>Aea&
zHhcj))?bFU#x4@~h_}{o_cE0785d_8Uaih6Q~9e<Za`zex0kn{SMLM7uK*6Wl|F@F
z!mfnl23{C?6#EB%<NRi*qp=%5xb7JgGN_4~YIM!D2kGn-PENjrt^J=Q-yg-hRgzV4
z7W*u#$G&*ogTt4k$#0TMcBk|OHHY97Ue}xW>U|%kkFR6S%xQY~??e9r?wv$#?_T`x
z@F`Akz7GhICb4f=iS6sJq)095ilrxtY(9@I6w%~;;y;dvH&^bhoaudKQs$}sE*xUL
z+NYkW-q{tYGx6wa_i*I-5<#8EUj7m03S$VxTzxSte@<Y){rKr+U(zTUwS@+C%+qUk
zidq6Qyb_hV4=;dlJ%${Y5SyqGZ3&y9z@v<_zHl6vrO^G6m+zKRAqkKzrg7&(*I=<S
z0XO`X2J1{EGh6vvV4v&M5R}dEM{j<Yrva_2qv=<#n$Xr(yoK1q-J85J7E2TO-a~)v
z^AbK~VPf%vM{mGlb%Ik%77&$<d<MnkkZ)X(7@u!;xhUL{x?V-zS70$sU%y(kk?S=n
z64I&0`=O{sj2*{akKG_eU!D>8!$~rV-}u6>=+ku%|8<2^WwwG1j2>nJwM7UeWL1M6
z7Ij*7RffFFu7^M64Qxu4N5&QO%<S5HegbzscufuR%MyS!mW%Jb_^bHz&adzvR8T>e
z2(e6{q5vLb*?lRro5kr~V7WlZx2NMtmpxCu)Bhpz^GubWc;lCN<b}JDD+d3V`rUs#
zP13M;*Uk9g*1bI2V<kMR>iob8RxrSF^8ny<?y7TrnV+&gXsxfAj(cOl962TAD_Oj7
z<PrSOfqxF<`u~dnqSaBNbN*R-uxa&$Slzh^?M>bE4ZrD(vH5a-UPo9L^>^DxZ`oo7
rGmED&l6o5hr(VHpLr*QsalQQ?uf>G_osycz00000NkvXXu0mjfs<Vw+

diff --git a/apps/app-frontend/src/components/ui/new-icon-editor-notification/assets/03.png b/apps/app-frontend/src/components/ui/new-icon-editor-notification/assets/03.png
deleted file mode 100644
index 39b88132b5b02fe3e2f4137f15bcae0d82eafb02..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5187
zcmV-J6uj$+P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH01k9TSaefwW^{L9
za%BKUX=iO=p0So=000xdNkl<Zcmb_jS&&`DdH(v`bN6Ky?V6ETWCX)vOJK`T4k=QB
zN^A;SELAp;1oD))D)5qrJS0`|OOlruSD8E*S1Kkc;uMK&Fe!{p3^*7&K?EZqAt4zp
zpjkBQoteAN-8z4FpQTTqK3Br!o;q`u?$iD6Tc68zU9pGbGMbyJVAJTG7%hDkrTi3f
znMt^AMH}Hy!;EXQUvJEK&MtFYwDo#5v^&$NwN7HK{w9`Je}Z0r9hcMCr3fGpo!I&a
zwr#o}Y*5C=2GF5nFkp0W4LJP_;~5gJ^|6;i)|?l?z2gvrTn0A{q|+SP9K*$>@8SI1
zH;FJa__YWiIDX~C<Cxg;2$~I`)ug2eX|647oe;x#WgB5iNfOa)?=$U5_$-wo#^uGq
zF}L*3I7fu&_v{j3C4k`i{_CE>pf`a=ohIi=izjhDsSO*$FuWy6TavmlDH){_U8bh-
z&Z$2@dt*8_t7ASW6|Tensb|pbOrl=%k!R{KVPrZ0Nr*FVoB=HJ=8N_Db9wiSTh`zP
z4Ej6adqPFm*ExEf3G5?=mI_mdL8nVVE;B*M|0}xf3A9^GEzS*OF3CNOGxEd&fYi0g
zF->}c^@iCC%Q!&<o}^Z4jV!4|HaCM`z8{r@Kmvr$3*`Gmt#(`Ew$CMIyY>%mzxRP<
z8aE^Fb7MR+o-^YeeJ-ZG$1QMi?Ep5~AgP|f%_Ipa&3gp|xN71t8ashjOU%W+gQ<Cg
zYxB8&czq7Mer6x%aO2)KPG46)YyIXtF?jW{>bgz1@%|*P-uZZx0D0l+wmphw)8sNw
z;4)8^3a|vJ@W#P-hA5}3@5Ju8F%L7~(vRraMvG%|$D_z)Cqn{Uz3VX&5#iU7O!3Is
z9K$V~V+qeMH7|xdOX|0+!>#KHJJfD+T(SL8MSygwj2+wVL#rJ%ZY;2_db1fov!5gW
zs%iLGte<((kjwY!=)q?BedMC=GXqv`z|UgvHAxk=ZM|380(bNHUFdXFki(csgvcE(
z%kO&@IZgxyyUSE!n#l}s%V(;1;Ndpv4UT93C5scswpeK%om;^Y@uu>uq|oZPq{daS
zb^K1a<D&;;Xe*T=;(~Ytp=2aj{Msfw5kR8zTzyRq5B<>^uHKuY+bn90ix}JSI@Vu*
z4~6nyP?&p#fw0a1118-L`QE_-M5oIzKJr<(mE!g2(G3d*+sLIa&Wvk56kEXs&NV}%
z^^I@p;J&Xc;=t!zxK0iW3swB`$SJI?tx_z~L5j_wwf<*FrGFRM!k38<JECwUQrdvS
zSXZ=ehoe%Qf}77xV5Oz`(?n!+$zVuEJ~|JN5HJed-S;2EXKtOqpgX|pZym?kvopwM
z97<{&=^h7sK;f)IuIp9QtFI%I{|ZUO1BmOj?S438L>`yRQ%0LkS3CkGan`1{@d@LE
z0+RHe^A<K5FHp?k;MA!$-hJ-^C0lJ|vJN3kF+9Q2=RHbf=8&flu2d)@O$pAGSG|GX
z`_gv2^Y%WxceHHG9XEtg7^3hCq09&)82V>!nILIWoA@PBK1!JG#=Gb=pCXZ8AQ686
zE^)ly>r)0t$TLSKFkQ0BCy%}_-)?QRkjbU-&>!E6d%t`SrMqeD`}6{y{Q3(xbLzK=
zgS#=jB{2@t_(}pqt-me_LtY-rdBpDfz4O>;J_Bd)uH+^sf9%jX<wa^K8Y+-Kcjg>k
z{n0C^t<_N|6manVFW|vHycgq}$B8gK96kCgoc`5^l%l_l+VXed=I%kEbdU(K-MX$F
z9uHnx+l_HDF##Ip9rUq?jN^j_I<4<v(D@<d8)Og#wiw8<a~BqI)hDi$Vn2Oh4u{|P
z1?Hw_r6g?Gv;}|j#9!h1oA%0C&z_yboBwx$GP?~jhK_t+*oS`SMN}7mO19xa6w3z_
zV7B3-p1XduWW__LR*d7^GETeWU9#jaqt`w}9PdaGS7-~fsC@s+&%ci8^B1u~+&=d9
zQR*LHq&Pw)w-PF&BUoCk;q<8sIC}gnmY3I%A>)`Kl@Ts`quU{OSwkULK+36OqyBBQ
z>W5Gq`BM~%zZHd9M=(G`#XW9d(1*4p5r;vP@VdVK5}fWcWYsfDP<)Az-7Fx)i6f^;
zN;o!;ZdM+Hd!B>TBb#<HJHL$i`6|-Hb>Eu_{x=Budb=TyLavB%zDSa@f~EPt#Fm{;
zA)mk20zZqoL?$HwhM!ClAK$O*lAmlWd;L1rt5p=qf>%hFW!5KqEn-Q17(~|;SD9>z
z=IN_@@je~Z<tpAe{1#5XcS^<>#cTluLcY`MVYRVNHNZB;N$q?N^GI+PZ2}k12m(<~
z4ikwmZr7j1h~Q0HZ`S2eE|f{Mv(nNjBC^2VctR1>Oc+<8ZQ5m0btFNl8hh;RV|ee#
z5sF+pBw1M^?1;1<)%v<rhrqbQU!GZDjjD!608@l7)oc`v5+TJ@Fe5lCxUf##X|z+M
z;}sImEIk{9_Q1lOTD6WB550<;KX)@eI(r635C1RKC+p<9GZ?RIBK63iMue@duc41Y
zOd-v@#)^Zm0W4wzhFMR&-!zCi5fDtsgtp4df$Zv&I4`ZOAk$1^v{E7Cm_ppEgmWG_
ze4G$JPHNCaIa@?2U664=gVMPRix+7>paa;lRtJV!!vdp{WXH!}9bU>A+%w~B9E=<H
zN}A+6j`Hhc`B8f2c+b_iPPdEsrA5^0%?N3s!R@cfWqgn#7n+u4Vs>d6v&-}73gnYo
z@V*8gV-~!G4UjKz^KICTqID&Mve3A~aQ}_>0Lw0(yYK>*I*S3JDaywh>20IcK)GB&
zDVIT?%3RV{M)XwKgk?&Qg!CBGCpU-NW3>pZLPmYA1!ujQ!eFoNnAI2_yLU7K-B!5`
zPu%{u_~h2>Wt<;ygU-D{4=bxHm|a{X3*IHkaWpzQSf$$hnb{AqxVDUs(-<@u0i!a6
zpnhPuL6clIJCLOFh7>tUzg{@;Lv+W01GQW6sZF26v4xXzgtU+H9aV^s_F-j(EPELv
zBoVb%4Rb3C*dVv&6YOJB0CpT$0K2jQ8a33R{1USkDY-_@@HvYVBh@%@O0fZ2yoqNQ
zp2gQb`fF?{ZpMLK`#ms}`1#T#X-3C-vxe#US=!h8NFkrdh#}3<VNJpTdL+mV3adrK
zXO=M7I#xa3Xda~){TC<|OJ3UPVx!l>KOA`q*;LjmRSl%Ri}yxyBUo*(d2(m5+MYT`
zJ=U-`ELMr;Gp^52ZXg5;LG1U!aFI243bdDakutP@Bnlj%NY*E_f<8r|Y^j*1`Xl89
zB8eF&TXFX_cj4|&d>-Hb@0ajO^A+jxcq|#aOuW73i?xE%rm|{AL2TF86=ucP<hWrQ
zsA$nxJA_XCC8RQYDfu~0dHz89Ke_NAHX+iPG`X}CiFZdDy{)A!NS`U=f$jI>p&P!0
zM}P3u*h-1W59w5Bam~S*OjK&CB}3dYL-b`8t9W8w|2f*Vf2TZtiIC=4t-e8fZY^xx
zv~7sWdh?L7XLDIejDI`!ANVi)6c6rr7`K;hR;<v18+NG()j|a3+W_sgXb$7U0lgri
zQ%L8$VI63uF8TAN>AypT_MSH=3AsptNo%7aMZ4H6p_nhg&-Zj2!41h0aeO|X!&<M3
zZ%lt3hkt&nS47oUwW%Z`$eF|#4BFNJF?{A*8y?z#D6$s4@krS3ucER1E#h{YHd8jR
zTwhYY-BEycx*L)J$t|=C-W?S<T$GC`9G-g%egqeT{9`zR>FMVvJ8aYD$L}CC|2&*W
zuFt(lFi?Rgb;4@|_pP-bpj-b>q^YP`DwHU}smV!GguKZ1M3UlC4zF7=QP~xSEk)rh
zV~!PI0m?chHmkK&WE>aSY#|EA<s$D5?~_qpT>Kf8*N<WA);lmd`YCOUMtKG^8yqeL
z^V8oUu`kF%MVZ7ulg-L=ii}z=llAac;f;^D!&1nkGQ<(85cS)%5t|QZCV~jNvAA9(
z@30|>+3HXcG?T+`qIEi}Bn{7Fb@d1)CJxfPBQOc(M1vrYLXjXM40=SgR;41x>e@Qd
z#6ebwE=fY(0JuwbK~#Ctl)939P`<u~>BVVuDGBnMN^Isay>u}^UV{q}v1A;V^n*h8
zIT5?KpDN8;A~@9>=c$nTB&O$Hl!Y1}FI5ncP4UEsA?k;<2!S}pN!*)MoM^Nb2>Akv
z#asx19|)0)>va2)x(loGveqZ6zt!3b89osdb+Nj>O11xfP`L2d=P^WwIzkWL0ZHQ?
zWND{|IT<8TD4!jt^`rf+{CL3ejSTk!2-7S0Q;^+cq8iI(38L0)Qjw!gv3rU3+cU(0
zzI-E{a)|&vS+MBSp1Vs`ogAr4niij5S)^xuWeYVOk7Rf(wyMksO*#lEbJCkptn8yT
z%F)0<1HCeGEhZ<wNUEwEXU`1=9)KCvGUk7kYOsN~hPRnIAY??UDv%r>8I!IpOUSw|
z)$@qcjFHVC6%j>@8tJ4zrN;PRE{P<V;lk|5GpC3`Wk1CdTa1qIoXL!1a@Rd1rB@mQ
zcp!PMT5y;FMA#R&5N{f<#4l3sUVni3<z*Cec~r_pqBh5-(Q(?|x`>79a)iSy2nsZK
zjiptwjA_*J`^olHZa_AF1*upXHsr<g?c464&DR68`QjpUy@m^Rc(^aXwbk_?Mhjz<
z)uc%VUPQ>e$VR9I^N3S#Hz}2EPz~QD#OGx3GYGVN<o#=%0ud}3BEh+Yc|beFdx+~d
z4AFC7bmV$W5Z6<w9H0esiso8C=JmQhb)q&{&+fv&L;-B5!N6O@tLHh?-=`HCtrpn?
z7P08D|13mT>q4OS-Z_;XLwSt$^4%hmS|&G+UAqpFxbKP}t~X|!l?r$jpD=5RXH2m;
zB#<O7#YiSSk{F5zDM18;UK9q#%mS2JIu+O-l@sJp8oe30!VV-gVb!;7zXMyg-j*;z
zw`WFAP!;w$uCs-Q6b!z%;h}-@>-Pht7g8$V6N9lBmf_SKQN3o$jpeUKt~5oj_tD=t
zk6dLNO64h7gL<!xj^Bu#JAR)k#YM!b%1rZYHX?ZD#SLyE7p5mr=PUL-g@yCqMsxLl
zWHo2tO9I#Yk8rDlXk1}k!;iH{yo)2Zkj^Uc7KL);r)U#J7&8}RoA#kn*+czVGH7{q
zCL`yNj*FNghLmp1SqKNW3xSdVJCV&dL<+kTyRQ2h)c}rQ_JeQG-ru}30YVu(V<&D0
z4vTz+Y|=r{%VBxs$$w{Z+iZ)YSh^CscHcuTbsY9)a#drR{z;A}1u<rDCE0GbS0`$g
zy>I``1+>Yv#fqc*aLuQm#`4_rSpMj{6e8E8E#Lzs+K!<Cx@wV0qlj%UZD;R=CF~<2
zk6~i+^Ax;X6WiAdIhmx_y0_up_M6%7sWcOr>l)l<^8$(0l(GWer)9y5T#pTO(kWlM
zdFMflZM_S#XTOE@#UB$9Qi=ikK0_e!4$`>^ltyj}-IzADa9i89-!6?A3rbo%hHDtO
zK_eiKAt?<wGoA$$q&$T}h-PaBZnb)n7M-F%Mok*|sL84tnvsz%s)SwF{y93kAHwwM
zzej8RI9RwhB^Pwk<5Fte^k{6h6lIEIV>e;P#GO<(%xQjyhdOPo?;&vC3F?h-?=d8V
zvW?`aT#l9blW-Ro4`X8YeU!i;ieSW-n%CyCWFHDUv1i{C@@tKSv;RaH(K#?OTE&qY
zsc+H>V7Yu1CU@UWV!ugS+eUYu@Z5Kqh`g_>EYrsMO{i!l!?3h)7;Mic_VX`%@ip4Q
zu8<C!%Ww-p>_9}}9nj>jk%7$11jKRDR1nEXF_%`H?j4tsBe#%fo&CA>I%E_<?+Nq2
zLu8icfX$eTWNwT$Yo0rF3*1h39Uq>5jx6q@Xtr&-6y7I<MH+BEAP%<dxYL*?E;ULd
zS!|uKKSU<EnR@`Cv?jeqWk{Sm_kF5ut}ADC`sCB{M@G@gP`H3E_E!EgebG2@Ay6SQ
z`u7OoKE57!X~xcaL?B356A0Cn1>;hV`c>J9cfTp`B>@`EX?$?{X%ve7;@W1Zqi>9Q
zXRn5!GHCOeHrD^~gcEL{>fG@;Wd6Vbo|}roVjjaj!S@dx7IjTE9Gp4*9W)v<Apt}?
zP81pRXQU)Ve#&AYWWd3|TWDO25S&@(V7`-xVWrO%9n1XSBA7#8OYh^b?h8Wwl&;sC
zAzYsfmIw&YA$@r5#}CoFv&iLixO6Ip-`pf~MB|vlt=t3jxp_<in1`@F7Qr^XIfq3G
z9CKS=6lnz5GkEpohav1<i~yq5Ni2T$+Mf`?W~HGBDXY#5x)k{0ia=yz96^*j%%B8g
zEY2y9AaQ8|l7FgWoS{iDopV_+=M3I>?W=+4TL~aqwfa6@{n5jcTIDhYI`T80us#sN
z<Nf!!68v#QK21T$IYjzA8=;RwSO!tg^v_(FHV($MarOcyp*1C8*Dxb-5<#EY5`Q|I
z$y9LTzQ?h5>Jh5lL;hxX(D%Q+^TCX}HCU{2<TnEzfKlIlsk8ZB3=Qbt1Pa3Db6l#j
z@Nmc8c~YvltzGiR)1}fR5#llIx#m979brU7{ZF0wz(xoweBKZpA$IBa630ae<bRNr
zkw2amjH=_@2Z!+fiKo%1|C&FZHk*)$iQRW$+l~WNY@DKWby7ZyOM%}^P6Bp`LBcp@
xna8${FyJ*pbQ;x_6PTZS6Vo65B$4B0`+tifMr@rUybu5Y002ovPDHLkV1nU)+L-_V

diff --git a/apps/app-frontend/src/components/ui/new-icon-editor-notification/assets/04.png b/apps/app-frontend/src/components/ui/new-icon-editor-notification/assets/04.png
deleted file mode 100644
index c87cd33b19f3e2e1c99545a93b812eae21f0b185..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7803
zcmV->9)#hEP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH01k9TSaefwW^{L9
za%BKUX=iO=p0So=0015KNkl<ZcmbVziE|v+dFQWtdhYwiF}MK&BtVLScuJNm*-|Vy
zi4(_X)owP~bve5!mup?So2}a2IHjun2ey*UR&A<sDzRgi54j{qQX<8a7>N`~iHAUf
zAOHdcW&q3$%zbv}>$`g}l$|`*a2l^)zxTfHeaG+nz8+>|Y)Zf{(7YBmo(nDFjQ<$s
zoa0E?!|-u#?Y<xgU>N4mwefy$6UV4y`+cipjC1zRBleX#RV15v+^ucmN@*GYQ1}4l
zZWX^sV}2e3hHX*&_R#bAeB?=ZyAGhmLud<Ny8?LLxM^{dfJ%42YjyAXSaE<LUrSeq
z$Mv5}9j)}y)2xm5VWEDT1&o8mk1`kWN68-`)y&~v#Q^cdzd8CF_^sIUK)nmpI<%6$
zJ3(5Ok-kk6GAs?@<!j}>aa`}Uv3=ZF<9KzPVNuhX3`h4I76?ujf4uuLG2%xMcpkqn
z1H@B*Y2o)VEChiHFFh=AU4Xth_2dmis+%({(1&0_o(LuydYA$8A?wWPQ7_Znnv^JG
zSo(M@NU;U{=12d#uQaf|9Y<ZGc<IEqk>~^=l)K7gth^&}LPq(BOR}uCydZTk(pYJ{
zaxHzca-V68g_Zkz?n$Sq(ysn(xTo$xy)Qnmjxjwa?uk@XD0ML04C1BZ-^QGK?Bf|Q
z?1<uzkNqBoTLB1lL780UvcM=uCeJPRiOY#YSe<C8PbHq!nWgrb=0eYSi4c8Vjc5ja
znQA-;o$=<e(wdDfF(HKicl5tXH1=hHILS-L{{Tas0MHN&;z<)(EIpI6$_C_*pwOtD
z4g>u}81qM*3npguJg-R;tM#eORL2>=)pgWEfnlsRulQe+$8aYk(dadJFO31;9Q`5^
zLKsY)*G^gHqN0q9e)_5oGSYqZAmnlKX)rw>gXS3aB-q<%4&RsOQ|Dy$XXJtUVK9b0
z$>VzF71xIRjB#I@MAf=T@L_y&?28%$BqNw0vH01k{|lkmhS1@4->X`ohZwAnv+Rew
zgdh_q>LvM5ROfEM`s8g`TwOGhE^u!?1;_r7{9F$X(2T7SYd|>cWdt0?A3a7{WC$Cv
z<LRs4K&p|2#UBX0_&=w98^^d&2u+!IRisol>f+z$7&XaYwEF_ov4#^<`m^DC*gE=S
zaF6Yv-l}15?*R4?gPqW2Wcf6F&2exYn>H5%bq@VoQ1&9|8!@b}h(3BGM*XN`tqd*}
zZ-SYhIxbv$;x8fOTR@kW&rl^!1u4v7FoJ%f0mH(kapX;HS+qY_M(~p{93+?EjZI49
z_LFOfPMts@c@H+H7Zx^xgTKkazcLIf@9I0Rwz{?_9gG=9n*f@r(Rr2w9X#{?H^4m`
zJp-nt_+`<p35rlj4~iTWbj}-?U|iV9gx*c^TodK_%h-;+1E&x|82<*5$wlP1mg!~(
zq49a7SFa;DG6%cckL<=0c86a_X)uVP)lb8bJff(94hxKXFfsv$_GsLUVV`vAgB#CA
zPJ=rWn5TX4nz7TdH#DoS=_9Kwz#32Gumq@^sLfml`_wJCJskvg9AG_hlru@B?_EMQ
zpF$^g27EaT%jRvQZoY-c#7TGuCg5=U5D0W(n|}w@^(EN;=~J*(gQk6H>#%yCuDZs3
zFdFeD$!vFVE;tY7`j>w!9PNxiXz|KT!N4(@0mgovL44nP;&nTg1b^-W*rszNRID^r
zE^~mrR8g9>>zhV9ev0sR0xqW$l}ZI{ZW-LpyI`6n*c~>EPe$N$aMH8wRu`RH)3Dw+
z4NKi;Ac*O^H}hfe8XYDhN>i_JDKMFT_pabA+9b9ZMan2j#*>vNGyg5Ki~c#Qs6TcY
zw#5zDC@2x{cge2g(g(<AOX%7{Xbqf4*M9^aj~k;SBjBu76!-VByPHO<R)J;bJy;6M
zurn=;PDJ5#S+zB4Sq{wAM`3?(j2wy0uuuJzRlVm0GdyPv#7NH&9I22UU>aY$DF~TX
zA5&&Fahm@18N;(JJcz#y=Jbb%4tkN#mErTdB<CcadYiYP6FG&>z*%C94T+Hi+%7k=
z>sC~ETo_!ez~=5Elg?r<ok6!&1ebglmf|u3VJ~7~7jnfK9Cj=0b`Bdin;2Yu0fUW&
zLwhpX31gJ0j?>*HnY_3SoE9_~p6(y5>C+g4pZ(EIIDX560U?f7{c(85PNK7U15W=S
zIEM$B_GL7K=fT>YNDK}k7z}_Z<RB0O{Ba(9qXUbTM;B#81|0|lk06~%BWw4eQ$K^k
z`pekQ?NPXE$JDvcz!ivM$gza*SAr<tNy73&H{7jI-+hV(++?E}MvJ)_#b8)|fAM!;
zL``;os()pSK3((wF!|JGB!%3mSCNgqiSQ(ebZi2y;E;s6T%jRYojw$I?xMJQ8BAyf
z<1;7V^?AUi9>DYCmtd)uAsm^4JJzP~wT`6!4^gw;g}-|iey<;XzaNb*i<*A{yv+-y
zoJJ+RPLdM9;M{3g?GD_(_cAu^ufY~<!BLHa>DnRVf5x;|i5F_%CSd{PzK4V5+mC(Y
zMG+#xK&TXus1GWbUAt#*pmvJ%^s|>>4Ohv{`QaOy17~-mxAARqfs{+=c*aNqyprAv
zz5v<_r_i1{N_c=ne$@lJheb#@18?gTEU6Ui7vF@{<3Vs@id4pm8skUDKZQ>90DNT!
zo<N)!>_)5EghR+9I#)qEv5HQOM7kW2MO>jlP@uFLE}Q6avEbyO!QjU=G1v7+MO~F?
zvh2^?fLk=gAcG|E$|wu^HH+OvMzDjfK-}lMI%7l+BHp*M(h3$EPuN6^LCCOqePBpE
z1gmWPI_);v?GB_TC@;|{<t0chHk;LsCY`v2LTg*B1>rLnQA)iJ?!vFa-H7WnDdQQz
zpwdd<#sNB4j2fg}tGNpjq1D<?F}!O>)Ex#(>8En3fl983T5$(<Z|D#M3Y#Ah!d!tp
zd;<PJKxWE=HF#e6F50svfM<UV?l>7>p#(SkeOkkciubFiKm9yP<uW#xmg$rmV0W&-
zzIO#qmkSeTf0^t{M4D@F<r*3X`-p^W<W6m<)mpgo;6B_!49A(z8EhD%xGsacR-}Lv
zxg(t;!vf}WhaQP39Hg)8N(Kj8`-sj);RxB`@<-te4<WsBSweQ+p=ly~3GP4)zW5{x
z*<G}(e%f3OPNxIiv1ydP_TL~loI0Z!ADN*q)AM#zDD}3xlfprz3MP98HgbzxYhPMC
zK6hRe8?0acDF$ZGA~ZIS=3Wb}j)2SWZlYVP5SkYV<1rdWISiE*zy~>^<kUg3FJ(*s
zN45ASv7wW1HQPvCPl0uF;37`6HeV)y(jjr}kf^T#CE7@9od{!LrQBk(Qzs8mK{{DN
zsoqA=ZNmZC2CJ1$&d#EEP=}ZLMCZJhEug!f0+)Ih*2)&bAt%DoIEuwOx_j>fRR{Qk
zGMa096uNhi$_jYvN)|h0JAyP<BIFV^#Q=(!o-b9sWhQZ2ysQov5rQchXAm7$_aq`C
zs{1YMJ~%+8(8k$w39`%{Y24sY2x=hZ3kc*2H;{Rkm}GIlHSr|!@4XDi&;nYmHfm`)
z<;kZ}*t!bV>PBGfG-@k9C2_Z5WG+s4!7k0|aXU119CzE1%h&O}*OoCgdk*24n?57B
zb>kB1xjG!J20hRl1oZ|Gvb*P?x;s;{(U5;Psep_bDz!FQ_YO95RRkgf*xM-M?!hWz
z#|99a4rzG|wZ*t3gn$Ls=mKK1v*=F#XOd)xbg$ib4pxU7o#Q8o!5q4s7Pd+=7z#FE
z;~4aY^R;FdOINm#+A5$UP#%G^QWWWwAomkbzku7f-bV;AN`uM9?@&ELRSAV2P7fX!
zGo%7@2pWraJSQ5y7K>!2jQP_~NH<($oK~(~M2FwS{$`$t96&JP(Kau_VG)XUJ8e>p
zCRu%lc26W;Y@A&VeOrVAMUT*|H(~QSwB3+)VQn>!tvfr|uQah&6L9?0DWnKjh*9j|
z;3#<=D~_Ew3)i}bB3%8@RJbfCCvWWIWNs*^2{0KCNh%aBir>pSB{Fy%xgI;tJ^x9#
z91d_6jtpEG2ZB{fC$vdAQXg!gv>U|0e4I{)m58raNr!9q5I=GjAJ@8_4gsibxQD$I
zEQuOu!Pa^KcW-Q=Rc%SCS0HO&sJ8Lp2bWN;9KaJvAieu8PMv=m>-Uz>NpU#tJFlF+
zU{Y~4kWoyYY6Db`7(!n|D6HQ1I5{}uLpVA!PlS`L5ODzYyIek;fA$5WZ(M+bku$~R
zog&J~Ji@bsh)xD6HlULZ9+&1x-@AgqFsTCBfKp}?@u`!@Cs)ZvSm29|(!CLQe1s0O
z4cvZj6OBSeQazE54q5!N7#$L$4!RaJN1s8fw2eSJFYUXO+kww@#-O^Yxa%hm-3%(R
z0Hf)F0Tbw%A=NZY#wpOL?;)QFAwDz$831*q%~|bstmkUzdKe6dqAM|-MSf+M@O%bL
zlyH9H15_J#NIHr@{yGVrAYlpX!F80$6NpS@GA>joa=dVh#ar)OMZ!-~##%5GaA0e{
zj@?QNJQ>UO$Z0gFJ}EgS<#0Dv?_efkgQv<##+zYuV&x`i-cITlnTme6S-my@3C%!u
zo7h>qBZ;E4I&0D5gtMRe3?VtcydyQpqGM~d$VH|q`1?0jv0v<9Vls|!#Dh@OOV?2X
zNiK|xhAEN^;L7bh-hMBKX3dGk<7Ws4yHKWR@`Kbql2oOtQLt1_d;*qW0>`GuV7JML
zu~DyLXPcx*l4uxW8df`4l@4QWlhdpsqksd0-xL%JsM%3gJY6STUJk`v2BAnyiMEJh
zg1QH#0uBhwq$#AGicpls(YQt%jb;byS@IYI2`s(24F2ReVsjC~`AWTxn7F%D!Ofqo
z;D!jY1}CIEfsZ1<V{^w*DD5M=vyXagfs7_am9a1e<6#)1RgU(yI1-c?AZdP&K^GX^
zzG)K9DmXwoDFKEum@-H)|7t}?T2JII1vxh^ypHpq{SqAH0m}P%l=4|@EPsTGYn+C8
zac#4JLBAbU(pL)M5FMMq!Xt}#u=F88*c6KQb`U#03<t&f*WcMdZo7bNqlL-Id3Z!A
zQshrWkoWfqFASW-P%MUcJVdE`4%>Hq7@aF=LTVuzEXJ6IVKwii9<G@sGNU-%D(YgP
z50L{ULEDZz#%s4=eu8pzLK_e6-X@e*L_W2S`uHzNF0K+i3ERPa?51zw$m|TIxSSZE
zT!2^;D3K8>kS@<h-N-DZkS({Qzr}gi2<`cY_0`1oU~3(1?+A|19wAgo{3n>Vw;3ek
zNk&y<K#!YOL`nfVvLxu4A%jFn0<Az{Fb^w9GY0da`cSz)?6KqO#W$!79VHxZL2K>{
zh(rhA_4_1nvU=Z!s%HpgZXY9*;gw7{8O#%>&my_9gnDrsP7AB8v`=bs?$L7;)VQ>R
zs5Yv|`sQFAn1qd(J@M*~k$(IcgoZsBoY}|2nub;xonZMiduU`7BPel6EjDU~qo*p%
z$ZkjjPNHihU{mHouuMIT@K6F{V+jmIDfJ!n;_*`pIC69r+4K%Rx^_vDFjh2}qDtAE
zxV&{B*ZpYD0@;aWa&<1NQ`>NpT;vBgF2h1`|3EYfOPhk8(Ft@YTxNZF<U^MX=P9=&
zrOjGhg{7>aINC#pY7b-;FmcWxDvVidSg@+G*TQ5eq$UEal<qn*H7e^HeH^JRI9ABm
zJ^dU?Q|D0M{!sQ7;(G=(J~26s4xy$_@xBbgI2#s^&Y5b}9fHJ_@H{bf7EVHVZPtdZ
z6X!s<3;VvSsJb^0FQ3!KHz~EhTj`>WIy_{f*no&9jVCVdm(|05DQPOJ0ZeHyrITeC
zZ2)V)3L*h50wFE3`m9m`hvIfDd`8aGQ##8-Ob~B*LQ!NbF}(Zw%c7-%Dn{c|NAP~~
z0Cxyd7s+!N-`^-w(&O4a$^`_bC}QLkhOk(=Fpf&z1%G`8lWD!cDV-##-PtFfLxr-%
z4v$X~3zY_$34qZKss&h9jRqCasK0OkwV%;lA^HAHv55l_hOSX6YI1?RfLFs&!;aVB
zX6~co^CR=+-;|yo9*Sdr@iDZ#!v<`?NOO(O9i#X`fTL5vjpggelQ(Hltk7ulsQbpT
zFgr=0rh*XRj&7T!z^e<Vw*zO{gTU=&7#l~SwaA1=&pbsTbX4CnqrZru(xR62H5;IR
z6w9e{OM%Ji_d3M_`&2&9wmmp{_R|<UdJ>5s-QRy84L`sW5Lh=MIU81P460rec9#bw
zN{KIj@E#hqs`hTd#OyIVx^N7Xo5UQ&{Wn)`VKcdbd&LI$$gBj7M{Zt*vtEbY*}>=|
zTjXV$2ol~8Qf8@N+at-_-An3ftk5B6we(Usqou?cUFUl%ExjIwJQ%{mGw??S;iE8E
zY)*2Co%`2u{nh{;S(uYHZM9RnY|l@N6k*Nf;0{Hw_{bbqfA|W5(JZOFO?vO>%3H4^
z%-P|$angnsqAa${1u(H89GMuE=FcuXhI)LE1g428%bQ5!6lx>mC>>p(2$2vb>At8W
z9-oXIcDL6kOs^9nP2ha&6kMD`OX+E}84lg@2cP&aFES0?xM?pxu&U1Mu$UkHCv+`!
zxT$_;rG%u|>kWjd_UA(?okJ`!E=7l&ql>{=DtB3U_%FQ!&)qxd99zIzja+2AgeK(>
z?@}Zeuv3!rphD?vd3^_G!TrFaXoaRIaoUB)McF2|N4jTa>IhnQP!y(7qYQI0Q^5TP
zDJtnzFi9$ZY<7+cG8x1yC3G5otYzxBo?n8M@{Gft0qA9a)zi_n%c8hJE%-5{j8)$W
z!!`BS_cK_%^0uPSGFP2W$_;M)3|p%!Xpy^W*f){(y(--+pLqhE#E5K=Xm~cgi-YaE
z1gR~U8}cFIcWSaGS?Wp}&5f(bWOGRFW>6#X7hOwB@L;v|8KiP8+`PSty}dnHvrF)7
zUx2GyL7ifOr4KJjkX*HP4T@XdNWP6fy!{tgDy%?_bM*X&Y6HNS)IbLjx@}M)^2ngL
zX_j=kA`c-ZcmpBKKk-YbRZ1wAD<qO`l>N75sq*<yI=LuaTa*nrZ7jxP9+`ovZ&kir
z<xK=pg>CB+#T04mrgrckwMPZiD(<drV1usN;s)GX7vQO<aFk+&(TQm^swFH8`(fwg
z<gOOH(bqw%j2~^jjvsBjj=Y#)g{}geOao(ri7cze0MK+pjj6>PfE_J-bm1p><Wrv~
z<K&W_iBLwyee-*$xyf4lPGO4wnuZ#ijV9&x+cFbm{gPgjgQ*hDN`ce#<Q%zJhB8l7
zO-{arO5_oeC?~Q7Kdg-+JjJ`P5)q<%Joor>QqYu4ZX&gQ2a97tjRw`|=@~Hww~P0X
zYZma8>CYix^+~*!@&Vc_B^qWHG@og#8ALLlLq_-se7*`5EJcD0c|#gEe*84n2-n}b
za}UFVF^bq2Y$tb!SSz-+sp7MHmGr#^mNSIcj1IP!DaW`tU_&e#rqY;?5~4N~^7oLZ
zOfbh-;i&IYM%fM<!SFIAL$;^}Fq9aDmF&e#+#{vLcQPJSigDSa8LYV7V#E1?Q+R6V
zjLvgW;@kf#B``%^tD_rRZv-Vao=$(q`H#p)e@anW8Dk4iAP^mr=IgXtSpDc4_Nojz
zVn9UUEY+*fCSb$n@50^L$Kd2F+!iu$wQXq=$@}}rr>V3hP98l1Kb6j)8eY<w;yx8#
zC?-fH*C^RR1yv^%Pug-RZ<(Hp4^oMpPSws+AvQfj>36>=o)NDfrDW{WLyyB_>v`oS
z#3>S>1O|*|_#nS!X^;Y`PY~<ub_~~_M`-&o?6<#zLS`2Zw^z#LEnofza*LD-uhmgM
z*hDLG0&H~;Zpv9$_#zgc`#hmx9y#*$D{DENnwBd(2b3^bDb(=EaUan0%8i$>f3uP!
z$?!?~Bi?pXSlFeD#gPE6ZR}CuWCqsuINf7)Z$|%y$ohY3_(}2-Bc|-I4*40mHpnpM
zH)iELpp2VM(V+$?r~-^Qp0a%lm1F_;gulbm$`7dg?L&aX))uvswXPzwcL~waSwd(W
zCZ76=6bpzpAV7J=(8v^>v>eZimBF#$30*V|Jh*e`1~|ToNW^2>W2eKACm4jSnxLoc
z@&ig@*Gct<r-sksO#Cs;j)`?aL8}L7B2Fss?Og%IuKKr`5lWxXb5H0q_IC3vw8vhf
z`h7)PL45bBP2sGc!dda?1VIN`;vZLD{Y%sfE#xY8Opeeg+O6{0Den=B+{$j<hKE3q
zR7X`Z)R~eG`79+>J1(6PnNBQ5Pv99!nYpO$pza-lpnEqXO(Dub7XHVY;Hx?%kvEFE
z>3y3+#f2X71)1|*LR2Zo>nO$EAnzbQvrYkzBQj04;<PqSK4k&7F207_*H<Al$pcUw
z;LORh5>{|HT~aOK+DBI~?W0Vw%PNHrg{lqN{86-<!9yr@*fWUd$DTogz8~7OVvi`@
zJWB35EdTb=FTWVIhP2W#Ysd>|#H!c5_td7mqRLWvJJ6YfuXGl53UJzvZCGs<0yABN
z6I0rBYKxD~z)9GlL2%hYo?$t;CDjWn1Ztd=MQW9j@H;rv+YENI6O?(H*G^rQY=-iN
zUc4~&X?%9#)9?{OG#!%hqwZh5P5ZjvcmT^MXFl=bvA_{JK3T9$nG}XOe69YiKxOUq
z8pF4hfKafxNHB05E!zWfdwHrKRuGI0OOK1?FP7}W%GI~Qm&h$vt3;@L%DIwQ8S0Yt
z&tuR@c;H|FxdOrCmS`|pZ66}!ethr@eq-iWknkE#on_2>HSU)&FotyMo$M8G@9*8f
z7bkw1G75$Pf?#-WNVzt>fvBz~^f1XhKFXg&H2VlPm^ZLq{VPl?oI~{>hsu5q+Z6eM
z5L%a@tvc7R*NzY!M7dqZdftw<<qX+PKYH7kZw$XO`5eN|kRsLsOfN4QRo1va<(??z
zyp_SFy$`|6&paYr{L;(t)m_kDtLkmW0%7lfUMs0Fijh#G>X&$mcpeO0#ofkt(4k6>
zC;>+(7Fho%hvIHUPEe2<9Mo+{m*yaJjk+u^;J5qm>r*cf0}?PGHJIX7Z7)iHudz_2
z!f(NezkU{6iK3|=uDyzXKmAqtw?R53hZYfYdb|dhlm!^WxAq#TZfxXl5kHVC+&M=!
zVg#G^AHWg6DNSKfGDLOC_!P<$1bW748mkmMMO_h$QCJ&y#}IM`G2|YQqPrfB_YkNu
z#DG#w)KhaXMDyQKiLIi%E>D*8;#Yq{h@>mNz=OjqGqheQQIUtq$!LSoS7NB8nM=rp
ze~69ycd@zdChdL_5$7=Ct{6sq!(`Qm2)<g)4;t6*J?TSz{hFelJ{F(&{;wld-j#!)
zWMvnBcKf^d4>KeMwH`>UiN3M`%b5EagAN$SN@G~`yiTfp$8jF<+<AnpYk2m=C>*TK
zY;e`Lqx&)&JwNtg)OhOWG)8(e?2m5!sYJZgqyB2lXY=5-FZ?xzETnr4S$BKqQ?smM
zc2!gb_4gTKKWo^j@oyf&A&C{mn-|Qlul9S6RhTNRC9cWy+C07Ew7n_U#&2yOl&MN~
z(|GE8pVxjyr_m_dg0H;tyVw!-NJm%&qKd{#{zwc_Z~(99Jg<yVT?@|~zGjU-o?>LT
z$;+TYd*1k*`jITPc5pHgMvP)yTYDbz3t#FuiD~LR8-o;|##dkcPp01xnhsf1g|EN%
zd)O5+5)=APq%0)%u}WUN_dcr>R!mHQOqBGT`eA#R(?iT5f*D!*)HzwjfNFipe7#KN
z2~Q-2G`{}Ef7e7`<88kmPA13z{q3*)e~j1%<zJBT^4r%E?s<q&GaBPV;%LxaRrJMv
z3vIlsykucihkoL$KKpU@O;Zm=#iYN<;_o*1@TFJ&BN4xI=&^_XbXJ_?Tc>{q-#qzs
zNWprOHX`6-n<RdH`(#5Y37*6NRw2wVu8&PPJg33p_gPQ-Ta*^Esj##7^QG_L|6KhO
zQt>kSwV(UrX;B)!b>?^Qh1p+~8PS0Zo4dkcX@J>_vW&T3{F_(6lzgq;RivV4C+hQ>
z)Ch;?RSB0U7kwHbylS_M@2|XqKfU$czNe0V2?Nw71|82$JcILz$8aos1jD{TN^AQS
zf^gWP_p|Z_m#B#;9_|$$HcxL84S2GY!cz7g-cMb{-)~%a=!y5Xe+JaO(hzKQc{Tt5
N002ovPDHLkV1j^Wr%M0;

diff --git a/apps/app-frontend/src/components/ui/new-icon-editor-notification/assets/05.png b/apps/app-frontend/src/components/ui/new-icon-editor-notification/assets/05.png
deleted file mode 100644
index 4374b9ca3e875f5db6528f55e30cc53203c4f610..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5640
zcmV+j7We6iP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH01k9TSaefwW^{L9
za%BKUX=iO=p0So=000$(Nkl<Zcmb_jd5~PidH?mBnVr36XHV^}c7+baAr;~_U=eN!
zglz89k!{J9qLLV6s7lH>&R?;y10+>AQd|{d7swcw0TZBX91cSn98*RVhZTdg0%<|g
z9@<^)ea!C8%<J^)^XoS=66JDBZ{M4KeSCL+-`D-vvgIdoe2NmJ8&G@V2Bf>sM^)<@
zBs1MeR5#f7oO3W1Ju&Z@zK<8iT-)e%{I_c3j~O2(sw>V<qcGiv{L#J0_3c9Lz$*wB
zrtoPBJ01a&4c%xsYb)y4-h_OR!F&Po;vqvZ<OFDUcLa%^xrdyOxN8g5G}g`#4`s%+
zq?KJ$NrqGcs7`WJrx>R9{5Qtm+>YW@KmIHNL>zCr;OoeoxfL^uz|2B4xzEu`9HHD(
zz|*=og7Gm+2}Q>~o`gkxk^xXt1=Ln?%)IpjjPKem7#8AF6CmRH(pw(KLb?l6^FU~j
zfWyQBN3m3p#AblxEWx0(4SiRpo9*Mx#Z@apZAOR@!IuyfnQ9<C--o_md{Ib4U&*vV
zydu?hsziP+-Hpk4Jx##m1p21t7grD%xs`lT?*e_9=cu1(7meZCsJb9P={t!9mzVm@
z$vby9G?V@H{InlLo1!4ZL{3OSster$r>eF!B?Ry!AlcA`uG@YlJIpOIIZ;Gl$6&`7
z%Jgz#Yyfd;qc~P7zC8Bq&*Pqby{GTus^Yg*?Q4@jeW4!%LK5<mP7<sHFu{&)f&5%m
z7v}St+xlH1P`}lsD4qzMG(?0l?<uF`xboR?E}=OVXioe68R?^b2lAbfJ}!SV3kSCn
z<NCt3HSMD^Uj%a1U08bS;|R#=WeL!{{x0NeBhIS<wMlj&Y4uK1Tu;Ufy_tF!Xt8&f
zYvbBMtB?_4*GK_x^qE@@!Z5_V54bljmvcKwa`P!wi%Mk3^R?Y*S^ssP09Dy;G+yvE
z%;fb1QZF^d1Jz1W)ao~Px)<p7MCW~dRrSthP{}bWLv%jSM9^~u78ZiMu>pabUm?kz
zO)(cE;|38CI2zB{hLphB5}^6QyO1j|ghe8ngt~H2`Rpt$)7)YD*}e}<f9BN(R#d6v
z7zyzu1toK7I6P_cZGw8wEIg{t$3sFSY|>0#5aHZyiU5gp2HABtBDct$7)I1eFv~eB
zdI67d1HODSWif-maoyGv$+BFvV`)jV?YMoWch!dz2~}ey5={4VFuFPxgM(vMs6xYO
zH%MEMtUGxl7KCRPMqCQGXWi+Yk+oNepw?2({Uw}uJ^s>e`YVo^dHiurQyu{%5#eEc
z9Dgd)Hwa==7@NQ>U%YX6ssWkR8<4DDejf6AGH?fwaZjT`te532W6mLpFH4-EbYU}e
z(Q~Yt?!i5Weu%|H3J)&72g9|Ub_B&*9wWXbofdKPm&rOckujFcwKWEtz#9EtEHc!u
zI3Mhi?|i`L>emV>FoSXra_hWV6e;K3fFQsyLkO-27;;xvpP$0ELp$-s(O;t`si>YW
zhS-_C8c!_Wf|2wRi>&Oy9cL9X+`0u6QA<4d;^Mj0+9pILiW@RBd%-sDnBXIe4a(hx
zb2+#-pmSo%O>8K{0#-KalM@OHdwt(ixMS!^v<LGgvqa@%WbsJHZTRKV>tS45!(~HI
z+RYMN`RTHbYhv2~3m}s1ppLYot!f%<(~m+vI0a%=-7J-SGzzq%zE+Qz%0w+rAAbk`
z@bM3DT5$k&srD7tmQd7v$XoGmE5C+!+t#Z&IJc@{o=g3{m^5gWV??TrL>YQ5&5F01
ze=G<v?S?dZDmw%O(a^2E(lF_Fv|dU{=s@e5JB+(~{{xrJzK>+0f+ed^3PLS@)%aKV
zujO}OxVqyQ^TtFz1}81?F*-9`5#Y!SEb>%TTphe{R@D>T^6~*96wOcL_JdDg>+rM4
zBnU-)a4OXMWmedxoo(0Q>6KeBnaqN*QXMxU&3W7?`*_8}@Xn0*`}s#WAMlbVyaJ&9
zz)rM?riux!>U$1f?RyMMgE_>VmGa{PC@a*y()9+-_;L3Zywth5Y@0G@SD3@qbtnQv
zDnO?8xQ&Y0961GdA@Q2g_i)$8Kf*Z+y~HQ~%a(#jYU~X<aNnA5Vt>OLw?c7fS2#W|
zN0bMlF+$WP43&@2Q7<I+nn#5SOdnqut%%d5PW*3K7{=fAY{%xQU1Di5vDL9DU%8EW
z1}aNOWFI)5X}%0US-B0vH60}*IvB}1V=SK?ohuc%c4x>3rl}BB0@x=+O(BOH5B?lq
zKJpxzSRUm|B_gm2ZH`q++l>|z_(|u@cxKh@SPW{8*@yZ7rbH?bNJcVf|6TcwCR@Y2
zm><?}kLpi7@Djf8#~&gaF2*K|8@+PKma_-t>f_`1V`T;5Klk2$V)=nr;qneH7I9G_
z3BpL^8sV8V?k?aWsuE!&Ho-oK{}V&wm>HizOJ_5(O&J_ZY|EFpG*ptl(s2(Tox;9@
zN3d8ZB0M8h%;P4;@V!~vRf8Uq)goyqLtRa#Tq@hq1w~9RJ1PScWswSt1q>Y=!o=`6
zI#zZfU6sJGIT^1z9-;jAV>3DQi225+a#|uu2pkwyhFp>C+DMCuJfW8Cq(PADmzL|)
z)dcfAEO}2r5&$fek=sHpkAr&-qM<d5*7imuBWK&qic)S@LN?w;{az4`(cazx^bJo~
z#J!ONjVp7jmEx*;AL)7s;!zp`sECmh5itWR>M=&{&`XY)I?5UFgeH<A#FP-tNG+O{
zHltY(gYmdcC}#vKt4u+R**i3bUcvRqJEU4@egqnB6Qx=;Q2%9mToS=ftrI1pLsC9y
zQIVl<NJQWKc5W6S5Ny4y6Bd~Vp(JJ~7T?jsBbXeXL|a!2GTA!qm+~@5$E8C*2MG*L
z%;19$`;f~mYE@*~77`esq!DD<OC+GP(Y%yk+|4E>z-DH2`q~6DYBKIJJKS+h(!!`f
zWD_DHC8Ej1?_xx-P<ART<T2Pgh{?u!w6E$A5n+hR2F}$@%rD}D-Xj=2I%$z+WwRp8
zNr85R7)Vm5j9YAMh9pj4Y=9n1qo<8L2j!I!9p!g33=3R_1>#E*N-E^mlO#W+T1Zoy
zP--zZF^iAi-H+_j7PJUrB&*`~K^3tTfu2u>@X5gufT(2&+C=<kM6(HS&wv|MFpd08
zB~@>*Q!2nnipo-!lXMg@ELx{O5^1En#&h^WZ5r3tCWJ&7X%Ik(tKJYo>Y^gV<iIFq
z#%9ng>_bzFST^%TIc_M%J<vaf4?h`1Azx6OWR(zCFN&hgOCs6-tHlsaVwh|s0ious
z0n;<w+%ESfq*gY-BrvtDqFElACgYwyF}X1^D%56&NVY$f1MY69#`!5>YlTGID+qH@
zI)PhilF|UNFo-OJ<W6y65hFq^#`{OnzPuf?0+`)<4`OyYr)>;DSc@l%iNXgWLj0-N
zq8`xUZj&)=f$8UrqKOub*jxTW<u;S<2TDXvYLv;@Ygv+p(uk+-8>z#$CgyQjbrN^f
zr7$Dv9-htPmjcMYsY~Jtu_Q8K)U16FH)$XC58zKDlWzUix>f><ejW@J;_nx=$L~Z|
zORwQDkzD3hEkAXp)W*8PCS}Y_YFb}(J1j68B*ySCxM$JnH6fB)MsqlG)0If4(>NkT
z^Se`dA*MyuFtQg3MGTg32r$c)(h}9p31FWRWBl`+MxLxj26+n$)1GY%59Z<Iw&wzA
zj_6Jga~lkbAg-S7{Iqv0L0em!C5+{S`1j?lU%{h0AH|iMHp=!>QEkFf(-J~$FrsWx
zyaZkqI{uH-1w1eAg)*)}ZCx#z8nZ+S;Pwpk1qLs!f!=SF9<2kwEPV{HD*<4PgNdol
zDsj?DCt=5q9k}+|YaJKJ7TD6x4*b)-_hS3@?<3REuDF&6JVLOf3!km=)n%^`nt#a^
zuu~vDQ-(l+m~6wwO}Ovd|Bj{I-Go7~s_G<!**a?*G#-H(%v~~?5<r@rp-4pJGox)3
z^Oh`W!#(%hjmIDV8P5I8XUd2i!@70r(0|tXcyM|VL&ljBgGlF#2!LVkxM;I|p@@GK
z$oGcjMdRd?*W#Ps`ZjL3>2@IjbvXL=GZ_2Rizw!%e0URXkJCv2C+e(S;Yb{mpUg=#
z=yaXz7C6Zuq8oAh!3XZgE3dqQM;>{^ag{m0;bmbTUKdE+R-eMH!cbQ8=)E)BQKI|>
z!R?oX@4MjRYwbg8Yddbe{YzN8cAY*{;mYKJU6?zv7mX)hgv_dQv`b`c6d`lW)+AxX
zmct<)pWUtk6+Cv`VZ(+Exb)J?@%rnp;o^%g5-w@Vx}4F&qWJTeSRGyzfz!77G&a>K
zhv-d#^v}hH<%H*pxKdM7hbykwgv&Q<LRGTLPD$HE{R(qaIJ*1SnEdDsw5+=lbxYNW
zkciG<=+xSz`J$~r=Lj(uH27GO?GFa;AVRs46ng#GV~<Hm*tTseuGp|q*2}OV>JzGE
z^MR=aJTF9jI2U3cFE^e-@w4kM#^<lO8JYTwbIW7Rtm)FFFgJmrT~DE|^Axn4aWztP
zSrs3E>Da{%uN)z@|EG{O*3sGF_?+eH{8C?Ehn}8&xc~kK@WKl(iq)bO+PSo0YZQC*
z2yb#EB!iJbSFJup7}#5|V#SHERi<*$w$7H>!F}?IRHEh7i;%3%!Z-Ssq1+lRv(@DM
z0p<lHc3BK619IPe_u-bCZ<d7Jy?ZxKIN=1``;Bj)L#_rO{e5|l9<$j-d}-@fap#@)
z;)La^46Ht)1Y^ZFdL)M~cWSjrRHfy`EDp{{v#rl_J~Zom{rKKqxkHW7W11CkLHz)(
zUY0|)zNRc8hK7dl@WT&d)v8t4vSo`1Yjb$wi6`*nQ@_CCLS*U!jEIOYDmB&BxcJg5
zap@(SP+e1Pm#iRw2e>_~A@0+2v-sTyhw=8Iak0Zq;MM|M)4Bp}XKz9}+W{JS8&7db
zt+;P{KIFqWUv!vFB{8cBB_}&Iak4=U8{39)QD+{hRH`f?#>U3b+}vz`4-O6qJFycl
zi&bNIXcDKNaW1aA?shabHhG9T=Zv|tLxLcM{36~J*`e3=4Pho<x>lxYGiW<=GwQq7
zI9Tnr80?l=yGT>8ul$dYfH|tybkTFEBugClfsyvg(Ulm-ZC!&{-kcVOFo{o7-hcmn
z{PuS}SiSmWIflthM`Qa0&`Y&|ymxQ}ulDrg$kZY=Q;JtX3Qec1NAs!c!BSNYK>eOX
zMe@15F3JjP!{<bRdpaiH6ZGZZ*g%oJ7$`R4p+k*0YitNtbxfnXu?oj4r=7MA2m3-d
zRhgnxnPF&R46p6!L(lM>wIkFwsp~umOV0WnlJ!|IiVsbUGJjwh4VnxonC~=jlFN%9
zRHjxUFjif=o`0O{z`ou_T$mZaRm%#fu1@2ag&`(iKAbbcZv5e+KD^gAj>V9>&|SBy
zYHUOMS({PYvC`k94G7FZxiiPAsC@xOpn+QX&2p&C2I=SyCAuv#N35vikjAUiEAdv(
zJT|u;!Flb)iuQq(^8rLfp;*A4j|cI;2Z)|?`x-&28qI6gqvezfMJ_TR-f0Xzz2dO2
z)QOX>uxv^a36u<eorBU4CjKtI{WOhgJUP4q?@b=XH65c^)|8gZ66i>DC1j9#-akBs
z-|p|n&<xpiGVR2l?1^WiZQTYWt82VuM_}2dV7I~&a&OtT<{;V`D$LIa4=|(7@n}el
ztLS_NpThz3Es7B@Z;zhoiG_Q)ztD<@`dV<#=n-sepFu}9?Ez!{PE1YV%>#Yddvq2d
zeJ{pKWtvdix*XZnXN&tXyBt%gFe=~}sGk!Q4{d10b75{0$%Uhbk!W8d{nTgxWo=zL
zNe;r|wBv+Qz6cvNQ4;~w48N1>#7Bn~aG~%YF7FPlTFlSS<DEkT_`gA+=OW>etZhJM
z$uguHJ5kfph3ckG1Xa|QaBHtj`0L={9%)T`$slVBIHJ64Zm1v0sXh@wb*@3K$SpT5
zCpAJLd6vthrgUg*g?B=v^dv?|_8g{o8ZXVP!XJ9(a9vwJ_8*<V?%5<3n@`7*Rqd!-
za)Lm%7PJ_NqQ`G2vYt2X*%Pkkhj%zTs!NJMX!6irB**r>g(aW85xLNLTt*U%J|(O{
zB)K?ncXZVRNSeYy;Eu}}f||WMotVWWufb1`t_C|}H5%awtkq$csn%h&*5lClXv`g&
z3XFkZu@wxE@SBy+Y#FAj7{>O$g<$Bt-+(PnsqC#rC}6$=LM^Mw9a^8BsXF^%gOU-I
zk>PYK=5$scn=c7+Y+h1l&a^Y+=3>MvRHTweWo@dCTgIp(_RND9a7XadLIRGw`x^v#
z5kn8W@hs}9m|IGWc<E=O%R$nu(}q|qfc4Em?)F)4xVm=k4r6TX$!_MxCg*`^Kt>5~
z_1}uSlSX5!7(vMdNFrO0{x_bH`2&es@5?(;E$op*&~VdCZVo3W9IO0KVxZrd!_3gz
zW^m(}gUbo+;+pmeGrqoiNAd|0vYtL`Q1sk(Z-ePM6B>pD^RGy%#QPe7=f3B*D~X8y
z<c{{?pddmf1y5X=79(cYcW$FI=cjW^T@|TOHBfrZto<+=?y@tctwqR)E@(KeRWoqx
zq~8iLTc_LGe-0MYE+ZC`1JCaeIQKgOL}lNz+YyfUqc#ON9jAbSOyu_0p>@}Aj1e(a
z58M-7Fp{cfjOaD<<}~eSrr8&NIu|3)&W<1kcXhO7DRA8P><)vrBS2&e-uT{MgG~-V
zZ17n3IR3qlSx&r7krJtKK$_e<y_mfdv1a}_31Um!oXi`;&FxmCsHpFfIQg!KNxe@_
z_2c*7+v0sg=;d`Hv3TpDzeQ?#Kz1<cWpl8IIz9ALmH4MA)*upNruwjwD~Q_@qwg|3
zPwUM)myrszT{3ktogX+!RCYydo+JhHCi}7L`+sjmzbpZwGIgj2zyHn_1cF+b6qjFN
zx)UTMrw*5yp_bZyu0jl%&Fm1%Z0w0u54c?@Q_NnU8Q)u-^cXClby{_ay3~oNJP~pJ
zyITZqd*kRH<I`Eud(BOEWAzPp%1_Qj0vDkM$U#86`l&MuqOIdLr0@=5=<#@HLRd3C
zCu6!f=$vj7)Qzt;JR#Tl$etZ|aVPdZy+f*axpLf(r)%4~1tIRjic4<9e5lUsL|${D
z=y>S?MF*#Z0AR97h&`90M*I7xK22XrsOWFx3`JKu%1?*@@9^tS<D(aLVs7Nm{CGNE
zQgsdJI(H*l*Pe&$iZzljX;F8)524FNjjBCErLW23ecU)cX-vt_PGfeY50jtl!N{In
i=zseaQTORSpZ|Yeqgp6b-Q|z~0000<MNUMnLSTY&D7LWx

diff --git a/apps/app-frontend/src/components/ui/new-icon-editor-notification/assets/06.png b/apps/app-frontend/src/components/ui/new-icon-editor-notification/assets/06.png
deleted file mode 100644
index 6dc6879b1d6f27ab4409d6e5ee44c7aab04132d3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5925
zcmV+=7ux8FP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH01k9TSaefwW^{L9
za%BKUX=iO=p0So=000)CNkl<ZcmbVTX|QBfegB=?x3|~bZ=E;m8)gQOO~p}zisObF
zNg|jsiiRXss)D8}pDfBxRwY$_Fjl3?iixRIB^60XCD8y;gQg;C3_=71WOHDEVZt!O
z+vn}QyzbZC_vC-}|LJ}#mBT#lz2~0gzi;QZIDF(1iPzCaD+#WD=Lp_)RS9oATENWS
z97d}-|6WR3MhJ+3`{?~Z6Ewz+rJJE=J1ANcgX>UVz0t?)av#r}>*ArOxACJ#TG(o4
zcs)(L76E4Vrnu#XQQY)_5!6O{K)*vk><~~r4U_^;%FF<-7IX;Pd$;&*_ZGE)oO{Qf
z!REle6C&}eNk=461d^1V3lO;y?z*>$KfhxgbIU#azX+f>e(R?v@CP5Q0$Gy~ZxRrJ
zs;|Zo&OHo_^IUd-v#F9x!Qfan{?#N*Xu_pHt_(?ke|c9EU%O)iGRs~+0TkEo{PF=D
znj~&#4MM(8)YZJEh3rInmKgy|%us!rDS&_Po9g#-USSM-$9fQCChXy_ZbY=Uuw$i$
zkElTZYM5Qi<EB4e*i{;aw!QLLK_fpiwGH$(3HZKVOt|5~??e5GVXSAc(1g-|YK)#I
z^f*m0J4UZZebD{!JHXsayRfv+dJl+j^=l=5e>KNQhj}d}scCN=hbCIMi*UM%aC=n(
zD9+#ZMaB7+7J2B!jcy0{1naY+Xc6&xtgh}^SfK4VzLwSuwuW?e#O<qfTZBD?2>bXk
z@Wga|e5`&)Dtu_7iEn&y9}W?YyAnVRyz|S4aA>Lpk+s+mF^t^6pBGeNIml*vgzeR@
z<)ntq7ks|ccSZ!hmKa>u-^6338!fj9w>Iwj(}Sp0l3@ZUgLi08mpI?>6NLv<dMoey
zJ;D|UXRs0juwZ~=fFK?PJvNEQiLkyND`iAb*mdQA(J;id^O)f@(rDKv+-COd;MSX`
zVgk(U&ExYoj~as~f_^$qcrLknH^u?P?+3@Td3+o^lG2Mlc9AX-sggt9@}G%3nELR)
zNIKP+UIU-Kag<ac9|)i*B6@8_B5h8kj3;To%dTow8Q8^qaRO(=)V&0s&j@Obof|I@
z`rLcJ7wZdiVdui{7wr#g6x|%VzmYcOC7Sr$$Hoi+l)wMvhiWu|>3uQ?fZa%N?uCB$
z=XK6`0SBO`r<wcQQxeU(^i$m&M^q^SfupN4dLr!YJ&N-XB9=<Q)zra92L2NttZ7@2
zUjNP-^|W=6BUyxn0Kesk5my}z2<f>tprPiye~_#fn0+b36F*7OSS(@gvNn!?0J#6V
z38oKcIB|Ufry<hMb*4@Xz!mI;feDNm&V6!QH5lqh3ga_e|E?<1cfGkx&t1z^=@IZg
zdnhskBFoJ=?7)-^AiCe!=;NRNp^pAsja+O&g(p}#Rm9hSx`~6;D%Q{DaptieuKD#0
zZ~PTu!)r#;fT0m>CjgSc#H7XHE$w^oz|_r?9lZO^6(m<(Qlb|<FIsHhAW~MOouw7b
zB}yh@-c=@{U*r;e<F6Yy`9KdZ%x>yMa<phM$zgw`jQV!htkcZnfjbNM&ffrQD;Y4b
zZ!nUMhh`t&XUB&=b8q4d3zJ(zN3k7Tad8p3uiSe1mx`huu-1zu{wln|5=`>M0I}?t
zgb{-gWO6!(Cm-seTFj%@%P?6fp`R%@awr#4&#@fM?`$M^>VE`Q*E38XN>C~zGQQj(
zI_c9EpTQ(p^cak)W1R4~mMb-id7l2L#Lhwx8|)^^h$0Y<rrSu*v6)&>8DMKe;(@z?
z#pm-#>ABJFVxm&SPB-&=WPB~#r*)gM&$nC$yzPC$?jd}rJ7^Nb;2N4>(p~(xketz_
zc#sHi>INxx7FlvBna(f^I*{S{U}d+wo!SoNQIFpToOzIpTR-*4N@Z*_j;Lvw93ZN_
z=_{3~_VAuhNW9@qiRYrUi--ZkJqTyiY&PZQ$ie|690)_Cg!ygf+L&HhAMNzg#|X{{
z+2=Dabn)Nc=^*P0#IcPHQi3Gw#yw~7asvINk4{tI-rH0B;2$L#Thb$L;E>+u2Y8%Y
zOgucsElOs<jY=dU3SE<-sLTZ%KFAPkBacBCD_r0~eG8i{JaujriyN&dbO?lq5w`Zp
zNDxU%T9TNk7EmeWu-)(Bo*!@G<f(Ru2^=CW`SAf;Fw%~#@V3lsDy{cO3@5{Xe!N!-
zmj}q8YXbfm9vHrYd8dq8k7WDog)KaBb_E-a4w4~h5D{@&-7cP4T*veC8>p2E+J&q9
zZ71ttrP&_dUw}g%B-u04c?$$_V|+`zs35kG{C+o%I}!90cVVr&7a|}@f9-A$&(5#Y
z--aiUa9k2WB}%yzQzJ#P2@<m_O$$SUT0W0rK8;`z18{Tc^->H|QwXqGNw?JTu~&E*
zU)>*93r9)spAqO5jHy}vsr3!CsG_7cO^6fg#Kni6Tf*FG9bMgT_1_jo3WWq?<$~^i
zaj8Ls%W!tJiHFaxphHAN;<(Sm+^H}yEdIh*9zDE)I7+&lOes;6)|Dm9Ck_agr?3nv
z;C!!Rt29xS4s9=Vy69weymQY)Fv>ZJ^Tgc?TWuWKJBq!dWppV%XcIwB&aPpeY{n>w
ze~yBvA3rlkYLr<HDnjKDjINB~a(r-ZZnt-So{3vhXGFZdFxO{EH`IoMAo!Yr+j4W=
z=-#KVoWbFVDz@7_Lb{IaoxTBrh_K!5<J8M*IA6+BY+k@GUtYDqC8+Oot?-7>)?wo_
z!2x&eT%Zhr31Va{yex!Hy$N=mR%4=of+H@a7eSsUXsMu~TWc8}_--GkpOm<KW)zbo
z&MN8~$tM^enZnZMHs;q`TAUMW09A0bwAIjhA85!}IK%-&rE}>R<!hIAdLo8G0cj=P
zNpesDFHnJt4nYx#yzn8Z-<a-qwk4kYX@)ZoN#uHY<Vc@Ro?XY0=@CkRD)gLapR<3g
zOoS+6fr#+f;wr|-xK(n=D<iur@&J!G!8jiH7Q6tgTFcCeJ|kelso^HNz`@1Y?iz`a
zSxWam|9B7I{%Q|re@6LrmU?)UDLKE~Bp0}j)kYg>-uQmy*Q@0`=2~t1*ZhSb(yyc4
z{mnWS=ldqva)nR}w_t_QC`n702XpUi?2sB{U5%enRRk(KQ4)gd8yUFSJ|6yFAFa6*
zdFszxRBG*^GGaejyntiX3R;~Vloz*f$^J2%oLeVVXkj{+$H-`o2<2SW5VMEc+ML9n
zeSQ^hy{?EGK20h{M|7IonTzqILCz~PTg>V|nEE7O9Cws-+>I(g-lv8H=)nh@IQjTC
zxwFi39bPibTm{#Ciz~Q)X&sH743E69MB;C<&r+J;im{sYI=fg~)(Sa+sd5pul!!+0
zz}heK`1h}N@#wuB1B~UU7CY%gT?E7-Vo9+gnu3R62)ZE!cOt^8KD==;{qyS$ENyJ#
zqNyrorYoKaBZZv4|HwuAaAt$lU}ZxSG?(x?AUz9r$9yW&2!+oWrP0+wL64oRmMA<X
zw@F6ysTVg;e>lNAK3KM@ZqE%x5JYA)O!DRSldxU@gTagq97LGNOpT4Uq#vjL-<Kxb
zT_FE`bZ-sQ<0Z|dw;!FtOREi)|KTVBt`KPUZ5Bsx_O-aeJ0ea8)oR6pMqa7NBpJ><
zqZJ*ioLk?*nUzf)Z(NKK54XW3pf1^(62UM!n`dl*o6O5zMidxL1ma_CV;d4zJk<ww
zf}*xQo||3A{8|B59-cs+Y``&+jQxcCIkNhjt*%}|kswDRjlSTp`&LeK*h2{CNm{DK
z6#K?1It)Hf(zdwOM6r+rHBK0_9JY?j4sPeQ+y?BNBXyJ*f&$#{hXuT$v}_Z?5hU}R
z*xKH~&neuU*;6GKID#@EamBt-)XCqUS>D3osS5f;EGopIkQOLB?&zrnBG@z$Ya~rc
zg(xSel~ExHsCRled43s{a*o_;1zj>M7wT>Fvk2Ijc^qMF6cNWP7C(PbCWo;P3$yp!
zWjaG+LIfqtl5s{QGYu?nZR6;46$d9qP^F0P_~9vUNL^^Lw^l-hY(_aX`dcHUYh>_t
zC_H{*_5wP+K84IxtwM^<DP2cMJ?cbg&!`A=%aDk%LC*xkBjwZ>{K~`igHbi2WWprH
zJDm_bsrOw1{`A}?&R=NY4depHDCCt{?3EO^->`q2Rg6>uRL64*>*&$o17!44Qa66Y
zUn`}W09i(LL@H_*@(8Nz0=5YDz(tO)L%~Gdwg~FE%#4N$gpBbIhbAs95f&po%@<j0
z9}RC)4xox7FDz_nqsF=6nzAX26e|Dl*;)K@c7;UUV7%Gt`O?0FM-^Dr<Y!)J;cK_Q
zj7Lv4BAER#oRbLK=c`@PNr2utfMGqTzxO~2OF}MEU^RR1Bb6qY!xQ~pN*j4eT@GI)
zW4O51ByTZ_X$p%AHVkeMH=m+pNEtbk+6I`E7g5Pnp^$nYi=-~)VotwpcO?Gvr>l5*
zse=z+JBhJcj!7n>5MO%m4HLW(929wO^<yiGU}X~l<}H0zVh%1?4KB0QSxpD^m5IPv
zGKR`NOje6HzgDMsqNydv*9L{BJe0$zlLwh9#Ao|slrnFk?O{6kToW(PcW~|TQM}`=
zW07a`I7LmcPd<30=O_eLb>U})2n-J!xC)S~$%XXTgy*4Pp_WqRvKCqQd9n@jBoVP>
z@jDZ$H`;v<pT&j@VH)cYwT-PFesKR9zJ1R!HtYSM7G8B(HA(0aF!KP3U`TQ`V1mSo
zsDV|^9l}b7tI!PC21W$6msZnUum^102rmV!QUhgBc`K9p<Wp8zW!I-qw{ZJ+7IFGq
z%OIbyx&nheF-B@27qEuR#miuyr6_f1&|$~34|Xy8bT1r5g}^i5;-keN8O{(nyAr`9
z2N-IDI$gP;dD}_~B25%JQXE9yU6nL^>+WUz_<=PYGe|~c$!&l;L^QS_^Hvj(%pjWk
z`)+Sx{h6FDCy%u&*joXXo7-kloepN+y}2Tbac|PAhQ|!70K(u8Vjw&v6cJPfsfN6k
z21kdqsSI9^&6DhE+Jld6;?$WIe*fe9F)?27d5k$1u#^a8<|Hid-@#{4TZF6%MO9Lx
zbnud?QCz)m3RTL|Oj_@fo!B-c!a3OBBAu!XHKq!x?GXEvi&WRlg|?Q!1v+)=)&s1&
zdMmo$*zDo2{%IC3&9x&bNQ_v7PfU!+#b1PkNXy)>HaC#aL7(<uIaRaIP|D{Bz`k8d
zFb>B#g<mOJmt)TF3?bF}QtK<JK_|8YJ9KiSyh^-`h#08a)MOr?`K^OEa=6SzO+}Rf
zISfR4E+%jpmim9bLJ^th<J`&$PS3Y=rAIGB)Myi+DwfZuwn$-P-Z+>HF3BISi`eq{
zZzEizv7M}sGF5~-R3<Nx|L+j7m$y3TPWCY~o<}V9;a)N6#5Lo1?==%hQ^5>@**^^l
zP6n4u1{EAAm(kyePmJT+&y$O}(8e5PXUaG!<Xvk}#5a-V{06bRw6;L{2XHSuXacxL
zXb|VSX@(q~HMU9TSLl>U5;G58T7VBm5aWONU<o(=>NKV&hd+>X3{8QM-#dNPFlTXr
z(Q&Ohp5nc~H;y~Lvf#zErv}nFUcN@su^w~5xj~sp4x15fA%`vhZZ?5N^yzG{)i<zg
z(pnRjQ<{8fL8~AJ2wEZ=b=|usDHs}uGvtHc9J`h}!{>l=i1M_TS6|ib#aCBw^^Kzt
zrv#>t7P0?G0TX))WE2TdI?4Us->#vtn1O}kj7h@U1?it{FUJ?bkcMtmKp8!j!~QoG
zkrpsCUQzS1V-@21Uev0oxAra=8mf`2?ri=ubO?VTB20+3;9152kxWMiRMmI<><1h8
z$-i!(xyn8Ua7$)h+0g4tsv2z?FJUn@>X3NesCDyu1P;8Vfa*kQAqRL7q*~44h7aw-
z<(H1^VhUuC5Y{i!y%3wHe^-u<tiyftZxE4)KQ9}!)dJj3Nys3EEOyx3=;EF`*75W2
zZIHD!3Ceh-fFlzX%&xUakGDy*i2!SxQIu#HYU&FK>G}S*Q62DL9z)Fn@s8tTxbDOh
z8OH=XkrPA1Wq@C*EOP?l>HBYzS6!lxo%_B7?pP_U1>cQ`!MX{q*ioeBo>vyTxcl!f
z;H6*e;H@(g+Hfjy-k?g*>7^~KQ3kk0MNV}-=wgJ7EcV3Zc^tT+Xv$~1wCSk=Zv5~*
z96nSW65mK-J^W0alLDpEDRLh;apX%^T~?yE>|1)_WCT8vbN9Y%o|t}jkUDsU7iX&8
zR1zFNQNzX)8LIh`4r<ge^?}q3NkfOE;5=o6N)0kHaFwHZT>QQfOdQDTv0jgD%M)?l
zf9)Q8{5K9@T)9BbZX23A7wh3?-v}5SO1STlCenu=-@+$vm?R6cZG=MzUtTtDJQzgD
zBD`R~7*Y6KCPivfCF;$33%%Sn6-)EvI&*YVR6w(n;pD=aUav4Eu>bf7#`eVGPD3$1
zM$)jiL;+0!Z@Qw2Jre~)#abaEBQ6;;{U>tfr9DF^;GxIrNbk9C1%J{!hS9PqE<nWL
zsm~8=tPr2Jh~Ony+%9=uk+{<(ayb;hsO&AHfJp^5?Q93<R=3H=_ptBHC0ulM8KqK!
zOOIAGqSJ)r{{1D4*HWzp!A6<mav#Hh+dJutppF>48F=VzQpAt$UqQOn=;7b~V;Q&n
z_Jsb37%XZF0f{X`QzRx`H8T-IUc!t?jL)|vbMO7>Ur+sZfe^{%Y_WtU<njW=sf3U>
z_5GVaeh3%Mj9_=IcP)wGbVVD$AM^2ZjexzIK0-Jzp<eHq-we$hDC5EJUqjHX_<)6T
zId*je6lI>nJ$t&aLaJ(AIvQK}-!_(C>|*7`4%W~2aDJ(YwPRiE*;~Lh$H(#hcTZt3
zBzJHO`Ed*wHa-@+cmcy9`ZtMdKlUi*7TTsJIJ>Zo+rBxETYg9Vkf0tJ^~f7I&I3NW
zk}km!BIFI$D~3Z#vtU{fIDF*@{n-GEBD=YBZA|Q=Bl3}i5laM@<#Gz)P>KmHnfo1P
z7NeV+pVaUdx6Ntfb&vbi*eL1QJ>R?rhxSp8S$#UsqOl<9%#RL40x`WMn=3IqQ~(39
z2K@SL9=rG9te+AV6pUaFQr8#qPc^rUxy3wA{N^M6XLLST-6DPX)E_>Hxn;7zD*9jn
zg}#bVACwUQmL$v*__^9h@>(KuXCl-erG576_`O1Z_?3zn+B?AGU`RZ?(!perzlm_<
zzafmiOi-%u*)N>L+)_asiU3Ri+NW&}AR&gcMmNTRWS_$ajiEf|*L+2yglj;C!6gvG
zDT2#$Ye-Sj$lvmXr@iR!N&wYPJ>S5mK1Y(UNXbMpN+WXK!Umt4!~qd2l=^S=5P&gt
z!z4m1LJ)|49p)M*tPrt8hWi18-F^<eq)NCHH0Pf^-55j{yMCLZB;h?b{v2QbyCr&}
zlu}eQAvnk3ku`rFS<6|+Z7=>qQe>aqZ~NFg{;3PtUeWIZS)o=8{ASQ0j@%?}`_?Lc
z?dC^^IPZ!4nm?W<7kTR+9mOYaJP7rpY5fOfD0?1<S6zT_hS)Vm(U}mhIVb94S97Nj
zSH+Pc>cr?fzrTRn{^e!N&A0KYFum@d&sX#K$cOge+P6>Os>^D++A=zt$7}u&8rU@|
z<NiB@&`j5NS%(vVH)X(Q=eJ3H>v-rF>-gclE7aG;>uLW76J-nGJRk)900000NkvXX
Hu0mjfAV@Rs

diff --git a/apps/app-frontend/src/components/ui/new-icon-editor-notification/assets/07.png b/apps/app-frontend/src/components/ui/new-icon-editor-notification/assets/07.png
deleted file mode 100644
index f9b9b636d0d3642449c491221dcf8bca19d09285..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6469
zcmV-L8M@|)P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH01k9TSaefwW^{L9
za%BKUX=iO=p0So=000=kNkl<Zcmb7L349b)n*UdIb$2@H+#v}eT;U2Jgb?ma78E%o
z93lvU;ysGEBICjMbH}-K#?f`haoCyBQ3n|vgm8l*Q6b?bkc5CS2}wwkkh633eWYvO
ztM2MlSE`ci2c7DA^^WiR-gm!hX7JDvJo*9QhHzwNW?;<d(HJr$6>;%#hzJi4KIeHJ
z48!#JE`2Ts+DGiGbQSwZ=akPw+iZ3_TFtF6nQo)3yc~r^*I*}Y{Q;&g1|%fJ<KBe}
zF>BUz=yW=Cb#)0Jiin7m&*$qwaK9E05F}@q5(A~rSe6Z81nsNQXo6Rc<8b!u1spzd
z6fI^mdc{GF0pVnKv$K~G;upZ}cEjWG^gu*yN2I%_w4?IfRhv^je}5#5w$qPRs}&fL
z`~4{#I(!5Uy951Z0NwRhe*O|-Vxk4&r8}%focy^OLzMbRpQ(Y;T9Dx*?@J|xGNPl?
zf<L_TE?Qd5eKUaS_txj1L!{BzW7m~-gfd5t02GK*VvL*!IRU+a*hgt@IZ#QkSZ(<5
z!~ccp_U({otn`NNyhyy)>+LrZl+z+IB5~4>w5>Nn#OHKA`55_};+pbjN_{CUk;VvY
z-TItBqap*S&cF7`c0@%+3Pw)8n7E+)s)mFbD2?lj2syFRs|ae07VoK~Mn^>w8h;K$
zxS=NlR<2l1bUsGlR$n01MYRRhJ|XjX++ciO)$vN}s;wbc8zm-FdlnrXg;j*s5C$Y9
z48XnjEC}kn(qK6vqL|A2^fp%7uDx*vsb9W<VSC?1Lfxev&y~hV=a&*JS07b|lY7d9
z`xf0BR0U0ROx&9rH>^WS%0NN%<%CIzl|EA<Rw}A$-!=7>NIJC(DV1jtb<aacoHHG1
zw+<k>wG5rw1b7UwswyJAO6`Qw`trVVrqFnyq~r#eF=Hq2f8F_k5IITRoyg_hpg-0+
zh)ky$kypP#Qu$fv$7Dde?iKJ!!$4QiIn9X4e;;h!HB?7VLS^!QpvxGC{(=&&z2PrD
zd+C)O;IgtN1znju!jcY<65N{$k}^c-=W-yt_&X$)evc@f7n)ct9F@i3^AF-y%3WZ>
z^vGatL)-Ktoc1n+m**kXeF3%^i_t!OHoRO|k9Fj0$O)56i;|l)7!1hD%mg<!Jw3$b
z$%&ONE;2|>|3e5T?VPC;iFuzRmi0orWE0{z6T<4QqO-+`w#$cM7}bWj6a%7~&ZFtJ
z6_#cf*pZnSn3ajx`h2vP6rwC;5!we%>VcQ|UBpSr9w-?`v7M^>xUuQrh7KKqzCdjf
zHSuTLn~?Cs=ZJ5;32xdFXdm1L-e5!r(L1N<GNSU{gE7GYdwevS@7Td#w}59k)Gc@t
zVVQS>O&tP{Z!MxOe~jrBIcTUqjT>V&!W$9aLjvXaiT7$rmH3@9VCay+;1UN62#MyD
zL`b@`093`Fb=eSk;SdsUo=0RP2|&U$=qkSg%XfQFl{g-5Ul+#Ke~TEG73W%XXc{mW
z#vv>s>dwQ_+<`E29a<V2(9zn8yBH!ZrULL?WS33V7*y~&Y!m0AGh->-#867{l}dp~
zi<DS7Eh63n2<=Q>ULJ3=*?JXaIq^N1!ut?WbP~zMUn4v^2D;VHA--}Ce697cHaXBy
z?|?Hr9)BZIsLAfZGpR1TXEMMW8HbH&Zmb^U#2+tukhc7Bq{4yWRk;{$Y(+a!mDWZF
zn3zF`ShfL)rem<%?5K*$Lc{R+g4C!HrzQo`HY166IVGax-0Q86?p6sBFCRj5M;)~H
zKMBo(_3*M<Tn<Y?WYu>lzmtb!W-I18J&5K#7@}nnoirSOeEcbVdFBf0A|g;cXEvG}
zz9bURjuCnryrx=Id7bcT!q7Hh3HTYyF=+HyG-WO#M)CwEUiloUg;!CLv=AMGr}T-l
zS{r2o*PGFhw#g-cCA%AQVLt}mxdwd%2alHYxqJfrm}%ffW+2+tfWPG4z?E_v<_?NQ
z_}a}dRMz0g!NWLP(1vA6H&9kq28Y8TBrDgiUq=!tvV>W0gY~#zO-V<??1$jfa7eN=
zgVRrfwy}b!1qqr+z{WH;Ag16WFe3_JpRpRAs3cXpq)G#g56+x9!^^8DY6S{G-`q~(
z&yQo^k0+rYnhwLXSui%Ag0HO=9W_>1tsJb`&myhvATCw4<5H;&*$F(FGVa5lF4y2z
zO=vd85Qjpx0QxWkHg8;yv|&Suq<GOtBxaDg5HaTtqrS<8Ys04E{>Vy1``l=(w!*`P
zLpN_FQoJ|7wwX{7HyicCNc^BTsuC@C<J1*u9)JAtH<i*}rF+ATJPga-i9~xn^lM%O
zw|)m~1ID1jn+#2t4ferfQI+*D9Bv=H*Gh4^v;__07Gm7<zk!Dsys@K3A~rS}wRQDE
z*eysO`A7eIy<NC+wFm}d6ei4`hqUB)3~VmIp|U&ppZZALbg=McWP?OV@NnU1xql0c
zGnc@d`2hIHBn&d;BB3T9E*}ef%+L@T<PoCSCKOGi-02NyALIUypp6eBNO0hPx(uYx
zfG&Cf;`uhjI!);EvanXSBC4VQ4r1UcHL<9<S%uERd^iXL98L$yE2@MVUUE_*T3g!)
z;T}4<utu_`3m1<c#Kj92@QXFGF}<}IlVg3T53^&Lwi#%Rho<=sSQ=H{DM#3pIbdyO
z=xYl|z}11yRvV7){{S=IodZFx81-C4q?eQGLtlkSpO+Vc7+pArh$|<Fiz|SB)MyOl
zD&c5!!%}aB5%p-Cl8v^JQ;}L!0{ssMFyz?#u*VI-dzBtEXpGpf_5qAa8;<<5=W#0k
z4D@;(W=@@gHH~@b>S%-0=)eq91KNoP$*ItxP(KvQvgct!M;>vDtuVVCXg~1}xJ)HT
z2(O3FX~C7^R{Ut{L{o=HAYLA<DXD@GtjW0}kMu$~82Gq}E3;cYDCKRKMs(k$C;pyf
z(d?o};G4D#-Zl$T<Kj?SU5isp3|^?yU=xY=pPoMl^<(ZvOhg!>l81sVD8kbFmt*PD
zC2%y{LVS%4apmXGTx&;Vu^lclXDrVmee@`>Q<k75Vksg@4kM}L5MmMyXfzd}@QwwY
z1Q%ZyAA+aSuFKmfot!k=lX?U>=LFC&g3$s``|<dx$%#a=@Nj~RE<y|b<`qO{Ekx9~
zyPz>w;Mw>RteNY;+vkB%oD*Gk3lggfkbLbVn1$=HcvcpCBpn)Kz5rus4!Sx!&|>it
zVtgod>+#RdSlAg2mKrpOjE;t;y&5`mCEX?b)L_T=#myM4Wd#kA6RoD!atY^pC0NEe
zzX(vX#S7mx0g17-x?t~g!|1&R-`ks@oj46~Y$d$zE}XpP#pMnI5!(c;7%>x^F&bCT
zox%LWAE8B?i15Kt2#;;Uo}0k%4h!5~A3n1VK$%C61<74lr)dFqeIK}wsu7E7Sje2`
z3z~7^whayvSt42=Kut=A0`4kO5tINi6%Oh<xfk1m&jq<5e|_}A3tt%`5>zT^$l7^_
z7&*d_vEB=C5#LS%L@XRX8Ixal0z3bG0F5>u21II6qK(DWK|WMA0tYX2;w^@Qj^qj(
zHg17~6faR&h<DbnLRM2Q!Ya=Y<K{wrSt0Vtu6J~}A>R`}NH;Fj2FPg<+j`glssEQ3
zLAuo>zyzY3L?eWfl79>@+|;$YVY7NMBZc_sNF51SYB9jkj9>ruw_w~>L=^lJ>!*>O
z?j(M`tpihIc^tJz;89~UB3lZfUHUjyKlmVYb;aO*tOhO6ow{R1%}*U9Oa_>Klpo|V
z3@v`hZJX#CIeAv4RKpLp&%6&z!AXJF3>&Dhu%c!#f<BX_gnO5T9HuzD(7Ecs@A@UY
zm%c$FvDh4OS4}k*Slc`(a_Vr@YJ`c`V*?46_{+!OD7}Qp^wCK0{D{hG3rb7ckWVtk
z1U*^Ez=bM%DA~f__z6=(Y=C@Y<tpAI7w9dP<~Q$vZ~8r8bN&L<n+UOte@6mC*nsG<
zngBzHK0BJ7MAUi2Sn}W{1h9m0zQm#Mu3d|(C3T3lTCj8RWQ;7|3#Pputqq;1%|C@g
zvkRT=Zb8_BrCUacWdD^PI25sq9>!h6#|Onk$p*;j<9ZOOlJ)tcHUg9HhL7azIQ~x<
z_x_tyc3Z$`NDSel<9GpAzgh%PV|ldNy|__f!SWF#`wG_r4jaN5AGSXCEEv8E`szFq
z$k^Z^gAS9zNJnWKlC>IvS$zQ?76E?28u0V7i8PXxNw6h%<7$#1cma_(d67XnFoY50
zbL&<WDO@bVtl7)qJNPk}`~!kr;Ndrn8c21ONCoAzhKG~b2cGO~81dWuSMS1;yBh<>
z4nm~Mgp!}yP;%9blO*_=Zq$VCwn~s1HHX9;D>lJGiW|1tI;4^Uhm;;jHjjeH80moy
zCykSpN=VW+k+8~&3cU07TUfVYBQ`(rGJH!P0ki9OU`q=EeW+(33PLQcFTfP3R5;sQ
zXd~9#-d=-Na#U480v|VtdiYRp9xCHfeheFj(QCHA7drs^bM|2GzrVn<FTChy0N;(f
zX!+$3;s&LSeeJ&JZRg&7H`?3U@Zkr4!nY^B#+I#HF=zXq!54fF{omdr0ZTmsEGHU3
z45NUIKl6jnKaY(RK+lk3$4JgUr=qkA)>d*GlYlN#Y+*)a;6_Oi{<`B;)YsMG!Sx$4
zW7eD=L@F6{Ik3_Wa_)#+3`z;(Z#R(Cb@|FwLcf8@DY$g;BH2MFs^f=Z(#``I{KTuI
ziW3tskW4UWqB_cmj35mfm5|%tyPJ5eAp#ML*1_}q`>580!%6h~EHRX^vHsHe1M4=B
z<F4=^)2IZ>%XiX`^mvbz>W938e1afOOgEz*eq<B=bK7>foGv`_&^lDt)WEoS9ei(m
z27d1Sg1e*=pkV^M2rz-(bF6Gfg5IQCY<-jF;jY&{K>U3Vq0&@?*Is;%Fx!QPHa>>6
z8#Z;1<pa_mSV!DAd6+MyR|t$k)|W|w{GJuIjzMr^X&d>jBiWqTx3Qt#|2#e!{G+eK
z_q#7h>3L)~b0yIu3*`ic+5&#i2)Lj8HEh|>07UdDbdk_k)ahs<VLgCXr$x?$pdplt
zhqR-75Yt#2_|A6gY`{GVqD{X4;+2<i_|SedH#K6-%4INfMx?#_6~=CR3ru2)&|ff$
zf&pUWW{)IQQD9g84DM&%hC4Y8J6?PWCB;{9r`FU>ppv}^v~}LPDa<Y3KqaP#8yIpT
zq;%*J6dRK0u>W`iObdzVI2|6|v?&lDbQ6-jY87l2n{Z!WUk|gn8RyRA!8MwkK)rJS
z{F<ME(dz>$AW<t);q98U60?5!cQ}Smz^UBhq-x|w6OpJt{OUD)cj73{pF7oq?)z6f
zfG}c{NG%<0AHRiyw_gs@!uN54O+m39pvEz3o0!5}FgFXq&B?|yPdo`$r>EI*kOB8C
zUW$(PcI^4$U%|0A%geCi<?Xn4@e(}$!ZyTAUkvWxCt&yQp(~;*eHxrgHp8tC$B9E<
z;fE84Fn`g~;P}PMR=`K_`u6DI5aK6J%0kBY@nFCE3LL2&f@G5vN2(?o+2O1-*^_!W
zPD$+54;B3%-eM+^;HN0sn}cyrJdd!s%MoS>LuzWOzzB{+hWm5&1w@R&V^2N>FR7UP
zZRbuDT)cpH{`&)rdh&J5oVEzpu9m|$CKL6w)!6yocC-?SS(?2TYc@Ovm&0GIojhYM
z!ov;7$efB@AMYeK$DaasUOI)iv-?Typ)QCcHMsls?ZcF*Q!#4Ps9?k=4}!XFQZH7&
z#|L5p<QI7lsn5AS{WaJ>Zxv2;_8vGSEIMcIJp5zVE|G1*n5-%OBxUxzy9N6|@rj=_
z4L+h86k3`ZFm>kL!uK)bClbc7A-X<%#3+oPkb!qU{0L$7w@~x`>!|wlU9c^6JvNFS
z^qf9@8b^;FMN?Cgs`v+U0eOt9`aK{8f-xdY&}#fH4rK*k-y-&4-WnJdZU940Tw<c4
z{fn>&7$yIL+g{o(l)wckW4mLWjI5cMkU0e>j_wor7C<s!lSoHB@dDc1FQB<_94-=0
zGaB>?4Gj%Aa^wg`j~<Q5lP3!&K~j2y43HZ;Ik$o$6hsQaq=(f=#^>kY=7D{PfADD}
zt$qxLj~yrDGyx;Y1{oq<CM4RGX`YrC+TZ-~FBqOiT;iEyh&ufhIe!eCVNiT%MMwoi
zyeU+W(4BrL6DCcX6cY1r{<(TaPKuL}Di9OcHGfsekGSYK1Q$&zwvN3Yg1vSGDcR2h
zSql)Tpas+@uy_dh=;_+X7#%UNX}ldpzuAJgj(S9q6DX;{m2_41j50cki;D#*7&B%}
zu#HpOeWl4d*X)4z<R^%>w{)w6KQ<D8GD1Vug6^`p0h&)<2Y+@dd>dZF*zx1=>W&@c
znZ}>LOZ8InW%=q27%?gxFcVjM^zYDC-++%)j~G4Mv%ic97Hv2jSy_rz?X<KsOrJiT
zoLWcv`-|@|h{UN?P(xt+OgKho!g-OL0+VBK4XoXa5Qy?i1<MAiW^|{^FQfK_Z1`p_
z$GV3}R7avlf7r_RphT<HVac+U;PMVYf8_)@ZSwd-TeXxS05%dsR3wZ<ZORy;lG+e@
z;^X5nZQ3*p9z0l)wjL57UZrVdh#}M&;G4Y?mhrQJy`P}VbS`Ka>0cq~0VLThBNR|O
zzdr!Y9dh2k;%WG%E+Is5p;VB93S0C8F6MlW$&4M5dPY&)1v~;*QXocUcp}P2WWf_=
z46Npdu&^*e-zQ9%p!jmNcvU<em%nr%9UL@>aY;yi`ZYM4YSEGN4vcNJgqsj7vtTbZ
zLit{>6&mU>$mua-A*!>Rgv2C<aBp}6n)FORBBoM=ee($kwM~L`N0d&r^v4KO@~}q6
zqItw*nBx*dpA&qkxX+q3OE~<bAkv~F<(z!5^s3etQawr@0@s!g;UY(6hWtImB$)gz
zFHkS!11jN9hy4tp`fd6BQ)n7I4Z0Q^v}KnBS1A}XB?~8kc1DNNp%c+QaD-56kU|_e
zjha7yzVPOUh_gtzoTi`+py%_nY^(&mxyK%mbuS#_X26+y7|i#(yIrOx;5Ie>RM<}u
zJ&|EyxttFTJ^xa122%2z<jIYcvAC0(4j*xkQe5;TGNcABJv|+LB|y@v)oKOT(Ab2*
zse^<D@!&xEzKv2)B;HFW7M_PkAz}H$;OE?nw$ooA^7;=#!ovh~S+EqW;7tX_a754H
zLMX_XL67{LNkd>xn*eQ0=(~dy*NGD+A|oS1c-L8qmzr8rn#8k$+PXS$Rh3o3+fpL2
z@(QZ_yL7UU7bhgI(DB4RcvfwLdBjxc^S&U*+ExCDF`ya<cngk^q{A|2PBo?35Cc=%
zM0nx{K__E6%{yk!oQZ^lgphV67bwjIq}N;3x4>O1DZxGWEKtpsl(?zpIYO8~ucVse
z$(Rev@h^dM$A}7a`VFJN0ol9yk|k_pcN&LHfO*JRk%Ay@bf>Af(_lsoSGDs^>1I(0
zD86<b%-C@g`OkNKN~|=eQV4~jH;^wVR~4xW3FGWm@VUE?aP1qxAa>ZiFf}?+*WnHp
zNL-}b5Ah>l9G@wq*;1fLQ@2LLS^7?qv|a9{q#LQm3~D!4KCl*?m1IsQb91pGdwKA+
z73oA$A}QB;d#6yk`yz6|g^f`p2H1kuc@Kg+@ILsmqM!uOT)!bI5p@%0BFYdc%oQ6O
zi<FcU!J<=f7b7@1ZgK+UE>B64DIMRQ{EnPq+WbG6Nlr|}?%kgW3{ZQ~P`bF%bEO5<
zB#MHw_$(Se`v7HiW^~S4goKQ#NJ=8HMRGDCA|iwxQZlr1=uPD1AmT&k-mq~q8XFt^
zaX<sfnR5;v#H#FU)nbTr0wqvtS7M%sa9GA{4EcQ)lH4vBBBNF3R?}}azup@NexImM
z&i;b}@f3nG`uVPZp}Dyw7!!zkB>zYkm$xb1%MlP34XB2O)CIz$VuW_3w^Y=AD%0Cq
zz2Qh{qcrZ?wL6GYkO5Yr58JoD0&{Cyh>?*ZuY`~qBjjV$m?)n^{3zA)<-a#lBUF0u
zA;rUNZpBMKe-+g3^<V%6stW)0#+yP%@t2tWB~FfvoH!|BY6Pi`Q)0H7^r<nHzLNLG
zFMkyjeMJUPxLH+2%2qF<g)o6ig3{q>Uo}K&yOde|B}}QGoG^JGwKn=PBqe?uk?u+o
z^!4bg_S0FTF#?+(c?7FhuMj+g(kZJPlnjxQ%Th90eZ?UCSx;W^rBa-;{{TMwY&Q{m
ztKuAe{&+f>xTZ%R-H0WN?+gBDnu7S-!v8Py#iag@k%CCD7^~2CpTGX*1afi?qCqC|
zJ;wI;=kvx0Bj(JRDMVu<N2C#dog@S&y(J$?ZBnFrlZf8tkps=@8X6i=akCOdMa4LC
f=A7z|%i;e3@t<6Dt#NH`00000NkvXXu0mjfIfDz-

diff --git a/apps/app-frontend/src/components/ui/new-icon-editor-notification/assets/08.png b/apps/app-frontend/src/components/ui/new-icon-editor-notification/assets/08.png
deleted file mode 100644
index 8359a83917f9786226074dc6416ca211af6f8b51..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5955
zcmV-J7rf|+P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH01k9TSaefwW^{L9
za%BKUX=iO=p0So=000)gNkl<ZcmbVT36LCDdH!Bc&(68K+Iv^0ZAq5p1Iswrl8Lc#
z3^)`i62KHmAdn(JB_<>(s7fj+2t@)#l1gw0xQakxY)B<#4m-AkLu@A%%SM)L%ZIQe
zTPxX?_SCNSn4Np3`{jS#{oeb#XI418Rcm@)zvI8J*CV!U+b;1sTG2`4&Ak)2GCzVH
z*?x?t^VHX4o~uPfmwWy^*#sNg?Gv#zCEbgt-|nFPFZ)f*wW^q`uj2XYBA!^Ap}rPg
zPZK|j0OM{R?;YHZcl2*X-V^ZaEyxBf?h{D92O$V3x(_}hAUVKs;AI4KG?wP5E-BT$
zMoR?W)zq$Qsj-fTQB*n-PPzvooubQylgr@8E3e_(i^nieg!#D$pg8{F(cO4&|Ap`?
z4fxdt?c|${V@NTU2ZWFeQE7?8k=OUUtw$&WY!`w=4`O=?H$_Asf)F9@UYW#QL<s5o
zc-;h0T>rZZuE$u@fmf~*w><<b3U-$o)9{{u^5<p;5uX!{=};4qRGLJK_Rs{4^(W_R
zcv2~(ia9K#+xWv*_Xlc{Y)-Ocd!`?^UwA!6iQ(Q_g%%6NT<ATbEBJ6CZ4LI8(HIc|
z7){XQLZIy!NA>B8KMOJF{BD;teFg?$=kT%c+VED_FjABF3NcjKuJaN=asG?j_F}k7
z9IDhqAc05>wTQv?$xfuD20-=E>M~MS8TI+W2$|p(EYTv{Adnz-^gQ_)AQ2JKGRlq#
z_9R?Jt3Li>%U+E4<hv6<I1X;V=z0v-=u5p}B}%|@OIV6Kn(_u{m`iga)JuD*KR!=#
z=@CrA3=v`W6l@&-)cc6UJR?PVuX+<>q|LXJBotHWP6B*nWH-jW6i}^!ixLOOEb2s7
zToZ*8f{C^hU7R@Ha0Bh_W%whcW3E*N!|epZF|pQT5^IWxm|Pu1V!Z0}2)D78gO7~u
zHUw}3(I>I^@X${9OQlE}A}!ODm7EBAQ|7K>_h55{b#XFWH+5wdBfnchtL4FONwgPT
z_=_pjAI%~C)KF*~1&afcYw-0QW)x+pl8z(5n>0o;1m7>$aO>zr`2OM~=9<+|0)Bh+
z5)%75*}Hb+V`YqrPD&W0LxM0P6{EO)ZY;H0?g}!dzj+q^Elcn>uEHyokd`fE3l56g
zeDq!2Liz&F5LY8E7{Nov7_<!1;r7z1XY^cq2f=KCHnx7Xj$4O!gc6|i;g-Q|@XjvV
z#TgYPb88~9OvZ@CiH%Sn5vd59JKDt1dqNk~m^zEn;pwoS#<}FHot`wQ#wb$nbkUw8
z*L5ZXv5>LIaHQGBG9r|Q(|W?lATufCO%dRhq0P8+{utcr`zGKtTNKz?k<y##MY+i9
z4f)2r#e6hk@EUxCp5n<M&hSu2VQUV#n^uGFm3xZ7_cO6QtwBW$hB!><3S&p3fUYQ0
z_(j6q-BTQf*Jx_r)=5#VUtKm_f0HPvWf7nWSh@#fVZY?u*6Sqqk+FS*HBxMzeXe5>
zDHCfD&Ts4;fx9!m0jNpicO}!Es0&~maAF2BE(J*fDXB`4dwp@Kf%(Z53};<zYD)~|
zvhZq+AfHI0WT^p$9A6(uN`f|yoy@S}?{I^u`bp|{=KJApRDr?TT8vs9CRcB!#ZVg*
zMyywJ5<T>FW8DH6+EX9%wHAJKvJ|X+^98-Qb?+r1ngoPbYr?1GYVAk{^&@$t#@p~0
zdX$GWmKzDF4CO2OFS7j7d}Sdsm`C9RQqKskiEJ+!K{t(d%xc@uWJbp`G(D#5`1r4_
zX-rQPgH5+jm2tyV3k7m8hO@oZAe~SIS*f+LNCX+oxez@r+@8P_!(A>Q^~3RCAJ+g3
zhKw*a$}xtRxn|3BXi3%cO#H%=GfIwn$pN@QTrR9t)rpGXx^B{Lz{Pw~Ht|HGf{o1_
zJi_wcr8Bt7A40()D?U*|@5i1*e|`<}$dIymI5=I!!I`Ss7(@9K2C{S!F|NA$6m~na
zXgzQ_MAJrUK<B<%r$Z?daTQAFQ!Ja*(xb&k1c8vHA|g)^Guj<S4>8x0BIoRR9_Hre
zFf}y~LBXWVHIaMYPciU;7m+RcxMDhuch#0KwUWlvY7Z8h8MMe1%&fF9mr}7u6C1Wy
z@b*tmq4ds4tlV`KyvMf3n2;1uXC3>)1EIJ<7tFB3sE4a2_@es+-RDatQV}QgcNI#x
zZbTTmzwQk)D8AzW`u0(vQw-O*WK%1+RQusmz4+&+Gr{<4$1AwyiZ#rYT#RpM2ha1H
z%WytZ!r~3r!28CFa26^ZV$I>=#*Z^f<KQz_9>XUxu&zvGXF>-Nu*C^SyE7Jt#DgJ$
z9ox_1Qy)8wOLvq}=mW^UFt^4f3M#`6+E8yBS8s2iMafr#Qjq2O0TQV{Ad3DPhOVV@
z+jTdg^3Y+_|LrHhLYeIs4}3am1dJE~ryXH&12dpNpo*Qo)PfuR3yI*HQdP7Z-Sm@)
z-}dq6@s{gPf(kL<Q%!Ry?DQvtTjlxMZ9iC}x=J46l<HOGtY1eu|54=n#*xkz;HJaH
zdOvUz%5S+GE8l$p?FT1=AW9+Pvlt+>^2QG&J}up3Owwf_v93Wn5p~5QK}OAlhb*Kk
z81H=*?bSToK~`}I29qAAzDU=N6!rapuCF7X*$T&dnG9wd?fL)#bvcT|e@^PM3u%fE
zI-0DYIQm`WKXnI6?*dBybT#Cm3z@EqMDQaLpEg3&$j8F_>Gyp`w&%`8E(XRB0*D12
z9UDZ_&>UJK;O-}5LVO(DfZlB`QW?_s)NOQqg2rUfffG$#T$_hak}x_jfsXh^H}6Mu
z{TWS|h30CTOvUPBTTuDtURtEkb(#&BV!JZ<L+MD550L~2rX$+In}xJ%WOKD`;Qluf
z{l?M?n&$+vJMThq>_$?Xo^=2OM*7CEZu6d_>kG8i0dUn+O&Q#wn`TfOeGv7}{W5yi
z`mFJeR95S_>=I+DgwmH9HyH(73EyraD#Q&2Pf7&h#8N~MUI<2cWf`^FvnUQ-fC6!N
z{RE&(^U2_~-?Q%H(p)dj9P+R-Q^9ahmbdT+mYunDM|5U_)`o>RIJy$k?a~z%^O@*V
z-#s58Sw-}zE?J{`WF4z>M=^im3DhfVc-_sp4oDxu{Mk#v^|)CZz{&sa!?F8ID9=@_
z+Avrp`%A*kOL3-hqzW{jzWln+%SzRn4#5hGu>R8Fadf0cYRqh@fq!^p3ZtW>&l7&Q
zS>pi37AnfPm_p7rsw-!LjI$@#N5z%YdGTLZSi-mOdKmZKKZvsny_gtT!OF{dOg>UU
zC5Q<`KxD<({K?(Ov~$pEX^S4rvq@NkDMAmT@pFp#NNPmLO-GlxBSq54o5c+0g^8$C
zTRNA*H@;fHop<DL?wsnZz%Bm^vF&gW9SJ9eYH12*Pdtv&*;nBE>#M{+e)Aq2IdT&D
zd>%hJxD#Le)6JMVNR_0fiWT~C`h~ZeSj9wjg24@2c-871t30!D0go&)mU2AENG3_V
z#ujXrg4yiZr+RRhuFw57)#8W!pwcXZ*f=Ur%Qn^)CQ)6UM(^l$vJV@P^fDfq`PWX*
zVtRUkBwzu1HZ`a(jiu>Ju{^z-Ml%WG3}O;0Szj`3=k?AY7qCW9uNp5Zbjt;-D~Vd5
z_bOYHfxR<B91WNg&2@t;%xl*OnHNxAdJRKkqm+_f6g+R$R?#fYAWcwJt3h6k>e?Vq
zK6NQ&li2`{{DyO8Z_#1pSxOHi7%E~TMZ`c?3SLcNa;=Es$15}43KHow3y=^IAy5_7
zrzF6!#M17EBtboE*OsyP*smhD`GY7|w`1yw+cE!&@*2CK4SKs#AcAF(qT{WJi=RRN
z_$vWD12mm@`CIxHkIq_VyqKfmcO1cL``U>{dLx+SxB7-y-F|q)$7lbhgv<7{tSV`5
z5E!PEo)lelaOuy(UHBsk99{_AXKnhsn0w|9cyzoiXy00c9n3`fmCjVrKSpu0&@kE>
zK@whVt5PYa<3J~ggCn_dOB{5>&fTKV*m+<yW@uF6<DahJ!?#s1G~$Ka(2_4S5eS&p
z({O6{P-hduUxd5zm2fYm*0Kd1p@o5#WZctG!|HlO1a7o74qA<M(WK*`h2i8Hh8w-o
zXZK+4FnlhUde~+~?Tvd|xayjg5p@yj0pa^3A$b8!Yr!dh56epr;rLI}*t@S4A|HsZ
z2OUcUNO*Ril-t6<#H86z8*@kfC3IUKzxh6s-~`Mj%SBKO5=K8Pv4urWa~h!p!%9-j
zzxouSrZQI2gK@3n0Y<_*1$XIVaO(GkB44ZGJ9p;rSAUtu+`JPVc!b>F(qAHP;f35K
zgSmNN4Lh!V00UcILI*~SlRRAyL_5O6WPS{8Z6|#Ci&ca=j>H&;`KgQGg$Z(X?m!m(
zBlW-_)>i0RAO@;Rd*gd>S|RrXb?{CaF00Ser(JyEvw7@$a~u0EQ-)FE=AF~nvt<eQ
zAATb)8W_gKql;t!8*!W&;v!Z7f`vZ@qlmdcGX~mJY0@w~=f)#x1g)!-K`iV|k*}^6
zgXcM_vTq=-mLHDB`)5cJ_A{|zQWUAlfyZ5}Ej5ia4Hs(om2ImS%Vay{m#JahZ&}VK
zV7EaVgO}L>EliHkIwzUIU}BOqC_Ea}8+%mkTs>CD^1^57epe726)4#opgKs8ekVaY
z0ii#IwQVFt2~`eS@9-?fE_}W#{_5tw*;6>QJQwOaU=1|vnIRIYVAhB(Cn-Ms;FH?}
z!2=9F#-$V8B88`PfLg0uiTTr?!|L)U2&h3Sc~iw`Gtjq<v><H>v0+GJ-}TKH5n>??
zeIFv7-*Wk5R3s^P0v^Ca?vk>>$ChUCt<y(ww7eX-!cM){HX?ZDSbS7V{qdeK849T3
z2p0OHvx)fI7^-=Fbg**shaj_iFn!iRUvB};`Zm<cHxW_t=*gTRLNt&YqPb*oC`k-*
z`ZrwN#${KwF?l?VN=4x6-A!b&(gcnUoi`YdpktNDts)}W<TL76&qad>aiY44lXOkw
z@=#|T9L9j|33Uj9phAuaaMg967qvR{0fL^Sb8AOfad!k$4}|^g0&RA~F7n&M_`q*`
zi4vnVY~Qg3`D_vO@(v=zn~<e4xs!U0xCvzXLIF~Q=pU50@oh~E4EiXL+N7Lle}g#U
z_Q$a@s~|W*1ZX#0gJhMC_n%umht+lyW7#}1j$_UZ94-~X()3r%g>EqUqJz=zgxDFE
z7y*gMhy{lMYBP$w{`1ji@s+PWh{v8Fx8?Lu32OrLXFf{y;cqFVy$mT*i(bls1}-LI
z^oHx~yRn7hKoAYVDuawkUbtU85i_F9VWj>SOH26Ht4DEgdEUe{l8=YQ!_gGs)Ja-O
z6DRO-VDpr(C;8rT;bs!~EUNW3?*EU&_|li}!wW}dh(0}(4v*pNOK(T{wGkq6k<JAB
zFncUZ2@%+f4~Qcz5`@r?j6`%2LZ3)qSnS26eFNq-oo=t|sLPeiuk$y&;u~7Y;E9I1
z@1cT7<?&+>dv{@QXahD3^r2dziVZ3H3Z4Cb=U?~ZfA<gI{kQJJM8P8hETBBI5vPwR
z?s$+S!TJ7f*mpxd?58tToOq$1vd6S>se0^CPZn<*+lsBZLI<p|)HoXNDiQDuSK|-k
z6E(LZN=IW;%{Kaf@EpnqCQ+o5-nA@oyI!Yswn{~f0x}dGJ^kz{JoMv(_?-`4fcM`x
zNP4RdODXUn<o&ilqvQQWofB|ksE|Wq`qey+KE4U%vjy0LPl`WMF5WaSf@=mTy(X2E
z+#Le!o>#Qgxqz_gW3q}GFE4e#XYc91!ps`JfIRlMTDZqoho%y1<uz0(C=g^DD4@rQ
zsSWT)zf2`0DtF`F5J@fSGD21)Z9ur$;*yJ_2PUvEITQhJxx2e>5Wh6Kkql|%Yb{-3
z5n)F>A%bLxTSrDOX$?}hGeiAMpV#T6<OVwBxx8l>Kd7(ZVPCy+=c8{!5t&?u+#Dqf
z=?Qp+TS5X5vQmeq9kws*Cqcro!y}kJItH)hMt(hnZ8V$3&0||g+>1ya=<wX1pDA*D
z)Ecf$acv6<Av!t~(I=SEGeFCj4(j1U#EFj=NAYfQM|alG;boOFj|^gblR5-R6F?~q
zN$Ay50FUq0f9e3_)sww=>FG^qRkAVaWJ#L#4UXZO;jwtchd6xF=QRS+QQ%R{jky%9
zb$WqlQOR^ZLN&4l0*o@yMGD=<C?NTh!Z;3jHQe852i_t`(@X#=)%iNOhN%}R=4LZE
zPKd89_QnXU+8g=@@z$};$fsNb3ygP)+b~C$%B77jG@kmr(=B@~6jbrj_su5uMFgSo
z0?<u_U;vc5U$VMf7=hqgCy#51qsOLJP@7*tnxY=H-P|h_Mdmz=?`j5PS4%0p^ujom
z#fGU;<6t1&Ly=tpgFQWgb>EmTVuPEuQmOWluuL#}Tlj<(4I4%Tae;#pNvJzRx%tI(
ztSj0w(ig`RNNrHmSy&8oDl&#zUBZPe4@5%uc2BLLeaHXc+@4-6AG!jm=?M%FVrVX)
zvQk3(<#GIiQ=|kahrvt^=?L1c`pZ6zXeZoWoJVnYpXy0trcUP}-+9-q^4<L-l*HGu
z-j5p0O9sqM>VEz1fT<)U=BmbDun69%NB|dGM|2)%nRgaAAsCl^UdBg4I@$WMMh5iX
zON(%xTB4I-5-|g`V*$}o6|el5K*<;v_T8~BQ3uV@S(x2dy>_d!Gp)Z4+p}vEhy`Mr
z34DF?%&}|p^>sLHUh>YSacF4)&ZF})Sfk8K==XtvSjebPi(;on=nR#4c&yjZudwmZ
zQ>W58G>xsr?s@ncOJWjhB|}`^*8#JZL^YmN;E}Vla7yhK?wdJ7sbL;mdOD&(g!UmR
z1^hB1jLyWP+dM95!eG|9b~3f)eKPTv?CaQDF^6K3duL9gOhH@V818;$l0+gKA_yKr
z^3sto{pK0iGa3KRB}1pt!KcHdLnNewt!bo1TB%6FhRBt1KIpz~SLk*L03yKGPaF%0
zq5hjDPjL6?$sj-GKX{1M(*@HXE_RwDTI3j@$zPS|pV^oK<vME{W=HFCVj6BbB6bE4
z>tlQJ&wv>u>35tuf$3`15<s=Dy?h)qbhae&nTX1Xg+*N7`5Al+2sVckgFlPuwG%&?
z77TbNSqu?f>_9gnCEzi&!dwp1Xya=qj%&0n0ZOC~A9`{>W|T-}v#@T*BH(n{h`)Ro
zLsZ{)$-$HJlLRuJLCOxI@-<>vY9uu#58#Nad%|gkg2&%Fus`-2!dNLniN$SCAH=LW
zFUn=@Lc%Vj4W%wHnhGy$JkFC1{#~$oBA*YYN>;}aJFKzZ!ouY60;gt>qYXGK>;}jS
zeDdihjp%nJfNIA|EBGK$X;v-PM>)5OxeY$7vKsYSLuPA-)_BH6J>nZ1!@?H629r8K
zCcHr02wLN4pPAaFTC-5V3}N{p!s*!RY7*V`e>$rc`Ta|F<M%GwNug?kBE?4Viuw6k
zw{!T{^Sgre=AN&=+cO)wQ#enB8IjH5?$=J@?~fnHTC4kysek5=r#I#E_|&dT@Sd&P
z!djHNsG8%q+UQow>v-*!^(Vt>JywUu9R-<aJ`a_X>jv}HdgR`uDu-t>C=sLXJ#!j&
zo;ukf^8arF=+;Z6t+!81;M(C~T+-K%O(a_Vl&zgN`RLMTHWuQ%5^=tDlC9KgVyapT
l)c4@R0v?{7U6<p@_J3m~gO=_Ph#dd`002ovPDHLkV1lnYPmTZp

diff --git a/apps/app-frontend/src/components/ui/new-icon-editor-notification/assets/09.png b/apps/app-frontend/src/components/ui/new-icon-editor-notification/assets/09.png
deleted file mode 100644
index 51768ef23f9181681d682519028865ab8b5a369f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4223
zcmV-_5P<KAP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH01k9TSaefwW^{L9
za%BKUX=iO=p0So=000mANkl<Zcmb7L39KDe8UAMO-2J}xJ=(rjY0(z9NL+9&6<pdX
zY9Jv&P{1WoG}I+=i;7DmxZ)l$8VsmWLNI95XakB>BB%*gj0z%EisDk<>#Ke5zI*51
zxyy|InVB>9pMTD|?{RJ>Gjq;={{8&_f9B3OJ05p>gmpB>bx|$XP_9(rd1boyP@+EF
zq9}snIE8CIUcgB(8rF2yFdV1Eqx!~Sh$tLkG#p|$3J?tXbRS|p&07ngRPs=-HBqV7
zF&d3A2nOhMJBY^Pn6Qa?&ajDj6RcE<zP91YDS?i1r2?;1qH`THGpC^6>!RChBP2ej
zHOJ-w%Hoa222`sJ^!y%t-_J2R%_1g2WuLz0Z5k{r3gL4#Oo<dxt5s2}*DwtF==4^A
zFj~I?l+`zE*c@BC+wEqSmV|7UpQaEK3?H*K6D<gSB&<t{Xf+$CR?0ZJvP9l6D&Tcx
zhv#|NxN$T5ULWn%)tvAqrZoec5e?7JQW5fy-X-r%3gI;L91c4kjj*!PrX}mgGL<NH
zO;vz$9R=9w_~iC}0l8$rB(%-Fb)QYRY3|L(<(bpBDc+|g++FRGS8pP(@XQKOYkqci
z3u&v5px=)JizeZ^<W35ix{i@f&Izq3fzNn~tcSuC&&z~0&(|=VmWJbJeQ<mlb^-?k
zK|o&J!yFkHEPG{Fjm8WHgCSYIOVg4cQe?4})H(gdmV~fW3YQ4z6s%Hc4sx)X(?kF*
zUh39}a`QO+L}dwWKrES*jvDXLQs@r`Xi;#_DL@6iTD3_5uNTj795+4^Jc%#xYYn6O
zBrJ#L{U)3yI7!FUAKN4y(`Vhs4^BfJYI)adt!yc{+WP%|KzV*-T&HqvJ=%3_3UnOa
z)TWKebZHBSlD?C;GrAPt8jV(>0GG5>qe4gJd5+xXzH2dNN{PHbhqp{s-1dsGrjWvM
zye8#J9%Y*5hf+X=3MLf`+)A}Z`945s$n~}g%|=)<XJSYn!zUBnr!~>O<+&K|svB{x
z<#{HrGI_3Ss!R^YA=L+Uc;#}H0>iK{Db`-np%+n3t5b<2i!pP#>>f#M_OIAR+Am@7
z#vO70c#{k7XrvJ)Cyhta;R0)3bYB$ZW22zUaj2|NrSjQTHFOk?i|HecH*vqKqwXY)
zWvNQeQD+9@mfRekIHh)pfj2w`kw=}SG5l-JK>z$x5;{7yrSK-6vU@$w@aw*e?-ZAt
zUhDn=WdpBVQPrY{!Ei7&=s|b}m^av}G~FK>c4hS&7tng&5x9RoN#)uY(VUC$3C#jc
zPTS<}nwF^$Gx3&NO2n5(J6feLx+w-2TTrsOzioM#N>$ZY`BfXUZ#@DGXt%cHV{pzK
z`uk_Gp1p(=)}|B_tR9O?d=&(BzLdF{=UGz@w&iTon52>6iJfDN)<++Nck2TD1CN;w
zZ{W$s<9c{iXHQyLx}d2~T19Htl-6unBMw~c5HmL%M|jH#<2+NdElJz5wJjlc+B&x(
zHYtVAw-M8Glakp@@58L$ZHGp9DMVx`fFzInEalN--eg0OK}<FpX^M%XX~Z%^I-aCS
z<WrHl4s}LAt`F&^O4s)e?LLvqeo=Ov^CbN+BcqK8Kj}5xqL;?!NM{2~Qfw-kx^p>j
zhD=`bpuz~mDJSjY<Blt~rcsn<UgM6fKTec6C1_<Sk<rc+uZij!K%N;<hw-QJx|)b7
z3xE@}G*ihcOJWJ@$RY{$Y-3Ata(o*9oG*??wcOJIx!!HL-jpJ(WoH!G;Vp55D{!rp
zW@_s(o>rQ>-U*y}6CzX1pw6LNM~DqMxC}nZKeVv%VGDYa2NSO*1M+d#mM<f*kA~QH
zgXMh=$8&YB`a+zTy#_()G&3$WA6hu%a3xFB!M<TXM^m09UHNPPYt#px&E8HHK_Yh6
z+Sh#(IBuPwbUHeX3o$BhN3(kyYT<*~yvclxKTMe|u33l1J`}X^@=+h(sWkCtuc}7{
z9=?3R_>}zSWpLsk=peh{8yv}S;$~n(qYN%alx{-W%}cPn=_*8S3!9cdf>v;li1Z7%
zGUe%%l!b(3S;UXA$by$NH=#^|eWiC2?+#WlAB{4a6W5Oz58N=3;2k;n3Nb(iy~3JB
zalOgt+ONNWE@*o@{x`gEIcFi>bSi^+d1mc+sf>5GHsQKz3$G?mxT(8@U87+E*Lt&$
zj0>*WWdx(hM_`$bazT(zrNLj(?A-<#wIxH7l@u8j&yVBu{6LMiXsi*9je$|pGx07B
zSomYa%B(>tHU^shK~%zrr{c;4j=~&Xn;{OB>-e<SL}=iF<CFr*3?<>+%otNNDN~7r
z%~x$jZJW}YI&VMqu|O(P0gr%JJ-5*#tT0v@3UHD)>FRuGaQ<DcNRyD9i2_riU_r*J
zdH1FJPMMp-WtYANuf6orxc~g~UV*vUStGqX4ktTFYny1P4cGLgoz?*wSWn0zqyd56
z#Yq@_-D=;A`siMx<<%4Dm+s$-D-OIleo}Pf%{RsR+PU*__{=p|<Dv^MD9qtUL{WYr
z-Bg$a(lSVaxg2~f%K}=1HW##Mk<ZoEZH<0Sf{qICF;1d(_6zpl7l-b^cfWfJ(2wxM
z@pfE$?REI&FMoyo`(JFNt#J=YfmcvkTy#C7f+R0%mCBATgiNW<mQo}lsWiFPic7&k
z`@jFfYfs&VU9Z0!PwzezZyUcC|2?(<Q%;mZEHU9FjcH3&8bjTOaS*gj;J_xKOoVI^
zSohV)?Q1{z0p9tSKVTO<3OMIQ&%<fkx1mwlOrnPc@ofe$xwC1Wj8W2~RP!)}sEq;J
zQZWTieST)p#l`+IcHGm&(HHH-C+@iqXMg<DIC0k7@rQla!dX3x<2`pOE)x%YT=HvL
z3euxo321ZQC^Ekfz{jM}s&5NDa=&ur5xi%03HOz2_~U_h;DT@6fUn)~RXp&(-_ig6
zM{r>03Le^i4nB1B3=B@+U*N;0Xp<+JVwtphZqD;|?~N80k0YtZvNW!T1-Kc;aky6`
zHF=Z%Y<YF(B=!eBe(zQAO)6(kcwWrN*7+^?)F(fRGtYcR{8Gjpcif4qzwizG^VEG9
zob@I+|2~4|Z6AcU@(?qIiKmF&M`Ap$v@k3hck9+IaGrnG-e_TAF$2^9wq^<@d`^`r
zyL0^xE(lg}+$rHE`Y--Z^yjO|WzRi#AKEKz{N}fJXBG-Ko(6yS0gRroAC>!mjN0AT
z!R;&<d9Zl`ZxV*z&(Eg{SX^An31o__{JKuoJ!2T)aJ7-^f6AbT%R9^1L_4<c(dOmn
z&5a1+X9nhih+j(v2Tyz{`g;x_tZhW?*Vm)^w}WtKYiz>7`=szv9u7M{zgeZhe1weF
zNPVhZ++W3$X>BV7DA+BuJG+A1{aK>`w^nMnu{95$HZL~jY>MUA)xZB7mA~DN-qS8Y
z@RGM+aOOp*-SuTu9=c<yaZIs`pL5Drb%2d2lP2|bi~d?xcWPI5X=ep58~C_SZCf{P
z#nJRlEXP1}t>t49sB!Pjs2)9p{&Qak|ANn=|L|e7etI=6i(@b~n+Mxk>C_!NuTpPO
zNhCbdb7UW;X#PsFv>G|D*ToiE4%as};@hn`oJ_4Q>w>jXnxs*{G3cWFkKe+3@J@^#
z|9k}d-i2^x9;L-2v@ALqj^K=QlkGS?JdvJYQb?=SL}|y4T~~Fw-K@Tj0p+8n^e<-B
z-qdenE=r>BPpWl%al;%Qr1Ta!c|npJOwQ@yfV~u@`%)TC*^M`c8IEMXlEIby6R7-!
zo-nl^!SLDVWAL0;0Tgf@XN>;EAH!(x>k$qDS|+~(ApT{Nyrc?<{~2;KrlUM8vw})%
zAL#rKr_ovEq`#82Z*0wG^BiblU<^D_tAg&A&PP;t(0b3Ua2I@pO-hR+8t;z~K4}*I
zmFFN@?Vxq#U2wa@jA7|DwfhgEdgN#D_q-W{%dSG8wse$E9nc=6QlV=SD@^wzuE8Ko
z5h^ho(}^s6Hk05jx<5&?HZd66`Yw!j255ZlPWbOX8!NY84)68{5boXutggVlmn^#X
zba;m!M&tTFWx~r~mU*aGL-6d2FnZyIBtZ%B17@}Q=&$zbeTNXylVn>^%*jc8rS033
z7+?!fdUB7b9He|cPZ9qZU90GMi0-GYX?`6aOI=icbU&PbEn{@vQxNT-X8?1QN`nCP
z&)<c{=MR%-^a^vOGKM>MW3cB{DBt}<l$IX`MkADe{AEO2wvkuOqH^>e`p0c(tz30$
zHHrV-XYGp?;!1GsJgVCse--~MSMi^6#R$*uCG(kO8XkI=JvFvM?VI<)9k2ZY6d#i`
za=0yY<@L6$^YB#gQ6D~x*{dwv-Asgj)0lx2oFlebFo)Y8q5kzhW^*C|Z&HM5Nk}-!
zx6MOU+#A!fc1Pn;T#uU&NUO;)eV9CldyfrPDu>TCHCvjLN-)irb%$3j$8VE+LrNRv
zN;!T@G<nt*#;GdOe|!MBYozzCPF*RizSrlNA+Qw3GL0iPSvh<h&Phhylz2W<F&rtJ
zYOcZJ8b4Q9rCcJJhj0f$A2m`y#Qrvl5anuuOv@~9^Sr9>P4E#6^?KSrc_CZOlg%kE
zOFftKEpc=Fn)fJuy-vLz7|`Cu?e+cm#bMWR^Gvd9n>%M3Hn^NA9%$HHN{jOQcNw{-
z1w&h`l5<T<P`xDS_egg2bhg*;pwVm;kV|1)*Q_K-T*eNm7#p*ub<LGw>N5#wG7`sI
zuh-$L&jLvHSfbTV8x87I0!oWWC2;0#W7C2thc|hLytjGCv;ZuX%9W+g^?D5}t0!al
zcsHn`Vb^b?NrgeD(}isLdcYM7n<IJB=URo+V>a9qIBih?C}t2F4@KO`*v!lfS${Q_
zS+$H}yS*HLU8S@WBQ;nw3ASl;=GvFSAzyCB3;?-3hS57Xp3IWTJpDBY$HQqkoR7$`
zr=h-jqmD9_&h7R}Ha}B<iUo^H$Iv7N)EhOHS|%w;zcd{)&&T6PiwusxbHHC{F2D)=
zlg$*^i_;THT-RY5n9$D78n=F7n!O-htyj?`xs;3%`$IP8bIL7_pIAhTG*xfb3u~4)
z8MM|L1581WHxnM+FAE`4Y~irFHOQ#y`@y9X3z_R16`<OXp7kvpKZZuNhM5gBD0!tE
z6OwTgLtJpF1Y0S~amZk2!fguH1%=bEwV@S%LAppX4F?0rX8m+lRZbf=&QeU6p){F%
zN*7u_Ka~oy^-0B;QsR1W+Qu?vk?YsVfOWFEPr-d<W!d^MwX@dO<0bVa>C7zE2{Q<S
z0eOh}LVHNN&2gd1(@bQ@4a}Lm!*tK*uT@_tORN1%nabNrtp<<Mxld1uR=e$j%Rg!b
zWPs{p>bm+4mk6jYwdvt!NximWVQQ^BZ&Jpi^#I*M+SSEhw$r{Q2zpS}?Rr0-|39~v
VzhFh5>6rik002ovPDHLkV1i3Y3P}I}

diff --git a/apps/app-frontend/src/components/ui/new-icon-editor-notification/index.vue b/apps/app-frontend/src/components/ui/new-icon-editor-notification/index.vue
deleted file mode 100644
index 1e6985e45c..0000000000
--- a/apps/app-frontend/src/components/ui/new-icon-editor-notification/index.vue
+++ /dev/null
@@ -1,144 +0,0 @@
-<script setup lang="ts">
-import { XIcon } from '@modrinth/assets'
-import { Button, defineMessages, IconButton, useVIntl } from '@modrinth/ui'
-import { ref, useTemplateRef } from 'vue'
-
-import ApplyNewIconsModal from './apply-new-icons-modal.vue'
-import icon01 from './assets/01.png'
-import icon02 from './assets/02.png'
-import icon03 from './assets/03.png'
-import icon04 from './assets/04.png'
-import icon05 from './assets/05.png'
-import icon06 from './assets/06.png'
-import icon07 from './assets/07.png'
-import icon08 from './assets/08.png'
-import icon09 from './assets/09.png'
-
-const emit = defineEmits<{
-	dismiss: []
-}>()
-
-const { formatMessage } = useVIntl()
-const applyNewIconsModal =
-	useTemplateRef<InstanceType<typeof ApplyNewIconsModal>>('applyNewIconsModal')
-const modalOpen = ref(false)
-const icons = [icon01, icon02, icon03, icon04, icon05, icon06, icon07, icon08, icon09]
-
-const messages = defineMessages({
-	title: {
-		id: 'app.icon-editor.notification.title',
-		defaultMessage: 'New icon editor',
-	},
-	description: {
-		id: 'app.icon-editor.notification.description',
-		defaultMessage: 'Personalize your instances!',
-	},
-	viewUpdate: {
-		id: 'app.icon-editor.notification.view-update',
-		defaultMessage: 'View update',
-	},
-	dismiss: {
-		id: 'app.icon-editor.notification.dismiss',
-		defaultMessage: 'Dismiss',
-	},
-	close: {
-		id: 'app.icon-editor.notification.close',
-		defaultMessage: 'Close',
-	},
-})
-
-function viewUpdate() {
-	modalOpen.value = true
-	applyNewIconsModal.value?.show()
-}
-
-function handleModalClose() {
-	modalOpen.value = false
-	emit('dismiss')
-}
-</script>
-
-<template>
-	<section
-		v-show="!modalOpen"
-		class="relative ml-auto w-full max-w-full overflow-hidden rounded-2xl border border-solid border-surface-5 bg-surface-3 p-4 shadow-xl"
-		:aria-label="formatMessage(messages.title)"
-	>
-		<div class="icon-grid" aria-hidden="true">
-			<div v-for="(icon, index) in icons" :key="index" class="icon-tile">
-				<img :src="icon" alt="" />
-			</div>
-		</div>
-		<div class="icon-fade" />
-
-		<div class="relative z-[1] flex w-full flex-col items-start gap-3">
-			<div class="flex w-full flex-col gap-2">
-				<div class="flex w-full items-center justify-between gap-2.5">
-					<div class="min-w-0 flex-1 font-semibold text-contrast">
-						{{ formatMessage(messages.title) }}
-					</div>
-					<IconButton
-						class="-m-1.5 -mx-2"
-						type="quiet"
-						size="sm"
-						:label="formatMessage(messages.close)"
-						@click="emit('dismiss')"
-					>
-						<XIcon />
-					</IconButton>
-				</div>
-				<div class="text-primary">
-					{{ formatMessage(messages.description) }}
-				</div>
-			</div>
-
-			<div class="flex items-center gap-1.5">
-				<Button type="colored" color="brand" @click="viewUpdate">
-					{{ formatMessage(messages.viewUpdate) }}
-				</Button>
-				<Button @click="emit('dismiss')">
-					{{ formatMessage(messages.dismiss) }}
-				</Button>
-			</div>
-		</div>
-	</section>
-	<ApplyNewIconsModal ref="applyNewIconsModal" @close="handleModalClose" />
-</template>
-
-<style scoped>
-.icon-grid {
-	position: absolute;
-	top: -4px;
-	left: 232px;
-	display: grid;
-	width: 160px;
-	height: 160px;
-	grid-template-columns: repeat(3, 1fr);
-	grid-template-rows: repeat(3, 1fr);
-	gap: 8px;
-	transform: rotate(23.89deg);
-}
-
-.icon-tile {
-	min-width: 0;
-	min-height: 0;
-	overflow: hidden;
-	border: 1px solid rgba(255, 255, 255, 0.15);
-	border-radius: 16px;
-	box-shadow: 0 1px 1px rgba(0, 0, 0, 0.12);
-}
-
-.icon-tile img {
-	display: block;
-	width: 100%;
-	height: 100%;
-	object-fit: cover;
-}
-
-.icon-fade {
-	position: absolute;
-	inset: 0 auto 0 210px;
-	width: 110px;
-	background: linear-gradient(90deg, var(--surface-3) 0%, transparent 100%);
-}
-</style>
diff --git a/apps/app-frontend/src/components/ui/new-icon-editor-notification/show-notification.ts b/apps/app-frontend/src/components/ui/new-icon-editor-notification/show-notification.ts
deleted file mode 100644
index ab4f7fce97..0000000000
--- a/apps/app-frontend/src/components/ui/new-icon-editor-notification/show-notification.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-const STORAGE_KEY = 'new-icon-editor-notification-shown'
-
-export function shouldShowNewIconEditorNotification(showOnboardingChecklist: boolean): boolean {
-	try {
-		if (localStorage.getItem(STORAGE_KEY) === 'true') return false
-		if (showOnboardingChecklist) return false
-		localStorage.setItem(STORAGE_KEY, 'true')
-		return true
-	} catch {
-		return !showOnboardingChecklist
-	}
-}
diff --git a/apps/app-frontend/src/components/ui/settings/instances/InstancesSyncedSettings.vue b/apps/app-frontend/src/components/ui/settings/instances/InstancesSyncedSettings.vue
index eb10daf39e..a93da1627a 100644
--- a/apps/app-frontend/src/components/ui/settings/instances/InstancesSyncedSettings.vue
+++ b/apps/app-frontend/src/components/ui/settings/instances/InstancesSyncedSettings.vue
@@ -16,7 +16,6 @@ import {
 	Avatar,
 	Button,
 	type ButtonMenuOption,
-	CheckCircleButton,
 	commonMessages,
 	defineMessages,
 	FilterPills,
@@ -36,13 +35,11 @@ import type { Component } from 'vue'
 import { computed, nextTick, ref, shallowRef, watch } from 'vue'
 
 import GameSettingsModal from '@/components/ui/settings/instances/game-settings/GameSettingsModal.vue'
+import SyncedPacksModal from '@/components/ui/settings/instances/SyncedPacksModal.vue'
+import SyncSourceModal from '@/components/ui/settings/instances/SyncSourceModal.vue'
 import useMemorySlider from '@/composables/useMemorySlider'
-import { list_game_options_sync_sources } from '@/helpers/game-options'
 import {
 	get_command_history,
-	get_global_synced_options,
-	get_initialized_synced_options,
-	getInstanceIconUrl,
 	type GlobalSyncedOptions,
 	list as listInstances,
 	list_synced_servers,
@@ -55,6 +52,13 @@ import {
 	update_synced_server,
 } from '@/helpers/instance'
 import { get, parseEnvVars, serializeEnvVars, set } from '@/helpers/settings.ts'
+import {
+	gameOptionsSyncSourcesQueryOptions,
+	globalSyncedOptionsQueryOptions,
+	initializedSyncedOptionsQueryOptions,
+	syncedOptionsKeys,
+} from '@/helpers/synced-options'
+import { syncedPackKeys, syncedPackQueryOptions } from '@/helpers/synced-packs'
 import { copyToClipboard } from '@/helpers/utils'
 import {
 	refreshServerData,
@@ -68,7 +72,26 @@ const { handleError } = injectNotificationManager()
 const { formatMessage } = useVIntl()
 const queryClient = useQueryClient()
 
+const syncedPacksModal = ref<InstanceType<typeof SyncedPacksModal>>()
+
 const messages = defineMessages({
+	resourcePacks: {
+		id: 'app.settings.synced-options.resource-packs',
+		defaultMessage: 'Sync resource packs',
+	},
+	resourcePacksDescription: {
+		id: 'app.settings.synced-options.resource-packs.description',
+		defaultMessage: 'Use the same resource packs across your instances',
+	},
+	dataPacks: { id: 'app.settings.synced-options.data-packs', defaultMessage: 'Sync data packs' },
+	dataPacksDescription: {
+		id: 'app.settings.synced-options.data-packs.description',
+		defaultMessage: 'Use the same datapacks across your instances',
+	},
+	packsDisabled: {
+		id: 'app.settings.synced-options.packs.disabled',
+		defaultMessage: 'Enable syncing before editing shared packs.',
+	},
 	// syncedDescription: {
 	// 	id: 'app.settings.synced-options.description',
 	// 	defaultMessage:
@@ -84,8 +107,7 @@ const messages = defineMessages({
 	},
 	gameSettingsDescription: {
 		id: 'app.settings.synced-options.game-settings.description',
-		defaultMessage:
-			'Use the same graphics, keybinds, and other game settings across your instances.',
+		defaultMessage: 'Use the same game options across your instances',
 	},
 	gameSettingsButton: {
 		id: 'app.settings.synced-options.game-settings.button',
@@ -123,10 +145,6 @@ const messages = defineMessages({
 		id: 'app.settings.synced-options.creative-hotbars.description',
 		defaultMessage: 'Use the same saved creative hotbars across your instances.',
 	},
-	chooseSyncSourceTitle: {
-		id: 'app.settings.synced-options.choose-sync-source.title',
-		defaultMessage: 'Choose a sync source',
-	},
 	multiplayerServersSyncSourceDescription: {
 		id: 'app.settings.synced-options.choose-sync-source.multiplayer-servers-description',
 		defaultMessage: 'Pick the instance whose multiplayer servers become the shared copy.',
@@ -143,18 +161,6 @@ const messages = defineMessages({
 		id: 'app.settings.synced-options.choose-sync-source.game-settings-description',
 		defaultMessage: 'Choose which instance to copy game settings from.',
 	},
-	searchInstance: {
-		id: 'app.settings.synced-options.choose-sync-source.search-placeholder',
-		defaultMessage: 'Search instance',
-	},
-	noInstancesFound: {
-		id: 'app.settings.synced-options.choose-sync-source.no-instances-found',
-		defaultMessage: 'No instances found',
-	},
-	syncButton: {
-		id: 'app.settings.synced-options.choose-sync-source.sync',
-		defaultMessage: 'Sync',
-	},
 	commandHistoryEditorTitle: {
 		id: 'app.settings.synced-options.command-history.editor-title',
 		defaultMessage: 'Edit command history',
@@ -218,7 +224,15 @@ const messages = defineMessages({
 	},
 	noServersSyncedYet: {
 		id: 'app.settings.synced-options.multiplayer-servers.none-synced-yet',
-		defaultMessage: 'No servers synced yet',
+		defaultMessage: "You haven't synced any servers yet",
+	},
+	noResourcePacksSyncedYet: {
+		id: 'app.settings.synced-options.resource-packs.none-synced-yet',
+		defaultMessage: "You haven't synced any resource packs yet",
+	},
+	noDataPacksSyncedYet: {
+		id: 'app.settings.synced-options.data-packs.none-synced-yet',
+		defaultMessage: "You haven't synced any data packs yet",
 	},
 	noInstancesToEdit: {
 		id: 'app.settings.synced-options.edit.no-instances',
@@ -375,7 +389,7 @@ const globalRows: Array<{
 	option: SyncedOption
 	title: keyof typeof messages
 	description?: keyof typeof messages
-	editable?: 'game-settings' | 'servers' | 'commands'
+	editable?: 'game-settings' | 'servers' | 'commands' | 'resourcepack' | 'datapack'
 }> = [
 	{
 		option: 'game_options',
@@ -389,6 +403,18 @@ const globalRows: Array<{
 		description: 'multiplayerServersDescription',
 		editable: 'servers',
 	},
+	{
+		option: 'resource_packs',
+		title: 'resourcePacks',
+		description: 'resourcePacksDescription',
+		editable: 'resourcepack',
+	},
+	{
+		option: 'data_packs',
+		title: 'dataPacks',
+		description: 'dataPacksDescription',
+		editable: 'datapack',
+	},
 	{
 		option: 'command_history',
 		title: 'commandHistory',
@@ -402,11 +428,13 @@ const globalRows: Array<{
 	},
 ]
 
-const globalSyncedOptionsQueryKey = ['global-synced-options'] as const
-const initializedSyncedOptionsQueryKey = ['initialized-synced-options'] as const
-const gameOptionsSyncSourcesQueryKey = ['game-options-sync-sources'] as const
-const globalSyncedOptionsMutationKey = ['global-synced-options', 'set'] as const
+const globalSyncedOptionsQueryKey = syncedOptionsKeys.global
+const initializedSyncedOptionsQueryKey = syncedOptionsKeys.initialized
+const gameOptionsSyncSourcesQueryKey = syncedOptionsKeys.gameSources
+const globalSyncedOptionsMutationKey = syncedOptionsKeys.set
 const defaultGlobalOptions: GlobalSyncedOptions = {
+	resource_packs: false,
+	data_packs: false,
 	game_options: false,
 	command_history: false,
 	multiplayer_servers: false,
@@ -414,18 +442,11 @@ const defaultGlobalOptions: GlobalSyncedOptions = {
 	screenshots: false,
 }
 
-const globalOptionsQuery = useQuery({
-	queryKey: globalSyncedOptionsQueryKey,
-	queryFn: get_global_synced_options,
-})
-const initializedOptionsQuery = useQuery({
-	queryKey: initializedSyncedOptionsQueryKey,
-	queryFn: get_initialized_synced_options,
-})
-const gameOptionSourcesQuery = useQuery({
-	queryKey: gameOptionsSyncSourcesQueryKey,
-	queryFn: list_game_options_sync_sources,
-})
+const globalOptionsQuery = useQuery(globalSyncedOptionsQueryOptions())
+const initializedOptionsQuery = useQuery(initializedSyncedOptionsQueryOptions())
+const gameOptionSourcesQuery = useQuery(gameOptionsSyncSourcesQueryOptions())
+const resourcePacksQuery = useQuery(syncedPackQueryOptions('resourcepack'))
+const dataPacksQuery = useQuery(syncedPackQueryOptions('datapack'))
 const globalOptions = computed(() => globalOptionsQuery.data.value ?? defaultGlobalOptions)
 const initializedOptions = computed(
 	() => initializedOptionsQuery.data.value ?? defaultGlobalOptions,
@@ -448,8 +469,7 @@ const hasGameOptionsToEdit = computed(
 )
 const baseOption = ref<SyncedOption | null>(null)
 const baseInstanceId = ref(instances.value[0]?.id ?? '')
-const baseInstanceSearch = ref('')
-const baseModal = ref<InstanceType<typeof NewModal> | null>(null)
+const baseModal = ref<InstanceType<typeof SyncSourceModal> | null>(null)
 const gameSettingsModal = ref<InstanceType<typeof GameSettingsModal> | null>(null)
 const commandHistoryModal = ref<InstanceType<typeof NewModal> | null>(null)
 const serverEditorModal = ref<InstanceType<typeof NewModal> | null>(null)
@@ -580,25 +600,21 @@ const baseInstanceDescription = computed(() => {
 	}
 })
 
-const filteredBaseInstances = computed(() => {
-	const search = baseInstanceSearch.value.trim().toLowerCase()
-	const candidates: BaseSourceCandidate[] =
-		baseOption.value === 'game_options'
-			? gameOptionSources.value.map((source) => ({
-					id: source.source_id,
-					name: source.name,
-					icon_path: source.icon_path,
-					eligible: source.eligible,
-				}))
-			: instances.value.map((instance) => ({
-					id: instance.id,
-					name: instance.name,
-					icon_path: instance.icon_path,
-					eligible: true,
-				}))
-	if (!search) return candidates
-	return candidates.filter((instance) => instance.name.toLowerCase().includes(search))
-})
+const baseInstances = computed<BaseSourceCandidate[]>(() =>
+	baseOption.value === 'game_options'
+		? gameOptionSources.value.map((source) => ({
+				id: source.source_id,
+				name: source.name,
+				icon_path: source.icon_path,
+				eligible: source.eligible,
+			}))
+		: instances.value.map((instance) => ({
+				id: instance.id,
+				name: instance.name,
+				icon_path: instance.icon_path,
+				eligible: true,
+			})),
+)
 
 async function invalidateSyncedOptions() {
 	await Promise.all([
@@ -606,11 +622,29 @@ async function invalidateSyncedOptions() {
 		queryClient.invalidateQueries({ queryKey: ['instance-synced-options'] }),
 		queryClient.invalidateQueries({ queryKey: globalSyncedOptionsQueryKey }),
 		queryClient.invalidateQueries({ queryKey: initializedSyncedOptionsQueryKey }),
+		queryClient.invalidateQueries({ queryKey: syncedPackKeys.all }),
 	])
 }
 
+function emptySyncedContentMessage(row: (typeof globalRows)[number]) {
+	if (
+		row.editable === 'servers' &&
+		(instances.value.length === 0 || syncedServers.value.length === 0)
+	) {
+		return messages.noServersSyncedYet
+	}
+	if (row.editable === 'resourcepack' && !resourcePacksQuery.data.value?.length) {
+		return messages.noResourcePacksSyncedYet
+	}
+	if (row.editable === 'datapack' && !dataPacksQuery.data.value?.length) {
+		return messages.noDataPacksSyncedYet
+	}
+}
+
 function canEditGlobalOption(row: (typeof globalRows)[number]): boolean {
 	if (!row.editable || !globalOptions.value[row.option]) return false
+	if (emptySyncedContentMessage(row)) return false
+	if (row.editable === 'resourcepack' || row.editable === 'datapack') return true
 	if (row.editable === 'game-settings') return hasGameOptionsToEdit.value
 	return (
 		instances.value.length > 0 &&
@@ -620,6 +654,13 @@ function canEditGlobalOption(row: (typeof globalRows)[number]): boolean {
 }
 
 function editGlobalOptionTooltip(row: (typeof globalRows)[number]): string {
+	const emptyMessage = emptySyncedContentMessage(row)
+	if (emptyMessage) return formatMessage(emptyMessage)
+	if (row.editable === 'resourcepack' || row.editable === 'datapack') {
+		return formatMessage(
+			globalOptions.value[row.option] ? commonMessages.editButton : messages.packsDisabled,
+		)
+	}
 	if (row.editable === 'game-settings') {
 		if (!hasGameOptionsToEdit.value) return formatMessage(messages.noGameOptionsToEdit)
 		if (!globalOptions.value[row.option]) {
@@ -633,9 +674,6 @@ function editGlobalOptionTooltip(row: (typeof globalRows)[number]): string {
 	if (!initializedOptions.value[row.option]) {
 		return formatMessage(messages.noSyncedDataToEdit)
 	}
-	if (row.editable === 'servers' && syncedServers.value.length === 0) {
-		return formatMessage(messages.noServersSyncedYet)
-	}
 	return formatMessage(commonMessages.editButton)
 }
 
@@ -695,16 +733,11 @@ function applyGlobalOption(option: SyncedOption, enabled: boolean, baseInstanceI
 async function chooseBaseInstance(option: SyncedOption) {
 	const generation = ++baseSourceGeneration
 	baseOption.value = option
-	baseInstanceSearch.value = ''
 	baseSourcesLoading.value = option === 'game_options'
 
 	if (option === 'game_options') {
 		try {
-			const sources = await queryClient.fetchQuery({
-				queryKey: gameOptionsSyncSourcesQueryKey,
-				queryFn: list_game_options_sync_sources,
-				staleTime: 0,
-			})
+			const sources = await queryClient.fetchQuery(gameOptionsSyncSourcesQueryOptions())
 			if (generation !== baseSourceGeneration || baseOption.value !== option) return
 			const eligibleSources = sources.filter((source) => source.eligible)
 			baseInstanceId.value = eligibleSources[0]?.source_id ?? ''
@@ -744,7 +777,12 @@ async function chooseBaseInstance(option: SyncedOption) {
 }
 
 function toggleGlobalOption(option: SyncedOption, enabled: boolean) {
-	if (enabled && option !== 'screenshots') {
+	if (
+		enabled &&
+		option !== 'screenshots' &&
+		option !== 'resource_packs' &&
+		option !== 'data_packs'
+	) {
 		void chooseBaseInstance(option)
 		return
 	}
@@ -766,6 +804,16 @@ async function confirmBaseInstance() {
 	}
 }
 
+function editGlobalOption(row: (typeof globalRows)[number]) {
+	if (row.editable === 'resourcepack' || row.editable === 'datapack') {
+		void syncedPacksModal.value?.show(row.editable)
+	} else if (row.editable === 'commands') {
+		void openCommandHistoryEditor()
+	} else {
+		void openServerEditor()
+	}
+}
+
 function openGameSettings() {
 	if (!hasGameOptionsToEdit.value) return
 	gameSettingsModal.value?.show()
@@ -946,93 +994,19 @@ watch(
 </script>
 
 <template>
+	<SyncedPacksModal ref="syncedPacksModal" />
 	<div>
 		<GameSettingsModal ref="gameSettingsModal" @saved="handleGameSettingsSaved" />
 
-		<NewModal
+		<SyncSourceModal
 			ref="baseModal"
-			:header="formatMessage(messages.chooseSyncSourceTitle)"
-			no-padding
-			actions-divider
-			max-width="560px"
-			width="560px"
-			:disable-close="globalOptionMutation.isPending.value"
-		>
-			<p class="m-0 border-0 border-b border-solid border-surface-5 p-6 text-primary">
-				{{ baseInstanceDescription }}
-			</p>
-
-			<div class="flex h-[400px] flex-col gap-3 overflow-y-auto bg-surface-2 px-6 py-4">
-				<Input
-					v-model="baseInstanceSearch"
-					:icon="SearchIcon"
-					type="search"
-					autocomplete="off"
-					:placeholder="formatMessage(messages.searchInstance)"
-					class="shrink-0"
-				/>
-
-				<div v-if="baseSourcesLoading" class="flex flex-1 items-center justify-center">
-					<RefreshCwIcon class="size-5 animate-spin text-secondary" />
-				</div>
-				<div
-					v-else-if="filteredBaseInstances.length === 0"
-					class="flex flex-1 items-center justify-center text-secondary"
-				>
-					{{ formatMessage(messages.noInstancesFound) }}
-				</div>
-				<div
-					v-else
-					role="radiogroup"
-					:aria-label="formatMessage(messages.chooseSyncSourceTitle)"
-					class="flex flex-col gap-1"
-				>
-					<CheckCircleButton
-						v-for="instance in filteredBaseInstances"
-						:key="instance.id"
-						:checked="baseInstanceId === instance.id"
-						:disabled="!instance.eligible"
-						class="min-h-10"
-						@click="instance.eligible && (baseInstanceId = instance.id)"
-					>
-						<span class="size-5 shrink-0 overflow-hidden rounded-[6px]">
-							<Avatar
-								:src="getInstanceIconUrl(instance.icon_path)"
-								:alt="instance.name"
-								:tint-by="instance.id"
-								size="1.25rem"
-								no-shadow
-							/>
-						</span>
-						<span class="min-w-0 flex-1 truncate">{{ instance.name }}</span>
-					</CheckCircleButton>
-				</div>
-			</div>
-			<template #actions>
-				<div class="flex justify-end gap-2 p-2">
-					<Button
-						type="outlined"
-						:disabled="globalOptionMutation.isPending.value"
-						@click="baseModal?.hide()"
-					>
-						<XIcon />
-						{{ formatMessage(commonMessages.cancelButton) }}
-					</Button>
-					<Button
-						type="colored"
-						color="brand"
-						:disabled="
-							!baseInstanceId || baseSourcesLoading || globalOptionMutation.isPending.value
-						"
-						:loading="globalOptionMutation.isPending.value"
-						@click="confirmBaseInstance"
-					>
-						<RefreshCwIcon v-if="!globalOptionMutation.isPending.value" />
-						{{ formatMessage(messages.syncButton) }}
-					</Button>
-				</div>
-			</template>
-		</NewModal>
+			v-model="baseInstanceId"
+			:description="baseInstanceDescription"
+			:sources="baseInstances"
+			:loading="baseSourcesLoading"
+			:pending="globalOptionMutation.isPending.value"
+			@confirm="confirmBaseInstance"
+		/>
 
 		<NewModal
 			ref="commandHistoryModal"
@@ -1292,9 +1266,7 @@ watch(
 										globalOptionMutation.isPending.value
 									"
 									:label="formatMessage(commonMessages.editButton)"
-									@click="
-										row.editable === 'commands' ? openCommandHistoryEditor() : openServerEditor()
-									"
+									@click="editGlobalOption(row)"
 								>
 									<EditIcon />
 								</IconButton>
diff --git a/apps/app-frontend/src/components/ui/settings/instances/SyncSourceModal.vue b/apps/app-frontend/src/components/ui/settings/instances/SyncSourceModal.vue
new file mode 100644
index 0000000000..dda4b06ffc
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/settings/instances/SyncSourceModal.vue
@@ -0,0 +1,179 @@
+<script setup lang="ts">
+import { RefreshCwIcon, SearchIcon, SpinnerIcon, XIcon } from '@modrinth/assets'
+import {
+	Avatar,
+	Button,
+	CheckCircleButton,
+	commonMessages,
+	defineMessages,
+	Input,
+	NewModal,
+	useVIntl,
+} from '@modrinth/ui'
+import { computed, ref, useTemplateRef } from 'vue'
+
+import { getInstanceIconUrl } from '@/helpers/instance'
+
+const props = defineProps<{
+	description: string
+	sources: {
+		id: string
+		name: string
+		icon_path?: string | null
+		eligible: boolean
+	}[]
+	loading?: boolean
+	pending?: boolean
+	error?: boolean
+}>()
+
+const emit = defineEmits<{
+	confirm: []
+	close: []
+	retry: []
+}>()
+
+const selectedInstanceId = defineModel<string>({ required: true })
+const modal = useTemplateRef<InstanceType<typeof NewModal>>('modal')
+const search = ref('')
+const { formatMessage } = useVIntl()
+
+const messages = defineMessages({
+	title: {
+		id: 'app.settings.synced-options.choose-sync-source.title',
+		defaultMessage: 'Choose a sync source',
+	},
+	search: {
+		id: 'app.settings.synced-options.choose-sync-source.search-placeholder',
+		defaultMessage: 'Search instance',
+	},
+	empty: {
+		id: 'app.settings.synced-options.choose-sync-source.no-instances-found',
+		defaultMessage: 'No instances found',
+	},
+	sync: {
+		id: 'app.settings.synced-options.choose-sync-source.sync',
+		defaultMessage: 'Sync',
+	},
+	loadError: {
+		id: 'app.settings.synced-options.choose-sync-source.load-error',
+		defaultMessage: 'Could not load sync sources. Please try again.',
+	},
+	retry: {
+		id: 'app.settings.synced-options.choose-sync-source.retry',
+		defaultMessage: 'Try again',
+	},
+})
+
+const filteredSources = computed(() => {
+	const query = search.value.trim().toLocaleLowerCase()
+	return props.sources.filter((source) => source.name.toLocaleLowerCase().includes(query))
+})
+const canConfirm = computed(
+	() =>
+		!props.loading &&
+		!props.pending &&
+		!props.error &&
+		props.sources.some((source) => source.id === selectedInstanceId.value && source.eligible),
+)
+
+function show() {
+	search.value = ''
+	modal.value?.show()
+}
+
+function hide() {
+	modal.value?.hide()
+}
+
+defineExpose({ show, hide })
+</script>
+
+<template>
+	<NewModal
+		ref="modal"
+		:header="formatMessage(messages.title)"
+		no-padding
+		actions-divider
+		max-width="560px"
+		width="560px"
+		:disable-close="pending"
+		:on-after-hide="() => emit('close')"
+	>
+		<p class="m-0 border-0 border-b border-solid border-surface-5 p-6 text-primary">
+			{{ description }}
+		</p>
+
+		<div class="flex h-[400px] flex-col gap-3 overflow-y-auto bg-surface-2 px-6 py-4">
+			<Input
+				v-model="search"
+				:icon="SearchIcon"
+				type="search"
+				autocomplete="off"
+				:placeholder="formatMessage(messages.search)"
+				class="shrink-0"
+			/>
+
+			<div v-if="loading" class="flex flex-1 items-center justify-center" aria-busy="true">
+				<SpinnerIcon class="size-5 animate-spin text-secondary" />
+			</div>
+			<div v-else-if="error" class="flex flex-1 flex-col items-center justify-center gap-3">
+				<p role="alert" class="m-0 text-center text-primary">
+					{{ formatMessage(messages.loadError) }}
+				</p>
+				<Button @click="emit('retry')">{{ formatMessage(messages.retry) }}</Button>
+			</div>
+			<div
+				v-else-if="filteredSources.length === 0"
+				class="flex flex-1 items-center justify-center text-secondary"
+			>
+				{{ formatMessage(messages.empty) }}
+			</div>
+			<div
+				v-else
+				role="radiogroup"
+				:aria-label="formatMessage(messages.title)"
+				class="flex flex-col gap-1"
+			>
+				<CheckCircleButton
+					v-for="source in filteredSources"
+					:key="source.id"
+					:checked="selectedInstanceId === source.id"
+					:disabled="pending || !source.eligible"
+					class="min-h-10"
+					@click="selectedInstanceId = source.id"
+				>
+					<span class="size-5 shrink-0 overflow-hidden rounded-[6px]">
+						<Avatar
+							:src="getInstanceIconUrl(source.icon_path)"
+							:alt="source.name"
+							:tint-by="source.id"
+							size="1.25rem"
+							no-shadow
+						/>
+					</span>
+					<span class="min-w-0 flex-1 truncate">{{ source.name }}</span>
+				</CheckCircleButton>
+			</div>
+		</div>
+		<template #actions>
+			<div class="flex justify-end gap-2 p-2">
+				<Button type="outlined" :disabled="pending" @click="hide">
+					<XIcon />
+					{{ formatMessage(commonMessages.cancelButton) }}
+				</Button>
+				<Button
+					type="colored"
+					color="brand"
+					:disabled="!canConfirm"
+					:loading="pending"
+					@click="canConfirm && emit('confirm')"
+				>
+					<SpinnerIcon v-if="pending" class="animate-spin" />
+					<RefreshCwIcon v-else />
+					{{ formatMessage(messages.sync) }}
+				</Button>
+			</div>
+		</template>
+	</NewModal>
+</template>
diff --git a/apps/app-frontend/src/components/ui/settings/instances/SyncedPacksModal.vue b/apps/app-frontend/src/components/ui/settings/instances/SyncedPacksModal.vue
new file mode 100644
index 0000000000..5f9ec62b56
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/settings/instances/SyncedPacksModal.vue
@@ -0,0 +1,144 @@
+<script setup lang="ts">
+import { TrashIcon } from '@modrinth/assets'
+import {
+	Button,
+	type ButtonMenuOption,
+	commonMessages,
+	type ContentItem,
+	defineMessages,
+	injectNotificationManager,
+	ManagedContentModal,
+	useVIntl,
+} from '@modrinth/ui'
+import { useMutation, useQuery, useQueryClient } from '@tanstack/vue-query'
+import { computed, nextTick, ref, watch } from 'vue'
+
+import SyncedContentModal from '@/components/ui/instance/SyncedContentModal.vue'
+import { useAppEvent } from '@/composables/use-app-event'
+import {
+	remove_synced_pack,
+	set_synced_pack_enabled,
+	syncedPackKeys,
+	syncedPackQueryOptions,
+	type SyncedPackType,
+} from '@/helpers/synced-packs'
+import { instanceKeys } from '@/pages/instance/query-options'
+
+const { formatMessage } = useVIntl()
+const { handleError } = injectNotificationManager()
+const queryClient = useQueryClient()
+const manager = ref<InstanceType<typeof ManagedContentModal>>()
+const confirmation = ref<InstanceType<typeof SyncedContentModal>>()
+const projectType = ref<SyncedPackType>('resourcepack')
+const isOpen = ref(false)
+
+const messages = defineMessages({
+	resourcePacks: {
+		id: 'app.synced-packs.resource-packs.title',
+		defaultMessage: 'Synced resource packs',
+	},
+	dataPacks: { id: 'app.synced-packs.data-packs.title', defaultMessage: 'Synced data packs' },
+	empty: {
+		id: 'app.synced-packs.empty',
+		defaultMessage: 'Add packs from an instance’s content page to start syncing.',
+	},
+	loadFailed: {
+		id: 'app.synced-packs.load-failed',
+		defaultMessage: 'Packs could not be loaded. Try refreshing.',
+	},
+})
+
+const title = computed(() =>
+	formatMessage(projectType.value === 'resourcepack' ? messages.resourcePacks : messages.dataPacks),
+)
+const packsQuery = useQuery(
+	computed(() => ({
+		...syncedPackQueryOptions(projectType.value),
+		enabled: isOpen.value,
+	})),
+)
+const mutation = useMutation({
+	mutationFn: (operation: () => Promise<void>) => operation(),
+	onError: (error) => handleError(error),
+	onSettled: async () => {
+		await Promise.all([
+			queryClient.invalidateQueries({ queryKey: syncedPackKeys.all }),
+			queryClient.invalidateQueries({ queryKey: instanceKeys.all }),
+		])
+	},
+})
+
+watch([packsQuery.data, packsQuery.isPending], ([items, pending]) => {
+	if (isOpen.value && !pending) manager.value?.setItems(items ?? [])
+})
+watch(packsQuery.error, (error) => {
+	if (error) handleError(error)
+})
+useAppEvent('instance', (event) => {
+	if (isOpen.value && event.event === 'synced') {
+		void queryClient.invalidateQueries({ queryKey: syncedPackKeys.all })
+	}
+})
+
+async function show(type: SyncedPackType) {
+	projectType.value = type
+	isOpen.value = true
+	await nextTick()
+	if (packsQuery.data.value) manager.value?.show(packsQuery.data.value)
+	else manager.value?.showLoading()
+}
+
+async function togglePacks(items: ContentItem[], enabled: boolean) {
+	const changing = items.filter((item) => item.enabled !== enabled)
+	if (changing.length === 0 || mutation.isPending.value) return
+	if (!(await confirmation.value?.confirmChange(enabled ? 'enable' : 'disable', changing))) return
+	mutation.mutate(async () => {
+		for (const item of changing) await set_synced_pack_enabled(item.id, enabled)
+	})
+}
+
+async function deletePack(item: ContentItem) {
+	if ((await confirmation.value?.confirmDelete([item])) !== 'all') return
+	mutation.mutate(() => remove_synced_pack(item.id))
+}
+
+function overflowOptions(item: ContentItem): ButtonMenuOption[] {
+	return [
+		{
+			id: 'delete-synced-pack',
+			label: formatMessage(commonMessages.deleteLabel),
+			icon: TrashIcon,
+			tone: 'red',
+			action: () => deletePack(item),
+		},
+	]
+}
+
+defineExpose({ show })
+</script>
+
+<template>
+	<SyncedContentModal ref="confirmation" />
+	<ManagedContentModal
+		ref="manager"
+		:header="title"
+		:empty-description="
+			formatMessage(packsQuery.isError.value ? messages.loadFailed : messages.empty)
+		"
+		:show-version="false"
+		filter-mode="status"
+		enable-toggle
+		:action-disabled="mutation.isPending.value"
+		:get-overflow-options="overflowOptions"
+		@update:enabled="(item, enabled) => togglePacks([item], enabled)"
+		@bulk:enable="(items) => togglePacks(items, true)"
+		@bulk:disable="(items) => togglePacks(items, false)"
+		@hide="isOpen = false"
+	>
+		<template v-if="packsQuery.isError.value" #toolbar>
+			<Button @click="packsQuery.refetch()">{{
+				formatMessage(commonMessages.refreshButton)
+			}}</Button>
+		</template>
+	</ManagedContentModal>
+</template>
diff --git a/apps/app-frontend/src/components/ui/sync-instances-update-modal/index.vue b/apps/app-frontend/src/components/ui/sync-instances-update-modal/index.vue
new file mode 100644
index 0000000000..a76bd83942
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/sync-instances-update-modal/index.vue
@@ -0,0 +1,333 @@
+<script setup lang="ts">
+import { CircleSlashIcon, RefreshCwIcon, RightArrowIcon, XIcon } from '@modrinth/assets'
+import {
+	Button,
+	commonMessages,
+	defineMessages,
+	IconButton,
+	NewModal,
+	Toggle,
+	useVIntl,
+} from '@modrinth/ui'
+import { useLocalStorage } from '@vueuse/core'
+import { computed, nextTick, useTemplateRef } from 'vue'
+
+import SyncSourceModal from '@/components/ui/settings/instances/SyncSourceModal.vue'
+
+import {
+	type SyncUpdateOption,
+	syncUpdateOptions,
+	useSyncInstancesUpdate,
+} from './use-sync-instances-update'
+
+const hasSeenUpdate = useLocalStorage('sync-instances-update-modal-shown', false)
+const modal = useTemplateRef<InstanceType<typeof NewModal>>('modal')
+const sourceModal = useTemplateRef<InstanceType<typeof SyncSourceModal>>('sourceModal')
+const { formatMessage } = useVIntl()
+const {
+	isOpen,
+	globalOptionsQuery,
+	allSynced,
+	syncMutation,
+	sourceOptions,
+	sourceInstanceId,
+	sources,
+	sourcesLoading,
+	sourcesError,
+	chooseSource,
+	retrySources,
+} = useSyncInstancesUpdate()
+
+const messages = defineMessages({
+	badge: {
+		id: 'app.sync-instances-update.badge',
+		defaultMessage: 'New this update',
+	},
+	title: {
+		id: 'app.sync-instances-update.title',
+		defaultMessage: 'Sync your instances',
+	},
+	description: {
+		id: 'app.sync-instances-update.description',
+		defaultMessage:
+			'You can now sync options like game settings, servers, resource packs, and more across your instances, so everything stays the same every time you play!',
+	},
+	manageLater: {
+		id: 'app.sync-instances-update.manage-later',
+		defaultMessage: 'You can enable syncing now and manage it later in your app settings.',
+	},
+	skip: {
+		id: 'app.sync-instances-update.skip',
+		defaultMessage: 'Skip',
+	},
+	syncAll: {
+		id: 'app.sync-instances-update.sync-all',
+		defaultMessage: 'Sync all',
+	},
+	game_options: {
+		id: 'app.settings.synced-options.game-settings',
+		defaultMessage: 'Sync game options',
+	},
+	multiplayer_servers: {
+		id: 'app.settings.synced-options.multiplayer-servers',
+		defaultMessage: 'Sync multiplayer servers',
+	},
+	command_history: {
+		id: 'app.settings.synced-options.command-history',
+		defaultMessage: 'Sync command history',
+	},
+	creative_hotbars: {
+		id: 'app.sync-instances-update.creative-hotbars',
+		defaultMessage: 'Sync creative hotbars',
+	},
+	resource_packs: {
+		id: 'app.settings.synced-options.resource-packs',
+		defaultMessage: 'Sync resource packs',
+	},
+	data_packs: {
+		id: 'app.settings.synced-options.data-packs',
+		defaultMessage: 'Sync data packs',
+	},
+	allSourcesDescription: {
+		id: 'app.sync-instances-update.choose-source.all',
+		defaultMessage: 'Choose the instance to use as the sync source for all six settings.',
+	},
+	game_options_source: {
+		id: 'app.settings.synced-options.choose-sync-source.game-settings-description',
+		defaultMessage: 'Choose which instance to copy game settings from.',
+	},
+	multiplayer_servers_source: {
+		id: 'app.settings.synced-options.choose-sync-source.multiplayer-servers-description',
+		defaultMessage: 'Pick the instance whose multiplayer servers become the shared copy.',
+	},
+	command_history_source: {
+		id: 'app.settings.synced-options.choose-sync-source.command-history-description',
+		defaultMessage: 'Pick the instance whose command history becomes the shared copy.',
+	},
+	creative_hotbars_source: {
+		id: 'app.settings.synced-options.choose-sync-source.creative-hotbars-description',
+		defaultMessage: 'Pick the instance whose saved creative hotbars become the shared copy.',
+	},
+	resource_packs_source: {
+		id: 'app.sync-instances-update.choose-source.resource-packs',
+		defaultMessage: 'Choose which instance to copy resource packs from.',
+	},
+	data_packs_source: {
+		id: 'app.sync-instances-update.choose-source.data-packs',
+		defaultMessage: 'Choose which instance to copy data packs from.',
+	},
+	loadError: {
+		id: 'app.sync-instances-update.load-error',
+		defaultMessage: 'Could not load your sync settings. Please try again.',
+	},
+	retry: {
+		id: 'app.sync-instances-update.retry',
+		defaultMessage: 'Try again',
+	},
+})
+
+const sourceDescription = computed(() => {
+	const option = sourceOptions.value[0]
+	return formatMessage(
+		option && sourceOptions.value.length === 1
+			? messages[`${option}_source`]
+			: messages.allSourcesDescription,
+	)
+})
+const busy = computed(() => sourceOptions.value.length > 0 || syncMutation.isPending.value)
+const controlsDisabled = computed(() => !globalOptionsQuery.data.value || busy.value)
+
+function show() {
+	isOpen.value = true
+	modal.value?.show()
+}
+
+function showOnce() {
+	if (!hasSeenUpdate.value) {
+		show()
+	}
+}
+
+function hide() {
+	modal.value?.hide()
+}
+
+function handleHide() {
+	isOpen.value = false
+	hasSeenUpdate.value = true
+}
+
+async function openSourcePicker(options: readonly SyncUpdateOption[], retry = false) {
+	if (syncMutation.isPending.value || (retry ? sourcesLoading.value : controlsDisabled.value)) {
+		return
+	}
+
+	chooseSource(options)
+	await nextTick()
+	const result = await retrySources()
+	if (!result.isSuccess || sources.value.some((source) => source.eligible)) {
+		if (!retry) sourceModal.value?.show()
+		return
+	}
+
+	try {
+		await syncMutation.mutateAsync({ options: [...options], enabled: true })
+		await nextTick()
+		if (retry) sourceModal.value?.hide()
+	} catch {
+		return
+	} finally {
+		if (!retry) sourceOptions.value = []
+	}
+}
+
+function toggleOption(option: SyncUpdateOption, enabled: boolean) {
+	if (controlsDisabled.value) return
+	if (enabled) {
+		void openSourcePicker([option])
+	} else {
+		syncMutation.mutate({ options: [option], enabled: false })
+	}
+}
+
+async function confirmSource() {
+	if (
+		syncMutation.isPending.value ||
+		sourceOptions.value.length === 0 ||
+		!sources.value.some((source) => source.id === sourceInstanceId.value && source.eligible)
+	) {
+		return
+	}
+
+	try {
+		await syncMutation.mutateAsync({
+			options: [...sourceOptions.value],
+			enabled: true,
+			baseInstanceId: sourceInstanceId.value,
+		})
+		await nextTick()
+		sourceModal.value?.hide()
+	} catch {
+		return
+	}
+}
+
+defineExpose({ show, showOnce, hide })
+</script>
+
+<template>
+	<NewModal
+		ref="modal"
+		hide-header
+		no-padding
+		width="770px"
+		max-width="calc(100vw - 2rem)"
+		:aria-label="formatMessage(messages.title)"
+		:disable-close="busy"
+		:on-after-hide="handleHide"
+		class="!overflow-y-auto !rounded-[20px]"
+	>
+		<div class="relative grid w-[768px] max-w-full grid-cols-2 max-[700px]:grid-cols-1">
+			<IconButton
+				type="quiet"
+				size="sm"
+				:label="formatMessage(commonMessages.closeButton)"
+				class="!absolute right-4 top-4 z-10"
+				:disabled="busy"
+				@click="hide"
+			>
+				<XIcon />
+			</IconButton>
+
+			<section class="flex min-h-96 min-w-0 flex-col gap-6 bg-surface-3 p-8">
+				<div
+					class="flex h-8 w-fit items-center rounded-full border border-solid border-brand bg-brand-highlight px-2.5 text-sm font-medium leading-5 text-brand"
+				>
+					{{ formatMessage(messages.badge) }}
+				</div>
+
+				<div class="flex min-w-0 flex-col gap-4">
+					<h2 class="m-0 text-2xl font-semibold leading-6 text-contrast">
+						{{ formatMessage(messages.title) }}
+					</h2>
+					<p class="m-0 leading-6 text-primary">{{ formatMessage(messages.description) }}</p>
+					<p v-if="!allSynced" class="m-0 leading-6 text-primary">
+						{{ formatMessage(messages.manageLater) }}
+					</p>
+				</div>
+
+				<div v-if="globalOptionsQuery.isError.value" class="flex flex-col items-start gap-2">
+					<p role="alert" class="m-0 text-primary">{{ formatMessage(messages.loadError) }}</p>
+					<Button @click="globalOptionsQuery.refetch()">{{ formatMessage(messages.retry) }}</Button>
+				</div>
+
+				<div class="mt-auto flex items-center gap-2.5">
+					<Button v-if="!allSynced" size="lg" :disabled="busy" @click="hide">
+						<CircleSlashIcon />
+						{{ formatMessage(messages.skip) }}
+					</Button>
+					<Button
+						v-if="allSynced"
+						type="colored"
+						color="brand"
+						size="lg"
+						:disabled="controlsDisabled"
+						@click="hide"
+					>
+						{{ formatMessage(commonMessages.continueButton) }}
+						<RightArrowIcon />
+					</Button>
+					<Button
+						v-else
+						type="colored"
+						color="brand"
+						size="lg"
+						:disabled="controlsDisabled"
+						@click="openSourcePicker(syncUpdateOptions)"
+					>
+						<RefreshCwIcon />
+						{{ formatMessage(messages.syncAll) }}
+					</Button>
+				</div>
+			</section>
+
+			<section
+				class="flex min-w-0 items-center border-0 border-l border-solid border-surface-5 bg-surface-2 p-10 max-[700px]:border-l-0 max-[700px]:border-t"
+			>
+				<div class="flex w-full flex-col gap-5">
+					<div
+						v-for="option in syncUpdateOptions"
+						:key="option"
+						class="flex items-center justify-between gap-4"
+					>
+						<label
+							:for="`update-sync-${option}`"
+							class="text-base font-semibold leading-6 text-contrast"
+						>
+							{{ formatMessage(messages[option]) }}
+						</label>
+						<Toggle
+							:id="`update-sync-${option}`"
+							:model-value="globalOptionsQuery.data.value?.[option] ?? false"
+							:disabled="controlsDisabled"
+							class="!h-[26px] !w-[50px] !p-0.5 [&>span]:!m-0 [&>span]:!size-5"
+							@update:model-value="(enabled) => toggleOption(option, enabled)"
+						/>
+					</div>
+				</div>
+			</section>
+		</div>
+	</NewModal>
+	<SyncSourceModal
+		ref="sourceModal"
+		v-model="sourceInstanceId"
+		:description="sourceDescription"
+		:sources="sources"
+		:loading="sourcesLoading"
+		:pending="syncMutation.isPending.value"
+		:error="sourcesError"
+		@confirm="confirmSource"
+		@close="sourceOptions = []"
+		@retry="openSourcePicker(sourceOptions, true)"
+	/>
+</template>
diff --git a/apps/app-frontend/src/components/ui/sync-instances-update-modal/use-sync-instances-update.ts b/apps/app-frontend/src/components/ui/sync-instances-update-modal/use-sync-instances-update.ts
new file mode 100644
index 0000000000..432b05542b
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/sync-instances-update-modal/use-sync-instances-update.ts
@@ -0,0 +1,132 @@
+import { injectNotificationManager } from '@modrinth/ui'
+import { useMutation, useQuery, useQueryClient } from '@tanstack/vue-query'
+import { computed, ref, watch } from 'vue'
+
+import { set_global_synced_option } from '@/helpers/instance'
+import {
+	gameOptionsSyncSourcesQueryOptions,
+	globalSyncedOptionsQueryOptions,
+	syncedOptionsKeys,
+} from '@/helpers/synced-options'
+import { syncedPackKeys } from '@/helpers/synced-packs'
+import { instanceKeys, instanceListQueryOptions } from '@/pages/instance/query-options'
+
+export const syncUpdateOptions = [
+	'game_options',
+	'multiplayer_servers',
+	'command_history',
+	'creative_hotbars',
+	'resource_packs',
+	'data_packs',
+] as const
+
+export type SyncUpdateOption = (typeof syncUpdateOptions)[number]
+
+export function useSyncInstancesUpdate() {
+	const queryClient = useQueryClient()
+	const { handleError } = injectNotificationManager()
+	const isOpen = ref(false)
+	const sourceOptions = ref<SyncUpdateOption[]>([])
+	const sourceInstanceId = ref('')
+	const needsGameOptionsSource = computed(() => sourceOptions.value.includes('game_options'))
+	const globalOptionsQuery = useQuery({
+		...globalSyncedOptionsQueryOptions(),
+		enabled: isOpen,
+	})
+	const gameSourcesQuery = useQuery({
+		...gameOptionsSyncSourcesQueryOptions(),
+		enabled: needsGameOptionsSource,
+	})
+	const instancesQuery = useQuery({
+		...instanceListQueryOptions(),
+		staleTime: 0,
+		enabled: computed(() => sourceOptions.value.length > 0 && !needsGameOptionsSource.value),
+	})
+	const sources = computed(() =>
+		needsGameOptionsSource.value
+			? (gameSourcesQuery.data.value ?? []).map((source) => ({
+					id: source.source_id,
+					name: source.name,
+					icon_path: source.icon_path,
+					eligible: source.eligible,
+				}))
+			: (instancesQuery.data.value ?? []).map((instance) => ({
+					id: instance.id,
+					name: instance.name,
+					icon_path: instance.icon_path,
+					eligible: instance.install_stage === 'installed' && !instance.quarantined,
+				})),
+	)
+	const sourcesLoading = computed(() =>
+		needsGameOptionsSource.value
+			? gameSourcesQuery.isPending.value || gameSourcesQuery.isFetching.value
+			: instancesQuery.isPending.value || instancesQuery.isFetching.value,
+	)
+	const sourcesError = computed(() =>
+		needsGameOptionsSource.value ? gameSourcesQuery.isError.value : instancesQuery.isError.value,
+	)
+	const allSynced = computed(() =>
+		syncUpdateOptions.every((option) => globalOptionsQuery.data.value?.[option]),
+	)
+
+	watch([sources, sourceOptions], ([candidates]) => {
+		if (!candidates.some((source) => source.id === sourceInstanceId.value && source.eligible)) {
+			sourceInstanceId.value = candidates.find((source) => source.eligible)?.id ?? ''
+		}
+	})
+
+	const syncMutation = useMutation({
+		mutationKey: syncedOptionsKeys.set,
+		mutationFn: async ({
+			options,
+			enabled,
+			baseInstanceId,
+		}: {
+			options: readonly SyncUpdateOption[]
+			enabled: boolean
+			baseInstanceId?: string
+		}) => {
+			for (const option of options) {
+				const updated = await set_global_synced_option(option, enabled, baseInstanceId)
+				queryClient.setQueryData(syncedOptionsKeys.global, updated)
+			}
+		},
+		onMutate: () => queryClient.cancelQueries({ queryKey: syncedOptionsKeys.global }),
+		onError: handleError,
+		onSettled: () =>
+			Promise.all([
+				queryClient.invalidateQueries({ queryKey: syncedOptionsKeys.global }),
+				queryClient.invalidateQueries({ queryKey: syncedOptionsKeys.initialized }),
+				queryClient.invalidateQueries({ queryKey: syncedOptionsKeys.gameSources }),
+				queryClient.invalidateQueries({ queryKey: ['instance-synced-options'] }),
+				queryClient.invalidateQueries({ queryKey: instanceKeys.all }),
+				queryClient.invalidateQueries({ queryKey: ['worlds'] }),
+				queryClient.invalidateQueries({ queryKey: syncedPackKeys.all }),
+			]),
+	})
+
+	function chooseSource(options: readonly SyncUpdateOption[]) {
+		sourceInstanceId.value = ''
+		sourceOptions.value = [...options]
+	}
+
+	function retrySources() {
+		return needsGameOptionsSource.value
+			? gameSourcesQuery.refetch({ cancelRefetch: false })
+			: instancesQuery.refetch({ cancelRefetch: false })
+	}
+
+	return {
+		isOpen,
+		globalOptionsQuery,
+		allSynced,
+		syncMutation,
+		sourceOptions,
+		sourceInstanceId,
+		sources,
+		sourcesLoading,
+		sourcesError,
+		chooseSource,
+		retrySources,
+	}
+}
diff --git a/apps/app-frontend/src/composables/instances/use-synced-pack-actions.ts b/apps/app-frontend/src/composables/instances/use-synced-pack-actions.ts
new file mode 100644
index 0000000000..343dd99cf3
--- /dev/null
+++ b/apps/app-frontend/src/composables/instances/use-synced-pack-actions.ts
@@ -0,0 +1,150 @@
+import { LinkIcon, XIcon } from '@modrinth/assets'
+import {
+	type ButtonMenuOption,
+	type ContentItem,
+	defineMessages,
+	injectNotificationManager,
+	useVIntl,
+} from '@modrinth/ui'
+import { useMutation, useQuery, useQueryClient } from '@tanstack/vue-query'
+import { type Ref, watch } from 'vue'
+
+import type SyncedContentModal from '@/components/ui/instance/SyncedContentModal.vue'
+import { get_global_synced_options } from '@/helpers/instance'
+import {
+	desync_pack,
+	remove_synced_pack,
+	sync_pack,
+	type SyncedPackAction,
+	syncedPackKeys,
+} from '@/helpers/synced-packs'
+import type { GameInstance } from '@/helpers/types'
+import { instanceKeys } from '@/pages/instance/query-options'
+
+export function useSyncedPackActions(
+	instance: Ref<GameInstance>,
+	modal: Ref<InstanceType<typeof SyncedContentModal> | undefined>,
+	canMutate: (item: ContentItem) => boolean,
+	refresh: () => Promise<unknown>,
+) {
+	const { formatMessage } = useVIntl()
+	const { handleError } = injectNotificationManager()
+	const queryClient = useQueryClient()
+	const globalOptions = useQuery({
+		queryKey: ['global-synced-options'],
+		queryFn: get_global_synced_options,
+	})
+	const deleteEverywhere = new Set<string>()
+	watch(
+		[
+			() => globalOptions.data.value?.resource_packs,
+			() => globalOptions.data.value?.data_packs,
+			() => instance.value.synced_options.resource_packs,
+			() => instance.value.synced_options.data_packs,
+		],
+		() => refresh().catch(handleError),
+	)
+	const messages = defineMessages({
+		sync: { id: 'app.content.sync-pack', defaultMessage: 'Sync' },
+		desync: { id: 'app.content.desync-pack', defaultMessage: 'Desync' },
+		resourceDisabled: {
+			id: 'app.content.sync-resource-packs-disabled',
+			defaultMessage: 'Turn on resource pack syncing in app settings first.',
+		},
+		dataDisabled: {
+			id: 'app.content.sync-data-packs-disabled',
+			defaultMessage: 'Turn on data pack syncing in app settings first.',
+		},
+		override: {
+			id: 'app.content.sync-packs-override',
+			defaultMessage: 'Turn off the pack syncing override in this instance’s settings first.',
+		},
+	})
+
+	const mutation = useMutation({
+		mutationFn: (operation: () => Promise<void>) => operation(),
+		onError: (error) => handleError(error),
+		onSettled: async () => {
+			await Promise.all([
+				queryClient.invalidateQueries({ queryKey: syncedPackKeys.all }),
+				queryClient.invalidateQueries({ queryKey: instanceKeys.all }),
+			])
+			await refresh()
+		},
+	})
+
+	function sync(item: ContentItem) {
+		if (!item.file_path || mutation.isPending.value) return
+		const instanceId = instance.value.id
+		const projectPath = item.file_path
+		mutation.mutate(() => sync_pack(instanceId, projectPath))
+	}
+
+	async function desync(item: ContentItem) {
+		if (!item.synced_pack) return
+		const mode = await modal.value?.confirmDesync(item)
+		if (!mode) return
+		mutation.mutate(() => desync_pack(instance.value.id, item.synced_pack!.id, mode))
+	}
+
+	function overflowOptions(item: ContentItem): ButtonMenuOption[] {
+		if (
+			!['resourcepack', 'datapack'].includes(item.project_type) ||
+			!canMutate(item) ||
+			(item.source_kind && item.source_kind !== 'local')
+		)
+			return []
+		const option = item.project_type === 'resourcepack' ? 'resource_packs' : 'data_packs'
+		const disabledReason = !globalOptions.data.value?.[option]
+			? formatMessage(
+					option === 'resource_packs' ? messages.resourceDisabled : messages.dataDisabled,
+				)
+			: !instance.value.synced_options[option]
+				? formatMessage(messages.override)
+				: undefined
+		return [
+			{
+				id: item.synced_pack ? 'desync-pack' : 'sync-pack',
+				label: formatMessage(item.synced_pack ? messages.desync : messages.sync),
+				icon: item.synced_pack ? XIcon : LinkIcon,
+				disabled: mutation.isPending.value || !!disabledReason,
+				tooltip: disabledReason,
+				action: () => (item.synced_pack ? desync(item) : sync(item)),
+			},
+		]
+	}
+
+	async function confirmAction(action: SyncedPackAction, items: ContentItem[]) {
+		if (!items.some((item) => item.synced_pack)) return true
+		return (await modal.value?.confirmChange(action, items)) ?? false
+	}
+
+	async function confirmDeleteItems(items: ContentItem[]) {
+		deleteEverywhere.clear()
+		if (!items.some((item) => item.synced_pack)) return undefined
+		const choice = await modal.value?.confirmDelete(items)
+		if (!choice) return false
+		if (choice === 'all') {
+			for (const item of items) if (item.synced_pack) deleteEverywhere.add(item.synced_pack.id)
+		}
+		return true
+	}
+
+	async function deleteSyncedItem(item: ContentItem) {
+		if (!item.synced_pack) return false
+		if (deleteEverywhere.has(item.synced_pack.id)) {
+			await remove_synced_pack(item.synced_pack.id)
+			return true
+		}
+		await desync_pack(instance.value.id, item.synced_pack.id, 'keep_in_other_instances')
+		return false
+	}
+
+	return {
+		overflowOptions,
+		confirmAction,
+		confirmDeleteItems,
+		deleteSyncedItem,
+		isPending: mutation.isPending,
+	}
+}
diff --git a/apps/app-frontend/src/helpers/instance.ts b/apps/app-frontend/src/helpers/instance.ts
index ef22c538c3..d0966dda87 100644
--- a/apps/app-frontend/src/helpers/instance.ts
+++ b/apps/app-frontend/src/helpers/instance.ts
@@ -144,7 +144,7 @@ export async function get_dependencies_as_content_items(
 	return adaptContentItems(items)
 }
 
-function adaptContentItems(items: ContentItem[]): ContentItem[] {
+export function adaptContentItems(items: ContentItem[]): ContentItem[] {
 	return items.map((item) => {
 		const embeddedMetadata = item.embedded_metadata
 		if (!embeddedMetadata?.icon_path) return item
@@ -289,6 +289,8 @@ export async function set_synced_option(
 }
 
 export type SyncedOption =
+	| 'resource_packs'
+	| 'data_packs'
 	| 'game_options'
 	| 'command_history'
 	| 'multiplayer_servers'
diff --git a/apps/app-frontend/src/helpers/synced-options.ts b/apps/app-frontend/src/helpers/synced-options.ts
new file mode 100644
index 0000000000..20c6072e0b
--- /dev/null
+++ b/apps/app-frontend/src/helpers/synced-options.ts
@@ -0,0 +1,33 @@
+import { queryOptions } from '@tanstack/vue-query'
+
+import { list_game_options_sync_sources } from './game-options'
+import { get_global_synced_options, get_initialized_synced_options } from './instance'
+
+export const syncedOptionsKeys = {
+	global: ['global-synced-options'] as const,
+	initialized: ['initialized-synced-options'] as const,
+	gameSources: ['game-options-sync-sources'] as const,
+	set: ['global-synced-options', 'set'] as const,
+}
+
+export function globalSyncedOptionsQueryOptions() {
+	return queryOptions({
+		queryKey: syncedOptionsKeys.global,
+		queryFn: get_global_synced_options,
+	})
+}
+
+export function initializedSyncedOptionsQueryOptions() {
+	return queryOptions({
+		queryKey: syncedOptionsKeys.initialized,
+		queryFn: get_initialized_synced_options,
+	})
+}
+
+export function gameOptionsSyncSourcesQueryOptions() {
+	return queryOptions({
+		queryKey: syncedOptionsKeys.gameSources,
+		queryFn: list_game_options_sync_sources,
+		staleTime: 0,
+	})
+}
diff --git a/apps/app-frontend/src/helpers/synced-packs.ts b/apps/app-frontend/src/helpers/synced-packs.ts
new file mode 100644
index 0000000000..0458640eb1
--- /dev/null
+++ b/apps/app-frontend/src/helpers/synced-packs.ts
@@ -0,0 +1,71 @@
+import type { ContentItem } from '@modrinth/ui'
+import { invoke } from '@tauri-apps/api/core'
+
+import { adaptContentItems } from './instance'
+import type { DesyncServerMode } from './worlds'
+
+export type SyncedPackType = 'resourcepack' | 'datapack'
+export type SyncedPackAction = 'enable' | 'disable'
+
+export interface PackSyncPreview {
+	pack: ContentItem
+	instances: {
+		instance_id: string
+		name: string
+		game_version: string
+		compatible: boolean
+		participating: boolean
+	}[]
+}
+
+export const syncedPackKeys = {
+	all: ['synced-packs'] as const,
+	list: (type: SyncedPackType) => ['synced-packs', 'list', type] as const,
+}
+
+export const syncedPackQueryOptions = (type: SyncedPackType) => ({
+	queryKey: syncedPackKeys.list(type),
+	queryFn: () => list_synced_packs(type),
+})
+
+export async function list_synced_packs(projectType: SyncedPackType): Promise<ContentItem[]> {
+	const items = await invoke<ContentItem[]>('plugin:instance|instance_list_synced_packs', {
+		projectType,
+	})
+	return adaptContentItems(items).map((item) => ({ ...item, external: !item.project }))
+}
+
+export function get_pack_sync_preview(
+	instanceId: string,
+	projectPath: string,
+): Promise<PackSyncPreview> {
+	return invoke('plugin:instance|instance_get_pack_sync_preview', { instanceId, projectPath })
+}
+
+export function sync_pack(instanceId: string, projectPath: string): Promise<void> {
+	return invoke('plugin:instance|instance_sync_pack', { instanceId, projectPath })
+}
+
+export function desync_pack(
+	instanceId: string,
+	packId: string,
+	mode: DesyncServerMode,
+): Promise<void> {
+	return invoke('plugin:instance|instance_desync_pack', { instanceId, packId, mode })
+}
+
+export function upload_synced_pack(
+	path: string,
+	projectType: SyncedPackType,
+	gameVersions: string[],
+): Promise<void> {
+	return invoke('plugin:instance|instance_upload_synced_pack', { path, projectType, gameVersions })
+}
+
+export function set_synced_pack_enabled(packId: string, enabled: boolean): Promise<void> {
+	return invoke('plugin:instance|instance_set_synced_pack_enabled', { packId, enabled })
+}
+
+export function remove_synced_pack(packId: string): Promise<void> {
+	return invoke('plugin:instance|instance_remove_synced_pack', { packId })
+}
diff --git a/apps/app-frontend/src/helpers/types.d.ts b/apps/app-frontend/src/helpers/types.d.ts
index e055cbe2ce..2de15f952d 100644
--- a/apps/app-frontend/src/helpers/types.d.ts
+++ b/apps/app-frontend/src/helpers/types.d.ts
@@ -17,6 +17,8 @@ export type GameInstance = {
 
 	group_ids: string[]
 	synced_options: {
+		resource_packs: boolean
+		data_packs: boolean
 		game_options: boolean
 		command_history: boolean
 		multiplayer_servers: boolean
diff --git a/apps/app-frontend/src/locales/ar-SA/index.json b/apps/app-frontend/src/locales/ar-SA/index.json
index 09012c1e5a..8696293cc6 100644
--- a/apps/app-frontend/src/locales/ar-SA/index.json
+++ b/apps/app-frontend/src/locales/ar-SA/index.json
@@ -332,48 +332,6 @@
   "app.hosting.update-required.title": {
     "message": "يلزم تحديث تطبيق Modrinth"
   },
-  "app.icon-editor.apply-icons-modal.apply-error": {
-    "message": "تعذّر تطبيق أيقونات عشوائية على النسخ."
-  },
-  "app.icon-editor.apply-icons-modal.apply-success": {
-    "message": "تم تعيين أيقونة عشوائية لـ {num, plural, one {نسخة واحدة} two {نسختين} few {# نسخ} many {# نسخة} other {# نسخة}}."
-  },
-  "app.icon-editor.apply-icons-modal.badge": {
-    "message": "جديد في هذا التحديث"
-  },
-  "app.icon-editor.apply-icons-modal.close": {
-    "message": "إغلاق"
-  },
-  "app.icon-editor.apply-icons-modal.description": {
-    "message": "أنشئ أيقونات مخصصة لنسخك مباشرةً في Modrinth App. امزج بين الخلفيات والرموز من Minecraft والمودات الشائعة!"
-  },
-  "app.icon-editor.apply-icons-modal.instances-without-icons": {
-    "message": "{count, plural, one {# نسخة لا تحتوي} two {# نسختان لا تحتويان} few {# نسخ لا تحتوي} many {# نسخة لا تحتوي} other {# نسخة لا تحتوي}} على أيقونات بعد. هل تريد منا تعيين أيقونات عشوائية لـ{count, plural, one {نسخة واحدة} two {نسختين} few {# نسخ} many {# نسخة} other {# نسخة}} للبدء؟"
-  },
-  "app.icon-editor.apply-icons-modal.random-icons": {
-    "message": "أيقونات عشوائية"
-  },
-  "app.icon-editor.apply-icons-modal.skip": {
-    "message": "تخطي"
-  },
-  "app.icon-editor.apply-icons-modal.title": {
-    "message": "محرر الأيقونات المخصصة"
-  },
-  "app.icon-editor.notification.close": {
-    "message": "إغلاق"
-  },
-  "app.icon-editor.notification.description": {
-    "message": "خصّص نسخك!"
-  },
-  "app.icon-editor.notification.dismiss": {
-    "message": "تجاهل"
-  },
-  "app.icon-editor.notification.title": {
-    "message": "محرر الأيقونات الجديد"
-  },
-  "app.icon-editor.notification.view-update": {
-    "message": "عرض التحديث"
-  },
   "app.install.phase.downloading_content": {
     "message": "جارٍ تنزيل المحتوى"
   },
diff --git a/apps/app-frontend/src/locales/cs-CZ/index.json b/apps/app-frontend/src/locales/cs-CZ/index.json
index f25b9fdc41..04f09af38c 100644
--- a/apps/app-frontend/src/locales/cs-CZ/index.json
+++ b/apps/app-frontend/src/locales/cs-CZ/index.json
@@ -341,48 +341,6 @@
   "app.hosting.update-required.title": {
     "message": "Modrinth App potřebuje být aktualizovaná"
   },
-  "app.icon-editor.apply-icons-modal.apply-error": {
-    "message": "Nepodařilo se použít náhodné ikony pro instance."
-  },
-  "app.icon-editor.apply-icons-modal.apply-success": {
-    "message": "Náhodná ikona pro {num, plural, one {# instanci} few {# instance} many {# instancí} other {# instancí}}."
-  },
-  "app.icon-editor.apply-icons-modal.badge": {
-    "message": "Nové z této aktualizace"
-  },
-  "app.icon-editor.apply-icons-modal.close": {
-    "message": "Zavřít"
-  },
-  "app.icon-editor.apply-icons-modal.description": {
-    "message": "Vytvořit vlastní ikonu pro vaší instanci přímo v Modrinth App. Smíchejte a porovnejte pozadí se symboly z Minecraftu a populárních módů!"
-  },
-  "app.icon-editor.apply-icons-modal.instances-without-icons": {
-    "message": "{count, plural, one {# instance nemá} few {# instance nemají} many {# instancí nemá} other {# instancí nemá}} zatím žádnou ikonu. Chcete, abychom {count, plural, one {jí} other {jim}} dali náhodné na začátek?"
-  },
-  "app.icon-editor.apply-icons-modal.random-icons": {
-    "message": "Náhodné ikony"
-  },
-  "app.icon-editor.apply-icons-modal.skip": {
-    "message": "Přeskočit"
-  },
-  "app.icon-editor.apply-icons-modal.title": {
-    "message": "Editor vlastních ikon"
-  },
-  "app.icon-editor.notification.close": {
-    "message": "Zavřít"
-  },
-  "app.icon-editor.notification.description": {
-    "message": "Přizpůsobte si své instance!"
-  },
-  "app.icon-editor.notification.dismiss": {
-    "message": "Zavřít"
-  },
-  "app.icon-editor.notification.title": {
-    "message": "Nový editor ikon"
-  },
-  "app.icon-editor.notification.view-update": {
-    "message": "Zobrazit aktualizaci"
-  },
   "app.install.phase.downloading_content": {
     "message": "Stahování obsahu"
   },
diff --git a/apps/app-frontend/src/locales/de-CH/index.json b/apps/app-frontend/src/locales/de-CH/index.json
index ad6587bcbe..ab078aa1f6 100644
--- a/apps/app-frontend/src/locales/de-CH/index.json
+++ b/apps/app-frontend/src/locales/de-CH/index.json
@@ -344,48 +344,6 @@
   "app.hosting.update-required.title": {
     "message": "Update der Modrinth App erforderlich"
   },
-  "app.icon-editor.apply-icons-modal.apply-error": {
-    "message": "Es konnten keine zufälligen Symbole auf Instanzen angewendet werden."
-  },
-  "app.icon-editor.apply-icons-modal.apply-success": {
-    "message": "Icon für {num, plural, one {# Instanz} other {# Instanzen}} randomisiert."
-  },
-  "app.icon-editor.apply-icons-modal.badge": {
-    "message": "Neu in diesem Update"
-  },
-  "app.icon-editor.apply-icons-modal.close": {
-    "message": "Schließen"
-  },
-  "app.icon-editor.apply-icons-modal.description": {
-    "message": "Erstelle direkt in der Modrinth-App benutzerdefinierte Icons für deine Instanzen. Kombiniere Hintergründe mit Symbolen aus Minecraft und beliebten Mods!"
-  },
-  "app.icon-editor.apply-icons-modal.instances-without-icons": {
-    "message": "{count, plural, one {# Instanz hat} other {# Instanzen haben}} noch kein Icon. Möchtest du, dass wir {count, plural, one {dieser ein zufälliges Icon} other {diesen zufällige Icons}} zuweisen, um loszulegen?"
-  },
-  "app.icon-editor.apply-icons-modal.random-icons": {
-    "message": "Zufällige Icons"
-  },
-  "app.icon-editor.apply-icons-modal.skip": {
-    "message": "Überspringen"
-  },
-  "app.icon-editor.apply-icons-modal.title": {
-    "message": "Benutzerdefinierter Icon-Editor"
-  },
-  "app.icon-editor.notification.close": {
-    "message": "Schließen"
-  },
-  "app.icon-editor.notification.description": {
-    "message": "Personalisiere deine Instanzen!"
-  },
-  "app.icon-editor.notification.dismiss": {
-    "message": "Ausblenden"
-  },
-  "app.icon-editor.notification.title": {
-    "message": "Neuer Icon-Editor"
-  },
-  "app.icon-editor.notification.view-update": {
-    "message": "Update ansehen"
-  },
   "app.install.phase.downloading_content": {
     "message": "Inhalte werden heruntergeladen"
   },
diff --git a/apps/app-frontend/src/locales/de-DE/index.json b/apps/app-frontend/src/locales/de-DE/index.json
index a42ec584c6..f5f19e5360 100644
--- a/apps/app-frontend/src/locales/de-DE/index.json
+++ b/apps/app-frontend/src/locales/de-DE/index.json
@@ -344,48 +344,6 @@
   "app.hosting.update-required.title": {
     "message": "Update der Modrinth App erforderlich"
   },
-  "app.icon-editor.apply-icons-modal.apply-error": {
-    "message": "Es konnten keine zufälligen Symbole auf Instanzen angewendet werden."
-  },
-  "app.icon-editor.apply-icons-modal.apply-success": {
-    "message": "Icon für {num, plural, one {# Instanz} other {# Instanzen}} randomisiert."
-  },
-  "app.icon-editor.apply-icons-modal.badge": {
-    "message": "Neu in diesem Update"
-  },
-  "app.icon-editor.apply-icons-modal.close": {
-    "message": "Schließen"
-  },
-  "app.icon-editor.apply-icons-modal.description": {
-    "message": "Erstelle direkt in der Modrinth-App benutzerdefinierte Icons für deine Instanzen. Kombiniere Hintergründe mit Symbolen aus Minecraft und beliebten Mods!"
-  },
-  "app.icon-editor.apply-icons-modal.instances-without-icons": {
-    "message": "{count, plural, one {# Instanz hat} other {# Instanzen haben}} noch kein Icon. Möchtest du, dass wir {count, plural, one {dieser ein zufälliges Icon} other {diesen zufällige Icons}} zuweisen, um loszulegen?"
-  },
-  "app.icon-editor.apply-icons-modal.random-icons": {
-    "message": "Zufällige Icons"
-  },
-  "app.icon-editor.apply-icons-modal.skip": {
-    "message": "Überspringen"
-  },
-  "app.icon-editor.apply-icons-modal.title": {
-    "message": "Benutzerdefinierter Icon-Editor"
-  },
-  "app.icon-editor.notification.close": {
-    "message": "Schließen"
-  },
-  "app.icon-editor.notification.description": {
-    "message": "Personalisiere deine Instanzen!"
-  },
-  "app.icon-editor.notification.dismiss": {
-    "message": "Ausblenden"
-  },
-  "app.icon-editor.notification.title": {
-    "message": "Neuer Icon-Editor"
-  },
-  "app.icon-editor.notification.view-update": {
-    "message": "Update ansehen"
-  },
   "app.install.phase.downloading_content": {
     "message": "Inhalte werden heruntergeladen"
   },
diff --git a/apps/app-frontend/src/locales/en-US/index.json b/apps/app-frontend/src/locales/en-US/index.json
index 9e64372d30..1d7a261e62 100644
--- a/apps/app-frontend/src/locales/en-US/index.json
+++ b/apps/app-frontend/src/locales/en-US/index.json
@@ -284,6 +284,21 @@
   "app.content-install.no-compatible-versions": {
     "message": "No available versions match {compatibilityLabel}. Select a version to install anyway. Dependencies will not be installed automatically."
   },
+  "app.content.desync-pack": {
+    "message": "Desync"
+  },
+  "app.content.sync-data-packs-disabled": {
+    "message": "Turn on data pack syncing in app settings first."
+  },
+  "app.content.sync-pack": {
+    "message": "Sync"
+  },
+  "app.content.sync-packs-override": {
+    "message": "Turn off the pack syncing override in this instance’s settings first."
+  },
+  "app.content.sync-resource-packs-disabled": {
+    "message": "Turn on resource pack syncing in app settings first."
+  },
   "app.error.state-init.open-backups-folder": {
     "message": "Open backups folder"
   },
@@ -404,48 +419,6 @@
   "app.hosting.update-required.title": {
     "message": "Modrinth App update required"
   },
-  "app.icon-editor.apply-icons-modal.apply-error": {
-    "message": "Failed to apply random icons to instances."
-  },
-  "app.icon-editor.apply-icons-modal.apply-success": {
-    "message": "Randomized icon for {num, plural, one {# instance} other {# instances}}."
-  },
-  "app.icon-editor.apply-icons-modal.badge": {
-    "message": "New this update"
-  },
-  "app.icon-editor.apply-icons-modal.close": {
-    "message": "Close"
-  },
-  "app.icon-editor.apply-icons-modal.description": {
-    "message": "Create custom icons for your instances right in the Modrinth App. Mix and match backgrounds with symbols from Minecraft and popular mods!"
-  },
-  "app.icon-editor.apply-icons-modal.instances-without-icons": {
-    "message": "{count, plural, one {# instance doesn’t} other {# instances don’t}} have icons yet. Want us to give {count, plural, one {it} other {them}} random ones to get started?"
-  },
-  "app.icon-editor.apply-icons-modal.random-icons": {
-    "message": "Random icons"
-  },
-  "app.icon-editor.apply-icons-modal.skip": {
-    "message": "Skip"
-  },
-  "app.icon-editor.apply-icons-modal.title": {
-    "message": "Custom icon editor"
-  },
-  "app.icon-editor.notification.close": {
-    "message": "Close"
-  },
-  "app.icon-editor.notification.description": {
-    "message": "Personalize your instances!"
-  },
-  "app.icon-editor.notification.dismiss": {
-    "message": "Dismiss"
-  },
-  "app.icon-editor.notification.title": {
-    "message": "New icon editor"
-  },
-  "app.icon-editor.notification.view-update": {
-    "message": "View update"
-  },
   "app.install.phase.downloading_content": {
     "message": "Downloading content"
   },
@@ -2798,12 +2771,18 @@
   "app.settings.synced-options.choose-sync-source.game-settings-description": {
     "message": "Choose which instance to copy game settings from."
   },
+  "app.settings.synced-options.choose-sync-source.load-error": {
+    "message": "Could not load sync sources. Please try again."
+  },
   "app.settings.synced-options.choose-sync-source.multiplayer-servers-description": {
     "message": "Pick the instance whose multiplayer servers become the shared copy."
   },
   "app.settings.synced-options.choose-sync-source.no-instances-found": {
     "message": "No instances found"
   },
+  "app.settings.synced-options.choose-sync-source.retry": {
+    "message": "Try again"
+  },
   "app.settings.synced-options.choose-sync-source.search-placeholder": {
     "message": "Search instance"
   },
@@ -2828,6 +2807,15 @@
   "app.settings.synced-options.creative-hotbars.description": {
     "message": "Use the same saved creative hotbars across your instances."
   },
+  "app.settings.synced-options.data-packs": {
+    "message": "Sync data packs"
+  },
+  "app.settings.synced-options.data-packs.description": {
+    "message": "Use the same datapacks across your instances"
+  },
+  "app.settings.synced-options.data-packs.none-synced-yet": {
+    "message": "You haven't synced any data packs yet"
+  },
   "app.settings.synced-options.edit.no-instances": {
     "message": "Add an instance before editing synced data."
   },
@@ -2955,7 +2943,7 @@
     "message": "No synced servers match your search or filters."
   },
   "app.settings.synced-options.multiplayer-servers.none-synced-yet": {
-    "message": "No servers synced yet"
+    "message": "You haven't synced any servers yet"
   },
   "app.settings.synced-options.multiplayer-servers.players-online": {
     "message": "{count, number} online"
@@ -2966,6 +2954,18 @@
   "app.settings.synced-options.multiplayer-servers.status": {
     "message": "Status"
   },
+  "app.settings.synced-options.packs.disabled": {
+    "message": "Enable syncing before editing shared packs."
+  },
+  "app.settings.synced-options.resource-packs": {
+    "message": "Sync resource packs"
+  },
+  "app.settings.synced-options.resource-packs.description": {
+    "message": "Use the same resource packs across your instances"
+  },
+  "app.settings.synced-options.resource-packs.none-synced-yet": {
+    "message": "You haven't synced any resource packs yet"
+  },
   "app.settings.tabs.appearance": {
     "message": "Appearance"
   },
@@ -3170,6 +3170,84 @@
   "app.survey.title": {
     "message": "Hey there Modrinth user!"
   },
+  "app.sync-instances-update.badge": {
+    "message": "New this update"
+  },
+  "app.sync-instances-update.choose-source.all": {
+    "message": "Choose the instance to use as the sync source for all six settings."
+  },
+  "app.sync-instances-update.choose-source.data-packs": {
+    "message": "Choose which instance to copy data packs from."
+  },
+  "app.sync-instances-update.choose-source.resource-packs": {
+    "message": "Choose which instance to copy resource packs from."
+  },
+  "app.sync-instances-update.creative-hotbars": {
+    "message": "Sync creative hotbars"
+  },
+  "app.sync-instances-update.description": {
+    "message": "You can now sync options like game settings, servers, resource packs, and more across your instances, so everything stays the same every time you play!"
+  },
+  "app.sync-instances-update.load-error": {
+    "message": "Could not load your sync settings. Please try again."
+  },
+  "app.sync-instances-update.manage-later": {
+    "message": "You can enable syncing now and manage it later in your app settings."
+  },
+  "app.sync-instances-update.retry": {
+    "message": "Try again"
+  },
+  "app.sync-instances-update.skip": {
+    "message": "Skip"
+  },
+  "app.sync-instances-update.sync-all": {
+    "message": "Sync all"
+  },
+  "app.sync-instances-update.title": {
+    "message": "Sync your instances"
+  },
+  "app.synced-content.delete.description": {
+    "message": "Deleting this content will delete it across all your instances"
+  },
+  "app.synced-content.delete.mixed": {
+    "message": "Selected content that is not synced will only be deleted from this instance."
+  },
+  "app.synced-content.desync.description": {
+    "message": "This instance will keep its own copy. Do you want to keep this content synced in other instances, or remove it from them?"
+  },
+  "app.synced-content.desync.keep": {
+    "message": "Keep"
+  },
+  "app.synced-content.desync.remove": {
+    "message": "Remove"
+  },
+  "app.synced-content.desync.title": {
+    "message": "Desync content"
+  },
+  "app.synced-content.warning.disable": {
+    "message": "Disabling this content will also disable it in the other instances where it is synced. To change it only here, desync it first."
+  },
+  "app.synced-content.warning.enable": {
+    "message": "Enabling this content will also enable it in the other instances where it is synced. To change it only here, desync it first."
+  },
+  "app.synced-content.warning.modal-title": {
+    "message": "Sync warning"
+  },
+  "app.synced-content.warning.title": {
+    "message": "This content is synced"
+  },
+  "app.synced-packs.data-packs.title": {
+    "message": "Synced data packs"
+  },
+  "app.synced-packs.empty": {
+    "message": "Add packs from an instance’s content page to start syncing."
+  },
+  "app.synced-packs.load-failed": {
+    "message": "Packs could not be loaded. Try refreshing."
+  },
+  "app.synced-packs.resource-packs.title": {
+    "message": "Synced resource packs"
+  },
   "app.update-popup.body.download-complete": {
     "message": "Modrinth App v{version} has finished downloading. Reload to update now, or automatically when you close Modrinth App."
   },
@@ -3728,6 +3806,30 @@
   "instance.settings.sharing.revoke-invite.header": {
     "message": "Revoke invite"
   },
+  "instance.settings.synced-options.data-packs": {
+    "message": "Unsync data packs"
+  },
+  "instance.settings.synced-options.data-packs.description": {
+    "message": "Keep this instance's data packs separate from synced packs."
+  },
+  "instance.settings.synced-options.data-packs.disabled": {
+    "message": "Data pack syncing is turned off in app settings."
+  },
+  "instance.settings.synced-options.edit-packs": {
+    "message": "Edit synced packs"
+  },
+  "instance.settings.synced-options.packs-override": {
+    "message": "Turn off this override to edit synced packs. Independent packs can be managed in the content tab."
+  },
+  "instance.settings.synced-options.resource-packs": {
+    "message": "Unsync resource packs"
+  },
+  "instance.settings.synced-options.resource-packs.description": {
+    "message": "Keep this instance's resource packs separate from synced packs."
+  },
+  "instance.settings.synced-options.resource-packs.disabled": {
+    "message": "Resource pack syncing is turned off in app settings."
+  },
   "instance.settings.tabs.behavior.description": {
     "message": "Choose which tabs appear on this instance."
   },
diff --git a/apps/app-frontend/src/locales/es-419/index.json b/apps/app-frontend/src/locales/es-419/index.json
index 43b4a2f841..6ea543fefd 100644
--- a/apps/app-frontend/src/locales/es-419/index.json
+++ b/apps/app-frontend/src/locales/es-419/index.json
@@ -344,48 +344,6 @@
   "app.hosting.update-required.title": {
     "message": "Se requiere actualizar la aplicación de Modrinth"
   },
-  "app.icon-editor.apply-icons-modal.apply-error": {
-    "message": "Error al aplicar iconos aleatorios a las instancias."
-  },
-  "app.icon-editor.apply-icons-modal.apply-success": {
-    "message": "Otorgado ícono aleatorio para {num, plural, one {# instancia} other {# instancias}}."
-  },
-  "app.icon-editor.apply-icons-modal.badge": {
-    "message": "Nuevo en esta actualización"
-  },
-  "app.icon-editor.apply-icons-modal.close": {
-    "message": "Cerrar"
-  },
-  "app.icon-editor.apply-icons-modal.description": {
-    "message": "Crea íconos personalizados para tus instancias directamente en la aplicación de Modrinth. ¡Mezcla y empareja fondos con símbolos de Minecraft y mods populares!"
-  },
-  "app.icon-editor.apply-icons-modal.instances-without-icons": {
-    "message": "{count, plural, one {# instancia no tiene ícono} other {# instancias no tienen íconos}} todavía. ¿Quieres que le demos a {count, plural, one {este} other {ellos}} un estilo aleatorio para empezar?"
-  },
-  "app.icon-editor.apply-icons-modal.random-icons": {
-    "message": "Dar íconos aleatorios"
-  },
-  "app.icon-editor.apply-icons-modal.skip": {
-    "message": "Omitir"
-  },
-  "app.icon-editor.apply-icons-modal.title": {
-    "message": "Editor de íconos personalizados"
-  },
-  "app.icon-editor.notification.close": {
-    "message": "Cerrar"
-  },
-  "app.icon-editor.notification.description": {
-    "message": "¡Personaliza tus instancias!"
-  },
-  "app.icon-editor.notification.dismiss": {
-    "message": "Descartar"
-  },
-  "app.icon-editor.notification.title": {
-    "message": "Nuevo editor de íconos"
-  },
-  "app.icon-editor.notification.view-update": {
-    "message": "Ver actualización"
-  },
   "app.install.phase.downloading_content": {
     "message": "Descargando contenido"
   },
diff --git a/apps/app-frontend/src/locales/es-ES/index.json b/apps/app-frontend/src/locales/es-ES/index.json
index 007d3a80ab..4d959d8e33 100644
--- a/apps/app-frontend/src/locales/es-ES/index.json
+++ b/apps/app-frontend/src/locales/es-ES/index.json
@@ -344,48 +344,6 @@
   "app.hosting.update-required.title": {
     "message": "Se requiere actualizar Modrinth App"
   },
-  "app.icon-editor.apply-icons-modal.apply-error": {
-    "message": "Error al aplicar iconos aleatorios a las instancias."
-  },
-  "app.icon-editor.apply-icons-modal.apply-success": {
-    "message": "Icono aleatorio para {num, plural, one {# instance} other {# instances}}."
-  },
-  "app.icon-editor.apply-icons-modal.badge": {
-    "message": "Nuevo en esta actualización"
-  },
-  "app.icon-editor.apply-icons-modal.close": {
-    "message": "Cerrar"
-  },
-  "app.icon-editor.apply-icons-modal.description": {
-    "message": "Crea iconos personalizados para tus instancias directamente en la aplicación Modrinth. ¡Mezclar y emparejar fondos con símbolos de Minecraft y mods populares!"
-  },
-  "app.icon-editor.apply-icons-modal.instances-without-icons": {
-    "message": "{count, plural, one {#Esta instancia no} other {#Estas instancias no}} tienen iconos aún. ¿Quieres que le demos {count, plural, one {¡} other {¡}} ¡unos aleatorios para empezar?"
-  },
-  "app.icon-editor.apply-icons-modal.random-icons": {
-    "message": "Iconos aleatorios"
-  },
-  "app.icon-editor.apply-icons-modal.skip": {
-    "message": "Saltar"
-  },
-  "app.icon-editor.apply-icons-modal.title": {
-    "message": "Editor de iconos personalizados"
-  },
-  "app.icon-editor.notification.close": {
-    "message": "Cerrar"
-  },
-  "app.icon-editor.notification.description": {
-    "message": "¡Personaliza tus instancias!"
-  },
-  "app.icon-editor.notification.dismiss": {
-    "message": "Descartar"
-  },
-  "app.icon-editor.notification.title": {
-    "message": "Editor de iconos nuevos"
-  },
-  "app.icon-editor.notification.view-update": {
-    "message": "Ver la actualización"
-  },
   "app.install.phase.downloading_content": {
     "message": "Descargando contenido"
   },
diff --git a/apps/app-frontend/src/locales/fr-FR/index.json b/apps/app-frontend/src/locales/fr-FR/index.json
index 74fb465d38..bc8ad4debc 100644
--- a/apps/app-frontend/src/locales/fr-FR/index.json
+++ b/apps/app-frontend/src/locales/fr-FR/index.json
@@ -344,48 +344,6 @@
   "app.hosting.update-required.title": {
     "message": "Mise à jour de Modrinth App requise"
   },
-  "app.icon-editor.apply-icons-modal.apply-error": {
-    "message": "Impossible d'appliquer des icônes aléatoires aux instances."
-  },
-  "app.icon-editor.apply-icons-modal.apply-success": {
-    "message": "Appliqué une icône aléatoire pour {num, plural,one {# instance} other {# instances}}."
-  },
-  "app.icon-editor.apply-icons-modal.badge": {
-    "message": "Nouveautés"
-  },
-  "app.icon-editor.apply-icons-modal.close": {
-    "message": "Fermer"
-  },
-  "app.icon-editor.apply-icons-modal.description": {
-    "message": "Créez des icônes personnalisées pour vos instances directement dans l'application Modrinth. Mélangez et associez des arrière-plans avec des symboles de Minecraft et des mods populaires !"
-  },
-  "app.icon-editor.apply-icons-modal.instances-without-icons": {
-    "message": "{count, plural, one {Une instance n'a} other {# instances n'ont}} pas encore d'icône. Vous voulez qu'on {count, plural, one {lui} other {leur}} attribue {count, plural, one {une icône aléatoire} other {des icônes aléatoires}} pour commencer ?"
-  },
-  "app.icon-editor.apply-icons-modal.random-icons": {
-    "message": "Icônes aléatoires"
-  },
-  "app.icon-editor.apply-icons-modal.skip": {
-    "message": "Ignorer"
-  },
-  "app.icon-editor.apply-icons-modal.title": {
-    "message": "Éditeur d'icônes personnalisées"
-  },
-  "app.icon-editor.notification.close": {
-    "message": "Fermer"
-  },
-  "app.icon-editor.notification.description": {
-    "message": "Personnalisez vos instances !"
-  },
-  "app.icon-editor.notification.dismiss": {
-    "message": "Ignorer"
-  },
-  "app.icon-editor.notification.title": {
-    "message": "Nouvel éditeur d'icônes"
-  },
-  "app.icon-editor.notification.view-update": {
-    "message": "Voir la mise à jour"
-  },
   "app.install.phase.downloading_content": {
     "message": "Téléchargement du contenu"
   },
diff --git a/apps/app-frontend/src/locales/hu-HU/index.json b/apps/app-frontend/src/locales/hu-HU/index.json
index cfb858ff42..202c1093e6 100644
--- a/apps/app-frontend/src/locales/hu-HU/index.json
+++ b/apps/app-frontend/src/locales/hu-HU/index.json
@@ -332,42 +332,6 @@
   "app.hosting.update-required.title": {
     "message": "Frissítés szükséges a Modrinth Apphoz"
   },
-  "app.icon-editor.apply-icons-modal.apply-error": {
-    "message": "Nem sikerült véletlenszerű ikonokat rendelni a játékprofilokhoz."
-  },
-  "app.icon-editor.apply-icons-modal.apply-success": {
-    "message": "Véletlenszerű ikon alkalmazva {num} játékprofilnak."
-  },
-  "app.icon-editor.apply-icons-modal.close": {
-    "message": "Bezárás"
-  },
-  "app.icon-editor.apply-icons-modal.instances-without-icons": {
-    "message": "{count, plural, one {Egy játékprofilnak} other {# játékprofilnak}} még nincs ikonja. Szeretnéd, ha adnánk neki{count, plural, one { egy} other {k néhány}} véletlenszerű példát a kezdéshez?"
-  },
-  "app.icon-editor.apply-icons-modal.random-icons": {
-    "message": "Véletlenszerű ikonok"
-  },
-  "app.icon-editor.apply-icons-modal.skip": {
-    "message": "Átugrás"
-  },
-  "app.icon-editor.apply-icons-modal.title": {
-    "message": "Saját ikon szerkesztő"
-  },
-  "app.icon-editor.notification.close": {
-    "message": "Bezárás"
-  },
-  "app.icon-editor.notification.description": {
-    "message": "Szabd személyre a példányodat!"
-  },
-  "app.icon-editor.notification.dismiss": {
-    "message": "Elvet"
-  },
-  "app.icon-editor.notification.title": {
-    "message": "Új ikon szerkesztő"
-  },
-  "app.icon-editor.notification.view-update": {
-    "message": "Frissítés megtekintése"
-  },
   "app.install.phase.downloading_content": {
     "message": "A tartalom letöltése..."
   },
diff --git a/apps/app-frontend/src/locales/it-IT/index.json b/apps/app-frontend/src/locales/it-IT/index.json
index 9ae13ba742..7913bc3152 100644
--- a/apps/app-frontend/src/locales/it-IT/index.json
+++ b/apps/app-frontend/src/locales/it-IT/index.json
@@ -344,48 +344,6 @@
   "app.hosting.update-required.title": {
     "message": "Aggiornamento richiesto"
   },
-  "app.icon-editor.apply-icons-modal.apply-error": {
-    "message": "Impossibile applicare icone casuali alle istanze."
-  },
-  "app.icon-editor.apply-icons-modal.apply-success": {
-    "message": "Applicata una icona casuale a {num, plural, one {# istanza} other {# istanze}}."
-  },
-  "app.icon-editor.apply-icons-modal.badge": {
-    "message": "Novità"
-  },
-  "app.icon-editor.apply-icons-modal.close": {
-    "message": "Chiudi"
-  },
-  "app.icon-editor.apply-icons-modal.description": {
-    "message": "Crea icone personalizzate per le tue istanze direttamente nell'app. Abbina a piacimento sfondi e simboli provenienti da Minecraft e da altre mod famose!"
-  },
-  "app.icon-editor.apply-icons-modal.instances-without-icons": {
-    "message": "{count, plural, one {# istanza non ha} other {# istanze non hanno}} ancora una icona. Vorresti che {count, plural, one {venga scelta} other {vengano scelte}} a caso?"
-  },
-  "app.icon-editor.apply-icons-modal.random-icons": {
-    "message": "Icone casuali"
-  },
-  "app.icon-editor.apply-icons-modal.skip": {
-    "message": "Salta"
-  },
-  "app.icon-editor.apply-icons-modal.title": {
-    "message": "Editor di icone"
-  },
-  "app.icon-editor.notification.close": {
-    "message": "Chiudi"
-  },
-  "app.icon-editor.notification.description": {
-    "message": "Personalizza le tue istanze!"
-  },
-  "app.icon-editor.notification.dismiss": {
-    "message": "Ignora"
-  },
-  "app.icon-editor.notification.title": {
-    "message": "Nuovo editor di icone"
-  },
-  "app.icon-editor.notification.view-update": {
-    "message": "Scopri di più"
-  },
   "app.install.phase.downloading_content": {
     "message": "Download dei contenuti"
   },
diff --git a/apps/app-frontend/src/locales/ja-JP/index.json b/apps/app-frontend/src/locales/ja-JP/index.json
index 80108b0183..7cb69e0b73 100644
--- a/apps/app-frontend/src/locales/ja-JP/index.json
+++ b/apps/app-frontend/src/locales/ja-JP/index.json
@@ -284,9 +284,6 @@
   "app.export-modal.version-number-placeholder": {
     "message": "1.0.0"
   },
-  "app.icon-editor.apply-icons-modal.close": {
-    "message": "閉じる"
-  },
   "app.install.phase.downloading_content": {
     "message": "コンテンツをダウンロード中"
   },
diff --git a/apps/app-frontend/src/locales/ko-KR/index.json b/apps/app-frontend/src/locales/ko-KR/index.json
index 0a59a9d477..c60099fcee 100644
--- a/apps/app-frontend/src/locales/ko-KR/index.json
+++ b/apps/app-frontend/src/locales/ko-KR/index.json
@@ -338,36 +338,6 @@
   "app.hosting.update-required.title": {
     "message": "Modrinth App 업데이트 필요"
   },
-  "app.icon-editor.apply-icons-modal.apply-error": {
-    "message": "인스턴스에 무작위 아이콘을 표시하는 데 실패했습니다."
-  },
-  "app.icon-editor.apply-icons-modal.apply-success": {
-    "message": "인스턴스 {num, plural, other {#}}개의 아이콘을 무작위로 섞었습니다."
-  },
-  "app.icon-editor.apply-icons-modal.badge": {
-    "message": "이번 업데이트"
-  },
-  "app.icon-editor.apply-icons-modal.close": {
-    "message": "닫기"
-  },
-  "app.icon-editor.apply-icons-modal.description": {
-    "message": "Modrinth App에서 자신의 인스턴스에 사용자 지정 아이콘을 만들어 보세요. 배경을 Minecraft 및 인기 모드의 문양과 자유롭게 조합할 수 있습니다!"
-  },
-  "app.icon-editor.apply-icons-modal.random-icons": {
-    "message": "무작위 아이콘"
-  },
-  "app.icon-editor.apply-icons-modal.skip": {
-    "message": "건너뛰기"
-  },
-  "app.icon-editor.notification.close": {
-    "message": "닫기"
-  },
-  "app.icon-editor.notification.dismiss": {
-    "message": "닫기"
-  },
-  "app.icon-editor.notification.view-update": {
-    "message": "업데이트 보기"
-  },
   "app.install.phase.downloading_content": {
     "message": "콘텐츠 다운로드 중"
   },
diff --git a/apps/app-frontend/src/locales/ms-MY/index.json b/apps/app-frontend/src/locales/ms-MY/index.json
index 96866d312d..bc438d7b1b 100644
--- a/apps/app-frontend/src/locales/ms-MY/index.json
+++ b/apps/app-frontend/src/locales/ms-MY/index.json
@@ -125,9 +125,6 @@
   "app.export-modal.version-number-placeholder": {
     "message": "1.0.0"
   },
-  "app.icon-editor.apply-icons-modal.skip": {
-    "message": "Langkau"
-  },
   "app.install.phase.preparing_java.downloading": {
     "message": "Sedang memuat turun Java {version}"
   },
diff --git a/apps/app-frontend/src/locales/pl-PL/index.json b/apps/app-frontend/src/locales/pl-PL/index.json
index 2ffdc1b41b..0b350591b5 100644
--- a/apps/app-frontend/src/locales/pl-PL/index.json
+++ b/apps/app-frontend/src/locales/pl-PL/index.json
@@ -305,27 +305,6 @@
   "app.home.jump-back-in.view-instance": {
     "message": "Pokaż instancję"
   },
-  "app.icon-editor.apply-icons-modal.close": {
-    "message": "Zamknij"
-  },
-  "app.icon-editor.apply-icons-modal.random-icons": {
-    "message": "Losowe ikony"
-  },
-  "app.icon-editor.apply-icons-modal.skip": {
-    "message": "Pomiń"
-  },
-  "app.icon-editor.notification.close": {
-    "message": "Zamknij"
-  },
-  "app.icon-editor.notification.dismiss": {
-    "message": "Odrzuć"
-  },
-  "app.icon-editor.notification.title": {
-    "message": "Nowy edytor ikon"
-  },
-  "app.icon-editor.notification.view-update": {
-    "message": "Pokaż aktualizację"
-  },
   "app.install.phase.downloading_content": {
     "message": "Pobieranie zawartości"
   },
diff --git a/apps/app-frontend/src/locales/pt-BR/index.json b/apps/app-frontend/src/locales/pt-BR/index.json
index bf1178833a..73e6367578 100644
--- a/apps/app-frontend/src/locales/pt-BR/index.json
+++ b/apps/app-frontend/src/locales/pt-BR/index.json
@@ -326,36 +326,6 @@
   "app.hosting.update-required.title": {
     "message": "Atualização do Modrinth App necessária"
   },
-  "app.icon-editor.apply-icons-modal.apply-error": {
-    "message": "Falha ao aplicar ícones aleatórios nas instâncias."
-  },
-  "app.icon-editor.apply-icons-modal.apply-success": {
-    "message": "Ícone aleatório para {num, plural, one {# instância} other {# instâncias}}."
-  },
-  "app.icon-editor.apply-icons-modal.badge": {
-    "message": "Novidade desta atualização"
-  },
-  "app.icon-editor.apply-icons-modal.close": {
-    "message": "Fechar"
-  },
-  "app.icon-editor.apply-icons-modal.description": {
-    "message": "Crie ícones personalizados para as suas instâncias diretamente no Modrinth App. Misture e combine os fundos com símbolos do Minecraft e mods populares!"
-  },
-  "app.icon-editor.apply-icons-modal.instances-without-icons": {
-    "message": "{count, plural, one {# instância} other {# instâncias}} ainda não têm ícones. Quer dar {count, plural, one {ícone aleatório} other {ícones aleatórios}} para começar?"
-  },
-  "app.icon-editor.apply-icons-modal.random-icons": {
-    "message": "Ícones aleatórios"
-  },
-  "app.icon-editor.apply-icons-modal.skip": {
-    "message": "Pular"
-  },
-  "app.icon-editor.apply-icons-modal.title": {
-    "message": "Editor de Ícone personalizado"
-  },
-  "app.icon-editor.notification.close": {
-    "message": "Fechar"
-  },
   "app.install.phase.downloading_content": {
     "message": "Instalando conteúdo"
   },
diff --git a/apps/app-frontend/src/locales/ru-RU/index.json b/apps/app-frontend/src/locales/ru-RU/index.json
index 78c8ecc6cf..9c099248ff 100644
--- a/apps/app-frontend/src/locales/ru-RU/index.json
+++ b/apps/app-frontend/src/locales/ru-RU/index.json
@@ -344,48 +344,6 @@
   "app.hosting.update-required.title": {
     "message": "Обновите Modrinth App"
   },
-  "app.icon-editor.apply-icons-modal.apply-error": {
-    "message": "Не удалось применить случайные иконки к сборкам."
-  },
-  "app.icon-editor.apply-icons-modal.apply-success": {
-    "message": "Установлен случайный значок для {num, plural, one {# сборки} few {# сборок} many {# сборок} other {# сборок}}."
-  },
-  "app.icon-editor.apply-icons-modal.badge": {
-    "message": "Новый контент"
-  },
-  "app.icon-editor.apply-icons-modal.close": {
-    "message": "Закрыть"
-  },
-  "app.icon-editor.apply-icons-modal.description": {
-    "message": "Создавайте собственные иконки прямо в Modrinth App. Сочетайте фоны с символами из Minecraft и популярных модов!"
-  },
-  "app.icon-editor.apply-icons-modal.instances-without-icons": {
-    "message": "У {count, plural, one {# сборки} other {# сборок}} нет {count, plural, one {иконки} other {иконок}}. Хотите создать {count, plural, one {случайную} other {случайные}}?"
-  },
-  "app.icon-editor.apply-icons-modal.random-icons": {
-    "message": "Случайные иконки"
-  },
-  "app.icon-editor.apply-icons-modal.skip": {
-    "message": "Пропустить"
-  },
-  "app.icon-editor.apply-icons-modal.title": {
-    "message": "Редактор иконок"
-  },
-  "app.icon-editor.notification.close": {
-    "message": "Закрыть"
-  },
-  "app.icon-editor.notification.description": {
-    "message": "Персонализируйте свои сборки!"
-  },
-  "app.icon-editor.notification.dismiss": {
-    "message": "Закрыть"
-  },
-  "app.icon-editor.notification.title": {
-    "message": "Новый редактор иконок"
-  },
-  "app.icon-editor.notification.view-update": {
-    "message": "Подробнее"
-  },
   "app.install.phase.downloading_content": {
     "message": "Скачивание контента"
   },
diff --git a/apps/app-frontend/src/locales/sv-SE/index.json b/apps/app-frontend/src/locales/sv-SE/index.json
index 9dbba4c09f..ccc2ad5f5c 100644
--- a/apps/app-frontend/src/locales/sv-SE/index.json
+++ b/apps/app-frontend/src/locales/sv-SE/index.json
@@ -326,42 +326,6 @@
   "app.hosting.update-required.title": {
     "message": "Modrinth App-uppdatering krävs"
   },
-  "app.icon-editor.apply-icons-modal.apply-error": {
-    "message": "Kunde inte tillämpa slumpmässiga ikoner till instanser."
-  },
-  "app.icon-editor.apply-icons-modal.apply-success": {
-    "message": "Slumpmässig ikon för {num, plural, one {# instans} other {# instanser}}."
-  },
-  "app.icon-editor.apply-icons-modal.badge": {
-    "message": "Nytt den här uppdateringen"
-  },
-  "app.icon-editor.apply-icons-modal.close": {
-    "message": "Stäng"
-  },
-  "app.icon-editor.apply-icons-modal.instances-without-icons": {
-    "message": "{count, plural, one {# instans har ingen ikon} other {# instanser har inga ikoner}} än. Vill du att vi ska ge {count, plural, one {den en slumpmässig} other {dem slumpmässiga}} för att komma igång?"
-  },
-  "app.icon-editor.apply-icons-modal.random-icons": {
-    "message": "Slumpmässiga ikoner"
-  },
-  "app.icon-editor.apply-icons-modal.skip": {
-    "message": "Hoppa över"
-  },
-  "app.icon-editor.notification.close": {
-    "message": "Stäng"
-  },
-  "app.icon-editor.notification.description": {
-    "message": "Anpassa dina instanser!"
-  },
-  "app.icon-editor.notification.dismiss": {
-    "message": "Avfärda"
-  },
-  "app.icon-editor.notification.title": {
-    "message": "Ny ikonredigerare"
-  },
-  "app.icon-editor.notification.view-update": {
-    "message": "Visa uppdatering"
-  },
   "app.install.phase.downloading_content": {
     "message": "Laddar ner innehåll"
   },
diff --git a/apps/app-frontend/src/locales/tr-TR/index.json b/apps/app-frontend/src/locales/tr-TR/index.json
index de18f455df..3036c9fa87 100644
--- a/apps/app-frontend/src/locales/tr-TR/index.json
+++ b/apps/app-frontend/src/locales/tr-TR/index.json
@@ -344,48 +344,6 @@
   "app.hosting.update-required.title": {
     "message": "Modrinth App güncellemesi gerekli"
   },
-  "app.icon-editor.apply-icons-modal.apply-error": {
-    "message": "Kurulumlara rastgele ikonlar uygulanamadı."
-  },
-  "app.icon-editor.apply-icons-modal.apply-success": {
-    "message": "{num, plural, one {# kurulum} other {# kurulumlar}} için rastgele ikon."
-  },
-  "app.icon-editor.apply-icons-modal.badge": {
-    "message": "Bu güncellemede yeni"
-  },
-  "app.icon-editor.apply-icons-modal.close": {
-    "message": "Kapat"
-  },
-  "app.icon-editor.apply-icons-modal.description": {
-    "message": "Modrinth App'de kurulumlarınız için özel ikonlar oluşturun. Arka planları Minecraft ve popüler modlardan sembollerle karıştırıp eşleştirin!"
-  },
-  "app.icon-editor.apply-icons-modal.instances-without-icons": {
-    "message": "{count, plural, one {# kurulumun} other {# kurulumun}} henüz ikonu yok. Başlangıç için {count, plural, one {ona} other {onlara}} rastgele simgeler vermemizi ister misiniz?"
-  },
-  "app.icon-editor.apply-icons-modal.random-icons": {
-    "message": "Rastgele ikon"
-  },
-  "app.icon-editor.apply-icons-modal.skip": {
-    "message": "Atla"
-  },
-  "app.icon-editor.apply-icons-modal.title": {
-    "message": "Özel ikon düzenleyici"
-  },
-  "app.icon-editor.notification.close": {
-    "message": "Kapat"
-  },
-  "app.icon-editor.notification.description": {
-    "message": "Kurulumunuzu özelleştirin!"
-  },
-  "app.icon-editor.notification.dismiss": {
-    "message": "Reddet"
-  },
-  "app.icon-editor.notification.title": {
-    "message": "Yeni ikon düzenleyici"
-  },
-  "app.icon-editor.notification.view-update": {
-    "message": "Güncellemeyi görüntüle"
-  },
   "app.install.phase.downloading_content": {
     "message": "İçerik indiriliyor"
   },
diff --git a/apps/app-frontend/src/locales/uk-UA/index.json b/apps/app-frontend/src/locales/uk-UA/index.json
index cb5d6e3811..0329c56832 100644
--- a/apps/app-frontend/src/locales/uk-UA/index.json
+++ b/apps/app-frontend/src/locales/uk-UA/index.json
@@ -326,30 +326,6 @@
   "app.hosting.update-required.title": {
     "message": "Потрібне оновлення Modrinth App"
   },
-  "app.icon-editor.apply-icons-modal.badge": {
-    "message": "Нове оновлення"
-  },
-  "app.icon-editor.apply-icons-modal.close": {
-    "message": "Закрити"
-  },
-  "app.icon-editor.apply-icons-modal.random-icons": {
-    "message": "Випадкові іконки"
-  },
-  "app.icon-editor.apply-icons-modal.skip": {
-    "message": "Пропустити"
-  },
-  "app.icon-editor.notification.close": {
-    "message": "Закрити"
-  },
-  "app.icon-editor.notification.description": {
-    "message": "Персоналізуйте свої примірники!"
-  },
-  "app.icon-editor.notification.dismiss": {
-    "message": "Відхилити"
-  },
-  "app.icon-editor.notification.view-update": {
-    "message": "Переглянути оновлення"
-  },
   "app.install.phase.downloading_content": {
     "message": "Завантаження вмісту"
   },
diff --git a/apps/app-frontend/src/locales/vi-VN/index.json b/apps/app-frontend/src/locales/vi-VN/index.json
index 8bb887d7db..6de19d5c09 100644
--- a/apps/app-frontend/src/locales/vi-VN/index.json
+++ b/apps/app-frontend/src/locales/vi-VN/index.json
@@ -302,24 +302,6 @@
   "app.hosting.update-required.title": {
     "message": "Yêu cầu cập nhật ứng dụng Modrinth"
   },
-  "app.icon-editor.apply-icons-modal.apply-error": {
-    "message": "Không thể áp dụng các biểu tượng ngẫu nhiên cho các thực thể."
-  },
-  "app.icon-editor.apply-icons-modal.badge": {
-    "message": "Điểm mới trong bản cập nhật này"
-  },
-  "app.icon-editor.apply-icons-modal.description": {
-    "message": "Tạo biểu tượng tùy chỉnh cho các instance của bạn ngay trong ứng dụng Modrinth. Hãy kết hợp các hình nền với những biểu tượng từ Minecraft và các bản mod phổ biến!"
-  },
-  "app.icon-editor.apply-icons-modal.title": {
-    "message": "Trình chỉnh sửa biểu tượng tùy chỉnh"
-  },
-  "app.icon-editor.notification.description": {
-    "message": "Tùy chỉnh các instance của bạn!"
-  },
-  "app.icon-editor.notification.title": {
-    "message": "Trình chỉnh sửa biểu tượng mới"
-  },
   "app.install.phase.downloading_content": {
     "message": "Đang tải nội dung"
   },
diff --git a/apps/app-frontend/src/locales/zh-CN/index.json b/apps/app-frontend/src/locales/zh-CN/index.json
index 33ee6a975d..dac2b571f0 100644
--- a/apps/app-frontend/src/locales/zh-CN/index.json
+++ b/apps/app-frontend/src/locales/zh-CN/index.json
@@ -344,48 +344,6 @@
   "app.hosting.update-required.title": {
     "message": "需要更新 Modrinth App"
   },
-  "app.icon-editor.apply-icons-modal.apply-error": {
-    "message": "无法为实例应用随机图标。"
-  },
-  "app.icon-editor.apply-icons-modal.apply-success": {
-    "message": "已为 {num, plural, one {# 个实例} other {# 个实例}} 随机分配图标。"
-  },
-  "app.icon-editor.apply-icons-modal.badge": {
-    "message": "本次更新的新功能"
-  },
-  "app.icon-editor.apply-icons-modal.close": {
-    "message": "关闭"
-  },
-  "app.icon-editor.apply-icons-modal.description": {
-    "message": "直接在 Modrinth App 中为你的实例创建自定义图标。自由搭配背景与来自《我的世界》及热门 Mod 的图案！"
-  },
-  "app.icon-editor.apply-icons-modal.instances-without-icons": {
-    "message": "还有 {count, plural, one {# 个实例} other {# 个实例}} 未设置图标。要先随机分配图标来试试看吗？"
-  },
-  "app.icon-editor.apply-icons-modal.random-icons": {
-    "message": "随机一个图标"
-  },
-  "app.icon-editor.apply-icons-modal.skip": {
-    "message": "跳过"
-  },
-  "app.icon-editor.apply-icons-modal.title": {
-    "message": "自定义图标编辑器"
-  },
-  "app.icon-editor.notification.close": {
-    "message": "关闭"
-  },
-  "app.icon-editor.notification.description": {
-    "message": "个性化你的实例！"
-  },
-  "app.icon-editor.notification.dismiss": {
-    "message": "忽略"
-  },
-  "app.icon-editor.notification.title": {
-    "message": "新的图标编辑器"
-  },
-  "app.icon-editor.notification.view-update": {
-    "message": "查看更新"
-  },
   "app.install.phase.downloading_content": {
     "message": "正在下载内容"
   },
diff --git a/apps/app-frontend/src/locales/zh-TW/index.json b/apps/app-frontend/src/locales/zh-TW/index.json
index bfb917c9fd..d576611e29 100644
--- a/apps/app-frontend/src/locales/zh-TW/index.json
+++ b/apps/app-frontend/src/locales/zh-TW/index.json
@@ -344,48 +344,6 @@
   "app.hosting.update-required.title": {
     "message": "需要更新 Modrinth App"
   },
-  "app.icon-editor.apply-icons-modal.apply-error": {
-    "message": "無法將隨機圖示套用到實例。"
-  },
-  "app.icon-editor.apply-icons-modal.apply-success": {
-    "message": "已隨機產生 {num, plural, other {# 個實例}}的圖示。"
-  },
-  "app.icon-editor.apply-icons-modal.badge": {
-    "message": "更新內容"
-  },
-  "app.icon-editor.apply-icons-modal.close": {
-    "message": "關閉"
-  },
-  "app.icon-editor.apply-icons-modal.description": {
-    "message": "直接在 Modrinth App 中為你的實例建立自訂圖示。自由搭配 Minecraft 及熱門模組中的圖案與背景！"
-  },
-  "app.icon-editor.apply-icons-modal.instances-without-icons": {
-    "message": "你有 {count, plural, other {# 個實例}}還沒有圖示。要我們先幫你的{count, plural, other {實例}}隨機產生圖示嗎？"
-  },
-  "app.icon-editor.apply-icons-modal.random-icons": {
-    "message": "隨機產生圖示"
-  },
-  "app.icon-editor.apply-icons-modal.skip": {
-    "message": "跳過"
-  },
-  "app.icon-editor.apply-icons-modal.title": {
-    "message": "自訂圖示編輯器"
-  },
-  "app.icon-editor.notification.close": {
-    "message": "關閉"
-  },
-  "app.icon-editor.notification.description": {
-    "message": "讓你的實例更具個人風格！"
-  },
-  "app.icon-editor.notification.dismiss": {
-    "message": "忽略"
-  },
-  "app.icon-editor.notification.title": {
-    "message": "新的圖示編輯器"
-  },
-  "app.icon-editor.notification.view-update": {
-    "message": "查看更新"
-  },
   "app.install.phase.downloading_content": {
     "message": "正在下載內容"
   },
diff --git a/apps/app-frontend/src/pages/instance/components/settings-modal/synced-options-settings.vue b/apps/app-frontend/src/pages/instance/components/settings-modal/synced-options-settings.vue
index 897377f793..d7b8bb36f4 100644
--- a/apps/app-frontend/src/pages/instance/components/settings-modal/synced-options-settings.vue
+++ b/apps/app-frontend/src/pages/instance/components/settings-modal/synced-options-settings.vue
@@ -14,6 +14,7 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/vue-query'
 import { computed, inject, ref } from 'vue'
 
 import GameSettingsModal from '@/components/ui/settings/instances/game-settings/GameSettingsModal.vue'
+import SyncedPacksModal from '@/components/ui/settings/instances/SyncedPacksModal.vue'
 import { list_game_options_sync_sources } from '@/helpers/game-options'
 import {
 	get_initialized_synced_options,
@@ -39,7 +40,42 @@ const { handleError } = injectNotificationManager()
 const queryClient = useQueryClient()
 const openAppSettingsSyncedOptions = inject(appSettingsModalOpenSyncedOptionsKey, () => {})
 
+const syncedPacksModal = ref<InstanceType<typeof SyncedPacksModal>>()
+
 const messages = defineMessages({
+	resourcePacks: {
+		id: 'instance.settings.synced-options.resource-packs',
+		defaultMessage: 'Unsync resource packs',
+	},
+	resourcePacksDescription: {
+		id: 'instance.settings.synced-options.resource-packs.description',
+		defaultMessage: "Keep this instance's resource packs separate from synced packs.",
+	},
+	resourcePacksDisabled: {
+		id: 'instance.settings.synced-options.resource-packs.disabled',
+		defaultMessage: 'Resource pack syncing is turned off in app settings.',
+	},
+	dataPacks: {
+		id: 'instance.settings.synced-options.data-packs',
+		defaultMessage: 'Unsync data packs',
+	},
+	dataPacksDescription: {
+		id: 'instance.settings.synced-options.data-packs.description',
+		defaultMessage: "Keep this instance's data packs separate from synced packs.",
+	},
+	dataPacksDisabled: {
+		id: 'instance.settings.synced-options.data-packs.disabled',
+		defaultMessage: 'Data pack syncing is turned off in app settings.',
+	},
+	editPacks: {
+		id: 'instance.settings.synced-options.edit-packs',
+		defaultMessage: 'Edit synced packs',
+	},
+	packsOverride: {
+		id: 'instance.settings.synced-options.packs-override',
+		defaultMessage:
+			'Turn off this override to edit synced packs. Independent packs can be managed in the content tab.',
+	},
 	sharedSettingsDescription: {
 		id: 'instance.settings.tabs.synced-options.shared-settings.description',
 		defaultMessage: 'Enable an override to keep a synced setting separate for this instance.',
@@ -130,6 +166,8 @@ const messages = defineMessages({
 type InstanceSyncedOption = Exclude<SyncedOption, 'screenshots'>
 
 const globalDisabledMessages: Record<InstanceSyncedOption, keyof typeof messages> = {
+	resource_packs: 'resourcePacksDisabled',
+	data_packs: 'dataPacksDisabled',
 	game_options: 'gameSettingsDisabled',
 	multiplayer_servers: 'multiplayerServersDisabled',
 	command_history: 'commandHistoryDisabled',
@@ -151,6 +189,16 @@ const rows: Array<{
 		title: 'multiplayerServers',
 		description: 'multiplayerServersDescription',
 	},
+	{
+		option: 'resource_packs',
+		title: 'resourcePacks',
+		description: 'resourcePacksDescription',
+	},
+	{
+		option: 'data_packs',
+		title: 'dataPacks',
+		description: 'dataPacksDescription',
+	},
 	{
 		option: 'command_history',
 		title: 'commandHistory',
@@ -411,6 +459,7 @@ function resolveHotbars(resolution: SyncedOptionJoinResolution) {
 
 <template>
 	<div class="flex flex-col gap-6">
+		<SyncedPacksModal ref="syncedPacksModal" />
 		<GameSettingsModal
 			ref="gameSettingsModal"
 			:instance-id="gameSettingsInstanceId"
@@ -505,6 +554,33 @@ function resolveHotbars(resolution: SyncedOptionJoinResolution) {
 							<EditIcon />
 						</IconButton>
 					</span>
+					<span
+						v-if="row.option === 'resource_packs' || row.option === 'data_packs'"
+						v-tooltip="
+							disabledReason(row.option) ??
+							formatMessage(enabled(row.option) ? messages.editPacks : messages.packsOverride)
+						"
+						class="flex"
+					>
+						<IconButton
+							type="outlined"
+							circular
+							:label="formatMessage(messages.editPacks)"
+							:disabled="
+								mutation.isPending.value ||
+								overviewQuery.isPending.value ||
+								!!disabledReason(row.option) ||
+								!enabled(row.option)
+							"
+							@click="
+								syncedPacksModal?.show(
+									row.option === 'resource_packs' ? 'resourcepack' : 'datapack',
+								)
+							"
+						>
+							<EditIcon />
+						</IconButton>
+					</span>
 					<span v-tooltip="disabledReason(row.option)" class="flex">
 						<Toggle
 							:id="`exclude-${row.option}`"
diff --git a/apps/app-frontend/src/pages/instance/content/index.vue b/apps/app-frontend/src/pages/instance/content/index.vue
index 5aca64d7eb..3e87f48647 100644
--- a/apps/app-frontend/src/pages/instance/content/index.vue
+++ b/apps/app-frontend/src/pages/instance/content/index.vue
@@ -2,6 +2,7 @@
 	<ReadyTransition :pending="loading">
 		<ContentPageLayout>
 			<template #modals>
+				<SyncedContentModal ref="syncedContentModal" />
 				<UnknownFileWarningModal
 					ref="unknownFileWarningModal"
 					mode="mod"
@@ -124,8 +125,10 @@ import { computed, nextTick, onMounted, onUnmounted, ref, watch } from 'vue'
 import { useRouter } from 'vue-router'
 
 import ExportModal from '@/components/ui/ExportModal.vue'
+import SyncedContentModal from '@/components/ui/instance/SyncedContentModal.vue'
 import ShareModalWrapper from '@/components/ui/modal/ShareModalWrapper.vue'
 import { useManagedContentPolicy } from '@/composables/instances/use-managed-content-policy'
+import { useSyncedPackActions } from '@/composables/instances/use-synced-pack-actions'
 import { useAppEvent } from '@/composables/use-app-event'
 import { type FeatureFlag, useAppSettings } from '@/composables/use-app-settings.ts'
 import { trackEvent } from '@/helpers/analytics'
@@ -146,6 +149,7 @@ import {
 } from '@/helpers/instance'
 import { type InstanceContentData, loadInstanceContentData } from '@/helpers/instance-content'
 import { get as getSettings, set as setSettings } from '@/helpers/settings'
+import { set_synced_pack_enabled, syncedPackKeys } from '@/helpers/synced-packs'
 import type { CacheBehaviour } from '@/helpers/types'
 import { highlightModInInstance } from '@/helpers/utils.js'
 import { type AppEventPayload, injectAppEvents } from '@/providers/app-events'
@@ -801,6 +805,13 @@ async function toggleDisableMod(
 	const originalFilePath = mod.file_path
 
 	try {
+		if (mod.synced_pack) {
+			await set_synced_pack_enabled(mod.synced_pack.id, desiredEnabled ?? !mod.enabled)
+			await refreshContentState('must_revalidate')
+			await queryClient.invalidateQueries({ queryKey: syncedPackKeys.all })
+			if (reconcileSharedState) await reconcileSharedInstancePublishState()
+			return
+		}
 		const newPath = await toggle_disable_project(instance.value.id, mod.file_path, desiredEnabled)
 		const newFileName = fileNameFromPath(newPath)
 		const enabled = !newPath.endsWith('.disabled')
@@ -846,8 +857,15 @@ async function removeMod(mod: ContentItem) {
 
 	try {
 		const removedPath = mod.file_path
-		await remove_project(instance.value.id, removedPath)
-		projects.value = projects.value.filter((x) => removedPath !== x.file_path)
+		if (!(await packActions.deleteSyncedItem(mod))) {
+			await remove_project(instance.value.id, removedPath)
+		}
+		if (mod.synced_pack) {
+			await refreshContentState('must_revalidate')
+			await queryClient.invalidateQueries({ queryKey: syncedPackKeys.all })
+		} else {
+			projects.value = projects.value.filter((x) => removedPath !== x.file_path)
+		}
 
 		trackEvent('InstanceProjectRemove', {
 			loader: instance.value.loader,
@@ -1473,8 +1491,13 @@ async function handleShareItems(
 	await shareModal.value?.show(text)
 }
 
+const syncedContentModal = ref<InstanceType<typeof SyncedContentModal>>()
+const packActions = useSyncedPackActions(instance, syncedContentModal, canMutateContent, () =>
+	refreshContentState('must_revalidate'),
+)
+
 function getOverflowOptions(item: ContentItem): ButtonMenuOption[] {
-	const options: ButtonMenuOption[] = []
+	const options: ButtonMenuOption[] = packActions.overflowOptions(item)
 
 	options.push({
 		id: 'show-file',
@@ -1582,7 +1605,7 @@ provideContentManager({
 	error: ref(null),
 	managedContent,
 	isPackLocked,
-	isBusy: isInstanceBusy,
+	isBusy: computed(() => isInstanceBusy.value || packActions.isPending.value),
 	disableAddContent: isQuarantined,
 	disableAddContentTooltip: formatMessage(messages.lockedContent),
 	isBulkOperating,
@@ -1612,6 +1635,8 @@ provideContentManager({
 	canToggleItem: canToggleContent,
 	getDeleteWarning: managedContentPolicy.deleteWarning,
 	getDisableWarning: managedContentPolicy.disableWarning,
+	confirmAction: packActions.confirmAction,
+	confirmDeleteItems: packActions.confirmDeleteItems,
 	getDeleteDependencyWarning,
 	refresh: () => initProjects('must_revalidate'),
 	browse: handleBrowseContent,
@@ -1664,6 +1689,8 @@ provideContentManager({
 			: undefined,
 		external: item.external ?? !item.project,
 		enabled: canMutateContent(item) ? item.enabled : undefined,
+		synced: !!item.synced_pack,
+		syncUpdatePending: item.synced_pack?.update_pending,
 		locked: item.locked,
 		installing: item.installing,
 		hideDelete: !canDeleteContent(item),
diff --git a/apps/app/build.rs b/apps/app/build.rs
index f51ea5f0a5..63ee044765 100644
--- a/apps/app/build.rs
+++ b/apps/app/build.rs
@@ -251,6 +251,13 @@ fn main() {
                         "instance_list_synced_servers",
                         "instance_update_synced_server",
                         "instance_remove_synced_server",
+                        "instance_get_pack_sync_preview",
+                        "instance_sync_pack",
+                        "instance_desync_pack",
+                        "instance_list_synced_packs",
+                        "instance_upload_synced_pack",
+                        "instance_set_synced_pack_enabled",
+                        "instance_remove_synced_pack",
                         "instance_rebuild_synced_options",
                         "instance_list",
                         "instance_list_groups",
diff --git a/apps/app/src/api/instance.rs b/apps/app/src/api/instance.rs
index baccddb5f0..ef1e4165b9 100644
--- a/apps/app/src/api/instance.rs
+++ b/apps/app/src/api/instance.rs
@@ -80,6 +80,13 @@ pub fn init<R: tauri::Runtime>() -> tauri::plugin::TauriPlugin<R> {
             instance_list_synced_servers,
             instance_update_synced_server,
             instance_remove_synced_server,
+            instance_get_pack_sync_preview,
+            instance_sync_pack,
+            instance_desync_pack,
+            instance_list_synced_packs,
+            instance_upload_synced_pack,
+            instance_set_synced_pack_enabled,
+            instance_remove_synced_pack,
             instance_rebuild_synced_options,
             instance_check_installed,
             instance_update_all,
@@ -964,6 +971,70 @@ pub async fn instance_remove_synced_server(server_id: &str) -> Result<()> {
     Ok(theseus::instance::remove_synced_server(server_id).await?)
 }
 
+#[tauri::command]
+pub async fn instance_get_pack_sync_preview(
+    instance_id: &str,
+    project_path: &str,
+) -> Result<theseus::instance::PackSyncPreview> {
+    Ok(
+        theseus::instance::get_pack_sync_preview(instance_id, project_path)
+            .await?,
+    )
+}
+
+#[tauri::command]
+pub async fn instance_sync_pack(
+    instance_id: &str,
+    project_path: &str,
+) -> Result<()> {
+    Ok(theseus::instance::sync_pack(instance_id, project_path).await?)
+}
+
+#[tauri::command]
+pub async fn instance_desync_pack(
+    instance_id: &str,
+    pack_id: &str,
+    mode: theseus::instance::DesyncServerMode,
+) -> Result<()> {
+    Ok(theseus::instance::desync_pack(instance_id, pack_id, mode).await?)
+}
+
+#[tauri::command]
+pub async fn instance_list_synced_packs(
+    project_type: ProjectType,
+) -> Result<Vec<ContentItem>> {
+    Ok(theseus::instance::list_synced_packs(project_type).await?)
+}
+
+#[tauri::command]
+pub async fn instance_upload_synced_pack(
+    path: &Path,
+    project_type: ProjectType,
+    game_versions: Vec<String>,
+) -> Result<()> {
+    Ok(
+        theseus::instance::upload_synced_pack(
+            path,
+            project_type,
+            game_versions,
+        )
+        .await?,
+    )
+}
+
+#[tauri::command]
+pub async fn instance_set_synced_pack_enabled(
+    pack_id: &str,
+    enabled: bool,
+) -> Result<()> {
+    Ok(theseus::instance::set_synced_pack_enabled(pack_id, enabled).await?)
+}
+
+#[tauri::command]
+pub async fn instance_remove_synced_pack(pack_id: &str) -> Result<()> {
+    Ok(theseus::instance::remove_synced_pack(pack_id).await?)
+}
+
 #[tauri::command]
 pub async fn instance_rebuild_synced_options(
     instance_id: Option<&str>,
diff --git a/packages/app-lib/migrations/20260903120000_synced-packs.sql b/packages/app-lib/migrations/20260903120000_synced-packs.sql
new file mode 100644
index 0000000000..8d7c2354a7
--- /dev/null
+++ b/packages/app-lib/migrations/20260903120000_synced-packs.sql
@@ -0,0 +1,16 @@
+INSERT INTO sync_feature_settings
+	(feature, globally_enabled, new_instance_default)
+VALUES
+	('resource_packs', 0, 1),
+	('data_packs', 0, 1);
+
+UPDATE sync_feature_settings
+SET globally_enabled = 1
+WHERE feature IN ('resource_packs', 'data_packs')
+	AND NOT EXISTS (SELECT 1 FROM instances);
+
+INSERT INTO instance_sync_preferences (instance_id, feature, enabled)
+SELECT instances.id, features.feature, 1
+FROM instances
+CROSS JOIN sync_feature_settings features
+WHERE features.feature IN ('resource_packs', 'data_packs');
diff --git a/packages/app-lib/src/api/instance.rs b/packages/app-lib/src/api/instance.rs
index 107e98f306..e9ae3da69d 100644
--- a/packages/app-lib/src/api/instance.rs
+++ b/packages/app-lib/src/api/instance.rs
@@ -15,6 +15,7 @@ mod screenshot_groups;
 mod screenshots;
 mod shared;
 mod synced_options;
+mod synced_packs;
 pub(crate) mod synced_servers;
 
 pub use self::content::{
@@ -138,3 +139,10 @@ pub use self::synced_servers::{
     DesyncServerMode, ServerSource, SyncedServer, desync_server,
     list_synced_servers, remove_synced_server, update_synced_server,
 };
+
+pub(crate) use self::synced_packs::reconcile_after_change as reconcile_synced_packs;
+pub use self::synced_packs::{
+    PackSyncPreview, PackSyncTarget, desync_pack, get_pack_sync_preview,
+    list_synced_packs, remove_synced_pack, set_synced_pack_enabled, sync_pack,
+    upload_synced_pack,
+};
diff --git a/packages/app-lib/src/api/instance/content.rs b/packages/app-lib/src/api/instance/content.rs
index 29d2fbef27..20c897fb4c 100644
--- a/packages/app-lib/src/api/instance/content.rs
+++ b/packages/app-lib/src/api/instance/content.rs
@@ -71,7 +71,12 @@ pub async fn get_content_items(
     cache_behaviour: Option<CacheBehaviour>,
 ) -> crate::Result<Vec<ContentItem>> {
     let state = State::get().await?;
-    crate::state::list_content(instance_id, None, cache_behaviour, &state).await
+    let mut items =
+        crate::state::list_content(instance_id, None, cache_behaviour, &state)
+            .await?;
+    super::synced_packs::decorate_content(instance_id, &mut items, &state)
+        .await?;
+    Ok(items)
 }
 
 #[tracing::instrument]
diff --git a/packages/app-lib/src/api/instance/projects.rs b/packages/app-lib/src/api/instance/projects.rs
index 365e1a1c4e..dc847ac8bc 100644
--- a/packages/app-lib/src/api/instance/projects.rs
+++ b/packages/app-lib/src/api/instance/projects.rs
@@ -41,6 +41,7 @@ pub async fn update_all_projects(
         &state,
     )
     .await?;
+    super::synced_packs::reconcile_after_content_change(instance_id).await;
     emit_loading(&loading_bar, 100.0, Some("Updated instance"))?;
     emit_instance(&instance.id, InstancePayloadType::Edited).await?;
 
@@ -67,6 +68,7 @@ pub async fn update_project(
         &state,
     )
     .await?;
+    super::synced_packs::reconcile_after_content_change(instance_id).await;
     if !skip_send_event.unwrap_or(false) {
         emit_instance(instance_id, InstancePayloadType::Edited).await?;
     }
@@ -93,6 +95,7 @@ pub async fn add_project_from_version(
             &state,
         )
         .await?;
+    super::synced_packs::sync_new_pack(instance_id, &project_path).await;
     emit_instance(instance_id, InstancePayloadType::Edited).await?;
 
     Ok(project_path)
@@ -124,13 +127,18 @@ pub async fn install_project_with_dependencies(
     let project_ids = plan_project_ids(&plan);
     let install_plan = plan.clone();
     tokio::spawn(async move {
-        match crate::state::instances::commands::install_resolved_content_plan(
-            &instance_id,
-            &install_plan,
-            &state,
-        )
-        .await
-        {
+        let result = async {
+			let paths = crate::state::instances::commands::install_resolved_content_plan(
+				&instance_id,
+				&install_plan,
+				&state,
+			).await?;
+			for path in paths {
+				super::synced_packs::sync_new_pack(&instance_id, &path).await;
+			}
+			Ok::<(), crate::Error>(())
+		}.await;
+        match result {
             Ok(()) => {
                 if let Err(error) = emit_instance(
                     &instance_id,
@@ -210,6 +218,7 @@ pub async fn switch_project_version_with_dependencies(
             &state,
         )
         .await?;
+    super::synced_packs::reconcile_after_content_change(instance_id).await;
     emit_instance(&metadata.instance.id, InstancePayloadType::Edited).await?;
 
     Ok(path)
@@ -231,6 +240,7 @@ pub async fn add_project_from_path(
             &state,
         )
         .await?;
+    super::synced_packs::sync_new_pack(instance_id, &project_path).await;
     emit_instance(instance_id, InstancePayloadType::Edited).await?;
 
     Ok(project_path)
@@ -267,6 +277,7 @@ pub async fn toggle_disable_project(
         &state,
     )
     .await?;
+    super::synced_packs::reconcile_after_content_change(instance_id).await;
     emit_instance(instance_id, InstancePayloadType::Edited).await?;
 
     Ok(res)
@@ -286,6 +297,7 @@ pub async fn remove_project(
         &state,
     )
     .await?;
+    super::synced_packs::reconcile_after_content_change(instance_id).await;
     emit_instance(instance_id, InstancePayloadType::Edited).await?;
 
     Ok(())
@@ -503,7 +515,7 @@ async fn ensure_instance_content_unlocked(
     Ok(())
 }
 
-fn ensure_metadata_content_unlocked(
+pub(super) fn ensure_metadata_content_unlocked(
     metadata: &crate::state::InstanceMetadata,
 ) -> crate::Result<()> {
     if metadata.quarantined {
diff --git a/packages/app-lib/src/api/instance/synced_options/files.rs b/packages/app-lib/src/api/instance/synced_options/files.rs
index 23ff80fc41..800c087edd 100644
--- a/packages/app-lib/src/api/instance/synced_options/files.rs
+++ b/packages/app-lib/src/api/instance/synced_options/files.rs
@@ -96,6 +96,8 @@ pub(in crate::api::instance) fn instance_option_enabled(
             metadata.synced_options.creative_hotbars
         }
         SyncedOption::Screenshots => metadata.synced_options.screenshots,
+        SyncedOption::ResourcePacks => metadata.synced_options.resource_packs,
+        SyncedOption::DataPacks => metadata.synced_options.data_packs,
     }
 }
 
diff --git a/packages/app-lib/src/api/instance/synced_options/orchestration.rs b/packages/app-lib/src/api/instance/synced_options/orchestration.rs
index e19301dfa7..e2bba63176 100644
--- a/packages/app-lib/src/api/instance/synced_options/orchestration.rs
+++ b/packages/app-lib/src/api/instance/synced_options/orchestration.rs
@@ -7,7 +7,7 @@ use serde::{Deserialize, Serialize};
 use std::path::PathBuf;
 use std::time::{SystemTime, UNIX_EPOCH};
 
-use super::super::synced_servers;
+use super::super::{synced_packs, synced_servers};
 use super::command_history::{
     command_history_path, ensure_command_history,
     merge_command_history_from_instance, normalize_command_history,
@@ -55,6 +55,10 @@ pub struct GlobalSyncedOptions {
     pub multiplayer_servers: bool,
     pub creative_hotbars: bool,
     pub screenshots: bool,
+    #[serde(default)]
+    pub resource_packs: bool,
+    #[serde(default)]
+    pub data_packs: bool,
 }
 
 impl GlobalSyncedOptions {
@@ -65,6 +69,8 @@ impl GlobalSyncedOptions {
             SyncedOption::MultiplayerServers => self.multiplayer_servers,
             SyncedOption::CreativeHotbars => self.creative_hotbars,
             SyncedOption::Screenshots => self.screenshots,
+            SyncedOption::ResourcePacks => self.resource_packs,
+            SyncedOption::DataPacks => self.data_packs,
         }
     }
 
@@ -77,6 +83,8 @@ impl GlobalSyncedOptions {
             }
             SyncedOption::CreativeHotbars => self.creative_hotbars = enabled,
             SyncedOption::Screenshots => self.screenshots = enabled,
+            SyncedOption::ResourcePacks => self.resource_packs = enabled,
+            SyncedOption::DataPacks => self.data_packs = enabled,
         }
     }
 }
@@ -240,7 +248,10 @@ async fn version_capability(
 ) -> CapabilityStatus {
     if matches!(
         option,
-        SyncedOption::GameOptions | SyncedOption::Screenshots
+        SyncedOption::GameOptions
+            | SyncedOption::Screenshots
+            | SyncedOption::ResourcePacks
+            | SyncedOption::DataPacks
     ) {
         return CapabilityStatus::Supported;
     }
@@ -255,7 +266,9 @@ async fn version_capability(
 		);
     };
     let cutoff_id = match option {
-        SyncedOption::GameOptions => unreachable!(),
+        SyncedOption::GameOptions
+        | SyncedOption::ResourcePacks
+        | SyncedOption::DataPacks => unreachable!(),
         // Mojang's manifest does not include Beta 1.8 Pre-release as a
         // separate entry, so b1.8 is the first resolvable version at that
         // boundary.
@@ -289,7 +302,7 @@ async fn version_capability(
 
     CapabilityStatus::Unsupported(
 		match option {
-			SyncedOption::GameOptions => unreachable!(),
+			SyncedOption::GameOptions | SyncedOption::ResourcePacks | SyncedOption::DataPacks => unreachable!(),
 			SyncedOption::MultiplayerServers => {
 				"Multiplayer server syncing requires Minecraft Beta 1.8 Pre-release or newer."
 			}
@@ -315,12 +328,15 @@ pub async fn set_global_option(
     let was_enabled = get_global_options_with_state(&state).await?.get(option);
 
     let initializing_game_options_from_base = enabled
-        && !was_enabled
         && option == SyncedOption::GameOptions
         && base_instance_id.is_some();
     if enabled
-        && !was_enabled
         && option != SyncedOption::Screenshots
+        && (!was_enabled
+            || !matches!(
+                option,
+                SyncedOption::ResourcePacks | SyncedOption::DataPacks
+            ))
         && let Some(base_instance_id) = base_instance_id
     {
         if option == SyncedOption::GameOptions {
@@ -372,6 +388,15 @@ pub async fn set_global_option(
         Err(error) => return Err(error),
     };
     for metadata in instances {
+        if !enabled
+            && matches!(
+                option,
+                SyncedOption::ResourcePacks | SyncedOption::DataPacks
+            )
+        {
+            detach_option(&metadata, option, &state).await?;
+            continue;
+        }
         let running = option != SyncedOption::GameOptions
             && instance_is_running(&metadata, &state).await?;
         if sync_files_are_protected(&metadata) || running {
@@ -541,7 +566,10 @@ pub async fn set_instance_option(
         }
         if !matches!(
             option,
-            SyncedOption::GameOptions | SyncedOption::Screenshots
+            SyncedOption::GameOptions
+                | SyncedOption::Screenshots
+                | SyncedOption::ResourcePacks
+                | SyncedOption::DataPacks
         ) && !can_reconcile
         {
             return Err(ErrorKind::InputError(
@@ -583,7 +611,9 @@ pub async fn set_instance_option(
                 }
                 SyncedOption::GameOptions
                 | SyncedOption::CreativeHotbars
-                | SyncedOption::Screenshots => {
+                | SyncedOption::Screenshots
+                | SyncedOption::ResourcePacks
+                | SyncedOption::DataPacks => {
                     unreachable!()
                 }
             },
@@ -629,6 +659,13 @@ pub async fn set_instance_option(
             }
             return Err(error);
         }
+    } else if !enabled
+        && matches!(
+            option,
+            SyncedOption::ResourcePacks | SyncedOption::DataPacks
+        )
+    {
+        detach_option(&metadata, option, &state).await?;
     }
 
     crate::state::get_instance(instance_id, &state.pool)
@@ -658,7 +695,10 @@ pub async fn get_instance_option_join_preview(
     }
     if !matches!(
         option,
-        SyncedOption::GameOptions | SyncedOption::Screenshots
+        SyncedOption::GameOptions
+            | SyncedOption::Screenshots
+            | SyncedOption::ResourcePacks
+            | SyncedOption::DataPacks
     ) && (sync_files_are_protected(&metadata)
         || instance_is_running(&metadata, &state).await?)
     {
@@ -694,7 +734,9 @@ async fn instance_option_join_action(
                 SyncedOptionJoinAction::Attach
             }
         }
-        SyncedOption::Screenshots => SyncedOptionJoinAction::Attach,
+        SyncedOption::Screenshots
+        | SyncedOption::ResourcePacks
+        | SyncedOption::DataPacks => SyncedOptionJoinAction::Attach,
     })
 }
 
@@ -739,6 +781,14 @@ pub(crate) async fn monitor_persisted_processes() -> crate::Result<()> {
                             .await;
                     }
                     Ok(false) => {
+                        if let Err(error) =
+                            synced_packs::reconcile_after_change(&instance_id)
+                                .await
+                        {
+                            tracing::warn!(
+                                "Failed to reconcile synced packs after closing {instance_id}: {error}"
+                            );
+                        }
                         break;
                     }
                     Err(error) => {
@@ -872,6 +922,9 @@ async fn reconcile_option(
         SyncedOption::MultiplayerServers => {
             synced_servers::reconcile_servers(metadata, state).await
         }
+        SyncedOption::ResourcePacks | SyncedOption::DataPacks => {
+            synced_packs::reconcile(metadata, option, state).await
+        }
         SyncedOption::Screenshots => Ok(()),
     }
 }
@@ -967,7 +1020,9 @@ async fn backup_instance_option_file(
         SyncedOption::CommandHistory => directory.join(COMMAND_HISTORY_FILE),
         SyncedOption::CreativeHotbars => directory.join(HOTBAR_FILE),
         SyncedOption::MultiplayerServers => directory.join("servers.dat"),
-        SyncedOption::Screenshots => return Ok(()),
+        SyncedOption::Screenshots
+        | SyncedOption::ResourcePacks
+        | SyncedOption::DataPacks => return Ok(()),
     };
     if !path.exists() {
         return Ok(());
@@ -1060,6 +1115,9 @@ pub(super) async fn seed_from_instance(
         SyncedOption::MultiplayerServers => {
             synced_servers::seed_servers(metadata, state).await?;
         }
+        SyncedOption::ResourcePacks | SyncedOption::DataPacks => {
+            synced_packs::seed_from_instance(metadata, option, state).await?;
+        }
         SyncedOption::Screenshots => {}
     }
     Ok(())
@@ -1082,6 +1140,9 @@ async fn ensure_option(
         SyncedOption::MultiplayerServers => {
             synced_servers::ensure_servers(metadata, state).await
         }
+        SyncedOption::ResourcePacks | SyncedOption::DataPacks => {
+            synced_packs::reconcile(metadata, option, state).await
+        }
         SyncedOption::Screenshots => Ok(()),
     }
 }
@@ -1116,6 +1177,9 @@ async fn detach_option(
         SyncedOption::MultiplayerServers => {
             synced_servers::detach_servers(metadata, state).await
         }
+        SyncedOption::ResourcePacks | SyncedOption::DataPacks => {
+            synced_packs::detach(metadata, option, state).await
+        }
         SyncedOption::Screenshots => Ok(()),
     }
 }
@@ -1133,7 +1197,9 @@ async fn canonical_exists(
         SyncedOption::MultiplayerServers => {
             synced_servers::canonical_exists(state).await?
         }
-        SyncedOption::Screenshots => true,
+        SyncedOption::Screenshots
+        | SyncedOption::ResourcePacks
+        | SyncedOption::DataPacks => true,
     })
 }
 
@@ -1178,6 +1244,8 @@ fn option_from_str(value: &str) -> Option<SyncedOption> {
         "multiplayer_servers" => Some(SyncedOption::MultiplayerServers),
         "creative_hotbars" => Some(SyncedOption::CreativeHotbars),
         "screenshots" => Some(SyncedOption::Screenshots),
+        "resource_packs" => Some(SyncedOption::ResourcePacks),
+        "data_packs" => Some(SyncedOption::DataPacks),
         _ => None,
     }
 }
diff --git a/packages/app-lib/src/api/instance/synced_packs/mod.rs b/packages/app-lib/src/api/instance/synced_packs/mod.rs
new file mode 100644
index 0000000000..3fc0ab1b5d
--- /dev/null
+++ b/packages/app-lib/src/api/instance/synced_packs/mod.rs
@@ -0,0 +1,104 @@
+mod operations;
+mod reconciliation;
+mod storage;
+
+pub use operations::{
+    desync_pack, get_pack_sync_preview, list_synced_packs, remove_synced_pack,
+    set_synced_pack_enabled, sync_pack, upload_synced_pack,
+};
+pub(super) use operations::{seed_from_instance, sync_new_pack};
+pub(crate) use reconciliation::reconcile_after_change;
+pub(super) use reconciliation::{
+    decorate_content, detach, reconcile, reconcile_after_content_change,
+};
+
+use crate::state::{
+    ContentItem, InstanceMetadata, ProjectType, SyncedOption, Version,
+};
+use serde::{Deserialize, Serialize};
+use std::collections::BTreeMap;
+
+#[derive(Clone, Default, Serialize, Deserialize)]
+struct PackLibrary {
+    packs: BTreeMap<String, SyncedPack>,
+    instances: BTreeMap<String, BTreeMap<String, PackPlacement>>,
+}
+
+#[derive(Clone, Serialize, Deserialize)]
+struct SyncedPack {
+    item: ContentItem,
+    sha1: String,
+    game_versions: Vec<String>,
+}
+
+#[derive(Clone, Default, Serialize, Deserialize)]
+struct PackPlacement {
+    path: String,
+    sha1: String,
+    enabled: bool,
+    excluded: bool,
+    suspended: bool,
+    pending: bool,
+    content_set_id: String,
+    #[serde(default)]
+    error: Option<String>,
+}
+
+#[derive(Clone, Serialize)]
+pub struct PackSyncTarget {
+    pub instance_id: String,
+    pub name: String,
+    pub game_version: String,
+    pub compatible: bool,
+    pub participating: bool,
+}
+
+#[derive(Clone, Serialize)]
+pub struct PackSyncPreview {
+    pub pack: ContentItem,
+    pub instances: Vec<PackSyncTarget>,
+}
+
+fn pack_option(project_type: ProjectType) -> crate::Result<SyncedOption> {
+    match project_type {
+        ProjectType::ResourcePack => Ok(SyncedOption::ResourcePacks),
+        ProjectType::DataPack => Ok(SyncedOption::DataPacks),
+        _ => Err(crate::ErrorKind::InputError(
+            "Only resource packs and data packs can be synced.".to_string(),
+        )
+        .into()),
+    }
+}
+
+fn version_compatible(
+    pack: &SyncedPack,
+    version: &Version,
+    metadata: &InstanceMetadata,
+) -> bool {
+    pack.item
+        .project
+        .as_ref()
+        .is_some_and(|project| project.id == version.project_id)
+        && version
+            .game_versions
+            .contains(&metadata.applied_content_set.game_version)
+        && version.loaders.iter().any(|loader| {
+            pack.item
+                .project_type
+                .get_loaders()
+                .contains(&loader.as_str())
+        })
+}
+
+fn same_path(left: &str, right: &str) -> bool {
+    left.trim_end_matches(".disabled") == right.trim_end_matches(".disabled")
+}
+
+fn pack_path(pack: &SyncedPack, file_name: &str) -> String {
+    format!(
+        "{}/{}{}",
+        pack.item.project_type.get_folder(),
+        file_name,
+        if pack.item.enabled { "" } else { ".disabled" },
+    )
+}
diff --git a/packages/app-lib/src/api/instance/synced_packs/operations.rs b/packages/app-lib/src/api/instance/synced_packs/operations.rs
new file mode 100644
index 0000000000..72730c8b0a
--- /dev/null
+++ b/packages/app-lib/src/api/instance/synced_packs/operations.rs
@@ -0,0 +1,563 @@
+use super::super::DesyncServerMode;
+use super::super::synced_options::{
+    get_global_options, instance_dir, instance_is_running,
+    instance_option_enabled, sync_files_are_protected,
+};
+use super::reconciliation::{apply_all, participating, synced_instance_ids};
+use super::storage::{cache_bytes, read_library, write_library};
+use super::{
+    PackLibrary, PackPlacement, PackSyncPreview, PackSyncTarget, SyncedPack,
+    pack_option, version_compatible,
+};
+use crate::event::{InstancePayloadType, emit::emit_instance};
+use crate::state::instances::commands;
+use crate::state::{
+    CacheBehaviour, CachedEntry, ContentItem, ContentSourceKind,
+    InstanceMetadata, ProjectType, State, SyncedOption, SyncedPackInfo,
+};
+use crate::util::io;
+use bytes::Bytes;
+use std::io::{Cursor, Read};
+use std::path::Path;
+use uuid::Uuid;
+
+async fn source(
+    instance_id: &str,
+    project_path: &str,
+    state: &State,
+) -> crate::Result<(InstanceMetadata, ContentItem)> {
+    let metadata = crate::state::get_instance(instance_id, &state.pool)
+        .await?
+        .ok_or_else(|| {
+            crate::ErrorKind::InputError("Unknown instance".to_string())
+        })?;
+    super::super::projects::ensure_metadata_content_unlocked(&metadata)?;
+    if sync_files_are_protected(&metadata)
+        || instance_is_running(&metadata, state).await?
+    {
+        return Err(crate::ErrorKind::InputError(
+            "Close the instance before syncing its packs.".to_string(),
+        )
+        .into());
+    }
+    let item = commands::list_content(instance_id, None, None, state)
+        .await?
+        .into_iter()
+        .find(|item| item.file_path == project_path)
+        .ok_or_else(|| {
+            crate::ErrorKind::InputError(
+                "This pack could not be found in the instance.".to_string(),
+            )
+        })?;
+    pack_option(item.project_type)?;
+    if item
+        .source_kind
+        .is_some_and(|kind| kind != ContentSourceKind::Local)
+    {
+        return Err(crate::ErrorKind::InputError(
+            "Managed content cannot be added to pack syncing.".to_string(),
+        )
+        .into());
+    }
+    Ok((metadata, item))
+}
+
+pub(super) async fn pack_from_item(
+    mut item: ContentItem,
+    metadata: &InstanceMetadata,
+    state: &State,
+) -> crate::Result<SyncedPack> {
+    pack_option(item.project_type)?;
+    if !path_util::is_safe_file_name(&item.file_name)
+        || item.file_path
+            != format!("{}/{}", item.project_type.get_folder(), item.file_name)
+    {
+        return Err(crate::ErrorKind::InputError(
+            "Invalid pack file path.".to_string(),
+        )
+        .into());
+    }
+    let bytes = Bytes::from(
+        io::read(instance_dir(metadata, state).join(&item.file_path)).await?,
+    );
+    validate_pack(&bytes, item.project_type)?;
+    let game_versions = if let Some(version) = &item.version {
+        CachedEntry::get_version(
+            &version.id,
+            None,
+            &state.pool,
+            &state.api_semaphore,
+        )
+        .await?
+        .ok_or_else(|| {
+            crate::ErrorKind::InputError(
+                "The pack's compatibility could not be verified.".to_string(),
+            )
+        })?
+        .game_versions
+    } else {
+        vec![metadata.applied_content_set.game_version.clone()]
+    };
+    let sha1 = cache_bytes(bytes, state).await?;
+    item.file_name = item.file_name.trim_end_matches(".disabled").to_string();
+    item.file_path.clear();
+    item.synced_pack = None;
+    item.locked = false;
+    item.has_update = false;
+    item.update_version_id = None;
+    Ok(SyncedPack {
+        item,
+        sha1,
+        game_versions,
+    })
+}
+
+pub(super) fn validate_pack(
+    bytes: &[u8],
+    project_type: ProjectType,
+) -> crate::Result<()> {
+    let mut archive =
+        zip::ZipArchive::new(Cursor::new(bytes)).map_err(|_| {
+            crate::ErrorKind::InputError(
+                "Choose a valid pack ZIP file.".to_string(),
+            )
+        })?;
+    let mut metadata = String::new();
+    {
+        let file = archive.by_name("pack.mcmeta").map_err(|_| {
+            crate::ErrorKind::InputError(
+                "Choose a pack ZIP containing pack.mcmeta.".to_string(),
+            )
+        })?;
+        if file.size() > 1024 * 1024 {
+            return Err(crate::ErrorKind::InputError(
+                "The pack metadata is too large.".to_string(),
+            )
+            .into());
+        }
+        file.take(1024 * 1024 + 1).read_to_string(&mut metadata)?;
+    }
+    let value: serde_json::Value = serde_json::from_str(&metadata)?;
+    let (prefix, other_prefix) = match project_type {
+        ProjectType::ResourcePack => ("assets/", "data/"),
+        ProjectType::DataPack => ("data/", "assets/"),
+        _ => {
+            return Err(crate::ErrorKind::InputError(
+                "Unsupported synced content type.".to_string(),
+            )
+            .into());
+        }
+    };
+    if !value.get("pack").is_some_and(serde_json::Value::is_object)
+        || (!archive.file_names().any(|name| name.starts_with(prefix))
+            && archive
+                .file_names()
+                .any(|name| name.starts_with(other_prefix)))
+    {
+        return Err(crate::ErrorKind::InputError(
+            "This file is not a pack of the selected type.".to_string(),
+        )
+        .into());
+    }
+    Ok(())
+}
+
+fn existing_pack<'a>(
+    library: &'a PackLibrary,
+    candidate: &SyncedPack,
+) -> Option<(&'a String, &'a SyncedPack)> {
+    library.packs.iter().find(|(_, pack)| {
+        pack.item.project_type == candidate.item.project_type
+            && (pack.sha1 == candidate.sha1
+                || candidate.item.project.as_ref().is_some_and(|project| {
+                    pack.item
+                        .project
+                        .as_ref()
+                        .is_some_and(|existing| existing.id == project.id)
+                }))
+    })
+}
+
+pub async fn get_pack_sync_preview(
+    instance_id: &str,
+    project_path: &str,
+) -> crate::Result<PackSyncPreview> {
+    let state = State::get().await?;
+    let _guard = state.lock_synced_options().await;
+    let (metadata, item) = source(instance_id, project_path, &state).await?;
+    let candidate = pack_from_item(item, &metadata, &state).await?;
+    let library = read_library(&state).await?;
+    let existing = existing_pack(&library, &candidate);
+    let pack = existing.map_or(&candidate, |(_, pack)| pack);
+    let versions = if let Some(project) = &pack.item.project {
+        Some(
+            CachedEntry::get_project_versions(
+                &project.id,
+                Some(CacheBehaviour::MustRevalidate),
+                &state.pool,
+                &state.api_semaphore,
+            )
+            .await?
+            .unwrap_or_default(),
+        )
+    } else {
+        None
+    };
+    let global = get_global_options().await?;
+    let instances = crate::state::list_instances(&state.pool)
+        .await?
+        .iter()
+        .map(|instance| {
+            let excluded = existing.is_some_and(|(id, _)| {
+                library
+                    .instances
+                    .get(&instance.instance.id)
+                    .and_then(|items| items.get(id))
+                    .is_some_and(|placement| placement.excluded)
+            });
+            PackSyncTarget {
+                instance_id: instance.instance.id.clone(),
+                name: instance.instance.name.clone(),
+                game_version: instance.applied_content_set.game_version.clone(),
+                compatible: versions.as_ref().map_or_else(
+                    || {
+                        pack.game_versions.contains(
+                            &instance.applied_content_set.game_version,
+                        )
+                    },
+                    |versions| {
+                        versions.iter().any(|version| {
+                            version_compatible(pack, version, instance)
+                        })
+                    },
+                ),
+                participating: participating(instance, pack, global)
+                    && (instance.instance.id == instance_id || !excluded),
+            }
+        })
+        .collect();
+    Ok(PackSyncPreview {
+        pack: pack.item.clone(),
+        instances,
+    })
+}
+
+pub async fn sync_pack(
+    instance_id: &str,
+    project_path: &str,
+) -> crate::Result<()> {
+    sync_pack_inner(instance_id, project_path, false).await
+}
+
+pub(in crate::api::instance) async fn seed_from_instance(
+    metadata: &InstanceMetadata,
+    option: SyncedOption,
+    state: &State,
+) -> crate::Result<()> {
+    super::super::projects::ensure_metadata_content_unlocked(metadata)?;
+    let instance_id = &metadata.instance.id;
+    let items = commands::list_content(instance_id, None, None, state).await?;
+    let mut candidates = Vec::new();
+    for item in items {
+        if pack_option(item.project_type).ok() != Some(option)
+            || item
+                .source_kind
+                .is_some_and(|kind| kind != ContentSourceKind::Local)
+        {
+            continue;
+        }
+        let candidate = pack_from_item(item.clone(), metadata, state).await?;
+        if !candidate
+            .game_versions
+            .contains(&metadata.applied_content_set.game_version)
+        {
+            return Err(crate::ErrorKind::InputError(
+				"A pack in the selected sync source is incompatible with its Minecraft version.".to_string(),
+			).into());
+        }
+        candidates.push((item, candidate));
+    }
+
+    let mut library = read_library(state).await?;
+    for (item, mut pack) in candidates {
+        let id = existing_pack(&library, &pack)
+            .map(|(id, _)| id.clone())
+            .unwrap_or_else(|| Uuid::new_v4().to_string());
+        pack.item.id = id.clone();
+        library.packs.insert(id.clone(), pack);
+        library
+            .instances
+            .entry(instance_id.clone())
+            .or_default()
+            .insert(
+                id,
+                PackPlacement {
+                    path: item.file_path,
+                    sha1: item.id,
+                    enabled: item.enabled,
+                    content_set_id: metadata.applied_content_set.id.clone(),
+                    ..Default::default()
+                },
+            );
+    }
+    write_library(&library, state).await
+}
+
+pub(in crate::api::instance) async fn sync_new_pack(
+    instance_id: &str,
+    project_path: &str,
+) {
+    let Some(_) = ProjectType::get_from_parent_folder(project_path)
+        .and_then(|project_type| pack_option(project_type).ok())
+    else {
+        return;
+    };
+    if let Err(error) = sync_pack_inner(instance_id, project_path, true).await {
+        tracing::warn!(
+            "Installed {project_path} in {instance_id}, but could not sync it: {error}"
+        );
+    }
+}
+
+async fn sync_pack_inner(
+    instance_id: &str,
+    project_path: &str,
+    automatic: bool,
+) -> crate::Result<()> {
+    let state = State::get().await?;
+    let _guard = state.lock_synced_options().await;
+    let global = get_global_options().await?;
+    if automatic {
+        let metadata = crate::state::get_instance(instance_id, &state.pool)
+            .await?
+            .ok_or_else(|| {
+                crate::ErrorKind::InputError("Unknown instance".to_string())
+            })?;
+        let option = ProjectType::get_from_parent_folder(project_path)
+            .and_then(|project_type| pack_option(project_type).ok());
+        if !option.is_some_and(|option| {
+            global.get(option) && instance_option_enabled(&metadata, option)
+        }) {
+            return Ok(());
+        }
+    }
+    let (metadata, item) = source(instance_id, project_path, &state).await?;
+    let candidate = pack_from_item(item.clone(), &metadata, &state).await?;
+    if !candidate
+        .game_versions
+        .contains(&metadata.applied_content_set.game_version)
+    {
+        return Err(crate::ErrorKind::InputError(
+            "This pack version is incompatible with this instance.".to_string(),
+        )
+        .into());
+    }
+    let mut library = read_library(&state).await?;
+    let (id, mut pack) = existing_pack(&library, &candidate)
+        .map(|(id, pack)| (id.clone(), pack.clone()))
+        .unwrap_or_else(|| (Uuid::new_v4().to_string(), candidate));
+    if automatic
+        && library
+            .instances
+            .get(instance_id)
+            .and_then(|placements| placements.get(&id))
+            .is_some_and(|placement| placement.excluded)
+    {
+        return Ok(());
+    }
+    if !participating(&metadata, &pack, global) {
+        return Err(crate::ErrorKind::InputError("Enable pack syncing in app settings and turn off this instance's override first.".to_string()).into());
+    }
+    pack.item.id = id.clone();
+    library.packs.insert(id.clone(), pack);
+    library
+        .instances
+        .entry(instance_id.to_string())
+        .or_default()
+        .insert(
+            id,
+            PackPlacement {
+                path: item.file_path,
+                sha1: item.id,
+                enabled: item.enabled,
+                content_set_id: metadata.applied_content_set.id,
+                ..Default::default()
+            },
+        );
+    apply_all(&mut library, &state).await?;
+    emit_instance(instance_id, InstancePayloadType::Synced).await?;
+    Ok(())
+}
+
+pub async fn list_synced_packs(
+    project_type: ProjectType,
+) -> crate::Result<Vec<ContentItem>> {
+    pack_option(project_type)?;
+    let state = State::get().await?;
+    let _guard = state.lock_synced_options().await;
+    let library = read_library(&state).await?;
+    let global = get_global_options().await?;
+    let instances = crate::state::list_instances(&state.pool).await?;
+    Ok(library
+        .packs
+        .iter()
+        .filter(|(_, pack)| pack.item.project_type == project_type)
+        .map(|(id, pack)| {
+            let mut item = pack.item.clone();
+            item.synced_pack = Some(SyncedPackInfo {
+                id: id.clone(),
+                instance_ids: synced_instance_ids(
+                    id, &library, &instances, global,
+                ),
+                update_pending: library
+                    .instances
+                    .values()
+                    .filter_map(|placements| placements.get(id))
+                    .any(|placement| {
+                        !placement.excluded
+                            && !placement.suspended
+                            && (placement.pending
+                                || placement.error.is_some()
+                                || placement.enabled != pack.item.enabled)
+                    }),
+            });
+            item
+        })
+        .collect())
+}
+
+pub async fn upload_synced_pack(
+    path: &Path,
+    project_type: ProjectType,
+    game_versions: Vec<String>,
+) -> crate::Result<()> {
+    let option = pack_option(project_type)?;
+    if game_versions.is_empty() {
+        return Err(crate::ErrorKind::InputError(
+            "Select the Minecraft versions this pack supports.".to_string(),
+        )
+        .into());
+    }
+    let state = State::get().await?;
+    let _guard = state.lock_synced_options().await;
+    if !get_global_options().await?.get(option) {
+        return Err(crate::ErrorKind::InputError(
+            "Enable pack syncing before adding packs.".to_string(),
+        )
+        .into());
+    }
+    let file_name = path
+        .file_name()
+        .and_then(|name| name.to_str())
+        .filter(|name| path_util::is_safe_file_name(name))
+        .ok_or_else(|| {
+            crate::ErrorKind::InputError("Invalid pack filename.".to_string())
+        })?
+        .to_string();
+    let bytes = Bytes::from(io::read(path).await?);
+    validate_pack(&bytes, project_type)?;
+    let size = bytes.len() as u64;
+    let sha1 = cache_bytes(bytes, &state).await?;
+    let mut library = read_library(&state).await?;
+    if library
+        .packs
+        .values()
+        .any(|pack| pack.sha1 == sha1 && pack.item.project_type == project_type)
+    {
+        return Ok(());
+    }
+    let id = Uuid::new_v4().to_string();
+    library.packs.insert(
+        id.clone(),
+        SyncedPack {
+            sha1,
+            game_versions,
+            item: ContentItem {
+                id,
+                file_name,
+                file_path: String::new(),
+                size,
+                enabled: true,
+                locked: false,
+                project_type,
+                project: None,
+                version: None,
+                environment: None,
+                owner: None,
+                has_update: false,
+                update_version_id: None,
+                date_added: Some(chrono::Utc::now().to_rfc3339()),
+                source_kind: Some(ContentSourceKind::Local),
+                embedded_metadata: None,
+                synced_pack: None,
+            },
+        },
+    );
+    apply_all(&mut library, &state).await
+}
+
+pub async fn set_synced_pack_enabled(
+    pack_id: &str,
+    enabled: bool,
+) -> crate::Result<()> {
+    let state = State::get().await?;
+    let _guard = state.lock_synced_options().await;
+    let mut library = read_library(&state).await?;
+    let pack = library.packs.get_mut(pack_id).ok_or_else(|| {
+        crate::ErrorKind::InputError("Unknown synced pack.".to_string())
+    })?;
+    pack.item.enabled = enabled;
+    apply_all(&mut library, &state).await
+}
+
+pub async fn remove_synced_pack(pack_id: &str) -> crate::Result<()> {
+    let state = State::get().await?;
+    let _guard = state.lock_synced_options().await;
+    let mut library = read_library(&state).await?;
+    if library.packs.remove(pack_id).is_none() {
+        return Err(crate::ErrorKind::InputError(
+            "Unknown synced pack.".to_string(),
+        )
+        .into());
+    }
+    apply_all(&mut library, &state).await
+}
+
+pub async fn desync_pack(
+    instance_id: &str,
+    pack_id: &str,
+    mode: DesyncServerMode,
+) -> crate::Result<()> {
+    let state = State::get().await?;
+    let _guard = state.lock_synced_options().await;
+    let metadata = crate::state::get_instance(instance_id, &state.pool)
+        .await?
+        .ok_or_else(|| {
+            crate::ErrorKind::InputError("Unknown instance".to_string())
+        })?;
+    super::super::projects::ensure_metadata_content_unlocked(&metadata)?;
+    if sync_files_are_protected(&metadata) {
+        return Err(crate::ErrorKind::InputError(
+			"Wait for the instance to finish installing before changing pack syncing.".to_string(),
+		).into());
+    }
+    let mut library = read_library(&state).await?;
+    let placement = library
+        .instances
+        .get_mut(instance_id)
+        .and_then(|items| items.get_mut(pack_id))
+        .ok_or_else(|| {
+            crate::ErrorKind::InputError(
+                "This pack is not synced in this instance.".to_string(),
+            )
+        })?;
+    placement.excluded = true;
+    if mode == DesyncServerMode::RemoveFromOtherInstances {
+        library.packs.remove(pack_id);
+        apply_all(&mut library, &state).await?;
+    } else {
+        write_library(&library, &state).await?;
+    }
+    emit_instance(instance_id, InstancePayloadType::Synced).await?;
+    Ok(())
+}
diff --git a/packages/app-lib/src/api/instance/synced_packs/reconciliation.rs b/packages/app-lib/src/api/instance/synced_packs/reconciliation.rs
new file mode 100644
index 0000000000..899f58c20d
--- /dev/null
+++ b/packages/app-lib/src/api/instance/synced_packs/reconciliation.rs
@@ -0,0 +1,689 @@
+use super::storage::{read_bytes, read_library, write_library};
+use super::{
+    PackLibrary, PackPlacement, SyncedPack, pack_option, pack_path, same_path,
+    version_compatible,
+};
+use crate::event::{InstancePayloadType, emit::emit_instance};
+use crate::state::instances::commands;
+use crate::state::{
+    CacheBehaviour, CachedEntry, ContentItem, ContentSourceKind,
+    InstanceMetadata, ProjectType, State, SyncedOption, SyncedPackInfo,
+};
+use crate::util::fetch;
+
+use super::super::synced_options::{
+    GlobalSyncedOptions, get_global_options, instance_dir, instance_is_running,
+    instance_option_enabled, sync_files_are_protected,
+};
+
+pub(super) fn participating(
+    metadata: &InstanceMetadata,
+    pack: &SyncedPack,
+    global: GlobalSyncedOptions,
+) -> bool {
+    pack_option(pack.item.project_type).is_ok_and(|option| {
+        global.get(option) && instance_option_enabled(metadata, option)
+    })
+}
+
+fn local(item: &ContentItem) -> bool {
+    item.source_kind
+        .is_none_or(|kind| kind == ContentSourceKind::Local)
+}
+
+fn current_item<'a>(
+    items: &'a [ContentItem],
+    pack: &SyncedPack,
+    placement: &PackPlacement,
+) -> Option<&'a ContentItem> {
+    items
+        .iter()
+        .find(|item| {
+            item.project_type == pack.item.project_type
+                && same_path(&item.file_path, &placement.path)
+                && pack.item.project.as_ref().is_none_or(|project| {
+                    item.project
+                        .as_ref()
+                        .is_some_and(|candidate| candidate.id == project.id)
+                })
+        })
+        .or_else(|| {
+            items.iter().find(|item| {
+                item.project_type == pack.item.project_type
+                    && pack.item.project.as_ref().is_some_and(|project| {
+                        item.project
+                            .as_ref()
+                            .is_some_and(|candidate| candidate.id == project.id)
+                    })
+            })
+        })
+}
+
+pub(super) async fn capture(
+    metadata: &InstanceMetadata,
+    library: &mut PackLibrary,
+    state: &State,
+) -> crate::Result<bool> {
+    let Some(placements) =
+        library.instances.get(&metadata.instance.id).cloned()
+    else {
+        return Ok(false);
+    };
+    if sync_files_are_protected(metadata)
+        || instance_is_running(metadata, state).await?
+    {
+        return Ok(false);
+    }
+    let global = get_global_options().await?;
+    let items =
+        commands::list_content(&metadata.instance.id, None, None, state)
+            .await?;
+    let mut shared_changed = false;
+    for (id, mut placement) in placements {
+        let Some(pack) = library.packs.get(&id).cloned() else {
+            continue;
+        };
+        if placement.excluded
+            || placement.suspended
+            || placement.pending
+            || placement.path.is_empty()
+            || placement.content_set_id != metadata.applied_content_set.id
+            || !participating(metadata, &pack, global)
+            || pack.item.enabled != placement.enabled
+        {
+            continue;
+        }
+        if let Some(item) = current_item(&items, &pack, &placement) {
+            if !local(item) {
+                continue;
+            }
+            if item.enabled != placement.enabled {
+                if let Some(pack) = library.packs.get_mut(&id) {
+                    pack.item.enabled = item.enabled;
+                }
+                shared_changed = true;
+            }
+            placement.path = item.file_path.clone();
+            placement.sha1 = item.id.clone();
+            placement.enabled = item.enabled;
+        } else if !instance_dir(metadata, state).join(&placement.path).exists()
+        {
+            placement.excluded = true;
+        }
+        library
+            .instances
+            .entry(metadata.instance.id.clone())
+            .or_default()
+            .insert(id, placement);
+    }
+    Ok(shared_changed)
+}
+
+async fn owns_file(
+    metadata: &InstanceMetadata,
+    placement: &PackPlacement,
+    state: &State,
+) -> crate::Result<bool> {
+    if placement.path.is_empty() {
+        return Ok(false);
+    }
+    let path = instance_dir(metadata, state).join(&placement.path);
+    if !path.exists() {
+        return Ok(false);
+    }
+    let kind = commands::content_source_kind_for_project_path(
+        &metadata.instance.id,
+        &placement.path,
+        state,
+    )
+    .await?;
+    if kind.is_some_and(|kind| kind != ContentSourceKind::Local) {
+        return Ok(false);
+    }
+    let (_, hash) = fetch::sha1_file_async(&path).await?;
+    Ok(hash == placement.sha1)
+}
+
+async fn toggle_pack(
+    metadata: &InstanceMetadata,
+    item: &ContentItem,
+    enabled: bool,
+    state: &State,
+) -> crate::Result<String> {
+    let path = format!(
+        "{}{}",
+        item.file_path.trim_end_matches(".disabled"),
+        if enabled { "" } else { ".disabled" },
+    );
+    if path != item.file_path
+        && instance_dir(metadata, state).join(&path).exists()
+    {
+        return Err(crate::ErrorKind::InputError(
+            "Another pack already uses this file name in the instance."
+                .to_string(),
+        )
+        .into());
+    }
+    commands::toggle_disable_project(
+        &metadata.instance.id,
+        &item.file_path,
+        Some(enabled),
+        state,
+    )
+    .await
+}
+
+async fn apply_pack(
+    metadata: &InstanceMetadata,
+    id: &str,
+    pack: &SyncedPack,
+    library: &mut PackLibrary,
+    state: &State,
+) -> crate::Result<()> {
+    let instance_id = &metadata.instance.id;
+    let previous = library
+        .instances
+        .get(instance_id)
+        .and_then(|items| items.get(id))
+        .cloned();
+    if previous
+        .as_ref()
+        .is_some_and(|placement| placement.excluded)
+    {
+        return Ok(());
+    }
+    let items = commands::list_content(instance_id, None, None, state).await?;
+    let matching = previous
+        .as_ref()
+        .filter(|placement| !placement.path.is_empty())
+        .and_then(|placement| current_item(&items, pack, placement))
+        .or_else(|| {
+            items.iter().find(|item| {
+                local(item)
+                    && item.id == pack.sha1
+                    && item.project_type == pack.item.project_type
+            })
+        });
+    if matching.is_some_and(|item| !local(item)) {
+        return Err(crate::ErrorKind::InputError(
+            "This pack is managed in this instance.".to_string(),
+        )
+        .into());
+    }
+    if let Some(item) = matching {
+        let compatible = if pack.item.project.is_some() {
+            if let Some(version) = &item.version {
+                CachedEntry::get_version(
+                    &version.id,
+                    None,
+                    &state.pool,
+                    &state.api_semaphore,
+                )
+                .await?
+                .is_some_and(|version| {
+                    version_compatible(pack, &version, metadata)
+                })
+            } else {
+                false
+            }
+        } else {
+            pack.game_versions
+                .contains(&metadata.applied_content_set.game_version)
+        };
+        if compatible || item.locked {
+            let changed = item.enabled != pack.item.enabled;
+            let joined = previous
+                .as_ref()
+                .is_none_or(|placement| placement.suspended);
+            let path = if changed {
+                toggle_pack(metadata, item, pack.item.enabled, state).await?
+            } else {
+                item.file_path.clone()
+            };
+            library
+                .instances
+                .entry(instance_id.clone())
+                .or_default()
+                .insert(
+                    id.to_string(),
+                    PackPlacement {
+                        path,
+                        sha1: item.id.clone(),
+                        enabled: pack.item.enabled,
+                        pending: !compatible,
+                        content_set_id: metadata.applied_content_set.id.clone(),
+                        ..Default::default()
+                    },
+                );
+            if changed || joined {
+                emit_instance(instance_id, InstancePayloadType::Synced).await?;
+            }
+            return Ok(());
+        }
+    }
+    let version = if let Some(project) = &pack.item.project {
+        CachedEntry::get_project_versions(
+            &project.id,
+            Some(CacheBehaviour::MustRevalidate),
+            &state.pool,
+            &state.api_semaphore,
+        )
+        .await?
+        .unwrap_or_default()
+        .into_iter()
+        .filter(|version| {
+            version_compatible(pack, version, metadata)
+                && !version.files.is_empty()
+        })
+        .max_by_key(|version| version.date_published)
+    } else {
+        None
+    };
+    let compatible = if pack.item.project.is_some() {
+        version.is_some()
+    } else {
+        pack.game_versions
+            .contains(&metadata.applied_content_set.game_version)
+    };
+    if !compatible {
+        if let Some(previous) = &previous
+            && owns_file(metadata, previous, state).await?
+        {
+            commands::remove_project(instance_id, &previous.path, state)
+                .await?;
+            emit_instance(instance_id, InstancePayloadType::Synced).await?;
+        }
+        library
+            .instances
+            .entry(instance_id.clone())
+            .or_default()
+            .insert(
+                id.to_string(),
+                PackPlacement {
+                    enabled: pack.item.enabled,
+                    content_set_id: metadata.applied_content_set.id.clone(),
+                    ..Default::default()
+                },
+            );
+        return Ok(());
+    }
+    let file = version.as_ref().and_then(|version| {
+        version
+            .files
+            .iter()
+            .find(|file| file.primary)
+            .or_else(|| version.files.first())
+    });
+    let file_name = file
+        .map_or(pack.item.file_name.as_str(), |file| file.filename.as_str());
+    if !path_util::is_safe_file_name(file_name) {
+        return Err(crate::ErrorKind::InputError(
+            "Invalid pack filename.".to_string(),
+        )
+        .into());
+    }
+    let target_path = pack_path(pack, file_name);
+    if previous
+        .as_ref()
+        .is_none_or(|placement| placement.path.is_empty())
+        && items.iter().any(|item| {
+            same_path(&item.file_path, &target_path)
+                || pack.item.project.as_ref().is_some_and(|project| {
+                    item.project
+                        .as_ref()
+                        .is_some_and(|candidate| candidate.id == project.id)
+                })
+        })
+    {
+        return Err(crate::ErrorKind::InputError(
+			"A local copy of this pack already exists. Sync it from the content tab to include it.".to_string(),
+		).into());
+    }
+    let target_base = target_path.trim_end_matches(".disabled");
+    for path in [target_base.to_string(), format!("{target_base}.disabled")] {
+        if instance_dir(metadata, state).join(&path).exists() {
+            let owned = if let Some(previous) = &previous {
+                previous.path == path
+                    && owns_file(metadata, previous, state).await?
+            } else {
+                false
+            };
+            if !owned {
+                return Err(crate::ErrorKind::InputError(
+                    "An existing pack would be replaced.".to_string(),
+                )
+                .into());
+            }
+        }
+    }
+    let bytes = if let Some(file) = file {
+        fetch::fetch(
+            &file.url,
+            file.hashes.get("sha1").map(String::as_str),
+            None,
+            None,
+            &state.fetch_semaphore,
+            &state.pool,
+        )
+        .await?
+    } else {
+        read_bytes(pack, state).await?
+    };
+    super::operations::validate_pack(&bytes, pack.item.project_type)?;
+    let sha1 = fetch::sha1_async(bytes.clone()).await?;
+    let mut pending = previous.clone().unwrap_or_default();
+    pending.pending = true;
+    library
+        .instances
+        .entry(instance_id.clone())
+        .or_default()
+        .insert(id.to_string(), pending);
+    write_library(library, state).await?;
+    if let (Some(project), Some(version)) = (&pack.item.project, &version) {
+        let plan = commands::resolve_install_plan(
+            instance_id,
+            commands::InstanceInstallProjectRequest {
+                project_id: project.id.clone(),
+                version_id: Some(version.id.clone()),
+                content_type: pack.item.project_type.into(),
+                selected: Default::default(),
+            },
+            state,
+        )
+        .await?;
+        for dependency in &plan.dependencies {
+            commands::add_project_from_version(
+                instance_id,
+                &dependency.version_id,
+                fetch::DownloadReason::Dependency,
+                dependency.dependent_on_version_id.clone(),
+                ContentSourceKind::Local,
+                state,
+            )
+            .await?;
+        }
+    }
+    let file_name = if pack.item.enabled {
+        file_name.to_string()
+    } else {
+        format!("{file_name}.disabled")
+    };
+    let path = commands::add_project_bytes(
+        instance_id,
+        &file_name,
+        bytes,
+        Some(&sha1),
+        Some(pack.item.project_type),
+        ContentSourceKind::Local,
+        pack.item
+            .project
+            .as_ref()
+            .map(|project| project.id.as_str()),
+        version.as_ref().map(|version| version.id.as_str()),
+        state,
+    )
+    .await?;
+    if let Some(previous) = previous
+        && previous.path != path
+        && owns_file(metadata, &previous, state).await?
+    {
+        commands::remove_project(instance_id, &previous.path, state).await?;
+    }
+    library
+        .instances
+        .entry(instance_id.clone())
+        .or_default()
+        .insert(
+            id.to_string(),
+            PackPlacement {
+                path,
+                sha1,
+                enabled: pack.item.enabled,
+                content_set_id: metadata.applied_content_set.id.clone(),
+                ..Default::default()
+            },
+        );
+    emit_instance(instance_id, InstancePayloadType::Synced).await?;
+    Ok(())
+}
+
+pub(super) async fn apply_instance(
+    metadata: &InstanceMetadata,
+    library: &mut PackLibrary,
+    state: &State,
+) -> crate::Result<()> {
+    if sync_files_are_protected(metadata)
+        || instance_is_running(metadata, state).await?
+        || super::super::projects::ensure_metadata_content_unlocked(metadata)
+            .is_err()
+    {
+        return Ok(());
+    }
+    let global = get_global_options().await?;
+    let packs = library.packs.clone();
+    for (id, pack) in &packs {
+        if !participating(metadata, pack, global) {
+            continue;
+        }
+        if let Err(error) = apply_pack(metadata, id, pack, library, state).await
+        {
+            tracing::warn!(
+                "Could not sync pack {id} to {}: {error}",
+                metadata.instance.id
+            );
+            let placement = library
+                .instances
+                .entry(metadata.instance.id.clone())
+                .or_default()
+                .entry(id.clone())
+                .or_default();
+            placement.error = Some(error.to_string());
+        }
+    }
+    let placements = library
+        .instances
+        .get(&metadata.instance.id)
+        .cloned()
+        .unwrap_or_default();
+    for (id, placement) in placements {
+        if packs.contains_key(&id) {
+            continue;
+        }
+        let included = ProjectType::get_from_parent_folder(&placement.path)
+            .and_then(|project_type| pack_option(project_type).ok())
+            .is_some_and(|option| {
+                global.get(option) && instance_option_enabled(metadata, option)
+            });
+        if included
+            && !placement.excluded
+            && !placement.suspended
+            && owns_file(metadata, &placement, state).await?
+        {
+            commands::remove_project(
+                &metadata.instance.id,
+                &placement.path,
+                state,
+            )
+            .await?;
+            emit_instance(&metadata.instance.id, InstancePayloadType::Synced)
+                .await?;
+        }
+        if let Some(placements) =
+            library.instances.get_mut(&metadata.instance.id)
+        {
+            placements.remove(&id);
+        }
+    }
+    Ok(())
+}
+
+pub(super) async fn apply_all(
+    library: &mut PackLibrary,
+    state: &State,
+) -> crate::Result<()> {
+    let instances = crate::state::list_instances(&state.pool).await?;
+    library.instances.retain(|id, _| {
+        instances.iter().any(|metadata| &metadata.instance.id == id)
+    });
+    write_library(library, state).await?;
+    for metadata in instances {
+        if let Err(error) = apply_instance(&metadata, library, state).await {
+            tracing::warn!(
+                "Could not reconcile synced packs for {}: {error}",
+                metadata.instance.id
+            );
+        }
+    }
+    write_library(library, state).await
+}
+
+pub(in crate::api::instance) async fn reconcile(
+    metadata: &InstanceMetadata,
+    _option: SyncedOption,
+    state: &State,
+) -> crate::Result<()> {
+    let mut library = read_library(state).await?;
+    if library.packs.is_empty() && library.instances.is_empty() {
+        return Ok(());
+    }
+    let metadata =
+        crate::state::get_instance(&metadata.instance.id, &state.pool)
+            .await?
+            .ok_or_else(|| {
+                crate::ErrorKind::InputError("Unknown instance".to_string())
+            })?;
+    if capture(&metadata, &mut library, state).await? {
+        apply_all(&mut library, state).await
+    } else {
+        apply_instance(&metadata, &mut library, state).await?;
+        write_library(&library, state).await
+    }
+}
+
+pub(crate) async fn reconcile_after_change(
+    instance_id: &str,
+) -> crate::Result<()> {
+    let state = State::get().await?;
+    let _guard = state.lock_synced_options().await;
+    let metadata = crate::state::get_instance(instance_id, &state.pool)
+        .await?
+        .ok_or_else(|| {
+            crate::ErrorKind::InputError("Unknown instance".to_string())
+        })?;
+    reconcile(&metadata, SyncedOption::ResourcePacks, &state).await
+}
+
+pub(in crate::api::instance) async fn reconcile_after_content_change(
+    instance_id: &str,
+) {
+    if let Err(error) = reconcile_after_change(instance_id).await {
+        tracing::warn!(
+            "Content changed in {instance_id}, but synced packs could not be reconciled: {error}"
+        );
+    }
+}
+
+pub(in crate::api::instance) async fn detach(
+    metadata: &InstanceMetadata,
+    option: SyncedOption,
+    state: &State,
+) -> crate::Result<()> {
+    let mut library = read_library(state).await?;
+    let mut changed = false;
+    if let Some(placements) = library.instances.get_mut(&metadata.instance.id) {
+        for (id, placement) in placements {
+            if library.packs.get(id).is_some_and(|pack| {
+                pack_option(pack.item.project_type).ok() == Some(option)
+            }) && !placement.suspended
+            {
+                placement.suspended = true;
+                changed = true;
+            }
+        }
+    }
+    if changed {
+        write_library(&library, state).await?;
+    }
+    Ok(())
+}
+
+pub(in crate::api::instance) async fn decorate_content(
+    instance_id: &str,
+    items: &mut [ContentItem],
+    state: &State,
+) -> crate::Result<()> {
+    let library = read_library(state).await?;
+    let Some(placements) = library.instances.get(instance_id) else {
+        return Ok(());
+    };
+    let metadata = crate::state::get_instance(instance_id, &state.pool)
+        .await?
+        .ok_or_else(|| {
+            crate::ErrorKind::InputError("Unknown instance".to_string())
+        })?;
+    let global = get_global_options().await?;
+    let instances = crate::state::list_instances(&state.pool).await?;
+    for item in items {
+        if !local(item) {
+            continue;
+        }
+        for (id, placement) in placements {
+            let Some(pack) = library.packs.get(id) else {
+                continue;
+            };
+            if !placement.excluded
+                && !placement.suspended
+                && same_path(&placement.path, &item.file_path)
+                && item.project_type == pack.item.project_type
+                && pack.item.project.as_ref().map_or_else(
+                    || item.id == placement.sha1,
+                    |project| {
+                        item.project
+                            .as_ref()
+                            .is_some_and(|candidate| candidate.id == project.id)
+                    },
+                )
+                && participating(&metadata, pack, global)
+            {
+                item.synced_pack = Some(SyncedPackInfo {
+                    id: id.clone(),
+                    instance_ids: synced_instance_ids(
+                        id, &library, &instances, global,
+                    ),
+                    update_pending: placement.pending
+                        || item.enabled != pack.item.enabled
+                        || placement.error.is_some(),
+                });
+                break;
+            }
+        }
+    }
+    Ok(())
+}
+
+pub(super) fn synced_instance_ids(
+    id: &str,
+    library: &PackLibrary,
+    instances: &[InstanceMetadata],
+    global: GlobalSyncedOptions,
+) -> Vec<String> {
+    let Some(pack) = library.packs.get(id) else {
+        return Vec::new();
+    };
+    instances
+        .iter()
+        .filter(|metadata| {
+            participating(metadata, pack, global)
+                && library
+                    .instances
+                    .get(&metadata.instance.id)
+                    .and_then(|items| items.get(id))
+                    .is_some_and(|placement| {
+                        !placement.excluded
+                            && !placement.suspended
+                            && !placement.path.is_empty()
+                    })
+        })
+        .map(|metadata| metadata.instance.id.clone())
+        .collect()
+}
diff --git a/packages/app-lib/src/api/instance/synced_packs/storage.rs b/packages/app-lib/src/api/instance/synced_packs/storage.rs
new file mode 100644
index 0000000000..2403ac6372
--- /dev/null
+++ b/packages/app-lib/src/api/instance/synced_packs/storage.rs
@@ -0,0 +1,70 @@
+use super::{PackLibrary, SyncedPack};
+use crate::state::State;
+use crate::util::{fetch, io};
+use bytes::Bytes;
+use std::path::PathBuf;
+
+fn directory(state: &State) -> PathBuf {
+    state.directories.synced_options_dir().join("packs")
+}
+
+pub(super) async fn read_library(state: &State) -> crate::Result<PackLibrary> {
+    match io::read(directory(state).join("packs.json")).await {
+        Ok(bytes) => Ok(serde_json::from_slice(&bytes)?),
+        Err(error) if error.kind() == std::io::ErrorKind::NotFound => {
+            Ok(PackLibrary::default())
+        }
+        Err(error) => Err(error.into()),
+    }
+}
+
+pub(super) async fn write_library(
+    library: &PackLibrary,
+    state: &State,
+) -> crate::Result<()> {
+    io::create_dir_all(directory(state)).await?;
+    io::write(
+        directory(state).join("packs.json"),
+        serde_json::to_vec(library)?,
+    )
+    .await?;
+    Ok(())
+}
+
+pub(super) async fn cache_bytes(
+    bytes: Bytes,
+    state: &State,
+) -> crate::Result<String> {
+    let sha1 = fetch::sha1_async(bytes.clone()).await?;
+    let folder = directory(state).join("files");
+    io::create_dir_all(&folder).await?;
+    let path = folder.join(&sha1);
+    if !path.exists() {
+        io::write(path, &bytes).await?;
+    }
+    Ok(sha1)
+}
+
+pub(super) async fn read_bytes(
+    pack: &SyncedPack,
+    state: &State,
+) -> crate::Result<Bytes> {
+    if pack.sha1.len() != 40
+        || !pack.sha1.bytes().all(|byte| byte.is_ascii_hexdigit())
+    {
+        return Err(crate::ErrorKind::InputError(
+            "Invalid synced pack hash.".to_string(),
+        )
+        .into());
+    }
+    let bytes = Bytes::from(
+        io::read(directory(state).join("files").join(&pack.sha1)).await?,
+    );
+    if fetch::sha1_async(bytes.clone()).await? != pack.sha1 {
+        return Err(crate::ErrorKind::InputError(
+            "The synced pack file is damaged.".to_string(),
+        )
+        .into());
+    }
+    Ok(bytes)
+}
diff --git a/packages/app-lib/src/launcher/mod.rs b/packages/app-lib/src/launcher/mod.rs
index 060cfefec8..34d4b504cf 100644
--- a/packages/app-lib/src/launcher/mod.rs
+++ b/packages/app-lib/src/launcher/mod.rs
@@ -1076,6 +1076,15 @@ pub async fn launch_minecraft(
 
     command.envs(env_args.iter().cloned());
 
+    if let Err(error) =
+        crate::api::instance::reconcile_synced_packs(&instance.id).await
+    {
+        tracing::warn!(
+            "Failed to reconcile synced packs before launching {}: {error}",
+            instance.id
+        );
+    }
+
     if let Err(error) =
         crate::api::instance::sync_game_options_before_launch(&instance.id)
             .await
diff --git a/packages/app-lib/src/state/instances/adapters/sqlite/instance_rows.rs b/packages/app-lib/src/state/instances/adapters/sqlite/instance_rows.rs
index a311c83034..3ed9234348 100644
--- a/packages/app-lib/src/state/instances/adapters/sqlite/instance_rows.rs
+++ b/packages/app-lib/src/state/instances/adapters/sqlite/instance_rows.rs
@@ -533,6 +533,8 @@ pub(crate) async fn get_instance_sync_preferences(
         multiplayer_servers: enabled_features.contains("multiplayer_servers"),
         creative_hotbars: enabled_features.contains("creative_hotbars"),
         screenshots: enabled_features.contains("screenshots"),
+        resource_packs: enabled_features.contains("resource_packs"),
+        data_packs: enabled_features.contains("data_packs"),
     })
 }
 
@@ -567,6 +569,8 @@ async fn attach_sync_preferences(
                     record.synced_options.creative_hotbars = true
                 }
                 "screenshots" => record.synced_options.screenshots = true,
+                "resource_packs" => record.synced_options.resource_packs = true,
+                "data_packs" => record.synced_options.data_packs = true,
                 _ => {}
             }
         }
diff --git a/packages/app-lib/src/state/instances/commands/apply_content_install.rs b/packages/app-lib/src/state/instances/commands/apply_content_install.rs
index b2b9c5b640..5a1c8f7c73 100644
--- a/packages/app-lib/src/state/instances/commands/apply_content_install.rs
+++ b/packages/app-lib/src/state/instances/commands/apply_content_install.rs
@@ -203,25 +203,29 @@ pub(crate) async fn install_resolved_content_plan(
     instance_id: &str,
     plan: &ResolveContentPlan,
     state: &State,
-) -> crate::Result<()> {
-    add_resolved_content(
-        instance_id,
-        &plan.primary,
-        DownloadReason::Standalone,
-        state,
-    )
-    .await?;
-    for dependency in &plan.dependencies {
+) -> crate::Result<Vec<String>> {
+    let mut paths = vec![
         add_resolved_content(
             instance_id,
-            dependency,
-            DownloadReason::Dependency,
+            &plan.primary,
+            DownloadReason::Standalone,
             state,
         )
-        .await?;
+        .await?,
+    ];
+    for dependency in &plan.dependencies {
+        paths.push(
+            add_resolved_content(
+                instance_id,
+                dependency,
+                DownloadReason::Dependency,
+                state,
+            )
+            .await?,
+        );
     }
 
-    Ok(())
+    Ok(paths)
 }
 
 pub(crate) async fn switch_project_version_with_dependencies(
diff --git a/packages/app-lib/src/state/instances/commands/list_content.rs b/packages/app-lib/src/state/instances/commands/list_content.rs
index 67b7b6966d..b543e03841 100644
--- a/packages/app-lib/src/state/instances/commands/list_content.rs
+++ b/packages/app-lib/src/state/instances/commands/list_content.rs
@@ -506,6 +506,7 @@ pub(crate) async fn dependencies_to_content_items(
                 project_type_from_api_name(&project.project_type);
 
             Some(ContentItem {
+                synced_pack: None,
                 file_name: version
                     .and_then(|version| version.files.first())
                     .map(|file| file.filename.clone())
@@ -908,6 +909,7 @@ async fn content_files_to_content_items(
             });
 
             ContentItem {
+                synced_pack: None,
                 file_name: file.file_name.clone(),
                 file_path: path.clone(),
                 id: file.hash.clone(),
diff --git a/packages/app-lib/src/state/instances/content.rs b/packages/app-lib/src/state/instances/content.rs
index 0a2ba95dc2..62d6c25836 100644
--- a/packages/app-lib/src/state/instances/content.rs
+++ b/packages/app-lib/src/state/instances/content.rs
@@ -22,6 +22,15 @@ pub struct ContentItem {
     pub date_added: Option<String>,
     pub source_kind: Option<ContentSourceKind>,
     pub embedded_metadata: Option<EmbeddedContentMetadata>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub synced_pack: Option<SyncedPackInfo>,
+}
+
+#[derive(Debug, Serialize, Deserialize, Clone)]
+pub struct SyncedPackInfo {
+    pub id: String,
+    pub instance_ids: Vec<String>,
+    pub update_pending: bool,
 }
 
 #[derive(Debug, Serialize, Deserialize, Clone, Default)]
diff --git a/packages/app-lib/src/state/instances/model/instance.rs b/packages/app-lib/src/state/instances/model/instance.rs
index 81e836a942..be168c8499 100644
--- a/packages/app-lib/src/state/instances/model/instance.rs
+++ b/packages/app-lib/src/state/instances/model/instance.rs
@@ -33,6 +33,10 @@ pub struct InstanceSyncedOptions {
     pub multiplayer_servers: bool,
     pub creative_hotbars: bool,
     pub screenshots: bool,
+    #[serde(default)]
+    pub resource_packs: bool,
+    #[serde(default)]
+    pub data_packs: bool,
 }
 
 #[derive(Clone, Copy, Debug, Eq, PartialEq, Serialize, Deserialize)]
@@ -43,6 +47,8 @@ pub enum SyncedOption {
     MultiplayerServers,
     CreativeHotbars,
     Screenshots,
+    ResourcePacks,
+    DataPacks,
 }
 
 impl SyncedOption {
@@ -53,15 +59,19 @@ impl SyncedOption {
             Self::MultiplayerServers => "multiplayer_servers",
             Self::CreativeHotbars => "creative_hotbars",
             Self::Screenshots => "screenshots",
+            Self::ResourcePacks => "resource_packs",
+            Self::DataPacks => "data_packs",
         }
     }
 
-    pub const ALL: [Self; 5] = [
+    pub const ALL: [Self; 7] = [
         Self::GameOptions,
         Self::CommandHistory,
         Self::MultiplayerServers,
         Self::CreativeHotbars,
         Self::Screenshots,
+        Self::ResourcePacks,
+        Self::DataPacks,
     ];
 }
 
diff --git a/packages/app-lib/src/state/instances/watcher.rs b/packages/app-lib/src/state/instances/watcher.rs
index 3053d18add..578d7aa605 100644
--- a/packages/app-lib/src/state/instances/watcher.rs
+++ b/packages/app-lib/src/state/instances/watcher.rs
@@ -208,6 +208,11 @@ pub async fn init_watcher() -> crate::Result<FileWatcher> {
                                                 "Failed to sync instance content after filesystem change: {error}"
                                             );
 										}
+                                        if sync_content
+											&& let Err(error) = crate::api::instance::reconcile_synced_packs(&emit_instance_id).await
+										{
+											tracing::error!("Failed to reconcile synced packs after filesystem change: {error}");
+										}
                                         if reconcile_screenshots
                                             && let Err(error) =
                                                 crate::api::instance::reconcile_screenshots(
diff --git a/packages/app-lib/src/state/process.rs b/packages/app-lib/src/state/process.rs
index b9d7465b89..c12f0b2d38 100644
--- a/packages/app-lib/src/state/process.rs
+++ b/packages/app-lib/src/state/process.rs
@@ -929,6 +929,18 @@ impl Process {
 
         state.process_manager.remove(uuid);
         clear_persisted_process(&state, persisted_process).await;
+        let synced_pack_instance_id = instance_id.clone();
+        tokio::spawn(async move {
+            if let Err(error) = crate::api::instance::reconcile_synced_packs(
+                &synced_pack_instance_id,
+            )
+            .await
+            {
+                tracing::warn!(
+                    "Failed to reconcile synced packs after closing {synced_pack_instance_id}: {error}"
+                );
+            }
+        });
         emit_process(
             &instance_id,
             uuid,
diff --git a/packages/ui/src/layouts/shared/content-tab/components/ContentCardItem.vue b/packages/ui/src/layouts/shared/content-tab/components/ContentCardItem.vue
index e707dc318c..3149c63a46 100644
--- a/packages/ui/src/layouts/shared/content-tab/components/ContentCardItem.vue
+++ b/packages/ui/src/layouts/shared/content-tab/components/ContentCardItem.vue
@@ -2,6 +2,7 @@
 import {
 	ArrowLeftRightIcon,
 	DownloadIcon,
+	LinkIcon,
 	LockIcon,
 	MoreVerticalIcon,
 	SpinnerIcon,
@@ -49,12 +50,22 @@ const messages = defineMessages({
 		id: 'content.card.frozen',
 		defaultMessage: 'This project is locked to its current version until unfrozen.',
 	},
+	synced: {
+		id: 'content.card.synced',
+		defaultMessage: 'Synced across instances',
+	},
+	syncUpdatePending: {
+		id: 'content.card.sync-update-pending',
+		defaultMessage:
+			'Some synced copies are waiting for changes. An instance may be running, have a frozen or incompatible version, or already contain its own copy.',
+	},
 })
 
 interface Props {
 	project: ContentCardProject
 	projectLink?: string | RouteLocationRaw
 	version?: ContentCardVersion
+	showVersion?: boolean
 	versionLink?: string | RouteLocationRaw
 	owner?: ContentOwner
 	source?: ContentSource
@@ -66,6 +77,8 @@ interface Props {
 	hasUpdate?: boolean
 	isClientOnly?: boolean
 	clientWarning?: ClientWarningType | null
+	synced?: boolean
+	syncUpdatePending?: boolean
 	hideSwitchVersion?: boolean
 	overflowOptions?: ButtonMenuOption[]
 	disabled?: boolean
@@ -82,6 +95,7 @@ interface Props {
 const props = withDefaults(defineProps<Props>(), {
 	projectLink: undefined,
 	version: undefined,
+	showVersion: true,
 	versionLink: undefined,
 	owner: undefined,
 	source: undefined,
@@ -93,6 +107,8 @@ const props = withDefaults(defineProps<Props>(), {
 	hasUpdate: false,
 	isClientOnly: false,
 	clientWarning: null,
+	synced: false,
+	syncUpdatePending: false,
 	hideSwitchVersion: false,
 	overflowOptions: undefined,
 	disabled: false,
@@ -163,7 +179,9 @@ const installTooltip = computed(() => {
 		<div
 			class="flex min-w-0 items-center gap-4"
 			:class="
-				hideActions ? 'flex-1' : 'flex-1 @[800px]:w-[45%] @[800px]:shrink-0 @[800px]:flex-none'
+				hideActions || !showVersion
+					? 'flex-1'
+					: 'flex-1 @[800px]:w-[45%] @[800px]:shrink-0 @[800px]:flex-none'
 			"
 		>
 			<Checkbox
@@ -215,6 +233,22 @@ const installTooltip = computed(() => {
 							{{ project.title }}
 						</AutoLink>
 						<slot name="title-badges" />
+						<span
+							v-if="synced"
+							v-tooltip="
+								formatMessage(syncUpdatePending ? messages.syncUpdatePending : messages.synced)
+							"
+							:aria-label="
+								formatMessage(syncUpdatePending ? messages.syncUpdatePending : messages.synced)
+							"
+							class="inline-flex size-5 shrink-0 cursor-help items-center justify-center"
+							tabindex="0"
+						>
+							<LinkIcon
+								class="size-4"
+								:class="syncUpdatePending ? 'text-orange' : 'text-secondary'"
+							/>
+						</span>
 						<span
 							v-if="isClientOnly"
 							v-tooltip="formatMessage(clientWarningMessage)"
@@ -275,7 +309,7 @@ const installTooltip = computed(() => {
 							<UploadIcon class="size-4 shrink-0" />
 							<span class="text-sm leading-5">{{ formatMessage(messages.uploaded) }}</span>
 						</span>
-						<template v-if="version && !external">
+						<template v-if="showVersion && version && !external">
 							<BulletDivider class="shrink-0 @[800px]:hidden" />
 							<AutoLink
 								:target="
@@ -296,6 +330,7 @@ const installTooltip = computed(() => {
 		</div>
 
 		<div
+			v-if="showVersion"
 			class="hidden flex-col gap-0.5 transition-[filter,opacity] duration-200 @[800px]:flex"
 			:class="[
 				hideActions ? 'flex-1' : 'flex-1 min-w-0',
diff --git a/packages/ui/src/layouts/shared/content-tab/components/ContentCardTable.vue b/packages/ui/src/layouts/shared/content-tab/components/ContentCardTable.vue
index a9e32f1d8d..c305767986 100644
--- a/packages/ui/src/layouts/shared/content-tab/components/ContentCardTable.vue
+++ b/packages/ui/src/layouts/shared/content-tab/components/ContentCardTable.vue
@@ -28,6 +28,7 @@ interface Props {
 	hideHeader?: boolean
 	flat?: boolean
 	showItemActions?: boolean
+	showVersion?: boolean
 }
 
 const props = withDefaults(defineProps<Props>(), {
@@ -40,6 +41,7 @@ const props = withDefaults(defineProps<Props>(), {
 	hideHeader: false,
 	flat: false,
 	showItemActions: false,
+	showVersion: true,
 })
 
 const stickyHeaderRef = ref<HTMLElement | null>(null)
@@ -191,7 +193,9 @@ function handleSort(column: ContentCardTableSortColumn) {
 				role="row"
 				class="flex min-w-0 items-center gap-4"
 				:class="
-					hasAnyActions ? 'flex-1 @[800px]:w-[45%] @[800px]:shrink-0 @[800px]:flex-none' : 'flex-1'
+					hasAnyActions && showVersion
+						? 'flex-1 @[800px]:w-[45%] @[800px]:shrink-0 @[800px]:flex-none'
+						: 'flex-1'
 				"
 			>
 				<Checkbox
@@ -225,7 +229,11 @@ function handleSort(column: ContentCardTableSortColumn) {
 				}}</span>
 			</div>
 
-			<div class="hidden @[800px]:flex" :class="hasAnyActions ? 'flex-1 min-w-0' : 'flex-1'">
+			<div
+				v-if="showVersion"
+				class="hidden @[800px]:flex"
+				:class="hasAnyActions ? 'flex-1 min-w-0' : 'flex-1'"
+			>
 				<button
 					v-if="sortable"
 					role="columnheader"
@@ -270,6 +278,7 @@ function handleSort(column: ContentCardTableSortColumn) {
 					:project="item.project"
 					:project-link="item.projectLink"
 					:version="item.version"
+					:show-version="showVersion"
 					:version-link="item.versionLink"
 					:owner="item.owner"
 					:source="item.source"
@@ -281,6 +290,8 @@ function handleSort(column: ContentCardTableSortColumn) {
 					:has-update="item.hasUpdate"
 					:is-client-only="item.isClientOnly"
 					:client-warning="item.clientWarning"
+					:synced="item.synced"
+					:sync-update-pending="item.syncUpdatePending"
 					:hide-switch-version="item.hideSwitchVersion"
 					:overflow-options="item.overflowOptions"
 					:disabled="item.disabled"
@@ -338,6 +349,7 @@ function handleSort(column: ContentCardTableSortColumn) {
 				:project="item.project"
 				:project-link="item.projectLink"
 				:version="item.version"
+				:show-version="showVersion"
 				:version-link="item.versionLink"
 				:owner="item.owner"
 				:source="item.source"
@@ -349,6 +361,8 @@ function handleSort(column: ContentCardTableSortColumn) {
 				:has-update="item.hasUpdate"
 				:is-client-only="item.isClientOnly"
 				:client-warning="item.clientWarning"
+				:synced="item.synced"
+				:sync-update-pending="item.syncUpdatePending"
 				:hide-switch-version="item.hideSwitchVersion"
 				:overflow-options="item.overflowOptions"
 				:disabled="item.disabled"
diff --git a/packages/ui/src/layouts/shared/content-tab/components/managed-content-modal/index.vue b/packages/ui/src/layouts/shared/content-tab/components/managed-content-modal/index.vue
index 47562c1eda..40a2c05346 100644
--- a/packages/ui/src/layouts/shared/content-tab/components/managed-content-modal/index.vue
+++ b/packages/ui/src/layouts/shared/content-tab/components/managed-content-modal/index.vue
@@ -38,6 +38,8 @@ const { formatMessage } = useVIntl()
 const pageContext = injectPageContext(null)
 
 interface Props {
+	description?: string
+	emptyDescription?: string
 	header?: string
 	sourceName?: string
 	sourceIconUrl?: string
@@ -46,11 +48,15 @@ interface Props {
 	actionDisabledTooltip?: string | null
 	getOverflowOptions?: (item: ContentItem) => ButtonMenuOption[]
 	switchVersion?: (item: ContentItem) => void
+	showVersion?: boolean
 	showEnvironmentWarnings?: boolean
+	filterMode?: 'content' | 'status'
 }
 
 const props = withDefaults(defineProps<Props>(), {
 	header: undefined,
+	description: undefined,
+	emptyDescription: undefined,
 	sourceName: undefined,
 	sourceIconUrl: undefined,
 	enableToggle: false,
@@ -58,7 +64,9 @@ const props = withDefaults(defineProps<Props>(), {
 	actionDisabledTooltip: undefined,
 	getOverflowOptions: undefined,
 	switchVersion: undefined,
+	showVersion: true,
 	showEnvironmentWarnings: false,
+	filterMode: 'content',
 })
 
 const emit = defineEmits<{
@@ -109,6 +117,18 @@ const messages = defineMessages({
 		id: 'instances.managed-content-modal.download-file',
 		defaultMessage: 'Download File',
 	},
+	warnings: {
+		id: 'instances.managed-content-modal.warnings',
+		defaultMessage: 'Warnings',
+	},
+	enabled: {
+		id: 'instances.managed-content-modal.enabled',
+		defaultMessage: 'Enabled',
+	},
+	disabled: {
+		id: 'instances.managed-content-modal.disabled',
+		defaultMessage: 'Disabled',
+	},
 })
 
 export interface ManagedContentModalState {
@@ -128,6 +148,10 @@ const searchQuery = ref('')
 const selectedFilters = ref<string[]>([])
 const selectedIds = ref<string[]>([])
 
+function updateFilters(filters: string[]) {
+	selectedFilters.value = props.filterMode === 'status' ? filters.slice(-1) : filters
+}
+
 const selectedItems = computed(() =>
 	items.value.filter((item) => selectedIds.value.includes(item.id)),
 )
@@ -161,6 +185,13 @@ const fuse = new Fuse<ContentItem>([], {
 watchSyncEffect(() => fuse.setCollection(items.value))
 
 const filterOptions = computed(() => {
+	if (props.filterMode === 'status') {
+		return [
+			{ id: 'enabled', label: formatMessage(messages.enabled) },
+			{ id: 'disabled', label: formatMessage(messages.disabled) },
+		]
+	}
+
 	const frequency = items.value.reduce(
 		(map, item) => {
 			const normalized = normalizeProjectType(item.project_type)
@@ -184,11 +215,11 @@ const filterOptions = computed(() => {
 	if (
 		items.value.some((item) => getClientWarningType(item, props.showEnvironmentWarnings) !== null)
 	) {
-		options.push({ id: 'warnings', label: 'Warnings' })
+		options.push({ id: 'warnings', label: formatMessage(messages.warnings) })
 	}
 
 	if (props.enableToggle && items.value.some((item) => item.enabled === false)) {
-		options.push({ id: 'disabled', label: 'Disabled' })
+		options.push({ id: 'disabled', label: formatMessage(messages.disabled) })
 	}
 
 	return options
@@ -203,22 +234,23 @@ const stats = computed(() => {
 	return counts
 })
 
-const attributeFilterIds = new Set(['disabled', 'warnings'])
+const attributeFilterIds = new Set(['enabled', 'disabled', 'warnings'])
 
-const typeFilteredCount = computed(() => {
-	if (selectedFilters.value.length === 0) return items.value.length
+function matchesSelectedFilters(item: ContentItem) {
 	const typeFilters = selectedFilters.value.filter((f) => !attributeFilterIds.has(f))
+	const hasEnabledFilter = props.enableToggle && selectedFilters.value.includes('enabled')
 	const hasDisabledFilter = props.enableToggle && selectedFilters.value.includes('disabled')
 	const hasWarningsFilter = selectedFilters.value.includes('warnings')
-	return items.value.filter((item) => {
-		if (typeFilters.length > 0 && !typeFilters.includes(normalizeProjectType(item.project_type)))
-			return false
-		if (hasDisabledFilter && item.enabled) return false
-		if (hasWarningsFilter && getClientWarningType(item, props.showEnvironmentWarnings) === null)
-			return false
-		return true
-	}).length
-})
+	if (typeFilters.length > 0 && !typeFilters.includes(normalizeProjectType(item.project_type)))
+		return false
+	if (hasEnabledFilter !== hasDisabledFilter && Boolean(item.enabled) !== hasEnabledFilter)
+		return false
+	if (hasWarningsFilter && getClientWarningType(item, props.showEnvironmentWarnings) === null)
+		return false
+	return true
+}
+
+const typeFilteredCount = computed(() => items.value.filter(matchesSelectedFilters).length)
 
 const filteredItems = computed(() => {
 	const query = searchQuery.value.trim()
@@ -231,17 +263,7 @@ const filteredItems = computed(() => {
 	}
 
 	if (selectedFilters.value.length > 0) {
-		const typeFilters = selectedFilters.value.filter((f) => !attributeFilterIds.has(f))
-		const hasDisabledFilter = props.enableToggle && selectedFilters.value.includes('disabled')
-		const hasWarningsFilter = selectedFilters.value.includes('warnings')
-		result = result.filter((item) => {
-			if (typeFilters.length > 0 && !typeFilters.includes(normalizeProjectType(item.project_type)))
-				return false
-			if (hasDisabledFilter && item.enabled) return false
-			if (hasWarningsFilter && getClientWarningType(item, props.showEnvironmentWarnings) === null)
-				return false
-			return true
-		})
+		result = result.filter(matchesSelectedFilters)
 	}
 
 	return sortContentItems(result, !query)
@@ -262,11 +284,13 @@ const tableItems = computed<ContentCardTableItem[]>(() =>
 			icon_url: item.embedded_metadata?.icon_url ?? null,
 		},
 		projectLink: !item.external && item.project?.id ? `/project/${item.project.id}` : undefined,
-		version: item.version ?? {
-			id: item.id,
-			version_number: contentVersionLabel(item),
-			file_name: item.file_name,
-		},
+		version: props.showVersion
+			? (item.version ?? {
+					id: item.id,
+					version_number: contentVersionLabel(item),
+					file_name: item.file_name,
+				})
+			: undefined,
 		owner: item.owner
 			? {
 					...item.owner,
@@ -283,6 +307,8 @@ const tableItems = computed<ContentCardTableItem[]>(() =>
 				}
 			: undefined,
 		...(props.enableToggle ? { enabled: item.enabled } : {}),
+		synced: !!item.synced_pack,
+		syncUpdatePending: item.synced_pack?.update_pending,
 		locked: item.locked,
 		installing: item.installing === true,
 		toggleDisabled: props.actionDisabled,
@@ -293,7 +319,7 @@ const tableItems = computed<ContentCardTableItem[]>(() =>
 			props.actionDisabled || disabledIds.value.has(item.file_name) || item.installing === true,
 		disabledTooltip: props.actionDisabled ? props.actionDisabledTooltip : undefined,
 		overflowOptions: [
-			...(props.switchVersion && !item.locked
+			...(props.switchVersion && !item.locked && item.project?.id && item.version?.id
 				? [
 						{
 							id: 'switch-version',
@@ -491,8 +517,12 @@ defineExpose({ show, showLoading, hide, getState, restore, updateItem, setItems
 				{{ props.header ?? formatMessage(messages.header) }}
 			</span>
 		</template>
-		<div class="flex flex-col h-[min(600px,calc(95vh-10rem))]">
-			<div class="flex flex-col gap-4 px-6 py-4 border-b border-solid border-0 border-surface-4">
+		<div class="flex max-h-[min(600px,calc(95vh-10rem))] flex-col">
+			<div
+				class="flex shrink-0 flex-col gap-4 px-6 py-4 border-b border-solid border-0 border-surface-4"
+			>
+				<p v-if="description" class="m-0 text-secondary">{{ description }}</p>
+				<slot name="toolbar" />
 				<Input
 					v-model="searchQuery"
 					:icon="SearchIcon"
@@ -502,8 +532,9 @@ defineExpose({ show, showLoading, hide, getState, restore, updateItem, setItems
 
 				<FilterPills
 					v-if="filterOptions.length > 0"
-					v-model="selectedFilters"
+					:model-value="selectedFilters"
 					:options="filterOptions"
+					@update:model-value="updateFilters"
 				>
 					<template #all>
 						{{ formatMessage(commonMessages.allProjectType) }}
@@ -511,10 +542,10 @@ defineExpose({ show, showLoading, hide, getState, restore, updateItem, setItems
 				</FilterPills>
 			</div>
 
-			<div class="flex-1 flex flex-col min-h-0 overflow-hidden">
+			<div class="flex min-h-0 flex-col overflow-hidden">
 				<div
 					v-if="loading"
-					class="flex flex-col items-center justify-center flex-1 gap-2 text-secondary"
+					class="flex flex-col items-center justify-center gap-2 p-8 text-secondary"
 				>
 					<SpinnerIcon class="size-8 animate-spin" />
 					<span class="text-sm">{{ formatMessage(messages.loading) }}</span>
@@ -527,7 +558,9 @@ defineExpose({ show, showLoading, hide, getState, restore, updateItem, setItems
 					<span class="text-xl font-semibold text-contrast">
 						{{ formatMessage(messages.emptyTitle) }}
 					</span>
-					<span class="text-secondary">{{ formatMessage(messages.emptyDescription) }}</span>
+					<span class="text-secondary">{{
+						emptyDescription ?? formatMessage(messages.emptyDescription)
+					}}</span>
 				</div>
 
 				<div
@@ -537,14 +570,14 @@ defineExpose({ show, showLoading, hide, getState, restore, updateItem, setItems
 					<span class="text-secondary">{{ formatMessage(messages.noResults) }}</span>
 				</div>
 
-				<div v-else class="@container flex-1 min-h-0 flex flex-col">
+				<div v-else class="@container flex min-h-0 flex-col">
 					<div
 						class="flex h-12 shrink-0 items-center justify-between gap-4 border-0 border-b border-solid border-surface-4 bg-surface-3 px-3"
 					>
 						<div
 							class="flex min-w-0 items-center gap-4"
 							:class="
-								showTableActions
+								showTableActions && showVersion
 									? 'flex-1 @[800px]:w-[45%] @[800px]:shrink-0 @[800px]:flex-none'
 									: 'flex-1'
 							"
@@ -562,6 +595,7 @@ defineExpose({ show, showLoading, hide, getState, restore, updateItem, setItems
 							}}</span>
 						</div>
 						<div
+							v-if="showVersion"
 							class="hidden @[800px]:flex"
 							:class="showTableActions ? 'flex-1 min-w-0' : 'flex-1'"
 						>
@@ -575,12 +609,13 @@ defineExpose({ show, showLoading, hide, getState, restore, updateItem, setItems
 							}}</span>
 						</div>
 					</div>
-					<div ref="scrollContainer" class="flex-1 min-h-0 overflow-y-auto">
+					<div ref="scrollContainer" class="min-h-0 overflow-y-auto">
 						<ContentCardTable
 							v-model:selected-ids="selectedIds"
 							:items="tableItems"
 							:show-selection="props.enableToggle"
-							:show-item-actions="hasExternalSlicerUrls"
+							:show-item-actions="showTableActions"
+							:show-version="showVersion"
 							hide-delete
 							hide-header
 							flat
diff --git a/packages/ui/src/layouts/shared/content-tab/layout.vue b/packages/ui/src/layouts/shared/content-tab/layout.vue
index dc674e51ae..c389872a9f 100644
--- a/packages/ui/src/layouts/shared/content-tab/layout.vue
+++ b/packages/ui/src/layouts/shared/content-tab/layout.vue
@@ -563,6 +563,16 @@ async function promptDeleteItems(items: ContentItem[], event?: MouseEvent) {
 }
 
 async function showDeletionConfirmation(event?: MouseEvent) {
+	const confirmed = await ctx.confirmDeleteItems?.(pendingDeletionItems.value)
+	if (confirmed !== undefined) {
+		if (!confirmed) return
+		if (pendingDeletionWarning.value) {
+			confirmDeletionModal.value?.show()
+		} else {
+			await confirmDelete()
+		}
+		return
+	}
 	if (
 		!pendingDeletionWarning.value &&
 		(event?.shiftKey || skipNonEssentialWarnings.value) &&
@@ -596,6 +606,7 @@ async function confirmDependencyWarningDelete(disableDependentsAfterDeleting: bo
 
 	pendingDependencyWarningItems.value = []
 	pendingDependencyWarningDependents.value = []
+	if ((await ctx.confirmDeleteItems?.(pendingDeletionItems.value)) === false) return
 	if (pendingDeletionWarning.value) {
 		confirmDeletionModal.value?.show()
 		return
@@ -685,6 +696,7 @@ async function confirmDelete() {
 async function promptDisableItems(items: ContentItem[]) {
 	const toggleableItems = items.filter(canToggleItem)
 	if (toggleableItems.length === 0) return
+	if (ctx.confirmAction && !(await ctx.confirmAction('disable', toggleableItems))) return
 	pendingDisableItems.value = toggleableItems
 	const warning = ctx.getDisableWarning?.(toggleableItems) ?? null
 	if (warning) {
@@ -752,6 +764,7 @@ async function handleToggleEnabledById(id: string, _value: boolean) {
 		await promptDisableItems([item])
 		return
 	}
+	if (ctx.confirmAction && !(await ctx.confirmAction('enable', [item]))) return
 	markChanging(id)
 	try {
 		await ctx.toggleEnabled(item)
@@ -764,6 +777,7 @@ async function bulkEnable() {
 	if (ctx.isBusy.value) return
 	const items = toggleableSelectedItems.value.filter((item) => !item.enabled)
 	if (items.length === 0) return
+	if (ctx.confirmAction && !(await ctx.confirmAction('enable', items))) return
 	if (ctx.bulkEnableItems) {
 		isBulkOperating.value = true
 		bulkOperation.value = 'enable'
@@ -794,7 +808,7 @@ async function bulkDisable() {
 
 function handleUpdateById(id: string) {
 	const item = ctx.items.value.find((item) => getItemId(item) === id)
-	if (item?.locked) return
+	if (!item || item.locked) return
 	ctx.updateItem?.(id)
 }
 
diff --git a/packages/ui/src/layouts/shared/content-tab/providers/content-manager.ts b/packages/ui/src/layouts/shared/content-tab/providers/content-manager.ts
index 10397a9c35..71b052cde7 100644
--- a/packages/ui/src/layouts/shared/content-tab/providers/content-manager.ts
+++ b/packages/ui/src/layouts/shared/content-tab/providers/content-manager.ts
@@ -60,6 +60,8 @@ export interface ContentManagerContext {
 	canToggleItem?: (item: ContentItem) => boolean
 	getDeleteWarning?: (items: ContentItem[]) => ContentActionWarning | null
 	getDisableWarning?: (items: ContentItem[]) => ContentActionWarning | null
+	confirmAction?: (action: 'enable' | 'disable', items: ContentItem[]) => Promise<boolean>
+	confirmDeleteItems?: (items: ContentItem[]) => Promise<boolean | undefined>
 	getDeleteDependencyWarning?: (
 		items: ContentItem[],
 	) => ContentDependencyWarning | null | Promise<ContentDependencyWarning | null>
diff --git a/packages/ui/src/layouts/shared/content-tab/types.ts b/packages/ui/src/layouts/shared/content-tab/types.ts
index 6154b33ca1..f5cb9e76a5 100644
--- a/packages/ui/src/layouts/shared/content-tab/types.ts
+++ b/packages/ui/src/layouts/shared/content-tab/types.ts
@@ -71,6 +71,8 @@ export interface ContentCardTableItem {
 	hasUpdate?: boolean
 	isClientOnly?: boolean
 	clientWarning?: ClientWarningType | null
+	synced?: boolean
+	syncUpdatePending?: boolean
 	hideDelete?: boolean
 	hideSwitchVersion?: boolean
 	overflowOptions?: ButtonMenuOption[]
@@ -92,6 +94,11 @@ export interface ContentItem extends Omit<
 	'id' | 'projectLink' | 'disabled' | 'overflowOptions'
 > {
 	id: string
+	synced_pack?: {
+		id: string
+		instance_ids: string[]
+		update_pending: boolean
+	} | null
 	file_name: string
 	file_path?: string
 	size?: number
diff --git a/packages/ui/src/locales/en-US/index.json b/packages/ui/src/locales/en-US/index.json
index aacf36cf88..be7037605b 100644
--- a/packages/ui/src/locales/en-US/index.json
+++ b/packages/ui/src/locales/en-US/index.json
@@ -377,6 +377,12 @@
   "content.card.select-project": {
     "defaultMessage": "Select {project}"
   },
+  "content.card.sync-update-pending": {
+    "defaultMessage": "Some synced copies are waiting for changes. An instance may be running, have a frozen or incompatible version, or already contain its own copy."
+  },
+  "content.card.synced": {
+    "defaultMessage": "Synced across instances"
+  },
   "content.card.uploaded": {
     "defaultMessage": "Uploaded"
   },
@@ -2351,6 +2357,9 @@
   "instances.content-install.show-unavailable": {
     "defaultMessage": "Show unavailable"
   },
+  "instances.managed-content-modal.disabled": {
+    "defaultMessage": "Disabled"
+  },
   "instances.managed-content-modal.download-file": {
     "defaultMessage": "Download File"
   },
@@ -2360,6 +2369,9 @@
   "instances.managed-content-modal.empty-title": {
     "defaultMessage": "No content found"
   },
+  "instances.managed-content-modal.enabled": {
+    "defaultMessage": "Enabled"
+  },
   "instances.managed-content-modal.external-content": {
     "defaultMessage": "External"
   },
@@ -2381,6 +2393,9 @@
   "instances.managed-content-modal.search-placeholder": {
     "defaultMessage": "Search {count, number} {count, plural, one {project} other {projects}}"
   },
+  "instances.managed-content-modal.warnings": {
+    "defaultMessage": "Warnings"
+  },
   "instances.updater-modal.badge.current": {
     "defaultMessage": "Current"
   },

From bfa2e1a1a552e1ad877a3272b5a29ce5e70b31da Mon Sep 17 00:00:00 2001
From: "Calum H. (IMB11)" <contact@cal.engineer>
Date: Thu, 3 Sep 2026 18:26:12 +0100
Subject: [PATCH 19/33] chore: cleanup frontend impl

---
 apps/app-frontend/src/App.vue                 |   76 +-
 .../components/ui/QuickInstanceSwitcher.vue   |    9 +-
 .../ui/instance/SyncedContentModal.vue        |   32 +-
 .../components/ui/modal/AppSettingsModal.vue  |    2 +-
 .../ui/settings/display/BehaviorSettings.vue  |   41 +-
 .../ui/settings/display/FeaturesSettings.vue  |  131 +-
 .../instances/InstancesSyncedSettings.vue     | 1498 -----------------
 .../ui/settings/instances/SyncSourceModal.vue |    8 +-
 .../settings/instances/SyncedPacksModal.vue   |    9 +-
 .../game-settings-modal/boolean-control.vue   |   38 +
 .../editors.ts}                               |    0
 .../instances/game-settings-modal/index.vue   |  429 +++++
 .../keybind-input.vue}                        |   67 +-
 .../keybinds.ts}                              |    0
 .../messages.ts}                              |  150 --
 .../row.vue}                                  |   59 +-
 .../game-settings-modal/use-editor.ts         |  408 +++++
 .../game-settings/GameSettingsModal.vue       |  779 ---------
 .../game-setting-boolean-control.vue          |   53 -
 .../command-history-modal.vue                 |  124 ++
 .../instances-synced-settings/index.vue       |  564 +++++++
 .../launch-options.vue                        |  463 +++++
 .../servers-modal.vue                         |  476 ++++++
 .../ui/sync-instances-update-modal/index.vue  |    9 +-
 ...e-sync-instances-update.ts => use-sync.ts} |   10 +-
 .../instances/use-synced-pack-actions.ts      |   16 +-
 .../composables/use-quick-instance-limit.ts   |   18 +-
 apps/app-frontend/src/helpers/instance.ts     |    6 +-
 apps/app-frontend/src/helpers/settings.ts     |   14 +
 .../src/helpers/synced-options.ts             |   23 +-
 apps/app-frontend/src/helpers/synced-packs.ts |   21 +-
 apps/app-frontend/src/helpers/types.d.ts      |    5 +-
 .../app-frontend/src/locales/en-US/index.json |   56 +-
 .../synced-options-settings.vue               |   44 +-
 .../src/pages/instance/worlds/index.vue       |    7 +-
 .../instance/synced_options/orchestration.rs  |   21 +
 .../src/api/instance/synced_packs/mod.rs      |   25 +-
 .../api/instance/synced_packs/operations.rs   |   16 +-
 .../src/state/instances/model/instance.rs     |    4 +
 packages/ui/src/components/base/Slider.vue    |   15 +-
 .../components/ConsoleActionButtons.vue       |   48 +-
 .../components/ContentCardItem.vue            |   13 +-
 .../managed-content-modal/index.vue           |    7 +-
 packages/ui/src/locales/en-US/index.json      |    9 +
 44 files changed, 2962 insertions(+), 2841 deletions(-)
 delete mode 100644 apps/app-frontend/src/components/ui/settings/instances/InstancesSyncedSettings.vue
 create mode 100644 apps/app-frontend/src/components/ui/settings/instances/game-settings-modal/boolean-control.vue
 rename apps/app-frontend/src/components/ui/settings/instances/{game-settings/game-setting-editors.ts => game-settings-modal/editors.ts} (100%)
 create mode 100644 apps/app-frontend/src/components/ui/settings/instances/game-settings-modal/index.vue
 rename apps/app-frontend/src/components/ui/settings/instances/{game-settings/GameKeybindInput.vue => game-settings-modal/keybind-input.vue} (80%)
 rename apps/app-frontend/src/components/ui/settings/instances/{game-settings/game-keybinds.ts => game-settings-modal/keybinds.ts} (100%)
 rename apps/app-frontend/src/components/ui/settings/instances/{game-settings/game-setting-messages.ts => game-settings-modal/messages.ts} (90%)
 rename apps/app-frontend/src/components/ui/settings/instances/{game-settings/GameSettingRow.vue => game-settings-modal/row.vue} (85%)
 create mode 100644 apps/app-frontend/src/components/ui/settings/instances/game-settings-modal/use-editor.ts
 delete mode 100644 apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingsModal.vue
 delete mode 100644 apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-boolean-control.vue
 create mode 100644 apps/app-frontend/src/components/ui/settings/instances/instances-synced-settings/command-history-modal.vue
 create mode 100644 apps/app-frontend/src/components/ui/settings/instances/instances-synced-settings/index.vue
 create mode 100644 apps/app-frontend/src/components/ui/settings/instances/instances-synced-settings/launch-options.vue
 create mode 100644 apps/app-frontend/src/components/ui/settings/instances/instances-synced-settings/servers-modal.vue
 rename apps/app-frontend/src/components/ui/sync-instances-update-modal/{use-sync-instances-update.ts => use-sync.ts} (93%)

diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue
index 27a6c05c65..dc3c832025 100644
--- a/apps/app-frontend/src/App.vue
+++ b/apps/app-frontend/src/App.vue
@@ -105,10 +105,7 @@ import { useAppEvent } from '@/composables/use-app-event'
 import { useAppSettings } from '@/composables/use-app-settings.ts'
 import { useError } from '@/composables/use-error.js'
 import { useInstanceMetadataRefresh } from '@/composables/use-instance-metadata-refresh'
-import {
-	QUICK_INSTANCE_LIMIT_MAX,
-	useQuickInstanceLimit,
-} from '@/composables/use-quick-instance-limit.ts'
+import { useQuickInstanceLimit } from '@/composables/use-quick-instance-limit.ts'
 import { isDarkTheme, useTheme } from '@/composables/use-theme.ts'
 import { config } from '@/config'
 import { getAccountAppearance, rememberAccountAppearance } from '@/helpers/account-appearance.ts'
@@ -127,7 +124,6 @@ import { install_create_modpack_instance, install_get_modpack_preview } from '@/
 import {
 	can_current_user_use_shared_instances,
 	get as getInstance,
-	get_global_synced_options,
 	run,
 	set_global_synced_option,
 } from '@/helpers/instance'
@@ -140,8 +136,9 @@ import {
 	setActive,
 } from '@/helpers/mr_auth.ts'
 import { mergeUrlQuery, parseModrinthLink } from '@/helpers/project-links.ts'
-import { get as getSettings, set as setSettings } from '@/helpers/settings.ts'
+import { appSettingsKeys, get as getSettings, set as setSettings } from '@/helpers/settings.ts'
 import { get_opening_command, initialize_state } from '@/helpers/state'
+import { globalSyncedOptionsQueryOptions, syncedOptionsKeys } from '@/helpers/synced-options'
 import { hasActivePride26Midas, hasMidasBadge } from '@/helpers/user-campaigns.ts'
 import { get_user_preferences } from '@/helpers/user-preferences.ts'
 import { parse_modrinth_user_link } from '@/helpers/users'
@@ -456,8 +453,7 @@ const isDevEnvironment = ref(false)
 
 const stateInitialized = ref(false)
 const globalSyncedOptionsQuery = useQuery({
-	queryKey: ['global-synced-options'],
-	queryFn: get_global_synced_options,
+	...globalSyncedOptionsQueryOptions(),
 	enabled: computed(() => stateInitialized.value),
 })
 
@@ -1142,63 +1138,36 @@ watch(
 					const featureFlags = {
 						worlds_in_home: behavior.show_jump_in,
 					}
-					const showFilesTab =
-						behavior.show_files_tab_in_instances ?? settings.show_files_tab_in_instances
-					const showWorldsTab =
-						behavior.show_worlds_tab_in_instances ?? settings.show_worlds_tab_in_instances
-					const showScreenshotsTab =
-						behavior.show_screenshots_tab_in_instances ?? settings.show_screenshots_tab_in_instances
-					const showSkinSelector =
-						behavior.show_skin_selector_in_sidebar ?? settings.show_skin_selector_in_sidebar
-					const quickInstanceCount = Math.min(
-						Math.max(
-							typeof behavior.quick_instance_count === 'number'
-								? behavior.quick_instance_count
-								: (quickInstances.limit.value ?? QUICK_INSTANCE_LIMIT_MAX),
-							0,
-						),
-						QUICK_INSTANCE_LIMIT_MAX,
-					)
-
-					appSettings.showFilesTabInInstances = showFilesTab
-					appSettings.showWorldsTabInInstances = showWorldsTab
-					appSettings.showScreenshotsTabInInstances = showScreenshotsTab
-					appSettings.showSkinSelectorInSidebar = showSkinSelector
-					Object.assign(appSettings.featureFlags, featureFlags)
-					quickInstances.setLimit(
-						quickInstanceCount >= QUICK_INSTANCE_LIMIT_MAX ? null : quickInstanceCount,
-					)
-
-					if (settings.show_files_tab_in_instances !== showFilesTab) {
-						settings.show_files_tab_in_instances = showFilesTab
-						settingsChanged = true
-					}
-					if (settings.show_worlds_tab_in_instances !== showWorldsTab) {
-						settings.show_worlds_tab_in_instances = showWorldsTab
-						settingsChanged = true
+					const featureSettings = {
+						show_files_tab_in_instances: 'showFilesTabInInstances',
+						show_worlds_tab_in_instances: 'showWorldsTabInInstances',
+						show_screenshots_tab_in_instances: 'showScreenshotsTabInInstances',
+						show_skin_selector_in_sidebar: 'showSkinSelectorInSidebar',
 					}
-					if (settings.show_screenshots_tab_in_instances !== showScreenshotsTab) {
-						settings.show_screenshots_tab_in_instances = showScreenshotsTab
-						settingsChanged = true
+					for (const [key, stateKey] of Object.entries(featureSettings)) {
+						const value = behavior[key] ?? settings[key]
+						appSettings[stateKey] = value
+						if (settings[key] !== value) {
+							settings[key] = value
+							settingsChanged = true
+						}
 					}
-					if (settings.show_skin_selector_in_sidebar !== showSkinSelector) {
-						settings.show_skin_selector_in_sidebar = showSkinSelector
-						settingsChanged = true
+					Object.assign(appSettings.featureFlags, featureFlags)
+					if (typeof behavior.quick_instance_count === 'number') {
+						quickInstances.setLimit(behavior.quick_instance_count)
 					}
+
 					const showAllScreenshots = behavior.show_all_screenshots
 					if (typeof showAllScreenshots === 'boolean') {
 						const globalSyncedOptions =
 							globalSyncedOptionsQuery.data.value ??
-							(await queryClient.fetchQuery({
-								queryKey: ['global-synced-options'],
-								queryFn: get_global_synced_options,
-							}))
+							(await queryClient.fetchQuery(globalSyncedOptionsQueryOptions()))
 						if (globalSyncedOptions.screenshots !== showAllScreenshots) {
 							const updatedGlobalSyncedOptions = await set_global_synced_option(
 								'screenshots',
 								showAllScreenshots,
 							)
-							queryClient.setQueryData(['global-synced-options'], updatedGlobalSyncedOptions)
+							queryClient.setQueryData(syncedOptionsKeys.global, updatedGlobalSyncedOptions)
 							await queryClient.invalidateQueries({ queryKey: screenshotKeys.all })
 						}
 					}
@@ -1213,6 +1182,7 @@ watch(
 
 				if (settingsChanged) {
 					await setSettings(settings)
+					queryClient.setQueryData(appSettingsKeys.all, settings)
 				}
 			})
 			.catch(handleError)
diff --git a/apps/app-frontend/src/components/ui/QuickInstanceSwitcher.vue b/apps/app-frontend/src/components/ui/QuickInstanceSwitcher.vue
index 49e9bd103f..7387eaca6a 100644
--- a/apps/app-frontend/src/components/ui/QuickInstanceSwitcher.vue
+++ b/apps/app-frontend/src/components/ui/QuickInstanceSwitcher.vue
@@ -16,7 +16,10 @@ import { useRouter } from 'vue-router'
 import NavButton from '@/components/ui/NavButton.vue'
 import { useAppEvent } from '@/composables/use-app-event'
 import { handleSevereError } from '@/composables/use-error.js'
-import { useQuickInstanceLimit } from '@/composables/use-quick-instance-limit.ts'
+import {
+	QUICK_INSTANCE_LIMIT_MAX,
+	useQuickInstanceLimit,
+} from '@/composables/use-quick-instance-limit.ts'
 import { trackEvent } from '@/helpers/analytics'
 import { getInstanceIconUrl, kill, run } from '@/helpers/instance'
 import { get_all } from '@/helpers/process'
@@ -55,7 +58,9 @@ const allInstances = computed(() =>
 const dragging = ref(false)
 const quickInstances = useQuickInstanceLimit()
 
-const maxVisible = computed(() => Math.min(maxAuto.value, allInstances.value.length))
+const maxVisible = computed(() =>
+	Math.min(maxAuto.value, allInstances.value.length, QUICK_INSTANCE_LIMIT_MAX),
+)
 const visibleCount = computed(() =>
 	Math.min(quickInstances.limit.value ?? maxVisible.value, maxVisible.value),
 )
diff --git a/apps/app-frontend/src/components/ui/instance/SyncedContentModal.vue b/apps/app-frontend/src/components/ui/instance/SyncedContentModal.vue
index 7404786b67..b9bce0689f 100644
--- a/apps/app-frontend/src/components/ui/instance/SyncedContentModal.vue
+++ b/apps/app-frontend/src/components/ui/instance/SyncedContentModal.vue
@@ -80,7 +80,8 @@ function finish(choice: Choice) {
 }
 
 function show() {
-	resolveChoice?.(null)
+	settle(null)
+	if (!modal.value) return Promise.resolve(null)
 	return new Promise<Choice>((resolve) => {
 		resolveChoice = resolve
 		modal.value?.show()
@@ -111,7 +112,7 @@ async function confirmDesync(item: ContentItem) {
 		: null
 }
 
-onBeforeUnmount(() => resolveChoice?.(null))
+onBeforeUnmount(() => settle(null))
 defineExpose({ confirmChange, confirmDelete, confirmDesync })
 </script>
 
@@ -134,7 +135,7 @@ defineExpose({ confirmChange, confirmDelete, confirmDesync })
 				<div
 					v-for="item in items"
 					:key="item.id"
-					class="rounded-xl border border-solid border-surface-5 p-4 !bg-surface-2"
+					class="rounded-xl border border-solid border-surface-4 bg-surface-2 p-4"
 				>
 					<ContentCardItem
 						:project="
@@ -171,16 +172,19 @@ defineExpose({ confirmChange, confirmDelete, confirmDesync })
 		</div>
 		<template #actions>
 			<div class="flex flex-wrap justify-end gap-2">
-				<Button type="outlined" class="!border !border-surface-5" @click="finish(null)"
-					><XIcon />{{ formatMessage(commonMessages.cancelButton) }}</Button
-				>
+				<Button type="outlined" @click="finish(null)">
+					<XIcon aria-hidden="true" />
+					{{ formatMessage(commonMessages.cancelButton) }}
+				</Button>
 				<template v-if="mode === 'desync'">
-					<Button @click="finish('keep_in_other_instances')"
-						><LinkIcon />{{ formatMessage(messages.keep) }}</Button
-					>
-					<Button type="colored" color="orange" @click="finish('remove_from_other_instances')"
-						><TrashIcon />{{ formatMessage(messages.remove) }}</Button
-					>
+					<Button @click="finish('keep_in_other_instances')">
+						<LinkIcon aria-hidden="true" />
+						{{ formatMessage(messages.keep) }}
+					</Button>
+					<Button type="colored" color="orange" @click="finish('remove_from_other_instances')">
+						<TrashIcon aria-hidden="true" />
+						{{ formatMessage(messages.remove) }}
+					</Button>
 				</template>
 				<Button
 					v-else
@@ -188,8 +192,8 @@ defineExpose({ confirmChange, confirmDelete, confirmDesync })
 					:color="mode === 'delete' ? 'red' : 'orange'"
 					@click="finish(mode === 'delete' ? 'all' : 'confirm')"
 				>
-					<TrashIcon v-if="mode === 'delete'" />
-					<RightArrowIcon v-else />
+					<TrashIcon v-if="mode === 'delete'" aria-hidden="true" />
+					<RightArrowIcon v-else aria-hidden="true" />
 					{{
 						formatMessage(
 							mode === 'delete' ? commonMessages.deleteLabel : commonMessages.continueButton,
diff --git a/apps/app-frontend/src/components/ui/modal/AppSettingsModal.vue b/apps/app-frontend/src/components/ui/modal/AppSettingsModal.vue
index a3e6285f9a..6a4503023f 100644
--- a/apps/app-frontend/src/components/ui/modal/AppSettingsModal.vue
+++ b/apps/app-frontend/src/components/ui/modal/AppSettingsModal.vue
@@ -35,7 +35,7 @@ import BehaviorSettings from '@/components/ui/settings/display/BehaviorSettings.
 import FeatureFlagSettings from '@/components/ui/settings/display/FeatureFlagSettings.vue'
 import FeaturesSettings from '@/components/ui/settings/display/FeaturesSettings.vue'
 import LanguageSettings from '@/components/ui/settings/display/LanguageSettings.vue'
-import InstancesSyncedSettings from '@/components/ui/settings/instances/InstancesSyncedSettings.vue'
+import InstancesSyncedSettings from '@/components/ui/settings/instances/instances-synced-settings/index.vue'
 import JavaSettings from '@/components/ui/settings/instances/JavaSettings.vue'
 import ResourceManagementSettings from '@/components/ui/settings/instances/ResourceManagementSettings.vue'
 import { useAppSettings } from '@/composables/use-app-settings.ts'
diff --git a/apps/app-frontend/src/components/ui/settings/display/BehaviorSettings.vue b/apps/app-frontend/src/components/ui/settings/display/BehaviorSettings.vue
index 142f21d5cd..55622d7ee2 100644
--- a/apps/app-frontend/src/components/ui/settings/display/BehaviorSettings.vue
+++ b/apps/app-frontend/src/components/ui/settings/display/BehaviorSettings.vue
@@ -2,26 +2,36 @@
 import {
 	defineMessages,
 	injectAuth,
+	injectNotificationManager,
 	injectUserPreferences,
 	Toggle,
 	useSavable,
 	useVIntl,
 } from '@modrinth/ui'
-import { inject, onBeforeUnmount, onMounted, ref } from 'vue'
+import { useMutation, useQuery, useQueryClient } from '@tanstack/vue-query'
+import { inject, onBeforeUnmount, onMounted } from 'vue'
 
 import {
 	DEFAULT_FEATURE_FLAGS,
 	type FeatureFlag,
 	useAppSettings,
 } from '@/composables/use-app-settings.ts'
-import { type AppSettings, get, set } from '@/helpers/settings.ts'
+import {
+	type AppSettings,
+	appSettingsKeys,
+	appSettingsQueryOptions,
+	get,
+	set,
+} from '@/helpers/settings.ts'
 import { appSettingsModalContextKey } from '@/providers/app-settings-modal'
 
 const appSettings = useAppSettings()
 const { formatMessage } = useVIntl()
 const auth = injectAuth()
+const { handleError } = injectNotificationManager()
 const { updatePreferences } = injectUserPreferences()
 const settingsModal = inject(appSettingsModalContextKey, null)
+const queryClient = useQueryClient()
 
 const compactInstanceCardsFlag: FeatureFlag = 'compact_instance_cards'
 const skipNonEssentialWarningsFlag: FeatureFlag = 'skip_non_essential_warnings'
@@ -133,7 +143,8 @@ type BehaviorSettingsState = {
 	skipNonEssentialWarnings: boolean
 }
 
-const persistedSettings = ref(await get())
+const settingsQuery = useQuery(appSettingsQueryOptions())
+await settingsQuery.suspense()
 
 function getBehaviorSettingsState(settings: AppSettings): BehaviorSettingsState {
 	return {
@@ -156,11 +167,10 @@ function getBehaviorSettingsState(settings: AppSettings): BehaviorSettingsState
 	}
 }
 
-const { saved, current, changes, saving, hasChanges, reset, save } = useSavable(
-	() => getBehaviorSettingsState(persistedSettings.value),
-	async () => {
-		const value = current.value
-
+const settingsMutation = useMutation({
+	mutationKey: appSettingsKeys.update,
+	scope: { id: 'app-settings' },
+	mutationFn: async (value: BehaviorSettingsState) => {
 		if (value.syncBehaviorAcrossDevices && auth.user.value) {
 			await updatePreferences({
 				behavior: {
@@ -175,14 +185,15 @@ const { saved, current, changes, saving, hasChanges, reset, save } = useSavable(
 			})
 		}
 
+		const latestSettings = await get()
 		const nextSettings: AppSettings = {
-			...persistedSettings.value,
+			...latestSettings,
 			sync_behavior_across_devices: value.syncBehaviorAcrossDevices,
 			hide_on_process_start: value.minimizeApp,
 			toggle_sidebar: value.hideRightSidebar,
 			hide_nametag_skins_page: value.hideNametag,
 			feature_flags: {
-				...persistedSettings.value.feature_flags,
+				...latestSettings.feature_flags,
 				[compactInstanceCardsFlag]: value.compactInstanceCards,
 				[showPlayTimeFlag]: value.showPlayTime,
 				[skipUnknownPackWarningFlag]: !value.warnOnUnknownModpacks,
@@ -191,7 +202,7 @@ const { saved, current, changes, saving, hasChanges, reset, save } = useSavable(
 		}
 
 		await set(nextSettings)
-		persistedSettings.value = nextSettings
+		queryClient.setQueryData(appSettingsKeys.all, nextSettings)
 		appSettings.setBehaviorSyncAcrossDevices(value.syncBehaviorAcrossDevices)
 		appSettings.toggleSidebar = value.hideRightSidebar
 		appSettings.hideNametagSkinsPage = value.hideNametag
@@ -200,6 +211,14 @@ const { saved, current, changes, saving, hasChanges, reset, save } = useSavable(
 		appSettings.featureFlags[skipUnknownPackWarningFlag] = !value.warnOnUnknownModpacks
 		appSettings.featureFlags[skipNonEssentialWarningsFlag] = value.skipNonEssentialWarnings
 	},
+	onMutate: () => queryClient.cancelQueries({ queryKey: appSettingsKeys.all }),
+	onError: handleError,
+	onSettled: () => queryClient.invalidateQueries({ queryKey: appSettingsKeys.all }),
+})
+
+const { saved, current, changes, saving, hasChanges, reset, save } = useSavable(
+	() => getBehaviorSettingsState(settingsQuery.data.value!),
+	() => settingsMutation.mutateAsync({ ...current.value }),
 )
 
 async function saveBehaviorSettings(): Promise<void> {
diff --git a/apps/app-frontend/src/components/ui/settings/display/FeaturesSettings.vue b/apps/app-frontend/src/components/ui/settings/display/FeaturesSettings.vue
index 3091cbe0d3..1d3e379416 100644
--- a/apps/app-frontend/src/components/ui/settings/display/FeaturesSettings.vue
+++ b/apps/app-frontend/src/components/ui/settings/display/FeaturesSettings.vue
@@ -2,14 +2,15 @@
 import {
 	defineMessages,
 	injectAuth,
+	injectNotificationManager,
 	injectUserPreferences,
 	Slider,
 	Toggle,
 	useSavable,
 	useVIntl,
 } from '@modrinth/ui'
-import { useQueryClient } from '@tanstack/vue-query'
-import { inject, onBeforeUnmount, onMounted, ref } from 'vue'
+import { useMutation, useQuery, useQueryClient } from '@tanstack/vue-query'
+import { inject, onBeforeUnmount, onMounted } from 'vue'
 
 import {
 	DEFAULT_FEATURE_FLAGS,
@@ -20,18 +21,22 @@ import {
 	QUICK_INSTANCE_LIMIT_MAX,
 	useQuickInstanceLimit,
 } from '@/composables/use-quick-instance-limit.ts'
+import { type GlobalSyncedOptions, set_global_synced_option } from '@/helpers/instance.ts'
 import {
-	get_global_synced_options,
-	type GlobalSyncedOptions,
-	set_global_synced_option,
-} from '@/helpers/instance.ts'
-import { type AppSettings, get, set } from '@/helpers/settings.ts'
+	type AppSettings,
+	appSettingsKeys,
+	appSettingsQueryOptions,
+	get,
+	set,
+} from '@/helpers/settings.ts'
+import { globalSyncedOptionsQueryOptions, syncedOptionsKeys } from '@/helpers/synced-options'
 import { screenshotKeys } from '@/pages/instance/query-options.ts'
 import { appSettingsModalContextKey } from '@/providers/app-settings-modal'
 
 const appSettings = useAppSettings()
 const { formatMessage } = useVIntl()
 const auth = injectAuth()
+const { handleError } = injectNotificationManager()
 const { updatePreferences } = injectUserPreferences()
 const settingsModal = inject(appSettingsModalContextKey, null)
 const quickInstances = useQuickInstanceLimit()
@@ -124,12 +129,9 @@ type FeaturesSettingsState = {
 	showJumpIn: boolean
 }
 
-const [initialSettings, initialGlobalSyncedOptions] = await Promise.all([
-	get(),
-	get_global_synced_options(),
-])
-const persistedSettings = ref(initialSettings)
-const persistedGlobalSyncedOptions = ref(initialGlobalSyncedOptions)
+const settingsQuery = useQuery(appSettingsQueryOptions())
+const globalOptionsQuery = useQuery(globalSyncedOptionsQueryOptions())
+await Promise.all([settingsQuery.suspense(), globalOptionsQuery.suspense()])
 
 function getFeaturesSettingsState(
 	settings: AppSettings,
@@ -142,19 +144,21 @@ function getFeaturesSettingsState(
 		showScreenshotsTab: settings.show_screenshots_tab_in_instances,
 		showAllScreenshots: globalSyncedOptions.screenshots,
 		showSkinSelector: settings.show_skin_selector_in_sidebar,
-		quickInstanceCount: Math.min(
-			quickInstances.limit.value ?? QUICK_INSTANCE_LIMIT_MAX,
-			QUICK_INSTANCE_LIMIT_MAX,
-		),
+		quickInstanceCount: quickInstances.limit.value ?? QUICK_INSTANCE_LIMIT_MAX,
 		showJumpIn: settings.feature_flags[showJumpInFlag] ?? DEFAULT_FEATURE_FLAGS[showJumpInFlag],
 	}
 }
 
-const { saved, current, changes, saving, hasChanges, reset, save } = useSavable(
-	() => getFeaturesSettingsState(persistedSettings.value, persistedGlobalSyncedOptions.value),
-	async (changedValues) => {
-		const value = current.value
-
+const settingsMutation = useMutation({
+	mutationKey: appSettingsKeys.update,
+	scope: { id: 'app-settings' },
+	mutationFn: async ({
+		value,
+		updateQuickInstanceCount,
+	}: {
+		value: FeaturesSettingsState
+		updateQuickInstanceCount: boolean
+	}) => {
 		if (value.syncFeaturesAcrossDevices && auth.user.value) {
 			await updatePreferences({
 				behavior: {
@@ -169,30 +173,30 @@ const { saved, current, changes, saving, hasChanges, reset, save } = useSavable(
 			})
 		}
 
+		const latestSettings = await get()
 		const nextSettings: AppSettings = {
-			...persistedSettings.value,
+			...latestSettings,
 			sync_features_across_devices: value.syncFeaturesAcrossDevices,
 			show_files_tab_in_instances: value.showFilesTab,
 			show_worlds_tab_in_instances: value.showWorldsTab,
 			show_screenshots_tab_in_instances: value.showScreenshotsTab,
 			show_skin_selector_in_sidebar: value.showSkinSelector,
 			feature_flags: {
-				...persistedSettings.value.feature_flags,
+				...latestSettings.feature_flags,
 				[showJumpInFlag]: value.showJumpIn,
 			},
 		}
 
 		const screenshotsChanged =
-			value.showAllScreenshots !== persistedGlobalSyncedOptions.value.screenshots
+			value.showAllScreenshots !== globalOptionsQuery.data.value!.screenshots
 		const [, updatedGlobalSyncedOptions] = await Promise.all([
 			set(nextSettings),
 			screenshotsChanged
 				? set_global_synced_option('screenshots', value.showAllScreenshots)
-				: Promise.resolve(persistedGlobalSyncedOptions.value),
+				: Promise.resolve(globalOptionsQuery.data.value!),
 		])
-		persistedSettings.value = nextSettings
-		persistedGlobalSyncedOptions.value = updatedGlobalSyncedOptions
-		queryClient.setQueryData(['global-synced-options'], updatedGlobalSyncedOptions)
+		queryClient.setQueryData(appSettingsKeys.all, nextSettings)
+		queryClient.setQueryData(syncedOptionsKeys.global, updatedGlobalSyncedOptions)
 		if (screenshotsChanged) {
 			await queryClient.invalidateQueries({ queryKey: screenshotKeys.all })
 		}
@@ -203,12 +207,30 @@ const { saved, current, changes, saving, hasChanges, reset, save } = useSavable(
 		appSettings.showSkinSelectorInSidebar = value.showSkinSelector
 		appSettings.featureFlags[showJumpInFlag] = value.showJumpIn
 
-		if (changedValues.quickInstanceCount !== undefined) {
-			quickInstances.setLimit(
-				value.quickInstanceCount >= QUICK_INSTANCE_LIMIT_MAX ? null : value.quickInstanceCount,
-			)
+		if (updateQuickInstanceCount) {
+			quickInstances.setLimit(value.quickInstanceCount)
 		}
 	},
+	onMutate: () =>
+		Promise.all([
+			queryClient.cancelQueries({ queryKey: appSettingsKeys.all }),
+			queryClient.cancelQueries({ queryKey: syncedOptionsKeys.global }),
+		]),
+	onError: handleError,
+	onSettled: () =>
+		Promise.all([
+			queryClient.invalidateQueries({ queryKey: appSettingsKeys.all }),
+			queryClient.invalidateQueries({ queryKey: syncedOptionsKeys.global }),
+		]),
+})
+
+const { saved, current, changes, saving, hasChanges, reset, save } = useSavable(
+	() => getFeaturesSettingsState(settingsQuery.data.value!, globalOptionsQuery.data.value!),
+	(changedValues) =>
+		settingsMutation.mutateAsync({
+			value: { ...current.value },
+			updateQuickInstanceCount: changedValues.quickInstanceCount !== undefined,
+		}),
 )
 
 async function saveFeaturesSettings(): Promise<void> {
@@ -236,7 +258,7 @@ onBeforeUnmount(() => {
 </script>
 
 <template>
-	<section class="border-0 border-b border-solid border-divider pb-6">
+	<section class="border-0 border-b border-solid border-surface-4 pb-6">
 		<div class="flex items-center justify-between gap-4">
 			<div>
 				<h2 id="sync-features-across-devices-label" class="m-0 text-lg font-semibold text-contrast">
@@ -274,7 +296,11 @@ onBeforeUnmount(() => {
 						{{ formatMessage(messages.showWorldsTabTitle) }}
 					</h3>
 				</div>
-				<Toggle id="show-worlds-tab-in-instances" v-model="current.showWorldsTab" />
+				<Toggle
+					id="show-worlds-tab-in-instances"
+					v-model="current.showWorldsTab"
+					:aria-label="formatMessage(messages.showWorldsTabTitle)"
+				/>
 			</div>
 
 			<div class="flex items-center justify-between gap-4">
@@ -283,7 +309,11 @@ onBeforeUnmount(() => {
 						{{ formatMessage(messages.showFilesTabTitle) }}
 					</h3>
 				</div>
-				<Toggle id="show-files-tab-in-instances" v-model="current.showFilesTab" />
+				<Toggle
+					id="show-files-tab-in-instances"
+					v-model="current.showFilesTab"
+					:aria-label="formatMessage(messages.showFilesTabTitle)"
+				/>
 			</div>
 
 			<div class="flex items-center justify-between gap-4">
@@ -292,12 +322,16 @@ onBeforeUnmount(() => {
 						{{ formatMessage(messages.showScreenshotsTabTitle) }}
 					</h3>
 				</div>
-				<Toggle id="show-screenshots-tab-in-instances" v-model="current.showScreenshotsTab" />
+				<Toggle
+					id="show-screenshots-tab-in-instances"
+					v-model="current.showScreenshotsTab"
+					:aria-label="formatMessage(messages.showScreenshotsTabTitle)"
+				/>
 			</div>
 		</div>
 	</section>
 
-	<section class="mt-8 border-0 border-t border-solid border-divider pt-6">
+	<section class="mt-8 border-0 border-t border-solid border-surface-4 pt-6">
 		<h2 class="m-0 text-xl font-semibold text-contrast">
 			{{ formatMessage(messages.sidebarTitle) }}
 		</h2>
@@ -311,7 +345,11 @@ onBeforeUnmount(() => {
 						{{ formatMessage(messages.showAllScreenshotsDescription) }}
 					</p>
 				</div>
-				<Toggle id="show-all-screenshots" v-model="current.showAllScreenshots" />
+				<Toggle
+					id="show-all-screenshots"
+					v-model="current.showAllScreenshots"
+					:aria-label="formatMessage(messages.showAllScreenshotsTitle)"
+				/>
 			</div>
 
 			<div class="flex items-center justify-between gap-4">
@@ -321,7 +359,11 @@ onBeforeUnmount(() => {
 					</h3>
 					<p class="m-0 mt-1">{{ formatMessage(messages.showSkinSelectorDescription) }}</p>
 				</div>
-				<Toggle id="show-skin-selector-in-sidebar" v-model="current.showSkinSelector" />
+				<Toggle
+					id="show-skin-selector-in-sidebar"
+					v-model="current.showSkinSelector"
+					:aria-label="formatMessage(messages.showSkinSelectorTitle)"
+				/>
 			</div>
 
 			<div class="flex flex-col gap-2.5">
@@ -331,6 +373,7 @@ onBeforeUnmount(() => {
 				<Slider
 					id="quick-instances-in-sidebar"
 					v-model="current.quickInstanceCount"
+					:aria-label="formatMessage(messages.quickInstancesTitle)"
 					:min="0"
 					:max="QUICK_INSTANCE_LIMIT_MAX"
 					:step="1"
@@ -342,7 +385,7 @@ onBeforeUnmount(() => {
 		</div>
 	</section>
 
-	<section class="mt-8 border-0 border-t border-solid border-divider pt-6">
+	<section class="mt-8 border-0 border-t border-solid border-surface-4 pt-6">
 		<h2 class="m-0 text-xl font-semibold text-contrast">
 			{{ formatMessage(messages.playPageTitle) }}
 		</h2>
@@ -353,7 +396,11 @@ onBeforeUnmount(() => {
 				</h3>
 				<p class="m-0 mt-1">{{ formatMessage(messages.showJumpInDescription) }}</p>
 			</div>
-			<Toggle id="show-jump-in-section" v-model="current.showJumpIn" />
+			<Toggle
+				id="show-jump-in-section"
+				v-model="current.showJumpIn"
+				:aria-label="formatMessage(messages.showJumpInTitle)"
+			/>
 		</div>
 	</section>
 </template>
diff --git a/apps/app-frontend/src/components/ui/settings/instances/InstancesSyncedSettings.vue b/apps/app-frontend/src/components/ui/settings/instances/InstancesSyncedSettings.vue
deleted file mode 100644
index a93da1627a..0000000000
--- a/apps/app-frontend/src/components/ui/settings/instances/InstancesSyncedSettings.vue
+++ /dev/null
@@ -1,1498 +0,0 @@
-<script setup lang="ts">
-import {
-	ClipboardCopyIcon,
-	EditIcon,
-	// FolderOpenIcon,
-	MoreVerticalIcon,
-	NoSignalIcon,
-	RefreshCwIcon,
-	SaveIcon,
-	SearchIcon,
-	SignalIcon,
-	TrashIcon,
-	XIcon,
-} from '@modrinth/assets'
-import {
-	Avatar,
-	Button,
-	type ButtonMenuOption,
-	commonMessages,
-	defineMessages,
-	FilterPills,
-	IconButton,
-	injectNotificationManager,
-	Input,
-	NewModal,
-	Slider,
-	Table,
-	type TableColumn,
-	TeleportOverflowMenu,
-	Toggle,
-	useVIntl,
-} from '@modrinth/ui'
-import { useMutation, useQuery, useQueryClient } from '@tanstack/vue-query'
-import type { Component } from 'vue'
-import { computed, nextTick, ref, shallowRef, watch } from 'vue'
-
-import GameSettingsModal from '@/components/ui/settings/instances/game-settings/GameSettingsModal.vue'
-import SyncedPacksModal from '@/components/ui/settings/instances/SyncedPacksModal.vue'
-import SyncSourceModal from '@/components/ui/settings/instances/SyncSourceModal.vue'
-import useMemorySlider from '@/composables/useMemorySlider'
-import {
-	get_command_history,
-	type GlobalSyncedOptions,
-	list as listInstances,
-	list_synced_servers,
-	// open_synced_options_folder,
-	remove_synced_server,
-	set_command_history,
-	set_global_synced_option,
-	type SyncedOption,
-	type SyncedServer,
-	update_synced_server,
-} from '@/helpers/instance'
-import { get, parseEnvVars, serializeEnvVars, set } from '@/helpers/settings.ts'
-import {
-	gameOptionsSyncSourcesQueryOptions,
-	globalSyncedOptionsQueryOptions,
-	initializedSyncedOptionsQueryOptions,
-	syncedOptionsKeys,
-} from '@/helpers/synced-options'
-import { syncedPackKeys, syncedPackQueryOptions } from '@/helpers/synced-packs'
-import { copyToClipboard } from '@/helpers/utils'
-import {
-	refreshServerData,
-	refreshServers,
-	type ServerData,
-	type ServerWorld,
-} from '@/helpers/worlds.ts'
-import { instanceKeys } from '@/pages/instance/query-options'
-
-const { handleError } = injectNotificationManager()
-const { formatMessage } = useVIntl()
-const queryClient = useQueryClient()
-
-const syncedPacksModal = ref<InstanceType<typeof SyncedPacksModal>>()
-
-const messages = defineMessages({
-	resourcePacks: {
-		id: 'app.settings.synced-options.resource-packs',
-		defaultMessage: 'Sync resource packs',
-	},
-	resourcePacksDescription: {
-		id: 'app.settings.synced-options.resource-packs.description',
-		defaultMessage: 'Use the same resource packs across your instances',
-	},
-	dataPacks: { id: 'app.settings.synced-options.data-packs', defaultMessage: 'Sync data packs' },
-	dataPacksDescription: {
-		id: 'app.settings.synced-options.data-packs.description',
-		defaultMessage: 'Use the same datapacks across your instances',
-	},
-	packsDisabled: {
-		id: 'app.settings.synced-options.packs.disabled',
-		defaultMessage: 'Enable syncing before editing shared packs.',
-	},
-	// syncedDescription: {
-	// 	id: 'app.settings.synced-options.description',
-	// 	defaultMessage:
-	// 		'Sync options and config across instances so you don’t have to set them up every time.',
-	// },
-	// syncedFolder: {
-	// 	id: 'app.settings.synced-options.folder',
-	// 	defaultMessage: 'Synced folder',
-	// },
-	gameSettings: {
-		id: 'app.settings.synced-options.game-settings',
-		defaultMessage: 'Sync game options',
-	},
-	gameSettingsDescription: {
-		id: 'app.settings.synced-options.game-settings.description',
-		defaultMessage: 'Use the same game options across your instances',
-	},
-	gameSettingsButton: {
-		id: 'app.settings.synced-options.game-settings.button',
-		defaultMessage: 'Edit game settings',
-	},
-	gameSettingsDisabledTooltip: {
-		id: 'app.settings.synced-options.game-settings.disabled-tooltip',
-		defaultMessage: 'Enable game settings sync before choosing individual settings.',
-	},
-	noGameOptionsToEdit: {
-		id: 'app.settings.synced-options.game-settings.no-options-to-edit',
-		defaultMessage: "You haven't got any options yet to edit",
-	},
-	multiplayerServers: {
-		id: 'app.settings.synced-options.multiplayer-servers',
-		defaultMessage: 'Sync multiplayer servers',
-	},
-	multiplayerServersDescription: {
-		id: 'app.settings.synced-options.multiplayer-servers.description',
-		defaultMessage: 'Use the same multiplayer servers across your instances.',
-	},
-	commandHistory: {
-		id: 'app.settings.synced-options.command-history',
-		defaultMessage: 'Sync command history',
-	},
-	commandHistoryDescription: {
-		id: 'app.settings.synced-options.command-history.description',
-		defaultMessage: 'Use the same command history across your instances.',
-	},
-	creativeHotbars: {
-		id: 'app.settings.synced-options.creative-hotbars',
-		defaultMessage: 'Sync saved creative hotbars',
-	},
-	creativeHotbarsDescription: {
-		id: 'app.settings.synced-options.creative-hotbars.description',
-		defaultMessage: 'Use the same saved creative hotbars across your instances.',
-	},
-	multiplayerServersSyncSourceDescription: {
-		id: 'app.settings.synced-options.choose-sync-source.multiplayer-servers-description',
-		defaultMessage: 'Pick the instance whose multiplayer servers become the shared copy.',
-	},
-	commandHistorySyncSourceDescription: {
-		id: 'app.settings.synced-options.choose-sync-source.command-history-description',
-		defaultMessage: 'Pick the instance whose command history becomes the shared copy.',
-	},
-	creativeHotbarsSyncSourceDescription: {
-		id: 'app.settings.synced-options.choose-sync-source.creative-hotbars-description',
-		defaultMessage: 'Pick the instance whose saved creative hotbars become the shared copy.',
-	},
-	gameSettingsSyncSourceDescription: {
-		id: 'app.settings.synced-options.choose-sync-source.game-settings-description',
-		defaultMessage: 'Choose which instance to copy game settings from.',
-	},
-	commandHistoryEditorTitle: {
-		id: 'app.settings.synced-options.command-history.editor-title',
-		defaultMessage: 'Edit command history',
-	},
-	serverEditorTitle: {
-		id: 'app.settings.synced-options.multiplayer-servers.editor-title',
-		defaultMessage: 'Edit synced servers',
-	},
-	editServerTitle: {
-		id: 'instance.edit-server.title',
-		defaultMessage: 'Edit server',
-	},
-	serverName: {
-		id: 'app.settings.synced-options.multiplayer-servers.name',
-		defaultMessage: 'Server name',
-	},
-	serverAddress: {
-		id: 'app.settings.synced-options.multiplayer-servers.address',
-		defaultMessage: 'Server address',
-	},
-	searchServers: {
-		id: 'app.settings.synced-options.multiplayer-servers.search',
-		defaultMessage:
-			'Search {count, number} {count, plural, one {synced server} other {synced servers}}...',
-	},
-	serverStatus: {
-		id: 'app.settings.synced-options.multiplayer-servers.status',
-		defaultMessage: 'Status',
-	},
-	onlineFilter: {
-		id: 'app.settings.synced-options.multiplayer-servers.filter-online',
-		defaultMessage: 'Online',
-	},
-	offlineFilter: {
-		id: 'app.settings.synced-options.multiplayer-servers.filter-offline',
-		defaultMessage: 'Offline',
-	},
-	playersOnline: {
-		id: 'app.settings.synced-options.multiplayer-servers.players-online',
-		defaultMessage: '{count, number} online',
-	},
-	noMatchingServers: {
-		id: 'app.settings.synced-options.multiplayer-servers.no-results',
-		defaultMessage: 'No synced servers match your search or filters.',
-	},
-	serverCount: {
-		id: 'app.settings.synced-options.multiplayer-servers.count',
-		defaultMessage: '{count, plural, one {# server} other {# servers}}',
-	},
-	moreServerOptions: {
-		id: 'app.settings.synced-options.multiplayer-servers.more-options',
-		defaultMessage: 'More server options',
-	},
-	copyServerAddress: {
-		id: 'app.settings.synced-options.multiplayer-servers.copy-address',
-		defaultMessage: 'Copy address',
-	},
-	noSyncedServers: {
-		id: 'app.settings.synced-options.multiplayer-servers.empty',
-		defaultMessage: 'No user-added servers are currently synced.',
-	},
-	noServersSyncedYet: {
-		id: 'app.settings.synced-options.multiplayer-servers.none-synced-yet',
-		defaultMessage: "You haven't synced any servers yet",
-	},
-	noResourcePacksSyncedYet: {
-		id: 'app.settings.synced-options.resource-packs.none-synced-yet',
-		defaultMessage: "You haven't synced any resource packs yet",
-	},
-	noDataPacksSyncedYet: {
-		id: 'app.settings.synced-options.data-packs.none-synced-yet',
-		defaultMessage: "You haven't synced any data packs yet",
-	},
-	noInstancesToEdit: {
-		id: 'app.settings.synced-options.edit.no-instances',
-		defaultMessage: 'Add an instance before editing synced data.',
-	},
-	noSyncedDataToEdit: {
-		id: 'app.settings.synced-options.edit.no-synced-data',
-		defaultMessage: 'Choose a sync source before editing this setting.',
-	},
-	windowSectionTitle: {
-		id: 'app.settings.default-instance-options.window.title',
-		defaultMessage: 'Window',
-	},
-	javaAndMemorySectionTitle: {
-		id: 'app.settings.default-instance-options.java-and-memory.title',
-		defaultMessage: 'Java and memory',
-	},
-	launchHooksSectionTitle: {
-		id: 'app.settings.default-instance-options.launch-hooks.title',
-		defaultMessage: 'Launch hooks',
-	},
-	fullscreenTitle: {
-		id: 'app.settings.default-instance-options.fullscreen.title',
-		defaultMessage: 'Fullscreen',
-	},
-	fullscreenDescription: {
-		id: 'app.settings.default-instance-options.fullscreen.description',
-		defaultMessage: 'Start instances in fullscreen by updating their options.txt file.',
-	},
-	widthTitle: {
-		id: 'app.settings.default-instance-options.width.title',
-		defaultMessage: 'Width',
-	},
-	widthDescription: {
-		id: 'app.settings.default-instance-options.width.description',
-		defaultMessage: 'The width of the game window when launched.',
-	},
-	widthPlaceholder: {
-		id: 'app.settings.default-instance-options.width.placeholder',
-		defaultMessage: 'Enter width...',
-	},
-	heightTitle: {
-		id: 'app.settings.default-instance-options.height.title',
-		defaultMessage: 'Height',
-	},
-	heightDescription: {
-		id: 'app.settings.default-instance-options.height.description',
-		defaultMessage: 'The height of the game window when launched.',
-	},
-	heightPlaceholder: {
-		id: 'app.settings.default-instance-options.height.placeholder',
-		defaultMessage: 'Enter height...',
-	},
-	memoryAllocationTitle: {
-		id: 'app.settings.default-instance-options.memory-allocation.title',
-		defaultMessage: 'Memory allocation',
-	},
-	memoryAllocationDescription: {
-		id: 'app.settings.default-instance-options.memory-allocation.description',
-		defaultMessage: 'Maximum memory available to each instance.',
-	},
-	javaArgumentsTitle: {
-		id: 'app.settings.default-instance-options.java-arguments.title',
-		defaultMessage: 'Java arguments',
-	},
-	javaArgumentsPlaceholder: {
-		id: 'app.settings.default-instance-options.java-arguments.placeholder',
-		defaultMessage: 'Enter Java arguments...',
-	},
-	javaArgumentsDescription: {
-		id: 'app.settings.default-instance-options.java-arguments.description',
-		defaultMessage: 'Arguments passed to Java when launching an instance.',
-	},
-	environmentVariablesTitle: {
-		id: 'app.settings.default-instance-options.environment-variables.title',
-		defaultMessage: 'Environment variables',
-	},
-	environmentVariablesPlaceholder: {
-		id: 'app.settings.default-instance-options.environment-variables.placeholder',
-		defaultMessage: 'Enter environment variables...',
-	},
-	environmentVariablesDescription: {
-		id: 'app.settings.default-instance-options.environment-variables.description',
-		defaultMessage: 'Environment variables set when launching an instance.',
-	},
-	preLaunchHookTitle: {
-		id: 'app.settings.default-instance-options.pre-launch-hook.title',
-		defaultMessage: 'Pre-launch hook',
-	},
-	preLaunchHookPlaceholder: {
-		id: 'app.settings.default-instance-options.pre-launch-hook.placeholder',
-		defaultMessage: 'Enter pre-launch command...',
-	},
-	preLaunchHookDescription: {
-		id: 'app.settings.default-instance-options.pre-launch-hook.description',
-		defaultMessage: 'Runs before the instance starts.',
-	},
-	wrapperHookTitle: {
-		id: 'app.settings.default-instance-options.wrapper-hook.title',
-		defaultMessage: 'Wrapper hook',
-	},
-	wrapperHookPlaceholder: {
-		id: 'app.settings.default-instance-options.wrapper-hook.placeholder',
-		defaultMessage: 'Enter wrapper command...',
-	},
-	wrapperHookDescription: {
-		id: 'app.settings.default-instance-options.wrapper-hook.description',
-		defaultMessage: 'Command used to wrap the Minecraft launch process.',
-	},
-	postExitHookTitle: {
-		id: 'app.settings.default-instance-options.post-exit-hook.title',
-		defaultMessage: 'Post-exit hook',
-	},
-	postExitHookPlaceholder: {
-		id: 'app.settings.default-instance-options.post-exit-hook.placeholder',
-		defaultMessage: 'Enter post-exit command...',
-	},
-	postExitHookDescription: {
-		id: 'app.settings.default-instance-options.post-exit-hook.description',
-		defaultMessage: 'Runs after the game closes.',
-	},
-	hookVariablesDescription: {
-		id: 'instance.settings.tabs.hooks.variables.description',
-		defaultMessage:
-			'Hooks run in the working directory of the instance, with the following variables:',
-	},
-	instanceNameDescription: {
-		id: 'instance.settings.tabs.hooks.variables.inst-name.description',
-		defaultMessage: '$INST_NAME: The name of the instance',
-	},
-	instanceIdDescription: {
-		id: 'instance.settings.tabs.hooks.variables.inst-id.description',
-		defaultMessage: "$INST_ID: The name of the instance's folder",
-	},
-	instanceDirDescription: {
-		id: 'instance.settings.tabs.hooks.variables.inst-dir.description',
-		defaultMessage: "$INST_DIR: The absolute path to the instance's folder",
-	},
-	instanceMcDirDescription: {
-		id: 'instance.settings.tabs.hooks.variables.inst-mc-dir.description',
-		defaultMessage: '$INST_MC_DIR: An alias for $INST_DIR',
-	},
-	instanceJavaDescription: {
-		id: 'instance.settings.tabs.hooks.variables.inst-java.description',
-		defaultMessage: '$INST_JAVA: The absolute path to the java binary',
-	},
-	instanceJavaArgsDescription: {
-		id: 'instance.settings.tabs.hooks.variables.inst-java-args.description',
-		defaultMessage: '$INST_JAVA_ARGS: The JVM Arguments provided to the game',
-	},
-})
-
-const globalRows: Array<{
-	option: SyncedOption
-	title: keyof typeof messages
-	description?: keyof typeof messages
-	editable?: 'game-settings' | 'servers' | 'commands' | 'resourcepack' | 'datapack'
-}> = [
-	{
-		option: 'game_options',
-		title: 'gameSettings',
-		description: 'gameSettingsDescription',
-		editable: 'game-settings',
-	},
-	{
-		option: 'multiplayer_servers',
-		title: 'multiplayerServers',
-		description: 'multiplayerServersDescription',
-		editable: 'servers',
-	},
-	{
-		option: 'resource_packs',
-		title: 'resourcePacks',
-		description: 'resourcePacksDescription',
-		editable: 'resourcepack',
-	},
-	{
-		option: 'data_packs',
-		title: 'dataPacks',
-		description: 'dataPacksDescription',
-		editable: 'datapack',
-	},
-	{
-		option: 'command_history',
-		title: 'commandHistory',
-		description: 'commandHistoryDescription',
-		editable: 'commands',
-	},
-	{
-		option: 'creative_hotbars',
-		title: 'creativeHotbars',
-		description: 'creativeHotbarsDescription',
-	},
-]
-
-const globalSyncedOptionsQueryKey = syncedOptionsKeys.global
-const initializedSyncedOptionsQueryKey = syncedOptionsKeys.initialized
-const gameOptionsSyncSourcesQueryKey = syncedOptionsKeys.gameSources
-const globalSyncedOptionsMutationKey = syncedOptionsKeys.set
-const defaultGlobalOptions: GlobalSyncedOptions = {
-	resource_packs: false,
-	data_packs: false,
-	game_options: false,
-	command_history: false,
-	multiplayer_servers: false,
-	creative_hotbars: false,
-	screenshots: false,
-}
-
-const globalOptionsQuery = useQuery(globalSyncedOptionsQueryOptions())
-const initializedOptionsQuery = useQuery(initializedSyncedOptionsQueryOptions())
-const gameOptionSourcesQuery = useQuery(gameOptionsSyncSourcesQueryOptions())
-const resourcePacksQuery = useQuery(syncedPackQueryOptions('resourcepack'))
-const dataPacksQuery = useQuery(syncedPackQueryOptions('datapack'))
-const globalOptions = computed(() => globalOptionsQuery.data.value ?? defaultGlobalOptions)
-const initializedOptions = computed(
-	() => initializedOptionsQuery.data.value ?? defaultGlobalOptions,
-)
-const gameOptionSources = computed(() => gameOptionSourcesQuery.data.value ?? [])
-const instances = ref(await listInstances().catch(() => []))
-const eligibleGameOptionSourceIds = computed(
-	() =>
-		new Set(
-			gameOptionSources.value.filter((source) => source.eligible).map((source) => source.source_id),
-		),
-)
-const hasGameOptionsToEdit = computed(
-	() =>
-		initializedOptions.value.game_options ||
-		instances.value.some(
-			(instance) =>
-				instance.synced_options.game_options && eligibleGameOptionSourceIds.value.has(instance.id),
-		),
-)
-const baseOption = ref<SyncedOption | null>(null)
-const baseInstanceId = ref(instances.value[0]?.id ?? '')
-const baseModal = ref<InstanceType<typeof SyncSourceModal> | null>(null)
-const gameSettingsModal = ref<InstanceType<typeof GameSettingsModal> | null>(null)
-const commandHistoryModal = ref<InstanceType<typeof NewModal> | null>(null)
-const serverEditorModal = ref<InstanceType<typeof NewModal> | null>(null)
-const editServerModal = ref<InstanceType<typeof NewModal> | null>(null)
-const commandHistory = ref('')
-const syncedServers = ref<SyncedServer[]>(
-	(await list_synced_servers().catch((error) => {
-		handleError(error)
-		return []
-	})) ?? [],
-)
-const editedServer = ref<SyncedServer | null>(null)
-const serverData = ref<Record<string, ServerData>>({})
-const serverSearch = ref('')
-const selectedServerFilters = ref<string[]>([])
-const refreshingAllSyncedServers = ref(false)
-const editorComponent = shallowRef<Component | null>(null)
-const baseSourcesLoading = ref(false)
-let baseSourceGeneration = 0
-
-type BaseSourceCandidate = {
-	id: string
-	name: string
-	icon_path?: string | null
-	eligible: boolean
-}
-
-const syncedServerCards = computed(() =>
-	syncedServers.value.map((server, index) => ({
-		server,
-		world: {
-			name: server.name,
-			type: 'server',
-			index,
-			server_id: server.id,
-			address: server.address,
-			pack_status:
-				server.accept_textures === true
-					? 'enabled'
-					: server.accept_textures === false
-						? 'disabled'
-						: 'prompt',
-			display_status: 'normal',
-		} satisfies ServerWorld,
-	})),
-)
-
-type SyncedServerTableColumn = 'server' | 'status' | 'version' | 'actions'
-type SyncedServerTableRow = SyncedServer &
-	Record<SyncedServerTableColumn, unknown> & {
-		server: string
-		status: 'online' | 'offline'
-		version: string
-	}
-
-const syncedServerColumns = computed<TableColumn<SyncedServerTableColumn>[]>(() => [
-	{
-		key: 'server',
-		label: formatMessage(commonMessages.serverLabel),
-		width: '45%',
-		cellClass: '!h-16',
-	},
-	{
-		key: 'status',
-		label: formatMessage(messages.serverStatus),
-		width: '25%',
-		cellClass: '!h-16',
-	},
-	{
-		key: 'version',
-		label: formatMessage(commonMessages.versionLabel),
-		width: '22%',
-		cellClass: '!h-16',
-	},
-	{
-		key: 'actions',
-		label: formatMessage(commonMessages.actionsLabel),
-		align: 'right',
-		width: '6rem',
-		cellClass: '!h-16',
-	},
-])
-
-const syncedServerFilterOptions = computed(() => [
-	{ id: 'online', label: formatMessage(messages.onlineFilter) },
-	{ id: 'offline', label: formatMessage(messages.offlineFilter) },
-])
-
-const syncedServerRows = computed<SyncedServerTableRow[]>(() =>
-	syncedServers.value.map((server) => ({
-		...server,
-		server: server.name,
-		status: serverData.value[server.address]?.status ? 'online' : 'offline',
-		version: serverData.value[server.address]?.status?.version?.name ?? '',
-		actions: null,
-	})),
-)
-
-const statusFilteredSyncedServerRows = computed(() => {
-	if (selectedServerFilters.value.length === 0) return syncedServerRows.value
-	return syncedServerRows.value.filter((server) =>
-		selectedServerFilters.value.includes(server.status),
-	)
-})
-
-const filteredSyncedServerRows = computed(() => {
-	const search = serverSearch.value.trim().toLocaleLowerCase()
-	if (!search) return statusFilteredSyncedServerRows.value
-	return statusFilteredSyncedServerRows.value.filter(
-		(server) =>
-			server.name.toLocaleLowerCase().includes(search) ||
-			server.address.toLocaleLowerCase().includes(search),
-	)
-})
-
-const baseInstanceDescription = computed(() => {
-	switch (baseOption.value) {
-		case 'game_options':
-			return formatMessage(messages.gameSettingsSyncSourceDescription)
-		case 'multiplayer_servers':
-			return formatMessage(messages.multiplayerServersSyncSourceDescription)
-		case 'command_history':
-			return formatMessage(messages.commandHistorySyncSourceDescription)
-		case 'creative_hotbars':
-			return formatMessage(messages.creativeHotbarsSyncSourceDescription)
-		default:
-			return ''
-	}
-})
-
-const baseInstances = computed<BaseSourceCandidate[]>(() =>
-	baseOption.value === 'game_options'
-		? gameOptionSources.value.map((source) => ({
-				id: source.source_id,
-				name: source.name,
-				icon_path: source.icon_path,
-				eligible: source.eligible,
-			}))
-		: instances.value.map((instance) => ({
-				id: instance.id,
-				name: instance.name,
-				icon_path: instance.icon_path,
-				eligible: true,
-			})),
-)
-
-async function invalidateSyncedOptions() {
-	await Promise.all([
-		queryClient.invalidateQueries({ queryKey: instanceKeys.all }),
-		queryClient.invalidateQueries({ queryKey: ['instance-synced-options'] }),
-		queryClient.invalidateQueries({ queryKey: globalSyncedOptionsQueryKey }),
-		queryClient.invalidateQueries({ queryKey: initializedSyncedOptionsQueryKey }),
-		queryClient.invalidateQueries({ queryKey: syncedPackKeys.all }),
-	])
-}
-
-function emptySyncedContentMessage(row: (typeof globalRows)[number]) {
-	if (
-		row.editable === 'servers' &&
-		(instances.value.length === 0 || syncedServers.value.length === 0)
-	) {
-		return messages.noServersSyncedYet
-	}
-	if (row.editable === 'resourcepack' && !resourcePacksQuery.data.value?.length) {
-		return messages.noResourcePacksSyncedYet
-	}
-	if (row.editable === 'datapack' && !dataPacksQuery.data.value?.length) {
-		return messages.noDataPacksSyncedYet
-	}
-}
-
-function canEditGlobalOption(row: (typeof globalRows)[number]): boolean {
-	if (!row.editable || !globalOptions.value[row.option]) return false
-	if (emptySyncedContentMessage(row)) return false
-	if (row.editable === 'resourcepack' || row.editable === 'datapack') return true
-	if (row.editable === 'game-settings') return hasGameOptionsToEdit.value
-	return (
-		instances.value.length > 0 &&
-		initializedOptions.value[row.option] &&
-		(row.editable !== 'servers' || syncedServers.value.length > 0)
-	)
-}
-
-function editGlobalOptionTooltip(row: (typeof globalRows)[number]): string {
-	const emptyMessage = emptySyncedContentMessage(row)
-	if (emptyMessage) return formatMessage(emptyMessage)
-	if (row.editable === 'resourcepack' || row.editable === 'datapack') {
-		return formatMessage(
-			globalOptions.value[row.option] ? commonMessages.editButton : messages.packsDisabled,
-		)
-	}
-	if (row.editable === 'game-settings') {
-		if (!hasGameOptionsToEdit.value) return formatMessage(messages.noGameOptionsToEdit)
-		if (!globalOptions.value[row.option]) {
-			return formatMessage(messages.gameSettingsDisabledTooltip)
-		}
-		return formatMessage(messages.gameSettingsButton)
-	}
-	if (instances.value.length === 0) {
-		return formatMessage(messages.noInstancesToEdit)
-	}
-	if (!initializedOptions.value[row.option]) {
-		return formatMessage(messages.noSyncedDataToEdit)
-	}
-	return formatMessage(commonMessages.editButton)
-}
-
-type GlobalOptionMutationVariables = {
-	option: SyncedOption
-	enabled: boolean
-	baseInstanceId?: string
-}
-
-const globalOptionMutation = useMutation({
-	mutationKey: globalSyncedOptionsMutationKey,
-	mutationFn: ({ option, enabled, baseInstanceId }: GlobalOptionMutationVariables) =>
-		set_global_synced_option(option, enabled, baseInstanceId),
-	onMutate: async ({ option, enabled }) => {
-		await queryClient.cancelQueries({ queryKey: globalSyncedOptionsQueryKey })
-		const previous = globalOptions.value[option]
-
-		if (option !== 'game_options' || !enabled) {
-			queryClient.setQueryData<GlobalSyncedOptions>(globalSyncedOptionsQueryKey, (current) => ({
-				...(current ?? defaultGlobalOptions),
-				[option]: enabled,
-			}))
-		}
-
-		return { previous }
-	},
-	onError: (error, { option }, context) => {
-		queryClient.setQueryData<GlobalSyncedOptions>(globalSyncedOptionsQueryKey, (current) => ({
-			...(current ?? defaultGlobalOptions),
-			[option]: context?.previous ?? defaultGlobalOptions[option],
-		}))
-		handleError(error)
-	},
-	onSuccess: async (options, { option, enabled }) => {
-		queryClient.setQueryData(globalSyncedOptionsQueryKey, options)
-		if (option === 'game_options') {
-			await refreshSettings()
-		}
-		if (enabled && option === 'multiplayer_servers') {
-			syncedServers.value = await list_synced_servers().catch((error) => {
-				handleError(error)
-				return []
-			})
-		}
-	},
-	onSettled: async () => {
-		if (queryClient.isMutating({ mutationKey: globalSyncedOptionsMutationKey }) === 1) {
-			await invalidateSyncedOptions()
-		}
-	},
-})
-
-function applyGlobalOption(option: SyncedOption, enabled: boolean, baseInstanceId?: string) {
-	globalOptionMutation.mutate({ option, enabled, baseInstanceId })
-}
-
-async function chooseBaseInstance(option: SyncedOption) {
-	const generation = ++baseSourceGeneration
-	baseOption.value = option
-	baseSourcesLoading.value = option === 'game_options'
-
-	if (option === 'game_options') {
-		try {
-			const sources = await queryClient.fetchQuery(gameOptionsSyncSourcesQueryOptions())
-			if (generation !== baseSourceGeneration || baseOption.value !== option) return
-			const eligibleSources = sources.filter((source) => source.eligible)
-			baseInstanceId.value = eligibleSources[0]?.source_id ?? ''
-			if (eligibleSources.length === 1) {
-				applyGlobalOption(option, true, eligibleSources[0].source_id)
-				return
-			}
-		} catch (error) {
-			if (generation !== baseSourceGeneration || baseOption.value !== option) return
-			queryClient.setQueryData(gameOptionsSyncSourcesQueryKey, [])
-			baseInstanceId.value = ''
-			handleError(error)
-			return
-		} finally {
-			if (generation === baseSourceGeneration && baseOption.value === option) {
-				baseSourcesLoading.value = false
-			}
-		}
-		if (!baseInstanceId.value) {
-			applyGlobalOption(option, true)
-			return
-		}
-		baseModal.value?.show()
-		return
-	}
-
-	if (instances.value.length === 0) {
-		applyGlobalOption(option, true)
-		return
-	}
-	baseInstanceId.value = instances.value[0]?.id ?? ''
-	if (instances.value.length === 1) {
-		applyGlobalOption(option, true, baseInstanceId.value)
-		return
-	}
-	baseModal.value?.show()
-}
-
-function toggleGlobalOption(option: SyncedOption, enabled: boolean) {
-	if (
-		enabled &&
-		option !== 'screenshots' &&
-		option !== 'resource_packs' &&
-		option !== 'data_packs'
-	) {
-		void chooseBaseInstance(option)
-		return
-	}
-	applyGlobalOption(option, enabled)
-}
-
-async function confirmBaseInstance() {
-	if (!baseOption.value || !baseInstanceId.value) return
-	try {
-		await globalOptionMutation.mutateAsync({
-			option: baseOption.value,
-			enabled: true,
-			baseInstanceId: baseInstanceId.value,
-		})
-		await nextTick()
-		baseModal.value?.hide()
-	} catch {
-		return
-	}
-}
-
-function editGlobalOption(row: (typeof globalRows)[number]) {
-	if (row.editable === 'resourcepack' || row.editable === 'datapack') {
-		void syncedPacksModal.value?.show(row.editable)
-	} else if (row.editable === 'commands') {
-		void openCommandHistoryEditor()
-	} else {
-		void openServerEditor()
-	}
-}
-
-function openGameSettings() {
-	if (!hasGameOptionsToEdit.value) return
-	gameSettingsModal.value?.show()
-}
-
-async function openCommandHistoryEditor() {
-	commandHistory.value = await get_command_history().catch((error) => {
-		handleError(error)
-		return ''
-	})
-	if (!editorComponent.value) {
-		const [editor] = await Promise.all([
-			import('vue3-ace-editor'),
-			import('@modrinth/ui/src/utils/ace-theme'),
-			import('@modrinth/ui/src/utils/ace-mode-mcfunction'),
-		])
-		editorComponent.value = editor.VAceEditor
-	}
-	commandHistoryModal.value?.show()
-}
-
-async function saveCommandHistory() {
-	try {
-		commandHistory.value = await set_command_history(commandHistory.value)
-		commandHistoryModal.value?.hide()
-	} catch (error) {
-		handleError(error)
-	}
-}
-
-async function openServerEditor() {
-	syncedServers.value = await list_synced_servers().catch((error) => {
-		handleError(error)
-		return []
-	})
-	serverSearch.value = ''
-	selectedServerFilters.value = []
-	serverData.value = {}
-	serverEditorModal.value?.show()
-	await refreshAllSyncedServers()
-}
-
-function openSyncedServerEditor(server: SyncedServer) {
-	editedServer.value = { ...server }
-	editServerModal.value?.show()
-}
-
-async function saveSyncedServer() {
-	if (!editedServer.value) return
-	const server = editedServer.value
-
-	try {
-		await update_synced_server(server)
-		const index = syncedServers.value.findIndex(({ id }) => id === server.id)
-		if (index !== -1) {
-			syncedServers.value[index] = { ...server }
-		}
-		editServerModal.value?.hide()
-		serverData.value[server.address] = { refreshing: true }
-		await refreshServerData(serverData.value[server.address], null, server.address)
-		await queryClient.invalidateQueries({ queryKey: ['worlds'] })
-	} catch (error) {
-		handleError(error)
-	}
-}
-
-async function refreshSyncedServer(address: string) {
-	serverData.value[address] ??= { refreshing: true }
-	await refreshServerData(serverData.value[address], null, address)
-}
-
-async function refreshAllSyncedServers() {
-	if (refreshingAllSyncedServers.value) return
-	refreshingAllSyncedServers.value = true
-	try {
-		await refreshServers(
-			syncedServerCards.value.map(({ world }) => world),
-			serverData.value,
-			null,
-		)
-	} finally {
-		refreshingAllSyncedServers.value = false
-	}
-}
-
-function syncedServerMenuOptions(server: SyncedServer): ButtonMenuOption[] {
-	return [
-		{
-			id: 'refresh',
-			label: formatMessage(commonMessages.refreshButton),
-			icon: RefreshCwIcon,
-			action: () => void refreshSyncedServer(server.address),
-		},
-		{
-			id: 'copy-address',
-			label: formatMessage(messages.copyServerAddress),
-			icon: ClipboardCopyIcon,
-			action: () => copyToClipboard(server.address),
-		},
-		{
-			id: 'edit',
-			label: formatMessage(commonMessages.editButton),
-			icon: EditIcon,
-			action: () => openSyncedServerEditor(server),
-		},
-		{ type: 'divider' },
-		{
-			id: 'remove',
-			label: formatMessage(commonMessages.removeButton),
-			icon: TrashIcon,
-			tone: 'red',
-			action: () => void removeSyncedServer(server.id),
-		},
-	]
-}
-
-async function removeSyncedServer(serverId: string) {
-	try {
-		await remove_synced_server(serverId)
-		syncedServers.value = syncedServers.value.filter((server) => server.id !== serverId)
-		await queryClient.invalidateQueries({ queryKey: ['worlds'] })
-	} catch (error) {
-		handleError(error)
-	}
-}
-
-function addEditableSettingsFields(fetchSettings: Awaited<ReturnType<typeof get>>) {
-	return Object.assign(fetchSettings, {
-		launchArgs: fetchSettings.extra_launch_args.join(' '),
-		envVars: serializeEnvVars(fetchSettings.custom_env_vars),
-	})
-}
-
-const settings = ref(addEditableSettingsFields(await get()))
-let applyingFetchedSettings = false
-
-async function refreshSettings() {
-	try {
-		const refreshedSettings = addEditableSettingsFields(await get())
-		applyingFetchedSettings = true
-		settings.value = refreshedSettings
-		await nextTick()
-	} catch (error) {
-		handleError(error)
-	} finally {
-		applyingFetchedSettings = false
-	}
-}
-
-async function handleGameSettingsSaved() {
-	await Promise.all([invalidateSyncedOptions(), refreshSettings()])
-}
-
-const { maxMemory, snapPoints } = (await useMemorySlider().catch(handleError)) as unknown as {
-	maxMemory: number
-	snapPoints: number[]
-}
-
-watch(
-	settings,
-	async () => {
-		if (applyingFetchedSettings) return
-		const setSettings = JSON.parse(JSON.stringify(settings.value))
-
-		setSettings.extra_launch_args = setSettings.launchArgs.trim().split(/\s+/).filter(Boolean)
-		setSettings.custom_env_vars = parseEnvVars(setSettings.envVars)
-		delete setSettings.launchArgs
-		delete setSettings.envVars
-
-		if (!setSettings.custom_dir) {
-			setSettings.custom_dir = null
-		}
-
-		await set(setSettings).catch(handleError)
-	},
-	{ deep: true },
-)
-</script>
-
-<template>
-	<SyncedPacksModal ref="syncedPacksModal" />
-	<div>
-		<GameSettingsModal ref="gameSettingsModal" @saved="handleGameSettingsSaved" />
-
-		<SyncSourceModal
-			ref="baseModal"
-			v-model="baseInstanceId"
-			:description="baseInstanceDescription"
-			:sources="baseInstances"
-			:loading="baseSourcesLoading"
-			:pending="globalOptionMutation.isPending.value"
-			@confirm="confirmBaseInstance"
-		/>
-
-		<NewModal
-			ref="commandHistoryModal"
-			:header="formatMessage(messages.commandHistoryEditorTitle)"
-			no-padding
-			actions-divider
-			max-width="700px"
-			width="700px"
-		>
-			<component
-				:is="editorComponent"
-				v-if="editorComponent"
-				v-model:value="commandHistory"
-				lang="mcfunction"
-				theme="modrinth"
-				:print-margin="false"
-				class="command-history-editor ace-modrinth"
-				style="height: 420px; font-size: 0.875rem"
-			/>
-			<template #actions>
-				<div class="flex justify-end gap-2">
-					<Button type="outlined" @click="commandHistoryModal?.hide()">
-						<XIcon />
-						{{ formatMessage(commonMessages.cancelButton) }}
-					</Button>
-					<Button type="colored" color="brand" @click="saveCommandHistory">
-						<SaveIcon />
-						{{ formatMessage(commonMessages.saveButton) }}
-					</Button>
-				</div>
-			</template>
-		</NewModal>
-
-		<NewModal
-			ref="serverEditorModal"
-			no-padding
-			:max-width="'min(928px, calc(95vw - 10rem))'"
-			:width="'min(928px, calc(95vw - 10rem))'"
-		>
-			<template #title>
-				<span class="text-lg font-extrabold text-contrast">
-					{{ formatMessage(messages.serverEditorTitle) }}
-				</span>
-			</template>
-			<div class="flex h-[min(600px,calc(95vh-10rem))] flex-col">
-				<div
-					class="flex shrink-0 flex-col gap-4 border-0 border-b border-solid border-surface-4 px-6 py-4"
-				>
-					<Input
-						v-model="serverSearch"
-						:icon="SearchIcon"
-						type="search"
-						autocomplete="off"
-						:spellcheck="false"
-						:placeholder="formatMessage(messages.searchServers, { count: syncedServers.length })"
-						input-class="!h-10"
-						clearable
-					/>
-
-					<div class="flex flex-wrap items-center justify-between gap-3">
-						<FilterPills v-model="selectedServerFilters" :options="syncedServerFilterOptions">
-							<template #all>
-								{{ formatMessage(commonMessages.allProjectType) }}
-							</template>
-						</FilterPills>
-						<Button
-							type="quiet"
-							:disabled="refreshingAllSyncedServers || syncedServers.length === 0"
-							class="hover:!bg-transparent focus-visible:!bg-transparent"
-							@click="refreshAllSyncedServers"
-						>
-							<RefreshCwIcon :class="{ 'animate-spin': refreshingAllSyncedServers }" />
-							{{ formatMessage(commonMessages.refreshButton) }}
-						</Button>
-					</div>
-				</div>
-
-				<div class="flex min-h-0 flex-1 flex-col overflow-hidden">
-					<div
-						v-if="syncedServers.length === 0"
-						class="flex flex-1 items-center justify-center p-8 text-center text-secondary"
-					>
-						{{ formatMessage(messages.noSyncedServers) }}
-					</div>
-					<div
-						v-else-if="filteredSyncedServerRows.length === 0"
-						class="flex flex-1 items-center justify-center p-8 text-center text-secondary"
-					>
-						{{ formatMessage(messages.noMatchingServers) }}
-					</div>
-					<div v-else class="min-h-0 flex-1 overflow-y-auto">
-						<Table
-							:columns="syncedServerColumns"
-							:data="filteredSyncedServerRows"
-							row-key="id"
-							table-min-width="44rem"
-							class="!rounded-none !border-0"
-						>
-							<template #cell-server="{ row }">
-								<div class="flex min-w-0 items-center gap-3">
-									<Avatar
-										:src="serverData[row.address]?.status?.favicon"
-										:alt="row.name"
-										:tint-by="row.address"
-										size="32px"
-										no-shadow
-										class="shrink-0 !rounded-lg"
-									/>
-									<div class="flex min-w-0 flex-col">
-										<span class="truncate font-semibold text-contrast">{{ row.name }}</span>
-										<span class="truncate text-sm text-secondary">{{ row.address }}</span>
-									</div>
-								</div>
-							</template>
-							<template #cell-status="{ row }">
-								<span class="inline-flex items-center gap-1.5 font-medium">
-									<RefreshCwIcon
-										v-if="serverData[row.address]?.refreshing"
-										class="size-4 shrink-0 animate-spin"
-										aria-hidden="true"
-									/>
-									<SignalIcon
-										v-else-if="serverData[row.address]?.status"
-										class="size-4 shrink-0 text-green"
-										aria-hidden="true"
-									/>
-									<NoSignalIcon v-else class="size-4 shrink-0" aria-hidden="true" />
-									<template v-if="serverData[row.address]?.refreshing">
-										{{ formatMessage(commonMessages.loadingLabel) }}
-									</template>
-									<template v-else-if="serverData[row.address]?.status">
-										{{
-											formatMessage(messages.playersOnline, {
-												count: serverData[row.address]?.status?.players?.online ?? 0,
-											})
-										}}
-									</template>
-									<template v-else>{{ formatMessage(messages.offlineFilter) }}</template>
-								</span>
-							</template>
-							<template #cell-version="{ row }">
-								<span class="block truncate">{{ row.version || '—' }}</span>
-							</template>
-							<template #cell-actions="{ row }">
-								<div class="flex justify-end">
-									<TeleportOverflowMenu
-										type="quiet"
-										:label="formatMessage(messages.moreServerOptions)"
-										:options="syncedServerMenuOptions(row)"
-									>
-										<MoreVerticalIcon aria-hidden="true" />
-									</TeleportOverflowMenu>
-								</div>
-							</template>
-						</Table>
-					</div>
-				</div>
-
-				<div
-					class="flex shrink-0 items-center border-0 border-t border-solid border-surface-4 px-6 py-4"
-				>
-					<span class="font-medium text-primary">
-						{{ formatMessage(messages.serverCount, { count: syncedServers.length }) }}
-					</span>
-				</div>
-			</div>
-		</NewModal>
-
-		<NewModal
-			ref="editServerModal"
-			:header="formatMessage(messages.editServerTitle)"
-			max-width="500px"
-			width="500px"
-		>
-			<div v-if="editedServer" class="flex flex-col gap-4">
-				<label class="flex flex-col gap-2 font-semibold text-contrast">
-					{{ formatMessage(messages.serverName) }}
-					<Input v-model="editedServer.name" autocomplete="off" wrapper-class="w-full" />
-				</label>
-				<label class="flex flex-col gap-2 font-semibold text-contrast">
-					{{ formatMessage(messages.serverAddress) }}
-					<Input v-model="editedServer.address" autocomplete="off" wrapper-class="w-full" />
-				</label>
-			</div>
-			<template #actions>
-				<div class="flex justify-end gap-2">
-					<Button type="outlined" @click="editServerModal?.hide()">
-						<XIcon />
-						{{ formatMessage(commonMessages.cancelButton) }}
-					</Button>
-					<Button
-						type="colored"
-						color="brand"
-						:disabled="!editedServer?.address"
-						@click="saveSyncedServer"
-					>
-						<SaveIcon />
-						{{ formatMessage(commonMessages.saveChangesButton) }}
-					</Button>
-				</div>
-			</template>
-		</NewModal>
-
-		<section class="border-0 border-b border-solid border-divider pb-6">
-			<div class="flex flex-col gap-6">
-				<!--
-				<div class="flex items-center justify-between gap-4">
-					<p class="m-0 text-secondary">{{ formatMessage(messages.syncedDescription) }}</p>
-					<Button @click="open_synced_options_folder().catch(handleError)">
-						<FolderOpenIcon />
-						{{ formatMessage(messages.syncedFolder) }}
-					</Button>
-				</div>
-				-->
-
-				<div class="flex flex-col gap-4">
-					<div
-						v-for="row in globalRows"
-						:key="row.option"
-						class="flex items-center justify-between gap-6"
-					>
-						<div class="flex min-w-0 flex-col gap-1">
-							<h2 class="m-0 text-lg font-semibold text-contrast">
-								{{ formatMessage(messages[row.title]) }}
-							</h2>
-							<p v-if="row.description" class="m-0 text-secondary">
-								{{ formatMessage(messages[row.description]) }}
-							</p>
-						</div>
-						<div class="flex shrink-0 items-center gap-2">
-							<span
-								v-if="row.editable === 'game-settings'"
-								v-tooltip="editGlobalOptionTooltip(row)"
-								class="flex"
-							>
-								<IconButton
-									type="outlined"
-									circular
-									:disabled="
-										!canEditGlobalOption(row) ||
-										initializedOptionsQuery.isPending.value ||
-										globalOptionMutation.isPending.value
-									"
-									:label="formatMessage(messages.gameSettingsButton)"
-									@click="openGameSettings"
-								>
-									<EditIcon />
-								</IconButton>
-							</span>
-							<span v-else-if="row.editable" v-tooltip="editGlobalOptionTooltip(row)" class="flex">
-								<IconButton
-									type="outlined"
-									circular
-									:disabled="
-										!canEditGlobalOption(row) ||
-										initializedOptionsQuery.isPending.value ||
-										globalOptionMutation.isPending.value
-									"
-									:label="formatMessage(commonMessages.editButton)"
-									@click="editGlobalOption(row)"
-								>
-									<EditIcon />
-								</IconButton>
-							</span>
-							<Toggle
-								:id="`global-sync-${row.option}`"
-								:model-value="globalOptions[row.option]"
-								:disabled="globalOptionMutation.isPending.value"
-								@update:model-value="(enabled) => toggleGlobalOption(row.option, enabled)"
-							/>
-						</div>
-					</div>
-				</div>
-			</div>
-		</section>
-
-		<section class="mt-6">
-			<h2 class="m-0 text-xl font-semibold text-contrast">
-				{{ formatMessage(messages.windowSectionTitle) }}
-			</h2>
-			<div class="mt-4 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">
-							{{ formatMessage(messages.fullscreenTitle) }}
-						</h3>
-						<p class="m-0 leading-tight">
-							{{ formatMessage(messages.fullscreenDescription) }}
-						</p>
-					</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">
-							{{ formatMessage(messages.widthTitle) }}
-						</h3>
-						<p class="m-0 leading-tight">
-							{{ formatMessage(messages.widthDescription) }}
-						</p>
-					</div>
-
-					<Input
-						id="width"
-						v-model="settings.game_resolution[0]"
-						:disabled="settings.force_fullscreen"
-						autocomplete="off"
-						type="number"
-						:placeholder="formatMessage(messages.widthPlaceholder)"
-					/>
-				</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">
-							{{ formatMessage(messages.heightTitle) }}
-						</h3>
-						<p class="m-0 leading-tight">
-							{{ formatMessage(messages.heightDescription) }}
-						</p>
-					</div>
-
-					<Input
-						id="height"
-						v-model="settings.game_resolution[1]"
-						:disabled="settings.force_fullscreen"
-						autocomplete="off"
-						type="number"
-						:placeholder="formatMessage(messages.heightPlaceholder)"
-					/>
-				</div>
-			</div>
-		</section>
-
-		<section class="mt-8 border-0 border-t border-solid border-divider pt-6">
-			<h2 class="m-0 text-xl font-semibold text-contrast">
-				{{ formatMessage(messages.javaAndMemorySectionTitle) }}
-			</h2>
-			<div class="mt-4 flex flex-col gap-6">
-				<div class="flex flex-col gap-2.5">
-					<h3 class="m-0 text-lg font-semibold text-contrast">
-						{{ formatMessage(messages.memoryAllocationTitle) }}
-					</h3>
-					<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">
-						{{ formatMessage(messages.memoryAllocationDescription) }}
-					</p>
-				</div>
-
-				<div class="flex flex-col gap-2.5">
-					<h3 class="m-0 text-lg font-semibold text-contrast">
-						{{ formatMessage(messages.javaArgumentsTitle) }}
-					</h3>
-					<Input
-						id="java-args"
-						v-model="settings.launchArgs"
-						autocomplete="off"
-						type="text"
-						:placeholder="formatMessage(messages.javaArgumentsPlaceholder)"
-						wrapper-class="w-full"
-					/>
-					<p class="m-0 leading-tight">
-						{{ formatMessage(messages.javaArgumentsDescription) }}
-					</p>
-				</div>
-
-				<div class="flex flex-col gap-2.5">
-					<h3 class="m-0 text-lg font-semibold text-contrast">
-						{{ formatMessage(messages.environmentVariablesTitle) }}
-					</h3>
-					<Input
-						id="env-vars"
-						v-model="settings.envVars"
-						autocomplete="off"
-						type="text"
-						:placeholder="formatMessage(messages.environmentVariablesPlaceholder)"
-						wrapper-class="w-full"
-					/>
-					<p class="m-0 leading-tight">
-						{{ formatMessage(messages.environmentVariablesDescription) }}
-					</p>
-				</div>
-			</div>
-		</section>
-
-		<section class="mt-8 border-0 border-t border-solid border-divider pt-6">
-			<h2 class="m-0 text-xl font-semibold text-contrast">
-				{{ formatMessage(messages.launchHooksSectionTitle) }}
-			</h2>
-			<div class="mt-4 flex flex-col gap-6">
-				<div class="flex flex-col gap-2.5">
-					<h3 class="m-0 text-lg font-semibold text-contrast">
-						{{ formatMessage(messages.preLaunchHookTitle) }}
-					</h3>
-					<Input
-						id="pre-launch"
-						v-model="settings.hooks.pre_launch"
-						autocomplete="off"
-						type="text"
-						:placeholder="formatMessage(messages.preLaunchHookPlaceholder)"
-						wrapper-class="w-full"
-					/>
-					<p class="m-0 leading-tight">
-						{{ formatMessage(messages.preLaunchHookDescription) }}
-					</p>
-				</div>
-
-				<div class="flex flex-col gap-2.5">
-					<h3 class="m-0 text-lg font-semibold text-contrast">
-						{{ formatMessage(messages.wrapperHookTitle) }}
-					</h3>
-					<Input
-						id="wrapper"
-						v-model="settings.hooks.wrapper"
-						autocomplete="off"
-						type="text"
-						:placeholder="formatMessage(messages.wrapperHookPlaceholder)"
-						wrapper-class="w-full"
-					/>
-					<p class="m-0 leading-tight">
-						{{ formatMessage(messages.wrapperHookDescription) }}
-					</p>
-				</div>
-
-				<div class="flex flex-col gap-2.5">
-					<h3 class="m-0 text-lg font-semibold text-contrast">
-						{{ formatMessage(messages.postExitHookTitle) }}
-					</h3>
-					<Input
-						id="post-exit"
-						v-model="settings.hooks.post_exit"
-						autocomplete="off"
-						type="text"
-						:placeholder="formatMessage(messages.postExitHookPlaceholder)"
-						wrapper-class="w-full"
-					/>
-					<p class="m-0 leading-tight">
-						{{ formatMessage(messages.postExitHookDescription) }}
-					</p>
-				</div>
-
-				<div class="m-0 leading-tight">
-					{{ formatMessage(messages.hookVariablesDescription) }}
-					<ul>
-						<li>{{ formatMessage(messages.instanceNameDescription) }}</li>
-						<li>{{ formatMessage(messages.instanceIdDescription) }}</li>
-						<li>{{ formatMessage(messages.instanceDirDescription) }}</li>
-						<li>{{ formatMessage(messages.instanceMcDirDescription) }}</li>
-						<li>{{ formatMessage(messages.instanceJavaDescription) }}</li>
-						<li>{{ formatMessage(messages.instanceJavaArgsDescription) }}</li>
-					</ul>
-				</div>
-			</div>
-		</section>
-	</div>
-</template>
-
-<style>
-.command-history-editor.ace-modrinth {
-	background-color: var(--surface-2);
-}
-
-.command-history-editor.ace-modrinth .ace_gutter {
-	background: var(--surface-1);
-}
-
-.command-history-editor.ace-modrinth .ace_marker-layer .ace_active-line {
-	background: var(--surface-2-5);
-}
-
-.command-history-editor.ace-modrinth .ace_gutter-active-line {
-	background-color: var(--surface-1-5);
-}
-
-.command-history-editor.ace-modrinth.ace_multiselect .ace_selection.ace_start {
-	box-shadow: 0 0 3px 0 var(--surface-2);
-}
-</style>
diff --git a/apps/app-frontend/src/components/ui/settings/instances/SyncSourceModal.vue b/apps/app-frontend/src/components/ui/settings/instances/SyncSourceModal.vue
index dda4b06ffc..74f3ef92dd 100644
--- a/apps/app-frontend/src/components/ui/settings/instances/SyncSourceModal.vue
+++ b/apps/app-frontend/src/components/ui/settings/instances/SyncSourceModal.vue
@@ -83,7 +83,7 @@ function show() {
 }
 
 function hide() {
-	modal.value?.hide()
+	return modal.value?.hide()
 }
 
 defineExpose({ show, hide })
@@ -111,6 +111,7 @@ defineExpose({ show, hide })
 				type="search"
 				autocomplete="off"
 				:placeholder="formatMessage(messages.search)"
+				:aria-label="formatMessage(messages.search)"
 				class="shrink-0"
 			/>
 
@@ -159,7 +160,7 @@ defineExpose({ show, hide })
 		<template #actions>
 			<div class="flex justify-end gap-2 p-2">
 				<Button type="outlined" :disabled="pending" @click="hide">
-					<XIcon />
+					<XIcon aria-hidden="true" />
 					{{ formatMessage(commonMessages.cancelButton) }}
 				</Button>
 				<Button
@@ -169,8 +170,7 @@ defineExpose({ show, hide })
 					:loading="pending"
 					@click="canConfirm && emit('confirm')"
 				>
-					<SpinnerIcon v-if="pending" class="animate-spin" />
-					<RefreshCwIcon v-else />
+					<RefreshCwIcon :class="{ 'animate-spin': pending }" aria-hidden="true" />
 					{{ formatMessage(messages.sync) }}
 				</Button>
 			</div>
diff --git a/apps/app-frontend/src/components/ui/settings/instances/SyncedPacksModal.vue b/apps/app-frontend/src/components/ui/settings/instances/SyncedPacksModal.vue
index 5f9ec62b56..bec30070f6 100644
--- a/apps/app-frontend/src/components/ui/settings/instances/SyncedPacksModal.vue
+++ b/apps/app-frontend/src/components/ui/settings/instances/SyncedPacksModal.vue
@@ -16,6 +16,7 @@ import { computed, nextTick, ref, watch } from 'vue'
 import SyncedContentModal from '@/components/ui/instance/SyncedContentModal.vue'
 import { useAppEvent } from '@/composables/use-app-event'
 import {
+	isSyncedPackTypeAvailable,
 	remove_synced_pack,
 	set_synced_pack_enabled,
 	syncedPackKeys,
@@ -54,7 +55,7 @@ const title = computed(() =>
 const packsQuery = useQuery(
 	computed(() => ({
 		...syncedPackQueryOptions(projectType.value),
-		enabled: isOpen.value,
+		enabled: isOpen.value && isSyncedPackTypeAvailable(projectType.value),
 	})),
 )
 const mutation = useMutation({
@@ -81,11 +82,12 @@ useAppEvent('instance', (event) => {
 })
 
 async function show(type: SyncedPackType) {
+	if (!isSyncedPackTypeAvailable(type)) return
 	projectType.value = type
 	isOpen.value = true
 	await nextTick()
-	if (packsQuery.data.value) manager.value?.show(packsQuery.data.value)
-	else manager.value?.showLoading()
+	if (packsQuery.isPending.value) manager.value?.showLoading()
+	else manager.value?.show(packsQuery.data.value ?? [])
 }
 
 async function togglePacks(items: ContentItem[], enabled: boolean) {
@@ -98,6 +100,7 @@ async function togglePacks(items: ContentItem[], enabled: boolean) {
 }
 
 async function deletePack(item: ContentItem) {
+	if (mutation.isPending.value) return
 	if ((await confirmation.value?.confirmDelete([item])) !== 'all') return
 	mutation.mutate(() => remove_synced_pack(item.id))
 }
diff --git a/apps/app-frontend/src/components/ui/settings/instances/game-settings-modal/boolean-control.vue b/apps/app-frontend/src/components/ui/settings/instances/game-settings-modal/boolean-control.vue
new file mode 100644
index 0000000000..1dde7b1baf
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/settings/instances/game-settings-modal/boolean-control.vue
@@ -0,0 +1,38 @@
+<script setup lang="ts">
+import { Button, ButtonGroup } from '@modrinth/ui'
+
+defineProps<{
+	modelValue?: boolean
+	disabled?: boolean
+	label: string
+	onLabel: string
+	offLabel: string
+	placeholder?: string
+}>()
+
+const emit = defineEmits<{
+	'update:model-value': [value: boolean]
+}>()
+</script>
+
+<template>
+	<ButtonGroup v-tooltip="modelValue === undefined ? placeholder : undefined" :label="label">
+		<Button
+			type="outlined"
+			:color="modelValue === true ? 'green' : undefined"
+			:aria-pressed="modelValue === true"
+			:disabled="disabled"
+			@click="emit('update:model-value', true)"
+		>
+			{{ onLabel }}
+		</Button>
+		<Button
+			:type="modelValue === false ? 'base' : 'outlined'"
+			:aria-pressed="modelValue === false"
+			:disabled="disabled"
+			@click="emit('update:model-value', false)"
+		>
+			{{ offLabel }}
+		</Button>
+	</ButtonGroup>
+</template>
diff --git a/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-editors.ts b/apps/app-frontend/src/components/ui/settings/instances/game-settings-modal/editors.ts
similarity index 100%
rename from apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-editors.ts
rename to apps/app-frontend/src/components/ui/settings/instances/game-settings-modal/editors.ts
diff --git a/apps/app-frontend/src/components/ui/settings/instances/game-settings-modal/index.vue b/apps/app-frontend/src/components/ui/settings/instances/game-settings-modal/index.vue
new file mode 100644
index 0000000000..d83bb9f22c
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/settings/instances/game-settings-modal/index.vue
@@ -0,0 +1,429 @@
+<script setup lang="ts">
+import {
+	EyeIcon,
+	LanguagesIcon,
+	LinkIcon,
+	MessageIcon,
+	MonitorIcon,
+	RefreshCwIcon,
+	SaveIcon,
+	SearchIcon,
+	SettingsIcon,
+	ShirtIcon,
+	SpinnerIcon,
+	TagCategoryAudioIcon,
+	TagCategoryGamepad2Icon,
+	UnlinkIcon,
+	WrenchIcon,
+	XIcon,
+} from '@modrinth/assets'
+import {
+	Button,
+	commonMessages,
+	ConfirmLeaveModal,
+	defineMessages,
+	FloatingActionBar,
+	Input,
+	TabbedModal,
+	type TabbedModalTab,
+	useVIntl,
+} from '@modrinth/ui'
+import type { Component } from 'vue'
+import { computed, ref } from 'vue'
+
+import type { EditableGameSetting, GameSettingCategory } from '@/helpers/game-options'
+
+import { settingCanBeEnabled, settingSearchText } from './editors'
+import { minecraftKeybindConflictKey } from './keybinds'
+import {
+	formatGameSettingDescription,
+	formatGameSettingLabel,
+	gameSettingCategoryMessage,
+} from './messages'
+import GameSettingRow from './row.vue'
+import { useGameSettingsEditor } from './use-editor'
+
+const props = defineProps<{
+	instanceId?: string
+}>()
+
+const emit = defineEmits<{
+	saved: []
+}>()
+
+const { formatMessage } = useVIntl()
+
+const messages = defineMessages({
+	title: {
+		id: 'app.settings.synced-options.game-settings.title',
+		defaultMessage: 'Game settings',
+	},
+	syncTitle: {
+		id: 'app.settings.synced-options.game-settings.sync-title',
+		defaultMessage: 'Sync game settings',
+	},
+	syncedOptionsDescription: {
+		id: 'app.settings.synced-options.game-settings.sync-description',
+		defaultMessage:
+			'Synced options are applied to every instance and override the values included with a modpack.',
+	},
+	search: {
+		id: 'app.settings.synced-options.game-settings.search',
+		defaultMessage: 'Search settings...',
+	},
+	enableAll: {
+		id: 'app.settings.synced-options.game-settings.enable-all',
+		defaultMessage: 'Sync all',
+	},
+	disableAll: {
+		id: 'app.settings.synced-options.game-settings.disable-all',
+		defaultMessage: 'Unsync all',
+	},
+	customEmpty: {
+		id: 'app.settings.synced-options.game-settings.custom-empty',
+		defaultMessage:
+			'Settings added by mods will appear here after Modrinth finds them in one of your instances.',
+	},
+	empty: {
+		id: 'app.settings.synced-options.game-settings.empty',
+		defaultMessage: 'No settings match your search or filter.',
+	},
+	loading: {
+		id: 'app.settings.synced-options.game-settings.loading',
+		defaultMessage: 'Loading settings...',
+	},
+	loadFailed: {
+		id: 'app.settings.synced-options.game-settings.load-failed',
+		defaultMessage: 'We couldn’t load your game settings.',
+	},
+	retry: {
+		id: 'app.settings.synced-options.game-settings.retry',
+		defaultMessage: 'Retry',
+	},
+	saveSettings: {
+		id: 'app.settings.synced-options.game-settings.save',
+		defaultMessage: 'Save settings',
+	},
+	unsavedChanges: {
+		id: 'app.settings.synced-options.game-settings.unsaved-changes',
+		defaultMessage: 'You have unsaved changes.',
+	},
+})
+
+const modal = ref<InstanceType<typeof TabbedModal> | null>(null)
+const confirmLeaveModal = ref<InstanceType<typeof ConfirmLeaveModal> | null>(null)
+const activeCategoryId = ref('')
+const search = ref('')
+let allowClose = false
+
+const {
+	draftState,
+	isLocalEditor,
+	isDirty,
+	hasBlockingDraft,
+	loading,
+	loadError,
+	saving,
+	load: loadSettings,
+	reset: resetEditor,
+	cancelChanges,
+	setSyncEnabled,
+	setCanonicalValue,
+	save,
+} = useGameSettingsEditor(
+	() => props.instanceId,
+	() => emit('saved'),
+)
+
+const categoryIcons: Record<string, Component> = {
+	skin_customization: ShirtIcon,
+	video: MonitorIcon,
+	video_settings: MonitorIcon,
+	language: LanguagesIcon,
+	music_and_sound: TagCategoryAudioIcon,
+	controls: TagCategoryGamepad2Icon,
+	chat: MessageIcon,
+	chat_settings: MessageIcon,
+	accessibility: EyeIcon,
+	custom: WrenchIcon,
+	custom_settings: WrenchIcon,
+}
+
+const categories = computed<GameSettingCategory[]>(() => {
+	if (!draftState.value) return []
+
+	const settings = draftState.value.settings
+	const visible = draftState.value.categories.filter(
+		(category) =>
+			category.is_custom || settings.some((setting) => setting.category_id === category.id),
+	)
+	if (!visible.some((category) => category.is_custom || category.id === 'custom_settings')) {
+		visible.push({
+			id: 'custom_settings',
+			is_custom: true,
+		})
+	}
+	return visible
+})
+
+const categoryTabs = computed<TabbedModalTab[]>(() =>
+	categories.value.map((category) => ({
+		name: gameSettingCategoryMessage(category),
+		icon: categoryIcon(category),
+	})),
+)
+
+const activeCategory = computed(() =>
+	categories.value.find((category) => category.id === activeCategoryId.value),
+)
+
+const categorySettings = computed(() => {
+	if (!draftState.value) return []
+
+	const query = search.value.trim().toLocaleLowerCase()
+	return draftState.value.settings.filter((setting) => {
+		if (!query && setting.category_id !== activeCategoryId.value) return false
+		if (
+			query &&
+			!settingSearchText(
+				setting,
+				formatGameSettingLabel(formatMessage, setting),
+				formatGameSettingDescription(formatMessage, setting),
+			).includes(query)
+		)
+			return false
+		return true
+	})
+})
+
+const keybindConflicts = computed(() => {
+	if (!draftState.value) return new Map<string, string[]>()
+
+	const bindings = new Map<string, EditableGameSetting[]>()
+	for (const setting of draftState.value.settings) {
+		if (setting.editor.type !== 'key_binding' || setting.canonical_value?.type !== 'key_binding')
+			continue
+		const key = minecraftKeybindConflictKey(setting.option_id, setting.canonical_value.value)
+		if (!key) continue
+		bindings.set(key, [...(bindings.get(key) ?? []), setting])
+	}
+
+	const conflicts = new Map<string, string[]>()
+	for (const settings of bindings.values()) {
+		if (settings.length < 2) continue
+		for (const setting of settings) {
+			conflicts.set(
+				setting.option_id,
+				settings
+					.filter((candidate) => candidate.option_id !== setting.option_id)
+					.map((candidate) => formatGameSettingLabel(formatMessage, candidate)),
+			)
+		}
+	}
+	return conflicts
+})
+
+const enableCandidates = computed(() =>
+	categorySettings.value.filter((setting) => !setting.sync_enabled && settingCanBeEnabled(setting)),
+)
+const disableCandidates = computed(() =>
+	categorySettings.value.filter((setting) => setting.sync_enabled && !setting.controlled),
+)
+const toggleableCategorySettings = computed(() =>
+	categorySettings.value.filter((setting) => !setting.controlled),
+)
+const allCategorySettingsSynced = computed(
+	() =>
+		toggleableCategorySettings.value.length > 0 &&
+		toggleableCategorySettings.value.every((setting) => setting.sync_enabled),
+)
+const modalTitle = computed(() =>
+	formatMessage(isLocalEditor.value ? messages.title : messages.syncTitle),
+)
+
+function categoryIcon(category: GameSettingCategory): Component {
+	return categoryIcons[category.id] ?? SettingsIcon
+}
+
+function changeCategory(_fromIndex: number, toIndex: number): boolean {
+	const category = categories.value[toIndex]
+	if (!category) return false
+	activeCategoryId.value = category.id
+	search.value = ''
+	return true
+}
+
+async function load() {
+	if (!(await loadSettings())) return
+	if (!categories.value.some((category) => category.id === activeCategoryId.value)) {
+		activeCategoryId.value = categories.value[0]?.id ?? 'custom_settings'
+	}
+	const index = categories.value.findIndex((category) => category.id === activeCategoryId.value)
+	if (index >= 0) modal.value?.setTab(index)
+}
+
+function show() {
+	allowClose = false
+	search.value = ''
+	modal.value?.show()
+	void load()
+}
+
+function hide() {
+	modal.value?.hide()
+}
+
+function reset() {
+	resetEditor()
+	allowClose = false
+}
+
+function beforeHide(): boolean {
+	if (allowClose || !isDirty.value) return true
+	void confirmDiscard()
+	return false
+}
+
+async function confirmDiscard() {
+	const discard = await confirmLeaveModal.value?.prompt()
+	if (!discard) return
+	allowClose = true
+	modal.value?.hide()
+}
+
+function toggleVisibleSync() {
+	const enabled = !allCategorySettingsSynced.value
+	const candidates = enabled ? enableCandidates.value : disableCandidates.value
+	setSyncEnabled(
+		candidates.map((setting) => setting.option_id),
+		enabled,
+	)
+}
+
+defineExpose({ show, hide })
+</script>
+
+<template>
+	<TabbedModal
+		ref="modal"
+		:tabs="categoryTabs"
+		:header="modalTitle"
+		:before-hide="beforeHide"
+		:before-tab-change="changeCategory"
+		:on-after-hide="reset"
+		:floating-action-bar-shown="isDirty"
+		max-width="min(1080px, calc(95vw - 2rem))"
+		width="min(1080px, calc(95vw - 2rem))"
+	>
+		<template #sidebar-header>
+			<div class="pb-4">
+				<Input
+					v-model="search"
+					:icon="SearchIcon"
+					type="search"
+					autocomplete="off"
+					:placeholder="formatMessage(messages.search)"
+					:aria-label="formatMessage(messages.search)"
+					wrapper-class="w-full shrink-0"
+				/>
+			</div>
+		</template>
+
+		<template #content>
+			<div class="flex min-h-full min-w-0 flex-col">
+				<div
+					v-if="!isLocalEditor && (loading || loadError || categorySettings.length > 0)"
+					class="mb-4 flex shrink-0 flex-wrap items-start justify-between gap-4 border-0 border-b border-solid border-surface-4 pb-4"
+				>
+					<p class="m-0 min-w-60 flex-1 text-primary">
+						{{ formatMessage(messages.syncedOptionsDescription) }}
+					</p>
+					<div class="ml-auto flex w-48 justify-end">
+						<Button
+							size="lg"
+							:disabled="
+								allCategorySettingsSynced
+									? disableCandidates.length === 0
+									: enableCandidates.length === 0
+							"
+							@click="toggleVisibleSync"
+						>
+							<LinkIcon v-if="allCategorySettingsSynced" aria-hidden="true" />
+							<UnlinkIcon v-else aria-hidden="true" />
+							{{
+								formatMessage(allCategorySettingsSynced ? messages.disableAll : messages.enableAll)
+							}}
+						</Button>
+					</div>
+				</div>
+
+				<div
+					v-if="loading"
+					class="flex min-h-40 flex-1 items-center justify-center gap-2 text-secondary"
+				>
+					<SpinnerIcon class="size-5 animate-spin" aria-hidden="true" />
+					{{ formatMessage(messages.loading) }}
+				</div>
+				<div
+					v-else-if="loadError"
+					class="flex min-h-40 flex-1 flex-col items-center justify-center gap-3 text-secondary"
+				>
+					<p class="m-0">{{ formatMessage(messages.loadFailed) }}</p>
+					<Button @click="load">
+						<RefreshCwIcon aria-hidden="true" />
+						{{ formatMessage(messages.retry) }}
+					</Button>
+				</div>
+				<div v-else class="min-h-0 flex-1">
+					<div
+						v-if="categorySettings.length === 0"
+						class="flex h-full min-h-40 items-center justify-center px-8 text-center text-secondary"
+					>
+						{{
+							activeCategory?.is_custom && !search
+								? formatMessage(messages.customEmpty)
+								: formatMessage(messages.empty)
+						}}
+					</div>
+					<div v-else class="flex flex-col gap-4">
+						<GameSettingRow
+							v-for="setting in categorySettings"
+							:key="setting.option_id"
+							:setting="setting"
+							:keybind-conflicts="keybindConflicts.get(setting.option_id)"
+							:show-sync-toggle="!isLocalEditor"
+							@update:sync-enabled="setSyncEnabled([setting.option_id], $event)"
+							@update:canonical-value="setCanonicalValue(setting.option_id, $event)"
+						/>
+					</div>
+				</div>
+			</div>
+		</template>
+
+		<template #floating-action-bar>
+			<FloatingActionBar v-if="isDirty" shown inline :aria-label="modalTitle">
+				<p class="m-0 text-sm font-semibold md:text-base">
+					{{ formatMessage(messages.unsavedChanges) }}
+				</p>
+				<div class="ml-auto flex gap-2">
+					<Button type="outlined" @click="cancelChanges">
+						<XIcon aria-hidden="true" />
+						{{ formatMessage(commonMessages.cancelButton) }}
+					</Button>
+					<Button
+						type="colored"
+						color="brand"
+						:disabled="!isDirty || loading || saving || hasBlockingDraft"
+						:loading="saving"
+						@click="save"
+					>
+						<SaveIcon aria-hidden="true" />
+						{{ formatMessage(messages.saveSettings) }}
+					</Button>
+				</div>
+			</FloatingActionBar>
+		</template>
+	</TabbedModal>
+
+	<ConfirmLeaveModal ref="confirmLeaveModal" />
+</template>
diff --git a/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameKeybindInput.vue b/apps/app-frontend/src/components/ui/settings/instances/game-settings-modal/keybind-input.vue
similarity index 80%
rename from apps/app-frontend/src/components/ui/settings/instances/game-settings/GameKeybindInput.vue
rename to apps/app-frontend/src/components/ui/settings/instances/game-settings-modal/keybind-input.vue
index e62f065b52..12b0bf7529 100644
--- a/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameKeybindInput.vue
+++ b/apps/app-frontend/src/components/ui/settings/instances/game-settings-modal/keybind-input.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { TriangleAlertIcon } from '@modrinth/assets'
 import { Button, defineMessages, useVIntl } from '@modrinth/ui'
-import { computed, onBeforeUnmount, ref, useId } from 'vue'
+import { computed, onBeforeUnmount, ref, useId, watch } from 'vue'
 
 import {
 	activateKeybindRecording,
@@ -9,7 +9,7 @@ import {
 	formatMinecraftKeybind,
 	minecraftKeyTokenFromKeyboardEvent,
 	minecraftMouseTokenFromButton,
-} from './game-keybinds'
+} from './keybinds'
 
 const props = withDefaults(
 	defineProps<{
@@ -32,6 +32,7 @@ const emit = defineEmits<{
 
 const { formatMessage, locale } = useVIntl()
 const statusId = useId()
+const conflictId = useId()
 const recording = ref(false)
 const statusMessage = ref('')
 const controlElement = ref<HTMLElement | null>(null)
@@ -58,6 +59,11 @@ const messages = defineMessages({
 		id: 'app.settings.game-options.keybind.listening-status',
 		defaultMessage: 'Listening for a key or mouse button. Press Escape to clear this binding.',
 	},
+	recordingLabel: {
+		id: 'app.settings.game-options.keybind.recording-label',
+		defaultMessage:
+			'{setting}: listening for a key or mouse button. Press Escape to clear this binding.',
+	},
 	unsupportedStatus: {
 		id: 'app.settings.game-options.keybind.unsupported-status',
 		defaultMessage: 'That input cannot be used by Minecraft. Press another key.',
@@ -95,16 +101,12 @@ const conflictMessage = computed(() =>
 		? formatMessage(messages.conflict, { settings: conflictSettings.value })
 		: '',
 )
-const accessibleLabel = computed(() => {
-	if (recording.value) {
-		return `${props.settingLabel}. ${formatMessage(messages.listeningStatus)}`
-	}
-	const change = formatMessage(messages.change, {
+const accessibleLabel = computed(() =>
+	formatMessage(recording.value ? messages.recordingLabel : messages.change, {
 		setting: props.settingLabel,
 		binding: bindingLabel.value,
-	})
-	return conflictMessage.value ? `${change} ${conflictMessage.value}` : change
-})
+	}),
+)
 
 function startRecording() {
 	if (props.disabled || recording.value) return
@@ -113,12 +115,14 @@ function startRecording() {
 	statusMessage.value = formatMessage(messages.listeningStatus)
 	window.addEventListener('keydown', handleKeydown, true)
 	window.addEventListener('pointerdown', handlePointerDown, true)
+	window.addEventListener('blur', cancelRecording)
 }
 
 function stopRecording() {
 	recording.value = false
 	window.removeEventListener('keydown', handleKeydown, true)
 	window.removeEventListener('pointerdown', handlePointerDown, true)
+	window.removeEventListener('blur', cancelRecording)
 	deactivateKeybindRecording(cancelRecording)
 }
 
@@ -187,6 +191,12 @@ function handlePointerDown(event: PointerEvent) {
 	assign(token)
 }
 
+watch(
+	() => props.disabled,
+	(disabled) => {
+		if (disabled) cancelRecording()
+	},
+)
 onBeforeUnmount(cancelRecording)
 </script>
 
@@ -199,46 +209,27 @@ onBeforeUnmount(cancelRecording)
 			class="flex min-w-0 flex-1"
 		>
 			<Button
-				type="base"
+				:type="recording || conflicts.length ? 'outlined' : 'quiet'"
+				:color="recording ? 'brand' : conflicts.length ? 'orange' : undefined"
 				size="lg"
 				:disabled="disabled"
 				:aria-label="accessibleLabel"
-				:aria-describedby="recording ? statusId : undefined"
-				class="keybind-button !w-full overflow-hidden"
-				:class="{
-					'!bg-brand-highlight !text-brand !shadow-[inset_0_0_0_1px_var(--color-brand)]': recording,
-					'keybind-button--conflict': !recording && conflicts.length,
-					'!bg-transparent !text-secondary': !recording && !conflicts.length,
-				}"
+				:aria-describedby="recording ? statusId : conflicts.length ? conflictId : undefined"
+				class="w-full overflow-hidden"
 				@click="handleClick"
 				@contextmenu.prevent.stop
 				@auxclick.prevent.stop
 			>
-				<span class="flex min-w-0 flex-row items-center justify-center gap-2">
-					<TriangleAlertIcon
-						v-if="!recording && conflicts.length"
-						class="keybind-conflict-icon order-first size-4 shrink-0"
-						aria-hidden="true"
-					/>
-					<span class="order-last min-w-0 truncate">{{ visibleLabel }}</span>
-				</span>
+				<TriangleAlertIcon v-if="!recording && conflicts.length" aria-hidden="true" />
+				<span class="min-w-0 truncate">{{ visibleLabel }}</span>
 			</Button>
 		</span>
 
 		<span :id="statusId" class="visually-hidden" role="status" aria-live="polite">
 			{{ statusMessage }}
 		</span>
+		<span v-if="conflicts.length" :id="conflictId" class="visually-hidden">
+			{{ conflictMessage }}
+		</span>
 	</div>
 </template>
-
-<style scoped>
-.keybind-button.keybind-button--conflict {
-	background-color: var(--color-orange-highlight) !important;
-	color: var(--color-orange) !important;
-	box-shadow: inset 0 0 0 1px var(--color-orange) !important;
-}
-
-.keybind-button.keybind-button--conflict .keybind-conflict-icon {
-	color: var(--color-orange) !important;
-}
-</style>
diff --git a/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-keybinds.ts b/apps/app-frontend/src/components/ui/settings/instances/game-settings-modal/keybinds.ts
similarity index 100%
rename from apps/app-frontend/src/components/ui/settings/instances/game-settings/game-keybinds.ts
rename to apps/app-frontend/src/components/ui/settings/instances/game-settings-modal/keybinds.ts
diff --git a/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-messages.ts b/apps/app-frontend/src/components/ui/settings/instances/game-settings-modal/messages.ts
similarity index 90%
rename from apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-messages.ts
rename to apps/app-frontend/src/components/ui/settings/instances/game-settings-modal/messages.ts
index 372b4996e0..f481630e91 100644
--- a/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-messages.ts
+++ b/apps/app-frontend/src/components/ui/settings/instances/game-settings-modal/messages.ts
@@ -2,8 +2,6 @@ import { defineMessages, type MessageDescriptor, type VIntlFormatters } from '@m
 
 import type {
 	EditableGameSetting,
-	GameOptionsSourceCandidate,
-	GameOptionsSourceDisabledReason,
 	GameOptionValidationError,
 	GameSettingCategory,
 } from '@/helpers/game-options'
@@ -1006,76 +1004,14 @@ export const presentationMessages = defineMessages({
 		id: 'app.settings.game-options.validation.changed-since-opened',
 		defaultMessage: 'This setting changed elsewhere. Check it and try again.',
 	},
-	compatibilityNoParticipants: {
-		id: 'app.settings.game-options.compatibility.no-participants',
-		defaultMessage: 'Add an instance to start syncing',
-	},
 	compatibilityNone: {
 		id: 'app.settings.game-options.compatibility.none',
 		defaultMessage: 'Some of your instances cannot use this setting',
 	},
-	compatibilityAll: {
-		id: 'app.settings.game-options.compatibility.all',
-		defaultMessage: 'Syncs to {count, plural, one {# instance} other {# instances}}',
-	},
-	compatibilityAllDisabled: {
-		id: 'app.settings.game-options.compatibility.all-disabled',
-		defaultMessage: 'Sync is off',
-	},
-	compatibilitySome: {
-		id: 'app.settings.game-options.compatibility.some',
-		defaultMessage: 'Some of your instances cannot use this setting',
-	},
-	compatibilitySomeDisabled: {
-		id: 'app.settings.game-options.compatibility.some-disabled',
-		defaultMessage: 'Some of your instances cannot use this setting',
-	},
-	compatibilityTooltipNoParticipants: {
-		id: 'app.settings.game-options.compatibility.tooltip.no-participants',
-		defaultMessage: 'Add an instance to start syncing this setting.',
-	},
-	compatibilityTooltipAll: {
-		id: 'app.settings.game-options.compatibility.tooltip.all',
-		defaultMessage: 'All of your instances can use this setting.',
-	},
-	compatibilityTooltipLimited: {
-		id: 'app.settings.game-options.compatibility.tooltip.recipients',
-		defaultMessage: 'Some of your instances cannot use this setting',
-	},
-	compatibilityTooltipWaiting: {
-		id: 'app.settings.game-options.compatibility.tooltip.waiting',
-		defaultMessage:
-			'{count, plural, one {Launch this instance once before syncing this setting.} other {Launch these instances once before syncing this setting.}}',
-	},
 	bucketLauncherControlled: {
 		id: 'app.settings.game-options.compatibility.reason.launcher-controlled',
 		defaultMessage: 'This setting is managed by Modrinth’s launch settings.',
 	},
-	sourceInstallingOrUpdating: {
-		id: 'app.settings.game-options.source.disabled.installing-or-updating',
-		defaultMessage: 'Installing or updating',
-	},
-	sourceUnsupportedVersion: {
-		id: 'app.settings.game-options.source.disabled.unsupported-version',
-		defaultMessage: 'Unsupported Minecraft version',
-	},
-	sourceMissingOptionsFile: {
-		id: 'app.settings.game-options.source.disabled.missing-options-file',
-		defaultMessage: 'No options.txt file',
-	},
-	sourceNoSyncableSettings: {
-		id: 'app.settings.game-options.source.disabled.no-syncable-settings',
-		defaultMessage: 'No syncable settings found',
-	},
-	sourceUnreadableOptionsFile: {
-		id: 'app.settings.game-options.source.disabled.unreadable-options-file',
-		defaultMessage: 'options.txt could not be read',
-	},
-	sourceSettingsSummary: {
-		id: 'app.settings.game-options.source.settings-summary',
-		defaultMessage:
-			'{recognized, plural, one {# recognized setting} other {# recognized settings}}, {custom, plural, one {# custom setting} other {# custom settings}}',
-	},
 })
 
 const knownSettings: Record<string, { label: MessageDescriptor; description?: MessageDescriptor }> =
@@ -1453,14 +1389,6 @@ const validationMessages: Record<GameOptionValidationError, MessageDescriptor> =
 	changed_since_opened: presentationMessages.validationChangedSinceOpened,
 }
 
-const sourceDisabledMessages: Record<GameOptionsSourceDisabledReason, MessageDescriptor> = {
-	installing_or_updating: presentationMessages.sourceInstallingOrUpdating,
-	unsupported_version: presentationMessages.sourceUnsupportedVersion,
-	missing_options_file: presentationMessages.sourceMissingOptionsFile,
-	no_syncable_settings: presentationMessages.sourceNoSyncableSettings,
-	unreadable_options_file: presentationMessages.sourceUnreadableOptionsFile,
-}
-
 export function formatGameSettingLabel(
 	formatMessage: FormatMessage,
 	setting: EditableGameSetting,
@@ -1488,13 +1416,6 @@ export function gameSettingCategoryMessage(category: GameSettingCategory): Messa
 	)
 }
 
-export function formatGameSettingCategory(
-	formatMessage: FormatMessage,
-	category: GameSettingCategory,
-): string {
-	return formatMessage(gameSettingCategoryMessage(category))
-}
-
 export function formatGameSettingChoice(
 	formatMessage: FormatMessage,
 	optionId: string,
@@ -1510,74 +1431,3 @@ export function formatGameSettingValidation(
 ): string | null {
 	return error ? formatMessage(validationMessages[error]) : null
 }
-
-export function formatCompatibilitySubtitle(
-	formatMessage: FormatMessage,
-	setting: EditableGameSetting,
-): string {
-	const { total_participating: total, will_receive: recipients } = setting.compatibility
-	if (total === 0) return formatMessage(presentationMessages.compatibilityNoParticipants)
-	if (recipients === 0) return formatMessage(presentationMessages.compatibilityNone)
-	if (recipients === total) {
-		return formatMessage(
-			setting.sync_enabled
-				? presentationMessages.compatibilityAll
-				: presentationMessages.compatibilityAllDisabled,
-			{ count: total },
-		)
-	}
-	return formatMessage(
-		setting.sync_enabled
-			? presentationMessages.compatibilitySome
-			: presentationMessages.compatibilitySomeDisabled,
-		{ recipients, total },
-	)
-}
-
-export function formatCompatibilityTooltip(
-	formatMessage: FormatMessage,
-	setting: EditableGameSetting,
-): string {
-	const summary = setting.compatibility
-	if (summary.total_participating === 0) {
-		return formatMessage(presentationMessages.compatibilityTooltipNoParticipants)
-	}
-	if (summary.left_local > 0) {
-		return formatMessage(presentationMessages.compatibilityTooltipLimited)
-	}
-	const waiting = summary.buckets
-		.filter(
-			(bucket) => bucket.status === 'waiting_for_file' || bucket.status === 'waiting_for_base',
-		)
-		.reduce((count, bucket) => count + bucket.instance_count, 0)
-	if (waiting > 0) {
-		return formatMessage(presentationMessages.compatibilityTooltipWaiting, { count: waiting })
-	}
-	return formatMessage(presentationMessages.compatibilityTooltipAll)
-}
-
-export function shouldShowCompatibilityIndicator(setting: EditableGameSetting): boolean {
-	return (
-		setting.compatibility.left_local > 0 ||
-		setting.compatibility.buckets.some(
-			(bucket) => bucket.status === 'waiting_for_file' || bucket.status === 'waiting_for_base',
-		)
-	)
-}
-
-export function formatSourceDisabledReason(
-	formatMessage: FormatMessage,
-	reason: GameOptionsSourceDisabledReason | null | undefined,
-): string | null {
-	return reason ? formatMessage(sourceDisabledMessages[reason]) : null
-}
-
-export function formatSourceSettingsSummary(
-	formatMessage: FormatMessage,
-	source: Pick<GameOptionsSourceCandidate, 'recognized_setting_count' | 'custom_setting_count'>,
-): string {
-	return formatMessage(presentationMessages.sourceSettingsSummary, {
-		recognized: source.recognized_setting_count,
-		custom: source.custom_setting_count,
-	})
-}
diff --git a/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingRow.vue b/apps/app-frontend/src/components/ui/settings/instances/game-settings-modal/row.vue
similarity index 85%
rename from apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingRow.vue
rename to apps/app-frontend/src/components/ui/settings/instances/game-settings-modal/row.vue
index ca23e3b72b..d696a12fde 100644
--- a/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingRow.vue
+++ b/apps/app-frontend/src/components/ui/settings/instances/game-settings-modal/row.vue
@@ -14,20 +14,21 @@ import { computed, ref } from 'vue'
 
 import type { EditableGameSetting, GameOptionCanonicalValue } from '@/helpers/game-options'
 
-import GameSettingBooleanControl from './game-setting-boolean-control.vue'
+import GameSettingBooleanControl from './boolean-control.vue'
 import {
 	canonicalBooleanValue,
 	canonicalValueFromInput,
 	canonicalValueText,
-} from './game-setting-editors'
+	settingCanBeEnabled,
+} from './editors'
+import GameKeybindInput from './keybind-input.vue'
 import {
 	formatGameSettingChoice,
 	formatGameSettingDescription,
 	formatGameSettingLabel,
 	formatGameSettingValidation,
 	presentationMessages,
-} from './game-setting-messages'
-import GameKeybindInput from './GameKeybindInput.vue'
+} from './messages'
 
 const props = withDefaults(
 	defineProps<{
@@ -52,10 +53,6 @@ const { formatMessage } = useVIntl()
 const settingLabelRef = ref<HTMLElement | null>(null)
 
 const messages = defineMessages({
-	valueLabel: {
-		id: 'app.settings.synced-options.game-settings.value-label',
-		defaultMessage: 'Value',
-	},
 	on: {
 		id: 'app.settings.synced-options.game-settings.value-on',
 		defaultMessage: 'On',
@@ -101,11 +98,11 @@ const enumOptions = computed<ComboboxOption<string>[]>(() =>
 		label: formatGameSettingChoice(formatMessage, props.setting.option_id, choice.value),
 	})),
 )
+const isNumber = computed(
+	() => props.setting.editor.type === 'integer' || props.setting.editor.type === 'decimal',
+)
 const isSlider = computed(
-	() =>
-		(props.setting.editor.type === 'integer' || props.setting.editor.type === 'decimal') &&
-		props.setting.editor.min != null &&
-		props.setting.editor.max != null,
+	() => isNumber.value && props.setting.editor.min != null && props.setting.editor.max != null,
 )
 const booleanValue = computed(() => canonicalBooleanValue(props.setting))
 const numberScale = computed(() => (props.setting.editor.unit === 'percent' ? 100 : 1))
@@ -129,6 +126,9 @@ const sliderValue = computed(() => {
 	const value = Number(valueText.value)
 	return Number.isFinite(value) ? value : null
 })
+const inputValue = computed(() =>
+	isNumber.value ? (sliderValue.value ?? undefined) : valueText.value,
+)
 const editorDisabled = computed(
 	() =>
 		props.disabled ||
@@ -139,11 +139,7 @@ const syncToggleDisabled = computed(
 	() =>
 		props.disabled ||
 		props.setting.controlled ||
-		(!props.setting.sync_enabled &&
-			(!!props.setting.validation_error ||
-				['mixed', 'unset', 'invalid'].includes(props.setting.value_state) ||
-				(props.setting.compatibility.total_participating > 0 &&
-					props.setting.compatibility.will_receive === 0))),
+		(!props.setting.sync_enabled && !settingCanBeEnabled(props.setting)),
 )
 const placeholder = computed(() => {
 	if (props.setting.value_state === 'mixed') return formatMessage(messages.mixed)
@@ -242,15 +238,13 @@ function updateValue(value: string | number | boolean | undefined) {
 				:placeholder="placeholder"
 				:aria-label="settingLabel"
 				:disabled="editorDisabled"
-				value-input-class="!bg-transparent"
-				class="[&_input]:!text-secondary"
 				@update:model-value="updateValue"
 			/>
 
 			<GameSettingBooleanControl
 				v-else-if="setting.editor.type === 'bool'"
 				:model-value="booleanValue"
-				:label="formatMessage(messages.valueLabel)"
+				:label="settingLabel"
 				:on-label="formatMessage(messages.on)"
 				:off-label="formatMessage(messages.off)"
 				:placeholder="placeholder"
@@ -264,8 +258,7 @@ function updateValue(value: string | number | boolean | undefined) {
 				:options="enumOptions"
 				:placeholder="placeholder"
 				:disabled="editorDisabled"
-				:aria-label="formatMessage(messages.valueLabel)"
-				trigger-class="!bg-transparent !text-secondary"
+				:aria-label="settingLabel"
 				class="min-w-0"
 				@update:model-value="updateValue"
 			/>
@@ -282,18 +275,15 @@ function updateValue(value: string | number | boolean | undefined) {
 
 			<Input
 				v-else
-				:model-value="valueText"
-				:type="
-					setting.editor.type === 'integer' || setting.editor.type === 'decimal' ? 'number' : 'text'
-				"
+				:model-value="inputValue"
+				:type="isNumber ? 'number' : 'text'"
 				:min="inputMin"
 				:max="inputMax"
 				:step="inputStep"
 				:placeholder="placeholder"
 				:disabled="editorDisabled"
-				:aria-label="formatMessage(messages.valueLabel)"
-				wrapper-class="w-full !bg-transparent"
-				input-class="!text-secondary"
+				:aria-label="settingLabel"
+				wrapper-class="w-full"
 				@update:model-value="updateValue"
 			/>
 		</div>
@@ -304,18 +294,15 @@ function updateValue(value: string | number | boolean | undefined) {
 			class="flex justify-center"
 		>
 			<IconButton
+				:type="setting.sync_enabled ? 'outlined' : 'base'"
+				:color="setting.sync_enabled ? 'blue' : undefined"
 				:label="syncActionLabel"
 				:disabled="syncToggleDisabled"
 				:aria-pressed="setting.sync_enabled"
-				:class="
-					setting.sync_enabled
-						? '!bg-highlight-blue !text-blue !shadow-[inset_0_0_0_1px_var(--color-blue)] [&>svg]:!text-blue'
-						: ''
-				"
 				@click="emit('update:sync-enabled', !setting.sync_enabled)"
 			>
-				<LinkIcon v-if="setting.sync_enabled" />
-				<UnlinkIcon v-else />
+				<LinkIcon v-if="setting.sync_enabled" aria-hidden="true" />
+				<UnlinkIcon v-else aria-hidden="true" />
 			</IconButton>
 		</span>
 	</div>
diff --git a/apps/app-frontend/src/components/ui/settings/instances/game-settings-modal/use-editor.ts b/apps/app-frontend/src/components/ui/settings/instances/game-settings-modal/use-editor.ts
new file mode 100644
index 0000000000..84d850e098
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/settings/instances/game-settings-modal/use-editor.ts
@@ -0,0 +1,408 @@
+import { defineMessages, injectNotificationManager, useVIntl } from '@modrinth/ui'
+import { useMutation, useQuery, useQueryClient } from '@tanstack/vue-query'
+import { computed, type MaybeRefOrGetter, nextTick, onScopeDispose, ref, toValue } from 'vue'
+
+import {
+	type EditableGameSetting,
+	type GameOptionCanonicalValue,
+	type GameSettingChange,
+	type GameSettingsEditorState,
+	get_local_game_options_config,
+	get_synced_game_options_config,
+	preview_local_game_option_changes,
+	preview_synced_game_option_changes,
+	save_local_game_option_changes,
+	save_synced_game_option_changes,
+	type UpdateGameSettingsRequest,
+} from '@/helpers/game-options'
+
+import { canonicalValuesEqual, cloneGameSettingsState, gameSettingChanges } from './editors'
+
+function editorQueryKey(instanceId?: string) {
+	return instanceId
+		? (['game-settings', 'local', instanceId] as const)
+		: (['game-settings', 'synced'] as const)
+}
+
+export function useGameSettingsEditor(
+	instanceId: MaybeRefOrGetter<string | undefined>,
+	onSaved: () => void,
+) {
+	const { addNotification, handleError } = injectNotificationManager()
+	const { formatMessage } = useVIntl()
+	const queryClient = useQueryClient()
+	const messages = defineMessages({
+		conflictTitle: {
+			id: 'app.settings.synced-options.game-settings.conflict-title',
+			defaultMessage: 'These settings changed elsewhere',
+		},
+		conflictText: {
+			id: 'app.settings.synced-options.game-settings.conflict-text',
+			defaultMessage: 'We loaded the latest settings. Check your changes, then save again.',
+		},
+	})
+
+	const baseState = ref<GameSettingsEditorState | null>(null)
+	const draftState = ref<GameSettingsEditorState | null>(null)
+	const touchedValueOptionIds = ref<Set<string>>(new Set())
+	let previewTimer: ReturnType<typeof setTimeout> | null = null
+	let previewGeneration = 0
+	let loadGeneration = 0
+	let saveGeneration = 0
+
+	const editorInstanceId = ref<string>()
+	const isLocalEditor = computed(() => !!editorInstanceId.value)
+
+	const dirtyChanges = computed(() =>
+		gameSettingChanges(baseState.value, draftState.value, touchedValueOptionIds.value),
+	)
+	const isDirty = computed(() => dirtyChanges.value.length > 0)
+	const dirtyOptionIds = computed(
+		() => new Set(dirtyChanges.value.map((change) => change.option_id)),
+	)
+	const hasBlockingDraft = computed(
+		() =>
+			draftState.value?.settings.some(
+				(setting) =>
+					dirtyOptionIds.value.has(setting.option_id) &&
+					(isLocalEditor.value || setting.sync_enabled) &&
+					(!!setting.validation_error ||
+						['mixed', 'unset', 'invalid'].includes(setting.value_state)),
+			) ?? false,
+	)
+	const stateQuery = useQuery(
+		computed(() => {
+			const instanceId = editorInstanceId.value
+			return {
+				queryKey: editorQueryKey(instanceId),
+				queryFn: () =>
+					instanceId ? get_local_game_options_config(instanceId) : get_synced_game_options_config(),
+				enabled: false,
+				retry: false,
+			}
+		}),
+	)
+	const loading = computed(() => stateQuery.isPending.value || stateQuery.isFetching.value)
+	const previewMutation = useMutation({
+		mutationFn: ({
+			instanceId,
+			request,
+		}: {
+			instanceId?: string
+			request: UpdateGameSettingsRequest
+		}) =>
+			instanceId
+				? preview_local_game_option_changes(instanceId, request)
+				: preview_synced_game_option_changes(request),
+	})
+	const saveMutation = useMutation({
+		mutationFn: saveDraft,
+		onError: handleError,
+	})
+
+	async function load() {
+		const generation = ++loadGeneration
+		cancelPreview()
+		editorInstanceId.value = toValue(instanceId)
+		await nextTick()
+		const result = await stateQuery.refetch()
+		if (generation !== loadGeneration) return false
+		if (result.isError) {
+			handleError(result.error)
+			return false
+		}
+		if (!result.data) return false
+		baseState.value = cloneGameSettingsState(result.data)
+		draftState.value = cloneGameSettingsState(result.data)
+		touchedValueOptionIds.value = new Set()
+		return true
+	}
+
+	function cancelPreview() {
+		if (previewTimer) clearTimeout(previewTimer)
+		previewTimer = null
+		previewGeneration++
+	}
+
+	function reset() {
+		cancelPreview()
+		loadGeneration++
+		saveGeneration++
+		baseState.value = null
+		draftState.value = null
+		touchedValueOptionIds.value = new Set()
+		saveMutation.reset()
+	}
+
+	function cancelChanges() {
+		if (!baseState.value) return
+		cancelPreview()
+		draftState.value = cloneGameSettingsState(baseState.value)
+		touchedValueOptionIds.value = new Set()
+	}
+
+	function setSyncEnabled(optionIds: readonly string[], enabled: boolean) {
+		if (!draftState.value) return
+		const ids = new Set(optionIds)
+		draftState.value.settings = draftState.value.settings.map((setting) =>
+			ids.has(setting.option_id)
+				? { ...setting, sync_enabled: enabled, validation_error: null }
+				: setting,
+		)
+		schedulePreview()
+	}
+
+	function schedulePreview() {
+		cancelPreview()
+		previewTimer = setTimeout(() => void preview(), 350)
+	}
+
+	function save() {
+		if (saveMutation.isPending.value || loading.value || hasBlockingDraft.value || !isDirty.value)
+			return
+		saveMutation.mutate()
+	}
+
+	function editorRequest(): UpdateGameSettingsRequest | null {
+		if (!baseState.value || !draftState.value) return null
+		return {
+			expected_summary_revision: draftState.value.summary_revision,
+			expected_canonical_revision: draftState.value.canonical_revision,
+			expected_catalog_revision: draftState.value.catalog_revision,
+			changes: dirtyChanges.value,
+		}
+	}
+
+	function setCanonicalValue(optionId: string, value: GameOptionCanonicalValue | null) {
+		if (!draftState.value) return
+		const currentSetting = draftState.value.settings.find(
+			(setting) => setting.option_id === optionId,
+		)
+		const baseSetting = baseState.value?.settings.find((setting) => setting.option_id === optionId)
+		if (!currentSetting) return
+
+		const revertedToBase =
+			!!baseSetting &&
+			!canonicalValuesEqual(currentSetting.canonical_value, baseSetting.canonical_value) &&
+			canonicalValuesEqual(value, baseSetting.canonical_value)
+		const touchedOptionIds = new Set(touchedValueOptionIds.value)
+		if (revertedToBase) {
+			touchedOptionIds.delete(optionId)
+		} else {
+			touchedOptionIds.add(optionId)
+		}
+		touchedValueOptionIds.value = touchedOptionIds
+		draftState.value.settings = draftState.value.settings.map((setting) =>
+			setting.option_id === optionId
+				? {
+						...setting,
+						canonical_value: value,
+						value_state: revertedToBase ? baseSetting.value_state : value ? 'canonical' : 'unset',
+						validation_error: revertedToBase ? baseSetting.validation_error : null,
+					}
+				: setting,
+		)
+		schedulePreview()
+	}
+
+	function mergePreview(preview: GameSettingsEditorState) {
+		if (!baseState.value || !draftState.value) return
+		const previousBase = cloneGameSettingsState(baseState.value)
+		const previousDraft = cloneGameSettingsState(draftState.value)
+		const dirtyIds = new Set(
+			gameSettingChanges(previousBase, previousDraft, touchedValueOptionIds.value).map(
+				(change) => change.option_id,
+			),
+		)
+		const stagedSettings = new Map(
+			previousDraft.settings
+				.filter((setting) => dirtyIds.has(setting.option_id))
+				.map((setting) => [setting.option_id, setting]),
+		)
+		const previousBaseSettings = new Map(
+			previousBase.settings.map((setting) => [setting.option_id, setting]),
+		)
+		const nextBase = cloneGameSettingsState(preview)
+		const nextDraft = cloneGameSettingsState(preview)
+		nextBase.settings = nextBase.settings.map((setting) =>
+			dirtyIds.has(setting.option_id)
+				? { ...(previousBaseSettings.get(setting.option_id) ?? setting) }
+				: setting,
+		)
+		nextDraft.settings = nextDraft.settings.map((setting): EditableGameSetting => {
+			const staged = stagedSettings.get(setting.option_id)
+			if (!staged) return setting
+			return {
+				...setting,
+				sync_enabled: staged.sync_enabled,
+				canonical_value: staged.canonical_value,
+				option_revision: staged.option_revision,
+			}
+		})
+		baseState.value = nextBase
+		draftState.value = nextDraft
+	}
+
+	async function preview() {
+		const request = editorRequest()
+		if (!request || request.changes.length === 0) {
+			previewGeneration++
+			if (baseState.value) draftState.value = cloneGameSettingsState(baseState.value)
+			return
+		}
+
+		const generation = ++previewGeneration
+		try {
+			const previewState = await previewMutation.mutateAsync({
+				instanceId: editorInstanceId.value,
+				request,
+			})
+			if (generation !== previewGeneration) return
+			mergePreview(previewState)
+		} catch {
+			return
+		}
+	}
+
+	function applyChangesToRefreshedState(
+		refreshed: GameSettingsEditorState,
+		stagedDraft: GameSettingsEditorState,
+		changes: GameSettingChange[],
+		touchedOptionIds: ReadonlySet<string>,
+		conflictOptionIds: ReadonlySet<string> = new Set(),
+	) {
+		const changesById = new Map(changes.map((change) => [change.option_id, change]))
+		const stagedSettings = new Map(
+			stagedDraft.settings.map((setting) => [setting.option_id, setting]),
+		)
+		const nextBase = cloneGameSettingsState(refreshed)
+		const nextDraft = cloneGameSettingsState(refreshed)
+
+		nextDraft.settings = nextDraft.settings.map((setting) => {
+			const change = changesById.get(setting.option_id)
+			const staged = stagedSettings.get(setting.option_id)
+			if (!change || !staged) return setting
+
+			return {
+				...setting,
+				...(change.sync_enabled !== undefined ? { sync_enabled: staged.sync_enabled } : {}),
+				...(change.canonical_value !== undefined
+					? {
+							canonical_value: staged.canonical_value,
+							value_state: staged.value_state,
+						}
+					: {}),
+				validation_error: conflictOptionIds.has(setting.option_id)
+					? 'changed_since_opened'
+					: staged.validation_error,
+			}
+		})
+
+		baseState.value = nextBase
+		draftState.value = nextDraft
+		touchedValueOptionIds.value = new Set(
+			[...touchedOptionIds].filter(
+				(optionId) => changesById.get(optionId)?.canonical_value !== undefined,
+			),
+		)
+	}
+
+	async function saveDraft() {
+		const request = editorRequest()
+		if (!request || request.changes.length === 0 || !baseState.value || !draftState.value) return
+
+		cancelPreview()
+		const targetInstanceId = editorInstanceId.value
+		const generation = ++saveGeneration
+		const previousBase = cloneGameSettingsState(baseState.value)
+		const optimisticState = cloneGameSettingsState(draftState.value)
+		const previouslyTouchedOptionIds = new Set(touchedValueOptionIds.value)
+		baseState.value = cloneGameSettingsState(optimisticState)
+		touchedValueOptionIds.value = new Set()
+		try {
+			const result = targetInstanceId
+				? await save_local_game_option_changes(targetInstanceId, request)
+				: await save_synced_game_option_changes(request)
+			const refreshed =
+				result.state ??
+				(targetInstanceId
+					? await get_local_game_options_config(targetInstanceId)
+					: await get_synced_game_options_config())
+			queryClient.setQueryData(editorQueryKey(targetInstanceId), refreshed)
+			if (result.conflicts?.length) {
+				if (generation !== saveGeneration || !draftState.value) return
+				previewGeneration++
+				const stagedDraft = cloneGameSettingsState(draftState.value)
+				const retainedTouchedOptionIds = new Set([
+					...previouslyTouchedOptionIds,
+					...touchedValueOptionIds.value,
+				])
+				const stagedChanges = gameSettingChanges(
+					previousBase,
+					stagedDraft,
+					retainedTouchedOptionIds,
+				)
+				const conflicts = new Set(result.conflicts)
+				applyChangesToRefreshedState(
+					refreshed,
+					stagedDraft,
+					stagedChanges,
+					retainedTouchedOptionIds,
+					conflicts,
+				)
+
+				addNotification({
+					type: 'warning',
+					title: formatMessage(messages.conflictTitle),
+					text: formatMessage(messages.conflictText),
+				})
+				if (isDirty.value) {
+					schedulePreview()
+				}
+				return
+			}
+
+			if (generation !== saveGeneration) {
+				onSaved()
+				return
+			}
+			if (!baseState.value || !draftState.value) return
+			previewGeneration++
+			const stagedDraft = cloneGameSettingsState(draftState.value)
+			const touchedSinceSave = new Set(touchedValueOptionIds.value)
+			const changesSinceSave = gameSettingChanges(optimisticState, stagedDraft, touchedSinceSave)
+			applyChangesToRefreshedState(refreshed, stagedDraft, changesSinceSave, touchedSinceSave)
+			if (changesSinceSave.length > 0) schedulePreview()
+			onSaved()
+		} catch (error) {
+			if (generation === saveGeneration && draftState.value) {
+				previewGeneration++
+				baseState.value = previousBase
+				touchedValueOptionIds.value = new Set([
+					...previouslyTouchedOptionIds,
+					...touchedValueOptionIds.value,
+				])
+				if (dirtyChanges.value.length > 0) schedulePreview()
+			}
+			throw error
+		}
+	}
+
+	onScopeDispose(reset)
+
+	return {
+		draftState,
+		isLocalEditor,
+		isDirty,
+		hasBlockingDraft,
+		loading,
+		loadError: stateQuery.isError,
+		saving: saveMutation.isPending,
+		load,
+		reset,
+		cancelChanges,
+		setSyncEnabled,
+		setCanonicalValue,
+		save,
+	}
+}
diff --git a/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingsModal.vue b/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingsModal.vue
deleted file mode 100644
index a9a38425fc..0000000000
--- a/apps/app-frontend/src/components/ui/settings/instances/game-settings/GameSettingsModal.vue
+++ /dev/null
@@ -1,779 +0,0 @@
-<script setup lang="ts">
-import {
-	EyeIcon,
-	LanguagesIcon,
-	LinkIcon,
-	MessageIcon,
-	MonitorIcon,
-	RefreshCwIcon,
-	SaveIcon,
-	SearchIcon,
-	SettingsIcon,
-	ShirtIcon,
-	SpinnerIcon,
-	TagCategoryAudioIcon,
-	TagCategoryGamepad2Icon,
-	UnlinkIcon,
-	WrenchIcon,
-	XIcon,
-} from '@modrinth/assets'
-import {
-	Button,
-	commonMessages,
-	ConfirmLeaveModal,
-	defineMessages,
-	FloatingActionBar,
-	injectNotificationManager,
-	Input,
-	TabbedModal,
-	type TabbedModalTab,
-	useVIntl,
-} from '@modrinth/ui'
-import type { Component } from 'vue'
-import { computed, onUnmounted, ref } from 'vue'
-
-import {
-	type EditableGameSetting,
-	type GameOptionCanonicalValue,
-	type GameSettingCategory,
-	type GameSettingChange,
-	type GameSettingsEditorState,
-	get_local_game_options_config,
-	get_synced_game_options_config,
-	preview_local_game_option_changes,
-	preview_synced_game_option_changes,
-	save_local_game_option_changes,
-	save_synced_game_option_changes,
-	type UpdateGameSettingsRequest,
-} from '@/helpers/game-options'
-
-import { minecraftKeybindConflictKey } from './game-keybinds'
-import {
-	canonicalValuesEqual,
-	cloneGameSettingsState,
-	gameSettingChanges,
-	settingCanBeEnabled,
-	settingSearchText,
-} from './game-setting-editors'
-import {
-	formatGameSettingDescription,
-	formatGameSettingLabel,
-	gameSettingCategoryMessage,
-} from './game-setting-messages'
-import GameSettingRow from './GameSettingRow.vue'
-
-const props = defineProps<{
-	instanceId?: string
-}>()
-
-const emit = defineEmits<{
-	saved: []
-}>()
-
-const { formatMessage } = useVIntl()
-const { addNotification, handleError } = injectNotificationManager()
-
-const messages = defineMessages({
-	title: {
-		id: 'app.settings.synced-options.game-settings.title',
-		defaultMessage: 'Game settings',
-	},
-	syncTitle: {
-		id: 'app.settings.synced-options.game-settings.sync-title',
-		defaultMessage: 'Sync game settings',
-	},
-	syncedOptionsDescription: {
-		id: 'app.settings.synced-options.game-settings.description',
-		defaultMessage:
-			'Synced options are applied to every instance and override the values included with a modpack.',
-	},
-	search: {
-		id: 'app.settings.synced-options.game-settings.search',
-		defaultMessage: 'Search settings...',
-	},
-	enableAll: {
-		id: 'app.settings.synced-options.game-settings.enable-all',
-		defaultMessage: 'Sync all',
-	},
-	disableAll: {
-		id: 'app.settings.synced-options.game-settings.disable-all',
-		defaultMessage: 'Unsync all',
-	},
-	customEmpty: {
-		id: 'app.settings.synced-options.game-settings.custom-empty',
-		defaultMessage:
-			'Settings added by mods will appear here after Modrinth finds them in one of your instances.',
-	},
-	empty: {
-		id: 'app.settings.synced-options.game-settings.empty',
-		defaultMessage: 'No settings match your search or filter.',
-	},
-	loading: {
-		id: 'app.settings.synced-options.game-settings.loading',
-		defaultMessage: 'Loading settings...',
-	},
-	loadFailed: {
-		id: 'app.settings.synced-options.game-settings.load-failed',
-		defaultMessage: 'We couldn’t load your game settings.',
-	},
-	retry: {
-		id: 'app.settings.synced-options.game-settings.retry',
-		defaultMessage: 'Retry',
-	},
-	saveSettings: {
-		id: 'app.settings.synced-options.game-settings.save',
-		defaultMessage: 'Save settings',
-	},
-	unsavedChanges: {
-		id: 'app.settings.synced-options.game-settings.unsaved-changes',
-		defaultMessage: 'You have unsaved changes.',
-	},
-	conflictTitle: {
-		id: 'app.settings.synced-options.game-settings.conflict-title',
-		defaultMessage: 'These settings changed elsewhere',
-	},
-	conflictText: {
-		id: 'app.settings.synced-options.game-settings.conflict-text',
-		defaultMessage: 'We loaded the latest settings. Check your changes, then save again.',
-	},
-})
-
-const modal = ref<InstanceType<typeof TabbedModal> | null>(null)
-const confirmLeaveModal = ref<InstanceType<typeof ConfirmLeaveModal> | null>(null)
-const baseState = ref<GameSettingsEditorState | null>(null)
-const draftState = ref<GameSettingsEditorState | null>(null)
-const activeCategoryId = ref('')
-const search = ref('')
-const loading = ref(false)
-const saving = ref(false)
-const loadError = ref(false)
-const touchedValueOptionIds = ref<Set<string>>(new Set())
-let allowClose = false
-let previewTimer: ReturnType<typeof setTimeout> | null = null
-let previewGeneration = 0
-let loadGeneration = 0
-let saveGeneration = 0
-
-const isLocalEditor = computed(() => !!props.instanceId)
-
-const categoryIcons: Record<string, Component> = {
-	skin_customization: ShirtIcon,
-	video: MonitorIcon,
-	video_settings: MonitorIcon,
-	language: LanguagesIcon,
-	music_and_sound: TagCategoryAudioIcon,
-	controls: TagCategoryGamepad2Icon,
-	chat: MessageIcon,
-	chat_settings: MessageIcon,
-	accessibility: EyeIcon,
-	custom: WrenchIcon,
-	custom_settings: WrenchIcon,
-}
-
-const categories = computed<GameSettingCategory[]>(() => {
-	if (!draftState.value) return []
-
-	const settings = draftState.value.settings
-	const visible = draftState.value.categories.filter(
-		(category) =>
-			category.is_custom || settings.some((setting) => setting.category_id === category.id),
-	)
-	if (!visible.some((category) => category.is_custom || category.id === 'custom_settings')) {
-		visible.push({
-			id: 'custom_settings',
-			is_custom: true,
-		})
-	}
-	return visible
-})
-
-const categoryTabs = computed<TabbedModalTab[]>(() =>
-	categories.value.map((category) => ({
-		name: gameSettingCategoryMessage(category),
-		icon: categoryIcon(category),
-	})),
-)
-
-const activeCategory = computed(() =>
-	categories.value.find((category) => category.id === activeCategoryId.value),
-)
-
-const categorySettings = computed(() => {
-	if (!draftState.value) return []
-
-	const query = search.value.trim().toLocaleLowerCase()
-	return draftState.value.settings.filter((setting) => {
-		if (!query && setting.category_id !== activeCategoryId.value) return false
-		if (
-			query &&
-			!settingSearchText(
-				setting,
-				formatGameSettingLabel(formatMessage, setting),
-				formatGameSettingDescription(formatMessage, setting),
-			).includes(query)
-		)
-			return false
-		return true
-	})
-})
-
-const keybindConflicts = computed(() => {
-	if (!draftState.value) return new Map<string, string[]>()
-
-	const bindings = new Map<string, EditableGameSetting[]>()
-	for (const setting of draftState.value.settings) {
-		if (setting.editor.type !== 'key_binding' || setting.canonical_value?.type !== 'key_binding')
-			continue
-		const key = minecraftKeybindConflictKey(setting.option_id, setting.canonical_value.value)
-		if (!key) continue
-		bindings.set(key, [...(bindings.get(key) ?? []), setting])
-	}
-
-	const conflicts = new Map<string, string[]>()
-	for (const settings of bindings.values()) {
-		if (settings.length < 2) continue
-		for (const setting of settings) {
-			conflicts.set(
-				setting.option_id,
-				settings
-					.filter((candidate) => candidate.option_id !== setting.option_id)
-					.map((candidate) => formatGameSettingLabel(formatMessage, candidate)),
-			)
-		}
-	}
-	return conflicts
-})
-
-const dirtyChanges = computed(() =>
-	gameSettingChanges(baseState.value, draftState.value, touchedValueOptionIds.value),
-)
-const isDirty = computed(() => dirtyChanges.value.length > 0)
-const dirtyOptionIds = computed(() => new Set(dirtyChanges.value.map((change) => change.option_id)))
-const hasBlockingDraft = computed(
-	() =>
-		draftState.value?.settings.some(
-			(setting) =>
-				dirtyOptionIds.value.has(setting.option_id) &&
-				(isLocalEditor.value || setting.sync_enabled) &&
-				(!!setting.validation_error || ['mixed', 'unset', 'invalid'].includes(setting.value_state)),
-		) ?? false,
-)
-const enableCandidates = computed(() =>
-	categorySettings.value.filter((setting) => !setting.sync_enabled && settingCanBeEnabled(setting)),
-)
-const disableCandidates = computed(() =>
-	categorySettings.value.filter((setting) => setting.sync_enabled && !setting.controlled),
-)
-const toggleableCategorySettings = computed(() =>
-	categorySettings.value.filter((setting) => !setting.controlled),
-)
-const allCategorySettingsSynced = computed(
-	() =>
-		toggleableCategorySettings.value.length > 0 &&
-		toggleableCategorySettings.value.every((setting) => setting.sync_enabled),
-)
-const modalTitle = computed(() =>
-	formatMessage(isLocalEditor.value ? messages.title : messages.syncTitle),
-)
-
-function categoryIcon(category: GameSettingCategory): Component {
-	return categoryIcons[category.id] ?? SettingsIcon
-}
-
-function changeCategory(_fromIndex: number, toIndex: number): boolean {
-	const category = categories.value[toIndex]
-	if (!category) return false
-	activeCategoryId.value = category.id
-	search.value = ''
-	return true
-}
-
-function editorRequest(): UpdateGameSettingsRequest | null {
-	if (!baseState.value || !draftState.value) return null
-	return {
-		expected_summary_revision: draftState.value.summary_revision,
-		expected_canonical_revision: draftState.value.canonical_revision,
-		expected_catalog_revision: draftState.value.catalog_revision,
-		changes: dirtyChanges.value,
-	}
-}
-
-async function load() {
-	const generation = ++loadGeneration
-	previewGeneration++
-	loading.value = true
-	loadError.value = false
-	try {
-		const state = props.instanceId
-			? await get_local_game_options_config(props.instanceId)
-			: await get_synced_game_options_config()
-		if (generation !== loadGeneration) return
-		baseState.value = cloneGameSettingsState(state)
-		draftState.value = cloneGameSettingsState(state)
-		touchedValueOptionIds.value = new Set()
-		const currentCategoryExists = categories.value.some(
-			(category) => category.id === activeCategoryId.value,
-		)
-		if (!currentCategoryExists)
-			activeCategoryId.value = categories.value[0]?.id ?? 'custom_settings'
-		const activeCategoryIndex = categories.value.findIndex(
-			(category) => category.id === activeCategoryId.value,
-		)
-		if (activeCategoryIndex >= 0) modal.value?.setTab(activeCategoryIndex)
-	} catch (error) {
-		if (generation !== loadGeneration) return
-		loadError.value = true
-		handleError(error)
-	} finally {
-		if (generation === loadGeneration) loading.value = false
-	}
-}
-
-function show() {
-	allowClose = false
-	search.value = ''
-	modal.value?.show()
-	void load()
-}
-
-function hide() {
-	modal.value?.hide()
-}
-
-function reset() {
-	if (previewTimer) clearTimeout(previewTimer)
-	previewTimer = null
-	previewGeneration++
-	loadGeneration++
-	saveGeneration++
-	baseState.value = null
-	draftState.value = null
-	loading.value = false
-	saving.value = false
-	loadError.value = false
-	touchedValueOptionIds.value = new Set()
-	allowClose = false
-}
-
-function beforeHide(): boolean {
-	if (allowClose || !isDirty.value) return true
-	void confirmDiscard()
-	return false
-}
-
-async function confirmDiscard() {
-	const discard = await confirmLeaveModal.value?.prompt()
-	if (!discard) return
-	allowClose = true
-	modal.value?.hide()
-}
-
-function cancelChanges() {
-	if (!baseState.value) return
-	if (previewTimer) clearTimeout(previewTimer)
-	previewTimer = null
-	previewGeneration++
-	draftState.value = cloneGameSettingsState(baseState.value)
-	touchedValueOptionIds.value = new Set()
-}
-
-function settingById(optionId: string): EditableGameSetting | undefined {
-	return draftState.value?.settings.find((setting) => setting.option_id === optionId)
-}
-
-function setSyncEnabled(optionId: string, enabled: boolean) {
-	if (!draftState.value) return
-	draftState.value.settings = draftState.value.settings.map((setting) =>
-		setting.option_id === optionId
-			? { ...setting, sync_enabled: enabled, validation_error: null }
-			: setting,
-	)
-	schedulePreview()
-}
-
-function setCanonicalValue(optionId: string, value: GameOptionCanonicalValue | null) {
-	if (!draftState.value) return
-	const currentSetting = settingById(optionId)
-	const baseSetting = baseState.value?.settings.find((setting) => setting.option_id === optionId)
-	if (!currentSetting) return
-
-	const revertedToBase =
-		!!baseSetting &&
-		!canonicalValuesEqual(currentSetting.canonical_value, baseSetting.canonical_value) &&
-		canonicalValuesEqual(value, baseSetting.canonical_value)
-	const touchedOptionIds = new Set(touchedValueOptionIds.value)
-	if (revertedToBase) {
-		touchedOptionIds.delete(optionId)
-	} else {
-		touchedOptionIds.add(optionId)
-	}
-	touchedValueOptionIds.value = touchedOptionIds
-	draftState.value.settings = draftState.value.settings.map((setting) =>
-		setting.option_id === optionId
-			? {
-					...setting,
-					canonical_value: value,
-					value_state: revertedToBase ? baseSetting.value_state : value ? 'canonical' : 'unset',
-					validation_error: revertedToBase ? baseSetting.validation_error : null,
-				}
-			: setting,
-	)
-	schedulePreview()
-}
-
-function enableVisible() {
-	if (!draftState.value) return
-	const optionIds = new Set(enableCandidates.value.map((setting) => setting.option_id))
-	draftState.value.settings = draftState.value.settings.map((setting) =>
-		optionIds.has(setting.option_id)
-			? { ...setting, sync_enabled: true, validation_error: null }
-			: setting,
-	)
-	schedulePreview()
-}
-
-function disableVisible() {
-	if (!draftState.value) return
-	const optionIds = new Set(disableCandidates.value.map((setting) => setting.option_id))
-	draftState.value.settings = draftState.value.settings.map((setting) =>
-		optionIds.has(setting.option_id)
-			? { ...setting, sync_enabled: false, validation_error: null }
-			: setting,
-	)
-	schedulePreview()
-}
-
-function toggleVisibleSync() {
-	if (allCategorySettingsSynced.value) {
-		disableVisible()
-	} else {
-		enableVisible()
-	}
-}
-
-function schedulePreview() {
-	previewGeneration++
-	if (previewTimer) clearTimeout(previewTimer)
-	previewTimer = setTimeout(() => void preview(), 350)
-}
-
-function mergePreview(preview: GameSettingsEditorState) {
-	if (!baseState.value || !draftState.value) return
-	const previousBase = cloneGameSettingsState(baseState.value)
-	const previousDraft = cloneGameSettingsState(draftState.value)
-	const dirtyIds = new Set(
-		gameSettingChanges(previousBase, previousDraft, touchedValueOptionIds.value).map(
-			(change) => change.option_id,
-		),
-	)
-	const stagedSettings = new Map(
-		previousDraft.settings
-			.filter((setting) => dirtyIds.has(setting.option_id))
-			.map((setting) => [setting.option_id, setting]),
-	)
-	const previousBaseSettings = new Map(
-		previousBase.settings.map((setting) => [setting.option_id, setting]),
-	)
-	const nextBase = cloneGameSettingsState(preview)
-	const nextDraft = cloneGameSettingsState(preview)
-	nextBase.settings = nextBase.settings.map((setting) =>
-		dirtyIds.has(setting.option_id)
-			? { ...(previousBaseSettings.get(setting.option_id) ?? setting) }
-			: setting,
-	)
-	nextDraft.settings = nextDraft.settings.map((setting): EditableGameSetting => {
-		const staged = stagedSettings.get(setting.option_id)
-		if (!staged) return setting
-		return {
-			...setting,
-			sync_enabled: staged.sync_enabled,
-			canonical_value: staged.canonical_value,
-			option_revision: staged.option_revision,
-		}
-	})
-	baseState.value = nextBase
-	draftState.value = nextDraft
-}
-
-async function preview() {
-	const request = editorRequest()
-	if (!request || request.changes.length === 0) {
-		previewGeneration++
-		if (baseState.value) draftState.value = cloneGameSettingsState(baseState.value)
-		return
-	}
-
-	const generation = ++previewGeneration
-	try {
-		const previewState = props.instanceId
-			? await preview_local_game_option_changes(props.instanceId, request)
-			: await preview_synced_game_option_changes(request)
-		if (generation !== previewGeneration) return
-		mergePreview(previewState)
-	} catch {
-		return
-	}
-}
-
-function applyChangesToRefreshedState(
-	refreshed: GameSettingsEditorState,
-	stagedDraft: GameSettingsEditorState,
-	changes: GameSettingChange[],
-	touchedOptionIds: ReadonlySet<string>,
-	conflictOptionIds: ReadonlySet<string> = new Set(),
-) {
-	const changesById = new Map(changes.map((change) => [change.option_id, change]))
-	const stagedSettings = new Map(
-		stagedDraft.settings.map((setting) => [setting.option_id, setting]),
-	)
-	const nextBase = cloneGameSettingsState(refreshed)
-	const nextDraft = cloneGameSettingsState(refreshed)
-
-	nextDraft.settings = nextDraft.settings.map((setting) => {
-		const change = changesById.get(setting.option_id)
-		const staged = stagedSettings.get(setting.option_id)
-		if (!change || !staged) return setting
-
-		return {
-			...setting,
-			...(change.sync_enabled !== undefined ? { sync_enabled: staged.sync_enabled } : {}),
-			...(change.canonical_value !== undefined
-				? {
-						canonical_value: staged.canonical_value,
-						value_state: staged.value_state,
-					}
-				: {}),
-			validation_error: conflictOptionIds.has(setting.option_id)
-				? 'changed_since_opened'
-				: staged.validation_error,
-		}
-	})
-
-	baseState.value = nextBase
-	draftState.value = nextDraft
-	touchedValueOptionIds.value = new Set(
-		[...touchedOptionIds].filter(
-			(optionId) => changesById.get(optionId)?.canonical_value !== undefined,
-		),
-	)
-}
-
-async function save() {
-	if (saving.value) return
-	const request = editorRequest()
-	if (!request || request.changes.length === 0 || !baseState.value || !draftState.value) return
-
-	if (previewTimer) clearTimeout(previewTimer)
-	previewTimer = null
-	previewGeneration++
-	const generation = ++saveGeneration
-	const previousBase = cloneGameSettingsState(baseState.value)
-	const optimisticState = cloneGameSettingsState(draftState.value)
-	const previouslyTouchedOptionIds = new Set(touchedValueOptionIds.value)
-	baseState.value = cloneGameSettingsState(optimisticState)
-	touchedValueOptionIds.value = new Set()
-	saving.value = true
-	try {
-		const result = props.instanceId
-			? await save_local_game_option_changes(props.instanceId, request)
-			: await save_synced_game_option_changes(request)
-		if (result.conflicts?.length) {
-			const refreshed =
-				result.state ??
-				(props.instanceId
-					? await get_local_game_options_config(props.instanceId)
-					: await get_synced_game_options_config())
-			if (generation !== saveGeneration || !draftState.value) return
-			previewGeneration++
-			const stagedDraft = cloneGameSettingsState(draftState.value)
-			const retainedTouchedOptionIds = new Set([
-				...previouslyTouchedOptionIds,
-				...touchedValueOptionIds.value,
-			])
-			const stagedChanges = gameSettingChanges(previousBase, stagedDraft, retainedTouchedOptionIds)
-			const conflicts = new Set(result.conflicts)
-			applyChangesToRefreshedState(
-				refreshed,
-				stagedDraft,
-				stagedChanges,
-				retainedTouchedOptionIds,
-				conflicts,
-			)
-
-			addNotification({
-				type: 'warning',
-				title: formatMessage(messages.conflictTitle),
-				text: formatMessage(messages.conflictText),
-			})
-			if (
-				gameSettingChanges(baseState.value, draftState.value, touchedValueOptionIds.value).length >
-				0
-			) {
-				schedulePreview()
-			}
-			return
-		}
-
-		const refreshed =
-			result.state ??
-			(props.instanceId
-				? await get_local_game_options_config(props.instanceId)
-				: await get_synced_game_options_config())
-		if (generation !== saveGeneration) {
-			emit('saved')
-			return
-		}
-		if (!baseState.value || !draftState.value) return
-		previewGeneration++
-		const stagedDraft = cloneGameSettingsState(draftState.value)
-		const touchedSinceSave = new Set(touchedValueOptionIds.value)
-		const changesSinceSave = gameSettingChanges(optimisticState, stagedDraft, touchedSinceSave)
-		applyChangesToRefreshedState(refreshed, stagedDraft, changesSinceSave, touchedSinceSave)
-		if (changesSinceSave.length > 0) schedulePreview()
-		emit('saved')
-	} catch (error) {
-		if (generation === saveGeneration && draftState.value) {
-			previewGeneration++
-			baseState.value = previousBase
-			touchedValueOptionIds.value = new Set([
-				...previouslyTouchedOptionIds,
-				...touchedValueOptionIds.value,
-			])
-			if (dirtyChanges.value.length > 0) schedulePreview()
-		}
-		handleError(error)
-	} finally {
-		if (generation === saveGeneration) saving.value = false
-	}
-}
-
-onUnmounted(() => {
-	if (previewTimer) clearTimeout(previewTimer)
-})
-
-defineExpose({ show, hide })
-</script>
-
-<template>
-	<TabbedModal
-		ref="modal"
-		:tabs="categoryTabs"
-		:header="modalTitle"
-		:before-hide="beforeHide"
-		:before-tab-change="changeCategory"
-		:on-after-hide="reset"
-		:floating-action-bar-shown="isDirty"
-		:max-width="'min(1080px, calc(95vw - 2rem))'"
-		:width="'min(1080px, calc(95vw - 2rem))'"
-	>
-		<template #sidebar-header>
-			<div class="pb-4">
-				<Input
-					v-model="search"
-					:icon="SearchIcon"
-					type="search"
-					autocomplete="off"
-					:placeholder="formatMessage(messages.search)"
-					wrapper-class="w-full shrink-0"
-				/>
-			</div>
-		</template>
-
-		<template #content>
-			<div class="flex min-h-full min-w-0 flex-col">
-				<div
-					v-if="!isLocalEditor && (loading || loadError || categorySettings.length > 0)"
-					class="mb-4 flex shrink-0 flex-wrap items-start justify-between gap-4 border-0 border-b border-solid border-divider pb-4"
-				>
-					<p class="m-0 min-w-60 flex-1 text-primary">
-						{{ formatMessage(messages.syncedOptionsDescription) }}
-					</p>
-					<div class="ml-auto flex w-48 justify-end">
-						<Button
-							size="lg"
-							:disabled="
-								allCategorySettingsSynced
-									? disableCandidates.length === 0
-									: enableCandidates.length === 0
-							"
-							@click="toggleVisibleSync"
-						>
-							<LinkIcon v-if="allCategorySettingsSynced" />
-							<UnlinkIcon v-else />
-							{{
-								formatMessage(allCategorySettingsSynced ? messages.disableAll : messages.enableAll)
-							}}
-						</Button>
-					</div>
-				</div>
-
-				<div
-					v-if="loading"
-					class="flex min-h-40 flex-1 items-center justify-center gap-2 text-secondary"
-				>
-					<SpinnerIcon class="size-5 animate-spin" />
-					{{ formatMessage(messages.loading) }}
-				</div>
-				<div
-					v-else-if="loadError"
-					class="flex min-h-40 flex-1 flex-col items-center justify-center gap-3 text-secondary"
-				>
-					<p class="m-0">{{ formatMessage(messages.loadFailed) }}</p>
-					<Button @click="load">
-						<RefreshCwIcon />
-						{{ formatMessage(messages.retry) }}
-					</Button>
-				</div>
-				<div v-else class="min-h-0 flex-1">
-					<div
-						v-if="categorySettings.length === 0"
-						class="flex h-full min-h-40 items-center justify-center px-8 text-center text-secondary"
-					>
-						{{
-							activeCategory?.is_custom && !search
-								? formatMessage(messages.customEmpty)
-								: formatMessage(messages.empty)
-						}}
-					</div>
-					<div v-else class="flex flex-col gap-4">
-						<GameSettingRow
-							v-for="setting in categorySettings"
-							:key="setting.option_id"
-							:setting="setting"
-							:keybind-conflicts="keybindConflicts.get(setting.option_id)"
-							:show-sync-toggle="!isLocalEditor"
-							@update:sync-enabled="setSyncEnabled(setting.option_id, $event)"
-							@update:canonical-value="setCanonicalValue(setting.option_id, $event)"
-						/>
-					</div>
-				</div>
-			</div>
-		</template>
-
-		<template #floating-action-bar>
-			<FloatingActionBar v-if="isDirty" :shown="true" :inline="true" :aria-label="modalTitle">
-				<p class="m-0 text-sm font-semibold md:text-base">
-					{{ formatMessage(messages.unsavedChanges) }}
-				</p>
-				<div class="ml-auto flex gap-2">
-					<Button type="outlined" @click="cancelChanges">
-						<XIcon />
-						{{ formatMessage(commonMessages.cancelButton) }}
-					</Button>
-					<Button
-						type="colored"
-						color="brand"
-						:disabled="!isDirty || loading || saving || hasBlockingDraft"
-						:loading="saving"
-						@click="save"
-					>
-						<SaveIcon v-if="!saving" />
-						{{ formatMessage(messages.saveSettings) }}
-					</Button>
-				</div>
-			</FloatingActionBar>
-		</template>
-	</TabbedModal>
-
-	<ConfirmLeaveModal ref="confirmLeaveModal" />
-</template>
diff --git a/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-boolean-control.vue b/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-boolean-control.vue
deleted file mode 100644
index 45601bb28f..0000000000
--- a/apps/app-frontend/src/components/ui/settings/instances/game-settings/game-setting-boolean-control.vue
+++ /dev/null
@@ -1,53 +0,0 @@
-<script setup lang="ts">
-defineProps<{
-	modelValue?: boolean
-	disabled?: boolean
-	label: string
-	onLabel: string
-	offLabel: string
-	placeholder?: string
-}>()
-
-const emit = defineEmits<{
-	'update:model-value': [value: boolean]
-}>()
-</script>
-
-<template>
-	<div
-		v-tooltip="modelValue === undefined ? placeholder : undefined"
-		role="group"
-		:aria-label="label"
-		class="inline-flex h-9 items-center gap-0.5 rounded-xl border border-solid border-surface-5 bg-transparent p-px shadow-sm"
-		:class="disabled ? 'opacity-50' : ''"
-	>
-		<button
-			type="button"
-			:aria-pressed="modelValue === true"
-			:disabled="disabled"
-			class="flex h-8 cursor-pointer items-center rounded-[10px] border border-solid px-3 text-base font-medium leading-5 text-secondary transition-all active:scale-[0.97] focus-visible:outline-none focus-visible:ring-4 focus-visible:ring-brand-shadow disabled:cursor-not-allowed"
-			:class="
-				modelValue === true
-					? 'border-green bg-highlight-green !text-green'
-					: 'border-transparent bg-transparent hover:bg-surface-4'
-			"
-			@click="emit('update:model-value', true)"
-		>
-			{{ onLabel }}
-		</button>
-		<button
-			type="button"
-			:aria-pressed="modelValue === false"
-			:disabled="disabled"
-			class="flex h-8 cursor-pointer items-center rounded-[10px] border border-solid px-3 text-base font-medium leading-5 text-secondary transition-all active:scale-[0.97] focus-visible:outline-none focus-visible:ring-4 focus-visible:ring-brand-shadow disabled:cursor-not-allowed"
-			:class="
-				modelValue === false
-					? 'border-surface-5 bg-surface-4'
-					: 'border-transparent bg-transparent hover:bg-surface-4'
-			"
-			@click="emit('update:model-value', false)"
-		>
-			{{ offLabel }}
-		</button>
-	</div>
-</template>
diff --git a/apps/app-frontend/src/components/ui/settings/instances/instances-synced-settings/command-history-modal.vue b/apps/app-frontend/src/components/ui/settings/instances/instances-synced-settings/command-history-modal.vue
new file mode 100644
index 0000000000..432ba3c75c
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/settings/instances/instances-synced-settings/command-history-modal.vue
@@ -0,0 +1,124 @@
+<script setup lang="ts">
+import { SaveIcon, XIcon } from '@modrinth/assets'
+import {
+	Button,
+	commonMessages,
+	defineMessages,
+	injectNotificationManager,
+	NewModal,
+	useVIntl,
+} from '@modrinth/ui'
+import { useMutation, useQuery, useQueryClient } from '@tanstack/vue-query'
+import { defineAsyncComponent, nextTick, ref } from 'vue'
+
+import { set_command_history } from '@/helpers/instance'
+import { commandHistoryQueryOptions, syncedOptionsKeys } from '@/helpers/synced-options'
+
+const { formatMessage } = useVIntl()
+const { handleError } = injectNotificationManager()
+const queryClient = useQueryClient()
+const modal = ref<InstanceType<typeof NewModal> | null>(null)
+const commandHistory = ref('')
+const historyQuery = useQuery({ ...commandHistoryQueryOptions(), enabled: false })
+const CommandHistoryEditor = defineAsyncComponent(async () => {
+	const [editor] = await Promise.all([
+		import('vue3-ace-editor'),
+		import('@modrinth/ui/src/utils/ace-theme'),
+		import('@modrinth/ui/src/utils/ace-mode-mcfunction'),
+	])
+	return editor.VAceEditor
+})
+const saveMutation = useMutation({
+	mutationFn: set_command_history,
+	onSuccess: (history) => {
+		queryClient.setQueryData(syncedOptionsKeys.commandHistory, history)
+	},
+	onError: handleError,
+})
+
+const messages = defineMessages({
+	commandHistoryEditorTitle: {
+		id: 'app.settings.synced-options.command-history.editor-title',
+		defaultMessage: 'Edit command history',
+	},
+})
+
+async function show() {
+	const result = await historyQuery.refetch()
+	if (result.isError) {
+		handleError(result.error)
+		return
+	}
+	if (!result.isSuccess) return
+	commandHistory.value = result.data
+	modal.value?.show()
+}
+
+async function saveCommandHistory() {
+	if (saveMutation.isPending.value) return
+	try {
+		await saveMutation.mutateAsync(commandHistory.value)
+		await nextTick()
+		modal.value?.hide()
+	} catch {
+		return
+	}
+}
+
+defineExpose({ show })
+</script>
+
+<template>
+	<NewModal
+		ref="modal"
+		:header="formatMessage(messages.commandHistoryEditorTitle)"
+		:disable-close="saveMutation.isPending.value"
+		no-padding
+		actions-divider
+		max-width="700px"
+		width="700px"
+	>
+		<CommandHistoryEditor
+			v-model:value="commandHistory"
+			lang="mcfunction"
+			theme="modrinth"
+			:print-margin="false"
+			class="command-history-editor ace-modrinth"
+			style="height: 420px; font-size: 0.875rem"
+		/>
+		<template #actions>
+			<div class="flex justify-end gap-2">
+				<Button type="outlined" @click="modal?.hide()">
+					<XIcon aria-hidden="true" />
+					{{ formatMessage(commonMessages.cancelButton) }}
+				</Button>
+				<Button type="colored" :loading="saveMutation.isPending.value" @click="saveCommandHistory">
+					<SaveIcon aria-hidden="true" />
+					{{ formatMessage(commonMessages.saveButton) }}
+				</Button>
+			</div>
+		</template>
+	</NewModal>
+</template>
+
+<style>
+.command-history-editor.ace-modrinth {
+	background-color: var(--surface-2);
+}
+
+.command-history-editor.ace-modrinth .ace_gutter {
+	background: var(--surface-1);
+}
+
+.command-history-editor.ace-modrinth .ace_marker-layer .ace_active-line {
+	background: var(--surface-2-5);
+}
+
+.command-history-editor.ace-modrinth .ace_gutter-active-line {
+	background-color: var(--surface-1-5);
+}
+
+.command-history-editor.ace-modrinth.ace_multiselect .ace_selection.ace_start {
+	box-shadow: 0 0 3px 0 var(--surface-2);
+}
+</style>
diff --git a/apps/app-frontend/src/components/ui/settings/instances/instances-synced-settings/index.vue b/apps/app-frontend/src/components/ui/settings/instances/instances-synced-settings/index.vue
new file mode 100644
index 0000000000..413b6cf6f4
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/settings/instances/instances-synced-settings/index.vue
@@ -0,0 +1,564 @@
+<script setup lang="ts">
+import { EditIcon } from '@modrinth/assets'
+import {
+	commonMessages,
+	defineMessages,
+	IconButton,
+	injectNotificationManager,
+	Toggle,
+	useVIntl,
+} from '@modrinth/ui'
+import { useMutation, useQuery, useQueryClient } from '@tanstack/vue-query'
+import { computed, nextTick, onScopeDispose, ref } from 'vue'
+
+import {
+	type GlobalSyncedOptions,
+	isSyncedOptionAvailable,
+	set_global_synced_option,
+	type SyncedOption,
+} from '@/helpers/instance'
+import { appSettingsKeys } from '@/helpers/settings'
+import {
+	gameOptionsSyncSourcesQueryOptions,
+	globalSyncedOptionsQueryOptions,
+	initializedSyncedOptionsQueryOptions,
+	syncedOptionsKeys,
+	syncedServersQueryOptions,
+} from '@/helpers/synced-options'
+import { syncedPackKeys, syncedPackQueryOptions } from '@/helpers/synced-packs'
+import { instanceKeys, instanceListQueryOptions } from '@/pages/instance/query-options'
+
+import GameSettingsModal from '../game-settings-modal/index.vue'
+import SyncedPacksModal from '../SyncedPacksModal.vue'
+import SyncSourceModal from '../SyncSourceModal.vue'
+import CommandHistoryModal from './command-history-modal.vue'
+import LaunchOptions from './launch-options.vue'
+import SyncedServersModal from './servers-modal.vue'
+
+const { handleError } = injectNotificationManager()
+const { formatMessage } = useVIntl()
+const queryClient = useQueryClient()
+const syncedPacksModal = ref<InstanceType<typeof SyncedPacksModal>>()
+const commandHistoryModal = ref<InstanceType<typeof CommandHistoryModal>>()
+const syncedServersModal = ref<InstanceType<typeof SyncedServersModal>>()
+
+const messages = defineMessages({
+	resourcePacks: {
+		id: 'app.settings.synced-options.resource-packs',
+		defaultMessage: 'Sync resource packs',
+	},
+	resourcePacksDescription: {
+		id: 'app.settings.synced-options.resource-packs.description',
+		defaultMessage: 'Use the same resource packs across your instances',
+	},
+	dataPacks: { id: 'app.settings.synced-options.data-packs', defaultMessage: 'Sync data packs' },
+	dataPacksDescription: {
+		id: 'app.settings.synced-options.data-packs.description',
+		defaultMessage: 'Use the same datapacks across your instances',
+	},
+	packsDisabled: {
+		id: 'app.settings.synced-options.packs.disabled',
+		defaultMessage: 'Enable syncing before editing shared packs.',
+	},
+	gameSettings: {
+		id: 'app.settings.synced-options.game-settings',
+		defaultMessage: 'Sync game options',
+	},
+	gameSettingsDescription: {
+		id: 'app.settings.synced-options.game-settings.description',
+		defaultMessage: 'Use the same game options across your instances',
+	},
+	gameSettingsButton: {
+		id: 'app.settings.synced-options.game-settings.button',
+		defaultMessage: 'Edit game settings',
+	},
+	gameSettingsDisabledTooltip: {
+		id: 'app.settings.synced-options.game-settings.disabled-tooltip',
+		defaultMessage: 'Enable game settings sync before choosing individual settings.',
+	},
+	noGameOptionsToEdit: {
+		id: 'app.settings.synced-options.game-settings.no-options-to-edit',
+		defaultMessage: "You haven't got any options yet to edit",
+	},
+	multiplayerServers: {
+		id: 'app.settings.synced-options.multiplayer-servers',
+		defaultMessage: 'Sync multiplayer servers',
+	},
+	multiplayerServersDescription: {
+		id: 'app.settings.synced-options.multiplayer-servers.description',
+		defaultMessage: 'Use the same multiplayer servers across your instances.',
+	},
+	commandHistory: {
+		id: 'app.settings.synced-options.command-history',
+		defaultMessage: 'Sync command history',
+	},
+	commandHistoryDescription: {
+		id: 'app.settings.synced-options.command-history.description',
+		defaultMessage: 'Use the same command history across your instances.',
+	},
+	creativeHotbars: {
+		id: 'app.settings.synced-options.creative-hotbars',
+		defaultMessage: 'Sync saved creative hotbars',
+	},
+	creativeHotbarsDescription: {
+		id: 'app.settings.synced-options.creative-hotbars.description',
+		defaultMessage: 'Use the same saved creative hotbars across your instances.',
+	},
+	multiplayerServersSyncSourceDescription: {
+		id: 'app.settings.synced-options.choose-sync-source.multiplayer-servers-description',
+		defaultMessage: 'Pick the instance whose multiplayer servers become the shared copy.',
+	},
+	commandHistorySyncSourceDescription: {
+		id: 'app.settings.synced-options.choose-sync-source.command-history-description',
+		defaultMessage: 'Pick the instance whose command history becomes the shared copy.',
+	},
+	creativeHotbarsSyncSourceDescription: {
+		id: 'app.settings.synced-options.choose-sync-source.creative-hotbars-description',
+		defaultMessage: 'Pick the instance whose saved creative hotbars become the shared copy.',
+	},
+	gameSettingsSyncSourceDescription: {
+		id: 'app.settings.synced-options.choose-sync-source.game-settings-description',
+		defaultMessage: 'Choose which instance to copy game settings from.',
+	},
+	noServersSyncedYet: {
+		id: 'app.settings.synced-options.multiplayer-servers.none-synced-yet',
+		defaultMessage: "You haven't synced any servers yet",
+	},
+	noResourcePacksSyncedYet: {
+		id: 'app.settings.synced-options.resource-packs.none-synced-yet',
+		defaultMessage: "You haven't synced any resource packs yet",
+	},
+	noDataPacksSyncedYet: {
+		id: 'app.settings.synced-options.data-packs.none-synced-yet',
+		defaultMessage: "You haven't synced any data packs yet",
+	},
+	noInstancesToEdit: {
+		id: 'app.settings.synced-options.edit.no-instances',
+		defaultMessage: 'Add an instance before editing synced data.',
+	},
+	noSyncedDataToEdit: {
+		id: 'app.settings.synced-options.edit.no-synced-data',
+		defaultMessage: 'Choose a sync source before editing this setting.',
+	},
+})
+
+const globalRows: Array<{
+	option: SyncedOption
+	title: keyof typeof messages
+	description?: keyof typeof messages
+	editable?: 'game-settings' | 'servers' | 'commands' | 'resourcepack' | 'datapack'
+}> = [
+	{
+		option: 'game_options',
+		title: 'gameSettings',
+		description: 'gameSettingsDescription',
+		editable: 'game-settings',
+	},
+	{
+		option: 'multiplayer_servers',
+		title: 'multiplayerServers',
+		description: 'multiplayerServersDescription',
+		editable: 'servers',
+	},
+	{
+		option: 'resource_packs',
+		title: 'resourcePacks',
+		description: 'resourcePacksDescription',
+		editable: 'resourcepack',
+	},
+	{
+		option: 'data_packs',
+		title: 'dataPacks',
+		description: 'dataPacksDescription',
+		editable: 'datapack',
+	},
+	{
+		option: 'command_history',
+		title: 'commandHistory',
+		description: 'commandHistoryDescription',
+		editable: 'commands',
+	},
+	{
+		option: 'creative_hotbars',
+		title: 'creativeHotbars',
+		description: 'creativeHotbarsDescription',
+	},
+]
+
+const availableGlobalRows = globalRows.filter((row) => isSyncedOptionAvailable(row.option))
+
+const defaultGlobalOptions: GlobalSyncedOptions = {
+	resource_packs: false,
+	data_packs: false,
+	game_options: false,
+	command_history: false,
+	multiplayer_servers: false,
+	creative_hotbars: false,
+	screenshots: false,
+}
+
+const globalOptionsQuery = useQuery(globalSyncedOptionsQueryOptions())
+const initializedOptionsQuery = useQuery(initializedSyncedOptionsQueryOptions())
+const gameOptionSourcesQuery = useQuery(gameOptionsSyncSourcesQueryOptions())
+const resourcePacksQuery = useQuery(syncedPackQueryOptions('resourcepack'))
+const dataPacksQuery = useQuery(syncedPackQueryOptions('datapack'))
+const globalOptions = computed(() => globalOptionsQuery.data.value ?? defaultGlobalOptions)
+const initializedOptions = computed(
+	() => initializedOptionsQuery.data.value ?? defaultGlobalOptions,
+)
+const gameOptionSources = computed(() => gameOptionSourcesQuery.data.value ?? [])
+const instancesQuery = useQuery(instanceListQueryOptions())
+const instances = computed(() => instancesQuery.data.value ?? [])
+const serversQuery = useQuery(syncedServersQueryOptions())
+const syncedServers = computed(() => serversQuery.data.value ?? [])
+const eligibleGameOptionSourceIds = computed(
+	() =>
+		new Set(
+			gameOptionSources.value.filter((source) => source.eligible).map((source) => source.source_id),
+		),
+)
+const hasGameOptionsToEdit = computed(
+	() =>
+		initializedOptions.value.game_options ||
+		instances.value.some(
+			(instance) =>
+				instance.synced_options.game_options && eligibleGameOptionSourceIds.value.has(instance.id),
+		),
+)
+const baseOption = ref<SyncedOption | null>(null)
+const baseInstanceId = ref('')
+const baseModal = ref<InstanceType<typeof SyncSourceModal> | null>(null)
+const gameSettingsModal = ref<InstanceType<typeof GameSettingsModal> | null>(null)
+const baseSourcesLoading = computed(() =>
+	baseOption.value === null
+		? false
+		: baseOption.value === 'game_options'
+			? gameOptionSourcesQuery.isFetching.value
+			: instancesQuery.isFetching.value,
+)
+const baseSourcesError = computed(() =>
+	baseOption.value === 'game_options'
+		? gameOptionSourcesQuery.isError.value
+		: instancesQuery.isError.value,
+)
+let baseSourceGeneration = 0
+
+const baseInstanceDescription = computed(() => {
+	switch (baseOption.value) {
+		case 'game_options':
+			return formatMessage(messages.gameSettingsSyncSourceDescription)
+		case 'multiplayer_servers':
+			return formatMessage(messages.multiplayerServersSyncSourceDescription)
+		case 'command_history':
+			return formatMessage(messages.commandHistorySyncSourceDescription)
+		case 'creative_hotbars':
+			return formatMessage(messages.creativeHotbarsSyncSourceDescription)
+		default:
+			return ''
+	}
+})
+
+const baseInstances = computed(() =>
+	baseOption.value === 'game_options'
+		? gameOptionSources.value.map((source) => ({
+				id: source.source_id,
+				name: source.name,
+				icon_path: source.icon_path,
+				eligible: source.eligible,
+			}))
+		: instances.value.map((instance) => ({
+				id: instance.id,
+				name: instance.name,
+				icon_path: instance.icon_path,
+				eligible: instance.install_stage === 'installed' && !instance.quarantined,
+			})),
+)
+
+async function invalidateSyncedOptions() {
+	await Promise.all([
+		queryClient.invalidateQueries({ queryKey: instanceKeys.all }),
+		queryClient.invalidateQueries({ queryKey: ['instance-synced-options'] }),
+		queryClient.invalidateQueries({ queryKey: syncedOptionsKeys.global }),
+		queryClient.invalidateQueries({ queryKey: syncedOptionsKeys.initialized }),
+		queryClient.invalidateQueries({ queryKey: syncedOptionsKeys.gameSources }),
+		queryClient.invalidateQueries({ queryKey: ['worlds'] }),
+		queryClient.invalidateQueries({ queryKey: syncedPackKeys.all }),
+	])
+}
+
+function emptySyncedContentMessage(row: (typeof globalRows)[number]) {
+	if (
+		row.editable === 'servers' &&
+		(instances.value.length === 0 || syncedServers.value.length === 0)
+	) {
+		return messages.noServersSyncedYet
+	}
+	if (row.editable === 'resourcepack' && !resourcePacksQuery.data.value?.length) {
+		return messages.noResourcePacksSyncedYet
+	}
+	if (row.editable === 'datapack' && !dataPacksQuery.data.value?.length) {
+		return messages.noDataPacksSyncedYet
+	}
+}
+
+function canEditGlobalOption(row: (typeof globalRows)[number]): boolean {
+	if (!row.editable || !globalOptions.value[row.option]) return false
+	if (emptySyncedContentMessage(row)) return false
+	if (row.editable === 'resourcepack' || row.editable === 'datapack') return true
+	if (row.editable === 'game-settings') return hasGameOptionsToEdit.value
+	return instances.value.length > 0 && initializedOptions.value[row.option]
+}
+
+function editGlobalOptionTooltip(row: (typeof globalRows)[number]): string {
+	const emptyMessage = emptySyncedContentMessage(row)
+	if (emptyMessage) return formatMessage(emptyMessage)
+	if (row.editable === 'resourcepack' || row.editable === 'datapack') {
+		return formatMessage(
+			globalOptions.value[row.option] ? commonMessages.editButton : messages.packsDisabled,
+		)
+	}
+	if (row.editable === 'game-settings') {
+		if (!hasGameOptionsToEdit.value) return formatMessage(messages.noGameOptionsToEdit)
+		if (!globalOptions.value[row.option]) {
+			return formatMessage(messages.gameSettingsDisabledTooltip)
+		}
+		return formatMessage(messages.gameSettingsButton)
+	}
+	if (instances.value.length === 0) {
+		return formatMessage(messages.noInstancesToEdit)
+	}
+	if (!initializedOptions.value[row.option]) {
+		return formatMessage(messages.noSyncedDataToEdit)
+	}
+	return formatMessage(commonMessages.editButton)
+}
+
+type GlobalOptionMutationVariables = {
+	option: SyncedOption
+	enabled: boolean
+	baseInstanceId?: string
+}
+
+const globalOptionMutation = useMutation({
+	mutationKey: syncedOptionsKeys.set,
+	mutationFn: ({ option, enabled, baseInstanceId }: GlobalOptionMutationVariables) =>
+		set_global_synced_option(option, enabled, baseInstanceId),
+	onMutate: async ({ option, enabled }) => {
+		await queryClient.cancelQueries({ queryKey: syncedOptionsKeys.global })
+		const previous = globalOptions.value[option]
+
+		if (option !== 'game_options' || !enabled) {
+			queryClient.setQueryData<GlobalSyncedOptions>(syncedOptionsKeys.global, (current) => ({
+				...(current ?? defaultGlobalOptions),
+				[option]: enabled,
+			}))
+		}
+
+		return { previous }
+	},
+	onError: (error, { option }, context) => {
+		queryClient.setQueryData<GlobalSyncedOptions>(syncedOptionsKeys.global, (current) => ({
+			...(current ?? defaultGlobalOptions),
+			[option]: context?.previous ?? defaultGlobalOptions[option],
+		}))
+		handleError(error)
+	},
+	onSuccess: async (options, { option, enabled }) => {
+		queryClient.setQueryData(syncedOptionsKeys.global, options)
+		if (option === 'game_options') {
+			await refreshSettings()
+		}
+		if (enabled && option === 'multiplayer_servers') {
+			await queryClient.invalidateQueries({ queryKey: syncedOptionsKeys.servers })
+		}
+	},
+	onSettled: async () => {
+		if (queryClient.isMutating({ mutationKey: syncedOptionsKeys.set }) === 1) {
+			await invalidateSyncedOptions()
+		}
+	},
+})
+
+const canToggleGlobalOptions = computed(
+	() =>
+		!!globalOptionsQuery.data.value &&
+		!globalOptionMutation.isPending.value &&
+		!baseSourcesLoading.value,
+)
+
+async function chooseBaseInstance(option: SyncedOption) {
+	const generation = ++baseSourceGeneration
+	baseOption.value = option
+	baseInstanceId.value = ''
+
+	try {
+		if (option === 'game_options') {
+			await queryClient.fetchQuery(gameOptionsSyncSourcesQueryOptions())
+		} else {
+			await queryClient.fetchQuery({ ...instanceListQueryOptions(), staleTime: 0 })
+		}
+	} catch (error) {
+		if (generation !== baseSourceGeneration) return
+		handleError(error)
+		baseModal.value?.show()
+		return
+	}
+
+	if (generation !== baseSourceGeneration) return
+	const eligibleSources = baseInstances.value.filter((source) => source.eligible)
+	baseInstanceId.value = eligibleSources[0]?.id ?? ''
+	if (eligibleSources.length > 1) {
+		baseModal.value?.show()
+		return
+	}
+
+	try {
+		await globalOptionMutation.mutateAsync({
+			option,
+			enabled: true,
+			baseInstanceId: eligibleSources[0]?.id,
+		})
+		await nextTick()
+		if (!baseModal.value?.hide()) clearBaseSource()
+	} catch {
+		return
+	}
+}
+
+function toggleGlobalOption(option: SyncedOption, enabled: boolean) {
+	if (!isSyncedOptionAvailable(option) || !canToggleGlobalOptions.value) return
+	if (
+		enabled &&
+		option !== 'screenshots' &&
+		option !== 'resource_packs' &&
+		option !== 'data_packs'
+	) {
+		void chooseBaseInstance(option)
+		return
+	}
+	globalOptionMutation.mutate({ option, enabled })
+}
+
+async function confirmBaseInstance() {
+	if (!baseOption.value || !baseInstanceId.value) return
+	try {
+		await globalOptionMutation.mutateAsync({
+			option: baseOption.value,
+			enabled: true,
+			baseInstanceId: baseInstanceId.value,
+		})
+		await nextTick()
+		baseModal.value?.hide()
+	} catch {
+		return
+	}
+}
+
+function editGlobalOption(row: (typeof globalRows)[number]) {
+	if (!isSyncedOptionAvailable(row.option)) return
+	if (row.editable === 'resourcepack' || row.editable === 'datapack') {
+		void syncedPacksModal.value?.show(row.editable)
+	} else if (row.editable === 'game-settings') {
+		openGameSettings()
+	} else if (row.editable === 'commands') {
+		void commandHistoryModal.value?.show()
+	} else {
+		void syncedServersModal.value?.show()
+	}
+}
+
+function openGameSettings() {
+	if (!hasGameOptionsToEdit.value) return
+	gameSettingsModal.value?.show()
+}
+
+function refreshSettings() {
+	return queryClient.invalidateQueries({ queryKey: appSettingsKeys.all })
+}
+
+async function handleGameSettingsSaved() {
+	await Promise.all([invalidateSyncedOptions(), refreshSettings()])
+}
+
+function clearBaseSource() {
+	baseSourceGeneration++
+	baseOption.value = null
+}
+
+onScopeDispose(clearBaseSource)
+</script>
+
+<template>
+	<div>
+		<SyncedPacksModal ref="syncedPacksModal" />
+		<CommandHistoryModal ref="commandHistoryModal" />
+		<SyncedServersModal ref="syncedServersModal" />
+		<GameSettingsModal ref="gameSettingsModal" @saved="handleGameSettingsSaved" />
+
+		<SyncSourceModal
+			ref="baseModal"
+			v-model="baseInstanceId"
+			:description="baseInstanceDescription"
+			:sources="baseInstances"
+			:loading="baseSourcesLoading"
+			:error="baseSourcesError"
+			:pending="globalOptionMutation.isPending.value"
+			@confirm="confirmBaseInstance"
+			@close="clearBaseSource"
+			@retry="baseOption && chooseBaseInstance(baseOption)"
+		/>
+
+		<section class="border-0 border-b border-solid border-surface-4 pb-6">
+			<div class="flex flex-col gap-6">
+				<div class="flex flex-col gap-4">
+					<div
+						v-for="row in availableGlobalRows"
+						:key="row.option"
+						class="flex items-center justify-between gap-6"
+					>
+						<div class="flex min-w-0 flex-col gap-1">
+							<h2 class="m-0 text-lg font-semibold text-contrast">
+								{{ formatMessage(messages[row.title]) }}
+							</h2>
+							<p v-if="row.description" class="m-0 text-secondary">
+								{{ formatMessage(messages[row.description]) }}
+							</p>
+						</div>
+						<div class="flex shrink-0 items-center gap-2">
+							<span v-if="row.editable" v-tooltip="editGlobalOptionTooltip(row)" class="flex">
+								<IconButton
+									type="outlined"
+									circular
+									:disabled="
+										!canEditGlobalOption(row) ||
+										initializedOptionsQuery.isPending.value ||
+										globalOptionMutation.isPending.value
+									"
+									:label="
+										formatMessage(
+											row.editable === 'game-settings'
+												? messages.gameSettingsButton
+												: commonMessages.editButton,
+										)
+									"
+									@click="editGlobalOption(row)"
+								>
+									<EditIcon aria-hidden="true" />
+								</IconButton>
+							</span>
+							<Toggle
+								:id="`global-sync-${row.option}`"
+								:model-value="globalOptions[row.option]"
+								:disabled="!canToggleGlobalOptions"
+								:aria-label="formatMessage(messages[row.title])"
+								@update:model-value="(enabled) => toggleGlobalOption(row.option, enabled)"
+							/>
+						</div>
+					</div>
+				</div>
+			</div>
+		</section>
+
+		<LaunchOptions />
+	</div>
+</template>
diff --git a/apps/app-frontend/src/components/ui/settings/instances/instances-synced-settings/launch-options.vue b/apps/app-frontend/src/components/ui/settings/instances/instances-synced-settings/launch-options.vue
new file mode 100644
index 0000000000..e5ac9f5698
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/settings/instances/instances-synced-settings/launch-options.vue
@@ -0,0 +1,463 @@
+<script setup lang="ts">
+import { SpinnerIcon } from '@modrinth/assets'
+import {
+	Button,
+	commonMessages,
+	defineMessages,
+	injectNotificationManager,
+	Input,
+	Slider,
+	Toggle,
+	useVIntl,
+} from '@modrinth/ui'
+import { useMutation, useQuery, useQueryClient } from '@tanstack/vue-query'
+import { ref, watch } from 'vue'
+
+import useMemorySlider from '@/composables/useMemorySlider'
+import {
+	type AppSettings,
+	appSettingsKeys,
+	appSettingsQueryOptions,
+	get,
+	parseEnvVars,
+	serializeEnvVars,
+	set,
+} from '@/helpers/settings'
+
+const { handleError } = injectNotificationManager()
+const { formatMessage } = useVIntl()
+const queryClient = useQueryClient()
+type LaunchSettings = Pick<
+	AppSettings,
+	'force_fullscreen' | 'game_resolution' | 'memory' | 'hooks'
+> & {
+	launchArgs: string
+	envVars: string
+}
+type LaunchSettingsUpdate = Pick<
+	AppSettings,
+	| 'force_fullscreen'
+	| 'game_resolution'
+	| 'memory'
+	| 'hooks'
+	| 'extra_launch_args'
+	| 'custom_env_vars'
+>
+
+const settingsQuery = useQuery(appSettingsQueryOptions())
+const settings = ref<LaunchSettings | null>(null)
+const mutation = useMutation({
+	mutationKey: appSettingsKeys.update,
+	scope: { id: 'app-settings' },
+	mutationFn: async (changes: LaunchSettingsUpdate) => {
+		await set({ ...(await get()), ...changes })
+	},
+	onMutate: () => queryClient.cancelQueries({ queryKey: appSettingsKeys.all }),
+	onError: handleError,
+	onSettled: async () => {
+		if (queryClient.isMutating({ mutationKey: appSettingsKeys.update }) === 1) {
+			await queryClient.invalidateQueries({ queryKey: appSettingsKeys.all })
+		}
+	},
+})
+watch(
+	settingsQuery.data,
+	(value) => {
+		if (
+			!value ||
+			(settings.value && queryClient.isMutating({ mutationKey: appSettingsKeys.update }))
+		) {
+			return
+		}
+		settings.value = {
+			force_fullscreen: value.force_fullscreen,
+			game_resolution: [...value.game_resolution],
+			memory: { ...value.memory },
+			hooks: { ...value.hooks },
+			launchArgs: value.extra_launch_args.join(' '),
+			envVars: serializeEnvVars(value.custom_env_vars),
+		}
+	},
+	{ immediate: true, flush: 'sync' },
+)
+watch(settingsQuery.error, (error) => {
+	if (error) handleError(error)
+})
+watch(
+	settings,
+	(value, previous) => {
+		if (!value || value !== previous) return
+		if (!value.game_resolution.every((dimension) => Number.isInteger(dimension) && dimension > 0)) {
+			return
+		}
+		mutation.mutate({
+			force_fullscreen: value.force_fullscreen,
+			game_resolution: [...value.game_resolution],
+			memory: { ...value.memory },
+			hooks: { ...value.hooks },
+			extra_launch_args: value.launchArgs.trim().split(/\s+/).filter(Boolean),
+			custom_env_vars: parseEnvVars(value.envVars),
+		})
+	},
+	{ deep: true },
+)
+
+const { maxMemory, snapPoints } = await useMemorySlider()
+
+const messages = defineMessages({
+	windowSectionTitle: {
+		id: 'app.settings.default-instance-options.window.title',
+		defaultMessage: 'Window',
+	},
+	javaAndMemorySectionTitle: {
+		id: 'app.settings.default-instance-options.java-and-memory.title',
+		defaultMessage: 'Java and memory',
+	},
+	launchHooksSectionTitle: {
+		id: 'app.settings.default-instance-options.launch-hooks.title',
+		defaultMessage: 'Launch hooks',
+	},
+	fullscreenTitle: {
+		id: 'app.settings.default-instance-options.fullscreen.title',
+		defaultMessage: 'Fullscreen',
+	},
+	fullscreenDescription: {
+		id: 'app.settings.default-instance-options.fullscreen.description',
+		defaultMessage: 'Start instances in fullscreen by updating their options.txt file.',
+	},
+	widthTitle: {
+		id: 'app.settings.default-instance-options.width.title',
+		defaultMessage: 'Width',
+	},
+	widthDescription: {
+		id: 'app.settings.default-instance-options.width.description',
+		defaultMessage: 'The width of the game window when launched.',
+	},
+	widthPlaceholder: {
+		id: 'app.settings.default-instance-options.width.placeholder',
+		defaultMessage: 'Enter width...',
+	},
+	heightTitle: {
+		id: 'app.settings.default-instance-options.height.title',
+		defaultMessage: 'Height',
+	},
+	heightDescription: {
+		id: 'app.settings.default-instance-options.height.description',
+		defaultMessage: 'The height of the game window when launched.',
+	},
+	heightPlaceholder: {
+		id: 'app.settings.default-instance-options.height.placeholder',
+		defaultMessage: 'Enter height...',
+	},
+	memoryAllocationTitle: {
+		id: 'app.settings.default-instance-options.memory-allocation.title',
+		defaultMessage: 'Memory allocation',
+	},
+	memoryAllocationDescription: {
+		id: 'app.settings.default-instance-options.memory-allocation.description',
+		defaultMessage: 'Maximum memory available to each instance.',
+	},
+	javaArgumentsTitle: {
+		id: 'app.settings.default-instance-options.java-arguments.title',
+		defaultMessage: 'Java arguments',
+	},
+	javaArgumentsPlaceholder: {
+		id: 'app.settings.default-instance-options.java-arguments.placeholder',
+		defaultMessage: 'Enter Java arguments...',
+	},
+	javaArgumentsDescription: {
+		id: 'app.settings.default-instance-options.java-arguments.description',
+		defaultMessage: 'Arguments passed to Java when launching an instance.',
+	},
+	environmentVariablesTitle: {
+		id: 'app.settings.default-instance-options.environment-variables.title',
+		defaultMessage: 'Environment variables',
+	},
+	environmentVariablesPlaceholder: {
+		id: 'app.settings.default-instance-options.environment-variables.placeholder',
+		defaultMessage: 'Enter environment variables...',
+	},
+	environmentVariablesDescription: {
+		id: 'app.settings.default-instance-options.environment-variables.description',
+		defaultMessage: 'Environment variables set when launching an instance.',
+	},
+	preLaunchHookTitle: {
+		id: 'app.settings.default-instance-options.pre-launch-hook.title',
+		defaultMessage: 'Pre-launch hook',
+	},
+	preLaunchHookPlaceholder: {
+		id: 'app.settings.default-instance-options.pre-launch-hook.placeholder',
+		defaultMessage: 'Enter pre-launch command...',
+	},
+	preLaunchHookDescription: {
+		id: 'app.settings.default-instance-options.pre-launch-hook.description',
+		defaultMessage: 'Runs before the instance starts.',
+	},
+	wrapperHookTitle: {
+		id: 'app.settings.default-instance-options.wrapper-hook.title',
+		defaultMessage: 'Wrapper hook',
+	},
+	wrapperHookPlaceholder: {
+		id: 'app.settings.default-instance-options.wrapper-hook.placeholder',
+		defaultMessage: 'Enter wrapper command...',
+	},
+	wrapperHookDescription: {
+		id: 'app.settings.default-instance-options.wrapper-hook.description',
+		defaultMessage: 'Command used to wrap the Minecraft launch process.',
+	},
+	postExitHookTitle: {
+		id: 'app.settings.default-instance-options.post-exit-hook.title',
+		defaultMessage: 'Post-exit hook',
+	},
+	postExitHookPlaceholder: {
+		id: 'app.settings.default-instance-options.post-exit-hook.placeholder',
+		defaultMessage: 'Enter post-exit command...',
+	},
+	postExitHookDescription: {
+		id: 'app.settings.default-instance-options.post-exit-hook.description',
+		defaultMessage: 'Runs after the game closes.',
+	},
+	hookVariablesDescription: {
+		id: 'instance.settings.tabs.hooks.variables.description',
+		defaultMessage:
+			'Hooks run in the working directory of the instance, with the following variables:',
+	},
+	instanceNameDescription: {
+		id: 'instance.settings.tabs.hooks.variables.inst-name.description',
+		defaultMessage: '$INST_NAME: The name of the instance',
+	},
+	instanceIdDescription: {
+		id: 'instance.settings.tabs.hooks.variables.inst-id.description',
+		defaultMessage: "$INST_ID: The name of the instance's folder",
+	},
+	instanceDirDescription: {
+		id: 'instance.settings.tabs.hooks.variables.inst-dir.description',
+		defaultMessage: "$INST_DIR: The absolute path to the instance's folder",
+	},
+	instanceMcDirDescription: {
+		id: 'instance.settings.tabs.hooks.variables.inst-mc-dir.description',
+		defaultMessage: '$INST_MC_DIR: An alias for $INST_DIR',
+	},
+	instanceJavaDescription: {
+		id: 'instance.settings.tabs.hooks.variables.inst-java.description',
+		defaultMessage: '$INST_JAVA: The absolute path to the java binary',
+	},
+	instanceJavaArgsDescription: {
+		id: 'instance.settings.tabs.hooks.variables.inst-java-args.description',
+		defaultMessage: '$INST_JAVA_ARGS: The JVM Arguments provided to the game',
+	},
+})
+</script>
+
+<template>
+	<div v-if="settings">
+		<section class="mt-6">
+			<h2 class="m-0 text-xl font-semibold text-contrast">
+				{{ formatMessage(messages.windowSectionTitle) }}
+			</h2>
+			<div class="mt-4 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">
+							{{ formatMessage(messages.fullscreenTitle) }}
+						</h3>
+						<p class="m-0 leading-tight">
+							{{ formatMessage(messages.fullscreenDescription) }}
+						</p>
+					</div>
+
+					<Toggle
+						id="fullscreen"
+						v-model="settings.force_fullscreen"
+						:aria-label="formatMessage(messages.fullscreenTitle)"
+					/>
+				</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">
+							{{ formatMessage(messages.widthTitle) }}
+						</h3>
+						<p class="m-0 leading-tight">
+							{{ formatMessage(messages.widthDescription) }}
+						</p>
+					</div>
+
+					<Input
+						id="width"
+						v-model="settings.game_resolution[0]"
+						:aria-label="formatMessage(messages.widthTitle)"
+						:disabled="settings.force_fullscreen"
+						autocomplete="off"
+						type="number"
+						:placeholder="formatMessage(messages.widthPlaceholder)"
+					/>
+				</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">
+							{{ formatMessage(messages.heightTitle) }}
+						</h3>
+						<p class="m-0 leading-tight">
+							{{ formatMessage(messages.heightDescription) }}
+						</p>
+					</div>
+
+					<Input
+						id="height"
+						v-model="settings.game_resolution[1]"
+						:aria-label="formatMessage(messages.heightTitle)"
+						:disabled="settings.force_fullscreen"
+						autocomplete="off"
+						type="number"
+						:placeholder="formatMessage(messages.heightPlaceholder)"
+					/>
+				</div>
+			</div>
+		</section>
+
+		<section class="mt-8 border-0 border-t border-solid border-surface-4 pt-6">
+			<h2 class="m-0 text-xl font-semibold text-contrast">
+				{{ formatMessage(messages.javaAndMemorySectionTitle) }}
+			</h2>
+			<div class="mt-4 flex flex-col gap-6">
+				<div class="flex flex-col gap-2.5">
+					<h3 class="m-0 text-lg font-semibold text-contrast">
+						{{ formatMessage(messages.memoryAllocationTitle) }}
+					</h3>
+					<Slider
+						id="max-memory"
+						v-model="settings.memory.maximum"
+						:aria-label="formatMessage(messages.memoryAllocationTitle)"
+						:min="512"
+						:max="maxMemory"
+						:step="64"
+						:snap-points="snapPoints"
+						:snap-range="512"
+						unit="MB"
+					/>
+					<p class="m-0 mt-1 leading-tight">
+						{{ formatMessage(messages.memoryAllocationDescription) }}
+					</p>
+				</div>
+
+				<div class="flex flex-col gap-2.5">
+					<h3 class="m-0 text-lg font-semibold text-contrast">
+						{{ formatMessage(messages.javaArgumentsTitle) }}
+					</h3>
+					<Input
+						id="java-args"
+						v-model="settings.launchArgs"
+						:aria-label="formatMessage(messages.javaArgumentsTitle)"
+						autocomplete="off"
+						type="text"
+						:placeholder="formatMessage(messages.javaArgumentsPlaceholder)"
+						wrapper-class="w-full"
+					/>
+					<p class="m-0 leading-tight">
+						{{ formatMessage(messages.javaArgumentsDescription) }}
+					</p>
+				</div>
+
+				<div class="flex flex-col gap-2.5">
+					<h3 class="m-0 text-lg font-semibold text-contrast">
+						{{ formatMessage(messages.environmentVariablesTitle) }}
+					</h3>
+					<Input
+						id="env-vars"
+						v-model="settings.envVars"
+						:aria-label="formatMessage(messages.environmentVariablesTitle)"
+						autocomplete="off"
+						type="text"
+						:placeholder="formatMessage(messages.environmentVariablesPlaceholder)"
+						wrapper-class="w-full"
+					/>
+					<p class="m-0 leading-tight">
+						{{ formatMessage(messages.environmentVariablesDescription) }}
+					</p>
+				</div>
+			</div>
+		</section>
+
+		<section class="mt-8 border-0 border-t border-solid border-surface-4 pt-6">
+			<h2 class="m-0 text-xl font-semibold text-contrast">
+				{{ formatMessage(messages.launchHooksSectionTitle) }}
+			</h2>
+			<div class="mt-4 flex flex-col gap-6">
+				<div class="flex flex-col gap-2.5">
+					<h3 class="m-0 text-lg font-semibold text-contrast">
+						{{ formatMessage(messages.preLaunchHookTitle) }}
+					</h3>
+					<Input
+						id="pre-launch"
+						v-model="settings.hooks.pre_launch"
+						:aria-label="formatMessage(messages.preLaunchHookTitle)"
+						autocomplete="off"
+						type="text"
+						:placeholder="formatMessage(messages.preLaunchHookPlaceholder)"
+						wrapper-class="w-full"
+					/>
+					<p class="m-0 leading-tight">
+						{{ formatMessage(messages.preLaunchHookDescription) }}
+					</p>
+				</div>
+
+				<div class="flex flex-col gap-2.5">
+					<h3 class="m-0 text-lg font-semibold text-contrast">
+						{{ formatMessage(messages.wrapperHookTitle) }}
+					</h3>
+					<Input
+						id="wrapper"
+						v-model="settings.hooks.wrapper"
+						:aria-label="formatMessage(messages.wrapperHookTitle)"
+						autocomplete="off"
+						type="text"
+						:placeholder="formatMessage(messages.wrapperHookPlaceholder)"
+						wrapper-class="w-full"
+					/>
+					<p class="m-0 leading-tight">
+						{{ formatMessage(messages.wrapperHookDescription) }}
+					</p>
+				</div>
+
+				<div class="flex flex-col gap-2.5">
+					<h3 class="m-0 text-lg font-semibold text-contrast">
+						{{ formatMessage(messages.postExitHookTitle) }}
+					</h3>
+					<Input
+						id="post-exit"
+						v-model="settings.hooks.post_exit"
+						:aria-label="formatMessage(messages.postExitHookTitle)"
+						autocomplete="off"
+						type="text"
+						:placeholder="formatMessage(messages.postExitHookPlaceholder)"
+						wrapper-class="w-full"
+					/>
+					<p class="m-0 leading-tight">
+						{{ formatMessage(messages.postExitHookDescription) }}
+					</p>
+				</div>
+
+				<div class="m-0 leading-tight">
+					{{ formatMessage(messages.hookVariablesDescription) }}
+					<ul>
+						<li>{{ formatMessage(messages.instanceNameDescription) }}</li>
+						<li>{{ formatMessage(messages.instanceIdDescription) }}</li>
+						<li>{{ formatMessage(messages.instanceDirDescription) }}</li>
+						<li>{{ formatMessage(messages.instanceMcDirDescription) }}</li>
+						<li>{{ formatMessage(messages.instanceJavaDescription) }}</li>
+						<li>{{ formatMessage(messages.instanceJavaArgsDescription) }}</li>
+					</ul>
+				</div>
+			</div>
+		</section>
+	</div>
+	<Button v-else-if="settingsQuery.isError.value" @click="settingsQuery.refetch()">
+		{{ formatMessage(commonMessages.refreshButton) }}
+	</Button>
+	<div v-else class="flex items-center gap-2 py-6 text-secondary">
+		<SpinnerIcon class="size-5 animate-spin" aria-hidden="true" />
+		{{ formatMessage(commonMessages.loadingLabel) }}
+	</div>
+</template>
diff --git a/apps/app-frontend/src/components/ui/settings/instances/instances-synced-settings/servers-modal.vue b/apps/app-frontend/src/components/ui/settings/instances/instances-synced-settings/servers-modal.vue
new file mode 100644
index 0000000000..f8a0135442
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/settings/instances/instances-synced-settings/servers-modal.vue
@@ -0,0 +1,476 @@
+<script setup lang="ts">
+import {
+	ClipboardCopyIcon,
+	EditIcon,
+	MoreVerticalIcon,
+	NoSignalIcon,
+	RefreshCwIcon,
+	SaveIcon,
+	SearchIcon,
+	SignalIcon,
+	TrashIcon,
+	XIcon,
+} from '@modrinth/assets'
+import {
+	Avatar,
+	Button,
+	type ButtonMenuOption,
+	commonMessages,
+	defineMessages,
+	FilterPills,
+	injectNotificationManager,
+	Input,
+	NewModal,
+	Table,
+	type TableColumn,
+	TeleportOverflowMenu,
+	useVIntl,
+} from '@modrinth/ui'
+import { useMutation, useQuery, useQueryClient } from '@tanstack/vue-query'
+import { computed, nextTick, ref } from 'vue'
+
+import { remove_synced_server, type SyncedServer, update_synced_server } from '@/helpers/instance'
+import { syncedOptionsKeys, syncedServersQueryOptions } from '@/helpers/synced-options'
+import { copyToClipboard } from '@/helpers/utils'
+import {
+	refreshServerData,
+	refreshServers,
+	type ServerData,
+	type ServerWorld,
+} from '@/helpers/worlds'
+
+const { handleError } = injectNotificationManager()
+const { formatMessage } = useVIntl()
+const queryClient = useQueryClient()
+const serverEditorModal = ref<InstanceType<typeof NewModal> | null>(null)
+const editServerModal = ref<InstanceType<typeof NewModal> | null>(null)
+const editedServer = ref<SyncedServer | null>(null)
+const serversQuery = useQuery(syncedServersQueryOptions())
+const syncedServers = computed(() => serversQuery.data.value ?? [])
+const serverData = ref<Record<string, ServerData>>({})
+const serverSearch = ref('')
+const selectedServerFilters = ref<string[]>([])
+
+const messages = defineMessages({
+	serverEditorTitle: {
+		id: 'app.settings.synced-options.multiplayer-servers.editor-title',
+		defaultMessage: 'Edit synced servers',
+	},
+	editServerTitle: {
+		id: 'instance.edit-server.title',
+		defaultMessage: 'Edit server',
+	},
+	serverName: {
+		id: 'app.settings.synced-options.multiplayer-servers.name',
+		defaultMessage: 'Server name',
+	},
+	serverAddress: {
+		id: 'app.settings.synced-options.multiplayer-servers.address',
+		defaultMessage: 'Server address',
+	},
+	searchServers: {
+		id: 'app.settings.synced-options.multiplayer-servers.search',
+		defaultMessage:
+			'Search {count, number} {count, plural, one {synced server} other {synced servers}}...',
+	},
+	serverStatus: {
+		id: 'app.settings.synced-options.multiplayer-servers.status',
+		defaultMessage: 'Status',
+	},
+	onlineFilter: {
+		id: 'app.settings.synced-options.multiplayer-servers.filter-online',
+		defaultMessage: 'Online',
+	},
+	offlineFilter: {
+		id: 'app.settings.synced-options.multiplayer-servers.filter-offline',
+		defaultMessage: 'Offline',
+	},
+	playersOnline: {
+		id: 'app.settings.synced-options.multiplayer-servers.players-online',
+		defaultMessage: '{count, number} online',
+	},
+	noMatchingServers: {
+		id: 'app.settings.synced-options.multiplayer-servers.no-results',
+		defaultMessage: 'No synced servers match your search or filters.',
+	},
+	serverCount: {
+		id: 'app.settings.synced-options.multiplayer-servers.count',
+		defaultMessage: '{count, plural, one {# server} other {# servers}}',
+	},
+	moreServerOptions: {
+		id: 'app.settings.synced-options.multiplayer-servers.more-options',
+		defaultMessage: 'More server options',
+	},
+	copyServerAddress: {
+		id: 'app.settings.synced-options.multiplayer-servers.copy-address',
+		defaultMessage: 'Copy address',
+	},
+	noSyncedServers: {
+		id: 'app.settings.synced-options.multiplayer-servers.empty',
+		defaultMessage: 'No user-added servers are currently synced.',
+	},
+})
+
+const serverWorlds = computed<ServerWorld[]>(() =>
+	syncedServers.value.map((server, index) => ({
+		name: server.name,
+		type: 'server',
+		index,
+		server_id: server.id,
+		address: server.address,
+		pack_status:
+			server.accept_textures === true
+				? 'enabled'
+				: server.accept_textures === false
+					? 'disabled'
+					: 'prompt',
+		display_status: 'normal',
+	})),
+)
+
+type SyncedServerTableColumn = 'server' | 'status' | 'version' | 'actions'
+type SyncedServerTableRow = SyncedServer & {
+	server: string
+	status: 'online' | 'offline'
+	version: string
+	actions: null
+}
+
+const syncedServerColumns = computed<TableColumn<SyncedServerTableColumn>[]>(() => [
+	{
+		key: 'server',
+		label: formatMessage(commonMessages.serverLabel),
+		width: '45%',
+		cellClass: '!h-16',
+	},
+	{
+		key: 'status',
+		label: formatMessage(messages.serverStatus),
+		width: '25%',
+		cellClass: '!h-16',
+	},
+	{
+		key: 'version',
+		label: formatMessage(commonMessages.versionLabel),
+		width: '22%',
+		cellClass: '!h-16',
+	},
+	{
+		key: 'actions',
+		label: formatMessage(commonMessages.actionsLabel),
+		align: 'right',
+		width: '6rem',
+		cellClass: '!h-16',
+	},
+])
+
+const syncedServerFilterOptions = computed(() => [
+	{ id: 'online', label: formatMessage(messages.onlineFilter) },
+	{ id: 'offline', label: formatMessage(messages.offlineFilter) },
+])
+
+const syncedServerRows = computed<SyncedServerTableRow[]>(() =>
+	syncedServers.value.map((server) => ({
+		...server,
+		server: server.name,
+		status: serverData.value[server.address]?.status ? 'online' : 'offline',
+		version: serverData.value[server.address]?.status?.version?.name ?? '',
+		actions: null,
+	})),
+)
+
+const statusFilteredSyncedServerRows = computed(() => {
+	if (selectedServerFilters.value.length === 0) return syncedServerRows.value
+	return syncedServerRows.value.filter((server) =>
+		selectedServerFilters.value.includes(server.status),
+	)
+})
+
+const filteredSyncedServerRows = computed(() => {
+	const search = serverSearch.value.trim().toLocaleLowerCase()
+	if (!search) return statusFilteredSyncedServerRows.value
+	return statusFilteredSyncedServerRows.value.filter(
+		(server) =>
+			server.name.toLocaleLowerCase().includes(search) ||
+			server.address.toLocaleLowerCase().includes(search),
+	)
+})
+
+const refreshMutation = useMutation({
+	mutationFn: () => refreshServers(serverWorlds.value, serverData.value, null),
+	onError: handleError,
+})
+const refreshingAllSyncedServers = refreshMutation.isPending
+const saveMutation = useMutation({
+	mutationFn: update_synced_server,
+	onSuccess: async (_, server) => {
+		queryClient.setQueryData<SyncedServer[]>(syncedOptionsKeys.servers, (servers) =>
+			servers?.map((current) => (current.id === server.id ? { ...server } : current)),
+		)
+		await queryClient.invalidateQueries({ queryKey: ['worlds'] })
+		void refreshSyncedServer(server.address).catch(handleError)
+	},
+	onError: handleError,
+})
+const removeMutation = useMutation({
+	mutationFn: remove_synced_server,
+	onSuccess: async (_, serverId) => {
+		queryClient.setQueryData<SyncedServer[]>(syncedOptionsKeys.servers, (servers) =>
+			servers?.filter((server) => server.id !== serverId),
+		)
+		await queryClient.invalidateQueries({ queryKey: ['worlds'] })
+	},
+	onError: handleError,
+})
+
+async function show() {
+	const result = await serversQuery.refetch()
+	if (result.isError) {
+		handleError(result.error)
+		return
+	}
+	serverSearch.value = ''
+	selectedServerFilters.value = []
+	serverData.value = {}
+	serverEditorModal.value?.show()
+	refreshAllSyncedServers()
+}
+
+function openSyncedServerEditor(server: SyncedServer) {
+	editedServer.value = { ...server }
+	editServerModal.value?.show()
+}
+
+async function saveSyncedServer() {
+	if (!editedServer.value || saveMutation.isPending.value) return
+	try {
+		await saveMutation.mutateAsync({ ...editedServer.value })
+		await nextTick()
+		editServerModal.value?.hide()
+	} catch {
+		return
+	}
+}
+
+async function refreshSyncedServer(address: string) {
+	serverData.value[address] ??= { refreshing: true }
+	await refreshServerData(serverData.value[address], null, address)
+}
+
+function refreshAllSyncedServers() {
+	if (!refreshingAllSyncedServers.value) refreshMutation.mutate()
+}
+
+function syncedServerMenuOptions(server: SyncedServer): ButtonMenuOption[] {
+	return [
+		{
+			id: 'refresh',
+			label: formatMessage(commonMessages.refreshButton),
+			icon: RefreshCwIcon,
+			action: () => refreshSyncedServer(server.address).catch(handleError),
+		},
+		{
+			id: 'copy-address',
+			label: formatMessage(messages.copyServerAddress),
+			icon: ClipboardCopyIcon,
+			action: () => copyToClipboard(server.address),
+		},
+		{
+			id: 'edit',
+			label: formatMessage(commonMessages.editButton),
+			icon: EditIcon,
+			action: () => openSyncedServerEditor(server),
+		},
+		{ type: 'divider' },
+		{
+			id: 'remove',
+			label: formatMessage(commonMessages.removeButton),
+			icon: TrashIcon,
+			tone: 'red',
+			disabled: removeMutation.isPending.value,
+			action: () => removeMutation.mutate(server.id),
+		},
+	]
+}
+
+defineExpose({ show })
+</script>
+
+<template>
+	<NewModal
+		ref="serverEditorModal"
+		no-padding
+		max-width="min(928px, calc(95vw - 10rem))"
+		width="min(928px, calc(95vw - 10rem))"
+	>
+		<template #title>
+			<span class="text-lg font-extrabold text-contrast">
+				{{ formatMessage(messages.serverEditorTitle) }}
+			</span>
+		</template>
+		<div class="flex h-[min(600px,calc(95vh-10rem))] flex-col">
+			<div
+				class="flex shrink-0 flex-col gap-4 border-0 border-b border-solid border-surface-4 px-6 py-4"
+			>
+				<Input
+					v-model="serverSearch"
+					:icon="SearchIcon"
+					type="search"
+					autocomplete="off"
+					:spellcheck="false"
+					:placeholder="formatMessage(messages.searchServers, { count: syncedServers.length })"
+					size="medium"
+					:aria-label="formatMessage(messages.searchServers, { count: syncedServers.length })"
+					:clear-label="formatMessage(commonMessages.clearButton)"
+					clearable
+				/>
+
+				<div class="flex flex-wrap items-center justify-between gap-3">
+					<FilterPills v-model="selectedServerFilters" :options="syncedServerFilterOptions">
+						<template #all>
+							{{ formatMessage(commonMessages.allProjectType) }}
+						</template>
+					</FilterPills>
+					<Button
+						type="quiet"
+						:disabled="refreshingAllSyncedServers || syncedServers.length === 0"
+						interaction="none"
+						@click="refreshAllSyncedServers"
+					>
+						<RefreshCwIcon
+							:class="{ 'animate-spin': refreshingAllSyncedServers }"
+							aria-hidden="true"
+						/>
+						{{ formatMessage(commonMessages.refreshButton) }}
+					</Button>
+				</div>
+			</div>
+
+			<div class="flex min-h-0 flex-1 flex-col overflow-hidden">
+				<div
+					v-if="syncedServers.length === 0"
+					class="flex flex-1 items-center justify-center p-8 text-center text-secondary"
+				>
+					{{ formatMessage(messages.noSyncedServers) }}
+				</div>
+				<div
+					v-else-if="filteredSyncedServerRows.length === 0"
+					class="flex flex-1 items-center justify-center p-8 text-center text-secondary"
+				>
+					{{ formatMessage(messages.noMatchingServers) }}
+				</div>
+				<div v-else class="min-h-0 flex-1 overflow-y-auto">
+					<Table
+						:columns="syncedServerColumns"
+						:data="filteredSyncedServerRows"
+						row-key="id"
+						table-min-width="44rem"
+						class="!rounded-none !border-0"
+					>
+						<template #cell-server="{ row }">
+							<div class="flex min-w-0 items-center gap-3">
+								<Avatar
+									:src="serverData[row.address]?.status?.favicon"
+									:alt="row.name"
+									:tint-by="row.address"
+									size="32px"
+									no-shadow
+									class="shrink-0 !rounded-lg"
+								/>
+								<div class="flex min-w-0 flex-col">
+									<span class="truncate font-semibold text-contrast">{{ row.name }}</span>
+									<span class="truncate text-sm text-secondary">{{ row.address }}</span>
+								</div>
+							</div>
+						</template>
+						<template #cell-status="{ row }">
+							<span class="inline-flex items-center gap-1.5 font-medium">
+								<RefreshCwIcon
+									v-if="serverData[row.address]?.refreshing"
+									class="size-4 shrink-0 animate-spin"
+									aria-hidden="true"
+								/>
+								<SignalIcon
+									v-else-if="serverData[row.address]?.status"
+									class="size-4 shrink-0 text-green"
+									aria-hidden="true"
+								/>
+								<NoSignalIcon v-else class="size-4 shrink-0" aria-hidden="true" />
+								<template v-if="serverData[row.address]?.refreshing">
+									{{ formatMessage(commonMessages.loadingLabel) }}
+								</template>
+								<template v-else-if="serverData[row.address]?.status">
+									{{
+										formatMessage(messages.playersOnline, {
+											count: serverData[row.address]?.status?.players?.online ?? 0,
+										})
+									}}
+								</template>
+								<template v-else>{{ formatMessage(messages.offlineFilter) }}</template>
+							</span>
+						</template>
+						<template #cell-version="{ row }">
+							<span class="block truncate">{{ row.version || '—' }}</span>
+						</template>
+						<template #cell-actions="{ row }">
+							<div class="flex justify-end">
+								<TeleportOverflowMenu
+									type="quiet"
+									:label="formatMessage(messages.moreServerOptions)"
+									:options="syncedServerMenuOptions(row)"
+								>
+									<MoreVerticalIcon aria-hidden="true" />
+								</TeleportOverflowMenu>
+							</div>
+						</template>
+					</Table>
+				</div>
+			</div>
+
+			<div
+				class="flex shrink-0 items-center border-0 border-t border-solid border-surface-4 px-6 py-4"
+			>
+				<span class="font-medium text-primary">
+					{{ formatMessage(messages.serverCount, { count: syncedServers.length }) }}
+				</span>
+			</div>
+		</div>
+	</NewModal>
+
+	<NewModal
+		ref="editServerModal"
+		:header="formatMessage(messages.editServerTitle)"
+		:disable-close="saveMutation.isPending.value"
+		max-width="500px"
+		width="500px"
+	>
+		<div v-if="editedServer" class="flex flex-col gap-4">
+			<label class="flex flex-col gap-2 font-semibold text-contrast">
+				{{ formatMessage(messages.serverName) }}
+				<Input v-model="editedServer.name" autocomplete="off" wrapper-class="w-full" />
+			</label>
+			<label class="flex flex-col gap-2 font-semibold text-contrast">
+				{{ formatMessage(messages.serverAddress) }}
+				<Input v-model="editedServer.address" autocomplete="off" wrapper-class="w-full" />
+			</label>
+		</div>
+		<template #actions>
+			<div class="flex justify-end gap-2">
+				<Button type="outlined" @click="editServerModal?.hide()">
+					<XIcon aria-hidden="true" />
+					{{ formatMessage(commonMessages.cancelButton) }}
+				</Button>
+				<Button
+					type="colored"
+					color="brand"
+					:disabled="!editedServer?.address"
+					:loading="saveMutation.isPending.value"
+					@click="saveSyncedServer"
+				>
+					<SaveIcon aria-hidden="true" />
+					{{ formatMessage(commonMessages.saveChangesButton) }}
+				</Button>
+			</div>
+		</template>
+	</NewModal>
+</template>
diff --git a/apps/app-frontend/src/components/ui/sync-instances-update-modal/index.vue b/apps/app-frontend/src/components/ui/sync-instances-update-modal/index.vue
index a76bd83942..aee167ec25 100644
--- a/apps/app-frontend/src/components/ui/sync-instances-update-modal/index.vue
+++ b/apps/app-frontend/src/components/ui/sync-instances-update-modal/index.vue
@@ -14,11 +14,7 @@ import { computed, nextTick, useTemplateRef } from 'vue'
 
 import SyncSourceModal from '@/components/ui/settings/instances/SyncSourceModal.vue'
 
-import {
-	type SyncUpdateOption,
-	syncUpdateOptions,
-	useSyncInstancesUpdate,
-} from './use-sync-instances-update'
+import { type SyncUpdateOption, syncUpdateOptions, useSyncInstancesUpdate } from './use-sync'
 
 const hasSeenUpdate = useLocalStorage('sync-instances-update-modal-shown', false)
 const modal = useTemplateRef<InstanceType<typeof NewModal>>('modal')
@@ -90,7 +86,7 @@ const messages = defineMessages({
 	},
 	allSourcesDescription: {
 		id: 'app.sync-instances-update.choose-source.all',
-		defaultMessage: 'Choose the instance to use as the sync source for all six settings.',
+		defaultMessage: 'Choose the instance to use as the sync source for all selected settings.',
 	},
 	game_options_source: {
 		id: 'app.settings.synced-options.choose-sync-source.game-settings-description',
@@ -310,7 +306,6 @@ defineExpose({ show, showOnce, hide })
 							:id="`update-sync-${option}`"
 							:model-value="globalOptionsQuery.data.value?.[option] ?? false"
 							:disabled="controlsDisabled"
-							class="!h-[26px] !w-[50px] !p-0.5 [&>span]:!m-0 [&>span]:!size-5"
 							@update:model-value="(enabled) => toggleOption(option, enabled)"
 						/>
 					</div>
diff --git a/apps/app-frontend/src/components/ui/sync-instances-update-modal/use-sync-instances-update.ts b/apps/app-frontend/src/components/ui/sync-instances-update-modal/use-sync.ts
similarity index 93%
rename from apps/app-frontend/src/components/ui/sync-instances-update-modal/use-sync-instances-update.ts
rename to apps/app-frontend/src/components/ui/sync-instances-update-modal/use-sync.ts
index 432b05542b..21893622c2 100644
--- a/apps/app-frontend/src/components/ui/sync-instances-update-modal/use-sync-instances-update.ts
+++ b/apps/app-frontend/src/components/ui/sync-instances-update-modal/use-sync.ts
@@ -2,7 +2,7 @@ import { injectNotificationManager } from '@modrinth/ui'
 import { useMutation, useQuery, useQueryClient } from '@tanstack/vue-query'
 import { computed, ref, watch } from 'vue'
 
-import { set_global_synced_option } from '@/helpers/instance'
+import { isSyncedOptionAvailable, set_global_synced_option } from '@/helpers/instance'
 import {
 	gameOptionsSyncSourcesQueryOptions,
 	globalSyncedOptionsQueryOptions,
@@ -11,14 +11,14 @@ import {
 import { syncedPackKeys } from '@/helpers/synced-packs'
 import { instanceKeys, instanceListQueryOptions } from '@/pages/instance/query-options'
 
-export const syncUpdateOptions = [
+export const syncUpdateOptions = ([
 	'game_options',
 	'multiplayer_servers',
 	'command_history',
 	'creative_hotbars',
 	'resource_packs',
 	'data_packs',
-] as const
+] as const).filter(isSyncedOptionAvailable)
 
 export type SyncUpdateOption = (typeof syncUpdateOptions)[number]
 
@@ -86,7 +86,7 @@ export function useSyncInstancesUpdate() {
 			enabled: boolean
 			baseInstanceId?: string
 		}) => {
-			for (const option of options) {
+			for (const option of options.filter(isSyncedOptionAvailable)) {
 				const updated = await set_global_synced_option(option, enabled, baseInstanceId)
 				queryClient.setQueryData(syncedOptionsKeys.global, updated)
 			}
@@ -107,7 +107,7 @@ export function useSyncInstancesUpdate() {
 
 	function chooseSource(options: readonly SyncUpdateOption[]) {
 		sourceInstanceId.value = ''
-		sourceOptions.value = [...options]
+		sourceOptions.value = options.filter(isSyncedOptionAvailable)
 	}
 
 	function retrySources() {
diff --git a/apps/app-frontend/src/composables/instances/use-synced-pack-actions.ts b/apps/app-frontend/src/composables/instances/use-synced-pack-actions.ts
index 343dd99cf3..92ae68ea0c 100644
--- a/apps/app-frontend/src/composables/instances/use-synced-pack-actions.ts
+++ b/apps/app-frontend/src/composables/instances/use-synced-pack-actions.ts
@@ -10,9 +10,10 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/vue-query'
 import { type Ref, watch } from 'vue'
 
 import type SyncedContentModal from '@/components/ui/instance/SyncedContentModal.vue'
-import { get_global_synced_options } from '@/helpers/instance'
+import { globalSyncedOptionsQueryOptions } from '@/helpers/synced-options'
 import {
 	desync_pack,
+	isSyncedPackTypeAvailable,
 	remove_synced_pack,
 	sync_pack,
 	type SyncedPackAction,
@@ -30,10 +31,7 @@ export function useSyncedPackActions(
 	const { formatMessage } = useVIntl()
 	const { handleError } = injectNotificationManager()
 	const queryClient = useQueryClient()
-	const globalOptions = useQuery({
-		queryKey: ['global-synced-options'],
-		queryFn: get_global_synced_options,
-	})
+	const globalOptions = useQuery(globalSyncedOptionsQueryOptions())
 	const deleteEverywhere = new Set<string>()
 	watch(
 		[
@@ -81,15 +79,17 @@ export function useSyncedPackActions(
 	}
 
 	async function desync(item: ContentItem) {
-		if (!item.synced_pack) return
+		const packId = item.synced_pack?.id
+		if (!packId || mutation.isPending.value) return
+		const instanceId = instance.value.id
 		const mode = await modal.value?.confirmDesync(item)
 		if (!mode) return
-		mutation.mutate(() => desync_pack(instance.value.id, item.synced_pack!.id, mode))
+		mutation.mutate(() => desync_pack(instanceId, packId, mode))
 	}
 
 	function overflowOptions(item: ContentItem): ButtonMenuOption[] {
 		if (
-			!['resourcepack', 'datapack'].includes(item.project_type) ||
+			!isSyncedPackTypeAvailable(item.project_type) ||
 			!canMutate(item) ||
 			(item.source_kind && item.source_kind !== 'local')
 		)
diff --git a/apps/app-frontend/src/composables/use-quick-instance-limit.ts b/apps/app-frontend/src/composables/use-quick-instance-limit.ts
index b504acf97b..0cbc4ee736 100644
--- a/apps/app-frontend/src/composables/use-quick-instance-limit.ts
+++ b/apps/app-frontend/src/composables/use-quick-instance-limit.ts
@@ -1,16 +1,20 @@
-import { ref } from 'vue'
+import { readonly, ref } from 'vue'
 
 const STORAGE_KEY = 'modrinth-quick-instance-count'
 
 export const QUICK_INSTANCE_LIMIT_MAX = 20
 
-const storedLimit = Number.parseInt(localStorage.getItem(STORAGE_KEY) ?? '', 10)
-const quickInstanceLimit = ref<number | null>(
-	Number.isFinite(storedLimit) ? Math.max(0, storedLimit) : null,
-)
+function normalizeLimit(limit: number | null): number | null {
+	if (limit === null || !Number.isFinite(limit)) return null
+	const rounded = Math.max(0, Math.round(limit))
+	return rounded >= QUICK_INSTANCE_LIMIT_MAX ? null : rounded
+}
+
+const storedLimit = localStorage.getItem(STORAGE_KEY)
+const quickInstanceLimit = ref(normalizeLimit(storedLimit === null ? null : Number(storedLimit)))
 
 function setQuickInstanceLimit(limit: number | null): void {
-	const normalizedLimit = limit === null ? null : Math.max(0, Math.round(limit))
+	const normalizedLimit = normalizeLimit(limit)
 	quickInstanceLimit.value = normalizedLimit
 
 	if (normalizedLimit === null) {
@@ -22,7 +26,7 @@ function setQuickInstanceLimit(limit: number | null): void {
 
 export function useQuickInstanceLimit() {
 	return {
-		limit: quickInstanceLimit,
+		limit: readonly(quickInstanceLimit),
 		setLimit: setQuickInstanceLimit,
 	}
 }
diff --git a/apps/app-frontend/src/helpers/instance.ts b/apps/app-frontend/src/helpers/instance.ts
index d0966dda87..a0c0b563c2 100644
--- a/apps/app-frontend/src/helpers/instance.ts
+++ b/apps/app-frontend/src/helpers/instance.ts
@@ -297,6 +297,10 @@ export type SyncedOption =
 	| 'creative_hotbars'
 	| 'screenshots'
 
+export function isSyncedOptionAvailable(option: SyncedOption): boolean {
+	return option !== 'data_packs'
+}
+
 export type GlobalSyncedOptions = Record<SyncedOption, boolean>
 
 export type SyncedOptionJoinAction = 'seed_shared' | 'attach' | 'merge' | 'requires_resolution'
@@ -354,8 +358,6 @@ export async function set_global_synced_option(
 	})
 }
 
-export * from './game-options'
-
 export async function get_command_history(): Promise<string> {
 	return await invoke('plugin:instance|instance_get_command_history')
 }
diff --git a/apps/app-frontend/src/helpers/settings.ts b/apps/app-frontend/src/helpers/settings.ts
index 2d222e83e5..9d1d67b774 100644
--- a/apps/app-frontend/src/helpers/settings.ts
+++ b/apps/app-frontend/src/helpers/settings.ts
@@ -3,6 +3,7 @@
  * So, for example, addDefaultInstance creates a blank instance object, where the Rust struct is serialized,
  *  and deserialized into a usable JS object.
  */
+import { queryOptions } from '@tanstack/vue-query'
 import { invoke } from '@tauri-apps/api/core'
 
 import type { FeatureFlag } from '@/composables/use-app-settings.ts'
@@ -78,6 +79,19 @@ export type AppSettings = {
 	version: number
 }
 
+export const appSettingsKeys = {
+	all: ['app-settings'] as const,
+	update: ['app-settings', 'update'] as const,
+}
+
+export function appSettingsQueryOptions() {
+	return queryOptions({
+		queryKey: appSettingsKeys.all,
+		queryFn: get,
+		staleTime: 0,
+	})
+}
+
 export function serializeEnvVars(vars: [string, string][] | undefined | null): string {
 	return (vars ?? []).map(([key, value]) => `${key}=${value}`).join(' ')
 }
diff --git a/apps/app-frontend/src/helpers/synced-options.ts b/apps/app-frontend/src/helpers/synced-options.ts
index 20c6072e0b..39069bc8d9 100644
--- a/apps/app-frontend/src/helpers/synced-options.ts
+++ b/apps/app-frontend/src/helpers/synced-options.ts
@@ -1,13 +1,20 @@
 import { queryOptions } from '@tanstack/vue-query'
 
 import { list_game_options_sync_sources } from './game-options'
-import { get_global_synced_options, get_initialized_synced_options } from './instance'
+import {
+	get_command_history,
+	get_global_synced_options,
+	get_initialized_synced_options,
+	list_synced_servers,
+} from './instance'
 
 export const syncedOptionsKeys = {
 	global: ['global-synced-options'] as const,
 	initialized: ['initialized-synced-options'] as const,
 	gameSources: ['game-options-sync-sources'] as const,
 	set: ['global-synced-options', 'set'] as const,
+	servers: ['synced-servers', 'list'] as const,
+	commandHistory: ['synced-options', 'command-history'] as const,
 }
 
 export function globalSyncedOptionsQueryOptions() {
@@ -31,3 +38,17 @@ export function gameOptionsSyncSourcesQueryOptions() {
 		staleTime: 0,
 	})
 }
+
+export function syncedServersQueryOptions() {
+	return queryOptions({
+		queryKey: syncedOptionsKeys.servers,
+		queryFn: list_synced_servers,
+	})
+}
+
+export function commandHistoryQueryOptions() {
+	return queryOptions({
+		queryKey: syncedOptionsKeys.commandHistory,
+		queryFn: get_command_history,
+	})
+}
diff --git a/apps/app-frontend/src/helpers/synced-packs.ts b/apps/app-frontend/src/helpers/synced-packs.ts
index 0458640eb1..82e0d6a1c9 100644
--- a/apps/app-frontend/src/helpers/synced-packs.ts
+++ b/apps/app-frontend/src/helpers/synced-packs.ts
@@ -1,12 +1,20 @@
 import type { ContentItem } from '@modrinth/ui'
+import { queryOptions } from '@tanstack/vue-query'
 import { invoke } from '@tauri-apps/api/core'
 
-import { adaptContentItems } from './instance'
+import { adaptContentItems, isSyncedOptionAvailable } from './instance'
 import type { DesyncServerMode } from './worlds'
 
 export type SyncedPackType = 'resourcepack' | 'datapack'
 export type SyncedPackAction = 'enable' | 'disable'
 
+export function isSyncedPackTypeAvailable(projectType: ContentItem['project_type']): boolean {
+	return (
+		['resourcepack', 'datapack'].includes(projectType) &&
+		isSyncedOptionAvailable(projectType === 'resourcepack' ? 'resource_packs' : 'data_packs')
+	)
+}
+
 export interface PackSyncPreview {
 	pack: ContentItem
 	instances: {
@@ -23,10 +31,13 @@ export const syncedPackKeys = {
 	list: (type: SyncedPackType) => ['synced-packs', 'list', type] as const,
 }
 
-export const syncedPackQueryOptions = (type: SyncedPackType) => ({
-	queryKey: syncedPackKeys.list(type),
-	queryFn: () => list_synced_packs(type),
-})
+export function syncedPackQueryOptions(type: SyncedPackType) {
+	return queryOptions({
+		queryKey: syncedPackKeys.list(type),
+		queryFn: () => list_synced_packs(type),
+		enabled: isSyncedPackTypeAvailable(type),
+	})
+}
 
 export async function list_synced_packs(projectType: SyncedPackType): Promise<ContentItem[]> {
 	const items = await invoke<ContentItem[]>('plugin:instance|instance_list_synced_packs', {
diff --git a/apps/app-frontend/src/helpers/types.d.ts b/apps/app-frontend/src/helpers/types.d.ts
index 2de15f952d..b2bbc664ce 100644
--- a/apps/app-frontend/src/helpers/types.d.ts
+++ b/apps/app-frontend/src/helpers/types.d.ts
@@ -183,10 +183,7 @@ type MemorySettings = {
 	maximum: number
 }
 
-type WindowSize = {
-	width: number
-	height: number
-}
+type WindowSize = [number, number]
 
 type Hooks = {
 	pre_launch?: string
diff --git a/apps/app-frontend/src/locales/en-US/index.json b/apps/app-frontend/src/locales/en-US/index.json
index 1d7a261e62..15822d65d4 100644
--- a/apps/app-frontend/src/locales/en-US/index.json
+++ b/apps/app-frontend/src/locales/en-US/index.json
@@ -1808,39 +1808,12 @@
   "app.settings.game-options.choice.while-afk": {
     "message": "While AFK"
   },
-  "app.settings.game-options.compatibility.all": {
-    "message": "Syncs to {count, plural, one {# instance} other {# instances}}"
-  },
-  "app.settings.game-options.compatibility.all-disabled": {
-    "message": "Sync is off"
-  },
-  "app.settings.game-options.compatibility.no-participants": {
-    "message": "Add an instance to start syncing"
-  },
   "app.settings.game-options.compatibility.none": {
     "message": "Some of your instances cannot use this setting"
   },
   "app.settings.game-options.compatibility.reason.launcher-controlled": {
     "message": "This setting is managed by Modrinth’s launch settings."
   },
-  "app.settings.game-options.compatibility.some": {
-    "message": "Some of your instances cannot use this setting"
-  },
-  "app.settings.game-options.compatibility.some-disabled": {
-    "message": "Some of your instances cannot use this setting"
-  },
-  "app.settings.game-options.compatibility.tooltip.all": {
-    "message": "All of your instances can use this setting."
-  },
-  "app.settings.game-options.compatibility.tooltip.no-participants": {
-    "message": "Add an instance to start syncing this setting."
-  },
-  "app.settings.game-options.compatibility.tooltip.recipients": {
-    "message": "Some of your instances cannot use this setting"
-  },
-  "app.settings.game-options.compatibility.tooltip.waiting": {
-    "message": "{count, plural, one {Launch this instance once before syncing this setting.} other {Launch these instances once before syncing this setting.}}"
-  },
   "app.settings.game-options.custom-value.placeholder": {
     "message": "Enter a value"
   },
@@ -1997,6 +1970,9 @@
   "app.settings.game-options.keybind.mouse.right": {
     "message": "Right Mouse"
   },
+  "app.settings.game-options.keybind.recording-label": {
+    "message": "{setting}: listening for a key or mouse button. Press Escape to clear this binding."
+  },
   "app.settings.game-options.keybind.scancode": {
     "message": "Scancode {code}"
   },
@@ -2651,24 +2627,6 @@
   "app.settings.game-options.setting.weather-volume.label": {
     "message": "Weather"
   },
-  "app.settings.game-options.source.disabled.installing-or-updating": {
-    "message": "Installing or updating"
-  },
-  "app.settings.game-options.source.disabled.missing-options-file": {
-    "message": "No options.txt file"
-  },
-  "app.settings.game-options.source.disabled.no-syncable-settings": {
-    "message": "No syncable settings found"
-  },
-  "app.settings.game-options.source.disabled.unreadable-options-file": {
-    "message": "options.txt could not be read"
-  },
-  "app.settings.game-options.source.disabled.unsupported-version": {
-    "message": "Unsupported Minecraft version"
-  },
-  "app.settings.game-options.source.settings-summary": {
-    "message": "{recognized, plural, one {# recognized setting} other {# recognized settings}}, {custom, plural, one {# custom setting} other {# custom settings}}"
-  },
   "app.settings.game-options.validation.changed-since-opened": {
     "message": "This setting changed elsewhere. Check it and try again."
   },
@@ -2838,7 +2796,7 @@
     "message": "Settings added by mods will appear here after Modrinth finds them in one of your instances."
   },
   "app.settings.synced-options.game-settings.description": {
-    "message": "Synced options are applied to every instance and override the values included with a modpack."
+    "message": "Use the same game options across your instances"
   },
   "app.settings.synced-options.game-settings.disable-all": {
     "message": "Unsync all"
@@ -2873,6 +2831,9 @@
   "app.settings.synced-options.game-settings.search": {
     "message": "Search settings..."
   },
+  "app.settings.synced-options.game-settings.sync-description": {
+    "message": "Synced options are applied to every instance and override the values included with a modpack."
+  },
   "app.settings.synced-options.game-settings.sync-setting": {
     "message": "Sync {setting} across instances"
   },
@@ -2891,9 +2852,6 @@
   "app.settings.synced-options.game-settings.unsync-setting": {
     "message": "Stop syncing {setting} across instances"
   },
-  "app.settings.synced-options.game-settings.value-label": {
-    "message": "Value"
-  },
   "app.settings.synced-options.game-settings.value-mixed": {
     "message": "Different across instances"
   },
diff --git a/apps/app-frontend/src/pages/instance/components/settings-modal/synced-options-settings.vue b/apps/app-frontend/src/pages/instance/components/settings-modal/synced-options-settings.vue
index d7b8bb36f4..c45356d7fb 100644
--- a/apps/app-frontend/src/pages/instance/components/settings-modal/synced-options-settings.vue
+++ b/apps/app-frontend/src/pages/instance/components/settings-modal/synced-options-settings.vue
@@ -13,22 +13,25 @@ import {
 import { useMutation, useQuery, useQueryClient } from '@tanstack/vue-query'
 import { computed, inject, ref } from 'vue'
 
-import GameSettingsModal from '@/components/ui/settings/instances/game-settings/GameSettingsModal.vue'
+import GameSettingsModal from '@/components/ui/settings/instances/game-settings-modal/index.vue'
 import SyncedPacksModal from '@/components/ui/settings/instances/SyncedPacksModal.vue'
-import { list_game_options_sync_sources } from '@/helpers/game-options'
 import {
-	get_initialized_synced_options,
 	get_synced_option_join_preview,
 	get_synced_options_overview,
-	list as listInstances,
+	isSyncedOptionAvailable,
 	set_synced_option,
 	type SyncedOption,
 	type SyncedOptionJoinResolution,
 } from '@/helpers/instance'
+import {
+	gameOptionsSyncSourcesQueryOptions,
+	initializedSyncedOptionsQueryOptions,
+	syncedOptionsKeys,
+} from '@/helpers/synced-options'
 import type { GameInstance } from '@/helpers/types'
 import { appSettingsModalOpenSyncedOptionsKey } from '@/providers/app-settings-modal'
 
-import { instanceKeys } from '../../query-options'
+import { instanceKeys, instanceListQueryOptions } from '../../query-options'
 import HooksSettings from './hooks-settings.vue'
 import { injectInstanceSettings } from './instance-settings-context'
 import JavaSettings from './java-settings.vue'
@@ -211,24 +214,17 @@ const rows: Array<{
 	},
 ]
 
+const availableRows = rows.filter((row) => isSyncedOptionAvailable(row.option))
+
 const overviewQuery = useQuery(
 	computed(() => ({
 		queryKey: ['instance-synced-options', instance.value.id],
 		queryFn: () => get_synced_options_overview(instance.value.id),
 	})),
 )
-const initializedOptionsQuery = useQuery({
-	queryKey: ['initialized-synced-options'],
-	queryFn: get_initialized_synced_options,
-})
-const instancesQuery = useQuery({
-	queryKey: instanceKeys.list(),
-	queryFn: listInstances,
-})
-const gameOptionSourcesQuery = useQuery({
-	queryKey: ['game-options-sync-sources'],
-	queryFn: list_game_options_sync_sources,
-})
+const initializedOptionsQuery = useQuery(initializedSyncedOptionsQueryOptions())
+const instancesQuery = useQuery(instanceListQueryOptions())
+const gameOptionSourcesQuery = useQuery(gameOptionsSyncSourcesQueryOptions())
 
 const capabilities = computed(
 	() =>
@@ -328,8 +324,8 @@ async function handleGameSettingsSaved(): Promise<void> {
 	await Promise.all([
 		queryClient.invalidateQueries({ queryKey: instanceKeys.all }),
 		queryClient.invalidateQueries({ queryKey: ['instance-synced-options'] }),
-		queryClient.invalidateQueries({ queryKey: ['initialized-synced-options'] }),
-		queryClient.invalidateQueries({ queryKey: ['game-options-sync-sources'] }),
+		queryClient.invalidateQueries({ queryKey: syncedOptionsKeys.initialized }),
+		queryClient.invalidateQueries({ queryKey: syncedOptionsKeys.gameSources }),
 	])
 }
 
@@ -400,7 +396,7 @@ const mutation = useMutation({
 	},
 	onSettled: async (_data, _error, variables) => {
 		if (variables.option === 'game_options') {
-			await queryClient.invalidateQueries({ queryKey: ['game-options-sync-sources'] })
+			await queryClient.invalidateQueries({ queryKey: syncedOptionsKeys.gameSources })
 		}
 		if (variables.option === 'multiplayer_servers') {
 			await queryClient.invalidateQueries({
@@ -420,6 +416,7 @@ const mutation = useMutation({
 })
 
 async function setExcluded(option: InstanceSyncedOption, nextExcluded: boolean) {
+	if (!isSyncedOptionAvailable(option)) return
 	const enabled = !nextExcluded
 	if (!enabled || option !== 'creative_hotbars') {
 		mutation.mutate({ option, enabled })
@@ -528,7 +525,11 @@ function resolveHotbars(resolution: SyncedOptionJoinResolution) {
 		</div>
 
 		<div class="flex flex-col gap-4">
-			<div v-for="row in rows" :key="row.option" class="flex items-center justify-between gap-6">
+			<div
+				v-for="row in availableRows"
+				:key="row.option"
+				class="flex items-center justify-between gap-6"
+			>
 				<div class="flex min-w-0 flex-col gap-1">
 					<h2 class="m-0 text-lg font-semibold text-contrast">
 						{{ formatMessage(messages[row.title]) }}
@@ -584,6 +585,7 @@ function resolveHotbars(resolution: SyncedOptionJoinResolution) {
 					<span v-tooltip="disabledReason(row.option)" class="flex">
 						<Toggle
 							:id="`exclude-${row.option}`"
+							:aria-label="formatMessage(messages[row.title])"
 							:model-value="excluded(row.option)"
 							:disabled="
 								previewingOption !== null ||
diff --git a/apps/app-frontend/src/pages/instance/worlds/index.vue b/apps/app-frontend/src/pages/instance/worlds/index.vue
index 277f38ba8f..bcc6d2e3fd 100644
--- a/apps/app-frontend/src/pages/instance/worlds/index.vue
+++ b/apps/app-frontend/src/pages/instance/worlds/index.vue
@@ -65,12 +65,7 @@
 						{{ option.label }}
 					</button>
 				</div>
-				<Button
-					type="quiet"
-					:disabled="refreshingAll"
-					class="!text-sm !font-medium"
-					@click="refreshAllWorlds"
-				>
+				<Button type="quiet" :disabled="refreshingAll" size="sm" @click="refreshAllWorlds">
 					<RefreshCwIcon :class="refreshingAll ? 'animate-spin' : ''" />
 					{{
 						formatMessage(refreshingAll ? messages.refreshingButton : commonMessages.refreshButton)
diff --git a/packages/app-lib/src/api/instance/synced_options/orchestration.rs b/packages/app-lib/src/api/instance/synced_options/orchestration.rs
index e2bba63176..1808f694c0 100644
--- a/packages/app-lib/src/api/instance/synced_options/orchestration.rs
+++ b/packages/app-lib/src/api/instance/synced_options/orchestration.rs
@@ -63,6 +63,9 @@ pub struct GlobalSyncedOptions {
 
 impl GlobalSyncedOptions {
     pub fn get(self, option: SyncedOption) -> bool {
+		if !option.is_available() {
+			return false;
+		}
         match option {
             SyncedOption::GameOptions => self.game_options,
             SyncedOption::CommandHistory => self.command_history,
@@ -75,6 +78,7 @@ impl GlobalSyncedOptions {
     }
 
     fn set(&mut self, option: SyncedOption, enabled: bool) {
+		let enabled = enabled && option.is_available();
         match option {
             SyncedOption::GameOptions => self.game_options = enabled,
             SyncedOption::CommandHistory => self.command_history = enabled,
@@ -209,6 +213,11 @@ async fn capability_status(
     global_enabled: bool,
     state: &State,
 ) -> CapabilityStatus {
+	if !option.is_available() {
+		return CapabilityStatus::Unsupported(
+			"Data pack syncing is currently disabled.".to_string(),
+		);
+	}
     if !global_enabled {
         return CapabilityStatus::Unsupported(
             "This option is disabled in the app's synced options settings."
@@ -323,6 +332,12 @@ pub async fn set_global_option(
     enabled: bool,
     base_instance_id: Option<&str>,
 ) -> crate::Result<GlobalSyncedOptions> {
+	if !option.is_available() {
+		return Err(ErrorKind::InputError(
+			"Data pack syncing is currently disabled.".to_string(),
+		)
+		.into());
+	}
     let state = State::get().await?;
     let _guard = state.lock_synced_options().await;
     let was_enabled = get_global_options_with_state(&state).await?.get(option);
@@ -542,6 +557,12 @@ pub async fn set_instance_option(
     enabled: bool,
     resolution: Option<SyncedOptionJoinResolution>,
 ) -> crate::Result<InstanceMetadata> {
+	if !option.is_available() {
+		return Err(ErrorKind::InputError(
+			"Data pack syncing is currently disabled.".to_string(),
+		)
+		.into());
+	}
     let state = State::get().await?;
     let _guard = state.lock_synced_options().await;
     let metadata = crate::state::get_instance(instance_id, &state.pool)
diff --git a/packages/app-lib/src/api/instance/synced_packs/mod.rs b/packages/app-lib/src/api/instance/synced_packs/mod.rs
index 3fc0ab1b5d..af8f937416 100644
--- a/packages/app-lib/src/api/instance/synced_packs/mod.rs
+++ b/packages/app-lib/src/api/instance/synced_packs/mod.rs
@@ -60,14 +60,23 @@ pub struct PackSyncPreview {
 }
 
 fn pack_option(project_type: ProjectType) -> crate::Result<SyncedOption> {
-    match project_type {
-        ProjectType::ResourcePack => Ok(SyncedOption::ResourcePacks),
-        ProjectType::DataPack => Ok(SyncedOption::DataPacks),
-        _ => Err(crate::ErrorKind::InputError(
-            "Only resource packs and data packs can be synced.".to_string(),
-        )
-        .into()),
-    }
+	let option = match project_type {
+		ProjectType::ResourcePack => SyncedOption::ResourcePacks,
+		ProjectType::DataPack => SyncedOption::DataPacks,
+		_ => {
+			return Err(crate::ErrorKind::InputError(
+				"Only resource packs and data packs can be synced.".to_string(),
+			)
+			.into());
+		}
+	};
+	if !option.is_available() {
+		return Err(crate::ErrorKind::InputError(
+			"Data pack syncing is currently disabled.".to_string(),
+		)
+		.into());
+	}
+	Ok(option)
 }
 
 fn version_compatible(
diff --git a/packages/app-lib/src/api/instance/synced_packs/operations.rs b/packages/app-lib/src/api/instance/synced_packs/operations.rs
index 72730c8b0a..cba3f2b308 100644
--- a/packages/app-lib/src/api/instance/synced_packs/operations.rs
+++ b/packages/app-lib/src/api/instance/synced_packs/operations.rs
@@ -506,6 +506,7 @@ pub async fn set_synced_pack_enabled(
     let pack = library.packs.get_mut(pack_id).ok_or_else(|| {
         crate::ErrorKind::InputError("Unknown synced pack.".to_string())
     })?;
+	pack_option(pack.item.project_type)?;
     pack.item.enabled = enabled;
     apply_all(&mut library, &state).await
 }
@@ -514,12 +515,11 @@ pub async fn remove_synced_pack(pack_id: &str) -> crate::Result<()> {
     let state = State::get().await?;
     let _guard = state.lock_synced_options().await;
     let mut library = read_library(&state).await?;
-    if library.packs.remove(pack_id).is_none() {
-        return Err(crate::ErrorKind::InputError(
-            "Unknown synced pack.".to_string(),
-        )
-        .into());
-    }
+	let pack = library.packs.get(pack_id).ok_or_else(|| {
+		crate::ErrorKind::InputError("Unknown synced pack.".to_string())
+	})?;
+	pack_option(pack.item.project_type)?;
+	library.packs.remove(pack_id);
     apply_all(&mut library, &state).await
 }
 
@@ -542,6 +542,10 @@ pub async fn desync_pack(
 		).into());
     }
     let mut library = read_library(&state).await?;
+	let pack = library.packs.get(pack_id).ok_or_else(|| {
+		crate::ErrorKind::InputError("Unknown synced pack.".to_string())
+	})?;
+	pack_option(pack.item.project_type)?;
     let placement = library
         .instances
         .get_mut(instance_id)
diff --git a/packages/app-lib/src/state/instances/model/instance.rs b/packages/app-lib/src/state/instances/model/instance.rs
index be168c8499..e5e6777734 100644
--- a/packages/app-lib/src/state/instances/model/instance.rs
+++ b/packages/app-lib/src/state/instances/model/instance.rs
@@ -52,6 +52,10 @@ pub enum SyncedOption {
 }
 
 impl SyncedOption {
+	pub const fn is_available(self) -> bool {
+		!matches!(self, Self::DataPacks)
+	}
+
     pub fn as_str(self) -> &'static str {
         match self {
             Self::GameOptions => "game_options",
diff --git a/packages/ui/src/components/base/Slider.vue b/packages/ui/src/components/base/Slider.vue
index 5e00c10050..c1847668f9 100644
--- a/packages/ui/src/components/base/Slider.vue
+++ b/packages/ui/src/components/base/Slider.vue
@@ -54,13 +54,11 @@
 		</span>
 
 		<Input
-			:model-value="currentValue === null ? '' : String(currentValue)"
+			:model-value="currentValue ?? undefined"
 			type="number"
 			size="medium"
-			:class="valueInputClass"
 			wrapper-class="slider-value shrink-0"
-			input-class="!font-semibold"
-			:style="{ width: currentValue === null ? '100%' : '5rem' }"
+			:style="{ width: valueInputWidth }"
 			:disabled="disabled"
 			:placeholder="placeholder"
 			:aria-label="ariaLabel"
@@ -89,7 +87,6 @@ interface Props {
 	snapRange?: number
 	disabled?: boolean
 	unit?: string
-	valueInputClass?: string
 	placeholder?: string
 	ariaLabel?: string
 }
@@ -104,11 +101,15 @@ const props = withDefaults(defineProps<Props>(), {
 	snapRange: 100,
 	disabled: false,
 	unit: '',
-	valueInputClass: '',
 })
 
 const currentValue = ref(props.modelValue === null ? null : clampValue(props.modelValue))
 const currentPercentage = computed(() => getPercentage(currentValue.value ?? props.min))
+const valueInputWidth = computed(() =>
+	currentValue.value === null
+		? '100%'
+		: `calc(${Math.max(String(currentValue.value).length, 1)}ch + 2.125rem)`,
+)
 const visibleSnapPoints = computed(() =>
 	props.snapPoints.filter((snapPoint) => snapPoint >= props.min && snapPoint <= props.max),
 )
@@ -136,7 +137,7 @@ function formatValue(value: number) {
 }
 
 function inputValueValid(inputValue: number) {
-	if (Number.isNaN(inputValue)) return
+	if (!Number.isFinite(inputValue)) return
 
 	let newValue = inputValue
 	if (props.forceStep && props.step > 0) {
diff --git a/packages/ui/src/layouts/shared/console/components/ConsoleActionButtons.vue b/packages/ui/src/layouts/shared/console/components/ConsoleActionButtons.vue
index e5a2febc96..9da6074b34 100644
--- a/packages/ui/src/layouts/shared/console/components/ConsoleActionButtons.vue
+++ b/packages/ui/src/layouts/shared/console/components/ConsoleActionButtons.vue
@@ -4,39 +4,43 @@
 			v-if="showClear && hasLogs"
 			v-tooltip="clearDisabled ? clearDisabledTooltip : undefined"
 			type="quiet"
+			size="sm"
 			:disabled="clearDisabled"
 			@click="emit('clear')"
 		>
-			<XIcon />
-			Clear
+			<XIcon aria-hidden="true" />
+			{{ formatMessage(commonMessages.clearButton) }}
 		</Button>
 		<Button
 			v-if="showDelete"
 			v-tooltip="deleteDisabled ? deleteDisabledTooltip : undefined"
 			type="quiet"
+			size="sm"
 			color="red"
+			interaction="filled"
 			:disabled="deleteDisabled"
-			class="hover:!bg-red focus-visible:!bg-red hover:!text-[var(--color-accent-contrast)] focus-visible:!text-[var(--color-accent-contrast)]"
 			@click="emit('delete')"
 		>
-			<TrashIcon />
-			Delete
+			<TrashIcon aria-hidden="true" />
+			{{ formatMessage(commonMessages.deleteLabel) }}
 		</Button>
 		<Button
 			v-if="hasLogs"
 			v-tooltip="shareDisabled ? shareDisabledTooltip : undefined"
 			type="quiet"
-			:disabled="shareDisabled || sharing"
+			size="sm"
+			:disabled="shareDisabled"
+			:loading="sharing"
 			@click="emit('share')"
 		>
-			<SpinnerIcon v-if="sharing" class="animate-spin" />
-			<ShareIcon v-else />
-			Share
+			<SpinnerIcon v-if="sharing" class="animate-spin" aria-hidden="true" />
+			<ShareIcon v-else aria-hidden="true" />
+			{{ formatMessage(messages.share) }}
 		</Button>
-		<Button type="quiet" class="!text-sm !font-medium" @click="emit('toggle-fullscreen')">
-			<ContractIcon v-if="fullscreen" />
-			<ExpandIcon v-else />
-			{{ fullscreen ? 'Collapse' : 'Expand' }}
+		<Button type="quiet" size="sm" @click="emit('toggle-fullscreen')">
+			<ContractIcon v-if="fullscreen" aria-hidden="true" />
+			<ExpandIcon v-else aria-hidden="true" />
+			{{ formatMessage(fullscreen ? messages.collapse : messages.expand) }}
 		</Button>
 	</div>
 </template>
@@ -52,6 +56,24 @@ import {
 } from '@modrinth/assets'
 
 import { Button } from '#ui/components/base/buttons'
+import { defineMessages, useVIntl } from '#ui/composables/i18n'
+import { commonMessages } from '#ui/utils/common-messages'
+
+const { formatMessage } = useVIntl()
+const messages = defineMessages({
+	share: {
+		id: 'console.actions.share',
+		defaultMessage: 'Share',
+	},
+	collapse: {
+		id: 'console.actions.collapse',
+		defaultMessage: 'Collapse',
+	},
+	expand: {
+		id: 'console.actions.expand',
+		defaultMessage: 'Expand',
+	},
+})
 
 defineProps<{
 	showClear?: boolean
diff --git a/packages/ui/src/layouts/shared/content-tab/components/ContentCardItem.vue b/packages/ui/src/layouts/shared/content-tab/components/ContentCardItem.vue
index 3149c63a46..ff22ede02b 100644
--- a/packages/ui/src/layouts/shared/content-tab/components/ContentCardItem.vue
+++ b/packages/ui/src/layouts/shared/content-tab/components/ContentCardItem.vue
@@ -144,6 +144,9 @@ const fileNameRef = ref<HTMLElement | null>(null)
 
 const isDisabled = computed(() => props.disabled || props.installing)
 const isToggleDisabled = computed(() => isDisabled.value || props.toggleDisabled)
+const syncStatusLabel = computed(() =>
+	formatMessage(props.syncUpdatePending ? messages.syncUpdatePending : messages.synced),
+)
 
 const clientWarningMessage = computed(() => {
 	switch (props.clientWarning) {
@@ -235,18 +238,16 @@ const installTooltip = computed(() => {
 						<slot name="title-badges" />
 						<span
 							v-if="synced"
-							v-tooltip="
-								formatMessage(syncUpdatePending ? messages.syncUpdatePending : messages.synced)
-							"
-							:aria-label="
-								formatMessage(syncUpdatePending ? messages.syncUpdatePending : messages.synced)
-							"
+							v-tooltip="syncStatusLabel"
+							:aria-label="syncStatusLabel"
+							role="img"
 							class="inline-flex size-5 shrink-0 cursor-help items-center justify-center"
 							tabindex="0"
 						>
 							<LinkIcon
 								class="size-4"
 								:class="syncUpdatePending ? 'text-orange' : 'text-secondary'"
+								aria-hidden="true"
 							/>
 						</span>
 						<span
diff --git a/packages/ui/src/layouts/shared/content-tab/components/managed-content-modal/index.vue b/packages/ui/src/layouts/shared/content-tab/components/managed-content-modal/index.vue
index 40a2c05346..fffa8e9e50 100644
--- a/packages/ui/src/layouts/shared/content-tab/components/managed-content-modal/index.vue
+++ b/packages/ui/src/layouts/shared/content-tab/components/managed-content-modal/index.vue
@@ -500,8 +500,8 @@ defineExpose({ show, showLoading, hide, getState, restore, updateItem, setItems
 <template>
 	<NewModal
 		ref="modal"
-		:max-width="'min(928px, calc(95vw - 10rem))'"
-		:width="'min(928px, calc(95vw - 10rem))'"
+		max-width="min(928px, calc(95vw - 10rem))"
+		width="min(928px, calc(95vw - 10rem))"
 		:on-hide="handleHide"
 		no-padding
 	>
@@ -526,7 +526,10 @@ defineExpose({ show, showLoading, hide, getState, restore, updateItem, setItems
 				<Input
 					v-model="searchQuery"
 					:icon="SearchIcon"
+					type="search"
 					:placeholder="formatMessage(messages.searchPlaceholder, { count: typeFilteredCount })"
+					:aria-label="formatMessage(messages.searchPlaceholder, { count: typeFilteredCount })"
+					:clear-label="formatMessage(commonMessages.clearButton)"
 					clearable
 				/>
 
diff --git a/packages/ui/src/locales/en-US/index.json b/packages/ui/src/locales/en-US/index.json
index be7037605b..469de8b1bd 100644
--- a/packages/ui/src/locales/en-US/index.json
+++ b/packages/ui/src/locales/en-US/index.json
@@ -365,6 +365,15 @@
   "collections.label.private": {
     "defaultMessage": "Private"
   },
+  "console.actions.collapse": {
+    "defaultMessage": "Collapse"
+  },
+  "console.actions.expand": {
+    "defaultMessage": "Expand"
+  },
+  "console.actions.share": {
+    "defaultMessage": "Share"
+  },
   "content-type.content.lowercase": {
     "defaultMessage": "content"
   },

From 80dcc74a49224d9a503e6069d664fcacc95355b6 Mon Sep 17 00:00:00 2001
From: "Calum H. (IMB11)" <contact@cal.engineer>
Date: Thu, 3 Sep 2026 19:12:59 +0100
Subject: [PATCH 20/33] fix: options.txt handling for synced resource packs

---
 .../synced_options/game_options/mod.rs        |   6 +
 .../game_options/resource_pack_options.rs     | 105 ++++
 .../instance/synced_options/orchestration.rs  |  61 ++-
 .../src/api/instance/synced_packs/mod.rs      |  52 +-
 .../api/instance/synced_packs/operations.rs   |  94 +++-
 .../instance/synced_packs/reconciliation.rs   | 142 ++++++
 .../api/instance/synced_packs/selection.rs    | 464 ++++++++++++++++++
 .../synced_packs/selection_compatibility.rs   | 167 +++++++
 .../src/state/instances/model/instance.rs     |   6 +-
 9 files changed, 1041 insertions(+), 56 deletions(-)
 create mode 100644 packages/app-lib/src/api/instance/synced_options/game_options/resource_pack_options.rs
 create mode 100644 packages/app-lib/src/api/instance/synced_packs/selection.rs
 create mode 100644 packages/app-lib/src/api/instance/synced_packs/selection_compatibility.rs

diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/mod.rs b/packages/app-lib/src/api/instance/synced_options/game_options/mod.rs
index 9dfe0dbecc..8a22e9163a 100644
--- a/packages/app-lib/src/api/instance/synced_options/game_options/mod.rs
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/mod.rs
@@ -28,6 +28,7 @@ mod local_settings_editor;
 mod options_file;
 mod pack_updates;
 mod read_instance_changes;
+mod resource_pack_options;
 mod settings_editor;
 mod source_selection;
 mod write_shared_settings;
@@ -57,6 +58,11 @@ pub(crate) use fullscreen::{
 };
 pub(crate) use write_shared_settings::sync_all_participating_instances;
 
+pub(in crate::api::instance) use resource_pack_options::{
+    ResourcePackOptionsUpdate, merge_resource_pack_entries,
+    merge_resource_pack_order, read_resource_pack_entries,
+};
+
 pub(in crate::api::instance) use pack_updates::{
     detach_instance, prepare_instance_update_with_state,
 };
diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/resource_pack_options.rs b/packages/app-lib/src/api/instance/synced_options/game_options/resource_pack_options.rs
new file mode 100644
index 0000000000..e8277349e7
--- /dev/null
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/resource_pack_options.rs
@@ -0,0 +1,105 @@
+//! Reads and merges Minecraft's active resource-pack list.
+
+use super::options_file::{input_error, options_path, read_document};
+use crate::state::{InstanceMetadata, State};
+use crate::util::io;
+use std::collections::BTreeSet;
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub(in crate::api::instance) struct ResourcePackOptions {
+    pub entries: Vec<String>,
+    pub incompatible: Vec<String>,
+}
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub(in crate::api::instance) enum ResourcePackOptionsUpdate {
+    Deferred,
+    Applied(ResourcePackOptions),
+}
+
+fn parse_entries(raw: &str) -> crate::Result<Vec<String>> {
+    serde_json::from_str(raw).map_err(|_| {
+        input_error("options.txt contains an invalid resourcePacks value")
+    })
+}
+
+pub(in crate::api::instance) fn merge_resource_pack_order(
+    entries: &[String],
+    managed: &BTreeSet<String>,
+    selected: &[String],
+) -> Vec<String> {
+    let mut merged = Vec::new();
+    let mut remaining = selected.iter();
+    let mut seen = BTreeSet::new();
+    for entry in entries {
+        if !managed.contains(entry) {
+            merged.push(entry.clone());
+        } else if selected.contains(entry)
+            && seen.insert(entry)
+            && let Some(next) = remaining.next()
+        {
+            merged.push(next.clone());
+        }
+    }
+    merged.extend(remaining.cloned());
+    merged
+}
+
+pub(in crate::api::instance) async fn read_resource_pack_entries(
+    metadata: &InstanceMetadata,
+    state: &State,
+) -> crate::Result<Option<ResourcePackOptions>> {
+    let path = options_path(metadata, state);
+    if !path.exists() {
+        return Ok(None);
+    }
+    let (document, _) = read_document(&path).await?;
+    let Some(raw) = document.value("resourcePacks") else {
+        return Ok(None);
+    };
+    Ok(Some(ResourcePackOptions {
+        entries: parse_entries(raw)?,
+        incompatible: document
+            .value("incompatibleResourcePacks")
+            .map(parse_entries)
+            .transpose()?
+            .unwrap_or_default(),
+    }))
+}
+
+pub(in crate::api::instance) async fn merge_resource_pack_entries(
+    metadata: &InstanceMetadata,
+    managed: &BTreeSet<String>,
+    selected: &[String],
+    state: &State,
+) -> crate::Result<ResourcePackOptionsUpdate> {
+    let path = options_path(metadata, state);
+    if !path.exists() {
+        return Ok(ResourcePackOptionsUpdate::Deferred);
+    }
+    let (mut document, input_bytes) = read_document(&path).await?;
+    let Some(raw) = document.value("resourcePacks") else {
+        return Ok(ResourcePackOptionsUpdate::Deferred);
+    };
+    let original = parse_entries(raw)?;
+    let entries = merge_resource_pack_order(&original, managed, selected);
+    let options = ResourcePackOptions {
+        entries,
+        incompatible: document
+            .value("incompatibleResourcePacks")
+            .map(parse_entries)
+            .transpose()?
+            .unwrap_or_default(),
+    };
+    if options.entries == original {
+        return Ok(ResourcePackOptionsUpdate::Applied(options));
+    }
+    let raw = serde_json::to_string(&options.entries)?;
+    document.set("resourcePacks", &raw, false)?;
+    let output_bytes = document.serialize()?;
+    if output_bytes == input_bytes {
+        return Ok(ResourcePackOptionsUpdate::Applied(options));
+    }
+    io::write(path, output_bytes).await?;
+    Ok(ResourcePackOptionsUpdate::Applied(options))
+}
diff --git a/packages/app-lib/src/api/instance/synced_options/orchestration.rs b/packages/app-lib/src/api/instance/synced_options/orchestration.rs
index 1808f694c0..49e1dd0c5e 100644
--- a/packages/app-lib/src/api/instance/synced_options/orchestration.rs
+++ b/packages/app-lib/src/api/instance/synced_options/orchestration.rs
@@ -63,9 +63,9 @@ pub struct GlobalSyncedOptions {
 
 impl GlobalSyncedOptions {
     pub fn get(self, option: SyncedOption) -> bool {
-		if !option.is_available() {
-			return false;
-		}
+        if !option.is_available() {
+            return false;
+        }
         match option {
             SyncedOption::GameOptions => self.game_options,
             SyncedOption::CommandHistory => self.command_history,
@@ -78,7 +78,7 @@ impl GlobalSyncedOptions {
     }
 
     fn set(&mut self, option: SyncedOption, enabled: bool) {
-		let enabled = enabled && option.is_available();
+        let enabled = enabled && option.is_available();
         match option {
             SyncedOption::GameOptions => self.game_options = enabled,
             SyncedOption::CommandHistory => self.command_history = enabled,
@@ -213,11 +213,11 @@ async fn capability_status(
     global_enabled: bool,
     state: &State,
 ) -> CapabilityStatus {
-	if !option.is_available() {
-		return CapabilityStatus::Unsupported(
-			"Data pack syncing is currently disabled.".to_string(),
-		);
-	}
+    if !option.is_available() {
+        return CapabilityStatus::Unsupported(
+            "Data pack syncing is currently disabled.".to_string(),
+        );
+    }
     if !global_enabled {
         return CapabilityStatus::Unsupported(
             "This option is disabled in the app's synced options settings."
@@ -332,12 +332,12 @@ pub async fn set_global_option(
     enabled: bool,
     base_instance_id: Option<&str>,
 ) -> crate::Result<GlobalSyncedOptions> {
-	if !option.is_available() {
-		return Err(ErrorKind::InputError(
-			"Data pack syncing is currently disabled.".to_string(),
-		)
-		.into());
-	}
+    if !option.is_available() {
+        return Err(ErrorKind::InputError(
+            "Data pack syncing is currently disabled.".to_string(),
+        )
+        .into());
+    }
     let state = State::get().await?;
     let _guard = state.lock_synced_options().await;
     let was_enabled = get_global_options_with_state(&state).await?.get(option);
@@ -557,12 +557,12 @@ pub async fn set_instance_option(
     enabled: bool,
     resolution: Option<SyncedOptionJoinResolution>,
 ) -> crate::Result<InstanceMetadata> {
-	if !option.is_available() {
-		return Err(ErrorKind::InputError(
-			"Data pack syncing is currently disabled.".to_string(),
-		)
-		.into());
-	}
+    if !option.is_available() {
+        return Err(ErrorKind::InputError(
+            "Data pack syncing is currently disabled.".to_string(),
+        )
+        .into());
+    }
     let state = State::get().await?;
     let _guard = state.lock_synced_options().await;
     let metadata = crate::state::get_instance(instance_id, &state.pool)
@@ -854,6 +854,13 @@ pub(crate) async fn prepare_instance_update(
     let metadata = crate::state::get_instance(instance_id, &state.pool)
         .await?
         .ok_or_else(|| ErrorKind::InputError("Unknown instance".to_string()))?;
+    if let Err(error) =
+        synced_packs::prepare_instance_update(&metadata, &state).await
+    {
+        tracing::warn!(
+            "The modpack update will continue, but resource-pack selection could not be prepared: {error}"
+        );
+    }
     for option in [
         SyncedOption::GameOptions,
         SyncedOption::CommandHistory,
@@ -976,6 +983,18 @@ pub async fn reconcile_changed_file(
                 )
                 .await?;
             }
+            let resource_packs_participate = option_participates(
+                &metadata,
+                SyncedOption::ResourcePacks,
+                &state,
+            )
+            .await?;
+            if resource_packs_participate {
+                synced_packs::capture_resource_pack_selection_change(
+                    &metadata, &state,
+                )
+                .await?;
+            }
             Ok(())
         }
         COMMAND_HISTORY_FILE => {
diff --git a/packages/app-lib/src/api/instance/synced_packs/mod.rs b/packages/app-lib/src/api/instance/synced_packs/mod.rs
index af8f937416..9bb48c6c78 100644
--- a/packages/app-lib/src/api/instance/synced_packs/mod.rs
+++ b/packages/app-lib/src/api/instance/synced_packs/mod.rs
@@ -1,5 +1,7 @@
 mod operations;
 mod reconciliation;
+mod selection;
+mod selection_compatibility;
 mod storage;
 
 pub use operations::{
@@ -9,7 +11,8 @@ pub use operations::{
 pub(super) use operations::{seed_from_instance, sync_new_pack};
 pub(crate) use reconciliation::reconcile_after_change;
 pub(super) use reconciliation::{
-    decorate_content, detach, reconcile, reconcile_after_content_change,
+    capture_resource_pack_selection_change, decorate_content, detach,
+    prepare_instance_update, reconcile, reconcile_after_content_change,
 };
 
 use crate::state::{
@@ -22,6 +25,12 @@ use std::collections::BTreeMap;
 struct PackLibrary {
     packs: BTreeMap<String, SyncedPack>,
     instances: BTreeMap<String, BTreeMap<String, PackPlacement>>,
+    #[serde(default)]
+    resource_pack_order: Vec<String>,
+    #[serde(default)]
+    resource_pack_observations: BTreeMap<String, Vec<String>>,
+    #[serde(default)]
+    resource_pack_incompatible_observations: BTreeMap<String, Vec<String>>,
 }
 
 #[derive(Clone, Serialize, Deserialize)]
@@ -29,6 +38,8 @@ struct SyncedPack {
     item: ContentItem,
     sha1: String,
     game_versions: Vec<String>,
+    #[serde(default)]
+    selected: Option<bool>,
 }
 
 #[derive(Clone, Default, Serialize, Deserialize)]
@@ -42,6 +53,11 @@ struct PackPlacement {
     content_set_id: String,
     #[serde(default)]
     error: Option<String>,
+    #[serde(default)]
+    resource_pack_selection_pending: bool,
+    /// The pack path used by the last reconciled resourcePacks selection.
+    #[serde(default)]
+    resource_pack_selection_path: Option<String>,
 }
 
 #[derive(Clone, Serialize)]
@@ -60,23 +76,23 @@ pub struct PackSyncPreview {
 }
 
 fn pack_option(project_type: ProjectType) -> crate::Result<SyncedOption> {
-	let option = match project_type {
-		ProjectType::ResourcePack => SyncedOption::ResourcePacks,
-		ProjectType::DataPack => SyncedOption::DataPacks,
-		_ => {
-			return Err(crate::ErrorKind::InputError(
-				"Only resource packs and data packs can be synced.".to_string(),
-			)
-			.into());
-		}
-	};
-	if !option.is_available() {
-		return Err(crate::ErrorKind::InputError(
-			"Data pack syncing is currently disabled.".to_string(),
-		)
-		.into());
-	}
-	Ok(option)
+    let option = match project_type {
+        ProjectType::ResourcePack => SyncedOption::ResourcePacks,
+        ProjectType::DataPack => SyncedOption::DataPacks,
+        _ => {
+            return Err(crate::ErrorKind::InputError(
+                "Only resource packs and data packs can be synced.".to_string(),
+            )
+            .into());
+        }
+    };
+    if !option.is_available() {
+        return Err(crate::ErrorKind::InputError(
+            "Data pack syncing is currently disabled.".to_string(),
+        )
+        .into());
+    }
+    Ok(option)
 }
 
 fn version_compatible(
diff --git a/packages/app-lib/src/api/instance/synced_packs/operations.rs b/packages/app-lib/src/api/instance/synced_packs/operations.rs
index cba3f2b308..371031af19 100644
--- a/packages/app-lib/src/api/instance/synced_packs/operations.rs
+++ b/packages/app-lib/src/api/instance/synced_packs/operations.rs
@@ -99,6 +99,26 @@ pub(super) async fn pack_from_item(
         vec![metadata.applied_content_set.game_version.clone()]
     };
     let sha1 = cache_bytes(bytes, state).await?;
+    let selected = if item.project_type == ProjectType::ResourcePack {
+        match super::selection::selected_in_instance(
+            metadata,
+            &item.file_path,
+            state,
+        )
+        .await
+        {
+            Ok(selected) => selected,
+            Err(error) => {
+                tracing::warn!(
+                    "Could not read resource-pack selection from {}: {error}",
+                    metadata.instance.id
+                );
+                None
+            }
+        }
+    } else {
+        None
+    };
     item.file_name = item.file_name.trim_end_matches(".disabled").to_string();
     item.file_path.clear();
     item.synced_pack = None;
@@ -109,6 +129,7 @@ pub(super) async fn pack_from_item(
         item,
         sha1,
         game_versions,
+        selected,
     })
 }
 
@@ -300,6 +321,14 @@ pub(in crate::api::instance) async fn seed_from_instance(
                 },
             );
     }
+    if let Err(error) =
+        super::selection::capture_source_order(metadata, &mut library, state)
+            .await
+    {
+        tracing::warn!(
+            "Could not read the source resource-pack order for {instance_id}: {error}"
+        );
+    }
     write_library(&library, state).await
 }
 
@@ -353,9 +382,23 @@ async fn sync_pack_inner(
         .into());
     }
     let mut library = read_library(&state).await?;
-    let (id, mut pack) = existing_pack(&library, &candidate)
-        .map(|(id, pack)| (id.clone(), pack.clone()))
-        .unwrap_or_else(|| (Uuid::new_v4().to_string(), candidate));
+    if let Err(error) =
+        super::selection::capture(&metadata, &mut library, &state).await
+    {
+        tracing::warn!(
+            "Could not capture resource-pack selection before syncing {project_path}: {error}"
+        );
+    }
+    let (id, mut pack) =
+        if let Some((id, existing)) = existing_pack(&library, &candidate) {
+            let mut existing = existing.clone();
+            if existing.selected.is_none() {
+                existing.selected = candidate.selected;
+            }
+            (id.clone(), existing)
+        } else {
+            (Uuid::new_v4().to_string(), candidate)
+        };
     if automatic
         && library
             .instances
@@ -368,6 +411,17 @@ async fn sync_pack_inner(
     if !participating(&metadata, &pack, global) {
         return Err(crate::ErrorKind::InputError("Enable pack syncing in app settings and turn off this instance's override first.".to_string()).into());
     }
+    let previous = library
+        .instances
+        .get(instance_id)
+        .and_then(|placements| placements.get(&id));
+    let resource_pack_selection_path = previous.and_then(|placement| {
+        placement.resource_pack_selection_path.clone().or_else(|| {
+            (!placement.path.is_empty()).then(|| placement.path.clone())
+        })
+    });
+    let resource_pack_selection_pending = previous
+        .is_some_and(|placement| placement.resource_pack_selection_pending);
     pack.item.id = id.clone();
     library.packs.insert(id.clone(), pack);
     library
@@ -380,10 +434,20 @@ async fn sync_pack_inner(
                 path: item.file_path,
                 sha1: item.id,
                 enabled: item.enabled,
-                content_set_id: metadata.applied_content_set.id,
+                content_set_id: metadata.applied_content_set.id.clone(),
+                resource_pack_selection_path,
+                resource_pack_selection_pending,
                 ..Default::default()
             },
         );
+    if let Err(error) =
+        super::selection::capture_source_order(&metadata, &mut library, &state)
+            .await
+    {
+        tracing::warn!(
+            "Could not read the source resource-pack order for {instance_id}: {error}"
+        );
+    }
     apply_all(&mut library, &state).await?;
     emit_instance(instance_id, InstancePayloadType::Synced).await?;
     Ok(())
@@ -472,6 +536,8 @@ pub async fn upload_synced_pack(
         SyncedPack {
             sha1,
             game_versions,
+            selected: (project_type == ProjectType::ResourcePack)
+                .then_some(false),
             item: ContentItem {
                 id,
                 file_name,
@@ -506,7 +572,7 @@ pub async fn set_synced_pack_enabled(
     let pack = library.packs.get_mut(pack_id).ok_or_else(|| {
         crate::ErrorKind::InputError("Unknown synced pack.".to_string())
     })?;
-	pack_option(pack.item.project_type)?;
+    pack_option(pack.item.project_type)?;
     pack.item.enabled = enabled;
     apply_all(&mut library, &state).await
 }
@@ -515,11 +581,11 @@ pub async fn remove_synced_pack(pack_id: &str) -> crate::Result<()> {
     let state = State::get().await?;
     let _guard = state.lock_synced_options().await;
     let mut library = read_library(&state).await?;
-	let pack = library.packs.get(pack_id).ok_or_else(|| {
-		crate::ErrorKind::InputError("Unknown synced pack.".to_string())
-	})?;
-	pack_option(pack.item.project_type)?;
-	library.packs.remove(pack_id);
+    let pack = library.packs.get(pack_id).ok_or_else(|| {
+        crate::ErrorKind::InputError("Unknown synced pack.".to_string())
+    })?;
+    pack_option(pack.item.project_type)?;
+    library.packs.remove(pack_id);
     apply_all(&mut library, &state).await
 }
 
@@ -542,10 +608,10 @@ pub async fn desync_pack(
 		).into());
     }
     let mut library = read_library(&state).await?;
-	let pack = library.packs.get(pack_id).ok_or_else(|| {
-		crate::ErrorKind::InputError("Unknown synced pack.".to_string())
-	})?;
-	pack_option(pack.item.project_type)?;
+    let pack = library.packs.get(pack_id).ok_or_else(|| {
+        crate::ErrorKind::InputError("Unknown synced pack.".to_string())
+    })?;
+    pack_option(pack.item.project_type)?;
     let placement = library
         .instances
         .get_mut(instance_id)
diff --git a/packages/app-lib/src/api/instance/synced_packs/reconciliation.rs b/packages/app-lib/src/api/instance/synced_packs/reconciliation.rs
index 899f58c20d..71c2b27892 100644
--- a/packages/app-lib/src/api/instance/synced_packs/reconciliation.rs
+++ b/packages/app-lib/src/api/instance/synced_packs/reconciliation.rs
@@ -103,6 +103,12 @@ pub(super) async fn capture(
                 }
                 shared_changed = true;
             }
+            if pack.item.project_type == ProjectType::ResourcePack
+                && placement.resource_pack_selection_path.is_none()
+            {
+                placement.resource_pack_selection_path =
+                    Some(placement.path.clone());
+            }
             placement.path = item.file_path.clone();
             placement.sha1 = item.id.clone();
             placement.enabled = item.enabled;
@@ -116,6 +122,13 @@ pub(super) async fn capture(
             .or_default()
             .insert(id, placement);
     }
+    match super::selection::capture(metadata, library, state).await {
+        Ok(changed) => shared_changed |= changed.unwrap_or(false),
+        Err(error) => tracing::warn!(
+            "Could not capture resource-pack selection for {}: {error}",
+            metadata.instance.id
+        ),
+    }
     Ok(shared_changed)
 }
 
@@ -186,6 +199,15 @@ async fn apply_pack(
         .get(instance_id)
         .and_then(|items| items.get(id))
         .cloned();
+    let resource_pack_selection_path =
+        previous.as_ref().and_then(|placement| {
+            placement.resource_pack_selection_path.clone().or_else(|| {
+                (!placement.path.is_empty()).then(|| placement.path.clone())
+            })
+        });
+    let resource_pack_selection_pending = previous
+        .as_ref()
+        .is_some_and(|placement| placement.resource_pack_selection_pending);
     if previous
         .as_ref()
         .is_some_and(|placement| placement.excluded)
@@ -252,6 +274,8 @@ async fn apply_pack(
                         enabled: pack.item.enabled,
                         pending: !compatible,
                         content_set_id: metadata.applied_content_set.id.clone(),
+                        resource_pack_selection_path,
+                        resource_pack_selection_pending,
                         ..Default::default()
                     },
                 );
@@ -302,6 +326,8 @@ async fn apply_pack(
                 PackPlacement {
                     enabled: pack.item.enabled,
                     content_set_id: metadata.applied_content_set.id.clone(),
+                    resource_pack_selection_path,
+                    resource_pack_selection_pending,
                     ..Default::default()
                 },
             );
@@ -440,6 +466,8 @@ async fn apply_pack(
                 sha1,
                 enabled: pack.item.enabled,
                 content_set_id: metadata.applied_content_set.id.clone(),
+                resource_pack_selection_path,
+                resource_pack_selection_pending,
                 ..Default::default()
             },
         );
@@ -460,6 +488,11 @@ pub(super) async fn apply_instance(
         return Ok(());
     }
     let global = get_global_options().await?;
+    let previous_placements = library
+        .instances
+        .get(&metadata.instance.id)
+        .cloned()
+        .unwrap_or_default();
     let packs = library.packs.clone();
     for (id, pack) in &packs {
         if !participating(metadata, pack, global) {
@@ -514,6 +547,15 @@ pub(super) async fn apply_instance(
             placements.remove(&id);
         }
     }
+    if let Err(error) =
+        super::selection::apply(metadata, library, &previous_placements, state)
+            .await
+    {
+        tracing::warn!(
+            "Could not apply resource-pack selection for {}: {error}",
+            metadata.instance.id
+        );
+    }
     Ok(())
 }
 
@@ -525,6 +567,30 @@ pub(super) async fn apply_all(
     library.instances.retain(|id, _| {
         instances.iter().any(|metadata| &metadata.instance.id == id)
     });
+    library.resource_pack_observations.retain(|id, _| {
+        instances.iter().any(|metadata| &metadata.instance.id == id)
+    });
+    library
+        .resource_pack_incompatible_observations
+        .retain(|id, _| {
+            instances.iter().any(|metadata| &metadata.instance.id == id)
+        });
+    library
+        .resource_pack_order
+        .retain(|id| library.packs.contains_key(id));
+    for metadata in &instances {
+        if sync_files_are_protected(metadata) {
+            continue;
+        }
+        if let Err(error) =
+            super::selection::capture(metadata, library, state).await
+        {
+            tracing::warn!(
+                "Could not capture resource-pack selection for {} before syncing: {error}",
+                metadata.instance.id
+            );
+        }
+    }
     write_library(library, state).await?;
     for metadata in instances {
         if let Err(error) = apply_instance(&metadata, library, state).await {
@@ -583,6 +649,72 @@ pub(in crate::api::instance) async fn reconcile_after_content_change(
     }
 }
 
+pub(in crate::api::instance) async fn capture_resource_pack_selection_change(
+    metadata: &InstanceMetadata,
+    state: &State,
+) -> crate::Result<()> {
+    let mut library = read_library(state).await?;
+    match super::selection::capture(metadata, &mut library, state).await? {
+        Some(true) => apply_all(&mut library, state).await?,
+        Some(false) => write_library(&library, state).await?,
+        None => {}
+    }
+    Ok(())
+}
+
+pub(in crate::api::instance) async fn prepare_instance_update(
+    metadata: &InstanceMetadata,
+    state: &State,
+) -> crate::Result<()> {
+    let mut library = read_library(state).await?;
+    match super::selection::capture(metadata, &mut library, state).await {
+        Ok(Some(true)) => apply_all(&mut library, state).await?,
+        Ok(_) => {}
+        Err(error) => tracing::warn!(
+            "Could not capture resource-pack selection before updating {}: {error}",
+            metadata.instance.id
+        ),
+    }
+    let global = get_global_options().await?;
+    let pending_ids = library
+        .instances
+        .get(&metadata.instance.id)
+        .into_iter()
+        .flat_map(|placements| placements.iter())
+        .filter_map(|(id, placement)| {
+            let pack = library.packs.get(id)?;
+            (pack.item.project_type == ProjectType::ResourcePack
+                && pack.selected.is_some()
+                && participating(metadata, pack, global)
+                && !placement.excluded
+                && !placement.suspended)
+                .then(|| id.clone())
+        })
+        .collect::<Vec<_>>();
+    let mut changed = library
+        .resource_pack_observations
+        .remove(&metadata.instance.id)
+        .is_some();
+    changed |= library
+        .resource_pack_incompatible_observations
+        .remove(&metadata.instance.id)
+        .is_some();
+    if let Some(placements) = library.instances.get_mut(&metadata.instance.id) {
+        for id in pending_ids {
+            if let Some(placement) = placements.get_mut(&id)
+                && !placement.resource_pack_selection_pending
+            {
+                placement.resource_pack_selection_pending = true;
+                changed = true;
+            }
+        }
+    }
+    if changed {
+        write_library(&library, state).await?;
+    }
+    Ok(())
+}
+
 pub(in crate::api::instance) async fn detach(
     metadata: &InstanceMetadata,
     option: SyncedOption,
@@ -601,6 +733,16 @@ pub(in crate::api::instance) async fn detach(
             }
         }
     }
+    if option == SyncedOption::ResourcePacks {
+        changed |= library
+            .resource_pack_observations
+            .remove(&metadata.instance.id)
+            .is_some();
+        changed |= library
+            .resource_pack_incompatible_observations
+            .remove(&metadata.instance.id)
+            .is_some();
+    }
     if changed {
         write_library(&library, state).await?;
     }
diff --git a/packages/app-lib/src/api/instance/synced_packs/selection.rs b/packages/app-lib/src/api/instance/synced_packs/selection.rs
new file mode 100644
index 0000000000..080988ae1c
--- /dev/null
+++ b/packages/app-lib/src/api/instance/synced_packs/selection.rs
@@ -0,0 +1,464 @@
+use super::super::synced_options::game_options::{
+    ResourcePackOptionsUpdate, merge_resource_pack_entries,
+    merge_resource_pack_order, read_resource_pack_entries,
+};
+use super::super::synced_options::{get_global_options, instance_dir};
+use super::reconciliation::participating;
+use super::selection_compatibility;
+use super::{PackLibrary, PackPlacement, SyncedPack};
+use crate::state::instances::commands;
+use crate::state::{
+    ContentSourceKind, InstanceMetadata, ProjectType, State, SyncedOption,
+};
+use std::collections::{BTreeMap, BTreeSet};
+use std::path::Path;
+
+fn option_entry(path: &str) -> Option<String> {
+    let path = path.trim_end_matches(".disabled");
+    let file_name = Path::new(path).file_name()?.to_str()?;
+    Some(format!("file/{file_name}"))
+}
+
+fn selected_entry(entries: &[String], entry: &str) -> bool {
+    let legacy = entry.strip_prefix("file/").unwrap_or(entry);
+    entries
+        .iter()
+        .any(|candidate| candidate == entry || candidate == legacy)
+}
+
+fn target_entry(metadata: &InstanceMetadata, entry: String) -> String {
+    let legacy = metadata
+        .applied_content_set
+        .game_version
+        .strip_prefix("1.")
+        .and_then(|version| version.split('.').next()?.parse::<u32>().ok())
+        .is_some_and(|minor| minor < 13);
+    if legacy {
+        entry.strip_prefix("file/").unwrap_or(&entry).to_string()
+    } else {
+        entry
+    }
+}
+
+async fn local_file(
+    metadata: &InstanceMetadata,
+    path: &str,
+    state: &State,
+) -> crate::Result<bool> {
+    if path.is_empty() || !instance_dir(metadata, state).join(path).exists() {
+        return Ok(false);
+    }
+    let kind = commands::content_source_kind_for_project_path(
+        &metadata.instance.id,
+        path,
+        state,
+    )
+    .await?;
+    Ok(kind.is_none_or(|kind| kind == ContentSourceKind::Local))
+}
+
+async fn can_capture(
+    metadata: &InstanceMetadata,
+    pack: &SyncedPack,
+    placement: &PackPlacement,
+    state: &State,
+) -> crate::Result<bool> {
+    if pack.item.project_type != ProjectType::ResourcePack
+        || !pack.item.enabled
+        || !placement.enabled
+        || placement.excluded
+        || placement.suspended
+        || placement.pending
+        || placement.error.is_some()
+        || placement.path.ends_with(".disabled")
+        || placement.content_set_id != metadata.applied_content_set.id
+    {
+        return Ok(false);
+    }
+    local_file(metadata, &placement.path, state).await
+}
+
+pub(super) async fn selected_in_instance(
+    metadata: &InstanceMetadata,
+    project_path: &str,
+    state: &State,
+) -> crate::Result<Option<bool>> {
+    let Some(entry) = option_entry(project_path) else {
+        return Ok(None);
+    };
+    let Some(options) = read_resource_pack_entries(metadata, state).await?
+    else {
+        return Ok(None);
+    };
+    Ok(Some(selected_entry(&options.entries, &entry)))
+}
+
+pub(super) async fn capture_source_order(
+    metadata: &InstanceMetadata,
+    library: &mut PackLibrary,
+    state: &State,
+) -> crate::Result<()> {
+    let Some(options) = read_resource_pack_entries(metadata, state).await?
+    else {
+        return Ok(());
+    };
+    let mut known_entries = BTreeMap::new();
+    for (id, placement) in library
+        .instances
+        .get(&metadata.instance.id)
+        .into_iter()
+        .flat_map(|placements| placements.iter())
+    {
+        let Some(pack) = library.packs.get(id) else {
+            continue;
+        };
+        if pack.selected != Some(true)
+            || placement.resource_pack_selection_pending
+            || !can_capture(metadata, pack, placement, state).await?
+        {
+            continue;
+        }
+        let Some(entry) = option_entry(&placement.path) else {
+            continue;
+        };
+        let legacy = entry.strip_prefix("file/").unwrap_or(&entry).to_string();
+        known_entries.insert(entry, id.clone());
+        known_entries.insert(legacy, id.clone());
+    }
+    let mut seen = BTreeSet::new();
+    let selected = options
+        .entries
+        .iter()
+        .filter_map(|entry| known_entries.get(entry))
+        .filter(|id| seen.insert((*id).clone()))
+        .cloned()
+        .collect::<Vec<_>>();
+    let managed = selected.iter().cloned().collect();
+    library.resource_pack_order = merge_resource_pack_order(
+        &library.resource_pack_order,
+        &managed,
+        &selected,
+    );
+    library
+        .resource_pack_observations
+        .insert(metadata.instance.id.clone(), options.entries);
+    library
+        .resource_pack_incompatible_observations
+        .insert(metadata.instance.id.clone(), options.incompatible);
+    Ok(())
+}
+
+pub(super) async fn capture(
+    metadata: &InstanceMetadata,
+    library: &mut PackLibrary,
+    state: &State,
+) -> crate::Result<Option<bool>> {
+    let Some(placements) =
+        library.instances.get(&metadata.instance.id).cloned()
+    else {
+        return Ok(None);
+    };
+    let global = get_global_options().await?;
+    if !global.get(SyncedOption::ResourcePacks)
+        || !metadata.synced_options.resource_packs
+    {
+        return Ok(None);
+    }
+    let Some(options) = read_resource_pack_entries(metadata, state).await?
+    else {
+        return Ok(None);
+    };
+    let entries = options.entries;
+    let mut game_format = None;
+    let previous = library
+        .resource_pack_observations
+        .get(&metadata.instance.id)
+        .cloned();
+    let previous_incompatible = library
+        .resource_pack_incompatible_observations
+        .get(&metadata.instance.id)
+        .cloned()
+        .unwrap_or_default();
+    let mut shared_changed = false;
+    let mut initialized = false;
+    let mut known_entries = BTreeMap::new();
+    let mut deselected = BTreeSet::new();
+    for (id, placement) in placements {
+        let Some(pack) = library.packs.get(&id) else {
+            continue;
+        };
+        if !participating(metadata, pack, global)
+            || !can_capture(metadata, pack, &placement, state).await?
+        {
+            continue;
+        }
+        let Some(entry) = option_entry(&placement.path) else {
+            continue;
+        };
+        let selected = selected_entry(&entries, &entry);
+        let changed_in_instance = previous.as_ref().is_some_and(|previous| {
+            selected_entry(previous, &entry) != selected
+        });
+        let initialize = pack.selected.is_none();
+        let path_changed = placement
+            .resource_pack_selection_path
+            .as_ref()
+            .is_some_and(|path| option_entry(path) != Some(entry.clone()));
+        if path_changed
+            && !selected
+            && !changed_in_instance
+            && pack.selected.is_some()
+        {
+            continue;
+        }
+        if placement.resource_pack_selection_pending && !changed_in_instance {
+            continue;
+        }
+        if !selected && !changed_in_instance && !initialize {
+            continue;
+        }
+        let target_entry = target_entry(metadata, entry.clone());
+        if !selected
+            && !previous_incompatible.contains(&target_entry)
+            && !options.incompatible.contains(&target_entry)
+        {
+            let format = if let Some(format) = game_format {
+                format
+            } else {
+                let format =
+                    selection_compatibility::game_format(metadata, state)
+                        .await?;
+                game_format = Some(format);
+                format
+            };
+            if !selection_compatibility::compatible(
+                &instance_dir(metadata, state).join(&placement.path),
+                format,
+            )
+            .await
+            {
+                continue;
+            }
+        }
+        let legacy = entry.strip_prefix("file/").unwrap_or(&entry).to_string();
+        known_entries.insert(entry, id.clone());
+        known_entries.insert(legacy, id.clone());
+        initialized |= initialize;
+        if (changed_in_instance || initialize)
+            && pack.selected != Some(selected)
+        {
+            if let Some(pack) = library.packs.get_mut(&id) {
+                pack.selected = Some(selected);
+            }
+            shared_changed = true;
+        }
+        if (changed_in_instance || initialize) && !selected {
+            deselected.insert(id.clone());
+        }
+        if changed_in_instance
+            && let Some(placement) = library
+                .instances
+                .get_mut(&metadata.instance.id)
+                .and_then(|placements| placements.get_mut(&id))
+        {
+            placement.resource_pack_selection_pending = false;
+        }
+    }
+    let ordered_ids = |entries: &[String]| {
+        let mut seen = BTreeSet::new();
+        entries
+            .iter()
+            .filter_map(|entry| known_entries.get(entry))
+            .filter(|id| seen.insert((*id).clone()))
+            .cloned()
+            .collect::<Vec<_>>()
+    };
+    let current_order = ordered_ids(&entries);
+    let order_changed = previous
+        .as_ref()
+        .is_some_and(|previous| ordered_ids(previous) != current_order);
+    if initialized || previous.is_none() || order_changed {
+        let selected = current_order
+            .into_iter()
+            .filter(|id| {
+                library
+                    .packs
+                    .get(id)
+                    .is_some_and(|pack| pack.selected == Some(true))
+            })
+            .collect::<Vec<_>>();
+        let managed = selected.iter().cloned().chain(deselected).collect();
+        let order = merge_resource_pack_order(
+            &library.resource_pack_order,
+            &managed,
+            &selected,
+        );
+        if order != library.resource_pack_order {
+            library.resource_pack_order = order;
+            shared_changed = true;
+        }
+    }
+    let observation_changed = previous.as_ref() != Some(&entries)
+        || previous_incompatible != options.incompatible;
+    if observation_changed {
+        library
+            .resource_pack_observations
+            .insert(metadata.instance.id.clone(), entries);
+        library
+            .resource_pack_incompatible_observations
+            .insert(metadata.instance.id.clone(), options.incompatible);
+    }
+    Ok((shared_changed || observation_changed).then_some(shared_changed))
+}
+
+pub(super) async fn apply(
+    metadata: &InstanceMetadata,
+    library: &mut PackLibrary,
+    previous_placements: &BTreeMap<String, PackPlacement>,
+    state: &State,
+) -> crate::Result<()> {
+    let directory = instance_dir(metadata, state);
+    let global = get_global_options().await?;
+    if !global.get(SyncedOption::ResourcePacks)
+        || !metadata.synced_options.resource_packs
+    {
+        return Ok(());
+    }
+    let mut managed = BTreeSet::new();
+    for placement in previous_placements.values() {
+        if placement.excluded
+            || placement.suspended
+            || placement.error.is_some()
+        {
+            continue;
+        }
+        for path in std::iter::once(&placement.path)
+            .chain(placement.resource_pack_selection_path.iter())
+        {
+            if !path.is_empty()
+                && ProjectType::get_from_parent_folder(path)
+                    == Some(ProjectType::ResourcePack)
+                && !directory.join(path).exists()
+                && let Some(entry) = option_entry(path)
+            {
+                managed.insert(
+                    entry.strip_prefix("file/").unwrap_or(&entry).to_string(),
+                );
+                managed.insert(entry);
+            }
+        }
+    }
+
+    let placements = library
+        .instances
+        .get(&metadata.instance.id)
+        .cloned()
+        .unwrap_or_default();
+    let mut tracked = Vec::new();
+    let mut active_entries = BTreeMap::new();
+    let game_format =
+        selection_compatibility::game_format(metadata, state).await?;
+    let incompatible = read_resource_pack_entries(metadata, state)
+        .await?
+        .map(|options| options.incompatible)
+        .unwrap_or_default();
+    for (id, placement) in &placements {
+        let Some(pack) = library.packs.get(id) else {
+            continue;
+        };
+        if pack.item.project_type != ProjectType::ResourcePack
+            || !participating(metadata, pack, global)
+            || placement.excluded
+            || placement.suspended
+            || placement.pending
+            || placement.error.is_some()
+            || placement.content_set_id != metadata.applied_content_set.id
+            || !local_file(metadata, &placement.path, state).await?
+        {
+            continue;
+        }
+        let Some(selected) = pack.selected else {
+            continue;
+        };
+        let Some(entry) = option_entry(&placement.path) else {
+            continue;
+        };
+        let target_entry = target_entry(metadata, entry.clone());
+        if selected
+            && pack.item.enabled
+            && placement.enabled
+            && !incompatible.contains(&target_entry)
+            && !selection_compatibility::compatible(
+                &directory.join(&placement.path),
+                game_format,
+            )
+            .await
+        {
+            if let Some(placement) = library
+                .instances
+                .get_mut(&metadata.instance.id)
+                .and_then(|placements| placements.get_mut(id))
+            {
+                placement.resource_pack_selection_pending = true;
+            }
+            continue;
+        }
+        managed
+            .insert(entry.strip_prefix("file/").unwrap_or(&entry).to_string());
+        managed.insert(entry.clone());
+        if selected && pack.item.enabled && placement.enabled {
+            active_entries.insert(id.clone(), target_entry);
+        }
+        tracked.push(id.clone());
+    }
+    if managed.is_empty() {
+        return Ok(());
+    }
+    let mut selected = Vec::new();
+    for id in &library.resource_pack_order {
+        if let Some(entry) = active_entries.remove(id) {
+            selected.push(entry);
+        }
+    }
+    selected.extend(active_entries.into_values());
+    library
+        .resource_pack_observations
+        .remove(&metadata.instance.id);
+    library
+        .resource_pack_incompatible_observations
+        .remove(&metadata.instance.id);
+    if let Some(placements) = library.instances.get_mut(&metadata.instance.id) {
+        for id in &tracked {
+            if let Some(placement) = placements.get_mut(id) {
+                placement.resource_pack_selection_pending = true;
+            }
+        }
+    }
+    let update =
+        merge_resource_pack_entries(metadata, &managed, &selected, state)
+            .await?;
+    let pending = match update {
+        ResourcePackOptionsUpdate::Deferred => true,
+        ResourcePackOptionsUpdate::Applied(options) => {
+            library
+                .resource_pack_observations
+                .insert(metadata.instance.id.clone(), options.entries);
+            library
+                .resource_pack_incompatible_observations
+                .insert(metadata.instance.id.clone(), options.incompatible);
+            false
+        }
+    };
+    if let Some(placements) = library.instances.get_mut(&metadata.instance.id) {
+        for id in tracked {
+            if let Some(placement) = placements.get_mut(&id) {
+                placement.resource_pack_selection_pending = pending;
+                if !pending {
+                    placement.resource_pack_selection_path =
+                        Some(placement.path.clone());
+                }
+            }
+        }
+    }
+    Ok(())
+}
diff --git a/packages/app-lib/src/api/instance/synced_packs/selection_compatibility.rs b/packages/app-lib/src/api/instance/synced_packs/selection_compatibility.rs
new file mode 100644
index 0000000000..31b678b692
--- /dev/null
+++ b/packages/app-lib/src/api/instance/synced_packs/selection_compatibility.rs
@@ -0,0 +1,167 @@
+use crate::state::{InstanceMetadata, State};
+use serde_json::Value;
+use std::path::Path;
+
+#[derive(Clone, Copy, Eq, Ord, PartialEq, PartialOrd)]
+pub(super) struct PackFormat {
+    major: u64,
+    minor: u64,
+}
+
+async fn read_zip_json(
+    path: &Path,
+    name: &str,
+) -> crate::Result<Option<Value>> {
+    let zip = async_zip::tokio::read::fs::ZipFileReader::new(path).await?;
+    let Some(index) = zip.file().entries().iter().position(|entry| {
+        entry.filename().as_str().is_ok_and(|value| value == name)
+    }) else {
+        return Ok(None);
+    };
+    if zip.file().entries()[index].uncompressed_size() > 1024 * 1024 {
+        return Ok(None);
+    }
+    let mut bytes = Vec::new();
+    zip.reader_with_entry(index)
+        .await?
+        .read_to_end_checked(&mut bytes)
+        .await?;
+    Ok(Some(serde_json::from_slice(&bytes)?))
+}
+
+pub(super) async fn game_format(
+    metadata: &InstanceMetadata,
+    state: &State,
+) -> crate::Result<Option<PackFormat>> {
+    let content_set = &metadata.applied_content_set;
+    let version = &content_set.game_version;
+    if let Some(minor) = version
+        .strip_prefix("1.")
+        .and_then(|version| version.split('.').next()?.parse::<u32>().ok())
+    {
+        let major = match minor {
+            6..=8 => Some(1),
+            9..=10 => Some(2),
+            11..=12 => Some(3),
+            13 => Some(4),
+            _ => None,
+        };
+        if let Some(major) = major {
+            return Ok(Some(PackFormat { major, minor: 0 }));
+        }
+    }
+    let version_jar = content_set.loader_version.as_ref().map_or_else(
+        || version.clone(),
+        |loader| format!("{version}-{loader}"),
+    );
+    let path = state
+        .directories
+        .version_dir(&version_jar)
+        .join(format!("{version_jar}.jar"));
+    if !path.exists() {
+        return Ok(None);
+    }
+    let Some(data) = read_zip_json(&path, "version.json").await? else {
+        return Ok(None);
+    };
+    let Some(pack) = data.get("pack_version") else {
+        return Ok(None);
+    };
+    let major = pack.as_u64().or_else(|| {
+        pack.get("resource")
+            .or_else(|| pack.get("resource_major"))?
+            .as_u64()
+    });
+    Ok(major.map(|major| PackFormat {
+        major,
+        minor: pack
+            .get("resource_minor")
+            .and_then(Value::as_u64)
+            .unwrap_or(0),
+    }))
+}
+
+fn format_bound(value: &Value, default_minor: u64) -> Option<PackFormat> {
+    if let Some(major) = value.as_u64() {
+        return Some(PackFormat {
+            major,
+            minor: default_minor,
+        });
+    }
+    let values = value.as_array()?;
+    if !(1..=2).contains(&values.len()) {
+        return None;
+    }
+    Some(PackFormat {
+        major: values[0].as_u64()?,
+        minor: match values.get(1) {
+            Some(minor) => minor.as_u64()?,
+            None => default_minor,
+        },
+    })
+}
+
+fn legacy_range(value: &Value) -> Option<(u64, u64)> {
+    if let Some(format) = value.as_u64() {
+        return Some((format, format));
+    }
+    if let Some(values) = value.as_array() {
+        return (values.len() == 2)
+            .then(|| Some((values[0].as_u64()?, values[1].as_u64()?)))?;
+    }
+    Some((
+        value.get("min_inclusive")?.as_u64()?,
+        value.get("max_inclusive")?.as_u64()?,
+    ))
+}
+
+fn supports_format(pack: &Value, game: PackFormat) -> Option<bool> {
+    if game.major >= 65 {
+        let min = format_bound(pack.get("min_format")?, 0)?;
+        let max = format_bound(pack.get("max_format")?, i32::MAX as u64)?;
+        if min.major < 65 {
+            let format = pack.get("pack_format")?.as_u64()?;
+            let (legacy_min, legacy_max) =
+                legacy_range(pack.get("supported_formats")?)?;
+            if format < legacy_min || format > legacy_max {
+                return Some(false);
+            }
+        } else if pack.get("supported_formats").is_some() {
+            return Some(false);
+        }
+        return Some(min <= game && game <= max);
+    }
+    let format = pack.get("pack_format")?.as_u64()?;
+    if game.major >= 16
+        && let Some(range) = pack.get("supported_formats")
+    {
+        let (min, max) = legacy_range(range)?;
+        return Some(
+            min <= format
+                && format <= max
+                && min <= game.major
+                && game.major <= max,
+        );
+    }
+    Some(format == game.major)
+}
+
+pub(super) async fn compatible(path: &Path, game: Option<PackFormat>) -> bool {
+    let Some(game) = game else {
+        return false;
+    };
+    match read_zip_json(path, "pack.mcmeta").await {
+        Ok(Some(data)) => data
+            .get("pack")
+            .and_then(|pack| supports_format(pack, game))
+            .unwrap_or(false),
+        Ok(None) => false,
+        Err(error) => {
+            tracing::warn!(
+                "Could not check resource-pack compatibility for {}: {error}",
+                path.display()
+            );
+            false
+        }
+    }
+}
diff --git a/packages/app-lib/src/state/instances/model/instance.rs b/packages/app-lib/src/state/instances/model/instance.rs
index e5e6777734..f76f3a5afb 100644
--- a/packages/app-lib/src/state/instances/model/instance.rs
+++ b/packages/app-lib/src/state/instances/model/instance.rs
@@ -52,9 +52,9 @@ pub enum SyncedOption {
 }
 
 impl SyncedOption {
-	pub const fn is_available(self) -> bool {
-		!matches!(self, Self::DataPacks)
-	}
+    pub const fn is_available(self) -> bool {
+        !matches!(self, Self::DataPacks)
+    }
 
     pub fn as_str(self) -> &'static str {
         match self {

From f8b89ed6fe3ed3dfc771260fc2821e0ff7870ef6 Mon Sep 17 00:00:00 2001
From: "Calum H. (IMB11)" <contact@cal.engineer>
Date: Fri, 4 Sep 2026 12:46:03 +0100
Subject: [PATCH 21/33] fix: try fix freeze issue

---
 .../instances-synced-settings/index.vue       | 19 +++++++++++++------
 .../instance/synced_options/orchestration.rs  |  6 ------
 packages/app-lib/src/launcher/mod.rs          | 14 ++++++++++----
 3 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/apps/app-frontend/src/components/ui/settings/instances/instances-synced-settings/index.vue b/apps/app-frontend/src/components/ui/settings/instances/instances-synced-settings/index.vue
index 413b6cf6f4..afb0c2236d 100644
--- a/apps/app-frontend/src/components/ui/settings/instances/instances-synced-settings/index.vue
+++ b/apps/app-frontend/src/components/ui/settings/instances/instances-synced-settings/index.vue
@@ -120,6 +120,14 @@ const messages = defineMessages({
 		id: 'app.settings.synced-options.choose-sync-source.game-settings-description',
 		defaultMessage: 'Choose which instance to copy game settings from.',
 	},
+	resourcePacksSyncSourceDescription: {
+		id: 'app.sync-instances-update.choose-source.resource-packs',
+		defaultMessage: 'Choose which instance to copy resource packs from.',
+	},
+	dataPacksSyncSourceDescription: {
+		id: 'app.sync-instances-update.choose-source.data-packs',
+		defaultMessage: 'Choose which instance to copy data packs from.',
+	},
 	noServersSyncedYet: {
 		id: 'app.settings.synced-options.multiplayer-servers.none-synced-yet',
 		defaultMessage: "You haven't synced any servers yet",
@@ -253,6 +261,10 @@ const baseInstanceDescription = computed(() => {
 			return formatMessage(messages.commandHistorySyncSourceDescription)
 		case 'creative_hotbars':
 			return formatMessage(messages.creativeHotbarsSyncSourceDescription)
+		case 'resource_packs':
+			return formatMessage(messages.resourcePacksSyncSourceDescription)
+		case 'data_packs':
+			return formatMessage(messages.dataPacksSyncSourceDescription)
 		default:
 			return ''
 	}
@@ -427,12 +439,7 @@ async function chooseBaseInstance(option: SyncedOption) {
 
 function toggleGlobalOption(option: SyncedOption, enabled: boolean) {
 	if (!isSyncedOptionAvailable(option) || !canToggleGlobalOptions.value) return
-	if (
-		enabled &&
-		option !== 'screenshots' &&
-		option !== 'resource_packs' &&
-		option !== 'data_packs'
-	) {
+	if (enabled && option !== 'screenshots') {
 		void chooseBaseInstance(option)
 		return
 	}
diff --git a/packages/app-lib/src/api/instance/synced_options/orchestration.rs b/packages/app-lib/src/api/instance/synced_options/orchestration.rs
index 49e1dd0c5e..e74d3b46e2 100644
--- a/packages/app-lib/src/api/instance/synced_options/orchestration.rs
+++ b/packages/app-lib/src/api/instance/synced_options/orchestration.rs
@@ -340,18 +340,12 @@ pub async fn set_global_option(
     }
     let state = State::get().await?;
     let _guard = state.lock_synced_options().await;
-    let was_enabled = get_global_options_with_state(&state).await?.get(option);
 
     let initializing_game_options_from_base = enabled
         && option == SyncedOption::GameOptions
         && base_instance_id.is_some();
     if enabled
         && option != SyncedOption::Screenshots
-        && (!was_enabled
-            || !matches!(
-                option,
-                SyncedOption::ResourcePacks | SyncedOption::DataPacks
-            ))
         && let Some(base_instance_id) = base_instance_id
     {
         if option == SyncedOption::GameOptions {
diff --git a/packages/app-lib/src/launcher/mod.rs b/packages/app-lib/src/launcher/mod.rs
index 34d4b504cf..43717b1dec 100644
--- a/packages/app-lib/src/launcher/mod.rs
+++ b/packages/app-lib/src/launcher/mod.rs
@@ -933,11 +933,7 @@ pub async fn launch_minecraft(
 
     let env_args = Vec::from(env_args);
 
-    let _instance_content_lock =
-        state.lock_instance_content(&instance.id).await;
-
     // Check if instance has a running process, and reject running the command if it does
-    // Done late so a quick double call doesn't launch two instances
     let existing_processes = process::get_by_instance_id(&instance.id).await?;
     if let Some(process) = existing_processes.first() {
         return Err(crate::ErrorKind::LauncherError(format!(
@@ -1101,6 +1097,16 @@ pub async fn launch_minecraft(
     )
     .await?;
 
+	let _instance_content_lock =
+		state.lock_instance_content(&instance.id).await;
+	if crate::state::instance_has_running_process(&instance.id, &state).await? {
+		return Err(crate::ErrorKind::LauncherError(format!(
+			"Instance {} is already running",
+			instance.id
+		))
+		.as_error());
+	}
+
     crate::state::instances::commands::set_instance_last_played(
         &instance.id,
         Utc::now(),

From bae9033700437e1c49294617e55a2d1812e5a095 Mon Sep 17 00:00:00 2001
From: "Calum H. (IMB11)" <contact@cal.engineer>
Date: Fri, 4 Sep 2026 12:51:46 +0100
Subject: [PATCH 22/33] qa: pass

---
 apps/app-frontend/src/App.vue                            | 9 ++++++---
 .../components/ui/sync-instances-update-modal/index.vue  | 8 ++++++--
 apps/app-frontend/src/pages/instance/layout.vue          | 4 ++--
 .../app-lib/migrations/20260903120000_synced-packs.sql   | 5 -----
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue
index dc3c832025..8e97cb374c 100644
--- a/apps/app-frontend/src/App.vue
+++ b/apps/app-frontend/src/App.vue
@@ -14,7 +14,7 @@ import {
 	ChevronLeftIcon,
 	ChevronRightIcon,
 	CompassIcon,
-	ImagesIcon,
+	ImageIcon,
 	LogInIcon,
 	LogOutIcon,
 	NewspaperIcon,
@@ -706,6 +706,7 @@ function handleAdsConsentRequired(required) {
 
 async function setupApp() {
 	await onboardingChecklist.initialize()
+	const skipSyncUpdate = showChecklist.value
 
 	const {
 		native_decorations,
@@ -756,7 +757,9 @@ async function setupApp() {
 	appSettings.devMode = developer_mode
 	stateInitialized.value = true
 	await nextTick()
-	if (!showChecklist.value) {
+	if (skipSyncUpdate) {
+		syncInstancesUpdateModal.value?.skip()
+	} else {
 		syncInstancesUpdateModal.value?.showOnce()
 	}
 
@@ -2130,7 +2133,7 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
 				v-tooltip.right="formatMessage(messages.screenshots)"
 				to="/screenshots"
 			>
-				<ImagesIcon />
+				<ImageIcon />
 			</NavButton>
 			<NavButton
 				v-tooltip.right="formatMessage(messages.modrinthHosting)"
diff --git a/apps/app-frontend/src/components/ui/sync-instances-update-modal/index.vue b/apps/app-frontend/src/components/ui/sync-instances-update-modal/index.vue
index aee167ec25..e10f045368 100644
--- a/apps/app-frontend/src/components/ui/sync-instances-update-modal/index.vue
+++ b/apps/app-frontend/src/components/ui/sync-instances-update-modal/index.vue
@@ -148,9 +148,13 @@ function hide() {
 	modal.value?.hide()
 }
 
+function skip() {
+	hasSeenUpdate.value = true
+}
+
 function handleHide() {
 	isOpen.value = false
-	hasSeenUpdate.value = true
+	skip()
 }
 
 async function openSourcePicker(options: readonly SyncUpdateOption[], retry = false) {
@@ -208,7 +212,7 @@ async function confirmSource() {
 	}
 }
 
-defineExpose({ show, showOnce, hide })
+defineExpose({ show, showOnce, hide, skip })
 </script>
 
 <template>
diff --git a/apps/app-frontend/src/pages/instance/layout.vue b/apps/app-frontend/src/pages/instance/layout.vue
index 78f49f250b..7ec73ca240 100644
--- a/apps/app-frontend/src/pages/instance/layout.vue
+++ b/apps/app-frontend/src/pages/instance/layout.vue
@@ -92,7 +92,7 @@ import {
 	EditIcon,
 	FolderOpenIcon,
 	GlobeIcon,
-	ImagesIcon,
+	ImageIcon,
 	PlayIcon,
 	PlusIcon,
 	StopCircleIcon,
@@ -494,7 +494,7 @@ const tabs = computed(() => {
 		instanceTabs.push({
 			label: formatMessage(messages.screenshotsTab),
 			href: `${basePath.value}/screenshots`,
-			icon: ImagesIcon,
+			icon: ImageIcon,
 		})
 	}
 
diff --git a/packages/app-lib/migrations/20260903120000_synced-packs.sql b/packages/app-lib/migrations/20260903120000_synced-packs.sql
index 8d7c2354a7..a84483e27f 100644
--- a/packages/app-lib/migrations/20260903120000_synced-packs.sql
+++ b/packages/app-lib/migrations/20260903120000_synced-packs.sql
@@ -4,11 +4,6 @@ VALUES
 	('resource_packs', 0, 1),
 	('data_packs', 0, 1);
 
-UPDATE sync_feature_settings
-SET globally_enabled = 1
-WHERE feature IN ('resource_packs', 'data_packs')
-	AND NOT EXISTS (SELECT 1 FROM instances);
-
 INSERT INTO instance_sync_preferences (instance_id, feature, enabled)
 SELECT instances.id, features.feature, 1
 FROM instances

From 9871f88731cd00cbaed4d3c7285cacb42c0016a1 Mon Sep 17 00:00:00 2001
From: "Calum H. (IMB11)" <contact@cal.engineer>
Date: Fri, 4 Sep 2026 13:37:50 +0100
Subject: [PATCH 23/33] fix: qa

---
 .../instances-synced-settings/index.vue       |   2 +-
 .../sync-instances-update-modal/use-sync.ts   |  18 +-
 .../app-frontend/src/locales/en-US/index.json |   2 +-
 .../src/api/instance/synced_options/files.rs  |  11 +
 .../game_options/instance_support.rs          |   8 +-
 .../game_options/resource_pack_options.rs     |   7 +
 .../game_options/source_selection.rs          |   9 +-
 .../game_options/write_shared_settings.rs     |   6 +
 .../src/api/instance/synced_options/mod.rs    |   5 +-
 .../instance/synced_options/orchestration.rs  | 374 +++++++++++++-----
 .../api/instance/synced_options/pending.rs    |  97 +++++
 .../api/instance/synced_packs/operations.rs   |   8 +-
 .../instance/synced_packs/reconciliation.rs   |  58 ++-
 .../api/instance/synced_packs/selection.rs    |   9 +
 packages/app-lib/src/launcher/mod.rs          |  18 +-
 packages/app-lib/src/state/process.rs         |  13 +-
 16 files changed, 501 insertions(+), 144 deletions(-)
 create mode 100644 packages/app-lib/src/api/instance/synced_options/pending.rs

diff --git a/apps/app-frontend/src/components/ui/settings/instances/instances-synced-settings/index.vue b/apps/app-frontend/src/components/ui/settings/instances/instances-synced-settings/index.vue
index afb0c2236d..37c5f1c96e 100644
--- a/apps/app-frontend/src/components/ui/settings/instances/instances-synced-settings/index.vue
+++ b/apps/app-frontend/src/components/ui/settings/instances/instances-synced-settings/index.vue
@@ -282,7 +282,7 @@ const baseInstances = computed(() =>
 				id: instance.id,
 				name: instance.name,
 				icon_path: instance.icon_path,
-				eligible: instance.install_stage === 'installed' && !instance.quarantined,
+				eligible: !instance.quarantined,
 			})),
 )
 
diff --git a/apps/app-frontend/src/components/ui/sync-instances-update-modal/use-sync.ts b/apps/app-frontend/src/components/ui/sync-instances-update-modal/use-sync.ts
index 21893622c2..c17f1f9213 100644
--- a/apps/app-frontend/src/components/ui/sync-instances-update-modal/use-sync.ts
+++ b/apps/app-frontend/src/components/ui/sync-instances-update-modal/use-sync.ts
@@ -11,14 +11,16 @@ import {
 import { syncedPackKeys } from '@/helpers/synced-packs'
 import { instanceKeys, instanceListQueryOptions } from '@/pages/instance/query-options'
 
-export const syncUpdateOptions = ([
-	'game_options',
-	'multiplayer_servers',
-	'command_history',
-	'creative_hotbars',
-	'resource_packs',
-	'data_packs',
-] as const).filter(isSyncedOptionAvailable)
+export const syncUpdateOptions = (
+	[
+		'game_options',
+		'multiplayer_servers',
+		'command_history',
+		'creative_hotbars',
+		'resource_packs',
+		'data_packs',
+	] as const
+).filter(isSyncedOptionAvailable)
 
 export type SyncUpdateOption = (typeof syncUpdateOptions)[number]
 
diff --git a/apps/app-frontend/src/locales/en-US/index.json b/apps/app-frontend/src/locales/en-US/index.json
index 15822d65d4..c3767a762b 100644
--- a/apps/app-frontend/src/locales/en-US/index.json
+++ b/apps/app-frontend/src/locales/en-US/index.json
@@ -3132,7 +3132,7 @@
     "message": "New this update"
   },
   "app.sync-instances-update.choose-source.all": {
-    "message": "Choose the instance to use as the sync source for all six settings."
+    "message": "Choose the instance to use as the sync source for all selected settings."
   },
   "app.sync-instances-update.choose-source.data-packs": {
     "message": "Choose which instance to copy data packs from."
diff --git a/packages/app-lib/src/api/instance/synced_options/files.rs b/packages/app-lib/src/api/instance/synced_options/files.rs
index 800c087edd..7def40fd64 100644
--- a/packages/app-lib/src/api/instance/synced_options/files.rs
+++ b/packages/app-lib/src/api/instance/synced_options/files.rs
@@ -82,6 +82,17 @@ pub(in crate::api::instance) async fn instance_is_running(
         .await
 }
 
+pub(in crate::api::instance) fn option_can_apply_while_running(
+    option: SyncedOption,
+) -> bool {
+    matches!(
+        option,
+        SyncedOption::GameOptions
+            | SyncedOption::Screenshots
+            | SyncedOption::ResourcePacks
+    )
+}
+
 pub(in crate::api::instance) fn instance_option_enabled(
     metadata: &InstanceMetadata,
     option: SyncedOption,
diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/instance_support.rs b/packages/app-lib/src/api/instance/synced_options/game_options/instance_support.rs
index 763e3d80d5..780f3e71f3 100644
--- a/packages/app-lib/src/api/instance/synced_options/game_options/instance_support.rs
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/instance_support.rs
@@ -39,7 +39,13 @@ pub(super) async fn load_participating_instances(
         if !metadata.synced_options.game_options {
             continue;
         }
-        let deferred = synced_options::sync_files_are_protected(&metadata);
+        let deferred = synced_options::sync_files_are_protected(&metadata)
+            || synced_options::pending::contains(
+                &metadata.instance.id,
+                crate::state::SyncedOption::GameOptions,
+                state,
+            )
+            .await?;
         let path = options_path(&metadata, state);
         let (document, inspection_error) = if path.exists() {
             match read_document(&path).await {
diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/resource_pack_options.rs b/packages/app-lib/src/api/instance/synced_options/game_options/resource_pack_options.rs
index e8277349e7..ce343a7a78 100644
--- a/packages/app-lib/src/api/instance/synced_options/game_options/resource_pack_options.rs
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/resource_pack_options.rs
@@ -1,5 +1,6 @@
 //! Reads and merges Minecraft's active resource-pack list.
 
+use super::super::{instance_is_running, sync_files_are_protected};
 use super::options_file::{input_error, options_path, read_document};
 use crate::state::{InstanceMetadata, State};
 use crate::util::io;
@@ -73,6 +74,9 @@ pub(in crate::api::instance) async fn merge_resource_pack_entries(
     selected: &[String],
     state: &State,
 ) -> crate::Result<ResourcePackOptionsUpdate> {
+    if sync_files_are_protected(metadata) {
+        return Ok(ResourcePackOptionsUpdate::Deferred);
+    }
     let path = options_path(metadata, state);
     if !path.exists() {
         return Ok(ResourcePackOptionsUpdate::Deferred);
@@ -94,6 +98,9 @@ pub(in crate::api::instance) async fn merge_resource_pack_entries(
     if options.entries == original {
         return Ok(ResourcePackOptionsUpdate::Applied(options));
     }
+    if instance_is_running(metadata, state).await? {
+        return Ok(ResourcePackOptionsUpdate::Deferred);
+    }
     let raw = serde_json::to_string(&options.entries)?;
     document.set("resourcePacks", &raw, false)?;
     let output_bytes = document.serialize()?;
diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/source_selection.rs b/packages/app-lib/src/api/instance/synced_options/game_options/source_selection.rs
index f3272ba33b..05a7e53f63 100644
--- a/packages/app-lib/src/api/instance/synced_options/game_options/source_selection.rs
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/source_selection.rs
@@ -317,14 +317,11 @@ pub async fn list_sync_sources()
         let mut disabled_reason = None;
         let mut recognized_setting_count = 0;
         let mut custom_setting_count = 0;
-        if synced_options::sync_files_are_protected(&metadata) {
-            eligible = false;
-            disabled_reason =
-                Some(GameOptionsSourceIssue::InstallingOrUpdating);
-        } else if !path.exists() {
+        let installing = synced_options::sync_files_are_protected(&metadata);
+        if !installing && !path.exists() {
             eligible = false;
             disabled_reason = Some(GameOptionsSourceIssue::MissingOptionsFile);
-        } else {
+        } else if !installing {
             match read_document(&path).await {
                 Ok((document, _)) => {
                     let launcher_keys =
diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/write_shared_settings.rs b/packages/app-lib/src/api/instance/synced_options/game_options/write_shared_settings.rs
index c9392da75f..1c8aecc6f9 100644
--- a/packages/app-lib/src/api/instance/synced_options/game_options/write_shared_settings.rs
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/write_shared_settings.rs
@@ -29,6 +29,12 @@ pub(super) async fn sync_is_active_for_instance(
     state: &State,
 ) -> crate::Result<bool> {
     Ok(metadata.synced_options.game_options
+        && !synced_options::pending::contains(
+            &metadata.instance.id,
+            SyncedOption::GameOptions,
+            state,
+        )
+        .await?
         && game_options_sync_is_enabled(&state.pool).await?)
 }
 
diff --git a/packages/app-lib/src/api/instance/synced_options/mod.rs b/packages/app-lib/src/api/instance/synced_options/mod.rs
index 6fe52de2cf..22fc523039 100644
--- a/packages/app-lib/src/api/instance/synced_options/mod.rs
+++ b/packages/app-lib/src/api/instance/synced_options/mod.rs
@@ -3,6 +3,7 @@ mod files;
 pub(super) mod game_options;
 mod hotbars;
 mod orchestration;
+pub(in crate::api::instance) mod pending;
 
 const COMMAND_HISTORY_FILE: &str = "command_history.txt";
 const HOTBAR_FILE: &str = "hotbar.nbt";
@@ -12,8 +13,8 @@ pub(super) use self::files::{
     CheckpointStatus, begin_checkpoint, checkpoint, detach_link, ensure_link,
     finish_checkpoint, finish_plain_checkpoint, instance_dir,
     instance_is_running, instance_option_enabled, nbt_from_bytes, nbt_to_bytes,
-    read_nbt_file, safe_instance_id, sha1_bytes, sha1_file,
-    sync_files_are_protected,
+    option_can_apply_while_running, read_nbt_file, safe_instance_id,
+    sha1_bytes, sha1_file, sync_files_are_protected,
 };
 pub(super) use self::orchestration::instance_option_supported;
 pub use self::orchestration::{
diff --git a/packages/app-lib/src/api/instance/synced_options/orchestration.rs b/packages/app-lib/src/api/instance/synced_options/orchestration.rs
index e74d3b46e2..f75c1e2b1a 100644
--- a/packages/app-lib/src/api/instance/synced_options/orchestration.rs
+++ b/packages/app-lib/src/api/instance/synced_options/orchestration.rs
@@ -14,8 +14,9 @@ use super::command_history::{
     reconcile_command_history,
 };
 use super::files::{
-    detach_link, instance_dir, instance_is_running, instance_option_enabled,
-    read_nbt_file, safe_instance_id, sync_files_are_protected,
+    begin_checkpoint, detach_link, instance_dir, instance_is_running,
+    instance_option_enabled, option_can_apply_while_running, read_nbt_file,
+    safe_instance_id, sync_files_are_protected,
 };
 use super::hotbars::{
     HOTBAR_SCHEMA_VERSION, HotbarState, backup_shared_hotbars,
@@ -25,6 +26,7 @@ use super::hotbars::{
     read_hotbar_state, reconcile_hotbar, regenerate_hotbars,
     write_hotbar_state,
 };
+use super::pending::{self, PendingAction, PendingChange};
 use super::{COMMAND_HISTORY_FILE, HOTBAR_FILE};
 
 #[derive(Clone, Copy, Debug, Eq, PartialEq, Serialize)]
@@ -244,6 +246,12 @@ pub(in crate::api::instance) async fn instance_option_supported(
     global_enabled: bool,
     state: &State,
 ) -> bool {
+    if pending::contains(&metadata.instance.id, option, state)
+        .await
+        .unwrap_or(true)
+    {
+        return false;
+    }
     matches!(
         capability_status(metadata, option, global_enabled, state).await,
         CapabilityStatus::Supported
@@ -340,7 +348,17 @@ pub async fn set_global_option(
     }
     let state = State::get().await?;
     let _guard = state.lock_synced_options().await;
+    pending::cancel(option, None, &state).await?;
+    set_global_option_with_state(option, enabled, base_instance_id, &state)
+        .await
+}
 
+async fn set_global_option_with_state(
+    option: SyncedOption,
+    enabled: bool,
+    base_instance_id: Option<&str>,
+    state: &State,
+) -> crate::Result<GlobalSyncedOptions> {
     let initializing_game_options_from_base = enabled
         && option == SyncedOption::GameOptions
         && base_instance_id.is_some();
@@ -357,13 +375,6 @@ pub async fn set_global_option(
                             "Unknown sync source instance.".to_string(),
                         )
                     })?;
-            if sync_files_are_protected(&source) {
-                return Err(ErrorKind::InputError(
-                    "Wait for the source instance to finish installing or updating."
-                        .to_string(),
-                )
-                .into());
-            }
             match capability_status(&source, option, true, &state).await {
                 CapabilityStatus::Supported => {}
                 CapabilityStatus::Unsupported(reason)
@@ -371,7 +382,11 @@ pub async fn set_global_option(
                     return Err(ErrorKind::InputError(reason).into());
                 }
             }
+            if sync_files_are_protected(&source) {
+                return queue_source(&source, option, state).await;
+            }
             seed_from_instance(&source, option, &state).await?;
+            complete_pending_source(base_instance_id, option, state).await?;
         } else {
             return enable_global_option_from_base(
                 option,
@@ -397,6 +412,9 @@ pub async fn set_global_option(
         Err(error) => return Err(error),
     };
     for metadata in instances {
+        if pending::contains(&metadata.instance.id, option, state).await? {
+            continue;
+        }
         if !enabled
             && matches!(
                 option,
@@ -406,7 +424,7 @@ pub async fn set_global_option(
             detach_option(&metadata, option, &state).await?;
             continue;
         }
-        let running = option != SyncedOption::GameOptions
+        let running = !option_can_apply_while_running(option)
             && instance_is_running(&metadata, &state).await?;
         if sync_files_are_protected(&metadata) || running {
             continue;
@@ -471,15 +489,6 @@ async fn enable_global_option_from_base(
         .ok_or_else(|| {
             ErrorKind::InputError("Unknown sync source instance.".to_string())
         })?;
-    if sync_files_are_protected(&source)
-        || instance_is_running(&source, state).await?
-    {
-        return Err(ErrorKind::InputError(
-            "Close the source instance before using it for syncing."
-                .to_string(),
-        )
-        .into());
-    }
     match capability_status(&source, option, true, state).await {
         CapabilityStatus::Supported => {}
         CapabilityStatus::Unsupported(reason)
@@ -487,31 +496,42 @@ async fn enable_global_option_from_base(
             return Err(ErrorKind::InputError(reason).into());
         }
     }
+    if sync_files_are_protected(&source)
+        || (!option_can_apply_while_running(option)
+            && instance_is_running(&source, state).await?)
+    {
+        return queue_source(&source, option, state).await;
+    }
 
     let instances = crate::state::list_instances(&state.pool).await?;
     for metadata in &instances {
-        if instance_option_enabled(metadata, option)
-            && (sync_files_are_protected(metadata)
-                || instance_is_running(metadata, state).await?)
+        if metadata.instance.id != base_instance_id
+            && pending::contains(&metadata.instance.id, option, state).await?
         {
-            return Err(ErrorKind::InputError(
-                "Close all instances using this synced setting before choosing a new sync source."
-                    .to_string(),
-            )
-            .into());
+            continue;
         }
-    }
-
-    for metadata in &instances {
-        if instance_option_enabled(metadata, option) {
-            detach_option(metadata, option, state).await?;
+        if !instance_option_enabled(metadata, option) {
+            continue;
+        }
+        let installing = sync_files_are_protected(metadata);
+        if installing
+            || (!option_can_apply_while_running(option)
+                && instance_is_running(metadata, state).await?)
+        {
+            defer_option(metadata, option, state).await?;
+            if option == SyncedOption::CommandHistory && !installing {
+                detach_option(metadata, option, state).await?;
+            }
+            continue;
         }
+        detach_option(metadata, option, state).await?;
     }
     if !instance_option_enabled(&source, option) {
         detach_option(&source, option, state).await?;
     }
 
     seed_from_instance(&source, option, state).await?;
+    complete_pending_source(base_instance_id, option, state).await?;
     instance_rows::set_instance_sync_preference(
         base_instance_id,
         option,
@@ -522,8 +542,12 @@ async fn enable_global_option_from_base(
     set_global_option_enabled(option, true, state).await?;
 
     for metadata in crate::state::list_instances(&state.pool).await? {
+        if pending::contains(&metadata.instance.id, option, state).await? {
+            continue;
+        }
         if sync_files_are_protected(&metadata)
-            || instance_is_running(&metadata, state).await?
+            || (!option_can_apply_while_running(option)
+                && instance_is_running(&metadata, state).await?)
         {
             continue;
         }
@@ -545,6 +569,78 @@ async fn enable_global_option_from_base(
     get_global_options_with_state(state).await
 }
 
+async fn complete_pending_source(
+    instance_id: &str,
+    option: SyncedOption,
+    state: &State,
+) -> crate::Result<()> {
+    pending::remove(
+        &PendingChange {
+            instance_id: instance_id.to_string(),
+            option,
+            action: PendingAction::SelectSource,
+        },
+        state,
+    )
+    .await
+}
+
+async fn queue_source(
+    metadata: &InstanceMetadata,
+    option: SyncedOption,
+    state: &State,
+) -> crate::Result<GlobalSyncedOptions> {
+    pending::save(
+        PendingChange {
+            instance_id: metadata.instance.id.clone(),
+            option,
+            action: PendingAction::SelectSource,
+        },
+        state,
+    )
+    .await?;
+    instance_rows::set_instance_sync_preference(
+        &metadata.instance.id,
+        option,
+        true,
+        &state.pool,
+    )
+    .await?;
+    set_global_option_enabled(option, true, state).await?;
+    get_global_options_with_state(state).await
+}
+
+/// Pending checkpoints apply shared data without capturing the old local file.
+async fn defer_option(
+    metadata: &InstanceMetadata,
+    option: SyncedOption,
+    state: &State,
+) -> crate::Result<()> {
+    let variants: &[&str] = match option {
+        SyncedOption::CommandHistory | SyncedOption::MultiplayerServers => {
+            &["default"]
+        }
+        SyncedOption::CreativeHotbars => &["legacy", "components"],
+        SyncedOption::ResourcePacks | SyncedOption::DataPacks => {
+            return synced_packs::detach(metadata, option, state).await;
+        }
+        SyncedOption::GameOptions | SyncedOption::Screenshots => return Ok(()),
+    };
+    for variant in variants {
+        begin_checkpoint(
+            &metadata.instance.id,
+            option,
+            variant,
+            "",
+            None,
+            0,
+            state,
+        )
+        .await?;
+    }
+    Ok(())
+}
+
 pub async fn set_instance_option(
     instance_id: &str,
     option: SyncedOption,
@@ -568,7 +664,7 @@ pub async fn set_instance_option(
     }
     let global = get_global_options_with_state(&state).await?;
     let can_reconcile = !sync_files_are_protected(&metadata)
-        && (option == SyncedOption::GameOptions
+        && (option_can_apply_while_running(option)
             || !instance_is_running(&metadata, &state).await?);
     if enabled {
         let eligibility =
@@ -579,21 +675,6 @@ pub async fn set_instance_option(
             )
             .into());
         }
-        if !matches!(
-            option,
-            SyncedOption::GameOptions
-                | SyncedOption::Screenshots
-                | SyncedOption::ResourcePacks
-                | SyncedOption::DataPacks
-        ) && !can_reconcile
-        {
-            return Err(ErrorKind::InputError(
-                "Close the instance before including it in file syncing."
-                    .to_string(),
-            )
-            .into());
-        }
-
         let action =
             instance_option_join_action(&metadata, option, &state).await?;
         if action == SyncedOptionJoinAction::RequiresResolution
@@ -605,42 +686,23 @@ pub async fn set_instance_option(
             )
             .into());
         }
-        if option != SyncedOption::Screenshots {
-            backup_instance_option_file(&metadata, option, &state).await?;
-        }
-        match action {
-            SyncedOptionJoinAction::SeedShared => {
-                seed_from_instance(&metadata, option, &state).await?;
-            }
-            SyncedOptionJoinAction::Attach => {}
-            SyncedOptionJoinAction::Merge => match option {
-                SyncedOption::CommandHistory => {
-                    merge_command_history_from_instance(&metadata, &state)
-                        .await?;
-                }
-                SyncedOption::MultiplayerServers => {
-                    synced_servers::merge_servers_from_instance(
-                        &metadata, &state,
-                    )
-                    .await?;
-                }
-                SyncedOption::GameOptions
-                | SyncedOption::CreativeHotbars
-                | SyncedOption::Screenshots
-                | SyncedOption::ResourcePacks
-                | SyncedOption::DataPacks => {
-                    unreachable!()
-                }
-            },
-            SyncedOptionJoinAction::RequiresResolution => match resolution {
-                Some(SyncedOptionJoinResolution::UseSynced) => {}
-                Some(SyncedOptionJoinResolution::UseInstance) => {
-                    backup_shared_hotbars(&state).await?;
-                    seed_from_instance(&metadata, option, &state).await?;
-                }
-                None => unreachable!(),
-            },
+        if can_reconcile {
+            pending::cancel(option, Some(instance_id), &state).await?;
+            prepare_instance_join(&metadata, option, resolution, &state)
+                .await?;
+        } else {
+            pending::save(
+                PendingChange {
+                    instance_id: instance_id.to_string(),
+                    option,
+                    action: PendingAction::Join { resolution },
+                },
+                &state,
+            )
+            .await?;
         }
+    } else {
+        pending::cancel(option, Some(instance_id), &state).await?;
     }
 
     instance_rows::set_instance_sync_preference(
@@ -708,21 +770,6 @@ pub async fn get_instance_option_join_preview(
         )
         .into());
     }
-    if !matches!(
-        option,
-        SyncedOption::GameOptions
-            | SyncedOption::Screenshots
-            | SyncedOption::ResourcePacks
-            | SyncedOption::DataPacks
-    ) && (sync_files_are_protected(&metadata)
-        || instance_is_running(&metadata, &state).await?)
-    {
-        return Err(ErrorKind::InputError(
-            "Close the instance before including it in file syncing."
-                .to_string(),
-        )
-        .into());
-    }
 
     Ok(SyncedOptionJoinPreview {
         action: instance_option_join_action(&metadata, option, &state).await?,
@@ -743,7 +790,10 @@ async fn instance_option_join_action(
             SyncedOptionJoinAction::Merge
         }
         SyncedOption::CreativeHotbars => {
-            if instance_hotbars_differ_from_synced(metadata, state).await? {
+            if sync_files_are_protected(metadata)
+                || instance_is_running(metadata, state).await?
+                || instance_hotbars_differ_from_synced(metadata, state).await?
+            {
                 SyncedOptionJoinAction::RequiresResolution
             } else {
                 SyncedOptionJoinAction::Attach
@@ -755,10 +805,113 @@ async fn instance_option_join_action(
     })
 }
 
+async fn prepare_instance_join(
+    metadata: &InstanceMetadata,
+    option: SyncedOption,
+    resolution: Option<SyncedOptionJoinResolution>,
+    state: &State,
+) -> crate::Result<()> {
+    let action = instance_option_join_action(metadata, option, state).await?;
+    backup_instance_option_file(metadata, option, state).await?;
+    match action {
+        SyncedOptionJoinAction::SeedShared => {
+            seed_from_instance(metadata, option, state).await?;
+        }
+        SyncedOptionJoinAction::Attach => {}
+        SyncedOptionJoinAction::Merge => match option {
+            SyncedOption::CommandHistory => {
+                merge_command_history_from_instance(metadata, state).await?;
+            }
+            SyncedOption::MultiplayerServers => {
+                synced_servers::merge_servers_from_instance(metadata, state)
+                    .await?;
+            }
+            _ => unreachable!(),
+        },
+        SyncedOptionJoinAction::RequiresResolution => {
+            if resolution == Some(SyncedOptionJoinResolution::UseInstance) {
+                backup_shared_hotbars(state).await?;
+                seed_from_instance(metadata, option, state).await?;
+            }
+        }
+    }
+    defer_option(metadata, option, state).await
+}
+
+async fn apply_pending_changes(state: &State) -> crate::Result<()> {
+    for change in pending::read(state).await? {
+        if !pending::read(state).await?.contains(&change) {
+            continue;
+        }
+        let Some(metadata) =
+            crate::state::get_instance(&change.instance_id, &state.pool)
+                .await?
+        else {
+            pending::remove(&change, state).await?;
+            continue;
+        };
+        let global = get_global_options_with_state(state).await?;
+        if !global.get(change.option)
+            || !instance_option_enabled(&metadata, change.option)
+        {
+            pending::remove(&change, state).await?;
+            continue;
+        }
+        if sync_files_are_protected(&metadata)
+            || (!option_can_apply_while_running(change.option)
+                && instance_is_running(&metadata, state).await?)
+        {
+            continue;
+        }
+        let result = match change.action {
+            PendingAction::SelectSource => set_global_option_with_state(
+                change.option,
+                true,
+                Some(&change.instance_id),
+                state,
+            )
+            .await
+            .map(|_| ()),
+            PendingAction::Join { resolution } => {
+                if !matches!(
+                    capability_status(&metadata, change.option, true, state)
+                        .await,
+                    CapabilityStatus::Supported
+                ) {
+                    continue;
+                }
+                match prepare_instance_join(
+                    &metadata,
+                    change.option,
+                    resolution,
+                    state,
+                )
+                .await
+                {
+                    Ok(()) => {
+                        pending::remove(&change, state).await?;
+                        ensure_option(&metadata, change.option, state).await
+                    }
+                    Err(error) => Err(error),
+                }
+            }
+        };
+        if let Err(error) = result {
+            tracing::warn!(
+                "Could not apply pending {:?} sync change for {}: {error}",
+                change.option,
+                change.instance_id,
+            );
+        }
+    }
+    Ok(())
+}
+
 pub async fn reconcile_all() -> crate::Result<()> {
     let state = State::get().await?;
     let _guard = state.lock_synced_options().await;
     create_synced_directories(&state).await?;
+    apply_pending_changes(&state).await?;
     let instances = crate::state::list_instances(&state.pool).await?;
     for metadata in instances {
         if let Err(error) =
@@ -797,11 +950,10 @@ pub(crate) async fn monitor_persisted_processes() -> crate::Result<()> {
                     }
                     Ok(false) => {
                         if let Err(error) =
-                            synced_packs::reconcile_after_change(&instance_id)
-                                .await
+                            reconcile_instance(&instance_id).await
                         {
                             tracing::warn!(
-                                "Failed to reconcile synced packs after closing {instance_id}: {error}"
+                                "Failed to reconcile synced options after closing {instance_id}: {error}"
                             );
                         }
                         break;
@@ -823,6 +975,7 @@ pub(crate) async fn monitor_persisted_processes() -> crate::Result<()> {
 pub async fn reconcile_instance(instance_id: &str) -> crate::Result<()> {
     let state = State::get().await?;
     let _guard = state.lock_synced_options().await;
+    apply_pending_changes(&state).await?;
     let metadata = crate::state::get_instance(instance_id, &state.pool)
         .await?
         .ok_or_else(|| ErrorKind::InputError("Unknown instance".to_string()))?;
@@ -886,13 +1039,18 @@ async fn reconcile_instance_with_state(
     state: &State,
     allow_protected: bool,
 ) -> crate::Result<()> {
-    if (!allow_protected && sync_files_are_protected(metadata))
-        || instance_is_running(metadata, state).await?
-    {
+    if !allow_protected && sync_files_are_protected(metadata) {
         return Ok(());
     }
+    let running = instance_is_running(metadata, state).await?;
     let global = get_global_options_with_state(state).await?;
     for option in SyncedOption::ALL {
+        if pending::contains(&metadata.instance.id, option, state).await? {
+            continue;
+        }
+        if running && !option_can_apply_while_running(option) {
+            continue;
+        }
         if !instance_option_enabled(metadata, option) {
             detach_option(metadata, option, state).await?;
             continue;
@@ -957,6 +1115,7 @@ pub async fn reconcile_changed_file(
 ) -> crate::Result<()> {
     let state = State::get().await?;
     let _guard = state.lock_synced_options().await;
+    apply_pending_changes(&state).await?;
     let metadata = crate::state::get_instance(instance_id, &state.pool)
         .await?
         .ok_or_else(|| ErrorKind::InputError("Unknown instance".to_string()))?;
@@ -1255,6 +1414,9 @@ async fn option_participates(
     option: SyncedOption,
     state: &State,
 ) -> crate::Result<bool> {
+    if pending::contains(&metadata.instance.id, option, state).await? {
+        return Ok(false);
+    }
     let global = get_global_options_with_state(state).await?;
     Ok(instance_option_enabled(metadata, option)
         && capability(metadata, option, global.get(option), state)
diff --git a/packages/app-lib/src/api/instance/synced_options/pending.rs b/packages/app-lib/src/api/instance/synced_options/pending.rs
new file mode 100644
index 0000000000..a6a97ac24b
--- /dev/null
+++ b/packages/app-lib/src/api/instance/synced_options/pending.rs
@@ -0,0 +1,97 @@
+use super::orchestration::{SyncedOptionJoinResolution, synced_options_path};
+use crate::State;
+use crate::state::SyncedOption;
+use crate::util::io;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize)]
+#[serde(tag = "action", rename_all = "snake_case")]
+pub(super) enum PendingAction {
+    SelectSource,
+    Join {
+        resolution: Option<SyncedOptionJoinResolution>,
+    },
+}
+
+#[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize)]
+pub(super) struct PendingChange {
+    pub instance_id: String,
+    pub option: SyncedOption,
+    pub action: PendingAction,
+}
+
+pub(super) async fn read(state: &State) -> crate::Result<Vec<PendingChange>> {
+    let path = synced_options_path(state).join("pending-changes.json");
+    match tokio::fs::read(path).await {
+        Ok(bytes) => Ok(serde_json::from_slice(&bytes)?),
+        Err(error) if error.kind() == std::io::ErrorKind::NotFound => {
+            Ok(Vec::new())
+        }
+        Err(error) => Err(error.into()),
+    }
+}
+
+async fn write(changes: &[PendingChange], state: &State) -> crate::Result<()> {
+    let directory = synced_options_path(state);
+    io::create_dir_all(&directory).await?;
+    let temporary = directory.join("pending-changes.json.tmp");
+    io::write(&temporary, serde_json::to_vec(changes)?).await?;
+    tokio::fs::rename(temporary, directory.join("pending-changes.json"))
+        .await?;
+    Ok(())
+}
+
+/// Callers hold the synced-options lock while updating or replaying requests.
+pub(super) async fn save(
+    change: PendingChange,
+    state: &State,
+) -> crate::Result<()> {
+    let mut changes = read(state).await?;
+    changes.retain(|previous| {
+        previous.option != change.option
+            || (change.action != PendingAction::SelectSource
+                && previous.instance_id != change.instance_id)
+    });
+    changes.push(change);
+    write(&changes, state).await
+}
+
+pub(super) async fn remove(
+    change: &PendingChange,
+    state: &State,
+) -> crate::Result<()> {
+    let mut changes = read(state).await?;
+    let previous_len = changes.len();
+    changes.retain(|previous| previous != change);
+    if changes.len() != previous_len {
+        write(&changes, state).await?;
+    }
+    Ok(())
+}
+
+pub(super) async fn cancel(
+    option: SyncedOption,
+    instance_id: Option<&str>,
+    state: &State,
+) -> crate::Result<()> {
+    let mut changes = read(state).await?;
+    let previous_len = changes.len();
+    changes.retain(|change| {
+        change.option != option
+            || instance_id.is_some_and(|id| change.instance_id != id)
+    });
+    if changes.len() != previous_len {
+        write(&changes, state).await?;
+    }
+    Ok(())
+}
+
+pub(in crate::api::instance) async fn contains(
+    instance_id: &str,
+    option: SyncedOption,
+    state: &State,
+) -> crate::Result<bool> {
+    Ok(read(state).await?.iter().any(|change| {
+        change.instance_id == instance_id && change.option == option
+    }))
+}
diff --git a/packages/app-lib/src/api/instance/synced_packs/operations.rs b/packages/app-lib/src/api/instance/synced_packs/operations.rs
index 371031af19..180c594abb 100644
--- a/packages/app-lib/src/api/instance/synced_packs/operations.rs
+++ b/packages/app-lib/src/api/instance/synced_packs/operations.rs
@@ -1,7 +1,8 @@
 use super::super::DesyncServerMode;
 use super::super::synced_options::{
     get_global_options, instance_dir, instance_is_running,
-    instance_option_enabled, sync_files_are_protected,
+    instance_option_enabled, option_can_apply_while_running,
+    sync_files_are_protected,
 };
 use super::reconciliation::{apply_all, participating, synced_instance_ids};
 use super::storage::{cache_bytes, read_library, write_library};
@@ -32,8 +33,11 @@ async fn source(
             crate::ErrorKind::InputError("Unknown instance".to_string())
         })?;
     super::super::projects::ensure_metadata_content_unlocked(&metadata)?;
+    let option = ProjectType::get_from_parent_folder(project_path)
+        .and_then(|project_type| pack_option(project_type).ok());
     if sync_files_are_protected(&metadata)
-        || instance_is_running(&metadata, state).await?
+        || (!option.is_some_and(option_can_apply_while_running)
+            && instance_is_running(&metadata, state).await?)
     {
         return Err(crate::ErrorKind::InputError(
             "Close the instance before syncing its packs.".to_string(),
diff --git a/packages/app-lib/src/api/instance/synced_packs/reconciliation.rs b/packages/app-lib/src/api/instance/synced_packs/reconciliation.rs
index 71c2b27892..cbaec3cafe 100644
--- a/packages/app-lib/src/api/instance/synced_packs/reconciliation.rs
+++ b/packages/app-lib/src/api/instance/synced_packs/reconciliation.rs
@@ -64,6 +64,15 @@ pub(super) async fn capture(
     library: &mut PackLibrary,
     state: &State,
 ) -> crate::Result<bool> {
+    if super::super::synced_options::pending::contains(
+        &metadata.instance.id,
+        SyncedOption::ResourcePacks,
+        state,
+    )
+    .await?
+    {
+        return Ok(false);
+    }
     let Some(placements) =
         library.instances.get(&metadata.instance.id).cloned()
     else {
@@ -417,6 +426,11 @@ async fn apply_pack(
             state,
         )
         .await?;
+        if !plan.dependencies.is_empty()
+            && instance_is_running(metadata, state).await?
+        {
+            return Ok(());
+        }
         for dependency in &plan.dependencies {
             commands::add_project_from_version(
                 instance_id,
@@ -480,13 +494,27 @@ pub(super) async fn apply_instance(
     library: &mut PackLibrary,
     state: &State,
 ) -> crate::Result<()> {
+    if super::super::synced_options::pending::contains(
+        &metadata.instance.id,
+        SyncedOption::ResourcePacks,
+        state,
+    )
+    .await?
+    {
+        return Ok(());
+    }
     if sync_files_are_protected(metadata)
-        || instance_is_running(metadata, state).await?
         || super::super::projects::ensure_metadata_content_unlocked(metadata)
             .is_err()
     {
         return Ok(());
     }
+    let running = instance_is_running(metadata, state).await?;
+    let running_items = if running {
+        commands::list_content(&metadata.instance.id, None, None, state).await?
+    } else {
+        Vec::new()
+    };
     let global = get_global_options().await?;
     let previous_placements = library
         .instances
@@ -498,6 +526,32 @@ pub(super) async fn apply_instance(
         if !participating(metadata, pack, global) {
             continue;
         }
+        if running
+            && (pack.item.project_type != ProjectType::ResourcePack
+                || previous_placements.get(id).is_some_and(|placement| {
+                    !placement.path.is_empty()
+                        && instance_dir(metadata, state)
+                            .join(&placement.path)
+                            .exists()
+                })
+                || running_items.iter().any(|item| {
+                    item.project_type == pack.item.project_type
+                        && (item.id == pack.sha1
+                            || same_path(
+                                &item.file_path,
+                                &pack_path(pack, &pack.item.file_name),
+                            )
+                            || pack.item.project.as_ref().is_some_and(
+                                |project| {
+                                    item.project.as_ref().is_some_and(
+                                        |candidate| candidate.id == project.id,
+                                    )
+                                },
+                            ))
+                }))
+        {
+            continue;
+        }
         if let Err(error) = apply_pack(metadata, id, pack, library, state).await
         {
             tracing::warn!(
@@ -519,7 +573,7 @@ pub(super) async fn apply_instance(
         .cloned()
         .unwrap_or_default();
     for (id, placement) in placements {
-        if packs.contains_key(&id) {
+        if running || packs.contains_key(&id) {
             continue;
         }
         let included = ProjectType::get_from_parent_folder(&placement.path)
diff --git a/packages/app-lib/src/api/instance/synced_packs/selection.rs b/packages/app-lib/src/api/instance/synced_packs/selection.rs
index 080988ae1c..34303c12e4 100644
--- a/packages/app-lib/src/api/instance/synced_packs/selection.rs
+++ b/packages/app-lib/src/api/instance/synced_packs/selection.rs
@@ -153,6 +153,15 @@ pub(super) async fn capture(
     library: &mut PackLibrary,
     state: &State,
 ) -> crate::Result<Option<bool>> {
+    if super::super::synced_options::pending::contains(
+        &metadata.instance.id,
+        SyncedOption::ResourcePacks,
+        state,
+    )
+    .await?
+    {
+        return Ok(None);
+    }
     let Some(placements) =
         library.instances.get(&metadata.instance.id).cloned()
     else {
diff --git a/packages/app-lib/src/launcher/mod.rs b/packages/app-lib/src/launcher/mod.rs
index 43717b1dec..e71fc9e065 100644
--- a/packages/app-lib/src/launcher/mod.rs
+++ b/packages/app-lib/src/launcher/mod.rs
@@ -1097,15 +1097,15 @@ pub async fn launch_minecraft(
     )
     .await?;
 
-	let _instance_content_lock =
-		state.lock_instance_content(&instance.id).await;
-	if crate::state::instance_has_running_process(&instance.id, &state).await? {
-		return Err(crate::ErrorKind::LauncherError(format!(
-			"Instance {} is already running",
-			instance.id
-		))
-		.as_error());
-	}
+    let _instance_content_lock =
+        state.lock_instance_content(&instance.id).await;
+    if crate::state::instance_has_running_process(&instance.id, &state).await? {
+        return Err(crate::ErrorKind::LauncherError(format!(
+            "Instance {} is already running",
+            instance.id
+        ))
+        .as_error());
+    }
 
     crate::state::instances::commands::set_instance_last_played(
         &instance.id,
diff --git a/packages/app-lib/src/state/process.rs b/packages/app-lib/src/state/process.rs
index c12f0b2d38..fb098423ea 100644
--- a/packages/app-lib/src/state/process.rs
+++ b/packages/app-lib/src/state/process.rs
@@ -929,15 +929,16 @@ impl Process {
 
         state.process_manager.remove(uuid);
         clear_persisted_process(&state, persisted_process).await;
-        let synced_pack_instance_id = instance_id.clone();
+        let sync_instance_id = instance_id.clone();
         tokio::spawn(async move {
-            if let Err(error) = crate::api::instance::reconcile_synced_packs(
-                &synced_pack_instance_id,
-            )
-            .await
+            if let Err(error) =
+                crate::api::instance::reconcile_instance_synced_options(
+                    &sync_instance_id,
+                )
+                .await
             {
                 tracing::warn!(
-                    "Failed to reconcile synced packs after closing {synced_pack_instance_id}: {error}"
+                    "Failed to reconcile synced options after closing {sync_instance_id}: {error}"
                 );
             }
         });

From 36f63d4490d0e0bfd15313880a72ff84fb2bbfdc Mon Sep 17 00:00:00 2001
From: "Calum H. (IMB11)" <contact@cal.engineer>
Date: Fri, 4 Sep 2026 14:20:49 +0100
Subject: [PATCH 24/33] fix: qa

---
 .../servers-modal.vue                         |  8 +--
 .../src/pages/instance/worlds/index.vue       | 63 +++++++------------
 .../components/ConsoleActionButtons.vue       |  8 +--
 .../managed-content-modal/index.vue           |  2 +-
 4 files changed, 31 insertions(+), 50 deletions(-)

diff --git a/apps/app-frontend/src/components/ui/settings/instances/instances-synced-settings/servers-modal.vue b/apps/app-frontend/src/components/ui/settings/instances/instances-synced-settings/servers-modal.vue
index f8a0135442..98a5aa9534 100644
--- a/apps/app-frontend/src/components/ui/settings/instances/instances-synced-settings/servers-modal.vue
+++ b/apps/app-frontend/src/components/ui/settings/instances/instances-synced-settings/servers-modal.vue
@@ -299,16 +299,12 @@ defineExpose({ show })
 <template>
 	<NewModal
 		ref="serverEditorModal"
+		:header="formatMessage(messages.serverEditorTitle)"
 		no-padding
 		max-width="min(928px, calc(95vw - 10rem))"
 		width="min(928px, calc(95vw - 10rem))"
 	>
-		<template #title>
-			<span class="text-lg font-extrabold text-contrast">
-				{{ formatMessage(messages.serverEditorTitle) }}
-			</span>
-		</template>
-		<div class="flex h-[min(600px,calc(95vh-10rem))] flex-col">
+		<div class="flex max-h-[min(600px,calc(95vh-10rem))] flex-col">
 			<div
 				class="flex shrink-0 flex-col gap-4 border-0 border-b border-solid border-surface-4 px-6 py-4"
 			>
diff --git a/apps/app-frontend/src/pages/instance/worlds/index.vue b/apps/app-frontend/src/pages/instance/worlds/index.vue
index bcc6d2e3fd..a36587ee7a 100644
--- a/apps/app-frontend/src/pages/instance/worlds/index.vue
+++ b/apps/app-frontend/src/pages/instance/worlds/index.vue
@@ -29,7 +29,7 @@
 					type="text"
 					autocomplete="off"
 					:spellcheck="false"
-					input-class="!h-10"
+					size="medium"
 					wrapper-class="flex-1 min-w-0"
 					clearable
 					:placeholder="
@@ -48,24 +48,21 @@
 				</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 = []"
-					>
+				<FilterPills
+					:model-value="selectedFilters"
+					:options="filterOptions"
+					@update:model-value="updateFilters"
+				>
+					<template #all>
 						{{ formatMessage(commonMessages.allProjectType) }}
-					</button>
-					<button
-						v-for="option in filterOptions"
-						:key="option.id"
-						:class="filterPillClass(selectedFilters.includes(option.id))"
-						@click="toggleFilter(option.id)"
-					>
-						{{ option.label }}
-					</button>
-				</div>
-				<Button type="quiet" :disabled="refreshingAll" size="sm" @click="refreshAllWorlds">
+					</template>
+				</FilterPills>
+				<Button
+					type="quiet"
+					:disabled="refreshingAll"
+					class="!text-sm !font-medium"
+					@click="refreshAllWorlds"
+				>
 					<RefreshCwIcon :class="refreshingAll ? 'animate-spin' : ''" />
 					{{
 						formatMessage(refreshingAll ? messages.refreshingButton : commonMessages.refreshButton)
@@ -130,12 +127,13 @@
 	</ReadyTransition>
 </template>
 <script setup lang="ts">
-import { CompassIcon, FilterIcon, PlusIcon, RefreshCwIcon, SearchIcon } from '@modrinth/assets'
+import { CompassIcon, PlusIcon, RefreshCwIcon, SearchIcon } from '@modrinth/assets'
 import { Button } from '@modrinth/ui'
 import {
 	commonMessages,
 	defineMessages,
 	EmptyState,
+	FilterPills,
 	GAME_MODES,
 	type GameVersion,
 	injectNotificationManager,
@@ -263,26 +261,13 @@ function play() {
 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-brand 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')
-		}
+function updateFilters(filters: string[]) {
+	const addedFilter = filters.find((id) => !selectedFilters.value.includes(id))
+	selectedFilters.value = filters
+	if (addedFilter === 'singleplayer') {
+		selectedFilters.value = filters.filter((id) => id !== 'online' && id !== 'offline')
+	} else if (addedFilter === 'online' || addedFilter === 'offline') {
+		selectedFilters.value = filters.filter((id) => id !== 'singleplayer')
 	}
 }
 
diff --git a/packages/ui/src/layouts/shared/console/components/ConsoleActionButtons.vue b/packages/ui/src/layouts/shared/console/components/ConsoleActionButtons.vue
index 9da6074b34..b0a89c541d 100644
--- a/packages/ui/src/layouts/shared/console/components/ConsoleActionButtons.vue
+++ b/packages/ui/src/layouts/shared/console/components/ConsoleActionButtons.vue
@@ -4,7 +4,7 @@
 			v-if="showClear && hasLogs"
 			v-tooltip="clearDisabled ? clearDisabledTooltip : undefined"
 			type="quiet"
-			size="sm"
+			class="!text-sm !font-medium"
 			:disabled="clearDisabled"
 			@click="emit('clear')"
 		>
@@ -15,7 +15,7 @@
 			v-if="showDelete"
 			v-tooltip="deleteDisabled ? deleteDisabledTooltip : undefined"
 			type="quiet"
-			size="sm"
+			class="!text-sm !font-medium"
 			color="red"
 			interaction="filled"
 			:disabled="deleteDisabled"
@@ -28,7 +28,7 @@
 			v-if="hasLogs"
 			v-tooltip="shareDisabled ? shareDisabledTooltip : undefined"
 			type="quiet"
-			size="sm"
+			class="!text-sm !font-medium"
 			:disabled="shareDisabled"
 			:loading="sharing"
 			@click="emit('share')"
@@ -37,7 +37,7 @@
 			<ShareIcon v-else aria-hidden="true" />
 			{{ formatMessage(messages.share) }}
 		</Button>
-		<Button type="quiet" size="sm" @click="emit('toggle-fullscreen')">
+		<Button type="quiet" class="!text-sm !font-medium" @click="emit('toggle-fullscreen')">
 			<ContractIcon v-if="fullscreen" aria-hidden="true" />
 			<ExpandIcon v-else aria-hidden="true" />
 			{{ formatMessage(fullscreen ? messages.collapse : messages.expand) }}
diff --git a/packages/ui/src/layouts/shared/content-tab/components/managed-content-modal/index.vue b/packages/ui/src/layouts/shared/content-tab/components/managed-content-modal/index.vue
index fffa8e9e50..686fefb2f7 100644
--- a/packages/ui/src/layouts/shared/content-tab/components/managed-content-modal/index.vue
+++ b/packages/ui/src/layouts/shared/content-tab/components/managed-content-modal/index.vue
@@ -513,7 +513,7 @@ defineExpose({ show, showLoading, hide, getState, restore, updateItem, setItems
 				size="3rem"
 				:tint-by="props.sourceName"
 			/>
-			<span class="text-lg font-extrabold text-contrast">
+			<span class="text-2xl font-semibold text-contrast">
 				{{ props.header ?? formatMessage(messages.header) }}
 			</span>
 		</template>

From 766cbd93530d073a77227e58fd094bb918badefe Mon Sep 17 00:00:00 2001
From: "Calum H. (IMB11)" <contact@cal.engineer>
Date: Fri, 4 Sep 2026 14:24:23 +0100
Subject: [PATCH 25/33] chore: panic

---
 packages/app-lib/src/state/mod.rs | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/packages/app-lib/src/state/mod.rs b/packages/app-lib/src/state/mod.rs
index 9ec87e8444..ad77e4ea80 100644
--- a/packages/app-lib/src/state/mod.rs
+++ b/packages/app-lib/src/state/mod.rs
@@ -226,21 +226,18 @@ impl State {
         Ok(())
     }
 
-    /// Get the current launcher state, waiting for initialization
-    pub async fn get() -> crate::Result<Arc<Self>> {
-        if !LAUNCHER_STATE.initialized() {
-            tracing::error!(
-                "Attempted to get state before it is initialized - this should never happen!"
-            );
-            while !LAUNCHER_STATE.initialized() {
-                tokio::time::sleep(std::time::Duration::from_millis(100)).await;
-            }
-        }
-
-        Ok(Arc::clone(
-            LAUNCHER_STATE.get().expect("State is not initialized!"),
-        ))
-    }
+	/// Get the current launcher state, panicking if it has not been initialized.
+	pub async fn get() -> crate::Result<Arc<Self>> {
+		if !LAUNCHER_STATE.initialized() {
+			panic!(
+				"Attempted to get state before it is initialized - this should never happen!"
+			);
+		}
+
+		Ok(Arc::clone(
+			LAUNCHER_STATE.get().expect("State is not initialized!"),
+		))
+	}
 
     pub fn initialized() -> bool {
         LAUNCHER_STATE.initialized()

From 07660d219fc3010f9c050d4cc7a8a7cd623ea245 Mon Sep 17 00:00:00 2001
From: "Calum H. (IMB11)" <contact@cal.engineer>
Date: Fri, 4 Sep 2026 14:31:25 +0100
Subject: [PATCH 26/33] fix: ads using state before ready

---
 apps/app-frontend/src/App.vue                 |  8 ++++--
 apps/app-frontend/src/providers/setup.ts      |  3 ++-
 apps/app-frontend/src/providers/setup/tags.ts | 25 +++++++++++--------
 packages/app-lib/src/state/mod.rs             |  7 ++++--
 4 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue
index 8e97cb374c..aa3d249067 100644
--- a/apps/app-frontend/src/App.vue
+++ b/apps/app-frontend/src/App.vue
@@ -385,6 +385,7 @@ const {
 	handleModpackDuplicateCreateAnyway,
 	handleModpackDuplicateGoToInstance,
 	onboardingChecklist,
+	tags,
 } = setupProviders(
 	tauriApiClient,
 	notificationManager,
@@ -705,6 +706,7 @@ function handleAdsConsentRequired(required) {
 }
 
 async function setupApp() {
+	tags.initialize()
 	await onboardingChecklist.initialize()
 	const skipSyncUpdate = showChecklist.value
 
@@ -1457,8 +1459,10 @@ async function fetchIntercomToken() {
 }
 
 watch(
-	[showAd, adConsentAvailable],
-	async ([showAds, canManageConsent]) => {
+	[stateInitialized, showAd, adConsentAvailable],
+	async ([ready, showAds, canManageConsent]) => {
+		if (!ready) return
+
 		if (showAds) {
 			await init_ads_window(true)
 			return
diff --git a/apps/app-frontend/src/providers/setup.ts b/apps/app-frontend/src/providers/setup.ts
index 5e71ccb7c8..bec1551bb7 100644
--- a/apps/app-frontend/src/providers/setup.ts
+++ b/apps/app-frontend/src/providers/setup.ts
@@ -21,7 +21,7 @@ export function setupProviders(
 	getGeneratedIconConfig?: (iconPath: string) => InstanceIconConfig | null,
 ) {
 	setupUserCountryProvider(client)
-	setupTagsProvider(notificationManager)
+	const tags = setupTagsProvider(notificationManager)
 	setupFileDropProvider()
 	setupFilePickerProvider()
 	setupImageViewerEditorProvider()
@@ -31,5 +31,6 @@ export function setupProviders(
 	return {
 		...setupCreationModal(notificationManager, getGeneratedIconConfig),
 		onboardingChecklist,
+		tags,
 	}
 }
diff --git a/apps/app-frontend/src/providers/setup/tags.ts b/apps/app-frontend/src/providers/setup/tags.ts
index f7cce3c66c..7c0e881af0 100644
--- a/apps/app-frontend/src/providers/setup/tags.ts
+++ b/apps/app-frontend/src/providers/setup/tags.ts
@@ -9,16 +9,21 @@ export function setupTagsProvider(notificationManager: AbstractWebNotificationMa
 
 	const gameVersions = ref([])
 	const loaders = ref([])
-	get_game_versions()
-		.then((v) => {
-			gameVersions.value = v
-		})
-		.catch(handleError)
-	get_loaders()
-		.then((v) => {
-			loaders.value = v
-		})
-		.catch(handleError)
+
+	function initialize() {
+		get_game_versions()
+			.then((v) => {
+				gameVersions.value = v
+			})
+			.catch(handleError)
+		get_loaders()
+			.then((v) => {
+				loaders.value = v
+			})
+			.catch(handleError)
+	}
 
 	provideTags({ gameVersions, loaders })
+
+	return { initialize }
 }
diff --git a/packages/app-lib/src/state/mod.rs b/packages/app-lib/src/state/mod.rs
index ad77e4ea80..2bf4d77326 100644
--- a/packages/app-lib/src/state/mod.rs
+++ b/packages/app-lib/src/state/mod.rs
@@ -226,12 +226,15 @@ impl State {
         Ok(())
     }
 
-	/// Get the current launcher state, panicking if it has not been initialized.
+	/// Get the current launcher state, waiting for initialization.
 	pub async fn get() -> crate::Result<Arc<Self>> {
 		if !LAUNCHER_STATE.initialized() {
-			panic!(
+			tracing::error!(
 				"Attempted to get state before it is initialized - this should never happen!"
 			);
+			while !LAUNCHER_STATE.initialized() {
+				tokio::time::sleep(std::time::Duration::from_millis(100)).await;
+			}
 		}
 
 		Ok(Arc::clone(

From 543f5457bae6f17cd0f293a37da98e2a6d48caa5 Mon Sep 17 00:00:00 2001
From: "Calum H. (IMB11)" <contact@cal.engineer>
Date: Fri, 4 Sep 2026 14:35:09 +0100
Subject: [PATCH 27/33] fix: qa

---
 .../synced-options-settings.vue               | 61 +++++++++++++++++++
 1 file changed, 61 insertions(+)

diff --git a/apps/app-frontend/src/pages/instance/components/settings-modal/synced-options-settings.vue b/apps/app-frontend/src/pages/instance/components/settings-modal/synced-options-settings.vue
index c45356d7fb..871935ebbd 100644
--- a/apps/app-frontend/src/pages/instance/components/settings-modal/synced-options-settings.vue
+++ b/apps/app-frontend/src/pages/instance/components/settings-modal/synced-options-settings.vue
@@ -14,6 +14,8 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/vue-query'
 import { computed, inject, ref } from 'vue'
 
 import GameSettingsModal from '@/components/ui/settings/instances/game-settings-modal/index.vue'
+import CommandHistoryModal from '@/components/ui/settings/instances/instances-synced-settings/command-history-modal.vue'
+import SyncedServersModal from '@/components/ui/settings/instances/instances-synced-settings/servers-modal.vue'
 import SyncedPacksModal from '@/components/ui/settings/instances/SyncedPacksModal.vue'
 import {
 	get_synced_option_join_preview,
@@ -27,6 +29,7 @@ import {
 	gameOptionsSyncSourcesQueryOptions,
 	initializedSyncedOptionsQueryOptions,
 	syncedOptionsKeys,
+	syncedServersQueryOptions,
 } from '@/helpers/synced-options'
 import type { GameInstance } from '@/helpers/types'
 import { appSettingsModalOpenSyncedOptionsKey } from '@/providers/app-settings-modal'
@@ -44,6 +47,8 @@ const queryClient = useQueryClient()
 const openAppSettingsSyncedOptions = inject(appSettingsModalOpenSyncedOptionsKey, () => {})
 
 const syncedPacksModal = ref<InstanceType<typeof SyncedPacksModal>>()
+const commandHistoryModal = ref<InstanceType<typeof CommandHistoryModal>>()
+const syncedServersModal = ref<InstanceType<typeof SyncedServersModal>>()
 
 const messages = defineMessages({
 	resourcePacks: {
@@ -79,6 +84,18 @@ const messages = defineMessages({
 		defaultMessage:
 			'Turn off this override to edit synced packs. Independent packs can be managed in the content tab.',
 	},
+	syncedDataOverride: {
+		id: 'instance.settings.synced-options.data-override',
+		defaultMessage: 'Turn off this override to edit synced data.',
+	},
+	noSyncedDataToEdit: {
+		id: 'app.settings.synced-options.edit.no-synced-data',
+		defaultMessage: 'Choose a sync source before editing this setting.',
+	},
+	noServersSyncedYet: {
+		id: 'app.settings.synced-options.multiplayer-servers.none-synced-yet',
+		defaultMessage: "You haven't synced any servers yet",
+	},
 	sharedSettingsDescription: {
 		id: 'instance.settings.tabs.synced-options.shared-settings.description',
 		defaultMessage: 'Enable an override to keep a synced setting separate for this instance.',
@@ -223,6 +240,7 @@ const overviewQuery = useQuery(
 	})),
 )
 const initializedOptionsQuery = useQuery(initializedSyncedOptionsQueryOptions())
+const syncedServersQuery = useQuery(syncedServersQueryOptions())
 const instancesQuery = useQuery(instanceListQueryOptions())
 const gameOptionSourcesQuery = useQuery(gameOptionsSyncSourcesQueryOptions())
 
@@ -307,6 +325,20 @@ function disabledReason(option: InstanceSyncedOption): string | undefined {
 	return capabilities.value.get(option)?.disabled_reason ?? undefined
 }
 
+function syncedDataDisabledReason(
+	option: 'multiplayer_servers' | 'command_history',
+): string | undefined {
+	const reason = disabledReason(option)
+	if (reason) return reason
+	if (!enabled(option)) return formatMessage(messages.syncedDataOverride)
+	if (option === 'multiplayer_servers' && !syncedServersQuery.data.value?.length) {
+		return formatMessage(messages.noServersSyncedYet)
+	}
+	if (!initializedOptionsQuery.data.value?.[option]) {
+		return formatMessage(messages.noSyncedDataToEdit)
+	}
+}
+
 function showAppSyncedOptions(): void {
 	if (closeModal) {
 		closeModal(openAppSettingsSyncedOptions)
@@ -457,6 +489,8 @@ function resolveHotbars(resolution: SyncedOptionJoinResolution) {
 <template>
 	<div class="flex flex-col gap-6">
 		<SyncedPacksModal ref="syncedPacksModal" />
+		<CommandHistoryModal ref="commandHistoryModal" />
+		<SyncedServersModal ref="syncedServersModal" />
 		<GameSettingsModal
 			ref="gameSettingsModal"
 			:instance-id="gameSettingsInstanceId"
@@ -555,6 +589,33 @@ function resolveHotbars(resolution: SyncedOptionJoinResolution) {
 							<EditIcon />
 						</IconButton>
 					</span>
+					<span
+						v-if="row.option === 'multiplayer_servers' || row.option === 'command_history'"
+						v-tooltip="
+							syncedDataDisabledReason(row.option) ?? formatMessage(commonMessages.editButton)
+						"
+						class="flex"
+					>
+						<IconButton
+							type="outlined"
+							circular
+							:label="formatMessage(commonMessages.editButton)"
+							:disabled="
+								mutation.isPending.value ||
+								overviewQuery.isPending.value ||
+								initializedOptionsQuery.isPending.value ||
+								(row.option === 'multiplayer_servers' && syncedServersQuery.isPending.value) ||
+								!!syncedDataDisabledReason(row.option)
+							"
+							@click="
+								row.option === 'multiplayer_servers'
+									? syncedServersModal?.show()
+									: commandHistoryModal?.show()
+							"
+						>
+							<EditIcon aria-hidden="true" />
+						</IconButton>
+					</span>
 					<span
 						v-if="row.option === 'resource_packs' || row.option === 'data_packs'"
 						v-tooltip="

From 2bfb7fa08ffdf42e109ba45cb1d13ef85f344ef6 Mon Sep 17 00:00:00 2001
From: "Calum H. (IMB11)" <contact@cal.engineer>
Date: Fri, 4 Sep 2026 14:46:26 +0100
Subject: [PATCH 28/33] fix: qa

---
 .../src/components/ui/world/WorldItem.vue     | 26 ++++++++++++-------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/apps/app-frontend/src/components/ui/world/WorldItem.vue b/apps/app-frontend/src/components/ui/world/WorldItem.vue
index c226d7be0d..480c133f6e 100644
--- a/apps/app-frontend/src/components/ui/world/WorldItem.vue
+++ b/apps/app-frontend/src/components/ui/world/WorldItem.vue
@@ -36,6 +36,7 @@ import {
 	useVIntl,
 } from '@modrinth/ui'
 import { getPingLevel } from '@modrinth/utils'
+import { autoToHTML } from '@sfirew/minecraft-motd-parser'
 import dayjs from 'dayjs'
 import { Tooltip } from 'floating-vue'
 import type { Component } from 'vue'
@@ -276,6 +277,15 @@ const messages = defineMessages({
 	},
 })
 
+const incompatibleVersionTooltip = computed(() => ({
+	content: `<span class="font-minecraft font-normal leading-5">${autoToHTML(
+		formatMessage(messages.incompatibleVersion, {
+			version: props.serverStatus?.version?.name ?? '',
+		}),
+	)}</span>`,
+	html: true,
+}))
+
 const cardOptions = useTemplateRef('cardOptions')
 const showStop = computed(
 	() =>
@@ -507,16 +517,12 @@ function openContextMenu(event: MouseEvent) {
 								{{ 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">
-										{{
-											formatMessage(messages.incompatibleVersion, {
-												version: serverStatus.version?.name,
-											})
-										}}
-									</span>
-								</template>
+								<IssuesIcon
+									v-if="serverIncompatible"
+									v-tooltip="incompatibleVersionTooltip"
+									class="shrink-0 text-orange cursor-help smart-clickable:allow-pointer-events"
+									aria-hidden="true"
+								/>
 								<template v-else>
 									<SignalIcon
 										v-tooltip="`${serverStatus.ping}ms`"

From 2147f93a21905e32cf1ad9307b3351f94e168bcd Mon Sep 17 00:00:00 2001
From: "Calum H. (IMB11)" <contact@cal.engineer>
Date: Fri, 4 Sep 2026 15:16:25 +0100
Subject: [PATCH 29/33] fix: qa

---
 apps/app-frontend/src/helpers/worlds.ts       |  14 +-
 .../app-frontend/src/locales/en-US/index.json |   3 +
 .../src/pages/instance/content/index.vue      |   3 +-
 apps/app/src/api/worlds.rs                    |  13 ++
 .../src/api/instance/synced_servers/mod.rs    |   4 +-
 .../api/instance/synced_servers/operations.rs | 141 ++++++++++++++----
 packages/app-lib/src/api/worlds.rs            |  19 +++
 packages/app-lib/src/state/mod.rs             |  30 ++--
 8 files changed, 172 insertions(+), 55 deletions(-)

diff --git a/apps/app-frontend/src/helpers/worlds.ts b/apps/app-frontend/src/helpers/worlds.ts
index 7039437136..d93c3e87ef 100644
--- a/apps/app-frontend/src/helpers/worlds.ts
+++ b/apps/app-frontend/src/helpers/worlds.ts
@@ -345,16 +345,16 @@ export function getServerAddress(javaServer?: { address?: string | null } | null
 
 export async function ensureManagedServerWorldExists(
 	instanceId: string,
-	serverName: string,
+	serverName: string | null,
 	serverAddress: string | null,
 ) {
-	if (!instanceId || !serverAddress) return
+	if (!instanceId || !serverName || !serverAddress) return
 	try {
-		const worlds = await get_instance_worlds(instanceId)
-		const managedWorld = resolveManagedServerWorld(worlds, serverName, serverAddress)
-		if (!managedWorld) {
-			await add_server_to_instance(instanceId, serverName, serverAddress, 'prompt')
-		}
+		await invoke('plugin:worlds|ensure_managed_server_in_instance', {
+			instanceId,
+			name: serverName,
+			address: serverAddress,
+		})
 	} catch (err) {
 		console.error('Failed to ensure managed server world exists:', err)
 	}
diff --git a/apps/app-frontend/src/locales/en-US/index.json b/apps/app-frontend/src/locales/en-US/index.json
index c3767a762b..1c5e6de076 100644
--- a/apps/app-frontend/src/locales/en-US/index.json
+++ b/apps/app-frontend/src/locales/en-US/index.json
@@ -3764,6 +3764,9 @@
   "instance.settings.sharing.revoke-invite.header": {
     "message": "Revoke invite"
   },
+  "instance.settings.synced-options.data-override": {
+    "message": "Turn off this override to edit synced data."
+  },
   "instance.settings.synced-options.data-packs": {
     "message": "Unsync data packs"
   },
diff --git a/apps/app-frontend/src/pages/instance/content/index.vue b/apps/app-frontend/src/pages/instance/content/index.vue
index 3e87f48647..64b14fd50a 100644
--- a/apps/app-frontend/src/pages/instance/content/index.vue
+++ b/apps/app-frontend/src/pages/instance/content/index.vue
@@ -428,8 +428,7 @@ const managedContent = computed<ManagedContentData | null>(() => {
 				attachment?.server_manager_icon_url ??
 				linkedProject?.icon_url ??
 				undefined)
-			: (sharedManager?.avatarUrl ??
-				(instance.value.icon_path ? convertFileSrc(instance.value.icon_path) : undefined))
+			: (sharedManager?.avatarUrl ?? getInstanceIconUrl(instance.value.icon_path) ?? undefined)
 		const managerLink = serverManaged
 			? linkedProject
 				? {
diff --git a/apps/app/src/api/worlds.rs b/apps/app/src/api/worlds.rs
index 56dcdd091b..1c53cd7436 100644
--- a/apps/app/src/api/worlds.rs
+++ b/apps/app/src/api/worlds.rs
@@ -23,6 +23,7 @@ pub fn init<R: Runtime>() -> tauri::plugin::TauriPlugin<R> {
             backup_world,
             delete_world,
             add_server_to_instance,
+            ensure_managed_server_in_instance,
             edit_server_in_instance,
             remove_server_from_instance,
             desync_server,
@@ -166,6 +167,18 @@ pub async fn add_server_to_instance(
     .await?)
 }
 
+#[tauri::command]
+pub async fn ensure_managed_server_in_instance(
+    instance_id: &str,
+    name: String,
+    address: String,
+) -> Result<()> {
+    Ok(
+        worlds::ensure_managed_server_in_instance(instance_id, name, address)
+            .await?,
+    )
+}
+
 #[tauri::command]
 pub async fn edit_server_in_instance(
     instance_id: &str,
diff --git a/packages/app-lib/src/api/instance/synced_servers/mod.rs b/packages/app-lib/src/api/instance/synced_servers/mod.rs
index 60ddd2949a..4f41d6ed8b 100644
--- a/packages/app-lib/src/api/instance/synced_servers/mod.rs
+++ b/packages/app-lib/src/api/instance/synced_servers/mod.rs
@@ -9,8 +9,8 @@ const SERVERS_FILE: &str = "servers.dat";
 pub(crate) use self::codec::server_data;
 pub use self::modpack::{capture_modpack_servers, clear_modpack_servers};
 pub(crate) use self::operations::{
-    add_user_server, list_server_records, remove_server_by_index,
-    update_server_by_index,
+    add_user_server, ensure_managed_server, list_server_records,
+    remove_server_by_index, update_server_by_index,
 };
 pub use self::operations::{
     desync_server, list_synced_servers, remove_synced_server,
diff --git a/packages/app-lib/src/api/instance/synced_servers/operations.rs b/packages/app-lib/src/api/instance/synced_servers/operations.rs
index 753391f9d4..957eb0a289 100644
--- a/packages/app-lib/src/api/instance/synced_servers/operations.rs
+++ b/packages/app-lib/src/api/instance/synced_servers/operations.rs
@@ -28,6 +28,38 @@ use super::types::{
 };
 use std::collections::HashSet;
 
+fn normalized_server_address(data: &NbtCompound) -> (String, u16) {
+    let address = server_identity_address(data);
+    let (host, port) = crate::server_address::parse_server_address(&address)
+        .unwrap_or((&address, 25565));
+    (host.trim().to_string(), port)
+}
+
+async fn sync_candidates(
+    metadata: &InstanceMetadata,
+    state: &State,
+) -> crate::Result<Vec<NbtCompound>> {
+    let locals = load_local(&metadata.instance.id, state).await?;
+    let mut servers =
+        read_servers(&instance_dir(metadata, state).join(SERVERS_FILE)).await?;
+    for local in locals {
+        let local_address = normalized_server_address(&local.data);
+        let index = servers
+            .iter()
+            .position(|data| data == &local.data)
+            .or_else(|| {
+                servers.iter().position(|data| {
+                    !local_address.0.is_empty()
+                        && normalized_server_address(data) == local_address
+                })
+            });
+        if let Some(index) = index {
+            servers.remove(index);
+        }
+    }
+    Ok(servers)
+}
+
 pub(in crate::api::instance) async fn seed_servers(
     metadata: &InstanceMetadata,
     state: &State,
@@ -42,7 +74,6 @@ pub(in crate::api::instance) async fn seed_servers(
             metadata.instance.id
         );
     }
-    let local_entries = load_local(&metadata.instance.id, state).await?;
     if is_modpack_link(&metadata.link)
         && !pack_state_exists(&metadata.instance.id, state).await?
     {
@@ -52,18 +83,7 @@ pub(in crate::api::instance) async fn seed_servers(
 		)
 		.into());
     }
-    let path = instance_dir(metadata, state).join(SERVERS_FILE);
-    let mut servers = read_servers(&path).await?;
-    for local in &local_entries {
-        let local_address = server_identity_address(&local.data);
-        if let Some(index) = servers.iter().position(|data| {
-            data == &local.data
-                || (!local_address.is_empty()
-                    && server_identity_address(data) == local_address)
-        }) {
-            servers.remove(index);
-        }
-    }
+    let servers = sync_candidates(metadata, state).await?;
     let canonical = servers
         .into_iter()
         .map(|data| CanonicalServer {
@@ -89,7 +109,6 @@ pub(in crate::api::instance) async fn merge_servers_from_instance(
             metadata.instance.id
         );
     }
-    let local_entries = load_local(&metadata.instance.id, state).await?;
     if is_modpack_link(&metadata.link)
         && !pack_state_exists(&metadata.instance.id, state).await?
     {
@@ -99,18 +118,7 @@ pub(in crate::api::instance) async fn merge_servers_from_instance(
         )
         .into());
     }
-    let path = instance_dir(metadata, state).join(SERVERS_FILE);
-    let mut candidates = read_servers(&path).await?;
-    for local in &local_entries {
-        let local_address = server_identity_address(&local.data);
-        if let Some(index) = candidates.iter().position(|data| {
-            data == &local.data
-                || (!local_address.is_empty()
-                    && server_identity_address(data) == local_address)
-        }) {
-            candidates.remove(index);
-        }
-    }
+    let candidates = sync_candidates(metadata, state).await?;
 
     let mut canonical = read_canonical(state).await?;
     for data in candidates {
@@ -148,9 +156,7 @@ pub(in crate::api::instance) async fn ensure_servers(
     }
     if !canonical_exists(state).await? {
         if !is_modpack_link(&metadata.link) {
-            let servers =
-                read_servers(&instance_dir(metadata, state).join(SERVERS_FILE))
-                    .await?;
+            let servers = sync_candidates(metadata, state).await?;
             let canonical = servers
                 .into_iter()
                 .map(|data| CanonicalServer {
@@ -411,6 +417,83 @@ async fn list_server_records_locked(
     )
 }
 
+/// Keeps an automatically added server local, even before server sync is enabled.
+pub(crate) async fn ensure_managed_server(
+    metadata: &InstanceMetadata,
+    data: NbtCompound,
+    state: &State,
+) -> crate::Result<()> {
+    let _guard = state.lock_synced_options().await;
+    let path = instance_dir(metadata, state).join(SERVERS_FILE);
+    let syncing = participating(metadata, state).await?;
+    let records = list_server_records_locked(metadata, state).await?;
+    let address = normalized_server_address(&data);
+    let name = server_identity_name(&data);
+    let existing_index = records
+        .iter()
+        .position(|record| {
+            normalized_server_address(&record.data) == address
+                && server_identity_name(&record.data) == name
+        })
+        .or_else(|| {
+            records.iter().position(|record| {
+                normalized_server_address(&record.data) == address
+            })
+        });
+    let existing = existing_index.map(|index| &records[index]);
+    let position = existing_index.unwrap_or_else(|| {
+        records
+            .iter()
+            .position(ServerRecord::hidden)
+            .unwrap_or(records.len())
+    });
+    let data = existing.map(|record| record.data.clone()).unwrap_or(data);
+    let excluded_synced_server_id = existing
+        .filter(|record| record.source == ServerSource::UserSynced)
+        .map(|record| record.id.clone());
+    let mut locals = load_local(&metadata.instance.id, state).await?;
+    if let Some(local) = locals
+        .iter_mut()
+        .find(|server| normalized_server_address(&server.data) == address)
+    {
+        let excluded_synced_server_id = excluded_synced_server_id
+            .or_else(|| local.excluded_synced_server_id.clone());
+        if existing.is_some()
+            && local.data == data
+            && local.position == position as i64
+            && local.excluded_synced_server_id == excluded_synced_server_id
+            && (!syncing || path.exists())
+        {
+            return Ok(());
+        }
+        local.data = data.clone();
+        local.position = position as i64;
+        local.excluded_synced_server_id = excluded_synced_server_id;
+    } else {
+        locals.push(LocalServer {
+            id: Uuid::new_v4().to_string(),
+            source: ServerSource::LinkedServerProject,
+            excluded_synced_server_id,
+            data: data.clone(),
+            position: position as i64,
+        });
+    }
+    write_local(&metadata.instance.id, &locals, state).await?;
+    if syncing {
+        if effective(metadata, state).await? {
+            compose_instance(metadata, state).await?;
+        }
+    } else if existing.is_none() {
+        let mut servers = records
+            .into_iter()
+            .map(|record| record.data)
+            .collect::<Vec<_>>();
+        servers.insert(position, data);
+        write_servers(&path, &servers).await?;
+    }
+    Ok(())
+}
+
 pub(crate) async fn add_user_server(
     metadata: &InstanceMetadata,
     mut data: NbtCompound,
diff --git a/packages/app-lib/src/api/worlds.rs b/packages/app-lib/src/api/worlds.rs
index a4d7e77df7..d8f8d655dd 100644
--- a/packages/app-lib/src/api/worlds.rs
+++ b/packages/app-lib/src/api/worlds.rs
@@ -827,6 +827,25 @@ pub async fn add_server_to_instance(
     Ok(insert_index)
 }
 
+pub async fn ensure_managed_server_in_instance(
+    instance_id: &str,
+    name: String,
+    address: String,
+) -> Result<()> {
+    let state = State::get().await?;
+    let (instance_id, _) =
+        resolve_instance_identity(instance_id, &state).await?;
+    let metadata = crate::state::get_instance(&instance_id, &state.pool)
+        .await?
+        .ok_or_else(|| ErrorKind::InputError("Unknown instance".to_string()))?;
+    let data =
+        crate::api::instance::synced_servers::server_data(name, address, None);
+    crate::api::instance::synced_servers::ensure_managed_server(
+        &metadata, data, &state,
+    )
+    .await
+}
+
 pub async fn edit_server_in_instance(
     instance_id: &str,
     index: usize,
diff --git a/packages/app-lib/src/state/mod.rs b/packages/app-lib/src/state/mod.rs
index 2bf4d77326..65c3c7b37f 100644
--- a/packages/app-lib/src/state/mod.rs
+++ b/packages/app-lib/src/state/mod.rs
@@ -226,21 +226,21 @@ impl State {
         Ok(())
     }
 
-	/// Get the current launcher state, waiting for initialization.
-	pub async fn get() -> crate::Result<Arc<Self>> {
-		if !LAUNCHER_STATE.initialized() {
-			tracing::error!(
-				"Attempted to get state before it is initialized - this should never happen!"
-			);
-			while !LAUNCHER_STATE.initialized() {
-				tokio::time::sleep(std::time::Duration::from_millis(100)).await;
-			}
-		}
-
-		Ok(Arc::clone(
-			LAUNCHER_STATE.get().expect("State is not initialized!"),
-		))
-	}
+    /// Get the current launcher state, waiting for initialization.
+    pub async fn get() -> crate::Result<Arc<Self>> {
+        if !LAUNCHER_STATE.initialized() {
+            tracing::error!(
+                "Attempted to get state before it is initialized - this should never happen!"
+            );
+            while !LAUNCHER_STATE.initialized() {
+                tokio::time::sleep(std::time::Duration::from_millis(100)).await;
+            }
+        }
+
+        Ok(Arc::clone(
+            LAUNCHER_STATE.get().expect("State is not initialized!"),
+        ))
+    }
 
     pub fn initialized() -> bool {
         LAUNCHER_STATE.initialized()

From 4b9e434f0fe5a14644c5d4cf089ecbf4aa926610 Mon Sep 17 00:00:00 2001
From: "Calum H. (IMB11)" <contact@cal.engineer>
Date: Fri, 4 Sep 2026 18:35:11 +0100
Subject: [PATCH 30/33] fix: qa

---
 .../game-settings-modal/boolean-control.vue   |  36 +++++-
 packages/app-lib/src/install/runner.rs        | 108 +++++++++---------
 packages/ui/src/components/base/Slider.vue    |  23 ++--
 .../ui/src/components/modal/TabbedModal.vue   |  35 ++++--
 4 files changed, 122 insertions(+), 80 deletions(-)

diff --git a/apps/app-frontend/src/components/ui/settings/instances/game-settings-modal/boolean-control.vue b/apps/app-frontend/src/components/ui/settings/instances/game-settings-modal/boolean-control.vue
index 1dde7b1baf..3700ca7019 100644
--- a/apps/app-frontend/src/components/ui/settings/instances/game-settings-modal/boolean-control.vue
+++ b/apps/app-frontend/src/components/ui/settings/instances/game-settings-modal/boolean-control.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { Button, ButtonGroup } from '@modrinth/ui'
+import { Button } from '@modrinth/ui'
 
 defineProps<{
 	modelValue?: boolean
@@ -16,10 +16,19 @@ const emit = defineEmits<{
 </script>
 
 <template>
-	<ButtonGroup v-tooltip="modelValue === undefined ? placeholder : undefined" :label="label">
+	<div
+		v-tooltip="modelValue === undefined ? placeholder : undefined"
+		role="group"
+		:aria-label="label"
+		class="inline-flex h-8 items-center gap-0.5 rounded-xl border border-solid border-surface-5 p-px shadow-[0_1px_3px_rgba(0,0,0,0.15)]"
+		:class="{ 'opacity-50': disabled }"
+	>
 		<Button
-			type="outlined"
-			:color="modelValue === true ? 'green' : undefined"
+			type="quiet"
+			size="xs"
+			:interaction="modelValue === true ? 'none' : 'surface'"
+			class="boolean-control-on !rounded-[10px] !px-3 !font-medium disabled:!opacity-100"
+			:class="modelValue === true ? '!text-green' : '!text-contrast'"
 			:aria-pressed="modelValue === true"
 			:disabled="disabled"
 			@click="emit('update:model-value', true)"
@@ -27,12 +36,27 @@ const emit = defineEmits<{
 			{{ onLabel }}
 		</Button>
 		<Button
-			:type="modelValue === false ? 'base' : 'outlined'"
+			type="quiet"
+			size="xs"
+			:interaction="modelValue === false ? 'none' : 'surface'"
+			class="boolean-control-off !rounded-[10px] !px-3 !font-medium !text-contrast disabled:!opacity-100"
 			:aria-pressed="modelValue === false"
 			:disabled="disabled"
 			@click="emit('update:model-value', false)"
 		>
 			{{ offLabel }}
 		</Button>
-	</ButtonGroup>
+	</div>
 </template>
+
+<style scoped>
+.boolean-control-on[aria-pressed='true'] {
+	background-color: color-mix(in srgb, var(--color-green) 30%, var(--surface-3));
+	box-shadow: inset 0 0 0 1px color-mix(in srgb, var(--color-green) 60%, transparent);
+}
+
+.boolean-control-off[aria-pressed='true'] {
+	background-color: var(--surface-4);
+	box-shadow: inset 0 0 0 1px var(--surface-5);
+}
+</style>
diff --git a/packages/app-lib/src/install/runner.rs b/packages/app-lib/src/install/runner.rs
index 2add5d541a..fa75a07e37 100644
--- a/packages/app-lib/src/install/runner.rs
+++ b/packages/app-lib/src/install/runner.rs
@@ -194,7 +194,9 @@ pub async fn retry_job(job_id: Uuid) -> crate::Result<InstallJobSnapshot> {
     };
     emit_install_job(&record.snapshot()).await?;
 
-    if let Err(error) = prepare_initial_instance(&mut job.state, &state).await {
+	if let Err(error) =
+		Box::pin(prepare_initial_instance(&mut job.state, &state)).await
+	{
         let error_view = install_error_view(
             job.state.progress.phase,
             &error,
@@ -373,7 +375,9 @@ async fn start(request: InstallRequest) -> crate::Result<InstallJobSnapshot> {
         store::insert(id, &job_state, InstallJobStatus::Queued, &state).await?;
     emit_install_job(&record.snapshot()).await?;
 
-    if let Err(error) = prepare_initial_instance(&mut job_state, &state).await {
+	if let Err(error) =
+		Box::pin(prepare_initial_instance(&mut job_state, &state)).await
+	{
         let error_view = install_error_view(
             job_state.progress.phase,
             &error,
@@ -442,16 +446,16 @@ async fn prepare_initial_instance(
             icon_config,
             link,
         } => {
-            let metadata = crate::api::instance::create(
-                name,
-                game_version,
-                loader,
-                loader_version,
-                icon_path,
-                icon_config,
-                link,
-            )
-            .await?;
+			let metadata = Box::pin(crate::api::instance::create(
+				name,
+				game_version,
+				loader,
+				loader_version,
+				icon_path,
+				icon_config,
+				link,
+			))
+			.await?;
             set_display(
                 job_state,
                 metadata.instance.name,
@@ -489,16 +493,16 @@ async fn prepare_initial_instance(
                 .and_then(|edit| edit.link.clone())
                 .or_else(|| preview.link.clone())
                 .unwrap_or(InstanceLink::Unmanaged);
-            let metadata = crate::api::instance::create(
-                name,
-                preview.game_version,
-                preview.modloader,
-                preview.loader_version,
-                icon_path,
-                None,
-                link,
-            )
-            .await?;
+			let metadata = Box::pin(crate::api::instance::create(
+				name,
+				preview.game_version,
+				preview.modloader,
+				preview.loader_version,
+				icon_path,
+				None,
+				link,
+			))
+			.await?;
             set_display(
                 job_state,
                 metadata.instance.name,
@@ -535,16 +539,16 @@ async fn prepare_initial_instance(
                         data.instance_icon_url.clone(),
                     )
                 };
-            let metadata = crate::api::instance::create(
-                data.name.clone(),
-                game_version,
-                loader,
-                loader_version,
-                icon_path,
-                None,
-                shared_link,
-            )
-            .await?;
+			let metadata = Box::pin(crate::api::instance::create(
+				data.name.clone(),
+				game_version,
+				loader,
+				loader_version,
+				icon_path,
+				None,
+				shared_link,
+			))
+			.await?;
             set_display(
                 job_state,
                 metadata.instance.name,
@@ -558,16 +562,16 @@ async fn prepare_initial_instance(
         InstallRequest::ImportInstance {
             instance_folder, ..
         } => {
-            let metadata = crate::api::instance::create(
-                instance_folder,
-                "1.19.4".to_string(),
-                ModLoader::Vanilla,
-                Some("latest".to_string()),
-                None,
-                None,
-                InstanceLink::Unmanaged,
-            )
-            .await?;
+			let metadata = Box::pin(crate::api::instance::create(
+				instance_folder,
+				"1.19.4".to_string(),
+				ModLoader::Vanilla,
+				Some("latest".to_string()),
+				None,
+				None,
+				InstanceLink::Unmanaged,
+			))
+			.await?;
             set_display(
                 job_state,
                 metadata.instance.name,
@@ -584,16 +588,16 @@ async fn prepare_initial_instance(
                             "Unknown instance".to_string(),
                         )
                     })?;
-            let created = crate::api::instance::create(
-                metadata.instance.name,
-                metadata.applied_content_set.game_version,
-                metadata.applied_content_set.loader,
-                metadata.applied_content_set.loader_version,
-                metadata.instance.icon_path,
-                None,
-                metadata.link,
-            )
-            .await?;
+			let created = Box::pin(crate::api::instance::create(
+				metadata.instance.name,
+				metadata.applied_content_set.game_version,
+				metadata.applied_content_set.loader,
+				metadata.applied_content_set.loader_version,
+				metadata.instance.icon_path,
+				None,
+				metadata.link,
+			))
+			.await?;
             set_display(
                 job_state,
                 created.instance.name,
diff --git a/packages/ui/src/components/base/Slider.vue b/packages/ui/src/components/base/Slider.vue
index c1847668f9..a0006848b0 100644
--- a/packages/ui/src/components/base/Slider.vue
+++ b/packages/ui/src/components/base/Slider.vue
@@ -9,7 +9,7 @@
 
 		<div
 			v-if="currentValue !== null"
-			class="relative h-10 min-w-0 flex-1"
+			class="relative mx-2 h-10 min-w-0 flex-1"
 			:class="disabled ? 'opacity-50' : ''"
 		>
 			<div
@@ -103,7 +103,7 @@ const props = withDefaults(defineProps<Props>(), {
 	unit: '',
 })
 
-const currentValue = ref(props.modelValue === null ? null : clampValue(props.modelValue))
+const currentValue = ref(props.modelValue === null ? null : normalizeValue(props.modelValue))
 const currentPercentage = computed(() => getPercentage(currentValue.value ?? props.min))
 const valueInputWidth = computed(() =>
 	currentValue.value === null
@@ -117,11 +117,18 @@ const visibleSnapPoints = computed(() =>
 watch(
 	() => props.modelValue,
 	(newValue) => {
-		currentValue.value = newValue === null ? null : clampValue(newValue ?? props.min)
+		currentValue.value = newValue === null ? null : normalizeValue(newValue ?? props.min)
 	},
 )
 
-function clampValue(value: number) {
+function normalizeValue(value: number) {
+	if (!Number.isFinite(value)) return props.min
+
+	if (props.forceStep && props.step > 0) {
+		value = props.min + Math.round((value - props.min) / props.step) * props.step
+		value = Number(value.toFixed(8))
+	}
+
 	return Math.max(props.min, Math.min(value, props.max))
 }
 
@@ -139,13 +146,7 @@ function formatValue(value: number) {
 function inputValueValid(inputValue: number) {
 	if (!Number.isFinite(inputValue)) return
 
-	let newValue = inputValue
-	if (props.forceStep && props.step > 0) {
-		newValue = props.min + Math.round((newValue - props.min) / props.step) * props.step
-		newValue = Number(newValue.toFixed(8))
-	}
-
-	currentValue.value = clampValue(newValue)
+	currentValue.value = normalizeValue(inputValue)
 	emit('update:modelValue', currentValue.value)
 }
 
diff --git a/packages/ui/src/components/modal/TabbedModal.vue b/packages/ui/src/components/modal/TabbedModal.vue
index 99a607949b..02e6a0d9f3 100644
--- a/packages/ui/src/components/modal/TabbedModal.vue
+++ b/packages/ui/src/components/modal/TabbedModal.vue
@@ -2,7 +2,8 @@
 
 <script setup lang="ts">
 import { RightArrowIcon } from '@modrinth/assets'
-import { type Component, type ComponentPublicInstance, computed, nextTick, ref } from 'vue'
+import { useElementSize } from '@vueuse/core'
+import { type Component, type ComponentPublicInstance, computed, nextTick, ref, watch } from 'vue'
 
 import { type MessageDescriptor, useVIntl } from '../../composables/i18n'
 import { useScrollIndicator } from '../../composables/scroll-indicator'
@@ -75,6 +76,14 @@ const scrollContainer = ref<HTMLElement | null>(null)
 const { showTopFade, showBottomFade, checkScrollState, forceCheck } =
 	useScrollIndicator(scrollContainer)
 
+const floatingActionBarContainer = ref<HTMLElement | null>(null)
+const { height: floatingActionBarHeight } = useElementSize(floatingActionBarContainer)
+const contentBottomPadding = computed(() =>
+	props.floatingActionBarShown ? `calc(${floatingActionBarHeight.value}px + 2.25rem)` : '1.5rem',
+)
+
+watch(contentBottomPadding, () => forceCheck(), { flush: 'post' })
+
 const sidebarScrollContainer = ref<HTMLElement | null>(null)
 const {
 	showTopFade: showSidebarTopFade,
@@ -218,17 +227,18 @@ defineExpose({ show, hide, selectedTab, setTab })
 				<div
 					ref="scrollContainer"
 					class="absolute inset-0 overflow-y-auto px-6"
-					:class="floatingActionBarShown ? 'pb-24' : 'pb-6'"
 					@scroll="checkScrollState"
 				>
-					<slot name="content" :tab="visibleTabs[selectedTab]" :index="selectedTab">
-						<Suspense>
-							<component
-								:is="visibleTabs[selectedTab]?.content"
-								v-if="visibleTabs[selectedTab]?.content"
-							/>
-						</Suspense>
-					</slot>
+					<div class="flow-root min-h-full" :style="{ paddingBottom: contentBottomPadding }">
+						<slot name="content" :tab="visibleTabs[selectedTab]" :index="selectedTab">
+							<Suspense>
+								<component
+									:is="visibleTabs[selectedTab]?.content"
+									v-if="visibleTabs[selectedTab]?.content"
+								/>
+							</Suspense>
+						</slot>
+					</div>
 				</div>
 
 				<Transition
@@ -245,7 +255,10 @@ defineExpose({ show, hide, selectedTab, setTab })
 					/>
 				</Transition>
 
-				<div class="pointer-events-none absolute bottom-3 left-6 right-6 z-20">
+				<div
+					ref="floatingActionBarContainer"
+					class="pointer-events-none absolute bottom-3 left-6 right-6 z-20"
+				>
 					<div class="pointer-events-auto">
 						<slot name="floating-action-bar" />
 					</div>

From 5e6fc01abdd7a17ab021bd24e16f91ad9ca089fe Mon Sep 17 00:00:00 2001
From: "Calum H. (IMB11)" <contact@cal.engineer>
Date: Fri, 4 Sep 2026 18:39:23 +0100
Subject: [PATCH 31/33] fix: not using right version field

---
 .../game_options/launch_overrides.rs          |   7 +-
 .../game_options/options_file.rs              |  56 +++++++++
 .../game_options/write_shared_settings.rs     |  14 ++-
 packages/app-lib/src/install/runner.rs        | 112 +++++++++---------
 packages/app-lib/src/launcher/mod.rs          |  40 ++++---
 5 files changed, 155 insertions(+), 74 deletions(-)

diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/launch_overrides.rs b/packages/app-lib/src/api/instance/synced_options/game_options/launch_overrides.rs
index a095bb5398..08901884dd 100644
--- a/packages/app-lib/src/api/instance/synced_options/game_options/launch_overrides.rs
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/launch_overrides.rs
@@ -55,7 +55,12 @@ pub async fn apply_launcher_overrides(
     let (mut document, input_bytes) = if path.exists() {
         read_document(&path).await?
     } else {
-        (GameOptionsDocument::empty(), Vec::new())
+        (
+            GameOptionsDocument::for_instance(&metadata, &state)
+                .await?
+                .unwrap_or_else(GameOptionsDocument::empty),
+            Vec::new(),
+        )
     };
     for (key, value) in overrides {
         validate_raw_key_value(key, value)?;
diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/options_file.rs b/packages/app-lib/src/api/instance/synced_options/game_options/options_file.rs
index 429f94cbe5..1168c49442 100644
--- a/packages/app-lib/src/api/instance/synced_options/game_options/options_file.rs
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/options_file.rs
@@ -1,6 +1,7 @@
 //! Reads and edits `options.txt` without changing unrelated lines or file formatting.
 
 use super::super as synced_options;
+use super::catalog::release_version;
 use super::{
     MAX_KEY_BYTES, MAX_OPTIONS_BYTES, MAX_OPTIONS_LINES, MAX_VALUE_BYTES,
     OPTIONS_FILE,
@@ -53,6 +54,61 @@ impl GameOptionsDocument {
         }
     }
 
+    /// Creates settings in the target game's format. Modern key bindings need
+    /// its data version so Minecraft does not run legacy migrations on them.
+    /// Unknown versions without embedded metadata wait for Minecraft's own file.
+    pub(super) async fn for_instance(
+        metadata: &InstanceMetadata,
+        state: &State,
+    ) -> crate::Result<Option<Self>> {
+        let content_set = &metadata.applied_content_set;
+        let version = &content_set.game_version;
+        let version_jar = content_set.loader_version.as_ref().map_or_else(
+            || version.clone(),
+            |loader| format!("{version}-{loader}"),
+        );
+        let path = state
+            .directories
+            .version_dir(&version_jar)
+            .join(format!("{version_jar}.jar"));
+        let embedded_version = if path.exists() {
+            crate::launcher::read_game_version_metadata_from_jar(&path)
+                .await?
+                .and_then(|metadata| metadata.world_version)
+        } else {
+            None
+        };
+        let data_version = match embedded_version {
+            Some(data_version) => Some(data_version),
+            None => match version.as_str() {
+                "1.10" => Some(510),
+                "1.10.1" => Some(511),
+                "1.10.2" => Some(512),
+                "1.11" => Some(819),
+                "1.11.1" => Some(921),
+                "1.11.2" => Some(922),
+                "1.12" => Some(1139),
+                "1.12.1" => Some(1241),
+                "1.12.2" => Some(1343),
+                "1.13" => Some(1519),
+                "1.13.1" => Some(1628),
+                "1.13.2" => Some(1631),
+                _ if release_version(version).is_some_and(
+                    |(major, minor, _)| major == 1 && minor < 10,
+                ) =>
+                {
+                    None
+                }
+                _ => return Ok(None),
+            },
+        };
+        let mut document = Self::empty();
+        if let Some(data_version) = data_version {
+            document.set("version", &data_version.to_string(), true)?;
+        }
+        Ok(Some(document))
+    }
+
     pub(super) fn parse(bytes: &[u8]) -> crate::Result<Self> {
         if bytes.len() > MAX_OPTIONS_BYTES {
             return Err(input_error("options.txt is too large to sync safely"));
diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/write_shared_settings.rs b/packages/app-lib/src/api/instance/synced_options/game_options/write_shared_settings.rs
index 1c8aecc6f9..005466cb9b 100644
--- a/packages/app-lib/src/api/instance/synced_options/game_options/write_shared_settings.rs
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/write_shared_settings.rs
@@ -195,8 +195,20 @@ pub(super) async fn apply_shared_settings_to_instance(
     let (mut document, input_bytes) = if path.exists() {
         read_document(&path).await?
     } else {
-        (GameOptionsDocument::empty(), Vec::new())
+        let Some(document) =
+            GameOptionsDocument::for_instance(metadata, state).await?
+        else {
+            return Ok(SyncOutcome::WaitingForFile);
+        };
+        (document, Vec::new())
     };
+    if document.value("version").is_none()
+        && !supported_settings_cover_game_version(
+            &metadata.applied_content_set.game_version,
+        )
+    {
+        return Ok(SyncOutcome::Deferred);
+    }
     let applied =
         apply_shared_settings_to_document(metadata, &mut document, state)
             .await?;
diff --git a/packages/app-lib/src/install/runner.rs b/packages/app-lib/src/install/runner.rs
index fa75a07e37..1de4ada72c 100644
--- a/packages/app-lib/src/install/runner.rs
+++ b/packages/app-lib/src/install/runner.rs
@@ -194,9 +194,9 @@ pub async fn retry_job(job_id: Uuid) -> crate::Result<InstallJobSnapshot> {
     };
     emit_install_job(&record.snapshot()).await?;
 
-	if let Err(error) =
-		Box::pin(prepare_initial_instance(&mut job.state, &state)).await
-	{
+    if let Err(error) =
+        Box::pin(prepare_initial_instance(&mut job.state, &state)).await
+    {
         let error_view = install_error_view(
             job.state.progress.phase,
             &error,
@@ -375,9 +375,9 @@ async fn start(request: InstallRequest) -> crate::Result<InstallJobSnapshot> {
         store::insert(id, &job_state, InstallJobStatus::Queued, &state).await?;
     emit_install_job(&record.snapshot()).await?;
 
-	if let Err(error) =
-		Box::pin(prepare_initial_instance(&mut job_state, &state)).await
-	{
+    if let Err(error) =
+        Box::pin(prepare_initial_instance(&mut job_state, &state)).await
+    {
         let error_view = install_error_view(
             job_state.progress.phase,
             &error,
@@ -446,16 +446,16 @@ async fn prepare_initial_instance(
             icon_config,
             link,
         } => {
-			let metadata = Box::pin(crate::api::instance::create(
-				name,
-				game_version,
-				loader,
-				loader_version,
-				icon_path,
-				icon_config,
-				link,
-			))
-			.await?;
+            let metadata = Box::pin(crate::api::instance::create(
+                name,
+                game_version,
+                loader,
+                loader_version,
+                icon_path,
+                icon_config,
+                link,
+            ))
+            .await?;
             set_display(
                 job_state,
                 metadata.instance.name,
@@ -493,16 +493,16 @@ async fn prepare_initial_instance(
                 .and_then(|edit| edit.link.clone())
                 .or_else(|| preview.link.clone())
                 .unwrap_or(InstanceLink::Unmanaged);
-			let metadata = Box::pin(crate::api::instance::create(
-				name,
-				preview.game_version,
-				preview.modloader,
-				preview.loader_version,
-				icon_path,
-				None,
-				link,
-			))
-			.await?;
+            let metadata = Box::pin(crate::api::instance::create(
+                name,
+                preview.game_version,
+                preview.modloader,
+                preview.loader_version,
+                icon_path,
+                None,
+                link,
+            ))
+            .await?;
             set_display(
                 job_state,
                 metadata.instance.name,
@@ -539,16 +539,16 @@ async fn prepare_initial_instance(
                         data.instance_icon_url.clone(),
                     )
                 };
-			let metadata = Box::pin(crate::api::instance::create(
-				data.name.clone(),
-				game_version,
-				loader,
-				loader_version,
-				icon_path,
-				None,
-				shared_link,
-			))
-			.await?;
+            let metadata = Box::pin(crate::api::instance::create(
+                data.name.clone(),
+                game_version,
+                loader,
+                loader_version,
+                icon_path,
+                None,
+                shared_link,
+            ))
+            .await?;
             set_display(
                 job_state,
                 metadata.instance.name,
@@ -562,16 +562,16 @@ async fn prepare_initial_instance(
         InstallRequest::ImportInstance {
             instance_folder, ..
         } => {
-			let metadata = Box::pin(crate::api::instance::create(
-				instance_folder,
-				"1.19.4".to_string(),
-				ModLoader::Vanilla,
-				Some("latest".to_string()),
-				None,
-				None,
-				InstanceLink::Unmanaged,
-			))
-			.await?;
+            let metadata = Box::pin(crate::api::instance::create(
+                instance_folder,
+                "1.19.4".to_string(),
+                ModLoader::Vanilla,
+                Some("latest".to_string()),
+                None,
+                None,
+                InstanceLink::Unmanaged,
+            ))
+            .await?;
             set_display(
                 job_state,
                 metadata.instance.name,
@@ -588,16 +588,16 @@ async fn prepare_initial_instance(
                             "Unknown instance".to_string(),
                         )
                     })?;
-			let created = Box::pin(crate::api::instance::create(
-				metadata.instance.name,
-				metadata.applied_content_set.game_version,
-				metadata.applied_content_set.loader,
-				metadata.applied_content_set.loader_version,
-				metadata.instance.icon_path,
-				None,
-				metadata.link,
-			))
-			.await?;
+            let created = Box::pin(crate::api::instance::create(
+                metadata.instance.name,
+                metadata.applied_content_set.game_version,
+                metadata.applied_content_set.loader,
+                metadata.applied_content_set.loader_version,
+                metadata.instance.icon_path,
+                None,
+                metadata.link,
+            ))
+            .await?;
             set_display(
                 job_state,
                 created.instance.name,
diff --git a/packages/app-lib/src/launcher/mod.rs b/packages/app-lib/src/launcher/mod.rs
index e71fc9e065..6d1adf6121 100644
--- a/packages/app-lib/src/launcher/mod.rs
+++ b/packages/app-lib/src/launcher/mod.rs
@@ -26,7 +26,7 @@ use daedalus as d;
 use daedalus::minecraft::{LoggingSide, RuleAction, VersionInfo};
 use daedalus::modded::{LoaderVersion, Manifest};
 use serde::Deserialize;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 use tokio::process::Command;
 
 mod args;
@@ -742,29 +742,37 @@ pub async fn install_minecraft_for_instance_id_with_reporter(
 pub async fn read_protocol_version_from_jar(
     path: PathBuf,
 ) -> crate::Result<Option<u32>> {
+    Ok(read_game_version_metadata_from_jar(&path)
+        .await?
+        .and_then(|data| data.protocol_version))
+}
+
+#[derive(Deserialize, Debug)]
+pub(crate) struct GameVersionMetadata {
+    pub(crate) protocol_version: Option<u32>,
+    pub(crate) world_version: Option<u32>,
+}
+
+/// Reads the game's embedded metadata, available from snapshot 18w47b onward.
+pub(crate) async fn read_game_version_metadata_from_jar(
+    path: &Path,
+) -> crate::Result<Option<GameVersionMetadata>> {
     let zip = async_zip::tokio::read::fs::ZipFileReader::new(path).await?;
-    let Some(entry_index) = zip
-        .file()
-        .entries()
-        .iter()
-        .position(|x| matches!(x.filename().as_str(), Ok("version.json")))
-    else {
+    let Some(entry_index) = zip.file().entries().iter().position(|entry| {
+        entry
+            .filename()
+            .as_str()
+            .is_ok_and(|name| name == "version.json")
+    }) else {
         return Ok(None);
     };
 
-    #[derive(Deserialize, Debug)]
-    struct VersionData {
-        protocol_version: Option<u32>,
-    }
-
-    let mut data = vec![];
+    let mut data = Vec::new();
     zip.reader_with_entry(entry_index)
         .await?
         .read_to_end_checked(&mut data)
         .await?;
-    let data: VersionData = serde_json::from_slice(&data)?;
-
-    Ok(data.protocol_version)
+    Ok(Some(serde_json::from_slice(&data)?))
 }
 
 fn link_project_and_version(

From 32fa3265690bb1a75ddf8a3aa7cf99100dabeffe Mon Sep 17 00:00:00 2001
From: "Calum H. (IMB11)" <contact@cal.engineer>
Date: Fri, 4 Sep 2026 18:41:10 +0100
Subject: [PATCH 32/33] fix: lint

---
 .../ui/settings/instances/instances-synced-settings/index.vue   | 2 +-
 apps/app-frontend/src/locales/en-US/index.json                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/app-frontend/src/components/ui/settings/instances/instances-synced-settings/index.vue b/apps/app-frontend/src/components/ui/settings/instances/instances-synced-settings/index.vue
index 37c5f1c96e..fa7c40b9f2 100644
--- a/apps/app-frontend/src/components/ui/settings/instances/instances-synced-settings/index.vue
+++ b/apps/app-frontend/src/components/ui/settings/instances/instances-synced-settings/index.vue
@@ -66,7 +66,7 @@ const messages = defineMessages({
 	},
 	gameSettingsDescription: {
 		id: 'app.settings.synced-options.game-settings.description',
-		defaultMessage: 'Use the same game options across your instances',
+		defaultMessage: 'Use the same game options across your instances.',
 	},
 	gameSettingsButton: {
 		id: 'app.settings.synced-options.game-settings.button',
diff --git a/apps/app-frontend/src/locales/en-US/index.json b/apps/app-frontend/src/locales/en-US/index.json
index 1c5e6de076..58ba6b6d86 100644
--- a/apps/app-frontend/src/locales/en-US/index.json
+++ b/apps/app-frontend/src/locales/en-US/index.json
@@ -2796,7 +2796,7 @@
     "message": "Settings added by mods will appear here after Modrinth finds them in one of your instances."
   },
   "app.settings.synced-options.game-settings.description": {
-    "message": "Use the same game options across your instances"
+    "message": "Use the same game options across your instances."
   },
   "app.settings.synced-options.game-settings.disable-all": {
     "message": "Unsync all"

From 316e6464a1e46a3fb8174d09fb70b73f14625799 Mon Sep 17 00:00:00 2001
From: "Calum H. (IMB11)" <contact@cal.engineer>
Date: Fri, 4 Sep 2026 18:57:07 +0100
Subject: [PATCH 33/33] fix: qa

---
 .../instances/game-settings-modal/row.vue     |   1 +
 .../game_options/catalog/data_versions.rs     | 127 ++++++++++++++++++
 .../game_options/catalog/mod.rs               |   2 +
 .../game_options/options_file.rs              |  34 ++---
 packages/ui/src/components/base/Slider.vue    |  12 +-
 5 files changed, 143 insertions(+), 33 deletions(-)
 create mode 100644 packages/app-lib/src/api/instance/synced_options/game_options/catalog/data_versions.rs

diff --git a/apps/app-frontend/src/components/ui/settings/instances/game-settings-modal/row.vue b/apps/app-frontend/src/components/ui/settings/instances/game-settings-modal/row.vue
index d696a12fde..d324e31ce1 100644
--- a/apps/app-frontend/src/components/ui/settings/instances/game-settings-modal/row.vue
+++ b/apps/app-frontend/src/components/ui/settings/instances/game-settings-modal/row.vue
@@ -296,6 +296,7 @@ function updateValue(value: string | number | boolean | undefined) {
 			<IconButton
 				:type="setting.sync_enabled ? 'outlined' : 'base'"
 				:color="setting.sync_enabled ? 'blue' : undefined"
+				:class="setting.sync_enabled ? '!bg-highlight-blue' : undefined"
 				:label="syncActionLabel"
 				:disabled="syncToggleDisabled"
 				:aria-pressed="setting.sync_enabled"
diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/catalog/data_versions.rs b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/data_versions.rs
new file mode 100644
index 0000000000..5e30337176
--- /dev/null
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/data_versions.rs
@@ -0,0 +1,127 @@
+use phf::phf_map;
+
+/// https://minecraft.wiki/w/Module:Protocol_version/Versions
+/// Covers 1.10-pre1, which introduced the options version field, through
+/// 18w47a, the last snapshot without embedded `version.json` metadata.
+pub(in crate::api::instance) const LEGACY_DATA_VERSIONS: phf::Map<&str, u32> = phf_map! {
+    "18w47a" => 1912,
+    "18w46a" => 1910,
+    "18w45a" => 1908,
+    "18w44a" => 1907,
+    "18w43c" => 1903,
+    "18w43b" => 1902,
+    "18w43a" => 1901,
+    "1.13.2" => 1631,
+    "1.13.2-pre2" => 1630,
+    "1.13.2-pre1" => 1629,
+    "1.13.1" => 1628,
+    "1.13.1-pre2" => 1627,
+    "1.13.1-pre1" => 1626,
+    "18w33a" => 1625,
+    "18w32a" => 1623,
+    "18w31a" => 1622,
+    "18w30b" => 1621,
+    "18w30a" => 1620,
+    "1.13" => 1519,
+    "1.13-pre10" => 1518,
+    "1.13-pre9" => 1517,
+    "1.13-pre8" => 1516,
+    "1.13-pre7" => 1513,
+    "1.13-pre6" => 1512,
+    "1.13-pre5" => 1511,
+    "1.13-pre4" => 1504,
+    "1.13-pre3" => 1503,
+    "1.13-pre2" => 1502,
+    "1.13-pre1" => 1501,
+    "18w22c" => 1499,
+    "18w22b" => 1498,
+    "18w22a" => 1497,
+    "18w21b" => 1496,
+    "18w21a" => 1495,
+    "18w20c" => 1493,
+    "18w20b" => 1491,
+    "18w20a" => 1489,
+    "18w19b" => 1485,
+    "18w19a" => 1484,
+    "18w16a" => 1483,
+    "18w15a" => 1482,
+    "18w14b" => 1481,
+    "18w14a" => 1479,
+    "18w11a" => 1478,
+    "18w10d" => 1477,
+    "18w10c" => 1476,
+    "18w10b" => 1474,
+    "18w10a" => 1473,
+    "18w09a" => 1472,
+    "18w08b" => 1471,
+    "18w08a" => 1470,
+    "18w07c" => 1469,
+    "18w07b" => 1468,
+    "18w07a" => 1467,
+    "18w06a" => 1466,
+    "18w05a" => 1464,
+    "18w03b" => 1463,
+    "18w03a" => 1462,
+    "18w02a" => 1461,
+    "18w01a" => 1459,
+    "17w50a" => 1457,
+    "17w49b" => 1455,
+    "17w49a" => 1454,
+    "17w48a" => 1453,
+    "17w47b" => 1452,
+    "17w47a" => 1451,
+    "17w46a" => 1449,
+    "17w45b" => 1448,
+    "17w45a" => 1447,
+    "17w43b" => 1445,
+    "17w43a" => 1444,
+    "1.12.2" => 1343,
+    "1.12.2-pre2" => 1342,
+    "1.12.2-pre1" => 1341,
+    "1.12.1" => 1241,
+    "1.12.1-pre1" => 1240,
+    "17w31a" => 1239,
+    "1.12" => 1139,
+    "1.12-pre7" => 1138,
+    "1.12-pre6" => 1137,
+    "1.12-pre5" => 1136,
+    "1.12-pre4" => 1135,
+    "1.12-pre3" => 1134,
+    "1.12-pre2" => 1133,
+    "1.12-pre1" => 1132,
+    "17w18b" => 1131,
+    "17w18a" => 1130,
+    "17w17b" => 1129,
+    "17w17a" => 1128,
+    "17w16b" => 1127,
+    "17w16a" => 1126,
+    "17w15a" => 1125,
+    "17w14a" => 1124,
+    "17w13b" => 1123,
+    "17w13a" => 1122,
+    "17w06a" => 1022,
+    "1.11.2" => 922,
+    "1.11.1" => 921,
+    "16w50a" => 920,
+    "1.11" => 819,
+    "1.11-pre1" => 818,
+    "16w44a" => 817,
+    "16w43a" => 816,
+    "16w42a" => 815,
+    "16w41a" => 814,
+    "16w40a" => 813,
+    "16w39c" => 812,
+    "16w39b" => 811,
+    "16w39a" => 809,
+    "16w38a" => 807,
+    "16w36a" => 805,
+    "16w35a" => 803,
+    "16w33a" => 802,
+    "16w32b" => 801,
+    "16w32a" => 800,
+    "1.10.2" => 512,
+    "1.10.1" => 511,
+    "1.10" => 510,
+    "1.10-pre2" => 507,
+    "1.10-pre1" => 506,
+};
diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/catalog/mod.rs b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/mod.rs
index 5389446c2f..4b4555ddfa 100644
--- a/packages/app-lib/src/api/instance/synced_options/game_options/catalog/mod.rs
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/mod.rs
@@ -6,6 +6,7 @@
 mod accessibility;
 mod chat;
 mod controls;
+mod data_versions;
 mod known_vanilla_keys;
 mod legacy_key_bindings;
 mod sound;
@@ -16,6 +17,7 @@ use super::api_types::{
     GameOptionEditorChoice, GameOptionEditorDefinition, GameOptionMappingKind,
 };
 
+pub(super) use data_versions::LEGACY_DATA_VERSIONS;
 use known_vanilla_keys::{KNOWN_VANILLA_KEYS, NEVER_SYNC_KEYS};
 pub(in crate::api::instance) use legacy_key_bindings::LEGACY_KEY_BINDINGS;
 pub(in crate::api::instance) use version_changes::*;
diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/options_file.rs b/packages/app-lib/src/api/instance/synced_options/game_options/options_file.rs
index 1168c49442..15213ba4a6 100644
--- a/packages/app-lib/src/api/instance/synced_options/game_options/options_file.rs
+++ b/packages/app-lib/src/api/instance/synced_options/game_options/options_file.rs
@@ -1,7 +1,7 @@
 //! Reads and edits `options.txt` without changing unrelated lines or file formatting.
 
 use super::super as synced_options;
-use super::catalog::release_version;
+use super::catalog::{LEGACY_DATA_VERSIONS, release_version};
 use super::{
     MAX_KEY_BYTES, MAX_OPTIONS_BYTES, MAX_OPTIONS_LINES, MAX_VALUE_BYTES,
     OPTIONS_FILE,
@@ -78,30 +78,14 @@ impl GameOptionsDocument {
         } else {
             None
         };
-        let data_version = match embedded_version {
-            Some(data_version) => Some(data_version),
-            None => match version.as_str() {
-                "1.10" => Some(510),
-                "1.10.1" => Some(511),
-                "1.10.2" => Some(512),
-                "1.11" => Some(819),
-                "1.11.1" => Some(921),
-                "1.11.2" => Some(922),
-                "1.12" => Some(1139),
-                "1.12.1" => Some(1241),
-                "1.12.2" => Some(1343),
-                "1.13" => Some(1519),
-                "1.13.1" => Some(1628),
-                "1.13.2" => Some(1631),
-                _ if release_version(version).is_some_and(
-                    |(major, minor, _)| major == 1 && minor < 10,
-                ) =>
-                {
-                    None
-                }
-                _ => return Ok(None),
-            },
-        };
+        let data_version = embedded_version
+            .or_else(|| LEGACY_DATA_VERSIONS.get(version.as_str()).copied());
+        if data_version.is_none()
+            && !release_version(version)
+                .is_some_and(|(major, minor, _)| major == 1 && minor < 10)
+        {
+            return Ok(None);
+        }
         let mut document = Self::empty();
         if let Some(data_version) = data_version {
             document.set("version", &data_version.to_string(), true)?;
diff --git a/packages/ui/src/components/base/Slider.vue b/packages/ui/src/components/base/Slider.vue
index a0006848b0..d8c7cbe750 100644
--- a/packages/ui/src/components/base/Slider.vue
+++ b/packages/ui/src/components/base/Slider.vue
@@ -2,7 +2,7 @@
 	<div class="flex w-full items-center gap-4">
 		<span
 			v-if="currentValue !== null"
-			class="shrink-0 whitespace-nowrap py-2 text-sm leading-5 text-secondary"
+			class="w-10 shrink-0 whitespace-nowrap py-2 text-right text-sm leading-5 text-secondary"
 		>
 			{{ min }}
 		</span>
@@ -48,7 +48,7 @@
 
 		<span
 			v-if="currentValue !== null"
-			class="shrink-0 whitespace-nowrap py-2 text-sm leading-5 text-secondary"
+			class="w-10 shrink-0 whitespace-nowrap py-2 text-left text-sm leading-5 text-secondary"
 		>
 			{{ formatValue(max) }}
 		</span>
@@ -58,7 +58,8 @@
 			type="number"
 			size="medium"
 			wrapper-class="slider-value shrink-0"
-			:style="{ width: valueInputWidth }"
+			:class="currentValue === null ? 'w-full' : 'w-[65px]'"
+			:input-class="currentValue === null ? undefined : 'text-center'"
 			:disabled="disabled"
 			:placeholder="placeholder"
 			:aria-label="ariaLabel"
@@ -105,11 +106,6 @@ const props = withDefaults(defineProps<Props>(), {
 
 const currentValue = ref(props.modelValue === null ? null : normalizeValue(props.modelValue))
 const currentPercentage = computed(() => getPercentage(currentValue.value ?? props.min))
-const valueInputWidth = computed(() =>
-	currentValue.value === null
-		? '100%'
-		: `calc(${Math.max(String(currentValue.value).length, 1)}ch + 2.125rem)`,
-)
 const visibleSnapPoints = computed(() =>
 	props.snapPoints.filter((snapPoint) => snapPoint >= props.min && snapPoint <= props.max),
 )