diff --git a/Switch_Toolbox_Library/Forms/Custom/STContextMenuStrip.cs b/Switch_Toolbox_Library/Forms/Custom/STContextMenuStrip.cs
index 83fef31b..93f1a58e 100644
--- a/Switch_Toolbox_Library/Forms/Custom/STContextMenuStrip.cs
+++ b/Switch_Toolbox_Library/Forms/Custom/STContextMenuStrip.cs
@@ -43,7 +43,7 @@ namespace Toolbox.Library.Forms
                 return ((MenuRenderer)this.Renderer).HighlightMenuBar;
             }
             set {
-                if (Renderer == null || !(Renderer is MenuRenderer))
+                if (Renderer != null && (Renderer is MenuRenderer))
                     ((MenuRenderer)this.Renderer).HighlightMenuBar = value;
             }
         }
diff --git a/Switch_Toolbox_Library/Forms/Custom/STToolStrip.cs b/Switch_Toolbox_Library/Forms/Custom/STToolStrip.cs
index 508c84cf..f579b123 100644
--- a/Switch_Toolbox_Library/Forms/Custom/STToolStrip.cs
+++ b/Switch_Toolbox_Library/Forms/Custom/STToolStrip.cs
@@ -40,7 +40,7 @@ namespace Toolbox.Library.Forms
             }
             set
             {
-                if (Renderer != null || !(Renderer is MenuRenderer))
+                if (Renderer != null && Renderer is MenuRenderer)
                     ((MenuRenderer)this.Renderer).HighlightMenuBar = value;
             }
         }
@@ -113,8 +113,8 @@ namespace Toolbox.Library.Forms
         {
             public bool HighlightMenuBar = false;
 
-            private static Color checkedHighlightBackColor = FormThemes.BaseTheme.FormContextMenuSelectColor;
-            private static Color uncheckedHighlightBackColor = FormThemes.BaseTheme.CheckBoxBackColor;
+            private static Color checkedHighlightBackColor = FormThemes.BaseTheme.FormBackColor;
+            private static Color uncheckedHighlightBackColor = FormThemes.BaseTheme.FormBackColor;
 
             public override Color ToolStripDropDownBackground
             {