diff --git a/src/ARKServerManager.Common/Utils/GameDataUtils.cs b/src/ARKServerManager.Common/Utils/GameDataUtils.cs
index 9f74cff0..acddc094 100644
--- a/src/ARKServerManager.Common/Utils/GameDataUtils.cs
+++ b/src/ARKServerManager.Common/Utils/GameDataUtils.cs
@@ -43,6 +43,7 @@ namespace ServerManagerTool.Utils
                     data.Branches.AddRange(fileData.Branches);
                     data.Events.AddRange(fileData.Events);
                     data.OfficialMods.AddRange(fileData.OfficialMods);
+                    data.RconInputModes.AddRange(fileData.RconInputModes);
 
                     if (fileData.PlayerAdditionalLevels > 0 && fileData.PlayerAdditionalLevels > data.PlayerAdditionalLevels)
                         data.PlayerAdditionalLevels = fileData.PlayerAdditionalLevels;
@@ -137,6 +138,9 @@ namespace ServerManagerTool.Utils
         [DataMember(IsRequired = false)]
         public List<OfficialModItem> OfficialMods = new List<OfficialModItem>();
 
+        [DataMember(IsRequired = false)]
+        public List<RconInputModeItem> RconInputModes = new List<RconInputModeItem>();
+
         public static MainGameData Load(string file, bool isUserData)
         {
             if (string.IsNullOrWhiteSpace(file) || !File.Exists(file))
@@ -157,6 +161,7 @@ namespace ServerManagerTool.Utils
                 data.Branches.ForEach(c => c.IsUserData = isUserData);
                 data.Events.ForEach(c => c.IsUserData = isUserData);
                 data.OfficialMods.ForEach(c => c.IsUserData = isUserData);
+                data.RconInputModes.ForEach(c => c.IsUserData = isUserData);
             }
             return data;
         }
@@ -300,4 +305,15 @@ namespace ServerManagerTool.Utils
 
         public bool IsUserData = false;
     }
+
+    [DataContract]
+    public class RconInputModeItem
+    {
+        [DataMember]
+        public string Command = string.Empty;
+        [DataMember]
+        public string Description = string.Empty;
+
+        public bool IsUserData = false;
+    }
 }
diff --git a/src/ARKServerManager/GameData/SurvivalEvolved.gamedata b/src/ARKServerManager/GameData/SurvivalEvolved.gamedata
index 72e8f43d..297d31f0 100644
--- a/src/ARKServerManager/GameData/SurvivalEvolved.gamedata
+++ b/src/ARKServerManager/GameData/SurvivalEvolved.gamedata
@@ -13450,6 +13450,20 @@
     {
       "ModId": "LostIsland",
       "ModName": "Lost Island"
+    },
+    {
+      "ModId": "Fjordur",
+      "ModName": "Fjordur"
+    }
+  ],
+  "RconInputModes": [
+    {
+      "Command": "Global",
+      "Description": "Global"
+    },
+    {
+      "Command": "Broadcast",
+      "Description": "Broadcast"
     }
   ]
 }
\ No newline at end of file
diff --git a/src/ARKServerManager/Globalization/en-US/en-US.xaml b/src/ARKServerManager/Globalization/en-US/en-US.xaml
index 36ead293..334f6c99 100644
--- a/src/ARKServerManager/Globalization/en-US/en-US.xaml
+++ b/src/ARKServerManager/Globalization/en-US/en-US.xaml
@@ -25,6 +25,7 @@
     <sys:String x:Key="Map_CrystalIsles">Crystal Isles</sys:String>
     <sys:String x:Key="Map_Gen2">Genesis: Part 2</sys:String>
     <sys:String x:Key="Map_LostIsland">Lost Island</sys:String>
+    <sys:String x:Key="Map_Fjordur">Fjordur</sys:String>
     <!--#endregion-->
 
     <!--#region Total Conversion Names -->
@@ -58,6 +59,7 @@
     <sys:String x:Key="Mod_CrystalIsles">Crystal Isles</sys:String>
     <sys:String x:Key="Mod_Genesis2">Genesis: Part 2</sys:String>
     <sys:String x:Key="Mod_LostIsland">Lost Island</sys:String>
+    <sys:String x:Key="Mod_Fjordur">Fjordur</sys:String>
     <sys:String x:Key="Mod_PGM">PGM</sys:String>
     <!--#endregion-->
 
@@ -107,6 +109,12 @@
     <sys:String x:Key="DiscordBotLogLevel_Debug">Debug</sys:String>
     <!--#endregion-->
 
+    <!--#region Rcon Message Modes -->
+    <sys:String x:Key="InputMode_Command">Command</sys:String>
+    <sys:String x:Key="InputMode_Global">Global</sys:String>
+    <sys:String x:Key="InputMode_Broadcast">Broadcast</sys:String>
+    <!--#endregion-->
+
     <!--#region Application -->
     <sys:String x:Key="Application_RunAsAdministratorTitle">Run as Administrator</sys:String>
     <sys:String x:Key="Application_RunAsAdministratorLabel">This application requires administration priviledges to access ALL functionality. Would you like to Run as Administrator?</sys:String>
@@ -2654,10 +2662,6 @@
     <sys:String x:Key="RCON_ViewLogs_ErrorTitle">Can't open logs</sys:String>
     <sys:String x:Key="RCON_ViewLogs_ErrorLabel">Unable to open the logs directory at {0}. Please make sure this directory exists and that you have permission to access it.\nException: {1}</sys:String>
 
-    <sys:String x:Key="InputMode_Command">Command</sys:String>
-    <sys:String x:Key="InputMode_Global">Global</sys:String>
-    <sys:String x:Key="InputMode_Broadcast">Broadcast</sys:String>
-
     <sys:String x:Key="ConsoleStatus_Disconnected">Disconnected</sys:String>
     <sys:String x:Key="ConsoleStatus_Connected">Connected</sys:String>
 
diff --git a/src/ARKServerManager/Lib/GameData.cs b/src/ARKServerManager/Lib/GameData.cs
index 6f2a1db2..64904487 100644
--- a/src/ARKServerManager/Lib/GameData.cs
+++ b/src/ARKServerManager/Lib/GameData.cs
@@ -15,6 +15,8 @@ namespace ServerManagerTool.Lib
         public const string MOD_ALL = "All";
         public const string MOD_UNKNOWN = "Unknown";
 
+        public const string RCONINPUTMODE_COMMAND = "Command";
+
         public static string MainDataFolder = Path.Combine(Environment.CurrentDirectory, Config.Default.GameDataDir);
         public static string UserDataFolder = Path.Combine(Config.Default.DataDir, Config.Default.GameDataDir);
 
@@ -159,6 +161,17 @@ namespace ServerManagerTool.Lib
             {
                 ModUtils.AddOfficialMods(gameData.OfficialMods.Where(m => !string.IsNullOrWhiteSpace(m.ModId)).Select(m => m.ModId).ToList());
             }
+
+            // rcon input modes
+            gameData.RconInputModes.AddRange(userGameData.RconInputModes);
+
+            if (gameData.RconInputModes.Count > 0)
+            {
+                var modes1 = rconInputModes.ToList();
+                modes1.AddRange(gameData.RconInputModes.Select(item => new ComboBoxItem { ValueMember = item.Command, DisplayMember = item.Description }));
+
+                rconInputModes = modes1.ToArray();
+            }
         }
 
         public static string FriendlyNameForClass(string className, bool returnNullIfNotFound = false) => string.IsNullOrWhiteSpace(className) ? (returnNullIfNotFound ? null : string.Empty) : GlobalizedApplication.Instance.GetResourceString(className) ?? (returnNullIfNotFound ? null : className);
@@ -430,5 +443,18 @@ namespace ServerManagerTool.Lib
 
         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
+
+        #region Rcon input Modes
+        private static ComboBoxItem[] rconInputModes = new[]
+        {
+            new ComboBoxItem { ValueMember=RCONINPUTMODE_COMMAND, DisplayMember=FriendlyNameForClass($"InputMode_{RCONINPUTMODE_COMMAND}") },
+        };
+
+        public static IEnumerable<ComboBoxItem> GetAllRconInputModes() => rconInputModes.Select(m => m.Duplicate());
+
+        public static IEnumerable<ComboBoxItem> GetMessageRconInputModes() => rconInputModes.Where(m => !m.ValueMember.Equals(RCONINPUTMODE_COMMAND, StringComparison.OrdinalIgnoreCase)).Select(m => m.Duplicate());
+
+        public static string FriendlyRconInputModeName(string rconInputMode, bool returnEmptyIfNotFound = false) => string.IsNullOrWhiteSpace(rconInputMode) ? string.Empty : GlobalizedApplication.Instance.GetResourceString("InputMode_" + rconInputMode) ?? gameData?.RconInputModes?.FirstOrDefault(i => i.Command.Equals(rconInputMode))?.Description ?? (returnEmptyIfNotFound ? string.Empty : rconInputMode);
+        #endregion
     }
 }
diff --git a/src/ARKServerManager/Lib/ServerApp.cs b/src/ARKServerManager/Lib/ServerApp.cs
index 470cf562..d2998ef5 100644
--- a/src/ARKServerManager/Lib/ServerApp.cs
+++ b/src/ARKServerManager/Lib/ServerApp.cs
@@ -2437,7 +2437,7 @@ namespace ServerManagerTool.Lib
                     return ServerRcon.RCON_COMMAND_SERVERCHAT;
 
                 default:
-                    return ServerRcon.RCON_COMMAND_BROADCAST;
+                    return commandValue.ToLower();
             }
         }
 
diff --git a/src/ARKServerManager/Lib/ServerRCON.cs b/src/ARKServerManager/Lib/ServerRCON.cs
index 5b36d482..e3d0ba76 100644
--- a/src/ARKServerManager/Lib/ServerRCON.cs
+++ b/src/ARKServerManager/Lib/ServerRCON.cs
@@ -29,7 +29,6 @@ namespace ServerManagerTool.Lib
         private const string NoResponseMatch = "Server received, But no response!!";
         public const string NoResponseOutput = "NO_RESPONSE";
 
-        public const string RCON_COMMAND_BROADCAST = "broadcast";
         public const string RCON_COMMAND_LISTPLAYERS = "listplayers";
         public const string RCON_COMMAND_GETCHAT = "getchat";
         public const string RCON_COMMAND_SERVERCHAT = "serverchat";
@@ -315,18 +314,21 @@ namespace ServerManagerTool.Lib
                     }
                 }
             }
-
-            if (command.command.Equals(RCON_COMMAND_BROADCAST, StringComparison.OrdinalIgnoreCase))
-            {
-                LogEvent(LogEventType.Chat, command.rawCommand);
-                command.suppressOutput = true;
-            }
             
             if (command.command.Equals(RCON_COMMAND_SERVERCHAT, StringComparison.OrdinalIgnoreCase))
             {
                 LogEvent(LogEventType.Chat, command.rawCommand);
                 command.suppressOutput = true;
             }
+
+            foreach (var item in GameData.GetMessageRconInputModes())
+            {
+                if (command.command.Equals(item.ValueMember, StringComparison.OrdinalIgnoreCase))
+                {
+                    LogEvent(LogEventType.Chat, command.rawCommand);
+                    command.suppressOutput = true;
+                }
+            }
         }
 
         // This is bound to the UI thread
diff --git a/src/ARKServerManager/UserControls/GlobalSettingsControl.xaml.cs b/src/ARKServerManager/UserControls/GlobalSettingsControl.xaml.cs
index 4e2f474f..cbd342e1 100644
--- a/src/ARKServerManager/UserControls/GlobalSettingsControl.xaml.cs
+++ b/src/ARKServerManager/UserControls/GlobalSettingsControl.xaml.cs
@@ -4,6 +4,7 @@ using ServerManagerTool.Common;
 using ServerManagerTool.Common.Lib;
 using ServerManagerTool.Common.Model;
 using ServerManagerTool.Common.Utils;
+using ServerManagerTool.Lib;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -548,13 +549,10 @@ namespace ServerManagerTool
             var selectedValue = this.RconMessageModesComboBox?.SelectedValue ?? Config.RCON_MessageCommand;
             var list = new ComboBoxItemList();
 
-            foreach (InputMode inputMode in Enum.GetValues(typeof(InputMode)))
+            foreach (var item in GameData.GetMessageRconInputModes())
             {
-                if (inputMode == InputMode.Command)
-                    continue;
-
-                var displayMember = _globalizer.GetResourceString($"InputMode_{inputMode}") ?? inputMode.ToString();
-                list.Add(new Common.Model.ComboBoxItem(inputMode.ToString(), displayMember));
+                item.DisplayMember = GameData.FriendlyRconInputModeName(item.ValueMember);
+                list.Add(item);
             }
 
             this.RconMessageModes = list;
diff --git a/src/ARKServerManager/Windows/RCONWindow.xaml b/src/ARKServerManager/Windows/RCONWindow.xaml
index 83a29287..1a10bd43 100644
--- a/src/ARKServerManager/Windows/RCONWindow.xaml
+++ b/src/ARKServerManager/Windows/RCONWindow.xaml
@@ -20,12 +20,6 @@
             </ResourceDictionary.MergedDictionaries>
             
             <local:ScrollToBottomAction x:Key="ScrollToBottomAction" />
-           
-            <ObjectDataProvider MethodName="GetValues" ObjectType="{x:Type sys:Enum}" x:Key="InputModes">
-                <ObjectDataProvider.MethodParameters>
-                    <x:Type TypeName="local:InputMode" />
-                </ObjectDataProvider.MethodParameters>
-            </ObjectDataProvider>
         </ResourceDictionary>
     </Window.Resources>
 
@@ -239,7 +233,7 @@
                 </Grid.ColumnDefinitions>
 
                 <Label Grid.Column="0" Content="{DynamicResource RCON_ModeLabel}"/>
-                <ComboBox Name="InputModesComboBox" Grid.Column="1" ItemsSource="{Binding Source={StaticResource InputModes}}" SelectedItem="{Binding CurrentInputMode, Mode=TwoWay}" Margin="0,0,2,0"/>
+                <ComboBox Name="InputModesComboBox" Grid.Column="1" ItemsSource="{Binding ElementName=RCON, Path=RconInputModes}" SelectedValue="{Binding ElementName=RCON, Path=CurrentInputMode, Mode=TwoWay}" SelectedValuePath="ValueMember" DisplayMemberPath="DisplayMember" Margin="0,0,2,0"/>
                 <TextBox Name="ConsoleInput" TabIndex="0" Grid.Column="2" KeyUp="ConsoleInput_KeyUp" BorderBrush="LightGray" VerticalContentAlignment="Center" IsTabStop="True"/>
             </Grid>
         </Grid>
diff --git a/src/ARKServerManager/Windows/RCONWindow.xaml.cs b/src/ARKServerManager/Windows/RCONWindow.xaml.cs
index dd846b91..405d370d 100644
--- a/src/ARKServerManager/Windows/RCONWindow.xaml.cs
+++ b/src/ARKServerManager/Windows/RCONWindow.xaml.cs
@@ -1,10 +1,10 @@
 using ServerManagerTool.Common.Enums;
 using ServerManagerTool.Common.Extensions;
 using ServerManagerTool.Common.Lib;
+using ServerManagerTool.Common.Model;
 using ServerManagerTool.Common.Utils;
 using ServerManagerTool.Enums;
 using ServerManagerTool.Lib;
-using ServerManagerTool.Lib.ViewModel;
 using ServerManagerTool.Lib.ViewModel.RCON;
 using System;
 using System.Collections.Generic;
@@ -24,14 +24,6 @@ using WPFSharp.Globalizer;
 
 namespace ServerManagerTool
 {
-    [TypeConverter(typeof(EnumDescriptionTypeConverter))]
-    public enum InputMode
-    {
-        Command,
-        Global,
-        Broadcast,
-    }
-
     public enum InputWindowMode
     {
         None,
@@ -169,7 +161,7 @@ namespace ServerManagerTool
         private GlobalizedApplication _globalizer = GlobalizedApplication.Instance;
 
         public static readonly DependencyProperty CurrentConfigProperty = DependencyProperty.Register(nameof(CurrentConfig), typeof(Config), typeof(RCONWindow), new PropertyMetadata(Config.Default));
-        public static readonly DependencyProperty CurrentInputModeProperty = DependencyProperty.Register(nameof(CurrentInputMode), typeof(InputMode), typeof(RCONWindow), new PropertyMetadata(InputMode.Command));
+        public static readonly DependencyProperty CurrentInputModeProperty = DependencyProperty.Register(nameof(CurrentInputMode), typeof(string), typeof(RCONWindow), new PropertyMetadata(GameData.RCONINPUTMODE_COMMAND));
         public static readonly DependencyProperty PlayerFilteringProperty = DependencyProperty.Register(nameof(PlayerFiltering), typeof(PlayerFilterType), typeof(RCONWindow), new PropertyMetadata(PlayerFilterType.Online | PlayerFilterType.Offline | PlayerFilterType.Whitelisted));
         public static readonly DependencyProperty PlayerFilterStringProperty = DependencyProperty.Register(nameof(PlayerFilterString), typeof(string), typeof(RCONWindow), new PropertyMetadata(string.Empty));
         public static readonly DependencyProperty PlayerSortingProperty = DependencyProperty.Register(nameof(PlayerSorting), typeof(PlayerSortType), typeof(RCONWindow), new PropertyMetadata(PlayerSortType.Online));
@@ -177,12 +169,15 @@ namespace ServerManagerTool
         public static readonly DependencyProperty RCONParametersProperty = DependencyProperty.Register(nameof(RCONParameters), typeof(RCONParameters), typeof(RCONWindow), new PropertyMetadata(null));
         public static readonly DependencyProperty ScrollOnNewInputProperty = DependencyProperty.Register(nameof(ScrollOnNewInput), typeof(bool), typeof(RCONWindow), new PropertyMetadata(true));
         public static readonly DependencyProperty ServerRCONProperty = DependencyProperty.Register(nameof(ServerRCON), typeof(ServerRcon), typeof(RCONWindow), new PropertyMetadata(null));
+        public static readonly DependencyProperty RconInputModesProperty = DependencyProperty.Register(nameof(RconInputModes), typeof(ComboBoxItemList), typeof(RCONWindow), new PropertyMetadata(null));
 
         public RCONWindow(RCONParameters parameters)
         {
             InitializeComponent();
             WindowUtils.RemoveDefaultResourceDictionary(this, Config.Default.DefaultGlobalizationFile);
 
+            PopulateRconInputModesComboBox();
+
             this.CurrentInputWindowMode = InputWindowMode.None;
             this.PlayerFiltering = (PlayerFilterType)Config.Default.RCON_PlayerListFilter;
             this.PlayerSorting = (PlayerSortType)Config.Default.RCON_PlayerListSort;
@@ -259,9 +254,9 @@ namespace ServerManagerTool
             set { SetValue(CurrentConfigProperty, value); }
         }
 
-        public InputMode CurrentInputMode
+        public string CurrentInputMode
         {
-            get { return (InputMode)GetValue(CurrentInputModeProperty); }
+            get { return (string)GetValue(CurrentInputModeProperty); }
             set { SetValue(CurrentInputModeProperty, value); }
         }
 
@@ -306,6 +301,12 @@ namespace ServerManagerTool
             get { return (ServerRcon)GetValue(ServerRCONProperty); }
             set { SetValue(ServerRCONProperty, value); }
         }
+
+        public ComboBoxItemList RconInputModes
+        {
+            get { return (ComboBoxItemList)GetValue(RconInputModesProperty); }
+            set { SetValue(RconInputModesProperty, value); }
+        }
         #endregion
 
         #region Commands
@@ -685,13 +686,7 @@ namespace ServerManagerTool
 
         private void ResourceDictionaryChangedEvent(object source, ResourceDictionaryChangedEventArgs e)
         {
-            // refresh the InputModes combobox list
-            this.InputModesComboBox.Items.Refresh();
-
-            // refresh the InputModes combobox value
-            var currentInputMode = CurrentInputMode;
-            this.InputModesComboBox.SelectedItem = null;
-            this.InputModesComboBox.SelectedItem = currentInputMode;
+            PopulateRconInputModesComboBox();
         }
 
         protected override void OnClosed(EventArgs e)
@@ -796,29 +791,29 @@ namespace ServerManagerTool
                 {
                     if (commandText.StartsWith("/"))
                     {
-                        effectiveMode = InputMode.Command;
+                        effectiveMode = GameData.RCONINPUTMODE_COMMAND;
                         commandText = commandText.Substring(1);
                     }
 
                     switch (effectiveMode)
                     {
-                        case InputMode.Command:
+                        case GameData.RCONINPUTMODE_COMMAND:
                             this.ServerRCON.IssueCommand(commandText);
                             break;
 
-                        case InputMode.Broadcast:
-                            this.ServerRCON.IssueCommand($"{ServerRcon.RCON_COMMAND_BROADCAST} {commandText}");
-                            break;
-
-                        case InputMode.Global:
-                            if (!String.IsNullOrWhiteSpace(Config.Default.RCON_AdminName))
-                            {
-                                this.ServerRCON.IssueCommand($"{ServerRcon.RCON_COMMAND_SERVERCHAT} [{Config.Default.RCON_AdminName}] {commandText}");
-                            }
-                            else
+                        case "Global":
+                            if (string.IsNullOrWhiteSpace(Config.Default.RCON_AdminName))
                             {
                                 this.ServerRCON.IssueCommand($"{ServerRcon.RCON_COMMAND_SERVERCHAT} {commandText}");
                             }
+                            else
+                            {
+                                this.ServerRCON.IssueCommand($"{ServerRcon.RCON_COMMAND_SERVERCHAT} [{Config.Default.RCON_AdminName}] {commandText}");
+                            }
+                            break;
+
+                        default:
+                            this.ServerRCON.IssueCommand($"{effectiveMode} {commandText}");
                             break;
                     }
                 }
@@ -870,6 +865,24 @@ namespace ServerManagerTool
             windows.Clear();
         }
 
+        private void PopulateRconInputModesComboBox()
+        {
+            var selectedValue = this.InputModesComboBox?.SelectedValue ?? GameData.RCONINPUTMODE_COMMAND;
+            var list = new ComboBoxItemList();
+
+            foreach (var item in GameData.GetAllRconInputModes())
+            {
+                item.DisplayMember = GameData.FriendlyRconInputModeName(item.ValueMember);
+                list.Add(item);
+            }
+
+            this.RconInputModes = list;
+            if (this.InputModesComboBox != null)
+            {
+                this.InputModesComboBox.SelectedValue = selectedValue;
+            }
+        }
+
         private void SetPlayerListWidth(double value)
         {
             if (value < this.playerListColumn.MinWidth)
@@ -914,16 +927,28 @@ namespace ServerManagerTool
 
         private IEnumerable<Inline> FormatCommandInput(ConsoleCommand command)
         {
-            if (command.command.Equals(ServerRcon.RCON_COMMAND_BROADCAST, StringComparison.OrdinalIgnoreCase))
+            var commandValue = command?.command?.ToLower() ?? string.Empty;
+            if (string.IsNullOrWhiteSpace(commandValue))
             {
-                yield return new RCONOutput_Broadcast(command.args);
+                yield return new LineBreak();
             }
-            else
+
+            var found = false;
+            foreach (var item in GameData.GetMessageRconInputModes())
+            {
+                if (item.ValueMember.Equals(commandValue, StringComparison.OrdinalIgnoreCase))
+                {
+                    found = true;
+                    yield return new RCONOutput_Broadcast(command.args);
+                }
+            }
+
+            if (!found)
             {
                 yield return new RCONOutput_Command($"> {command.rawCommand}");
             }
 
-            if(!command.suppressOutput && !command.lines.IsEmpty())
+            if (!command.suppressOutput && !command.lines.IsEmpty())
             {
                 yield return new LineBreak();
             }
diff --git a/src/ConanServerManager.Common/Utils/GameDataUtils.cs b/src/ConanServerManager.Common/Utils/GameDataUtils.cs
index e30e1f4c..3462003b 100644
--- a/src/ConanServerManager.Common/Utils/GameDataUtils.cs
+++ b/src/ConanServerManager.Common/Utils/GameDataUtils.cs
@@ -32,6 +32,7 @@ namespace ServerManagerTool.Utils
                     data.GameMaps.AddRange(fileData.GameMaps);
                     data.Branches.AddRange(fileData.Branches);
                     data.ServerRegions.AddRange(fileData.ServerRegions);
+                    data.RconInputModes.AddRange(fileData.RconInputModes);
                 }
                 catch
                 {
@@ -90,6 +91,9 @@ namespace ServerManagerTool.Utils
         [DataMember(IsRequired = false)]
         public List<ServerRegionDataItem> ServerRegions = new List<ServerRegionDataItem>();
 
+        [DataMember(IsRequired = false)]
+        public List<RconInputModeItem> RconInputModes = new List<RconInputModeItem>();
+
         public static MainGameData Load(string file, bool isUserData)
         {
             if (string.IsNullOrWhiteSpace(file) || !File.Exists(file))
@@ -102,6 +106,7 @@ namespace ServerManagerTool.Utils
                 data.GameMaps.ForEach(c => c.IsUserData = isUserData);
                 data.Branches.ForEach(c => c.IsUserData = isUserData);
                 data.ServerRegions.ForEach(c => c.IsUserData = isUserData);
+                data.RconInputModes.ForEach(c => c.IsUserData = isUserData);
             }
             return data;
         }
@@ -148,4 +153,15 @@ namespace ServerManagerTool.Utils
 
         public bool IsUserData = false;
     }
+
+    [DataContract]
+    public class RconInputModeItem
+    {
+        [DataMember]
+        public string Command = string.Empty;
+        [DataMember]
+        public string Description = string.Empty;
+
+        public bool IsUserData = false;
+    }
 }
diff --git a/src/ConanServerManager/GameData/Conan.gamedata b/src/ConanServerManager/GameData/Conan.gamedata
index f26854b8..7b24677b 100644
--- a/src/ConanServerManager/GameData/Conan.gamedata
+++ b/src/ConanServerManager/GameData/Conan.gamedata
@@ -47,5 +47,19 @@
       "RegionNumber": "5",
       "Description": "Japan"
     }
+  ],
+  "RconInputModes": [
+    {
+      "Command": "Broadcast",
+      "Description": "Broadcast"
+    },
+    {
+      "Command": "Alert",
+      "Description": "Alert (requires Pippi mod)"
+    },
+    {
+      "Command": "Server",
+      "Description": "Server (requires Pippi mod)"
+    }
   ]
 }
\ No newline at end of file
diff --git a/src/ConanServerManager/Globalization/en-US/en-US.xaml b/src/ConanServerManager/Globalization/en-US/en-US.xaml
index 5bd906d6..40ea3a1c 100644
--- a/src/ConanServerManager/Globalization/en-US/en-US.xaml
+++ b/src/ConanServerManager/Globalization/en-US/en-US.xaml
@@ -81,6 +81,14 @@
     <sys:String x:Key="DiscordBotLogLevel_Debug">Debug</sys:String>
     <!--#endregion-->
 
+    <!--#region Rcon Message Modes -->
+    <sys:String x:Key="InputMode_Command">Command</sys:String>
+    <sys:String x:Key="InputMode_Global">Global</sys:String>
+    <sys:String x:Key="InputMode_Broadcast">Broadcast</sys:String>
+    <sys:String x:Key="InputMode_Alert">Alert (requires Pippi mod)</sys:String>
+    <sys:String x:Key="InputMode_Server">Server (requires Pippi mod)</sys:String>
+    <!--#endregion-->
+
     <!--#region Unit strings -->
     <sys:String x:Key="SliderUnits_Multiplier">x</sys:String>
     <sys:String x:Key="SliderUnits_Percentage">%</sys:String>
@@ -565,12 +573,6 @@
     <sys:String x:Key="RCON_ViewLogs_ErrorTitle">Can't open logs</sys:String>
     <sys:String x:Key="RCON_ViewLogs_ErrorLabel">Unable to open the logs directory at {0}. Please make sure this directory exists and that you have permission to access it.\nException: {1}</sys:String>
 
-    <sys:String x:Key="InputMode_Command">Command</sys:String>
-    <sys:String x:Key="InputMode_Global">Global</sys:String>
-    <sys:String x:Key="InputMode_Broadcast">Broadcast</sys:String>
-    <sys:String x:Key="InputMode_Alert">Alert (requires Pippi mod)</sys:String>
-    <sys:String x:Key="InputMode_Server">Server (requires Pippi mod)</sys:String>
-
     <sys:String x:Key="ConsoleStatus_Disconnected">Disconnected</sys:String>
     <sys:String x:Key="ConsoleStatus_Connected">Connected</sys:String>
 
diff --git a/src/ConanServerManager/Lib/GameData.cs b/src/ConanServerManager/Lib/GameData.cs
index bd2282e8..1c5d8c5c 100644
--- a/src/ConanServerManager/Lib/GameData.cs
+++ b/src/ConanServerManager/Lib/GameData.cs
@@ -10,6 +10,8 @@ namespace ServerManagerTool.Lib
 {
     public static class GameData
     {
+        public const string RCONINPUTMODE_COMMAND = "Command";
+
         public static string MainDataFolder = Path.Combine(Environment.CurrentDirectory, Config.Default.GameDataRelativePath);
         public static string UserDataFolder = Path.Combine(Config.Default.DataPath, Config.Default.GameDataRelativePath);
 
@@ -59,6 +61,17 @@ namespace ServerManagerTool.Lib
 
                 serverRegions = allServerRegions.ToArray();
             }
+
+            // rcon input modes
+            gameData.RconInputModes.AddRange(userGameData.RconInputModes);
+
+            if (gameData.RconInputModes.Count > 0)
+            {
+                var modes1 = rconInputModes.ToList();
+                modes1.AddRange(gameData.RconInputModes.Select(item => new ComboBoxItem { ValueMember = item.Command, DisplayMember = item.Description }));
+
+                rconInputModes = modes1.ToArray();
+            }
         }
 
         public static string FriendlyNameForClass(string className, bool returnNullIfNotFound = false) => string.IsNullOrWhiteSpace(className) ? (returnNullIfNotFound ? null : string.Empty) : GlobalizedApplication.Instance.GetResourceString(className) ?? (returnNullIfNotFound ? null : className);
@@ -94,5 +107,18 @@ namespace ServerManagerTool.Lib
 
         public static string FriendlyServerRegionName(string regionNumber, bool returnEmptyIfNotFound = false) => string.IsNullOrWhiteSpace(regionNumber) ? string.Empty : GlobalizedApplication.Instance.GetResourceString($"ServerRegion_{regionNumber}") ?? gameData?.ServerRegions?.FirstOrDefault(i => i.RegionNumber.Equals(regionNumber))?.Description ?? (returnEmptyIfNotFound ? string.Empty : regionNumber);
         #endregion
+
+        #region Rcon Message Modes
+        private static ComboBoxItem[] rconInputModes = new[]
+        {
+            new ComboBoxItem { ValueMember=RCONINPUTMODE_COMMAND, DisplayMember=FriendlyNameForClass($"InputMode_{RCONINPUTMODE_COMMAND}") },
+        };
+
+        public static IEnumerable<ComboBoxItem> GetAllRconInputModes() => rconInputModes.Select(m => m.Duplicate());
+
+        public static IEnumerable<ComboBoxItem> GetMessageRconInputModes() => rconInputModes.Where(m => !m.ValueMember.Equals(RCONINPUTMODE_COMMAND, StringComparison.OrdinalIgnoreCase)).Select(m => m.Duplicate());
+
+        public static string FriendlyRconInputModeName(string rconInputMode, bool returnEmptyIfNotFound = false) => string.IsNullOrWhiteSpace(rconInputMode) ? string.Empty : GlobalizedApplication.Instance.GetResourceString("InputMode_" + rconInputMode) ?? gameData?.RconInputModes?.FirstOrDefault(i => i.Command.Equals(rconInputMode))?.Description ?? (returnEmptyIfNotFound ? string.Empty : rconInputMode);
+        #endregion
     }
 }
diff --git a/src/ConanServerManager/Lib/ServerApp.cs b/src/ConanServerManager/Lib/ServerApp.cs
index 82b6a89e..c5b85eb7 100644
--- a/src/ConanServerManager/Lib/ServerApp.cs
+++ b/src/ConanServerManager/Lib/ServerApp.cs
@@ -2306,17 +2306,7 @@ namespace ServerManagerTool.Lib
 
         private static string GetRconMessageCommand(string commandValue)
         {
-            switch (commandValue.ToLower())
-            {
-                case "alert":
-                    return ServerRcon.RCON_COMMAND_ALERT;
-
-                case "server":
-                    return ServerRcon.RCON_COMMAND_SERVER;
-
-                default:
-                    return ServerRcon.RCON_COMMAND_BROADCAST;
-            }
+            return commandValue.ToLower();
         }
 
         public static string GetServerBackupFolder(ServerProfile profile)
diff --git a/src/ConanServerManager/Lib/ServerRcon.cs b/src/ConanServerManager/Lib/ServerRcon.cs
index 32dffffc..1c2a78dd 100644
--- a/src/ConanServerManager/Lib/ServerRcon.cs
+++ b/src/ConanServerManager/Lib/ServerRcon.cs
@@ -26,9 +26,6 @@ namespace ServerManagerTool.Lib
         private const string NoResponseMatch = "Server received, But no response!!";
         public const string NoResponseOutput = "NO_RESPONSE";
 
-        public const string RCON_COMMAND_BROADCAST = "broadcast";
-        public const string RCON_COMMAND_ALERT = "alert";
-        public const string RCON_COMMAND_SERVER = "server";
         public const string RCON_COMMAND_LISTPLAYERS = "listplayers";
 
         public event EventHandler PlayersCollectionUpdated;
@@ -274,22 +271,13 @@ namespace ServerManagerTool.Lib
                 command.suppressOutput = command.lines.Count() == 0;
             }
 
-            if (command?.command?.Equals(RCON_COMMAND_BROADCAST, StringComparison.OrdinalIgnoreCase) ?? false)
+            foreach (var item in GameData.GetMessageRconInputModes())
             {
-                LogEvent(LogEventType.Chat, command.rawCommand);
-                command.suppressOutput = true;
-            }
-
-            if (command?.command?.Equals(RCON_COMMAND_ALERT, StringComparison.OrdinalIgnoreCase) ?? false)
-            {
-                LogEvent(LogEventType.Chat, command.rawCommand);
-                command.suppressOutput = true;
-            }
-
-            if (command?.command?.Equals(RCON_COMMAND_SERVER, StringComparison.OrdinalIgnoreCase) ?? false)
-            {
-                LogEvent(LogEventType.Chat, command.rawCommand);
-                command.suppressOutput = true;
+                if (command?.command?.Equals(item.ValueMember, StringComparison.OrdinalIgnoreCase) ?? false)
+                {
+                    LogEvent(LogEventType.Chat, command.rawCommand);
+                    command.suppressOutput = true;
+                }
             }
         }
 
diff --git a/src/ConanServerManager/UserControls/GlobalSettingsControl.xaml.cs b/src/ConanServerManager/UserControls/GlobalSettingsControl.xaml.cs
index dc43aa07..5f4a389a 100644
--- a/src/ConanServerManager/UserControls/GlobalSettingsControl.xaml.cs
+++ b/src/ConanServerManager/UserControls/GlobalSettingsControl.xaml.cs
@@ -4,6 +4,7 @@ using ServerManagerTool.Common;
 using ServerManagerTool.Common.Lib;
 using ServerManagerTool.Common.Model;
 using ServerManagerTool.Common.Utils;
+using ServerManagerTool.Lib;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -550,13 +551,10 @@ namespace ServerManagerTool
             var selectedValue = this.RconMessageModesComboBox?.SelectedValue ?? Config.RCON_MessageCommand;
             var list = new ComboBoxItemList();
 
-            foreach (InputMode inputMode in Enum.GetValues(typeof(InputMode)))
+            foreach (var item in GameData.GetMessageRconInputModes())
             {
-                if (inputMode == InputMode.Command)
-                    continue;
-
-                var displayMember = _globalizer.GetResourceString($"InputMode_{inputMode}") ?? inputMode.ToString();
-                list.Add(new Common.Model.ComboBoxItem(inputMode.ToString(), displayMember));
+                item.DisplayMember = GameData.FriendlyRconInputModeName(item.ValueMember);
+                list.Add(item);
             }
 
             this.RconMessageModes = list;
diff --git a/src/ConanServerManager/Windows/RconWindow.xaml b/src/ConanServerManager/Windows/RconWindow.xaml
index 828fbaf2..d03c94bb 100644
--- a/src/ConanServerManager/Windows/RconWindow.xaml
+++ b/src/ConanServerManager/Windows/RconWindow.xaml
@@ -20,12 +20,6 @@
             </ResourceDictionary.MergedDictionaries>
 
             <sm:ScrollToBottomAction x:Key="ScrollToBottomAction" />
-            
-            <ObjectDataProvider MethodName="GetValues" ObjectType="{x:Type sys:Enum}" x:Key="InputModes">
-                <ObjectDataProvider.MethodParameters>
-                    <x:Type TypeName="sm:InputMode" />
-                </ObjectDataProvider.MethodParameters>
-            </ObjectDataProvider>
         </ResourceDictionary>
     </Window.Resources>
 
@@ -215,7 +209,7 @@
                 </Grid.ColumnDefinitions>
 
                 <Label Grid.Column="0" Content="{DynamicResource RCON_ModeLabel}"/>
-                <ComboBox Name="InputModesComboBox" Grid.Column="1" ItemsSource="{Binding Source={StaticResource InputModes}}" SelectedItem="{Binding CurrentInputMode, Mode=TwoWay}" Margin="0,0,2,0"/>
+                <ComboBox Name="InputModesComboBox" Grid.Column="1" ItemsSource="{Binding ElementName=RCON, Path=RconInputModes}" SelectedValue="{Binding ElementName=RCON, Path=CurrentInputMode, Mode=TwoWay}" SelectedValuePath="ValueMember" DisplayMemberPath="DisplayMember" Margin="0,0,2,0"/>
                 <TextBox Name="ConsoleInput" TabIndex="0" Grid.Column="2" KeyUp="ConsoleInput_KeyUp" BorderBrush="LightGray" VerticalContentAlignment="Center" IsTabStop="True"/>
             </Grid>
         </Grid>
diff --git a/src/ConanServerManager/Windows/RconWindow.xaml.cs b/src/ConanServerManager/Windows/RconWindow.xaml.cs
index 6599b251..84e4ca29 100644
--- a/src/ConanServerManager/Windows/RconWindow.xaml.cs
+++ b/src/ConanServerManager/Windows/RconWindow.xaml.cs
@@ -1,6 +1,6 @@
-using ServerManagerTool.Common.Enums;
-using ServerManagerTool.Common.Extensions;
+using ServerManagerTool.Common.Extensions;
 using ServerManagerTool.Common.Lib;
+using ServerManagerTool.Common.Model;
 using ServerManagerTool.Common.Utils;
 using ServerManagerTool.Enums;
 using ServerManagerTool.Lib;
@@ -23,15 +23,6 @@ using WPFSharp.Globalizer;
 
 namespace ServerManagerTool
 {
-    [TypeConverter(typeof(EnumDescriptionTypeConverter))]
-    public enum InputMode
-    {
-        Command,
-        Broadcast,
-        Alert,
-        Server,
-    }
-
     public enum InputWindowMode
     {
         None,
@@ -169,7 +160,7 @@ namespace ServerManagerTool
         private GlobalizedApplication _globalizer = GlobalizedApplication.Instance;
 
         public static readonly DependencyProperty ConfigProperty = DependencyProperty.Register(nameof(Config), typeof(Config), typeof(RconWindow), new PropertyMetadata(Config.Default));
-        public static readonly DependencyProperty CurrentInputModeProperty = DependencyProperty.Register(nameof(CurrentInputMode), typeof(InputMode), typeof(RconWindow), new PropertyMetadata(InputMode.Command));
+        public static readonly DependencyProperty CurrentInputModeProperty = DependencyProperty.Register(nameof(CurrentInputMode), typeof(string), typeof(RconWindow), new PropertyMetadata(GameData.RCONINPUTMODE_COMMAND));
         public static readonly DependencyProperty PlayerFilteringProperty = DependencyProperty.Register(nameof(PlayerFiltering), typeof(PlayerFilterType), typeof(RconWindow), new PropertyMetadata(PlayerFilterType.Online | PlayerFilterType.Offline));
         public static readonly DependencyProperty PlayerFilterStringProperty = DependencyProperty.Register(nameof(PlayerFilterString), typeof(string), typeof(RconWindow), new PropertyMetadata(string.Empty));
         public static readonly DependencyProperty PlayerSortingProperty = DependencyProperty.Register(nameof(PlayerSorting), typeof(PlayerSortType), typeof(RconWindow), new PropertyMetadata(PlayerSortType.Online));
@@ -177,12 +168,15 @@ namespace ServerManagerTool
         public static readonly DependencyProperty RconParametersProperty = DependencyProperty.Register(nameof(RconParameters), typeof(RconParameters), typeof(RconWindow), new PropertyMetadata(null));
         public static readonly DependencyProperty ScrollOnNewInputProperty = DependencyProperty.Register(nameof(ScrollOnNewInput), typeof(bool), typeof(RconWindow), new PropertyMetadata(true));
         public static readonly DependencyProperty ServerRconProperty = DependencyProperty.Register(nameof(ServerRcon), typeof(ServerRcon), typeof(RconWindow), new PropertyMetadata(null));
+        public static readonly DependencyProperty RconInputModesProperty = DependencyProperty.Register(nameof(RconInputModes), typeof(ComboBoxItemList), typeof(RconWindow), new PropertyMetadata(null));
 
         public RconWindow(RconParameters parameters)
         {
             InitializeComponent();
             WindowUtils.RemoveDefaultResourceDictionary(this, Config.Default.DefaultGlobalizationFile);
 
+            PopulateRconInputModesComboBox();
+
             this.CurrentInputWindowMode = InputWindowMode.None;
             this.PlayerFiltering = (PlayerFilterType)Config.Default.RCON_PlayerListFilter;
             this.PlayerSorting = (PlayerSortType)Config.Default.RCON_PlayerListSort;
@@ -215,8 +209,7 @@ namespace ServerManagerTool
                 _globalizer.GetResourceString("RCON_Comments_Line2"),
                 _globalizer.GetResourceString("RCON_Comments_Line3"),
                 _globalizer.GetResourceString("RCON_Comments_Line4"),
-                _globalizer.GetResourceString("RCON_Comments_Line5"),
-                String.Format(_globalizer.GetResourceString("RCON_Comments_Line6"), _globalizer.GetResourceString("RCON_Help_Keyword"))
+                _globalizer.GetResourceString("RCON_Comments_Line5")
             );
 
             if (this.RconParameters.WindowExtents.Width > 50 && this.RconParameters.WindowExtents.Height > 50)
@@ -254,9 +247,9 @@ namespace ServerManagerTool
             set { SetValue(ConfigProperty, value); }
         }
 
-        public InputMode CurrentInputMode
+        public string CurrentInputMode
         {
-            get { return (InputMode)GetValue(CurrentInputModeProperty); }
+            get { return (string)GetValue(CurrentInputModeProperty); }
             set { SetValue(CurrentInputModeProperty, value); }
         }
 
@@ -301,6 +294,12 @@ namespace ServerManagerTool
             get { return (ServerRcon)GetValue(ServerRconProperty); }
             set { SetValue(ServerRconProperty, value); }
         }
+
+        public ComboBoxItemList RconInputModes
+        {
+            get { return (ComboBoxItemList)GetValue(RconInputModesProperty); }
+            set { SetValue(RconInputModesProperty, value); }
+        }
         #endregion
 
         #region Commands
@@ -557,13 +556,7 @@ namespace ServerManagerTool
 
         private void ResourceDictionaryChangedEvent(object source, ResourceDictionaryChangedEventArgs e)
         {
-            // refresh the InputModes combobox list
-            this.InputModesComboBox.Items.Refresh();
-
-            // refresh the InputModes combobox value
-            var currentInputMode = CurrentInputMode;
-            this.InputModesComboBox.SelectedItem = null;
-            this.InputModesComboBox.SelectedItem = currentInputMode;
+            PopulateRconInputModesComboBox();
         }
 
         protected override void OnClosed(EventArgs e)
@@ -630,26 +623,18 @@ namespace ServerManagerTool
 
                 if (commandText.StartsWith("/"))
                 {
-                    effectiveMode = InputMode.Command;
+                    effectiveMode = GameData.RCONINPUTMODE_COMMAND;
                     commandText = commandText.Substring(1);
                 }
 
                 switch (effectiveMode)
                 {
-                    case InputMode.Command:
+                    case GameData.RCONINPUTMODE_COMMAND:
                         this.ServerRcon.IssueCommand(commandText);
                         break;
 
-                    case InputMode.Broadcast:
-                        this.ServerRcon.IssueCommand($"{ServerRcon.RCON_COMMAND_BROADCAST} {commandText}");
-                        break;
-
-                    case InputMode.Alert:
-                        this.ServerRcon.IssueCommand($"{ServerRcon.RCON_COMMAND_ALERT} {commandText}");
-                        break;
-
-                    case InputMode.Server:
-                        this.ServerRcon.IssueCommand($"{ServerRcon.RCON_COMMAND_SERVER} {commandText}");
+                    default:
+                        this.ServerRcon.IssueCommand($"{effectiveMode} {commandText}");
                         break;
                 }
 
@@ -708,6 +693,24 @@ namespace ServerManagerTool
                 this.playerListColumn.Width = new GridLength(value, GridUnitType.Pixel);
         }
 
+        private void PopulateRconInputModesComboBox()
+        {
+            var selectedValue = this.InputModesComboBox?.SelectedValue ?? GameData.RCONINPUTMODE_COMMAND;
+            var list = new ComboBoxItemList();
+
+            foreach (var item in GameData.GetAllRconInputModes())
+            {
+                item.DisplayMember = GameData.FriendlyRconInputModeName(item.ValueMember);
+                list.Add(item);
+            }
+
+            this.RconInputModes = list;
+            if (this.InputModesComboBox != null)
+            {
+                this.InputModesComboBox.SelectedValue = selectedValue;
+            }
+        }
+
         public void SortPlayers()
         {
             this.PlayersView.SortDescriptions.Clear();
@@ -744,19 +747,23 @@ namespace ServerManagerTool
 
         private IEnumerable<Inline> FormatCommandInput(ConsoleCommand command)
         {
-            if (command.command.Equals(ServerRcon.RCON_COMMAND_BROADCAST, StringComparison.OrdinalIgnoreCase))
+            var commandValue = command?.command?.ToLower() ?? string.Empty;
+            if (string.IsNullOrWhiteSpace(commandValue))
             {
-                yield return new RconOutput_Broadcast(command.args);
+                yield return new LineBreak();
             }
-            else if(command.command.Equals(ServerRcon.RCON_COMMAND_ALERT, StringComparison.OrdinalIgnoreCase))
+
+            var found = false;
+            foreach (var item in GameData.GetMessageRconInputModes())
             {
-                yield return new RconOutput_Broadcast(command.args);
+                if (item.ValueMember.Equals(commandValue, StringComparison.OrdinalIgnoreCase))
+                {
+                    found = true;
+                    yield return new RconOutput_Broadcast(command.args);
+                }
             }
-            else if(command.command.Equals(ServerRcon.RCON_COMMAND_SERVER, StringComparison.OrdinalIgnoreCase))
-            {
-                yield return new RconOutput_Broadcast(command.args);
-            }
-            else
+
+            if (!found)
             {
                 yield return new RconOutput_Command($"> {command.rawCommand}");
             }