.github/FUNDING.yml

@@ -2,11 +2,11 @@
 
 github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
 patreon: # Replace with a single Patreon username
-open_collective: #
+open_collective: # Replace with a single Open Collective username
-ko_fi: 
+ko_fi: sigmanor
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
 community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-liberapay: 
+liberapay: sigmanor
 issuehunt: #
 otechie: # Replace with a single Otechie username
-custom: https://github.com/Crypto-Notepad/Crypto-Notepad/wiki/Support-the-project
+custom: paypal.me/sigmanor

CODE_OF_CONDUCT.md

@@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at dock-brunt-rarity@duck.com. All
+reported by contacting the project team at sigmanor@pm.me. All
 complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. The project team is
 obligated to maintain confidentiality with regard to the reporter of an incident.

CONTRIBUTING.md

@@ -4,7 +4,7 @@ Before starting, make sure that you visited the [projects](https://github.com/Cr
 ## How to contribute to Crypto Notepad
 
 ### Did you find any bug/have an idea how to improve the project?
-* Send me a message: [`email`](mailto:dock-brunt-rarity@duck.com)
+* Send me a message: [`telegram`](https://t.me/Sigmanor) [`facebook`](https://www.fb.com/SlGMANOR) [`email`](mailto:sigmanor@pm.me)
 * Create an [issue](https://github.com/Sigmanor/Crypto-Notepad/issues/new/choose).
 
 ###  You can help me fix some bug/implement a new feature?

Crypto Notepad/App.config

@@ -12,7 +12,7 @@
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup>
     <userSettings>
         <Crypto_Notepad.Properties.Settings>
-            <setting name="editorForeColor" serializeAs="String">
+            <setting name="editroForeColor" serializeAs="String">
                 <value>Black</value>
             </setting>
             <setting name="editorBackColor" serializeAs="String">
@@ -192,15 +192,6 @@
             <setting name="shortcutKeys" serializeAs="String">
                 <value>True</value>
             </setting>
-            <setting name="openTxtUnencrypted" serializeAs="String">
-                <value>False</value>
-            </setting>
-            <setting name="trayMenu" serializeAs="String">
-                <value>False</value>
-            </setting>
-            <setting name="statusPanelPasteboard" serializeAs="String">
-                <value>False</value>
-            </setting>
         </Crypto_Notepad.Properties.Settings>
     </userSettings>
 </configuration>

Crypto Notepad/Crypto Notepad.csproj

@@ -56,15 +56,14 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>embedded</DebugType>
+    <DebugType>PdbOnly</DebugType>
-    <Optimize>true</Optimize>
+    <Optimize>True</Optimize>
     <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <Prefer32Bit>false</Prefer32Bit>
-    <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
@@ -82,9 +81,6 @@
   <PropertyGroup>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
-  <PropertyGroup>
-    <NoWin32Manifest>true</NoWin32Manifest>
-  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Costura, Version=4.1.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
       <HintPath>..\packages\Costura.Fody.4.1.0\lib\net40\Costura.dll</HintPath>
@@ -203,12 +199,7 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\clock--plus.png" />
-    <None Include="Resources\clock_add.png" />
-    <None Include="Resources\clipboard-text.png" />
     <None Include="Resources\Updater.exe" />
-    <None Include="Resources\application.png" />
-    <None Include="Resources\application-dock-180.png" />
     <Content Include="Notepad_Lock.ico" />
   </ItemGroup>
   <ItemGroup>

Crypto Notepad/External Libraries/Methods.cs

@@ -1,8 +1,6 @@
 using Microsoft.Win32;
 using System;
-using System.Drawing;
 using System.IO;
-using System.Linq;
 using System.Reflection;
 using System.Windows.Forms;
 
@@ -19,12 +17,6 @@ public static void AppendLine(this TextBox source, string value)
                 source.AppendText("\r\n" + value);
         }
 
-        public static bool IsOnScreen(Form form)
-        {
-            Rectangle formRectangle = new Rectangle(form.Left, form.Top, form.Width, form.Height);
-            return Screen.AllScreens.Any(s => s.WorkingArea.IntersectsWith(formRectangle));
-        }
-
         public static void Times(this int count, Action action)
         {
             for (int i = 0; i < count; i++)

Crypto Notepad/Forms/ChangePasswordForm.Designer.cs

@@ -35,11 +35,11 @@ private void InitializeComponent()
             this.lockPictureBox = new System.Windows.Forms.PictureBox();
             this.showNewKeyPictureBox = new System.Windows.Forms.PictureBox();
             this.showOldKeyPictureBox = new System.Windows.Forms.PictureBox();
+            this.oldKeyTextBox = new System.Windows.Forms.PlaceholderTextBox();
+            this.newKeyTextBox = new System.Windows.Forms.PlaceholderTextBox();
             this.statusLabel = new System.Windows.Forms.Label();
             this.changeKeyFormToolTip = new System.Windows.Forms.ToolTip(this.components);
             this.passwordGeneratorButton = new System.Windows.Forms.Button();
-            this.oldKeyTextBox = new System.Windows.Forms.PlaceholderTextBox();
-            this.newKeyTextBox = new System.Windows.Forms.PlaceholderTextBox();
             this.mainPanel.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.lockPictureBox)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.showNewKeyPictureBox)).BeginInit();
@@ -49,7 +49,6 @@ private void InitializeComponent()
             // acceptButton
             // 
             this.acceptButton.Enabled = false;
-            this.acceptButton.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
             this.acceptButton.Location = new System.Drawing.Point(211, 80);
             this.acceptButton.Name = "acceptButton";
             this.acceptButton.Size = new System.Drawing.Size(53, 25);
@@ -79,7 +78,7 @@ private void InitializeComponent()
             this.lockPictureBox.Image = global::Crypto_Notepad.Properties.Resources.gnupg_keys;
             this.lockPictureBox.Location = new System.Drawing.Point(8, 14);
             this.lockPictureBox.Name = "lockPictureBox";
-            this.lockPictureBox.Size = new System.Drawing.Size(48, 48);
+            this.lockPictureBox.Size = new System.Drawing.Size(47, 47);
             this.lockPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
             this.lockPictureBox.TabIndex = 7;
             this.lockPictureBox.TabStop = false;
@@ -91,7 +90,7 @@ private void InitializeComponent()
             this.showNewKeyPictureBox.Image = global::Crypto_Notepad.Properties.Resources.eye_half;
             this.showNewKeyPictureBox.Location = new System.Drawing.Point(269, 39);
             this.showNewKeyPictureBox.Name = "showNewKeyPictureBox";
-            this.showNewKeyPictureBox.Size = new System.Drawing.Size(19, 23);
+            this.showNewKeyPictureBox.Size = new System.Drawing.Size(18, 22);
             this.showNewKeyPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
             this.showNewKeyPictureBox.TabIndex = 5;
             this.showNewKeyPictureBox.TabStop = false;
@@ -104,12 +103,40 @@ private void InitializeComponent()
             this.showOldKeyPictureBox.Image = global::Crypto_Notepad.Properties.Resources.eye_half;
             this.showOldKeyPictureBox.Location = new System.Drawing.Point(269, 14);
             this.showOldKeyPictureBox.Name = "showOldKeyPictureBox";
-            this.showOldKeyPictureBox.Size = new System.Drawing.Size(19, 23);
+            this.showOldKeyPictureBox.Size = new System.Drawing.Size(18, 22);
             this.showOldKeyPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
             this.showOldKeyPictureBox.TabIndex = 5;
             this.showOldKeyPictureBox.TabStop = false;
             this.showOldKeyPictureBox.Click += new System.EventHandler(this.ShowOldKeyPictureBox_Click);
             // 
+            // oldKeyTextBox
+            // 
+            this.oldKeyTextBox.Location = new System.Drawing.Point(64, 14);
+            this.oldKeyTextBox.Name = "oldKeyTextBox";
+            this.oldKeyTextBox.Placeholder = "Old password";
+            this.oldKeyTextBox.PlaceholderActiveForeColor = System.Drawing.Color.DarkGray;
+            this.oldKeyTextBox.PlaceholderFont = new System.Drawing.Font("Segoe UI", 8.25F);
+            this.oldKeyTextBox.PlaceholderForeColor = System.Drawing.Color.DarkGray;
+            this.oldKeyTextBox.Size = new System.Drawing.Size(206, 22);
+            this.oldKeyTextBox.TabIndex = 0;
+            this.oldKeyTextBox.UseSystemPasswordChar = true;
+            this.oldKeyTextBox.TextChanged += new System.EventHandler(this.OldKeyTextBox_TextChanged);
+            this.oldKeyTextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.OldKeyTextBox_KeyDown);
+            // 
+            // newKeyTextBox
+            // 
+            this.newKeyTextBox.Location = new System.Drawing.Point(64, 39);
+            this.newKeyTextBox.Name = "newKeyTextBox";
+            this.newKeyTextBox.Placeholder = "New password";
+            this.newKeyTextBox.PlaceholderActiveForeColor = System.Drawing.Color.DarkGray;
+            this.newKeyTextBox.PlaceholderFont = new System.Drawing.Font("Segoe UI", 8.25F);
+            this.newKeyTextBox.PlaceholderForeColor = System.Drawing.Color.DarkGray;
+            this.newKeyTextBox.Size = new System.Drawing.Size(206, 22);
+            this.newKeyTextBox.TabIndex = 1;
+            this.newKeyTextBox.UseSystemPasswordChar = true;
+            this.newKeyTextBox.TextChanged += new System.EventHandler(this.NewKeyTextBox_TextChanged);
+            this.newKeyTextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.NewKeyTextBox_KeyDown);
+            // 
             // statusLabel
             // 
             this.statusLabel.AutoSize = true;
@@ -132,36 +159,6 @@ private void InitializeComponent()
             this.passwordGeneratorButton.UseVisualStyleBackColor = true;
             this.passwordGeneratorButton.Click += new System.EventHandler(this.PasswordGeneratorButton_Click);
             // 
-            // oldKeyTextBox
-            // 
-            this.oldKeyTextBox.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
-            this.oldKeyTextBox.Location = new System.Drawing.Point(64, 14);
-            this.oldKeyTextBox.Name = "oldKeyTextBox";
-            this.oldKeyTextBox.Placeholder = "Old password";
-            this.oldKeyTextBox.PlaceholderActiveForeColor = System.Drawing.Color.DarkGray;
-            this.oldKeyTextBox.PlaceholderFont = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
-            this.oldKeyTextBox.PlaceholderForeColor = System.Drawing.Color.DarkGray;
-            this.oldKeyTextBox.Size = new System.Drawing.Size(206, 23);
-            this.oldKeyTextBox.TabIndex = 0;
-            this.oldKeyTextBox.UseSystemPasswordChar = true;
-            this.oldKeyTextBox.TextChanged += new System.EventHandler(this.OldKeyTextBox_TextChanged);
-            this.oldKeyTextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.OldKeyTextBox_KeyDown);
-            // 
-            // newKeyTextBox
-            // 
-            this.newKeyTextBox.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
-            this.newKeyTextBox.Location = new System.Drawing.Point(64, 39);
-            this.newKeyTextBox.Name = "newKeyTextBox";
-            this.newKeyTextBox.Placeholder = "New password";
-            this.newKeyTextBox.PlaceholderActiveForeColor = System.Drawing.Color.DarkGray;
-            this.newKeyTextBox.PlaceholderFont = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
-            this.newKeyTextBox.PlaceholderForeColor = System.Drawing.Color.DarkGray;
-            this.newKeyTextBox.Size = new System.Drawing.Size(206, 23);
-            this.newKeyTextBox.TabIndex = 1;
-            this.newKeyTextBox.UseSystemPasswordChar = true;
-            this.newKeyTextBox.TextChanged += new System.EventHandler(this.NewKeyTextBox_TextChanged);
-            this.newKeyTextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.NewKeyTextBox_KeyDown);
-            // 
             // ChangePasswordForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

Crypto Notepad/Forms/EnterPasswordForm.Designer.cs

@@ -46,7 +46,6 @@ private void InitializeComponent()
             // okButton
             // 
             this.okButton.Enabled = false;
-            this.okButton.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
             this.okButton.Location = new System.Drawing.Point(211, 80);
             this.okButton.Name = "okButton";
             this.okButton.Size = new System.Drawing.Size(53, 25);
@@ -75,7 +74,7 @@ private void InitializeComponent()
             this.lockPictureBox.Image = global::Crypto_Notepad.Properties.Resources.key_solid;
             this.lockPictureBox.Location = new System.Drawing.Point(8, 14);
             this.lockPictureBox.Name = "lockPictureBox";
-            this.lockPictureBox.Size = new System.Drawing.Size(48, 48);
+            this.lockPictureBox.Size = new System.Drawing.Size(47, 47);
             this.lockPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
             this.lockPictureBox.TabIndex = 6;
             this.lockPictureBox.TabStop = false;
@@ -83,7 +82,6 @@ private void InitializeComponent()
             // fileNameLabel
             // 
             this.fileNameLabel.AutoEllipsis = true;
-            this.fileNameLabel.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
             this.fileNameLabel.Location = new System.Drawing.Point(61, 14);
             this.fileNameLabel.Name = "fileNameLabel";
             this.fileNameLabel.Size = new System.Drawing.Size(221, 13);
@@ -93,14 +91,13 @@ private void InitializeComponent()
             // 
             // keyTextBox
             // 
-            this.keyTextBox.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
             this.keyTextBox.Location = new System.Drawing.Point(64, 39);
             this.keyTextBox.Name = "keyTextBox";
             this.keyTextBox.Placeholder = "Password";
             this.keyTextBox.PlaceholderActiveForeColor = System.Drawing.Color.DarkGray;
-            this.keyTextBox.PlaceholderFont = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+            this.keyTextBox.PlaceholderFont = new System.Drawing.Font("Segoe UI", 8.25F);
             this.keyTextBox.PlaceholderForeColor = System.Drawing.Color.DarkGray;
-            this.keyTextBox.Size = new System.Drawing.Size(206, 23);
+            this.keyTextBox.Size = new System.Drawing.Size(206, 22);
             this.keyTextBox.TabIndex = 0;
             this.keyTextBox.UseSystemPasswordChar = true;
             this.keyTextBox.TextChanged += new System.EventHandler(this.KeyTextBox_TextChanged);
@@ -114,7 +111,7 @@ private void InitializeComponent()
             this.showKeyPictureBox.InitialImage = global::Crypto_Notepad.Properties.Resources.eye_half;
             this.showKeyPictureBox.Location = new System.Drawing.Point(269, 39);
             this.showKeyPictureBox.Name = "showKeyPictureBox";
-            this.showKeyPictureBox.Size = new System.Drawing.Size(19, 23);
+            this.showKeyPictureBox.Size = new System.Drawing.Size(18, 22);
             this.showKeyPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
             this.showKeyPictureBox.TabIndex = 3;
             this.showKeyPictureBox.TabStop = false;

Crypto Notepad/Forms/MainForm.Designer.cs

@@ -41,7 +41,6 @@ public void InitializeComponent()
             this.mainMenuSeparator2 = new System.Windows.Forms.ToolStripSeparator();
             this.openFileLocationMainMenu = new System.Windows.Forms.ToolStripMenuItem();
             this.deleteFileMainMenu = new System.Windows.Forms.ToolStripMenuItem();
-            this.tryToDecryptMainMenu = new System.Windows.Forms.ToolStripMenuItem();
             this.mainMenuSeparator3 = new System.Windows.Forms.ToolStripSeparator();
             this.exitMainMenu = new System.Windows.Forms.ToolStripMenuItem();
             this.editMainMenu = new System.Windows.Forms.ToolStripMenuItem();
@@ -59,7 +58,6 @@ public void InitializeComponent()
             this.clearClipboardMainMenu = new System.Windows.Forms.ToolStripMenuItem();
             this.wordWrapMainMenu = new System.Windows.Forms.ToolStripMenuItem();
             this.readOnlyMainMenu = new System.Windows.Forms.ToolStripMenuItem();
-            this.insertDateTimeMainMenu = new System.Windows.Forms.ToolStripMenuItem();
             this.mainMenuSeparator7 = new System.Windows.Forms.ToolStripSeparator();
             this.clearMainMenu = new System.Windows.Forms.ToolStripMenuItem();
             this.toolsMainMenu = new System.Windows.Forms.ToolStripMenuItem();
@@ -68,7 +66,6 @@ public void InitializeComponent()
             this.changePasswordMainMenu = new System.Windows.Forms.ToolStripMenuItem();
             this.lockMainMenu = new System.Windows.Forms.ToolStripMenuItem();
             this.settingsMainMenu = new System.Windows.Forms.ToolStripMenuItem();
-            this.pasteBoardMainMenu = new System.Windows.Forms.ToolStripMenuItem();
             this.helpMainMenu = new System.Windows.Forms.ToolStripMenuItem();
             this.documentationMainMenu = new System.Windows.Forms.ToolStripMenuItem();
             this.checkForUpdatesMainMenu = new System.Windows.Forms.ToolStripMenuItem();
@@ -99,7 +96,9 @@ public void InitializeComponent()
             this.searchFindNextButton = new System.Windows.Forms.Label();
             this.toolbarPanel = new System.Windows.Forms.TableLayoutPanel();
             this.closeToolbarButton = new System.Windows.Forms.Label();
+            this.lockToolbarButton = new System.Windows.Forms.PictureBox();
             this.newToolbarButton = new System.Windows.Forms.PictureBox();
+            this.changePasswordToolbarButton = new System.Windows.Forms.PictureBox();
             this.openToolbarButton = new System.Windows.Forms.PictureBox();
             this.pasteToolbarButton = new System.Windows.Forms.PictureBox();
             this.saveToolbarButton = new System.Windows.Forms.PictureBox();
@@ -107,11 +106,8 @@ public void InitializeComponent()
             this.fileLocationToolbarButton = new System.Windows.Forms.PictureBox();
             this.cutToolbarButton = new System.Windows.Forms.PictureBox();
             this.deleteFileToolbarButton = new System.Windows.Forms.PictureBox();
-            this.tryToDecryptToolbarButton = new System.Windows.Forms.PictureBox();
-            this.changePasswordToolbarButton = new System.Windows.Forms.PictureBox();
-            this.lockToolbarButton = new System.Windows.Forms.PictureBox();
-            this.alwaysOnTopToolbarButton = new System.Windows.Forms.PictureBox();
             this.settingsToolbarButton = new System.Windows.Forms.PictureBox();
+            this.alwaysOnTopToolbarButton = new System.Windows.Forms.PictureBox();
             this.statusPanel = new System.Windows.Forms.StatusStrip();
             this.statusPanelLabel = new System.Windows.Forms.ToolStripStatusLabel();
             this.statusPanelLengthLabel = new System.Windows.Forms.ToolStripStatusLabel();
@@ -120,15 +116,10 @@ public void InitializeComponent()
             this.statusPanelSizeLabel = new System.Windows.Forms.ToolStripStatusLabel();
             this.statusPanelReadonlyLabel = new System.Windows.Forms.ToolStripStatusLabel();
             this.statusPanelWordwrapLabel = new System.Windows.Forms.ToolStripStatusLabel();
-            this.statusPanelPasteboardLabel = new System.Windows.Forms.ToolStripStatusLabel();
             this.statusPanelClipboardProgressBar = new System.Windows.Forms.ToolStripProgressBar();
             this.trayIcon = new System.Windows.Forms.NotifyIcon(this.components);
             this.trayMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
-            this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.showTrayMenu = new System.Windows.Forms.ToolStripMenuItem();
-            this.resetWindowLocationTrayMenu = new System.Windows.Forms.ToolStripMenuItem();
-            this.showWindowTrayMenu = new System.Windows.Forms.ToolStripMenuItem();
-            this.hideWindowTrayMenu = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
             this.exitTrayMenu = new System.Windows.Forms.ToolStripMenuItem();
             this.fileLockedPanel = new System.Windows.Forms.Panel();
             this.fileLockedCloseButton = new System.Windows.Forms.Button();
@@ -142,12 +133,13 @@ public void InitializeComponent()
             this.statusPanelTimer = new System.Windows.Forms.Timer(this.components);
             this.lockTimer = new System.Windows.Forms.Timer(this.components);
             this.clipboardTimer = new System.Windows.Forms.Timer(this.components);
-            this.pasteBoardTimer = new System.Windows.Forms.Timer(this.components);
             this.mainMenu.SuspendLayout();
             this.contextMenu.SuspendLayout();
             this.searchPanel.SuspendLayout();
             this.toolbarPanel.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.lockToolbarButton)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.newToolbarButton)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.changePasswordToolbarButton)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.openToolbarButton)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pasteToolbarButton)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.saveToolbarButton)).BeginInit();
@@ -155,11 +147,8 @@ public void InitializeComponent()
             ((System.ComponentModel.ISupportInitialize)(this.fileLocationToolbarButton)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.cutToolbarButton)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.deleteFileToolbarButton)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.tryToDecryptToolbarButton)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.changePasswordToolbarButton)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.lockToolbarButton)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.alwaysOnTopToolbarButton)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.settingsToolbarButton)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.alwaysOnTopToolbarButton)).BeginInit();
             this.statusPanel.SuspendLayout();
             this.trayMenu.SuspendLayout();
             this.fileLockedPanel.SuspendLayout();
@@ -180,7 +169,7 @@ public void InitializeComponent()
             this.mainMenu.Location = new System.Drawing.Point(0, 0);
             this.mainMenu.Name = "mainMenu";
             this.mainMenu.Padding = new System.Windows.Forms.Padding(0);
-            this.mainMenu.Size = new System.Drawing.Size(593, 24);
+            this.mainMenu.Size = new System.Drawing.Size(544, 24);
             this.mainMenu.TabIndex = 0;
             this.mainMenu.Text = "menuStrip1";
             // 
@@ -196,14 +185,12 @@ public void InitializeComponent()
             this.mainMenuSeparator2,
             this.openFileLocationMainMenu,
             this.deleteFileMainMenu,
-            this.tryToDecryptMainMenu,
             this.mainMenuSeparator3,
             this.exitMainMenu});
             this.fileMainMenu.ForeColor = System.Drawing.SystemColors.ControlText;
             this.fileMainMenu.Name = "fileMainMenu";
             this.fileMainMenu.Size = new System.Drawing.Size(37, 24);
             this.fileMainMenu.Text = "File";
-            this.fileMainMenu.DropDownOpening += new System.EventHandler(this.FileMainMenu_DropDownOpening);
             // 
             // newMainMenu
             // 
@@ -276,15 +263,6 @@ public void InitializeComponent()
             this.deleteFileMainMenu.Text = "Delete File";
             this.deleteFileMainMenu.Click += new System.EventHandler(this.DeleteFileToolStripMenuItem_Click);
             // 
-            // tryToDecryptMainMenu
-            // 
-            this.tryToDecryptMainMenu.Name = "tryToDecryptMainMenu";
-            this.tryToDecryptMainMenu.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) 
-            | System.Windows.Forms.Keys.E)));
-            this.tryToDecryptMainMenu.Size = new System.Drawing.Size(248, 22);
-            this.tryToDecryptMainMenu.Text = "Try to Decrypt";
-            this.tryToDecryptMainMenu.Click += new System.EventHandler(this.TryToDecryptMainMenu_Click);
-            // 
             // mainMenuSeparator3
             // 
             this.mainMenuSeparator3.Name = "mainMenuSeparator3";
@@ -315,21 +293,19 @@ public void InitializeComponent()
             this.clearClipboardMainMenu,
             this.wordWrapMainMenu,
             this.readOnlyMainMenu,
-            this.insertDateTimeMainMenu,
             this.mainMenuSeparator7,
             this.clearMainMenu});
             this.editMainMenu.ForeColor = System.Drawing.SystemColors.ControlText;
             this.editMainMenu.Name = "editMainMenu";
             this.editMainMenu.Size = new System.Drawing.Size(39, 24);
             this.editMainMenu.Text = "Edit";
-            this.editMainMenu.DropDownOpening += new System.EventHandler(this.EditMainMenu_DropDownOpening);
             this.editMainMenu.DropDownOpened += new System.EventHandler(this.EditMainMenu_DropDownOpened);
             // 
             // undoMainMenu
             // 
             this.undoMainMenu.Name = "undoMainMenu";
             this.undoMainMenu.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Z)));
-            this.undoMainMenu.Size = new System.Drawing.Size(198, 22);
+            this.undoMainMenu.Size = new System.Drawing.Size(221, 22);
             this.undoMainMenu.Text = "Undo";
             this.undoMainMenu.Click += new System.EventHandler(this.UndoMainMenu_Click);
             // 
@@ -337,21 +313,21 @@ public void InitializeComponent()
             // 
             this.redoMainMenu.Name = "redoMainMenu";
             this.redoMainMenu.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Y)));
-            this.redoMainMenu.Size = new System.Drawing.Size(198, 22);
+            this.redoMainMenu.Size = new System.Drawing.Size(221, 22);
             this.redoMainMenu.Text = "Redo";
             this.redoMainMenu.Click += new System.EventHandler(this.RedoMainMenu_Click);
             // 
             // mainMenuSeparator4
             // 
             this.mainMenuSeparator4.Name = "mainMenuSeparator4";
-            this.mainMenuSeparator4.Size = new System.Drawing.Size(195, 6);
+            this.mainMenuSeparator4.Size = new System.Drawing.Size(218, 6);
             // 
             // cutMainMenu
             // 
             this.cutMainMenu.Enabled = false;
             this.cutMainMenu.Name = "cutMainMenu";
             this.cutMainMenu.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.X)));
-            this.cutMainMenu.Size = new System.Drawing.Size(198, 22);
+            this.cutMainMenu.Size = new System.Drawing.Size(221, 22);
             this.cutMainMenu.Text = "Cut";
             this.cutMainMenu.Click += new System.EventHandler(this.CutMainMenu_Click);
             // 
@@ -360,7 +336,7 @@ public void InitializeComponent()
             this.copyMainMenu.Enabled = false;
             this.copyMainMenu.Name = "copyMainMenu";
             this.copyMainMenu.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C)));
-            this.copyMainMenu.Size = new System.Drawing.Size(198, 22);
+            this.copyMainMenu.Size = new System.Drawing.Size(221, 22);
             this.copyMainMenu.Text = "Copy";
             this.copyMainMenu.Click += new System.EventHandler(this.CopyMainMenu_Click);
             // 
@@ -368,7 +344,7 @@ public void InitializeComponent()
             // 
             this.pasteMainMenu.Name = "pasteMainMenu";
             this.pasteMainMenu.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.V)));
-            this.pasteMainMenu.Size = new System.Drawing.Size(198, 22);
+            this.pasteMainMenu.Size = new System.Drawing.Size(221, 22);
             this.pasteMainMenu.Text = "Paste";
             this.pasteMainMenu.Click += new System.EventHandler(this.PasteMainMenu_Click);
             // 
@@ -377,34 +353,34 @@ public void InitializeComponent()
             this.deleteMainMenu.Enabled = false;
             this.deleteMainMenu.Name = "deleteMainMenu";
             this.deleteMainMenu.ShortcutKeys = System.Windows.Forms.Keys.Delete;
-            this.deleteMainMenu.Size = new System.Drawing.Size(198, 22);
+            this.deleteMainMenu.Size = new System.Drawing.Size(221, 22);
             this.deleteMainMenu.Text = "Delete";
             this.deleteMainMenu.Click += new System.EventHandler(this.DeleteMainMenu_Click);
             // 
             // mainMenuSeparator5
             // 
             this.mainMenuSeparator5.Name = "mainMenuSeparator5";
-            this.mainMenuSeparator5.Size = new System.Drawing.Size(195, 6);
+            this.mainMenuSeparator5.Size = new System.Drawing.Size(218, 6);
             // 
             // findMainMenu
             // 
             this.findMainMenu.Name = "findMainMenu";
             this.findMainMenu.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F)));
-            this.findMainMenu.Size = new System.Drawing.Size(198, 22);
+            this.findMainMenu.Size = new System.Drawing.Size(221, 22);
             this.findMainMenu.Text = "Find";
             this.findMainMenu.Click += new System.EventHandler(this.FindMainMenu_Click);
             // 
             // mainMenuSeparator6
             // 
             this.mainMenuSeparator6.Name = "mainMenuSeparator6";
-            this.mainMenuSeparator6.Size = new System.Drawing.Size(195, 6);
+            this.mainMenuSeparator6.Size = new System.Drawing.Size(218, 6);
             // 
             // selectAllMainMenu
             // 
             this.selectAllMainMenu.Name = "selectAllMainMenu";
             this.selectAllMainMenu.ShortcutKeyDisplayString = "";
             this.selectAllMainMenu.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.A)));
-            this.selectAllMainMenu.Size = new System.Drawing.Size(198, 22);
+            this.selectAllMainMenu.Size = new System.Drawing.Size(221, 22);
             this.selectAllMainMenu.Text = "Select All";
             this.selectAllMainMenu.Click += new System.EventHandler(this.SelectAllMainMenu_Click);
             // 
@@ -423,7 +399,7 @@ public void InitializeComponent()
             this.wordWrapMainMenu.CheckState = System.Windows.Forms.CheckState.Checked;
             this.wordWrapMainMenu.Name = "wordWrapMainMenu";
             this.wordWrapMainMenu.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.W)));
-            this.wordWrapMainMenu.Size = new System.Drawing.Size(198, 22);
+            this.wordWrapMainMenu.Size = new System.Drawing.Size(221, 22);
             this.wordWrapMainMenu.Text = "Word Wrap";
             this.wordWrapMainMenu.Click += new System.EventHandler(this.WordWrapMainMenu_Click);
             // 
@@ -432,28 +408,20 @@ public void InitializeComponent()
             this.readOnlyMainMenu.CheckOnClick = true;
             this.readOnlyMainMenu.Name = "readOnlyMainMenu";
             this.readOnlyMainMenu.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.R)));
-            this.readOnlyMainMenu.Size = new System.Drawing.Size(198, 22);
+            this.readOnlyMainMenu.Size = new System.Drawing.Size(221, 22);
             this.readOnlyMainMenu.Text = "Readonly";
             this.readOnlyMainMenu.Click += new System.EventHandler(this.ReadOnlyMainMenu_Click);
             // 
-            // insertDateTimeMainMenu
-            // 
-            this.insertDateTimeMainMenu.Name = "insertDateTimeMainMenu";
-            this.insertDateTimeMainMenu.ShortcutKeys = System.Windows.Forms.Keys.F5;
-            this.insertDateTimeMainMenu.Size = new System.Drawing.Size(198, 22);
-            this.insertDateTimeMainMenu.Text = "Insert Date Time";
-            this.insertDateTimeMainMenu.Click += new System.EventHandler(this.InsertDateTimeMainMenu_Click);
-            // 
             // mainMenuSeparator7
             // 
             this.mainMenuSeparator7.Name = "mainMenuSeparator7";
-            this.mainMenuSeparator7.Size = new System.Drawing.Size(195, 6);
+            this.mainMenuSeparator7.Size = new System.Drawing.Size(218, 6);
             // 
             // clearMainMenu
             // 
             this.clearMainMenu.Name = "clearMainMenu";
             this.clearMainMenu.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Delete)));
-            this.clearMainMenu.Size = new System.Drawing.Size(198, 22);
+            this.clearMainMenu.Size = new System.Drawing.Size(221, 22);
             this.clearMainMenu.Text = "Clear";
             this.clearMainMenu.Click += new System.EventHandler(this.ClearMainMenu_Click);
             // 
@@ -464,20 +432,18 @@ public void InitializeComponent()
             this.passwordGeneratorMainMenu,
             this.changePasswordMainMenu,
             this.lockMainMenu,
-            this.settingsMainMenu,
+            this.settingsMainMenu});
-            this.pasteBoardMainMenu});
             this.toolsMainMenu.ForeColor = System.Drawing.SystemColors.ControlText;
             this.toolsMainMenu.Name = "toolsMainMenu";
             this.toolsMainMenu.Size = new System.Drawing.Size(46, 24);
             this.toolsMainMenu.Text = "Tools";
-            this.toolsMainMenu.DropDownOpening += new System.EventHandler(this.ToolsMainMenu_DropDownOpening);
             // 
             // alwaysOnTopMainMenu
             // 
             this.alwaysOnTopMainMenu.CheckOnClick = true;
             this.alwaysOnTopMainMenu.Name = "alwaysOnTopMainMenu";
             this.alwaysOnTopMainMenu.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.T)));
-            this.alwaysOnTopMainMenu.Size = new System.Drawing.Size(245, 22);
+            this.alwaysOnTopMainMenu.Size = new System.Drawing.Size(232, 22);
             this.alwaysOnTopMainMenu.Text = "Always on Top";
             this.alwaysOnTopMainMenu.Click += new System.EventHandler(this.AlwaysOnTopMainMenu_Click);
             // 
@@ -485,7 +451,7 @@ public void InitializeComponent()
             // 
             this.passwordGeneratorMainMenu.Name = "passwordGeneratorMainMenu";
             this.passwordGeneratorMainMenu.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.P)));
-            this.passwordGeneratorMainMenu.Size = new System.Drawing.Size(245, 22);
+            this.passwordGeneratorMainMenu.Size = new System.Drawing.Size(232, 22);
             this.passwordGeneratorMainMenu.Text = "Password Generator";
             this.passwordGeneratorMainMenu.Click += new System.EventHandler(this.PasswordGeneratorMainMenu_Click);
             // 
@@ -494,7 +460,7 @@ public void InitializeComponent()
             this.changePasswordMainMenu.Name = "changePasswordMainMenu";
             this.changePasswordMainMenu.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) 
             | System.Windows.Forms.Keys.P)));
-            this.changePasswordMainMenu.Size = new System.Drawing.Size(245, 22);
+            this.changePasswordMainMenu.Size = new System.Drawing.Size(241, 22);
             this.changePasswordMainMenu.Text = "Change Password";
             this.changePasswordMainMenu.Click += new System.EventHandler(this.ChangePasswordMainMenu_Click);
             // 
@@ -502,7 +468,7 @@ public void InitializeComponent()
             // 
             this.lockMainMenu.Name = "lockMainMenu";
             this.lockMainMenu.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.L)));
-            this.lockMainMenu.Size = new System.Drawing.Size(245, 22);
+            this.lockMainMenu.Size = new System.Drawing.Size(241, 22);
             this.lockMainMenu.Text = "Lock";
             this.lockMainMenu.Click += new System.EventHandler(this.LockMainMenu_Click);
             // 
@@ -512,20 +478,10 @@ public void InitializeComponent()
             this.settingsMainMenu.ShortcutKeyDisplayString = "";
             this.settingsMainMenu.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) 
             | System.Windows.Forms.Keys.T)));
-            this.settingsMainMenu.Size = new System.Drawing.Size(245, 22);
+            this.settingsMainMenu.Size = new System.Drawing.Size(241, 22);
             this.settingsMainMenu.Text = "Settings";
             this.settingsMainMenu.Click += new System.EventHandler(this.SettingsMainMenu_Click);
             // 
-            // pasteBoardMainMenu
-            // 
-            this.pasteBoardMainMenu.CheckOnClick = true;
-            this.pasteBoardMainMenu.Name = "pasteBoardMainMenu";
-            this.pasteBoardMainMenu.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) 
-            | System.Windows.Forms.Keys.P)));
-            this.pasteBoardMainMenu.Size = new System.Drawing.Size(245, 22);
-            this.pasteBoardMainMenu.Text = "Use as Paste Board";
-            this.pasteBoardMainMenu.Click += new System.EventHandler(this.PasteBoardMainMenu_Click);
-            // 
             // helpMainMenu
             // 
             this.helpMainMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -726,11 +682,11 @@ public void InitializeComponent()
             this.searchPanel.Dock = System.Windows.Forms.DockStyle.Bottom;
             this.searchPanel.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
             this.searchPanel.ForeColor = System.Drawing.Color.Black;
-            this.searchPanel.Location = new System.Drawing.Point(0, 318);
+            this.searchPanel.Location = new System.Drawing.Point(0, 274);
             this.searchPanel.Name = "searchPanel";
             this.searchPanel.RowCount = 1;
             this.searchPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.searchPanel.Size = new System.Drawing.Size(593, 25);
+            this.searchPanel.Size = new System.Drawing.Size(544, 25);
             this.searchPanel.TabIndex = 17;
             this.searchPanel.Visible = false;
             // 
@@ -742,7 +698,7 @@ public void InitializeComponent()
             this.searchTextBox.ForeColor = System.Drawing.Color.Black;
             this.searchTextBox.Location = new System.Drawing.Point(3, 5);
             this.searchTextBox.Name = "searchTextBox";
-            this.searchTextBox.Size = new System.Drawing.Size(289, 15);
+            this.searchTextBox.Size = new System.Drawing.Size(240, 15);
             this.searchTextBox.TabIndex = 9;
             this.searchTextBox.TabStop = false;
             this.searchTextBox.TextChanged += new System.EventHandler(this.SearchTextBox_TextChanged);
@@ -755,7 +711,7 @@ public void InitializeComponent()
             this.searchWholeWordCheckBox.Dock = System.Windows.Forms.DockStyle.Fill;
             this.searchWholeWordCheckBox.ForeColor = System.Drawing.Color.Black;
             this.searchWholeWordCheckBox.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.searchWholeWordCheckBox.Location = new System.Drawing.Point(402, 3);
+            this.searchWholeWordCheckBox.Location = new System.Drawing.Point(353, 3);
             this.searchWholeWordCheckBox.Name = "searchWholeWordCheckBox";
             this.searchWholeWordCheckBox.Size = new System.Drawing.Size(94, 19);
             this.searchWholeWordCheckBox.TabIndex = 12;
@@ -772,7 +728,7 @@ public void InitializeComponent()
             this.searchCaseSensitiveCheckBox.Dock = System.Windows.Forms.DockStyle.Fill;
             this.searchCaseSensitiveCheckBox.ForeColor = System.Drawing.Color.Black;
             this.searchCaseSensitiveCheckBox.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.searchCaseSensitiveCheckBox.Location = new System.Drawing.Point(298, 3);
+            this.searchCaseSensitiveCheckBox.Location = new System.Drawing.Point(249, 3);
             this.searchCaseSensitiveCheckBox.Name = "searchCaseSensitiveCheckBox";
             this.searchCaseSensitiveCheckBox.Size = new System.Drawing.Size(98, 19);
             this.searchCaseSensitiveCheckBox.TabIndex = 11;
@@ -789,7 +745,7 @@ public void InitializeComponent()
             this.searchCloseButton.Dock = System.Windows.Forms.DockStyle.Fill;
             this.searchCloseButton.Font = new System.Drawing.Font("Segoe UI Black", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
             this.searchCloseButton.ForeColor = System.Drawing.Color.DarkGray;
-            this.searchCloseButton.Location = new System.Drawing.Point(574, 0);
+            this.searchCloseButton.Location = new System.Drawing.Point(525, 0);
             this.searchCloseButton.Name = "searchCloseButton";
             this.searchCloseButton.Size = new System.Drawing.Size(16, 25);
             this.searchCloseButton.TabIndex = 16;
@@ -803,7 +759,7 @@ public void InitializeComponent()
             this.searchFindNextButton.Cursor = System.Windows.Forms.Cursors.Hand;
             this.searchFindNextButton.Dock = System.Windows.Forms.DockStyle.Fill;
             this.searchFindNextButton.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
-            this.searchFindNextButton.Location = new System.Drawing.Point(502, 0);
+            this.searchFindNextButton.Location = new System.Drawing.Point(453, 0);
             this.searchFindNextButton.Name = "searchFindNextButton";
             this.searchFindNextButton.Size = new System.Drawing.Size(66, 25);
             this.searchFindNextButton.TabIndex = 17;
@@ -832,7 +788,9 @@ public void InitializeComponent()
             this.toolbarPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
             this.toolbarPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 18F));
             this.toolbarPanel.Controls.Add(this.closeToolbarButton, 13, 0);
+            this.toolbarPanel.Controls.Add(this.lockToolbarButton, 9, 0);
             this.toolbarPanel.Controls.Add(this.newToolbarButton, 0, 0);
+            this.toolbarPanel.Controls.Add(this.changePasswordToolbarButton, 8, 0);
             this.toolbarPanel.Controls.Add(this.openToolbarButton, 1, 0);
             this.toolbarPanel.Controls.Add(this.pasteToolbarButton, 7, 0);
             this.toolbarPanel.Controls.Add(this.saveToolbarButton, 2, 0);
@@ -840,18 +798,15 @@ public void InitializeComponent()
             this.toolbarPanel.Controls.Add(this.fileLocationToolbarButton, 3, 0);
             this.toolbarPanel.Controls.Add(this.cutToolbarButton, 5, 0);
             this.toolbarPanel.Controls.Add(this.deleteFileToolbarButton, 4, 0);
-            this.toolbarPanel.Controls.Add(this.tryToDecryptToolbarButton, 8, 0);
+            this.toolbarPanel.Controls.Add(this.settingsToolbarButton, 11, 0);
-            this.toolbarPanel.Controls.Add(this.changePasswordToolbarButton, 9, 0);
+            this.toolbarPanel.Controls.Add(this.alwaysOnTopToolbarButton, 10, 0);
-            this.toolbarPanel.Controls.Add(this.lockToolbarButton, 10, 0);
-            this.toolbarPanel.Controls.Add(this.alwaysOnTopToolbarButton, 11, 0);
-            this.toolbarPanel.Controls.Add(this.settingsToolbarButton, 12, 0);
             this.toolbarPanel.Dock = System.Windows.Forms.DockStyle.Top;
             this.toolbarPanel.ForeColor = System.Drawing.SystemColors.Control;
             this.toolbarPanel.Location = new System.Drawing.Point(0, 24);
             this.toolbarPanel.Name = "toolbarPanel";
             this.toolbarPanel.RowCount = 1;
             this.toolbarPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.toolbarPanel.Size = new System.Drawing.Size(593, 24);
+            this.toolbarPanel.Size = new System.Drawing.Size(544, 24);
             this.toolbarPanel.TabIndex = 17;
             this.toolbarPanel.MouseEnter += new System.EventHandler(this.ToolbarPanel_MouseEnter);
             // 
@@ -862,7 +817,7 @@ public void InitializeComponent()
             this.closeToolbarButton.Dock = System.Windows.Forms.DockStyle.Fill;
             this.closeToolbarButton.Font = new System.Drawing.Font("Segoe UI Black", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
             this.closeToolbarButton.ForeColor = System.Drawing.Color.DarkGray;
-            this.closeToolbarButton.Location = new System.Drawing.Point(578, 0);
+            this.closeToolbarButton.Location = new System.Drawing.Point(529, 0);
             this.closeToolbarButton.Name = "closeToolbarButton";
             this.closeToolbarButton.Size = new System.Drawing.Size(12, 24);
             this.closeToolbarButton.TabIndex = 17;
@@ -872,6 +827,20 @@ public void InitializeComponent()
             this.closeToolbarButton.MouseEnter += new System.EventHandler(this.CloseToolbarButton_MouseEnter);
             this.closeToolbarButton.MouseLeave += new System.EventHandler(this.CloseToolbarButton_MouseLeave);
             // 
+            // lockToolbarButton
+            // 
+            this.lockToolbarButton.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.lockToolbarButton.Image = ((System.Drawing.Image)(resources.GetObject("lockToolbarButton.Image")));
+            this.lockToolbarButton.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+            this.lockToolbarButton.Location = new System.Drawing.Point(219, 3);
+            this.lockToolbarButton.Name = "lockToolbarButton";
+            this.lockToolbarButton.Size = new System.Drawing.Size(16, 16);
+            this.lockToolbarButton.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
+            this.lockToolbarButton.TabIndex = 15;
+            this.lockToolbarButton.TabStop = false;
+            this.toolTip.SetToolTip(this.lockToolbarButton, "Lock");
+            this.lockToolbarButton.Click += new System.EventHandler(this.LockToolbarButton_Click);
+            // 
             // newToolbarButton
             // 
             this.newToolbarButton.Cursor = System.Windows.Forms.Cursors.Hand;
@@ -886,6 +855,20 @@ public void InitializeComponent()
             this.toolTip.SetToolTip(this.newToolbarButton, "New");
             this.newToolbarButton.Click += new System.EventHandler(this.NewToolbarButton_Click);
             // 
+            // changePasswordToolbarButton
+            // 
+            this.changePasswordToolbarButton.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.changePasswordToolbarButton.Image = ((System.Drawing.Image)(resources.GetObject("changePasswordToolbarButton.Image")));
+            this.changePasswordToolbarButton.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+            this.changePasswordToolbarButton.Location = new System.Drawing.Point(195, 3);
+            this.changePasswordToolbarButton.Name = "changePasswordToolbarButton";
+            this.changePasswordToolbarButton.Size = new System.Drawing.Size(16, 16);
+            this.changePasswordToolbarButton.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
+            this.changePasswordToolbarButton.TabIndex = 15;
+            this.changePasswordToolbarButton.TabStop = false;
+            this.toolTip.SetToolTip(this.changePasswordToolbarButton, "Change password");
+            this.changePasswordToolbarButton.Click += new System.EventHandler(this.ChangePasswordToolbarButton_Click);
+            // 
             // openToolbarButton
             // 
             this.openToolbarButton.Cursor = System.Windows.Forms.Cursors.Hand;
@@ -984,67 +967,12 @@ public void InitializeComponent()
             this.toolTip.SetToolTip(this.deleteFileToolbarButton, "Delete file");
             this.deleteFileToolbarButton.Click += new System.EventHandler(this.DeleteFileToolbarButton_Click);
             // 
-            // tryToDecryptToolbarButton
-            // 
-            this.tryToDecryptToolbarButton.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.tryToDecryptToolbarButton.Image = global::Crypto_Notepad.Properties.Resources.lock_pencil;
-            this.tryToDecryptToolbarButton.Location = new System.Drawing.Point(195, 3);
-            this.tryToDecryptToolbarButton.Name = "tryToDecryptToolbarButton";
-            this.tryToDecryptToolbarButton.Size = new System.Drawing.Size(16, 16);
-            this.tryToDecryptToolbarButton.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
-            this.tryToDecryptToolbarButton.TabIndex = 18;
-            this.tryToDecryptToolbarButton.TabStop = false;
-            this.toolTip.SetToolTip(this.tryToDecryptToolbarButton, "Try to decrypt");
-            this.tryToDecryptToolbarButton.Click += new System.EventHandler(this.TryToDecryptToolbarButton_Click);
-            // 
-            // changePasswordToolbarButton
-            // 
-            this.changePasswordToolbarButton.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.changePasswordToolbarButton.Image = ((System.Drawing.Image)(resources.GetObject("changePasswordToolbarButton.Image")));
-            this.changePasswordToolbarButton.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.changePasswordToolbarButton.Location = new System.Drawing.Point(219, 3);
-            this.changePasswordToolbarButton.Name = "changePasswordToolbarButton";
-            this.changePasswordToolbarButton.Size = new System.Drawing.Size(16, 16);
-            this.changePasswordToolbarButton.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
-            this.changePasswordToolbarButton.TabIndex = 15;
-            this.changePasswordToolbarButton.TabStop = false;
-            this.toolTip.SetToolTip(this.changePasswordToolbarButton, "Change password");
-            this.changePasswordToolbarButton.Click += new System.EventHandler(this.ChangePasswordToolbarButton_Click);
-            // 
-            // lockToolbarButton
-            // 
-            this.lockToolbarButton.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.lockToolbarButton.Image = ((System.Drawing.Image)(resources.GetObject("lockToolbarButton.Image")));
-            this.lockToolbarButton.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.lockToolbarButton.Location = new System.Drawing.Point(243, 3);
-            this.lockToolbarButton.Name = "lockToolbarButton";
-            this.lockToolbarButton.Size = new System.Drawing.Size(16, 16);
-            this.lockToolbarButton.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
-            this.lockToolbarButton.TabIndex = 15;
-            this.lockToolbarButton.TabStop = false;
-            this.toolTip.SetToolTip(this.lockToolbarButton, "Lock");
-            this.lockToolbarButton.Click += new System.EventHandler(this.LockToolbarButton_Click);
-            // 
-            // alwaysOnTopToolbarButton
-            // 
-            this.alwaysOnTopToolbarButton.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.alwaysOnTopToolbarButton.Image = global::Crypto_Notepad.Properties.Resources.applications_blue;
-            this.alwaysOnTopToolbarButton.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.alwaysOnTopToolbarButton.Location = new System.Drawing.Point(267, 3);
-            this.alwaysOnTopToolbarButton.Name = "alwaysOnTopToolbarButton";
-            this.alwaysOnTopToolbarButton.Size = new System.Drawing.Size(16, 16);
-            this.alwaysOnTopToolbarButton.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
-            this.alwaysOnTopToolbarButton.TabIndex = 15;
-            this.alwaysOnTopToolbarButton.TabStop = false;
-            this.toolTip.SetToolTip(this.alwaysOnTopToolbarButton, "Always on top");
-            this.alwaysOnTopToolbarButton.Click += new System.EventHandler(this.AlwaysOnTopToolbarButton_Click);
-            // 
             // settingsToolbarButton
             // 
             this.settingsToolbarButton.Cursor = System.Windows.Forms.Cursors.Hand;
             this.settingsToolbarButton.Image = ((System.Drawing.Image)(resources.GetObject("settingsToolbarButton.Image")));
             this.settingsToolbarButton.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.settingsToolbarButton.Location = new System.Drawing.Point(291, 3);
+            this.settingsToolbarButton.Location = new System.Drawing.Point(267, 3);
             this.settingsToolbarButton.Name = "settingsToolbarButton";
             this.settingsToolbarButton.Size = new System.Drawing.Size(16, 16);
             this.settingsToolbarButton.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
@@ -1053,6 +981,20 @@ public void InitializeComponent()
             this.toolTip.SetToolTip(this.settingsToolbarButton, "Settings");
             this.settingsToolbarButton.Click += new System.EventHandler(this.SettingsToolbarButton_Click);
             // 
+            // alwaysOnTopToolbarButton
+            // 
+            this.alwaysOnTopToolbarButton.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.alwaysOnTopToolbarButton.Image = global::Crypto_Notepad.Properties.Resources.applications_blue;
+            this.alwaysOnTopToolbarButton.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+            this.alwaysOnTopToolbarButton.Location = new System.Drawing.Point(243, 3);
+            this.alwaysOnTopToolbarButton.Name = "alwaysOnTopToolbarButton";
+            this.alwaysOnTopToolbarButton.Size = new System.Drawing.Size(16, 16);
+            this.alwaysOnTopToolbarButton.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
+            this.alwaysOnTopToolbarButton.TabIndex = 15;
+            this.alwaysOnTopToolbarButton.TabStop = false;
+            this.toolTip.SetToolTip(this.alwaysOnTopToolbarButton, "Always on top");
+            this.alwaysOnTopToolbarButton.Click += new System.EventHandler(this.AlwaysOnTopToolbarButton_Click);
+            // 
             // statusPanel
             // 
             this.statusPanel.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240)))));
@@ -1066,13 +1008,12 @@ public void InitializeComponent()
             this.statusPanelSizeLabel,
             this.statusPanelReadonlyLabel,
             this.statusPanelWordwrapLabel,
-            this.statusPanelPasteboardLabel,
             this.statusPanelClipboardProgressBar});
             this.statusPanel.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Flow;
-            this.statusPanel.Location = new System.Drawing.Point(0, 343);
+            this.statusPanel.Location = new System.Drawing.Point(0, 299);
             this.statusPanel.Name = "statusPanel";
             this.statusPanel.ShowItemToolTips = true;
-            this.statusPanel.Size = new System.Drawing.Size(593, 22);
+            this.statusPanel.Size = new System.Drawing.Size(544, 22);
             this.statusPanel.SizingGrip = false;
             this.statusPanel.TabIndex = 18;
             this.statusPanel.VisibleChanged += new System.EventHandler(this.StatusPanel_VisibleChanged);
@@ -1158,17 +1099,6 @@ public void InitializeComponent()
             this.statusPanelWordwrapLabel.Size = new System.Drawing.Size(76, 17);
             this.statusPanelWordwrapLabel.Text = "Word Wrap";
             // 
-            // statusPanelPasteboardLabel
-            // 
-            this.statusPanelPasteboardLabel.BorderSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.Right;
-            this.statusPanelPasteboardLabel.BorderStyle = System.Windows.Forms.Border3DStyle.Etched;
-            this.statusPanelPasteboardLabel.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
-            this.statusPanelPasteboardLabel.Name = "statusPanelPasteboardLabel";
-            this.statusPanelPasteboardLabel.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0);
-            this.statusPanelPasteboardLabel.Size = new System.Drawing.Size(76, 17);
-            this.statusPanelPasteboardLabel.Text = "Paste Board";
-            this.statusPanelPasteboardLabel.Visible = false;
-            // 
             // statusPanelClipboardProgressBar
             // 
             this.statusPanelClipboardProgressBar.Name = "statusPanelClipboardProgressBar";
@@ -1186,58 +1116,24 @@ public void InitializeComponent()
             // trayMenu
             // 
             this.trayMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.settingsToolStripMenuItem,
+            this.showTrayMenu,
-            this.resetWindowLocationTrayMenu,
-            this.showWindowTrayMenu,
-            this.hideWindowTrayMenu,
-            this.toolStripSeparator1,
             this.exitTrayMenu});
             this.trayMenu.Name = "mnuTray";
-            this.trayMenu.Size = new System.Drawing.Size(199, 120);
+            this.trayMenu.Size = new System.Drawing.Size(104, 48);
-            this.trayMenu.Opening += new System.ComponentModel.CancelEventHandler(this.TrayMenu_Opening);
             // 
-            // settingsToolStripMenuItem
+            // showTrayMenu
             // 
-            this.settingsToolStripMenuItem.Image = global::Crypto_Notepad.Properties.Resources.gear;
+            this.showTrayMenu.Image = global::Crypto_Notepad.Properties.Resources.application_blue;
-            this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem";
+            this.showTrayMenu.Name = "showTrayMenu";
-            this.settingsToolStripMenuItem.Size = new System.Drawing.Size(198, 22);
+            this.showTrayMenu.Size = new System.Drawing.Size(103, 22);
-            this.settingsToolStripMenuItem.Text = "Settings";
+            this.showTrayMenu.Text = "Show";
-            this.settingsToolStripMenuItem.Click += new System.EventHandler(this.SettingsToolStripMenuItem_Click);
+            this.showTrayMenu.Click += new System.EventHandler(this.ShowTrayMenu_Click);
-            // 
-            // resetWindowLocationTrayMenu
-            // 
-            this.resetWindowLocationTrayMenu.Image = global::Crypto_Notepad.Properties.Resources.application_dock_180;
-            this.resetWindowLocationTrayMenu.Name = "resetWindowLocationTrayMenu";
-            this.resetWindowLocationTrayMenu.Size = new System.Drawing.Size(198, 22);
-            this.resetWindowLocationTrayMenu.Text = "Reset Window Location";
-            this.resetWindowLocationTrayMenu.Click += new System.EventHandler(this.ResetWindowLocationTrayMenu_Click);
-            // 
-            // showWindowTrayMenu
-            // 
-            this.showWindowTrayMenu.Image = global::Crypto_Notepad.Properties.Resources.application_blue;
-            this.showWindowTrayMenu.Name = "showWindowTrayMenu";
-            this.showWindowTrayMenu.Size = new System.Drawing.Size(198, 22);
-            this.showWindowTrayMenu.Text = "Show Window";
-            this.showWindowTrayMenu.Click += new System.EventHandler(this.ShowWindowTrayMenu_Click);
-            // 
-            // hideWindowTrayMenu
-            // 
-            this.hideWindowTrayMenu.Image = global::Crypto_Notepad.Properties.Resources.application;
-            this.hideWindowTrayMenu.Name = "hideWindowTrayMenu";
-            this.hideWindowTrayMenu.Size = new System.Drawing.Size(198, 22);
-            this.hideWindowTrayMenu.Text = "Hide Window";
-            this.hideWindowTrayMenu.Click += new System.EventHandler(this.HideWindowTrayMenu_Click);
-            // 
-            // toolStripSeparator1
-            // 
-            this.toolStripSeparator1.Name = "toolStripSeparator1";
-            this.toolStripSeparator1.Size = new System.Drawing.Size(195, 6);
             // 
             // exitTrayMenu
             // 
             this.exitTrayMenu.Image = global::Crypto_Notepad.Properties.Resources.cross_button;
             this.exitTrayMenu.Name = "exitTrayMenu";
-            this.exitTrayMenu.Size = new System.Drawing.Size(198, 22);
+            this.exitTrayMenu.Size = new System.Drawing.Size(103, 22);
             this.exitTrayMenu.Text = "Exit";
             this.exitTrayMenu.Click += new System.EventHandler(this.ExitTrayMenu_Click);
             // 
@@ -1253,7 +1149,7 @@ public void InitializeComponent()
             this.fileLockedPanel.Controls.Add(this.fileLockedLabel);
             this.fileLockedPanel.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
             this.fileLockedPanel.ForeColor = System.Drawing.Color.Azure;
-            this.fileLockedPanel.Location = new System.Drawing.Point(160, 71);
+            this.fileLockedPanel.Location = new System.Drawing.Point(136, 49);
             this.fileLockedPanel.Name = "fileLockedPanel";
             this.fileLockedPanel.Size = new System.Drawing.Size(261, 91);
             this.fileLockedPanel.TabIndex = 20;
@@ -1335,8 +1231,7 @@ public void InitializeComponent()
             // 
             this.toolTip.AutoPopDelay = 5000;
             this.toolTip.InitialDelay = 500;
-            this.toolTip.ReshowDelay = 500;
+            this.toolTip.ReshowDelay = 19000;
-            this.toolTip.ShowAlways = true;
             // 
             // richTextBoxPanel
             // 
@@ -1346,7 +1241,7 @@ public void InitializeComponent()
             this.richTextBoxPanel.Dock = System.Windows.Forms.DockStyle.Fill;
             this.richTextBoxPanel.Location = new System.Drawing.Point(0, 48);
             this.richTextBoxPanel.Name = "richTextBoxPanel";
-            this.richTextBoxPanel.Size = new System.Drawing.Size(593, 270);
+            this.richTextBoxPanel.Size = new System.Drawing.Size(544, 226);
             this.richTextBoxPanel.TabIndex = 21;
             // 
             // richTextBox
@@ -1360,7 +1255,7 @@ public void InitializeComponent()
             this.richTextBox.ForeColor = System.Drawing.Color.Black;
             this.richTextBox.Location = new System.Drawing.Point(0, 0);
             this.richTextBox.Name = "richTextBox";
-            this.richTextBox.Size = new System.Drawing.Size(591, 268);
+            this.richTextBox.Size = new System.Drawing.Size(542, 224);
             this.richTextBox.TabIndex = 16;
             this.richTextBox.Text = "";
             this.richTextBox.LinkClicked += new System.Windows.Forms.LinkClickedEventHandler(this.RichTextBox_LinkClicked);
@@ -1383,16 +1278,12 @@ public void InitializeComponent()
             this.clipboardTimer.Interval = 50;
             this.clipboardTimer.Tick += new System.EventHandler(this.ClipboardTimer_Tick);
             // 
-            // pasteBoardTimer
-            // 
-            this.pasteBoardTimer.Tick += new System.EventHandler(this.PasteBoardTimer_Tick);
-            // 
             // MainForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.White;
-            this.ClientSize = new System.Drawing.Size(593, 365);
+            this.ClientSize = new System.Drawing.Size(544, 321);
             this.Controls.Add(this.richTextBoxPanel);
             this.Controls.Add(this.searchPanel);
             this.Controls.Add(this.toolbarPanel);
@@ -1420,7 +1311,9 @@ public void InitializeComponent()
             this.searchPanel.PerformLayout();
             this.toolbarPanel.ResumeLayout(false);
             this.toolbarPanel.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.lockToolbarButton)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.newToolbarButton)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.changePasswordToolbarButton)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.openToolbarButton)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pasteToolbarButton)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.saveToolbarButton)).EndInit();
@@ -1428,11 +1321,8 @@ public void InitializeComponent()
             ((System.ComponentModel.ISupportInitialize)(this.fileLocationToolbarButton)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.cutToolbarButton)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.deleteFileToolbarButton)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.tryToDecryptToolbarButton)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.changePasswordToolbarButton)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.lockToolbarButton)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.alwaysOnTopToolbarButton)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.settingsToolbarButton)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.alwaysOnTopToolbarButton)).EndInit();
             this.statusPanel.ResumeLayout(false);
             this.statusPanel.PerformLayout();
             this.trayMenu.ResumeLayout(false);
@@ -1525,7 +1415,7 @@ public void InitializeComponent()
         protected internal System.Windows.Forms.PictureBox alwaysOnTopToolbarButton;
         protected internal System.Windows.Forms.ToolTip toolTip;
         protected internal System.Windows.Forms.ContextMenuStrip trayMenu;
-        protected internal System.Windows.Forms.ToolStripMenuItem showWindowTrayMenu;
+        protected internal System.Windows.Forms.ToolStripMenuItem showTrayMenu;
         protected internal System.Windows.Forms.ToolStripMenuItem exitTrayMenu;
         protected internal System.Windows.Forms.PlaceholderTextBox fileLockedKeyTextBox;
         protected internal System.Windows.Forms.Panel richTextBoxPanel;
@@ -1549,15 +1439,5 @@ public void InitializeComponent()
         private System.Windows.Forms.ToolStripProgressBar statusPanelClipboardProgressBar;
         private System.Windows.Forms.Timer clipboardTimer;
         private System.Windows.Forms.ToolStripMenuItem clearClipboardMainMenu;
-        private System.Windows.Forms.ToolStripMenuItem tryToDecryptMainMenu;
-        private System.Windows.Forms.PictureBox tryToDecryptToolbarButton;
-        private System.Windows.Forms.ToolStripMenuItem settingsToolStripMenuItem;
-        private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
-        private System.Windows.Forms.ToolStripMenuItem resetWindowLocationTrayMenu;
-        private System.Windows.Forms.ToolStripMenuItem hideWindowTrayMenu;
-        private System.Windows.Forms.ToolStripMenuItem pasteBoardMainMenu;
-        private System.Windows.Forms.Timer pasteBoardTimer;
-        protected internal System.Windows.Forms.ToolStripStatusLabel statusPanelPasteboardLabel;
-        private System.Windows.Forms.ToolStripMenuItem insertDateTimeMainMenu;
     }
 }

Crypto Notepad/Forms/MainForm.cs

@@ -1,5 +1,4 @@
 using Crypto_Notepad.Properties;
-using Microsoft.Win32;
 using System;
 using System.ComponentModel;
 using System.Diagnostics;
@@ -24,7 +23,6 @@ public partial class MainForm : Form
         bool cancelPressed = false;
         int findPos = 0;
         int caretPos;
-        FormWindowState currentWindowState;
         public MainForm()
         {
             InitializeComponent();
@@ -46,21 +44,7 @@ protected override void WndProc(ref Message m)
                 }
                 if (m.Msg == WM_SYSCOMMAND & m.WParam.ToInt32() == SC_RESTORE | m.WParam.ToInt32() == SC_MAXIMIZE & !fileLockedPanel.Visible)
                 {
-                    if (!fileLockedPanel.Visible)
+                    richTextBox.Visible = true;
-                    {
-                        richTextBox.Visible = true;
-                    }
-                }
-
-                switch (m.Msg)
-                {
-                    case WM_SYSCOMMAND:
-                        int command = m.WParam.ToInt32() & 0xfff0;
-                        if (command == SC_MINIMIZE)
-                        {
-                            currentWindowState = WindowState;
-                        }
-                        break;
                 }
             }
             catch (OverflowException)
@@ -81,10 +65,8 @@ private async Task DecryptAES()
             if (!PublicVar.okPressed)
             {
                 PublicVar.openFileName = Path.GetFileName(filePath);
-                openFileDialog.FileName = filePath;
                 mainMenu.Enabled = true;
                 toolbarPanel.Enabled = true;
-                settingsToolStripMenuItem.Enabled = true;
                 richTextBox.ReadOnly = false;
                 UseWaitCursor = false;
                 richTextBox.ResumeDrawing();
@@ -100,7 +82,6 @@ private async Task DecryptAES()
                 {
                     mainMenu.Enabled = false;
                     toolbarPanel.Enabled = false;
-                    settingsToolStripMenuItem.Enabled = false;
                     richTextBox.ReadOnly = true;
                     string openedFileText = await reader.ReadToEndAsync();
                     if (string.IsNullOrEmpty(settings.TheSalt))
@@ -118,7 +99,6 @@ private async Task DecryptAES()
                             PublicVar.openFileName = Path.GetFileName(filePath);
                             PublicVar.metadataCorrupt = false;
                             mainMenu.Enabled = true;
-                            settingsToolStripMenuItem.Enabled = true;
                             toolbarPanel.Enabled = true;
                             richTextBox.ReadOnly = false;
                             UseWaitCursor = false;
@@ -136,7 +116,6 @@ private async Task DecryptAES()
                 TypedPassword.Value = null;
                 StatusPanelFileInfo();
                 mainMenu.Enabled = true;
-                settingsToolStripMenuItem.Enabled = true;
                 toolbarPanel.Enabled = true;
                 richTextBox.ReadOnly = false;
                 UseWaitCursor = false;
@@ -163,7 +142,6 @@ private async Task DecryptAES()
                         {
                             PublicVar.openFileName = Path.GetFileName(filePath);
                             mainMenu.Enabled = true;
-                            settingsToolStripMenuItem.Enabled = true;
                             toolbarPanel.Enabled = true;
                             richTextBox.ReadOnly = false;
                             UseWaitCursor = false;
@@ -178,67 +156,51 @@ private async Task DecryptAES()
             }
         }
 
-        private async void TryToDecryptMessage(string openedFilePath)
+        private async void OpenAsotiations()
-        {
-            if (Visible)
-            {
-                PublicVar.messageBoxCenterParent = true;
-            }
-
-            PublicVar.password.Set(null);
-
-            if (Path.GetExtension(openedFilePath) != ".cnp")
-            {
-                if (settings.openTxtUnencrypted)
-                {
-                    richTextBox.Text = File.ReadAllText(openedFilePath);
-                    Text = Path.GetFileName(openedFilePath) + " – " + PublicVar.appName;
-                    filePath = openedFilePath;
-                    StatusPanelFileInfo();
-                }
-                else
-                {
-                    using (new CenterWinDialog(this))
-                    {
-                        DialogResult res = MessageBox.Show(this, "Try to decrypt \"" + PublicVar.openFileName + "\" file?", PublicVar.appName,
-                            MessageBoxButtons.YesNo, MessageBoxIcon.Information);
-                        if (res == DialogResult.No)
-                        {
-                            richTextBox.Text = File.ReadAllText(openedFilePath);
-                            Text = Path.GetFileName(openedFilePath) + " – " + PublicVar.appName;
-                            filePath = openedFilePath;
-                            StatusPanelFileInfo();
-                        }
-                        else
-                        {
-                            await DecryptAES();
-                        }
-                    }
-                }
-            }
-            else
-            {
-                await DecryptAES();
-            }
-        }
-
-        private void OpenAsotiations()
         {
+            string fileExtension = Path.GetExtension(args[1]);
             PublicVar.openFileName = Path.GetFileName(args[1]);
             openFileDialog.FileName = Path.GetFullPath(args[1]);
-            TryToDecryptMessage(args[1]);
+            if (fileExtension != ".cnp")
+            {
+                DialogResult res = MessageBox.Show(this, "Try to decrypt \"" + PublicVar.openFileName + "\" file?", PublicVar.appName, 
+                    MessageBoxButtons.YesNo, MessageBoxIcon.Information);
+                if (res == DialogResult.No)
+                {
+                    richTextBox.Text = File.ReadAllText(args[1]); ;
+                    filePath = args[1];
+                    Text = Path.GetFileName(args[1]) + " – " + PublicVar.appName;
+                    StatusPanelFileInfo();
+                    return;
+                }
+            }
+            await DecryptAES();
         }
 
-        private void SendTo()
+        private async void SendTo()
         {
-            PublicVar.openFileName = Path.GetFileName(argsPath);
+            string fileExtension = Path.GetExtension(argsPath);
             openFileDialog.FileName = Path.GetFullPath(argsPath);
-            TryToDecryptMessage(argsPath);
+            PublicVar.openFileName = Path.GetFileName(argsPath);
+            if (fileExtension != ".cnp")
+            {
+                DialogResult res = MessageBox.Show(this, "Try to decrypt \"" + PublicVar.openFileName  + "\" file?", PublicVar.appName, 
+                    MessageBoxButtons.YesNo, MessageBoxIcon.Information);
+                if (res == DialogResult.No)
+                {
+                    richTextBox.Text = File.ReadAllText(argsPath);
+                    filePath = argsPath;
+                    Text = Path.GetFileName(argsPath) + " – " + PublicVar.appName;
+                    StatusPanelFileInfo();
+                    return;
+                }
+            }
+            await DecryptAES();
         }
 
         private async void ContextMenuEncryptReplace()
         {
-            DialogResult res = MessageBox.Show(this, "This action will delete the source file and replace it with encrypted version. File must be in UTF-8 Encoding.", PublicVar.appName,
+            DialogResult res = MessageBox.Show(this, "This action will delete the source file and replace it with encrypted version. File must be in UTF-8 Encoding.", PublicVar.appName, 
                 MessageBoxButtons.OKCancel, MessageBoxIcon.Question);
             if (res == DialogResult.Cancel)
             {
@@ -254,7 +216,7 @@ private async void ContextMenuEncryptReplace()
             enterPasswordForm.ShowDialog();
             File.Delete(args[1]);
             string unencryptedText = richTextBox.Text;
-            string encryptedText = await AES.Encrypt(richTextBox.Text, TypedPassword.Value, null, settings.HashAlgorithm, Convert.ToInt32(settings.PasswordIterations),
+            string encryptedText = await AES.Encrypt(richTextBox.Text, TypedPassword.Value, null, settings.HashAlgorithm, Convert.ToInt32(settings.PasswordIterations), 
                 Convert.ToInt32(settings.KeySize));
             using (StreamWriter writer = new StreamWriter(newFileName))
             {
@@ -509,7 +471,6 @@ private async Task UnlockFile()
                 fileLockedPanel.Enabled = false;
                 TypedPassword.Value = fileLockedKeyTextBox.Text;
                 mainMenu.Enabled = false;
-                settingsToolStripMenuItem.Enabled = false;
                 toolbarPanel.Enabled = false;
                 using (StreamReader reader = File.OpenText(openFileDialog.FileName))
                 {
@@ -528,7 +489,6 @@ private async Task UnlockFile()
                 UseWaitCursor = false;
                 fileLockedPanel.Enabled = true;
                 mainMenu.Enabled = true;
-                settingsToolStripMenuItem.Enabled = true;
                 toolbarPanel.Enabled = true;
             }
             catch (Exception ex)
@@ -587,12 +547,8 @@ private void LoadSettings()
             {
                 Location = settings.windowLocation;
             }
-            if (!Methods.IsOnScreen(this))
-            {
-                Location = new Point(1, 1);
-            }
-
             Size = settings.windowSize;
+            WindowState = settings.windowState;
             if (settings.toolbarBorder)
             {
                 toolbarPanel.BorderStyle = BorderStyle.FixedSingle;
@@ -603,7 +559,7 @@ private void LoadSettings()
             }
             TopMost = settings.alwaysOnTop;
             alwaysOnTopMainMenu.Checked = settings.alwaysOnTop;
-            if (settings.closeToTray | settings.minimizeToTray | settings.trayMenu)
+            if (settings.closeToTray | settings.minimizeToTray)
             {
                 trayIcon.Visible = true;
             }
@@ -623,9 +579,8 @@ private void LoadSettings()
             statusPanelSizeLabel.Visible = settings.statusPanelSize;
             statusPanelReadonlyLabel.Visible = settings.statusPanelReadonly;
             statusPanelWordwrapLabel.Visible = settings.statusPanelWordWrap;
-            statusPanelPasteboardLabel.Visible = settings.statusPanelPasteboard;
             richTextBox.WordWrap = settings.editorWrap;
-            richTextBox.ForeColor = settings.editorForeColor;
+            richTextBox.ForeColor = settings.editroForeColor;
             richTextBox.BackColor = settings.editorBackColor;
             richTextBox.Font = settings.editorFont;
             BackColor = settings.editorBackColor;
@@ -638,24 +593,6 @@ private void LoadSettings()
             searchFindNextButton.ForeColor = settings.searchPanelForeColor;
             searchCloseButton.ForeColor = settings.searchPanelForeColor;
             searchPanel.CellBorderStyle = (TableLayoutPanelCellBorderStyle)Enum.Parse(typeof(TableLayoutPanelCellBorderStyle), settings.searchPanelBorder);
-
-            RegistryKey explorerAssociate = Registry.CurrentUser.OpenSubKey(@"Software\Classes\.cnp\", true);
-            if (settings.explorerAssociate && explorerAssociate == null)
-            {
-                Methods.AssociateExtension(Assembly.GetEntryAssembly().Location, "cnp");
-            }
-
-            RegistryKey explorerIntegrate = Registry.CurrentUser.OpenSubKey(@"Software\Classes\*\shell\Crypto Notepad\", true);
-            if (settings.explorerIntegrate && explorerIntegrate == null)
-            {
-                Methods.MenuIntegrate("enable");
-            }
-
-            string shortcutPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + @"\Microsoft\Windows\SendTo\Crypto Notepad.lnk";
-            if (settings.explorerSendTo && !File.Exists(shortcutPath))
-            {
-                Methods.SendToShortcut();
-            }
         }
 
         public void MenuIcons(bool menuIcons)
@@ -668,7 +605,6 @@ public void MenuIcons(bool menuIcons)
                 saveAsMainMenu.Image = Resources.disks_black;
                 openFileLocationMainMenu.Image = Resources.folder_horizontal;
                 deleteFileMainMenu.Image = Resources.document_minus;
-                tryToDecryptMainMenu.Image = Resources.lock_pencil;
                 exitMainMenu.Image = Resources.cross_button;
                 undoMainMenu.Image = Resources.arrow_left;
                 redoMainMenu.Image = Resources.arrow_right;
@@ -681,12 +617,10 @@ public void MenuIcons(bool menuIcons)
                 clearClipboardMainMenu.Image = Resources.clipboard_minus;
                 wordWrapMainMenu.Image = Resources.wrap_option;
                 readOnlyMainMenu.Image = Resources.document_pencil;
-                insertDateTimeMainMenu.Image = Resources.clock_plus;
                 clearMainMenu.Image = Resources.document;
                 changePasswordMainMenu.Image = Resources.key;
                 lockMainMenu.Image = Resources.lock_warning;
                 settingsMainMenu.Image = Resources.gear;
-                pasteBoardMainMenu.Image = Resources.clipboard_text;
                 documentationMainMenu.Image = Resources.document_text;
                 checkForUpdatesMainMenu.Image = Resources.upload_cloud;
                 aboutMainMenu.Image = Resources.information;
@@ -704,7 +638,7 @@ public void MenuIcons(bool menuIcons)
                             dropDownItem.Image = null;
                         }
                 }
-            }
+            } 
         }
 
         protected internal void ShortcutKeys(bool shortcutKeys)
@@ -718,7 +652,6 @@ protected internal void ShortcutKeys(bool shortcutKeys)
                 saveCloseFileMainMenu.ShortcutKeys = Keys.Alt | Keys.Shift | Keys.S;
                 openFileLocationMainMenu.ShortcutKeys = Keys.Control | Keys.Shift | Keys.O;
                 deleteFileMainMenu.ShortcutKeys = Keys.Control | Keys.Shift | Keys.D;
-                tryToDecryptMainMenu.ShortcutKeys = Keys.Control | Keys.Shift | Keys.E;
                 exitMainMenu.ShortcutKeys = Keys.Control | Keys.Q;
                 undoMainMenu.ShortcutKeys = Keys.Control | Keys.Z;
                 redoMainMenu.ShortcutKeys = Keys.Control | Keys.Y;
@@ -750,7 +683,6 @@ protected internal void ShortcutKeys(bool shortcutKeys)
                 saveCloseFileMainMenu.ShortcutKeys = Keys.None;
                 openFileLocationMainMenu.ShortcutKeys = Keys.None;
                 deleteFileMainMenu.ShortcutKeys = Keys.None;
-                tryToDecryptMainMenu.ShortcutKeys = Keys.None;
                 exitMainMenu.ShortcutKeys = Keys.None;
                 undoMainMenu.ShortcutKeys = Keys.None;
                 redoMainMenu.ShortcutKeys = Keys.None;
@@ -789,8 +721,6 @@ public void ToolbarIcons(bool oldIcons)
                 pasteToolbarButton.Image = Resources.old_paste_plain;
                 changePasswordToolbarButton.Image = Resources.old_page_white_key;
                 lockToolbarButton.Image = Resources.old_lock;
-                insertDateTimeMainMenu.Image = Resources.old_clock_add;
-                tryToDecryptToolbarButton.Image = Resources.old_lock_edit;
                 settingsToolbarButton.Image = Resources.old_setting_tools;
                 alwaysOnTopToolbarButton.Image = Resources.old_application_double;
             }
@@ -806,8 +736,6 @@ public void ToolbarIcons(bool oldIcons)
                 pasteToolbarButton.Image = Resources.clipboard;
                 changePasswordToolbarButton.Image = Resources.key;
                 lockToolbarButton.Image = Resources.lock_warning;
-                insertDateTimeMainMenu.Image = Resources.clock_plus;
-                tryToDecryptToolbarButton.Image = Resources.lock_pencil;
                 settingsToolbarButton.Image = Resources.gear;
                 alwaysOnTopToolbarButton.Image = Resources.applications_blue;
             }
@@ -839,18 +767,6 @@ private void RichTextBox_ModifiedChanged(object sender, EventArgs e)
                     Text = Text.Replace("*", string.Empty);
                 }
             }
-            //if (richTextBox.Modified == true)
-            //{
-            //    if (!Text.Contains("*"))
-            //    {
-            //        Text = Text.Insert(0, "*");
-            //        if (string.IsNullOrEmpty(PublicVar.openFileName) & richTextBox.TextLength > 0)
-            //        {
-            //            Text = "Unnamed.cnp" + " – " + PublicVar.appName;
-            //            Text = Text.Insert(0, "*");
-            //        }
-            //    }
-            //}
         }
         private void StatusPanel_VisibleChanged(object sender, EventArgs e)
         {
@@ -862,13 +778,15 @@ private void StatusPanel_VisibleChanged(object sender, EventArgs e)
 
         private void MainForm_Resize(object sender, EventArgs e)
         {
-            if (WindowState == FormWindowState.Minimized & settings.minimizeToTray)
+            if (settings.minimizeToTray)
             {
-                Hide();
+                if (WindowState == FormWindowState.Minimized)
+                {
+                    Hide();
+                }
             }
             if (WindowState == FormWindowState.Minimized & settings.autoLock & !string.IsNullOrEmpty(PublicVar.password.Get()))
             {
-                settingsToolStripMenuItem.Enabled = false;
                 fileLockedPanel.Visible = true;
             }
             if (WindowState == FormWindowState.Normal)
@@ -918,7 +836,6 @@ private void MainWindow_FormClosing(object sender, FormClosingEventArgs e)
                 {
                     if (settings.autoLock & !string.IsNullOrEmpty(PublicVar.password.Get()))
                     {
-                        settingsToolStripMenuItem.Enabled = false;
                         fileLockedPanel.Visible = true;
                     }
                     Hide();
@@ -983,11 +900,8 @@ private void MainWindow_FormClosing(object sender, FormClosingEventArgs e)
                             using (StreamWriter writer = new StreamWriter(filePath))
                             {
                                 string encryptedText = richTextBox.Text;
-                                Task.Run(async () =>
+                                Task.Run(async () => { encryptedText =  await AES.Encrypt(encryptedText, PublicVar.password.Get(), null, settings.HashAlgorithm, 
-                                {
+                                    Convert.ToInt32(settings.PasswordIterations), Convert.ToInt32(settings.KeySize)); }).Wait();
-                                    encryptedText = await AES.Encrypt(encryptedText, PublicVar.password.Get(), null, settings.HashAlgorithm,
-                                    Convert.ToInt32(settings.PasswordIterations), Convert.ToInt32(settings.KeySize));
-                                }).Wait();
                                 writer.Write(encryptedText);
                                 writer.Close();
                             }
@@ -1034,7 +948,6 @@ private void MainForm_Shown(object sender, EventArgs e)
                     }
                 }
             }
-            WindowState = settings.windowState;
         }
 
         private async void MainWindow_Load(object sender, EventArgs e)
@@ -1047,7 +960,6 @@ private async void MainWindow_Load(object sender, EventArgs e)
             ShortcutKeys(settings.shortcutKeys);
             statusPanelReadonlyLabel.Text = "Readonly: " + readOnlyMainMenu.Checked.ToString();
             statusPanelWordwrapLabel.Text = "Word Wrap: " + wordWrapMainMenu.Checked.ToString();
-            statusPanelPasteboardLabel.Text = "Paste Board: " + pasteBoardMainMenu.Checked.ToString();
             if (args.Length == 2) /*drag & drop to executable*/
             {
                 OpenAsotiations();
@@ -1060,11 +972,9 @@ private async void MainWindow_Load(object sender, EventArgs e)
                 }
                 SendTo();
             }
-            if (args.Contains("/o"))  /*decrypt & open*/
+            if (args.Contains("/o"))  /*decrypt & open cnp*/
             {
-                PublicVar.openFileName = Path.GetFileName(args[1]);
+                OpenAsotiations();
-                openFileDialog.FileName = Path.GetFullPath(args[1]);
-                await DecryptAES();
             }
             if (args.Contains("/er")) /*encrypt and replace*/
             {
@@ -1136,7 +1046,7 @@ private void RichTextBox_LinkClicked(object sender, LinkClickedEventArgs e)
             }
         }
 
-        private void RichTextBox_DragDrop(object sender, DragEventArgs e)
+        private async void RichTextBox_DragDrop(object sender, DragEventArgs e)
         {
             SaveConfirm();
             if (cancelPressed)
@@ -1152,14 +1062,34 @@ private void RichTextBox_DragDrop(object sender, DragEventArgs e)
             {
                 if (fileName is string[] list && !string.IsNullOrWhiteSpace(list[0]))
                 {
-                    TryToDecryptMessage(openFileDialog.FileName);
+                    if (!openFileDialog.FileName.Contains(".cnp"))
+                    {
+                        if (Visible)
+                        {
+                            PublicVar.messageBoxCenterParent = true;
+                        }
+                        using (new CenterWinDialog(this))
+                        {
+                            DialogResult res = MessageBox.Show(this, "Try to decrypt \"" + PublicVar.openFileName + "\" file?", PublicVar.appName, 
+                                MessageBoxButtons.YesNo, MessageBoxIcon.Information);
+                            if (res == DialogResult.No)
+                            {
+                                richTextBox.Text = File.ReadAllText(openFileDialog.FileName);
+                                Text = Path.GetFileName(openFileDialog.FileName) + " – " + PublicVar.appName;
+                                filePath = openFileDialog.FileName;
+                                StatusPanelFileInfo();
+                                return;
+                            }
+                        }
+                    }
+                    await DecryptAES();
                 }
             }
         }
 
         private void RichTextBox_TextChanged(object sender, EventArgs e)
         {
-           statusPanelTimer.Start();
+            statusPanelTimer.Start();
             if (richTextBox.Modified)
             {
                 if (!Text.Contains("*"))
@@ -1193,7 +1123,7 @@ private void StatusPanelLabel_Click(object sender, EventArgs e)
                 string exePath = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location) + @"\";
                 using (new CenterWinDialog(this))
                 {
-                    DialogResult res = MessageBox.Show(this, "New version is available. Install it now?", PublicVar.appName,
+                    DialogResult res = MessageBox.Show(this, "New version is available. Install it now?", PublicVar.appName, 
                         MessageBoxButtons.YesNo, MessageBoxIcon.Information);
                     if (res == DialogResult.Yes)
                     {
@@ -1274,7 +1204,7 @@ private void NewMainMenu_Click(object sender, EventArgs e)
             TypedPassword.Value = null;
         }
 
-        private void OpenMainMenu_Click(object sender, EventArgs e)
+        private async void OpenMainMenu_Click(object sender, EventArgs e)
         {
             SaveConfirm();
             if (cancelPressed)
@@ -1286,7 +1216,27 @@ private void OpenMainMenu_Click(object sender, EventArgs e)
             if (openFileDialog.ShowDialog() != DialogResult.OK) return;
             {
                 PublicVar.openFileName = Path.GetFileName(openFileDialog.FileName);
-                TryToDecryptMessage(openFileDialog.FileName);
+                if (!openFileDialog.FileName.Contains(".cnp"))
+                {
+                    if (Visible)
+                    {
+                        PublicVar.messageBoxCenterParent = true;
+                    }
+                    using (new CenterWinDialog(this))
+                    {
+                        DialogResult res = MessageBox.Show(this, "Try to decrypt \"" + PublicVar.openFileName + "\" file?", PublicVar.appName,
+                            MessageBoxButtons.YesNo, MessageBoxIcon.Information);
+                        if (res == DialogResult.No)
+                        {
+                            richTextBox.Text = File.ReadAllText(openFileDialog.FileName);
+                            Text = Path.GetFileName(openFileDialog.FileName) + " – " + PublicVar.appName;
+                            filePath = openFileDialog.FileName;
+                            StatusPanelFileInfo();
+                            return;
+                        }
+                    }
+                }
+                await DecryptAES();
                 richTextBox.Modified = false;
             }
         }
@@ -1299,14 +1249,13 @@ private async void SaveMainMenu_Click(object sender, EventArgs e)
                 return;
             }
             mainMenu.Enabled = false;
-            settingsToolStripMenuItem.Enabled = false;
             toolbarPanel.Enabled = false;
             richTextBox.ReadOnly = true;
             richTextBox.SuspendDrawing();
             UseWaitCursor = true;
             using (StreamWriter writer = new StreamWriter(filePath))
             {
-                writer.Write(await AES.Encrypt(richTextBox.Text, PublicVar.password.Get(), null, settings.HashAlgorithm,
+                writer.Write(await AES.Encrypt(richTextBox.Text, PublicVar.password.Get(), null, settings.HashAlgorithm, 
                     Convert.ToInt32(settings.PasswordIterations), Convert.ToInt32(settings.KeySize)));
                 writer.Close();
             }
@@ -1317,7 +1266,6 @@ private async void SaveMainMenu_Click(object sender, EventArgs e)
             richTextBox.ResumeDrawing();
             UseWaitCursor = false;
             mainMenu.Enabled = true;
-            settingsToolStripMenuItem.Enabled = true;
             toolbarPanel.Enabled = true;
             richTextBox.ReadOnly = false;
         }
@@ -1359,7 +1307,6 @@ private async void SaveAsMainMenu_Click(object sender, EventArgs e)
             PublicVar.password.Set(TypedPassword.Value);
             filePath = saveFileDialog.FileName;
             mainMenu.Enabled = false;
-            settingsToolStripMenuItem.Enabled = false;
             toolbarPanel.Enabled = false;
             richTextBox.ReadOnly = true;
             richTextBox.SuspendDrawing();
@@ -1373,7 +1320,6 @@ private async void SaveAsMainMenu_Click(object sender, EventArgs e)
             richTextBox.ResumeDrawing();
             UseWaitCursor = false;
             mainMenu.Enabled = true;
-            settingsToolStripMenuItem.Enabled = true;
             toolbarPanel.Enabled = true;
             richTextBox.ReadOnly = false;
             richTextBox.Modified = false;
@@ -1386,8 +1332,12 @@ private async void SaveAsMainMenu_Click(object sender, EventArgs e)
 
         private async void SaveCloseFileMainMenu_Click(object sender, EventArgs e)
         {
+            if (string.IsNullOrEmpty(filePath))
+            {
+                return;
+            }
+
             mainMenu.Enabled = false;
-            settingsToolStripMenuItem.Enabled = false;
             toolbarPanel.Enabled = false;
             richTextBox.SuspendDrawing();
             UseWaitCursor = true;
@@ -1400,7 +1350,6 @@ private async void SaveCloseFileMainMenu_Click(object sender, EventArgs e)
             richTextBox.ResumeDrawing();
             UseWaitCursor = false;
             mainMenu.Enabled = true;
-            settingsToolStripMenuItem.Enabled = true;
             toolbarPanel.Enabled = true;
             richTextBox.ReadOnly = false;
             PublicVar.password.Set(null);
@@ -1428,7 +1377,7 @@ private void DeleteFileToolStripMenuItem_Click(object sender, EventArgs e)
                 PublicVar.messageBoxCenterParent = true;
                 using (new CenterWinDialog(this))
                 {
-                    if (MessageBox.Show(this, "Delete file: " + "\"" + filePath + "\"" + " ?", PublicVar.appName,
+                    if (MessageBox.Show(this, "Delete file: " + "\"" + filePath + "\"" + " ?", PublicVar.appName, 
                         MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
                     {
                         File.Delete(filePath);
@@ -1450,14 +1399,6 @@ private void DeleteFileToolStripMenuItem_Click(object sender, EventArgs e)
             }
         }
 
-        private async void TryToDecryptMainMenu_Click(object sender, EventArgs e)
-        {
-            if (!string.IsNullOrEmpty(filePath))
-            {
-                await DecryptAES();
-            }
-        }
-
         private void ExitMainMenu_Click(object sender, EventArgs e)
         {
             Application.Exit();
@@ -1466,43 +1407,6 @@ private void ExitMainMenu_Click(object sender, EventArgs e)
 
         /*Edit*/
         private void EditMainMenu_DropDownOpened(object sender, EventArgs e)
-        {
-
-        }
-
-        private void FileMainMenu_DropDownOpening(object sender, EventArgs e)
-        {
-            if (!string.IsNullOrEmpty(filePath))
-            {
-                deleteFileMainMenu.Enabled = true;
-                openFileLocationMainMenu.Enabled = true;
-            }
-            else
-            {
-                deleteFileMainMenu.Enabled = false;
-                openFileLocationMainMenu.Enabled = false;
-            }
-
-            if (!string.IsNullOrEmpty(PublicVar.password.Get()) && !string.IsNullOrEmpty(filePath))
-            {
-                saveCloseFileMainMenu.Enabled = true;
-            }
-            else
-            {
-                saveCloseFileMainMenu.Enabled = false;
-            }
-
-            if (string.IsNullOrEmpty(PublicVar.password.Get()) && richTextBox.TextLength > 0 && !string.IsNullOrEmpty(filePath))
-            {
-                tryToDecryptMainMenu.Enabled = true;
-            }
-            else
-            {
-                tryToDecryptMainMenu.Enabled = false;
-            }
-        }
-
-        private void EditMainMenu_DropDownOpening(object sender, EventArgs e)
         {
             if (richTextBox.SelectionLength != 0)
             {
@@ -1518,21 +1422,6 @@ private void EditMainMenu_DropDownOpening(object sender, EventArgs e)
             }
         }
 
-        private void ToolsMainMenu_DropDownOpening(object sender, EventArgs e)
-        {
-            if (string.IsNullOrEmpty(PublicVar.password.Get()))
-            {
-                changePasswordMainMenu.Enabled = false;
-                lockMainMenu.Enabled = false;
-            }
-            else
-            {
-                changePasswordMainMenu.Enabled = true;
-                lockMainMenu.Enabled = true;
-
-            }
-        }
-
         private void UndoMainMenu_Click(object sender, EventArgs e)
         {
             richTextBox.Undo();
@@ -1625,22 +1514,6 @@ private void ReadOnlyMainMenu_Click(object sender, EventArgs e)
             statusPanelReadonlyLabel.Text = "Readonly: " + readOnlyMainMenu.Checked.ToString();
         }
 
-        private void InsertDateTimeMainMenu_Click(object sender, EventArgs e)
-        {
-            DateTime now = DateTime.Now;
-            richTextBox.SelectedText = now.ToString();
-            richTextBox.Modified = true;
-            if (!Text.Contains("*"))
-            {
-                Text = Text.Insert(0, "*");
-                if (string.IsNullOrEmpty(PublicVar.openFileName) & richTextBox.TextLength > 0)
-                {
-                    Text = "Unnamed.cnp" + " – " + PublicVar.appName;
-                    Text = Text.Insert(0, "*");
-                }
-            }
-        }
-
         private void WordWrapMainMenu_Click(object sender, EventArgs e)
         {
             richTextBox.WordWrap = wordWrapMainMenu.Checked;
@@ -1701,7 +1574,6 @@ private async void LockMainMenu_Click(object sender, EventArgs e)
             }
 
             mainMenu.Enabled = false;
-            settingsToolStripMenuItem.Enabled = false;
             toolbarPanel.Enabled = false;
             richTextBox.SuspendDrawing();
             UseWaitCursor = true;
@@ -1726,43 +1598,6 @@ private void SettingsMainMenu_Click(object sender, EventArgs e)
         }
         /*Tools*/
 
-        /*Paste Board*/
-        string clipboardLastText = "";
-        private void PasteBoardTimer_Tick(object sender, EventArgs e)
-        {
-            string clipboardText = Clipboard.GetText();
-            if (!string.IsNullOrEmpty(clipboardText) && clipboardLastText != clipboardText)
-            {
-                clipboardLastText = clipboardText;
-                if (richTextBox.Text.Length > 0)
-                {
-                    richTextBox.AppendText("\n\n" + clipboardText);
-                    richTextBox.SelectionStart = richTextBox.Text.Length;
-                    richTextBox.ScrollToCaret();
-                }
-                else
-                {
-                    richTextBox.AppendText(clipboardText);
-                }
-            }
-        }
-
-        private void PasteBoardMainMenu_Click(object sender, EventArgs e)
-        {
-            if (pasteBoardMainMenu.Checked)
-            {
-                Clipboard.Clear();
-                pasteBoardTimer.Start();
-                statusPanelPasteboardLabel.Text = "Paste Board: " + pasteBoardMainMenu.Checked.ToString();
-            }
-            else
-            {
-                pasteBoardTimer.Stop();
-                statusPanelPasteboardLabel.Text = "Paste Board: " + pasteBoardMainMenu.Checked.ToString();
-            }
-        }
-        /*Paste Board*/
-
         /*Help*/
         private void DocumentationMainMenu_Click(object sender, EventArgs e)
         {
@@ -1934,11 +1769,6 @@ private void LockToolbarButton_Click(object sender, EventArgs e)
             LockMainMenu_Click(this, new EventArgs());
         }
 
-        private void TryToDecryptToolbarButton_Click(object sender, EventArgs e)
-        {
-            TryToDecryptMainMenu_Click(this, new EventArgs());
-        }
-
         private void CloseToolbarButton_Click(object sender, EventArgs e)
         {
             toolbarPanel.Visible = false;
@@ -2000,16 +1830,6 @@ private void ToolbarPanel_MouseEnter(object sender, EventArgs e)
                 changePasswordToolbarButton.Enabled = true;
                 lockToolbarButton.Enabled = true;
             }
-
-            if (string.IsNullOrEmpty(PublicVar.password.Get()) && richTextBox.TextLength > 0 && !string.IsNullOrEmpty(filePath))
-            {
-                tryToDecryptToolbarButton.Enabled = true;
-            }
-            else
-            {
-                tryToDecryptToolbarButton.Enabled = false;
-            }
-
         }
         #endregion
 
@@ -2146,7 +1966,6 @@ private void FileLockedPanel_VisibleChanged(object sender, EventArgs e)
                 PublicVar.password.Set(null);
                 caretPos = richTextBox.SelectionStart;
                 richTextBox.Visible = false;
-                settingsToolStripMenuItem.Enabled = false;
                 toolbarPanel.Enabled = false;
                 mainMenu.Enabled = false;
                 richTextBox.Clear();
@@ -2182,7 +2001,6 @@ private async void FileLockedOkButton_Click(object sender, EventArgs e)
 
         private void FileLockedCloseButton_MouseClick(object sender, MouseEventArgs e)
         {
-            settingsToolStripMenuItem.Enabled = true;
             fileLockedPanel.Visible = false;
             Text = PublicVar.appName;
             filePath = "";
@@ -2228,76 +2046,23 @@ private void FileLockedCloseButton_MouseLeave(object sender, EventArgs e)
 
 
         #region Tray
-        private void ResetWindowLocationTrayMenu_Click(object sender, EventArgs e)
-        {
-            Location = new Point(1, 1);
-        }
-        private void SettingsToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            SettingsForm settingsForm = new SettingsForm
-            {
-                Owner = this,
-                StartPosition = FormStartPosition.CenterScreen
-            };
-            settingsForm.ShowDialog();
-        }
         private void TrayIcon_MouseDoubleClick(object sender, MouseEventArgs e)
         {
             if (e.Button == MouseButtons.Left)
-            {
-                if (!Visible)
-                {
-                    Show();
-                    WindowState = currentWindowState;
-                    if (!fileLockedPanel.Visible)
-                    {
-                        richTextBox.Visible = true;
-                    }
-                }
-            }
-        }
-        private void HideWindowTrayMenu_Click(object sender, EventArgs e)
-        {
-            currentWindowState = WindowState;
-            WindowState = FormWindowState.Minimized;
-            Hide();
-        }
-        private void ShowWindowTrayMenu_Click(object sender, EventArgs e)
-        {
-            if (!Visible)
             {
                 Show();
-                WindowState = currentWindowState;
+                WindowState = FormWindowState.Normal;
-                if (!fileLockedPanel.Visible)
-                {
-                    richTextBox.Visible = true;
-                }
             }
         }
+        private void ShowTrayMenu_Click(object sender, EventArgs e)
+        {
+            Show();
+            WindowState = FormWindowState.Normal;
+        }
         private void ExitTrayMenu_Click(object sender, EventArgs e)
         {
             Application.Exit();
         }
-        private void TrayMenu_Opening(object sender, CancelEventArgs e)
-        {
-            if (Visible)
-            {
-                showWindowTrayMenu.Enabled = false;
-            }
-            else
-            {
-                showWindowTrayMenu.Enabled = true;
-            }
-
-            if (!Visible)
-            {
-                hideWindowTrayMenu.Enabled = false;
-            }
-            else
-            {
-                hideWindowTrayMenu.Enabled = true;
-            }
-        }
         #endregion
 
 
@@ -2308,7 +2073,6 @@ private void VariablesMainMenu_Click(object sender, EventArgs e)
             string formattedTime = DateTime.Now.ToString("yyyy.MM.dd hh:mm:ss");
             Debug.WriteLine("\nTime: " + formattedTime);
             Debug.WriteLine("PublicVar.openFileName: " + PublicVar.openFileName);
-            Debug.WriteLine("openFileDialog.FileName " + openFileDialog.FileName);
             Debug.WriteLine("filePath: " + filePath);
             Debug.WriteLine("encryptionKey: " + PublicVar.password.Get());
             Debug.WriteLine("TypedPassword: " + TypedPassword.Value);
@@ -2319,14 +2083,8 @@ private void VariablesMainMenu_Click(object sender, EventArgs e)
             Debug.WriteLine("metadataCorrupt: " + PublicVar.metadataCorrupt);
 #endif
         }
-
-
-
-
-
-
-
         #endregion
 
+
     }
 }

Crypto Notepad/Forms/MainForm.resx

@@ -130,6 +130,24 @@
     <value>260, 17</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="lockToolbarButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAIdSURBVDhPlZPdS5NRHMd/5zkQeNtFF0H9A9aVBF12
+        4U10ZXCKDFaIyjaqi0HT1rTFtDfFFAdlU9LMqJVrs1Zt2laDqIYtTXMXMXvDlwoqoosw6tf5Pu4RE4N1
+        4MP5vX2/5zzPw0NYmzcKOllp0K16g+54JCV9sizlky7N6QIu1NDDDGahMZcltIgdkVvSrRuCn541vh2P
+        OT8CxKiht3wWWgq5jJV45p54Z4fObH15aq/oAIhRQ2/FLFHELZfocRjg3OzTpl+BmjXxtn2CAGLU0MNM
+        +LCkmwXowXFpktJE6yS17xf9rxJuDlSLoQt2vBttoOP8SD2jh1OHGyXdP7bIcgNHokGePbGHro6Gavh8
+        rRjsdohr/t2UQRzr2MHoRdxGUBscXM2ghT8M8MLrbv6eC/DnbCvPP/Zz7raNpxM2nk/b+FvGxj+nqlgb
+        tK9q8Humj39MdfLXbAvPPfLzm6SHn19XnIsqfh9X/OWh4oVx278NMqFazt6w84vIAZ6IHuKxsJNTPYrT
+        vYozA4ontNn0vcq/DYYbpEVbsY9w1yM740clAep3GhbBYm/Qazcu9unPCah5p2FxqdgbNFUYl5srtEZD
+        QgiLsFKK811lJohBV125mWO3aiFFoxoqXbf4O1gGI/xuO3O+nL1en0lysMrMsVs1zMBgSazXWs0m3za6
+        goY2mgS7SsUYcuxWrXAyZkLQFLRUooHf+v9Ea6jkD7YQxEPE9EcrAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>969, 17</value>
+  </metadata>
   <data name="newToolbarButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
@@ -145,9 +163,21 @@
         ls8mjzluOrP5k2QAWNYAQ/B729ITVjwAAAAASUVORK5CYII=
 </value>
   </data>
-  <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <data name="changePasswordToolbarButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>969, 17</value>
+    <value>
-  </metadata>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAIfSURBVDhPfYxdSJNhFMfPu/VJhd4E5UVEETFyk+gq
+        gkUX3qjhjbVGFJaQbaBUxIoym81JgX0oY2RQ8I4JkzSdUpk4gq0ZW28vpKgwWh/gvFn2QeWqi07nyFbP
+        08Ue+PE85zn//w8Q8S+PLxoh0mpUnrqNZsJBePLw28w7zogdaaCl8qTFWJPwm9QFvTX9Yfo6zmtuzDxr
+        Sid821TecUbsSIIhl6Ei1rU9+PP9XZxQK2d6L5SMBc6vGRv3mWa+vjqH0ZtbgpwRO5IgdMpw+stsZ/bF
+        /cp0sAOu9F6DjQy/nwdM6U9JZ5YzYkcS3HMaun9nVAzfLtVDtyAhMuRfrf+aakbOiB1J4GtQvLm3Pbkf
+        b+7g95QfM8k2TEWacS7mxM9JB3576chxRuxIgs6jSnU8WKctUvmjdhWnhhsxHqjB2cH9uDBxHKM9ezTO
+        iB1J4LXDyvZD0BS+YY2/i7VkU+NnUH9wGCcHbdmBjvI47zgjdv4XQNtBWO4+APuI/ozmwcmRY8hv/uMd
+        Z8SONOQFQGEmzILp0RMsCPMf74oK8sUCD1nAN2HhPxZ4bEUEl+tA5BELXkddi/wu/NfvLSLgY98N4Kpe
+        oo8FfBOWs1UAm9cvReSONORPbQXASSuoLJhLXkKHFQL8VzhSRxoAFGIFse7ILgjN616ku8+6FWrpr4RY
+        RRikjjTQklhLlO0sA7vNDBHLBqineQexiSgllv3rIPwBd+IjYDkT9I0AAAAASUVORK5CYII=
+</value>
+  </data>
   <data name="openToolbarButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
@@ -242,36 +272,6 @@
         IwpvUR5KXgTlksvJSQ6azRrnFgsfGAyPEr46Itqn+s5OarbbgQ8vrShTlEtOJJQaH//GnkgwBNVardRg
         sy1DgCqXnDkcvCsSsCd4KypC6xLexARSBqGq2mrdKOW1wnWwEywWIvxivJOMfKMXmVKWjEKToa5uobKx
         ces/oBcZIjJ+Aga8g1BwXIV5AAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="changePasswordToolbarButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAIfSURBVDhPfYxdSJNhFMfPu/VJhd4E5UVEETFyk+gq
-        gkUX3qjhjbVGFJaQbaBUxIoym81JgX0oY2RQ8I4JkzSdUpk4gq0ZW28vpKgwWh/gvFn2QeWqi07nyFbP
-        08Ue+PE85zn//w8Q8S+PLxoh0mpUnrqNZsJBePLw28w7zogdaaCl8qTFWJPwm9QFvTX9Yfo6zmtuzDxr
-        Sid821TecUbsSIIhl6Ei1rU9+PP9XZxQK2d6L5SMBc6vGRv3mWa+vjqH0ZtbgpwRO5IgdMpw+stsZ/bF
-        /cp0sAOu9F6DjQy/nwdM6U9JZ5YzYkcS3HMaun9nVAzfLtVDtyAhMuRfrf+aakbOiB1J4GtQvLm3Pbkf
-        b+7g95QfM8k2TEWacS7mxM9JB3576chxRuxIgs6jSnU8WKctUvmjdhWnhhsxHqjB2cH9uDBxHKM9ezTO
-        iB1J4LXDyvZD0BS+YY2/i7VkU+NnUH9wGCcHbdmBjvI47zgjdv4XQNtBWO4+APuI/ozmwcmRY8hv/uMd
-        Z8SONOQFQGEmzILp0RMsCPMf74oK8sUCD1nAN2HhPxZ4bEUEl+tA5BELXkddi/wu/NfvLSLgY98N4Kpe
-        oo8FfBOWs1UAm9cvReSONORPbQXASSuoLJhLXkKHFQL8VzhSRxoAFGIFse7ILgjN616ku8+6FWrpr4RY
-        RRikjjTQklhLlO0sA7vNDBHLBqineQexiSgllv3rIPwBd+IjYDkT9I0AAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="lockToolbarButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAIdSURBVDhPlZPdS5NRHMd/5zkQeNtFF0H9A9aVBF12
-        4U10ZXCKDFaIyjaqi0HT1rTFtDfFFAdlU9LMqJVrs1Zt2laDqIYtTXMXMXvDlwoqoosw6tf5Pu4RE4N1
-        4MP5vX2/5zzPw0NYmzcKOllp0K16g+54JCV9sizlky7N6QIu1NDDDGahMZcltIgdkVvSrRuCn541vh2P
-        OT8CxKiht3wWWgq5jJV45p54Z4fObH15aq/oAIhRQ2/FLFHELZfocRjg3OzTpl+BmjXxtn2CAGLU0MNM
-        +LCkmwXowXFpktJE6yS17xf9rxJuDlSLoQt2vBttoOP8SD2jh1OHGyXdP7bIcgNHokGePbGHro6Gavh8
-        rRjsdohr/t2UQRzr2MHoRdxGUBscXM2ghT8M8MLrbv6eC/DnbCvPP/Zz7raNpxM2nk/b+FvGxj+nqlgb
-        tK9q8Humj39MdfLXbAvPPfLzm6SHn19XnIsqfh9X/OWh4oVx278NMqFazt6w84vIAZ6IHuKxsJNTPYrT
-        vYozA4ontNn0vcq/DYYbpEVbsY9w1yM740clAep3GhbBYm/Qazcu9unPCah5p2FxqdgbNFUYl5srtEZD
-        QgiLsFKK811lJohBV125mWO3aiFFoxoqXbf4O1gGI/xuO3O+nL1en0lysMrMsVs1zMBgSazXWs0m3za6
-        goY2mgS7SsUYcuxWrXAyZkLQFLRUooHf+v9Ea6jkD7YQxEPE9EcrAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="settingsToolbarButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -6477,10 +6477,7 @@
     <value>1059, 17</value>
   </metadata>
   <metadata name="clipboardTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 56</value>
+    <value>1163, 17</value>
-  </metadata>
-  <metadata name="pasteBoardTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>151, 56</value>
   </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>99</value>

Crypto Notepad/Forms/PasswordGeneratorFrom.Designer.cs

@@ -63,7 +63,7 @@ private void InitializeComponent()
             // 
             // passwordsListTextBox
             // 
-            this.passwordsListTextBox.Font = new System.Drawing.Font("Consolas", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+            this.passwordsListTextBox.Font = new System.Drawing.Font("Consolas", 8.25F);
             this.passwordsListTextBox.Location = new System.Drawing.Point(9, 161);
             this.passwordsListTextBox.Multiline = true;
             this.passwordsListTextBox.Name = "passwordsListTextBox";

Crypto Notepad/Forms/SettingsForm.Designer.cs

@@ -34,27 +34,24 @@ private void InitializeComponent()
             this.colorDialog = new System.Windows.Forms.ColorDialog();
             this.settingsTabControl = new System.Windows.Forms.TabControl();
             this.generalTabPage = new System.Windows.Forms.TabPage();
-            this.autoLockGroupBox = new System.Windows.Forms.GroupBox();
-            this.autoLockMinutesLabel = new System.Windows.Forms.Label();
-            this.autoLockOnMinimizeCheckBox = new System.Windows.Forms.CheckBox();
-            this.lockTimeoutTextBox = new System.Windows.Forms.PlaceholderTextBox();
-            this.lockTimeoutLabel = new System.Windows.Forms.Label();
             this.integrationGroupBox = new System.Windows.Forms.GroupBox();
             this.integrateCheckBox = new System.Windows.Forms.CheckBox();
             this.associateCheckBox = new System.Windows.Forms.CheckBox();
             this.sendToCheckBox = new System.Windows.Forms.CheckBox();
             this.applicationGroupBox = new System.Windows.Forms.GroupBox();
-            this.trayMenuCheckBox = new System.Windows.Forms.CheckBox();
-            this.openTxtUnencryptedCheckBox = new System.Windows.Forms.CheckBox();
             this.clearClipboardCheckBox = new System.Windows.Forms.CheckBox();
             this.autoCheckUpdatesCheckBox = new System.Windows.Forms.CheckBox();
             this.singleInstanceCheckBox = new System.Windows.Forms.CheckBox();
             this.closeToTrayCheckBox = new System.Windows.Forms.CheckBox();
             this.minimizeToTrayCheckBox = new System.Windows.Forms.CheckBox();
+            this.autoLockGroupBox = new System.Windows.Forms.GroupBox();
+            this.autoLockMinutesLabel = new System.Windows.Forms.Label();
+            this.autoLockOnMinimizeCheckBox = new System.Windows.Forms.CheckBox();
+            this.lockTimeoutTextBox = new System.Windows.Forms.PlaceholderTextBox();
+            this.lockTimeoutLabel = new System.Windows.Forms.Label();
             this.interfaceTabPage = new System.Windows.Forms.TabPage();
             this.statusPanelGroupBox = new System.Windows.Forms.GroupBox();
             this.statusPanelLabelsGroupBox = new System.Windows.Forms.GroupBox();
-            this.statusPanelPasteboardCheckBox = new System.Windows.Forms.CheckBox();
             this.statusPanelClipboardCheckBox = new System.Windows.Forms.CheckBox();
             this.statusPanelWordwrapCheckBox = new System.Windows.Forms.CheckBox();
             this.statusPanelReadonlyCheckBox = new System.Windows.Forms.CheckBox();
@@ -67,13 +64,9 @@ private void InitializeComponent()
             this.statusPanelFontColorLabel = new System.Windows.Forms.Label();
             this.statusPanelBackColor = new System.Windows.Forms.Panel();
             this.statusPanelFontColor = new System.Windows.Forms.Panel();
-            this.searchPanelGroupBox = new System.Windows.Forms.GroupBox();
+            this.mainMenuGroupBox = new System.Windows.Forms.GroupBox();
-            this.searchBorderComboBox = new System.Windows.Forms.ComboBox();
+            this.mainMenuCheckBox = new System.Windows.Forms.CheckBox();
-            this.searchBackColorLabel = new System.Windows.Forms.Label();
+            this.menuIconsCheckBox = new System.Windows.Forms.CheckBox();
-            this.searchBorderLabel = new System.Windows.Forms.Label();
-            this.searchFontColorLabel = new System.Windows.Forms.Label();
-            this.searchFontColor = new System.Windows.Forms.Panel();
-            this.searchBackColor = new System.Windows.Forms.Panel();
             this.toolbarGroupBox = new System.Windows.Forms.GroupBox();
             this.toolbarCloseButtonCheckBox = new System.Windows.Forms.CheckBox();
             this.toolbarBorderCheckBox = new System.Windows.Forms.CheckBox();
@@ -81,10 +74,13 @@ private void InitializeComponent()
             this.toolbarBackColorLabel = new System.Windows.Forms.Label();
             this.toolbarBackColor = new System.Windows.Forms.Panel();
             this.toolbarVisibleCheckBox = new System.Windows.Forms.CheckBox();
-            this.mainMenuGroupBox = new System.Windows.Forms.GroupBox();
+            this.searchPanelGroupBox = new System.Windows.Forms.GroupBox();
-            this.shortcutKeysCheckBox = new System.Windows.Forms.CheckBox();
+            this.searchBorderComboBox = new System.Windows.Forms.ComboBox();
-            this.mainMenuCheckBox = new System.Windows.Forms.CheckBox();
+            this.searchBackColorLabel = new System.Windows.Forms.Label();
-            this.menuIconsCheckBox = new System.Windows.Forms.CheckBox();
+            this.searchBorderLabel = new System.Windows.Forms.Label();
+            this.searchFontColorLabel = new System.Windows.Forms.Label();
+            this.searchFontColor = new System.Windows.Forms.Panel();
+            this.searchBackColor = new System.Windows.Forms.Panel();
             this.editorTabPage = new System.Windows.Forms.TabPage();
             this.clearClipboardTextBox = new System.Windows.Forms.TextBox();
             this.clearClipboardLabel = new System.Windows.Forms.Label();
@@ -112,17 +108,18 @@ private void InitializeComponent()
             this.settingsNavigation = new System.Windows.Forms.ListBox();
             this.fontDialog = new System.Windows.Forms.FontDialog();
             this.settingsToolTip = new System.Windows.Forms.ToolTip(this.components);
+            this.shortcutKeysCheckBox = new System.Windows.Forms.CheckBox();
             this.settingsTabControl.SuspendLayout();
             this.generalTabPage.SuspendLayout();
-            this.autoLockGroupBox.SuspendLayout();
             this.integrationGroupBox.SuspendLayout();
             this.applicationGroupBox.SuspendLayout();
+            this.autoLockGroupBox.SuspendLayout();
             this.interfaceTabPage.SuspendLayout();
             this.statusPanelGroupBox.SuspendLayout();
             this.statusPanelLabelsGroupBox.SuspendLayout();
-            this.searchPanelGroupBox.SuspendLayout();
-            this.toolbarGroupBox.SuspendLayout();
             this.mainMenuGroupBox.SuspendLayout();
+            this.toolbarGroupBox.SuspendLayout();
+            this.searchPanelGroupBox.SuspendLayout();
             this.editorTabPage.SuspendLayout();
             this.encryptionTabPage.SuspendLayout();
             this.SuspendLayout();
@@ -160,79 +157,22 @@ private void InitializeComponent()
             // 
             this.generalTabPage.BackColor = System.Drawing.SystemColors.Window;
             this.generalTabPage.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.generalTabPage.Controls.Add(this.autoLockGroupBox);
             this.generalTabPage.Controls.Add(this.integrationGroupBox);
             this.generalTabPage.Controls.Add(this.applicationGroupBox);
+            this.generalTabPage.Controls.Add(this.autoLockGroupBox);
             this.generalTabPage.Location = new System.Drawing.Point(4, 24);
             this.generalTabPage.Name = "generalTabPage";
-            this.generalTabPage.Padding = new System.Windows.Forms.Padding(6, 6, 6, 3);
+            this.generalTabPage.Padding = new System.Windows.Forms.Padding(3);
             this.generalTabPage.Size = new System.Drawing.Size(326, 291);
             this.generalTabPage.TabIndex = 2;
             this.generalTabPage.Text = "gen";
             // 
-            // autoLockGroupBox
-            // 
-            this.autoLockGroupBox.Controls.Add(this.autoLockMinutesLabel);
-            this.autoLockGroupBox.Controls.Add(this.autoLockOnMinimizeCheckBox);
-            this.autoLockGroupBox.Controls.Add(this.lockTimeoutTextBox);
-            this.autoLockGroupBox.Controls.Add(this.lockTimeoutLabel);
-            this.autoLockGroupBox.Dock = System.Windows.Forms.DockStyle.Top;
-            this.autoLockGroupBox.Location = new System.Drawing.Point(6, 230);
-            this.autoLockGroupBox.Name = "autoLockGroupBox";
-            this.autoLockGroupBox.Size = new System.Drawing.Size(312, 75);
-            this.autoLockGroupBox.TabIndex = 3;
-            this.autoLockGroupBox.TabStop = false;
-            this.autoLockGroupBox.Text = "Auto lock";
-            // 
-            // autoLockMinutesLabel
-            // 
-            this.autoLockMinutesLabel.AutoSize = true;
-            this.autoLockMinutesLabel.Location = new System.Drawing.Point(184, 48);
-            this.autoLockMinutesLabel.Name = "autoLockMinutesLabel";
-            this.autoLockMinutesLabel.Size = new System.Drawing.Size(50, 15);
-            this.autoLockMinutesLabel.TabIndex = 0;
-            this.autoLockMinutesLabel.Text = "minutes";
-            // 
-            // autoLockOnMinimizeCheckBox
-            // 
-            this.autoLockOnMinimizeCheckBox.AutoSize = true;
-            this.autoLockOnMinimizeCheckBox.Location = new System.Drawing.Point(6, 22);
-            this.autoLockOnMinimizeCheckBox.Name = "autoLockOnMinimizeCheckBox";
-            this.autoLockOnMinimizeCheckBox.Size = new System.Drawing.Size(146, 19);
-            this.autoLockOnMinimizeCheckBox.TabIndex = 7;
-            this.autoLockOnMinimizeCheckBox.Text = "Auto lock on minimize";
-            this.autoLockOnMinimizeCheckBox.UseVisualStyleBackColor = true;
-            this.autoLockOnMinimizeCheckBox.Click += new System.EventHandler(this.AutoLockOnMinimizeCheckBox_Click);
-            // 
-            // lockTimeoutTextBox
-            // 
-            this.lockTimeoutTextBox.Location = new System.Drawing.Point(134, 45);
-            this.lockTimeoutTextBox.Name = "lockTimeoutTextBox";
-            this.lockTimeoutTextBox.Placeholder = "";
-            this.lockTimeoutTextBox.PlaceholderActiveForeColor = System.Drawing.Color.DarkGray;
-            this.lockTimeoutTextBox.PlaceholderFont = new System.Drawing.Font("Segoe UI", 8.25F);
-            this.lockTimeoutTextBox.PlaceholderForeColor = System.Drawing.Color.DarkGray;
-            this.lockTimeoutTextBox.Size = new System.Drawing.Size(44, 23);
-            this.lockTimeoutTextBox.TabIndex = 8;
-            this.lockTimeoutTextBox.TextChanged += new System.EventHandler(this.LockTimeoutTextBox_TextChanged);
-            this.lockTimeoutTextBox.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.LockTimeoutTextBox_KeyPress);
-            // 
-            // lockTimeoutLabel
-            // 
-            this.lockTimeoutLabel.AutoSize = true;
-            this.lockTimeoutLabel.Location = new System.Drawing.Point(3, 48);
-            this.lockTimeoutLabel.Name = "lockTimeoutLabel";
-            this.lockTimeoutLabel.Size = new System.Drawing.Size(125, 15);
-            this.lockTimeoutLabel.TabIndex = 7;
-            this.lockTimeoutLabel.Text = "If the app is inactive in";
-            // 
             // integrationGroupBox
             // 
             this.integrationGroupBox.Controls.Add(this.integrateCheckBox);
             this.integrationGroupBox.Controls.Add(this.associateCheckBox);
             this.integrationGroupBox.Controls.Add(this.sendToCheckBox);
-            this.integrationGroupBox.Dock = System.Windows.Forms.DockStyle.Top;
+            this.integrationGroupBox.Location = new System.Drawing.Point(6, 109);
-            this.integrationGroupBox.Location = new System.Drawing.Point(6, 128);
             this.integrationGroupBox.Name = "integrationGroupBox";
             this.integrationGroupBox.Size = new System.Drawing.Size(312, 102);
             this.integrationGroupBox.TabIndex = 2;
@@ -274,47 +214,22 @@ private void InitializeComponent()
             // 
             // applicationGroupBox
             // 
-            this.applicationGroupBox.Controls.Add(this.trayMenuCheckBox);
-            this.applicationGroupBox.Controls.Add(this.openTxtUnencryptedCheckBox);
             this.applicationGroupBox.Controls.Add(this.clearClipboardCheckBox);
             this.applicationGroupBox.Controls.Add(this.autoCheckUpdatesCheckBox);
             this.applicationGroupBox.Controls.Add(this.singleInstanceCheckBox);
             this.applicationGroupBox.Controls.Add(this.closeToTrayCheckBox);
             this.applicationGroupBox.Controls.Add(this.minimizeToTrayCheckBox);
-            this.applicationGroupBox.Dock = System.Windows.Forms.DockStyle.Top;
             this.applicationGroupBox.Location = new System.Drawing.Point(6, 6);
             this.applicationGroupBox.Name = "applicationGroupBox";
-            this.applicationGroupBox.Size = new System.Drawing.Size(312, 122);
+            this.applicationGroupBox.Size = new System.Drawing.Size(312, 97);
             this.applicationGroupBox.TabIndex = 1;
             this.applicationGroupBox.TabStop = false;
             this.applicationGroupBox.Text = "Application";
             // 
-            // trayMenuCheckBox
-            // 
-            this.trayMenuCheckBox.AutoSize = true;
-            this.trayMenuCheckBox.Location = new System.Drawing.Point(6, 72);
-            this.trayMenuCheckBox.Name = "trayMenuCheckBox";
-            this.trayMenuCheckBox.Size = new System.Drawing.Size(81, 19);
-            this.trayMenuCheckBox.TabIndex = 10;
-            this.trayMenuCheckBox.Text = "Tray menu";
-            this.trayMenuCheckBox.UseVisualStyleBackColor = true;
-            this.trayMenuCheckBox.Click += new System.EventHandler(this.TrayMenuCheckBox_Click);
-            // 
-            // openTxtUnencryptedCheckBox
-            // 
-            this.openTxtUnencryptedCheckBox.AutoSize = true;
-            this.openTxtUnencryptedCheckBox.Location = new System.Drawing.Point(6, 97);
-            this.openTxtUnencryptedCheckBox.Name = "openTxtUnencryptedCheckBox";
-            this.openTxtUnencryptedCheckBox.Size = new System.Drawing.Size(254, 19);
-            this.openTxtUnencryptedCheckBox.TabIndex = 9;
-            this.openTxtUnencryptedCheckBox.Text = "Open all files except *.cnp like unencrypted";
-            this.openTxtUnencryptedCheckBox.UseVisualStyleBackColor = true;
-            this.openTxtUnencryptedCheckBox.Click += new System.EventHandler(this.OpenTxtUnencryptedCheckBox_Click);
-            // 
             // clearClipboardCheckBox
             // 
             this.clearClipboardCheckBox.AutoSize = true;
-            this.clearClipboardCheckBox.Location = new System.Drawing.Point(124, 72);
+            this.clearClipboardCheckBox.Location = new System.Drawing.Point(6, 72);
             this.clearClipboardCheckBox.Name = "clearClipboardCheckBox";
             this.clearClipboardCheckBox.Size = new System.Drawing.Size(168, 19);
             this.clearClipboardCheckBox.TabIndex = 4;
@@ -366,18 +281,73 @@ private void InitializeComponent()
             this.minimizeToTrayCheckBox.UseVisualStyleBackColor = true;
             this.minimizeToTrayCheckBox.Click += new System.EventHandler(this.MinimizeToTrayCheckBox_Click);
             // 
+            // autoLockGroupBox
+            // 
+            this.autoLockGroupBox.Controls.Add(this.autoLockMinutesLabel);
+            this.autoLockGroupBox.Controls.Add(this.autoLockOnMinimizeCheckBox);
+            this.autoLockGroupBox.Controls.Add(this.lockTimeoutTextBox);
+            this.autoLockGroupBox.Controls.Add(this.lockTimeoutLabel);
+            this.autoLockGroupBox.Location = new System.Drawing.Point(6, 217);
+            this.autoLockGroupBox.Name = "autoLockGroupBox";
+            this.autoLockGroupBox.Size = new System.Drawing.Size(312, 75);
+            this.autoLockGroupBox.TabIndex = 3;
+            this.autoLockGroupBox.TabStop = false;
+            this.autoLockGroupBox.Text = "Auto lock";
+            // 
+            // autoLockMinutesLabel
+            // 
+            this.autoLockMinutesLabel.AutoSize = true;
+            this.autoLockMinutesLabel.Location = new System.Drawing.Point(184, 48);
+            this.autoLockMinutesLabel.Name = "autoLockMinutesLabel";
+            this.autoLockMinutesLabel.Size = new System.Drawing.Size(50, 15);
+            this.autoLockMinutesLabel.TabIndex = 0;
+            this.autoLockMinutesLabel.Text = "minutes";
+            // 
+            // autoLockOnMinimizeCheckBox
+            // 
+            this.autoLockOnMinimizeCheckBox.AutoSize = true;
+            this.autoLockOnMinimizeCheckBox.Location = new System.Drawing.Point(6, 22);
+            this.autoLockOnMinimizeCheckBox.Name = "autoLockOnMinimizeCheckBox";
+            this.autoLockOnMinimizeCheckBox.Size = new System.Drawing.Size(146, 19);
+            this.autoLockOnMinimizeCheckBox.TabIndex = 7;
+            this.autoLockOnMinimizeCheckBox.Text = "Auto lock on minimize";
+            this.autoLockOnMinimizeCheckBox.UseVisualStyleBackColor = true;
+            this.autoLockOnMinimizeCheckBox.Click += new System.EventHandler(this.AutoLockOnMinimizeCheckBox_Click);
+            // 
+            // lockTimeoutTextBox
+            // 
+            this.lockTimeoutTextBox.Location = new System.Drawing.Point(134, 45);
+            this.lockTimeoutTextBox.Name = "lockTimeoutTextBox";
+            this.lockTimeoutTextBox.Placeholder = "";
+            this.lockTimeoutTextBox.PlaceholderActiveForeColor = System.Drawing.Color.DarkGray;
+            this.lockTimeoutTextBox.PlaceholderFont = new System.Drawing.Font("Segoe UI", 8.25F);
+            this.lockTimeoutTextBox.PlaceholderForeColor = System.Drawing.Color.DarkGray;
+            this.lockTimeoutTextBox.Size = new System.Drawing.Size(44, 23);
+            this.lockTimeoutTextBox.TabIndex = 8;
+            this.lockTimeoutTextBox.TextChanged += new System.EventHandler(this.LockTimeoutTextBox_TextChanged);
+            this.lockTimeoutTextBox.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.LockTimeoutTextBox_KeyPress);
+            // 
+            // lockTimeoutLabel
+            // 
+            this.lockTimeoutLabel.AutoSize = true;
+            this.lockTimeoutLabel.Location = new System.Drawing.Point(3, 48);
+            this.lockTimeoutLabel.Name = "lockTimeoutLabel";
+            this.lockTimeoutLabel.Size = new System.Drawing.Size(125, 15);
+            this.lockTimeoutLabel.TabIndex = 7;
+            this.lockTimeoutLabel.Text = "If the app is inactive in";
+            // 
             // interfaceTabPage
             // 
             this.interfaceTabPage.AutoScroll = true;
             this.interfaceTabPage.BackColor = System.Drawing.SystemColors.Window;
             this.interfaceTabPage.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.interfaceTabPage.Controls.Add(this.statusPanelGroupBox);
-            this.interfaceTabPage.Controls.Add(this.searchPanelGroupBox);
-            this.interfaceTabPage.Controls.Add(this.toolbarGroupBox);
             this.interfaceTabPage.Controls.Add(this.mainMenuGroupBox);
+            this.interfaceTabPage.Controls.Add(this.toolbarGroupBox);
+            this.interfaceTabPage.Controls.Add(this.searchPanelGroupBox);
             this.interfaceTabPage.Location = new System.Drawing.Point(4, 24);
             this.interfaceTabPage.Name = "interfaceTabPage";
-            this.interfaceTabPage.Padding = new System.Windows.Forms.Padding(6, 6, 6, 3);
+            this.interfaceTabPage.Padding = new System.Windows.Forms.Padding(3);
             this.interfaceTabPage.Size = new System.Drawing.Size(326, 291);
             this.interfaceTabPage.TabIndex = 5;
             this.interfaceTabPage.Text = "intf";
@@ -390,17 +360,15 @@ private void InitializeComponent()
             this.statusPanelGroupBox.Controls.Add(this.statusPanelFontColorLabel);
             this.statusPanelGroupBox.Controls.Add(this.statusPanelBackColor);
             this.statusPanelGroupBox.Controls.Add(this.statusPanelFontColor);
-            this.statusPanelGroupBox.Dock = System.Windows.Forms.DockStyle.Top;
+            this.statusPanelGroupBox.Location = new System.Drawing.Point(6, 281);
-            this.statusPanelGroupBox.Location = new System.Drawing.Point(6, 263);
             this.statusPanelGroupBox.Name = "statusPanelGroupBox";
-            this.statusPanelGroupBox.Size = new System.Drawing.Size(295, 205);
+            this.statusPanelGroupBox.Size = new System.Drawing.Size(295, 180);
             this.statusPanelGroupBox.TabIndex = 4;
             this.statusPanelGroupBox.TabStop = false;
             this.statusPanelGroupBox.Text = "Status Panel";
             // 
             // statusPanelLabelsGroupBox
             // 
-            this.statusPanelLabelsGroupBox.Controls.Add(this.statusPanelPasteboardCheckBox);
             this.statusPanelLabelsGroupBox.Controls.Add(this.statusPanelClipboardCheckBox);
             this.statusPanelLabelsGroupBox.Controls.Add(this.statusPanelWordwrapCheckBox);
             this.statusPanelLabelsGroupBox.Controls.Add(this.statusPanelReadonlyCheckBox);
@@ -410,22 +378,11 @@ private void InitializeComponent()
             this.statusPanelLabelsGroupBox.Controls.Add(this.statusPanelLengthCheckBox);
             this.statusPanelLabelsGroupBox.Location = new System.Drawing.Point(9, 101);
             this.statusPanelLabelsGroupBox.Name = "statusPanelLabelsGroupBox";
-            this.statusPanelLabelsGroupBox.Size = new System.Drawing.Size(277, 97);
+            this.statusPanelLabelsGroupBox.Size = new System.Drawing.Size(277, 71);
             this.statusPanelLabelsGroupBox.TabIndex = 9;
             this.statusPanelLabelsGroupBox.TabStop = false;
             this.statusPanelLabelsGroupBox.Text = "Labels";
             // 
-            // statusPanelPasteboardCheckBox
-            // 
-            this.statusPanelPasteboardCheckBox.AutoSize = true;
-            this.statusPanelPasteboardCheckBox.Location = new System.Drawing.Point(6, 72);
-            this.statusPanelPasteboardCheckBox.Name = "statusPanelPasteboardCheckBox";
-            this.statusPanelPasteboardCheckBox.Size = new System.Drawing.Size(88, 19);
-            this.statusPanelPasteboardCheckBox.TabIndex = 10;
-            this.statusPanelPasteboardCheckBox.Text = "Paste Board";
-            this.statusPanelPasteboardCheckBox.UseVisualStyleBackColor = true;
-            this.statusPanelPasteboardCheckBox.Click += new System.EventHandler(this.StatusPanelPasteboardCheckBox_Click);
-            // 
             // statusPanelClipboardCheckBox
             // 
             this.statusPanelClipboardCheckBox.AutoSize = true;
@@ -554,6 +511,119 @@ private void InitializeComponent()
             this.statusPanelFontColor.TabIndex = 3;
             this.statusPanelFontColor.Click += new System.EventHandler(this.StatusPanelFontColor_Click);
             // 
+            // mainMenuGroupBox
+            // 
+            this.mainMenuGroupBox.Controls.Add(this.shortcutKeysCheckBox);
+            this.mainMenuGroupBox.Controls.Add(this.mainMenuCheckBox);
+            this.mainMenuGroupBox.Controls.Add(this.menuIconsCheckBox);
+            this.mainMenuGroupBox.Location = new System.Drawing.Point(6, 6);
+            this.mainMenuGroupBox.Name = "mainMenuGroupBox";
+            this.mainMenuGroupBox.Size = new System.Drawing.Size(295, 49);
+            this.mainMenuGroupBox.TabIndex = 1;
+            this.mainMenuGroupBox.TabStop = false;
+            this.mainMenuGroupBox.Text = "Main menu";
+            // 
+            // mainMenuCheckBox
+            // 
+            this.mainMenuCheckBox.AutoSize = true;
+            this.mainMenuCheckBox.Location = new System.Drawing.Point(6, 22);
+            this.mainMenuCheckBox.Name = "mainMenuCheckBox";
+            this.mainMenuCheckBox.Size = new System.Drawing.Size(60, 19);
+            this.mainMenuCheckBox.TabIndex = 1;
+            this.mainMenuCheckBox.Text = "Visible";
+            this.mainMenuCheckBox.UseVisualStyleBackColor = true;
+            this.mainMenuCheckBox.Click += new System.EventHandler(this.MainMenuCheckBox_Click);
+            // 
+            // menuIconsCheckBox
+            // 
+            this.menuIconsCheckBox.AutoSize = true;
+            this.menuIconsCheckBox.Location = new System.Drawing.Point(72, 22);
+            this.menuIconsCheckBox.Name = "menuIconsCheckBox";
+            this.menuIconsCheckBox.Size = new System.Drawing.Size(88, 19);
+            this.menuIconsCheckBox.TabIndex = 2;
+            this.menuIconsCheckBox.Text = "Menu icons";
+            this.menuIconsCheckBox.UseVisualStyleBackColor = true;
+            this.menuIconsCheckBox.Click += new System.EventHandler(this.MenuIconsCheckBox_Click);
+            // 
+            // toolbarGroupBox
+            // 
+            this.toolbarGroupBox.Controls.Add(this.toolbarCloseButtonCheckBox);
+            this.toolbarGroupBox.Controls.Add(this.toolbarBorderCheckBox);
+            this.toolbarGroupBox.Controls.Add(this.toolbarOldIconsCheckBox);
+            this.toolbarGroupBox.Controls.Add(this.toolbarBackColorLabel);
+            this.toolbarGroupBox.Controls.Add(this.toolbarBackColor);
+            this.toolbarGroupBox.Controls.Add(this.toolbarVisibleCheckBox);
+            this.toolbarGroupBox.Location = new System.Drawing.Point(6, 61);
+            this.toolbarGroupBox.Name = "toolbarGroupBox";
+            this.toolbarGroupBox.Size = new System.Drawing.Size(295, 98);
+            this.toolbarGroupBox.TabIndex = 2;
+            this.toolbarGroupBox.TabStop = false;
+            this.toolbarGroupBox.Text = "Toolbar";
+            // 
+            // toolbarCloseButtonCheckBox
+            // 
+            this.toolbarCloseButtonCheckBox.AutoSize = true;
+            this.toolbarCloseButtonCheckBox.Location = new System.Drawing.Point(91, 72);
+            this.toolbarCloseButtonCheckBox.Name = "toolbarCloseButtonCheckBox";
+            this.toolbarCloseButtonCheckBox.Size = new System.Drawing.Size(94, 19);
+            this.toolbarCloseButtonCheckBox.TabIndex = 6;
+            this.toolbarCloseButtonCheckBox.Text = "Close button";
+            this.toolbarCloseButtonCheckBox.UseVisualStyleBackColor = true;
+            this.toolbarCloseButtonCheckBox.Click += new System.EventHandler(this.ToolbarCloseButtonCheckBox_Click);
+            // 
+            // toolbarBorderCheckBox
+            // 
+            this.toolbarBorderCheckBox.AutoSize = true;
+            this.toolbarBorderCheckBox.Location = new System.Drawing.Point(91, 47);
+            this.toolbarBorderCheckBox.Name = "toolbarBorderCheckBox";
+            this.toolbarBorderCheckBox.Size = new System.Drawing.Size(61, 19);
+            this.toolbarBorderCheckBox.TabIndex = 4;
+            this.toolbarBorderCheckBox.Text = "Border";
+            this.toolbarBorderCheckBox.UseVisualStyleBackColor = true;
+            this.toolbarBorderCheckBox.Click += new System.EventHandler(this.ToolbarBorderCheckBox_Click);
+            // 
+            // toolbarOldIconsCheckBox
+            // 
+            this.toolbarOldIconsCheckBox.AutoSize = true;
+            this.toolbarOldIconsCheckBox.Location = new System.Drawing.Point(9, 72);
+            this.toolbarOldIconsCheckBox.Name = "toolbarOldIconsCheckBox";
+            this.toolbarOldIconsCheckBox.Size = new System.Drawing.Size(76, 19);
+            this.toolbarOldIconsCheckBox.TabIndex = 5;
+            this.toolbarOldIconsCheckBox.Text = "Old icons";
+            this.toolbarOldIconsCheckBox.UseVisualStyleBackColor = true;
+            this.toolbarOldIconsCheckBox.Click += new System.EventHandler(this.ToolbarOldIconsCheckBox_Click);
+            // 
+            // toolbarBackColorLabel
+            // 
+            this.toolbarBackColorLabel.Location = new System.Drawing.Point(6, 16);
+            this.toolbarBackColorLabel.Name = "toolbarBackColorLabel";
+            this.toolbarBackColorLabel.Size = new System.Drawing.Size(120, 23);
+            this.toolbarBackColorLabel.TabIndex = 9;
+            this.toolbarBackColorLabel.Text = "Background color";
+            this.toolbarBackColorLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // toolbarBackColor
+            // 
+            this.toolbarBackColor.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240)))));
+            this.toolbarBackColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.toolbarBackColor.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.toolbarBackColor.Location = new System.Drawing.Point(145, 16);
+            this.toolbarBackColor.Name = "toolbarBackColor";
+            this.toolbarBackColor.Size = new System.Drawing.Size(141, 23);
+            this.toolbarBackColor.TabIndex = 11;
+            this.toolbarBackColor.Click += new System.EventHandler(this.ToolbarBackColor_Click);
+            // 
+            // toolbarVisibleCheckBox
+            // 
+            this.toolbarVisibleCheckBox.AutoSize = true;
+            this.toolbarVisibleCheckBox.Location = new System.Drawing.Point(9, 49);
+            this.toolbarVisibleCheckBox.Name = "toolbarVisibleCheckBox";
+            this.toolbarVisibleCheckBox.Size = new System.Drawing.Size(60, 19);
+            this.toolbarVisibleCheckBox.TabIndex = 3;
+            this.toolbarVisibleCheckBox.Text = "Visible";
+            this.toolbarVisibleCheckBox.UseVisualStyleBackColor = true;
+            this.toolbarVisibleCheckBox.Click += new System.EventHandler(this.ToolbarVisibleCheckBox_Click);
+            // 
             // searchPanelGroupBox
             // 
             this.searchPanelGroupBox.Controls.Add(this.searchBorderComboBox);
@@ -562,8 +632,7 @@ private void InitializeComponent()
             this.searchPanelGroupBox.Controls.Add(this.searchFontColorLabel);
             this.searchPanelGroupBox.Controls.Add(this.searchFontColor);
             this.searchPanelGroupBox.Controls.Add(this.searchBackColor);
-            this.searchPanelGroupBox.Dock = System.Windows.Forms.DockStyle.Top;
+            this.searchPanelGroupBox.Location = new System.Drawing.Point(6, 165);
-            this.searchPanelGroupBox.Location = new System.Drawing.Point(6, 153);
             this.searchPanelGroupBox.Name = "searchPanelGroupBox";
             this.searchPanelGroupBox.Size = new System.Drawing.Size(295, 110);
             this.searchPanelGroupBox.TabIndex = 3;
@@ -632,132 +701,6 @@ private void InitializeComponent()
             this.searchBackColor.TabIndex = 2;
             this.searchBackColor.Click += new System.EventHandler(this.SearchBackColor_Click);
             // 
-            // toolbarGroupBox
-            // 
-            this.toolbarGroupBox.Controls.Add(this.toolbarCloseButtonCheckBox);
-            this.toolbarGroupBox.Controls.Add(this.toolbarBorderCheckBox);
-            this.toolbarGroupBox.Controls.Add(this.toolbarOldIconsCheckBox);
-            this.toolbarGroupBox.Controls.Add(this.toolbarBackColorLabel);
-            this.toolbarGroupBox.Controls.Add(this.toolbarBackColor);
-            this.toolbarGroupBox.Controls.Add(this.toolbarVisibleCheckBox);
-            this.toolbarGroupBox.Dock = System.Windows.Forms.DockStyle.Top;
-            this.toolbarGroupBox.Location = new System.Drawing.Point(6, 55);
-            this.toolbarGroupBox.Name = "toolbarGroupBox";
-            this.toolbarGroupBox.Size = new System.Drawing.Size(295, 98);
-            this.toolbarGroupBox.TabIndex = 2;
-            this.toolbarGroupBox.TabStop = false;
-            this.toolbarGroupBox.Text = "Toolbar";
-            // 
-            // toolbarCloseButtonCheckBox
-            // 
-            this.toolbarCloseButtonCheckBox.AutoSize = true;
-            this.toolbarCloseButtonCheckBox.Location = new System.Drawing.Point(91, 72);
-            this.toolbarCloseButtonCheckBox.Name = "toolbarCloseButtonCheckBox";
-            this.toolbarCloseButtonCheckBox.Size = new System.Drawing.Size(94, 19);
-            this.toolbarCloseButtonCheckBox.TabIndex = 6;
-            this.toolbarCloseButtonCheckBox.Text = "Close button";
-            this.toolbarCloseButtonCheckBox.UseVisualStyleBackColor = true;
-            this.toolbarCloseButtonCheckBox.Click += new System.EventHandler(this.ToolbarCloseButtonCheckBox_Click);
-            // 
-            // toolbarBorderCheckBox
-            // 
-            this.toolbarBorderCheckBox.AutoSize = true;
-            this.toolbarBorderCheckBox.Location = new System.Drawing.Point(91, 49);
-            this.toolbarBorderCheckBox.Name = "toolbarBorderCheckBox";
-            this.toolbarBorderCheckBox.Size = new System.Drawing.Size(61, 19);
-            this.toolbarBorderCheckBox.TabIndex = 4;
-            this.toolbarBorderCheckBox.Text = "Border";
-            this.toolbarBorderCheckBox.UseVisualStyleBackColor = true;
-            this.toolbarBorderCheckBox.Click += new System.EventHandler(this.ToolbarBorderCheckBox_Click);
-            // 
-            // toolbarOldIconsCheckBox
-            // 
-            this.toolbarOldIconsCheckBox.AutoSize = true;
-            this.toolbarOldIconsCheckBox.Location = new System.Drawing.Point(9, 72);
-            this.toolbarOldIconsCheckBox.Name = "toolbarOldIconsCheckBox";
-            this.toolbarOldIconsCheckBox.Size = new System.Drawing.Size(76, 19);
-            this.toolbarOldIconsCheckBox.TabIndex = 5;
-            this.toolbarOldIconsCheckBox.Text = "Old icons";
-            this.toolbarOldIconsCheckBox.UseVisualStyleBackColor = true;
-            this.toolbarOldIconsCheckBox.Click += new System.EventHandler(this.ToolbarOldIconsCheckBox_Click);
-            // 
-            // toolbarBackColorLabel
-            // 
-            this.toolbarBackColorLabel.Location = new System.Drawing.Point(6, 16);
-            this.toolbarBackColorLabel.Name = "toolbarBackColorLabel";
-            this.toolbarBackColorLabel.Size = new System.Drawing.Size(120, 23);
-            this.toolbarBackColorLabel.TabIndex = 9;
-            this.toolbarBackColorLabel.Text = "Background color";
-            this.toolbarBackColorLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // toolbarBackColor
-            // 
-            this.toolbarBackColor.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240)))));
-            this.toolbarBackColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.toolbarBackColor.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.toolbarBackColor.Location = new System.Drawing.Point(145, 16);
-            this.toolbarBackColor.Name = "toolbarBackColor";
-            this.toolbarBackColor.Size = new System.Drawing.Size(141, 23);
-            this.toolbarBackColor.TabIndex = 11;
-            this.toolbarBackColor.Click += new System.EventHandler(this.ToolbarBackColor_Click);
-            // 
-            // toolbarVisibleCheckBox
-            // 
-            this.toolbarVisibleCheckBox.AutoSize = true;
-            this.toolbarVisibleCheckBox.Location = new System.Drawing.Point(9, 49);
-            this.toolbarVisibleCheckBox.Name = "toolbarVisibleCheckBox";
-            this.toolbarVisibleCheckBox.Size = new System.Drawing.Size(60, 19);
-            this.toolbarVisibleCheckBox.TabIndex = 3;
-            this.toolbarVisibleCheckBox.Text = "Visible";
-            this.toolbarVisibleCheckBox.UseVisualStyleBackColor = true;
-            this.toolbarVisibleCheckBox.Click += new System.EventHandler(this.ToolbarVisibleCheckBox_Click);
-            // 
-            // mainMenuGroupBox
-            // 
-            this.mainMenuGroupBox.Controls.Add(this.shortcutKeysCheckBox);
-            this.mainMenuGroupBox.Controls.Add(this.mainMenuCheckBox);
-            this.mainMenuGroupBox.Controls.Add(this.menuIconsCheckBox);
-            this.mainMenuGroupBox.Dock = System.Windows.Forms.DockStyle.Top;
-            this.mainMenuGroupBox.Location = new System.Drawing.Point(6, 6);
-            this.mainMenuGroupBox.Name = "mainMenuGroupBox";
-            this.mainMenuGroupBox.Size = new System.Drawing.Size(295, 49);
-            this.mainMenuGroupBox.TabIndex = 1;
-            this.mainMenuGroupBox.TabStop = false;
-            this.mainMenuGroupBox.Text = "Main menu";
-            // 
-            // shortcutKeysCheckBox
-            // 
-            this.shortcutKeysCheckBox.AutoSize = true;
-            this.shortcutKeysCheckBox.Location = new System.Drawing.Point(166, 22);
-            this.shortcutKeysCheckBox.Name = "shortcutKeysCheckBox";
-            this.shortcutKeysCheckBox.Size = new System.Drawing.Size(97, 19);
-            this.shortcutKeysCheckBox.TabIndex = 3;
-            this.shortcutKeysCheckBox.Text = "Shortcut keys";
-            this.shortcutKeysCheckBox.UseVisualStyleBackColor = true;
-            this.shortcutKeysCheckBox.Click += new System.EventHandler(this.ShortcutKeysCheckBox_Click);
-            // 
-            // mainMenuCheckBox
-            // 
-            this.mainMenuCheckBox.AutoSize = true;
-            this.mainMenuCheckBox.Location = new System.Drawing.Point(6, 22);
-            this.mainMenuCheckBox.Name = "mainMenuCheckBox";
-            this.mainMenuCheckBox.Size = new System.Drawing.Size(60, 19);
-            this.mainMenuCheckBox.TabIndex = 1;
-            this.mainMenuCheckBox.Text = "Visible";
-            this.mainMenuCheckBox.UseVisualStyleBackColor = true;
-            this.mainMenuCheckBox.Click += new System.EventHandler(this.MainMenuCheckBox_Click);
-            // 
-            // menuIconsCheckBox
-            // 
-            this.menuIconsCheckBox.AutoSize = true;
-            this.menuIconsCheckBox.Location = new System.Drawing.Point(72, 22);
-            this.menuIconsCheckBox.Name = "menuIconsCheckBox";
-            this.menuIconsCheckBox.Size = new System.Drawing.Size(88, 19);
-            this.menuIconsCheckBox.TabIndex = 2;
-            this.menuIconsCheckBox.Text = "Menu icons";
-            this.menuIconsCheckBox.UseVisualStyleBackColor = true;
-            this.menuIconsCheckBox.Click += new System.EventHandler(this.MenuIconsCheckBox_Click);
-            // 
             // editorTabPage
             // 
             this.editorTabPage.AutoScroll = true;
@@ -967,7 +910,7 @@ private void InitializeComponent()
             this.encryptionHintLabel.BackColor = System.Drawing.SystemColors.ButtonFace;
             this.encryptionHintLabel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.encryptionHintLabel.Font = new System.Drawing.Font("Segoe UI", 8F);
-            this.encryptionHintLabel.Location = new System.Drawing.Point(9, 101);
+            this.encryptionHintLabel.Location = new System.Drawing.Point(9, 102);
             this.encryptionHintLabel.Name = "encryptionHintLabel";
             this.encryptionHintLabel.Size = new System.Drawing.Size(309, 70);
             this.encryptionHintLabel.TabIndex = 7;
@@ -1074,6 +1017,17 @@ private void InitializeComponent()
             this.fontDialog.ShowEffects = false;
             this.fontDialog.Apply += new System.EventHandler(this.FontDialog_Apply);
             // 
+            // shortcutKeysCheckBox
+            // 
+            this.shortcutKeysCheckBox.AutoSize = true;
+            this.shortcutKeysCheckBox.Location = new System.Drawing.Point(166, 22);
+            this.shortcutKeysCheckBox.Name = "shortcutKeysCheckBox";
+            this.shortcutKeysCheckBox.Size = new System.Drawing.Size(97, 19);
+            this.shortcutKeysCheckBox.TabIndex = 3;
+            this.shortcutKeysCheckBox.Text = "Shortcut keys";
+            this.shortcutKeysCheckBox.UseVisualStyleBackColor = true;
+            this.shortcutKeysCheckBox.Click += new System.EventHandler(this.ShortcutKeysCheckBox_Click);
+            // 
             // SettingsForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -1093,23 +1047,23 @@ private void InitializeComponent()
             this.Load += new System.EventHandler(this.SettingsForm_Load);
             this.settingsTabControl.ResumeLayout(false);
             this.generalTabPage.ResumeLayout(false);
-            this.autoLockGroupBox.ResumeLayout(false);
-            this.autoLockGroupBox.PerformLayout();
             this.integrationGroupBox.ResumeLayout(false);
             this.integrationGroupBox.PerformLayout();
             this.applicationGroupBox.ResumeLayout(false);
             this.applicationGroupBox.PerformLayout();
+            this.autoLockGroupBox.ResumeLayout(false);
+            this.autoLockGroupBox.PerformLayout();
             this.interfaceTabPage.ResumeLayout(false);
             this.statusPanelGroupBox.ResumeLayout(false);
             this.statusPanelGroupBox.PerformLayout();
             this.statusPanelLabelsGroupBox.ResumeLayout(false);
             this.statusPanelLabelsGroupBox.PerformLayout();
-            this.searchPanelGroupBox.ResumeLayout(false);
-            this.searchPanelGroupBox.PerformLayout();
-            this.toolbarGroupBox.ResumeLayout(false);
-            this.toolbarGroupBox.PerformLayout();
             this.mainMenuGroupBox.ResumeLayout(false);
             this.mainMenuGroupBox.PerformLayout();
+            this.toolbarGroupBox.ResumeLayout(false);
+            this.toolbarGroupBox.PerformLayout();
+            this.searchPanelGroupBox.ResumeLayout(false);
+            this.searchPanelGroupBox.PerformLayout();
             this.editorTabPage.ResumeLayout(false);
             this.editorTabPage.PerformLayout();
             this.encryptionTabPage.ResumeLayout(false);
@@ -1199,8 +1153,5 @@ private void InitializeComponent()
         private System.Windows.Forms.CheckBox statusPanelClipboardCheckBox;
         private System.Windows.Forms.CheckBox clearClipboardCheckBox;
         private System.Windows.Forms.CheckBox shortcutKeysCheckBox;
-        private System.Windows.Forms.CheckBox openTxtUnencryptedCheckBox;
-        private System.Windows.Forms.CheckBox trayMenuCheckBox;
-        private System.Windows.Forms.CheckBox statusPanelPasteboardCheckBox;
     }
 }

Crypto Notepad/Forms/SettingsForm.cs

@@ -18,7 +18,7 @@ public SettingsForm()
         #region Methods
         private void LoadSettings()
         {
-            editorFontColor.BackColor = settings.editorForeColor;
+            editorFontColor.BackColor = settings.editroForeColor;
             editorBackColor.BackColor = settings.editorBackColor;
             editorInsertKeyComboBox.Text = settings.insertKey;
             if (settings.clipboardClearTime != "")
@@ -40,14 +40,12 @@ private void LoadSettings()
             closeToTrayCheckBox.Checked = settings.closeToTray;
             singleInstanceCheckBox.Checked = settings.singleInstance;
             clearClipboardCheckBox.Checked = settings.clearClipboardAtClose;
-            trayMenuCheckBox.Checked = settings.trayMenu;
             integrateCheckBox.Checked = settings.explorerIntegrate;
             associateCheckBox.Checked = settings.explorerAssociate;
             sendToCheckBox.Checked = settings.explorerSendTo;
             hashAlgorithmComboBox.Text = settings.HashAlgorithm;
             keySizeComboBox.Text = settings.KeySize;
             passwordIterationsTextBox.Text = settings.PasswordIterations;
-            openTxtUnencryptedCheckBox.Checked = settings.openTxtUnencrypted;
             searchBackColor.BackColor = settings.searchPanelBackColor;
             searchFontColor.BackColor = settings.searchPanelForeColor;
             searchBorderComboBox.Text = settings.searchPanelBorder;
@@ -65,10 +63,9 @@ private void LoadSettings()
             statusPanelSizeCheckBox.Checked = settings.statusPanelSize;
             statusPanelReadonlyCheckBox.Checked = settings.statusPanelReadonly;
             statusPanelWordwrapCheckBox.Checked = settings.statusPanelWordWrap;
-            statusPanelPasteboardCheckBox.Checked = settings.statusPanelPasteboard;
             statusPanelClipboardCheckBox.Checked = settings.statusPanelClipboard;
             encryptionHintLabel.Visible = settings.encryptionHint;
-        }
+        }     
         #endregion
 
 
@@ -153,7 +150,7 @@ private void EditorFontColor_Click(object sender, EventArgs e)
                     MainForm main = Owner as MainForm;
                     main.richTextBox.ForeColor = colorDialog.Color;
                     main.richTextBox.SetInnerMargins(Convert.ToInt32(settings.editorPaddingLeft), 0, 0, 0);
-                    settings.editorForeColor = colorDialog.Color;
+                    settings.editroForeColor = colorDialog.Color;
                     editorFontColor.BackColor = colorDialog.Color;
                 }
             }
@@ -189,8 +186,8 @@ private void SettingsNavigation_Click(object sender, EventArgs e)
                     break;
                 case 3:
                     settingsTabControl.SelectedTab = encryptionTabPage;
-                    break;
+                    break;             
-            }
+            }            
         }
 
         private void SettingsTabControl_SelectedIndexChanged(object sender, EventArgs e)
@@ -203,7 +200,7 @@ private void ToolbarVisibleCheckBox_Click(object sender, EventArgs e)
             MainForm main = Owner as MainForm;
             main.toolbarPanel.Visible = toolbarVisibleCheckBox.Checked;
             main.richTextBox.SetInnerMargins(Convert.ToInt32(settings.editorPaddingLeft), 0, 0, 0);
-            settings.toolbarVisible = toolbarVisibleCheckBox.Checked;
+            settings.toolbarVisible= toolbarVisibleCheckBox.Checked;
         }
 
         private void AssociateCheckBox_Click(object sender, EventArgs e)
@@ -243,7 +240,7 @@ private void EditorPaddingLeftTextBox_TextChanged(object sender, EventArgs e)
                     main.richTextBox.Refresh();
                     settings.editorPaddingLeft = editorPaddingLeftTextBox.Text;
                 }
-            }
+            }               
         }
 
         private void LockTimeoutTextBox_TextChanged(object sender, EventArgs e)
@@ -392,8 +389,8 @@ private void ToolbarBackColor_Click(object sender, EventArgs e)
                     toolbarBackColor.BackColor = colorDialog.Color;
                 }
             }
-        }
+        }    
-
+        
         private void ToolbarBorderCheckBox_Click(object sender, EventArgs e)
         {
             MainForm main = Owner as MainForm;
@@ -489,13 +486,13 @@ private void PasswordIterationsTextBox_TextChanged(object sender, EventArgs e)
             {
                 settings.PasswordIterations = passwordIterationsTextBox.Text;
             }
-        }
+        }    
-
+        
 
         private void MinimizeToTrayCheckBox_Click(object sender, EventArgs e)
         {
             MainForm main = Owner as MainForm;
-            if (closeToTrayCheckBox.Checked == false & minimizeToTrayCheckBox.Checked == false & trayMenuCheckBox.Checked == false)
+            if (closeToTrayCheckBox.Checked == false & minimizeToTrayCheckBox.Checked == false)
             {
                 main.trayIcon.Visible = false;
             }
@@ -509,7 +506,7 @@ private void MinimizeToTrayCheckBox_Click(object sender, EventArgs e)
         private void CloseToTrayCheckBox_Click(object sender, EventArgs e)
         {
             MainForm main = Owner as MainForm;
-            if (closeToTrayCheckBox.Checked == false & minimizeToTrayCheckBox.Checked == false & trayMenuCheckBox.Checked == false)
+            if (closeToTrayCheckBox.Checked == false & minimizeToTrayCheckBox.Checked ==false )
             {
                 main.trayIcon.Visible = false;
             }
@@ -595,15 +592,6 @@ private void StatusPanelWordwrapCheckBox_Click(object sender, EventArgs e)
             settings.statusPanelWordWrap = statusPanelWordwrapCheckBox.Checked;
             main.StatusPanelFileInfo();
         }
-
-        private void StatusPanelPasteboardCheckBox_Click(object sender, EventArgs e)
-        {
-            MainForm main = Owner as MainForm;
-            main.statusPanelPasteboardLabel.Visible = statusPanelPasteboardCheckBox.Checked;
-            settings.statusPanelPasteboard = statusPanelPasteboardCheckBox.Checked;
-            main.StatusPanelFileInfo();
-        }
-
         private void StatusPanelClipboardCheckBox_Click(object sender, EventArgs e)
         {
             settings.statusPanelClipboard = statusPanelClipboardCheckBox.Checked;
@@ -626,32 +614,11 @@ private void ClearClipboardCheckBox_Click(object sender, EventArgs e)
             settings.clearClipboardAtClose = clearClipboardCheckBox.Checked;
         }
 
-        private void TrayMenuCheckBox_Click(object sender, EventArgs e)
-        {
-            MainForm main = Owner as MainForm;
-            if (closeToTrayCheckBox.Checked == false & minimizeToTrayCheckBox.Checked == false & trayMenuCheckBox.Checked == false)
-            {
-                main.trayIcon.Visible = false;
-            }
-            if (trayMenuCheckBox.Checked == true)
-            {
-                main.trayIcon.Visible = true;
-            }
-            settings.trayMenu = trayMenuCheckBox.Checked;
-        }
-
         private void ShortcutKeysCheckBox_Click(object sender, EventArgs e)
         {
             MainForm main = Owner as MainForm;
             settings.shortcutKeys = shortcutKeysCheckBox.Checked;
             main.ShortcutKeys(settings.shortcutKeys);
         }
-
-        private void OpenTxtUnencryptedCheckBox_Click(object sender, EventArgs e)
-        {
-            settings.openTxtUnencrypted = openTxtUnencryptedCheckBox.Checked;
-        }
-
-
     }
 }

Crypto Notepad/Forms/SettingsForm.resx

@@ -126,6 +126,9 @@
   <data name="encryptionHintLabel.Text" xml:space="preserve">
     <value>For the best balance of performance &amp;&amp; security is recommended to use SHA512 Hash / 256 Key size / above 2000000 Password iterations. But caution, if you change this parameters you will not able to decrypt previously encrypted files with old parameters.</value>
   </data>
+  <metadata name="settingsToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>240, 17</value>
+  </metadata>
   <metadata name="fontDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>131, 17</value>
   </metadata>

Crypto Notepad/Properties/AssemblyInfo.cs

@@ -33,4 +33,4 @@
 // используя "*", как показано ниже:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.7.3.0")]
+[assembly: AssemblyFileVersion("1.6.7.0")]

Crypto Notepad/Properties/Resources.Designer.cs

@@ -19,7 +19,7 @@ namespace Crypto_Notepad.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -60,16 +60,6 @@ internal Resources() {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap application {
-            get {
-                object obj = ResourceManager.GetObject("application", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -80,16 +70,6 @@ internal static System.Drawing.Bitmap application_blue {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap application_dock_180 {
-            get {
-                object obj = ResourceManager.GetObject("application-dock-180", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -150,26 +130,6 @@ internal static System.Drawing.Bitmap clipboard_minus {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap clipboard_text {
-            get {
-                object obj = ResourceManager.GetObject("clipboard_text", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap clock_plus {
-            get {
-                object obj = ResourceManager.GetObject("clock_plus", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -370,16 +330,6 @@ internal static System.Drawing.Bitmap key_solid {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap lock_pencil {
-            get {
-                object obj = ResourceManager.GetObject("lock_pencil", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -430,16 +380,6 @@ internal static System.Drawing.Bitmap old_application_double {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap old_clock_add {
-            get {
-                object obj = ResourceManager.GetObject("old_clock_add", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -490,16 +430,6 @@ internal static System.Drawing.Bitmap old_lock {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap old_lock_edit {
-            get {
-                object obj = ResourceManager.GetObject("old_lock_edit", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>

Crypto Notepad/Properties/Settings.Designer.cs

@@ -12,7 +12,7 @@ namespace Crypto_Notepad.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.4.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -27,12 +27,12 @@ public static Settings Default {
         [global::System.Configuration.SettingsProviderAttribute(typeof(PortableSettingsProvider))]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("Black")]
-        public global::System.Drawing.Color editorForeColor {
+        public global::System.Drawing.Color editroForeColor {
             get {
-                return ((global::System.Drawing.Color)(this["editorForeColor"]));
+                return ((global::System.Drawing.Color)(this["editroForeColor"]));
             }
             set {
-                this["editorForeColor"] = value;
+                this["editroForeColor"] = value;
             }
         }
         
@@ -803,44 +803,5 @@ public bool shortcutKeys {
                 this["shortcutKeys"] = value;
             }
         }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Configuration.SettingsProviderAttribute(typeof(PortableSettingsProvider))]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("False")]
-        public bool openTxtUnencrypted {
-            get {
-                return ((bool)(this["openTxtUnencrypted"]));
-            }
-            set {
-                this["openTxtUnencrypted"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Configuration.SettingsProviderAttribute(typeof(PortableSettingsProvider))]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("False")]
-        public bool trayMenu {
-            get {
-                return ((bool)(this["trayMenu"]));
-            }
-            set {
-                this["trayMenu"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Configuration.SettingsProviderAttribute(typeof(PortableSettingsProvider))]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("False")]
-        public bool statusPanelPasteboard {
-            get {
-                return ((bool)(this["statusPanelPasteboard"]));
-            }
-            set {
-                this["statusPanelPasteboard"] = value;
-            }
-        }
     }
 }

Crypto Notepad/Properties/Settings.settings

@@ -2,7 +2,7 @@
 <SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="Crypto_Notepad.Properties" GeneratedClassName="Settings">
   <Profiles />
   <Settings>
-    <Setting Name="editorForeColor" Provider="PortableSettingsProvider" Type="System.Drawing.Color" Scope="User">
+    <Setting Name="editroForeColor" Provider="PortableSettingsProvider" Type="System.Drawing.Color" Scope="User">
       <Value Profile="(Default)">Black</Value>
     </Setting>
     <Setting Name="editorBackColor" Provider="PortableSettingsProvider" Type="System.Drawing.Color" Scope="User">
@@ -182,14 +182,5 @@
     <Setting Name="shortcutKeys" Provider="PortableSettingsProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
-    <Setting Name="openTxtUnencrypted" Provider="PortableSettingsProvider" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">False</Value>
-    </Setting>
-    <Setting Name="trayMenu" Provider="PortableSettingsProvider" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">False</Value>
-    </Setting>
-    <Setting Name="statusPanelPasteboard" Provider="PortableSettingsProvider" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">False</Value>
-    </Setting>
   </Settings>
 </SettingsFile>

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2022 Sigmanor
+Copyright (c) 2019 Sigmanor
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,16 +1,10 @@
-[![SWUbanner](https://raw.githubusercontent.com/vshymanskyy/StandWithUkraine/main/banner-direct-single.svg)](https://stand-with-ukraine.pp.ua/)
+# Crypto Notepad [![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social)](https://twitter.com/intent/tweet?text=Simple%20notepad%20for%20Windows%20with%20encryption%20features.%20Download%20for%20free:%20https://crypto-notepad.info/&hashtags=notepad,encryption,windows,opensource,csharp)
-
-# Crypto Notepad [![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social)](https://twitter.com/intent/tweet?text=Simple%20notepad%20for%20Windows%20with%20encryption%20features.%20Download%20for%20free:%20https://crypto-notepad.github.io/&hashtags=notepad,encryption,windows,opensource,csharp)
-
-> [!WARNING]  
-> - **THE PROJECT HAS VERY LIMITED SUPPORT**  
-> - **NO NEW FEATURES ARE PLANNED**  
-> - **ONLY CRITICAL BUG FIXES WILL BE ADDRESSED**
 
 [![downloads](https://img.shields.io/github/downloads/Crypto-Notepad/Crypto-Notepad/total.svg)](https://github.com/Crypto-Notepad/Crypto-Notepad/releases/latest)
-[![license](https://img.shields.io/github/license/Crypto-Notepad/Crypto-Notepad.svg?color=6DAAAE)](https://github.com/Crypto-Notepad/Crypto-Notepad/blob/master/LICENSE)
+[![license](https://img.shields.io/github/license/Crypto-Notepad/Crypto-Notepad.svg)](https://github.com/Crypto-Notepad/Crypto-Notepad/blob/master/LICENSE)
 [![release](https://img.shields.io/github/release/Crypto-Notepad/Crypto-Notepad.svg)](https://github.com/Crypto-Notepad/Crypto-Notepad/wiki/Release-Notes)
-[![documentation](https://img.shields.io/badge/documentation-wiki-yellowgreen.svg?color=F09C29)](https://github.com/Crypto-Notepad/Crypto-Notepad/wiki/Documentation)
+[![documentation](https://img.shields.io/badge/documentation-wiki-yellowgreen.svg)](https://github.com/Crypto-Notepad/Crypto-Notepad/wiki/Documentation)
+[![status](https://img.shields.io/badge/project_status-suspended-orange.svg)](https://github.com/Crypto-Notepad/Crypto-Notepad/wiki/Project-status)
 
 Notepad-like simple text editor for Windows, where files are saved and loaded encrypted with AES algorithms.
 
@@ -22,32 +16,17 @@ Notepad-like simple text editor for Windows, where files are saved and loaded en
 * Associate own file type with application
 * Integrate with windows context menu
 * Сustomizable encryption options
-* Built-in password generator
 * Detecting links in editor
-* Drag and Drop support
 * Сustomizable interface
-* Pasteboard function
+* Drag and Drop support
-* Autoclear clipboard
-* Autolock editor
-* Rich settings
 * Portable
 
-## Installation
-### Via chocolatey:
-```
-choco install crypto-notepad
-```
-### Manual instalition:
-- [Download](https://github.com/Crypto-Notepad/Crypto-Notepad/releases/latest) latest release.
-- Unzip **Crypto.Notepad.zip** archive to any directory
-- Run **Crypto Notepad.exe**
-
 ## System requirements
 * Windows 7 SP1 and higher
 * .NET Framework 4.6.1 and higher
 
-## Build
-App was created in Visual Studio Community, you can run the *.sln file and simply build a project
-
 ## Contributing
 Want to help make the project better? Check out [CONTRIBUTING.md](https://github.com/Crypto-Notepad/Crypto-Notepad/blob/master/CONTRIBUTING.md) to get involved. Welcome! :octocat:
+
+## Build
+App was created in Visual Studio Community, you can run the *.sln file and simply build a project

version.txt

@@ -1 +1 @@
-1.7.3.0
+1.6.7.0