diff --git a/UIComposites/ColorScheme.cs b/UIComposites/ColorScheme.cs
index d217f3937..e8f0a91bf 100644
--- a/UIComposites/ColorScheme.cs
+++ b/UIComposites/ColorScheme.cs
@@ -111,15 +111,18 @@ public ColorScheme(DefaultColorBinding defaultColors, List<IColorBinding> colors
         {
             Theme = colors;
             Default = defaultColors;
+            BorderHighlight = new();
         }
         public ColorScheme()
         {
             Theme = new();
             Default = new();
+            BorderHighlight = new();
         }
 
         public List<IColorBinding> Theme;
         public DefaultColorBinding Default;
+        public DefaultColorBinding BorderHighlight;
 
         private IColorBinding GetApplicableColor(Control type)
         {
diff --git a/UIComposites/ColorSchemes.cs b/UIComposites/ColorSchemes.cs
index 0952920b4..41486f2a0 100644
--- a/UIComposites/ColorSchemes.cs
+++ b/UIComposites/ColorSchemes.cs
@@ -7,6 +7,7 @@ public partial class ColorScheme
         public static readonly ColorScheme LightMode = new()
         {
             Default = new(Color.Black, Color.WhiteSmoke),
+            BorderHighlight = new(Color.Black, Color.WhiteSmoke),
             Theme = new()
             {
                 new ColorBinding<Panel>(Color.Transparent, Color.WhiteSmoke),
@@ -21,14 +22,15 @@ public partial class ColorScheme
         };
         public static readonly ColorScheme DarkMode = new()
         {
-            Default = new(Color.WhiteSmoke, Color.FromArgb(75, 75, 75)),
+            Default = new(Color.WhiteSmoke, Color.FromArgb(50, 50, 50)),
+            BorderHighlight = new(Color.WhiteSmoke, Color.Magenta),
             Theme = new()
             {
                 new ColorBinding<Panel>(Color.Transparent, Color.FromArgb(60, 60, 60)),
                 new ColorBinding<GroupBox>(Color.WhiteSmoke, Color.FromArgb(60, 60, 60)),
                 new ColorBinding<Label>(Color.WhiteSmoke, Color.Transparent),
                 new ColorBinding<CheckBox>(Color.WhiteSmoke, Color.FromArgb(60, 60, 60)),
-                new ColorBinding<ComboBox>(Color.WhiteSmoke, Color.FromArgb(75, 75, 75)),
+                new ColorBinding<ComboBox>(Color.WhiteSmoke, Color.FromArgb(50, 50, 50)),
                 new ColorBinding<NumericUpDown>(Color.WhiteSmoke, Color.FromArgb(60, 60, 60)),
                 new ColorBinding<UserControl>(Color.WhiteSmoke, Color.FromArgb(60, 60, 60)),
                 new ColorBinding<Tab>(Color.WhiteSmoke, Color.FromArgb(60, 60, 60))
diff --git a/UIComposites/HotkeyEditor.Designer.cs b/UIComposites/HotkeyEditor.Designer.cs
index 8db0bf95b..a230e2899 100644
--- a/UIComposites/HotkeyEditor.Designer.cs
+++ b/UIComposites/HotkeyEditor.Designer.cs
@@ -42,10 +42,11 @@ private void InitializeComponent()
             // Checkbox_Enabled
             // 
             this.Checkbox_Enabled.AutoSize = true;
+            this.Checkbox_Enabled.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.Checkbox_Enabled.Location = new System.Drawing.Point(4, 34);
             this.Checkbox_Enabled.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.Checkbox_Enabled.Name = "Checkbox_Enabled";
-            this.Checkbox_Enabled.Size = new System.Drawing.Size(68, 19);
+            this.Checkbox_Enabled.Size = new System.Drawing.Size(65, 19);
             this.Checkbox_Enabled.TabIndex = 0;
             this.Checkbox_Enabled.Text = "Enabled";
             this.Checkbox_Enabled.UseMnemonic = false;
@@ -82,10 +83,11 @@ private void InitializeComponent()
             // Checkbox_ModifierKey_Ctrl
             // 
             this.Checkbox_ModifierKey_Ctrl.AutoSize = true;
+            this.Checkbox_ModifierKey_Ctrl.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.Checkbox_ModifierKey_Ctrl.Location = new System.Drawing.Point(190, 35);
             this.Checkbox_ModifierKey_Ctrl.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.Checkbox_ModifierKey_Ctrl.Name = "Checkbox_ModifierKey_Ctrl";
-            this.Checkbox_ModifierKey_Ctrl.Size = new System.Drawing.Size(45, 19);
+            this.Checkbox_ModifierKey_Ctrl.Size = new System.Drawing.Size(42, 19);
             this.Checkbox_ModifierKey_Ctrl.TabIndex = 3;
             this.Checkbox_ModifierKey_Ctrl.Text = "Ctrl";
             this.Checkbox_ModifierKey_Ctrl.UseMnemonic = false;
@@ -95,10 +97,11 @@ private void InitializeComponent()
             // Checkbox_ModifierKey_Alt
             // 
             this.Checkbox_ModifierKey_Alt.AutoSize = true;
+            this.Checkbox_ModifierKey_Alt.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.Checkbox_ModifierKey_Alt.Location = new System.Drawing.Point(243, 35);
             this.Checkbox_ModifierKey_Alt.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.Checkbox_ModifierKey_Alt.Name = "Checkbox_ModifierKey_Alt";
-            this.Checkbox_ModifierKey_Alt.Size = new System.Drawing.Size(41, 19);
+            this.Checkbox_ModifierKey_Alt.Size = new System.Drawing.Size(38, 19);
             this.Checkbox_ModifierKey_Alt.TabIndex = 4;
             this.Checkbox_ModifierKey_Alt.Text = "Alt";
             this.Checkbox_ModifierKey_Alt.UseMnemonic = false;
@@ -108,10 +111,11 @@ private void InitializeComponent()
             // Checkbox_ModifierKey_Shift
             // 
             this.Checkbox_ModifierKey_Shift.AutoSize = true;
+            this.Checkbox_ModifierKey_Shift.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.Checkbox_ModifierKey_Shift.Location = new System.Drawing.Point(132, 35);
             this.Checkbox_ModifierKey_Shift.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.Checkbox_ModifierKey_Shift.Name = "Checkbox_ModifierKey_Shift";
-            this.Checkbox_ModifierKey_Shift.Size = new System.Drawing.Size(50, 19);
+            this.Checkbox_ModifierKey_Shift.Size = new System.Drawing.Size(47, 19);
             this.Checkbox_ModifierKey_Shift.TabIndex = 5;
             this.Checkbox_ModifierKey_Shift.Text = "Shift";
             this.Checkbox_ModifierKey_Shift.UseMnemonic = false;
@@ -121,10 +125,11 @@ private void InitializeComponent()
             // Checkbox_ModifierKey_Win
             // 
             this.Checkbox_ModifierKey_Win.AutoSize = true;
+            this.Checkbox_ModifierKey_Win.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.Checkbox_ModifierKey_Win.Location = new System.Drawing.Point(292, 35);
             this.Checkbox_ModifierKey_Win.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.Checkbox_ModifierKey_Win.Name = "Checkbox_ModifierKey_Win";
-            this.Checkbox_ModifierKey_Win.Size = new System.Drawing.Size(47, 19);
+            this.Checkbox_ModifierKey_Win.Size = new System.Drawing.Size(44, 19);
             this.Checkbox_ModifierKey_Win.TabIndex = 6;
             this.Checkbox_ModifierKey_Win.Text = "Win";
             this.Checkbox_ModifierKey_Win.UseMnemonic = false;
diff --git a/UIComposites/SettingsPane.Designer.cs b/UIComposites/SettingsPane.Designer.cs
index 6009057d6..281be86db 100644
--- a/UIComposites/SettingsPane.Designer.cs
+++ b/UIComposites/SettingsPane.Designer.cs
@@ -29,13 +29,13 @@ protected override void Dispose(bool disposing)
         private void InitializeComponent()
         {
             this.SettingsGroupBox = new System.Windows.Forms.GroupBox();
+            this.cb_DarkMode = new System.Windows.Forms.CheckBox();
             this.num_VolumeStep = new UIComposites.NumberUpDownWithLabel();
             this.cb_RunAtStartup = new System.Windows.Forms.CheckBox();
             this.cb_MinimizeOnStartup = new System.Windows.Forms.CheckBox();
             this.cb_ShowInTaskbar = new System.Windows.Forms.CheckBox();
             this.cb_AlwaysOnTop = new System.Windows.Forms.CheckBox();
             this.panel = new System.Windows.Forms.Panel();
-            this.cb_DarkMode = new System.Windows.Forms.CheckBox();
             this.SettingsGroupBox.SuspendLayout();
             this.panel.SuspendLayout();
             this.SuspendLayout();
@@ -59,6 +59,18 @@ private void InitializeComponent()
             this.SettingsGroupBox.TabStop = false;
             this.SettingsGroupBox.Text = "Settings";
             // 
+            // cb_DarkMode
+            // 
+            this.cb_DarkMode.AutoSize = true;
+            this.cb_DarkMode.BackColor = System.Drawing.Color.Transparent;
+            this.cb_DarkMode.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.cb_DarkMode.Location = new System.Drawing.Point(6, 100);
+            this.cb_DarkMode.Name = "cb_DarkMode";
+            this.cb_DarkMode.Size = new System.Drawing.Size(119, 19);
+            this.cb_DarkMode.TabIndex = 5;
+            this.cb_DarkMode.Text = "Enable Dark Mode";
+            this.cb_DarkMode.UseVisualStyleBackColor = false;
+            // 
             // num_VolumeStep
             // 
             this.num_VolumeStep.AutoSize = true;
@@ -94,39 +106,43 @@ private void InitializeComponent()
             // cb_RunAtStartup
             // 
             this.cb_RunAtStartup.AutoSize = true;
+            this.cb_RunAtStartup.BackColor = System.Drawing.Color.Transparent;
             this.cb_RunAtStartup.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.cb_RunAtStartup.Location = new System.Drawing.Point(6, 20);
             this.cb_RunAtStartup.Name = "cb_RunAtStartup";
             this.cb_RunAtStartup.Size = new System.Drawing.Size(98, 19);
             this.cb_RunAtStartup.TabIndex = 3;
             this.cb_RunAtStartup.Text = "Run at Startup";
-            this.cb_RunAtStartup.UseVisualStyleBackColor = true;
+            this.cb_RunAtStartup.UseVisualStyleBackColor = false;
             // 
             // cb_MinimizeOnStartup
             // 
             this.cb_MinimizeOnStartup.AutoSize = true;
+            this.cb_MinimizeOnStartup.BackColor = System.Drawing.Color.Transparent;
             this.cb_MinimizeOnStartup.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.cb_MinimizeOnStartup.Location = new System.Drawing.Point(6, 40);
             this.cb_MinimizeOnStartup.Name = "cb_MinimizeOnStartup";
             this.cb_MinimizeOnStartup.Size = new System.Drawing.Size(130, 19);
             this.cb_MinimizeOnStartup.TabIndex = 2;
             this.cb_MinimizeOnStartup.Text = "Minimize on Startup";
-            this.cb_MinimizeOnStartup.UseVisualStyleBackColor = true;
+            this.cb_MinimizeOnStartup.UseVisualStyleBackColor = false;
             // 
             // cb_ShowInTaskbar
             // 
             this.cb_ShowInTaskbar.AutoSize = true;
+            this.cb_ShowInTaskbar.BackColor = System.Drawing.Color.Transparent;
             this.cb_ShowInTaskbar.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.cb_ShowInTaskbar.Location = new System.Drawing.Point(6, 60);
             this.cb_ShowInTaskbar.Name = "cb_ShowInTaskbar";
             this.cb_ShowInTaskbar.Size = new System.Drawing.Size(107, 19);
             this.cb_ShowInTaskbar.TabIndex = 1;
             this.cb_ShowInTaskbar.Text = "Show In Taskbar";
-            this.cb_ShowInTaskbar.UseVisualStyleBackColor = true;
+            this.cb_ShowInTaskbar.UseVisualStyleBackColor = false;
             // 
             // cb_AlwaysOnTop
             // 
             this.cb_AlwaysOnTop.AutoSize = true;
+            this.cb_AlwaysOnTop.BackColor = System.Drawing.Color.Transparent;
             this.cb_AlwaysOnTop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.cb_AlwaysOnTop.Location = new System.Drawing.Point(6, 80);
             this.cb_AlwaysOnTop.Name = "cb_AlwaysOnTop";
@@ -134,7 +150,7 @@ private void InitializeComponent()
             this.cb_AlwaysOnTop.TabIndex = 0;
             this.cb_AlwaysOnTop.Text = "Always on Top";
             this.cb_AlwaysOnTop.UseMnemonic = false;
-            this.cb_AlwaysOnTop.UseVisualStyleBackColor = true;
+            this.cb_AlwaysOnTop.UseVisualStyleBackColor = false;
             // 
             // panel
             // 
@@ -147,17 +163,6 @@ private void InitializeComponent()
             this.panel.Size = new System.Drawing.Size(146, 155);
             this.panel.TabIndex = 1;
             // 
-            // cb_DarkMode
-            // 
-            this.cb_DarkMode.AutoSize = true;
-            this.cb_DarkMode.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.cb_DarkMode.Location = new System.Drawing.Point(6, 100);
-            this.cb_DarkMode.Name = "cb_DarkMode";
-            this.cb_DarkMode.Size = new System.Drawing.Size(119, 19);
-            this.cb_DarkMode.TabIndex = 5;
-            this.cb_DarkMode.Text = "Enable Dark Mode";
-            this.cb_DarkMode.UseVisualStyleBackColor = true;
-            // 
             // SettingsPane
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);