Index: Core/Common/src/Core.Common.Controls/Forms/CustomToolStripRenderer.cs
===================================================================
diff -u -rc347a9390ab4b0fbf97363fa62a9ab1827ec1b69 -r819a14edd9683ae0c2f29a0d4afd1f05802f339d
--- Core/Common/src/Core.Common.Controls/Forms/CustomToolStripRenderer.cs	(.../CustomToolStripRenderer.cs)	(revision c347a9390ab4b0fbf97363fa62a9ab1827ec1b69)
+++ Core/Common/src/Core.Common.Controls/Forms/CustomToolStripRenderer.cs	(.../CustomToolStripRenderer.cs)	(revision 819a14edd9683ae0c2f29a0d4afd1f05802f339d)
@@ -21,6 +21,7 @@
 
 using System.Drawing;
 using System.Windows.Forms;
+using Core.Common.Controls.Style;
 
 namespace Core.Common.Controls.Forms
 {
@@ -37,14 +38,14 @@
                 {
                     var bounds = new Rectangle(Point.Empty, e.Item.Size);
 
-                    e.Graphics.FillRectangle(new SolidBrush(Color.FromArgb(228, 228, 223)), bounds);
-                    e.Graphics.DrawRectangle(new Pen(Color.FromArgb(210, 210, 202)), bounds);
+                    e.Graphics.FillRectangle(new SolidBrush(ColorDefinitions.ButtonBackgroundColor), bounds);
+                    e.Graphics.DrawRectangle(new Pen(ColorDefinitions.ButtonBorderColor), bounds);
 
-                    btn.ForeColor = Color.FromArgb(0, 139, 191);
+                    btn.ForeColor = ColorDefinitions.ButtonActiveFrontColor;
                 }
                 else
                 {
-                    btn.ForeColor = Color.Black;
+                    btn.ForeColor = ColorDefinitions.ButtonInactiveFrontColor;
                 }
 
                 return;
Index: Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.Designer.cs
===================================================================
diff -u -rc347a9390ab4b0fbf97363fa62a9ab1827ec1b69 -r819a14edd9683ae0c2f29a0d4afd1f05802f339d
--- Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.Designer.cs	(.../MapControl.Designer.cs)	(revision c347a9390ab4b0fbf97363fa62a9ab1827ec1b69)
+++ Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.Designer.cs	(.../MapControl.Designer.cs)	(revision 819a14edd9683ae0c2f29a0d4afd1f05802f339d)
@@ -22,6 +22,7 @@
 using System.ComponentModel;
 using System.Drawing;
 using Core.Common.Controls.Forms;
+using Core.Common.Controls.Style;
 using Core.Components.DotSpatial.Forms.Properties;
 
 namespace Core.Components.DotSpatial.Forms
@@ -59,7 +60,7 @@
             this.toolStrip.Dock = System.Windows.Forms.DockStyle.Fill;
             this.toolStrip.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;
             this.toolStrip.ImageScalingSize = new System.Drawing.Size(24, 24);
-            this.toolStrip.BackColor = Color.FromArgb(241, 241, 238);
+            this.toolStrip.BackColor = ColorDefinitions.ControlBackgroundColor;
             this.toolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.panToolStripButton,
             this.zoomToRectangleToolStripButton,
Index: Core/Components/src/Core.Components.OxyPlot.Forms/ChartControl.Designer.cs
===================================================================
diff -u -rd0777f04676946bd8e4be0bbf13d67b34c08d499 -r819a14edd9683ae0c2f29a0d4afd1f05802f339d
--- Core/Components/src/Core.Components.OxyPlot.Forms/ChartControl.Designer.cs	(.../ChartControl.Designer.cs)	(revision d0777f04676946bd8e4be0bbf13d67b34c08d499)
+++ Core/Components/src/Core.Components.OxyPlot.Forms/ChartControl.Designer.cs	(.../ChartControl.Designer.cs)	(revision 819a14edd9683ae0c2f29a0d4afd1f05802f339d)
@@ -22,6 +22,7 @@
 using System.ComponentModel;
 using System.Drawing;
 using Core.Common.Controls.Forms;
+using Core.Common.Controls.Style;
 
 namespace Core.Components.OxyPlot.Forms
 {
@@ -56,7 +57,7 @@
             this.toolStrip.Dock = System.Windows.Forms.DockStyle.Fill;
             this.toolStrip.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;
             this.toolStrip.ImageScalingSize = new System.Drawing.Size(24, 24);
-            this.toolStrip.BackColor = Color.FromArgb(241, 241, 238);
+            this.toolStrip.BackColor = ColorDefinitions.ControlBackgroundColor;
             this.toolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.panToolStripButton,
             this.zoomToRectangleToolStripButton,