diff --git a/ShareX.UploadersLib/Forms/CustomUploaderSettingsForm.cs b/ShareX.UploadersLib/Forms/CustomUploaderSettingsForm.cs
index 2e0bf1df8..c89f2c5f8 100644
--- a/ShareX.UploadersLib/Forms/CustomUploaderSettingsForm.cs
+++ b/ShareX.UploadersLib/Forms/CustomUploaderSettingsForm.cs
@@ -198,7 +198,6 @@ private void CustomUploaderLoad(CustomUploaderItem uploader)
             txtFileFormName.Text = uploader.FileFormName ?? "";
 
             rtbData.Text = uploader.Data ?? "";
-            CustomUploaderSyntaxHighlight(rtbData);
 
             rtbResultURL.Text = uploader.URL;
             CustomUploaderSyntaxHighlight(rtbResultURL);
@@ -621,8 +620,19 @@ private async Task TestCustomUploader(CustomUploaderDestinationType type, int in
                             break;
                         case CustomUploaderDestinationType.TextUploader:
                             CustomTextUploader textUploader = new CustomTextUploader(item);
-                            result = textUploader.UploadText("ShareX text upload test", "Test.txt");
-                            result.Errors.AddRange(textUploader.Errors);
+                            using (TextUploadForm form = new TextUploadForm("ShareX text upload test"))
+                            {
+                                if (form.ShowDialog() == DialogResult.OK)
+                                {
+                                    string text = form.Content;
+
+                                    if (!string.IsNullOrEmpty(text))
+                                    {
+                                        result = textUploader.UploadText(text, "Test.txt");
+                                        result.Errors.AddRange(textUploader.Errors);
+                                    }
+                                }
+                            }
                             break;
                         case CustomUploaderDestinationType.FileUploader:
                             using (Stream stream = ShareXResources.Logo.GetStream())
@@ -993,8 +1003,6 @@ private void rtbCustomUploaderData_TextChanged(object sender, EventArgs e)
         {
             CustomUploaderItem uploader = CustomUploaderGetSelected();
             if (uploader != null) uploader.Data = rtbData.Text;
-
-            CustomUploaderSyntaxHighlight(rtbData);
         }
 
         private void btnCustomUploaderDataBeautify_Click(object sender, EventArgs e)
diff --git a/ShareX/Forms/TextUploadForm.Designer.cs b/ShareX.UploadersLib/Forms/TextUploadForm.Designer.cs
similarity index 98%
rename from ShareX/Forms/TextUploadForm.Designer.cs
rename to ShareX.UploadersLib/Forms/TextUploadForm.Designer.cs
index 00a9e89f1..ba9f5b982 100644
--- a/ShareX/Forms/TextUploadForm.Designer.cs
+++ b/ShareX.UploadersLib/Forms/TextUploadForm.Designer.cs
@@ -1,4 +1,4 @@
-namespace ShareX
+namespace ShareX.UploadersLib
 {
     partial class TextUploadForm
     {
diff --git a/ShareX/Forms/TextUploadForm.cs b/ShareX.UploadersLib/Forms/TextUploadForm.cs
similarity index 98%
rename from ShareX/Forms/TextUploadForm.cs
rename to ShareX.UploadersLib/Forms/TextUploadForm.cs
index f9fbf28b4..d6c910d4d 100644
--- a/ShareX/Forms/TextUploadForm.cs
+++ b/ShareX.UploadersLib/Forms/TextUploadForm.cs
@@ -27,7 +27,7 @@
 using System;
 using System.Windows.Forms;
 
-namespace ShareX
+namespace ShareX.UploadersLib
 {
     public partial class TextUploadForm : Form
     {
diff --git a/ShareX/Forms/TextUploadForm.de.resx b/ShareX.UploadersLib/Forms/TextUploadForm.de.resx
similarity index 100%
rename from ShareX/Forms/TextUploadForm.de.resx
rename to ShareX.UploadersLib/Forms/TextUploadForm.de.resx
diff --git a/ShareX/Forms/TextUploadForm.es-MX.resx b/ShareX.UploadersLib/Forms/TextUploadForm.es-MX.resx
similarity index 100%
rename from ShareX/Forms/TextUploadForm.es-MX.resx
rename to ShareX.UploadersLib/Forms/TextUploadForm.es-MX.resx
diff --git a/ShareX/Forms/TextUploadForm.fa-IR.resx b/ShareX.UploadersLib/Forms/TextUploadForm.fa-IR.resx
similarity index 100%
rename from ShareX/Forms/TextUploadForm.fa-IR.resx
rename to ShareX.UploadersLib/Forms/TextUploadForm.fa-IR.resx
diff --git a/ShareX/Forms/TextUploadForm.fr.resx b/ShareX.UploadersLib/Forms/TextUploadForm.fr.resx
similarity index 100%
rename from ShareX/Forms/TextUploadForm.fr.resx
rename to ShareX.UploadersLib/Forms/TextUploadForm.fr.resx
diff --git a/ShareX/Forms/TextUploadForm.ja-JP.resx b/ShareX.UploadersLib/Forms/TextUploadForm.ja-JP.resx
similarity index 100%
rename from ShareX/Forms/TextUploadForm.ja-JP.resx
rename to ShareX.UploadersLib/Forms/TextUploadForm.ja-JP.resx
diff --git a/ShareX/Forms/TextUploadForm.ko-KR.resx b/ShareX.UploadersLib/Forms/TextUploadForm.ko-KR.resx
similarity index 100%
rename from ShareX/Forms/TextUploadForm.ko-KR.resx
rename to ShareX.UploadersLib/Forms/TextUploadForm.ko-KR.resx
diff --git a/ShareX/Forms/TextUploadForm.pt-PT.resx b/ShareX.UploadersLib/Forms/TextUploadForm.pt-PT.resx
similarity index 100%
rename from ShareX/Forms/TextUploadForm.pt-PT.resx
rename to ShareX.UploadersLib/Forms/TextUploadForm.pt-PT.resx
diff --git a/ShareX/Forms/TextUploadForm.resx b/ShareX.UploadersLib/Forms/TextUploadForm.resx
similarity index 100%
rename from ShareX/Forms/TextUploadForm.resx
rename to ShareX.UploadersLib/Forms/TextUploadForm.resx
diff --git a/ShareX/Forms/TextUploadForm.ru.resx b/ShareX.UploadersLib/Forms/TextUploadForm.ru.resx
similarity index 100%
rename from ShareX/Forms/TextUploadForm.ru.resx
rename to ShareX.UploadersLib/Forms/TextUploadForm.ru.resx
diff --git a/ShareX/Forms/TextUploadForm.tr.resx b/ShareX.UploadersLib/Forms/TextUploadForm.tr.resx
similarity index 100%
rename from ShareX/Forms/TextUploadForm.tr.resx
rename to ShareX.UploadersLib/Forms/TextUploadForm.tr.resx
diff --git a/ShareX/Forms/TextUploadForm.uk.resx b/ShareX.UploadersLib/Forms/TextUploadForm.uk.resx
similarity index 100%
rename from ShareX/Forms/TextUploadForm.uk.resx
rename to ShareX.UploadersLib/Forms/TextUploadForm.uk.resx
diff --git a/ShareX/Forms/TextUploadForm.vi-VN.resx b/ShareX.UploadersLib/Forms/TextUploadForm.vi-VN.resx
similarity index 100%
rename from ShareX/Forms/TextUploadForm.vi-VN.resx
rename to ShareX.UploadersLib/Forms/TextUploadForm.vi-VN.resx
diff --git a/ShareX/Forms/TextUploadForm.zh-CN.resx b/ShareX.UploadersLib/Forms/TextUploadForm.zh-CN.resx
similarity index 100%
rename from ShareX/Forms/TextUploadForm.zh-CN.resx
rename to ShareX.UploadersLib/Forms/TextUploadForm.zh-CN.resx
diff --git a/ShareX/Forms/TextUploadForm.zh-TW.resx b/ShareX.UploadersLib/Forms/TextUploadForm.zh-TW.resx
similarity index 100%
rename from ShareX/Forms/TextUploadForm.zh-TW.resx
rename to ShareX.UploadersLib/Forms/TextUploadForm.zh-TW.resx
diff --git a/ShareX.UploadersLib/ShareX.UploadersLib.csproj b/ShareX.UploadersLib/ShareX.UploadersLib.csproj
index b8a7c46a1..5ed21c170 100644
--- a/ShareX.UploadersLib/ShareX.UploadersLib.csproj
+++ b/ShareX.UploadersLib/ShareX.UploadersLib.csproj
@@ -229,6 +229,12 @@
     <Compile Include="Forms\ResponseForm.Designer.cs">
       <DependentUpon>ResponseForm.cs</DependentUpon>
     </Compile>
+    <Compile Include="Forms\TextUploadForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Forms\TextUploadForm.Designer.cs">
+      <DependentUpon>TextUploadForm.cs</DependentUpon>
+    </Compile>
     <Compile Include="Forms\UploadersConfigFormHelper.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -790,6 +796,48 @@
     <EmbeddedResource Include="Forms\ResponseForm.zh-TW.resx">
       <DependentUpon>ResponseForm.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Forms\TextUploadForm.de.resx">
+      <DependentUpon>TextUploadForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Forms\TextUploadForm.es-MX.resx">
+      <DependentUpon>TextUploadForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Forms\TextUploadForm.fa-IR.resx">
+      <DependentUpon>TextUploadForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Forms\TextUploadForm.fr.resx">
+      <DependentUpon>TextUploadForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Forms\TextUploadForm.ja-JP.resx">
+      <DependentUpon>TextUploadForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Forms\TextUploadForm.ko-KR.resx">
+      <DependentUpon>TextUploadForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Forms\TextUploadForm.pt-PT.resx">
+      <DependentUpon>TextUploadForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Forms\TextUploadForm.resx">
+      <DependentUpon>TextUploadForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Forms\TextUploadForm.ru.resx">
+      <DependentUpon>TextUploadForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Forms\TextUploadForm.tr.resx">
+      <DependentUpon>TextUploadForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Forms\TextUploadForm.uk.resx">
+      <DependentUpon>TextUploadForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Forms\TextUploadForm.vi-VN.resx">
+      <DependentUpon>TextUploadForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Forms\TextUploadForm.zh-CN.resx">
+      <DependentUpon>TextUploadForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Forms\TextUploadForm.zh-TW.resx">
+      <DependentUpon>TextUploadForm.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Forms\TwitterTweetForm.de.resx">
       <DependentUpon>TwitterTweetForm.cs</DependentUpon>
     </EmbeddedResource>
diff --git a/ShareX/ShareX.csproj b/ShareX/ShareX.csproj
index 4c230100f..2a221b21c 100644
--- a/ShareX/ShareX.csproj
+++ b/ShareX/ShareX.csproj
@@ -212,12 +212,6 @@
     <Compile Include="Forms\InspectWindowForm.Designer.cs">
       <DependentUpon>InspectWindowForm.cs</DependentUpon>
     </Compile>
-    <Compile Include="Forms\TextUploadForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Forms\TextUploadForm.Designer.cs">
-      <DependentUpon>TextUploadForm.cs</DependentUpon>
-    </Compile>
     <Compile Include="NativeMessageInput.cs" />
     <Compile Include="NewsItem.cs" />
     <Compile Include="NewsManager.cs" />
@@ -1549,48 +1543,6 @@
     <EmbeddedResource Include="Forms\TaskSettingsForm.zh-TW.resx">
       <DependentUpon>TaskSettingsForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Forms\TextUploadForm.de.resx">
-      <DependentUpon>TextUploadForm.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\TextUploadForm.es-MX.resx">
-      <DependentUpon>TextUploadForm.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\TextUploadForm.fa-IR.resx">
-      <DependentUpon>TextUploadForm.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\TextUploadForm.fr.resx">
-      <DependentUpon>TextUploadForm.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\TextUploadForm.ja-JP.resx">
-      <DependentUpon>TextUploadForm.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\TextUploadForm.ko-KR.resx">
-      <DependentUpon>TextUploadForm.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\TextUploadForm.pt-PT.resx">
-      <DependentUpon>TextUploadForm.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\TextUploadForm.resx">
-      <DependentUpon>TextUploadForm.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\TextUploadForm.ru.resx">
-      <DependentUpon>TextUploadForm.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\TextUploadForm.tr.resx">
-      <DependentUpon>TextUploadForm.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\TextUploadForm.uk.resx">
-      <DependentUpon>TextUploadForm.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\TextUploadForm.vi-VN.resx">
-      <DependentUpon>TextUploadForm.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\TextUploadForm.zh-CN.resx">
-      <DependentUpon>TextUploadForm.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\TextUploadForm.zh-TW.resx">
-      <DependentUpon>TextUploadForm.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="Forms\WatchFolderForm.de.resx">
       <DependentUpon>WatchFolderForm.cs</DependentUpon>
     </EmbeddedResource>