Merge remote-tracking branch 'TheRandomMelon/master'

3 files changed, 83 insertions, 54 deletions

diff --git a/Histacom2/OS/Win95/Win95.Designer.cs b/Histacom2/OS/Win95/Win95.Designer.cs
index 12c1509..ed21560 100644
--- a/Histacom2/OS/Win95/Win95.Designer.cs
+++ b/Histacom2/OS/Win95/Win95.Designer.cs
@@ -108,6 +108,7 @@ namespace Histacom2.OS.Win95
             this.deleteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.PropertiesToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
             this.desktopupdate = new System.Windows.Forms.Timer(this.components);
+            this.waitUntil95Loaded = new System.Windows.Forms.Timer(this.components);
             this.panel1.SuspendLayout();
             this.taskbar.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.startbutton)).BeginInit();
@@ -285,7 +286,7 @@ namespace Histacom2.OS.Win95
             this.AccessoriesToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.AccessoriesToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.AccessoriesToolStripMenuItem.Name = "AccessoriesToolStripMenuItem";
-            this.AccessoriesToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
+            this.AccessoriesToolStripMenuItem.Size = new System.Drawing.Size(172, 28);
             this.AccessoriesToolStripMenuItem.Text = "Accessories";
             // 
             // CommunicationsToolStripMenuItem
@@ -299,7 +300,7 @@ namespace Histacom2.OS.Win95
             this.CommunicationsToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicProgramItem;
             this.CommunicationsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.CommunicationsToolStripMenuItem.Name = "CommunicationsToolStripMenuItem";
-            this.CommunicationsToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
+            this.CommunicationsToolStripMenuItem.Size = new System.Drawing.Size(169, 28);
             this.CommunicationsToolStripMenuItem.Text = "Communications";
             // 
             // InternetConnectionWizardToolStripMenuItem
@@ -337,7 +338,7 @@ namespace Histacom2.OS.Win95
             this.MultimediaToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicProgramItem;
             this.MultimediaToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.MultimediaToolStripMenuItem.Name = "MultimediaToolStripMenuItem";
-            this.MultimediaToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
+            this.MultimediaToolStripMenuItem.Size = new System.Drawing.Size(169, 28);
             this.MultimediaToolStripMenuItem.Text = "Multimedia";
             // 
             // CDPlayerToolStripMenuItem
@@ -395,7 +396,7 @@ namespace Histacom2.OS.Win95
             this.toolStripMenuItem1.Image = global::Histacom2.Properties.Resources.WinClassicProgramItem;
             this.toolStripMenuItem1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.toolStripMenuItem1.Name = "toolStripMenuItem1";
-            this.toolStripMenuItem1.Size = new System.Drawing.Size(186, 28);
+            this.toolStripMenuItem1.Size = new System.Drawing.Size(169, 28);
             this.toolStripMenuItem1.Text = "System Tools";
             // 
             // toolStripMenuItem2
@@ -406,7 +407,7 @@ namespace Histacom2.OS.Win95
             this.toolStripMenuItem2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem2.Image")));
             this.toolStripMenuItem2.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.toolStripMenuItem2.Name = "toolStripMenuItem2";
-            this.toolStripMenuItem2.Size = new System.Drawing.Size(180, 22);
+            this.toolStripMenuItem2.Size = new System.Drawing.Size(162, 22);
             this.toolStripMenuItem2.Text = "Disk Defragmenter";
             // 
             // toolStripMenuItem3
@@ -417,7 +418,7 @@ namespace Histacom2.OS.Win95
             this.toolStripMenuItem3.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem3.Image")));
             this.toolStripMenuItem3.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.toolStripMenuItem3.Name = "toolStripMenuItem3";
-            this.toolStripMenuItem3.Size = new System.Drawing.Size(180, 22);
+            this.toolStripMenuItem3.Size = new System.Drawing.Size(162, 22);
             this.toolStripMenuItem3.Text = "ScanDisk";
             // 
             // GamesToolStripMenuItem
@@ -430,7 +431,7 @@ namespace Histacom2.OS.Win95
             this.GamesToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicProgramItem;
             this.GamesToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.GamesToolStripMenuItem.Name = "GamesToolStripMenuItem";
-            this.GamesToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
+            this.GamesToolStripMenuItem.Size = new System.Drawing.Size(169, 28);
             this.GamesToolStripMenuItem.Text = "Games";
             // 
             // MinsweeperToolStripMenuItem
@@ -440,7 +441,7 @@ namespace Histacom2.OS.Win95
             this.MinsweeperToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
             this.MinsweeperToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicMinesweeper;
             this.MinsweeperToolStripMenuItem.Name = "MinsweeperToolStripMenuItem";
-            this.MinsweeperToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.MinsweeperToolStripMenuItem.Size = new System.Drawing.Size(137, 22);
             this.MinsweeperToolStripMenuItem.Text = "Minesweeper";
             this.MinsweeperToolStripMenuItem.Click += new System.EventHandler(this.MinsweeperToolStripMenuItem_Click);
             // 
@@ -452,7 +453,7 @@ namespace Histacom2.OS.Win95
             this.CalculatorToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("CalculatorToolStripMenuItem.Image")));
             this.CalculatorToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.CalculatorToolStripMenuItem.Name = "CalculatorToolStripMenuItem";
-            this.CalculatorToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
+            this.CalculatorToolStripMenuItem.Size = new System.Drawing.Size(169, 28);
             this.CalculatorToolStripMenuItem.Text = "Calculator";
             this.CalculatorToolStripMenuItem.Click += new System.EventHandler(this.CalculatorToolStripMenuItem_Click);
             // 
@@ -464,7 +465,7 @@ namespace Histacom2.OS.Win95
             this.HyperTerminalToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicFolderSmall;
             this.HyperTerminalToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.HyperTerminalToolStripMenuItem.Name = "HyperTerminalToolStripMenuItem";
-            this.HyperTerminalToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
+            this.HyperTerminalToolStripMenuItem.Size = new System.Drawing.Size(169, 28);
             this.HyperTerminalToolStripMenuItem.Text = "HyperTerminal";
             // 
             // ImagingToolStripMenuItem
@@ -475,7 +476,7 @@ namespace Histacom2.OS.Win95
             this.ImagingToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("ImagingToolStripMenuItem.Image")));
             this.ImagingToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.ImagingToolStripMenuItem.Name = "ImagingToolStripMenuItem";
-            this.ImagingToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
+            this.ImagingToolStripMenuItem.Size = new System.Drawing.Size(169, 28);
             this.ImagingToolStripMenuItem.Text = "Imaging";
             // 
             // NotePadToolStripMenuItem
@@ -486,7 +487,7 @@ namespace Histacom2.OS.Win95
             this.NotePadToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("NotePadToolStripMenuItem.Image")));
             this.NotePadToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.NotePadToolStripMenuItem.Name = "NotePadToolStripMenuItem";
-            this.NotePadToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
+            this.NotePadToolStripMenuItem.Size = new System.Drawing.Size(169, 28);
             this.NotePadToolStripMenuItem.Text = "Notepad";
             this.NotePadToolStripMenuItem.Click += new System.EventHandler(this.NotePadToolStripMenuItem_Click);
             // 
@@ -498,7 +499,7 @@ namespace Histacom2.OS.Win95
             this.OnlineRegistrationToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("OnlineRegistrationToolStripMenuItem.Image")));
             this.OnlineRegistrationToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.OnlineRegistrationToolStripMenuItem.Name = "OnlineRegistrationToolStripMenuItem";
-            this.OnlineRegistrationToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
+            this.OnlineRegistrationToolStripMenuItem.Size = new System.Drawing.Size(169, 28);
             this.OnlineRegistrationToolStripMenuItem.Text = "Online Registration";
             // 
             // PaintToolStripMenuItem
@@ -509,7 +510,7 @@ namespace Histacom2.OS.Win95
             this.PaintToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("PaintToolStripMenuItem.Image")));
             this.PaintToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.PaintToolStripMenuItem.Name = "PaintToolStripMenuItem";
-            this.PaintToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
+            this.PaintToolStripMenuItem.Size = new System.Drawing.Size(169, 28);
             this.PaintToolStripMenuItem.Text = "Paintbrush";
             // 
             // PhoneDialerToolStripMenuItem
@@ -520,7 +521,7 @@ namespace Histacom2.OS.Win95
             this.PhoneDialerToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("PhoneDialerToolStripMenuItem.Image")));
             this.PhoneDialerToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.PhoneDialerToolStripMenuItem.Name = "PhoneDialerToolStripMenuItem";
-            this.PhoneDialerToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
+            this.PhoneDialerToolStripMenuItem.Size = new System.Drawing.Size(169, 28);
             this.PhoneDialerToolStripMenuItem.Text = "Phone Dialer";
             // 
             // WordPadToolStripMenuItem
@@ -531,7 +532,7 @@ namespace Histacom2.OS.Win95
             this.WordPadToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("WordPadToolStripMenuItem.Image")));
             this.WordPadToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.WordPadToolStripMenuItem.Name = "WordPadToolStripMenuItem";
-            this.WordPadToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
+            this.WordPadToolStripMenuItem.Size = new System.Drawing.Size(169, 28);
             this.WordPadToolStripMenuItem.Text = "WordPad";
             this.WordPadToolStripMenuItem.Click += new System.EventHandler(this.WordPadToolStripMenuItem_Click);
             // 
@@ -549,7 +550,7 @@ namespace Histacom2.OS.Win95
             this.StartUpToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.StartUpToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.StartUpToolStripMenuItem.Name = "StartUpToolStripMenuItem";
-            this.StartUpToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
+            this.StartUpToolStripMenuItem.Size = new System.Drawing.Size(172, 28);
             this.StartUpToolStripMenuItem.Text = "Online Services";
             // 
             // AOLInternetFREETrialToolStripMenuItem
@@ -602,7 +603,7 @@ namespace Histacom2.OS.Win95
             this.MSDOSPromptToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.MSDOSPromptToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.MSDOSPromptToolStripMenuItem.Name = "MSDOSPromptToolStripMenuItem";
-            this.MSDOSPromptToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
+            this.MSDOSPromptToolStripMenuItem.Size = new System.Drawing.Size(172, 28);
             this.MSDOSPromptToolStripMenuItem.Text = "StartUp";
             // 
             // EmptyToolStripMenuItem
@@ -611,7 +612,7 @@ namespace Histacom2.OS.Win95
             this.EmptyToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver;
             this.EmptyToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
             this.EmptyToolStripMenuItem.Name = "EmptyToolStripMenuItem";
-            this.EmptyToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.EmptyToolStripMenuItem.Size = new System.Drawing.Size(109, 22);
             this.EmptyToolStripMenuItem.Text = "(Empty)";
             // 
             // InternetExplorerToolStripMenuItem
@@ -623,7 +624,7 @@ namespace Histacom2.OS.Win95
             this.InternetExplorerToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.InternetExplorerToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.InternetExplorerToolStripMenuItem.Name = "InternetExplorerToolStripMenuItem";
-            this.InternetExplorerToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
+            this.InternetExplorerToolStripMenuItem.Size = new System.Drawing.Size(172, 28);
             this.InternetExplorerToolStripMenuItem.Text = "Internet Explorer";
             this.InternetExplorerToolStripMenuItem.Click += new System.EventHandler(this.InternetExplorerToolStripMenuItem_Click);
             // 
@@ -636,7 +637,7 @@ namespace Histacom2.OS.Win95
             this.MSDOSPromptToolStripMenuItem1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.MSDOSPromptToolStripMenuItem1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.MSDOSPromptToolStripMenuItem1.Name = "MSDOSPromptToolStripMenuItem1";
-            this.MSDOSPromptToolStripMenuItem1.Size = new System.Drawing.Size(186, 28);
+            this.MSDOSPromptToolStripMenuItem1.Size = new System.Drawing.Size(172, 28);
             this.MSDOSPromptToolStripMenuItem1.Text = "MS-DOS Prompt";
             this.MSDOSPromptToolStripMenuItem1.Click += new System.EventHandler(this.MSDOSPromptToolStripMenuItem1_Click);
             // 
@@ -649,7 +650,7 @@ namespace Histacom2.OS.Win95
             this.OutlookExpressToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.OutlookExpressToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.OutlookExpressToolStripMenuItem.Name = "OutlookExpressToolStripMenuItem";
-            this.OutlookExpressToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
+            this.OutlookExpressToolStripMenuItem.Size = new System.Drawing.Size(172, 28);
             this.OutlookExpressToolStripMenuItem.Text = "Outlook Express";
             // 
             // WindowsExplorerToolStripMenuItem1
@@ -661,7 +662,7 @@ namespace Histacom2.OS.Win95
             this.WindowsExplorerToolStripMenuItem1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.WindowsExplorerToolStripMenuItem1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.WindowsExplorerToolStripMenuItem1.Name = "WindowsExplorerToolStripMenuItem1";
-            this.WindowsExplorerToolStripMenuItem1.Size = new System.Drawing.Size(186, 28);
+            this.WindowsExplorerToolStripMenuItem1.Size = new System.Drawing.Size(172, 28);
             this.WindowsExplorerToolStripMenuItem1.Text = "Windows Explorer";
             this.WindowsExplorerToolStripMenuItem1.Click += new System.EventHandler(this.WindowsExplorerToolStripMenuItem1_Click);
             // 
@@ -672,7 +673,7 @@ namespace Histacom2.OS.Win95
             this.GuessTheNumberToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
             this.GuessTheNumberToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicGTNIcon;
             this.GuessTheNumberToolStripMenuItem.Name = "GuessTheNumberToolStripMenuItem";
-            this.GuessTheNumberToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
+            this.GuessTheNumberToolStripMenuItem.Size = new System.Drawing.Size(172, 28);
             this.GuessTheNumberToolStripMenuItem.Text = "Guess The Number";
             this.GuessTheNumberToolStripMenuItem.Visible = false;
             this.GuessTheNumberToolStripMenuItem.Click += new System.EventHandler(this.GuessTheNumberToolStripMenuItem_Click);
@@ -683,7 +684,7 @@ namespace Histacom2.OS.Win95
             this.StartRunnerToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver;
             this.StartRunnerToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
             this.StartRunnerToolStripMenuItem.Name = "StartRunnerToolStripMenuItem";
-            this.StartRunnerToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
+            this.StartRunnerToolStripMenuItem.Size = new System.Drawing.Size(172, 28);
             this.StartRunnerToolStripMenuItem.Text = "Start Runner";
             this.StartRunnerToolStripMenuItem.Visible = false;
             this.StartRunnerToolStripMenuItem.Click += new System.EventHandler(this.StartRunnerToolStripMenuItem_Click);
@@ -695,7 +696,7 @@ namespace Histacom2.OS.Win95
             this.ErrorBlasterToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
             this.ErrorBlasterToolStripMenuItem.Image = global::Histacom2.Properties.Resources.Win95Error;
             this.ErrorBlasterToolStripMenuItem.Name = "ErrorBlasterToolStripMenuItem";
-            this.ErrorBlasterToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
+            this.ErrorBlasterToolStripMenuItem.Size = new System.Drawing.Size(172, 28);
             this.ErrorBlasterToolStripMenuItem.Text = "Error Blaster 95";
             this.ErrorBlasterToolStripMenuItem.Visible = false;
             this.ErrorBlasterToolStripMenuItem.Click += new System.EventHandler(this.ErrorBlasterToolStripMenuItem_Click);
@@ -706,7 +707,7 @@ namespace Histacom2.OS.Win95
             this.SkindowsToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver;
             this.SkindowsToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
             this.SkindowsToolStripMenuItem.Name = "SkindowsToolStripMenuItem";
-            this.SkindowsToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
+            this.SkindowsToolStripMenuItem.Size = new System.Drawing.Size(172, 28);
             this.SkindowsToolStripMenuItem.Text = "Skindows 95";
             this.SkindowsToolStripMenuItem.Visible = false;
             // 
@@ -717,7 +718,7 @@ namespace Histacom2.OS.Win95
             this.WebChatToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
             this.WebChatToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicWebchat;
             this.WebChatToolStripMenuItem.Name = "WebChatToolStripMenuItem";
-            this.WebChatToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
+            this.WebChatToolStripMenuItem.Size = new System.Drawing.Size(172, 28);
             this.WebChatToolStripMenuItem.Text = "Web Chat";
             this.WebChatToolStripMenuItem.Visible = false;
             this.WebChatToolStripMenuItem.Click += new System.EventHandler(this.WebChatToolStripMenuItem_Click);
@@ -729,7 +730,7 @@ namespace Histacom2.OS.Win95
             this.TimeDistorterToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
             this.TimeDistorterToolStripMenuItem.Image = global::Histacom2.Properties.Resources.TimeDistorter1Icon;
             this.TimeDistorterToolStripMenuItem.Name = "TimeDistorterToolStripMenuItem";
-            this.TimeDistorterToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
+            this.TimeDistorterToolStripMenuItem.Size = new System.Drawing.Size(172, 28);
             this.TimeDistorterToolStripMenuItem.Text = "Time Distorter";
             this.TimeDistorterToolStripMenuItem.Visible = false;
             this.TimeDistorterToolStripMenuItem.Click += new System.EventHandler(this.TimeDistorterToolStripMenuItem_Click);
@@ -741,7 +742,7 @@ namespace Histacom2.OS.Win95
             this.FTPClientToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
             this.FTPClientToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicFTPIcon;
             this.FTPClientToolStripMenuItem.Name = "FTPClientToolStripMenuItem";
-            this.FTPClientToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
+            this.FTPClientToolStripMenuItem.Size = new System.Drawing.Size(172, 28);
             this.FTPClientToolStripMenuItem.Text = "FTP Client";
             this.FTPClientToolStripMenuItem.Visible = false;
             this.FTPClientToolStripMenuItem.Click += new System.EventHandler(this.FTPClientToolStripMenuItem_Click);
@@ -790,7 +791,7 @@ namespace Histacom2.OS.Win95
             this.ControlPanelToolStripMenuItem.Image = global::Histacom2.Properties.Resources.Win95ControlPanelIcon;
             this.ControlPanelToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.ControlPanelToolStripMenuItem.Name = "ControlPanelToolStripMenuItem";
-            this.ControlPanelToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.ControlPanelToolStripMenuItem.Size = new System.Drawing.Size(137, 22);
             this.ControlPanelToolStripMenuItem.Text = "Control Panel";
             // 
             // PrintersToolStripMenuItem
@@ -800,7 +801,7 @@ namespace Histacom2.OS.Win95
             this.PrintersToolStripMenuItem.Image = global::Histacom2.Properties.Resources.Win95PrintersFolder;
             this.PrintersToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.PrintersToolStripMenuItem.Name = "PrintersToolStripMenuItem";
-            this.PrintersToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.PrintersToolStripMenuItem.Size = new System.Drawing.Size(137, 22);
             this.PrintersToolStripMenuItem.Text = "Printers";
             // 
             // TaskbarToolStripMenuItem
@@ -809,7 +810,7 @@ namespace Histacom2.OS.Win95
             this.TaskbarToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("TaskbarToolStripMenuItem.BackgroundImage")));
             this.TaskbarToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.TaskbarToolStripMenuItem.Name = "TaskbarToolStripMenuItem";
-            this.TaskbarToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.TaskbarToolStripMenuItem.Size = new System.Drawing.Size(137, 22);
             this.TaskbarToolStripMenuItem.Text = "Taskbar";
             // 
             // FindToolStripMenuItem
@@ -841,7 +842,7 @@ namespace Histacom2.OS.Win95
             this.FilesOrFoldersToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("FilesOrFoldersToolStripMenuItem.BackgroundImage")));
             this.FilesOrFoldersToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.FilesOrFoldersToolStripMenuItem.Name = "FilesOrFoldersToolStripMenuItem";
-            this.FilesOrFoldersToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.FilesOrFoldersToolStripMenuItem.Size = new System.Drawing.Size(154, 22);
             this.FilesOrFoldersToolStripMenuItem.Text = "Files or Folders...";
             // 
             // ComputerToolStripMenuItem
@@ -850,7 +851,7 @@ namespace Histacom2.OS.Win95
             this.ComputerToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("ComputerToolStripMenuItem.BackgroundImage")));
             this.ComputerToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.ComputerToolStripMenuItem.Name = "ComputerToolStripMenuItem";
-            this.ComputerToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.ComputerToolStripMenuItem.Size = new System.Drawing.Size(154, 22);
             this.ComputerToolStripMenuItem.Text = "Computer...";
             // 
             // OnTheInternetToolStripMenuItem
@@ -859,7 +860,7 @@ namespace Histacom2.OS.Win95
             this.OnTheInternetToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("OnTheInternetToolStripMenuItem.BackgroundImage")));
             this.OnTheInternetToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.OnTheInternetToolStripMenuItem.Name = "OnTheInternetToolStripMenuItem";
-            this.OnTheInternetToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.OnTheInternetToolStripMenuItem.Size = new System.Drawing.Size(154, 22);
             this.OnTheInternetToolStripMenuItem.Text = "On the Internet...";
             // 
             // PeopleToolStripMenuItem
@@ -868,7 +869,7 @@ namespace Histacom2.OS.Win95
             this.PeopleToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("PeopleToolStripMenuItem.BackgroundImage")));
             this.PeopleToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.PeopleToolStripMenuItem.Name = "PeopleToolStripMenuItem";
-            this.PeopleToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.PeopleToolStripMenuItem.Size = new System.Drawing.Size(154, 22);
             this.PeopleToolStripMenuItem.Text = "People...";
             // 
             // HelpToolStripMenuItem
@@ -1056,6 +1057,11 @@ namespace Histacom2.OS.Win95
             this.desktopupdate.Interval = 10000;
             this.desktopupdate.Tick += new System.EventHandler(this.desktopupdate_Tick);
             // 
+            // waitUntil95Loaded
+            // 
+            this.waitUntil95Loaded.Enabled = true;
+            this.waitUntil95Loaded.Tick += new System.EventHandler(this.waitUntil95Loaded_Tick);
+            // 
             // Windows95
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -1168,5 +1174,6 @@ namespace Histacom2.OS.Win95
         internal System.Windows.Forms.ToolStripMenuItem toolStripMenuItem3;
         public System.Windows.Forms.Panel clockPanel;
         public System.Windows.Forms.PictureBox startbutton;
+        private System.Windows.Forms.Timer waitUntil95Loaded;
     }
 }
\ No newline at end of file
diff --git a/Histacom2/OS/Win95/Win95.cs b/Histacom2/OS/Win95/Win95.cs
index ad828ba..c0f3622 100644
--- a/Histacom2/OS/Win95/Win95.cs
+++ b/Histacom2/OS/Win95/Win95.cs
@@ -36,6 +36,17 @@ namespace Histacom2.OS.Win95
 
         ListViewItem heldDownItem;
         Point heldDownPoint;
+        
+        // Overrides the Painting function of the Form, so that you don't see all that crap drawing.
+        protected override CreateParams CreateParams
+        {
+            get
+            {
+                CreateParams cp = base.CreateParams;
+                cp.ExStyle |= 0x02000000;  // Turn on WS_EX_COMPOSITED
+                return cp;
+            }
+        }
 
         // Init the form
         public Windows95()
@@ -113,22 +124,6 @@ namespace Histacom2.OS.Win95
             // Bring to this the front
             this.BringToFront();
 
-            //Check if it is the first time
-            if (!CurrentSave.FTime95)
-            {
-                CurrentSave.FTime95 = true;
-                SaveGame();
-                welcome = wm.Init(new Win95Welcome(), "Welcome", null, false, false, resize: false);
-                AddTaskBarItem(welcome, welcome.Tag.ToString(), "Welcome", null);
-
-                nonimportantapps.Add(welcome);
-                nonimportantapps[nonimportantapps.Count - 1].BringToFront();
-                nonimportantapps[nonimportantapps.Count - 1].FormClosing += new FormClosingEventHandler(NonImportantApp_Closing);
-
-                welcome.BringToFront();
-                welcome.Activate();
-            }
-
             // Update the Desktop icons
 
             DesktopController.RefreshDesktopIcons(new ListViewItem[] { new ListViewItem("My Computer", 0),
@@ -648,6 +643,30 @@ namespace Histacom2.OS.Win95
         {
             startmenu.Hide();
         }
+
+        private void waitUntil95Loaded_Tick(object sender, EventArgs e)
+        {
+            if (Visible)
+            {
+                //Check if it is the first time
+                if (!CurrentSave.FTime95)
+                {
+                    CurrentSave.FTime95 = true;
+                    SaveGame();
+                    welcome = wm.Init(new Win95Welcome(), "Welcome", null, false, false, resize: false);
+                    AddTaskBarItem(welcome, welcome.Tag.ToString(), "Welcome", null);
+
+                    nonimportantapps.Add(welcome);
+                    nonimportantapps[nonimportantapps.Count - 1].BringToFront();
+                    nonimportantapps[nonimportantapps.Count - 1].FormClosing += new FormClosingEventHandler(NonImportantApp_Closing);
+
+                    welcome.BringToFront();
+                    welcome.Activate();
+
+                    waitUntil95Loaded.Enabled = false;
+                }
+            }
+        }
     }
 }
 
diff --git a/Histacom2/OS/Win95/Win95.resx b/Histacom2/OS/Win95/Win95.resx
index 5e48cce..c1da639 100644
--- a/Histacom2/OS/Win95/Win95.resx
+++ b/Histacom2/OS/Win95/Win95.resx
@@ -360,7 +360,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACO
-        hAAAAk1TRnQBSQFMAgEBDQEAAVQBAwFUAQMBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA
+        hAAAAk1TRnQBSQFMAgEBDQEAAVwBAwFcAQMBIAEAASABAAT/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/
@@ -934,6 +934,9 @@
   <metadata name="desktopupdate.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>580, 17</value>
   </metadata>
+  <metadata name="waitUntil95Loaded.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>714, 17</value>
+  </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>92</value>
   </metadata>