Updated my fork!

Conflicts:
	Histacom2/TitleScreen.Designer.cs
	Histacom2/TitleScreen.cs

7 files changed, 136 insertions, 68 deletions

diff --git a/Histacom2.Engine/Template/AboutBox95.Designer.cs b/Histacom2.Engine/Template/AboutBox95.Designer.cs
index 8ad5dea..c6877f6 100644
--- a/Histacom2.Engine/Template/AboutBox95.Designer.cs
+++ b/Histacom2.Engine/Template/AboutBox95.Designer.cs
@@ -100,7 +100,12 @@
             // 
             // classicButton1
             // 
+            this.classicButton1.AdaptBackColorWithTheme = true;
+            this.classicButton1.AdaptFontWithTheme = true;
+            this.classicButton1.AdaptForeColorWithTheme = true;
             this.classicButton1.BackColor = System.Drawing.Color.Silver;
+            this.classicButton1.DialogResult = System.Windows.Forms.DialogResult.None;
+            this.classicButton1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F);
             this.classicButton1.ForeColor = System.Drawing.Color.Black;
             this.classicButton1.Location = new System.Drawing.Point(251, 223);
             this.classicButton1.Name = "classicButton1";
diff --git a/Histacom2.Engine/Template/AboutBox95.cs b/Histacom2.Engine/Template/AboutBox95.cs
index a97ab1c..188cf80 100644
--- a/Histacom2.Engine/Template/AboutBox95.cs
+++ b/Histacom2.Engine/Template/AboutBox95.cs
@@ -9,6 +9,10 @@ namespace Histacom2.Engine.Template
         {
             InitializeComponent();
             this.textBox2.Text = "This product is licensed to:\r\n" + Environment.UserName + "\r\n";
+            textBox1.BackColor = SaveSystem.currentTheme.threeDObjectsColor;
+            textBox2.BackColor = SaveSystem.currentTheme.threeDObjectsColor;
+            textBox3.BackColor = SaveSystem.currentTheme.threeDObjectsColor;
+            textBox4.BackColor = SaveSystem.currentTheme.threeDObjectsColor;
         }
 
         private void classicButton1_Click(object sender, EventArgs e)
diff --git a/Histacom2.Engine/Template/WinClassic.Designer.cs b/Histacom2.Engine/Template/WinClassic.Designer.cs
index f788517..8b9497f 100644
--- a/Histacom2.Engine/Template/WinClassic.Designer.cs
+++ b/Histacom2.Engine/Template/WinClassic.Designer.cs
@@ -31,6 +31,7 @@
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WinClassic));
             this.program = new System.Windows.Forms.Panel();
             this.programContent = new System.Windows.Forms.Panel();
+            this.panel1 = new System.Windows.Forms.Panel();
             this.programtopbar = new System.Windows.Forms.Panel();
             this.programIcon = new System.Windows.Forms.PictureBox();
             this.maximizebutton = new System.Windows.Forms.PictureBox();
@@ -45,7 +46,6 @@
             this.bottom = new System.Windows.Forms.Panel();
             this.right = new System.Windows.Forms.Panel();
             this.top = new System.Windows.Forms.Panel();
-            this.panel1 = new System.Windows.Forms.Panel();
             this.program.SuspendLayout();
             this.programtopbar.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.programIcon)).BeginInit();
@@ -83,6 +83,14 @@
             this.programContent.TabIndex = 9;
             this.programContent.ControlAdded += new System.Windows.Forms.ControlEventHandler(this.programContent_ControlAdded);
             // 
+            // panel1
+            // 
+            this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.panel1.Location = new System.Drawing.Point(4, 22);
+            this.panel1.Name = "panel1";
+            this.panel1.Size = new System.Drawing.Size(292, 1);
+            this.panel1.TabIndex = 0;
+            // 
             // programtopbar
             // 
             this.programtopbar.BackColor = System.Drawing.Color.Navy;
@@ -130,6 +138,7 @@
             this.minimizebutton.Size = new System.Drawing.Size(16, 14);
             this.minimizebutton.TabIndex = 5;
             this.minimizebutton.TabStop = false;
+            this.minimizebutton.Click += new System.EventHandler(this.minimizebutton_Click);
             // 
             // Title
             // 
@@ -267,14 +276,6 @@
             this.top.MouseMove += new System.Windows.Forms.MouseEventHandler(this.top_MouseMove);
             this.top.MouseUp += new System.Windows.Forms.MouseEventHandler(this.border_MouseUp);
             // 
-            // panel1
-            // 
-            this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
-            this.panel1.Location = new System.Drawing.Point(4, 22);
-            this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(292, 1);
-            this.panel1.TabIndex = 0;
-            // 
             // WinClassic
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
diff --git a/Histacom2.Engine/Template/WinClassic.cs b/Histacom2.Engine/Template/WinClassic.cs
index 68cba3d..c911af3 100644
--- a/Histacom2.Engine/Template/WinClassic.cs
+++ b/Histacom2.Engine/Template/WinClassic.cs
@@ -88,8 +88,11 @@ namespace Histacom2.Engine.Template
             {
                 var toDraw = resizer.ToDraw;
                 if (resizable) {
-                    if (((this.Width + this.Location.X) - Cursor.Position.X) > progContent.MinimumSize.Width + 8) toDraw.Width = ((this.Width + this.Location.X) - Cursor.Position.X);
-                    if (((this.Width + this.Location.X) - Cursor.Position.X) > progContent.MinimumSize.Width + 8) toDraw.X = Cursor.Position.X;
+                    if (((this.Width + this.Location.X) - Cursor.Position.X) > progContent.MinimumSize.Width + 8)
+                    {
+                        toDraw.Width = ((this.Width + this.Location.X) - Cursor.Position.X);
+                        toDraw.X = Cursor.Position.X;
+                    }
                 }
                 resizer.ToDraw = toDraw;
             }
@@ -100,8 +103,11 @@ namespace Histacom2.Engine.Template
             if (e.Button == MouseButtons.Left)
             {
                 var toDraw = resizer.ToDraw;
-                if (resizable) toDraw.Y = this.Location.Y;
-                if (resizable) toDraw.Height = MousePosition.Y - this.Location.Y;
+                if (resizable)
+                {
+                    toDraw.Y = this.Location.Y;
+                    toDraw.Height = MousePosition.Y - this.Location.Y;
+                }
                 resizer.ToDraw = toDraw;
             }
         }
@@ -111,8 +117,13 @@ namespace Histacom2.Engine.Template
             if (e.Button == MouseButtons.Left)
             {
                 var toDraw = resizer.ToDraw;
-                if (resizable) if (MousePosition.X - this.Location.X > progContent.MinimumSize.Width + 8) toDraw.Width = MousePosition.X - this.Location.X;
-                if (resizable) toDraw.Height = MousePosition.Y - this.Location.Y;
+                if (resizable)
+                {
+                if (MousePosition.X - this.Location.X > progContent.MinimumSize.Width + 8)
+                        toDraw.Width = MousePosition.X - this.Location.X;
+                toDraw.Height = MousePosition.Y - this.Location.Y;
+                }
+
                 resizer.ToDraw = toDraw;
             }
         }
@@ -122,9 +133,15 @@ namespace Histacom2.Engine.Template
             if (e.Button == MouseButtons.Left)
             {
                 var toDraw = resizer.ToDraw;
-                if (resizable) if (((this.Width + this.Location.X) - Cursor.Position.X) > progContent.MinimumSize.Width + 8) toDraw.Width = ((toDraw.Width + toDraw.Location.X) - Cursor.Position.X);
-                if (resizable) toDraw.Height = Cursor.Position.Y - this.Location.Y;
-                if (resizable) if (((this.Width + this.Location.X) - Cursor.Position.X) > progContent.MinimumSize.Width + 8) toDraw.X = Cursor.Position.X;
+                if (resizable)
+                {
+                    if (((this.Width + this.Location.X) - Cursor.Position.X) > progContent.MinimumSize.Width + 8)
+                    {
+                        toDraw.Width = ((toDraw.Width + toDraw.Location.X) - Cursor.Position.X);
+                        toDraw.X = Cursor.Position.X;
+                    }
+                    toDraw.Height = Cursor.Position.Y - this.Location.Y;
+                }
                 resizer.ToDraw = toDraw;
             }
         }
@@ -134,10 +151,16 @@ namespace Histacom2.Engine.Template
             if (e.Button == MouseButtons.Left)
             {
                 var toDraw = resizer.ToDraw;
-                if (resizable) if (((this.Width + this.Location.X) - Cursor.Position.X) > progContent.MinimumSize.Width + 8) toDraw.Width = ((this.Width + this.Location.X) - Cursor.Position.X);
-                if (resizable) if (((this.Width + this.Location.X) - Cursor.Position.X) > progContent.MinimumSize.Width + 8) toDraw.X = Cursor.Position.X;
-                if (resizable) toDraw.Height = ((this.Height + this.Location.Y) - Cursor.Position.Y);
-                if (resizable) toDraw.Y = Cursor.Position.Y;
+                if (resizable)
+                {
+                    if (((this.Width + this.Location.X) - Cursor.Position.X) > progContent.MinimumSize.Width + 8)
+                    {
+                        toDraw.Width = ((this.Width + this.Location.X) - Cursor.Position.X);
+                        toDraw.X = Cursor.Position.X;
+                    }
+                    toDraw.Height = ((this.Height + this.Location.Y) - Cursor.Position.Y);
+                    toDraw.Y = Cursor.Position.Y;
+                }
                 resizer.ToDraw = toDraw;
             }
         }
@@ -147,8 +170,11 @@ namespace Histacom2.Engine.Template
             if(e.Button == MouseButtons.Left)
             {
                 var toDraw = resizer.ToDraw;
-                if (resizable) toDraw.Height = ((toDraw.Height + toDraw.Top) - Cursor.Position.Y);
-                if (resizable) toDraw.Y = Cursor.Position.Y;
+                if (resizable)
+                {
+                    toDraw.Height = ((toDraw.Height + toDraw.Top) - Cursor.Position.Y);
+                    toDraw.Y = Cursor.Position.Y;
+                }
                 resizer.ToDraw = toDraw;
             }
         }
@@ -158,9 +184,12 @@ namespace Histacom2.Engine.Template
             if (e.Button == MouseButtons.Left)
             {
                 var toDraw = resizer.ToDraw;
-                if (resizable) if (MousePosition.X - this.Location.X > progContent.MinimumSize.Width + 8) toDraw.Width = MousePosition.X - this.Location.X;
-                if (resizable) toDraw.Height = ((toDraw.Height + toDraw.Top) - Cursor.Position.Y);
-                if (resizable) toDraw.Y = Cursor.Position.Y;
+                if (resizable)
+                {
+                    if (MousePosition.X - this.Location.X > progContent.MinimumSize.Width + 8) toDraw.Width = MousePosition.X - this.Location.X;
+                    toDraw.Height = ((toDraw.Height + toDraw.Top) - Cursor.Position.Y);
+                    toDraw.Y = Cursor.Position.Y;
+                }
                 resizer.ToDraw = toDraw;
             }
         }
@@ -301,6 +330,11 @@ namespace Histacom2.Engine.Template
             gfx.DrawLine(new Pen(_darkBack), 0, 2, 2, 2);
         }
 
+        private void minimizebutton_Click(object sender, EventArgs e)
+        {
+            Hide();
+        }
+
         public Size prevSize;
         public Point prevPoint;
         private void maximizebutton_Click(object sender, EventArgs e)
diff --git a/Histacom2.Engine/Template/WinClassic.resx b/Histacom2.Engine/Template/WinClassic.resx
index a3848f8..ea30fa1 100644
--- a/Histacom2.Engine/Template/WinClassic.resx
+++ b/Histacom2.Engine/Template/WinClassic.resx
@@ -118,6 +118,30 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="maximizebutton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAOCAIAAACpTQvdAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        wgAADsIBFShKgAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAA+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
+        wgAADsIBFShKgAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAA5SURBVChTY/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
+        wgAADsIBFShKgAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAABcSURBVChTrY/R
+        DcAgCERvdEbrJh2lPU+SYkINRt+PSN6J4FkBhMddw8y+wFUgCbQ70OtO7OQTJLgRa/L7JWmOt8RsB8mD
+        TQ5NkFbeQcLwauzMdkjZCLAq0gJrAC8niIXaIK89FAAAAABJRU5ErkJggg==
+</value>
+  </data>
   <data name="toprightcorner.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAIAAAAmkwkpAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
@@ -174,28 +198,4 @@
         /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
-        wgAADsIBFShKgAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAA+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
-        wgAADsIBFShKgAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAA5SURBVChTY/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
-        wgAADsIBFShKgAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAABcSURBVChTrY/R
-        DcAgCERvdEbrJh2lPU+SYkINRt+PSN6J4FkBhMddw8y+wFUgCbQ70OtO7OQTJLgRa/L7JWmOt8RsB8mD
-        TQ5NkFbeQcLwauzMdkjZCLAq0gJrAC8niIXaIK89FAAAAABJRU5ErkJggg==
-</value>
-  </data>
 </root>
\ No newline at end of file
diff --git a/Histacom2.Engine/Template/WinXP.Designer.cs b/Histacom2.Engine/Template/WinXP.Designer.cs
index 0d1e060..3e1da44 100644
--- a/Histacom2.Engine/Template/WinXP.Designer.cs
+++ b/Histacom2.Engine/Template/WinXP.Designer.cs
@@ -30,8 +30,8 @@
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WinXP));
             this.program = new System.Windows.Forms.Panel();
-            this.flowLayoutPanel1 = new System.Windows.Forms.Panel();
             this.bottomleftcorner = new System.Windows.Forms.Panel();
+            this.flowLayoutPanel1 = new System.Windows.Forms.Panel();
             this.toprightcorner = new System.Windows.Forms.Panel();
             this.bottomrightcorner = new System.Windows.Forms.Panel();
             this.topleftcorner = new System.Windows.Forms.Panel();
@@ -55,8 +55,8 @@
             // program
             // 
             this.program.BackColor = System.Drawing.Color.OldLace;
-            this.program.Controls.Add(this.flowLayoutPanel1);
             this.program.Controls.Add(this.bottomleftcorner);
+            this.program.Controls.Add(this.flowLayoutPanel1);
             this.program.Controls.Add(this.toprightcorner);
             this.program.Controls.Add(this.bottomrightcorner);
             this.program.Controls.Add(this.topleftcorner);
@@ -70,23 +70,24 @@
             this.program.Size = new System.Drawing.Size(300, 300);
             this.program.TabIndex = 10;
             // 
-            // flowLayoutPanel1
-            // 
-            this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.flowLayoutPanel1.Location = new System.Drawing.Point(4, 30);
-            this.flowLayoutPanel1.Name = "flowLayoutPanel1";
-            this.flowLayoutPanel1.Size = new System.Drawing.Size(292, 266);
-            this.flowLayoutPanel1.TabIndex = 11;
-            // 
             // bottomleftcorner
             // 
             this.bottomleftcorner.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.bottomleftcorner.BackgroundImage = global::Histacom2.Engine.Properties.Resources.WinXP_BottomLeft;
+            this.bottomleftcorner.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
             this.bottomleftcorner.Location = new System.Drawing.Point(0, 296);
             this.bottomleftcorner.Name = "bottomleftcorner";
-            this.bottomleftcorner.Size = new System.Drawing.Size(5, 4);
+            this.bottomleftcorner.Size = new System.Drawing.Size(4, 4);
             this.bottomleftcorner.TabIndex = 10;
             // 
+            // flowLayoutPanel1
+            // 
+            this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.flowLayoutPanel1.Location = new System.Drawing.Point(4, 30);
+            this.flowLayoutPanel1.Name = "flowLayoutPanel1";
+            this.flowLayoutPanel1.Size = new System.Drawing.Size(292, 266);
+            this.flowLayoutPanel1.TabIndex = 11;
+            // 
             // toprightcorner
             // 
             this.toprightcorner.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@@ -120,6 +121,7 @@
             // bottom
             // 
             this.bottom.BackgroundImage = global::Histacom2.Engine.Properties.Resources.WinXP_Bottom;
+            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(4, 296);
@@ -131,6 +133,7 @@
             // 
             this.top.BackColor = System.Drawing.Color.Transparent;
             this.top.BackgroundImage = global::Histacom2.Engine.Properties.Resources.WinXP_TopBar;
+            this.top.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
             this.top.Controls.Add(this.programIcon);
             this.top.Controls.Add(this.maximizebutton);
             this.top.Controls.Add(this.minimizebutton);
@@ -178,11 +181,11 @@
             // 
             this.programname.AutoSize = true;
             this.programname.BackColor = System.Drawing.Color.Transparent;
-            this.programname.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.programname.Font = new System.Drawing.Font("Trebuchet MS", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.programname.ForeColor = System.Drawing.Color.White;
-            this.programname.Location = new System.Drawing.Point(25, 8);
+            this.programname.Location = new System.Drawing.Point(25, 6);
             this.programname.Name = "programname";
-            this.programname.Size = new System.Drawing.Size(99, 13);
+            this.programname.Size = new System.Drawing.Size(110, 18);
             this.programname.TabIndex = 3;
             this.programname.Text = "Application Title";
             this.programname.MouseDown += new System.Windows.Forms.MouseEventHandler(this.top_MouseDown);
@@ -197,6 +200,9 @@
             this.closebutton.TabIndex = 4;
             this.closebutton.TabStop = false;
             this.closebutton.Click += new System.EventHandler(this.closebutton_Click);
+            this.closebutton.MouseDown += new System.Windows.Forms.MouseEventHandler(this.closebutton_MouseDown);
+            this.closebutton.MouseEnter += new System.EventHandler(this.closebutton_MouseEnter);
+            this.closebutton.MouseLeave += new System.EventHandler(this.closebutton_MouseLeave);
             // 
             // right
             // 
@@ -221,11 +227,13 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.BackColor = System.Drawing.Color.Magenta;
             this.ClientSize = new System.Drawing.Size(300, 300);
             this.Controls.Add(this.program);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
             this.Name = "WinXP";
             this.Text = "WinXP";
+            this.TransparencyKey = System.Drawing.Color.Magenta;
             this.Load += new System.EventHandler(this.WinXP_Load);
             this.program.ResumeLayout(false);
             this.top.ResumeLayout(false);
@@ -247,13 +255,13 @@
         internal System.Windows.Forms.Panel topleftcorner;
         internal System.Windows.Forms.Panel bottom;
         internal System.Windows.Forms.Panel top;
-        internal System.Windows.Forms.PictureBox maximizebutton;
-        internal System.Windows.Forms.PictureBox minimizebutton;
         internal System.Windows.Forms.Label programname;
-        internal System.Windows.Forms.PictureBox closebutton;
         internal System.Windows.Forms.Panel right;
         internal System.Windows.Forms.Panel left;
         public System.Windows.Forms.PictureBox programIcon;
         public System.Windows.Forms.Panel flowLayoutPanel1;
+        public System.Windows.Forms.PictureBox maximizebutton;
+        public System.Windows.Forms.PictureBox minimizebutton;
+        public System.Windows.Forms.PictureBox closebutton;
     }
 }
\ No newline at end of file
diff --git a/Histacom2.Engine/Template/WinXP.cs b/Histacom2.Engine/Template/WinXP.cs
index 2f51c1c..d572fe8 100644
--- a/Histacom2.Engine/Template/WinXP.cs
+++ b/Histacom2.Engine/Template/WinXP.cs
@@ -17,6 +17,7 @@ namespace Histacom2.Engine.Template
         public WinXP()
         {
             InitializeComponent();
+            SetStyle(ControlStyles.SupportsTransparentBackColor, true);
             DoubleBuffered = true;
         }
 
@@ -44,6 +45,21 @@ namespace Histacom2.Engine.Template
             HTBOTTOMLEFT = 16,
             HTBOTTOMRIGHT = 17;
 
+        private void closebutton_MouseDown(object sender, MouseEventArgs e)
+        {
+            closebutton.BackgroundImage = Properties.Resources.WinXP_ClosePress;
+        }
+
+        private void closebutton_MouseLeave(object sender, EventArgs e)
+        {
+            closebutton.BackgroundImage = Properties.Resources.WinXP_Close;
+        }
+
+        private void closebutton_MouseEnter(object sender, EventArgs e)
+        {
+            closebutton.BackgroundImage = Properties.Resources.WinXP_CloseHover;
+        }
+
         private void closebutton_Click(object sender, EventArgs e)
         {
             if (!closeDisabled) this.Close();