diff --git a/ASM/ArkServerManager_1.0.358.exe b/ASM/ArkServerManager_1.0.358.exe
new file mode 100644
index 00000000..eb88d9ce
Binary files /dev/null and b/ASM/ArkServerManager_1.0.358.exe differ
diff --git a/ASM/ArkServerManager_1.0.358.zip b/ASM/ArkServerManager_1.0.358.zip
new file mode 100644
index 00000000..8b9fe0f6
Binary files /dev/null and b/ASM/ArkServerManager_1.0.358.zip differ
diff --git a/ASM/VersionFeed.xml b/ASM/VersionFeed.xml
index 8114bfd3..b29f12a7 100644
--- a/ASM/VersionFeed.xml
+++ b/ASM/VersionFeed.xml
@@ -5,7 +5,42 @@
   <title>Ark Server Manager Version Feed</title>
   <subtitle>This is the Ark Server Manager release version feed.</subtitle>
   <link href="http://arkservermanager.freeforums.net/" />
-  <updated>2020-03-05T00:00:00Z</updated>
+  <updated>2020-03-09T00:00:00Z</updated>
+
+  <entry>
+    <id>urn:uuid:A3359CF9-37EE-4068-BEF6-2F661C2F9A00</id>
+    <title>1.0.358 (1.0.358.2)</title>
+    <summary>1.0.358.2</summary>
+    <link href="" />
+    <updated>2020-03-09T00: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>
+            <li>Server Settings - have added error dialogs when trying to add a child record without selecting a parent record first (crafting overrides, map spawner overrides and supply crate overrides).</li>
+            <li>Server Settings (Engrams section) - will not write OverrideNamedEngramEntries entries to the game.ini file unless one or more default values have changed.</li>
+          </ul>
+          <u style="font-size: .9em;">CHANGE</u>
+          <br/>
+          <ul>
+            <li>Server Settings (Dino section) - changed the way the sort works for the dino grid.</li>
+            <li>Server Settings (Engrams section) - added column header tooltips to for more clarity.</li>
+            <li>Server Settings (Engrams section) - changed the way the sort works for the engrams grid.</li>
+            <li>Server Settings (Environment section) - changed the way the sort works for the resources grid.</li>
+            <li>fr-FR Translation file updated. (thanks @angemymy)</li>
+            <li>pt-BR Translation file updated. (thanks @bruno5011)</li>
+          </ul>
+        </p>
+      </div>
+    </content>
+    <author>
+      <name>bletch</name>
+      <email>bletch1971@hotmail.com</email>
+    </author>
+  </entry>
 
   <entry>
     <id>urn:uuid:72F068F8-1E22-4A60-87B7-3BA9B133DDF1</id>
diff --git a/ASM/en-US.xaml b/ASM/en-US.xaml
index 46457997..ccc693c7 100644
--- a/ASM/en-US.xaml
+++ b/ASM/en-US.xaml
@@ -752,15 +752,17 @@
     <sys:String x:Key="ServerSettings_Save_UpdatePermissions_ErrorLabel">Failed to update directory permissions. Ensure you have administrator rights on this machine and try again. If the problem persists, please report this as a bug.</sys:String>
     <sys:String x:Key="ServerSettings_Save_UpdateSchedule_ErrorTitle">Update schedule failed</sys:String>
     <sys:String x:Key="ServerSettings_Save_UpdateSchedule_ErrorLabel">Failed to update scheduled tasks. Ensure you have administrator rights on this machine and try again. If the problem persists, please report this as a bug.</sys:String>
-    <sys:String x:Key="ServerSettings_ResetTitle">Confirm Reset Action</sys:String>
-    <sys:String x:Key="ServerSettings_ResetLabel">Click 'Yes' to confirm you want to perform the reset.</sys:String>
     <sys:String x:Key="ServerSettings_LoadCustomConfig_Title">Load Ini File.</sys:String>
     <sys:String x:Key="ServerSettings_LoadCustomConfig_Label">The ini file was successfully loaded.</sys:String>
     <sys:String x:Key="ServerSettings_LoadCustomConfig_ErrorTitle">Ini File Load Error</sys:String>
+    <sys:String x:Key="ServerSettings_AddChildErrorTitle">Add Record Error</sys:String>
+    <sys:String x:Key="ServerSettings_AddChildErrorLabel">You must select a parent record to add the new record to.</sys:String>
     <sys:String x:Key="ServerSettings_ClearTitle">Confirm Clear Action</sys:String>
     <sys:String x:Key="ServerSettings_ClearLabel">Click 'Yes' to confirm you want to clear all.</sys:String>
     <sys:String x:Key="ServerSettings_DeleteTitle">Confirm Delete Action</sys:String>
     <sys:String x:Key="ServerSettings_DeleteLabel">Click 'Yes' to confirm you want to perform the delete.</sys:String>
+    <sys:String x:Key="ServerSettings_ResetTitle">Confirm Reset Action</sys:String>
+    <sys:String x:Key="ServerSettings_ResetLabel">Click 'Yes' to confirm you want to perform the reset.</sys:String>
     <!--#endregion-->
 
     <!--#region Server Settings - Administration   -->
@@ -1566,15 +1568,25 @@
     <sys:String x:Key="ServerSettings_FilterOnlySelectedEngramsLabel">Filter Only Selected Engrams</sys:String>
     <sys:String x:Key="ServerSettings_FilterOnlySelectedEngramsTooltip">If enabled, only the selected engram will be visible.</sys:String>
     <sys:String x:Key="ServerSettings_SaveEngramOverrideColumnLabel">Selected</sys:String>
+    <sys:String x:Key="ServerSettings_SaveEngramOverrideColumnTooltip">Selected</sys:String>
     <sys:String x:Key="ServerSettings_EngramsNameColumnLabel">Name</sys:String>
+    <sys:String x:Key="ServerSettings_EngramsNameColumnTooltip">Name of the Engram (engram class name).</sys:String>
     <sys:String x:Key="ServerSettings_EngramsModColumnLabel">Mod</sys:String>
+    <sys:String x:Key="ServerSettings_EngramsModColumnTooltip">Mod</sys:String>
+    <sys:String x:Key="ServerSettings_EngramsIsTekgramColumnLabel">Is Tekgram</sys:String>
+    <sys:String x:Key="ServerSettings_EngramsIsTekgramColumnTooltip">Is Tekgram</sys:String>
     <sys:String x:Key="ServerSettings_EngramsLevelColumnLabel">Level</sys:String>
+    <sys:String x:Key="ServerSettings_EngramsLevelColumnTooltip">Player level when the engram can be manually unlocked.</sys:String>
     <sys:String x:Key="ServerSettings_EngramsCostColumnLabel">Cost</sys:String>
+    <sys:String x:Key="ServerSettings_EngramsCostColumnTooltip">The amount fo engram points needed to manually unlock.</sys:String>
     <sys:String x:Key="ServerSettings_EngramsHiddenColumnLabel">Hidden</sys:String>
-    <sys:String x:Key="ServerSettings_EngramsKnownColumnLabel">Known</sys:String>
+    <sys:String x:Key="ServerSettings_EngramsHiddenColumnTooltip">If enabled, the engram will be removed from the engram unlock screen and cannot be learned.</sys:String>
     <sys:String x:Key="ServerSettings_EngramsRemovePrereqsColumnLabel">Remove Prereqs</sys:String>
+    <sys:String x:Key="ServerSettings_EngramsRemovePrereqsColumnTooltip">If enabled, will remove the prerequisites needed to unlock the engram.</sys:String>
     <sys:String x:Key="ServerSettings_EngramsAutoUnlockColumnLabel">Auto Unlock</sys:String>
+    <sys:String x:Key="ServerSettings_EngramsAutoUnlockColumnTooltip">Is enabled, the engram will be automatically unlocked at the specified level.</sys:String>
     <sys:String x:Key="ServerSettings_EngramsLevelToAutoUnlockColumnLabel">Unlock Level</sys:String>
+    <sys:String x:Key="ServerSettings_EngramsLevelToAutoUnlockColumnTooltip">Player level when the engram is automatically unlocked. Auto Unlock must be enabled.</sys:String>
     <sys:String x:Key="ServerSettings_EngramsRemoveRecordTooltip">Remove this Engram</sys:String>
 
     <sys:String x:Key="ServerSettings_EngramsOverride_EngramsRemoveRecordTitle">Remove Engram</sys:String>
diff --git a/ASM/latest.exe b/ASM/latest.exe
index 528bdcb2..eb88d9ce 100644
Binary files a/ASM/latest.exe and b/ASM/latest.exe differ
diff --git a/ASM/latest.txt b/ASM/latest.txt
index db85bcb2..d24d1c3c 100644
--- a/ASM/latest.txt
+++ b/ASM/latest.txt
@@ -1 +1 @@
-1.0.357
+1.0.358
diff --git a/ASM/latest.zip b/ASM/latest.zip
index f2536c74..8b9fe0f6 100644
Binary files a/ASM/latest.zip and b/ASM/latest.zip differ