diff --git a/PSM/PantropyServerManager_1.0.21.exe b/PSM/PantropyServerManager_1.0.21.exe
new file mode 100644
index 00000000..5a0fc9e6
Binary files /dev/null and b/PSM/PantropyServerManager_1.0.21.exe differ
diff --git a/PSM/PantropyServerManager_1.0.21.zip b/PSM/PantropyServerManager_1.0.21.zip
new file mode 100644
index 00000000..fd3b980a
Binary files /dev/null and b/PSM/PantropyServerManager_1.0.21.zip differ
diff --git a/PSM/VersionFeed.xml b/PSM/VersionFeed.xml
index c3ee2f76..e0c84169 100644
--- a/PSM/VersionFeed.xml
+++ b/PSM/VersionFeed.xml
@@ -5,7 +5,60 @@
   <title>Pantropy Server Manager Version Feed</title>
   <subtitle>This is the Pantropy Server Manager release version feed.</subtitle>
   <link href="http://servermanagers.freeforums.net/" />
-  <updated>2020-03-07T01:00:00Z</updated>
+  <updated>2020-03-12T00:00:00Z</updated>
+
+  <entry>
+    <id>urn:uuid:CD977A08-1D8C-42CF-883B-FB66C5626452</id>
+    <title>1.0.21 (1.0.21.1)</title>
+    <summary>1.0.21.1</summary>
+    <link href="" />
+    <updated>2020-03-12T00: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;">BUGFIX</u>
+          <br/>
+          <ul>
+            <li>Game Data - have crash when loading with an invalid gamedata file.</li>
+          </ul>
+          <u style="font-size: .9em;">CHANGE</u>
+          <br/>
+          <ul>
+            <li>Game Data Window - Added a validate button, to validate the user gamedata files.</li>
+            <li>Game Data Window - Displays the gamedata file in Red if the file is invalid.</li>
+            <li>Game Data Window - When adding a new gamedata file, will display an error if the file is invalid.</li>
+          </ul>
+        </p>
+      </div>
+    </content>
+    <author>
+      <name>bletch</name>
+      <email>bletch1971@hotmail.com</email>
+    </author>
+  </entry>
+
+  <entry>
+    <id>urn:uuid:D8AD9F83-A7D0-49D8-905D-8F17164F2CBA</id>
+    <title>1.0.20 (1.0.20.1)</title>
+    <summary>1.0.20.1</summary>
+    <link href="" />
+    <updated>2020-03-08T00: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;">BUGFIX</u>
+          <br/>
+          <ul>
+            <li>Dialog forms - have fixed an issue where the dialog forms would open behind the current window.</li>
+          </ul>
+        </p>
+      </div>
+    </content>
+    <author>
+      <name>bletch</name>
+      <email>bletch1971@hotmail.com</email>
+    </author>
+  </entry>
 
   <entry>
     <id>urn:uuid:E27DA119-DD66-403A-9A4B-80CE2ECDBDF5</id>
diff --git a/PSM/en-US.xaml b/PSM/en-US.xaml
index 20d50057..721af39c 100644
--- a/PSM/en-US.xaml
+++ b/PSM/en-US.xaml
@@ -268,6 +268,7 @@
     <sys:String x:Key="GameDataWindow_OpenGameDataFolderTooltip">Open Game Data Folder</sys:String>
     <sys:String x:Key="GameDataWindow_GameDataForumTooltip">Open Game Data Forum</sys:String>
     <sys:String x:Key="GameDataWindow_ReloadGameDataTooltip">Reload Game Data Files</sys:String>
+    <sys:String x:Key="GameDataWindow_ValidateGameDataTooltip">Validate Game Data Files</sys:String>
     <sys:String x:Key="GameDataWindow_RemoveGameDataTooltip">Delete Game Data File</sys:String>
 
     <sys:String x:Key="GameDataWindow_NameColumnLabel">Name</sys:String>
@@ -276,6 +277,7 @@
 
     <sys:String x:Key="GameDataWindow_AddErrorTitle">Add Action Error</sys:String>
     <sys:String x:Key="GameDataWindow_AddErrorLabel">An error occurred while reading the selected file.</sys:String>
+    <sys:String x:Key="GameDataWindow_ExistingFileErrorLabel">A file with the same name already exists, delete the existing file and try again.</sys:String>
     <sys:String x:Key="GameDataWindow_ClearTitle">Confirm Clear Action</sys:String>
     <sys:String x:Key="GameDataWindow_ClearLabel">Click 'Yes' to confirm you want to clear all.</sys:String>
     <sys:String x:Key="GameDataWindow_ClearErrorTitle">Clear Action Error</sys:String>
@@ -284,6 +286,11 @@
     <sys:String x:Key="GameDataWindow_DeleteErrorTitle">Delete Action Error</sys:String>
     <sys:String x:Key="GameDataWindow_OpenErrorTitle">Open Folder Error</sys:String>
     <sys:String x:Key="GameDataWindow_LoadErrorTitle">Load Error</sys:String>
+    <sys:String x:Key="GameDataWindow_ValidateSuccessTitle">Validation</sys:String>
+    <sys:String x:Key="GameDataWindow_ValidateSuccessLabel">All game data files are valid.</sys:String>
+    <sys:String x:Key="GameDataWindow_ValidateErrorTitle">Validation Error</sys:String>
+    <sys:String x:Key="GameDataWindow_ValidateErrorLabel">The following file(s) have errors</sys:String>
+    <sys:String x:Key="GameDataWindow_ValidateErrorMessage">The file is not valid. It may contain errors or have incorrect formatting.</sys:String>
 
     <sys:String x:Key="GameDataWindow_AddDialogTitle">Select game data file</sys:String>
     <sys:String x:Key="GameDataWindow_GameDataDefaultExtension">gamedata</sys:String>
diff --git a/PSM/latest.exe b/PSM/latest.exe
index 58cd64b8..5a0fc9e6 100644
Binary files a/PSM/latest.exe and b/PSM/latest.exe differ
diff --git a/PSM/latest.txt b/PSM/latest.txt
index ecba93a4..bb56ccda 100644
--- a/PSM/latest.txt
+++ b/PSM/latest.txt
@@ -1 +1 @@
-1.0.19
+1.0.21
diff --git a/PSM/latest.zip b/PSM/latest.zip
index ff4fdda8..fd3b980a 100644
Binary files a/PSM/latest.zip and b/PSM/latest.zip differ