diff --git a/CSM/beta/VersionFeed.xml b/CSM/beta/VersionFeed.xml
index 8339e2ce..4fc8f6e2 100644
--- a/CSM/beta/VersionFeed.xml
+++ b/CSM/beta/VersionFeed.xml
@@ -7,6 +7,30 @@
   <link href="http://servermanagers.freeforums.net/" />
   <updated>2021-12-17T00:00:00Z</updated>
 
+  <entry>
+    <id>urn:uuid:9A427D82-9904-44F5-8C1E-7C943049869A</id>
+    <title>1.1.58 (1.1.58.7)</title>
+    <summary>1.1.58.7</summary>
+    <link href="" />
+    <updated>2021-12-17T00: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;">NEW</u>
+          <br/>
+          <ul>
+            <li>Main Window - Added Discord Bot Status and a button to Stop/Start the discord bot.</li>
+            <li>Global Settings - Discord Bot section - Added a checkbox to allow all bots.</li>
+          </ul>
+        </p>
+      </div>
+    </content>
+    <author>
+      <name>bletch</name>
+      <email>bletch1971@hotmail.com</email>
+    </author>
+  </entry>
+
   <entry>
     <id>urn:uuid:A189668E-DA03-471A-9C5A-7FF2A7264F9C</id>
     <title>1.1.58 (1.1.58.6)</title>
@@ -93,7 +117,7 @@
           <u style="font-size: .9em;">CHANGE</u>
           <br/>
           <ul>
-            <li>Removed the mandatory requirement to enter the '!' after the discord prefix. The '!' has been added to the existing prefix so no change the existing functionality, but you can now change it.</li>
+            <li>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>
           </ul>
         </p>
       </div>
diff --git a/CSM/beta/en-US.xaml b/CSM/beta/en-US.xaml
index 39ba6c7e..db8c265c 100644
--- a/CSM/beta/en-US.xaml
+++ b/CSM/beta/en-US.xaml
@@ -615,12 +615,18 @@
     <sys:String x:Key="MainWindow_AutoUpdateTaskEnableLabel">Enable</sys:String>
     <sys:String x:Key="MainWindow_AutoUpdateTaskEnableTooltip">Enable the auto-update scheduled task</sys:String>
     <sys:String x:Key="MainWindow_TaskRunTimeLabel">Next Run Time:</sys:String>
+    <sys:String x:Key="MainWindow_DiscordBotStatusLabel">Discord Bot:</sys:String>
+    <sys:String x:Key="MainWindow_DiscordBotTaskStartLabel">Start</sys:String>
+    <sys:String x:Key="MainWindow_DiscordBotTaskStartTooltip">Start the discord bot</sys:String>
+    <sys:String x:Key="MainWindow_DiscordBotTaskStopLabel">Stop</sys:String>
+    <sys:String x:Key="MainWindow_DiscordBotTaskStopTooltip">Stop the discord bot</sys:String>
 
     <sys:String x:Key="MainWindow_TaskStateUnknownLabel">Unknown</sys:String>
     <sys:String x:Key="MainWindow_TaskStateDisabledLabel">Disabled</sys:String>
     <sys:String x:Key="MainWindow_TaskStateQueuedLabel">Queued</sys:String>
     <sys:String x:Key="MainWindow_TaskStateReadyLabel">Ready</sys:String>
     <sys:String x:Key="MainWindow_TaskStateRunningLabel">Running</sys:String>
+    <sys:String x:Key="MainWindow_TaskStateStoppedLabel">Stopped</sys:String>
 
     <sys:String x:Key="MainWindow_ProfileLoad_FailedTitle">Profile failed to load</sys:String>
     <sys:String x:Key="MainWindow_ProfileLoad_FailedLabel">The profile at {0} failed to load. The error was: {1}\r\n{2}</sys:String>
@@ -792,6 +798,8 @@
     <sys:String x:Key="GlobalSettings_DiscordBotLogLevelLabel">Log Level:</sys:String>
     <sys:String x:Key="GlobalSettings_DiscordBotApplyButtonLabel">Get Token...</sys:String>
     <sys:String x:Key="GlobalSettings_DiscordBotHelpButtonLabel">Help...</sys:String>
+    <sys:String x:Key="ServerSettings_DiscordBotAllowAllBotsLabel">Allow All Bots</sys:String>
+    <sys:String x:Key="ServerSettings_DiscordBotAllowAllBotsTooltip">If enabled, the server manager bot will respond to all other bots, otherwise they will be ignored unless they are in the whitelist.</sys:String>
     <sys:String x:Key="GlobalSettings_DiscordBotWhitelistLabel">Bot Whitelist</sys:String>
     <sys:String x:Key="GlobalSettings_DiscordBotWhitelistIdLabel">Bot ID</sys:String>
     <sys:String x:Key="GlobalSettings_DiscordBotWhitelistIdTooltip">The id of the bot to whitelist.</sys:String>
diff --git a/CSM/beta/latest.txt b/CSM/beta/latest.txt
index fe65ed56..96ec7d2c 100644
--- a/CSM/beta/latest.txt
+++ b/CSM/beta/latest.txt
@@ -1 +1 @@
-1.1.58.6
+1.1.58.7
diff --git a/CSM/beta/latest.zip b/CSM/beta/latest.zip
index 8f826cf7..e0b87bc2 100644
Binary files a/CSM/beta/latest.zip and b/CSM/beta/latest.zip differ