diff --git a/src/ARKServerManager/Globalization/de-DE/de-DE.xaml b/src/ARKServerManager/Globalization/de-DE/de-DE.xaml
index b7dba195..cd83aaec 100644
--- a/src/ARKServerManager/Globalization/de-DE/de-DE.xaml
+++ b/src/ARKServerManager/Globalization/de-DE/de-DE.xaml
@@ -13,7 +13,34 @@
     <sys:String x:Key="Generic_ErrorLabel">Fehler</sys:String>
     <!--#endregion-->
 
-    <!--#region Mods -->
+    <!--#region Game Map Names -->
+    <sys:String x:Key="Map_TheIsland">The Island</sys:String>
+    <sys:String x:Key="Map_TheCenter">The Center</sys:String>
+    <sys:String x:Key="Map_ScorchedEarth_P">Scorched Earth</sys:String>
+    <sys:String x:Key="Map_Ragnarok">Ragnarok</sys:String>
+    <sys:String x:Key="Map_Aberration_P">Aberration</sys:String>
+    <sys:String x:Key="Map_Extinction">Extinction</sys:String>
+    <sys:String x:Key="Map_Valguero_P">Valguero</sys:String>
+    <sys:String x:Key="Map_Genesis">Genesis</sys:String>
+    <!--#endregion-->
+
+    <!--#region Total Conversion Names -->
+    <sys:String x:Key="TotalConv_111111111">Primitive Plus</sys:String>
+    <!--#endregion-->
+
+    <!--#region Branch Names -->
+    <sys:String x:Key="Branch_live">Live</sys:String>
+    <!--#endregion-->
+
+    <!--#region Event Names -->
+    <sys:String x:Key="Event_vday">Valentines Day</sys:String>
+    <sys:String x:Key="Event_Easter">Easter</sys:String>
+    <sys:String x:Key="Event_FearEvolved">Fear Evolved (Halloween)</sys:String>
+    <sys:String x:Key="Event_TurkeyTrial">Turkey Trial</sys:String>
+    <sys:String x:Key="Event_WinterWonderland">Winter Wonderland</sys:String>
+    <!--#endregion-->
+
+    <!--#region Mod Names -->
     <sys:String x:Key="Mod_All">Alle</sys:String>
     <sys:String x:Key="Mod_Unknown">Unbekannt</sys:String>
     <sys:String x:Key="Mod_ArkPrime">ARK Prime</sys:String>
@@ -2380,33 +2407,6 @@
     <sys:String x:Key="Settings_Title">Einstellungen</sys:String>
     <!--#endregion-->
 
-    <!--#region Game Map Names -->
-    <sys:String x:Key="TheIsland">The Island</sys:String>
-    <sys:String x:Key="TheCenter">The Center</sys:String>
-    <sys:String x:Key="ScorchedEarth_P">Scorched Earth</sys:String>
-    <sys:String x:Key="Ragnarok">Ragnarok</sys:String>
-    <sys:String x:Key="Aberration_P">Aberration</sys:String>
-    <sys:String x:Key="Extinction">Extinction</sys:String>
-    <sys:String x:Key="Valguero_P">Valguero</sys:String>
-    <sys:String x:Key="Genesis">Genesis</sys:String>
-    <!--#endregion-->
-
-    <!--#region Total Conversion Names -->
-    <sys:String x:Key="111111111">Primitive Plus</sys:String>
-    <!--#endregion-->
-
-    <!--#region Branch Names -->
-    <sys:String x:Key="live">Live</sys:String>
-    <!--#endregion-->
-
-    <!--#region Event Names -->
-    <sys:String x:Key="vday">Valentines Day</sys:String>
-    <sys:String x:Key="Easter">Easter</sys:String>
-    <sys:String x:Key="FearEvolved">Fear Evolved (Halloween)</sys:String>
-    <sys:String x:Key="TurkeyTrial">Turkey Trial</sys:String>
-    <sys:String x:Key="WinterWonderland">Winter Wonderland</sys:String>
-    <!--#endregion-->
-
     <!--#region Dino/Creature -->
 
     <!--#region Dino/Creature Class Names -->
diff --git a/src/ARKServerManager/Globalization/en-US/en-US.xaml b/src/ARKServerManager/Globalization/en-US/en-US.xaml
index e61444ff..c8c83020 100644
--- a/src/ARKServerManager/Globalization/en-US/en-US.xaml
+++ b/src/ARKServerManager/Globalization/en-US/en-US.xaml
@@ -13,7 +13,37 @@
     <sys:String x:Key="Generic_ErrorLabel">Error</sys:String>
     <!--#endregion-->
 
-    <!--#region Mods -->
+    <!--#region Game Map Names -->
+    <sys:String x:Key="Map_TheIsland">The Island</sys:String>
+    <sys:String x:Key="Map_TheCenter">The Center</sys:String>
+    <sys:String x:Key="Map_ScorchedEarth_P">Scorched Earth</sys:String>
+    <sys:String x:Key="Map_Ragnarok">Ragnarok</sys:String>
+    <sys:String x:Key="Map_Aberration_P">Aberration</sys:String>
+    <sys:String x:Key="Map_Extinction">Extinction</sys:String>
+    <sys:String x:Key="Map_Valguero_P">Valguero</sys:String>
+    <sys:String x:Key="Map_Genesis">Genesis: Part 1</sys:String>
+    <sys:String x:Key="Map_CrystalIsles">Crystal Isles</sys:String>
+    <sys:String x:Key="Map_Gen2">Genesis: Part 2</sys:String>
+    <!--#endregion-->
+
+    <!--#region Total Conversion Names -->
+    <sys:String x:Key="TotalConv_111111111">Primitive Plus</sys:String>
+    <!--#endregion-->
+
+    <!--#region Branch Names -->
+    <sys:String x:Key="Branch_live">Live</sys:String>
+    <!--#endregion-->
+
+    <!--#region Event Names -->
+    <sys:String x:Key="Event_none">None</sys:String>
+    <sys:String x:Key="Event_vday">Valentines Day</sys:String>
+    <sys:String x:Key="Event_Easter">Easter</sys:String>
+    <sys:String x:Key="Event_FearEvolved">Fear Evolved (Halloween)</sys:String>
+    <sys:String x:Key="Event_TurkeyTrial">Turkey Trial</sys:String>
+    <sys:String x:Key="Event_WinterWonderland">Winter Wonderland</sys:String>
+    <!--#endregion-->
+
+    <!--#region Mod Names -->
     <sys:String x:Key="Mod_All">All</sys:String>
     <sys:String x:Key="Mod_Unknown">Unknown</sys:String>
     <sys:String x:Key="Mod_ArkPrime">ARK Prime</sys:String>
@@ -2476,36 +2506,6 @@
     <sys:String x:Key="Settings_Title">Settings</sys:String>
     <!--#endregion-->
 
-    <!--#region Game Map Names -->
-    <sys:String x:Key="TheIsland">The Island</sys:String>
-    <sys:String x:Key="TheCenter">The Center</sys:String>
-    <sys:String x:Key="ScorchedEarth_P">Scorched Earth</sys:String>
-    <sys:String x:Key="Ragnarok">Ragnarok</sys:String>
-    <sys:String x:Key="Aberration_P">Aberration</sys:String>
-    <sys:String x:Key="Extinction">Extinction</sys:String>
-    <sys:String x:Key="Valguero_P">Valguero</sys:String>
-    <sys:String x:Key="Genesis">Genesis: Part 1</sys:String>
-    <sys:String x:Key="CrystalIsles">Crystal Isles</sys:String>
-    <sys:String x:Key="Gen2">Genesis: Part 2</sys:String>
-    <!--#endregion-->
-
-    <!--#region Total Conversion Names -->
-    <sys:String x:Key="111111111">Primitive Plus</sys:String>
-    <!--#endregion-->
-
-    <!--#region Branch Names -->
-    <sys:String x:Key="live">Live</sys:String>
-    <!--#endregion-->
-
-    <!--#region Event Names -->
-    <sys:String x:Key="none">None</sys:String>
-    <sys:String x:Key="vday">Valentines Day</sys:String>
-    <sys:String x:Key="Easter">Easter</sys:String>
-    <sys:String x:Key="FearEvolved">Fear Evolved (Halloween)</sys:String>
-    <sys:String x:Key="TurkeyTrial">Turkey Trial</sys:String>
-    <sys:String x:Key="WinterWonderland">Winter Wonderland</sys:String>
-    <!--#endregion-->
-
     <!--#region Dino/Creature -->
 
     <!--#region Dino/Creature Class Names -->
diff --git a/src/ARKServerManager/Globalization/es-ES/es-ES.xaml b/src/ARKServerManager/Globalization/es-ES/es-ES.xaml
index a55e4d64..55223869 100644
--- a/src/ARKServerManager/Globalization/es-ES/es-ES.xaml
+++ b/src/ARKServerManager/Globalization/es-ES/es-ES.xaml
@@ -13,7 +13,35 @@
     <sys:String x:Key="Generic_ErrorLabel">Error</sys:String>
     <!--#endregion-->
 
-    <!--#region Mods -->
+    <!--#region Game Map Names -->
+    <sys:String x:Key="Map_TheIsland">The Island</sys:String>
+    <sys:String x:Key="Map_TheCenter">The Center</sys:String>
+    <sys:String x:Key="Map_ScorchedEarth_P">Scorched Earth</sys:String>
+    <sys:String x:Key="Map_Ragnarok">Ragnarok</sys:String>
+    <sys:String x:Key="Map_Aberration_P">Aberración</sys:String>
+    <sys:String x:Key="Map_Extinction">Extinción</sys:String>
+    <sys:String x:Key="Map_Valguero_P">Valguero</sys:String>
+    <sys:String x:Key="Map_Genesis">Genesis</sys:String>
+    <!--#endregion-->
+
+    <!--#region Total Conversion Names -->
+    <sys:String x:Key="TotalConv_111111111">Primitive Plus</sys:String>
+    <!--#endregion-->
+
+    <!--#region Branch Names -->
+    <sys:String x:Key="Branch_live">Pública</sys:String>
+    <!--#endregion-->
+
+    <!--#region Event Names -->
+    <sys:String x:Key="Event_none">Ninguno</sys:String>
+    <sys:String x:Key="Event_vday">Love Evolved (San Valentín)</sys:String>
+    <sys:String x:Key="Event_Easter">Eggcellent Adventure (Pascua)</sys:String>
+    <sys:String x:Key="Event_FearEvolved">Fear Evolved (Halloween)</sys:String>
+    <sys:String x:Key="Event_TurkeyTrial">Turkey Trial (Acción de Gracias)</sys:String>
+    <sys:String x:Key="Event_WinterWonderland">Winter Wonderland (Navidad)</sys:String>
+    <!--#endregion-->
+
+    <!--#region Mod Names -->
     <sys:String x:Key="Mod_All">Todos</sys:String>
     <sys:String x:Key="Mod_Unknown">Desconocido</sys:String>
     <sys:String x:Key="Mod_ArkPrime">ARK Prime</sys:String>
@@ -2400,34 +2428,6 @@
     <sys:String x:Key="Settings_Title">Ajustes</sys:String>
     <!--#endregion-->
 
-    <!--#region Game Map Names -->
-    <sys:String x:Key="TheIsland">The Island</sys:String>
-    <sys:String x:Key="TheCenter">The Center</sys:String>
-    <sys:String x:Key="ScorchedEarth_P">Scorched Earth</sys:String>
-    <sys:String x:Key="Ragnarok">Ragnarok</sys:String>
-    <sys:String x:Key="Aberration_P">Aberración</sys:String>
-    <sys:String x:Key="Extinction">Extinción</sys:String>
-    <sys:String x:Key="Valguero_P">Valguero</sys:String>
-    <sys:String x:Key="Genesis">Genesis</sys:String>
-    <!--#endregion-->
-
-    <!--#region Total Conversion Names -->
-    <sys:String x:Key="111111111">Primitive Plus</sys:String>
-    <!--#endregion-->
-
-    <!--#region Branch Names -->
-    <sys:String x:Key="live">Pública</sys:String>
-    <!--#endregion-->
-
-    <!--#region Event Names -->
-    <sys:String x:Key="none">Ninguno</sys:String>
-    <sys:String x:Key="vday">Love Evolved (San Valentín)</sys:String>
-    <sys:String x:Key="Easter">Eggcellent Adventure (Pascua)</sys:String>
-    <sys:String x:Key="FearEvolved">Fear Evolved (Halloween)</sys:String>
-    <sys:String x:Key="TurkeyTrial">Turkey Trial (Acción de Gracias)</sys:String>
-    <sys:String x:Key="WinterWonderland">Winter Wonderland (Navidad)</sys:String>
-    <!--#endregion-->
-
     <!--#region Dino/Creature -->
 
     <!--#region Dino/Creature Class Names -->
diff --git a/src/ARKServerManager/Globalization/fr-FR/fr-FR.xaml b/src/ARKServerManager/Globalization/fr-FR/fr-FR.xaml
index e41141ba..72408ded 100644
--- a/src/ARKServerManager/Globalization/fr-FR/fr-FR.xaml
+++ b/src/ARKServerManager/Globalization/fr-FR/fr-FR.xaml
@@ -13,7 +13,37 @@
     <sys:String x:Key="Generic_ErrorLabel">Erreur</sys:String>
     <!--#endregion-->
 
-    <!--#region Mods -->
+    <!--#region Game Map Names -->
+    <sys:String x:Key="Map_TheIsland">The Island</sys:String>
+    <sys:String x:Key="Map_TheCenter">The Center</sys:String>
+    <sys:String x:Key="Map_ScorchedEarth_P">Scorched Earth</sys:String>
+    <sys:String x:Key="Map_Ragnarok">Ragnarok</sys:String>
+    <sys:String x:Key="Map_Aberration_P">Aberration</sys:String>
+    <sys:String x:Key="Map_Extinction">Extinction</sys:String>
+    <sys:String x:Key="Map_Valguero_P">Valguero</sys:String>
+    <sys:String x:Key="Map_Genesis">Genesis</sys:String>
+    <sys:String x:Key="Map_CrystalIsles">Crystal Isles</sys:String>
+    <sys:String x:Key="Map_Gen2">Genesis: Part 2</sys:String>
+    <!--#endregion-->
+
+    <!--#region Total Conversion Names -->
+    <sys:String x:Key="TotalConv_111111111">Primitive Plus</sys:String>
+    <!--#endregion-->
+
+    <!--#region Branch Names -->
+    <sys:String x:Key="Branch_live">Version Steam (Défaut)</sys:String>
+    <!--#endregion-->
+
+    <!--#region Event Names -->
+    <sys:String x:Key="Event_none">Aucun</sys:String>
+    <sys:String x:Key="Event_vday">Saint-Valentin</sys:String>
+    <sys:String x:Key="Event_Easter">Pâques</sys:String>
+    <sys:String x:Key="Event_FearEvolved">Fear Evolved (Halloween)</sys:String>
+    <sys:String x:Key="Event_TurkeyTrial">Turkey Trial</sys:String>
+    <sys:String x:Key="Event_WinterWonderland">Winter Wonderland</sys:String>
+    <!--#endregion-->
+
+    <!--#region Mod Names -->
     <sys:String x:Key="Mod_All">All</sys:String>
     <sys:String x:Key="Mod_Unknown">Unknown</sys:String>
     <sys:String x:Key="Mod_ArkPrime">ARK Prime</sys:String>
@@ -2462,36 +2492,6 @@
     <sys:String x:Key="Settings_Title">Paramètres</sys:String>
     <!--#endregion-->
 
-    <!--#region Game Map Names -->
-    <sys:String x:Key="TheIsland">The Island</sys:String>
-    <sys:String x:Key="TheCenter">The Center</sys:String>
-    <sys:String x:Key="ScorchedEarth_P">Scorched Earth</sys:String>
-    <sys:String x:Key="Ragnarok">Ragnarok</sys:String>
-    <sys:String x:Key="Aberration_P">Aberration</sys:String>
-    <sys:String x:Key="Extinction">Extinction</sys:String>
-    <sys:String x:Key="Valguero_P">Valguero</sys:String>
-    <sys:String x:Key="Genesis">Genesis</sys:String>
-    <sys:String x:Key="CrystalIsles">Crystal Isles</sys:String>
-    <sys:String x:Key="Gen2">Genesis: Part 2</sys:String>
-    <!--#endregion-->
-
-    <!--#region Total Conversion Names -->
-    <sys:String x:Key="111111111">Primitive Plus</sys:String>
-    <!--#endregion-->
-
-    <!--#region Branch Names -->
-    <sys:String x:Key="live">Version Steam (Défaut)</sys:String>
-    <!--#endregion-->
-
-    <!--#region Event Names -->
-    <sys:String x:Key="none">Aucun</sys:String>
-    <sys:String x:Key="vday">Saint-Valentin</sys:String>
-    <sys:String x:Key="Easter">Pâques</sys:String>
-    <sys:String x:Key="FearEvolved">Fear Evolved (Halloween)</sys:String>
-    <sys:String x:Key="TurkeyTrial">Turkey Trial</sys:String>
-    <sys:String x:Key="WinterWonderland">Winter Wonderland</sys:String>
-    <!--#endregion-->
-
     <!--#region Dino/Creature -->
 
     <!--#region Dino/Creature Class Names -->
diff --git a/src/ARKServerManager/Globalization/pt-BR/pt-BR.xaml b/src/ARKServerManager/Globalization/pt-BR/pt-BR.xaml
index 23c47a99..57f24005 100644
--- a/src/ARKServerManager/Globalization/pt-BR/pt-BR.xaml
+++ b/src/ARKServerManager/Globalization/pt-BR/pt-BR.xaml
@@ -13,7 +13,37 @@
     <sys:String x:Key="Generic_ErrorLabel">Error</sys:String>
     <!--#endregion-->
 
-    <!--#region Mods -->
+    <!--#region Game Map Names -->
+    <sys:String x:Key="Map_TheIsland">The Island</sys:String>
+    <sys:String x:Key="Map_TheCenter">The Center</sys:String>
+    <sys:String x:Key="Map_ScorchedEarth_P">Scorched Earth</sys:String>
+    <sys:String x:Key="Map_Ragnarok">Ragnarok</sys:String>
+    <sys:String x:Key="Map_Aberration_P">Aberration</sys:String>
+    <sys:String x:Key="Map_Extinction">Extinction</sys:String>
+    <sys:String x:Key="Map_Valguero_P">Valguero</sys:String>
+    <sys:String x:Key="Map_Genesis">Genesis: Part 1</sys:String>
+    <sys:String x:Key="Map_CrystalIsles">Crystal Isles</sys:String>
+    <sys:String x:Key="Map_Gen2">Genesis: Part 2</sys:String>
+    <!--#endregion-->
+
+    <!--#region Total Conversion Names -->
+    <sys:String x:Key="TotalConv_111111111">Primitive Plus</sys:String>
+    <!--#endregion-->
+
+    <!--#region Branch Names -->
+    <sys:String x:Key="Branch_live">Live</sys:String>
+    <!--#endregion-->
+
+    <!--#region Event Names -->
+    <sys:String x:Key="Event_none">Nenhum</sys:String>
+    <sys:String x:Key="Event_vday">Dia dos namorados</sys:String>
+    <sys:String x:Key="Event_Easter">Páscoa</sys:String>
+    <sys:String x:Key="Event_FearEvolved">Fear Evolved (Halloween)</sys:String>
+    <sys:String x:Key="Event_TurkeyTrial">Turkey Trial</sys:String>
+    <sys:String x:Key="Event_WinterWonderland">Winter Wonderland</sys:String>
+    <!--#endregion-->
+
+    <!--#region Mod Names -->
     <sys:String x:Key="Mod_All">Todos</sys:String>
     <sys:String x:Key="Mod_Unknown">Desconhecido</sys:String>
     <sys:String x:Key="Mod_ArkPrime">ARK Prime</sys:String>
@@ -2466,36 +2496,6 @@
     <sys:String x:Key="Settings_Title">Definições</sys:String>
     <!--#endregion-->
 
-    <!--#region Game Map Names -->
-    <sys:String x:Key="TheIsland">The Island</sys:String>
-    <sys:String x:Key="TheCenter">The Center</sys:String>
-    <sys:String x:Key="ScorchedEarth_P">Scorched Earth</sys:String>
-    <sys:String x:Key="Ragnarok">Ragnarok</sys:String>
-    <sys:String x:Key="Aberration_P">Aberration</sys:String>
-    <sys:String x:Key="Extinction">Extinction</sys:String>
-	<sys:String x:Key="Valguero_P">Valguero</sys:String>
-    <sys:String x:Key="Genesis">Genesis: Part 1</sys:String>
-    <sys:String x:Key="CrystalIsles">Crystal Isles</sys:String>
-    <sys:String x:Key="Gen2">Genesis: Part 2</sys:String>
-    <!--#endregion-->
-
-    <!--#region Total Conversion Names -->
-    <sys:String x:Key="111111111">Primitive Plus</sys:String>
-    <!--#endregion-->
-
-    <!--#region Branch Names -->
-    <sys:String x:Key="live">Live</sys:String>
-    <!--#endregion-->
-
-    <!--#region Event Names -->
-	<sys:String x:Key="none">Nenhum</sys:String>
-    <sys:String x:Key="vday">Dia dos namorados</sys:String>
-    <sys:String x:Key="Easter">Páscoa</sys:String>
-    <sys:String x:Key="FearEvolved">Fear Evolved (Halloween)</sys:String>
-    <sys:String x:Key="TurkeyTrial">Turkey Trial</sys:String>
-    <sys:String x:Key="WinterWonderland">Winter Wonderland</sys:String>
-    <!--#endregion-->
-
     <!--#region Dino/Creature -->
 
     <!--#region Dino/Creature Class Names -->
diff --git a/src/ARKServerManager/Globalization/ru-RU/ru-RU.xaml b/src/ARKServerManager/Globalization/ru-RU/ru-RU.xaml
index 6920adb2..0e11214c 100644
--- a/src/ARKServerManager/Globalization/ru-RU/ru-RU.xaml
+++ b/src/ARKServerManager/Globalization/ru-RU/ru-RU.xaml
@@ -13,7 +13,37 @@
     <sys:String x:Key="Generic_ErrorLabel">Ошибка</sys:String>
     <!--#endregion-->
 
-    <!--#region Mods -->
+    <!--#region Game Map Names -->
+    <sys:String x:Key="Map_TheIsland">The Island</sys:String>
+    <sys:String x:Key="Map_TheCenter">The Center</sys:String>
+    <sys:String x:Key="Map_ScorchedEarth_P">Scorched Earth</sys:String>
+    <sys:String x:Key="Map_Ragnarok">Ragnarok</sys:String>
+    <sys:String x:Key="Map_Aberration_P">Aberration</sys:String>
+    <sys:String x:Key="Map_Extinction">Extinction</sys:String>
+    <sys:String x:Key="Map_Valguero_P">Valguero</sys:String>
+    <sys:String x:Key="Map_Genesis">Genesis: Part 1</sys:String>
+    <sys:String x:Key="Map_CrystalIsles">Crystal Isles</sys:String>
+    <sys:String x:Key="Map_Gen2">Genesis: Part 2</sys:String>
+    <!--#endregion-->
+
+    <!--#region Total Conversion Names -->
+    <sys:String x:Key="TotalConv_111111111">Primitive Plus</sys:String>
+    <!--#endregion-->
+
+    <!--#region Branch Names -->
+    <sys:String x:Key="Branch_live">Основной ARK</sys:String>
+    <!--#endregion-->
+
+    <!--#region Event Names -->
+    <sys:String x:Key="Event_none">None</sys:String>
+    <sys:String x:Key="Event_vday">Valentines Day</sys:String>
+    <sys:String x:Key="Event_Easter">Easter</sys:String>
+    <sys:String x:Key="Event_FearEvolved">Fear Evolved (Halloween)</sys:String>
+    <sys:String x:Key="Event_TurkeyTrial">Turkey Trial</sys:String>
+    <sys:String x:Key="Event_WinterWonderland">Winter Wonderland</sys:String>
+    <!--#endregion-->
+
+    <!--#region Mod Names -->
     <sys:String x:Key="Mod_All">All</sys:String>
     <sys:String x:Key="Mod_Unknown">Unknown</sys:String>
     <sys:String x:Key="Mod_ArkPrime">ARK Prime</sys:String>
@@ -2462,36 +2492,6 @@
     <sys:String x:Key="Settings_Title">Настройки</sys:String>
     <!--#endregion-->
 
-    <!--#region Game Map Names -->
-    <sys:String x:Key="TheIsland">The Island</sys:String>
-    <sys:String x:Key="TheCenter">The Center</sys:String>
-    <sys:String x:Key="ScorchedEarth_P">Scorched Earth</sys:String>
-    <sys:String x:Key="Ragnarok">Ragnarok</sys:String>
-    <sys:String x:Key="Aberration_P">Aberration</sys:String>
-    <sys:String x:Key="Extinction">Extinction</sys:String>
-    <sys:String x:Key="Valguero_P">Valguero</sys:String>
-    <sys:String x:Key="Genesis">Genesis: Part 1</sys:String>
-    <sys:String x:Key="CrystalIsles">Crystal Isles</sys:String>
-    <sys:String x:Key="Gen2">Genesis: Part 2</sys:String>
-    <!--#endregion-->
-
-    <!--#region Total Conversion Names -->
-    <sys:String x:Key="111111111">Primitive Plus</sys:String>
-    <!--#endregion-->
-
-    <!--#region Branch Names -->
-    <sys:String x:Key="live">Основной ARK</sys:String>
-    <!--#endregion-->
-
-    <!--#region Event Names -->
-    <sys:String x:Key="none">None</sys:String>
-    <sys:String x:Key="vday">Valentines Day</sys:String>
-    <sys:String x:Key="Easter">Easter</sys:String>
-    <sys:String x:Key="FearEvolved">Fear Evolved (Halloween)</sys:String>
-    <sys:String x:Key="TurkeyTrial">Turkey Trial</sys:String>
-    <sys:String x:Key="WinterWonderland">Winter Wonderland</sys:String>
-    <!--#endregion-->
-
     <!--#region Dino/Creature -->
 
     <!--#region Dino/Creature Class Names -->
diff --git a/src/ARKServerManager/Globalization/zh-CN/zh-CN.xaml b/src/ARKServerManager/Globalization/zh-CN/zh-CN.xaml
index d383589f..1c10e204 100644
--- a/src/ARKServerManager/Globalization/zh-CN/zh-CN.xaml
+++ b/src/ARKServerManager/Globalization/zh-CN/zh-CN.xaml
@@ -13,7 +13,37 @@
     <sys:String x:Key="Generic_ErrorLabel">错误</sys:String>
     <!--#endregion-->
 
-    <!--#region Mods -->
+    <!--#游戏地图名称 -->
+    <sys:String x:Key="Map_TheIsland">孤岛(The Island)</sys:String>
+    <sys:String x:Key="Map_TheCenter">中心岛地图(The Center)</sys:String>
+    <sys:String x:Key="Map_ScorchedEarth_P">焦土地图(Scorched Earth)</sys:String>
+    <sys:String x:Key="Map_Ragnarok">仙境地图(Ragnarok)</sys:String>
+    <sys:String x:Key="Map_Aberration_P">畸变地图(Aberration)</sys:String>
+    <sys:String x:Key="Map_Extinction">灭绝地图(Extinction)</sys:String>
+    <sys:String x:Key="Map_Valguero_P">瓦尔盖罗(Valguero)</sys:String>
+    <sys:String x:Key="Map_Genesis">创世纪(Genesis)</sys:String>
+    <sys:String x:Key="Map_Gen2">创世纪 2（Genesis: Part 2）</sys:String>
+    <sys:String x:Key="Map_CrystalIsles">水晶岛(Crystal Isles)</sys:String>
+    <!--#endregion-->
+
+    <!--#总转换名称 -->
+    <sys:String x:Key="TotalConv_111111111">原始服(Primitive Plus)</sys:String>
+    <!--#endregion-->
+
+    <!--#区域分支名称 -->
+    <sys:String x:Key="Branch_live">生存</sys:String>
+    <!--#endregion-->
+
+    <!--#region Event Names -->
+    <sys:String x:Key="Event_none">无节日</sys:String>
+    <sys:String x:Key="Event_vday">情人节</sys:String>
+    <sys:String x:Key="Event_Easter">复活节</sys:String>
+    <sys:String x:Key="Event_FearEvolved">恐惧进化（万圣节）</sys:String>
+    <sys:String x:Key="Event_TurkeyTrial">土耳其审判（感恩节）</sys:String>
+    <sys:String x:Key="Event_WinterWonderland">冬季仙境（圣诞节）</sys:String>
+    <!--#endregion-->
+
+    <!--#region Mod Names -->
     <sys:String x:Key="Mod_All">所有</sys:String>
     <sys:String x:Key="Mod_Unknown">未知</sys:String>
     <sys:String x:Key="Mod_ArkPrime">方舟主体</sys:String>
@@ -2463,36 +2493,6 @@
     <sys:String x:Key="Settings_Title">设置</sys:String>
     <!--#endregion-->
 
-    <!--#游戏地图名称 -->
-    <sys:String x:Key="TheIsland">孤岛(The Island)</sys:String>
-    <sys:String x:Key="TheCenter">中心岛地图(The Center)</sys:String>
-    <sys:String x:Key="ScorchedEarth_P">焦土地图(Scorched Earth)</sys:String>
-    <sys:String x:Key="Ragnarok">仙境地图(Ragnarok)</sys:String>
-    <sys:String x:Key="Aberration_P">畸变地图(Aberration)</sys:String>
-    <sys:String x:Key="Extinction">灭绝地图(Extinction)</sys:String>
-    <sys:String x:Key="Valguero_P">瓦尔盖罗(Valguero)</sys:String>
-    <sys:String x:Key="Genesis">创世纪(Genesis)</sys:String>
-	<sys:String x:Key="Gen2">创世纪 2（Genesis: Part 2）</sys:String>
-    <sys:String x:Key="CrystalIsles">水晶岛(Crystal Isles)</sys:String>
-    <!--#endregion-->
-
-    <!--#总转换名称 -->
-    <sys:String x:Key="111111111">原始服(Primitive Plus)</sys:String>
-    <!--#endregion-->
-
-    <!--#区域分支名称 -->
-    <sys:String x:Key="live">生存</sys:String>
-    <!--#endregion-->
-
-    <!--#region Event Names -->
-	<sys:String x:Key="none">无节日</sys:String>
-    <sys:String x:Key="vday">情人节</sys:String>
-    <sys:String x:Key="Easter">复活节</sys:String>
-    <sys:String x:Key="FearEvolved">恐惧进化（万圣节）</sys:String>
-    <sys:String x:Key="TurkeyTrial">土耳其审判（感恩节）</sys:String>
-    <sys:String x:Key="WinterWonderland">冬季仙境（圣诞节）</sys:String>
-    <!--#endregion-->
-
     <!--恐龙/生物 -->
 
     <!--恐龙/生物类别名称 -->
diff --git a/src/ARKServerManager/Lib/GameData.cs b/src/ARKServerManager/Lib/GameData.cs
index c5f2c7ce..5ad10edc 100644
--- a/src/ARKServerManager/Lib/GameData.cs
+++ b/src/ARKServerManager/Lib/GameData.cs
@@ -259,7 +259,7 @@ namespace ServerManagerTool.Lib
 
         public static IEnumerable<ComboBoxItem> GetGameMaps() => gameMaps.Select(d => d.Duplicate());
 
-        public static string FriendlyMapNameForClass(string className, bool returnEmptyIfNotFound = false) => string.IsNullOrWhiteSpace(className) ? string.Empty : GlobalizedApplication.Instance.GetResourceString(className) ?? gameData?.GameMaps?.FirstOrDefault(i => i.ClassName.Equals(className) && !i.IsSotF)?.Description ?? (returnEmptyIfNotFound ? string.Empty : className);
+        public static string FriendlyMapNameForClass(string className, bool returnEmptyIfNotFound = false) => string.IsNullOrWhiteSpace(className) ? string.Empty : GlobalizedApplication.Instance.GetResourceString("Map_" + className) ?? gameData?.GameMaps?.FirstOrDefault(i => i.ClassName.Equals(className) && !i.IsSotF)?.Description ?? (returnEmptyIfNotFound ? string.Empty : className);
 
         private static ComboBoxItem[] gameMapsSotF = new[]
         {
@@ -268,7 +268,7 @@ namespace ServerManagerTool.Lib
 
         public static IEnumerable<ComboBoxItem> GetGameMapsSotF() => gameMapsSotF.Select(d => d.Duplicate());
 
-        public static string FriendlyMapSotFNameForClass(string className, bool returnEmptyIfNotFound = false) => string.IsNullOrWhiteSpace(className) ? string.Empty : GlobalizedApplication.Instance.GetResourceString(className) ?? gameData?.GameMaps?.FirstOrDefault(i => i.ClassName.Equals(className) && i.IsSotF)?.Description ?? (returnEmptyIfNotFound ? string.Empty : className);
+        public static string FriendlyMapSotFNameForClass(string className, bool returnEmptyIfNotFound = false) => string.IsNullOrWhiteSpace(className) ? string.Empty : GlobalizedApplication.Instance.GetResourceString("Map_" + className) ?? gameData?.GameMaps?.FirstOrDefault(i => i.ClassName.Equals(className) && i.IsSotF)?.Description ?? (returnEmptyIfNotFound ? string.Empty : className);
         #endregion
 
         #region Total Conversions
@@ -279,7 +279,7 @@ namespace ServerManagerTool.Lib
 
         public static IEnumerable<ComboBoxItem> GetTotalConversions() => totalConversions.Select(d => d.Duplicate());
 
-        public static string FriendlyTotalConversionNameForClass(string className, bool returnEmptyIfNotFound = false) => string.IsNullOrWhiteSpace(className) ? string.Empty : GlobalizedApplication.Instance.GetResourceString(className) ?? gameData?.Mods?.FirstOrDefault(i => i.ClassName.Equals(className) && !i.IsSotF)?.Description ?? (returnEmptyIfNotFound ? string.Empty : className);
+        public static string FriendlyTotalConversionNameForClass(string className, bool returnEmptyIfNotFound = false) => string.IsNullOrWhiteSpace(className) ? string.Empty : GlobalizedApplication.Instance.GetResourceString("TotalConv_" + className) ?? gameData?.Mods?.FirstOrDefault(i => i.ClassName.Equals(className) && !i.IsSotF)?.Description ?? (returnEmptyIfNotFound ? string.Empty : className);
 
         private static ComboBoxItem[] totalConversionsSotF = new[]
         {
@@ -288,7 +288,7 @@ namespace ServerManagerTool.Lib
 
         public static IEnumerable<ComboBoxItem> GetTotalConversionsSotF() => totalConversionsSotF.Select(d => d.Duplicate());
 
-        public static string FriendlyTotalConversionSotFNameForClass(string className, bool returnEmptyIfNotFound = false) => string.IsNullOrWhiteSpace(className) ? string.Empty : GlobalizedApplication.Instance.GetResourceString(className) ?? gameData?.Mods?.FirstOrDefault(i => i.ClassName.Equals(className) && i.IsSotF)?.Description ?? (returnEmptyIfNotFound ? string.Empty : className);
+        public static string FriendlyTotalConversionSotFNameForClass(string className, bool returnEmptyIfNotFound = false) => string.IsNullOrWhiteSpace(className) ? string.Empty : GlobalizedApplication.Instance.GetResourceString("TotalConv_" + className) ?? gameData?.Mods?.FirstOrDefault(i => i.ClassName.Equals(className) && i.IsSotF)?.Description ?? (returnEmptyIfNotFound ? string.Empty : className);
         #endregion
 
         #region Stats Multipliers
@@ -379,7 +379,7 @@ namespace ServerManagerTool.Lib
 
         public static IEnumerable<ComboBoxItem> GetBranches() => branches.Select(d => d.Duplicate());
 
-        public static string FriendlyBranchName(string branchName, bool returnEmptyIfNotFound = false) => string.IsNullOrWhiteSpace(branchName) ? string.Empty : GlobalizedApplication.Instance.GetResourceString(branchName) ?? gameData?.Branches?.FirstOrDefault(i => i.BranchName.Equals(branchName) && !i.IsSotF)?.Description ?? (returnEmptyIfNotFound ? string.Empty : branchName);
+        public static string FriendlyBranchName(string branchName, bool returnEmptyIfNotFound = false) => string.IsNullOrWhiteSpace(branchName) ? string.Empty : GlobalizedApplication.Instance.GetResourceString("Branch_" + branchName) ?? gameData?.Branches?.FirstOrDefault(i => i.BranchName.Equals(branchName) && !i.IsSotF)?.Description ?? (returnEmptyIfNotFound ? string.Empty : branchName);
 
         private static ComboBoxItem[] branchesSotF = new[]
         {
@@ -388,7 +388,7 @@ namespace ServerManagerTool.Lib
 
         public static IEnumerable<ComboBoxItem> GetBranchesSotF() => branchesSotF.Select(d => d.Duplicate());
 
-        public static string FriendlyBranchSotFName(string branchName, bool returnEmptyIfNotFound = false) => string.IsNullOrWhiteSpace(branchName) ? string.Empty : GlobalizedApplication.Instance.GetResourceString(branchName) ?? gameData?.Branches?.FirstOrDefault(i => i.BranchName.Equals(branchName) && i.IsSotF)?.Description ?? (returnEmptyIfNotFound ? string.Empty : branchName);
+        public static string FriendlyBranchSotFName(string branchName, bool returnEmptyIfNotFound = false) => string.IsNullOrWhiteSpace(branchName) ? string.Empty : GlobalizedApplication.Instance.GetResourceString("Branch_" + branchName) ?? gameData?.Branches?.FirstOrDefault(i => i.BranchName.Equals(branchName) && i.IsSotF)?.Description ?? (returnEmptyIfNotFound ? string.Empty : branchName);
         #endregion
 
         #region Events
@@ -399,7 +399,7 @@ namespace ServerManagerTool.Lib
 
         public static IEnumerable<ComboBoxItem> GetEvents() => events.Select(d => d.Duplicate());
 
-        public static string FriendlyEventName(string eventName, bool returnEmptyIfNotFound = false) => string.IsNullOrWhiteSpace(eventName) ? string.Empty : GlobalizedApplication.Instance.GetResourceString(eventName) ?? gameData?.Events?.FirstOrDefault(i => i.EventName.Equals(eventName) && !i.IsSotF)?.Description ?? (returnEmptyIfNotFound ? string.Empty : eventName);
+        public static string FriendlyEventName(string eventName, bool returnEmptyIfNotFound = false) => string.IsNullOrWhiteSpace(eventName) ? string.Empty : GlobalizedApplication.Instance.GetResourceString("Event_" + eventName) ?? gameData?.Events?.FirstOrDefault(i => i.EventName.Equals(eventName) && !i.IsSotF)?.Description ?? (returnEmptyIfNotFound ? string.Empty : eventName);
 
         private static ComboBoxItem[] eventsSotF = new[]
         {
@@ -408,7 +408,7 @@ namespace ServerManagerTool.Lib
 
         public static IEnumerable<ComboBoxItem> GetEventsSotF() => eventsSotF.Select(d => d.Duplicate());
 
-        public static string FriendlyEventSotFName(string eventName, bool returnEmptyIfNotFound = false) => string.IsNullOrWhiteSpace(eventName) ? string.Empty : GlobalizedApplication.Instance.GetResourceString(eventName) ?? gameData?.Events?.FirstOrDefault(i => i.EventName.Equals(eventName) && i.IsSotF)?.Description ?? (returnEmptyIfNotFound ? string.Empty : eventName);
+        public static string FriendlyEventSotFName(string eventName, bool returnEmptyIfNotFound = false) => string.IsNullOrWhiteSpace(eventName) ? string.Empty : GlobalizedApplication.Instance.GetResourceString("Event_" + eventName) ?? gameData?.Events?.FirstOrDefault(i => i.EventName.Equals(eventName) && i.IsSotF)?.Description ?? (returnEmptyIfNotFound ? string.Empty : eventName);
         #endregion
     }
 }
diff --git a/src/ConanServerManager/Globalization/en-US/en-US.xaml b/src/ConanServerManager/Globalization/en-US/en-US.xaml
index d0b5792b..43175cce 100644
--- a/src/ConanServerManager/Globalization/en-US/en-US.xaml
+++ b/src/ConanServerManager/Globalization/en-US/en-US.xaml
@@ -13,6 +13,15 @@
     <sys:String x:Key="Generic_ErrorLabel">Error</sys:String>
     <!--#endregion-->
 
+    <!--#region Game Map Names -->
+    <sys:String x:Key="Map_ConanSandbox">The Exiled Lands</sys:String>
+    <sys:String x:Key="Map_/Game/DLC_EXT/DLC_Siptah/Maps/DLC_Isle_of_Siptah">Isle of Siptah</sys:String>
+    <!--#endregion-->
+
+    <!--#region Branch Names -->
+    <sys:String x:Key="Branch_live">Live</sys:String>
+    <!--#endregion-->
+
     <!--#region Mod Types -->
     <sys:String x:Key="ModType_Unknown">Unknown</sys:String>
     <sys:String x:Key="ModType_NotDownloaded">Not Downloaded</sys:String>
@@ -26,10 +35,6 @@
     <sys:String x:Key="GameApplication_Unknown">Unknown</sys:String>
     <!--#endregion-->
 
-    <!--#region Branch Names -->
-    <sys:String x:Key="live">Live</sys:String>
-    <!--#endregion-->
-
     <!--#region Server Regions -->
     <sys:String x:Key="ServerRegion_0">Europe</sys:String>
     <sys:String x:Key="ServerRegion_1">North America</sys:String>
@@ -39,11 +44,6 @@
     <sys:String x:Key="ServerRegion_5">Japan</sys:String>
     <!--#endregion-->
 
-    <!--#region Game Map Names -->
-    <sys:String x:Key="ConanSandbox">The Exiled Lands</sys:String>
-    <sys:String x:Key="/Game/DLC_EXT/DLC_Siptah/Maps/DLC_Isle_of_Siptah">Isle of Siptah</sys:String>
-    <!--#endregion-->
-
     <!--#region Process Priority -->
     <sys:String x:Key="Priority_low">Low</sys:String>
     <sys:String x:Key="Priority_belownormal">Below Normal</sys:String>
diff --git a/src/ConanServerManager/Globalization/fr-FR/fr-FR.xaml b/src/ConanServerManager/Globalization/fr-FR/fr-FR.xaml
index d484cd4c..b598f7dd 100644
--- a/src/ConanServerManager/Globalization/fr-FR/fr-FR.xaml
+++ b/src/ConanServerManager/Globalization/fr-FR/fr-FR.xaml
@@ -12,6 +12,14 @@
     <sys:String x:Key="Generic_ErrorLabel">Erreur</sys:String>
     <!--#endregion-->
 
+    <!--#region Game Map Names -->
+    <sys:String x:Key="Map_ConanSandbox">Les terres exilées</sys:String>
+    <!--#endregion-->
+
+    <!--#region Branch Names -->
+    <sys:String x:Key="Branch_live">Version Steam (Défaut)</sys:String>
+    <!--#endregion-->
+
     <!--#region GameApplication enum -->
     <sys:String x:Key="GameApplication_All">Tout</sys:String>
     <sys:String x:Key="GameApplication_Conan">Conan Exiles</sys:String>
@@ -989,12 +997,4 @@
     <sys:String x:Key="ServerSettings_OverlayMessage_SchedulesLabel">Vérification des tâches planifiées...</sys:String>
     <!--#endregion-->
 
-    <!--#region Branch Names -->
-    <sys:String x:Key="live">Version Steam (Défaut)</sys:String>
-    <!--#endregion-->
-
-    <!--#region Game Map Names -->
-    <sys:String x:Key="ConanSandbox">Les terres exilées</sys:String>
-    <!--#endregion-->
-
 </Globalization:GlobalizationResourceDictionary>
\ No newline at end of file
diff --git a/src/ConanServerManager/Globalization/pt-BR/pt-BR.xaml b/src/ConanServerManager/Globalization/pt-BR/pt-BR.xaml
index 60c33d02..df0c6e73 100644
--- a/src/ConanServerManager/Globalization/pt-BR/pt-BR.xaml
+++ b/src/ConanServerManager/Globalization/pt-BR/pt-BR.xaml
@@ -12,6 +12,14 @@
     <sys:String x:Key="Generic_ErrorLabel">Error</sys:String>
     <!--#endregion-->
 
+    <!--#region Game Map Names -->
+    <sys:String x:Key="Map_ConanSandbox">The Exiled Lands</sys:String>
+    <!--#endregion-->
+
+    <!--#region Branch Names -->
+    <sys:String x:Key="Branch_live">Live</sys:String>
+    <!--#endregion-->
+
     <!--#region GameApplication enum -->
     <sys:String x:Key="GameApplication_All">Todos</sys:String>
     <sys:String x:Key="GameApplication_Conan">Conan</sys:String>
@@ -1033,12 +1041,4 @@
     <sys:String x:Key="ServerSettings_OverlayMessage_SchedulesLabel">Verificando tarefas agendadas ...</sys:String>
     <!--#endregion-->
 
-    <!--#region Branch Names -->
-    <sys:String x:Key="live">Live</sys:String>
-    <!--#endregion-->
-
-    <!--#region Game Map Names -->
-    <sys:String x:Key="ConanSandbox">The Exiled Lands</sys:String>
-    <!--#endregion-->
-
 </Globalization:GlobalizationResourceDictionary>
\ No newline at end of file
diff --git a/src/ConanServerManager/Lib/GameData.cs b/src/ConanServerManager/Lib/GameData.cs
index bd96fbac..bd2282e8 100644
--- a/src/ConanServerManager/Lib/GameData.cs
+++ b/src/ConanServerManager/Lib/GameData.cs
@@ -71,7 +71,7 @@ namespace ServerManagerTool.Lib
 
         public static IEnumerable<ComboBoxItem> GetGameMaps() => gameMaps.Select(m => m.Duplicate());
 
-        public static string FriendlyMapNameForClass(string className, bool returnEmptyIfNotFound = false) => string.IsNullOrWhiteSpace(className) ? string.Empty : GlobalizedApplication.Instance.GetResourceString(className) ?? gameData?.GameMaps?.FirstOrDefault(i => i.ClassName.Equals(className))?.Description ?? (returnEmptyIfNotFound ? string.Empty : className);
+        public static string FriendlyMapNameForClass(string className, bool returnEmptyIfNotFound = false) => string.IsNullOrWhiteSpace(className) ? string.Empty : GlobalizedApplication.Instance.GetResourceString("Map_" + className) ?? gameData?.GameMaps?.FirstOrDefault(i => i.ClassName.Equals(className))?.Description ?? (returnEmptyIfNotFound ? string.Empty : className);
 
         public static string MapSaveNameForClass(string className, bool returnEmptyIfNotFound = false) => string.IsNullOrWhiteSpace(className) ? string.Empty : gameData?.GameMaps?.FirstOrDefault(i => i.ClassName.Equals(className))?.SaveFileName ?? (returnEmptyIfNotFound ? string.Empty : className);
         #endregion
@@ -84,7 +84,7 @@ namespace ServerManagerTool.Lib
 
         public static IEnumerable<ComboBoxItem> GetBranches() => branches.Select(d => d.Duplicate());
 
-        public static string FriendlyBranchName(string branchName, bool returnEmptyIfNotFound = false) => string.IsNullOrWhiteSpace(branchName) ? string.Empty : GlobalizedApplication.Instance.GetResourceString(branchName) ?? gameData?.Branches?.FirstOrDefault(i => i.BranchName.Equals(branchName))?.Description ?? (returnEmptyIfNotFound ? string.Empty : branchName);
+        public static string FriendlyBranchName(string branchName, bool returnEmptyIfNotFound = false) => string.IsNullOrWhiteSpace(branchName) ? string.Empty : GlobalizedApplication.Instance.GetResourceString("Branch_" + branchName) ?? gameData?.Branches?.FirstOrDefault(i => i.BranchName.Equals(branchName))?.Description ?? (returnEmptyIfNotFound ? string.Empty : branchName);
         #endregion
 
         #region Server Regions