Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master'

4 files changed, 347 insertions, 429 deletions

diff --git a/TimeHACK.Main/Program.cs b/TimeHACK.Main/Program.cs
index 673ab07..72a7291 100644
--- a/TimeHACK.Main/Program.cs
+++ b/TimeHACK.Main/Program.cs
@@ -21,7 +21,7 @@ namespace TimeHACK
 
         internal static bool nightly = true;
         internal static string gameID;
-        internal static TitleScreen title = null;
+        internal static TitleScreen title;
         public static string AddressBookSelectedFolderName;
         public static AddressBookContact AddressBookSelectedContact;
         public static string WindowsExplorerReturnPath;
@@ -34,26 +34,15 @@ namespace TimeHACK
         [STAThread]
         static void Main(string[] args)
         {
-            if (nightly == true)
-            {
-                try
-                {
-                    WebClient wc = new WebClient();
+            Application.SetCompatibleTextRenderingDefault(false);
 
-                    // Set the GameID
-                    string json = wc.DownloadString("http://ci.appveyor.com/api/projects/timehack/timehack");
-                    JObject j = JObject.Parse(JObject.Parse(json)["build"].ToString());
-                    gameID = "AppVeyor-" + j["buildNumber"].ToString();
-                }
-                catch (WebException)
-                {
-                    gameID = "AppVeyor";
-                }
-            }
-            else
-            {
-                gameID = "TimeHACK 1.1";
-            }
+            title = new TitleScreen();
+
+            gameID = "Getting AppVeyor...";
+            System.Threading.Thread getAppVeyor = new System.Threading.Thread(GetAppVeyor);
+
+            getAppVeyor.Start();
+            System.Threading.Thread.Sleep(500);
 
             //TimeHACK.Engine.GameSave.SaveData MySaveData = new TimeHACK.Engine.GameSave.SaveData()
             //{
@@ -72,9 +61,8 @@ namespace TimeHACK
 
             //MySaveData = (TimeHACK.Engine.GameSave.SaveData)JsonConvert.DeserializeObject(TheJSON, MySaveData.GetType());
             //MessageBox.Show(MySaveData.OS.ToString());
-            Application.EnableVisualStyles();
-            Application.SetCompatibleTextRenderingDefault(false);
-            Application.Run(title = new TitleScreen());
+            Application.EnableVisualStyles();           
+            Application.Run(title);
         }
 
         public static String OpenFileExplorerAsDialogAndReturnGivenPath()
@@ -100,5 +88,30 @@ namespace TimeHACK
             System.Threading.Thread.Sleep(1500);
             Application.Exit();
         }
+
+        public static void GetAppVeyor()
+        {
+            if (nightly == true)
+            {
+                try
+                {
+                    WebClient wc = new WebClient();
+
+                    // Set the GameID
+                    string json = wc.DownloadString("http://ci.appveyor.com/api/projects/timehack/timehack");
+                    JObject j = JObject.Parse(JObject.Parse(json)["build"].ToString());
+                    gameID = "AppVeyor-" + j["buildNumber"].ToString();
+                }
+                catch (WebException)
+                {
+                    gameID = "AppVeyor";
+                }
+            }
+            else
+            {
+                gameID = "TimeHACK 1.1";
+            }
+
+        }
     }
 }
diff --git a/TimeHACK.Main/TitleScreen.Designer.cs b/TimeHACK.Main/TitleScreen.Designer.cs
index cdcee85..26861fd 100644
--- a/TimeHACK.Main/TitleScreen.Designer.cs
+++ b/TimeHACK.Main/TitleScreen.Designer.cs
@@ -30,33 +30,13 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TitleScreen));
-            this.gameversion = new System.Windows.Forms.Label();
-            this.vm_mode = new System.Windows.Forms.CheckBox();
             this.vmModeTimer = new System.Windows.Forms.Timer(this.components);
-            this.panel2 = new System.Windows.Forms.Panel();
-            this.VM_Height = new System.Windows.Forms.NumericUpDown();
-            this.VM_Width = new System.Windows.Forms.NumericUpDown();
-            this.pictureBox1 = new System.Windows.Forms.PictureBox();
-            this.startbutton = new System.Windows.Forms.PictureBox();
             this.program = new System.Windows.Forms.Panel();
             this.programContent = new System.Windows.Forms.Panel();
-            this.programtopbar = new System.Windows.Forms.Panel();
-            this.maximizebutton = new System.Windows.Forms.PictureBox();
-            this.minimizebutton = new System.Windows.Forms.PictureBox();
-            this.Title = new System.Windows.Forms.Label();
-            this.closebutton = 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();
-            this.topleftcorner = new System.Windows.Forms.Panel();
-            this.left = new System.Windows.Forms.Panel();
-            this.bottom = new System.Windows.Forms.Panel();
-            this.right = new System.Windows.Forms.Panel();
-            this.top = new System.Windows.Forms.Panel();
             this.startmenu = new System.Windows.Forms.Panel();
             this.startmenuitems = new System.Windows.Forms.MenuStrip();
-            this.ProgramsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             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();
@@ -65,144 +45,43 @@
             this.ShutdownToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.ossidestartmenu = new System.Windows.Forms.Panel();
             this.osimage = new System.Windows.Forms.PictureBox();
-            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.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.toprightcorner = new System.Windows.Forms.Panel();
+            this.bottomrightcorner = new System.Windows.Forms.Panel();
+            this.bottomleftcorner = new System.Windows.Forms.Panel();
+            this.topleftcorner = new System.Windows.Forms.Panel();
+            this.updateText = new System.Windows.Forms.Timer(this.components);
             this.program.SuspendLayout();
             this.programContent.SuspendLayout();
-            this.programtopbar.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.maximizebutton)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.minimizebutton)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.closebutton)).BeginInit();
             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.SuspendLayout();
             // 
-            // 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);
-            // 
-            // 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;
-            // 
             // vmModeTimer
             // 
             this.vmModeTimer.Tick += new System.EventHandler(this.vmModeTimer_Tick);
             // 
-            // 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, 546);
-            this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(792, 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});
-            // 
-            // 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;
-            // 
-            // 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);
-            // 
             // program
             // 
             this.program.BackColor = System.Drawing.Color.Silver;
             this.program.Controls.Add(this.programContent);
-            this.program.Controls.Add(this.programtopbar);
             this.program.Controls.Add(this.toprightcorner);
             this.program.Controls.Add(this.bottomrightcorner);
             this.program.Controls.Add(this.bottomleftcorner);
             this.program.Controls.Add(this.topleftcorner);
-            this.program.Controls.Add(this.left);
-            this.program.Controls.Add(this.bottom);
-            this.program.Controls.Add(this.right);
-            this.program.Controls.Add(this.top);
             this.program.Dock = System.Windows.Forms.DockStyle.Fill;
             this.program.Location = new System.Drawing.Point(0, 0);
             this.program.Name = "program";
@@ -215,150 +94,18 @@
             this.programContent.Controls.Add(this.startmenu);
             this.programContent.Controls.Add(this.panel2);
             this.programContent.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.programContent.Location = new System.Drawing.Point(4, 22);
+            this.programContent.Location = new System.Drawing.Point(0, 0);
             this.programContent.Name = "programContent";
-            this.programContent.Size = new System.Drawing.Size(792, 574);
+            this.programContent.Size = new System.Drawing.Size(800, 600);
             this.programContent.TabIndex = 9;
             // 
-            // programtopbar
-            // 
-            this.programtopbar.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(170)))));
-            this.programtopbar.Controls.Add(this.maximizebutton);
-            this.programtopbar.Controls.Add(this.minimizebutton);
-            this.programtopbar.Controls.Add(this.Title);
-            this.programtopbar.Controls.Add(this.closebutton);
-            this.programtopbar.Dock = System.Windows.Forms.DockStyle.Top;
-            this.programtopbar.Location = new System.Drawing.Point(4, 4);
-            this.programtopbar.Name = "programtopbar";
-            this.programtopbar.Size = new System.Drawing.Size(792, 18);
-            this.programtopbar.TabIndex = 0;
-            this.programtopbar.Tag = "";
-            // 
-            // maximizebutton
-            // 
-            this.maximizebutton.Anchor = System.Windows.Forms.AnchorStyles.Right;
-            this.maximizebutton.Image = ((System.Drawing.Image)(resources.GetObject("maximizebutton.Image")));
-            this.maximizebutton.Location = new System.Drawing.Point(757, 2);
-            this.maximizebutton.Name = "maximizebutton";
-            this.maximizebutton.Size = new System.Drawing.Size(16, 14);
-            this.maximizebutton.TabIndex = 6;
-            this.maximizebutton.TabStop = false;
-            // 
-            // minimizebutton
-            // 
-            this.minimizebutton.Anchor = System.Windows.Forms.AnchorStyles.Right;
-            this.minimizebutton.Image = ((System.Drawing.Image)(resources.GetObject("minimizebutton.Image")));
-            this.minimizebutton.Location = new System.Drawing.Point(741, 2);
-            this.minimizebutton.Name = "minimizebutton";
-            this.minimizebutton.Size = new System.Drawing.Size(16, 14);
-            this.minimizebutton.TabIndex = 5;
-            this.minimizebutton.TabStop = false;
-            // 
-            // Title
-            // 
-            this.Title.AutoSize = true;
-            this.Title.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Title.ForeColor = System.Drawing.Color.White;
-            this.Title.Location = new System.Drawing.Point(2, 1);
-            this.Title.Name = "Title";
-            this.Title.Size = new System.Drawing.Size(124, 13);
-            this.Title.TabIndex = 3;
-            this.Title.Text = "TimeHACK Launcher";
-            // 
-            // closebutton
-            // 
-            this.closebutton.Anchor = System.Windows.Forms.AnchorStyles.Right;
-            this.closebutton.Image = ((System.Drawing.Image)(resources.GetObject("closebutton.Image")));
-            this.closebutton.Location = new System.Drawing.Point(775, 2);
-            this.closebutton.Name = "closebutton";
-            this.closebutton.Size = new System.Drawing.Size(16, 14);
-            this.closebutton.TabIndex = 4;
-            this.closebutton.TabStop = false;
-            this.closebutton.Click += new System.EventHandler(this.closebutton_Click_1);
-            // 
-            // toprightcorner
-            // 
-            this.toprightcorner.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.toprightcorner.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("toprightcorner.BackgroundImage")));
-            this.toprightcorner.Location = new System.Drawing.Point(796, 0);
-            this.toprightcorner.Name = "toprightcorner";
-            this.toprightcorner.Size = new System.Drawing.Size(4, 4);
-            this.toprightcorner.TabIndex = 6;
-            // 
-            // bottomrightcorner
-            // 
-            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.Name = "bottomrightcorner";
-            this.bottomrightcorner.Size = new System.Drawing.Size(4, 4);
-            this.bottomrightcorner.TabIndex = 4;
-            // 
-            // bottomleftcorner
-            // 
-            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.Name = "bottomleftcorner";
-            this.bottomleftcorner.Size = new System.Drawing.Size(4, 4);
-            this.bottomleftcorner.TabIndex = 2;
-            // 
-            // topleftcorner
-            // 
-            this.topleftcorner.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("topleftcorner.BackgroundImage")));
-            this.topleftcorner.Location = new System.Drawing.Point(0, 0);
-            this.topleftcorner.Name = "topleftcorner";
-            this.topleftcorner.Size = new System.Drawing.Size(4, 4);
-            this.topleftcorner.TabIndex = 1;
-            // 
-            // left
-            // 
-            this.left.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("left.BackgroundImage")));
-            this.left.Dock = System.Windows.Forms.DockStyle.Left;
-            this.left.Location = new System.Drawing.Point(0, 4);
-            this.left.Name = "left";
-            this.left.Size = new System.Drawing.Size(4, 592);
-            this.left.TabIndex = 3;
-            // 
-            // bottom
-            // 
-            this.bottom.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("bottom.BackgroundImage")));
-            this.bottom.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.bottom.Cursor = System.Windows.Forms.Cursors.SizeNS;
-            this.bottom.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.bottom.Location = new System.Drawing.Point(0, 596);
-            this.bottom.Name = "bottom";
-            this.bottom.Size = new System.Drawing.Size(796, 4);
-            this.bottom.TabIndex = 5;
-            // 
-            // right
-            // 
-            this.right.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("right.BackgroundImage")));
-            this.right.Cursor = System.Windows.Forms.Cursors.SizeWE;
-            this.right.Dock = System.Windows.Forms.DockStyle.Right;
-            this.right.Location = new System.Drawing.Point(796, 4);
-            this.right.Name = "right";
-            this.right.Size = new System.Drawing.Size(4, 596);
-            this.right.TabIndex = 7;
-            // 
-            // top
-            // 
-            this.top.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("top.BackgroundImage")));
-            this.top.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.top.Dock = System.Windows.Forms.DockStyle.Top;
-            this.top.Location = new System.Drawing.Point(0, 0);
-            this.top.Name = "top";
-            this.top.Size = new System.Drawing.Size(800, 4);
-            this.top.TabIndex = 8;
-            // 
             // 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, 257);
+            this.startmenu.Location = new System.Drawing.Point(0, 283);
             this.startmenu.Name = "startmenu";
             this.startmenu.Size = new System.Drawing.Size(174, 290);
             this.startmenu.TabIndex = 11;
@@ -383,6 +130,20 @@
             this.startmenuitems.TabIndex = 0;
             this.startmenuitems.Text = "StartMenu";
             // 
+            // DocumentsToolStripMenuItem
+            // 
+            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.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            this.DocumentsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.DocumentsToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Silver;
+            this.DocumentsToolStripMenuItem.Name = "DocumentsToolStripMenuItem";
+            this.DocumentsToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0);
+            this.DocumentsToolStripMenuItem.Size = new System.Drawing.Size(138, 36);
+            this.DocumentsToolStripMenuItem.Text = "New Game";
+            this.DocumentsToolStripMenuItem.Click += new System.EventHandler(this.NewGame_Click);
+            // 
             // ProgramsToolStripMenuItem
             // 
             this.ProgramsToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
@@ -398,20 +159,6 @@
             this.ProgramsToolStripMenuItem.Text = "Load Game";
             this.ProgramsToolStripMenuItem.Click += new System.EventHandler(this.LoadGame_Click);
             // 
-            // DocumentsToolStripMenuItem
-            // 
-            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.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            this.DocumentsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
-            this.DocumentsToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Silver;
-            this.DocumentsToolStripMenuItem.Name = "DocumentsToolStripMenuItem";
-            this.DocumentsToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0);
-            this.DocumentsToolStripMenuItem.Size = new System.Drawing.Size(138, 36);
-            this.DocumentsToolStripMenuItem.Text = "New Game";
-            this.DocumentsToolStripMenuItem.Click += new System.EventHandler(this.NewGame_Click);
-            // 
             // SettingsToolStripMenuItem
             // 
             this.SettingsToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
@@ -434,7 +181,7 @@
             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(152, 22);
+            this.ControlPanelToolStripMenuItem.Size = new System.Drawing.Size(146, 22);
             this.ControlPanelToolStripMenuItem.Text = "Control Panel";
             // 
             // PrintersToolStripMenuItem
@@ -443,7 +190,7 @@
             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(152, 22);
+            this.PrintersToolStripMenuItem.Size = new System.Drawing.Size(146, 22);
             this.PrintersToolStripMenuItem.Text = "Printers";
             // 
             // TaskbarToolStripMenuItem
@@ -452,7 +199,7 @@
             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(152, 22);
+            this.TaskbarToolStripMenuItem.Size = new System.Drawing.Size(146, 22);
             this.TaskbarToolStripMenuItem.Text = "Taskbar";
             // 
             // HelpToolStripMenuItem
@@ -500,6 +247,151 @@
             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});
+            // 
+            // 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);
+            // 
+            // toprightcorner
+            // 
+            this.toprightcorner.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.toprightcorner.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("toprightcorner.BackgroundImage")));
+            this.toprightcorner.Location = new System.Drawing.Point(796, 0);
+            this.toprightcorner.Name = "toprightcorner";
+            this.toprightcorner.Size = new System.Drawing.Size(4, 4);
+            this.toprightcorner.TabIndex = 6;
+            // 
+            // bottomrightcorner
+            // 
+            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.Name = "bottomrightcorner";
+            this.bottomrightcorner.Size = new System.Drawing.Size(4, 4);
+            this.bottomrightcorner.TabIndex = 4;
+            // 
+            // bottomleftcorner
+            // 
+            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.Name = "bottomleftcorner";
+            this.bottomleftcorner.Size = new System.Drawing.Size(4, 4);
+            this.bottomleftcorner.TabIndex = 2;
+            // 
+            // topleftcorner
+            // 
+            this.topleftcorner.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("topleftcorner.BackgroundImage")));
+            this.topleftcorner.Location = new System.Drawing.Point(0, 0);
+            this.topleftcorner.Name = "topleftcorner";
+            this.topleftcorner.Size = new System.Drawing.Size(4, 4);
+            this.topleftcorner.TabIndex = 1;
+            // 
+            // updateText
+            // 
+            this.updateText.Enabled = true;
+            this.updateText.Tick += new System.EventHandler(this.updateText_Tick);
+            // 
             // TitleScreen
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -512,57 +404,36 @@
             this.Tag = "ignoreFormOnTaskbar";
             this.Text = "TimeHACK Launcher";
             this.Load += new System.EventHandler(this.TitleScreen_Load);
-            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.program.ResumeLayout(false);
             this.programContent.ResumeLayout(false);
-            this.programtopbar.ResumeLayout(false);
-            this.programtopbar.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.maximizebutton)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.minimizebutton)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.closebutton)).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();
+            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.ResumeLayout(false);
 
         }
 
         #endregion
-        private System.Windows.Forms.Label gameversion;
-        private System.Windows.Forms.CheckBox vm_mode;
         private System.Windows.Forms.Timer vmModeTimer;
-        private System.Windows.Forms.Panel panel2;
-        internal System.Windows.Forms.PictureBox startbutton;
-        internal System.Windows.Forms.PictureBox pictureBox1;
-        private System.Windows.Forms.NumericUpDown VM_Height;
-        private System.Windows.Forms.NumericUpDown VM_Width;
         internal System.Windows.Forms.Panel program;
-        public System.Windows.Forms.Panel programContent;
-        public System.Windows.Forms.Panel programtopbar;
-        public System.Windows.Forms.PictureBox maximizebutton;
-        public System.Windows.Forms.PictureBox minimizebutton;
-        internal System.Windows.Forms.Label Title;
-        internal System.Windows.Forms.PictureBox closebutton;
         internal System.Windows.Forms.Panel toprightcorner;
         internal System.Windows.Forms.Panel bottomrightcorner;
         internal System.Windows.Forms.Panel bottomleftcorner;
         internal System.Windows.Forms.Panel topleftcorner;
-        internal System.Windows.Forms.Panel left;
-        internal System.Windows.Forms.Panel bottom;
-        internal System.Windows.Forms.Panel right;
-        internal System.Windows.Forms.Panel top;
+        public System.Windows.Forms.Panel programContent;
         internal System.Windows.Forms.Panel startmenu;
         internal System.Windows.Forms.MenuStrip startmenuitems;
-        internal System.Windows.Forms.ToolStripMenuItem ProgramsToolStripMenuItem;
         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;
@@ -571,5 +442,13 @@
         internal System.Windows.Forms.ToolStripMenuItem ShutdownToolStripMenuItem;
         internal System.Windows.Forms.Panel ossidestartmenu;
         internal System.Windows.Forms.PictureBox osimage;
+        private System.Windows.Forms.Panel panel2;
+        private System.Windows.Forms.NumericUpDown VM_Height;
+        private System.Windows.Forms.NumericUpDown VM_Width;
+        private System.Windows.Forms.CheckBox vm_mode;
+        internal System.Windows.Forms.PictureBox pictureBox1;
+        public System.Windows.Forms.Label gameversion;
+        internal System.Windows.Forms.PictureBox startbutton;
+        private System.Windows.Forms.Timer updateText;
     }
 }
\ No newline at end of file
diff --git a/TimeHACK.Main/TitleScreen.cs b/TimeHACK.Main/TitleScreen.cs
index 0d7ee36..0e01d4c 100644
--- a/TimeHACK.Main/TitleScreen.cs
+++ b/TimeHACK.Main/TitleScreen.cs
@@ -8,12 +8,18 @@ using TimeHACK.OS.Win98;
 using TimeHACK.Engine;
 using static TimeHACK.Engine.SaveSystem;
 using TimeHACK.SaveDialogs;
+using System.Runtime.InteropServices;
+using System.Reflection;
+using System.ComponentModel;
 
 namespace TimeHACK
 {
     public partial class TitleScreen : Form
     {
         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;
@@ -25,14 +31,56 @@ namespace TimeHACK
         public static NewGameDialog newGameBox;
         public static LoadGameDialog loadGameBox;
 
+        // Border stuff
+
+        public Boolean max = false;
+
+        public const int WM_NCLBUTTONDOWN = 0xA1;
+        public const int HT_CAPTION = 0x2;
+
+        [DllImportAttribute("user32.dll")]
+        public static extern int SendMessage(IntPtr hWnd,
+                         int Msg, int wParam, int lParam);
+        [DllImportAttribute("user32.dll")]
+        public static extern bool ReleaseCapture();
+
+
+        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);
+
+            
+        }
+
         public void StartGame()
-        {           
+        {
             //TODO: You may want to handle story stuff to decide what OS to boot here.
             if (Convert.ToInt32(VM_Width.Text) == 1337 && Convert.ToInt32(VM_Height.Text) == 1337)
             {
                 leet();
             }
-            else {
+            else
+            {
                 // Time to decide which OS to start up!
 
                 switch (CurrentSave.CurrentOS)
@@ -74,14 +122,32 @@ namespace TimeHACK
                         troubleshooter.ShowDialog();
                         break;
                 }
-                
-            }             
+
+            }
         }
 
+        void TitleBarDrag(object sender, MouseEventArgs e)
+        {
+            if (e.Button == MouseButtons.Left && max == false)
+            {
+                ReleaseCapture();
+                SendMessage(Handle, WM_NCLBUTTONDOWN, HT_CAPTION, 0);
+            }
+        }
 
-        public TitleScreen()
+        void MaximiseButton(object sender, MouseEventArgs e)
         {
-            InitializeComponent();
+            if (this.WindowState == FormWindowState.Normal)
+            {
+                this.WindowState = FormWindowState.Maximized;
+            } else {
+                this.WindowState = FormWindowState.Normal;
+            }
+        }
+
+        void closeButton(object sender, MouseEventArgs e)
+        {
+            Close();
         }
 
         private void closebutton_Click(object sender, EventArgs e)
@@ -125,7 +191,7 @@ namespace TimeHACK
 
 
             // Set GameVersion
-            gameversion.Text = "TimeHACK " + Program.gameID;
+            gameversion.Text = Program.gameID;
 
             // Initialize Font
             File.WriteAllBytes(Data + "\\LeviWindows.ttf", Resources.LeviWindows);
@@ -269,7 +335,7 @@ namespace TimeHACK
 
         private void gameversion_MouseLeave(object sender, EventArgs e)
         {
-            gameversion.Text = "TimeHACK " + Program.gameID;
+            gameversion.Text = Program.gameID;
         }
 
         private void startbutton_Click(object sender, EventArgs e)
@@ -289,5 +355,14 @@ namespace TimeHACK
         {
             Application.Exit();
         }
+
+        private void updateText_Tick(object sender, EventArgs e)
+        {
+            if (gameversion.Text != Program.gameID)
+            {
+                gameversion.Text = Program.gameID;
+                updateText.Stop();
+            }
+        }
     }
 }
diff --git a/TimeHACK.Main/TitleScreen.resx b/TimeHACK.Main/TitleScreen.resx
index 71e6763..9d7a9cb 100644
--- a/TimeHACK.Main/TitleScreen.resx
+++ b/TimeHACK.Main/TitleScreen.resx
@@ -120,7 +120,34 @@
   <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
@@ -147,9 +174,6 @@
         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
@@ -178,82 +202,9 @@
         /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
-        /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
-        /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
-        /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
-        /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
-        CmAAAiB1nzjQ0NCA0HDgwAEQBwcAygIBNTRAJNDAqAY0DbgAdg0EAUIDkEUkAGkgDTAwAACYPGiagsMD
-        PwAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="minimizebutton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAOCAIAAACpTQvdAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAA5SURBVChTY/hP
-        CmAAAiB1nzjQ0NCA0HCACDCqASqGF2DRAOKjAog4BFBDA36A0ABkEQlAGkgDDAwAKPmlWmNluNoAAAAA
-        SUVORK5CYII=
-</value>
-  </data>
-  <data name="closebutton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAOCAIAAACpTQvdAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAABcSURBVChTrY/R
-        DcAgCERvdEbrJh2lPU+SYkINRt+PSN6J4FkBhMddw8y+wFUgCbQ70OtO7OQTJLgRa/L7JWmOt8RsB8mD
-        TQ5NkFbeQcLwauzMdkjZCLAq0gJrAC8niIXaIK89FAAAAABJRU5ErkJggg==
-</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 name="updateText.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>289, 17</value>
   </metadata>
-  <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>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>47</value>
   </metadata>