Updated my fork!

Conflicts:
	Histacom2/TitleScreen.Designer.cs
	Histacom2/TitleScreen.cs

14 files changed, 169 insertions, 173 deletions

diff --git a/Histacom2/OS/Win95/Win95.Designer.cs b/Histacom2/OS/Win95/Win95.Designer.cs
index 8e17941..53295f8 100644
--- a/Histacom2/OS/Win95/Win95.Designer.cs
+++ b/Histacom2/OS/Win95/Win95.Designer.cs
@@ -35,10 +35,10 @@ namespace Histacom2.OS.Win95
             this.panel1 = new System.Windows.Forms.Panel();
             this.panel2 = new System.Windows.Forms.Panel();
             this.taskbar = new System.Windows.Forms.Panel();
+            this.startbutton = new System.Windows.Forms.PictureBox();
             this.clockPanel = new System.Windows.Forms.Panel();
             this.taskbartime = new System.Windows.Forms.Label();
             this.taskbarItems = new System.Windows.Forms.Panel();
-            this.startbutton = new System.Windows.Forms.PictureBox();
             this.startmenu = new System.Windows.Forms.Panel();
             this.startmenuitems = new System.Windows.Forms.MenuStrip();
             this.ProgramsToolStripMenuItem = new Histacom2.Engine.UI.ClassicStartMenuItem();
@@ -83,9 +83,6 @@ namespace Histacom2.OS.Win95
             this.TimeDistorterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.FTPClientToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.DocumentsToolStripMenuItem = new Histacom2.Engine.UI.ClassicStartMenuItem();
-            this.downloaderTestToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.installerTestToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.storyTest1ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.SettingsToolStripMenuItem = new Histacom2.Engine.UI.ClassicStartMenuItem();
             this.ControlPanelToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.PrintersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -113,8 +110,8 @@ namespace Histacom2.OS.Win95
             this.desktopupdate = new System.Windows.Forms.Timer(this.components);
             this.panel1.SuspendLayout();
             this.taskbar.SuspendLayout();
-            this.clockPanel.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.startbutton)).BeginInit();
+            this.clockPanel.SuspendLayout();
             this.startmenu.SuspendLayout();
             this.startmenuitems.SuspendLayout();
             this.ossidestartmenu.SuspendLayout();
@@ -154,6 +151,16 @@ namespace Histacom2.OS.Win95
             this.taskbar.TabIndex = 2;
             this.taskbar.Paint += new System.Windows.Forms.PaintEventHandler(this.taskbar_Paint);
             // 
+            // startbutton
+            // 
+            this.startbutton.Image = global::Histacom2.Properties.Resources.WinClassicStart;
+            this.startbutton.Location = new System.Drawing.Point(2, 4);
+            this.startbutton.Name = "startbutton";
+            this.startbutton.Size = new System.Drawing.Size(54, 22);
+            this.startbutton.TabIndex = 3;
+            this.startbutton.TabStop = false;
+            this.startbutton.Click += new System.EventHandler(this.startbutton_Click);
+            // 
             // clockPanel
             // 
             this.clockPanel.BackgroundImage = global::Histacom2.Properties.Resources.WinClassicTime;
@@ -185,16 +192,6 @@ namespace Histacom2.OS.Win95
             this.taskbarItems.Size = new System.Drawing.Size(3648, 22);
             this.taskbarItems.TabIndex = 5;
             // 
-            // startbutton
-            // 
-            this.startbutton.Image = global::Histacom2.Properties.Resources.WinClassicStart;
-            this.startbutton.Location = new System.Drawing.Point(2, 4);
-            this.startbutton.Name = "startbutton";
-            this.startbutton.Size = new System.Drawing.Size(54, 22);
-            this.startbutton.TabIndex = 3;
-            this.startbutton.TabStop = false;
-            this.startbutton.Click += new System.EventHandler(this.startbutton_Click);
-            // 
             // startmenu
             // 
             this.startmenu.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
@@ -239,6 +236,7 @@ namespace Histacom2.OS.Win95
             this.ProgramsToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
             this.ProgramsToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver;
             this.ProgramsToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
+            this.ProgramsToolStripMenuItem.DoBackColorAdapt = false;
             this.ProgramsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.AccessoriesToolStripMenuItem,
             this.StartUpToolStripMenuItem,
@@ -257,9 +255,11 @@ namespace Histacom2.OS.Win95
             this.ProgramsToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicPrograms;
             this.ProgramsToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.ProgramsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.ProgramsToolStripMenuItem.LayoutStyle = Histacom2.Engine.UI.ClassicStartMenuItemLayout.DistancedTitle;
             this.ProgramsToolStripMenuItem.Name = "ProgramsToolStripMenuItem";
             this.ProgramsToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0);
             this.ProgramsToolStripMenuItem.Size = new System.Drawing.Size(137, 32);
+            this.ProgramsToolStripMenuItem.SubTitle = "Subtitle";
             this.ProgramsToolStripMenuItem.Text = "&Programs";
             // 
             // AccessoriesToolStripMenuItem
@@ -311,7 +311,6 @@ namespace Histacom2.OS.Win95
             this.InternetConnectionWizardToolStripMenuItem.Name = "InternetConnectionWizardToolStripMenuItem";
             this.InternetConnectionWizardToolStripMenuItem.Size = new System.Drawing.Size(219, 22);
             this.InternetConnectionWizardToolStripMenuItem.Text = "Internet Connection Wizard";
-            this.InternetConnectionWizardToolStripMenuItem.Click += new System.EventHandler(this.temp_for_std);
             // 
             // NetMeetingToolStripMenuItem
             // 
@@ -686,6 +685,7 @@ namespace Histacom2.OS.Win95
             this.StartRunnerToolStripMenuItem.Size = new System.Drawing.Size(181, 28);
             this.StartRunnerToolStripMenuItem.Text = "Start Runner";
             this.StartRunnerToolStripMenuItem.Visible = false;
+            this.StartRunnerToolStripMenuItem.Click += new System.EventHandler(this.StartRunnerToolStripMenuItem_Click);
             // 
             // ErrorBlasterToolStripMenuItem
             // 
@@ -750,48 +750,22 @@ namespace Histacom2.OS.Win95
             this.DocumentsToolStripMenuItem.AutoSize = false;
             this.DocumentsToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
             this.DocumentsToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver;
-            this.DocumentsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.downloaderTestToolStripMenuItem,
-            this.installerTestToolStripMenuItem,
-            this.storyTest1ToolStripMenuItem});
+            this.DocumentsToolStripMenuItem.DoBackColorAdapt = false;
             this.DocumentsToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicDocuments;
             this.DocumentsToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.DocumentsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.DocumentsToolStripMenuItem.LayoutStyle = Histacom2.Engine.UI.ClassicStartMenuItemLayout.DistancedTitle;
             this.DocumentsToolStripMenuItem.Name = "DocumentsToolStripMenuItem";
             this.DocumentsToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0);
             this.DocumentsToolStripMenuItem.Size = new System.Drawing.Size(137, 32);
+            this.DocumentsToolStripMenuItem.SubTitle = "Subtitle";
             this.DocumentsToolStripMenuItem.Text = "&Documents";
             // 
-            // downloaderTestToolStripMenuItem
-            // 
-            this.downloaderTestToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
-            this.downloaderTestToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("downloaderTestToolStripMenuItem.BackgroundImage")));
-            this.downloaderTestToolStripMenuItem.Name = "downloaderTestToolStripMenuItem";
-            this.downloaderTestToolStripMenuItem.Size = new System.Drawing.Size(159, 22);
-            this.downloaderTestToolStripMenuItem.Text = "DownloaderTest";
-            this.downloaderTestToolStripMenuItem.Click += new System.EventHandler(this.downloaderTestToolStripMenuItem_Click);
-            // 
-            // installerTestToolStripMenuItem
-            // 
-            this.installerTestToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
-            this.installerTestToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("installerTestToolStripMenuItem.BackgroundImage")));
-            this.installerTestToolStripMenuItem.Name = "installerTestToolStripMenuItem";
-            this.installerTestToolStripMenuItem.Size = new System.Drawing.Size(159, 22);
-            this.installerTestToolStripMenuItem.Text = "InstallerTest";
-            this.installerTestToolStripMenuItem.Click += new System.EventHandler(this.installerTestToolStripMenuItem_Click);
-            // 
-            // storyTest1ToolStripMenuItem
-            // 
-            this.storyTest1ToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver;
-            this.storyTest1ToolStripMenuItem.Name = "storyTest1ToolStripMenuItem";
-            this.storyTest1ToolStripMenuItem.Size = new System.Drawing.Size(159, 22);
-            this.storyTest1ToolStripMenuItem.Text = "StoryTest1";
-            this.storyTest1ToolStripMenuItem.Click += new System.EventHandler(this.storyTest1ToolStripMenuItem_Click);
-            // 
             // SettingsToolStripMenuItem
             // 
             this.SettingsToolStripMenuItem.AutoSize = false;
             this.SettingsToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
+            this.SettingsToolStripMenuItem.DoBackColorAdapt = false;
             this.SettingsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.ControlPanelToolStripMenuItem,
             this.PrintersToolStripMenuItem,
@@ -799,9 +773,11 @@ namespace Histacom2.OS.Win95
             this.SettingsToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicSettings;
             this.SettingsToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.SettingsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.SettingsToolStripMenuItem.LayoutStyle = Histacom2.Engine.UI.ClassicStartMenuItemLayout.DistancedTitle;
             this.SettingsToolStripMenuItem.Name = "SettingsToolStripMenuItem";
             this.SettingsToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0);
             this.SettingsToolStripMenuItem.Size = new System.Drawing.Size(137, 32);
+            this.SettingsToolStripMenuItem.SubTitle = "Subtitle";
             this.SettingsToolStripMenuItem.Text = "&Settings";
             // 
             // ControlPanelToolStripMenuItem
@@ -823,7 +799,6 @@ namespace Histacom2.OS.Win95
             this.PrintersToolStripMenuItem.Name = "PrintersToolStripMenuItem";
             this.PrintersToolStripMenuItem.Size = new System.Drawing.Size(146, 22);
             this.PrintersToolStripMenuItem.Text = "Printers";
-            this.PrintersToolStripMenuItem.Click += new System.EventHandler(this.infoboxTestToolStripMenuItem_Click);
             // 
             // TaskbarToolStripMenuItem
             // 
@@ -839,6 +814,7 @@ namespace Histacom2.OS.Win95
             this.FindToolStripMenuItem.AutoSize = false;
             this.FindToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
             this.FindToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("FindToolStripMenuItem.BackgroundImage")));
+            this.FindToolStripMenuItem.DoBackColorAdapt = false;
             this.FindToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.FilesOrFoldersToolStripMenuItem,
             this.ComputerToolStripMenuItem,
@@ -847,10 +823,12 @@ namespace Histacom2.OS.Win95
             this.FindToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicFind;
             this.FindToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.FindToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.FindToolStripMenuItem.LayoutStyle = Histacom2.Engine.UI.ClassicStartMenuItemLayout.DistancedTitle;
             this.FindToolStripMenuItem.Name = "FindToolStripMenuItem";
             this.FindToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0);
             this.FindToolStripMenuItem.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.FindToolStripMenuItem.Size = new System.Drawing.Size(137, 32);
+            this.FindToolStripMenuItem.SubTitle = "Subtitle";
             this.FindToolStripMenuItem.Text = "&Find";
             // 
             // FilesOrFoldersToolStripMenuItem
@@ -861,7 +839,6 @@ namespace Histacom2.OS.Win95
             this.FilesOrFoldersToolStripMenuItem.Name = "FilesOrFoldersToolStripMenuItem";
             this.FilesOrFoldersToolStripMenuItem.Size = new System.Drawing.Size(163, 22);
             this.FilesOrFoldersToolStripMenuItem.Text = "Files or Folders...";
-            this.FilesOrFoldersToolStripMenuItem.Click += new System.EventHandler(this.FilesOrFoldersToolStripMenuItem_Click);
             // 
             // ComputerToolStripMenuItem
             // 
@@ -894,50 +871,62 @@ namespace Histacom2.OS.Win95
             // 
             this.HelpToolStripMenuItem.AutoSize = false;
             this.HelpToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
+            this.HelpToolStripMenuItem.DoBackColorAdapt = false;
             this.HelpToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicHelp;
             this.HelpToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.HelpToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.HelpToolStripMenuItem.LayoutStyle = Histacom2.Engine.UI.ClassicStartMenuItemLayout.DistancedTitle;
             this.HelpToolStripMenuItem.Name = "HelpToolStripMenuItem";
             this.HelpToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0);
             this.HelpToolStripMenuItem.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.HelpToolStripMenuItem.Size = new System.Drawing.Size(137, 32);
+            this.HelpToolStripMenuItem.SubTitle = "Subtitle";
             this.HelpToolStripMenuItem.Text = "&Help";
             // 
             // RunToolStripMenuItem
             // 
             this.RunToolStripMenuItem.AutoSize = false;
             this.RunToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
+            this.RunToolStripMenuItem.DoBackColorAdapt = false;
             this.RunToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicRun;
             this.RunToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.RunToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.RunToolStripMenuItem.LayoutStyle = Histacom2.Engine.UI.ClassicStartMenuItemLayout.DistancedTitle;
             this.RunToolStripMenuItem.Name = "RunToolStripMenuItem";
             this.RunToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0);
             this.RunToolStripMenuItem.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.RunToolStripMenuItem.Size = new System.Drawing.Size(137, 32);
+            this.RunToolStripMenuItem.SubTitle = "Subtitle";
             this.RunToolStripMenuItem.Text = "&Run...";
             // 
             // SuspendToolStripMenuItem
             // 
             this.SuspendToolStripMenuItem.AutoSize = false;
             this.SuspendToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
+            this.SuspendToolStripMenuItem.DoBackColorAdapt = false;
             this.SuspendToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicSuspend;
             this.SuspendToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.SuspendToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.SuspendToolStripMenuItem.LayoutStyle = Histacom2.Engine.UI.ClassicStartMenuItemLayout.DistancedTitle;
             this.SuspendToolStripMenuItem.Name = "SuspendToolStripMenuItem";
             this.SuspendToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0);
             this.SuspendToolStripMenuItem.Size = new System.Drawing.Size(137, 32);
+            this.SuspendToolStripMenuItem.SubTitle = "Subtitle";
             this.SuspendToolStripMenuItem.Text = "Suspe&nd";
             // 
             // ShutdownToolStripMenuItem
             // 
             this.ShutdownToolStripMenuItem.AutoSize = false;
             this.ShutdownToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
+            this.ShutdownToolStripMenuItem.DoBackColorAdapt = false;
             this.ShutdownToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicShutdown;
             this.ShutdownToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.ShutdownToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.ShutdownToolStripMenuItem.LayoutStyle = Histacom2.Engine.UI.ClassicStartMenuItemLayout.DistancedTitle;
             this.ShutdownToolStripMenuItem.Name = "ShutdownToolStripMenuItem";
             this.ShutdownToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0);
             this.ShutdownToolStripMenuItem.Size = new System.Drawing.Size(137, 32);
+            this.ShutdownToolStripMenuItem.SubTitle = "Subtitle";
             this.ShutdownToolStripMenuItem.Text = "Sh&ut Down...";
             this.ShutdownToolStripMenuItem.Click += new System.EventHandler(this.ShutdownToolStripMenuItem_Click);
             // 
@@ -1078,9 +1067,9 @@ namespace Histacom2.OS.Win95
             this.Load += new System.EventHandler(this.Desktop_Load);
             this.panel1.ResumeLayout(false);
             this.taskbar.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.startbutton)).EndInit();
             this.clockPanel.ResumeLayout(false);
             this.clockPanel.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.startbutton)).EndInit();
             this.startmenu.ResumeLayout(false);
             this.startmenuitems.ResumeLayout(false);
             this.startmenuitems.PerformLayout();
@@ -1162,10 +1151,7 @@ namespace Histacom2.OS.Win95
         internal System.Windows.Forms.ToolStripMenuItem TextDocumentToolStripMenuItem;
         internal System.Windows.Forms.ToolStripMenuItem PropertiesToolStripMenuItem1;
         internal System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Windows95));
-        private System.Windows.Forms.ToolStripMenuItem downloaderTestToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem installerTestToolStripMenuItem;
         private System.Windows.Forms.Panel taskbarItems;
-        private System.Windows.Forms.ToolStripMenuItem storyTest1ToolStripMenuItem;
         internal System.Windows.Forms.ToolStripMenuItem FTPClientToolStripMenuItem;
         private System.Windows.Forms.Timer desktopupdate;
         private System.Windows.Forms.ToolStripMenuItem deleteToolStripMenuItem;
diff --git a/Histacom2/OS/Win95/Win95.cs b/Histacom2/OS/Win95/Win95.cs
index 2a26b91..0e2ac3b 100644
--- a/Histacom2/OS/Win95/Win95.cs
+++ b/Histacom2/OS/Win95/Win95.cs
@@ -140,6 +140,15 @@ namespace Histacom2.OS.Win95
             new ListViewItem("Set Up The Microsoft Network", 4),
             new ListViewItem("Outlook Express", 6) }, ref desktopicons, Path.Combine(ProfileWindowsDirectory, "Desktop"));
             desktopicons.AutoArrange = false;
+
+            // Enable installed programs
+
+            if (CurrentSave.installed95[0]) WebChatToolStripMenuItem.Visible = true;
+            if (CurrentSave.installed95[1]) FTPClientToolStripMenuItem.Visible = true;
+            if (CurrentSave.installed95[2]) StartRunnerToolStripMenuItem.Visible = true;
+            if (CurrentSave.installed95[3]) ErrorBlasterToolStripMenuItem.Visible = true;
+            if (CurrentSave.installed95[5]) TimeDistorterToolStripMenuItem.Visible = true;
+            if (CurrentSave.installed95[6]) GuessTheNumberToolStripMenuItem.Visible = true;
         }
 
         private void fontLoad()
@@ -235,29 +244,6 @@ namespace Histacom2.OS.Win95
             app.BringToFront();
             startmenu.Hide();
         }
-        private void downloaderTestToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            WinClassicDownloader opendownload = new WinClassicDownloader();
-            WinClassic app = wm.Init(opendownload, "Downloader", null, false, true, resize: false);
-            opendownload.appName.Text = "Downloading: Survive The Day";
-
-            AddTaskBarItem(app, app.Tag.ToString(), "Downloader", null);
-
-            app.BringToFront();
-            startmenu.Hide();
-        }
-
-        private void installerTestToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            Win95Installer openinstaller = new Win95Installer("Testing");
-            WinClassic app = wm.Init(openinstaller, "Installer", null, false, true, resize: false);
-
-            AddTaskBarItem(app, app.Tag.ToString(), "Installer", null);
-
-            app.BringToFront();
-            startmenu.Hide();
-        }
-
         private void InternetExplorerToolStripMenuItem_Click(object sender, EventArgs e)
         {
             if (ie != null) { wm.StartInfobox95("Error Opening Internet Explorer", "An instance of Internet Explorer 4 is already open.", InfoboxType.Warning, InfoboxButtons.OK); return; }
@@ -347,13 +333,6 @@ namespace Histacom2.OS.Win95
             }
         }
 
-        private void infoboxTestToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            WinClassic app = wm.StartInfobox95("AShifter's Infobox", "This is the very first Histacom2 Infobox. It's really easy to call, too! \nJust use wm.startInfobox95(string title, string text, InfoboxType type, InfoboxButtons btns)!", InfoboxType.Info, InfoboxButtons.OK);
-
-            app.BringToFront();
-            startmenu.Hide();
-        }
         private void WebChatToolStripMenuItem_Click(object sender, EventArgs e)
         {
             webchat = wm.Init(new WebChat1998(), "Web Chat 1998", null, true, true);
@@ -432,20 +411,6 @@ namespace Histacom2.OS.Win95
             Hack1.StartObjective();
         }
 
-        private void temp_for_std(object sender, EventArgs e)
-        {
-            Win2K.Win2KApps.SurviveTheDay std = new Win2K.Win2KApps.SurviveTheDay();
-            WinClassic app = wm.Init(std, "Survive The Day", null, false, false);
-            AddTaskBarItem(app, app.Tag.ToString(), "Survive The Day", null);
-
-            nonimportantapps.Add(app);
-            nonimportantapps[nonimportantapps.Count - 1].BringToFront();
-            nonimportantapps[nonimportantapps.Count - 1].FormClosing += new FormClosingEventHandler(NonImportantApp_Closing);
-
-            app.BringToFront();
-            startmenu.Hide();
-        }
-
         private void MSDOSPromptToolStripMenuItem1_Click (object sender, EventArgs e)
         {
             WinClassicTerminal msdos = new WinClassicTerminal(false);
@@ -598,6 +563,7 @@ namespace Histacom2.OS.Win95
         private void desktopicons_MouseUp(object sender, MouseEventArgs e)
         {
             heldDownItem = null;
+            startmenu.Hide();
         }
 
         private void GuessTheNumberToolStripMenuItem_Click(object sender, EventArgs e)
@@ -673,7 +639,7 @@ namespace Histacom2.OS.Win95
             startmenu.Hide();
         }
 
-        private void FilesOrFoldersToolStripMenuItem_Click(object sender, EventArgs e)
+        private void StartRunnerToolStripMenuItem_Click(object sender, EventArgs e)
         {
             WinClassic app = wm.Init(new StartRunner95(), "Welcome to Start Runner 95!", null, false, false, false, false);
             AddTaskBarItem(app, app.Tag.ToString(), "Welcome to Start Runner 95!", null);
@@ -684,6 +650,12 @@ namespace Histacom2.OS.Win95
 
             app.BringToFront();
             startmenu.Hide();
+
+        }
+
+        private void desktopicons_Click(object sender, EventArgs e)
+        {
+            startmenu.Hide();
         }
     }
 }
diff --git a/Histacom2/OS/Win95/Win95.resx b/Histacom2/OS/Win95/Win95.resx
index 3aabd22..a40158b 100644
--- a/Histacom2/OS/Win95/Win95.resx
+++ b/Histacom2/OS/Win95/Win95.resx
@@ -120,42 +120,10 @@
   <metadata name="startmenuitems.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
+  <metadata name="startmenuitems.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="FindToolStripMenuItem.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
-        4AAABIQCQUtXaBsAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="FilesOrFoldersToolStripMenuItem.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
-        4AAABIQCQUtXaBsAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="ComputerToolStripMenuItem.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
-        4AAABIQCQUtXaBsAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="OnTheInternetToolStripMenuItem.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
-        4AAABIQCQUtXaBsAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="PeopleToolStripMenuItem.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
-        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
@@ -328,35 +296,56 @@
         6EP7A+obqOc2EzIBeELmtqNFDECI9R3gYmPhCPH+qX6HfAJAQ7iUCwlxft5LSoDNAAAAAElFTkSuQmCC
 </value>
   </data>
-  <data name="downloaderTestToolStripMenuItem.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="ControlPanelToolStripMenuItem.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
         vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
         4AAABIQCQUtXaBsAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="installerTestToolStripMenuItem.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="PrintersToolStripMenuItem.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
         vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
         4AAABIQCQUtXaBsAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="ControlPanelToolStripMenuItem.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="TaskbarToolStripMenuItem.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
         vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
         4AAABIQCQUtXaBsAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="PrintersToolStripMenuItem.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="FindToolStripMenuItem.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
         vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
         4AAABIQCQUtXaBsAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="TaskbarToolStripMenuItem.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="FilesOrFoldersToolStripMenuItem.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
+        4AAABIQCQUtXaBsAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="ComputerToolStripMenuItem.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
+        4AAABIQCQUtXaBsAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="OnTheInternetToolStripMenuItem.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
+        4AAABIQCQUtXaBsAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="PeopleToolStripMenuItem.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
         vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
@@ -374,7 +363,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACO
-        hAAAAk1TRnQBSQFMAgEBDQEAASwBAwEsAQMBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA
+        hAAAAk1TRnQBSQFMAgEBDQEAAUQBAwFEAQMBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA
         AwABgAMAAQEBAAEgBwABASQAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/
         AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH//wChAAOAAf8DwAH/
         A8AB/wPAAf8DwAH/A8AB/wPAAf8DwAH/A8AB/wPAAf8DwAH/A8AB/wPAAf8DwAH/A8AB/wPAAf8DwAH/
diff --git a/Histacom2/OS/Win95/Win95Apps/IE3Sites/12padams1998.cs b/Histacom2/OS/Win95/Win95Apps/IE3Sites/12padams1998.cs
index 9f4bfbd..f55ee45 100644
--- a/Histacom2/OS/Win95/Win95Apps/IE3Sites/12padams1998.cs
+++ b/Histacom2/OS/Win95/Win95Apps/IE3Sites/12padams1998.cs
@@ -15,6 +15,7 @@ namespace Histacom2.OS.Win95.Win95Apps.IE3Sites
 {
     public partial class _12padams1998 : UserControl
     {
+        bool clicked = false;
         public _12padams1998()
         {
             InitializeComponent();
@@ -47,6 +48,8 @@ namespace Histacom2.OS.Win95.Win95Apps.IE3Sites
 
         private void label17_Click(object sender, EventArgs e)
         {
+            if (clicked) return;
+            clicked = true;
             label16.Text = "1̧͙̙̦̪͙͇̜̥͍̟͍̹̰̝͖̫̩͘͡͡9̸̨͏̖̱̗̣̥͕̲͈̬̦9͠҉̶̢͔̹̖͇̫̩̻̪̬͔̥̟̺̼̺̟̫8̷̴̶̱̩͖̟̠̬̻̼̳̰̺͚͜͞:̧͟͏̰̣̠̹͍͔̼͕̲͇̪̥̗̞͚͇̖ͅ ͏̙͇̮̤̠͇̜͚͈͇͔̠̙͜͡ͅÀ͏̰̮̞̲̠̩̳͙͓͉̭̼̠͕̣͇̜͎ͅd̢̩̝̙̩̭̫͓̮͙͔̘̥͝d̻̻̪̙͖̬͈͟͝e͠҉̨̧҉̯̙̹̝̟̺̰͖̹̞̻̝̖̪͉͍͇̬#҉̵̻̜͇̻̹͈̀͟ ̨̡̘͓͔̜̭̫͖͔̰̦̘̀#̛͓̬̭̦̹̙̭͕̕#̧͢͠͏̖̙͚͉͇̣̜̖ͅ#̜̝͚͓̳̘̭̣̲̟̤̖͇̬̠̯̠̀͠ ̢͚̲̞̯͎͙̪̗̜̹͙͓͉͢ͅ#̡͙̻̫̝̪͙͚̺̝͓̘̬̬͙͔̀̕͠#̴҉͖̲̺̱͖͈̭̭ͅ#̸̸̷̼̫̪̖̻̻͈̭̬͓̘͓̦̟̻̪͇̞̕#̸̢̨̻̗̣̠̥̖̜̜̖̺͍̝̗͓̦̳̫#̛͡҉̭̝̙̟̘̩̬͖͎̘̞̭̖͔̪̼̠͢ͅ#̰̜̭̹̻̖̬̺͘͡#̛̬̣̳͔͔̘̟͜͢͟͡#̷̨̼̺̤̥̞́͢͡ ̢̞̬͙͍̬̪̪̰̰̰̙̮͙͚͕̩̟͇̕͜ͅ#̶͙̣̣̦͈͈̫̕͡#̸̡̥̹̮͇̱̱͍͜͜͢#̵̢̧̦͙̮̮͔͖̞̮͚͞#̧̗̤̱̪̜͓̠͖̞̰͍͢#̧̱̳̻̖̝͇͜͞#̛́҉͍̩̞̬͔̬̪̻̯̩";
             Thread.Sleep(100);
             Refresh();
diff --git a/Histacom2/OS/Win95/Win95Apps/Story/Hack1.cs b/Histacom2/OS/Win95/Win95Apps/Story/Hack1.cs
index 7cf9dd4..a918cda 100644
--- a/Histacom2/OS/Win95/Win95Apps/Story/Hack1.cs
+++ b/Histacom2/OS/Win95/Win95Apps/Story/Hack1.cs
@@ -40,6 +40,7 @@ namespace Histacom2.OS.Win95.Win95Apps.Story
         {
             WinClassicTerminal Console = new WinClassicTerminal(true);
             WinClassic app = wm.Init(Console, "MS-DOS Prompt", null, true, true);
+            TitleScreen.frm95.AddTaskBarItem(app, app.Tag.ToString(), "MS-DOS Prompt", null);
 
             Console.WriteLine("telnet> 104.27.135.159 Connecting...");
             await Task.Delay(2500);
diff --git a/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs b/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs
index 77f63b5..9dcebfc 100644
--- a/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs
+++ b/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs
@@ -10,6 +10,7 @@ namespace Histacom2.OS.Win95.Win95Apps.Story
 {
     public class Hack2 : object
     {
+        public static bool Upgraded = false;
         static WindowManager wm = new WindowManager();
 
         public static async void StartObjective()
@@ -80,7 +81,7 @@ namespace Histacom2.OS.Win95.Win95Apps.Story
             await Task.Delay(2500);
             Console.WriteLine("Command> Show Start Button");
             TitleScreen.frm95.startbutton.Show();
-            TitleScreen.frm95.desktopicons.BackgroundImage = null;
+            if (SaveSystem.currentTheme.defaultWallpaper != null) TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(SaveSystem.currentTheme.defaultWallpaper, TitleScreen.frm95.Width, TitleScreen.frm95.Height);
             await Task.Delay(2900);
             Console.WriteLine("12padams> OKAY, NOW YOU'VE DONE IT!");
             await Task.Delay(2500);
@@ -273,6 +274,7 @@ namespace Histacom2.OS.Win95.Win95Apps.Story
             SaveSystem.CurrentSave.CurrentOS = "98";
             SaveSystem.currentTheme = new Default98Theme();
             SaveSystem.CurrentSave.ThemeName = "default98";
+            Upgraded = true;
             TitleScreen.frm95.distort.ParentForm.Close();
             foreach (Form frm in Application.OpenForms) if (frm is WinClassic) frm.Close();
             Program.title.StartGame();
diff --git a/Histacom2/OS/Win95/Win95Apps/WebChat1998.cs b/Histacom2/OS/Win95/Win95Apps/WebChat1998.cs
index c986b23..5956276 100644
--- a/Histacom2/OS/Win95/Win95Apps/WebChat1998.cs
+++ b/Histacom2/OS/Win95/Win95Apps/WebChat1998.cs
@@ -70,9 +70,9 @@ namespace Histacom2.OS.Win95.Win95Apps
         {
             if (!guessing)
             {
-                if (history.ScrollBars != ScrollBars.None) history.AppendText(wcmp.ParseMessage(resources.GetString("convo"), chat_index, TitleScreen.username));
-                else history.Text = wcmp.ParseMessage(resources.GetString("convo"), chat_index, TitleScreen.username);
-                switch (wcmp.GetSpecial(resources.GetString("convo"), chat_index))
+                if (history.ScrollBars != ScrollBars.None) history.AppendText(wcmp.ParseMessage(Properties.Resources.webchat1998_convo, chat_index, TitleScreen.username));
+                else history.Text = wcmp.ParseMessage(Properties.Resources.webchat1998_convo, chat_index, TitleScreen.username);
+                switch (wcmp.GetSpecial(Properties.Resources.webchat1998_convo, chat_index))
                 {
                     case "addsh":
                         listBox1.Items.Add("SkyHigh");
@@ -208,8 +208,8 @@ namespace Histacom2.OS.Win95.Win95Apps
                         if (msgsound) receive.Play();
                         break;
                 }
-                if (TitleScreen.username == "devspeed") Chat.Interval = wcmp.GetMessageDelay(resources.GetString("convo"), chat_index) / 2;
-                else Chat.Interval = wcmp.GetMessageDelay(resources.GetString("convo"), chat_index);
+                if (TitleScreen.username == "devspeed") Chat.Interval = wcmp.GetMessageDelay(Properties.Resources.webchat1998_convo, chat_index) / 2;
+                else Chat.Interval = wcmp.GetMessageDelay(Properties.Resources.webchat1998_convo, chat_index);
             }
             else
             {
@@ -223,7 +223,7 @@ namespace Histacom2.OS.Win95.Win95Apps
                 }
                 guessing = false;
                 receive.Play();
-                Chat.Interval = wcmp.GetMessageDelay(resources.GetString("convo"), chat_index);
+                Chat.Interval = wcmp.GetMessageDelay(Properties.Resources.webchat1998_convo, chat_index);
             }
             chat_index++;
         }
diff --git a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs
index 0f221af..8f946ab 100644
--- a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs
+++ b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs
@@ -304,7 +304,7 @@ namespace Histacom2.OS.Win95.Win95Apps
                     break;
                 case "web chat setup":
                     Win95Installer inst = new Win95Installer("Web Chat 1998");
-                    inst.InstallCompleted += (sendr, args) => TitleScreen.frm95.WebChatToolStripMenuItem.Visible = true;
+                    inst.InstallCompleted += (sendr, args) => { TitleScreen.frm95.WebChatToolStripMenuItem.Visible = true; CurrentSave.installed95[0] = true; SaveGame(); };
                     WinClassic appInstaller = wm.Init(inst, "Web Chat Setup", null, true, true);
                     Program.AddTaskbarItem(appInstaller, appInstaller.Tag.ToString(), "Web Chat Setup", null);
                     appInstaller.BringToFront();
@@ -318,6 +318,8 @@ namespace Histacom2.OS.Win95.Win95Apps
                         SaveDirectoryInfo(Path.Combine(ProfileProgramsDirectory, "12padams"), "FTP Client", true, "FTP Client", true);
                         CreateWindowsFile(Path.Combine(ProfileProgramsDirectory, "12padams", "FTP Client"), "ftpclint.exe", "ftp client", 19, 58395);
                         TitleScreen.frm95.FTPClientToolStripMenuItem.Visible = true;
+                        CurrentSave.installed95[1] = true;
+                        SaveGame();
                     };
                     WinClassic appFtp = wm.Init(instFtp, "FTP Client Setup", null, true, true);
                     Program.AddTaskbarItem(appFtp, appFtp.Tag.ToString(), "FTP Client Setup", null);
@@ -332,6 +334,8 @@ namespace Histacom2.OS.Win95.Win95Apps
                         SaveDirectoryInfo(Path.Combine(ProfileProgramsDirectory, "12padams"), "Time Distorter 0.1", true, "Time Distorter 0.1", true);
                         CreateWindowsFile(Path.Combine(ProfileProgramsDirectory, "12padams", "Time Distorter 0.1"), "tdistort.exe", "time distorter", 17, 23895);
                         TitleScreen.frm95.TimeDistorterToolStripMenuItem.Visible = true;
+                        CurrentSave.installed95[5] = true;
+                        SaveGame();
                     };
                     WinClassic appTd = wm.Init(instTd, "Time Distorter Setup", null, true, true);
                     Program.AddTaskbarItem(appTd, appTd.Tag.ToString(), "Time Distorter Setup", null);
@@ -350,6 +354,8 @@ namespace Histacom2.OS.Win95.Win95Apps
                         SaveDirectoryInfo(Path.Combine(ProfileProgramsDirectory, "12padams"), "Guess The Number V1", true, "Guess The Number V1", true);
                         CreateWindowsFile(Path.Combine(ProfileProgramsDirectory, "12padams", "Guess The Number V1"), "guessnum.exe", "guess number", 18, 17483);
                         TitleScreen.frm95.GuessTheNumberToolStripMenuItem.Visible = true;
+                        CurrentSave.installed95[6] = true;
+                        SaveGame();
                     };
                     WinClassic appGtn = wm.Init(instGtn, "Guess The Number Setup", null, true, true);
                     Program.AddTaskbarItem(appGtn, appGtn.Tag.ToString(), "Guess The Number Setup", null);
@@ -367,7 +373,7 @@ namespace Histacom2.OS.Win95.Win95Apps
                     break;
                 case "eb95 setup":
                     Win95Installer ebInstall = new Win95Installer("Error Blaster 95");
-                    ebInstall.InstallCompleted += (sender, args) => TitleScreen.frm95.ErrorBlasterToolStripMenuItem.Visible = true;
+                    ebInstall.InstallCompleted += (sender, args) => { TitleScreen.frm95.ErrorBlasterToolStripMenuItem.Visible = true; CurrentSave.installed95[3] = true; };
                     WinClassic installer = wm.Init(ebInstall, "Error Blaster 95 Setup", null, true, true);
                     Program.AddTaskbarItem(installer, installer.Tag.ToString(), "Error Blaster 95 Setup", null);
                     installer.BringToFront();
@@ -380,9 +386,9 @@ namespace Histacom2.OS.Win95.Win95Apps
                     break;
                 case "sr95 setup":
                     Win95Installer srInstall = new Win95Installer("Start Runner 95");
-                    srInstall.InstallCompleted += (sender, args) => TitleScreen.frm95.ErrorBlasterToolStripMenuItem.Visible = true;
+                    srInstall.InstallCompleted += (sender, args) => { TitleScreen.frm95.StartRunnerToolStripMenuItem.Visible = true; CurrentSave.installed95[2] = true; };
                     WinClassic install = wm.Init(srInstall, "Start Runner 95 Setup", null, true, true);
-                    Program.AddTaskbarItem(install, install.Tag.ToString(), "Error Blaster 95 Setup", null);
+                    Program.AddTaskbarItem(install, install.Tag.ToString(), "Start Runner 95 Setup", null);
                     install.BringToFront();
                     break;
                 default:
diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs
index 63e056b..c112e61 100644
--- a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs
+++ b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs
@@ -78,8 +78,12 @@
             // 
             // btnLogin
             // 
+            this.btnLogin.AdaptBackColorWithTheme = true;
+            this.btnLogin.AdaptFontWithTheme = true;
+            this.btnLogin.AdaptForeColorWithTheme = true;
             this.btnLogin.BackColor = System.Drawing.Color.Silver;
-            this.btnLogin.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btnLogin.DialogResult = System.Windows.Forms.DialogResult.None;
+            this.btnLogin.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F);
             this.btnLogin.ForeColor = System.Drawing.Color.Black;
             this.btnLogin.Location = new System.Drawing.Point(585, 4);
             this.btnLogin.Name = "btnLogin";
@@ -184,7 +188,12 @@
             // 
             // btnCancel
             // 
+            this.btnCancel.AdaptBackColorWithTheme = true;
+            this.btnCancel.AdaptFontWithTheme = true;
+            this.btnCancel.AdaptForeColorWithTheme = true;
             this.btnCancel.BackColor = System.Drawing.Color.Silver;
+            this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.None;
+            this.btnCancel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F);
             this.btnCancel.ForeColor = System.Drawing.Color.Black;
             this.btnCancel.Location = new System.Drawing.Point(3, 2);
             this.btnCancel.Name = "btnCancel";
@@ -227,7 +236,7 @@
             this.ftpFiles.UseCompatibleStateImageBehavior = false;
             this.ftpFiles.View = System.Windows.Forms.View.List;
             this.ftpFiles.Visible = false;
-            this.ftpFiles.Click += new System.EventHandler(this.ftpItems_Click);
+            this.ftpFiles.DoubleClick += new System.EventHandler(this.ftpFiles_DoubleClick);
             // 
             // fileIcons
             // 
diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs
index 55a4ee2..df531c3 100644
--- a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs
+++ b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs
@@ -56,7 +56,23 @@ namespace Histacom2.OS.Win95.Win95Apps
             }
         }
 
-        private void ftpItems_Click(object sender, EventArgs e)
+
+        private void btnCancel_Click(object sender, EventArgs e)
+        {
+            ParentForm.Close();
+        }
+
+        private void WinClassicFTPClient_Load(object sender, EventArgs e)
+        {
+            
+        }
+
+        private void topBar_Paint(object sender, PaintEventArgs e)
+        {
+            topBar.BackColor = SaveSystem.currentTheme.threeDObjectsColor;
+        }
+
+        private void ftpFiles_DoubleClick(object sender, EventArgs e)
         {
             try
             {
@@ -120,20 +136,5 @@ namespace Histacom2.OS.Win95.Win95Apps
                 }
             } catch { } // Try catch due to if you have more then one item selected the game crashing.
         }
-
-        private void btnCancel_Click(object sender, EventArgs e)
-        {
-            ParentForm.Close();
-        }
-
-        private void WinClassicFTPClient_Load(object sender, EventArgs e)
-        {
-            
-        }
-
-        private void topBar_Paint(object sender, PaintEventArgs e)
-        {
-            topBar.BackColor = SaveSystem.currentTheme.threeDObjectsColor;
-        }
     }
 }
diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.resx b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.resx
index 9dd3ac3..e03fcd1 100644
--- a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.resx
+++ b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.resx
@@ -128,7 +128,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABe
-        EgAAAk1TRnQBSQFMAgEBAwEAATABAAEwAQABIAEAASABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        EgAAAk1TRnQBSQFMAgEBAwEAAUABAAFAAQABIAEAASABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABgAMAASADAAEBAQABCAYAARAYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicIE3.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicIE3.cs
index de2e4b0..34828cc 100644
--- a/Histacom2/OS/Win95/Win95Apps/WinClassicIE3.cs
+++ b/Histacom2/OS/Win95/Win95Apps/WinClassicIE3.cs
@@ -34,6 +34,7 @@ namespace Histacom2.OS.Win95.Win95Apps
 
         public static async void GoToPage(string url)
         {
+            string newURL = url;
             UserControl uc = new UserControl();
 
             switch (url)
@@ -50,12 +51,24 @@ namespace Histacom2.OS.Win95.Win95Apps
                 case "www.12padams.com":
                     uc = new _12padams1998();
                     break;
+                case "12padams.com":
+                    uc = new _12padams1998();
+                    newURL = "www.12padams.com";
+                    break;
+                case "google.com":
+                    uc = new GoogleHome();
+                    newURL = "www.google.com";
+                    break;
+                case "google.stanford.edu":
+                    uc = new GooglePrototype();
+                    newURL = "www.google.stanford.edu";
+                    break;
                 default:
                     uc = new IENoPage();
                     break;
             }
 
-            addressbar.Text = url;
+            addressbar.Text = newURL;
             uc.Dock = DockStyle.Fill;
 
             await Task.Delay(new Random().Next(500, 1500));
diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicTerminal.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicTerminal.cs
index d87dc4e..6e2371a 100644
--- a/Histacom2/OS/Win95/Win95Apps/WinClassicTerminal.cs
+++ b/Histacom2/OS/Win95/Win95Apps/WinClassicTerminal.cs
@@ -54,10 +54,16 @@ namespace Histacom2.OS.Win95.Win95Apps
             {
                 actionPanel.Hide();
                 cmdPrompt.ReadOnly = true;
+                if (SaveSystem.CurrentSave.CurrentOS == "xpbad")
+                {
+                    cmdPrompt.BorderStyle = BorderStyle.None;
+                    cmdPrompt.ScrollBars = RichTextBoxScrollBars.Vertical;
+                }
             }
             else
             {
-                cmdPrompt.AppendText("\nMicrosoft<R> Windows 95\n   <C>Copyright Microsoft Corp 1981-1995.\n\n");
+                if (SaveSystem.CurrentSave.CurrentOS == "95") cmdPrompt.AppendText("\nMicrosoft<R> Windows 95\n   <C>Copyright Microsoft Corp 1981-1995.\n\n");
+                if (SaveSystem.CurrentSave.CurrentOS == "98") cmdPrompt.AppendText("\nMicrosoft<R> Windows 98\n   <C>Copyright Microsoft Corp 1981-1998.\n\n");
                 cmdPrompt.AppendText(prefix);
             }
         }
@@ -68,7 +74,8 @@ namespace Histacom2.OS.Win95.Win95Apps
         public void WriteLine(string Text)
         {
             cmdPrompt.AppendText(Text + "\n");
-            this.Update();
+            cmdPrompt.Update();
+            cmdPrompt.ScrollToCaret();
         }
 
         /// <summary>
diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicTimeDistorter.Designer.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicTimeDistorter.Designer.cs
index 33ab4f2..9421bdc 100644
--- a/Histacom2/OS/Win95/Win95Apps/WinClassicTimeDistorter.Designer.cs
+++ b/Histacom2/OS/Win95/Win95Apps/WinClassicTimeDistorter.Designer.cs
@@ -104,10 +104,17 @@
             // 
             // btnGo
             // 
-            this.btnGo.Location = new System.Drawing.Point(162, 133);
+            this.btnGo.AdaptBackColorWithTheme = true;
+            this.btnGo.AdaptFontWithTheme = true;
+            this.btnGo.AdaptForeColorWithTheme = true;
+            this.btnGo.BackColor = System.Drawing.Color.Silver;
+            this.btnGo.DialogResult = System.Windows.Forms.DialogResult.None;
+            this.btnGo.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F);
+            this.btnGo.ForeColor = System.Drawing.Color.Black;
+            this.btnGo.Location = new System.Drawing.Point(155, 133);
             this.btnGo.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
             this.btnGo.Name = "btnGo";
-            this.btnGo.Size = new System.Drawing.Size(124, 23);
+            this.btnGo.Size = new System.Drawing.Size(131, 23);
             this.btnGo.TabIndex = 7;
             this.btnGo.Text = "Go To Destination Year";
             this.btnGo.Click += new System.EventHandler(this.btnGo_Click);