Merge pull request #133 from Alex-TIMEHACK/master

Done a lot of work on the Windows ExplorerS

19 files changed, 554 insertions, 2109 deletions

diff --git a/TimeHACK.Main/OS/Win95/Win95.Designer.cs b/TimeHACK.Main/OS/Win95/Win95.Designer.cs
index 15f4feb..b77e2db 100644
--- a/TimeHACK.Main/OS/Win95/Win95.Designer.cs
+++ b/TimeHACK.Main/OS/Win95/Win95.Designer.cs
@@ -62,7 +62,6 @@ namespace TimeHACK.OS.Win95
             this.SystemToolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.DiskDefragmenterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.ScanDiskToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.AddressBookToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.CalculatorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.HyperTerminalToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.ImagingToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -244,7 +243,7 @@ namespace TimeHACK.OS.Win95
             this.startmenuitems.Name = "startmenuitems";
             this.startmenuitems.Padding = new System.Windows.Forms.Padding(6, 2, 0, 0);
             this.startmenuitems.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;
-            this.startmenuitems.Size = new System.Drawing.Size(145, 311);
+            this.startmenuitems.Size = new System.Drawing.Size(145, 292);
             this.startmenuitems.TabIndex = 0;
             this.startmenuitems.Text = "StartMenu";
             // 
@@ -285,7 +284,6 @@ namespace TimeHACK.OS.Win95
             this.CommunicationsToolStripMenuItem,
             this.MultimediaToolStripMenuItem,
             this.SystemToolsToolStripMenuItem,
-            this.AddressBookToolStripMenuItem,
             this.CalculatorToolStripMenuItem,
             this.HyperTerminalToolStripMenuItem,
             this.ImagingToolStripMenuItem,
@@ -435,18 +433,6 @@ namespace TimeHACK.OS.Win95
             this.ScanDiskToolStripMenuItem.Size = new System.Drawing.Size(172, 22);
             this.ScanDiskToolStripMenuItem.Text = "ScanDisk";
             // 
-            // AddressBookToolStripMenuItem
-            // 
-            this.AddressBookToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
-            this.AddressBookToolStripMenuItem.BackgroundImage = global::TimeHACK.Properties.Resources.sliversilver;
-            this.AddressBookToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
-            this.AddressBookToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("AddressBookToolStripMenuItem.Image")));
-            this.AddressBookToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
-            this.AddressBookToolStripMenuItem.Name = "AddressBookToolStripMenuItem";
-            this.AddressBookToolStripMenuItem.Size = new System.Drawing.Size(181, 28);
-            this.AddressBookToolStripMenuItem.Text = "Address Book";
-            this.AddressBookToolStripMenuItem.Click += new System.EventHandler(this.AddressBookToolStripMenuItem_Click);
-            // 
             // CalculatorToolStripMenuItem
             // 
             this.CalculatorToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
@@ -1211,7 +1197,6 @@ namespace TimeHACK.OS.Win95
         internal System.Windows.Forms.ToolStripMenuItem SystemToolsToolStripMenuItem;
         internal System.Windows.Forms.ToolStripMenuItem DiskDefragmenterToolStripMenuItem;
         internal System.Windows.Forms.ToolStripMenuItem ScanDiskToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem AddressBookToolStripMenuItem;
         internal System.Windows.Forms.ToolStripMenuItem CalculatorToolStripMenuItem;
         internal System.Windows.Forms.ToolStripMenuItem HyperTerminalToolStripMenuItem;
         internal System.Windows.Forms.ToolStripMenuItem ImagingToolStripMenuItem;
diff --git a/TimeHACK.Main/OS/Win95/Win95.cs b/TimeHACK.Main/OS/Win95/Win95.cs
index 34500ab..e1de2e3 100644
--- a/TimeHACK.Main/OS/Win95/Win95.cs
+++ b/TimeHACK.Main/OS/Win95/Win95.cs
@@ -121,9 +121,12 @@ namespace TimeHACK.OS.Win95
                 nonimportantapps[nonimportantapps.Count - 1].BringToFront();
                 nonimportantapps[nonimportantapps.Count - 1].FormClosing += new FormClosingEventHandler(NonImportantApp_Closing);
 
+                
+
                 app.BringToFront();
                 
             }
+            
         }
 
         private void fontLoad()
@@ -354,23 +357,14 @@ namespace TimeHACK.OS.Win95
 
         private void AddressBookToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            WinClassicAddressBook ab = new WinClassicAddressBook();
-            WinClassic app = wm.StartWin95(ab, "Address Book", Properties.Resources.WinClassicAddressBook, true, true);
-            AddTaskBarItem(app, app.Tag.ToString(), "Address Book", Properties.Resources.WinClassicAddressBook);
 
-            nonimportantapps.Add(app);
-            nonimportantapps[nonimportantapps.Count - 1].BringToFront();
-            nonimportantapps[nonimportantapps.Count - 1].FormClosing += new FormClosingEventHandler(NonImportantApp_Closing);
-
-            app.BringToFront();
-            startmenu.Hide();
         }
 
         private void WindowsExplorerToolStripMenuItem1_Click(object sender, EventArgs e)
         {
             FileDialogBoxManager.IsInOpenDialog = false;
             FileDialogBoxManager.IsInSaveDialog = false;
-            WinClassicWindowsExplorer we = new WinClassicWindowsExplorer();
+            Win95WindowsExplorer we = new Win95WindowsExplorer();
             WinClassic app = wm.StartWin95(we, "Windows Explorer", Properties.Resources.WinClassicFileExplorer, true, true);
             AddTaskBarItem(app, app.Tag.ToString(), "Windows Explorer", Properties.Resources.WinClassicFileExplorer);
 
diff --git a/TimeHACK.Main/OS/Win95/Win95.resx b/TimeHACK.Main/OS/Win95/Win95.resx
index ba695aa..5e1c35e 100644
--- a/TimeHACK.Main/OS/Win95/Win95.resx
+++ b/TimeHACK.Main/OS/Win95/Win95.resx
@@ -121,48 +121,6 @@
     <value>17, 17</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="InternetExplorerToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAAJVJREFUOE+VkQsSxCAMQj16bu4GFU3YdO2+Gaqi0F/7j96zfqKHqYiuByYBFfYJ
-        1okT9uuef4slmG9gWjdzN4Wnf9bRT1RhaCN+KriGieyvkjr8Rl7AMMbywE0zCBiIBS9Awbn7tUD29xME
-        Q0rM8IHhPbziKRhMU0pqjVIfcgHAfB2oiugnuEnG/EkZ/4fLZEksutHaB6sGQO/gf7MbAAAAAElFTkSu
-        QmCC
-</value>
-  </data>
-  <data name="MSDOSPromptToolStripMenuItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAALtJREFUOE91TwESBCEI6un9vBPRYqljhtEIyUZhzTkXKo8J1ZI4P3xjlAjsqpoN
-        upcBf0zA6+7r8QAxA9170IEPm6l7PWu9A1CLwNaVpSfWNEKLWCECDnkvAdFtMgBDLeHFaNaXEpQu22B9
-        NsFA96i2yQlo00wejQG9VfuSCQ0IXAFAVAb468AVwJB3AHpsBFKn2uYkemh9hllezf4KcDKwtqkBpX5j
-        Dyj5DRIeDDh3wD3c5AYkh2QwOMYPtAJqglssjE8AAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="OutlookExpressToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAAJVJREFUOE+VkIESgCAIQ/10/pwasJrlkb27nUZsoqPHPbWNlYHCN9gKMTc7O31I
-        gIa0PM2EE32ErE9WNQEw1y6azbZGvkFAhnBcKMmwrQnCVI0MofA+a6UniIDYqKTx7JhBDeVaQd5fVT9m
-        M4JvowbwzjNlu4C5DVBgVyll4Zo8AzrK0gfo6ZBSFq7J6g0+ePWj8EPDD0i7RXV30HOWAAAAAElFTkSu
-        QmCC
-</value>
-  </data>
-  <data name="WindowsExplorerToolStripMenuItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAAJJJREFUOE+tkYEOgCAIRP10/tzk4FISZ7ZuuzDwnq4KJSL1aR/txc21llBfQVbh
-        EZJZZ5C+nEoEcIN0QDyxLVGzm6WAsMYTvRSSAqaw2jRBloApbJUBhLVub4ABqwMY1poCuEYzhPWjRkgK
-        6EP7A+obqOc2EzIBeELmtqNFDECI9R3gYmPhCPH+qX6HfAJAQ7iUCwlxft5LSoDNAAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="FindToolStripMenuItem.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
-        4AAABIQCQUtXaBsAAAAASUVORK5CYII=
-</value>
-  </data>
   <data name="InternetConnectionWizardToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAALRJREFUOE+N
@@ -236,14 +194,6 @@
         oXsQ9vRAYAJVbYNqAARf2M+aQa3Hr2QAdmH5TTPoDVz1BW7tA7ajvYP7sMmIAAAAAElFTkSuQmCC
 </value>
   </data>
-  <data name="AddressBookToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAG1JREFUOE/N
-        j1sOgCAQAzk6N/exdqRsAuqH0THNrm2DWP5DrXVxyQ5mWRc6FLO/Wa5WYBKyZyLfn9EBoMJwl65vwA4p
-        e+EGDkXneJ8coODcM+TSvV9wwmfu5C8jPOZA7YCMleT0KAu68kN9TikrCNOnE4xyRLMAAAAASUVORK5C
-        YII=
-</value>
-  </data>
   <data name="CalculatorToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
@@ -308,6 +258,41 @@
         aQNok1HVambm9gBAYeI/oBSQZwAAAABJRU5ErkJggg==
 </value>
   </data>
+  <data name="InternetExplorerToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        wwAADsMBx2+oZAAAAJVJREFUOE+VkQsSxCAMQj16bu4GFU3YdO2+Gaqi0F/7j96zfqKHqYiuByYBFfYJ
+        1okT9uuef4slmG9gWjdzN4Wnf9bRT1RhaCN+KriGieyvkjr8Rl7AMMbywE0zCBiIBS9Awbn7tUD29xME
+        Q0rM8IHhPbziKRhMU0pqjVIfcgHAfB2oiugnuEnG/EkZ/4fLZEksutHaB6sGQO/gf7MbAAAAAElFTkSu
+        QmCC
+</value>
+  </data>
+  <data name="MSDOSPromptToolStripMenuItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        wwAADsMBx2+oZAAAALtJREFUOE91TwESBCEI6un9vBPRYqljhtEIyUZhzTkXKo8J1ZI4P3xjlAjsqpoN
+        upcBf0zA6+7r8QAxA9170IEPm6l7PWu9A1CLwNaVpSfWNEKLWCECDnkvAdFtMgBDLeHFaNaXEpQu22B9
+        NsFA96i2yQlo00wejQG9VfuSCQ0IXAFAVAb468AVwJB3AHpsBFKn2uYkemh9hllezf4KcDKwtqkBpX5j
+        Dyj5DRIeDDh3wD3c5AYkh2QwOMYPtAJqglssjE8AAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="OutlookExpressToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        wwAADsMBx2+oZAAAAJVJREFUOE+VkIESgCAIQ/10/pwasJrlkb27nUZsoqPHPbWNlYHCN9gKMTc7O31I
+        gIa0PM2EE32ErE9WNQEw1y6azbZGvkFAhnBcKMmwrQnCVI0MofA+a6UniIDYqKTx7JhBDeVaQd5fVT9m
+        M4JvowbwzjNlu4C5DVBgVyll4Zo8AzrK0gfo6ZBSFq7J6g0+ePWj8EPDD0i7RXV30HOWAAAAAElFTkSu
+        QmCC
+</value>
+  </data>
+  <data name="WindowsExplorerToolStripMenuItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        wwAADsMBx2+oZAAAAJJJREFUOE+tkYEOgCAIRP10/tzk4FISZ7ZuuzDwnq4KJSL1aR/txc21llBfQVbh
+        EZJZZ5C+nEoEcIN0QDyxLVGzm6WAsMYTvRSSAqaw2jRBloApbJUBhLVub4ABqwMY1poCuEYzhPWjRkgK
+        6EP7A+obqOc2EzIBeELmtqNFDECI9R3gYmPhCPH+qX6HfAJAQ7iUCwlxft5LSoDNAAAAAElFTkSuQmCC
+</value>
+  </data>
   <data name="downloaderTestToolStripMenuItem.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
@@ -343,6 +328,13 @@
         4AAABIQCQUtXaBsAAAAASUVORK5CYII=
 </value>
   </data>
+  <data name="FindToolStripMenuItem.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
+        4AAABIQCQUtXaBsAAAAASUVORK5CYII=
+</value>
+  </data>
   <data name="FilesOrFoldersToolStripMenuItem.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
@@ -382,7 +374,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADq
-        ggAAAk1TRnQBSQFMAgEBDAEAAbABAQGwAQEBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA
+        ggAAAk1TRnQBSQFMAgEBDAEAAbgBAQG4AQEBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA
         AwABgAMAAQEBAAEgBwABAf8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A
         /wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A
         /wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8AXAAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/x8AAf8DAAH/
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/FRMWinClassicAddressBookNewContact.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/FRMWinClassicAddressBookNewContact.Designer.cs
deleted file mode 100644
index 7eb3196..0000000
--- a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/FRMWinClassicAddressBookNewContact.Designer.cs
+++ /dev/null
@@ -1,227 +0,0 @@
-namespace TimeHACK.OS.Win95.Win95Apps
-{
-    partial class FRMWinClassicAddressBookNewContact
-    {
-        /// <summary> 
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary> 
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Component Designer generated code
-
-        /// <summary> 
-        /// Required method for Designer support - do not modify 
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.button1 = new System.Windows.Forms.Button();
-            this.label1 = new System.Windows.Forms.Label();
-            this.label2 = new System.Windows.Forms.Label();
-            this.label3 = new System.Windows.Forms.Label();
-            this.txtFirst = new System.Windows.Forms.TextBox();
-            this.txtMiddle = new System.Windows.Forms.TextBox();
-            this.txtLast = new System.Windows.Forms.TextBox();
-            this.emails = new System.Windows.Forms.ListView();
-            this.label4 = new System.Windows.Forms.Label();
-            this.button2 = new System.Windows.Forms.Button();
-            this.button3 = new System.Windows.Forms.Button();
-            this.pnlAdd = new System.Windows.Forms.Panel();
-            this.button4 = new System.Windows.Forms.Button();
-            this.textBox1 = new System.Windows.Forms.TextBox();
-            this.label5 = new System.Windows.Forms.Label();
-            this.pnlAdd.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // button1
-            // 
-            this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.button1.Location = new System.Drawing.Point(107, 239);
-            this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(105, 23);
-            this.button1.TabIndex = 0;
-            this.button1.Text = "OK";
-            this.button1.UseVisualStyleBackColor = true;
-            this.button1.Click += new System.EventHandler(this.button1_Click);
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(16, 13);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(60, 13);
-            this.label1.TabIndex = 1;
-            this.label1.Text = "First Name:";
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(16, 36);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(72, 13);
-            this.label2.TabIndex = 1;
-            this.label2.Text = "Middle Name:";
-            // 
-            // label3
-            // 
-            this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(16, 59);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(61, 13);
-            this.label3.TabIndex = 1;
-            this.label3.Text = "Last Name:";
-            // 
-            // txtFirst
-            // 
-            this.txtFirst.Location = new System.Drawing.Point(94, 13);
-            this.txtFirst.Name = "txtFirst";
-            this.txtFirst.Size = new System.Drawing.Size(203, 20);
-            this.txtFirst.TabIndex = 2;
-            // 
-            // txtMiddle
-            // 
-            this.txtMiddle.Location = new System.Drawing.Point(94, 36);
-            this.txtMiddle.Name = "txtMiddle";
-            this.txtMiddle.Size = new System.Drawing.Size(203, 20);
-            this.txtMiddle.TabIndex = 2;
-            // 
-            // txtLast
-            // 
-            this.txtLast.Location = new System.Drawing.Point(94, 59);
-            this.txtLast.Name = "txtLast";
-            this.txtLast.Size = new System.Drawing.Size(203, 20);
-            this.txtLast.TabIndex = 2;
-            // 
-            // emails
-            // 
-            this.emails.Location = new System.Drawing.Point(94, 114);
-            this.emails.Name = "emails";
-            this.emails.Size = new System.Drawing.Size(203, 119);
-            this.emails.TabIndex = 3;
-            this.emails.UseCompatibleStateImageBehavior = false;
-            this.emails.View = System.Windows.Forms.View.List;
-            // 
-            // label4
-            // 
-            this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(91, 89);
-            this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(40, 13);
-            this.label4.TabIndex = 4;
-            this.label4.Text = "Emails:";
-            // 
-            // cancelButton
-            // 
-            this.button2.Location = new System.Drawing.Point(13, 114);
-            this.button2.Name = "cancelButton";
-            this.button2.Size = new System.Drawing.Size(75, 23);
-            this.button2.TabIndex = 5;
-            this.button2.Text = "Add";
-            this.button2.UseVisualStyleBackColor = true;
-            this.button2.Click += new System.EventHandler(this.button2_Click);
-            // 
-            // button3
-            // 
-            this.button3.Location = new System.Drawing.Point(13, 143);
-            this.button3.Name = "button3";
-            this.button3.Size = new System.Drawing.Size(75, 23);
-            this.button3.TabIndex = 5;
-            this.button3.Text = "Remove";
-            this.button3.UseVisualStyleBackColor = true;
-            // 
-            // pnlAdd
-            // 
-            this.pnlAdd.Controls.Add(this.button4);
-            this.pnlAdd.Controls.Add(this.textBox1);
-            this.pnlAdd.Controls.Add(this.label5);
-            this.pnlAdd.Location = new System.Drawing.Point(94, 114);
-            this.pnlAdd.Name = "pnlAdd";
-            this.pnlAdd.Size = new System.Drawing.Size(203, 119);
-            this.pnlAdd.TabIndex = 6;
-            this.pnlAdd.Visible = false;
-            // 
-            // button4
-            // 
-            this.button4.Location = new System.Drawing.Point(59, 73);
-            this.button4.Name = "button4";
-            this.button4.Size = new System.Drawing.Size(75, 23);
-            this.button4.TabIndex = 8;
-            this.button4.Text = "Add";
-            this.button4.UseVisualStyleBackColor = true;
-            this.button4.Click += new System.EventHandler(this.button4_Click);
-            // 
-            // textBox1
-            // 
-            this.textBox1.Location = new System.Drawing.Point(9, 31);
-            this.textBox1.Name = "textBox1";
-            this.textBox1.Size = new System.Drawing.Size(187, 20);
-            this.textBox1.TabIndex = 7;
-            // 
-            // label5
-            // 
-            this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(60, 18);
-            this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(68, 13);
-            this.label5.TabIndex = 0;
-            this.label5.Text = "Email to add:";
-            // 
-            // FRMWinClassicAddressBookNewContact
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.button3);
-            this.Controls.Add(this.button2);
-            this.Controls.Add(this.label4);
-            this.Controls.Add(this.txtLast);
-            this.Controls.Add(this.txtMiddle);
-            this.Controls.Add(this.txtFirst);
-            this.Controls.Add(this.label3);
-            this.Controls.Add(this.label2);
-            this.Controls.Add(this.label1);
-            this.Controls.Add(this.button1);
-            this.Controls.Add(this.emails);
-            this.Controls.Add(this.pnlAdd);
-            this.Name = "FRMWinClassicAddressBookNewContact";
-            this.Size = new System.Drawing.Size(332, 265);
-            this.Load += new System.EventHandler(this.FRMWinClassicAddressBookNewContact_Load);
-            this.pnlAdd.ResumeLayout(false);
-            this.pnlAdd.PerformLayout();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.Button button1;
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.Label label3;
-        private System.Windows.Forms.TextBox txtFirst;
-        private System.Windows.Forms.TextBox txtMiddle;
-        private System.Windows.Forms.TextBox txtLast;
-        private System.Windows.Forms.ListView emails;
-        private System.Windows.Forms.Label label4;
-        private System.Windows.Forms.Button button2;
-        private System.Windows.Forms.Button button3;
-        private System.Windows.Forms.Panel pnlAdd;
-        private System.Windows.Forms.Button button4;
-        private System.Windows.Forms.TextBox textBox1;
-        private System.Windows.Forms.Label label5;
-    }
-}
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/FRMWinClassicAddressBookNewContact.cs b/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/FRMWinClassicAddressBookNewContact.cs
deleted file mode 100644
index 482d54c..0000000
--- a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/FRMWinClassicAddressBookNewContact.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-
-namespace TimeHACK.OS.Win95.Win95Apps
-{
-    public partial class FRMWinClassicAddressBookNewContact : UserControl
-    {
-        public AddressBookContact toSet = new AddressBookContact();
-        public FRMWinClassicAddressBookNewContact()
-        {
-            InitializeComponent();
-            Program.AddressBookSelectedContact = null;
-        }
-
-        private void button2_Click(object sender, EventArgs e)
-        {
-            pnlAdd.Show();
-            pnlAdd.BringToFront();
-        }
-
-        private void button1_Click(object sender, EventArgs e)
-        {
-            if (txtFirst.Text != "" && txtMiddle.Text != "" && txtLast.Text != "")
-            {
-                toSet.FirstName = txtFirst.Text;
-                toSet.MiddleName = txtMiddle.Text;
-                toSet.LastName = txtLast.Text;
-
-                Program.AddressBookSelectedContact = toSet;
-                ((Form)this.TopLevelControl).Close();
-            } else {
-                MessageBox.Show("Please fill out the First, Middle and Last name.");
-            }           
-        }
-
-        private void button4_Click(object sender, EventArgs e)
-        {
-            emails.Items.Add(textBox1.Text);
-            toSet.Emails.Add(textBox1.Text);
-            emails.BringToFront();
-        }
-
-        private void FRMWinClassicAddressBookNewContact_Load(object sender, EventArgs e)
-        {
-            if (toSet != null)
-            {
-                txtFirst.Text = toSet.FirstName;
-                txtMiddle.Text = toSet.MiddleName;
-                txtLast.Text = toSet.LastName;
-                if (toSet.Emails != null)
-                {
-                    foreach (string email in toSet.Emails)
-                    {
-                        emails.Items.Add(email);
-                    }
-                }
-            } else
-            {
-                MessageBox.Show("NULL CONTACT!");
-            }
-        }
-    }
-}
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/FRMWinClassicAddressBookNewContact.resx b/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/FRMWinClassicAddressBookNewContact.resx
deleted file mode 100644
index 1af7de1..0000000
--- a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/FRMWinClassicAddressBookNewContact.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
\ No newline at end of file
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/FRMWinClassicAddressBookNewFolder.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/FRMWinClassicAddressBookNewFolder.Designer.cs
deleted file mode 100644
index c7efcd0..0000000
--- a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/FRMWinClassicAddressBookNewFolder.Designer.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-namespace TimeHACK.OS.Win95.Win95Apps
-{
-    partial class FRMWinClassicAddressBookNewFolder
-    {
-        /// <summary> 
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary> 
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Component Designer generated code
-
-        /// <summary> 
-        /// Required method for Designer support - do not modify 
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.label1 = new System.Windows.Forms.Label();
-            this.button1 = new System.Windows.Forms.Button();
-            this.textBox1 = new System.Windows.Forms.TextBox();
-            this.SuspendLayout();
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(102, 11);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(70, 13);
-            this.label1.TabIndex = 1;
-            this.label1.Text = "Folder Name:";
-            // 
-            // button1
-            // 
-            this.button1.Location = new System.Drawing.Point(97, 78);
-            this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(75, 23);
-            this.button1.TabIndex = 2;
-            this.button1.Text = "OK";
-            this.button1.UseVisualStyleBackColor = true;
-            this.button1.Click += new System.EventHandler(this.button1_Click);
-            // 
-            // textBox1
-            // 
-            this.textBox1.Location = new System.Drawing.Point(3, 40);
-            this.textBox1.Name = "textBox1";
-            this.textBox1.Size = new System.Drawing.Size(295, 20);
-            this.textBox1.TabIndex = 3;
-            // 
-            // FRMWinClassicAddressBookNewFolder
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.textBox1);
-            this.Controls.Add(this.button1);
-            this.Controls.Add(this.label1);
-            this.Name = "FRMWinClassicAddressBookNewFolder";
-            this.Size = new System.Drawing.Size(301, 116);
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.Button button1;
-        private System.Windows.Forms.TextBox textBox1;
-    }
-}
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/FRMWinClassicAddressBookNewFolder.cs b/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/FRMWinClassicAddressBookNewFolder.cs
deleted file mode 100644
index 705fd0d..0000000
--- a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/FRMWinClassicAddressBookNewFolder.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace TimeHACK.OS.Win95.Win95Apps
-{
-    public partial class FRMWinClassicAddressBookNewFolder : UserControl
-    {
-        
-        public FRMWinClassicAddressBookNewFolder()
-        {
-            InitializeComponent();
-        }
-
-        private void button1_Click(object sender, EventArgs e)
-        {
-            Program.AddressBookSelectedFolderName = textBox1.Text;
-            ((Form)this.TopLevelControl).Close();
-        }
-    }
-}
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/FRMWinClassicAddressBookNewFolder.resx b/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/FRMWinClassicAddressBookNewFolder.resx
deleted file mode 100644
index 1af7de1..0000000
--- a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/FRMWinClassicAddressBookNewFolder.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
\ No newline at end of file
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/WinClassicAddressBook.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/WinClassicAddressBook.Designer.cs
deleted file mode 100644
index 41107e8..0000000
--- a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/WinClassicAddressBook.Designer.cs
+++ /dev/null
@@ -1,398 +0,0 @@
-namespace TimeHACK.OS.Win95.Win95Apps
-{
-    partial class WinClassicAddressBook
-    {
-        /// <summary> 
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary> 
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Component Designer generated code
-
-        /// <summary> 
-        /// Required method for Designer support - do not modify 
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.components = new System.ComponentModel.Container();
-            System.Windows.Forms.TreeNode treeNode1 = new System.Windows.Forms.TreeNode("Shared Contacts");
-            this.topmenu = new System.Windows.Forms.MenuStrip();
-            this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.newContactToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.newFolderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
-            this.propertiesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.deleteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
-            this.importToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.exportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
-            this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
-            this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.viewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolbarToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.foldersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.actionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.sendMailToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.dialToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.internetToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.aboutAddressBookToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.contactsView = new System.Windows.Forms.ListView();
-            this.treeView1 = new System.Windows.Forms.TreeView();
-            this.toolbar = new System.Windows.Forms.Panel();
-            this.toolProp = new System.Windows.Forms.PictureBox();
-            this.toolNew = new System.Windows.Forms.PictureBox();
-            this.toolDelete = new System.Windows.Forms.PictureBox();
-            this.newContext = new System.Windows.Forms.ContextMenuStrip(this.components);
-            this.newContactToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
-            this.newFolderToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
-            this.topmenu.SuspendLayout();
-            this.toolbar.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.toolProp)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.toolNew)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.toolDelete)).BeginInit();
-            this.newContext.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // topmenu
-            // 
-            this.topmenu.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(212)))), ((int)(((byte)(208)))), ((int)(((byte)(200)))));
-            this.topmenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.fileToolStripMenuItem,
-            this.viewToolStripMenuItem,
-            this.toolsToolStripMenuItem,
-            this.helpToolStripMenuItem});
-            this.topmenu.Location = new System.Drawing.Point(0, 0);
-            this.topmenu.Name = "topmenu";
-            this.topmenu.Size = new System.Drawing.Size(666, 24);
-            this.topmenu.TabIndex = 1;
-            this.topmenu.Text = "menuStrip1";
-            // 
-            // fileToolStripMenuItem
-            // 
-            this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.newContactToolStripMenuItem,
-            this.newFolderToolStripMenuItem,
-            this.toolStripSeparator1,
-            this.propertiesToolStripMenuItem,
-            this.deleteToolStripMenuItem,
-            this.toolStripSeparator2,
-            this.importToolStripMenuItem,
-            this.exportToolStripMenuItem,
-            this.toolStripSeparator3,
-            this.toolStripSeparator4,
-            this.exitToolStripMenuItem});
-            this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
-            this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
-            this.fileToolStripMenuItem.Text = "File";
-            // 
-            // newContactToolStripMenuItem
-            // 
-            this.newContactToolStripMenuItem.Name = "newContactToolStripMenuItem";
-            this.newContactToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
-            this.newContactToolStripMenuItem.Text = "New contact...";
-            this.newContactToolStripMenuItem.Click += new System.EventHandler(this.newContactToolStripMenuItem_Click);
-            // 
-            // newFolderToolStripMenuItem
-            // 
-            this.newFolderToolStripMenuItem.Name = "newFolderToolStripMenuItem";
-            this.newFolderToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
-            this.newFolderToolStripMenuItem.Text = "New folder...";
-            this.newFolderToolStripMenuItem.Click += new System.EventHandler(this.newFolderToolStripMenuItem_Click);
-            // 
-            // toolStripSeparator1
-            // 
-            this.toolStripSeparator1.Name = "toolStripSeparator1";
-            this.toolStripSeparator1.Size = new System.Drawing.Size(149, 6);
-            // 
-            // propertiesToolStripMenuItem
-            // 
-            this.propertiesToolStripMenuItem.Name = "propertiesToolStripMenuItem";
-            this.propertiesToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
-            this.propertiesToolStripMenuItem.Text = "Properties";
-            this.propertiesToolStripMenuItem.Click += new System.EventHandler(this.propertiesToolStripMenuItem_Click);
-            // 
-            // deleteToolStripMenuItem
-            // 
-            this.deleteToolStripMenuItem.Name = "deleteToolStripMenuItem";
-            this.deleteToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
-            this.deleteToolStripMenuItem.Text = "Delete";
-            this.deleteToolStripMenuItem.Click += new System.EventHandler(this.deleteToolStripMenuItem_Click);
-            // 
-            // toolStripSeparator2
-            // 
-            this.toolStripSeparator2.Name = "toolStripSeparator2";
-            this.toolStripSeparator2.Size = new System.Drawing.Size(149, 6);
-            // 
-            // importToolStripMenuItem
-            // 
-            this.importToolStripMenuItem.Name = "importToolStripMenuItem";
-            this.importToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
-            this.importToolStripMenuItem.Text = "Import...";
-            // 
-            // exportToolStripMenuItem
-            // 
-            this.exportToolStripMenuItem.Name = "exportToolStripMenuItem";
-            this.exportToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
-            this.exportToolStripMenuItem.Text = "Export...";
-            // 
-            // toolStripSeparator3
-            // 
-            this.toolStripSeparator3.Name = "toolStripSeparator3";
-            this.toolStripSeparator3.Size = new System.Drawing.Size(149, 6);
-            // 
-            // toolStripSeparator4
-            // 
-            this.toolStripSeparator4.Name = "toolStripSeparator4";
-            this.toolStripSeparator4.Size = new System.Drawing.Size(149, 6);
-            // 
-            // exitToolStripMenuItem
-            // 
-            this.exitToolStripMenuItem.Name = "exitToolStripMenuItem";
-            this.exitToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
-            this.exitToolStripMenuItem.Text = "Exit";
-            this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click);
-            // 
-            // viewToolStripMenuItem
-            // 
-            this.viewToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.toolbarToolStripMenuItem,
-            this.foldersToolStripMenuItem});
-            this.viewToolStripMenuItem.Name = "viewToolStripMenuItem";
-            this.viewToolStripMenuItem.Size = new System.Drawing.Size(44, 20);
-            this.viewToolStripMenuItem.Text = "View";
-            // 
-            // toolbarToolStripMenuItem
-            // 
-            this.toolbarToolStripMenuItem.Checked = true;
-            this.toolbarToolStripMenuItem.CheckOnClick = true;
-            this.toolbarToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.toolbarToolStripMenuItem.Name = "toolbarToolStripMenuItem";
-            this.toolbarToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
-            this.toolbarToolStripMenuItem.Text = "Toolbar";
-            this.toolbarToolStripMenuItem.Click += new System.EventHandler(this.toolbarToolStripMenuItem_Click);
-            // 
-            // foldersToolStripMenuItem
-            // 
-            this.foldersToolStripMenuItem.Checked = true;
-            this.foldersToolStripMenuItem.CheckOnClick = true;
-            this.foldersToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.foldersToolStripMenuItem.Name = "foldersToolStripMenuItem";
-            this.foldersToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
-            this.foldersToolStripMenuItem.Text = "Folders";
-            this.foldersToolStripMenuItem.Click += new System.EventHandler(this.foldersToolStripMenuItem_Click);
-            // 
-            // toolsToolStripMenuItem
-            // 
-            this.toolsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.actionToolStripMenuItem});
-            this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem";
-            this.toolsToolStripMenuItem.Size = new System.Drawing.Size(47, 20);
-            this.toolsToolStripMenuItem.Text = "Tools";
-            // 
-            // actionToolStripMenuItem
-            // 
-            this.actionToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.sendMailToolStripMenuItem,
-            this.dialToolStripMenuItem,
-            this.internetToolStripMenuItem});
-            this.actionToolStripMenuItem.Name = "actionToolStripMenuItem";
-            this.actionToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
-            this.actionToolStripMenuItem.Text = "Action";
-            // 
-            // sendMailToolStripMenuItem
-            // 
-            this.sendMailToolStripMenuItem.Name = "sendMailToolStripMenuItem";
-            this.sendMailToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
-            this.sendMailToolStripMenuItem.Text = "Send Mail";
-            // 
-            // dialToolStripMenuItem
-            // 
-            this.dialToolStripMenuItem.Name = "dialToolStripMenuItem";
-            this.dialToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
-            this.dialToolStripMenuItem.Text = "Dial";
-            // 
-            // internetToolStripMenuItem
-            // 
-            this.internetToolStripMenuItem.Name = "internetToolStripMenuItem";
-            this.internetToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
-            this.internetToolStripMenuItem.Text = "Internet Call";
-            // 
-            // helpToolStripMenuItem
-            // 
-            this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.aboutAddressBookToolStripMenuItem});
-            this.helpToolStripMenuItem.Name = "helpToolStripMenuItem";
-            this.helpToolStripMenuItem.Size = new System.Drawing.Size(44, 20);
-            this.helpToolStripMenuItem.Text = "Help";
-            // 
-            // aboutAddressBookToolStripMenuItem
-            // 
-            this.aboutAddressBookToolStripMenuItem.Name = "aboutAddressBookToolStripMenuItem";
-            this.aboutAddressBookToolStripMenuItem.Size = new System.Drawing.Size(182, 22);
-            this.aboutAddressBookToolStripMenuItem.Text = "About Address Book";
-            // 
-            // contactsView
-            // 
-            this.contactsView.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.contactsView.Location = new System.Drawing.Point(208, 72);
-            this.contactsView.Name = "contactsView";
-            this.contactsView.Size = new System.Drawing.Size(458, 353);
-            this.contactsView.TabIndex = 3;
-            this.contactsView.UseCompatibleStateImageBehavior = false;
-            this.contactsView.View = System.Windows.Forms.View.List;
-            // 
-            // treeView1
-            // 
-            this.treeView1.Dock = System.Windows.Forms.DockStyle.Left;
-            this.treeView1.Location = new System.Drawing.Point(0, 72);
-            this.treeView1.Name = "treeView1";
-            treeNode1.Name = "Node0";
-            treeNode1.Text = "Shared Contacts";
-            this.treeView1.Nodes.AddRange(new System.Windows.Forms.TreeNode[] {
-            treeNode1});
-            this.treeView1.Size = new System.Drawing.Size(208, 353);
-            this.treeView1.TabIndex = 4;
-            this.treeView1.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView1_AfterSelect);
-            // 
-            // toolbar
-            // 
-            this.toolbar.BackColor = System.Drawing.Color.Silver;
-            this.toolbar.BackgroundImage = global::TimeHACK.Properties.Resources.WinClassicGENERALApplicationToolbarBackground;
-            this.toolbar.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.toolbar.Controls.Add(this.toolProp);
-            this.toolbar.Controls.Add(this.toolNew);
-            this.toolbar.Controls.Add(this.toolDelete);
-            this.toolbar.Dock = System.Windows.Forms.DockStyle.Top;
-            this.toolbar.Location = new System.Drawing.Point(0, 24);
-            this.toolbar.Name = "toolbar";
-            this.toolbar.Size = new System.Drawing.Size(666, 48);
-            this.toolbar.TabIndex = 5;
-            // 
-            // toolProp
-            // 
-            this.toolProp.BackColor = System.Drawing.Color.Transparent;
-            this.toolProp.Image = global::TimeHACK.Properties.Resources.WinClassicAddressBookPropertiesIcon;
-            this.toolProp.Location = new System.Drawing.Point(65, 3);
-            this.toolProp.Name = "toolProp";
-            this.toolProp.Size = new System.Drawing.Size(61, 39);
-            this.toolProp.TabIndex = 0;
-            this.toolProp.TabStop = false;
-            this.toolProp.Click += new System.EventHandler(this.toolProp_Click);
-            // 
-            // toolNew
-            // 
-            this.toolNew.BackColor = System.Drawing.Color.Transparent;
-            this.toolNew.Image = global::TimeHACK.Properties.Resources.WinClassicAddressBookNewIcon;
-            this.toolNew.Location = new System.Drawing.Point(16, 4);
-            this.toolNew.Name = "toolNew";
-            this.toolNew.Size = new System.Drawing.Size(43, 39);
-            this.toolNew.TabIndex = 0;
-            this.toolNew.TabStop = false;
-            // 
-            // toolDelete
-            // 
-            this.toolDelete.BackColor = System.Drawing.Color.Transparent;
-            this.toolDelete.Image = global::TimeHACK.Properties.Resources.WinClassicAddressBookDeleteIcon;
-            this.toolDelete.Location = new System.Drawing.Point(132, 3);
-            this.toolDelete.Name = "toolDelete";
-            this.toolDelete.Size = new System.Drawing.Size(61, 39);
-            this.toolDelete.TabIndex = 0;
-            this.toolDelete.TabStop = false;
-            this.toolDelete.Click += new System.EventHandler(this.toolDelete_Click);
-            // 
-            // newContext
-            // 
-            this.newContext.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.newContactToolStripMenuItem1,
-            this.newFolderToolStripMenuItem1});
-            this.newContext.Name = "newContext";
-            this.newContext.Size = new System.Drawing.Size(153, 48);
-            // 
-            // newContactToolStripMenuItem1
-            // 
-            this.newContactToolStripMenuItem1.Name = "newContactToolStripMenuItem1";
-            this.newContactToolStripMenuItem1.Size = new System.Drawing.Size(152, 22);
-            this.newContactToolStripMenuItem1.Text = "New Contact...";
-            this.newContactToolStripMenuItem1.Click += new System.EventHandler(this.newContactToolStripMenuItem1_Click);
-            // 
-            // newFolderToolStripMenuItem1
-            // 
-            this.newFolderToolStripMenuItem1.Name = "newFolderToolStripMenuItem1";
-            this.newFolderToolStripMenuItem1.Size = new System.Drawing.Size(152, 22);
-            this.newFolderToolStripMenuItem1.Text = "New Folder...";
-            this.newFolderToolStripMenuItem1.Click += new System.EventHandler(this.newFolderToolStripMenuItem1_Click);
-            // 
-            // WinClassicAddressBook
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.contactsView);
-            this.Controls.Add(this.treeView1);
-            this.Controls.Add(this.toolbar);
-            this.Controls.Add(this.topmenu);
-            this.Name = "WinClassicAddressBook";
-            this.Size = new System.Drawing.Size(666, 425);
-            this.topmenu.ResumeLayout(false);
-            this.topmenu.PerformLayout();
-            this.toolbar.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.toolProp)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.toolNew)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.toolDelete)).EndInit();
-            this.newContext.ResumeLayout(false);
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-        private System.Windows.Forms.MenuStrip topmenu;
-        private System.Windows.Forms.ToolStripMenuItem fileToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem viewToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem toolsToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem helpToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem newContactToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem newFolderToolStripMenuItem;
-        private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
-        private System.Windows.Forms.ToolStripMenuItem propertiesToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem deleteToolStripMenuItem;
-        private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
-        private System.Windows.Forms.ToolStripMenuItem importToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem exportToolStripMenuItem;
-        private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
-        private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
-        private System.Windows.Forms.ToolStripMenuItem exitToolStripMenuItem;
-        private System.Windows.Forms.ListView contactsView;
-        private System.Windows.Forms.TreeView treeView1;
-        private System.Windows.Forms.ToolStripMenuItem toolbarToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem foldersToolStripMenuItem;
-        private System.Windows.Forms.Panel toolbar;
-        private System.Windows.Forms.PictureBox toolNew;
-        private System.Windows.Forms.PictureBox toolDelete;
-        private System.Windows.Forms.PictureBox toolProp;
-        private System.Windows.Forms.ToolStripMenuItem actionToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem sendMailToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem dialToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem internetToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem aboutAddressBookToolStripMenuItem;
-        private System.Windows.Forms.ContextMenuStrip newContext;
-        private System.Windows.Forms.ToolStripMenuItem newContactToolStripMenuItem1;
-        private System.Windows.Forms.ToolStripMenuItem newFolderToolStripMenuItem1;
-    }
-}
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/WinClassicAddressBook.cs b/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/WinClassicAddressBook.cs
deleted file mode 100644
index 95ee509..0000000
--- a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/WinClassicAddressBook.cs
+++ /dev/null
@@ -1,293 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using TimeHACK.Engine;
-using TimeHACK.Engine.Template;
-
-namespace TimeHACK.OS.Win95.Win95Apps
-{
-    public partial class WinClassicAddressBook : UserControl
-    {
-        WindowManager wm = new WindowManager();
-
-        public List<AddressBookContactList> AddressBookObjects;
-        public WinClassicAddressBook()
-        {
-            InitializeComponent();
-            foreach (ToolStripMenuItem item in topmenu.Items)
-            {
-                item.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((0)));
-                item.BackColor = Color.Silver;
-                item.BackgroundImage = Properties.Resources.sliversilver;
-                item.BackgroundImageLayout = ImageLayout.Center;
-                item.DisplayStyle = ToolStripItemDisplayStyle.Text;
-            }
-
-            //Time to prepare to load all the fonts up for the combo boxes
-
-            //foreach (FontFamily font in System.Drawing.FontFamily.Families)
-            //{
-            // Added to the ComboBox here
-
-            //comboFont.Items.Add(font.Name);
-            //}
-
-            AddressBookObjects = new List<AddressBookContactList>
-            {
-                new AddressBookContactList()
-                {
-                    AttachedNode = treeView1.Nodes[0].Text,
-                }
-            };
-        }
-
-        private void treeView1_AfterSelect(object sender, TreeViewEventArgs e)
-        {
-            UpdateContactListFromNodeName(treeView1.SelectedNode.Text);
-        }
-
-        //AddressBookContactList GetAddressBookContactListFromNode(string NodeText)
-        //{
-        //    AddressBookContactList toReturn = new AddressBookContactList();
-        //    foreach (AddressBookContactList lstitem in AddressBookObjects)
-        //    {
-        //        if (lstitem.AttachedNode == NodeText)
-        //        {
-        //            toReturn = lstitem;
-        //        }
-        //    }
-        //    if (toReturn == null)
-        //    {
-        //        // Something has gone wrong!
-        //        MessageBox.Show("Unable to find list of items");
-        //    }
-        //    MessageBox.Show("Gone through process!");
-        //    return toReturn;
-        //}
-
-        public void UpdateContactListFromNodeName(string NodeName)
-        {
-            contactsView.Items.Clear();
-            try
-            {
-                foreach (AddressBookContactList ContactList in AddressBookObjects)
-                {
-                    if (ContactList.AttachedNode == NodeName)
-                    {
-                        foreach (AddressBookContact contact in ContactList.Contacts)
-                        {
-                            if (contact != null)
-                            {
-                                if (contact.FirstName != null)
-                                {
-                                    contactsView.Items.Add(contact.FirstName + " " + contact.MiddleName + " " + contact.LastName);
-                                }
-                            }
-                            else
-                            {
-                                MessageBox.Show("Null contact!");
-                            }
-                        }
-                    }
-                }
-            } catch
-            {
-
-            }             
-        }
-
-        public void AddFolderToNode(TreeNode OldTreeNode, string NewNodeName)
-        {
-            if (OldTreeNode != null)
-            {
-                OldTreeNode.Nodes.Add(NewNodeName);
-
-                AddressBookObjects.Add(new AddressBookContactList
-                {
-                    AttachedNode = NewNodeName,
-                });
-            }
-        }
-
-        private void newFolderToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            NewFolder();      
-        }
-
-        void NewFolder()
-        {
-            FRMWinClassicAddressBookNewFolder abnf = new FRMWinClassicAddressBookNewFolder();
-            WinClassic app = wm.StartWin95(abnf, "Address Book - New Folder", Properties.Resources.Win95IconWordpad, true, true, true);
-
-            if (treeView1.SelectedNode != null)
-            {
-                if (Program.AddressBookSelectedFolderName != null)
-                {
-                    AddFolderToNode(treeView1.SelectedNode, Program.AddressBookSelectedFolderName);
-                }
-                else
-                {
-                    wm.StartInfobox95("Address Book - New Folder", "You must enter a folder name!", Properties.Resources.Win95Error);
-                }
-            }
-        }
-
-        private void newContactToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            NewContact();
-        }
-
-        void NewContact()
-        {
-            FRMWinClassicAddressBookNewContact abnc = new FRMWinClassicAddressBookNewContact();
-            WinClassic app = wm.StartWin95(abnc, "Address Book - New Contact", Properties.Resources.Win95IconWordpad, true, true, true);
-
-            if (treeView1.SelectedNode != null)
-            {
-                if (Program.AddressBookSelectedContact != null)
-                {
-                    foreach (AddressBookContactList ContactList in AddressBookObjects)
-                    {
-                        if (ContactList.AttachedNode == treeView1.SelectedNode.Text)
-                        {
-                            ContactList.Contacts.Add(Program.AddressBookSelectedContact);
-                            contactsView.Items.Add(Program.AddressBookSelectedContact.FirstName + " " + Program.AddressBookSelectedContact.MiddleName + " " + Program.AddressBookSelectedContact.LastName);
-                        }
-                    }
-                }
-            }
-        }
-
-        private void toolProp_Click(object sender, EventArgs e)
-        {
-            OpenProperties();
-        }
-
-        void OpenProperties()
-        {
-            FRMWinClassicAddressBookNewContact abnc = new FRMWinClassicAddressBookNewContact();
-
-            // Finds the selected contact
-            if (treeView1.SelectedNode != null)
-            {
-                foreach (AddressBookContactList ContactList in AddressBookObjects)
-                {
-                    if (ContactList.AttachedNode == treeView1.SelectedNode.Text)
-                    {
-                        foreach (AddressBookContact Contact in ContactList.Contacts)
-                        {
-                            if ((Contact.FirstName + " " + Contact.MiddleName + " " + Contact.LastName) == contactsView.FocusedItem.Text)
-                            {
-                                abnc.toSet = Contact;
-                            }
-                        }
-                    }
-                }
-                WinClassic app = wm.StartWin95(abnc, "Address Book - Contact Properties", Properties.Resources.Win95IconWordpad, true, true, true);
-
-                if (treeView1.SelectedNode != null)
-                {
-                    if (Program.AddressBookSelectedContact != null)
-                    {
-                        foreach (AddressBookContactList ContactList in AddressBookObjects)
-                        {
-                            if (ContactList.AttachedNode == treeView1.SelectedNode.Text)
-                            {
-                                foreach (AddressBookContact Contact in ContactList.Contacts)
-                                {
-                                    if ((Contact.FirstName + " " + Contact.MiddleName + " " + Contact.LastName) == contactsView.FocusedItem.Text)
-                                    {
-                                        ContactList.Contacts.Remove(Contact);
-                                        ContactList.Contacts.Add(Program.AddressBookSelectedContact);
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-
-            
-        }
-
-        private void propertiesToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            OpenProperties();
-        }
-
-        private void deleteToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            DeleteContact();
-        }
-
-        void DeleteContact()
-        {
-            if (treeView1.SelectedNode != null)
-            {
-                foreach (AddressBookContactList ContactList in AddressBookObjects)
-                {
-                    if (ContactList.AttachedNode == treeView1.SelectedNode.Text)
-                    {
-                        foreach (AddressBookContact Contact in ContactList.Contacts)
-                        {
-                            if ((Contact.FirstName + " " + Contact.MiddleName + " " + Contact.LastName) == contactsView.FocusedItem.Text)
-                            {
-                                ContactList.Contacts.Remove(Contact);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        private void toolDelete_Click(object sender, EventArgs e)
-        {
-            DeleteContact();
-        }
-
-        private void newContactToolStripMenuItem1_Click(object sender, EventArgs e)
-        {
-            NewContact();
-        }
-
-        private void newFolderToolStripMenuItem1_Click(object sender, EventArgs e)
-        {
-            NewFolder();
-        }
-
-        private void toolbarToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            toolbar.Visible = toolbarToolStripMenuItem.Checked;
-        }
-
-        private void foldersToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            treeView1.Visible = foldersToolStripMenuItem.Checked;
-        }
-
-        private void exitToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            ((Form)this.TopLevelControl).Close();
-        }
-    }
-
-    public class AddressBookContact
-    {
-        public string FirstName;
-        public string MiddleName;
-        public string LastName;
-        public List<string> Emails = new List<string>();
-    }
-
-    public class AddressBookContactList
-    {
-        public string AttachedNode;
-        public List<AddressBookContact> Contacts = new List<AddressBookContact>();
-    }
-}
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/IE4Sites/IE4NoPage.resx b/TimeHACK.Main/OS/Win95/Win95Apps/IE4Sites/IE4NoPage.resx
index a167a19..5f61137 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/IE4Sites/IE4NoPage.resx
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/IE4Sites/IE4NoPage.resx
@@ -117,7 +117,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="String1" xml:space="preserve">
+  <data name="string1" xml:space="preserve">
     <value>testy</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/Win95WindowsExplorer.Designer.cs
index 3cc9ad9..e8ea655 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.Designer.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/Win95WindowsExplorer.Designer.cs
@@ -1,6 +1,6 @@
 namespace TimeHACK.OS.Win95.Win95Apps
 {
-    partial class WinClassicWindowsExplorer
+    partial class Win95WindowsExplorer
     {
         /// <summary> 
         /// Required designer variable.
@@ -29,8 +29,8 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WinClassicWindowsExplorer));
             this.program = new System.Windows.Forms.Panel();
+            this.mainView = new System.Windows.Forms.ListView();
             this.diskView = new System.Windows.Forms.TreeView();
             this.MenuStrip1 = new System.Windows.Forms.MenuStrip();
             this.FileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -41,40 +41,14 @@
             this.BitmapImageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.DeleteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.RenameToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.PropertiesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.CloseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.EditToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.UndoCtrlZToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.CutCtrlXToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.CopyCtrlCToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.PasteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.PasteShortcutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.SellectAllCtrlAToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.InvertSelectionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.ViewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.ToolbarToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.StatusBarToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.LargeIconsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SmallIconsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.ListToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.DetailsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.ArrangeIconsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.ByDriveLetterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.ByTypeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.BySizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.ByFreeSpaceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.LineUpIconsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.RefreshToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.OptionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.ToolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.FindToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.FilesOrFoldersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.ComputerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.OnTheInternetToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.PeopleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.MapNetworkDriveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.DisconnectNetworkDriveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.GoToToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.HelpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.HelpToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
             this.AboutWindows95ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -86,7 +60,7 @@
             this.Button1 = new System.Windows.Forms.Button();
             this.Label1 = new System.Windows.Forms.Label();
             this.txtSave = new System.Windows.Forms.TextBox();
-            this.mainView = new System.Windows.Forms.ListView();
+            this.refresh = new System.Windows.Forms.Timer(this.components);
             this.program.SuspendLayout();
             this.MenuStrip1.SuspendLayout();
             this.pnlSave.SuspendLayout();
@@ -95,6 +69,7 @@
             // program
             // 
             this.program.BackColor = System.Drawing.Color.Silver;
+            this.program.Controls.Add(this.mainView);
             this.program.Controls.Add(this.diskView);
             this.program.Controls.Add(this.MenuStrip1);
             this.program.Controls.Add(this.toprightcorner);
@@ -102,31 +77,41 @@
             this.program.Controls.Add(this.bottomleftcorner);
             this.program.Controls.Add(this.topleftcorner);
             this.program.Controls.Add(this.pnlSave);
-            this.program.Controls.Add(this.mainView);
             this.program.Dock = System.Windows.Forms.DockStyle.Fill;
             this.program.Location = new System.Drawing.Point(0, 0);
             this.program.Name = "program";
             this.program.Size = new System.Drawing.Size(704, 517);
             this.program.TabIndex = 13;
             // 
+            // mainView
+            // 
+            this.mainView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.mainView.Location = new System.Drawing.Point(215, 27);
+            this.mainView.Name = "mainView";
+            this.mainView.Size = new System.Drawing.Size(486, 444);
+            this.mainView.TabIndex = 10;
+            this.mainView.UseCompatibleStateImageBehavior = false;
+            this.mainView.View = System.Windows.Forms.View.List;
+            this.mainView.DoubleClick += new System.EventHandler(this.mainView_DoubleClick);
+            // 
             // diskView
             // 
-            this.diskView.ImageList = new System.Windows.Forms.ImageList();
             this.diskView.Location = new System.Drawing.Point(3, 27);
             this.diskView.Name = "diskView";
             this.diskView.Size = new System.Drawing.Size(213, 444);
             this.diskView.TabIndex = 13;
-            this.diskView.Visible = true;
-            this.diskView.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(diskView_AfterSelect);
+            this.diskView.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.diskView_AfterSelect);
             // 
             // MenuStrip1
             // 
-            this.MenuStrip1.BackColor = System.Drawing.Color.Silver;
+            this.MenuStrip1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(212)))), ((int)(((byte)(208)))), ((int)(((byte)(200)))));
+            this.MenuStrip1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
             this.MenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.FileToolStripMenuItem,
             this.EditToolStripMenuItem,
             this.ViewToolStripMenuItem,
-            this.ToolsToolStripMenuItem,
             this.HelpToolStripMenuItem});
             this.MenuStrip1.Location = new System.Drawing.Point(0, 0);
             this.MenuStrip1.Name = "MenuStrip1";
@@ -140,7 +125,6 @@
             this.CreateShortcutToolStripMenuItem,
             this.DeleteToolStripMenuItem,
             this.RenameToolStripMenuItem,
-            this.PropertiesToolStripMenuItem,
             this.CloseToolStripMenuItem});
             this.FileToolStripMenuItem.Name = "FileToolStripMenuItem";
             this.FileToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
@@ -154,7 +138,7 @@
             this.TextDocumentToolStripMenuItem,
             this.BitmapImageToolStripMenuItem});
             this.CreateShortcutToolStripMenuItem.Name = "CreateShortcutToolStripMenuItem";
-            this.CreateShortcutToolStripMenuItem.Size = new System.Drawing.Size(127, 22);
+            this.CreateShortcutToolStripMenuItem.Size = new System.Drawing.Size(117, 22);
             this.CreateShortcutToolStripMenuItem.Text = "New";
             // 
             // FolderToolStripMenuItem
@@ -185,254 +169,77 @@
             // DeleteToolStripMenuItem
             // 
             this.DeleteToolStripMenuItem.Name = "DeleteToolStripMenuItem";
-            this.DeleteToolStripMenuItem.Size = new System.Drawing.Size(127, 22);
+            this.DeleteToolStripMenuItem.Size = new System.Drawing.Size(117, 22);
             this.DeleteToolStripMenuItem.Text = "Delete";
             this.DeleteToolStripMenuItem.Click += new System.EventHandler(this.DeleteToolStripMenuItem_Click);
             // 
             // RenameToolStripMenuItem
             // 
             this.RenameToolStripMenuItem.Name = "RenameToolStripMenuItem";
-            this.RenameToolStripMenuItem.Size = new System.Drawing.Size(127, 22);
+            this.RenameToolStripMenuItem.Size = new System.Drawing.Size(117, 22);
             this.RenameToolStripMenuItem.Text = "Rename";
-            // 
-            // PropertiesToolStripMenuItem
-            // 
-            this.PropertiesToolStripMenuItem.Name = "PropertiesToolStripMenuItem";
-            this.PropertiesToolStripMenuItem.Size = new System.Drawing.Size(127, 22);
-            this.PropertiesToolStripMenuItem.Text = "Properties";
+            this.RenameToolStripMenuItem.Click += new System.EventHandler(this.RenameToolStripMenuItem_Click);
             // 
             // CloseToolStripMenuItem
             // 
             this.CloseToolStripMenuItem.Name = "CloseToolStripMenuItem";
-            this.CloseToolStripMenuItem.Size = new System.Drawing.Size(127, 22);
+            this.CloseToolStripMenuItem.Size = new System.Drawing.Size(117, 22);
             this.CloseToolStripMenuItem.Text = "Close";
             this.CloseToolStripMenuItem.Click += new System.EventHandler(this.CloseToolStripMenuItem_Click);
             // 
             // EditToolStripMenuItem
             // 
             this.EditToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.UndoCtrlZToolStripMenuItem,
             this.CutCtrlXToolStripMenuItem,
             this.CopyCtrlCToolStripMenuItem,
             this.PasteToolStripMenuItem,
-            this.PasteShortcutToolStripMenuItem,
-            this.SellectAllCtrlAToolStripMenuItem,
-            this.InvertSelectionToolStripMenuItem});
+            this.SellectAllCtrlAToolStripMenuItem});
             this.EditToolStripMenuItem.Name = "EditToolStripMenuItem";
             this.EditToolStripMenuItem.Size = new System.Drawing.Size(39, 20);
             this.EditToolStripMenuItem.Text = "Edit";
             // 
-            // UndoCtrlZToolStripMenuItem
-            // 
-            this.UndoCtrlZToolStripMenuItem.Name = "UndoCtrlZToolStripMenuItem";
-            this.UndoCtrlZToolStripMenuItem.Size = new System.Drawing.Size(197, 22);
-            this.UndoCtrlZToolStripMenuItem.Text = "Undo                    Ctrl+Z";
-            // 
             // CutCtrlXToolStripMenuItem
             // 
             this.CutCtrlXToolStripMenuItem.Name = "CutCtrlXToolStripMenuItem";
             this.CutCtrlXToolStripMenuItem.Size = new System.Drawing.Size(197, 22);
             this.CutCtrlXToolStripMenuItem.Text = "Cut                       Ctrl+X";
+            this.CutCtrlXToolStripMenuItem.Click += new System.EventHandler(this.CutCtrlXToolStripMenuItem_Click);
             // 
             // CopyCtrlCToolStripMenuItem
             // 
             this.CopyCtrlCToolStripMenuItem.Name = "CopyCtrlCToolStripMenuItem";
             this.CopyCtrlCToolStripMenuItem.Size = new System.Drawing.Size(197, 22);
             this.CopyCtrlCToolStripMenuItem.Text = "Copy                    Ctrl+C";
+            this.CopyCtrlCToolStripMenuItem.Click += new System.EventHandler(this.CopyCtrlCToolStripMenuItem_Click);
             // 
             // PasteToolStripMenuItem
             // 
             this.PasteToolStripMenuItem.Name = "PasteToolStripMenuItem";
             this.PasteToolStripMenuItem.Size = new System.Drawing.Size(197, 22);
             this.PasteToolStripMenuItem.Text = "Paste                    Ctrl+V";
-            // 
-            // PasteShortcutToolStripMenuItem
-            // 
-            this.PasteShortcutToolStripMenuItem.Name = "PasteShortcutToolStripMenuItem";
-            this.PasteShortcutToolStripMenuItem.Size = new System.Drawing.Size(197, 22);
-            this.PasteShortcutToolStripMenuItem.Text = "Paste Shortcut";
+            this.PasteToolStripMenuItem.Click += new System.EventHandler(this.PasteToolStripMenuItem_Click);
             // 
             // SellectAllCtrlAToolStripMenuItem
             // 
             this.SellectAllCtrlAToolStripMenuItem.Name = "SellectAllCtrlAToolStripMenuItem";
             this.SellectAllCtrlAToolStripMenuItem.Size = new System.Drawing.Size(197, 22);
-            this.SellectAllCtrlAToolStripMenuItem.Text = "Sellect All            Ctrl+A";
-            // 
-            // InvertSelectionToolStripMenuItem
-            // 
-            this.InvertSelectionToolStripMenuItem.Name = "InvertSelectionToolStripMenuItem";
-            this.InvertSelectionToolStripMenuItem.Size = new System.Drawing.Size(197, 22);
-            this.InvertSelectionToolStripMenuItem.Text = "Invert Selection";
+            this.SellectAllCtrlAToolStripMenuItem.Text = "Select All            Ctrl+A";
+            this.SellectAllCtrlAToolStripMenuItem.Click += new System.EventHandler(this.SellectAllCtrlAToolStripMenuItem_Click);
             // 
             // ViewToolStripMenuItem
             // 
             this.ViewToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.ToolbarToolStripMenuItem,
-            this.StatusBarToolStripMenuItem,
-            this.LargeIconsToolStripMenuItem,
-            this.SmallIconsToolStripMenuItem,
-            this.ListToolStripMenuItem,
-            this.DetailsToolStripMenuItem,
-            this.ArrangeIconsToolStripMenuItem,
-            this.LineUpIconsToolStripMenuItem,
-            this.RefreshToolStripMenuItem,
-            this.OptionsToolStripMenuItem});
+            this.RefreshToolStripMenuItem});
             this.ViewToolStripMenuItem.Name = "ViewToolStripMenuItem";
             this.ViewToolStripMenuItem.Size = new System.Drawing.Size(44, 20);
             this.ViewToolStripMenuItem.Text = "View";
             // 
-            // ToolbarToolStripMenuItem
-            // 
-            this.ToolbarToolStripMenuItem.Name = "ToolbarToolStripMenuItem";
-            this.ToolbarToolStripMenuItem.Size = new System.Drawing.Size(147, 22);
-            this.ToolbarToolStripMenuItem.Text = "Toolbar";
-            // 
-            // StatusBarToolStripMenuItem
-            // 
-            this.StatusBarToolStripMenuItem.Name = "StatusBarToolStripMenuItem";
-            this.StatusBarToolStripMenuItem.Size = new System.Drawing.Size(147, 22);
-            this.StatusBarToolStripMenuItem.Text = "Status Bar";
-            // 
-            // LargeIconsToolStripMenuItem
-            // 
-            this.LargeIconsToolStripMenuItem.Name = "LargeIconsToolStripMenuItem";
-            this.LargeIconsToolStripMenuItem.Size = new System.Drawing.Size(147, 22);
-            this.LargeIconsToolStripMenuItem.Text = "Large Icons";
-            // 
-            // SmallIconsToolStripMenuItem
-            // 
-            this.SmallIconsToolStripMenuItem.Name = "SmallIconsToolStripMenuItem";
-            this.SmallIconsToolStripMenuItem.Size = new System.Drawing.Size(147, 22);
-            this.SmallIconsToolStripMenuItem.Text = "Small Icons";
-            // 
-            // ListToolStripMenuItem
-            // 
-            this.ListToolStripMenuItem.Name = "ListToolStripMenuItem";
-            this.ListToolStripMenuItem.Size = new System.Drawing.Size(147, 22);
-            this.ListToolStripMenuItem.Text = "List";
-            // 
-            // DetailsToolStripMenuItem
-            // 
-            this.DetailsToolStripMenuItem.Name = "DetailsToolStripMenuItem";
-            this.DetailsToolStripMenuItem.Size = new System.Drawing.Size(147, 22);
-            this.DetailsToolStripMenuItem.Text = "Details";
-            // 
-            // ArrangeIconsToolStripMenuItem
-            // 
-            this.ArrangeIconsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.ByDriveLetterToolStripMenuItem,
-            this.ByTypeToolStripMenuItem,
-            this.BySizeToolStripMenuItem,
-            this.ByFreeSpaceToolStripMenuItem});
-            this.ArrangeIconsToolStripMenuItem.Name = "ArrangeIconsToolStripMenuItem";
-            this.ArrangeIconsToolStripMenuItem.Size = new System.Drawing.Size(147, 22);
-            this.ArrangeIconsToolStripMenuItem.Text = "Arrange Icons";
-            // 
-            // ByDriveLetterToolStripMenuItem
-            // 
-            this.ByDriveLetterToolStripMenuItem.Name = "ByDriveLetterToolStripMenuItem";
-            this.ByDriveLetterToolStripMenuItem.Size = new System.Drawing.Size(150, 22);
-            this.ByDriveLetterToolStripMenuItem.Text = "by Drive Letter";
-            // 
-            // ByTypeToolStripMenuItem
-            // 
-            this.ByTypeToolStripMenuItem.Name = "ByTypeToolStripMenuItem";
-            this.ByTypeToolStripMenuItem.Size = new System.Drawing.Size(150, 22);
-            this.ByTypeToolStripMenuItem.Text = "by Type";
-            // 
-            // BySizeToolStripMenuItem
-            // 
-            this.BySizeToolStripMenuItem.Name = "BySizeToolStripMenuItem";
-            this.BySizeToolStripMenuItem.Size = new System.Drawing.Size(150, 22);
-            this.BySizeToolStripMenuItem.Text = "by Size";
-            // 
-            // ByFreeSpaceToolStripMenuItem
-            // 
-            this.ByFreeSpaceToolStripMenuItem.Name = "ByFreeSpaceToolStripMenuItem";
-            this.ByFreeSpaceToolStripMenuItem.Size = new System.Drawing.Size(150, 22);
-            this.ByFreeSpaceToolStripMenuItem.Text = "by Free Space";
-            // 
-            // LineUpIconsToolStripMenuItem
-            // 
-            this.LineUpIconsToolStripMenuItem.Name = "LineUpIconsToolStripMenuItem";
-            this.LineUpIconsToolStripMenuItem.Size = new System.Drawing.Size(147, 22);
-            this.LineUpIconsToolStripMenuItem.Text = "Line up Icons";
-            // 
             // RefreshToolStripMenuItem
             // 
             this.RefreshToolStripMenuItem.Name = "RefreshToolStripMenuItem";
-            this.RefreshToolStripMenuItem.Size = new System.Drawing.Size(147, 22);
+            this.RefreshToolStripMenuItem.Size = new System.Drawing.Size(113, 22);
             this.RefreshToolStripMenuItem.Text = "Refresh";
-            // 
-            // OptionsToolStripMenuItem
-            // 
-            this.OptionsToolStripMenuItem.Name = "OptionsToolStripMenuItem";
-            this.OptionsToolStripMenuItem.Size = new System.Drawing.Size(147, 22);
-            this.OptionsToolStripMenuItem.Text = "Options...";
-            // 
-            // ToolsToolStripMenuItem
-            // 
-            this.ToolsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.FindToolStripMenuItem,
-            this.MapNetworkDriveToolStripMenuItem,
-            this.DisconnectNetworkDriveToolStripMenuItem,
-            this.GoToToolStripMenuItem});
-            this.ToolsToolStripMenuItem.Name = "ToolsToolStripMenuItem";
-            this.ToolsToolStripMenuItem.Size = new System.Drawing.Size(47, 20);
-            this.ToolsToolStripMenuItem.Text = "Tools";
-            // 
-            // FindToolStripMenuItem
-            // 
-            this.FindToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.FilesOrFoldersToolStripMenuItem,
-            this.ComputerToolStripMenuItem,
-            this.OnTheInternetToolStripMenuItem,
-            this.PeopleToolStripMenuItem});
-            this.FindToolStripMenuItem.Name = "FindToolStripMenuItem";
-            this.FindToolStripMenuItem.Size = new System.Drawing.Size(220, 22);
-            this.FindToolStripMenuItem.Text = "Find";
-            // 
-            // FilesOrFoldersToolStripMenuItem
-            // 
-            this.FilesOrFoldersToolStripMenuItem.Name = "FilesOrFoldersToolStripMenuItem";
-            this.FilesOrFoldersToolStripMenuItem.Size = new System.Drawing.Size(161, 22);
-            this.FilesOrFoldersToolStripMenuItem.Text = "Files or Folders...";
-            // 
-            // ComputerToolStripMenuItem
-            // 
-            this.ComputerToolStripMenuItem.Name = "ComputerToolStripMenuItem";
-            this.ComputerToolStripMenuItem.Size = new System.Drawing.Size(161, 22);
-            this.ComputerToolStripMenuItem.Text = "Computer...";
-            // 
-            // OnTheInternetToolStripMenuItem
-            // 
-            this.OnTheInternetToolStripMenuItem.Name = "OnTheInternetToolStripMenuItem";
-            this.OnTheInternetToolStripMenuItem.Size = new System.Drawing.Size(161, 22);
-            this.OnTheInternetToolStripMenuItem.Text = "On the Internet";
-            // 
-            // PeopleToolStripMenuItem
-            // 
-            this.PeopleToolStripMenuItem.Name = "PeopleToolStripMenuItem";
-            this.PeopleToolStripMenuItem.Size = new System.Drawing.Size(161, 22);
-            this.PeopleToolStripMenuItem.Text = "People...";
-            // 
-            // MapNetworkDriveToolStripMenuItem
-            // 
-            this.MapNetworkDriveToolStripMenuItem.Name = "MapNetworkDriveToolStripMenuItem";
-            this.MapNetworkDriveToolStripMenuItem.Size = new System.Drawing.Size(220, 22);
-            this.MapNetworkDriveToolStripMenuItem.Text = "Map Network Drive...";
-            // 
-            // DisconnectNetworkDriveToolStripMenuItem
-            // 
-            this.DisconnectNetworkDriveToolStripMenuItem.Name = "DisconnectNetworkDriveToolStripMenuItem";
-            this.DisconnectNetworkDriveToolStripMenuItem.Size = new System.Drawing.Size(220, 22);
-            this.DisconnectNetworkDriveToolStripMenuItem.Text = "Disconnect Network Drive...";
-            // 
-            // GoToToolStripMenuItem
-            // 
-            this.GoToToolStripMenuItem.Name = "GoToToolStripMenuItem";
-            this.GoToToolStripMenuItem.Size = new System.Drawing.Size(220, 22);
-            this.GoToToolStripMenuItem.Text = "Go to...";
+            this.RefreshToolStripMenuItem.Click += new System.EventHandler(this.RefreshToolStripMenuItem_Click);
             // 
             // HelpToolStripMenuItem
             // 
@@ -529,25 +336,17 @@
             this.txtSave.Size = new System.Drawing.Size(542, 20);
             this.txtSave.TabIndex = 15;
             // 
-            // mainView
+            // refresh
             // 
-            this.mainView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.mainView.Location = new System.Drawing.Point(215, 27);
-            this.mainView.Name = "mainView";
-            this.mainView.Size = new System.Drawing.Size(486, 444);
-            this.mainView.TabIndex = 10;
-            this.mainView.UseCompatibleStateImageBehavior = false;
-            this.mainView.View = System.Windows.Forms.View.List;
-            this.mainView.DoubleClick += new System.EventHandler(this.mainView_DoubleClick);
+            this.refresh.Interval = 15000;
+            this.refresh.Tick += new System.EventHandler(this.refresh_Tick);
             // 
-            // WinClassicWindowsExplorer
+            // Win95WindowsExplorer
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.program);
-            this.Name = "WinClassicWindowsExplorer";
+            this.Name = "Win95WindowsExplorer";
             this.Size = new System.Drawing.Size(704, 517);
             this.Load += new System.EventHandler(this.WinClassicWindowsExplorer_Load);
             this.program.ResumeLayout(false);
@@ -573,40 +372,14 @@
         internal System.Windows.Forms.ToolStripMenuItem BitmapImageToolStripMenuItem;
         internal System.Windows.Forms.ToolStripMenuItem DeleteToolStripMenuItem;
         internal System.Windows.Forms.ToolStripMenuItem RenameToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem PropertiesToolStripMenuItem;
         internal System.Windows.Forms.ToolStripMenuItem CloseToolStripMenuItem;
         internal System.Windows.Forms.ToolStripMenuItem EditToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem UndoCtrlZToolStripMenuItem;
         internal System.Windows.Forms.ToolStripMenuItem CutCtrlXToolStripMenuItem;
         internal System.Windows.Forms.ToolStripMenuItem CopyCtrlCToolStripMenuItem;
         internal System.Windows.Forms.ToolStripMenuItem PasteToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem PasteShortcutToolStripMenuItem;
         internal System.Windows.Forms.ToolStripMenuItem SellectAllCtrlAToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem InvertSelectionToolStripMenuItem;
         internal System.Windows.Forms.ToolStripMenuItem ViewToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem ToolbarToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem StatusBarToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem LargeIconsToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem SmallIconsToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem ListToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem DetailsToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem ArrangeIconsToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem ByDriveLetterToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem ByTypeToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem BySizeToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem ByFreeSpaceToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem LineUpIconsToolStripMenuItem;
         internal System.Windows.Forms.ToolStripMenuItem RefreshToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem OptionsToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem ToolsToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem FindToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem FilesOrFoldersToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem ComputerToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem OnTheInternetToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem PeopleToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem MapNetworkDriveToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem DisconnectNetworkDriveToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem GoToToolStripMenuItem;
         internal System.Windows.Forms.ToolStripMenuItem HelpToolStripMenuItem;
         internal System.Windows.Forms.ToolStripMenuItem HelpToolStripMenuItem1;
         internal System.Windows.Forms.ToolStripMenuItem AboutWindows95ToolStripMenuItem;
@@ -619,5 +392,6 @@
         internal System.Windows.Forms.Button Button1;
         internal System.Windows.Forms.Label Label1;
         internal System.Windows.Forms.TextBox txtSave;
+        private System.Windows.Forms.Timer refresh;
     }
 }
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/Win95WindowsExplorer.cs
index 98dc4ff..44cf08f 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/Win95WindowsExplorer.cs
@@ -11,39 +11,78 @@ using static TimeHACK.Engine.SaveSystem;
 using System.IO;
 using TimeHACK.Engine;
 using Newtonsoft.Json;
+using TimeHACK.Engine.Template;
 
 namespace TimeHACK.OS.Win95.Win95Apps
 {
-    public partial class WinClassicWindowsExplorer : UserControl
+    public partial class Win95WindowsExplorer : UserControl
     {
         public bool IsFileOpenDialog = false;
         public bool IsFileSaveDialog = false;
         public string onlyViewExtension = "";
 
         string ToReplaceWith = ProfileDirectory;
-        string currentDirectory = Path.Combine(ProfileDirectory, "folders/computer");
-        string oldLabelText;
+        string CurrentDirectory = ProfileMyComputerDirectory;
+        string OldLabelText;
+        string CurrentCopyFile;
+
         int fileType = 6;
-        string attemptedDirectory = "";
+        //string attemptedDirectory = "";
         WindowManager wm = new WindowManager();
 
-        public WinClassicWindowsExplorer()
+        public Win95WindowsExplorer()
         {
             InitializeComponent();
         }
 
-        //'Private Sub TreeView1_AfterSelect(ByVal sender As System.Object, ByVal e As System.Windows.Forms.TreeViewEventArgs)
-        //'    mainView.Items.Clear()
-        //'    Dim childamount As TreeNodeCollection
-        //'    childamount = TreeView1.SelectedNode.Nodes
-        //'    lblamountofobjects.Text = (childamount.Count & " objects(s)")
-        //'    For Each TreeNode In TreeView1.SelectedNode.Nodes
-        //'        If TreeNode.tag = "file" Then
-        //'            TreeNode.forecolor = TreeView1.BackColor
-        //'        End If
-        //'        mainView.Items.Add(TreeNode.text)
-        //'    Next
-        //'End Sub
+        void WinClassicWindowsExplorer_Load(object sender, EventArgs e)
+        {
+            diskView.ImageList = new ImageList();
+
+            diskView.ImageList.Images.Add(Properties.Resources.Win95DesktopIcon);
+            diskView.ImageList.Images.Add(Properties.Resources.Win95HardDiskIcon);
+            diskView.ImageList.Images.Add(Properties.Resources.WinClassicFolderSmall);
+            diskView.ImageList.Images.Add(Properties.Resources.WinClassicOpenFolderSmall);
+            diskView.ImageList.Images.Add(Properties.Resources.Win95ControlPanelIcon);
+            diskView.ImageList.Images.Add(Properties.Resources.Win95PrintersFolder);
+            diskView.ImageList.Images.Add(Properties.Resources.Win95ComputerIcon);
+            diskView.ImageList.Images.Add(Properties.Resources.Win95NetworkIcon);
+            diskView.ImageList.Images.Add(Properties.Resources.Win95RecycleIcon);
+
+            program.BringToFront();
+
+
+            //diskView.Items.Add("My Computer", 0);
+            Application.DoEvents();
+
+            RefreshAll();
+            RefreshTreeNode();
+
+            if (FileDialogBoxManager.IsInOpenDialog)
+            {
+                IsFileOpenDialog = true;
+            }
+            else if (FileDialogBoxManager.IsInSaveDialog)
+            {
+                IsFileSaveDialog = true;
+            }
+
+            if (IsFileOpenDialog == true)
+            {
+                pnlSave.Show();
+                Button1.Text = "Open";
+            }
+            else
+            {
+                if (IsFileSaveDialog == true)
+                {
+                    pnlSave.Show();
+                    Button1.Text = "Save";
+                }
+            }
+
+            onlyViewExtension = FileDialogBoxManager.OnlyViewExtension;
+        }
 
         string ReadDataFile(string reqDirectory, bool returnYesIfProtected = false) {
             string Val = "";
@@ -68,49 +107,40 @@ namespace TimeHACK.OS.Win95.Win95Apps
 
         void RefreshAll() {
             try {
-                // Refresh the right listview
                 this.mainView.Items.Clear();
-                // For Each drive As string In My.Computer.FileSystem.GetDirectories(GameMain.MyDocuments & "\HistacomVB\" & GameMain.SaveProfile & "\HistacomVB\Folders")
-                //    If GetPropetiesForDir(drive)(4) = "isMyDocuments" Then
-                //        diskView.Items.Add("", 0)
-                //    End If
-                //Next
-                foreach (string str in Directory.GetDirectories(currentDirectory))
+
+                foreach (string str in Directory.GetDirectories(CurrentDirectory))
                 {
                     string label = ReadDataFile(str, false);
-                    if (label == "")
-                    {
-                        this.mainView.Items.Add(Path.GetFileName(str));
-                        this.mainView.FindItemWithText(Path.GetFileName(str)).Tag = Path.GetFileName(str);
-                    } else {
-                        this.mainView.Items.Add(label, 1).ImageIndex = 1;
-                        this.mainView.FindItemWithText(label).Tag = Path.GetFileName(str);
-                    }
+                    ListViewItem itm = this.mainView.Items.Add(label ?? Path.GetFileName(str));
+                    itm.ImageKey = str;
                 }
-                foreach (string str in Directory.GetFiles(currentDirectory))
+                foreach (string str in Directory.GetFiles(CurrentDirectory))
                 {
-                    // Get app Icon
+                    // Get the app Icon
 
-                    int AppIcon = 2;
+                    //int AppIcon = 2;
 
-                    switch (new FileInfo(str).Extension)
-                    {
-                        case ".exe":
-                            string contents;
+                    //switch (new FileInfo(str).Extension)
+                    //{
+                    //    case ".exe":
+                    //        string contents;
+
+                    //        contents = File.ReadAllText(str);
+
+                    //        switch (contents.ToLower())
+                    //        {
+                    //            case "calc":
+                    //                AppIcon = 3;
+                    //                break;
+                    //            case "explorer":
+                    //                AppIcon = 4;
+                    //                break;
+                    //        }
+                    //        break;
+                    //}
 
-                            contents = File.ReadAllText(str);
 
-                            switch (contents.ToLower())
-                            {
-                                case "calculator":
-                                    AppIcon = 3;
-                                    break;
-                                case "windowsexplorer":
-                                    AppIcon = 4;
-                                    break;
-                            }
-                            break;
-                    }
 
                     if (IsFileOpenDialog == true || IsFileSaveDialog == true)
                     {
@@ -118,12 +148,14 @@ namespace TimeHACK.OS.Win95.Win95Apps
                         {
                             if (new FileInfo(str).Extension == onlyViewExtension)
                             {
-                                this.mainView.Items.Add(Path.GetFileName(str), AppIcon);                               
+                                ListViewItem itm = this.mainView.Items.Add(Path.GetFileName(str));
+                                itm.Tag = str;
                             }
                         }
                     } else {
                         if (!(Path.GetFileName(str) == "_data.info")) {
-                            this.mainView.Items.Add(Path.GetFileName(str), AppIcon);
+                            ListViewItem itm = this.mainView.Items.Add(Path.GetFileName(str));
+                            itm.Tag = str;
                         }
                     }
                 }
@@ -133,6 +165,103 @@ namespace TimeHACK.OS.Win95.Win95Apps
             }
         }
 
+        void RefreshTreeNode()
+        {
+            // Refresh the TreeView
+
+            diskView.Nodes.Clear();
+            int loc = 0;
+            TreeNode[] folders = new TreeNode[new DirectoryInfo(ProfileMyComputerDirectory).GetDirectories().Length];
+            foreach (DirectoryInfo folder in new DirectoryInfo(ProfileMyComputerDirectory).GetDirectories())
+            {
+                if (folder.GetDirectories().Length > 0)
+                {
+                    string label = ReadDataFile(folder.FullName, false);
+                    TreeNode[] tn = createSubDirNodes(folder);
+                    folders[loc] = new TreeNode(label ?? folder.Name, 2, 3, tn);
+                    folders[loc].Tag = folder.FullName;
+                }
+                else
+                {
+                    string label = ReadDataFile(folder.FullName, false);
+                    folders[loc] = new TreeNode(label ?? folder.Name, 2, 3);
+                    folders[loc].Tag = folder.FullName;
+                }
+                loc++;
+            }
+            TreeNode[] mypcarray = new TreeNode[3];
+            mypcarray[0] = new TreeNode("(C:)", 1, 1, folders);
+            mypcarray[1] = new TreeNode("Control Panel", 4, 4);
+            mypcarray[2] = new TreeNode("Printers", 5, 5);
+            TreeNode[] desktoparray = new TreeNode[3];
+            desktoparray[0] = new TreeNode("My Computer", 6, 6, mypcarray);
+            desktoparray[1] = new TreeNode("Network Neighborhood", 7, 7);
+            desktoparray[2] = new TreeNode("Recycle Bin", 8, 8);
+            diskView.Nodes.Add(new TreeNode("Desktop", 0, 0, desktoparray));
+        }
+
+        void OpenFile(string fileDir)
+        {
+            try
+            {
+                ReturnType(new FileInfo(fileDir).Extension);
+                switch (fileType)
+                {
+                    case 1:
+                        WinClassicNotepad np = new WinClassicNotepad();
+                        np.mainText.Text = FileDialogBoxManager.ReadTextFile(fileDir);
+                        WinClassic app = wm.StartWin95(np, "Notepad", Properties.Resources.Win95IconNotepad, true, true);
+
+                        Program.AddTaskbarItem(app, app.Tag.ToString(), "Notepad", Properties.Resources.Win95IconNotepad);
+
+                        break;
+                    case 12:
+                        OpenApplication(FileDialogBoxManager.ReadTextFile(fileDir));
+                        break;
+                }
+            } catch {
+            }
+            
+        }
+
+        void OpenApplication(string appname)
+        {
+            switch (appname.ToLower())
+            {               
+                case "explorer":
+                    Engine.Template.WinClassic app = wm.StartWin95(new Win95WindowsExplorer(), "Windows Explorer", Properties.Resources.WinClassicFileExplorer, true, true);
+                    Program.AddTaskbarItem(app, app.Tag.ToString(), "Windows Explorer", Properties.Resources.WinClassicFileExplorer);
+                    break;
+                case "calc":
+                    Engine.Template.WinClassic appCalc = wm.StartWin95(new WinClassicCalculator(), "Calculator", Properties.Resources.WinClassicCalc, true, true);
+                    Program.AddTaskbarItem(appCalc, appCalc.Tag.ToString(), "Calculator", Properties.Resources.WinClassicCalc);
+
+                    Program.nonimportantapps.Add(appCalc);
+                    Program.nonimportantapps[Program.nonimportantapps.Count - 1].BringToFront();
+                    Program.nonimportantapps[Program.nonimportantapps.Count - 1].FormClosing += new FormClosingEventHandler(Program.NonImportantApp_Closing);
+
+                    break;
+                case "wordpad":
+                    Engine.Template.WinClassic appWP = wm.StartWin95(new WinClassicWordPad(), "Wordpad", Properties.Resources.WinClassicWordpad, true, true);
+                    Program.AddTaskbarItem(appWP, appWP.Tag.ToString(), "Wordpad", Properties.Resources.WinClassicWordpad);
+
+                    Program.nonimportantapps.Add(appWP);
+                    Program.nonimportantapps[Program.nonimportantapps.Count - 1].BringToFront();
+                    Program.nonimportantapps[Program.nonimportantapps.Count - 1].FormClosing += new FormClosingEventHandler(Program.NonImportantApp_Closing);
+
+                    break;
+                case "addressbook":
+                    WinClassic appAdBk = wm.StartWin95(new WinClassicAddressBook(), "Address Book", Properties.Resources.WinClassicAddressBook, true, true);
+                    Program.AddTaskbarItem(appAdBk, appAdBk.Tag.ToString(), "Address Book", Properties.Resources.WinClassicAddressBook);
+
+                    Program.nonimportantapps.Add(appAdBk);
+                    Program.nonimportantapps[Program.nonimportantapps.Count - 1].BringToFront();
+                    Program.nonimportantapps[Program.nonimportantapps.Count - 1].FormClosing += new FormClosingEventHandler(Program.NonImportantApp_Closing);
+
+                    break;
+            }
+            }
+
         string ReturnType(string extension) {
             string returnVal = "";
             fileType = 1;
@@ -157,6 +286,10 @@ namespace TimeHACK.OS.Win95.Win95Apps
                     fileType = 1;
                     returnVal = "log text file \n createtext";
                     break;
+                case ".ini":
+                    fileType = 1;
+                    returnVal = "initialization \n createtext";
+                    break;
                 case ".properties":
                     fileType = 1;
                     returnVal = "Config file \n createtext";
@@ -167,10 +300,6 @@ namespace TimeHACK.OS.Win95.Win95Apps
                     break;
                 case ".doc":
                     fileType = 3;
-                    returnVal = "Word Document (Old) \n word";
-                    break;
-                case ".docx":
-                    fileType = 3;
                     returnVal = "Word Document \n word";
                     break;
                 case ".docm":
@@ -179,18 +308,10 @@ namespace TimeHACK.OS.Win95.Win95Apps
                     break;
                 case ".xls":
                     fileType = 4;
-                    returnVal = "Excel Spreadsheets (Old) \n excel";
-                    break;
-                case ".xlsx":
-                    fileType = 4;
                     returnVal = "Excel Spreadsheets \n excel";
                     break;
                 case ".ppt":
                     fileType = 5;
-                    returnVal = "Powerpoint Presentation (Old) \n powerpoint";
-                    break;
-                case ".pptx":
-                    fileType = 5;
                     returnVal = "Powerpoint Presentation \n powerpoint";
                     break;
                 case ".pub":
@@ -428,86 +549,37 @@ namespace TimeHACK.OS.Win95.Win95Apps
     //Private Sub windows_explorer_Closed(sender As Object, e As EventArgs) Handles Me.Closed
     //    IsFileDialog = False
     //End Sub
-        void WinClassicWindowsExplorer_Load(object sender, EventArgs e) {
-            diskView.ImageList.Images.Add(Properties.Resources.Win95DesktopIcon);
-            diskView.ImageList.Images.Add(Properties.Resources.Win95HardDiskIcon);
-            diskView.ImageList.Images.Add(Properties.Resources.WinClassicFolderSmall);
-            diskView.ImageList.Images.Add(Properties.Resources.WinClassicOpenFolderSmall);
-            diskView.ImageList.Images.Add(Properties.Resources.Win95ControlPanelIcon);
-            diskView.ImageList.Images.Add(Properties.Resources.Win95PrintersFolder);
-            diskView.ImageList.Images.Add(Properties.Resources.Win95ComputerIcon);
-            diskView.ImageList.Images.Add(Properties.Resources.Win95NetworkIcon);
-            diskView.ImageList.Images.Add(Properties.Resources.Win95RecycleIcon);
-            program.BringToFront();
-            int loc = 0;
-            TreeNode[] folders = new TreeNode[new DirectoryInfo(currentDirectory).GetDirectories().Length];
-            foreach (DirectoryInfo folder in new DirectoryInfo(currentDirectory).GetDirectories())
-            {
-                if (folder.GetDirectories().Length > 0)
-                {
-                    TreeNode[] tn = createSubDirNodes(folder);
-                    folders[loc] = new TreeNode(folder.Name, 2, 3, tn);
-                }
-                else
-                {
-                    folders[loc] = new TreeNode(folder.Name, 2, 3);
-                }
-                loc++;
-            }
-            TreeNode[] mypcarray = new TreeNode[3];
-            mypcarray[0] = new TreeNode("(C:)", 1, 1, folders);
-            mypcarray[1] = new TreeNode("Control Panel", 4, 4);
-            mypcarray[2] = new TreeNode("Printers", 5, 5);
-            TreeNode[] desktoparray = new TreeNode[3];
-            desktoparray[0] = new TreeNode("My Computer", 6, 6, mypcarray);
-            desktoparray[1] = new TreeNode("Network Neighborhood", 7, 7);
-            desktoparray[2] = new TreeNode("Recycle Bin", 8, 8);
-            diskView.Nodes.Add(new TreeNode("Desktop", 0, 0, desktoparray));
-            //diskView.Items.Add("My Computer", 0);
-            Application.DoEvents();
-            RefreshAll();
-            if (FileDialogBoxManager.IsInOpenDialog)
-            {
-                IsFileOpenDialog = true;
-            } else if (FileDialogBoxManager.IsInSaveDialog) {
-                IsFileSaveDialog = true;
-            }
-
-            if (IsFileOpenDialog == true)
-            {
-                pnlSave.Show();
-                Button1.Text = "Open";
-            } else {
-                if (IsFileSaveDialog == true)
-                {
-                    pnlSave.Show();
-                    Button1.Text = "Save";
-                }       
-            }
-
-            onlyViewExtension = FileDialogBoxManager.OnlyViewExtension;
-        }
 
         void mainView_DoubleClick(object sender, EventArgs e)
         {
             try
             {
-                if ((string)mainView.FocusedItem.Tag != "") { // If it isn't a file
-                    GoToDir(currentDirectory + "\\" + mainView.FocusedItem.Tag);
-                } else { // If it is a file
-                    if (new FileInfo(Path.Combine(currentDirectory, txtSave.Text)).Extension == onlyViewExtension)
-                    {
-                        Program.WindowsExplorerReturnPath = currentDirectory + "\\" + txtSave.Text;
-                    }
+                if (mainView.FocusedItem.Tag == null)
+                { // If it isn't a file
+                    GoToDir(Path.Combine(CurrentDirectory, mainView.FocusedItem.ImageKey.ToString()));
+                }
+                else
+                { // If it is a file
+                        if (IsFileOpenDialog == true || IsFileSaveDialog == true)
+                        {
+                            if (new FileInfo(Path.Combine(CurrentDirectory, txtSave.Text)).Extension == onlyViewExtension)
+                            {
+                                Program.WindowsExplorerReturnPath = Path.Combine(CurrentDirectory, txtSave.Text);
+                            }
 
 
-                    FileDialogBoxManager.IsInOpenDialog = false;
-                    FileDialogBoxManager.IsInSaveDialog = false;
+                            FileDialogBoxManager.IsInOpenDialog = false;
+                            FileDialogBoxManager.IsInSaveDialog = false;
 
-                    ((Form)this.TopLevelControl).Close();
+                            ((Form)this.TopLevelControl).Close();
+                        }
+                        else
+                        {
+                            OpenFile(mainView.FocusedItem.Tag.ToString());
+                        }
                 }
-            } catch {
-
+            } catch (Exception ex) {
+                MessageBox.Show(ex.Message);
             }
         }
 
@@ -515,10 +587,30 @@ namespace TimeHACK.OS.Win95.Win95Apps
         {
             try
             {
-                if (diskView.SelectedNode.Text == "My Computer") {
-                    GoToDir(ProfileFileSystemDirectory);
-                }
+                if (diskView.SelectedNode != null)
+                {
+                    if (diskView.SelectedNode.Text == "My Computer")
+                    {
+                        GoToDir(ProfileFileSystemDirectory);
+                    }
+                    else if (diskView.SelectedNode.Text == "(C:)")
+                    {
+                        GoToDir(ProfileMyComputerDirectory);
+                    }
+                    else
+                    {
+                        if (diskView.SelectedNode.Tag != null)
+                        {
+                            // It is a directory:
 
+                            try
+                            {
+                                GoToDir(diskView.SelectedNode.Tag.ToString());
+                            }
+                            catch { }
+                        }
+                    }
+                }
             } catch {
             }
         }
@@ -527,20 +619,25 @@ namespace TimeHACK.OS.Win95.Win95Apps
         {
             mainView.Show();
             mainView.BringToFront();
-            currentDirectory = dir;
+            CurrentDirectory = dir;
             RefreshAll();
         }
 
         private void FolderToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            if (File.Exists(currentDirectory + "\\New Folder")) {
+            if (File.Exists(CurrentDirectory + "\\New Folder"))
+            {
                 wm.StartInfobox95("Windows Explorer", "This directory already exists", Properties.Resources.Win95Info);
-            } else {
-                Directory.CreateDirectory(currentDirectory + "\\New Folder");
-                SaveDirectoryInfo(currentDirectory + "\\New Folder", false, "New Folder", true);
-                
+            }
+            else
+            {
+                Directory.CreateDirectory(Path.Combine(CurrentDirectory, "New Folder"));
+                SaveDirectoryInfo(Path.Combine(CurrentDirectory, "New Folder"), false, "New Folder", true);
+
                 RefreshAll();
             }
+
+            RefreshTreeNode();
         }
 
         private void Button1_Click(object sender, EventArgs e)
@@ -550,9 +647,9 @@ namespace TimeHACK.OS.Win95.Win95Apps
                 bool OpenFile = false;
                 if (mainView.FocusedItem != null)
                 {
-                    if ((string)mainView.FocusedItem.Tag != "")
+                    if (mainView.FocusedItem.Tag.ToString() == "")
                     { // If it isn't a file
-                        GoToDir(currentDirectory + "\\" + mainView.FocusedItem.Tag);
+                        GoToDir(Path.Combine(CurrentDirectory, mainView.FocusedItem.Tag.ToString()));
                     }
                     else OpenFile = true; // If it is a file
                 }
@@ -565,10 +662,10 @@ namespace TimeHACK.OS.Win95.Win95Apps
                     }
                     else
                     {
-                        if (new FileInfo(currentDirectory + "\\" + txtSave.Text).Extension == onlyViewExtension)
+                        if (new FileInfo(Path.Combine(CurrentDirectory, txtSave.Text)).Extension == onlyViewExtension)
                         {
 
-                            Program.WindowsExplorerReturnPath = currentDirectory + "\\" + txtSave.Text;
+                            Program.WindowsExplorerReturnPath = Path.Combine(CurrentDirectory, txtSave.Text);
 
                         }
 
@@ -588,21 +685,28 @@ namespace TimeHACK.OS.Win95.Win95Apps
         {
             try
             {
-                if (!File.Exists(Path.Combine(currentDirectory, mainView.FocusedItem.Text)))
+                if (!FileOrDirectoryExists(Path.Combine(CurrentDirectory, mainView.FocusedItem.Text)))
                 {
                     wm.StartInfobox95("Windows Explorer", "This directory doesn't exist", Properties.Resources.Win95Info);
                 }
                 else
                 {
-                    Directory.Delete(currentDirectory + mainView.FocusedItem.Text, true);
+                    if (Directory.Exists(Path.Combine(CurrentDirectory, mainView.FocusedItem.Text))) Directory.Delete(Path.Combine(CurrentDirectory, mainView.FocusedItem.Text), true);
+                        else File.Delete(Path.Combine(CurrentDirectory, mainView.FocusedItem.Text));
 
                     RefreshAll();
                 }
             } catch
             {
-
+                RefreshAll();
             }
-            
+
+            RefreshTreeNode();
+        }
+
+        internal static bool FileOrDirectoryExists(string path)
+        {
+             return (Directory.Exists(path) || File.Exists(path));
         }
 
         private void CloseToolStripMenuItem_Click(object sender, EventArgs e)
@@ -620,7 +724,7 @@ namespace TimeHACK.OS.Win95.Win95Apps
             try
             {
                 // The AfterLabelEdit event will kick in after this
-                oldLabelText = mainView.FocusedItem.Text;
+                OldLabelText = mainView.FocusedItem.Text;
                 mainView.LabelEdit = true;
                 mainView.FocusedItem.BeginEdit();
             } catch
@@ -632,25 +736,55 @@ namespace TimeHACK.OS.Win95.Win95Apps
         private void mainView_AfterLabelEdit(object sender, LabelEditEventArgs e)
         {
 
-            string setText;
-            setText = mainView.FocusedItem.Text;
-            if (setText == "")
-            {
-                wm.StartInfobox95("Windows Explorer", "Please enter a new directory name", Properties.Resources.Win95Info);
-            }
-            else
+            try
             {
-                if (Directory.Exists(setText))
+                string setText;
+                setText = e.Label;
+                if (setText == "")
                 {
-                    wm.StartInfobox95("Windows Explorer", "That directory already exists.", Properties.Resources.Win95Info);
+                    wm.StartInfobox95("Windows Explorer", "Please enter a new directory name", Properties.Resources.Win95Info);
                 }
                 else
                 {
-                    Directory.Delete(Path.Combine(currentDirectory, oldLabelText), true);
-                    Directory.CreateDirectory(Path.Combine(currentDirectory, setText));
+                    if (Directory.Exists(setText))
+                    {
+                        wm.StartInfobox95("Windows Explorer", "That directory already exists.", Properties.Resources.Win95Info);
+                    }
+                    else
+                    {
+                        if (File.Exists(setText))
+                        {
+                            wm.StartInfobox95("Windows Explorer", "That file already exists.", Properties.Resources.Win95Info);
+                        }
+                        else
+                        {
+                            if (Directory.Exists(mainView.FocusedItem.ImageKey))
+                            {
+                                // It was a directory
+
+                                Directory.Move(mainView.FocusedItem.ImageKey, Path.Combine(CurrentDirectory, setText));
+
+                                File.Delete(Path.Combine(CurrentDirectory, setText, "_data.info"));
+
+                                SaveDirectoryInfo(Path.Combine(CurrentDirectory, setText), false, $"{setText}", true);
+                            }
+                            else
+                            {
+                                // It was a file
+
+                                File.Copy(mainView.FocusedItem.ImageKey, Path.Combine(CurrentDirectory, setText));
+                                File.Delete(mainView.FocusedItem.ImageKey);
+                            }
+                        }
+
+                    }
                 }
+                RefreshAll();
+                RefreshTreeNode();
+            }
+            catch
+            {
             }
-            RefreshAll();
         }
 
         private TreeNode[] createSubDirNodes(DirectoryInfo folder)
@@ -661,16 +795,165 @@ namespace TimeHACK.OS.Win95.Win95Apps
             {
                 if (fold.GetDirectories().Length > 0)
                 {
+                    string label = ReadDataFile(fold.FullName, false);
                     TreeNode[] tn = createSubDirNodes(fold);
-                    toReturn[loc] = new TreeNode(fold.Name, 2, 3, tn);
+                    toReturn[loc] = new TreeNode(label ?? fold.Name, 2, 3, tn);
+                    toReturn[loc].Tag = fold.FullName;
                 }
                 else
                 {
-                    toReturn[loc] = new TreeNode(fold.Name, 2, 3);
+                    string label = ReadDataFile(fold.FullName, false);
+                    toReturn[loc] = new TreeNode(label ?? fold.Name, 2, 3);
+                    toReturn[loc].Tag = fold.FullName;
                 }
                 loc++;
             }
             return toReturn;
         }
+
+        private void RefreshToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            RefreshAll();
+        }
+
+        private void CutCtrlXToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                if (mainView.FocusedItem != null && mainView.FocusedItem.ImageKey != "")
+                {
+
+                    // It is a directory
+                    string oldLocation;
+                    oldLocation = mainView.FocusedItem.ImageKey;
+
+                    CurrentCopyFile = Path.Combine(GameDirectory, "Data", Path.GetFileName(mainView.FocusedItem.ImageKey));
+
+                    if (Directory.Exists(CurrentCopyFile)) Directory.Delete(CurrentCopyFile);
+                    if (File.Exists(CurrentCopyFile)) File.Delete(CurrentCopyFile);
+
+                    Directory.Move(mainView.FocusedItem.ImageKey, Path.Combine(GameDirectory, "Data", Path.GetDirectoryName(mainView.FocusedItem.ImageKey)));
+
+
+                    DirectoryCopy(CurrentCopyFile, oldLocation, true);
+                }
+                else if (mainView.FocusedItem != null)
+                {
+                    // It is a file
+
+                    CurrentCopyFile = Path.Combine(GameDirectory, "Data", Path.GetFileName(mainView.FocusedItem.Tag.ToString()));
+
+                    if (Directory.Exists(CurrentCopyFile)) Directory.Delete(CurrentCopyFile);
+                    if (File.Exists(CurrentCopyFile)) File.Delete(CurrentCopyFile);
+
+                    File.Move(mainView.FocusedItem.Tag.ToString(), Path.Combine(GameDirectory, "Data", Path.GetFileName(mainView.FocusedItem.Tag.ToString())));
+
+
+                }
+                RefreshAll();
+            }
+            catch
+            {
+            }
+        }
+
+        private void CopyCtrlCToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                if (mainView.FocusedItem != null && mainView.FocusedItem.ImageKey != "")
+                {
+                    // It is a directory
+                    string oldLocation;
+                    oldLocation = mainView.FocusedItem.ImageKey;
+                    CurrentCopyFile = Path.Combine(GameDirectory, "Data", Path.GetFileName(mainView.FocusedItem.ImageKey));
+
+                    if (Directory.Exists(CurrentCopyFile)) Directory.Delete(CurrentCopyFile);
+                    if (File.Exists(CurrentCopyFile)) File.Delete(CurrentCopyFile);
+
+                    DirectoryCopy(CurrentCopyFile, oldLocation, true);
+                }
+                else if (mainView.FocusedItem != null)
+                {
+                    // It is a file
+
+                    CurrentCopyFile = Path.Combine(GameDirectory, "Data", Path.GetFileName(mainView.FocusedItem.Tag.ToString()));
+
+                    if (Directory.Exists(CurrentCopyFile)) Directory.Delete(CurrentCopyFile);
+                    if (File.Exists(CurrentCopyFile)) File.Delete(CurrentCopyFile);
+
+                    File.Copy(mainView.FocusedItem.Tag.ToString(), Path.Combine(GameDirectory, "Data", Path.GetFileName(mainView.FocusedItem.Tag.ToString())));
+
+                }
+                RefreshAll();
+            }
+            catch
+            {
+            }
+        }
+
+        private void PasteToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            if (Directory.Exists(CurrentCopyFile))
+            {
+                // It is a directory
+
+                DirectoryCopy(CurrentCopyFile, CurrentDirectory, true);
+            }
+            else if (File.Exists(CurrentCopyFile))
+            {
+                // It is a file
+
+                File.Copy(CurrentCopyFile, Path.Combine(CurrentDirectory, Path.GetFileName(CurrentCopyFile)));
+            }
+            RefreshAll();
+        }
+
+        private static void DirectoryCopy(string sourceDirName, string destDirName, bool copySubDirs)
+        {
+            // Get the subdirectories for the specified directory.
+            DirectoryInfo dir = new DirectoryInfo(sourceDirName);
+
+            if (dir.Exists)
+            {
+                DirectoryInfo[] dirs = dir.GetDirectories();
+                // If the destination directory doesn't exist, create it.
+                if (!Directory.Exists(destDirName))
+                {
+                    Directory.CreateDirectory(destDirName);
+                }
+
+                // Get the files in the directory and copy them to the new location.
+                FileInfo[] files = dir.GetFiles();
+                foreach (FileInfo file in files)
+                {
+                    string temppath = Path.Combine(destDirName, file.Name);
+                    file.CopyTo(temppath, false);
+                }
+
+                // If copying subdirectories, copy them and their contents to new location.
+                if (copySubDirs)
+                {
+                    foreach (DirectoryInfo subdir in dirs)
+                    {
+                        string temppath = Path.Combine(destDirName, subdir.Name);
+                        DirectoryCopy(subdir.FullName, temppath, copySubDirs);
+                    }
+                }
+            }
+        }
+
+        private void refresh_Tick(object sender, EventArgs e)
+        {
+            RefreshAll();
+        }
+
+        private void SellectAllCtrlAToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            foreach (ListViewItem item in mainView.Items)
+            {
+                item.Selected = true;
+            }
+        }
     }
 }
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/WinClassicAddressBook.resx b/TimeHACK.Main/OS/Win95/Win95Apps/Win95WindowsExplorer.resx
index e1c367e..e423ac1 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/WinClassicAddressBook.resx
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/Win95WindowsExplorer.resx
@@ -117,10 +117,13 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="topmenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="MenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <metadata name="newContext.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>118, 17</value>
+  <metadata name="MenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="refresh.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>132, 17</value>
   </metadata>
 </root>
\ No newline at end of file
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.Designer.cs
index 7e4c69f..bd614eb 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.Designer.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.Designer.cs
@@ -93,7 +93,7 @@
             this.newToolStripMenuItem.BackgroundImage = global::TimeHACK.Properties.Resources.sliversilver;
             this.newToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
             this.newToolStripMenuItem.Name = "newToolStripMenuItem";
-            this.newToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.newToolStripMenuItem.Size = new System.Drawing.Size(142, 22);
             this.newToolStripMenuItem.Text = "New";
             // 
             // openToolStripMenuItem
@@ -102,7 +102,7 @@
             this.openToolStripMenuItem.BackgroundImage = global::TimeHACK.Properties.Resources.sliversilver;
             this.openToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
             this.openToolStripMenuItem.Name = "openToolStripMenuItem";
-            this.openToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.openToolStripMenuItem.Size = new System.Drawing.Size(142, 22);
             this.openToolStripMenuItem.Text = "Open...";
             this.openToolStripMenuItem.Click += new System.EventHandler(this.openToolStripMenuItem_Click);
             // 
@@ -112,7 +112,7 @@
             this.saveToolStripMenuItem.BackgroundImage = global::TimeHACK.Properties.Resources.sliversilver;
             this.saveToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
             this.saveToolStripMenuItem.Name = "saveToolStripMenuItem";
-            this.saveToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.saveToolStripMenuItem.Size = new System.Drawing.Size(142, 22);
             this.saveToolStripMenuItem.Text = "Save";
             this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click);
             // 
@@ -122,7 +122,7 @@
             this.saveAsToolStripMenuItem.BackgroundImage = global::TimeHACK.Properties.Resources.sliversilver;
             this.saveAsToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
             this.saveAsToolStripMenuItem.Name = "saveAsToolStripMenuItem";
-            this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(142, 22);
             this.saveAsToolStripMenuItem.Text = "Save As...";
             // 
             // pageSetupToolStripMenuItem
@@ -131,7 +131,7 @@
             this.pageSetupToolStripMenuItem.BackgroundImage = global::TimeHACK.Properties.Resources.sliversilver;
             this.pageSetupToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
             this.pageSetupToolStripMenuItem.Name = "pageSetupToolStripMenuItem";
-            this.pageSetupToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.pageSetupToolStripMenuItem.Size = new System.Drawing.Size(142, 22);
             this.pageSetupToolStripMenuItem.Text = "Page Setup...";
             // 
             // printToolStripMenuItem
@@ -140,7 +140,7 @@
             this.printToolStripMenuItem.BackgroundImage = global::TimeHACK.Properties.Resources.sliversilver;
             this.printToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
             this.printToolStripMenuItem.Name = "printToolStripMenuItem";
-            this.printToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.printToolStripMenuItem.Size = new System.Drawing.Size(142, 22);
             this.printToolStripMenuItem.Text = "Print";
             // 
             // exitToolStripMenuItem
@@ -149,7 +149,7 @@
             this.exitToolStripMenuItem.BackgroundImage = global::TimeHACK.Properties.Resources.sliversilver;
             this.exitToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
             this.exitToolStripMenuItem.Name = "exitToolStripMenuItem";
-            this.exitToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.exitToolStripMenuItem.Size = new System.Drawing.Size(142, 22);
             this.exitToolStripMenuItem.Text = "Exit";
             this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click);
             // 
@@ -357,7 +357,7 @@
         private System.Windows.Forms.ToolStripMenuItem printToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem exitToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem editToolStripMenuItem;
-        private System.Windows.Forms.TextBox mainText;
+        public System.Windows.Forms.TextBox mainText;
         private System.Windows.Forms.ToolStripMenuItem undoToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem cutToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem copyToolStripMenuItem;
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.cs
index db49c53..3117d9c 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.cs
@@ -111,7 +111,6 @@ namespace TimeHACK.OS.Win95.Win95Apps
                 ActivateSaveFileDialog(".txt");
                 string selectedPath = Program.OpenFileExplorerAsDialogAndReturnGivenPath();
 
-                MessageBox.Show(selectedPath);
                 if (selectedPath != "")
                 {
                     File.WriteAllText(selectedPath, mainText.Text);
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.resx b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.resx
deleted file mode 100644
index 8ebe617..0000000
--- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.resx
+++ /dev/null
@@ -1,245 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="icons.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>312, 18</value>
-  </metadata>
-  <data name="icons.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
-        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
-        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADG
-        CwAAAk1TRnQBSQFMAgEBBQEAATgBAAE4AQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
-        AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
-        AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
-        AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
-        AWYDAAGZAwABzAIAATMDAAIzAgABMwFmAgABMwGZAgABMwHMAgABMwH/AgABZgMAAWYBMwIAAmYCAAFm
-        AZkCAAFmAcwCAAFmAf8CAAGZAwABmQEzAgABmQFmAgACmQIAAZkBzAIAAZkB/wIAAcwDAAHMATMCAAHM
-        AWYCAAHMAZkCAALMAgABzAH/AgAB/wFmAgAB/wGZAgAB/wHMAQABMwH/AgAB/wEAATMBAAEzAQABZgEA
-        ATMBAAGZAQABMwEAAcwBAAEzAQAB/wEAAf8BMwIAAzMBAAIzAWYBAAIzAZkBAAIzAcwBAAIzAf8BAAEz
-        AWYCAAEzAWYBMwEAATMCZgEAATMBZgGZAQABMwFmAcwBAAEzAWYB/wEAATMBmQIAATMBmQEzAQABMwGZ
-        AWYBAAEzApkBAAEzAZkBzAEAATMBmQH/AQABMwHMAgABMwHMATMBAAEzAcwBZgEAATMBzAGZAQABMwLM
-        AQABMwHMAf8BAAEzAf8BMwEAATMB/wFmAQABMwH/AZkBAAEzAf8BzAEAATMC/wEAAWYDAAFmAQABMwEA
-        AWYBAAFmAQABZgEAAZkBAAFmAQABzAEAAWYBAAH/AQABZgEzAgABZgIzAQABZgEzAWYBAAFmATMBmQEA
-        AWYBMwHMAQABZgEzAf8BAAJmAgACZgEzAQADZgEAAmYBmQEAAmYBzAEAAWYBmQIAAWYBmQEzAQABZgGZ
-        AWYBAAFmApkBAAFmAZkBzAEAAWYBmQH/AQABZgHMAgABZgHMATMBAAFmAcwBmQEAAWYCzAEAAWYBzAH/
-        AQABZgH/AgABZgH/ATMBAAFmAf8BmQEAAWYB/wHMAQABzAEAAf8BAAH/AQABzAEAApkCAAGZATMBmQEA
-        AZkBAAGZAQABmQEAAcwBAAGZAwABmQIzAQABmQEAAWYBAAGZATMBzAEAAZkBAAH/AQABmQFmAgABmQFm
-        ATMBAAGZATMBZgEAAZkBZgGZAQABmQFmAcwBAAGZATMB/wEAApkBMwEAApkBZgEAA5kBAAKZAcwBAAKZ
-        Af8BAAGZAcwCAAGZAcwBMwEAAWYBzAFmAQABmQHMAZkBAAGZAswBAAGZAcwB/wEAAZkB/wIAAZkB/wEz
-        AQABmQHMAWYBAAGZAf8BmQEAAZkB/wHMAQABmQL/AQABzAMAAZkBAAEzAQABzAEAAWYBAAHMAQABmQEA
-        AcwBAAHMAQABmQEzAgABzAIzAQABzAEzAWYBAAHMATMBmQEAAcwBMwHMAQABzAEzAf8BAAHMAWYCAAHM
-        AWYBMwEAAZkCZgEAAcwBZgGZAQABzAFmAcwBAAGZAWYB/wEAAcwBmQIAAcwBmQEzAQABzAGZAWYBAAHM
-        ApkBAAHMAZkBzAEAAcwBmQH/AQACzAIAAswBMwEAAswBZgEAAswBmQEAA8wBAALMAf8BAAHMAf8CAAHM
-        Af8BMwEAAZkB/wFmAQABzAH/AZkBAAHMAf8BzAEAAcwC/wEAAcwBAAEzAQAB/wEAAWYBAAH/AQABmQEA
-        AcwBMwIAAf8CMwEAAf8BMwFmAQAB/wEzAZkBAAH/ATMBzAEAAf8BMwH/AQAB/wFmAgAB/wFmATMBAAHM
-        AmYBAAH/AWYBmQEAAf8BZgHMAQABzAFmAf8BAAH/AZkCAAH/AZkBMwEAAf8BmQFmAQAB/wKZAQAB/wGZ
-        AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz
-        AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm
-        AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw
-        AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/wIADAc0AAPsAQAC7AEA
-        AuwBAAPsNAAC7AH/AQAB7AH/AQAB7AH/AQAB7AH/AewzAAHsAQcBAgYHAewCBwLsMgAB7AUHBewBBwLs
-        MgAB7Av/Auw+AALsNAAB/wgHAewBAAHsNAAB/wfsAf8B7DYAAf8BAAIGAv8BAAEGAf8B7DYAAf8BAAEG
-        A/8BAAEGAf8B7DYAAf8BAAH+Av8BAAIGAf8B7DYAAf8BAAYGAf8B7DYAAf8H7AH/Aew2AAHsCP8B7DcA
-        CewyAAHtDRQB8jEADQcB9wFtAfIwAAIHATMEBwHtAm0BEgFtAe0B9wHsARQwAAcHAe8E9wHvAfcB7AEU
-        AgAL7AUAAfAIbQHzBAACBg0EAQANBwHvAewBFAIAAewB/wEHAfsBBwH7AQcB+wEHAfsB7AUAAe8BBwb/
-        AewB8gQAAQYB/wwGAQQCAAEHCxQBbQGSARQBAAHsAf8BBwH7AQcB+wEHAfsBBwH7AQcBAAHsBAAB7wEH
-        Bv8B7AHyBAABBgH+AQYBAAH/AQAB/wEAAf8BAAL/AQcBAAEEAgAB8ArxAfcBbQGSAfMBAAHsAf8B+wEH
-        AfsBBwH7AQcB+wEHAewGAAHvAQcG/wHsAfIEAAEGAf8MBgEEAgAB8AHxAQQHoQG1AfcB7AHvAQAB7AH/
-        AfsBBwH7AQcB+wEHAfsBBwH7AgABBwQAAe8BBwb/AewB8gQAAQYB/gEGAQAB/wEAAf8BAAH/AQAB/wEA
-        Af8BAAEEAgAB8AHxAQQC/AGGAuwBFAH8Ac8B9wHsAe8BAAHsCf8B7AEAAfwB/wEHAwAB7wEHBv8B7AHy
-        BAABBgH/DAYBBAIAAfAB8QEEAfwB6gHsAv8B7AH8Ac8B9wHsAe8BAAzsAv8EAAHvAQcG/wHsAfIEAAEG
-        Af4BAAcHBAYBBAIAAfAB8QEEAfwBBwG8AbUBBAGFAfwBzwH3AewB7wIAAewB/wH7AQcB7AL/AfwB/wH8
-        Av8FAAHvAQcE/wIRAQ4B8gQAAQYB/wEABv8BBwQGAQQCAAHwAfEBBAHNAwQBoQL8Ac8B9wHsAe8CAAHs
-        Af8BBwH7AQcB7AL/AfwC/wEAAewEAAHvAQcE/wHsAfcB8AUAAQYB/ggABAYBBAIAAfAB8QEKBwQBzwH3
-        AewB7wIAAewB/wH7AQcB+wEHAewD/wEAAuwEAAHvARUEEwERAfMGAAEGAf8B/gH/Af4B/wH+Af8B/gH/
-        Af4B/wH+Af8BBgIAAfAB8Qj3AQcB9wHsAe8DAAHsBP8C7AH/FwAOBgIAAf8BvAnxAbwB7AHvBAAE7CsA
-        Af8BBwn3AZIB8jEAAUIBTQE+BwABPgMAASgDAAFAAwABIAMAAQEBAAEBBgABARYAA/8BAAGAAQMGAAGA
-        AQEGAAHABwABwAcAAcAHAAHABwAB8AcAAfAHAAHwAQEGAAHwAQEGAAHwAQEGAAHwAQEGAAHwAQEGAAHw
-        AQEGAAHwAQEGAAH4AQMHAAEBBv8CAAb/AgAB4AEBAv8BgAEBAgABwAEBAcABDwQAAcABAQHAAQ8CAAGA
-        AQABgAEBAcABDwIAAYABAAGAAQEBwAEPAgABgAEBAQABCQHAAQ8CAAGAAQECAAHAAQ8CAAGAAQEBAAEB
-        AcABDwIAAYABAQGAAQEBwAEPAgABgAEBAYABAQHAAR8CAAGAAQEBgAEDAcABPwIAAYABAQHAAR8C/wGA
-        AQEBgAEBAeEBvwT/AcABAQb/Cw==
-</value>
-  </data>
-  <metadata name="MenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <metadata name="iconsList.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>409, 17</value>
-  </metadata>
-  <data name="iconsList.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
-        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
-        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADG
-        CwAAAk1TRnQBSQFMAgEBBQEAASABAAEgAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
-        AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
-        AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
-        AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
-        AWYDAAGZAwABzAIAATMDAAIzAgABMwFmAgABMwGZAgABMwHMAgABMwH/AgABZgMAAWYBMwIAAmYCAAFm
-        AZkCAAFmAcwCAAFmAf8CAAGZAwABmQEzAgABmQFmAgACmQIAAZkBzAIAAZkB/wIAAcwDAAHMATMCAAHM
-        AWYCAAHMAZkCAALMAgABzAH/AgAB/wFmAgAB/wGZAgAB/wHMAQABMwH/AgAB/wEAATMBAAEzAQABZgEA
-        ATMBAAGZAQABMwEAAcwBAAEzAQAB/wEAAf8BMwIAAzMBAAIzAWYBAAIzAZkBAAIzAcwBAAIzAf8BAAEz
-        AWYCAAEzAWYBMwEAATMCZgEAATMBZgGZAQABMwFmAcwBAAEzAWYB/wEAATMBmQIAATMBmQEzAQABMwGZ
-        AWYBAAEzApkBAAEzAZkBzAEAATMBmQH/AQABMwHMAgABMwHMATMBAAEzAcwBZgEAATMBzAGZAQABMwLM
-        AQABMwHMAf8BAAEzAf8BMwEAATMB/wFmAQABMwH/AZkBAAEzAf8BzAEAATMC/wEAAWYDAAFmAQABMwEA
-        AWYBAAFmAQABZgEAAZkBAAFmAQABzAEAAWYBAAH/AQABZgEzAgABZgIzAQABZgEzAWYBAAFmATMBmQEA
-        AWYBMwHMAQABZgEzAf8BAAJmAgACZgEzAQADZgEAAmYBmQEAAmYBzAEAAWYBmQIAAWYBmQEzAQABZgGZ
-        AWYBAAFmApkBAAFmAZkBzAEAAWYBmQH/AQABZgHMAgABZgHMATMBAAFmAcwBmQEAAWYCzAEAAWYBzAH/
-        AQABZgH/AgABZgH/ATMBAAFmAf8BmQEAAWYB/wHMAQABzAEAAf8BAAH/AQABzAEAApkCAAGZATMBmQEA
-        AZkBAAGZAQABmQEAAcwBAAGZAwABmQIzAQABmQEAAWYBAAGZATMBzAEAAZkBAAH/AQABmQFmAgABmQFm
-        ATMBAAGZATMBZgEAAZkBZgGZAQABmQFmAcwBAAGZATMB/wEAApkBMwEAApkBZgEAA5kBAAKZAcwBAAKZ
-        Af8BAAGZAcwCAAGZAcwBMwEAAWYBzAFmAQABmQHMAZkBAAGZAswBAAGZAcwB/wEAAZkB/wIAAZkB/wEz
-        AQABmQHMAWYBAAGZAf8BmQEAAZkB/wHMAQABmQL/AQABzAMAAZkBAAEzAQABzAEAAWYBAAHMAQABmQEA
-        AcwBAAHMAQABmQEzAgABzAIzAQABzAEzAWYBAAHMATMBmQEAAcwBMwHMAQABzAEzAf8BAAHMAWYCAAHM
-        AWYBMwEAAZkCZgEAAcwBZgGZAQABzAFmAcwBAAGZAWYB/wEAAcwBmQIAAcwBmQEzAQABzAGZAWYBAAHM
-        ApkBAAHMAZkBzAEAAcwBmQH/AQACzAIAAswBMwEAAswBZgEAAswBmQEAA8wBAALMAf8BAAHMAf8CAAHM
-        Af8BMwEAAZkB/wFmAQABzAH/AZkBAAHMAf8BzAEAAcwC/wEAAcwBAAEzAQAB/wEAAWYBAAH/AQABmQEA
-        AcwBMwIAAf8CMwEAAf8BMwFmAQAB/wEzAZkBAAH/ATMBzAEAAf8BMwH/AQAB/wFmAgAB/wFmATMBAAHM
-        AmYBAAH/AWYBmQEAAf8BZgHMAQABzAFmAf8BAAH/AZkCAAH/AZkBMwEAAf8BmQFmAQAB/wKZAQAB/wGZ
-        AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz
-        AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm
-        AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw
-        AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/wIADAc0AAPsAQAC7AEA
-        AuwBAAPsNAAC7AH/AQAB7AH/AQAB7AH/AQAB7AH/AewzAAHsAQcBAgYHAewCBwLsMgAB7AUHBewBBwLs
-        MgAB7Av/Auw+AALsNAAB/wgHAewBAAHsNAAB/wfsAf8B7DYAAf8BAAIGAv8BAAEGAf8B7DYAAf8BAAEG
-        A/8BAAEGAf8B7DYAAf8BAAH+Av8BAAIGAf8B7DYAAf8BAAYGAf8B7DYAAf8H7AH/Aew2AAHsCP8B7DcA
-        CewyAAHtDRQB8jEADQcB9wFtAfIwAAIHATMEBwHtAm0BEgFtAe0B9wHsARQwAAcHAe8E9wHvAfcB7AEU
-        AgAL7AUAAfAIbQHzBAACBg0EAQANBwHvAewBFAIAAewB/wEHAfsBBwH7AQcB+wEHAfsB7AUAAe8BBwb/
-        AewB8gQAAQYB/wwGAQQCAAEHCxQBbQGSARQBAAHsAf8BBwH7AQcB+wEHAfsBBwH7AQcBAAHsBAAB7wEH
-        Bv8B7AHyBAABBgH+AQYBAAH/AQAB/wEAAf8BAAL/AQcBAAEEAgAB8ArxAfcBbQGSAfMBAAHsAf8B+wEH
-        AfsBBwH7AQcB+wEHAewGAAHvAQcG/wHsAfIEAAEGAf8MBgEEAgAB8AHxAQQHoQG1AfcB7AHvAQAB7AH/
-        AfsBBwH7AQcB+wEHAfsBBwH7AgABBwQAAe8BBwb/AewB8gQAAQYB/gEGAQAB/wEAAf8BAAH/AQAB/wEA
-        Af8BAAEEAgAB8AHxAQQC/AGGAuwBFAH8Ac8B9wHsAe8BAAHsCf8B7AEAAfwB/wEHAwAB7wEHBv8B7AHy
-        BAABBgH/DAYBBAIAAfAB8QEEAfwB6gHsAv8B7AH8Ac8B9wHsAe8BAAzsAv8EAAHvAQcG/wHsAfIEAAEG
-        Af4BAAcHBAYBBAIAAfAB8QEEAfwBBwG8AbUBBAGFAfwBzwH3AewB7wIAAewB/wH7AQcB7AL/AfwB/wH8
-        Av8FAAHvAQcE/wIRAQ4B8gQAAQYB/wEABv8BBwQGAQQCAAHwAfEBBAHNAwQBoQL8Ac8B9wHsAe8CAAHs
-        Af8BBwH7AQcB7AL/AfwC/wEAAewEAAHvAQcE/wHsAfcB8AUAAQYB/ggABAYBBAIAAfAB8QEKBwQBzwH3
-        AewB7wIAAewB/wH7AQcB+wEHAewD/wEAAuwEAAHvARUEEwERAfMGAAEGAf8B/gH/Af4B/wH+Af8B/gH/
-        Af4B/wH+Af8BBgIAAfAB8Qj3AQcB9wHsAe8DAAHsBP8C7AH/FwAOBgIAAf8BvAnxAbwB7AHvBAAE7CsA
-        Af8BBwn3AZIB8jEAAUIBTQE+BwABPgMAASgDAAFAAwABIAMAAQEBAAEBBgABARYAA/8BAAGAAQMGAAGA
-        AQEGAAHABwABwAcAAcAHAAHABwAB8AcAAfAHAAHwAQEGAAHwAQEGAAHwAQEGAAHwAQEGAAHwAQEGAAHw
-        AQEGAAHwAQEGAAH4AQMHAAEBBv8CAAb/AgAB4AEBAv8BgAEBAgABwAEBAcABDwQAAcABAQHAAQ8CAAGA
-        AQABgAEBAcABDwIAAYABAAGAAQEBwAEPAgABgAEBAQABCQHAAQ8CAAGAAQECAAHAAQ8CAAGAAQEBAAEB
-        AcABDwIAAYABAQGAAQEBwAEPAgABgAEBAYABAQHAAR8CAAGAAQEBgAEDAcABPwIAAYABAQHAAR8C/wGA
-        AQEBgAEBAeEBvwT/AcABAQb/Cw==
-</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.Designer.cs
index 465e375..710c51c 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.Designer.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.Designer.cs
@@ -508,9 +508,6 @@
         }
 
         #endregion
-
-        private System.Windows.Forms.ContextMenuStrip contextMenuStrip1;
-        private System.Windows.Forms.ToolStripMenuItem helloToolStripMenuItem;
         private System.Windows.Forms.MenuStrip topmenu;
         private System.Windows.Forms.ToolStripMenuItem fileToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem editToolStripMenuItem;