fix conflict in vs :D

20 files changed, 86 insertions, 85 deletions

diff --git a/TimeHACK.Engine/FileDialogBoxManager.cs b/TimeHACK.Engine/FileDialogBoxManager.cs
index 334ebdd..f6d30ae 100644
--- a/TimeHACK.Engine/FileDialogBoxManager.cs
+++ b/TimeHACK.Engine/FileDialogBoxManager.cs
@@ -10,24 +10,24 @@ namespace TimeHACK.Engine
 {
     public static class FileDialogBoxManager
     {
-        public static Boolean IsInOpenDialog = false;
-        public static Boolean IsInSaveDialog = false;
-        public static String OnlyViewExtension = "";
-        public static void ActivateOpenFileDialog(String ExtensionToView)
+        public static bool IsInOpenDialog = false;
+        public static bool IsInSaveDialog = false;
+        public static string OnlyViewExtension = "";
+        public static void ActivateOpenFileDialog(string ExtensionToView)
         {
             IsInOpenDialog = true;
             IsInSaveDialog = false;
             OnlyViewExtension = ExtensionToView;
         }
 
-        public static void ActivateSaveFileDialog(String ExtensionToView)
+        public static void ActivateSaveFileDialog(string ExtensionToView)
         {
             IsInOpenDialog = false;
             IsInSaveDialog = true;
             OnlyViewExtension = ExtensionToView;
         }
 
-        public static String ReadTextFile(String path)
+        public static string ReadTextFile(string path)
         {
             try
             {
diff --git a/TimeHACK.Engine/Template/WinClassic.cs b/TimeHACK.Engine/Template/WinClassic.cs
index f5737aa..554d6be 100644
--- a/TimeHACK.Engine/Template/WinClassic.cs
+++ b/TimeHACK.Engine/Template/WinClassic.cs
@@ -39,7 +39,7 @@ namespace TimeHACK.Engine.Template
             if (!closeDisabled) this.Close();
         }
 
-           public Boolean max = false;
+           public bool max = false;
 
         private void maximizebutton_Click(object sender, EventArgs e)
         {
diff --git a/TimeHACK.Engine/WindowManager.cs b/TimeHACK.Engine/WindowManager.cs
index 9e96673..156da2f 100644
--- a/TimeHACK.Engine/WindowManager.cs
+++ b/TimeHACK.Engine/WindowManager.cs
@@ -10,7 +10,7 @@ namespace TimeHACK.Engine
     {
         public static System.Drawing.Text.PrivateFontCollection pfc = new System.Drawing.Text.PrivateFontCollection();
 
-        public WinClassic StartWin95(UserControl content, String title, Image icon, Boolean MaxButton, Boolean MinButton, Boolean ShowApplicationAsDialog = false)
+        public WinClassic StartWin95(UserControl content, string title, Image icon, bool MaxButton, bool MinButton, bool ShowApplicationAsDialog = false)
         {
             // Setup Window
             WinClassic app = new WinClassic();
@@ -72,7 +72,7 @@ namespace TimeHACK.Engine
             return app;
         }
 
-        public WinClassic StartInfobox95(String title, String text, Image erroricon)
+        public WinClassic StartInfobox95(string title, string text, Image erroricon)
         {
             Infobox95 app = new Infobox95();
             app.infoText.Text = text;
@@ -82,7 +82,7 @@ namespace TimeHACK.Engine
             return StartWin95(app, title, null, false, false);
         }
 
-        public WinClassic StartAboutBox95(String shortname, String longname, Image appicon)
+        public WinClassic StartAboutBox95(string shortname, string longname, Image appicon)
         {
             AboutBox95 uc = new AboutBox95();
             uc.pictureBox1.Image = appicon;
diff --git a/TimeHACK.Main/OS/Win95/Win95.Designer.cs b/TimeHACK.Main/OS/Win95/Win95.Designer.cs
index 9a371b1..15f4feb 100644
--- a/TimeHACK.Main/OS/Win95/Win95.Designer.cs
+++ b/TimeHACK.Main/OS/Win95/Win95.Designer.cs
@@ -717,7 +717,7 @@ namespace TimeHACK.OS.Win95
             this.WebChatToolStripMenuItem.Size = new System.Drawing.Size(181, 28);
             this.WebChatToolStripMenuItem.Text = "Web Chat";
             this.WebChatToolStripMenuItem.Visible = false;
-            this.WebChatToolStripMenuItem.Click += new System.EventHandler(WebChatToolStripMenuItem_Click);
+            this.WebChatToolStripMenuItem.Click += new System.EventHandler(this.WebChatToolStripMenuItem_Click);
             // 
             // TimeDistorterToolStripMenuItem
             // 
diff --git a/TimeHACK.Main/OS/Win95/Win95.cs b/TimeHACK.Main/OS/Win95/Win95.cs
index a170f7f..d681c58 100644
--- a/TimeHACK.Main/OS/Win95/Win95.cs
+++ b/TimeHACK.Main/OS/Win95/Win95.cs
@@ -289,7 +289,7 @@ namespace TimeHACK.OS.Win95
 
         private void infoboxTestToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            WinClassic app = wm.StartInfobox95("AShifter's Infobox", "This is the very first TimeHACK Infobox. It's really easy to call, too! \n Just use wm.startInfobox95(String title, String text, Image erroricon)!", Properties.Resources.Win95Info);
+            WinClassic app = wm.StartInfobox95("AShifter's Infobox", "This is the very first TimeHACK Infobox. It's really easy to call, too! \n Just use wm.startInfobox95(string title, string text, Image erroricon)!", Properties.Resources.Win95Info);
 
             app.BringToFront();
             startmenu.Hide();
diff --git a/TimeHACK.Main/OS/Win95/Win95.resx b/TimeHACK.Main/OS/Win95/Win95.resx
index ec161c8..ba695aa 100644
--- a/TimeHACK.Main/OS/Win95/Win95.resx
+++ b/TimeHACK.Main/OS/Win95/Win95.resx
@@ -121,6 +121,48 @@
     <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
@@ -266,41 +308,6 @@
         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
@@ -336,13 +343,6 @@
         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 +382,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADq
-        ggAAAk1TRnQBSQFMAgEBDAEAAZgBAQGYAQEBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA
+        ggAAAk1TRnQBSQFMAgEBDAEAAbABAQGwAQEBIAEAASABAAT/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.cs b/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/FRMWinClassicAddressBookNewContact.cs
index fe75e83..482d54c 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/FRMWinClassicAddressBookNewContact.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/FRMWinClassicAddressBookNewContact.cs
@@ -57,7 +57,7 @@ namespace TimeHACK.OS.Win95.Win95Apps
                 txtLast.Text = toSet.LastName;
                 if (toSet.Emails != null)
                 {
-                    foreach (String email in toSet.Emails)
+                    foreach (string email in toSet.Emails)
                     {
                         emails.Items.Add(email);
                     }
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/WinClassicAddressBook.cs b/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/WinClassicAddressBook.cs
index 24404bf..95ee509 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/WinClassicAddressBook.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/WinClassicAddressBook.cs
@@ -282,12 +282,12 @@ namespace TimeHACK.OS.Win95.Win95Apps
         public string FirstName;
         public string MiddleName;
         public string LastName;
-        public List<String> Emails = new List<String>();
+        public List<string> Emails = new List<string>();
     }
 
     public class AddressBookContactList
     {
-        public String AttachedNode;
+        public string AttachedNode;
         public List<AddressBookContact> Contacts = new List<AddressBookContact>();
     }
 }
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTerminal.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTerminal.cs
index 70cd0f9..a754ed0 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTerminal.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTerminal.cs
@@ -71,7 +71,7 @@ namespace TimeHACK.OS.Win95.Win95Apps
         /// Write text to the Terminal. Very similar to the Win32 Console.Write Function.
         /// </summary>
         /// <param name="Text"></param>
-        public void Write(String Text)
+        public void Write(string Text)
         {
             cmdPrompt.AppendText(Text);
             cmdPrompt.Update();
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs
index e4f98ff..98dc4ff 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs
@@ -45,9 +45,9 @@ namespace TimeHACK.OS.Win95.Win95Apps
         //'    Next
         //'End Sub
 
-        String ReadDataFile(String reqDirectory, Boolean returnYesIfProtected = false) {
-            String Val = "";
-            String directoryFileInfo;
+        string ReadDataFile(string reqDirectory, bool returnYesIfProtected = false) {
+            string Val = "";
+            string directoryFileInfo;
             directoryFileInfo = File.ReadAllText(Path.Combine(reqDirectory, "_data.info"));
             FileSystemFolderInfo toRead = new FileSystemFolderInfo();
             toRead = JsonConvert.DeserializeObject<FileSystemFolderInfo>(directoryFileInfo);
@@ -70,14 +70,14 @@ namespace TimeHACK.OS.Win95.Win95Apps
             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")
+                // 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);
+                    string label = ReadDataFile(str, false);
                     if (label == "")
                     {
                         this.mainView.Items.Add(Path.GetFileName(str));
@@ -87,7 +87,7 @@ namespace TimeHACK.OS.Win95.Win95Apps
                         this.mainView.FindItemWithText(label).Tag = Path.GetFileName(str);
                     }
                 }
-                foreach (String str in Directory.GetFiles(currentDirectory))
+                foreach (string str in Directory.GetFiles(currentDirectory))
                 {
                     // Get app Icon
 
@@ -96,7 +96,7 @@ namespace TimeHACK.OS.Win95.Win95Apps
                     switch (new FileInfo(str).Extension)
                     {
                         case ".exe":
-                            String contents;
+                            string contents;
 
                             contents = File.ReadAllText(str);
 
@@ -492,7 +492,7 @@ namespace TimeHACK.OS.Win95.Win95Apps
         {
             try
             {
-                if ((String)mainView.FocusedItem.Tag != "") { // If it isn't a file
+                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)
@@ -547,10 +547,10 @@ namespace TimeHACK.OS.Win95.Win95Apps
         {
             try
             {
-                Boolean OpenFile = false;
+                bool OpenFile = false;
                 if (mainView.FocusedItem != null)
                 {
-                    if ((String)mainView.FocusedItem.Tag != "")
+                    if ((string)mainView.FocusedItem.Tag != "")
                     { // If it isn't a file
                         GoToDir(currentDirectory + "\\" + mainView.FocusedItem.Tag);
                     }
@@ -632,7 +632,7 @@ namespace TimeHACK.OS.Win95.Win95Apps
         private void mainView_AfterLabelEdit(object sender, LabelEditEventArgs e)
         {
 
-            String setText;
+            string setText;
             setText = mainView.FocusedItem.Text;
             if (setText == "")
             {
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs
index bf0cb16..2453abc 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs
@@ -155,7 +155,7 @@ namespace TimeHACK.OS.Win95.Win95Apps
 
         void SetSelectedTextFont(string font)
         {
-            // The next two lines convert a String to a Font
+            // The next two lines convert a string to a Font
             var cvt = new FontConverter();
             Font f = cvt.ConvertFromString(font) as Font;
 
@@ -164,7 +164,7 @@ namespace TimeHACK.OS.Win95.Win95Apps
 
         void SetSelectedTextSize(string size)
         {
-            //  The next few lines will ATTEMPT to convert a String to an Integer
+            //  The next few lines will ATTEMPT to convert a string to an Integer
             int SizeInt = Convert.ToInt32(size);
 
             mainText.SelectionFont = new Font(mainText.SelectionFont.FontFamily, SizeInt, mainText.SelectionFont.Style);
diff --git a/TimeHACK.Main/OS/Win98/Win98.cs b/TimeHACK.Main/OS/Win98/Win98.cs
index a249ba3..d65a9ed 100644
--- a/TimeHACK.Main/OS/Win98/Win98.cs
+++ b/TimeHACK.Main/OS/Win98/Win98.cs
@@ -261,7 +261,7 @@ namespace TimeHACK.OS.Win98
 
         private void infoboxTestToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            WinClassic app = wm.StartInfobox95("AShifter's Infobox", "This is the very first TimeHACK Infobox. It's really easy to call, too! \n Just use wm.startInfobox95(String title, String text, Image erroricon)!", Properties.Resources.Win95Info);
+            WinClassic app = wm.StartInfobox95("AShifter's Infobox", "This is the very first TimeHACK Infobox. It's really easy to call, too! \n Just use wm.startInfobox95(string title, string text, Image erroricon)!", Properties.Resources.Win95Info);
 
             app.BringToFront();
             startmenu.Hide();
diff --git a/TimeHACK.Main/Program.cs b/TimeHACK.Main/Program.cs
index e2a4be6..3f8d10c 100644
--- a/TimeHACK.Main/Program.cs
+++ b/TimeHACK.Main/Program.cs
@@ -51,7 +51,7 @@ namespace TimeHACK
             //TimeHACK.Engine.GameSave.SaveData MySaveData = new TimeHACK.Engine.GameSave.SaveData()
             //{
             //    OS = 60,
-            //    MyStringList = new List<string>
+            //    MystringList = new List<string>
             //    {
             //        "Item1",
             //        "Item2"
@@ -69,7 +69,7 @@ namespace TimeHACK
             Application.Run(title);
         }
 
-        public static String OpenFileExplorerAsDialogAndReturnGivenPath()
+        public static string OpenFileExplorerAsDialogAndReturnGivenPath()
         {
             WinClassicWindowsExplorer we = new WinClassicWindowsExplorer();
 
diff --git a/TimeHACK.Main/Resources/msdosprompt.png b/TimeHACK.Main/Resources/msdosprompt.png
new file mode 100644
index 0000000..2f3fe85
--- /dev/null
+++ b/TimeHACK.Main/Resources/msdosprompt.png
diff --git a/TimeHACK.Main/SaveDialogs/LoadGameDialog.cs b/TimeHACK.Main/SaveDialogs/LoadGameDialog.cs
index b31bc50..89e875e 100644
--- a/TimeHACK.Main/SaveDialogs/LoadGameDialog.cs
+++ b/TimeHACK.Main/SaveDialogs/LoadGameDialog.cs
@@ -14,7 +14,7 @@ namespace TimeHACK
 {
     public partial class LoadGameDialog : Form
     {
-        public Boolean successful = false;
+        public bool successful = false;
         public LoadGameDialog()
         {
             InitializeComponent();
diff --git a/TimeHACK.Main/SaveDialogs/LoadGameProfileItem.cs b/TimeHACK.Main/SaveDialogs/LoadGameProfileItem.cs
index 5e1ccf4..10d1a25 100644
--- a/TimeHACK.Main/SaveDialogs/LoadGameProfileItem.cs
+++ b/TimeHACK.Main/SaveDialogs/LoadGameProfileItem.cs
@@ -14,9 +14,9 @@ namespace TimeHACK
 {
     public partial class LoadGameProfileItem : UserControl, IMessageFilter
     {
-        public Boolean OnceRemoveHeight = false;
-        public Boolean OnceAddHeight = false;
-        public Boolean RequestingNewName = false;
+        public bool OnceRemoveHeight = false;
+        public bool OnceAddHeight = false;
+        public bool RequestingNewName = false;
         public LoadGameProfileItem()
         {
             InitializeComponent();
diff --git a/TimeHACK.Main/SaveDialogs/NewGameDialog.cs b/TimeHACK.Main/SaveDialogs/NewGameDialog.cs
index 0e6f346..e9af8cb 100644
--- a/TimeHACK.Main/SaveDialogs/NewGameDialog.cs
+++ b/TimeHACK.Main/SaveDialogs/NewGameDialog.cs
@@ -16,7 +16,7 @@ namespace TimeHACK
 {
     public partial class NewGameDialog : Form
     {
-        public Boolean Successful = false;
+        public bool Successful = false;
         public NewGameDialog()
         {
             InitializeComponent();
diff --git a/TimeHACK.Main/SaveDialogs/SaveFileTroubleShooter.cs b/TimeHACK.Main/SaveDialogs/SaveFileTroubleShooter.cs
index 4ada932..bcd60d1 100644
--- a/TimeHACK.Main/SaveDialogs/SaveFileTroubleShooter.cs
+++ b/TimeHACK.Main/SaveDialogs/SaveFileTroubleShooter.cs
@@ -14,9 +14,9 @@ namespace TimeHACK.SaveDialogs
 {
     public partial class SaveFileTroubleShooter : Form
     {
-        public String log;
+        public string log;
         Save savedata = new Save();
-        String json;
+        string json;
         public SaveFileTroubleShooter()
         {
             InitializeComponent();
@@ -32,7 +32,7 @@ namespace TimeHACK.SaveDialogs
             BeginScan();
         }
 
-        void WriteToLog(String toWrite)
+        void WriteToLog(string toWrite)
         {
             log += toWrite + Environment.NewLine;
         }
diff --git a/TimeHACK.Main/TimeHACK.Main.csproj b/TimeHACK.Main/TimeHACK.Main.csproj
index 052cbe8..a7a8817 100644
--- a/TimeHACK.Main/TimeHACK.Main.csproj
+++ b/TimeHACK.Main/TimeHACK.Main.csproj
@@ -482,6 +482,7 @@
     <None Include="Resources\IE4\start_padamslink.png" />
     <Content Include="Resources\modem_dial.wav" />
     <None Include="Resources\MS-DOS-logo-1.png" />
+    <None Include="Resources\msdosprompt.png" />
     <Content Include="Resources\std_beep.wav" />
     <Content Include="Resources\std_gobeep.wav" />
     <None Include="Resources\termCopy.png" />
diff --git a/TimeHACK.Main/TitleScreen.cs b/TimeHACK.Main/TitleScreen.cs
index 1b7d006..d13fd90 100644
--- a/TimeHACK.Main/TitleScreen.cs
+++ b/TimeHACK.Main/TitleScreen.cs
@@ -31,7 +31,7 @@ namespace TimeHACK
 
         // Border stuff
 
-        public Boolean max = false;
+        public bool max = false;
 
         public const int WM_NCLBUTTONDOWN = 0xA1;
         public const int HT_CAPTION = 0x2;