diff --git a/Crypto Notepad/App.config b/Crypto Notepad/App.config
index 86c69a6..81db5ff 100644
--- a/Crypto Notepad/App.config	
+++ b/Crypto Notepad/App.config	
@@ -12,24 +12,12 @@
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup>
     <userSettings>
         <Crypto_Notepad.Properties.Settings>
-            <setting name="TopPosition" serializeAs="String">
-                <value>0</value>
-            </setting>
-            <setting name="LeftPosition" serializeAs="String">
-                <value>0</value>
-            </setting>
             <setting name="RichTextFont" serializeAs="String">
                 <value>Consolas</value>
             </setting>
             <setting name="RichForeColor" serializeAs="String">
                 <value>228, 228, 228</value>
             </setting>
-            <setting name="FormWidth" serializeAs="String">
-                <value>690</value>
-            </setting>
-            <setting name="FormHeight" serializeAs="String">
-                <value>430</value>
-            </setting>
             <setting name="RichBackColor" serializeAs="String">
                 <value>56, 56, 56</value>
             </setting>
@@ -72,6 +60,12 @@
             <setting name="AutoCheckUpdate" serializeAs="String">
                 <value>True</value>
             </setting>
+            <setting name="AutoLock" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="WindowSize" serializeAs="String">
+                <value>645, 460</value>
+            </setting>
         </Crypto_Notepad.Properties.Settings>
         <EncryptPad.Properties.Settings>
             <setting name="TopPosition" serializeAs="String">
diff --git a/Crypto Notepad/Properties/Settings.Designer.cs b/Crypto Notepad/Properties/Settings.Designer.cs
index 3d3fef1..f68fc3c 100644
--- a/Crypto Notepad/Properties/Settings.Designer.cs	
+++ b/Crypto Notepad/Properties/Settings.Designer.cs	
@@ -23,32 +23,6 @@ public static Settings Default {
             }
         }
         
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Configuration.SettingsProviderAttribute(typeof(PortableSettingsProvider))]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("0")]
-        public int TopPosition {
-            get {
-                return ((int)(this["TopPosition"]));
-            }
-            set {
-                this["TopPosition"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Configuration.SettingsProviderAttribute(typeof(PortableSettingsProvider))]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("0")]
-        public int LeftPosition {
-            get {
-                return ((int)(this["LeftPosition"]));
-            }
-            set {
-                this["LeftPosition"] = value;
-            }
-        }
-        
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Configuration.SettingsProviderAttribute(typeof(PortableSettingsProvider))]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -75,32 +49,6 @@ public string RichTextFont {
             }
         }
         
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Configuration.SettingsProviderAttribute(typeof(PortableSettingsProvider))]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("690")]
-        public int FormWidth {
-            get {
-                return ((int)(this["FormWidth"]));
-            }
-            set {
-                this["FormWidth"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Configuration.SettingsProviderAttribute(typeof(PortableSettingsProvider))]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("430")]
-        public int FormHeight {
-            get {
-                return ((int)(this["FormHeight"]));
-            }
-            set {
-                this["FormHeight"] = value;
-            }
-        }
-        
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Configuration.SettingsProviderAttribute(typeof(PortableSettingsProvider))]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -282,5 +230,43 @@ public bool AutoCheckUpdate {
                 this["AutoCheckUpdate"] = value;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Configuration.SettingsProviderAttribute(typeof(PortableSettingsProvider))]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("False")]
+        public bool AutoLock {
+            get {
+                return ((bool)(this["AutoLock"]));
+            }
+            set {
+                this["AutoLock"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Configuration.SettingsProviderAttribute(typeof(PortableSettingsProvider))]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        public global::System.Drawing.Point WindowLocation {
+            get {
+                return ((global::System.Drawing.Point)(this["WindowLocation"]));
+            }
+            set {
+                this["WindowLocation"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Configuration.SettingsProviderAttribute(typeof(PortableSettingsProvider))]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("645, 460")]
+        public global::System.Drawing.Size WindowSize {
+            get {
+                return ((global::System.Drawing.Size)(this["WindowSize"]));
+            }
+            set {
+                this["WindowSize"] = value;
+            }
+        }
     }
 }
diff --git a/Crypto Notepad/Properties/Settings.settings b/Crypto Notepad/Properties/Settings.settings
index e54c745..198442e 100644
--- a/Crypto Notepad/Properties/Settings.settings	
+++ b/Crypto Notepad/Properties/Settings.settings	
@@ -2,24 +2,12 @@
 <SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="Crypto_Notepad.Properties" GeneratedClassName="Settings">
   <Profiles />
   <Settings>
-    <Setting Name="TopPosition" Provider="PortableSettingsProvider" Type="System.Int32" Scope="User">
-      <Value Profile="(Default)">0</Value>
-    </Setting>
-    <Setting Name="LeftPosition" Provider="PortableSettingsProvider" Type="System.Int32" Scope="User">
-      <Value Profile="(Default)">0</Value>
-    </Setting>
     <Setting Name="RichTextFont" Provider="PortableSettingsProvider" Type="System.String" Scope="User">
       <Value Profile="(Default)">Consolas</Value>
     </Setting>
     <Setting Name="RichForeColor" Provider="PortableSettingsProvider" Type="System.Drawing.Color" Scope="User">
       <Value Profile="(Default)">228, 228, 228</Value>
     </Setting>
-    <Setting Name="FormWidth" Provider="PortableSettingsProvider" Type="System.Int32" Scope="User">
-      <Value Profile="(Default)">690</Value>
-    </Setting>
-    <Setting Name="FormHeight" Provider="PortableSettingsProvider" Type="System.Int32" Scope="User">
-      <Value Profile="(Default)">430</Value>
-    </Setting>
     <Setting Name="RichBackColor" Provider="PortableSettingsProvider" Type="System.Drawing.Color" Scope="User">
       <Value Profile="(Default)">56, 56, 56</Value>
     </Setting>
@@ -62,5 +50,14 @@
     <Setting Name="AutoCheckUpdate" Provider="PortableSettingsProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
+    <Setting Name="AutoLock" Provider="PortableSettingsProvider" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
+    <Setting Name="WindowLocation" Provider="PortableSettingsProvider" Type="System.Drawing.Point" Scope="User">
+      <Value Profile="(Default)" />
+    </Setting>
+    <Setting Name="WindowSize" Provider="PortableSettingsProvider" Type="System.Drawing.Size" Scope="User">
+      <Value Profile="(Default)">645, 460</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file