Merge branch 'master' of https://github.com/Histacom2-Devs/Histacom2

44 files changed, 1110 insertions, 403 deletions

diff --git a/Histacom2/OS/Win95/Win95.Designer.cs b/Histacom2/OS/Win95/Win95.Designer.cs
index 40f40ca..8f8443c 100644
--- a/Histacom2/OS/Win95/Win95.Designer.cs
+++ b/Histacom2/OS/Win95/Win95.Designer.cs
@@ -41,7 +41,7 @@ namespace Histacom2.OS.Win95
             this.startbutton = new System.Windows.Forms.PictureBox();
             this.startmenu = new System.Windows.Forms.Panel();
             this.startmenuitems = new System.Windows.Forms.MenuStrip();
-            this.ProgramsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.ProgramsToolStripMenuItem = new Histacom2.Engine.UI.ClassicStartMenuItem();
             this.AccessoriesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.CommunicationsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.InternetConnectionWizardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -82,23 +82,23 @@ namespace Histacom2.OS.Win95
             this.WebChatToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.TimeDistorterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.FTPClientToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.DocumentsToolStripMenuItem = 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 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();
             this.TaskbarToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.FindToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.FindToolStripMenuItem = new Histacom2.Engine.UI.ClassicStartMenuItem();
             this.FilesOrFoldersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.ComputerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.OnTheInternetToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.PeopleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.HelpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.RunToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SuspendToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.ShutdownToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.HelpToolStripMenuItem = new Histacom2.Engine.UI.ClassicStartMenuItem();
+            this.RunToolStripMenuItem = new Histacom2.Engine.UI.ClassicStartMenuItem();
+            this.SuspendToolStripMenuItem = new Histacom2.Engine.UI.ClassicStartMenuItem();
+            this.ShutdownToolStripMenuItem = new Histacom2.Engine.UI.ClassicStartMenuItem();
             this.ossidestartmenu = new System.Windows.Forms.Panel();
             this.osimage = new System.Windows.Forms.PictureBox();
             this.clockTimer = new System.Windows.Forms.Timer(this.components);
@@ -144,14 +144,15 @@ namespace Histacom2.OS.Win95
             // 
             this.taskbar.BackColor = System.Drawing.Color.Silver;
             this.taskbar.BackgroundImage = global::Histacom2.Properties.Resources.WinClassicTaskBar;
+            this.taskbar.Controls.Add(this.startbutton);
             this.taskbar.Controls.Add(this.clockPanel);
             this.taskbar.Controls.Add(this.taskbarItems);
-            this.taskbar.Controls.Add(this.startbutton);
             this.taskbar.Dock = System.Windows.Forms.DockStyle.Bottom;
             this.taskbar.Location = new System.Drawing.Point(0, 452);
             this.taskbar.Name = "taskbar";
             this.taskbar.Size = new System.Drawing.Size(640, 28);
             this.taskbar.TabIndex = 2;
+            this.taskbar.Paint += new System.Windows.Forms.PaintEventHandler(this.taskbar_Paint);
             // 
             // clockPanel
             // 
@@ -162,6 +163,7 @@ namespace Histacom2.OS.Win95
             this.clockPanel.Name = "clockPanel";
             this.clockPanel.Size = new System.Drawing.Size(65, 28);
             this.clockPanel.TabIndex = 4;
+            this.clockPanel.Paint += new System.Windows.Forms.PaintEventHandler(this.clockPanel_Paint);
             // 
             // taskbartime
             // 
@@ -199,15 +201,19 @@ namespace Histacom2.OS.Win95
             this.startmenu.BackColor = System.Drawing.Color.Silver;
             this.startmenu.Controls.Add(this.startmenuitems);
             this.startmenu.Controls.Add(this.ossidestartmenu);
-            this.startmenu.Location = new System.Drawing.Point(0, 160);
+            this.startmenu.Location = new System.Drawing.Point(2, 185);
             this.startmenu.Name = "startmenu";
-            this.startmenu.Size = new System.Drawing.Size(174, 300);
+            this.startmenu.Size = new System.Drawing.Size(168, 271);
             this.startmenu.TabIndex = 3;
+            this.startmenu.Paint += new System.Windows.Forms.PaintEventHandler(this.startmenu_Paint);
             // 
             // startmenuitems
             // 
+            this.startmenuitems.AutoSize = false;
             this.startmenuitems.BackColor = System.Drawing.Color.Silver;
+            this.startmenuitems.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver;
             this.startmenuitems.Dock = System.Windows.Forms.DockStyle.None;
+            this.startmenuitems.GripMargin = new System.Windows.Forms.Padding(0);
             this.startmenuitems.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.ProgramsToolStripMenuItem,
             this.DocumentsToolStripMenuItem,
@@ -218,17 +224,18 @@ namespace Histacom2.OS.Win95
             this.SuspendToolStripMenuItem,
             this.ShutdownToolStripMenuItem});
             this.startmenuitems.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.VerticalStackWithOverflow;
-            this.startmenuitems.Location = new System.Drawing.Point(26, 2);
-            this.startmenuitems.Margin = new System.Windows.Forms.Padding(0, 0, 5, 0);
+            this.startmenuitems.Location = new System.Drawing.Point(26, 5);
             this.startmenuitems.Name = "startmenuitems";
-            this.startmenuitems.Padding = new System.Windows.Forms.Padding(6, 2, 0, 0);
-            this.startmenuitems.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;
-            this.startmenuitems.Size = new System.Drawing.Size(145, 311);
+            this.startmenuitems.Padding = new System.Windows.Forms.Padding(3, 0, 0, 0);
+            this.startmenuitems.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional;
+            this.startmenuitems.Size = new System.Drawing.Size(137, 262);
             this.startmenuitems.TabIndex = 0;
             this.startmenuitems.Text = "StartMenu";
+            this.startmenuitems.Paint += new System.Windows.Forms.PaintEventHandler(this.startmenuitems_Paint);
             // 
             // ProgramsToolStripMenuItem
             // 
+            this.ProgramsToolStripMenuItem.AutoSize = false;
             this.ProgramsToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
             this.ProgramsToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver;
             this.ProgramsToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
@@ -251,9 +258,9 @@ namespace Histacom2.OS.Win95
             this.ProgramsToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.ProgramsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.ProgramsToolStripMenuItem.Name = "ProgramsToolStripMenuItem";
-            this.ProgramsToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0);
-            this.ProgramsToolStripMenuItem.Size = new System.Drawing.Size(138, 36);
-            this.ProgramsToolStripMenuItem.Text = "Programs";
+            this.ProgramsToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0);
+            this.ProgramsToolStripMenuItem.Size = new System.Drawing.Size(137, 32);
+            this.ProgramsToolStripMenuItem.Text = "&Programs";
             // 
             // AccessoriesToolStripMenuItem
             // 
@@ -686,10 +693,12 @@ namespace Histacom2.OS.Win95
             this.ErrorBlasterToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
             this.ErrorBlasterToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver;
             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(181, 28);
-            this.ErrorBlasterToolStripMenuItem.Text = "Error Blaster";
+            this.ErrorBlasterToolStripMenuItem.Text = "Error Blaster 95";
             this.ErrorBlasterToolStripMenuItem.Visible = false;
+            this.ErrorBlasterToolStripMenuItem.Click += new System.EventHandler(this.ErrorBlasterToolStripMenuItem_Click);
             // 
             // SkindowsToolStripMenuItem
             // 
@@ -739,6 +748,7 @@ namespace Histacom2.OS.Win95
             // 
             // DocumentsToolStripMenuItem
             // 
+            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[] {
@@ -749,9 +759,9 @@ namespace Histacom2.OS.Win95
             this.DocumentsToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.DocumentsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.DocumentsToolStripMenuItem.Name = "DocumentsToolStripMenuItem";
-            this.DocumentsToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0);
-            this.DocumentsToolStripMenuItem.Size = new System.Drawing.Size(138, 36);
-            this.DocumentsToolStripMenuItem.Text = "Documents";
+            this.DocumentsToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0);
+            this.DocumentsToolStripMenuItem.Size = new System.Drawing.Size(137, 32);
+            this.DocumentsToolStripMenuItem.Text = "&Documents";
             // 
             // downloaderTestToolStripMenuItem
             // 
@@ -781,6 +791,7 @@ namespace Histacom2.OS.Win95
             // 
             // SettingsToolStripMenuItem
             // 
+            this.SettingsToolStripMenuItem.AutoSize = false;
             this.SettingsToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
             this.SettingsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.ControlPanelToolStripMenuItem,
@@ -790,9 +801,9 @@ namespace Histacom2.OS.Win95
             this.SettingsToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.SettingsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.SettingsToolStripMenuItem.Name = "SettingsToolStripMenuItem";
-            this.SettingsToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0);
-            this.SettingsToolStripMenuItem.Size = new System.Drawing.Size(138, 36);
-            this.SettingsToolStripMenuItem.Text = "Settings";
+            this.SettingsToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0);
+            this.SettingsToolStripMenuItem.Size = new System.Drawing.Size(137, 32);
+            this.SettingsToolStripMenuItem.Text = "&Settings";
             // 
             // ControlPanelToolStripMenuItem
             // 
@@ -826,6 +837,7 @@ namespace Histacom2.OS.Win95
             // 
             // FindToolStripMenuItem
             // 
+            this.FindToolStripMenuItem.AutoSize = false;
             this.FindToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
             this.FindToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("FindToolStripMenuItem.BackgroundImage")));
             this.FindToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -837,10 +849,10 @@ namespace Histacom2.OS.Win95
             this.FindToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.FindToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.FindToolStripMenuItem.Name = "FindToolStripMenuItem";
-            this.FindToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0);
+            this.FindToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0);
             this.FindToolStripMenuItem.RightToLeft = System.Windows.Forms.RightToLeft.No;
-            this.FindToolStripMenuItem.Size = new System.Drawing.Size(138, 36);
-            this.FindToolStripMenuItem.Text = "Find";
+            this.FindToolStripMenuItem.Size = new System.Drawing.Size(137, 32);
+            this.FindToolStripMenuItem.Text = "&Find";
             // 
             // FilesOrFoldersToolStripMenuItem
             // 
@@ -850,6 +862,7 @@ 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
             // 
@@ -880,57 +893,61 @@ namespace Histacom2.OS.Win95
             // 
             // HelpToolStripMenuItem
             // 
+            this.HelpToolStripMenuItem.AutoSize = false;
             this.HelpToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
             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.Name = "HelpToolStripMenuItem";
-            this.HelpToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0);
+            this.HelpToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0);
             this.HelpToolStripMenuItem.RightToLeft = System.Windows.Forms.RightToLeft.No;
-            this.HelpToolStripMenuItem.Size = new System.Drawing.Size(138, 36);
-            this.HelpToolStripMenuItem.Text = "Help";
+            this.HelpToolStripMenuItem.Size = new System.Drawing.Size(137, 32);
+            this.HelpToolStripMenuItem.Text = "&Help";
             // 
             // RunToolStripMenuItem
             // 
+            this.RunToolStripMenuItem.AutoSize = false;
             this.RunToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
             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.Name = "RunToolStripMenuItem";
-            this.RunToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0);
+            this.RunToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0);
             this.RunToolStripMenuItem.RightToLeft = System.Windows.Forms.RightToLeft.No;
-            this.RunToolStripMenuItem.Size = new System.Drawing.Size(138, 36);
-            this.RunToolStripMenuItem.Text = "Run...";
+            this.RunToolStripMenuItem.Size = new System.Drawing.Size(137, 32);
+            this.RunToolStripMenuItem.Text = "&Run...";
             // 
             // SuspendToolStripMenuItem
             // 
+            this.SuspendToolStripMenuItem.AutoSize = false;
             this.SuspendToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
             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.Name = "SuspendToolStripMenuItem";
-            this.SuspendToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0);
-            this.SuspendToolStripMenuItem.Size = new System.Drawing.Size(138, 36);
-            this.SuspendToolStripMenuItem.Text = "Suspend";
+            this.SuspendToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0);
+            this.SuspendToolStripMenuItem.Size = new System.Drawing.Size(137, 32);
+            this.SuspendToolStripMenuItem.Text = "Suspe&nd";
             // 
             // ShutdownToolStripMenuItem
             // 
+            this.ShutdownToolStripMenuItem.AutoSize = false;
             this.ShutdownToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
             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.Name = "ShutdownToolStripMenuItem";
-            this.ShutdownToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0);
-            this.ShutdownToolStripMenuItem.Size = new System.Drawing.Size(138, 36);
-            this.ShutdownToolStripMenuItem.Text = "Shut Down...";
+            this.ShutdownToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0);
+            this.ShutdownToolStripMenuItem.Size = new System.Drawing.Size(137, 32);
+            this.ShutdownToolStripMenuItem.Text = "Sh&ut Down...";
             this.ShutdownToolStripMenuItem.Click += new System.EventHandler(this.ShutdownToolStripMenuItem_Click);
             // 
             // ossidestartmenu
             // 
             this.ossidestartmenu.Controls.Add(this.osimage);
-            this.ossidestartmenu.Location = new System.Drawing.Point(0, 0);
+            this.ossidestartmenu.Location = new System.Drawing.Point(3, 3);
             this.ossidestartmenu.Name = "ossidestartmenu";
-            this.ossidestartmenu.Size = new System.Drawing.Size(23, 297);
+            this.ossidestartmenu.Size = new System.Drawing.Size(21, 265);
             this.ossidestartmenu.TabIndex = 4;
             // 
             // osimage
@@ -939,7 +956,7 @@ namespace Histacom2.OS.Win95
             this.osimage.Image = global::Histacom2.Properties.Resources.Win95SideBar;
             this.osimage.Location = new System.Drawing.Point(0, 0);
             this.osimage.Name = "osimage";
-            this.osimage.Size = new System.Drawing.Size(23, 297);
+            this.osimage.Size = new System.Drawing.Size(21, 265);
             this.osimage.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
             this.osimage.TabIndex = 0;
             this.osimage.TabStop = false;
@@ -1050,8 +1067,8 @@ namespace Histacom2.OS.Win95
             this.BackColor = System.Drawing.Color.Teal;
             this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
             this.ClientSize = new System.Drawing.Size(640, 480);
-            this.Controls.Add(this.taskbar);
             this.Controls.Add(this.startmenu);
+            this.Controls.Add(this.taskbar);
             this.Controls.Add(this.panel1);
             this.Controls.Add(this.desktopicons);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
@@ -1066,7 +1083,6 @@ namespace Histacom2.OS.Win95
             this.clockPanel.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.startbutton)).EndInit();
             this.startmenu.ResumeLayout(false);
-            this.startmenu.PerformLayout();
             this.startmenuitems.ResumeLayout(false);
             this.startmenuitems.PerformLayout();
             this.ossidestartmenu.ResumeLayout(false);
@@ -1082,11 +1098,10 @@ namespace Histacom2.OS.Win95
         private System.Windows.Forms.Panel panel1;
         private System.Windows.Forms.Panel panel2;
         internal System.Windows.Forms.Panel taskbar;
-        internal System.Windows.Forms.PictureBox startbutton;
         internal System.Windows.Forms.Label taskbartime;
         internal System.Windows.Forms.Panel startmenu;
         internal System.Windows.Forms.MenuStrip startmenuitems;
-        internal System.Windows.Forms.ToolStripMenuItem ProgramsToolStripMenuItem;
+        internal Histacom2.Engine.UI.ClassicStartMenuItem ProgramsToolStripMenuItem;
         internal System.Windows.Forms.ToolStripMenuItem AccessoriesToolStripMenuItem;
         internal System.Windows.Forms.ToolStripMenuItem CommunicationsToolStripMenuItem;
         internal System.Windows.Forms.ToolStripMenuItem InternetConnectionWizardToolStripMenuItem;
@@ -1123,23 +1138,22 @@ namespace Histacom2.OS.Win95
         internal System.Windows.Forms.ToolStripMenuItem SkindowsToolStripMenuItem;
         internal System.Windows.Forms.ToolStripMenuItem WebChatToolStripMenuItem;
         internal System.Windows.Forms.ToolStripMenuItem TimeDistorterToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem DocumentsToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem SettingsToolStripMenuItem;
+        internal Histacom2.Engine.UI.ClassicStartMenuItem DocumentsToolStripMenuItem;
+        internal Histacom2.Engine.UI.ClassicStartMenuItem SettingsToolStripMenuItem;
         internal System.Windows.Forms.ToolStripMenuItem ControlPanelToolStripMenuItem;
         internal System.Windows.Forms.ToolStripMenuItem PrintersToolStripMenuItem;
         internal System.Windows.Forms.ToolStripMenuItem TaskbarToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem FindToolStripMenuItem;
+        internal Histacom2.Engine.UI.ClassicStartMenuItem FindToolStripMenuItem;
         internal System.Windows.Forms.ToolStripMenuItem FilesOrFoldersToolStripMenuItem;
         internal System.Windows.Forms.ToolStripMenuItem ComputerToolStripMenuItem;
         internal System.Windows.Forms.ToolStripMenuItem OnTheInternetToolStripMenuItem;
         internal System.Windows.Forms.ToolStripMenuItem PeopleToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem HelpToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem RunToolStripMenuItem;
+        internal Histacom2.Engine.UI.ClassicStartMenuItem HelpToolStripMenuItem;
+        internal Histacom2.Engine.UI.ClassicStartMenuItem RunToolStripMenuItem;
         internal System.Windows.Forms.Panel ossidestartmenu;
         internal System.Windows.Forms.PictureBox osimage;
-        internal System.Windows.Forms.ToolStripMenuItem ShutdownToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem SuspendToolStripMenuItem;
-        private System.Windows.Forms.Panel clockPanel;
+        internal Histacom2.Engine.UI.ClassicStartMenuItem ShutdownToolStripMenuItem;
+        internal Histacom2.Engine.UI.ClassicStartMenuItem SuspendToolStripMenuItem;
         private System.Windows.Forms.Timer clockTimer;
         private System.Windows.Forms.ImageList desktopImages;
         internal System.Windows.Forms.ListView desktopicons;
@@ -1159,5 +1173,7 @@ namespace Histacom2.OS.Win95
         internal System.Windows.Forms.ToolStripMenuItem toolStripMenuItem1;
         internal System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2;
         internal System.Windows.Forms.ToolStripMenuItem toolStripMenuItem3;
+        public System.Windows.Forms.Panel clockPanel;
+        public System.Windows.Forms.PictureBox startbutton;
     }
 }
\ No newline at end of file
diff --git a/Histacom2/OS/Win95/Win95.cs b/Histacom2/OS/Win95/Win95.cs
index 8d2e466..38129ab 100644
--- a/Histacom2/OS/Win95/Win95.cs
+++ b/Histacom2/OS/Win95/Win95.cs
@@ -10,6 +10,10 @@ using Histacom2.Engine.Template.Taskbars;
 using Histacom2.OS.Win95.Win95Apps;
 using Histacom2.OS.Win95.Win95Apps.Story;
 using static Histacom2.Engine.SaveSystem;
+using Histacom2.OS.Win95.Win95Apps._12padamViruses;
+using Histacom2.OS.Win95.Win95Apps._12padamsViruses;
+using Histacom2.GlobalPrograms;
+
 namespace Histacom2.OS.Win95
 {
     public partial class Windows95 : Form
@@ -37,7 +41,7 @@ namespace Histacom2.OS.Win95
         public Windows95()
         {
             InitializeComponent();
-            startmenu.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2);
+            //startmenu.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2);
             ProgramsToolStripMenuItem.DropDown.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2);
             AccessoriesToolStripMenuItem.DropDown.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2);
             CommunicationsToolStripMenuItem.DropDown.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2);
@@ -76,9 +80,6 @@ namespace Histacom2.OS.Win95
         private void Desktop_Load(object sender, EventArgs e)
         {
             if (currentTheme.defaultWallpaper != null) desktopicons.BackgroundImage = new Bitmap(currentTheme.defaultWallpaper, Width, Height);
-            //Start Menu Color - Commented until it works reliably
-            //startmenuitems.Renderer = new MyRenderer();
-            //ProgramsToolStripMenuItem.DropDown.Renderer = new MyRenderer();
 
             // Make Font Mandatory
             fontLoad();
@@ -117,7 +118,7 @@ namespace Histacom2.OS.Win95
             {
                 CurrentSave.FTime95 = true;
                 SaveGame();
-                welcome = wm.StartWin95(new WinClassicWelcome(), "Welcome", null, false, false, resize: false);
+                welcome = wm.Init(new WinClassicWelcome(), "Welcome", null, false, false, resize: false);
                 AddTaskBarItem(welcome, welcome.Tag.ToString(), "Welcome", null);
 
                 nonimportantapps.Add(welcome);
@@ -161,8 +162,8 @@ namespace Histacom2.OS.Win95
         private void startbutton_Click(object sender, EventArgs e)
         {
             startmenu.Show();
-            startmenu.BringToFront();
             if (taskbar.Visible) taskbar.BringToFront();
+            startmenu.BringToFront();
         }
 
         // Shutdown button
@@ -224,7 +225,7 @@ namespace Histacom2.OS.Win95
         private void NotePadToolStripMenuItem_Click(object sender, EventArgs e)
         {
             WinClassicNotepad wp = new WinClassicNotepad();
-            WinClassic app = wm.StartWin95(wp, "Notepad", Properties.Resources.Win95IconNotepad, true, true);
+            WinClassic app = wm.Init(wp, "Notepad", Properties.Resources.Win95IconNotepad, true, true);
             AddTaskBarItem(app, app.Tag.ToString(), "Notepad", Properties.Resources.Win95IconNotepad);
 
             nonimportantapps.Add(app);
@@ -237,7 +238,7 @@ namespace Histacom2.OS.Win95
         private void downloaderTestToolStripMenuItem_Click(object sender, EventArgs e)
         {
             WinClassicDownloader opendownload = new WinClassicDownloader();
-            WinClassic app = wm.StartWin95(opendownload, "Downloader", null, false, true, resize: false);
+            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);
@@ -249,7 +250,7 @@ namespace Histacom2.OS.Win95
         private void installerTestToolStripMenuItem_Click(object sender, EventArgs e)
         {
             Win95Installer openinstaller = new Win95Installer("Testing");
-            WinClassic app = wm.StartWin95(openinstaller, "Installer", null, false, true, resize: false);
+            WinClassic app = wm.Init(openinstaller, "Installer", null, false, true, resize: false);
 
             AddTaskBarItem(app, app.Tag.ToString(), "Installer", null);
 
@@ -260,7 +261,7 @@ namespace Histacom2.OS.Win95
         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; }
-            ie = wm.StartWin95(new WinClassicIE3(), "Internet Explorer 4", Properties.Resources.Win95IconIE4, true, true);
+            ie = wm.Init(new WinClassicIE3(), "Internet Explorer 4", Properties.Resources.Win95IconIE4, true, true);
             AddTaskBarItem(ie, ie.Tag.ToString(), "Internet Explorer 4", Properties.Resources.Win95IconIE4);
             ie.BringToFront();
             ie.FormClosing += new FormClosingEventHandler(InternetExplorer4_Closing);
@@ -280,7 +281,7 @@ namespace Histacom2.OS.Win95
                     if (objListViewItem.Text == "Internet Explorer")
                     {
                         if (ie != null) { wm.StartInfobox95("Error Opening Internet Explorer", "An instance of Internet Explorer 4 is already open.", InfoboxType.Warning, InfoboxButtons.OK); return; }
-                        ie = wm.StartWin95(new WinClassicIE3(), "Internet Explorer 4", Properties.Resources.Win95IconIE4, true, true);
+                        ie = wm.Init(new WinClassicIE3(), "Internet Explorer 4", Properties.Resources.Win95IconIE4, true, true);
                         AddTaskBarItem(ie, ie.Tag.ToString(), "Internet Explorer 4", Properties.Resources.Win95IconIE4);
                         ie.BringToFront();
                         ie.FormClosing += new FormClosingEventHandler(InternetExplorer4_Closing);
@@ -288,7 +289,7 @@ namespace Histacom2.OS.Win95
                     }
                     else if (objListViewItem.Text == "My Computer") // TODO: Implement slightly limited explorer (with no treeview and a new window each time ya go into a dir)
                     {
-                        WinClassic app = wm.StartWin95(new Win95WindowsExplorer(), "Windows Explorer", Properties.Resources.WinClassicFileExplorer, true, true);
+                        WinClassic app = wm.Init(new Win95WindowsExplorer(), "Windows Explorer", Properties.Resources.WinClassicFileExplorer, true, true);
                         AddTaskBarItem(app, app.Tag.ToString(), "Windows Explorer", Properties.Resources.WinClassicFileExplorer);
                         app.BringToFront();
                         startmenu.Hide();
@@ -312,6 +313,11 @@ namespace Histacom2.OS.Win95
                     {
                         //wm.StartInfobox95("Win32 Application", "That is not a valid Win32 Application.", Properties.Resources.Win95Error);
                     }
+                    else if (objListViewItem.Text == "Online Services")
+                    {
+                        wm.StartInfobox95("Caught it!", "If you were to run this, the game would crash!\nLuckily, it won't crash this time!", InfoboxType.Error, InfoboxButtons.OK);
+                    }
+                   
                     else
                     {
                         // It is an actual file on the disk
@@ -324,7 +330,7 @@ namespace Histacom2.OS.Win95
                         {
                             we.CurrentDirectory = objListViewItem.Tag.ToString();
 
-                            WinClassic app = wm.StartWin95(we, "Windows Explorer", Properties.Resources.WinClassicFileExplorer, true, true);
+                            WinClassic app = wm.Init(we, "Windows Explorer", Properties.Resources.WinClassicFileExplorer, true, true);
                             AddTaskBarItem(app, app.Tag.ToString(), "Windows Explorer", Properties.Resources.WinClassicFileExplorer);
                             app.BringToFront();
                             startmenu.Hide();
@@ -350,7 +356,7 @@ namespace Histacom2.OS.Win95
         }
         private void WebChatToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            webchat = wm.StartWin95(new WebChat1998(), "Web Chat 1998", null, true, true);
+            webchat = wm.Init(new WebChat1998(), "Web Chat 1998", null, true, true);
 
             AddTaskBarItem(webchat, webchat.Tag.ToString(), "Web Chat 1998", null);
 
@@ -369,7 +375,7 @@ namespace Histacom2.OS.Win95
         private void WordPadToolStripMenuItem_Click(object sender, EventArgs e)
         {
             WinClassicWordPad wp = new WinClassicWordPad();
-            WinClassic app = wm.StartWin95(wp, "Wordpad", Properties.Resources.Win95WordpadIcon2, true, true);
+            WinClassic app = wm.Init(wp, "Wordpad", Properties.Resources.Win95WordpadIcon2, true, true);
             AddTaskBarItem(app, app.Tag.ToString(), "Wordpad", Properties.Resources.Win95WordpadIcon2);
 
             nonimportantapps.Add(app);
@@ -410,7 +416,7 @@ namespace Histacom2.OS.Win95
             FileDialogBoxManager.IsInOpenDialog = false;
             FileDialogBoxManager.IsInSaveDialog = false;
             Win95WindowsExplorer we = new Win95WindowsExplorer();
-            WinClassic app = wm.StartWin95(we, "Windows Explorer", Properties.Resources.WinClassicFileExplorer, true, true);
+            WinClassic app = wm.Init(we, "Windows Explorer", Properties.Resources.WinClassicFileExplorer, true, true);
             AddTaskBarItem(app, app.Tag.ToString(), "Windows Explorer", Properties.Resources.WinClassicFileExplorer);
 
             nonimportantapps.Add(app);
@@ -429,7 +435,7 @@ namespace Histacom2.OS.Win95
         private void temp_for_std(object sender, EventArgs e)
         {
             Win2K.Win2KApps.SurviveTheDay std = new Win2K.Win2KApps.SurviveTheDay();
-            WinClassic app = wm.StartWin95(std, "Survive The Day", null, false, false);
+            WinClassic app = wm.Init(std, "Survive The Day", null, false, false);
             AddTaskBarItem(app, app.Tag.ToString(), "Survive The Day", null);
 
             nonimportantapps.Add(app);
@@ -443,7 +449,7 @@ namespace Histacom2.OS.Win95
         private void MSDOSPromptToolStripMenuItem1_Click (object sender, EventArgs e)
         {
             WinClassicTerminal msdos = new WinClassicTerminal(false);
-            WinClassic app = wm.StartWin95(msdos, "MS-DOS Prompt", Properties.Resources.MSDOSPromptToolStripMenuItem1_Image, true, true, false);
+            WinClassic app = wm.Init(msdos, "MS-DOS Prompt", Properties.Resources.MSDOSPromptToolStripMenuItem1_Image, true, true, false);
 
             AddTaskBarItem(app, app.Tag.ToString(), "MS-DOS Prompt", Properties.Resources.MSDOSPromptToolStripMenuItem1_Image);
             app.BringToFront();
@@ -453,7 +459,7 @@ namespace Histacom2.OS.Win95
         private void PropertiesToolStripMenuItem1_Click(object sender, EventArgs e)
         {
             WinClassicThemePanel theme = new WinClassicThemePanel();
-            WinClassic app = wm.StartWin95(theme, "Themes", null, false, true, false, resize: false);
+            WinClassic app = wm.Init(theme, "Themes", null, false, true, false, resize: false);
 
             AddTaskBarItem(app, app.Tag.ToString(), "Themes", null);
             app.BringToFront();
@@ -463,14 +469,14 @@ namespace Histacom2.OS.Win95
         private void TimeDistorterToolStripMenuItem_Click(object sender, EventArgs e)
         {
             distort = new WinClassicTimeDistorter("1998", "1999", 150, Hack2.StartObjective);
-            WinClassic app = wm.StartWin95(distort, "Time Distorter", null, false, true);
+            WinClassic app = wm.Init(distort, "Time Distorter", null, false, true);
             AddTaskBarItem(app, app.Tag.ToString(), "Time Distorter", null);
             app.BringToFront();
             startmenu.Hide();
         }
         private void FTPClientToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            WinClassic app = wm.StartWin95(new WinClassicFTPClient(), "FTP Client", null, true, true);
+            WinClassic app = wm.Init(new WinClassicFTPClient(), "FTP Client", null, true, true);
 
             AddTaskBarItem(app, app.Tag.ToString(), "FTP Client", null);
             app.BringToFront();
@@ -479,7 +485,7 @@ namespace Histacom2.OS.Win95
 
         private void CalculatorToolStripMenuItem_Click(object sender, EventArgs e)
         { 
-            WinClassic app = wm.StartWin95(new WinClassicCalculator(), "Calculator", Properties.Resources.WinClassicCalc, false, false, resize: false);
+            WinClassic app = wm.Init(new WinClassicCalculator(), "Calculator", Properties.Resources.WinClassicCalc, false, false, resize: false);
             AddTaskBarItem(app, app.Tag.ToString(), "Calculator", Properties.Resources.WinClassicCalc);
 
             nonimportantapps.Add(app);
@@ -569,7 +575,7 @@ namespace Histacom2.OS.Win95
 
         private void MinsweeperToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            WinClassic app = wm.StartWin95(new WinClassicMinesweeper(), "Minesweeper", Properties.Resources.WinClassicMinesweeper, false, false, false, false);
+            WinClassic app = wm.Init(new WinClassicMinesweeper(), "Minesweeper", Properties.Resources.WinClassicMinesweeper, false, false, false, false);
             AddTaskBarItem(app, app.Tag.ToString(), "Minesweeper", Properties.Resources.WinClassicMinesweeper);
 
             nonimportantapps.Add(app);
@@ -596,7 +602,7 @@ namespace Histacom2.OS.Win95
 
         private void GuessTheNumberToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            WinClassic app = wm.StartWin95(new GuessTheNumber(), "Guess The Number", Properties.Resources.WinClassicGTNIcon, false, false, false, false);
+            WinClassic app = wm.Init(new GuessTheNumber(), "Guess The Number", Properties.Resources.WinClassicGTNIcon, false, false, false, false);
             AddTaskBarItem(app, app.Tag.ToString(), "Guess The Number", Properties.Resources.WinClassicGTNIcon);
 
             nonimportantapps.Add(app);
@@ -606,29 +612,78 @@ namespace Histacom2.OS.Win95
             app.BringToFront();
             startmenu.Hide();
         }
-    }
-    public class MyRenderer : ToolStripProfessionalRenderer
-    {
-        public MyRenderer() : base(new MyColors()) { }
-    }
 
-    public class MyColors : ProfessionalColorTable
-    {
-        public override Color MenuItemSelectedGradientBegin
+        private void taskbar_Paint(object sender, PaintEventArgs e)
+        {
+            var gfx = e.Graphics;
+            gfx.Clear(currentTheme.threeDObjectsColor);
+
+            var _lightBack = Paintbrush.GetLightFromColor(currentTheme.threeDObjectsColor);
+
+            gfx.DrawLine(new Pen(_lightBack), 0, 1, taskbar.Width, 1);
+        }
+
+        private void clockPanel_Paint(object sender, PaintEventArgs e)
+        {
+            var gfx = e.Graphics;
+            gfx.Clear(currentTheme.threeDObjectsColor);
+
+            var _lightBack = Paintbrush.GetLightFromColor(currentTheme.threeDObjectsColor);
+            var _darkBack = Paintbrush.GetDarkFromColor(currentTheme.threeDObjectsColor);
+
+            gfx.DrawLine(new Pen(_lightBack), 0, 1, clockPanel.Width, 1);
+            gfx.DrawLine(new Pen(_darkBack), 0, 24, 0, 4);
+            gfx.DrawLine(new Pen(_darkBack), 61, 4, 0, 4);
+            gfx.DrawLine(new Pen(_lightBack), 62, 4, 62, 25);
+            gfx.DrawLine(new Pen(_lightBack), 0, 25, 62, 25);
+        }
+
+        private void startmenuitems_Paint(object sender, PaintEventArgs e)
         {
-            get { return Color.Navy; }
+            var gfx = e.Graphics;
+            gfx.Clear(currentTheme.threeDObjectsColor);
         }
-        public override Color MenuItemSelectedGradientEnd
+
+        private void startmenu_Paint(object sender, PaintEventArgs e)
         {
-            get { return Color.Navy; }
+            var gfx = e.Graphics;
+            gfx.Clear(currentTheme.threeDObjectsColor);
+
+            var _lightBack = Paintbrush.GetLightFromColor(currentTheme.threeDObjectsColor);
+            var _darkBack = Paintbrush.GetDarkFromColor(currentTheme.threeDObjectsColor);
+
+            gfx.DrawLine(Pens.Black, 0, startmenu.Height - 1, startmenu.Width - 1, startmenu.Height - 1);
+            gfx.DrawLine(Pens.Black, startmenu.Width - 1, startmenu.Height - 1, startmenu.Width - 1, 0);
+            gfx.DrawLine(new Pen(_darkBack), 1, startmenu.Height - 2, startmenu.Width - 2, startmenu.Height - 2);
+            gfx.DrawLine(new Pen(_darkBack), startmenu.Width - 2, 1, startmenu.Width - 2, startmenu.Height - 2);
+            gfx.DrawLine(new Pen(_lightBack), 1, startmenu.Height - 3, 1, 1);
+            gfx.DrawLine(new Pen(_lightBack), startmenu.Width - 3, 1, 1, 1);
         }
-        public override Color MenuItemPressedGradientBegin
+
+        private void ErrorBlasterToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            get { return Color.Navy; }
+            WinClassic app = wm.Init(new ErrorBlaster95(), "Welcome to Error Blaster 95!", null, false, false, false, false);
+            AddTaskBarItem(app, app.Tag.ToString(), "Welcome to Error Blaster 95!", null);
+
+            nonimportantapps.Add(app);
+            nonimportantapps[nonimportantapps.Count - 1].BringToFront();
+            nonimportantapps[nonimportantapps.Count - 1].FormClosing += new FormClosingEventHandler(NonImportantApp_Closing);
+
+            app.BringToFront();
+            startmenu.Hide();
         }
-        public override Color MenuItemPressedGradientEnd
+
+        private void FilesOrFoldersToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            get { return Color.Navy; }
+            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);
+
+            nonimportantapps.Add(app);
+            nonimportantapps[nonimportantapps.Count - 1].BringToFront();
+            nonimportantapps[nonimportantapps.Count - 1].FormClosing += new FormClosingEventHandler(NonImportantApp_Closing);
+
+            app.BringToFront();
+            startmenu.Hide();
         }
     }
 }
diff --git a/Histacom2/OS/Win95/Win95.resx b/Histacom2/OS/Win95/Win95.resx
index 419e624..3aabd22 100644
--- a/Histacom2/OS/Win95/Win95.resx
+++ b/Histacom2/OS/Win95/Win95.resx
@@ -121,6 +121,41 @@
     <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
@@ -188,7 +223,7 @@
   <data name="toolStripMenuItem3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wAAADsABataJCQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACmSURBVDhPnZFR
+        vgAADr4B6kKxwAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACmSURBVDhPnZFR
         EsQgCEM9ukfzZl0CREmrO7uNw0ghL360ndR7v7L9X4BfBxDeVVrOmsaLQqd1DKowK7QmYwxvza4hC66H
         UpiV6IJlm+UQOnvxvg7aBAPkIWpY87rICtpkX/4SX5MgmkvnxzD4JIC3BCUGzZCEfWb9I4D3M2gDp3xY
         oXsQ9vRAYAJVbYNqAARf2M+aQa3Hr2QAdmH5TTPoDVz1BW7tA7ajvYP7sMmIAAAAAElFTkSuQmCC
@@ -223,7 +258,7 @@
   <data name="OnlineRegistrationToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wAAADsABataJCQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACzSURBVDhPhZJR
+        vgAADr4B6kKxwAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACzSURBVDhPhZJR
         EsUgCAN7dI7mzawRl1KLU2fygMimfryr9/6rcUY53FVmluDWmpoxFveViQSZuU4h72GMyMwm5AF2DPnA
         QPTM9FIOCTiMBarSI1712qeZwwbkkApejBuqLLK8h7Cb5T8HGI8QBLPq8+wdzr722FUNL7+gEsuE06MI
         qELk6T7DOhNcwTNAcuMJAZYAdQgiJAIk/kAZdr8OmCHD+5UWeRkBfKgEduUAYL/r1w0ie5EGNPvMCQAA
@@ -261,7 +296,7 @@
   <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
+        wQAADsEBuJFr7QAAAJVJREFUOE+VkQsSxCAMQj16bu4GFU3YdO2+Gaqi0F/7j96zfqKHqYiuByYBFfYJ
         1okT9uuef4slmG9gWjdzN4Wnf9bRT1RhaCN+KriGieyvkjr8Rl7AMMbywE0zCBiIBS9Awbn7tUD29xME
         Q0rM8IHhPbziKRhMU0pqjVIfcgHAfB2oiugnuEnG/EkZ/4fLZEksutHaB6sGQO/gf7MbAAAAAElFTkSu
         QmCC
@@ -270,7 +305,7 @@
   <data name="MSDOSPromptToolStripMenuItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAALtJREFUOE91TwESBCEI6un9vBPRYqljhtEIyUZhzTkXKo8J1ZI4P3xjlAjsqpoN
+        wQAADsEBuJFr7QAAALtJREFUOE91TwESBCEI6un9vBPRYqljhtEIyUZhzTkXKo8J1ZI4P3xjlAjsqpoN
         upcBf0zA6+7r8QAxA9170IEPm6l7PWu9A1CLwNaVpSfWNEKLWCECDnkvAdFtMgBDLeHFaNaXEpQu22B9
         NsFA96i2yQlo00wejQG9VfuSCQ0IXAFAVAb468AVwJB3AHpsBFKn2uYkemh9hllezf4KcDKwtqkBpX5j
         Dyj5DRIeDDh3wD3c5AYkh2QwOMYPtAJqglssjE8AAAAASUVORK5CYII=
@@ -279,7 +314,7 @@
   <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
+        wQAADsEBuJFr7QAAAJVJREFUOE+VkIESgCAIQ/10/pwasJrlkb27nUZsoqPHPbWNlYHCN9gKMTc7O31I
         gIa0PM2EE32ErE9WNQEw1y6azbZGvkFAhnBcKMmwrQnCVI0MofA+a6UniIDYqKTx7JhBDeVaQd5fVT9m
         M4JvowbwzjNlu4C5DVBgVyll4Zo8AzrK0gfo6ZBSFq7J6g0+ePWj8EPDD0i7RXV30HOWAAAAAElFTkSu
         QmCC
@@ -288,7 +323,7 @@
   <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
+        wQAADsEBuJFr7QAAAJJJREFUOE+tkYEOgCAIRP10/tzk4FISZ7ZuuzDwnq4KJSL1aR/txc21llBfQVbh
         EZJZZ5C+nEoEcIN0QDyxLVGzm6WAsMYTvRSSAqaw2jRBloApbJUBhLVub4ABqwMY1poCuEYzhPWjRkgK
         6EP7A+obqOc2EzIBeELmtqNFDECI9R3gYmPhCPH+qX6HfAJAQ7iUCwlxft5LSoDNAAAAAElFTkSuQmCC
 </value>
@@ -296,70 +331,35 @@
   <data name="downloaderTestToolStripMenuItem.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
+        vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
         4AAABIQCQUtXaBsAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="installerTestToolStripMenuItem.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
+        vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
         4AAABIQCQUtXaBsAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="ControlPanelToolStripMenuItem.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
+        vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
         4AAABIQCQUtXaBsAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="PrintersToolStripMenuItem.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
+        vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
         4AAABIQCQUtXaBsAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="TaskbarToolStripMenuItem.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
-        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
-        wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
-        4AAABIQCQUtXaBsAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="ComputerToolStripMenuItem.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
-        4AAABIQCQUtXaBsAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="OnTheInternetToolStripMenuItem.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
-        4AAABIQCQUtXaBsAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="PeopleToolStripMenuItem.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
+        vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
         4AAABIQCQUtXaBsAAAAASUVORK5CYII=
 </value>
   </data>
@@ -374,7 +374,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACO
-        hAAAAk1TRnQBSQFMAgEBDQEAAUQBAgFEAQIBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA
+        hAAAAk1TRnQBSQFMAgEBDQEAASwBAwEsAQMBIAEAASABAAT/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/12padamsViruses/ErrorBlaster95.Designer.cs b/Histacom2/OS/Win95/Win95Apps/12padamsViruses/ErrorBlaster95.Designer.cs
new file mode 100644
index 0000000..6035a1a
--- /dev/null
+++ b/Histacom2/OS/Win95/Win95Apps/12padamsViruses/ErrorBlaster95.Designer.cs
@@ -0,0 +1,112 @@
+namespace Histacom2.OS.Win95.Win95Apps._12padamViruses
+{
+    partial class ErrorBlaster95
+    {
+        /// <summary> 
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Component Designer generated code
+
+        /// <summary> 
+        /// Required method for Designer support - do not modify 
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ErrorBlaster95));
+            this.classicButton1 = new Histacom2.Engine.UI.ClassicButton();
+            this.classicButton3 = new Histacom2.Engine.UI.ClassicButton();
+            this.label1 = new System.Windows.Forms.Label();
+            this.classicButton2 = new Histacom2.Engine.UI.ClassicButton();
+            this.SuspendLayout();
+            // 
+            // classicButton1
+            // 
+            this.classicButton1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.classicButton1.BackColor = System.Drawing.Color.Silver;
+            this.classicButton1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F);
+            this.classicButton1.ForeColor = System.Drawing.Color.Black;
+            this.classicButton1.Location = new System.Drawing.Point(16, 219);
+            this.classicButton1.Name = "classicButton1";
+            this.classicButton1.Size = new System.Drawing.Size(73, 38);
+            this.classicButton1.TabIndex = 18;
+            this.classicButton1.Text = "Infect";
+            this.classicButton1.Click += new System.EventHandler(this.classicButton1_Click);
+            // 
+            // classicButton3
+            // 
+            this.classicButton3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.classicButton3.BackColor = System.Drawing.Color.Silver;
+            this.classicButton3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F);
+            this.classicButton3.ForeColor = System.Drawing.Color.Black;
+            this.classicButton3.Location = new System.Drawing.Point(353, 219);
+            this.classicButton3.Name = "classicButton3";
+            this.classicButton3.Size = new System.Drawing.Size(75, 38);
+            this.classicButton3.TabIndex = 20;
+            this.classicButton3.Text = "Exit";
+            this.classicButton3.Click += new System.EventHandler(this.classicButton3_Click);
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(11, 2);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(423, 169);
+            this.label1.TabIndex = 21;
+            this.label1.Text = resources.GetString("label1.Text");
+            // 
+            // classicButton2
+            // 
+            this.classicButton2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.classicButton2.BackColor = System.Drawing.Color.Silver;
+            this.classicButton2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F);
+            this.classicButton2.ForeColor = System.Drawing.Color.Black;
+            this.classicButton2.Location = new System.Drawing.Point(95, 219);
+            this.classicButton2.Name = "classicButton2";
+            this.classicButton2.Size = new System.Drawing.Size(75, 38);
+            this.classicButton2.TabIndex = 19;
+            this.classicButton2.Text = "Remove";
+            this.classicButton2.Click += new System.EventHandler(this.classicButton2_Click);
+            // 
+            // ErrorBlaster95
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.BackColor = System.Drawing.Color.Silver;
+            this.Controls.Add(this.label1);
+            this.Controls.Add(this.classicButton3);
+            this.Controls.Add(this.classicButton2);
+            this.Controls.Add(this.classicButton1);
+            this.Name = "ErrorBlaster95";
+            this.Size = new System.Drawing.Size(447, 265);
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private Engine.UI.ClassicButton classicButton1;
+        private Engine.UI.ClassicButton classicButton3;
+        private System.Windows.Forms.Label label1;
+        private Engine.UI.ClassicButton classicButton2;
+    }
+}
diff --git a/Histacom2/OS/Win95/Win95Apps/12padamsViruses/ErrorBlaster95.cs b/Histacom2/OS/Win95/Win95Apps/12padamsViruses/ErrorBlaster95.cs
new file mode 100644
index 0000000..3d6f064
--- /dev/null
+++ b/Histacom2/OS/Win95/Win95Apps/12padamsViruses/ErrorBlaster95.cs
@@ -0,0 +1,75 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using Histacom2.Engine;
+using System.Drawing.Text;
+using static Histacom2.Engine.SaveSystem;
+    
+namespace Histacom2.OS.Win95.Win95Apps._12padamViruses
+{
+    public partial class ErrorBlaster95 : UserControl
+    {
+        Timer messageGen = new Timer();
+        Random messageChooser = new Random();
+        WindowManager wm = new WindowManager();
+        private static PrivateFontCollection pfc = new PrivateFontCollection();
+        public ErrorBlaster95()
+        {
+            InitializeComponent();
+            messageGen.Interval = 3000;
+            messageGen.Tick += MessageGen_Tick;
+            pfc.AddFontFile(DataDirectory + "\\LeviWindows.ttf");
+            label1.Font=new Font(pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0)));
+        }
+
+        private void MessageGen_Tick(object sender, EventArgs e)
+        {
+            int messageRandomizer = messageChooser.Next(1, 3);
+            switch (messageRandomizer)
+            {
+                case 1:
+                    wm.StartInfobox95("Alert!", "A virus has been detected on your computer! Press OK to disinfect!", Engine.Template.InfoboxType.Error, Engine.Template.InfoboxButtons.OK);
+                    messageGen.Interval -= 300;
+                    break;
+
+                case 2:
+                    wm.StartInfobox95("Microsoft Security Alert", "Microsoft says to install UltraSurpremeAntiVirus1998 to get rid of any viruses!", Engine.Template.InfoboxType.Info, Engine.Template.InfoboxButtons.OK);
+                    messageGen.Interval -= 300;
+                    break;
+                case 3:
+                    wm.StartInfobox95("Error", "A BSOD.exe virus has been found on your computer!", Engine.Template.InfoboxType.Warning, Engine.Template.InfoboxButtons.OK);
+                    messageGen.Interval -= 300;
+                    break;
+            }
+            if (messageGen.Interval == 300)
+            {
+                messageGen.Stop();
+                
+                BSODCreator bs = new BSODCreator();
+                
+                bs.throw9XBSOD(true, BSODCreator.BSODCauses.Generic);
+            }
+        }
+
+        private void classicButton3_Click(object sender, EventArgs e)
+        {
+            ParentForm.Close();
+        }
+
+        private void classicButton1_Click(object sender, EventArgs e)
+        {
+            messageGen.Start();
+        }
+
+        private void classicButton2_Click(object sender, EventArgs e)
+        {
+            messageGen.Stop();
+        }
+    }
+}
diff --git a/Histacom2/OS/Win95/Win95Apps/12padamsViruses/ErrorBlaster95.resx b/Histacom2/OS/Win95/Win95Apps/12padamsViruses/ErrorBlaster95.resx
new file mode 100644
index 0000000..71d9882
--- /dev/null
+++ b/Histacom2/OS/Win95/Win95Apps/12padamsViruses/ErrorBlaster95.resx
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="label1.Text" xml:space="preserve">
+    <value>Virus Name: Virus.Win9x.ErrorBlaster
+Virus Type: Scareware/Memory Leak
+Purpose: To force the user into doing a specific type of action to remove the virus.
+Effect: Various infoboxes at random times will show up, alerting you about false
+infections until the user is forced to buy a rogue antivirus to "remove" the virus.
+
+Hey there, thanks for downloading this ErrorBlaster sample from my website!
+This virus can be very annoying and is very common.
+The infoboxes will show up at random, first showing anywhere from one to three seconds
+and will decrease every 300 milliseconds. 
+
+Note: Clicking "Remove" will disinfect but will not remove the infoboxes opened.
+Warning: A BSOD will occur over elongated periods of use.
+</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Histacom2/OS/Win95/Win95Apps/12padamsViruses/StartRunner95.Designer.cs b/Histacom2/OS/Win95/Win95Apps/12padamsViruses/StartRunner95.Designer.cs
new file mode 100644
index 0000000..01ac2e2
--- /dev/null
+++ b/Histacom2/OS/Win95/Win95Apps/12padamsViruses/StartRunner95.Designer.cs
@@ -0,0 +1,106 @@
+namespace Histacom2.OS.Win95.Win95Apps._12padamsViruses
+{
+    partial class StartRunner95
+    {
+        /// <summary> 
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Component Designer generated code
+
+        /// <summary> 
+        /// Required method for Designer support - do not modify 
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(StartRunner95));
+            this.classicButton1 = new Histacom2.Engine.UI.ClassicButton();
+            this.classicButton2 = new Histacom2.Engine.UI.ClassicButton();
+            this.classicButton3 = new Histacom2.Engine.UI.ClassicButton();
+            this.label2 = new System.Windows.Forms.Label();
+            this.SuspendLayout();
+            // 
+            // classicButton1
+            // 
+            this.classicButton1.BackColor = System.Drawing.Color.Silver;
+            this.classicButton1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F);
+            this.classicButton1.ForeColor = System.Drawing.Color.Black;
+            this.classicButton1.Location = new System.Drawing.Point(16, 168);
+            this.classicButton1.Name = "classicButton1";
+            this.classicButton1.Size = new System.Drawing.Size(75, 23);
+            this.classicButton1.TabIndex = 11;
+            this.classicButton1.Text = "Infect";
+            this.classicButton1.Click += new System.EventHandler(this.classicButton1_Click);
+            // 
+            // classicButton2
+            // 
+            this.classicButton2.BackColor = System.Drawing.Color.Silver;
+            this.classicButton2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F);
+            this.classicButton2.ForeColor = System.Drawing.Color.Black;
+            this.classicButton2.Location = new System.Drawing.Point(97, 168);
+            this.classicButton2.Name = "classicButton2";
+            this.classicButton2.Size = new System.Drawing.Size(75, 23);
+            this.classicButton2.TabIndex = 12;
+            this.classicButton2.Text = "Remove";
+            this.classicButton2.Click += new System.EventHandler(this.classicButton2_Click);
+            // 
+            // classicButton3
+            // 
+            this.classicButton3.BackColor = System.Drawing.Color.Silver;
+            this.classicButton3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F);
+            this.classicButton3.ForeColor = System.Drawing.Color.Black;
+            this.classicButton3.Location = new System.Drawing.Point(293, 168);
+            this.classicButton3.Name = "classicButton3";
+            this.classicButton3.Size = new System.Drawing.Size(75, 23);
+            this.classicButton3.TabIndex = 13;
+            this.classicButton3.Text = "Exit";
+            this.classicButton3.Click += new System.EventHandler(this.classicButton3_Click);
+            // 
+            // label2
+            // 
+            this.label2.Anchor = System.Windows.Forms.AnchorStyles.Top;
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(13, 23);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(355, 117);
+            this.label2.TabIndex = 10;
+            this.label2.Text = resources.GetString("label2.Text");
+            // 
+            // StartRunner95
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.classicButton3);
+            this.Controls.Add(this.classicButton2);
+            this.Controls.Add(this.classicButton1);
+            this.Controls.Add(this.label2);
+            this.Name = "StartRunner95";
+            this.Size = new System.Drawing.Size(383, 208);
+            this.Load += new System.EventHandler(this.StartRunner95_Load);
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+        private Engine.UI.ClassicButton classicButton1;
+        private Engine.UI.ClassicButton classicButton2;
+        private Engine.UI.ClassicButton classicButton3;
+        internal System.Windows.Forms.Label label2;
+    }
+}
diff --git a/Histacom2/OS/Win95/Win95Apps/12padamsViruses/StartRunner95.cs b/Histacom2/OS/Win95/Win95Apps/12padamsViruses/StartRunner95.cs
new file mode 100644
index 0000000..579f001
--- /dev/null
+++ b/Histacom2/OS/Win95/Win95Apps/12padamsViruses/StartRunner95.cs
@@ -0,0 +1,65 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using Histacom2.Engine;
+using System.Drawing.Text;
+using static Histacom2.Engine.SaveSystem;
+using Histacom2.OS.Win95;
+
+namespace Histacom2.OS.Win95.Win95Apps._12padamsViruses
+{
+    public partial class StartRunner95 : UserControl
+    {
+        Point beginLocation;
+        int taskbarLength;
+        int xLocation;
+        Timer moveStart = new Timer();
+        private static PrivateFontCollection pfc = new PrivateFontCollection();
+        Windows95 w = new Windows95();
+        public StartRunner95()
+        {
+            InitializeComponent();
+            pfc.AddFontFile(DataDirectory + "\\LeviWindows.ttf");
+            label2.Font = new Font(pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0)));
+            beginLocation = w.startbutton.Location;
+            moveStart.Interval = 300;
+            moveStart.Tick += MoveStart_Tick;
+
+        }
+
+        private void MoveStart_Tick(object sender, EventArgs e)
+        {
+            int taskbarWidth = w.taskbar.Size.Width;
+            Random random = new Random();
+            xLocation = random.Next(1, taskbarWidth);
+            w.startbutton.Location = new Point(xLocation, w.startbutton.Location.Y);
+        }
+
+        private void classicButton1_Click(object sender, EventArgs e)
+        {
+            moveStart.Start();
+        }
+
+        private void StartRunner95_Load(object sender, EventArgs e)
+        {
+            
+        }
+
+        private void classicButton2_Click(object sender, EventArgs e)
+        {
+            moveStart.Stop();
+            w.startbutton.Location = beginLocation;
+        }
+
+        private void classicButton3_Click(object sender, EventArgs e)
+        {
+            ParentForm.Close();
+        }
+    }
+}
diff --git a/Histacom2/OS/Win95/Win95Apps/12padamsViruses/StartRunner95.resx b/Histacom2/OS/Win95/Win95Apps/12padamsViruses/StartRunner95.resx
new file mode 100644
index 0000000..f8ee0b3
--- /dev/null
+++ b/Histacom2/OS/Win95/Win95Apps/12padamsViruses/StartRunner95.resx
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="label2.Text" xml:space="preserve">
+    <value>Virus Name: Start Runner
+Virus Type: Joke Program
+Purpose: A fun prank to pull on April Fools' Day! 
+Effect: The start button will move side to side along the taskbar.
+
+Hey there! Thanks for installing this joke program from my website!
+This is a fairly common joke program often found in email chains.
+How this works is simple; it simply moves your startbutton from side-to-side.
+To remove, simply press the remove button on this window.
+</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Histacom2/OS/Win95/Win95Apps/GuessTheNumber.Designer.cs b/Histacom2/OS/Win95/Win95Apps/GuessTheNumber.Designer.cs
index cc266c0..6102f9f 100644
--- a/Histacom2/OS/Win95/Win95Apps/GuessTheNumber.Designer.cs
+++ b/Histacom2/OS/Win95/Win95Apps/GuessTheNumber.Designer.cs
@@ -31,12 +31,10 @@
             this.label1 = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
             this.textBox1 = new System.Windows.Forms.TextBox();
-            this.pictureBox1 = new System.Windows.Forms.PictureBox();
+            this.pictureBox1 = new Histacom2.Engine.UI.ClassicButton();
             this.pictureBox2 = new System.Windows.Forms.PictureBox();
-            this.pictureBox3 = new System.Windows.Forms.PictureBox();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+            this.pictureBox3 = new Histacom2.Engine.UI.ClassicButton();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit();
             this.SuspendLayout();
             // 
             // label1
@@ -68,12 +66,13 @@
             // 
             // pictureBox1
             // 
-            this.pictureBox1.BackgroundImage = global::Histacom2.Properties.Resources.GTN95_Check;
+            this.pictureBox1.BackColor = System.Drawing.Color.Silver;
+            this.pictureBox1.ForeColor = System.Drawing.Color.Black;
             this.pictureBox1.Location = new System.Drawing.Point(191, 30);
             this.pictureBox1.Name = "pictureBox1";
             this.pictureBox1.Size = new System.Drawing.Size(55, 27);
-            this.pictureBox1.TabIndex = 3;
-            this.pictureBox1.TabStop = false;
+            this.pictureBox1.TabIndex = 5;
+            this.pictureBox1.Text = "Check";
             this.pictureBox1.Click += new System.EventHandler(this.pictureBox1_Click);
             // 
             // pictureBox2
@@ -86,12 +85,14 @@
             // 
             // pictureBox3
             // 
-            this.pictureBox3.BackgroundImage = global::Histacom2.Properties.Resources.GTN95_Restart;
+            this.pictureBox3.BackColor = System.Drawing.Color.Silver;
+            this.pictureBox3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.pictureBox3.ForeColor = System.Drawing.Color.Black;
             this.pictureBox3.Location = new System.Drawing.Point(19, 62);
             this.pictureBox3.Name = "pictureBox3";
             this.pictureBox3.Size = new System.Drawing.Size(227, 23);
-            this.pictureBox3.TabIndex = 5;
-            this.pictureBox3.TabStop = false;
+            this.pictureBox3.TabIndex = 0;
+            this.pictureBox3.Text = "Restart";
             this.pictureBox3.Click += new System.EventHandler(this.pictureBox3_Click);
             // 
             // GuessTheNumber
@@ -107,9 +108,7 @@
             this.Controls.Add(this.label1);
             this.Name = "GuessTheNumber";
             this.Size = new System.Drawing.Size(268, 100);
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -120,8 +119,8 @@
         private System.Windows.Forms.Label label1;
         private System.Windows.Forms.Label label2;
         private System.Windows.Forms.TextBox textBox1;
-        private System.Windows.Forms.PictureBox pictureBox1;
+        private Engine.UI.ClassicButton pictureBox1;
         private System.Windows.Forms.PictureBox pictureBox2;
-        private System.Windows.Forms.PictureBox pictureBox3;
+        private Engine.UI.ClassicButton pictureBox3;
     }
 }
diff --git a/Histacom2/OS/Win95/Win95Apps/GuessTheNumber.cs b/Histacom2/OS/Win95/Win95Apps/GuessTheNumber.cs
index 72adc0e..4766c8d 100644
--- a/Histacom2/OS/Win95/Win95Apps/GuessTheNumber.cs
+++ b/Histacom2/OS/Win95/Win95Apps/GuessTheNumber.cs
@@ -21,11 +21,6 @@ namespace Histacom2.OS.Win95.Win95Apps
 
             rnd = new Random();
             num = rnd.Next(0, 101);
-
-            pictureBox1.MouseDown += (s, a) => pictureBox1.BackgroundImage = Properties.Resources.GTN95_CheckClicked;
-            pictureBox1.MouseUp += (s, a) => pictureBox1.BackgroundImage = Properties.Resources.GTN95_Check;
-            pictureBox3.MouseDown += (s, a) => pictureBox3.BackgroundImage = Properties.Resources.GTN95_RestartClicked;
-            pictureBox3.MouseUp += (s, a) => pictureBox3.BackgroundImage = Properties.Resources.GTN95_Restart;
         }
 
         private void pictureBox3_Click(object sender, EventArgs e)
diff --git a/Histacom2/OS/Win95/Win95Apps/IE4Sites/12padams1998.Designer.cs b/Histacom2/OS/Win95/Win95Apps/IE3Sites/12padams1998.Designer.cs
index 29a63e4..dc00477 100644
--- a/Histacom2/OS/Win95/Win95Apps/IE4Sites/12padams1998.Designer.cs
+++ b/Histacom2/OS/Win95/Win95Apps/IE3Sites/12padams1998.Designer.cs
@@ -1,4 +1,4 @@
-namespace Histacom2.OS.Win95.Win95Apps.IE4Sites
+namespace Histacom2.OS.Win95.Win95Apps.IE3Sites
 {
     partial class _12padams1998
     {
@@ -275,6 +275,7 @@
             this.button7.TabIndex = 12;
             this.button7.Text = "Download";
             this.button7.UseVisualStyleBackColor = false;
+            this.button7.Click += new System.EventHandler(this.button7_Click);
             // 
             // label13
             // 
@@ -297,6 +298,7 @@
             this.button6.TabIndex = 10;
             this.button6.Text = "Download";
             this.button6.UseVisualStyleBackColor = false;
+            this.button6.Click += new System.EventHandler(this.button6_Click);
             // 
             // label12
             // 
diff --git a/Histacom2/OS/Win95/Win95Apps/IE4Sites/12padams1998.cs b/Histacom2/OS/Win95/Win95Apps/IE3Sites/12padams1998.cs
index be6ab95..9f4bfbd 100644
--- a/Histacom2/OS/Win95/Win95Apps/IE4Sites/12padams1998.cs
+++ b/Histacom2/OS/Win95/Win95Apps/IE3Sites/12padams1998.cs
@@ -9,8 +9,9 @@ using System.Threading.Tasks;
 using System.Windows.Forms;
 using Histacom2.Engine;
 using System.Threading;
+using Histacom2.GlobalPrograms;
 
-namespace Histacom2.OS.Win95.Win95Apps.IE4Sites
+namespace Histacom2.OS.Win95.Win95Apps.IE3Sites
 {
     public partial class _12padams1998 : UserControl
     {
@@ -30,7 +31,7 @@ namespace Histacom2.OS.Win95.Win95Apps.IE4Sites
         {
             WinClassicDownloader opendownload = new WinClassicDownloader();
             WindowManager wm = new WindowManager();
-            wm.StartWin95(opendownload, "Downloader", null, false, true);
+            wm.Init(opendownload, "Downloader", null, false, true);
             opendownload.appName.Text = "Downloading: FTP Client";
             opendownload.amountToDL = 56;
         }
@@ -39,7 +40,7 @@ namespace Histacom2.OS.Win95.Win95Apps.IE4Sites
         {
             WinClassicDownloader opendownload = new WinClassicDownloader();
             WindowManager wm = new WindowManager();
-            wm.StartWin95(opendownload, "Downloader", null, false, true);
+            wm.Init(opendownload, "Downloader", null, false, true);
             opendownload.appName.Text = "Downloading: Web Chat 1998";
             opendownload.amountToDL = 35;
         }
@@ -141,9 +142,27 @@ namespace Histacom2.OS.Win95.Win95Apps.IE4Sites
         {
             WinClassicDownloader opendownload = new WinClassicDownloader();
             WindowManager wm = new WindowManager();
-            wm.StartWin95(opendownload, "Downloader", null, false, true);
+            wm.Init(opendownload, "Downloader", null, false, true);
             opendownload.appName.Text = "Downloading: Guess The Number V1";
             opendownload.amountToDL = 16;
         }
+
+        private void button7_Click(object sender, EventArgs e)
+        {
+            WinClassicDownloader opendownload = new WinClassicDownloader();
+            WindowManager wm = new WindowManager();
+            wm.Init(opendownload, "Downloader", null, false, true);
+            opendownload.appName.Text = "Downloading: Error Blaster 95";
+            opendownload.amountToDL = 32;
+        }
+
+        private void button6_Click(object sender, EventArgs e)
+        {
+            WinClassicDownloader opendownload = new WinClassicDownloader();
+            WindowManager wm = new WindowManager();
+            wm.Init(opendownload, "Downloader", null, false, true);
+            opendownload.appName.Text = "Downloading: Start Runner 95";
+            opendownload.amountToDL = 32;
+        }
     }
 }
diff --git a/Histacom2/OS/Win95/Win95Apps/IE4Sites/12padams1998.resx b/Histacom2/OS/Win95/Win95Apps/IE3Sites/12padams1998.resx
index 6a9a4c8..6a9a4c8 100644
--- a/Histacom2/OS/Win95/Win95Apps/IE4Sites/12padams1998.resx
+++ b/Histacom2/OS/Win95/Win95Apps/IE3Sites/12padams1998.resx
diff --git a/Histacom2/OS/Win95/Win95Apps/IE4Sites/GoogleHome.Designer.cs b/Histacom2/OS/Win95/Win95Apps/IE3Sites/GoogleHome.Designer.cs
index e0c0743..71665dc 100644
--- a/Histacom2/OS/Win95/Win95Apps/IE4Sites/GoogleHome.Designer.cs
+++ b/Histacom2/OS/Win95/Win95Apps/IE3Sites/GoogleHome.Designer.cs
@@ -1,4 +1,4 @@
-namespace Histacom2.OS.Win95.Win95Apps.IE4Sites
+namespace Histacom2.OS.Win95.Win95Apps.IE3Sites
 {
     partial class GoogleHome
     {
diff --git a/Histacom2/OS/Win95/Win95Apps/IE4Sites/GoogleHome.cs b/Histacom2/OS/Win95/Win95Apps/IE3Sites/GoogleHome.cs
index 0782a35..cc0a382 100644
--- a/Histacom2/OS/Win95/Win95Apps/IE4Sites/GoogleHome.cs
+++ b/Histacom2/OS/Win95/Win95Apps/IE3Sites/GoogleHome.cs
@@ -8,7 +8,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace Histacom2.OS.Win95.Win95Apps.IE4Sites
+namespace Histacom2.OS.Win95.Win95Apps.IE3Sites
 {
     public partial class GoogleHome : UserControl
     {
diff --git a/Histacom2/OS/Win95/Win95Apps/IE4Sites/GoogleHome.resx b/Histacom2/OS/Win95/Win95Apps/IE3Sites/GoogleHome.resx
index 1af7de1..1af7de1 100644
--- a/Histacom2/OS/Win95/Win95Apps/IE4Sites/GoogleHome.resx
+++ b/Histacom2/OS/Win95/Win95Apps/IE3Sites/GoogleHome.resx
diff --git a/Histacom2/OS/Win95/Win95Apps/IE4Sites/GooglePrototype.Designer.cs b/Histacom2/OS/Win95/Win95Apps/IE3Sites/GooglePrototype.Designer.cs
index bda1bb4..d60bd77 100644
--- a/Histacom2/OS/Win95/Win95Apps/IE4Sites/GooglePrototype.Designer.cs
+++ b/Histacom2/OS/Win95/Win95Apps/IE3Sites/GooglePrototype.Designer.cs
@@ -1,4 +1,4 @@
-namespace Histacom2.OS.Win95.Win95Apps.IE4Sites
+namespace Histacom2.OS.Win95.Win95Apps.IE3Sites
 {
     partial class GooglePrototype
     {
diff --git a/Histacom2/OS/Win95/Win95Apps/IE4Sites/GooglePrototype.cs b/Histacom2/OS/Win95/Win95Apps/IE3Sites/GooglePrototype.cs
index fb5e04b..d9a8826 100644
--- a/Histacom2/OS/Win95/Win95Apps/IE4Sites/GooglePrototype.cs
+++ b/Histacom2/OS/Win95/Win95Apps/IE3Sites/GooglePrototype.cs
@@ -8,7 +8,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace Histacom2.OS.Win95.Win95Apps.IE4Sites
+namespace Histacom2.OS.Win95.Win95Apps.IE3Sites
 {
     public partial class GooglePrototype : UserControl
     {
diff --git a/Histacom2/OS/Win95/Win95Apps/IE4Sites/GooglePrototype.resx b/Histacom2/OS/Win95/Win95Apps/IE3Sites/GooglePrototype.resx
index 1af7de1..1af7de1 100644
--- a/Histacom2/OS/Win95/Win95Apps/IE4Sites/GooglePrototype.resx
+++ b/Histacom2/OS/Win95/Win95Apps/IE3Sites/GooglePrototype.resx
diff --git a/Histacom2/OS/Win95/Win95Apps/IE4Sites/IE4Start.Designer.cs b/Histacom2/OS/Win95/Win95Apps/IE3Sites/IE3Start.Designer.cs
index d058523..920715b 100644
--- a/Histacom2/OS/Win95/Win95Apps/IE4Sites/IE4Start.Designer.cs
+++ b/Histacom2/OS/Win95/Win95Apps/IE3Sites/IE3Start.Designer.cs
@@ -1,6 +1,6 @@
-namespace Histacom2.OS.Win95.Win95Apps.IE4Sites
+namespace Histacom2.OS.Win95.Win95Apps.IE3Sites
 {
-    partial class IE4Start
+    partial class IE3Start
     {
         /// <summary> 
         /// Required designer variable.
@@ -36,7 +36,7 @@
             // 
             // pictureBox1
             // 
-            this.pictureBox1.Image = global::Histacom2.Properties.Resources.start;
+            this.pictureBox1.Image = global::Histacom2.Properties.Resources.IE3_Start;
             this.pictureBox1.Location = new System.Drawing.Point(0, 0);
             this.pictureBox1.Name = "pictureBox1";
             this.pictureBox1.Size = new System.Drawing.Size(640, 480);
@@ -71,7 +71,7 @@
             this.linkLabel2.Text = "   ";
             this.linkLabel2.Click += new System.EventHandler(this.linkLabel2_Click);
             // 
-            // IE4Start
+            // IE3Start
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
@@ -79,7 +79,7 @@
             this.Controls.Add(this.linkLabel2);
             this.Controls.Add(this.linkLabel1);
             this.Controls.Add(this.pictureBox1);
-            this.Name = "IE4Start";
+            this.Name = "IE3Start";
             this.Size = new System.Drawing.Size(959, 483);
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
             this.ResumeLayout(false);
diff --git a/Histacom2/OS/Win95/Win95Apps/IE4Sites/IE4Start.cs b/Histacom2/OS/Win95/Win95Apps/IE3Sites/IE3Start.cs
index 191cb2d..6481c3c 100644
--- a/Histacom2/OS/Win95/Win95Apps/IE4Sites/IE4Start.cs
+++ b/Histacom2/OS/Win95/Win95Apps/IE3Sites/IE3Start.cs
@@ -8,11 +8,11 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace Histacom2.OS.Win95.Win95Apps.IE4Sites
+namespace Histacom2.OS.Win95.Win95Apps.IE3Sites
 {
-    public partial class IE4Start : UserControl
+    public partial class IE3Start : UserControl
     {
-        public IE4Start()
+        public IE3Start()
         {
             InitializeComponent();
         }
diff --git a/Histacom2/OS/Win95/Win95Apps/IE4Sites/IE4Start.resx b/Histacom2/OS/Win95/Win95Apps/IE3Sites/IE3Start.resx
index 1af7de1..1af7de1 100644
--- a/Histacom2/OS/Win95/Win95Apps/IE4Sites/IE4Start.resx
+++ b/Histacom2/OS/Win95/Win95Apps/IE3Sites/IE3Start.resx
diff --git a/Histacom2/OS/Win95/Win95Apps/IE4Sites/IE4NoPage.Designer.cs b/Histacom2/OS/Win95/Win95Apps/IE3Sites/IENoPage.Designer.cs
index 9c16553..0055932 100644
--- a/Histacom2/OS/Win95/Win95Apps/IE4Sites/IE4NoPage.Designer.cs
+++ b/Histacom2/OS/Win95/Win95Apps/IE3Sites/IENoPage.Designer.cs
@@ -1,6 +1,6 @@
-namespace Histacom2.OS.Win95.Win95Apps.IE4Sites
+namespace Histacom2.OS.Win95.Win95Apps.IE3Sites
 {
-    partial class IE4NoPage
+    partial class IENoPage
     {
         /// <summary> 
         /// Required designer variable.
@@ -41,13 +41,13 @@
             this.pictureBox1.TabIndex = 0;
             this.pictureBox1.TabStop = false;
             // 
-            // IE4NoPage
+            // IENoPage
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.White;
             this.Controls.Add(this.pictureBox1);
-            this.Name = "IE4NoPage";
+            this.Name = "IENoPage";
             this.Size = new System.Drawing.Size(959, 541);
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
             this.ResumeLayout(false);
diff --git a/Histacom2/OS/Win95/Win95Apps/IE4Sites/IE4NoPage.cs b/Histacom2/OS/Win95/Win95Apps/IE3Sites/IENoPage.cs
index fad6ef9..73da6c7 100644
--- a/Histacom2/OS/Win95/Win95Apps/IE4Sites/IE4NoPage.cs
+++ b/Histacom2/OS/Win95/Win95Apps/IE3Sites/IENoPage.cs
@@ -8,11 +8,11 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace Histacom2.OS.Win95.Win95Apps.IE4Sites
+namespace Histacom2.OS.Win95.Win95Apps.IE3Sites
 {
-    public partial class IE4NoPage : UserControl
+    public partial class IENoPage : UserControl
     {
-        public IE4NoPage()
+        public IENoPage()
         {
             InitializeComponent();
         }
diff --git a/Histacom2/OS/Win95/Win95Apps/IE4Sites/IE4NoPage.resx b/Histacom2/OS/Win95/Win95Apps/IE3Sites/IENoPage.resx
index 5f61137..5f61137 100644
--- a/Histacom2/OS/Win95/Win95Apps/IE4Sites/IE4NoPage.resx
+++ b/Histacom2/OS/Win95/Win95Apps/IE3Sites/IENoPage.resx
diff --git a/Histacom2/OS/Win95/Win95Apps/MineSweeper/WinClassicMinesweeper.cs b/Histacom2/OS/Win95/Win95Apps/MineSweeper/WinClassicMinesweeper.cs
index 9b6595c..2a03c7e 100644
--- a/Histacom2/OS/Win95/Win95Apps/MineSweeper/WinClassicMinesweeper.cs
+++ b/Histacom2/OS/Win95/Win95Apps/MineSweeper/WinClassicMinesweeper.cs
@@ -123,7 +123,7 @@ namespace Histacom2.OS.Win95.Win95Apps
         private void bestTimesToolStripMenuItem_Click(object sender, EventArgs e)
         {
             WindowManager wm = new WindowManager();
-            wm.StartWin95(new MineBestTimes(), "Best Times", null, false, false, true, false);
+            wm.Init(new MineBestTimes(), "Best Times", null, false, false, true, false);
 
         }
 
@@ -165,7 +165,7 @@ namespace Histacom2.OS.Win95.Win95Apps
         private void customToolStripMenuItem_Click(object sender, EventArgs e)
         {
             level = "custom";
-            new WindowManager().StartWin95(new CustomMinefield(this), "Custom Field", null, false, false, true, false);
+            new WindowManager().Init(new CustomMinefield(this), "Custom Field", null, false, false, true, false);
         }
     }
 }
diff --git a/Histacom2/OS/Win95/Win95Apps/Story/Hack1.cs b/Histacom2/OS/Win95/Win95Apps/Story/Hack1.cs
index b988092..41f7c35 100644
--- a/Histacom2/OS/Win95/Win95Apps/Story/Hack1.cs
+++ b/Histacom2/OS/Win95/Win95Apps/Story/Hack1.cs
@@ -39,7 +39,7 @@ namespace Histacom2.OS.Win95.Win95Apps.Story
         public static async void ContinueObjective()
         {
             WinClassicTerminal Console = new WinClassicTerminal(true);
-            WinClassic app = wm.StartWin95(Console, "MS-DOS Prompt", null, true, true);
+            WinClassic app = wm.Init(Console, "MS-DOS Prompt", null, true, true);
 
             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 b72c576..5f71ce4 100644
--- a/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs
+++ b/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs
@@ -17,7 +17,7 @@ namespace Histacom2.OS.Win95.Win95Apps.Story
         {
             WinClassicTerminal Console = new WinClassicTerminal(true);
             Random r = new Random();
-            WinClassic app = wm.StartWin95(Console, "MS-DOS Prompt", null, true, true);
+            WinClassic app = wm.Init(Console, "MS-DOS Prompt", null, true, true);
             
             Console.WriteLine("telnet> 185.152.46.51 Connecting...");
             await Task.Delay(2500);
diff --git a/Histacom2/OS/Win95/Win95Apps/WebChat1998.Designer.cs b/Histacom2/OS/Win95/Win95Apps/WebChat1998.Designer.cs
index 8a32029..ea9d0cd 100644
--- a/Histacom2/OS/Win95/Win95Apps/WebChat1998.Designer.cs
+++ b/Histacom2/OS/Win95/Win95Apps/WebChat1998.Designer.cs
@@ -29,28 +29,28 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            this.resources = new System.ComponentModel.ComponentResourceManager(typeof(WebChat1998));
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WebChat1998));
             this.Chat = new System.Windows.Forms.Timer(this.components);
             this.listBox1 = new System.Windows.Forms.ListBox();
-            this.label1 = new System.Windows.Forms.Label();
+            this.label1 = new Histacom2.Engine.UI.ClassicLabel();
             this.history = new System.Windows.Forms.TextBox();
             this.panel1 = new System.Windows.Forms.Panel();
-            this.label5 = new System.Windows.Forms.Label();
-            this.button5 = new System.Windows.Forms.Button();
-            this.label6 = new System.Windows.Forms.Label();
+            this.label5 = new Histacom2.Engine.UI.ClassicLabel();
+            this.button5 = new Histacom2.Engine.UI.ClassicButton();
+            this.label6 = new Histacom2.Engine.UI.ClassicLabel();
             this.typechat = new System.Windows.Forms.TextBox();
             this.login = new System.Windows.Forms.Panel();
-            this.label2 = new System.Windows.Forms.Label();
+            this.label2 = new Histacom2.Engine.UI.ClassicLabel();
             this.txtscreenname = new System.Windows.Forms.TextBox();
-            this.button1 = new System.Windows.Forms.Button();
-            this.label3 = new System.Windows.Forms.Label();
-            this.label4 = new System.Windows.Forms.Label();
+            this.button1 = new Histacom2.Engine.UI.ClassicButton();
+            this.label3 = new Histacom2.Engine.UI.ClassicLabel();
+            this.label4 = new Histacom2.Engine.UI.ClassicLabel();
             this.textBox1 = new System.Windows.Forms.TextBox();
             this.textBox2 = new System.Windows.Forms.TextBox();
-            this.label7 = new System.Windows.Forms.Label();
-            this.button2 = new System.Windows.Forms.Button();
-            this.button3 = new System.Windows.Forms.Button();
-            this.button4 = new System.Windows.Forms.Button();
+            this.label7 = new Histacom2.Engine.UI.ClassicLabel();
+            this.button2 = new Histacom2.Engine.UI.ClassicButton();
+            this.button3 = new Histacom2.Engine.UI.ClassicButton();
+            this.button4 = new Histacom2.Engine.UI.ClassicButton();
             this.panel1.SuspendLayout();
             this.login.SuspendLayout();
             this.SuspendLayout();
@@ -73,8 +73,7 @@
             // label1
             // 
             this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(501, 13);
+            this.label1.Location = new System.Drawing.Point(506, 13);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(85, 13);
             this.label1.TabIndex = 1;
@@ -107,7 +106,6 @@
             // 
             // label5
             // 
-            this.label5.AutoSize = true;
             this.label5.Location = new System.Drawing.Point(13, 18);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(84, 13);
@@ -116,17 +114,18 @@
             // 
             // button5
             // 
-            this.button5.Location = new System.Drawing.Point(97, 13);
+            this.button5.BackColor = System.Drawing.Color.Silver;
+            this.button5.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F);
+            this.button5.ForeColor = System.Drawing.Color.Black;
+            this.button5.Location = new System.Drawing.Point(101, 13);
             this.button5.Name = "button5";
             this.button5.Size = new System.Drawing.Size(75, 23);
             this.button5.TabIndex = 0;
             this.button5.Text = "Download";
-            this.button5.UseVisualStyleBackColor = true;
             // 
             // label6
             // 
             this.label6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.label6.AutoSize = true;
             this.label6.Location = new System.Drawing.Point(504, 374);
             this.label6.Name = "label6";
             this.label6.Size = new System.Drawing.Size(62, 13);
@@ -157,7 +156,6 @@
             // 
             // label2
             // 
-            this.label2.AutoSize = true;
             this.label2.Location = new System.Drawing.Point(328, 161);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(149, 13);
@@ -174,19 +172,18 @@
             // button1
             // 
             this.button1.BackColor = System.Drawing.Color.Silver;
-            this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.button1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F);
+            this.button1.ForeColor = System.Drawing.Color.Black;
             this.button1.Location = new System.Drawing.Point(331, 208);
             this.button1.Name = "button1";
             this.button1.Size = new System.Drawing.Size(151, 23);
             this.button1.TabIndex = 4;
             this.button1.Text = "Login";
-            this.button1.UseVisualStyleBackColor = true;
             this.button1.Click += new System.EventHandler(this.Button1_Click);
             // 
             // label3
             // 
-            this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(196, 16);
+            this.label3.Location = new System.Drawing.Point(202, 16);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(112, 13);
             this.label3.TabIndex = 3;
@@ -194,7 +191,6 @@
             // 
             // label4
             // 
-            this.label4.AutoSize = true;
             this.label4.Location = new System.Drawing.Point(118, 56);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(93, 13);
@@ -229,48 +225,48 @@
             // 
             // label7
             // 
-            this.label7.AutoSize = true;
             this.label7.Location = new System.Drawing.Point(22, 13);
             this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(406, 13);
+            this.label7.Size = new System.Drawing.Size(441, 13);
             this.label7.TabIndex = 7;
             this.label7.Text = "To speak, just type in the bottom textbox, then click the Speak button or press E" +
     "nter.";
             // 
             // button2
             // 
-            this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.button2.BackColor = System.Drawing.Color.Silver;
-            this.button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.button2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F);
+            this.button2.ForeColor = System.Drawing.Color.Black;
             this.button2.Location = new System.Drawing.Point(422, 415);
             this.button2.Name = "button2";
             this.button2.Size = new System.Drawing.Size(71, 23);
             this.button2.TabIndex = 8;
             this.button2.Text = "Speak";
-            this.button2.UseVisualStyleBackColor = true;
             this.button2.Click += new System.EventHandler(this.Button2_Click);
             // 
             // button3
             // 
             this.button3.BackColor = System.Drawing.Color.Silver;
-            this.button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.button3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F);
+            this.button3.ForeColor = System.Drawing.Color.Black;
             this.button3.Location = new System.Drawing.Point(149, 427);
             this.button3.Name = "button3";
             this.button3.Size = new System.Drawing.Size(75, 23);
             this.button3.TabIndex = 9;
             this.button3.Text = "Paul";
-            this.button3.UseVisualStyleBackColor = true;
             this.button3.Click += new System.EventHandler(this.Button3_Click);
             // 
             // button4
             // 
+            this.button4.BackColor = System.Drawing.Color.Silver;
+            this.button4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F);
+            this.button4.ForeColor = System.Drawing.Color.Black;
             this.button4.Location = new System.Drawing.Point(235, 427);
             this.button4.Name = "button4";
             this.button4.Size = new System.Drawing.Size(75, 23);
             this.button4.TabIndex = 10;
             this.button4.Text = "Bill";
-            this.button4.UseVisualStyleBackColor = true;
             this.button4.Click += new System.EventHandler(this.Button4_Click);
             // 
             // WebChat1998
@@ -293,7 +289,6 @@
             this.Size = new System.Drawing.Size(724, 462);
             this.Load += new System.EventHandler(this.WebChat1998_Load);
             this.panel1.ResumeLayout(false);
-            this.panel1.PerformLayout();
             this.login.ResumeLayout(false);
             this.login.PerformLayout();
             this.ResumeLayout(false);
@@ -305,25 +300,25 @@
 
         private System.Windows.Forms.Timer Chat;
         private System.Windows.Forms.ListBox listBox1;
-        private System.Windows.Forms.Label label1;
+        private Histacom2.Engine.UI.ClassicLabel label1;
         private System.Windows.Forms.TextBox history;
         private System.Windows.Forms.Panel panel1;
-        private System.Windows.Forms.Label label6;
-        private System.Windows.Forms.Button button5;
-        private System.Windows.Forms.Label label5;
+        private Histacom2.Engine.UI.ClassicLabel label6;
+        private Histacom2.Engine.UI.ClassicButton button5;
+        private Histacom2.Engine.UI.ClassicLabel label5;
         private System.Windows.Forms.TextBox typechat;
         private System.Windows.Forms.Panel login;
         private System.Windows.Forms.TextBox textBox2;
         private System.Windows.Forms.TextBox textBox1;
-        private System.Windows.Forms.Label label4;
-        private System.Windows.Forms.Label label3;
-        private System.Windows.Forms.Button button1;
+        private Histacom2.Engine.UI.ClassicLabel label4;
+        private Histacom2.Engine.UI.ClassicLabel label3;
+        private Histacom2.Engine.UI.ClassicButton button1;
         private System.Windows.Forms.TextBox txtscreenname;
-        private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.Label label7;
-        private System.Windows.Forms.Button button2;
-        private System.Windows.Forms.Button button3;
-        private System.Windows.Forms.Button button4;
+        private Histacom2.Engine.UI.ClassicLabel label2;
+        private Histacom2.Engine.UI.ClassicLabel label7;
+        private Histacom2.Engine.UI.ClassicButton button2;
+        private Histacom2.Engine.UI.ClassicButton button3;
+        private Histacom2.Engine.UI.ClassicButton button4;
         private System.ComponentModel.ComponentResourceManager resources;
     }
 }
diff --git a/Histacom2/OS/Win95/Win95Apps/WebChat1998.resx b/Histacom2/OS/Win95/Win95Apps/WebChat1998.resx
index f1d3183..61225ed 100644
--- a/Histacom2/OS/Win95/Win95Apps/WebChat1998.resx
+++ b/Histacom2/OS/Win95/Win95Apps/WebChat1998.resx
@@ -117,10 +117,9 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="Chat.TrayLocation" type="System.Drawing.Point, System.Drawing">
+  <metadata name="Chat.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
-  </data>
+  </metadata>
   <data name="textBox1.Text" xml:space="preserve">
     <value>If you do not agree to the following rules below DO NOT log into the chat:
 
diff --git a/Histacom2/OS/Win95/Win95Apps/Win95Installer.Designer.cs b/Histacom2/OS/Win95/Win95Apps/Win95Installer.Designer.cs
index e53ceb3..5592445 100644
--- a/Histacom2/OS/Win95/Win95Apps/Win95Installer.Designer.cs
+++ b/Histacom2/OS/Win95/Win95Apps/Win95Installer.Designer.cs
@@ -41,14 +41,14 @@
             this.checkBox1 = new System.Windows.Forms.CheckBox();
             this.panel1 = new System.Windows.Forms.Panel();
             this.panel2 = new System.Windows.Forms.Panel();
-            this.label3 = new System.Windows.Forms.Label();
-            this.label4 = new System.Windows.Forms.Label();
             this.label5 = new System.Windows.Forms.Label();
+            this.label4 = new System.Windows.Forms.Label();
+            this.label3 = new System.Windows.Forms.Label();
             this.panel3 = new System.Windows.Forms.Panel();
             this.label6 = new System.Windows.Forms.Label();
+            this.progressBar1 = new Histacom2.Engine.UI.ProgressBar();
             this.panel4 = new System.Windows.Forms.Panel();
             this.label7 = new System.Windows.Forms.Label();
-            this.progressBar1 = new Histacom2.UI.ProgressBar();
             ((System.ComponentModel.ISupportInitialize)(this.installPic)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             this.panel1.SuspendLayout();
@@ -184,14 +184,14 @@
             this.panel2.TabIndex = 11;
             this.panel2.Visible = false;
             // 
-            // label3
+            // label5
             // 
-            this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(-3, 0);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(268, 13);
-            this.label3.TabIndex = 0;
-            this.label3.Text = "Setup will install GenericName in the following directory:";
+            this.label5.AutoSize = true;
+            this.label5.Location = new System.Drawing.Point(-3, 28);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(178, 13);
+            this.label5.TabIndex = 2;
+            this.label5.Text = "To install in this directory, click Next.";
             // 
             // label4
             // 
@@ -202,14 +202,14 @@
             this.label4.TabIndex = 1;
             this.label4.Text = "C:\\Program Files\\12padams\\GenericName\\";
             // 
-            // label5
+            // label3
             // 
-            this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(-3, 28);
-            this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(178, 13);
-            this.label5.TabIndex = 2;
-            this.label5.Text = "To install in this directory, click Next.";
+            this.label3.AutoSize = true;
+            this.label3.Location = new System.Drawing.Point(-3, 0);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(268, 13);
+            this.label3.TabIndex = 0;
+            this.label3.Text = "Setup will install GenericName in the following directory:";
             // 
             // panel3
             // 
@@ -230,6 +230,23 @@
             this.label6.TabIndex = 1;
             this.label6.Text = "Installing...";
             // 
+            // progressBar1
+            // 
+            this.progressBar1.BlockSpacing = 5;
+            this.progressBar1.BlockWidth = 20;
+            this.progressBar1.Location = new System.Drawing.Point(3, 115);
+            this.progressBar1.MarqueeWidth = 125;
+            this.progressBar1.Maximum = 100D;
+            this.progressBar1.Minimum = 0D;
+            this.progressBar1.Name = "progressBar1";
+            this.progressBar1.ProgressColor = System.Drawing.Color.Navy;
+            this.progressBar1.ShowText = false;
+            this.progressBar1.Size = new System.Drawing.Size(312, 28);
+            this.progressBar1.Style = System.Windows.Forms.ProgressBarStyle.Blocks;
+            this.progressBar1.TabIndex = 0;
+            this.progressBar1.Text = "progressBar1";
+            this.progressBar1.Value = 0D;
+            // 
             // panel4
             // 
             this.panel4.Controls.Add(this.label7);
@@ -248,23 +265,6 @@
             this.label7.TabIndex = 0;
             this.label7.Text = "GenericName Setup has been completed.";
             // 
-            // progressBar1
-            // 
-            this.progressBar1.BlockSpacing = 5;
-            this.progressBar1.BlockWidth = 20;
-            this.progressBar1.Location = new System.Drawing.Point(3, 115);
-            this.progressBar1.MarqueeWidth = 125;
-            this.progressBar1.Maximum = 100D;
-            this.progressBar1.Minimum = 0D;
-            this.progressBar1.Name = "progressBar1";
-            this.progressBar1.ProgressColor = System.Drawing.Color.Navy;
-            this.progressBar1.ShowText = false;
-            this.progressBar1.Size = new System.Drawing.Size(312, 28);
-            this.progressBar1.Style = System.Windows.Forms.ProgressBarStyle.Blocks;
-            this.progressBar1.TabIndex = 0;
-            this.progressBar1.Text = "progressBar1";
-            this.progressBar1.Value = 0D;
-            // 
             // Win95Installer
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -317,7 +317,7 @@
         private System.Windows.Forms.Label label3;
         private System.Windows.Forms.Label label5;
         private System.Windows.Forms.Panel panel3;
-        private UI.ProgressBar progressBar1;
+        private Engine.UI.ProgressBar progressBar1;
         private System.Windows.Forms.Label label6;
         private System.Windows.Forms.Panel panel4;
         private System.Windows.Forms.Label label7;
diff --git a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs
index d7a10a8..fa1e0ce 100644
--- a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs
+++ b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs
@@ -13,6 +13,8 @@ using Histacom2.Engine;
 using Newtonsoft.Json;
 using Histacom2.Engine.Template;
 using System.Diagnostics;
+using Histacom2.OS.Win95.Win95Apps._12padamViruses;
+using Histacom2.GlobalPrograms;
 
 namespace Histacom2.OS.Win95.Win95Apps
 {
@@ -225,7 +227,7 @@ namespace Histacom2.OS.Win95.Win95Apps
                         WinClassicNotepad np = new WinClassicNotepad();
                         np.mainText.Text = FileDialogBoxManager.ReadTextFile(fileDir);
                         np.CurrentFilePath = fileDir;
-                        WinClassic app = wm.StartWin95(np, "Notepad", Properties.Resources.Win95IconNotepad, true, true);
+                        WinClassic app = wm.Init(np, "Notepad", Properties.Resources.Win95IconNotepad, true, true);
 
                         Program.AddTaskbarItem(app, app.Tag.ToString(), "Notepad", Properties.Resources.Win95IconNotepad);
                         break;
@@ -233,7 +235,7 @@ namespace Histacom2.OS.Win95.Win95Apps
                         WinClassicWordPad wp = new WinClassicWordPad();
                         wp.mainText.LoadFile(fileDir);
                         wp.CurrentFilePath = fileDir;
-                        WinClassic app2 = wm.StartWin95(wp, "Wordpad", Properties.Resources.Win95IconWordpad, true, true);
+                        WinClassic app2 = wm.Init(wp, "Wordpad", Properties.Resources.Win95IconWordpad, true, true);
 
                         Program.AddTaskbarItem(app2, app2.Tag.ToString(), "Wordpad", Properties.Resources.Win95IconWordpad);
                         break;
@@ -250,11 +252,11 @@ namespace Histacom2.OS.Win95.Win95Apps
             switch (appname.ToLower())
             {
                 case "explorer":
-                    WinClassic app = wm.StartWin95(new Win95WindowsExplorer(), "Windows Explorer", Properties.Resources.WinClassicFileExplorer, true, true);
+                    WinClassic app = wm.Init(new Win95WindowsExplorer(), "Windows Explorer", Properties.Resources.WinClassicFileExplorer, true, true);
                     Program.AddTaskbarItem(app, app.Tag.ToString(), "Windows Explorer", Properties.Resources.WinClassicFileExplorer);
                     break;
                 case "calc":
-                    WinClassic appCalc = wm.StartWin95(new WinClassicCalculator(), "Calculator", Properties.Resources.WinClassicCalc, true, true);
+                    WinClassic appCalc = wm.Init(new WinClassicCalculator(), "Calculator", Properties.Resources.WinClassicCalc, true, true);
                     Program.AddTaskbarItem(appCalc, appCalc.Tag.ToString(), "Calculator", Properties.Resources.WinClassicCalc);
 
                     Program.nonimportantapps.Add(appCalc);
@@ -263,7 +265,7 @@ namespace Histacom2.OS.Win95.Win95Apps
 
                     break;
                 case "notepad":
-                    WinClassic appNP = wm.StartWin95(new WinClassicNotepad(), "Notepad", Properties.Resources.Win95IconNotepad_2, true, true);
+                    WinClassic appNP = wm.Init(new WinClassicNotepad(), "Notepad", Properties.Resources.Win95IconNotepad_2, true, true);
                     Program.AddTaskbarItem(appNP, appNP.Tag.ToString(), "Notepad", Properties.Resources.Win95IconNotepad_2);
 
                     Program.nonimportantapps.Add(appNP);
@@ -272,7 +274,7 @@ namespace Histacom2.OS.Win95.Win95Apps
 
                     break;
                 case "wordpad":
-                    WinClassic appWP = wm.StartWin95(new WinClassicWordPad(), "Wordpad", Properties.Resources.Win95WordpadIcon2, true, true);
+                    WinClassic appWP = wm.Init(new WinClassicWordPad(), "Wordpad", Properties.Resources.Win95WordpadIcon2, true, true);
                     Program.AddTaskbarItem(appWP, appWP.Tag.ToString(), "Wordpad", Properties.Resources.Win95WordpadIcon2);
 
                     Program.nonimportantapps.Add(appWP);
@@ -282,7 +284,7 @@ namespace Histacom2.OS.Win95.Win95Apps
                     break;
                 case "ie":
                     if (TitleScreen.frm95.ie != null) { wm.StartInfobox95("Error Opening Internet Explorer", "An instance of Internet Explorer 4 is already open.", InfoboxType.Warning, InfoboxButtons.OK); return; }
-                    TitleScreen.frm95.ie = wm.StartWin95(new WinClassicIE3(), "Internet Explorer 4", Properties.Resources.Win95IconIE4, true, true);
+                    TitleScreen.frm95.ie = wm.Init(new WinClassicIE3(), "Internet Explorer 4", Properties.Resources.Win95IconIE4, true, true);
                     Program.AddTaskbarItem(TitleScreen.frm95.ie, TitleScreen.frm95.ie.Tag.ToString(), "Internet Explorer 4", Properties.Resources.Win95IconIE4);
                     TitleScreen.frm95.ie.BringToFront();
                     TitleScreen.frm95.ie.FormClosing += new FormClosingEventHandler(TitleScreen.frm95.InternetExplorer4_Closing);
@@ -291,7 +293,7 @@ namespace Histacom2.OS.Win95.Win95Apps
                 case "web chat setup":
                     Win95Installer inst = new Win95Installer("Web Chat 1998");
                     inst.InstallCompleted += (sendr, args) => TitleScreen.frm95.WebChatToolStripMenuItem.Visible = true;
-                    WinClassic appInstaller = wm.StartWin95(inst, "Web Chat Setup", null, true, true);
+                    WinClassic appInstaller = wm.Init(inst, "Web Chat Setup", null, true, true);
                     Program.AddTaskbarItem(appInstaller, appInstaller.Tag.ToString(), "Web Chat Setup", null);
                     appInstaller.BringToFront();
 
@@ -305,7 +307,7 @@ namespace Histacom2.OS.Win95.Win95Apps
                         CreateWindowsFile(Path.Combine(ProfileProgramsDirectory, "12padams", "FTP Client"), "ftpclint.exe", "ftp client", 19, 58395);
                         TitleScreen.frm95.FTPClientToolStripMenuItem.Visible = true;
                     };
-                    WinClassic appFtp = wm.StartWin95(instFtp, "FTP Client Setup", null, true, true);
+                    WinClassic appFtp = wm.Init(instFtp, "FTP Client Setup", null, true, true);
                     Program.AddTaskbarItem(appFtp, appFtp.Tag.ToString(), "FTP Client Setup", null);
                     appFtp.BringToFront();
 
@@ -319,7 +321,7 @@ namespace Histacom2.OS.Win95.Win95Apps
                         CreateWindowsFile(Path.Combine(ProfileProgramsDirectory, "12padams", "Time Distorter 0.1"), "tdistort.exe", "time distorter", 17, 23895);
                         TitleScreen.frm95.TimeDistorterToolStripMenuItem.Visible = true;
                     };
-                    WinClassic appTd = wm.StartWin95(instTd, "Time Distorter Setup", null, true, true);
+                    WinClassic appTd = wm.Init(instTd, "Time Distorter Setup", null, true, true);
                     Program.AddTaskbarItem(appTd, appTd.Tag.ToString(), "Time Distorter Setup", null);
                     appTd.BringToFront();
 
@@ -337,13 +339,13 @@ namespace Histacom2.OS.Win95.Win95Apps
                         CreateWindowsFile(Path.Combine(ProfileProgramsDirectory, "12padams", "Guess The Number V1"), "guessnum.exe", "guess number", 18, 17483);
                         TitleScreen.frm95.GuessTheNumberToolStripMenuItem.Visible = true;
                     };
-                    WinClassic appGtn = wm.StartWin95(instGtn, "Guess The Number Setup", null, true, true);
+                    WinClassic appGtn = wm.Init(instGtn, "Guess The Number Setup", null, true, true);
                     Program.AddTaskbarItem(appGtn, appGtn.Tag.ToString(), "Guess The Number Setup", null);
                     appGtn.BringToFront();
 
                     break;
                 case "guess number":
-                    WinClassic appGTN = wm.StartWin95(new GuessTheNumber(), "Guess The Number", Properties.Resources.WinClassicGTNIcon, false, true, false, false);
+                    WinClassic appGTN = wm.Init(new GuessTheNumber(), "Guess The Number", Properties.Resources.WinClassicGTNIcon, false, true, false, false);
                     Program.AddTaskbarItem(appGTN, appGTN.Tag.ToString(), "Guess The Number", Properties.Resources.WinClassicGTNIcon);
 
                     Program.nonimportantapps.Add(appGTN);
@@ -351,6 +353,26 @@ namespace Histacom2.OS.Win95.Win95Apps
                     Program.nonimportantapps[Program.nonimportantapps.Count - 1].FormClosing += new FormClosingEventHandler(Program.NonImportantApp_Closing);
 
                     break;
+                case "eb95 setup":
+                    Win95Installer ebInstall = new Win95Installer("Error Blaster 95");
+                    ebInstall.InstallCompleted += (sender, args) => TitleScreen.frm95.ErrorBlasterToolStripMenuItem.Visible = 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();
+                    break;
+                case "error blaster":
+                    WinClassic eb = wm.Init(new ErrorBlaster95(), "Welcome to Error Blaster 95!", null, true, true);
+                    Program.AddTaskbarItem(eb, eb.Tag.ToString(), "Welcome to Error Blaster 95!", null);
+                    Program.nonimportantapps[Program.nonimportantapps.Count - 1].BringToFront();
+                    Program.nonimportantapps[Program.nonimportantapps.Count - 1].FormClosing += new FormClosingEventHandler(Program.NonImportantApp_Closing);
+                    break;
+                case "sr95 setup":
+                    Win95Installer srInstall = new Win95Installer("Start Runner 95");
+                    srInstall.InstallCompleted += (sender, args) => TitleScreen.frm95.ErrorBlasterToolStripMenuItem.Visible = true;
+                    WinClassic install = wm.Init(srInstall, "Start Runner 95 Setup", null, true, true);
+                    Program.AddTaskbarItem(install, install.Tag.ToString(), "Error Blaster 95 Setup", null);
+                    install.BringToFront();
+                    break;
                 default:
                     wm.StartInfobox95(path.Replace(ProfileMyComputerDirectory, "C:"), $"{path.Replace(ProfileMyComputerDirectory, "C:")} is not a valid Win32 application.", InfoboxType.Error, InfoboxButtons.OK);
                     break;
diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs
index 9e09cb0..63e056b 100644
--- a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs
+++ b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs
@@ -37,7 +37,7 @@
             "???.html"}, 1, System.Drawing.Color.Black, System.Drawing.Color.Empty, null);
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WinClassicFTPClient));
             this.topBar = new System.Windows.Forms.Panel();
-            this.btnLogin = new System.Windows.Forms.Button();
+            this.btnLogin = new Histacom2.Engine.UI.ClassicButton();
             this.infoLabel = new System.Windows.Forms.Label();
             this.label4 = new System.Windows.Forms.Label();
             this.textBox4 = new System.Windows.Forms.TextBox();
@@ -49,7 +49,7 @@
             this.hostnameBox = new System.Windows.Forms.TextBox();
             this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
             this.panel1 = new System.Windows.Forms.Panel();
-            this.btnCancel = new System.Windows.Forms.Button();
+            this.btnCancel = new Histacom2.Engine.UI.ClassicButton();
             this.welcomeLabel = new System.Windows.Forms.Label();
             this.ftpFiles = new System.Windows.Forms.ListView();
             this.fileIcons = new System.Windows.Forms.ImageList(this.components);
@@ -78,13 +78,14 @@
             // 
             // btnLogin
             // 
-            this.btnLogin.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnLogin.Location = new System.Drawing.Point(585, 2);
+            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.ForeColor = System.Drawing.Color.Black;
+            this.btnLogin.Location = new System.Drawing.Point(585, 4);
             this.btnLogin.Name = "btnLogin";
-            this.btnLogin.Size = new System.Drawing.Size(44, 23);
-            this.btnLogin.TabIndex = 5;
+            this.btnLogin.Size = new System.Drawing.Size(44, 20);
+            this.btnLogin.TabIndex = 9;
             this.btnLogin.Text = "Login";
-            this.btnLogin.UseVisualStyleBackColor = true;
             this.btnLogin.Click += new System.EventHandler(this.button1_Click);
             // 
             // infoLabel
@@ -183,13 +184,13 @@
             // 
             // btnCancel
             // 
-            this.btnCancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnCancel.BackColor = System.Drawing.Color.Silver;
+            this.btnCancel.ForeColor = System.Drawing.Color.Black;
             this.btnCancel.Location = new System.Drawing.Point(3, 2);
             this.btnCancel.Name = "btnCancel";
             this.btnCancel.Size = new System.Drawing.Size(75, 23);
             this.btnCancel.TabIndex = 0;
             this.btnCancel.Text = "Cancel";
-            this.btnCancel.UseVisualStyleBackColor = true;
             this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
             // 
             // welcomeLabel
@@ -266,11 +267,11 @@
         private System.Windows.Forms.ContextMenuStrip contextMenuStrip1;
         public System.Windows.Forms.TextBox hostnameBox;
         private System.Windows.Forms.Label infoLabel;
-        private System.Windows.Forms.Button btnLogin;
         private System.Windows.Forms.Panel panel1;
-        private System.Windows.Forms.Button btnCancel;
+        private Engine.UI.ClassicButton btnCancel;
         private System.Windows.Forms.Label welcomeLabel;
         internal System.Windows.Forms.ListView ftpFiles;
         private System.Windows.Forms.ImageList fileIcons;
+        private Engine.UI.ClassicButton btnLogin;
     }
 }
diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs
index 1488808..1a0836b 100644
--- a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs
+++ b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs
@@ -8,6 +8,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using Histacom2.Engine;
+using Histacom2.GlobalPrograms;
 
 namespace Histacom2.OS.Win95.Win95Apps
 {
@@ -88,14 +89,14 @@ namespace Histacom2.OS.Win95.Win95Apps
                 {
                     WinClassicDownloader opendownload = new WinClassicDownloader();
                     WindowManager wm = new WindowManager();
-                    wm.StartWin95(opendownload, "Downloader", null, false, true);
+                    wm.Init(opendownload, "Downloader", null, false, true);
                     opendownload.appName.Text = "Downloading: FTP Client";
                 }
                 else if (objListViewItem.Text == "Web Chat Setup.exe")
                 {
                     WinClassicDownloader opendownload = new WinClassicDownloader();
                     WindowManager wm = new WindowManager();
-                    wm.StartWin95(opendownload, "Downloader", null, false, true);
+                    wm.Init(opendownload, "Downloader", null, false, true);
                     opendownload.appName.Text = "Downloading: Web Chat 1998";
                     opendownload.amountToDL = 35;
                 }
@@ -103,26 +104,20 @@ namespace Histacom2.OS.Win95.Win95Apps
                 {
                     WinClassicDownloader opendownload = new WinClassicDownloader();
                     WindowManager wm = new WindowManager();
-                    wm.StartWin95(opendownload, "Downloader", null, false, true);
+                    wm.Init(opendownload, "Downloader", null, false, true);
                     opendownload.appName.Text = "Downloading: Time Distorter 0.1";
                 }
                 else if (objListViewItem.Text == "Guess The Number V1 Setup.exe")
                 {
                     WinClassicDownloader opendownload = new WinClassicDownloader();
                     WindowManager wm = new WindowManager();
-                    wm.StartWin95(opendownload, "Downloader", null, false, true);
+                    wm.Init(opendownload, "Downloader", null, false, true);
                     opendownload.appName.Text = "Downloading: Guess The Number V1";
                     opendownload.amountToDL = 16;
                 }
             }
         }
 
-        private void DoClassicButtons()
-        {
-            btnLogin.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2);
-            btnCancel.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2);
-        }
-
         private void btnCancel_Click(object sender, EventArgs e)
         {
             ParentForm.Close();
@@ -130,7 +125,12 @@ namespace Histacom2.OS.Win95.Win95Apps
 
         private void WinClassicFTPClient_Load(object sender, EventArgs e)
         {
-            DoClassicButtons();
+            
+        }
+
+        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 0869aa0..9dd3ac3 100644
--- a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.resx
+++ b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.resx
@@ -128,7 +128,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABe
-        EgAAAk1TRnQBSQFMAgEBAwEAASABAAEgAQABIAEAASABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        EgAAAk1TRnQBSQFMAgEBAwEAATABAAEwAQABIAEAASABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABgAMAASADAAEBAQABCAYAARAYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicIE3.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicIE3.cs
index ee32a38..de2e4b0 100644
--- a/Histacom2/OS/Win95/Win95Apps/WinClassicIE3.cs
+++ b/Histacom2/OS/Win95/Win95Apps/WinClassicIE3.cs
@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using Histacom2.OS.Win95.Win95Apps.IE4Sites;
+using Histacom2.OS.Win95.Win95Apps.IE3Sites;
 
 namespace Histacom2.OS.Win95.Win95Apps
 {
@@ -39,7 +39,7 @@ namespace Histacom2.OS.Win95.Win95Apps
             switch (url)
             {
                 case "www.microsoft.com/windows/ie/default.htm":
-                    uc = new IE4Start();
+                    uc = new IE3Start();
                     break;
                 case "www.google.com":
                     uc = new GoogleHome();
@@ -51,7 +51,7 @@ namespace Histacom2.OS.Win95.Win95Apps
                     uc = new _12padams1998();
                     break;
                 default:
-                    uc = new IE4NoPage();
+                    uc = new IENoPage();
                     break;
             }
 
diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.Designer.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.Designer.cs
index ee8021c..6b92d11 100644
--- a/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.Designer.cs
+++ b/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.Designer.cs
@@ -31,9 +31,9 @@
             this.pictureBox1 = new System.Windows.Forms.PictureBox();
             this.comboBox1 = new System.Windows.Forms.ComboBox();
             this.pictureBox2 = new System.Windows.Forms.PictureBox();
-            this.applyButton = new System.Windows.Forms.Button();
-            this.cancelButton = new System.Windows.Forms.Button();
-            this.okButton = new System.Windows.Forms.Button();
+            this.applyButton = new Histacom2.Engine.UI.ClassicButton();
+            this.cancelButton = new Histacom2.Engine.UI.ClassicButton();
+            this.okButton = new Histacom2.Engine.UI.ClassicButton();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
             this.SuspendLayout();
@@ -73,35 +73,29 @@
             // 
             // applyButton
             // 
-            this.applyButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.applyButton.Location = new System.Drawing.Point(209, 245);
             this.applyButton.Name = "applyButton";
             this.applyButton.Size = new System.Drawing.Size(75, 23);
             this.applyButton.TabIndex = 3;
             this.applyButton.Text = "Apply";
-            this.applyButton.UseVisualStyleBackColor = true;
             this.applyButton.Click += new System.EventHandler(this.applyButton_Click);
             // 
             // cancelButton
             // 
-            this.cancelButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.cancelButton.Location = new System.Drawing.Point(128, 245);
             this.cancelButton.Name = "cancelButton";
             this.cancelButton.Size = new System.Drawing.Size(75, 23);
             this.cancelButton.TabIndex = 4;
             this.cancelButton.Text = "Cancel";
-            this.cancelButton.UseVisualStyleBackColor = true;
             this.cancelButton.Click += new System.EventHandler(this.cancelButton_Click);
             // 
             // okButton
             // 
-            this.okButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.okButton.Location = new System.Drawing.Point(47, 245);
             this.okButton.Name = "okButton";
             this.okButton.Size = new System.Drawing.Size(75, 23);
             this.okButton.TabIndex = 5;
             this.okButton.Text = "OK";
-            this.okButton.UseVisualStyleBackColor = true;
             this.okButton.Click += new System.EventHandler(this.okButton_Click);
             // 
             // WinClassicThemePanel
@@ -129,8 +123,8 @@
         private System.Windows.Forms.PictureBox pictureBox1;
         private System.Windows.Forms.ComboBox comboBox1;
         private System.Windows.Forms.PictureBox pictureBox2;
-        private System.Windows.Forms.Button applyButton;
-        private System.Windows.Forms.Button cancelButton;
-        private System.Windows.Forms.Button okButton;
+        private Histacom2.Engine.UI.ClassicButton applyButton;
+        private Histacom2.Engine.UI.ClassicButton cancelButton;
+        private Histacom2.Engine.UI.ClassicButton okButton;
     }
 }
diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs
index fb790cb..2529e10 100644
--- a/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs
+++ b/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs
@@ -61,64 +61,32 @@ namespace Histacom2.OS.Win95.Win95Apps
 
         private void applyButton_Click(object sender, EventArgs e)
         {
-            switch ((string)comboBox1.SelectedItem)
-            {
-                case "Default":
-                    SaveSystem.CurrentSave.ThemeName = "default95";
-                    SaveSystem.currentTheme = new Default95Theme();
-                    TitleScreen.frm95.BackgroundImage = null;
-                    TitleScreen.frm95.desktopicons.BackgroundImage = null;
-                    break;
-                case "Dangerous Creatures":
-                    SaveSystem.CurrentSave.ThemeName = "dangeranimals";
-                    SaveSystem.currentTheme = new DangerousCreaturesTheme();
-                    TitleScreen.frm95.BackgroundImage = Properties.Resources.DCTheme_BG;
-                    TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(Properties.Resources.DCTheme_BG, TitleScreen.frm95.Width, TitleScreen.frm95.Height);
-                    break;
-                case "Inside Your Computer":
-                    SaveSystem.CurrentSave.ThemeName = "insidepc";
-                    SaveSystem.currentTheme = new InsideComputerTheme();
-                    TitleScreen.frm95.BackgroundImage = Properties.Resources.ICTheme_BG;
-                    TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(Properties.Resources.ICTheme_BG, TitleScreen.frm95.Width, TitleScreen.frm95.Height);
-                    break;
-            }
-            foreach (Form f in Application.OpenForms)
-            {
-                if (f is WinClassic)
-                {
-                    if (((WinClassic)f).isActive)
-                    {
-                        ((WinClassic)f).programtopbar.BackColor = SaveSystem.currentTheme.activeTitleBarColor;
-                        ((WinClassic)f).Title.ForeColor = SaveSystem.currentTheme.activeTitleTextColor;
-                    } else
-                    {
-                        ((WinClassic)f).programtopbar.BackColor = SaveSystem.currentTheme.inactiveTitleBarColor;
-                        ((WinClassic)f).Title.ForeColor = SaveSystem.currentTheme.inactiveTitleTextColor;
-                    }
-                }
-            }
+            ChangeTheme();
         }
 
         private void okButton_Click(object sender, EventArgs e)
         {
+            ChangeTheme();
+            ParentForm.Close();
+        }
+
+        private void ChangeTheme()
+        {
             switch ((string)comboBox1.SelectedItem)
             {
                 case "Default":
                     SaveSystem.CurrentSave.ThemeName = "default95";
                     SaveSystem.currentTheme = new Default95Theme();
-                    TitleScreen.frm95.BackgroundImage = null;
                     TitleScreen.frm95.desktopicons.BackgroundImage = null;
                     break;
                 case "Dangerous Creatures":
                     SaveSystem.CurrentSave.ThemeName = "dangeranimals";
                     SaveSystem.currentTheme = new DangerousCreaturesTheme();
-                    TitleScreen.frm95.BackgroundImage = Properties.Resources.DCTheme_BG;
                     TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(Properties.Resources.DCTheme_BG, TitleScreen.frm95.Width, TitleScreen.frm95.Height);
                     break;
                 case "Inside Your Computer":
                     SaveSystem.CurrentSave.ThemeName = "insidepc";
                     SaveSystem.currentTheme = new InsideComputerTheme();
-                    TitleScreen.frm95.BackgroundImage = Properties.Resources.ICTheme_BG;
                     TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(Properties.Resources.ICTheme_BG, TitleScreen.frm95.Width, TitleScreen.frm95.Height);
                     break;
             }
@@ -136,9 +104,22 @@ namespace Histacom2.OS.Win95.Win95Apps
                         ((WinClassic)f).programtopbar.BackColor = SaveSystem.currentTheme.inactiveTitleBarColor;
                         ((WinClassic)f).Title.ForeColor = SaveSystem.currentTheme.inactiveTitleTextColor;
                     }
+                    f.Invalidate();
+                    ((WinClassic)f).programContent.Invalidate();
+                    ((WinClassic)f).top.Invalidate();
+                    ((WinClassic)f).toprightcorner.Invalidate();
+                    ((WinClassic)f).right.Invalidate();
+                    ((WinClassic)f).bottomrightcorner.Invalidate();
+                    ((WinClassic)f).bottom.Invalidate();
+                    ((WinClassic)f).bottomleftcorner.Invalidate();
+                    ((WinClassic)f).left.Invalidate();
+                    ((WinClassic)f).topleftcorner.Invalidate();
+                    foreach (Control c in ((WinClassic)f).progContent.Controls) c.Invalidate();
+                    ((WinClassic)f).progContent.BackColor = SaveSystem.currentTheme.threeDObjectsColor;
                 }
             }
-            ParentForm.Close();
+            TitleScreen.frm95.taskbar.Invalidate();
+            TitleScreen.frm95.clockPanel.Invalidate();
         }
     }
 }
diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicTimeDistorter.Designer.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicTimeDistorter.Designer.cs
index ca74bd4..33ab4f2 100644
--- a/Histacom2/OS/Win95/Win95Apps/WinClassicTimeDistorter.Designer.cs
+++ b/Histacom2/OS/Win95/Win95Apps/WinClassicTimeDistorter.Designer.cs
@@ -34,7 +34,7 @@
             this.lblCurrent = new System.Windows.Forms.Label();
             this.lblYear = new System.Windows.Forms.Label();
             this.lblTo = new System.Windows.Forms.Label();
-            this.btnGo = new System.Windows.Forms.Button();
+            this.btnGo = new Histacom2.Engine.UI.ClassicButton();
             this.lblCountDown = new System.Windows.Forms.Label();
             this.countDownTimer = new System.Windows.Forms.Timer(this.components);
             this.SuspendLayout();
@@ -104,14 +104,12 @@
             // 
             // btnGo
             // 
-            this.btnGo.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnGo.Location = new System.Drawing.Point(162, 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.TabIndex = 7;
-            this.btnGo.Text = "Go to destination year";
-            this.btnGo.UseVisualStyleBackColor = true;
+            this.btnGo.Text = "Go To Destination Year";
             this.btnGo.Click += new System.EventHandler(this.btnGo_Click);
             // 
             // lblCountDown
@@ -158,7 +156,7 @@
         private System.Windows.Forms.Label lblYear;
         internal System.Windows.Forms.Label lblCountDown;
         private System.Windows.Forms.Timer countDownTimer;
-        internal System.Windows.Forms.Button btnGo;
+        internal Histacom2.Engine.UI.ClassicButton btnGo;
         internal System.Windows.Forms.Label lblTo;
         internal System.Windows.Forms.Label lblDestYear;
     }
diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.Designer.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.Designer.cs
index ca3f22d..8c1f84a 100644
--- a/Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.Designer.cs
+++ b/Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.Designer.cs
@@ -30,10 +30,10 @@
         {
             this.imgTip = new System.Windows.Forms.PictureBox();
             this.imgPnl = new System.Windows.Forms.PictureBox();
-            this.btnClose = new System.Windows.Forms.Button();
-            this.btnOnline = new System.Windows.Forms.Button();
-            this.btnTour = new System.Windows.Forms.Button();
             this.imgWelcome = new System.Windows.Forms.PictureBox();
+            this.btnClose = new Histacom2.Engine.UI.ClassicButton();
+            this.btnOnline = new Histacom2.Engine.UI.ClassicButton();
+            this.btnTour = new Histacom2.Engine.UI.ClassicButton();
             ((System.ComponentModel.ISupportInitialize)(this.imgTip)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.imgPnl)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.imgWelcome)).BeginInit();
@@ -59,52 +59,46 @@
             this.imgPnl.TabIndex = 16;
             this.imgPnl.TabStop = false;
             // 
+            // imgWelcome
+            // 
+            this.imgWelcome.BackgroundImage = global::Histacom2.Properties.Resources.win95_welcome;
+            this.imgWelcome.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
+            this.imgWelcome.Location = new System.Drawing.Point(19, 17);
+            this.imgWelcome.Name = "imgWelcome";
+            this.imgWelcome.Size = new System.Drawing.Size(292, 19);
+            this.imgWelcome.TabIndex = 18;
+            this.imgWelcome.TabStop = false;
+            // 
             // btnClose
             // 
             this.btnClose.BackColor = System.Drawing.Color.Silver;
-            this.btnClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnClose.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btnClose.ForeColor = System.Drawing.Color.Black;
             this.btnClose.Location = new System.Drawing.Point(358, 156);
             this.btnClose.Name = "btnClose";
             this.btnClose.Size = new System.Drawing.Size(115, 26);
             this.btnClose.TabIndex = 15;
             this.btnClose.Text = "Close";
-            this.btnClose.UseVisualStyleBackColor = false;
             this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
             // 
             // btnOnline
             // 
             this.btnOnline.BackColor = System.Drawing.Color.Silver;
-            this.btnOnline.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnOnline.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btnOnline.ForeColor = System.Drawing.Color.Black;
             this.btnOnline.Location = new System.Drawing.Point(356, 78);
             this.btnOnline.Name = "btnOnline";
             this.btnOnline.Size = new System.Drawing.Size(115, 26);
             this.btnOnline.TabIndex = 14;
-            this.btnOnline.Text = "Online Registration";
-            this.btnOnline.UseVisualStyleBackColor = false;
+            this.btnOnline.Text = "&Online Registration";
             // 
             // btnTour
             // 
             this.btnTour.BackColor = System.Drawing.Color.Silver;
-            this.btnTour.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnTour.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btnTour.ForeColor = System.Drawing.Color.Black;
             this.btnTour.Location = new System.Drawing.Point(356, 49);
             this.btnTour.Name = "btnTour";
             this.btnTour.Size = new System.Drawing.Size(115, 26);
             this.btnTour.TabIndex = 12;
-            this.btnTour.Text = "What\'s New";
-            this.btnTour.UseVisualStyleBackColor = false;
-            // 
-            // imgWelcome
-            // 
-            this.imgWelcome.BackgroundImage = global::Histacom2.Properties.Resources.win95_welcome;
-            this.imgWelcome.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
-            this.imgWelcome.Location = new System.Drawing.Point(19, 17);
-            this.imgWelcome.Name = "imgWelcome";
-            this.imgWelcome.Size = new System.Drawing.Size(292, 19);
-            this.imgWelcome.TabIndex = 18;
-            this.imgWelcome.TabStop = false;
+            this.btnTour.Text = "What\'s &New";
             // 
             // WinClassicWelcome
             // 
@@ -130,9 +124,9 @@
 
         private System.Windows.Forms.PictureBox imgTip;
         private System.Windows.Forms.PictureBox imgPnl;
-        private System.Windows.Forms.Button btnClose;
-        private System.Windows.Forms.Button btnOnline;
-        private System.Windows.Forms.Button btnTour;
+        private Histacom2.Engine.UI.ClassicButton btnClose;
+        private Histacom2.Engine.UI.ClassicButton btnOnline;
+        private Histacom2.Engine.UI.ClassicButton btnTour;
         private System.Windows.Forms.PictureBox imgWelcome;
     }
 }
diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.cs
index 4804ca5..6ec79a4 100644
--- a/Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.cs
+++ b/Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.cs
@@ -15,13 +15,6 @@ namespace Histacom2.OS.Win95.Win95Apps
         public WinClassicWelcome()
         {
             InitializeComponent();
-
-            btnTour.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0)));
-            btnTour.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2);
-            btnOnline.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0)));
-            btnOnline.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2);
-            btnClose.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0)));
-            btnClose.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); 
         }
 
         private void btnClose_Click(object sender, EventArgs e)
diff --git a/Histacom2/OS/Win95/Win95TaskBarItem.Designer.cs b/Histacom2/OS/Win95/Win95TaskBarItem.Designer.cs
index 844e47b..c6c4952 100644
--- a/Histacom2/OS/Win95/Win95TaskBarItem.Designer.cs
+++ b/Histacom2/OS/Win95/Win95TaskBarItem.Designer.cs
@@ -67,6 +67,7 @@
             this.panel1.Name = "panel1";
             this.panel1.Size = new System.Drawing.Size(160, 22);
             this.panel1.TabIndex = 2;
+            this.panel1.Paint += new System.Windows.Forms.PaintEventHandler(this.panel1_Paint);
             // 
             // Win95TaskBarItem
             // 
diff --git a/Histacom2/OS/Win95/Win95TaskBarItem.cs b/Histacom2/OS/Win95/Win95TaskBarItem.cs
index b13e25c..f550497 100644
--- a/Histacom2/OS/Win95/Win95TaskBarItem.cs
+++ b/Histacom2/OS/Win95/Win95TaskBarItem.cs
@@ -39,5 +39,22 @@ namespace Histacom2.Engine.Template.Taskbars
         {
             tb.FocusAppFromID(ApplicationID);
         }
+
+        private void panel1_Paint(object sender, PaintEventArgs e)
+        {
+            if (SaveSystem.currentTheme != null) BackColor = SaveSystem.currentTheme.threeDObjectsColor;
+            else BackColor = Color.Silver;
+
+            var _lightBack = Paintbrush.GetLightFromColor(BackColor);
+            var _darkBack = Paintbrush.GetDarkFromColor(BackColor);
+
+            var g = e.Graphics;
+            g.Clear(BackColor);
+
+            g.FillRectangle(Brushes.Black, new Rectangle(0, 0, Width, Height));
+            g.FillRectangle(new SolidBrush(_lightBack), new Rectangle(0, 0, Width - 1, Height - 1));
+            g.FillRectangle(new SolidBrush(_darkBack), new Rectangle(1, 1, Width - 2, Height - 2));
+            g.FillRectangle(new SolidBrush(BackColor), new Rectangle(1, 1, Width - 3, Height - 3));
+        }
     }
 }