From aa4ce0cd0eecd6a43c4cd0b87fc3ba3f77f61e98 Mon Sep 17 00:00:00 2001
From: JanitorialMess <65749353+JanitorialMess@users.noreply.github.com>
Date: Mon, 30 Mar 2026 00:43:09 -0400
Subject: [PATCH 01/10] feat: add game-specific server presets

- Persist presets and last-selected preset names per game in JsonSetting
- Add ServerPresetModel plus preset name dialog for save/create flow
- Add preset picker and save/delete preset actions to the main window
- Store clustered state and blocked server keys in each preset
- Restore the last applied preset for the current game on load and game switch when the state is still clean
- Apply presets through a reset-first flow: clear current rules, switch clustered state if needed, then apply the preset's blocked set
- Track blocked server keys in-session so the current state can be saved without reading firewall rules back from the OS
- Clear the active preset selection and persisted last-selected preset when manual block/unblock or manual cluster changes dirty the current state
- Keep the last preset name as an in-session save suggestion so updating an existing preset does not require retyping it
- Use the full current ServerModels list for internal reset paths during preset apply, game switching, and cluster/uncluster transitions while keeping the user-facing Unblock All action filtered
- Update the cluster/uncluster button text after preset apply and manual view switches so it matches the actual active clustered state
- Add localized preset strings and a disabled empty-state UI when the current game has no presets
---
 ServerPickerX/Locales/Locale_de-de.axaml      |  14 +
 ServerPickerX/Locales/Locale_en-us.axaml      |  14 +
 ServerPickerX/Locales/Locale_es-es.axaml      |  14 +
 ServerPickerX/Locales/Locale_ja-jp.axaml      |  14 +
 ServerPickerX/Locales/Locale_pl-pl.axaml      |  14 +
 ServerPickerX/Locales/Locale_ru-ru.axaml      |  14 +
 ServerPickerX/Locales/Locale_sv-se.axaml      |  14 +
 ServerPickerX/Locales/Locale_tr-tr.axaml      |  14 +
 ServerPickerX/Locales/Locale_zh-cn.axaml      |  14 +
 ServerPickerX/Models/ServerPresetModel.cs     |  15 +
 .../Services/Settings/JsonSetting.cs          | 106 +++++-
 .../ViewModels/MainWindowViewModel.cs         | 359 +++++++++++++++++-
 ServerPickerX/Views/MainWindow.axaml          |  82 +++-
 ServerPickerX/Views/MainWindow.axaml.cs       | 215 +++++++++--
 .../Views/UserWindows/PresetNameWindow.axaml  |  75 ++++
 .../UserWindows/PresetNameWindow.axaml.cs     |  45 +++
 16 files changed, 977 insertions(+), 46 deletions(-)
 create mode 100644 ServerPickerX/Models/ServerPresetModel.cs
 create mode 100644 ServerPickerX/Views/UserWindows/PresetNameWindow.axaml
 create mode 100644 ServerPickerX/Views/UserWindows/PresetNameWindow.axaml.cs

diff --git a/ServerPickerX/Locales/Locale_de-de.axaml b/ServerPickerX/Locales/Locale_de-de.axaml
index 5a980c2..444d60e 100644
--- a/ServerPickerX/Locales/Locale_de-de.axaml
+++ b/ServerPickerX/Locales/Locale_de-de.axaml
@@ -5,18 +5,32 @@
   <x:String x:Key="UnclusterServers">Server entgruppieren</x:String>
   <x:String x:Key="Refresh">Aktualisieren</x:String>
   <x:String x:Key="SearchForServers">Nach Servern suchen...</x:String>
+  <x:String x:Key="NoPresets">Keine Presets</x:String>
   <x:String x:Key="BlockAll">Alle blockieren</x:String>
   <x:String x:Key="BlockSelected">Ausgewählte blockieren</x:String>
   <x:String x:Key="UnblockAll">Alle freigeben</x:String>
   <x:String x:Key="UnblockSelected">Ausgewählte freigeben</x:String>
+  <x:String x:Key="SavePreset">Preset speichern</x:String>
+  <x:String x:Key="DeletePreset">Preset löschen</x:String>
+  <x:String x:Key="SaveButtonText">Speichern</x:String>
+  <x:String x:Key="CancelButtonText">Abbrechen</x:String>
   <x:String x:Key="CheckForNewVersion">Bei Start nach neuen Versionen suchen</x:String>
   <x:String x:Key="ResetFirewall">Brandmauer zurücksetzen</x:String>
   <x:String x:Key="GameModeToolTip">Spielmodus auswählen</x:String>
+  <x:String x:Key="PresetToolTip">Preset auswählen</x:String>
   <x:String x:Key="ClusterUnclusterToolTip">Server gruppieren oder entgruppieren</x:String>
   <x:String x:Key="RefreshToolTip">Ping aller Server aktualisieren</x:String>
+  <x:String x:Key="SavePresetToolTip">Aktuell blockierte Server als Preset speichern</x:String>
+  <x:String x:Key="DeletePresetToolTip">Ausgewähltes Preset löschen</x:String>
   <x:String x:Key="SwapGameModeUnblockAllConflict">Diese Aktion wird zuerst alle Server freigeben, um Firewall-Konflikte zu vermeiden.</x:String>
+  <x:String x:Key="PresetDeleteConfirmDialogue">Preset '{0}' löschen?</x:String>
+  <x:String x:Key="PresetOverwriteConfirmDialogue">Ein Preset mit dem Namen '{0}' existiert für dieses Spiel bereits. Überschreiben?</x:String>
+  <x:String x:Key="PresetNameRequiredDialogue">Der Preset-Name darf nicht leer sein.</x:String>
   <x:String x:Key="LanguageComboBoxToolTip">Sprache auswählen</x:String>
   <x:String x:Key="ResetFirewallToolTip">Firewall-Regeln zurücksetzen</x:String>
+  <x:String x:Key="PresetNameTitle">Preset speichern</x:String>
+  <x:String x:Key="PresetNamePrompt">Einen Preset-Namen für das aktuelle Spiel eingeben.</x:String>
+  <x:String x:Key="PresetNameWatermark">Preset-Name</x:String>
   <x:String x:Key="MessageBoxInfoTitle">Info</x:String>
   <x:String x:Key="SyncServersUnblockAllDialogue">Die Serverdaten wurden soeben von Valve aktualisiert! Alle gesperrten Server werden entsperrt, um die neuen Serverdaten zu synchronisieren.</x:String>
   <x:String x:Key="NewVersionDialogue">Neue Version verfügbar! Zu den Veröffentlichungen?</x:String>
diff --git a/ServerPickerX/Locales/Locale_en-us.axaml b/ServerPickerX/Locales/Locale_en-us.axaml
index 39c4570..59a1bb5 100644
--- a/ServerPickerX/Locales/Locale_en-us.axaml
+++ b/ServerPickerX/Locales/Locale_en-us.axaml
@@ -5,18 +5,32 @@
   <x:String x:Key="UnclusterServers">Uncluster Servers</x:String>
   <x:String x:Key="Refresh">Refresh</x:String>
   <x:String x:Key="SearchForServers">Search for servers...</x:String>
+  <x:String x:Key="NoPresets">No presets</x:String>
   <x:String x:Key="BlockAll">Block All</x:String>
   <x:String x:Key="BlockSelected">Block Selected</x:String>
   <x:String x:Key="UnblockAll">Unblock All</x:String>
   <x:String x:Key="UnblockSelected">Unblock Selected</x:String>
+  <x:String x:Key="SavePreset">Save Preset</x:String>
+  <x:String x:Key="DeletePreset">Delete Preset</x:String>
+  <x:String x:Key="SaveButtonText">Save</x:String>
+  <x:String x:Key="CancelButtonText">Cancel</x:String>
   <x:String x:Key="CheckForNewVersion">Check for new version on startup</x:String>
   <x:String x:Key="ResetFirewall">Reset Firewall</x:String>
   <x:String x:Key="GameModeToolTip">Select game mode</x:String>
+  <x:String x:Key="PresetToolTip">Select preset</x:String>
   <x:String x:Key="ClusterUnclusterToolTip">Group or ungroup servers</x:String>
   <x:String x:Key="RefreshToolTip">Refresh all server ping</x:String>
+  <x:String x:Key="SavePresetToolTip">Save the current blocked servers as a preset</x:String>
+  <x:String x:Key="DeletePresetToolTip">Delete the selected preset</x:String>
   <x:String x:Key="SwapGameModeUnblockAllConflict">This action will unblock all servers first to prevent firewall conflicts.</x:String>
+  <x:String x:Key="PresetDeleteConfirmDialogue">Delete the preset '{0}'?</x:String>
+  <x:String x:Key="PresetOverwriteConfirmDialogue">A preset named '{0}' already exists for this game. Overwrite it?</x:String>
+  <x:String x:Key="PresetNameRequiredDialogue">Preset name cannot be empty.</x:String>
   <x:String x:Key="LanguageComboBoxToolTip">Select language</x:String>
   <x:String x:Key="ResetFirewallToolTip">Reset firewall rules</x:String>
+  <x:String x:Key="PresetNameTitle">Save Preset</x:String>
+  <x:String x:Key="PresetNamePrompt">Enter a preset name for the current game.</x:String>
+  <x:String x:Key="PresetNameWatermark">Preset name</x:String>
   <x:String x:Key="MessageBoxInfoTitle">Info</x:String>
   <x:String x:Key="SyncServersUnblockAllDialogue">Server data just got updated by Valve! All blocked servers will be unblocked in order to synchronize new server data</x:String>
   <x:String x:Key="NewVersionDialogue">New version available! Go to releases?</x:String>
diff --git a/ServerPickerX/Locales/Locale_es-es.axaml b/ServerPickerX/Locales/Locale_es-es.axaml
index 6879e10..e060948 100644
--- a/ServerPickerX/Locales/Locale_es-es.axaml
+++ b/ServerPickerX/Locales/Locale_es-es.axaml
@@ -5,18 +5,32 @@
   <x:String x:Key="UnclusterServers">Servidores Uncluster</x:String>
   <x:String x:Key="Refresh">Refrescar</x:String>
   <x:String x:Key="SearchForServers">Buscar servidores...</x:String>
+  <x:String x:Key="NoPresets">No hay presets</x:String>
   <x:String x:Key="BlockAll">Bloquear Todo</x:String>
   <x:String x:Key="BlockSelected">Bloque Seleccionado</x:String>
   <x:String x:Key="UnblockAll">Desbloquear Todo</x:String>
   <x:String x:Key="UnblockSelected">Desbloquear Seleccionado</x:String>
+  <x:String x:Key="SavePreset">Guardar preset</x:String>
+  <x:String x:Key="DeletePreset">Eliminar preset</x:String>
+  <x:String x:Key="SaveButtonText">Guardar</x:String>
+  <x:String x:Key="CancelButtonText">Cancelar</x:String>
   <x:String x:Key="CheckForNewVersion">Comprobar si hay nueva versión al iniciar</x:String>
   <x:String x:Key="ResetFirewall">Restablecer el cortafuegos</x:String>
   <x:String x:Key="GameModeToolTip">Seleccionar modo de juego</x:String>
+  <x:String x:Key="PresetToolTip">Seleccionar preset</x:String>
   <x:String x:Key="ClusterUnclusterToolTip">Agrupar o desagrupar servidores</x:String>
   <x:String x:Key="RefreshToolTip">Actualizar el ping de todos los servidores</x:String>
+  <x:String x:Key="SavePresetToolTip">Guardar los servidores bloqueados actuales como un preset</x:String>
+  <x:String x:Key="DeletePresetToolTip">Eliminar el preset seleccionado</x:String>
   <x:String x:Key="SwapGameModeUnblockAllConflict">Esta acción desbloqueará primero todos los servidores para evitar conflictos de firewall.</x:String>
+  <x:String x:Key="PresetDeleteConfirmDialogue">¿Eliminar el preset '{0}'?</x:String>
+  <x:String x:Key="PresetOverwriteConfirmDialogue">Ya existe un preset llamado '{0}' para este juego. ¿Sobrescribirlo?</x:String>
+  <x:String x:Key="PresetNameRequiredDialogue">El nombre del preset no puede estar vacío.</x:String>
   <x:String x:Key="LanguageComboBoxToolTip">Seleccionar idioma</x:String>
   <x:String x:Key="ResetFirewallToolTip">Restablecer reglas del firewall</x:String>
+  <x:String x:Key="PresetNameTitle">Guardar preset</x:String>
+  <x:String x:Key="PresetNamePrompt">Introduce un nombre de preset para el juego actual.</x:String>
+  <x:String x:Key="PresetNameWatermark">Nombre del preset</x:String>
   <x:String x:Key="MessageBoxInfoTitle">Información</x:String>
   <x:String x:Key="SyncServersUnblockAllDialogue">¡Valve acaba de actualizar los datos del servidor! Todos los servidores bloqueados serán desbloqueados para sincronizar los nuevos datos.</x:String>
   <x:String x:Key="NewVersionDialogue">¡Nueva versión disponible! ¿Ir a lanzamientos?</x:String>
diff --git a/ServerPickerX/Locales/Locale_ja-jp.axaml b/ServerPickerX/Locales/Locale_ja-jp.axaml
index aff28c6..d65cad4 100644
--- a/ServerPickerX/Locales/Locale_ja-jp.axaml
+++ b/ServerPickerX/Locales/Locale_ja-jp.axaml
@@ -5,18 +5,32 @@
   <x:String x:Key="UnclusterServers">サーバーのグループ解除</x:String>
   <x:String x:Key="Refresh">更新</x:String>
   <x:String x:Key="SearchForServers">サーバーを検索...</x:String>
+  <x:String x:Key="NoPresets">プリセットなし</x:String>
   <x:String x:Key="BlockAll">すべてブロック</x:String>
   <x:String x:Key="BlockSelected">選択したサーバーをブロック</x:String>
   <x:String x:Key="UnblockAll">すべて解除</x:String>
   <x:String x:Key="UnblockSelected">選択したサーバーを解除</x:String>
+  <x:String x:Key="SavePreset">プリセットを保存</x:String>
+  <x:String x:Key="DeletePreset">プリセットを削除</x:String>
+  <x:String x:Key="SaveButtonText">保存</x:String>
+  <x:String x:Key="CancelButtonText">キャンセル</x:String>
   <x:String x:Key="CheckForNewVersion">起動時に新しいバージョンを確認</x:String>
   <x:String x:Key="ResetFirewall">ファイアウォールをリセット</x:String>
   <x:String x:Key="GameModeToolTip">ゲームモードを選択</x:String>
+  <x:String x:Key="PresetToolTip">プリセットを選択</x:String>
   <x:String x:Key="ClusterUnclusterToolTip">サーバーをグループ化またはグループ解除</x:String>
   <x:String x:Key="RefreshToolTip">すべてのサーバーの ping を更新</x:String>
+  <x:String x:Key="SavePresetToolTip">現在ブロック中のサーバーをプリセットとして保存</x:String>
+  <x:String x:Key="DeletePresetToolTip">選択したプリセットを削除</x:String>
   <x:String x:Key="SwapGameModeUnblockAllConflict">この操作は、ファイアウォールの競合を防ぐためにまずすべてのサーバーを解除します。</x:String>
+  <x:String x:Key="PresetDeleteConfirmDialogue">プリセット '{0}' を削除しますか？</x:String>
+  <x:String x:Key="PresetOverwriteConfirmDialogue">このゲームには '{0}' という名前のプリセットが既にあります。上書きしますか？</x:String>
+  <x:String x:Key="PresetNameRequiredDialogue">プリセット名は空にできません。</x:String>
   <x:String x:Key="LanguageComboBoxToolTip">言語を選択</x:String>
   <x:String x:Key="ResetFirewallToolTip">ファイアウォールルールをリセット</x:String>
+  <x:String x:Key="PresetNameTitle">プリセットを保存</x:String>
+  <x:String x:Key="PresetNamePrompt">現在のゲーム用のプリセット名を入力してください。</x:String>
+  <x:String x:Key="PresetNameWatermark">プリセット名</x:String>
   <x:String x:Key="MessageBoxInfoTitle">情報</x:String>
   <x:String x:Key="SyncServersUnblockAllDialogue">Valveによってサーバーデータが更新されました！新しいサーバーデータを同期するために、ブロックされていたすべてのサーバーのブロックが解除されます。</x:String>
   <x:String x:Key="NewVersionDialogue">新バージョンがリリースされました！リリース一覧へどうぞ。</x:String>
diff --git a/ServerPickerX/Locales/Locale_pl-pl.axaml b/ServerPickerX/Locales/Locale_pl-pl.axaml
index 84b0b97..4e4bd73 100644
--- a/ServerPickerX/Locales/Locale_pl-pl.axaml
+++ b/ServerPickerX/Locales/Locale_pl-pl.axaml
@@ -5,18 +5,32 @@
   <x:String x:Key="UnclusterServers">Serwery Uncluster</x:String>
   <x:String x:Key="Refresh">Odświeżać</x:String>
   <x:String x:Key="SearchForServers">Wyszukaj serwery...</x:String>
+  <x:String x:Key="NoPresets">Brak presetów</x:String>
   <x:String x:Key="BlockAll">Zablokuj wszystko</x:String>
   <x:String x:Key="BlockSelected">Blok wybrany</x:String>
   <x:String x:Key="UnblockAll">Odblokuj wszystko</x:String>
   <x:String x:Key="UnblockSelected">Odblokuj wybrane</x:String>
+  <x:String x:Key="SavePreset">Zapisz preset</x:String>
+  <x:String x:Key="DeletePreset">Usuń preset</x:String>
+  <x:String x:Key="SaveButtonText">Zapisz</x:String>
+  <x:String x:Key="CancelButtonText">Anuluj</x:String>
   <x:String x:Key="CheckForNewVersion">Sprawdź nową wersję podczas uruchamiania</x:String>
   <x:String x:Key="ResetFirewall">Zresetuj zaporę sieciową</x:String>
   <x:String x:Key="GameModeToolTip">Wybierz Tryb gry</x:String>
+  <x:String x:Key="PresetToolTip">Wybierz preset</x:String>
   <x:String x:Key="ClusterUnclusterToolTip">Grupowanie lub rozgrupowywanie serwerów</x:String>
   <x:String x:Key="RefreshToolTip">Odśwież ping wszystkich serwerów</x:String>
+  <x:String x:Key="SavePresetToolTip">Zapisz aktualnie zablokowane serwery jako preset</x:String>
+  <x:String x:Key="DeletePresetToolTip">Usuń wybrany preset</x:String>
   <x:String x:Key="SwapGameModeUnblockAllConflict">Ta czynność odblokuje najpierw wszystkie serwery, aby zapobiec konfliktom z zaporą sieciową.</x:String>
+  <x:String x:Key="PresetDeleteConfirmDialogue">Usunąć preset '{0}'?</x:String>
+  <x:String x:Key="PresetOverwriteConfirmDialogue">Preset o nazwie '{0}' już istnieje dla tej gry. Nadpisać?</x:String>
+  <x:String x:Key="PresetNameRequiredDialogue">Nazwa presetu nie może być pusta.</x:String>
   <x:String x:Key="LanguageComboBoxToolTip">Wybierz język</x:String>
   <x:String x:Key="ResetFirewallToolTip">Zresetuj reguły zapory sieciowej</x:String>
+  <x:String x:Key="PresetNameTitle">Zapisz preset</x:String>
+  <x:String x:Key="PresetNamePrompt">Wpisz nazwę presetu dla bieżącej gry.</x:String>
+  <x:String x:Key="PresetNameWatermark">Nazwa presetu</x:String>
   <x:String x:Key="MessageBoxInfoTitle">informacje</x:String>
   <x:String x:Key="SyncServersUnblockAllDialogue">Valve właśnie zaktualizowało dane serwera! Wszystkie zablokowane serwery zostaną odblokowane, aby zsynchronizować nowe dane serwera.</x:String>
   <x:String x:Key="NewVersionDialogue">Nowa wersja dostępna! Przejdź do wydań?</x:String>
diff --git a/ServerPickerX/Locales/Locale_ru-ru.axaml b/ServerPickerX/Locales/Locale_ru-ru.axaml
index 46c46e6..ac98607 100644
--- a/ServerPickerX/Locales/Locale_ru-ru.axaml
+++ b/ServerPickerX/Locales/Locale_ru-ru.axaml
@@ -5,18 +5,32 @@
   <x:String x:Key="UnclusterServers">Разгруппировать серверы</x:String>
   <x:String x:Key="Refresh">Обновить</x:String>
   <x:String x:Key="SearchForServers">Поиск серверов...</x:String>
+  <x:String x:Key="NoPresets">Нет пресетов</x:String>
   <x:String x:Key="BlockAll">Блокировать все</x:String>
   <x:String x:Key="BlockSelected">Блокировать выбранные</x:String>
   <x:String x:Key="UnblockAll">Разблокировать все</x:String>
   <x:String x:Key="UnblockSelected">Разблокировать выбранные</x:String>
+  <x:String x:Key="SavePreset">Сохранить пресет</x:String>
+  <x:String x:Key="DeletePreset">Удалить пресет</x:String>
+  <x:String x:Key="SaveButtonText">Сохранить</x:String>
+  <x:String x:Key="CancelButtonText">Отмена</x:String>
   <x:String x:Key="CheckForNewVersion">Проверять новые версии при запуске</x:String>
   <x:String x:Key="ResetFirewall">Сбросить брандмауэр</x:String>
   <x:String x:Key="GameModeToolTip">Выберите режим игры</x:String>
+  <x:String x:Key="PresetToolTip">Выбрать пресет</x:String>
   <x:String x:Key="ClusterUnclusterToolTip">Группировать или разгруппировать серверы</x:String>
   <x:String x:Key="RefreshToolTip">Обновить пинг всех серверов</x:String>
+  <x:String x:Key="SavePresetToolTip">Сохранить текущие заблокированные серверы как пресет</x:String>
+  <x:String x:Key="DeletePresetToolTip">Удалить выбранный пресет</x:String>
   <x:String x:Key="SwapGameModeUnblockAllConflict">Это действие сначала разблокирует все сервера для предотвращения конфликтов брандмауэра.</x:String>
+  <x:String x:Key="PresetDeleteConfirmDialogue">Удалить пресет '{0}'?</x:String>
+  <x:String x:Key="PresetOverwriteConfirmDialogue">Пресет с именем '{0}' уже существует для этой игры. Перезаписать его?</x:String>
+  <x:String x:Key="PresetNameRequiredDialogue">Имя пресета не может быть пустым.</x:String>
   <x:String x:Key="LanguageComboBoxToolTip">Выберите язык</x:String>
   <x:String x:Key="ResetFirewallToolTip">Сбросить правила брандмауэра</x:String>
+  <x:String x:Key="PresetNameTitle">Сохранить пресет</x:String>
+  <x:String x:Key="PresetNamePrompt">Введите имя пресета для текущей игры.</x:String>
+  <x:String x:Key="PresetNameWatermark">Имя пресета</x:String>
   <x:String x:Key="MessageBoxInfoTitle">информация</x:String>
   <x:String x:Key="SyncServersUnblockAllDialogue">Valve обновила данные серверов! Все заблокированные серверы будут разблокированы для синхронизации новых данных.</x:String>
   <x:String x:Key="NewVersionDialogue">Доступна новая версия! Перейти к релизам?</x:String>
diff --git a/ServerPickerX/Locales/Locale_sv-se.axaml b/ServerPickerX/Locales/Locale_sv-se.axaml
index 3f625da..4e905a6 100644
--- a/ServerPickerX/Locales/Locale_sv-se.axaml
+++ b/ServerPickerX/Locales/Locale_sv-se.axaml
@@ -5,18 +5,32 @@
   <x:String x:Key="UnclusterServers">Avgruppera servrar</x:String>
   <x:String x:Key="Refresh">Uppdatera</x:String>
   <x:String x:Key="SearchForServers">Sök efter servrar...</x:String>
+  <x:String x:Key="NoPresets">Inga förinställningar</x:String>
   <x:String x:Key="BlockAll">Blockera alla</x:String>
   <x:String x:Key="BlockSelected">Blockera valda</x:String>
   <x:String x:Key="UnblockAll">Avblockera alla</x:String>
   <x:String x:Key="UnblockSelected">Avblockera valda</x:String>
+  <x:String x:Key="SavePreset">Spara förinställning</x:String>
+  <x:String x:Key="DeletePreset">Ta bort förinställning</x:String>
+  <x:String x:Key="SaveButtonText">Spara</x:String>
+  <x:String x:Key="CancelButtonText">Avbryt</x:String>
   <x:String x:Key="CheckForNewVersion">Kontrollera efter ny version vid start</x:String>
   <x:String x:Key="ResetFirewall">Återställ brandvägg</x:String>
   <x:String x:Key="GameModeToolTip">Välj spelläge</x:String>
+  <x:String x:Key="PresetToolTip">Välj förinställning</x:String>
   <x:String x:Key="ClusterUnclusterToolTip">Gruppera eller avgruppera servrar</x:String>
   <x:String x:Key="RefreshToolTip">Uppdatera ping för alla servrar</x:String>
+  <x:String x:Key="SavePresetToolTip">Spara de nuvarande blockerade servrarna som en förinställning</x:String>
+  <x:String x:Key="DeletePresetToolTip">Ta bort den valda förinställningen</x:String>
   <x:String x:Key="SwapGameModeUnblockAllConflict">Detta åtgärder kommer att avblockera alla servrar först för att undvika brandvägskonflikter.</x:String>
+  <x:String x:Key="PresetDeleteConfirmDialogue">Ta bort förinställningen '{0}'?</x:String>
+  <x:String x:Key="PresetOverwriteConfirmDialogue">En förinställning med namnet '{0}' finns redan för det här spelet. Skriva över den?</x:String>
+  <x:String x:Key="PresetNameRequiredDialogue">Namnet på förinställningen får inte vara tomt.</x:String>
   <x:String x:Key="LanguageComboBoxToolTip">Välj språk</x:String>
   <x:String x:Key="ResetFirewallToolTip">Återställ brandväggsregler</x:String>
+  <x:String x:Key="PresetNameTitle">Spara förinställning</x:String>
+  <x:String x:Key="PresetNamePrompt">Ange ett namn på förinställningen för det aktuella spelet.</x:String>
+  <x:String x:Key="PresetNameWatermark">Namn på förinställning</x:String>
   <x:String x:Key="MessageBoxInfoTitle">info</x:String>
   <x:String x:Key="SyncServersUnblockAllDialogue">Serverdata har precis uppdaterats av Valve! Alla blockerade servrar kommer att avblockeras för att synkronisera ny serverdata.</x:String>
   <x:String x:Key="NewVersionDialogue">Ny version tillgänglig! Gå till utgåvor?</x:String>
diff --git a/ServerPickerX/Locales/Locale_tr-tr.axaml b/ServerPickerX/Locales/Locale_tr-tr.axaml
index ae65a1e..bf6316d 100644
--- a/ServerPickerX/Locales/Locale_tr-tr.axaml
+++ b/ServerPickerX/Locales/Locale_tr-tr.axaml
@@ -5,18 +5,32 @@
   <x:String x:Key="UnclusterServers">Sunucu kümelemeyi kaldır</x:String>
   <x:String x:Key="Refresh">Yenile</x:String>
   <x:String x:Key="SearchForServers">Sunucu ara...</x:String>
+  <x:String x:Key="NoPresets">Ön ayar yok</x:String>
   <x:String x:Key="BlockAll">Tümünü engelle</x:String>
   <x:String x:Key="BlockSelected">Seçili olanları engelle</x:String>
   <x:String x:Key="UnblockAll">Tüm engellemeleri kaldır</x:String>
   <x:String x:Key="UnblockSelected">Seçili engellemeleri kaldır</x:String>
+  <x:String x:Key="SavePreset">Ön ayarı kaydet</x:String>
+  <x:String x:Key="DeletePreset">Ön ayarı sil</x:String>
+  <x:String x:Key="SaveButtonText">Kaydet</x:String>
+  <x:String x:Key="CancelButtonText">İptal</x:String>
   <x:String x:Key="CheckForNewVersion">Başlangıçta yeni versiyonları denetle</x:String>
   <x:String x:Key="ResetFirewall">Güvenlik duvarını sıfırla</x:String>
   <x:String x:Key="GameModeToolTip">Oyunu seç</x:String>
+  <x:String x:Key="PresetToolTip">Ön ayar seç</x:String>
   <x:String x:Key="ClusterUnclusterToolTip">Sunucuları grupla veya gruplamayı kaldır</x:String>
   <x:String x:Key="RefreshToolTip">Tüm sunucu gecikmelerini yenile</x:String>
+  <x:String x:Key="SavePresetToolTip">Geçerli engellenen sunucuları ön ayar olarak kaydet</x:String>
+  <x:String x:Key="DeletePresetToolTip">Seçili ön ayarı sil</x:String>
   <x:String x:Key="SwapGameModeUnblockAllConflict">Bu işlem, güvenlik duvarı çakışmalarını önlemek amacıyla önce tüm sunucuların engellemelerini kaldıracak.</x:String>
+  <x:String x:Key="PresetDeleteConfirmDialogue">'{0}' ön ayarı silinsin mi?</x:String>
+  <x:String x:Key="PresetOverwriteConfirmDialogue">Bu oyun için '{0}' adında bir ön ayar zaten var. Üzerine yazılsın mı?</x:String>
+  <x:String x:Key="PresetNameRequiredDialogue">Ön ayar adı boş olamaz.</x:String>
   <x:String x:Key="LanguageComboBoxToolTip">Dil seç</x:String>
   <x:String x:Key="ResetFirewallToolTip">Güvenlik duvarı kurallarını sıfırla</x:String>
+  <x:String x:Key="PresetNameTitle">Ön ayarı kaydet</x:String>
+  <x:String x:Key="PresetNamePrompt">Geçerli oyun için bir ön ayar adı girin.</x:String>
+  <x:String x:Key="PresetNameWatermark">Ön ayar adı</x:String>
   <x:String x:Key="MessageBoxInfoTitle">Bilgi</x:String>
   <x:String x:Key="SyncServersUnblockAllDialogue">Sunucu verileri Valve tarafından güncellendi! Yeni sunucu verilerini senkronize etmek için tüm engellenen sunucuların engelleri kaldırılacak</x:String>
   <x:String x:Key="NewVersionDialogue">Yeni sürüm yayınlandı! Güncelle?</x:String>
diff --git a/ServerPickerX/Locales/Locale_zh-cn.axaml b/ServerPickerX/Locales/Locale_zh-cn.axaml
index 897e933..4d0b386 100644
--- a/ServerPickerX/Locales/Locale_zh-cn.axaml
+++ b/ServerPickerX/Locales/Locale_zh-cn.axaml
@@ -5,18 +5,32 @@
   <x:String x:Key="UnclusterServers">解组服务器</x:String>
   <x:String x:Key="Refresh">刷新</x:String>
   <x:String x:Key="SearchForServers">搜索服务器...</x:String>
+  <x:String x:Key="NoPresets">无预设</x:String>
   <x:String x:Key="BlockAll">全部阻止</x:String>
   <x:String x:Key="BlockSelected">块选定</x:String>
   <x:String x:Key="UnblockAll">全部解锁</x:String>
   <x:String x:Key="UnblockSelected">取消阻止所选内容</x:String>
+  <x:String x:Key="SavePreset">保存预设</x:String>
+  <x:String x:Key="DeletePreset">删除预设</x:String>
+  <x:String x:Key="SaveButtonText">保存</x:String>
+  <x:String x:Key="CancelButtonText">取消</x:String>
   <x:String x:Key="CheckForNewVersion">启动时检查新版本</x:String>
   <x:String x:Key="ResetFirewall">重置防火墙</x:String>
   <x:String x:Key="GameModeToolTip">选择游戏模式</x:String>
+  <x:String x:Key="PresetToolTip">选择预设</x:String>
   <x:String x:Key="ClusterUnclusterToolTip">分组或取消分组服务器</x:String>
   <x:String x:Key="RefreshToolTip">刷新所有服务器 ping</x:String>
+  <x:String x:Key="SavePresetToolTip">将当前已屏蔽的服务器保存为预设</x:String>
+  <x:String x:Key="DeletePresetToolTip">删除所选预设</x:String>
   <x:String x:Key="SwapGameModeUnblockAllConflict">此操作将首先解除所有服务器的阻止，以防止防火墙冲突。</x:String>
+  <x:String x:Key="PresetDeleteConfirmDialogue">要删除预设“{0}”吗？</x:String>
+  <x:String x:Key="PresetOverwriteConfirmDialogue">此游戏已存在名为“{0}”的预设。要覆盖吗？</x:String>
+  <x:String x:Key="PresetNameRequiredDialogue">预设名称不能为空。</x:String>
   <x:String x:Key="LanguageComboBoxToolTip">选择语言</x:String>
   <x:String x:Key="ResetFirewallToolTip">重置防火墙规则</x:String>
+  <x:String x:Key="PresetNameTitle">保存预设</x:String>
+  <x:String x:Key="PresetNamePrompt">为当前游戏输入一个预设名称。</x:String>
+  <x:String x:Key="PresetNameWatermark">预设名称</x:String>
   <x:String x:Key="MessageBoxInfoTitle">信息</x:String>
   <x:String x:Key="SyncServersUnblockAllDialogue">Valve刚刚更新了服务器数据！所有被屏蔽的服务器都将被解除屏蔽，以便同步新的服务器数据。</x:String>
   <x:String x:Key="NewVersionDialogue">新版本已发布！前往发布页面？</x:String>
diff --git a/ServerPickerX/Models/ServerPresetModel.cs b/ServerPickerX/Models/ServerPresetModel.cs
new file mode 100644
index 0000000..1fb2070
--- /dev/null
+++ b/ServerPickerX/Models/ServerPresetModel.cs
@@ -0,0 +1,15 @@
+using System.Collections.Generic;
+
+namespace ServerPickerX.Models
+{
+    public class ServerPresetModel
+    {
+        public string Name { get; set; } = string.Empty;
+
+        public string GameMode { get; set; } = string.Empty;
+
+        public bool IsClustered { get; set; }
+
+        public List<string> BlockedServerKeys { get; set; } = [];
+    }
+}
diff --git a/ServerPickerX/Services/Settings/JsonSetting.cs b/ServerPickerX/Services/Settings/JsonSetting.cs
index 30e1264..c72cdb5 100644
--- a/ServerPickerX/Services/Settings/JsonSetting.cs
+++ b/ServerPickerX/Services/Settings/JsonSetting.cs
@@ -1,13 +1,15 @@
-
 using ServerPickerX.Constants;
 using ServerPickerX.Helpers;
+using ServerPickerX.Models;
 using ServerPickerX.Services.DependencyInjection;
 using ServerPickerX.Services.Loggers;
 using ServerPickerX.Services.MessageBoxes;
 using ServerPickerX.Services.Settings;
 using System;
+using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
+using System.Linq;
 using System.Text;
 using System.Text.Json;
 using System.Text.Json.Serialization;
@@ -41,6 +43,10 @@ public class JsonSetting : ISetting
 
         public virtual bool version_check_on_startup { get; set; } = true;
 
+        public virtual List<ServerPresetModel> server_presets { get; set; } = [];
+
+        public virtual Dictionary<string, string> last_selected_preset_names { get; set; } = new(StringComparer.OrdinalIgnoreCase);
+
         [JsonIgnore]
         public readonly string jsonFilePath = "./settings.json";
 
@@ -96,6 +102,10 @@ public async Task LoadSettingsAsync()
                 marathon_server_revision = localSettings.marathon_server_revision;
                 is_clustered = localSettings.is_clustered;
                 version_check_on_startup = localSettings.version_check_on_startup;
+                server_presets = localSettings.server_presets ?? [];
+                last_selected_preset_names = localSettings.last_selected_preset_names != null
+                    ? new Dictionary<string, string>(localSettings.last_selected_preset_names, StringComparer.OrdinalIgnoreCase)
+                    : new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
             }
             catch (Exception ex)
             {
@@ -192,5 +202,99 @@ public async Task SetLanguageAsync(string language)
 
             await this.SaveSettingsAsync();
         }
+
+        public string GetLastSelectedPresetNameByGameMode()
+        {
+            if (string.IsNullOrWhiteSpace(game_mode))
+            {
+                return string.Empty;
+            }
+
+            return last_selected_preset_names.TryGetValue(game_mode, out string? presetName)
+                ? presetName
+                : string.Empty;
+        }
+
+        public async Task SetLastSelectedPresetNameByGameModeAsync(string presetName)
+        {
+            if (string.IsNullOrWhiteSpace(game_mode))
+            {
+                return;
+            }
+
+            last_selected_preset_names[game_mode] = presetName;
+
+            await SaveSettingsAsync();
+        }
+
+        public async Task ClearLastSelectedPresetNameByGameModeAsync()
+        {
+            if (string.IsNullOrWhiteSpace(game_mode))
+            {
+                return;
+            }
+
+            last_selected_preset_names.Remove(game_mode);
+
+            await SaveSettingsAsync();
+        }
+
+        public List<ServerPresetModel> GetPresetsByGameMode(string gameMode)
+        {
+            string normalizedGameMode = gameMode ?? string.Empty;
+
+            return (server_presets ?? [])
+                .Where(preset => (preset.GameMode ?? string.Empty).Equals(normalizedGameMode, StringComparison.OrdinalIgnoreCase))
+                .OrderBy(preset => preset.Name, StringComparer.OrdinalIgnoreCase)
+                .ToList();
+        }
+
+        public ServerPresetModel? GetPresetByGameMode(string gameMode, string presetName)
+        {
+            string normalizedGameMode = gameMode ?? string.Empty;
+            string normalizedPresetName = presetName ?? string.Empty;
+
+            return (server_presets ?? []).FirstOrDefault(preset =>
+                (preset.GameMode ?? string.Empty).Equals(normalizedGameMode, StringComparison.OrdinalIgnoreCase) &&
+                (preset.Name ?? string.Empty).Equals(normalizedPresetName, StringComparison.OrdinalIgnoreCase));
+        }
+
+        public async Task AddOrUpdatePresetAsync(ServerPresetModel serverPreset)
+        {
+            server_presets ??= [];
+            ServerPresetModel? existingPreset = GetPresetByGameMode(serverPreset.GameMode, serverPreset.Name);
+            List<string> blockedServerKeys = serverPreset.BlockedServerKeys
+                .Distinct(StringComparer.OrdinalIgnoreCase)
+                .OrderBy(key => key, StringComparer.OrdinalIgnoreCase)
+                .ToList();
+
+            if (existingPreset == null)
+            {
+                server_presets.Add(new ServerPresetModel
+                {
+                    Name = serverPreset.Name,
+                    GameMode = serverPreset.GameMode,
+                    IsClustered = serverPreset.IsClustered,
+                    BlockedServerKeys = blockedServerKeys,
+                });
+            }
+            else
+            {
+                existingPreset.IsClustered = serverPreset.IsClustered;
+                existingPreset.BlockedServerKeys = blockedServerKeys;
+            }
+
+            await SaveSettingsAsync();
+        }
+
+        public async Task RemovePresetAsync(string gameMode, string presetName)
+        {
+            server_presets ??= [];
+            server_presets.RemoveAll(preset =>
+                preset.GameMode.Equals(gameMode, StringComparison.OrdinalIgnoreCase) &&
+                preset.Name.Equals(presetName, StringComparison.OrdinalIgnoreCase));
+
+            await SaveSettingsAsync();
+        }
     }
 }
diff --git a/ServerPickerX/ViewModels/MainWindowViewModel.cs b/ServerPickerX/ViewModels/MainWindowViewModel.cs
index 15704d7..844ae54 100644
--- a/ServerPickerX/ViewModels/MainWindowViewModel.cs
+++ b/ServerPickerX/ViewModels/MainWindowViewModel.cs
@@ -23,6 +23,8 @@ public partial class MainWindowViewModel : ViewModelBase
     {
         public ObservableCollectionExtended<ServerModel> ServerModels { get; set; } = [];
 
+        public ObservableCollectionExtended<ServerPresetModel> PresetItems { get; set; } = [];
+
         // Property resolved through expression body that react to changes from another observable property
         public ObservableCollectionExtended<ServerModel> FilteredServerModels =>
              string.IsNullOrWhiteSpace(SearchText)
@@ -48,21 +50,39 @@ public partial class MainWindowViewModel : ViewModelBase
 
         [ObservableProperty]
         [NotifyPropertyChangedFor(nameof(IsOperationAllowed))]
+        [NotifyPropertyChangedFor(nameof(CanDeletePreset))]
+        [NotifyPropertyChangedFor(nameof(CanSelectPresets))]
         public bool serverModelsInitialized = false;
 
         [ObservableProperty]
         [NotifyPropertyChangedFor(nameof(IsOperationAllowed))]
+        [NotifyPropertyChangedFor(nameof(CanDeletePreset))]
+        [NotifyPropertyChangedFor(nameof(CanSelectPresets))]
         public bool pendingOperation = false;
 
+        [ObservableProperty]
+        [NotifyPropertyChangedFor(nameof(CanDeletePreset))]
+        public ServerPresetModel? selectedPreset;
+
+        [ObservableProperty]
+        [NotifyPropertyChangedFor(nameof(CanSelectPresets))]
+        public bool hasPresets = false;
+
         // Dependent/Computed prop for main UI buttons `IsEnabled` state
         public bool IsOperationAllowed => !PendingOperation && ServerModelsInitialized;
 
+        public bool CanDeletePreset => IsOperationAllowed && SelectedPreset != null;
+
+        public bool CanSelectPresets => IsOperationAllowed && HasPresets;
+
         private readonly ILoggerService _loggerService;
         private readonly IMessageBoxService _messageBoxService;
         private readonly ILocalizationService _localizationService;
         private readonly IServerDataService _serverDataService;
         private readonly ISystemFirewallService _systemFirewallService;
         private readonly JsonSetting _jsonSetting;
+        private readonly HashSet<string> _blockedServerKeys = new(StringComparer.OrdinalIgnoreCase);
+        private string _presetNameSuggestion = string.Empty;
 
         // Parameterless constructor, allows design previewer to instantiate this class since it doesn't support DI
         public MainWindowViewModel()
@@ -95,40 +115,198 @@ JsonSetting jsonSetting
 
         public async Task LoadServersAsync()
         {
+            _presetNameSuggestion = string.Empty;
             ServersLoaded = await _serverDataService.LoadServersAsync();
 
             if (!ServersLoaded) return;
 
-            await ClusterUnclusterServersAsync();
+            await SetClusterStateAsync(_jsonSetting.is_clustered, false, false);
 
             ServerModelsInitialized = true;
+
+            LoadPresetPickerItems();
+            await RestoreLastSelectedPresetAsync();
         }
 
         [RelayCommand]
         public async Task ClusterUnclusterServersAsync()
         {
-            if (!ServersLoaded) return;
+            await SetClusterStateAsync(!_jsonSetting.is_clustered, true, true);
+        }
 
-            // Update json settings and unblock all servers only after servers are initialized on first load
-            if (ServerModelsInitialized)
+        public async Task SetClusterStateAsync(bool isClustered, bool shouldUnblockCurrentServers, bool shouldUpdatePresetSelection)
+        {
+            if (!ServersLoaded)
             {
-                _jsonSetting.is_clustered = !_jsonSetting.is_clustered;
+                return;
+            }
 
-                await _jsonSetting.SaveSettingsAsync();
+            bool clusterStateChanged = _jsonSetting.is_clustered != isClustered;
+
+            // After initial load, clear the full current view before switching representations
+            // so clustered/unclustered transitions do not carry stale rules forward
+            if (shouldUnblockCurrentServers && ServerModelsInitialized && ServerModels.Count > 0)
+            {
+                bool unblocked = await PerformOperationAsync(
+                    false,
+                    new ObservableCollection<ServerModel>(ServerModels),
+                    false
+                    );
 
-                await UnblockAllAsync();
+                if (!unblocked)
+                {
+                    return;
+                }
             }
 
-            ServerData serverData = _serverDataService.GetServerData();
+            if (clusterStateChanged)
+            {
+                _jsonSetting.is_clustered = isClustered;
 
-            List<ServerModel> serverModels = _jsonSetting.is_clustered ?
-                serverData.ClusteredServers : serverData.UnclusteredServers;
+                await _jsonSetting.SaveSettingsAsync();
+            }
 
-            ServerModels.Clear();
+            ServerData serverData = _serverDataService.GetServerData();
+            List<ServerModel> serverModels = _jsonSetting.is_clustered
+                ? serverData.ClusteredServers
+                : serverData.UnclusteredServers;
 
+            ServerModels.Clear();
             ServerModels.AddRange(serverModels);
 
             PingServers(serverModels);
+
+            if (shouldUpdatePresetSelection)
+            {
+                if (clusterStateChanged)
+                {
+                    await MarkPresetSelectionDirtyAsync();
+                }
+            }
+        }
+
+        public List<ServerPresetModel> GetCurrentGamePresets()
+        {
+            return _jsonSetting.GetPresetsByGameMode(_jsonSetting.game_mode);
+        }
+
+        public ServerPresetModel? GetCurrentGamePreset(string presetName)
+        {
+            return _jsonSetting.GetPresetByGameMode(_jsonSetting.game_mode, presetName);
+        }
+
+        public void LoadPresetPickerItems()
+        {
+            string? selectedPresetName = SelectedPreset?.Name;
+            List<ServerPresetModel> presetItems = GetCurrentGamePresets();
+
+            PresetItems.Clear();
+
+            if (presetItems.Count == 0)
+            {
+                HasPresets = false;
+                ClearSelectedPreset();
+                return;
+            }
+
+            HasPresets = true;
+            PresetItems.AddRange(presetItems);
+
+            if (!string.IsNullOrWhiteSpace(selectedPresetName))
+            {
+                SelectPresetByName(selectedPresetName);
+                return;
+            }
+
+            ClearSelectedPreset();
+        }
+
+        public void SelectPresetByName(string presetName)
+        {
+            SelectedPreset = PresetItems.FirstOrDefault(preset =>
+                preset.Name.Equals(presetName, StringComparison.OrdinalIgnoreCase));
+        }
+
+        public async Task SavePresetAsync(string presetName)
+        {
+            ServerPresetModel serverPreset = new()
+            {
+                Name = presetName.Trim(),
+                GameMode = _jsonSetting.game_mode,
+                IsClustered = _jsonSetting.is_clustered,
+                BlockedServerKeys = _blockedServerKeys
+                    .OrderBy(key => key, StringComparer.OrdinalIgnoreCase)
+                    .ToList(),
+            };
+
+            await _jsonSetting.AddOrUpdatePresetAsync(serverPreset);
+            await _jsonSetting.SetLastSelectedPresetNameByGameModeAsync(serverPreset.Name);
+
+            _presetNameSuggestion = serverPreset.Name;
+            LoadPresetPickerItems();
+            SelectPresetByName(serverPreset.Name);
+        }
+
+        public string GetPresetNameSuggestion()
+        {
+            return SelectedPreset?.Name ?? _presetNameSuggestion;
+        }
+
+        public bool IsSuggestedPresetName(string presetName)
+        {
+            return GetPresetNameSuggestion().Equals(presetName, StringComparison.OrdinalIgnoreCase);
+        }
+
+        public async Task DeleteSelectedPresetAsync()
+        {
+            if (SelectedPreset == null)
+            {
+                return;
+            }
+
+            string deletedPresetName = SelectedPreset.Name;
+
+            await _jsonSetting.RemovePresetAsync(_jsonSetting.game_mode, deletedPresetName);
+
+            if (_jsonSetting.GetLastSelectedPresetNameByGameMode().Equals(deletedPresetName, StringComparison.OrdinalIgnoreCase))
+            {
+                await _jsonSetting.ClearLastSelectedPresetNameByGameModeAsync();
+            }
+
+            if (GetPresetNameSuggestion().Equals(deletedPresetName, StringComparison.OrdinalIgnoreCase))
+            {
+                _presetNameSuggestion = string.Empty;
+            }
+
+            LoadPresetPickerItems();
+            ClearSelectedPreset();
+        }
+
+        public async Task<bool> ApplyPresetAsync(ServerPresetModel serverPreset)
+        {
+            if (!ServersLoaded)
+            {
+                return false;
+            }
+
+            if (!serverPreset.GameMode.Equals(_jsonSetting.game_mode, StringComparison.OrdinalIgnoreCase))
+            {
+                return false;
+            }
+
+            bool presetApplied = await ApplyPresetWithResetAsync(serverPreset);
+
+            if (!presetApplied)
+            {
+                return false;
+            }
+
+            ReplaceBlockedServerKeysFromPreset(serverPreset);
+            await _jsonSetting.SetLastSelectedPresetNameByGameModeAsync(serverPreset.Name);
+            _presetNameSuggestion = serverPreset.Name;
+            SelectPresetByName(serverPreset.Name);
+
+            return true;
         }
 
         [RelayCommand]
@@ -202,6 +380,15 @@ public async Task<bool> UnblockAllAsync()
             return await PerformOperationAsync(false, FilteredServerModels);
         }
 
+        public async Task<bool> UnblockCurrentGameServersAsync()
+        {
+            if (ServerModels.Count == 0)
+            {
+                return false;
+            }
+
+            return await PerformOperationAsync(false, new ObservableCollection<ServerModel>(ServerModels), false);
+        }
 
         [RelayCommand]
         public async Task<bool> UnblockSelectedAsync(IList selectedServers)
@@ -221,7 +408,11 @@ await _messageBoxService.ShowMessageBoxAsync(
             return await PerformOperationAsync(false, serverModels);
         }
 
-        public async Task<bool> PerformOperationAsync(bool shouldBlock, ObservableCollection<ServerModel> serverModels)
+        public async Task<bool> PerformOperationAsync(
+            bool shouldBlock,
+            ObservableCollection<ServerModel> serverModels,
+            bool shouldUpdatePresetSelection = true
+            )
         {
             if (PendingOperation)
             {
@@ -254,8 +445,17 @@ await _messageBoxService.ShowMessageBoxAsync(
                     await _loggerService.LogInfoAsync("Servers unblocked successfully");
                 }
 
+                TrackBlockedServerKeys(serverModels, shouldBlock);
+
+                if (shouldUpdatePresetSelection)
+                {
+                    await MarkPresetSelectionDirtyAsync();
+                }
+
                 // Ping servers (parallel operation)
                 PingServers(serverModels);
+
+                return true;
             }
             catch (Exception ex)
             {
@@ -268,11 +468,11 @@ await _messageBoxService.ShowMessageBoxAsync(
 
                 return false;
             }
-
-            PendingOperation = false;
-            ShowProgressBar = false;
-
-            return true;
+            finally
+            {
+                PendingOperation = false;
+                ShowProgressBar = false;
+            }
         }
 
         public IServerDataService GetServerDataService()
@@ -280,5 +480,130 @@ public IServerDataService GetServerDataService()
             return _serverDataService;
         }
 
+        private void TrackBlockedServerKeys(IEnumerable<ServerModel> serverModels, bool shouldBlock)
+        {
+            foreach (ServerModel serverModel in serverModels)
+            {
+                string serverKey = GetServerKey(serverModel);
+
+                if (shouldBlock)
+                {
+                    _blockedServerKeys.Add(serverKey);
+                }
+                else
+                {
+                    _blockedServerKeys.Remove(serverKey);
+                }
+            }
+        }
+
+        private string GetServerKey(ServerModel serverModel)
+        {
+            return _jsonSetting.is_clustered
+                ? serverModel.Description
+                : serverModel.Name;
+        }
+
+        private async Task RestoreLastSelectedPresetAsync()
+        {
+            if (!HasPresets)
+            {
+                await _jsonSetting.ClearLastSelectedPresetNameByGameModeAsync();
+
+                ClearSelectedPreset();
+                return;
+            }
+
+            string lastSelectedPresetName = _jsonSetting.GetLastSelectedPresetNameByGameMode();
+
+            if (string.IsNullOrWhiteSpace(lastSelectedPresetName))
+            {
+                ClearSelectedPreset();
+                return;
+            }
+
+            ServerPresetModel? lastSelectedPreset = GetCurrentGamePreset(lastSelectedPresetName);
+
+            if (lastSelectedPreset == null)
+            {
+                await _jsonSetting.ClearLastSelectedPresetNameByGameModeAsync();
+                ClearSelectedPreset();
+                return;
+            }
+
+            bool restored = await ApplyPresetAsync(lastSelectedPreset);
+
+            if (!restored)
+            {
+                ClearSelectedPreset();
+            }
+        }
+
+        private async Task<bool> ApplyPresetWithResetAsync(ServerPresetModel serverPreset)
+        {
+            if (ServerModels.Count > 0)
+            {
+                bool unblocked = await PerformOperationAsync(
+                    false,
+                    new ObservableCollection<ServerModel>(ServerModels),
+                    false
+                    );
+
+                if (!unblocked)
+                {
+                    return false;
+                }
+            }
+
+            await SetClusterStateAsync(serverPreset.IsClustered, false, false);
+
+            ObservableCollection<ServerModel> matchingServerModels = GetMatchingServerModels(serverPreset);
+
+            if (matchingServerModels.Count == 0)
+            {
+                return true;
+            }
+
+            return await PerformOperationAsync(true, matchingServerModels, false);
+        }
+
+        private ObservableCollection<ServerModel> GetMatchingServerModels(ServerPresetModel serverPreset)
+        {
+            return new ObservableCollection<ServerModel>(
+                ServerModels.Where(serverModel =>
+                    (serverPreset.BlockedServerKeys ?? [])
+                        .Contains(GetServerKey(serverModel), StringComparer.OrdinalIgnoreCase))
+                );
+        }
+
+        private void ReplaceBlockedServerKeysFromPreset(ServerPresetModel serverPreset)
+        {
+            ObservableCollection<ServerModel> matchingServerModels = GetMatchingServerModels(serverPreset);
+
+            _blockedServerKeys.Clear();
+
+            foreach (string blockedServerKey in matchingServerModels.Select(GetServerKey))
+            {
+                _blockedServerKeys.Add(blockedServerKey);
+            }
+        }
+
+        private void ClearSelectedPreset()
+        {
+            SelectedPreset = null;
+        }
+
+        private async Task MarkPresetSelectionDirtyAsync()
+        {
+            if (SelectedPreset != null)
+            {
+                _presetNameSuggestion = SelectedPreset.Name;
+            }
+
+            await _jsonSetting.ClearLastSelectedPresetNameByGameModeAsync();
+
+            ClearSelectedPreset();
+        }
+
     }
 }
diff --git a/ServerPickerX/Views/MainWindow.axaml b/ServerPickerX/Views/MainWindow.axaml
index 76bcde1..167d467 100644
--- a/ServerPickerX/Views/MainWindow.axaml
+++ b/ServerPickerX/Views/MainWindow.axaml
@@ -10,8 +10,8 @@
         mc:Ignorable="d"
         x:Class="ServerPickerX.Views.MainWindow"
         x:DataType="vm:MainWindowViewModel"
-        Width="850"
-        MinWidth="850"
+        Width="980"
+        MinWidth="980"
         MaxWidth="1280"
         Height="640"
         MinHeight="500"
@@ -74,8 +74,14 @@
 					<RowDefinition Height="48"></RowDefinition>
                 </Grid.RowDefinitions>
 
-                <Grid>
-                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                <Grid Grid.Row="0">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+
+                    <StackPanel Grid.Column="0" Orientation="Horizontal" HorizontalAlignment="Left">
                         <TextBox
                             Classes="search-textbox"
                             Text="{Binding SearchText}"
@@ -102,12 +108,76 @@
                             Margin="8,0,0,0"
                             BorderThickness="1">
                         </ComboBox>
+                        <Grid MinWidth="146" Margin="8,0,20,0">
+                            <ComboBox
+                                x:Name="PresetComboBox"
+                                Classes="game-combobox"
+                                ItemsSource="{Binding PresetItems}"
+                                SelectedItem="{Binding SelectedPreset}"
+                                SelectionChanged="PresetComboBox_SelectionChanged"
+                                IsVisible="{Binding HasPresets}"
+                                IsEnabled="{Binding CanSelectPresets}"
+                                ToolTip.Tip="{DynamicResource PresetToolTip}"
+                                ToolTip.ShowDelay="20"
+                                FontSize="12"
+                                Width="146"
+                                MinWidth="146"
+                                Height="32"
+                                VerticalAlignment="Center"
+                                BorderThickness="1">
+                                <ComboBox.ItemTemplate>
+                                    <DataTemplate>
+                                        <TextBlock Text="{Binding Name}" />
+                                    </DataTemplate>
+                                </ComboBox.ItemTemplate>
+                            </ComboBox>
+                            <Border
+                                IsVisible="{Binding !HasPresets}"
+                                Width="146"
+                                MinWidth="146"
+                                Height="32"
+                                VerticalAlignment="Center"
+                                BorderBrush="#575cd4"
+                                BorderThickness="1"
+                                Background="#804a4e8a"
+                                CornerRadius="2">
+                                <TextBlock
+                                    Margin="12,0,12,0"
+                                    VerticalAlignment="Center"
+                                    FontSize="12"
+                                    Foreground="White"
+                                    Opacity="0.55"
+                                    TextTrimming="CharacterEllipsis"
+                                    Text="{DynamicResource NoPresets}" />
+                            </Border>
+                        </Grid>
                     </StackPanel>
-                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+                    <StackPanel Grid.Column="2" Orientation="Horizontal" HorizontalAlignment="Right">
+                        <Button
+                            x:Name="SavePresetBtn"
+                            Classes="main-btn"
+                            IsEnabled="{Binding IsOperationAllowed}"
+                            Content="{DynamicResource SavePreset}"
+                            ToolTip.Tip="{DynamicResource SavePresetToolTip}"
+                            ToolTip.ShowDelay="20"
+                            Click="SavePresetBtn_Click"
+                            VerticalAlignment="Center"
+                            Foreground="White"
+                            Margin="0,0,8,0"/>
+                        <Button
+                            x:Name="DeletePresetBtn"
+                            Classes="main-btn"
+                            IsEnabled="{Binding CanDeletePreset}"
+                            Content="{DynamicResource DeletePreset}"
+                            ToolTip.Tip="{DynamicResource DeletePresetToolTip}"
+                            ToolTip.ShowDelay="20"
+                            Click="DeletePresetBtn_Click"
+                            VerticalAlignment="Center"
+                            Foreground="White"
+                            Margin="0,0,8,0"/>
                         <Button 
                             x:Name="ClusterUnclusterBtn"
                             Classes="main-btn"
-                            Command="{Binding ClusterUnclusterServersAsync}"
                             IsEnabled="{Binding IsOperationAllowed}"
                             Content="{DynamicResource ClusterServers}"
                             ToolTip.Tip="{DynamicResource ClusterUnclusterToolTip}"
diff --git a/ServerPickerX/Views/MainWindow.axaml.cs b/ServerPickerX/Views/MainWindow.axaml.cs
index a7b1616..44c094b 100644
--- a/ServerPickerX/Views/MainWindow.axaml.cs
+++ b/ServerPickerX/Views/MainWindow.axaml.cs
@@ -1,10 +1,9 @@
 using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Data;
 using Avalonia.Markup.Xaml;
-using Avalonia.Markup.Xaml.MarkupExtensions;
 using ServerPickerX.Comparers;
 using ServerPickerX.Constants;
+using ServerPickerX.Models;
 using ServerPickerX.Services.DependencyInjection;
 using ServerPickerX.Services.Localizations;
 using ServerPickerX.Services.Loggers;
@@ -14,9 +13,7 @@
 using ServerPickerX.ViewModels;
 using System;
 using System.ComponentModel;
-using System.Threading;
 using System.Threading.Tasks;
-using static System.Collections.Specialized.BitVector32;
 
 namespace ServerPickerX.Views
 {
@@ -38,6 +35,8 @@ public static bool IsDebugBuild
         }
 
         private ListSortDirection pingSortDirection = ListSortDirection.Ascending;
+        private bool _suppressPresetSelectionChanged;
+        private ServerPresetModel? _previousPreset;
 
         private readonly ILoggerService _loggerService;
         private readonly JsonSetting _jsonSetting;
@@ -87,11 +86,37 @@ private async void GameModeComboBox_SelectionChanged(object? sender, SelectionCh
             await HandleGameModeChangeAsync();
         }
 
+        private async void PresetComboBox_SelectionChanged(object? sender, SelectionChangedEventArgs e)
+        {
+            ServerPresetModel? previousPreset = e.RemovedItems.Count > 0
+                ? e.RemovedItems[0] as ServerPresetModel
+                : _previousPreset;
+
+            if (_suppressPresetSelectionChanged)
+            {
+                return;
+            }
+
+            if (PresetComboBox?.SelectedItem is not ServerPresetModel selectedPreset)
+            {
+                _previousPreset = null;
+                return;
+            }
+
+            if (!PresetComboBox.IsDropDownOpen)
+            {
+                _previousPreset = selectedPreset;
+                return;
+            }
+
+            await HandlePresetChangeAsync(selectedPreset, previousPreset);
+        }
+
         private async void DataGrid_DoubleTapped(object? sender, Avalonia.Input.TappedEventArgs e)
         {
             var source = e.Source;
 
-            if (source is  Border or TextBlock or Image)
+            if (source is Border or TextBlock or Image)
             {
                 var vm = DataContext as MainWindowViewModel;
                 vm?.PingSelectedServer();
@@ -116,19 +141,108 @@ private void DataGridTextColumn_HeaderPointerPressed(object? sender, Avalonia.In
 
         private async void ClusterUnclusterBtn_Click(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
         {
-            var vm = DataContext as MainWindowViewModel;
+            if (DataContext is not MainWindowViewModel vm || !vm.ServerModelsInitialized)
+            {
+                return;
+            }
+
+            await vm.ClusterUnclusterServersAsync();
+            SyncPresetSelection(vm.SelectedPreset);
+            RefreshClusterButtonContent();
+        }
 
-            // Check if servers are loaded and initialized
-            if (!vm?.ServerModelsInitialized ?? false)
+        private async void SavePresetBtn_Click(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
+        {
+            if (DataContext is not MainWindowViewModel vm)
             {
                 return;
             }
 
-            // Update button DynamicResource binding base on language setting
-            ClusterUnclusterBtn.Bind(
-                Button.ContentProperty,
-                new DynamicResourceExtension(_jsonSetting.is_clustered ? "ClusterServers" : "UnclusterServers")
-            );
+            PresetNameWindow presetNameWindow = new(vm.GetPresetNameSuggestion())
+            {
+                WindowStartupLocation = WindowStartupLocation.CenterOwner
+            };
+
+            string? presetName = await presetNameWindow.ShowDialog<string?>(this);
+
+            if (presetName == null)
+            {
+                return;
+            }
+
+            presetName = presetName?.Trim() ?? string.Empty;
+
+            if (string.IsNullOrWhiteSpace(presetName))
+            {
+                await _messageBoxService.ShowMessageBoxAsync(
+                    _localizationService.GetLocaleValue("MessageBoxInfoTitle"),
+                    _localizationService.GetLocaleValue("PresetNameRequiredDialogue")
+                    );
+
+                return;
+            }
+
+            ServerPresetModel? existingPreset = vm.GetCurrentGamePreset(presetName);
+            bool isSuggestedPresetName = vm.IsSuggestedPresetName(presetName);
+
+            if (existingPreset != null && !isSuggestedPresetName)
+            {
+                bool overwriteResult = await _messageBoxService.ShowMessageBoxConfirmationAsync(
+                    _localizationService.GetLocaleValue("MessageBoxInfoTitle"),
+                    string.Format(_localizationService.GetLocaleValue("PresetOverwriteConfirmDialogue"), presetName),
+                    MsBox.Avalonia.Enums.Icon.Setting
+                    );
+
+                if (!overwriteResult)
+                {
+                    return;
+                }
+            }
+
+            _suppressPresetSelectionChanged = true;
+
+            try
+            {
+                await vm.SavePresetAsync(presetName);
+
+                SyncPresetSelection(vm.SelectedPreset);
+            }
+            finally
+            {
+                _suppressPresetSelectionChanged = false;
+            }
+        }
+
+        private async void DeletePresetBtn_Click(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
+        {
+            if (DataContext is not MainWindowViewModel vm || vm.SelectedPreset == null)
+            {
+                return;
+            }
+
+            bool deleteResult = await _messageBoxService.ShowMessageBoxConfirmationAsync(
+                _localizationService.GetLocaleValue("MessageBoxInfoTitle"),
+                string.Format(_localizationService.GetLocaleValue("PresetDeleteConfirmDialogue"), vm.SelectedPreset.Name),
+                MsBox.Avalonia.Enums.Icon.Warning
+                );
+
+            if (!deleteResult)
+            {
+                return;
+            }
+
+            _suppressPresetSelectionChanged = true;
+
+            try
+            {
+                await vm.DeleteSelectedPresetAsync();
+
+                SyncPresetSelection(vm.SelectedPreset);
+            }
+            finally
+            {
+                _suppressPresetSelectionChanged = false;
+            }
         }
 
         public async Task InitializeApp()
@@ -144,7 +258,10 @@ public async Task InitializeApp()
             await vm.LoadServersAsync();
 
             DataContext = vm;
-           
+
+            ConfigurePresetControls(vm);
+            RefreshClusterButtonContent();
+
             if (vm.ServersLoaded)
             {
                 await SyncServersAsync(vm);
@@ -187,11 +304,12 @@ private async Task ConfigureControls()
                 throw;
             }
 
-            // Update button content property DynamicResource binding based on json setting
-            ClusterUnclusterBtn.Bind(
-                Button.ContentProperty,
-                new DynamicResourceExtension(_jsonSetting.is_clustered ? "UnclusterServers" : "ClusterServers")
-                );
+            RefreshClusterButtonContent();
+        }
+
+        private void ConfigurePresetControls(MainWindowViewModel vm)
+        {
+            SyncPresetSelection(vm.SelectedPreset);
         }
 
         private async Task SyncServersAsync(MainWindowViewModel vm)
@@ -213,7 +331,7 @@ await _messageBoxService.ShowMessageBoxAsync(
                     MsBox.Avalonia.Enums.Icon.Setting
                     );
 
-            await vm.UnblockAllAsync();
+            await vm.UnblockCurrentGameServersAsync();
 
             await _jsonSetting.SetRevisionByGameModeAsync(fetchedRevision);
         }
@@ -241,13 +359,66 @@ private async Task HandleGameModeChangeAsync()
                 return;
             }
 
-            // Unblock all servers first before changing game mode
-            await vm.UnblockAllAsync();
+            // Clear the currently loaded game's rules before changing game mode
+            await vm.UnblockCurrentGameServersAsync();
 
             // Update json setting game mode and serialize it
             await _jsonSetting.SetGameModeAsync((string)GameModeComboBox.SelectedItem);
 
             await InitializeApp();
         }
+
+        private async Task HandlePresetChangeAsync(
+            ServerPresetModel selectedPreset,
+            ServerPresetModel? previousPreset
+            )
+        {
+            if (DataContext is not MainWindowViewModel vm)
+            {
+                return;
+            }
+
+            if (AreSamePresetSelection(selectedPreset, previousPreset))
+            {
+                return;
+            }
+
+            bool presetApplied = await vm.ApplyPresetAsync(selectedPreset);
+
+            if (!presetApplied)
+            {
+                SyncPresetSelection(previousPreset);
+                return;
+            }
+
+            SyncPresetSelection(vm.SelectedPreset);
+            RefreshClusterButtonContent();
+        }
+
+        private void SyncPresetSelection(ServerPresetModel? preset)
+        {
+            _suppressPresetSelectionChanged = true;
+            PresetComboBox.SelectedItem = preset;
+            _suppressPresetSelectionChanged = false;
+            _previousPreset = preset;
+        }
+
+        private static bool AreSamePresetSelection(ServerPresetModel? left, ServerPresetModel? right)
+        {
+            if (left == null || right == null)
+            {
+                return left == null && right == null;
+            }
+
+            return left.GameMode.Equals(right.GameMode, StringComparison.OrdinalIgnoreCase) &&
+                left.Name.Equals(right.Name, StringComparison.OrdinalIgnoreCase);
+        }
+
+        private void RefreshClusterButtonContent()
+        {
+            ClusterUnclusterBtn.Content = _localizationService.GetLocaleValue(
+                _jsonSetting.is_clustered ? "UnclusterServers" : "ClusterServers"
+                );
+        }
     }
 }
diff --git a/ServerPickerX/Views/UserWindows/PresetNameWindow.axaml b/ServerPickerX/Views/UserWindows/PresetNameWindow.axaml
new file mode 100644
index 0000000..c42c08e
--- /dev/null
+++ b/ServerPickerX/Views/UserWindows/PresetNameWindow.axaml
@@ -0,0 +1,75 @@
+<Window xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:userControls="using:ServerPickerX"
+    mc:Ignorable="d"
+    Width="360"
+    Height="180"
+    x:Class="ServerPickerX.PresetNameWindow"
+    SystemDecorations="BorderOnly"
+    ExtendClientAreaToDecorationsHint="True"
+    ExtendClientAreaChromeHints="NoChrome"
+    ExtendClientAreaTitleBarHeightHint="-1"
+    WindowStartupLocation="CenterOwner"
+    CanResize="False"
+    CanMaximize="False"
+    Background="Transparent"
+    Loaded="Window_Loaded">
+    <Border
+        Background="#373B78"
+        BorderBrush="#575cd4"
+        BorderThickness="1.35">
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="30" />
+                <RowDefinition />
+            </Grid.RowDefinitions>
+
+            <Grid x:Name="TitleBar"
+                  Background="#373B78"
+                  PointerPressed="TitleBar_PointerPressed">
+                <TextBlock
+                    VerticalAlignment="Center"
+                    Margin="10,0,0,0"
+                    Foreground="White"
+                    FontWeight="Bold"
+                    FontSize="14"
+                    Text="{DynamicResource PresetNameTitle}" />
+                <userControls:TitleBarButtons/>
+            </Grid>
+
+            <Grid Grid.Row="1" Margin="16">
+                <Grid.RowDefinitions>
+                    <RowDefinition />
+                    <RowDefinition Height="48" />
+                </Grid.RowDefinitions>
+
+                <StackPanel Spacing="10" VerticalAlignment="Center">
+                    <TextBlock
+                        Foreground="White"
+                        Text="{DynamicResource PresetNamePrompt}" />
+                    <TextBox
+                        x:Name="PresetNameTextBox"
+                        Classes="search-textbox"
+                        Watermark="{DynamicResource PresetNameWatermark}" />
+                </StackPanel>
+
+                <StackPanel
+                    Grid.Row="1"
+                    Orientation="Horizontal"
+                    HorizontalAlignment="Right"
+                    Spacing="8">
+                    <Button
+                        Classes="main-btn"
+                        Content="{DynamicResource CancelButtonText}"
+                        Click="CancelBtn_Click" />
+                    <Button
+                        Classes="main-btn"
+                        Content="{DynamicResource SaveButtonText}"
+                        Click="SaveBtn_Click" />
+                </StackPanel>
+            </Grid>
+        </Grid>
+    </Border>
+</Window>
diff --git a/ServerPickerX/Views/UserWindows/PresetNameWindow.axaml.cs b/ServerPickerX/Views/UserWindows/PresetNameWindow.axaml.cs
new file mode 100644
index 0000000..b59bbba
--- /dev/null
+++ b/ServerPickerX/Views/UserWindows/PresetNameWindow.axaml.cs
@@ -0,0 +1,45 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Input;
+
+namespace ServerPickerX;
+
+public partial class PresetNameWindow : Window
+{
+    private readonly string? _initialPresetName;
+
+    public PresetNameWindow()
+    {
+        InitializeComponent();
+    }
+
+    public PresetNameWindow(string? initialPresetName)
+    {
+        InitializeComponent();
+        _initialPresetName = initialPresetName;
+    }
+
+    private void Window_Loaded(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
+    {
+        PresetNameTextBox.Text = _initialPresetName;
+        PresetNameTextBox.Focus();
+        PresetNameTextBox.CaretIndex = PresetNameTextBox.Text?.Length ?? 0;
+    }
+
+    private void TitleBar_PointerPressed(object? sender, PointerPressedEventArgs e)
+    {
+        e.Handled = true;
+        var parentWindow = TopLevel.GetTopLevel(this) as Window;
+        parentWindow?.BeginMoveDrag(e);
+    }
+
+    private void SaveBtn_Click(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
+    {
+        Close(PresetNameTextBox.Text);
+    }
+
+    private void CancelBtn_Click(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
+    {
+        Close(null);
+    }
+}

From 3d24708908d9e70d9a6c0a401b48d939015c4e15 Mon Sep 17 00:00:00 2001
From: JanitorialMess <65749353+JanitorialMess@users.noreply.github.com>
Date: Tue, 31 Mar 2026 01:46:44 -0400
Subject: [PATCH 02/10] fix: swap preset dialog button order

---
 ServerPickerX/Views/UserWindows/PresetNameWindow.axaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ServerPickerX/Views/UserWindows/PresetNameWindow.axaml b/ServerPickerX/Views/UserWindows/PresetNameWindow.axaml
index c42c08e..f9837af 100644
--- a/ServerPickerX/Views/UserWindows/PresetNameWindow.axaml
+++ b/ServerPickerX/Views/UserWindows/PresetNameWindow.axaml
@@ -60,14 +60,14 @@
                     Orientation="Horizontal"
                     HorizontalAlignment="Right"
                     Spacing="8">
-                    <Button
-                        Classes="main-btn"
-                        Content="{DynamicResource CancelButtonText}"
-                        Click="CancelBtn_Click" />
                     <Button
                         Classes="main-btn"
                         Content="{DynamicResource SaveButtonText}"
                         Click="SaveBtn_Click" />
+                    <Button
+                        Classes="main-btn"
+                        Content="{DynamicResource CancelButtonText}"
+                        Click="CancelBtn_Click" />
                 </StackPanel>
             </Grid>
         </Grid>

From c698e423b803ce51afd833a0ae0788797d3e1d95 Mon Sep 17 00:00:00 2001
From: JanitorialMess <65749353+JanitorialMess@users.noreply.github.com>
Date: Tue, 31 Mar 2026 23:02:37 -0400
Subject: [PATCH 03/10] fix: reset and prune stale preset entries on server
 revision changes

---
 ServerPickerX/Locales/Locale_de-de.axaml      |  2 +-
 ServerPickerX/Locales/Locale_en-us.axaml      |  2 +-
 ServerPickerX/Locales/Locale_es-es.axaml      |  2 +-
 ServerPickerX/Locales/Locale_ja-jp.axaml      |  2 +-
 ServerPickerX/Locales/Locale_pl-pl.axaml      |  2 +-
 ServerPickerX/Locales/Locale_ru-ru.axaml      |  2 +-
 ServerPickerX/Locales/Locale_sv-se.axaml      |  2 +-
 ServerPickerX/Locales/Locale_tr-tr.axaml      |  4 +-
 ServerPickerX/Locales/Locale_zh-cn.axaml      |  2 +-
 .../CS2PerfectWorldServerDataService.cs       | 14 +---
 .../Services/Servers/CS2ServerDataService.cs  | 12 +--
 .../Servers/DeadLockServerDataService.cs      | 12 +--
 .../Servers/MarathonServerDataService.cs      | 12 +--
 .../Services/Settings/JsonSetting.cs          | 55 +++++++++++++
 .../ViewModels/MainWindowViewModel.cs         | 78 +++++++++++++++++--
 ServerPickerX/Views/MainWindow.axaml.cs       | 43 ++++++++--
 16 files changed, 182 insertions(+), 64 deletions(-)

diff --git a/ServerPickerX/Locales/Locale_de-de.axaml b/ServerPickerX/Locales/Locale_de-de.axaml
index 444d60e..ee7b083 100644
--- a/ServerPickerX/Locales/Locale_de-de.axaml
+++ b/ServerPickerX/Locales/Locale_de-de.axaml
@@ -32,7 +32,7 @@
   <x:String x:Key="PresetNamePrompt">Einen Preset-Namen für das aktuelle Spiel eingeben.</x:String>
   <x:String x:Key="PresetNameWatermark">Preset-Name</x:String>
   <x:String x:Key="MessageBoxInfoTitle">Info</x:String>
-  <x:String x:Key="SyncServersUnblockAllDialogue">Die Serverdaten wurden soeben von Valve aktualisiert! Alle gesperrten Server werden entsperrt, um die neuen Serverdaten zu synchronisieren.</x:String>
+  <x:String x:Key="SyncServersUnblockAllDialogue">Die Serverdaten wurden gerade von Valve aktualisiert! Alle blockierten Server werden entsperrt, um die neuen Serverdaten zu synchronisieren. Preset-Einträge für Server, die nicht mehr existieren, werden entfernt, und das zuletzt ausgewählte Preset wird erneut angewendet, falls verfügbar.</x:String>
   <x:String x:Key="NewVersionDialogue">Neue Version verfügbar! Zu den Veröffentlichungen?</x:String>
   <x:String x:Key="SelectOneServerToBlockDialogue">Hey! Bitte wähle mindestens einen Server zum Blockieren aus.</x:String>
   <x:String x:Key="SelectOneServerToUnblockDialogue">Bitte wählen Sie mindestens einen Server aus, um die Entsperrung aufzuheben.</x:String>
diff --git a/ServerPickerX/Locales/Locale_en-us.axaml b/ServerPickerX/Locales/Locale_en-us.axaml
index 59a1bb5..333fe78 100644
--- a/ServerPickerX/Locales/Locale_en-us.axaml
+++ b/ServerPickerX/Locales/Locale_en-us.axaml
@@ -32,7 +32,7 @@
   <x:String x:Key="PresetNamePrompt">Enter a preset name for the current game.</x:String>
   <x:String x:Key="PresetNameWatermark">Preset name</x:String>
   <x:String x:Key="MessageBoxInfoTitle">Info</x:String>
-  <x:String x:Key="SyncServersUnblockAllDialogue">Server data just got updated by Valve! All blocked servers will be unblocked in order to synchronize new server data</x:String>
+  <x:String x:Key="SyncServersUnblockAllDialogue">Server data just got updated by Valve! All blocked servers will be unblocked in order to synchronize new server data. Preset entries for servers that no longer exist will be removed, and the last selected preset will be reapplied if available.</x:String>
   <x:String x:Key="NewVersionDialogue">New version available! Go to releases?</x:String>
   <x:String x:Key="SelectOneServerToBlockDialogue">Hey! Please select at least one server to block</x:String>
   <x:String x:Key="SelectOneServerToUnblockDialogue">Hey! Please select at least one server to unblock</x:String>
diff --git a/ServerPickerX/Locales/Locale_es-es.axaml b/ServerPickerX/Locales/Locale_es-es.axaml
index e060948..bd4c311 100644
--- a/ServerPickerX/Locales/Locale_es-es.axaml
+++ b/ServerPickerX/Locales/Locale_es-es.axaml
@@ -32,7 +32,7 @@
   <x:String x:Key="PresetNamePrompt">Introduce un nombre de preset para el juego actual.</x:String>
   <x:String x:Key="PresetNameWatermark">Nombre del preset</x:String>
   <x:String x:Key="MessageBoxInfoTitle">Información</x:String>
-  <x:String x:Key="SyncServersUnblockAllDialogue">¡Valve acaba de actualizar los datos del servidor! Todos los servidores bloqueados serán desbloqueados para sincronizar los nuevos datos.</x:String>
+  <x:String x:Key="SyncServersUnblockAllDialogue">Valve acaba de actualizar los datos del servidor. Todos los servidores bloqueados se desbloquearán para sincronizar los nuevos datos. Se eliminarán las entradas del preset correspondientes a servidores que ya no existen y, si está disponible, se volverá a aplicar el último preset seleccionado.</x:String>
   <x:String x:Key="NewVersionDialogue">¡Nueva versión disponible! ¿Ir a lanzamientos?</x:String>
   <x:String x:Key="SelectOneServerToBlockDialogue">Por favor, selecciona al menos un servidor para bloquear.</x:String>
   <x:String x:Key="SelectOneServerToUnblockDialogue">Seleccione al menos un servidor para desbloquear.</x:String>
diff --git a/ServerPickerX/Locales/Locale_ja-jp.axaml b/ServerPickerX/Locales/Locale_ja-jp.axaml
index d65cad4..8c7d27b 100644
--- a/ServerPickerX/Locales/Locale_ja-jp.axaml
+++ b/ServerPickerX/Locales/Locale_ja-jp.axaml
@@ -32,7 +32,7 @@
   <x:String x:Key="PresetNamePrompt">現在のゲーム用のプリセット名を入力してください。</x:String>
   <x:String x:Key="PresetNameWatermark">プリセット名</x:String>
   <x:String x:Key="MessageBoxInfoTitle">情報</x:String>
-  <x:String x:Key="SyncServersUnblockAllDialogue">Valveによってサーバーデータが更新されました！新しいサーバーデータを同期するために、ブロックされていたすべてのサーバーのブロックが解除されます。</x:String>
+  <x:String x:Key="SyncServersUnblockAllDialogue">Valve によってサーバーデータが更新されました。新しいサーバーデータと同期するために、ブロックされていたすべてのサーバーのブロックが解除されます。存在しなくなったサーバーのプリセット項目は削除され、可能であれば最後に選択したプリセットが再適用されます。</x:String>
   <x:String x:Key="NewVersionDialogue">新バージョンがリリースされました！リリース一覧へどうぞ。</x:String>
   <x:String x:Key="SelectOneServerToBlockDialogue">こんにちは！ブロックするサーバーを少なくとも1つ選択してください。</x:String>
   <x:String x:Key="SelectOneServerToUnblockDialogue">ブロックを解除したいサーバーを少なくとも1つ選択してください。</x:String>
diff --git a/ServerPickerX/Locales/Locale_pl-pl.axaml b/ServerPickerX/Locales/Locale_pl-pl.axaml
index 4e4bd73..37129ab 100644
--- a/ServerPickerX/Locales/Locale_pl-pl.axaml
+++ b/ServerPickerX/Locales/Locale_pl-pl.axaml
@@ -32,7 +32,7 @@
   <x:String x:Key="PresetNamePrompt">Wpisz nazwę presetu dla bieżącej gry.</x:String>
   <x:String x:Key="PresetNameWatermark">Nazwa presetu</x:String>
   <x:String x:Key="MessageBoxInfoTitle">informacje</x:String>
-  <x:String x:Key="SyncServersUnblockAllDialogue">Valve właśnie zaktualizowało dane serwera! Wszystkie zablokowane serwery zostaną odblokowane, aby zsynchronizować nowe dane serwera.</x:String>
+  <x:String x:Key="SyncServersUnblockAllDialogue">Valve właśnie zaktualizowało dane serwerów. Wszystkie zablokowane serwery zostaną odblokowane, aby zsynchronizować nowe dane serwera. Wpisy presetów dla serwerów, które już nie istnieją, zostaną usunięte, a ostatnio wybrany preset zostanie zastosowany ponownie, jeśli jest dostępny.</x:String>
   <x:String x:Key="NewVersionDialogue">Nowa wersja dostępna! Przejdź do wydań?</x:String>
   <x:String x:Key="SelectOneServerToBlockDialogue">Hej! Wybierz co najmniej jeden serwer do zablokowania</x:String>
   <x:String x:Key="SelectOneServerToUnblockDialogue">Hej! Wybierz co najmniej jeden serwer do odblokowania</x:String>
diff --git a/ServerPickerX/Locales/Locale_ru-ru.axaml b/ServerPickerX/Locales/Locale_ru-ru.axaml
index ac98607..3298ec9 100644
--- a/ServerPickerX/Locales/Locale_ru-ru.axaml
+++ b/ServerPickerX/Locales/Locale_ru-ru.axaml
@@ -32,7 +32,7 @@
   <x:String x:Key="PresetNamePrompt">Введите имя пресета для текущей игры.</x:String>
   <x:String x:Key="PresetNameWatermark">Имя пресета</x:String>
   <x:String x:Key="MessageBoxInfoTitle">информация</x:String>
-  <x:String x:Key="SyncServersUnblockAllDialogue">Valve обновила данные серверов! Все заблокированные серверы будут разблокированы для синхронизации новых данных.</x:String>
+  <x:String x:Key="SyncServersUnblockAllDialogue">Valve обновила данные серверов. Все заблокированные серверы будут разблокированы для синхронизации новых данных. Записи пресета для серверов, которые больше не существуют, будут удалены, а последний выбранный пресет будет применен снова, если он доступен.</x:String>
   <x:String x:Key="NewVersionDialogue">Доступна новая версия! Перейти к релизам?</x:String>
   <x:String x:Key="SelectOneServerToBlockDialogue">Пожалуйста, выберите хотя бы один сервер для блокировки.</x:String>
   <x:String x:Key="SelectOneServerToUnblockDialogue">Пожалуйста, выберите хотя бы один сервер для разблокировки.</x:String>
diff --git a/ServerPickerX/Locales/Locale_sv-se.axaml b/ServerPickerX/Locales/Locale_sv-se.axaml
index 4e905a6..3ec510c 100644
--- a/ServerPickerX/Locales/Locale_sv-se.axaml
+++ b/ServerPickerX/Locales/Locale_sv-se.axaml
@@ -32,7 +32,7 @@
   <x:String x:Key="PresetNamePrompt">Ange ett namn på förinställningen för det aktuella spelet.</x:String>
   <x:String x:Key="PresetNameWatermark">Namn på förinställning</x:String>
   <x:String x:Key="MessageBoxInfoTitle">info</x:String>
-  <x:String x:Key="SyncServersUnblockAllDialogue">Serverdata har precis uppdaterats av Valve! Alla blockerade servrar kommer att avblockeras för att synkronisera ny serverdata.</x:String>
+  <x:String x:Key="SyncServersUnblockAllDialogue">Serverdata har just uppdaterats av Valve. Alla blockerade servrar kommer att avblockeras för att synkronisera ny serverdata. Förinställningsposter för servrar som inte längre finns kommer att tas bort, och den senast valda förinställningen kommer att tillämpas igen om den fortfarande finns.</x:String>
   <x:String x:Key="NewVersionDialogue">Ny version tillgänglig! Gå till utgåvor?</x:String>
   <x:String x:Key="SelectOneServerToBlockDialogue">Välj minst en server att blockera</x:String>
   <x:String x:Key="SelectOneServerToUnblockDialogue">Välj minst en server att avblockera.</x:String>
diff --git a/ServerPickerX/Locales/Locale_tr-tr.axaml b/ServerPickerX/Locales/Locale_tr-tr.axaml
index bf6316d..619faa1 100644
--- a/ServerPickerX/Locales/Locale_tr-tr.axaml
+++ b/ServerPickerX/Locales/Locale_tr-tr.axaml
@@ -32,11 +32,11 @@
   <x:String x:Key="PresetNamePrompt">Geçerli oyun için bir ön ayar adı girin.</x:String>
   <x:String x:Key="PresetNameWatermark">Ön ayar adı</x:String>
   <x:String x:Key="MessageBoxInfoTitle">Bilgi</x:String>
-  <x:String x:Key="SyncServersUnblockAllDialogue">Sunucu verileri Valve tarafından güncellendi! Yeni sunucu verilerini senkronize etmek için tüm engellenen sunucuların engelleri kaldırılacak</x:String>
+  <x:String x:Key="SyncServersUnblockAllDialogue">Sunucu verileri Valve tarafından güncellendi! Yeni sunucu verilerini senkronize etmek için tüm engellenen sunucuların engelleri kaldırılacak. Artık mevcut olmayan sunuculara ait preset girdileri kaldırılacak ve varsa son seçilen preset yeniden uygulanacak.</x:String>
   <x:String x:Key="NewVersionDialogue">Yeni sürüm yayınlandı! Güncelle?</x:String>
   <x:String x:Key="SelectOneServerToBlockDialogue">Lütfen engellenecek en az bir sunucu seç</x:String>
   <x:String x:Key="SelectOneServerToUnblockDialogue">Lütfen engeli kaldırılacak en az bir sunucu seçin</x:String>
   <x:String x:Key="PendingOperationDialogue">Zaten bekleyen bir işlem var. Lütfen bekleyin...</x:String>
   <x:String x:Key="FirewallResetConfirmDialogue">Bu işlem güvenlik duvarını sıfırlayacak. Onaylıyor musun?</x:String>
   <x:String x:Key="FirewallResetSuccessDialogue">Güvenlik duvarı başarıyla sıfırlandı!</x:String>
-</ResourceDictionary>
\ No newline at end of file
+</ResourceDictionary>
diff --git a/ServerPickerX/Locales/Locale_zh-cn.axaml b/ServerPickerX/Locales/Locale_zh-cn.axaml
index 4d0b386..40d3bb8 100644
--- a/ServerPickerX/Locales/Locale_zh-cn.axaml
+++ b/ServerPickerX/Locales/Locale_zh-cn.axaml
@@ -32,7 +32,7 @@
   <x:String x:Key="PresetNamePrompt">为当前游戏输入一个预设名称。</x:String>
   <x:String x:Key="PresetNameWatermark">预设名称</x:String>
   <x:String x:Key="MessageBoxInfoTitle">信息</x:String>
-  <x:String x:Key="SyncServersUnblockAllDialogue">Valve刚刚更新了服务器数据！所有被屏蔽的服务器都将被解除屏蔽，以便同步新的服务器数据。</x:String>
+  <x:String x:Key="SyncServersUnblockAllDialogue">Valve 刚刚更新了服务器数据。所有被屏蔽的服务器都将被解除屏蔽，以便同步新的服务器数据。对于已不存在的服务器，其预设条目将被移除，并且如果可用，最后选中的预设将被重新应用。</x:String>
   <x:String x:Key="NewVersionDialogue">新版本已发布！前往发布页面？</x:String>
   <x:String x:Key="SelectOneServerToBlockDialogue">嘿！请至少选择一个服务器进行屏蔽。</x:String>
   <x:String x:Key="SelectOneServerToUnblockDialogue">嘿！请至少选择一个服务器进行解锁。</x:String>
diff --git a/ServerPickerX/Services/Servers/CS2PerfectWorldServerDataService.cs b/ServerPickerX/Services/Servers/CS2PerfectWorldServerDataService.cs
index aaed89d..b4a56b3 100644
--- a/ServerPickerX/Services/Servers/CS2PerfectWorldServerDataService.cs
+++ b/ServerPickerX/Services/Servers/CS2PerfectWorldServerDataService.cs
@@ -1,4 +1,3 @@
-using ServerPickerX.Settings;
 using ServerPickerX.Models;
 using System;
 using System.Collections.Generic;
@@ -14,8 +13,7 @@ namespace ServerPickerX.Services.Servers
     public class CS2PerfectWorldServerDataService(
         ILoggerService _logger,
         IMessageBoxService _messageBoxService,
-        HttpClient _httpClient,
-        JsonSetting _jsonSettings
+        HttpClient _httpClient
         ) : IServerDataService
     {
         private ServerData _serverData = new();
@@ -47,14 +45,6 @@ public async Task<bool> LoadServersAsync()
 
                 _serverData.Revision = revision;
 
-                // Update settings if app is initialized for the first time
-                if (_jsonSettings.cs2_server_revision == "-1")
-                {
-                    _jsonSettings.cs2_server_revision = revision;
-
-                    await _jsonSettings.SaveSettingsAsync();
-                }
-
                 ProcessServers(mainJson, _serverData);
             }
             catch (Exception ex)
@@ -158,4 +148,4 @@ private List<string> GetWhiteListedServerKeywords()
             return ["China"];
         }
     }
-}
\ No newline at end of file
+}
diff --git a/ServerPickerX/Services/Servers/CS2ServerDataService.cs b/ServerPickerX/Services/Servers/CS2ServerDataService.cs
index b3b928b..e29bc45 100644
--- a/ServerPickerX/Services/Servers/CS2ServerDataService.cs
+++ b/ServerPickerX/Services/Servers/CS2ServerDataService.cs
@@ -1,4 +1,3 @@
-using ServerPickerX.Settings;
 using ServerPickerX.Models;
 using System;
 using System.Collections.Generic;
@@ -14,8 +13,7 @@ namespace ServerPickerX.Services.Servers
     public class CS2ServerDataService(
         ILoggerService _logger,
         IMessageBoxService _messageBoxService,
-        HttpClient _httpClient,
-        JsonSetting _jsonSettings
+        HttpClient _httpClient
         ) : IServerDataService
     {
         private ServerData _serverData = new();
@@ -47,12 +45,6 @@ public async Task<bool> LoadServersAsync()
 
                 _serverData.Revision = revision;
 
-                // Update settings if app is initialized for the first time
-                if (_jsonSettings.cs2_server_revision == "-1")
-                {
-                    await _jsonSettings.SetRevisionByGameModeAsync(revision);
-                }
-
                 ProcessServers(mainJson, _serverData);
             }
             catch (Exception ex)
@@ -155,4 +147,4 @@ private List<string> GetExcludedServerKeywords()
             return ["China"];
         }
     }
-}
\ No newline at end of file
+}
diff --git a/ServerPickerX/Services/Servers/DeadLockServerDataService.cs b/ServerPickerX/Services/Servers/DeadLockServerDataService.cs
index f139ae7..d17beaf 100644
--- a/ServerPickerX/Services/Servers/DeadLockServerDataService.cs
+++ b/ServerPickerX/Services/Servers/DeadLockServerDataService.cs
@@ -1,4 +1,3 @@
-using ServerPickerX.Settings;
 using ServerPickerX.Models;
 using System;
 using System.Collections.Generic;
@@ -14,8 +13,7 @@ namespace ServerPickerX.Services.Servers
     public class DeadLockServerDataService(
         ILoggerService _logger,
         IMessageBoxService _messageBoxService,
-        HttpClient _httpClient,
-        JsonSetting _jsonSettings
+        HttpClient _httpClient
         ) : IServerDataService
     {
         private ServerData _serverData = new();
@@ -47,12 +45,6 @@ public async Task<bool> LoadServersAsync()
 
                 _serverData.Revision = revision;
 
-                // Update settings if app is initialized for the first time
-                if (_jsonSettings.deadlock_server_revision == "-1")
-                {
-                    await _jsonSettings.SetRevisionByGameModeAsync(revision);
-                }
-
                 ProcessServers(mainJson, _serverData);
             }
             catch (Exception ex)
@@ -142,4 +134,4 @@ public List<string> GetClusterKeywords()
             };
         }
     }
-}
\ No newline at end of file
+}
diff --git a/ServerPickerX/Services/Servers/MarathonServerDataService.cs b/ServerPickerX/Services/Servers/MarathonServerDataService.cs
index b549a28..a8cb480 100644
--- a/ServerPickerX/Services/Servers/MarathonServerDataService.cs
+++ b/ServerPickerX/Services/Servers/MarathonServerDataService.cs
@@ -1,4 +1,3 @@
-using ServerPickerX.Settings;
 using ServerPickerX.Models;
 using System;
 using System.Collections.Generic;
@@ -14,8 +13,7 @@ namespace ServerPickerX.Services.Servers
     public class MarathonServerDataService(
         ILoggerService _logger,
         IMessageBoxService _messageBoxService,
-        HttpClient _httpClient,
-        JsonSetting _jsonSettings
+        HttpClient _httpClient
         ) : IServerDataService
     {
         private ServerData _serverData = new();
@@ -47,12 +45,6 @@ public async Task<bool> LoadServersAsync()
 
                 _serverData.Revision = revision;
 
-                // Update settings if app is initialized for the first time
-                if (_jsonSettings.marathon_server_revision == "-1")
-                {
-                    await _jsonSettings.SetRevisionByGameModeAsync(revision);
-                }
-
                 ProcessServers(mainJson, _serverData);
             }
             catch (Exception ex)
@@ -143,4 +135,4 @@ public List<string> GetClusterKeywords()
             ];
         }
     }
-}
\ No newline at end of file
+}
diff --git a/ServerPickerX/Services/Settings/JsonSetting.cs b/ServerPickerX/Services/Settings/JsonSetting.cs
index c72cdb5..9baedae 100644
--- a/ServerPickerX/Services/Settings/JsonSetting.cs
+++ b/ServerPickerX/Services/Settings/JsonSetting.cs
@@ -296,5 +296,60 @@ public async Task RemovePresetAsync(string gameMode, string presetName)
 
             await SaveSettingsAsync();
         }
+
+        public async Task<bool> PrunePresetEntriesByGameModeAsync(
+            string gameMode,
+            HashSet<string> clusteredServerKeys,
+            HashSet<string> unclusteredServerKeys
+            )
+        {
+            if (string.IsNullOrWhiteSpace(gameMode))
+            {
+                return false;
+            }
+
+            server_presets ??= [];
+
+            bool presetsChanged = false;
+
+            foreach (ServerPresetModel preset in server_presets.Where(preset =>
+                         (preset.GameMode ?? string.Empty).Equals(gameMode, StringComparison.OrdinalIgnoreCase)))
+            {
+                HashSet<string> validServerKeys = preset.IsClustered
+                    ? clusteredServerKeys
+                    : unclusteredServerKeys;
+
+                List<string> prunedServerKeys = (preset.BlockedServerKeys ?? [])
+                    .Where(serverKey => !string.IsNullOrWhiteSpace(serverKey) && validServerKeys.Contains(serverKey))
+                    .Distinct(StringComparer.OrdinalIgnoreCase)
+                    .OrderBy(serverKey => serverKey, StringComparer.OrdinalIgnoreCase)
+                    .ToList();
+
+                List<string> currentServerKeys = (preset.BlockedServerKeys ?? [])
+                    .Where(serverKey => !string.IsNullOrWhiteSpace(serverKey))
+                    .Distinct(StringComparer.OrdinalIgnoreCase)
+                    .OrderBy(serverKey => serverKey, StringComparer.OrdinalIgnoreCase)
+                    .ToList();
+
+                if (currentServerKeys.SequenceEqual(prunedServerKeys, StringComparer.OrdinalIgnoreCase))
+                {
+                    continue;
+                }
+
+                preset.BlockedServerKeys = prunedServerKeys;
+                presetsChanged = true;
+            }
+
+            if (!presetsChanged)
+            {
+                return false;
+            }
+
+            await SaveSettingsAsync();
+
+            return true;
+        }
+
+
     }
 }
diff --git a/ServerPickerX/ViewModels/MainWindowViewModel.cs b/ServerPickerX/ViewModels/MainWindowViewModel.cs
index 844ae54..2fcff85 100644
--- a/ServerPickerX/ViewModels/MainWindowViewModel.cs
+++ b/ServerPickerX/ViewModels/MainWindowViewModel.cs
@@ -1,6 +1,7 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using MsBox.Avalonia.Enums;
+using ServerPickerX.Constants;
 using ServerPickerX.Extensions;
 using ServerPickerX.Models;
 using ServerPickerX.Services.DependencyInjection;
@@ -123,9 +124,6 @@ public async Task LoadServersAsync()
             await SetClusterStateAsync(_jsonSetting.is_clustered, false, false);
 
             ServerModelsInitialized = true;
-
-            LoadPresetPickerItems();
-            await RestoreLastSelectedPresetAsync();
         }
 
         [RelayCommand]
@@ -384,7 +382,7 @@ public async Task<bool> UnblockCurrentGameServersAsync()
         {
             if (ServerModels.Count == 0)
             {
-                return false;
+                return true;
             }
 
             return await PerformOperationAsync(false, new ObservableCollection<ServerModel>(ServerModels), false);
@@ -480,6 +478,74 @@ public IServerDataService GetServerDataService()
             return _serverDataService;
         }
 
+        public async Task<bool> PruneCurrentGamePresetEntriesAsync()
+        {
+            if (!ServersLoaded)
+            {
+                return false;
+            }
+
+            return await PrunePresetEntriesAsync(_jsonSetting.game_mode, _serverDataService.GetServerData());
+        }
+
+        public async Task<bool> PruneCounterStrikeFamilyPresetEntriesAsync()
+        {
+            // CS2 and Perfect World share one revision bucket, but their filtered server sets differ.
+            // When either mode syncs, prune the sibling mode too before marking the shared revision current.
+            if (_jsonSetting.game_mode == GameModes.CounterStrike2)
+            {
+                CS2PerfectWorldServerDataService perfectWorldServerDataService =
+                    ServiceLocator.GetRequiredService<CS2PerfectWorldServerDataService>();
+
+                if (!await perfectWorldServerDataService.LoadServersAsync())
+                {
+                    return false;
+                }
+
+                await PrunePresetEntriesAsync(
+                    GameModes.CounterStrike2PerfectWorld,
+                    perfectWorldServerDataService.GetServerData()
+                    );
+
+                return true;
+            }
+
+            CS2ServerDataService counterStrikeServerDataService =
+                ServiceLocator.GetRequiredService<CS2ServerDataService>();
+
+            if (!await counterStrikeServerDataService.LoadServersAsync())
+            {
+                return false;
+            }
+
+            await PrunePresetEntriesAsync(
+                GameModes.CounterStrike2,
+                counterStrikeServerDataService.GetServerData()
+                );
+
+            return true;
+        }
+
+        public async Task<bool> PrunePresetEntriesAsync(string gameMode, ServerData serverData)
+        {
+            HashSet<string> clusteredServerKeys = serverData.ClusteredServers
+                .Select(serverModel => serverModel.Description)
+                .Where(serverKey => !string.IsNullOrWhiteSpace(serverKey))
+                .ToHashSet(StringComparer.OrdinalIgnoreCase);
+            HashSet<string> unclusteredServerKeys = serverData.UnclusteredServers
+                .Select(serverModel => serverModel.Name)
+                .Where(serverKey => !string.IsNullOrWhiteSpace(serverKey))
+                .ToHashSet(StringComparer.OrdinalIgnoreCase);
+
+            bool presetsPruned = await _jsonSetting.PrunePresetEntriesByGameModeAsync(
+                gameMode,
+                clusteredServerKeys,
+                unclusteredServerKeys
+                );
+
+            return presetsPruned;
+        }
+
         private void TrackBlockedServerKeys(IEnumerable<ServerModel> serverModels, bool shouldBlock)
         {
             foreach (ServerModel serverModel in serverModels)
@@ -504,7 +570,7 @@ private string GetServerKey(ServerModel serverModel)
                 : serverModel.Name;
         }
 
-        private async Task RestoreLastSelectedPresetAsync()
+        public async Task RestoreLastSelectedPresetAsync()
         {
             if (!HasPresets)
             {
@@ -571,7 +637,7 @@ private ObservableCollection<ServerModel> GetMatchingServerModels(ServerPresetMo
         {
             return new ObservableCollection<ServerModel>(
                 ServerModels.Where(serverModel =>
-                    (serverPreset.BlockedServerKeys ?? [])
+                    serverPreset.BlockedServerKeys
                         .Contains(GetServerKey(serverModel), StringComparer.OrdinalIgnoreCase))
                 );
         }
diff --git a/ServerPickerX/Views/MainWindow.axaml.cs b/ServerPickerX/Views/MainWindow.axaml.cs
index 44c094b..68ce0c8 100644
--- a/ServerPickerX/Views/MainWindow.axaml.cs
+++ b/ServerPickerX/Views/MainWindow.axaml.cs
@@ -170,7 +170,7 @@ private async void SavePresetBtn_Click(object? sender, Avalonia.Interactivity.Ro
                 return;
             }
 
-            presetName = presetName?.Trim() ?? string.Empty;
+            presetName = presetName.Trim();
 
             if (string.IsNullOrWhiteSpace(presetName))
             {
@@ -259,14 +259,16 @@ public async Task InitializeApp()
 
             DataContext = vm;
 
-            ConfigurePresetControls(vm);
-            RefreshClusterButtonContent();
-
             if (vm.ServersLoaded)
             {
                 await SyncServersAsync(vm);
+                vm.LoadPresetPickerItems();
+                await vm.RestoreLastSelectedPresetAsync();
             }
 
+            ConfigurePresetControls(vm);
+            RefreshClusterButtonContent();
+
             await _versionService.CheckVersionAsync();
         }
 
@@ -314,24 +316,53 @@ private void ConfigurePresetControls(MainWindowViewModel vm)
 
         private async Task SyncServersAsync(MainWindowViewModel vm)
         {
-            // If Steam SDR API data got updated, sync the changes
             var localRevision = await _jsonSetting.GetRevisionByGameModeAsync();
 
             var fetchedRevision = vm.GetServerDataService().GetFetchedRevision();
 
+            bool isCounterStrikeFamilyGame = _jsonSetting.game_mode is
+                GameModes.CounterStrike2 or GameModes.CounterStrike2PerfectWorld;
+            bool hasAffectedPresets = isCounterStrikeFamilyGame
+                ? _jsonSetting.GetPresetsByGameMode(GameModes.CounterStrike2).Count > 0 ||
+                  _jsonSetting.GetPresetsByGameMode(GameModes.CounterStrike2PerfectWorld).Count > 0
+                : _jsonSetting.GetPresetsByGameMode(_jsonSetting.game_mode).Count > 0;
+
+            // Store the initial revision without a reset when this game has no saved presets yet.
+            if (localRevision == "-1" && !hasAffectedPresets)
+            {
+                await _jsonSetting.SetRevisionByGameModeAsync(fetchedRevision);
+                return;
+            }
+
             // Skip server unblocking and revision sync if local revision is equal to fetched revision
             if (localRevision == fetchedRevision)
             {
                 return;
             }
 
+            // This only happens on successful load and sync on startup or game switch
             await _messageBoxService.ShowMessageBoxAsync(
                     _localizationService.GetLocaleValue("MessageBoxInfoTitle"),
                     _localizationService.GetLocaleValue("SyncServersUnblockAllDialogue"),
                     MsBox.Avalonia.Enums.Icon.Setting
                     );
 
-            await vm.UnblockCurrentGameServersAsync();
+            bool unblocked = await vm.UnblockCurrentGameServersAsync();
+
+            if (!unblocked)
+            {
+                return;
+            }
+
+            await vm.PruneCurrentGamePresetEntriesAsync();
+
+            if (isCounterStrikeFamilyGame)
+            {
+                if (!await vm.PruneCounterStrikeFamilyPresetEntriesAsync())
+                {
+                    return;
+                }
+            }
 
             await _jsonSetting.SetRevisionByGameModeAsync(fetchedRevision);
         }

From ef096e810a461c73fcb584939f69a2aa48fd7655 Mon Sep 17 00:00:00 2001
From: JanitorialMess <65749353+JanitorialMess@users.noreply.github.com>
Date: Tue, 31 Mar 2026 23:09:28 -0400
Subject: [PATCH 04/10] refactor: move value equality to ServerPresetModel

---
 ServerPickerX/Models/ServerPresetModel.cs | 16 ++++++++++++++++
 ServerPickerX/Views/MainWindow.axaml.cs   |  3 +--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/ServerPickerX/Models/ServerPresetModel.cs b/ServerPickerX/Models/ServerPresetModel.cs
index 1fb2070..8e73bdd 100644
--- a/ServerPickerX/Models/ServerPresetModel.cs
+++ b/ServerPickerX/Models/ServerPresetModel.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 
 namespace ServerPickerX.Models
@@ -11,5 +12,20 @@ public class ServerPresetModel
         public bool IsClustered { get; set; }
 
         public List<string> BlockedServerKeys { get; set; } = [];
+
+        public override bool Equals(object? obj)
+        {
+            return obj is ServerPresetModel other &&
+                GameMode.Equals(other.GameMode, StringComparison.OrdinalIgnoreCase) &&
+                Name.Equals(other.Name, StringComparison.OrdinalIgnoreCase);
+        }
+
+        public override int GetHashCode()
+        {
+            return HashCode.Combine(
+                StringComparer.OrdinalIgnoreCase.GetHashCode(GameMode),
+                StringComparer.OrdinalIgnoreCase.GetHashCode(Name)
+            );
+        }
     }
 }
diff --git a/ServerPickerX/Views/MainWindow.axaml.cs b/ServerPickerX/Views/MainWindow.axaml.cs
index 68ce0c8..7a12fff 100644
--- a/ServerPickerX/Views/MainWindow.axaml.cs
+++ b/ServerPickerX/Views/MainWindow.axaml.cs
@@ -441,8 +441,7 @@ private static bool AreSamePresetSelection(ServerPresetModel? left, ServerPreset
                 return left == null && right == null;
             }
 
-            return left.GameMode.Equals(right.GameMode, StringComparison.OrdinalIgnoreCase) &&
-                left.Name.Equals(right.Name, StringComparison.OrdinalIgnoreCase);
+            return left.Equals(right);
         }
 
         private void RefreshClusterButtonContent()

From f21d0d75bf414712a229719750524a8c92ee3ef5 Mon Sep 17 00:00:00 2001
From: JanitorialMess <65749353+JanitorialMess@users.noreply.github.com>
Date: Fri, 3 Apr 2026 06:13:24 -0400
Subject: [PATCH 05/10] refactor: move preset management to a separate window

---
 .../Comparers/NaturalStringComparer.cs        | 110 ++++
 ServerPickerX/Locales/Locale_de-de.axaml      |  30 +-
 ServerPickerX/Locales/Locale_en-us.axaml      |  28 +-
 ServerPickerX/Locales/Locale_es-es.axaml      |  30 +-
 ServerPickerX/Locales/Locale_ja-jp.axaml      |  28 +-
 ServerPickerX/Locales/Locale_pl-pl.axaml      |  28 +-
 ServerPickerX/Locales/Locale_ru-ru.axaml      |  28 +-
 ServerPickerX/Locales/Locale_sv-se.axaml      |  28 +-
 ServerPickerX/Locales/Locale_tr-tr.axaml      |  28 +-
 ServerPickerX/Locales/Locale_zh-cn.axaml      |  28 +-
 .../Services/Settings/JsonSetting.cs          |   1 -
 .../ViewModels/MainWindowViewModel.cs         |  65 +-
 .../PresetManagerWindowViewModel.cs           | 602 ++++++++++++++++++
 ServerPickerX/Views/MainWindow.axaml          |  45 +-
 ServerPickerX/Views/MainWindow.axaml.cs       |  87 +--
 .../UserWindows/PresetManagerWindow.axaml     | 262 ++++++++
 .../UserWindows/PresetManagerWindow.axaml.cs  | 382 +++++++++++
 .../Views/UserWindows/PresetNameWindow.axaml  |  75 ---
 .../UserWindows/PresetNameWindow.axaml.cs     |  45 --
 19 files changed, 1567 insertions(+), 363 deletions(-)
 create mode 100644 ServerPickerX/Comparers/NaturalStringComparer.cs
 create mode 100644 ServerPickerX/ViewModels/PresetManagerWindowViewModel.cs
 create mode 100644 ServerPickerX/Views/UserWindows/PresetManagerWindow.axaml
 create mode 100644 ServerPickerX/Views/UserWindows/PresetManagerWindow.axaml.cs
 delete mode 100644 ServerPickerX/Views/UserWindows/PresetNameWindow.axaml
 delete mode 100644 ServerPickerX/Views/UserWindows/PresetNameWindow.axaml.cs

diff --git a/ServerPickerX/Comparers/NaturalStringComparer.cs b/ServerPickerX/Comparers/NaturalStringComparer.cs
new file mode 100644
index 0000000..be68255
--- /dev/null
+++ b/ServerPickerX/Comparers/NaturalStringComparer.cs
@@ -0,0 +1,110 @@
+using System;
+using System.Collections.Generic;
+
+namespace ServerPickerX.Comparers
+{
+    public sealed class NaturalStringComparer : IComparer<string>
+    {
+        public static NaturalStringComparer OrdinalIgnoreCase { get; } = new(StringComparison.OrdinalIgnoreCase);
+
+        private readonly StringComparison _stringComparison;
+
+        public NaturalStringComparer(StringComparison stringComparison)
+        {
+            _stringComparison = stringComparison;
+        }
+
+        public int Compare(string? left, string? right)
+        {
+            if (ReferenceEquals(left, right))
+            {
+                return 0;
+            }
+
+            if (left == null)
+            {
+                return -1;
+            }
+
+            if (right == null)
+            {
+                return 1;
+            }
+
+            int leftIndex = 0;
+            int rightIndex = 0;
+
+            while (leftIndex < left.Length && rightIndex < right.Length)
+            {
+                if (char.IsDigit(left[leftIndex]) && char.IsDigit(right[rightIndex]))
+                {
+                    int leftNumberStart = leftIndex;
+                    int rightNumberStart = rightIndex;
+
+                    while (leftIndex < left.Length && char.IsDigit(left[leftIndex]))
+                    {
+                        leftIndex++;
+                    }
+
+                    while (rightIndex < right.Length && char.IsDigit(right[rightIndex]))
+                    {
+                        rightIndex++;
+                    }
+
+                    ReadOnlySpan<char> leftDigits = left.AsSpan(leftNumberStart, leftIndex - leftNumberStart);
+                    ReadOnlySpan<char> rightDigits = right.AsSpan(rightNumberStart, rightIndex - rightNumberStart);
+
+                    int leftTrimmedStart = 0;
+                    while (leftTrimmedStart < leftDigits.Length - 1 && leftDigits[leftTrimmedStart] == '0')
+                    {
+                        leftTrimmedStart++;
+                    }
+
+                    int rightTrimmedStart = 0;
+                    while (rightTrimmedStart < rightDigits.Length - 1 && rightDigits[rightTrimmedStart] == '0')
+                    {
+                        rightTrimmedStart++;
+                    }
+
+                    ReadOnlySpan<char> leftTrimmedDigits = leftDigits[leftTrimmedStart..];
+                    ReadOnlySpan<char> rightTrimmedDigits = rightDigits[rightTrimmedStart..];
+
+                    if (leftTrimmedDigits.Length != rightTrimmedDigits.Length)
+                    {
+                        return leftTrimmedDigits.Length.CompareTo(rightTrimmedDigits.Length);
+                    }
+
+                    int digitComparison = leftTrimmedDigits.CompareTo(rightTrimmedDigits, StringComparison.Ordinal);
+
+                    if (digitComparison != 0)
+                    {
+                        return digitComparison;
+                    }
+
+                    if (leftDigits.Length != rightDigits.Length)
+                    {
+                        return leftDigits.Length.CompareTo(rightDigits.Length);
+                    }
+
+                    continue;
+                }
+
+                int characterComparison = string.Compare(
+                    left[leftIndex].ToString(),
+                    right[rightIndex].ToString(),
+                    _stringComparison
+                    );
+
+                if (characterComparison != 0)
+                {
+                    return characterComparison;
+                }
+
+                leftIndex++;
+                rightIndex++;
+            }
+
+            return left.Length.CompareTo(right.Length);
+        }
+    }
+}
diff --git a/ServerPickerX/Locales/Locale_de-de.axaml b/ServerPickerX/Locales/Locale_de-de.axaml
index ee7b083..a09e274 100644
--- a/ServerPickerX/Locales/Locale_de-de.axaml
+++ b/ServerPickerX/Locales/Locale_de-de.axaml
@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui"
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <x:String x:Key="LanguageCode">de-de</x:String>
   <x:String x:Key="ClusterServers">Server gruppieren</x:String>
@@ -10,8 +10,6 @@
   <x:String x:Key="BlockSelected">Ausgewählte blockieren</x:String>
   <x:String x:Key="UnblockAll">Alle freigeben</x:String>
   <x:String x:Key="UnblockSelected">Ausgewählte freigeben</x:String>
-  <x:String x:Key="SavePreset">Preset speichern</x:String>
-  <x:String x:Key="DeletePreset">Preset löschen</x:String>
   <x:String x:Key="SaveButtonText">Speichern</x:String>
   <x:String x:Key="CancelButtonText">Abbrechen</x:String>
   <x:String x:Key="CheckForNewVersion">Bei Start nach neuen Versionen suchen</x:String>
@@ -20,17 +18,9 @@
   <x:String x:Key="PresetToolTip">Preset auswählen</x:String>
   <x:String x:Key="ClusterUnclusterToolTip">Server gruppieren oder entgruppieren</x:String>
   <x:String x:Key="RefreshToolTip">Ping aller Server aktualisieren</x:String>
-  <x:String x:Key="SavePresetToolTip">Aktuell blockierte Server als Preset speichern</x:String>
-  <x:String x:Key="DeletePresetToolTip">Ausgewähltes Preset löschen</x:String>
   <x:String x:Key="SwapGameModeUnblockAllConflict">Diese Aktion wird zuerst alle Server freigeben, um Firewall-Konflikte zu vermeiden.</x:String>
-  <x:String x:Key="PresetDeleteConfirmDialogue">Preset '{0}' löschen?</x:String>
-  <x:String x:Key="PresetOverwriteConfirmDialogue">Ein Preset mit dem Namen '{0}' existiert für dieses Spiel bereits. Überschreiben?</x:String>
-  <x:String x:Key="PresetNameRequiredDialogue">Der Preset-Name darf nicht leer sein.</x:String>
   <x:String x:Key="LanguageComboBoxToolTip">Sprache auswählen</x:String>
   <x:String x:Key="ResetFirewallToolTip">Firewall-Regeln zurücksetzen</x:String>
-  <x:String x:Key="PresetNameTitle">Preset speichern</x:String>
-  <x:String x:Key="PresetNamePrompt">Einen Preset-Namen für das aktuelle Spiel eingeben.</x:String>
-  <x:String x:Key="PresetNameWatermark">Preset-Name</x:String>
   <x:String x:Key="MessageBoxInfoTitle">Info</x:String>
   <x:String x:Key="SyncServersUnblockAllDialogue">Die Serverdaten wurden gerade von Valve aktualisiert! Alle blockierten Server werden entsperrt, um die neuen Serverdaten zu synchronisieren. Preset-Einträge für Server, die nicht mehr existieren, werden entfernt, und das zuletzt ausgewählte Preset wird erneut angewendet, falls verfügbar.</x:String>
   <x:String x:Key="NewVersionDialogue">Neue Version verfügbar! Zu den Veröffentlichungen?</x:String>
@@ -39,4 +29,22 @@
   <x:String x:Key="PendingOperationDialogue">Moment! Ein Vorgang läuft bereits. Bitte warten Sie...</x:String>
   <x:String x:Key="FirewallResetConfirmDialogue">Dadurch wird versucht, die Firewall auf den Standardzustand zurückzusetzen. Aktion bestätigen?</x:String>
   <x:String x:Key="FirewallResetSuccessDialogue">Firewall erfolgreich zurückgesetzt!</x:String>
+  <x:String x:Key="Presets">Voreinstellungen</x:String>
+  <x:String x:Key="PresetsToolTip">Voreinstellungen verwalten</x:String>
+  <x:String x:Key="AddPreset">Hinzufügen</x:String>
+  <x:String x:Key="NewPresetName">Neues Preset</x:String>
+  <x:String x:Key="AddPresetToolTip">Neues Preset erstellen</x:String>
+  <x:String x:Key="DeletePreset">Löschen</x:String>
+  <x:String x:Key="DeletePresetToolTip">Ausgewählte Presets löschen</x:String>
+  <x:String x:Key="ApplyPreset">Anwenden</x:String>
+  <x:String x:Key="ApplyPresetToolTip">Ausgewähltes Preset anwenden</x:String>
+  <x:String x:Key="PresetsWindowTitle">Voreinstellungen</x:String>
+  <x:String x:Key="PresetServersHeader">Blockierte Server</x:String>
+  <x:String x:Key="BlockedColumnHeader">Blockiert</x:String>
+  <x:String x:Key="PresetListHeader">Voreinstellung</x:String>
+  <x:String x:Key="PresetDeleteConfirmDialogue">Preset '{0}' löschen?</x:String>
+  <x:String x:Key="PresetDeleteSelectedConfirmDialogue">Die {0} ausgewählten Presets löschen?</x:String>
+  <x:String x:Key="PresetOverwriteConfirmDialogue">Ein Preset mit dem Namen '{0}' existiert für dieses Spiel bereits. Überschreiben?</x:String>
+  <x:String x:Key="PresetChangeViewModeConfirmDialogue">Das Wechseln zwischen gruppierter und entgruppierter Ansicht löscht die blockierten Einträge dieses Presets. Fortfahren?</x:String>
+  <x:String x:Key="PresetNameRequiredDialogue">Der Preset-Name darf nicht leer sein.</x:String>
 </ResourceDictionary>
diff --git a/ServerPickerX/Locales/Locale_en-us.axaml b/ServerPickerX/Locales/Locale_en-us.axaml
index 333fe78..4ecc99f 100644
--- a/ServerPickerX/Locales/Locale_en-us.axaml
+++ b/ServerPickerX/Locales/Locale_en-us.axaml
@@ -10,8 +10,6 @@
   <x:String x:Key="BlockSelected">Block Selected</x:String>
   <x:String x:Key="UnblockAll">Unblock All</x:String>
   <x:String x:Key="UnblockSelected">Unblock Selected</x:String>
-  <x:String x:Key="SavePreset">Save Preset</x:String>
-  <x:String x:Key="DeletePreset">Delete Preset</x:String>
   <x:String x:Key="SaveButtonText">Save</x:String>
   <x:String x:Key="CancelButtonText">Cancel</x:String>
   <x:String x:Key="CheckForNewVersion">Check for new version on startup</x:String>
@@ -20,17 +18,9 @@
   <x:String x:Key="PresetToolTip">Select preset</x:String>
   <x:String x:Key="ClusterUnclusterToolTip">Group or ungroup servers</x:String>
   <x:String x:Key="RefreshToolTip">Refresh all server ping</x:String>
-  <x:String x:Key="SavePresetToolTip">Save the current blocked servers as a preset</x:String>
-  <x:String x:Key="DeletePresetToolTip">Delete the selected preset</x:String>
   <x:String x:Key="SwapGameModeUnblockAllConflict">This action will unblock all servers first to prevent firewall conflicts.</x:String>
-  <x:String x:Key="PresetDeleteConfirmDialogue">Delete the preset '{0}'?</x:String>
-  <x:String x:Key="PresetOverwriteConfirmDialogue">A preset named '{0}' already exists for this game. Overwrite it?</x:String>
-  <x:String x:Key="PresetNameRequiredDialogue">Preset name cannot be empty.</x:String>
   <x:String x:Key="LanguageComboBoxToolTip">Select language</x:String>
   <x:String x:Key="ResetFirewallToolTip">Reset firewall rules</x:String>
-  <x:String x:Key="PresetNameTitle">Save Preset</x:String>
-  <x:String x:Key="PresetNamePrompt">Enter a preset name for the current game.</x:String>
-  <x:String x:Key="PresetNameWatermark">Preset name</x:String>
   <x:String x:Key="MessageBoxInfoTitle">Info</x:String>
   <x:String x:Key="SyncServersUnblockAllDialogue">Server data just got updated by Valve! All blocked servers will be unblocked in order to synchronize new server data. Preset entries for servers that no longer exist will be removed, and the last selected preset will be reapplied if available.</x:String>
   <x:String x:Key="NewVersionDialogue">New version available! Go to releases?</x:String>
@@ -39,4 +29,22 @@
   <x:String x:Key="PendingOperationDialogue">Whoa! There's already a pending operation. Please wait...</x:String>
   <x:String x:Key="FirewallResetConfirmDialogue">This will attempt to reset firewall to its default state. Confirm action?</x:String>
   <x:String x:Key="FirewallResetSuccessDialogue">Firewall has been successfully reset!</x:String>
+  <x:String x:Key="Presets">Presets</x:String>
+  <x:String x:Key="PresetsToolTip">Manage presets</x:String>
+  <x:String x:Key="AddPreset">Add</x:String>
+  <x:String x:Key="NewPresetName">New Preset</x:String>
+  <x:String x:Key="AddPresetToolTip">Create a new preset</x:String>
+  <x:String x:Key="DeletePreset">Delete</x:String>
+  <x:String x:Key="DeletePresetToolTip">Delete selected presets</x:String>
+  <x:String x:Key="ApplyPreset">Apply</x:String>
+  <x:String x:Key="ApplyPresetToolTip">Apply the selected preset</x:String>
+  <x:String x:Key="PresetsWindowTitle">Presets</x:String>
+  <x:String x:Key="PresetServersHeader">Blocked Servers</x:String>
+  <x:String x:Key="BlockedColumnHeader">Blocked</x:String>
+  <x:String x:Key="PresetListHeader">Preset</x:String>
+  <x:String x:Key="PresetDeleteConfirmDialogue">Delete the preset '{0}'?</x:String>
+  <x:String x:Key="PresetDeleteSelectedConfirmDialogue">Delete the {0} selected presets?</x:String>
+  <x:String x:Key="PresetOverwriteConfirmDialogue">A preset named '{0}' already exists for this game. Overwrite it?</x:String>
+  <x:String x:Key="PresetChangeViewModeConfirmDialogue">Changing between clustered and unclustered view will clear this preset's blocked entries. Continue?</x:String>
+  <x:String x:Key="PresetNameRequiredDialogue">Preset name cannot be empty.</x:String>
 </ResourceDictionary>
diff --git a/ServerPickerX/Locales/Locale_es-es.axaml b/ServerPickerX/Locales/Locale_es-es.axaml
index bd4c311..ed19545 100644
--- a/ServerPickerX/Locales/Locale_es-es.axaml
+++ b/ServerPickerX/Locales/Locale_es-es.axaml
@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui"
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <x:String x:Key="LanguageCode">es-es</x:String>
   <x:String x:Key="ClusterServers">Servidores de clúster</x:String>
@@ -10,8 +10,6 @@
   <x:String x:Key="BlockSelected">Bloque Seleccionado</x:String>
   <x:String x:Key="UnblockAll">Desbloquear Todo</x:String>
   <x:String x:Key="UnblockSelected">Desbloquear Seleccionado</x:String>
-  <x:String x:Key="SavePreset">Guardar preset</x:String>
-  <x:String x:Key="DeletePreset">Eliminar preset</x:String>
   <x:String x:Key="SaveButtonText">Guardar</x:String>
   <x:String x:Key="CancelButtonText">Cancelar</x:String>
   <x:String x:Key="CheckForNewVersion">Comprobar si hay nueva versión al iniciar</x:String>
@@ -20,17 +18,9 @@
   <x:String x:Key="PresetToolTip">Seleccionar preset</x:String>
   <x:String x:Key="ClusterUnclusterToolTip">Agrupar o desagrupar servidores</x:String>
   <x:String x:Key="RefreshToolTip">Actualizar el ping de todos los servidores</x:String>
-  <x:String x:Key="SavePresetToolTip">Guardar los servidores bloqueados actuales como un preset</x:String>
-  <x:String x:Key="DeletePresetToolTip">Eliminar el preset seleccionado</x:String>
   <x:String x:Key="SwapGameModeUnblockAllConflict">Esta acción desbloqueará primero todos los servidores para evitar conflictos de firewall.</x:String>
-  <x:String x:Key="PresetDeleteConfirmDialogue">¿Eliminar el preset '{0}'?</x:String>
-  <x:String x:Key="PresetOverwriteConfirmDialogue">Ya existe un preset llamado '{0}' para este juego. ¿Sobrescribirlo?</x:String>
-  <x:String x:Key="PresetNameRequiredDialogue">El nombre del preset no puede estar vacío.</x:String>
   <x:String x:Key="LanguageComboBoxToolTip">Seleccionar idioma</x:String>
   <x:String x:Key="ResetFirewallToolTip">Restablecer reglas del firewall</x:String>
-  <x:String x:Key="PresetNameTitle">Guardar preset</x:String>
-  <x:String x:Key="PresetNamePrompt">Introduce un nombre de preset para el juego actual.</x:String>
-  <x:String x:Key="PresetNameWatermark">Nombre del preset</x:String>
   <x:String x:Key="MessageBoxInfoTitle">Información</x:String>
   <x:String x:Key="SyncServersUnblockAllDialogue">Valve acaba de actualizar los datos del servidor. Todos los servidores bloqueados se desbloquearán para sincronizar los nuevos datos. Se eliminarán las entradas del preset correspondientes a servidores que ya no existen y, si está disponible, se volverá a aplicar el último preset seleccionado.</x:String>
   <x:String x:Key="NewVersionDialogue">¡Nueva versión disponible! ¿Ir a lanzamientos?</x:String>
@@ -39,4 +29,22 @@
   <x:String x:Key="PendingOperationDialogue">¡Vaya! Ya hay una operación pendiente. Por favor, espere...</x:String>
   <x:String x:Key="FirewallResetConfirmDialogue">Esto intentará restablecer el cortafuegos a su estado predeterminado. ¿Confirma la acción?</x:String>
   <x:String x:Key="FirewallResetSuccessDialogue">¡El cortafuegos se ha restablecido correctamente a su estado predeterminado!</x:String>
+  <x:String x:Key="Presets">Preajustes</x:String>
+  <x:String x:Key="PresetsToolTip">Administrar preajustes</x:String>
+  <x:String x:Key="AddPreset">Añadir</x:String>
+  <x:String x:Key="NewPresetName">Nuevo preajuste</x:String>
+  <x:String x:Key="AddPresetToolTip">Crear un nuevo preajuste</x:String>
+  <x:String x:Key="DeletePreset">Eliminar</x:String>
+  <x:String x:Key="DeletePresetToolTip">Eliminar los preajustes seleccionados</x:String>
+  <x:String x:Key="ApplyPreset">Aplicar</x:String>
+  <x:String x:Key="ApplyPresetToolTip">Aplicar el preajuste seleccionado</x:String>
+  <x:String x:Key="PresetsWindowTitle">Preajustes</x:String>
+  <x:String x:Key="PresetServersHeader">Servidores bloqueados</x:String>
+  <x:String x:Key="BlockedColumnHeader">Bloqueado</x:String>
+  <x:String x:Key="PresetListHeader">Preajuste</x:String>
+  <x:String x:Key="PresetDeleteConfirmDialogue">¿Eliminar el preset '{0}'?</x:String>
+  <x:String x:Key="PresetDeleteSelectedConfirmDialogue">¿Eliminar los {0} preajustes seleccionados?</x:String>
+  <x:String x:Key="PresetOverwriteConfirmDialogue">Ya existe un preset llamado '{0}' para este juego. ¿Sobrescribirlo?</x:String>
+  <x:String x:Key="PresetChangeViewModeConfirmDialogue">Cambiar entre la vista agrupada y no agrupada borrará las entradas bloqueadas de este preajuste. ¿Continuar?</x:String>
+  <x:String x:Key="PresetNameRequiredDialogue">El nombre del preset no puede estar vacío.</x:String>
 </ResourceDictionary>
diff --git a/ServerPickerX/Locales/Locale_ja-jp.axaml b/ServerPickerX/Locales/Locale_ja-jp.axaml
index 8c7d27b..82aef1f 100644
--- a/ServerPickerX/Locales/Locale_ja-jp.axaml
+++ b/ServerPickerX/Locales/Locale_ja-jp.axaml
@@ -10,8 +10,6 @@
   <x:String x:Key="BlockSelected">選択したサーバーをブロック</x:String>
   <x:String x:Key="UnblockAll">すべて解除</x:String>
   <x:String x:Key="UnblockSelected">選択したサーバーを解除</x:String>
-  <x:String x:Key="SavePreset">プリセットを保存</x:String>
-  <x:String x:Key="DeletePreset">プリセットを削除</x:String>
   <x:String x:Key="SaveButtonText">保存</x:String>
   <x:String x:Key="CancelButtonText">キャンセル</x:String>
   <x:String x:Key="CheckForNewVersion">起動時に新しいバージョンを確認</x:String>
@@ -20,17 +18,9 @@
   <x:String x:Key="PresetToolTip">プリセットを選択</x:String>
   <x:String x:Key="ClusterUnclusterToolTip">サーバーをグループ化またはグループ解除</x:String>
   <x:String x:Key="RefreshToolTip">すべてのサーバーの ping を更新</x:String>
-  <x:String x:Key="SavePresetToolTip">現在ブロック中のサーバーをプリセットとして保存</x:String>
-  <x:String x:Key="DeletePresetToolTip">選択したプリセットを削除</x:String>
   <x:String x:Key="SwapGameModeUnblockAllConflict">この操作は、ファイアウォールの競合を防ぐためにまずすべてのサーバーを解除します。</x:String>
-  <x:String x:Key="PresetDeleteConfirmDialogue">プリセット '{0}' を削除しますか？</x:String>
-  <x:String x:Key="PresetOverwriteConfirmDialogue">このゲームには '{0}' という名前のプリセットが既にあります。上書きしますか？</x:String>
-  <x:String x:Key="PresetNameRequiredDialogue">プリセット名は空にできません。</x:String>
   <x:String x:Key="LanguageComboBoxToolTip">言語を選択</x:String>
   <x:String x:Key="ResetFirewallToolTip">ファイアウォールルールをリセット</x:String>
-  <x:String x:Key="PresetNameTitle">プリセットを保存</x:String>
-  <x:String x:Key="PresetNamePrompt">現在のゲーム用のプリセット名を入力してください。</x:String>
-  <x:String x:Key="PresetNameWatermark">プリセット名</x:String>
   <x:String x:Key="MessageBoxInfoTitle">情報</x:String>
   <x:String x:Key="SyncServersUnblockAllDialogue">Valve によってサーバーデータが更新されました。新しいサーバーデータと同期するために、ブロックされていたすべてのサーバーのブロックが解除されます。存在しなくなったサーバーのプリセット項目は削除され、可能であれば最後に選択したプリセットが再適用されます。</x:String>
   <x:String x:Key="NewVersionDialogue">新バージョンがリリースされました！リリース一覧へどうぞ。</x:String>
@@ -39,4 +29,22 @@
   <x:String x:Key="PendingOperationDialogue">おっと！既に処理が実行されています。しばらくお待ちください。</x:String>
   <x:String x:Key="FirewallResetConfirmDialogue">これにより、ファイアウォールがデフォルトの状態にリセットされます。操作を確定しますか？</x:String>
   <x:String x:Key="FirewallResetSuccessDialogue">ファイアウォールが正常にリセットされました！</x:String>
+  <x:String x:Key="Presets">プリセット</x:String>
+  <x:String x:Key="PresetsToolTip">プリセットの管理</x:String>
+  <x:String x:Key="AddPreset">追加</x:String>
+  <x:String x:Key="NewPresetName">新しいプリセット</x:String>
+  <x:String x:Key="AddPresetToolTip">新しいプリセットを作成</x:String>
+  <x:String x:Key="DeletePreset">削除</x:String>
+  <x:String x:Key="DeletePresetToolTip">選択したプリセットを削除</x:String>
+  <x:String x:Key="ApplyPreset">適用</x:String>
+  <x:String x:Key="ApplyPresetToolTip">選択したプリセットを適用</x:String>
+  <x:String x:Key="PresetsWindowTitle">プリセット</x:String>
+  <x:String x:Key="PresetServersHeader">ブロック中のサーバー</x:String>
+  <x:String x:Key="BlockedColumnHeader">ブロック</x:String>
+  <x:String x:Key="PresetListHeader">プリセット</x:String>
+  <x:String x:Key="PresetDeleteConfirmDialogue">プリセット '{0}' を削除しますか？</x:String>
+  <x:String x:Key="PresetDeleteSelectedConfirmDialogue">選択した {0} 個のプリセットを削除しますか？</x:String>
+  <x:String x:Key="PresetOverwriteConfirmDialogue">このゲームには '{0}' という名前のプリセットが既にあります。上書きしますか？</x:String>
+  <x:String x:Key="PresetChangeViewModeConfirmDialogue">クラスタ表示と非クラスタ表示を切り替えると、このプリセットのブロック済み項目は消去されます。続行しますか？</x:String>
+  <x:String x:Key="PresetNameRequiredDialogue">プリセット名は空にできません。</x:String>
 </ResourceDictionary>
diff --git a/ServerPickerX/Locales/Locale_pl-pl.axaml b/ServerPickerX/Locales/Locale_pl-pl.axaml
index 37129ab..edf2f13 100644
--- a/ServerPickerX/Locales/Locale_pl-pl.axaml
+++ b/ServerPickerX/Locales/Locale_pl-pl.axaml
@@ -10,8 +10,6 @@
   <x:String x:Key="BlockSelected">Blok wybrany</x:String>
   <x:String x:Key="UnblockAll">Odblokuj wszystko</x:String>
   <x:String x:Key="UnblockSelected">Odblokuj wybrane</x:String>
-  <x:String x:Key="SavePreset">Zapisz preset</x:String>
-  <x:String x:Key="DeletePreset">Usuń preset</x:String>
   <x:String x:Key="SaveButtonText">Zapisz</x:String>
   <x:String x:Key="CancelButtonText">Anuluj</x:String>
   <x:String x:Key="CheckForNewVersion">Sprawdź nową wersję podczas uruchamiania</x:String>
@@ -20,17 +18,9 @@
   <x:String x:Key="PresetToolTip">Wybierz preset</x:String>
   <x:String x:Key="ClusterUnclusterToolTip">Grupowanie lub rozgrupowywanie serwerów</x:String>
   <x:String x:Key="RefreshToolTip">Odśwież ping wszystkich serwerów</x:String>
-  <x:String x:Key="SavePresetToolTip">Zapisz aktualnie zablokowane serwery jako preset</x:String>
-  <x:String x:Key="DeletePresetToolTip">Usuń wybrany preset</x:String>
   <x:String x:Key="SwapGameModeUnblockAllConflict">Ta czynność odblokuje najpierw wszystkie serwery, aby zapobiec konfliktom z zaporą sieciową.</x:String>
-  <x:String x:Key="PresetDeleteConfirmDialogue">Usunąć preset '{0}'?</x:String>
-  <x:String x:Key="PresetOverwriteConfirmDialogue">Preset o nazwie '{0}' już istnieje dla tej gry. Nadpisać?</x:String>
-  <x:String x:Key="PresetNameRequiredDialogue">Nazwa presetu nie może być pusta.</x:String>
   <x:String x:Key="LanguageComboBoxToolTip">Wybierz język</x:String>
   <x:String x:Key="ResetFirewallToolTip">Zresetuj reguły zapory sieciowej</x:String>
-  <x:String x:Key="PresetNameTitle">Zapisz preset</x:String>
-  <x:String x:Key="PresetNamePrompt">Wpisz nazwę presetu dla bieżącej gry.</x:String>
-  <x:String x:Key="PresetNameWatermark">Nazwa presetu</x:String>
   <x:String x:Key="MessageBoxInfoTitle">informacje</x:String>
   <x:String x:Key="SyncServersUnblockAllDialogue">Valve właśnie zaktualizowało dane serwerów. Wszystkie zablokowane serwery zostaną odblokowane, aby zsynchronizować nowe dane serwera. Wpisy presetów dla serwerów, które już nie istnieją, zostaną usunięte, a ostatnio wybrany preset zostanie zastosowany ponownie, jeśli jest dostępny.</x:String>
   <x:String x:Key="NewVersionDialogue">Nowa wersja dostępna! Przejdź do wydań?</x:String>
@@ -39,4 +29,22 @@
   <x:String x:Key="PendingOperationDialogue">Ojej! Jest już operacja w toku. Proszę czekać...</x:String>
   <x:String x:Key="FirewallResetConfirmDialogue">Spowoduje to próbę przywrócenia zapory do stanu domyślnego. Czy potwierdzić działanie?</x:String>
   <x:String x:Key="FirewallResetSuccessDialogue">Zapora sieciowa została pomyślnie zresetowana!</x:String>
+  <x:String x:Key="Presets">Presety</x:String>
+  <x:String x:Key="PresetsToolTip">Zarządzaj presetami</x:String>
+  <x:String x:Key="AddPreset">Dodaj</x:String>
+  <x:String x:Key="NewPresetName">Nowy preset</x:String>
+  <x:String x:Key="AddPresetToolTip">Utwórz nowy preset</x:String>
+  <x:String x:Key="DeletePreset">Usuń</x:String>
+  <x:String x:Key="DeletePresetToolTip">Usuń wybrane presety</x:String>
+  <x:String x:Key="ApplyPreset">Zastosuj</x:String>
+  <x:String x:Key="ApplyPresetToolTip">Zastosuj wybrany preset</x:String>
+  <x:String x:Key="PresetsWindowTitle">Presety</x:String>
+  <x:String x:Key="PresetServersHeader">Zablokowane serwery</x:String>
+  <x:String x:Key="BlockedColumnHeader">Zablokowany</x:String>
+  <x:String x:Key="PresetListHeader">Preset</x:String>
+  <x:String x:Key="PresetDeleteConfirmDialogue">Usunąć preset '{0}'?</x:String>
+  <x:String x:Key="PresetDeleteSelectedConfirmDialogue">Usunąć {0} wybranych presetów?</x:String>
+  <x:String x:Key="PresetOverwriteConfirmDialogue">Preset o nazwie '{0}' już istnieje dla tej gry. Nadpisać?</x:String>
+  <x:String x:Key="PresetChangeViewModeConfirmDialogue">Przełączenie między widokiem grupowanym i niegrupowanym wyczyści zablokowane wpisy tego presetu. Kontynuować?</x:String>
+  <x:String x:Key="PresetNameRequiredDialogue">Nazwa presetu nie może być pusta.</x:String>
 </ResourceDictionary>
diff --git a/ServerPickerX/Locales/Locale_ru-ru.axaml b/ServerPickerX/Locales/Locale_ru-ru.axaml
index 3298ec9..4a2349c 100644
--- a/ServerPickerX/Locales/Locale_ru-ru.axaml
+++ b/ServerPickerX/Locales/Locale_ru-ru.axaml
@@ -10,8 +10,6 @@
   <x:String x:Key="BlockSelected">Блокировать выбранные</x:String>
   <x:String x:Key="UnblockAll">Разблокировать все</x:String>
   <x:String x:Key="UnblockSelected">Разблокировать выбранные</x:String>
-  <x:String x:Key="SavePreset">Сохранить пресет</x:String>
-  <x:String x:Key="DeletePreset">Удалить пресет</x:String>
   <x:String x:Key="SaveButtonText">Сохранить</x:String>
   <x:String x:Key="CancelButtonText">Отмена</x:String>
   <x:String x:Key="CheckForNewVersion">Проверять новые версии при запуске</x:String>
@@ -20,17 +18,9 @@
   <x:String x:Key="PresetToolTip">Выбрать пресет</x:String>
   <x:String x:Key="ClusterUnclusterToolTip">Группировать или разгруппировать серверы</x:String>
   <x:String x:Key="RefreshToolTip">Обновить пинг всех серверов</x:String>
-  <x:String x:Key="SavePresetToolTip">Сохранить текущие заблокированные серверы как пресет</x:String>
-  <x:String x:Key="DeletePresetToolTip">Удалить выбранный пресет</x:String>
   <x:String x:Key="SwapGameModeUnblockAllConflict">Это действие сначала разблокирует все сервера для предотвращения конфликтов брандмауэра.</x:String>
-  <x:String x:Key="PresetDeleteConfirmDialogue">Удалить пресет '{0}'?</x:String>
-  <x:String x:Key="PresetOverwriteConfirmDialogue">Пресет с именем '{0}' уже существует для этой игры. Перезаписать его?</x:String>
-  <x:String x:Key="PresetNameRequiredDialogue">Имя пресета не может быть пустым.</x:String>
   <x:String x:Key="LanguageComboBoxToolTip">Выберите язык</x:String>
   <x:String x:Key="ResetFirewallToolTip">Сбросить правила брандмауэра</x:String>
-  <x:String x:Key="PresetNameTitle">Сохранить пресет</x:String>
-  <x:String x:Key="PresetNamePrompt">Введите имя пресета для текущей игры.</x:String>
-  <x:String x:Key="PresetNameWatermark">Имя пресета</x:String>
   <x:String x:Key="MessageBoxInfoTitle">информация</x:String>
   <x:String x:Key="SyncServersUnblockAllDialogue">Valve обновила данные серверов. Все заблокированные серверы будут разблокированы для синхронизации новых данных. Записи пресета для серверов, которые больше не существуют, будут удалены, а последний выбранный пресет будет применен снова, если он доступен.</x:String>
   <x:String x:Key="NewVersionDialogue">Доступна новая версия! Перейти к релизам?</x:String>
@@ -39,4 +29,22 @@
   <x:String x:Key="PendingOperationDialogue">Ого! Уже есть ожидающая операция. Пожалуйста, подождите...</x:String>
   <x:String x:Key="FirewallResetConfirmDialogue">Это попытается сбросить брандмауэр до состояния по умолчанию. Подтвердите действие?</x:String>
   <x:String x:Key="FirewallResetSuccessDialogue">Межсетевой экран успешно перезагружен и вернулся в состояние по умолчанию!</x:String>
+  <x:String x:Key="Presets">Пресеты</x:String>
+  <x:String x:Key="PresetsToolTip">Управление пресетами</x:String>
+  <x:String x:Key="AddPreset">Добавить</x:String>
+  <x:String x:Key="NewPresetName">Новый пресет</x:String>
+  <x:String x:Key="AddPresetToolTip">Создать новый пресет</x:String>
+  <x:String x:Key="DeletePreset">Удалить</x:String>
+  <x:String x:Key="DeletePresetToolTip">Удалить выбранные пресеты</x:String>
+  <x:String x:Key="ApplyPreset">Применить</x:String>
+  <x:String x:Key="ApplyPresetToolTip">Применить выбранный пресет</x:String>
+  <x:String x:Key="PresetsWindowTitle">Пресеты</x:String>
+  <x:String x:Key="PresetServersHeader">Заблокированные серверы</x:String>
+  <x:String x:Key="BlockedColumnHeader">Блок</x:String>
+  <x:String x:Key="PresetListHeader">Пресет</x:String>
+  <x:String x:Key="PresetDeleteConfirmDialogue">Удалить пресет '{0}'?</x:String>
+  <x:String x:Key="PresetDeleteSelectedConfirmDialogue">Удалить {0} выбранных пресетов?</x:String>
+  <x:String x:Key="PresetOverwriteConfirmDialogue">Пресет с именем '{0}' уже существует для этой игры. Перезаписать его?</x:String>
+  <x:String x:Key="PresetChangeViewModeConfirmDialogue">Переключение между сгруппированным и несгруппированным видом очистит заблокированные записи этого пресета. Продолжить?</x:String>
+  <x:String x:Key="PresetNameRequiredDialogue">Имя пресета не может быть пустым.</x:String>
 </ResourceDictionary>
diff --git a/ServerPickerX/Locales/Locale_sv-se.axaml b/ServerPickerX/Locales/Locale_sv-se.axaml
index 3ec510c..aee60b9 100644
--- a/ServerPickerX/Locales/Locale_sv-se.axaml
+++ b/ServerPickerX/Locales/Locale_sv-se.axaml
@@ -10,8 +10,6 @@
   <x:String x:Key="BlockSelected">Blockera valda</x:String>
   <x:String x:Key="UnblockAll">Avblockera alla</x:String>
   <x:String x:Key="UnblockSelected">Avblockera valda</x:String>
-  <x:String x:Key="SavePreset">Spara förinställning</x:String>
-  <x:String x:Key="DeletePreset">Ta bort förinställning</x:String>
   <x:String x:Key="SaveButtonText">Spara</x:String>
   <x:String x:Key="CancelButtonText">Avbryt</x:String>
   <x:String x:Key="CheckForNewVersion">Kontrollera efter ny version vid start</x:String>
@@ -20,17 +18,9 @@
   <x:String x:Key="PresetToolTip">Välj förinställning</x:String>
   <x:String x:Key="ClusterUnclusterToolTip">Gruppera eller avgruppera servrar</x:String>
   <x:String x:Key="RefreshToolTip">Uppdatera ping för alla servrar</x:String>
-  <x:String x:Key="SavePresetToolTip">Spara de nuvarande blockerade servrarna som en förinställning</x:String>
-  <x:String x:Key="DeletePresetToolTip">Ta bort den valda förinställningen</x:String>
   <x:String x:Key="SwapGameModeUnblockAllConflict">Detta åtgärder kommer att avblockera alla servrar först för att undvika brandvägskonflikter.</x:String>
-  <x:String x:Key="PresetDeleteConfirmDialogue">Ta bort förinställningen '{0}'?</x:String>
-  <x:String x:Key="PresetOverwriteConfirmDialogue">En förinställning med namnet '{0}' finns redan för det här spelet. Skriva över den?</x:String>
-  <x:String x:Key="PresetNameRequiredDialogue">Namnet på förinställningen får inte vara tomt.</x:String>
   <x:String x:Key="LanguageComboBoxToolTip">Välj språk</x:String>
   <x:String x:Key="ResetFirewallToolTip">Återställ brandväggsregler</x:String>
-  <x:String x:Key="PresetNameTitle">Spara förinställning</x:String>
-  <x:String x:Key="PresetNamePrompt">Ange ett namn på förinställningen för det aktuella spelet.</x:String>
-  <x:String x:Key="PresetNameWatermark">Namn på förinställning</x:String>
   <x:String x:Key="MessageBoxInfoTitle">info</x:String>
   <x:String x:Key="SyncServersUnblockAllDialogue">Serverdata har just uppdaterats av Valve. Alla blockerade servrar kommer att avblockeras för att synkronisera ny serverdata. Förinställningsposter för servrar som inte längre finns kommer att tas bort, och den senast valda förinställningen kommer att tillämpas igen om den fortfarande finns.</x:String>
   <x:String x:Key="NewVersionDialogue">Ny version tillgänglig! Gå till utgåvor?</x:String>
@@ -39,4 +29,22 @@
   <x:String x:Key="PendingOperationDialogue">Oj! Det finns redan en väntande åtgärd. Vänta...</x:String>
   <x:String x:Key="FirewallResetConfirmDialogue">Detta kommer att försöka återställa brandväggen till standardläget. Bekräfta åtgärd?</x:String>
   <x:String x:Key="FirewallResetSuccessDialogue">Brandväggen har återställts!</x:String>
+  <x:String x:Key="Presets">Förinställningar</x:String>
+  <x:String x:Key="PresetsToolTip">Hantera förinställningar</x:String>
+  <x:String x:Key="AddPreset">Lägg till</x:String>
+  <x:String x:Key="NewPresetName">Ny förinställning</x:String>
+  <x:String x:Key="AddPresetToolTip">Skapa en ny förinställning</x:String>
+  <x:String x:Key="DeletePreset">Ta bort</x:String>
+  <x:String x:Key="DeletePresetToolTip">Ta bort markerade förinställningar</x:String>
+  <x:String x:Key="ApplyPreset">Verkställ</x:String>
+  <x:String x:Key="ApplyPresetToolTip">Verkställ vald förinställning</x:String>
+  <x:String x:Key="PresetsWindowTitle">Förinställningar</x:String>
+  <x:String x:Key="PresetServersHeader">Blockerade servrar</x:String>
+  <x:String x:Key="BlockedColumnHeader">Blockerad</x:String>
+  <x:String x:Key="PresetListHeader">Förinställning</x:String>
+  <x:String x:Key="PresetDeleteConfirmDialogue">Ta bort förinställningen '{0}'?</x:String>
+  <x:String x:Key="PresetDeleteSelectedConfirmDialogue">Ta bort de {0} valda förinställningarna?</x:String>
+  <x:String x:Key="PresetOverwriteConfirmDialogue">En förinställning med namnet '{0}' finns redan för det här spelet. Skriva över den?</x:String>
+  <x:String x:Key="PresetChangeViewModeConfirmDialogue">Att växla mellan grupperad och ogrupperad vy kommer att rensa det här förinställets blockerade poster. Fortsätta?</x:String>
+  <x:String x:Key="PresetNameRequiredDialogue">Namnet på förinställningen får inte vara tomt.</x:String>
 </ResourceDictionary>
diff --git a/ServerPickerX/Locales/Locale_tr-tr.axaml b/ServerPickerX/Locales/Locale_tr-tr.axaml
index 619faa1..e5962ce 100644
--- a/ServerPickerX/Locales/Locale_tr-tr.axaml
+++ b/ServerPickerX/Locales/Locale_tr-tr.axaml
@@ -10,8 +10,6 @@
   <x:String x:Key="BlockSelected">Seçili olanları engelle</x:String>
   <x:String x:Key="UnblockAll">Tüm engellemeleri kaldır</x:String>
   <x:String x:Key="UnblockSelected">Seçili engellemeleri kaldır</x:String>
-  <x:String x:Key="SavePreset">Ön ayarı kaydet</x:String>
-  <x:String x:Key="DeletePreset">Ön ayarı sil</x:String>
   <x:String x:Key="SaveButtonText">Kaydet</x:String>
   <x:String x:Key="CancelButtonText">İptal</x:String>
   <x:String x:Key="CheckForNewVersion">Başlangıçta yeni versiyonları denetle</x:String>
@@ -20,17 +18,9 @@
   <x:String x:Key="PresetToolTip">Ön ayar seç</x:String>
   <x:String x:Key="ClusterUnclusterToolTip">Sunucuları grupla veya gruplamayı kaldır</x:String>
   <x:String x:Key="RefreshToolTip">Tüm sunucu gecikmelerini yenile</x:String>
-  <x:String x:Key="SavePresetToolTip">Geçerli engellenen sunucuları ön ayar olarak kaydet</x:String>
-  <x:String x:Key="DeletePresetToolTip">Seçili ön ayarı sil</x:String>
   <x:String x:Key="SwapGameModeUnblockAllConflict">Bu işlem, güvenlik duvarı çakışmalarını önlemek amacıyla önce tüm sunucuların engellemelerini kaldıracak.</x:String>
-  <x:String x:Key="PresetDeleteConfirmDialogue">'{0}' ön ayarı silinsin mi?</x:String>
-  <x:String x:Key="PresetOverwriteConfirmDialogue">Bu oyun için '{0}' adında bir ön ayar zaten var. Üzerine yazılsın mı?</x:String>
-  <x:String x:Key="PresetNameRequiredDialogue">Ön ayar adı boş olamaz.</x:String>
   <x:String x:Key="LanguageComboBoxToolTip">Dil seç</x:String>
   <x:String x:Key="ResetFirewallToolTip">Güvenlik duvarı kurallarını sıfırla</x:String>
-  <x:String x:Key="PresetNameTitle">Ön ayarı kaydet</x:String>
-  <x:String x:Key="PresetNamePrompt">Geçerli oyun için bir ön ayar adı girin.</x:String>
-  <x:String x:Key="PresetNameWatermark">Ön ayar adı</x:String>
   <x:String x:Key="MessageBoxInfoTitle">Bilgi</x:String>
   <x:String x:Key="SyncServersUnblockAllDialogue">Sunucu verileri Valve tarafından güncellendi! Yeni sunucu verilerini senkronize etmek için tüm engellenen sunucuların engelleri kaldırılacak. Artık mevcut olmayan sunuculara ait preset girdileri kaldırılacak ve varsa son seçilen preset yeniden uygulanacak.</x:String>
   <x:String x:Key="NewVersionDialogue">Yeni sürüm yayınlandı! Güncelle?</x:String>
@@ -39,4 +29,22 @@
   <x:String x:Key="PendingOperationDialogue">Zaten bekleyen bir işlem var. Lütfen bekleyin...</x:String>
   <x:String x:Key="FirewallResetConfirmDialogue">Bu işlem güvenlik duvarını sıfırlayacak. Onaylıyor musun?</x:String>
   <x:String x:Key="FirewallResetSuccessDialogue">Güvenlik duvarı başarıyla sıfırlandı!</x:String>
+  <x:String x:Key="Presets">Ön Ayarlar</x:String>
+  <x:String x:Key="PresetsToolTip">Ön ayarları yönet</x:String>
+  <x:String x:Key="AddPreset">Ekle</x:String>
+  <x:String x:Key="NewPresetName">Yeni ön ayar</x:String>
+  <x:String x:Key="AddPresetToolTip">Yeni bir ön ayar oluştur</x:String>
+  <x:String x:Key="DeletePreset">Sil</x:String>
+  <x:String x:Key="DeletePresetToolTip">Seçili ön ayarları sil</x:String>
+  <x:String x:Key="ApplyPreset">Uygula</x:String>
+  <x:String x:Key="ApplyPresetToolTip">Seçili ön ayarı uygula</x:String>
+  <x:String x:Key="PresetsWindowTitle">Ön Ayarlar</x:String>
+  <x:String x:Key="PresetServersHeader">Engellenen sunucular</x:String>
+  <x:String x:Key="BlockedColumnHeader">Engelli</x:String>
+  <x:String x:Key="PresetListHeader">Ön Ayar</x:String>
+  <x:String x:Key="PresetDeleteConfirmDialogue">'{0}' ön ayarı silinsin mi?</x:String>
+  <x:String x:Key="PresetDeleteSelectedConfirmDialogue">Seçili {0} ön ayar silinsin mi?</x:String>
+  <x:String x:Key="PresetOverwriteConfirmDialogue">Bu oyun için '{0}' adında bir ön ayar zaten var. Üzerine yazılsın mı?</x:String>
+  <x:String x:Key="PresetChangeViewModeConfirmDialogue">Kümelenmiş ve kümelenmemiş görünüm arasında geçiş yapmak bu ön ayarın engellenen girdilerini temizleyecek. Devam edilsin mi?</x:String>
+  <x:String x:Key="PresetNameRequiredDialogue">Ön ayar adı boş olamaz.</x:String>
 </ResourceDictionary>
diff --git a/ServerPickerX/Locales/Locale_zh-cn.axaml b/ServerPickerX/Locales/Locale_zh-cn.axaml
index 40d3bb8..1a35430 100644
--- a/ServerPickerX/Locales/Locale_zh-cn.axaml
+++ b/ServerPickerX/Locales/Locale_zh-cn.axaml
@@ -10,8 +10,6 @@
   <x:String x:Key="BlockSelected">块选定</x:String>
   <x:String x:Key="UnblockAll">全部解锁</x:String>
   <x:String x:Key="UnblockSelected">取消阻止所选内容</x:String>
-  <x:String x:Key="SavePreset">保存预设</x:String>
-  <x:String x:Key="DeletePreset">删除预设</x:String>
   <x:String x:Key="SaveButtonText">保存</x:String>
   <x:String x:Key="CancelButtonText">取消</x:String>
   <x:String x:Key="CheckForNewVersion">启动时检查新版本</x:String>
@@ -20,17 +18,9 @@
   <x:String x:Key="PresetToolTip">选择预设</x:String>
   <x:String x:Key="ClusterUnclusterToolTip">分组或取消分组服务器</x:String>
   <x:String x:Key="RefreshToolTip">刷新所有服务器 ping</x:String>
-  <x:String x:Key="SavePresetToolTip">将当前已屏蔽的服务器保存为预设</x:String>
-  <x:String x:Key="DeletePresetToolTip">删除所选预设</x:String>
   <x:String x:Key="SwapGameModeUnblockAllConflict">此操作将首先解除所有服务器的阻止，以防止防火墙冲突。</x:String>
-  <x:String x:Key="PresetDeleteConfirmDialogue">要删除预设“{0}”吗？</x:String>
-  <x:String x:Key="PresetOverwriteConfirmDialogue">此游戏已存在名为“{0}”的预设。要覆盖吗？</x:String>
-  <x:String x:Key="PresetNameRequiredDialogue">预设名称不能为空。</x:String>
   <x:String x:Key="LanguageComboBoxToolTip">选择语言</x:String>
   <x:String x:Key="ResetFirewallToolTip">重置防火墙规则</x:String>
-  <x:String x:Key="PresetNameTitle">保存预设</x:String>
-  <x:String x:Key="PresetNamePrompt">为当前游戏输入一个预设名称。</x:String>
-  <x:String x:Key="PresetNameWatermark">预设名称</x:String>
   <x:String x:Key="MessageBoxInfoTitle">信息</x:String>
   <x:String x:Key="SyncServersUnblockAllDialogue">Valve 刚刚更新了服务器数据。所有被屏蔽的服务器都将被解除屏蔽，以便同步新的服务器数据。对于已不存在的服务器，其预设条目将被移除，并且如果可用，最后选中的预设将被重新应用。</x:String>
   <x:String x:Key="NewVersionDialogue">新版本已发布！前往发布页面？</x:String>
@@ -39,4 +29,22 @@
   <x:String x:Key="PendingOperationDialogue">目前有待处理的操作。请稍候……</x:String>
   <x:String x:Key="FirewallResetConfirmDialogue">此操作将尝试把防火墙重置为默认状态。确认操作？</x:String>
   <x:String x:Key="FirewallResetSuccessDialogue">防火墙已成功重置！</x:String>
+  <x:String x:Key="Presets">预设</x:String>
+  <x:String x:Key="PresetsToolTip">管理预设</x:String>
+  <x:String x:Key="AddPreset">添加</x:String>
+  <x:String x:Key="NewPresetName">新预设</x:String>
+  <x:String x:Key="AddPresetToolTip">创建新预设</x:String>
+  <x:String x:Key="DeletePreset">删除</x:String>
+  <x:String x:Key="DeletePresetToolTip">删除所选预设</x:String>
+  <x:String x:Key="ApplyPreset">应用</x:String>
+  <x:String x:Key="ApplyPresetToolTip">应用所选预设</x:String>
+  <x:String x:Key="PresetsWindowTitle">预设</x:String>
+  <x:String x:Key="PresetServersHeader">已屏蔽服务器</x:String>
+  <x:String x:Key="BlockedColumnHeader">已屏蔽</x:String>
+  <x:String x:Key="PresetListHeader">预设</x:String>
+  <x:String x:Key="PresetDeleteConfirmDialogue">要删除预设“{0}”吗？</x:String>
+  <x:String x:Key="PresetDeleteSelectedConfirmDialogue">要删除这 {0} 个选中的预设吗？</x:String>
+  <x:String x:Key="PresetOverwriteConfirmDialogue">此游戏已存在名为“{0}”的预设。要覆盖吗？</x:String>
+  <x:String x:Key="PresetChangeViewModeConfirmDialogue">在集群视图和非集群视图之间切换将清除此预设中已阻止的条目。是否继续？</x:String>
+  <x:String x:Key="PresetNameRequiredDialogue">预设名称不能为空。</x:String>
 </ResourceDictionary>
diff --git a/ServerPickerX/Services/Settings/JsonSetting.cs b/ServerPickerX/Services/Settings/JsonSetting.cs
index 9baedae..b8ec223 100644
--- a/ServerPickerX/Services/Settings/JsonSetting.cs
+++ b/ServerPickerX/Services/Settings/JsonSetting.cs
@@ -245,7 +245,6 @@ public List<ServerPresetModel> GetPresetsByGameMode(string gameMode)
 
             return (server_presets ?? [])
                 .Where(preset => (preset.GameMode ?? string.Empty).Equals(normalizedGameMode, StringComparison.OrdinalIgnoreCase))
-                .OrderBy(preset => preset.Name, StringComparer.OrdinalIgnoreCase)
                 .ToList();
         }
 
diff --git a/ServerPickerX/ViewModels/MainWindowViewModel.cs b/ServerPickerX/ViewModels/MainWindowViewModel.cs
index 2fcff85..23ed595 100644
--- a/ServerPickerX/ViewModels/MainWindowViewModel.cs
+++ b/ServerPickerX/ViewModels/MainWindowViewModel.cs
@@ -51,18 +51,15 @@ public partial class MainWindowViewModel : ViewModelBase
 
         [ObservableProperty]
         [NotifyPropertyChangedFor(nameof(IsOperationAllowed))]
-        [NotifyPropertyChangedFor(nameof(CanDeletePreset))]
         [NotifyPropertyChangedFor(nameof(CanSelectPresets))]
         public bool serverModelsInitialized = false;
 
         [ObservableProperty]
         [NotifyPropertyChangedFor(nameof(IsOperationAllowed))]
-        [NotifyPropertyChangedFor(nameof(CanDeletePreset))]
         [NotifyPropertyChangedFor(nameof(CanSelectPresets))]
         public bool pendingOperation = false;
 
         [ObservableProperty]
-        [NotifyPropertyChangedFor(nameof(CanDeletePreset))]
         public ServerPresetModel? selectedPreset;
 
         [ObservableProperty]
@@ -72,8 +69,6 @@ public partial class MainWindowViewModel : ViewModelBase
         // Dependent/Computed prop for main UI buttons `IsEnabled` state
         public bool IsOperationAllowed => !PendingOperation && ServerModelsInitialized;
 
-        public bool CanDeletePreset => IsOperationAllowed && SelectedPreset != null;
-
         public bool CanSelectPresets => IsOperationAllowed && HasPresets;
 
         private readonly ILoggerService _loggerService;
@@ -225,44 +220,20 @@ public void SelectPresetByName(string presetName)
                 preset.Name.Equals(presetName, StringComparison.OrdinalIgnoreCase));
         }
 
-        public async Task SavePresetAsync(string presetName)
-        {
-            ServerPresetModel serverPreset = new()
-            {
-                Name = presetName.Trim(),
-                GameMode = _jsonSetting.game_mode,
-                IsClustered = _jsonSetting.is_clustered,
-                BlockedServerKeys = _blockedServerKeys
-                    .OrderBy(key => key, StringComparer.OrdinalIgnoreCase)
-                    .ToList(),
-            };
-
-            await _jsonSetting.AddOrUpdatePresetAsync(serverPreset);
-            await _jsonSetting.SetLastSelectedPresetNameByGameModeAsync(serverPreset.Name);
+        public string GetCurrentGameMode() => _jsonSetting.game_mode;
 
-            _presetNameSuggestion = serverPreset.Name;
-            LoadPresetPickerItems();
-            SelectPresetByName(serverPreset.Name);
-        }
-
-        public string GetPresetNameSuggestion()
+        public IReadOnlyList<ServerModel> GetCurrentGameServerModels(bool isClustered)
         {
-            return SelectedPreset?.Name ?? _presetNameSuggestion;
-        }
+            ServerData serverData = _serverDataService.GetServerData();
 
-        public bool IsSuggestedPresetName(string presetName)
-        {
-            return GetPresetNameSuggestion().Equals(presetName, StringComparison.OrdinalIgnoreCase);
+            return isClustered
+                ? serverData.ClusteredServers
+                : serverData.UnclusteredServers;
         }
 
-        public async Task DeleteSelectedPresetAsync()
+        public async Task DeletePresetAsync(ServerPresetModel preset)
         {
-            if (SelectedPreset == null)
-            {
-                return;
-            }
-
-            string deletedPresetName = SelectedPreset.Name;
+            string deletedPresetName = preset.Name;
 
             await _jsonSetting.RemovePresetAsync(_jsonSetting.game_mode, deletedPresetName);
 
@@ -271,13 +242,18 @@ public async Task DeleteSelectedPresetAsync()
                 await _jsonSetting.ClearLastSelectedPresetNameByGameModeAsync();
             }
 
-            if (GetPresetNameSuggestion().Equals(deletedPresetName, StringComparison.OrdinalIgnoreCase))
+            if ((SelectedPreset?.Name ?? string.Empty).Equals(deletedPresetName, StringComparison.OrdinalIgnoreCase) ||
+                _presetNameSuggestion.Equals(deletedPresetName, StringComparison.OrdinalIgnoreCase))
             {
                 _presetNameSuggestion = string.Empty;
             }
 
             LoadPresetPickerItems();
-            ClearSelectedPreset();
+
+            if (SelectedPreset?.Equals(preset) == true)
+            {
+                ClearSelectedPreset();
+            }
         }
 
         public async Task<bool> ApplyPresetAsync(ServerPresetModel serverPreset)
@@ -563,13 +539,20 @@ private void TrackBlockedServerKeys(IEnumerable<ServerModel> serverModels, bool
             }
         }
 
-        private string GetServerKey(ServerModel serverModel)
+        public string GetCurrentServerKey(ServerModel serverModel) => GetServerKey(serverModel);
+
+        public string GetServerKey(ServerModel serverModel, bool isClustered)
         {
-            return _jsonSetting.is_clustered
+            return isClustered
                 ? serverModel.Description
                 : serverModel.Name;
         }
 
+        private string GetServerKey(ServerModel serverModel)
+        {
+            return GetServerKey(serverModel, _jsonSetting.is_clustered);
+        }
+
         public async Task RestoreLastSelectedPresetAsync()
         {
             if (!HasPresets)
diff --git a/ServerPickerX/ViewModels/PresetManagerWindowViewModel.cs b/ServerPickerX/ViewModels/PresetManagerWindowViewModel.cs
new file mode 100644
index 0000000..bfab235
--- /dev/null
+++ b/ServerPickerX/ViewModels/PresetManagerWindowViewModel.cs
@@ -0,0 +1,602 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using MsBox.Avalonia.Enums;
+using Avalonia.Platform;
+using ServerPickerX.Comparers;
+using ServerPickerX.Extensions;
+using ServerPickerX.Models;
+using ServerPickerX.Services.Localizations;
+using ServerPickerX.Services.MessageBoxes;
+using ServerPickerX.Settings;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Security.Cryptography;
+using System.Threading.Tasks;
+
+namespace ServerPickerX.ViewModels
+{
+    public partial class PresetManagerWindowViewModel : ViewModelBase
+    {
+        [ObservableProperty]
+        private ObservableCollectionExtended<PresetListItemViewModel> presets = [];
+
+        public ObservableCollectionExtended<PresetServerSelectionItem> ServerItems { get; } = [];
+
+        [ObservableProperty]
+        [NotifyPropertyChangedFor(nameof(CanDelete))]
+        [NotifyPropertyChangedFor(nameof(CanApply))]
+        [NotifyPropertyChangedFor(nameof(CanEditPreset))]
+        [NotifyPropertyChangedFor(nameof(CanToggleClusterMode))]
+        private PresetListItemViewModel? selectedPresetItem;
+
+        [ObservableProperty]
+        [NotifyPropertyChangedFor(nameof(CanDelete))]
+        private bool isDeletingPreset;
+
+        [ObservableProperty]
+        [NotifyPropertyChangedFor(nameof(ClusterToggleText))]
+        private bool editorIsClustered;
+
+        private readonly MainWindowViewModel _mainVm;
+        private readonly JsonSetting _jsonSetting;
+        private readonly IMessageBoxService _messageBoxService;
+        private readonly ILocalizationService _localizationService;
+
+        public string WindowTitle =>
+            $"{_localizationService.GetLocaleValue("PresetsWindowTitle")} - {_mainVm.GetCurrentGameMode()}";
+
+        public bool CanDelete => SelectedPresetItem != null && !IsDeletingPreset;
+
+        public bool CanApply => SelectedPresetItem != null;
+
+        public bool CanEditPreset => SelectedPresetItem != null;
+
+        public bool CanToggleClusterMode => SelectedPresetItem != null;
+
+        public string ClusterToggleText => _localizationService.GetLocaleValue(
+            EditorIsClustered ? "UnclusterServers" : "ClusterServers");
+
+        public PresetManagerWindowViewModel(
+            MainWindowViewModel mainVm,
+            JsonSetting jsonSetting,
+            IMessageBoxService messageBoxService,
+            ILocalizationService localizationService
+            )
+        {
+            _mainVm = mainVm;
+            _jsonSetting = jsonSetting;
+            _messageBoxService = messageBoxService;
+            _localizationService = localizationService;
+            EditorIsClustered = false;
+
+            ReloadPresets(_mainVm.SelectedPreset?.Name);
+        }
+
+        partial void OnSelectedPresetItemChanged(PresetListItemViewModel? oldValue, PresetListItemViewModel? newValue)
+        {
+            if (oldValue != null && !ReferenceEquals(oldValue, newValue))
+            {
+                oldValue.IsEditing = false;
+            }
+
+            if (newValue != null)
+            {
+                EditorIsClustered = newValue.Preset.IsClustered;
+            }
+            else
+            {
+                EditorIsClustered = false;
+            }
+
+            LoadServerItemsForSelectedPreset();
+        }
+
+        public async Task AddPresetAsync()
+        {
+            string presetName = GetNextPresetName();
+            ServerPresetModel newPreset = new()
+            {
+                Name = presetName,
+                GameMode = _mainVm.GetCurrentGameMode(),
+                IsClustered = false,
+                BlockedServerKeys = [],
+            };
+
+            await _jsonSetting.AddOrUpdatePresetAsync(ClonePreset(newPreset));
+
+            ReloadPresets(presetName);
+        }
+
+        public async Task<bool> DeletePresetsAsync(IReadOnlyList<ServerPresetModel> presetsToDelete)
+        {
+            if (presetsToDelete == null || presetsToDelete.Count == 0 || IsDeletingPreset)
+            {
+                return false;
+            }
+
+            List<ServerPresetModel> normalizedPresets = presetsToDelete
+                .Where(preset => preset != null)
+                .Distinct()
+                .ToList();
+
+            if (normalizedPresets.Count == 0)
+            {
+                return false;
+            }
+
+            IsDeletingPreset = true;
+
+            try
+            {
+                string confirmationText = normalizedPresets.Count == 1
+                    ? string.Format(
+                        _localizationService.GetLocaleValue("PresetDeleteConfirmDialogue"),
+                        normalizedPresets[0].Name
+                        )
+                    : string.Format(
+                        _localizationService.GetLocaleValue("PresetDeleteSelectedConfirmDialogue"),
+                        normalizedPresets.Count
+                        );
+
+                bool shouldDelete = await _messageBoxService.ShowMessageBoxConfirmationAsync(
+                    _localizationService.GetLocaleValue("MessageBoxInfoTitle"),
+                    confirmationText,
+                    Icon.Setting
+                    );
+
+                if (!shouldDelete)
+                {
+                    return false;
+                }
+
+                List<ServerPresetModel> currentPresets = GetCurrentGamePresets();
+                HashSet<string> deletedPresetNames = normalizedPresets
+                    .Select(preset => preset.Name)
+                    .ToHashSet(StringComparer.OrdinalIgnoreCase);
+                string? preferredPresetName = currentPresets
+                    .FirstOrDefault(preset => !deletedPresetNames.Contains(preset.Name))
+                    ?.Name;
+
+                foreach (ServerPresetModel preset in normalizedPresets)
+                {
+                    await _mainVm.DeletePresetAsync(preset);
+                }
+
+                ReloadPresets(preferredPresetName);
+
+                return true;
+            }
+            finally
+            {
+                IsDeletingPreset = false;
+            }
+        }
+
+        public async Task<bool> ApplySelectedPresetAsync()
+        {
+            if (SelectedPresetItem == null)
+            {
+                return false;
+            }
+
+            // The modal can add/delete presets without touching the main dropdown state.
+            // Refresh the main preset list before applying so the selected preset can be reselected there too.
+            _mainVm.LoadPresetPickerItems();
+
+            return await _mainVm.ApplyPresetAsync(ClonePreset(SelectedPresetItem.Preset));
+        }
+
+        public async Task<bool> RenamePresetAsync(PresetListItemViewModel presetItem, string originalPresetName)
+        {
+            if (presetItem == null)
+            {
+                return false;
+            }
+
+            string newPresetName = (presetItem.Name ?? string.Empty).Trim();
+            string currentPresetName = originalPresetName.Trim();
+
+            if (string.IsNullOrWhiteSpace(newPresetName))
+            {
+                await _messageBoxService.ShowMessageBoxAsync(
+                    _localizationService.GetLocaleValue("MessageBoxInfoTitle"),
+                    _localizationService.GetLocaleValue("PresetNameRequiredDialogue")
+                    );
+
+                ReloadPresets(currentPresetName);
+                return false;
+            }
+
+            if (newPresetName.Equals(currentPresetName, StringComparison.OrdinalIgnoreCase))
+            {
+                ReloadPresets(currentPresetName);
+                return true;
+            }
+
+            ServerPresetModel? existingPreset = _mainVm.GetCurrentGamePreset(newPresetName);
+            bool overwritingDifferentPreset = existingPreset != null &&
+                !existingPreset.Name.Equals(currentPresetName, StringComparison.OrdinalIgnoreCase);
+
+            if (overwritingDifferentPreset)
+            {
+                bool shouldOverwrite = await _messageBoxService.ShowMessageBoxConfirmationAsync(
+                        _localizationService.GetLocaleValue("MessageBoxInfoTitle"),
+                        string.Format(
+                        _localizationService.GetLocaleValue("PresetOverwriteConfirmDialogue"),
+                        newPresetName
+                        ),
+                    Icon.Setting
+                    );
+
+                if (!shouldOverwrite)
+                {
+                    ReloadPresets(currentPresetName);
+                    return false;
+                }
+            }
+
+            ServerPresetModel renamedPreset = ClonePreset(presetItem.Preset);
+            renamedPreset.Name = newPresetName;
+
+            await _jsonSetting.AddOrUpdatePresetAsync(renamedPreset);
+
+            await _jsonSetting.RemovePresetAsync(_mainVm.GetCurrentGameMode(), currentPresetName);
+            await SyncPresetReferenceAfterRenameAsync(currentPresetName, newPresetName, overwritingDifferentPreset);
+
+            ReloadPresets(newPresetName);
+
+            return true;
+        }
+
+        public async Task PersistSelectedPresetServerKeysAsync()
+        {
+            if (SelectedPresetItem == null)
+            {
+                return;
+            }
+
+            SelectedPresetItem.Preset.BlockedServerKeys = ServerItems
+                .Where(serverItem => serverItem.IsBlocked)
+                .Select(serverItem => serverItem.Key)
+                .Distinct(StringComparer.OrdinalIgnoreCase)
+                .OrderBy(serverKey => serverKey, StringComparer.OrdinalIgnoreCase)
+                .ToList();
+
+            await _jsonSetting.AddOrUpdatePresetAsync(ClonePreset(SelectedPresetItem.Preset));
+            await ClearAppliedPresetReferenceIfNeededAsync(SelectedPresetItem.Preset.Name);
+        }
+
+        public async Task ToggleSelectedPresetClusterModeAsync()
+        {
+            if (SelectedPresetItem == null)
+            {
+                return;
+            }
+
+            bool hasBlockedEntries = (SelectedPresetItem.Preset.BlockedServerKeys?.Count ?? 0) > 0;
+
+            if (hasBlockedEntries)
+            {
+                bool shouldChangeMode = await _messageBoxService.ShowMessageBoxConfirmationAsync(
+                    _localizationService.GetLocaleValue("MessageBoxInfoTitle"),
+                    _localizationService.GetLocaleValue("PresetChangeViewModeConfirmDialogue"),
+                    Icon.Setting
+                    );
+
+                if (!shouldChangeMode)
+                {
+                    return;
+                }
+            }
+
+            SelectedPresetItem.Preset.IsClustered = !SelectedPresetItem.Preset.IsClustered;
+            SelectedPresetItem.Preset.BlockedServerKeys = [];
+            EditorIsClustered = SelectedPresetItem.Preset.IsClustered;
+
+            await _jsonSetting.AddOrUpdatePresetAsync(ClonePreset(SelectedPresetItem.Preset));
+            await ClearAppliedPresetReferenceIfNeededAsync(SelectedPresetItem.Preset.Name);
+
+            LoadServerItemsForSelectedPreset();
+        }
+
+        // Use NaturalStringComparer to sort preset names.
+        // This is to avoid issues with numbers in preset names being treated as part of the number sequence.
+        // For example, "Preset 1" should come before "Preset 10" in ascending order, not after.
+        public void SortPresets(ListSortDirection direction)
+        {
+            string? selectedPresetName = SelectedPresetItem?.Name;
+            List<PresetListItemViewModel> sortedPresets = (direction == ListSortDirection.Ascending
+                ? Presets.OrderBy(preset => preset.Name, NaturalStringComparer.OrdinalIgnoreCase)
+                : Presets.OrderByDescending(preset => preset.Name, NaturalStringComparer.OrdinalIgnoreCase))
+                .ToList();
+
+            Presets.Clear();
+            Presets.AddRange(sortedPresets);
+
+            if (!string.IsNullOrWhiteSpace(selectedPresetName))
+            {
+                SelectedPresetItem = Presets.FirstOrDefault(preset =>
+                    preset.Name.Equals(selectedPresetName, StringComparison.OrdinalIgnoreCase));
+            }
+        }
+
+        public void SortServerItems(string sortKey, ListSortDirection direction)
+        {
+            List<PresetServerSelectionItem> sortedItems = sortKey switch
+            {
+                "Blocked" => (direction == ListSortDirection.Ascending
+                    ? ServerItems.OrderBy(serverItem => serverItem.IsBlocked)
+                    : ServerItems.OrderByDescending(serverItem => serverItem.IsBlocked)).ToList(),
+                "Flag" => (direction == ListSortDirection.Ascending
+                    ? ServerItems.OrderBy(serverItem => serverItem.FlagSortKey, StringComparer.OrdinalIgnoreCase)
+                        .ThenBy(serverItem => serverItem.Description, StringComparer.OrdinalIgnoreCase)
+                    : ServerItems.OrderByDescending(serverItem => serverItem.FlagSortKey, StringComparer.OrdinalIgnoreCase)
+                        .ThenBy(serverItem => serverItem.Description, StringComparer.OrdinalIgnoreCase)).ToList(),
+                "ServerId" => (direction == ListSortDirection.Ascending
+                    ? ServerItems.OrderBy(serverItem => serverItem.Name, StringComparer.OrdinalIgnoreCase)
+                    : ServerItems.OrderByDescending(serverItem => serverItem.Name, StringComparer.OrdinalIgnoreCase)).ToList(),
+                _ => (direction == ListSortDirection.Ascending
+                    ? ServerItems.OrderBy(serverItem => serverItem.Description, StringComparer.OrdinalIgnoreCase)
+                    : ServerItems.OrderByDescending(serverItem => serverItem.Description, StringComparer.OrdinalIgnoreCase)).ToList(),
+            };
+
+            ServerItems.Clear();
+            ServerItems.AddRange(sortedItems);
+        }
+
+        private void ReloadPresets(string? preferredPresetName = null)
+        {
+            string? presetNameToSelect = preferredPresetName ?? SelectedPresetItem?.Name;
+            List<ServerPresetModel> currentPresets = GetCurrentGamePresets();
+
+            if (currentPresets.Count == 0)
+            {
+                Presets = [];
+                SelectedPresetItem = null;
+                ServerItems.Clear();
+                return;
+            }
+
+            Presets = new ObservableCollectionExtended<PresetListItemViewModel>(
+                currentPresets.Select(preset => new PresetListItemViewModel(ClonePreset(preset))).ToList()
+                );
+
+            SelectedPresetItem = !string.IsNullOrWhiteSpace(presetNameToSelect)
+                ? Presets.FirstOrDefault(preset =>
+                    preset.Name.Equals(presetNameToSelect, StringComparison.OrdinalIgnoreCase))
+                : null;
+
+            SelectedPresetItem ??= Presets[0];
+        }
+
+        private void LoadServerItemsForSelectedPreset()
+        {
+            ServerItems.Clear();
+
+            if (SelectedPresetItem == null)
+            {
+                return;
+            }
+
+            HashSet<string> blockedServerKeys = (SelectedPresetItem.Preset.BlockedServerKeys ?? [])
+                .ToHashSet(StringComparer.OrdinalIgnoreCase);
+
+            foreach (ServerModel serverModel in _mainVm.GetCurrentGameServerModels(SelectedPresetItem.Preset.IsClustered))
+            {
+                string serverKey = _mainVm.GetServerKey(serverModel, SelectedPresetItem.Preset.IsClustered);
+
+                ServerItems.Add(new PresetServerSelectionItem(serverModel, serverKey, blockedServerKeys.Contains(serverKey)));
+            }
+        }
+
+        public void StopEditingPresets()
+        {
+            foreach (PresetListItemViewModel preset in Presets)
+            {
+                preset.IsEditing = false;
+            }
+        }
+
+        private List<ServerPresetModel> GetCurrentGamePresets()
+        {
+            return _jsonSetting.GetPresetsByGameMode(_mainVm.GetCurrentGameMode());
+        }
+
+        private async Task ClearAppliedPresetReferenceIfNeededAsync(string presetName)
+        {
+            bool matchesAppliedPreset = (_mainVm.SelectedPreset?.Name ?? string.Empty)
+                .Equals(presetName, StringComparison.OrdinalIgnoreCase);
+            bool matchesLastSelected = (_jsonSetting.GetLastSelectedPresetNameByGameMode() ?? string.Empty)
+                .Equals(presetName, StringComparison.OrdinalIgnoreCase);
+
+            if (!matchesAppliedPreset && !matchesLastSelected)
+            {
+                return;
+            }
+
+            if (matchesLastSelected)
+            {
+                await _jsonSetting.ClearLastSelectedPresetNameByGameModeAsync();
+            }
+
+            if (matchesAppliedPreset)
+            {
+                _mainVm.SelectPresetByName(string.Empty);
+            }
+        }
+
+        private async Task SyncPresetReferenceAfterRenameAsync(
+            string originalPresetName,
+            string renamedPresetName,
+            bool overwroteDifferentPreset
+            )
+        {
+            if (overwroteDifferentPreset)
+            {
+                bool targetWasAppliedOrRemembered =
+                    (_mainVm.SelectedPreset?.Name ?? string.Empty).Equals(renamedPresetName, StringComparison.OrdinalIgnoreCase) ||
+                    (_jsonSetting.GetLastSelectedPresetNameByGameMode() ?? string.Empty).Equals(renamedPresetName, StringComparison.OrdinalIgnoreCase);
+
+                if (targetWasAppliedOrRemembered)
+                {
+                    await ClearAppliedPresetReferenceIfNeededAsync(renamedPresetName);
+                }
+
+                if ((_mainVm.SelectedPreset?.Name ?? string.Empty).Equals(originalPresetName, StringComparison.OrdinalIgnoreCase) ||
+                    (_jsonSetting.GetLastSelectedPresetNameByGameMode() ?? string.Empty).Equals(originalPresetName, StringComparison.OrdinalIgnoreCase))
+                {
+                    await ClearAppliedPresetReferenceIfNeededAsync(originalPresetName);
+                }
+
+                return;
+            }
+
+            bool renamedAppliedPreset = (_mainVm.SelectedPreset?.Name ?? string.Empty)
+                .Equals(originalPresetName, StringComparison.OrdinalIgnoreCase);
+            bool renamedLastSelected = (_jsonSetting.GetLastSelectedPresetNameByGameMode() ?? string.Empty)
+                .Equals(originalPresetName, StringComparison.OrdinalIgnoreCase);
+
+            if (renamedLastSelected)
+            {
+                await _jsonSetting.SetLastSelectedPresetNameByGameModeAsync(renamedPresetName);
+            }
+
+            if (renamedAppliedPreset)
+            {
+                _mainVm.LoadPresetPickerItems();
+                _mainVm.SelectPresetByName(renamedPresetName);
+            }
+        }
+
+        private string GetNextPresetName()
+        {
+            string basePresetName = _localizationService.GetLocaleValue("NewPresetName");
+            HashSet<string> existingPresetNames = GetCurrentGamePresets()
+                .Select(preset => preset.Name)
+                .ToHashSet(StringComparer.OrdinalIgnoreCase);
+
+            if (!existingPresetNames.Contains(basePresetName))
+            {
+                return basePresetName;
+            }
+
+            for (int suffix = 2; ; suffix++)
+            {
+                string candidateName = $"{basePresetName} ({suffix})";
+
+                if (!existingPresetNames.Contains(candidateName))
+                {
+                    return candidateName;
+                }
+            }
+        }
+
+        private static ServerPresetModel ClonePreset(ServerPresetModel preset)
+        {
+            return new ServerPresetModel
+            {
+                Name = preset.Name,
+                GameMode = preset.GameMode,
+                IsClustered = preset.IsClustered,
+                BlockedServerKeys = (preset.BlockedServerKeys ?? [])
+                    .Distinct(StringComparer.OrdinalIgnoreCase)
+                    .OrderBy(serverKey => serverKey, StringComparer.OrdinalIgnoreCase)
+                    .ToList(),
+            };
+        }
+    }
+
+    public partial class PresetListItemViewModel : ObservableObject
+    {
+        public ServerPresetModel Preset { get; }
+
+        public string Name
+        {
+            get => Preset.Name;
+            set
+            {
+                if (Preset.Name == value)
+                {
+                    return;
+                }
+
+                Preset.Name = value;
+                OnPropertyChanged();
+            }
+        }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedFor(nameof(IsDisplayVisible))]
+        [NotifyPropertyChangedFor(nameof(IsEditorVisible))]
+        private bool isEditing;
+
+        public bool IsDisplayVisible => !IsEditing;
+
+        public bool IsEditorVisible => IsEditing;
+
+        public PresetListItemViewModel(ServerPresetModel preset)
+        {
+            Preset = preset;
+        }
+    }
+
+    public partial class PresetServerSelectionItem : ObservableObject
+    {
+        private static readonly Dictionary<string, string> FlagSortKeyCache = new(StringComparer.OrdinalIgnoreCase);
+
+        public ServerModel ServerModel { get; }
+
+        public string Key { get; }
+
+        public string Flag => ServerModel.Flag;
+
+        public string FlagSortKey { get; }
+
+        public string Name => ServerModel.Name;
+
+        public string Description => ServerModel.Description;
+
+        [ObservableProperty]
+        private bool isBlocked;
+
+        public PresetServerSelectionItem(ServerModel serverModel, string key, bool isBlocked)
+        {
+            ServerModel = serverModel;
+            Key = key;
+            IsBlocked = isBlocked;
+            FlagSortKey = GetFlagSortKey(serverModel.Flag);
+        }
+
+        private static string GetFlagSortKey(string flagPath)
+        {
+            if (string.IsNullOrWhiteSpace(flagPath))
+            {
+                return string.Empty;
+            }
+
+            if (FlagSortKeyCache.TryGetValue(flagPath, out string? cachedValue))
+            {
+                return cachedValue;
+            }
+
+            string assetUri = $"avares://ServerPickerX{flagPath}";
+
+            try
+            {
+                using var stream = AssetLoader.Open(new Uri(assetUri));
+                byte[] hash = SHA256.HashData(stream);
+                string flagSortKey = Convert.ToHexString(hash);
+                FlagSortKeyCache[flagPath] = flagSortKey;
+
+                return flagSortKey;
+            }
+            catch
+            {
+                FlagSortKeyCache[flagPath] = flagPath;
+
+                return flagPath;
+            }
+        }
+    }
+}
diff --git a/ServerPickerX/Views/MainWindow.axaml b/ServerPickerX/Views/MainWindow.axaml
index 167d467..ccb08d9 100644
--- a/ServerPickerX/Views/MainWindow.axaml
+++ b/ServerPickerX/Views/MainWindow.axaml
@@ -10,8 +10,8 @@
         mc:Ignorable="d"
         x:Class="ServerPickerX.Views.MainWindow"
         x:DataType="vm:MainWindowViewModel"
-        Width="980"
-        MinWidth="980"
+        Width="920"
+        MinWidth="920"
         MaxWidth="1280"
         Height="640"
         MinHeight="500"
@@ -125,12 +125,12 @@
                                 Height="32"
                                 VerticalAlignment="Center"
                                 BorderThickness="1">
-                                <ComboBox.ItemTemplate>
-                                    <DataTemplate>
-                                        <TextBlock Text="{Binding Name}" />
-                                    </DataTemplate>
-                                </ComboBox.ItemTemplate>
-                            </ComboBox>
+                            <ComboBox.ItemTemplate>
+                                <DataTemplate>
+                                    <TextBlock Text="{Binding Name}" />
+                                </DataTemplate>
+                            </ComboBox.ItemTemplate>
+                        </ComboBox>
                             <Border
                                 IsVisible="{Binding !HasPresets}"
                                 Width="146"
@@ -153,36 +153,25 @@
                         </Grid>
                     </StackPanel>
                     <StackPanel Grid.Column="2" Orientation="Horizontal" HorizontalAlignment="Right">
-                        <Button
-                            x:Name="SavePresetBtn"
+                        <Button 
+                            x:Name="ClusterUnclusterBtn"
                             Classes="main-btn"
                             IsEnabled="{Binding IsOperationAllowed}"
-                            Content="{DynamicResource SavePreset}"
-                            ToolTip.Tip="{DynamicResource SavePresetToolTip}"
+                            Content="{DynamicResource ClusterServers}"
+                            ToolTip.Tip="{DynamicResource ClusterUnclusterToolTip}"
                             ToolTip.ShowDelay="20"
-                            Click="SavePresetBtn_Click"
+                            Click="ClusterUnclusterBtn_Click"
                             VerticalAlignment="Center"
                             Foreground="White"
                             Margin="0,0,8,0"/>
                         <Button
-                            x:Name="DeletePresetBtn"
-                            Classes="main-btn"
-                            IsEnabled="{Binding CanDeletePreset}"
-                            Content="{DynamicResource DeletePreset}"
-                            ToolTip.Tip="{DynamicResource DeletePresetToolTip}"
-                            ToolTip.ShowDelay="20"
-                            Click="DeletePresetBtn_Click"
-                            VerticalAlignment="Center"
-                            Foreground="White"
-                            Margin="0,0,8,0"/>
-                        <Button 
-                            x:Name="ClusterUnclusterBtn"
+                            x:Name="PresetsBtn"
                             Classes="main-btn"
                             IsEnabled="{Binding IsOperationAllowed}"
-                            Content="{DynamicResource ClusterServers}"
-                            ToolTip.Tip="{DynamicResource ClusterUnclusterToolTip}"
+                            Content="{DynamicResource Presets}"
+                            ToolTip.Tip="{DynamicResource PresetsToolTip}"
                             ToolTip.ShowDelay="20"
-                            Click="ClusterUnclusterBtn_Click"
+                            Click="PresetsBtn_Click"
                             VerticalAlignment="Center"
                             Foreground="White"
                             Margin="0,0,8,0"/>
diff --git a/ServerPickerX/Views/MainWindow.axaml.cs b/ServerPickerX/Views/MainWindow.axaml.cs
index 7a12fff..7d1229f 100644
--- a/ServerPickerX/Views/MainWindow.axaml.cs
+++ b/ServerPickerX/Views/MainWindow.axaml.cs
@@ -151,98 +151,23 @@ private async void ClusterUnclusterBtn_Click(object? sender, Avalonia.Interactiv
             RefreshClusterButtonContent();
         }
 
-        private async void SavePresetBtn_Click(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
+        private async void PresetsBtn_Click(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
         {
             if (DataContext is not MainWindowViewModel vm)
             {
                 return;
             }
 
-            PresetNameWindow presetNameWindow = new(vm.GetPresetNameSuggestion())
+            PresetManagerWindow presetManagementWindow = new(vm)
             {
                 WindowStartupLocation = WindowStartupLocation.CenterOwner
             };
 
-            string? presetName = await presetNameWindow.ShowDialog<string?>(this);
+            await presetManagementWindow.ShowDialog(this);
 
-            if (presetName == null)
-            {
-                return;
-            }
-
-            presetName = presetName.Trim();
-
-            if (string.IsNullOrWhiteSpace(presetName))
-            {
-                await _messageBoxService.ShowMessageBoxAsync(
-                    _localizationService.GetLocaleValue("MessageBoxInfoTitle"),
-                    _localizationService.GetLocaleValue("PresetNameRequiredDialogue")
-                    );
-
-                return;
-            }
-
-            ServerPresetModel? existingPreset = vm.GetCurrentGamePreset(presetName);
-            bool isSuggestedPresetName = vm.IsSuggestedPresetName(presetName);
-
-            if (existingPreset != null && !isSuggestedPresetName)
-            {
-                bool overwriteResult = await _messageBoxService.ShowMessageBoxConfirmationAsync(
-                    _localizationService.GetLocaleValue("MessageBoxInfoTitle"),
-                    string.Format(_localizationService.GetLocaleValue("PresetOverwriteConfirmDialogue"), presetName),
-                    MsBox.Avalonia.Enums.Icon.Setting
-                    );
-
-                if (!overwriteResult)
-                {
-                    return;
-                }
-            }
-
-            _suppressPresetSelectionChanged = true;
-
-            try
-            {
-                await vm.SavePresetAsync(presetName);
-
-                SyncPresetSelection(vm.SelectedPreset);
-            }
-            finally
-            {
-                _suppressPresetSelectionChanged = false;
-            }
-        }
-
-        private async void DeletePresetBtn_Click(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
-        {
-            if (DataContext is not MainWindowViewModel vm || vm.SelectedPreset == null)
-            {
-                return;
-            }
-
-            bool deleteResult = await _messageBoxService.ShowMessageBoxConfirmationAsync(
-                _localizationService.GetLocaleValue("MessageBoxInfoTitle"),
-                string.Format(_localizationService.GetLocaleValue("PresetDeleteConfirmDialogue"), vm.SelectedPreset.Name),
-                MsBox.Avalonia.Enums.Icon.Warning
-                );
-
-            if (!deleteResult)
-            {
-                return;
-            }
-
-            _suppressPresetSelectionChanged = true;
-
-            try
-            {
-                await vm.DeleteSelectedPresetAsync();
-
-                SyncPresetSelection(vm.SelectedPreset);
-            }
-            finally
-            {
-                _suppressPresetSelectionChanged = false;
-            }
+            vm.LoadPresetPickerItems();
+            SyncPresetSelection(vm.SelectedPreset);
+            RefreshClusterButtonContent();
         }
 
         public async Task InitializeApp()
diff --git a/ServerPickerX/Views/UserWindows/PresetManagerWindow.axaml b/ServerPickerX/Views/UserWindows/PresetManagerWindow.axaml
new file mode 100644
index 0000000..047ba85
--- /dev/null
+++ b/ServerPickerX/Views/UserWindows/PresetManagerWindow.axaml
@@ -0,0 +1,262 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:userControls="using:ServerPickerX"
+        xmlns:viewmodels="using:ServerPickerX.ViewModels"
+        xmlns:converters="clr-namespace:ServerPickerX.Converters"
+        mc:Ignorable="d"
+
+        Width="996"
+        MinWidth="996"
+        MaxWidth="1280"
+        Height="610"
+        MinHeight="500"
+        MaxHeight="960"
+        x:Class="ServerPickerX.Views.PresetManagerWindow"
+        x:DataType="viewmodels:PresetManagerWindowViewModel"
+        SystemDecorations="BorderOnly"
+        ExtendClientAreaToDecorationsHint="True"
+        ExtendClientAreaChromeHints="NoChrome"
+        ExtendClientAreaTitleBarHeightHint="-1"
+        WindowStartupLocation="CenterOwner"
+        Background="Transparent">
+
+    <Window.Resources>
+        <converters:ImageConverter x:Key="ImageConverter" />
+    </Window.Resources>
+
+    <Window.Styles>
+        <Style Selector="DataGrid.preset-grid">
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="Foreground" Value="White" />
+            <Setter Property="CanUserResizeColumns" Value="False" />
+            <Setter Property="CanUserReorderColumns" Value="False" />
+            <Setter Property="CanUserSortColumns" Value="False" />
+            <Setter Property="GridLinesVisibility" Value="All" />
+            <Setter Property="HeadersVisibility" Value="Column" />
+        </Style>
+        <Style Selector="DataGrid.preset-grid DataGridColumnHeader">
+            <Setter Property="Background" Value="#1A1D40" />
+            <Setter Property="Foreground" Value="White" />
+            <Setter Property="FontWeight" Value="SemiBold" />
+        </Style>
+        <Style Selector="DataGrid.preset-grid DataGridCell">
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="Foreground" Value="White" />
+        </Style>
+        <Style Selector="DataGrid.preset-grid TextBox">
+            <Setter Property="Background" Value="#1A1D40" />
+            <Setter Property="Foreground" Value="White" />
+            <Setter Property="BorderBrush" Value="#00d9ff" />
+            <Setter Property="CaretBrush" Value="White" />
+            <Setter Property="SelectionBrush" Value="#575cd4" />
+        </Style>
+        <Style Selector="CheckBox.preset-toggle">
+            <Setter Property="Foreground" Value="White" />
+            <Setter Property="HorizontalAlignment" Value="Center" />
+            <Setter Property="VerticalAlignment" Value="Center" />
+        </Style>
+    </Window.Styles>
+
+    <Border
+        Background="#373B78"
+        BorderBrush="#575cd4"
+        BorderThickness="1.35">
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="30" />
+                <RowDefinition />
+            </Grid.RowDefinitions>
+
+            <Grid x:Name="TitleBar"
+                  Background="#373B78"
+                  PointerPressed="TitleBar_PointerPressed">
+                <TextBlock
+                    VerticalAlignment="Center"
+                    Margin="10,0,0,0"
+                    Foreground="White"
+                    FontWeight="Bold"
+                    FontSize="14"
+                    Text="{Binding WindowTitle}" />
+                <userControls:TitleBarButtons />
+            </Grid>
+
+            <Grid Grid.Row="1" Margin="8,8,8,8">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="330" MinWidth="260" MaxWidth="400"/>
+                    <ColumnDefinition Width="10" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+
+                <Border
+                    Grid.Column="0"
+                    BorderBrush="#575cd4"
+                    BorderThickness="1"
+                    Background="#4a4e8a"
+                    Opacity="0.95">
+                    <Grid Margin="10">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition />
+                        </Grid.RowDefinitions>
+
+                        <Grid ColumnDefinitions="*,2,*,2,*">
+                            <Button
+                                Grid.Column="0"
+                                HorizontalAlignment="Stretch"
+                                HorizontalContentAlignment="Center"
+                                Classes="main-btn"
+                                Content="{DynamicResource AddPreset}"
+                                ToolTip.Tip="{DynamicResource AddPresetToolTip}"
+                                Click="AddBtn_Click"
+                                Foreground="White" />
+                            <Button
+                                Grid.Column="2"
+                                HorizontalAlignment="Stretch"
+                                HorizontalContentAlignment="Center"
+                                Classes="main-btn"
+                                Content="{DynamicResource DeletePreset}"
+                                ToolTip.Tip="{DynamicResource DeletePresetToolTip}"
+                                IsEnabled="{Binding CanDelete}"
+                                Click="DeleteBtn_Click"
+                                Foreground="White" />
+                            <Button
+                                Grid.Column="4"
+                                HorizontalAlignment="Stretch"
+                                HorizontalContentAlignment="Center"
+                                Classes="main-btn"
+                                Content="{DynamicResource ApplyPreset}"
+                                ToolTip.Tip="{DynamicResource ApplyPresetToolTip}"
+                                IsEnabled="{Binding CanApply}"
+                                Click="ApplyBtn_Click"
+                                Foreground="White" />
+                        </Grid>
+
+                        <DataGrid
+                            Grid.Row="1"
+                            x:Name="PresetListGrid"
+                            Classes="preset-grid"
+                            AutoGenerateColumns="False"
+                            ItemsSource="{Binding Presets}"
+                            SelectedItem="{Binding SelectedPresetItem}"
+                            IsReadOnly="True"
+                            CanUserSortColumns="True"
+                            SelectionMode="Extended"
+                            Margin="0,10,0,0"
+                            SelectionChanged="PresetListGrid_SelectionChanged"
+                            Sorting="PresetListGrid_Sorting"
+                            BeginningEdit="PresetListGrid_BeginningEdit"
+                            RowEditEnded="PresetListGrid_RowEditEnded"
+                            DoubleTapped="PresetListGrid_DoubleTapped"
+                            KeyDown="PresetListGrid_KeyDown">
+                            <DataGrid.Columns>
+                                <DataGridTextColumn
+                                    Header="{DynamicResource PresetListHeader}"
+                                    SortMemberPath="Name"
+                                    Binding="{Binding Name}"
+                                    Width="*" />
+                            </DataGrid.Columns>
+                        </DataGrid>
+                    </Grid>
+                </Border>
+
+                <GridSplitter
+                    Grid.Column="1"
+                    ResizeDirection="Columns"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Stretch"
+                    Background="Transparent">
+                    <GridSplitter.Template>
+                        <ControlTemplate>
+                            <Grid Background="Transparent">
+                                <StackPanel
+                                    VerticalAlignment="Center"
+                                    HorizontalAlignment="Center"
+                                    Spacing="4">
+                                    <Ellipse Width="2" Height="2" Fill="White" />
+                                    <Ellipse Width="2" Height="2" Fill="White" />
+                                    <Ellipse Width="2" Height="2" Fill="White" />
+                                </StackPanel>
+                            </Grid>
+                        </ControlTemplate>
+                    </GridSplitter.Template>
+                </GridSplitter>
+
+                <Border
+                    Grid.Column="2"
+                    BorderBrush="#575cd4"
+                    BorderThickness="1"
+                    Background="#4a4e8a"
+                    Opacity="0.95">
+                    <Grid Margin="10">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition />
+                        </Grid.RowDefinitions>
+
+                        <Grid ColumnDefinitions="*,Auto">
+                            <TextBlock
+                                Foreground="White"
+                                FontSize="14"
+                                FontWeight="SemiBold"
+                                VerticalAlignment="Center"
+                                Text="{DynamicResource PresetServersHeader}" />
+                            <Button
+                                Grid.Column="1"
+                                Classes="main-btn"
+                                Content="{Binding ClusterToggleText}"
+                                ToolTip.Tip="{DynamicResource ClusterUnclusterToolTip}"
+                                IsEnabled="{Binding CanToggleClusterMode}"
+                                Click="ClusterToggleBtn_Click"
+                                HorizontalAlignment="Right"
+                                Foreground="White" />
+                        </Grid>
+
+                        <DataGrid
+                            Grid.Row="1"
+                            x:Name="ServerItemsGrid"
+                            Classes="preset-grid"
+                            AutoGenerateColumns="False"
+                            ItemsSource="{Binding ServerItems}"
+                            IsReadOnly="False"
+                            IsEnabled="{Binding CanEditPreset}"
+                            CanUserSortColumns="True"
+                            Margin="0,10,0,0"
+                            SelectionMode="Extended"
+                            Sorting="ServerItemsGrid_Sorting"
+                            KeyDown="ServerItemsGrid_KeyDown">
+                            <DataGrid.Columns>
+                                <DataGridTemplateColumn Width="108" Header="{DynamicResource BlockedColumnHeader}" SortMemberPath="IsBlocked">
+                                    <DataGridTemplateColumn.CellTemplate>
+                                        <DataTemplate>
+                                            <Grid>
+                                                <CheckBox
+                                                    Classes="preset-toggle"
+                                                    IsChecked="{Binding IsBlocked}"
+                                                    Click="BlockedCheckBox_Click" />
+                                            </Grid>
+                                        </DataTemplate>
+                                    </DataGridTemplateColumn.CellTemplate>
+                                </DataGridTemplateColumn>
+                                <DataGridTemplateColumn Width="Auto" Header="Flag" SortMemberPath="FlagSortKey">
+                                    <DataGridTemplateColumn.CellTemplate>
+                                        <DataTemplate>
+                                            <Image Source="{Binding Flag, Converter={StaticResource ImageConverter}}"
+                                                   Width="50"
+                                                   Height="50"
+                                                   Stretch="Uniform"
+                                                   VerticalAlignment="Center" />
+                                        </DataTemplate>
+                                    </DataGridTemplateColumn.CellTemplate>
+                                </DataGridTemplateColumn>
+                                <DataGridTextColumn Width="105" Header="Server ID" SortMemberPath="Name" Binding="{Binding Name}" />
+                                <DataGridTextColumn Width="*" Header="Server Name" SortMemberPath="Description" Binding="{Binding Description}" />
+                            </DataGrid.Columns>
+                        </DataGrid>
+                    </Grid>
+                </Border>
+            </Grid>
+        </Grid>
+    </Border>
+</Window>
diff --git a/ServerPickerX/Views/UserWindows/PresetManagerWindow.axaml.cs b/ServerPickerX/Views/UserWindows/PresetManagerWindow.axaml.cs
new file mode 100644
index 0000000..fba9fe4
--- /dev/null
+++ b/ServerPickerX/Views/UserWindows/PresetManagerWindow.axaml.cs
@@ -0,0 +1,382 @@
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using Avalonia.Threading;
+using Avalonia.VisualTree;
+using ServerPickerX.Services.DependencyInjection;
+using ServerPickerX.Services.Localizations;
+using ServerPickerX.Services.MessageBoxes;
+using ServerPickerX.Settings;
+using ServerPickerX.ViewModels;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace ServerPickerX.Views
+{
+    public partial class PresetManagerWindow : Window
+    {
+        private readonly MainWindowViewModel? _mainVm;
+        private bool _allowPresetNameEdit;
+        private bool _committingPresetName;
+        private bool _isEditingPresetName;
+        private string? _editingPresetOriginalName;
+        private ListSortDirection? _presetSortDirection;
+        private string? _serverSortColumn;
+        private ListSortDirection _serverSortDirection = ListSortDirection.Ascending;
+
+        public PresetManagerWindow()
+        {
+            InitializeComponent();
+        }
+
+        public PresetManagerWindow(MainWindowViewModel mainVm)
+        {
+            InitializeComponent();
+            _mainVm = mainVm;
+            DataContext = new PresetManagerWindowViewModel(
+                _mainVm,
+                ServiceLocator.GetRequiredService<JsonSetting>(),
+                ServiceLocator.GetRequiredService<IMessageBoxService>(),
+                ServiceLocator.GetRequiredService<ILocalizationService>()
+                );
+        }
+
+        private async void AddBtn_Click(object? sender, RoutedEventArgs e)
+        {
+            if (DataContext is not PresetManagerWindowViewModel vm)
+            {
+                return;
+            }
+
+            await vm.AddPresetAsync();
+            ReapplyPresetSortIfNeeded();
+            ReapplyServerSortIfNeeded();
+            BeginEditingSelectedPreset();
+        }
+
+        private async void DeleteBtn_Click(object? sender, RoutedEventArgs e)
+        {
+            if (DataContext is not PresetManagerWindowViewModel vm)
+            {
+                return;
+            }
+
+            bool deleted = await vm.DeletePresetsAsync(GetSelectedPresetItems().Select(item => item.Preset).ToList());
+
+            if (deleted)
+            {
+                ReapplyPresetSortIfNeeded();
+                ReapplyServerSortIfNeeded();
+                RestorePresetListFocus();
+            }
+        }
+
+        private async void ApplyBtn_Click(object? sender, RoutedEventArgs e)
+        {
+            if (DataContext is not PresetManagerWindowViewModel vm)
+            {
+                return;
+            }
+
+            if (await vm.ApplySelectedPresetAsync())
+            {
+                Close();
+            }
+        }
+
+        private async void ClusterToggleBtn_Click(object? sender, RoutedEventArgs e)
+        {
+            if (DataContext is not PresetManagerWindowViewModel vm)
+            {
+                return;
+            }
+
+            await vm.ToggleSelectedPresetClusterModeAsync();
+            ReapplyServerSortIfNeeded();
+        }
+
+        private void PresetListGrid_SelectionChanged(object? sender, SelectionChangedEventArgs e)
+        {
+            ReapplyServerSortIfNeeded();
+        }
+
+        private void TitleBar_PointerPressed(object? sender, PointerPressedEventArgs e)
+        {
+            e.Handled = true;
+            (TopLevel.GetTopLevel(this) as Window)?.BeginMoveDrag(e);
+        }
+
+        private void PresetListGrid_BeginningEdit(object? sender, DataGridBeginningEditEventArgs e)
+        {
+            if (!_allowPresetNameEdit)
+            {
+                e.Cancel = true;
+                return;
+            }
+
+            if (e.Row.DataContext is not PresetListItemViewModel presetItem)
+            {
+                return;
+            }
+
+            _isEditingPresetName = true;
+            _editingPresetOriginalName = presetItem.Name;
+        }
+
+        private async void PresetListGrid_RowEditEnded(object? sender, DataGridRowEditEndedEventArgs e)
+        {
+            _allowPresetNameEdit = false;
+            _isEditingPresetName = false;
+            PresetListGrid.IsReadOnly = true;
+
+            if (e.EditAction != DataGridEditAction.Commit || e.Row.DataContext is not PresetListItemViewModel presetItem)
+            {
+                return;
+            }
+
+            await CommitPresetNameAsync(presetItem, _editingPresetOriginalName ?? presetItem.Name);
+        }
+
+        private void PresetListGrid_DoubleTapped(object? sender, RoutedEventArgs e)
+        {
+            if (_isEditingPresetName || DataContext is not PresetManagerWindowViewModel vm || vm.SelectedPresetItem == null)
+            {
+                return;
+            }
+
+            if (e.Source is not Control sourceControl ||
+                sourceControl.FindAncestorOfType<DataGridColumnHeader>() != null ||
+                sourceControl.FindAncestorOfType<DataGridCell>() == null)
+            {
+                return;
+            }
+
+            BeginEditingSelectedPreset();
+        }
+
+        private async Task CommitPresetNameAsync(PresetListItemViewModel presetItem, string originalPresetName)
+        {
+            if (_committingPresetName || DataContext is not PresetManagerWindowViewModel vm)
+            {
+                return;
+            }
+
+            _committingPresetName = true;
+
+            try
+            {
+                await vm.RenamePresetAsync(presetItem, originalPresetName);
+                ReapplyPresetSortIfNeeded();
+                ReapplyServerSortIfNeeded();
+            }
+            finally
+            {
+                _committingPresetName = false;
+                _editingPresetOriginalName = null;
+            }
+        }
+
+        private async void PresetListGrid_KeyDown(object? sender, KeyEventArgs e)
+        {
+            if (DataContext is not PresetManagerWindowViewModel vm)
+            {
+                return;
+            }
+
+            if (e.Key == Key.Delete)
+            {
+                List<PresetListItemViewModel> selectedPresetItems = GetSelectedPresetItems();
+
+                if (selectedPresetItems.Count == 0)
+                {
+                    return;
+                }
+
+                e.Handled = true;
+                bool deleted = await vm.DeletePresetsAsync(selectedPresetItems.Select(item => item.Preset).ToList());
+
+                if (deleted)
+                {
+                    RestorePresetListFocus();
+                }
+
+                return;
+            }
+
+            if (e.Key == Key.F2)
+            {
+                e.Handled = true;
+                BeginEditingSelectedPreset();
+            }
+        }
+
+        private void PresetListGrid_Sorting(object? sender, DataGridColumnEventArgs e)
+        {
+            if (DataContext is not PresetManagerWindowViewModel vm || PresetListGrid.Columns.Count == 0 || !ReferenceEquals(e.Column, PresetListGrid.Columns[0]))
+            {
+                return;
+            }
+
+            _presetSortDirection = _presetSortDirection switch
+            {
+                ListSortDirection.Ascending => ListSortDirection.Descending,
+                _ => ListSortDirection.Ascending,
+            };
+
+            vm.SortPresets(_presetSortDirection.Value);
+        }
+
+        private async void BlockedCheckBox_Click(object? sender, RoutedEventArgs e)
+        {
+            if (DataContext is not PresetManagerWindowViewModel vm)
+            {
+                return;
+            }
+
+            await vm.PersistSelectedPresetServerKeysAsync();
+            ReapplyServerSortIfNeeded();
+        }
+
+        private async void ServerItemsGrid_KeyDown(object? sender, KeyEventArgs e)
+        {
+            if (e.Key != Key.Space || DataContext is not PresetManagerWindowViewModel vm)
+            {
+                return;
+            }
+
+            if (ServerItemsGrid.SelectedItems.Count == 0)
+            {
+                return;
+            }
+
+            List<PresetServerSelectionItem> selectedItems = ServerItemsGrid.SelectedItems
+                .OfType<PresetServerSelectionItem>()
+                .ToList();
+
+            if (selectedItems.Count == 0)
+            {
+                return;
+            }
+
+            e.Handled = true;
+
+            bool shouldBlock = selectedItems.Any(serverItem => !serverItem.IsBlocked);
+
+            foreach (PresetServerSelectionItem serverItem in selectedItems)
+            {
+                serverItem.IsBlocked = shouldBlock;
+            }
+
+            await vm.PersistSelectedPresetServerKeysAsync();
+            ReapplyServerSortIfNeeded();
+        }
+
+        private void ServerItemsGrid_Sorting(object? sender, DataGridColumnEventArgs e)
+        {
+            string? sortKey = e.Column.SortMemberPath switch
+            {
+                "IsBlocked" => "Blocked",
+                "FlagSortKey" => "Flag",
+                "Name" => "ServerId",
+                "Description" => "ServerName",
+                _ => null,
+            };
+
+            if (sortKey == null)
+            {
+                return;
+            }
+
+            ListSortDirection defaultDirection = sortKey == "Blocked"
+                ? ListSortDirection.Descending
+                : ListSortDirection.Ascending;
+
+            SortServerItems(sortKey, defaultDirection);
+        }
+
+        private void SortServerItems(string columnName, ListSortDirection defaultDirection = ListSortDirection.Ascending)
+        {
+            if (DataContext is not PresetManagerWindowViewModel vm)
+            {
+                return;
+            }
+
+            if (_serverSortColumn == columnName)
+            {
+                _serverSortDirection = _serverSortDirection == ListSortDirection.Ascending
+                    ? ListSortDirection.Descending
+                    : ListSortDirection.Ascending;
+            }
+            else
+            {
+                _serverSortColumn = columnName;
+                _serverSortDirection = defaultDirection;
+            }
+
+            vm.SortServerItems(columnName, _serverSortDirection);
+        }
+
+        private void ReapplyPresetSortIfNeeded()
+        {
+            if (_presetSortDirection == null || DataContext is not PresetManagerWindowViewModel vm)
+            {
+                return;
+            }
+
+            vm.SortPresets(_presetSortDirection.Value);
+        }
+
+        private void ReapplyServerSortIfNeeded()
+        {
+            if (string.IsNullOrWhiteSpace(_serverSortColumn) || DataContext is not PresetManagerWindowViewModel vm)
+            {
+                return;
+            }
+
+            vm.SortServerItems(_serverSortColumn, _serverSortDirection);
+        }
+
+        private void RestorePresetListFocus()
+        {
+            Dispatcher.UIThread.Post(() => PresetListGrid.Focus());
+        }
+
+        private void BeginEditingSelectedPreset()
+        {
+            Dispatcher.UIThread.Post(() =>
+            {
+                if (DataContext is not PresetManagerWindowViewModel vm || vm.SelectedPresetItem == null || GetSelectedPresetItems().Count != 1)
+                {
+                    return;
+                }
+
+                vm.StopEditingPresets();
+                PresetListGrid.Focus();
+                _allowPresetNameEdit = true;
+                PresetListGrid.IsReadOnly = false;
+                PresetListGrid.CurrentColumn = PresetListGrid.Columns.FirstOrDefault();
+                PresetListGrid.BeginEdit();
+            });
+        }
+
+        private List<PresetListItemViewModel> GetSelectedPresetItems()
+        {
+            IEnumerable selectedItems = PresetListGrid.SelectedItems ?? System.Array.Empty<object>();
+            List<PresetListItemViewModel> selectedPresetItems = selectedItems
+                .OfType<PresetListItemViewModel>()
+                .Distinct()
+                .ToList();
+
+            if (selectedPresetItems.Count == 0 && DataContext is PresetManagerWindowViewModel vm && vm.SelectedPresetItem != null)
+            {
+                selectedPresetItems.Add(vm.SelectedPresetItem);
+            }
+
+            return selectedPresetItems;
+        }
+
+    }
+}
diff --git a/ServerPickerX/Views/UserWindows/PresetNameWindow.axaml b/ServerPickerX/Views/UserWindows/PresetNameWindow.axaml
deleted file mode 100644
index f9837af..0000000
--- a/ServerPickerX/Views/UserWindows/PresetNameWindow.axaml
+++ /dev/null
@@ -1,75 +0,0 @@
-<Window xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:userControls="using:ServerPickerX"
-    mc:Ignorable="d"
-    Width="360"
-    Height="180"
-    x:Class="ServerPickerX.PresetNameWindow"
-    SystemDecorations="BorderOnly"
-    ExtendClientAreaToDecorationsHint="True"
-    ExtendClientAreaChromeHints="NoChrome"
-    ExtendClientAreaTitleBarHeightHint="-1"
-    WindowStartupLocation="CenterOwner"
-    CanResize="False"
-    CanMaximize="False"
-    Background="Transparent"
-    Loaded="Window_Loaded">
-    <Border
-        Background="#373B78"
-        BorderBrush="#575cd4"
-        BorderThickness="1.35">
-        <Grid>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="30" />
-                <RowDefinition />
-            </Grid.RowDefinitions>
-
-            <Grid x:Name="TitleBar"
-                  Background="#373B78"
-                  PointerPressed="TitleBar_PointerPressed">
-                <TextBlock
-                    VerticalAlignment="Center"
-                    Margin="10,0,0,0"
-                    Foreground="White"
-                    FontWeight="Bold"
-                    FontSize="14"
-                    Text="{DynamicResource PresetNameTitle}" />
-                <userControls:TitleBarButtons/>
-            </Grid>
-
-            <Grid Grid.Row="1" Margin="16">
-                <Grid.RowDefinitions>
-                    <RowDefinition />
-                    <RowDefinition Height="48" />
-                </Grid.RowDefinitions>
-
-                <StackPanel Spacing="10" VerticalAlignment="Center">
-                    <TextBlock
-                        Foreground="White"
-                        Text="{DynamicResource PresetNamePrompt}" />
-                    <TextBox
-                        x:Name="PresetNameTextBox"
-                        Classes="search-textbox"
-                        Watermark="{DynamicResource PresetNameWatermark}" />
-                </StackPanel>
-
-                <StackPanel
-                    Grid.Row="1"
-                    Orientation="Horizontal"
-                    HorizontalAlignment="Right"
-                    Spacing="8">
-                    <Button
-                        Classes="main-btn"
-                        Content="{DynamicResource SaveButtonText}"
-                        Click="SaveBtn_Click" />
-                    <Button
-                        Classes="main-btn"
-                        Content="{DynamicResource CancelButtonText}"
-                        Click="CancelBtn_Click" />
-                </StackPanel>
-            </Grid>
-        </Grid>
-    </Border>
-</Window>
diff --git a/ServerPickerX/Views/UserWindows/PresetNameWindow.axaml.cs b/ServerPickerX/Views/UserWindows/PresetNameWindow.axaml.cs
deleted file mode 100644
index b59bbba..0000000
--- a/ServerPickerX/Views/UserWindows/PresetNameWindow.axaml.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Input;
-
-namespace ServerPickerX;
-
-public partial class PresetNameWindow : Window
-{
-    private readonly string? _initialPresetName;
-
-    public PresetNameWindow()
-    {
-        InitializeComponent();
-    }
-
-    public PresetNameWindow(string? initialPresetName)
-    {
-        InitializeComponent();
-        _initialPresetName = initialPresetName;
-    }
-
-    private void Window_Loaded(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
-    {
-        PresetNameTextBox.Text = _initialPresetName;
-        PresetNameTextBox.Focus();
-        PresetNameTextBox.CaretIndex = PresetNameTextBox.Text?.Length ?? 0;
-    }
-
-    private void TitleBar_PointerPressed(object? sender, PointerPressedEventArgs e)
-    {
-        e.Handled = true;
-        var parentWindow = TopLevel.GetTopLevel(this) as Window;
-        parentWindow?.BeginMoveDrag(e);
-    }
-
-    private void SaveBtn_Click(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
-    {
-        Close(PresetNameTextBox.Text);
-    }
-
-    private void CancelBtn_Click(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
-    {
-        Close(null);
-    }
-}

From e87eb1d29d811710b420ba4138f907010489d482 Mon Sep 17 00:00:00 2001
From: JanitorialMess <65749353+JanitorialMess@users.noreply.github.com>
Date: Sat, 4 Apr 2026 19:05:06 -0400
Subject: [PATCH 06/10] refactor: extract preset item models and clean up dead
 code

---
 ServerPickerX/Models/PresetItemModel.cs       |  29 ++++
 ServerPickerX/Models/PresetServerItemModel.cs |  67 +++++++++
 .../ViewModels/MainWindowViewModel.cs         |   2 -
 .../PresetManagerWindowViewModel.cs           | 130 ++----------------
 .../UserWindows/PresetManagerWindow.axaml.cs  |  26 ++--
 5 files changed, 119 insertions(+), 135 deletions(-)
 create mode 100644 ServerPickerX/Models/PresetItemModel.cs
 create mode 100644 ServerPickerX/Models/PresetServerItemModel.cs

diff --git a/ServerPickerX/Models/PresetItemModel.cs b/ServerPickerX/Models/PresetItemModel.cs
new file mode 100644
index 0000000..19be55b
--- /dev/null
+++ b/ServerPickerX/Models/PresetItemModel.cs
@@ -0,0 +1,29 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+
+namespace ServerPickerX.Models
+{
+    public class PresetItemModel : ObservableObject
+    {
+        public ServerPresetModel Preset { get; }
+
+        public string Name
+        {
+            get => Preset.Name;
+            set
+            {
+                if (Preset.Name == value)
+                {
+                    return;
+                }
+
+                Preset.Name = value;
+                OnPropertyChanged();
+            }
+        }
+
+        public PresetItemModel(ServerPresetModel preset)
+        {
+            Preset = preset;
+        }
+    }
+}
diff --git a/ServerPickerX/Models/PresetServerItemModel.cs b/ServerPickerX/Models/PresetServerItemModel.cs
new file mode 100644
index 0000000..dabe255
--- /dev/null
+++ b/ServerPickerX/Models/PresetServerItemModel.cs
@@ -0,0 +1,67 @@
+using Avalonia.Platform;
+using CommunityToolkit.Mvvm.ComponentModel;
+using System;
+using System.Collections.Generic;
+using System.Security.Cryptography;
+
+namespace ServerPickerX.Models
+{
+    public partial class PresetServerItemModel : ObservableObject
+    {
+        private static readonly Dictionary<string, string> FlagSortKeyCache = new(StringComparer.OrdinalIgnoreCase);
+
+        public ServerModel ServerModel { get; }
+
+        public string Key { get; }
+
+        public string Flag => ServerModel.Flag;
+
+        public string FlagSortKey { get; }
+
+        public string Name => ServerModel.Name;
+
+        public string Description => ServerModel.Description;
+
+        [ObservableProperty]
+        private bool isBlocked;
+
+        public PresetServerItemModel(ServerModel serverModel, string key, bool isBlocked)
+        {
+            ServerModel = serverModel;
+            Key = key;
+            IsBlocked = isBlocked;
+            FlagSortKey = GetFlagSortKey(serverModel.Flag);
+        }
+
+        private static string GetFlagSortKey(string flagPath)
+        {
+            if (string.IsNullOrWhiteSpace(flagPath))
+            {
+                return string.Empty;
+            }
+
+            if (FlagSortKeyCache.TryGetValue(flagPath, out string? cachedValue))
+            {
+                return cachedValue;
+            }
+
+            string assetUri = $"avares://ServerPickerX{flagPath}";
+
+            try
+            {
+                using var stream = AssetLoader.Open(new Uri(assetUri));
+                byte[] hash = SHA256.HashData(stream);
+                string flagSortKey = Convert.ToHexString(hash);
+                FlagSortKeyCache[flagPath] = flagSortKey;
+
+                return flagSortKey;
+            }
+            catch
+            {
+                FlagSortKeyCache[flagPath] = flagPath;
+
+                return flagPath;
+            }
+        }
+    }
+}
diff --git a/ServerPickerX/ViewModels/MainWindowViewModel.cs b/ServerPickerX/ViewModels/MainWindowViewModel.cs
index 23ed595..62c0aaa 100644
--- a/ServerPickerX/ViewModels/MainWindowViewModel.cs
+++ b/ServerPickerX/ViewModels/MainWindowViewModel.cs
@@ -539,8 +539,6 @@ private void TrackBlockedServerKeys(IEnumerable<ServerModel> serverModels, bool
             }
         }
 
-        public string GetCurrentServerKey(ServerModel serverModel) => GetServerKey(serverModel);
-
         public string GetServerKey(ServerModel serverModel, bool isClustered)
         {
             return isClustered
diff --git a/ServerPickerX/ViewModels/PresetManagerWindowViewModel.cs b/ServerPickerX/ViewModels/PresetManagerWindowViewModel.cs
index bfab235..fc406d1 100644
--- a/ServerPickerX/ViewModels/PresetManagerWindowViewModel.cs
+++ b/ServerPickerX/ViewModels/PresetManagerWindowViewModel.cs
@@ -1,6 +1,5 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using MsBox.Avalonia.Enums;
-using Avalonia.Platform;
 using ServerPickerX.Comparers;
 using ServerPickerX.Extensions;
 using ServerPickerX.Models;
@@ -11,7 +10,6 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
-using System.Security.Cryptography;
 using System.Threading.Tasks;
 
 namespace ServerPickerX.ViewModels
@@ -19,16 +17,16 @@ namespace ServerPickerX.ViewModels
     public partial class PresetManagerWindowViewModel : ViewModelBase
     {
         [ObservableProperty]
-        private ObservableCollectionExtended<PresetListItemViewModel> presets = [];
+        private ObservableCollectionExtended<PresetItemModel> presets = [];
 
-        public ObservableCollectionExtended<PresetServerSelectionItem> ServerItems { get; } = [];
+        public ObservableCollectionExtended<PresetServerItemModel> ServerItems { get; } = [];
 
         [ObservableProperty]
         [NotifyPropertyChangedFor(nameof(CanDelete))]
         [NotifyPropertyChangedFor(nameof(CanApply))]
         [NotifyPropertyChangedFor(nameof(CanEditPreset))]
         [NotifyPropertyChangedFor(nameof(CanToggleClusterMode))]
-        private PresetListItemViewModel? selectedPresetItem;
+        private PresetItemModel? selectedPresetItem;
 
         [ObservableProperty]
         [NotifyPropertyChangedFor(nameof(CanDelete))]
@@ -73,13 +71,8 @@ ILocalizationService localizationService
             ReloadPresets(_mainVm.SelectedPreset?.Name);
         }
 
-        partial void OnSelectedPresetItemChanged(PresetListItemViewModel? oldValue, PresetListItemViewModel? newValue)
+        partial void OnSelectedPresetItemChanged(PresetItemModel? oldValue, PresetItemModel? newValue)
         {
-            if (oldValue != null && !ReferenceEquals(oldValue, newValue))
-            {
-                oldValue.IsEditing = false;
-            }
-
             if (newValue != null)
             {
                 EditorIsClustered = newValue.Preset.IsClustered;
@@ -187,7 +180,7 @@ public async Task<bool> ApplySelectedPresetAsync()
             return await _mainVm.ApplyPresetAsync(ClonePreset(SelectedPresetItem.Preset));
         }
 
-        public async Task<bool> RenamePresetAsync(PresetListItemViewModel presetItem, string originalPresetName)
+        public async Task<bool> RenamePresetAsync(PresetItemModel presetItem, string originalPresetName)
         {
             if (presetItem == null)
             {
@@ -306,7 +299,7 @@ public async Task ToggleSelectedPresetClusterModeAsync()
         public void SortPresets(ListSortDirection direction)
         {
             string? selectedPresetName = SelectedPresetItem?.Name;
-            List<PresetListItemViewModel> sortedPresets = (direction == ListSortDirection.Ascending
+            List<PresetItemModel> sortedPresets = (direction == ListSortDirection.Ascending
                 ? Presets.OrderBy(preset => preset.Name, NaturalStringComparer.OrdinalIgnoreCase)
                 : Presets.OrderByDescending(preset => preset.Name, NaturalStringComparer.OrdinalIgnoreCase))
                 .ToList();
@@ -323,7 +316,7 @@ public void SortPresets(ListSortDirection direction)
 
         public void SortServerItems(string sortKey, ListSortDirection direction)
         {
-            List<PresetServerSelectionItem> sortedItems = sortKey switch
+            List<PresetServerItemModel> sortedItems = sortKey switch
             {
                 "Blocked" => (direction == ListSortDirection.Ascending
                     ? ServerItems.OrderBy(serverItem => serverItem.IsBlocked)
@@ -358,8 +351,8 @@ private void ReloadPresets(string? preferredPresetName = null)
                 return;
             }
 
-            Presets = new ObservableCollectionExtended<PresetListItemViewModel>(
-                currentPresets.Select(preset => new PresetListItemViewModel(ClonePreset(preset))).ToList()
+            Presets = new ObservableCollectionExtended<PresetItemModel>(
+                currentPresets.Select(preset => new PresetItemModel(ClonePreset(preset))).ToList()
                 );
 
             SelectedPresetItem = !string.IsNullOrWhiteSpace(presetNameToSelect)
@@ -386,15 +379,7 @@ private void LoadServerItemsForSelectedPreset()
             {
                 string serverKey = _mainVm.GetServerKey(serverModel, SelectedPresetItem.Preset.IsClustered);
 
-                ServerItems.Add(new PresetServerSelectionItem(serverModel, serverKey, blockedServerKeys.Contains(serverKey)));
-            }
-        }
-
-        public void StopEditingPresets()
-        {
-            foreach (PresetListItemViewModel preset in Presets)
-            {
-                preset.IsEditing = false;
+                ServerItems.Add(new PresetServerItemModel(serverModel, serverKey, blockedServerKeys.Contains(serverKey)));
             }
         }
 
@@ -503,100 +488,7 @@ private static ServerPresetModel ClonePreset(ServerPresetModel preset)
                     .Distinct(StringComparer.OrdinalIgnoreCase)
                     .OrderBy(serverKey => serverKey, StringComparer.OrdinalIgnoreCase)
                     .ToList(),
-            };
-        }
-    }
-
-    public partial class PresetListItemViewModel : ObservableObject
-    {
-        public ServerPresetModel Preset { get; }
-
-        public string Name
-        {
-            get => Preset.Name;
-            set
-            {
-                if (Preset.Name == value)
-                {
-                    return;
-                }
-
-                Preset.Name = value;
-                OnPropertyChanged();
-            }
-        }
-
-        [ObservableProperty]
-        [NotifyPropertyChangedFor(nameof(IsDisplayVisible))]
-        [NotifyPropertyChangedFor(nameof(IsEditorVisible))]
-        private bool isEditing;
-
-        public bool IsDisplayVisible => !IsEditing;
-
-        public bool IsEditorVisible => IsEditing;
-
-        public PresetListItemViewModel(ServerPresetModel preset)
-        {
-            Preset = preset;
-        }
-    }
-
-    public partial class PresetServerSelectionItem : ObservableObject
-    {
-        private static readonly Dictionary<string, string> FlagSortKeyCache = new(StringComparer.OrdinalIgnoreCase);
-
-        public ServerModel ServerModel { get; }
-
-        public string Key { get; }
-
-        public string Flag => ServerModel.Flag;
-
-        public string FlagSortKey { get; }
-
-        public string Name => ServerModel.Name;
-
-        public string Description => ServerModel.Description;
-
-        [ObservableProperty]
-        private bool isBlocked;
-
-        public PresetServerSelectionItem(ServerModel serverModel, string key, bool isBlocked)
-        {
-            ServerModel = serverModel;
-            Key = key;
-            IsBlocked = isBlocked;
-            FlagSortKey = GetFlagSortKey(serverModel.Flag);
-        }
-
-        private static string GetFlagSortKey(string flagPath)
-        {
-            if (string.IsNullOrWhiteSpace(flagPath))
-            {
-                return string.Empty;
-            }
-
-            if (FlagSortKeyCache.TryGetValue(flagPath, out string? cachedValue))
-            {
-                return cachedValue;
-            }
-
-            string assetUri = $"avares://ServerPickerX{flagPath}";
-
-            try
-            {
-                using var stream = AssetLoader.Open(new Uri(assetUri));
-                byte[] hash = SHA256.HashData(stream);
-                string flagSortKey = Convert.ToHexString(hash);
-                FlagSortKeyCache[flagPath] = flagSortKey;
-
-                return flagSortKey;
-            }
-            catch
-            {
-                FlagSortKeyCache[flagPath] = flagPath;
-
-                return flagPath;
-            }
+                };
         }
     }
 }
diff --git a/ServerPickerX/Views/UserWindows/PresetManagerWindow.axaml.cs b/ServerPickerX/Views/UserWindows/PresetManagerWindow.axaml.cs
index fba9fe4..ead1d6b 100644
--- a/ServerPickerX/Views/UserWindows/PresetManagerWindow.axaml.cs
+++ b/ServerPickerX/Views/UserWindows/PresetManagerWindow.axaml.cs
@@ -3,6 +3,7 @@
 using Avalonia.Interactivity;
 using Avalonia.Threading;
 using Avalonia.VisualTree;
+using ServerPickerX.Models;
 using ServerPickerX.Services.DependencyInjection;
 using ServerPickerX.Services.Localizations;
 using ServerPickerX.Services.MessageBoxes;
@@ -18,7 +19,6 @@ namespace ServerPickerX.Views
 {
     public partial class PresetManagerWindow : Window
     {
-        private readonly MainWindowViewModel? _mainVm;
         private bool _allowPresetNameEdit;
         private bool _committingPresetName;
         private bool _isEditingPresetName;
@@ -35,9 +35,8 @@ public PresetManagerWindow()
         public PresetManagerWindow(MainWindowViewModel mainVm)
         {
             InitializeComponent();
-            _mainVm = mainVm;
             DataContext = new PresetManagerWindowViewModel(
-                _mainVm,
+                mainVm,
                 ServiceLocator.GetRequiredService<JsonSetting>(),
                 ServiceLocator.GetRequiredService<IMessageBoxService>(),
                 ServiceLocator.GetRequiredService<ILocalizationService>()
@@ -117,7 +116,7 @@ private void PresetListGrid_BeginningEdit(object? sender, DataGridBeginningEditE
                 return;
             }
 
-            if (e.Row.DataContext is not PresetListItemViewModel presetItem)
+            if (e.Row.DataContext is not PresetItemModel presetItem)
             {
                 return;
             }
@@ -132,7 +131,7 @@ private async void PresetListGrid_RowEditEnded(object? sender, DataGridRowEditEn
             _isEditingPresetName = false;
             PresetListGrid.IsReadOnly = true;
 
-            if (e.EditAction != DataGridEditAction.Commit || e.Row.DataContext is not PresetListItemViewModel presetItem)
+            if (e.EditAction != DataGridEditAction.Commit || e.Row.DataContext is not PresetItemModel presetItem)
             {
                 return;
             }
@@ -157,7 +156,7 @@ private void PresetListGrid_DoubleTapped(object? sender, RoutedEventArgs e)
             BeginEditingSelectedPreset();
         }
 
-        private async Task CommitPresetNameAsync(PresetListItemViewModel presetItem, string originalPresetName)
+        private async Task CommitPresetNameAsync(PresetItemModel presetItem, string originalPresetName)
         {
             if (_committingPresetName || DataContext is not PresetManagerWindowViewModel vm)
             {
@@ -188,7 +187,7 @@ private async void PresetListGrid_KeyDown(object? sender, KeyEventArgs e)
 
             if (e.Key == Key.Delete)
             {
-                List<PresetListItemViewModel> selectedPresetItems = GetSelectedPresetItems();
+                List<PresetItemModel> selectedPresetItems = GetSelectedPresetItems();
 
                 if (selectedPresetItems.Count == 0)
                 {
@@ -252,8 +251,8 @@ private async void ServerItemsGrid_KeyDown(object? sender, KeyEventArgs e)
                 return;
             }
 
-            List<PresetServerSelectionItem> selectedItems = ServerItemsGrid.SelectedItems
-                .OfType<PresetServerSelectionItem>()
+            List<PresetServerItemModel> selectedItems = ServerItemsGrid.SelectedItems
+                .OfType<PresetServerItemModel>()
                 .ToList();
 
             if (selectedItems.Count == 0)
@@ -265,7 +264,7 @@ private async void ServerItemsGrid_KeyDown(object? sender, KeyEventArgs e)
 
             bool shouldBlock = selectedItems.Any(serverItem => !serverItem.IsBlocked);
 
-            foreach (PresetServerSelectionItem serverItem in selectedItems)
+            foreach (PresetServerItemModel serverItem in selectedItems)
             {
                 serverItem.IsBlocked = shouldBlock;
             }
@@ -353,7 +352,6 @@ private void BeginEditingSelectedPreset()
                     return;
                 }
 
-                vm.StopEditingPresets();
                 PresetListGrid.Focus();
                 _allowPresetNameEdit = true;
                 PresetListGrid.IsReadOnly = false;
@@ -362,11 +360,11 @@ private void BeginEditingSelectedPreset()
             });
         }
 
-        private List<PresetListItemViewModel> GetSelectedPresetItems()
+        private List<PresetItemModel> GetSelectedPresetItems()
         {
             IEnumerable selectedItems = PresetListGrid.SelectedItems ?? System.Array.Empty<object>();
-            List<PresetListItemViewModel> selectedPresetItems = selectedItems
-                .OfType<PresetListItemViewModel>()
+            List<PresetItemModel> selectedPresetItems = selectedItems
+                .OfType<PresetItemModel>()
                 .Distinct()
                 .ToList();
 

From 4fc913fe3f50cad6b4ba92d33f772f7f783fe5a7 Mon Sep 17 00:00:00 2001
From: FN-FAL113 <orbetajeff@gmail.com>
Date: Sun, 5 Apr 2026 21:24:09 +0800
Subject: [PATCH 07/10] refactor: simplifications, fixes and chores (for
 testing)

---
 ServerPickerX/Models/PresetItemModel.cs       |  29 ----
 .../{ServerPresetModel.cs => PresetModel.cs}  |   5 +-
 ...erverItemModel.cs => PresetServerModel.cs} |   4 +-
 .../Services/Settings/JsonSetting.cs          |  37 +++--
 .../ViewModels/MainWindowViewModel.cs         |  48 +++---
 .../PresetManagerWindowViewModel.cs           | 142 ++++++++----------
 ServerPickerX/Views/MainWindow.axaml.cs       |  16 +-
 .../UserWindows/PresetManagerWindow.axaml     |   2 +-
 .../UserWindows/PresetManagerWindow.axaml.cs  |  67 ++++-----
 9 files changed, 148 insertions(+), 202 deletions(-)
 delete mode 100644 ServerPickerX/Models/PresetItemModel.cs
 rename ServerPickerX/Models/{ServerPresetModel.cs => PresetModel.cs} (85%)
 rename ServerPickerX/Models/{PresetServerItemModel.cs => PresetServerModel.cs} (91%)

diff --git a/ServerPickerX/Models/PresetItemModel.cs b/ServerPickerX/Models/PresetItemModel.cs
deleted file mode 100644
index 19be55b..0000000
--- a/ServerPickerX/Models/PresetItemModel.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using CommunityToolkit.Mvvm.ComponentModel;
-
-namespace ServerPickerX.Models
-{
-    public class PresetItemModel : ObservableObject
-    {
-        public ServerPresetModel Preset { get; }
-
-        public string Name
-        {
-            get => Preset.Name;
-            set
-            {
-                if (Preset.Name == value)
-                {
-                    return;
-                }
-
-                Preset.Name = value;
-                OnPropertyChanged();
-            }
-        }
-
-        public PresetItemModel(ServerPresetModel preset)
-        {
-            Preset = preset;
-        }
-    }
-}
diff --git a/ServerPickerX/Models/ServerPresetModel.cs b/ServerPickerX/Models/PresetModel.cs
similarity index 85%
rename from ServerPickerX/Models/ServerPresetModel.cs
rename to ServerPickerX/Models/PresetModel.cs
index 8e73bdd..4b952b1 100644
--- a/ServerPickerX/Models/ServerPresetModel.cs
+++ b/ServerPickerX/Models/PresetModel.cs
@@ -1,9 +1,10 @@
+using CommunityToolkit.Mvvm.ComponentModel;
 using System;
 using System.Collections.Generic;
 
 namespace ServerPickerX.Models
 {
-    public class ServerPresetModel
+    public class PresetModel : ObservableObject
     {
         public string Name { get; set; } = string.Empty;
 
@@ -15,7 +16,7 @@ public class ServerPresetModel
 
         public override bool Equals(object? obj)
         {
-            return obj is ServerPresetModel other &&
+            return obj is PresetModel other &&
                 GameMode.Equals(other.GameMode, StringComparison.OrdinalIgnoreCase) &&
                 Name.Equals(other.Name, StringComparison.OrdinalIgnoreCase);
         }
diff --git a/ServerPickerX/Models/PresetServerItemModel.cs b/ServerPickerX/Models/PresetServerModel.cs
similarity index 91%
rename from ServerPickerX/Models/PresetServerItemModel.cs
rename to ServerPickerX/Models/PresetServerModel.cs
index dabe255..0f6139b 100644
--- a/ServerPickerX/Models/PresetServerItemModel.cs
+++ b/ServerPickerX/Models/PresetServerModel.cs
@@ -6,7 +6,7 @@
 
 namespace ServerPickerX.Models
 {
-    public partial class PresetServerItemModel : ObservableObject
+    public partial class PresetServerModel : ObservableObject
     {
         private static readonly Dictionary<string, string> FlagSortKeyCache = new(StringComparer.OrdinalIgnoreCase);
 
@@ -25,7 +25,7 @@ public partial class PresetServerItemModel : ObservableObject
         [ObservableProperty]
         private bool isBlocked;
 
-        public PresetServerItemModel(ServerModel serverModel, string key, bool isBlocked)
+        public PresetServerModel(ServerModel serverModel, string key, bool isBlocked)
         {
             ServerModel = serverModel;
             Key = key;
diff --git a/ServerPickerX/Services/Settings/JsonSetting.cs b/ServerPickerX/Services/Settings/JsonSetting.cs
index b8ec223..589dc86 100644
--- a/ServerPickerX/Services/Settings/JsonSetting.cs
+++ b/ServerPickerX/Services/Settings/JsonSetting.cs
@@ -43,7 +43,7 @@ public class JsonSetting : ISetting
 
         public virtual bool version_check_on_startup { get; set; } = true;
 
-        public virtual List<ServerPresetModel> server_presets { get; set; } = [];
+        public virtual List<PresetModel> server_presets { get; set; } = [];
 
         public virtual Dictionary<string, string> last_selected_preset_names { get; set; } = new(StringComparer.OrdinalIgnoreCase);
 
@@ -239,7 +239,7 @@ public async Task ClearLastSelectedPresetNameByGameModeAsync()
             await SaveSettingsAsync();
         }
 
-        public List<ServerPresetModel> GetPresetsByGameMode(string gameMode)
+        public List<PresetModel> GetPresetsByGameMode(string gameMode)
         {
             string normalizedGameMode = gameMode ?? string.Empty;
 
@@ -248,7 +248,7 @@ public List<ServerPresetModel> GetPresetsByGameMode(string gameMode)
                 .ToList();
         }
 
-        public ServerPresetModel? GetPresetByGameMode(string gameMode, string presetName)
+        public PresetModel? GetPresetByGameMode(string gameMode, string presetName)
         {
             string normalizedGameMode = gameMode ?? string.Empty;
             string normalizedPresetName = presetName ?? string.Empty;
@@ -258,28 +258,41 @@ public List<ServerPresetModel> GetPresetsByGameMode(string gameMode)
                 (preset.Name ?? string.Empty).Equals(normalizedPresetName, StringComparison.OrdinalIgnoreCase));
         }
 
-        public async Task AddOrUpdatePresetAsync(ServerPresetModel serverPreset)
+        public bool HasDuplicatePresetNameByCurrentGameMode(string presetName)
+        {
+            string normalizedPresetName = presetName ?? string.Empty;
+
+            return (server_presets ?? [])
+                .Count(preset =>
+                    (preset.GameMode ?? string.Empty).Equals(this.game_mode, StringComparison.OrdinalIgnoreCase) &&
+                    (preset.Name ?? string.Empty).Equals(normalizedPresetName, StringComparison.OrdinalIgnoreCase)
+                ) > 1;
+        }
+
+        public async Task AddOrUpdatePresetAsync(PresetModel preset)
         {
             server_presets ??= [];
-            ServerPresetModel? existingPreset = GetPresetByGameMode(serverPreset.GameMode, serverPreset.Name);
-            List<string> blockedServerKeys = serverPreset.BlockedServerKeys
+
+            PresetModel? existingPreset = GetPresetByGameMode(preset.GameMode, preset.Name);
+
+            List<string> blockedServerKeys = preset.BlockedServerKeys
                 .Distinct(StringComparer.OrdinalIgnoreCase)
                 .OrderBy(key => key, StringComparer.OrdinalIgnoreCase)
                 .ToList();
 
             if (existingPreset == null)
             {
-                server_presets.Add(new ServerPresetModel
+                server_presets.Add(new PresetModel
                 {
-                    Name = serverPreset.Name,
-                    GameMode = serverPreset.GameMode,
-                    IsClustered = serverPreset.IsClustered,
+                    Name = preset.Name,
+                    GameMode = preset.GameMode,
+                    IsClustered = preset.IsClustered,
                     BlockedServerKeys = blockedServerKeys,
                 });
             }
             else
             {
-                existingPreset.IsClustered = serverPreset.IsClustered;
+                existingPreset.IsClustered = preset.IsClustered;
                 existingPreset.BlockedServerKeys = blockedServerKeys;
             }
 
@@ -311,7 +324,7 @@ HashSet<string> unclusteredServerKeys
 
             bool presetsChanged = false;
 
-            foreach (ServerPresetModel preset in server_presets.Where(preset =>
+            foreach (PresetModel preset in server_presets.Where(preset =>
                          (preset.GameMode ?? string.Empty).Equals(gameMode, StringComparison.OrdinalIgnoreCase)))
             {
                 HashSet<string> validServerKeys = preset.IsClustered
diff --git a/ServerPickerX/ViewModels/MainWindowViewModel.cs b/ServerPickerX/ViewModels/MainWindowViewModel.cs
index 62c0aaa..a243a12 100644
--- a/ServerPickerX/ViewModels/MainWindowViewModel.cs
+++ b/ServerPickerX/ViewModels/MainWindowViewModel.cs
@@ -24,8 +24,6 @@ public partial class MainWindowViewModel : ViewModelBase
     {
         public ObservableCollectionExtended<ServerModel> ServerModels { get; set; } = [];
 
-        public ObservableCollectionExtended<ServerPresetModel> PresetItems { get; set; } = [];
-
         // Property resolved through expression body that react to changes from another observable property
         public ObservableCollectionExtended<ServerModel> FilteredServerModels =>
              string.IsNullOrWhiteSpace(SearchText)
@@ -35,6 +33,8 @@ public partial class MainWindowViewModel : ViewModelBase
                     s.Description.Contains(SearchText, StringComparison.OrdinalIgnoreCase)
                 ));
 
+        public ObservableCollectionExtended<PresetModel> PresetItems { get; set; } = [];
+
         public ServerModel? SelectedDataGridServerModel { get; set; }
 
         // Mvvm tool kit will auto generate source code to make this property observable
@@ -60,7 +60,7 @@ public partial class MainWindowViewModel : ViewModelBase
         public bool pendingOperation = false;
 
         [ObservableProperty]
-        public ServerPresetModel? selectedPreset;
+        public PresetModel? selectedPreset;
 
         [ObservableProperty]
         [NotifyPropertyChangedFor(nameof(CanSelectPresets))]
@@ -78,7 +78,6 @@ public partial class MainWindowViewModel : ViewModelBase
         private readonly ISystemFirewallService _systemFirewallService;
         private readonly JsonSetting _jsonSetting;
         private readonly HashSet<string> _blockedServerKeys = new(StringComparer.OrdinalIgnoreCase);
-        private string _presetNameSuggestion = string.Empty;
 
         // Parameterless constructor, allows design previewer to instantiate this class since it doesn't support DI
         public MainWindowViewModel()
@@ -111,7 +110,6 @@ JsonSetting jsonSetting
 
         public async Task LoadServersAsync()
         {
-            _presetNameSuggestion = string.Empty;
             ServersLoaded = await _serverDataService.LoadServersAsync();
 
             if (!ServersLoaded) return;
@@ -178,12 +176,12 @@ public async Task SetClusterStateAsync(bool isClustered, bool shouldUnblockCurre
             }
         }
 
-        public List<ServerPresetModel> GetCurrentGamePresets()
+        public List<PresetModel> GetCurrentGamePresets()
         {
             return _jsonSetting.GetPresetsByGameMode(_jsonSetting.game_mode);
         }
 
-        public ServerPresetModel? GetCurrentGamePreset(string presetName)
+        public PresetModel? GetCurrentGamePreset(string presetName)
         {
             return _jsonSetting.GetPresetByGameMode(_jsonSetting.game_mode, presetName);
         }
@@ -191,7 +189,7 @@ public List<ServerPresetModel> GetCurrentGamePresets()
         public void LoadPresetPickerItems()
         {
             string? selectedPresetName = SelectedPreset?.Name;
-            List<ServerPresetModel> presetItems = GetCurrentGamePresets();
+            List<PresetModel> presetItems = GetCurrentGamePresets();
 
             PresetItems.Clear();
 
@@ -231,7 +229,7 @@ public IReadOnlyList<ServerModel> GetCurrentGameServerModels(bool isClustered)
                 : serverData.UnclusteredServers;
         }
 
-        public async Task DeletePresetAsync(ServerPresetModel preset)
+        public async Task DeletePresetAsync(PresetModel preset)
         {
             string deletedPresetName = preset.Name;
 
@@ -242,12 +240,6 @@ public async Task DeletePresetAsync(ServerPresetModel preset)
                 await _jsonSetting.ClearLastSelectedPresetNameByGameModeAsync();
             }
 
-            if ((SelectedPreset?.Name ?? string.Empty).Equals(deletedPresetName, StringComparison.OrdinalIgnoreCase) ||
-                _presetNameSuggestion.Equals(deletedPresetName, StringComparison.OrdinalIgnoreCase))
-            {
-                _presetNameSuggestion = string.Empty;
-            }
-
             LoadPresetPickerItems();
 
             if (SelectedPreset?.Equals(preset) == true)
@@ -256,29 +248,28 @@ public async Task DeletePresetAsync(ServerPresetModel preset)
             }
         }
 
-        public async Task<bool> ApplyPresetAsync(ServerPresetModel serverPreset)
+        public async Task<bool> ApplyPresetAsync(PresetModel preset)
         {
             if (!ServersLoaded)
             {
                 return false;
             }
 
-            if (!serverPreset.GameMode.Equals(_jsonSetting.game_mode, StringComparison.OrdinalIgnoreCase))
+            if (!preset.GameMode.Equals(_jsonSetting.game_mode, StringComparison.OrdinalIgnoreCase))
             {
                 return false;
             }
 
-            bool presetApplied = await ApplyPresetWithResetAsync(serverPreset);
+            bool presetApplied = await ApplyPresetWithResetAsync(preset);
 
             if (!presetApplied)
             {
                 return false;
             }
 
-            ReplaceBlockedServerKeysFromPreset(serverPreset);
-            await _jsonSetting.SetLastSelectedPresetNameByGameModeAsync(serverPreset.Name);
-            _presetNameSuggestion = serverPreset.Name;
-            SelectPresetByName(serverPreset.Name);
+            ReplaceBlockedServerKeysFromPreset(preset);
+            await _jsonSetting.SetLastSelectedPresetNameByGameModeAsync(preset.Name);
+            SelectPresetByName(preset.Name);
 
             return true;
         }
@@ -569,7 +560,7 @@ public async Task RestoreLastSelectedPresetAsync()
                 return;
             }
 
-            ServerPresetModel? lastSelectedPreset = GetCurrentGamePreset(lastSelectedPresetName);
+            PresetModel? lastSelectedPreset = GetCurrentGamePreset(lastSelectedPresetName);
 
             if (lastSelectedPreset == null)
             {
@@ -586,7 +577,7 @@ public async Task RestoreLastSelectedPresetAsync()
             }
         }
 
-        private async Task<bool> ApplyPresetWithResetAsync(ServerPresetModel serverPreset)
+        private async Task<bool> ApplyPresetWithResetAsync(PresetModel serverPreset)
         {
             if (ServerModels.Count > 0)
             {
@@ -614,7 +605,7 @@ private async Task<bool> ApplyPresetWithResetAsync(ServerPresetModel serverPrese
             return await PerformOperationAsync(true, matchingServerModels, false);
         }
 
-        private ObservableCollection<ServerModel> GetMatchingServerModels(ServerPresetModel serverPreset)
+        private ObservableCollection<ServerModel> GetMatchingServerModels(PresetModel serverPreset)
         {
             return new ObservableCollection<ServerModel>(
                 ServerModels.Where(serverModel =>
@@ -623,7 +614,7 @@ private ObservableCollection<ServerModel> GetMatchingServerModels(ServerPresetMo
                 );
         }
 
-        private void ReplaceBlockedServerKeysFromPreset(ServerPresetModel serverPreset)
+        private void ReplaceBlockedServerKeysFromPreset(PresetModel serverPreset)
         {
             ObservableCollection<ServerModel> matchingServerModels = GetMatchingServerModels(serverPreset);
 
@@ -642,11 +633,6 @@ private void ClearSelectedPreset()
 
         private async Task MarkPresetSelectionDirtyAsync()
         {
-            if (SelectedPreset != null)
-            {
-                _presetNameSuggestion = SelectedPreset.Name;
-            }
-
             await _jsonSetting.ClearLastSelectedPresetNameByGameModeAsync();
 
             ClearSelectedPreset();
diff --git a/ServerPickerX/ViewModels/PresetManagerWindowViewModel.cs b/ServerPickerX/ViewModels/PresetManagerWindowViewModel.cs
index fc406d1..1e61874 100644
--- a/ServerPickerX/ViewModels/PresetManagerWindowViewModel.cs
+++ b/ServerPickerX/ViewModels/PresetManagerWindowViewModel.cs
@@ -3,6 +3,7 @@
 using ServerPickerX.Comparers;
 using ServerPickerX.Extensions;
 using ServerPickerX.Models;
+using ServerPickerX.Services.DependencyInjection;
 using ServerPickerX.Services.Localizations;
 using ServerPickerX.Services.MessageBoxes;
 using ServerPickerX.Settings;
@@ -17,16 +18,16 @@ namespace ServerPickerX.ViewModels
     public partial class PresetManagerWindowViewModel : ViewModelBase
     {
         [ObservableProperty]
-        private ObservableCollectionExtended<PresetItemModel> presets = [];
+        private ObservableCollectionExtended<PresetModel> presets = [];
 
-        public ObservableCollectionExtended<PresetServerItemModel> ServerItems { get; } = [];
+        public ObservableCollectionExtended<PresetServerModel> PresetServers { get; } = [];
 
         [ObservableProperty]
         [NotifyPropertyChangedFor(nameof(CanDelete))]
         [NotifyPropertyChangedFor(nameof(CanApply))]
         [NotifyPropertyChangedFor(nameof(CanEditPreset))]
         [NotifyPropertyChangedFor(nameof(CanToggleClusterMode))]
-        private PresetItemModel? selectedPresetItem;
+        private PresetModel? selectedPresetItem;
 
         [ObservableProperty]
         [NotifyPropertyChangedFor(nameof(CanDelete))]
@@ -71,11 +72,11 @@ ILocalizationService localizationService
             ReloadPresets(_mainVm.SelectedPreset?.Name);
         }
 
-        partial void OnSelectedPresetItemChanged(PresetItemModel? oldValue, PresetItemModel? newValue)
+        partial void OnSelectedPresetItemChanged(PresetModel? oldValue, PresetModel? newValue)
         {
             if (newValue != null)
             {
-                EditorIsClustered = newValue.Preset.IsClustered;
+                EditorIsClustered = newValue.IsClustered;
             }
             else
             {
@@ -88,7 +89,7 @@ partial void OnSelectedPresetItemChanged(PresetItemModel? oldValue, PresetItemMo
         public async Task AddPresetAsync()
         {
             string presetName = GetNextPresetName();
-            ServerPresetModel newPreset = new()
+            PresetModel newPreset = new()
             {
                 Name = presetName,
                 GameMode = _mainVm.GetCurrentGameMode(),
@@ -101,14 +102,14 @@ public async Task AddPresetAsync()
             ReloadPresets(presetName);
         }
 
-        public async Task<bool> DeletePresetsAsync(IReadOnlyList<ServerPresetModel> presetsToDelete)
+        public async Task<bool> DeletePresetsAsync(IReadOnlyList<PresetModel> presetsToDelete)
         {
             if (presetsToDelete == null || presetsToDelete.Count == 0 || IsDeletingPreset)
             {
                 return false;
             }
 
-            List<ServerPresetModel> normalizedPresets = presetsToDelete
+            List<PresetModel> normalizedPresets = presetsToDelete
                 .Where(preset => preset != null)
                 .Distinct()
                 .ToList();
@@ -143,7 +144,7 @@ public async Task<bool> DeletePresetsAsync(IReadOnlyList<ServerPresetModel> pres
                     return false;
                 }
 
-                List<ServerPresetModel> currentPresets = GetCurrentGamePresets();
+                List<PresetModel> currentPresets = GetCurrentGamePresets();
                 HashSet<string> deletedPresetNames = normalizedPresets
                     .Select(preset => preset.Name)
                     .ToHashSet(StringComparer.OrdinalIgnoreCase);
@@ -151,7 +152,7 @@ public async Task<bool> DeletePresetsAsync(IReadOnlyList<ServerPresetModel> pres
                     .FirstOrDefault(preset => !deletedPresetNames.Contains(preset.Name))
                     ?.Name;
 
-                foreach (ServerPresetModel preset in normalizedPresets)
+                foreach (PresetModel preset in normalizedPresets)
                 {
                     await _mainVm.DeletePresetAsync(preset);
                 }
@@ -177,17 +178,17 @@ public async Task<bool> ApplySelectedPresetAsync()
             // Refresh the main preset list before applying so the selected preset can be reselected there too.
             _mainVm.LoadPresetPickerItems();
 
-            return await _mainVm.ApplyPresetAsync(ClonePreset(SelectedPresetItem.Preset));
+            return await _mainVm.ApplyPresetAsync(ClonePreset(SelectedPresetItem));
         }
 
-        public async Task<bool> RenamePresetAsync(PresetItemModel presetItem, string originalPresetName)
+        public async Task<bool> RenamePresetAsync(PresetModel preset, string originalPresetName)
         {
-            if (presetItem == null)
+            if (preset == null)
             {
                 return false;
             }
 
-            string newPresetName = (presetItem.Name ?? string.Empty).Trim();
+            string newPresetName = (preset.Name ?? string.Empty).Trim();
             string currentPresetName = originalPresetName.Trim();
 
             if (string.IsNullOrWhiteSpace(newPresetName))
@@ -207,13 +208,12 @@ await _messageBoxService.ShowMessageBoxAsync(
                 return true;
             }
 
-            ServerPresetModel? existingPreset = _mainVm.GetCurrentGamePreset(newPresetName);
-            bool overwritingDifferentPreset = existingPreset != null &&
-                !existingPreset.Name.Equals(currentPresetName, StringComparison.OrdinalIgnoreCase);
+            bool hasDuplicatePresetName = _jsonSetting.HasDuplicatePresetNameByCurrentGameMode(newPresetName);
+            bool overwroteDifferentPreset = false;
 
-            if (overwritingDifferentPreset)
+            if (hasDuplicatePresetName)
             {
-                bool shouldOverwrite = await _messageBoxService.ShowMessageBoxConfirmationAsync(
+                overwroteDifferentPreset = await _messageBoxService.ShowMessageBoxConfirmationAsync(
                         _localizationService.GetLocaleValue("MessageBoxInfoTitle"),
                         string.Format(
                         _localizationService.GetLocaleValue("PresetOverwriteConfirmDialogue"),
@@ -222,20 +222,18 @@ await _messageBoxService.ShowMessageBoxAsync(
                     Icon.Setting
                     );
 
-                if (!shouldOverwrite)
+                if (!overwroteDifferentPreset)
                 {
+                    // Revert back prename and reload presets
+                    preset.Name = currentPresetName;
                     ReloadPresets(currentPresetName);
                     return false;
                 }
             }
 
-            ServerPresetModel renamedPreset = ClonePreset(presetItem.Preset);
-            renamedPreset.Name = newPresetName;
-
-            await _jsonSetting.AddOrUpdatePresetAsync(renamedPreset);
-
-            await _jsonSetting.RemovePresetAsync(_mainVm.GetCurrentGameMode(), currentPresetName);
-            await SyncPresetReferenceAfterRenameAsync(currentPresetName, newPresetName, overwritingDifferentPreset);
+            await _jsonSetting.RemovePresetAsync(_mainVm.GetCurrentGameMode(), newPresetName);
+            await _jsonSetting.AddOrUpdatePresetAsync(preset);
+            await SyncPresetReferenceAfterRenameAsync(currentPresetName, newPresetName, overwroteDifferentPreset);
 
             ReloadPresets(newPresetName);
 
@@ -249,15 +247,15 @@ public async Task PersistSelectedPresetServerKeysAsync()
                 return;
             }
 
-            SelectedPresetItem.Preset.BlockedServerKeys = ServerItems
+            SelectedPresetItem.BlockedServerKeys = PresetServers
                 .Where(serverItem => serverItem.IsBlocked)
                 .Select(serverItem => serverItem.Key)
                 .Distinct(StringComparer.OrdinalIgnoreCase)
                 .OrderBy(serverKey => serverKey, StringComparer.OrdinalIgnoreCase)
                 .ToList();
 
-            await _jsonSetting.AddOrUpdatePresetAsync(ClonePreset(SelectedPresetItem.Preset));
-            await ClearAppliedPresetReferenceIfNeededAsync(SelectedPresetItem.Preset.Name);
+            await _jsonSetting.AddOrUpdatePresetAsync(ClonePreset(SelectedPresetItem));
+            await ClearAppliedPresetReferenceIfNeededAsync(SelectedPresetItem.Name);
         }
 
         public async Task ToggleSelectedPresetClusterModeAsync()
@@ -267,7 +265,7 @@ public async Task ToggleSelectedPresetClusterModeAsync()
                 return;
             }
 
-            bool hasBlockedEntries = (SelectedPresetItem.Preset.BlockedServerKeys?.Count ?? 0) > 0;
+            bool hasBlockedEntries = (SelectedPresetItem.BlockedServerKeys?.Count ?? 0) > 0;
 
             if (hasBlockedEntries)
             {
@@ -283,12 +281,12 @@ public async Task ToggleSelectedPresetClusterModeAsync()
                 }
             }
 
-            SelectedPresetItem.Preset.IsClustered = !SelectedPresetItem.Preset.IsClustered;
-            SelectedPresetItem.Preset.BlockedServerKeys = [];
-            EditorIsClustered = SelectedPresetItem.Preset.IsClustered;
+            SelectedPresetItem.IsClustered = !SelectedPresetItem.IsClustered;
+            SelectedPresetItem.BlockedServerKeys = [];
+            EditorIsClustered = SelectedPresetItem.IsClustered;
 
-            await _jsonSetting.AddOrUpdatePresetAsync(ClonePreset(SelectedPresetItem.Preset));
-            await ClearAppliedPresetReferenceIfNeededAsync(SelectedPresetItem.Preset.Name);
+            await _jsonSetting.AddOrUpdatePresetAsync(ClonePreset(SelectedPresetItem));
+            await ClearAppliedPresetReferenceIfNeededAsync(SelectedPresetItem.Name);
 
             LoadServerItemsForSelectedPreset();
         }
@@ -299,7 +297,7 @@ public async Task ToggleSelectedPresetClusterModeAsync()
         public void SortPresets(ListSortDirection direction)
         {
             string? selectedPresetName = SelectedPresetItem?.Name;
-            List<PresetItemModel> sortedPresets = (direction == ListSortDirection.Ascending
+            List<PresetModel> sortedPresets = (direction == ListSortDirection.Ascending
                 ? Presets.OrderBy(preset => preset.Name, NaturalStringComparer.OrdinalIgnoreCase)
                 : Presets.OrderByDescending(preset => preset.Name, NaturalStringComparer.OrdinalIgnoreCase))
                 .ToList();
@@ -316,44 +314,42 @@ public void SortPresets(ListSortDirection direction)
 
         public void SortServerItems(string sortKey, ListSortDirection direction)
         {
-            List<PresetServerItemModel> sortedItems = sortKey switch
+            List<PresetServerModel> sortedItems = sortKey switch
             {
                 "Blocked" => (direction == ListSortDirection.Ascending
-                    ? ServerItems.OrderBy(serverItem => serverItem.IsBlocked)
-                    : ServerItems.OrderByDescending(serverItem => serverItem.IsBlocked)).ToList(),
+                    ? PresetServers.OrderBy(serverItem => serverItem.IsBlocked)
+                    : PresetServers.OrderByDescending(serverItem => serverItem.IsBlocked)).ToList(),
                 "Flag" => (direction == ListSortDirection.Ascending
-                    ? ServerItems.OrderBy(serverItem => serverItem.FlagSortKey, StringComparer.OrdinalIgnoreCase)
+                    ? PresetServers.OrderBy(serverItem => serverItem.FlagSortKey, StringComparer.OrdinalIgnoreCase)
                         .ThenBy(serverItem => serverItem.Description, StringComparer.OrdinalIgnoreCase)
-                    : ServerItems.OrderByDescending(serverItem => serverItem.FlagSortKey, StringComparer.OrdinalIgnoreCase)
+                    : PresetServers.OrderByDescending(serverItem => serverItem.FlagSortKey, StringComparer.OrdinalIgnoreCase)
                         .ThenBy(serverItem => serverItem.Description, StringComparer.OrdinalIgnoreCase)).ToList(),
                 "ServerId" => (direction == ListSortDirection.Ascending
-                    ? ServerItems.OrderBy(serverItem => serverItem.Name, StringComparer.OrdinalIgnoreCase)
-                    : ServerItems.OrderByDescending(serverItem => serverItem.Name, StringComparer.OrdinalIgnoreCase)).ToList(),
+                    ? PresetServers.OrderBy(serverItem => serverItem.Name, StringComparer.OrdinalIgnoreCase)
+                    : PresetServers.OrderByDescending(serverItem => serverItem.Name, StringComparer.OrdinalIgnoreCase)).ToList(),
                 _ => (direction == ListSortDirection.Ascending
-                    ? ServerItems.OrderBy(serverItem => serverItem.Description, StringComparer.OrdinalIgnoreCase)
-                    : ServerItems.OrderByDescending(serverItem => serverItem.Description, StringComparer.OrdinalIgnoreCase)).ToList(),
+                    ? PresetServers.OrderBy(serverItem => serverItem.Description, StringComparer.OrdinalIgnoreCase)
+                    : PresetServers.OrderByDescending(serverItem => serverItem.Description, StringComparer.OrdinalIgnoreCase)).ToList(),
             };
 
-            ServerItems.Clear();
-            ServerItems.AddRange(sortedItems);
+            PresetServers.Clear();
+            PresetServers.AddRange(sortedItems);
         }
 
-        private void ReloadPresets(string? preferredPresetName = null)
+        private void ReloadPresets(string? selectedPresetName = null)
         {
-            string? presetNameToSelect = preferredPresetName ?? SelectedPresetItem?.Name;
-            List<ServerPresetModel> currentPresets = GetCurrentGamePresets();
+            string? presetNameToSelect = selectedPresetName ?? SelectedPresetItem?.Name;
+            List<PresetModel> currentPresets = GetCurrentGamePresets();
 
             if (currentPresets.Count == 0)
             {
                 Presets = [];
                 SelectedPresetItem = null;
-                ServerItems.Clear();
+                PresetServers.Clear();
                 return;
             }
 
-            Presets = new ObservableCollectionExtended<PresetItemModel>(
-                currentPresets.Select(preset => new PresetItemModel(ClonePreset(preset))).ToList()
-                );
+            Presets = new ObservableCollectionExtended<PresetModel>(currentPresets);
 
             SelectedPresetItem = !string.IsNullOrWhiteSpace(presetNameToSelect)
                 ? Presets.FirstOrDefault(preset =>
@@ -365,25 +361,25 @@ private void ReloadPresets(string? preferredPresetName = null)
 
         private void LoadServerItemsForSelectedPreset()
         {
-            ServerItems.Clear();
+            PresetServers.Clear();
 
             if (SelectedPresetItem == null)
             {
                 return;
             }
 
-            HashSet<string> blockedServerKeys = (SelectedPresetItem.Preset.BlockedServerKeys ?? [])
+            HashSet<string> blockedServerKeys = (SelectedPresetItem.BlockedServerKeys ?? [])
                 .ToHashSet(StringComparer.OrdinalIgnoreCase);
 
-            foreach (ServerModel serverModel in _mainVm.GetCurrentGameServerModels(SelectedPresetItem.Preset.IsClustered))
+            foreach (ServerModel serverModel in _mainVm.GetCurrentGameServerModels(SelectedPresetItem.IsClustered))
             {
-                string serverKey = _mainVm.GetServerKey(serverModel, SelectedPresetItem.Preset.IsClustered);
+                string serverKey = _mainVm.GetServerKey(serverModel, SelectedPresetItem.IsClustered);
 
-                ServerItems.Add(new PresetServerItemModel(serverModel, serverKey, blockedServerKeys.Contains(serverKey)));
+                PresetServers.Add(new PresetServerModel(serverModel, serverKey, blockedServerKeys.Contains(serverKey)));
             }
         }
 
-        private List<ServerPresetModel> GetCurrentGamePresets()
+        private List<PresetModel> GetCurrentGamePresets()
         {
             return _jsonSetting.GetPresetsByGameMode(_mainVm.GetCurrentGameMode());
         }
@@ -419,28 +415,16 @@ bool overwroteDifferentPreset
         {
             if (overwroteDifferentPreset)
             {
-                bool targetWasAppliedOrRemembered =
-                    (_mainVm.SelectedPreset?.Name ?? string.Empty).Equals(renamedPresetName, StringComparison.OrdinalIgnoreCase) ||
-                    (_jsonSetting.GetLastSelectedPresetNameByGameMode() ?? string.Empty).Equals(renamedPresetName, StringComparison.OrdinalIgnoreCase);
-
-                if (targetWasAppliedOrRemembered)
-                {
-                    await ClearAppliedPresetReferenceIfNeededAsync(renamedPresetName);
-                }
-
-                if ((_mainVm.SelectedPreset?.Name ?? string.Empty).Equals(originalPresetName, StringComparison.OrdinalIgnoreCase) ||
-                    (_jsonSetting.GetLastSelectedPresetNameByGameMode() ?? string.Empty).Equals(originalPresetName, StringComparison.OrdinalIgnoreCase))
-                {
-                    await ClearAppliedPresetReferenceIfNeededAsync(originalPresetName);
-                }
+                await ClearAppliedPresetReferenceIfNeededAsync(renamedPresetName);
 
                 return;
             }
 
-            bool renamedAppliedPreset = (_mainVm.SelectedPreset?.Name ?? string.Empty)
-                .Equals(originalPresetName, StringComparison.OrdinalIgnoreCase);
             bool renamedLastSelected = (_jsonSetting.GetLastSelectedPresetNameByGameMode() ?? string.Empty)
                 .Equals(originalPresetName, StringComparison.OrdinalIgnoreCase);
+            bool renamedAppliedPreset = (_mainVm.SelectedPreset?.Name ?? string.Empty)
+                .Equals(originalPresetName, StringComparison.OrdinalIgnoreCase);
+            
 
             if (renamedLastSelected)
             {
@@ -477,9 +461,9 @@ private string GetNextPresetName()
             }
         }
 
-        private static ServerPresetModel ClonePreset(ServerPresetModel preset)
+        private static PresetModel ClonePreset(PresetModel preset)
         {
-            return new ServerPresetModel
+            return new PresetModel
             {
                 Name = preset.Name,
                 GameMode = preset.GameMode,
diff --git a/ServerPickerX/Views/MainWindow.axaml.cs b/ServerPickerX/Views/MainWindow.axaml.cs
index 7d1229f..00eae04 100644
--- a/ServerPickerX/Views/MainWindow.axaml.cs
+++ b/ServerPickerX/Views/MainWindow.axaml.cs
@@ -36,7 +36,7 @@ public static bool IsDebugBuild
 
         private ListSortDirection pingSortDirection = ListSortDirection.Ascending;
         private bool _suppressPresetSelectionChanged;
-        private ServerPresetModel? _previousPreset;
+        private PresetModel? _previousPreset;
 
         private readonly ILoggerService _loggerService;
         private readonly JsonSetting _jsonSetting;
@@ -88,8 +88,8 @@ private async void GameModeComboBox_SelectionChanged(object? sender, SelectionCh
 
         private async void PresetComboBox_SelectionChanged(object? sender, SelectionChangedEventArgs e)
         {
-            ServerPresetModel? previousPreset = e.RemovedItems.Count > 0
-                ? e.RemovedItems[0] as ServerPresetModel
+            PresetModel? previousPreset = e.RemovedItems.Count > 0
+                ? e.RemovedItems[0] as PresetModel
                 : _previousPreset;
 
             if (_suppressPresetSelectionChanged)
@@ -97,7 +97,7 @@ private async void PresetComboBox_SelectionChanged(object? sender, SelectionChan
                 return;
             }
 
-            if (PresetComboBox?.SelectedItem is not ServerPresetModel selectedPreset)
+            if (PresetComboBox?.SelectedItem is not PresetModel selectedPreset)
             {
                 _previousPreset = null;
                 return;
@@ -325,8 +325,8 @@ private async Task HandleGameModeChangeAsync()
         }
 
         private async Task HandlePresetChangeAsync(
-            ServerPresetModel selectedPreset,
-            ServerPresetModel? previousPreset
+            PresetModel selectedPreset,
+            PresetModel? previousPreset
             )
         {
             if (DataContext is not MainWindowViewModel vm)
@@ -351,7 +351,7 @@ private async Task HandlePresetChangeAsync(
             RefreshClusterButtonContent();
         }
 
-        private void SyncPresetSelection(ServerPresetModel? preset)
+        private void SyncPresetSelection(PresetModel? preset)
         {
             _suppressPresetSelectionChanged = true;
             PresetComboBox.SelectedItem = preset;
@@ -359,7 +359,7 @@ private void SyncPresetSelection(ServerPresetModel? preset)
             _previousPreset = preset;
         }
 
-        private static bool AreSamePresetSelection(ServerPresetModel? left, ServerPresetModel? right)
+        private static bool AreSamePresetSelection(PresetModel? left, PresetModel? right)
         {
             if (left == null || right == null)
             {
diff --git a/ServerPickerX/Views/UserWindows/PresetManagerWindow.axaml b/ServerPickerX/Views/UserWindows/PresetManagerWindow.axaml
index 047ba85..da7267c 100644
--- a/ServerPickerX/Views/UserWindows/PresetManagerWindow.axaml
+++ b/ServerPickerX/Views/UserWindows/PresetManagerWindow.axaml
@@ -218,7 +218,7 @@
                             x:Name="ServerItemsGrid"
                             Classes="preset-grid"
                             AutoGenerateColumns="False"
-                            ItemsSource="{Binding ServerItems}"
+                            ItemsSource="{Binding PresetServers}"
                             IsReadOnly="False"
                             IsEnabled="{Binding CanEditPreset}"
                             CanUserSortColumns="True"
diff --git a/ServerPickerX/Views/UserWindows/PresetManagerWindow.axaml.cs b/ServerPickerX/Views/UserWindows/PresetManagerWindow.axaml.cs
index ead1d6b..50eb396 100644
--- a/ServerPickerX/Views/UserWindows/PresetManagerWindow.axaml.cs
+++ b/ServerPickerX/Views/UserWindows/PresetManagerWindow.axaml.cs
@@ -63,7 +63,7 @@ private async void DeleteBtn_Click(object? sender, RoutedEventArgs e)
                 return;
             }
 
-            bool deleted = await vm.DeletePresetsAsync(GetSelectedPresetItems().Select(item => item.Preset).ToList());
+            bool deleted = await vm.DeletePresetsAsync(GetSelectedPresetItems());
 
             if (deleted)
             {
@@ -110,13 +110,7 @@ private void TitleBar_PointerPressed(object? sender, PointerPressedEventArgs e)
 
         private void PresetListGrid_BeginningEdit(object? sender, DataGridBeginningEditEventArgs e)
         {
-            if (!_allowPresetNameEdit)
-            {
-                e.Cancel = true;
-                return;
-            }
-
-            if (e.Row.DataContext is not PresetItemModel presetItem)
+            if (e.Row.DataContext is not PresetModel presetItem)
             {
                 return;
             }
@@ -127,11 +121,10 @@ private void PresetListGrid_BeginningEdit(object? sender, DataGridBeginningEditE
 
         private async void PresetListGrid_RowEditEnded(object? sender, DataGridRowEditEndedEventArgs e)
         {
-            _allowPresetNameEdit = false;
             _isEditingPresetName = false;
             PresetListGrid.IsReadOnly = true;
 
-            if (e.EditAction != DataGridEditAction.Commit || e.Row.DataContext is not PresetItemModel presetItem)
+            if (e.EditAction != DataGridEditAction.Commit || e.Row.DataContext is not PresetModel presetItem)
             {
                 return;
             }
@@ -139,24 +132,7 @@ private async void PresetListGrid_RowEditEnded(object? sender, DataGridRowEditEn
             await CommitPresetNameAsync(presetItem, _editingPresetOriginalName ?? presetItem.Name);
         }
 
-        private void PresetListGrid_DoubleTapped(object? sender, RoutedEventArgs e)
-        {
-            if (_isEditingPresetName || DataContext is not PresetManagerWindowViewModel vm || vm.SelectedPresetItem == null)
-            {
-                return;
-            }
-
-            if (e.Source is not Control sourceControl ||
-                sourceControl.FindAncestorOfType<DataGridColumnHeader>() != null ||
-                sourceControl.FindAncestorOfType<DataGridCell>() == null)
-            {
-                return;
-            }
-
-            BeginEditingSelectedPreset();
-        }
-
-        private async Task CommitPresetNameAsync(PresetItemModel presetItem, string originalPresetName)
+        private async Task CommitPresetNameAsync(PresetModel presetItem, string originalPresetName)
         {
             if (_committingPresetName || DataContext is not PresetManagerWindowViewModel vm)
             {
@@ -178,6 +154,23 @@ private async Task CommitPresetNameAsync(PresetItemModel presetItem, string orig
             }
         }
 
+        private void PresetListGrid_DoubleTapped(object? sender, TappedEventArgs e)
+        {
+            if (_isEditingPresetName || DataContext is not PresetManagerWindowViewModel vm || vm.SelectedPresetItem == null)
+            {
+                return;
+            }
+
+            if (e.Source is not Control sourceControl ||
+                sourceControl.FindAncestorOfType<DataGridColumnHeader>() != null ||
+                sourceControl.FindAncestorOfType<DataGridCell>() == null)
+            {
+                return;
+            }
+
+            BeginEditingSelectedPreset();
+        }
+
         private async void PresetListGrid_KeyDown(object? sender, KeyEventArgs e)
         {
             if (DataContext is not PresetManagerWindowViewModel vm)
@@ -187,7 +180,7 @@ private async void PresetListGrid_KeyDown(object? sender, KeyEventArgs e)
 
             if (e.Key == Key.Delete)
             {
-                List<PresetItemModel> selectedPresetItems = GetSelectedPresetItems();
+                List<PresetModel> selectedPresetItems = GetSelectedPresetItems();
 
                 if (selectedPresetItems.Count == 0)
                 {
@@ -195,7 +188,7 @@ private async void PresetListGrid_KeyDown(object? sender, KeyEventArgs e)
                 }
 
                 e.Handled = true;
-                bool deleted = await vm.DeletePresetsAsync(selectedPresetItems.Select(item => item.Preset).ToList());
+                bool deleted = await vm.DeletePresetsAsync(selectedPresetItems);
 
                 if (deleted)
                 {
@@ -251,8 +244,8 @@ private async void ServerItemsGrid_KeyDown(object? sender, KeyEventArgs e)
                 return;
             }
 
-            List<PresetServerItemModel> selectedItems = ServerItemsGrid.SelectedItems
-                .OfType<PresetServerItemModel>()
+            List<PresetServerModel> selectedItems = ServerItemsGrid.SelectedItems
+                .OfType<PresetServerModel>()
                 .ToList();
 
             if (selectedItems.Count == 0)
@@ -264,7 +257,7 @@ private async void ServerItemsGrid_KeyDown(object? sender, KeyEventArgs e)
 
             bool shouldBlock = selectedItems.Any(serverItem => !serverItem.IsBlocked);
 
-            foreach (PresetServerItemModel serverItem in selectedItems)
+            foreach (PresetServerModel serverItem in selectedItems)
             {
                 serverItem.IsBlocked = shouldBlock;
             }
@@ -353,18 +346,17 @@ private void BeginEditingSelectedPreset()
                 }
 
                 PresetListGrid.Focus();
-                _allowPresetNameEdit = true;
                 PresetListGrid.IsReadOnly = false;
                 PresetListGrid.CurrentColumn = PresetListGrid.Columns.FirstOrDefault();
                 PresetListGrid.BeginEdit();
             });
         }
 
-        private List<PresetItemModel> GetSelectedPresetItems()
+        private List<PresetModel> GetSelectedPresetItems()
         {
             IEnumerable selectedItems = PresetListGrid.SelectedItems ?? System.Array.Empty<object>();
-            List<PresetItemModel> selectedPresetItems = selectedItems
-                .OfType<PresetItemModel>()
+            List<PresetModel> selectedPresetItems = selectedItems
+                .OfType<PresetModel>()
                 .Distinct()
                 .ToList();
 
@@ -375,6 +367,5 @@ private List<PresetItemModel> GetSelectedPresetItems()
 
             return selectedPresetItems;
         }
-
     }
 }

From 5295ac0ac6411f98105342178e3c50fb028a372f Mon Sep 17 00:00:00 2001
From: JanitorialMess <65749353+JanitorialMess@users.noreply.github.com>
Date: Mon, 6 Apr 2026 00:34:58 -0400
Subject: [PATCH 08/10] refactor: remove unused preset rename edit flag

---
 ServerPickerX/Views/UserWindows/PresetManagerWindow.axaml.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ServerPickerX/Views/UserWindows/PresetManagerWindow.axaml.cs b/ServerPickerX/Views/UserWindows/PresetManagerWindow.axaml.cs
index 50eb396..be35fa7 100644
--- a/ServerPickerX/Views/UserWindows/PresetManagerWindow.axaml.cs
+++ b/ServerPickerX/Views/UserWindows/PresetManagerWindow.axaml.cs
@@ -19,7 +19,6 @@ namespace ServerPickerX.Views
 {
     public partial class PresetManagerWindow : Window
     {
-        private bool _allowPresetNameEdit;
         private bool _committingPresetName;
         private bool _isEditingPresetName;
         private string? _editingPresetOriginalName;

From 40796650039b929ddb73554f515506df620605a8 Mon Sep 17 00:00:00 2001
From: FN-FAL113 <orbetajeff@gmail.com>
Date: Mon, 6 Apr 2026 14:22:35 +0800
Subject: [PATCH 09/10] refactor: simplifications and chores (part 2)

- Remove in-memory blocked-server tracking and simplify cluster/preset handling.
- Deleted the _blockedServerKeys field and TrackBlockedServerKeys/ReplaceBlockedServerKeysFromPreset methods; SetClusterStateAsync signature simplified (removed shouldUpdatePresetSelection) and callers updated.
- Preset selection is now marked dirty by clearing saved last-selected preset (MarkPresetSelectionDirtyAsync) and resetting SelectedPreset.
- Use JsonSetting methods directly for preset lookups (GetPresetsByGameMode/GetPresetByGameMode).
- Also normalize PerformOperationAsync calls to pass ServerModels directly.
---
 .../ViewModels/MainWindowViewModel.cs         | 82 ++++---------------
 ServerPickerX/Views/MainWindow.axaml.cs       |  1 +
 2 files changed, 16 insertions(+), 67 deletions(-)

diff --git a/ServerPickerX/ViewModels/MainWindowViewModel.cs b/ServerPickerX/ViewModels/MainWindowViewModel.cs
index a243a12..d5f63d6 100644
--- a/ServerPickerX/ViewModels/MainWindowViewModel.cs
+++ b/ServerPickerX/ViewModels/MainWindowViewModel.cs
@@ -77,7 +77,6 @@ public partial class MainWindowViewModel : ViewModelBase
         private readonly IServerDataService _serverDataService;
         private readonly ISystemFirewallService _systemFirewallService;
         private readonly JsonSetting _jsonSetting;
-        private readonly HashSet<string> _blockedServerKeys = new(StringComparer.OrdinalIgnoreCase);
 
         // Parameterless constructor, allows design previewer to instantiate this class since it doesn't support DI
         public MainWindowViewModel()
@@ -114,7 +113,7 @@ public async Task LoadServersAsync()
 
             if (!ServersLoaded) return;
 
-            await SetClusterStateAsync(_jsonSetting.is_clustered, false, false);
+            await SetClusterStateAsync(_jsonSetting.is_clustered, false);
 
             ServerModelsInitialized = true;
         }
@@ -122,10 +121,10 @@ public async Task LoadServersAsync()
         [RelayCommand]
         public async Task ClusterUnclusterServersAsync()
         {
-            await SetClusterStateAsync(!_jsonSetting.is_clustered, true, true);
+            await SetClusterStateAsync(!_jsonSetting.is_clustered, true);
         }
 
-        public async Task SetClusterStateAsync(bool isClustered, bool shouldUnblockCurrentServers, bool shouldUpdatePresetSelection)
+        public async Task SetClusterStateAsync(bool isClustered, bool shouldUnblockCurrentServers)
         {
             if (!ServersLoaded)
             {
@@ -138,11 +137,7 @@ public async Task SetClusterStateAsync(bool isClustered, bool shouldUnblockCurre
             // so clustered/unclustered transitions do not carry stale rules forward
             if (shouldUnblockCurrentServers && ServerModelsInitialized && ServerModels.Count > 0)
             {
-                bool unblocked = await PerformOperationAsync(
-                    false,
-                    new ObservableCollection<ServerModel>(ServerModels),
-                    false
-                    );
+                bool unblocked = await PerformOperationAsync(false, ServerModels, false);
 
                 if (!unblocked)
                 {
@@ -155,6 +150,8 @@ public async Task SetClusterStateAsync(bool isClustered, bool shouldUnblockCurre
                 _jsonSetting.is_clustered = isClustered;
 
                 await _jsonSetting.SaveSettingsAsync();
+
+                await MarkPresetSelectionDirtyAsync();
             }
 
             ServerData serverData = _serverDataService.GetServerData();
@@ -166,19 +163,6 @@ public async Task SetClusterStateAsync(bool isClustered, bool shouldUnblockCurre
             ServerModels.AddRange(serverModels);
 
             PingServers(serverModels);
-
-            if (shouldUpdatePresetSelection)
-            {
-                if (clusterStateChanged)
-                {
-                    await MarkPresetSelectionDirtyAsync();
-                }
-            }
-        }
-
-        public List<PresetModel> GetCurrentGamePresets()
-        {
-            return _jsonSetting.GetPresetsByGameMode(_jsonSetting.game_mode);
         }
 
         public PresetModel? GetCurrentGamePreset(string presetName)
@@ -189,7 +173,7 @@ public List<PresetModel> GetCurrentGamePresets()
         public void LoadPresetPickerItems()
         {
             string? selectedPresetName = SelectedPreset?.Name;
-            List<PresetModel> presetItems = GetCurrentGamePresets();
+            List<PresetModel> presetItems = _jsonSetting.GetPresetsByGameMode(_jsonSetting.game_mode);
 
             PresetItems.Clear();
 
@@ -267,10 +251,10 @@ public async Task<bool> ApplyPresetAsync(PresetModel preset)
                 return false;
             }
 
-            ReplaceBlockedServerKeysFromPreset(preset);
-            await _jsonSetting.SetLastSelectedPresetNameByGameModeAsync(preset.Name);
             SelectPresetByName(preset.Name);
 
+            await _jsonSetting.SetLastSelectedPresetNameByGameModeAsync(preset.Name);
+
             return true;
         }
 
@@ -410,8 +394,6 @@ await _messageBoxService.ShowMessageBoxAsync(
                     await _loggerService.LogInfoAsync("Servers unblocked successfully");
                 }
 
-                TrackBlockedServerKeys(serverModels, shouldBlock);
-
                 if (shouldUpdatePresetSelection)
                 {
                     await MarkPresetSelectionDirtyAsync();
@@ -513,23 +495,6 @@ public async Task<bool> PrunePresetEntriesAsync(string gameMode, ServerData serv
             return presetsPruned;
         }
 
-        private void TrackBlockedServerKeys(IEnumerable<ServerModel> serverModels, bool shouldBlock)
-        {
-            foreach (ServerModel serverModel in serverModels)
-            {
-                string serverKey = GetServerKey(serverModel);
-
-                if (shouldBlock)
-                {
-                    _blockedServerKeys.Add(serverKey);
-                }
-                else
-                {
-                    _blockedServerKeys.Remove(serverKey);
-                }
-            }
-        }
-
         public string GetServerKey(ServerModel serverModel, bool isClustered)
         {
             return isClustered
@@ -560,7 +525,7 @@ public async Task RestoreLastSelectedPresetAsync()
                 return;
             }
 
-            PresetModel? lastSelectedPreset = GetCurrentGamePreset(lastSelectedPresetName);
+            PresetModel? lastSelectedPreset = _jsonSetting.GetPresetByGameMode(_jsonSetting.game_mode, lastSelectedPresetName);
 
             if (lastSelectedPreset == null)
             {
@@ -581,11 +546,7 @@ private async Task<bool> ApplyPresetWithResetAsync(PresetModel serverPreset)
         {
             if (ServerModels.Count > 0)
             {
-                bool unblocked = await PerformOperationAsync(
-                    false,
-                    new ObservableCollection<ServerModel>(ServerModels),
-                    false
-                    );
+                bool unblocked = await PerformOperationAsync(false, ServerModels, false);
 
                 if (!unblocked)
                 {
@@ -593,7 +554,7 @@ private async Task<bool> ApplyPresetWithResetAsync(PresetModel serverPreset)
                 }
             }
 
-            await SetClusterStateAsync(serverPreset.IsClustered, false, false);
+            await SetClusterStateAsync(serverPreset.IsClustered, false);
 
             ObservableCollection<ServerModel> matchingServerModels = GetMatchingServerModels(serverPreset);
 
@@ -614,29 +575,16 @@ private ObservableCollection<ServerModel> GetMatchingServerModels(PresetModel se
                 );
         }
 
-        private void ReplaceBlockedServerKeysFromPreset(PresetModel serverPreset)
+        private async Task MarkPresetSelectionDirtyAsync()
         {
-            ObservableCollection<ServerModel> matchingServerModels = GetMatchingServerModels(serverPreset);
-
-            _blockedServerKeys.Clear();
+            await _jsonSetting.ClearLastSelectedPresetNameByGameModeAsync();
 
-            foreach (string blockedServerKey in matchingServerModels.Select(GetServerKey))
-            {
-                _blockedServerKeys.Add(blockedServerKey);
-            }
+            ClearSelectedPreset();
         }
 
         private void ClearSelectedPreset()
         {
             SelectedPreset = null;
         }
-
-        private async Task MarkPresetSelectionDirtyAsync()
-        {
-            await _jsonSetting.ClearLastSelectedPresetNameByGameModeAsync();
-
-            ClearSelectedPreset();
-        }
-
     }
 }
diff --git a/ServerPickerX/Views/MainWindow.axaml.cs b/ServerPickerX/Views/MainWindow.axaml.cs
index 00eae04..e45d5ef 100644
--- a/ServerPickerX/Views/MainWindow.axaml.cs
+++ b/ServerPickerX/Views/MainWindow.axaml.cs
@@ -165,6 +165,7 @@ private async void PresetsBtn_Click(object? sender, Avalonia.Interactivity.Route
 
             await presetManagementWindow.ShowDialog(this);
 
+            // Reload presets after closing preset manager window
             vm.LoadPresetPickerItems();
             SyncPresetSelection(vm.SelectedPreset);
             RefreshClusterButtonContent();

From b07e96e4b5117b3c17466919d6b8dbc05b2403db Mon Sep 17 00:00:00 2001
From: FN-FAL113 <orbetajeff@gmail.com>
Date: Thu, 9 Apr 2026 11:22:04 +0800
Subject: [PATCH 10/10] chore: bump version and update readme screenshot

---
 README.md                          | 2 +-
 ServerPickerX/ServerPickerX.csproj | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index ad393d6..cbf4ced 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ Lightweight server picker for CS2 and Deadlock with cross-platform support for *
 ### [Releases](https://github.com/FN-FAL113/server-picker-x/releases)
 
 ## 📷 Screenshot
-![ServerPickerX](https://github.com/user-attachments/assets/195b9553-4ca3-48b4-9d21-1aca8990d623)
+![ServerPickerX](https://github.com/user-attachments/assets/6feac783-5d18-4900-bf6a-0a07b9d665a9)
 <details>
   <summary>Windows Short Demo</summary>
   
diff --git a/ServerPickerX/ServerPickerX.csproj b/ServerPickerX/ServerPickerX.csproj
index 64d084c..51d84f3 100644
--- a/ServerPickerX/ServerPickerX.csproj
+++ b/ServerPickerX/ServerPickerX.csproj
@@ -22,8 +22,8 @@
         <PackageProjectUrl>https://github.com/FN-FAL113/server-picker-x</PackageProjectUrl>
         <RepositoryUrl>https://github.com/FN-FAL113/server-picker-x</RepositoryUrl>
         <ApplicationIcon>Assets\favicon.ico</ApplicationIcon>
-        <AssemblyVersion>1.0.4.0</AssemblyVersion>
-        <FileVersion>1.0.4.0</FileVersion>
+        <AssemblyVersion>1.0.5.0</AssemblyVersion>
+        <FileVersion>1.0.5.0</FileVersion>
     </PropertyGroup>
 
     <ItemGroup>
@@ -51,5 +51,6 @@
         <PackageReference Include="MessageBox.Avalonia" Version="3.3.1.1" />
         <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.3" />
         <PackageReference Include="Projektanker.Icons.Avalonia.FontAwesome" Version="9.6.2" />
+        <PackageReference Include="Tmds.DBus.Protocol" Version="0.21.3" />
     </ItemGroup>
 </Project>