diff --git a/Logic/ApplicationSettings.cs b/Logic/ApplicationSettings.cs
index 1f0c3133..96843cf3 100644
--- a/Logic/ApplicationSettings.cs
+++ b/Logic/ApplicationSettings.cs
@@ -40,9 +40,9 @@ public class ApplicationSettings
         private List<string> _globalProperties;
 
         // Application Specific Settings we want to protect
-        private string _clientVersion = "1.8.0";
+        private string _clientVersion = "1.8.1";
         private string _version = "5";
-        private int _clientCodeVersion = 127;
+        private int _clientCodeVersion = 128;
 
         public string ClientVersion { get { return _clientVersion; } }
         public string Version { get { return _version; } }
@@ -187,7 +187,24 @@ public void Save()
                     {
                         if (property.CanRead && !_globalProperties.Contains(property.Name) && property.Name != "HardwareKey")
                         {
-                            writer.WriteElementString(property.Name, "" + property.GetValue(_instance));
+                            if (property.Name == "Commands")
+                            {
+                                writer.WriteStartElement("commands");
+
+                                foreach (Command command in _instance.Commands)
+                                {
+                                    writer.WriteStartElement(command.Code);
+                                    writer.WriteElementString("commandString", command.CommandString);
+                                    writer.WriteElementString("commandValidation", command.Validation);
+                                    writer.WriteEndElement();
+                                }
+
+                                writer.WriteEndElement();
+                            }
+                            else
+                            {
+                                writer.WriteElementString(property.Name, "" + property.GetValue(_instance));
+                            }
                         }
                     }
                     catch
@@ -229,7 +246,7 @@ public void PopulateFromXml(XmlDocument document)
             foreach (XmlNode node in document.DocumentElement.ChildNodes)
             {
                 // Are we a commands node?
-                if (node.Name == "commands")
+                if (node.Name.ToLower() == "commands")
                 {
                     List<Command> commands = new List<Command>();
 
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
index 3e50ab10..76d8e804 100644
--- a/Properties/AssemblyInfo.cs
+++ b/Properties/AssemblyInfo.cs
@@ -30,6 +30,6 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("10.8.0.4")]
-[assembly: AssemblyFileVersion("10.8.0.4")]
+[assembly: AssemblyVersion("10.8.1.0")]
+[assembly: AssemblyFileVersion("10.8.1.0")]
 [assembly: NeutralResourcesLanguageAttribute("en-GB")]