diff --git a/ShareX.HelpersLib/ShareXResources.cs b/ShareX.HelpersLib/ShareXResources.cs
index ecc13da12..acc0f5866 100644
--- a/ShareX.HelpersLib/ShareXResources.cs
+++ b/ShareX.HelpersLib/ShareXResources.cs
@@ -107,14 +107,26 @@ private static void ApplyDarkThemeToControl(Control control)
                     btn.BackColor = DarkBackgroundVariantColor;
                     return;
                 case CheckBox cb when cb.Appearance == Appearance.Button:
-                    // Buttons looks better with system colors
-                    control.ForeColor = SystemColors.ControlText;
+                    cb.FlatStyle = FlatStyle.Flat;
+                    cb.FlatAppearance.BorderColor = DarkBorderColor;
+                    cb.ForeColor = DarkTextColor;
+                    cb.BackColor = DarkBackgroundVariantColor;
                     return;
                 case TextBox tb:
                     tb.ForeColor = DarkTextColor;
                     tb.BackColor = DarkBackgroundVariantColor;
                     tb.BorderStyle = BorderStyle.FixedSingle;
                     return;
+                case ComboBox cb:
+                    cb.FlatStyle = FlatStyle.Flat;
+                    cb.ForeColor = DarkTextColor;
+                    cb.BackColor = DarkBackgroundVariantColor;
+                    return;
+                case ListBox lb:
+                case ListView lv:
+                    control.ForeColor = DarkTextColor;
+                    control.BackColor = DarkBackgroundVariantColor;
+                    return;
                 case SplitContainer sc:
                     sc.Panel1.BackColor = DarkBackgroundColor;
                     sc.Panel2.BackColor = DarkBackgroundColor;