diff --git a/source/ShiftUI/Theming/ShiftOS.cs b/source/ShiftUI/Theming/ShiftOS.cs
index 1004a45..00e9b1a 100644
--- a/source/ShiftUI/Theming/ShiftOS.cs
+++ b/source/ShiftUI/Theming/ShiftOS.cs
@@ -17,6 +17,7 @@ namespace ShiftUI.ShiftOS
         #endregion
 
         #region Global
+        public Color SelectionHighlight = Color.Black;
         public string DefaultFont = "Microsoft Sans Serif";
         public Color VisualStyleBorderColor = Color.Black;
         public int VisualStyleBorderWidth = 2;
@@ -36,6 +37,13 @@ namespace ShiftUI.ShiftOS
         public Color Border3DBottomRightInner = Color.Gray;
         #endregion
 
+        #region CheckBox
+        public Color CheckBoxCheckColor = Color.Black;
+        public Color CheckBoxBorderColor = Color.Black;
+        public Color CheckBoxBackgroundColor = Color.White;
+        public int CheckBoxBorderWidth = 2;
+        #endregion
+
         #region MessageBox
         public Color MessageBox_BottomPanel = Color.Gray;
         #endregion
diff --git a/source/ShiftUI/Theming/ThemeSkinnable.cs b/source/ShiftUI/Theming/ThemeSkinnable.cs
index ede3aa9..6772251 100644
--- a/source/ShiftUI/Theming/ThemeSkinnable.cs
+++ b/source/ShiftUI/Theming/ThemeSkinnable.cs
@@ -3141,20 +3141,20 @@ namespace ShiftUI
                     int scale = Math.Max(1, rect_checkrect.Width / 12);
 
                     // set the checkbox background
-                    dc.FillRectangle(SystemBrushes.Window,
+                    dc.FillRectangle(new SolidBrush(Application.CurrentSkin.CheckBoxBackgroundColor),
                               rect_checkrect);
                     // define a rectangle inside the border area
                     Rectangle rect = new Rectangle(rect_checkrect.X + 2,
                                     rect_checkrect.Y + 2,
                                     rect_checkrect.Width - 4,
                                     rect_checkrect.Height - 4);
-                    Pen pen = ResPool.GetSizedPen(this.ColorWindowText, 2);
+                    Pen pen = new Pen(new SolidBrush(Application.CurrentSkin.CheckBoxBorderColor), Application.CurrentSkin.CheckBoxBorderWidth);
                     dc.DrawRectangle(pen, rect);
 
                     // Need to draw a check-mark
                     if (item.Checked)
                     {
-                        Pen check_pen = ResPool.GetSizedPen(this.ColorWindowText, 1);
+                        Pen check_pen = new Pen(new SolidBrush(Application.CurrentSkin.CheckBoxCheckColor), 1);
                         // adjustments to get the check-mark at the right place
                         rect.X++; rect.Y++;
                         // following logic is taken from DrawFrameControl method
@@ -3235,7 +3235,7 @@ namespace ShiftUI
             }
 
             if (item.Selected && control.Focused)
-                dc.FillRectangle(SystemBrushes.Highlight, highlight_rect);
+                dc.FillRectangle(new SolidBrush(Application.CurrentSkin.SelectionHighlight), highlight_rect);
             else if (item.Selected && !control.HideSelection)
                 dc.FillRectangle(SystemBrushes.Control, highlight_rect);
             else
diff --git a/source/WindowsFormsApplication1/ShiftOS.csproj b/source/WindowsFormsApplication1/ShiftOS.csproj
index 3e2d172..f794b02 100644
--- a/source/WindowsFormsApplication1/ShiftOS.csproj
+++ b/source/WindowsFormsApplication1/ShiftOS.csproj
@@ -63,7 +63,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="ShiftUI">
-      <HintPath>..\..\..\Project-Circle\ShiftUI\bin\Debug\ShiftUI.dll</HintPath>
+      <HintPath>..\ShiftUI\bin\Debug\ShiftUI.dll</HintPath>
     </Reference>
     <Reference Include="Svg, Version=2.1.0.28187, Culture=neutral, PublicKeyToken=12a0bac221edeae2, processorArchitecture=MSIL">
       <HintPath>..\packages\Svg.2.1.0\lib\Svg.dll</HintPath>