diff --git a/CSM/ConanServerManager_1.1.36.exe b/CSM/ConanServerManager_1.1.36.exe
new file mode 100644
index 00000000..ddde5727
Binary files /dev/null and b/CSM/ConanServerManager_1.1.36.exe differ
diff --git a/CSM/ConanServerManager_1.1.36.zip b/CSM/ConanServerManager_1.1.36.zip
new file mode 100644
index 00000000..d4d281c8
Binary files /dev/null and b/CSM/ConanServerManager_1.1.36.zip differ
diff --git a/CSM/VersionFeed.xml b/CSM/VersionFeed.xml
index d1231573..9b47f949 100644
--- a/CSM/VersionFeed.xml
+++ b/CSM/VersionFeed.xml
@@ -5,7 +5,31 @@
   <title>Conan Server Manager Version Feed</title>
   <subtitle>This is the Conan Server Manager release version feed.</subtitle>
   <link href="http://servermanagers.freeforums.net/" />
-  <updated>2020-05-28T00:00:00Z</updated>
+  <updated>2020-06-10T00:00:00Z</updated>
+
+  <entry>
+    <id>urn:uuid:855F4319-6E7D-4DB7-A7C8-AD6DC2A4C074</id>
+    <title>1.1.36 (1.1.36.5)</title>
+    <summary>1.1.36.5</summary>
+    <link href="" />
+    <updated>2020-06-10T00: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 logic when reading the config files, when an expected setting is missing from the config file.</li>
+            <li>Globalisation - added some additional strings to the globalisation files.</li>
+          </ul>
+        </p>
+      </div>
+    </content>
+    <author>
+      <name>bletch</name>
+      <email>bletch1971@hotmail.com</email>
+    </author>
+  </entry>
 
   <entry>
     <id>urn:uuid:84F25550-B942-4C86-9822-F71265A1EC8F</id>
diff --git a/CSM/en-US.xaml b/CSM/en-US.xaml
index 16752329..6f89d5c1 100644
--- a/CSM/en-US.xaml
+++ b/CSM/en-US.xaml
@@ -8,15 +8,32 @@
     >
 
     <!--#region Generic -->
+    <sys:String x:Key="Generic_TranslatedByLabel">Last Updated By:</sys:String>
+    <sys:String x:Key="Generic_TranslatedBy">unknown</sys:String>
     <sys:String x:Key="Generic_ErrorLabel">Error</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>
+    <sys:String x:Key="ModType_Map">Map</sys:String>
+    <sys:String x:Key="ModType_Mod">Mod</sys:String>
+    <!--#endregion-->
+
     <!--#region GameApplication enum -->
     <sys:String x:Key="GameApplication_All">All</sys:String>
     <sys:String x:Key="GameApplication_Conan">Conan</sys:String>
     <sys:String x:Key="GameApplication_Unknown">Unknown</sys:String>
     <!--#endregion-->
 
+    <!--#region Branch Names -->
+    <sys:String x:Key="live">Live</sys:String>
+    <!--#endregion-->
+
+    <!--#region Game Map Names -->
+    <sys:String x:Key="ConanSandbox">The Exiled Lands</sys:String>
+    <!--#endregion-->
+
     <!--#region Process Priority -->
     <sys:String x:Key="Priority_low">Low</sys:String>
     <sys:String x:Key="Priority_belownormal">Below Normal</sys:String>
@@ -211,6 +228,18 @@
     <sys:String x:Key="WorldSaveRestore_DeleteTooltip">Delete backup file</sys:String>
     <sys:String x:Key="WorldSaveRestore_ReloadTooltip">Reload backup files</sys:String>
     <sys:String x:Key="WorldSaveRestore_RestoreTooltip">Restore backup</sys:String>
+
+    <sys:String x:Key="WorldSaveRestore_DeleteConfirmationTitle">Delete Backup Confirmation</sys:String>
+    <sys:String x:Key="WorldSaveRestore_DeleteConfirmationLabel">You are about to delete backup file\r\n{fileName}.\r\n\r\nDo you want to continue?</sys:String>
+    <sys:String x:Key="WorldSaveRestore_DeleteErrorTitle">Delete Backup Error</sys:String>
+    <sys:String x:Key="WorldSaveRestore_DeleteSuccessTitle">Delete Backup Success</sys:String>
+    <sys:String x:Key="WorldSaveRestore_DeleteSuccessLabel">The backup file has been deleted.</sys:String>
+
+    <sys:String x:Key="WorldSaveRestore_RestoreConfirmationTitle">Restore Backup Confirmation</sys:String>
+    <sys:String x:Key="WorldSaveRestore_RestoreConfirmationLabel">You are about to restore backup file\r\n{fileName}.\r\n\r\nDo you want to continue?</sys:String>
+    <sys:String x:Key="WorldSaveRestore_RestoreErrorTitle">Restore Backup Error</sys:String>
+    <sys:String x:Key="WorldSaveRestore_RestoreSuccessTitle">Restore Backup Success</sys:String>
+    <sys:String x:Key="WorldSaveRestore_RestoreSuccessLabel">The backup file has been restored, {fileCount} file(s) restored.</sys:String>
     <!--#endregion-->
 
     <!--#region Profile Sync Window -->
@@ -888,6 +917,7 @@
     <sys:String x:Key="ServerSettings_UpdateServer_NoSteamCredentialsLabel">The server update failed as the steam username or password has not been setup in the Global Settings.</sys:String>
     <sys:String x:Key="ServerSettings_BackupServer_Title">Backup Server</sys:String>
     <sys:String x:Key="ServerSettings_BackupServer_FailedTitle">Backup Server Error</sys:String>
+    <sys:String x:Key="ServerSettings_BackupServer_SuccessfulLabel">The backup was successful.</sys:String>
     <sys:String x:Key="ServerSettings_ShutdownServer_FailedTitle">Shutdown Server Error</sys:String>
     <sys:String x:Key="ServerSettings_ShutdownServer_CancelledTitle">Shutdown Server Cancelled</sys:String>
     <sys:String x:Key="ServerSettings_ShutdownServer_AlreadyOpenLabel">The shutdown window is already open for this server.</sys:String>
@@ -998,6 +1028,7 @@
     <sys:String x:Key="ServerSettings_BranchNameTooltip">The name of the branch to download (leave blank to use the release branch).</sys:String>
     <sys:String x:Key="ServerSettings_BranchPasswordLabel">Branch Password:</sys:String>
     <sys:String x:Key="ServerSettings_BranchPasswordTooltip">The password that is used to access the branch download.</sys:String>
+    <sys:String x:Key="ServerSettings_BranchClearErrorTitle">Clear Branch Error</sys:String>
 
     <sys:String x:Key="ServerSettings_CommandLineLabel">Command Line</sys:String>
     <sys:String x:Key="ServerSettings_ProcessPriorityLabel">Priority:</sys:String>
@@ -1039,6 +1070,8 @@
     <!--#region Server Settings - Server File Details -->
     <sys:String x:Key="ServerSettings_ServerFilesLabel">Server File Details</sys:String>
     <sys:String x:Key="ServerSettings_ServerFilesWarningLabel">NOTE: Any changes will require a server restart to take effect.</sys:String>
+    <sys:String x:Key="ServerSettings_ServerFilesLoadErrorTitle">Load Error</sys:String>
+    <sys:String x:Key="ServerSettings_ServerFilesSaveErrorTitle">Save Error</sys:String>
 
     <sys:String x:Key="ServerSettings_ServerFilesBlacklistedLabel">Blacklisted</sys:String>
     <sys:String x:Key="ServerSettings_AddBlacklistedPlayerTooltip">Add Blacklisted Player</sys:String>
@@ -1065,12 +1098,45 @@
     <sys:String x:Key="ServerSettings_OverlayMessage_SchedulesLabel">Checking Scheduled Tasks...</sys:String>
     <!--#endregion-->
 
-    <!--#region Branch Names -->
-    <sys:String x:Key="live">Live</sys:String>
+    <!--#region Profile Validation -->
+    <sys:String x:Key="ProfileValidation_Title">Profile Validation</sys:String>
+    <sys:String x:Key="ProfileValidation_WarningLabel">The following validation problems were encountered.\r\n\r\n{validateMessage}\r\n\r\nDo you want to continue with the server start, this could cause problems?</sys:String>
+
+    <sys:String x:Key="ProfileValidation_ServerPort">The server port is outside the valid range ({PortMinimum}-{PortMaximum}).</sys:String>
+    <sys:String x:Key="ProfileValidation_ServerPeerPort">The server peer port is outside the valid range ({PortMinimum}-{PortMaximum}).</sys:String>
+    <sys:String x:Key="ProfileValidation_QueryPort">The query port is outside the valid range ({PortMinimum}-{PortMaximum}).</sys:String>
+    <sys:String x:Key="ProfileValidation_RconPort">The rcon port is outside the valid range ({PortMinimum}-{PortMaximum}).</sys:String>
+
+    <sys:String x:Key="ProfileValidation_MapNameBlank">The map name has not been entered.</sys:String>
+
+    <sys:String x:Key="ProfileValidation_ServerNotDownloaded">Server files have not been downloaded, server folder does not exist.</sys:String>
+    <sys:String x:Key="ProfileValidation_ServerExeNotDownloaded">Server files have not been downloaded properly, server executable file ({ServerExe}) does not exist.</sys:String>
+    <sys:String x:Key="ProfileValidation_ServerDifferentApplication">The server files are for a different application.</sys:String>
+
+    <sys:String x:Key="ProfileValidation_ModFileNotDownloaded">Mod {modId} has not been downloaded, mod file does not exist.</sys:String>
+    <sys:String x:Key="ProfileValidation_ModDifferentApplication">Mod {modId} is for a different application.</sys:String>
+    <sys:String x:Key="ProfileValidation_ModOutdated">Mod {modId} is outdated.</sys:String>
+    <sys:String x:Key="ProfileValidation_ModSteamError">Mod {modId} details could not be retrieved from steam.</sys:String>
     <!--#endregion-->
 
-    <!--#region Game Map Names -->
-    <sys:String x:Key="ConanSandbox">The Exiled Lands</sys:String>
+    <!--#region Profile Save -->
+    <sys:String x:Key="ProfileSave_Saving">Saving...</sys:String>
+    <sys:String x:Key="ProfileSave_SavingProfileFile">Saving Profile File...</sys:String>
+    <sys:String x:Key="ProfileSave_SavingConfigFiles">Saving Config Files...</sys:String>
+    <sys:String x:Key="ProfileSave_SavingLauncherFile">Saving Launcher File...</sys:String>
+    <sys:String x:Key="ProfileSave_CheckingDirectoryPermissions">Checking Directory Permissions...</sys:String>
+    <sys:String x:Key="ProfileSave_CheckingScheduledTasks">Checking Scheduled Tasks...</sys:String>
+    <!--#endregion-->
+
+    <!--#region Restore Save Files -->
+    <sys:String x:Key="RestoreSaveFiles_BackupFileNotFound">Backup file could not be found or does not exist.</sys:String>
+    <sys:String x:Key="RestoreSaveFiles_SaveFolderNotFound">The server save folder could not be found or does not exist.\r\n{saveFolder}</sys:String>
+    <sys:String x:Key="RestoreSaveFiles_MissingWorldSaveFile">The backup does not contain the world save file.</sys:String>
+    <!--#endregion-->
+
+    <!--#region Server Update -->
+    <sys:String x:Key="ServerUpdate_Title">Server Update</sys:String>
+    <sys:String x:Key="ServerUpdate_WarningLabel">There was a problem while performing the server update. This may leave your server in a incomplete state.\r\n\r\nDo you want to continue with the server start, this could cause problems?</sys:String>
     <!--#endregion-->
 
 </Globalization:GlobalizationResourceDictionary>
\ No newline at end of file
diff --git a/CSM/latest.exe b/CSM/latest.exe
index e988c178..ddde5727 100644
Binary files a/CSM/latest.exe and b/CSM/latest.exe differ
diff --git a/CSM/latest.txt b/CSM/latest.txt
index 7289deeb..0ddfe784 100644
--- a/CSM/latest.txt
+++ b/CSM/latest.txt
@@ -1 +1 @@
-1.1.35
+1.1.36
diff --git a/CSM/latest.zip b/CSM/latest.zip
index ca8cb176..d4d281c8 100644
Binary files a/CSM/latest.zip and b/CSM/latest.zip differ