buttons and window colors

8 files changed, 198 insertions, 42 deletions

diff --git a/Histacom2.Engine/Paintbrush.cs b/Histacom2.Engine/Paintbrush.cs
index 320b80d..ab84491 100644
--- a/Histacom2.Engine/Paintbrush.cs
+++ b/Histacom2.Engine/Paintbrush.cs
@@ -45,5 +45,17 @@ namespace Histacom2.Engine
             // Draw the line.
             e.Graphics.DrawLine(new Pen(foreColor), 4, height / 2, width - 4, height / 2);
         }
+
+        public static Color GetLightFromColor(Color basecolor)
+        {
+            if (basecolor == Color.FromArgb(112, 112, 112)) return Color.FromArgb(184, 184, 184);
+            return ControlPaint.Light(basecolor, 50);
+        }
+
+        public static Color GetDarkFromColor(Color basecolor)
+        {
+            if (basecolor == Color.FromArgb(112, 112, 112)) return Color.FromArgb(72, 72, 72);
+            return ControlPaint.Dark(basecolor, 50);
+        }
     }
 }
diff --git a/Histacom2.Engine/Template/Infobox95.Designer.cs b/Histacom2.Engine/Template/Infobox95.Designer.cs
index 6ee2a6a..7bb6869 100644
--- a/Histacom2.Engine/Template/Infobox95.Designer.cs
+++ b/Histacom2.Engine/Template/Infobox95.Designer.cs
@@ -29,11 +29,11 @@
         private void InitializeComponent()
         {
             this.programContent = new System.Windows.Forms.Panel();
-            this.button1 = new Histacom2.Engine.UI.ClassicButton();
-            this.button3 = new Histacom2.Engine.UI.ClassicButton();
             this.pictureBox1 = new System.Windows.Forms.PictureBox();
             this.panel1 = new System.Windows.Forms.Panel();
             this.infoText = new System.Windows.Forms.Label();
+            this.button1 = new Histacom2.Engine.UI.ClassicButton();
+            this.button3 = new Histacom2.Engine.UI.ClassicButton();
             this.button2 = new Histacom2.Engine.UI.ClassicButton();
             this.programContent.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
@@ -54,31 +54,7 @@
             this.programContent.Size = new System.Drawing.Size(413, 118);
             this.programContent.TabIndex = 10;
             this.programContent.Tag = "gnoreFormOnTaskbar";
-            // 
-            // button1
-            // 
-            this.button1.BackColor = System.Drawing.Color.Silver;
-            this.button1.ForeColor = System.Drawing.Color.Black;
-            this.button1.Location = new System.Drawing.Point(150, 84);
-            this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(80, 23);
-            this.button1.TabIndex = 6;
-            this.button1.Text = "Yes";
-            this.button1.Click += new System.EventHandler(this.button1_Click);
-            // 
-            // button3
-            // 
-            this.button3.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.button3.BackColor = System.Drawing.Color.Silver;
-            this.button3.ForeColor = System.Drawing.Color.Black;
-            this.button3.Location = new System.Drawing.Point(323, 84);
-            this.button3.Name = "button3";
-            this.button3.Size = new System.Drawing.Size(80, 23);
-            this.button3.TabIndex = 4;
-            this.button3.Text = "Cancel";
-            this.button3.Click += new System.EventHandler(this.button3_Click);
+            this.programContent.Paint += new System.Windows.Forms.PaintEventHandler(this.programContent_Paint);
             // 
             // pictureBox1
             // 
@@ -108,6 +84,31 @@
             this.infoText.TabIndex = 0;
             this.infoText.Text = "label1";
             // 
+            // button1
+            // 
+            this.button1.BackColor = System.Drawing.Color.Silver;
+            this.button1.ForeColor = System.Drawing.Color.Black;
+            this.button1.Location = new System.Drawing.Point(150, 84);
+            this.button1.Name = "button1";
+            this.button1.Size = new System.Drawing.Size(80, 23);
+            this.button1.TabIndex = 6;
+            this.button1.Text = "Yes";
+            this.button1.Click += new System.EventHandler(this.button1_Click);
+            // 
+            // button3
+            // 
+            this.button3.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.button3.BackColor = System.Drawing.Color.Silver;
+            this.button3.ForeColor = System.Drawing.Color.Black;
+            this.button3.Location = new System.Drawing.Point(323, 84);
+            this.button3.Name = "button3";
+            this.button3.Size = new System.Drawing.Size(80, 23);
+            this.button3.TabIndex = 4;
+            this.button3.Text = "Cancel";
+            this.button3.Click += new System.EventHandler(this.button3_Click);
+            // 
             // button2
             // 
             this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
diff --git a/Histacom2.Engine/Template/Infobox95.cs b/Histacom2.Engine/Template/Infobox95.cs
index dca45bb..9214461 100644
--- a/Histacom2.Engine/Template/Infobox95.cs
+++ b/Histacom2.Engine/Template/Infobox95.cs
@@ -13,6 +13,8 @@ namespace Histacom2.Engine.Template
         public Infobox95(InfoboxType type, InfoboxButtons btns)
         {
             InitializeComponent();
+            this.BackColor = SaveSystem.currentTheme.threeDObjectsColor;
+            this.programContent.BackColor = SaveSystem.currentTheme.threeDObjectsColor;
 
             switch (type)
             {
@@ -63,6 +65,12 @@ namespace Histacom2.Engine.Template
         {
             if (btnStatus == 0) this.ParentForm.Close();
         }
+
+        private void programContent_Paint(object sender, PaintEventArgs e)
+        {
+            this.BackColor = SaveSystem.currentTheme.threeDObjectsColor;
+            this.programContent.BackColor = SaveSystem.currentTheme.threeDObjectsColor;
+        }
     }
 
     public enum InfoboxType
diff --git a/Histacom2.Engine/Template/WinClassic.Designer.cs b/Histacom2.Engine/Template/WinClassic.Designer.cs
index 593cfd6..bacce99 100644
--- a/Histacom2.Engine/Template/WinClassic.Designer.cs
+++ b/Histacom2.Engine/Template/WinClassic.Designer.cs
@@ -79,6 +79,7 @@
             this.programContent.Name = "programContent";
             this.programContent.Size = new System.Drawing.Size(292, 274);
             this.programContent.TabIndex = 9;
+            this.programContent.ControlAdded += new System.Windows.Forms.ControlEventHandler(this.programContent_ControlAdded);
             // 
             // programtopbar
             // 
@@ -160,6 +161,7 @@
             this.toprightcorner.Name = "toprightcorner";
             this.toprightcorner.Size = new System.Drawing.Size(4, 4);
             this.toprightcorner.TabIndex = 6;
+            this.toprightcorner.Paint += new System.Windows.Forms.PaintEventHandler(this.toprightcorner_Paint);
             this.toprightcorner.MouseDown += new System.Windows.Forms.MouseEventHandler(this.border_MouseDown);
             this.toprightcorner.MouseMove += new System.Windows.Forms.MouseEventHandler(this.toprightcorner_MouseMove);
             this.toprightcorner.MouseUp += new System.Windows.Forms.MouseEventHandler(this.border_MouseUp);
@@ -173,6 +175,7 @@
             this.bottomrightcorner.Name = "bottomrightcorner";
             this.bottomrightcorner.Size = new System.Drawing.Size(4, 4);
             this.bottomrightcorner.TabIndex = 4;
+            this.bottomrightcorner.Paint += new System.Windows.Forms.PaintEventHandler(this.bottomrightcorner_Paint);
             this.bottomrightcorner.MouseDown += new System.Windows.Forms.MouseEventHandler(this.border_MouseDown);
             this.bottomrightcorner.MouseMove += new System.Windows.Forms.MouseEventHandler(this.bottomrightcorner_MouseMove);
             this.bottomrightcorner.MouseUp += new System.Windows.Forms.MouseEventHandler(this.border_MouseUp);
@@ -186,6 +189,7 @@
             this.bottomleftcorner.Name = "bottomleftcorner";
             this.bottomleftcorner.Size = new System.Drawing.Size(4, 4);
             this.bottomleftcorner.TabIndex = 2;
+            this.bottomleftcorner.Paint += new System.Windows.Forms.PaintEventHandler(this.bottomleftcorner_Paint);
             this.bottomleftcorner.MouseDown += new System.Windows.Forms.MouseEventHandler(this.border_MouseDown);
             this.bottomleftcorner.MouseMove += new System.Windows.Forms.MouseEventHandler(this.bottomleftcorner_MouseMove);
             this.bottomleftcorner.MouseUp += new System.Windows.Forms.MouseEventHandler(this.border_MouseUp);
@@ -198,6 +202,7 @@
             this.topleftcorner.Name = "topleftcorner";
             this.topleftcorner.Size = new System.Drawing.Size(4, 4);
             this.topleftcorner.TabIndex = 1;
+            this.topleftcorner.Paint += new System.Windows.Forms.PaintEventHandler(this.topleftcorner_Paint);
             this.topleftcorner.MouseDown += new System.Windows.Forms.MouseEventHandler(this.border_MouseDown);
             this.topleftcorner.MouseMove += new System.Windows.Forms.MouseEventHandler(this.topleftcorner_MouseMove);
             this.topleftcorner.MouseUp += new System.Windows.Forms.MouseEventHandler(this.border_MouseUp);
@@ -211,6 +216,7 @@
             this.left.Name = "left";
             this.left.Size = new System.Drawing.Size(4, 292);
             this.left.TabIndex = 3;
+            this.left.Paint += new System.Windows.Forms.PaintEventHandler(this.left_Paint);
             this.left.MouseDown += new System.Windows.Forms.MouseEventHandler(this.border_MouseDown);
             this.left.MouseMove += new System.Windows.Forms.MouseEventHandler(this.left_MouseMove);
             this.left.MouseUp += new System.Windows.Forms.MouseEventHandler(this.border_MouseUp);
@@ -225,6 +231,7 @@
             this.bottom.Name = "bottom";
             this.bottom.Size = new System.Drawing.Size(296, 4);
             this.bottom.TabIndex = 5;
+            this.bottom.Paint += new System.Windows.Forms.PaintEventHandler(this.bottom_Paint);
             this.bottom.MouseDown += new System.Windows.Forms.MouseEventHandler(this.border_MouseDown);
             this.bottom.MouseMove += new System.Windows.Forms.MouseEventHandler(this.bottom_MouseMove);
             this.bottom.MouseUp += new System.Windows.Forms.MouseEventHandler(this.border_MouseUp);
@@ -238,6 +245,7 @@
             this.right.Name = "right";
             this.right.Size = new System.Drawing.Size(4, 296);
             this.right.TabIndex = 7;
+            this.right.Paint += new System.Windows.Forms.PaintEventHandler(this.right_Paint);
             this.right.MouseDown += new System.Windows.Forms.MouseEventHandler(this.border_MouseDown);
             this.right.MouseMove += new System.Windows.Forms.MouseEventHandler(this.right_MouseMove);
             this.right.MouseUp += new System.Windows.Forms.MouseEventHandler(this.border_MouseUp);
@@ -252,6 +260,7 @@
             this.top.Name = "top";
             this.top.Size = new System.Drawing.Size(300, 4);
             this.top.TabIndex = 8;
+            this.top.Paint += new System.Windows.Forms.PaintEventHandler(this.top_Paint);
             this.top.MouseDown += new System.Windows.Forms.MouseEventHandler(this.border_MouseDown);
             this.top.MouseMove += new System.Windows.Forms.MouseEventHandler(this.top_MouseMove);
             this.top.MouseUp += new System.Windows.Forms.MouseEventHandler(this.border_MouseUp);
diff --git a/Histacom2.Engine/Template/WinClassic.cs b/Histacom2.Engine/Template/WinClassic.cs
index 20e66f0..c1c7fe1 100644
--- a/Histacom2.Engine/Template/WinClassic.cs
+++ b/Histacom2.Engine/Template/WinClassic.cs
@@ -11,6 +11,7 @@ namespace Histacom2.Engine.Template
         {
             InitializeComponent();
             DoubleBuffered = true;
+            programContent.BackColor = SaveSystem.currentTheme.threeDObjectsColor;
         }
 
         public Font fnt;
@@ -207,6 +208,105 @@ namespace Histacom2.Engine.Template
 
 
         public bool max = false;
+
+        private void bottom_Paint(object sender, PaintEventArgs e)
+        {
+            var gfx = e.Graphics;
+            gfx.Clear(SaveSystem.currentTheme.threeDObjectsColor);
+
+            var _darkBack = Paintbrush.GetDarkFromColor(SaveSystem.currentTheme.threeDObjectsColor);
+
+            gfx.DrawLine(Pens.Black, 0, 3, bottom.Width, 3);
+            gfx.DrawLine(new Pen(_darkBack), 0, 2, bottom.Width, 2);
+        }
+
+        private void bottomleftcorner_Paint(object sender, PaintEventArgs e)
+        {
+            var gfx = e.Graphics;
+            gfx.Clear(SaveSystem.currentTheme.threeDObjectsColor);
+
+            var _lightBack = Paintbrush.GetLightFromColor(SaveSystem.currentTheme.threeDObjectsColor);
+            var _darkBack = Paintbrush.GetDarkFromColor(SaveSystem.currentTheme.threeDObjectsColor);
+
+            gfx.DrawLine(Pens.Black, 0, 3, 3, 3);
+            gfx.DrawLine(new Pen(_darkBack), 1, 2, 3, 2);
+            gfx.DrawLine(new Pen(_lightBack), 1, 0, 1, 1);
+        }
+
+        private void left_Paint(object sender, PaintEventArgs e)
+        {
+            var gfx = e.Graphics;
+            gfx.Clear(SaveSystem.currentTheme.threeDObjectsColor);
+
+            var _lightBack = Paintbrush.GetLightFromColor(SaveSystem.currentTheme.threeDObjectsColor);
+
+            gfx.DrawLine(new Pen(_lightBack), 1, 0, 1, left.Height);
+        }
+
+        private void programContent_ControlAdded(object sender, ControlEventArgs e)
+        {
+            e.Control.BackColor = SaveSystem.currentTheme.threeDObjectsColor;
+            e.Control.Invalidate();
+        }
+
+        private void topleftcorner_Paint(object sender, PaintEventArgs e)
+        {
+            var gfx = e.Graphics;
+            gfx.Clear(SaveSystem.currentTheme.threeDObjectsColor);
+
+            var _lightBack = Paintbrush.GetLightFromColor(SaveSystem.currentTheme.threeDObjectsColor);
+
+            gfx.DrawLine(new Pen(_lightBack), 1, 3, 1, 1);
+            gfx.DrawLine(new Pen(_lightBack), 1, 1, 3, 1);
+        }
+
+        private void top_Paint(object sender, PaintEventArgs e)
+        {
+            var gfx = e.Graphics;
+            gfx.Clear(SaveSystem.currentTheme.threeDObjectsColor);
+
+            var _lightBack = Paintbrush.GetLightFromColor(SaveSystem.currentTheme.threeDObjectsColor);
+
+            gfx.DrawLine(new Pen(_lightBack), 0, 1, top.Width, 1);
+        }
+
+        private void toprightcorner_Paint(object sender, PaintEventArgs e)
+        {
+            var gfx = e.Graphics;
+            gfx.Clear(SaveSystem.currentTheme.threeDObjectsColor);
+
+            var _lightBack = Paintbrush.GetLightFromColor(SaveSystem.currentTheme.threeDObjectsColor);
+            var _darkBack = Paintbrush.GetDarkFromColor(SaveSystem.currentTheme.threeDObjectsColor);
+
+            gfx.DrawLine(new Pen(_lightBack), 0, 1, 1, 1);
+            gfx.DrawLine(new Pen(_darkBack), 2, 1, 2, 3);
+            gfx.DrawLine(Pens.Black, 3, 0, 3, 3);
+        }
+
+        private void right_Paint(object sender, PaintEventArgs e)
+        {
+            var gfx = e.Graphics;
+            gfx.Clear(SaveSystem.currentTheme.threeDObjectsColor);
+
+            var _darkBack = Paintbrush.GetDarkFromColor(SaveSystem.currentTheme.threeDObjectsColor);
+
+            gfx.DrawLine(Pens.Black, 3, 0, 3, bottom.Width);
+            gfx.DrawLine(new Pen(_darkBack), 2, 0, 2, bottom.Width);
+        }
+
+        private void bottomrightcorner_Paint(object sender, PaintEventArgs e)
+        {
+            var gfx = e.Graphics;
+            gfx.Clear(SaveSystem.currentTheme.threeDObjectsColor);
+
+            var _darkBack = Paintbrush.GetDarkFromColor(SaveSystem.currentTheme.threeDObjectsColor);
+
+            gfx.DrawLine(Pens.Black, 3, 0, 3, 3);
+            gfx.DrawLine(Pens.Black, 0, 3, 3, 3);
+            gfx.DrawLine(new Pen(_darkBack), 2, 0, 2, 2);
+            gfx.DrawLine(new Pen(_darkBack), 0, 2, 2, 2);
+        }
+
         public Size prevSize;
         public Point prevPoint;
         private void maximizebutton_Click(object sender, EventArgs e)
diff --git a/Histacom2.Engine/Template/WinClassic.resx b/Histacom2.Engine/Template/WinClassic.resx
index 6876b17..a3848f8 100644
--- a/Histacom2.Engine/Template/WinClassic.resx
+++ b/Histacom2.Engine/Template/WinClassic.resx
@@ -121,63 +121,63 @@
   <data name="toprightcorner.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAIAAAAmkwkpAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAdSURBVBhXYzh8
+        wgAADsIBFShKgAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAdSURBVBhXYzh8
         /DQEMQDBfzBo6+oDcSDCGBwGBgAJoRsoKGRD1QAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="bottomrightcorner.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAIAAAAmkwkpAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAdSURBVBhXYzh8
+        wgAADsIBFShKgAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAdSURBVBhXYzh8
         /DQQtXX1MQABCgdIQRCIgwAMDABm/hFrLt/K7gAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="bottomleftcorner.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAIAAAAmkwkpAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAdSURBVBhXYzh8
+        wgAADsIBFShKgAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAdSURBVBhXYzh8
         /PT///+BJBBhcNq6+iCIAQEYGACcHRsocGQwIQAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="topleftcorner.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAIAAAAmkwkpAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAaSURBVBhXYzh8
+        wgAADsIBFShKgAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAaSURBVBhXYzh8
         /DQcgTj/YQDKQZEBcY6fBgAaSCiZEc9BxAAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="left.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAQAAAABCAIAAAB2XpiaAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAUSURBVBhXYzh8
+        wgAADsIBFShKgAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAUSURBVBhXYzh8
         /PT///+B5OHjpwFB1wn9nx9JYgAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="bottom.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAEAAAAECAIAAADAusJtAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAVSURBVBhXYzh8
+        wgAADsIBFShKgAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAVSURBVBhXYzh8
         /DQYt3X1MTAwMAAAQaQGSbsObiQAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="right.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAQAAAABCAIAAAB2XpiaAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAUSURBVBhXYzh8
+        wgAADsIBFShKgAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAUSURBVBhXYzh8
         /DQQtXX1MTAwAAA0WgZJrWm8iAAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="top.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAEAAAAECAIAAADAusJtAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAVSURBVBhXYzh8
+        wgAADsIBFShKgAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAVSURBVBhXYzh8
         /DTD////wfTh46cBUSgJ/bC/izUAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="maximizebutton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAOCAIAAACpTQvdAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAA+SURBVChTY/hP
+        wgAADsIBFShKgAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAA+SURBVChTY/hP
         CmAAAiB1nzjQ0NCA0HDgwAEQBwcAygIBNTRAJNDAqAY0DbgAdg0EAUIDkEUkAGkgDTAwAACYPGiagsMD
         PwAAAABJRU5ErkJggg==
 </value>
@@ -185,7 +185,7 @@
   <data name="minimizebutton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAOCAIAAACpTQvdAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAA5SURBVChTY/hP
+        wgAADsIBFShKgAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAA5SURBVChTY/hP
         CmAAAiB1nzjQ0NCA0HCACDCqASqGF2DRAOKjAog4BFBDA36A0ABkEQlAGkgDDAwAKPmlWmNluNoAAAAA
         SUVORK5CYII=
 </value>
@@ -193,7 +193,7 @@
   <data name="closebutton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAOCAIAAACpTQvdAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAABcSURBVChTrY/R
+        wgAADsIBFShKgAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAABcSURBVChTrY/R
         DcAgCERvdEbrJh2lPU+SYkINRt+PSN6J4FkBhMddw8y+wFUgCbQ70OtO7OQTJLgRa/L7JWmOt8RsB8mD
         TQ5NkFbeQcLwauzMdkjZCLAq0gJrAC8niIXaIK89FAAAAABJRU5ErkJggg==
 </value>
diff --git a/Histacom2.Engine/Theme.cs b/Histacom2.Engine/Theme.cs
index 579f42e..8aa9dcf 100644
--- a/Histacom2.Engine/Theme.cs
+++ b/Histacom2.Engine/Theme.cs
@@ -22,6 +22,8 @@ namespace Histacom2.Engine
         public Color threeDObjectsColor { get; set; }
         public Color threeDObjectsTextColor { get; set; }
 
+        public Font buttonFont { get; set; }
+
         public Color activeTitleBarColor { get; set; }
         public Color activeTitleTextColor { get; set; }
         public Color inactiveTitleBarColor { get; set; }
@@ -48,6 +50,8 @@ namespace Histacom2.Engine
             threeDObjectsColor = Color.Silver;
             threeDObjectsTextColor = Color.Black;
 
+            buttonFont = new Font("Microsoft Sans Serif", 8.25F, FontStyle.Regular);
+
             activeTitleBarColor = Color.Navy;
             activeTitleTextColor = Color.White;
             inactiveTitleBarColor = Color.Gray;
@@ -74,6 +78,8 @@ namespace Histacom2.Engine
             threeDObjectsColor = Color.Silver;
             threeDObjectsTextColor = Color.Black;
 
+            buttonFont = new Font("Microsoft Sans Serif", 8.25F, FontStyle.Regular);
+
             activeTitleBarColor = Color.Navy;
             activeTitleTextColor = Color.White;
             inactiveTitleBarColor = Color.Gray;
@@ -97,6 +103,11 @@ namespace Histacom2.Engine
             progErrorSound = Properties.Resources.Win95PlusDangerousCreaturesProgError;
             questionSound = Properties.Resources.Win95PlusDangerousCreaturesQuestion;
 
+            threeDObjectsColor = Color.FromArgb(112, 112, 112);
+            threeDObjectsTextColor = Color.Black;
+
+            buttonFont = new Font("Microsoft Sans Serif", 8.25F, FontStyle.Bold);
+
             activeTitleBarColor = Color.Teal;
             activeTitleTextColor = Color.White;
             inactiveTitleBarColor = Color.FromArgb(72, 72, 72);
diff --git a/Histacom2.Engine/UI/ClassicButton.cs b/Histacom2.Engine/UI/ClassicButton.cs
index e82a742..717a6ce 100644
--- a/Histacom2.Engine/UI/ClassicButton.cs
+++ b/Histacom2.Engine/UI/ClassicButton.cs
@@ -10,8 +10,9 @@ namespace Histacom2.Engine.UI
 {
     public class ClassicButton : Control
     {
-        private Color _lightBack = Color.White;
-        private Color _darkBack = Color.Gray;
+        private Color _lightBack;
+        private Color _darkBack;
+        private Font _font;
 
         private bool _pressing = false;
 
@@ -25,17 +26,31 @@ namespace Histacom2.Engine.UI
             if (SaveSystem.currentTheme != null) ForeColor = SaveSystem.currentTheme.threeDObjectsTextColor;
             else ForeColor = Color.Black;
 
+            if (SaveSystem.currentTheme != null) _font = SaveSystem.currentTheme.buttonFont;
+            else _font = new Font("Microsoft Sans Serif", 8.25F, FontStyle.Regular);
+
             MouseDown += (s, e) => { _pressing = true; Invalidate(); };
             MouseUp += (s, e) => { _pressing = false; Invalidate(); };
+            Invalidate();
         }
 
         protected override void OnPaint(PaintEventArgs e)
         {
             base.OnPaint(e);
+
+            if (SaveSystem.currentTheme != null) BackColor = SaveSystem.currentTheme.threeDObjectsColor;
+            else BackColor = Color.Silver;
+
+            _lightBack = Paintbrush.GetLightFromColor(BackColor);
+            _darkBack = Paintbrush.GetDarkFromColor(BackColor);
+
             var g = e.Graphics;
             g.Clear(BackColor);
 
             g.TextRenderingHint = System.Drawing.Text.TextRenderingHint.SingleBitPerPixelGridFit;
+            StringFormat sf = new StringFormat();
+            sf.Alignment = StringAlignment.Center;
+            sf.HotkeyPrefix = System.Drawing.Text.HotkeyPrefix.Show;
             
             if (_pressing)
             {
@@ -44,7 +59,7 @@ namespace Histacom2.Engine.UI
                 g.FillRectangle(new SolidBrush(_darkBack), new Rectangle(1, 1, Width - 2, Height - 2));
                 g.FillRectangle(new SolidBrush(BackColor), new Rectangle(2, 2, Width - 3, Height - 3));
 
-                g.DrawString(Text, Font, new SolidBrush(ForeColor), (Width / 2) - (g.MeasureString(Text, Font).Width / 2) + 1, (Height / 2) - (g.MeasureString(Text, Font).Height / 2) + 1);
+                g.DrawString(Text, _font, new SolidBrush(ForeColor), ((Width / 2) + 1) + Padding.Left, (Height / 2) - (g.MeasureString(Text, Font).Height / 2) + 3, sf);
             }
             else
             {
@@ -53,7 +68,7 @@ namespace Histacom2.Engine.UI
                 g.FillRectangle(new SolidBrush(_darkBack), new Rectangle(1, 1, Width - 2, Height - 2));
                 g.FillRectangle(new SolidBrush(BackColor), new Rectangle(1, 1, Width - 3, Height - 3));
 
-                g.DrawString(Text, Font, new SolidBrush(ForeColor), (Width / 2) - (g.MeasureString(Text, Font).Width / 2), (Height / 2) - (g.MeasureString(Text, Font).Height / 2));
+                g.DrawString(Text, _font, new SolidBrush(ForeColor), (Width / 2) + Padding.Left, (Height / 2) - (g.MeasureString(Text, Font).Height / 2) + 2, sf);
             }
         }