diff --git a/CSM/beta/VersionFeed.xml b/CSM/beta/VersionFeed.xml
index d7c391f6..583485b5 100644
--- a/CSM/beta/VersionFeed.xml
+++ b/CSM/beta/VersionFeed.xml
@@ -5,67 +5,22 @@
   <title>Conan Server Manager Version Feed</title>
   <subtitle>This is the Conan Server Manager beta version feed.</subtitle>
   <link href="http://servermanagers.freeforums.net/" />
-  <updated>2021-12-01T00:00:00Z</updated>
+  <updated>2021-12-02T00:00:00Z</updated>
 
   <entry>
-    <id>urn:uuid:38961ED8-0964-4C1A-B09C-8AE2C5FCF76E</id>
-    <title>1.1.54 (1.1.54.3)</title>
-    <summary>1.1.54.3</summary>
+    <id>urn:uuid:A3A790A9-D511-4CE8-AC15-A36B3DAB4385</id>
+    <title>1.1.55 (1.1.55.1)</title>
+    <summary>1.1.55.1</summary>
     <link href="" />
-    <updated>2021-12-01T00: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>Added the Profile ID to the top of the profile window.</li>
-          </ul>
-        </p>
-      </div>
-    </content>
-    <author>
-      <name>bletch</name>
-      <email>bletch1971@hotmail.com</email>
-    </author>
-  </entry>
-
-  <entry>
-    <id>urn:uuid:38961ED8-0964-4C1A-B09C-8AE2C5FCF76E</id>
-    <title>1.1.54 (1.1.54.2)</title>
-    <summary>1.1.54.2</summary>
-    <link href="" />
-    <updated>2021-11-30T00:00:00Z</updated>
+    <updated>2021-12-02T00: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>Changed the Window States when the language is changed.</li>
-          </ul>
-        </p>
-      </div>
-    </content>
-    <author>
-      <name>bletch</name>
-      <email>bletch1971@hotmail.com</email>
-    </author>
-  </entry>
-
-  <entry>
-    <id>urn:uuid:38961ED8-0964-4C1A-B09C-8AE2C5FCF76E</id>
-    <title>1.1.54 (1.1.54.1)</title>
-    <summary>1.1.54.1</summary>
-    <link href="" />
-    <updated>2021-11-30T00: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>Added globalization to the Main Window Start Mode setting in the Global Settings.</li>
+            <li>Changed some globalization key values (maps and branches).</li>
+            <li>Changed the way the data directory is selected and created on first startup of the server manager.</li>
           </ul>
         </p>
       </div>
diff --git a/CSM/beta/en-US.xaml b/CSM/beta/en-US.xaml
index 04362c1f..e61a9e28 100644
--- a/CSM/beta/en-US.xaml
+++ b/CSM/beta/en-US.xaml
@@ -13,6 +13,15 @@
     <sys:String x:Key="Generic_ErrorLabel">Error</sys:String>
     <!--#endregion-->
 
+    <!--#region Game Map Names -->
+    <sys:String x:Key="Map_ConanSandbox">The Exiled Lands</sys:String>
+    <sys:String x:Key="Map_/Game/DLC_EXT/DLC_Siptah/Maps/DLC_Isle_of_Siptah">Isle of Siptah</sys:String>
+    <!--#endregion-->
+
+    <!--#region Branch Names -->
+    <sys:String x:Key="Branch_live">Live</sys:String>
+    <!--#endregion-->
+
     <!--#region Mod Types -->
     <sys:String x:Key="ModType_Unknown">Unknown</sys:String>
     <sys:String x:Key="ModType_NotDownloaded">Not Downloaded</sys:String>
@@ -26,10 +35,6 @@
     <sys:String x:Key="GameApplication_Unknown">Unknown</sys:String>
     <!--#endregion-->
 
-    <!--#region Branch Names -->
-    <sys:String x:Key="live">Live</sys:String>
-    <!--#endregion-->
-
     <!--#region Server Regions -->
     <sys:String x:Key="ServerRegion_0">Europe</sys:String>
     <sys:String x:Key="ServerRegion_1">North America</sys:String>
@@ -39,11 +44,6 @@
     <sys:String x:Key="ServerRegion_5">Japan</sys:String>
     <!--#endregion-->
 
-    <!--#region Game Map Names -->
-    <sys:String x:Key="ConanSandbox">The Exiled Lands</sys:String>
-    <sys:String x:Key="/Game/DLC_EXT/DLC_Siptah/Maps/DLC_Isle_of_Siptah">Isle of Siptah</sys:String>
-    <!--#endregion-->
-
     <!--#region Process Priority -->
     <sys:String x:Key="Priority_low">Low</sys:String>
     <sys:String x:Key="Priority_belownormal">Below Normal</sys:String>
@@ -97,8 +97,9 @@
     <sys:String x:Key="Application_DataDirectory_DialogTitle">Select a Data Directory</sys:String>
     <sys:String x:Key="Application_DataDirectory_ConfirmTitle">Confirm location</sys:String>
     <sys:String x:Key="Application_DataDirectory_ConfirmLabel">The server manager will store profiles and SteamCMD in the following directories:\r\n\r\nProfiles: {0}\r\nSteamCMD: {1}\r\n\r\nIs this ok?</sys:String>
-    <sys:String x:Key="Application_DataDirectory_WithinInstallFolderErrorTitle">Data Directory Selection Error</sys:String>
-    <sys:String x:Key="Application_DataDirectory_WithinInstallFolderErrorLabel">The directory you have chosen is within the server manager installation folder. This is not recommended, please choose another folder.</sys:String>
+    <sys:String x:Key="Application_DataDirectory_DataDirectoryFolderErrorTitle">Data Directory Selection Error</sys:String>
+    <sys:String x:Key="Application_DataDirectory_DataDirectoryWithinInstallFolderErrorLabel">The directory you have chosen is within the server manager installation folder. This is not recommended, please choose another folder.</sys:String>
+    <sys:String x:Key="Application_DataDirectory_DataDirectoryWithinDesktopFolderErrorLabel">The directory you have chosen is on the desktop. This is not recommended, please choose another folder.</sys:String>
     <sys:String x:Key="Application_Profile_SaveFailedTitle">Failed to save profile</sys:String>
     <sys:String x:Key="Application_Profile_SaveFailedLabel">Failed to save profile {0}.  {1}\n{2}</sys:String>
 
@@ -167,6 +168,25 @@
     <sys:String x:Key="ProcessorAffinity_DescriptionColumnLabel">Processor</sys:String>
     <!--#endregion-->
 
+    <!--#region Data Directory Window -->
+    <sys:String x:Key="DataDirectory_Title">Data Folder Selection</sys:String>
+    <sys:String x:Key="DataDirectory_InformationLabel">It appears you do not have a data directory set. The data directory is where your profiles and SteamCMD will be stored. It is not the same as the server installation directory, which you can choose for each profile.</sys:String>
+    <sys:String x:Key="DataDirectory_SelectionLabel">Select the drive where the data folder should be located.</sys:String>
+    <sys:String x:Key="DataDirectory_FolderLabel">Data Folder Name:</sys:String>
+    <sys:String x:Key="DataDirectory_FolderTooltip">The name of the server manager data folder.</sys:String>
+    <sys:String x:Key="DataDirectory_LocalDiskLabel">Local Disk</sys:String>
+    <sys:String x:Key="DataDirectory_DriveLine2Label">{0} free of {1}</sys:String>
+
+    <sys:String x:Key="DataDirectory_OkButtonLabel">Ok</sys:String>
+    <sys:String x:Key="DataDirectory_CancelButtonLabel">Cancel</sys:String>
+    <sys:String x:Key="DataDirectory_RefreshButtonLabel">Refresh</sys:String>
+
+    <sys:String x:Key="DataDirectory_ErrorTitle">Data Directory Selection Error</sys:String>
+    <sys:String x:Key="DataDirectory_FolderErrorLabel">The data folder name you have entered is not valid.</sys:String>
+    <sys:String x:Key="DataDirectory_RestartTitle">Server Manager Restart Required</sys:String>
+    <sys:String x:Key="DataDirectory_RestartLabel">The data folder has been set, you must now restart the server manager to use the new settings.</sys:String>
+    <!--#endregion-->
+
     <!--#region Mod Details Window -->
     <sys:String x:Key="ModDetails_Title">Mod Details</sys:String>
     <sys:String x:Key="ModDetails_ProfileTitle">Mod Details - {0}</sys:String>
diff --git a/CSM/beta/latest.txt b/CSM/beta/latest.txt
index 4562248c..bf354a29 100644
--- a/CSM/beta/latest.txt
+++ b/CSM/beta/latest.txt
@@ -1 +1 @@
-1.1.54.3
+1.1.55.1
diff --git a/CSM/beta/latest.zip b/CSM/beta/latest.zip
index a5faf492..b3410a43 100644
Binary files a/CSM/beta/latest.zip and b/CSM/beta/latest.zip differ
diff --git a/src/ConanServerManager/ConanServerManager.csproj b/src/ConanServerManager/ConanServerManager.csproj
index 2fc84422..094c9b18 100644
--- a/src/ConanServerManager/ConanServerManager.csproj
+++ b/src/ConanServerManager/ConanServerManager.csproj
@@ -36,7 +36,7 @@
     <PublisherName>Bletch1971</PublisherName>
     <SuiteName>Server Managers</SuiteName>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
-    <ApplicationRevision>1</ApplicationRevision>
+    <ApplicationRevision>2</ApplicationRevision>
     <ApplicationVersion>1.1.55.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
diff --git a/src/ConanServerManager/VersionFeed.xml b/src/ConanServerManager/VersionFeed.xml
index 11f32130..c622bc1a 100644
--- a/src/ConanServerManager/VersionFeed.xml
+++ b/src/ConanServerManager/VersionFeed.xml
@@ -20,6 +20,7 @@
           <br/>
           <ul>
             <li>Changed some globalization key values (maps and branches).</li>
+            <li>Changed the way the data directory is selected and created on first startup of the server manager.</li>
           </ul>
         </p>
       </div>
diff --git a/src/ConanServerManager/VersionFeedBeta.xml b/src/ConanServerManager/VersionFeedBeta.xml
index fe8c8adc..68e1bddb 100644
--- a/src/ConanServerManager/VersionFeedBeta.xml
+++ b/src/ConanServerManager/VersionFeedBeta.xml
@@ -20,6 +20,7 @@
           <br/>
           <ul>
             <li>Changed some globalization key values (maps and branches).</li>
+            <li>Changed the way the data directory is selected and created on first startup of the server manager.</li>
           </ul>
         </p>
       </div>