Merge remote-tracking branch 'refs/remotes/Histacom2-Devs/master'

25 files changed, 535 insertions, 583 deletions

diff --git a/Histacom2.Engine/Histacom2.Engine.csproj b/Histacom2.Engine/Histacom2.Engine.csproj
index fb64648..9b186d8 100644
--- a/Histacom2.Engine/Histacom2.Engine.csproj
+++ b/Histacom2.Engine/Histacom2.Engine.csproj
@@ -92,10 +92,7 @@
     </Compile>
     <Compile Include="Theme.cs" />
     <Compile Include="UI\ClassicButton.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="UI\ClassicButton.Designer.cs">
-      <DependentUpon>ClassicButton.cs</DependentUpon>
+      <SubType>Component</SubType>
     </Compile>
     <Compile Include="UI\IProgressBar.cs">
       <SubType>Component</SubType>
@@ -132,9 +129,6 @@
     <EmbeddedResource Include="Template\WinXP.resx">
       <DependentUpon>WinXP.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="UI\ClassicButton.resx">
-      <DependentUpon>ClassicButton.cs</DependentUpon>
-    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <Content Include="Resources\chord.wav" />
diff --git a/Histacom2.Engine/Paintbrush.cs b/Histacom2.Engine/Paintbrush.cs
index 320b80d..4424371 100644
--- a/Histacom2.Engine/Paintbrush.cs
+++ b/Histacom2.Engine/Paintbrush.cs
@@ -45,5 +45,20 @@ namespace Histacom2.Engine
             // Draw the line.
             e.Graphics.DrawLine(new Pen(foreColor), 4, height / 2, width - 4, height / 2);
         }
+
+        public static Color GetLightFromColor(Color basecolor)
+        {
+            if (basecolor == Color.Silver) return Color.White;
+            if (basecolor == Color.FromArgb(112, 112, 112)) return Color.FromArgb(184, 184, 184);
+            if (basecolor == Color.FromArgb(169, 200, 169)) return Color.FromArgb(218, 223, 218);
+            return ControlPaint.Light(basecolor, 70);
+        }
+
+        public static Color GetDarkFromColor(Color basecolor)
+        {
+            if (basecolor == Color.FromArgb(112, 112, 112)) return Color.FromArgb(72, 72, 72);
+            if (basecolor == Color.FromArgb(169, 200, 169)) return Color.FromArgb(95, 153, 95);
+            return ControlPaint.Dark(basecolor, 70);
+        }
     }
 }
diff --git a/Histacom2.Engine/Template/Infobox95.Designer.cs b/Histacom2.Engine/Template/Infobox95.Designer.cs
index 0bccf85..7bb6869 100644
--- a/Histacom2.Engine/Template/Infobox95.Designer.cs
+++ b/Histacom2.Engine/Template/Infobox95.Designer.cs
@@ -29,12 +29,12 @@
         private void InitializeComponent()
         {
             this.programContent = new System.Windows.Forms.Panel();
-            this.button1 = new System.Windows.Forms.Button();
-            this.button3 = new System.Windows.Forms.Button();
             this.pictureBox1 = new System.Windows.Forms.PictureBox();
             this.panel1 = new System.Windows.Forms.Panel();
             this.infoText = new System.Windows.Forms.Label();
-            this.button2 = new System.Windows.Forms.Button();
+            this.button1 = new Histacom2.Engine.UI.ClassicButton();
+            this.button3 = new Histacom2.Engine.UI.ClassicButton();
+            this.button2 = new Histacom2.Engine.UI.ClassicButton();
             this.programContent.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             this.panel1.SuspendLayout();
@@ -54,34 +54,7 @@
             this.programContent.Size = new System.Drawing.Size(413, 118);
             this.programContent.TabIndex = 10;
             this.programContent.Tag = "gnoreFormOnTaskbar";
-            // 
-            // button1
-            // 
-            this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.button1.Location = new System.Drawing.Point(150, 84);
-            this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(80, 23);
-            this.button1.TabIndex = 5;
-            this.button1.Text = "Yes";
-            this.button1.UseVisualStyleBackColor = true;
-            this.button1.Click += new System.EventHandler(this.button1_Click);
-            // 
-            // button3
-            // 
-            this.button3.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.button3.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.button3.Location = new System.Drawing.Point(323, 84);
-            this.button3.Name = "button3";
-            this.button3.Size = new System.Drawing.Size(80, 23);
-            this.button3.TabIndex = 4;
-            this.button3.Text = "Cancel";
-            this.button3.UseVisualStyleBackColor = true;
-            this.button3.Click += new System.EventHandler(this.button3_Click);
+            this.programContent.Paint += new System.Windows.Forms.PaintEventHandler(this.programContent_Paint);
             // 
             // pictureBox1
             // 
@@ -111,18 +84,43 @@
             this.infoText.TabIndex = 0;
             this.infoText.Text = "label1";
             // 
+            // button1
+            // 
+            this.button1.BackColor = System.Drawing.Color.Silver;
+            this.button1.ForeColor = System.Drawing.Color.Black;
+            this.button1.Location = new System.Drawing.Point(150, 84);
+            this.button1.Name = "button1";
+            this.button1.Size = new System.Drawing.Size(80, 23);
+            this.button1.TabIndex = 6;
+            this.button1.Text = "Yes";
+            this.button1.Click += new System.EventHandler(this.button1_Click);
+            // 
+            // button3
+            // 
+            this.button3.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.button3.BackColor = System.Drawing.Color.Silver;
+            this.button3.ForeColor = System.Drawing.Color.Black;
+            this.button3.Location = new System.Drawing.Point(323, 84);
+            this.button3.Name = "button3";
+            this.button3.Size = new System.Drawing.Size(80, 23);
+            this.button3.TabIndex = 4;
+            this.button3.Text = "Cancel";
+            this.button3.Click += new System.EventHandler(this.button3_Click);
+            // 
             // button2
             // 
             this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.button2.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.button2.Location = new System.Drawing.Point(236, 84);
+            this.button2.BackColor = System.Drawing.Color.Silver;
+            this.button2.ForeColor = System.Drawing.Color.Black;
+            this.button2.Location = new System.Drawing.Point(237, 84);
             this.button2.Name = "button2";
             this.button2.Size = new System.Drawing.Size(80, 23);
             this.button2.TabIndex = 1;
             this.button2.Text = "No";
-            this.button2.UseVisualStyleBackColor = true;
             this.button2.Click += new System.EventHandler(this.button2_Click);
             // 
             // Infobox95
@@ -145,8 +143,8 @@
         private System.Windows.Forms.PictureBox pictureBox1;
         private System.Windows.Forms.Panel panel1;
         public System.Windows.Forms.Label infoText;
-        private System.Windows.Forms.Button button2;
-        private System.Windows.Forms.Button button3;
-        private System.Windows.Forms.Button button1;
+        private UI.ClassicButton button1;
+        private UI.ClassicButton button2;
+        private UI.ClassicButton button3;
     }
 }
\ No newline at end of file
diff --git a/Histacom2.Engine/Template/Infobox95.cs b/Histacom2.Engine/Template/Infobox95.cs
index f0ed0db..9214461 100644
--- a/Histacom2.Engine/Template/Infobox95.cs
+++ b/Histacom2.Engine/Template/Infobox95.cs
@@ -13,9 +13,8 @@ namespace Histacom2.Engine.Template
         public Infobox95(InfoboxType type, InfoboxButtons btns)
         {
             InitializeComponent();
-            button1.Paint += (sender, args) => Paintbrush.PaintClassicBorders(sender, args, 2);
-            button2.Paint += (sender, args) => Paintbrush.PaintClassicBorders(sender, args, 2);
-            button3.Paint += (sender, args) => Paintbrush.PaintClassicBorders(sender, args, 2);
+            this.BackColor = SaveSystem.currentTheme.threeDObjectsColor;
+            this.programContent.BackColor = SaveSystem.currentTheme.threeDObjectsColor;
 
             switch (type)
             {
@@ -66,6 +65,12 @@ namespace Histacom2.Engine.Template
         {
             if (btnStatus == 0) this.ParentForm.Close();
         }
+
+        private void programContent_Paint(object sender, PaintEventArgs e)
+        {
+            this.BackColor = SaveSystem.currentTheme.threeDObjectsColor;
+            this.programContent.BackColor = SaveSystem.currentTheme.threeDObjectsColor;
+        }
     }
 
     public enum InfoboxType
diff --git a/Histacom2.Engine/Template/WinClassic.Designer.cs b/Histacom2.Engine/Template/WinClassic.Designer.cs
index 593cfd6..bacce99 100644
--- a/Histacom2.Engine/Template/WinClassic.Designer.cs
+++ b/Histacom2.Engine/Template/WinClassic.Designer.cs
@@ -79,6 +79,7 @@
             this.programContent.Name = "programContent";
             this.programContent.Size = new System.Drawing.Size(292, 274);
             this.programContent.TabIndex = 9;
+            this.programContent.ControlAdded += new System.Windows.Forms.ControlEventHandler(this.programContent_ControlAdded);
             // 
             // programtopbar
             // 
@@ -160,6 +161,7 @@
             this.toprightcorner.Name = "toprightcorner";
             this.toprightcorner.Size = new System.Drawing.Size(4, 4);
             this.toprightcorner.TabIndex = 6;
+            this.toprightcorner.Paint += new System.Windows.Forms.PaintEventHandler(this.toprightcorner_Paint);
             this.toprightcorner.MouseDown += new System.Windows.Forms.MouseEventHandler(this.border_MouseDown);
             this.toprightcorner.MouseMove += new System.Windows.Forms.MouseEventHandler(this.toprightcorner_MouseMove);
             this.toprightcorner.MouseUp += new System.Windows.Forms.MouseEventHandler(this.border_MouseUp);
@@ -173,6 +175,7 @@
             this.bottomrightcorner.Name = "bottomrightcorner";
             this.bottomrightcorner.Size = new System.Drawing.Size(4, 4);
             this.bottomrightcorner.TabIndex = 4;
+            this.bottomrightcorner.Paint += new System.Windows.Forms.PaintEventHandler(this.bottomrightcorner_Paint);
             this.bottomrightcorner.MouseDown += new System.Windows.Forms.MouseEventHandler(this.border_MouseDown);
             this.bottomrightcorner.MouseMove += new System.Windows.Forms.MouseEventHandler(this.bottomrightcorner_MouseMove);
             this.bottomrightcorner.MouseUp += new System.Windows.Forms.MouseEventHandler(this.border_MouseUp);
@@ -186,6 +189,7 @@
             this.bottomleftcorner.Name = "bottomleftcorner";
             this.bottomleftcorner.Size = new System.Drawing.Size(4, 4);
             this.bottomleftcorner.TabIndex = 2;
+            this.bottomleftcorner.Paint += new System.Windows.Forms.PaintEventHandler(this.bottomleftcorner_Paint);
             this.bottomleftcorner.MouseDown += new System.Windows.Forms.MouseEventHandler(this.border_MouseDown);
             this.bottomleftcorner.MouseMove += new System.Windows.Forms.MouseEventHandler(this.bottomleftcorner_MouseMove);
             this.bottomleftcorner.MouseUp += new System.Windows.Forms.MouseEventHandler(this.border_MouseUp);
@@ -198,6 +202,7 @@
             this.topleftcorner.Name = "topleftcorner";
             this.topleftcorner.Size = new System.Drawing.Size(4, 4);
             this.topleftcorner.TabIndex = 1;
+            this.topleftcorner.Paint += new System.Windows.Forms.PaintEventHandler(this.topleftcorner_Paint);
             this.topleftcorner.MouseDown += new System.Windows.Forms.MouseEventHandler(this.border_MouseDown);
             this.topleftcorner.MouseMove += new System.Windows.Forms.MouseEventHandler(this.topleftcorner_MouseMove);
             this.topleftcorner.MouseUp += new System.Windows.Forms.MouseEventHandler(this.border_MouseUp);
@@ -211,6 +216,7 @@
             this.left.Name = "left";
             this.left.Size = new System.Drawing.Size(4, 292);
             this.left.TabIndex = 3;
+            this.left.Paint += new System.Windows.Forms.PaintEventHandler(this.left_Paint);
             this.left.MouseDown += new System.Windows.Forms.MouseEventHandler(this.border_MouseDown);
             this.left.MouseMove += new System.Windows.Forms.MouseEventHandler(this.left_MouseMove);
             this.left.MouseUp += new System.Windows.Forms.MouseEventHandler(this.border_MouseUp);
@@ -225,6 +231,7 @@
             this.bottom.Name = "bottom";
             this.bottom.Size = new System.Drawing.Size(296, 4);
             this.bottom.TabIndex = 5;
+            this.bottom.Paint += new System.Windows.Forms.PaintEventHandler(this.bottom_Paint);
             this.bottom.MouseDown += new System.Windows.Forms.MouseEventHandler(this.border_MouseDown);
             this.bottom.MouseMove += new System.Windows.Forms.MouseEventHandler(this.bottom_MouseMove);
             this.bottom.MouseUp += new System.Windows.Forms.MouseEventHandler(this.border_MouseUp);
@@ -238,6 +245,7 @@
             this.right.Name = "right";
             this.right.Size = new System.Drawing.Size(4, 296);
             this.right.TabIndex = 7;
+            this.right.Paint += new System.Windows.Forms.PaintEventHandler(this.right_Paint);
             this.right.MouseDown += new System.Windows.Forms.MouseEventHandler(this.border_MouseDown);
             this.right.MouseMove += new System.Windows.Forms.MouseEventHandler(this.right_MouseMove);
             this.right.MouseUp += new System.Windows.Forms.MouseEventHandler(this.border_MouseUp);
@@ -252,6 +260,7 @@
             this.top.Name = "top";
             this.top.Size = new System.Drawing.Size(300, 4);
             this.top.TabIndex = 8;
+            this.top.Paint += new System.Windows.Forms.PaintEventHandler(this.top_Paint);
             this.top.MouseDown += new System.Windows.Forms.MouseEventHandler(this.border_MouseDown);
             this.top.MouseMove += new System.Windows.Forms.MouseEventHandler(this.top_MouseMove);
             this.top.MouseUp += new System.Windows.Forms.MouseEventHandler(this.border_MouseUp);
diff --git a/Histacom2.Engine/Template/WinClassic.cs b/Histacom2.Engine/Template/WinClassic.cs
index 20e66f0..0ccbe5b 100644
--- a/Histacom2.Engine/Template/WinClassic.cs
+++ b/Histacom2.Engine/Template/WinClassic.cs
@@ -11,10 +11,12 @@ namespace Histacom2.Engine.Template
         {
             InitializeComponent();
             DoubleBuffered = true;
+            programContent.BackColor = SaveSystem.currentTheme.threeDObjectsColor;
         }
 
         public Font fnt;
         public ResizeOverlay resizer = new ResizeOverlay();
+        public UserControl progContent;
 
         public bool resizable = true;
         public bool closeDisabled = false;
@@ -207,6 +209,105 @@ namespace Histacom2.Engine.Template
 
 
         public bool max = false;
+
+        private void bottom_Paint(object sender, PaintEventArgs e)
+        {
+            var gfx = e.Graphics;
+            gfx.Clear(SaveSystem.currentTheme.threeDObjectsColor);
+
+            var _darkBack = Paintbrush.GetDarkFromColor(SaveSystem.currentTheme.threeDObjectsColor);
+
+            gfx.DrawLine(Pens.Black, 0, 3, bottom.Width, 3);
+            gfx.DrawLine(new Pen(_darkBack), 0, 2, bottom.Width, 2);
+        }
+
+        private void bottomleftcorner_Paint(object sender, PaintEventArgs e)
+        {
+            var gfx = e.Graphics;
+            gfx.Clear(SaveSystem.currentTheme.threeDObjectsColor);
+
+            var _lightBack = Paintbrush.GetLightFromColor(SaveSystem.currentTheme.threeDObjectsColor);
+            var _darkBack = Paintbrush.GetDarkFromColor(SaveSystem.currentTheme.threeDObjectsColor);
+
+            gfx.DrawLine(Pens.Black, 0, 3, 3, 3);
+            gfx.DrawLine(new Pen(_darkBack), 1, 2, 3, 2);
+            gfx.DrawLine(new Pen(_lightBack), 1, 0, 1, 1);
+        }
+
+        private void left_Paint(object sender, PaintEventArgs e)
+        {
+            var gfx = e.Graphics;
+            gfx.Clear(SaveSystem.currentTheme.threeDObjectsColor);
+
+            var _lightBack = Paintbrush.GetLightFromColor(SaveSystem.currentTheme.threeDObjectsColor);
+
+            gfx.DrawLine(new Pen(_lightBack), 1, 0, 1, left.Height);
+        }
+
+        private void programContent_ControlAdded(object sender, ControlEventArgs e)
+        {
+            e.Control.BackColor = SaveSystem.currentTheme.threeDObjectsColor;
+            e.Control.Invalidate();
+        }
+
+        private void topleftcorner_Paint(object sender, PaintEventArgs e)
+        {
+            var gfx = e.Graphics;
+            gfx.Clear(SaveSystem.currentTheme.threeDObjectsColor);
+
+            var _lightBack = Paintbrush.GetLightFromColor(SaveSystem.currentTheme.threeDObjectsColor);
+
+            gfx.DrawLine(new Pen(_lightBack), 1, 3, 1, 1);
+            gfx.DrawLine(new Pen(_lightBack), 1, 1, 3, 1);
+        }
+
+        private void top_Paint(object sender, PaintEventArgs e)
+        {
+            var gfx = e.Graphics;
+            gfx.Clear(SaveSystem.currentTheme.threeDObjectsColor);
+
+            var _lightBack = Paintbrush.GetLightFromColor(SaveSystem.currentTheme.threeDObjectsColor);
+
+            gfx.DrawLine(new Pen(_lightBack), 0, 1, top.Width, 1);
+        }
+
+        private void toprightcorner_Paint(object sender, PaintEventArgs e)
+        {
+            var gfx = e.Graphics;
+            gfx.Clear(SaveSystem.currentTheme.threeDObjectsColor);
+
+            var _lightBack = Paintbrush.GetLightFromColor(SaveSystem.currentTheme.threeDObjectsColor);
+            var _darkBack = Paintbrush.GetDarkFromColor(SaveSystem.currentTheme.threeDObjectsColor);
+
+            gfx.DrawLine(new Pen(_lightBack), 0, 1, 1, 1);
+            gfx.DrawLine(new Pen(_darkBack), 2, 1, 2, 3);
+            gfx.DrawLine(Pens.Black, 3, 0, 3, 3);
+        }
+
+        private void right_Paint(object sender, PaintEventArgs e)
+        {
+            var gfx = e.Graphics;
+            gfx.Clear(SaveSystem.currentTheme.threeDObjectsColor);
+
+            var _darkBack = Paintbrush.GetDarkFromColor(SaveSystem.currentTheme.threeDObjectsColor);
+
+            gfx.DrawLine(Pens.Black, 3, 0, 3, bottom.Width);
+            gfx.DrawLine(new Pen(_darkBack), 2, 0, 2, bottom.Width);
+        }
+
+        private void bottomrightcorner_Paint(object sender, PaintEventArgs e)
+        {
+            var gfx = e.Graphics;
+            gfx.Clear(SaveSystem.currentTheme.threeDObjectsColor);
+
+            var _darkBack = Paintbrush.GetDarkFromColor(SaveSystem.currentTheme.threeDObjectsColor);
+
+            gfx.DrawLine(Pens.Black, 3, 0, 3, 3);
+            gfx.DrawLine(Pens.Black, 0, 3, 3, 3);
+            gfx.DrawLine(new Pen(_darkBack), 2, 0, 2, 2);
+            gfx.DrawLine(new Pen(_darkBack), 0, 2, 2, 2);
+        }
+
         public Size prevSize;
         public Point prevPoint;
         private void maximizebutton_Click(object sender, EventArgs e)
diff --git a/Histacom2.Engine/Template/WinClassic.resx b/Histacom2.Engine/Template/WinClassic.resx
index 6876b17..a3848f8 100644
--- a/Histacom2.Engine/Template/WinClassic.resx
+++ b/Histacom2.Engine/Template/WinClassic.resx
@@ -121,63 +121,63 @@
   <data name="toprightcorner.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAIAAAAmkwkpAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAdSURBVBhXYzh8
+        wgAADsIBFShKgAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAdSURBVBhXYzh8
         /DQEMQDBfzBo6+oDcSDCGBwGBgAJoRsoKGRD1QAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="bottomrightcorner.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAIAAAAmkwkpAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAdSURBVBhXYzh8
+        wgAADsIBFShKgAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAdSURBVBhXYzh8
         /DQQtXX1MQABCgdIQRCIgwAMDABm/hFrLt/K7gAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="bottomleftcorner.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAIAAAAmkwkpAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAdSURBVBhXYzh8
+        wgAADsIBFShKgAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAdSURBVBhXYzh8
         /PT///+BJBBhcNq6+iCIAQEYGACcHRsocGQwIQAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="topleftcorner.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAIAAAAmkwkpAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAaSURBVBhXYzh8
+        wgAADsIBFShKgAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAaSURBVBhXYzh8
         /DQcgTj/YQDKQZEBcY6fBgAaSCiZEc9BxAAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="left.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAQAAAABCAIAAAB2XpiaAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAUSURBVBhXYzh8
+        wgAADsIBFShKgAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAUSURBVBhXYzh8
         /PT///+B5OHjpwFB1wn9nx9JYgAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="bottom.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAEAAAAECAIAAADAusJtAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAVSURBVBhXYzh8
+        wgAADsIBFShKgAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAVSURBVBhXYzh8
         /DQYt3X1MTAwMAAAQaQGSbsObiQAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="right.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAQAAAABCAIAAAB2XpiaAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAUSURBVBhXYzh8
+        wgAADsIBFShKgAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAUSURBVBhXYzh8
         /DQQtXX1MTAwAAA0WgZJrWm8iAAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="top.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAEAAAAECAIAAADAusJtAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAVSURBVBhXYzh8
+        wgAADsIBFShKgAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAVSURBVBhXYzh8
         /DTD////wfTh46cBUSgJ/bC/izUAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="maximizebutton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAOCAIAAACpTQvdAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAA+SURBVChTY/hP
+        wgAADsIBFShKgAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAA+SURBVChTY/hP
         CmAAAiB1nzjQ0NCA0HDgwAEQBwcAygIBNTRAJNDAqAY0DbgAdg0EAUIDkEUkAGkgDTAwAACYPGiagsMD
         PwAAAABJRU5ErkJggg==
 </value>
@@ -185,7 +185,7 @@
   <data name="minimizebutton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAOCAIAAACpTQvdAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAA5SURBVChTY/hP
+        wgAADsIBFShKgAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAA5SURBVChTY/hP
         CmAAAiB1nzjQ0NCA0HCACDCqASqGF2DRAOKjAog4BFBDA36A0ABkEQlAGkgDDAwAKPmlWmNluNoAAAAA
         SUVORK5CYII=
 </value>
@@ -193,7 +193,7 @@
   <data name="closebutton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAOCAIAAACpTQvdAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAABcSURBVChTrY/R
+        wgAADsIBFShKgAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAABcSURBVChTrY/R
         DcAgCERvdEbrJh2lPU+SYkINRt+PSN6J4FkBhMddw8y+wFUgCbQ70OtO7OQTJLgRa/L7JWmOt8RsB8mD
         TQ5NkFbeQcLwauzMdkjZCLAq0gJrAC8niIXaIK89FAAAAABJRU5ErkJggg==
 </value>
diff --git a/Histacom2.Engine/Theme.cs b/Histacom2.Engine/Theme.cs
index 6c1efef..5b5ae50 100644
--- a/Histacom2.Engine/Theme.cs
+++ b/Histacom2.Engine/Theme.cs
@@ -19,6 +19,11 @@ namespace Histacom2.Engine
         public Stream progErrorSound { get; set; }
         public Stream questionSound { get; set; }
 
+        public Color threeDObjectsColor { get; set; }
+        public Color threeDObjectsTextColor { get; set; }
+
+        public Font buttonFont { get; set; }
+
         public Color activeTitleBarColor { get; set; }
         public Color activeTitleTextColor { get; set; }
         public Color inactiveTitleBarColor { get; set; }
@@ -42,6 +47,11 @@ namespace Histacom2.Engine
             progErrorSound = Properties.Resources.CHORD;
             questionSound = Properties.Resources.CHORD;
 
+            threeDObjectsColor = Color.Silver;
+            threeDObjectsTextColor = Color.Black;
+
+            buttonFont = new Font("Microsoft Sans Serif", 8.25F, FontStyle.Regular);
+
             activeTitleBarColor = Color.Navy;
             activeTitleTextColor = Color.White;
             inactiveTitleBarColor = Color.Gray;
@@ -65,6 +75,16 @@ namespace Histacom2.Engine
             progErrorSound = Properties.Resources.CHORD;
             questionSound = Properties.Resources.CHORD;
 
+            threeDObjectsColor = Color.Silver;
+            threeDObjectsTextColor = Color.Black;
+
+            buttonFont = new Font("Microsoft Sans Serif", 8.25F, FontStyle.Regular);
+
+            activeTitleBarColor = Color.Navy;
+            activeTitleTextColor = Color.White;
+            inactiveTitleBarColor = Color.Gray;
+            inactiveTitleTextColor = Color.Silver;
+
             defaultWallpaper = null;
             themeName = "default98";
         }
@@ -83,6 +103,11 @@ namespace Histacom2.Engine
             progErrorSound = Properties.Resources.Win95PlusDangerousCreaturesProgError;
             questionSound = Properties.Resources.Win95PlusDangerousCreaturesQuestion;
 
+            threeDObjectsColor = Color.FromArgb(112, 112, 112);
+            threeDObjectsTextColor = Color.Black;
+
+            buttonFont = new Font("Microsoft Sans Serif", 8.25F, FontStyle.Bold);
+
             activeTitleBarColor = Color.Teal;
             activeTitleTextColor = Color.White;
             inactiveTitleBarColor = Color.FromArgb(72, 72, 72);
@@ -102,6 +127,11 @@ namespace Histacom2.Engine
 
             asteriskSound = Properties.Resources.Win95PlusInsideComputerAsterisk;
 
+            threeDObjectsColor = Color.FromArgb(169, 200, 169);
+            threeDObjectsTextColor = Color.Black;
+
+            buttonFont = new Font("Microsoft Sans Serif", 8.25F, FontStyle.Bold);
+
             activeTitleBarColor = Color.FromArgb(224, 0, 0);
             activeTitleTextColor = Color.White;
             inactiveTitleBarColor = Color.FromArgb(96, 168, 128);
diff --git a/Histacom2.Engine/UI/ClassicButton.Designer.cs b/Histacom2.Engine/UI/ClassicButton.Designer.cs
deleted file mode 100644
index c76bba0..0000000
--- a/Histacom2.Engine/UI/ClassicButton.Designer.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-namespace Histacom2.Engine.UI
-{
-    partial class ClassicButton
-    {
-        /// <summary> 
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary> 
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Component Designer generated code
-
-        /// <summary> 
-        /// Required method for Designer support - do not modify 
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.borderpart = new System.Windows.Forms.Panel();
-            this.graystuff = new System.Windows.Forms.Panel();
-            this.lessgraystuff = new System.Windows.Forms.Label();
-            this.borderpart.SuspendLayout();
-            this.graystuff.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // borderpart
-            // 
-            this.borderpart.BackColor = System.Drawing.Color.White;
-            this.borderpart.Controls.Add(this.graystuff);
-            this.borderpart.Location = new System.Drawing.Point(0, 0);
-            this.borderpart.Name = "borderpart";
-            this.borderpart.Size = new System.Drawing.Size(99, 24);
-            this.borderpart.TabIndex = 0;
-            // 
-            // graystuff
-            // 
-            this.graystuff.BackColor = System.Drawing.Color.Gray;
-            this.graystuff.Controls.Add(this.lessgraystuff);
-            this.graystuff.Location = new System.Drawing.Point(1, 1);
-            this.graystuff.Name = "graystuff";
-            this.graystuff.Size = new System.Drawing.Size(98, 23);
-            this.graystuff.TabIndex = 0;
-            // 
-            // lessgraystuff
-            // 
-            this.lessgraystuff.BackColor = System.Drawing.Color.Silver;
-            this.lessgraystuff.Location = new System.Drawing.Point(0, 0);
-            this.lessgraystuff.Margin = new System.Windows.Forms.Padding(0);
-            this.lessgraystuff.Name = "lessgraystuff";
-            this.lessgraystuff.Size = new System.Drawing.Size(97, 22);
-            this.lessgraystuff.TabIndex = 0;
-            this.lessgraystuff.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            this.lessgraystuff.Paint += new System.Windows.Forms.PaintEventHandler(this.lessgraystuff_Paint);
-            // 
-            // ClassicButton
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.BackColor = System.Drawing.Color.Black;
-            this.Controls.Add(this.borderpart);
-            this.Name = "ClassicButton";
-            this.Size = new System.Drawing.Size(100, 25);
-            this.Paint += new System.Windows.Forms.PaintEventHandler(this.ClassicButton_Paint);
-            this.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ClassicButton_MouseDown);
-            this.MouseUp += new System.Windows.Forms.MouseEventHandler(this.ClassicButton_MouseUp);
-            this.Resize += new System.EventHandler(this.ClassicButton_Resize);
-            this.borderpart.ResumeLayout(false);
-            this.graystuff.ResumeLayout(false);
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.Panel borderpart;
-        private System.Windows.Forms.Panel graystuff;
-        private System.Windows.Forms.Label lessgraystuff;
-    }
-}
diff --git a/Histacom2.Engine/UI/ClassicButton.cs b/Histacom2.Engine/UI/ClassicButton.cs
index 26629a8..b761504 100644
--- a/Histacom2.Engine/UI/ClassicButton.cs
+++ b/Histacom2.Engine/UI/ClassicButton.cs
@@ -1,8 +1,6 @@
 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;
@@ -10,49 +8,69 @@ using System.Windows.Forms;
 
 namespace Histacom2.Engine.UI
 {
-    public partial class ClassicButton : UserControl
+    public class ClassicButton : Control
     {
-        public ClassicButton()
-        {
-            InitializeComponent();
-        }
+        private Color _lightBack;
+        private Color _darkBack;
+        private Font _font;
 
-        private void ClassicButton_SizeChanged(object sender, EventArgs e)
+        private bool _pressing = false;
+
+        public ClassicButton() : base()
         {
+            if (SaveSystem.currentTheme != null) BackColor = SaveSystem.currentTheme.threeDObjectsColor;
+            else BackColor = Color.Silver;
+            _lightBack = ControlPaint.Light(BackColor, 50);
+            _darkBack = ControlPaint.Dark(BackColor, 50);
 
-        }
+            if (SaveSystem.currentTheme != null) ForeColor = SaveSystem.currentTheme.threeDObjectsTextColor;
+            else ForeColor = Color.Black;
 
-        private void ClassicButton_MouseDown(object sender, MouseEventArgs e)
-        {
-            this.BackColor = Color.White;
-            borderpart.BackColor = Color.Black;
-            lessgraystuff.Location = new Point(1, 1);
-        }
+            if (SaveSystem.currentTheme != null) _font = SaveSystem.currentTheme.buttonFont;
+            else _font = new Font("Microsoft Sans Serif", 8.25F, FontStyle.Regular);
 
-        private void ClassicButton_Paint(object sender, PaintEventArgs e)
-        {
-            e.Graphics.TextRenderingHint = System.Drawing.Text.TextRenderingHint.SingleBitPerPixelGridFit;
-            base.OnPaint(e);
+            MouseDown += (s, e) => { _pressing = true; Invalidate(); };
+            MouseUp += (s, e) => { _pressing = false; Invalidate(); };
+            Invalidate();
         }
 
-        private void lessgraystuff_Paint(object sender, PaintEventArgs e)
+        protected override void OnPaint(PaintEventArgs e)
         {
-            e.Graphics.TextRenderingHint = System.Drawing.Text.TextRenderingHint.SingleBitPerPixelGridFit;
             base.OnPaint(e);
-        }
 
-        private void ClassicButton_MouseUp(object sender, MouseEventArgs e)
-        {
-            this.BackColor = Color.Black;
-            borderpart.BackColor = Color.White;
-            lessgraystuff.Location = new Point(0, 0);
-        }
+            if (SaveSystem.currentTheme != null) BackColor = SaveSystem.currentTheme.threeDObjectsColor;
+            else BackColor = Color.Silver;
 
-        private void ClassicButton_Resize(object sender, EventArgs e)
-        {
-            borderpart.Size = new Size(this.Width - 1, this.Height - 1);
-            graystuff.Size = new Size(this.Width - 2, this.Height - 2);
-            lessgraystuff.Size = new Size(this.Width - 3, this.Height - 3);
+            _lightBack = Paintbrush.GetLightFromColor(BackColor);
+            _darkBack = Paintbrush.GetDarkFromColor(BackColor);
+
+            var g = e.Graphics;
+            g.Clear(BackColor);
+
+            g.TextRenderingHint = System.Drawing.Text.TextRenderingHint.SingleBitPerPixelGridFit;
+            StringFormat sf = new StringFormat();
+            sf.Alignment = StringAlignment.Center;
+            sf.HotkeyPrefix = System.Drawing.Text.HotkeyPrefix.Show;
+            
+            if (_pressing)
+            {
+                g.FillRectangle(new SolidBrush(_lightBack), new Rectangle(0, 0, Width, Height));
+                g.FillRectangle(Brushes.Black, 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(2, 2, Width - 3, Height - 3));
+
+                g.DrawString(Text, _font, new SolidBrush(ForeColor), ((Width / 2) + 1) + Padding.Left, (Height / 2) - (g.MeasureString(Text, Font).Height / 2) + 2, sf);
+            }
+            else
+            {
+                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));
+
+                g.DrawString(Text, _font, new SolidBrush(ForeColor), (Width / 2) + Padding.Left, (Height / 2) - (g.MeasureString(Text, Font).Height / 2) + 1, sf);
+            }
         }
+        
     }
-}
\ No newline at end of file
+}
diff --git a/Histacom2.Engine/UI/ClassicButton.resx b/Histacom2.Engine/UI/ClassicButton.resx
deleted file mode 100644
index d5494e3..0000000
--- a/Histacom2.Engine/UI/ClassicButton.resx
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-</root>
\ No newline at end of file
diff --git a/Histacom2.Engine/WindowManager.cs b/Histacom2.Engine/WindowManager.cs
index cffb74a..4f4951c 100644
--- a/Histacom2.Engine/WindowManager.cs
+++ b/Histacom2.Engine/WindowManager.cs
@@ -60,6 +60,7 @@ namespace Histacom2.Engine
             content.Parent = app.programContent;
             content.BringToFront();
             content.Dock = DockStyle.Fill;
+            app.progContent = content;
 
             // Check if icon is null
             if (icon == null)
diff --git a/Histacom2/OS/Win95/Win95.Designer.cs b/Histacom2/OS/Win95/Win95.Designer.cs
index 40f40ca..f08b474 100644
--- a/Histacom2/OS/Win95/Win95.Designer.cs
+++ b/Histacom2/OS/Win95/Win95.Designer.cs
@@ -152,6 +152,7 @@ namespace Histacom2.OS.Win95
             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
             // 
@@ -223,7 +225,7 @@ namespace Histacom2.OS.Win95
             this.startmenuitems.Name = "startmenuitems";
             this.startmenuitems.Padding = new System.Windows.Forms.Padding(6, 2, 0, 0);
             this.startmenuitems.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;
-            this.startmenuitems.Size = new System.Drawing.Size(145, 311);
+            this.startmenuitems.Size = new System.Drawing.Size(148, 292);
             this.startmenuitems.TabIndex = 0;
             this.startmenuitems.Text = "StartMenu";
             // 
@@ -252,7 +254,7 @@ namespace Histacom2.OS.Win95
             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.Size = new System.Drawing.Size(141, 36);
             this.ProgramsToolStripMenuItem.Text = "Programs";
             // 
             // AccessoriesToolStripMenuItem
@@ -277,7 +279,7 @@ namespace Histacom2.OS.Win95
             this.AccessoriesToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.AccessoriesToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.AccessoriesToolStripMenuItem.Name = "AccessoriesToolStripMenuItem";
-            this.AccessoriesToolStripMenuItem.Size = new System.Drawing.Size(181, 28);
+            this.AccessoriesToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
             this.AccessoriesToolStripMenuItem.Text = "Accessories";
             // 
             // CommunicationsToolStripMenuItem
@@ -291,7 +293,7 @@ namespace Histacom2.OS.Win95
             this.CommunicationsToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicProgramItem;
             this.CommunicationsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.CommunicationsToolStripMenuItem.Name = "CommunicationsToolStripMenuItem";
-            this.CommunicationsToolStripMenuItem.Size = new System.Drawing.Size(181, 28);
+            this.CommunicationsToolStripMenuItem.Size = new System.Drawing.Size(188, 28);
             this.CommunicationsToolStripMenuItem.Text = "Communications";
             // 
             // InternetConnectionWizardToolStripMenuItem
@@ -302,7 +304,7 @@ namespace Histacom2.OS.Win95
             this.InternetConnectionWizardToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("InternetConnectionWizardToolStripMenuItem.Image")));
             this.InternetConnectionWizardToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.InternetConnectionWizardToolStripMenuItem.Name = "InternetConnectionWizardToolStripMenuItem";
-            this.InternetConnectionWizardToolStripMenuItem.Size = new System.Drawing.Size(219, 22);
+            this.InternetConnectionWizardToolStripMenuItem.Size = new System.Drawing.Size(229, 22);
             this.InternetConnectionWizardToolStripMenuItem.Text = "Internet Connection Wizard";
             this.InternetConnectionWizardToolStripMenuItem.Click += new System.EventHandler(this.temp_for_std);
             // 
@@ -314,7 +316,7 @@ namespace Histacom2.OS.Win95
             this.NetMeetingToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("NetMeetingToolStripMenuItem.Image")));
             this.NetMeetingToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.NetMeetingToolStripMenuItem.Name = "NetMeetingToolStripMenuItem";
-            this.NetMeetingToolStripMenuItem.Size = new System.Drawing.Size(219, 22);
+            this.NetMeetingToolStripMenuItem.Size = new System.Drawing.Size(229, 22);
             this.NetMeetingToolStripMenuItem.Text = "NetMeeting";
             this.NetMeetingToolStripMenuItem.Click += new System.EventHandler(this.WebChatToolStripMenuItem_Click);
             // 
@@ -331,7 +333,7 @@ namespace Histacom2.OS.Win95
             this.MultimediaToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicProgramItem;
             this.MultimediaToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.MultimediaToolStripMenuItem.Name = "MultimediaToolStripMenuItem";
-            this.MultimediaToolStripMenuItem.Size = new System.Drawing.Size(181, 28);
+            this.MultimediaToolStripMenuItem.Size = new System.Drawing.Size(188, 28);
             this.MultimediaToolStripMenuItem.Text = "Multimedia";
             // 
             // CDPlayerToolStripMenuItem
@@ -342,7 +344,7 @@ namespace Histacom2.OS.Win95
             this.CDPlayerToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("CDPlayerToolStripMenuItem.Image")));
             this.CDPlayerToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.CDPlayerToolStripMenuItem.Name = "CDPlayerToolStripMenuItem";
-            this.CDPlayerToolStripMenuItem.Size = new System.Drawing.Size(194, 22);
+            this.CDPlayerToolStripMenuItem.Size = new System.Drawing.Size(201, 22);
             this.CDPlayerToolStripMenuItem.Text = "CD Player";
             // 
             // SoundRecorderToolStripMenuItem
@@ -353,7 +355,7 @@ namespace Histacom2.OS.Win95
             this.SoundRecorderToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("SoundRecorderToolStripMenuItem.Image")));
             this.SoundRecorderToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.SoundRecorderToolStripMenuItem.Name = "SoundRecorderToolStripMenuItem";
-            this.SoundRecorderToolStripMenuItem.Size = new System.Drawing.Size(194, 22);
+            this.SoundRecorderToolStripMenuItem.Size = new System.Drawing.Size(201, 22);
             this.SoundRecorderToolStripMenuItem.Text = "Sound Recorder";
             // 
             // VolumeControlToolStripMenuItem
@@ -364,7 +366,7 @@ namespace Histacom2.OS.Win95
             this.VolumeControlToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("VolumeControlToolStripMenuItem.Image")));
             this.VolumeControlToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.VolumeControlToolStripMenuItem.Name = "VolumeControlToolStripMenuItem";
-            this.VolumeControlToolStripMenuItem.Size = new System.Drawing.Size(194, 22);
+            this.VolumeControlToolStripMenuItem.Size = new System.Drawing.Size(201, 22);
             this.VolumeControlToolStripMenuItem.Text = "Volume Control";
             // 
             // WindowsMediaPlayerToolStripMenuItem
@@ -375,7 +377,7 @@ namespace Histacom2.OS.Win95
             this.WindowsMediaPlayerToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("WindowsMediaPlayerToolStripMenuItem.Image")));
             this.WindowsMediaPlayerToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.WindowsMediaPlayerToolStripMenuItem.Name = "WindowsMediaPlayerToolStripMenuItem";
-            this.WindowsMediaPlayerToolStripMenuItem.Size = new System.Drawing.Size(194, 22);
+            this.WindowsMediaPlayerToolStripMenuItem.Size = new System.Drawing.Size(201, 22);
             this.WindowsMediaPlayerToolStripMenuItem.Text = "Windows Media Player";
             // 
             // toolStripMenuItem1
@@ -389,7 +391,7 @@ namespace Histacom2.OS.Win95
             this.toolStripMenuItem1.Image = global::Histacom2.Properties.Resources.WinClassicProgramItem;
             this.toolStripMenuItem1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.toolStripMenuItem1.Name = "toolStripMenuItem1";
-            this.toolStripMenuItem1.Size = new System.Drawing.Size(181, 28);
+            this.toolStripMenuItem1.Size = new System.Drawing.Size(188, 28);
             this.toolStripMenuItem1.Text = "System Tools";
             // 
             // toolStripMenuItem2
@@ -400,7 +402,7 @@ namespace Histacom2.OS.Win95
             this.toolStripMenuItem2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem2.Image")));
             this.toolStripMenuItem2.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.toolStripMenuItem2.Name = "toolStripMenuItem2";
-            this.toolStripMenuItem2.Size = new System.Drawing.Size(172, 22);
+            this.toolStripMenuItem2.Size = new System.Drawing.Size(181, 22);
             this.toolStripMenuItem2.Text = "Disk Defragmenter";
             // 
             // toolStripMenuItem3
@@ -411,7 +413,7 @@ namespace Histacom2.OS.Win95
             this.toolStripMenuItem3.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem3.Image")));
             this.toolStripMenuItem3.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.toolStripMenuItem3.Name = "toolStripMenuItem3";
-            this.toolStripMenuItem3.Size = new System.Drawing.Size(172, 22);
+            this.toolStripMenuItem3.Size = new System.Drawing.Size(181, 22);
             this.toolStripMenuItem3.Text = "ScanDisk";
             // 
             // GamesToolStripMenuItem
@@ -424,7 +426,7 @@ namespace Histacom2.OS.Win95
             this.GamesToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicProgramItem;
             this.GamesToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.GamesToolStripMenuItem.Name = "GamesToolStripMenuItem";
-            this.GamesToolStripMenuItem.Size = new System.Drawing.Size(181, 28);
+            this.GamesToolStripMenuItem.Size = new System.Drawing.Size(188, 28);
             this.GamesToolStripMenuItem.Text = "Games";
             // 
             // MinsweeperToolStripMenuItem
@@ -434,7 +436,7 @@ namespace Histacom2.OS.Win95
             this.MinsweeperToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
             this.MinsweeperToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicMinesweeper;
             this.MinsweeperToolStripMenuItem.Name = "MinsweeperToolStripMenuItem";
-            this.MinsweeperToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
+            this.MinsweeperToolStripMenuItem.Size = new System.Drawing.Size(150, 22);
             this.MinsweeperToolStripMenuItem.Text = "Minesweeper";
             this.MinsweeperToolStripMenuItem.Click += new System.EventHandler(this.MinsweeperToolStripMenuItem_Click);
             // 
@@ -446,7 +448,7 @@ namespace Histacom2.OS.Win95
             this.CalculatorToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("CalculatorToolStripMenuItem.Image")));
             this.CalculatorToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.CalculatorToolStripMenuItem.Name = "CalculatorToolStripMenuItem";
-            this.CalculatorToolStripMenuItem.Size = new System.Drawing.Size(181, 28);
+            this.CalculatorToolStripMenuItem.Size = new System.Drawing.Size(188, 28);
             this.CalculatorToolStripMenuItem.Text = "Calculator";
             this.CalculatorToolStripMenuItem.Click += new System.EventHandler(this.CalculatorToolStripMenuItem_Click);
             // 
@@ -458,7 +460,7 @@ namespace Histacom2.OS.Win95
             this.HyperTerminalToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicFolderSmall;
             this.HyperTerminalToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.HyperTerminalToolStripMenuItem.Name = "HyperTerminalToolStripMenuItem";
-            this.HyperTerminalToolStripMenuItem.Size = new System.Drawing.Size(181, 28);
+            this.HyperTerminalToolStripMenuItem.Size = new System.Drawing.Size(188, 28);
             this.HyperTerminalToolStripMenuItem.Text = "HyperTerminal";
             // 
             // ImagingToolStripMenuItem
@@ -469,7 +471,7 @@ namespace Histacom2.OS.Win95
             this.ImagingToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("ImagingToolStripMenuItem.Image")));
             this.ImagingToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.ImagingToolStripMenuItem.Name = "ImagingToolStripMenuItem";
-            this.ImagingToolStripMenuItem.Size = new System.Drawing.Size(181, 28);
+            this.ImagingToolStripMenuItem.Size = new System.Drawing.Size(188, 28);
             this.ImagingToolStripMenuItem.Text = "Imaging";
             // 
             // NotePadToolStripMenuItem
@@ -480,7 +482,7 @@ namespace Histacom2.OS.Win95
             this.NotePadToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("NotePadToolStripMenuItem.Image")));
             this.NotePadToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.NotePadToolStripMenuItem.Name = "NotePadToolStripMenuItem";
-            this.NotePadToolStripMenuItem.Size = new System.Drawing.Size(181, 28);
+            this.NotePadToolStripMenuItem.Size = new System.Drawing.Size(188, 28);
             this.NotePadToolStripMenuItem.Text = "Notepad";
             this.NotePadToolStripMenuItem.Click += new System.EventHandler(this.NotePadToolStripMenuItem_Click);
             // 
@@ -492,7 +494,7 @@ namespace Histacom2.OS.Win95
             this.OnlineRegistrationToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("OnlineRegistrationToolStripMenuItem.Image")));
             this.OnlineRegistrationToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.OnlineRegistrationToolStripMenuItem.Name = "OnlineRegistrationToolStripMenuItem";
-            this.OnlineRegistrationToolStripMenuItem.Size = new System.Drawing.Size(181, 28);
+            this.OnlineRegistrationToolStripMenuItem.Size = new System.Drawing.Size(188, 28);
             this.OnlineRegistrationToolStripMenuItem.Text = "Online Registration";
             // 
             // PaintToolStripMenuItem
@@ -503,7 +505,7 @@ namespace Histacom2.OS.Win95
             this.PaintToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("PaintToolStripMenuItem.Image")));
             this.PaintToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.PaintToolStripMenuItem.Name = "PaintToolStripMenuItem";
-            this.PaintToolStripMenuItem.Size = new System.Drawing.Size(181, 28);
+            this.PaintToolStripMenuItem.Size = new System.Drawing.Size(188, 28);
             this.PaintToolStripMenuItem.Text = "Paintbrush";
             // 
             // PhoneDialerToolStripMenuItem
@@ -514,7 +516,7 @@ namespace Histacom2.OS.Win95
             this.PhoneDialerToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("PhoneDialerToolStripMenuItem.Image")));
             this.PhoneDialerToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.PhoneDialerToolStripMenuItem.Name = "PhoneDialerToolStripMenuItem";
-            this.PhoneDialerToolStripMenuItem.Size = new System.Drawing.Size(181, 28);
+            this.PhoneDialerToolStripMenuItem.Size = new System.Drawing.Size(188, 28);
             this.PhoneDialerToolStripMenuItem.Text = "Phone Dialer";
             // 
             // WordPadToolStripMenuItem
@@ -525,7 +527,7 @@ namespace Histacom2.OS.Win95
             this.WordPadToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("WordPadToolStripMenuItem.Image")));
             this.WordPadToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.WordPadToolStripMenuItem.Name = "WordPadToolStripMenuItem";
-            this.WordPadToolStripMenuItem.Size = new System.Drawing.Size(181, 28);
+            this.WordPadToolStripMenuItem.Size = new System.Drawing.Size(188, 28);
             this.WordPadToolStripMenuItem.Text = "WordPad";
             this.WordPadToolStripMenuItem.Click += new System.EventHandler(this.WordPadToolStripMenuItem_Click);
             // 
@@ -543,7 +545,7 @@ namespace Histacom2.OS.Win95
             this.StartUpToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.StartUpToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.StartUpToolStripMenuItem.Name = "StartUpToolStripMenuItem";
-            this.StartUpToolStripMenuItem.Size = new System.Drawing.Size(181, 28);
+            this.StartUpToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
             this.StartUpToolStripMenuItem.Text = "Online Services";
             // 
             // AOLInternetFREETrialToolStripMenuItem
@@ -553,7 +555,7 @@ namespace Histacom2.OS.Win95
             this.AOLInternetFREETrialToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
             this.AOLInternetFREETrialToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.AOLInternetFREETrialToolStripMenuItem.Name = "AOLInternetFREETrialToolStripMenuItem";
-            this.AOLInternetFREETrialToolStripMenuItem.Size = new System.Drawing.Size(241, 22);
+            this.AOLInternetFREETrialToolStripMenuItem.Size = new System.Drawing.Size(248, 22);
             this.AOLInternetFREETrialToolStripMenuItem.Text = "AOL & Internet FREE Trial!";
             // 
             // ATTWorldNetSignupToolStripMenuItem
@@ -563,7 +565,7 @@ namespace Histacom2.OS.Win95
             this.ATTWorldNetSignupToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
             this.ATTWorldNetSignupToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.ATTWorldNetSignupToolStripMenuItem.Name = "ATTWorldNetSignupToolStripMenuItem";
-            this.ATTWorldNetSignupToolStripMenuItem.Size = new System.Drawing.Size(241, 22);
+            this.ATTWorldNetSignupToolStripMenuItem.Size = new System.Drawing.Size(248, 22);
             this.ATTWorldNetSignupToolStripMenuItem.Text = "AT&T WorldNet Signup";
             // 
             // SetupCompuServe30ToolStripMenuItem
@@ -573,7 +575,7 @@ namespace Histacom2.OS.Win95
             this.SetupCompuServe30ToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
             this.SetupCompuServe30ToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.SetupCompuServe30ToolStripMenuItem.Name = "SetupCompuServe30ToolStripMenuItem";
-            this.SetupCompuServe30ToolStripMenuItem.Size = new System.Drawing.Size(241, 22);
+            this.SetupCompuServe30ToolStripMenuItem.Size = new System.Drawing.Size(248, 22);
             this.SetupCompuServe30ToolStripMenuItem.Text = "Setup CompuServe 3.0";
             // 
             // SetupWOWFromCompuServeToolStripMenuItem
@@ -582,7 +584,7 @@ namespace Histacom2.OS.Win95
             this.SetupWOWFromCompuServeToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver;
             this.SetupWOWFromCompuServeToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
             this.SetupWOWFromCompuServeToolStripMenuItem.Name = "SetupWOWFromCompuServeToolStripMenuItem";
-            this.SetupWOWFromCompuServeToolStripMenuItem.Size = new System.Drawing.Size(241, 22);
+            this.SetupWOWFromCompuServeToolStripMenuItem.Size = new System.Drawing.Size(248, 22);
             this.SetupWOWFromCompuServeToolStripMenuItem.Text = "Setup WOW! from CompuServe";
             // 
             // MSDOSPromptToolStripMenuItem
@@ -596,7 +598,7 @@ namespace Histacom2.OS.Win95
             this.MSDOSPromptToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.MSDOSPromptToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.MSDOSPromptToolStripMenuItem.Name = "MSDOSPromptToolStripMenuItem";
-            this.MSDOSPromptToolStripMenuItem.Size = new System.Drawing.Size(181, 28);
+            this.MSDOSPromptToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
             this.MSDOSPromptToolStripMenuItem.Text = "StartUp";
             // 
             // EmptyToolStripMenuItem
@@ -605,7 +607,7 @@ namespace Histacom2.OS.Win95
             this.EmptyToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver;
             this.EmptyToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
             this.EmptyToolStripMenuItem.Name = "EmptyToolStripMenuItem";
-            this.EmptyToolStripMenuItem.Size = new System.Drawing.Size(116, 22);
+            this.EmptyToolStripMenuItem.Size = new System.Drawing.Size(118, 22);
             this.EmptyToolStripMenuItem.Text = "(Empty)";
             // 
             // InternetExplorerToolStripMenuItem
@@ -617,7 +619,7 @@ namespace Histacom2.OS.Win95
             this.InternetExplorerToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.InternetExplorerToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.InternetExplorerToolStripMenuItem.Name = "InternetExplorerToolStripMenuItem";
-            this.InternetExplorerToolStripMenuItem.Size = new System.Drawing.Size(181, 28);
+            this.InternetExplorerToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
             this.InternetExplorerToolStripMenuItem.Text = "Internet Explorer";
             this.InternetExplorerToolStripMenuItem.Click += new System.EventHandler(this.InternetExplorerToolStripMenuItem_Click);
             // 
@@ -630,7 +632,7 @@ namespace Histacom2.OS.Win95
             this.MSDOSPromptToolStripMenuItem1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.MSDOSPromptToolStripMenuItem1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.MSDOSPromptToolStripMenuItem1.Name = "MSDOSPromptToolStripMenuItem1";
-            this.MSDOSPromptToolStripMenuItem1.Size = new System.Drawing.Size(181, 28);
+            this.MSDOSPromptToolStripMenuItem1.Size = new System.Drawing.Size(186, 28);
             this.MSDOSPromptToolStripMenuItem1.Text = "MS-DOS Prompt";
             this.MSDOSPromptToolStripMenuItem1.Click += new System.EventHandler(this.MSDOSPromptToolStripMenuItem1_Click);
             // 
@@ -643,7 +645,7 @@ namespace Histacom2.OS.Win95
             this.OutlookExpressToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.OutlookExpressToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.OutlookExpressToolStripMenuItem.Name = "OutlookExpressToolStripMenuItem";
-            this.OutlookExpressToolStripMenuItem.Size = new System.Drawing.Size(181, 28);
+            this.OutlookExpressToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
             this.OutlookExpressToolStripMenuItem.Text = "Outlook Express";
             // 
             // WindowsExplorerToolStripMenuItem1
@@ -655,7 +657,7 @@ namespace Histacom2.OS.Win95
             this.WindowsExplorerToolStripMenuItem1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.WindowsExplorerToolStripMenuItem1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.WindowsExplorerToolStripMenuItem1.Name = "WindowsExplorerToolStripMenuItem1";
-            this.WindowsExplorerToolStripMenuItem1.Size = new System.Drawing.Size(181, 28);
+            this.WindowsExplorerToolStripMenuItem1.Size = new System.Drawing.Size(186, 28);
             this.WindowsExplorerToolStripMenuItem1.Text = "Windows Explorer";
             this.WindowsExplorerToolStripMenuItem1.Click += new System.EventHandler(this.WindowsExplorerToolStripMenuItem1_Click);
             // 
@@ -666,7 +668,7 @@ namespace Histacom2.OS.Win95
             this.GuessTheNumberToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
             this.GuessTheNumberToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicGTNIcon;
             this.GuessTheNumberToolStripMenuItem.Name = "GuessTheNumberToolStripMenuItem";
-            this.GuessTheNumberToolStripMenuItem.Size = new System.Drawing.Size(181, 28);
+            this.GuessTheNumberToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
             this.GuessTheNumberToolStripMenuItem.Text = "Guess The Number";
             this.GuessTheNumberToolStripMenuItem.Visible = false;
             this.GuessTheNumberToolStripMenuItem.Click += new System.EventHandler(this.GuessTheNumberToolStripMenuItem_Click);
@@ -677,7 +679,7 @@ namespace Histacom2.OS.Win95
             this.StartRunnerToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver;
             this.StartRunnerToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
             this.StartRunnerToolStripMenuItem.Name = "StartRunnerToolStripMenuItem";
-            this.StartRunnerToolStripMenuItem.Size = new System.Drawing.Size(181, 28);
+            this.StartRunnerToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
             this.StartRunnerToolStripMenuItem.Text = "Start Runner";
             this.StartRunnerToolStripMenuItem.Visible = false;
             // 
@@ -687,7 +689,7 @@ namespace Histacom2.OS.Win95
             this.ErrorBlasterToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver;
             this.ErrorBlasterToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
             this.ErrorBlasterToolStripMenuItem.Name = "ErrorBlasterToolStripMenuItem";
-            this.ErrorBlasterToolStripMenuItem.Size = new System.Drawing.Size(181, 28);
+            this.ErrorBlasterToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
             this.ErrorBlasterToolStripMenuItem.Text = "Error Blaster";
             this.ErrorBlasterToolStripMenuItem.Visible = false;
             // 
@@ -697,7 +699,7 @@ namespace Histacom2.OS.Win95
             this.SkindowsToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver;
             this.SkindowsToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
             this.SkindowsToolStripMenuItem.Name = "SkindowsToolStripMenuItem";
-            this.SkindowsToolStripMenuItem.Size = new System.Drawing.Size(181, 28);
+            this.SkindowsToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
             this.SkindowsToolStripMenuItem.Text = "Skindows 95";
             this.SkindowsToolStripMenuItem.Visible = false;
             // 
@@ -708,7 +710,7 @@ namespace Histacom2.OS.Win95
             this.WebChatToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
             this.WebChatToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicWebchat;
             this.WebChatToolStripMenuItem.Name = "WebChatToolStripMenuItem";
-            this.WebChatToolStripMenuItem.Size = new System.Drawing.Size(181, 28);
+            this.WebChatToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
             this.WebChatToolStripMenuItem.Text = "Web Chat";
             this.WebChatToolStripMenuItem.Visible = false;
             this.WebChatToolStripMenuItem.Click += new System.EventHandler(this.WebChatToolStripMenuItem_Click);
@@ -720,7 +722,7 @@ namespace Histacom2.OS.Win95
             this.TimeDistorterToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
             this.TimeDistorterToolStripMenuItem.Image = global::Histacom2.Properties.Resources.TimeDistorter1Icon;
             this.TimeDistorterToolStripMenuItem.Name = "TimeDistorterToolStripMenuItem";
-            this.TimeDistorterToolStripMenuItem.Size = new System.Drawing.Size(181, 28);
+            this.TimeDistorterToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
             this.TimeDistorterToolStripMenuItem.Text = "Time Distorter";
             this.TimeDistorterToolStripMenuItem.Visible = false;
             this.TimeDistorterToolStripMenuItem.Click += new System.EventHandler(this.TimeDistorterToolStripMenuItem_Click);
@@ -732,7 +734,7 @@ namespace Histacom2.OS.Win95
             this.FTPClientToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
             this.FTPClientToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicFTPIcon;
             this.FTPClientToolStripMenuItem.Name = "FTPClientToolStripMenuItem";
-            this.FTPClientToolStripMenuItem.Size = new System.Drawing.Size(181, 28);
+            this.FTPClientToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
             this.FTPClientToolStripMenuItem.Text = "FTP Client";
             this.FTPClientToolStripMenuItem.Visible = false;
             this.FTPClientToolStripMenuItem.Click += new System.EventHandler(this.FTPClientToolStripMenuItem_Click);
@@ -750,7 +752,7 @@ namespace Histacom2.OS.Win95
             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.Size = new System.Drawing.Size(141, 36);
             this.DocumentsToolStripMenuItem.Text = "Documents";
             // 
             // downloaderTestToolStripMenuItem
@@ -758,7 +760,7 @@ namespace Histacom2.OS.Win95
             this.downloaderTestToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
             this.downloaderTestToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("downloaderTestToolStripMenuItem.BackgroundImage")));
             this.downloaderTestToolStripMenuItem.Name = "downloaderTestToolStripMenuItem";
-            this.downloaderTestToolStripMenuItem.Size = new System.Drawing.Size(159, 22);
+            this.downloaderTestToolStripMenuItem.Size = new System.Drawing.Size(165, 22);
             this.downloaderTestToolStripMenuItem.Text = "DownloaderTest";
             this.downloaderTestToolStripMenuItem.Click += new System.EventHandler(this.downloaderTestToolStripMenuItem_Click);
             // 
@@ -767,7 +769,7 @@ namespace Histacom2.OS.Win95
             this.installerTestToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
             this.installerTestToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("installerTestToolStripMenuItem.BackgroundImage")));
             this.installerTestToolStripMenuItem.Name = "installerTestToolStripMenuItem";
-            this.installerTestToolStripMenuItem.Size = new System.Drawing.Size(159, 22);
+            this.installerTestToolStripMenuItem.Size = new System.Drawing.Size(165, 22);
             this.installerTestToolStripMenuItem.Text = "InstallerTest";
             this.installerTestToolStripMenuItem.Click += new System.EventHandler(this.installerTestToolStripMenuItem_Click);
             // 
@@ -775,7 +777,7 @@ namespace Histacom2.OS.Win95
             // 
             this.storyTest1ToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver;
             this.storyTest1ToolStripMenuItem.Name = "storyTest1ToolStripMenuItem";
-            this.storyTest1ToolStripMenuItem.Size = new System.Drawing.Size(159, 22);
+            this.storyTest1ToolStripMenuItem.Size = new System.Drawing.Size(165, 22);
             this.storyTest1ToolStripMenuItem.Text = "StoryTest1";
             this.storyTest1ToolStripMenuItem.Click += new System.EventHandler(this.storyTest1ToolStripMenuItem_Click);
             // 
@@ -791,7 +793,7 @@ namespace Histacom2.OS.Win95
             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.Size = new System.Drawing.Size(141, 36);
             this.SettingsToolStripMenuItem.Text = "Settings";
             // 
             // ControlPanelToolStripMenuItem
@@ -801,7 +803,7 @@ namespace Histacom2.OS.Win95
             this.ControlPanelToolStripMenuItem.Image = global::Histacom2.Properties.Resources.Win95ControlPanelIcon;
             this.ControlPanelToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.ControlPanelToolStripMenuItem.Name = "ControlPanelToolStripMenuItem";
-            this.ControlPanelToolStripMenuItem.Size = new System.Drawing.Size(146, 22);
+            this.ControlPanelToolStripMenuItem.Size = new System.Drawing.Size(151, 22);
             this.ControlPanelToolStripMenuItem.Text = "Control Panel";
             // 
             // PrintersToolStripMenuItem
@@ -811,7 +813,7 @@ namespace Histacom2.OS.Win95
             this.PrintersToolStripMenuItem.Image = global::Histacom2.Properties.Resources.Win95PrintersFolder;
             this.PrintersToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.PrintersToolStripMenuItem.Name = "PrintersToolStripMenuItem";
-            this.PrintersToolStripMenuItem.Size = new System.Drawing.Size(146, 22);
+            this.PrintersToolStripMenuItem.Size = new System.Drawing.Size(151, 22);
             this.PrintersToolStripMenuItem.Text = "Printers";
             this.PrintersToolStripMenuItem.Click += new System.EventHandler(this.infoboxTestToolStripMenuItem_Click);
             // 
@@ -821,7 +823,7 @@ namespace Histacom2.OS.Win95
             this.TaskbarToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("TaskbarToolStripMenuItem.BackgroundImage")));
             this.TaskbarToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.TaskbarToolStripMenuItem.Name = "TaskbarToolStripMenuItem";
-            this.TaskbarToolStripMenuItem.Size = new System.Drawing.Size(146, 22);
+            this.TaskbarToolStripMenuItem.Size = new System.Drawing.Size(151, 22);
             this.TaskbarToolStripMenuItem.Text = "Taskbar";
             // 
             // FindToolStripMenuItem
@@ -839,7 +841,7 @@ namespace Histacom2.OS.Win95
             this.FindToolStripMenuItem.Name = "FindToolStripMenuItem";
             this.FindToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0);
             this.FindToolStripMenuItem.RightToLeft = System.Windows.Forms.RightToLeft.No;
-            this.FindToolStripMenuItem.Size = new System.Drawing.Size(138, 36);
+            this.FindToolStripMenuItem.Size = new System.Drawing.Size(141, 36);
             this.FindToolStripMenuItem.Text = "Find";
             // 
             // FilesOrFoldersToolStripMenuItem
@@ -848,7 +850,7 @@ namespace Histacom2.OS.Win95
             this.FilesOrFoldersToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("FilesOrFoldersToolStripMenuItem.BackgroundImage")));
             this.FilesOrFoldersToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.FilesOrFoldersToolStripMenuItem.Name = "FilesOrFoldersToolStripMenuItem";
-            this.FilesOrFoldersToolStripMenuItem.Size = new System.Drawing.Size(163, 22);
+            this.FilesOrFoldersToolStripMenuItem.Size = new System.Drawing.Size(169, 22);
             this.FilesOrFoldersToolStripMenuItem.Text = "Files or Folders...";
             // 
             // ComputerToolStripMenuItem
@@ -857,7 +859,7 @@ namespace Histacom2.OS.Win95
             this.ComputerToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("ComputerToolStripMenuItem.BackgroundImage")));
             this.ComputerToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.ComputerToolStripMenuItem.Name = "ComputerToolStripMenuItem";
-            this.ComputerToolStripMenuItem.Size = new System.Drawing.Size(163, 22);
+            this.ComputerToolStripMenuItem.Size = new System.Drawing.Size(169, 22);
             this.ComputerToolStripMenuItem.Text = "Computer...";
             // 
             // OnTheInternetToolStripMenuItem
@@ -866,7 +868,7 @@ namespace Histacom2.OS.Win95
             this.OnTheInternetToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("OnTheInternetToolStripMenuItem.BackgroundImage")));
             this.OnTheInternetToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.OnTheInternetToolStripMenuItem.Name = "OnTheInternetToolStripMenuItem";
-            this.OnTheInternetToolStripMenuItem.Size = new System.Drawing.Size(163, 22);
+            this.OnTheInternetToolStripMenuItem.Size = new System.Drawing.Size(169, 22);
             this.OnTheInternetToolStripMenuItem.Text = "On the Internet...";
             // 
             // PeopleToolStripMenuItem
@@ -875,7 +877,7 @@ namespace Histacom2.OS.Win95
             this.PeopleToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("PeopleToolStripMenuItem.BackgroundImage")));
             this.PeopleToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.PeopleToolStripMenuItem.Name = "PeopleToolStripMenuItem";
-            this.PeopleToolStripMenuItem.Size = new System.Drawing.Size(163, 22);
+            this.PeopleToolStripMenuItem.Size = new System.Drawing.Size(169, 22);
             this.PeopleToolStripMenuItem.Text = "People...";
             // 
             // HelpToolStripMenuItem
@@ -887,7 +889,7 @@ namespace Histacom2.OS.Win95
             this.HelpToolStripMenuItem.Name = "HelpToolStripMenuItem";
             this.HelpToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0);
             this.HelpToolStripMenuItem.RightToLeft = System.Windows.Forms.RightToLeft.No;
-            this.HelpToolStripMenuItem.Size = new System.Drawing.Size(138, 36);
+            this.HelpToolStripMenuItem.Size = new System.Drawing.Size(141, 36);
             this.HelpToolStripMenuItem.Text = "Help";
             // 
             // RunToolStripMenuItem
@@ -899,7 +901,7 @@ namespace Histacom2.OS.Win95
             this.RunToolStripMenuItem.Name = "RunToolStripMenuItem";
             this.RunToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0);
             this.RunToolStripMenuItem.RightToLeft = System.Windows.Forms.RightToLeft.No;
-            this.RunToolStripMenuItem.Size = new System.Drawing.Size(138, 36);
+            this.RunToolStripMenuItem.Size = new System.Drawing.Size(141, 36);
             this.RunToolStripMenuItem.Text = "Run...";
             // 
             // SuspendToolStripMenuItem
@@ -910,7 +912,7 @@ namespace Histacom2.OS.Win95
             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.Size = new System.Drawing.Size(141, 36);
             this.SuspendToolStripMenuItem.Text = "Suspend";
             // 
             // ShutdownToolStripMenuItem
@@ -921,7 +923,7 @@ namespace Histacom2.OS.Win95
             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.Size = new System.Drawing.Size(141, 36);
             this.ShutdownToolStripMenuItem.Text = "Shut Down...";
             this.ShutdownToolStripMenuItem.Click += new System.EventHandler(this.ShutdownToolStripMenuItem_Click);
             // 
@@ -993,7 +995,7 @@ namespace Histacom2.OS.Win95
             this.PropertiesToolStripMenuItem1});
             this.rightclickbackproperties.Name = "ContextMenuStrip1";
             this.rightclickbackproperties.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional;
-            this.rightclickbackproperties.Size = new System.Drawing.Size(128, 70);
+            this.rightclickbackproperties.Size = new System.Drawing.Size(135, 70);
             // 
             // NewToolStripMenuItem1
             // 
@@ -1002,14 +1004,14 @@ namespace Histacom2.OS.Win95
             this.FolderToolStripMenuItem,
             this.TextDocumentToolStripMenuItem});
             this.NewToolStripMenuItem1.Name = "NewToolStripMenuItem1";
-            this.NewToolStripMenuItem1.Size = new System.Drawing.Size(127, 22);
+            this.NewToolStripMenuItem1.Size = new System.Drawing.Size(134, 22);
             this.NewToolStripMenuItem1.Text = "New";
             // 
             // FolderToolStripMenuItem
             // 
             this.FolderToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
             this.FolderToolStripMenuItem.Name = "FolderToolStripMenuItem";
-            this.FolderToolStripMenuItem.Size = new System.Drawing.Size(154, 22);
+            this.FolderToolStripMenuItem.Size = new System.Drawing.Size(161, 22);
             this.FolderToolStripMenuItem.Text = "Folder";
             this.FolderToolStripMenuItem.Click += new System.EventHandler(this.FolderToolStripMenuItem_Click);
             // 
@@ -1017,7 +1019,7 @@ namespace Histacom2.OS.Win95
             // 
             this.TextDocumentToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
             this.TextDocumentToolStripMenuItem.Name = "TextDocumentToolStripMenuItem";
-            this.TextDocumentToolStripMenuItem.Size = new System.Drawing.Size(154, 22);
+            this.TextDocumentToolStripMenuItem.Size = new System.Drawing.Size(161, 22);
             this.TextDocumentToolStripMenuItem.Text = "Text Document";
             this.TextDocumentToolStripMenuItem.Click += new System.EventHandler(this.TextDocumentToolStripMenuItem_Click);
             // 
@@ -1025,7 +1027,7 @@ namespace Histacom2.OS.Win95
             // 
             this.deleteToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
             this.deleteToolStripMenuItem.Name = "deleteToolStripMenuItem";
-            this.deleteToolStripMenuItem.Size = new System.Drawing.Size(127, 22);
+            this.deleteToolStripMenuItem.Size = new System.Drawing.Size(134, 22);
             this.deleteToolStripMenuItem.Text = "Delete";
             this.deleteToolStripMenuItem.Click += new System.EventHandler(this.deleteToolStripMenuItem_Click);
             // 
@@ -1033,7 +1035,7 @@ namespace Histacom2.OS.Win95
             // 
             this.PropertiesToolStripMenuItem1.BackColor = System.Drawing.Color.Silver;
             this.PropertiesToolStripMenuItem1.Name = "PropertiesToolStripMenuItem1";
-            this.PropertiesToolStripMenuItem1.Size = new System.Drawing.Size(127, 22);
+            this.PropertiesToolStripMenuItem1.Size = new System.Drawing.Size(134, 22);
             this.PropertiesToolStripMenuItem1.Text = "Properties";
             this.PropertiesToolStripMenuItem1.Click += new System.EventHandler(this.PropertiesToolStripMenuItem1_Click);
             // 
@@ -1139,7 +1141,6 @@ namespace Histacom2.OS.Win95
         internal System.Windows.Forms.PictureBox osimage;
         internal System.Windows.Forms.ToolStripMenuItem ShutdownToolStripMenuItem;
         internal System.Windows.Forms.ToolStripMenuItem SuspendToolStripMenuItem;
-        private System.Windows.Forms.Panel clockPanel;
         private System.Windows.Forms.Timer clockTimer;
         private System.Windows.Forms.ImageList desktopImages;
         internal System.Windows.Forms.ListView desktopicons;
@@ -1159,5 +1160,6 @@ 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;
     }
 }
\ No newline at end of file
diff --git a/Histacom2/OS/Win95/Win95.cs b/Histacom2/OS/Win95/Win95.cs
index 25bc348..8188b7e 100644
--- a/Histacom2/OS/Win95/Win95.cs
+++ b/Histacom2/OS/Win95/Win95.cs
@@ -606,6 +606,31 @@ namespace Histacom2.OS.Win95
             app.BringToFront();
             startmenu.Hide();
         }
+
+        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);
+        }
     }
     public class MyRenderer : ToolStripProfessionalRenderer
     {
diff --git a/Histacom2/OS/Win95/Win95.resx b/Histacom2/OS/Win95/Win95.resx
index 419e624..f0d544c 100644
--- a/Histacom2/OS/Win95/Win95.resx
+++ b/Histacom2/OS/Win95/Win95.resx
@@ -120,6 +120,9 @@
   <metadata name="startmenuitems.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
+  <metadata name="startmenuitems.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="InternetConnectionWizardToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -188,7 +191,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 +226,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 +264,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 +273,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 +282,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 +291,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 +299,70 @@
   <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
+        vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
         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
+        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
-        wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
+        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
-        wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
+        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
-        wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
+        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
-        wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
+        vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
         4AAABIQCQUtXaBsAAAAASUVORK5CYII=
 </value>
   </data>
@@ -374,7 +377,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACO
-        hAAAAk1TRnQBSQFMAgEBDQEAAUQBAgFEAQIBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA
+        hAAAAk1TRnQBSQFMAgEBDQEAAVQBAgFUAQIBIAEAASABAAT/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/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 b6195ae..4dd74fb 100644
--- a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs
+++ b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs
@@ -117,12 +117,6 @@ namespace Histacom2.OS.Win95.Win95Apps
             }
         }
 
-        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 +124,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/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..f22ee89 100644
--- a/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs
+++ b/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs
@@ -61,46 +61,17 @@ 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":
@@ -136,9 +107,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/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/Win98/Win98.Designer.cs b/Histacom2/OS/Win98/Win98.Designer.cs
index 6c1f2d2..52fb2f2 100644
--- a/Histacom2/OS/Win98/Win98.Designer.cs
+++ b/Histacom2/OS/Win98/Win98.Designer.cs
@@ -106,9 +106,9 @@ namespace Histacom2.OS.Win98
             this.NewToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
             this.FolderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.TextDocumentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.deleteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.PropertiesToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
             this.desktopupdate = new System.Windows.Forms.Timer(this.components);
-            this.deleteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.panel1.SuspendLayout();
             this.taskbar.SuspendLayout();
             this.clockPanel.SuspendLayout();
@@ -200,7 +200,7 @@ namespace Histacom2.OS.Win98
             this.startmenu.Controls.Add(this.ossidestartmenu);
             this.startmenu.Location = new System.Drawing.Point(0, 160);
             this.startmenu.Name = "startmenu";
-            this.startmenu.Size = new System.Drawing.Size(174, 300);
+            this.startmenu.Size = new System.Drawing.Size(174, 295);
             this.startmenu.TabIndex = 3;
             // 
             // startmenuitems
@@ -217,12 +217,12 @@ namespace Histacom2.OS.Win98
             this.SuspendToolStripMenuItem,
             this.ShutdownToolStripMenuItem});
             this.startmenuitems.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.VerticalStackWithOverflow;
-            this.startmenuitems.Location = new System.Drawing.Point(28, 2);
+            this.startmenuitems.Location = new System.Drawing.Point(22, 2);
             this.startmenuitems.Margin = new System.Windows.Forms.Padding(0, 0, 5, 0);
             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, 292);
+            this.startmenuitems.Size = new System.Drawing.Size(148, 292);
             this.startmenuitems.TabIndex = 0;
             this.startmenuitems.Text = "StartMenu";
             // 
@@ -250,7 +250,7 @@ namespace Histacom2.OS.Win98
             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.Size = new System.Drawing.Size(141, 36);
             this.ProgramsToolStripMenuItem.Text = "Programs";
             // 
             // AccessoriesToolStripMenuItem
@@ -275,7 +275,7 @@ namespace Histacom2.OS.Win98
             this.AccessoriesToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.AccessoriesToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.AccessoriesToolStripMenuItem.Name = "AccessoriesToolStripMenuItem";
-            this.AccessoriesToolStripMenuItem.Size = new System.Drawing.Size(181, 28);
+            this.AccessoriesToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
             this.AccessoriesToolStripMenuItem.Text = "Accessories";
             // 
             // CommunicationsToolStripMenuItem
@@ -289,7 +289,7 @@ namespace Histacom2.OS.Win98
             this.CommunicationsToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicProgramItem;
             this.CommunicationsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.CommunicationsToolStripMenuItem.Name = "CommunicationsToolStripMenuItem";
-            this.CommunicationsToolStripMenuItem.Size = new System.Drawing.Size(181, 28);
+            this.CommunicationsToolStripMenuItem.Size = new System.Drawing.Size(188, 28);
             this.CommunicationsToolStripMenuItem.Text = "Communications";
             // 
             // InternetConnectionWizardToolStripMenuItem
@@ -300,7 +300,7 @@ namespace Histacom2.OS.Win98
             this.InternetConnectionWizardToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("InternetConnectionWizardToolStripMenuItem.Image")));
             this.InternetConnectionWizardToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.InternetConnectionWizardToolStripMenuItem.Name = "InternetConnectionWizardToolStripMenuItem";
-            this.InternetConnectionWizardToolStripMenuItem.Size = new System.Drawing.Size(219, 22);
+            this.InternetConnectionWizardToolStripMenuItem.Size = new System.Drawing.Size(229, 22);
             this.InternetConnectionWizardToolStripMenuItem.Text = "Internet Connection Wizard";
             this.InternetConnectionWizardToolStripMenuItem.Click += new System.EventHandler(this.temp_for_std);
             // 
@@ -312,7 +312,7 @@ namespace Histacom2.OS.Win98
             this.NetMeetingToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("NetMeetingToolStripMenuItem.Image")));
             this.NetMeetingToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.NetMeetingToolStripMenuItem.Name = "NetMeetingToolStripMenuItem";
-            this.NetMeetingToolStripMenuItem.Size = new System.Drawing.Size(219, 22);
+            this.NetMeetingToolStripMenuItem.Size = new System.Drawing.Size(229, 22);
             this.NetMeetingToolStripMenuItem.Text = "NetMeeting";
             this.NetMeetingToolStripMenuItem.Click += new System.EventHandler(this.WebChatToolStripMenuItem_Click);
             // 
@@ -329,7 +329,7 @@ namespace Histacom2.OS.Win98
             this.MultimediaToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicProgramItem;
             this.MultimediaToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.MultimediaToolStripMenuItem.Name = "MultimediaToolStripMenuItem";
-            this.MultimediaToolStripMenuItem.Size = new System.Drawing.Size(181, 28);
+            this.MultimediaToolStripMenuItem.Size = new System.Drawing.Size(188, 28);
             this.MultimediaToolStripMenuItem.Text = "Multimedia";
             // 
             // CDPlayerToolStripMenuItem
@@ -340,7 +340,7 @@ namespace Histacom2.OS.Win98
             this.CDPlayerToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("CDPlayerToolStripMenuItem.Image")));
             this.CDPlayerToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.CDPlayerToolStripMenuItem.Name = "CDPlayerToolStripMenuItem";
-            this.CDPlayerToolStripMenuItem.Size = new System.Drawing.Size(194, 22);
+            this.CDPlayerToolStripMenuItem.Size = new System.Drawing.Size(201, 22);
             this.CDPlayerToolStripMenuItem.Text = "CD Player";
             // 
             // SoundRecorderToolStripMenuItem
@@ -351,7 +351,7 @@ namespace Histacom2.OS.Win98
             this.SoundRecorderToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("SoundRecorderToolStripMenuItem.Image")));
             this.SoundRecorderToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.SoundRecorderToolStripMenuItem.Name = "SoundRecorderToolStripMenuItem";
-            this.SoundRecorderToolStripMenuItem.Size = new System.Drawing.Size(194, 22);
+            this.SoundRecorderToolStripMenuItem.Size = new System.Drawing.Size(201, 22);
             this.SoundRecorderToolStripMenuItem.Text = "Sound Recorder";
             // 
             // VolumeControlToolStripMenuItem
@@ -362,7 +362,7 @@ namespace Histacom2.OS.Win98
             this.VolumeControlToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("VolumeControlToolStripMenuItem.Image")));
             this.VolumeControlToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.VolumeControlToolStripMenuItem.Name = "VolumeControlToolStripMenuItem";
-            this.VolumeControlToolStripMenuItem.Size = new System.Drawing.Size(194, 22);
+            this.VolumeControlToolStripMenuItem.Size = new System.Drawing.Size(201, 22);
             this.VolumeControlToolStripMenuItem.Text = "Volume Control";
             // 
             // WindowsMediaPlayerToolStripMenuItem
@@ -373,7 +373,7 @@ namespace Histacom2.OS.Win98
             this.WindowsMediaPlayerToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("WindowsMediaPlayerToolStripMenuItem.Image")));
             this.WindowsMediaPlayerToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.WindowsMediaPlayerToolStripMenuItem.Name = "WindowsMediaPlayerToolStripMenuItem";
-            this.WindowsMediaPlayerToolStripMenuItem.Size = new System.Drawing.Size(194, 22);
+            this.WindowsMediaPlayerToolStripMenuItem.Size = new System.Drawing.Size(201, 22);
             this.WindowsMediaPlayerToolStripMenuItem.Text = "Windows Media Player";
             // 
             // SystemToolsToolStripMenuItem
@@ -387,7 +387,7 @@ namespace Histacom2.OS.Win98
             this.SystemToolsToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicProgramItem;
             this.SystemToolsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.SystemToolsToolStripMenuItem.Name = "SystemToolsToolStripMenuItem";
-            this.SystemToolsToolStripMenuItem.Size = new System.Drawing.Size(181, 28);
+            this.SystemToolsToolStripMenuItem.Size = new System.Drawing.Size(188, 28);
             this.SystemToolsToolStripMenuItem.Text = "System Tools";
             // 
             // DiskDefragmenterToolStripMenuItem
@@ -398,7 +398,7 @@ namespace Histacom2.OS.Win98
             this.DiskDefragmenterToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("DiskDefragmenterToolStripMenuItem.Image")));
             this.DiskDefragmenterToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.DiskDefragmenterToolStripMenuItem.Name = "DiskDefragmenterToolStripMenuItem";
-            this.DiskDefragmenterToolStripMenuItem.Size = new System.Drawing.Size(172, 22);
+            this.DiskDefragmenterToolStripMenuItem.Size = new System.Drawing.Size(181, 22);
             this.DiskDefragmenterToolStripMenuItem.Text = "Disk Defragmenter";
             // 
             // ScanDiskToolStripMenuItem
@@ -409,7 +409,7 @@ namespace Histacom2.OS.Win98
             this.ScanDiskToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("ScanDiskToolStripMenuItem.Image")));
             this.ScanDiskToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.ScanDiskToolStripMenuItem.Name = "ScanDiskToolStripMenuItem";
-            this.ScanDiskToolStripMenuItem.Size = new System.Drawing.Size(172, 22);
+            this.ScanDiskToolStripMenuItem.Size = new System.Drawing.Size(181, 22);
             this.ScanDiskToolStripMenuItem.Text = "ScanDisk";
             // 
             // AddressBookToolStripMenuItem
@@ -420,7 +420,7 @@ namespace Histacom2.OS.Win98
             this.AddressBookToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("AddressBookToolStripMenuItem.Image")));
             this.AddressBookToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.AddressBookToolStripMenuItem.Name = "AddressBookToolStripMenuItem";
-            this.AddressBookToolStripMenuItem.Size = new System.Drawing.Size(181, 28);
+            this.AddressBookToolStripMenuItem.Size = new System.Drawing.Size(188, 28);
             this.AddressBookToolStripMenuItem.Text = "Address Book";
             this.AddressBookToolStripMenuItem.Click += new System.EventHandler(this.AddressBookToolStripMenuItem_Click);
             // 
@@ -432,7 +432,7 @@ namespace Histacom2.OS.Win98
             this.CalculatorToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("CalculatorToolStripMenuItem.Image")));
             this.CalculatorToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.CalculatorToolStripMenuItem.Name = "CalculatorToolStripMenuItem";
-            this.CalculatorToolStripMenuItem.Size = new System.Drawing.Size(181, 28);
+            this.CalculatorToolStripMenuItem.Size = new System.Drawing.Size(188, 28);
             this.CalculatorToolStripMenuItem.Text = "Calculator";
             // 
             // HyperTerminalToolStripMenuItem
@@ -443,7 +443,7 @@ namespace Histacom2.OS.Win98
             this.HyperTerminalToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicFolderSmall;
             this.HyperTerminalToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.HyperTerminalToolStripMenuItem.Name = "HyperTerminalToolStripMenuItem";
-            this.HyperTerminalToolStripMenuItem.Size = new System.Drawing.Size(181, 28);
+            this.HyperTerminalToolStripMenuItem.Size = new System.Drawing.Size(188, 28);
             this.HyperTerminalToolStripMenuItem.Text = "HyperTerminal";
             // 
             // ImagingToolStripMenuItem
@@ -454,7 +454,7 @@ namespace Histacom2.OS.Win98
             this.ImagingToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("ImagingToolStripMenuItem.Image")));
             this.ImagingToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.ImagingToolStripMenuItem.Name = "ImagingToolStripMenuItem";
-            this.ImagingToolStripMenuItem.Size = new System.Drawing.Size(181, 28);
+            this.ImagingToolStripMenuItem.Size = new System.Drawing.Size(188, 28);
             this.ImagingToolStripMenuItem.Text = "Imaging";
             // 
             // NotePadToolStripMenuItem
@@ -465,7 +465,7 @@ namespace Histacom2.OS.Win98
             this.NotePadToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("NotePadToolStripMenuItem.Image")));
             this.NotePadToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.NotePadToolStripMenuItem.Name = "NotePadToolStripMenuItem";
-            this.NotePadToolStripMenuItem.Size = new System.Drawing.Size(181, 28);
+            this.NotePadToolStripMenuItem.Size = new System.Drawing.Size(188, 28);
             this.NotePadToolStripMenuItem.Text = "Notepad";
             this.NotePadToolStripMenuItem.Click += new System.EventHandler(this.NotePadToolStripMenuItem_Click);
             // 
@@ -477,7 +477,7 @@ namespace Histacom2.OS.Win98
             this.OnlineRegistrationToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("OnlineRegistrationToolStripMenuItem.Image")));
             this.OnlineRegistrationToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.OnlineRegistrationToolStripMenuItem.Name = "OnlineRegistrationToolStripMenuItem";
-            this.OnlineRegistrationToolStripMenuItem.Size = new System.Drawing.Size(181, 28);
+            this.OnlineRegistrationToolStripMenuItem.Size = new System.Drawing.Size(188, 28);
             this.OnlineRegistrationToolStripMenuItem.Text = "Online Registration";
             // 
             // PaintToolStripMenuItem
@@ -488,7 +488,7 @@ namespace Histacom2.OS.Win98
             this.PaintToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("PaintToolStripMenuItem.Image")));
             this.PaintToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.PaintToolStripMenuItem.Name = "PaintToolStripMenuItem";
-            this.PaintToolStripMenuItem.Size = new System.Drawing.Size(181, 28);
+            this.PaintToolStripMenuItem.Size = new System.Drawing.Size(188, 28);
             this.PaintToolStripMenuItem.Text = "Paintbrush";
             // 
             // PhoneDialerToolStripMenuItem
@@ -499,7 +499,7 @@ namespace Histacom2.OS.Win98
             this.PhoneDialerToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("PhoneDialerToolStripMenuItem.Image")));
             this.PhoneDialerToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.PhoneDialerToolStripMenuItem.Name = "PhoneDialerToolStripMenuItem";
-            this.PhoneDialerToolStripMenuItem.Size = new System.Drawing.Size(181, 28);
+            this.PhoneDialerToolStripMenuItem.Size = new System.Drawing.Size(188, 28);
             this.PhoneDialerToolStripMenuItem.Text = "Phone Dialer";
             // 
             // WordPadToolStripMenuItem
@@ -510,7 +510,7 @@ namespace Histacom2.OS.Win98
             this.WordPadToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("WordPadToolStripMenuItem.Image")));
             this.WordPadToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.WordPadToolStripMenuItem.Name = "WordPadToolStripMenuItem";
-            this.WordPadToolStripMenuItem.Size = new System.Drawing.Size(181, 28);
+            this.WordPadToolStripMenuItem.Size = new System.Drawing.Size(188, 28);
             this.WordPadToolStripMenuItem.Text = "WordPad";
             this.WordPadToolStripMenuItem.Click += new System.EventHandler(this.WordPadToolStripMenuItem_Click);
             // 
@@ -528,7 +528,7 @@ namespace Histacom2.OS.Win98
             this.StartUpToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.StartUpToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.StartUpToolStripMenuItem.Name = "StartUpToolStripMenuItem";
-            this.StartUpToolStripMenuItem.Size = new System.Drawing.Size(181, 28);
+            this.StartUpToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
             this.StartUpToolStripMenuItem.Text = "Online Services";
             // 
             // AOLInternetFREETrialToolStripMenuItem
@@ -538,7 +538,7 @@ namespace Histacom2.OS.Win98
             this.AOLInternetFREETrialToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
             this.AOLInternetFREETrialToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.AOLInternetFREETrialToolStripMenuItem.Name = "AOLInternetFREETrialToolStripMenuItem";
-            this.AOLInternetFREETrialToolStripMenuItem.Size = new System.Drawing.Size(241, 22);
+            this.AOLInternetFREETrialToolStripMenuItem.Size = new System.Drawing.Size(248, 22);
             this.AOLInternetFREETrialToolStripMenuItem.Text = "AOL & Internet FREE Trial!";
             // 
             // ATTWorldNetSignupToolStripMenuItem
@@ -548,7 +548,7 @@ namespace Histacom2.OS.Win98
             this.ATTWorldNetSignupToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
             this.ATTWorldNetSignupToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.ATTWorldNetSignupToolStripMenuItem.Name = "ATTWorldNetSignupToolStripMenuItem";
-            this.ATTWorldNetSignupToolStripMenuItem.Size = new System.Drawing.Size(241, 22);
+            this.ATTWorldNetSignupToolStripMenuItem.Size = new System.Drawing.Size(248, 22);
             this.ATTWorldNetSignupToolStripMenuItem.Text = "AT&T WorldNet Signup";
             // 
             // SetupCompuServe30ToolStripMenuItem
@@ -558,7 +558,7 @@ namespace Histacom2.OS.Win98
             this.SetupCompuServe30ToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
             this.SetupCompuServe30ToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.SetupCompuServe30ToolStripMenuItem.Name = "SetupCompuServe30ToolStripMenuItem";
-            this.SetupCompuServe30ToolStripMenuItem.Size = new System.Drawing.Size(241, 22);
+            this.SetupCompuServe30ToolStripMenuItem.Size = new System.Drawing.Size(248, 22);
             this.SetupCompuServe30ToolStripMenuItem.Text = "Setup CompuServe 3.0";
             // 
             // SetupWOWFromCompuServeToolStripMenuItem
@@ -567,7 +567,7 @@ namespace Histacom2.OS.Win98
             this.SetupWOWFromCompuServeToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver;
             this.SetupWOWFromCompuServeToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
             this.SetupWOWFromCompuServeToolStripMenuItem.Name = "SetupWOWFromCompuServeToolStripMenuItem";
-            this.SetupWOWFromCompuServeToolStripMenuItem.Size = new System.Drawing.Size(241, 22);
+            this.SetupWOWFromCompuServeToolStripMenuItem.Size = new System.Drawing.Size(248, 22);
             this.SetupWOWFromCompuServeToolStripMenuItem.Text = "Setup WOW! from CompuServe";
             // 
             // MSDOSPromptToolStripMenuItem
@@ -581,7 +581,7 @@ namespace Histacom2.OS.Win98
             this.MSDOSPromptToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.MSDOSPromptToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.MSDOSPromptToolStripMenuItem.Name = "MSDOSPromptToolStripMenuItem";
-            this.MSDOSPromptToolStripMenuItem.Size = new System.Drawing.Size(181, 28);
+            this.MSDOSPromptToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
             this.MSDOSPromptToolStripMenuItem.Text = "StartUp";
             // 
             // EmptyToolStripMenuItem
@@ -590,7 +590,7 @@ namespace Histacom2.OS.Win98
             this.EmptyToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver;
             this.EmptyToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
             this.EmptyToolStripMenuItem.Name = "EmptyToolStripMenuItem";
-            this.EmptyToolStripMenuItem.Size = new System.Drawing.Size(116, 22);
+            this.EmptyToolStripMenuItem.Size = new System.Drawing.Size(118, 22);
             this.EmptyToolStripMenuItem.Text = "(Empty)";
             // 
             // InternetExplorerToolStripMenuItem
@@ -602,7 +602,7 @@ namespace Histacom2.OS.Win98
             this.InternetExplorerToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.InternetExplorerToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.InternetExplorerToolStripMenuItem.Name = "InternetExplorerToolStripMenuItem";
-            this.InternetExplorerToolStripMenuItem.Size = new System.Drawing.Size(181, 28);
+            this.InternetExplorerToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
             this.InternetExplorerToolStripMenuItem.Text = "Internet Explorer";
             this.InternetExplorerToolStripMenuItem.Click += new System.EventHandler(this.InternetExplorerToolStripMenuItem_Click);
             // 
@@ -615,7 +615,7 @@ namespace Histacom2.OS.Win98
             this.MSDOSPromptToolStripMenuItem1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.MSDOSPromptToolStripMenuItem1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.MSDOSPromptToolStripMenuItem1.Name = "MSDOSPromptToolStripMenuItem1";
-            this.MSDOSPromptToolStripMenuItem1.Size = new System.Drawing.Size(181, 28);
+            this.MSDOSPromptToolStripMenuItem1.Size = new System.Drawing.Size(186, 28);
             this.MSDOSPromptToolStripMenuItem1.Text = "MS-DOS Prompt";
             this.MSDOSPromptToolStripMenuItem1.Click += new System.EventHandler(this.MSDOSPromptToolStripMenuItem1_Click);
             // 
@@ -628,7 +628,7 @@ namespace Histacom2.OS.Win98
             this.OutlookExpressToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.OutlookExpressToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.OutlookExpressToolStripMenuItem.Name = "OutlookExpressToolStripMenuItem";
-            this.OutlookExpressToolStripMenuItem.Size = new System.Drawing.Size(181, 28);
+            this.OutlookExpressToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
             this.OutlookExpressToolStripMenuItem.Text = "Outlook Express";
             // 
             // WindowsExplorerToolStripMenuItem1
@@ -640,7 +640,7 @@ namespace Histacom2.OS.Win98
             this.WindowsExplorerToolStripMenuItem1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.WindowsExplorerToolStripMenuItem1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.WindowsExplorerToolStripMenuItem1.Name = "WindowsExplorerToolStripMenuItem1";
-            this.WindowsExplorerToolStripMenuItem1.Size = new System.Drawing.Size(181, 28);
+            this.WindowsExplorerToolStripMenuItem1.Size = new System.Drawing.Size(186, 28);
             this.WindowsExplorerToolStripMenuItem1.Text = "Windows Explorer";
             this.WindowsExplorerToolStripMenuItem1.Click += new System.EventHandler(this.WindowsExplorerToolStripMenuItem1_Click);
             // 
@@ -650,7 +650,7 @@ namespace Histacom2.OS.Win98
             this.GuessTheNumberToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver;
             this.GuessTheNumberToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
             this.GuessTheNumberToolStripMenuItem.Name = "GuessTheNumberToolStripMenuItem";
-            this.GuessTheNumberToolStripMenuItem.Size = new System.Drawing.Size(181, 28);
+            this.GuessTheNumberToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
             this.GuessTheNumberToolStripMenuItem.Text = "Guess The Number";
             this.GuessTheNumberToolStripMenuItem.Visible = false;
             // 
@@ -660,7 +660,7 @@ namespace Histacom2.OS.Win98
             this.StartRunnerToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver;
             this.StartRunnerToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
             this.StartRunnerToolStripMenuItem.Name = "StartRunnerToolStripMenuItem";
-            this.StartRunnerToolStripMenuItem.Size = new System.Drawing.Size(181, 28);
+            this.StartRunnerToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
             this.StartRunnerToolStripMenuItem.Text = "Start Runner";
             this.StartRunnerToolStripMenuItem.Visible = false;
             // 
@@ -670,7 +670,7 @@ namespace Histacom2.OS.Win98
             this.ErrorBlasterToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver;
             this.ErrorBlasterToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
             this.ErrorBlasterToolStripMenuItem.Name = "ErrorBlasterToolStripMenuItem";
-            this.ErrorBlasterToolStripMenuItem.Size = new System.Drawing.Size(181, 28);
+            this.ErrorBlasterToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
             this.ErrorBlasterToolStripMenuItem.Text = "Error Blaster";
             this.ErrorBlasterToolStripMenuItem.Visible = false;
             // 
@@ -680,7 +680,7 @@ namespace Histacom2.OS.Win98
             this.SkindowsToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver;
             this.SkindowsToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
             this.SkindowsToolStripMenuItem.Name = "SkindowsToolStripMenuItem";
-            this.SkindowsToolStripMenuItem.Size = new System.Drawing.Size(181, 28);
+            this.SkindowsToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
             this.SkindowsToolStripMenuItem.Text = "Skindows 95";
             this.SkindowsToolStripMenuItem.Visible = false;
             // 
@@ -690,7 +690,7 @@ namespace Histacom2.OS.Win98
             this.WebChatToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver;
             this.WebChatToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
             this.WebChatToolStripMenuItem.Name = "WebChatToolStripMenuItem";
-            this.WebChatToolStripMenuItem.Size = new System.Drawing.Size(181, 28);
+            this.WebChatToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
             this.WebChatToolStripMenuItem.Text = "Web Chat";
             this.WebChatToolStripMenuItem.Visible = false;
             // 
@@ -700,7 +700,7 @@ namespace Histacom2.OS.Win98
             this.TimeDistorterToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver;
             this.TimeDistorterToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
             this.TimeDistorterToolStripMenuItem.Name = "TimeDistorterToolStripMenuItem";
-            this.TimeDistorterToolStripMenuItem.Size = new System.Drawing.Size(181, 28);
+            this.TimeDistorterToolStripMenuItem.Size = new System.Drawing.Size(186, 28);
             this.TimeDistorterToolStripMenuItem.Text = "Time Distorter";
             this.TimeDistorterToolStripMenuItem.Visible = false;
             // 
@@ -717,7 +717,7 @@ namespace Histacom2.OS.Win98
             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.Size = new System.Drawing.Size(141, 36);
             this.DocumentsToolStripMenuItem.Text = "Documents";
             // 
             // downloaderTestToolStripMenuItem
@@ -725,7 +725,7 @@ namespace Histacom2.OS.Win98
             this.downloaderTestToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
             this.downloaderTestToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("downloaderTestToolStripMenuItem.BackgroundImage")));
             this.downloaderTestToolStripMenuItem.Name = "downloaderTestToolStripMenuItem";
-            this.downloaderTestToolStripMenuItem.Size = new System.Drawing.Size(159, 22);
+            this.downloaderTestToolStripMenuItem.Size = new System.Drawing.Size(165, 22);
             this.downloaderTestToolStripMenuItem.Text = "DownloaderTest";
             this.downloaderTestToolStripMenuItem.Click += new System.EventHandler(this.downloaderTestToolStripMenuItem_Click);
             // 
@@ -734,7 +734,7 @@ namespace Histacom2.OS.Win98
             this.installerTestToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
             this.installerTestToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("installerTestToolStripMenuItem.BackgroundImage")));
             this.installerTestToolStripMenuItem.Name = "installerTestToolStripMenuItem";
-            this.installerTestToolStripMenuItem.Size = new System.Drawing.Size(159, 22);
+            this.installerTestToolStripMenuItem.Size = new System.Drawing.Size(165, 22);
             this.installerTestToolStripMenuItem.Text = "InstallerTest";
             this.installerTestToolStripMenuItem.Click += new System.EventHandler(this.installerTestToolStripMenuItem_Click);
             // 
@@ -742,7 +742,7 @@ namespace Histacom2.OS.Win98
             // 
             this.storyTest1ToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver;
             this.storyTest1ToolStripMenuItem.Name = "storyTest1ToolStripMenuItem";
-            this.storyTest1ToolStripMenuItem.Size = new System.Drawing.Size(159, 22);
+            this.storyTest1ToolStripMenuItem.Size = new System.Drawing.Size(165, 22);
             this.storyTest1ToolStripMenuItem.Text = "StoryTest1";
             this.storyTest1ToolStripMenuItem.Click += new System.EventHandler(this.storyTest1ToolStripMenuItem_Click);
             // 
@@ -758,7 +758,7 @@ namespace Histacom2.OS.Win98
             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.Size = new System.Drawing.Size(141, 36);
             this.SettingsToolStripMenuItem.Text = "Settings";
             // 
             // ControlPanelToolStripMenuItem
@@ -767,7 +767,7 @@ namespace Histacom2.OS.Win98
             this.ControlPanelToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("ControlPanelToolStripMenuItem.BackgroundImage")));
             this.ControlPanelToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.ControlPanelToolStripMenuItem.Name = "ControlPanelToolStripMenuItem";
-            this.ControlPanelToolStripMenuItem.Size = new System.Drawing.Size(146, 22);
+            this.ControlPanelToolStripMenuItem.Size = new System.Drawing.Size(151, 22);
             this.ControlPanelToolStripMenuItem.Text = "Control Panel";
             // 
             // PrintersToolStripMenuItem
@@ -776,7 +776,7 @@ namespace Histacom2.OS.Win98
             this.PrintersToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("PrintersToolStripMenuItem.BackgroundImage")));
             this.PrintersToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.PrintersToolStripMenuItem.Name = "PrintersToolStripMenuItem";
-            this.PrintersToolStripMenuItem.Size = new System.Drawing.Size(146, 22);
+            this.PrintersToolStripMenuItem.Size = new System.Drawing.Size(151, 22);
             this.PrintersToolStripMenuItem.Text = "Printers";
             // 
             // TaskbarToolStripMenuItem
@@ -785,7 +785,7 @@ namespace Histacom2.OS.Win98
             this.TaskbarToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("TaskbarToolStripMenuItem.BackgroundImage")));
             this.TaskbarToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.TaskbarToolStripMenuItem.Name = "TaskbarToolStripMenuItem";
-            this.TaskbarToolStripMenuItem.Size = new System.Drawing.Size(146, 22);
+            this.TaskbarToolStripMenuItem.Size = new System.Drawing.Size(151, 22);
             this.TaskbarToolStripMenuItem.Text = "Taskbar";
             // 
             // FindToolStripMenuItem
@@ -803,7 +803,7 @@ namespace Histacom2.OS.Win98
             this.FindToolStripMenuItem.Name = "FindToolStripMenuItem";
             this.FindToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0);
             this.FindToolStripMenuItem.RightToLeft = System.Windows.Forms.RightToLeft.No;
-            this.FindToolStripMenuItem.Size = new System.Drawing.Size(138, 36);
+            this.FindToolStripMenuItem.Size = new System.Drawing.Size(141, 36);
             this.FindToolStripMenuItem.Text = "Find";
             // 
             // FilesOrFoldersToolStripMenuItem
@@ -812,7 +812,7 @@ namespace Histacom2.OS.Win98
             this.FilesOrFoldersToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("FilesOrFoldersToolStripMenuItem.BackgroundImage")));
             this.FilesOrFoldersToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.FilesOrFoldersToolStripMenuItem.Name = "FilesOrFoldersToolStripMenuItem";
-            this.FilesOrFoldersToolStripMenuItem.Size = new System.Drawing.Size(163, 22);
+            this.FilesOrFoldersToolStripMenuItem.Size = new System.Drawing.Size(169, 22);
             this.FilesOrFoldersToolStripMenuItem.Text = "Files or Folders...";
             // 
             // ComputerToolStripMenuItem
@@ -821,7 +821,7 @@ namespace Histacom2.OS.Win98
             this.ComputerToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("ComputerToolStripMenuItem.BackgroundImage")));
             this.ComputerToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.ComputerToolStripMenuItem.Name = "ComputerToolStripMenuItem";
-            this.ComputerToolStripMenuItem.Size = new System.Drawing.Size(163, 22);
+            this.ComputerToolStripMenuItem.Size = new System.Drawing.Size(169, 22);
             this.ComputerToolStripMenuItem.Text = "Computer...";
             // 
             // OnTheInternetToolStripMenuItem
@@ -830,7 +830,7 @@ namespace Histacom2.OS.Win98
             this.OnTheInternetToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("OnTheInternetToolStripMenuItem.BackgroundImage")));
             this.OnTheInternetToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.OnTheInternetToolStripMenuItem.Name = "OnTheInternetToolStripMenuItem";
-            this.OnTheInternetToolStripMenuItem.Size = new System.Drawing.Size(163, 22);
+            this.OnTheInternetToolStripMenuItem.Size = new System.Drawing.Size(169, 22);
             this.OnTheInternetToolStripMenuItem.Text = "On the Internet...";
             // 
             // PeopleToolStripMenuItem
@@ -839,7 +839,7 @@ namespace Histacom2.OS.Win98
             this.PeopleToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("PeopleToolStripMenuItem.BackgroundImage")));
             this.PeopleToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.PeopleToolStripMenuItem.Name = "PeopleToolStripMenuItem";
-            this.PeopleToolStripMenuItem.Size = new System.Drawing.Size(163, 22);
+            this.PeopleToolStripMenuItem.Size = new System.Drawing.Size(169, 22);
             this.PeopleToolStripMenuItem.Text = "People...";
             // 
             // HelpToolStripMenuItem
@@ -851,7 +851,7 @@ namespace Histacom2.OS.Win98
             this.HelpToolStripMenuItem.Name = "HelpToolStripMenuItem";
             this.HelpToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0);
             this.HelpToolStripMenuItem.RightToLeft = System.Windows.Forms.RightToLeft.No;
-            this.HelpToolStripMenuItem.Size = new System.Drawing.Size(138, 36);
+            this.HelpToolStripMenuItem.Size = new System.Drawing.Size(141, 36);
             this.HelpToolStripMenuItem.Text = "Help";
             // 
             // RunToolStripMenuItem
@@ -863,7 +863,7 @@ namespace Histacom2.OS.Win98
             this.RunToolStripMenuItem.Name = "RunToolStripMenuItem";
             this.RunToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0);
             this.RunToolStripMenuItem.RightToLeft = System.Windows.Forms.RightToLeft.No;
-            this.RunToolStripMenuItem.Size = new System.Drawing.Size(138, 36);
+            this.RunToolStripMenuItem.Size = new System.Drawing.Size(141, 36);
             this.RunToolStripMenuItem.Text = "Run...";
             // 
             // SuspendToolStripMenuItem
@@ -874,7 +874,7 @@ namespace Histacom2.OS.Win98
             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.Size = new System.Drawing.Size(141, 36);
             this.SuspendToolStripMenuItem.Text = "Suspend";
             // 
             // ShutdownToolStripMenuItem
@@ -885,7 +885,7 @@ namespace Histacom2.OS.Win98
             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.Size = new System.Drawing.Size(141, 36);
             this.ShutdownToolStripMenuItem.Text = "Shut Down...";
             this.ShutdownToolStripMenuItem.Click += new System.EventHandler(this.ShutdownToolStripMenuItem_Click);
             // 
@@ -894,7 +894,7 @@ namespace Histacom2.OS.Win98
             this.ossidestartmenu.Controls.Add(this.osimage);
             this.ossidestartmenu.Location = new System.Drawing.Point(0, 0);
             this.ossidestartmenu.Name = "ossidestartmenu";
-            this.ossidestartmenu.Size = new System.Drawing.Size(22, 297);
+            this.ossidestartmenu.Size = new System.Drawing.Size(21, 297);
             this.ossidestartmenu.TabIndex = 4;
             // 
             // osimage
@@ -903,7 +903,7 @@ namespace Histacom2.OS.Win98
             this.osimage.Image = global::Histacom2.Properties.Resources.Win98SideBar;
             this.osimage.Location = new System.Drawing.Point(0, 0);
             this.osimage.Name = "osimage";
-            this.osimage.Size = new System.Drawing.Size(22, 297);
+            this.osimage.Size = new System.Drawing.Size(21, 297);
             this.osimage.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
             this.osimage.TabIndex = 0;
             this.osimage.TabStop = false;
@@ -954,7 +954,7 @@ namespace Histacom2.OS.Win98
             this.PropertiesToolStripMenuItem1});
             this.rightclickbackproperties.Name = "ContextMenuStrip1";
             this.rightclickbackproperties.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional;
-            this.rightclickbackproperties.Size = new System.Drawing.Size(153, 92);
+            this.rightclickbackproperties.Size = new System.Drawing.Size(135, 70);
             // 
             // NewToolStripMenuItem1
             // 
@@ -963,14 +963,14 @@ namespace Histacom2.OS.Win98
             this.FolderToolStripMenuItem,
             this.TextDocumentToolStripMenuItem});
             this.NewToolStripMenuItem1.Name = "NewToolStripMenuItem1";
-            this.NewToolStripMenuItem1.Size = new System.Drawing.Size(152, 22);
+            this.NewToolStripMenuItem1.Size = new System.Drawing.Size(134, 22);
             this.NewToolStripMenuItem1.Text = "New";
             // 
             // FolderToolStripMenuItem
             // 
             this.FolderToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
             this.FolderToolStripMenuItem.Name = "FolderToolStripMenuItem";
-            this.FolderToolStripMenuItem.Size = new System.Drawing.Size(154, 22);
+            this.FolderToolStripMenuItem.Size = new System.Drawing.Size(161, 22);
             this.FolderToolStripMenuItem.Text = "Folder";
             this.FolderToolStripMenuItem.Click += new System.EventHandler(this.FolderToolStripMenuItem_Click);
             // 
@@ -978,15 +978,23 @@ namespace Histacom2.OS.Win98
             // 
             this.TextDocumentToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
             this.TextDocumentToolStripMenuItem.Name = "TextDocumentToolStripMenuItem";
-            this.TextDocumentToolStripMenuItem.Size = new System.Drawing.Size(154, 22);
+            this.TextDocumentToolStripMenuItem.Size = new System.Drawing.Size(161, 22);
             this.TextDocumentToolStripMenuItem.Text = "Text Document";
             this.TextDocumentToolStripMenuItem.Click += new System.EventHandler(this.TextDocumentToolStripMenuItem_Click);
             // 
+            // deleteToolStripMenuItem
+            // 
+            this.deleteToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
+            this.deleteToolStripMenuItem.Name = "deleteToolStripMenuItem";
+            this.deleteToolStripMenuItem.Size = new System.Drawing.Size(134, 22);
+            this.deleteToolStripMenuItem.Text = "Delete";
+            this.deleteToolStripMenuItem.Click += new System.EventHandler(this.deleteToolStripMenuItem_Click);
+            // 
             // PropertiesToolStripMenuItem1
             // 
             this.PropertiesToolStripMenuItem1.BackColor = System.Drawing.Color.Silver;
             this.PropertiesToolStripMenuItem1.Name = "PropertiesToolStripMenuItem1";
-            this.PropertiesToolStripMenuItem1.Size = new System.Drawing.Size(152, 22);
+            this.PropertiesToolStripMenuItem1.Size = new System.Drawing.Size(134, 22);
             this.PropertiesToolStripMenuItem1.Text = "Properties";
             // 
             // desktopupdate
@@ -995,14 +1003,6 @@ namespace Histacom2.OS.Win98
             this.desktopupdate.Interval = 5000;
             this.desktopupdate.Tick += new System.EventHandler(this.desktopupdate_Tick);
             // 
-            // deleteToolStripMenuItem
-            // 
-            this.deleteToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
-            this.deleteToolStripMenuItem.Name = "deleteToolStripMenuItem";
-            this.deleteToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
-            this.deleteToolStripMenuItem.Text = "Delete";
-            this.deleteToolStripMenuItem.Click += new System.EventHandler(this.deleteToolStripMenuItem_Click);
-            // 
             // Windows98
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
diff --git a/Histacom2/OS/Win98/Win98.resx b/Histacom2/OS/Win98/Win98.resx
index f1a458f..d94fb94 100644
--- a/Histacom2/OS/Win98/Win98.resx
+++ b/Histacom2/OS/Win98/Win98.resx
@@ -124,7 +124,7 @@
   <data name="FindToolStripMenuItem.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
+        wAAADsABataJCQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
         4AAABIQCQUtXaBsAAAAASUVORK5CYII=
 </value>
   </data>
@@ -195,7 +195,7 @@
   <data name="ScanDiskToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wAAADsABataJCQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACmSURBVDhPnZFR
+        vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACmSURBVDhPnZFR
         EsQgCEM9ukfzZl0CREmrO7uNw0ghL360ndR7v7L9X4BfBxDeVVrOmsaLQqd1DKowK7QmYwxvza4hC66H
         UpiV6IJlm+UQOnvxvg7aBAPkIWpY87rICtpkX/4SX5MgmkvnxzD4JIC3BCUGzZCEfWb9I4D3M2gDp3xY
         oXsQ9vRAYAJVbYNqAARf2M+aQa3Hr2QAdmH5TTPoDVz1BW7tA7ajvYP7sMmIAAAAAElFTkSuQmCC
@@ -238,7 +238,7 @@
   <data name="OnlineRegistrationToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wAAADsABataJCQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACzSURBVDhPhZJR
+        vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACzSURBVDhPhZJR
         EsUgCAN7dI7mzawRl1KLU2fygMimfryr9/6rcUY53FVmluDWmpoxFveViQSZuU4h72GMyMwm5AF2DPnA
         QPTM9FIOCTiMBarSI1712qeZwwbkkApejBuqLLK8h7Cb5T8HGI8QBLPq8+wdzr722FUNL7+gEsuE06MI
         qELk6T7DOhNcwTNAcuMJAZYAdQgiJAIk/kAZdr8OmCHD+5UWeRkBfKgEduUAYL/r1w0ie5EGNPvMCQAA
@@ -276,7 +276,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
+        wgAADsIBFShKgAAAAJVJREFUOE+VkQsSxCAMQj16bu4GFU3YdO2+Gaqi0F/7j96zfqKHqYiuByYBFfYJ
         1okT9uuef4slmG9gWjdzN4Wnf9bRT1RhaCN+KriGieyvkjr8Rl7AMMbywE0zCBiIBS9Awbn7tUD29xME
         Q0rM8IHhPbziKRhMU0pqjVIfcgHAfB2oiugnuEnG/EkZ/4fLZEksutHaB6sGQO/gf7MbAAAAAElFTkSu
         QmCC
@@ -285,7 +285,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
+        wgAADsIBFShKgAAAALtJREFUOE91TwESBCEI6un9vBPRYqljhtEIyUZhzTkXKo8J1ZI4P3xjlAjsqpoN
         upcBf0zA6+7r8QAxA9170IEPm6l7PWu9A1CLwNaVpSfWNEKLWCECDnkvAdFtMgBDLeHFaNaXEpQu22B9
         NsFA96i2yQlo00wejQG9VfuSCQ0IXAFAVAb468AVwJB3AHpsBFKn2uYkemh9hllezf4KcDKwtqkBpX5j
         Dyj5DRIeDDh3wD3c5AYkh2QwOMYPtAJqglssjE8AAAAASUVORK5CYII=
@@ -294,7 +294,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
+        wgAADsIBFShKgAAAAJVJREFUOE+VkIESgCAIQ/10/pwasJrlkb27nUZsoqPHPbWNlYHCN9gKMTc7O31I
         gIa0PM2EE32ErE9WNQEw1y6azbZGvkFAhnBcKMmwrQnCVI0MofA+a6UniIDYqKTx7JhBDeVaQd5fVT9m
         M4JvowbwzjNlu4C5DVBgVyll4Zo8AzrK0gfo6ZBSFq7J6g0+ePWj8EPDD0i7RXV30HOWAAAAAElFTkSu
         QmCC
@@ -303,7 +303,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
+        wgAADsIBFShKgAAAAJJJREFUOE+tkYEOgCAIRP10/tzk4FISZ7ZuuzDwnq4KJSL1aR/txc21llBfQVbh
         EZJZZ5C+nEoEcIN0QDyxLVGzm6WAsMYTvRSSAqaw2jRBloApbJUBhLVub4ABqwMY1poCuEYzhPWjRkgK
         6EP7A+obqOc2EzIBeELmtqNFDECI9R3gYmPhCPH+qX6HfAJAQ7iUCwlxft5LSoDNAAAAAElFTkSuQmCC
 </value>
@@ -311,63 +311,63 @@
   <data name="downloaderTestToolStripMenuItem.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
+        wAAADsABataJCQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
         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
+        wAAADsABataJCQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
         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
+        wAAADsABataJCQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
         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
+        wAAADsABataJCQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
         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
+        wAAADsABataJCQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
         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
+        wAAADsABataJCQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
         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
+        wAAADsABataJCQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
         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
+        wAAADsABataJCQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
         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
+        wAAADsABataJCQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
         4AAABIQCQUtXaBsAAAAASUVORK5CYII=
 </value>
   </data>
@@ -382,7 +382,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADq
-        ggAAAk1TRnQBSQFMAgEBDAEAAZABAQGQAQEBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA
+        ggAAAk1TRnQBSQFMAgEBDAEAAZgBAQGYAQEBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA
         AwABgAMAAQEBAAEgBwABAf8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A
         /wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A
         /wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8AXAAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/x8AAf8DAAH/
diff --git a/Histacom2/Resources/WinClassic/WinClassicDisplayExample.png b/Histacom2/Resources/WinClassic/WinClassicDisplayExample.png
index 63e21df..81eb443 100644
--- a/Histacom2/Resources/WinClassic/WinClassicDisplayExample.png
+++ b/Histacom2/Resources/WinClassic/WinClassicDisplayExample.png