From a6f2b6f912cbcc0ec61784da4ec4bbbce8a75fed Mon Sep 17 00:00:00 2001
From: Brett Hewitson <bletch1971@hotmail.com>
Date: Sat, 18 Dec 2021 12:17:58 +1000
Subject: [PATCH] Add a reset to default button to discord bot section. Added
 Discord Bot section to the profile sync list.

---
 src/ARKServerManager/ARKServerManager.csproj  |  2 +
 .../Enums/ServerProfileCategory.cs            |  1 +
 .../Enums/ServerSettingsCustomLevelsAction.cs | 12 +++
 .../Enums/ServerSettingsResetAction.cs        | 44 ++++++++++
 src/ARKServerManager/Lib/ServerProfile.cs     | 29 +++++++
 .../UserControls/ServerSettingsControl.xaml   | 86 ++++++++++---------
 .../ServerSettingsControl.xaml.cs             | 58 +------------
 src/ARKServerManager/VersionFeed.xml          |  6 +-
 src/ARKServerManager/VersionFeedBeta.xml      | 24 ++++++
 .../Windows/ProfileSyncWindow.xaml.cs         |  2 +
 .../ConanServerManager.csproj                 |  1 +
 .../Enums/ServerProfileCategory.cs            |  1 +
 .../Enums/ServerSettingsResetAction.cs        | 14 +++
 src/ConanServerManager/Lib/ServerProfile.cs   | 29 +++++++
 .../UserControls/ServerSettingsControl.xaml   | 12 ++-
 .../ServerSettingsControl.xaml.cs             | 17 +---
 src/ConanServerManager/VersionFeed.xml        |  6 +-
 src/ConanServerManager/VersionFeedBeta.xml    | 26 +++++-
 .../Windows/ProfileSyncWindow.xaml.cs         |  2 +
 19 files changed, 254 insertions(+), 118 deletions(-)
 create mode 100644 src/ARKServerManager/Enums/ServerSettingsCustomLevelsAction.cs
 create mode 100644 src/ARKServerManager/Enums/ServerSettingsResetAction.cs
 create mode 100644 src/ConanServerManager/Enums/ServerSettingsResetAction.cs

diff --git a/src/ARKServerManager/ARKServerManager.csproj b/src/ARKServerManager/ARKServerManager.csproj
index 380bd3cd..bd490e4e 100644
--- a/src/ARKServerManager/ARKServerManager.csproj
+++ b/src/ARKServerManager/ARKServerManager.csproj
@@ -184,6 +184,8 @@
     <Compile Include="Enums\ServerProcessStatus.cs" />
     <Compile Include="Enums\ServerProcessType.cs" />
     <Compile Include="Enums\ServerProfileCategory.cs" />
+    <Compile Include="Enums\ServerSettingsCustomLevelsAction.cs" />
+    <Compile Include="Enums\ServerSettingsResetAction.cs" />
     <Compile Include="Enums\ServerStatus.cs" />
     <Compile Include="Enums\StatsMultiplier.cs" />
     <Compile Include="Enums\AvailabilityStatus.cs" />
diff --git a/src/ARKServerManager/Enums/ServerProfileCategory.cs b/src/ARKServerManager/Enums/ServerProfileCategory.cs
index c923ae2e..12c68784 100644
--- a/src/ARKServerManager/Enums/ServerProfileCategory.cs
+++ b/src/ARKServerManager/Enums/ServerProfileCategory.cs
@@ -5,6 +5,7 @@
         Unknown,
         Administration,
         AutomaticManagement,
+        DiscordBot,
         Rules,
         ChatAndNotifications,
         HudAndVisuals,
diff --git a/src/ARKServerManager/Enums/ServerSettingsCustomLevelsAction.cs b/src/ARKServerManager/Enums/ServerSettingsCustomLevelsAction.cs
new file mode 100644
index 00000000..55fd9120
--- /dev/null
+++ b/src/ARKServerManager/Enums/ServerSettingsCustomLevelsAction.cs
@@ -0,0 +1,12 @@
+namespace ServerManagerTool.Enums
+{
+    public enum ServerSettingsCustomLevelsAction
+    {
+        ExportPlayerLevels,
+        ImportPlayerLevels,
+        UpdatePlayerXPCap,
+        ExportDinoLevels,
+        ImportDinoLevels,
+        UpdateDinoXPCap,
+    }
+}
diff --git a/src/ARKServerManager/Enums/ServerSettingsResetAction.cs b/src/ARKServerManager/Enums/ServerSettingsResetAction.cs
new file mode 100644
index 00000000..09b629fc
--- /dev/null
+++ b/src/ARKServerManager/Enums/ServerSettingsResetAction.cs
@@ -0,0 +1,44 @@
+namespace ServerManagerTool.Enums
+{
+    public enum ServerSettingsResetAction
+    {
+        // Sections
+        AdministrationSection,
+        DiscordBotSection,
+        RulesSection,
+        ChatAndNotificationsSection,
+        HudAndVisualsSection,
+        PlayerSettingsSection,
+        DinoSettingsSection,
+        EnvironmentSection,
+        StructuresSection,
+        EngramsSection,
+        CustomLevelsSection,
+        SOTFSection,
+        PGMSection,
+        MapSpawnerOverridesSection,
+        CraftingOverridesSection,
+        SupplyCrateOverridesSection,
+        StackSizeOverridesSection,
+        PreventTransferOverridesSection,
+
+        // Properties
+        MapNameTotalConversionProperty,
+        BanListProperty,
+
+        PlayerMaxXpProperty,
+        DinoMaxXpProperty,
+        PlayerBaseStatMultipliers,
+        PlayerPerLevelStatMultipliers,
+        DinoWildPerLevelStatMultipliers,
+        DinoTamedPerLevelStatMultipliers,
+        DinoTamedAddPerLevelStatMultipliers,
+        DinoTamedAffinityPerLevelStatMultipliers,
+        DinoWildMutagenLevelBoost,
+        DinoBredMutagenLevelBoost,
+        ItemStatClamps,
+        RCONWindowExtents,
+        ServerOptions,
+        ServerLogOptions,
+    }
+}
diff --git a/src/ARKServerManager/Lib/ServerProfile.cs b/src/ARKServerManager/Lib/ServerProfile.cs
index 09dc1038..ce9cf29c 100644
--- a/src/ARKServerManager/Lib/ServerProfile.cs
+++ b/src/ARKServerManager/Lib/ServerProfile.cs
@@ -5349,6 +5349,19 @@ namespace ServerManagerTool.Lib
             this.DinoSettings.RenderToView();
         }
 
+        public void ResetDiscordBotSection()
+        {
+            this.ClearValue(DiscordChannelIdProperty);
+            this.ClearValue(DiscordAliasProperty);
+
+            this.ClearValue(AllowDiscordBackupProperty);
+            this.ClearValue(AllowDiscordRestartProperty);
+            this.ClearValue(AllowDiscordShutdownProperty);
+            this.ClearValue(AllowDiscordStartProperty);
+            this.ClearValue(AllowDiscordStopProperty);
+            this.ClearValue(AllowDiscordUpdateProperty);
+        }
+
         public void ResetEngramsSection()
         {
             this.ClearValue(AutoUnlockAllEngramsProperty);
@@ -5695,6 +5708,9 @@ namespace ServerManagerTool.Lib
                 case ServerProfileCategory.AutomaticManagement:
                     SyncAutomaticManagement(sourceProfile);
                     break;
+                case ServerProfileCategory.DiscordBot:
+                    SyncDiscordBot(sourceProfile);
+                    break;
                 case ServerProfileCategory.Rules:
                     SyncRulesSection(sourceProfile);
                     break;
@@ -6016,6 +6032,19 @@ namespace ServerManagerTool.Lib
             this.DinoSettings.RenderToView();
         }
 
+        private void SyncDiscordBot(ServerProfile sourceProfile)
+        {
+            this.SetValue(DiscordChannelIdProperty, sourceProfile.DiscordChannelId);
+            this.SetValue(DiscordAliasProperty, sourceProfile.DiscordAlias);
+
+            this.SetValue(AllowDiscordBackupProperty, sourceProfile.AllowDiscordBackup);
+            this.SetValue(AllowDiscordRestartProperty, sourceProfile.AllowDiscordRestart);
+            this.SetValue(AllowDiscordShutdownProperty, sourceProfile.AllowDiscordShutdown);
+            this.SetValue(AllowDiscordStartProperty, sourceProfile.AllowDiscordStart);
+            this.SetValue(AllowDiscordStopProperty, sourceProfile.AllowDiscordStop);
+            this.SetValue(AllowDiscordUpdateProperty, sourceProfile.AllowDiscordUpdate);
+        }
+
         private void SyncEngramsSection(ServerProfile sourceProfile)
         {
             this.SetValue(AutoUnlockAllEngramsProperty, sourceProfile.AutoUnlockAllEngrams);
diff --git a/src/ARKServerManager/UserControls/ServerSettingsControl.xaml b/src/ARKServerManager/UserControls/ServerSettingsControl.xaml
index b845570c..434953fb 100644
--- a/src/ARKServerManager/UserControls/ServerSettingsControl.xaml
+++ b/src/ARKServerManager/UserControls/ServerSettingsControl.xaml
@@ -4,14 +4,13 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:mts="clr-namespace:Microsoft.Win32.TaskScheduler;assembly=Microsoft.Win32.TaskScheduler"
-             xmlns:local="clr-namespace:ServerManagerTool"
              xmlns:cctl="clr-namespace:ServerManagerTool.Common.Controls;assembly=ServerManager.Common"
              xmlns:cc="clr-namespace:ServerManagerTool.Common.Converters;assembly=ServerManager.Common"
              xmlns:clib="clr-namespace:ServerManagerTool.Common.Lib;assembly=ServerManager.Common"
              xmlns:cvr="clr-namespace:ServerManagerTool.Common.ValidationRules;assembly=ServerManager.Common"
              xmlns:com="clr-namespace:ServerManagerTool.Common;assembly=ServerManager.Common"
              xmlns:enum="clr-namespace:ServerManagerTool.Enums"
-             xmlns:acenum="clr-namespace:ServerManagerTool.Enums;assembly=ArkServerManager.Common"
+             xmlns:cenum="clr-namespace:ServerManagerTool.Enums;assembly=ArkServerManager.Common"
              xmlns:vm="clr-namespace:ServerManagerTool.Lib.ViewModel"
              xmlns:sys="clr-namespace:System;assembly=mscorlib"
              mc:Ignorable="d"
@@ -534,7 +533,7 @@
                                     <TextBlock Text="{DynamicResource ServerSettings_AdministrationSectionLabel}" Style="{StaticResource ExpanderHeaderTextStyle}"/>
                                     <Button Margin="20,0,0,0" ToolTip="{DynamicResource ServerSettings_ResetSectionTooltip}" Style="{StaticResource ButtonStyle1}"
                                             IsEnabled="{Binding ElementName=SectionAdministration, Path=IsExpanded}"
-                                            Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static local:ServerSettingsResetAction.AdministrationSection}">
+                                            Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static enum:ServerSettingsResetAction.AdministrationSection}">
                                         <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/Refresh.ico,Size=32}"/>
                                     </Button>
                                 </StackPanel>
@@ -709,7 +708,7 @@
                                         <Label    Grid.Row="0" Grid.Column="2" Margin="20,0,0,0" Content="{DynamicResource ServerSettings_RCONLogBufferLabel}" ToolTip="{DynamicResource ServerSettings_RCONLogBufferTooltip}" VerticalAlignment="Center"/>
                                         <TextBox  Grid.Row="0" Grid.Column="3" Margin="1,1,0,1" Text="{Binding RCONServerGameLogBuffer}" ToolTip="{DynamicResource ServerSettings_RCONLogBufferTooltip}" IsEnabled="{Binding RCONEnabled}" VerticalContentAlignment="Center" Width="100" HorizontalAlignment="Left"/>
 
-                                        <Button   Grid.Row="0" Grid.Column="5" Margin="1" Content="{StaticResource ResetRCONButtonContent}" ToolTip="{DynamicResource ServerSettings_RCONResetTooltip}" Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static local:ServerSettingsResetAction.RCONWindowExtents}" HorizontalAlignment="Right"/>
+                                        <Button   Grid.Row="0" Grid.Column="5" Margin="1" Content="{StaticResource ResetRCONButtonContent}" ToolTip="{DynamicResource ServerSettings_RCONResetTooltip}" Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static enum:ServerSettingsResetAction.RCONWindowExtents}" HorizontalAlignment="Right"/>
                                     </Grid>
                                 </GroupBox>
 
@@ -749,7 +748,7 @@
 
                                         <Label   Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Content="{DynamicResource ServerSettings_TotalConversionLabel}" ToolTip="{DynamicResource ServerSettings_TotalConversionTooltip}" VerticalAlignment="Center"/>
                                         <ComboBox Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2" Margin="1" Name="TotalConversionComboBox" ItemsSource="{Binding BaseTotalConversions, ElementName=SettingsControl}" SelectedValue="{Binding TotalConversionModId, Mode=TwoWay, UpdateSourceTrigger=Explicit}" SelectedValuePath="ValueMember" DisplayMemberPath="DisplayMember" IsEditable="True" ToolTip="{DynamicResource ServerSettings_TotalConversionTooltip}" LostFocus="ComboBoxItemList_LostFocus" PreviewMouseWheel="ComboBox_PreviewMouseWheel"/>
-                                        <Button  Grid.Row="1" Grid.Column="3" Width="22" Height="22" Margin="5,1,0,0" ToolTip="{DynamicResource ServerSettings_FindTotalConversionMapNameTooltip}" HorizontalAlignment="Left" Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static local:ServerSettingsResetAction.MapNameTotalConversionProperty}">
+                                        <Button  Grid.Row="1" Grid.Column="3" Width="22" Height="22" Margin="5,1,0,0" ToolTip="{DynamicResource ServerSettings_FindTotalConversionMapNameTooltip}" HorizontalAlignment="Left" Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static enum:ServerSettingsResetAction.MapNameTotalConversionProperty}">
                                             <Button.Style>
                                                 <Style BasedOn="{StaticResource ButtonStyle1}" TargetType="{x:Type Button}">
                                                     <Setter Property="Visibility" Value="Visible"/>
@@ -965,7 +964,7 @@
                                     <GroupBox.Header>
                                         <StackPanel Orientation="Horizontal">
                                             <Label Content="{DynamicResource ServerSettings_ServerOptionsLabel}"/>
-                                            <Button Margin="20,0,0,0" Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static local:ServerSettingsResetAction.ServerOptions}" ToolTip="{DynamicResource ServerSettings_ResetServerOptionsTooltip}" Style="{StaticResource ButtonStyle1}">
+                                            <Button Margin="20,0,0,0" Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static enum:ServerSettingsResetAction.ServerOptions}" ToolTip="{DynamicResource ServerSettings_ResetServerOptionsTooltip}" Style="{StaticResource ButtonStyle1}">
                                                 <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/Refresh.ico,Size=32}"/>
                                             </Button>
                                         </StackPanel>
@@ -1007,7 +1006,7 @@
                                         <DockPanel Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="4" HorizontalAlignment="Stretch">
                                             <CheckBox DockPanel.Dock="Left" Margin="5" Name="EnableBanListCheckbox" IsChecked="{Binding EnableBanListURL}" Content="{DynamicResource ServerSettings_UseBanListLabel}" VerticalAlignment="Center" ToolTip="{DynamicResource ServerSettings_UseBanListTooltip}"/>
                                             
-                                            <Button  DockPanel.Dock="Right" ToolTip="{DynamicResource ServerSettings_ResetBanlistTooltip}" Style="{StaticResource ButtonStyle1}" Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static local:ServerSettingsResetAction.BanListProperty}">
+                                            <Button  DockPanel.Dock="Right" ToolTip="{DynamicResource ServerSettings_ResetBanlistTooltip}" Style="{StaticResource ButtonStyle1}" Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static enum:ServerSettingsResetAction.BanListProperty}">
                                                 <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/Refresh.ico,Size=32}"/>
                                             </Button>
 
@@ -1191,7 +1190,7 @@
                                     <GroupBox.Header>
                                         <StackPanel Orientation="Horizontal">
                                             <Label Content="{DynamicResource ServerSettings_ServerLogOptionsLabel}"/>
-                                            <Button Margin="20,0,0,0" Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static local:ServerSettingsResetAction.ServerOptions}" ToolTip="{DynamicResource ServerSettings_ResetServerLogOptionsTooltip}" Style="{StaticResource ButtonStyle1}">
+                                            <Button Margin="20,0,0,0" Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static enum:ServerSettingsResetAction.ServerOptions}" ToolTip="{DynamicResource ServerSettings_ResetServerLogOptionsTooltip}" Style="{StaticResource ButtonStyle1}">
                                                 <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/Refresh.ico,Size=32}"/>
                                             </Button>
                                         </StackPanel>
@@ -1583,6 +1582,11 @@
                             <Expander.Header>
                                 <StackPanel Orientation="Horizontal">
                                     <TextBlock Text="{DynamicResource ServerSettings_DiscordBotLabel}" Style="{StaticResource ExpanderHeaderTextStyle}"/>
+                                    <Button Margin="20,0,0,0" ToolTip="{DynamicResource ServerSettings_ResetSectionTooltip}" Style="{StaticResource ButtonStyle1}"
+                                            IsEnabled="{Binding ElementName=SectionDiscordBot, Path=IsExpanded}"
+                                            Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static enum:ServerSettingsResetAction.DiscordBotSection}">
+                                        <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/Refresh.ico,Size=32}"/>
+                                    </Button>
                                 </StackPanel>
                             </Expander.Header>
 
@@ -1653,7 +1657,7 @@
                                     <TextBlock Text="{DynamicResource ServerSettings_RulesLabel}" Style="{StaticResource ExpanderHeaderTextStyle}"/>
                                     <Button Margin="20,0,0,0" ToolTip="{DynamicResource ServerSettings_ResetSectionTooltip}" Style="{StaticResource ButtonStyle1}"
                                             IsEnabled="{Binding ElementName=SectionRules, Path=IsExpanded}"
-                                            Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static local:ServerSettingsResetAction.RulesSection}">
+                                            Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static enum:ServerSettingsResetAction.RulesSection}">
                                         <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/Refresh.ico,Size=32}"/>
                                     </Button>
                                 </StackPanel>
@@ -2096,7 +2100,7 @@
                                     <TextBlock Text="{DynamicResource ServerSettings_ChatAndNotificationsLabel}" Style="{StaticResource ExpanderHeaderTextStyle}"/>
                                     <Button Margin="20,0,0,0" ToolTip="{DynamicResource ServerSettings_ResetSectionTooltip}" Style="{StaticResource ButtonStyle1}"
                                             IsEnabled="{Binding ElementName=SectionChatAndNotifications, Path=IsExpanded}" 
-                                            Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static local:ServerSettingsResetAction.ChatAndNotificationsSection}">
+                                            Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static enum:ServerSettingsResetAction.ChatAndNotificationsSection}">
                                         <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/Refresh.ico,Size=32}"/>
                                     </Button>
                                 </StackPanel>
@@ -2143,7 +2147,7 @@
                                     <TextBlock Text="{DynamicResource ServerSettings_HUDAndVisualsLabel}" Style="{StaticResource ExpanderHeaderTextStyle}"/>
                                     <Button Margin="20,0,0,0" ToolTip="{DynamicResource ServerSettings_ResetSectionTooltip}" Style="{StaticResource ButtonStyle1}"
                                             IsEnabled="{Binding ElementName=SectionHUDAndVisuals, Path=IsExpanded}"
-                                            Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static local:ServerSettingsResetAction.HudAndVisualsSection}">
+                                            Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static enum:ServerSettingsResetAction.HudAndVisualsSection}">
                                         <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/Refresh.ico,Size=32}"/>
                                     </Button>
                                 </StackPanel>
@@ -2195,7 +2199,7 @@
                                     <TextBlock Text="{DynamicResource ServerSettings_PlayerSettingsLabel}" Style="{StaticResource ExpanderHeaderTextStyle}"/>
                                     <Button Margin="20,0,0,0" ToolTip="{DynamicResource ServerSettings_ResetSectionTooltip}" Style="{StaticResource ButtonStyle1}"
                                             IsEnabled="{Binding ElementName=SectionPlayerSettings, Path=IsExpanded}"
-                                            Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static local:ServerSettingsResetAction.PlayerSettingsSection}">
+                                            Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static enum:ServerSettingsResetAction.PlayerSettingsSection}">
                                         <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/Refresh.ico,Size=32}"/>
                                     </Button>
                                 </StackPanel>
@@ -2233,7 +2237,7 @@
                                         <GroupBox.Header>
                                             <StackPanel Orientation="Horizontal">
                                                 <CheckBox x:Name="EnablePlayerBaseStatMultipliersCheckbox" Content="{DynamicResource ServerSettings_PlayerBaseStatMultipliersLabel}" IsChecked="{Binding PlayerBaseStatMultipliers.IsEnabled}" ToolTip="{DynamicResource ServerSettings_BaseStatMultipliersTooltip}" VerticalAlignment="Center"/>
-                                                <Button Margin="20,0,0,0" IsEnabled="{Binding ElementName=EnablePlayerBaseStatMultipliersCheckbox, Path=IsChecked}" Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static local:ServerSettingsResetAction.PlayerBaseStatMultipliers}" ToolTip="{DynamicResource ServerSettings_ResetBaseStatMultipliersTooltip}" Style="{StaticResource ButtonStyle1}">
+                                                <Button Margin="20,0,0,0" IsEnabled="{Binding ElementName=EnablePlayerBaseStatMultipliersCheckbox, Path=IsChecked}" Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static enum:ServerSettingsResetAction.PlayerBaseStatMultipliers}" ToolTip="{DynamicResource ServerSettings_ResetBaseStatMultipliersTooltip}" Style="{StaticResource ButtonStyle1}">
                                                     <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/Refresh.ico,Size=32}"/>
                                                 </Button>
                                             </StackPanel>
@@ -2268,7 +2272,7 @@
                                         <GroupBox.Header>
                                             <StackPanel Orientation="Horizontal">
                                                 <CheckBox x:Name="EnablePlayerPerLevelStatMultipliersCheckbox" Content="{DynamicResource ServerSettings_PlayerPerLevelStatMultipliersLabel}" IsChecked="{Binding PerLevelStatsMultiplier_Player.IsEnabled}" ToolTip="{DynamicResource ServerSettings_PerLevelStatMultipliersTooltip}" VerticalAlignment="Center"/>
-                                                <Button Margin="20,0,0,0" IsEnabled="{Binding ElementName=EnablePlayerPerLevelStatMultipliersCheckbox, Path=IsChecked}" Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static local:ServerSettingsResetAction.PlayerPerLevelStatMultipliers}" ToolTip="{DynamicResource ServerSettings_ResetPerLevelStatMultipliersTooltip}" Style="{StaticResource ButtonStyle1}">
+                                                <Button Margin="20,0,0,0" IsEnabled="{Binding ElementName=EnablePlayerPerLevelStatMultipliersCheckbox, Path=IsChecked}" Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static enum:ServerSettingsResetAction.PlayerPerLevelStatMultipliers}" ToolTip="{DynamicResource ServerSettings_ResetPerLevelStatMultipliersTooltip}" Style="{StaticResource ButtonStyle1}">
                                                     <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/Refresh.ico,Size=32}"/>
                                                 </Button>
                                             </StackPanel>
@@ -2308,7 +2312,7 @@
                                     <TextBlock Text="{DynamicResource ServerSettings_DinoSettingsLabel}" Style="{StaticResource ExpanderHeaderTextStyle}"/>
                                     <Button Margin="20,0,0,0" ToolTip="{DynamicResource ServerSettings_ResetSectionTooltip}" Style="{StaticResource ButtonStyle1}"
                                             IsEnabled="{Binding ElementName=SectionDinoSettings, Path=IsExpanded}" 
-                                            Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static local:ServerSettingsResetAction.DinoSettingsSection}">
+                                            Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static enum:ServerSettingsResetAction.DinoSettingsSection}">
                                         <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/Refresh.ico,Size=32}"/>
                                     </Button>
                                 </StackPanel>
@@ -2528,7 +2532,7 @@
                                                                     <DataTrigger Binding="{Binding HasClassName}" Value="False">
                                                                         <Setter Property="Visibility" Value="Hidden" />
                                                                     </DataTrigger>
-                                                                    <DataTrigger Binding="{Binding IsTameable}" Value="{x:Static acenum:DinoTamable.False}">
+                                                                    <DataTrigger Binding="{Binding IsTameable}" Value="{x:Static cenum:DinoTamable.False}">
                                                                         <Setter Property="Visibility" Value="Hidden" />
                                                                     </DataTrigger>
                                                                 </Style.Triggers>
@@ -2630,7 +2634,7 @@
                                                                     <DataTrigger Binding="{Binding HasClassName}" Value="False">
                                                                         <Setter Property="Visibility" Value="Hidden" />
                                                                     </DataTrigger>
-                                                                    <DataTrigger Binding="{Binding IsTameable}" Value="{x:Static acenum:DinoTamable.False}">
+                                                                    <DataTrigger Binding="{Binding IsTameable}" Value="{x:Static cenum:DinoTamable.False}">
                                                                         <Setter Property="Visibility" Value="Hidden" />
                                                                     </DataTrigger>
                                                                 </Style.Triggers>
@@ -2648,7 +2652,7 @@
                                                                     <DataTrigger Binding="{Binding HasClassName}" Value="False">
                                                                         <Setter Property="Visibility" Value="Hidden" />
                                                                     </DataTrigger>
-                                                                    <DataTrigger Binding="{Binding IsTameable}" Value="{x:Static acenum:DinoTamable.False}">
+                                                                    <DataTrigger Binding="{Binding IsTameable}" Value="{x:Static cenum:DinoTamable.False}">
                                                                         <Setter Property="Visibility" Value="Hidden" />
                                                                     </DataTrigger>
                                                                 </Style.Triggers>
@@ -2764,7 +2768,7 @@
                                         <GroupBox.Header>
                                             <StackPanel Orientation="Horizontal">
                                                 <CheckBox x:Name="EnableWildDinoPerLevelStatMultipliersCheckbox" Content="{DynamicResource ServerSettings_WildDinoPerLevelStatMultipliersLabel}" IsChecked="{Binding PerLevelStatsMultiplier_DinoWild.IsEnabled}" Margin="0,5,5,5" ToolTip="{DynamicResource ServerSettings_PerLevelStatMultipliersTooltip}"/>
-                                                <Button Margin="20,0,0,0" IsEnabled="{Binding ElementName=EnableWildDinoPerLevelStatMultipliersCheckbox, Path=IsChecked}" Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static local:ServerSettingsResetAction.DinoWildPerLevelStatMultipliers}" ToolTip="{DynamicResource ServerSettings_ResetPerLevelStatMultipliersTooltip}" Style="{StaticResource ButtonStyle1}">
+                                                <Button Margin="20,0,0,0" IsEnabled="{Binding ElementName=EnableWildDinoPerLevelStatMultipliersCheckbox, Path=IsChecked}" Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static enum:ServerSettingsResetAction.DinoWildPerLevelStatMultipliers}" ToolTip="{DynamicResource ServerSettings_ResetPerLevelStatMultipliersTooltip}" Style="{StaticResource ButtonStyle1}">
                                                     <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/Refresh.ico,Size=32}"/>
                                                 </Button>
                                             </StackPanel>
@@ -2798,7 +2802,7 @@
                                         <GroupBox.Header>
                                             <StackPanel Orientation="Horizontal">
                                                 <CheckBox x:Name="EnableTamedDinoPerLevelStatMultipliersCheckbox" Content="{DynamicResource ServerSettings_TamedDinoPerLevelStatMultipliersLabel}" IsChecked="{Binding PerLevelStatsMultiplier_DinoTamed.IsEnabled}" Margin="0,5,5,5" ToolTip="{DynamicResource ServerSettings_PerLevelStatTamedMultipliersTooltip}"/>
-                                                <Button Margin="20,0,0,0" IsEnabled="{Binding ElementName=EnableTamedDinoPerLevelStatMultipliersCheckbox, Path=IsChecked}" Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static local:ServerSettingsResetAction.DinoTamedPerLevelStatMultipliers}" ToolTip="{DynamicResource ServerSettings_ResetPerLevelStatMultipliersTooltip}" Style="{StaticResource ButtonStyle1}">
+                                                <Button Margin="20,0,0,0" IsEnabled="{Binding ElementName=EnableTamedDinoPerLevelStatMultipliersCheckbox, Path=IsChecked}" Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static enum:ServerSettingsResetAction.DinoTamedPerLevelStatMultipliers}" ToolTip="{DynamicResource ServerSettings_ResetPerLevelStatMultipliersTooltip}" Style="{StaticResource ButtonStyle1}">
                                                     <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/Refresh.ico,Size=32}"/>
                                                 </Button>
                                             </StackPanel>
@@ -2832,7 +2836,7 @@
                                         <GroupBox.Header>
                                             <StackPanel Orientation="Horizontal">
                                                 <CheckBox x:Name="EnableTamedDinoPerLevelStatAddMultipliersCheckbox" Content="{DynamicResource ServerSettings_TamedDinoPerLevelStatAddMultipliersLabel}" IsChecked="{Binding PerLevelStatsMultiplier_DinoTamed_Add.IsEnabled}" Margin="0,5,5,5" ToolTip="{DynamicResource ServerSettings_PerLevelStatTamedAddMultipliersTooltip}"/>
-                                                <Button Margin="20,0,0,0" IsEnabled="{Binding ElementName=EnableTamedDinoPerLevelStatAddMultipliersCheckbox, Path=IsChecked}" Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static local:ServerSettingsResetAction.DinoTamedAddPerLevelStatMultipliers}" ToolTip="{DynamicResource ServerSettings_ResetPerLevelStatMultipliersTooltip}" Style="{StaticResource ButtonStyle1}">
+                                                <Button Margin="20,0,0,0" IsEnabled="{Binding ElementName=EnableTamedDinoPerLevelStatAddMultipliersCheckbox, Path=IsChecked}" Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static enum:ServerSettingsResetAction.DinoTamedAddPerLevelStatMultipliers}" ToolTip="{DynamicResource ServerSettings_ResetPerLevelStatMultipliersTooltip}" Style="{StaticResource ButtonStyle1}">
                                                     <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/Refresh.ico,Size=32}"/>
                                                 </Button>
                                             </StackPanel>
@@ -2866,7 +2870,7 @@
                                         <GroupBox.Header>
                                             <StackPanel Orientation="Horizontal">
                                                 <CheckBox x:Name="EnableTamedDinoPerLevelStatAffinityMultipliersCheckbox" Content="{DynamicResource ServerSettings_TamedDinoPerLevelStatAffinityMultipliersLabel}" IsChecked="{Binding PerLevelStatsMultiplier_DinoTamed_Affinity.IsEnabled}" Margin="0,5,5,5" ToolTip="{DynamicResource ServerSettings_PerLevelStatTamedAffinityMultipliersTooltip}"/>
-                                                <Button Width="22" Height="22" Margin="20,0,0,0" IsEnabled="{Binding ElementName=EnableTamedDinoPerLevelStatAffinityMultipliersCheckbox, Path=IsChecked}" Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static local:ServerSettingsResetAction.DinoTamedAffinityPerLevelStatMultipliers}" ToolTip="{DynamicResource ServerSettings_ResetPerLevelStatMultipliersTooltip}" Style="{StaticResource ButtonStyle1}">
+                                                <Button Width="22" Height="22" Margin="20,0,0,0" IsEnabled="{Binding ElementName=EnableTamedDinoPerLevelStatAffinityMultipliersCheckbox, Path=IsChecked}" Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static enum:ServerSettingsResetAction.DinoTamedAffinityPerLevelStatMultipliers}" ToolTip="{DynamicResource ServerSettings_ResetPerLevelStatMultipliersTooltip}" Style="{StaticResource ButtonStyle1}">
                                                     <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/Refresh.ico,Size=32}"/>
                                                 </Button>
                                             </StackPanel>
@@ -2900,7 +2904,7 @@
                                         <GroupBox.Header>
                                             <StackPanel Orientation="Horizontal">
                                                 <CheckBox x:Name="EnableWildDinoMutagenLevelBoostCheckbox" Content="{DynamicResource ServerSettings_DinoWildMutagenLevelBoostLabel}" IsChecked="{Binding MutagenLevelBoost.IsEnabled}" Margin="0,5,5,5" ToolTip="{DynamicResource ServerSettings_DinoWildMutagenLevelBoostTooltip}"/>
-                                                <Button Width="22" Height="22" Margin="20,0,0,0" IsEnabled="{Binding ElementName=EnableWildDinoMutagenLevelBoostCheckbox, Path=IsChecked}" Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static local:ServerSettingsResetAction.DinoWildMutagenLevelBoost}" ToolTip="{DynamicResource ServerSettings_ResetPerLevelStatMultipliersTooltip}" Style="{StaticResource ButtonStyle1}">
+                                                <Button Width="22" Height="22" Margin="20,0,0,0" IsEnabled="{Binding ElementName=EnableWildDinoMutagenLevelBoostCheckbox, Path=IsChecked}" Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static enum:ServerSettingsResetAction.DinoWildMutagenLevelBoost}" ToolTip="{DynamicResource ServerSettings_ResetPerLevelStatMultipliersTooltip}" Style="{StaticResource ButtonStyle1}">
                                                     <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/Refresh.ico,Size=32}"/>
                                                 </Button>
                                             </StackPanel>
@@ -2934,7 +2938,7 @@
                                         <GroupBox.Header>
                                             <StackPanel Orientation="Horizontal">
                                                 <CheckBox x:Name="EnableBredDinoMutagenLevelBoostCheckbox" Content="{DynamicResource ServerSettings_DinoBredMutagenLevelBoostLabel}" IsChecked="{Binding MutagenLevelBoostBred.IsEnabled}" Margin="0,5,5,5" ToolTip="{DynamicResource ServerSettings_DinoBredMutagenLevelBoostTooltip}"/>
-                                                <Button Width="22" Height="22" Margin="20,0,0,0" IsEnabled="{Binding ElementName=EnableBredDinoMutagenLevelBoostCheckbox, Path=IsChecked}" Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static local:ServerSettingsResetAction.DinoBredMutagenLevelBoost}" ToolTip="{DynamicResource ServerSettings_ResetPerLevelStatMultipliersTooltip}" Style="{StaticResource ButtonStyle1}">
+                                                <Button Width="22" Height="22" Margin="20,0,0,0" IsEnabled="{Binding ElementName=EnableBredDinoMutagenLevelBoostCheckbox, Path=IsChecked}" Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static enum:ServerSettingsResetAction.DinoBredMutagenLevelBoost}" ToolTip="{DynamicResource ServerSettings_ResetPerLevelStatMultipliersTooltip}" Style="{StaticResource ButtonStyle1}">
                                                     <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/Refresh.ico,Size=32}"/>
                                                 </Button>
                                             </StackPanel>
@@ -3004,7 +3008,7 @@
                                     <TextBlock Text="{DynamicResource ServerSettings_EnvironmentLabel}" Style="{StaticResource ExpanderHeaderTextStyle}"/>
                                     <Button Margin="20,0,0,0" ToolTip="{DynamicResource ServerSettings_ResetSectionTooltip}" Style="{StaticResource ButtonStyle1}"
                                             IsEnabled="{Binding ElementName=SectionEnvironment, Path=IsExpanded}"
-                                            Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static local:ServerSettingsResetAction.EnvironmentSection}">
+                                            Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static enum:ServerSettingsResetAction.EnvironmentSection}">
                                         <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/Refresh.ico,Size=32}"/>
                                     </Button>
                                 </StackPanel>
@@ -3193,7 +3197,7 @@
                                     <TextBlock Text="{DynamicResource ServerSettings_StructuresLabel}" Style="{StaticResource ExpanderHeaderTextStyle}"/>
                                     <Button Margin="20,0,0,0" ToolTip="{DynamicResource ServerSettings_ResetSectionTooltip}" Style="{StaticResource ButtonStyle1}"
                                             IsEnabled="{Binding ElementName=SectionStructures, Path=IsExpanded}"
-                                            Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static local:ServerSettingsResetAction.StructuresSection}">
+                                            Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static enum:ServerSettingsResetAction.StructuresSection}">
                                         <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/Refresh.ico,Size=32}"/>
                                     </Button>
                                 </StackPanel>
@@ -3314,7 +3318,7 @@
                                     <TextBlock Text="{DynamicResource ServerSettings_EngramsLabel}" Style="{StaticResource ExpanderHeaderTextStyle}"/>
                                     <Button Margin="20,0,0,0" ToolTip="{DynamicResource ServerSettings_ResetSectionTooltip}" Style="{StaticResource ButtonStyle1}"
                                             IsEnabled="{Binding ElementName=SectionEngrams, Path=IsExpanded}"
-                                            Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static local:ServerSettingsResetAction.EngramsSection}">
+                                            Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static enum:ServerSettingsResetAction.EngramsSection}">
                                         <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/Refresh.ico,Size=32}"/>
                                     </Button>
                                 </StackPanel>
@@ -4466,7 +4470,7 @@
                                     <TextBlock Text="{DynamicResource ServerSettings_LevelProgressionsLabel}" Style="{StaticResource ExpanderHeaderTextStyle}"/>
                                     <Button Margin="20,0,0,0" ToolTip="{DynamicResource ServerSettings_ResetSectionTooltip}" Style="{StaticResource ButtonStyle1}"
                                             IsEnabled="{Binding ElementName=SectionCustomLevels, Path=IsExpanded}"
-                                            Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static local:ServerSettingsResetAction.CustomLevelsSection}">
+                                            Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static enum:ServerSettingsResetAction.CustomLevelsSection}">
                                         <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/Refresh.ico,Size=32}"/>
                                     </Button>
                                 </StackPanel>
@@ -4531,13 +4535,13 @@
                                             <Button Margin="5,0,0,0" Click="PlayerLevels_ResetOfficial" IsEnabled="{Binding EnableLevelProgressions}" ToolTip="{DynamicResource ServerSettings_ResetToOfficialDefaultsTooltip}" Style="{StaticResource ButtonStyle1}">
                                                 <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/Refresh.ico,Size=32}"/>
                                             </Button>
-                                            <Button Margin="20,0,0,0" ToolTip="{DynamicResource ServerSettings_UpdateLevelsTooltip}" IsEnabled="{Binding EnableLevelProgressions}" Command="{Binding CustomLevelActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static local:ServerSettingsCustomLevelsAction.UpdatePlayerXPCap}" Style="{StaticResource ButtonStyle1}">
+                                            <Button Margin="20,0,0,0" ToolTip="{DynamicResource ServerSettings_UpdateLevelsTooltip}" IsEnabled="{Binding EnableLevelProgressions}" Command="{Binding CustomLevelActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static enum:ServerSettingsCustomLevelsAction.UpdatePlayerXPCap}" Style="{StaticResource ButtonStyle1}">
                                                 <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/Edit.ico,Size=32}"/>
                                             </Button>
-                                            <Button Margin="20,0,0,0" ToolTip="{DynamicResource ServerSettings_ImportLevelsTooltip}" IsEnabled="{Binding EnableLevelProgressions}" Command="{Binding CustomLevelActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static local:ServerSettingsCustomLevelsAction.ImportPlayerLevels}" Style="{StaticResource ButtonStyle1}">
+                                            <Button Margin="20,0,0,0" ToolTip="{DynamicResource ServerSettings_ImportLevelsTooltip}" IsEnabled="{Binding EnableLevelProgressions}" Command="{Binding CustomLevelActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static enum:ServerSettingsCustomLevelsAction.ImportPlayerLevels}" Style="{StaticResource ButtonStyle1}">
                                                 <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/FolderImport.ico,Size=32}"/>
                                             </Button>
-                                            <Button Margin="5,0,0,0" ToolTip="{DynamicResource ServerSettings_ExportLevelsTooltip}" IsEnabled="{Binding EnableLevelProgressions}" Command="{Binding CustomLevelActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static local:ServerSettingsCustomLevelsAction.ExportPlayerLevels}" Style="{StaticResource ButtonStyle1}">
+                                            <Button Margin="5,0,0,0" ToolTip="{DynamicResource ServerSettings_ExportLevelsTooltip}" IsEnabled="{Binding EnableLevelProgressions}" Command="{Binding CustomLevelActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static enum:ServerSettingsCustomLevelsAction.ExportPlayerLevels}" Style="{StaticResource ButtonStyle1}">
                                                 <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/FolderExport.ico,Size=32}"/>
                                             </Button>
                                         </StackPanel>
@@ -4622,13 +4626,13 @@
                                             <Button Margin="5,0,0,0" Click="DinoLevels_ResetOfficial"  IsEnabled="{Binding EnableDinoLevelProgressions}" ToolTip="{DynamicResource ServerSettings_ResetToOfficialDefaultsTooltip}" Style="{StaticResource ButtonStyle1}">
                                                 <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/Refresh.ico,Size=32}"/>
                                             </Button>
-                                            <Button Margin="20,0,0,0" ToolTip="{DynamicResource ServerSettings_UpdateLevelsTooltip}" IsEnabled="{Binding EnableDinoLevelProgressions}" Command="{Binding CustomLevelActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static local:ServerSettingsCustomLevelsAction.UpdateDinoXPCap}" Style="{StaticResource ButtonStyle1}">
+                                            <Button Margin="20,0,0,0" ToolTip="{DynamicResource ServerSettings_UpdateLevelsTooltip}" IsEnabled="{Binding EnableDinoLevelProgressions}" Command="{Binding CustomLevelActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static enum:ServerSettingsCustomLevelsAction.UpdateDinoXPCap}" Style="{StaticResource ButtonStyle1}">
                                                 <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/Edit.ico,Size=32}"/>
                                             </Button>
-                                            <Button Margin="20,0,0,0" ToolTip="{DynamicResource ServerSettings_ImportLevelsTooltip}" IsEnabled="{Binding EnableDinoLevelProgressions}" Command="{Binding CustomLevelActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static local:ServerSettingsCustomLevelsAction.ImportDinoLevels}" Style="{StaticResource ButtonStyle1}">
+                                            <Button Margin="20,0,0,0" ToolTip="{DynamicResource ServerSettings_ImportLevelsTooltip}" IsEnabled="{Binding EnableDinoLevelProgressions}" Command="{Binding CustomLevelActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static enum:ServerSettingsCustomLevelsAction.ImportDinoLevels}" Style="{StaticResource ButtonStyle1}">
                                                 <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/FolderImport.ico,Size=32}"/>
                                             </Button>
-                                            <Button Margin="5,0,0,0" ToolTip="{DynamicResource ServerSettings_ExportLevelsTooltip}" IsEnabled="{Binding EnableDinoLevelProgressions}" Command="{Binding CustomLevelActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static local:ServerSettingsCustomLevelsAction.ExportDinoLevels}" Style="{StaticResource ButtonStyle1}">
+                                            <Button Margin="5,0,0,0" ToolTip="{DynamicResource ServerSettings_ExportLevelsTooltip}" IsEnabled="{Binding EnableDinoLevelProgressions}" Command="{Binding CustomLevelActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static enum:ServerSettingsCustomLevelsAction.ExportDinoLevels}" Style="{StaticResource ButtonStyle1}">
                                                 <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/FolderExport.ico,Size=32}"/>
                                             </Button>
                                         </StackPanel>
@@ -4684,7 +4688,7 @@
                                     <TextBlock Text="{DynamicResource ServerSettings_CraftingOverridesLabel}" Style="{StaticResource ExpanderHeaderTextStyle}"/>
                                     <Button Margin="20,0,0,0" ToolTip="{DynamicResource ServerSettings_ResetSectionTooltip}" Style="{StaticResource ButtonStyle1}"
                                             IsEnabled="{Binding ElementName=SectionCraftingOverrides, Path=IsExpanded}"
-                                            Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static local:ServerSettingsResetAction.CraftingOverridesSection}">
+                                            Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static enum:ServerSettingsResetAction.CraftingOverridesSection}">
                                         <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/Refresh.ico,Size=32}"/>
                                     </Button>
                                 </StackPanel>
@@ -4880,7 +4884,7 @@
                                     <TextBlock Text="{DynamicResource ServerSettings_StackSizeOverridesLabel}" Style="{StaticResource ExpanderHeaderTextStyle}"/>
                                     <Button Margin="20,0,0,0" ToolTip="{DynamicResource ServerSettings_ResetSectionTooltip}" Style="{StaticResource ButtonStyle1}"
                                             IsEnabled="{Binding ElementName=SectionStackSizeOverrides, Path=IsExpanded}"
-                                            Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static local:ServerSettingsResetAction.StackSizeOverridesSection}">
+                                            Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static enum:ServerSettingsResetAction.StackSizeOverridesSection}">
                                         <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/Refresh.ico,Size=32}"/>
                                     </Button>
                                 </StackPanel>
@@ -5019,7 +5023,7 @@
                                     <TextBlock Text="{DynamicResource ServerSettings_MapSpawnerOverridesLabel}" Style="{StaticResource ExpanderHeaderTextStyle}"/>
                                     <Button Margin="20,0,0,0" ToolTip="{DynamicResource ServerSettings_ResetSectionTooltip}" Style="{StaticResource ButtonStyle1}"
                                             IsEnabled="{Binding ElementName=SectionMapSpawnerOverrides, Path=IsExpanded}"
-                                            Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static local:ServerSettingsResetAction.MapSpawnerOverridesSection}">
+                                            Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static enum:ServerSettingsResetAction.MapSpawnerOverridesSection}">
                                         <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/Refresh.ico,Size=32}"/>
                                     </Button>
                                 </StackPanel>
@@ -5219,7 +5223,7 @@
                                     <TextBlock Text="{DynamicResource ServerSettings_SupplyCrateOverridesLabel}" Style="{StaticResource ExpanderHeaderTextStyle}"/>
                                     <Button Margin="20,0,0,0" ToolTip="{DynamicResource ServerSettings_ResetSectionTooltip}" Style="{StaticResource ButtonStyle1}"
                                             IsEnabled="{Binding ElementName=SectionSupplyCrateOverrides, Path=IsExpanded}"
-                                            Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static local:ServerSettingsResetAction.SupplyCrateOverridesSection}">
+                                            Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static enum:ServerSettingsResetAction.SupplyCrateOverridesSection}">
                                         <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/Refresh.ico,Size=32}"/>
                                     </Button>
                                 </StackPanel>
@@ -5753,7 +5757,7 @@
                                     <TextBlock Text="{DynamicResource ServerSettings_PreventTransferOverridesLabel}" Style="{StaticResource ExpanderHeaderTextStyle}"/>
                                     <Button Margin="20,0,0,0" ToolTip="{DynamicResource ServerSettings_ResetSectionTooltip}" Style="{StaticResource ButtonStyle1}"
                                             IsEnabled="{Binding ElementName=SectionPreventTransferOverrides, Path=IsExpanded}"
-                                            Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static local:ServerSettingsResetAction.PreventTransferOverridesSection}">
+                                            Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static enum:ServerSettingsResetAction.PreventTransferOverridesSection}">
                                         <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/Refresh.ico,Size=32}"/>
                                     </Button>
                                 </StackPanel>
@@ -5870,7 +5874,7 @@
                                     <TextBlock Text="{DynamicResource ServerSettings_PGMLabel}" Style="{StaticResource ExpanderHeaderTextStyle}"/>
                                     <Button Margin="20,0,0,0" ToolTip="{DynamicResource ServerSettings_ResetSectionTooltip}" Style="{StaticResource ButtonStyle1}"
                                             IsEnabled="{Binding ElementName=SectionPGM, Path=IsExpanded}"
-                                            Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static local:ServerSettingsResetAction.PGMSection}">
+                                            Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static enum:ServerSettingsResetAction.PGMSection}">
                                         <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/Refresh.ico,Size=32}"/>
                                     </Button>
                                 </StackPanel>
@@ -6162,7 +6166,7 @@
                                     <TextBlock Text="{DynamicResource ServerSettings_SOTFLabel}" Style="{StaticResource ExpanderHeaderTextStyle}"/>
                                     <Button Margin="20,0,0,0" ToolTip="{DynamicResource ServerSettings_ResetSectionTooltip}" Style="{StaticResource ButtonStyle1}"
                                             IsEnabled="{Binding ElementName=SectionSOTF, Path=IsExpanded}"
-                                            Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static local:ServerSettingsResetAction.SOTFSection}">
+                                            Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static enum:ServerSettingsResetAction.SOTFSection}">
                                         <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/Refresh.ico,Size=32}"/>
                                     </Button>
                                 </StackPanel>
diff --git a/src/ARKServerManager/UserControls/ServerSettingsControl.xaml.cs b/src/ARKServerManager/UserControls/ServerSettingsControl.xaml.cs
index a33660d6..7c198fdb 100644
--- a/src/ARKServerManager/UserControls/ServerSettingsControl.xaml.cs
+++ b/src/ARKServerManager/UserControls/ServerSettingsControl.xaml.cs
@@ -28,60 +28,6 @@ using WPFSharp.Globalizer;
 
 namespace ServerManagerTool
 {
-    public enum ServerSettingsCustomLevelsAction
-    {
-        ExportPlayerLevels,
-        ImportPlayerLevels,
-        UpdatePlayerXPCap,
-        ExportDinoLevels,
-        ImportDinoLevels,
-        UpdateDinoXPCap,
-    }
-
-    public enum ServerSettingsResetAction
-    {
-        // Sections
-        AdministrationSection,
-        RulesSection,
-        ChatAndNotificationsSection,
-        HudAndVisualsSection,
-        PlayerSettingsSection,
-        DinoSettingsSection,
-        EnvironmentSection,
-        StructuresSection,
-        EngramsSection,
-        CustomLevelsSection,
-        SOTFSection,
-        PGMSection,
-        MapSpawnerOverridesSection,
-        CraftingOverridesSection,
-        SupplyCrateOverridesSection,
-        StackSizeOverridesSection,
-        PreventTransferOverridesSection,
-
-        // Properties
-        MapNameTotalConversionProperty,
-        BanListProperty,
-
-        PlayerMaxXpProperty,
-        DinoMaxXpProperty,
-        PlayerBaseStatMultipliers,
-        PlayerPerLevelStatMultipliers,
-        DinoWildPerLevelStatMultipliers,
-        DinoTamedPerLevelStatMultipliers,
-        DinoTamedAddPerLevelStatMultipliers,
-        DinoTamedAffinityPerLevelStatMultipliers,
-        DinoWildMutagenLevelBoost,
-        DinoBredMutagenLevelBoost,
-        ItemStatClamps,
-        RCONWindowExtents,
-        ServerOptions,
-        ServerLogOptions,
-    }
-
-    /// <summary>
-    /// Interaction logic for ServerSettings.xaml
-    /// </summary>
     partial class ServerSettingsControl : UserControl
     {
         private readonly GlobalizedApplication _globalizer = GlobalizedApplication.Instance;
@@ -4019,6 +3965,10 @@ namespace ServerManagerTool
                                 RefreshProcessPrioritiesList();
                                 break;
 
+                            case ServerSettingsResetAction.DiscordBotSection:
+                                this.Settings.ResetDiscordBotSection();
+                                break;
+
                             case ServerSettingsResetAction.ChatAndNotificationsSection:
                                 this.Settings.ResetChatAndNotificationSection();
                                 break;
diff --git a/src/ARKServerManager/VersionFeed.xml b/src/ARKServerManager/VersionFeed.xml
index 8052dd3e..928c5a32 100644
--- a/src/ARKServerManager/VersionFeed.xml
+++ b/src/ARKServerManager/VersionFeed.xml
@@ -9,8 +9,8 @@
 
   <entry>
     <id>urn:uuid:3E33DCB2-ECFE-4489-B1A4-56F5D386F9DC</id>
-    <title>1.1.413 (1.1.413.9)</title>
-    <summary>1.1.413.9</summary>
+    <title>1.1.413 (1.1.413.10)</title>
+    <summary>1.1.413.10</summary>
     <link href="" />
     <updated>2021-12-18T00:00:00Z</updated>
     <content type="xhtml">
@@ -30,6 +30,8 @@
           <ul>
             <li>Discord Bot - all commands are now case INsensitive, along with the profile id and the alias.</li>
             <li>Discord Bot - removed the mandatory requirement to enter the '!' after the discord prefix. The '!' has been added to the existing prefix so no change to existing functionality, but you can now change it.</li>
+            <li>Server Settings - Discord Bot section - Add a reset to default button.</li>
+            <li>Profile Sync - Added Discord Bot section to the list.</li>
             <li>Made changes to the code to help improve performance.</li>
             <li>pt-BR Translation file updated.</li>
             <li>ru-RU Translation file updated.</li>
diff --git a/src/ARKServerManager/VersionFeedBeta.xml b/src/ARKServerManager/VersionFeedBeta.xml
index 47889223..b9dc08e5 100644
--- a/src/ARKServerManager/VersionFeedBeta.xml
+++ b/src/ARKServerManager/VersionFeedBeta.xml
@@ -7,6 +7,30 @@
   <link href="http://arkservermanager.freeforums.net/" />
   <updated>2021-12-16T00:00:00Z</updated>
 
+  <entry>
+    <id>urn:uuid:D1CFECED-7968-47FD-B1DE-2FECD7878BDA</id>
+    <title>1.1.413 (1.1.413.10)</title>
+    <summary>1.1.413.10</summary>
+    <link href="" />
+    <updated>2021-12-18T00:00:00Z</updated>
+    <content type="xhtml">
+      <div xmlns="http://www.w3.org/1999/xhtml" style="font-family: Arial, Verdana, Helvetica, Sans-Serif;font-size: .8em;">
+        <p>
+          <u style="font-size: .9em;">CHANGE</u>
+          <br/>
+          <ul>
+            <li>Server Settings - Discord Bot section - Add a reset to default button.</li>
+            <li>Profile Sync - Added Discord Bot section to the list.</li>
+          </ul>
+        </p>
+      </div>
+    </content>
+    <author>
+      <name>bletch</name>
+      <email>bletch1971@hotmail.com</email>
+    </author>
+  </entry>
+
   <entry>
     <id>urn:uuid:1B7448FB-E4E0-4E0F-BF87-AE8661AA7D93</id>
     <title>1.1.413 (1.1.413.9)</title>
diff --git a/src/ARKServerManager/Windows/ProfileSyncWindow.xaml.cs b/src/ARKServerManager/Windows/ProfileSyncWindow.xaml.cs
index aefcf251..368e51e9 100644
--- a/src/ARKServerManager/Windows/ProfileSyncWindow.xaml.cs
+++ b/src/ARKServerManager/Windows/ProfileSyncWindow.xaml.cs
@@ -215,6 +215,8 @@ namespace ServerManagerTool
 
             SyncSections.Add(new SyncSection() { Selected = false, Category = ServerProfileCategory.Administration, SectionName = _globalizer.GetResourceString("ServerSettings_AdministrationSectionLabel") });
             SyncSections.Add(new SyncSection() { Selected = false, Category = ServerProfileCategory.AutomaticManagement, SectionName = _globalizer.GetResourceString("ServerSettings_AutomaticManagementLabel") });
+            if (Config.Default.DiscordBotEnabled)
+                SyncSections.Add(new SyncSection() { Selected = false, Category = ServerProfileCategory.DiscordBot, SectionName = _globalizer.GetResourceString("ServerSettings_DiscordBotLabel") });
             SyncSections.Add(new SyncSection() { Selected = false, Category = ServerProfileCategory.Rules, SectionName = _globalizer.GetResourceString("ServerSettings_RulesLabel") });
             SyncSections.Add(new SyncSection() { Selected = false, Category = ServerProfileCategory.ChatAndNotifications, SectionName = _globalizer.GetResourceString("ServerSettings_ChatAndNotificationsLabel") });
             SyncSections.Add(new SyncSection() { Selected = false, Category = ServerProfileCategory.HudAndVisuals, SectionName = _globalizer.GetResourceString("ServerSettings_HUDAndVisualsLabel") });
diff --git a/src/ConanServerManager/ConanServerManager.csproj b/src/ConanServerManager/ConanServerManager.csproj
index 9bfc02b9..2cb68cae 100644
--- a/src/ConanServerManager/ConanServerManager.csproj
+++ b/src/ConanServerManager/ConanServerManager.csproj
@@ -160,6 +160,7 @@
       <SubType>Designer</SubType>
     </ApplicationDefinition>
     <Compile Include="Delegates\ServerStatusChangeDelegate.cs" />
+    <Compile Include="Enums\ServerSettingsResetAction.cs" />
     <Compile Include="Lib\Model\PlayerListParameters.cs" />
     <Compile Include="Lib\Model\RconParameters.cs" />
     <Compile Include="Lib\Serialization\IniFileEntryAttribute.cs" />
diff --git a/src/ConanServerManager/Enums/ServerProfileCategory.cs b/src/ConanServerManager/Enums/ServerProfileCategory.cs
index 049fa72f..6319d9cc 100644
--- a/src/ConanServerManager/Enums/ServerProfileCategory.cs
+++ b/src/ConanServerManager/Enums/ServerProfileCategory.cs
@@ -4,6 +4,7 @@
     {
         Administration,
         AutomaticManagement,
+        DiscordBot,
         ServerFiles,
     }
 }
diff --git a/src/ConanServerManager/Enums/ServerSettingsResetAction.cs b/src/ConanServerManager/Enums/ServerSettingsResetAction.cs
new file mode 100644
index 00000000..5441d7b1
--- /dev/null
+++ b/src/ConanServerManager/Enums/ServerSettingsResetAction.cs
@@ -0,0 +1,14 @@
+namespace ServerManagerTool.Enums
+{
+    public enum ServerSettingsResetAction
+    {
+        // Sections
+        AdministrationSection,
+        DiscordBotSection,
+
+        // Properties
+        RconWindowExtents,
+        PlayerMaxXpProperty,
+        ServerOptions,
+    }
+}
diff --git a/src/ConanServerManager/Lib/ServerProfile.cs b/src/ConanServerManager/Lib/ServerProfile.cs
index cc62450c..083c5e64 100644
--- a/src/ConanServerManager/Lib/ServerProfile.cs
+++ b/src/ConanServerManager/Lib/ServerProfile.cs
@@ -1451,6 +1451,19 @@ namespace ServerManagerTool.Lib
             this.ClearValue(LauncherArgsProperty);
             this.ClearValue(AdditionalArgsProperty);
         }
+
+        public void ResetDiscordBotSection()
+        {
+            this.ClearValue(DiscordChannelIdProperty);
+            this.ClearValue(DiscordAliasProperty);
+
+            this.ClearValue(AllowDiscordBackupProperty);
+            this.ClearValue(AllowDiscordRestartProperty);
+            this.ClearValue(AllowDiscordShutdownProperty);
+            this.ClearValue(AllowDiscordStartProperty);
+            this.ClearValue(AllowDiscordStopProperty);
+            this.ClearValue(AllowDiscordUpdateProperty);
+        }
         #endregion
 
         #region Sync Methods
@@ -1467,6 +1480,9 @@ namespace ServerManagerTool.Lib
                 case ServerProfileCategory.AutomaticManagement:
                     SyncAutomaticManagement(sourceProfile);
                     break;
+                case ServerProfileCategory.DiscordBot:
+                    SyncDiscordBot(sourceProfile);
+                    break;
                 case ServerProfileCategory.ServerFiles:
                     SyncServerFiles(sourceProfile);
                     break;
@@ -1516,6 +1532,19 @@ namespace ServerManagerTool.Lib
             this.SetValue(AutoRestartIfShutdownProperty, sourceProfile.AutoRestartIfShutdown);
         }
 
+        private void SyncDiscordBot(ServerProfile sourceProfile)
+        {
+            this.SetValue(DiscordChannelIdProperty, sourceProfile.DiscordChannelId);
+            this.SetValue(DiscordAliasProperty, sourceProfile.DiscordAlias);
+
+            this.SetValue(AllowDiscordBackupProperty, sourceProfile.AllowDiscordBackup);
+            this.SetValue(AllowDiscordRestartProperty, sourceProfile.AllowDiscordRestart);
+            this.SetValue(AllowDiscordShutdownProperty, sourceProfile.AllowDiscordShutdown);
+            this.SetValue(AllowDiscordStartProperty, sourceProfile.AllowDiscordStart);
+            this.SetValue(AllowDiscordStopProperty, sourceProfile.AllowDiscordStop);
+            this.SetValue(AllowDiscordUpdateProperty, sourceProfile.AllowDiscordUpdate);
+        }
+
         private void SyncServerFiles(ServerProfile sourceProfile)
         {
             this.SetValue(ServerFilesBlacklistedProperty, sourceProfile.ServerFilesBlacklisted);
diff --git a/src/ConanServerManager/UserControls/ServerSettingsControl.xaml b/src/ConanServerManager/UserControls/ServerSettingsControl.xaml
index 3e63d22c..97e11c46 100644
--- a/src/ConanServerManager/UserControls/ServerSettingsControl.xaml
+++ b/src/ConanServerManager/UserControls/ServerSettingsControl.xaml
@@ -4,7 +4,6 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:mts="clr-namespace:Microsoft.Win32.TaskScheduler;assembly=Microsoft.Win32.TaskScheduler"
-             xmlns:sm="clr-namespace:ServerManagerTool"
              xmlns:cctl="clr-namespace:ServerManagerTool.Common.Controls;assembly=ServerManager.Common"
              xmlns:cc="clr-namespace:ServerManagerTool.Common.Converters;assembly=ServerManager.Common"
              xmlns:cvr="clr-namespace:ServerManagerTool.Common.ValidationRules;assembly=ServerManager.Common"
@@ -397,7 +396,7 @@
                                     <TextBlock Text="{DynamicResource ServerSettings_AdministrationSectionLabel}" Style="{StaticResource ExpanderHeaderTextStyle}"/>
                                     <Button Margin="20,0,0,0" ToolTip="{DynamicResource ServerSettings_ResetSectionTooltip}" Style="{StaticResource ButtonStyle1}"
                                             IsEnabled="{Binding ElementName=SectionAdministration, Path=IsExpanded}"
-                                            Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static sm:ServerSettingsResetAction.AdministrationSection}">
+                                            Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static enum:ServerSettingsResetAction.AdministrationSection}">
                                         <Image Source="{com:Icon Path=/ConanServerManager;component/Art/Refresh.ico,Size=32}"/>
                                     </Button>
                                 </StackPanel>
@@ -557,7 +556,7 @@
                                         <TextBox  Grid.Row="0" Grid.Column="3" Margin="1" VerticalContentAlignment="Center" Name="HideRconPasswordTextBox" Style="{StaticResource HiddenTextBoxStyle}" IsEnabled="{Binding RconEnabled}" GotFocus="HiddenField_GotFocus" Text="{DynamicResource ServerSettings_HidePasswordText}" ToolTip="{DynamicResource ServerSettings_HidePasswordTooltip}"/>
                                         <TextBox  Grid.Row="0" Grid.Column="3" Margin="1" VerticalContentAlignment="Center" Name="RconPasswordTextBox" Visibility="Collapsed" LostFocus="HiddenField_LostFocus" Text="{Binding RconPassword}" ToolTip="{DynamicResource ServerSettings_RconPasswordTooltip}"/>
 
-                                        <Button   Grid.Row="0" Grid.Column="5" Margin="1" Content="{StaticResource ResetRconButtonContent}" ToolTip="{DynamicResource ServerSettings_RconResetTooltip}" Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static sm:ServerSettingsResetAction.RconWindowExtents}" HorizontalAlignment="Right"/>
+                                        <Button   Grid.Row="0" Grid.Column="5" Margin="1" Content="{StaticResource ResetRconButtonContent}" ToolTip="{DynamicResource ServerSettings_RconResetTooltip}" Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static enum:ServerSettingsResetAction.RconWindowExtents}" HorizontalAlignment="Right"/>
                                     </Grid>
                                 </GroupBox>
 
@@ -760,7 +759,7 @@
                                     <GroupBox.Header>
                                         <StackPanel Orientation="Horizontal">
                                             <Label Content="{DynamicResource ServerSettings_ServerOptionsLabel}"/>
-                                            <Button Width="22" Height="22" Margin="20,0,0,0" Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static sm:ServerSettingsResetAction.ServerOptions}" ToolTip="{DynamicResource ServerSettings_ResetServerOptionsTooltip}" Style="{StaticResource ButtonStyle1}">
+                                            <Button Width="22" Height="22" Margin="20,0,0,0" Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static enum:ServerSettingsResetAction.ServerOptions}" ToolTip="{DynamicResource ServerSettings_ResetServerOptionsTooltip}" Style="{StaticResource ButtonStyle1}">
                                                 <Image Source="{com:Icon Path=/ConanServerManager;component/Art/Refresh.ico,Size=32}"/>
                                             </Button>
                                         </StackPanel>
@@ -1066,6 +1065,11 @@
                             <Expander.Header>
                                 <StackPanel Orientation="Horizontal">
                                     <TextBlock Text="{DynamicResource ServerSettings_DiscordBotLabel}" Style="{StaticResource ExpanderHeaderTextStyle}"/>
+                                    <Button Margin="20,0,0,0" ToolTip="{DynamicResource ServerSettings_ResetSectionTooltip}" Style="{StaticResource ButtonStyle1}"
+                                            IsEnabled="{Binding ElementName=SectionDiscordBot, Path=IsExpanded}"
+                                            Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static enum:ServerSettingsResetAction.DiscordBotSection}">
+                                        <Image Source="{com:Icon Path=/ConanServerManager;component/Art/Refresh.ico,Size=32}"/>
+                                    </Button>
                                 </StackPanel>
                             </Expander.Header>
 
diff --git a/src/ConanServerManager/UserControls/ServerSettingsControl.xaml.cs b/src/ConanServerManager/UserControls/ServerSettingsControl.xaml.cs
index 60e21a10..4673a699 100644
--- a/src/ConanServerManager/UserControls/ServerSettingsControl.xaml.cs
+++ b/src/ConanServerManager/UserControls/ServerSettingsControl.xaml.cs
@@ -26,20 +26,6 @@ using WPFSharp.Globalizer;
 
 namespace ServerManagerTool
 {
-    public enum ServerSettingsResetAction
-    {
-        // Sections
-        AdministrationSection,
-
-        // Properties
-        RconWindowExtents,
-        PlayerMaxXpProperty,
-        ServerOptions,
-    }
-
-    /// <summary>
-    /// Interaction logic for ServerSettings.xaml
-    /// </summary>
     partial class ServerSettingsControl : UserControl
     {
         private readonly GlobalizedApplication _globalizer = GlobalizedApplication.Instance;
@@ -1354,6 +1340,9 @@ namespace ServerManagerTool
                                 RefreshServerRegionsList();
                                 break;
 
+                            case ServerSettingsResetAction.DiscordBotSection:
+                                this.Settings.ResetDiscordBotSection();
+                                break;
 
                             // Properties
                             case ServerSettingsResetAction.RconWindowExtents:
diff --git a/src/ConanServerManager/VersionFeed.xml b/src/ConanServerManager/VersionFeed.xml
index 4b9a2b2e..eb6c1b92 100644
--- a/src/ConanServerManager/VersionFeed.xml
+++ b/src/ConanServerManager/VersionFeed.xml
@@ -9,8 +9,8 @@
 
   <entry>
     <id>urn:uuid:19B09A66-43F2-4D5F-AF33-5C77D7EA9A6B</id>
-    <title>1.1.58 (1.1.58.9)</title>
-    <summary>1.1.58.9</summary>
+    <title>1.1.58 (1.1.58.10)</title>
+    <summary>1.1.58.10</summary>
     <link href="" />
     <updated>2021-12-18T00:00:00Z</updated>
     <content type="xhtml">
@@ -30,6 +30,8 @@
           <ul>
             <li>Discord Bot - all commands are now case INsensitive, along with the profile id and the alias.</li>
             <li>Discord Bot - removed the mandatory requirement to enter the '!' after the discord prefix. The '!' has been added to the existing prefix so no change to existing functionality, but you can now change it.</li>
+            <li>Server Settings - Discord Bot section - Add a reset to default button.</li>
+            <li>Profile Sync - Added Discord Bot section to the list.</li>
             <li>Made changes to the code to help improve performance.</li>
           </ul>
         </p>
diff --git a/src/ConanServerManager/VersionFeedBeta.xml b/src/ConanServerManager/VersionFeedBeta.xml
index 8f7a1bfe..e30a105d 100644
--- a/src/ConanServerManager/VersionFeedBeta.xml
+++ b/src/ConanServerManager/VersionFeedBeta.xml
@@ -8,7 +8,31 @@
   <updated>2021-12-17T00:00:00Z</updated>
 
   <entry>
-    <id>urn:uuid:9A427D82-9904-44F5-8C1E-7C943049869A</id>
+    <id>urn:uuid:6EF11E7A-65D0-481E-A712-71CDB6C3F23F</id>
+    <title>1.1.58 (1.1.58.10)</title>
+    <summary>1.1.58.10</summary>
+    <link href="" />
+    <updated>2021-12-18T00:00:00Z</updated>
+    <content type="xhtml">
+      <div xmlns="http://www.w3.org/1999/xhtml" style="font-family: Arial, Verdana, Helvetica, Sans-Serif;font-size: .8em;">
+        <p>
+          <u style="font-size: .9em;">CHANGE</u>
+          <br/>
+          <ul>
+            <li>Server Settings - Discord Bot section - Add a reset to default button.</li>
+            <li>Profile Sync - Added Discord Bot section to the list.</li>
+          </ul>
+        </p>
+      </div>
+    </content>
+    <author>
+      <name>bletch</name>
+      <email>bletch1971@hotmail.com</email>
+    </author>
+  </entry>
+
+  <entry>
+    <id>urn:uuid:970CFB45-B99A-4F12-9135-1E5763D1B2F6</id>
     <title>1.1.58 (1.1.58.9)</title>
     <summary>1.1.58.9</summary>
     <link href="" />
diff --git a/src/ConanServerManager/Windows/ProfileSyncWindow.xaml.cs b/src/ConanServerManager/Windows/ProfileSyncWindow.xaml.cs
index 84e4a752..434914a5 100644
--- a/src/ConanServerManager/Windows/ProfileSyncWindow.xaml.cs
+++ b/src/ConanServerManager/Windows/ProfileSyncWindow.xaml.cs
@@ -215,6 +215,8 @@ namespace ServerManagerTool
 
             SyncSections.Add(new SyncSection() { Selected = false, Category = ServerProfileCategory.Administration, SectionName = _globalizer.GetResourceString("ServerSettings_AdministrationSectionLabel") });
             SyncSections.Add(new SyncSection() { Selected = false, Category = ServerProfileCategory.AutomaticManagement, SectionName = _globalizer.GetResourceString("ServerSettings_AutomaticManagementLabel") });
+            if (Config.Default.DiscordBotEnabled)
+                SyncSections.Add(new SyncSection() { Selected = false, Category = ServerProfileCategory.DiscordBot, SectionName = _globalizer.GetResourceString("ServerSettings_DiscordBotLabel") });
             SyncSections.Add(new SyncSection() { Selected = false, Category = ServerProfileCategory.ServerFiles, SectionName = _globalizer.GetResourceString("ServerSettings_ServerFilesLabel") });
         }