diff --git a/ShareX.HelpersLib/Forms/ClipboardContentViewer.cs b/ShareX.HelpersLib/Forms/ClipboardContentViewer.cs
index ae89a284b..9413decf4 100644
--- a/ShareX.HelpersLib/Forms/ClipboardContentViewer.cs
+++ b/ShareX.HelpersLib/Forms/ClipboardContentViewer.cs
@@ -41,7 +41,12 @@ public partial class ClipboardContentViewer : Form
         public ClipboardContentViewer(bool showCheckBox = false)
         {
             InitializeComponent();
-            Icon = ShareXResources.Icon;
+            ShareXResources.ApplyThemeToForm(this);
+
+            if (ShareXResources.UseDarkTheme)
+            {
+                lblQuestion.BackColor = ShareXResources.DarkBorderColor;
+            }
 
             cbDontShowThisWindow.Visible = showCheckBox;
         }
diff --git a/ShareX.HelpersLib/Colors/ColorPickerForm.Designer.cs b/ShareX.HelpersLib/Forms/ColorPickerForm.Designer.cs
similarity index 100%
rename from ShareX.HelpersLib/Colors/ColorPickerForm.Designer.cs
rename to ShareX.HelpersLib/Forms/ColorPickerForm.Designer.cs
diff --git a/ShareX.HelpersLib/Colors/ColorPickerForm.cs b/ShareX.HelpersLib/Forms/ColorPickerForm.cs
similarity index 100%
rename from ShareX.HelpersLib/Colors/ColorPickerForm.cs
rename to ShareX.HelpersLib/Forms/ColorPickerForm.cs
diff --git a/ShareX.HelpersLib/Colors/ColorPickerForm.de.resx b/ShareX.HelpersLib/Forms/ColorPickerForm.de.resx
similarity index 100%
rename from ShareX.HelpersLib/Colors/ColorPickerForm.de.resx
rename to ShareX.HelpersLib/Forms/ColorPickerForm.de.resx
diff --git a/ShareX.HelpersLib/Colors/ColorPickerForm.es-MX.resx b/ShareX.HelpersLib/Forms/ColorPickerForm.es-MX.resx
similarity index 100%
rename from ShareX.HelpersLib/Colors/ColorPickerForm.es-MX.resx
rename to ShareX.HelpersLib/Forms/ColorPickerForm.es-MX.resx
diff --git a/ShareX.HelpersLib/Colors/ColorPickerForm.es.resx b/ShareX.HelpersLib/Forms/ColorPickerForm.es.resx
similarity index 100%
rename from ShareX.HelpersLib/Colors/ColorPickerForm.es.resx
rename to ShareX.HelpersLib/Forms/ColorPickerForm.es.resx
diff --git a/ShareX.HelpersLib/Colors/ColorPickerForm.fr.resx b/ShareX.HelpersLib/Forms/ColorPickerForm.fr.resx
similarity index 100%
rename from ShareX.HelpersLib/Colors/ColorPickerForm.fr.resx
rename to ShareX.HelpersLib/Forms/ColorPickerForm.fr.resx
diff --git a/ShareX.HelpersLib/Colors/ColorPickerForm.hu.resx b/ShareX.HelpersLib/Forms/ColorPickerForm.hu.resx
similarity index 100%
rename from ShareX.HelpersLib/Colors/ColorPickerForm.hu.resx
rename to ShareX.HelpersLib/Forms/ColorPickerForm.hu.resx
diff --git a/ShareX.HelpersLib/Colors/ColorPickerForm.id-ID.resx b/ShareX.HelpersLib/Forms/ColorPickerForm.id-ID.resx
similarity index 100%
rename from ShareX.HelpersLib/Colors/ColorPickerForm.id-ID.resx
rename to ShareX.HelpersLib/Forms/ColorPickerForm.id-ID.resx
diff --git a/ShareX.HelpersLib/Colors/ColorPickerForm.it-IT.resx b/ShareX.HelpersLib/Forms/ColorPickerForm.it-IT.resx
similarity index 100%
rename from ShareX.HelpersLib/Colors/ColorPickerForm.it-IT.resx
rename to ShareX.HelpersLib/Forms/ColorPickerForm.it-IT.resx
diff --git a/ShareX.HelpersLib/Colors/ColorPickerForm.ko-KR.resx b/ShareX.HelpersLib/Forms/ColorPickerForm.ko-KR.resx
similarity index 100%
rename from ShareX.HelpersLib/Colors/ColorPickerForm.ko-KR.resx
rename to ShareX.HelpersLib/Forms/ColorPickerForm.ko-KR.resx
diff --git a/ShareX.HelpersLib/Colors/ColorPickerForm.nl-NL.resx b/ShareX.HelpersLib/Forms/ColorPickerForm.nl-NL.resx
similarity index 100%
rename from ShareX.HelpersLib/Colors/ColorPickerForm.nl-NL.resx
rename to ShareX.HelpersLib/Forms/ColorPickerForm.nl-NL.resx
diff --git a/ShareX.HelpersLib/Colors/ColorPickerForm.pt-BR.resx b/ShareX.HelpersLib/Forms/ColorPickerForm.pt-BR.resx
similarity index 100%
rename from ShareX.HelpersLib/Colors/ColorPickerForm.pt-BR.resx
rename to ShareX.HelpersLib/Forms/ColorPickerForm.pt-BR.resx
diff --git a/ShareX.HelpersLib/Colors/ColorPickerForm.resx b/ShareX.HelpersLib/Forms/ColorPickerForm.resx
similarity index 100%
rename from ShareX.HelpersLib/Colors/ColorPickerForm.resx
rename to ShareX.HelpersLib/Forms/ColorPickerForm.resx
diff --git a/ShareX.HelpersLib/Colors/ColorPickerForm.ru.resx b/ShareX.HelpersLib/Forms/ColorPickerForm.ru.resx
similarity index 100%
rename from ShareX.HelpersLib/Colors/ColorPickerForm.ru.resx
rename to ShareX.HelpersLib/Forms/ColorPickerForm.ru.resx
diff --git a/ShareX.HelpersLib/Colors/ColorPickerForm.tr.resx b/ShareX.HelpersLib/Forms/ColorPickerForm.tr.resx
similarity index 100%
rename from ShareX.HelpersLib/Colors/ColorPickerForm.tr.resx
rename to ShareX.HelpersLib/Forms/ColorPickerForm.tr.resx
diff --git a/ShareX.HelpersLib/Colors/ColorPickerForm.uk.resx b/ShareX.HelpersLib/Forms/ColorPickerForm.uk.resx
similarity index 100%
rename from ShareX.HelpersLib/Colors/ColorPickerForm.uk.resx
rename to ShareX.HelpersLib/Forms/ColorPickerForm.uk.resx
diff --git a/ShareX.HelpersLib/Colors/ColorPickerForm.vi-VN.resx b/ShareX.HelpersLib/Forms/ColorPickerForm.vi-VN.resx
similarity index 100%
rename from ShareX.HelpersLib/Colors/ColorPickerForm.vi-VN.resx
rename to ShareX.HelpersLib/Forms/ColorPickerForm.vi-VN.resx
diff --git a/ShareX.HelpersLib/Colors/ColorPickerForm.zh-CN.resx b/ShareX.HelpersLib/Forms/ColorPickerForm.zh-CN.resx
similarity index 100%
rename from ShareX.HelpersLib/Colors/ColorPickerForm.zh-CN.resx
rename to ShareX.HelpersLib/Forms/ColorPickerForm.zh-CN.resx
diff --git a/ShareX.HelpersLib/Colors/ColorPickerForm.zh-TW.resx b/ShareX.HelpersLib/Forms/ColorPickerForm.zh-TW.resx
similarity index 100%
rename from ShareX.HelpersLib/Colors/ColorPickerForm.zh-TW.resx
rename to ShareX.HelpersLib/Forms/ColorPickerForm.zh-TW.resx
diff --git a/ShareX.HelpersLib/DNS/DNSChangerForm.Designer.cs b/ShareX.HelpersLib/Forms/DNSChangerForm.Designer.cs
similarity index 100%
rename from ShareX.HelpersLib/DNS/DNSChangerForm.Designer.cs
rename to ShareX.HelpersLib/Forms/DNSChangerForm.Designer.cs
diff --git a/ShareX.HelpersLib/DNS/DNSChangerForm.cs b/ShareX.HelpersLib/Forms/DNSChangerForm.cs
similarity index 99%
rename from ShareX.HelpersLib/DNS/DNSChangerForm.cs
rename to ShareX.HelpersLib/Forms/DNSChangerForm.cs
index aec2463e2..f3512e775 100644
--- a/ShareX.HelpersLib/DNS/DNSChangerForm.cs
+++ b/ShareX.HelpersLib/Forms/DNSChangerForm.cs
@@ -35,7 +35,7 @@ public partial class DNSChangerForm : Form
         public DNSChangerForm()
         {
             InitializeComponent();
-            Icon = ShareXResources.Icon;
+            ShareXResources.ApplyThemeToForm(this);
 
             AddDNS(Resources.DNSChangerForm_DNSChangerForm_Manual);
             AddDNS("Google Public DNS", "8.8.8.8", "8.8.4.4"); // https://developers.google.com/speed/public-dns/
diff --git a/ShareX.HelpersLib/DNS/DNSChangerForm.de.resx b/ShareX.HelpersLib/Forms/DNSChangerForm.de.resx
similarity index 100%
rename from ShareX.HelpersLib/DNS/DNSChangerForm.de.resx
rename to ShareX.HelpersLib/Forms/DNSChangerForm.de.resx
diff --git a/ShareX.HelpersLib/DNS/DNSChangerForm.es-MX.resx b/ShareX.HelpersLib/Forms/DNSChangerForm.es-MX.resx
similarity index 100%
rename from ShareX.HelpersLib/DNS/DNSChangerForm.es-MX.resx
rename to ShareX.HelpersLib/Forms/DNSChangerForm.es-MX.resx
diff --git a/ShareX.HelpersLib/DNS/DNSChangerForm.es.resx b/ShareX.HelpersLib/Forms/DNSChangerForm.es.resx
similarity index 100%
rename from ShareX.HelpersLib/DNS/DNSChangerForm.es.resx
rename to ShareX.HelpersLib/Forms/DNSChangerForm.es.resx
diff --git a/ShareX.HelpersLib/DNS/DNSChangerForm.fr.resx b/ShareX.HelpersLib/Forms/DNSChangerForm.fr.resx
similarity index 100%
rename from ShareX.HelpersLib/DNS/DNSChangerForm.fr.resx
rename to ShareX.HelpersLib/Forms/DNSChangerForm.fr.resx
diff --git a/ShareX.HelpersLib/DNS/DNSChangerForm.hu.resx b/ShareX.HelpersLib/Forms/DNSChangerForm.hu.resx
similarity index 100%
rename from ShareX.HelpersLib/DNS/DNSChangerForm.hu.resx
rename to ShareX.HelpersLib/Forms/DNSChangerForm.hu.resx
diff --git a/ShareX.HelpersLib/DNS/DNSChangerForm.id-ID.resx b/ShareX.HelpersLib/Forms/DNSChangerForm.id-ID.resx
similarity index 100%
rename from ShareX.HelpersLib/DNS/DNSChangerForm.id-ID.resx
rename to ShareX.HelpersLib/Forms/DNSChangerForm.id-ID.resx
diff --git a/ShareX.HelpersLib/DNS/DNSChangerForm.it-IT.resx b/ShareX.HelpersLib/Forms/DNSChangerForm.it-IT.resx
similarity index 100%
rename from ShareX.HelpersLib/DNS/DNSChangerForm.it-IT.resx
rename to ShareX.HelpersLib/Forms/DNSChangerForm.it-IT.resx
diff --git a/ShareX.HelpersLib/DNS/DNSChangerForm.ko-KR.resx b/ShareX.HelpersLib/Forms/DNSChangerForm.ko-KR.resx
similarity index 100%
rename from ShareX.HelpersLib/DNS/DNSChangerForm.ko-KR.resx
rename to ShareX.HelpersLib/Forms/DNSChangerForm.ko-KR.resx
diff --git a/ShareX.HelpersLib/DNS/DNSChangerForm.nl-NL.resx b/ShareX.HelpersLib/Forms/DNSChangerForm.nl-NL.resx
similarity index 100%
rename from ShareX.HelpersLib/DNS/DNSChangerForm.nl-NL.resx
rename to ShareX.HelpersLib/Forms/DNSChangerForm.nl-NL.resx
diff --git a/ShareX.HelpersLib/DNS/DNSChangerForm.pt-BR.resx b/ShareX.HelpersLib/Forms/DNSChangerForm.pt-BR.resx
similarity index 100%
rename from ShareX.HelpersLib/DNS/DNSChangerForm.pt-BR.resx
rename to ShareX.HelpersLib/Forms/DNSChangerForm.pt-BR.resx
diff --git a/ShareX.HelpersLib/DNS/DNSChangerForm.resx b/ShareX.HelpersLib/Forms/DNSChangerForm.resx
similarity index 100%
rename from ShareX.HelpersLib/DNS/DNSChangerForm.resx
rename to ShareX.HelpersLib/Forms/DNSChangerForm.resx
diff --git a/ShareX.HelpersLib/DNS/DNSChangerForm.ru.resx b/ShareX.HelpersLib/Forms/DNSChangerForm.ru.resx
similarity index 100%
rename from ShareX.HelpersLib/DNS/DNSChangerForm.ru.resx
rename to ShareX.HelpersLib/Forms/DNSChangerForm.ru.resx
diff --git a/ShareX.HelpersLib/DNS/DNSChangerForm.tr.resx b/ShareX.HelpersLib/Forms/DNSChangerForm.tr.resx
similarity index 100%
rename from ShareX.HelpersLib/DNS/DNSChangerForm.tr.resx
rename to ShareX.HelpersLib/Forms/DNSChangerForm.tr.resx
diff --git a/ShareX.HelpersLib/DNS/DNSChangerForm.uk.resx b/ShareX.HelpersLib/Forms/DNSChangerForm.uk.resx
similarity index 100%
rename from ShareX.HelpersLib/DNS/DNSChangerForm.uk.resx
rename to ShareX.HelpersLib/Forms/DNSChangerForm.uk.resx
diff --git a/ShareX.HelpersLib/DNS/DNSChangerForm.vi-VN.resx b/ShareX.HelpersLib/Forms/DNSChangerForm.vi-VN.resx
similarity index 100%
rename from ShareX.HelpersLib/DNS/DNSChangerForm.vi-VN.resx
rename to ShareX.HelpersLib/Forms/DNSChangerForm.vi-VN.resx
diff --git a/ShareX.HelpersLib/DNS/DNSChangerForm.zh-CN.resx b/ShareX.HelpersLib/Forms/DNSChangerForm.zh-CN.resx
similarity index 100%
rename from ShareX.HelpersLib/DNS/DNSChangerForm.zh-CN.resx
rename to ShareX.HelpersLib/Forms/DNSChangerForm.zh-CN.resx
diff --git a/ShareX.HelpersLib/DNS/DNSChangerForm.zh-TW.resx b/ShareX.HelpersLib/Forms/DNSChangerForm.zh-TW.resx
similarity index 100%
rename from ShareX.HelpersLib/DNS/DNSChangerForm.zh-TW.resx
rename to ShareX.HelpersLib/Forms/DNSChangerForm.zh-TW.resx
diff --git a/ShareX.HelpersLib/Forms/DebugForm.cs b/ShareX.HelpersLib/Forms/DebugForm.cs
index 5d08600fa..fa29b2ee2 100644
--- a/ShareX.HelpersLib/Forms/DebugForm.cs
+++ b/ShareX.HelpersLib/Forms/DebugForm.cs
@@ -44,10 +44,11 @@ public partial class DebugForm : Form
 
         private DebugForm(Logger logger)
         {
-            InitializeComponent();
-            Icon = ShareXResources.Icon;
             Logger = logger;
 
+            InitializeComponent();
+            ShareXResources.ApplyThemeToForm(this);
+
             rtbDebug.Text = Logger.ToString();
             rtbDebug.SelectionStart = rtbDebug.TextLength;
             rtbDebug.ScrollToCaret();
diff --git a/ShareX.HelpersLib/Forms/ErrorForm.cs b/ShareX.HelpersLib/Forms/ErrorForm.cs
index c21ef35e2..bad1107dc 100644
--- a/ShareX.HelpersLib/Forms/ErrorForm.cs
+++ b/ShareX.HelpersLib/Forms/ErrorForm.cs
@@ -42,7 +42,7 @@ public ErrorForm(Exception error, string logPath, string bugReportPath) : this(e
         public ErrorForm(string errorTitle, string errorMessage, string logPath, string bugReportPath, bool unhandledException = true)
         {
             InitializeComponent();
-            Icon = ShareXResources.Icon;
+            ShareXResources.ApplyThemeToForm(this);
 
             IsUnhandledException = unhandledException;
             LogPath = logPath;
diff --git a/ShareX.HelpersLib/Colors/GradientPickerForm.Designer.cs b/ShareX.HelpersLib/Forms/GradientPickerForm.Designer.cs
similarity index 100%
rename from ShareX.HelpersLib/Colors/GradientPickerForm.Designer.cs
rename to ShareX.HelpersLib/Forms/GradientPickerForm.Designer.cs
diff --git a/ShareX.HelpersLib/Colors/GradientPickerForm.cs b/ShareX.HelpersLib/Forms/GradientPickerForm.cs
similarity index 99%
rename from ShareX.HelpersLib/Colors/GradientPickerForm.cs
rename to ShareX.HelpersLib/Forms/GradientPickerForm.cs
index f5a930c25..ba7dd4868 100644
--- a/ShareX.HelpersLib/Colors/GradientPickerForm.cs
+++ b/ShareX.HelpersLib/Forms/GradientPickerForm.cs
@@ -39,8 +39,10 @@ public partial class GradientPickerForm : Form
         public GradientPickerForm(GradientInfo gradient)
         {
             Gradient = gradient;
+
             InitializeComponent();
-            Icon = ShareXResources.Icon;
+            ShareXResources.ApplyThemeToForm(this);
+
             cbGradientType.Items.AddRange(Helpers.GetEnumNamesProper<LinearGradientMode>());
             cbGradientType.SelectedIndex = (int)Gradient.Type;
             foreach (GradientStop gradientStop in Gradient.Colors)
diff --git a/ShareX.HelpersLib/Colors/GradientPickerForm.de.resx b/ShareX.HelpersLib/Forms/GradientPickerForm.de.resx
similarity index 100%
rename from ShareX.HelpersLib/Colors/GradientPickerForm.de.resx
rename to ShareX.HelpersLib/Forms/GradientPickerForm.de.resx
diff --git a/ShareX.HelpersLib/Colors/GradientPickerForm.es-MX.resx b/ShareX.HelpersLib/Forms/GradientPickerForm.es-MX.resx
similarity index 100%
rename from ShareX.HelpersLib/Colors/GradientPickerForm.es-MX.resx
rename to ShareX.HelpersLib/Forms/GradientPickerForm.es-MX.resx
diff --git a/ShareX.HelpersLib/Colors/GradientPickerForm.es.resx b/ShareX.HelpersLib/Forms/GradientPickerForm.es.resx
similarity index 100%
rename from ShareX.HelpersLib/Colors/GradientPickerForm.es.resx
rename to ShareX.HelpersLib/Forms/GradientPickerForm.es.resx
diff --git a/ShareX.HelpersLib/Colors/GradientPickerForm.fr.resx b/ShareX.HelpersLib/Forms/GradientPickerForm.fr.resx
similarity index 100%
rename from ShareX.HelpersLib/Colors/GradientPickerForm.fr.resx
rename to ShareX.HelpersLib/Forms/GradientPickerForm.fr.resx
diff --git a/ShareX.HelpersLib/Colors/GradientPickerForm.hu.resx b/ShareX.HelpersLib/Forms/GradientPickerForm.hu.resx
similarity index 100%
rename from ShareX.HelpersLib/Colors/GradientPickerForm.hu.resx
rename to ShareX.HelpersLib/Forms/GradientPickerForm.hu.resx
diff --git a/ShareX.HelpersLib/Colors/GradientPickerForm.id-ID.resx b/ShareX.HelpersLib/Forms/GradientPickerForm.id-ID.resx
similarity index 100%
rename from ShareX.HelpersLib/Colors/GradientPickerForm.id-ID.resx
rename to ShareX.HelpersLib/Forms/GradientPickerForm.id-ID.resx
diff --git a/ShareX.HelpersLib/Colors/GradientPickerForm.it-IT.resx b/ShareX.HelpersLib/Forms/GradientPickerForm.it-IT.resx
similarity index 100%
rename from ShareX.HelpersLib/Colors/GradientPickerForm.it-IT.resx
rename to ShareX.HelpersLib/Forms/GradientPickerForm.it-IT.resx
diff --git a/ShareX.HelpersLib/Colors/GradientPickerForm.ko-KR.resx b/ShareX.HelpersLib/Forms/GradientPickerForm.ko-KR.resx
similarity index 100%
rename from ShareX.HelpersLib/Colors/GradientPickerForm.ko-KR.resx
rename to ShareX.HelpersLib/Forms/GradientPickerForm.ko-KR.resx
diff --git a/ShareX.HelpersLib/Colors/GradientPickerForm.nl-NL.resx b/ShareX.HelpersLib/Forms/GradientPickerForm.nl-NL.resx
similarity index 100%
rename from ShareX.HelpersLib/Colors/GradientPickerForm.nl-NL.resx
rename to ShareX.HelpersLib/Forms/GradientPickerForm.nl-NL.resx
diff --git a/ShareX.HelpersLib/Colors/GradientPickerForm.pt-BR.resx b/ShareX.HelpersLib/Forms/GradientPickerForm.pt-BR.resx
similarity index 100%
rename from ShareX.HelpersLib/Colors/GradientPickerForm.pt-BR.resx
rename to ShareX.HelpersLib/Forms/GradientPickerForm.pt-BR.resx
diff --git a/ShareX.HelpersLib/Colors/GradientPickerForm.resx b/ShareX.HelpersLib/Forms/GradientPickerForm.resx
similarity index 100%
rename from ShareX.HelpersLib/Colors/GradientPickerForm.resx
rename to ShareX.HelpersLib/Forms/GradientPickerForm.resx
diff --git a/ShareX.HelpersLib/Colors/GradientPickerForm.ru.resx b/ShareX.HelpersLib/Forms/GradientPickerForm.ru.resx
similarity index 100%
rename from ShareX.HelpersLib/Colors/GradientPickerForm.ru.resx
rename to ShareX.HelpersLib/Forms/GradientPickerForm.ru.resx
diff --git a/ShareX.HelpersLib/Colors/GradientPickerForm.tr.resx b/ShareX.HelpersLib/Forms/GradientPickerForm.tr.resx
similarity index 100%
rename from ShareX.HelpersLib/Colors/GradientPickerForm.tr.resx
rename to ShareX.HelpersLib/Forms/GradientPickerForm.tr.resx
diff --git a/ShareX.HelpersLib/Colors/GradientPickerForm.uk.resx b/ShareX.HelpersLib/Forms/GradientPickerForm.uk.resx
similarity index 100%
rename from ShareX.HelpersLib/Colors/GradientPickerForm.uk.resx
rename to ShareX.HelpersLib/Forms/GradientPickerForm.uk.resx
diff --git a/ShareX.HelpersLib/Colors/GradientPickerForm.vi-VN.resx b/ShareX.HelpersLib/Forms/GradientPickerForm.vi-VN.resx
similarity index 100%
rename from ShareX.HelpersLib/Colors/GradientPickerForm.vi-VN.resx
rename to ShareX.HelpersLib/Forms/GradientPickerForm.vi-VN.resx
diff --git a/ShareX.HelpersLib/Colors/GradientPickerForm.zh-CN.resx b/ShareX.HelpersLib/Forms/GradientPickerForm.zh-CN.resx
similarity index 100%
rename from ShareX.HelpersLib/Colors/GradientPickerForm.zh-CN.resx
rename to ShareX.HelpersLib/Forms/GradientPickerForm.zh-CN.resx
diff --git a/ShareX.HelpersLib/Colors/GradientPickerForm.zh-TW.resx b/ShareX.HelpersLib/Forms/GradientPickerForm.zh-TW.resx
similarity index 100%
rename from ShareX.HelpersLib/Colors/GradientPickerForm.zh-TW.resx
rename to ShareX.HelpersLib/Forms/GradientPickerForm.zh-TW.resx
diff --git a/ShareX.HelpersLib/Forms/HashCheckForm.cs b/ShareX.HelpersLib/Forms/HashCheckForm.cs
index 9eb5d199c..c26d1237b 100644
--- a/ShareX.HelpersLib/Forms/HashCheckForm.cs
+++ b/ShareX.HelpersLib/Forms/HashCheckForm.cs
@@ -38,7 +38,7 @@ public partial class HashCheckForm : Form
         public HashCheckForm()
         {
             InitializeComponent();
-            Icon = ShareXResources.Icon;
+            ShareXResources.ApplyThemeToForm(this);
 
             cbHashType.Items.AddRange(Helpers.GetEnumDescriptions<HashType>());
             cbHashType.SelectedIndex = (int)HashType.SHA1;
@@ -64,10 +64,13 @@ private void UpdateResult()
                 {
                     txtTarget.BackColor = Color.FromArgb(255, 200, 200);
                 }
+
+                txtTarget.ForeColor = SystemColors.ControlText;
             }
             else
             {
-                txtTarget.BackColor = SystemColors.Window;
+                txtTarget.BackColor = txtResult.BackColor;
+                txtTarget.ForeColor = txtResult.ForeColor;
             }
         }
 
diff --git a/ShareX.HelpersLib/Forms/InputBox.cs b/ShareX.HelpersLib/Forms/InputBox.cs
index 77aacca30..66a5c4649 100644
--- a/ShareX.HelpersLib/Forms/InputBox.cs
+++ b/ShareX.HelpersLib/Forms/InputBox.cs
@@ -36,7 +36,7 @@ public class InputBox : Form
         public InputBox(string title = null, string inputText = null, string okText = null, string cancelText = null)
         {
             InitializeComponent();
-            Icon = ShareXResources.Icon;
+            ShareXResources.ApplyThemeToForm(this);
 
             InputText = inputText;
 
diff --git a/ShareX.HelpersLib/Forms/MonitorTestForm.cs b/ShareX.HelpersLib/Forms/MonitorTestForm.cs
index 2fd43e999..ba2416d97 100644
--- a/ShareX.HelpersLib/Forms/MonitorTestForm.cs
+++ b/ShareX.HelpersLib/Forms/MonitorTestForm.cs
@@ -35,7 +35,7 @@ public partial class MonitorTestForm : Form
         public MonitorTestForm()
         {
             InitializeComponent();
-            Icon = ShareXResources.Icon;
+            ShareXResources.ApplyThemeToForm(this);
 
             Rectangle screenBounds = CaptureHelpers.GetScreenBounds();
             Location = screenBounds.Location;
diff --git a/ShareX.HelpersLib/Forms/MyMessageBox.cs b/ShareX.HelpersLib/Forms/MyMessageBox.cs
index 0ed064451..76726c797 100644
--- a/ShareX.HelpersLib/Forms/MyMessageBox.cs
+++ b/ShareX.HelpersLib/Forms/MyMessageBox.cs
@@ -42,8 +42,6 @@ public class MyMessageBox : Form
 
         public MyMessageBox(string text, string caption, MessageBoxButtons buttons = MessageBoxButtons.OK, string checkBoxText = null, bool isChecked = false)
         {
-            Icon = ShareXResources.Icon;
-
             Width = 180;
             Height = 100;
             Text = caption;
@@ -148,6 +146,13 @@ public MyMessageBox(string text, string caption, MessageBoxButtons buttons = Mes
             panel.Location = new Point(0, labelPanel.Bottom + LabelVerticalPadding);
             panel.Size = new Size(labelPanel.Width + (LabelHorizontalPadding * 2), button1.Height + (ButtonPadding * 2));
             ClientSize = new Size(panel.Width, labelPanel.Height + (LabelVerticalPadding * 2) + panel.Height);
+
+            ShareXResources.ApplyThemeToForm(this);
+
+            if (ShareXResources.UseDarkTheme)
+            {
+                panel.BackColor = ShareXResources.DarkBorderColor;
+            }
         }
 
         private void MyMessageBox_Shown(object sender, System.EventArgs e)
diff --git a/ShareX.HelpersLib/Forms/OutputBox.cs b/ShareX.HelpersLib/Forms/OutputBox.cs
index 268b2d5f9..71e51f58d 100644
--- a/ShareX.HelpersLib/Forms/OutputBox.cs
+++ b/ShareX.HelpersLib/Forms/OutputBox.cs
@@ -33,7 +33,8 @@ public partial class OutputBox : Form
         public OutputBox(string text, string title)
         {
             InitializeComponent();
-            Icon = ShareXResources.Icon;
+            ShareXResources.ApplyThemeToForm(this);
+
             Text = "ShareX - " + title;
             txtText.Text = text;
         }
diff --git a/ShareX.HelpersLib/Printer/PrintForm.Designer.cs b/ShareX.HelpersLib/Forms/PrintForm.Designer.cs
similarity index 98%
rename from ShareX.HelpersLib/Printer/PrintForm.Designer.cs
rename to ShareX.HelpersLib/Forms/PrintForm.Designer.cs
index 8230b73cc..2c074f0ca 100644
--- a/ShareX.HelpersLib/Printer/PrintForm.Designer.cs
+++ b/ShareX.HelpersLib/Forms/PrintForm.Designer.cs
@@ -93,6 +93,7 @@ private void InitializeComponent()
             // 
             // btnCancel
             // 
+            this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
             resources.ApplyResources(this.btnCancel, "btnCancel");
             this.btnCancel.Name = "btnCancel";
             this.btnCancel.UseVisualStyleBackColor = true;
diff --git a/ShareX.HelpersLib/Printer/PrintForm.cs b/ShareX.HelpersLib/Forms/PrintForm.cs
similarity index 98%
rename from ShareX.HelpersLib/Printer/PrintForm.cs
rename to ShareX.HelpersLib/Forms/PrintForm.cs
index 00772b9b5..528a4acf5 100644
--- a/ShareX.HelpersLib/Printer/PrintForm.cs
+++ b/ShareX.HelpersLib/Forms/PrintForm.cs
@@ -38,7 +38,8 @@ public partial class PrintForm : Form
         public PrintForm(Image img, PrintSettings settings, bool previewOnly = false)
         {
             InitializeComponent();
-            Icon = ShareXResources.Icon;
+            ShareXResources.ApplyThemeToForm(this);
+
             printHelper = new PrintHelper(img);
             printHelper.Settings = printSettings = settings;
             btnPrint.Enabled = !previewOnly;
diff --git a/ShareX.HelpersLib/Printer/PrintForm.de.resx b/ShareX.HelpersLib/Forms/PrintForm.de.resx
similarity index 100%
rename from ShareX.HelpersLib/Printer/PrintForm.de.resx
rename to ShareX.HelpersLib/Forms/PrintForm.de.resx
diff --git a/ShareX.HelpersLib/Printer/PrintForm.es-MX.resx b/ShareX.HelpersLib/Forms/PrintForm.es-MX.resx
similarity index 100%
rename from ShareX.HelpersLib/Printer/PrintForm.es-MX.resx
rename to ShareX.HelpersLib/Forms/PrintForm.es-MX.resx
diff --git a/ShareX.HelpersLib/Printer/PrintForm.es.resx b/ShareX.HelpersLib/Forms/PrintForm.es.resx
similarity index 100%
rename from ShareX.HelpersLib/Printer/PrintForm.es.resx
rename to ShareX.HelpersLib/Forms/PrintForm.es.resx
diff --git a/ShareX.HelpersLib/Printer/PrintForm.fr.resx b/ShareX.HelpersLib/Forms/PrintForm.fr.resx
similarity index 100%
rename from ShareX.HelpersLib/Printer/PrintForm.fr.resx
rename to ShareX.HelpersLib/Forms/PrintForm.fr.resx
diff --git a/ShareX.HelpersLib/Printer/PrintForm.hu.resx b/ShareX.HelpersLib/Forms/PrintForm.hu.resx
similarity index 100%
rename from ShareX.HelpersLib/Printer/PrintForm.hu.resx
rename to ShareX.HelpersLib/Forms/PrintForm.hu.resx
diff --git a/ShareX.HelpersLib/Printer/PrintForm.id-ID.resx b/ShareX.HelpersLib/Forms/PrintForm.id-ID.resx
similarity index 100%
rename from ShareX.HelpersLib/Printer/PrintForm.id-ID.resx
rename to ShareX.HelpersLib/Forms/PrintForm.id-ID.resx
diff --git a/ShareX.HelpersLib/Printer/PrintForm.it-IT.resx b/ShareX.HelpersLib/Forms/PrintForm.it-IT.resx
similarity index 100%
rename from ShareX.HelpersLib/Printer/PrintForm.it-IT.resx
rename to ShareX.HelpersLib/Forms/PrintForm.it-IT.resx
diff --git a/ShareX.HelpersLib/Printer/PrintForm.ko-KR.resx b/ShareX.HelpersLib/Forms/PrintForm.ko-KR.resx
similarity index 100%
rename from ShareX.HelpersLib/Printer/PrintForm.ko-KR.resx
rename to ShareX.HelpersLib/Forms/PrintForm.ko-KR.resx
diff --git a/ShareX.HelpersLib/Printer/PrintForm.nl-NL.resx b/ShareX.HelpersLib/Forms/PrintForm.nl-NL.resx
similarity index 100%
rename from ShareX.HelpersLib/Printer/PrintForm.nl-NL.resx
rename to ShareX.HelpersLib/Forms/PrintForm.nl-NL.resx
diff --git a/ShareX.HelpersLib/Printer/PrintForm.pt-BR.resx b/ShareX.HelpersLib/Forms/PrintForm.pt-BR.resx
similarity index 100%
rename from ShareX.HelpersLib/Printer/PrintForm.pt-BR.resx
rename to ShareX.HelpersLib/Forms/PrintForm.pt-BR.resx
diff --git a/ShareX.HelpersLib/Printer/PrintForm.resx b/ShareX.HelpersLib/Forms/PrintForm.resx
similarity index 99%
rename from ShareX.HelpersLib/Printer/PrintForm.resx
rename to ShareX.HelpersLib/Forms/PrintForm.resx
index 55367423b..3bed430a0 100644
--- a/ShareX.HelpersLib/Printer/PrintForm.resx
+++ b/ShareX.HelpersLib/Forms/PrintForm.resx
@@ -202,7 +202,7 @@
     <value>True</value>
   </data>
   <data name="lblMargin.Location" type="System.Drawing.Point, System.Drawing">
-    <value>16, 16</value>
+    <value>13, 16</value>
   </data>
   <data name="lblMargin.Size" type="System.Drawing.Size, System.Drawing">
     <value>42, 13</value>
diff --git a/ShareX.HelpersLib/Printer/PrintForm.ru.resx b/ShareX.HelpersLib/Forms/PrintForm.ru.resx
similarity index 100%
rename from ShareX.HelpersLib/Printer/PrintForm.ru.resx
rename to ShareX.HelpersLib/Forms/PrintForm.ru.resx
diff --git a/ShareX.HelpersLib/Printer/PrintForm.tr.resx b/ShareX.HelpersLib/Forms/PrintForm.tr.resx
similarity index 100%
rename from ShareX.HelpersLib/Printer/PrintForm.tr.resx
rename to ShareX.HelpersLib/Forms/PrintForm.tr.resx
diff --git a/ShareX.HelpersLib/Printer/PrintForm.uk.resx b/ShareX.HelpersLib/Forms/PrintForm.uk.resx
similarity index 100%
rename from ShareX.HelpersLib/Printer/PrintForm.uk.resx
rename to ShareX.HelpersLib/Forms/PrintForm.uk.resx
diff --git a/ShareX.HelpersLib/Printer/PrintForm.vi-VN.resx b/ShareX.HelpersLib/Forms/PrintForm.vi-VN.resx
similarity index 100%
rename from ShareX.HelpersLib/Printer/PrintForm.vi-VN.resx
rename to ShareX.HelpersLib/Forms/PrintForm.vi-VN.resx
diff --git a/ShareX.HelpersLib/Printer/PrintForm.zh-CN.resx b/ShareX.HelpersLib/Forms/PrintForm.zh-CN.resx
similarity index 100%
rename from ShareX.HelpersLib/Printer/PrintForm.zh-CN.resx
rename to ShareX.HelpersLib/Forms/PrintForm.zh-CN.resx
diff --git a/ShareX.HelpersLib/Printer/PrintForm.zh-TW.resx b/ShareX.HelpersLib/Forms/PrintForm.zh-TW.resx
similarity index 100%
rename from ShareX.HelpersLib/Printer/PrintForm.zh-TW.resx
rename to ShareX.HelpersLib/Forms/PrintForm.zh-TW.resx
diff --git a/ShareX.HelpersLib/Printer/PrintTextForm.Designer.cs b/ShareX.HelpersLib/Forms/PrintTextForm.Designer.cs
similarity index 100%
rename from ShareX.HelpersLib/Printer/PrintTextForm.Designer.cs
rename to ShareX.HelpersLib/Forms/PrintTextForm.Designer.cs
diff --git a/ShareX.HelpersLib/Printer/PrintTextForm.cs b/ShareX.HelpersLib/Forms/PrintTextForm.cs
similarity index 98%
rename from ShareX.HelpersLib/Printer/PrintTextForm.cs
rename to ShareX.HelpersLib/Forms/PrintTextForm.cs
index 57a467cb0..c788ad9bf 100644
--- a/ShareX.HelpersLib/Printer/PrintTextForm.cs
+++ b/ShareX.HelpersLib/Forms/PrintTextForm.cs
@@ -38,7 +38,8 @@ public partial class PrintTextForm : Form
         public PrintTextForm(string text, PrintSettings settings)
         {
             InitializeComponent();
-            Icon = ShareXResources.Icon;
+            ShareXResources.ApplyThemeToForm(this);
+
             printHelper = new PrintHelper(text);
             printHelper.Settings = printSettings = settings;
             LoadSettings();
diff --git a/ShareX.HelpersLib/Printer/PrintTextForm.de.resx b/ShareX.HelpersLib/Forms/PrintTextForm.de.resx
similarity index 100%
rename from ShareX.HelpersLib/Printer/PrintTextForm.de.resx
rename to ShareX.HelpersLib/Forms/PrintTextForm.de.resx
diff --git a/ShareX.HelpersLib/Printer/PrintTextForm.es-MX.resx b/ShareX.HelpersLib/Forms/PrintTextForm.es-MX.resx
similarity index 100%
rename from ShareX.HelpersLib/Printer/PrintTextForm.es-MX.resx
rename to ShareX.HelpersLib/Forms/PrintTextForm.es-MX.resx
diff --git a/ShareX.HelpersLib/Printer/PrintTextForm.es.resx b/ShareX.HelpersLib/Forms/PrintTextForm.es.resx
similarity index 100%
rename from ShareX.HelpersLib/Printer/PrintTextForm.es.resx
rename to ShareX.HelpersLib/Forms/PrintTextForm.es.resx
diff --git a/ShareX.HelpersLib/Printer/PrintTextForm.fr.resx b/ShareX.HelpersLib/Forms/PrintTextForm.fr.resx
similarity index 100%
rename from ShareX.HelpersLib/Printer/PrintTextForm.fr.resx
rename to ShareX.HelpersLib/Forms/PrintTextForm.fr.resx
diff --git a/ShareX.HelpersLib/Printer/PrintTextForm.hu.resx b/ShareX.HelpersLib/Forms/PrintTextForm.hu.resx
similarity index 100%
rename from ShareX.HelpersLib/Printer/PrintTextForm.hu.resx
rename to ShareX.HelpersLib/Forms/PrintTextForm.hu.resx
diff --git a/ShareX.HelpersLib/Printer/PrintTextForm.id-ID.resx b/ShareX.HelpersLib/Forms/PrintTextForm.id-ID.resx
similarity index 100%
rename from ShareX.HelpersLib/Printer/PrintTextForm.id-ID.resx
rename to ShareX.HelpersLib/Forms/PrintTextForm.id-ID.resx
diff --git a/ShareX.HelpersLib/Printer/PrintTextForm.it-IT.resx b/ShareX.HelpersLib/Forms/PrintTextForm.it-IT.resx
similarity index 100%
rename from ShareX.HelpersLib/Printer/PrintTextForm.it-IT.resx
rename to ShareX.HelpersLib/Forms/PrintTextForm.it-IT.resx
diff --git a/ShareX.HelpersLib/Printer/PrintTextForm.ko-KR.resx b/ShareX.HelpersLib/Forms/PrintTextForm.ko-KR.resx
similarity index 100%
rename from ShareX.HelpersLib/Printer/PrintTextForm.ko-KR.resx
rename to ShareX.HelpersLib/Forms/PrintTextForm.ko-KR.resx
diff --git a/ShareX.HelpersLib/Printer/PrintTextForm.nl-NL.resx b/ShareX.HelpersLib/Forms/PrintTextForm.nl-NL.resx
similarity index 100%
rename from ShareX.HelpersLib/Printer/PrintTextForm.nl-NL.resx
rename to ShareX.HelpersLib/Forms/PrintTextForm.nl-NL.resx
diff --git a/ShareX.HelpersLib/Printer/PrintTextForm.pt-BR.resx b/ShareX.HelpersLib/Forms/PrintTextForm.pt-BR.resx
similarity index 100%
rename from ShareX.HelpersLib/Printer/PrintTextForm.pt-BR.resx
rename to ShareX.HelpersLib/Forms/PrintTextForm.pt-BR.resx
diff --git a/ShareX.HelpersLib/Printer/PrintTextForm.resx b/ShareX.HelpersLib/Forms/PrintTextForm.resx
similarity index 100%
rename from ShareX.HelpersLib/Printer/PrintTextForm.resx
rename to ShareX.HelpersLib/Forms/PrintTextForm.resx
diff --git a/ShareX.HelpersLib/Printer/PrintTextForm.ru.resx b/ShareX.HelpersLib/Forms/PrintTextForm.ru.resx
similarity index 100%
rename from ShareX.HelpersLib/Printer/PrintTextForm.ru.resx
rename to ShareX.HelpersLib/Forms/PrintTextForm.ru.resx
diff --git a/ShareX.HelpersLib/Printer/PrintTextForm.tr.resx b/ShareX.HelpersLib/Forms/PrintTextForm.tr.resx
similarity index 100%
rename from ShareX.HelpersLib/Printer/PrintTextForm.tr.resx
rename to ShareX.HelpersLib/Forms/PrintTextForm.tr.resx
diff --git a/ShareX.HelpersLib/Printer/PrintTextForm.uk.resx b/ShareX.HelpersLib/Forms/PrintTextForm.uk.resx
similarity index 100%
rename from ShareX.HelpersLib/Printer/PrintTextForm.uk.resx
rename to ShareX.HelpersLib/Forms/PrintTextForm.uk.resx
diff --git a/ShareX.HelpersLib/Printer/PrintTextForm.vi-VN.resx b/ShareX.HelpersLib/Forms/PrintTextForm.vi-VN.resx
similarity index 100%
rename from ShareX.HelpersLib/Printer/PrintTextForm.vi-VN.resx
rename to ShareX.HelpersLib/Forms/PrintTextForm.vi-VN.resx
diff --git a/ShareX.HelpersLib/Printer/PrintTextForm.zh-CN.resx b/ShareX.HelpersLib/Forms/PrintTextForm.zh-CN.resx
similarity index 100%
rename from ShareX.HelpersLib/Printer/PrintTextForm.zh-CN.resx
rename to ShareX.HelpersLib/Forms/PrintTextForm.zh-CN.resx
diff --git a/ShareX.HelpersLib/Printer/PrintTextForm.zh-TW.resx b/ShareX.HelpersLib/Forms/PrintTextForm.zh-TW.resx
similarity index 100%
rename from ShareX.HelpersLib/Printer/PrintTextForm.zh-TW.resx
rename to ShareX.HelpersLib/Forms/PrintTextForm.zh-TW.resx
diff --git a/ShareX.HelpersLib/ShareX.HelpersLib.csproj b/ShareX.HelpersLib/ShareX.HelpersLib.csproj
index a702e6889..48efb1748 100644
--- a/ShareX.HelpersLib/ShareX.HelpersLib.csproj
+++ b/ShareX.HelpersLib/ShareX.HelpersLib.csproj
@@ -157,10 +157,10 @@
     <Compile Include="Colors\CMYK.cs" />
     <Compile Include="Colors\ColorEventHandler.cs" />
     <Compile Include="Colors\GradientInfo.cs" />
-    <Compile Include="Colors\GradientPickerForm.cs">
+    <Compile Include="Forms\GradientPickerForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Colors\GradientPickerForm.Designer.cs">
+    <Compile Include="Forms\GradientPickerForm.Designer.cs">
       <DependentUpon>GradientPickerForm.cs</DependentUpon>
     </Compile>
     <Compile Include="Colors\GradientStop.cs" />
@@ -204,10 +204,10 @@
     <Compile Include="ConvolutionMatrix.cs" />
     <Compile Include="ConvolutionMatrixManager.cs" />
     <Compile Include="DNS\AdapterInfo.cs" />
-    <Compile Include="DNS\DNSChangerForm.cs">
+    <Compile Include="Forms\DNSChangerForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="DNS\DNSChangerForm.Designer.cs">
+    <Compile Include="Forms\DNSChangerForm.Designer.cs">
       <DependentUpon>DNSChangerForm.cs</DependentUpon>
     </Compile>
     <Compile Include="DNS\DNSInfo.cs" />
@@ -316,10 +316,10 @@
     <Compile Include="Colors\ColorUserControl.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="Colors\ColorPickerForm.cs">
+    <Compile Include="Forms\ColorPickerForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Colors\ColorPickerForm.Designer.cs">
+    <Compile Include="Forms\ColorPickerForm.Designer.cs">
       <DependentUpon>ColorPickerForm.cs</DependentUpon>
     </Compile>
     <Compile Include="Extensions\EnumExtensions.cs" />
@@ -402,18 +402,18 @@
     <Compile Include="Native\NativeMethods.cs" />
     <Compile Include="Native\NativeMethods_Helpers.cs" />
     <Compile Include="Native\NativeStructs.cs" />
-    <Compile Include="Printer\PrintForm.cs">
+    <Compile Include="Forms\PrintForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Printer\PrintForm.Designer.cs">
+    <Compile Include="Forms\PrintForm.Designer.cs">
       <DependentUpon>PrintForm.cs</DependentUpon>
     </Compile>
     <Compile Include="Printer\PrintHelper.cs" />
     <Compile Include="Printer\PrintSettings.cs" />
-    <Compile Include="Printer\PrintTextForm.cs">
+    <Compile Include="Forms\PrintTextForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Printer\PrintTextForm.Designer.cs">
+    <Compile Include="Forms\PrintTextForm.Designer.cs">
       <DependentUpon>PrintTextForm.cs</DependentUpon>
     </Compile>
     <Compile Include="Printer\PrintTextHelper.cs" />
@@ -469,106 +469,106 @@
     <Compile Include="XmlColor.cs" />
     <Compile Include="XmlFont.cs" />
     <Compile Include="ZipManager.cs" />
-    <EmbeddedResource Include="Colors\ColorPickerForm.de.resx">
+    <EmbeddedResource Include="Forms\ColorPickerForm.de.resx">
       <DependentUpon>ColorPickerForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Colors\ColorPickerForm.es-MX.resx">
+    <EmbeddedResource Include="Forms\ColorPickerForm.es-MX.resx">
       <DependentUpon>ColorPickerForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Colors\ColorPickerForm.es.resx">
+    <EmbeddedResource Include="Forms\ColorPickerForm.es.resx">
       <DependentUpon>ColorPickerForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Colors\ColorPickerForm.fr.resx">
+    <EmbeddedResource Include="Forms\ColorPickerForm.fr.resx">
       <DependentUpon>ColorPickerForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Colors\ColorPickerForm.hu.resx">
+    <EmbeddedResource Include="Forms\ColorPickerForm.hu.resx">
       <DependentUpon>ColorPickerForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Colors\ColorPickerForm.id-ID.resx">
+    <EmbeddedResource Include="Forms\ColorPickerForm.id-ID.resx">
       <DependentUpon>ColorPickerForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Colors\ColorPickerForm.it-IT.resx">
+    <EmbeddedResource Include="Forms\ColorPickerForm.it-IT.resx">
       <DependentUpon>ColorPickerForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Colors\ColorPickerForm.ko-KR.resx">
+    <EmbeddedResource Include="Forms\ColorPickerForm.ko-KR.resx">
       <DependentUpon>ColorPickerForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Colors\ColorPickerForm.nl-NL.resx">
+    <EmbeddedResource Include="Forms\ColorPickerForm.nl-NL.resx">
       <DependentUpon>ColorPickerForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Colors\ColorPickerForm.pt-BR.resx">
+    <EmbeddedResource Include="Forms\ColorPickerForm.pt-BR.resx">
       <DependentUpon>ColorPickerForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Colors\ColorPickerForm.resx">
+    <EmbeddedResource Include="Forms\ColorPickerForm.resx">
       <DependentUpon>ColorPickerForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Colors\ColorPickerForm.ru.resx">
+    <EmbeddedResource Include="Forms\ColorPickerForm.ru.resx">
       <DependentUpon>ColorPickerForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Colors\ColorPickerForm.tr.resx">
+    <EmbeddedResource Include="Forms\ColorPickerForm.tr.resx">
       <DependentUpon>ColorPickerForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Colors\ColorPickerForm.uk.resx">
+    <EmbeddedResource Include="Forms\ColorPickerForm.uk.resx">
       <DependentUpon>ColorPickerForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Colors\ColorPickerForm.vi-VN.resx">
+    <EmbeddedResource Include="Forms\ColorPickerForm.vi-VN.resx">
       <DependentUpon>ColorPickerForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Colors\ColorPickerForm.zh-CN.resx">
+    <EmbeddedResource Include="Forms\ColorPickerForm.zh-CN.resx">
       <DependentUpon>ColorPickerForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Colors\ColorPickerForm.zh-TW.resx">
+    <EmbeddedResource Include="Forms\ColorPickerForm.zh-TW.resx">
       <DependentUpon>ColorPickerForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Colors\GradientPickerForm.de.resx">
+    <EmbeddedResource Include="Forms\GradientPickerForm.de.resx">
       <DependentUpon>GradientPickerForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Colors\GradientPickerForm.es-MX.resx">
+    <EmbeddedResource Include="Forms\GradientPickerForm.es-MX.resx">
       <DependentUpon>GradientPickerForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Colors\GradientPickerForm.es.resx">
+    <EmbeddedResource Include="Forms\GradientPickerForm.es.resx">
       <DependentUpon>GradientPickerForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Colors\GradientPickerForm.fr.resx">
+    <EmbeddedResource Include="Forms\GradientPickerForm.fr.resx">
       <DependentUpon>GradientPickerForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Colors\GradientPickerForm.hu.resx">
+    <EmbeddedResource Include="Forms\GradientPickerForm.hu.resx">
       <DependentUpon>GradientPickerForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Colors\GradientPickerForm.id-ID.resx">
+    <EmbeddedResource Include="Forms\GradientPickerForm.id-ID.resx">
       <DependentUpon>GradientPickerForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Colors\GradientPickerForm.it-IT.resx">
+    <EmbeddedResource Include="Forms\GradientPickerForm.it-IT.resx">
       <DependentUpon>GradientPickerForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Colors\GradientPickerForm.ko-KR.resx">
+    <EmbeddedResource Include="Forms\GradientPickerForm.ko-KR.resx">
       <DependentUpon>GradientPickerForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Colors\GradientPickerForm.nl-NL.resx">
+    <EmbeddedResource Include="Forms\GradientPickerForm.nl-NL.resx">
       <DependentUpon>GradientPickerForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Colors\GradientPickerForm.pt-BR.resx">
+    <EmbeddedResource Include="Forms\GradientPickerForm.pt-BR.resx">
       <DependentUpon>GradientPickerForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Colors\GradientPickerForm.resx">
+    <EmbeddedResource Include="Forms\GradientPickerForm.resx">
       <DependentUpon>GradientPickerForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Colors\GradientPickerForm.ru.resx">
+    <EmbeddedResource Include="Forms\GradientPickerForm.ru.resx">
       <DependentUpon>GradientPickerForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Colors\GradientPickerForm.tr.resx">
+    <EmbeddedResource Include="Forms\GradientPickerForm.tr.resx">
       <DependentUpon>GradientPickerForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Colors\GradientPickerForm.uk.resx">
+    <EmbeddedResource Include="Forms\GradientPickerForm.uk.resx">
       <DependentUpon>GradientPickerForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Colors\GradientPickerForm.vi-VN.resx">
+    <EmbeddedResource Include="Forms\GradientPickerForm.vi-VN.resx">
       <DependentUpon>GradientPickerForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Colors\GradientPickerForm.zh-CN.resx">
+    <EmbeddedResource Include="Forms\GradientPickerForm.zh-CN.resx">
       <DependentUpon>GradientPickerForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Colors\GradientPickerForm.zh-TW.resx">
+    <EmbeddedResource Include="Forms\GradientPickerForm.zh-TW.resx">
       <DependentUpon>GradientPickerForm.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Controls\ExportImportControl.de.resx">
@@ -673,55 +673,55 @@
     <EmbeddedResource Include="Controls\MyPictureBox.zh-TW.resx">
       <DependentUpon>MyPictureBox.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="DNS\DNSChangerForm.de.resx">
+    <EmbeddedResource Include="Forms\DNSChangerForm.de.resx">
       <DependentUpon>DNSChangerForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="DNS\DNSChangerForm.es-MX.resx">
+    <EmbeddedResource Include="Forms\DNSChangerForm.es-MX.resx">
       <DependentUpon>DNSChangerForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="DNS\DNSChangerForm.es.resx">
+    <EmbeddedResource Include="Forms\DNSChangerForm.es.resx">
       <DependentUpon>DNSChangerForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="DNS\DNSChangerForm.fr.resx">
+    <EmbeddedResource Include="Forms\DNSChangerForm.fr.resx">
       <DependentUpon>DNSChangerForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="DNS\DNSChangerForm.hu.resx">
+    <EmbeddedResource Include="Forms\DNSChangerForm.hu.resx">
       <DependentUpon>DNSChangerForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="DNS\DNSChangerForm.id-ID.resx">
+    <EmbeddedResource Include="Forms\DNSChangerForm.id-ID.resx">
       <DependentUpon>DNSChangerForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="DNS\DNSChangerForm.it-IT.resx">
+    <EmbeddedResource Include="Forms\DNSChangerForm.it-IT.resx">
       <DependentUpon>DNSChangerForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="DNS\DNSChangerForm.ko-KR.resx">
+    <EmbeddedResource Include="Forms\DNSChangerForm.ko-KR.resx">
       <DependentUpon>DNSChangerForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="DNS\DNSChangerForm.nl-NL.resx">
+    <EmbeddedResource Include="Forms\DNSChangerForm.nl-NL.resx">
       <DependentUpon>DNSChangerForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="DNS\DNSChangerForm.pt-BR.resx">
+    <EmbeddedResource Include="Forms\DNSChangerForm.pt-BR.resx">
       <DependentUpon>DNSChangerForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="DNS\DNSChangerForm.resx">
+    <EmbeddedResource Include="Forms\DNSChangerForm.resx">
       <DependentUpon>DNSChangerForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="DNS\DNSChangerForm.ru.resx">
+    <EmbeddedResource Include="Forms\DNSChangerForm.ru.resx">
       <DependentUpon>DNSChangerForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="DNS\DNSChangerForm.tr.resx">
+    <EmbeddedResource Include="Forms\DNSChangerForm.tr.resx">
       <DependentUpon>DNSChangerForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="DNS\DNSChangerForm.uk.resx">
+    <EmbeddedResource Include="Forms\DNSChangerForm.uk.resx">
       <DependentUpon>DNSChangerForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="DNS\DNSChangerForm.vi-VN.resx">
+    <EmbeddedResource Include="Forms\DNSChangerForm.vi-VN.resx">
       <DependentUpon>DNSChangerForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="DNS\DNSChangerForm.zh-CN.resx">
+    <EmbeddedResource Include="Forms\DNSChangerForm.zh-CN.resx">
       <DependentUpon>DNSChangerForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="DNS\DNSChangerForm.zh-TW.resx">
+    <EmbeddedResource Include="Forms\DNSChangerForm.zh-TW.resx">
       <DependentUpon>DNSChangerForm.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Forms\ClipboardContentViewer.de.resx">
@@ -1033,100 +1033,100 @@
     <EmbeddedResource Include="Controls\ExportImportControl.resx">
       <DependentUpon>ExportImportControl.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Printer\PrintForm.de.resx">
+    <EmbeddedResource Include="Forms\PrintForm.de.resx">
       <DependentUpon>PrintForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Printer\PrintForm.es-MX.resx">
+    <EmbeddedResource Include="Forms\PrintForm.es-MX.resx">
       <DependentUpon>PrintForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Printer\PrintForm.es.resx">
+    <EmbeddedResource Include="Forms\PrintForm.es.resx">
       <DependentUpon>PrintForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Printer\PrintForm.fr.resx">
+    <EmbeddedResource Include="Forms\PrintForm.fr.resx">
       <DependentUpon>PrintForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Printer\PrintForm.hu.resx">
+    <EmbeddedResource Include="Forms\PrintForm.hu.resx">
       <DependentUpon>PrintForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Printer\PrintForm.id-ID.resx">
+    <EmbeddedResource Include="Forms\PrintForm.id-ID.resx">
       <DependentUpon>PrintForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Printer\PrintForm.it-IT.resx">
+    <EmbeddedResource Include="Forms\PrintForm.it-IT.resx">
       <DependentUpon>PrintForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Printer\PrintForm.ko-KR.resx">
+    <EmbeddedResource Include="Forms\PrintForm.ko-KR.resx">
       <DependentUpon>PrintForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Printer\PrintForm.nl-NL.resx">
+    <EmbeddedResource Include="Forms\PrintForm.nl-NL.resx">
       <DependentUpon>PrintForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Printer\PrintForm.pt-BR.resx">
+    <EmbeddedResource Include="Forms\PrintForm.pt-BR.resx">
       <DependentUpon>PrintForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Printer\PrintForm.ru.resx">
+    <EmbeddedResource Include="Forms\PrintForm.ru.resx">
       <DependentUpon>PrintForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Printer\PrintForm.tr.resx">
+    <EmbeddedResource Include="Forms\PrintForm.tr.resx">
       <DependentUpon>PrintForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Printer\PrintForm.uk.resx">
+    <EmbeddedResource Include="Forms\PrintForm.uk.resx">
       <DependentUpon>PrintForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Printer\PrintForm.vi-VN.resx">
+    <EmbeddedResource Include="Forms\PrintForm.vi-VN.resx">
       <DependentUpon>PrintForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Printer\PrintForm.zh-CN.resx">
+    <EmbeddedResource Include="Forms\PrintForm.zh-CN.resx">
       <DependentUpon>PrintForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Printer\PrintForm.zh-TW.resx">
+    <EmbeddedResource Include="Forms\PrintForm.zh-TW.resx">
       <DependentUpon>PrintForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Printer\PrintTextForm.de.resx">
+    <EmbeddedResource Include="Forms\PrintTextForm.de.resx">
       <DependentUpon>PrintTextForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Printer\PrintTextForm.es-MX.resx">
+    <EmbeddedResource Include="Forms\PrintTextForm.es-MX.resx">
       <DependentUpon>PrintTextForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Printer\PrintTextForm.es.resx">
+    <EmbeddedResource Include="Forms\PrintTextForm.es.resx">
       <DependentUpon>PrintTextForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Printer\PrintTextForm.fr.resx">
+    <EmbeddedResource Include="Forms\PrintTextForm.fr.resx">
       <DependentUpon>PrintTextForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Printer\PrintTextForm.hu.resx">
+    <EmbeddedResource Include="Forms\PrintTextForm.hu.resx">
       <DependentUpon>PrintTextForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Printer\PrintTextForm.id-ID.resx">
+    <EmbeddedResource Include="Forms\PrintTextForm.id-ID.resx">
       <DependentUpon>PrintTextForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Printer\PrintTextForm.it-IT.resx">
+    <EmbeddedResource Include="Forms\PrintTextForm.it-IT.resx">
       <DependentUpon>PrintTextForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Printer\PrintTextForm.ko-KR.resx">
+    <EmbeddedResource Include="Forms\PrintTextForm.ko-KR.resx">
       <DependentUpon>PrintTextForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Printer\PrintTextForm.nl-NL.resx">
+    <EmbeddedResource Include="Forms\PrintTextForm.nl-NL.resx">
       <DependentUpon>PrintTextForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Printer\PrintTextForm.pt-BR.resx">
+    <EmbeddedResource Include="Forms\PrintTextForm.pt-BR.resx">
       <DependentUpon>PrintTextForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Printer\PrintTextForm.ru.resx">
+    <EmbeddedResource Include="Forms\PrintTextForm.ru.resx">
       <DependentUpon>PrintTextForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Printer\PrintTextForm.tr.resx">
+    <EmbeddedResource Include="Forms\PrintTextForm.tr.resx">
       <DependentUpon>PrintTextForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Printer\PrintTextForm.uk.resx">
+    <EmbeddedResource Include="Forms\PrintTextForm.uk.resx">
       <DependentUpon>PrintTextForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Printer\PrintTextForm.vi-VN.resx">
+    <EmbeddedResource Include="Forms\PrintTextForm.vi-VN.resx">
       <DependentUpon>PrintTextForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Printer\PrintTextForm.zh-CN.resx">
+    <EmbeddedResource Include="Forms\PrintTextForm.zh-CN.resx">
       <DependentUpon>PrintTextForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Printer\PrintTextForm.zh-TW.resx">
+    <EmbeddedResource Include="Forms\PrintTextForm.zh-TW.resx">
       <DependentUpon>PrintTextForm.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.de.resx" />
@@ -1183,10 +1183,10 @@
       <DependentUpon>DownloaderForm.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Printer\PrintForm.resx">
+    <EmbeddedResource Include="Forms\PrintForm.resx">
       <DependentUpon>PrintForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Printer\PrintTextForm.resx">
+    <EmbeddedResource Include="Forms\PrintTextForm.resx">
       <DependentUpon>PrintTextForm.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
diff --git a/ShareX.ImageEffectsLib/ImageEffectsForm.cs b/ShareX.ImageEffectsLib/ImageEffectsForm.cs
index 622c3c841..45c694d44 100644
--- a/ShareX.ImageEffectsLib/ImageEffectsForm.cs
+++ b/ShareX.ImageEffectsLib/ImageEffectsForm.cs
@@ -48,7 +48,8 @@ public partial class ImageEffectsForm : Form
         public ImageEffectsForm(Image img, List<ImageEffectPreset> presets, int selectedPresetIndex)
         {
             InitializeComponent();
-            Icon = ShareXResources.Icon;
+            ShareXResources.ApplyThemeToForm(this);
+
             DefaultImage = img;
             Presets = presets;
             if (Presets.Count == 0)
diff --git a/ShareX.ImageEffectsLib/WatermarkForm.cs b/ShareX.ImageEffectsLib/WatermarkForm.cs
index e3988de74..bce74c587 100644
--- a/ShareX.ImageEffectsLib/WatermarkForm.cs
+++ b/ShareX.ImageEffectsLib/WatermarkForm.cs
@@ -39,9 +39,11 @@ public partial class WatermarkForm : Form
 
         public WatermarkForm(WatermarkConfig watermarkConfig)
         {
-            InitializeComponent();
-            Icon = ShareXResources.Icon;
             config = watermarkConfig;
+
+            InitializeComponent();
+            ShareXResources.ApplyThemeToForm(this);
+
             CodeMenu.Create<CodeMenuEntryFilename>(txtWatermarkText, CodeMenuEntryFilename.t, CodeMenuEntryFilename.pn);
         }