7 files changed, 17 insertions, 19 deletions
diff --git a/TimeHACK.Engine/Paintbrush.cs b/TimeHACK.Engine/Paintbrush.cs
index 2b640cf..9b94ad8 100644
--- a/TimeHACK.Engine/Paintbrush.cs
+++ b/TimeHACK.Engine/Paintbrush.cs
@@ -10,8 +10,16 @@ namespace TimeHACK.Engine
 {
     public class Paintbrush
     {
-        public static void paintClassicBorders(object sender, PaintEventArgs e, int borderwidth)
+        public enum BGStyle
         {
+            NoChange,
+            Silver,
+            XP
+        }
+
+        public static void paintClassicBorders(object sender, PaintEventArgs e, int borderwidth, BGStyle bg)
+        {
+            ((Control)sender).BackColor = Color.Silver;
             ControlPaint.DrawBorder(e.Graphics, ((Control)sender).ClientRectangle,
                 SystemColors.ControlLightLight, borderwidth, ButtonBorderStyle.Outset,
                 SystemColors.ControlLightLight, borderwidth, ButtonBorderStyle.Outset,
diff --git a/TimeHACK.Main/OS/Win95/Win95.Designer.cs b/TimeHACK.Main/OS/Win95/Win95.Designer.cs
index f963251..2a39d34 100644
--- a/TimeHACK.Main/OS/Win95/Win95.Designer.cs
+++ b/TimeHACK.Main/OS/Win95/Win95.Designer.cs
@@ -223,7 +223,7 @@ namespace TimeHACK.OS.Win95
             this.startmenu.Name = "startmenu";
             this.startmenu.Size = new System.Drawing.Size(174, 300);
             this.startmenu.TabIndex = 3;
-            this.startmenu.Paint += (sender, args) => Engine.Paintbrush.paintClassicBorders(sender, args, 2);
+            this.startmenu.Paint += (sender, args) => Engine.Paintbrush.paintClassicBorders(sender, args, 2, Engine.Paintbrush.BGStyle.NoChange);
             // 
             // startmenuitems
             // 
diff --git a/TimeHACK.Main/OS/Win95/Win95.cs b/TimeHACK.Main/OS/Win95/Win95.cs
index bd706cb..a991a00 100644
--- a/TimeHACK.Main/OS/Win95/Win95.cs
+++ b/TimeHACK.Main/OS/Win95/Win95.cs
@@ -16,7 +16,6 @@ namespace TimeHACK.OS.Win95
     public partial class Windows95 : Form
     {
         private SoundPlayer startsound;
-        private SoundPlayer stopsound;
         public WindowManager wm = new WindowManager();
 
         public List<WinClassic> nonimportantapps = new List<WinClassic>();
@@ -88,22 +87,12 @@ namespace TimeHACK.OS.Win95
 
         #region StartMenu
 
-        // Paint StartMenu
-        private void startmenu_Paint(object sender, PaintEventArgs e)
-        {
-            // Paint the StartMenu
-            ControlPaint.DrawBorder(e.Graphics, startmenu.ClientRectangle,
-                SystemColors.ControlLightLight, 2, ButtonBorderStyle.Outset,
-                SystemColors.ControlLightLight, 2, ButtonBorderStyle.Outset,
-                SystemColors.ControlLightLight, 2, ButtonBorderStyle.Outset,
-                SystemColors.ControlLightLight, 2, ButtonBorderStyle.Outset);
-        }
-
         // StartButton Click
         private void startbutton_Click(object sender, EventArgs e)
         {
             startmenu.Show();
             startmenu.BringToFront();
+            if (taskbar.Visible) taskbar.BringToFront();
         }
 
         // Shutdown button
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs
index cd94306..ec87a18 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs
@@ -200,6 +200,7 @@
             this.button1.Text = "Login";
             this.button1.UseVisualStyleBackColor = true;
             this.button1.Click += new System.EventHandler(this.Button1_Click);
+            this.button1.Paint += (sender, args) => Engine.Paintbrush.paintClassicBorders(sender, args, 1, Engine.Paintbrush.BGStyle.Silver);
             // 
             // txtscreenname
             // 
diff --git a/TimeHACK.Main/OS/Win98/Win98.Designer.cs b/TimeHACK.Main/OS/Win98/Win98.Designer.cs
index d1f66dd..97ff7bf 100644
--- a/TimeHACK.Main/OS/Win98/Win98.Designer.cs
+++ b/TimeHACK.Main/OS/Win98/Win98.Designer.cs
@@ -177,7 +177,7 @@
             this.startmenu.Name = "startmenu";
             this.startmenu.Size = new System.Drawing.Size(174, 300);
             this.startmenu.TabIndex = 4;
-            this.startmenu.Paint += (sender, args) => Engine.Paintbrush.paintClassicBorders(sender, args, 2);
+            this.startmenu.Paint += (sender, args) => Engine.Paintbrush.paintClassicBorders(sender, args, 2, Engine.Paintbrush.BGStyle.NoChange);
             // 
             // startmenuitems
             // 
diff --git a/TimeHACK.Main/Program.cs b/TimeHACK.Main/Program.cs
index 72a7291..8411ae8 100644
--- a/TimeHACK.Main/Program.cs
+++ b/TimeHACK.Main/Program.cs
@@ -80,12 +80,12 @@ namespace TimeHACK
 
         public static void ShutdownApplication(System.IO.UnmanagedMemoryStream audio)
         {
-            
+            System.Threading.Thread.Sleep(500);
             System.IO.Stream audioPlay = audio;
             stopsound = new System.Media.SoundPlayer(audioPlay);
-            stopsound.Play();
+            stopsound.PlaySync();
 
-            System.Threading.Thread.Sleep(1500);
+            System.Threading.Thread.Sleep(500);
             Application.Exit();
         }
 
diff --git a/TimeHACK.Main/TitleScreen.Designer.cs b/TimeHACK.Main/TitleScreen.Designer.cs
index b71f6f3..a51a0dd 100644
--- a/TimeHACK.Main/TitleScreen.Designer.cs
+++ b/TimeHACK.Main/TitleScreen.Designer.cs
@@ -213,7 +213,7 @@
             this.startmenu.Name = "startmenu";
             this.startmenu.Size = new System.Drawing.Size(165, 187);
             this.startmenu.TabIndex = 11;
-            this.startmenu.Paint += (sender, args) => Engine.Paintbrush.paintClassicBorders(sender, args, 2);
+            this.startmenu.Paint += (sender, args) => Engine.Paintbrush.paintClassicBorders(sender, args, 2, Engine.Paintbrush.BGStyle.NoChange);
             // 
             // startmenuitems
             //