improved launcher

9 files changed, 199 insertions, 224 deletions

diff --git a/TimeHACK.Main/OS/Win98/Win98.Designer.cs b/TimeHACK.Main/OS/Win98/Win98.Designer.cs
index 255a97a..72f6e10 100644
--- a/TimeHACK.Main/OS/Win98/Win98.Designer.cs
+++ b/TimeHACK.Main/OS/Win98/Win98.Designer.cs
@@ -879,7 +879,7 @@
             // osimage
             // 
             this.osimage.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.osimage.Image = global::TimeHACK.Properties.Resources.Win95SideBar;
+            this.osimage.Image = global::TimeHACK.Properties.Resources.Win98SideBar;
             this.osimage.Location = new System.Drawing.Point(0, 0);
             this.osimage.Name = "osimage";
             this.osimage.Size = new System.Drawing.Size(26, 297);
diff --git a/TimeHACK.Main/Properties/Resources.Designer.cs b/TimeHACK.Main/Properties/Resources.Designer.cs
index f05a298..9646755 100644
--- a/TimeHACK.Main/Properties/Resources.Designer.cs
+++ b/TimeHACK.Main/Properties/Resources.Designer.cs
@@ -156,6 +156,16 @@ namespace TimeHACK.Properties {
         }
         
         /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap LauncherSideBar {
+            get {
+                object obj = ResourceManager.GetObject("LauncherSideBar", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized resource of type System.Byte[].
         /// </summary>
         internal static byte[] LeviWindows {
@@ -436,6 +446,16 @@ namespace TimeHACK.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
+        internal static System.Drawing.Bitmap Win98SideBar {
+            get {
+                object obj = ResourceManager.GetObject("Win98SideBar", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
         internal static System.Drawing.Bitmap WinClassicAbout95 {
             get {
                 object obj = ResourceManager.GetObject("WinClassicAbout95", resourceCulture);
diff --git a/TimeHACK.Main/Properties/Resources.resx b/TimeHACK.Main/Properties/Resources.resx
index e2ac293..f865599 100644
--- a/TimeHACK.Main/Properties/Resources.resx
+++ b/TimeHACK.Main/Properties/Resources.resx
@@ -501,4 +501,10 @@
   }
 }</value>
   </data>
+  <data name="Win98SideBar" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\WinClassic\Win98SideBar.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="LauncherSideBar" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\WinClassic\LauncherSideBar.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/TimeHACK.Main/Resources/WinClassic/LauncherSideBar.png b/TimeHACK.Main/Resources/WinClassic/LauncherSideBar.png
new file mode 100644
index 0000000..657666f
--- /dev/null
+++ b/TimeHACK.Main/Resources/WinClassic/LauncherSideBar.png
diff --git a/TimeHACK.Main/Resources/WinClassic/Win98SideBar.png b/TimeHACK.Main/Resources/WinClassic/Win98SideBar.png
new file mode 100644
index 0000000..5451da3
--- /dev/null
+++ b/TimeHACK.Main/Resources/WinClassic/Win98SideBar.png
diff --git a/TimeHACK.Main/TimeHACK.Main.csproj b/TimeHACK.Main/TimeHACK.Main.csproj
index f17eb29..a6e4459 100644
--- a/TimeHACK.Main/TimeHACK.Main.csproj
+++ b/TimeHACK.Main/TimeHACK.Main.csproj
@@ -413,6 +413,7 @@
     <None Include="Resources\WinClassic\AIMbuddyjoin.wav" />
     <None Include="Resources\WinClassic\AIMbuddyleave.wav" />
     <None Include="Resources\WinClassic\AIMfile.wav" />
+    <None Include="Resources\WinClassic\LauncherSideBar.png" />
     <Content Include="Resources\WinClassic\TrueColor.png" />
     <None Include="Resources\WinClassic\Win95Info.png" />
     <None Include="Resources\WinClassic\Win95Error.png" />
@@ -423,6 +424,7 @@
     <None Include="Resources\WinClassic\WinClassicAddressBookNewIcon.png" />
     <None Include="Resources\WinClassic\WinClassicAddressBookPropertiesIcon.png" />
     <None Include="Resources\WinClassic\WinClassicAddressBookDeleteIcon.png" />
+    <None Include="Resources\WinClassic\Win98SideBar.png" />
     <Content Include="Resources\WinClassic\WinClassicClock.png" />
     <Content Include="Resources\WinClassic\WinClassicComputer.png" />
     <None Include="Resources\WinClassic\WinClassicCopy.png" />
diff --git a/TimeHACK.Main/TitleScreen.Designer.cs b/TimeHACK.Main/TitleScreen.Designer.cs
index 26861fd..774f7aa 100644
--- a/TimeHACK.Main/TitleScreen.Designer.cs
+++ b/TimeHACK.Main/TitleScreen.Designer.cs
@@ -33,25 +33,23 @@
             this.vmModeTimer = new System.Windows.Forms.Timer(this.components);
             this.program = new System.Windows.Forms.Panel();
             this.programContent = new System.Windows.Forms.Panel();
+            this.panel2 = new System.Windows.Forms.Panel();
+            this.VM_Height = new System.Windows.Forms.NumericUpDown();
+            this.VM_Width = new System.Windows.Forms.NumericUpDown();
+            this.vm_mode = new System.Windows.Forms.CheckBox();
+            this.pictureBox1 = new System.Windows.Forms.PictureBox();
+            this.gameversion = new System.Windows.Forms.Label();
+            this.startbutton = new System.Windows.Forms.PictureBox();
             this.startmenu = new System.Windows.Forms.Panel();
             this.startmenuitems = new System.Windows.Forms.MenuStrip();
             this.DocumentsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.ProgramsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.SettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.ControlPanelToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.PrintersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.TaskbarToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.HelpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.ShutdownToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.ossidestartmenu = new System.Windows.Forms.Panel();
             this.osimage = new System.Windows.Forms.PictureBox();
-            this.panel2 = new System.Windows.Forms.Panel();
-            this.VM_Height = new System.Windows.Forms.NumericUpDown();
-            this.VM_Width = new System.Windows.Forms.NumericUpDown();
-            this.vm_mode = new System.Windows.Forms.CheckBox();
-            this.pictureBox1 = new System.Windows.Forms.PictureBox();
-            this.gameversion = new System.Windows.Forms.Label();
-            this.startbutton = new System.Windows.Forms.PictureBox();
+            this.pictureBox2 = new System.Windows.Forms.PictureBox();
             this.toprightcorner = new System.Windows.Forms.Panel();
             this.bottomrightcorner = new System.Windows.Forms.Panel();
             this.bottomleftcorner = new System.Windows.Forms.Panel();
@@ -59,15 +57,16 @@
             this.updateText = new System.Windows.Forms.Timer(this.components);
             this.program.SuspendLayout();
             this.programContent.SuspendLayout();
-            this.startmenu.SuspendLayout();
-            this.startmenuitems.SuspendLayout();
-            this.ossidestartmenu.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.osimage)).BeginInit();
             this.panel2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.VM_Height)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.VM_Width)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.startbutton)).BeginInit();
+            this.startmenu.SuspendLayout();
+            this.startmenuitems.SuspendLayout();
+            this.ossidestartmenu.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.osimage)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
             this.SuspendLayout();
             // 
             // vmModeTimer
@@ -85,30 +84,136 @@
             this.program.Dock = System.Windows.Forms.DockStyle.Fill;
             this.program.Location = new System.Drawing.Point(0, 0);
             this.program.Name = "program";
-            this.program.Size = new System.Drawing.Size(800, 600);
+            this.program.Size = new System.Drawing.Size(800, 450);
             this.program.TabIndex = 11;
             // 
             // programContent
             // 
             this.programContent.BackColor = System.Drawing.Color.Teal;
-            this.programContent.Controls.Add(this.startmenu);
             this.programContent.Controls.Add(this.panel2);
+            this.programContent.Controls.Add(this.startmenu);
+            this.programContent.Controls.Add(this.pictureBox2);
             this.programContent.Dock = System.Windows.Forms.DockStyle.Fill;
             this.programContent.Location = new System.Drawing.Point(0, 0);
             this.programContent.Name = "programContent";
-            this.programContent.Size = new System.Drawing.Size(800, 600);
+            this.programContent.Size = new System.Drawing.Size(800, 450);
             this.programContent.TabIndex = 9;
             // 
+            // panel2
+            // 
+            this.panel2.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("panel2.BackgroundImage")));
+            this.panel2.Controls.Add(this.VM_Height);
+            this.panel2.Controls.Add(this.VM_Width);
+            this.panel2.Controls.Add(this.vm_mode);
+            this.panel2.Controls.Add(this.pictureBox1);
+            this.panel2.Controls.Add(this.gameversion);
+            this.panel2.Controls.Add(this.startbutton);
+            this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.panel2.Location = new System.Drawing.Point(0, 422);
+            this.panel2.Name = "panel2";
+            this.panel2.Size = new System.Drawing.Size(800, 28);
+            this.panel2.TabIndex = 10;
+            // 
+            // VM_Height
+            // 
+            this.VM_Height.Location = new System.Drawing.Point(658, 5);
+            this.VM_Height.Maximum = new decimal(new int[] {
+            2160,
+            0,
+            0,
+            0});
+            this.VM_Height.Minimum = new decimal(new int[] {
+            480,
+            0,
+            0,
+            0});
+            this.VM_Height.Name = "VM_Height";
+            this.VM_Height.Size = new System.Drawing.Size(50, 20);
+            this.VM_Height.TabIndex = 15;
+            this.VM_Height.Value = new decimal(new int[] {
+            480,
+            0,
+            0,
+            0});
+            // 
+            // VM_Width
+            // 
+            this.VM_Width.Location = new System.Drawing.Point(605, 5);
+            this.VM_Width.Maximum = new decimal(new int[] {
+            3840,
+            0,
+            0,
+            0});
+            this.VM_Width.Minimum = new decimal(new int[] {
+            640,
+            0,
+            0,
+            0});
+            this.VM_Width.Name = "VM_Width";
+            this.VM_Width.Size = new System.Drawing.Size(50, 20);
+            this.VM_Width.TabIndex = 14;
+            this.VM_Width.Value = new decimal(new int[] {
+            640,
+            0,
+            0,
+            0});
+            // 
+            // vm_mode
+            // 
+            this.vm_mode.AutoSize = true;
+            this.vm_mode.BackColor = System.Drawing.Color.Transparent;
+            this.vm_mode.ForeColor = System.Drawing.Color.Black;
+            this.vm_mode.Location = new System.Drawing.Point(712, 7);
+            this.vm_mode.Name = "vm_mode";
+            this.vm_mode.Size = new System.Drawing.Size(72, 17);
+            this.vm_mode.TabIndex = 4;
+            this.vm_mode.Text = "VM Mode";
+            this.vm_mode.UseVisualStyleBackColor = false;
+            // 
+            // pictureBox1
+            // 
+            this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
+            this.pictureBox1.Location = new System.Drawing.Point(603, 0);
+            this.pictureBox1.Name = "pictureBox1";
+            this.pictureBox1.Size = new System.Drawing.Size(187, 28);
+            this.pictureBox1.TabIndex = 13;
+            this.pictureBox1.TabStop = false;
+            // 
+            // gameversion
+            // 
+            this.gameversion.AutoSize = true;
+            this.gameversion.BackColor = System.Drawing.Color.Transparent;
+            this.gameversion.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.gameversion.Location = new System.Drawing.Point(25, 8);
+            this.gameversion.Name = "gameversion";
+            this.gameversion.Size = new System.Drawing.Size(78, 13);
+            this.gameversion.TabIndex = 0;
+            this.gameversion.Text = "gameversion";
+            this.gameversion.Click += new System.EventHandler(this.startbutton_Click);
+            this.gameversion.MouseLeave += new System.EventHandler(this.gameversion_MouseLeave);
+            this.gameversion.MouseHover += new System.EventHandler(this.gameversion_MouseHover);
+            // 
+            // startbutton
+            // 
+            this.startbutton.Image = ((System.Drawing.Image)(resources.GetObject("startbutton.Image")));
+            this.startbutton.Location = new System.Drawing.Point(2, 4);
+            this.startbutton.Name = "startbutton";
+            this.startbutton.Size = new System.Drawing.Size(279, 22);
+            this.startbutton.TabIndex = 12;
+            this.startbutton.TabStop = false;
+            this.startbutton.Click += new System.EventHandler(this.startbutton_Click);
+            // 
             // startmenu
             // 
             this.startmenu.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.startmenu.BackColor = System.Drawing.Color.Silver;
             this.startmenu.Controls.Add(this.startmenuitems);
             this.startmenu.Controls.Add(this.ossidestartmenu);
-            this.startmenu.Location = new System.Drawing.Point(0, 283);
+            this.startmenu.Location = new System.Drawing.Point(0, 238);
             this.startmenu.Name = "startmenu";
-            this.startmenu.Size = new System.Drawing.Size(174, 290);
+            this.startmenu.Size = new System.Drawing.Size(165, 187);
             this.startmenu.TabIndex = 11;
+            this.startmenu.Paint += new System.Windows.Forms.PaintEventHandler(this.startmenu_Paint);
             // 
             // startmenuitems
             // 
@@ -121,12 +226,12 @@
             this.HelpToolStripMenuItem,
             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(23, 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.Padding = new System.Windows.Forms.Padding(4, 2, 0, 0);
             this.startmenuitems.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;
-            this.startmenuitems.Size = new System.Drawing.Size(145, 184);
+            this.startmenuitems.Size = new System.Drawing.Size(143, 184);
             this.startmenuitems.TabIndex = 0;
             this.startmenuitems.Text = "StartMenu";
             // 
@@ -134,7 +239,7 @@
             // 
             this.DocumentsToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
             this.DocumentsToolStripMenuItem.BackgroundImage = global::TimeHACK.Properties.Resources.sliversilver;
-            this.DocumentsToolStripMenuItem.Image = global::TimeHACK.Properties.Resources.WinClassicDocuments;
+            this.DocumentsToolStripMenuItem.Image = global::TimeHACK.Properties.Resources.WinClassicPrograms;
             this.DocumentsToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.DocumentsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.DocumentsToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Silver;
@@ -149,7 +254,7 @@
             this.ProgramsToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
             this.ProgramsToolStripMenuItem.BackgroundImage = global::TimeHACK.Properties.Resources.sliversilver;
             this.ProgramsToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
-            this.ProgramsToolStripMenuItem.Image = global::TimeHACK.Properties.Resources.WinClassicPrograms;
+            this.ProgramsToolStripMenuItem.Image = global::TimeHACK.Properties.Resources.WinClassicDocuments;
             this.ProgramsToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.ProgramsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.ProgramsToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Silver;
@@ -162,10 +267,6 @@
             // SettingsToolStripMenuItem
             // 
             this.SettingsToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
-            this.SettingsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.ControlPanelToolStripMenuItem,
-            this.PrintersToolStripMenuItem,
-            this.TaskbarToolStripMenuItem});
             this.SettingsToolStripMenuItem.Image = global::TimeHACK.Properties.Resources.WinClassicSettings;
             this.SettingsToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.SettingsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
@@ -175,33 +276,6 @@
             this.SettingsToolStripMenuItem.Size = new System.Drawing.Size(138, 36);
             this.SettingsToolStripMenuItem.Text = "Settings";
             // 
-            // ControlPanelToolStripMenuItem
-            // 
-            this.ControlPanelToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
-            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.Text = "Control Panel";
-            // 
-            // PrintersToolStripMenuItem
-            // 
-            this.PrintersToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
-            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.Text = "Printers";
-            // 
-            // TaskbarToolStripMenuItem
-            // 
-            this.TaskbarToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
-            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.Text = "Taskbar";
-            // 
             // HelpToolStripMenuItem
             // 
             this.HelpToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
@@ -231,125 +305,33 @@
             // ossidestartmenu
             // 
             this.ossidestartmenu.Controls.Add(this.osimage);
-            this.ossidestartmenu.Location = new System.Drawing.Point(0, 0);
+            this.ossidestartmenu.Location = new System.Drawing.Point(2, 2);
             this.ossidestartmenu.Name = "ossidestartmenu";
-            this.ossidestartmenu.Size = new System.Drawing.Size(26, 297);
+            this.ossidestartmenu.Size = new System.Drawing.Size(21, 184);
             this.ossidestartmenu.TabIndex = 4;
             // 
             // osimage
             // 
             this.osimage.BackColor = System.Drawing.Color.Gray;
             this.osimage.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.osimage.Image = global::TimeHACK.Properties.Resources.LauncherSideBar;
             this.osimage.Location = new System.Drawing.Point(0, 0);
             this.osimage.Name = "osimage";
-            this.osimage.Size = new System.Drawing.Size(26, 297);
+            this.osimage.Size = new System.Drawing.Size(21, 184);
             this.osimage.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
             this.osimage.TabIndex = 0;
             this.osimage.TabStop = false;
             // 
-            // panel2
-            // 
-            this.panel2.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("panel2.BackgroundImage")));
-            this.panel2.Controls.Add(this.VM_Height);
-            this.panel2.Controls.Add(this.VM_Width);
-            this.panel2.Controls.Add(this.vm_mode);
-            this.panel2.Controls.Add(this.pictureBox1);
-            this.panel2.Controls.Add(this.gameversion);
-            this.panel2.Controls.Add(this.startbutton);
-            this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.panel2.Location = new System.Drawing.Point(0, 572);
-            this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(800, 28);
-            this.panel2.TabIndex = 10;
-            // 
-            // VM_Height
-            // 
-            this.VM_Height.Location = new System.Drawing.Point(658, 5);
-            this.VM_Height.Maximum = new decimal(new int[] {
-            2160,
-            0,
-            0,
-            0});
-            this.VM_Height.Minimum = new decimal(new int[] {
-            480,
-            0,
-            0,
-            0});
-            this.VM_Height.Name = "VM_Height";
-            this.VM_Height.Size = new System.Drawing.Size(50, 20);
-            this.VM_Height.TabIndex = 15;
-            this.VM_Height.Value = new decimal(new int[] {
-            480,
-            0,
-            0,
-            0});
+            // pictureBox2
             // 
-            // VM_Width
-            // 
-            this.VM_Width.Location = new System.Drawing.Point(605, 5);
-            this.VM_Width.Maximum = new decimal(new int[] {
-            3840,
-            0,
-            0,
-            0});
-            this.VM_Width.Minimum = new decimal(new int[] {
-            640,
-            0,
-            0,
-            0});
-            this.VM_Width.Name = "VM_Width";
-            this.VM_Width.Size = new System.Drawing.Size(50, 20);
-            this.VM_Width.TabIndex = 14;
-            this.VM_Width.Value = new decimal(new int[] {
-            640,
-            0,
-            0,
-            0});
-            // 
-            // vm_mode
-            // 
-            this.vm_mode.AutoSize = true;
-            this.vm_mode.BackColor = System.Drawing.Color.Transparent;
-            this.vm_mode.ForeColor = System.Drawing.Color.Black;
-            this.vm_mode.Location = new System.Drawing.Point(712, 7);
-            this.vm_mode.Name = "vm_mode";
-            this.vm_mode.Size = new System.Drawing.Size(72, 17);
-            this.vm_mode.TabIndex = 4;
-            this.vm_mode.Text = "VM Mode";
-            this.vm_mode.UseVisualStyleBackColor = false;
-            // 
-            // pictureBox1
-            // 
-            this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
-            this.pictureBox1.Location = new System.Drawing.Point(603, 0);
-            this.pictureBox1.Name = "pictureBox1";
-            this.pictureBox1.Size = new System.Drawing.Size(187, 28);
-            this.pictureBox1.TabIndex = 13;
-            this.pictureBox1.TabStop = false;
-            // 
-            // gameversion
-            // 
-            this.gameversion.AutoSize = true;
-            this.gameversion.BackColor = System.Drawing.Color.Transparent;
-            this.gameversion.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.gameversion.Location = new System.Drawing.Point(25, 8);
-            this.gameversion.Name = "gameversion";
-            this.gameversion.Size = new System.Drawing.Size(78, 13);
-            this.gameversion.TabIndex = 0;
-            this.gameversion.Text = "gameversion";
-            this.gameversion.Click += new System.EventHandler(this.startbutton_Click);
-            this.gameversion.MouseLeave += new System.EventHandler(this.gameversion_MouseLeave);
-            this.gameversion.MouseHover += new System.EventHandler(this.gameversion_MouseHover);
-            // 
-            // startbutton
-            // 
-            this.startbutton.Image = ((System.Drawing.Image)(resources.GetObject("startbutton.Image")));
-            this.startbutton.Location = new System.Drawing.Point(2, 4);
-            this.startbutton.Name = "startbutton";
-            this.startbutton.Size = new System.Drawing.Size(279, 22);
-            this.startbutton.TabIndex = 12;
-            this.startbutton.TabStop = false;
-            this.startbutton.Click += new System.EventHandler(this.startbutton_Click);
+            this.pictureBox2.BackColor = System.Drawing.Color.Transparent;
+            this.pictureBox2.Image = global::TimeHACK.Properties.Resources.TimeHACK_Logo;
+            this.pictureBox2.Location = new System.Drawing.Point(29, 12);
+            this.pictureBox2.Name = "pictureBox2";
+            this.pictureBox2.Size = new System.Drawing.Size(755, 350);
+            this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+            this.pictureBox2.TabIndex = 12;
+            this.pictureBox2.TabStop = false;
             // 
             // toprightcorner
             // 
@@ -365,7 +347,7 @@
             this.bottomrightcorner.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.bottomrightcorner.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("bottomrightcorner.BackgroundImage")));
             this.bottomrightcorner.Cursor = System.Windows.Forms.Cursors.SizeNWSE;
-            this.bottomrightcorner.Location = new System.Drawing.Point(796, 596);
+            this.bottomrightcorner.Location = new System.Drawing.Point(796, 446);
             this.bottomrightcorner.Name = "bottomrightcorner";
             this.bottomrightcorner.Size = new System.Drawing.Size(4, 4);
             this.bottomrightcorner.TabIndex = 4;
@@ -374,7 +356,7 @@
             // 
             this.bottomleftcorner.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.bottomleftcorner.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("bottomleftcorner.BackgroundImage")));
-            this.bottomleftcorner.Location = new System.Drawing.Point(0, 596);
+            this.bottomleftcorner.Location = new System.Drawing.Point(0, 446);
             this.bottomleftcorner.Name = "bottomleftcorner";
             this.bottomleftcorner.Size = new System.Drawing.Size(4, 4);
             this.bottomleftcorner.TabIndex = 2;
@@ -397,27 +379,27 @@
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.Teal;
-            this.ClientSize = new System.Drawing.Size(800, 600);
+            this.ClientSize = new System.Drawing.Size(800, 400);
             this.Controls.Add(this.program);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
             this.Name = "TitleScreen";
             this.Tag = "ignoreFormOnTaskbar";
             this.Text = "TimeHACK Launcher";
             this.Load += new System.EventHandler(this.TitleScreen_Load);
             this.program.ResumeLayout(false);
             this.programContent.ResumeLayout(false);
-            this.startmenu.ResumeLayout(false);
-            this.startmenu.PerformLayout();
-            this.startmenuitems.ResumeLayout(false);
-            this.startmenuitems.PerformLayout();
-            this.ossidestartmenu.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.osimage)).EndInit();
             this.panel2.ResumeLayout(false);
             this.panel2.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.VM_Height)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.VM_Width)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.startbutton)).EndInit();
+            this.startmenu.ResumeLayout(false);
+            this.startmenu.PerformLayout();
+            this.startmenuitems.ResumeLayout(false);
+            this.startmenuitems.PerformLayout();
+            this.ossidestartmenu.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.osimage)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -435,9 +417,6 @@
         internal System.Windows.Forms.ToolStripMenuItem DocumentsToolStripMenuItem;
         internal System.Windows.Forms.ToolStripMenuItem ProgramsToolStripMenuItem;
         internal System.Windows.Forms.ToolStripMenuItem SettingsToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem ControlPanelToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem PrintersToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem TaskbarToolStripMenuItem;
         internal System.Windows.Forms.ToolStripMenuItem HelpToolStripMenuItem;
         internal System.Windows.Forms.ToolStripMenuItem ShutdownToolStripMenuItem;
         internal System.Windows.Forms.Panel ossidestartmenu;
@@ -450,5 +429,6 @@
         public System.Windows.Forms.Label gameversion;
         internal System.Windows.Forms.PictureBox startbutton;
         private System.Windows.Forms.Timer updateText;
+        private System.Windows.Forms.PictureBox pictureBox2;
     }
 }
\ No newline at end of file
diff --git a/TimeHACK.Main/TitleScreen.cs b/TimeHACK.Main/TitleScreen.cs
index 0e01d4c..d23c1d3 100644
--- a/TimeHACK.Main/TitleScreen.cs
+++ b/TimeHACK.Main/TitleScreen.cs
@@ -18,8 +18,6 @@ namespace TimeHACK
     {
         public static System.Drawing.Text.PrivateFontCollection pfc = new System.Drawing.Text.PrivateFontCollection();
 
-        TimeHACK.Engine.Template.WinClassic borders = new TimeHACK.Engine.Template.WinClassic();
-
         public static Windows95 frm95;
         public static Windows98 frm98;
         public static string username;
@@ -48,28 +46,16 @@ namespace TimeHACK
         public TitleScreen()
         {
             InitializeComponent();
+        }
 
-            // Add the WINDOWS BORDERS from the Window Manager
-
-            FieldInfo f1 = typeof(Control).GetField("EventMouseDown",
-    BindingFlags.Static | BindingFlags.NonPublic);
-            object obj = f1.GetValue(borders.programtopbar);
-            PropertyInfo pi = borders.programtopbar.GetType().GetProperty("Events",
-                BindingFlags.NonPublic | BindingFlags.Instance);
-            EventHandlerList list = (EventHandlerList)pi.GetValue(borders.programtopbar, null);
-            list.RemoveHandler(obj, list[obj]);
-
-            borders.programtopbar.MouseDown += new MouseEventHandler(TitleBarDrag);
-            borders.programtopbar.Controls.Find("closebutton", false)[0].MouseClick += new MouseEventHandler(closeButton);
-            borders.programtopbar.Controls.Find("maximizebutton", false)[0].MouseClick += new MouseEventHandler(MaximiseButton);
-            
-            this.Controls.Add(borders.programtopbar);
-            this.Controls.Add(borders.top);
-            this.Controls.Add(borders.right);
-            this.Controls.Add(borders.left);
-            this.Controls.Add(borders.bottom);
-
-            
+        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);
         }
 
         public void StartGame()
@@ -199,6 +185,11 @@ namespace TimeHACK
             pfc.AddFontFile(Data + "\\LeviWindows.ttf");
             pfc.AddFontFile(Data + "\\windows_command_prompt.ttf");
             gameversion.Font = new Font(pfc.Families[0], 16F, FontStyle.Bold, GraphicsUnit.Point, (0));
+            ProgramsToolStripMenuItem.Font = new Font(pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0)));
+            DocumentsToolStripMenuItem.Font = new Font(pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0)));
+            SettingsToolStripMenuItem.Font = new Font(pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0)));
+            HelpToolStripMenuItem.Font = new Font(pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0)));
+            ShutdownToolStripMenuItem.Font = new Font(pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0)));
 
             // Start the VM Mode timer
             vmModeTimer.Start();
diff --git a/TimeHACK.Main/TitleScreen.resx b/TimeHACK.Main/TitleScreen.resx
index 9d7a9cb..1deb438 100644
--- a/TimeHACK.Main/TitleScreen.resx
+++ b/TimeHACK.Main/TitleScreen.resx
@@ -120,34 +120,7 @@
   <metadata name="vmModeTimer.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>153, 17</value>
-  </metadata>
-  <metadata name="startmenuitems.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>153, 17</value>
-  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="ControlPanelToolStripMenuItem.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
-        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
-        4AAABIQCQUtXaBsAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="TaskbarToolStripMenuItem.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw
-        4AAABIQCQUtXaBsAAAAASUVORK5CYII=
-</value>
-  </data>
   <data name="panel2.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAMAAAAcCAIAAAArypKmAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
@@ -174,6 +147,9 @@
         tdwAAAAASUVORK5CYII=
 </value>
   </data>
+  <metadata name="startmenuitems.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>153, 17</value>
+  </metadata>
   <data name="toprightcorner.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAIAAAAmkwkpAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO